summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2025-05-02 11:20:55 +0100
committerLeah Rowe <leah@libreboot.org>2025-05-02 11:20:55 +0100
commit9b11e93686c6b8298a1b4be912da339ac60ba65f (patch)
tree1160066bfdfa316053db7a41a653a659eabbe617
parent1f7e4b35cb2e95c7bbf1e3d39b10189b26f8d6ed (diff)
mk: include rom.sh directly
remove it from mkhelper files, because rom.sh doesn't initialise any variables globally, except one that never changes. Signed-off-by: Leah Rowe <leah@libreboot.org>
-rw-r--r--config/data/coreboot/mkhelper.cfg2
-rw-r--r--config/data/grub/mkhelper.cfg2
-rw-r--r--config/data/pcsx-redux/mkhelper.cfg2
-rw-r--r--config/data/pico-serprog/mkhelper.cfg2
-rw-r--r--config/data/stm32-vserprog/mkhelper.cfg2
-rwxr-xr-xmk1
6 files changed, 1 insertions, 10 deletions
diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg
index 624d4ec2..c993fbd4 100644
--- a/config/data/coreboot/mkhelper.cfg
+++ b/config/data/coreboot/mkhelper.cfg
@@ -1,7 +1,5 @@
# SPDX-License-Identifier: GPL-3.0-or-later
-. "include/rom.sh"
-
makeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS"
build_depend="seabios/default grub/default memtest86plus u-boot/amd64coreboot"
diff --git a/config/data/grub/mkhelper.cfg b/config/data/grub/mkhelper.cfg
index 5d66f42f..8c250f6b 100644
--- a/config/data/grub/mkhelper.cfg
+++ b/config/data/grub/mkhelper.cfg
@@ -1,7 +1,5 @@
# SPDX-License-Identifier: GPL-3.0-or-later
-. "include/rom.sh"
-
bootstrapargs="--gnulib-srcdir=gnulib/ --no-git"
autoconfargs="--with-platform=coreboot --disable-werror"
makeargs="FS_PAYLOAD_MODULES=\"\""
diff --git a/config/data/pcsx-redux/mkhelper.cfg b/config/data/pcsx-redux/mkhelper.cfg
index af744685..6ad20de5 100644
--- a/config/data/pcsx-redux/mkhelper.cfg
+++ b/config/data/pcsx-redux/mkhelper.cfg
@@ -1,5 +1,3 @@
# SPDX-License-Identifier: GPL-3.0-or-later
-. "include/rom.sh"
-
postmake="copyps1bios"
diff --git a/config/data/pico-serprog/mkhelper.cfg b/config/data/pico-serprog/mkhelper.cfg
index ccfdc0df..8e902bda 100644
--- a/config/data/pico-serprog/mkhelper.cfg
+++ b/config/data/pico-serprog/mkhelper.cfg
@@ -1,7 +1,5 @@
# SPDX-License-Identifier: GPL-3.0-or-later
-. "include/rom.sh"
-
sersrc="src/pico-serprog"
serx="$sersrc/build/pico_serprog.uf2"
picosdk="src/pico-sdk"
diff --git a/config/data/stm32-vserprog/mkhelper.cfg b/config/data/stm32-vserprog/mkhelper.cfg
index 54b05caf..907e890f 100644
--- a/config/data/stm32-vserprog/mkhelper.cfg
+++ b/config/data/stm32-vserprog/mkhelper.cfg
@@ -1,7 +1,5 @@
# SPDX-License-Identifier: GPL-3.0-or-later
-. "include/rom.sh"
-
sersrc="src/stm32-vserprog"
serx="$sersrc/stm32-vserprog.hex"
serdir="$sersrc/boards"
diff --git a/mk b/mk
index ec42d097..6a46f93c 100755
--- a/mk
+++ b/mk
@@ -17,6 +17,7 @@ fi
. "include/init.sh"
. "include/inject.sh"
. "include/mrc.sh"
+. "include/rom.sh"
eval "`setvars "" vdir src_dirname srcdir mode`"