diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-09-05 00:50:08 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-09-05 00:53:28 +0100 |
| commit | 15081ed9efc54c69d5600dd0379ee16eb271df89 (patch) | |
| tree | 0bf3de02690ef01810b91beb4b0a57765cbdcde1 | |
| parent | 0d315c3a4eb75474b8753d3a51fb1ddd7382a3ea (diff) | |
grub: make backgrounds configurable in target.cfg
now under coreboot mainboards, target.cfg can specify
a background. if not specified, the 1280x800 one is
assumed, and used by default. it can be overridden.
the path should be relative to:
config/grub/background/
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rw-r--r-- | config/coreboot/t60_16mb_intelgpu/target.cfg | 1 | ||||
| -rw-r--r-- | config/coreboot/t60_intelgpu/target.cfg | 1 | ||||
| -rw-r--r-- | config/coreboot/x60/target.cfg | 1 | ||||
| -rw-r--r-- | config/coreboot/x60_16mb/target.cfg | 1 | ||||
| -rwxr-xr-x | script/build/boot/roms_helper | 9 |
5 files changed, 6 insertions, 7 deletions
diff --git a/config/coreboot/t60_16mb_intelgpu/target.cfg b/config/coreboot/t60_16mb_intelgpu/target.cfg index 80a956c7..8a159ad6 100644 --- a/config/coreboot/t60_16mb_intelgpu/target.cfg +++ b/config/coreboot/t60_16mb_intelgpu/target.cfg @@ -8,3 +8,4 @@ payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" blobs_required="n" +grub_background="background1024x768.png" diff --git a/config/coreboot/t60_intelgpu/target.cfg b/config/coreboot/t60_intelgpu/target.cfg index 80a956c7..8a159ad6 100644 --- a/config/coreboot/t60_intelgpu/target.cfg +++ b/config/coreboot/t60_intelgpu/target.cfg @@ -8,3 +8,4 @@ payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" blobs_required="n" +grub_background="background1024x768.png" diff --git a/config/coreboot/x60/target.cfg b/config/coreboot/x60/target.cfg index 80a956c7..8a159ad6 100644 --- a/config/coreboot/x60/target.cfg +++ b/config/coreboot/x60/target.cfg @@ -8,3 +8,4 @@ payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" blobs_required="n" +grub_background="background1024x768.png" diff --git a/config/coreboot/x60_16mb/target.cfg b/config/coreboot/x60_16mb/target.cfg index 80a956c7..8a159ad6 100644 --- a/config/coreboot/x60_16mb/target.cfg +++ b/config/coreboot/x60_16mb/target.cfg @@ -8,3 +8,4 @@ payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" blobs_required="n" +grub_background="background1024x768.png" diff --git a/script/build/boot/roms_helper b/script/build/boot/roms_helper index 76487877..4cfe4bf1 100755 --- a/script/build/boot/roms_helper +++ b/script/build/boot/roms_helper @@ -60,6 +60,7 @@ cbdir="" cbfstool="" corebootrom="" seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin" +grub_background="background1280x800.png" initmode="" displaymode="" @@ -362,13 +363,7 @@ build_grub_roms() { # we only need insert background.png once, for each coreboot config: if [ "${displaymode}" = "vesafb" ] || \ [ "${displaymode}" = "corebootfb" ]; then - backgroundfile="background1280x800.png" - if [ "${board}" = "x60" ] \ - || [ "${board}" = "t60_intelgpu" ]; then - # TODO: don't hardcode this. do it in target.cfg - backgroundfile="background1024x768.png" - fi - backgroundfile="config/grub/background/${backgroundfile}" + backgroundfile="config/grub/background/${grub_background}" "${cbfstool}" "${tmprompath}" add -f ${backgroundfile} \ -n background.png -t raw || \ err "build_grub_roms: cannot add background.png to tmprom" |