Merge pull request #394 from TheYoctoJester/mwest90-working-jetson-orin

kas/jetson-agx-orin-devkit.yml

@@ -5,3 +5,11 @@ header:
   - kas/include/tegra-jetpack5.yml
 
 machine: jetson-agx-orin-devkit
+
+repos:
+  meta-tegra:
+    refspec: eb2bcfbfca44d100205c2d865a1ab5add1c4f264
+
+local_conf_header:
+  AB-upgrades: |
+    USE_REDUNDANT_FLASH_LAYOUT_DEFAULT = "1"

kas/jetson-agx-xavier-devkit.yml

@@ -2,6 +2,14 @@ header:
   version: 11
   includes:
   - kas/include/mender-full.yml
-  - kas/include/tegra-jetpack4.yml
+  - kas/include/tegra-jetpack5.yml
 
 machine: jetson-agx-xavier-devkit
+
+repos:
+  meta-tegra:
+    refspec: eb2bcfbfca44d100205c2d865a1ab5add1c4f264
+
+local_conf_header:
+  AB-upgrades: |
+    USE_REDUNDANT_FLASH_LAYOUT_DEFAULT = "1"

kas/jetson-orin-nano-devkit.yml

@@ -0,0 +1,15 @@
+header:
+  version: 11
+  includes:
+    - kas/include/mender-full.yml
+    - kas/include/tegra-jetpack5.yml
+
+machine: jetson-orin-nano-devkit
+repos:
+  meta-tegra:
+    refspec: b7a0792b996b47305c7ec1713621b0e07d314700
+
+local_conf_header:
+  AB-upgrades: |
+    UBOOT_EXTLINUX = "1"
+    USE_REDUNDANT_FLASH_LAYOUT_DEFAULT = "1"

meta-mender-tegra/meta-mender-tegra-jetpack5/README.md

@@ -5,10 +5,8 @@ Mender integration layer for NVIDIA Tegra hardware.
 The supported and tested boards are:
 
 - AGX Orin
-
-Visit the individual board links above for more information on status of the
-integration and more detailed instructions on how to build and use images
-together with Mender for the mentioned boards.
+- AGX Xavier
+- Orin Nano
 
 
 ## Dependencies
@@ -40,6 +38,8 @@ for the most up to date instructions on starting out with mender and tegra.
 The following configuration files for building using the `kas` tool are provided:
 
 - [jetson-agx-orin-devkit.yml](../../kas/jetson-agx-orin-devkit.yml)
+- [jetson-agx-xavier-devkit.yml](../../kas/jetson-agx-xavier-devkit.yml)
+- [jetson-orin-nano-devkit.yml](../../kas/jetson-orin-nano-devkit.yml)
 
 ## Acknowlegements
 

meta-mender-tegra/meta-mender-tegra-jetpack5/classes/tegra-mender-setup.bbclass

@@ -35,7 +35,10 @@ PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-tegra"
 PREFERRED_PROVIDER_libubootenv:tegra = "${@'libubootenv-fake' if d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') else 'libubootenv'}"
 PREFERRED_RPROVIDER_u-boot-fw-utils = "u-boot-fw-utils-tegra"
 PREFERRED_RPROVIDER_libubootenv-bin:tegra = "${@'libubootenv-fake' if d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') else 'libubootenv-bin'}"
+PREFERRED_PROVIDER_virtual/bootloader:tegra194 = "edk2-firmware-tegra"
 PREFERRED_PROVIDER_libubootenv:tegra234 = "libubootenv-fake"
+PREFERRED_PROVIDER_libubootenv:tegra194 = "libubootenv-fake"
+MENDER_FEATURES_DISABLE:append:tegra194 = " mender-uboot"
 
 # Note: this isn't really a boot file, just put it here to keep the mender build from
 # complaining about empty IMAGE_BOOT_FILES.  We won't use the full image anyway, just the mender file
@@ -46,18 +49,18 @@ IMAGE_BOOT_FILES = "u-boot-dtb.bin"
 # boot into an emergency shell and examine the /dev/mmcblk* devices,
 # or use the uboot console to look at mtdparts
 MENDER_DATA_PART_NUMBER_DEFAULT:tegra186 = "34"
-MENDER_DATA_PART_NUMBER_DEFAULT:tegra194 = "43"
+MENDER_DATA_PART_NUMBER_DEFAULT:tegra194 = "42"
+MENDER_DATA_PART_NUMBER_DEFAULT:xavier-nx = "23"
 MENDER_DATA_PART_NUMBER_DEFAULT:tegra210 = "${@'16' if (d.getVar('TEGRA_SPIFLASH_BOOT') or '') == '1' else '23'}"
 MENDER_DATA_PART_NUMBER_DEFAULT:jetson-nano-emmc = "19"
-MENDER_DATA_PART_NUMBER_DEFAULT:xavier-nx = "12"
-MENDER_DATA_PART_NUMBER_DEFAULT:tegra234 = "16"
+MENDER_DATA_PART_NUMBER_DEFAULT:tegra234 = "15"
 MENDER_ROOTFS_PART_A_NUMBER_DEFAULT = "1"
 MENDER_ROOTFS_PART_B_NUMBER_DEFAULT:tegra186 = "33"
-MENDER_ROOTFS_PART_B_NUMBER_DEFAULT:tegra194 = "42"
+MENDER_ROOTFS_PART_B_NUMBER_DEFAULT:tegra194 = "2"
 MENDER_ROOTFS_PART_B_NUMBER_DEFAULT:tegra210 = "${@'15' if (d.getVar('TEGRA_SPIFLASH_BOOT') or '') == '1' else '22'}"
 MENDER_ROOTFS_PART_B_NUMBER_DEFAULT:jetson-nano-emmc = "18"
-MENDER_ROOTFS_PART_B_NUMBER_DEFAULT:xavier-nx = "11"
 MENDER_ROOTFS_PART_B_NUMBER_DEFAULT:tegra234 = "2"
+MENDER_STORAGE_DEVICE_DEFAULT:jetson-orin-nano-devkit = "/dev/mmcblk1"
 
 # Machine name and flash layout changed for SDcard Nanos in L4T R32.5.x
 MENDER_DATA_PART_NUMBER_DEFAULT:jetson-nano-devkit = "3"
@@ -144,6 +147,7 @@ do_image_mender[depends] += "${_MENDER_IMAGE_DEPS_EXTRA}"
 # be included by default on cboot platforms.
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS:remove:tegra194 = "kernel-image kernel-devicetree"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS:remove:tegra186 = "${@'kernel-image kernel-devicetree' if (d.getVar('PREFERRED_PROVIDER_virtual/bootloader') or '').startswith('cboot') else ''}"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS:remove:tegra234 = "kernel-image kernel-devicetree"
 
 # Compatibility settings for handling the machine name changes
 # made in L4T R32.5.x, to allow for upgrades.  This does not