conf/machine: update TEGRA_BUPGEN_SPECS for all machines

Now that we have COMPATIBLE_SPEC support in the runtime bootloader update tools, we can reduce the set of specs we need to account for in the BUP payloads we build. The specs are more closely aligned with those in the stock L4T BUP generation script. Signed-off-by: Matt Madison <matt@madison.systems>
OE4T · Jan 12, 2023 · 08ac783 · 08ac783
1 parent 37a2bba
commit 08ac783
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 15 deletions.
diff --git a/conf/machine/include/tegra210.inc b/conf/machine/include/tegra210.inc
@@ -43,8 +43,6 @@ TEGRA_FAB ?= "100"
 TEGRA_BOARDSKU ?= ""
 TEGRA_BOARDREV ?= ""
 TEGRA_CHIPREV ?= "0"
-# Extracted from l4t_generate_soc_bup.sh for BOARDID=2180 and board=jetson-tx1-devkit
-TEGRA_BUPGEN_SPECS ?= "fab=100 fab=410"
 
 PARTITION_LAYOUT_EXTERNAL ?= "external_layout.xml"
 BOOT_PARTITIONS_ON_EMMC = "1"
diff --git a/conf/machine/jetson-agx-xavier-devkit.conf b/conf/machine/jetson-agx-xavier-devkit.conf
@@ -5,9 +5,8 @@
 require conf/machine/include/tegra194.inc
 
 # Extracted from l4t_generate_soc_bup.sh for BOARDID=2888 and board=jetson-agx-xavier-devkit
-TEGRA_BUPGEN_SPECS ?= "fab=400;boardsku=0001;boardrev=H.0 \
-                       fab=400;boardsku=0001;boardrev=J.0 \
-                       fab=400;boardsku=0001;boardrev=L.0 \
+TEGRA_BUPGEN_SPECS ?= "fab=400;boardsku=0001;boardrev=D.0 \
+                       fab=400;boardsku=0001;boardrev=E.0 \
                        fab=400;boardsku=0004;boardrev= \
 		       fab=402;boardsku=0005;boardrev="
 

diff --git a/conf/machine/jetson-nano-2gb-devkit.conf b/conf/machine/jetson-nano-2gb-devkit.conf
@@ -10,7 +10,7 @@ NVPMODEL ?= "nvpmodel_t210_jetson-nano"
 TEGRA_BOARDID ?= "3448"
 TEGRA_FAB ?= "400"
 TEGRA_BOARDSKU ?= "0003"
-TEGRA_BUPGEN_SPECS ?= "fab=400"
+TEGRA_BUPGEN_SPECS ?= "fab=300;boardsku=0003"
 
 require conf/machine/include/tegra210.inc
 

diff --git a/conf/machine/jetson-nano-devkit-emmc.conf b/conf/machine/jetson-nano-devkit-emmc.conf
@@ -11,7 +11,8 @@ TEGRA_BOARDID ?= "3448"
 TEGRA_FAB ?= "400"
 TEGRA_BOARDSKU ?= "0002"
 # Extracted from l4t_generate_soc_bup.sh for BOARDID=3448 and board=jetson-nano-devkit-emmc
-TEGRA_BUPGEN_SPECS ?= "fab=200 fab=300 fab=400 fab=401"
+TEGRA_BUPGEN_SPECS ?= "fab=200;boardsku=0002 \
+		       fab=300;boardsku=0002"
 
 require conf/machine/include/tegra210.inc
 

diff --git a/conf/machine/jetson-nano-devkit.conf b/conf/machine/jetson-nano-devkit.conf
@@ -11,7 +11,10 @@ TEGRA_BOARDID ?= "3448"
 TEGRA_FAB ?= "200"
 TEGRA_BOARDSKU ?= "0000"
 # Extracted from l4t_generate_soc_bup.sh for BOARDID=3448 and board=jetson-nano-devkit
-TEGRA_BUPGEN_SPECS ?= "fab=100 fab=200 fab=300 fab=400 fab=401 fab=402"
+TEGRA_BUPGEN_SPECS ?= "fab=000;boardsku=0000 \
+		       fab=100;boardsku=0000 \
+		       fab=200;boardsku=0000 \
+		       fab=300;boardsku=0000"
 
 require conf/machine/include/tegra210.inc
 

diff --git a/conf/machine/jetson-tx1-devkit.conf b/conf/machine/jetson-tx1-devkit.conf
@@ -4,6 +4,9 @@
 
 KERNEL_ARGS ?= "console=ttyS0,115200 console=tty0 fbcon=map:0 net.ifnames=0 sdhci_tegra.en_boot_part_access=1"
 
+# Extracted from l4t_generate_soc_bup.sh for BOARDID=2180 and board=jetson-tx1-devkit
+TEGRA_BUPGEN_SPECS ?= "fab=100"
+
 require conf/machine/include/tegra210.inc
 
 MACHINE_EXTRA_RRECOMMENDS += "tegra-firmware-brcm kernel-module-bcmdhd kernel-module-ov5693"

diff --git a/conf/machine/jetson-tx2-devkit.conf b/conf/machine/jetson-tx2-devkit.conf
@@ -28,4 +28,4 @@ TEGRA_BOARDSKU ?= ""
 TEGRA_BOARDREV ?= ""
 TEGRA_CHIPREV ?= "0"
 # Extracted from l4t_generate_soc_bup.sh for BOARDID=3310 and board=jetson-tx2-devkit
-TEGRA_BUPGEN_SPECS ?= "fab=B00 fab=B02 fab=C04 fab=D00 fab=D01 fab=D02"
+TEGRA_BUPGEN_SPECS ?= "fab=B00 fab=B01"
diff --git a/conf/machine/jetson-xavier-nx-devkit-emmc.conf b/conf/machine/jetson-xavier-nx-devkit-emmc.conf
@@ -5,10 +5,7 @@
 
 TEGRA_BOARDSKU ?= "0001"
 TEGRA_BUPGEN_SPECS ?= "fab=100;boardsku=0001;boardrev= \
-		       fab=200;boardsku=0001;boardrev= \
-		       fab=300;boardsku=0001;boardrev= \
-		       fab=301;boardsku=0001;boardrev= \
-		       fab=301;boardsku=0003;boardrev="
+		       fab=301;boardsku=0001;boardrev="
 IMAGE_ROOTFS_ALIGNMENT ?= "4"
 
 require conf/machine/include/xavier-nx.inc

diff --git a/conf/machine/jetson-xavier-nx-devkit.conf b/conf/machine/jetson-xavier-nx-devkit.conf
@@ -5,8 +5,6 @@
 
 TEGRA_BOARDSKU ?= "0000"
 TEGRA_BUPGEN_SPECS ?= "fab=100;boardsku=0000;boardrev= \
-		       fab=200;boardsku=0000;boardrev= \
-		       fab=300;boardsku=0000;boardrev= \
 		       fab=301;boardsku=0000;boardrev="
 IMAGE_ROOTFS_ALIGNMENT ?= "1024"