Signed-off-by: Tom Rini trini@konsulko.com --- arch/x86/cpu/intel_common/mrc.c | 2 +- arch/x86/dts/u-boot.dtsi | 2 +- include/configs/x86-chromebook.h | 2 +- scripts/config_whitelist.txt | 3 ++- tools/binman/binman.rst | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c index a4918fbad61a..69405d740b47 100644 --- a/arch/x86/cpu/intel_common/mrc.c +++ b/arch/x86/cpu/intel_common/mrc.c @@ -200,7 +200,7 @@ static int sdram_initialise(struct udevice *dev, struct udevice *me_dev,
debug("PEI data at %p:\n", pei_data);
- data = (char *)CONFIG_X86_MRC_ADDR; + data = (char *)CFG_X86_MRC_ADDR; if (data) { int rv; ulong start; diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi index 24e692f988d8..454efc17614e 100644 --- a/arch/x86/dts/u-boot.dtsi +++ b/arch/x86/dts/u-boot.dtsi @@ -86,7 +86,7 @@ #endif #ifdef CONFIG_HAVE_MRC intel-mrc { - offset = <CONFIG_X86_MRC_ADDR>; + offset = <CFG_X86_MRC_ADDR>; }; #endif #ifdef CONFIG_FSP_VERSION1 diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h index ccd37abe2611..7d93dcbfc2e5 100644 --- a/include/configs/x86-chromebook.h +++ b/include/configs/x86-chromebook.h @@ -6,7 +6,7 @@ #ifndef _X86_CHROMEBOOK_H #define _X86_CHROMEBOOK_H
-#define CONFIG_X86_MRC_ADDR 0xfffa0000 +#define CFG_X86_MRC_ADDR 0xfffa0000 #define CONFIG_X86_REFCODE_ADDR 0xffea0000 #define CONFIG_X86_REFCODE_RUN_ADDR 0
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e9ca514f3cdb..66173404901d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -252,6 +252,7 @@ CFG_VSC7385_IMAGE CFG_VSC7385_IMAGE_SIZE CFG_WATCHDOG_PRESC CFG_WATCHDOG_RC -CONFIG_X86_MRC_ADDR +CFG_X86EMU_RAW_IO +CFG_X86_MRC_ADDR CONFIG_X86_REFCODE_ADDR CONFIG_X86_REFCODE_RUN_ADDR diff --git a/tools/binman/binman.rst b/tools/binman/binman.rst index fda16f1992d7..f50949aa37dd 100644 --- a/tools/binman/binman.rst +++ b/tools/binman/binman.rst @@ -298,7 +298,7 @@ C preprocessor::
#ifdef CONFIG_HAVE_MRC intel-mrc { - offset = <CONFIG_X86_MRC_ADDR>; + offset = <CFG_X86_MRC_ADDR>; }; #endif