summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xbuild12
-rw-r--r--config/data/grub/mkhelper.cfg5
-rw-r--r--config/grub/default/target.cfg5
-rw-r--r--config/grub/nvme/target.cfg5
-rw-r--r--config/grub/xhci/target.cfg5
-rwxr-xr-xinclude/git.sh62
-rwxr-xr-xinclude/lib.sh1
-rwxr-xr-xinclude/vendor.sh225
-rwxr-xr-xscript/roms2
-rwxr-xr-xscript/trees105
10 files changed, 154 insertions, 273 deletions
diff --git a/build b/build
index b7af9048..91843d3f 100755
--- a/build
+++ b/build
@@ -92,7 +92,8 @@ build_release()
{
(
cd "$srcdir" || $err "$vdir: !cd \"$srcdir\""
- fetch_trees
+ ./update trees -f
+ rmgit .
x_ mv src/docs docs
) || $err "can't create release files"
@@ -119,15 +120,6 @@ build_release()
rm -Rf "$srcdir" || $err "!rm -Rf $srcdir"
}
-fetch_trees()
-{
- for x in $(ls -1 config/git); do
- ./update trees -f "$x" || $err "$vdir: fetch $x"
- singletree "$x" || x_ rm -Rf "src/$x/$x"
- done
- rmgit .
-}
-
fail()
{
tmp_cleanup || printf "WARNING: can't rm tmpfiles: %s\n" "$TMPDIR" 1>&2
diff --git a/config/data/grub/mkhelper.cfg b/config/data/grub/mkhelper.cfg
new file mode 100644
index 00000000..ff93a27c
--- /dev/null
+++ b/config/data/grub/mkhelper.cfg
@@ -0,0 +1,5 @@
+bootstrapargs="--gnulib-srcdir=gnulib/ --no-git"
+autoconfargs="--with-platform=coreboot --disable-werror"
+makeargs="FS_PAYLOAD_MODULES=\"\""
+btype="autohell"
+mkhelper="mkpayload_grub"
diff --git a/config/grub/default/target.cfg b/config/grub/default/target.cfg
index a5936693..e6ed598b 100644
--- a/config/grub/default/target.cfg
+++ b/config/grub/default/target.cfg
@@ -1,7 +1,2 @@
tree="default"
rev="8719cc2040368d43ab2de0b6e1b850b2c9cfc5b7"
-bootstrapargs="--gnulib-srcdir=gnulib/ --no-git"
-autoconfargs="--with-platform=coreboot --disable-werror"
-makeargs="FS_PAYLOAD_MODULES=\"\""
-btype="autohell"
-mkhelper="mkpayload_grub"
diff --git a/config/grub/nvme/target.cfg b/config/grub/nvme/target.cfg
index f5e95daf..97a0deb5 100644
--- a/config/grub/nvme/target.cfg
+++ b/config/grub/nvme/target.cfg
@@ -1,7 +1,2 @@
tree="nvme"
rev="8719cc2040368d43ab2de0b6e1b850b2c9cfc5b7"
-bootstrapargs="--gnulib-srcdir=gnulib/ --no-git"
-autoconfargs="--with-platform=coreboot --disable-werror"
-makeargs="FS_PAYLOAD_MODULES=\"\""
-btype="autohell"
-mkhelper="mkpayload_grub"
diff --git a/config/grub/xhci/target.cfg b/config/grub/xhci/target.cfg
index 3cdcb5d8..61ee9757 100644
--- a/config/grub/xhci/target.cfg
+++ b/config/grub/xhci/target.cfg
@@ -1,7 +1,2 @@
tree="xhci"
rev="8719cc2040368d43ab2de0b6e1b850b2c9cfc5b7"
-bootstrapargs="--gnulib-srcdir=gnulib/ --no-git"
-autoconfargs="--with-platform=coreboot --disable-werror"
-makeargs="FS_PAYLOAD_MODULES=\"\""
-btype="autohell"
-mkhelper="mkpayload_grub"
diff --git a/include/git.sh b/include/git.sh
index 6818578b..b0acd7dc 100755
--- a/include/git.sh
+++ b/include/git.sh
@@ -2,49 +2,21 @@
# Copyright (c) 2020-2021,2023-2024 Leah Rowe <leah@libreboot.org>
# Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
-eval `setvars "" _target rev loc url bkup_url depend tree_depend xtree mdir \
- subhash subrepo subrepo_bkup subfile subfile_bkup`
+eval `setvars "" loc url bkup_url subfile mdir subhash subrepo subrepo_bkup \
+ depend subfile_bkup`
-fetch_project_trees()
+fetch_targets()
{
- _target="$target"
- [ ! -d "src/$project/$project" ] && x_ mkdir -p "src/$project" \
- && fetch_project_repo "$project"
- fetch_config
- e "src/$project/$tree" d || prepare_new_tree; return 0
-}
-
-fetch_config()
-{
- rm -f "$cfgsdir/"*/seen || $err "fetch_config $cfgsdir: !rm seen"
- eval `setvars "" xtree tree_depend`
- while true; do
- eval `setvars "" rev tree`
- load_target_config "$_target"
- [ "$_target" = "$tree" ] && break
- _target="$tree"
- done
[ -n "$tree_depend" ] && [ "$tree_depend" != "$tree" ] && \
- x_ ./update trees -f "$project" "$tree_depend"; return 0
-}
-
-load_target_config()
-{
- [ -f "$cfgsdir/$1/seen" ] && $err "$project/$_target: tree loop"
- eval `setcfg "$cfgsdir/$1/target.cfg"`
- touch "$cfgsdir/$1/seen" || $err "load_config $cfgsdir/$1: !mk seen"
-}
-
-prepare_new_tree()
-{
- printf "Creating %s tree %s (%s)\n" "$project" "$tree" "$_target"
+ x_ ./update trees -f "$project" "$tree_depend"
+ e "src/$project/$tree" d && return 0
- git_prep "src/$project/$project" "src/$project/$project" \
- "$PWD/$cfgsdir/$tree/patches" "src/$project/$tree" "update"
- nuke "$project/$tree" "$project/$tree"
+ printf "Creating %s tree %s\n" "$project" "$tree"
+ git_prep "$loc" "$loc" "$PWD/$cfgsdir/$tree/patches" \
+ "${loc%/*}/$tree" u; nuke "$project/$tree" "$project/$tree"
}
-fetch_project_repo()
+fetch_project()
{
eval `setvars "" xtree tree_depend`
eval `setcfg "config/git/$project/pkg.cfg"`
@@ -65,8 +37,7 @@ fetch_project_repo()
clone_project()
{
- loc="src/$project"
- singletree "$project" || loc="src/$project/$project"
+ loc="src/$project/$project" && singletree "$project" && loc="${loc%/*}"
printf "Downloading project '%s' to '%s'\n" "$project" "$loc"
e "$loc" d && return 0
@@ -139,14 +110,11 @@ tmpclone()
git_am_patches()
{
- for _patch in "$2/"*; do
- [ -L "$_patch" ] || [ ! -f "$_patch" ] || git -C "$1" am \
- "$_patch" || $err "$1 $2: !git am $_patch"; continue
- done
- for _patches in "$2/"*; do
- [ ! -L "$_patches" ] && [ -d "$_patches" ] && \
- git_am_patches "$1" "$_patches"; continue
- done
+ for p in "$2/"*; do
+ [ -L "$p" ] && continue; [ -e "$p" ] || continue
+ [ -d "$p" ] && git_am_patches "$1" "$p" && continue
+ [ ! -f "$p" ] || git -C "$1" am "$p" || $err "$1 $2: !am $p"
+ done; return 0
}
link_crossgcc()
diff --git a/include/lib.sh b/include/lib.sh
index 58aa8d46..e6a998d2 100755
--- a/include/lib.sh
+++ b/include/lib.sh
@@ -33,6 +33,7 @@ chkvars()
{
for var in $@; do
eval "[ -n "\${$var+x}" ] || \$err \"$var unset\""
+ eval "[ -n "\$$var" ] || \$err \"$var unset\""
done; return 0
}
diff --git a/include/vendor.sh b/include/vendor.sh
index 22d5a76d..e282eedd 100755
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -3,13 +3,10 @@
# Copyright (c) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
# Copyright (c) 2023-2024 Leah Rowe <leah@libreboot.org>
-_7ztest="a"
-
e6400_unpack="$PWD/src/bios_extract/dell_inspiron_1100_unpacker.py"
me7updateparser="$PWD/util/me7_update_parser/me7_update_parser.py"
pfs_extract="$PWD/src/biosutilities/Dell_PFS_Extract.py"
uefiextract="$PWD/elf/uefitool/uefiextract"
-nvmutil="util/nvmutil/nvm"
vendir="vendorfiles"
appdir="$vendir/app"
cbcfgsdir="config/coreboot"
@@ -18,35 +15,29 @@ eval `setvars "" EC_url_bkup EC_hash DL_hash DL_url_bkup MRC_refcode_gbe vcfg \
E6400_VGA_DL_hash E6400_VGA_DL_url E6400_VGA_DL_url_bkup E6400_VGA_offset \
E6400_VGA_romname CONFIG_HAVE_MRC SCH5545EC_DL_url_bkup SCH5545EC_DL_hash \
mecleaner kbc1126_ec_dump MRC_refcode_cbtree new_mac _dl SCH5545EC_DL_url \
- CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_ME_BIN archive EC_url modifygbe rom \
+ CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_ME_BIN archive EC_url boarddir rom \
CONFIG_ME_BIN_PATH CONFIG_KBC1126_FIRMWARE _dest tree CONFIG_GBE_BIN_PATH \
CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2 CONFIG_KBC1126_FW2_OFFSET \
CONFIG_VGA_BIOS_FILE CONFIG_VGA_BIOS_ID CONFIG_KBC1126_FW1 cbdir DL_url \
CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_SMSC_SCH5545_EC_FW_FILE nukemode \
CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE CONFIG_HAVE_REFCODE_BLOB cbfstoolref \
- CONFIG_REFCODE_BLOB_FILE vrelease boarddir`
+ CONFIG_REFCODE_BLOB_FILE vrelease verify _7ztest`
vendor_download()
{
export PATH="$PATH:/sbin"
[ $# -gt 0 ] || $err "No argument given"
- board="$1" && readcfg && getcfg && bootstrap && getfiles; return 0
+ board="$1" && readcfg && readkconfig && bootstrap && getfiles; return 0
}
-getcfg()
+readkconfig()
{
check_defconfig "$boarddir" 1>"$TMPDIR/vendorcfg.list" && return 1
while read -r cbcfgfile; do
set +u +e; . "$cbcfgfile" 2>/dev/null; set -u -e
done < "$TMPDIR/vendorcfg.list"
- cbdir="src/coreboot/$tree"
- cbfstool="elf/cbfstool/$tree/cbfstool"
-
- mecleaner="$PWD/$cbdir/util/me_cleaner/me_cleaner.py"
- kbc1126_ec_dump="$PWD/$cbdir/util/kbc1126/kbc1126_ec_dump"
-
for c in CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN CONFIG_KBC1126_FIRMWARE \
CONFIG_VGA_BIOS_FILE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW; do
eval "[ \"\${$c}\" = \"/dev/null\" ] && continue"
@@ -60,15 +51,12 @@ bootstrap()
{
x_ ./update trees -f coreboot ${cbdir##*/}
for d in uefitool biosutilities bios_extract; do
- x_ ./update trees -f "$d"
+ x_ ./update trees -b "$d"
done
- x_ ./update trees -b uefitool
- [ ! -d "${kbc1126_ec_dump%/*}" ] || [ -f "$kbc1126_ec_dump" ] || x_ \
- make -C "$cbdir/util/kbc1126"
+ [ -d "${kbc1126_ec_dump%/*}" ] && x_ make -C "$cbdir/util/kbc1126"
[ -n "$MRC_refcode_cbtree" ] && \
- cbfstoolref="elf/cbfstool/$MRC_refcode_cbtree/cbfstool" && \
- x_ ./update trees -b coreboot utils $MRC_refcode_cbtree
- x_ ./update trees -b coreboot utils $tree
+ cbfstoolref="elf/cbfstool/$MRC_refcode_cbtree/cbfstool" && \
+ x_ ./update trees -b coreboot utils $MRC_refcode_cbtree; return 0
}
getfiles()
@@ -89,32 +77,23 @@ getfiles()
fetch()
{
- dl_type="$1"; dl="$2"; dl_bkup="$3"; dlsum="$4"
- [ "$5" = "/dev/null" ] && return 0
- [ "${5# }" = "$5" ] || $err "fetch: space not allowed in _dest: '$5'"
- [ "${5#/}" = "$5" ] || $err "fetch: absolute path not allowed: '$5'"
- _dest="${5##*../}"
- _dl="$vendir/cache/$dlsum"
+ dl_type="$1"; dl="$2"; dl_bkup="$3"; dlsum="$4"; _dest="${5##*../}"
+ [ "$5" = "/dev/null" ] && return 0; _dl="$vendir/cache/$dlsum"
download "$dl" "$dl_bkup" "$_dl" "$dlsum"
x_ rm -Rf "${_dl}_extracted"
- mkdirs "$_dest" "extract_$dl_type" || return 0
- eval "extract_$dl_type"
- set -u -e
+ e "$_dest" f && return 0
- [ -f "$_dest" ] && return 0
- $err "extract_$dl_type (fetch): missing file: '$_dest'"
-}
+ mkdir -p "${_dest%/*}" || $err "mkdirs: !mkdir -p ${_dest%/*}"
+ remkdir "$appdir"
+ extract_archive "$_dl" "$appdir" || [ "$dl_type" = "e6400vga" ] || \
+ $err "mkdirs $_dest $dl_type: !extract"
-mkdirs()
-{
- e "$1" f && return 1
+ eval "extract_$dl_type"
+ set -u -e
- mkdir -p "${1%/*}" || $err "mkdirs: !mkdir -p ${1%/*}"
- remkdir "$appdir"
- extract_archive "$_dl" "$appdir" || [ "$2" = "extract_e6400vga" ] || \
- $err "mkdirs $1 $2: !extract"; return 0
+ e "$_dest" f missing && $err "!extract_$dl_type"; return 0
}
extract_intel_me()
@@ -167,12 +146,11 @@ extract_archive()
extract_kbc1126ec()
{
- [ ! -f "$kbc1126_ec_dump" ] && \
- $err "extract_kbc1126ec $cbdir: kbc1126_ec_dump missing"
+ e "$kbc1126_ec_dump" f missing && $err "$cbdir: kbc1126 util missing"
(
x_ cd "$appdir/"
mv Rompaq/68*.BIN ec.bin || :
- if [ ! -f ec.bin ]; then
+ if [ ! -f "ec.bin" ]; then
unar -D ROM.CAB Rom.bin || unar -D Rom.CAB Rom.bin || \
unar -D 68*.CAB Rom.bin || $err "can't extract Rom.bin"
x_ mv Rom.bin ec.bin
@@ -190,16 +168,12 @@ extract_kbc1126ec()
extract_e6400vga()
{
set +u +e
- for v in E6400_VGA_offset E6400_VGA_romname; do
- eval "[ -z \"\$$v\" ] && $err \"e6400vga: $v undefined\""
- done
+ chkvars E6400_VGA_offset E6400_VGA_romname
tail -c +$E6400_VGA_offset "$_dl" | gunzip > "$appdir/bios.bin" || :
(
x_ cd "$appdir"
[ -f "bios.bin" ] || $err "extract_e6400vga: can't extract bios.bin"
"$e6400_unpack" bios.bin || printf "TODO: fix dell extract util\n"
- [ -f "$E6400_VGA_romname" ] || \
- $err "extract_e6400vga: can't extract vga rom from bios.bin"
) || $err "can't extract e6400 vga rom"
cp "$appdir/$E6400_VGA_romname" "$_dest" || \
$err "extract_e6400vga $board: can't copy vga rom to $_dest"
@@ -232,21 +206,19 @@ vendor_inject()
n) nukemode="$OPTARG" ;;
r) rom="$OPTARG" ;;
b) board="$OPTARG" ;;
- m) modifygbe="true"
- new_mac="$OPTARG" ;;
+ m) new_mac="$OPTARG"; chkvars new_mac ;;
*) : ;;
esac
done
- check_board
- build_dependencies_inject
+ check_board || return 0
+ [ "$nukemode" = "nuke" ] || x_ ./vendor download $board
[ "$vrelease" != "y" ] && patch_rom "$rom"
[ "$vrelease" = "y" ] && patch_release_roms
[ "$nukemode" = "nuke" ] && return 0
printf "Friendly reminder (this is *not* an error message):\n"
- printf "Please ensure that the files were inserted correctly. ALSO:\n"
- printf "%s\n" "$kbnotice"
+ printf "Make sure the files were inserted. ALSO:\n%s\n" "$kbnotice"
}
check_board()
@@ -257,9 +229,9 @@ check_board()
[ -z "${rom+x}" ] && $err "check_board: no rom specified"
[ -n "${board+x}" ] || board="$(detect_board "$rom")"
else
- vrelease="y"
- board="$(detect_board "$archive")"
- fi; readcfg
+ vrelease="y"; board="$(detect_board "$archive")"
+ fi
+ readcfg || return 1; return 0
}
check_release()
@@ -276,163 +248,126 @@ detect_board()
path="$1"
filename="$(basename "$path")"
case "$filename" in
- grub_*)
- board="$(echo "$filename" | cut -d '_' -f2-3)" ;;
+ grub_*) board="$(echo "$filename" | cut -d '_' -f2-3)" ;;
seabios_withgrub_*)
board="$(echo "$filename" | cut -d '_' -f3-4)" ;;
*.tar.xz)
_stripped_prefix="${filename#*_}"
board="${_stripped_prefix%.tar.xz}" ;;
- *)
- $err "detect_board $filename: could not detect board type"
- esac
- printf "%s\n" "$board"
+ *) $err "detect_board $filename: could not detect board type"
+ esac; printf "%s\n" "$board"
}
readcfg()
{
+ if [ "$board" = "serprog_rp2040" ] || \
+ [ "$board" = "serprog_stm32" ]; then
+ return 1
+ fi
boarddir="$cbcfgsdir/$board"
eval `setcfg "$boarddir/target.cfg"`
chkvars vcfg tree
-}
-build_dependencies_inject()
-{
cbdir="src/coreboot/$tree"
cbfstool="elf/cbfstool/$tree/cbfstool"
+ mecleaner="$PWD/$cbdir/util/me_cleaner/me_cleaner.py"
+ kbc1126_ec_dump="$PWD/$cbdir/util/kbc1126/kbc1126_ec_dump"
+ cbfstool="elf/cbfstool/$tree/cbfstool"
ifdtool="elf/ifdtool/$tree/ifdtool"
+
x_ ./update trees -b coreboot utils $tree
- [ -z "$new_mac" ] || [ -f "$nvmutil" ] || x_ make -C util/nvmutil
- [ "$nukemode" = "nuke" ] || x_ ./vendor download $board; return 0
}
patch_release_roms()
{
- _tmpdir="tmp/romdir"
- remkdir "$_tmpdir"
- tar -xf "$archive" -C "$_tmpdir" || \
- $err "patch_release_roms: !tar -xf \"$archive\" -C \"$_tmpdir\""
+ remkdir "tmp/romdir"
+ tar -xf "$archive" -C "tmp/romdir" || \
+ $err "patch_release_roms: !tar -xf \"$archive\" -C \"tmp/romdir\""
- for x in "$_tmpdir"/bin/*/*.rom ; do
- printf "patching rom: %s\n" "$x"
+ for x in "tmp/romdir/bin/"*/*.rom ; do
patch_rom "$x"
done
(
- cd "$_tmpdir/bin/"* || \
- $err "patch_release_roms: !cd $_tmpdir/bin/*"
+ cd "tmp/romdir/bin/"* || $err "patch roms: !cd tmp/romdir/bin/*"
# NOTE: For compatibility with older rom releases, defer to sha1
- [ "$nukemode" = "nuke" ] || sha512sum --status -c vendorhashes || \
+ [ "$verify" != "y" ] || [ "$nukemode" = "nuke" ] || \
+ sha512sum --status -c vendorhashes || \
sha1sum --status -c vendorhashes || sha512sum --status -c \
blobhashes || sha1sum --status -c blobhashes || \
$err "patch_release_roms: ROMs did not match expected hashes"
) || $err "can't verify vendor hashes"
- [ "$modifygbe" = "true" ] && \
- for x in "$_tmpdir"/bin/*/*.rom ; do
- [ -f "$x" ] && modify_gbe "$x"
- done
-
- [ -d "bin/release" ] || x_ mkdir -p bin/release
- x_ mv "$_tmpdir"/bin/* bin/release/
- x_ rm -Rf "$_tmpdir"
+ [ -n "$new_mac" ] && for x in "tmp/romdir/bin/"*/*.rom ; do
+ [ -f "$x" ] && modify_gbe "$x"
+ done
- printf "Success! Your ROMs are in bin/release\n"
+ x_ mkdir -p bin/release
+ mv tmp/romdir/bin/* bin/release/ || $err "$board: !mv release roms"
}
patch_rom()
{
+ rom="$1"
+
. "$(check_defconfig "$boarddir")" 2>/dev/null || exit 0
[ "$CONFIG_HAVE_MRC" = "y" ] && inject "mrc.bin" "$CONFIG_MRC_FILE" \
"mrc" "0xfffa0000"
[ -n "$CONFIG_HAVE_REFCODE_BLOB" ] && inject "fallback/refcode" \
"$CONFIG_REFCODE_BLOB_FILE" "stage"
- [ "$CONFIG_HAVE_ME_BIN" = "y" ] && inject "IFD" "$CONFIG_ME_BIN_PATH" \
- "me"
- [ "$CONFIG_KBC1126_FIRMWARE" = "y" ] && inject "ecfw1.bin" \
- "$CONFIG_KBC1126_FW1" "raw" "$CONFIG_KBC1126_FW1_OFFSET" && \
- inject "ecfw2.bin" "$CONFIG_KBC1126_FW2" "raw" \
- "$CONFIG_KBC1126_FW2_OFFSET"
+ [ "$CONFIG_HAVE_ME_BIN" = "y" ] && inject IFD "$CONFIG_ME_BIN_PATH" me
+ [ "$CONFIG_KBC1126_FIRMWARE" = "y" ] && inject ecfw1.bin \
+ "$CONFIG_KBC1126_FW1" raw "$CONFIG_KBC1126_FW1_OFFSET" && inject \
+ ecfw2.bin "$CONFIG_KBC1126_FW2" raw "$CONFIG_KBC1126_FW2_OFFSET"
[ -n "$CONFIG_VGA_BIOS_FILE" ] && [ -n "$CONFIG_VGA_BIOS_ID" ] && \
inject "pci$CONFIG_VGA_BIOS_ID.rom" \
"$CONFIG_VGA_BIOS_FILE" "optionrom"
[ "$CONFIG_INCLUDE_SMSC_SCH5545_EC_FW" = "y" ] && \
[ -n "$CONFIG_SMSC_SCH5545_EC_FW_FILE" ] && \
- inject "sch5545_ecfw.bin" "$CONFIG_SMSC_SCH5545_EC_FW_FILE" raw
- [ "$modifygbe" = "true" ] && ! [ "$vrelease" = "y" ] && \
- inject "IFD" "$CONFIG_GBE_BIN_PATH" "GbE"
+ inject sch5545_ecfw.bin "$CONFIG_SMSC_SCH5545_EC_FW_FILE" raw
+ [ -n "$new_mac" ] && [ "$vrelease" != "y" ] && modify_gbe "$rom"
- printf "ROM image successfully patched: %s\n" "$1"
+ printf "ROM image successfully patched: %s\n" "$rom"
}
inject()
{
[ $# -lt 3 ] && $err "$@, $rom: usage: inject name path type (offset)"
+ [ "$2" = "/dev/null" ] && return 0; verify="y"
eval `setvars "" cbfsname _dest _t _offset`
- cbfsname="$1"
- _dest="${2##*../}"
- _t="$3"
+ cbfsname="$1"; _dest="${2##*../}"; _t="$3"
+
[ $# -gt 3 ] && _offset="-b $4" && [ -z "$4" ] && \
$err "inject $@, $rom: offset passed, but empty (not defined)"
- [ -z "$_dest" ] && $err "inject $@, $rom: empty destination path"
- [ ! -f "$_dest" ] && [ "$nukemode" != "nuke" ] && \
- $err "inject_$dl_type: file missing, $_dest"
-
- [ "$nukemode" = "nuke" ] || \
- printf "Inserting %s/%s into: %s\n" "$cbfsname" "$_t" "$rom"
+ e "$_dest" f n && [ "$nukemode" != "nuke" ] && $err "!inject $dl_type"
- if [ "$_t" = "GbE" ]; then
- x_ mkdir -p tmp
- cp "$_dest" "tmp/gbe.bin" || \
- $err "inject: !cp \"$_dest\" \"tmp/gbe.bin\""
- _dest="tmp/gbe.bin"
- "$nvmutil" "$_dest" setmac "$new_mac" || \
- $err "inject $_dest: can't change mac address"
- fi
if [ "$cbfsname" = "IFD" ]; then
- if [ "$nukemode" != "nuke" ]; then
- "$ifdtool" -i $_t:$_dest "$rom" -O "$rom" || \
- $err "inject: can't insert $_t ($dest) into $rom"
- else
- "$ifdtool" --nuke $_t "$rom" -O "$rom" || \
- $err "inject $rom: can't nuke $_t in IFD"
- fi
- else
- if [ "$nukemode" != "nuke" ]; then
- if [ "$_t" = "stage" ]; then # broadwell refcode
- "$cbfstool" "$rom" add-stage -f "$_dest" \
- -n "$cbfsname" -t stage -c lzma
- else
- "$cbfstool" "$rom" add -f "$_dest" \
- -n "$cbfsname" -t $_t $_offset || \
- $err "$rom: can't insert $_t file $_dest"
- fi
- else
- "$cbfstool" "$rom" remove -n "$cbfsname" || \
- $err "inject $rom: can't remove $cbfsname"
- fi
+ [ "$nukemode" = "nuke" ] || "$ifdtool" -i $_t:$_dest "$rom" \
+ -O "$rom" || $err "failed: inject '$_t' '$_dest' on '$rom'"
+ [ "$nukemode" != "nuke" ] || "$ifdtool" --nuke $_t "$rom" \
+ -O "$rom" || $err "$rom: can't nuke $_t in IFD"; return 0
+ elif [ "$nukemode" = "nuke" ]; then
+ "$cbfstool" "$rom" remove -n "$cbfsname" || \
+ $err "inject $rom: can't remove $cbfsname"; return 0
fi
+ [ "$_t" != "stage" ] || "$cbfstool" "$rom" add-stage -f \
+ "$_dest" -n "$cbfsname" -t stage -c lzma || $err "$rom: !add ref"
+ [ "$_t" = "stage" ] || "$cbfstool" "$rom" add -f "$_dest" \
+ -n "$cbfsname" -t $_t $_offset || $err "$rom !add $_t ($_dest)"
}
modify_gbe()
{
- printf "changing mac address in gbe to $new_mac\n"
- [ -z "$CONFIG_GBE_BIN_PATH" ] && \
- err "modify_gbe: $board: CONFIG_GBE_BIN_PATH not set"
+ chkvars CONFIG_GBE_BIN_PATH
- _gbe_location=${CONFIG_GBE_BIN_PATH##*../}
- [ -f "$_gbe_location" ] || \
- err "modify_gbe: $_gbe_location points to missing file"
+ e "${CONFIG_GBE_BIN_PATH##*../}" f n && $err "missing gbe file"
x_ make -C util/nvmutil
- _gbe_tmp=$(mktemp -t gbeXXXX.bin)
- x_ cp "$_gbe_location" "$_gbe_tmp"
- x_ "$nvmutil" "$_gbe_tmp" setmac "$new_mac"
- x_ "${ifdtool}" -i GbE:"$_gbe_tmp" "$1" -O "$1"
-
- x_ rm -f "$_gbe_tmp"
+ x_ cp "${CONFIG_GBE_BIN_PATH##*../}" "$TMPDIR/gbe"
+ x_ "util/nvmutil/nvm" "$TMPDIR/gbe" setmac $new_mac
+ x_ "$ifdtool" -i GbE:"$TMPDIR/gbe" "$1" -O "$1"
}
diff --git a/script/roms b/script/roms
index 359d5725..8a2cc796 100755
--- a/script/roms
+++ b/script/roms
@@ -107,7 +107,7 @@ configure_target()
[ -n "$uboot_config" ] || uboot_config="default"
[ "$payload_uboot" = "y" ] || payload_seabios="y"
[ "$payload_grub" = "y" ] && payload_seabios="y"
- [ "$payload_seabios" = "y" ] && [ -n "$payload_uboot" = "y" ] && \
+ [ "$payload_seabios" = "y" ] && [ "$payload_uboot" = "y" ] && \
$err "$board: U-Boot and SeaBIOS/GRUB are both enabled."
[ -z "$grub_scan_disk" ] && grub_scan_disk="nvme ahci ata"
diff --git a/script/trees b/script/trees
index 6865a018..4ab0d406 100755
--- a/script/trees
+++ b/script/trees
@@ -10,9 +10,9 @@ set -u -e
. "include/git.sh"
cbmakeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS"
-eval `setvars "" xarch cdir config cmakedir xlang mode makeargs elfdir xtree \
- project target target_dir targets tree _f target1 bootstrapargs mkhelper \
- autoconfargs config_name listfile autogenargs btype`
+eval `setvars "" xarch cdir defconfig cmakedir xlang mode makeargs elfdir cmd \
+ project target target_dir targets xtree _f target1 bootstrapargs mkhelper \
+ autoconfargs listfile autogenargs btype tree rev tree_depend`
main()
{
@@ -31,11 +31,15 @@ main()
-n) mode="nconfig" ;;
*) $err "invalid option '-$option'" ;;
esac
- [ -n "${OPTARG+x}" ] || $err "OPTARG not set"
+ [ -z "${OPTARG+x}" ] && shift 1 && break
project="${OPTARG#src/}"; shift 2
done
[ -z "$_f" ] && $err "missing flag (-m/-u/-b/-c/-x/-f/-s/-l/-n)"
- [ -z "$project" ] && $err "project name not specified"
+ [ -z "$project" ] && for p in $(ls -1 config/git); do
+ ./update trees $_f "$p" || $err "!./update trees $_f $p"
+ [ "$XBMK_RELEASE" != "y" ] || singletree "$p" || \
+ x_ rm -Rf "src/$p/$p"; continue
+ done && return 0
[ -f "config/git/$project/pkg.cfg" ] || $err "'$project' not defined"
@@ -46,8 +50,8 @@ main()
remkdir "${tmpgit%/*}"
- _cmd="build_targets" && singletree "$project" && _cmd="build_project"
- $_cmd $@
+ cmd="build_targets" && singletree "$project" && cmd="build_project"
+ $cmd $@
[ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && return 0
@@ -57,12 +61,7 @@ main()
build_project()
{
- if [ "$mode" = "fetch" ]; then
- [ -f "CHANGELOG" ] && return 0
- fetch_project_repo; return 0
- fi
-
- load_project_config "$cfgsdir" 0 || return 0
+ load_target_config "$cfgsdir" || return 0
[ -f "$listfile" ] || listfile="" # optional on single-tree
dest_dir="$elfdir"
@@ -113,55 +112,58 @@ handle_defconfig()
for y in "$target_dir/config"/*; do
[ -f "$y" ] || continue
- config="$y"
- config_name="${config#"$target_dir/config/"}"
+ defconfig="$y"
- [ -n "$mode" ] || check_config || continue
+ [ -n "$mode" ] || check_defconfig || continue
handle_makefile
[ -n "$mode" ] || copy_elf
- done
+ done; return 0
}
handle_src_tree()
{
target_dir="$cfgsdir/$target"
- if [ "$mode" = "fetch" ]; then
- [ -f "CHANGELOG" ] && return 1
- fetch_project_trees; return 1
- fi
- load_project_config "$target_dir" || return 1
+ [ -f "CHANGELOG" ] || fetch_project "$project"
+ load_target_config "$target_dir" || return 1
x_ mkdir -p "$elfdir/$target"
chkvars tree
cdir="src/$project/$tree"
- if [ ! -d "$cdir" ]; then
- if [ "$mode" = "distclean" ] || \
- [ "$mode" = "crossgcc-clean" ]; then
- printf "Directory %s missing; skip\n" "$cdir" 1>&2
- return 1
- fi
- x_ ./update trees -f "$project" "$target"
+ if [ "$mode" = "distclean" ] || [ "$mode" = "crossgcc-clean" ]; then
+ [ -d "$cdir" ] || return 1
fi
+ x_ ./update trees -f "$project" "$target"
[ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && return 0
[ -z "$mode" ] && check_cross_compiler; return 0
}
-load_project_config()
+load_target_config()
{
- eval `setvars "" xarch xlang tree bootstrapargs autoconfargs xtree \
+ eval `setvars "" xarch xlang bootstrapargs autoconfargs xtree \
tree_depend makeargs btype mkhelper`
[ -f "$1/target.cfg" ] || btype="auto"
+ [ -f "$datadir/mkhelper.cfg" ] && eval `setcfg "$datadir/mkhelper.cfg"`
+
+ _tcfg="$1/target.cfg"
+ while [ -f "$_tcfg" ] || [ "$cmd" = "build_targets" ]; do
+ eval `setvars "" rev tree`
- # target.cfg optional on single-tree so return if missing.
- # target.cfg mandatory on multi-tree so err if missing.
- _setcfgarg="" && [ $# -gt 1 ] && _setcfgarg="$2"
- eval `setcfg "$1/target.cfg" $_setcfgarg`
+ printf "Loading %s config: %s\n" "$project" "$_tcfg"
+ eval `setcfg "$_tcfg"`
+ [ "$cmd" = "build_project" ] && break
+ [ "$mode" = "fetch" ] || break
- [ -z "$btype" ] || [ "${mode%config}" = "$mode" ] || \
- return 1; return 0
+ [ "${_tcfg%/*/target.cfg}" = "${_tcfg%"/$tree/target.cfg"}" ] \
+ && break; _tcfg="${_tcfg%/*/target.cfg}/$tree/target.cfg"
+ done
+
+ [ -z "$btype" ] || [ "${mode%config}" = "$mode" ] || return 1
+
+ [ "$mode" = "fetch" ] || return 0
+ [ -f "CHANGELOG" ] && return 1; fetch_${cmd#build_}; return 1
}
check_cross_compiler()
@@ -190,21 +192,20 @@ check_coreboot_utils()
utilelfdir="elf/$util/$1"
utilsrcdir="src/coreboot/$1/util/$util"
- utilmode=""
- [ -z "$mode" ] || utilmode="clean"
+ utilmode="" && [ -n "$mode" ] && utilmode="clean"
x_ make -C "$utilsrcdir" $utilmode -j$XBMK_THREADS $cbmakeargs
[ -z "$mode" ] && [ ! -f "$utilelfdir/$util" ] && \
x_ mkdir -p "$utilelfdir" && \
x_ cp "$utilsrcdir/$util" "elf/$util/$1"
[ -z "$mode" ] || x_ rm -Rf "$utilelfdir"
- done
+ done; return 0
}
-check_config()
+check_defconfig()
{
- [ -f "$config" ] || $err "check_config $project/$target: no config"
+ [ -f "$defconfig" ] || $err "$project/$target: missing defconfig"
- dest_dir="$elfdir/$target/$config_name"
+ dest_dir="$elfdir/$target/${defconfig#"$target_dir/config/"}"
elfcheck || return 1 # skip build if a previous one exists
x_ mkdir -p "$dest_dir"
@@ -221,15 +222,14 @@ elfcheck()
handle_makefile()
{
check_makefile "$cdir" && x_ make clean -C "$cdir"
- x_ cp "$config" "$cdir/.config"
+ x_ cp "$defconfig" "$cdir/.config"
[ -n "$mode" ] || [ -n "$btype" ] || make -C "$cdir" \
silentoldconfig || make -C "$cdir" oldconfig || :
run_make_command || $err "handle_makefile $cdir: no makefile!"
- _copy=".config"
- [ "$mode" = "savedefconfig" ] && _copy="defconfig"
- [ "${mode%config}" = "$mode" ] || x_ cp "$cdir/$_copy" "$config"
+ _copy=".config" && [ "$mode" = "savedefconfig" ] && _copy="defconfig"
+ [ "${mode%config}" = "$mode" ] || x_ cp "$cdir/$_copy" "$defconfig"
[ -e "$cdir/.git" ] && [ "$project" = "u-boot" ] && \
[ "$mode" = "distclean" ] && x_ git -C "$cdir" clean -fdx; return 0
@@ -245,12 +245,9 @@ run_make_command()
&& makeargs="$makeargs $cbmakeargs"
make -C "$cdir" $mode -j$XBMK_THREADS $makeargs || $err "$cdir mk$mode"
+ [ -z "$mkhelper" ] || [ -n "$mode" ] || $mkhelper || $err "!$mkhelper"
- [ -z "$mkhelper" ] || [ -n "$mode" ] || $mkhelper || \
- $err "$cdir: helper command failed: $mkhelper" # eg mkpayload_grub
-
- [ "$mode" != "clean" ] && return 0
- make -C "$cdir" distclean 2>/dev/null || :
+ [ "$mode" = "clean" ] && make -C "$cdir" distclean || :; return 0
}
check_cmake()
@@ -281,7 +278,6 @@ mkpayload_grub()
{
eval `setvars "" grub_modules grub_install_modules`
eval `setcfg "$grubdata/module/$tree"`
- chkvars "grub_install_modules" "grub_modules"
x_ rm -f "$cdir/grub.elf"
@@ -299,8 +295,7 @@ copy_elf()
{
[ -f "$listfile" ] && x_ mkdir -p "$dest_dir" && while read -r f; do
[ -f "$cdir/$f" ] && x_ cp "$cdir/$f" "$dest_dir"
- done < "$listfile"
- x_ make clean -C "$cdir"
+ done < "$listfile"; x_ make clean -C "$cdir"
}
main $@
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-02 21:56:12 +0000