diff options
| author | Tom Rini <trini@konsulko.com> | 2018-08-16 08:16:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-08-16 16:45:02 -0400 |
| commit | 86cf1c82850f7c226f23684e19616e526ffaf10f (patch) | |
| tree | 215dc29cd1f62c44019733ef85367a8d1f034287 /include/configs | |
| parent | 999a772d9f24bf9b8d0726e1359c9d8c3bdad72e (diff) | |
configs: Migrate CONFIG_NR_DRAM_BANKS
We have the following cases:
- CONFIG_NR_DRAM_BANKS was defined, migrate normally
- CONFIG_NR_DRAM_BANKS_MAX was defined and then used for
CONFIG_NR_DRAM_BANKS after a check, just migrate it over now.
- CONFIG_NR_DRAM_BANKS was very oddly defined on p2771-0000-* (to 1024 +
2), set this to 8.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs')
266 files changed, 0 insertions, 326 deletions
diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index 719a22d7974..4843a27cbf2 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -47,7 +47,6 @@ */ #define CONFIG_SYS_SDRAM_BASE 0xc8000000 #define CONFIG_SYS_SDRAM_SIZE 0x08000000 -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_MONITOR_IS_IN_RAM #define CONFIG_SYS_MONITOR_LEN 0x80000 /* Reserve 512k */ #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_SDRAM_BASE + \ diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index cc8b956a090..86fbec5ea29 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -51,7 +51,6 @@ */ #define CONFIG_SYS_SDRAM_BASE 0xD0000000 #define CONFIG_SYS_SDRAM_SIZE 0x08000000 -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_MONITOR_IS_IN_RAM #define CONFIG_SYS_MONITOR_LEN 0x80000 /* Reserve 512k */ #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_SDRAM_BASE + \ diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index 24712662d43..667fd43ea80 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -91,7 +91,6 @@ * Other required minimal configurations */ #define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */ -#define CONFIG_NR_DRAM_BANKS 4 #define CONFIG_SYS_MEMTEST_START 0x00400000 /* 4M */ #define CONFIG_SYS_MEMTEST_END 0x007fffff /*(_8M -1) */ #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */ diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h index 0491832feee..105967c3f70 100644 --- a/include/configs/SBx81LIFXCAT.h +++ b/include/configs/SBx81LIFXCAT.h @@ -91,7 +91,6 @@ * Other required minimal configurations */ #define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */ -#define CONFIG_NR_DRAM_BANKS 4 #define CONFIG_SYS_MEMTEST_START 0x00400000 /* 4M */ #define CONFIG_SYS_MEMTEST_END 0x007fffff /*(_8M -1) */ #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */ diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index e0da9e8b5f8..9395e618fae 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -97,8 +97,6 @@ #define PHYS_SDRAM_1 \ (PHYS_SDRAM_0 + PHYS_SDRAM_0_SIZE) /* SDRAM Bank #2 */ -#define CONFIG_NR_DRAM_BANKS 2 /* we have 2 bank of DRAM */ - #define PHYS_SDRAM_0_SIZE 0x20000000 /* 512 MB */ #define PHYS_SDRAM_1_SIZE 0x20000000 /* 512 MB */ diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index d04a85cff5c..6f9f82178d8 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -194,8 +194,6 @@ #define PHYS_SDRAM_1 \ (PHYS_SDRAM_0 + PHYS_SDRAM_0_SIZE) /* SDRAM Bank #2 */ -#define CONFIG_NR_DRAM_BANKS 2 /* we have 2 bank of DRAM */ - #ifdef CONFIG_SKIP_LOWLEVEL_INIT #define PHYS_SDRAM_0_SIZE 0x20000000 /* 512 MB */ #define PHYS_SDRAM_1_SIZE 0x20000000 /* 512 MB */ diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 586e7a77cae..294ad39116c 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -203,7 +203,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index b9a3a5079d1..e8c0d567069 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -176,7 +176,6 @@ /*----------------------------------------------------------------------- * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 #define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index c767961562c..8e63cdaa5f0 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -12,8 +12,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ - /* * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM * 64 bytes before this address should be set aside for u-boot.img's diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 42f271dd5ff..b2f042e3dfd 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -16,8 +16,6 @@ #define CONFIG_IODELAY_RECALIBRATION -#define CONFIG_NR_DRAM_BANKS 2 - /* MMC ENV related defines */ #define CONFIG_SYS_MMC_ENV_DEV 1 /* eMMC */ #define CONFIG_SYS_MMC_ENV_PART 0 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 443a02e7f89..fa95c8222c2 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -250,7 +250,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/apf27.h b/include/configs/apf27.h index f4e0c1a7625..018410f5cc6 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -48,7 +48,6 @@ * Memory configurations */ #define CONFIG_NR_DRAM_POPULATED 1 -#define CONFIG_NR_DRAM_BANKS 2 #define ACFG_SDRAM_MBYTE_SYZE 64 diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h index 00ba2eab6a4..09de1c06ef6 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -17,7 +17,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_APX4DEVKIT /* Memory configuration */ -#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ #define PHYS_SDRAM_1_SIZE 0x20000000 /* Max 512 MB RAM */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index bfa89b5d0a6..7e3a93d6b9d 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -138,7 +138,6 @@ #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 1433067e159..c0e17402195 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -51,7 +51,6 @@ #define CONFIG_SYS_SDRAM_SIZE (ARMADILLO_800EVA_SDRAM_SIZE) #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + \ 64 * 1024 * 1024) -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MONITOR_BASE 0x00000000 #define CONFIG_SYS_MONITOR_LEN (256 * 1024) diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h index be7dcecb85d..46062492cd0 100644 --- a/include/configs/aspeed-common.h +++ b/include/configs/aspeed-common.h @@ -33,8 +33,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (SYS_INIT_RAM_END \ - GENERATED_GBL_DATA_SIZE) -#define CONFIG_NR_DRAM_BANKS 1 - #define CONFIG_SYS_MALLOC_LEN (32 << 20) /* diff --git a/include/configs/aspenite.h b/include/configs/aspenite.h index bb6c8fe48f7..79bf8f26e93 100644 --- a/include/configs/aspenite.h +++ b/include/configs/aspenite.h @@ -22,7 +22,6 @@ * TBD: dcache to be used for this */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE - 0x00200000) -#define CONFIG_NR_DRAM_BANKS_MAX 2 /* * Commands configuration diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index fa7e9ee241c..ee44255b20c 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -54,7 +54,6 @@ /* * Memory Configuration */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE SZ_32M diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index fdc74a3d78e..2177512fe82 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -53,7 +53,6 @@ * SDRAM: 1 bank, min 32, max 128 MB * Initialized before u-boot gets started. */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS1 #define CONFIG_SYS_SDRAM_SIZE 0x04000000 diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 0cf34153b01..1c7fbe111f7 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -51,7 +51,6 @@ #define CONFIG_BOOTP_BOOTFILESIZE /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x04000000 #define CONFIG_SYS_INIT_SP_ADDR \ diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 3bd0926590b..f0dfc99d5b3 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -52,7 +52,6 @@ #define CONFIG_BOOTP_BOOTFILESIZE 1 /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS1 #define CONFIG_SYS_SDRAM_SIZE 0x04000000 diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 2c1ceeda075..0958d63c940 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -43,7 +43,6 @@ #define CONFIG_BOOTP_BOOTFILESIZE /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x70000000 #define CONFIG_SYS_SDRAM_SIZE 0x08000000 diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 739ea29737e..6cd267eee67 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -33,7 +33,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x08000000 diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 1001526b7d8..b052071478b 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -41,7 +41,6 @@ #undef CONFIG_FB_ADDR /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS1 #define CONFIG_SYS_SDRAM_SIZE 0x04000000 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index a30e345fef0..d48b7d07855 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -31,7 +31,6 @@ */ /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x08000000 /* 128 megs */ diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h index b230896734e..99fb80d53ec 100644 --- a/include/configs/ax25-ae350.h +++ b/include/configs/ax25-ae350.h @@ -45,7 +45,6 @@ /* * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_0 0x00000000 /* SDRAM Bank #1 */ #define PHYS_SDRAM_1 \ (PHYS_SDRAM_0 + PHYS_SDRAM_0_SIZE) /* SDRAM Bank #2 */ diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h index b8920d21ce5..a9c97dbcb49 100644 --- a/include/configs/bcm23550_w1d.h +++ b/include/configs/bcm23550_w1d.h @@ -20,7 +20,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_SDRAM_SIZE 0x20000000 -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MALLOC_LEN SZ_4M /* see armv7/start.S. */ diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index 4b0d599dfb3..8619f544d0a 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_SDRAM_SIZE 0x80000000 -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MALLOC_LEN SZ_4M /* see armv7/start.S. */ diff --git a/include/configs/bcm7445.h b/include/configs/bcm7445.h index 4601adf930e..f34cf2d03bc 100644 --- a/include/configs/bcm7445.h +++ b/include/configs/bcm7445.h @@ -12,8 +12,6 @@ #define CONFIG_SYS_NS16550_COM3 0xf040ab00 -#define CONFIG_NR_DRAM_BANKS 3 - #define CONFIG_SYS_TEXT_BASE 0x80100000 #define CONFIG_SYS_INIT_RAM_ADDR 0x80200000 diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index 4423e8613fc..0586c53ae17 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -24,8 +24,6 @@ #error CONFIG_SYS_SDRAM_SIZE must be defined! #endif -#define CONFIG_NR_DRAM_BANKS 1 - #define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) /* Some commands use this as the default load address */ diff --git a/include/configs/bcm_northstar2.h b/include/configs/bcm_northstar2.h index 5a288fc45cd..754bf2e0dbe 100644 --- a/include/configs/bcm_northstar2.h +++ b/include/configs/bcm_northstar2.h @@ -14,7 +14,6 @@ #define V2M_BASE 0x80000000 #define PHYS_SDRAM_1 V2M_BASE -#define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1_SIZE (4UL * SZ_1G) #define PHYS_SDRAM_2_SIZE (4UL * SZ_1G) #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h index 98cd7b6f285..ec6b01f1442 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -6,7 +6,6 @@ #define __CONFIGS_BG0900_H__ /* Memory configuration */ -#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ #define PHYS_SDRAM_1_SIZE 0x10000000 /* Max 256 MB RAM */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 diff --git a/include/configs/bmips_bcm3380.h b/include/configs/bmips_bcm3380.h index 813a14cf295..e2f9e76a978 100644 --- a/include/configs/bmips_bcm3380.h +++ b/include/configs/bmips_bcm3380.h @@ -10,7 +10,6 @@ #define CONFIG_SYS_MIPS_TIMER_FREQ 166500000 /* RAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* U-Boot */ diff --git a/include/configs/bmips_bcm6318.h b/include/configs/bmips_bcm6318.h index 5cc0ebe8bab..476aa51af30 100644 --- a/include/configs/bmips_bcm6318.h +++ b/include/configs/bmips_bcm6318.h @@ -10,7 +10,6 @@ #define CONFIG_SYS_MIPS_TIMER_FREQ 166500000 /* RAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* USB */ diff --git a/include/configs/bmips_bcm63268.h b/include/configs/bmips_bcm63268.h index e244cd02f80..1456b0ec479 100644 --- a/include/configs/bmips_bcm63268.h +++ b/include/configs/bmips_bcm63268.h @@ -10,7 +10,6 @@ #define CONFIG_SYS_MIPS_TIMER_FREQ 200000000 /* RAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* USB */ diff --git a/include/configs/bmips_bcm6328.h b/include/configs/bmips_bcm6328.h index 42e9215dc88..faf9abcc3e4 100644 --- a/include/configs/bmips_bcm6328.h +++ b/include/configs/bmips_bcm6328.h @@ -10,7 +10,6 @@ #define CONFIG_SYS_MIPS_TIMER_FREQ 160000000 /* RAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* USB */ diff --git a/include/configs/bmips_bcm6338.h b/include/configs/bmips_bcm6338.h index 66e731c01c0..2a02854f25d 100644 --- a/include/configs/bmips_bcm6338.h +++ b/include/configs/bmips_bcm6338.h @@ -10,7 +10,6 @@ #define CONFIG_SYS_MIPS_TIMER_FREQ 120000000 /* RAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* U-Boot */ diff --git a/include/configs/bmips_bcm6348.h b/include/configs/bmips_bcm6348.h index 3d4e2193020..647f630fbb9 100644 --- a/include/configs/bmips_bcm6348.h +++ b/include/configs/bmips_bcm6348.h @@ -10,7 +10,6 @@ #define CONFIG_SYS_MIPS_TIMER_FREQ 128000000 /* RAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* USB */ diff --git a/include/configs/bmips_bcm6358.h b/include/configs/bmips_bcm6358.h index a38903e248a..6cb99e854fa 100644 --- a/include/configs/bmips_bcm6358.h +++ b/include/configs/bmips_bcm6358.h @@ -10,7 +10,6 @@ #define CONFIG_SYS_MIPS_TIMER_FREQ 150000000 /* RAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* USB */ diff --git a/include/configs/bmips_bcm6362.h b/include/configs/bmips_bcm6362.h index 29518e6d6c8..60777207e1b 100644 --- a/include/configs/bmips_bcm6362.h +++ b/include/configs/bmips_bcm6362.h @@ -10,7 +10,6 @@ #define CONFIG_SYS_MIPS_TIMER_FREQ 200000000 /* RAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* USB */ diff --git a/include/configs/bmips_bcm6368.h b/include/configs/bmips_bcm6368.h index 8f8134d32e3..142379c768d 100644 --- a/include/configs/bmips_bcm6368.h +++ b/include/configs/bmips_bcm6368.h @@ -10,7 +10,6 @@ #define CONFIG_SYS_MIPS_TIMER_FREQ 200000000 /* RAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* USB */ diff --git a/include/configs/bmips_bcm6838.h b/include/configs/bmips_bcm6838.h index e79a98206ae..d735c51efc8 100644 --- a/include/configs/bmips_bcm6838.h +++ b/include/configs/bmips_bcm6838.h @@ -10,7 +10,6 @@ #define CONFIG_SYS_MIPS_TIMER_FREQ 160000000 /* RAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* U-Boot */ diff --git a/include/configs/bubblegum_96.h b/include/configs/bubblegum_96.h index a8f38a23f92..e1dc37b6872 100644 --- a/include/configs/bubblegum_96.h +++ b/include/configs/bubblegum_96.h @@ -12,7 +12,6 @@ /* SDRAM Definitions */ #define CONFIG_SYS_SDRAM_BASE 0x0 -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_SIZE 0x80000000 /* Generic Timer Definitions */ diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 926ba9918c8..1bbfa16660e 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -63,7 +63,6 @@ * always, even when we have more. We always start at 0x80000000, * and we place the initial stack pointer in our SRAM. */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \ GENERATED_GBL_DATA_SIZE) diff --git a/include/configs/calimain.h b/include/configs/calimain.h index 690f6056957..5db621fadad 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -122,8 +122,6 @@ /* memtest will be run on 16MB */ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (16 << 20)) -#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ - /* * Serial Driver info */ diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index 03b17840e57..a7f372e5b92 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -202,7 +202,6 @@ #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index f0e1e8280c1..295bcdf5ad9 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -10,8 +10,6 @@ #ifndef __CONFIG_CL_SOM_AM57X_H #define __CONFIG_CL_SOM_AM57X_H -#define CONFIG_NR_DRAM_BANKS 2 - #define CONSOLEDEV "ttyO2" #define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */ diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index faea6c6b937..f46c8dd47c1 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -133,7 +133,6 @@ #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 5f3b97f6e65..c09d360965c 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -24,7 +24,6 @@ #define PHYS_SDRAM_1 MMDC0_ARB_BASE_ADDR #define PHYS_SDRAM_2 MMDC1_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 -#define CONFIG_NR_DRAM_BANKS 2 #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END 0x10010000 #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index adadfb29bfa..5297a94d7d3 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -172,7 +172,6 @@ /*----------------------------------------------------------------------- * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 /* CS1 is never populated */ #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 /*----------------------------------------------------------------------- diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 0ea70cc1bf1..fec3c4ee073 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -172,7 +172,6 @@ /*----------------------------------------------------------------------- * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 /* CM-T3517 DRAM is only on CS0 */ #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 #define CONFIG_SYS_CS0_SIZE (256 << 20) diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index a692da5ea24..695fbcf697e 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -134,7 +134,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 7ecde42f58b..c26f2dc9adb 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -225,7 +225,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index ec5aade8529..aac4205fa3f 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -126,7 +126,6 @@ #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 61256e233be..7b10ac8cf15 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -84,7 +84,6 @@ /* * DRAM Map */ -#define CONFIG_NR_DRAM_BANKS 1 /* We have 1 bank of DRAM */ #define PHYS_SDRAM_1 0xa0000000 /* SDRAM Bank #1 */ #define PHYS_SDRAM_1_SIZE 0x04000000 /* 64 MB */ diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 1d15651c23c..ffff1cef0e0 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -133,7 +133,6 @@ #define CONFIG_SYS_HZ 1000 /* Physical memory map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM (0x80000000) #define PHYS_SDRAM_SIZE (256 * 1024 * 1024) diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 66fdbc2e9da..5dd5c28e08a 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -55,7 +55,6 @@ #define CONFIG_BOOTP_BOOTFILESIZE /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS6 #define CONFIG_SYS_SDRAM_SIZE 0x08000000 diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 3dcd1390cae..3a42ff3dc0e 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -57,8 +57,6 @@ /* memtest will be run on 16MB */ #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + 0x2000000 + 16*1024*1024) -#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ - #define CONFIG_SYS_DA850_SYSCFG_SUSPSRC ( \ DAVINCI_SYSCFG_SUSPSRC_TIMER0 | \ DAVINCI_SYSCFG_SUSPSRC_SPI1 | \ diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 00e9c44fdf3..ae2b81ba73c 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -23,7 +23,6 @@ /* * Memory configurations */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MALLOC_LEN SZ_1M #define CONFIG_SYS_SDRAM_BASE EMC_DYCS0_BASE #define CONFIG_SYS_SDRAM_SIZE SZ_64M diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 1b4e33255d9..491a07a8cab 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -31,7 +31,6 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 /* 1 MB */ /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ #include <configs/ti_omap3_common.h> diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 3e0ac152295..0d6e2b64178 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -146,7 +146,6 @@ #endif /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/display5.h b/include/configs/display5.h index 692a95938b8..167d8e0e9b3 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -378,7 +378,6 @@ #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 8658c80fdcc..f72ee90ab57 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -28,8 +28,6 @@ * Commands configuration */ -#define CONFIG_NR_DRAM_BANKS 1 - /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index fa3f2b92fef..b3d33650f15 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -16,7 +16,6 @@ #define CONFIG_IODELAY_RECALIBRATION #define CONFIG_VERY_BIG_RAM -#define CONFIG_NR_DRAM_BANKS 2 #define CONFIG_MAX_MEM_MAPPED 0x80000000 #ifndef CONFIG_QSPI_BOOT diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 46a7179f1be..fabdcf1d475 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -14,7 +14,6 @@ #define CONFIG_MISC_INIT_R /* To stop autoboot */ /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 0x80000000 /* 1008 MB (the last ~30Mb are secured for TrustZone by ATF*/ #define PHYS_SDRAM_1_SIZE 0x3da00000 diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h index 12ae6bc8843..baf15ac14c8 100644 --- a/include/configs/dragonboard820c.h +++ b/include/configs/dragonboard820c.h @@ -14,7 +14,6 @@ #define CONFIG_MISC_INIT_R /* To stop autoboot */ /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_SIZE 0xC0000000 #define PHYS_SDRAM_1 0x80000000 diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 485866d694f..e8fc753efef 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -43,8 +43,6 @@ /* memtest will be run on 16MB */ #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + 0x2000000 + 16*1024*1024) -#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ - /* * Serial Driver info */ diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index 7eff61645ed..cfd929b150a 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -137,7 +137,6 @@ #endif #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 -#define CONFIG_NR_DRAM_BANKS 8 #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + 32*1024 - GENERATED_GBL_DATA_SIZE) diff --git a/include/configs/edison.h b/include/configs/edison.h index 93ab900f11c..476f5e38b4b 100644 --- a/include/configs/edison.h +++ b/include/configs/edison.h @@ -25,8 +25,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x100000 #define CONFIG_PHYSMEM -#define CONFIG_NR_DRAM_BANKS 3 - #define CONFIG_SYS_STACK_SIZE (32 * 1024) #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 9882d84e29c..a5ad27e90a2 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -189,7 +189,6 @@ * Other required minimal configurations */ #define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_LOAD_ADDR 0x00800000 #define CONFIG_SYS_MEMTEST_START 0x00400000 diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index f5e92d67187..b472a6c5a2b 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -84,7 +84,6 @@ #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 03926bcef6a..b5502ad6147 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -64,7 +64,6 @@ #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/espresso7420.h b/include/configs/espresso7420.h index 977ff45ff0d..4e3b26c25cd 100644 --- a/include/configs/espresso7420.h +++ b/include/configs/espresso7420.h @@ -24,7 +24,6 @@ #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" /* DRAM Memory Banks */ -#define CONFIG_NR_DRAM_BANKS 8 #define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */ #endif /* __CONFIG_ESPRESSO7420_H */ diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 72a5d220e1f..944cdbbeb2d 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -33,7 +33,6 @@ GENERATED_GBL_DATA_SIZE) /* 128MB SDRAM in 1 bank */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE (128 << 20) #define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h index eaf40a0e7df..c3473f7ef82 100644 --- a/include/configs/exynos5250-common.h +++ b/include/configs/exynos5250-common.h @@ -29,7 +29,6 @@ #define CONFIG_USB_XHCI_EXYNOS /* DRAM Memory Banks */ -#define CONFIG_NR_DRAM_BANKS 8 #define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */ #endif /* __CONFIG_5250_H */ diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 9d16428606a..d7d9a297f02 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -91,7 +91,6 @@ /* * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1_SIZE (128 * 1024 * 1024) diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index fef41a8a188..762162e7eac 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -167,7 +167,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 4a6da951c87..357196b77cb 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -28,7 +28,6 @@ * TBD: dcache to be used for this */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE - 0x00200000) -#define CONFIG_NR_DRAM_BANKS_MAX 2 /* * Commands configuration diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index b078cc54664..ec839c2c834 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -157,7 +157,6 @@ #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR diff --git a/include/configs/h2200.h b/include/configs/h2200.h index 69100d3d2ab..1abf283e26c 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -12,7 +12,6 @@ #define CONFIG_CPU_PXA25X 1 -#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 4d2f1f0aa8a..2a6ebf0e498 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -53,7 +53,6 @@ * Physical Memory Map * The DRAM is already setup, so do not touch the DT node later. */ -#define CONFIG_NR_DRAM_BANKS 0 #define PHYS_SDRAM_1_SIZE (4089 << 20) #define CONFIG_SYS_MEMTEST_START 0x100000 #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1_SIZE - 0x100000) diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 29d4db97076..9e280df3bad 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -22,7 +22,6 @@ /* CONFIG_SYS_TEXT_BASE needs to align with where ATF loads bl33.bin */ -#define CONFIG_NR_DRAM_BANKS 6 #define PHYS_SDRAM_1 0x00000000 /* 1008 MB (the last 16Mb are secured for TrustZone by ATF*/ diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index dddb2c9b0e0..2a7682c76df 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -72,7 +72,6 @@ /* memtest start address */ #define CONFIG_SYS_MEMTEST_START 0xA0000000 #define CONFIG_SYS_MEMTEST_END 0xA1000000 /* 16MB RAM test */ -#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ #define PHYS_SDRAM_1 0xA0000000 /* DDR Start */ #define PHYS_SDRAM_1_SIZE 0x08000000 /* DDR size 128MB */ diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 7260f8013f2..68de6caedf8 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -117,7 +117,6 @@ #endif /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 36be5892411..f2d3f79902f 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -122,7 +122,6 @@ #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index 5a3c2d68b5d..da3d923ba42 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -83,7 +83,6 @@ #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index 811384ebbe4..db52992a5ab 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -64,7 +64,6 @@ /* * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ #define PHYS_SDRAM_1 0x00000000 /* SDRAM Bank #1 */ #define PHYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index eb3f3942310..1421be4a6db 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -42,8 +42,6 @@ /* memtest will be run on 16MB */ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 16 * 1024 * 1024) -#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ - #define CONFIG_SYS_DA850_SYSCFG_SUSPSRC ( \ DAVINCI_SYSCFG_SUSPSRC_TIMER0 | \ DAVINCI_SYSCFG_SUSPSRC_UART2 | \ diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 56a4b84ef8e..9a9b8f05044 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -39,8 +39,6 @@ * DRAM */ -#define CONFIG_NR_DRAM_BANKS 1 - /* * Memory */ diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index add3dae5bbe..a4ef70bb1ca 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -125,7 +125,6 @@ * Other required minimal configurations */ #define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */ -#define CONFIG_NR_DRAM_BANKS 4 #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */ /* diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h index 0dc708e480a..d7867712424 100644 --- a/include/configs/kp_imx53.h +++ b/include/configs/kp_imx53.h @@ -88,7 +88,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1_SIZE (512 * SZ_1M) #define PHYS_SDRAM_SIZE (PHYS_SDRAM_1_SIZE) diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index bf3cc174cd6..136e1cb31e2 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -116,7 +116,6 @@ #endif /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 016c2fd9ea4..dd7ad3e6591 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -24,7 +24,6 @@ #define KZM_SDRAM_BASE (0x40000000) #define PHYS_SDRAM KZM_SDRAM_BASE #define PHYS_SDRAM_SIZE (512 * 1024 * 1024) -#define CONFIG_NR_DRAM_BANKS (1) /* NOR Flash */ #define KZM_FLASH_BASE (0x00000000) diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 8af8fd5c63b..5602dc455ca 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -47,7 +47,6 @@ /* * SDRAM configuration */ -#define CONFIG_NR_DRAM_BANKS 1 /* * Different SDRAM configuration and size for some of the boards derived diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 7a0511f88e6..33e876efdf6 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -37,8 +37,6 @@ /* memtest will be run on 16MB */ #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + 0x2000000 + 16*1024*1024) -#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ - /* * Serial Driver info */ diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 6af8e70be68..98e3853a4e3 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -112,7 +112,6 @@ #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/ls1012a2g5rdb.h b/include/configs/ls1012a2g5rdb.h index d6baf166e45..71e4a8b4278 100644 --- a/include/configs/ls1012a2g5rdb.h +++ b/include/configs/ls1012a2g5rdb.h @@ -11,7 +11,6 @@ /* DDR */ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 1 -#define CONFIG_NR_DRAM_BANKS 2 #define CONFIG_SYS_SDRAM_SIZE 0x40000000 #define CONFIG_CMD_MEMINFO #define CONFIG_SYS_MEMTEST_START 0x80000000 diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h index 73ac162ffb1..7affabfdba5 100644 --- a/include/configs/ls1012afrdm.h +++ b/include/configs/ls1012afrdm.h @@ -11,7 +11,6 @@ /* DDR */ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 1 -#define CONFIG_NR_DRAM_BANKS 2 #define CONFIG_SYS_SDRAM_SIZE 0x20000000 #define CONFIG_CHIP_SELECTS_PER_CTRL 1 #define CONFIG_CMD_MEMINFO diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h index 35578c3e41f..8129595d519 100644 --- a/include/configs/ls1012afrwy.h +++ b/include/configs/ls1012afrwy.h @@ -15,7 +15,6 @@ /* DDR */ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 1 -#define CONFIG_NR_DRAM_BANKS 2 #define SYS_SDRAM_SIZE_512 0x20000000 #define SYS_SDRAM_SIZE_1024 0x40000000 #define CONFIG_CHIP_SELECTS_PER_CTRL 1 diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index d508bf9055c..4e85423d90f 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -11,7 +11,6 @@ /* DDR */ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 1 -#define CONFIG_NR_DRAM_BANKS 2 #define CONFIG_SYS_SDRAM_SIZE 0x40000000 #define CONFIG_CMD_MEMINFO #define CONFIG_SYS_MEMTEST_START 0x80000000 diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index 24980f8bbfa..17554ea955d 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -11,7 +11,6 @@ /* DDR */ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 1 -#define CONFIG_NR_DRAM_BANKS 2 #define CONFIG_SYS_SDRAM_SIZE 0x40000000 #define CONFIG_CMD_MEMINFO #define CONFIG_SYS_MEMTEST_START 0x80000000 diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 97792be6a85..d7f687982ee 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -82,8 +82,6 @@ #define CONFIG_SYS_MONITOR_LEN 0x80000 #endif -#define CONFIG_NR_DRAM_BANKS 1 - #define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000UL #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 79a84c4a64a..7358407a8f8 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -85,8 +85,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_MONITOR_LEN 0x80000 #endif -#define CONFIG_NR_DRAM_BANKS 1 - #define CONFIG_DDR_SPD #define SPD_EEPROM_ADDRESS 0x51 #define CONFIG_SYS_SPD_BUS_NUM 0 diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index cf23c33d857..169520f1e07 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -98,7 +98,6 @@ #endif /* ifdef CONFIG_U_BOOT_HDR_SIZE */ #endif -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM 0x80000000 #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index f4a0cc070ed..cdaa38781da 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -23,7 +23,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_DIMM_SLOTS_PER_CTLR 1 /* Physical Memory Map */ #define CONFIG_CHIP_SELECTS_PER_CTRL 4 -#define CONFIG_NR_DRAM_BANKS 2 #define CONFIG_DDR_SPD #define SPD_EEPROM_ADDRESS 0x51 diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 9b24056985f..41478d34833 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -17,7 +17,6 @@ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 /* Physical Memory Map */ #define CONFIG_CHIP_SELECTS_PER_CTRL 4 -#define CONFIG_NR_DRAM_BANKS 2 #define CONFIG_SYS_SPD_BUS_NUM 0 diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index e8736827664..aa82b610cfa 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -23,7 +23,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_DIMM_SLOTS_PER_CTLR 1 /* Physical Memory Map */ #define CONFIG_CHIP_SELECTS_PER_CTRL 4 -#define CONFIG_NR_DRAM_BANKS 2 #define CONFIG_DDR_SPD #define SPD_EEPROM_ADDRESS 0x51 diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 87d8cf53741..33ac30329d5 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -17,7 +17,6 @@ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 /* Physical Memory Map */ #define CONFIG_CHIP_SELECTS_PER_CTRL 4 -#define CONFIG_NR_DRAM_BANKS 2 #define CONFIG_DDR_SPD #define SPD_EEPROM_ADDRESS 0x51 diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 031c311a3c7..2d6a5fc3d42 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -166,8 +166,6 @@ unsigned long long get_qixis_addr(void); /* Physical Memory Map */ #define CONFIG_CHIP_SELECTS_PER_CTRL 4 -#define CONFIG_NR_DRAM_BANKS 2 - #define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 128 diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 5024f973262..e756844c6a3 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -163,8 +163,6 @@ unsigned long long get_qixis_addr(void); /* fixme: these need to be checked against the board */ #define CONFIG_CHIP_SELECTS_PER_CTRL 4 -#define CONFIG_NR_DRAM_BANKS 3 - #define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 128 diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 0816fae3651..f872d5a484a 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -275,7 +275,6 @@ "fi;\0" /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 66dec07b2a9..626d778ac3b 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -211,7 +211,6 @@ /* * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 #define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1 diff --git a/include/configs/meesc.h b/include/configs/meesc.h index dcf504b1cb8..1ebacf787dd 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -59,7 +59,6 @@ #define PHYS_SDRAM ATMEL_BASE_CS1 /* 0x20000000 */ #define PHYS_SDRAM_SIZE 0x02000000 /* 32 MByte */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM #define CONFIG_SYS_SDRAM_SIZE PHYS_SDRAM_SIZE diff --git a/include/configs/meson-gx-common.h b/include/configs/meson-gx-common.h index 7435f3475ea..c46522ef7e3 100644 --- a/include/configs/meson-gx-common.h +++ b/include/configs/meson-gx-common.h @@ -9,7 +9,6 @@ #define CONFIG_CPU_ARMV8 #define CONFIG_REMAKE_ELF -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MAXARGS 32 #define CONFIG_SYS_MALLOC_LEN (32 << 20) diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 8ae521f7e98..5eeb5a16249 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -70,17 +70,6 @@ /* ====> Include platform Common Definitions */ #include <asm/arch/config.h> -/* - * DRAM Banks configuration, Custom config can be done in <board>.h - */ -#ifndef CONFIG_NR_DRAM_BANKS -#define CONFIG_NR_DRAM_BANKS CONFIG_NR_DRAM_BANKS_MAX -#else -#if (CONFIG_NR_DRAM_BANKS > CONFIG_NR_DRAM_BANKS_MAX) -#error CONFIG_NR_DRAM_BANKS Configurated more than available -#endif -#endif /* CONFIG_NR_DRAM_BANKS */ - /* ====> Include driver Common Definitions */ /* * Common NAND configuration diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 5015bc74bb5..cf9440f90c7 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -13,8 +13,6 @@ /* additions for new ARM relocation support */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 -#define CONFIG_NR_DRAM_BANKS 1 - /* auto boot */ #define CONFIG_PREBOOT diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 9205bd9632c..93c50488a2e 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -14,8 +14,6 @@ /* additions for new ARM relocation support */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 -#define CONFIG_NR_DRAM_BANKS 1 - /* auto boot */ #define CONFIG_PREBOOT diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index abebda42926..330f020f789 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -11,7 +11,6 @@ /* U-Boot Commands */ /* Memory configuration */ -#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ #define PHYS_SDRAM_1_SIZE 0x08000000 /* Max 128 MB RAM */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index b7ac9c25340..da1d53c883d 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -14,7 +14,6 @@ /* U-Boot Commands */ /* Memory configuration */ -#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ #define PHYS_SDRAM_1_SIZE 0x08000000 /* Max 128 MB RAM */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index 166f3d1861c..0ebfbd10fc6 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -28,7 +28,6 @@ /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 0x80000000 #define PHYS_SDRAM_1_SIZE (64 * 1024 * 1024) diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index c060d56328a..1117139f1cf 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -14,7 +14,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_MX28EVK /* Memory configuration */ -#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* Max 1 GB RAM */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 3ec31262338..7d84d160b4c 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -86,7 +86,6 @@ /*----------------------------------------------------------------------- * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 CSD0_BASE #define PHYS_SDRAM_1_SIZE (128 * 1024 * 1024) diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 49d923b8eb8..b57389007dd 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -103,7 +103,6 @@ /* * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1_SIZE (128 * 1024 * 1024) #define PHYS_SDRAM_2 CSD1_BASE_ADDR diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 7cccca018a7..ea53ec32603 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -167,7 +167,6 @@ /*----------------------------------------------------------------------- * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1_SIZE (512 * 1024 * 1024) diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index d15a4cab3c5..ede75450bae 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -154,7 +154,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1_SIZE (512 * 1024 * 1024) #define PHYS_SDRAM_2 CSD1_BASE_ADDR diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 5752bf17908..c03e994d9f8 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -140,7 +140,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1_SIZE (gd->bd->bi_dram[0].size) #define PHYS_SDRAM_2 CSD1_BASE_ADDR diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index 3bfba35afce..3af57825420 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -107,7 +107,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1_SIZE (512 * 1024 * 1024) diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 0c74e563a04..091a8df803d 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -150,7 +150,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1_SIZE (gd->bd->bi_dram[0].size) #define PHYS_SDRAM_2 CSD1_BASE_ADDR diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index e08e83151fb..930fcea949c 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -179,7 +179,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1_SIZE (gd->bd->bi_dram[0].size) #define PHYS_SDRAM_2 CSD1_BASE_ADDR diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index 0887fe7d611..d3439f5258c 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -99,7 +99,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1_SIZE (512 * 1024 * 1024) #define PHYS_SDRAM_2 CSD1_BASE_ADDR diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 7fa63fd9355..eb92c568273 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -134,7 +134,6 @@ #endif /* CONFIG_SPL_BUILD */ /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h index fea0cada2ac..58d5ebf5647 100644 --- a/include/configs/mx6memcal.h +++ b/include/configs/mx6memcal.h @@ -39,7 +39,6 @@ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + 16) /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 7664b22476a..4db5d3de29c 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -107,7 +107,6 @@ #define CONFIG_SYS_MEMTEST_END 0x10010000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 99ecc412a63..cb4fdad3705 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -174,7 +174,6 @@ #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 4eac330a5c9..72ed8d443bd 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -120,7 +120,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_512M) /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h index 4d095361e06..fb8f44684b6 100644 --- a/include/configs/mx6sllevk.h +++ b/include/configs/mx6sllevk.h @@ -113,7 +113,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_128M) /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define PHYS_SDRAM_SIZE SZ_2G diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 4510ebfe362..fbc7e429e94 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -95,7 +95,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x10000) /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index f5ca2fcf04c..5b2e1c75f52 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -127,7 +127,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x10000) /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index da2a67fc211..48b4327af97 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -147,7 +147,6 @@ #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 10d0969ac32..c64d0929abc 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -133,7 +133,6 @@ #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 87d2b52ef14..1bbe0605748 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -169,7 +169,6 @@ #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 9f8c0641d0d..3d32ff17acd 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -73,7 +73,6 @@ #define CONFIG_SYS_MAXARGS 256 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM 0x60000000 #define PHYS_SDRAM_SIZE SZ_1G diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 4e375d88d1d..706a54da717 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -147,7 +147,6 @@ #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 40e735101b8..c5dffffa20f 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -322,7 +322,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); /* * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 /* diff --git a/include/configs/novena.h b/include/configs/novena.h index 81f7d471aaf..283eac16cc3 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -39,7 +39,6 @@ #define CONFIG_HOSTNAME "novena" /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 67a790ef02f..8d1733becf9 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -21,7 +21,6 @@ #define CONFIG_MACH_TYPE 4289 -#define CONFIG_NR_DRAM_BANKS 8 #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */ #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index f495f6219ba..d433bdd5a73 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -19,7 +19,6 @@ #define TZPC_BASE_OFFSET 0x10000 -#define CONFIG_NR_DRAM_BANKS 8 #define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */ /* Reserve the last 22 MiB for the secure firmware */ #define CONFIG_SYS_MEM_TOP_HIDE (22UL << 20UL) diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 1599b6f0ba1..d4079166c4c 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -11,8 +11,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ - #include <configs/ti_omap3_common.h> /* diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 72f04c3c18c..9e494a52421 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -19,8 +19,6 @@ #ifndef __OMAP3_CAIRO_CONFIG_H #define __OMAP3_CAIRO_CONFIG_H -#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ - /* * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM * 64 bytes before this address should be set aside for u-boot.img's diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 6e5c3005ced..68147946da8 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -16,8 +16,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ - #include <configs/ti_omap3_common.h> /* diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 4254330ee20..5bb908db7bf 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -9,8 +9,6 @@ #ifndef __IGEP00X0_H #define __IGEP00X0_H -#define CONFIG_NR_DRAM_BANKS 2 - #include <configs/ti_omap3_common.h> /* diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index d39546f15ca..77795f5f2dd 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -12,8 +12,6 @@ /* High Level Configuration Options */ -#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ - #include <configs/ti_omap3_common.h> /* diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index bcad26b2f12..b562bbd8362 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -6,8 +6,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ - #include <configs/ti_omap3_common.h> /* * We are only ever GP parts and will utilize all of the "downloaded image" diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 8edd16d3954..192c4c685bf 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ - /* override base for compatibility with MLO the device ships with */ #include <configs/ti_omap3_common.h> diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index ca03fc167d6..f0f199336f5 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -12,7 +12,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ #include <asm/arch/cpu.h> /* get chip and board defs */ #include <asm/arch/omap.h> #include <configs/ti_omap3_common.h> diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index a68c18f625a..2eb81ce14d5 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -50,8 +50,6 @@ /* memtest will be run on 16MB */ #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + 0x2000000 + 16*1024*1024) -#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ - #define CONFIG_SYS_DA850_SYSCFG_SUSPSRC ( \ DAVINCI_SYSCFG_SUSPSRC_TIMER0 | \ DAVINCI_SYSCFG_SUSPSRC_SPI1 | \ diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h index b634d9eb03c..b16879d48ab 100644 --- a/include/configs/opos6uldev.h +++ b/include/configs/opos6uldev.h @@ -25,7 +25,6 @@ #define CONFIG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE diff --git a/include/configs/origen.h b/include/configs/origen.h index 65e1c7c0c78..ece6f6d3af8 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_DCACHE_OFF 1 /* ORIGEN has 4 bank of DRAM */ -#define CONFIG_NR_DRAM_BANKS 4 #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE #define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */ diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index a4be49707bf..700c7666da3 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -90,7 +90,6 @@ #define CONFIG_IMX_THERMAL /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h index eddb201d4af..cfe8d8cbede 100644 --- a/include/configs/p2771-0000.h +++ b/include/configs/p2771-0000.h @@ -48,7 +48,4 @@ /* Crystal is 38.4MHz. clk_m runs at half that rate */ #define COUNTER_FREQUENCY 19200000 -#undef CONFIG_NR_DRAM_BANKS -#define CONFIG_NR_DRAM_BANKS (1024 + 2) - #endif diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 1885577ce5a..2d213718d4d 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -189,7 +189,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Physical memory map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM (0x80000000) #define PHYS_SDRAM_SIZE (CONFIG_PCM052_DDR_SIZE * 1024 * 1024) diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 6da624af6e0..481b323a3c6 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -63,7 +63,6 @@ /* Filesystem support */ /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h index d90eb14f6f4..2261c7a1785 100644 --- a/include/configs/peach-pi.h +++ b/include/configs/peach-pi.h @@ -37,7 +37,6 @@ #define CONFIG_POWER_TPS65090_EC /* DRAM Memory Banks */ -#define CONFIG_NR_DRAM_BANKS 7 #define SDRAM_BANK_SIZE (512UL << 20UL) /* 512 MB */ #endif /* __CONFIG_PEACH_PI_H */ diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h index b87b36a9c65..6a36536251a 100644 --- a/include/configs/peach-pit.h +++ b/include/configs/peach-pit.h @@ -28,7 +28,6 @@ #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" /* DRAM Memory Banks */ -#define CONFIG_NR_DRAM_BANKS 4 #define SDRAM_BANK_SIZE (512UL << 20UL) /* 512 MB */ #endif /* __CONFIG_PEACH_PIT_H */ diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h index 690efd74af8..2853af7af8a 100644 --- a/include/configs/pfla02.h +++ b/include/configs/pfla02.h @@ -64,7 +64,6 @@ /* Various command support */ /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 038b0a47788..2129c29c16d 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -120,7 +120,6 @@ #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 13e735379ed..b84c39c89ff 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -101,7 +101,6 @@ #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index 585db0ef532..0b240e7ebc3 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -66,7 +66,6 @@ */ /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 ATMEL_BASE_CS1 /* on DDRSDRC1 */ #define PHYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */ #define PHYS_SDRAM_2 ATMEL_BASE_CS6 /* on DDRSDRC0 */ diff --git a/include/configs/platinum.h b/include/configs/platinum.h index a780cca5926..ae7fb104cf1 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -45,7 +45,6 @@ #define CONFIG_MXC_USB_FLAGS 0 /* Memory config */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #ifndef PHYS_SDRAM_SIZE #define PHYS_SDRAM_SIZE (1024 << 20) diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 015eeab21c9..9dcb3b0c1b7 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -154,7 +154,6 @@ #define CONFIG_BOOTP_BOOTFILESIZE 1 /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM 0x20000000 #define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 20ecccca570..803de1c02ca 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -168,7 +168,6 @@ #define CONFIG_BOOTP_BOOTFILESIZE 1 /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM 0x20000000 #define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 275eac83194..46b80308949 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -65,7 +65,6 @@ #define CONFIG_JFFS2_PART_SIZE (256 * 1024 * 1024) /* partition */ /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM 0x70000000 #define PHYS_SDRAM_SIZE 0x08000000 /* 128 megs */ diff --git a/include/configs/poplar.h b/include/configs/poplar.h index be4c20a7c74..0a126002d7f 100644 --- a/include/configs/poplar.h +++ b/include/configs/poplar.h @@ -14,7 +14,6 @@ #include <linux/sizes.h> /* DRAM banks */ -#define CONFIG_NR_DRAM_BANKS 2 /* SYS */ #define CONFIG_SYS_BOOTM_LEN SZ_64M diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index be516bac0c5..913ff4f2636 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -10,7 +10,6 @@ /* Physical memory map */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x40000000 /* The DTB generated by QEMU is placed at start of RAM, stay away from there */ diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index 4f24a0e7ef4..2a5cd6b832c 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -35,7 +35,6 @@ #define CONFIG_SYS_SDRAM_SIZE (RCAR_GEN2_UBOOT_SDRAM_SIZE) #define CONFIG_SYS_LOAD_ADDR 0x50000000 #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MONITOR_BASE 0x00000000 #define CONFIG_SYS_MONITOR_LEN (256 * 1024) diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 07f08db4fe7..435d1086285 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -39,7 +39,6 @@ #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE #define DRAM_RSV_SIZE 0x08000000 -#define CONFIG_NR_DRAM_BANKS 4 #define CONFIG_SYS_SDRAM_BASE (0x40000000 + DRAM_RSV_SIZE) #define CONFIG_SYS_SDRAM_SIZE (0x80000000u - DRAM_RSV_SIZE) #define CONFIG_SYS_LOAD_ADDR 0x58000000 diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 07c54b596be..d4e5406101d 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -8,7 +8,6 @@ #include <asm/arch/hardware.h> #include "rockchip-common.h" -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SKIP_LOWLEVEL_INIT @@ -29,7 +28,6 @@ #define CONFIG_BOUNCE_BUFFER #define CONFIG_SYS_SDRAM_BASE 0x60000000 -#define CONFIG_NR_DRAM_BANKS 1 #define SDRAM_BANK_SIZE (512UL << 20UL) #define SDRAM_MAX_SIZE (CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE) diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h index 94b0ae0d791..3e9e642b783 100644 --- a/include/configs/rk3128_common.h +++ b/include/configs/rk3128_common.h @@ -31,7 +31,6 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SYS_SDRAM_BASE 0x60000000 -#define CONFIG_NR_DRAM_BANKS 2 #define SDRAM_MAX_SIZE 0x80000000 #define CONFIG_SPI_FLASH diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index 1a0f28d2a77..d1837d5c4e4 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -12,7 +12,6 @@ #include "rockchip-common.h" #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_CBSIZE 1024 @@ -38,7 +37,6 @@ #define CONFIG_BOUNCE_BUFFER #define CONFIG_SYS_SDRAM_BASE 0x60000000 -#define CONFIG_NR_DRAM_BANKS 1 #define SDRAM_BANK_SIZE (2UL << 30) #define SDRAM_MAX_SIZE 0x80000000 diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index 5b9c4082da2..176bd0c26c6 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -29,7 +29,6 @@ #define CONFIG_BOUNCE_BUFFER #define CONFIG_SYS_SDRAM_BASE 0x60000000 -#define CONFIG_NR_DRAM_BANKS 2 #define SDRAM_BANK_SIZE (512UL << 20UL) #define SDRAM_MAX_SIZE 0x80000000 diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 71ae3c2316e..5388b1391e9 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -10,7 +10,6 @@ #include "rockchip-common.h" #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_CBSIZE 1024 @@ -41,7 +40,6 @@ #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #define CONFIG_SYS_SDRAM_BASE 0 -#define CONFIG_NR_DRAM_BANKS 1 #define SDRAM_BANK_SIZE (2UL << 30) #define SDRAM_MAX_SIZE 0xfe000000 diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h index 481044dc24c..9174c67cad2 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -28,7 +28,6 @@ /* FAT sd card locations. */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SYS_SDRAM_BASE 0 -#define CONFIG_NR_DRAM_BANKS 1 #define SDRAM_MAX_SIZE 0xff000000 #define CONFIG_SPI_FLASH diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h index 0e77866b403..6638491e792 100644 --- a/include/configs/rk3368_common.h +++ b/include/configs/rk3368_common.h @@ -15,7 +15,6 @@ #define CONFIG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xff000000 -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_CBSIZE 1024 diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index ee38107ea5f..eeda0707521 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -8,7 +8,6 @@ #include "rockchip-common.h" -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SKIP_LOWLEVEL_INIT @@ -39,7 +38,6 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xf8000000 -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SF_DEFAULT_SPEED 20000000 diff --git a/include/configs/rpi.h b/include/configs/rpi.h index a97550b7320..f706c723139 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -39,7 +39,6 @@ #endif /* Memory layout */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE /* diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h index dc93775fb43..2ab3b85e0c1 100644 --- a/include/configs/rv1108_common.h +++ b/include/configs/rv1108_common.h @@ -18,7 +18,6 @@ #define CONFIG_SYS_TIMER_COUNTER (CONFIG_SYS_TIMER_BASE + 8) #define CONFIG_SYS_SDRAM_BASE 0x60000000 -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0x100000) #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x2000000) diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index c6fb909174d..f6227e79fee 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -167,7 +167,6 @@ /* Physical memory map */ /* EVB board has 2x256 MB DDR chips, DDR0 and DDR1, u-boot is using just one */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM (DDR_BASE_ADDR) #define PHYS_SDRAM_SIZE (256 * 1024 * 1024) diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 80bd8b845ed..b752e856320 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -156,7 +156,6 @@ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4000000) /* Goni has 3 banks of DRAM, but swap the bank */ -#define CONFIG_NR_DRAM_BANKS 3 #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE /* OneDRAM Bank #0 */ #define PHYS_SDRAM_1_SIZE (80 << 20) /* 80 MB in Bank #0 */ #define PHYS_SDRAM_2 0x40000000 /* mDDR DMC1 Bank #1 */ diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index baa19b0dc30..d489ec2b0b9 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_L2CACHE_OFF 1 /* Universal has 2 banks of DRAM */ -#define CONFIG_NR_DRAM_BANKS 2 #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h index 0cae301da26..798136f422e 100644 --- a/include/configs/sama5d27_som1_ek.h +++ b/include/configs/sama5d27_som1_ek.h @@ -17,7 +17,6 @@ #define CONFIG_MISC_INIT_R /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x8000000 diff --git a/include/configs/sama5d2_ptc_ek.h b/include/configs/sama5d2_ptc_ek.h index d2d4adbb7fa..aaa441f8d04 100644 --- a/include/configs/sama5d2_ptc_ek.h +++ b/include/configs/sama5d2_ptc_ek.h @@ -18,7 +18,6 @@ #define CONFIG_MISC_INIT_R /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x20000000 diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index b205d8d6045..c99ad559d43 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -14,7 +14,6 @@ #define CONFIG_MISC_INIT_R /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x20000000 diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index acfb2d70142..d0d8087ca38 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -23,7 +23,6 @@ #define ATMEL_PMC_UHP (1 << 6) /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x10000000 diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 82e1a16a409..9987484a006 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -39,7 +39,6 @@ #endif /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x20000000 diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index 42e5a869417..cd4ae585e72 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -14,7 +14,6 @@ #define CONFIG_MISC_INIT_R /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x20000000 diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index c36b5084e57..aa8573d8ba0 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -12,7 +12,6 @@ #include "at91-sama5_common.h" /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x20000000 diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 1a49d1dab55..e36a5fec0ef 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -55,7 +55,6 @@ #define CONFIG_SYS_SDRAM_BASE 0 #define CONFIG_SYS_SDRAM_SIZE (128 << 20) #define CONFIG_SYS_MONITOR_BASE 0 -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h index ddbb5a27e07..1beff234db1 100644 --- a/include/configs/sansa_fuze_plus.h +++ b/include/configs/sansa_fuze_plus.h @@ -8,7 +8,6 @@ /* U-Boot Commands */ /* Memory configuration */ -#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ #define PHYS_SDRAM_1_SIZE 0x08000000 /* Max 128 MB RAM */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h index fbd977abf55..cc108920dc6 100644 --- a/include/configs/sc_sps_1.h +++ b/include/configs/sc_sps_1.h @@ -14,7 +14,6 @@ /* U-Boot Commands */ /* Memory configuration */ -#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* Max 1 GB RAM */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h index ead9bddf7fa..ab274976f55 100644 --- a/include/configs/secomx6quq7.h +++ b/include/configs/secomx6quq7.h @@ -65,7 +65,6 @@ #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define PHYS_SDRAM_SIZE (2u * 1024 * 1024 * 1024) diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 97903a08e11..4420f54ee49 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -64,7 +64,6 @@ #define CONFIG_SF_DEFAULT_SPEED (75000000) /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_DRAM_1 0x80000000 /* DRAM Bank #1 */ #define CONFIG_SYS_SDRAM_BASE PHYS_DRAM_1 diff --git a/include/configs/sksimx6.h b/include/configs/sksimx6.h index 6f6cb1ecea4..688b334d2b1 100644 --- a/include/configs/sksimx6.h +++ b/include/configs/sksimx6.h @@ -38,7 +38,6 @@ /* Filesystem support */ /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 292da54162e..114b87e1b39 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -62,7 +62,6 @@ * SDRAM: 1 bank, 64 MB, base address 0x20000000 * Already initialized before u-boot gets started. */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS1 #define CONFIG_SYS_SDRAM_SIZE (64 * SZ_1M) diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h index dd7ded6d7a6..e2d4f30b28a 100644 --- a/include/configs/smdk5420.h +++ b/include/configs/smdk5420.h @@ -34,7 +34,6 @@ #define CONFIG_USB_XHCI_EXYNOS /* DRAM Memory Banks */ -#define CONFIG_NR_DRAM_BANKS 7 #define SDRAM_BANK_SIZE (512UL << 20UL) /* 512 MB */ #endif /* __CONFIG_SMDK5420_H */ diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index aa43798c42b..ba9a8bfd094 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -118,7 +118,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE /* SMDKC100 has 1 banks of DRAM, we use only one in U-Boot */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE /* SDRAM Bank #1 */ #define PHYS_SDRAM_1_SIZE (128 << 20) /* 0x8000000, 128 MB Bank #1 */ diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index 3446489e14a..4eb4c60126a 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -50,7 +50,6 @@ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000) /* SMDKV310 has 4 bank of DRAM */ -#define CONFIG_NR_DRAM_BANKS 4 #define SDRAM_BANK_SIZE (512UL << 20UL) /* 512 MB */ #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE #define PHYS_SDRAM_1_SIZE SDRAM_BANK_SIZE diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index b0d1f449767..f212d154e9c 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -27,7 +27,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS1 #define CONFIG_SYS_SDRAM_SIZE (64 * 1024 * 1024) /* 64MB */ #define CONFIG_SYS_INIT_SP_ADDR (ATMEL_BASE_SRAM1 + 0x1000 - \ diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 32b42a87590..f2c47dabc5c 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -25,7 +25,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS6 #define CONFIG_SYS_SDRAM_SIZE (128 * 1024 * 1024) /* 64MB */ #define CONFIG_SYS_INIT_SP_ADDR (ATMEL_BASE_SRAM + 0x1000 - \ diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 7a665f64e19..e35595b5bc9 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -38,7 +38,6 @@ * DRAM */ -#define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 #define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1 diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 8ebf6b85fee..abe5fd1342c 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -20,7 +20,6 @@ /* * Memory configurations */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 0x0 #define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024) #define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1 diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index e63fe290787..ba81f3e1905 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -131,7 +131,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define PHYS_SDRAM_1 0x0 #define PHYS_SDRAM_1_SIZE (1 * 1024 * 1024 * 1024) #define CONFIG_SYS_SDRAM_BASE 0 -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MEMTEST_START 0 #define CONFIG_SYS_MEMTEST_END PHYS_SDRAM_1_SIZE - 0x200000 diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index b91b999129e..d18b999dda9 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -165,7 +165,6 @@ #define CONFIG_SYS_FLASH_EMPTY_INFO /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 0x00000000 #define PHYS_SDRAM_1_MAXSIZE 0x40000000 diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index 9ce31f44631..b67efbb1683 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -10,7 +10,6 @@ #include <linux/sizes.h> /* ram memory-related information */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 0x40000000 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define PHYS_SDRAM_1_SIZE 0x3E000000 diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index b8848f16106..ca6648fcaad 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -16,7 +16,6 @@ /* * Configuration of the external SDRAM memory */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_LOAD_ADDR 0x90400000 #define CONFIG_LOADADDR 0x90400000 diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h index b0dcddc6d57..c8c41b8c489 100644 --- a/include/configs/stm32f429-evaluation.h +++ b/include/configs/stm32f429-evaluation.h @@ -16,7 +16,6 @@ /* * Configuration of the external SDRAM memory */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_LOAD_ADDR 0x00400000 #define CONFIG_LOADADDR 0x00400000 diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h index c95f3f7de45..73a5412660a 100644 --- a/include/configs/stm32f469-discovery.h +++ b/include/configs/stm32f469-discovery.h @@ -16,7 +16,6 @@ /* * Configuration of the external SDRAM memory */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_LOAD_ADDR 0x00400000 #define CONFIG_LOADADDR 0x00400000 diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 3a76c5807a9..d97725128ce 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -20,7 +20,6 @@ /* * Configuration of the external SDRAM memory */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 8 #define CONFIG_SYS_MAX_FLASH_BANKS 1 diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h index 822ab2de77c..f110e2994c7 100644 --- a/include/configs/stm32h743-disco.h +++ b/include/configs/stm32h743-disco.h @@ -15,7 +15,6 @@ /* * Configuration of the external SDRAM memory */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_LOAD_ADDR 0xD0400000 #define CONFIG_LOADADDR 0xD0400000 diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h index b49dc1a34a8..e3bf5b27e85 100644 --- a/include/configs/stm32h743-eval.h +++ b/include/configs/stm32h743-eval.h @@ -15,7 +15,6 @@ /* * Configuration of the external SDRAM memory */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_LOAD_ADDR 0xD0400000 #define CONFIG_LOADADDR 0xD0400000 diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index 09ec429b1f4..701298cab88 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -33,8 +33,6 @@ #define CONFIG_SYS_SDRAM_BASE STM32_DDR_BASE #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE -#define CONFIG_NR_DRAM_BANKS 1 - /* * Console I/O buffer size */ diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index 9ce610ab187..fd3fb8aa9a1 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -10,7 +10,6 @@ #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH /* ram memory-related information */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 0x00000000 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define PHYS_SDRAM_1_SIZE 0x00198000 diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 93690481a1a..25993761a6f 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -101,7 +101,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_0 CONFIG_SYS_SDRAM_BASE #define PHYS_SDRAM_0_SIZE 0x80000000 /* 2 GiB */ diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index a7d3d0822b8..b1f8f76c7b9 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -103,7 +103,6 @@ /* * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 #define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1 diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 02bf54ea6fc..72208f3ef0c 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -154,7 +154,6 @@ /* * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 #define PHYS_SDRAM_1_SIZE (32 << 20) /* at least 32 MiB */ #define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1 diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 3056f49428f..4fdb0dd962e 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -58,7 +58,6 @@ * SDRAM: 1 bank, min 32, max 128 MB * Initialized before u-boot gets started. */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS1 #define CONFIG_SYS_SDRAM_SIZE (128 * SZ_1M) diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 092eef81cb4..688814dc09c 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -19,7 +19,6 @@ #define CONFIG_IMX_THERMAL /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index d8ae9d1e0d8..4d249ddfd27 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -65,7 +65,6 @@ /*----------------------------------------------------------------------- * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 NV_PA_SDRC_CS0 #define PHYS_SDRAM_1_SIZE 0x20000000 /* 512M */ diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index d71d207621a..619571d45ba 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -48,7 +48,6 @@ #define CONFIG_SYS_LOAD_ADDR (MEM_BASE) /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 (MEM_BASE) /* SDRAM Bank #1 */ #define PHYS_SDRAM_1_SIZE (0x80000000-MEM_BASE) /* 2048 MB */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index a81f3b82012..9901a8b5e24 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -97,7 +97,6 @@ /** * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 /* 1 banks of DRAM */ #define PHYS_DRAM_1_SIZE 0x20000000 /* 512MB */ #define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1024MB */ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 57f27cb90e3..55b9b45eecc 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -64,9 +64,6 @@ * initial stack pointer in our SRAM. Otherwise, we can define * CONFIG_NR_DRAM_BANKS before including this file. */ -#ifndef CONFIG_NR_DRAM_BANKS -#define CONFIG_NR_DRAM_BANKS 1 -#endif #define CONFIG_SYS_SDRAM_BASE 0x80000000 #ifndef CONFIG_SYS_INIT_SP_ADDR diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 116bfaa4d9f..3790622c76a 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -20,7 +20,6 @@ #define CONFIG_SYS_DCACHE_OFF /* Memory Configuration */ -#define CONFIG_NR_DRAM_BANKS 2 #define CONFIG_SYS_LPAE_SDRAM_BASE 0x800000000 #define CONFIG_MAX_RAM_BANK_SIZE (2 << 30) /* 2GB */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SPL_TEXT_BASE - \ diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 63098387c3c..edfdc598c56 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -124,7 +124,6 @@ #define CONFIG_BOOTCOMMAND "run nand_ubifs" /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define PHYS_SDRAM_SIZE (512 << 20) diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index f0b5c42c649..2d89205a863 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -323,7 +323,6 @@ TQMA6_EXTRA_BOOTDEV_ENV_SETTINGS \ /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/trats.h b/include/configs/trats.h index f68a70e4b1c..1977a74a286 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -22,7 +22,6 @@ #endif /* TRATS has 4 banks of DRAM */ -#define CONFIG_NR_DRAM_BANKS 4 #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE #define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */ diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 020dd76eb72..4d61f1ed398 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -21,7 +21,6 @@ #endif /* TRATS2 has 4 banks of DRAM */ -#define CONFIG_NR_DRAM_BANKS 4 #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE #define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 6b4edcc8c4a..4605bd5480f 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -198,7 +198,6 @@ #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 #define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1 diff --git a/include/configs/ts4600.h b/include/configs/ts4600.h index d314398538c..a107e96530e 100644 --- a/include/configs/ts4600.h +++ b/include/configs/ts4600.h @@ -16,7 +16,6 @@ /* U-Boot Commands */ /* Memory configuration */ -#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* Max 1 GB RAM */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index 97019c4251d..dff792d2cf9 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -120,7 +120,6 @@ /*----------------------------------------------------------------------- * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1_SIZE (256 * 1024 * 1024) diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index 5784851271d..0aebe2100b4 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -18,8 +18,6 @@ /* additions for new ARM relocation support */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 -#define CONFIG_NR_DRAM_BANKS 1 - /* auto boot */ #define CONFIG_PREBOOT diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 23bdff3348c..2a5d8121879 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -142,7 +142,6 @@ "else run netboot; fi" /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h index 2924e3143a1..bc3d627ef56 100644 --- a/include/configs/udoo_neo.h +++ b/include/configs/udoo_neo.h @@ -64,7 +64,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x10000) /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 43add0e5a2a..21ed1d368a5 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -202,7 +202,6 @@ #define CONFIG_SYS_BOOTMAPSZ 0x20000000 #define CONFIG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_NR_DRAM_BANKS 3 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE) diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index a13fee6938c..aa8738fe733 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -39,7 +39,6 @@ #define CONFIG_BOOTP_BOOTFILESIZE /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS1 #define CONFIG_SYS_SDRAM_SIZE 0x04000000 diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index e17514cd49b..270f325a55e 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -82,7 +82,6 @@ #endif /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM CSD0_BASE_ADDR #define PHYS_SDRAM_SIZE (gd->ram_size) diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 7184aefd425..36f535e9a49 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -126,11 +126,8 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #ifdef CONFIG_TARGET_VEXPRESS64_JUNO -#define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_2 (0x880000000) #define PHYS_SDRAM_2_SIZE 0x180000000 -#else -#define CONFIG_NR_DRAM_BANKS 1 #endif /* Enable memtest */ diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 30dda0c085e..2ad3338a2b5 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -151,7 +151,6 @@ #define LINUX_BOOT_PARAM_ADDR (V2M_BASE + 0x2000) /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 (V2M_BASE) /* SDRAM Bank #1 */ #define PHYS_SDRAM_2 (((unsigned int)V2M_BASE) + \ ((unsigned int)0x20000000)) diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index effae2b0bad..cc6fef4d83d 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -179,7 +179,6 @@ #define CONFIG_SYS_MEMTEST_END 0x87C00000 /* Physical memory map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM (0x80000000) #define PHYS_SDRAM_SIZE (128 * 1024 * 1024) diff --git a/include/configs/vinco.h b/include/configs/vinco.h index e8dd5cf07cd..9d6001ff03c 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -25,7 +25,6 @@ #define CONFIG_SYS_TIMER_COUNTER 0xfc06863c /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x4000000 diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index 43f986342de..40951fb3dbe 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -33,7 +33,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x10000) /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index cb32cd11f94..7f1c925d02f 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -137,7 +137,6 @@ #include <config_distro_bootcmd.h> /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/warp.h b/include/configs/warp.h index 1fc35c1a0e9..f9c095dad3c 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -34,7 +34,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_256M) /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 2a7789baa26..1b656a5aaf6 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -103,7 +103,6 @@ #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h index c9dd3915b01..0ca5ef8d4d7 100644 --- a/include/configs/wb45n.h +++ b/include/configs/wb45n.h @@ -32,7 +32,6 @@ #define CONFIG_BOOTP_BOOTFILESIZE /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x04000000 /* 64 MB */ diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h index 70ea48a9a3b..40ca9d602b9 100644 --- a/include/configs/wb50n.h +++ b/include/configs/wb50n.h @@ -36,7 +36,6 @@ #define CONFIG_BOOTP_BOOTFILESIZE /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_DDRCS #define CONFIG_SYS_SDRAM_SIZE 0x04000000 diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 88ee59259ca..0c98303c198 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -97,7 +97,6 @@ /* * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 CSD0_BASE_ADDR #define PHYS_SDRAM_1_SIZE (256 * 1024 * 1024) diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 73a107e3c3f..f453f016751 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -31,7 +31,6 @@ /* * Memory configurations */ -#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MALLOC_LEN SZ_1M #define CONFIG_SYS_SDRAM_BASE EMC_DYCS0_BASE #define CONFIG_SYS_SDRAM_SIZE SZ_128M diff --git a/include/configs/x600.h b/include/configs/x600.h index 74f4dfc55d2..3cba30298e7 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -183,7 +183,6 @@ "\0" /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 0x00000000 #define PHYS_SDRAM_1_MAXSIZE 0x40000000 diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 098703064cf..cc621cb942b 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -16,7 +16,6 @@ */ #define CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_PHYSMEM -#define CONFIG_NR_DRAM_BANKS 8 #define CONFIG_LMB diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h index eda91648205..afc4b82fd80 100644 --- a/include/configs/xfi3.h +++ b/include/configs/xfi3.h @@ -8,7 +8,6 @@ /* U-Boot Commands */ /* Memory configuration */ -#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ #define PHYS_SDRAM_1_SIZE 0x08000000 /* Max 128 MB RAM */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index b1e44d55c2a..e498b422fe2 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -23,9 +23,6 @@ # define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 #endif -#ifndef CONFIG_NR_DRAM_BANKS -# define CONFIG_NR_DRAM_BANKS 2 -#endif #define CONFIG_SYS_MEMTEST_START 0 #define CONFIG_SYS_MEMTEST_END 1000 diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h index becb125f0a5..1387d39e791 100644 --- a/include/configs/xilinx_zynqmp_mini.h +++ b/include/configs/xilinx_zynqmp_mini.h @@ -30,7 +30,4 @@ #undef CONFIG_BOOTP_BOOTFILESIZE #undef CONFIG_BOOTP_MAY_FAIL -#undef CONFIG_NR_DRAM_BANKS -#define CONFIG_NR_DRAM_BANKS 1 - #endif /* __CONFIG_ZYNQMP_MINI_H */ diff --git a/include/configs/xilinx_zynqmp_r5.h b/include/configs/xilinx_zynqmp_r5.h index 05105e5d44e..4eb3312e2d2 100644 --- a/include/configs/xilinx_zynqmp_r5.h +++ b/include/configs/xilinx_zynqmp_r5.h @@ -26,8 +26,6 @@ #define CONFIG_SYS_MAXARGS 32 /* max number of command args */ -#define CONFIG_NR_DRAM_BANKS 1 - #define CONFIG_SYS_MALLOC_LEN 0x1400000 #define CONFIG_SYS_INIT_RAM_ADDR 0xFFFF0000 diff --git a/include/configs/xpress.h b/include/configs/xpress.h index 405ff462687..c8431f4762e 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -39,7 +39,6 @@ #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define PHYS_SDRAM_SIZE (128 << 20) diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index e48896a511e..17b9a5987a2 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -91,7 +91,6 @@ unsigned char zipitz2_spi_read(void); /* * DRAM Map */ -#define CONFIG_NR_DRAM_BANKS 1 /* We have 1 bank of DRAM */ #define PHYS_SDRAM_1 0xa0000000 /* SDRAM Bank #1 */ #define PHYS_SDRAM_1_SIZE 0x02000000 /* 32 MB */ diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index 576a73feb02..1d1cfa0c56f 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -73,7 +73,6 @@ #endif /* CONFIG_CMD_USB */ /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM 0x80000000 /* start address of LPDDRRAM */ #define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 2506d2b8060..bd65d20b215 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -227,10 +227,6 @@ #define CONFIG_CLOCKS #define CONFIG_SYS_MAXARGS 32 /* max number of command args */ -#ifndef CONFIG_NR_DRAM_BANKS -# define CONFIG_NR_DRAM_BANKS 1 -#endif - #define CONFIG_SYS_MEMTEST_START 0 #define CONFIG_SYS_MEMTEST_END 0x1000 |