diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-07 20:32:22 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-07 20:32:22 +0300 |
| commit | 5b8a83551d339736af92c43524ed0e1ba01122af (patch) | |
| tree | c05ddf8c68a2c7f00c8843a231026d95b3d82f43 /arch | |
| parent | 54fb6e396dd6a0cfbbed77d6baffa23899f4fca9 (diff) | |
| parent | 7bb1cc3bb9d6fca5f285db4df2299c3b80aa8c4a (diff) | |
| download | u-boot-5b8a83551d339736af92c43524ed0e1ba01122af.tar.xz | |
Merge branch '2021-07-06-update-to-gcc11-clang11'
- Update CI to use gcc-11.1 and clang-11 to build everything. This
requires a few fixes to the code that these newer compilers have
exposed.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/cpu/cpu.c | 2 | ||||
| -rw-r--r-- | arch/x86/lib/bios.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index 9c4edfcbfd..01dece5769 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -178,10 +178,12 @@ int default_print_cpuinfo(void) return 0; } +#if CONFIG_IS_ENABLED(BOOTSTAGE) void show_boot_progress(int val) { outb(val, POST_PORT); } +#endif #if !defined(CONFIG_SYS_COREBOOT) && !defined(CONFIG_EFI_STUB) /* diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c index fbdc3b04e3..98cc05de2e 100644 --- a/arch/x86/lib/bios.c +++ b/arch/x86/lib/bios.c @@ -23,7 +23,9 @@ static int (*int_handler[256])(void); /* to have a common register file for interrupt handlers */ +#ifndef CONFIG_BIOSEMU X86EMU_sysEnv _X86EMU_env; +#endif asmlinkage void (*realmode_call)(u32 addr, u32 eax, u32 ebx, u32 ecx, u32 edx, u32 esi, u32 edi); |