8 files changed, 8 insertions, 65 deletions
diff --git a/config/data/coreboot/build.list b/config/data/coreboot/build.list
index f6535149..55c2ee44 100644
--- a/config/data/coreboot/build.list
+++ b/config/data/coreboot/build.list
@@ -1 +1,2 @@
 build/coreboot.rom
+payloads/external/edk2/workspace/Build/UefiPayloadPkgX64/RELEASE_GCC/FV/UEFIPAYLOAD.fd
diff --git a/config/data/coreboot/libreboot.bmp b/config/data/coreboot/libreboot.bmp
new file mode 100644
index 00000000..adad7a9a
--- /dev/null
+++ b/config/data/coreboot/libreboot.bmp
diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg
index 3c8b18d9..485be95d 100644
--- a/config/data/coreboot/mkhelper.cfg
+++ b/config/data/coreboot/mkhelper.cfg
@@ -5,7 +5,7 @@ url="https://github.com/coreboot/coreboot.git"
 bkup_url="https://review.coreboot.org/coreboot"
 
 makeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS"
-build_depend="seabios/build grub/default memtest86plus/default u-boot/amd64coreboot"
+build_depend="seabios/build grub/default memtest86plus/default"
 
 seavgabiosrom="elf/seabios/default/build/libgfxinit/vgabios.bin"
 
@@ -24,9 +24,14 @@ pname=""
 displaymode=""
 tmprom=""
 newrom=""
-payload_uboot=""
+payload_uboot="" # arm64 only. edk2 replaced it on x86
+payload_edk2=""
 cbfscfg=""
 
 premake="corebootpremake"
 mkhelper="$if_not_dry_build coreboot_pad_one_byte"
 postmake="$if_not_dry_build mkcorebootbin"
+cook_config="$if_not_dry_build cook_coreboot_config"
+
+
+
diff --git a/config/data/grub/bootorder_uboot b/config/data/grub/bootorder_uboot
deleted file mode 100644
index 80641a36..00000000
--- a/config/data/grub/bootorder_uboot
+++ /dev/null
@@ -1 +0,0 @@
-/rom@img/u-boot
diff --git a/config/data/grub/cfg/default.config b/config/data/grub/cfg/default.config
index 3d84413e..c454965c 100644
--- a/config/data/grub/cfg/default.config
+++ b/config/data/grub/cfg/default.config
@@ -229,38 +229,18 @@ menuentry 'Load test configuration (grubtest.cfg) inside of CBFS  [t]' --hotkey=
 	fi
 }
 fi
-if [ -f (cbfsdisk)/u-boot ]; then
-menuentry 'U-Boot i386 payload (experimental) [u]' --hotkey='u' {
-	set root='cbfsdisk'
-	chainloader /u-boot
-}
-fi
 if [ -f (cbfsdisk)/seabios.elf ]; then
-if [ -f (cbfsdisk)/img/u-boot ]; then
-menuentry 'Load SeaBIOS (U-Boot UEFI available in the ESC menu) [b]' --hotkey='b' {
-	set root='cbfsdisk'
-	chainloader /seabios.elf
-}
-else
 menuentry 'Load SeaBIOS [b]' --hotkey='b' {
 	set root='cbfsdisk'
 	chainloader /seabios.elf
 }
 fi
-fi
 if [ -f (cbfsdisk)/img/grub2 ]; then
-if [ -f (cbfsdisk)/img/u-boot ]; then
-menuentry 'Return to SeaBIOS (U-Boot UEFI available in the ESC menu) [b]' --hotkey='b' {
-	set root='cbfsdisk'
-	chainloader /fallback/payload
-}
-else
 menuentry 'Return to SeaBIOS [b]' --hotkey='b' {
 	set root='cbfsdisk'
 	chainloader /fallback/payload
 }
 fi
-fi
 menuentry 'Poweroff  [p]' --hotkey='p' {
 	halt
 }
diff --git a/config/data/grub/cfg/nvme.config b/config/data/grub/cfg/nvme.config
index 4f3de36e..33ce3a9a 100644
--- a/config/data/grub/cfg/nvme.config
+++ b/config/data/grub/cfg/nvme.config
@@ -244,38 +244,18 @@ menuentry 'Load test configuration (grubtest.cfg) inside of CBFS  [t]' --hotkey=
 	fi
 }
 fi
-if [ -f (cbfsdisk)/u-boot ]; then
-menuentry 'U-Boot i386 payload (experimental) [u]' --hotkey='u' {
-	set root='cbfsdisk'
-	chainloader /u-boot
-}
-fi
 if [ -f (cbfsdisk)/seabios.elf ]; then
-if [ -f (cbfsdisk)/img/u-boot ]; then
-menuentry 'Load SeaBIOS (U-Boot UEFI available in the ESC menu) [b]' --hotkey='b' {
-	set root='cbfsdisk'
-	chainloader /seabios.elf
-}
-else
 menuentry 'Load SeaBIOS [b]' --hotkey='b' {
 	set root='cbfsdisk'
 	chainloader /seabios.elf
 }
 fi
-fi
 if [ -f (cbfsdisk)/img/grub2 ]; then
-if [ -f (cbfsdisk)/img/u-boot ]; then
-menuentry 'Return to SeaBIOS (U-Boot UEFI available in the ESC menu) [b]' --hotkey='b' {
-	set root='cbfsdisk'
-	chainloader /fallback/payload
-}
-else
 menuentry 'Return to SeaBIOS [b]' --hotkey='b' {
 	set root='cbfsdisk'
 	chainloader /fallback/payload
 }
 fi
-fi
 menuentry 'Poweroff  [p]' --hotkey='p' {
 	halt
 }
diff --git a/config/data/grub/cfg/xhci_nvme.config b/config/data/grub/cfg/xhci_nvme.config
index 9db22fe2..dbcae070 100644
--- a/config/data/grub/cfg/xhci_nvme.config
+++ b/config/data/grub/cfg/xhci_nvme.config
@@ -245,38 +245,18 @@ menuentry 'Load test configuration (grubtest.cfg) in CBFS  [t]' --hotkey='t' {
 	fi
 }
 fi
-if [ -f (cbfsdisk)/u-boot ]; then
-menuentry 'U-Boot i386 payload (experimental) [u]' --hotkey='u' {
-	set root='cbfsdisk'
-	chainloader /u-boot
-}
-fi
 if [ -f (cbfsdisk)/seabios.elf ]; then
-if [ -f (cbfsdisk)/img/u-boot ]; then
-menuentry 'Load SeaBIOS (U-Boot UEFI available in the ESC menu) [b]' --hotkey='b' {
-	set root='cbfsdisk'
-	chainloader /seabios.elf
-}
-else
 menuentry 'Load SeaBIOS [b]' --hotkey='b' {
 	set root='cbfsdisk'
 	chainloader /seabios.elf
 }
 fi
-fi
 if [ -f (cbfsdisk)/img/grub2 ]; then
-if [ -f (cbfsdisk)/img/u-boot ]; then
-menuentry 'Return to SeaBIOS (U-Boot UEFI available in the ESC menu) [b]' --hotkey='b' {
-	set root='cbfsdisk'
-	chainloader /fallback/payload
-}
-else
 menuentry 'Return to SeaBIOS [b]' --hotkey='b' {
 	set root='cbfsdisk'
 	chainloader /fallback/payload
 }
 fi
-fi
 menuentry 'Poweroff  [p]' --hotkey='p' {
 	halt
 }
diff --git a/config/data/u-boot/build.list b/config/data/u-boot/build.list
index 5af3064a..8d9a5cf0 100644
--- a/config/data/u-boot/build.list
+++ b/config/data/u-boot/build.list
@@ -4,5 +4,3 @@ u-boot.dtb
 u-boot.img
 u-boot.itb
 u-boot.elf
-u-boot-dtb.bin
-u-boot-x86-with-spl.bin