diff --git a/modules/coreboot b/modules/coreboot
index a578ae0b2..4cca37b09 100644
--- 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
deleted file mode 100644
index aa925348b..000000000
--- a/patches/coreboot-4.11/0010-cross-compiler-support.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/Makefile b/Makefile
-index f3f9592649..cb37557c81 100644
---- a/Makefile
-+++ b/Makefile
-@@ -164,6 +164,24 @@ $(if $(wildcard .xcompile)$(NOCOMPILE),,$(eval $(shell util/xcompile/xcompile $(
- 
- -include .xcompile
- 
-+ifneq "$(CROSS)" ""
-+  $(info coreboot: Using $(CROSS)gcc)
-+  CROSS_COMPILE_x86_32	:= $(CROSS)
-+  CC_x86_32		:= $(CROSS_COMPILE_x86_32)gcc
-+  CPP_x86_32		:= $(CROSS_COMPILE_x86_32)cpp
-+  AS_x86_32		:= $(CROSS_COMPILE_x86_32)as --32
-+  LD_x86_32		:= $(CROSS_COMPILE_x86_32)ld.bfd -b elf32-i386 -melf_i386
-+  NM_x86_32		:= $(CROSS_COMPILE_x86_32)nm
-+  OBJCOPY_x86_32	:= $(CROSS_COMPILE_x86_32)objcopy
-+  OBJDUMP_x86_32	:= $(CROSS_COMPILE_x86_32)objdump
-+  READELF_x86_32	:= $(CROSS_COMPILE_x86_32)readelf
-+  STRIP_x86_32		:= $(CROSS_COMPILE_x86_32)strip
-+  AR_x86_32		:= $(CROSS_COMPILE_x86_32)ar
-+  GNATBIND_x86_32	:= $(CROSS_COMPILE_x86_32)gnatbind
-+  COMPILER_RT_x86_32	:= $(shell $(CC_x86_32) --print-libgcc-file-name)
-+endif
-+
-+
- ifneq ($(XCOMPILE_COMPLETE),1)
- $(shell rm -f .xcompile)
- $(error .xcompile deleted because it's invalid. \
--- 
-2.20.1
-
diff --git a/patches/coreboot-4.13/0010-cross-compiler-support.patch b/patches/coreboot-4.13/0010-cross-compiler-support.patch
deleted file mode 100644
index c87f64f90..000000000
--- a/patches/coreboot-4.13/0010-cross-compiler-support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 027aae2faa..8251a9a478 100644
---- a/Makefile
-+++ b/Makefile
-@@ -176,6 +176,23 @@ $(if $(wildcard .xcompile)$(NOCOMPILE),,$(eval $(shell util/xcompile/xcompile $(
- 
- -include .xcompile
- 
-+ifneq "$(CROSS)" ""
-+  $(info coreboot: Using $(CROSS)gcc)
-+  CROSS_COMPILE_x86_32	:= $(CROSS)
-+  CC_x86_32		:= $(CROSS_COMPILE_x86_32)gcc
-+  CPP_x86_32		:= $(CROSS_COMPILE_x86_32)cpp
-+  AS_x86_32		:= $(CROSS_COMPILE_x86_32)as --32
-+  LD_x86_32		:= $(CROSS_COMPILE_x86_32)ld.bfd -b elf32-i386 -melf_i386
-+  NM_x86_32		:= $(CROSS_COMPILE_x86_32)nm
-+  OBJCOPY_x86_32	:= $(CROSS_COMPILE_x86_32)objcopy
-+  OBJDUMP_x86_32	:= $(CROSS_COMPILE_x86_32)objdump
-+  READELF_x86_32	:= $(CROSS_COMPILE_x86_32)readelf
-+  STRIP_x86_32		:= $(CROSS_COMPILE_x86_32)strip
-+  AR_x86_32		:= $(CROSS_COMPILE_x86_32)ar
-+  GNATBIND_x86_32	:= $(CROSS_COMPILE_x86_32)gnatbind
-+  COMPILER_RT_x86_32	:= $(shell $(CC_x86_32) --print-libgcc-file-name)
-+endif
-+
- ifneq ($(XCOMPILE_COMPLETE),1)
- $(shell rm -f .xcompile)
- $(error .xcompile deleted because it's invalid. \
diff --git a/patches/coreboot-4.8.1/0010-cross-compiler-support.patch b/patches/coreboot-4.8.1/0010-cross-compiler-support.patch
deleted file mode 100644
index b99941df7..000000000
--- a/patches/coreboot-4.8.1/0010-cross-compiler-support.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- clean/coreboot-4.8.1/Makefile	2018-05-16 21:00:17.000000000 +0200
-+++ coreboot-4.8.1/Makefile	2020-01-08 17:01:32.998287979 +0100
-@@ -152,6 +152,24 @@
- 
- -include .xcompile
- 
-+ifneq "$(CROSS)" ""
-+  $(info coreboot: Using $(CROSS)gcc)
-+  CROSS_COMPILE_x86_32	:= $(CROSS)
-+  CC_x86_32		:= $(CROSS_COMPILE_x86_32)gcc
-+  CPP_x86_32		:= $(CROSS_COMPILE_x86_32)cpp
-+  AS_x86_32		:= $(CROSS_COMPILE_x86_32)as --32
-+  LD_x86_32		:= $(CROSS_COMPILE_x86_32)ld.bfd -b elf32-i386 -melf_i386
-+  NM_x86_32		:= $(CROSS_COMPILE_x86_32)nm
-+  OBJCOPY_x86_32	:= $(CROSS_COMPILE_x86_32)objcopy
-+  OBJDUMP_x86_32	:= $(CROSS_COMPILE_x86_32)objdump
-+  READELF_x86_32	:= $(CROSS_COMPILE_x86_32)readelf
-+  STRIP_x86_32		:= $(CROSS_COMPILE_x86_32)strip
-+  AR_x86_32		:= $(CROSS_COMPILE_x86_32)ar
-+  GNATBIND_x86_32	:= $(CROSS_COMPILE_x86_32)gnatbind
-+  COMPILER_RT_x86_32	:= $(shell $(CC_x86_32) --print-libgcc-file-name)
-+endif
-+
-+
- ifneq ($(XCOMPILE_COMPLETE),1)
- $(shell rm -f .xcompile)
- $(error .xcompile deleted because it's invalid. \