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 --- board/renesas/blanche/blanche.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'board/renesas') diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c index 1372050..5156eaf 100644 --- a/board/renesas/blanche/blanche.c +++ b/board/renesas/blanche/blanche.c @@ -136,7 +136,7 @@ void s_init(void) /* SCIF Init */ pin_init(); -#if !defined(CONFIG_SYS_NO_FLASH) +#if defined(CONFIG_MTD_NOR_FLASH) struct rcar_lbsc *lbsc = (struct rcar_lbsc *)LBSC_BASE; struct rcar_dbsc3 *dbsc3_0 = (struct rcar_dbsc3 *)DBSC3_0_BASE; @@ -300,7 +300,7 @@ void s_init(void) /* This locks the access to the PHY unit registers */ writel(0x00000000, &dbsc3_0->dbpdlck); -#endif /* CONFIG_SYS_NO_FLASH */ +#endif /* CONFIG_MTD_NOR_FLASH */ } @@ -368,21 +368,21 @@ int board_init(void) gpio_request(GPIO_FN_A17, NULL); gpio_request(GPIO_FN_A18, NULL); gpio_request(GPIO_FN_A19, NULL); -#if defined(CONFIG_SYS_NO_FLASH) +#if !defined(CONFIG_MTD_NOR_FLASH) gpio_request(GPIO_FN_MOSI_IO0, NULL); gpio_request(GPIO_FN_MISO_IO1, NULL); gpio_request(GPIO_FN_IO2, NULL); gpio_request(GPIO_FN_IO3, NULL); gpio_request(GPIO_FN_SPCLK, NULL); gpio_request(GPIO_FN_SSL, NULL); -#else /* CONFIG_SYS_NO_FLASH */ +#else /* CONFIG_MTD_NOR_FLASH */ gpio_request(GPIO_FN_A20, NULL); gpio_request(GPIO_FN_A21, NULL); gpio_request(GPIO_FN_A22, NULL); gpio_request(GPIO_FN_A23, NULL); gpio_request(GPIO_FN_A24, NULL); gpio_request(GPIO_FN_A25, NULL); -#endif /* CONFIG_SYS_NO_FLASH */ +#endif /* CONFIG_MTD_NOR_FLASH */ gpio_request(GPIO_FN_CS1_A26, NULL); gpio_request(GPIO_FN_EX_CS0, NULL); -- cgit v1.1