[PoC 240/241] global: Migrate CONFIG_X86_REFCODE_RUN_ADDR to CFG

Tom Rini
2022-11-20T14:30:12Z

arch/x86/cpu/broadwell/refcode.c | 4 ++--
include/configs/x86-chromebook.h | 2 +-
scripts/config_whitelist.txt | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c
index 3b7ec2b74e8e..df2df7972e98 100644
--- a/arch/x86/cpu/broadwell/refcode.c
+++ b/arch/x86/cpu/broadwell/refcode.c
@@ -99,7 +99,7 @@ static int cpu_run_reference_code(void)
pei_data->saved_data = (void *)&dummy;

src = (char *)hdr + hdr->payload_begin_offset;
- dest = (char *)CONFIG_X86_REFCODE_RUN_ADDR;
+ dest = (char *)CFG_X86_REFCODE_RUN_ADDR;

size = hdr->payload_end_offset - hdr->payload_begin_offset;
debug("Copying refcode from %p to %p, size %x\n", src, dest, size);
@@ -112,7 +112,7 @@ static int cpu_run_reference_code(void)
func = (asmlinkage int (*)(void *))dest;
debug("Running reference code at %p\n", func);
#ifdef DEBUG
- print_buffer(CONFIG_X86_REFCODE_RUN_ADDR, (void *)func, 1, 0x40, 0);
+ print_buffer(CFG_X86_REFCODE_RUN_ADDR, (void *)func, 1, 0x40, 0);
#endif
ret = func(pei_data);
if (ret != 0) {
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index fa45bf809700..98a537141deb 100644
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -8,7 +8,7 @@

#define CFG_X86_MRC_ADDR 0xfffa0000
#define CFG_X86_REFCODE_ADDR 0xffea0000
-#define CONFIG_X86_REFCODE_RUN_ADDR 0
+#define CFG_X86_REFCODE_RUN_ADDR 0

#define VIDEO_IO_OFFSET 0
#define CFG_X86EMU_RAW_IO
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2895dd09bfcf..1a57607fccf7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -255,4 +255,4 @@ CFG_WATCHDOG_RC
CFG_X86EMU_RAW_IO
CFG_X86_MRC_ADDR
CFG_X86_REFCODE_ADDR
-CONFIG_X86_REFCODE_RUN_ADDR
+CFG_X86_REFCODE_RUN_ADDR
--
2.25.1