scottk/meta-tegra
1
0
Fork 0
mirror of https://github.com/lingble/meta-tegra.git synced 2025-10-29 19:42:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

image_types_tegra.bbclass: add dosdcard.sh script to t234 tegraflash packages

Browse Source 
All of the t234 platforms have SPI flash, so remove the conditional logic in
the t234 tegraflash package generator and always create a dosdcard.sh script.

Signed-off-by: Matt Madison <matt@madison.systems>
This commit is contained in:
Matt Madison
2023-04-08 05:41:30 -07:00
committed by Matt Madison
parent 5e0bcc6d5a
commit acd3a40a34
1 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
classes/image_types_tegra.bbclass
View File

@@ -15,7 +15,7 @@ def tegra_rootfs_device(d):
# For Xavier NX booting from SDcard, the RCM booted kernel # For Xavier NX booting from SDcard, the RCM booted kernel
# bypasses UEFI and doesn't get any overlays applied, such # bypasses UEFI and doesn't get any overlays applied, such
# as the one that renames mmcblk1 -> mmcblk0 # as the one that renames mmcblk1 -> mmcblk0
if bootdev.startswith("mmc") and d.getVar('TEGRA_SPIFLASH_BOOT') == "1": if d.getVar('NVIDIA_CHIP') == "0x19" and bootdev.startswith("mmc") and d.getVar('TEGRA_SPIFLASH_BOOT') == "1":
return "mmcblk1" return "mmcblk1"
if bootdev.startswith("mmc") or bootdev.startswith("nvme"): if bootdev.startswith("mmc") or bootdev.startswith("nvme"):
return re.sub(r"p[0-9]+$", "", bootdev) return re.sub(r"p[0-9]+$", "", bootdev)
@@ -601,29 +601,12 @@ END
chmod +x burnfuses.sh chmod +x burnfuses.sh
fi fi
if [ "${TEGRA_SPIFLASH_BOOT}" = "1" ]; then rm -f dosdcard.sh
rm -f dosdcard.sh cat > dosdcard.sh <<END
cat > dosdcard.sh <<END
#!/bin/sh #!/bin/sh
MACHINE=${TNSPEC_MACHINE} BOARDID=\${BOARDID:-${TEGRA_BOARDID}} FAB=\${FAB:-${TEGRA_FAB}} CHIPREV=\${CHIPREV:-${TEGRA_CHIPREV}} BOARDSKU=\${BOARDSKU:-${TEGRA_BOARDSKU}} fuselevel=\${fuselevel:-fuselevel_production} ./tegra234-flash-helper.sh --sdcard -B ${TEGRA_BLBLOCKSIZE} -s ${TEGRAFLASH_SDCARD_SIZE} -b ${IMAGE_BASENAME} $DATAARGS flash.xml.in ${DTBFILE} ${EMMC_BCT} ${ODMDATA} ${LNXFILE} ${IMAGE_BASENAME}.${IMAGE_TEGRAFLASH_FS_TYPE} "\$@" MACHINE=${TNSPEC_MACHINE} BOARDID=\${BOARDID:-${TEGRA_BOARDID}} FAB=\${FAB:-${TEGRA_FAB}} CHIPREV=\${CHIPREV:-${TEGRA_CHIPREV}} BOARDSKU=\${BOARDSKU:-${TEGRA_BOARDSKU}} fuselevel=\${fuselevel:-fuselevel_production} ./tegra234-flash-helper.sh --sdcard -B ${TEGRA_BLBLOCKSIZE} -s ${TEGRAFLASH_SDCARD_SIZE} -b ${IMAGE_BASENAME} $DATAARGS flash.xml.in ${DTBFILE} ${EMMC_BCT} ${ODMDATA} ${LNXFILE} ${IMAGE_BASENAME}.${IMAGE_TEGRAFLASH_FS_TYPE} "\$@"
END END
chmod +x dosdcard.sh chmod +x dosdcard.sh
elif [ "${TEGRA_ROOTFS_AND_KERNEL_ON_SDCARD}" = "1" ]; then
rm -f doflash.sh
cat > doflash.sh <<END
#!/bin/sh
./nvflashxmlparse --split=flash-sdcard.xml.in --output=flash-mmc.xml.in --sdcard-size=${TEGRAFLASH_SDCARD_SIZE} flash.xml.in
MACHINE=${TNSPEC_MACHINE} ./tegra234-flash-helper.sh $DATAARGS flash-mmc.xml.in ${DTBFILE} ${EMMC_BCT} ${ODMDATA} ${LNXFILE} ${IMAGE_BASENAME}.${IMAGE_TEGRAFLASH_FS_TYPE} "\$@"
END
chmod +x doflash.sh
rm -f dosdcard.sh
cat > dosdcard.sh <<END
#!/bin/sh
./nvflashxmlparse --split=flash-sdcard.xml.in --output=flash-mmc.xml.in --sdcard-size=${TEGRAFLASH_SDCARD_SIZE} flash.xml.in
MACHINE=${TNSPEC_MACHINE} BOARDID=\${BOARDID:-${TEGRA_BOARDID}} FAB=\${FAB:-${TEGRA_FAB}} CHIPREV=\${CHIPREV:-${TEGRA_CHIPREV}} BOARDSKU=\${BOARDSKU:-${TEGRA_BOARDSKU}} BOARDREV=\${BOARDREV:-${TEGRA_BOARDREV}} fuselevel=\${fuselevel:-fuselevel_production} ./tegra234-flash-helper.sh --sdcard -B ${TEGRA_BLBLOCKSIZE} -s ${TEGRAFLASH_SDCARD_SIZE} -b ${IMAGE_BASENAME} $DATAARGS flash-sdcard.xml.in ${DTBFILE} ${EMMC_BCT} ${ODMDATA} ${LNXFILE} ${IMAGE_BASENAME}.${IMAGE_TEGRAFLASH_FS_TYPE} "\$@"
END
chmod +x dosdcard.sh
fi
tegraflash_custom_post tegraflash_custom_post
tegraflash_custom_sign_pkg tegraflash_custom_sign_pkg
tegraflash_finalize_pkg tegraflash_finalize_pkg