mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 23:51:33 +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>
28 lines
690 B
Text
28 lines
690 B
Text
CONFIG_ARM=y
|
|
CONFIG_ARCH_AT91=y
|
|
CONFIG_TARGET_AT91SAM9263EK=y
|
|
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NORFLASH"
|
|
CONFIG_BOOTDELAY=3
|
|
# CONFIG_CONSOLE_MUX is not set
|
|
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
|
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
|
CONFIG_HUSH_PARSER=y
|
|
CONFIG_SYS_PROMPT="U-Boot> "
|
|
# CONFIG_CMD_BDI is not set
|
|
CONFIG_CMD_BOOTZ=y
|
|
# CONFIG_CMD_IMI is not set
|
|
# CONFIG_CMD_IMLS is not set
|
|
# CONFIG_CMD_LOADS is not set
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
# CONFIG_CMD_FPGA is not set
|
|
# CONFIG_CMD_SOURCE is not set
|
|
# CONFIG_CMD_SETEXPR is not set
|
|
CONFIG_CMD_DHCP=y
|
|
CONFIG_CMD_PING=y
|
|
CONFIG_CMD_FAT=y
|
|
CONFIG_MTD_NOR_FLASH=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_STORAGE=y
|
|
CONFIG_LCD=y
|
|
CONFIG_OF_LIBFDT=y
|