diff --git a/resources/packages/release/test b/resources/packages/release/test index cf84a2f..096a3be 100755 --- a/resources/packages/release/test +++ b/resources/packages/release/test @@ -73,8 +73,6 @@ test_qemu_rom_archive() archive_files="${archive_files} \ ${target}/grub_${target}_${cbfb}_${kb}.rom \ ${target}/grub_${target}_${txtmode}_${kb}.rom \ - ${target}/seabios_grubfirst_${target}_${cbfb}_${kb}.rom \ - ${target}/seabios_grubfirst_${target}_${txtmode}_${kb}.rom \ ${target}/seabios_withgrub_${target}_${cbfb}_${kb}.rom \ ${target}/seabios_withgrub_${target}_${txtmode}_${kb}.rom \ " diff --git a/resources/packages/roms_helper/boot b/resources/packages/roms_helper/boot index db393e0..588810c 100755 --- a/resources/packages/roms_helper/boot +++ b/resources/packages/roms_helper/boot @@ -362,19 +362,12 @@ mkRomsWithGrub() { tmprompath="${1}" initmode="${2}" displaymode="${3}" - firstpayloadname="${4}" # allow values: grub, seabios, seabios_withgrub, seabios_grubfirst + firstpayloadname="${4}" # allow values: grub, seabios, seabios_withgrub if [ "${payload_grub_withseabios}" = "y" ] && [ "${firstpayloadname}" = "grub" ]; then mv "$(make_seabios_rom "${tmprompath}" "seabios.elf" "${seabios_opromloadonly}" "${initmode}" "${cbfstool}")" "${tmprompath}" elif [ "${payload_seabios_withgrub}" ] && [ "${firstpayloadname}" != "grub" ]; then mv "$(make_seabios_rom "${tmprompath}" "fallback/payload" "${seabios_opromloadonly}" "${initmode}" "${cbfstool}")" "${tmprompath}" - if [ "${firstpayloadname}" = "seabios_grubfirst" ]; then - tmpbootorder=$(mktemp -t coreboot_rom.XXXXXXXXXX) - printf "/rom@img/grub2\n" > "${tmpbootorder}" - "${cbfstool}" "${tmprompath}" add -f "${tmpbootorder}" -n bootorder -t raw - rm -f "${tmpbootorder}" - "${cbfstool}" "${tmprompath}" add-int -i 0 -n etc/show-boot-menu - fi fi for keymapfile in resources/grub/keymap/*; do @@ -435,8 +428,6 @@ mkRoms() { tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX) cp "${corebootrom}" "${tmprom}" mkRomsWithGrub "${tmprom}" "${initmode}" "${displaymode}" "seabios_withgrub" - cp "${corebootrom}" "${tmprom}" - mkRomsWithGrub "${tmprom}" "${initmode}" "${displaymode}" "seabios_grubfirst" rm -f "${tmprom}" fi fi diff --git a/website/pages/docs/install/install.md b/website/pages/docs/install/install.md index c23d1ad..d7c749e 100644 --- a/website/pages/docs/install/install.md +++ b/website/pages/docs/install/install.md @@ -160,15 +160,6 @@ an option in the boot menu. ROM images that have `seabios_withgrub` in the file name start with SeaBIOS first, but also have GNU GRUB available in the boot menu when you press ESC. -### seabios\_grubfirst - -ROM images that have `seabios_grubfirst` in the file name start with SeaBIOS, -but SeaBIOS is configured via special `bootorder` file in CBFS so as to ONLY -load GNU GRUB. This setup would be most useful on desktops, where you wish to -only have GNU GRUB available, but want to use an add-on GPU while also having -the option to use libgfxinit, if a supported GPU/framebuffer chip is present -on your board. - Which systems are supported? ============================