summaryrefslogtreecommitdiff
path: root/script/build/boot
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-09-04 02:36:41 +0100
committerLeah Rowe <leah@libreboot.org>2023-09-04 02:47:25 +0100
commitda3c9bb3c5c3b1f2e6e67a3695ce39b17bf68d5b (patch)
treeb81cdd418a4906c846800a8c5094b312e74f57df /script/build/boot
parenta05010503f9a748943033d1fc40e36625e72dcbb (diff)
merge config/ and resources/
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script/build/boot')
-rwxr-xr-xscript/build/boot/roms8
-rwxr-xr-xscript/build/boot/roms_helper6
2 files changed, 7 insertions, 7 deletions
diff --git a/script/build/boot/roms b/script/build/boot/roms
index 50b1f460..e5b06423 100755
--- a/script/build/boot/roms
+++ b/script/build/boot/roms
@@ -43,7 +43,7 @@ main()
firstoption="${1}"
[ "${firstoption}" = "help" ] && usage && exit 0
[ "${firstoption}" = "list" ] && \
- ./build command options resources/coreboot && exit 0
+ ./build command options config/coreboot && exit 0
while [ $# -gt 0 ]; do
case ${1} in
@@ -66,7 +66,7 @@ main()
printf "Building %s ROM images\n" "${projectname}"
if [ "${firstoption}" = "all" ]; then
- for target in $(./build command options resources/coreboot); do
+ for target in $(./build command options config/coreboot); do
buildrom "${target}" || err "build/roms (1): error"
done
else
@@ -96,7 +96,7 @@ usage()
./build boot roms x60 -p grub -d corebootfb -k usqwerty
possible values for 'target':
- $(./build command options "resources/coreboot")
+ $(./build command options "config/coreboot")
Refer to the ${projectname} documentation for more information.
EOF
@@ -104,7 +104,7 @@ usage()
# Build ROM images for supported boards
buildrom() {
- [ -d "resources/coreboot/${1}/" ] || \
+ [ -d "config/coreboot/${1}/" ] || \
err "build/roms: target not defined: ${1}"
./build boot roms_helper ${1}${opts} || return 1
}
diff --git a/script/build/boot/roms_helper b/script/build/boot/roms_helper
index b663dc8e..a5cdb85c 100755
--- a/script/build/boot/roms_helper
+++ b/script/build/boot/roms_helper
@@ -30,13 +30,13 @@ set -u -e
read projectname < projectname
-cfgsdir="resources/coreboot"
+cfgsdir="config/coreboot"
blobs_required=""
board=""
ubdir=""
-kmapdir="resources/grub/keymap"
+kmapdir="config/grub/keymap"
displaymodes=""
payloads=""
keyboard_layouts=""
@@ -370,7 +370,7 @@ build_grub_roms() {
# TODO: don't hardcode this. do it in target.cfg
backgroundfile="background1024x768.png"
fi
- backgroundfile="resources/grub/background/${backgroundfile}"
+ backgroundfile="config/grub/background/${backgroundfile}"
"${cbfstool}" "${tmprompath}" add -f ${backgroundfile} \
-n background.png -t raw || \
err "build_grub_roms: cannot add background.png to tmprom"