diff options
| author | Simon Glass <sjg@chromium.org> | 2023-02-22 09:34:13 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-03-02 15:38:03 -0500 |
| commit | 86d7580acf3082b1d533c5a8d96d19930315860a (patch) | |
| tree | f355671866d980c78633329e183f352b2c3d89fc | |
| parent | f4fcbbe706fe57bc5b78a7ebbe4a8f9f9dee908d (diff) | |
| download | u-boot-86d7580acf3082b1d533c5a8d96d19930315860a.zip u-boot-86d7580acf3082b1d533c5a8d96d19930315860a.tar.gz u-boot-86d7580acf3082b1d533c5a8d96d19930315860a.tar.bz2 | |
x86: Fix up use of X86_32BIT_INIT and X86_64 options
Drop the invalid SPL_ in a CONFIG_IS_ENABLED() usage. Use the correct
X86_64 option in msr.h since SPL may be 32-bit when U-Bout proper is
not.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/x86/cpu/qemu/qemu.c | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/msr.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index e54082d..274978c0 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -97,7 +97,7 @@ static void qemu_chipset_init(void) } } -#if !CONFIG_IS_ENABLED(SPL_X86_32BIT_INIT) +#if CONFIG_IS_ENABLED(X86_32BIT_INIT) int arch_cpu_init(void) { post_code(POST_CPU_INIT); diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index 27764fc..eb3ddde 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -59,7 +59,7 @@ static inline unsigned long long native_read_tscp(unsigned int *aux) * edx:eax, while for x86_64 it doesn't mean rdx:rax or edx:eax. Instead, * it means rax *or* rdx. */ -#ifdef CONFIG_X86_64 +#if CONFIG_IS_ENABLED(X86_64) #define DECLARE_ARGS(val, low, high) unsigned low, high #define EAX_EDX_VAL(val, low, high) ((low) | ((u64)(high) << 32)) #define EAX_EDX_ARGS(val, low, high) "a" (low), "d" (high) |