mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-25 14:10:43 +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>
42 lines
1,021 B
Text
42 lines
1,021 B
Text
CONFIG_ARM=y
|
|
CONFIG_ARCH_UNIPHIER=y
|
|
CONFIG_SYS_MALLOC_F_LEN=0x2000
|
|
CONFIG_SPL_MMC_SUPPORT=y
|
|
CONFIG_SPL_NAND_SUPPORT=y
|
|
CONFIG_SPL_SERIAL_SUPPORT=y
|
|
CONFIG_ARCH_UNIPHIER_PRO5_PXS2_LD6B=y
|
|
CONFIG_MICRO_SUPPORT_CARD=y
|
|
CONFIG_SYS_TEXT_BASE=0x84000000
|
|
CONFIG_DEFAULT_DEVICE_TREE="uniphier-pxs2-vodka"
|
|
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
|
|
CONFIG_SPL=y
|
|
CONFIG_SPL_NOR_SUPPORT=y
|
|
CONFIG_HUSH_PARSER=y
|
|
CONFIG_CMD_BOOTZ=y
|
|
# CONFIG_CMD_XIMG is not set
|
|
# CONFIG_CMD_ENV_EXISTS is not set
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_NAND=y
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_USB=y
|
|
# CONFIG_CMD_FPGA is not set
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_TFTPPUT=y
|
|
CONFIG_CMD_PING=y
|
|
CONFIG_CMD_CACHE=y
|
|
CONFIG_CMD_TIME=y
|
|
# CONFIG_CMD_MISC is not set
|
|
CONFIG_CMD_FAT=y
|
|
CONFIG_NET_RANDOM_ETHADDR=y
|
|
CONFIG_GPIO_UNIPHIER=y
|
|
CONFIG_MISC=y
|
|
CONFIG_I2C_EEPROM=y
|
|
CONFIG_MMC_UNIPHIER=y
|
|
CONFIG_MTD_NOR_FLASH=y
|
|
CONFIG_NAND_DENALI=y
|
|
CONFIG_SYS_NAND_DENALI_64BIT=y
|
|
CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
|
|
CONFIG_SPL_NAND_DENALI=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_XHCI_HCD=y
|
|
CONFIG_USB_STORAGE=y
|