diff options
author | Tom Rini <trini@konsulko.com> | 2023-05-11 08:40:33 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-05-11 08:40:33 -0400 |
commit | e94fbdd2729fdcd570035d43f67adda8e0dfc115 (patch) | |
tree | fc4d5d6f989618994e0af5bb61f9918e4c8a7478 /arch/x86/lib/Makefile | |
parent | 0a9a4384c1483a88776bca38e28f09be51161034 (diff) | |
parent | b982f89c583c6c03f4d1f94d29991ccf691a0f7c (diff) | |
download | u-boot-WIP/11May2023.zip u-boot-WIP/11May2023.tar.gz u-boot-WIP/11May2023.tar.bz2 |
Merge https://source.denx.de/u-boot/custodians/u-boot-x86WIP/11May2023
- Various fixes for Google chromebooks
- Various minor enhancements for coreboot
Diffstat (limited to 'arch/x86/lib/Makefile')
-rw-r--r-- | arch/x86/lib/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index a6f2244..b0612ae 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -10,7 +10,9 @@ obj-y += bios.o obj-y += bios_asm.o obj-y += bios_interrupts.o endif -obj-y += string.o +endif +ifndef CONFIG_SPL_BUILD +obj-$(CONFIG_X86_32BIT_INIT) += string.o endif ifndef CONFIG_SPL_BUILD obj-$(CONFIG_CMD_BOOTM) += bootm.o |