From 361e9fadcc0b28240d8859eeb1965f153264c36d Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 20 Sep 2026 23:05:46 +0100 Subject: build seabios in a target, not tree/default otherwise, the recent fix to coreboot builds breaks seabios builds. lbmk should be stable now. Signed-off-by: Leah Rowe --- config/data/coreboot/mkhelper.cfg | 4 +- config/module/coreboot/d510mo/target.cfg | 2 +- config/module/coreboot/d945gclf_512kb/target.cfg | 2 +- config/module/coreboot/d945gclf_8mb/target.cfg | 2 +- .../coreboot/dell3040micro_vfsp_16mb/target.cfg | 2 +- .../coreboot/dell3050micro_vfsp_16mb/target.cfg | 2 +- .../dell3050microsecure_vfsp_16mb/target.cfg | 2 +- config/module/coreboot/dell7010sff_12mb/target.cfg | 2 +- config/module/coreboot/dell780mt_8mb/target.cfg | 2 +- .../coreboot/dell780mt_truncate_8mb/target.cfg | 2 +- config/module/coreboot/dell780usff_8mb/target.cfg | 2 +- .../coreboot/dell780usff_truncate_8mb/target.cfg | 2 +- .../module/coreboot/dell9020mt_nri_12mb/target.cfg | 2 +- .../coreboot/dell9020sff_nri_12mb/target.cfg | 2 +- config/module/coreboot/e7240_12mb/target.cfg | 2 +- config/module/coreboot/g43t_am3/target.cfg | 2 +- config/module/coreboot/g43t_am3_16mb/target.cfg | 2 +- config/module/coreboot/ga_g41m_es2l/target.cfg | 2 +- config/module/coreboot/hp8200sff_4mb/target.cfg | 2 +- config/module/coreboot/hp8200sff_8mb/target.cfg | 2 +- config/module/coreboot/hp820g2_12mb/target.cfg | 2 +- config/module/coreboot/hp8300cmt_16mb/target.cfg | 2 +- .../module/coreboot/hppro3500series_8mb/target.cfg | 2 +- config/module/coreboot/kcma_d8_16mb/target.cfg | 2 +- config/module/coreboot/kcma_d8_2mb/target.cfg | 2 +- config/module/coreboot/kfsn4_dre_1mb/target.cfg | 2 +- config/module/coreboot/kgpe_d16_16mb/target.cfg | 2 +- config/module/coreboot/kgpe_d16_2mb/target.cfg | 2 +- config/module/coreboot/macbook11/target.cfg | 2 +- config/module/coreboot/macbook11_16mb/target.cfg | 2 +- config/module/coreboot/q45t_am/target.cfg | 2 +- config/module/coreboot/qemu_x86_12mb/target.cfg | 2 +- .../supermicro_x11ssh_f_vfsp_16mb/target.cfg | 2 +- config/module/coreboot/t1650_12mb/target.cfg | 2 +- .../module/coreboot/t1700mt_bmrc_12mb/target.cfg | 2 +- .../module/coreboot/t1700sff_bmrc_12mb/target.cfg | 2 +- .../module/coreboot/t440plibremrc_12mb/target.cfg | 2 +- .../coreboot/t440plibremrc_4mcbfs_12mb/target.cfg | 2 +- config/module/coreboot/t480_vfsp_16mb/target.cfg | 2 +- config/module/coreboot/t480s_vfsp_16mb/target.cfg | 2 +- config/module/coreboot/t580_vfsp_16mb/target.cfg | 2 +- .../module/coreboot/t60_16mb_intelgpu/target.cfg | 2 +- config/module/coreboot/t60_intelgpu/target.cfg | 2 +- config/module/coreboot/w541_12mb/target.cfg | 2 +- config/module/coreboot/x270_vfsp_16mb/target.cfg | 2 +- config/module/coreboot/x280_vfsp_16mb/target.cfg | 2 +- config/module/coreboot/x2e_n150/target.cfg | 2 +- config/module/coreboot/x60/target.cfg | 2 +- config/module/coreboot/x60_16mb/target.cfg | 2 +- config/module/seabios/build/config/libgfxinit | 98 ++++++++++++++++++++++ config/module/seabios/build/config/normal | 94 +++++++++++++++++++++ config/module/seabios/build/config/vgarom | 93 ++++++++++++++++++++ config/module/seabios/build/target.cfg | 3 + config/module/seabios/default/config/libgfxinit | 98 ---------------------- config/module/seabios/default/config/normal | 94 --------------------- config/module/seabios/default/config/vgarom | 93 -------------------- include/fw/rom.sh | 4 +- 57 files changed, 340 insertions(+), 337 deletions(-) create mode 100644 config/module/seabios/build/config/libgfxinit create mode 100644 config/module/seabios/build/config/normal create mode 100644 config/module/seabios/build/config/vgarom create mode 100644 config/module/seabios/build/target.cfg delete mode 100644 config/module/seabios/default/config/libgfxinit delete mode 100644 config/module/seabios/default/config/normal delete mode 100644 config/module/seabios/default/config/vgarom diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg index e49d9ec3..3c8b18d9 100644 --- a/config/data/coreboot/mkhelper.cfg +++ b/config/data/coreboot/mkhelper.cfg @@ -5,9 +5,9 @@ url="https://github.com/coreboot/coreboot.git" bkup_url="https://review.coreboot.org/coreboot" makeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS" -build_depend="seabios/default grub/default memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/default memtest86plus/default u-boot/amd64coreboot" -seavgabiosrom="elf/seabios/default/default/libgfxinit/vgabios.bin" +seavgabiosrom="elf/seabios/default/build/libgfxinit/vgabios.bin" payload_seabios="n" payload_memtest="n" diff --git a/config/module/coreboot/d510mo/target.cfg b/config/module/coreboot/d510mo/target.cfg index af063079..dad5ddfa 100644 --- a/config/module/coreboot/d510mo/target.cfg +++ b/config/module/coreboot/d510mo/target.cfg @@ -5,4 +5,4 @@ xarch="i386-elf" payload_seabios="y" payload_memtest="y" release="n" -build_depend="seabios/default memtest86plus/default" +build_depend="seabios/build memtest86plus/default" diff --git a/config/module/coreboot/d945gclf_512kb/target.cfg b/config/module/coreboot/d945gclf_512kb/target.cfg index 8bddc19c..7696e9dd 100644 --- a/config/module/coreboot/d945gclf_512kb/target.cfg +++ b/config/module/coreboot/d945gclf_512kb/target.cfg @@ -4,4 +4,4 @@ tree="default" xarch="i386-elf" payload_seabios="y" release="n" -build_depend="seabios/default" +build_depend="seabios/build" diff --git a/config/module/coreboot/d945gclf_8mb/target.cfg b/config/module/coreboot/d945gclf_8mb/target.cfg index 447dc86b..00e3db7b 100644 --- a/config/module/coreboot/d945gclf_8mb/target.cfg +++ b/config/module/coreboot/d945gclf_8mb/target.cfg @@ -5,4 +5,4 @@ xarch="i386-elf" payload_seabios="y" payload_grub="y" release="n" -build_depend="seabios/default grub/default" +build_depend="seabios/build grub/default" diff --git a/config/module/coreboot/dell3040micro_vfsp_16mb/target.cfg b/config/module/coreboot/dell3040micro_vfsp_16mb/target.cfg index 901b6074..90f459cc 100644 --- a/config/module/coreboot/dell3040micro_vfsp_16mb/target.cfg +++ b/config/module/coreboot/dell3040micro_vfsp_16mb/target.cfg @@ -8,6 +8,6 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="3040micro" -build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" IFD_platform="sklkbl" payload_uboot="amd64" diff --git a/config/module/coreboot/dell3050micro_vfsp_16mb/target.cfg b/config/module/coreboot/dell3050micro_vfsp_16mb/target.cfg index 5bfc88c9..5b002ca4 100644 --- a/config/module/coreboot/dell3050micro_vfsp_16mb/target.cfg +++ b/config/module/coreboot/dell3050micro_vfsp_16mb/target.cfg @@ -8,6 +8,6 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="3050micro" -build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" IFD_platform="sklkbl" payload_uboot="amd64" diff --git a/config/module/coreboot/dell3050microsecure_vfsp_16mb/target.cfg b/config/module/coreboot/dell3050microsecure_vfsp_16mb/target.cfg index 093468ab..1ee71c8c 100644 --- a/config/module/coreboot/dell3050microsecure_vfsp_16mb/target.cfg +++ b/config/module/coreboot/dell3050microsecure_vfsp_16mb/target.cfg @@ -8,7 +8,7 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="3050micro" -build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" IFD_platform="sklkbl" payload_uboot="amd64" payload_grubsea="y" diff --git a/config/module/coreboot/dell7010sff_12mb/target.cfg b/config/module/coreboot/dell7010sff_12mb/target.cfg index 895146ef..4b4303c9 100644 --- a/config/module/coreboot/dell7010sff_12mb/target.cfg +++ b/config/module/coreboot/dell7010sff_12mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" vcfg="t1650" -build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/dell780mt_8mb/target.cfg b/config/module/coreboot/dell780mt_8mb/target.cfg index 5d795c50..af690aed 100644 --- a/config/module/coreboot/dell780mt_8mb/target.cfg +++ b/config/module/coreboot/dell780mt_8mb/target.cfg @@ -7,5 +7,5 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci ata" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/dell780mt_truncate_8mb/target.cfg b/config/module/coreboot/dell780mt_truncate_8mb/target.cfg index 5d795c50..af690aed 100644 --- a/config/module/coreboot/dell780mt_truncate_8mb/target.cfg +++ b/config/module/coreboot/dell780mt_truncate_8mb/target.cfg @@ -7,5 +7,5 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci ata" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/dell780usff_8mb/target.cfg b/config/module/coreboot/dell780usff_8mb/target.cfg index 5d795c50..af690aed 100644 --- a/config/module/coreboot/dell780usff_8mb/target.cfg +++ b/config/module/coreboot/dell780usff_8mb/target.cfg @@ -7,5 +7,5 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci ata" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/dell780usff_truncate_8mb/target.cfg b/config/module/coreboot/dell780usff_truncate_8mb/target.cfg index 5d795c50..af690aed 100644 --- a/config/module/coreboot/dell780usff_truncate_8mb/target.cfg +++ b/config/module/coreboot/dell780usff_truncate_8mb/target.cfg @@ -7,5 +7,5 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci ata" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/dell9020mt_nri_12mb/target.cfg b/config/module/coreboot/dell9020mt_nri_12mb/target.cfg index ddbbe740..f960058a 100644 --- a/config/module/coreboot/dell9020mt_nri_12mb/target.cfg +++ b/config/module/coreboot/dell9020mt_nri_12mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="haswell" -build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/dell9020sff_nri_12mb/target.cfg b/config/module/coreboot/dell9020sff_nri_12mb/target.cfg index ddbbe740..f960058a 100644 --- a/config/module/coreboot/dell9020sff_nri_12mb/target.cfg +++ b/config/module/coreboot/dell9020sff_nri_12mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="haswell" -build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/e7240_12mb/target.cfg b/config/module/coreboot/e7240_12mb/target.cfg index a58b743f..1950834b 100644 --- a/config/module/coreboot/e7240_12mb/target.cfg +++ b/config/module/coreboot/e7240_12mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="ahci" grubtree="xhci_nvme" vcfg="e7240" -build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/g43t_am3/target.cfg b/config/module/coreboot/g43t_am3/target.cfg index df15ed4a..00c967ae 100644 --- a/config/module/coreboot/g43t_am3/target.cfg +++ b/config/module/coreboot/g43t_am3/target.cfg @@ -5,5 +5,5 @@ xarch="i386-elf" payload_seabios="y" payload_memtest="y" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/g43t_am3_16mb/target.cfg b/config/module/coreboot/g43t_am3_16mb/target.cfg index 1b58e627..2ad3d052 100644 --- a/config/module/coreboot/g43t_am3_16mb/target.cfg +++ b/config/module/coreboot/g43t_am3_16mb/target.cfg @@ -6,5 +6,5 @@ payload_seabios="y" payload_memtest="y" release="n" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/ga_g41m_es2l/target.cfg b/config/module/coreboot/ga_g41m_es2l/target.cfg index 3c5c2915..2488a3eb 100644 --- a/config/module/coreboot/ga_g41m_es2l/target.cfg +++ b/config/module/coreboot/ga_g41m_es2l/target.cfg @@ -5,4 +5,4 @@ xarch="i386-elf" payload_seabios="y" payload_memtest="y" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus/default" +build_depend="seabios/build grub/nvme memtest86plus/default" diff --git a/config/module/coreboot/hp8200sff_4mb/target.cfg b/config/module/coreboot/hp8200sff_4mb/target.cfg index b19a1797..887c1d73 100644 --- a/config/module/coreboot/hp8200sff_4mb/target.cfg +++ b/config/module/coreboot/hp8200sff_4mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" vcfg="hp8200sff" -build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/hp8200sff_8mb/target.cfg b/config/module/coreboot/hp8200sff_8mb/target.cfg index b19a1797..887c1d73 100644 --- a/config/module/coreboot/hp8200sff_8mb/target.cfg +++ b/config/module/coreboot/hp8200sff_8mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" vcfg="hp8200sff" -build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/hp820g2_12mb/target.cfg b/config/module/coreboot/hp820g2_12mb/target.cfg index 1e8690f7..34c26411 100644 --- a/config/module/coreboot/hp820g2_12mb/target.cfg +++ b/config/module/coreboot/hp820g2_12mb/target.cfg @@ -8,4 +8,4 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="hp820g2" -build_depend="seabios/default grub/xhci_nvme memtest86plus/default" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default" diff --git a/config/module/coreboot/hp8300cmt_16mb/target.cfg b/config/module/coreboot/hp8300cmt_16mb/target.cfg index 85d360a7..a2543da0 100644 --- a/config/module/coreboot/hp8300cmt_16mb/target.cfg +++ b/config/module/coreboot/hp8300cmt_16mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" vcfg="ivybridge" -build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/hppro3500series_8mb/target.cfg b/config/module/coreboot/hppro3500series_8mb/target.cfg index 1a495c17..2cde02ea 100644 --- a/config/module/coreboot/hppro3500series_8mb/target.cfg +++ b/config/module/coreboot/hppro3500series_8mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" vcfg="hppro3500series" -build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/kcma_d8_16mb/target.cfg b/config/module/coreboot/kcma_d8_16mb/target.cfg index 0a6977f0..57f787a4 100644 --- a/config/module/coreboot/kcma_d8_16mb/target.cfg +++ b/config/module/coreboot/kcma_d8_16mb/target.cfg @@ -7,5 +7,5 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/kcma_d8_2mb/target.cfg b/config/module/coreboot/kcma_d8_2mb/target.cfg index 0a6977f0..57f787a4 100644 --- a/config/module/coreboot/kcma_d8_2mb/target.cfg +++ b/config/module/coreboot/kcma_d8_2mb/target.cfg @@ -7,5 +7,5 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/kfsn4_dre_1mb/target.cfg b/config/module/coreboot/kfsn4_dre_1mb/target.cfg index f719cb6c..022356d6 100644 --- a/config/module/coreboot/kfsn4_dre_1mb/target.cfg +++ b/config/module/coreboot/kfsn4_dre_1mb/target.cfg @@ -4,5 +4,5 @@ tree="fam15h_cb411" xarch="i386-elf" payload_seabios="y" payload_memtest="y" -build_depend="seabios/default memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/kgpe_d16_16mb/target.cfg b/config/module/coreboot/kgpe_d16_16mb/target.cfg index 0a6977f0..57f787a4 100644 --- a/config/module/coreboot/kgpe_d16_16mb/target.cfg +++ b/config/module/coreboot/kgpe_d16_16mb/target.cfg @@ -7,5 +7,5 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/kgpe_d16_2mb/target.cfg b/config/module/coreboot/kgpe_d16_2mb/target.cfg index 0a6977f0..57f787a4 100644 --- a/config/module/coreboot/kgpe_d16_2mb/target.cfg +++ b/config/module/coreboot/kgpe_d16_2mb/target.cfg @@ -7,5 +7,5 @@ payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/macbook11/target.cfg b/config/module/coreboot/macbook11/target.cfg index f41e3fe9..5b8cb55c 100644 --- a/config/module/coreboot/macbook11/target.cfg +++ b/config/module/coreboot/macbook11/target.cfg @@ -5,5 +5,5 @@ xarch="i386-elf" payload_seabios="y" payload_grub="y" grub_scan_disk="ahci" -build_depend="seabios/default grub/default u-boot/i386coreboot" +build_depend="seabios/build grub/default u-boot/i386coreboot" payload_uboot="i386" diff --git a/config/module/coreboot/macbook11_16mb/target.cfg b/config/module/coreboot/macbook11_16mb/target.cfg index f41e3fe9..5b8cb55c 100644 --- a/config/module/coreboot/macbook11_16mb/target.cfg +++ b/config/module/coreboot/macbook11_16mb/target.cfg @@ -5,5 +5,5 @@ xarch="i386-elf" payload_seabios="y" payload_grub="y" grub_scan_disk="ahci" -build_depend="seabios/default grub/default u-boot/i386coreboot" +build_depend="seabios/build grub/default u-boot/i386coreboot" payload_uboot="i386" diff --git a/config/module/coreboot/q45t_am/target.cfg b/config/module/coreboot/q45t_am/target.cfg index df15ed4a..00c967ae 100644 --- a/config/module/coreboot/q45t_am/target.cfg +++ b/config/module/coreboot/q45t_am/target.cfg @@ -5,5 +5,5 @@ xarch="i386-elf" payload_seabios="y" payload_memtest="y" grubtree="nvme" -build_depend="seabios/default grub/nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/qemu_x86_12mb/target.cfg b/config/module/coreboot/qemu_x86_12mb/target.cfg index d6a0a1bf..21bda139 100644 --- a/config/module/coreboot/qemu_x86_12mb/target.cfg +++ b/config/module/coreboot/qemu_x86_12mb/target.cfg @@ -5,5 +5,5 @@ xarch="i386-elf" payload_grub="y" payload_seabios="y" payload_memtest="y" -build_depend="seabios/default grub/default memtest86plus/default u-boot/i386coreboot" +build_depend="seabios/build grub/default memtest86plus/default u-boot/i386coreboot" payload_uboot="i386" diff --git a/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/target.cfg b/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/target.cfg index 68754455..42256607 100644 --- a/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/target.cfg +++ b/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/target.cfg @@ -8,6 +8,6 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="supermicro_x11_lga1151_series" -build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" IFD_platform="sklkbl" payload_uboot="amd64" diff --git a/config/module/coreboot/t1650_12mb/target.cfg b/config/module/coreboot/t1650_12mb/target.cfg index 2e3dfca9..681ff4ee 100644 --- a/config/module/coreboot/t1650_12mb/target.cfg +++ b/config/module/coreboot/t1650_12mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" vcfg="t1650" -build_depend="seabios/default grub/nvme default/memtest86plus u-boot/amd64coreboot" +build_depend="seabios/build grub/nvme default/memtest86plus u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/t1700mt_bmrc_12mb/target.cfg b/config/module/coreboot/t1700mt_bmrc_12mb/target.cfg index a8e6435e..88118386 100644 --- a/config/module/coreboot/t1700mt_bmrc_12mb/target.cfg +++ b/config/module/coreboot/t1700mt_bmrc_12mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="t1700" -build_depend="seabios/default grub/xhci_nvme default/memtest86plus u-boot/amd64coreboot" +build_depend="seabios/build grub/xhci_nvme default/memtest86plus u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/t1700sff_bmrc_12mb/target.cfg b/config/module/coreboot/t1700sff_bmrc_12mb/target.cfg index d493ac48..df91fc01 100644 --- a/config/module/coreboot/t1700sff_bmrc_12mb/target.cfg +++ b/config/module/coreboot/t1700sff_bmrc_12mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="t1700" -build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/t440plibremrc_12mb/target.cfg b/config/module/coreboot/t440plibremrc_12mb/target.cfg index ddbbe740..f960058a 100644 --- a/config/module/coreboot/t440plibremrc_12mb/target.cfg +++ b/config/module/coreboot/t440plibremrc_12mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="haswell" -build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/t440plibremrc_4mcbfs_12mb/target.cfg b/config/module/coreboot/t440plibremrc_4mcbfs_12mb/target.cfg index ddbbe740..f960058a 100644 --- a/config/module/coreboot/t440plibremrc_4mcbfs_12mb/target.cfg +++ b/config/module/coreboot/t440plibremrc_4mcbfs_12mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="haswell" -build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/t480_vfsp_16mb/target.cfg b/config/module/coreboot/t480_vfsp_16mb/target.cfg index bb709517..582fb90a 100644 --- a/config/module/coreboot/t480_vfsp_16mb/target.cfg +++ b/config/module/coreboot/t480_vfsp_16mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="t480" -build_depend="seabios/default grub/xhci_nvme memtest86plus/default" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default" IFD_platform="sklkbl" diff --git a/config/module/coreboot/t480s_vfsp_16mb/target.cfg b/config/module/coreboot/t480s_vfsp_16mb/target.cfg index 089090c7..803a39d5 100644 --- a/config/module/coreboot/t480s_vfsp_16mb/target.cfg +++ b/config/module/coreboot/t480s_vfsp_16mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="t480s" -build_depend="seabios/default grub/xhci_nvme memtest86plus/default" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default" IFD_platform="sklkbl" diff --git a/config/module/coreboot/t580_vfsp_16mb/target.cfg b/config/module/coreboot/t580_vfsp_16mb/target.cfg index d4666113..1b99df22 100644 --- a/config/module/coreboot/t580_vfsp_16mb/target.cfg +++ b/config/module/coreboot/t580_vfsp_16mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="t580" -build_depend="seabios/default grub/xhci_nvme memtest86plus/default" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default" IFD_platform="sklkbl" diff --git a/config/module/coreboot/t60_16mb_intelgpu/target.cfg b/config/module/coreboot/t60_16mb_intelgpu/target.cfg index f41e3fe9..5b8cb55c 100644 --- a/config/module/coreboot/t60_16mb_intelgpu/target.cfg +++ b/config/module/coreboot/t60_16mb_intelgpu/target.cfg @@ -5,5 +5,5 @@ xarch="i386-elf" payload_seabios="y" payload_grub="y" grub_scan_disk="ahci" -build_depend="seabios/default grub/default u-boot/i386coreboot" +build_depend="seabios/build grub/default u-boot/i386coreboot" payload_uboot="i386" diff --git a/config/module/coreboot/t60_intelgpu/target.cfg b/config/module/coreboot/t60_intelgpu/target.cfg index f41e3fe9..5b8cb55c 100644 --- a/config/module/coreboot/t60_intelgpu/target.cfg +++ b/config/module/coreboot/t60_intelgpu/target.cfg @@ -5,5 +5,5 @@ xarch="i386-elf" payload_seabios="y" payload_grub="y" grub_scan_disk="ahci" -build_depend="seabios/default grub/default u-boot/i386coreboot" +build_depend="seabios/build grub/default u-boot/i386coreboot" payload_uboot="i386" diff --git a/config/module/coreboot/w541_12mb/target.cfg b/config/module/coreboot/w541_12mb/target.cfg index ddbbe740..f960058a 100644 --- a/config/module/coreboot/w541_12mb/target.cfg +++ b/config/module/coreboot/w541_12mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="haswell" -build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/module/coreboot/x270_vfsp_16mb/target.cfg b/config/module/coreboot/x270_vfsp_16mb/target.cfg index 084b04ab..7789c54d 100644 --- a/config/module/coreboot/x270_vfsp_16mb/target.cfg +++ b/config/module/coreboot/x270_vfsp_16mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="x270" -build_depend="seabios/default grub/xhci_nvme memtest86plus/default" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default" IFD_platform="sklkbl" diff --git a/config/module/coreboot/x280_vfsp_16mb/target.cfg b/config/module/coreboot/x280_vfsp_16mb/target.cfg index 52a4ccca..22aa45b1 100644 --- a/config/module/coreboot/x280_vfsp_16mb/target.cfg +++ b/config/module/coreboot/x280_vfsp_16mb/target.cfg @@ -8,5 +8,5 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="x280" -build_depend="seabios/default grub/xhci_nvme memtest86plus/default" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default" IFD_platform="sklkbl" diff --git a/config/module/coreboot/x2e_n150/target.cfg b/config/module/coreboot/x2e_n150/target.cfg index b76c8593..9906022e 100644 --- a/config/module/coreboot/x2e_n150/target.cfg +++ b/config/module/coreboot/x2e_n150/target.cfg @@ -8,6 +8,6 @@ payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci_nvme" vcfg="x2e_n150" -build_depend="seabios/default grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" +build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot" IFD_platform="adl" payload_uboot="amd64" diff --git a/config/module/coreboot/x60/target.cfg b/config/module/coreboot/x60/target.cfg index f41e3fe9..5b8cb55c 100644 --- a/config/module/coreboot/x60/target.cfg +++ b/config/module/coreboot/x60/target.cfg @@ -5,5 +5,5 @@ xarch="i386-elf" payload_seabios="y" payload_grub="y" grub_scan_disk="ahci" -build_depend="seabios/default grub/default u-boot/i386coreboot" +build_depend="seabios/build grub/default u-boot/i386coreboot" payload_uboot="i386" diff --git a/config/module/coreboot/x60_16mb/target.cfg b/config/module/coreboot/x60_16mb/target.cfg index f41e3fe9..5b8cb55c 100644 --- a/config/module/coreboot/x60_16mb/target.cfg +++ b/config/module/coreboot/x60_16mb/target.cfg @@ -5,5 +5,5 @@ xarch="i386-elf" payload_seabios="y" payload_grub="y" grub_scan_disk="ahci" -build_depend="seabios/default grub/default u-boot/i386coreboot" +build_depend="seabios/build grub/default u-boot/i386coreboot" payload_uboot="i386" diff --git a/config/module/seabios/build/config/libgfxinit b/config/module/seabios/build/config/libgfxinit new file mode 100644 index 00000000..f1f4b0a6 --- /dev/null +++ b/config/module/seabios/build/config/libgfxinit @@ -0,0 +1,98 @@ +# +# Automatically generated file; DO NOT EDIT. +# SeaBIOS Configuration +# + +# +# General Features +# +CONFIG_COREBOOT=y +# CONFIG_QEMU is not set +# CONFIG_CSM is not set +# CONFIG_QEMU_HARDWARE is not set +CONFIG_THREADS=y +CONFIG_RELOCATE_INIT=y +CONFIG_BOOTMENU=y +CONFIG_BOOTSPLASH=y +CONFIG_BOOTORDER=y +CONFIG_HOST_BIOS_GEOMETRY=y +CONFIG_COREBOOT_FLASH=y +CONFIG_LZMA=y +CONFIG_CBFS_LOCATION=0 +CONFIG_MULTIBOOT=y +CONFIG_ENTRY_EXTRASTACK=y +CONFIG_MALLOC_UPPERMEMORY=y +CONFIG_ROM_SIZE=0 + +# +# Hardware support +# +CONFIG_ATA=y +# CONFIG_ATA_DMA is not set +# CONFIG_ATA_PIO32 is not set +CONFIG_AHCI=y +CONFIG_SDCARD=y +CONFIG_MEGASAS=y +CONFIG_FLOPPY=y +CONFIG_FLASH_FLOPPY=y +CONFIG_NVME=y +CONFIG_PS2PORT=y +CONFIG_USB=y +CONFIG_USB_UHCI=y +CONFIG_USB_OHCI=y +CONFIG_USB_EHCI=y +CONFIG_USB_XHCI=y +CONFIG_USB_MSC=y +CONFIG_USB_UAS=y +CONFIG_USB_HUB=y +CONFIG_USB_KEYBOARD=y +CONFIG_USB_MOUSE=y +CONFIG_SERIAL=y +CONFIG_SERCON=y +CONFIG_LPT=y +CONFIG_RTC_TIMER=y +CONFIG_HARDWARE_IRQ=y +CONFIG_PMTIMER=y +CONFIG_TSC_TIMER=y + +# +# BIOS interfaces +# +CONFIG_DRIVES=y +CONFIG_CDROM_BOOT=y +CONFIG_CDROM_EMU=y +CONFIG_PCIBIOS=y +CONFIG_APMBIOS=y +CONFIG_PNPBIOS=y +CONFIG_OPTIONROMS=y +CONFIG_PMM=y +CONFIG_BOOT=y +CONFIG_KEYBOARD=y +CONFIG_KBD_CALL_INT15_4F=y +CONFIG_MOUSE=y +CONFIG_S3_RESUME=y +CONFIG_VGAHOOKS=y +# CONFIG_DISABLE_A20 is not set +CONFIG_TCGBIOS=y + +# +# VGA ROM +# +# CONFIG_NO_VGABIOS is not set +# CONFIG_VGA_GEODEGX2 is not set +# CONFIG_VGA_GEODELX is not set +CONFIG_VGA_COREBOOT=y +CONFIG_BUILD_VGABIOS=y +CONFIG_VGA_EMULATE_TEXT=y +CONFIG_VGA_FIXUP_ASM=y +CONFIG_VGA_ALLOCATE_EXTRA_STACK=y +CONFIG_VGA_EXTRA_STACK_SIZE=512 +CONFIG_VGA_VBE=y + +# +# Debugging +# +CONFIG_DEBUG_LEVEL=1 +# CONFIG_DEBUG_SERIAL is not set +# CONFIG_DEBUG_SERIAL_MMIO is not set +CONFIG_DEBUG_COREBOOT=y diff --git a/config/module/seabios/build/config/normal b/config/module/seabios/build/config/normal new file mode 100644 index 00000000..187a7501 --- /dev/null +++ b/config/module/seabios/build/config/normal @@ -0,0 +1,94 @@ +# +# Automatically generated file; DO NOT EDIT. +# SeaBIOS Configuration +# + +# +# General Features +# +CONFIG_COREBOOT=y +# CONFIG_QEMU is not set +# CONFIG_CSM is not set +# CONFIG_QEMU_HARDWARE is not set +CONFIG_THREADS=y +CONFIG_RELOCATE_INIT=y +CONFIG_BOOTMENU=y +CONFIG_BOOTSPLASH=y +CONFIG_BOOTORDER=y +CONFIG_HOST_BIOS_GEOMETRY=y +CONFIG_COREBOOT_FLASH=y +CONFIG_LZMA=y +CONFIG_CBFS_LOCATION=0 +CONFIG_MULTIBOOT=y +CONFIG_ENTRY_EXTRASTACK=y +CONFIG_MALLOC_UPPERMEMORY=y +CONFIG_ROM_SIZE=0 + +# +# Hardware support +# +CONFIG_ATA=y +# CONFIG_ATA_DMA is not set +# CONFIG_ATA_PIO32 is not set +CONFIG_AHCI=y +CONFIG_SDCARD=y +CONFIG_MEGASAS=y +CONFIG_FLOPPY=y +CONFIG_FLASH_FLOPPY=y +CONFIG_NVME=y +CONFIG_PS2PORT=y +CONFIG_USB=y +CONFIG_USB_UHCI=y +CONFIG_USB_OHCI=y +CONFIG_USB_EHCI=y +CONFIG_USB_XHCI=y +CONFIG_USB_MSC=y +CONFIG_USB_UAS=y +CONFIG_USB_HUB=y +CONFIG_USB_KEYBOARD=y +CONFIG_USB_MOUSE=y +CONFIG_SERIAL=y +CONFIG_SERCON=y +CONFIG_LPT=y +CONFIG_RTC_TIMER=y +CONFIG_HARDWARE_IRQ=y +CONFIG_PMTIMER=y +CONFIG_TSC_TIMER=y + +# +# BIOS interfaces +# +CONFIG_DRIVES=y +CONFIG_CDROM_BOOT=y +CONFIG_CDROM_EMU=y +CONFIG_PCIBIOS=y +CONFIG_APMBIOS=y +CONFIG_PNPBIOS=y +CONFIG_OPTIONROMS=y +CONFIG_PMM=y +CONFIG_BOOT=y +CONFIG_KEYBOARD=y +CONFIG_KBD_CALL_INT15_4F=y +CONFIG_MOUSE=y +CONFIG_S3_RESUME=y +CONFIG_VGAHOOKS=y +# CONFIG_DISABLE_A20 is not set +CONFIG_TCGBIOS=y + +# +# VGA ROM +# +CONFIG_NO_VGABIOS=y +# CONFIG_VGA_GEODEGX2 is not set +# CONFIG_VGA_GEODELX is not set +# CONFIG_VGA_COREBOOT is not set +# CONFIG_BUILD_VGABIOS is not set +CONFIG_VGA_EXTRA_STACK_SIZE=512 + +# +# Debugging +# +CONFIG_DEBUG_LEVEL=1 +# CONFIG_DEBUG_SERIAL is not set +# CONFIG_DEBUG_SERIAL_MMIO is not set +CONFIG_DEBUG_COREBOOT=y diff --git a/config/module/seabios/build/config/vgarom b/config/module/seabios/build/config/vgarom new file mode 100644 index 00000000..9e63e65c --- /dev/null +++ b/config/module/seabios/build/config/vgarom @@ -0,0 +1,93 @@ +# +# Automatically generated file; DO NOT EDIT. +# SeaBIOS Configuration +# + +# +# General Features +# +CONFIG_COREBOOT=y +# CONFIG_QEMU is not set +# CONFIG_CSM is not set +# CONFIG_QEMU_HARDWARE is not set +CONFIG_THREADS=y +CONFIG_RELOCATE_INIT=y +CONFIG_BOOTMENU=y +CONFIG_BOOTSPLASH=y +CONFIG_BOOTORDER=y +CONFIG_HOST_BIOS_GEOMETRY=y +CONFIG_COREBOOT_FLASH=y +CONFIG_LZMA=y +CONFIG_CBFS_LOCATION=0 +CONFIG_MULTIBOOT=y +CONFIG_ENTRY_EXTRASTACK=y +CONFIG_MALLOC_UPPERMEMORY=y +CONFIG_ROM_SIZE=0 + +# +# Hardware support +# +CONFIG_ATA=y +# CONFIG_ATA_DMA is not set +# CONFIG_ATA_PIO32 is not set +CONFIG_AHCI=y +CONFIG_SDCARD=y +CONFIG_MEGASAS=y +CONFIG_FLOPPY=y +CONFIG_FLASH_FLOPPY=y +CONFIG_NVME=y +CONFIG_PS2PORT=y +CONFIG_USB=y +CONFIG_USB_UHCI=y +CONFIG_USB_OHCI=y +CONFIG_USB_EHCI=y +CONFIG_USB_XHCI=y +CONFIG_USB_MSC=y +CONFIG_USB_UAS=y +CONFIG_USB_HUB=y +CONFIG_USB_KEYBOARD=y +CONFIG_USB_MOUSE=y +CONFIG_SERIAL=y +CONFIG_SERCON=y +CONFIG_LPT=y +CONFIG_RTC_TIMER=y +CONFIG_HARDWARE_IRQ=y +CONFIG_PMTIMER=y +CONFIG_TSC_TIMER=y + +# +# BIOS interfaces +# +CONFIG_DRIVES=y +CONFIG_CDROM_BOOT=y +CONFIG_CDROM_EMU=y +CONFIG_PCIBIOS=y +CONFIG_APMBIOS=y +CONFIG_PNPBIOS=y +# CONFIG_OPTIONROMS is not set +CONFIG_BOOT=y +CONFIG_KEYBOARD=y +CONFIG_KBD_CALL_INT15_4F=y +CONFIG_MOUSE=y +CONFIG_S3_RESUME=y +CONFIG_VGAHOOKS=y +# CONFIG_DISABLE_A20 is not set +CONFIG_TCGBIOS=y + +# +# VGA ROM +# +CONFIG_NO_VGABIOS=y +# CONFIG_VGA_GEODEGX2 is not set +# CONFIG_VGA_GEODELX is not set +# CONFIG_VGA_COREBOOT is not set +# CONFIG_BUILD_VGABIOS is not set +CONFIG_VGA_EXTRA_STACK_SIZE=512 + +# +# Debugging +# +CONFIG_DEBUG_LEVEL=1 +# CONFIG_DEBUG_SERIAL is not set +# CONFIG_DEBUG_SERIAL_MMIO is not set +CONFIG_DEBUG_COREBOOT=y diff --git a/config/module/seabios/build/target.cfg b/config/module/seabios/build/target.cfg new file mode 100644 index 00000000..0b55af0c --- /dev/null +++ b/config/module/seabios/build/target.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +tree="default" diff --git a/config/module/seabios/default/config/libgfxinit b/config/module/seabios/default/config/libgfxinit deleted file mode 100644 index f1f4b0a6..00000000 --- a/config/module/seabios/default/config/libgfxinit +++ /dev/null @@ -1,98 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# SeaBIOS Configuration -# - -# -# General Features -# -CONFIG_COREBOOT=y -# CONFIG_QEMU is not set -# CONFIG_CSM is not set -# CONFIG_QEMU_HARDWARE is not set -CONFIG_THREADS=y -CONFIG_RELOCATE_INIT=y -CONFIG_BOOTMENU=y -CONFIG_BOOTSPLASH=y -CONFIG_BOOTORDER=y -CONFIG_HOST_BIOS_GEOMETRY=y -CONFIG_COREBOOT_FLASH=y -CONFIG_LZMA=y -CONFIG_CBFS_LOCATION=0 -CONFIG_MULTIBOOT=y -CONFIG_ENTRY_EXTRASTACK=y -CONFIG_MALLOC_UPPERMEMORY=y -CONFIG_ROM_SIZE=0 - -# -# Hardware support -# -CONFIG_ATA=y -# CONFIG_ATA_DMA is not set -# CONFIG_ATA_PIO32 is not set -CONFIG_AHCI=y -CONFIG_SDCARD=y -CONFIG_MEGASAS=y -CONFIG_FLOPPY=y -CONFIG_FLASH_FLOPPY=y -CONFIG_NVME=y -CONFIG_PS2PORT=y -CONFIG_USB=y -CONFIG_USB_UHCI=y -CONFIG_USB_OHCI=y -CONFIG_USB_EHCI=y -CONFIG_USB_XHCI=y -CONFIG_USB_MSC=y -CONFIG_USB_UAS=y -CONFIG_USB_HUB=y -CONFIG_USB_KEYBOARD=y -CONFIG_USB_MOUSE=y -CONFIG_SERIAL=y -CONFIG_SERCON=y -CONFIG_LPT=y -CONFIG_RTC_TIMER=y -CONFIG_HARDWARE_IRQ=y -CONFIG_PMTIMER=y -CONFIG_TSC_TIMER=y - -# -# BIOS interfaces -# -CONFIG_DRIVES=y -CONFIG_CDROM_BOOT=y -CONFIG_CDROM_EMU=y -CONFIG_PCIBIOS=y -CONFIG_APMBIOS=y -CONFIG_PNPBIOS=y -CONFIG_OPTIONROMS=y -CONFIG_PMM=y -CONFIG_BOOT=y -CONFIG_KEYBOARD=y -CONFIG_KBD_CALL_INT15_4F=y -CONFIG_MOUSE=y -CONFIG_S3_RESUME=y -CONFIG_VGAHOOKS=y -# CONFIG_DISABLE_A20 is not set -CONFIG_TCGBIOS=y - -# -# VGA ROM -# -# CONFIG_NO_VGABIOS is not set -# CONFIG_VGA_GEODEGX2 is not set -# CONFIG_VGA_GEODELX is not set -CONFIG_VGA_COREBOOT=y -CONFIG_BUILD_VGABIOS=y -CONFIG_VGA_EMULATE_TEXT=y -CONFIG_VGA_FIXUP_ASM=y -CONFIG_VGA_ALLOCATE_EXTRA_STACK=y -CONFIG_VGA_EXTRA_STACK_SIZE=512 -CONFIG_VGA_VBE=y - -# -# Debugging -# -CONFIG_DEBUG_LEVEL=1 -# CONFIG_DEBUG_SERIAL is not set -# CONFIG_DEBUG_SERIAL_MMIO is not set -CONFIG_DEBUG_COREBOOT=y diff --git a/config/module/seabios/default/config/normal b/config/module/seabios/default/config/normal deleted file mode 100644 index 187a7501..00000000 --- a/config/module/seabios/default/config/normal +++ /dev/null @@ -1,94 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# SeaBIOS Configuration -# - -# -# General Features -# -CONFIG_COREBOOT=y -# CONFIG_QEMU is not set -# CONFIG_CSM is not set -# CONFIG_QEMU_HARDWARE is not set -CONFIG_THREADS=y -CONFIG_RELOCATE_INIT=y -CONFIG_BOOTMENU=y -CONFIG_BOOTSPLASH=y -CONFIG_BOOTORDER=y -CONFIG_HOST_BIOS_GEOMETRY=y -CONFIG_COREBOOT_FLASH=y -CONFIG_LZMA=y -CONFIG_CBFS_LOCATION=0 -CONFIG_MULTIBOOT=y -CONFIG_ENTRY_EXTRASTACK=y -CONFIG_MALLOC_UPPERMEMORY=y -CONFIG_ROM_SIZE=0 - -# -# Hardware support -# -CONFIG_ATA=y -# CONFIG_ATA_DMA is not set -# CONFIG_ATA_PIO32 is not set -CONFIG_AHCI=y -CONFIG_SDCARD=y -CONFIG_MEGASAS=y -CONFIG_FLOPPY=y -CONFIG_FLASH_FLOPPY=y -CONFIG_NVME=y -CONFIG_PS2PORT=y -CONFIG_USB=y -CONFIG_USB_UHCI=y -CONFIG_USB_OHCI=y -CONFIG_USB_EHCI=y -CONFIG_USB_XHCI=y -CONFIG_USB_MSC=y -CONFIG_USB_UAS=y -CONFIG_USB_HUB=y -CONFIG_USB_KEYBOARD=y -CONFIG_USB_MOUSE=y -CONFIG_SERIAL=y -CONFIG_SERCON=y -CONFIG_LPT=y -CONFIG_RTC_TIMER=y -CONFIG_HARDWARE_IRQ=y -CONFIG_PMTIMER=y -CONFIG_TSC_TIMER=y - -# -# BIOS interfaces -# -CONFIG_DRIVES=y -CONFIG_CDROM_BOOT=y -CONFIG_CDROM_EMU=y -CONFIG_PCIBIOS=y -CONFIG_APMBIOS=y -CONFIG_PNPBIOS=y -CONFIG_OPTIONROMS=y -CONFIG_PMM=y -CONFIG_BOOT=y -CONFIG_KEYBOARD=y -CONFIG_KBD_CALL_INT15_4F=y -CONFIG_MOUSE=y -CONFIG_S3_RESUME=y -CONFIG_VGAHOOKS=y -# CONFIG_DISABLE_A20 is not set -CONFIG_TCGBIOS=y - -# -# VGA ROM -# -CONFIG_NO_VGABIOS=y -# CONFIG_VGA_GEODEGX2 is not set -# CONFIG_VGA_GEODELX is not set -# CONFIG_VGA_COREBOOT is not set -# CONFIG_BUILD_VGABIOS is not set -CONFIG_VGA_EXTRA_STACK_SIZE=512 - -# -# Debugging -# -CONFIG_DEBUG_LEVEL=1 -# CONFIG_DEBUG_SERIAL is not set -# CONFIG_DEBUG_SERIAL_MMIO is not set -CONFIG_DEBUG_COREBOOT=y diff --git a/config/module/seabios/default/config/vgarom b/config/module/seabios/default/config/vgarom deleted file mode 100644 index 9e63e65c..00000000 --- a/config/module/seabios/default/config/vgarom +++ /dev/null @@ -1,93 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# SeaBIOS Configuration -# - -# -# General Features -# -CONFIG_COREBOOT=y -# CONFIG_QEMU is not set -# CONFIG_CSM is not set -# CONFIG_QEMU_HARDWARE is not set -CONFIG_THREADS=y -CONFIG_RELOCATE_INIT=y -CONFIG_BOOTMENU=y -CONFIG_BOOTSPLASH=y -CONFIG_BOOTORDER=y -CONFIG_HOST_BIOS_GEOMETRY=y -CONFIG_COREBOOT_FLASH=y -CONFIG_LZMA=y -CONFIG_CBFS_LOCATION=0 -CONFIG_MULTIBOOT=y -CONFIG_ENTRY_EXTRASTACK=y -CONFIG_MALLOC_UPPERMEMORY=y -CONFIG_ROM_SIZE=0 - -# -# Hardware support -# -CONFIG_ATA=y -# CONFIG_ATA_DMA is not set -# CONFIG_ATA_PIO32 is not set -CONFIG_AHCI=y -CONFIG_SDCARD=y -CONFIG_MEGASAS=y -CONFIG_FLOPPY=y -CONFIG_FLASH_FLOPPY=y -CONFIG_NVME=y -CONFIG_PS2PORT=y -CONFIG_USB=y -CONFIG_USB_UHCI=y -CONFIG_USB_OHCI=y -CONFIG_USB_EHCI=y -CONFIG_USB_XHCI=y -CONFIG_USB_MSC=y -CONFIG_USB_UAS=y -CONFIG_USB_HUB=y -CONFIG_USB_KEYBOARD=y -CONFIG_USB_MOUSE=y -CONFIG_SERIAL=y -CONFIG_SERCON=y -CONFIG_LPT=y -CONFIG_RTC_TIMER=y -CONFIG_HARDWARE_IRQ=y -CONFIG_PMTIMER=y -CONFIG_TSC_TIMER=y - -# -# BIOS interfaces -# -CONFIG_DRIVES=y -CONFIG_CDROM_BOOT=y -CONFIG_CDROM_EMU=y -CONFIG_PCIBIOS=y -CONFIG_APMBIOS=y -CONFIG_PNPBIOS=y -# CONFIG_OPTIONROMS is not set -CONFIG_BOOT=y -CONFIG_KEYBOARD=y -CONFIG_KBD_CALL_INT15_4F=y -CONFIG_MOUSE=y -CONFIG_S3_RESUME=y -CONFIG_VGAHOOKS=y -# CONFIG_DISABLE_A20 is not set -CONFIG_TCGBIOS=y - -# -# VGA ROM -# -CONFIG_NO_VGABIOS=y -# CONFIG_VGA_GEODEGX2 is not set -# CONFIG_VGA_GEODELX is not set -# CONFIG_VGA_COREBOOT is not set -# CONFIG_BUILD_VGABIOS is not set -CONFIG_VGA_EXTRA_STACK_SIZE=512 - -# -# Debugging -# -CONFIG_DEBUG_LEVEL=1 -# CONFIG_DEBUG_SERIAL is not set -# CONFIG_DEBUG_SERIAL_MMIO is not set -CONFIG_DEBUG_COREBOOT=y diff --git a/include/fw/rom.sh b/include/fw/rom.sh index cfd332a0..df37fdcf 100644 --- a/include/fw/rom.sh +++ b/include/fw/rom.sh @@ -226,9 +226,9 @@ add_seabios() [ "$displaymode" != "txtmode" ] && [ "$initmode" != "normal" ] && \ add_uboot_x86 # u-boot first, due to fixed cbfs offset - _seabioself="elf/seabios/default/default/$initmode/bios.bin.elf" + _seabioself="elf/seabios/default/build/$initmode/bios.bin.elf" [ "$initmode" = "fspgop" ] && \ - _seabioself="elf/seabios/default/default/libgfxinit/bios.bin.elf" + _seabioself="elf/seabios/default/build/libgfxinit/bios.bin.elf" _seaname="fallback/payload" [ "$payload_grubsea" = "y" ] && \ -- cgit v1.2.1