summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-07-17 19:06:53 +0100
committerLeah Rowe <leah@libreboot.org>2024-07-17 19:06:53 +0100
commitc6e6d96ce16b821b5e956d98715907fb9d8ae096 (patch)
treef38a0c8b1491bcf08e54db0b1df1db1ca8aba500
parent78cdc56ae15b922a19cd6c71cec94ae62b6520c1 (diff)
allow using coreboot's build system to add payload
lbmk must still define payloads, but specific configs may use coreboot's build system instead. you might use this to add your own config with, say, tianocore payload, using coreboot.git to build it, rather than using lbmk's choice of payloads. Signed-off-by: Leah Rowe <leah@libreboot.org>
-rw-r--r--include/rom.sh11
-rw-r--r--include/vendor.sh3
2 files changed, 9 insertions, 5 deletions
diff --git a/include/rom.sh b/include/rom.sh
index 8798ef13..ed3dddf2 100644
--- a/include/rom.sh
+++ b/include/rom.sh
@@ -92,10 +92,13 @@ mkcorebootbin()
[ "$payload_memtest" = "y" ] || payload_memtest="n"
[ "$(uname -m)" = "x86_64" ] || payload_memtest="n"
-
- [ "$payload_seabios" = "y" ] && pname="seabios" && $dry add_seabios
- [ "$payload_uboot" = "y" ] && pname="uboot" && $dry add_uboot
-
+ if grep "CONFIG_PAYLOAD_NONE=y" "$defconfig"; then
+ [ "$payload_seabios" = "y" ] && pname="seabios" && \
+ $dry add_seabios
+ [ "$payload_uboot" = "y" ] && pname="uboot" && $dry add_uboot
+ else
+ pname="custom" # coreboot's build system added payloads
+ fi
newrom="bin/$target/${pname}_${target}_$initmode$displaymode.rom"
$dry x_ mkdir -p "${newrom%/*}"; $dry x_ mv "$tmprom" "$newrom"
diff --git a/include/vendor.sh b/include/vendor.sh
index ba0ad641..426e0f5f 100644
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -248,7 +248,8 @@ detect_board()
path="$1"
filename="$(basename "$path")"
case "$filename" in
- grub_*|seagrub_*) board="$(echo "$filename" | cut -d '_' -f2-3)" ;;
+ grub_*|seagrub_*|custom_*)
+ board="$(echo "$filename" | cut -d '_' -f2-3)" ;;
seabios_withgrub_*)
board="$(echo "$filename" | cut -d '_' -f3-4)" ;;
*.tar.xz)