[PATCH 123/149] global: Migrate CONFIG_SMP_PEN_ADDR to CFG

Tom Rini
2022-12-04T15:30:24Z

Perform a simple rename of CONFIG_SMP_PEN_ADDR to CFG_SMP_PEN_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/cpu/armv7/nonsec_virt.S | 4 ++--
board/samsung/arndale/arndale.c | 4 ++--
include/configs/arndale.h | 2 +-
include/configs/km/pg-wcom-ls102xa.h | 2 +-
include/configs/ls1021aiot.h | 2 +-
include/configs/ls1021aqds.h | 2 +-
include/configs/ls1021atwr.h | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S
index b6d144f065d2..dcf9a7165f03 100644
--- a/arch/arm/cpu/armv7/nonsec_virt.S
+++ b/arch/arm/cpu/armv7/nonsec_virt.S
@@ -205,11 +205,11 @@ ENTRY(_nonsec_init)
bx lr
ENDPROC(_nonsec_init)

-#ifdef CONFIG_SMP_PEN_ADDR
+#ifdef CFG_SMP_PEN_ADDR
/* void __weak smp_waitloop(unsigned previous_address); */
ENTRY(smp_waitloop)
wfi
- ldr r1, =CONFIG_SMP_PEN_ADDR @ load start address
+ ldr r1, =CFG_SMP_PEN_ADDR @ load start address
ldr r1, [r1]
#ifdef CONFIG_PEN_ADDR_BIG_ENDIAN
rev r1, r1
diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c
index a992dc684291..3ebf600e1d7c 100644
--- a/board/samsung/arndale/arndale.c
+++ b/board/samsung/arndale/arndale.c
@@ -112,10 +112,10 @@ int checkboard(void)
}
#endif

-#ifdef CONFIG_SMP_PEN_ADDR
+#ifdef CFG_SMP_PEN_ADDR
void smp_set_core_boot_addr(unsigned long addr, int corenr)
{
- writel(addr, CONFIG_SMP_PEN_ADDR);
+ writel(addr, CFG_SMP_PEN_ADDR);

/* make sure this write is really executed */
__asm__ volatile ("dsb\n");
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 8acc525b11c9..b56effcd411e 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -16,7 +16,7 @@

/* Miscellaneous configurable options */

-#define CONFIG_SMP_PEN_ADDR 0x02020000
+#define CFG_SMP_PEN_ADDR 0x02020000

/* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */
#define CFG_ARM_GIC_BASE_ADDRESS 0x10480000
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index a5dde8e441c9..d7ecd5ebe052 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -161,7 +161,7 @@
{1, {I2C_NULL_HOP} }, \
}

-#define CONFIG_SMP_PEN_ADDR 0x01ee0200
+#define CFG_SMP_PEN_ADDR 0x01ee0200

#define HWCONFIG_BUFFER_SIZE 256

diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 53d9936f4e77..83ab94ec444c 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -68,7 +68,7 @@

#define FSL_PCIE_COMPAT "fsl,ls1021a-pcie"

-#define CONFIG_SMP_PEN_ADDR 0x01ee0200
+#define CFG_SMP_PEN_ADDR 0x01ee0200

#define HWCONFIG_BUFFER_SIZE 256

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 78432e558117..e4e5522a2384 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -242,7 +242,7 @@
* MMC
*/

-#define CONFIG_SMP_PEN_ADDR 0x01ee0200
+#define CFG_SMP_PEN_ADDR 0x01ee0200

#define HWCONFIG_BUFFER_SIZE 256

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index a387eeab472a..eb8fb042723a 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -133,7 +133,7 @@

/* GPIO */

-#define CONFIG_SMP_PEN_ADDR 0x01ee0200
+#define CFG_SMP_PEN_ADDR 0x01ee0200

#define HWCONFIG_BUFFER_SIZE 256

--
2.25.1