From 1bc484dbf60bc7385d46d7be29b9c1a3ee8d7580 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 17 Jul 2024 19:06:53 +0100 Subject: [PATCH] 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 --- include/rom.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/rom.sh b/include/rom.sh index ae9c605..b0d7ff0 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -90,10 +90,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" }