From e856bdcfb49291d30b19603fc101bea096c48196 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sat, 11 Feb 2017 22:43:54 +0900 Subject: 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 --- include/configs/km/km83xx-common.h | 1 - include/configs/km/km_arm.h | 7 +------ include/configs/km/kmp204x-common.h | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) (limited to 'include/configs/km') diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h index d824b1bdcd..35ec0972bf 100644 --- a/include/configs/km/km83xx-common.h +++ b/include/configs/km/km83xx-common.h @@ -191,7 +191,6 @@ #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #else /* CFG_SYS_RAMBOOT */ -#define CONFIG_SYS_NO_FLASH /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 56d3f0260a..c44ab36128 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -120,11 +120,6 @@ */ #define CONFIG_CMD_MTDPARTS -/* - * Without NOR FLASH we need this - */ -#define CONFIG_SYS_NO_FLASH - /* * NAND Flash configuration */ @@ -292,7 +287,7 @@ int get_scl(void); "arch=arm\0" \ "" -#if defined(CONFIG_SYS_NO_FLASH) +#if !defined(CONFIG_MTD_NOR_FLASH) #undef CONFIG_FLASH_CFI_MTD #undef CONFIG_JFFS2_CMDLINE #endif diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index efd3b28900..9bfcfdefe9 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -373,7 +373,6 @@ int get_scl(void); #define CONFIG_CMD_ERRATA /* we don't need flash support */ -#define CONFIG_SYS_NO_FLASH #undef CONFIG_FLASH_CFI_MTD #undef CONFIG_JFFS2_CMDLINE -- cgit