conf/machine: Refactor AGX Orin configs, update TEGRA_BUPGEN_SPECS

Starting with R35.5.0, the BUP generator needs the chip SKU passed
to it for generating bootloader updates for Orin modules.  Update all
of the Orin configs to reflect that.

Also refactor the AGX Orin configs so we have a separate machine
definition for each of the board SKUs, similar to what's there for
the Orin NX/Nano configs.

Signed-off-by: Matt Madison <matt@madison.systems>

conf/machine/include/agx-orin.inc

@@ -0,0 +1,41 @@
+# Common settings for AGX Orin modules
+
+require conf/machine/include/tegra234.inc
+
+KERNEL_ARGS ?= "mminit_loglevel=4 console=tty0 console=ttyTCU0,115200 firmware_class.path=/etc/firmware fbcon=map:0 net.ifnames=0 nospectre_bhb"
+
+EMMC_SIZE ?= "31276924928"
+EMMC_DEVSECT_SIZE ?= "512"
+BOOTPART_SIZE ?= "8388608"
+BOOTPART_LIMIT ?= "10485760"
+ROOTFSPART_SIZE_DEFAULT ?= "30064771072"
+ODMDATA ?= "gbe-uphy-config-22,hsstp-lane-map-3,nvhs-uphy-config-0,hsio-uphy-config-0,gbe0-enable-10g"
+EMMC_BCT ?= "tegra234-p3701-0000-sdram-l4t.dts"
+NVIDIA_BOARD ?= "t186ref"
+PARTITION_LAYOUT_TEMPLATE_DEFAULT ?= "flash_t234_qspi_sdmmc.xml"
+TEGRA_AUDIO_DEVICE ?= "tegra-hda-jetson-agx"
+
+OTABOOTDEV ?= "/dev/mtdblock0"
+OTAGPTDEV ?= "/dev/mtdblock0"
+
+TEGRA_PLUGIN_MANAGER_OVERLAYS ?= "tegra234-p3737-audio-codec-rt5658-40pin.dtbo tegra234-p3737-overlay.dtbo tegra234-p3701-overlay.dtbo tegra234-p3737-camera-dual-imx274-overlay.dtbo tegra234-p3737-camera-e3331-overlay.dtbo tegra234-p3737-camera-e3333-overlay.dtbo tegra234-p3737-camera-imx185-overlay.dtbo tegra234-p3737-camera-imx390-overlay.dtbo"
+
+TEGRA_FLASHVAR_BPFDTB_FILE ?= "tegra234-bpmp-3701-0000-3737-0000.dtb"
+TEGRA_FLASHVAR_BPF_FILE ?= "bpmp_t234-TE990M-A1_prod.bin"
+TEGRA_FLASHVAR_BR_CMD_CONFIG ?= "tegra234-mb1-bct-reset-p3701-0000.dts"
+TEGRA_FLASHVAR_DEVICEPROD_CONFIG ?= "tegra234-mb1-bct-cprod-p3701-0000.dts"
+TEGRA_FLASHVAR_DEVICE_CONFIG ?= "tegra234-mb1-bct-device-p3701-0000.dts"
+TEGRA_FLASHVAR_DEV_PARAMS ?= "tegra234-br-bct-p3701-0000.dts"
+TEGRA_FLASHVAR_DEV_PARAMS_B ?= "tegra234-br-bct_b-p3701-0000.dts"
+TEGRA_FLASHVAR_EMC_FUSE_DEV_PARAMS ?= "tegra234-br-bct-diag-boot.dts"
+TEGRA_FLASHVAR_GPIOINT_CONFIG ?= "tegra234-mb1-bct-gpioint-p3701-0000.dts"
+TEGRA_FLASHVAR_MB2BCT_CFG ?= "tegra234-mb2-bct-misc-p3701-0000.dts"
+TEGRA_FLASHVAR_MINRATCHET_CONFIG ?= "--minratchet_config tegra234-mb1-bct-ratchet-p3701-0000.dts"
+TEGRA_FLASHVAR_MISC_CONFIG ?= "tegra234-mb1-bct-misc-p3701-0000.dts"
+TEGRA_FLASHVAR_PINMUX_CONFIG ?= "tegra234-mb1-bct-pinmux-p3701-0000-a04.dtsi"
+TEGRA_FLASHVAR_PMC_CONFIG ?= "tegra234-mb1-bct-padvoltage-p3701-0000-a04.dtsi"
+TEGRA_FLASHVAR_PMIC_CONFIG ?= "tegra234-mb1-bct-pmic-p3701-@PMICBOARDSKU@.dts"
+TEGRA_FLASHVAR_PROD_CONFIG ?= "tegra234-mb1-bct-prod-p3701-0000.dts"
+TEGRA_FLASHVAR_SCR_CONFIG ?= "tegra234-mb2-bct-scr-p3701-0000.dts"
+TEGRA_FLASHVAR_UPHY_CONFIG ?= "--uphy tegra234-mb1-bct-uphylane-si.dtsi"
+TEGRA_FLASHVAR_WB0SDRAM_BCT ?= "tegra234-p3701-0000-wb0sdram-l4t.dts"

conf/machine/include/orin-nano.inc

@@ -2,16 +2,15 @@ TEGRA_BOARDID ?= "3767"
 TEGRA_FAB ?= "RC1"
 TEGRA_BOARDSKU ?= "0005"
 TEGRA_BOARDREV ?= "B.4"
-TEGRA_CHIPREV ?= "1"
 NVPMODEL ?= "nvpmodel_p3767_0003"
 NVFANCONTROL ?= "nvfancontrol_p3767_0000"
 
 MACHINEOVERRIDES =. "orin-nano:"
 require conf/machine/include/tegra234.inc
 
-TEGRA_BUPGEN_SPECS ?= "fab=000;boardsku=0003;boardrev=;bup_type=bl \
+TEGRA_BUPGEN_SPECS ?= "fab=000;boardsku=0003;boardrev=;chipsku=00:00:00:D5;bup_type=bl \
                        fab=000;boardsku=0003;boardrev=;bup_type=kernel \
-                       fab=000;boardsku=0005;boardrev=;bup_type=bl \
+                       fab=000;boardsku=0005;boardrev=;chipsku=00:00:00:D5;bup_type=bl \
                        fab=000;boardsku=0005;boardrev=;bup_type=kernel"
 
 KERNEL_DEVICETREE ?= "tegra234-p3767-0003-p3768-0000-a0.dtb"

conf/machine/jetson-agx-orin-devkit-industrial.conf

@@ -1,12 +1,13 @@
 #@TYPE: Machine
-#@NAME: Nvidia Jetson Orin Industrial 64GB (P3701-0008)
+#@NAME: Nvidia Jetson AGX Orin Industrial 64GB (P3701-0008)
-#@DESCRIPTION: Nvidia Jetson Orin Industrial 64GB module in P3737 carrier
+#@DESCRIPTION: Nvidia Jetson AGX Orin Industrial 64GB module in P3737 carrier
 
 require conf/machine/include/tegra234.inc
 require conf/machine/include/devkit-wifi.inc
 
 # Extracted from jetson_board_spec.cfg for BOARDID=3701 and board=jetson-agx-orin-devkit-industrial
-TEGRA_BUPGEN_SPECS ?= "fab=300;boardsku=0008;boardrev="
+TEGRA_BUPGEN_SPECS ?= "fab=300;boardsku=0008;boardrev=;chipsku=00:00:00:90;bup_type=bl \
+                       fab=300;boardsku=0008;boardrev=;bup_type=kernel"
 KERNEL_DEVICETREE ?= "tegra234-p3701-0008-p3737-0000.dtb"
 KERNEL_ARGS ?= "mminit_loglevel=4 console=tty0 console=ttyTCU0,115200 firmware_class.path=/etc/firmware fbcon=map:0 net.ifnames=0 nospectre_bhb"
 

conf/machine/jetson-agx-orin-devkit.conf

@@ -1,49 +1,10 @@
 #@TYPE: Machine
-#@NAME: Nvidia Jetson Orin
+#@NAME: Nvidia Jetson AGX Orin dev kit
-#@DESCRIPTION: Nvidia Jetson Orin dev board
+#@DESCRIPTION: Nvidia Jetson AGX Orin dev kit (P3701-0000 module in P3737-0000 carrier)
 
-require conf/machine/include/tegra234.inc
+TEGRA_BUPGEN_SPECS ?= "fab=300;boardsku=0000;boardrev=;chipsku=00:00:00:D0;bup_type=bl \
+                       fab=300;boardsku=0000;boardrev=;bup_type=kernel"
+KERNEL_DEVICETREE ?= "tegra234-p3701-0000-p3737-0000.dtb"
+
+require conf/machine/include/agx-orin.inc
 require conf/machine/include/devkit-wifi.inc
-
-# Extracted from jetson_board_spec.cfg for BOARDID=3701 and board=jetson-agx-orin-devkit
-TEGRA_BUPGEN_SPECS ?= "fab=300;boardsku=0000;boardrev= \
-                       fab=300;boardsku=0004;boardrev= \
-                       fab=000;boardsku=0005;boardrev="
-KERNEL_DEVICETREE ?= "tegra234-p3701-0000-p3737-0000.dtb tegra234-p3701-0004-p3737-0000.dtb"
-KERNEL_ARGS ?= "mminit_loglevel=4 console=tty0 console=ttyTCU0,115200 firmware_class.path=/etc/firmware fbcon=map:0 net.ifnames=0 nospectre_bhb"
-
-EMMC_SIZE ?= "31276924928"
-EMMC_DEVSECT_SIZE ?= "512"
-BOOTPART_SIZE ?= "8388608"
-BOOTPART_LIMIT ?= "10485760"
-ROOTFSPART_SIZE_DEFAULT ?= "30064771072"
-ODMDATA ?= "gbe-uphy-config-22,hsstp-lane-map-3,nvhs-uphy-config-0,hsio-uphy-config-0,gbe0-enable-10g"
-EMMC_BCT ?= "tegra234-p3701-0000-sdram-l4t.dts"
-NVIDIA_BOARD ?= "t186ref"
-PARTITION_LAYOUT_TEMPLATE_DEFAULT ?= "flash_t234_qspi_sdmmc.xml"
-TEGRA_AUDIO_DEVICE ?= "tegra-hda-jetson-agx"
-
-OTABOOTDEV ?= "/dev/mtdblock0"
-OTAGPTDEV ?= "/dev/mtdblock0"
-
-TEGRA_PLUGIN_MANAGER_OVERLAYS ?= "tegra234-p3737-audio-codec-rt5658-40pin.dtbo tegra234-p3737-overlay.dtbo tegra234-p3701-overlay.dtbo tegra234-p3737-camera-dual-imx274-overlay.dtbo tegra234-p3737-camera-e3331-overlay.dtbo tegra234-p3737-camera-e3333-overlay.dtbo tegra234-p3737-camera-imx185-overlay.dtbo tegra234-p3737-camera-imx390-overlay.dtbo"
-
-TEGRA_FLASHVAR_BPFDTB_FILE = "tegra234-bpmp-3701-0000-3737-0000.dtb"
-TEGRA_FLASHVAR_BPF_FILE = "bpmp_t234-TE990M-A1_prod.bin"
-TEGRA_FLASHVAR_BR_CMD_CONFIG = "tegra234-mb1-bct-reset-p3701-0000.dts"
-TEGRA_FLASHVAR_DEVICEPROD_CONFIG = "tegra234-mb1-bct-cprod-p3701-0000.dts"
-TEGRA_FLASHVAR_DEVICE_CONFIG = "tegra234-mb1-bct-device-p3701-0000.dts"
-TEGRA_FLASHVAR_DEV_PARAMS = "tegra234-br-bct-p3701-0000.dts"
-TEGRA_FLASHVAR_DEV_PARAMS_B = "tegra234-br-bct_b-p3701-0000.dts"
-TEGRA_FLASHVAR_EMC_FUSE_DEV_PARAMS = "tegra234-br-bct-diag-boot.dts"
-TEGRA_FLASHVAR_GPIOINT_CONFIG = "tegra234-mb1-bct-gpioint-p3701-0000.dts"
-TEGRA_FLASHVAR_MB2BCT_CFG = "tegra234-mb2-bct-misc-p3701-0000.dts"
-TEGRA_FLASHVAR_MINRATCHET_CONFIG = "--minratchet_config tegra234-mb1-bct-ratchet-p3701-0000.dts"
-TEGRA_FLASHVAR_MISC_CONFIG = "tegra234-mb1-bct-misc-p3701-0000.dts"
-TEGRA_FLASHVAR_PINMUX_CONFIG = "tegra234-mb1-bct-pinmux-p3701-0000-a04.dtsi"
-TEGRA_FLASHVAR_PMC_CONFIG = "tegra234-mb1-bct-padvoltage-p3701-0000-a04.dtsi"
-TEGRA_FLASHVAR_PMIC_CONFIG = "tegra234-mb1-bct-pmic-p3701-@PMICBOARDSKU@.dts"
-TEGRA_FLASHVAR_PROD_CONFIG = "tegra234-mb1-bct-prod-p3701-0000.dts"
-TEGRA_FLASHVAR_SCR_CONFIG = "tegra234-mb2-bct-scr-p3701-0000.dts"
-TEGRA_FLASHVAR_UPHY_CONFIG = "--uphy tegra234-mb1-bct-uphylane-si.dtsi"
-TEGRA_FLASHVAR_WB0SDRAM_BCT = "tegra234-p3701-0000-wb0sdram-l4t.dts"

conf/machine/p3509-a02-p3767-0000.conf

@@ -19,7 +19,7 @@ TEGRAFLASH_NO_INTERNAL_STORAGE = "1"
 require conf/machine/include/tegra234.inc
 require conf/machine/include/devkit-wifi.inc
 
-TEGRA_BUPGEN_SPECS ?= "fab=000;boardsku=0000;boardrev=;bup_type=bl \
+TEGRA_BUPGEN_SPECS ?= "fab=000;boardsku=0000;boardrev=;chipsku=00:00:00:D3;bup_type=bl \
                        fab=000;boardsku=0000;boardrev=;bup_type=kernel"
 
 KERNEL_DEVICETREE ?= "tegra234-p3767-0000-p3509-a02.dtb"

conf/machine/p3737-0000-p3701-0004.conf

@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: Nvidia Jetson AGX Orin 32GB
+#@DESCRIPTION: Nvidia Jetson Orin dev kit (P3701-0004 module in P3737-0000 carrier)
+
+TEGRA_BUPGEN_SPECS ?= "fab=300;boardsku=0004;boardrev=;chipsku=00:00:00:D0;bup_type=bl \
+                       fab=300;boardsku=0004;boardrev=;bup_type=kernel"
+KERNEL_DEVICETREE ?= "tegra234-p3701-0004-p3737-0000.dtb"
+TEGRA_FLASHVAR_PMIC_CONFIG ?= "tegra234-mb1-bct-pmic-p3701-0005.dts"
+
+require conf/machine/include/agx-orin.inc
+require conf/machine/include/devkit-wifi.inc

conf/machine/p3737-0000-p3701-0005.conf

@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: Nvidia Jetson AGX Orin 64GB
+#@DESCRIPTION: Nvidia Jetson Orin dev kit (P3701-0005 module in P3737-0000 carrier)
+
+TEGRA_BUPGEN_SPECS ?= "fab=300;boardsku=0005;boardrev=;chipsku=00:00:00:D0;bup_type=bl \
+                       fab=300;boardsku=0005;boardrev=;bup_type=kernel"
+KERNEL_DEVICETREE ?= "tegra234-p3701-0005-p3737-0000.dtb"
+TEGRA_FLASHVAR_PMIC_CONFIG ?= "tegra234-mb1-bct-pmic-p3701-0005.dts"
+
+require conf/machine/include/agx-orin.inc
+require conf/machine/include/devkit-wifi.inc

conf/machine/p3768-0000-p3767-0000.conf

@@ -19,7 +19,7 @@ TEGRAFLASH_NO_INTERNAL_STORAGE = "1"
 require conf/machine/include/tegra234.inc
 require conf/machine/include/devkit-wifi.inc
 
-TEGRA_BUPGEN_SPECS ?= "fab=000;boardsku=0000;boardrev=;bup_type=bl \
+TEGRA_BUPGEN_SPECS ?= "fab=000;boardsku=0000;boardrev=;chipsku=00:00:00:D3;bup_type=bl \
                        fab=000;boardsku=0000;boardrev=;bup_type=kernel"
 
 KERNEL_DEVICETREE ?= "tegra234-p3767-0000-p3768-0000-a0.dtb"

conf/machine/p3768-0000-p3767-0001.conf

@@ -4,7 +4,7 @@
 
 NVPMODEL ?= "nvpmodel_p3767_0001"
 
-TEGRA_BUPGEN_SPECS ?= "fab=000;boardsku=0001;boardrev=;bup_type=bl \
+TEGRA_BUPGEN_SPECS ?= "fab=000;boardsku=0001;boardrev=;chipsku=00:00:00:D4;bup_type=bl \
                        fab=000;boardsku=0001;boardrev=;bup_type=kernel"
 
 KERNEL_DEVICETREE ?= "tegra234-p3767-0001-p3768-0000-a0.dtb"

conf/machine/p3768-0000-p3767-0004.conf

@@ -16,7 +16,7 @@ NVPMODEL ?= "nvpmodel_p3767_0004"
 TEGRA_FLASHVAR_BPFDTB_FILE ?= "tegra234-bpmp-3767-0004-3509-a02.dtb"
 TEGRA_FLASHVAR_RAMCODE ?= "4"
 
-TEGRA_BUPGEN_SPECS ?= "fab=000;boardsku=0004;boardrev=;bup_type=bl \
+TEGRA_BUPGEN_SPECS ?= "fab=000;boardsku=0004;boardrev=;chipsku=00:00:00:D6;bup_type=bl \
                        fab=000;boardsku=0004;boardrev=;bup_type=kernel"
 
 require conf/machine/include/orin-nano.inc