Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/include/asm/arch-ls102xa/config.h | 2 +- arch/xtensa/include/asm/config.h | 2 +- drivers/ram/mpc83xx_sdram.c | 2 +- include/configs/P2041RDB.h | 2 +- include/configs/T102xRDB.h | 2 +- include/configs/T104xRDB.h | 2 +- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/T4240RDB.h | 2 +- include/configs/dra7xx_evm.h | 2 +- include/configs/kmcent2.h | 2 +- include/configs/kontron_sl28.h | 2 +- include/configs/ls1028a_common.h | 2 +- include/configs/ls1043a_common.h | 2 +- include/configs/ls1046a_common.h | 2 +- include/configs/ls1088a_common.h | 2 +- include/configs/ls2080a_common.h | 2 +- include/configs/lx2160a_common.h | 2 +- include/configs/mt7621.h | 2 +- include/configs/qemu-ppce500.h | 2 +- include/configs/rcar-gen3-common.h | 2 +- include/configs/socrates.h | 2 +- include/configs/synquacer.h | 2 +- scripts/config_whitelist.txt | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h index 86bea960f1d1..581d4b3f9a60 100644 --- a/arch/arm/include/asm/arch-ls102xa/config.h +++ b/arch/arm/include/asm/arch-ls102xa/config.h @@ -75,7 +75,7 @@ /* SATA */ #define AHCI_BASE_ADDR (CONFIG_SYS_IMMR + 0x02200000) #ifdef CONFIG_DDR_SPD -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_MAX_MEM_MAPPED ((phys_size_t)2 << 30) #endif
diff --git a/arch/xtensa/include/asm/config.h b/arch/xtensa/include/asm/config.h index aad06118cdbd..07107c936481 100644 --- a/arch/xtensa/include/asm/config.h +++ b/arch/xtensa/include/asm/config.h @@ -14,7 +14,7 @@ * restricting used physical memory to the first 128MB. */ #if XCHAL_HAVE_PTP_MMU -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_MAX_MEM_MAPPED (128 << 20) #endif
diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c index 5d022d4993bc..ca207441b3fc 100644 --- a/drivers/ram/mpc83xx_sdram.c +++ b/drivers/ram/mpc83xx_sdram.c @@ -118,7 +118,7 @@ int dram_init(void)
phys_size_t get_effective_memsize(void) { - if (!IS_ENABLED(CONFIG_VERY_BIG_RAM)) + if (!IS_ENABLED(CFG_VERY_BIG_RAM)) return gd->ram_size;
/* Limit stack to what we can reasonable map */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 2fa9d777b926..89018fc3b38f 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -62,7 +62,7 @@ /* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index dff468d93bf1..8241bba92b36 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -112,7 +112,7 @@ /* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE #if defined(CONFIG_TARGET_T1024RDB) diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 4691e99c8b82..446b40a0c93d 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -86,7 +86,7 @@ /* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index ac1a7614b6a2..dc88b4e80938 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -78,7 +78,7 @@ /* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE #define CFG_SYS_SDRAM_SIZE 2048 /* for fixed parameter use */ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 3f51554d2322..515ee7c85982 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -78,7 +78,7 @@ /* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE #define CFG_SYS_SDRAM_SIZE 2048 /* for fixed parameter use */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 9081bd03749d..5a00853c9fa2 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -60,7 +60,7 @@ /* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 2aca6ad085e6..4abf10be2c25 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -13,7 +13,7 @@
#include <environment/ti/dfu.h>
-#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_MAX_MEM_MAPPED 0x80000000
#ifndef CONFIG_QSPI_BOOT diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index aa3112d94e0e..a7cc42c526c5 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -161,7 +161,7 @@ /* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h index 0029499ea3c0..26943ebae20d 100644 --- a/include/configs/kontron_sl28.h +++ b/include/configs/kontron_sl28.h @@ -18,7 +18,7 @@ /* DDR */ #define CFG_MEM_INIT_VALUE 0xdeadbeef
-#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h index b190bfe9c8e0..cf3137281a81 100644 --- a/include/configs/ls1028a_common.h +++ b/include/configs/ls1028a_common.h @@ -12,7 +12,7 @@
/* Link Definitions */
-#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 674aa7e7cf40..777f96f7bf83 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -31,7 +31,7 @@
/* Link Definitions */
-#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 161b34e57a2f..b8b234c8c8d9 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -31,7 +31,7 @@
/* Link Definitions */
-#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 49686b4f160f..12e0347edfdf 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -29,7 +29,7 @@ /* Link Definitions */ #define CFG_SYS_FSL_QSPI_BASE 0x20000000
-#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 631392cb8dd2..81e97759205e 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -16,7 +16,7 @@
/* Link Definitions */
-#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index dea14f28828d..8305260c718b 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -13,7 +13,7 @@ #define CFG_SYS_FLASH_BASE 0x20000000
/* DDR */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 #define CFG_SYS_DDR_BLOCK2_BASE 0x2080000000ULL diff --git a/include/configs/mt7621.h b/include/configs/mt7621.h index 188f481ec1fb..803de70f3d9c 100644 --- a/include/configs/mt7621.h +++ b/include/configs/mt7621.h @@ -10,7 +10,7 @@
#define CFG_SYS_SDRAM_BASE 0x80000000
-#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_MAX_MEM_MAPPED 0x1c000000
#define CFG_SYS_INIT_SP_OFFSET 0x800000 diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index 9040874a23ea..e2dea9ba6325 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -29,7 +29,7 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); /* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index f13e9e6213bb..9e6835e615f1 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -28,7 +28,7 @@ #define DRAM_RSV_SIZE 0x08000000 #define CFG_SYS_SDRAM_BASE (0x40000000 + DRAM_RSV_SIZE) #define CFG_SYS_SDRAM_SIZE (0x80000000u - DRAM_RSV_SIZE) -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_MAX_MEM_MAPPED (0x80000000u - DRAM_RSV_SIZE)
/* ENV setting */ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 3796d3464def..3ebf3bb765f8 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -55,7 +55,7 @@
#define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM
/* I2C addresses of SPD EEPROMs */ #define SPD_EEPROM_ADDRESS 0x50 /* CTLR 0 DIMM 0 */ diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index be606ce2955b..d8b6d09c9ef7 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -14,7 +14,7 @@ #define CFG_SYS_SDRAM_BASE (0x80000000) /* Start address of DDR3 */ #define PHYS_SDRAM_SIZE (0x7c000000) /* Default size (2GB - Secure memory) */
-#define CONFIG_VERY_BIG_RAM /* SynQuacer supports up to 64GB */ +#define CFG_VERY_BIG_RAM /* SynQuacer supports up to 64GB */ #define CFG_MAX_MEM_MAPPED PHYS_SDRAM_SIZE
#define SQ_DRAMINFO_BASE (0x2e00ffc0) /* DRAM info from TF-A */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 00973c35313c..9b67ea892eb1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -247,7 +247,7 @@ CFG_USB_FAT_BOOT CFG_USB_ISP1301_I2C_ADDR CFG_U_BOOT_HDR_SIZE CFG_VAR_SIZE_SPL -CONFIG_VERY_BIG_RAM +CFG_VERY_BIG_RAM CONFIG_VSC7385_IMAGE CONFIG_VSC7385_IMAGE_SIZE CONFIG_WATCHDOG_PRESC