summaryrefslogtreecommitdiff
path: root/script
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
parenta05010503f9a748943033d1fc40e36625e72dcbb (diff)
merge config/ and resources/
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script')
-rwxr-xr-xscript/build/boot/roms8
-rwxr-xr-xscript/build/boot/roms_helper6
-rwxr-xr-xscript/build/coreboot/utils8
-rwxr-xr-xscript/build/grub/payload2
-rwxr-xr-xscript/build/release/roms12
-rwxr-xr-xscript/build/release/src2
-rwxr-xr-xscript/handle/make/config2
-rwxr-xr-xscript/update/blobs/download6
-rwxr-xr-xscript/update/blobs/extract4
-rwxr-xr-xscript/update/blobs/inject4
-rwxr-xr-xscript/update/project/repo6
-rwxr-xr-xscript/update/project/trees2
12 files changed, 31 insertions, 31 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"
diff --git a/script/build/coreboot/utils b/script/build/coreboot/utils
index 80711fae..803d27d4 100755
--- a/script/build/coreboot/utils
+++ b/script/build/coreboot/utils
@@ -33,7 +33,7 @@ main()
err "cannot build cbutils for target, ${board}"
done
else
- for boarddir in resources/coreboot/*; do
+ for boarddir in config/coreboot/*; do
[ ! -d "${boarddir}" ] && continue
build_for_mainboard ${boarddir##*/} || \
err "cannot build cbutils for target, ${board}"
@@ -43,12 +43,12 @@ main()
build_for_mainboard() {
board="${1}"
- [ -d "resources/coreboot/${board}" ] || \
+ [ -d "config/coreboot/${board}" ] || \
err "build_for_mainboard ${board}: boarddir does not exist"
- [ -f "resources/coreboot/${board}/target.cfg" ] || \
+ [ -f "config/coreboot/${board}/target.cfg" ] || \
err "build_for_mainboard ${board}: target.cfg does not exist"
tree="undefined"
- . "resources/coreboot/${board}/target.cfg" # source
+ . "config/coreboot/${board}/target.cfg" # source
[ "${tree}" = "undefined" ] && \
err "build_for_mainboard: improper tree definition for '${board}'"
buildutils "${tree}"
diff --git a/script/build/grub/payload b/script/build/grub/payload
index 359fc1f7..343e1b88 100755
--- a/script/build/grub/payload
+++ b/script/build/grub/payload
@@ -23,7 +23,7 @@ set -u -e
. "include/err.sh"
-grubcfgsdir="resources/grub"
+grubcfgsdir="config/grub"
. "${grubcfgsdir}/modules.list"
diff --git a/script/build/release/roms b/script/build/release/roms
index 1d6bcb76..ad2c3a98 100755
--- a/script/build/release/roms
+++ b/script/build/release/roms
@@ -89,10 +89,10 @@ make_archive()
echo ${target}
- [ -f "resources/coreboot/${target}/target.cfg" ] || \
+ [ -f "config/coreboot/${target}/target.cfg" ] || \
err "make_archive: ${target}: target.cfg is missing"
- . "resources/coreboot/${target}/target.cfg"
+ . "config/coreboot/${target}/target.cfg"
[ "${microcode_required}" = "y" ] || \
[ "${microcode_required}" = "n" ] || microcode_required="y"
@@ -100,15 +100,15 @@ make_archive()
CONFIG_HAVE_ME_BIN="y"
CONFIG_KBC1126_FIRMWARE="y"
CONFIG_INCLUDE_SMSC_SCH5545_EC_FW="y"
- grep "CONFIG_HAVE_ME_BIN=y" "resources/coreboot/${target}/config/"* || \
+ grep "CONFIG_HAVE_ME_BIN=y" "config/coreboot/${target}/config/"* || \
CONFIG_HAVE_ME_BIN="n"
- grep "CONFIG_HAVE_MRC=y" "resources/coreboot/${target}/config/"* || \
+ grep "CONFIG_HAVE_MRC=y" "config/coreboot/${target}/config/"* || \
CONFIG_HAVE_MRC="n"
grep "CONFIG_KBC1126_FIRMWARE=y" \
- "resources/coreboot/${target}/config"/* || \
+ "config/coreboot/${target}/config"/* || \
CONFIG_KBC1126_FIRMWARE="n"
grep "CONFIG_INCLUDE_SMSC_SCH5545_EC_FW=y" \
- "resources/coreboot/${target}/config"/* || \
+ "config/coreboot/${target}/config"/* || \
CONFIG_INCLUDE_SMSC_SCH5545_EC_FW="n"
# remove ME/MRC/EC firmware from ROM images
diff --git a/script/build/release/src b/script/build/release/src
index 448e7b7b..97d8fb41 100755
--- a/script/build/release/src
+++ b/script/build/release/src
@@ -29,7 +29,7 @@ trees_fetch_list="coreboot u-boot seabios"
simple_fetch_list="flashrom grub memtest86plus me_cleaner uefitool"
simple_fetch_list="${simple_fetch_list} bios_extract biosutilities"
-dirlist="resources util script include config"
+dirlist="config util script include"
filelist="lbmk modify build README.md COPYING update version handle"
filelist="${filelist} versiondate projectname checkgit"
diff --git a/script/handle/make/config b/script/handle/make/config
index b2ecdfaf..3b48c986 100755
--- a/script/handle/make/config
+++ b/script/handle/make/config
@@ -77,7 +77,7 @@ main()
elfdir="elf/${project}"
- cfgsdir="resources/${project}"
+ cfgsdir="config/${project}"
[ -d "${cfgsdir}" ] || fail "directory, ${cfgsdir}, does not exist"
listfile="${cfgsdir}/build.list"
diff --git a/script/update/blobs/download b/script/update/blobs/download
index cadd0681..d0a6b9f7 100755
--- a/script/update/blobs/download
+++ b/script/update/blobs/download
@@ -26,14 +26,14 @@ sch5545ec_dl_url_bkup=""
sch5545ec_dl_hash=""
cbdir="coreboot/default"
-cbcfgsdir="resources/coreboot"
+cbcfgsdir="config/coreboot"
boarddir=""
blobdir="blobs"
appdir="${blobdir}/app"
_7ztest="a"
mecleaner="$(pwd)/me_cleaner/me_cleaner.py"
e6400_unpack="$(pwd)/bios_extract/dell_inspiron_1100_unpacker.py"
-me7updateparser="$(pwd)/resources/blobs/me7_update_parser.py"
+me7updateparser="$(pwd)/config/blobs/me7_update_parser.py"
kbc1126_ec_dump="$(pwd)/${cbdir}/util/kbc1126/kbc1126_ec_dump"
board=""
pfs_extract="$(pwd)/biosutilities/Dell_PFS_Extract.py"
@@ -146,7 +146,7 @@ scan_sources_config()
sch5545ec_dl_url=${2} ;;
esac
done << EOF
- $(eval "awk '${awkstr}' resources/blobs/sources")
+ $(eval "awk '${awkstr}' config/blobs/sources")
EOF
}
diff --git a/script/update/blobs/extract b/script/update/blobs/extract
index ad77abd4..10b570f1 100755
--- a/script/update/blobs/extract
+++ b/script/update/blobs/extract
@@ -12,10 +12,10 @@ board=""
vendor_rom=""
cbdir="coreboot/default"
-cbcfgsdir="resources/coreboot"
+cbcfgsdir="config/coreboot"
ifdtool="${cbdir}/util/ifdtool/ifdtool"
mecleaner="me_cleaner/me_cleaner.py"
-me7updateparser="resources/blobs/me7_update_parser.py"
+me7updateparser="config/blobs/me7_update_parser.py"
boarddir=""
diff --git a/script/update/blobs/inject b/script/update/blobs/inject
index c9c44702..53334879 100755
--- a/script/update/blobs/inject
+++ b/script/update/blobs/inject
@@ -18,7 +18,7 @@ release=""
releasearchive=""
cbdir="coreboot/default"
-cbcfgsdir="resources/coreboot"
+cbcfgsdir="config/coreboot"
ifdtool="cbutils/default/ifdtool"
cbfstool="cbutils/default/cbfstool"
nvmutil="util/nvmutil/nvm"
@@ -45,7 +45,7 @@ main()
[ $# -lt 1 ] && err "No options specified."
[ "${1}" = "listboards" ] && \
- ./build command options resources/coreboot && exit 0
+ ./build command options config/coreboot && exit 0
archive="${1}"
diff --git a/script/update/project/repo b/script/update/project/repo
index 72328b45..ba856612 100755
--- a/script/update/project/repo
+++ b/script/update/project/repo
@@ -57,7 +57,7 @@ read_config()
depend=${2} ;;
esac
done << EOF
- $(eval "awk '${awkstr}' resources/git/revisions")
+ $(eval "awk '${awkstr}' config/git/revisions")
EOF
}
@@ -92,7 +92,7 @@ clone_project()
patch_project()
{
- patchdir="resources/${name}/patches"
+ patchdir="config/${name}/patches"
for patchfile in "${PWD}/${patchdir}"/*.patch ; do
[ -f "${patchfile}" ] || continue
@@ -119,7 +119,7 @@ usage()
Usage: ./update project repo [name]
Options:
- name: Module name as specified in resources/git/revisions
+ name: Module name as specified in config/git/revisions
EOF
}
diff --git a/script/update/project/trees b/script/update/project/trees
index c4290294..2b99160c 100755
--- a/script/update/project/trees
+++ b/script/update/project/trees
@@ -48,7 +48,7 @@ main()
[ -z "${1}" ] && err "project name not specified"
project="${1}"
- cfgsdir="resources/${project}"
+ cfgsdir="config/${project}"
[ -d "${cfgsdir}" ] || err "unsupported project name"
shift 1