scottk/meta-tegra
1
0
Fork 0
mirror of https://github.com/lingble/meta-tegra.git synced 2025-10-30 12:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

meta: updates for BUP generation changes in R35.3.1

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

12
classes/image_types_tegra.bbclass
View File

@@ -638,7 +638,7 @@ def tegraflash_bupgen_strip_cmd(d):
tegraflash_generate_bupgen_script() { tegraflash_generate_bupgen_script() {
local outfile="${1:-./generate_bup_payload.sh}" 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 rm -f $outfile
cat <<EOF > $outfile cat <<EOF > $outfile
#!/bin/bash #!/bin/bash
@@ -658,9 +658,15 @@ EOF
boardsku="${TEGRA_BOARDSKU}" boardsku="${TEGRA_BOARDSKU}"
boardrev="${TEGRA_BOARDREV}" boardrev="${TEGRA_BOARDREV}"
for spec__ in ${@' '.join(['"%s"' % entry for entry in d.getVar('TEGRA_BUPGEN_SPECS').split()])}; do for spec__ in ${@' '.join(['"%s"' % entry for entry in d.getVar('TEGRA_BUPGEN_SPECS').split()])}; do
bup_type=""
eval $spec__ eval $spec__
if [ -n "$bup_type" ]; then
buptype_arg="--bup-type $bup_type"
else
buptype_arg=""
fi
cat <<EOF >> $outfile 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 EOF
done done
chmod +x $outfile chmod +x $outfile
@@ -765,8 +771,6 @@ EOF
create_bup_payload_image() { create_bup_payload_image() {
local type="$1" local type="$1"
oe_make_bup_payload ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} 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 for f in ${WORKDIR}/bup-payload/*_only_payload; do
[ -e $f ] || continue [ -e $f ] || continue
sfx=$(basename $f _payload) sfx=$(basename $f _payload)

11
recipes-bsp/tegra-bup-payload/tegra-bup-payload_1.0.bb
View File

@@ -16,17 +16,22 @@ def bup_dependency(d):
return "kernel-bup-payload:do_deploy" return "kernel-bup-payload:do_deploy"
return "${INITRAMFS_IMAGE}:do_image_complete" return "${INITRAMFS_IMAGE}:do_image_complete"
BUPFILE = "${@bupfile_basename(d)}.bup-payload" BUPFILENAME = "${@bupfile_basename(d)}"
do_install() { do_install() {
install -d ${D}/opt/ota_package/ install -d ${D}/opt/ota_package/
install -m 0644 ${DEPLOY_DIR_IMAGE}/${BUPFILE} ${D}/opt/ota_package/bl_update_payload if [ -e ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.bl_only.bup_payload ]; then
install -m 0644 ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.bl_only.bup_payload ${D}/opt/ota_package/bl_only_payload
fi
if [ -e ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.kernel_only.bup_payload ]; then
install -m 0644 ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.kernel_only.bup_payload ${D}/opt/ota_package/kernel_only_payload
fi
} }
ALLOW_EMPTY:${PN} = "1" ALLOW_EMPTY:${PN} = "1"
do_install[depends] += "${@bup_dependency(d)}" do_install[depends] += "${@bup_dependency(d)}"
FILES:${PN} = "/opt/ota_package/bl_update_payload" FILES:${PN} = "/opt/ota_package"
RDEPENDS:${PN} += "tegra-redundant-boot-update-engine" RDEPENDS:${PN} += "tegra-redundant-boot-update-engine"
# For UEFI build - remove once buildpaths issue is resolved there # For UEFI build - remove once buildpaths issue is resolved there
INSANE_SKIP:${PN} = "buildpaths" INSANE_SKIP:${PN} = "buildpaths"

1
recipes-kernel/kernel-bup-payload/kernel-bup-payload.bb
View File

@@ -24,7 +24,6 @@ do_deploy() {
initramfs_symlink_name=${imageType}-${INITRAMFS_LINK_NAME} initramfs_symlink_name=${imageType}-${INITRAMFS_LINK_NAME}
oe_make_bup_payload ${DEPLOY_DIR_IMAGE}/${initramfs_symlink_name}.cboot oe_make_bup_payload ${DEPLOY_DIR_IMAGE}/${initramfs_symlink_name}.cboot
install -d ${DEPLOYDIR} install -d ${DEPLOYDIR}
install -m 0644 ${WORKDIR}/bup-payload/bl_update_payload ${DEPLOYDIR}/${initramfs_symlink_name}.bup-payload
for f in ${WORKDIR}/bup-payload/*_only_payload; do for f in ${WORKDIR}/bup-payload/*_only_payload; do
[ -e $f ] || continue [ -e $f ] || continue
sfx=$(basename $f _payload) sfx=$(basename $f _payload)