[PoC 175/241] global: Migrate CONFIG_SERIAL_BOOT to CFG

Tom Rini
2022-11-20T14:20:42Z

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(-)

diff --git a/arch/m68k/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c
index 1ce244872f14..257af6c965d2 100644
--- a/arch/m68k/cpu/mcf5445x/cpu_init.c
+++ b/arch/m68k/cpu/mcf5445x/cpu_init.c
@@ -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);
diff --git a/arch/m68k/cpu/mcf5445x/start.S b/arch/m68k/cpu/mcf5445x/start.S
index a083c3d45d27..0beacb38dfbb 100644
--- a/arch/m68k/cpu/mcf5445x/start.S
+++ b/arch/m68k/cpu/mcf5445x/start.S
@@ -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 */
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index 3b4743905596..ca3eb6a31b1e 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -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 */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b45fcaa9432c..0d58f8ff0a1b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -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
--
2.25.1