Extend wendy_config partition to the SD card Jetson machine

konstantinbe · konstantinbe · commit cdb4b23fc9e3 · 2026-03-27T16:32:20.000+01:00
The NVMe machine already gets a 64 MB FAT32 WENDYCONFIG partition that
macOS auto-mounts. This extends the same to the SD card machine.

The SD card variant required three fixes beyond simply adding the
machine name:

- The SD card partition layout lives in a single XML shared with the
  QSPI bootloader layout. This means the bootloader update tooling
  (BUP) also sees our partition and tries to include the FAT32 image
  in firmware update payloads. We exclude it from BUP explicitly so
  it remains in the SD flash image only.

- The actual layout filename differs from what the machine config
  suggests, due to how the redundant AB layout naming works upstream.

- The tegraflash hook that copies the FAT32 image into the build
  package was written NVMe-only and needed to handle the SD case.
diff --git a/conf/machine/jetson-orin-nano-devkit-wendyos.conf b/conf/machine/jetson-orin-nano-devkit-wendyos.conf
@@ -35,3 +35,12 @@ IMAGE_FSTYPES:pn-tegra-initrd-flash-initramfs:tegra = "${TEGRA_INITRD_FLASH_INIT
 
 # If you really need it, board param (but consider removing if unused):
 EMMC_SIZE = "0"
+
+# Strip wendy-config.fat32.img from the BUP partition layout XML.
+# The BUP (bootloader update payload) is firmware-only; data partitions like
+# wendy_config must not be referenced there.  TEGRA_BUPGEN_STRIP_IMG_NAMES
+# removes the <filename> element for listed files when generating
+# flash-stripped.xml.in, which is what doflash.sh uses for BUP signing.
+# wendy_config is still present with its filename in flash.xml.in for normal
+# SD card flashing via dosdcard.sh.
+TEGRA_BUPGEN_STRIP_IMG_NAMES:append = " wendy-config.fat32.img"
diff --git a/meta-tegra-extensions/recipes-bsp/tegra-binaries/tegra-storage-layout-base_%.bbappend b/meta-tegra-extensions/recipes-bsp/tegra-binaries/tegra-storage-layout-base_%.bbappend
@@ -1,45 +1,38 @@
 DEPENDS:append = " tegra-helper-scripts-native"
 PATH =. "${STAGING_BINDIR_NATIVE}/tegra-flash:"
 
-# Override NVMe partition layout for WendyOS to:
-# 1. Remove "reserved" partition (between UDA and APP)
-# 2. Rename "permanet_user_storage" (p17) to "mender_data"
-# 3. Update mender_data size to 512MB (will auto-expand)
-# 4. Change allocation_attribute from 0x808 to 0x8 (allow expansion)
-# 5. Add partition type GUID for Linux filesystem
-#
-# This runs AFTER meta-mender-tegra's do_install:append which creates the _rootfs_ab.xml variant
+# Override partition layouts for WendyOS Jetson machines.
+# Runs AFTER meta-mender-tegra's do_install:append which injects DATAFILE into UDA.
 
 do_install:append() {
-    # Only apply to NVMe variants (both Nano and AGX use same T234 partition layout)
     case "${MACHINE}" in
-        jetson-orin-nano-devkit-nvme-wendyos|jetson-agx-orin-devkit-nvme-wendyos)
-            ;;
-        *)
-            return
-            ;;
-    esac
 
-    # Modify the _rootfs_ab.xml file created by meta-mender-tegra
-    local layout_file="flash_l4t_t234_nvme_rootfs_ab.xml"
-    local layout_path="${D}${datadir}/l4t-storage-layout/${layout_file}"
+        jetson-orin-nano-devkit-nvme-wendyos|jetson-agx-orin-devkit-nvme-wendyos)
+            # ------------------------------------------------------------------
+            # NVMe: modify flash_l4t_t234_nvme_rootfs_ab.xml
+            #
+            # 1. Remove "reserved" partition (blocks expansion, not needed)
+            # 2. Add "mender_data" (p17) after APP_b — persistent Mender store
+            # 2.5. Add "wendy_config" (p16, 64 MB FAT32) before mender_data
+            # 3. Remove DATAFILE from UDA (UDA kept for NVIDIA compat, not used)
+            # ------------------------------------------------------------------
+            local layout_file="flash_l4t_t234_nvme_rootfs_ab.xml"
+            local layout_path="${D}${datadir}/l4t-storage-layout/${layout_file}"
 
-    if [ ! -f "${layout_path}" ]; then
-        bbwarn "Layout file ${layout_file} not found at ${layout_path}, skipping WendyOS modifications"
-        return
-    fi
+            if [ ! -f "${layout_path}" ]; then
+                bbwarn "Layout file ${layout_file} not found at ${layout_path}, skipping WendyOS NVMe modifications"
+                return
+            fi
 
-    bbnote "wendyos: Modifying ${layout_file} to use mender_data partition..."
+            bbnote "wendyos: Modifying ${layout_file} for NVMe (mender_data + wendy_config)..."
 
-    # 1. Remove the "reserved" partition (between UDA and APP)
-    #    This partition blocks expansion and is not needed
-    nvflashxmlparse --remove --partitions-to-remove reserved \
-        --output ${WORKDIR}/${layout_file}.tmp1 \
-        ${layout_path}
+            # 1. Remove the "reserved" partition
+            nvflashxmlparse --remove --partitions-to-remove reserved \
+                --output ${WORKDIR}/${layout_file}.tmp1 \
+                ${layout_path}
 
-    # 2. Add new "mender_data" partition AFTER APP_b and BEFORE secondary_gpt
-    #    Insert the partition definition using sed
-    sed -i '/<partition name="secondary_gpt"/i\
+            # 2. Add "mender_data" AFTER APP_b and BEFORE secondary_gpt
+            sed -i '/<partition name="secondary_gpt"/i\
         <partition name="mender_data" id="17" type="data">\
             <allocation_policy> sequential </allocation_policy>\
             <filesystem_type> basic </filesystem_type>\
@@ -52,11 +45,11 @@ do_install:append() {
             <filename> DATAFILE </filename>\
             <description> **WendyOS/Mender.** Data partition for persistent storage (home directories, user data, Mender state). Positioned after APP_b to allow expansion to fill remaining disk space. Auto-expands via mender-grow-data.service on first boot. UDA (p15) is kept for NVIDIA compatibility but not mounted by wendyos. </description>\
         </partition>' \
-        ${WORKDIR}/${layout_file}.tmp1
+                ${WORKDIR}/${layout_file}.tmp1
 
-    # 2.5. Add wendy_config partition (id=16) BEFORE mender_data (id=17)
-    #      64 MB FAT32, Microsoft Basic Data GUID → macOS auto-mounts as /Volumes/WENDYCONFIG
-    sed -i '/<partition name="mender_data" id="17"/i\
+            # 2.5. Add wendy_config (id=16) BEFORE mender_data (id=17)
+            #      Microsoft Basic Data GUID → macOS auto-mounts as /Volumes/WENDYCONFIG
+            sed -i '/<partition name="mender_data" id="17"/i\
         <partition name="wendy_config" id="16" type="data">\
             <allocation_policy> sequential </allocation_policy>\
             <filesystem_type> basic </filesystem_type>\
@@ -69,19 +62,72 @@ do_install:append() {
             <filename> wendy-config.fat32.img </filename>\
             <description> WendyOS first-boot config partition (FAT32, 64 MB). </description>\
         </partition>' \
-        ${WORKDIR}/${layout_file}.tmp1
+                ${WORKDIR}/${layout_file}.tmp1
 
-    # 3. Remove DATAFILE filename from UDA partition
-    #    Prevent flash error when dataimg is larger than UDA partition
-    #    UDA is not used by WendyOS (mender_data is used instead)
-    #    UDA is kept for NVIDIA compatibility but should not have pre-written content
-    #    The filename field causes flash tools to fail during signing
-    sed -i '/<partition name="UDA"/,/<\/partition>/ {
-        /<filename>/d
-    }' ${WORKDIR}/${layout_file}.tmp1
+            # 3. Remove DATAFILE from UDA (prevents flash error; UDA not mounted by WendyOS)
+            sed -i '/<partition name="UDA"/,/<\/partition>/ {
+                /<filename>/d
+            }' ${WORKDIR}/${layout_file}.tmp1
 
-    # Install the modified layout
-    install -m 0644 ${WORKDIR}/${layout_file}.tmp1 ${layout_path}
+            install -m 0644 ${WORKDIR}/${layout_file}.tmp1 ${layout_path}
+            bbnote "WendyOS: Successfully modified ${layout_file} for NVMe"
+            ;;
 
-    bbnote "WendyOS: Successfully added mender_data partition to ${layout_file}"
+        jetson-orin-nano-devkit-wendyos)
+            # ------------------------------------------------------------------
+            # SD card: modify the SD template layout XML.
+            #
+            # With USE_REDUNDANT_FLASH_LAYOUT=1 and
+            # PARTITION_LAYOUT_TEMPLATE_DEFAULT_SUPPORTS_REDUNDANT unset,
+            # PARTITION_LAYOUT_TEMPLATE resolves to
+            # flash_t234_qspi_sd_rootfs_ab.xml (not flash_t234_qspi_sd.xml).
+            # Use ${PARTITION_LAYOUT_TEMPLATE} to follow the same variable that
+            # the base recipe and meta-mender-tegra use.
+            #
+            # Add wendy_config (id=17, 64 MB FAT32) AFTER APP_b (id=2) in the
+            # sdcard device block, immediately before secondary_gpt.
+            # APP_b (id=2) is the last data partition on the SD card.
+            # UDA (p15, mender data) is unaffected — no machine conf changes needed.
+            # id=17 is the next free GPT slot after reserved (slot 16).
+            # ------------------------------------------------------------------
+            local layout_file="${PARTITION_LAYOUT_TEMPLATE}"
+            local layout_path="${D}${datadir}/l4t-storage-layout/${layout_file}"
+
+            if [ ! -f "${layout_path}" ]; then
+                bbwarn "Layout file ${layout_file} not found at ${layout_path}, skipping WendyOS SD modifications"
+                return
+            fi
+
+            bbnote "wendyos: Modifying ${layout_file} for SD (wendy_config)..."
+
+            cp "${layout_path}" "${WORKDIR}/${layout_file}.tmp1"
+
+            # Add wendy_config AFTER APP_b (id=2), before secondary_gpt.
+            # The range APP_b-opening → first </partition> captures the APP_b
+            # block exactly; a\ appends the new partition immediately after it.
+            sed -i '/<partition name="APP_b" id="2"/,/<\/partition>/{
+/<\/partition>/a\
+        <partition name="wendy_config" id="17" type="data">\
+            <allocation_policy> sequential </allocation_policy>\
+            <filesystem_type> basic </filesystem_type>\
+            <size> 67108864 </size>\
+            <file_system_attribute> 0 </file_system_attribute>\
+            <allocation_attribute> 0x8 </allocation_attribute>\
+            <partition_type_guid> EBD0A0A2-B9E5-4433-87C0-68B6B72699C7 </partition_type_guid>\
+            <percent_reserved> 0 </percent_reserved>\
+            <align_boundary> 16384 </align_boundary>\
+            <filename> wendy-config.fat32.img </filename>\
+            <description> WendyOS first-boot config partition (FAT32, 64 MB). </description>\
+        </partition>
+}' \
+                "${WORKDIR}/${layout_file}.tmp1"
+
+            install -m 0644 "${WORKDIR}/${layout_file}.tmp1" "${layout_path}"
+            bbnote "WendyOS: Successfully added wendy_config to ${layout_file}"
+            ;;
+
+        *)
+            return
+            ;;
+    esac
 }
diff --git a/meta-tegra-extensions/recipes-bsp/wendy-config-partition/wendy-config-partition_1.0.bb b/meta-tegra-extensions/recipes-bsp/wendy-config-partition/wendy-config-partition_1.0.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 DEPENDS = "dosfstools-native"
 
-COMPATIBLE_MACHINE = "(jetson-orin-nano-devkit-nvme-wendyos|jetson-agx-orin-devkit-nvme-wendyos)"
+COMPATIBLE_MACHINE = "(jetson-orin-nano-devkit-nvme-wendyos|jetson-agx-orin-devkit-nvme-wendyos|jetson-orin-nano-devkit-wendyos)"
 
 inherit deploy nopackages
 
diff --git a/recipes-core/images/wendyos-image.bbappend b/recipes-core/images/wendyos-image.bbappend
@@ -6,32 +6,29 @@ EXTRA_IMAGEDEPENDS:append:tegra = " wendy-config-partition"
 
 tegraflash_custom_post:append() {
     if [ -f "external-flash.xml.in" ]; then
-        # Get the actual DTB filename
+        # NVMe: replace placeholders in the external partition layout XML
         DTB_NAME="$(basename ${KERNEL_DEVICETREE})"
-
-        # Replace placeholders with actual filenames
         sed -i \
             -e "s,DTB_FILE,${DTB_NAME}," \
             -e "s,DATAFILE,${IMAGE_LINK_NAME}.dataimg," \
             -e "s,APPFILE_b,${IMAGE_BASENAME}.ext4," \
             -e "s,APPFILE,${IMAGE_BASENAME}.ext4," \
             external-flash.xml.in
-
         bbnote "Replaced placeholders in external-flash.xml.in"
         bbnote "  DTB_FILE -> ${DTB_NAME}"
         bbnote "  DATAFILE -> ${IMAGE_LINK_NAME}.dataimg"
         bbnote "  APPFILE -> ${IMAGE_BASENAME}.ext4"
     else
-        bberror "external-flash.xml.in not found in tegraflash_custom_post"
-        bberror "Current directory: $(pwd)"
-        bberror "Files present: $(ls -la)"
+        # SD card: partition layout lives in flash.xml.in (the template XML);
+        # placeholder replacement for that file is handled by the base bbclass.
+        bbnote "No external-flash.xml.in (SD card machine — wendy_config is in template XML)"
     fi
 
     # Copy wendy-config FAT32 image into the tegraflash package directory so
-    # tegraparser_v2 can find it when processing external-flash.xml.in.
+    # tegraparser_v2 can find it when processing the partition layout XML.
     # create_tegraflash_pkg never auto-includes files from DEPLOY_DIR_IMAGE
     # just because they are referenced in a partition layout XML — each file
-    # must be copied explicitly.
+    # must be copied explicitly.  Required for both NVMe and SD card builds.
     if [ -f "${DEPLOY_DIR_IMAGE}/wendy-config.fat32.img" ]; then
         cp "${DEPLOY_DIR_IMAGE}/wendy-config.fat32.img" ./wendy-config.fat32.img
         bbnote "Copied wendy-config.fat32.img into tegraflash package"
