diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-31 15:48:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-31 15:48:43 -0400 |
| commit | 360e392274e3bfeda3b7226d2cac7514774d0da1 (patch) | |
| tree | 2f3608441e5fbbd43a9f5e3e51926ed352a2e838 /arch | |
| parent | 77680d8f85b94ffe690b8fe1f35767aef8b1415a (diff) | |
| parent | b55881ddb455af31b64038cf3b67f781909971cc (diff) | |
| download | u-boot-360e392274e3bfeda3b7226d2cac7514774d0da1.zip u-boot-360e392274e3bfeda3b7226d2cac7514774d0da1.tar.gz u-boot-360e392274e3bfeda3b7226d2cac7514774d0da1.tar.bz2 | |
Merge tag 'dm-pull-boo21' of https://source.denx.de/u-boot/custodians/u-boot-dmWIP/31Oct2021
Environment tidy-ups
patman 'postfix' support
fix binman test race condition causing a timeout error
# gpg: Signature made Sun 31 Oct 2021 03:36:55 PM EDT
# gpg: using RSA key B25C0022AF86A7CC1655B6277F173A3E9008ADE6
# gpg: issuer "sjg@chromium.org"
# gpg: Good signature from "Simon Glass <sjg@chromium.org>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B25C 0022 AF86 A7CC 1655 B627 7F17 3A3E 9008 ADE6
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sandbox/Kconfig | 3 | ||||
| -rw-r--r-- | arch/sandbox/config.mk | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/cpu.c | 2 |
3 files changed, 4 insertions, 2 deletions
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 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); |