flash: complete CONFIG_SYS_NO_FLASH move with renaming
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>
Showing
- README 0 additions, 13 deletionsREADME
- arch/arm/cpu/armv7/mx6/clock.c 1 addition, 1 deletionarch/arm/cpu/armv7/mx6/clock.c
- arch/arm/mach-uniphier/micro-support-card.c 3 additions, 3 deletionsarch/arm/mach-uniphier/micro-support-card.c
- board/amcc/sequoia/sequoia.c 4 additions, 4 deletionsboard/amcc/sequoia/sequoia.c
- board/atmel/at91sam9263ek/at91sam9263ek.c 4 additions, 4 deletionsboard/atmel/at91sam9263ek/at91sam9263ek.c
- board/atmel/sama5d3xek/sama5d3xek.c 2 additions, 2 deletionsboard/atmel/sama5d3xek/sama5d3xek.c
- board/bf518f-ezbrd/bf518f-ezbrd.c 2 additions, 2 deletionsboard/bf518f-ezbrd/bf518f-ezbrd.c
- board/bf526-ezbrd/bf526-ezbrd.c 2 additions, 2 deletionsboard/bf526-ezbrd/bf526-ezbrd.c
- board/bf537-stamp/bf537-stamp.c 2 additions, 2 deletionsboard/bf537-stamp/bf537-stamp.c
- board/dnp5370/dnp5370.c 2 additions, 2 deletionsboard/dnp5370/dnp5370.c
- board/freescale/bsc9132qds/bsc9132qds.c 1 addition, 1 deletionboard/freescale/bsc9132qds/bsc9132qds.c
- board/freescale/t102xqds/law.c 1 addition, 1 deletionboard/freescale/t102xqds/law.c
- board/freescale/t102xrdb/law.c 1 addition, 1 deletionboard/freescale/t102xrdb/law.c
- board/freescale/t1040qds/law.c 1 addition, 1 deletionboard/freescale/t1040qds/law.c
- board/freescale/t104xrdb/law.c 1 addition, 1 deletionboard/freescale/t104xrdb/law.c
- board/renesas/blanche/blanche.c 5 additions, 5 deletionsboard/renesas/blanche/blanche.c
- cmd/cramfs.c 1 addition, 1 deletioncmd/cramfs.c
- cmd/flash.c 17 additions, 17 deletionscmd/flash.c
- cmd/load.c 2 additions, 2 deletionscmd/load.c
- cmd/mem.c 2 additions, 2 deletionscmd/mem.c
Loading
Please register or sign in to comment