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 /include | |
| parent | a931e9975bd8fa2a1866d560de6a388042d00f0b (diff) | |
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 'include')
241 files changed, 56 insertions, 494 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 2fdb869383..6b56fe7763 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -35,7 +35,6 @@ #define CONFIG_SPL_SKIP_RELOCATE #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE -#define CONFIG_SYS_NO_FLASH #endif #endif #endif @@ -46,7 +45,6 @@ #define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc -#define CONFIG_SYS_NO_FLASH #endif /* High Level Configuration Options */ @@ -109,7 +107,7 @@ #define CONFIG_ENV_OVERWRITE -#ifdef CONFIG_SYS_NO_FLASH +#ifndef CONFIG_MTD_NOR_FLASH #if !defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) && !defined(CONFIG_RAMBOOT_PBL) #define CONFIG_ENV_IS_NOWHERE #endif diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 41162349cf..3edf52ec08 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -147,7 +147,6 @@ extern unsigned long get_sdram_size(void); /* * IFC Definitions */ -#define CONFIG_SYS_NO_FLASH /* NAND Flash on IFC */ #define CONFIG_SYS_NAND_BASE 0xff800000 diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 942123b828..557f6ef427 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -219,9 +219,6 @@ combinations. this should be removed later */ /* NOR Flash on IFC */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_NO_FLASH -#endif #define CONFIG_SYS_FLASH_BASE 0x88000000 #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* Max number of sector: 32M */ @@ -570,7 +567,7 @@ combinations. this should be removed later /* * Dynamic MTD Partition support with mtdparts */ -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #define CONFIG_CMD_MTDPARTS diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 8f68748d87..b5d3737b2c 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -150,10 +150,6 @@ (0xf00000000ull | CONFIG_SYS_PLATFORM_SRAM_BASE) #define CONFIG_SYS_PLATFORM_SRAM_SIZE (512 << 10) -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_NO_FLASH -#endif - /* * IFC Definitions */ diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index 9754bbd899..cfa6c90ea8 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -277,14 +277,12 @@ * Environment is embedded in u-boot in the second sector of the flash */ #if !defined(CONFIG_SERIAL_BOOT) /*MRAM boot*/ -#define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_IS_IN_MRAM 1 #define CONFIG_ENV_ADDR (0x40000 - 0x1000) /*MRAM size 40000*/ #define CONFIG_ENV_SIZE 0x1000 #endif #if defined(CONFIG_CF_SBF) -#define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_IS_IN_SPI_FLASH 1 #define CONFIG_ENV_SPI_CS 1 #define CONFIG_ENV_OFFSET 0x40000 @@ -292,7 +290,6 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 #endif #if defined(CONFIG_SYS_NAND_BOOT) -#define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_OFFSET 0x80000 #define CONFIG_ENV_SIZE 0x20000 diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index fb8d51e241..01fa3aecb5 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -429,7 +429,6 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 #else - #define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 53f8a664c0..5226b7e124 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -301,7 +301,6 @@ #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x2000 #else - #define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index 3bc10aa532..3aa1cc9f23 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -385,7 +385,6 @@ #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x2000 #else - #define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 09f052452e..0e094659d2 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -444,7 +444,6 @@ #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #else - #define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index fcc1a73f81..5f6fc8e5b4 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -460,7 +460,6 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for environment */ #define CONFIG_ENV_SIZE 0x2000 #else - #define CONFIG_SYS_NO_FLASH /* Flash is not usable now */ #undef CONFIG_FLASH_CFI_DRIVER #define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 4239f779a2..7c1dcfbd9d 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -450,7 +450,6 @@ extern int board_pci_host_broken(void); #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 #else - #define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 370e381f98..a49b8115bb 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -462,7 +462,6 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for env */ #define CONFIG_ENV_SIZE 0x4000 #else - #define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE-0x1000) #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 3389a77bc1..8fb16e9dd2 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -296,7 +296,6 @@ #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 #else - #define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index e0d010a618..f27bdee156 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -337,7 +337,6 @@ #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 #else - #define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index cf574da7c3..a444a7895b 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -303,9 +303,6 @@ extern unsigned long get_sdram_size(void); * IFC Definitions */ /* NOR Flash on IFC */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_NO_FLASH -#endif #define CONFIG_SYS_FLASH_BASE 0xee000000 #define CONFIG_SYS_MAX_FLASH_SECT 256 /* 32M */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 3fad88f62c..480261bd43 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -24,7 +24,6 @@ #define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc -#define CONFIG_SYS_NO_FLASH #endif /* High Level Configuration Options */ @@ -56,7 +55,7 @@ #define CONFIG_ENV_OVERWRITE -#ifdef CONFIG_SYS_NO_FLASH +#ifndef CONFIG_MTD_NOR_FLASH #if !defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) #define CONFIG_ENV_IS_NOWHERE #endif diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index fcaa803c4e..275d898f60 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -44,7 +44,6 @@ #define CONFIG_SPL_SKIP_RELOCATE #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE -#define CONFIG_SYS_NO_FLASH #endif #ifdef CONFIG_NAND @@ -97,7 +96,7 @@ #define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc #endif -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE @@ -144,7 +143,6 @@ #define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc -#define CONFIG_SYS_NO_FLASH #endif #if defined(CONFIG_SPIFLASH) @@ -762,7 +760,7 @@ unsigned long get_board_ddr_clk(void); /* * Dynamic MTD Partition support with mtdparts */ -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #define CONFIG_CMD_MTDPARTS diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index e46bf007ad..e4646836d8 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -47,7 +47,6 @@ #define CONFIG_SPL_SKIP_RELOCATE #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE -#define CONFIG_SYS_NO_FLASH #endif #ifdef CONFIG_NAND @@ -112,7 +111,7 @@ #define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc #endif -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE @@ -159,7 +158,6 @@ #define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc -#define CONFIG_SYS_NO_FLASH #endif #if defined(CONFIG_SPIFLASH) @@ -773,7 +771,7 @@ unsigned long get_board_ddr_clk(void); /* * Dynamic MTD Partition support with mtdparts */ -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #define CONFIG_CMD_MTDPARTS diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 2d436c2900..6fd8827edc 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -63,7 +63,7 @@ #define CONFIG_ENV_OVERWRITE -#ifdef CONFIG_SYS_NO_FLASH +#ifndef CONFIG_MTD_NOR_FLASH #define CONFIG_ENV_IS_NOWHERE #else #define CONFIG_FLASH_CFI_DRIVER @@ -71,7 +71,7 @@ #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE #endif -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #if defined(CONFIG_SPIFLASH) #define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_IS_IN_SPI_FLASH @@ -99,7 +99,7 @@ #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ #endif -#else /* CONFIG_SYS_NO_FLASH */ +#else /* CONFIG_MTD_NOR_FLASH */ #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ #endif @@ -640,7 +640,7 @@ unsigned long get_board_ddr_clk(void); /* * Dynamic MTD Partition support with mtdparts */ -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #define CONFIG_CMD_MTDPARTS diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 9306b73408..b3e9c28fae 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -31,7 +31,6 @@ #define CONFIG_SPL_SKIP_RELOCATE #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE -#define CONFIG_SYS_NO_FLASH #endif #define RESET_VECTOR_OFFSET 0x27FFC #define BOOT_PAGE_OFFSET 0x27000 @@ -174,7 +173,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_ENV_OVERWRITE -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE @@ -825,7 +824,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg /* * Dynamic MTD Partition support with mtdparts */ -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #define CONFIG_CMD_MTDPARTS diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 0a65d0e864..ff6fc2df6f 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -51,7 +51,6 @@ #define CONFIG_SPL_SKIP_RELOCATE #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE -#define CONFIG_SYS_NO_FLASH #endif #ifdef CONFIG_NAND @@ -115,7 +114,6 @@ #define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc -#define CONFIG_SYS_NO_FLASH #endif #ifndef CONFIG_SYS_TEXT_BASE @@ -137,7 +135,7 @@ #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #endif -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE @@ -726,7 +724,7 @@ unsigned long get_board_ddr_clk(void); /* * Dynamic MTD Partition support with mtdparts */ -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #define CONFIG_CMD_MTDPARTS diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index f833732038..f9534b7ca0 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -45,7 +45,6 @@ #define CONFIG_SPL_SKIP_RELOCATE #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE -#define CONFIG_SYS_NO_FLASH #endif #ifdef CONFIG_NAND @@ -97,7 +96,6 @@ #define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc -#define CONFIG_SYS_NO_FLASH #endif #ifndef CONFIG_SYS_TEXT_BASE @@ -123,7 +121,7 @@ #define CONFIG_SYS_MEMTEST_END 0x00400000 #define CONFIG_SYS_ALT_MEMTEST -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE @@ -674,7 +672,7 @@ unsigned long get_board_ddr_clk(void); /* * Dynamic MTD Partition support with mtdparts */ -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #define CONFIG_CMD_MTDPARTS diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 2bcb362121..3ef647e203 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -60,7 +60,6 @@ #define CONFIG_SPL_SKIP_RELOCATE #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE -#define CONFIG_SYS_NO_FLASH #endif #endif @@ -72,7 +71,6 @@ #define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc -#define CONFIG_SYS_NO_FLASH #endif #define CONFIG_SRIO_PCIE_BOOT_MASTER @@ -80,7 +78,7 @@ #include "t4qds.h" -#ifdef CONFIG_SYS_NO_FLASH +#ifndef CONFIG_MTD_NOR_FLASH #if !defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) && !defined(CONFIG_RAMBOOT_PBL) #define CONFIG_ENV_IS_NOWHERE #endif diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index dbb9fd4da1..c35506c6e0 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -49,7 +49,6 @@ #define CONFIG_SPL_SKIP_RELOCATE #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE -#define CONFIG_SYS_NO_FLASH #endif #endif @@ -325,7 +324,7 @@ "setenv bootargs config-addr=0x60000000; " \ "bootm 0x01000000 - 0x00f00000" -#ifdef CONFIG_SYS_NO_FLASH +#ifndef CONFIG_MTD_NOR_FLASH #ifndef CONFIG_RAMBOOT_PBL #define CONFIG_ENV_IS_NOWHERE #endif diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 1736426f46..c05ee1cc04 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -247,7 +247,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (8 * 1024) diff --git a/include/configs/alt.h b/include/configs/alt.h index e338fa9558..d8a66f2d7d 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -43,7 +43,6 @@ #define CONFIG_SPI #define CONFIG_SH_QSPI #define CONFIG_SPI_FLASH_QUAD -#define CONFIG_SYS_NO_FLASH /* SH Ether */ #define CONFIG_SH_ETHER diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index d8e6ba3e4f..164beb1966 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -385,7 +385,6 @@ * 0x4C0000 - 0xFFFFFF : Userland (11 MiB + 256 KiB) */ #if defined(CONFIG_NOR) -#undef CONFIG_SYS_NO_FLASH #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE #define CONFIG_SYS_FLASH_PROTECTION #define CONFIG_SYS_FLASH_CFI diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index f1b82df456..18938bf7dc 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -113,7 +113,6 @@ #define CONFIG_CMD_NAND /* NAND support */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 100000 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 1062e20f6d..c98c663dc1 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -17,8 +17,6 @@ #define CONFIG_OMAP -#define CONFIG_SYS_NO_FLASH - #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ /* Common ARM Erratas */ diff --git a/include/configs/ap121.h b/include/configs/ap121.h index 1253e0a64c..88869fa6f7 100644 --- a/include/configs/ap121.h +++ b/include/configs/ap121.h @@ -19,8 +19,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_LOAD_ADDR 0x81000000 -#define CONFIG_SYS_NO_FLASH - #define CONFIG_SYS_INIT_RAM_ADDR 0xbd000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x8000 #define CONFIG_SYS_INIT_SP_ADDR \ diff --git a/include/configs/ap143.h b/include/configs/ap143.h index 99027e078e..4f3742be2d 100644 --- a/include/configs/ap143.h +++ b/include/configs/ap143.h @@ -19,8 +19,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_LOAD_ADDR 0x81000000 -#define CONFIG_SYS_NO_FLASH - #define CONFIG_SYS_INIT_RAM_ADDR 0xbd000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x2000 #define CONFIG_SYS_INIT_SP_ADDR \ diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 8e8892ef00..9c899e40b0 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -306,8 +306,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH +/* environment organization */ #define CONFIG_ENV_SIZE (8 * 1024) diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 504bf92ffb..513f9ee69f 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -22,7 +22,6 @@ /* * Enable the call to miscellaneous platform dependent initialization. */ -#define CONFIG_SYS_NO_FLASH /* * SPL diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h index e8729b93bc..5ae622c205 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -19,7 +19,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_APX4DEVKIT /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_CMD_DATE #define CONFIG_CMD_NAND diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 25b88f9798..361ada1fc7 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -76,7 +76,6 @@ #define CONFIG_SYS_TEXT_BASE 0xE80C0000 /* FLASH */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT #define CONFIG_SYS_FLASH_BASE 0x00000000 diff --git a/include/configs/aspenite.h b/include/configs/aspenite.h index 32647d9f5a..e6cddc13ac 100644 --- a/include/configs/aspenite.h +++ b/include/configs/aspenite.h @@ -29,7 +29,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 022353c7fb..f12e16cc43 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -148,9 +148,6 @@ #define CONFIG_GENERIC_ATMEL_MCI #endif -/* NOR flash - no real flash on this board */ -#define CONFIG_SYS_NO_FLASH 1 - /* Ethernet */ #define CONFIG_MACB 1 #define CONFIG_RMII 1 diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 67a721bc2d..263e92bd33 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -110,9 +110,6 @@ #endif -/* NOR flash - no real flash on this board */ -#define CONFIG_SYS_NO_FLASH - /* Ethernet */ #define CONFIG_DRIVER_DM9000 #define CONFIG_DM9000_BASE 0x30000000 diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 1fea328f14..f9d4043a71 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -234,9 +234,6 @@ AT91_WDT_MR_WDD(0xfff)) #endif - -#else -#define CONFIG_SYS_NO_FLASH 1 #endif /* NAND flash */ diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 8577a11f7c..1ea3231cfb 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -68,8 +68,6 @@ * Command line configuration. */ -/* No NOR flash */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_CMD_NAND /* SDRAM */ diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index c4ac21d351..339f53f558 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -56,9 +56,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME -/* NOR flash - no real flash on this board */ -#define CONFIG_SYS_NO_FLASH - /* * Command line configuration. */ diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 4d0e7b48f1..7fbbd54942 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -84,9 +84,6 @@ #define DATAFLASH_TCSS (0x1a << 16) #define DATAFLASH_TCHS (0x1 << 24) -/* NOR flash - not present */ -#define CONFIG_SYS_NO_FLASH 1 - /* NAND flash */ #ifdef CONFIG_CMD_NAND #define CONFIG_NAND_ATMEL diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 897ffa9a0a..730b9807db 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -52,9 +52,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME -/* no NOR flash */ -#define CONFIG_SYS_NO_FLASH - /* * Command line configuration. */ diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index 0707599a1c..c055c1aab6 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -42,7 +42,6 @@ /* * NAND Flash configuration */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_NAND_BASE (ARC_FPGA_PERIPHERAL_BASE + 0x16000) #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index e134f23ec9..6dd6f09662 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -549,7 +549,6 @@ DEFAULT_LINUX_BOOT_ENV \ * 0x4C0000 - 0xFFFFFF : Userland (11 MiB + 256 KiB) */ #if defined(CONFIG_NOR) -#undef CONFIG_SYS_NO_FLASH #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE #define CONFIG_SYS_FLASH_PROTECTION #define CONFIG_SYS_FLASH_CFI diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h index 8368e151a5..ce1b89db42 100644 --- a/include/configs/bcm23550_w1d.h +++ b/include/configs/bcm23550_w1d.h @@ -89,8 +89,6 @@ #define CONFIG_ENV_OFFSET (0x00011a00 * 512) #define CONFIG_ENV_SIZE (8 * 512) -#define CONFIG_SYS_NO_FLASH /* Not using NAND/NOR unmanaged flash */ - /* console configuration */ #define CONFIG_SYS_CBSIZE 1024 /* Console buffer size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index 299674ad49..5001ca6882 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -88,8 +88,6 @@ #define CONFIG_ENV_OFFSET (0x00011a00 * 512) #define CONFIG_ENV_SIZE (8 * 512) -#define CONFIG_SYS_NO_FLASH /* Not using NAND/NOR unmanaged flash */ - /* console configuration */ #define CONFIG_SYS_CBSIZE 1024 /* Console buffer size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index a1e7a8cc83..09b7351844 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -51,8 +51,6 @@ #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_IS_NOWHERE -#define CONFIG_SYS_NO_FLASH /* Not using NAND/NOR unmanaged flash */ - /* console configuration */ #define CONFIG_SYS_CBSIZE 1024 /* Console buffer size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h index 6948e20243..6cad00fd7c 100644 --- a/include/configs/bf506f-ezkit.h +++ b/include/configs/bf506f-ezkit.h @@ -60,7 +60,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 71 #define CONFIG_MONITOR_IS_IN_RAM */ -#define CONFIG_SYS_NO_FLASH /* * SPI Settings diff --git a/include/configs/bf525-ucr2.h b/include/configs/bf525-ucr2.h index f7a45e9fdd..b58c1db960 100644 --- a/include/configs/bf525-ucr2.h +++ b/include/configs/bf525-ucr2.h @@ -62,9 +62,6 @@ #define CONFIG_SYS_MONITOR_LEN (320 * 1024) #define CONFIG_SYS_MALLOC_LEN (320 * 1024) -/* We don't have a parallel flash chip */ -#define CONFIG_SYS_NO_FLASH - /* support for serial flash */ #define CONFIG_BFIN_SPI #define CONFIG_SF_DEFAULT_HZ 30000000 diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h index 2c7972043a..cabbe37121 100644 --- a/include/configs/bf537-minotaur.h +++ b/include/configs/bf537-minotaur.h @@ -84,12 +84,6 @@ #define CONFIG_ROOTPATH "/romfs" /* - * Flash Settings - */ -/* We don't have a parallel flash chip there */ -#define CONFIG_SYS_NO_FLASH - -/* * SPI Settings */ #define CONFIG_BFIN_SPI diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h index 6ad5682a19..4b23aa8ab8 100644 --- a/include/configs/bf537-srv1.h +++ b/include/configs/bf537-srv1.h @@ -84,12 +84,6 @@ #define CONFIG_ROOTPATH "/romfs" /* - * Flash Settings - */ -/* We don't have a parallel flash chip there */ -#define CONFIG_SYS_NO_FLASH - -/* * SPI Settings */ #define CONFIG_BFIN_SPI diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h index 76b891b377..3a4631e4fe 100644 --- a/include/configs/bf561-acvilon.h +++ b/include/configs/bf561-acvilon.h @@ -86,11 +86,6 @@ #define CONFIG_HOSTNAME bf561-acvilon /* - * Flash Settings - */ -#define CONFIG_SYS_NO_FLASH - -/* * I2C Settings */ #define CONFIG_HARD_I2C diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 72099bff97..5d61f99871 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -49,7 +49,7 @@ # if defined(CONFIG_SYS_I2C) || defined(CONFIG_SYS_I2C_SOFT) # define CONFIG_SOFT_I2C_READ_REPEATED_START # endif -# ifndef CONFIG_SYS_NO_FLASH +# ifdef CONFIG_MTD_NOR_FLASH # define CONFIG_CMD_JFFS2 # endif # ifdef CONFIG_CMD_JFFS2 diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h index fdb044d72d..40f1538789 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -10,7 +10,6 @@ #define CONFIG_MX28 /* i.MX28 SoC */ /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h index dc596fae3e..5044f73b06 100644 --- a/include/configs/blackstamp.h +++ b/include/configs/blackstamp.h @@ -214,11 +214,6 @@ #define CONFIG_EBIU_SDRRC_VAL 0x268 #define CONFIG_EBIU_SDGCTL_VAL 0x911109 -/* Even though Rev C boards have Parallel Flash - * We aren't supporting it. Newer versions of the - * hardware don't support Parallel Flash at all. - */ -#define CONFIG_SYS_NO_FLASH #undef CONFIG_CMD_JFFS2 #endif diff --git a/include/configs/blackvme.h b/include/configs/blackvme.h index d3dc216c5f..0b8f4c0428 100644 --- a/include/configs/blackvme.h +++ b/include/configs/blackvme.h @@ -218,10 +218,6 @@ # define CONFIG_SYS_I2C_SLAVE 0xFE #endif -/* - * No Parallel Flash on this board - */ -#define CONFIG_SYS_NO_FLASH #undef CONFIG_CMD_JFFS2 #endif diff --git a/include/configs/blanche.h b/include/configs/blanche.h index e040dbaede..cb80b90381 100755 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -39,8 +39,7 @@ #undef CONFIG_SYS_LOADS_BAUD_CHANGE /* FLASH */ -/* #define CONFIG_SYS_NO_FLASH */ /* uncomment if use QSPI-FLASH */ -#if defined(CONFIG_SYS_NO_FLASH) +#if !defined(CONFIG_MTD_NOR_FLASH) #define CONFIG_SYS_TEXT_BASE 0x40000000 #define CONFIG_SPI #define CONFIG_SH_QSPI @@ -80,7 +79,7 @@ #define CONFIG_SYS_TMU_CLK_DIV 4 /* ENV setting */ -#if defined(CONFIG_SYS_NO_FLASH) +#if !defined(CONFIG_MTD_NOR_FLASH) #else #undef CONFIG_ENV_IS_IN_SPI_FLASH #undef CONFIG_ENV_ADDR diff --git a/include/configs/br4.h b/include/configs/br4.h index 16e4a1d4e2..64b379a979 100644 --- a/include/configs/br4.h +++ b/include/configs/br4.h @@ -67,11 +67,6 @@ #define CONFIG_TFTP_BLOCKSIZE 4404 /* - * Flash Settings - */ -#define CONFIG_SYS_NO_FLASH /* We have no parallel FLASH */ - -/* * SPI Settings */ #define CONFIG_BFIN_SPI diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 7afffa2ec6..9a39f488bd 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -22,8 +22,6 @@ #define CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC /* enable 32kHz OSC at bootime */ #define CONFIG_POWER_TPS65217 -#define CONFIG_SYS_NO_FLASH /* have no NOR-flash */ - #include <asm/arch/omap.h> /* NS16550 Configuration */ diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index a544223f7e..0c51d2a288 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -24,7 +24,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_CMD_ENV #define CONFIG_CMD_PCI diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 017a8bd47f..d244824f9c 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -102,7 +102,6 @@ #define CONFIG_CMD_NAND /* NAND support */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 100000 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1 diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index da866e4fba..bfd3b50f40 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -111,7 +111,6 @@ #define CONFIG_CMD_NAND /* NAND support */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 400000 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1 diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index c4765ebc77..2fbadf2522 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -274,9 +274,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* environment organization */ #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 7866f623ca..3da4211e9b 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -151,8 +151,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH +/* environment organization */ #define CONFIG_ENV_IS_IN_NAND #if defined(CONFIG_ENV_IS_IN_MMC) diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 51f7877908..4f05fab440 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -146,7 +146,6 @@ #define CONFIG_ENV_IS_IN_FLASH 1 #else /* No flash */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_IS_NOWHERE #endif diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index e0feb0a152..bfd5fbd8d7 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -174,7 +174,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* Environment organization */ -#define CONFIG_SYS_NO_FLASH #ifdef CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 @@ -188,8 +187,6 @@ #define CONFIG_ENV_OFFSET (12 * 64 * 2048) #endif -#define CONFIG_SYS_NO_FLASH - /* USB Host Support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_VF diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index cc2b2736f4..5bd66d8455 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -38,7 +38,6 @@ #define CONFIG_CONTROLCENTERD #define CONFIG_MP /* support multiple processors */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_ENABLE_36BIT_PHYS #ifdef CONFIG_PHYS_64BIT diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index dd38fa3511..8bed3e3022 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -42,7 +42,6 @@ #define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc -#define CONFIG_SYS_NO_FLASH #endif /* High Level Configuration Options */ @@ -67,7 +66,7 @@ #define CONFIG_ENV_OVERWRITE -#ifdef CONFIG_SYS_NO_FLASH +#ifndef CONFIG_MTD_NOR_FLASH #if !defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) && !defined(CONFIG_RAMBOOT_PBL) #define CONFIG_ENV_IS_NOWHERE #endif diff --git a/include/configs/corvus.h b/include/configs/corvus.h index e78f5110ec..3a01a2b48a 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -74,9 +74,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + SZ_4K - GENERATED_GBL_DATA_SIZE) -/* No NOR flash */ -#define CONFIG_SYS_NO_FLASH - /* NAND flash */ #ifdef CONFIG_CMD_NAND #define CONFIG_NAND_ATMEL diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 3f195ab413..0f0a075508 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -56,8 +56,6 @@ #define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_NO_FLASH - #if defined(CONFIG_SDCARD) #define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index ecefa979f5..42f54ef759 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -165,7 +165,6 @@ #ifdef CONFIG_USE_NAND #undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_NAND_DAVINCI -#define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 10) @@ -242,7 +241,6 @@ #define CONFIG_ENV_SIZE (64 << 10) #define CONFIG_ENV_OFFSET (512 << 10) #define CONFIG_ENV_SECT_SIZE (64 << 10) -#define CONFIG_SYS_NO_FLASH #endif /* @@ -305,7 +303,6 @@ !defined(CONFIG_USE_NOR) && \ !defined(CONFIG_USE_SPIFLASH) #define CONFIG_ENV_IS_NOWHERE -#define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_SIZE (16 << 10) #undef CONFIG_CMD_ENV #endif diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index 282d5e88bc..6e2561cb5a 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -23,7 +23,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_CMD_ENV /* I2C */ diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index 6d057762e3..ba5c0901b1 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -24,7 +24,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_CMD_ENV #define CONFIG_CMD_PCI diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 1fdeeddc5b..700fb5ed3e 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -24,7 +24,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_CMD_ENV #define CONFIG_CMD_PCI #define CONFIG_SCSI diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 656c8c3a01..fc8a3ec7dc 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -25,7 +25,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_CMD_ENV #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 1f06e5832f..c907d82b55 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -28,7 +28,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_CMD_ENV #define CONFIG_CMD_NAND #define CONFIG_CMD_IDE diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index 781a8b573f..69429ed34e 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -23,7 +23,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_CMD_ENV #define CONFIG_CMD_NAND /* diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index bf8c041fb7..549439e8b4 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -232,7 +232,6 @@ #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT #define CONFIG_SYS_FLASH_SIZE (64 * 1024 * 1024) /* 64 MB */ /* #define CONFIG_INIT_IGNORE_ERROR */ -#undef CONFIG_SYS_NO_FLASH #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE #define CONFIG_SYS_FLASH_PROTECTION #define CONFIG_SYS_FLASH_CFI diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 9b7f43f134..7f0742abbb 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -120,7 +120,6 @@ REFLASH(dragonboard/u-boot.img, 8)\ #define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_VARS_UBOOT_CONFIG -#define CONFIG_SYS_NO_FLASH /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_8M) diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 9d5a5f74f3..d1d4bf0156 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -23,7 +23,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_CMD_ENV /* I2C */ diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 8319dc4d34..a9eb6bcb80 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -95,7 +95,6 @@ #define CONFIG_ENV_SIZE (8 << 10) #define CONFIG_ENV_OFFSET 0x80000 #define CONFIG_ENV_SECT_SIZE (64 << 10) -#define CONFIG_SYS_NO_FLASH #endif #if defined(CONFIG_VIDEO) @@ -173,7 +172,6 @@ !defined(CONFIG_USE_NOR) && \ !defined(CONFIG_USE_SPIFLASH) #define CONFIG_ENV_IS_NOWHERE -#define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_SIZE (16 << 10) #undef CONFIG_CMD_ENV #endif diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index 484565c9aa..2f4219fff6 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -115,8 +115,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH +/* environment organization */ #define CONFIG_ENV_SIZE (8 * 1024) diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 6f57b21b30..7a40c98888 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -53,9 +53,6 @@ /* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - #include <config_distro_defaults.h> #endif /* __CONFIG_H */ diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h index 4d73b9331f..822654351c 100644 --- a/include/configs/exynos7420-common.h +++ b/include/configs/exynos7420-common.h @@ -33,9 +33,6 @@ /* select serial console configuration */ #define CONFIG_BAUDRATE 115200 -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - /* Timer input clock frequency */ #define COUNTER_FREQUENCY 24000000 diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index a2adbeba74..d8af90d9d0 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -276,9 +276,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* environment organization */ #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_OFFSET (768 * 1024) diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index c17c5e9750..f36f34040f 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -42,7 +42,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_CMD_ENV #define CONFIG_CMD_NAND diff --git a/include/configs/gose.h b/include/configs/gose.h index 15b3227a77..8956841fbe 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -41,7 +41,6 @@ #define CONFIG_SCIF_CONSOLE /* FLASH */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_SPI #define CONFIG_SH_QSPI diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 5639a45b37..3ec7649a1d 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -36,7 +36,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ /* Disable DCACHE */ #define CONFIG_SYS_DCACHE_OFF diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h index 7f6586fa0e..c2655552f1 100644 --- a/include/configs/gr_cpci_ax2000.h +++ b/include/configs/gr_cpci_ax2000.h @@ -163,7 +163,6 @@ * 0xFF000000 for 16 MB * 0xFF800000 for 8 MB */ -/*#define CONFIG_SYS_NO_FLASH 1*/ #define CONFIG_SYS_FLASH_BASE 0x00000000 #define CONFIG_SYS_FLASH_SIZE 0x00800000 diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h index 4d28a97012..0d513c5519 100644 --- a/include/configs/gr_ep2s60.h +++ b/include/configs/gr_ep2s60.h @@ -146,7 +146,6 @@ * 0xFF000000 for 16 MB * 0xFF800000 for 8 MB */ -/*#define CONFIG_SYS_NO_FLASH 1*/ #define CONFIG_SYS_FLASH_BASE 0x00000000 #define CONFIG_SYS_FLASH_SIZE 0x00400000 /* FPGA Bit file is in top of FLASH, we only ues the bottom 4Mb */ diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h index b91ab850aa..20eeab33d9 100644 --- a/include/configs/gr_xc3s_1500.h +++ b/include/configs/gr_xc3s_1500.h @@ -127,7 +127,6 @@ * 0xFF000000 for 16 MB * 0xFF800000 for 8 MB */ -/*#define CONFIG_SYS_NO_FLASH 1*/ #define CONFIG_SYS_FLASH_BASE 0x00000000 #define CONFIG_SYS_FLASH_SIZE 0x00800000 diff --git a/include/configs/grsim.h b/include/configs/grsim.h index 8c1c8b471e..18b8d3cbcb 100644 --- a/include/configs/grsim.h +++ b/include/configs/grsim.h @@ -139,7 +139,6 @@ * 0xFF000000 for 16 MB * 0xFF800000 for 8 MB */ -#define CONFIG_SYS_NO_FLASH 1 #define CONFIG_SYS_FLASH_BASE 0x00000000 #define CONFIG_SYS_FLASH_SIZE 0x00800000 #define CONFIG_ENV_SIZE 0x8000 diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h index 3651017aa9..ba570c38a9 100644 --- a/include/configs/grsim_leon2.h +++ b/include/configs/grsim_leon2.h @@ -134,7 +134,6 @@ * 0xFF000000 for 16 MB * 0xFF800000 for 8 MB */ -#define CONFIG_SYS_NO_FLASH 1 #define CONFIG_SYS_FLASH_BASE 0x00000000 #define CONFIG_SYS_FLASH_SIZE 0x00800000 #define CONFIG_ENV_SIZE 0x8000 diff --git a/include/configs/h2200.h b/include/configs/h2200.h index e22cf09c44..0891b02d35 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -14,8 +14,6 @@ #define CONFIG_CPU_PXA25X 1 #define CONFIG_BOARD_H2200 -#define CONFIG_SYS_NO_FLASH - #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 0xa0000000 /* SDRAM Bank #1 */ #define PHYS_SDRAM_1_SIZE 0x04000000 /* 64 MB */ diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 5cefddc2e0..b47624ad3f 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -12,8 +12,6 @@ #define CONFIG_SYS_DCACHE_OFF #define CONFIG_SYS_THUMB_BUILD -#define CONFIG_SYS_NO_FLASH - #define CONFIG_SYS_BOOTMAPSZ (16 << 20) #define CONFIG_SYS_TIMER_RATE (150000000/256) diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 899d62de26..d3492d5770 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -127,6 +127,4 @@ #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_MAXARGS 64 /* max command args */ -#define CONFIG_SYS_NO_FLASH - #endif /* __HIKEY_H */ diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 5528dfc810..9f5029a122 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -217,8 +217,6 @@ #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT #define CONFIG_FLASH_CFI_LEGACY #define CONFIG_SYS_FLASH_LEGACY_512Kx16 -#else -#define CONFIG_SYS_NO_FLASH #endif #define CONFIG_SYS_FLASH_BASE 0xFE000000 /* FLASH base address */ diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index ec209a1c9b..2cf0027d9c 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -28,7 +28,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* declare no flash (NOR/SPI) */ #define CONFIG_SYS_MVFS #define CONFIG_CMD_IDE diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index 633941b7dd..950a7195fd 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -31,7 +31,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* declare no flash (NOR/SPI) */ #define CONFIG_SYS_MVFS #define CONFIG_CMD_ENV #define CONFIG_CMD_NAND diff --git a/include/configs/imgtec_xilfpga.h b/include/configs/imgtec_xilfpga.h index 0a7fe60214..e5f682c874 100644 --- a/include/configs/imgtec_xilfpga.h +++ b/include/configs/imgtec_xilfpga.h @@ -42,11 +42,6 @@ */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -/*------------------------------------------------- - * FLASH configuration - */ -#define CONFIG_SYS_NO_FLASH - /*------------------------------------------------------------ * Console Configuration */ diff --git a/include/configs/ip04.h b/include/configs/ip04.h index 4a9093c469..ff8d432950 100644 --- a/include/configs/ip04.h +++ b/include/configs/ip04.h @@ -77,7 +77,6 @@ * Flash Settings */ #define CONFIG_ENV_OVERWRITE 1 -#define CONFIG_SYS_NO_FLASH /* we have only NAND */ /* * SPI Settings diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 74dad5fc2d..d0316221b0 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -140,7 +140,6 @@ * Flash & Environment */ #define CONFIG_NAND_DAVINCI -#define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 10) diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 33b6a987ae..76642d9089 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -79,12 +79,6 @@ #define CONFIG_I2C_MULTI_BUS /* - * Flash - */ - -#define CONFIG_SYS_NO_FLASH - -/* * Power */ 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 @@ -121,11 +121,6 @@ #define CONFIG_CMD_MTDPARTS /* - * Without NOR FLASH we need this - */ -#define CONFIG_SYS_NO_FLASH - -/* * NAND Flash configuration */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 @@ -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 diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 6371c5b906..1ca564f983 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -41,7 +41,6 @@ #define CONFIG_SCIF_CONSOLE /* FLASH */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_SPI #define CONFIG_SH_QSPI diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 61e658c66a..9e9d879541 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -43,7 +43,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_CMD_ENV #define CONFIG_CMD_IDE #ifndef CONFIG_NETSPACE_MINI_V2 /* No USB ports on Network Space v2 Mini */ diff --git a/include/configs/lager.h b/include/configs/lager.h index f30cc16e91..b619d153c9 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -43,7 +43,6 @@ /* SPI */ #define CONFIG_SPI #define CONFIG_SH_QSPI -#define CONFIG_SYS_NO_FLASH /* SH Ether */ #define CONFIG_SH_ETHER diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 1d4e7cd6fc..0435124a43 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -210,7 +210,6 @@ #endif #define CONFIG_ENV_IS_NOWHERE -#define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_SIZE (16 << 10) /* additions for new relocation code, must added to all boards */ diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 0965afafb1..e556c925fe 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -11,7 +11,6 @@ #define CONFIG_GICV2 #include <asm/arch/config.h> -#define CONFIG_SYS_NO_FLASH #define CONFIG_SUPPORT_RAW_INITRD diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 4941c2ebc8..c4ee23eb1b 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -107,17 +107,12 @@ #define CONFIG_SPL_BSS_START_ADDR 0x80100000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 #define CONFIG_SYS_MONITOR_LEN 0x80000 -#define CONFIG_SYS_NO_FLASH #endif #ifdef CONFIG_QSPI_BOOT #define CONFIG_SYS_TEXT_BASE 0x40010000 #endif -#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) -#define CONFIG_SYS_NO_FLASH -#endif - #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000UL diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 5c9b41f2e7..774a1de961 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -79,10 +79,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_TEXT_BASE 0x40010000 #endif -#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) -#define CONFIG_SYS_NO_FLASH -#endif - #ifdef CONFIG_NAND_BOOT #define CONFIG_SYS_FSL_PBL_RCW board/freescale/ls1021aqds/ls102xa_rcw_nand.cfg #define CONFIG_SPL_FRAMEWORK diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 25e3f92cf5..c49ad363bc 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -143,10 +143,6 @@ #define CONFIG_SYS_TEXT_BASE 0x40010000 #endif -#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) -#define CONFIG_SYS_NO_FLASH -#endif - #ifndef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0x60100000 #endif diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index ea7067c6ae..c4b05e0e63 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -95,7 +95,7 @@ #define CONFIG_SYS_FLASH_BASE_PHYS CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_FLASH_BASE_PHYS_EARLY 0x00000000 -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 98da408c99..f3b521d705 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -212,7 +212,6 @@ unsigned long get_board_ddr_clk(void); #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_QIXIS_I2C_ACCESS #define CONFIG_SYS_I2C_EARLY_INIT -#define CONFIG_SYS_NO_FLASH #endif /* diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 0e648b1ac8..cba22ca2b6 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -118,7 +118,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_FLASH_BASE_PHYS CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_FLASH_BASE_PHYS_EARLY 0x00000000 -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE @@ -267,7 +267,6 @@ unsigned long get_board_ddr_clk(void); #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_QIXIS_I2C_ACCESS #define CONFIG_SYS_I2C_EARLY_INIT -#define CONFIG_SYS_NO_FLASH #endif /* diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 0168f96462..a96aa650f7 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -49,9 +49,6 @@ #endif #endif -/* No NOR flash */ -#define CONFIG_SYS_NO_FLASH - /* IFC */ #define CONFIG_FSL_IFC diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 7aef43fac2..4bfd0ac4af 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -32,10 +32,6 @@ #endif #endif -#ifdef CONFIG_EMU -#define CONFIG_SYS_NO_FLASH -#endif - #define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h index 5dd0a1d3cb..de9db4abb4 100644 --- a/include/configs/ls2080a_simu.h +++ b/include/configs/ls2080a_simu.h @@ -28,7 +28,7 @@ #define CONFIG_SYS_NOR0_CSPR_EXT (0x0) #define CONFIG_SYS_NOR_AMASK IFC_AMASK(128*1024*1024) -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE @@ -60,7 +60,7 @@ #define CONFIG_SYS_NOR_FTIM3 0x04000000 #define CONFIG_SYS_IFC_CCR 0x01000000 -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 9ad8486df4..08d1586867 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -15,7 +15,6 @@ unsigned long get_board_ddr_clk(void); #endif #ifdef CONFIG_FSL_QSPI -#define CONFIG_SYS_NO_FLASH #undef CONFIG_CMD_IMLS #define CONFIG_QIXIS_I2C_ACCESS #define CONFIG_SYS_I2C_EARLY_INIT @@ -100,7 +99,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NOR_FTIM3 0x04000000 #define CONFIG_SYS_IFC_CCR 0x01000000 -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index db9ad157ac..408140f4e8 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -99,7 +99,7 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_NOR_FTIM3 0x04000000 #define CONFIG_SYS_IFC_CCR 0x01000000 -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index ad1adcec8c..ce6d7c9998 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -35,8 +35,6 @@ #define CONFIG_KIRKWOOD_GPIO -#define CONFIG_SYS_NO_FLASH - /* * Commands configuration */ diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index e39fbbae37..7f98f1f8a8 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -14,7 +14,6 @@ #define CONFIG_TIMESTAMP /* Print image info with timestamp */ /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_FAT_WRITE #define CONFIG_CMD_BMP diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index df7321f1b5..56fb6020f4 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -14,7 +14,6 @@ #include <asm/arch/imx-regs.h> #define CONFIG_REVISION_TAG -#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_FSL_CLK #define CONFIG_TIMESTAMP /* Print image info with timestamp */ diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index aed0f4b65f..a5db11ce12 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -8,8 +8,6 @@ #ifndef __MA5D4EVK_CONFIG_H__ #define __MA5D4EVK_CONFIG_H__ -#define CONFIG_SYS_NO_FLASH - #define CONFIG_TIMESTAMP /* Print image info with timestamp */ #include "at91-sama5_common.h" diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index 9f4308f1f2..cdb3a473ea 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -23,7 +23,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_CMD_ENV /* I2C */ diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index e7223fb714..8f1eddfd62 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -63,7 +63,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#undef CONFIG_SYS_NO_FLASH /* NOR 16-bit mode */ #define CONFIG_SYS_FLASH_BASE WEIM_ARB_BASE_ADDR #define CONFIG_SYS_FLASH_PROTECTION diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 5160758382..ef44110ee6 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -103,7 +103,6 @@ #define CONFIG_MTD_DEVICE #define CONFIG_CMD_MTDPARTS -#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 100000 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1 diff --git a/include/configs/meesc.h b/include/configs/meesc.h index af8bf3ad8e..63881c5e6f 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -111,9 +111,6 @@ # define DATAFLASH_TCHS (0x1 << 24) #endif -/* NOR flash is not populated, disable it */ -#define CONFIG_SYS_NO_FLASH - /* NAND flash */ #ifdef CONFIG_CMD_NAND # define CONFIG_NAND_ATMEL diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index 17e81b4540..cc2b5b61d4 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -10,7 +10,6 @@ #define CONFIG_CPU_ARMV8 #define CONFIG_REMAKE_ELF -#define CONFIG_SYS_NO_FLASH #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 24de528ba5..370481b8cf 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -111,7 +111,6 @@ #else /* !FLASH */ #ifdef SPIFLASH -# define CONFIG_SYS_NO_FLASH 1 # define CONFIG_SYS_SPI_BASE XILINX_SPI_FLASH_BASEADDR # define CONFIG_SPI 1 # define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 @@ -137,7 +136,6 @@ #else /* !SPIFLASH */ /* ENV in RAM */ -# define CONFIG_SYS_NO_FLASH 1 # define CONFIG_ENV_IS_NOWHERE 1 # define CONFIG_ENV_SIZE 0x1000 # define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE) diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h index bf583d0830..2e43fab1ef 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -28,7 +28,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_CMD_DATE #define CONFIG_CMD_ENV #define CONFIG_CMD_IDE diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index ebc7fca3d1..db1ba0de65 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -77,7 +77,6 @@ #define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE /* Environment in SPI NOR flash */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET 0x180000 /* as Marvell U-Boot version */ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ diff --git a/include/configs/mvebu_db-88f3720.h b/include/configs/mvebu_db-88f3720.h index 829f6938b1..753ed1e396 100644 --- a/include/configs/mvebu_db-88f3720.h +++ b/include/configs/mvebu_db-88f3720.h @@ -80,7 +80,6 @@ #define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE /* Environment in SPI NOR flash */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET 0x180000 /* as Marvell U-Boot version */ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index 015d24618a..cccc3a8ab0 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -11,7 +11,6 @@ #define CONFIG_MACH_TYPE 4105 /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH /* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index 4494bf6b4b..d485445875 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -14,7 +14,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_MX23EVK /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH /* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index 528b193d70..f787376221 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -59,7 +59,6 @@ #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 85ea54a91b..33c9e95dec 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -16,7 +16,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_MX28EVK /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_CMD_DATE #define CONFIG_CMD_NAND diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index e351f05c06..f0cdebe340 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -126,12 +126,9 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE) -/*----------------------------------------------------------------------- - * FLASH and environment organization +/* + * environment organization */ -/* No NOR flash present */ -#define CONFIG_SYS_NO_FLASH - #define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_OFFSET_REDUND 0x60000 diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 1f99a61b0d..292fa86162 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -219,10 +219,8 @@ #define CONFIG_SYS_MAIN_PWR_ON /*----------------------------------------------------------------------- - * FLASH and environment organization + * environment organization */ -#define CONFIG_SYS_NO_FLASH - #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index c17d976354..d67ba851c7 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -196,9 +196,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* environment organization */ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 03e9a2abe0..a103ee47ab 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -171,9 +171,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* environment organization */ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index 839c8ccfae..251b6f0c37 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -144,9 +144,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* environment organization */ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index c7ab295899..7cd750c72a 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -187,9 +187,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* environment organization */ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index 3ac89f2fc2..e7c3a1dcc2 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -134,9 +134,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* environment organization */ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index cdf46f016e..39d64189d3 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -23,8 +23,6 @@ #define CONFIG_BOARD_POSTCLK_INIT #define CONFIG_MXC_GPT_HCLK -#define CONFIG_SYS_NO_FLASH - #define CONFIG_SYS_BOOTM_LEN 0x1000000 #include <linux/sizes.h> diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index 7d68633c78..ef7675c688 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -29,7 +29,6 @@ #include "mx6sabre_common.h" -#undef CONFIG_SYS_NO_FLASH #define CONFIG_SYS_FLASH_BASE WEIM_ARB_BASE_ADDR #define CONFIG_SYS_FLASH_SECT_SIZE (128 * 1024) #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index f84bff9ff4..71c22fffa8 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -165,9 +165,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* environment organization */ #define CONFIG_ENV_SIZE SZ_8K #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (8 * SZ_64K) diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index b56482427f..c65a9e5474 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -152,9 +152,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* environment organization */ #define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 4aa360288a..81d769f21f 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -193,8 +193,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH +/* environment organization */ #define CONFIG_ENV_SIZE SZ_8K #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 96bf833f94..476825ecf1 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -41,7 +41,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_CMD_NAND #define CONFIG_CMD_DATE #define CONFIG_CMD_IDE diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 7e2f9925c3..e17c3c0a1d 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -107,8 +107,6 @@ #define CONFIG_USBD_MANUFACTURER "Nokia" #define CONFIG_USBD_PRODUCT_NAME "N900" -#define CONFIG_SYS_NO_FLASH - /* commands to include */ #define CONFIG_CMDLINE_EDITING /* add command line history */ diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index 366ee55dbe..eba31c4abf 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -24,7 +24,6 @@ #define CONFIG_LZMA /* commands configuration */ -#define CONFIG_SYS_NO_FLASH /* declare no flash (NOR/SPI) */ #define CONFIG_SYS_MVFS #define CONFIG_CMD_IDE diff --git a/include/configs/nsim.h b/include/configs/nsim.h index 1edc56046b..e8049162e0 100644 --- a/include/configs/nsim.h +++ b/include/configs/nsim.h @@ -30,8 +30,6 @@ #define CONFIG_SYS_BOOTM_LEN SZ_32M #define CONFIG_SYS_LOAD_ADDR 0x82000000 -#define CONFIG_SYS_NO_FLASH - /* * UART configuration * diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 8ed5602bc9..6a57ebdd11 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -314,7 +314,6 @@ * Board specific * ----------------------------------------------------------------------------- */ -#define CONFIG_SYS_NO_FLASH /* Uncomment to define the board revision statically */ /* #define CONFIG_STATIC_BOARD_REV OMAP3EVM_BOARD_GEN_2 */ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 8114de814b..76d66a0590 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -158,7 +158,6 @@ #ifdef CONFIG_USE_NAND #undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_NAND_DAVINCI -#define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 9) @@ -203,7 +202,6 @@ #ifdef CONFIG_SYS_USE_NOR #define CONFIG_ENV_IS_IN_FLASH -#undef CONFIG_SYS_NO_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_PROTECTION @@ -225,7 +223,6 @@ #define CONFIG_ENV_SIZE (64 << 10) #define CONFIG_ENV_OFFSET (256 << 10) #define CONFIG_ENV_SECT_SIZE (64 << 10) -#define CONFIG_SYS_NO_FLASH #endif /* @@ -318,7 +315,6 @@ !defined(CONFIG_SYS_USE_NOR) && \ !defined(CONFIG_USE_SPIFLASH) #define CONFIG_ENV_IS_NOWHERE -#define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_SIZE (16 << 10) #undef CONFIG_CMD_ENV #endif diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 51e4d90a2e..14cf3b43a2 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -26,7 +26,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_SYS_MVFS #define CONFIG_CMD_ENV #define CONFIG_CMD_NAND diff --git a/include/configs/openrisc-generic.h b/include/configs/openrisc-generic.h index 9decae76d6..7b2ce789cc 100644 --- a/include/configs/openrisc-generic.h +++ b/include/configs/openrisc-generic.h @@ -24,7 +24,6 @@ #define CONFIG_BOARD_NAME "OpenRISC Generic" -#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_MAX_FLASH_SECT 0 /* diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 283abfa726..49090498da 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -251,9 +251,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* environment organization */ #ifdef CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_SIZE (8 * 1024) diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index ffd1b28cba..6c7539f04a 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -56,11 +56,6 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMD_CLK -/*------------------------------------------------- - * FLASH configuration - */ -#define CONFIG_SYS_NO_FLASH - /*------------------------------------------------------------ * Console Configuration */ diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 63bd11ca46..8ad7fa620d 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -144,9 +144,7 @@ #define CONFIG_POWER_PFUZE3000 #define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* environment organization */ #define CONFIG_ENV_SIZE SZ_8K #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (8 * SZ_64K) diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index 327db73dd3..762308991e 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -74,9 +74,6 @@ * Command line configuration. */ -/* No NOR flash */ -#define CONFIG_SYS_NO_FLASH - /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 ATMEL_BASE_CS1 /* on DDRSDRC1 */ diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 3ec8ee102b..c3a07f7352 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -81,9 +81,6 @@ #define PHYS_SDRAM 0x70000000 #define PHYS_SDRAM_SIZE 0x08000000 /* 128 megs */ -/* NOR flash, not available */ -#define CONFIG_SYS_NO_FLASH 1 - /* NAND flash */ #ifdef CONFIG_CMD_NAND #define CONFIG_NAND_ATMEL diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index e06caf617e..36f6e95ced 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -28,7 +28,6 @@ /* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_SYS_MVFS #define CONFIG_CMD_ENV #define CONFIG_CMD_NAND diff --git a/include/configs/porter.h b/include/configs/porter.h index ed3125de90..fabab73680 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -44,7 +44,6 @@ #define CONFIG_SPI #define CONFIG_SH_QSPI #define CONFIG_SPI_FLASH_QUAD -#define CONFIG_SYS_NO_FLASH /* SH Ether */ #define CONFIG_SH_ETHER diff --git a/include/configs/pr1.h b/include/configs/pr1.h index 6804acb0cd..500d7156c7 100644 --- a/include/configs/pr1.h +++ b/include/configs/pr1.h @@ -67,11 +67,6 @@ #define CONFIG_TFTP_BLOCKSIZE 4404 /* - * Flash Settings - */ -#define CONFIG_SYS_NO_FLASH /* We have no parallel FLASH */ - -/* * SPI Settings */ #define CONFIG_BFIN_SPI diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index c715d6d9e5..234fc694d9 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -67,8 +67,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); #define CONFIG_SYS_CLK_FREQ 33000000 -#define CONFIG_SYS_NO_FLASH - #define CONFIG_SYS_BOOT_BLOCK 0x00000000 /* boot TLB */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index cf2f20b506..318a52c3ed 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -9,7 +9,6 @@ #include <asm/arch/hardware.h> #include "rockchip-common.h" -#define CONFIG_SYS_NO_FLASH #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index ff8a6ece4a..b5606d463c 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -11,7 +11,6 @@ #include "rockchip-common.h" #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY -#define CONFIG_SYS_NO_FLASH #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MAXARGS 16 diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index ab8bfd188e..ce64476c2e 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -9,7 +9,6 @@ #include "rockchip-common.h" -#define CONFIG_SYS_NO_FLASH #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MAXARGS 16 diff --git a/include/configs/rpi.h b/include/configs/rpi.h index a545850668..e293f2ed31 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -63,9 +63,6 @@ #define CONFIG_SYS_MEMTEST_END 0x00200000 #define CONFIG_LOADADDR 0x00200000 -/* Flash */ -#define CONFIG_SYS_NO_FLASH - /* Devices */ /* GPIO */ #define CONFIG_BCM2835_GPIO diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index 33490c2869..33ff6d5749 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -227,9 +227,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* environment organization */ #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 472c366972..e9dc57d647 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -52,8 +52,6 @@ /* PWM */ #define CONFIG_PWM 1 -#define CONFIG_SYS_NO_FLASH 1 - #define CONFIG_CMD_REGINFO #define CONFIG_CMD_ONENAND diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index d1d615c8a7..81a7226d62 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -24,7 +24,6 @@ /* [A] Hyper Flash */ /* use to RPC(SPI Multi I/O Bus Controller) */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_IS_NOWHERE /* Board Clock */ diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h index 6fbd05398b..16bafc0990 100644 --- a/include/configs/sama5d2_ptc.h +++ b/include/configs/sama5d2_ptc.h @@ -10,9 +10,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* No NOR flash, this definition should put before common header */ -#define CONFIG_SYS_NO_FLASH - #include "at91-sama5_common.h" /* serial console */ diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index 8e7358687a..ccbcc765c3 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -10,9 +10,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* No NOR flash, this definition should put before common header */ -#define CONFIG_SYS_NO_FLASH - #include "at91-sama5_common.h" #define CONFIG_MISC_INIT_R diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index 2a8b8a1a6e..3c9f49e426 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -10,9 +10,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* No NOR flash, this definition should put before common header */ -#define CONFIG_SYS_NO_FLASH - #include "at91-sama5_common.h" /* serial console */ diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 05e96f9fc4..13790e7244 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -13,10 +13,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* - * If has No NOR flash, please put the definition: CONFIG_SYS_NO_FLASH - * before the common header. - */ #include "at91-sama5_common.h" #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG @@ -51,7 +47,7 @@ #define CONFIG_SAMA5D3_LCD_BASE 0x23E00000 /* NOR flash */ -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_PROTECTION diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index a017b26f87..55f10ad1f0 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -10,9 +10,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* No NOR flash, this definition should put before common header */ -#define CONFIG_SYS_NO_FLASH - #include "at91-sama5_common.h" /* serial console */ diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index 354e5104c5..680d5918d7 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -10,9 +10,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* No NOR flash, this definition should put before common header */ -#define CONFIG_SYS_NO_FLASH - #include "at91-sama5_common.h" /* serial console */ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 25af94d885..ac7973ceca 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -91,8 +91,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} -#define CONFIG_SYS_NO_FLASH - /* include default commands */ #include <config_distro_defaults.h> diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h index d97b15f037..a6da2ccf82 100644 --- a/include/configs/sansa_fuze_plus.h +++ b/include/configs/sansa_fuze_plus.h @@ -10,7 +10,6 @@ #define CONFIG_MX23 /* i.MX23 SoC */ /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH /* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index ca5e64fd9b..dc1978b93b 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -380,7 +380,6 @@ #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #else - #define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h index c37f9131b9..73e7e6bbcf 100644 --- a/include/configs/sc_sps_1.h +++ b/include/configs/sc_sps_1.h @@ -14,7 +14,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_SC_SPS_1 /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH /* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index 77116049a7..d8189816df 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -59,9 +59,6 @@ #define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) -/* FLASH */ -#define CONFIG_SYS_NO_FLASH - /* Ether */ #define CONFIG_SH_ETHER 1 #define CONFIG_SH_ETHER_USE_PORT 0 diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index 49729f447e..a7d8de4241 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -59,9 +59,6 @@ #define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) -/* FLASH */ -#define CONFIG_SYS_NO_FLASH - /* Ether */ #define CONFIG_SH_ETHER 1 #define CONFIG_SH_ETHER_USE_PORT 0 diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index 0793f1e03e..c21a5f8fee 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -59,9 +59,6 @@ #define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) -/* FLASH */ -#define CONFIG_SYS_NO_FLASH - /* Ether */ #define CONFIG_SH_ETHER 1 #define CONFIG_SH_ETHER_USE_PORT 0 diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 327a806bee..34e124f506 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -25,7 +25,6 @@ #define CONFIG_ENV_SIZE (0x2000) #define CONFIG_SYS_MALLOC_LEN (16 * 1024 * 1024) #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_NO_FLASH #ifdef CONFIG_SIEMENS_MACH_TYPE #define CONFIG_MACH_TYPE CONFIG_SIEMENS_MACH_TYPE #endif diff --git a/include/configs/silk.h b/include/configs/silk.h index b43de8de14..4fc270fcc2 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -44,7 +44,6 @@ #define CONFIG_SPI #define CONFIG_SH_QSPI #define CONFIG_SPI_FLASH_QUAD -#define CONFIG_SYS_NO_FLASH /* SH Ether */ #define CONFIG_SH_ETHER diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 748865d9bf..f53f5d8ae2 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -83,7 +83,6 @@ /* NAND flash settings */ #define CONFIG_NAND_ATMEL -#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 #define CONFIG_SYS_NAND_DBW_8 diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index f605f10cd8..a7c43b06ea 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -161,7 +161,6 @@ /*----------------------------------------------------------------------- * FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH 1 #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* 256 KiB */ diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 0e079b0356..a465a0e43f 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -42,7 +42,6 @@ /* NAND Flash */ #define CONFIG_NAND_ATMEL -#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 #define CONFIG_SYS_NAND_DBW_8 diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index b0ed9eaf0e..c637ba1384 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -42,7 +42,6 @@ #define CONFIG_NAND_ATMEL #define CONFIG_ATMEL_NAND_HWECC #define CONFIG_SYS_NAND_ECC_BASE ATMEL_BASE_ECC -#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 #define CONFIG_SYS_NAND_DBW_8 diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 4f8a9f85f4..a1431ca41d 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -86,12 +86,6 @@ #define CONFIG_I2C_MULTI_BUS /* - * Flash - */ - -#define CONFIG_SYS_NO_FLASH - -/* * Power */ diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h index bc4d3cd9cc..9b1f753b4c 100644 --- a/include/configs/socfpga_arria5_socdk.h +++ b/include/configs/socfpga_arria5_socdk.h @@ -9,7 +9,6 @@ #include <asm/arch/base_addr_ac5.h> /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 8bbe3c5eed..b1878608ef 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -15,7 +15,6 @@ * High level configuration */ #define CONFIG_DISPLAY_BOARDINFO_LATE -#define CONFIG_SYS_NO_FLASH #define CONFIG_CLOCKS #define CONFIG_CRC32_VERIFY diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h index 5e317bb2e2..4100ef93d3 100644 --- a/include/configs/socfpga_cyclone5_socdk.h +++ b/include/configs/socfpga_cyclone5_socdk.h @@ -9,7 +9,6 @@ #include <asm/arch/base_addr_ac5.h> /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h index 361019c093..f6559722f4 100644 --- a/include/configs/socfpga_de0_nano_soc.h +++ b/include/configs/socfpga_de0_nano_soc.h @@ -9,7 +9,6 @@ #include <asm/arch/base_addr_ac5.h> /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h index 5e7a712cf5..2278357fc6 100644 --- a/include/configs/socfpga_de1_soc.h +++ b/include/configs/socfpga_de1_soc.h @@ -9,7 +9,6 @@ #include <asm/arch/base_addr_ac5.h> /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h index f102a1812f..3585eeb3c4 100644 --- a/include/configs/socfpga_is1.h +++ b/include/configs/socfpga_is1.h @@ -10,7 +10,6 @@ #include <asm/arch/base_addr_ac5.h> /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h index d36fac6309..3c9ba6de23 100644 --- a/include/configs/socfpga_mcvevk.h +++ b/include/configs/socfpga_mcvevk.h @@ -9,7 +9,6 @@ #include <asm/arch/base_addr_ac5.h> /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h index 16a85ae04c..326310b539 100644 --- a/include/configs/socfpga_sockit.h +++ b/include/configs/socfpga_sockit.h @@ -9,7 +9,6 @@ #include <asm/arch/base_addr_ac5.h> /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h index 0c8da60f4a..90343b7c6d 100644 --- a/include/configs/socfpga_socrates.h +++ b/include/configs/socfpga_socrates.h @@ -9,7 +9,6 @@ #include <asm/arch/base_addr_ac5.h> /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index 571e205136..f67fafd756 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -8,7 +8,6 @@ #include <asm/arch/base_addr_ac5.h> -#define CONFIG_SYS_NO_FLASH #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index a2d2b79c27..e208f45649 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -9,7 +9,6 @@ #include <asm/arch/base_addr_ac5.h> /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index d705830804..ae3211ab27 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -9,7 +9,6 @@ #define __CONFIG_H #define CONFIG_SYS_THUMB_BUILD -/*#define CONFIG_SYS_NO_FLASH*/ #define CONFIG_SYS_FLASH_BASE 0x08000000 #define CONFIG_SYS_INIT_SP_ADDR 0x20050000 diff --git a/include/configs/stout.h b/include/configs/stout.h index 28bf5539df..90258c2f42 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -47,7 +47,6 @@ #define CONFIG_SPI #define CONFIG_SH_QSPI #define CONFIG_SPI_FLASH_QUAD -#define CONFIG_SYS_NO_FLASH /* SH Ether */ #define CONFIG_SH_ETHER diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index 0e7d8608a2..24dd81856b 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -12,8 +12,6 @@ #define CONFIG_SYS_CORTEX_R4 -#define CONFIG_SYS_NO_FLASH - /* ram memory-related information */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 0x00000000 diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 5d76e9ff9a..d48bdac07a 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -170,8 +170,6 @@ /* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - #define CONFIG_SYS_MONITOR_LEN (768 << 10) /* 768 KiB */ #define CONFIG_ENV_OFFSET (544 << 10) /* (8 + 24 + 512) KiB */ diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 6bc2336b23..87b5315e56 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -84,7 +84,6 @@ #define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_EEPROM -#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 400000 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1 diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 32a4b27870..89d2e6bb5d 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -86,7 +86,6 @@ #define CONFIG_CMD_NAND /* NAND support */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_OMAP24_I2C_SPEED 100000 diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 0b07e30fa0..ba7346c628 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -92,9 +92,6 @@ #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13 #endif -/* NOR flash - no real flash on this board */ -#define CONFIG_SYS_NO_FLASH 1 - /* Ethernet */ #define CONFIG_MACB #define CONFIG_PHYLIB diff --git a/include/configs/tb100.h b/include/configs/tb100.h index 39bb5b35da..15d77626e5 100644 --- a/include/configs/tb100.h +++ b/include/configs/tb100.h @@ -30,8 +30,6 @@ #define CONFIG_SYS_BOOTM_LEN SZ_32M #define CONFIG_SYS_LOAD_ADDR 0x82000000 -#define CONFIG_SYS_NO_FLASH - /* * UART configuration */ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 11e4df35e9..a96b2b5d57 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -54,8 +54,6 @@ /* turn on command-line edit/hist/auto */ #define CONFIG_COMMAND_HISTORY -#define CONFIG_SYS_NO_FLASH - /* * Increasing the size of the IO buffer as default nfsargs size is more * than 256 and so it is not possible to edit it diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index d3c94b0e80..c132d8fa47 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -47,8 +47,6 @@ #define CONFIG_EHCI_IS_TDI #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ - /* SPI NOR flash default params, used by sf commands */ #define CONFIG_SF_DEFAULT_SPEED 27777777 /* for fast SPL booting */ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index a546db2eb4..0e563fed42 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -13,8 +13,6 @@ #define CONFIG_SYS_64BIT -#define CONFIG_SYS_NO_FLASH - #define MEM_BASE 0x00500000 #define CONFIG_SYS_LOWMEM_BASE MEM_BASE diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index aa4561c5f7..c0b477d044 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -18,7 +18,6 @@ #define CONFIG_TI81XX #define CONFIG_TI814X -#define CONFIG_SYS_NO_FLASH #define CONFIG_OMAP #include <asm/arch/omap.h> @@ -26,7 +25,6 @@ #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_SYS_MALLOC_LEN (1024 << 10) #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_MACH_TYPE MACH_TYPE_TI8148EVM #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index d7b1719b5b..951b842194 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -12,7 +12,6 @@ #define CONFIG_TI81XX #define CONFIG_TI816X -#define CONFIG_SYS_NO_FLASH #define CONFIG_OMAP #define CONFIG_ARCH_CPU_INIT diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index ca5794cec7..fbe8859eca 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -17,12 +17,6 @@ #ifndef __CONFIG_TI_ARMV7_COMMON_H__ #define __CONFIG_TI_ARMV7_COMMON_H__ -/* - * We typically do not contain NOR flash. In the cases where we do, we - * undefine this later. - */ -#define CONFIG_SYS_NO_FLASH - /* Support both device trees and ATAGs. */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h index 3576b4069b..d42889878e 100644 --- a/include/configs/tplink_wdr4300.h +++ b/include/configs/tplink_wdr4300.h @@ -20,8 +20,6 @@ #define CONFIG_SYS_LOAD_ADDR 0xa1000000 #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR -#define CONFIG_SYS_NO_FLASH - #define CONFIG_SYS_INIT_RAM_ADDR 0xbd000000 #define CONFIG_SYS_INIT_RAM_SIZE 0x8000 #define CONFIG_SYS_INIT_SP_ADDR \ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 654f9b4ec5..e4b3290268 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -92,7 +92,6 @@ #define CONFIG_TWL4030_LED /* Board NAND Info */ -#define CONFIG_SYS_NO_FLASH /* no NOR flash */ #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define MTDIDS_DEFAULT "nand0=omap2-nand.0" #define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:" \ diff --git a/include/configs/ts4600.h b/include/configs/ts4600.h index 2219a5362d..59565c60e3 100644 --- a/include/configs/ts4600.h +++ b/include/configs/ts4600.h @@ -18,7 +18,6 @@ #define CONFIG_MX28 /* i.MX28 SoC */ /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH /* No NOR Flash */ /* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index f2937779fa..5649c18c4f 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -16,7 +16,6 @@ /* High Level Configuration Options */ #define CONFIG_MX51 -#define CONFIG_SYS_NO_FLASH /* No NOR Flash */ #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 2nd stage bootloader */ #define CONFIG_HW_WATCHDOG diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index b453d8fba8..ab35191d92 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -36,8 +36,6 @@ #ifdef CONFIG_MICRO_SUPPORT_CARD #define CONFIG_SMC911X -#else -#define CONFIG_SYS_NO_FLASH #endif #define CONFIG_FLASH_CFI_DRIVER diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index a1ba428887..1462689244 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -75,9 +75,6 @@ #define DATAFLASH_TCSS (0x1a << 16) #define DATAFLASH_TCHS (0x1 << 24) -/* no NOR flash */ -#define CONFIG_SYS_NO_FLASH - /* NAND flash */ #ifdef CONFIG_CMD_NAND #define CONFIG_NAND_ATMEL diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index 01a2bd4060..6c888293c1 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -14,7 +14,6 @@ #define CONFIG_MX53 #define CONFIG_SYS_FSL_CLK #define CONFIG_MXC_GPIO -#define CONFIG_SYS_NO_FLASH #include <asm/arch/imx-regs.h> diff --git a/include/configs/vct.h b/include/configs/vct.h index 22f170c23c..c21c12577f 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -38,8 +38,6 @@ #if !defined(CONFIG_VCT_NAND) && !defined(CONFIG_VCT_ONENAND) #define CONFIG_VCT_NOR -#else -#define CONFIG_SYS_NO_FLASH #endif /* diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 33b3438b06..dde3a114aa 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -232,9 +232,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - #ifdef CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_SIZE (8 * 1024) diff --git a/include/configs/vinco.h b/include/configs/vinco.h index b79ad5b76a..c146f773db 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -13,9 +13,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* No NOR flash, this definition should be put before common header */ -#define CONFIG_SYS_NO_FLASH - #include "at91-sama5_common.h" /* The value in the common file is too far away for the VInCo platform */ diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index f1bd31328f..7724eea194 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -323,7 +323,6 @@ #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #else - #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/warp7.h b/include/configs/warp7.h index a8a4520843..b3e1f2e597 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -112,8 +112,7 @@ #define CONFIG_POWER_PFUZE3000 #define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH +/* environment organization */ #define CONFIG_ENV_SIZE SZ_8K #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index dd02142e32..6af03644b0 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -108,12 +108,6 @@ #define CONFIG_CMDLINE_EDITING /* - * No NOR - */ - -#define CONFIG_SYS_NO_FLASH - -/* * NAND chip timings for FIXME: which one? */ diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 96659081cc..a6ad18e88a 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -125,7 +125,6 @@ /*----------------------------------------------------------------------- * FLASH configuration */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_CMD_SF_TEST #define CONFIG_SPI diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h index 8e9b5d7077..2e6e75d5e3 100644 --- a/include/configs/xfi3.h +++ b/include/configs/xfi3.h @@ -10,7 +10,6 @@ #define CONFIG_MX23 /* i.MX23 SoC */ /* U-Boot Commands */ -#define CONFIG_SYS_NO_FLASH /* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index 47c1ddfaf9..58cfe41e86 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -85,7 +85,6 @@ #define CONFIG_FLASH_CFI_MTD #else #define CONFIG_ENV_IS_NOWHERE -#define CONFIG_SYS_NO_FLASH #endif #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 73830b212b..ba799436a1 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -15,8 +15,6 @@ /* #define CONFIG_ARMV8_SWITCH_TO_EL1 */ -#define CONFIG_SYS_NO_FLASH - /* Generic Interrupt Controller Definitions */ #define CONFIG_GICV2 #define GICD_BASE 0xF9010000 diff --git a/include/configs/xpress.h b/include/configs/xpress.h index ce355bf671..e7c82e5bd7 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -55,9 +55,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - /* Environment is in stored in the eMMC boot partition */ #define CONFIG_ENV_SIZE (16 << 10) #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 8e9d3c4213..431d6c49c4 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -60,7 +60,7 @@ #endif /* NOR */ -#ifndef CONFIG_SYS_NO_FLASH +#ifdef CONFIG_MTD_NOR_FLASH # define CONFIG_SYS_FLASH_BASE 0xE2000000 # define CONFIG_SYS_FLASH_SIZE (16 * 1024 * 1024) # define CONFIG_SYS_MAX_FLASH_BANKS 1 @@ -162,13 +162,13 @@ /* Environment */ #ifndef CONFIG_ENV_IS_NOWHERE -# ifndef CONFIG_SYS_NO_FLASH +# ifdef CONFIG_MTD_NOR_FLASH /* Environment in NOR flash */ # define CONFIG_ENV_IS_IN_FLASH # elif defined(CONFIG_ZYNQ_QSPI) /* Environment in Serial Flash */ # define CONFIG_ENV_IS_IN_SPI_FLASH -# elif defined(CONFIG_SYS_NO_FLASH) +# elif !defined(CONFIG_MTD_NOR_FLASH) # define CONFIG_ENV_IS_NOWHERE # endif diff --git a/include/dataflash.h b/include/dataflash.h index 142b55546f..84a56c30ce 100644 --- a/include/dataflash.h +++ b/include/dataflash.h @@ -23,7 +23,7 @@ /*number of protected area*/ #define NB_DATAFLASH_AREA 5 -#ifdef CONFIG_SYS_NO_FLASH +#ifndef CONFIG_MTD_NOR_FLASH /*----------------------------------------------------------------------- * return codes from flash_write(): @@ -49,7 +49,7 @@ * Set Environment according to label: */ # define FLAG_SETENV 0x80 -#endif /* CONFIG_SYS_NO_FLASH */ +#endif /* CONFIG_MTD_NOR_FLASH */ /*define the area structure*/ typedef struct { |