| Message ID | 1474860866-16406-69-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | ca5114f9afb9824ab4895cf75c37d1bc450cb08a |
| Delegated to: | Bin Meng |
| Headers | show |
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index ad3200a..7f6d12a 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 +ifndef CONFIG_SPL_BUILD obj-$(CONFIG_CMD_BOOTM) += bootm.o +endif obj-y += cmd_boot.o obj-$(CONFIG_SEABIOS) += coreboot_table.o obj-$(CONFIG_EFI) += efi/ @@ -41,7 +43,9 @@ ifndef CONFIG_QEMU obj-$(CONFIG_GENERATE_ACPI_TABLE) += acpi_table.o endif obj-y += tables.o +ifndef CONFIG_SPL_BUILD obj-$(CONFIG_CMD_ZBOOT) += zimage.o +endif obj-$(CONFIG_HAVE_FSP) += fsp/ obj-$(CONFIG_SPL_BUILD) += spl.o
Booting into linux from 64-bit U-Boot is not yet supported. Avoid bringing in the bootm code until it is implemented. Of course 32-bit U-Boot still supported booting into both 32- and 64-bit kernels. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/x86/lib/Makefile | 4 ++++ 1 file changed, 4 insertions(+)