From 10c917dbb15be9c325ee89f1313f83c51cb7d794 Mon Sep 17 00:00:00 2001 From: Matt Madison Date: Sat, 7 Oct 2023 06:31:31 -0700 Subject: [PATCH] image_types_tegra.bbclass: only populate initrd-flash.img in tegraflash packages Move the copying of the initrd flasher out of the common function, since it's not needed for BUP payload generation. Signed-off-by: Matt Madison --- classes-recipe/image_types_tegra.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes-recipe/image_types_tegra.bbclass b/classes-recipe/image_types_tegra.bbclass index 8cd565a3..48c70279 100644 --- a/classes-recipe/image_types_tegra.bbclass +++ b/classes-recipe/image_types_tegra.bbclass @@ -280,9 +280,6 @@ tegraflash_populate_package() { fi cp "$kernelimg" ./$lnxfile cp "${IMAGE_TEGRAFLASH_ESPIMG}" ./esp.img - if [ -n "${IMAGE_TEGRAFLASH_INITRD_FLASHER}" ]; then - cp "${IMAGE_TEGRAFLASH_INITRD_FLASHER}" ./initrd-flash.img - fi if [ -n "${DATAFILE}" -a -n "${IMAGE_TEGRAFLASH_DATA}" ]; then cp "${IMAGE_TEGRAFLASH_DATA}" ./${DATAFILE} DATAARGS="--datafile ${DATAFILE}" @@ -338,6 +335,9 @@ create_tegraflash_pkg() { mkdir -p ${WORKDIR}/tegraflash cd ${WORKDIR}/tegraflash tegraflash_populate_package ${IMAGE_TEGRAFLASH_KERNEL} ${LNXFILE} ${@tegra_bootcontrol_overlay_list(d)} + if [ -n "${IMAGE_TEGRAFLASH_INITRD_FLASHER}" ]; then + cp "${IMAGE_TEGRAFLASH_INITRD_FLASHER}" ./initrd-flash.img + fi tegraflash_custom_pre cp "${IMAGE_TEGRAFLASH_ROOTFS}" ./${IMAGE_BASENAME}.${IMAGE_TEGRAFLASH_FS_TYPE} tegraflash_create_flash_config flash.xml.in ${LNXFILE}