conf/machine: update partition layout settings for Orin Nano/NX modules

For all Orin Nano and Orin NX modules (P3767-xxxx), switch to using the QSPI-only layout for internal storage and the generic flash_l4t_external layout for the external drive. (The Orin Nano devkit, which has an SD card slot, continues with the qspi-sd layout for internal storage.) This aligns with how stock L4T supports these boards, requiring initrd flashing. Even though the tools and boot firmware appear to support direct flashing to NVME drives without having to boot a Linux kernel, doing so appears to cause some kind of memory corruption, sometimes leading to hangs during reboot after flashing. Signed-off-by: Matt Madison <[email protected]>
OE4T · Jul 16, 2023 · 5cb18c8 · 5cb18c8
1 parent 1e589d0
commit 5cb18c8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/conf/machine/jetson-orin-nano-devkit-nvme.conf b/conf/machine/jetson-orin-nano-devkit-nvme.conf
@@ -4,7 +4,8 @@
 
 MACHINEOVERRIDES =. "jetson-orin-nano-devkit:"
 TNSPEC_BOOTDEV_DEFAULT ?= "nvme0n1p1"
+PARTITION_LAYOUT_TEMPLATE ?= "flash_t234_qspi.xml"
+PARTITION_LAYOUT_EXTERNAL ?= "flash_l4t_external.xml"
 require conf/machine/include/orin-nano.inc
 require conf/machine/include/devkit-wifi.inc
 
-PARTITION_LAYOUT_TEMPLATE ?= "flash_t234_qspi_nvme.xml"
diff --git a/conf/machine/p3509-a02-p3767-0000.conf b/conf/machine/p3509-a02-p3767-0000.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: Nvidia Jetson Orin NX
-#@DESCRIPTION: Nvidia Jetson Orin NX module in P3509 carrier
+#@NAME: Nvidia Jetson Orin NX 16GB (P3767-0000)
+#@DESCRIPTION: Nvidia Jetson Orin NX 16GB module in P3509 carrier
 
 TEGRA_BOARDID ?= "3767"
 TEGRA_FAB ?= "ES1"
@@ -11,7 +11,8 @@ NVPMODEL ?= "nvpmodel_p3767_0000"
 NVFANCONTROL ?= "nvfancontrol_p3767_0000"
 
 TNSPEC_BOOTDEV ?= "nvme0n1p1"
-
+PARTITION_LAYOUT_TEMPLATE ?= "flash_t234_qspi.xml"
+PARTITION_LAYOUT_EXTERNAL ?= "flash_l4t_external.xml"
 TEGRAFLASH_NO_INTERNAL_STORAGE = "1"
 
 require conf/machine/include/tegra234.inc
@@ -40,7 +41,6 @@ ROOTFSPART_SIZE ?= "59055800320"
 ODMDATA ?= "gbe-uphy-config-8,hsstp-lane-map-3,hsio-uphy-config-0"
 EMMC_BCT ?= "tegra234-p3767-0000-sdram-l4t.dts"
 NVIDIA_BOARD ?= "t186ref"
-PARTITION_LAYOUT_TEMPLATE ?= "flash_t234_qspi_sd.xml"
 TEGRA_AUDIO_DEVICE ?= "tegra-hda-p3767-p3509"
 
 OTABOOTDEV ?= "/dev/mtdblock0"

diff --git a/conf/machine/p3768-0000-p3767-0000.conf b/conf/machine/p3768-0000-p3767-0000.conf
@@ -11,7 +11,8 @@ NVPMODEL ?= "nvpmodel_p3767_0000"
 NVFANCONTROL ?= "nvfancontrol_p3767_0000"
 
 TNSPEC_BOOTDEV ?= "nvme0n1p1"
-
+PARTITION_LAYOUT_TEMPLATE ?= "flash_t234_qspi.xml"
+PARTITION_LAYOUT_EXTERNAL ?= "flash_l4t_external.xml"
 TEGRAFLASH_NO_INTERNAL_STORAGE = "1"
 
 require conf/machine/include/tegra234.inc
@@ -40,7 +41,6 @@ ROOTFSPART_SIZE ?= "59055800320"
 ODMDATA ?= "gbe-uphy-config-8,hsstp-lane-map-3,hsio-uphy-config-0"
 EMMC_BCT ?= "tegra234-p3767-0000-sdram-l4t.dts"
 NVIDIA_BOARD ?= "t186ref"
-PARTITION_LAYOUT_TEMPLATE ?= "flash_t234_qspi_sd.xml"
 TEGRA_AUDIO_DEVICE ?= "tegra-hda-p3767-p3509"
 
 OTABOOTDEV ?= "/dev/mtdblock0"

diff --git a/conf/machine/p3768-0000-p3767-0004.conf b/conf/machine/p3768-0000-p3767-0004.conf
@@ -1,11 +1,12 @@
 #@TYPE: Machine
-#@NAME: Nvidia Jetson Orin Nano devkit
-#@DESCRIPTION: Nvidia Jetson Orin Nano devkit using NVMe drive for rootfs
+#@NAME: Nvidia Jetson Orin Nano 4GB (p3767-0004)
+#@DESCRIPTION: Nvidia Jetson Orin Nano 4GB module in p3768 carrier
 
 MACHINEOVERRIDES =. "jetson-orin-nano-4g-devkit:"
 TNSPEC_BOOTDEV_DEFAULT ?= "nvme0n1p1"
 
-PARTITION_LAYOUT_TEMPLATE ?= "flash_t234_qspi_nvme.xml"
+PARTITION_LAYOUT_TEMPLATE ?= "flash_t234_qspi.xml"
+PARTITION_LAYOUT_EXTERNAL ?= "flash_l4t_external.xml"
 
 TEGRA_BOARDSKU = "0004"
 KERNEL_DEVICETREE = "tegra234-p3767-0004-p3768-0000-a0.dtb"