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 --- common/Kconfig | 6 ------ common/board_r.c | 4 ++-- common/flash.c | 4 ++-- common/update.c | 10 +++++----- 4 files changed, 9 insertions(+), 15 deletions(-) (limited to 'common') diff --git a/common/Kconfig b/common/Kconfig index 9067d1e..8f73c8f 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -357,12 +357,6 @@ config DEFAULT_FDT_FILE help This option is used to set the default fdt file to boot OS. -config SYS_NO_FLASH - bool "Disable support for parallel NOR flash" - default n - help - This option is used to disable support for parallel NOR flash. - config VERSION_VARIABLE bool "add U-Boot environment variable vers" default n 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 diff --git a/common/flash.c b/common/flash.c index fa33f03..6d492c7 100644 --- a/common/flash.c +++ b/common/flash.c @@ -10,7 +10,7 @@ #include #include -#if !defined(CONFIG_SYS_NO_FLASH) +#if defined(CONFIG_MTD_NOR_FLASH) #include extern flash_info_t flash_info[]; /* info for FLASH chips */ @@ -221,4 +221,4 @@ void flash_perror (int err) /*----------------------------------------------------------------------- */ -#endif /* !CONFIG_SYS_NO_FLASH */ +#endif /* !CONFIG_MTD_NOR_FLASH */ diff --git a/common/update.c b/common/update.c index 1da80b7..0767fcb 100644 --- a/common/update.c +++ b/common/update.c @@ -13,8 +13,8 @@ #error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature" #endif -#if defined(CONFIG_UPDATE_TFTP) && defined(CONFIG_SYS_NO_FLASH) -#error "CONFIG_UPDATE_TFTP and CONFIG_SYS_NO_FLASH needed for legacy behaviour" +#if defined(CONFIG_UPDATE_TFTP) && !defined(CONFIG_MTD_NOR_FLASH) +#error "CONFIG_UPDATE_TFTP and !CONFIG_MTD_NOR_FLASH needed for legacy behaviour" #endif #include @@ -44,7 +44,7 @@ extern ulong tftp_timeout_ms; extern int tftp_timeout_count_max; extern ulong load_addr; -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH extern flash_info_t flash_info[]; static uchar *saved_prot_info; #endif @@ -96,7 +96,7 @@ static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr) return rv; } -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH static int update_flash_protect(int prot, ulong addr_first, ulong addr_last) { uchar *sp_info_ptr; @@ -172,7 +172,7 @@ static int update_flash_protect(int prot, ulong addr_first, ulong addr_last) static int update_flash(ulong addr_source, ulong addr_first, ulong size) { -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH ulong addr_last = addr_first + size - 1; /* round last address to the sector boundary */ -- cgit v1.1