meta: updates for BUP generation changes in R35.3.1

The combined bl + kernel payload is no longer generated; remove
references to that and instead deploy the individual bl_only and
kernel_only payloads.  Also update the BUP generator script to
allow the bupgen spec to explicitly name the type of payload to
generate, another feature on R35.3.1.

Signed-off-by: Matt Madison <matt@madison.systems>
This commit is contained in:
Matt Madison
2023-03-29 11:33:43 -07:00
committed by Matt Madison
parent 842596b289
commit cb3fb1dec0
3 changed files with 16 additions and 8 deletions

View File

@@ -638,7 +638,7 @@ def tegraflash_bupgen_strip_cmd(d):
tegraflash_generate_bupgen_script() {
local outfile="${1:-./generate_bup_payload.sh}"
local spec__ sdramcfg fab boardsku boardrev
local spec__ sdramcfg fab boardsku boardrev bup_type buptype_arg
rm -f $outfile
cat <<EOF > $outfile
#!/bin/bash
@@ -658,9 +658,15 @@ EOF
boardsku="${TEGRA_BOARDSKU}"
boardrev="${TEGRA_BOARDREV}"
for spec__ in ${@' '.join(['"%s"' % entry for entry in d.getVar('TEGRA_BUPGEN_SPECS').split()])}; do
bup_type=""
eval $spec__
if [ -n "$bup_type" ]; then
buptype_arg="--bup-type $bup_type"
else
buptype_arg=""
fi
cat <<EOF >> $outfile
MACHINE=${TNSPEC_MACHINE} FAB="$fab" BOARDSKU="$boardsku" BOARDREV="$boardrev" ./${SOC_FAMILY}-flash-helper.sh --bup ./flash-stripped.xml.in ${DTBFILE} $sdramcfg ${ODMDATA} "\$@"
MACHINE=${TNSPEC_MACHINE} FAB="$fab" BOARDSKU="$boardsku" BOARDREV="$boardrev" ./${SOC_FAMILY}-flash-helper.sh --bup $buptype_arg ./flash-stripped.xml.in ${DTBFILE} $sdramcfg ${ODMDATA} "\$@"
EOF
done
chmod +x $outfile
@@ -765,8 +771,6 @@ EOF
create_bup_payload_image() {
local type="$1"
oe_make_bup_payload ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}
install -m 0644 ${WORKDIR}/bup-payload/bl_update_payload ${IMGDEPLOYDIR}/${IMAGE_NAME}.bup-payload
ln -sf ${IMAGE_NAME}.bup-payload ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.bup-payload
for f in ${WORKDIR}/bup-payload/*_only_payload; do
[ -e $f ] || continue
sfx=$(basename $f _payload)