[PoC 115/241] global: Migrate CONFIG_MEM_INIT_VALUE to CFG

Tom Rini
2022-11-20T14:09:33Z

drivers/ddr/fsl/ctrl_regs.c | 6 +++---
drivers/ddr/fsl/mpc85xx_ddr_gen1.c | 2 +-
drivers/dma/fsl_dma.c | 2 +-
include/configs/MPC8548CDS.h | 2 +-
include/configs/P1010RDB.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/kontron_sl28.h | 2 +-
include/configs/ls1021aqds.h | 2 +-
include/configs/ls1043aqds.h | 2 +-
include/configs/ls1043ardb.h | 2 +-
include/configs/ls1046aqds.h | 2 +-
include/configs/ls1046ardb.h | 2 +-
include/configs/ls1088aqds.h | 2 +-
include/configs/ls1088ardb.h | 2 +-
include/configs/ls2080aqds.h | 2 +-
include/configs/ls2080ardb.h | 2 +-
include/configs/lx2160a_common.h | 2 +-
include/configs/socrates.h | 2 +-
scripts/config_whitelist.txt | 2 +-
23 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index df7ec484651a..684975eebc2d 100644
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -938,7 +938,7 @@ static void set_ddr_sdram_cfg_2(const unsigned int ctrl_num,
#if defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)
/* Use the DDR controller to auto initialize memory. */
d_init = popts->ecc_init_using_memctl;
- ddr->ddr_data_init = CONFIG_MEM_INIT_VALUE;
+ ddr->ddr_data_init = CFG_MEM_INIT_VALUE;
debug("DDR: ddr_data_init = 0x%08x\n", ddr->ddr_data_init);
#else
/* Memory will be initialized via DMA, or not at all. */
@@ -1847,8 +1847,8 @@ static void set_ddr_data_init(fsl_ddr_cfg_regs_t *ddr)
{
unsigned int init_value; /* Initialization value */

-#ifdef CONFIG_MEM_INIT_VALUE
- init_value = CONFIG_MEM_INIT_VALUE;
+#ifdef CFG_MEM_INIT_VALUE
+ init_value = CFG_MEM_INIT_VALUE;
#else
init_value = 0xDEADBEEF;
#endif
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
index 0f1e99eeb039..ec8c79199b29 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
@@ -73,7 +73,7 @@ ddr_enable_ecc(unsigned int dram_size)
struct ccsr_ddr __iomem *ddr =
(struct ccsr_ddr __iomem *)(CFG_SYS_FSL_DDR_ADDR);

- dma_meminit(CONFIG_MEM_INIT_VALUE, dram_size);
+ dma_meminit(CFG_MEM_INIT_VALUE, dram_size);

/*
* Enable errors for ECC.
diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c
index cd78e45d888a..8620c8f45d6f 100644
--- a/drivers/dma/fsl_dma.c
+++ b/drivers/dma/fsl_dma.c
@@ -142,7 +142,7 @@ void dma_meminit(uint val, uint size)
if (((uint)p & 0x1f) == 0)
ppcDcbz((ulong)p);

- *p = (uint)CONFIG_MEM_INIT_VALUE;
+ *p = (uint)CFG_MEM_INIT_VALUE;

if (((uint)p & 0x1c) == 0x1c)
ppcDcbf((ulong)p);
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 5f2fc5516d5e..28315eef765d 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -31,7 +31,7 @@

/* DDR Setup */

-#define CONFIG_MEM_INIT_VALUE 0xDeadBeef
+#define CFG_MEM_INIT_VALUE 0xDeadBeef

#define CFG_SYS_DDR_SDRAM_BASE 0x00000000 /* DDR is system memory*/
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 794289627fe8..a486fb7d6bd5 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -104,7 +104,7 @@
/* DDR Setup */
#define SPD_EEPROM_ADDRESS 0x52

-#define CONFIG_MEM_INIT_VALUE 0xDeadBeef
+#define CFG_MEM_INIT_VALUE 0xDeadBeef

#ifndef __ASSEMBLY__
extern unsigned long get_sdram_size(void);
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 36ae8394d5d6..c61d086dbe57 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -95,7 +95,7 @@
*/
#define CFG_SYS_INIT_L2CSR0 L2CSR0_L2E
#ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
+#define CFG_MEM_INIT_VALUE 0xdeadbeef
#endif

/*
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 7a31e8bcdc0a..bae6742928e3 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -65,7 +65,7 @@
*/
#define CFG_SYS_INIT_L2CSR0 L2CSR0_L2E
#ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
+#define CFG_MEM_INIT_VALUE 0xdeadbeef
#endif

/*
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 8e2566dd2175..d9841397fb6b 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -63,7 +63,7 @@
* These can be toggled for performance analysis, otherwise use default.
*/
#ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
+#define CFG_MEM_INIT_VALUE 0xdeadbeef
#endif

/*
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 6a215557104f..9e38d5e9f3a2 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -63,7 +63,7 @@
* These can be toggled for performance analysis, otherwise use default.
*/
#ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
+#define CFG_MEM_INIT_VALUE 0xdeadbeef
#endif

/*
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index bf0c3ac1318b..f1ee131aaa98 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -45,7 +45,7 @@
* These can be toggled for performance analysis, otherwise use default.
*/
#ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
+#define CFG_MEM_INIT_VALUE 0xdeadbeef
#endif

/*
diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h
index 0a1df4ad4bd0..0029499ea3c0 100644
--- a/include/configs/kontron_sl28.h
+++ b/include/configs/kontron_sl28.h
@@ -16,7 +16,7 @@
#endif

/* DDR */
-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
+#define CFG_MEM_INIT_VALUE 0xdeadbeef

#define CONFIG_VERY_BIG_RAM
#define CFG_SYS_DDR_SDRAM_BASE 0x80000000
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 69f9bacad97c..9d2622a7d69f 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -23,7 +23,7 @@
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE

#ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
+#define CFG_MEM_INIT_VALUE 0xdeadbeef
#endif

/*
diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index dab57382eddf..35662f65502f 100644
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -13,7 +13,7 @@
#define SPD_EEPROM_ADDRESS 0x51

#ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
+#define CFG_MEM_INIT_VALUE 0xdeadbeef
#endif

#ifdef CONFIG_SYS_DPAA_FMAN
diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index 12c4853ea963..80214e069cb1 100644
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -12,7 +12,7 @@
/* Physical Memory Map */

#ifndef CONFIG_SPL
-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
+#define CFG_MEM_INIT_VALUE 0xdeadbeef
#endif

/*
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index e67ded55da6b..c4fbef7e7f9a 100644
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -13,7 +13,7 @@
#define SPD_EEPROM_ADDRESS 0x51

#ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
+#define CFG_MEM_INIT_VALUE 0xdeadbeef
#endif

#ifdef CONFIG_SYS_DPAA_FMAN
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index f3904e7b3f7b..1209f16619f9 100644
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -13,7 +13,7 @@

#define SPD_EEPROM_ADDRESS 0x51

-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
+#define CFG_MEM_INIT_VALUE 0xdeadbeef

#if defined(CONFIG_QSPI_BOOT)
#define CFG_SYS_UBOOT_BASE 0x40100000
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index 0582a4568dc7..52a6a2768384 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -14,7 +14,7 @@

#define COUNTER_FREQUENCY_REAL (get_board_sys_clk()/4)

-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
+#define CFG_MEM_INIT_VALUE 0xdeadbeef
#define SPD_EEPROM_ADDRESS 0x51

diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index ee796facc06c..542495956c32 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -15,7 +15,7 @@

#define COUNTER_FREQUENCY_REAL 25000000 /* 25MHz */

-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
+#define CFG_MEM_INIT_VALUE 0xdeadbeef
#define SPD_EEPROM_ADDRESS 0x51

diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index d029d841d51e..db7e422336fe 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -16,7 +16,7 @@
#define CFG_SYS_I2C_FPGA_ADDR 0x66
#define COUNTER_FREQUENCY_REAL (get_board_sys_clk()/4)

-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
+#define CFG_MEM_INIT_VALUE 0xdeadbeef
#define SPD_EEPROM_ADDRESS1 0x51
#define SPD_EEPROM_ADDRESS2 0x52
#define SPD_EEPROM_ADDRESS3 0x53
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 73477978be46..e4c9b2c44ca6 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -21,7 +21,7 @@

#define COUNTER_FREQUENCY_REAL (get_board_sys_clk()/4)

-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
+#define CFG_MEM_INIT_VALUE 0xdeadbeef
#define SPD_EEPROM_ADDRESS1 0x51
#define SPD_EEPROM_ADDRESS2 0x52
#define SPD_EEPROM_ADDRESS3 0x53
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index a469c83fa4eb..0fc32efabc7f 100644
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -19,7 +19,7 @@
#define CFG_SYS_DDR_BLOCK2_BASE 0x2080000000ULL
#define CFG_SYS_SDRAM_SIZE 0x200000000UL
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
+#define CFG_MEM_INIT_VALUE 0xdeadbeef
#define SPD_EEPROM_ADDRESS1 0x51
#define SPD_EEPROM_ADDRESS2 0x52
#define SPD_EEPROM_ADDRESS3 0x53
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 9eee8de41644..eb5c14fff28e 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -51,7 +51,7 @@

/* DDR Setup */

-#define CONFIG_MEM_INIT_VALUE 0xDeadBeef
+#define CFG_MEM_INIT_VALUE 0xDeadBeef

#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 6461fc20d698..1adb99f49ec7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -123,7 +123,7 @@ CFG_MAX_DSP_CPUS
CFG_MAX_MEM_MAPPED
CFG_MAX_RAM_BANK_SIZE
CFG_MEMSIZE_IN_BYTES
-CONFIG_MEM_INIT_VALUE
+CFG_MEM_INIT_VALUE
CONFIG_MFG_ENV_SETTINGS
CONFIG_MII_DEFAULT_TSEC
CONFIG_MIU_2BIT_21_7_INTERLEAVED
--
2.25.1