Signed-off-by: Tom Rini <tr...@konsulko.com>
---
arch/arm/mach-davinci/misc.c | 2 +-
arch/arm/mach-omap2/am33xx/board.c | 4 ++--
arch/arm/mach-omap2/sec-common.c | 2 +-
arch/arm/mach-orion5x/dram.c | 4 ++--
arch/arm/mach-orion5x/include/mach/orion5x.h | 2 +-
board/phytec/phycore_am335x_r2/board.c | 2 +-
board/ti/ks2_evm/board.c | 2 +-
include/configs/am43xx_evm.h | 2 +-
include/configs/bur_am335x_common.h | 2 +-
include/configs/cm_t43.h | 2 +-
include/configs/da850evm.h | 2 +-
include/configs/draco.h | 2 +-
include/configs/etamin.h | 2 +-
include/configs/legoev3.h | 2 +-
include/configs/omapl138_lcdk.h | 2 +-
include/configs/pxm2.h | 2 +-
include/configs/rastaban.h | 2 +-
include/configs/rut.h | 2 +-
include/configs/thuban.h | 2 +-
include/configs/ti814x_evm.h | 2 +-
include/configs/ti816x_evm.h | 2 +-
include/configs/ti_am335x_common.h | 2 +-
include/configs/ti_armv7_keystone2.h | 2 +-
scripts/config_whitelist.txt | 2 +-
24 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c
index 42078b39f8ab..cfad28c43d0a 100644
--- a/arch/arm/mach-davinci/misc.c
+++ b/arch/arm/mach-davinci/misc.c
@@ -27,7 +27,7 @@ int dram_init(void)
/* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size(
(void *)CFG_SYS_SDRAM_BASE,
- CONFIG_MAX_RAM_BANK_SIZE);
+ CFG_MAX_RAM_BANK_SIZE);
return 0;
}
diff --git a/arch/arm/mach-omap2/am33xx/board.c
b/arch/arm/mach-omap2/am33xx/board.c
index 86755d6d9543..a52d04d85c8a 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -73,7 +73,7 @@ int dram_init(void)
/* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size(
(void *)CFG_SYS_SDRAM_BASE,
- CONFIG_MAX_RAM_BANK_SIZE);
+ CFG_MAX_RAM_BANK_SIZE);
return 0;
}
@@ -521,7 +521,7 @@ void board_init_f(ulong dummy)
/* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size(
(void *)CFG_SYS_SDRAM_BASE,
- CONFIG_MAX_RAM_BANK_SIZE);
+ CFG_MAX_RAM_BANK_SIZE);
}
#endif
diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c
index 0f9b915ea3dd..64560b21e3f5 100644
--- a/arch/arm/mach-omap2/sec-common.c
+++ b/arch/arm/mach-omap2/sec-common.c
@@ -203,7 +203,7 @@ u32 get_sec_mem_start(void)
omap_sdram_size()
#else
get_ram_size((void *)CFG_SYS_SDRAM_BASE,
- CONFIG_MAX_RAM_BANK_SIZE)
+ CFG_MAX_RAM_BANK_SIZE)
#endif
- sec_mem_size));
return sec_mem_start;
diff --git a/arch/arm/mach-orion5x/dram.c b/arch/arm/mach-orion5x/dram.c
index c9a3750e48de..5647f847d78f 100644
--- a/arch/arm/mach-orion5x/dram.c
+++ b/arch/arm/mach-orion5x/dram.c
@@ -39,7 +39,7 @@ int dram_init (void)
/* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size(
(long *) orion5x_sdram_bar(0),
- CONFIG_MAX_RAM_BANK_SIZE);
+ CFG_MAX_RAM_BANK_SIZE);
return 0;
}
@@ -51,7 +51,7 @@ int dram_init_banksize(void)
gd->bd->bi_dram[i].start = orion5x_sdram_bar(i);
gd->bd->bi_dram[i].size = get_ram_size(
(long *) (gd->bd->bi_dram[i].start),
- CONFIG_MAX_RAM_BANK_SIZE);
+ CFG_MAX_RAM_BANK_SIZE);
}
return 0;
diff --git a/arch/arm/mach-orion5x/include/mach/orion5x.h
b/arch/arm/mach-orion5x/include/mach/orion5x.h
index 4b1b0b0f3716..e41d07e18cc5 100644
--- a/arch/arm/mach-orion5x/include/mach/orion5x.h
+++ b/arch/arm/mach-orion5x/include/mach/orion5x.h
@@ -53,7 +53,7 @@
#define MVCPU_WIN_ENABLE ORION5X_WIN_ENABLE
#define MVCPU_WIN_DISABLE ORION5X_WIN_DISABLE
-#define CONFIG_MAX_RAM_BANK_SIZE (64*1024*1024)
+#define CFG_MAX_RAM_BANK_SIZE (64*1024*1024)
/* include here SoC variants. 5181, 5281, 6183 should go here when
adding support for them, and this comment should then be updated. */
diff --git a/board/phytec/phycore_am335x_r2/board.c
b/board/phytec/phycore_am335x_r2/board.c
index e84dd251c254..eb573d076dd7 100644
--- a/board/phytec/phycore_am335x_r2/board.c
+++ b/board/phytec/phycore_am335x_r2/board.c
@@ -167,7 +167,7 @@ void sdram_init(void)
/* Detect memory physically present */
gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
- CONFIG_MAX_RAM_BANK_SIZE);
+ CFG_MAX_RAM_BANK_SIZE);
/* Reconfigure memory for actual detected size */
switch (gd->ram_size) {
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c
index 1683f780a33b..5dcda12105b9 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -47,7 +47,7 @@ int dram_init(void)
ddr3_size = ddr3_init();
gd->ram_size = get_ram_size((long *)CFG_SYS_SDRAM_BASE,
- CONFIG_MAX_RAM_BANK_SIZE);
+ CFG_MAX_RAM_BANK_SIZE);
#if defined(CONFIG_TI_AEMIF)
if (!(board_is_k2g_ice() || board_is_k2g_i1()))
aemif_init(ARRAY_SIZE(aemif_configs), aemif_configs);
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 3a6ffd9de0bb..f43e00e8a2b6 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -8,7 +8,7 @@
#ifndef __CONFIG_AM43XX_EVM_H
#define __CONFIG_AM43XX_EVM_H
-#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 21) /* 2GB */
+#define CFG_MAX_RAM_BANK_SIZE (1024 << 21) /* 2GB */
#define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */
#include <asm/arch/omap.h>
diff --git a/include/configs/bur_am335x_common.h
b/include/configs/bur_am335x_common.h
index 3e0b42507888..ab57e14392d0 100644
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -19,7 +19,7 @@
#endif /* CONFIG_DM */
-#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
/* Timer information */
#define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index 5a795fe99171..48ee3a50be5e 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -8,7 +8,7 @@
#ifndef __CONFIG_CM_T43_H
#define __CONFIG_CM_T43_H
-#define CONFIG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2GB */
+#define CFG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2GB */
#define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */
#include <asm/arch/omap.h>
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index cfc8330e35ae..736af88a0247 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -31,7 +31,7 @@
*/
#define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
#define PHYS_SDRAM_1_SIZE (64 << 20) /* SDRAM size 64MB */
-#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
+#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
/* memtest start addr */
/* memtest will be run on 16MB */
diff --git a/include/configs/draco.h b/include/configs/draco.h
index b56ba9132af2..4c67174572f3 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -25,7 +25,7 @@
"led1=64,0,1\0"
/* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
/* Default env settings */
#define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 32b45b1e5b8d..8b2745ea96e4 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -67,7 +67,7 @@
"led5=63,0,1\0"
/* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
#define EEPROM_ADDR_DDR3 0x90
#define EEPROM_ADDR_CHIP 0x120
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index b9ec7f379354..3a0622ab0b3b 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -27,7 +27,7 @@
*/
#define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
#define PHYS_SDRAM_1_SIZE (64 << 20) /* SDRAM size 64MB */
-#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
+#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
/* memtest start addr */
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 02b88da28efa..b1fc437395dd 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -26,7 +26,7 @@
*/
#define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
#define PHYS_SDRAM_1_SIZE (128 << 20) /* SDRAM size 128MB */
-#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
+#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
/* memtest start addr */
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 10eaeb49de62..b701e52076db 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -23,7 +23,7 @@
"led0=117,0,1\0" \
/* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* 1GB */
/* Use common default */
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 777df4c11259..2efb4d23cdda 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -32,7 +32,7 @@
"led5=63,0,1\0"
/* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
#define EEPROM_ADDR_DDR3 0x90
#define EEPROM_ADDR_CHIP 0x120
diff --git a/include/configs/rut.h b/include/configs/rut.h
index 99799f8494e0..4002bc4b6c88 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -19,7 +19,7 @@
#define DDR_PLL_FREQ 303
/* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE (256 << 20) /* 256 MiB */
+#define CFG_MAX_RAM_BANK_SIZE (256 << 20) /* 256 MiB */
/* Watchdog */
#define WATCHDOG_TRIGGER_GPIO 14
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 1753fa410d18..a5913e1e7d2c 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -25,7 +25,7 @@
"led1=64,0,1\0"
/* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
#define EEPROM_ADDR_DDR3 0x90
#define EEPROM_ADDR_CHIP 0x120
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 28dba4aa95b6..11e1936c2562 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -67,7 +67,7 @@
* Physical Memory Map
*/
#define PHYS_DRAM_1_SIZE 0x20000000 /* 512MB */
-#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1024MB */
+#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1024MB */
#define CFG_SYS_SDRAM_BASE 0x80000000
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index 2d9d2fd66e9a..ac6d46f917b8 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -19,7 +19,7 @@
#define V_OSCK 24000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK >> 1)
-#define CONFIG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2048MB */
+#define CFG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2048MB */
#define CFG_SYS_SDRAM_BASE 0x80000000
/**
diff --git a/include/configs/ti_am335x_common.h
b/include/configs/ti_am335x_common.h
index ed17b4292096..20f8643771d8 100644
--- a/include/configs/ti_am335x_common.h
+++ b/include/configs/ti_am335x_common.h
@@ -11,7 +11,7 @@
#ifndef __CONFIG_TI_AM335X_COMMON_H__
#define __CONFIG_TI_AM335X_COMMON_H__
-#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
#define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */
#include <asm/arch/omap.h>
diff --git a/include/configs/ti_armv7_keystone2.h
b/include/configs/ti_armv7_keystone2.h
index 7142d30a5994..a47f0902a267 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -15,7 +15,7 @@
/* Memory Configuration */
#define CFG_SYS_LPAE_SDRAM_BASE 0x800000000
-#define CONFIG_MAX_RAM_BANK_SIZE (2 << 30) /* 2GB */
+#define CFG_MAX_RAM_BANK_SIZE (2 << 30) /* 2GB */
#ifdef CONFIG_SYS_MALLOC_F_LEN
#define SPL_MALLOC_F_SIZE CONFIG_SYS_MALLOC_F_LEN
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index be26a6c456f2..88e4db9a9f5c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -121,7 +121,7 @@ CFG_MALLOC_F_ADDR
CFG_MALTA
CFG_MAX_DSP_CPUS
CFG_MAX_MEM_MAPPED
-CONFIG_MAX_RAM_BANK_SIZE
+CFG_MAX_RAM_BANK_SIZE
CONFIG_MEMSIZE_IN_BYTES
CONFIG_MEM_INIT_VALUE
CONFIG_MFG_ENV_SETTINGS
--
2.25.1
