From 286a1595fbf5e3d984fc400a3995dd32bc7aa54f Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 19 Oct 2021 21:16:55 -0400 Subject: sandbox: Migrate ARCH_MAP_SYSMEM to Kconfig Move this from a hard-coded define in config.mk to Kconfig. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- arch/sandbox/Kconfig | 3 +++ arch/sandbox/config.mk | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig index f83282d..7606469 100644 --- a/arch/sandbox/Kconfig +++ b/arch/sandbox/Kconfig @@ -1,6 +1,9 @@ menu "Sandbox architecture" depends on SANDBOX +config ARCH_MAP_SYSMEM + def_bool y + config SYS_ARCH default "sandbox" diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk index 1f8cb61..2b1b657 100644 --- a/arch/sandbox/config.mk +++ b/arch/sandbox/config.mk @@ -2,7 +2,6 @@ # Copyright (c) 2011 The Chromium OS Authors. PLATFORM_CPPFLAGS += -D__SANDBOX__ -U_FORTIFY_SOURCE -PLATFORM_CPPFLAGS += -DCONFIG_ARCH_MAP_SYSMEM PLATFORM_CPPFLAGS += -fPIC PLATFORM_LIBS += -lrt SDL_CONFIG ?= sdl2-config -- cgit v1.1 From b55881ddb455af31b64038cf3b67f781909971cc Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 23 Oct 2021 03:06:03 +0200 Subject: bootstage: Add SPL support Allow usage of the bootstage facilities in SPL. Signed-off-by: Marek Vasut Cc: Simon Glass Reviewed-by: Simon Glass --- arch/x86/cpu/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index 01dece5..86f53e7 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -178,7 +178,7 @@ int default_print_cpuinfo(void) return 0; } -#if CONFIG_IS_ENABLED(BOOTSTAGE) +#if CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS) void show_boot_progress(int val) { outb(val, POST_PORT); -- cgit v1.1