diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-02-11 13:43:54 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-12 19:30:25 (GMT) |
| commit | e856bdcfb49291d30b19603fc101bea096c48196 (patch) | |
| tree | 55b06a9fcd09e0390cafc789aff5d86638eeb3f3 /include/configs/blanche.h | |
| parent | a931e9975bd8fa2a1866d560de6a388042d00f0b (diff) | |
| download | u-boot-e856bdcfb49291d30b19603fc101bea096c48196.tar.xz | |
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>
Diffstat (limited to 'include/configs/blanche.h')
| -rwxr-xr-x | include/configs/blanche.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/configs/blanche.h b/include/configs/blanche.h index e040dba..cb80b90 100755 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -39,8 +39,7 @@ #undef CONFIG_SYS_LOADS_BAUD_CHANGE /* FLASH */ -/* #define CONFIG_SYS_NO_FLASH */ /* uncomment if use QSPI-FLASH */ -#if defined(CONFIG_SYS_NO_FLASH) +#if !defined(CONFIG_MTD_NOR_FLASH) #define CONFIG_SYS_TEXT_BASE 0x40000000 #define CONFIG_SPI #define CONFIG_SH_QSPI @@ -80,7 +79,7 @@ #define CONFIG_SYS_TMU_CLK_DIV 4 /* ENV setting */ -#if defined(CONFIG_SYS_NO_FLASH) +#if !defined(CONFIG_MTD_NOR_FLASH) #else #undef CONFIG_ENV_IS_IN_SPI_FLASH #undef CONFIG_ENV_ADDR |