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 /board/atmel | |
| 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 'board/atmel')
| -rw-r--r-- | board/atmel/at91sam9263ek/at91sam9263ek.c | 8 | ||||
| -rw-r--r-- | board/atmel/sama5d3xek/sama5d3xek.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c index 04e5812..e4e32f6 100644 --- a/board/atmel/at91sam9263ek/at91sam9263ek.c +++ b/board/atmel/at91sam9263ek/at91sam9263ek.c @@ -166,14 +166,14 @@ static void at91sam9263ek_lcd_hw_init(void) #include <nand.h> #include <version.h> -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH extern flash_info_t flash_info[]; #endif void lcd_show_board_info(void) { ulong dram_size, nand_size; -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH ulong flash_size; #endif int i; @@ -192,7 +192,7 @@ void lcd_show_board_info(void) nand_size = 0; for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) nand_size += nand_info[i]->size; -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH flash_size = 0; for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) flash_size += flash_info[i].size; @@ -200,7 +200,7 @@ void lcd_show_board_info(void) lcd_printf (" %ld MB SDRAM, %ld MB NAND", dram_size >> 20, nand_size >> 20 ); -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH lcd_printf (",\n %ld MB NOR", flash_size >> 20); #endif diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c index fa90270..ce67478 100644 --- a/board/atmel/sama5d3xek/sama5d3xek.c +++ b/board/atmel/sama5d3xek/sama5d3xek.c @@ -68,7 +68,7 @@ void sama5d3xek_nand_hw_init(void) } #endif -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH static void sama5d3xek_nor_hw_init(void) { struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC; @@ -236,7 +236,7 @@ int board_init(void) #ifdef CONFIG_NAND_ATMEL sama5d3xek_nand_hw_init(); #endif -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH sama5d3xek_nor_hw_init(); #endif #ifdef CONFIG_CMD_USB |