Merge pull request #938 from tlaurion/revert-coreboot_musl-cross-make

coreboot: revert building coreboot against musl-cross-make.
linuxboot · Dec 30, 2020 · 7c686d5 · 7c686d5
2 parents b06a26f + 8e44853
commit 7c686d5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 88 deletions.
diff --git a/modules/coreboot b/modules/coreboot
@@ -70,7 +70,11 @@ coreboot_target := \
 coreboot_output := coreboot.rom
 coreboot_depend += linux initrd $(musl_dep)
 
-$(build)/$(coreboot_dir)/.configured: $(COREBOOT_IASL)
+COREBOOT_TOOLCHAIN="$(build)/$(coreboot_base_dir)/.xcompile"
+$(COREBOOT_TOOLCHAIN): $(build)/$(coreboot_base_dir)/.canary
+	$(MAKE) -C "$(build)/$(coreboot_base_dir)" CPUS=$$CPUS crossgcc-i386
+
+$(build)/$(coreboot_dir)/.configured: $(COREBOOT_IASL) $(COREBOOT_TOOLCHAIN)
 $(COREBOOT_IASL): $(build)/$(coreboot_base_dir)/.canary
 	$(MAKE) -C "$(build)/$(coreboot_base_dir)" CPUS=$(CPUS) iasl
 

diff --git a/patches/coreboot-4.11/0010-cross-compiler-support.patch b/patches/coreboot-4.11/0010-cross-compiler-support.patch
diff --git a/patches/coreboot-4.13/0010-cross-compiler-support.patch b/patches/coreboot-4.13/0010-cross-compiler-support.patch
diff --git a/patches/coreboot-4.8.1/0010-cross-compiler-support.patch b/patches/coreboot-4.8.1/0010-cross-compiler-support.patch