mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 15:37:23 +00:00
e856bdcfb4
We repeated partial moves for CONFIG_SYS_NO_FLASH, but this is
not completed. Finish this work by the tool.
During this move, let's rename it to CONFIG_MTD_NOR_FLASH.
Actually, we have more instances of "#ifndef CONFIG_SYS_NO_FLASH"
than those of "#ifdef CONFIG_SYS_NO_FLASH". Flipping the logic will
make the code more readable. Besides, negative meaning symbols do
not fit in obj-$(CONFIG_...) style Makefiles.
This commit was created as follows:
[1] Edit "default n" to "default y" in the config entry in
common/Kconfig.
[2] Run "tools/moveconfig.py -y -r HEAD SYS_NO_FLASH"
[3] Rename the instances in defconfigs by the following:
find . -path './configs/*_defconfig' | xargs sed -i \
-e '/CONFIG_SYS_NO_FLASH=y/d' \
-e 's/# CONFIG_SYS_NO_FLASH is not set/CONFIG_MTD_NOR_FLASH=y/'
[4] Change the conditionals by the following:
find . -name '*.[ch]' | xargs sed -i \
-e 's/ifndef CONFIG_SYS_NO_FLASH/ifdef CONFIG_MTD_NOR_FLASH/' \
-e 's/ifdef CONFIG_SYS_NO_FLASH/ifndef CONFIG_MTD_NOR_FLASH/' \
-e 's/!defined(CONFIG_SYS_NO_FLASH)/defined(CONFIG_MTD_NOR_FLASH)/' \
-e 's/defined(CONFIG_SYS_NO_FLASH)/!defined(CONFIG_MTD_NOR_FLASH)/'
[5] Modify the following manually
- Rename the rest of instances
- Remove the description from README
- Create the new Kconfig entry in drivers/mtd/Kconfig
- Remove the old Kconfig entry from common/Kconfig
- Remove the garbage comments from include/configs/*.h
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
91 lines
2.3 KiB
C
91 lines
2.3 KiB
C
/*
|
|
* Copyright (C) 2010 Eric C. Cooper <ecc@cmu.edu>
|
|
*
|
|
* Based on sheevaplug.h originally written by
|
|
* Prafulla Wadaskar <prafulla@marvell.com>
|
|
* (C) Copyright 2009
|
|
* Marvell Semiconductor <www.marvell.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#ifndef _CONFIG_DOCKSTAR_H
|
|
#define _CONFIG_DOCKSTAR_H
|
|
|
|
/*
|
|
* High Level Configuration Options (easy to change)
|
|
*/
|
|
#define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */
|
|
#define CONFIG_KW88F6281 1 /* SOC Name */
|
|
#define CONFIG_MACH_DOCKSTAR /* Machine type */
|
|
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
|
|
|
|
/*
|
|
* Commands configuration
|
|
*/
|
|
#define CONFIG_CMD_ENV
|
|
#define CONFIG_CMD_NAND
|
|
/*
|
|
* mv-common.h should be defined after CMD configs since it used them
|
|
* to enable certain macros
|
|
*/
|
|
#include "mv-common.h"
|
|
|
|
/*
|
|
* Environment variables configurations
|
|
*/
|
|
#ifdef CONFIG_CMD_NAND
|
|
#define CONFIG_ENV_IS_IN_NAND 1
|
|
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */
|
|
#else
|
|
#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */
|
|
#endif
|
|
/*
|
|
* max 4k env size is enough, but in case of nand
|
|
* it has to be rounded to sector size
|
|
*/
|
|
#define CONFIG_ENV_SIZE 0x20000 /* 128k */
|
|
#define CONFIG_ENV_ADDR 0x80000
|
|
#define CONFIG_ENV_OFFSET 0x80000 /* env starts here */
|
|
|
|
/*
|
|
* Default environment variables
|
|
*/
|
|
#define CONFIG_BOOTCOMMAND \
|
|
"setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
|
|
"ubi part root; " \
|
|
"ubifsmount ubi:root; " \
|
|
"ubifsload 0x800000 ${kernel}; " \
|
|
"ubifsload 0x1100000 ${initrd}; " \
|
|
"bootm 0x800000 0x1100000"
|
|
|
|
#define CONFIG_MTDPARTS "mtdparts=orion_nand:1m(uboot),-(root)\0"
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"console=console=ttyS0,115200\0" \
|
|
"mtdids=nand0=orion_nand\0" \
|
|
"mtdparts="CONFIG_MTDPARTS \
|
|
"kernel=/boot/uImage\0" \
|
|
"initrd=/boot/uInitrd\0" \
|
|
"bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"
|
|
|
|
/*
|
|
* Ethernet Driver configuration
|
|
*/
|
|
#ifdef CONFIG_CMD_NET
|
|
#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
|
|
#define CONFIG_PHY_BASE_ADR 0
|
|
#endif /* CONFIG_CMD_NET */
|
|
|
|
/*
|
|
* File system
|
|
*/
|
|
#define CONFIG_CMD_JFFS2
|
|
#define CONFIG_CMD_UBIFS
|
|
#define CONFIG_RBTREE
|
|
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
|
|
#define CONFIG_MTD_PARTITIONS
|
|
#define CONFIG_CMD_MTDPARTS
|
|
#define CONFIG_LZO
|
|
|
|
#endif /* _CONFIG_DOCKSTAR_H */
|