diff options
89 files changed, 169 insertions, 43 deletions
diff --git a/config/coreboot/dell3050micro_fsp_16mb/target.cfg b/config/coreboot/dell3050micro_fsp_16mb/target.cfg index d6bd3872..8ab796e4 100644 --- a/config/coreboot/dell3050micro_fsp_16mb/target.cfg +++ b/config/coreboot/dell3050micro_fsp_16mb/target.cfg @@ -6,5 +6,6 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci" vcfg="3050micro" -build_depend="seabios/default grub/xhci memtest86plus" +build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" IFD_platform="sklkbl" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/dell7010sff_12mb/target.cfg b/config/coreboot/dell7010sff_12mb/target.cfg index abc1d14e..aa08547a 100644 --- a/config/coreboot/dell7010sff_12mb/target.cfg +++ b/config/coreboot/dell7010sff_12mb/target.cfg @@ -6,4 +6,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" vcfg="t1650" -build_depend="seabios/default grub/nvme memtest86plus" +build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/dell780mt_8mb/target.cfg b/config/coreboot/dell780mt_8mb/target.cfg index eca44aa2..50ea82b6 100644 --- a/config/coreboot/dell780mt_8mb/target.cfg +++ b/config/coreboot/dell780mt_8mb/target.cfg @@ -5,4 +5,5 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci ata" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus" +build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/dell780mt_truncate_8mb/target.cfg b/config/coreboot/dell780mt_truncate_8mb/target.cfg index eca44aa2..50ea82b6 100644 --- a/config/coreboot/dell780mt_truncate_8mb/target.cfg +++ b/config/coreboot/dell780mt_truncate_8mb/target.cfg @@ -5,4 +5,5 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci ata" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus" +build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/dell780usff_8mb/target.cfg b/config/coreboot/dell780usff_8mb/target.cfg index eca44aa2..50ea82b6 100644 --- a/config/coreboot/dell780usff_8mb/target.cfg +++ b/config/coreboot/dell780usff_8mb/target.cfg @@ -5,4 +5,5 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci ata" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus" +build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/dell780usff_truncate_8mb/target.cfg b/config/coreboot/dell780usff_truncate_8mb/target.cfg index eca44aa2..50ea82b6 100644 --- a/config/coreboot/dell780usff_truncate_8mb/target.cfg +++ b/config/coreboot/dell780usff_truncate_8mb/target.cfg @@ -5,4 +5,5 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci ata" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus" +build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/dell9020mt_nri_12mb/target.cfg b/config/coreboot/dell9020mt_nri_12mb/target.cfg index e7411d7f..5be15ac2 100644 --- a/config/coreboot/dell9020mt_nri_12mb/target.cfg +++ b/config/coreboot/dell9020mt_nri_12mb/target.cfg @@ -6,4 +6,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci" vcfg="haswell" -build_depend="seabios/default grub/xhci memtest86plus" +build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/dell9020sff_nri_12mb/target.cfg b/config/coreboot/dell9020sff_nri_12mb/target.cfg index e7411d7f..5be15ac2 100644 --- a/config/coreboot/dell9020sff_nri_12mb/target.cfg +++ b/config/coreboot/dell9020sff_nri_12mb/target.cfg @@ -6,4 +6,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci" vcfg="haswell" -build_depend="seabios/default grub/xhci memtest86plus" +build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/e4300_4mb/target.cfg b/config/coreboot/e4300_4mb/target.cfg index 4a9af479..0b81f02f 100644 --- a/config/coreboot/e4300_4mb/target.cfg +++ b/config/coreboot/e4300_4mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/e5420_6mb/target.cfg b/config/coreboot/e5420_6mb/target.cfg index 4201beb1..27291f4d 100644 --- a/config/coreboot/e5420_6mb/target.cfg +++ b/config/coreboot/e5420_6mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/e5520_6mb/target.cfg b/config/coreboot/e5520_6mb/target.cfg index 4201beb1..27291f4d 100644 --- a/config/coreboot/e5520_6mb/target.cfg +++ b/config/coreboot/e5520_6mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/e5530_12mb/target.cfg b/config/coreboot/e5530_12mb/target.cfg index 2556a4ce..c0b56379 100644 --- a/config/coreboot/e5530_12mb/target.cfg +++ b/config/coreboot/e5530_12mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/e6220_10mb/target.cfg b/config/coreboot/e6220_10mb/target.cfg index 4201beb1..27291f4d 100644 --- a/config/coreboot/e6220_10mb/target.cfg +++ b/config/coreboot/e6220_10mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/e6230_12mb/target.cfg b/config/coreboot/e6230_12mb/target.cfg index 2556a4ce..5bd85905 100644 --- a/config/coreboot/e6230_12mb/target.cfg +++ b/config/coreboot/e6230_12mb/target.cfg @@ -5,3 +5,5 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" +payload_uboot_amd64="y" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/e6320_10mb/target.cfg b/config/coreboot/e6320_10mb/target.cfg index 4201beb1..27291f4d 100644 --- a/config/coreboot/e6320_10mb/target.cfg +++ b/config/coreboot/e6320_10mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/e6330_12mb/target.cfg b/config/coreboot/e6330_12mb/target.cfg index 2556a4ce..c0b56379 100644 --- a/config/coreboot/e6330_12mb/target.cfg +++ b/config/coreboot/e6330_12mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/e6400_4mb/target.cfg b/config/coreboot/e6400_4mb/target.cfg index 98eb8d3b..a0b322d3 100644 --- a/config/coreboot/e6400_4mb/target.cfg +++ b/config/coreboot/e6400_4mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="e6400" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/e6400nvidia_4mb/target.cfg b/config/coreboot/e6400nvidia_4mb/target.cfg index 98eb8d3b..a0b322d3 100644 --- a/config/coreboot/e6400nvidia_4mb/target.cfg +++ b/config/coreboot/e6400nvidia_4mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="e6400" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/e6420_10mb/target.cfg b/config/coreboot/e6420_10mb/target.cfg index 4201beb1..27291f4d 100644 --- a/config/coreboot/e6420_10mb/target.cfg +++ b/config/coreboot/e6420_10mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/e6430_12mb/target.cfg b/config/coreboot/e6430_12mb/target.cfg index 2556a4ce..c0b56379 100644 --- a/config/coreboot/e6430_12mb/target.cfg +++ b/config/coreboot/e6430_12mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/e6520_10mb/target.cfg b/config/coreboot/e6520_10mb/target.cfg index 4201beb1..27291f4d 100644 --- a/config/coreboot/e6520_10mb/target.cfg +++ b/config/coreboot/e6520_10mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/e6530_12mb/target.cfg b/config/coreboot/e6530_12mb/target.cfg index 2556a4ce..c0b56379 100644 --- a/config/coreboot/e6530_12mb/target.cfg +++ b/config/coreboot/e6530_12mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/g43t_am3/target.cfg b/config/coreboot/g43t_am3/target.cfg index 7f3d7886..7bc27788 100644 --- a/config/coreboot/g43t_am3/target.cfg +++ b/config/coreboot/g43t_am3/target.cfg @@ -3,4 +3,5 @@ xarch="i386-elf" payload_seabios="y" payload_memtest="y" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus" +build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/g43t_am3_16mb/target.cfg b/config/coreboot/g43t_am3_16mb/target.cfg index 594b6612..bef863ee 100644 --- a/config/coreboot/g43t_am3_16mb/target.cfg +++ b/config/coreboot/g43t_am3_16mb/target.cfg @@ -4,4 +4,5 @@ payload_seabios="y" payload_memtest="y" release="n" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus" +build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/hp2170p_16mb/target.cfg b/config/coreboot/hp2170p_16mb/target.cfg index f7544548..f12beab7 100644 --- a/config/coreboot/hp2170p_16mb/target.cfg +++ b/config/coreboot/hp2170p_16mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="hp2170p" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/hp2560p_8mb/target.cfg b/config/coreboot/hp2560p_8mb/target.cfg index a9dfe4e4..a3f8ba84 100644 --- a/config/coreboot/hp2560p_8mb/target.cfg +++ b/config/coreboot/hp2560p_8mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="hp2560p" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/hp2570p_16mb/target.cfg b/config/coreboot/hp2570p_16mb/target.cfg index 928527da..d899d7d9 100644 --- a/config/coreboot/hp2570p_16mb/target.cfg +++ b/config/coreboot/hp2570p_16mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="hp2570p" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/hp8200sff_4mb/target.cfg b/config/coreboot/hp8200sff_4mb/target.cfg index 54966da1..8d18ae23 100644 --- a/config/coreboot/hp8200sff_4mb/target.cfg +++ b/config/coreboot/hp8200sff_4mb/target.cfg @@ -6,4 +6,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" vcfg="hp8200sff" -build_depend="seabios/default grub/nvme memtest86plus" +build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/hp8200sff_8mb/target.cfg b/config/coreboot/hp8200sff_8mb/target.cfg index 54966da1..8d18ae23 100644 --- a/config/coreboot/hp8200sff_8mb/target.cfg +++ b/config/coreboot/hp8200sff_8mb/target.cfg @@ -6,4 +6,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" vcfg="hp8200sff" -build_depend="seabios/default grub/nvme memtest86plus" +build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/hp820g2_12mb/target.cfg b/config/coreboot/hp820g2_12mb/target.cfg index 99be701a..be150000 100644 --- a/config/coreboot/hp820g2_12mb/target.cfg +++ b/config/coreboot/hp820g2_12mb/target.cfg @@ -7,4 +7,5 @@ release="n" grub_scan_disk="nvme ahci" grubtree="xhci" vcfg="hp820g2" -build_depend="seabios/default grub/xhci memtest86plus" +build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/hp8300cmt_16mb/target.cfg b/config/coreboot/hp8300cmt_16mb/target.cfg index d0e19b73..7cbc8dad 100644 --- a/config/coreboot/hp8300cmt_16mb/target.cfg +++ b/config/coreboot/hp8300cmt_16mb/target.cfg @@ -6,4 +6,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" vcfg="ivybridge" -build_depend="seabios/default grub/nvme memtest86plus" +build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/hp8300usdt_16mb/target.cfg b/config/coreboot/hp8300usdt_16mb/target.cfg index 2556a4ce..c0b56379 100644 --- a/config/coreboot/hp8300usdt_16mb/target.cfg +++ b/config/coreboot/hp8300usdt_16mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/hp8460pintel_8mb/target.cfg b/config/coreboot/hp8460pintel_8mb/target.cfg index b39036ba..5897b9bc 100644 --- a/config/coreboot/hp8460pintel_8mb/target.cfg +++ b/config/coreboot/hp8460pintel_8mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="hp8460pintel" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/hp8470pintel_16mb/target.cfg b/config/coreboot/hp8470pintel_16mb/target.cfg index d960f36b..72e64b8a 100644 --- a/config/coreboot/hp8470pintel_16mb/target.cfg +++ b/config/coreboot/hp8470pintel_16mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="hp8470pintel" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/hp8560w_8mb/target.cfg b/config/coreboot/hp8560w_8mb/target.cfg index 7bad4889..dcdd1dc8 100644 --- a/config/coreboot/hp8560w_8mb/target.cfg +++ b/config/coreboot/hp8560w_8mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="hp8560w" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/hp9470m_16mb/target.cfg b/config/coreboot/hp9470m_16mb/target.cfg index 35a0a6fd..4580be7b 100644 --- a/config/coreboot/hp9470m_16mb/target.cfg +++ b/config/coreboot/hp9470m_16mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="hp9470m" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/kcma_d8_16mb/target.cfg b/config/coreboot/kcma_d8_16mb/target.cfg index 5f705f43..b0ab3d02 100644 --- a/config/coreboot/kcma_d8_16mb/target.cfg +++ b/config/coreboot/kcma_d8_16mb/target.cfg @@ -6,4 +6,5 @@ payload_memtest="y" xlang="c" grub_scan_disk="nvme ahci" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus" +build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/kcma_d8_2mb/target.cfg b/config/coreboot/kcma_d8_2mb/target.cfg index 5f705f43..b0ab3d02 100644 --- a/config/coreboot/kcma_d8_2mb/target.cfg +++ b/config/coreboot/kcma_d8_2mb/target.cfg @@ -6,4 +6,5 @@ payload_memtest="y" xlang="c" grub_scan_disk="nvme ahci" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus" +build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/kfsn4_dre_1mb/target.cfg b/config/coreboot/kfsn4_dre_1mb/target.cfg index 57e64580..c5759ac8 100644 --- a/config/coreboot/kfsn4_dre_1mb/target.cfg +++ b/config/coreboot/kfsn4_dre_1mb/target.cfg @@ -3,4 +3,5 @@ xarch="i386-elf" payload_seabios="y" payload_memtest="y" xlang="c" -build_depend="seabios/default memtest86plus" +build_depend="seabios/default memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/kfsn4_dre_2mb/target.cfg b/config/coreboot/kfsn4_dre_2mb/target.cfg index 606962a2..94601104 100644 --- a/config/coreboot/kfsn4_dre_2mb/target.cfg +++ b/config/coreboot/kfsn4_dre_2mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" xlang="c" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/kgpe_d16_16mb/target.cfg b/config/coreboot/kgpe_d16_16mb/target.cfg index 5f705f43..b0ab3d02 100644 --- a/config/coreboot/kgpe_d16_16mb/target.cfg +++ b/config/coreboot/kgpe_d16_16mb/target.cfg @@ -6,4 +6,5 @@ payload_memtest="y" xlang="c" grub_scan_disk="nvme ahci" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus" +build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/kgpe_d16_2mb/target.cfg b/config/coreboot/kgpe_d16_2mb/target.cfg index 5f705f43..b0ab3d02 100644 --- a/config/coreboot/kgpe_d16_2mb/target.cfg +++ b/config/coreboot/kgpe_d16_2mb/target.cfg @@ -6,4 +6,5 @@ payload_memtest="y" xlang="c" grub_scan_disk="nvme ahci" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus" +build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/macbook11/target.cfg b/config/coreboot/macbook11/target.cfg index 9ceb99e8..2661c6b2 100644 --- a/config/coreboot/macbook11/target.cfg +++ b/config/coreboot/macbook11/target.cfg @@ -3,4 +3,5 @@ xarch="i386-elf" payload_seabios="y" payload_grub="y" grub_scan_disk="ahci" -build_depend="seabios/default grub/default" +build_depend="seabios/default grub/default u-boot/i386coreboot" +payload_uboot_i386="y" diff --git a/config/coreboot/macbook11_16mb/target.cfg b/config/coreboot/macbook11_16mb/target.cfg index a53a1668..e37b6307 100644 --- a/config/coreboot/macbook11_16mb/target.cfg +++ b/config/coreboot/macbook11_16mb/target.cfg @@ -3,4 +3,5 @@ xarch="i386-elf" payload_seabios="y" payload_grub="y" scan_scan_disk="ahci" -build_depend="seabios/default grub/default" +build_depend="seabios/default grub/default u-boot/i386coreboot" +payload_uboot_i386="y" diff --git a/config/coreboot/macbook21/target.cfg b/config/coreboot/macbook21/target.cfg index 4a9af479..0b81f02f 100644 --- a/config/coreboot/macbook21/target.cfg +++ b/config/coreboot/macbook21/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/macbook21_16mb/target.cfg b/config/coreboot/macbook21_16mb/target.cfg index 4a9af479..0b81f02f 100644 --- a/config/coreboot/macbook21_16mb/target.cfg +++ b/config/coreboot/macbook21_16mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/qemu_x86_64_12mb/target.cfg b/config/coreboot/qemu_x86_64_12mb/target.cfg index 3db013b4..5c1a733f 100644 --- a/config/coreboot/qemu_x86_64_12mb/target.cfg +++ b/config/coreboot/qemu_x86_64_12mb/target.cfg @@ -3,5 +3,4 @@ xarch="i386-elf" payload_grub="y" payload_seabios="y" payload_memtest="y" -build_depend="seabios/default grub/default memtest86plus u-boot/amd64coreboot" payload_uboot_amd64="y" diff --git a/config/coreboot/r400_16mb/target.cfg b/config/coreboot/r400_16mb/target.cfg index 4a9af479..0b81f02f 100644 --- a/config/coreboot/r400_16mb/target.cfg +++ b/config/coreboot/r400_16mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/r400_4mb/target.cfg b/config/coreboot/r400_4mb/target.cfg index 4a9af479..0b81f02f 100644 --- a/config/coreboot/r400_4mb/target.cfg +++ b/config/coreboot/r400_4mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/r400_8mb/target.cfg b/config/coreboot/r400_8mb/target.cfg index f596cc06..ba490833 100644 --- a/config/coreboot/r400_8mb/target.cfg +++ b/config/coreboot/r400_8mb/target.cfg @@ -3,3 +3,4 @@ xarch="i386-elf" payload_seabios="y" payload_grub="y" payload_memtest="y" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/r500_4mb/target.cfg b/config/coreboot/r500_4mb/target.cfg index 4a9af479..0b81f02f 100644 --- a/config/coreboot/r500_4mb/target.cfg +++ b/config/coreboot/r500_4mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/t1650_12mb/target.cfg b/config/coreboot/t1650_12mb/target.cfg index abc1d14e..aa08547a 100644 --- a/config/coreboot/t1650_12mb/target.cfg +++ b/config/coreboot/t1650_12mb/target.cfg @@ -6,4 +6,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" vcfg="t1650" -build_depend="seabios/default grub/nvme memtest86plus" +build_depend="seabios/default grub/nvme memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/t400_16mb/target.cfg b/config/coreboot/t400_16mb/target.cfg index 4a9af479..0b81f02f 100644 --- a/config/coreboot/t400_16mb/target.cfg +++ b/config/coreboot/t400_16mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/t400_4mb/target.cfg b/config/coreboot/t400_4mb/target.cfg index 4a9af479..0b81f02f 100644 --- a/config/coreboot/t400_4mb/target.cfg +++ b/config/coreboot/t400_4mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/t400_8mb/target.cfg b/config/coreboot/t400_8mb/target.cfg index 4a9af479..0b81f02f 100644 --- a/config/coreboot/t400_8mb/target.cfg +++ b/config/coreboot/t400_8mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/t420_8mb/target.cfg b/config/coreboot/t420_8mb/target.cfg index 4201beb1..27291f4d 100644 --- a/config/coreboot/t420_8mb/target.cfg +++ b/config/coreboot/t420_8mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/t420s_8mb/target.cfg b/config/coreboot/t420s_8mb/target.cfg index 4201beb1..27291f4d 100644 --- a/config/coreboot/t420s_8mb/target.cfg +++ b/config/coreboot/t420s_8mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/t430_12mb/target.cfg b/config/coreboot/t430_12mb/target.cfg index 2556a4ce..c0b56379 100644 --- a/config/coreboot/t430_12mb/target.cfg +++ b/config/coreboot/t430_12mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/t440plibremrc_12mb/target.cfg b/config/coreboot/t440plibremrc_12mb/target.cfg index e7411d7f..5be15ac2 100644 --- a/config/coreboot/t440plibremrc_12mb/target.cfg +++ b/config/coreboot/t440plibremrc_12mb/target.cfg @@ -6,4 +6,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci" vcfg="haswell" -build_depend="seabios/default grub/xhci memtest86plus" +build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/t500_16mb/target.cfg b/config/coreboot/t500_16mb/target.cfg index 4a9af479..0b81f02f 100644 --- a/config/coreboot/t500_16mb/target.cfg +++ b/config/coreboot/t500_16mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/t500_4mb/target.cfg b/config/coreboot/t500_4mb/target.cfg index 4a9af479..0b81f02f 100644 --- a/config/coreboot/t500_4mb/target.cfg +++ b/config/coreboot/t500_4mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/t500_8mb/target.cfg b/config/coreboot/t500_8mb/target.cfg index 4a9af479..0b81f02f 100644 --- a/config/coreboot/t500_8mb/target.cfg +++ b/config/coreboot/t500_8mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/t520_8mb/target.cfg b/config/coreboot/t520_8mb/target.cfg index 4201beb1..27291f4d 100644 --- a/config/coreboot/t520_8mb/target.cfg +++ b/config/coreboot/t520_8mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/t530_12mb/target.cfg b/config/coreboot/t530_12mb/target.cfg index 2556a4ce..c0b56379 100644 --- a/config/coreboot/t530_12mb/target.cfg +++ b/config/coreboot/t530_12mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/t60_16mb_intelgpu/target.cfg b/config/coreboot/t60_16mb_intelgpu/target.cfg index 9ceb99e8..2661c6b2 100644 --- a/config/coreboot/t60_16mb_intelgpu/target.cfg +++ b/config/coreboot/t60_16mb_intelgpu/target.cfg @@ -3,4 +3,5 @@ xarch="i386-elf" payload_seabios="y" payload_grub="y" grub_scan_disk="ahci" -build_depend="seabios/default grub/default" +build_depend="seabios/default grub/default u-boot/i386coreboot" +payload_uboot_i386="y" diff --git a/config/coreboot/t60_intelgpu/target.cfg b/config/coreboot/t60_intelgpu/target.cfg index 9ceb99e8..2661c6b2 100644 --- a/config/coreboot/t60_intelgpu/target.cfg +++ b/config/coreboot/t60_intelgpu/target.cfg @@ -3,4 +3,5 @@ xarch="i386-elf" payload_seabios="y" payload_grub="y" grub_scan_disk="ahci" -build_depend="seabios/default grub/default" +build_depend="seabios/default grub/default u-boot/i386coreboot" +payload_uboot_i386="y" diff --git a/config/coreboot/w500_16mb/target.cfg b/config/coreboot/w500_16mb/target.cfg index 4a9af479..0b81f02f 100644 --- a/config/coreboot/w500_16mb/target.cfg +++ b/config/coreboot/w500_16mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/w500_4mb/target.cfg b/config/coreboot/w500_4mb/target.cfg index 4a9af479..0b81f02f 100644 --- a/config/coreboot/w500_4mb/target.cfg +++ b/config/coreboot/w500_4mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/w500_8mb/target.cfg b/config/coreboot/w500_8mb/target.cfg index 4a9af479..0b81f02f 100644 --- a/config/coreboot/w500_8mb/target.cfg +++ b/config/coreboot/w500_8mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/w530_12mb/target.cfg b/config/coreboot/w530_12mb/target.cfg index 2556a4ce..c0b56379 100644 --- a/config/coreboot/w530_12mb/target.cfg +++ b/config/coreboot/w530_12mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/w541_12mb/target.cfg b/config/coreboot/w541_12mb/target.cfg index e7411d7f..5be15ac2 100644 --- a/config/coreboot/w541_12mb/target.cfg +++ b/config/coreboot/w541_12mb/target.cfg @@ -6,4 +6,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci" vcfg="haswell" -build_depend="seabios/default grub/xhci memtest86plus" +build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/x200_16mb/target.cfg b/config/coreboot/x200_16mb/target.cfg index 4a9af479..0b81f02f 100644 --- a/config/coreboot/x200_16mb/target.cfg +++ b/config/coreboot/x200_16mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/x200_4mb/target.cfg b/config/coreboot/x200_4mb/target.cfg index 4a9af479..0b81f02f 100644 --- a/config/coreboot/x200_4mb/target.cfg +++ b/config/coreboot/x200_4mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/x200_8mb/target.cfg b/config/coreboot/x200_8mb/target.cfg index 4a9af479..0b81f02f 100644 --- a/config/coreboot/x200_8mb/target.cfg +++ b/config/coreboot/x200_8mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/x220_8mb/target.cfg b/config/coreboot/x220_8mb/target.cfg index 4201beb1..27291f4d 100644 --- a/config/coreboot/x220_8mb/target.cfg +++ b/config/coreboot/x220_8mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="sandybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/x230_12mb/target.cfg b/config/coreboot/x230_12mb/target.cfg index 2556a4ce..c0b56379 100644 --- a/config/coreboot/x230_12mb/target.cfg +++ b/config/coreboot/x230_12mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/x230_16mb/target.cfg b/config/coreboot/x230_16mb/target.cfg index 2556a4ce..c0b56379 100644 --- a/config/coreboot/x230_16mb/target.cfg +++ b/config/coreboot/x230_16mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/x230t_12mb/target.cfg b/config/coreboot/x230t_12mb/target.cfg index 2556a4ce..c0b56379 100644 --- a/config/coreboot/x230t_12mb/target.cfg +++ b/config/coreboot/x230t_12mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/x230t_16mb/target.cfg b/config/coreboot/x230t_16mb/target.cfg index 2556a4ce..c0b56379 100644 --- a/config/coreboot/x230t_16mb/target.cfg +++ b/config/coreboot/x230t_16mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="ahci" vcfg="ivybridge" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/x301_16mb/target.cfg b/config/coreboot/x301_16mb/target.cfg index 16ffc818..a364653c 100644 --- a/config/coreboot/x301_16mb/target.cfg +++ b/config/coreboot/x301_16mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" release="n" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/x301_4mb/target.cfg b/config/coreboot/x301_4mb/target.cfg index 16ffc818..a364653c 100644 --- a/config/coreboot/x301_4mb/target.cfg +++ b/config/coreboot/x301_4mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" release="n" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/x301_8mb/target.cfg b/config/coreboot/x301_8mb/target.cfg index 16ffc818..a364653c 100644 --- a/config/coreboot/x301_8mb/target.cfg +++ b/config/coreboot/x301_8mb/target.cfg @@ -5,3 +5,4 @@ payload_grub="y" payload_memtest="y" release="n" grub_scan_disk="ahci" +payload_uboot_amd64="y"
\ No newline at end of file diff --git a/config/coreboot/x60/target.cfg b/config/coreboot/x60/target.cfg index 9ceb99e8..2661c6b2 100644 --- a/config/coreboot/x60/target.cfg +++ b/config/coreboot/x60/target.cfg @@ -3,4 +3,5 @@ xarch="i386-elf" payload_seabios="y" payload_grub="y" grub_scan_disk="ahci" -build_depend="seabios/default grub/default" +build_depend="seabios/default grub/default u-boot/i386coreboot" +payload_uboot_i386="y" diff --git a/config/coreboot/x60_16mb/target.cfg b/config/coreboot/x60_16mb/target.cfg index 9ceb99e8..2661c6b2 100644 --- a/config/coreboot/x60_16mb/target.cfg +++ b/config/coreboot/x60_16mb/target.cfg @@ -3,4 +3,5 @@ xarch="i386-elf" payload_seabios="y" payload_grub="y" grub_scan_disk="ahci" -build_depend="seabios/default grub/default" +build_depend="seabios/default grub/default u-boot/i386coreboot" +payload_uboot_i386="y" diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg index a912400f..a218e0e7 100644 --- a/config/data/coreboot/mkhelper.cfg +++ b/config/data/coreboot/mkhelper.cfg @@ -1,7 +1,7 @@ . "include/rom.sh" makeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS" -build_depend="seabios/default grub/default memtest86plus" +build_depend="seabios/default grub/default memtest86plus u-boot/amd64coreboot" seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin" diff --git a/config/grub/default/config/payload b/config/grub/default/config/payload index a05cbfda..05e64bbd 100644 --- a/config/grub/default/config/payload +++ b/config/grub/default/config/payload @@ -216,24 +216,38 @@ menuentry 'Load test configuration (grubtest.cfg) inside of CBFS [t]' --hotkey= fi } fi -if [ -f (cbfsdisk)/img/u-boot ]; then -menuentry 'Highly experimental U-Boot payload [u]' --hotkey='u' { +if [ -f (cbfsdisk)/u-boot ]; then +menuentry 'U-Boot i386 payload (experimental) [u]' --hotkey='u' { set root='cbfsdisk' - chainloader /img/u-boot + chainloader /u-boot } fi if [ -f (cbfsdisk)/seabios.elf ]; then -menuentry 'Load SeaBIOS (payload) [b]' --hotkey='b' { +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/grub/nvme/config/payload b/config/grub/nvme/config/payload index 7f44b2bd..52b8dfd9 100644 --- a/config/grub/nvme/config/payload +++ b/config/grub/nvme/config/payload @@ -234,24 +234,38 @@ menuentry 'Load test configuration (grubtest.cfg) inside of CBFS [t]' --hotkey= fi } fi -if [ -f (cbfsdisk)/img/u-boot ]; then -menuentry 'Highly experimental U-Boot payload [u]' --hotkey='u' { +if [ -f (cbfsdisk)/u-boot ]; then +menuentry 'U-Boot i386 payload (experimental) [u]' --hotkey='u' { set root='cbfsdisk' - chainloader /img/u-boot + chainloader /u-boot } fi if [ -f (cbfsdisk)/seabios.elf ]; then -menuentry 'Load SeaBIOS (payload) [b]' --hotkey='b' { +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/grub/xhci/config/payload b/config/grub/xhci/config/payload index 4093edee..6a0fc250 100644 --- a/config/grub/xhci/config/payload +++ b/config/grub/xhci/config/payload @@ -235,24 +235,38 @@ menuentry 'Load test configuration (grubtest.cfg) in CBFS [t]' --hotkey='t' { fi } fi -if [ -f (cbfsdisk)/img/u-boot ]; then -menuentry 'Highly experimental U-Boot payload [u]' --hotkey='u' { +if [ -f (cbfsdisk)/u-boot ]; then +menuentry 'U-Boot i386 payload (experimental) [u]' --hotkey='u' { set root='cbfsdisk' - chainloader /img/u-boot + chainloader /u-boot } fi if [ -f (cbfsdisk)/seabios.elf ]; then -menuentry 'Load SeaBIOS (payload) [b]' --hotkey='b' { +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/include/rom.sh b/include/rom.sh index 808f83a4..96c7081a 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -187,8 +187,9 @@ add_uboot() [ "$payload_uboot_amd64" = "y" ]; then ubcbfsargs="-l 0x1110000 -e 0x1110000" # 64-bit and 32-bit # on 64-bit, 0x1120000 is the SPL, and stub before that - ubpath="img/u-boot" + ubpath="img/u-boot" # 64-bit ubtarget="amd64coreboot" + [ "$payload_uboot_i386" = "y" ] && ubpath="u-boot" # 32-bit [ "$payload_uboot_i386" = "y" ] && ubtarget="i386coreboot"; : fi |