projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Define board_quiesce_devices() in a shared location
[oweals/u-boot.git]
/
arch
/
x86
/
config.mk
diff --git
a/arch/x86/config.mk
b/arch/x86/config.mk
index 69074f4711cb99b61f9fbca8db3adccd7f758be0..5f77f98e60a453676058a9726c0e357243b41689 100644
(file)
--- a/
arch/x86/config.mk
+++ b/
arch/x86/config.mk
@@
-1,9
+1,7
@@
+# SPDX-License-Identifier: GPL-2.0+
#
# (C) Copyright 2000-2002
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
# (C) Copyright 2000-2002
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
@@
-88,9
+86,9
@@
else
PLATFORM_CPPFLAGS += -D__I386__
endif
PLATFORM_CPPFLAGS += -D__I386__
endif
-if
neq ($(CONFIG_EFI_STUB)$(CONFIG_CMD_BOOTEFI_HELLO_COMPILE),)
+if
def CONFIG_EFI_STUB
-if
neq ($(CONFIG_EFI_STUB_64BIT),)
+if
def CONFIG_EFI_STUB_64BIT
EFI_LDS := elf_x86_64_efi.lds
EFI_CRT0 := crt0_x86_64_efi.o
EFI_RELOC := reloc_x86_64_efi.o
EFI_LDS := elf_x86_64_efi.lds
EFI_CRT0 := crt0_x86_64_efi.o
EFI_RELOC := reloc_x86_64_efi.o
@@
-100,10
+98,22
@@
EFI_CRT0 := crt0_ia32_efi.o
EFI_RELOC := reloc_ia32_efi.o
endif
EFI_RELOC := reloc_ia32_efi.o
endif
+else
+
ifdef CONFIG_X86_64
ifdef CONFIG_X86_64
-EFI_TARGET := --target=efi-app-x86_64
+EFI_LDS := elf_x86_64_efi.lds
+EFI_CRT0 := crt0_x86_64_efi.o
+EFI_RELOC := reloc_x86_64_efi.o
else
else
-EFI_TARGET := --target=efi-app-ia32
+EFI_LDS := elf_ia32_efi.lds
+EFI_CRT0 := crt0_ia32_efi.o
+EFI_RELOC := reloc_ia32_efi.o
+endif
+
endif
endif
+ifdef CONFIG_X86_64
+EFI_TARGET := --target=efi-app-x86_64
+else
+EFI_TARGET := --target=efi-app-ia32
endif
endif