Skip to contentSkip to conversation

power: pmic: Guard non-DM_PMIC drivers with a check for POWER_LEGACY

PATCH In review Tom Rini 7 participants 537 messages Nov 19, 2022 – Dec 24, 2022 1 message not in the archive Page 3 of 8

Subsystems (59)
lore
Share & tools
lore
author
#134 lore raw

PATCH 88/241 global: Migrate CONFIG_L1_INIT_RAM to CFG

In reply to Tom Rini
---
 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 +-
 scripts/config_whitelist.txt | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
include/configs/P2041RDB.h +1 -1
index f2179db6b9b4..0a6fcde3913d 100644
@@ -133,7 +133,7 @@
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS + 0x8000000}
 
 /* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
+#define CFG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xffd00000	/* Initial L1 address */
 #ifdef CONFIG_PHYS_64BIT
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf
include/configs/T102xRDB.h +1 -1
index 09087a70895d..36ae8394d5d6 100644
@@ -271,7 +271,7 @@
 #endif
 
 /* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
+#define CFG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000	/* Initial L1 address */
 #ifdef CONFIG_PHYS_64BIT
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0xf
include/configs/T104xRDB.h +1 -1
index 4b7b53094446..7a31e8bcdc0a 100644
@@ -249,7 +249,7 @@
 #endif
 
 /* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
+#define CFG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000	/* Initial L1 address */
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0xf
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW	0xfe03c000
include/configs/T208xQDS.h +1 -1
index c614a539b391..8e2566dd2175 100644
@@ -247,7 +247,7 @@
 #endif
 
 /* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
+#define CFG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000 /* Initial L1 address */
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0xf
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW	0xfe03c000
include/configs/T208xRDB.h +1 -1
index 2da4f5a09b14..6a215557104f 100644
@@ -212,7 +212,7 @@
 #endif
 
 /* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
+#define CFG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000 /* Initial L1 address */
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0xf
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW	0xfe03c000
include/configs/T4240RDB.h +1 -1
index b8bfc52f07ae..bf0c3ac1318b 100644
@@ -71,7 +71,7 @@
 #define CFG_SYS_FLASH_BASE_PHYS	(0xf00000000ull | CFG_SYS_FLASH_BASE)
 
 /* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
+#define CFG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000	/* Initial L1 address */
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0xf
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW	0xfe03c000
scripts/config_whitelist.txt +1 -1
index bd22cbb231b8..ca45b1eeb514 100644
@@ -96,7 +96,7 @@ CFG_KSNET_NETCP_V1_5
 CFG_KSNET_SERDES_LANES_PER_SGMII
 CFG_KSNET_SERDES_SGMII2_BASE
 CFG_KSNET_SERDES_SGMII_BASE
-CONFIG_L1_INIT_RAM
+CFG_L1_INIT_RAM
 CONFIG_L2_CACHE
 CONFIG_LEGACY_BOOTCMD_ENV
 CONFIG_LOWPOWER_ADDR
Signature · 1 line
2.25.1
author
#135 lore raw

PATCH 89/241 global: Migrate CONFIG_L2_CACHE to CFG

In reply to Tom Rini
---
 arch/powerpc/cpu/mpc85xx/cpu_init.c | 4 ++--
 arch/powerpc/cpu/mpc85xx/fdt.c      | 4 ++--
 arch/x86/cpu/intel_common/car2.S    | 2 +-
 include/configs/MPC8548CDS.h        | 2 +-
 include/configs/P1010RDB.h          | 2 +-
 include/configs/p1_p2_rdb_pc.h      | 2 +-
 include/configs/socrates.h          | 2 +-
 scripts/config_whitelist.txt        | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)
arch/powerpc/cpu/mpc85xx/cpu_init.c +2 -2
index f07e8ab388e8..562d7074ed75 100644
@@ -515,7 +515,7 @@ int enable_cluster_l2(void)
 int l2cache_init(void)
 {
 	__maybe_unused u32 svr = get_svr();
-#ifdef CONFIG_L2_CACHE
+#ifdef CFG_L2_CACHE
 	ccsr_l2cache_t *l2cache = (void __iomem *)CFG_SYS_MPC85xx_L2_ADDR;
 #elif defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2) && defined(CONFIG_E6500)
 	struct ccsr_cluster_l2 * l2cache = (void __iomem *)CFG_SYS_FSL_CLUSTER_1_L2;
@@ -523,7 +523,7 @@ int l2cache_init(void)
 
 	puts ("L2:    ");
 
-#if defined(CONFIG_L2_CACHE)
+#if defined(CFG_L2_CACHE)
 	volatile uint cache_ctl;
 	uint ver;
 	u32 l2siz_field;
arch/powerpc/cpu/mpc85xx/fdt.c +2 -2
index a7e1df104d73..635eaed12152 100644
@@ -185,7 +185,7 @@ static inline void ft_fixup_l3cache(void *blob, int off)
 #define ft_fixup_l3cache(x, y)
 #endif
 
-#if defined(CONFIG_L2_CACHE) || \
+#if defined(CFG_L2_CACHE) || \
 	defined(CONFIG_BACKSIDE_L2_CACHE) || \
 	defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2)
 static inline void ft_fixup_l2cache_compatible(void *blob, int off)
@@ -218,7 +218,7 @@ static inline void ft_fixup_l2cache_compatible(void *blob, int off)
 }
 #endif
 
-#if defined(CONFIG_L2_CACHE)
+#if defined(CFG_L2_CACHE)
 /* return size in kilobytes */
 static inline u32 l2cache_size(void)
 {
arch/x86/cpu/intel_common/car2.S +1 -1
index f8cf78586d02..908f2251b67a 100644
@@ -246,7 +246,7 @@ car_cqos:
 	or	$(PREFETCH_L1_DISABLE | PREFETCH_L2_DISABLE), %eax
 	wrmsr
 
-#if (CONFIG_DCACHE_RAM_SIZE == CONFIG_L2_CACHE_SIZE)
+#if (CONFIG_DCACHE_RAM_SIZE == CFG_L2_CACHE_SIZE)
 /*
  * If CAR size is set to full L2 size, mask is calculated as all-zeros.
  * This is not supported by the CPU/uCode.
include/configs/MPC8548CDS.h +1 -1
index d2a70aa88f88..5f2fc5516d5e 100644
@@ -20,7 +20,7 @@
 /*
  * These can be toggled for performance analysis, otherwise use default.
  */
-#define CONFIG_L2_CACHE			/* toggle L2 cache */
+#define CFG_L2_CACHE			/* toggle L2 cache */
 
 /*
  * Only possible on E500 Version 2 or newer cores.
include/configs/P1010RDB.h +1 -1
index 67ee74ba6232..794289627fe8 100644
@@ -99,7 +99,7 @@
 /*
  * These can be toggled for performance analysis, otherwise use default.
  */
-#define CONFIG_L2_CACHE			/* toggle L2 cache */
+#define CFG_L2_CACHE			/* toggle L2 cache */
 
 /* DDR Setup */
 #define SPD_EEPROM_ADDRESS		0x52
include/configs/p1_p2_rdb_pc.h +1 -1
index de6440a07564..c8ecd2dc0fca 100644
@@ -112,7 +112,7 @@
 /*
  * These can be toggled for performance analysis, otherwise use default.
  */
-#define CONFIG_L2_CACHE
+#define CFG_L2_CACHE
 
 #define CFG_SYS_CCSRBAR		0xffe00000
 #define CFG_SYS_CCSRBAR_PHYS_LOW	CFG_SYS_CCSRBAR
include/configs/socrates.h +1 -1
index fb2b76eb829a..9eee8de41644 100644
@@ -40,7 +40,7 @@
 /*
  * These can be toggled for performance analysis, otherwise use default.
  */
-#define CONFIG_L2_CACHE			/* toggle L2 cache		*/
+#define CFG_L2_CACHE			/* toggle L2 cache		*/
 
 #define CFG_SYS_INIT_DBCR DBCR_IDM		/* Enable Debug Exceptions	*/
 
scripts/config_whitelist.txt +1 -1
index ca45b1eeb514..07fd8dbeab11 100644
@@ -97,7 +97,7 @@ CFG_KSNET_SERDES_LANES_PER_SGMII
 CFG_KSNET_SERDES_SGMII2_BASE
 CFG_KSNET_SERDES_SGMII_BASE
 CFG_L1_INIT_RAM
-CONFIG_L2_CACHE
+CFG_L2_CACHE
 CONFIG_LEGACY_BOOTCMD_ENV
 CONFIG_LOWPOWER_ADDR
 CONFIG_LOWPOWER_FLAG
Signature · 1 line
2.25.1
author
#136 lore raw

PATCH 90/241 global: Migrate CONFIG_LEGACY_BOOTCMD_ENV to CFG

In reply to Tom Rini
---
 include/configs/pic32mzdask.h | 4 ++--
 scripts/config_whitelist.txt  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
include/configs/pic32mzdask.h +2 -2
index 60c747327588..0ae4fc55a97b 100644
@@ -52,7 +52,7 @@
 	"fdt_addr_r=0x89d00000\0"				\
 	"scriptaddr=0x88300000\0"				\
 
-#define CONFIG_LEGACY_BOOTCMD_ENV					\
+#define CFG_LEGACY_BOOTCMD_ENV					\
 	"legacy_bootcmd= "						\
 		"if load mmc 0 ${scriptaddr} uEnv.txt; then "		\
 			"env import -tr ${scriptaddr} ${filesize}; "	\
@@ -71,7 +71,7 @@
 
 #define CFG_EXTRA_ENV_SETTINGS	\
 	MEM_LAYOUT_ENV_SETTINGS		\
-	CONFIG_LEGACY_BOOTCMD_ENV	\
+	CFG_LEGACY_BOOTCMD_ENV	\
 	BOOTENV
 
 #endif	/* __PIC32MZDASK_CONFIG_H */
scripts/config_whitelist.txt +1 -1
index 07fd8dbeab11..495467153157 100644
@@ -98,7 +98,7 @@ CFG_KSNET_SERDES_SGMII2_BASE
 CFG_KSNET_SERDES_SGMII_BASE
 CFG_L1_INIT_RAM
 CFG_L2_CACHE
-CONFIG_LEGACY_BOOTCMD_ENV
+CFG_LEGACY_BOOTCMD_ENV
 CONFIG_LOWPOWER_ADDR
 CONFIG_LOWPOWER_FLAG
 CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY
Signature · 1 line
2.25.1
author
#137 lore raw

PATCH 91/241 global: Migrate CONFIG_LOWPOWER_ADDR to CFG

In reply to Tom Rini
---
 arch/arm/mach-exynos/lowlevel_init.c | 2 +-
 include/configs/exynos5420-common.h  | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/lowlevel_init.c +1 -1
index 9225d2cc1f2a..02a79962af24 100644
@@ -161,7 +161,7 @@ static void secondary_cores_configure(void)
 
 	/* set lowpower flag and address */
 	writel(CPU_RST_FLAG_VAL, CONFIG_LOWPOWER_FLAG);
-	writel((uint32_t)&low_power_start, CONFIG_LOWPOWER_ADDR);
+	writel((uint32_t)&low_power_start, CFG_LOWPOWER_ADDR);
 	writel(CPU_RST_FLAG_VAL, EXYNOS5420_SPARE_BASE);
 	/* Store jump address for power down */
 	writel((uint32_t)&power_down_core, CONFIG_PHY_IRAM_BASE + 0x4);
include/configs/exynos5420-common.h +1 -1
index d5f480de0ef7..d7db17b2dc92 100644
@@ -18,6 +18,6 @@
  * Low Power settings
  */
 #define CONFIG_LOWPOWER_FLAG		0x02020028
-#define CONFIG_LOWPOWER_ADDR		0x0202002C
+#define CFG_LOWPOWER_ADDR		0x0202002C
 
 #endif	/* __CONFIG_EXYNOS5420_H */
scripts/config_whitelist.txt +1 -1
index 495467153157..f2d7a0202c22 100644
@@ -99,7 +99,7 @@ CFG_KSNET_SERDES_SGMII_BASE
 CFG_L1_INIT_RAM
 CFG_L2_CACHE
 CFG_LEGACY_BOOTCMD_ENV
-CONFIG_LOWPOWER_ADDR
+CFG_LOWPOWER_ADDR
 CONFIG_LOWPOWER_FLAG
 CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY
 CONFIG_LPC32XX_NAND_MLC_NAND_TA
Signature · 1 line
2.25.1
author
#138 lore raw

PATCH 92/241 global: Migrate CONFIG_LOWPOWER_FLAG to CFG

In reply to Tom Rini
---
 arch/arm/mach-exynos/lowlevel_init.c | 4 ++--
 include/configs/exynos5420-common.h  | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-exynos/lowlevel_init.c +2 -2
index 02a79962af24..243b5c80c90e 100644
@@ -73,7 +73,7 @@ static void low_power_start(void)
 
 	reg_val = readl(EXYNOS5420_SPARE_BASE);
 	if (reg_val != CPU_RST_FLAG_VAL) {
-		writel(0x0, CONFIG_LOWPOWER_FLAG);
+		writel(0x0, CFG_LOWPOWER_FLAG);
 		branch_bx(0x0);
 	}
 
@@ -160,7 +160,7 @@ static void secondary_cores_configure(void)
 	writel(0x0, (EXYNOS_RELOCATE_CODE_BASE + 0x1C));
 
 	/* set lowpower flag and address */
-	writel(CPU_RST_FLAG_VAL, CONFIG_LOWPOWER_FLAG);
+	writel(CPU_RST_FLAG_VAL, CFG_LOWPOWER_FLAG);
 	writel((uint32_t)&low_power_start, CFG_LOWPOWER_ADDR);
 	writel(CPU_RST_FLAG_VAL, EXYNOS5420_SPARE_BASE);
 	/* Store jump address for power down */
include/configs/exynos5420-common.h +1 -1
index d7db17b2dc92..b617c062881b 100644
@@ -17,7 +17,7 @@
 /*
  * Low Power settings
  */
-#define CONFIG_LOWPOWER_FLAG		0x02020028
+#define CFG_LOWPOWER_FLAG		0x02020028
 #define CFG_LOWPOWER_ADDR		0x0202002C
 
 #endif	/* __CONFIG_EXYNOS5420_H */
scripts/config_whitelist.txt +1 -1
index f2d7a0202c22..99942bf36472 100644
@@ -100,7 +100,7 @@ CFG_L1_INIT_RAM
 CFG_L2_CACHE
 CFG_LEGACY_BOOTCMD_ENV
 CFG_LOWPOWER_ADDR
-CONFIG_LOWPOWER_FLAG
+CFG_LOWPOWER_FLAG
 CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY
 CONFIG_LPC32XX_NAND_MLC_NAND_TA
 CONFIG_LPC32XX_NAND_MLC_RD_HIGH
Signature · 1 line
2.25.1
author
#139 lore raw

PATCH 93/241 global: Migrate CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +1 -1
index a884c65d18b8..dd3f35def0fa 100644
@@ -142,7 +142,7 @@ static void lpc32xx_nand_init(void)
 
 	writel(
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) |
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) |
+		clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
include/configs/work_92105.h +1 -1
index 010da1531ff9..a1ecd8ceef02 100644
@@ -28,7 +28,7 @@
  */
 
 #define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY  333333333
-#define CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
+#define CFG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
 #define CONFIG_LPC32XX_NAND_MLC_NAND_TA      18181818
 #define CONFIG_LPC32XX_NAND_MLC_RD_HIGH      31250000
 #define CONFIG_LPC32XX_NAND_MLC_RD_LOW       45454545
scripts/config_whitelist.txt +1 -1
index 99942bf36472..b38db2586a4f 100644
@@ -101,7 +101,7 @@ CFG_L2_CACHE
 CFG_LEGACY_BOOTCMD_ENV
 CFG_LOWPOWER_ADDR
 CFG_LOWPOWER_FLAG
-CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY
+CFG_LPC32XX_NAND_MLC_BUSY_DELAY
 CONFIG_LPC32XX_NAND_MLC_NAND_TA
 CONFIG_LPC32XX_NAND_MLC_RD_HIGH
 CONFIG_LPC32XX_NAND_MLC_RD_LOW
Signature · 1 line
2.25.1
author
#140 lore raw

PATCH 94/241 global: Migrate CONFIG_LPC32XX_NAND_MLC_NAND_TA to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +1 -1
index dd3f35def0fa..cd3831b5ffeb 100644
@@ -143,7 +143,7 @@ static void lpc32xx_nand_init(void)
 	writel(
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) |
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
+		clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH,    0x0F, 4) |
include/configs/work_92105.h +1 -1
index a1ecd8ceef02..d345382545e5 100644
@@ -29,7 +29,7 @@
 
 #define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY  333333333
 #define CFG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
-#define CONFIG_LPC32XX_NAND_MLC_NAND_TA      18181818
+#define CFG_LPC32XX_NAND_MLC_NAND_TA      18181818
 #define CONFIG_LPC32XX_NAND_MLC_RD_HIGH      31250000
 #define CONFIG_LPC32XX_NAND_MLC_RD_LOW       45454545
 #define CONFIG_LPC32XX_NAND_MLC_WR_HIGH      40000000
scripts/config_whitelist.txt +1 -1
index b38db2586a4f..bb3b1443ed5c 100644
@@ -102,7 +102,7 @@ CFG_LEGACY_BOOTCMD_ENV
 CFG_LOWPOWER_ADDR
 CFG_LOWPOWER_FLAG
 CFG_LPC32XX_NAND_MLC_BUSY_DELAY
-CONFIG_LPC32XX_NAND_MLC_NAND_TA
+CFG_LPC32XX_NAND_MLC_NAND_TA
 CONFIG_LPC32XX_NAND_MLC_RD_HIGH
 CONFIG_LPC32XX_NAND_MLC_RD_LOW
 CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY
Signature · 1 line
2.25.1
author
#141 lore raw

PATCH 95/241 global: Migrate CONFIG_LPC32XX_NAND_MLC_RD_HIGH to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +1 -1
index cd3831b5ffeb..388be16e2e71 100644
@@ -144,7 +144,7 @@ static void lpc32xx_nand_init(void)
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
+		clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH,    0x0F, 4) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW,     0x0F, 0),
include/configs/work_92105.h +1 -1
index d345382545e5..3959051a4ca6 100644
@@ -30,7 +30,7 @@
 #define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY  333333333
 #define CFG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
 #define CFG_LPC32XX_NAND_MLC_NAND_TA      18181818
-#define CONFIG_LPC32XX_NAND_MLC_RD_HIGH      31250000
+#define CFG_LPC32XX_NAND_MLC_RD_HIGH      31250000
 #define CONFIG_LPC32XX_NAND_MLC_RD_LOW       45454545
 #define CONFIG_LPC32XX_NAND_MLC_WR_HIGH      40000000
 #define CONFIG_LPC32XX_NAND_MLC_WR_LOW       83333333
scripts/config_whitelist.txt +1 -1
index bb3b1443ed5c..eda174693c08 100644
@@ -103,7 +103,7 @@ CFG_LOWPOWER_ADDR
 CFG_LOWPOWER_FLAG
 CFG_LPC32XX_NAND_MLC_BUSY_DELAY
 CFG_LPC32XX_NAND_MLC_NAND_TA
-CONFIG_LPC32XX_NAND_MLC_RD_HIGH
+CFG_LPC32XX_NAND_MLC_RD_HIGH
 CONFIG_LPC32XX_NAND_MLC_RD_LOW
 CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY
 CONFIG_LPC32XX_NAND_MLC_WR_HIGH
Signature · 1 line
2.25.1
author
#142 lore raw

PATCH 96/241 global: Migrate CONFIG_LPC32XX_NAND_MLC_RD_LOW to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +1 -1
index 388be16e2e71..e75ed1f2ae9c 100644
@@ -145,7 +145,7 @@ static void lpc32xx_nand_init(void)
 		clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
+		clkdiv(CFG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH,    0x0F, 4) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW,     0x0F, 0),
 		&lpc32xx_nand_mlc_registers->time_reg);
include/configs/work_92105.h +1 -1
index 3959051a4ca6..1a4617c5c02b 100644
@@ -31,7 +31,7 @@
 #define CFG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
 #define CFG_LPC32XX_NAND_MLC_NAND_TA      18181818
 #define CFG_LPC32XX_NAND_MLC_RD_HIGH      31250000
-#define CONFIG_LPC32XX_NAND_MLC_RD_LOW       45454545
+#define CFG_LPC32XX_NAND_MLC_RD_LOW       45454545
 #define CONFIG_LPC32XX_NAND_MLC_WR_HIGH      40000000
 #define CONFIG_LPC32XX_NAND_MLC_WR_LOW       83333333
 
scripts/config_whitelist.txt +1 -1
index eda174693c08..4c28d978ce8a 100644
@@ -104,7 +104,7 @@ CFG_LOWPOWER_FLAG
 CFG_LPC32XX_NAND_MLC_BUSY_DELAY
 CFG_LPC32XX_NAND_MLC_NAND_TA
 CFG_LPC32XX_NAND_MLC_RD_HIGH
-CONFIG_LPC32XX_NAND_MLC_RD_LOW
+CFG_LPC32XX_NAND_MLC_RD_LOW
 CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY
 CONFIG_LPC32XX_NAND_MLC_WR_HIGH
 CONFIG_LPC32XX_NAND_MLC_WR_LOW
Signature · 1 line
2.25.1
author
#143 lore raw

PATCH 97/241 global: Migrate CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +1 -1
index e75ed1f2ae9c..088fdb7981da 100644
@@ -141,7 +141,7 @@ static void lpc32xx_nand_init(void)
 	clk = get_hclk_clk_rate();
 
 	writel(
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) |
+		clkdiv(CFG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
include/configs/work_92105.h +1 -1
index 1a4617c5c02b..34af515037fe 100644
@@ -27,7 +27,7 @@
  * NAND chip timings for FIXME: which one?
  */
 
-#define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY  333333333
+#define CFG_LPC32XX_NAND_MLC_TCEA_DELAY  333333333
 #define CFG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
 #define CFG_LPC32XX_NAND_MLC_NAND_TA      18181818
 #define CFG_LPC32XX_NAND_MLC_RD_HIGH      31250000
scripts/config_whitelist.txt +1 -1
index 4c28d978ce8a..f0976db1a818 100644
@@ -105,7 +105,7 @@ CFG_LPC32XX_NAND_MLC_BUSY_DELAY
 CFG_LPC32XX_NAND_MLC_NAND_TA
 CFG_LPC32XX_NAND_MLC_RD_HIGH
 CFG_LPC32XX_NAND_MLC_RD_LOW
-CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY
+CFG_LPC32XX_NAND_MLC_TCEA_DELAY
 CONFIG_LPC32XX_NAND_MLC_WR_HIGH
 CONFIG_LPC32XX_NAND_MLC_WR_LOW
 CONFIG_LPC32XX_NAND_SLC_RDR_CLKS
Signature · 1 line
2.25.1
author
#144 lore raw

PATCH 98/241 global: Migrate CONFIG_LPC32XX_NAND_MLC_WR_HIGH to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +1 -1
index 088fdb7981da..31a9a22ba31f 100644
@@ -146,7 +146,7 @@ static void lpc32xx_nand_init(void)
 		clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH,    0x0F, 4) |
+		clkdiv(CFG_LPC32XX_NAND_MLC_WR_HIGH,    0x0F, 4) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW,     0x0F, 0),
 		&lpc32xx_nand_mlc_registers->time_reg);
 }
include/configs/work_92105.h +1 -1
index 34af515037fe..c67a0bb6e1a8 100644
@@ -32,7 +32,7 @@
 #define CFG_LPC32XX_NAND_MLC_NAND_TA      18181818
 #define CFG_LPC32XX_NAND_MLC_RD_HIGH      31250000
 #define CFG_LPC32XX_NAND_MLC_RD_LOW       45454545
-#define CONFIG_LPC32XX_NAND_MLC_WR_HIGH      40000000
+#define CFG_LPC32XX_NAND_MLC_WR_HIGH      40000000
 #define CONFIG_LPC32XX_NAND_MLC_WR_LOW       83333333
 
 /*
scripts/config_whitelist.txt +1 -1
index f0976db1a818..607056ade394 100644
@@ -106,7 +106,7 @@ CFG_LPC32XX_NAND_MLC_NAND_TA
 CFG_LPC32XX_NAND_MLC_RD_HIGH
 CFG_LPC32XX_NAND_MLC_RD_LOW
 CFG_LPC32XX_NAND_MLC_TCEA_DELAY
-CONFIG_LPC32XX_NAND_MLC_WR_HIGH
+CFG_LPC32XX_NAND_MLC_WR_HIGH
 CONFIG_LPC32XX_NAND_MLC_WR_LOW
 CONFIG_LPC32XX_NAND_SLC_RDR_CLKS
 CONFIG_LPC32XX_NAND_SLC_RHOLD
Signature · 1 line
2.25.1
author
#145 lore raw

PATCH 99/241 global: Migrate CONFIG_LPC32XX_NAND_MLC_WR_LOW to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +1 -1
index 31a9a22ba31f..285411776096 100644
@@ -147,7 +147,7 @@ static void lpc32xx_nand_init(void)
 		clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_WR_HIGH,    0x0F, 4) |
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW,     0x0F, 0),
+		clkdiv(CFG_LPC32XX_NAND_MLC_WR_LOW,     0x0F, 0),
 		&lpc32xx_nand_mlc_registers->time_reg);
 }
 
include/configs/work_92105.h +1 -1
index c67a0bb6e1a8..f1a7853a80e6 100644
@@ -33,7 +33,7 @@
 #define CFG_LPC32XX_NAND_MLC_RD_HIGH      31250000
 #define CFG_LPC32XX_NAND_MLC_RD_LOW       45454545
 #define CFG_LPC32XX_NAND_MLC_WR_HIGH      40000000
-#define CONFIG_LPC32XX_NAND_MLC_WR_LOW       83333333
+#define CFG_LPC32XX_NAND_MLC_WR_LOW       83333333
 
 /*
  * NAND
scripts/config_whitelist.txt +1 -1
index 607056ade394..6eed044d853c 100644
@@ -107,7 +107,7 @@ CFG_LPC32XX_NAND_MLC_RD_HIGH
 CFG_LPC32XX_NAND_MLC_RD_LOW
 CFG_LPC32XX_NAND_MLC_TCEA_DELAY
 CFG_LPC32XX_NAND_MLC_WR_HIGH
-CONFIG_LPC32XX_NAND_MLC_WR_LOW
+CFG_LPC32XX_NAND_MLC_WR_LOW
 CONFIG_LPC32XX_NAND_SLC_RDR_CLKS
 CONFIG_LPC32XX_NAND_SLC_RHOLD
 CONFIG_LPC32XX_NAND_SLC_RSETUP
Signature · 1 line
2.25.1
author
#146 lore raw

PATCH 100/241 global: Migrate CONFIG_LPC32XX_NAND_SLC_RDR_CLKS to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_slc.c +1 -1
index f4f1b22f5e21..0f12201aa0e3 100644
@@ -130,7 +130,7 @@ static void lpc32xx_nand_init(void)
 	       TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
 	       TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) |
 	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
-	       TAC_R_RDY(CONFIG_LPC32XX_NAND_SLC_RDR_CLKS) |
+	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
 	       TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) |
 	       TAC_R_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_RHOLD) |
 	       TAC_R_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_RSETUP),
include/configs/devkit3250.h +1 -1
index ab10101f20a9..e17896841355 100644
@@ -45,7 +45,7 @@
 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH		66666666
 #define CONFIG_LPC32XX_NAND_SLC_WHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
-#define CONFIG_LPC32XX_NAND_SLC_RDR_CLKS	14
+#define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_RWIDTH		66666666
 #define CONFIG_LPC32XX_NAND_SLC_RHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_RSETUP		50000000
scripts/config_whitelist.txt +1 -1
index 6eed044d853c..8c567e45590c 100644
@@ -108,7 +108,7 @@ CFG_LPC32XX_NAND_MLC_RD_LOW
 CFG_LPC32XX_NAND_MLC_TCEA_DELAY
 CFG_LPC32XX_NAND_MLC_WR_HIGH
 CFG_LPC32XX_NAND_MLC_WR_LOW
-CONFIG_LPC32XX_NAND_SLC_RDR_CLKS
+CFG_LPC32XX_NAND_SLC_RDR_CLKS
 CONFIG_LPC32XX_NAND_SLC_RHOLD
 CONFIG_LPC32XX_NAND_SLC_RSETUP
 CONFIG_LPC32XX_NAND_SLC_RWIDTH
Signature · 1 line
2.25.1
author
#147 lore raw

PATCH 101/241 global: Migrate CONFIG_LPC32XX_NAND_SLC_RHOLD to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_slc.c +1 -1
index 0f12201aa0e3..1fdc80989fab 100644
@@ -132,7 +132,7 @@ static void lpc32xx_nand_init(void)
 	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
 	       TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) |
-	       TAC_R_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_RHOLD) |
+	       TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) |
 	       TAC_R_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_RSETUP),
 	       &lpc32xx_nand_slc_regs->tac);
 }
include/configs/devkit3250.h +1 -1
index e17896841355..0b815ded7322 100644
@@ -47,7 +47,7 @@
 #define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_RWIDTH		66666666
-#define CONFIG_LPC32XX_NAND_SLC_RHOLD		200000000
+#define CFG_LPC32XX_NAND_SLC_RHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_RSETUP		50000000
 
 /*
scripts/config_whitelist.txt +1 -1
index 8c567e45590c..7ced36635799 100644
@@ -109,7 +109,7 @@ CFG_LPC32XX_NAND_MLC_TCEA_DELAY
 CFG_LPC32XX_NAND_MLC_WR_HIGH
 CFG_LPC32XX_NAND_MLC_WR_LOW
 CFG_LPC32XX_NAND_SLC_RDR_CLKS
-CONFIG_LPC32XX_NAND_SLC_RHOLD
+CFG_LPC32XX_NAND_SLC_RHOLD
 CONFIG_LPC32XX_NAND_SLC_RSETUP
 CONFIG_LPC32XX_NAND_SLC_RWIDTH
 CONFIG_LPC32XX_NAND_SLC_WDR_CLKS
Signature · 1 line
2.25.1
author
#148 lore raw

PATCH 102/241 global: Migrate CONFIG_LPC32XX_NAND_SLC_RSETUP to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_slc.c +1 -1
index 1fdc80989fab..71e8286d1c8f 100644
@@ -133,7 +133,7 @@ static void lpc32xx_nand_init(void)
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
 	       TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) |
 	       TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) |
-	       TAC_R_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_RSETUP),
+	       TAC_R_SETUP(hclk / CFG_LPC32XX_NAND_SLC_RSETUP),
 	       &lpc32xx_nand_slc_regs->tac);
 }
 
include/configs/devkit3250.h +1 -1
index 0b815ded7322..72cf031e05da 100644
@@ -48,7 +48,7 @@
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_RWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_RHOLD		200000000
-#define CONFIG_LPC32XX_NAND_SLC_RSETUP		50000000
+#define CFG_LPC32XX_NAND_SLC_RSETUP		50000000
 
 /*
  * USB
scripts/config_whitelist.txt +1 -1
index 7ced36635799..fc20b83d66d0 100644
@@ -110,7 +110,7 @@ CFG_LPC32XX_NAND_MLC_WR_HIGH
 CFG_LPC32XX_NAND_MLC_WR_LOW
 CFG_LPC32XX_NAND_SLC_RDR_CLKS
 CFG_LPC32XX_NAND_SLC_RHOLD
-CONFIG_LPC32XX_NAND_SLC_RSETUP
+CFG_LPC32XX_NAND_SLC_RSETUP
 CONFIG_LPC32XX_NAND_SLC_RWIDTH
 CONFIG_LPC32XX_NAND_SLC_WDR_CLKS
 CONFIG_LPC32XX_NAND_SLC_WHOLD
Signature · 1 line
2.25.1
author
#149 lore raw

PATCH 103/241 global: Migrate CONFIG_LPC32XX_NAND_SLC_RWIDTH to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_slc.c +1 -1
index 71e8286d1c8f..fb1fb2d7dccf 100644
@@ -131,7 +131,7 @@ static void lpc32xx_nand_init(void)
 	       TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) |
 	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
-	       TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) |
+	       TAC_R_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_RWIDTH) |
 	       TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) |
 	       TAC_R_SETUP(hclk / CFG_LPC32XX_NAND_SLC_RSETUP),
 	       &lpc32xx_nand_slc_regs->tac);
include/configs/devkit3250.h +1 -1
index 72cf031e05da..5ba8c1bb20e2 100644
@@ -46,7 +46,7 @@
 #define CONFIG_LPC32XX_NAND_SLC_WHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
-#define CONFIG_LPC32XX_NAND_SLC_RWIDTH		66666666
+#define CFG_LPC32XX_NAND_SLC_RWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_RHOLD		200000000
 #define CFG_LPC32XX_NAND_SLC_RSETUP		50000000
 
scripts/config_whitelist.txt +1 -1
index fc20b83d66d0..fc42b693e3e1 100644
@@ -111,7 +111,7 @@ CFG_LPC32XX_NAND_MLC_WR_LOW
 CFG_LPC32XX_NAND_SLC_RDR_CLKS
 CFG_LPC32XX_NAND_SLC_RHOLD
 CFG_LPC32XX_NAND_SLC_RSETUP
-CONFIG_LPC32XX_NAND_SLC_RWIDTH
+CFG_LPC32XX_NAND_SLC_RWIDTH
 CONFIG_LPC32XX_NAND_SLC_WDR_CLKS
 CONFIG_LPC32XX_NAND_SLC_WHOLD
 CONFIG_LPC32XX_NAND_SLC_WSETUP
Signature · 1 line
2.25.1
author
#150 lore raw

PATCH 104/241 global: Migrate CONFIG_LPC32XX_NAND_SLC_WDR_CLKS to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_slc.c +1 -1
index fb1fb2d7dccf..7de5c840ed9b 100644
@@ -126,7 +126,7 @@ static void lpc32xx_nand_init(void)
 	       &lpc32xx_nand_slc_regs->icr);
 
 	/* Configure NAND flash timings */
-	writel(TAC_W_RDY(CONFIG_LPC32XX_NAND_SLC_WDR_CLKS) |
+	writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) |
 	       TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
 	       TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) |
 	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
include/configs/devkit3250.h +1 -1
index 5ba8c1bb20e2..dc16ed84c52c 100644
@@ -41,7 +41,7 @@
 /*
  * NAND chip timings
  */
-#define CONFIG_LPC32XX_NAND_SLC_WDR_CLKS	14
+#define CFG_LPC32XX_NAND_SLC_WDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH		66666666
 #define CONFIG_LPC32XX_NAND_SLC_WHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
scripts/config_whitelist.txt +1 -1
index fc42b693e3e1..4f5de41ab95d 100644
@@ -112,7 +112,7 @@ CFG_LPC32XX_NAND_SLC_RDR_CLKS
 CFG_LPC32XX_NAND_SLC_RHOLD
 CFG_LPC32XX_NAND_SLC_RSETUP
 CFG_LPC32XX_NAND_SLC_RWIDTH
-CONFIG_LPC32XX_NAND_SLC_WDR_CLKS
+CFG_LPC32XX_NAND_SLC_WDR_CLKS
 CONFIG_LPC32XX_NAND_SLC_WHOLD
 CONFIG_LPC32XX_NAND_SLC_WSETUP
 CONFIG_LPC32XX_NAND_SLC_WWIDTH
Signature · 1 line
2.25.1
author
#151 lore raw

PATCH 105/241 global: Migrate CONFIG_LPC32XX_NAND_SLC_WHOLD to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_slc.c +1 -1
index 7de5c840ed9b..dee8fd24b94b 100644
@@ -128,7 +128,7 @@ static void lpc32xx_nand_init(void)
 	/* Configure NAND flash timings */
 	writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) |
 	       TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
-	       TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) |
+	       TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) |
 	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
 	       TAC_R_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_RWIDTH) |
include/configs/devkit3250.h +1 -1
index dc16ed84c52c..24312c848e2d 100644
@@ -43,7 +43,7 @@
  */
 #define CFG_LPC32XX_NAND_SLC_WDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH		66666666
-#define CONFIG_LPC32XX_NAND_SLC_WHOLD		200000000
+#define CFG_LPC32XX_NAND_SLC_WHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
 #define CFG_LPC32XX_NAND_SLC_RWIDTH		66666666
scripts/config_whitelist.txt +1 -1
index 4f5de41ab95d..9609ea606fd3 100644
@@ -113,7 +113,7 @@ CFG_LPC32XX_NAND_SLC_RHOLD
 CFG_LPC32XX_NAND_SLC_RSETUP
 CFG_LPC32XX_NAND_SLC_RWIDTH
 CFG_LPC32XX_NAND_SLC_WDR_CLKS
-CONFIG_LPC32XX_NAND_SLC_WHOLD
+CFG_LPC32XX_NAND_SLC_WHOLD
 CONFIG_LPC32XX_NAND_SLC_WSETUP
 CONFIG_LPC32XX_NAND_SLC_WWIDTH
 CONFIG_MACB_SEARCH_PHY
Signature · 1 line
2.25.1
author
#152 lore raw

PATCH 106/241 global: Migrate CONFIG_LPC32XX_NAND_SLC_WSETUP to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_slc.c +1 -1
index dee8fd24b94b..a070df81d7cd 100644
@@ -129,7 +129,7 @@ static void lpc32xx_nand_init(void)
 	writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) |
 	       TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
 	       TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) |
-	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
+	       TAC_W_SETUP(hclk / CFG_LPC32XX_NAND_SLC_WSETUP) |
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
 	       TAC_R_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_RWIDTH) |
 	       TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) |
include/configs/devkit3250.h +1 -1
index 24312c848e2d..5719e422da97 100644
@@ -44,7 +44,7 @@
 #define CFG_LPC32XX_NAND_SLC_WDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_WHOLD		200000000
-#define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
+#define CFG_LPC32XX_NAND_SLC_WSETUP		50000000
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
 #define CFG_LPC32XX_NAND_SLC_RWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_RHOLD		200000000
scripts/config_whitelist.txt +1 -1
index 9609ea606fd3..1051a7b949ec 100644
@@ -114,7 +114,7 @@ CFG_LPC32XX_NAND_SLC_RSETUP
 CFG_LPC32XX_NAND_SLC_RWIDTH
 CFG_LPC32XX_NAND_SLC_WDR_CLKS
 CFG_LPC32XX_NAND_SLC_WHOLD
-CONFIG_LPC32XX_NAND_SLC_WSETUP
+CFG_LPC32XX_NAND_SLC_WSETUP
 CONFIG_LPC32XX_NAND_SLC_WWIDTH
 CONFIG_MACB_SEARCH_PHY
 CONFIG_MALLOC_F_ADDR
Signature · 1 line
2.25.1
author
#153 lore raw

PATCH 106/241 global: Migrate CONFIG_LPC32XX_NAND_SLC_WSETUP to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_slc.c +1 -1
index dee8fd24b94b..a070df81d7cd 100644
@@ -129,7 +129,7 @@ static void lpc32xx_nand_init(void)
 	writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) |
 	       TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
 	       TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) |
-	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
+	       TAC_W_SETUP(hclk / CFG_LPC32XX_NAND_SLC_WSETUP) |
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
 	       TAC_R_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_RWIDTH) |
 	       TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) |
include/configs/devkit3250.h +1 -1
index 24312c848e2d..5719e422da97 100644
@@ -44,7 +44,7 @@
 #define CFG_LPC32XX_NAND_SLC_WDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_WHOLD		200000000
-#define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
+#define CFG_LPC32XX_NAND_SLC_WSETUP		50000000
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
 #define CFG_LPC32XX_NAND_SLC_RWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_RHOLD		200000000
scripts/config_whitelist.txt +1 -1
index 9609ea606fd3..1051a7b949ec 100644
@@ -114,7 +114,7 @@ CFG_LPC32XX_NAND_SLC_RSETUP
 CFG_LPC32XX_NAND_SLC_RWIDTH
 CFG_LPC32XX_NAND_SLC_WDR_CLKS
 CFG_LPC32XX_NAND_SLC_WHOLD
-CONFIG_LPC32XX_NAND_SLC_WSETUP
+CFG_LPC32XX_NAND_SLC_WSETUP
 CONFIG_LPC32XX_NAND_SLC_WWIDTH
 CONFIG_MACB_SEARCH_PHY
 CONFIG_MALLOC_F_ADDR
Signature · 1 line
2.25.1
author
#154 lore raw

PATCH 107/241 global: Migrate CONFIG_LPC32XX_NAND_SLC_WWIDTH to CFG

---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_slc.c +1 -1
index a070df81d7cd..356f8d9440bb 100644
@@ -127,7 +127,7 @@ static void lpc32xx_nand_init(void)
 
 	/* Configure NAND flash timings */
 	writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) |
-	       TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
+	       TAC_W_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_WWIDTH) |
 	       TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) |
 	       TAC_W_SETUP(hclk / CFG_LPC32XX_NAND_SLC_WSETUP) |
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
include/configs/devkit3250.h +1 -1
index 5719e422da97..9cfee381d4ac 100644
@@ -42,7 +42,7 @@
  * NAND chip timings
  */
 #define CFG_LPC32XX_NAND_SLC_WDR_CLKS	14
-#define CONFIG_LPC32XX_NAND_SLC_WWIDTH		66666666
+#define CFG_LPC32XX_NAND_SLC_WWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_WHOLD		200000000
 #define CFG_LPC32XX_NAND_SLC_WSETUP		50000000
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
scripts/config_whitelist.txt +1 -1
index 1051a7b949ec..58792f1d2b7c 100644
@@ -115,7 +115,7 @@ CFG_LPC32XX_NAND_SLC_RWIDTH
 CFG_LPC32XX_NAND_SLC_WDR_CLKS
 CFG_LPC32XX_NAND_SLC_WHOLD
 CFG_LPC32XX_NAND_SLC_WSETUP
-CONFIG_LPC32XX_NAND_SLC_WWIDTH
+CFG_LPC32XX_NAND_SLC_WWIDTH
 CONFIG_MACB_SEARCH_PHY
 CONFIG_MALLOC_F_ADDR
 CONFIG_MALTA
Signature · 1 line
2.25.1
author
#155 lore raw

PATCH 108/241 global: Migrate CONFIG_MACB_SEARCH_PHY to CFG

In reply to Tom Rini
---
 include/configs/ethernut5.h  | 2 +-
 include/configs/vinco.h      | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
include/configs/ethernut5.h +1 -1
index 52eb0be67611..2859188e60c9 100644
@@ -49,7 +49,7 @@
 
 /* Ethernet */
 #define CONFIG_PHY_ID			0
-#define CONFIG_MACB_SEARCH_PHY
+#define CFG_MACB_SEARCH_PHY
 
 /* MMC */
 #ifdef CONFIG_CMD_MMC
include/configs/vinco.h +1 -1
index 74ee61f09238..1e1175f00689 100644
@@ -40,7 +40,7 @@
 /* USB device */
 
 /* Ethernet Hardware */
-#define CONFIG_MACB_SEARCH_PHY
+#define CFG_MACB_SEARCH_PHY
 
 #ifdef CONFIG_SPI_BOOT
 /* bootstrap + u-boot + env + linux in serial flash */
scripts/config_whitelist.txt +1 -1
index 58792f1d2b7c..316095b75e0d 100644
@@ -116,7 +116,7 @@ CFG_LPC32XX_NAND_SLC_WDR_CLKS
 CFG_LPC32XX_NAND_SLC_WHOLD
 CFG_LPC32XX_NAND_SLC_WSETUP
 CFG_LPC32XX_NAND_SLC_WWIDTH
-CONFIG_MACB_SEARCH_PHY
+CFG_MACB_SEARCH_PHY
 CONFIG_MALLOC_F_ADDR
 CONFIG_MALTA
 CONFIG_MAX_DSP_CPUS
Signature · 1 line
2.25.1
author
#156 lore raw

PATCH 109/241 global: Migrate CONFIG_MALLOC_F_ADDR to CFG

In reply to Tom Rini
---
 arch/sandbox/cpu/start.c                    | 2 +-
 common/init/board_init.c                    | 2 +-
 common/spl/spl.c                            | 4 ++--
 doc/arch/sandbox/sandbox.rst                | 2 +-
 include/configs/capricorn-common.h          | 2 +-
 include/configs/cgtqmx8.h                   | 2 +-
 include/configs/imx8mm-cl-iot-gate.h        | 2 +-
 include/configs/imx8mm_beacon.h             | 2 +-
 include/configs/imx8mm_data_modul_edm_sbc.h | 2 +-
 include/configs/imx8mm_evk.h                | 2 +-
 include/configs/imx8mm_icore_mx8mm.h        | 2 +-
 include/configs/imx8mm_venice.h             | 2 +-
 include/configs/imx8mp_rsb3720.h            | 2 +-
 include/configs/imx8mq_cm.h                 | 2 +-
 include/configs/imx8mq_evk.h                | 2 +-
 include/configs/imx8mq_phanbell.h           | 2 +-
 include/configs/imx8qm_mek.h                | 2 +-
 include/configs/imx8qxp_mek.h               | 2 +-
 include/configs/imx8ulp_evk.h               | 2 +-
 include/configs/imx93_evk.h                 | 2 +-
 include/configs/kontron-sl-mx8mm.h          | 2 +-
 include/configs/kontron_pitx_imx8m.h        | 2 +-
 include/configs/kontron_sl28.h              | 2 +-
 include/configs/phycore_imx8mm.h            | 2 +-
 include/configs/pico-imx8mq.h               | 2 +-
 include/configs/sandbox.h                   | 2 +-
 include/configs/verdin-imx8mm.h             | 2 +-
 include/configs/verdin-imx8mp.h             | 2 +-
 scripts/config_whitelist.txt                | 2 +-
 29 files changed, 30 insertions(+), 30 deletions(-)
arch/sandbox/cpu/start.c +1 -1
index 622df41f54cf..234652872ecc 100644
@@ -535,7 +535,7 @@ int sandbox_main(int argc, char *argv[])
 	}
 
 #if CONFIG_VAL(SYS_MALLOC_F_LEN)
-	gd->malloc_base = CONFIG_MALLOC_F_ADDR;
+	gd->malloc_base = CFG_MALLOC_F_ADDR;
 #endif
 #if CONFIG_IS_ENABLED(LOG)
 	gd->default_log_level = state->default_log_level;
common/init/board_init.c +1 -1
index 6a550261778d..96ffb79a9869 100644
@@ -78,7 +78,7 @@ __weak void board_init_f_init_stack_protection(void)
 ulong board_init_f_alloc_reserve(ulong top)
 {
 	/* Reserve early malloc arena */
-#ifndef CONFIG_MALLOC_F_ADDR
+#ifndef CFG_MALLOC_F_ADDR
 #if CONFIG_VAL(SYS_MALLOC_F_LEN)
 	top -= CONFIG_VAL(SYS_MALLOC_F_LEN);
 #endif
common/spl/spl.c +2 -2
index 1d2e8fda7284..4668367b680f 100644
@@ -527,8 +527,8 @@ static int spl_common_init(bool setup_malloc)
 
 #if CONFIG_VAL(SYS_MALLOC_F_LEN)
 	if (setup_malloc) {
-#ifdef CONFIG_MALLOC_F_ADDR
-		gd->malloc_base = CONFIG_MALLOC_F_ADDR;
+#ifdef CFG_MALLOC_F_ADDR
+		gd->malloc_base = CFG_MALLOC_F_ADDR;
 #endif
 		gd->malloc_limit = CONFIG_VAL(SYS_MALLOC_F_LEN);
 		gd->malloc_ptr = 0;
doc/arch/sandbox/sandbox.rst +1 -1
index e6d840365166..cd7f8a2cb0dc 100644
@@ -615,7 +615,7 @@ Addr      Config                     Usage
 =======   ========================   ===============================
       0   CONFIG_SYS_FDT_LOAD_ADDR   Device tree
    c000   CONFIG_BLOBLIST_ADDR       Blob list
-  10000   CONFIG_MALLOC_F_ADDR       Early memory allocation
+  10000   CFG_MALLOC_F_ADDR          Early memory allocation
   f0000   CONFIG_PRE_CON_BUF_ADDR    Pre-console buffer
  100000   CONFIG_TRACE_EARLY_ADDR    Early trace buffer (if enabled). Also used
                                      as the SPL load buffer in spl_test_load().
include/configs/capricorn-common.h +1 -1
index 19c7fca03b29..9e7322cdb937 100644
@@ -14,7 +14,7 @@
 
 /* SPL config */
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x00120000
+#define CFG_MALLOC_F_ADDR		0x00120000
 
 #endif /* CONFIG_SPL_BUILD */
 
include/configs/cgtqmx8.h +1 -1
index caa1498acead..a63325973846 100644
@@ -13,7 +13,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SERIAL_LPUART_BASE	0x5a060000
-#define CONFIG_MALLOC_F_ADDR		0x00120000
+#define CFG_MALLOC_F_ADDR		0x00120000
 
 #endif
 
include/configs/imx8mm-cl-iot-gate.h +1 -1
index 7785bdc7cbe6..64cdc401d039 100644
@@ -16,7 +16,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x912000
+#define CFG_MALLOC_F_ADDR		0x912000
 /* For RAW image gives a error info not panic */
 
 #endif
include/configs/imx8mm_beacon.h +1 -1
index ee524f0e63f2..d85ae21e2317 100644
@@ -14,7 +14,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */
 
 #endif
include/configs/imx8mm_data_modul_edm_sbc.h +1 -1
index 44d74bb1a788..0723d27ab703 100644
@@ -11,7 +11,7 @@
 #include <asm/arch/imx-regs.h>
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 
 /* For RAW image gives a error info not panic */
 
include/configs/imx8mm_evk.h +1 -1
index c364e06dc450..d5642b96495f 100644
@@ -24,7 +24,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */
 
 #endif
include/configs/imx8mm_icore_mx8mm.h +1 -1
index e718daa07c3e..2158b0af74f9 100644
@@ -15,7 +15,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-# define CONFIG_MALLOC_F_ADDR		0x930000
+# define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */
 #endif /* CONFIG_SPL_BUILD */
 
include/configs/imx8mm_venice.h +1 -1
index c490e3829f9a..5579a05d165f 100644
@@ -14,7 +14,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 #endif
 
 /* Enable Distro Boot */
include/configs/imx8mp_rsb3720.h +1 -1
index 38ae5f137022..e4e24b522fdb 100644
@@ -24,7 +24,7 @@
 		 0x5f, 0xd3, 0x6b, 0x9b, 0xe5, 0xb9)
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x184000 /* malloc f used before \
+#define CFG_MALLOC_F_ADDR		0x184000 /* malloc f used before \
 						  * GD_FLG_FULL_MALLOC_INIT \
 						  * set \
 						  */
include/configs/imx8mq_cm.h +1 -1
index f6f356d27ba2..f7ae1b47d063 100644
@@ -14,7 +14,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 
 #endif
include/configs/imx8mq_evk.h +1 -1
index d9ce5d5d0f1a..4b46321e8512 100644
@@ -15,7 +15,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
include/configs/imx8mq_phanbell.h +1 -1
index eb7059f0648c..5158f2cc605a 100644
@@ -14,7 +14,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 #endif
 
include/configs/imx8qm_mek.h +1 -1
index 7772e71013ef..a25efbb16bdb 100644
@@ -12,7 +12,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SERIAL_LPUART_BASE	0x5a060000
-#define CONFIG_MALLOC_F_ADDR		0x00120000
+#define CFG_MALLOC_F_ADDR		0x00120000
 
 #endif
 
include/configs/imx8qxp_mek.h +1 -1
index 669da591fa2b..4f55ae49403d 100644
@@ -12,7 +12,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SERIAL_LPUART_BASE	0x5a060000
-#define CONFIG_MALLOC_F_ADDR		0x00120000
+#define CFG_MALLOC_F_ADDR		0x00120000
 
 #endif
 
include/configs/imx8ulp_evk.h +1 -1
index b7397f6038fd..d77510e1685e 100644
@@ -12,7 +12,7 @@
 #define CFG_SYS_UBOOT_BASE	(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x22040000
+#define CFG_MALLOC_F_ADDR		0x22040000
 
 
 #endif
include/configs/imx93_evk.h +1 -1
index 5cd6492dd503..7b7bef3ca755 100644
@@ -14,7 +14,7 @@
 	(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x204D0000
+#define CFG_MALLOC_F_ADDR		0x204D0000
 #endif
 
 #ifdef CONFIG_DISTRO_DEFAULTS
include/configs/kontron-sl-mx8mm.h +1 -1
index 56d0036147c6..657124cc725d 100644
@@ -47,7 +47,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 #endif
 
 #define CFG_EXTRA_ENV_SETTINGS BOOTENV
include/configs/kontron_pitx_imx8m.h +1 -1
index 4dd51c7f1d7f..5a3c9f76a431 100644
@@ -16,7 +16,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE     0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 
 
include/configs/kontron_sl28.h +1 -1
index 218e9d9b3013..0a1df4ad4bd0 100644
@@ -32,7 +32,7 @@
 /* generic timer */
 
 /* early heap for SPL DM */
-#define CONFIG_MALLOC_F_ADDR		CFG_SYS_FSL_OCRAM_BASE
+#define CFG_MALLOC_F_ADDR		CFG_SYS_FSL_OCRAM_BASE
 
 /* serial port */
 #define CFG_SYS_NS16550_CLK          (get_bus_freq(0) / 2)
include/configs/phycore_imx8mm.h +1 -1
index 9160c78c0464..ce6dc87c69c7 100644
@@ -16,7 +16,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */
 #endif
 
include/configs/pico-imx8mq.h +1 -1
index 1d8709180c83..37ade717ae99 100644
@@ -14,7 +14,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE	0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 #endif
 
include/configs/sandbox.h +1 -1
index c9e57da0160a..99893a7070fe 100644
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MALLOC_F_ADDR		0x0010000
+#define CFG_MALLOC_F_ADDR		0x0010000
 
 /* GUIDs for capsule updatable firmware images */
 #define SANDBOX_UBOOT_IMAGE_GUID \
include/configs/verdin-imx8mm.h +1 -1
index 7f3fa795afdc..27d7efb883de 100644
@@ -14,7 +14,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */
 #endif
 
include/configs/verdin-imx8mp.h +1 -1
index 3ce2714e196e..d03c69cf00ae 100644
@@ -16,7 +16,7 @@
 /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR				0x184000
+#define CFG_MALLOC_F_ADDR				0x184000
 /* For RAW image gives a error info not panic */
 
 #define CONFIG_POWER_PCA9450
scripts/config_whitelist.txt +1 -1
index 316095b75e0d..f42481a7b3bc 100644
@@ -117,7 +117,7 @@ CFG_LPC32XX_NAND_SLC_WHOLD
 CFG_LPC32XX_NAND_SLC_WSETUP
 CFG_LPC32XX_NAND_SLC_WWIDTH
 CFG_MACB_SEARCH_PHY
-CONFIG_MALLOC_F_ADDR
+CFG_MALLOC_F_ADDR
 CONFIG_MALTA
 CONFIG_MAX_DSP_CPUS
 CONFIG_MAX_MEM_MAPPED
Signature · 1 line
2.25.1
author
#157 lore raw

PATCH 110/241 global: Migrate CONFIG_MALTA to CFG

---
 drivers/rtc/mc146818.c       | 2 +-
 include/configs/malta.h      | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/rtc/mc146818.c +1 -1
index 122691b97842..d5f9f4206566 100644
@@ -13,7 +13,7 @@
 #include <dm.h>
 #include <rtc.h>
 
-#if defined(CONFIG_X86) || defined(CONFIG_MALTA)
+#if defined(CONFIG_X86) || defined(CFG_MALTA)
 #include <asm/io.h>
 #define in8(p) inb(p)
 #define out8(p, v) outb(v, p)
include/configs/malta.h +1 -1
index 65f4b05649b2..cd4f382b18f9 100644
@@ -9,7 +9,7 @@
 /*
  * System configuration
  */
-#define CONFIG_MALTA
+#define CFG_MALTA
 
 #define CONFIG_MEMSIZE_IN_BYTES
 
scripts/config_whitelist.txt +1 -1
index f42481a7b3bc..c72372a11ddc 100644
@@ -118,7 +118,7 @@ CFG_LPC32XX_NAND_SLC_WSETUP
 CFG_LPC32XX_NAND_SLC_WWIDTH
 CFG_MACB_SEARCH_PHY
 CFG_MALLOC_F_ADDR
-CONFIG_MALTA
+CFG_MALTA
 CONFIG_MAX_DSP_CPUS
 CONFIG_MAX_MEM_MAPPED
 CONFIG_MAX_RAM_BANK_SIZE
Signature · 1 line
2.25.1
author
#158 lore raw

PATCH 111/241 global: Migrate CONFIG_MAX_DSP_CPUS to CFG

---
 arch/powerpc/include/asm/config_mpc85xx.h | 4 ++--
 doc/README.Heterogeneous-SoCs             | 2 +-
 include/e500.h                            | 2 +-
 scripts/config_whitelist.txt              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/config_mpc85xx.h +2 -2
index d6b2b9b469a3..9738c573452b 100644
@@ -152,7 +152,7 @@
 #define CFG_SYS_FM_MURAM_SIZE	0x60000
 
 #ifdef CONFIG_ARCH_B4860
-#define CONFIG_MAX_DSP_CPUS		12
+#define CFG_MAX_DSP_CPUS		12
 #define CONFIG_NUM_DSP_CPUS		6
 #define CFG_SYS_FSL_CLUSTER_CLOCKS	{ 1, 4, 4, 4 }
 #define CFG_SYS_NUM_FM1_DTSEC	6
@@ -161,7 +161,7 @@
 #define CFG_SYS_FSL_SRIO_OB_WIN_NUM	9
 #define CFG_SYS_FSL_SRIO_IB_WIN_NUM	5
 #else
-#define CONFIG_MAX_DSP_CPUS		2
+#define CFG_MAX_DSP_CPUS		2
 #define CFG_SYS_FSL_CLUSTER_CLOCKS	{ 1, 4 }
 #define CFG_SYS_NUM_FM1_DTSEC	4
 #define CFG_SYS_NUM_FM1_10GEC	0
doc/README.Heterogeneous-SoCs +1 -1
index 9da652e459be..11f2dbc0013d 100644
@@ -72,7 +72,7 @@ CONFIG_SYS_ETVPE_CLK		- Define PLL index for ETVPE clock
 
 DSP cores and other device's components have been added in this structure.
 
-freq_processor_dsp[CONFIG_MAX_DSP_CPUS]	- Array to contain the DSP core's frequencies
+freq_processor_dsp[CFG_MAX_DSP_CPUS]	- Array to contain the DSP core's frequencies
 freq_cpri				- To store CPRI frequency
 freq_maple				- To store MAPLE frequency
 freq_maple_ulb				- To store MAPLE-ULB frequency
include/e500.h +1 -1
index 9f68a834c2f0..9ea90109406c 100644
@@ -12,7 +12,7 @@ typedef struct
 {
 	unsigned long freq_processor[CONFIG_MAX_CPUS];
 #ifdef CONFIG_HETROGENOUS_CLUSTERS
-	unsigned long freq_processor_dsp[CONFIG_MAX_DSP_CPUS];
+	unsigned long freq_processor_dsp[CFG_MAX_DSP_CPUS];
 #endif
 	unsigned long freq_systembus;
 	unsigned long freq_ddrbus;
scripts/config_whitelist.txt +1 -1
index c72372a11ddc..31484bd13fd9 100644
@@ -119,7 +119,7 @@ CFG_LPC32XX_NAND_SLC_WWIDTH
 CFG_MACB_SEARCH_PHY
 CFG_MALLOC_F_ADDR
 CFG_MALTA
-CONFIG_MAX_DSP_CPUS
+CFG_MAX_DSP_CPUS
 CONFIG_MAX_MEM_MAPPED
 CONFIG_MAX_RAM_BANK_SIZE
 CONFIG_MEMSIZE_IN_BYTES
Signature · 1 line
2.25.1
author
#159 lore raw

PATCH 112/241 global: Migrate CONFIG_MAX_MEM_MAPPED to CFG

In reply to Tom Rini
---
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c           |  6 +++---
 arch/arm/include/asm/arch-fsl-layerscape/config.h | 14 +++++++-------
 arch/arm/include/asm/arch-ls102xa/config.h        |  2 +-
 arch/powerpc/cpu/mpc85xx/cpu.c                    | 14 +++++++-------
 arch/powerpc/cpu/mpc85xx/mp.c                     |  4 ++--
 arch/powerpc/cpu/mpc85xx/tlb.c                    |  8 ++++----
 arch/powerpc/cpu/mpc8xxx/pamu_table.c             |  2 +-
 arch/powerpc/include/asm/config.h                 |  6 +++---
 arch/xtensa/include/asm/config.h                  |  2 +-
 board/ti/dra7xx/evm.c                             | 14 +++++++-------
 common/memsize.c                                  |  6 +++---
 drivers/ddr/fsl/util.c                            |  6 +++---
 drivers/ram/mpc83xx_sdram.c                       |  4 ++--
 include/configs/dra7xx_evm.h                      |  2 +-
 include/configs/mt7621.h                          |  2 +-
 include/configs/rcar-gen3-common.h                |  2 +-
 include/configs/synquacer.h                       |  2 +-
 include/configs/xtfpga.h                          |  8 ++++----
 scripts/config_whitelist.txt                      |  2 +-
 19 files changed, 53 insertions(+), 53 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/cpu.c +3 -3
index 99413ef52e22..11ea2b149eab 100644
@@ -1311,13 +1311,13 @@ phys_size_t get_effective_memsize(void)
 	 * allocated from first region. If the memory extends to  the second
 	 * region (or the third region if applicable), Management Complex (MC)
 	 * memory should be put into the highest region, i.e. the end of DDR
-	 * memory. CONFIG_MAX_MEM_MAPPED is set to the size of first region so
+	 * memory. CFG_MAX_MEM_MAPPED is set to the size of first region so
 	 * U-Boot doesn't relocate itself into higher address. Should DDR be
 	 * configured to skip the first region, this function needs to be
 	 * adjusted.
 	 */
-	if (gd->ram_size > CONFIG_MAX_MEM_MAPPED) {
-		ea_size = CONFIG_MAX_MEM_MAPPED;
+	if (gd->ram_size > CFG_MAX_MEM_MAPPED) {
+		ea_size = CFG_MAX_MEM_MAPPED;
 		rem = gd->ram_size - ea_size;
 	} else {
 		ea_size = gd->ram_size;
arch/arm/include/asm/arch-fsl-layerscape/config.h +7 -7
index c9c72e327172..b82aac9126d0 100644
@@ -38,7 +38,7 @@
 
 /* DDR */
 #define CFG_SYS_DDR_BLOCK1_SIZE	((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
 
 /* Generic Interrupt Controller Definitions */
 #define GICD_BASE			0x06000000
@@ -123,7 +123,7 @@
 
 /* DDR */
 #define CFG_SYS_DDR_BLOCK1_SIZE	((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
 
 /* DCFG - GUR */
 #define CFG_SYS_FSL_OCRAM_BASE	0x18000000 /* initial RAM */
@@ -149,7 +149,7 @@
 
 /* DDR */
 #define CFG_SYS_DDR_BLOCK1_SIZE		((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED			CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED			CFG_SYS_DDR_BLOCK1_SIZE
 
 /* Generic Interrupt Controller Definitions */
 #define GICD_BASE				0x06000000
@@ -193,7 +193,7 @@
 
 /* DDR */
 #define CFG_SYS_DDR_BLOCK1_SIZE	((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
 
 /* SEC */
 
@@ -213,7 +213,7 @@
 #define CFG_SYS_NUM_FM1_DTSEC		7
 #define CFG_SYS_NUM_FM1_10GEC		1
 #define CFG_SYS_DDR_BLOCK1_SIZE		((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED			CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED			CFG_SYS_DDR_BLOCK1_SIZE
 
 #define QE_MURAM_SIZE		0x6000UL
 #define MAX_QE_RISC		1
@@ -252,14 +252,14 @@
 #define GICD_BASE		0x01401000
 #define GICC_BASE		0x01402000
 #define CFG_SYS_DDR_BLOCK1_SIZE	((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
 
 #elif defined(CONFIG_ARCH_LS1046A)
 #define CFG_SYS_NUM_FMAN			1
 #define CFG_SYS_NUM_FM1_DTSEC		8
 #define CFG_SYS_NUM_FM1_10GEC		2
 #define CFG_SYS_DDR_BLOCK1_SIZE  ((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED           CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED           CFG_SYS_DDR_BLOCK1_SIZE
 
 /* SMMU Defintions */
 #define SMMU_BASE		0x09000000
arch/arm/include/asm/arch-ls102xa/config.h +1 -1
index 6413a307d273..86bea960f1d1 100644
@@ -76,7 +76,7 @@
 #define AHCI_BASE_ADDR				(CONFIG_SYS_IMMR + 0x02200000)
 #ifdef CONFIG_DDR_SPD
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_MAX_MEM_MAPPED			((phys_size_t)2 << 30)
+#define CFG_MAX_MEM_MAPPED			((phys_size_t)2 << 30)
 #endif
 
 #define DCU_LAYER_MAX_NUM			16
arch/powerpc/cpu/mpc85xx/cpu.c +7 -7
index be85c54e4801..0abcc01b8574 100644
@@ -616,12 +616,12 @@ static int reset_tlb(phys_addr_t p_addr, u32 size, phys_addr_t *phys_offset)
 /*
  * slide the testing window up to test another area
  * for 32_bit system, the maximum testable memory is limited to
- * CONFIG_MAX_MEM_MAPPED
+ * CFG_MAX_MEM_MAPPED
  */
 int arch_memory_test_advance(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
 {
 	phys_addr_t test_cap, p_addr;
-	phys_size_t p_size = min(gd->ram_size, CONFIG_MAX_MEM_MAPPED);
+	phys_size_t p_size = min(gd->ram_size, CFG_MAX_MEM_MAPPED);
 
 #if !defined(CONFIG_PHYS_64BIT) || \
     !defined(CFG_SYS_INIT_RAM_ADDR_PHYS) || \
@@ -632,7 +632,7 @@ int arch_memory_test_advance(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
 #endif
 	p_addr = (*vstart) + (*size) + (*phys_offset);
 	if (p_addr < test_cap - 1) {
-		p_size = min(test_cap - p_addr, CONFIG_MAX_MEM_MAPPED);
+		p_size = min(test_cap - p_addr, CFG_MAX_MEM_MAPPED);
 		if (reset_tlb(p_addr, p_size, phys_offset) == -1)
 			return -1;
 		*vstart = CFG_SYS_DDR_SDRAM_BASE;
@@ -649,18 +649,18 @@ int arch_memory_test_advance(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
 /* initialization for testing area */
 int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
 {
-	phys_size_t p_size = min(gd->ram_size, CONFIG_MAX_MEM_MAPPED);
+	phys_size_t p_size = min(gd->ram_size, CFG_MAX_MEM_MAPPED);
 
 	*vstart = CFG_SYS_DDR_SDRAM_BASE;
-	*size = (u32) p_size;	/* CONFIG_MAX_MEM_MAPPED < 4G */
+	*size = (u32) p_size;	/* CFG_MAX_MEM_MAPPED < 4G */
 	*phys_offset = 0;
 
 #if !defined(CONFIG_PHYS_64BIT) || \
     !defined(CFG_SYS_INIT_RAM_ADDR_PHYS) || \
 	(CFG_SYS_INIT_RAM_ADDR_PHYS < 0x100000000ull)
-		if (gd->ram_size > CONFIG_MAX_MEM_MAPPED) {
+		if (gd->ram_size > CFG_MAX_MEM_MAPPED) {
 			puts("Cannot test more than ");
-			print_size(CONFIG_MAX_MEM_MAPPED,
+			print_size(CFG_MAX_MEM_MAPPED,
 				" without proper 36BIT support.\n");
 		}
 #endif
arch/powerpc/cpu/mpc85xx/mp.c +2 -2
index 44f8ed8a19a3..7c47e415f05d 100644
@@ -193,8 +193,8 @@ u32 determine_mp_bootpg(unsigned int *pagesize)
 
 
 	/* use last 4K of mapped memory */
-	bootpg = ((gd->ram_size > CONFIG_MAX_MEM_MAPPED) ?
-		CONFIG_MAX_MEM_MAPPED : gd->ram_size) +
+	bootpg = ((gd->ram_size > CFG_MAX_MEM_MAPPED) ?
+		CFG_MAX_MEM_MAPPED : gd->ram_size) +
 		CFG_SYS_SDRAM_BASE - 4096;
 	if (pagesize)
 		*pagesize = 4096;
arch/powerpc/cpu/mpc85xx/tlb.c +4 -4
index 5d21bef58781..2a78f0fe502c 100644
@@ -306,12 +306,12 @@ unsigned int setup_ddr_tlbs_phys(phys_addr_t p_addr,
 	u64 memsize = (u64)memsize_in_meg << 20;
 	u64 size;
 
-	size = min(memsize, (u64)CONFIG_MAX_MEM_MAPPED);
+	size = min(memsize, (u64)CFG_MAX_MEM_MAPPED);
 	size = tlb_map_range(ram_tlb_address, p_addr, size, TLB_MAP_RAM);
 
-	if (size || memsize > CONFIG_MAX_MEM_MAPPED) {
-		print_size(memsize > CONFIG_MAX_MEM_MAPPED ?
-			   memsize - CONFIG_MAX_MEM_MAPPED + size : size,
+	if (size || memsize > CFG_MAX_MEM_MAPPED) {
+		print_size(memsize > CFG_MAX_MEM_MAPPED ?
+			   memsize - CFG_MAX_MEM_MAPPED + size : size,
 			   " of DDR memory left unmapped in U-Boot\n");
 #ifndef CONFIG_SPL_BUILD
 		puts("       ");
arch/powerpc/cpu/mpc8xxx/pamu_table.c +1 -1
index caad6670cc90..b906279226a5 100644
@@ -17,7 +17,7 @@ void construct_pamu_addr_table(struct pamu_addr_tbl *tbl, int *num_entries)
 
 	tbl->start_addr[i] =
 			(uint64_t)virt_to_phys((void *)CFG_SYS_SDRAM_BASE);
-	tbl->size[i] = (phys_size_t)(min(gd->ram_size, CONFIG_MAX_MEM_MAPPED));
+	tbl->size[i] = (phys_size_t)(min(gd->ram_size, CFG_MAX_MEM_MAPPED));
 	tbl->end_addr[i] = tbl->start_addr[i] +  tbl->size[i] - 1;
 
 	i++;
arch/powerpc/include/asm/config.h +3 -3
index 983c6f70cfee..f0702cab1431 100644
@@ -14,13 +14,13 @@
   #define HWCONFIG_BUFFER_SIZE 256
 #endif
 
-#ifndef CONFIG_MAX_MEM_MAPPED
+#ifndef CFG_MAX_MEM_MAPPED
 #if	defined(CONFIG_E500)		|| \
 	defined(CONFIG_MPC86xx)		|| \
 	defined(CONFIG_E300)
-#define CONFIG_MAX_MEM_MAPPED	((phys_size_t)2 << 30)
+#define CFG_MAX_MEM_MAPPED	((phys_size_t)2 << 30)
 #else
-#define CONFIG_MAX_MEM_MAPPED	(256 << 20)
+#define CFG_MAX_MEM_MAPPED	(256 << 20)
 #endif
 #endif
 
arch/xtensa/include/asm/config.h +1 -1
index a1096ab1961b..aad06118cdbd 100644
@@ -15,7 +15,7 @@
  */
 #if XCHAL_HAVE_PTP_MMU
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_MAX_MEM_MAPPED (128 << 20)
+#define CFG_MAX_MEM_MAPPED (128 << 20)
 #endif
 
 #endif
board/ti/dra7xx/evm.c +7 -7
index 1c00e253ffc8..bd7aac3656a6 100644
@@ -279,13 +279,13 @@ void emif_get_reg_dump(u32 emif_nr, const struct emif_regs **regs)
 	case DRA752_ES2_0:
 		switch (emif_nr) {
 		case 1:
-			if (ram_size > CONFIG_MAX_MEM_MAPPED)
+			if (ram_size > CFG_MAX_MEM_MAPPED)
 				*regs = &emif1_ddr3_532_mhz_1cs_2G;
 			else
 				*regs = &emif1_ddr3_532_mhz_1cs;
 			break;
 		case 2:
-			if (ram_size > CONFIG_MAX_MEM_MAPPED)
+			if (ram_size > CFG_MAX_MEM_MAPPED)
 				*regs = &emif2_ddr3_532_mhz_1cs_2G;
 			else
 				*regs = &emif2_ddr3_532_mhz_1cs;
@@ -303,7 +303,7 @@ void emif_get_reg_dump(u32 emif_nr, const struct emif_regs **regs)
 	case DRA722_ES1_0:
 	case DRA722_ES2_0:
 	case DRA722_ES2_1:
-		if (ram_size < CONFIG_MAX_MEM_MAPPED)
+		if (ram_size < CFG_MAX_MEM_MAPPED)
 			*regs = &emif_1_regs_ddr3_666_mhz_1cs_dra_es1;
 		else
 			*regs = &emif_1_regs_ddr3_666_mhz_1cs_dra_es2;
@@ -362,7 +362,7 @@ void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs)
 	case DRA752_ES1_0:
 	case DRA752_ES1_1:
 	case DRA752_ES2_0:
-		if (ram_size > CONFIG_MAX_MEM_MAPPED)
+		if (ram_size > CFG_MAX_MEM_MAPPED)
 			*dmm_lisa_regs = &lisa_map_dra7_2GB;
 		else
 			*dmm_lisa_regs = &lisa_map_dra7_1536MB;
@@ -371,7 +371,7 @@ void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs)
 	case DRA722_ES2_0:
 	case DRA722_ES2_1:
 	default:
-		if (ram_size < CONFIG_MAX_MEM_MAPPED)
+		if (ram_size < CFG_MAX_MEM_MAPPED)
 			*dmm_lisa_regs = &lisa_map_2G_x_2;
 		else
 			*dmm_lisa_regs = &lisa_map_2G_x_4;
@@ -646,9 +646,9 @@ int dram_init_banksize(void)
 
 	gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
 	gd->bd->bi_dram[0].size = get_effective_memsize();
-	if (ram_size > CONFIG_MAX_MEM_MAPPED) {
+	if (ram_size > CFG_MAX_MEM_MAPPED) {
 		gd->bd->bi_dram[1].start = 0x200000000;
-		gd->bd->bi_dram[1].size = ram_size - CONFIG_MAX_MEM_MAPPED;
+		gd->bd->bi_dram[1].size = ram_size - CFG_MAX_MEM_MAPPED;
 	}
 
 	return 0;
common/memsize.c +3 -3
index 3c80ad2c8346..ad9ddf67ac5b 100644
@@ -106,11 +106,11 @@ phys_size_t __weak get_effective_memsize(void)
 	if (gd->ram_base + ram_size < gd->ram_base)
 		ram_size = ((phys_size_t)~0xfffULL) - gd->ram_base;
 
-#ifndef CONFIG_MAX_MEM_MAPPED
+#ifndef CFG_MAX_MEM_MAPPED
 	return ram_size;
 #else
 	/* limit stack to what we can reasonable map */
-	return ((ram_size > CONFIG_MAX_MEM_MAPPED) ?
-		CONFIG_MAX_MEM_MAPPED : ram_size);
+	return ((ram_size > CFG_MAX_MEM_MAPPED) ?
+		CFG_MAX_MEM_MAPPED : ram_size);
 #endif
 }
drivers/ddr/fsl/util.c +3 -3
index e49cf6e8e3db..60051392e713 100644
@@ -139,10 +139,10 @@ __fsl_ddr_set_lawbar(const common_timing_params_t *memctl_common_params,
 	}
 
 #if !defined(CONFIG_PHYS_64BIT)
-	if (base >= CONFIG_MAX_MEM_MAPPED)
+	if (base >= CFG_MAX_MEM_MAPPED)
 		return;
-	if ((base + size) >= CONFIG_MAX_MEM_MAPPED)
-		size = CONFIG_MAX_MEM_MAPPED - base;
+	if ((base + size) >= CFG_MAX_MEM_MAPPED)
+		size = CFG_MAX_MEM_MAPPED - base;
 #endif
 	if (set_ddr_laws(base, size, law_memctl) < 0) {
 		printf("%s: ERROR (ctrl #%d, TRGT ID=%x)\n", __func__, ctrl_num,
drivers/ram/mpc83xx_sdram.c +2 -2
index a53ff93a6b06..5d022d4993bc 100644
@@ -122,8 +122,8 @@ phys_size_t get_effective_memsize(void)
 		return gd->ram_size;
 
 	/* Limit stack to what we can reasonable map */
-	return ((gd->ram_size > CONFIG_MAX_MEM_MAPPED) ?
-		CONFIG_MAX_MEM_MAPPED : gd->ram_size);
+	return ((gd->ram_size > CFG_MAX_MEM_MAPPED) ?
+		CFG_MAX_MEM_MAPPED : gd->ram_size);
 }
 
 /**
include/configs/dra7xx_evm.h +1 -1
index 30def6abf8f4..2aca6ad085e6 100644
@@ -14,7 +14,7 @@
 #include <environment/ti/dfu.h>
 
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_MAX_MEM_MAPPED		0x80000000
+#define CFG_MAX_MEM_MAPPED		0x80000000
 
 #ifndef CONFIG_QSPI_BOOT
 /* MMC ENV related defines */
include/configs/mt7621.h +1 -1
index 7c8c67f44697..188f481ec1fb 100644
@@ -11,7 +11,7 @@
 #define CFG_SYS_SDRAM_BASE		0x80000000
 
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_MAX_MEM_MAPPED		0x1c000000
+#define CFG_MAX_MEM_MAPPED		0x1c000000
 
 #define CFG_SYS_INIT_SP_OFFSET	0x800000
 
include/configs/rcar-gen3-common.h +1 -1
index 54844fe69662..f13e9e6213bb 100644
@@ -29,7 +29,7 @@
 #define CFG_SYS_SDRAM_BASE		(0x40000000 + DRAM_RSV_SIZE)
 #define CFG_SYS_SDRAM_SIZE		(0x80000000u - DRAM_RSV_SIZE)
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_MAX_MEM_MAPPED		(0x80000000u - DRAM_RSV_SIZE)
+#define CFG_MAX_MEM_MAPPED		(0x80000000u - DRAM_RSV_SIZE)
 
 /* ENV setting */
 
include/configs/synquacer.h +1 -1
index 271080303fb6..fa522ce82883 100644
@@ -15,7 +15,7 @@
 #define PHYS_SDRAM_SIZE			(0x7c000000)	/* Default size (2GB - Secure memory) */
 
 #define CONFIG_VERY_BIG_RAM				/* SynQuacer supports up to 64GB */
-#define CONFIG_MAX_MEM_MAPPED		PHYS_SDRAM_SIZE
+#define CFG_MAX_MEM_MAPPED		PHYS_SDRAM_SIZE
 
 #define SQ_DRAMINFO_BASE		(0x2e00ffc0)	/* DRAM info from TF-A */
 
include/configs/xtfpga.h +4 -4
index 6c5a9f566bee..105ce7c0c726 100644
@@ -27,7 +27,7 @@
 #else
 #define CFG_SYS_MEMORY_BASE		0x60000000
 #define CFG_SYS_IO_BASE		0x90000000
-#define CONFIG_MAX_MEM_MAPPED		0x10000000
+#define CFG_MAX_MEM_MAPPED		0x10000000
 #endif
 
 /* Onboard RAM sizes:
@@ -69,10 +69,10 @@
 #define CONFIG_STANDALONE_LOAD_ADDR	0x60800000
 #endif
 
-#if defined(CONFIG_MAX_MEM_MAPPED) && \
-	CONFIG_MAX_MEM_MAPPED < CFG_SYS_SDRAM_SIZE
+#if defined(CFG_MAX_MEM_MAPPED) && \
+	CFG_MAX_MEM_MAPPED < CFG_SYS_SDRAM_SIZE
 #define XTENSA_SYS_TEXT_ADDR		\
-	(MEMADDR(CONFIG_MAX_MEM_MAPPED) - CONFIG_SYS_MONITOR_LEN)
+	(MEMADDR(CFG_MAX_MEM_MAPPED) - CONFIG_SYS_MONITOR_LEN)
 #else
 #define XTENSA_SYS_TEXT_ADDR		\
 	(MEMADDR(CFG_SYS_SDRAM_SIZE) - CONFIG_SYS_MONITOR_LEN)
scripts/config_whitelist.txt +1 -1
index 31484bd13fd9..be26a6c456f2 100644
@@ -120,7 +120,7 @@ CFG_MACB_SEARCH_PHY
 CFG_MALLOC_F_ADDR
 CFG_MALTA
 CFG_MAX_DSP_CPUS
-CONFIG_MAX_MEM_MAPPED
+CFG_MAX_MEM_MAPPED
 CONFIG_MAX_RAM_BANK_SIZE
 CONFIG_MEMSIZE_IN_BYTES
 CONFIG_MEM_INIT_VALUE
Signature · 1 line
2.25.1
author
#160 lore raw

PATCH 113/241 global: Migrate CONFIG_MAX_RAM_BANK_SIZE to CFG

In reply to Tom Rini
---
 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(-)
arch/arm/mach-davinci/misc.c +1 -1
index 42078b39f8ab..cfad28c43d0a 100644
@@ -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;
 }
 
arch/arm/mach-omap2/am33xx/board.c +2 -2
index 86755d6d9543..a52d04d85c8a 100644
@@ -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
 
arch/arm/mach-omap2/sec-common.c +1 -1
index 0f9b915ea3dd..64560b21e3f5 100644
@@ -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;
arch/arm/mach-orion5x/dram.c +2 -2
index c9a3750e48de..5647f847d78f 100644
@@ -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;
arch/arm/mach-orion5x/include/mach/orion5x.h +1 -1
index 4b1b0b0f3716..e41d07e18cc5 100644
@@ -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. */
board/phytec/phycore_am335x_r2/board.c +1 -1
index e84dd251c254..eb573d076dd7 100644
@@ -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) {
board/ti/ks2_evm/board.c +1 -1
index 1683f780a33b..5dcda12105b9 100644
@@ -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);
include/configs/am43xx_evm.h +1 -1
index 3a6ffd9de0bb..f43e00e8a2b6 100644
@@ -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>
include/configs/bur_am335x_common.h +1 -1
index 3e0b42507888..ab57e14392d0 100644
@@ -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 */
include/configs/cm_t43.h +1 -1
index 5a795fe99171..48ee3a50be5e 100644
@@ -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>
include/configs/da850evm.h +1 -1
index cfc8330e35ae..736af88a0247 100644
@@ -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 */
include/configs/draco.h +1 -1
index b56ba9132af2..4c67174572f3 100644
@@ -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 \
include/configs/etamin.h +1 -1
index 32b45b1e5b8d..8b2745ea96e4 100644
@@ -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
include/configs/legoev3.h +1 -1
index b9ec7f379354..3a0622ab0b3b 100644
@@ -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 */
 
include/configs/omapl138_lcdk.h +1 -1
index 02b88da28efa..b1fc437395dd 100644
@@ -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 */
 
include/configs/pxm2.h +1 -1
index 10eaeb49de62..b701e52076db 100644
@@ -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 */
 
include/configs/rastaban.h +1 -1
index 777df4c11259..2efb4d23cdda 100644
@@ -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
include/configs/rut.h +1 -1
index 99799f8494e0..4002bc4b6c88 100644
@@ -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
include/configs/thuban.h +1 -1
index 1753fa410d18..a5913e1e7d2c 100644
@@ -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
include/configs/ti814x_evm.h +1 -1
index 28dba4aa95b6..11e1936c2562 100644
@@ -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
 
include/configs/ti816x_evm.h +1 -1
index 2d9d2fd66e9a..ac6d46f917b8 100644
@@ -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
 
 /**
include/configs/ti_am335x_common.h +1 -1
index ed17b4292096..20f8643771d8 100644
@@ -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>
include/configs/ti_armv7_keystone2.h +1 -1
index 7142d30a5994..a47f0902a267 100644
@@ -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
scripts/config_whitelist.txt +1 -1
index be26a6c456f2..88e4db9a9f5c 100644
@@ -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
Signature · 1 line
2.25.1
author
#161 lore raw

PATCH 114/241 global: Migrate CONFIG_MEMSIZE_IN_BYTES to CFG

In reply to Tom Rini
---
 README                       | 4 ++--
 include/configs/malta.h      | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
README +2 -2
index d09ebd47cd83..8ab897f09641 100644
@@ -373,11 +373,11 @@ The following options need to be configured:
 		such as ARM architectural timer initialization.
 
 - Linux Kernel Interface:
-		CONFIG_MEMSIZE_IN_BYTES		[relevant for MIPS only]
+		CFG_MEMSIZE_IN_BYTES		[relevant for MIPS only]
 
 		When transferring memsize parameter to Linux, some versions
 		expect it to be in bytes, others in MB.
-		Define CONFIG_MEMSIZE_IN_BYTES to make it in bytes.
+		Define CFG_MEMSIZE_IN_BYTES to make it in bytes.
 
 		CONFIG_OF_LIBFDT
 
include/configs/malta.h +1 -1
index cd4f382b18f9..5301afef4d58 100644
@@ -11,7 +11,7 @@
  */
 #define CFG_MALTA
 
-#define CONFIG_MEMSIZE_IN_BYTES
+#define CFG_MEMSIZE_IN_BYTES
 
 /*
  * CPU Configuration
scripts/config_whitelist.txt +1 -1
index 88e4db9a9f5c..6461fc20d698 100644
@@ -122,7 +122,7 @@ CFG_MALTA
 CFG_MAX_DSP_CPUS
 CFG_MAX_MEM_MAPPED
 CFG_MAX_RAM_BANK_SIZE
-CONFIG_MEMSIZE_IN_BYTES
+CFG_MEMSIZE_IN_BYTES
 CONFIG_MEM_INIT_VALUE
 CONFIG_MFG_ENV_SETTINGS
 CONFIG_MII_DEFAULT_TSEC
Signature · 1 line
2.25.1
author
#162 lore raw

PATCH 115/241 global: Migrate CONFIG_MEM_INIT_VALUE to CFG

In reply to Tom Rini
---
 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(-)
drivers/ddr/fsl/ctrl_regs.c +3 -3
index df7ec484651a..684975eebc2d 100644
@@ -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
drivers/ddr/fsl/mpc85xx_ddr_gen1.c +1 -1
index 0f1e99eeb039..ec8c79199b29 100644
@@ -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.
drivers/dma/fsl_dma.c +1 -1
index cd78e45d888a..8620c8f45d6f 100644
@@ -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);
include/configs/MPC8548CDS.h +1 -1
index 5f2fc5516d5e..28315eef765d 100644
@@ -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
include/configs/P1010RDB.h +1 -1
index 794289627fe8..a486fb7d6bd5 100644
@@ -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);
include/configs/T102xRDB.h +1 -1
index 36ae8394d5d6..c61d086dbe57 100644
@@ -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
 
 /*
include/configs/T104xRDB.h +1 -1
index 7a31e8bcdc0a..bae6742928e3 100644
@@ -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
 
 /*
include/configs/T208xQDS.h +1 -1
index 8e2566dd2175..d9841397fb6b 100644
@@ -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
 
 /*
include/configs/T208xRDB.h +1 -1
index 6a215557104f..9e38d5e9f3a2 100644
@@ -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
 
 /*
include/configs/T4240RDB.h +1 -1
index bf0c3ac1318b..f1ee131aaa98 100644
@@ -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
 
 /*
include/configs/kontron_sl28.h +1 -1
index 0a1df4ad4bd0..0029499ea3c0 100644
@@ -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
include/configs/ls1021aqds.h +1 -1
index 69f9bacad97c..9d2622a7d69f 100644
@@ -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
 
 /*
include/configs/ls1043aqds.h +1 -1
index dab57382eddf..35662f65502f 100644
@@ -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
include/configs/ls1043ardb.h +1 -1
index 12c4853ea963..80214e069cb1 100644
@@ -12,7 +12,7 @@
 /* Physical Memory Map */
 
 #ifndef CONFIG_SPL
-#define CONFIG_MEM_INIT_VALUE           0xdeadbeef
+#define CFG_MEM_INIT_VALUE           0xdeadbeef
 #endif
 
 /*
include/configs/ls1046aqds.h +1 -1
index e67ded55da6b..c4fbef7e7f9a 100644
@@ -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
include/configs/ls1046ardb.h +1 -1
index f3904e7b3f7b..1209f16619f9 100644
@@ -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
include/configs/ls1088aqds.h +1 -1
index 0582a4568dc7..52a6a2768384 100644
@@ -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
 
 
include/configs/ls1088ardb.h +1 -1
index ee796facc06c..542495956c32 100644
@@ -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
 
 
include/configs/ls2080aqds.h +1 -1
index d029d841d51e..db7e422336fe 100644
@@ -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
include/configs/ls2080ardb.h +1 -1
index 73477978be46..e4c9b2c44ca6 100644
@@ -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
include/configs/lx2160a_common.h +1 -1
index a469c83fa4eb..0fc32efabc7f 100644
@@ -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
include/configs/socrates.h +1 -1
index 9eee8de41644..eb5c14fff28e 100644
@@ -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
scripts/config_whitelist.txt +1 -1
index 6461fc20d698..1adb99f49ec7 100644
@@ -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
Signature · 1 line
2.25.1
author
#163 lore raw

PATCH 116/241 global: Migrate CONFIG_MFG_ENV_SETTINGS to CFG

In reply to Tom Rini
---
 include/configs/capricorn-common.h | 4 ++--
 include/configs/cgtqmx8.h          | 4 ++--
 include/configs/colibri-imx8x.h    | 4 ++--
 include/configs/imx8mq_phanbell.h  | 4 ++--
 include/configs/imx8qm_rom7720.h   | 4 ++--
 include/configs/mx7dsabresd.h      | 4 ++--
 scripts/config_whitelist.txt       | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)
include/configs/capricorn-common.h +2 -2
index 9e7322cdb937..9dcacad2fc00 100644
@@ -60,7 +60,7 @@
 			"${loadaddr} ${m4_0_image}\0" \
 	"m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" \
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
 	MFG_ENV_SETTINGS_DEFAULT \
 	"initrd_addr=0x83100000\0" \
 	"initrd_high=0xffffffffffffffff\0" \
@@ -68,7 +68,7 @@
 
 /* Initial environment variables */
 #define CFG_EXTRA_ENV_SETTINGS \
-	CONFIG_MFG_ENV_SETTINGS \
+	CFG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	AHAB_ENV \
 	ENV_COMMON \
include/configs/cgtqmx8.h +2 -2
index a63325973846..91454df19720 100644
@@ -42,7 +42,7 @@
 #define FEC0_RESET IMX_GPIO_NR(2, 5)
 #define FEC0_PDOMAIN "conn_enet0"
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
 	"mfgtool_args=setenv bootargs console=${console},${baudrate} " \
 		"rdinit=/linuxrc " \
 		"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
@@ -56,7 +56,7 @@
 
 /* Initial environment variables */
 #define CFG_EXTRA_ENV_SETTINGS		\
-	CONFIG_MFG_ENV_SETTINGS \
+	CFG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	"script=boot.scr\0" \
 	"image=Image\0" \
include/configs/colibri-imx8x.h +2 -2
index 35f29da0c351..0e8e24dd7bd2 100644
@@ -47,7 +47,7 @@
 #undef BOOTENV_RUN_NET_USB_START
 #define BOOTENV_RUN_NET_USB_START ""
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
 	"mfgtool_args=setenv bootargs ${consoleargs} " \
 		"rdinit=/linuxrc g_mass_storage.stall=0 " \
 		"g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F " \
@@ -63,7 +63,7 @@
 #define CFG_EXTRA_ENV_SETTINGS \
 	AHAB_ENV \
 	BOOTENV \
-	CONFIG_MFG_ENV_SETTINGS \
+	CFG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"boot_file=Image\0" \
include/configs/imx8mq_phanbell.h +2 -2
index 5158f2cc605a..6d0c45311183 100644
@@ -24,13 +24,13 @@
 #define CFG_FEC_MXC_PHYADDR          0
 #endif
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
 	"initrd_addr=0x43800000\0" \
 	"initrd_high=0xffffffff\0" \
 
 /* Initial environment variables */
 #define CFG_EXTRA_ENV_SETTINGS		\
-	CONFIG_MFG_ENV_SETTINGS \
+	CFG_MFG_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=Image\0" \
 	"console=ttymxc0,115200\0" \
include/configs/imx8qm_rom7720.h +2 -2
index 5692e3d00007..df2cb8d9ced1 100644
@@ -33,7 +33,7 @@
 #define MFG_NAND_PARTITION ""
 #endif
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
 	"mfgtool_args=setenv bootargs console=${console},${baudrate} " \
 		"rdinit=/linuxrc " \
 		"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
@@ -48,7 +48,7 @@
 
 /* Initial environment variables */
 #define CFG_EXTRA_ENV_SETTINGS		\
-	CONFIG_MFG_ENV_SETTINGS \
+	CFG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	"script=boot.scr\0" \
 	"image=Image\0" \
include/configs/mx7dsabresd.h +2 -2
index 183e67857ca1..a9722967f396 100644
@@ -32,7 +32,7 @@
 #define UPDATE_M4_ENV ""
 #endif
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
 	"mfgtool_args=setenv bootargs console=${console},${baudrate} " \
 		"rdinit=/linuxrc " \
 		"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
@@ -52,7 +52,7 @@
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	UPDATE_M4_ENV \
-	CONFIG_MFG_ENV_SETTINGS \
+	CFG_MFG_ENV_SETTINGS \
 	CFG_DFU_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
scripts/config_whitelist.txt +1 -1
index 1adb99f49ec7..a1b88d29cb15 100644
@@ -124,7 +124,7 @@ CFG_MAX_MEM_MAPPED
 CFG_MAX_RAM_BANK_SIZE
 CFG_MEMSIZE_IN_BYTES
 CFG_MEM_INIT_VALUE
-CONFIG_MFG_ENV_SETTINGS
+CFG_MFG_ENV_SETTINGS
 CONFIG_MII_DEFAULT_TSEC
 CONFIG_MIU_2BIT_21_7_INTERLEAVED
 CONFIG_MIU_2BIT_INTERLEAVED
Signature · 1 line
2.25.1
author
#164 lore raw

PATCH 117/241 global: Migrate CONFIG_MII_DEFAULT_TSEC to CFG

In reply to Tom Rini
---
 include/configs/P1010RDB.h   | 2 +-
 include/configs/ls1021aiot.h | 2 +-
 include/configs/ls1021aqds.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
include/configs/P1010RDB.h +1 -1
index a486fb7d6bd5..a75e1b8f7a8a 100644
@@ -350,7 +350,7 @@ extern unsigned long get_sdram_size(void);
 #endif
 
 #if defined(CONFIG_TSEC_ENET)
-#define CONFIG_MII_DEFAULT_TSEC	1	/* Allow unregistered phys */
+#define CFG_MII_DEFAULT_TSEC	1	/* Allow unregistered phys */
 #define CONFIG_TSEC1	1
 #define CONFIG_TSEC1_NAME	"eTSEC1"
 #define CONFIG_TSEC2	1
include/configs/ls1021aiot.h +1 -1
index 0a08619384b6..7a9a89d02390 100644
@@ -71,7 +71,7 @@
  */
 
 #ifdef CONFIG_TSEC_ENET
-#define CONFIG_MII_DEFAULT_TSEC		1
+#define CFG_MII_DEFAULT_TSEC		1
 #define CONFIG_TSEC1			1
 #define CONFIG_TSEC1_NAME		"eTSEC1"
 #define CONFIG_TSEC2			1
include/configs/ls1021aqds.h +1 -1
index 9d2622a7d69f..be05ab9de8cb 100644
@@ -252,7 +252,7 @@
  */
 
 #ifdef CONFIG_TSEC_ENET
-#define CONFIG_MII_DEFAULT_TSEC		3
+#define CFG_MII_DEFAULT_TSEC		3
 #define CONFIG_TSEC1			1
 #define CONFIG_TSEC1_NAME		"eTSEC1"
 #define CONFIG_TSEC2			1
scripts/config_whitelist.txt +1 -1
index a1b88d29cb15..0380ebb2a6e8 100644
@@ -125,7 +125,7 @@ CFG_MAX_RAM_BANK_SIZE
 CFG_MEMSIZE_IN_BYTES
 CFG_MEM_INIT_VALUE
 CFG_MFG_ENV_SETTINGS
-CONFIG_MII_DEFAULT_TSEC
+CFG_MII_DEFAULT_TSEC
 CONFIG_MIU_2BIT_21_7_INTERLEAVED
 CONFIG_MIU_2BIT_INTERLEAVED
 CONFIG_MMC_DEFAULT_DEV
Signature · 1 line
2.25.1
author
#165 lore raw

PATCH 118/241 global: Migrate CONFIG_MIU_2BIT_21_7_INTERLEAVED to CFG

In reply to Tom Rini
---
 include/configs/origen.h     | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/origen.h +1 -1
index d4ba599d72a4..a85fee4a0d84 100644
@@ -39,7 +39,7 @@
                 "source ${loadaddr}\0"
 
 /* MIU (Memory Interleaving Unit) */
-#define CONFIG_MIU_2BIT_21_7_INTERLEAVED
+#define CFG_MIU_2BIT_21_7_INTERLEAVED
 
 #define RESERVE_BLOCK_SIZE		(512)
 #define BL1_SIZE			(16 << 10) /*16 K reserved for BL1*/
scripts/config_whitelist.txt +1 -1
index 0380ebb2a6e8..8d6af14c3667 100644
@@ -126,7 +126,7 @@ CFG_MEMSIZE_IN_BYTES
 CFG_MEM_INIT_VALUE
 CFG_MFG_ENV_SETTINGS
 CFG_MII_DEFAULT_TSEC
-CONFIG_MIU_2BIT_21_7_INTERLEAVED
+CFG_MIU_2BIT_21_7_INTERLEAVED
 CONFIG_MIU_2BIT_INTERLEAVED
 CONFIG_MMC_DEFAULT_DEV
 CONFIG_MMC_SUNXI_SLOT
Signature · 1 line
2.25.1
author
#166 lore raw

PATCH 119/241 global: Migrate CONFIG_MIU_2BIT_INTERLEAVED to CFG

In reply to Tom Rini
---
 arch/arm/mach-exynos/exynos4_setup.h | 2 +-
 include/configs/smdkv310.h           | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/exynos4_setup.h +1 -1
index fbb45eb897e3..b696206cc855 100644
@@ -434,7 +434,7 @@ struct mem_timings {
 /* Interleave_bit0: 0xC*/
 #define APB_SFR_INTERLEAVE_CONF_VAL	0x0000000c
 #endif
-#ifdef CONFIG_MIU_2BIT_INTERLEAVED
+#ifdef CFG_MIU_2BIT_INTERLEAVED
 /* Interleave: 2Bit, Interleave_bit1: 0x15, Interleave_bit0: 0xc */
 #define APB_SFR_INTERLEAVE_CONF_VAL	0x2000150c
 #endif
include/configs/smdkv310.h +1 -1
index 1f137dba90f7..00dd929d90e6 100644
@@ -35,7 +35,7 @@
 /* FLASH and environment organization */
 
 /* MIU (Memory Interleaving Unit) */
-#define CONFIG_MIU_2BIT_INTERLEAVED
+#define CFG_MIU_2BIT_INTERLEAVED
 
 #define RESERVE_BLOCK_SIZE		(512)
 #define BL1_SIZE			(16 << 10) /*16 K reserved for BL1*/
scripts/config_whitelist.txt +1 -1
index 8d6af14c3667..b2686806c5c4 100644
@@ -127,7 +127,7 @@ CFG_MEM_INIT_VALUE
 CFG_MFG_ENV_SETTINGS
 CFG_MII_DEFAULT_TSEC
 CFG_MIU_2BIT_21_7_INTERLEAVED
-CONFIG_MIU_2BIT_INTERLEAVED
+CFG_MIU_2BIT_INTERLEAVED
 CONFIG_MMC_DEFAULT_DEV
 CONFIG_MMC_SUNXI_SLOT
 CONFIG_MONITOR_IS_IN_RAM
Signature · 1 line
2.25.1
author
#167 lore raw

PATCH 120/241 global: Migrate CONFIG_MMC_DEFAULT_DEV to CFG

In reply to Tom Rini
---
 include/configs/exynos4-common.h | 2 +-
 include/configs/s5p_goni.h       | 2 +-
 include/configs/trats2.h         | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
include/configs/exynos4-common.h +1 -1
index 63e26687dbce..6a48fe9103ff 100644
@@ -11,7 +11,7 @@
 #include "exynos-common.h"
 
 /* SD/MMC configuration */
-#define CONFIG_MMC_DEFAULT_DEV	0
+#define CFG_MMC_DEFAULT_DEV	0
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
include/configs/s5p_goni.h +1 -1
index 1e211eccee7b..85e24caa5107 100644
@@ -120,7 +120,7 @@
 #define PHYS_SDRAM_3_SIZE	(128 << 20)		/* 128 MB in Bank #2 */
 
 /* FLASH and environment organization */
-#define CONFIG_MMC_DEFAULT_DEV	0
+#define CFG_MMC_DEFAULT_DEV	0
 
 #define CFG_SYS_ONENAND_BASE		0xB0000000
 
include/configs/trats2.h +1 -1
index 21372243bbc8..d5f17e3b7802 100644
@@ -81,7 +81,7 @@
 		"${kernelname}\0" \
 	"loaddtb=ext4load mmc ${mmcdev}:${mmcbootpart} ${fdtaddr} " \
 		"${fdtfile}\0" \
-	"mmcdev=" __stringify(CONFIG_MMC_DEFAULT_DEV) "\0" \
+	"mmcdev=" __stringify(CFG_MMC_DEFAULT_DEV) "\0" \
 	"mmcbootpart=2\0" \
 	"mmcrootpart=5\0" \
 	"opts=always_resume=1\0" \
scripts/config_whitelist.txt +1 -1
index b2686806c5c4..a31178b8b6e7 100644
@@ -128,7 +128,7 @@ CFG_MFG_ENV_SETTINGS
 CFG_MII_DEFAULT_TSEC
 CFG_MIU_2BIT_21_7_INTERLEAVED
 CFG_MIU_2BIT_INTERLEAVED
-CONFIG_MMC_DEFAULT_DEV
+CFG_MMC_DEFAULT_DEV
 CONFIG_MMC_SUNXI_SLOT
 CONFIG_MONITOR_IS_IN_RAM
 CONFIG_MTD_NAND_VERIFY_WRITE
Signature · 1 line
2.25.1
author
#168 lore raw

PATCH 121/241 global: Migrate CONFIG_MMC_SUNXI_SLOT to CFG

In reply to Tom Rini
---
 board/sunxi/board.c            | 4 ++--
 include/configs/sunxi-common.h | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
board/sunxi/board.c +2 -2
index 21a2407e062f..356e5f07f688 100644
@@ -526,8 +526,8 @@ static void mmc_pinmux_setup(int sdc)
 int board_mmc_init(struct bd_info *bis)
 {
 	if (!IS_ENABLED(CONFIG_UART0_PORT_F)) {
-		mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT);
-		if (!sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT))
+		mmc_pinmux_setup(CFG_MMC_SUNXI_SLOT);
+		if (!sunxi_mmc_init(CFG_MMC_SUNXI_SLOT))
 			return -1;
 	}
 
include/configs/sunxi-common.h +1 -1
index f3c8f7002342..1be4cde2b70e 100644
@@ -70,7 +70,7 @@
 #define PHYS_SDRAM_0_SIZE		0x80000000 /* 2 GiB */
 
 /* mmc config */
-#define CONFIG_MMC_SUNXI_SLOT		0
+#define CFG_MMC_SUNXI_SLOT		0
 
 /*
  * Miscellaneous configurable options
scripts/config_whitelist.txt +1 -1
index a31178b8b6e7..4185a1b9c003 100644
@@ -129,7 +129,7 @@ CFG_MII_DEFAULT_TSEC
 CFG_MIU_2BIT_21_7_INTERLEAVED
 CFG_MIU_2BIT_INTERLEAVED
 CFG_MMC_DEFAULT_DEV
-CONFIG_MMC_SUNXI_SLOT
+CFG_MMC_SUNXI_SLOT
 CONFIG_MONITOR_IS_IN_RAM
 CONFIG_MTD_NAND_VERIFY_WRITE
 CONFIG_MVGBE_PORTS
Signature · 1 line
2.25.1
author
#169 lore raw

PATCH 122/241 global: Migrate CONFIG_MONITOR_IS_IN_RAM to CFG

In reply to Tom Rini
---
 arch/m68k/cpu/mcf52x2/cpu_init.c | 12 ++++++------
 arch/m68k/cpu/mcf52x2/start.S    |  4 ++--
 arch/m68k/cpu/mcf530x/start.S    |  4 ++--
 arch/m68k/cpu/mcf532x/speed.c    |  4 ++--
 arch/m68k/cpu/mcf532x/start.S    |  6 +++---
 board/astro/mcf5373l/mcf5373l.c  |  2 +-
 board/cobra5272/README           |  8 ++++----
 board/freescale/m53017evb/README |  2 +-
 board/freescale/m5373evb/README  |  2 +-
 doc/arch/m68k.rst                |  2 +-
 drivers/mtd/cfi_flash.c          |  2 +-
 include/configs/10m50_devboard.h |  2 +-
 include/configs/3c120_devboard.h |  2 +-
 include/configs/M5249EVB.h       |  2 +-
 include/configs/M5272C3.h        |  2 +-
 include/configs/M5282EVB.h       |  2 +-
 include/configs/astro_mcf5373l.h | 12 +-----------
 include/configs/cobra5272.h      | 21 ---------------------
 include/configs/eb_cpu5282.h     |  2 +-
 scripts/config_whitelist.txt     |  2 +-
 20 files changed, 32 insertions(+), 63 deletions(-)
arch/m68k/cpu/mcf52x2/cpu_init.c +6 -6
index 99eb61f16758..1d6e39a2ce5e 100644
@@ -334,7 +334,7 @@ void cpu_init_f(void)
 	/* if we come from RAM we assume the CPU is
 	 * already initialized.
 	 */
-#ifndef CONFIG_MONITOR_IS_IN_RAM
+#ifndef CFG_MONITOR_IS_IN_RAM
 	sysctrl_t *sysctrl = (sysctrl_t *) (CFG_SYS_MBAR);
 	gpio_t *gpio = (gpio_t *) (MMAP_GPIO);
 	csctrl_t *csctrl = (csctrl_t *) (MMAP_FBCS);
@@ -390,7 +390,7 @@ void cpu_init_f(void)
 	out_be32(&csctrl->cs_or7, CONFIG_SYS_OR7_PRELIM);
 #endif
 
-#endif				/* #ifndef CONFIG_MONITOR_IS_IN_RAM */
+#endif				/* #ifndef CFG_MONITOR_IS_IN_RAM */
 
 	/* enable instruction cache now */
 	icache_enable();
@@ -460,7 +460,7 @@ void cpu_init_f(void)
 	 * already initialized.
 	 */
 
-#ifndef CONFIG_MONITOR_IS_IN_RAM
+#ifndef CFG_MONITOR_IS_IN_RAM
 	wdog_t *wdog_reg = (wdog_t *) (MMAP_WDOG);
 	gpio_t *gpio_reg = (gpio_t *) (MMAP_GPIO);
 
@@ -469,7 +469,7 @@ void cpu_init_f(void)
 
 	/* FlexBus Chipselect */
 	init_fbcs();
-#endif				/* #ifndef CONFIG_MONITOR_IS_IN_RAM */
+#endif				/* #ifndef CFG_MONITOR_IS_IN_RAM */
 
 #ifdef CONFIG_SYS_I2C_FSL
 	CFG_SYS_I2C_PINMUX_REG &= CFG_SYS_I2C_PINMUX_CLR;
@@ -557,7 +557,7 @@ void cpu_init_f(void)
 	MCFWTM_WCR = 0;
 #endif
 
-#ifndef CONFIG_MONITOR_IS_IN_RAM
+#ifndef CFG_MONITOR_IS_IN_RAM
 	/* Set speed /PLL */
 	MCFCLOCK_SYNCR =
 	    MCFCLOCK_SYNCR_MFD(CFG_SYS_MFD) |
@@ -614,7 +614,7 @@ void cpu_init_f(void)
 	/* FlexBus Chipselect */
 	init_fbcs();
 
-#endif				/* CONFIG_MONITOR_IS_IN_RAM */
+#endif				/* CFG_MONITOR_IS_IN_RAM */
 
 	/* defer enabling cache until boot (see do_go) */
 	/* icache_enable(); */
arch/m68k/cpu/mcf52x2/start.S +2 -2
index d48d0192eea2..47d935d3d9f0 100644
@@ -25,7 +25,7 @@
 /* If we come from a pre-loader we don't need an initial exception
  * table.
  */
-#if !defined(CONFIG_MONITOR_IS_IN_RAM)
+#if !defined(CFG_MONITOR_IS_IN_RAM)
 
 .text
 
@@ -164,7 +164,7 @@ _after_flashbar_copy:
 	 * if we come from a pre-loader we have no exception table and
 	 * therefore no VBR to set
 	 */
-#if !defined(CONFIG_MONITOR_IS_IN_RAM)
+#if !defined(CFG_MONITOR_IS_IN_RAM)
 #if defined(CONFIG_M5282) && (CONFIG_TEXT_BASE == CFG_SYS_INT_FLASH_BASE)
 	move.l	#CFG_SYS_INT_FLASH_BASE, %d0
 #else
arch/m68k/cpu/mcf530x/start.S +2 -2
index dbe2b54e4101..4d474576457e 100644
@@ -27,7 +27,7 @@
 /* If we come from a pre-loader we don't need an initial exception
  * table.
  */
-#if !defined(CONFIG_MONITOR_IS_IN_RAM)
+#if !defined(CFG_MONITOR_IS_IN_RAM)
 
 .text
 
@@ -109,7 +109,7 @@ _start:
 	 * if we come from a pre-loader we have no exception table and
 	 * therefore no VBR to set
 	 */
-#if !defined(CONFIG_MONITOR_IS_IN_RAM)
+#if !defined(CFG_MONITOR_IS_IN_RAM)
 	move.l	#CFG_SYS_FLASH_BASE, %d0
 	movec	%d0, %VBR
 #endif
arch/m68k/cpu/mcf532x/speed.c +2 -2
index 32ffac08135d..f58f84f976ce 100644
@@ -192,7 +192,7 @@ int clock_pll(int fsys, int flags)
 #endif
 
 /* must not tamper with SDRAMC if running from SDRAM */
-#if !defined(CONFIG_MONITOR_IS_IN_RAM)
+#if !defined(CFG_MONITOR_IS_IN_RAM)
 	/*
 	 * Check to see if the SDRAM has already been initialized.
 	 * If it has then the SDRAM needs to be put into self refresh
@@ -244,7 +244,7 @@ int clock_pll(int fsys, int flags)
 
 	/* wait for DQS logic to relock */
 	for (i = 0; i < 0x200; i++) ;
-#endif /* !defined(CONFIG_MONITOR_IS_IN_RAM) */
+#endif /* !defined(CFG_MONITOR_IS_IN_RAM) */
 
 	return fout;
 }
arch/m68k/cpu/mcf532x/start.S +3 -3
index 72a2f99b7dd2..4e6f2b8621d7 100644
@@ -24,7 +24,7 @@
 	addl	#60,%sp;		/* space for 15 regs */ \
 	rte;
 
-#if !defined(CONFIG_MONITOR_IS_IN_RAM)
+#if !defined(CFG_MONITOR_IS_IN_RAM)
 
 .text
 
@@ -86,7 +86,7 @@ vector192_255:
 .long	_FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT
 .long	_FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT
 .long	_FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT
-#endif /* !defined(CONFIG_MONITOR_IS_IN_RAM) */
+#endif /* !defined(CFG_MONITOR_IS_IN_RAM) */
 
 .text
 
@@ -96,7 +96,7 @@ _start:
 	nop
 	move.w	#0x2700,%sr	/* Mask off Interrupt */
 
-#if !defined(CONFIG_MONITOR_IS_IN_RAM)
+#if !defined(CFG_MONITOR_IS_IN_RAM)
 	/* Set vector base register at the beginning of the Flash */
 	move.l	#CFG_SYS_FLASH_BASE, %d0
 	movec	%d0, %VBR
board/astro/mcf5373l/mcf5373l.c +1 -1
index 43563c412793..c6172365744a 100644
@@ -32,7 +32,7 @@ int checkboard(void)
 
 int dram_init(void)
 {
-#if !defined(CONFIG_MONITOR_IS_IN_RAM)
+#if !defined(CFG_MONITOR_IS_IN_RAM)
 	sdram_t *sdp = (sdram_t *)(MMAP_SDRAM);
 
 	/*
board/cobra5272/README +4 -4
index ac62e557a075..770b66327ef5 100644
@@ -79,10 +79,10 @@ please first check:
 
 	in ./include/configs/cobra5272.h
 
-		CONFIG_MONITOR_IS_IN_RAM has to be undefined, e. g. as follows:
+		CFG_MONITOR_IS_IN_RAM has to be undefined, e. g. as follows:
 
 		#if 0
-			#define CONFIG_MONITOR_IS_IN_RAM
+			#define CFG_MONITOR_IS_IN_RAM
 			/* define if monitor is started from a pre-loader */
 		#endif
 
@@ -118,10 +118,10 @@ please modify the settings:
 
 	in ./include/configs/cobra5272.h
 
-		CONFIG_MONITOR_IS_IN_RAM now has to be defined, e. g. as follows:
+		CFG_MONITOR_IS_IN_RAM now has to be defined, e. g. as follows:
 
 		#if 1
-			#define CONFIG_MONITOR_IS_IN_RAM
+			#define CFG_MONITOR_IS_IN_RAM
 			/*define if monitor is started from a pre-loader */
 		#endif
 
board/freescale/m53017evb/README +1 -1
index 34f05f3fdc72..193ba9394ac3 100644
@@ -98,7 +98,7 @@ CONFIG_SYS_IMMR			-- define for MBAR offset
 
 CFG_SYS_MBAR			-- define MBAR offset
 
-CONFIG_MONITOR_IS_IN_RAM	-- Not support
+CFG_MONITOR_IS_IN_RAM	-- Not support
 
 CFG_SYS_INIT_RAM_ADDR	-- defines the base address of the MCF5301x internal SRAM
 
board/freescale/m5373evb/README +1 -1
index 7240648796b5..807785cb4ff5 100644
@@ -97,7 +97,7 @@ CONFIG_SYS_IMMR		-- define for MBAR offset
 
 CFG_SYS_MBAR		-- define MBAR offset
 
-CONFIG_MONITOR_IS_IN_RAM -- Not support
+CFG_MONITOR_IS_IN_RAM -- Not support
 
 CFG_SYS_INIT_RAM_ADDR	-- defines the base address of the MCF5373 internal SRAM
 
doc/arch/m68k.rst +1 -1
index 770327fea21a..dc2a41d4e990 100644
@@ -93,7 +93,7 @@ Configuration to use a pre-loader
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 If U-Boot should be loaded to RAM and started by a pre-loader
-CONFIG_MONITOR_IS_IN_RAM must be defined. If it is defined the
+CFG_MONITOR_IS_IN_RAM must be defined. If it is defined the
 initial vector table and basic processor initialization will not
 be compiled in. The start address of U-Boot must be adjusted in
 the boards config header file (CONFIG_SYS_MONITOR_BASE) and Makefile
drivers/mtd/cfi_flash.c +1 -1
index f3abe7842b69..0461aa1adbed 100644
@@ -2360,7 +2360,7 @@ static void flash_protect_default(void)
 	/* Monitor protection ON by default */
 #if defined(CONFIG_SYS_MONITOR_BASE) && \
 	(CONFIG_SYS_MONITOR_BASE >= CFG_SYS_FLASH_BASE) && \
-	(!defined(CONFIG_MONITOR_IS_IN_RAM))
+	(!defined(CFG_MONITOR_IS_IN_RAM))
 	flash_protect(FLAG_PROTECT_SET,
 		      CONFIG_SYS_MONITOR_BASE,
 		      CONFIG_SYS_MONITOR_BASE + monitor_flash_len  - 1,
include/configs/10m50_devboard.h +1 -1
index 3a4fbc6eab83..cc22a4724aaa 100644
@@ -32,6 +32,6 @@
  */
 #define CFG_SYS_SDRAM_BASE		0xc8000000
 #define CFG_SYS_SDRAM_SIZE		0x08000000
-#define CONFIG_MONITOR_IS_IN_RAM
+#define CFG_MONITOR_IS_IN_RAM
 
 #endif /* __CONFIG_H */
include/configs/3c120_devboard.h +1 -1
index ab889180eede..556f31efe59f 100644
@@ -28,6 +28,6 @@
  */
 #define CFG_SYS_SDRAM_BASE		0xD0000000
 #define CFG_SYS_SDRAM_SIZE		0x08000000
-#define CONFIG_MONITOR_IS_IN_RAM
+#define CFG_MONITOR_IS_IN_RAM
 
 #endif /* __CONFIG_H */
include/configs/M5249EVB.h +1 -1
index 0e38eeb4a365..4a9e9ed882ac 100644
@@ -20,7 +20,7 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#undef CONFIG_MONITOR_IS_IN_RAM		/* no pre-loader required!!! ;-) */
+#undef CFG_MONITOR_IS_IN_RAM		/* no pre-loader required!!! ;-) */
 
 /*
  * Clock configuration: enable only one of the following options
include/configs/M5272C3.h +1 -1
index 4b88cfc2cdd9..99f1df087e36 100644
@@ -19,7 +19,7 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#undef CONFIG_MONITOR_IS_IN_RAM	/* define if monitor is started from a pre-loader */
+#undef CFG_MONITOR_IS_IN_RAM	/* define if monitor is started from a pre-loader */
 
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
include/configs/M5282EVB.h +1 -1
index f34985c47d4b..4b20da4a23eb 100644
@@ -19,7 +19,7 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#undef	CONFIG_MONITOR_IS_IN_RAM	/* define if monitor is started from a pre-loader */
+#undef	CFG_MONITOR_IS_IN_RAM	/* define if monitor is started from a pre-loader */
 
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
include/configs/astro_mcf5373l.h +1 -11
index 8f4419f402f7..fe49b04609cf 100644
@@ -45,7 +45,7 @@
  * boards.
  */
 #ifdef CONFIG_RAM
-#define CONFIG_MONITOR_IS_IN_RAM
+#define CFG_MONITOR_IS_IN_RAM
 #endif
 
 /* I2C */
@@ -74,16 +74,6 @@
  * Environment is located in the last sector of the flash
  */
 
-#ifndef CONFIG_MONITOR_IS_IN_RAM
-#else
-/*
- * environment in RAM - This is used to use a single PC-based application
- * to load an image, load U-Boot, load an environment and then start U-Boot
- * to execute the commands from the environment. Feedback is done via setting
- * and reading memory locations.
- */
-#endif
-
 /* here we put our FPGA configuration... */
 
 /* Define user parameters that have to be customized most likely */
include/configs/cobra5272.h +0 -21
index 1b5115f7caf1..b0acdb2e7d62 100644
@@ -42,27 +42,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-/* ---
- * CONFIG_MONITOR_IS_IN_RAM defines if u-boot is started from a different
- * bootloader residing in flash ('chainloading'); if you want to use
- * chainloading or want to compile a u-boot binary that can be loaded into
- * RAM via BDM set
- *	"#if 0" to "#if 1"
- * You will need a first stage bootloader then, e. g. colilo or a working BDM
- * cable (Background Debug Mode)
- *
- * Setting #if 0: u-boot will start from flash and relocate itself to RAM
- *
- * Please do not forget to modify the setting of CONFIG_TEXT_BASE
- * in board/cobra5272/config.mk accordingly (#if 0: 0xffe00000; #if 1: 0x20000)
- *
- * ---
- */
-
-#if 0
-#define CONFIG_MONITOR_IS_IN_RAM /* monitor is started from a preloader */
-#endif
-
 /* ---
  * Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
include/configs/eb_cpu5282.h +1 -1
index a4370ca5c7cc..e8d85bdd78f2 100644
@@ -14,7 +14,7 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#undef	CONFIG_MONITOR_IS_IN_RAM		/* starts uboot direct */
+#undef	CFG_MONITOR_IS_IN_RAM		/* starts uboot direct */
 
 /*----------------------------------------------------------------------*
  * Options								*
scripts/config_whitelist.txt +1 -1
index 4185a1b9c003..01f78d11afd8 100644
@@ -130,7 +130,7 @@ CFG_MIU_2BIT_21_7_INTERLEAVED
 CFG_MIU_2BIT_INTERLEAVED
 CFG_MMC_DEFAULT_DEV
 CFG_MMC_SUNXI_SLOT
-CONFIG_MONITOR_IS_IN_RAM
+CFG_MONITOR_IS_IN_RAM
 CONFIG_MTD_NAND_VERIFY_WRITE
 CONFIG_MVGBE_PORTS
 CONFIG_MXC_GPT_HCLK
Signature · 1 line
2.25.1
author
#170 lore raw

PATCH 123/241 global: Migrate CONFIG_MTD_NAND_VERIFY_WRITE to CFG

In reply to Tom Rini
---
 include/configs/ls1043aqds.h  | 2 +-
 include/configs/ls1043ardb.h  | 2 +-
 include/configs/ls1046afrwy.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 +-
 scripts/config_whitelist.txt  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)
include/configs/ls1043aqds.h +1 -1
index 35662f65502f..477e63ce0390 100644
@@ -107,7 +107,7 @@
 #define CFG_SYS_NAND_FTIM3           0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_MTD_NAND_VERIFY_WRITE
 #endif
 
 #ifdef CONFIG_NAND_BOOT
include/configs/ls1043ardb.h +1 -1
index 80214e069cb1..ec81b3ca5b36 100644
@@ -82,7 +82,7 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_MTD_NAND_VERIFY_WRITE
 
 #ifdef CONFIG_NAND_BOOT
 #define CFG_SYS_NAND_U_BOOT_SIZE	(1024 << 10)
include/configs/ls1046afrwy.h +1 -1
index 1759d25f3a39..c876d3ee2719 100644
@@ -45,7 +45,7 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_MTD_NAND_VERIFY_WRITE
 
 /* IFC Timing Params */
 #define CFG_SYS_CSPR0_EXT		CFG_SYS_NAND_CSPR_EXT
include/configs/ls1046aqds.h +1 -1
index c4fbef7e7f9a..731fc1d35bb7 100644
@@ -127,7 +127,7 @@
 #define CFG_SYS_NAND_FTIM3           0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_MTD_NAND_VERIFY_WRITE
 #endif
 
 #ifdef CONFIG_NAND_BOOT
include/configs/ls1046ardb.h +1 -1
index 1209f16619f9..13837e89d25b 100644
@@ -50,7 +50,7 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_MTD_NAND_VERIFY_WRITE
 
 /*
  * CPLD
include/configs/ls1088aqds.h +1 -1
index 52a6a2768384..421965fc7974 100644
@@ -99,7 +99,7 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_MTD_NAND_VERIFY_WRITE
 
 #define CFG_SYS_I2C_FPGA_ADDR	0x66
 #define QIXIS_LBMAP_SWITCH		6
include/configs/ls1088ardb.h +1 -1
index 542495956c32..41d1666a3588 100644
@@ -83,7 +83,7 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_MTD_NAND_VERIFY_WRITE
 
 #define CFG_SYS_I2C_FPGA_ADDR	0x66
 #define QIXIS_BRDCFG4_OFFSET            0x54
include/configs/ls2080aqds.h +1 -1
index db7e422336fe..652f0b1b7760 100644
@@ -100,7 +100,7 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_MTD_NAND_VERIFY_WRITE
 
 #define QIXIS_LBMAP_SWITCH		0x06
 #define QIXIS_LBMAP_MASK		0x0f
include/configs/ls2080ardb.h +1 -1
index e4c9b2c44ca6..4ca7d51c990b 100644
@@ -97,7 +97,7 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_MTD_NAND_VERIFY_WRITE
 
 #define QIXIS_LBMAP_SWITCH		0x06
 #define QIXIS_LBMAP_MASK		0x0f
scripts/config_whitelist.txt +1 -1
index 01f78d11afd8..24d09c1a4be2 100644
@@ -131,7 +131,7 @@ CFG_MIU_2BIT_INTERLEAVED
 CFG_MMC_DEFAULT_DEV
 CFG_MMC_SUNXI_SLOT
 CFG_MONITOR_IS_IN_RAM
-CONFIG_MTD_NAND_VERIFY_WRITE
+CFG_MTD_NAND_VERIFY_WRITE
 CONFIG_MVGBE_PORTS
 CONFIG_MXC_GPT_HCLK
 CONFIG_MXC_NAND_HWECC
Signature · 1 line
2.25.1
author
#171 lore raw

PATCH 124/241 global: Migrate CONFIG_MVGBE_PORTS to CFG

In reply to Tom Rini
---
 drivers/net/mvgbe.c            | 6 +++---
 include/configs/SBx81LIFKW.h   | 2 +-
 include/configs/SBx81LIFXCAT.h | 2 +-
 include/configs/dns325.h       | 2 +-
 include/configs/dockstar.h     | 2 +-
 include/configs/dreamplug.h    | 2 +-
 include/configs/ds109.h        | 2 +-
 include/configs/goflexhome.h   | 2 +-
 include/configs/guruplug.h     | 2 +-
 include/configs/ib62x0.h       | 2 +-
 include/configs/iconnect.h     | 2 +-
 include/configs/lacie_kw.h     | 2 +-
 include/configs/nas220.h       | 2 +-
 include/configs/nsa310s.h      | 2 +-
 include/configs/openrd.h       | 4 ++--
 include/configs/pogo_e02.h     | 2 +-
 include/configs/pogo_v4.h      | 2 +-
 include/configs/sheevaplug.h   | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 19 files changed, 22 insertions(+), 22 deletions(-)
drivers/net/mvgbe.c +3 -3
index a77c05743262..373bb8b0d239 100644
@@ -37,8 +37,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifndef CONFIG_MVGBE_PORTS
-# define CONFIG_MVGBE_PORTS {0, 0}
+#ifndef CFG_MVGBE_PORTS
+# define CFG_MVGBE_PORTS {0, 0}
 #endif
 
 #define MV_PHY_ADR_REQUEST 0xee
@@ -832,7 +832,7 @@ int mvgbe_initialize(struct bd_info *bis)
 	struct eth_device *dev;
 	int devnum;
 	int ret;
-	u8 used_ports[MAX_MVGBE_DEVS] = CONFIG_MVGBE_PORTS;
+	u8 used_ports[MAX_MVGBE_DEVS] = CFG_MVGBE_PORTS;
 
 	for (devnum = 0; devnum < MAX_MVGBE_DEVS; devnum++) {
 		/*skip if port is configured not to use */
include/configs/SBx81LIFKW.h +1 -1
index bad34d9771ec..861ae530336a 100644
@@ -43,7 +43,7 @@
  * Ethernet Driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable a single port */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable a single port */
 #define CONFIG_PHY_BASE_ADR	0x01
 #endif /* CONFIG_CMD_NET */
 
include/configs/SBx81LIFXCAT.h +1 -1
index 9a9663b34ba8..418221ca72b3 100644
@@ -48,7 +48,7 @@
  * Ethernet Driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable a single port */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable a single port */
 #define CONFIG_PHY_BASE_ADR	0x01
 #endif /* CONFIG_CMD_NET */
 
include/configs/dns325.h +1 -1
index 2a70db5e9382..8a9591ff29e1 100644
@@ -20,7 +20,7 @@
  * Ethernet Driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS		{1, 0} /* enable port 0 only */
+#define CFG_MVGBE_PORTS		{1, 0} /* enable port 0 only */
 #endif
 
 /*
include/configs/dockstar.h +1 -1
index 07cec38b50d0..68afe96239e6 100644
@@ -31,7 +31,7 @@
 /*
  * Ethernet Driver configuration
  */
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_DOCKSTAR_H */
include/configs/dreamplug.h +1 -1
index 733020d3e261..2b312e52b135 100644
@@ -27,7 +27,7 @@
 /*
  * Ethernet Driver configuration
  */
-#define CONFIG_MVGBE_PORTS	{1, 1}	/* enable both ports */
+#define CFG_MVGBE_PORTS	{1, 1}	/* enable both ports */
 #define CONFIG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_DREAMPLUG_H */
include/configs/ds109.h +1 -1
index ede21a4e2c57..a5f62497a731 100644
@@ -39,7 +39,7 @@
  * Ethernet Driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable one port */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable one port */
 #define CONFIG_PHY_BASE_ADR	8
 #endif /* CONFIG_CMD_NET */
 
include/configs/goflexhome.h +1 -1
index bc517286b113..c10e991d6589 100644
@@ -39,7 +39,7 @@
 /*
  * Ethernet Driver configuration
  */
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_GOFLEXHOME_H */
include/configs/guruplug.h +1 -1
index c4f53e6e4004..b21151e312c9 100644
@@ -34,7 +34,7 @@
  * Ethernet Driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 1}	/* enable both ports */
+#define CFG_MVGBE_PORTS	{1, 1}	/* enable both ports */
 #define CONFIG_PHY_BASE_ADR	0
 #endif /* CONFIG_CMD_NET */
 
include/configs/ib62x0.h +1 -1
index 242f92e6fd72..5eeaeadd4bec 100644
@@ -28,7 +28,7 @@
  * Ethernet driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	0
 #endif /* CONFIG_CMD_NET */
 
include/configs/iconnect.h +1 -1
index f719ecb5fe0b..12f8a3c933cc 100644
@@ -22,7 +22,7 @@
  * This board has PCIe Wifi card, so allow Ethernet to be disabled
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	11
 #endif /* CONFIG_CMD_NET */
 
include/configs/lacie_kw.h +1 -1
index db45585ba313..ea3a5215e8c9 100644
@@ -18,7 +18,7 @@
  * Ethernet Driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS		{1, 0} /* enable port 0 only */
+#define CFG_MVGBE_PORTS		{1, 0} /* enable port 0 only */
 #endif
 
 /*
include/configs/nas220.h +1 -1
index 9676ccc982f5..bfa132dbfe58 100644
@@ -43,7 +43,7 @@
  * Ethernet Driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0}	/* enable port 0 only */
+#define CFG_MVGBE_PORTS {1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR 8
 #endif /* CONFIG_CMD_NET */
 
include/configs/nsa310s.h +1 -1
index 76c4aed6fd91..85cbd0bab07d 100644
@@ -47,7 +47,7 @@
 #endif /* CONFIG_SPL_BUILD */
 
 /* Ethernet driver configuration */
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	1
 
 #endif /* _CONFIG_NSA310S_H */
include/configs/openrd.h +2 -2
index ec3a0e0676d7..1d1915a98520 100644
@@ -38,9 +38,9 @@
  */
 #ifdef CONFIG_CMD_NET
 # ifdef CONFIG_BOARD_IS_OPENRD_BASE
-#  define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+#  define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 # else
-#  define CONFIG_MVGBE_PORTS	{1, 1}	/* enable both ports */
+#  define CFG_MVGBE_PORTS	{1, 1}	/* enable both ports */
 # endif
 # ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE
 #  define CONFIG_PHY_BASE_ADR	0x0
include/configs/pogo_e02.h +1 -1
index af750e86ee98..c48590123bd2 100644
@@ -26,7 +26,7 @@
 /*
  * Ethernet Driver configuration
  */
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_POGO_E02_H */
include/configs/pogo_v4.h +1 -1
index 016da6d04b0b..5d26a45f1426 100644
@@ -72,7 +72,7 @@
 /*
  * Ethernet Driver configuration
  */
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_POGO_V4_H */
include/configs/sheevaplug.h +1 -1
index a228dac2ee92..d4d968285fbd 100644
@@ -24,7 +24,7 @@
 /*
  * Ethernet Driver configuration
  */
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_SHEEVAPLUG_H */
scripts/config_whitelist.txt +1 -1
index 24d09c1a4be2..92dec899cad7 100644
@@ -132,7 +132,7 @@ CFG_MMC_DEFAULT_DEV
 CFG_MMC_SUNXI_SLOT
 CFG_MONITOR_IS_IN_RAM
 CFG_MTD_NAND_VERIFY_WRITE
-CONFIG_MVGBE_PORTS
+CFG_MVGBE_PORTS
 CONFIG_MXC_GPT_HCLK
 CONFIG_MXC_NAND_HWECC
 CONFIG_MXC_NAND_IP_REGS_BASE
Signature · 1 line
2.25.1
author
#172 lore raw

PATCH 125/241 global: Migrate CONFIG_MXC_GPT_HCLK to CFG

In reply to Tom Rini
---
 arch/arm/mach-imx/timer.c    | 4 ++--
 include/configs/brppt2.h     | 2 +-
 include/configs/mx6_common.h | 2 +-
 include/configs/mx7_common.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-imx/timer.c +2 -2
index fcd45f09f181..792772b06473 100644
@@ -54,7 +54,7 @@ static inline int gpt_has_clk_source_osc(void)
 
 static inline ulong gpt_get_clk(void)
 {
-#ifdef CONFIG_MXC_GPT_HCLK
+#ifdef CFG_MXC_GPT_HCLK
 	if (gpt_has_clk_source_osc())
 		return MXC_HCLK >> 3;
 	else
@@ -78,7 +78,7 @@ int timer_init(void)
 	i = __raw_readl(&cur_gpt->control);
 	i &= ~GPTCR_CLKSOURCE_MASK;
 
-#ifdef CONFIG_MXC_GPT_HCLK
+#ifdef CFG_MXC_GPT_HCLK
 	if (gpt_has_clk_source_osc()) {
 		i |= GPTCR_CLKSOURCE_OSC | GPTCR_TEN;
 
include/configs/brppt2.h +1 -1
index 92f34407b401..47a95c0b920a 100644
@@ -16,7 +16,7 @@
 #define CFG_SYS_PL310_BASE		L2_PL310_BASE
 #endif /* !CONFIG_SYS_L2CACHE_OFF */
 
-#define CONFIG_MXC_GPT_HCLK
+#define CFG_MXC_GPT_HCLK
 
 /* MMC */
 
include/configs/mx6_common.h +1 -1
index 245530aa640b..1e99cdc7df4d 100644
@@ -16,7 +16,7 @@
 #endif
 
 #endif
-#define CONFIG_MXC_GPT_HCLK
+#define CFG_MXC_GPT_HCLK
 
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
include/configs/mx7_common.h +1 -1
index d5af6990107d..3a5917fed4b8 100644
@@ -14,7 +14,7 @@
 #include <asm/mach-imx/gpio.h>
 
 /* Timer settings */
-#define CONFIG_MXC_GPT_HCLK
+#define CFG_MXC_GPT_HCLK
 #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
 
 /* Miscellaneous configurable options */
scripts/config_whitelist.txt +1 -1
index 92dec899cad7..8aa247c62448 100644
@@ -133,7 +133,7 @@ CFG_MMC_SUNXI_SLOT
 CFG_MONITOR_IS_IN_RAM
 CFG_MTD_NAND_VERIFY_WRITE
 CFG_MVGBE_PORTS
-CONFIG_MXC_GPT_HCLK
+CFG_MXC_GPT_HCLK
 CONFIG_MXC_NAND_HWECC
 CONFIG_MXC_NAND_IP_REGS_BASE
 CONFIG_MXC_NAND_REGS_BASE
Signature · 1 line
2.25.1
author
#173 lore raw

PATCH 126/241 global: Migrate CONFIG_MXC_NAND_HWECC to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/mxc_nand.c | 4 ++--
 include/configs/m53menlo.h      | 2 +-
 scripts/config_whitelist.txt    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/mtd/nand/raw/mxc_nand.c +2 -2
index 8aa5f7342131..78f5719bc6ef 100644
@@ -372,7 +372,7 @@ static void _mxc_nand_enable_hwecc(struct mtd_info *mtd, int on)
 #endif
 }
 
-#ifdef CONFIG_MXC_NAND_HWECC
+#ifdef CFG_MXC_NAND_HWECC
 static void mxc_nand_enable_hwecc(struct mtd_info *mtd, int mode)
 {
 	/*
@@ -1179,7 +1179,7 @@ int board_nand_init(struct nand_chip *this)
 #endif
 	host->clk_act = 1;
 
-#ifdef CONFIG_MXC_NAND_HWECC
+#ifdef CFG_MXC_NAND_HWECC
 	this->ecc.calculate = mxc_nand_calculate_ecc;
 	this->ecc.hwctl = mxc_nand_enable_hwecc;
 	this->ecc.correct = mxc_nand_correct_data;
include/configs/m53menlo.h +1 -1
index 979fddab5e32..0684a9743a1c 100644
@@ -48,7 +48,7 @@
 #define CONFIG_MXC_NAND_REGS_BASE	NFC_BASE_ADDR_AXI
 #define CONFIG_MXC_NAND_IP_REGS_BASE	NFC_BASE_ADDR
 #define CFG_SYS_NAND_LARGEPAGE
-#define CONFIG_MXC_NAND_HWECC
+#define CFG_MXC_NAND_HWECC
 #endif
 
 /*
scripts/config_whitelist.txt +1 -1
index 8aa247c62448..2030e582de3f 100644
@@ -134,7 +134,7 @@ CFG_MONITOR_IS_IN_RAM
 CFG_MTD_NAND_VERIFY_WRITE
 CFG_MVGBE_PORTS
 CFG_MXC_GPT_HCLK
-CONFIG_MXC_NAND_HWECC
+CFG_MXC_NAND_HWECC
 CONFIG_MXC_NAND_IP_REGS_BASE
 CONFIG_MXC_NAND_REGS_BASE
 CONFIG_MXC_UART_BASE
Signature · 1 line
2.25.1
author
#174 lore raw

PATCH 127/241 global: Migrate CONFIG_MXC_NAND_IP_REGS_BASE to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/mxc_nand.c | 2 +-
 include/configs/m53menlo.h      | 2 +-
 scripts/config_whitelist.txt    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/mxc_nand.c +1 -1
index 78f5719bc6ef..36c61c2eb8cf 100644
@@ -1175,7 +1175,7 @@ int board_nand_init(struct nand_chip *this)
 	host->regs = (struct mxc_nand_regs __iomem *)CONFIG_MXC_NAND_REGS_BASE;
 #ifdef MXC_NFC_V3_2
 	host->ip_regs =
-		(struct mxc_nand_ip_regs __iomem *)CONFIG_MXC_NAND_IP_REGS_BASE;
+		(struct mxc_nand_ip_regs __iomem *)CFG_MXC_NAND_IP_REGS_BASE;
 #endif
 	host->clk_act = 1;
 
include/configs/m53menlo.h +1 -1
index 0684a9743a1c..6d0f43999681 100644
@@ -46,7 +46,7 @@
 #ifdef CONFIG_CMD_NAND
 #define CFG_SYS_NAND_BASE		NFC_BASE_ADDR_AXI
 #define CONFIG_MXC_NAND_REGS_BASE	NFC_BASE_ADDR_AXI
-#define CONFIG_MXC_NAND_IP_REGS_BASE	NFC_BASE_ADDR
+#define CFG_MXC_NAND_IP_REGS_BASE	NFC_BASE_ADDR
 #define CFG_SYS_NAND_LARGEPAGE
 #define CFG_MXC_NAND_HWECC
 #endif
scripts/config_whitelist.txt +1 -1
index 2030e582de3f..c83a676a330a 100644
@@ -135,7 +135,7 @@ CFG_MTD_NAND_VERIFY_WRITE
 CFG_MVGBE_PORTS
 CFG_MXC_GPT_HCLK
 CFG_MXC_NAND_HWECC
-CONFIG_MXC_NAND_IP_REGS_BASE
+CFG_MXC_NAND_IP_REGS_BASE
 CONFIG_MXC_NAND_REGS_BASE
 CONFIG_MXC_UART_BASE
 CONFIG_MXC_USB_FLAGS
Signature · 1 line
2.25.1
author
#175 lore raw

PATCH 128/241 global: Migrate CONFIG_MXC_NAND_REGS_BASE to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/mxc_nand.c | 2 +-
 include/configs/m53menlo.h      | 2 +-
 scripts/config_whitelist.txt    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/mxc_nand.c +1 -1
index 36c61c2eb8cf..3116356f6915 100644
@@ -1172,7 +1172,7 @@ int board_nand_init(struct nand_chip *this)
 	this->write_buf = mxc_nand_write_buf;
 	this->read_buf = mxc_nand_read_buf;
 
-	host->regs = (struct mxc_nand_regs __iomem *)CONFIG_MXC_NAND_REGS_BASE;
+	host->regs = (struct mxc_nand_regs __iomem *)CFG_MXC_NAND_REGS_BASE;
 #ifdef MXC_NFC_V3_2
 	host->ip_regs =
 		(struct mxc_nand_ip_regs __iomem *)CFG_MXC_NAND_IP_REGS_BASE;
include/configs/m53menlo.h +1 -1
index 6d0f43999681..88be79462e66 100644
@@ -45,7 +45,7 @@
  */
 #ifdef CONFIG_CMD_NAND
 #define CFG_SYS_NAND_BASE		NFC_BASE_ADDR_AXI
-#define CONFIG_MXC_NAND_REGS_BASE	NFC_BASE_ADDR_AXI
+#define CFG_MXC_NAND_REGS_BASE	NFC_BASE_ADDR_AXI
 #define CFG_MXC_NAND_IP_REGS_BASE	NFC_BASE_ADDR
 #define CFG_SYS_NAND_LARGEPAGE
 #define CFG_MXC_NAND_HWECC
scripts/config_whitelist.txt +1 -1
index c83a676a330a..e041df9b887a 100644
@@ -136,7 +136,7 @@ CFG_MVGBE_PORTS
 CFG_MXC_GPT_HCLK
 CFG_MXC_NAND_HWECC
 CFG_MXC_NAND_IP_REGS_BASE
-CONFIG_MXC_NAND_REGS_BASE
+CFG_MXC_NAND_REGS_BASE
 CONFIG_MXC_UART_BASE
 CONFIG_MXC_USB_FLAGS
 CONFIG_MXC_USB_PORT
Signature · 1 line
2.25.1
author
#176 lore raw

PATCH 129/241 global: Migrate CONFIG_MXC_UART_BASE to CFG

In reply to Tom Rini
---
 board/ge/b1x5v2/spl.c                       |  4 ++--
 drivers/serial/serial_mxc.c                 |  6 +++---
 include/configs/apalis_imx6.h               |  2 +-
 include/configs/cl-som-imx7.h               |  2 +-
 include/configs/cm_fx6.h                    |  2 +-
 include/configs/colibri_imx6.h              |  2 +-
 include/configs/dart_6ul.h                  |  2 +-
 include/configs/dh_imx6.h                   |  2 +-
 include/configs/display5.h                  |  2 +-
 include/configs/el6x_common.h               |  2 +-
 include/configs/embestmx6boards.h           |  2 +-
 include/configs/ge_b1x5v2.h                 |  4 ++--
 include/configs/gw_ventana.h                |  2 +-
 include/configs/imx6-engicam.h              |  4 ++--
 include/configs/imx6_logic.h                |  2 +-
 include/configs/imx6dl-mamoj.h              |  2 +-
 include/configs/imx6ulz_smm_m2.h            |  2 +-
 include/configs/imx7-cm.h                   |  2 +-
 include/configs/imx8mm_data_modul_edm_sbc.h |  2 +-
 include/configs/imx8mp_dhcom_pdk2.h         |  2 +-
 include/configs/imx8mp_rsb3720.h            |  2 +-
 include/configs/imx8mq_cm.h                 |  2 +-
 include/configs/imx8mq_evk.h                |  2 +-
 include/configs/imx8mq_phanbell.h           |  2 +-
 include/configs/kontron-sl-mx6ul.h          |  2 +-
 include/configs/kontron_pitx_imx8m.h        |  2 +-
 include/configs/librem5.h                   | 10 +++++-----
 include/configs/liteboard.h                 |  2 +-
 include/configs/m53menlo.h                  |  2 +-
 include/configs/mccmon6.h                   |  2 +-
 include/configs/msc_sm2s_imx8mp.h           |  2 +-
 include/configs/mx51evk.h                   |  2 +-
 include/configs/mx53cx9020.h                |  2 +-
 include/configs/mx53loco.h                  |  2 +-
 include/configs/mx6cuboxi.h                 |  2 +-
 include/configs/mx6memcal.h                 |  6 +++---
 include/configs/mx6sabreauto.h              |  2 +-
 include/configs/mx6sabresd.h                |  2 +-
 include/configs/mx6slevk.h                  |  2 +-
 include/configs/mx6sllevk.h                 |  2 +-
 include/configs/mx6sxsabreauto.h            |  2 +-
 include/configs/mx6sxsabresd.h              |  2 +-
 include/configs/mx6ul_14x14_evk.h           |  2 +-
 include/configs/mx6ullevk.h                 |  2 +-
 include/configs/mys_6ulx.h                  |  2 +-
 include/configs/nitrogen6x.h                |  2 +-
 include/configs/novena.h                    |  2 +-
 include/configs/npi_imx6ull.h               |  2 +-
 include/configs/pcl063.h                    |  2 +-
 include/configs/pcl063_ull.h                |  2 +-
 include/configs/pico-imx6.h                 |  2 +-
 include/configs/pico-imx6ul.h               |  2 +-
 include/configs/pico-imx7d.h                |  2 +-
 include/configs/pico-imx8mq.h               |  2 +-
 include/configs/tqma6_mba6.h                |  2 +-
 include/configs/tqma6_wru4.h                |  2 +-
 include/configs/udoo.h                      |  2 +-
 include/configs/udoo_neo.h                  |  2 +-
 include/configs/usbarmory.h                 |  2 +-
 include/configs/vining_2000.h               |  2 +-
 include/configs/wandboard.h                 |  2 +-
 include/configs/xpress.h                    |  2 +-
 scripts/config_whitelist.txt                |  2 +-
 63 files changed, 74 insertions(+), 74 deletions(-)
board/ge/b1x5v2/spl.c +2 -2
index 52c80f792d3c..460d3be1d834 100644
@@ -565,9 +565,9 @@ void board_init_f(ulong dummy)
 	timer_init();
 
 	/* iomux */
-	if (CONFIG_MXC_UART_BASE == UART2_BASE)
+	if (CFG_MXC_UART_BASE == UART2_BASE)
 		SETUP_IOMUX_PADS(uart2_pads);
-	else if (CONFIG_MXC_UART_BASE == UART3_BASE)
+	else if (CFG_MXC_UART_BASE == UART3_BASE)
 		SETUP_IOMUX_PADS(uart3_pads);
 
 	/* UART clocks enabled and gd valid - init serial console */
drivers/serial/serial_mxc.c +3 -3
index 82c0d84628d5..8bcbbf2bbfcb 100644
@@ -194,11 +194,11 @@ static void _mxc_serial_setbrg(struct mxc_uart *base, unsigned long clk,
 
 #if !CONFIG_IS_ENABLED(DM_SERIAL)
 
-#ifndef CONFIG_MXC_UART_BASE
-#error "define CONFIG_MXC_UART_BASE to use the MXC UART driver"
+#ifndef CFG_MXC_UART_BASE
+#error "define CFG_MXC_UART_BASE to use the MXC UART driver"
 #endif
 
-#define mxc_base	((struct mxc_uart *)CONFIG_MXC_UART_BASE)
+#define mxc_base	((struct mxc_uart *)CFG_MXC_UART_BASE)
 
 static void mxc_serial_setbrg(void)
 {
include/configs/apalis_imx6.h +1 -1
index 8db2909c96b2..b1355d637538 100644
@@ -15,7 +15,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/gpio.h>
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
include/configs/cl-som-imx7.h +1 -1
index cde7d3c891ab..b7920c7b3057 100644
@@ -10,7 +10,7 @@
 
 #include "mx7_common.h"
 
-#define CONFIG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
 
 /* Network */
 #define CFG_FEC_MXC_PHYADDR          0
include/configs/cm_fx6.h +1 -1
index 47b76c9371e8..90ebec4a94ca 100644
@@ -26,7 +26,7 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* Serial console */
-#define CONFIG_MXC_UART_BASE		UART4_BASE
+#define CFG_MXC_UART_BASE		UART4_BASE
 
 /* Environment */
 
include/configs/colibri_imx6.h +1 -1
index 2f30322bb4f8..5f098fab940e 100644
@@ -15,7 +15,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/gpio.h>
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
include/configs/dart_6ul.h +1 -1
index c2ed9c7c56af..fb619105a760 100644
@@ -28,7 +28,7 @@
 #define MMC_ROOTFS_PART			2
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 
include/configs/dh_imx6.h +1 -1
index 1fbdebb64511..e9c36cdb80e9 100644
@@ -28,7 +28,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	3
 
 /* UART */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
include/configs/display5.h +1 -1
index 191c8fb8ab46..9a6fb72377c1 100644
@@ -34,7 +34,7 @@
 #define CFG_SYS_SPI_ARGS_OFFS        0x140000
 #define CFG_SYS_SPI_ARGS_SIZE        0x10000
 
-#define CONFIG_MXC_UART_BASE		UART5_BASE
+#define CFG_MXC_UART_BASE		UART5_BASE
 
 /* I2C Configs */
 #define CFG_I2C_MULTI_BUS
include/configs/el6x_common.h +1 -1
index a5e2dc063a74..6913a91c4c19 100644
@@ -21,7 +21,7 @@
 
 /* Commands */
 
-#define CONFIG_MXC_UART_BASE	UART2_BASE
+#define CFG_MXC_UART_BASE	UART2_BASE
 
 #define CFG_EXTRA_ENV_SETTINGS                                               \
 	"board=EL6Q\0"								\
include/configs/embestmx6boards.h +1 -1
index 8f03c2ff3c0d..9b772d2bd367 100644
@@ -12,7 +12,7 @@
 #ifndef __RIOTBOARD_CONFIG_H
 #define __RIOTBOARD_CONFIG_H
 
-#define CONFIG_MXC_UART_BASE		UART2_BASE
+#define CFG_MXC_UART_BASE		UART2_BASE
 #define CONSOLE_DEV		"ttymxc1"
 
 #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
include/configs/ge_b1x5v2.h +2 -2
index 9dc1d7394afd..703d63bd20bc 100644
@@ -13,9 +13,9 @@
 #include "mx6_common.h"
 
 /* UART */
-#define CONFIG_MXC_UART_BASE		UART3_BASE
+#define CFG_MXC_UART_BASE		UART3_BASE
 
-#if CONFIG_MXC_UART_BASE == UART2_BASE
+#if CFG_MXC_UART_BASE == UART2_BASE
 /* UART2 requires CONFIG_DEBUG_UART_BASE=0x21e8000 */
 #define CONSOLE_DEVICE "ttymxc1" /* System on Module debug connector */
 #else
include/configs/gw_ventana.h +1 -1
index e71f10a24fa1..3713ba4dbceb 100644
@@ -16,7 +16,7 @@
 #include "mx6_common.h"
 
 /* Serial */
-#define CONFIG_MXC_UART_BASE	       UART2_BASE
+#define CFG_MXC_UART_BASE	       UART2_BASE
 
 /* NAND */
 
include/configs/imx6-engicam.h +2 -2
index 4208ba95915e..786b70fe064d 100644
@@ -116,9 +116,9 @@
 /* UART */
 #ifdef CONFIG_MXC_UART
 # ifdef CONFIG_MX6UL
-#  define CONFIG_MXC_UART_BASE		UART1_BASE
+#  define CFG_MXC_UART_BASE		UART1_BASE
 # else
-#  define CONFIG_MXC_UART_BASE		UART4_BASE
+#  define CFG_MXC_UART_BASE		UART4_BASE
 # endif
 #endif
 
include/configs/imx6_logic.h +1 -1
index 121b34ae96db..f9544cd430ca 100644
@@ -8,7 +8,7 @@
 #ifndef __IMX6LOGIC_CONFIG_H
 #define __IMX6LOGIC_CONFIG_H
 
-#define CONFIG_MXC_UART_BASE   UART1_BASE
+#define CFG_MXC_UART_BASE   UART1_BASE
 #define CONSOLE_DEV            "ttymxc0"
 
 #include "mx6_common.h"
include/configs/imx6dl-mamoj.h +1 -1
index 162b0b8a69bb..db08e43f0d86 100644
@@ -35,7 +35,7 @@
 #include <config_distro_bootcmd.h>
 
 /* UART */
-#define CONFIG_MXC_UART_BASE		UART3_BASE
+#define CFG_MXC_UART_BASE		UART3_BASE
 
 /* MMC */
 
include/configs/imx6ulz_smm_m2.h +1 -1
index c95038eaa537..9da98d0af277 100644
@@ -12,7 +12,7 @@
 #include <linux/sizes.h>
 #include <linux/stringify.h>
 
-#define CONFIG_MXC_UART_BASE		UART4_BASE
+#define CFG_MXC_UART_BASE		UART4_BASE
 
 #ifndef CONFIG_SPL_BUILD
 
include/configs/imx7-cm.h +1 -1
index 438e79df3cc1..87262a97877e 100644
@@ -10,7 +10,7 @@
 
 #include "mx7_common.h"
 
-#define CONFIG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
 
 #undef CFG_EXTRA_ENV_SETTINGS
 
include/configs/imx8mm_data_modul_edm_sbc.h +1 -1
index 0723d27ab703..f7d2b660c1f3 100644
@@ -25,7 +25,7 @@
 #define PHYS_SDRAM			0x40000000
 #define PHYS_SDRAM_SIZE			0x40000000 /* Minimum 1 GiB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART3_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART3_BASE_ADDR
 
 /* PHY needs a longer autonegotiation timeout after reset */
 #define PHY_ANEG_TIMEOUT		20000
include/configs/imx8mp_dhcom_pdk2.h +1 -1
index b8fdedefa21f..d022faaa91a4 100644
@@ -18,7 +18,7 @@
 #define PHYS_SDRAM			0x40000000
 #define PHYS_SDRAM_SIZE			0x20000000 /* Minimum 512 MiB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART1_BASE_ADDR
 
 /* PHY needs a longer autonegotiation timeout after reset */
 #define PHY_ANEG_TIMEOUT		20000
include/configs/imx8mp_rsb3720.h +1 -1
index e4e24b522fdb..495ca313db28 100644
@@ -148,7 +148,7 @@
 #define PHYS_SDRAM_2_SIZE		0x80000000	/* 2 GB */
 #endif
 
-#define CONFIG_MXC_UART_BASE		UART3_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART3_BASE_ADDR
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR	0
include/configs/imx8mq_cm.h +1 -1
index f7ae1b47d063..828bd6723727 100644
@@ -54,7 +54,7 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE					0x40000000 /* 1 GB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART_BASE_ADDR(1)
+#define CFG_MXC_UART_BASE		UART_BASE_ADDR(1)
 
 #define CFG_SYS_FSL_USDHC_NUM		2
 #define CFG_SYS_FSL_ESDHC_ADDR       0
include/configs/imx8mq_evk.h +1 -1
index 4b46321e8512..a7a51907f5c9 100644
@@ -59,7 +59,7 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE			0xC0000000 /* 3GB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART_BASE_ADDR(1)
+#define CFG_MXC_UART_BASE		UART_BASE_ADDR(1)
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR       0
include/configs/imx8mq_phanbell.h +1 -1
index 6d0c45311183..bfde15e6240f 100644
@@ -92,7 +92,7 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE			0x40000000 /* 1GB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART_BASE_ADDR(1)
+#define CFG_MXC_UART_BASE		UART_BASE_ADDR(1)
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR       0
include/configs/kontron-sl-mx6ul.h +1 -1
index e57ae20a74ea..523cb5a07fd0 100644
@@ -22,7 +22,7 @@
 #define CFG_SYS_UBOOT_BASE		CONFIG_TEXT_BASE
 
 /* Board and environment settings */
-#define CONFIG_MXC_UART_BASE		UART4_BASE
+#define CFG_MXC_UART_BASE		UART4_BASE
 #define CFG_HOSTNAME			"kontron-mx6ul"
 
 #ifdef CONFIG_USB_EHCI_HCD
include/configs/kontron_pitx_imx8m.h +1 -1
index 5a3c9f76a431..bf590efb4348 100644
@@ -67,7 +67,7 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE			0xC0000000 /* 3GB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART_BASE_ADDR(3)
+#define CFG_MXC_UART_BASE		UART_BASE_ADDR(3)
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR       0
include/configs/librem5.h +5 -5
index 1818a57e49c5..4725be264a9b 100644
@@ -32,23 +32,23 @@
 #define CONSOLE_ON_UART1
 
 #ifdef CONSOLE_ON_UART1
-#define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART1_BASE_ADDR
 #define CONSOLE_UART_CLK		0
 #define CONSOLE		"ttymxc0"
 #elif defined(CONSOLE_ON_UART2)
-#define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART2_BASE_ADDR
 #define CONSOLE_UART_CLK		1
 #define CONSOLE		"ttymxc1"
 #elif defined(CONSOLE_ON_UART3)
-#define CONFIG_MXC_UART_BASE		UART3_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART3_BASE_ADDR
 #define CONSOLE_UART_CLK		2
 #define CONSOLE		"ttymxc2"
 #elif defined(CONSOLE_ON_UART4)
-#define CONFIG_MXC_UART_BASE		UART4_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART4_BASE_ADDR
 #define CONSOLE_UART_CLK		3
 #define CONSOLE		"ttymxc3"
 #else
-#define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART1_BASE_ADDR
 #define CONSOLE_UART_CLK		0
 #define CONSOLE		"ttymxc0"
 #endif
include/configs/liteboard.h +1 -1
index 0b8781d7bf34..63e5dbfab775 100644
@@ -13,7 +13,7 @@
 #include <linux/stringify.h>
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC
include/configs/m53menlo.h +1 -1
index 88be79462e66..2ffee5b2e930 100644
@@ -31,7 +31,7 @@
 /*
  * Serial Driver
  */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /*
  * MMC Driver
include/configs/mccmon6.h +1 -1
index 9b2777339a10..9b4a1ab7f62f 100644
@@ -17,7 +17,7 @@
  * mode from SD card (SD2)
  */
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_USDHC_NUM	2
include/configs/msc_sm2s_imx8mp.h +1 -1
index 1cd0b3cf7374..c1c1fd5a7843 100644
@@ -55,7 +55,7 @@
 #define PHYS_SDRAM_2			0xc0000000
 #define PHYS_SDRAM_2_SIZE		0x0
 
-#define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART2_BASE_ADDR
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR	0
include/configs/mx51evk.h +1 -1
index 740e357e00e9..123b7a533b17 100644
@@ -18,7 +18,7 @@
  * Hardware drivers
  */
 
-#define CONFIG_MXC_UART_BASE	UART1_BASE
+#define CFG_MXC_UART_BASE	UART1_BASE
 
 /* PMIC Controller */
 #define CFG_FSL_PMIC_BUS	0
include/configs/mx53cx9020.h +1 -1
index baffe65c3697..1a3ec6e0cdb8 100644
@@ -14,7 +14,7 @@
 
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_MXC_UART_BASE UART2_BASE
+#define CFG_MXC_UART_BASE UART2_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
include/configs/mx53loco.h +1 -1
index 0ac93d6e0432..d87f9e942c51 100644
@@ -11,7 +11,7 @@
 
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_MXC_UART_BASE	UART1_BASE
+#define CFG_MXC_UART_BASE	UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
include/configs/mx6cuboxi.h +1 -1
index d4af96b51ea4..871d52c343f5 100644
@@ -19,7 +19,7 @@
 
 /* Command definition */
 
-#define CONFIG_MXC_UART_BASE	UART1_BASE
+#define CFG_MXC_UART_BASE	UART1_BASE
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"som_rev=undefined\0" \
include/configs/mx6memcal.h +3 -3
index f6d3b2eeb9cf..b664962a26a5 100644
@@ -14,12 +14,12 @@
 
 #ifdef CONFIG_SERIAL_CONSOLE_UART1
 #if defined(CONFIG_MX6SL)
-#define CONFIG_MXC_UART_BASE		UART1_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART1_IPS_BASE_ADDR
 #else
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 #endif
 #elif defined(CONFIG_SERIAL_CONSOLE_UART2)
-#define CONFIG_MXC_UART_BASE		UART2_BASE
+#define CFG_MXC_UART_BASE		UART2_BASE
 #else
 #error please define serial console (CONFIG_SERIAL_CONSOLE_UARTx)
 #endif
include/configs/mx6sabreauto.h +1 -1
index 888da7ce365f..274c14bbd383 100644
@@ -8,7 +8,7 @@
 #ifndef __MX6SABREAUTO_CONFIG_H
 #define __MX6SABREAUTO_CONFIG_H
 
-#define CONFIG_MXC_UART_BASE	UART4_BASE
+#define CFG_MXC_UART_BASE	UART4_BASE
 #define CONSOLE_DEV		"ttymxc3"
 
 /* USB Configs */
include/configs/mx6sabresd.h +1 -1
index 78a554d0ccba..af9978e02c89 100644
@@ -8,7 +8,7 @@
 #ifndef __MX6SABRESD_CONFIG_H
 #define __MX6SABRESD_CONFIG_H
 
-#define CONFIG_MXC_UART_BASE	UART1_BASE
+#define CFG_MXC_UART_BASE	UART1_BASE
 #define CONSOLE_DEV		"ttymxc0"
 
 #include "mx6sabre_common.h"
include/configs/mx6slevk.h +1 -1
index 4fbd06783a6d..f6d9ac20821f 100644
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART1_IPS_BASE_ADDR
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
include/configs/mx6sllevk.h +1 -1
index cf4871cbae39..aec3e51bff87 100644
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"epdc_waveform=epdc_splash.bin\0" \
include/configs/mx6sxsabreauto.h +1 -1
index 3399cdd16fa8..3d0f6e452d65 100644
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
include/configs/mx6sxsabresd.h +1 -1
index c99d99abc179..8c39e6d6cf4d 100644
@@ -12,7 +12,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 #ifdef CONFIG_IMX_BOOTAUX
 
include/configs/mx6ul_14x14_evk.h +1 -1
index 5e3695ecc971..3f8a90b626d1 100644
@@ -15,7 +15,7 @@
 
 #define is_mx6ul_9x9_evk()	CONFIG_IS_ENABLED(TARGET_MX6UL_9X9_EVK)
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC
include/configs/mx6ullevk.h +1 -1
index 58d1a744ae99..2c3cd32cefa7 100644
@@ -16,7 +16,7 @@
 
 #define PHYS_SDRAM_SIZE	SZ_512M
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC
include/configs/mys_6ulx.h +1 -1
index 43261824d3cf..0c0235b42984 100644
@@ -13,7 +13,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	1
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
include/configs/nitrogen6x.h +1 -1
index 811688ae82af..fabd82d6c9c6 100644
@@ -13,7 +13,7 @@
 
 #define CONFIG_USBD_HS
 
-#define CONFIG_MXC_UART_BASE	       UART2_BASE
+#define CFG_MXC_UART_BASE	       UART2_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR      0
include/configs/novena.h +1 -1
index af99ba4f193c..dd82c04440ec 100644
@@ -53,7 +53,7 @@
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* UART */
-#define CONFIG_MXC_UART_BASE		UART2_BASE
+#define CFG_MXC_UART_BASE		UART2_BASE
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
include/configs/npi_imx6ull.h +1 -1
index 664d4f11c867..ae5e566d3fb0 100644
@@ -13,7 +13,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	1
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
include/configs/pcl063.h +1 -1
index 146f87e9ce33..e8c48cf83652 100644
@@ -22,7 +22,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	1
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 
include/configs/pcl063_ull.h +1 -1
index 0890c115700c..bd04268a3ef3 100644
@@ -22,7 +22,7 @@
 #define MMC_ROOTFS_PART		2
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 
include/configs/pico-imx6.h +1 -1
index e1f7b7003194..a1d0dd93c526 100644
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC3_BASE_ADDR
include/configs/pico-imx6ul.h +1 -1
index 6148a343117d..4064a34f191b 100644
@@ -17,7 +17,7 @@
 
 #define CFG_FEC_MXC_PHYADDR		0x1
 
-#define CONFIG_MXC_UART_BASE		UART6_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART6_BASE_ADDR
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
include/configs/pico-imx7d.h +1 -1
index 7fc6211ff732..dbeaeea77f7d 100644
@@ -10,7 +10,7 @@
 
 #include "mx7_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART5_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART5_IPS_BASE_ADDR
 
 /* MMC Config */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
include/configs/pico-imx8mq.h +1 -1
index 37ade717ae99..4b602ea03022 100644
@@ -71,7 +71,7 @@
 #define PHYS_SDRAM			0x40000000
 #define PHYS_SDRAM_SIZE			0x80000000	/* 2 GiB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART_BASE_ADDR(1)
+#define CFG_MXC_UART_BASE		UART_BASE_ADDR(1)
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR	0
include/configs/tqma6_mba6.h +1 -1
index a5f14dc42679..b5871424bc64 100644
@@ -11,7 +11,7 @@
 
 #define CFG_FEC_MXC_PHYADDR		0x03
 
-#define CONFIG_MXC_UART_BASE		UART2_BASE
+#define CFG_MXC_UART_BASE		UART2_BASE
 #define CONSOLE_DEV		"ttymxc1"
 
 #endif /* __CONFIG_TQMA6_MBA6_H */
include/configs/tqma6_wru4.h +1 -1
index 34c9b6a2f97c..e06fc7fe1559 100644
@@ -10,7 +10,7 @@
 #define CFG_FEC_MXC_PHYADDR		0x01
 
 /* UART */
-#define CONFIG_MXC_UART_BASE		UART4_BASE
+#define CFG_MXC_UART_BASE		UART4_BASE
 #define CONSOLE_DEV		"ttymxc3"
 
 /* Watchdog */
include/configs/udoo.h +1 -1
index f0092eff1494..d85cf7808c7e 100644
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART2_BASE
+#define CFG_MXC_UART_BASE		UART2_BASE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
include/configs/udoo_neo.h +1 -1
index 5d7d734daa2d..842abb7b7a22 100644
@@ -16,7 +16,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 
 /* Command definition */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* Linux only */
 #define CFG_EXTRA_ENV_SETTINGS \
include/configs/usbarmory.h +1 -1
index b2153b441142..854875adc4b7 100644
@@ -17,7 +17,7 @@
 /* U-Boot general configurations */
 
 /* UART */
-#define CONFIG_MXC_UART_BASE	UART1_BASE
+#define CFG_MXC_UART_BASE	UART1_BASE
 
 /* SD/MMC */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
include/configs/vining_2000.h +1 -1
index cdd2eeef0ac9..7954ed9910c7 100644
@@ -50,7 +50,7 @@
 #endif
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 #endif
 
 #endif				/* __CONFIG_H */
include/configs/wandboard.h +1 -1
index 1e765439fabe..8853bcd7be28 100644
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_USDHC_NUM	2
include/configs/xpress.h +1 -1
index ce6ca175363b..602fd4595e77 100644
@@ -10,7 +10,7 @@
 #include "mx6_common.h"
 #include <asm/mach-imx/gpio.h>
 
-#define CONFIG_MXC_UART_BASE		MX6UL_UART7_BASE_ADDR
+#define CFG_MXC_UART_BASE		MX6UL_UART7_BASE_ADDR
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
scripts/config_whitelist.txt +1 -1
index e041df9b887a..2f3241289842 100644
@@ -137,7 +137,7 @@ CFG_MXC_GPT_HCLK
 CFG_MXC_NAND_HWECC
 CFG_MXC_NAND_IP_REGS_BASE
 CFG_MXC_NAND_REGS_BASE
-CONFIG_MXC_UART_BASE
+CFG_MXC_UART_BASE
 CONFIG_MXC_USB_FLAGS
 CONFIG_MXC_USB_PORT
 CONFIG_MXC_USB_PORTSC
Signature · 1 line
2.25.1
author
#177 lore raw

PATCH 130/241 global: Migrate CONFIG_MXC_USB_FLAGS to CFG

In reply to Tom Rini
---
 drivers/usb/host/ehci-mx5.c              | 2 +-
 include/configs/apalis_imx6.h            | 2 +-
 include/configs/aristainetos2.h          | 2 +-
 include/configs/cl-som-imx7.h            | 2 +-
 include/configs/cm_fx6.h                 | 2 +-
 include/configs/colibri-imx6ull.h        | 2 +-
 include/configs/colibri_imx6.h           | 2 +-
 include/configs/colibri_imx7.h           | 2 +-
 include/configs/dart_6ul.h               | 2 +-
 include/configs/dh_imx6.h                | 2 +-
 include/configs/embestmx6boards.h        | 2 +-
 include/configs/ge_b1x5v2.h              | 2 +-
 include/configs/gw_ventana.h             | 2 +-
 include/configs/imx6_logic.h             | 2 +-
 include/configs/imx6dl-mamoj.h           | 2 +-
 include/configs/imx6q-bosch-acc.h        | 2 +-
 include/configs/kontron-sl-mx6ul.h       | 2 +-
 include/configs/kontron-sl-mx8mm.h       | 2 +-
 include/configs/kp_imx53.h               | 2 +-
 include/configs/kp_imx6q_tpc.h           | 2 +-
 include/configs/liteboard.h              | 2 +-
 include/configs/m53menlo.h               | 2 +-
 include/configs/mx51evk.h                | 2 +-
 include/configs/mx53cx9020.h             | 2 +-
 include/configs/mx53loco.h               | 2 +-
 include/configs/mx53ppd.h                | 2 +-
 include/configs/mx6sabreauto.h           | 2 +-
 include/configs/mx6sabresd.h             | 2 +-
 include/configs/mx6slevk.h               | 2 +-
 include/configs/mx6sxsabreauto.h         | 2 +-
 include/configs/mx6sxsabresd.h           | 2 +-
 include/configs/mx6ul_14x14_evk.h        | 2 +-
 include/configs/mys_6ulx.h               | 2 +-
 include/configs/nitrogen6x.h             | 2 +-
 include/configs/novena.h                 | 2 +-
 include/configs/npi_imx6ull.h            | 2 +-
 include/configs/opos6uldev.h             | 2 +-
 include/configs/pcl063.h                 | 2 +-
 include/configs/pcl063_ull.h             | 2 +-
 include/configs/pico-imx6.h              | 2 +-
 include/configs/pico-imx6ul.h            | 2 +-
 include/configs/pico-imx7d.h             | 2 +-
 include/configs/somlabs_visionsom_6ull.h | 2 +-
 include/configs/usbarmory.h              | 2 +-
 include/configs/vining_2000.h            | 2 +-
 include/configs/wandboard.h              | 2 +-
 include/configs/xpress.h                 | 2 +-
 scripts/config_whitelist.txt             | 2 +-
 48 files changed, 48 insertions(+), 48 deletions(-)
drivers/usb/host/ehci-mx5.c +1 -1
index 964a53bb7c0e..bdfc1283e4aa 100644
@@ -302,7 +302,7 @@ static int ehci_usb_probe(struct udevice *dev)
 	__raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
 	setbits_le32(&ehci->portsc, USB_EN);
 
-	mxc_set_usbcontrol(priv->portnr, CONFIG_MXC_USB_FLAGS);
+	mxc_set_usbcontrol(priv->portnr, CFG_MXC_USB_FLAGS);
 	mdelay(10);
 
 	return ehci_register(dev, hccr, hcor, &mx5_ehci_ops, 0,
include/configs/apalis_imx6.h +1 -1
index b1355d637538..fd2a0e3d82d3 100644
@@ -27,7 +27,7 @@
 /* USB Configs */
 /* Host */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 /* Client */
 #define CONFIG_USBD_HS
 
include/configs/aristainetos2.h +1 -1
index 271d15dc5e50..19906db5966f 100644
@@ -416,7 +416,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_FLAGS	0
 
 /* UBI support */
 
include/configs/cl-som-imx7.h +1 -1
index b7920c7b3057..e38d2844c803 100644
@@ -97,6 +97,6 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_FLAGS   0
 
 #endif	/* __CONFIG_H */
include/configs/cm_fx6.h +1 -1
index 90ebec4a94ca..479feae77240 100644
@@ -136,7 +136,7 @@
 
 /* USB */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 /* Boot */
 #define CFG_SYS_BOOTMAPSZ	        (8 << 20)
include/configs/colibri-imx6ull.h +1 -1
index 4f5287b6bcfb..92dff580f601 100644
@@ -128,7 +128,7 @@
 /* USB Configs */
 
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define CONFIG_USBD_HS
 
include/configs/colibri_imx6.h +1 -1
index 5f098fab940e..419c919bbecd 100644
@@ -24,7 +24,7 @@
 /* USB Configs */
 /* Host */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 /* Client */
 #define CONFIG_USBD_HS
 
include/configs/colibri_imx7.h +1 -1
index 0da7553e0245..2b2b17f2c7b9 100644
@@ -172,7 +172,7 @@
 /* USB Configs */
 
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define CONFIG_USBD_HS
 
include/configs/dart_6ul.h +1 -1
index fb619105a760..93ee004b009c 100644
@@ -48,7 +48,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define ENV_MMC \
 	"mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
include/configs/dh_imx6.h +1 -1
index e9c36cdb80e9..90f8ce0fd57f 100644
@@ -33,7 +33,7 @@
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 /* USB Gadget (DFU, UMS) */
 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
include/configs/embestmx6boards.h +1 -1
index 9b772d2bd367..f73b1ec63de6 100644
@@ -19,7 +19,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_FLAGS	0
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR      0
include/configs/ge_b1x5v2.h +1 -1
index 703d63bd20bc..f7e9dd16b26f 100644
@@ -25,7 +25,7 @@
 
 /* USB */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 #define CONFIG_USBD_HS
 
 /* Memory */
include/configs/gw_ventana.h +1 -1
index 3713ba4dbceb..cc21e93a7beb 100644
@@ -37,7 +37,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS      0
+#define CFG_MXC_USB_FLAGS      0
 #define CONFIG_USBD_HS
 
 /* Miscellaneous configurable options */
include/configs/imx6_logic.h +1 -1
index f9544cd430ca..215ed75deaf3 100644
@@ -118,7 +118,7 @@
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* Falcon Mode */
include/configs/imx6dl-mamoj.h +1 -1
index db08e43f0d86..ca89f72f8a21 100644
@@ -44,7 +44,7 @@
 
 /* USB */
 #define CONFIG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS			0
+#define CFG_MXC_USB_FLAGS			0
 
 /* Falcon */
 
include/configs/imx6q-bosch-acc.h +1 -1
index e28185f24dd3..4209d9d7ab28 100644
@@ -111,6 +111,6 @@
 #endif
 
 #define CONFIG_MXC_USB_PORTSC            (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS             0
+#define CFG_MXC_USB_FLAGS             0
 
 #endif /* __IMX6Q_ACC_H */
include/configs/kontron-sl-mx6ul.h +1 -1
index 523cb5a07fd0..3479b0b2bf4d 100644
@@ -27,7 +27,7 @@
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* Boot order for distro boot */
include/configs/kontron-sl-mx8mm.h +1 -1
index 657124cc725d..89f5c6f46faf 100644
@@ -27,7 +27,7 @@
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* GUID for capsule updatable firmware image */
include/configs/kp_imx53.h +1 -1
index da8a67b4ab63..baf7779026fb 100644
@@ -12,7 +12,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_FLAGS	0
 
 /* Command definition */
 
include/configs/kp_imx6q_tpc.h +1 -1
index 99321b320f5f..07497d063fb8 100644
@@ -19,7 +19,7 @@
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 #define CFG_EXTRA_ENV_SETTINGS	\
include/configs/liteboard.h +1 -1
index 63e5dbfab775..75ff2d9db93c 100644
@@ -96,7 +96,7 @@
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #ifdef CONFIG_CMD_NET
include/configs/m53menlo.h +1 -1
index 2ffee5b2e930..d7b303b6ac05 100644
@@ -73,7 +73,7 @@
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORT		1
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* LVDS display */
include/configs/mx51evk.h +1 -1
index 123b7a533b17..e82e7547a3f6 100644
@@ -35,7 +35,7 @@
 /* USB Configs */
 #define CONFIG_MXC_USB_PORT	1
 #define CONFIG_MXC_USB_PORTSC	PORT_PTS_ULPI
-#define CONFIG_MXC_USB_FLAGS	MXC_EHCI_POWER_PINS_ENABLED
+#define CFG_MXC_USB_FLAGS	MXC_EHCI_POWER_PINS_ENABLED
 
 /* Framebuffer and LCD */
 
include/configs/mx53cx9020.h +1 -1
index 1a3ec6e0cdb8..5710fe90708a 100644
@@ -25,7 +25,7 @@
 /* USB Configs */
 #define CONFIG_MXC_USB_PORT	1
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_FLAGS	0
 
 /* Command definition */
 
include/configs/mx53loco.h +1 -1
index d87f9e942c51..cd7fa7c8cd96 100644
@@ -19,7 +19,7 @@
 /* USB Configs */
 #define CONFIG_MXC_USB_PORT	1
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_FLAGS	0
 
 /* PMIC Controller */
 #define CFG_SYS_DIALOG_PMIC_I2C_ADDR	0x48
include/configs/mx53ppd.h +1 -1
index 94d2191af91d..57dffbf6e40c 100644
@@ -14,7 +14,7 @@
 /* USB Configs */
 #define CONFIG_MXC_USB_PORT	1
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_FLAGS	0
 
 /* Command definition */
 
include/configs/mx6sabreauto.h +1 -1
index 274c14bbd383..1d96ecfa46cb 100644
@@ -13,7 +13,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_FLAGS	0
 
 #define CFG_SYS_I2C_PCA953X_WIDTH	{ {0x30, 8}, {0x32, 8}, {0x34, 8} }
 
include/configs/mx6sabresd.h +1 -1
index af9978e02c89..b2266025efcf 100644
@@ -30,7 +30,7 @@
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 #endif                         /* __MX6SABRESD_CONFIG_H */
include/configs/mx6slevk.h +1 -1
index f6d9ac20821f..5d5fc8f792de 100644
@@ -91,7 +91,7 @@
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 #define CFG_SYS_FSL_USDHC_NUM	3
include/configs/mx6sxsabreauto.h +1 -1
index 3d0f6e452d65..ff5ef7306611 100644
@@ -97,7 +97,7 @@
 
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #define CFG_SYS_FSL_USDHC_NUM	2
include/configs/mx6sxsabresd.h +1 -1
index 8c39e6d6cf4d..82dbf0f949c5 100644
@@ -119,7 +119,7 @@
 
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #ifdef CONFIG_CMD_PCI
include/configs/mx6ul_14x14_evk.h +1 -1
index 3f8a90b626d1..2d26d9b045af 100644
@@ -117,7 +117,7 @@
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #ifdef CONFIG_CMD_NET
include/configs/mys_6ulx.h +1 -1
index 0c0235b42984..a8a14600cc2d 100644
@@ -31,7 +31,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200n8\0" \
include/configs/nitrogen6x.h +1 -1
index fabd82d6c9c6..c634cb203b36 100644
@@ -24,7 +24,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_FLAGS	0
 
 #ifdef CONFIG_CMD_MMC
 #define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
include/configs/novena.h +1 -1
index dd82c04440ec..6088b2823412 100644
@@ -58,7 +58,7 @@
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 /* Gadget part */
 #define CONFIG_USBD_HS
 #endif
include/configs/npi_imx6ull.h +1 -1
index ae5e566d3fb0..490328d516f2 100644
@@ -32,7 +32,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #ifdef CONFIG_CMD_NET
 #define CFG_FEC_MXC_PHYADDR		0x1
include/configs/opos6uldev.h +1 -1
index e42a736136bc..5587237743c9 100644
@@ -21,7 +21,7 @@
 /* USB */
 #ifdef CONFIG_USB_EHCI_MX6
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* LCD */
include/configs/pcl063.h +1 -1
index e8c48cf83652..c95507b25fe9 100644
@@ -43,7 +43,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200n8\0" \
include/configs/pcl063_ull.h +1 -1
index bd04268a3ef3..688afe674591 100644
@@ -45,7 +45,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define ENV_MMC \
 	"mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
include/configs/pico-imx6.h +1 -1
index a1d0dd93c526..473f476aa470 100644
@@ -17,7 +17,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
include/configs/pico-imx6ul.h +1 -1
index 4064a34f191b..ba37e6765eed 100644
@@ -24,7 +24,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define CONFIG_USBD_HS
 
include/configs/pico-imx7d.h +1 -1
index dbeaeea77f7d..5995ce66ec8b 100644
@@ -108,6 +108,6 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS			0
+#define CFG_MXC_USB_FLAGS			0
 
 #endif
include/configs/somlabs_visionsom_6ull.h +1 -1
index 3418d4e2b559..1e3ae0398c1a 100644
@@ -62,7 +62,7 @@
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #ifdef CONFIG_CMD_NET
include/configs/usbarmory.h +1 -1
index 854875adc4b7..8cea69416df2 100644
@@ -25,7 +25,7 @@
 /* USB */
 #define CONFIG_MXC_USB_PORT	1
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_FLAGS	0
 
 /* Linux boot */
 #define CFG_HOSTNAME		"usbarmory"
include/configs/vining_2000.h +1 -1
index 7954ed9910c7..193706e46fa5 100644
@@ -37,7 +37,7 @@
 #define CFG_FEC_MXC_PHYADDR          0x0
 
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_FLAGS   0
 
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(4, 6)
include/configs/wandboard.h +1 -1
index 8853bcd7be28..64dbf93d05d0 100644
@@ -18,7 +18,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0\0" \
include/configs/xpress.h +1 -1
index 602fd4595e77..c17f0de7ede3 100644
@@ -29,7 +29,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define CFG_FEC_ENET_DEV		0
 #define CFG_FEC_MXC_PHYADDR          0x0
scripts/config_whitelist.txt +1 -1
index 2f3241289842..7c3c4bca17b7 100644
@@ -138,7 +138,7 @@ CFG_MXC_NAND_HWECC
 CFG_MXC_NAND_IP_REGS_BASE
 CFG_MXC_NAND_REGS_BASE
 CFG_MXC_UART_BASE
-CONFIG_MXC_USB_FLAGS
+CFG_MXC_USB_FLAGS
 CONFIG_MXC_USB_PORT
 CONFIG_MXC_USB_PORTSC
 CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
Signature · 1 line
2.25.1
author
#178 lore raw

PATCH 131/241 global: Migrate CONFIG_MXC_USB_PORT to CFG

In reply to Tom Rini
---
 drivers/usb/host/ehci-mx5.c              | 2 +-
 drivers/usb/host/ehci-mx6.c              | 8 ++++----
 include/configs/apalis_imx6.h            | 2 +-
 include/configs/aristainetos2.h          | 2 +-
 include/configs/brppt2.h                 | 2 +-
 include/configs/cl-som-imx7.h            | 2 +-
 include/configs/cm_fx6.h                 | 2 +-
 include/configs/colibri-imx6ull.h        | 2 +-
 include/configs/colibri_imx6.h           | 2 +-
 include/configs/colibri_imx7.h           | 2 +-
 include/configs/dart_6ul.h               | 2 +-
 include/configs/dh_imx6.h                | 2 +-
 include/configs/display5.h               | 2 +-
 include/configs/embestmx6boards.h        | 2 +-
 include/configs/ge_b1x5v2.h              | 2 +-
 include/configs/gw_ventana.h             | 2 +-
 include/configs/imx6_logic.h             | 2 +-
 include/configs/imx6dl-mamoj.h           | 2 +-
 include/configs/imx6q-bosch-acc.h        | 2 +-
 include/configs/imx7-cm.h                | 2 +-
 include/configs/imx8mm-cl-iot-gate.h     | 2 +-
 include/configs/kontron-sl-mx6ul.h       | 2 +-
 include/configs/kontron-sl-mx8mm.h       | 2 +-
 include/configs/kp_imx53.h               | 2 +-
 include/configs/kp_imx6q_tpc.h           | 2 +-
 include/configs/liteboard.h              | 2 +-
 include/configs/m53menlo.h               | 4 ++--
 include/configs/meerkat96.h              | 2 +-
 include/configs/mx51evk.h                | 4 ++--
 include/configs/mx53cx9020.h             | 4 ++--
 include/configs/mx53loco.h               | 4 ++--
 include/configs/mx53ppd.h                | 4 ++--
 include/configs/mx6cuboxi.h              | 2 +-
 include/configs/mx6memcal.h              | 2 +-
 include/configs/mx6sabreauto.h           | 2 +-
 include/configs/mx6sabresd.h             | 2 +-
 include/configs/mx6slevk.h               | 2 +-
 include/configs/mx6sllevk.h              | 2 +-
 include/configs/mx6sxsabreauto.h         | 2 +-
 include/configs/mx6sxsabresd.h           | 2 +-
 include/configs/mx6ul_14x14_evk.h        | 2 +-
 include/configs/mx7dsabresd.h            | 2 +-
 include/configs/mx7ulp_com.h             | 2 +-
 include/configs/mys_6ulx.h               | 2 +-
 include/configs/nitrogen6x.h             | 2 +-
 include/configs/novena.h                 | 2 +-
 include/configs/npi_imx6ull.h            | 2 +-
 include/configs/o4-imx6ull-nano.h        | 2 +-
 include/configs/opos6uldev.h             | 2 +-
 include/configs/pcl063.h                 | 2 +-
 include/configs/pcl063_ull.h             | 2 +-
 include/configs/pico-imx6.h              | 2 +-
 include/configs/pico-imx6ul.h            | 2 +-
 include/configs/pico-imx7d.h             | 2 +-
 include/configs/somlabs_visionsom_6ull.h | 2 +-
 include/configs/tbs2910.h                | 2 +-
 include/configs/tqma6.h                  | 2 +-
 include/configs/usbarmory.h              | 4 ++--
 include/configs/verdin-imx8mm.h          | 2 +-
 include/configs/vining_2000.h            | 2 +-
 include/configs/wandboard.h              | 2 +-
 include/configs/warp7.h                  | 2 +-
 include/configs/xpress.h                 | 2 +-
 scripts/config_whitelist.txt             | 4 ++--
 64 files changed, 74 insertions(+), 74 deletions(-)
drivers/usb/host/ehci-mx5.c +1 -1
index bdfc1283e4aa..c11279867c7c 100644
@@ -299,7 +299,7 @@ static int ehci_usb_probe(struct udevice *dev)
 			HC_LENGTH(ehci_readl(&(hccr)->cr_capbase)));
 	setbits_le32(&ehci->usbmode, CM_HOST);
 
-	__raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
+	__raw_writel(CFG_MXC_USB_PORTSC, &ehci->portsc);
 	setbits_le32(&ehci->portsc, USB_EN);
 
 	mxc_set_usbcontrol(priv->portnr, CFG_MXC_USB_FLAGS);
drivers/usb/host/ehci-mx6.c +4 -4
index fa2ca2a1d912..0a12db614ff4 100644
@@ -70,8 +70,8 @@ DECLARE_GLOBAL_DATA_PTR;
 #define UCMD_RESET		(1 << 1) /* controller reset */
 
 /* If this is not defined, assume MX6/MX7/MX8M SoC default */
-#ifndef CONFIG_MXC_USB_PORTSC
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#ifndef CFG_MXC_USB_PORTSC
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif
 
 /* Base address for this IP block is 0x02184800 */
@@ -411,7 +411,7 @@ int ehci_hcd_init(int index, enum usb_init_type init,
 		return 0;
 
 	setbits_le32(&ehci->usbmode, CM_HOST);
-	writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
+	writel(CFG_MXC_USB_PORTSC, &ehci->portsc);
 	setbits_le32(&ehci->portsc, USB_EN);
 
 	mdelay(10);
@@ -454,7 +454,7 @@ static u32 mx6_portsc(enum usb_phy_interface phy_type)
 	case USBPHY_INTERFACE_MODE_HSIC:
 		return PORT_PTS_HSIC;
 	default:
-		return CONFIG_MXC_USB_PORTSC;
+		return CFG_MXC_USB_PORTSC;
 	}
 }
 
include/configs/apalis_imx6.h +1 -1
index fd2a0e3d82d3..88505885ca85 100644
@@ -26,7 +26,7 @@
 
 /* USB Configs */
 /* Host */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 /* Client */
 #define CONFIG_USBD_HS
include/configs/aristainetos2.h +1 -1
index 19906db5966f..e0f1ec7e11a7 100644
@@ -415,7 +415,7 @@
 /* DMA stuff, needed for GPMI/MXS NAND support */
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS	0
 
 /* UBI support */
include/configs/brppt2.h +1 -1
index 47a95c0b920a..50aedae8794f 100644
@@ -84,6 +84,6 @@ BUR_COMMON_ENV \
 #define CFG_FEC_FIXED_SPEED		_1000BASET
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif	/* __CONFIG_BRPP2_IMX6_H */
include/configs/cl-som-imx7.h +1 -1
index e38d2844c803..0a667c60b61b 100644
@@ -96,7 +96,7 @@
 #endif
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS   0
 
 #endif	/* __CONFIG_H */
include/configs/cm_fx6.h +1 -1
index 479feae77240..7d0f2b6dc13a 100644
@@ -135,7 +135,7 @@
 #define CFG_FEC_MXC_PHYADDR		0
 
 /* USB */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 /* Boot */
include/configs/colibri-imx6ull.h +1 -1
index 92dff580f601..7e718b48e423 100644
@@ -127,7 +127,7 @@
 
 /* USB Configs */
 
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define CONFIG_USBD_HS
include/configs/colibri_imx6.h +1 -1
index 419c919bbecd..b8418373abae 100644
@@ -23,7 +23,7 @@
 
 /* USB Configs */
 /* Host */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 /* Client */
 #define CONFIG_USBD_HS
include/configs/colibri_imx7.h +1 -1
index 2b2b17f2c7b9..061c445bd9db 100644
@@ -171,7 +171,7 @@
 
 /* USB Configs */
 
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define CONFIG_USBD_HS
include/configs/dart_6ul.h +1 -1
index 93ee004b009c..c5781670864b 100644
@@ -47,7 +47,7 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define ENV_MMC \
include/configs/dh_imx6.h +1 -1
index 90f8ce0fd57f..db76b458a593 100644
@@ -32,7 +32,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 /* USB Gadget (DFU, UMS) */
include/configs/display5.h +1 -1
index 9a6fb72377c1..6900baa84545 100644
@@ -293,5 +293,5 @@
 /* The 0x120000 value corresponds to above SPI-NOR memory MAP */
 #endif
 
-#define CONFIG_MXC_USB_PORTSC           (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC           (PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif /* __CONFIG_H */
include/configs/embestmx6boards.h +1 -1
index f73b1ec63de6..c7a55c5c9266 100644
@@ -18,7 +18,7 @@
 #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS	0
 
 /* MMC Configs */
include/configs/ge_b1x5v2.h +1 -1
index f7e9dd16b26f..dd3c56c480be 100644
@@ -24,7 +24,7 @@
 #endif
 
 /* USB */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 #define CONFIG_USBD_HS
 
include/configs/gw_ventana.h +1 -1
index cc21e93a7beb..4741d399590c 100644
@@ -36,7 +36,7 @@
 /* Various command support */
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS      0
 #define CONFIG_USBD_HS
 
include/configs/imx6_logic.h +1 -1
index 215ed75deaf3..85c054451f35 100644
@@ -117,7 +117,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 #endif
 
include/configs/imx6dl-mamoj.h +1 -1
index ca89f72f8a21..6c61b3f44801 100644
@@ -43,7 +43,7 @@
 #define CFG_FEC_MXC_PHYADDR		1
 
 /* USB */
-#define CONFIG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS			0
 
 /* Falcon */
include/configs/imx6q-bosch-acc.h +1 -1
index 4209d9d7ab28..2c998cdcfc72 100644
@@ -110,7 +110,7 @@
 #endif
 #endif
 
-#define CONFIG_MXC_USB_PORTSC            (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC            (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS             0
 
 #endif /* __IMX6Q_ACC_H */
include/configs/imx7-cm.h +1 -1
index 87262a97877e..4202c5928c2f 100644
@@ -79,7 +79,7 @@
 
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #define CONFIG_USBD_HS
 
include/configs/imx8mm-cl-iot-gate.h +1 -1
index 64cdc401d039..2641d7bc960b 100644
@@ -139,6 +139,6 @@
 #define CFG_FEC_MXC_PHYADDR		0
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif /*__IMX8MM_CL_IOT_GATE_H*/
include/configs/kontron-sl-mx6ul.h +1 -1
index 3479b0b2bf4d..d0644cd1396b 100644
@@ -26,7 +26,7 @@
 #define CFG_HOSTNAME			"kontron-mx6ul"
 
 #ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 #endif
 
include/configs/kontron-sl-mx8mm.h +1 -1
index 89f5c6f46faf..8a7709a00b60 100644
@@ -26,7 +26,7 @@
 #define CFG_HOSTNAME			"kontron-mx8mm"
 
 #ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 #endif
 
include/configs/kp_imx53.h +1 -1
index baf7779026fb..6e383cbe75f7 100644
@@ -11,7 +11,7 @@
 #include <linux/sizes.h>
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS	0
 
 /* Command definition */
include/configs/kp_imx6q_tpc.h +1 -1
index 07497d063fb8..1aa4b8ab5987 100644
@@ -18,7 +18,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 #endif
 
include/configs/liteboard.h +1 -1
index 75ff2d9db93c..5811059c8e2b 100644
@@ -95,7 +95,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS   0
 #endif
 
include/configs/m53menlo.h +2 -2
index d7b303b6ac05..a54ece9ac828 100644
@@ -71,8 +71,8 @@
  * USB
  */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORT		1
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORT		1
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 #endif
 
include/configs/meerkat96.h +1 -1
index 9e480fe0558e..6ffc1282411a 100644
@@ -24,6 +24,6 @@
 /* Environment configs */
 
 /* USB configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif
include/configs/mx51evk.h +2 -2
index e82e7547a3f6..dff54d04a678 100644
@@ -33,8 +33,8 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	MMC_SDHC1_BASE_ADDR
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	PORT_PTS_ULPI
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	PORT_PTS_ULPI
 #define CFG_MXC_USB_FLAGS	MXC_EHCI_POWER_PINS_ENABLED
 
 /* Framebuffer and LCD */
include/configs/mx53cx9020.h +2 -2
index 5710fe90708a..e995776d30d5 100644
@@ -23,8 +23,8 @@
 
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS	0
 
 /* Command definition */
include/configs/mx53loco.h +2 -2
index cd7fa7c8cd96..7398804e6b54 100644
@@ -17,8 +17,8 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS	0
 
 /* PMIC Controller */
include/configs/mx53ppd.h +2 -2
index 57dffbf6e40c..df65dbeea41c 100644
@@ -12,8 +12,8 @@
 #include <asm/arch/imx-regs.h>
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS	0
 
 /* Command definition */
include/configs/mx6cuboxi.h +1 -1
index 871d52c343f5..f0d6405d3012 100644
@@ -15,7 +15,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 
 /* USB */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 /* Command definition */
 
include/configs/mx6memcal.h +1 -1
index b664962a26a5..f2edd13eb881 100644
@@ -31,6 +31,6 @@
 #define CFG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
-#define CONFIG_MXC_USB_PORTSC	PORT_PTS_UTMI
+#define CFG_MXC_USB_PORTSC	PORT_PTS_UTMI
 
 #endif	       /* __CONFIG_H */
include/configs/mx6sabreauto.h +1 -1
index 1d96ecfa46cb..da98139d7d77 100644
@@ -12,7 +12,7 @@
 #define CONSOLE_DEV		"ttymxc3"
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS	0
 
 #define CFG_SYS_I2C_PCA953X_WIDTH	{ {0x30, 8}, {0x32, 8}, {0x34, 8} }
include/configs/mx6sabresd.h +1 -1
index b2266025efcf..2b028e3aa2b1 100644
@@ -29,7 +29,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 #endif
 
include/configs/mx6slevk.h +1 -1
index 5d5fc8f792de..39c8ef060c7f 100644
@@ -90,7 +90,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 #endif
 
include/configs/mx6sllevk.h +1 -1
index aec3e51bff87..290996b51bc7 100644
@@ -94,7 +94,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif
 
 #include <linux/stringify.h>
include/configs/mx6sxsabreauto.h +1 -1
index ff5ef7306611..1c14a6beb0ac 100644
@@ -96,7 +96,7 @@
 #define CFG_FEC_MXC_PHYADDR          0x0
 
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS   0
 #endif
 
include/configs/mx6sxsabresd.h +1 -1
index 82dbf0f949c5..8b02c3b63101 100644
@@ -118,7 +118,7 @@
 #define CFG_FEC_MXC_PHYADDR          0x1
 
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS   0
 #endif
 
include/configs/mx6ul_14x14_evk.h +1 -1
index 2d26d9b045af..635ae78abcb5 100644
@@ -116,7 +116,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS   0
 #endif
 
include/configs/mx7dsabresd.h +1 -1
index a9722967f396..5392f38074ed 100644
@@ -99,7 +99,7 @@
 #endif
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #define CONFIG_USBD_HS
 
include/configs/mx7ulp_com.h +1 -1
index 5ee5129801d2..a310c64e7948 100644
@@ -51,5 +51,5 @@
 #define CFG_SYS_INIT_RAM_ADDR	IRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE	SZ_256K
 
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif	/* __CONFIG_H */
include/configs/mys_6ulx.h +1 -1
index a8a14600cc2d..2571098d06c6 100644
@@ -30,7 +30,7 @@
 #define CFG_SYS_NAND_BASE		0x40000000
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define CFG_EXTRA_ENV_SETTINGS \
include/configs/nitrogen6x.h +1 -1
index c634cb203b36..d35650a66e13 100644
@@ -23,7 +23,7 @@
 #define CFG_FEC_MXC_PHYADDR		6
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS	0
 
 #ifdef CONFIG_CMD_MMC
include/configs/novena.h +1 -1
index 6088b2823412..5176c6d1c48c 100644
@@ -57,7 +57,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 /* Gadget part */
 #define CONFIG_USBD_HS
include/configs/npi_imx6ull.h +1 -1
index 490328d516f2..62e74de8aea3 100644
@@ -31,7 +31,7 @@
 #define CFG_SYS_NAND_BASE		0x40000000
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #ifdef CONFIG_CMD_NET
include/configs/o4-imx6ull-nano.h +1 -1
index 0e1083a2130c..9050da8738b1 100644
@@ -12,7 +12,7 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 #if IS_ENABLED(CONFIG_CMD_USB)
-#	define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#	define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif /* CONFIG_CMD_USB */
 
 #define CFG_EXTRA_ENV_SETTINGS \
include/configs/opos6uldev.h +1 -1
index 5587237743c9..cfa708ff5e55 100644
@@ -20,7 +20,7 @@
 
 /* USB */
 #ifdef CONFIG_USB_EHCI_MX6
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 #endif
 
include/configs/pcl063.h +1 -1
index c95507b25fe9..38dcee053596 100644
@@ -42,7 +42,7 @@
 #define CFG_SYS_NAND_BASE		0x40000000
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define CFG_EXTRA_ENV_SETTINGS \
include/configs/pcl063_ull.h +1 -1
index 688afe674591..d742201ce43b 100644
@@ -44,7 +44,7 @@
 #define CFG_SYS_NAND_BASE		0x40000000
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define ENV_MMC \
include/configs/pico-imx6.h +1 -1
index 473f476aa470..d806d7d9c57d 100644
@@ -16,7 +16,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC3_BASE_ADDR
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
include/configs/pico-imx6ul.h +1 -1
index ba37e6765eed..531e462485d8 100644
@@ -23,7 +23,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define CONFIG_USBD_HS
include/configs/pico-imx7d.h +1 -1
index 5995ce66ec8b..fd8962e9f751 100644
@@ -107,7 +107,7 @@
 #define CFG_SYS_FSL_USDHC_NUM		2
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS			0
 
 #endif
include/configs/somlabs_visionsom_6ull.h +1 -1
index 1e3ae0398c1a..041a83b057d4 100644
@@ -61,7 +61,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS   0
 #endif
 
include/configs/tbs2910.h +1 -1
index 61f252cb638c..1e22ecfdc556 100644
@@ -27,7 +27,7 @@
 
 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #ifdef CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USBD_HS
 #endif /* CONFIG_CMD_USB_MASS_STORAGE */
include/configs/tqma6.h +1 -1
index cb5f7fc25af9..af5a474cf31e 100644
@@ -39,7 +39,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #if defined(CONFIG_TQMA6X_MMC_BOOT)
 
include/configs/usbarmory.h +2 -2
index 8cea69416df2..011a4610474e 100644
@@ -23,8 +23,8 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
 /* USB */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS	0
 
 /* Linux boot */
include/configs/verdin-imx8mm.h +1 -1
index 27d7efb883de..8cb1f1aff353 100644
@@ -67,6 +67,6 @@
 #define PHYS_SDRAM_SIZE			SZ_2G /* 2GB DDR */
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif /* __VERDIN_IMX8MM_H */
include/configs/vining_2000.h +1 -1
index 193706e46fa5..6db68c1e7001 100644
@@ -36,7 +36,7 @@
 /* Network */
 #define CFG_FEC_MXC_PHYADDR          0x0
 
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS   0
 
 #ifdef CONFIG_CMD_PCI
include/configs/wandboard.h +1 -1
index 64dbf93d05d0..7b8c5cbe7a8f 100644
@@ -17,7 +17,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define CFG_EXTRA_ENV_SETTINGS \
include/configs/warp7.h +1 -1
index 709bb046d018..ebc5f4aa6c91 100644
@@ -93,7 +93,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	1
 
 
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #define CONFIG_USBD_HS
 
include/configs/xpress.h +1 -1
index c17f0de7ede3..f8ee40a9543b 100644
@@ -28,7 +28,7 @@
 /* Environment is in stored in the eMMC boot partition */
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define CFG_FEC_ENET_DEV		0
scripts/config_whitelist.txt +2 -2
index 7c3c4bca17b7..8fdece74ef1e 100644
@@ -139,8 +139,8 @@ CFG_MXC_NAND_IP_REGS_BASE
 CFG_MXC_NAND_REGS_BASE
 CFG_MXC_UART_BASE
 CFG_MXC_USB_FLAGS
-CONFIG_MXC_USB_PORT
-CONFIG_MXC_USB_PORTSC
+CFG_MXC_USB_PORT
+CFG_MXC_USB_PORTSC
 CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 CONFIG_NAND_CS_INIT
 CONFIG_NETDEV
Signature · 1 line
2.25.1
author
#179 lore raw

PATCH 132/241 global: Migrate CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC to CFG

In reply to Tom Rini
---
 drivers/mtd/nand/raw/davinci_nand.c | 4 ++--
 include/configs/omapl138_lcdk.h     | 2 +-
 scripts/config_whitelist.txt        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/mtd/nand/raw/davinci_nand.c +2 -2
index e4e144bd7c83..25cd685555e8 100644
@@ -266,7 +266,7 @@ static int nand_davinci_correct_data(struct mtd_info *mtd, u_char *dat,
 static struct nand_ecclayout nand_davinci_4bit_layout_oobfirst = {
 #if defined(CONFIG_SYS_NAND_PAGE_2K)
 	.eccbytes = 40,
-#ifdef CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
+#ifdef CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 	.eccpos = {
 		6,   7,  8,  9, 10,	11, 12, 13, 14, 15,
 		22, 23, 24, 25, 26,	27, 28, 29, 30, 31,
@@ -287,7 +287,7 @@ static struct nand_ecclayout nand_davinci_4bit_layout_oobfirst = {
 	.oobfree = {
 		{.offset = 2, .length = 22, },
 	},
-#endif	/* #ifdef CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC */
+#endif	/* #ifdef CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC */
 #elif defined(CONFIG_SYS_NAND_PAGE_4K)
 	.eccbytes = 80,
 	.eccpos = {
include/configs/omapl138_lcdk.h +1 -1
index b1fc437395dd..5384c1f470c5 100644
@@ -109,7 +109,7 @@
 #define CFG_SYS_NAND_BASE		DAVINCI_ASYNC_EMIF_DATA_CE3_BASE
 #define CFG_SYS_NAND_MASK_CLE	0x10
 #define CFG_SYS_NAND_MASK_ALE	0x8
-#define CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
+#define CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 #define CFG_SYS_NAND_U_BOOT_SIZE	SZ_512K
 #define CFG_SYS_NAND_U_BOOT_DST	0xc1080000
 #define CFG_SYS_NAND_U_BOOT_START	CFG_SYS_NAND_U_BOOT_DST
scripts/config_whitelist.txt +1 -1
index 8fdece74ef1e..a7409a7f4978 100644
@@ -141,7 +141,7 @@ CFG_MXC_UART_BASE
 CFG_MXC_USB_FLAGS
 CFG_MXC_USB_PORT
 CFG_MXC_USB_PORTSC
-CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
+CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 CONFIG_NAND_CS_INIT
 CONFIG_NETDEV
 CONFIG_NETMASK
Signature · 1 line
2.25.1
author
#180 lore raw

PATCH 133/241 global: Migrate CONFIG_NAND_CS_INIT to CFG

In reply to Tom Rini
---
 board/siemens/common/board.c | 2 +-
 board/siemens/draco/board.c  | 2 +-
 include/configs/etamin.h     | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
board/siemens/common/board.c +1 -1
index 2efede62aa5d..1b3c06d13e55 100644
@@ -93,7 +93,7 @@ int board_init(void)
 
 	gpmc_init();
 
-#ifdef CONFIG_NAND_CS_INIT
+#ifdef CFG_NAND_CS_INIT
 	board_nand_cs_init();
 #endif
 
board/siemens/draco/board.c +1 -1
index f898bba4b0ee..fb81f40abceb 100644
@@ -370,7 +370,7 @@ U_BOOT_CMD(
 #endif /* #if defined(CONFIG_DRIVER_TI_CPSW) */
 #endif /* #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) */
 
-#ifdef CONFIG_NAND_CS_INIT
+#ifdef CFG_NAND_CS_INIT
 /* GPMC definitions for second nand cs1 */
 static const u32 gpmc_nand_config[] = {
 	ETAMIN_NAND_GPMC_CONFIG1,
include/configs/etamin.h +1 -1
index 8b2745ea96e4..861070866923 100644
@@ -129,7 +129,7 @@
 
 #ifndef CONFIG_SPL_BUILD
 
-#define CONFIG_NAND_CS_INIT
+#define CFG_NAND_CS_INIT
 #define ETAMIN_NAND_GPMC_CONFIG1	0x00000800
 #define ETAMIN_NAND_GPMC_CONFIG2	0x001e1e00
 #define ETAMIN_NAND_GPMC_CONFIG3	0x001e1e00
scripts/config_whitelist.txt +1 -1
index a7409a7f4978..e7d5f9ba57ca 100644
@@ -142,7 +142,7 @@ CFG_MXC_USB_FLAGS
 CFG_MXC_USB_PORT
 CFG_MXC_USB_PORTSC
 CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
-CONFIG_NAND_CS_INIT
+CFG_NAND_CS_INIT
 CONFIG_NETDEV
 CONFIG_NETMASK
 CONFIG_NORBOOT
Signature · 1 line
2.25.1
author
#181 lore raw

PATCH 134/241 global: Migrate CONFIG_NETDEV to CFG

In reply to Tom Rini
---
 include/configs/MPC837XERDB.h | 4 ++--
 scripts/config_whitelist.txt  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
include/configs/MPC837XERDB.h +2 -2
index 4c3acd5b013b..1f6efd7e098f 100644
@@ -223,7 +223,7 @@
  * Environment Configuration
  */
 
-#define CONFIG_NETDEV		"eth1"
+#define CFG_NETDEV		"eth1"
 
 #define CFG_HOSTNAME		"mpc837x_rdb"
 #define CONFIG_ROOTPATH		"/nfsroot"
@@ -232,7 +232,7 @@
 #define CFG_FDTFILE		"mpc8379_rdb.dtb"
 
 #define CFG_EXTRA_ENV_SETTINGS \
-	"netdev=" CONFIG_NETDEV "\0"				\
+	"netdev=" CFG_NETDEV "\0"				\
 	"uboot=" CONFIG_UBOOTPATH "\0"					\
 	"tftpflash=tftp $loadaddr $uboot;"				\
 		"protect off " __stringify(CONFIG_TEXT_BASE)	\
scripts/config_whitelist.txt +1 -1
index e7d5f9ba57ca..c8e0a85c124c 100644
@@ -143,7 +143,7 @@ CFG_MXC_USB_PORT
 CFG_MXC_USB_PORTSC
 CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 CFG_NAND_CS_INIT
-CONFIG_NETDEV
+CFG_NETDEV
 CONFIG_NETMASK
 CONFIG_NORBOOT
 CONFIG_NUM_DSP_CPUS
Signature · 1 line
2.25.1
author
#182 lore raw

PATCH 135/241 global: Migrate CONFIG_NETMASK to CFG

In reply to Tom Rini
---
 README                             | 2 +-
 include/configs/M5208EVBE.h        | 2 +-
 include/configs/M5235EVB.h         | 2 +-
 include/configs/M5272C3.h          | 2 +-
 include/configs/M5282EVB.h         | 2 +-
 include/configs/M53017EVB.h        | 2 +-
 include/configs/M5329EVB.h         | 2 +-
 include/configs/M5373EVB.h         | 2 +-
 include/configs/MCR3000.h          | 2 +-
 include/configs/MPC8548CDS.h       | 2 +-
 include/configs/apalis-imx8.h      | 2 +-
 include/configs/apalis-tk1.h       | 2 +-
 include/configs/apalis_imx6.h      | 2 +-
 include/configs/colibri-imx6ull.h  | 2 +-
 include/configs/colibri-imx8x.h    | 2 +-
 include/configs/colibri_imx6.h     | 2 +-
 include/configs/colibri_imx7.h     | 2 +-
 include/configs/colibri_vf.h       | 2 +-
 include/configs/mvebu_alleycat-5.h | 2 +-
 include/configs/npi_imx6ull.h      | 2 +-
 include/configs/poleg.h            | 2 +-
 include/configs/uniphier.h         | 2 +-
 include/env_default.h              | 4 ++--
 scripts/config_whitelist.txt       | 2 +-
 24 files changed, 25 insertions(+), 25 deletions(-)
README +1 -1
index 8ab897f09641..f5b4669b97c7 100644
@@ -758,7 +758,7 @@ The following options need to be configured:
 		(Environment variable "gatewayip")
 
 - Subnet mask:
-		CONFIG_NETMASK
+		CFG_NETMASK
 
 		Defines a default value for the subnet mask (or
 		routing prefix) which is used to determine if an IP
include/configs/M5208EVBE.h +1 -1
index 647e23f380b8..1357d682c7f7 100644
@@ -19,7 +19,7 @@
 
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
+#	define CFG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
include/configs/M5235EVB.h +1 -1
index 7bc86eb8b5f6..535b5064f193 100644
@@ -28,7 +28,7 @@
 /* this must be included AFTER the definition of CONFIG COMMANDS (if any) */
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
+#	define CFG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
include/configs/M5272C3.h +1 -1
index 99f1df087e36..043e188189e1 100644
@@ -31,7 +31,7 @@
 
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
+#	define CFG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
include/configs/M5282EVB.h +1 -1
index 4b20da4a23eb..88e3d72ef67f 100644
@@ -31,7 +31,7 @@
 
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
+#	define CFG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
include/configs/M53017EVB.h +1 -1
index 5afd8383c1bd..014405779fee 100644
@@ -32,7 +32,7 @@
 
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
+#	define CFG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
include/configs/M5329EVB.h +1 -1
index 9d5f0e1c0964..364eaa448dce 100644
@@ -24,7 +24,7 @@
 
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
+#	define CFG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
include/configs/M5373EVB.h +1 -1
index 807d591c9f12..cc67a268a8fe 100644
@@ -26,7 +26,7 @@
 
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
+#	define CFG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
include/configs/MCR3000.h +1 -1
index d61ed82ab3bf..1248b367ae62 100644
@@ -54,7 +54,7 @@
 
 #define CFG_IPADDR			192.168.0.3
 #define CONFIG_SERVERIP			192.168.0.1
-#define CONFIG_NETMASK			255.0.0.0
+#define CFG_NETMASK			255.0.0.0
 
 /* Miscellaneous configurable options */
 
include/configs/MPC8548CDS.h +1 -1
index 28315eef765d..f1287844486b 100644
@@ -333,7 +333,7 @@
 
 #define CONFIG_SERVERIP	 192.168.1.1
 #define CFG_GATEWAYIP 192.168.1.1
-#define CONFIG_NETMASK	 255.255.255.0
+#define CFG_NETMASK	 255.255.255.0
 
 #define	CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:ecc=off\0"		\
include/configs/apalis-imx8.h +1 -1
index 0258a70d923b..8f7841163936 100644
@@ -15,7 +15,7 @@
 
 /* Networking */
 #define CFG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
+#define CFG_NETMASK			255.255.255.0
 #define CONFIG_SERVERIP			192.168.10.1
 
 #define MEM_LAYOUT_ENV_SETTINGS \
include/configs/apalis-tk1.h +1 -1
index 4db3465cd9b7..387fb3f69c83 100644
@@ -35,7 +35,7 @@
 
 #undef CFG_IPADDR
 #define CFG_IPADDR		192.168.10.2
-#define CONFIG_NETMASK		255.255.255.0
+#define CFG_NETMASK		255.255.255.0
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP		192.168.10.1
 
include/configs/apalis_imx6.h +1 -1
index 88505885ca85..4f2addd42d8b 100644
@@ -37,7 +37,7 @@
 
 #undef CFG_IPADDR
 #define CFG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
+#define CFG_NETMASK			255.255.255.0
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP			192.168.10.1
 
include/configs/colibri-imx6ull.h +1 -1
index 7e718b48e423..3cf56e98faf8 100644
@@ -21,7 +21,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	1
 
 #define CFG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
+#define CFG_NETMASK			255.255.255.0
 #define CONFIG_SERVERIP			192.168.10.1
 
 #if defined(CONFIG_TARGET_COLIBRI_IMX6ULL_EMMC)
include/configs/colibri-imx8x.h +1 -1
index 0e8e24dd7bd2..0c879cc06bc7 100644
@@ -15,7 +15,7 @@
 #define USDHC2_BASE_ADDR		0x5b020000
 
 #define CFG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
+#define CFG_NETMASK			255.255.255.0
 #define CONFIG_SERVERIP			192.168.10.1
 
 #define MEM_LAYOUT_ENV_SETTINGS \
include/configs/colibri_imx6.h +1 -1
index b8418373abae..c0d5e6f0aa06 100644
@@ -32,7 +32,7 @@
 
 #undef CFG_IPADDR
 #define CFG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
+#define CFG_NETMASK			255.255.255.0
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP			192.168.10.1
 
include/configs/colibri_imx7.h +1 -1
index 061c445bd9db..fdaeb6588146 100644
@@ -22,7 +22,7 @@
 #endif
 
 #define CFG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
+#define CFG_NETMASK			255.255.255.0
 #define CONFIG_SERVERIP			192.168.10.1
 
 #if defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
include/configs/colibri_vf.h +1 -1
index 808d69d0c865..3da98a5165e4 100644
@@ -17,7 +17,7 @@
 /* NAND support */
 
 #define CFG_IPADDR		192.168.10.2
-#define CONFIG_NETMASK		255.255.255.0
+#define CFG_NETMASK		255.255.255.0
 #define CONFIG_SERVERIP		192.168.10.1
 
 #define CFG_FDTADDR			0x84000000
include/configs/mvebu_alleycat-5.h +1 -1
index 0d38645c0e60..1f923c2d4834 100644
@@ -17,7 +17,7 @@
 /* Default Env vars */
 #define CFG_IPADDR           0.0.0.0 /* In order to cause an error */
 #define CONFIG_SERVERIP         0.0.0.0 /* In order to cause an error */
-#define CONFIG_NETMASK          255.255.255.0
+#define CFG_NETMASK          255.255.255.0
 #define CFG_GATEWAYIP        0.0.0.0
 #define CONFIG_ROOTPATH                 "/srv/nfs/" /* Default Dir for NFS */
 
include/configs/npi_imx6ull.h +1 -1
index 62e74de8aea3..be295e73caa7 100644
@@ -18,7 +18,7 @@
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 
-#define CONFIG_NETMASK			255.255.255.0
+#define CFG_NETMASK			255.255.255.0
 
 /* Physical Memory Map */
 #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR
include/configs/poleg.h +1 -1
index 3e4309512cc1..e824af8273a1 100644
@@ -16,7 +16,7 @@
 /* Default environemnt variables */
 #define CONFIG_SERVERIP                 192.168.0.1
 #define CFG_IPADDR                   192.168.0.2
-#define CONFIG_NETMASK                  255.255.255.0
+#define CFG_NETMASK                  255.255.255.0
 #define CFG_EXTRA_ENV_SETTINGS   "uimage_flash_addr=80200000\0"   \
 		"stdin=serial\0"   \
 		"stdout=serial\0"   \
include/configs/uniphier.h +1 -1
index 3ec3caade49c..02a091ee0369 100644
@@ -49,7 +49,7 @@
 #define CONFIG_SERVERIP			192.168.11.1
 #define CFG_IPADDR			192.168.11.10
 #define CFG_GATEWAYIP		192.168.11.1
-#define CONFIG_NETMASK			255.255.255.0
+#define CFG_NETMASK			255.255.255.0
 
 #if defined(CONFIG_ARM64)
 /* ARM Trusted Firmware */
include/env_default.h +2 -2
index 5ee28a54960d..0a8ccaf52c3a 100644
@@ -71,8 +71,8 @@ const char default_environment[] = {
 #ifdef	CFG_GATEWAYIP
 	"gatewayip="	__stringify(CFG_GATEWAYIP)	"\0"
 #endif
-#ifdef	CONFIG_NETMASK
-	"netmask="	__stringify(CONFIG_NETMASK)	"\0"
+#ifdef	CFG_NETMASK
+	"netmask="	__stringify(CFG_NETMASK)	"\0"
 #endif
 #ifdef	CFG_HOSTNAME
 	"hostname="	CFG_HOSTNAME	"\0"
scripts/config_whitelist.txt +1 -1
index c8e0a85c124c..41312519749c 100644
@@ -144,7 +144,7 @@ CFG_MXC_USB_PORTSC
 CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 CFG_NAND_CS_INIT
 CFG_NETDEV
-CONFIG_NETMASK
+CFG_NETMASK
 CONFIG_NORBOOT
 CONFIG_NUM_DSP_CPUS
 CONFIG_ODROID_REV_AIN
Signature · 1 line
2.25.1
author
#183 lore raw

PATCH 136/241 global: Migrate CONFIG_NORBOOT to CFG

In reply to Tom Rini
---
 include/configs/p1_p2_rdb_pc.h | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/p1_p2_rdb_pc.h +1 -1
index c8ecd2dc0fca..1e66d609d68d 100644
@@ -482,7 +482,7 @@ RST_DEF_CMD(defboot) \
 "ext2load usb 0:4 $ramdiskaddr $ramdiskfile;" \
 "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_NORBOOT	\
+#define CFG_NORBOOT	\
 "setenv bootargs root=/dev/$jffs2nor rw "	\
 "console=$consoledev,$baudrate rootfstype=jffs2 $othbootargs;"	\
 "bootm $norbootaddr - $norfdtaddr"
scripts/config_whitelist.txt +1 -1
index 41312519749c..31d50b5ab580 100644
@@ -145,7 +145,7 @@ CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 CFG_NAND_CS_INIT
 CFG_NETDEV
 CFG_NETMASK
-CONFIG_NORBOOT
+CFG_NORBOOT
 CONFIG_NUM_DSP_CPUS
 CONFIG_ODROID_REV_AIN
 CONFIG_OTHBOOTARGS
Signature · 1 line
2.25.1
author
#184 lore raw

PATCH 137/241 global: Migrate CONFIG_NUM_DSP_CPUS to CFG

In reply to Tom Rini
---
 arch/powerpc/include/asm/config_mpc85xx.h | 2 +-
 scripts/config_whitelist.txt              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/config_mpc85xx.h +1 -1
index 9738c573452b..24259f6470ae 100644
@@ -153,7 +153,7 @@
 
 #ifdef CONFIG_ARCH_B4860
 #define CFG_MAX_DSP_CPUS		12
-#define CONFIG_NUM_DSP_CPUS		6
+#define CFG_NUM_DSP_CPUS		6
 #define CFG_SYS_FSL_CLUSTER_CLOCKS	{ 1, 4, 4, 4 }
 #define CFG_SYS_NUM_FM1_DTSEC	6
 #define CFG_SYS_NUM_FM1_10GEC	2
scripts/config_whitelist.txt +1 -1
index 31d50b5ab580..9021044470ae 100644
@@ -146,7 +146,7 @@ CFG_NAND_CS_INIT
 CFG_NETDEV
 CFG_NETMASK
 CFG_NORBOOT
-CONFIG_NUM_DSP_CPUS
+CFG_NUM_DSP_CPUS
 CONFIG_ODROID_REV_AIN
 CONFIG_OTHBOOTARGS
 CONFIG_OVERWRITE_ETHADDR_ONCE
Signature · 1 line
2.25.1
author
#185 lore raw

PATCH 138/241 global: Migrate CONFIG_ODROID_REV_AIN to CFG

In reply to Tom Rini
---
 board/samsung/common/exynos5-dt-types.c | 4 ++--
 include/configs/odroid_xu3.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
board/samsung/common/exynos5-dt-types.c +2 -2
index 554fc91cc1a3..9294d36ba358 100644
@@ -57,7 +57,7 @@ static int odroid_get_adc_val(unsigned int *adcval)
 	unsigned int adcval_prev = 0;
 	int ret, retries = 20;
 
-	ret = adc_channel_single_shot("adc@12D10000", CONFIG_ODROID_REV_AIN,
+	ret = adc_channel_single_shot("adc@12D10000", CFG_ODROID_REV_AIN,
 				      &adcval_prev);
 	if (ret)
 		return ret;
@@ -66,7 +66,7 @@ static int odroid_get_adc_val(unsigned int *adcval)
 		mdelay(5);
 
 		ret = adc_channel_single_shot("adc@12D10000",
-					      CONFIG_ODROID_REV_AIN, adcval);
+					      CFG_ODROID_REV_AIN, adcval);
 		if (ret)
 			return ret;
 
include/configs/odroid_xu3.h +1 -1
index 50213a383528..93f88ef53eba 100644
@@ -60,7 +60,7 @@
 #define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
 
 /* Set soc_rev, soc_id, board_rev, board_name, fdtfile */
-#define CONFIG_ODROID_REV_AIN		9
+#define CFG_ODROID_REV_AIN		9
 
 /*
  * Need to override existing one (smdk5420) with odroid so set_board_info will
scripts/config_whitelist.txt +1 -1
index 9021044470ae..d8e9be8a82ef 100644
@@ -147,7 +147,7 @@ CFG_NETDEV
 CFG_NETMASK
 CFG_NORBOOT
 CFG_NUM_DSP_CPUS
-CONFIG_ODROID_REV_AIN
+CFG_ODROID_REV_AIN
 CONFIG_OTHBOOTARGS
 CONFIG_OVERWRITE_ETHADDR_ONCE
 CONFIG_PCIE_IMX_PERST_GPIO
Signature · 1 line
2.25.1
author
#186 lore raw

PATCH 139/241 global: Migrate CONFIG_OTHBOOTARGS to CFG

In reply to Tom Rini
---
 include/configs/x86-common.h | 6 +++---
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
include/configs/x86-common.h +3 -3
index fdd7dba9a6f2..df75deedf583 100644
@@ -45,9 +45,9 @@
 #define CFG_HOSTNAME		"x86"
 #define CONFIG_RAMDISK_ADDR	0x4000000
 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
-#define CONFIG_OTHBOOTARGS	"othbootargs=\0"
+#define CFG_OTHBOOTARGS	"othbootargs=\0"
 #else
-#define CONFIG_OTHBOOTARGS	"othbootargs=acpi=off\0"
+#define CFG_OTHBOOTARGS	"othbootargs=acpi=off\0"
 #endif
 
 #if defined(CONFIG_DISTRO_DEFAULTS)
@@ -67,7 +67,7 @@
 	"pciconfighost=1\0"				\
 	"netdev=eth0\0"					\
 	"consoledev=ttyS0\0"				\
-	CONFIG_OTHBOOTARGS				\
+	CFG_OTHBOOTARGS				\
 	"scriptaddr=0x7000000\0"			\
 	"kernel_addr_r=0x1000000\0"			\
 	"ramdisk_addr_r=0x4000000\0"			\
scripts/config_whitelist.txt +1 -1
index d8e9be8a82ef..a5c5644e65dd 100644
@@ -148,7 +148,7 @@ CFG_NETMASK
 CFG_NORBOOT
 CFG_NUM_DSP_CPUS
 CFG_ODROID_REV_AIN
-CONFIG_OTHBOOTARGS
+CFG_OTHBOOTARGS
 CONFIG_OVERWRITE_ETHADDR_ONCE
 CONFIG_PCIE_IMX_PERST_GPIO
 CONFIG_PCIE_IMX_POWER_GPIO
Signature · 1 line
2.25.1
author
#187 lore raw

PATCH 140/241 global: Migrate CONFIG_OVERWRITE_ETHADDR_ONCE to CFG

In reply to Tom Rini
---
 README                       | 2 +-
 include/configs/M5253DEMO.h  | 2 +-
 include/configs/M5275EVB.h   | 2 +-
 include/configs/eb_cpu5282.h | 2 +-
 include/env_flags.h          | 2 +-
 scripts/config_whitelist.txt | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
README +1 -1
index f5b4669b97c7..d3659e7b54a2 100644
@@ -1123,7 +1123,7 @@ The following options need to be configured:
 		these parameters.
 
 		Alternatively, if you define _both_ an ethaddr in the
-		default env _and_ CONFIG_OVERWRITE_ETHADDR_ONCE, a default
+		default env _and_ CFG_OVERWRITE_ETHADDR_ONCE, a default
 		Ethernet address is installed in the environment,
 		which can be changed exactly ONCE by the user. [The
 		serial# is unaffected by this, i. e. it remains
include/configs/M5253DEMO.h +1 -1
index bf31d203e664..3bb22b8d50cd 100644
@@ -26,7 +26,7 @@
 #	undef CONFIG_DM9000_DEBUG
 #	define CFG_DM9000_BYTE_SWAPPED
 
-#	define CONFIG_OVERWRITE_ETHADDR_ONCE
+#	define CFG_OVERWRITE_ETHADDR_ONCE
 
 #	define CFG_EXTRA_ENV_SETTINGS		\
 		"netdev=eth0\0"				\
include/configs/M5275EVB.h +1 -1
index 951209fbd750..9f73237749aa 100644
@@ -39,7 +39,7 @@
 #define CFG_SYS_I2C_PINMUX_SET	(0x000F)
 
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_OVERWRITE_ETHADDR_ONCE
+#	define CFG_OVERWRITE_ETHADDR_ONCE
 #endif				/* FEC_ENET */
 
 #define CFG_EXTRA_ENV_SETTINGS		\
include/configs/eb_cpu5282.h +1 -1
index e8d85bdd78f2..49bf6fa4a280 100644
@@ -45,7 +45,7 @@
  *----------------------------------------------------------------------*/
 
 #ifdef CONFIG_MCFFEC
-#define CONFIG_OVERWRITE_ETHADDR_ONCE
+#define CFG_OVERWRITE_ETHADDR_ONCE
 #endif
 
 /*-------------------------------------------------------------------------
include/env_flags.h +1 -1
index e4e40169aed0..de1cdd013cda 100644
@@ -48,7 +48,7 @@ enum env_flags_varaccess {
 #ifdef CONFIG_ENV_OVERWRITE
 #define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:ma,"
 #else
-#ifdef CONFIG_OVERWRITE_ETHADDR_ONCE
+#ifdef CFG_OVERWRITE_ETHADDR_ONCE
 #define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:mc,"
 #else
 #define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:mo,"
scripts/config_whitelist.txt +1 -1
index a5c5644e65dd..cb85e39ad2cd 100644
@@ -149,7 +149,7 @@ CFG_NORBOOT
 CFG_NUM_DSP_CPUS
 CFG_ODROID_REV_AIN
 CFG_OTHBOOTARGS
-CONFIG_OVERWRITE_ETHADDR_ONCE
+CFG_OVERWRITE_ETHADDR_ONCE
 CONFIG_PCIE_IMX_PERST_GPIO
 CONFIG_PCIE_IMX_POWER_GPIO
 CONFIG_PEN_ADDR_BIG_ENDIAN
Signature · 1 line
2.25.1
author
#188 lore raw

PATCH 141/241 global: Migrate CONFIG_PCIE_IMX_PERST_GPIO to CFG

In reply to Tom Rini
---
 drivers/pci/pcie_imx.c         | 12 ++++++------
 include/configs/mx6sabresd.h   |  2 +-
 include/configs/mx6sxsabresd.h |  2 +-
 include/configs/novena.h       |  2 +-
 include/configs/tbs2910.h      |  2 +-
 include/configs/vining_2000.h  |  2 +-
 scripts/config_whitelist.txt   |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)
drivers/pci/pcie_imx.c +6 -6
index 46ac01713ff7..902507aaae38 100644
@@ -566,7 +566,7 @@ int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high)
 	 * do self-initialisation.
 	 *
 	 * In case your #PERST pin is connected to a plain GPIO pin of the
-	 * CPU, you can define CONFIG_PCIE_IMX_PERST_GPIO in your board's
+	 * CPU, you can define CFG_PCIE_IMX_PERST_GPIO in your board's
 	 * configuration file and the condition below will handle the rest
 	 * of the reset toggling.
 	 *
@@ -578,13 +578,13 @@ int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high)
 	 * Linux at all in the first place since it's in some non-reset
 	 * state due to being previously used in U-Boot.
 	 */
-#ifdef CONFIG_PCIE_IMX_PERST_GPIO
-	gpio_request(CONFIG_PCIE_IMX_PERST_GPIO, "pcie_reset");
-	gpio_direction_output(CONFIG_PCIE_IMX_PERST_GPIO, 0);
+#ifdef CFG_PCIE_IMX_PERST_GPIO
+	gpio_request(CFG_PCIE_IMX_PERST_GPIO, "pcie_reset");
+	gpio_direction_output(CFG_PCIE_IMX_PERST_GPIO, 0);
 	mdelay(20);
-	gpio_set_value(CONFIG_PCIE_IMX_PERST_GPIO, 1);
+	gpio_set_value(CFG_PCIE_IMX_PERST_GPIO, 1);
 	mdelay(20);
-	gpio_free(CONFIG_PCIE_IMX_PERST_GPIO);
+	gpio_free(CFG_PCIE_IMX_PERST_GPIO);
 #else
 	if (dm_gpio_is_valid(gpio)) {
 		/* Assert PERST# for 20ms then de-assert */
include/configs/mx6sabresd.h +1 -1
index 2b028e3aa2b1..116a9c6abcf3 100644
@@ -20,7 +20,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	3
 
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(7, 12)
+#define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(7, 12)
 #define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(3, 19)
 #endif
 
include/configs/mx6sxsabresd.h +1 -1
index 8b02c3b63101..85e5cfbb58db 100644
@@ -123,7 +123,7 @@
 #endif
 
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(2, 0)
+#define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(2, 0)
 #define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(2, 1)
 #endif
 
include/configs/novena.h +1 -1
index 5176c6d1c48c..1c695159dd8b 100644
@@ -45,7 +45,7 @@
 
 /* PCI express */
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(3, 29)
+#define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(3, 29)
 #define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(7, 12)
 #endif
 
include/configs/tbs2910.h +1 -1
index 1e22ecfdc556..7debc90205a8 100644
@@ -22,7 +22,7 @@
 
 /* PCI */
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(7, 12)
+#define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(7, 12)
 #endif
 
 /* USB */
include/configs/vining_2000.h +1 -1
index 6db68c1e7001..7bfc22c043fe 100644
@@ -40,7 +40,7 @@
 #define CFG_MXC_USB_FLAGS   0
 
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(4, 6)
+#define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(4, 6)
 #endif
 
 #define CFG_IMX6_PWM_PER_CLK 66000000
scripts/config_whitelist.txt +1 -1
index cb85e39ad2cd..392756572f81 100644
@@ -150,7 +150,7 @@ CFG_NUM_DSP_CPUS
 CFG_ODROID_REV_AIN
 CFG_OTHBOOTARGS
 CFG_OVERWRITE_ETHADDR_ONCE
-CONFIG_PCIE_IMX_PERST_GPIO
+CFG_PCIE_IMX_PERST_GPIO
 CONFIG_PCIE_IMX_POWER_GPIO
 CONFIG_PEN_ADDR_BIG_ENDIAN
 CONFIG_PHY_BASE_ADR
Signature · 1 line
2.25.1
author
#189 lore raw

PATCH 142/241 global: Migrate CONFIG_PCIE_IMX_POWER_GPIO to CFG

In reply to Tom Rini
---
 drivers/pci/pcie_imx.c         | 10 +++++-----
 include/configs/mx6sabresd.h   |  2 +-
 include/configs/mx6sxsabresd.h |  2 +-
 include/configs/novena.h       |  2 +-
 scripts/config_whitelist.txt   |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
drivers/pci/pcie_imx.c +5 -5
index 902507aaae38..da48466480cb 100644
@@ -534,13 +534,13 @@ static int imx6_pcie_init_phy(void)
 
 int imx6_pcie_toggle_power(struct udevice *vpcie)
 {
-#ifdef CONFIG_PCIE_IMX_POWER_GPIO
-	gpio_request(CONFIG_PCIE_IMX_POWER_GPIO, "pcie_power");
-	gpio_direction_output(CONFIG_PCIE_IMX_POWER_GPIO, 0);
+#ifdef CFG_PCIE_IMX_POWER_GPIO
+	gpio_request(CFG_PCIE_IMX_POWER_GPIO, "pcie_power");
+	gpio_direction_output(CFG_PCIE_IMX_POWER_GPIO, 0);
 	mdelay(20);
-	gpio_set_value(CONFIG_PCIE_IMX_POWER_GPIO, 1);
+	gpio_set_value(CFG_PCIE_IMX_POWER_GPIO, 1);
 	mdelay(20);
-	gpio_free(CONFIG_PCIE_IMX_POWER_GPIO);
+	gpio_free(CFG_PCIE_IMX_POWER_GPIO);
 #endif
 
 #if CONFIG_IS_ENABLED(DM_REGULATOR)
include/configs/mx6sabresd.h +1 -1
index 116a9c6abcf3..1aa8a56cceb6 100644
@@ -21,7 +21,7 @@
 
 #ifdef CONFIG_CMD_PCI
 #define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(7, 12)
-#define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(3, 19)
+#define CFG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(3, 19)
 #endif
 
 /* PMIC */
include/configs/mx6sxsabresd.h +1 -1
index 85e5cfbb58db..fe0ad34ef9c1 100644
@@ -124,7 +124,7 @@
 
 #ifdef CONFIG_CMD_PCI
 #define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(2, 0)
-#define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(2, 1)
+#define CFG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(2, 1)
 #endif
 
 #define MXS_LCDIF_BASE MX6SX_LCDIF1_BASE_ADDR
include/configs/novena.h +1 -1
index 1c695159dd8b..aecc75c050d8 100644
@@ -46,7 +46,7 @@
 /* PCI express */
 #ifdef CONFIG_CMD_PCI
 #define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(3, 29)
-#define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(7, 12)
+#define CFG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(7, 12)
 #endif
 
 /* PMIC */
scripts/config_whitelist.txt +1 -1
index 392756572f81..adf41306e819 100644
@@ -151,7 +151,7 @@ CFG_ODROID_REV_AIN
 CFG_OTHBOOTARGS
 CFG_OVERWRITE_ETHADDR_ONCE
 CFG_PCIE_IMX_PERST_GPIO
-CONFIG_PCIE_IMX_POWER_GPIO
+CFG_PCIE_IMX_POWER_GPIO
 CONFIG_PEN_ADDR_BIG_ENDIAN
 CONFIG_PHY_BASE_ADR
 CONFIG_PHY_ET1011C_TX_CLK_FIX
Signature · 1 line
2.25.1
author
#190 lore raw

PATCH 143/241 global: Migrate CONFIG_PEN_ADDR_BIG_ENDIAN to CFG

In reply to Tom Rini
---
 arch/arm/cpu/armv7/nonsec_virt.S | 2 +-
 include/configs/ls1021aiot.h     | 2 +-
 include/configs/ls1021aqds.h     | 2 +-
 include/configs/ls1021atwr.h     | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/cpu/armv7/nonsec_virt.S +1 -1
index b6d144f065d2..51beda79c967 100644
@@ -211,7 +211,7 @@ ENTRY(smp_waitloop)
 	wfi
 	ldr	r1, =CONFIG_SMP_PEN_ADDR	@ load start address
 	ldr	r1, [r1]
-#ifdef CONFIG_PEN_ADDR_BIG_ENDIAN
+#ifdef CFG_PEN_ADDR_BIG_ENDIAN
 	rev	r1, r1
 #endif
 	cmp	r0, r1			@ make sure we dont execute this code
include/configs/ls1021aiot.h +1 -1
index 7a9a89d02390..cc6d07b40620 100644
@@ -89,7 +89,7 @@
 
 #define FSL_PCIE_COMPAT		"fsl,ls1021a-pcie"
 
-#define CONFIG_PEN_ADDR_BIG_ENDIAN
+#define CFG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR		0x01ee0200
 
 #define HWCONFIG_BUFFER_SIZE		256
include/configs/ls1021aqds.h +1 -1
index be05ab9de8cb..ccbf7c2e70dc 100644
@@ -273,7 +273,7 @@
 #define TSEC3_PHYIDX			0
 #endif
 
-#define CONFIG_PEN_ADDR_BIG_ENDIAN
+#define CFG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR		0x01ee0200
 
 #define HWCONFIG_BUFFER_SIZE		256
include/configs/ls1021atwr.h +1 -1
index da1e409e5c77..a554ee459042 100644
@@ -154,7 +154,7 @@
 
 /* GPIO */
 
-#define CONFIG_PEN_ADDR_BIG_ENDIAN
+#define CFG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR		0x01ee0200
 
 #define HWCONFIG_BUFFER_SIZE		256
scripts/config_whitelist.txt +1 -1
index adf41306e819..ca5faaeea1a3 100644
@@ -152,7 +152,7 @@ CFG_OTHBOOTARGS
 CFG_OVERWRITE_ETHADDR_ONCE
 CFG_PCIE_IMX_PERST_GPIO
 CFG_PCIE_IMX_POWER_GPIO
-CONFIG_PEN_ADDR_BIG_ENDIAN
+CFG_PEN_ADDR_BIG_ENDIAN
 CONFIG_PHY_BASE_ADR
 CONFIG_PHY_ET1011C_TX_CLK_FIX
 CONFIG_PHY_ID
Signature · 1 line
2.25.1
author
#191 lore raw

PATCH 144/241 global: Migrate CONFIG_PHY_BASE_ADR to CFG

In reply to Tom Rini
---
 drivers/net/mvgbe.h            | 4 ++--
 include/configs/SBx81LIFKW.h   | 2 +-
 include/configs/SBx81LIFXCAT.h | 2 +-
 include/configs/dockstar.h     | 2 +-
 include/configs/dreamplug.h    | 2 +-
 include/configs/ds109.h        | 2 +-
 include/configs/goflexhome.h   | 2 +-
 include/configs/guruplug.h     | 2 +-
 include/configs/ib62x0.h       | 2 +-
 include/configs/iconnect.h     | 2 +-
 include/configs/nas220.h       | 2 +-
 include/configs/nsa310s.h      | 2 +-
 include/configs/openrd.h       | 4 ++--
 include/configs/pogo_e02.h     | 2 +-
 include/configs/pogo_v4.h      | 2 +-
 include/configs/sheevaplug.h   | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 17 files changed, 19 insertions(+), 19 deletions(-)
drivers/net/mvgbe.h +2 -2
index 44541c0a85e3..bc0c32957204 100644
@@ -12,8 +12,8 @@
 #define __MVGBE_H__
 
 /* PHY_BASE_ADR is board specific and can be configured */
-#if defined (CONFIG_PHY_BASE_ADR)
-#define PHY_BASE_ADR		CONFIG_PHY_BASE_ADR
+#if defined (CFG_PHY_BASE_ADR)
+#define PHY_BASE_ADR		CFG_PHY_BASE_ADR
 #else
 #define PHY_BASE_ADR		0x08	/* default phy base addr */
 #endif
include/configs/SBx81LIFKW.h +1 -1
index 861ae530336a..3585d5f1b021 100644
@@ -44,7 +44,7 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable a single port */
-#define CONFIG_PHY_BASE_ADR	0x01
+#define CFG_PHY_BASE_ADR	0x01
 #endif /* CONFIG_CMD_NET */
 
 #endif /* _CONFIG_SBX81LIFKW_H */
include/configs/SBx81LIFXCAT.h +1 -1
index 418221ca72b3..4b1c9f995fb0 100644
@@ -49,7 +49,7 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable a single port */
-#define CONFIG_PHY_BASE_ADR	0x01
+#define CFG_PHY_BASE_ADR	0x01
 #endif /* CONFIG_CMD_NET */
 
 #endif /* _CONFIG_SBX81LIFXCAT_H */
include/configs/dockstar.h +1 -1
index 68afe96239e6..bef274431261 100644
@@ -32,6 +32,6 @@
  * Ethernet Driver configuration
  */
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0
+#define CFG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_DOCKSTAR_H */
include/configs/dreamplug.h +1 -1
index 2b312e52b135..c258eadd6d9b 100644
@@ -28,6 +28,6 @@
  * Ethernet Driver configuration
  */
 #define CFG_MVGBE_PORTS	{1, 1}	/* enable both ports */
-#define CONFIG_PHY_BASE_ADR	0
+#define CFG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_DREAMPLUG_H */
include/configs/ds109.h +1 -1
index a5f62497a731..123ebf751f37 100644
@@ -40,7 +40,7 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable one port */
-#define CONFIG_PHY_BASE_ADR	8
+#define CFG_PHY_BASE_ADR	8
 #endif /* CONFIG_CMD_NET */
 
 #endif /* _CONFIG_DS109_H */
include/configs/goflexhome.h +1 -1
index c10e991d6589..10f2715c8b2a 100644
@@ -40,6 +40,6 @@
  * Ethernet Driver configuration
  */
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0
+#define CFG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_GOFLEXHOME_H */
include/configs/guruplug.h +1 -1
index b21151e312c9..f78981c5b4e6 100644
@@ -35,7 +35,7 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CFG_MVGBE_PORTS	{1, 1}	/* enable both ports */
-#define CONFIG_PHY_BASE_ADR	0
+#define CFG_PHY_BASE_ADR	0
 #endif /* CONFIG_CMD_NET */
 
 #endif /* _CONFIG_GURUPLUG_H */
include/configs/ib62x0.h +1 -1
index 5eeaeadd4bec..3dab13863051 100644
@@ -29,7 +29,7 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0
+#define CFG_PHY_BASE_ADR	0
 #endif /* CONFIG_CMD_NET */
 
 /*
include/configs/iconnect.h +1 -1
index 12f8a3c933cc..bb0813053256 100644
@@ -23,7 +23,7 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	11
+#define CFG_PHY_BASE_ADR	11
 #endif /* CONFIG_CMD_NET */
 
 #endif /* _CONFIG_ICONNECT_H */
include/configs/nas220.h +1 -1
index bfa132dbfe58..149a1e20af40 100644
@@ -44,7 +44,7 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CFG_MVGBE_PORTS {1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR 8
+#define CFG_PHY_BASE_ADR 8
 #endif /* CONFIG_CMD_NET */
 
 /*
include/configs/nsa310s.h +1 -1
index 85cbd0bab07d..765268cba3ca 100644
@@ -48,6 +48,6 @@
 
 /* Ethernet driver configuration */
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	1
+#define CFG_PHY_BASE_ADR	1
 
 #endif /* _CONFIG_NSA310S_H */
include/configs/openrd.h +2 -2
index 1d1915a98520..413ca37e861d 100644
@@ -43,10 +43,10 @@
 #  define CFG_MVGBE_PORTS	{1, 1}	/* enable both ports */
 # endif
 # ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE
-#  define CONFIG_PHY_BASE_ADR	0x0
+#  define CFG_PHY_BASE_ADR	0x0
 #  define PHY_NO		"88E1121"
 # else
-#  define CONFIG_PHY_BASE_ADR	0x8
+#  define CFG_PHY_BASE_ADR	0x8
 #  define PHY_NO		"88E1116"
 # endif
 #endif /* CONFIG_CMD_NET */
include/configs/pogo_e02.h +1 -1
index c48590123bd2..17fb475f56a7 100644
@@ -27,6 +27,6 @@
  * Ethernet Driver configuration
  */
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0
+#define CFG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_POGO_E02_H */
include/configs/pogo_v4.h +1 -1
index 5d26a45f1426..9d6064f1e631 100644
@@ -73,6 +73,6 @@
  * Ethernet Driver configuration
  */
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0
+#define CFG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_POGO_V4_H */
include/configs/sheevaplug.h +1 -1
index d4d968285fbd..9f78e1ac9a27 100644
@@ -25,6 +25,6 @@
  * Ethernet Driver configuration
  */
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0
+#define CFG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_SHEEVAPLUG_H */
scripts/config_whitelist.txt +1 -1
index ca5faaeea1a3..5788c297fc21 100644
@@ -153,7 +153,7 @@ CFG_OVERWRITE_ETHADDR_ONCE
 CFG_PCIE_IMX_PERST_GPIO
 CFG_PCIE_IMX_POWER_GPIO
 CFG_PEN_ADDR_BIG_ENDIAN
-CONFIG_PHY_BASE_ADR
+CFG_PHY_BASE_ADR
 CONFIG_PHY_ET1011C_TX_CLK_FIX
 CONFIG_PHY_ID
 CONFIG_PHY_INTERFACE_MODE
Signature · 1 line
2.25.1
author
#192 lore raw

PATCH 145/241 global: Migrate CONFIG_PHY_ET1011C_TX_CLK_FIX to CFG

In reply to Tom Rini
---
 drivers/net/phy/et1011c.c    | 2 +-
 include/configs/ti814x_evm.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/phy/et1011c.c +1 -1
index c243c5b72f81..7eff5ec7cacb 100644
@@ -60,7 +60,7 @@ static int et1011c_parse_status(struct phy_device *phydev)
 			  mii_reg |
 			  ET1011C_GMII_INTERFACE |
 			  ET1011C_SYS_CLK_EN |
-#ifdef CONFIG_PHY_ET1011C_TX_CLK_FIX
+#ifdef CFG_PHY_ET1011C_TX_CLK_FIX
 			  ET1011C_TX_CLK_EN |
 #endif
 			  ET1011C_TX_FIFO_DEPTH_16);
include/configs/ti814x_evm.h +1 -1
index 11e1936c2562..e67f2a2287de 100644
@@ -97,6 +97,6 @@
  */
 
 /* Ethernet */
-#define CONFIG_PHY_ET1011C_TX_CLK_FIX
+#define CFG_PHY_ET1011C_TX_CLK_FIX
 
 #endif	/* ! __CONFIG_TI814X_EVM_H */
scripts/config_whitelist.txt +1 -1
index 5788c297fc21..ebbc0b068611 100644
@@ -154,7 +154,7 @@ CFG_PCIE_IMX_PERST_GPIO
 CFG_PCIE_IMX_POWER_GPIO
 CFG_PEN_ADDR_BIG_ENDIAN
 CFG_PHY_BASE_ADR
-CONFIG_PHY_ET1011C_TX_CLK_FIX
+CFG_PHY_ET1011C_TX_CLK_FIX
 CONFIG_PHY_ID
 CONFIG_PHY_INTERFACE_MODE
 CONFIG_PHY_IRAM_BASE
Signature · 1 line
2.25.1
author
#193 lore raw

PATCH 146/241 global: Migrate CONFIG_PHY_ID to CFG

In reply to Tom Rini
---
 board/egnite/ethernut5/ethernut5.c | 2 +-
 include/configs/ethernut5.h        | 2 +-
 scripts/config_whitelist.txt       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
board/egnite/ethernut5/ethernut5.c +1 -1
index ceb0d2cf0aa3..9953df017e19 100644
@@ -160,7 +160,7 @@ int board_eth_init(struct bd_info *bis)
 	/* Set peripheral pins. */
 	at91_macb_hw_init();
 	/* Basic EMAC initialization. */
-	if (macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC0, CONFIG_PHY_ID))
+	if (macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC0, CFG_PHY_ID))
 		return -1;
 	/*
 	 * Early board revisions have a pull-down at the PHY's MODE0
include/configs/ethernut5.h +1 -1
index 2859188e60c9..18c643478f76 100644
@@ -48,7 +48,7 @@
 /* JFFS2 */
 
 /* Ethernet */
-#define CONFIG_PHY_ID			0
+#define CFG_PHY_ID			0
 #define CFG_MACB_SEARCH_PHY
 
 /* MMC */
scripts/config_whitelist.txt +1 -1
index ebbc0b068611..664b59d44050 100644
@@ -155,7 +155,7 @@ CFG_PCIE_IMX_POWER_GPIO
 CFG_PEN_ADDR_BIG_ENDIAN
 CFG_PHY_BASE_ADR
 CFG_PHY_ET1011C_TX_CLK_FIX
-CONFIG_PHY_ID
+CFG_PHY_ID
 CONFIG_PHY_INTERFACE_MODE
 CONFIG_PHY_IRAM_BASE
 CONFIG_PL011_CLOCK
Signature · 1 line
2.25.1
author
#194 lore raw

PATCH 147/241 global: Migrate CONFIG_PHY_INTERFACE_MODE to CFG

In reply to Tom Rini
---
 include/configs/socfpga_sr1500.h | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/socfpga_sr1500.h +1 -1
index 432144cb40ce..70df27241ca6 100644
@@ -11,7 +11,7 @@
 #define PHYS_SDRAM_1_SIZE		0x40000000	/* 1GiB on SR1500 */
 
 /* Ethernet on SoC (EMAC) */
-#define CONFIG_PHY_INTERFACE_MODE	PHY_INTERFACE_MODE_RGMII
+#define CFG_PHY_INTERFACE_MODE	PHY_INTERFACE_MODE_RGMII
 /* The PHY is autodetected, so no MII PHY address is needed here */
 #define PHY_ANEG_TIMEOUT	8000
 
scripts/config_whitelist.txt +1 -1
index 664b59d44050..9438ee6afdd7 100644
@@ -156,7 +156,7 @@ CFG_PEN_ADDR_BIG_ENDIAN
 CFG_PHY_BASE_ADR
 CFG_PHY_ET1011C_TX_CLK_FIX
 CFG_PHY_ID
-CONFIG_PHY_INTERFACE_MODE
+CFG_PHY_INTERFACE_MODE
 CONFIG_PHY_IRAM_BASE
 CONFIG_PL011_CLOCK
 CONFIG_PL01x_PORTS
Signature · 1 line
2.25.1
author
#195 lore raw

PATCH 148/241 global: Migrate CONFIG_PHY_IRAM_BASE to CFG

In reply to Tom Rini
---
 arch/arm/mach-exynos/lowlevel_init.c | 6 +++---
 include/configs/exynos5420-common.h  | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-exynos/lowlevel_init.c +3 -3
index 243b5c80c90e..c57b8aee7989 100644
@@ -77,10 +77,10 @@ static void low_power_start(void)
 		branch_bx(0x0);
 	}
 
-	reg_val = readl(CONFIG_PHY_IRAM_BASE + 0x4);
+	reg_val = readl(CFG_PHY_IRAM_BASE + 0x4);
 	if (reg_val != (uint32_t)&low_power_start) {
 		/* Store jump address as low_power_start if not present */
-		writel((uint32_t)&low_power_start, CONFIG_PHY_IRAM_BASE + 0x4);
+		writel((uint32_t)&low_power_start, CFG_PHY_IRAM_BASE + 0x4);
 		dsb();
 		sev();
 	}
@@ -164,7 +164,7 @@ static void secondary_cores_configure(void)
 	writel((uint32_t)&low_power_start, CFG_LOWPOWER_ADDR);
 	writel(CPU_RST_FLAG_VAL, EXYNOS5420_SPARE_BASE);
 	/* Store jump address for power down */
-	writel((uint32_t)&power_down_core, CONFIG_PHY_IRAM_BASE + 0x4);
+	writel((uint32_t)&power_down_core, CFG_PHY_IRAM_BASE + 0x4);
 
 	/* Need all core power down check */
 	dsb();
include/configs/exynos5420-common.h +1 -1
index b617c062881b..791ad154242e 100644
@@ -12,7 +12,7 @@
 
 #define CFG_IRAM_TOP			0x02074000
 
-#define CONFIG_PHY_IRAM_BASE		0x02020000
+#define CFG_PHY_IRAM_BASE		0x02020000
 
 /*
  * Low Power settings
scripts/config_whitelist.txt +1 -1
index 9438ee6afdd7..3e9d0d66f56d 100644
@@ -157,7 +157,7 @@ CFG_PHY_BASE_ADR
 CFG_PHY_ET1011C_TX_CLK_FIX
 CFG_PHY_ID
 CFG_PHY_INTERFACE_MODE
-CONFIG_PHY_IRAM_BASE
+CFG_PHY_IRAM_BASE
 CONFIG_PL011_CLOCK
 CONFIG_PL01x_PORTS
 CONFIG_PME_PLAT_CLK_DIV
Signature · 1 line
2.25.1
author
#196 lore raw

PATCH 149/241 global: Migrate CONFIG_PL011_CLOCK to CFG

In reply to Tom Rini
---
 README                                     | 2 +-
 arch/arm/cpu/armv7/s5p4418/cpu.c           | 2 +-
 board/armltd/total_compute/total_compute.c | 2 +-
 board/armltd/vexpress64/vexpress64.c       | 2 +-
 drivers/serial/serial_pl01x.c              | 8 ++++----
 include/configs/corstone1000.h             | 2 +-
 include/configs/highbank.h                 | 2 +-
 include/configs/lx2160a_common.h           | 2 +-
 include/configs/mxs.h                      | 2 +-
 include/configs/s5p4418_nanopi2.h          | 2 +-
 include/configs/synquacer.h                | 2 +-
 include/configs/thunderx_88xx.h            | 2 +-
 include/configs/total_compute.h            | 2 +-
 include/configs/vexpress_aemv8.h           | 4 ++--
 include/configs/vexpress_common.h          | 2 +-
 scripts/config_whitelist.txt               | 2 +-
 16 files changed, 20 insertions(+), 20 deletions(-)
README +1 -1
index d3659e7b54a2..1eda285312be 100644
@@ -419,7 +419,7 @@ The following options need to be configured:
 					controller register space
 
 - Serial Ports:
-		CONFIG_PL011_CLOCK
+		CFG_PL011_CLOCK
 
 		If you have Amba PrimeCell PL011 UARTs, set this variable to
 		the clock speed of the UARTs.
arch/arm/cpu/armv7/s5p4418/cpu.c +1 -1
index 3baa761ec7a9..7ba9c0b03236 100644
@@ -64,7 +64,7 @@ static void serial_device_init(void)
 
 	/* set clock   */
 	clk_disable(clk);
-	clk_set_rate(clk, CONFIG_PL011_CLOCK);
+	clk_set_rate(clk, CFG_PL011_CLOCK);
 	clk_enable(clk);
 }
 #endif
board/armltd/total_compute/total_compute.c +1 -1
index b7772f79a31a..53941b5f5f28 100644
@@ -13,7 +13,7 @@
 static const struct pl01x_serial_plat serial_plat = {
 	.base = UART0_BASE,
 	.type = TYPE_PL011,
-	.clock = CONFIG_PL011_CLOCK,
+	.clock = CFG_PL011_CLOCK,
 };
 
 U_BOOT_DRVINFO(total_compute_serials) = {
board/armltd/vexpress64/vexpress64.c +1 -1
index 4ca544f1017d..99fb67ecedc2 100644
@@ -29,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR;
 static const struct pl01x_serial_plat serial_plat = {
 	.base = V2M_UART0,
 	.type = TYPE_PL011,
-	.clock = CONFIG_PL011_CLOCK,
+	.clock = CFG_PL011_CLOCK,
 };
 
 U_BOOT_DRVINFO(vexpress_serials) = {
drivers/serial/serial_pl01x.c +4 -4
index d3c3d3e2d188..dd2881931dfd 100644
@@ -193,7 +193,7 @@ static void pl01x_serial_init_baud(int baudrate)
 
 #if defined(CONFIG_PL011_SERIAL)
 	pl01x_type = TYPE_PL011;
-	clock = CONFIG_PL011_CLOCK;
+	clock = CFG_PL011_CLOCK;
 #endif
 	base_regs = (struct pl01x_regs *)port[CONFIG_CONS_INDEX];
 
@@ -343,8 +343,8 @@ static const struct udevice_id pl01x_serial_id[] ={
 	{}
 };
 
-#ifndef CONFIG_PL011_CLOCK
-#define CONFIG_PL011_CLOCK 0
+#ifndef CFG_PL011_CLOCK
+#define CFG_PL011_CLOCK 0
 #endif
 
 int pl01x_serial_of_to_plat(struct udevice *dev)
@@ -359,7 +359,7 @@ int pl01x_serial_of_to_plat(struct udevice *dev)
 		return -EINVAL;
 
 	plat->base = addr;
-	plat->clock = dev_read_u32_default(dev, "clock", CONFIG_PL011_CLOCK);
+	plat->clock = dev_read_u32_default(dev, "clock", CFG_PL011_CLOCK);
 	ret = clk_get_by_index(dev, 0, &clk);
 	if (!ret) {
 		ret = clk_enable(&clk);
include/configs/corstone1000.h +1 -1
index 8aec52d508e2..3347c11792d5 100644
@@ -16,7 +16,7 @@
 
 #define V2M_BASE		0x80000000
 
-#define CONFIG_PL011_CLOCK	50000000
+#define CFG_PL011_CLOCK	50000000
 
 /* Physical Memory Map */
 #define PHYS_SDRAM_1		(V2M_BASE)
include/configs/highbank.h +1 -1
index 76e6054b0cc1..97bb439f7357 100644
@@ -8,7 +8,7 @@
 
 #define CFG_SYS_BOOTMAPSZ		(16 << 20)
 
-#define CONFIG_PL011_CLOCK		150000000
+#define CFG_PL011_CLOCK		150000000
 
 /*
  * Miscellaneous configurable options
include/configs/lx2160a_common.h +1 -1
index 0fc32efabc7f..ea59f772064a 100644
@@ -41,7 +41,7 @@
 
 
 /* Serial Port */
-#define CONFIG_PL011_CLOCK		(get_bus_freq(0) / 4)
+#define CFG_PL011_CLOCK		(get_bus_freq(0) / 4)
 #define CFG_SYS_SERIAL0		0x21c0000
 #define CFG_SYS_SERIAL1		0x21d0000
 #define CFG_SYS_SERIAL2		0x21e0000
include/configs/mxs.h +1 -1
index 30f27e7f0c19..212d2201e7cc 100644
@@ -77,7 +77,7 @@
  * DUART Serial Driver.
  * Conflicts with AUART driver which can be set by board.
  */
-#define CONFIG_PL011_CLOCK		24000000
+#define CFG_PL011_CLOCK		24000000
 #define CONFIG_PL01x_PORTS		{ (void *)MXS_UARTDBG_BASE }
 /* Default baudrate can be overridden by board! */
 
include/configs/s5p4418_nanopi2.h +1 -1
index 02c469049adb..c9cef6a77c62 100644
@@ -78,7 +78,7 @@
 /*-----------------------------------------------------------------------
  * serial console configuration
  */
-#define CONFIG_PL011_CLOCK		50000000
+#define CFG_PL011_CLOCK		50000000
 #define CONFIG_PL01x_PORTS		{(void *)PHY_BASEADDR_UART0, \
 					 (void *)PHY_BASEADDR_UART1, \
 					 (void *)PHY_BASEADDR_UART2, \
include/configs/synquacer.h +1 -1
index fa522ce82883..d0b56cb48f7d 100644
@@ -32,7 +32,7 @@
 
 /* Serial (pl011)       */
 #define UART_CLK			(62500000)
-#define CONFIG_PL011_CLOCK		UART_CLK
+#define CFG_PL011_CLOCK		UART_CLK
 #define CONFIG_PL01x_PORTS		{(void *)(0x2a400000)}
 
 /* Support MTD */
include/configs/thunderx_88xx.h +1 -1
index 8ba40546b2c0..2bca86bed939 100644
@@ -17,7 +17,7 @@
 
 /* PL011 Serial Configuration */
 
-#define CONFIG_PL011_CLOCK		24000000
+#define CFG_PL011_CLOCK		24000000
 
 /* Generic Interrupt Controller Definitions */
 #define GICD_BASE			(0x801000000000)
include/configs/total_compute.h +1 -1
index e007be8e4564..436bf622e174 100644
@@ -14,7 +14,7 @@
 #define UART0_BASE		0x7ff80000
 
 /* PL011 Serial Configuration */
-#define CONFIG_PL011_CLOCK	7372800
+#define CFG_PL011_CLOCK	7372800
 
 /* Miscellaneous configurable options */
 
include/configs/vexpress_aemv8.h +2 -2
index 87b8c5d57ee7..43f7e454d812 100644
@@ -86,9 +86,9 @@
 
 /* PL011 Serial Configuration */
 #ifdef CONFIG_TARGET_VEXPRESS64_JUNO
-#define CONFIG_PL011_CLOCK		7372800
+#define CFG_PL011_CLOCK		7372800
 #else
-#define CONFIG_PL011_CLOCK		24000000
+#define CFG_PL011_CLOCK		24000000
 #endif
 
 /* Physical Memory Map */
include/configs/vexpress_common.h +1 -1
index 705a941e3603..3fc70de57713 100644
@@ -116,7 +116,7 @@
 #define CFG_SYS_TIMER_COUNTER	(V2M_TIMER01 + 0x4)
 
 /* PL011 Serial Configuration */
-#define CONFIG_PL011_CLOCK		24000000
+#define CFG_PL011_CLOCK		24000000
 #define CONFIG_PL01x_PORTS		{(void *)CFG_SYS_SERIAL0, \
 					 (void *)CFG_SYS_SERIAL1}
 
scripts/config_whitelist.txt +1 -1
index 3e9d0d66f56d..0ea10f2edb32 100644
@@ -158,7 +158,7 @@ CFG_PHY_ET1011C_TX_CLK_FIX
 CFG_PHY_ID
 CFG_PHY_INTERFACE_MODE
 CFG_PHY_IRAM_BASE
-CONFIG_PL011_CLOCK
+CFG_PL011_CLOCK
 CONFIG_PL01x_PORTS
 CONFIG_PME_PLAT_CLK_DIV
 CONFIG_POST
Signature · 1 line
2.25.1
author
#197 lore raw

PATCH 150/241 global: Migrate CONFIG_PL01x_PORTS to CFG

In reply to Tom Rini
---
 README                            | 2 +-
 drivers/serial/serial_pl01x.c     | 2 +-
 include/configs/lx2160a_common.h  | 2 +-
 include/configs/mxs.h             | 2 +-
 include/configs/s5p4418_nanopi2.h | 2 +-
 include/configs/synquacer.h       | 2 +-
 include/configs/vexpress_common.h | 2 +-
 scripts/config_whitelist.txt      | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
README +1 -1
index 1eda285312be..3e5af3e204c3 100644
@@ -424,7 +424,7 @@ The following options need to be configured:
 		If you have Amba PrimeCell PL011 UARTs, set this variable to
 		the clock speed of the UARTs.
 
-		CONFIG_PL01x_PORTS
+		CFG_PL01x_PORTS
 
 		If you have Amba PrimeCell PL010 or PL011 UARTs on your board,
 		define this to a list of base addresses for each (supported)
drivers/serial/serial_pl01x.c +1 -1
index dd2881931dfd..7449e9b90430 100644
@@ -29,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #ifndef CONFIG_DM_SERIAL
 
-static volatile unsigned char *const port[] = CONFIG_PL01x_PORTS;
+static volatile unsigned char *const port[] = CFG_PL01x_PORTS;
 static enum pl01x_type pl01x_type __section(".data");
 static struct pl01x_regs *base_regs __section(".data");
 #define NUM_PORTS (sizeof(port)/sizeof(port[0]))
include/configs/lx2160a_common.h +1 -1
index ea59f772064a..dea14f28828d 100644
@@ -47,7 +47,7 @@
 #define CFG_SYS_SERIAL2		0x21e0000
 #define CFG_SYS_SERIAL3		0x21f0000
 /*below might needs to be removed*/
-#define CONFIG_PL01x_PORTS		{(void *)CFG_SYS_SERIAL0, \
+#define CFG_PL01x_PORTS		{(void *)CFG_SYS_SERIAL0, \
 					(void *)CFG_SYS_SERIAL1, \
 					(void *)CFG_SYS_SERIAL2, \
 					(void *)CFG_SYS_SERIAL3 }
include/configs/mxs.h +1 -1
index 212d2201e7cc..17b4295d2d6d 100644
@@ -78,7 +78,7 @@
  * Conflicts with AUART driver which can be set by board.
  */
 #define CFG_PL011_CLOCK		24000000
-#define CONFIG_PL01x_PORTS		{ (void *)MXS_UARTDBG_BASE }
+#define CFG_PL01x_PORTS		{ (void *)MXS_UARTDBG_BASE }
 /* Default baudrate can be overridden by board! */
 
 /* NAND */
include/configs/s5p4418_nanopi2.h +1 -1
index c9cef6a77c62..c192d733c1db 100644
@@ -79,7 +79,7 @@
  * serial console configuration
  */
 #define CFG_PL011_CLOCK		50000000
-#define CONFIG_PL01x_PORTS		{(void *)PHY_BASEADDR_UART0, \
+#define CFG_PL01x_PORTS		{(void *)PHY_BASEADDR_UART0, \
 					 (void *)PHY_BASEADDR_UART1, \
 					 (void *)PHY_BASEADDR_UART2, \
 					 (void *)PHY_BASEADDR_UART3}
include/configs/synquacer.h +1 -1
index d0b56cb48f7d..be606ce2955b 100644
@@ -33,7 +33,7 @@
 /* Serial (pl011)       */
 #define UART_CLK			(62500000)
 #define CFG_PL011_CLOCK		UART_CLK
-#define CONFIG_PL01x_PORTS		{(void *)(0x2a400000)}
+#define CFG_PL01x_PORTS		{(void *)(0x2a400000)}
 
 /* Support MTD */
 #define CFG_SYS_FLASH_BASE		(0x08000000)
include/configs/vexpress_common.h +1 -1
index 3fc70de57713..ba7731bfca6b 100644
@@ -117,7 +117,7 @@
 
 /* PL011 Serial Configuration */
 #define CFG_PL011_CLOCK		24000000
-#define CONFIG_PL01x_PORTS		{(void *)CFG_SYS_SERIAL0, \
+#define CFG_PL01x_PORTS		{(void *)CFG_SYS_SERIAL0, \
 					 (void *)CFG_SYS_SERIAL1}
 
 #define CFG_SYS_SERIAL0		V2M_UART0
scripts/config_whitelist.txt +1 -1
index 0ea10f2edb32..390299fa0a8f 100644
@@ -159,7 +159,7 @@ CFG_PHY_ID
 CFG_PHY_INTERFACE_MODE
 CFG_PHY_IRAM_BASE
 CFG_PL011_CLOCK
-CONFIG_PL01x_PORTS
+CFG_PL01x_PORTS
 CONFIG_PME_PLAT_CLK_DIV
 CONFIG_POST
 CONFIG_POSTBOOTMENU
Signature · 1 line
2.25.1
author
#198 lore raw

PATCH 151/241 global: Migrate CONFIG_PME_PLAT_CLK_DIV to CFG

In reply to Tom Rini
---
 arch/powerpc/cpu/mpc85xx/speed.c          | 6 +++---
 arch/powerpc/include/asm/config_mpc85xx.h | 8 ++++----
 scripts/config_whitelist.txt              | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
arch/powerpc/cpu/mpc85xx/speed.c +3 -3
index eec071022e59..c2e3e00f7ba8 100644
@@ -67,7 +67,7 @@ void get_sys_info(sys_info_t *sys_info)
 		[14] = 4,	/* CC4 PPL / 4 */
 	};
 	uint i, freq_c_pll[CONFIG_SYS_FSL_NUM_CC_PLLS];
-#if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
+#if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CFG_PME_PLAT_CLK_DIV)
 	uint rcw_tmp;
 #endif
 	uint ratio[CONFIG_SYS_FSL_NUM_CC_PLLS];
@@ -206,7 +206,7 @@ void get_sys_info(sys_info_t *sys_info)
 #define FM1_CLK_SEL	0x1c000000
 #define FM1_CLK_SHIFT	26
 #endif
-#if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
+#if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CFG_PME_PLAT_CLK_DIV)
 #if defined(CONFIG_ARCH_T1024)
 	rcw_tmp = in_be32(&gur->rcwsr[15]) - 4;
 #else
@@ -215,7 +215,7 @@ void get_sys_info(sys_info_t *sys_info)
 #endif
 
 #ifdef CONFIG_SYS_DPAA_PME
-#ifndef CONFIG_PME_PLAT_CLK_DIV
+#ifndef CFG_PME_PLAT_CLK_DIV
 	switch ((rcw_tmp & PME_CLK_SEL) >> PME_CLK_SHIFT) {
 	case 1:
 		sys_info->freq_pme = freq_c_pll[CFG_SYS_PME_CLK];
arch/powerpc/include/asm/config_mpc85xx.h +4 -4
index 24259f6470ae..4c19c50bda04 100644
@@ -172,8 +172,8 @@
 #define CONFIG_SYS_FSL_SRDS_1
 #define CFG_SYS_NUM_FMAN		1
 #define CFG_SYS_NUM_FM1_DTSEC	5
-#define CONFIG_PME_PLAT_CLK_DIV		2
-#define CFG_SYS_PME_CLK		CONFIG_PME_PLAT_CLK_DIV
+#define CFG_PME_PLAT_CLK_DIV		2
+#define CFG_SYS_PME_CLK		CFG_PME_PLAT_CLK_DIV
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_FM_PLAT_CLK_DIV	1
 #define CFG_SYS_FM1_CLK		CFG_FM_PLAT_CLK_DIV
@@ -211,8 +211,8 @@
 #define CFG_SYS_FSL_SRIO_OB_WIN_NUM	9
 #define CFG_SYS_FSL_SRIO_IB_WIN_NUM	5
 #endif
-#define CONFIG_PME_PLAT_CLK_DIV		1
-#define CFG_SYS_PME_CLK		CONFIG_PME_PLAT_CLK_DIV
+#define CFG_PME_PLAT_CLK_DIV		1
+#define CFG_SYS_PME_CLK		CFG_PME_PLAT_CLK_DIV
 #define CFG_SYS_FM1_CLK		0
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_SYS_FM_MURAM_SIZE	0x28000
scripts/config_whitelist.txt +1 -1
index 390299fa0a8f..2b3e4a79a00c 100644
@@ -160,7 +160,7 @@ CFG_PHY_INTERFACE_MODE
 CFG_PHY_IRAM_BASE
 CFG_PL011_CLOCK
 CFG_PL01x_PORTS
-CONFIG_PME_PLAT_CLK_DIV
+CFG_PME_PLAT_CLK_DIV
 CONFIG_POST
 CONFIG_POSTBOOTMENU
 CONFIG_POST_EXTERNAL_WORD_FUNCS
Signature · 1 line
2.25.1
author
#199 lore raw

PATCH 152/241 global: Migrate CONFIG_POSTBOOTMENU to CFG

In reply to Tom Rini
---
 cmd/bootmenu.c               | 4 ++--
 include/configs/nokia_rx51.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
cmd/bootmenu.c +2 -2
index 3340be16325b..e5a10f5d5c4d 100644
@@ -577,8 +577,8 @@ cleanup:
 		free(command);
 	}
 
-#ifdef CONFIG_POSTBOOTMENU
-	run_command(CONFIG_POSTBOOTMENU, 0);
+#ifdef CFG_POSTBOOTMENU
+	run_command(CFG_POSTBOOTMENU, 0);
 #endif
 
 	if (efi_ret != EFI_SUCCESS || cmd_ret != CMD_RET_SUCCESS)
include/configs/nokia_rx51.h +1 -1
index 96c23b5b5af7..5f4378f4c86f 100644
@@ -127,7 +127,7 @@
 	"bootmenu_delay=30\0" \
 	""
 
-#define CONFIG_POSTBOOTMENU \
+#define CFG_POSTBOOTMENU \
 	"echo;" \
 	"echo Extra commands:;" \
 	"echo run sdboot - Boot from SD card slot.;" \
Signature · 1 line
2.25.1
author
#200 lore raw

PATCH 153/241 global: Migrate CONFIG_POWER_LTC3676_I2C_ADDR to CFG

In reply to Tom Rini
---
 board/gateworks/gw_ventana/gw_ventana_spl.c | 4 ++--
 drivers/power/pmic/pmic_ltc3676.c           | 2 +-
 include/configs/gw_ventana.h                | 2 +-
 scripts/config_whitelist.txt                | 6 ++----
 4 files changed, 6 insertions(+), 8 deletions(-)
board/gateworks/gw_ventana/gw_ventana_spl.c +2 -2
index e85a00954cee..6ad994af1c64 100644
@@ -851,8 +851,8 @@ void setup_pmic(void)
 	}
 
 	/* configure LTC3676 PMIC */
-	else if (!i2c_probe(CONFIG_POWER_LTC3676_I2C_ADDR)) {
-		debug("probed LTC3676@0x%x\n", CONFIG_POWER_LTC3676_I2C_ADDR);
+	else if (!i2c_probe(CFG_POWER_LTC3676_I2C_ADDR)) {
+		debug("probed LTC3676@0x%x\n", CFG_POWER_LTC3676_I2C_ADDR);
 		power_ltc3676_init(i2c_pmic);
 		p = pmic_get("LTC3676_PMIC");
 		if (!p || pmic_probe(p))
drivers/power/pmic/pmic_ltc3676.c +1 -1
index 00c3e201cd56..af94f37b0f10 100644
@@ -23,7 +23,7 @@ int power_ltc3676_init(unsigned char bus)
 	p->name = name;
 	p->interface = PMIC_I2C;
 	p->number_of_regs = LTC3676_NUM_OF_REGS;
-	p->hw.i2c.addr = CONFIG_POWER_LTC3676_I2C_ADDR;
+	p->hw.i2c.addr = CFG_POWER_LTC3676_I2C_ADDR;
 	p->hw.i2c.tx_num = 1;
 	p->bus = bus;
 
include/configs/gw_ventana.h +1 -1
index 4741d399590c..577322a5987d 100644
@@ -31,7 +31,7 @@
  * PMIC
  */
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
-#define CONFIG_POWER_LTC3676_I2C_ADDR  0x3c
+#define CFG_POWER_LTC3676_I2C_ADDR  0x3c
 
 /* Various command support */
 
scripts/config_whitelist.txt +2 -4
index 2b3e4a79a00c..52a78f10cd52 100644
@@ -161,10 +161,8 @@ CFG_PHY_IRAM_BASE
 CFG_PL011_CLOCK
 CFG_PL01x_PORTS
 CFG_PME_PLAT_CLK_DIV
-CONFIG_POST
-CONFIG_POSTBOOTMENU
-CONFIG_POST_EXTERNAL_WORD_FUNCS
-CONFIG_POWER_LTC3676_I2C_ADDR
+CFG_POSTBOOTMENU
+CFG_POWER_LTC3676_I2C_ADDR
 CONFIG_POWER_PFUZE100_I2C_ADDR
 CONFIG_POWER_PFUZE3000_I2C_ADDR
 CONFIG_PPC_SPINTABLE_COMPATIBLE
Signature · 1 line
2.25.1
author
#201 lore raw

PATCH 156/241 global: Migrate CONFIG_PPC_SPINTABLE_COMPATIBLE to CFG

In reply to Tom Rini
---
 arch/powerpc/cpu/mpc85xx/cpu_init.c       | 4 ++--
 arch/powerpc/cpu/mpc85xx/release.S        | 6 +++---
 arch/powerpc/include/asm/config_mpc85xx.h | 2 +-
 scripts/config_whitelist.txt              | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
arch/powerpc/cpu/mpc85xx/cpu_init.c +2 -2
index 562d7074ed75..e5e00c5eade9 100644
@@ -659,7 +659,7 @@ int cpu_init_r(void)
 #ifdef CFG_SYS_LBC_LCRR
 	fsl_lbc_t *lbc = (void __iomem *)LBC_BASE_ADDR;
 #endif
-#if defined(CONFIG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP)
+#if defined(CFG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP)
 	extern int spin_table_compat;
 	const char *spin;
 #endif
@@ -725,7 +725,7 @@ int cpu_init_r(void)
 		mtspr(SPRN_HDBCR0, (mfspr(SPRN_HDBCR0) | 0x80000000));
 #endif
 
-#if defined(CONFIG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP)
+#if defined(CFG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP)
 	spin = env_get("spin_table_compat");
 	if (spin && (*spin == 'n'))
 		spin_table_compat = 0;
arch/powerpc/cpu/mpc85xx/release.S +3 -3
index 391751ce1e71..57cc4fda816c 100644
@@ -356,7 +356,7 @@ __secondary_reset_vector:
 	.align L1_CACHE_SHIFT
 	.global __second_half_boot_page
 __second_half_boot_page:
-#ifdef CONFIG_PPC_SPINTABLE_COMPATIBLE
+#ifdef CFG_PPC_SPINTABLE_COMPATIBLE
 	lis	r3,(spin_table_compat - __second_half_boot_page)@h
 	ori	r3,r3,(spin_table_compat - __second_half_boot_page)@l
 	add	r3,r3,r11 /* r11 has the address of __second_half_boot_page */
@@ -404,7 +404,7 @@ __second_half_boot_page:
  * "spin_table_compat=no". After Linux is fixed, we can remove this macro
  * and related code. For now, it is enabled by default.
  */
-#ifdef CONFIG_PPC_SPINTABLE_COMPATIBLE
+#ifdef CFG_PPC_SPINTABLE_COMPATIBLE
 	cmpwi   r14,0
 	beq     4f
 	dcbf    0, r10
@@ -486,7 +486,7 @@ __second_half_boot_page:
 __spin_table:
 	.space CONFIG_MAX_CPUS*ENTRY_SIZE
 
-#ifdef CONFIG_PPC_SPINTABLE_COMPATIBLE
+#ifdef CFG_PPC_SPINTABLE_COMPATIBLE
 	.align L1_CACHE_SHIFT
 	.global spin_table_compat
 spin_table_compat:
arch/powerpc/include/asm/config_mpc85xx.h +1 -1
index 4c19c50bda04..5491a1af2813 100644
@@ -12,7 +12,7 @@
  * This macro should be removed when we no longer care about backwards
  * compatibility with older operating systems.
  */
-#define CONFIG_PPC_SPINTABLE_COMPATIBLE
+#define CFG_PPC_SPINTABLE_COMPATIBLE
 
 #include <fsl_ddrc_version.h>
 
scripts/config_whitelist.txt +1 -1
index 6b824bb14f39..0e792dfbec9c 100644
@@ -165,7 +165,7 @@ CFG_POSTBOOTMENU
 CFG_POWER_LTC3676_I2C_ADDR
 CFG_POWER_PFUZE100_I2C_ADDR
 CFG_POWER_PFUZE3000_I2C_ADDR
-CONFIG_PPC_SPINTABLE_COMPATIBLE
+CFG_PPC_SPINTABLE_COMPATIBLE
 CONFIG_PRAM
 CONFIG_PSRAM_SCFG
 CONFIG_QBMAN_CLK_DIV
Signature · 1 line
2.25.1
author
#202 lore raw

PATCH 159/241 global: Migrate CONFIG_QBMAN_CLK_DIV to CFG

In reply to Tom Rini
---
 arch/powerpc/cpu/mpc85xx/speed.c          | 6 +++---
 arch/powerpc/include/asm/config_mpc85xx.h | 2 +-
 scripts/config_whitelist.txt              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
arch/powerpc/cpu/mpc85xx/speed.c +3 -3
index c2e3e00f7ba8..9af40310b46f 100644
@@ -249,10 +249,10 @@ void get_sys_info(sys_info_t *sys_info)
 #endif
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
-#ifndef CONFIG_QBMAN_CLK_DIV
-#define CONFIG_QBMAN_CLK_DIV	2
+#ifndef CFG_QBMAN_CLK_DIV
+#define CFG_QBMAN_CLK_DIV	2
 #endif
-	sys_info->freq_qman = sys_info->freq_systembus / CONFIG_QBMAN_CLK_DIV;
+	sys_info->freq_qman = sys_info->freq_systembus / CFG_QBMAN_CLK_DIV;
 #endif
 
 #if defined(CONFIG_SYS_MAPLE)
arch/powerpc/include/asm/config_mpc85xx.h +1 -1
index 5491a1af2813..0a67c76b61d6 100644
@@ -192,7 +192,7 @@
 #define CFG_FSL_FM_10GEC_REGULAR_NOTATION
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_SYS_FM1_CLK		0
-#define CONFIG_QBMAN_CLK_DIV		1
+#define CFG_QBMAN_CLK_DIV		1
 #define CFG_SYS_FM_MURAM_SIZE	0x30000
 #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE
 #define QE_MURAM_SIZE			0x6000UL
scripts/config_whitelist.txt +1 -1
index 3ee3720b8876..2a06cc5d3041 100644
@@ -168,7 +168,7 @@ CFG_POWER_PFUZE3000_I2C_ADDR
 CFG_PPC_SPINTABLE_COMPATIBLE
 CFG_PRAM
 CFG_PSRAM_SCFG
-CONFIG_QBMAN_CLK_DIV
+CFG_QBMAN_CLK_DIV
 CONFIG_RAMBOOT_SPIFLASH
 CONFIG_RAMBOOT_TEXT_BASE
 CONFIG_RAMDISK_ADDR
Signature · 1 line
2.25.1
author
#203 lore raw

PATCH 160/241 global: Migrate CONFIG_RAMBOOT_SPIFLASH to CFG

In reply to Tom Rini
---
 include/configs/P1010RDB.h   | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/P1010RDB.h +1 -1
index a75e1b8f7a8a..1fa0b38ae201 100644
@@ -24,7 +24,7 @@
 
 #ifdef CONFIG_SPIFLASH
 #ifdef CONFIG_NXP_ESBC
-#define CONFIG_RAMBOOT_SPIFLASH
+#define CFG_RAMBOOT_SPIFLASH
 #define CONFIG_RESET_VECTOR_ADDRESS	0x110bfffc
 #else
 #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE	(512 << 10)
scripts/config_whitelist.txt +1 -1
index 2a06cc5d3041..083352a88bb8 100644
@@ -169,7 +169,7 @@ CFG_PPC_SPINTABLE_COMPATIBLE
 CFG_PRAM
 CFG_PSRAM_SCFG
 CFG_QBMAN_CLK_DIV
-CONFIG_RAMBOOT_SPIFLASH
+CFG_RAMBOOT_SPIFLASH
 CONFIG_RAMBOOT_TEXT_BASE
 CONFIG_RAMDISK_ADDR
 CONFIG_RD_LVL
Signature · 1 line
2.25.1
author
#204 lore raw

PATCH 161/241 global: Migrate CONFIG_RAMBOOT_TEXT_BASE to CFG

In reply to Tom Rini
---
 include/configs/P2041RDB.h   | 6 +++---
 include/configs/T4240RDB.h   | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
include/configs/P2041RDB.h +3 -3
index 0a6fcde3913d..f4cf43e7100d 100644
@@ -12,7 +12,7 @@
 #define __CONFIG_H
 
 #ifdef CONFIG_RAMBOOT_PBL
-#define CONFIG_RAMBOOT_TEXT_BASE	CONFIG_TEXT_BASE
+#define CFG_RAMBOOT_TEXT_BASE	CONFIG_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS	0xfffffffc
 #endif
 
@@ -46,10 +46,10 @@
 /*
  *  Config the L3 Cache as L3 SRAM
  */
-#define CFG_SYS_INIT_L3_ADDR		CONFIG_RAMBOOT_TEXT_BASE
+#define CFG_SYS_INIT_L3_ADDR		CFG_RAMBOOT_TEXT_BASE
 #ifdef CONFIG_PHYS_64BIT
 #define CFG_SYS_INIT_L3_ADDR_PHYS	(0xf00000000ull | \
-		CONFIG_RAMBOOT_TEXT_BASE)
+		CFG_RAMBOOT_TEXT_BASE)
 #else
 #define CFG_SYS_INIT_L3_ADDR_PHYS	CFG_SYS_INIT_L3_ADDR
 #endif
include/configs/T4240RDB.h +1 -1
index f1ee131aaa98..c3a04a766abd 100644
@@ -16,7 +16,7 @@
 
 #ifdef CONFIG_RAMBOOT_PBL
 #ifndef CONFIG_SDCARD
-#define CONFIG_RAMBOOT_TEXT_BASE        CONFIG_TEXT_BASE
+#define CFG_RAMBOOT_TEXT_BASE        CONFIG_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS     0xfffffffc
 #else
 #define RESET_VECTOR_OFFSET		0x27FFC
scripts/config_whitelist.txt +1 -1
index 083352a88bb8..df6a95c2572b 100644
@@ -170,7 +170,7 @@ CFG_PRAM
 CFG_PSRAM_SCFG
 CFG_QBMAN_CLK_DIV
 CFG_RAMBOOT_SPIFLASH
-CONFIG_RAMBOOT_TEXT_BASE
+CFG_RAMBOOT_TEXT_BASE
 CONFIG_RAMDISK_ADDR
 CONFIG_RD_LVL
 CONFIG_RESET_VECTOR_ADDRESS
Signature · 1 line
2.25.1
author
#205 lore raw

PATCH 162/241 global: Migrate CONFIG_RAMDISK_ADDR to CFG

In reply to Tom Rini
---
 cmd/qfw.c                    | 4 ++--
 doc/usage/cmd/qfw.rst        | 2 +-
 include/configs/x86-common.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
cmd/qfw.c +2 -2
index 95ddc4b79ec7..0c49c6074e16 100644
@@ -130,8 +130,8 @@ static int qemu_fwcfg_do_load(struct cmd_tbl *cmdtp, int flag,
 	env = env_get("ramdiskaddr");
 	initrd_addr = env ?
 		(void *)hextoul(env, NULL) :
-#ifdef CONFIG_RAMDISK_ADDR
-		(void *)CONFIG_RAMDISK_ADDR;
+#ifdef CFG_RAMDISK_ADDR
+		(void *)CFG_RAMDISK_ADDR;
 #else
 		NULL;
 #endif
doc/usage/cmd/qfw.rst +1 -1
index b3704b92d6d9..cc0e27c27790 100644
@@ -31,7 +31,7 @@ kernel_addr
 initrd_addr
     address to which the file specified by the -initrd parameter of QEMU shall
     be loaded. Defaults to environment variable *ramdiskaddr* and further to
-    the value of *CONFIG_RAMDISK_ADDR*.
+    the value of *CFG_RAMDISK_ADDR*.
 
 Examples
 --------
include/configs/x86-common.h +1 -1
index df75deedf583..e8bd2e507041 100644
@@ -43,7 +43,7 @@
 /* Default environment */
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CFG_HOSTNAME		"x86"
-#define CONFIG_RAMDISK_ADDR	0x4000000
+#define CFG_RAMDISK_ADDR	0x4000000
 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
 #define CFG_OTHBOOTARGS	"othbootargs=\0"
 #else
scripts/config_whitelist.txt +1 -1
index df6a95c2572b..e706fba5e8fd 100644
@@ -171,7 +171,7 @@ CFG_PSRAM_SCFG
 CFG_QBMAN_CLK_DIV
 CFG_RAMBOOT_SPIFLASH
 CFG_RAMBOOT_TEXT_BASE
-CONFIG_RAMDISK_ADDR
+CFG_RAMDISK_ADDR
 CONFIG_RD_LVL
 CONFIG_RESET_VECTOR_ADDRESS
 CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
Signature · 1 line
2.25.1
author
#206 lore raw

PATCH 163/241 global: Migrate CONFIG_RD_LVL to CFG

In reply to Tom Rini
---
 include/configs/exynos5-common.h | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/exynos5-common.h +1 -1
index 860fd1601a66..e8236a9ec418 100644
@@ -27,7 +27,7 @@
 /* MMC SPL */
 #define COPY_BL2_FNPTR_ADDR	0x02020030
 
-#define CONFIG_RD_LVL
+#define CFG_RD_LVL
 
 #define PHYS_SDRAM_1		CFG_SYS_SDRAM_BASE
 #define PHYS_SDRAM_1_SIZE	SDRAM_BANK_SIZE
scripts/config_whitelist.txt +1 -1
index e706fba5e8fd..23d832894d3d 100644
@@ -172,7 +172,7 @@ CFG_QBMAN_CLK_DIV
 CFG_RAMBOOT_SPIFLASH
 CFG_RAMBOOT_TEXT_BASE
 CFG_RAMDISK_ADDR
-CONFIG_RD_LVL
+CFG_RD_LVL
 CONFIG_RESET_VECTOR_ADDRESS
 CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
 CONFIG_ROOTPATH
Signature · 1 line
2.25.1
author
#207 lore raw

PATCH 164/241 global: Migrate CONFIG_RESET_VECTOR_ADDRESS to CFG

In reply to Tom Rini
---
 arch/powerpc/cpu/mpc85xx/Kconfig     |  2 +-
 arch/powerpc/cpu/mpc85xx/u-boot.lds  |  4 ++--
 arch/powerpc/dts/kmcent2-u-boot.dtsi |  2 +-
 arch/powerpc/dts/u-boot.dtsi         |  6 +++---
 board/freescale/p1_p2_rdb_pc/README  |  2 +-
 board/freescale/p2041rdb/README      |  2 +-
 board/freescale/t104xrdb/README      |  2 +-
 board/freescale/t208xqds/README      |  2 +-
 board/freescale/t208xrdb/README      |  2 +-
 include/configs/P1010RDB.h           |  8 ++++----
 include/configs/P2041RDB.h           |  8 ++++----
 include/configs/T102xRDB.h           | 10 +++++-----
 include/configs/T104xRDB.h           |  8 ++++----
 include/configs/T208xQDS.h           | 10 +++++-----
 include/configs/T208xRDB.h           | 10 +++++-----
 include/configs/T4240RDB.h           |  8 ++++----
 include/configs/kmcent2.h            |  2 +-
 include/configs/p1_p2_rdb_pc.h       |  4 ++--
 scripts/config_whitelist.txt         |  2 +-
 19 files changed, 47 insertions(+), 47 deletions(-)
arch/powerpc/cpu/mpc85xx/Kconfig +1 -1
index f2361560e9ad..a4891bb558f6 100644
@@ -935,7 +935,7 @@ config ARCH_T4240
 	imply FSL_SATA
 
 config MPC85XX_HAVE_RESET_VECTOR
-	bool "Indicate reset vector at CONFIG_RESET_VECTOR_ADDRESS - 0xffc"
+	bool "Indicate reset vector at CFG_RESET_VECTOR_ADDRESS - 0xffc"
 	depends on MPC85xx
 
 config BTB
arch/powerpc/cpu/mpc85xx/u-boot.lds +2 -2
index fa3aa954cbb5..3af0dfdf336b 100644
@@ -5,8 +5,8 @@
 
 #include "config.h"
 
-#ifdef CONFIG_RESET_VECTOR_ADDRESS
-#define RESET_VECTOR_ADDRESS	CONFIG_RESET_VECTOR_ADDRESS
+#ifdef CFG_RESET_VECTOR_ADDRESS
+#define RESET_VECTOR_ADDRESS	CFG_RESET_VECTOR_ADDRESS
 #else
 #define RESET_VECTOR_ADDRESS	0xfffffffc
 #endif
arch/powerpc/dts/kmcent2-u-boot.dtsi +1 -1
index 28f303b749e9..53bac5533f24 100644
@@ -91,7 +91,7 @@
 			align = <256>;
 		};
 		powerpc-mpc85xx-bootpg-resetvec {
-			offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>;
+			offset = <(CFG_RESET_VECTOR_ADDRESS - 0xffc)>;
 		};
 	};
 };
arch/powerpc/dts/u-boot.dtsi +3 -3
index b4b5257362e5..6b7375cff215 100644
@@ -23,11 +23,11 @@
 		u-boot-dtb-with-ucode {
 			align = <4>;
 		};
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc
 #endif
 		powerpc-mpc85xx-bootpg-resetvec {
-			offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>;
+			offset = <(CFG_RESET_VECTOR_ADDRESS - 0xffc)>;
 		};
 	};
 };
board/freescale/p1_p2_rdb_pc/README +1 -1
index f542decec79b..fd849bfc29a2 100644
@@ -57,7 +57,7 @@ enabled in relative defconfig file,
 1. CONFIG_DEFAULT_DEVICE_TREE="p1020rdb" (Change default device tree name if required)
 2. CONFIG_OF_CONTROL
 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at
-   CONFIG_RESET_VECTOR_ADDRESS - 0xffc
+   CFG_RESET_VECTOR_ADDRESS - 0xffc
 
 If device tree support is enabled in defconfig,
 1. use 'u-boot.bin' for NOR boot.
board/freescale/p2041rdb/README +1 -1
index 96612daeeb11..ae7702773723 100644
@@ -98,7 +98,7 @@ enabled in relative defconfig file,
 1. CONFIG_DEFAULT_DEVICE_TREE="p2041rdb" (Change default device tree name if required)
 2. CONFIG_OF_CONTROL
 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at
-   CONFIG_RESET_VECTOR_ADDRESS - 0xffc
+   CFG_RESET_VECTOR_ADDRESS - 0xffc
 
 CPLD command
 ============
board/freescale/t104xrdb/README +1 -1
index e90dca416639..f312e6a3e32b 100644
@@ -379,7 +379,7 @@ enabled in relative defconfig file,
 1. CONFIG_DEFAULT_DEVICE_TREE="t1042d4rdb" (Change default device tree name if required)
 2. CONFIG_OF_CONTROL
 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at
-   CONFIG_RESET_VECTOR_ADDRESS - 0xffc
+   CFG_RESET_VECTOR_ADDRESS - 0xffc
 
 If device tree support is enabled in defconfig,
 1. use 'u-boot.bin' for NOR boot.
board/freescale/t208xqds/README +1 -1
index 63953d6b9b66..0d80c6901fb2 100755
@@ -285,7 +285,7 @@ enabled in relative defconfig file,
 1. CONFIG_DEFAULT_DEVICE_TREE="t2080qds" (Change default device tree name if required)
 2. CONFIG_OF_CONTROL
 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at
-   CONFIG_RESET_VECTOR_ADDRESS - 0xffc
+   CFG_RESET_VECTOR_ADDRESS - 0xffc
 
 If device tree support is enabled in defconfig,
 1. use 'u-boot.bin' for NOR boot.
board/freescale/t208xrdb/README +1 -1
index 60551f6723e6..533054bfe192 100644
@@ -281,7 +281,7 @@ enabled in relative defconfig file,
 1. CONFIG_DEFAULT_DEVICE_TREE="t2080rdb" (Change default device tree name if required)
 2. CONFIG_OF_CONTROL
 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at
-   CONFIG_RESET_VECTOR_ADDRESS - 0xffc
+   CFG_RESET_VECTOR_ADDRESS - 0xffc
 
 If device tree support is enabled in defconfig,
 1. use 'u-boot.bin' for NOR boot.
include/configs/P1010RDB.h +4 -4
index 1fa0b38ae201..eff275a5ada6 100644
@@ -25,7 +25,7 @@
 #ifdef CONFIG_SPIFLASH
 #ifdef CONFIG_NXP_ESBC
 #define CFG_RAMBOOT_SPIFLASH
-#define CONFIG_RESET_VECTOR_ADDRESS	0x110bfffc
+#define CFG_RESET_VECTOR_ADDRESS	0x110bfffc
 #else
 #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE	(512 << 10)
 #define CFG_SYS_SPI_FLASH_U_BOOT_DST		(0x11000000)
@@ -53,11 +53,11 @@
 #endif
 
 #ifdef CONFIG_NAND_SECBOOT	/* NAND Boot */
-#define CONFIG_RESET_VECTOR_ADDRESS	0x110bfffc
+#define CFG_RESET_VECTOR_ADDRESS	0x110bfffc
 #endif
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 /* High Level Configuration Options */
include/configs/P2041RDB.h +4 -4
index f4cf43e7100d..8cfa01135ffe 100644
@@ -13,7 +13,7 @@
 
 #ifdef CONFIG_RAMBOOT_PBL
 #define CFG_RAMBOOT_TEXT_BASE	CONFIG_TEXT_BASE
-#define CONFIG_RESET_VECTOR_ADDRESS	0xfffffffc
+#define CFG_RESET_VECTOR_ADDRESS	0xfffffffc
 #endif
 
 #ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE
@@ -21,13 +21,13 @@
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000)
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \
 		(0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
-#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
+#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc
 #endif
 
 /* High Level Configuration Options */
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 #define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
include/configs/T102xRDB.h +5 -5
index c61d086dbe57..9940eae0a36d 100644
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef CONFIG_SPIFLASH
-#define CONFIG_RESET_VECTOR_ADDRESS		0x30000FFC
+#define CFG_RESET_VECTOR_ADDRESS		0x30000FFC
 #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_SPI_FLASH_U_BOOT_DST		(0x30000000)
 #define CFG_SYS_SPI_FLASH_U_BOOT_START	(0x30000000)
@@ -36,7 +36,7 @@
 #endif
 
 #ifdef CONFIG_SDCARD
-#define CONFIG_RESET_VECTOR_ADDRESS	0x30000FFC
+#define CFG_RESET_VECTOR_ADDRESS	0x30000FFC
 #define CFG_SYS_MMC_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_MMC_U_BOOT_DST	(0x30000000)
 #define CFG_SYS_MMC_U_BOOT_START	(0x30000000)
@@ -45,8 +45,8 @@
 
 #endif /* CONFIG_RAMBOOT_PBL */
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 /*
@@ -87,7 +87,7 @@
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000)
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS	\
 		(0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
-#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
+#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc
 #endif
 
 /*
include/configs/T104xRDB.h +4 -4
index bae6742928e3..cd7a085b8b8c 100644
@@ -35,7 +35,7 @@
 #endif
 
 #ifdef CONFIG_SPIFLASH
-#define	CONFIG_RESET_VECTOR_ADDRESS		0x30000FFC
+#define	CFG_RESET_VECTOR_ADDRESS		0x30000FFC
 #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_SPI_FLASH_U_BOOT_DST		(0x30000000)
 #define CFG_SYS_SPI_FLASH_U_BOOT_START	(0x30000000)
@@ -43,7 +43,7 @@
 #endif
 
 #ifdef CONFIG_SDCARD
-#define	CONFIG_RESET_VECTOR_ADDRESS		0x30000FFC
+#define	CFG_RESET_VECTOR_ADDRESS		0x30000FFC
 #define CFG_SYS_MMC_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_MMC_U_BOOT_DST	(0x30000000)
 #define CFG_SYS_MMC_U_BOOT_START	(0x30000000)
@@ -54,8 +54,8 @@
 
 /* High Level Configuration Options */
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 #define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
include/configs/T208xQDS.h +5 -5
index d9841397fb6b..b0ded3647212 100644
@@ -30,7 +30,7 @@
 #endif
 
 #ifdef CONFIG_SPIFLASH
-#define	CONFIG_RESET_VECTOR_ADDRESS		0x200FFC
+#define	CFG_RESET_VECTOR_ADDRESS		0x200FFC
 #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_SPI_FLASH_U_BOOT_DST		(0x00200000)
 #define CFG_SYS_SPI_FLASH_U_BOOT_START	(0x00200000)
@@ -38,7 +38,7 @@
 #endif
 
 #ifdef CONFIG_SDCARD
-#define	CONFIG_RESET_VECTOR_ADDRESS		0x200FFC
+#define	CFG_RESET_VECTOR_ADDRESS		0x200FFC
 #define CFG_SYS_MMC_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_MMC_U_BOOT_DST	(0x00200000)
 #define CFG_SYS_MMC_U_BOOT_START	(0x00200000)
@@ -52,11 +52,11 @@
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000)
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \
 		(0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
-#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
+#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc
 #endif
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 /*
include/configs/T208xRDB.h +5 -5
index 9e38d5e9f3a2..e2c04d121edc 100644
@@ -30,7 +30,7 @@
 #endif
 
 #ifdef CONFIG_SPIFLASH
-#define        CONFIG_RESET_VECTOR_ADDRESS             0x200FFC
+#define        CFG_RESET_VECTOR_ADDRESS             0x200FFC
 #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE       (768 << 10)
 #define CFG_SYS_SPI_FLASH_U_BOOT_DST                (0x00200000)
 #define CFG_SYS_SPI_FLASH_U_BOOT_START      (0x00200000)
@@ -38,7 +38,7 @@
 #endif
 
 #ifdef CONFIG_SDCARD
-#define        CONFIG_RESET_VECTOR_ADDRESS             0x200FFC
+#define        CFG_RESET_VECTOR_ADDRESS             0x200FFC
 #define CFG_SYS_MMC_U_BOOT_SIZE     (768 << 10)
 #define CFG_SYS_MMC_U_BOOT_DST      (0x00200000)
 #define CFG_SYS_MMC_U_BOOT_START    (0x00200000)
@@ -52,11 +52,11 @@
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000)
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \
 		(0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
-#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
+#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc
 #endif
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 /*
include/configs/T4240RDB.h +4 -4
index c3a04a766abd..772db525bf81 100644
@@ -17,13 +17,13 @@
 #ifdef CONFIG_RAMBOOT_PBL
 #ifndef CONFIG_SDCARD
 #define CFG_RAMBOOT_TEXT_BASE        CONFIG_TEXT_BASE
-#define CONFIG_RESET_VECTOR_ADDRESS     0xfffffffc
+#define CFG_RESET_VECTOR_ADDRESS     0xfffffffc
 #else
 #define RESET_VECTOR_OFFSET		0x27FFC
 #define BOOT_PAGE_OFFSET		0x27000
 
 #ifdef	CONFIG_SDCARD
-#define CONFIG_RESET_VECTOR_ADDRESS	0x200FFC
+#define CFG_RESET_VECTOR_ADDRESS	0x200FFC
 #define CFG_SYS_MMC_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_MMC_U_BOOT_DST	0x00200000
 #define CFG_SYS_MMC_U_BOOT_START	0x00200000
@@ -35,8 +35,8 @@
 
 /* High Level Configuration Options */
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 #define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
include/configs/kmcent2.h +1 -1
index b64651527202..aa3112d94e0e 100644
@@ -134,7 +134,7 @@
 
 /* High Level Configuration Options */
 
-#define CONFIG_RESET_VECTOR_ADDRESS	0xebfffffc
+#define CFG_RESET_VECTOR_ADDRESS	0xebfffffc
 
 #define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
 
include/configs/p1_p2_rdb_pc.h +2 -2
index 1e66d609d68d..7be07b5f43d5 100644
@@ -105,8 +105,8 @@
 #endif /* not CONFIG_TPL_BUILD */
 #endif
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 /*
scripts/config_whitelist.txt +1 -1
index 23d832894d3d..bd4936d08ada 100644
@@ -173,7 +173,7 @@ CFG_RAMBOOT_SPIFLASH
 CFG_RAMBOOT_TEXT_BASE
 CFG_RAMDISK_ADDR
 CFG_RD_LVL
-CONFIG_RESET_VECTOR_ADDRESS
+CFG_RESET_VECTOR_ADDRESS
 CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
 CONFIG_ROOTPATH
 CONFIG_SANDBOX_ARCH
Signature · 1 line
2.25.1
author
#208 lore raw

PATCH 167/241 global: Migrate CONFIG_SANDBOX_ARCH to CFG

In reply to Tom Rini
---
 arch/sandbox/include/asm/config.h | 2 +-
 drivers/adc/adc-uclass.c          | 2 +-
 scripts/config_whitelist.txt      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/sandbox/include/asm/config.h +1 -1
index 50215b35d777..0adb6978451c 100644
@@ -6,7 +6,7 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SANDBOX_ARCH
+#define CFG_SANDBOX_ARCH
 
 /* Used by drivers/spi/sandbox_spi.c and arch/sandbox/include/asm/state.h */
 #ifndef CONFIG_SANDBOX_SPI_MAX_BUS
drivers/adc/adc-uclass.c +1 -1
index 67137ffb3414..67289bb1acae 100644
@@ -22,7 +22,7 @@
 #define CHECK_MASK			(!CHECK_NUMBER)
 
 /* TODO: add support for timer uclass (for early calls) */
-#ifdef CONFIG_SANDBOX_ARCH
+#ifdef CFG_SANDBOX_ARCH
 #define sdelay(x)	udelay(x)
 #else
 extern void sdelay(unsigned long loops);
scripts/config_whitelist.txt +1 -1
index 332b5493d30d..c9e0703f52a5 100644
@@ -176,7 +176,7 @@ CFG_RD_LVL
 CFG_RESET_VECTOR_ADDRESS
 CFG_ROCKCHIP_SDHCI_MAX_FREQ
 CFG_ROOTPATH
-CONFIG_SANDBOX_ARCH
+CFG_SANDBOX_ARCH
 CONFIG_SANDBOX_SDL
 CONFIG_SANDBOX_SPI_MAX_BUS
 CONFIG_SANDBOX_SPI_MAX_CS
Signature · 1 line
2.25.1
author
#209 lore raw

PATCH 169/241 global: Migrate CONFIG_SANDBOX_SPI_MAX_CS to CFG

In reply to Tom Rini
---
 arch/sandbox/include/asm/config.h | 4 ++--
 arch/sandbox/include/asm/state.h  | 2 +-
 drivers/spi/sandbox_spi.c         | 2 +-
 scripts/config_whitelist.txt      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
arch/sandbox/include/asm/config.h +2 -2
index 36833987330c..2ffe94f10bc8 100644
@@ -12,8 +12,8 @@
 #ifndef CFG_SANDBOX_SPI_MAX_BUS
 #define CFG_SANDBOX_SPI_MAX_BUS 1
 #endif
-#ifndef CONFIG_SANDBOX_SPI_MAX_CS
-#define CONFIG_SANDBOX_SPI_MAX_CS 10
+#ifndef CFG_SANDBOX_SPI_MAX_CS
+#define CFG_SANDBOX_SPI_MAX_CS 10
 #endif
 
 #endif
arch/sandbox/include/asm/state.h +1 -1
index ada85be5cb1a..e99a7d04e8da 100644
@@ -99,7 +99,7 @@ struct sandbox_state {
 
 	/* Pointer to information for each SPI bus/cs */
 	struct sandbox_spi_info spi[CFG_SANDBOX_SPI_MAX_BUS]
-					[CONFIG_SANDBOX_SPI_MAX_CS];
+					[CFG_SANDBOX_SPI_MAX_CS];
 
 	/* Information about Watchdog */
 	struct sandbox_wdt_info wdt;
drivers/spi/sandbox_spi.c +1 -1
index 0c645904da14..0065a5c65755 100644
@@ -90,7 +90,7 @@ static int sandbox_spi_xfer(struct udevice *slave, unsigned int bitlen,
 	busnum = dev_seq(bus);
 	cs = spi_chip_select(slave);
 	if (busnum >= CFG_SANDBOX_SPI_MAX_BUS ||
-	    cs >= CONFIG_SANDBOX_SPI_MAX_CS) {
+	    cs >= CFG_SANDBOX_SPI_MAX_CS) {
 		printf("%s: busnum=%u, cs=%u: out of range\n", __func__,
 		       busnum, cs);
 		return -ENOENT;
scripts/config_whitelist.txt +1 -1
index 815d8f8f12ba..7af096ee8f63 100644
@@ -178,7 +178,7 @@ CFG_ROCKCHIP_SDHCI_MAX_FREQ
 CFG_ROOTPATH
 CFG_SANDBOX_ARCH
 CFG_SANDBOX_SPI_MAX_BUS
-CONFIG_SANDBOX_SPI_MAX_CS
+CFG_SANDBOX_SPI_MAX_CS
 CONFIG_SAR2_REG
 CONFIG_SAR_REG
 CONFIG_SCIF_A
Signature · 1 line
2.25.1
author
#210 lore raw

PATCH 170/241 global: Migrate CONFIG_SAR2_REG to CFG

In reply to Tom Rini
---
 arch/arm/mach-mvebu/cpu.c              | 4 ++--
 arch/arm/mach-mvebu/include/mach/soc.h | 6 +++---
 scripts/config_whitelist.txt           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-mvebu/cpu.c +2 -2
index 67ad5e5907be..9139df1ae248 100644
@@ -195,7 +195,7 @@ void get_sar_freq(struct sar_freq_modes *sar_freq)
 	int i;
 
 #if defined(CONFIG_ARMADA_375) || defined(CONFIG_ARMADA_MSYS)
-	val = readl(CONFIG_SAR2_REG);	/* SAR - Sample At Reset */
+	val = readl(CFG_SAR2_REG);	/* SAR - Sample At Reset */
 #else
 	val = readl(CONFIG_SAR_REG);	/* SAR - Sample At Reset */
 #endif
@@ -205,7 +205,7 @@ void get_sar_freq(struct sar_freq_modes *sar_freq)
 	 * Shift CPU0 clock frequency select bit from SAR2 register
 	 * into correct position
 	 */
-	freq |= ((readl(CONFIG_SAR2_REG) & SAR2_CPU_FREQ_MASK)
+	freq |= ((readl(CFG_SAR2_REG) & SAR2_CPU_FREQ_MASK)
 		 >> SAR2_CPU_FREQ_OFFS) << 3;
 #endif
 	for (i = 0; sar_freq_tab[i].val != 0xff; i++) {
arch/arm/mach-mvebu/include/mach/soc.h +3 -3
index e6383d4a86e2..1210d26c7461 100644
@@ -135,7 +135,7 @@
 #if defined(CONFIG_ARMADA_375)
 /* SAR values for Armada 375 */
 #define CONFIG_SAR_REG		(MVEBU_REGISTER(0xe8200))
-#define CONFIG_SAR2_REG		(MVEBU_REGISTER(0xe8204))
+#define CFG_SAR2_REG		(MVEBU_REGISTER(0xe8204))
 
 #define SAR_CPU_FREQ_OFFS	17
 #define SAR_CPU_FREQ_MASK	(0x1f << SAR_CPU_FREQ_OFFS)
@@ -174,7 +174,7 @@
 #elif defined(CONFIG_ARMADA_MSYS)
 /* SAR values for MSYS */
 #define CONFIG_SAR_REG		(MBUS_DFX_BASE  + 0xf8200)
-#define CONFIG_SAR2_REG		(MBUS_DFX_BASE  + 0xf8204)
+#define CFG_SAR2_REG		(MBUS_DFX_BASE  + 0xf8204)
 
 #define SAR_CPU_FREQ_OFFS	18
 #define SAR_CPU_FREQ_MASK	(0x7 << SAR_CPU_FREQ_OFFS)
@@ -192,7 +192,7 @@
 #elif defined(CONFIG_ARMADA_XP)
 /* SAR values for Armada XP */
 #define CONFIG_SAR_REG		(MVEBU_REGISTER(0x18230))
-#define CONFIG_SAR2_REG		(MVEBU_REGISTER(0x18234))
+#define CFG_SAR2_REG		(MVEBU_REGISTER(0x18234))
 
 #define SAR_CPU_FREQ_OFFS	21
 #define SAR_CPU_FREQ_MASK	(0x7 << SAR_CPU_FREQ_OFFS)
scripts/config_whitelist.txt +1 -1
index 7af096ee8f63..ed50a507f270 100644
@@ -179,7 +179,7 @@ CFG_ROOTPATH
 CFG_SANDBOX_ARCH
 CFG_SANDBOX_SPI_MAX_BUS
 CFG_SANDBOX_SPI_MAX_CS
-CONFIG_SAR2_REG
+CFG_SAR2_REG
 CONFIG_SAR_REG
 CONFIG_SCIF_A
 CONFIG_SCSI_DEV_LIST
Signature · 1 line
2.25.1
author
#211 lore raw

PATCH 171/241 global: Migrate CONFIG_SAR_REG to CFG

In reply to Tom Rini
---
 arch/arm/mach-kirkwood/include/mach/kw88f6281.h |  2 +-
 arch/arm/mach-kirkwood/include/mach/soc.h       |  2 +-
 arch/arm/mach-mvebu/cpu.c                       |  4 ++--
 arch/arm/mach-mvebu/include/mach/soc.h          | 12 ++++++------
 scripts/config_whitelist.txt                    |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)
arch/arm/mach-kirkwood/include/mach/kw88f6281.h +1 -1
index 7f8e156a6bdc..67f0b3ec6772 100644
@@ -15,7 +15,7 @@
 #define KW_REGS_PHY_BASE		KW88F6281_REGS_PHYS_BASE
 
 /* TCLK Core Clock definition */
-#define CFG_SYS_TCLK			((readl(CONFIG_SAR_REG) & BIT(21)) ? \
+#define CFG_SYS_TCLK			((readl(CFG_SAR_REG) & BIT(21)) ? \
 					166666667 : 200000000)
 
 #endif /* _ASM_ARCH_KW88F6281_H */
arch/arm/mach-kirkwood/include/mach/soc.h +1 -1
index 5f545c6f4349..4a7efc50f67a 100644
@@ -62,7 +62,7 @@
 #define MVCPU_WIN_ENABLE	KWCPU_WIN_ENABLE
 #define MVCPU_WIN_DISABLE	KWCPU_WIN_DISABLE
 
-#define CONFIG_SAR_REG		(KW_MPP_BASE + 0x0030)
+#define CFG_SAR_REG		(KW_MPP_BASE + 0x0030)
 
 #if defined (CONFIG_KW88F6281)
 #include <asm/arch/kw88f6281.h>
arch/arm/mach-mvebu/cpu.c +2 -2
index 9139df1ae248..329d13691f0e 100644
@@ -83,7 +83,7 @@ u32 get_boot_device(void)
 	/*
 	 * Now check the SAR register for the strapped boot-device
 	 */
-	val = readl(CONFIG_SAR_REG);	/* SAR - Sample At Reset */
+	val = readl(CFG_SAR_REG);	/* SAR - Sample At Reset */
 	boot_device = (val & BOOT_DEV_SEL_MASK) >> BOOT_DEV_SEL_OFFS;
 	debug("SAR_REG=0x%08x boot_device=0x%x\n", val, boot_device);
 	switch (boot_device) {
@@ -197,7 +197,7 @@ void get_sar_freq(struct sar_freq_modes *sar_freq)
 #if defined(CONFIG_ARMADA_375) || defined(CONFIG_ARMADA_MSYS)
 	val = readl(CFG_SAR2_REG);	/* SAR - Sample At Reset */
 #else
-	val = readl(CONFIG_SAR_REG);	/* SAR - Sample At Reset */
+	val = readl(CFG_SAR_REG);	/* SAR - Sample At Reset */
 #endif
 	freq = (val & SAR_CPU_FREQ_MASK) >> SAR_CPU_FREQ_OFFS;
 #if defined(SAR2_CPU_FREQ_MASK)
arch/arm/mach-mvebu/include/mach/soc.h +6 -6
index 1210d26c7461..6edd2e2d79c7 100644
@@ -134,7 +134,7 @@
 
 #if defined(CONFIG_ARMADA_375)
 /* SAR values for Armada 375 */
-#define CONFIG_SAR_REG		(MVEBU_REGISTER(0xe8200))
+#define CFG_SAR_REG		(MVEBU_REGISTER(0xe8200))
 #define CFG_SAR2_REG		(MVEBU_REGISTER(0xe8204))
 
 #define SAR_CPU_FREQ_OFFS	17
@@ -146,11 +146,11 @@
 #define BOOT_FROM_UART		0x30
 #define BOOT_FROM_SPI		0x38
 
-#define CFG_SYS_TCLK		((readl(CONFIG_SAR_REG) & BIT(20)) ? \
+#define CFG_SYS_TCLK		((readl(CFG_SAR_REG) & BIT(20)) ? \
 				 200000000 : 166000000)
 #elif defined(CONFIG_ARMADA_38X)
 /* SAR values for Armada 38x */
-#define CONFIG_SAR_REG		(MVEBU_REGISTER(0x18600))
+#define CFG_SAR_REG		(MVEBU_REGISTER(0x18600))
 
 #define SAR_CPU_FREQ_OFFS	10
 #define SAR_CPU_FREQ_MASK	(0x1f << SAR_CPU_FREQ_OFFS)
@@ -169,11 +169,11 @@
 #define BOOT_FROM_MMC		0x30
 #define BOOT_FROM_MMC_ALT	0x31
 
-#define CFG_SYS_TCLK		((readl(CONFIG_SAR_REG) & BIT(15)) ? \
+#define CFG_SYS_TCLK		((readl(CFG_SAR_REG) & BIT(15)) ? \
 				 200000000 : 250000000)
 #elif defined(CONFIG_ARMADA_MSYS)
 /* SAR values for MSYS */
-#define CONFIG_SAR_REG		(MBUS_DFX_BASE  + 0xf8200)
+#define CFG_SAR_REG		(MBUS_DFX_BASE  + 0xf8200)
 #define CFG_SAR2_REG		(MBUS_DFX_BASE  + 0xf8204)
 
 #define SAR_CPU_FREQ_OFFS	18
@@ -191,7 +191,7 @@
 #define CFG_SYS_TCLK		200000000	/* 200MHz */
 #elif defined(CONFIG_ARMADA_XP)
 /* SAR values for Armada XP */
-#define CONFIG_SAR_REG		(MVEBU_REGISTER(0x18230))
+#define CFG_SAR_REG		(MVEBU_REGISTER(0x18230))
 #define CFG_SAR2_REG		(MVEBU_REGISTER(0x18234))
 
 #define SAR_CPU_FREQ_OFFS	21
scripts/config_whitelist.txt +1 -1
index ed50a507f270..bdb3b68f8c80 100644
@@ -180,7 +180,7 @@ CFG_SANDBOX_ARCH
 CFG_SANDBOX_SPI_MAX_BUS
 CFG_SANDBOX_SPI_MAX_CS
 CFG_SAR2_REG
-CONFIG_SAR_REG
+CFG_SAR_REG
 CONFIG_SCIF_A
 CONFIG_SCSI_DEV_LIST
 CONFIG_SC_TIMER_CLK
Signature · 1 line
2.25.1
author
#212 lore raw

PATCH 172/241 global: Migrate CONFIG_SCIF_A to CFG

In reply to Tom Rini
---
 drivers/serial/serial_sh.c   | 2 +-
 drivers/serial/serial_sh.h   | 8 ++++----
 include/configs/stout.h      | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
drivers/serial/serial_sh.c +1 -1
index e6c23cedff11..4671217b59a0 100644
@@ -274,7 +274,7 @@ U_BOOT_DRIVER(serial_sh) = {
 # error "Default SCIF doesn't set....."
 #endif
 
-#if defined(CONFIG_SCIF_A)
+#if defined(CFG_SCIF_A)
 	#define SCIF_BASE_PORT	PORT_SCIFA
 #elif defined(CONFIG_SCI)
 	#define SCIF_BASE_PORT  PORT_SCI
drivers/serial/serial_sh.h +4 -4
index 11deaa951168..e6ab6f1b9b76 100644
@@ -92,7 +92,7 @@ struct uart_port {
 # define SCIF_ORER 0x0001  /* overrun error bit */
 #elif defined(CONFIG_RCAR_GEN2) || defined(CONFIG_RCAR_GEN3) || \
       defined(CONFIG_R7S72100)
-# if defined(CONFIG_SCIF_A)
+# if defined(CFG_SCIF_A)
 #  define SCIF_ORER	0x0200
 # else
 #  define SCIF_ORER	0x0001
@@ -164,7 +164,7 @@ struct uart_port {
 # define SCIF2_TXROOM_MAX 16
 #elif defined(CONFIG_RCAR_GEN2)
 # define SCIF_ERRORS (SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK)
-# if defined(CONFIG_SCIF_A)
+# if defined(CFG_SCIF_A)
 #  define SCIF_RFDC_MASK	0x007f
 # else
 #  define SCIF_RFDC_MASK	0x001f
@@ -380,7 +380,7 @@ SCIF_FNS(SCFDR,  0,  0, 0x1C, 16)
 SCIF_FNS(SCSPTR, 0,  0, 0x20, 16)
 SCIF_FNS(DL,     0,  0, 0x30, 16)
 SCIF_FNS(CKS,    0,  0, 0x34, 16)
-#if defined(CONFIG_SCIF_A)
+#if defined(CFG_SCIF_A)
 SCIF_FNS(SCLSR,  0,  0, 0x14, 16)
 #else
 SCIF_FNS(SCLSR,  0,  0, 0x24, 16)
@@ -491,7 +491,7 @@ static inline int scbrr_calc(struct uart_port *port, int bps, int clk)
 #define SCBRR_VALUE(bps, clk) scbrr_calc(port, bps, clk)
 #elif defined(CONFIG_RCAR_GEN2)
 #define DL_VALUE(bps, clk) (clk / bps / 16) /* External Clock */
- #if defined(CONFIG_SCIF_A)
+ #if defined(CFG_SCIF_A)
   #define SCBRR_VALUE(bps, clk) (clk / bps / 16 - 1) /* Internal Clock */
  #else
   #define SCBRR_VALUE(bps, clk) (clk / bps / 32 - 1) /* Internal Clock */
include/configs/stout.h +1 -1
index 5058e0a204d7..be9013bcf93d 100644
@@ -23,7 +23,7 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)
 
 /* SCIF */
-#define CONFIG_SCIF_A
+#define CFG_SCIF_A
 
 /* SPI */
 #define CONFIG_SPI_FLASH_QUAD
scripts/config_whitelist.txt +1 -1
index bdb3b68f8c80..d77171c2c553 100644
@@ -181,7 +181,7 @@ CFG_SANDBOX_SPI_MAX_BUS
 CFG_SANDBOX_SPI_MAX_CS
 CFG_SAR2_REG
 CFG_SAR_REG
-CONFIG_SCIF_A
+CFG_SCIF_A
 CONFIG_SCSI_DEV_LIST
 CONFIG_SC_TIMER_CLK
 CONFIG_SERIAL_BOOT
Signature · 1 line
2.25.1
author
#213 lore raw

PATCH 173/241 global: Migrate CONFIG_SCSI_DEV_LIST to CFG

In reply to Tom Rini
---
 drivers/scsi/scsi.c          | 4 ++--
 include/configs/ls1021aiot.h | 2 +-
 include/configs/ls1028ardb.h | 2 +-
 include/configs/ls1043ardb.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
drivers/scsi/scsi.c +2 -2
index 3e769b0843f0..a020a7da23a5 100644
@@ -18,8 +18,8 @@
 #include <dm/uclass-internal.h>
 
 #if !defined(CONFIG_DM_SCSI)
-# ifdef CONFIG_SCSI_DEV_LIST
-#  define SCSI_DEV_LIST CONFIG_SCSI_DEV_LIST
+# ifdef CFG_SCSI_DEV_LIST
+#  define SCSI_DEV_LIST CFG_SCSI_DEV_LIST
 # else
 #  ifdef CONFIG_SATA_ULI5288
 
include/configs/ls1021aiot.h +1 -1
index cc6d07b40620..d6122856f069 100644
@@ -61,7 +61,7 @@
 #ifndef PCI_DEVICE_ID_FREESCALE_AHCI
 #define PCI_DEVICE_ID_FREESCALE_AHCI	0x0440
 #endif
-#define CONFIG_SCSI_DEV_LIST		{PCI_VENDOR_ID_FREESCALE, \
+#define CFG_SCSI_DEV_LIST		{PCI_VENDOR_ID_FREESCALE, \
 	PCI_DEVICE_ID_FREESCALE_AHCI}
 
 /* SPI */
include/configs/ls1028ardb.h +1 -1
index 8c53636beac3..ee4f885c5341 100644
@@ -52,7 +52,7 @@
 /* SATA */
 #define SCSI_VEND_ID 0x1b4b
 #define SCSI_DEV_ID  0x9170
-#define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
+#define CFG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
 
 /* Initial environment variables */
 #ifndef SPL_NO_ENV
include/configs/ls1043ardb.h +1 -1
index ec81b3ca5b36..da84e517b127 100644
@@ -210,7 +210,7 @@
 #ifndef SPL_NO_SATA
 #define SCSI_VEND_ID 0x1b4b
 #define SCSI_DEV_ID  0x9170
-#define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
+#define CFG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
 #endif
 
 #include <asm/fsl_secure_boot.h>
scripts/config_whitelist.txt +1 -1
index d77171c2c553..179d6918cd64 100644
@@ -182,7 +182,7 @@ CFG_SANDBOX_SPI_MAX_CS
 CFG_SAR2_REG
 CFG_SAR_REG
 CFG_SCIF_A
-CONFIG_SCSI_DEV_LIST
+CFG_SCSI_DEV_LIST
 CONFIG_SC_TIMER_CLK
 CONFIG_SERIAL_BOOT
 CONFIG_SERVERIP
Signature · 1 line
2.25.1
author
#214 lore raw

PATCH 174/241 global: Migrate CONFIG_SC_TIMER_CLK to CFG

In reply to Tom Rini
---
 arch/arm/mach-imx/syscounter.c | 2 +-
 include/configs/mx6_common.h   | 2 +-
 include/configs/mx7_common.h   | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-imx/syscounter.c +1 -1
index df478a232637..129efac6fa69 100644
@@ -65,7 +65,7 @@ int timer_init(void)
 	struct sctr_regs *sctr = (struct sctr_regs *)SCTR_BASE_ADDR;
 	unsigned long val, freq;
 
-	freq = CONFIG_SC_TIMER_CLK;
+	freq = CFG_SC_TIMER_CLK;
 	asm volatile("mcr p15, 0, %0, c14, c0, 0" : : "r" (freq));
 
 	writel(freq, &sctr->cntfid0);
include/configs/mx6_common.h +1 -1
index 1e99cdc7df4d..8129be9e88ea 100644
@@ -9,7 +9,7 @@
 #include <linux/stringify.h>
 
 #if (defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL))
-#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
+#define CFG_SC_TIMER_CLK 8000000 /* 8Mhz */
 #else
 #ifndef CONFIG_SYS_L2CACHE_OFF
 #define CFG_SYS_PL310_BASE	L2_PL310_BASE
include/configs/mx7_common.h +1 -1
index 3a5917fed4b8..dfba95b769cc 100644
@@ -15,7 +15,7 @@
 
 /* Timer settings */
 #define CFG_MXC_GPT_HCLK
-#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
+#define CFG_SC_TIMER_CLK 8000000 /* 8Mhz */
 
 /* Miscellaneous configurable options */
 
scripts/config_whitelist.txt +1 -1
index 179d6918cd64..b45fcaa9432c 100644
@@ -183,7 +183,7 @@ CFG_SAR2_REG
 CFG_SAR_REG
 CFG_SCIF_A
 CFG_SCSI_DEV_LIST
-CONFIG_SC_TIMER_CLK
+CFG_SC_TIMER_CLK
 CONFIG_SERIAL_BOOT
 CONFIG_SERVERIP
 CONFIG_SETUP_INITRD_TAG
Signature · 1 line
2.25.1
author
#215 lore raw

PATCH 175/241 global: Migrate CONFIG_SERIAL_BOOT to CFG

In reply to Tom Rini
---
 arch/m68k/cpu/mcf5445x/cpu_init.c |  2 +-
 arch/m68k/cpu/mcf5445x/start.S    | 10 +++++-----
 include/configs/stmark2.h         |  2 +-
 scripts/config_whitelist.txt      |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
arch/m68k/cpu/mcf5445x/cpu_init.c +1 -1
index 1ce244872f14..257af6c965d2 100644
@@ -28,7 +28,7 @@ void init_fbcs(void)
 {
 	fbcs_t *fbcs __maybe_unused = (fbcs_t *) MMAP_FBCS;
 
-#if !defined(CONFIG_SERIAL_BOOT)
+#if !defined(CFG_SERIAL_BOOT)
 #if (defined(CFG_SYS_CS0_BASE) && defined(CFG_SYS_CS0_MASK) && defined(CFG_SYS_CS0_CTRL))
 	out_be32(&fbcs->csar0, CFG_SYS_CS0_BASE);
 	out_be32(&fbcs->cscr0, CFG_SYS_CS0_CTRL);
arch/m68k/cpu/mcf5445x/start.S +5 -5
index a083c3d45d27..0beacb38dfbb 100644
@@ -25,7 +25,7 @@
 	addl	#60,%sp;		/* space for 15 regs */ \
 	rte;
 
-#if defined(CONFIG_SERIAL_BOOT)
+#if defined(CFG_SERIAL_BOOT)
 #define ASM_DRAMINIT	(asm_dram_init - CONFIG_TEXT_BASE + \
 	CFG_SYS_INIT_RAM_ADDR)
 #define ASM_DRAMINIT_N	(asm_dram_init - CONFIG_TEXT_BASE)
@@ -40,7 +40,7 @@
  * These vectors are to catch any un-intended traps.
  */
 _vectors:
-#if defined(CONFIG_SERIAL_BOOT)
+#if defined(CFG_SERIAL_BOOT)
 
 INITSP:	.long	0			/* Initial SP	*/
 #ifdef CONFIG_CF_SBF
@@ -68,7 +68,7 @@ vector10_17:
 vector18_1F:
 .long	_FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT
 
-#if !defined(CONFIG_SERIAL_BOOT)
+#if !defined(CFG_SERIAL_BOOT)
 
 /* TRAP #0 - #15 */
 vector20_2F:
@@ -111,7 +111,7 @@ vector192_255:
 .long	_FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT
 #endif
 
-#if defined(CONFIG_SERIAL_BOOT)
+#if defined(CFG_SERIAL_BOOT)
 	/* Image header: chksum 4 bytes, len 4 bytes, img dest 4 bytes */
 asm_sbf_img_hdr:
 	.long	0x00000000		/* checksum, not yet implemented */
@@ -436,7 +436,7 @@ asm_delay:
 	. = 0x400
 .globl _start
 _start:
-#if !defined(CONFIG_SERIAL_BOOT)
+#if !defined(CFG_SERIAL_BOOT)
 	nop
 	nop
 	move.w	#0x2700,%sr		/* Mask off Interrupt */
include/configs/stmark2.h +1 -1
index 3b4743905596..ca3eb6a31b1e 100644
@@ -64,7 +64,7 @@
 #define CFG_SYS_DRAM_TEST
 
 #if defined(CONFIG_CF_SBF)
-#define CONFIG_SERIAL_BOOT
+#define CFG_SERIAL_BOOT
 #endif
 
 /* Reserve 256 kB for Monitor */
scripts/config_whitelist.txt +1 -1
index b45fcaa9432c..0d58f8ff0a1b 100644
@@ -184,7 +184,7 @@ CFG_SAR_REG
 CFG_SCIF_A
 CFG_SCSI_DEV_LIST
 CFG_SC_TIMER_CLK
-CONFIG_SERIAL_BOOT
+CFG_SERIAL_BOOT
 CONFIG_SERVERIP
 CONFIG_SETUP_INITRD_TAG
 CONFIG_SET_DFU_ALT_BUF_LEN
Signature · 1 line
2.25.1