From 4589e5d1d31e924e51f508c701582f75e7497248 Mon Sep 17 00:00:00 2001 From: Trammell Hudson Date: Tue, 2 Aug 2016 21:59:14 -0400 Subject: [PATCH] copy the bzImage into the coreboot build directory --- Makefile | 6 ++++++ config/coreboot.config | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b0abe89..4b609fb 100644 --- a/Makefile +++ b/Makefile @@ -145,3 +145,9 @@ initrd.cpio: $(initrd_bins) initrd_libs # hack for the linux kernel to depend on the initrd image # this will change once coreboot can link in the initrd separately $(call outputs,linux): initrd.cpio + +# hack for the coreboot to find the linux kernel +$(build)/$(coreboot_dir)/bzImage: $(call outputs,linux) + cmp --quiet "$$@" "$$^" || \ + cp -a "$$^" "$$@" +$(call outputs,corebot): $(build)/$(coreboot_dir)/bzImage diff --git a/config/coreboot.config b/config/coreboot.config index 44b2cf9..bac833c 100644 --- a/config/coreboot.config +++ b/config/coreboot.config @@ -550,7 +550,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y # CONFIG_PAYLOAD_UBOOT is not set CONFIG_PAYLOAD_LINUX=y # CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="../linux-4.6.4/arch/x86/boot/bzImage" +CONFIG_PAYLOAD_FILE="./bzImage" CONFIG_PAYLOAD_OPTIONS="" CONFIG_LINUX_COMMAND_LINE="" CONFIG_LINUX_INITRD=""