summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/coreboot/t60_16mb_intelgpu/target.cfg1
-rw-r--r--config/coreboot/t60_intelgpu/target.cfg1
-rw-r--r--config/coreboot/x60/target.cfg1
-rw-r--r--config/coreboot/x60_16mb/target.cfg1
-rw-r--r--config/grub/default/config/payload15
-rw-r--r--config/grub/nvme/config/payload15
-rw-r--r--config/grub/xhci/config/payload15
7 files changed, 24 insertions, 25 deletions
diff --git a/config/coreboot/t60_16mb_intelgpu/target.cfg b/config/coreboot/t60_16mb_intelgpu/target.cfg
index 80f93d49..043bd365 100644
--- a/config/coreboot/t60_16mb_intelgpu/target.cfg
+++ b/config/coreboot/t60_16mb_intelgpu/target.cfg
@@ -2,5 +2,4 @@ tree="i945"
xarch="i386-elf"
payload_seabios="y"
payload_seabios_withgrub="y"
-grub_background="background1024x768.png"
grub_scan_disk="ahci"
diff --git a/config/coreboot/t60_intelgpu/target.cfg b/config/coreboot/t60_intelgpu/target.cfg
index 80f93d49..043bd365 100644
--- a/config/coreboot/t60_intelgpu/target.cfg
+++ b/config/coreboot/t60_intelgpu/target.cfg
@@ -2,5 +2,4 @@ tree="i945"
xarch="i386-elf"
payload_seabios="y"
payload_seabios_withgrub="y"
-grub_background="background1024x768.png"
grub_scan_disk="ahci"
diff --git a/config/coreboot/x60/target.cfg b/config/coreboot/x60/target.cfg
index 80f93d49..043bd365 100644
--- a/config/coreboot/x60/target.cfg
+++ b/config/coreboot/x60/target.cfg
@@ -2,5 +2,4 @@ tree="i945"
xarch="i386-elf"
payload_seabios="y"
payload_seabios_withgrub="y"
-grub_background="background1024x768.png"
grub_scan_disk="ahci"
diff --git a/config/coreboot/x60_16mb/target.cfg b/config/coreboot/x60_16mb/target.cfg
index 80f93d49..043bd365 100644
--- a/config/coreboot/x60_16mb/target.cfg
+++ b/config/coreboot/x60_16mb/target.cfg
@@ -2,5 +2,4 @@ tree="i945"
xarch="i386-elf"
payload_seabios="y"
payload_seabios_withgrub="y"
-grub_background="background1024x768.png"
grub_scan_disk="ahci"
diff --git a/config/grub/default/config/payload b/config/grub/default/config/payload
index a405ae25..313290ed 100644
--- a/config/grub/default/config/payload
+++ b/config/grub/default/config/payload
@@ -26,13 +26,14 @@ else
gfxpayload=keep
terminal_output --append gfxterm
- if [ -f (cbfsdisk)/background.png ]; then
- insmod png
- background_image (cbfsdisk)/background.png
- elif [ -f (cbfsdisk)/background.jpg ]; then
- insmod jpeg
- background_image (cbfsdisk)/background.jpg
- fi
+ for dt in cbfsdisk memdisk; do
+ for it in png jpg; do
+ if [ -f (${dt})/background.${it} ]; then
+ insmod ${it}
+ background_image (${dt})/background.${it}
+ fi
+ done
+ done
fi
# Keep CTRL pressed to enable default serial terminal (COM1 or the like)
diff --git a/config/grub/nvme/config/payload b/config/grub/nvme/config/payload
index f81d5930..d7a3c57d 100644
--- a/config/grub/nvme/config/payload
+++ b/config/grub/nvme/config/payload
@@ -26,13 +26,14 @@ else
gfxpayload=keep
terminal_output --append gfxterm
- if [ -f (cbfsdisk)/background.png ]; then
- insmod png
- background_image (cbfsdisk)/background.png
- elif [ -f (cbfsdisk)/background.jpg ]; then
- insmod jpeg
- background_image (cbfsdisk)/background.jpg
- fi
+ for dt in cbfsdisk memdisk; do
+ for it in png jpg; do
+ if [ -f (${dt})/background.${it} ]; then
+ insmod ${it}
+ background_image (${dt})/background.${it}
+ fi
+ done
+ done
fi
# Keep CTRL pressed to enable default serial terminal (COM1 or the like)
diff --git a/config/grub/xhci/config/payload b/config/grub/xhci/config/payload
index 0e16ecb6..cd5b49b3 100644
--- a/config/grub/xhci/config/payload
+++ b/config/grub/xhci/config/payload
@@ -27,13 +27,14 @@ else
gfxpayload=keep
terminal_output --append gfxterm
- if [ -f (cbfsdisk)/background.png ]; then
- insmod png
- background_image (cbfsdisk)/background.png
- elif [ -f (cbfsdisk)/background.jpg ]; then
- insmod jpeg
- background_image (cbfsdisk)/background.jpg
- fi
+ for dt in cbfsdisk memdisk; do
+ for it in png jpg; do
+ if [ -f (${dt})/background.${it} ]; then
+ insmod ${it}
+ background_image (${dt})/background.${it}
+ fi
+ done
+ done
fi
# Keep CTRL pressed to enable default serial terminal (COM1 or the like)