diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-02-11 22:43:54 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-12 14:30:25 -0500 |
| commit | e856bdcfb49291d30b19603fc101bea096c48196 (patch) | |
| tree | 55b06a9fcd09e0390cafc789aff5d86638eeb3f3 /common/board_r.c | |
| parent | a931e9975bd8fa2a1866d560de6a388042d00f0b (diff) | |
| download | u-boot-imx-e856bdcfb49291d30b19603fc101bea096c48196.zip u-boot-imx-e856bdcfb49291d30b19603fc101bea096c48196.tar.gz u-boot-imx-e856bdcfb49291d30b19603fc101bea096c48196.tar.bz2 | |
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 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/board_r.c b/common/board_r.c index 8077280..5c9e698 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -355,7 +355,7 @@ static int initr_manual_reloc_cmdtable(void) } #endif -#if !defined(CONFIG_SYS_NO_FLASH) +#if defined(CONFIG_MTD_NOR_FLASH) static int initr_flash(void) { ulong flash_size = 0; @@ -818,7 +818,7 @@ static init_fnc_t init_sequence_r[] = { arch_early_init_r, #endif power_init_board, -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH initr_flash, #endif INIT_FUNC_WATCHDOG_RESET |