conf/machine: updates for L4T R36.3.0

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

conf/machine/include/agx-orin.inc

@@ -2,7 +2,7 @@
 
 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"
+KERNEL_ARGS ?= "mminit_loglevel=4 console=tty0 console=ttyTCU0,115200 firmware_class.path=/etc/firmware fbcon=map:0 net.ifnames=0 nospectre_bhb video=efifb:off console=tty0"
 
 EMMC_SIZE ?= "31276924928"
 EMMC_DEVSECT_SIZE ?= "512"
@@ -11,7 +11,6 @@ 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"
 

conf/machine/include/orin-nano.inc

@@ -6,15 +6,14 @@ NVPMODEL ?= "nvpmodel_p3767_0003"
 NVFANCONTROL ?= "nvfancontrol_p3767_0000"
 
 MACHINEOVERRIDES =. "orin-nano:"
+TNSPEC_BOOTDEV_DEFAULT ?= "mmcblk0p1"
 require conf/machine/include/tegra234.inc
 
-TEGRA_BUPGEN_SPECS ?= "fab=000;boardsku=0003;boardrev=;chipsku=00:00:00:D5;bup_type=bl \
+TEGRA_BUPGEN_SPECS ?= "fab=000;boardsku=0005;boardrev=;chipsku=00:00:00:D5;bup_type=bl \
-                       fab=000;boardsku=0003;boardrev=;bup_type=kernel \
-                       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"
+KERNEL_DEVICETREE ?= "tegra234-p3768-0000+p3767-0005-nv.dtb"
-KERNEL_ARGS ?= "mminit_loglevel=4 console=ttyTCU0,115200 firmware_class.path=/etc/firmware fbcon=map:0 net.ifnames=0 nospectre_bhb"
+KERNEL_ARGS ?= "mminit_loglevel=4 console=ttyTCU0,115200 firmware_class.path=/etc/firmware fbcon=map:0 net.ifnames=0 nospectre_bhb video=efifb:off console=tty0"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-r8168 kernel-module-r8169 kernel-module-realtek"
 MACHINE_EXTRA_RDEPENDS += "linux-firmware-rtl8168"
 
@@ -22,14 +21,13 @@ EMMC_SIZE ?= ""
 BOOTPART_SIZE ?= "8388608"
 ROOTFSPART_SIZE_DEFAULT ?= "30064771072"
 ODMDATA ?= "gbe-uphy-config-8,hsstp-lane-map-3,hsio-uphy-config-0"
-EMMC_BCT ?= "tegra234-p3767-0000-sdram-l4t.dts"
+EMMC_BCT ?= "tegra234-p3767-0001-sdram-l4t.dts"
-NVIDIA_BOARD ?= "t186ref"
 TEGRA_AUDIO_DEVICE ?= "tegra-hda-p3767-p3509"
 
 OTABOOTDEV ?= "/dev/mtdblock0"
 OTAGPTDEV ?= "/dev/mtdblock0"
 
-TEGRA_PLUGIN_MANAGER_OVERLAYS ?= "tegra234-p3767-overlay.dtbo tegra234-p3768-overlay.dtbo"
+TEGRA_PLUGIN_MANAGER_OVERLAYS ?= "tegra234-carveouts.dtbo tegra-optee.dtbo tegra234-p3768-0000+p3767-0000-dynamic.dtbo"
 
 TEGRA_FLASHVAR_BPFDTB_FILE ?= "tegra234-bpmp-3767-0003-3509-a02.dtb"
 TEGRA_FLASHVAR_BPF_FILE ?= "bpmp_t234-TE950M-A1_prod.bin"

conf/machine/include/tegra-common.inc

@@ -16,9 +16,12 @@ UBOOT_EXTLINUX_KERNEL_IMAGE ?= "/boot/${KERNEL_IMAGETYPE}"
 UBOOT_EXTLINUX_KERNEL_ARGS ?= "${KERNEL_ARGS}"
 UBOOT_EXTLINUX_INITRD ?= "${@'/boot/initrd' if d.getVar('INITRAMFS_IMAGE') != '' and d.getVar('INITRAMFS_IMAGE_BUNDLE') != '1' else ''}"
 
+NVIDIA_BOARD ?= "generic"
+
 TEGRA_BOOTCONTROL_OVERLAYS ?= "L4TConfiguration.dtbo"
 TEGRA_BOOTCONTROL_OVERLAYS += "${@'L4TConfiguration-RootfsRedundancyLevelABEnable.dtbo' if bb.utils.to_boolean(d.getVar('USE_REDUNDANT_FLASH_LAYOUT')) else ''}"
 TEGRA_PLUGIN_MANAGER_OVERLAYS ??= ""
+TEGRA_DCE_OVERLAYS ??= ""
 # The following variable is deprecated; add new overlays
 # to one of the above instead.
 OVERLAY_DTB_FILE ?= ""
@@ -28,6 +31,7 @@ TNSPEC_BOOTDEV_DEFAULT ??= "mmcblk0p1"
 TNSPEC_BOOTDEV ??= "${TNSPEC_BOOTDEV_DEFAULT}"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-jammy-nvidia-tegra"
+PREFERRED_PROVIDER_virtual/dtb ?= "nvidia-kernel-oot"
 PREFERRED_PROVIDER_virtual/bootloader ?= "edk2-firmware-tegra"
 OPTEE_MM_PROVIDER = "${@'tegra-uefi-prebuilt' if d.getVar('PREFERRED_PROVIDER_virtual/bootloader') == 'tegra-uefi-prebuilt' else 'standalone-mm-optee-tegra'}"
 PREFERRED_PROVIDER_standalone-mm-optee-tegra ?= "${OPTEE_MM_PROVIDER}"
@@ -55,7 +59,7 @@ PREFERRED_RPROVIDER_optee-nvsamples ?= "${@'nvidia-l4t-optee-nvsamples' if oe.ty
 PREFERRED_RPROVIDER_optee-nvsamples-hwkey-agent ?= "${@'nvidia-l4t-optee-nvsamples-hwkey-agent' if oe.types.boolean(d.getVar('USE_PREBUILT_OPTEE')) else 'optee-nvsamples-hwkey-agent'}"
 PREFERRED_RPROVIDER_optee-nvsamples-luks-srv ?= "${@'nvidia-l4t-optee-nvsamples-luks-srv' if oe.types.boolean(d.getVar('USE_PREBUILT_OPTEE')) else 'optee-nvsamples-luks-srv'}"
 
-TEGRA_OPTEE_VERSION ?= "${@'' if oe.types.boolean(d.getVar('USE_PREBUILT_OPTEE')) else '3.21.0-l4t%'}"
+TEGRA_OPTEE_VERSION ?= "${@'' if oe.types.boolean(d.getVar('USE_PREBUILT_OPTEE')) else '3.22.0-l4t%'}"
 PREFERRED_VERSION_optee-os = "${TEGRA_OPTEE_VERSION}"
 PREFERRED_VERSION_optee-os-tadevkit = "${TEGRA_OPTEE_VERSION}"
 PREFERRED_VERSION_optee-client = "${TEGRA_OPTEE_VERSION}"
@@ -80,12 +84,12 @@ TEGRAFLASH_NO_INTERNAL_STORAGE ?= "0"
 UBOOT_EXTLINUX ?= "1"
 TEGRA_ESSENTIAL_EXTRA_RDEPENDS ?= "${@'l4t-launcher-extlinux' if d.getVar('UBOOT_EXTLINUX') == '1' else ''}"
 MACHINE_FEATURES = "alsa usbhost pci rtc cuda ext2"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "tegra-firmware ${TEGRA_ESSENTIAL_EXTRA_RDEPENDS}"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "tegra-firmware ${TEGRA_ESSENTIAL_EXTRA_RDEPENDS} nvidia-kernel-oot-base"
-MACHINE_EXTRA_RDEPENDS = "tegra-nvphs tegra-nvs-service tegra-nvsciipc tegra-nvstartup tegra-nvfancontrol tegra-configs-udev tegra-redundant-boot"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-ina3221 kernel-module-lm90 kernel-module-tegra-bpmp-thermal kernel-module-spi-tegra114 kernel-module-pwm-fan \
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nvgpu \
+                                       kernel-module-governor-userspace kernel-module-ucsi-ccg kernel-module-pcie-tegra194 kernel-module-phy-tegra194-p2u \
-			   kernel-module-snd-hda-tegra kernel-module-snd-hda-codec-hdmi kernel-module-ina3221 \
+                                       kernel-module-nvme kernel-module-pwm-tegra kernel-module-tegra-xudc"
-                           kernel-module-tegra-bpmp-thermal kernel-module-spi-tegra114 kernel-module-ahci \
+MACHINE_EXTRA_RDEPENDS = "tegra-nvphs tegra-nvs-service tegra-nvsciipc tegra-nvstartup tegra-nvfancontrol tegra-configs-udev tegra-redundant-boot nvidia-kernel-oot-display"
-                           kernel-module-max77620-thermal kernel-module-pwm-fan"
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-hda-tegra kernel-module-snd-hda-codec-hdmi nvidia-kernel-oot-cameras nvidia-kernel-oot-canbus"
 MACHINE_HWCODECS = "gstreamer1.0-plugins-nvvideo4linux2"
 
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"

conf/machine/include/tegra234.inc

@@ -28,8 +28,6 @@ NVPMODEL ?= "nvpmodel_p3701_0000"
 NVPOWER ?= "jetsonpower_t234"
 NVFANCONTROL ?= "nvfancontrol_p3701_0000"
 
-MACHINE_EXTRA_RRECOMMENDS += "kernel-module-nvidia kernel-module-nvidia-drm kernel-module-nvidia-modeset kernel-module-userspace-alert"
-
 PARTITION_LAYOUT_EXTERNAL_DEFAULT ?= "flash_l4t_t234_nvme.xml"
 
 TEGRA_BOOT_FIRMWARE_FILES = "\
@@ -42,7 +40,6 @@ TEGRA_BOOT_FIRMWARE_FILES = "\
     preboot_c10_prod_cr.bin \
     mce_c10_prod_cr.bin \
     mts_c10_prod_cr.bin \
-    nvtboot_cpurf_t234.bin \
     spe_t234.bin \
     psc_bl1_t234_prod.bin \
     pscfw_t234_prod.bin \
@@ -56,6 +53,7 @@ TEGRA_BOOT_FIRMWARE_FILES = "\
     pinctrl-tegra.h \
     tegra234-gpio.h \
     readinfo_t234_min_prod.xml \
-    camera-rtcpu-sce.img \
     fsi-fw-ecc.bin \
+    nvpva_020.fw \
+    tsec_t234.bin \
 "

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

@@ -5,11 +5,10 @@
 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=;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_DEVICETREE ?= "tegra234-p3737-0000+p3701-0008-nv.dtb"
-KERNEL_ARGS ?= "mminit_loglevel=4 console=tty0 console=ttyTCU0,115200 firmware_class.path=/etc/firmware fbcon=map:0 net.ifnames=0 nospectre_bhb"
+KERNEL_ARGS ?= "mminit_loglevel=4 console=tty0 console=ttyTCU0,115200 firmware_class.path=/etc/firmware fbcon=map:0 net.ifnames=0 nospectre_bhb video=efifb:off console=tty0"
 
 EMMC_SIZE ?= "63652757504"
 EMMC_DEVSECT_SIZE ?= "512"
@@ -18,14 +17,13 @@ BOOTPART_LIMIT ?= "10485760"
 ROOTFSPART_SIZE_DEFAULT ?= "59055800320"
 ODMDATA ?= "gbe-uphy-config-22,hsstp-lane-map-3,nvhs-uphy-config-0,hsio-uphy-config-0,gbe0-enable-10g"
 EMMC_BCT ?= "tegra234-p3701-0008-sdram-l4t.dts"
-NVIDIA_BOARD ?= "t186ref"
 PARTITION_LAYOUT_TEMPLATE_DEFAULT ?= "flash_t234_qspi_sdmmc_industrial.xml"
 TEGRA_AUDIO_DEVICE ?= "tegra-ape"
 
 OTABOOTDEV ?= "/dev/mtdblock0"
 OTAGPTDEV ?= "/dev/mtdblock0"
 
-TEGRA_PLUGIN_MANAGER_OVERLAYS ?= "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 tegra234-p3737-audio-codec-rt5658-40pin.dtbo tegra234-p3737-overlay.dtbo"
+TEGRA_PLUGIN_MANAGER_OVERLAYS ?= "tegra234-p3737-0000+p3701-0000-dynamic.dtbo tegra234-carveouts.dtbo tegra-optee.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"
 
 TEGRA_FLASHVAR_BPFDTB_FILE = "tegra234-bpmp-3701-0008-3737-0000.dtb"
 TEGRA_FLASHVAR_BPF_FILE = "bpmp_t234-TE992M-A1_prod.bin"

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

@@ -4,7 +4,7 @@
 
 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"
+KERNEL_DEVICETREE ?= "tegra234-p3737-0000+p3701-0000-nv.dtb"
 
 require conf/machine/include/agx-orin.inc
 require conf/machine/include/devkit-wifi.inc

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

@@ -2,61 +2,9 @@
 #@NAME: Nvidia Jetson Orin NX 16GB (P3767-0000)
 #@DESCRIPTION: Nvidia Jetson Orin NX 16GB module in P3509 carrier
 
-TEGRA_BOARDID ?= "3767"
-TEGRA_FAB ?= "ES1"
-TEGRA_BOARDSKU ?= "0000"
-TEGRA_BOARDREV ?= "A.3"
-TEGRA_CHIPREV ?= "1"
-NVPMODEL ?= "nvpmodel_p3767_0000"
-NVFANCONTROL ?= "nvfancontrol_p3767_0000"
-
-TNSPEC_BOOTDEV ?= "nvme0n1p1"
-PARTITION_LAYOUT_TEMPLATE_DEFAULT ?= "flash_t234_qspi.xml"
-PARTITION_LAYOUT_TEMPLATE_DEFAULT_SUPPORTS_REDUNDANT ?= "1"
-PARTITION_LAYOUT_EXTERNAL_DEFAULT ?= "flash_l4t_t234_nvme.xml"
-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=;chipsku=00:00:00:D3;bup_type=bl \
-                       fab=000;boardsku=0000;boardrev=;bup_type=kernel"
-
-KERNEL_DEVICETREE ?= "tegra234-p3767-0000-p3509-a02.dtb"
-KERNEL_ARGS ?= "mminit_loglevel=4 console=ttyTCU0,115200 firmware_class.path=/etc/firmware fbcon=map:0 net.ifnames=0 nospectre_bhb"
-MACHINE_EXTRA_RRECOMMENDS += "kernel-module-r8168 kernel-module-r8169 kernel-module-realtek"
-MACHINE_EXTRA_RDEPENDS += "linux-firmware-rtl8168"
-
-EMMC_SIZE ?= ""
-BOOTPART_SIZE ?= "8388608"
-# 55GiB default rootfs size
-ROOTFSPART_SIZE_DEFAULT ?= "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"
-TEGRA_AUDIO_DEVICE ?= "tegra-hda-p3767-p3509"
-
-OTABOOTDEV ?= "/dev/mtdblock0"
-OTAGPTDEV ?= "/dev/mtdblock0"
-
-TEGRA_PLUGIN_MANAGER_OVERLAYS ?= "tegra234-p3767-overlay.dtbo tegra234-p3767-0000-p3509-a02-hdr40.dtbo"
-
-TEGRA_FLASHVAR_BPFDTB_FILE ?= "tegra234-bpmp-3767-0000-@BPFDTBREV@-3509-a02.dtb"
-TEGRA_FLASHVAR_BPF_FILE ?= "bpmp_t234-TE980M-A1_prod.bin"
-TEGRA_FLASHVAR_BR_CMD_CONFIG ?= "tegra234-mb1-bct-reset-p3767-0000.dts"
-TEGRA_FLASHVAR_DEVICEPROD_CONFIG ?= "tegra234-mb1-bct-cprod-p3767-0000.dts"
-TEGRA_FLASHVAR_DEVICE_CONFIG ?= "tegra234-mb1-bct-device-p3767-0000.dts"
-TEGRA_FLASHVAR_DEV_PARAMS ?= "tegra234-br-bct-p3767-0000-l4t.dts"
-TEGRA_FLASHVAR_DEV_PARAMS_B ?= "tegra234-br-bct_b-p3767-0000-l4t.dts"
-TEGRA_FLASHVAR_EMC_FUSE_DEV_PARAMS ?= "tegra234-br-bct-diag-boot.dts"
-TEGRA_FLASHVAR_GPIOINT_CONFIG ?= "tegra234-mb1-bct-gpioint-p3767-0000.dts"
-TEGRA_FLASHVAR_MB2BCT_CFG ?= "tegra234-mb2-bct-misc-p3767-0000.dts"
-TEGRA_FLASHVAR_MINRATCHET_CONFIG ?= "--minratchet_config tegra234-mb1-bct-ratchet-p3767-0000.dts"
-TEGRA_FLASHVAR_MISC_CONFIG ?= "tegra234-mb1-bct-misc-p3767-0000.dts"
 TEGRA_FLASHVAR_PINMUX_CONFIG ?= "tegra234-mb1-bct-pinmux-p3767-hdmi-a03.dtsi"
 TEGRA_FLASHVAR_PMC_CONFIG ?= "tegra234-mb1-bct-padvoltage-p3767-hdmi-a03.dtsi"
-TEGRA_FLASHVAR_PMIC_CONFIG ?= "tegra234-mb1-bct-pmic-p3767-0000-@PMICREV@.dts"
+TEGRA_PLUGIN_MANAGER_OVERLAYS ?= "tegra234-carveouts.dtbo tegra-optee.dtbo tegra234-p3768-0000+p3767-0000-dynamic.dtbo tegra234-dcb-p3767-0000-hdmi.dtbo"
-TEGRA_FLASHVAR_PROD_CONFIG ?= "tegra234-mb1-bct-prod-p3767-0000.dts"
+TEGRA_DCE_OVERLAY ?= "tegra234-dcb-p3767-0000-hdmi.dtbo"
-TEGRA_FLASHVAR_SCR_CONFIG ?= "tegra234-mb2-bct-scr-p3767-0000.dts"
+
-TEGRA_FLASHVAR_UPHY_CONFIG ?= "--uphy tegra234-mb1-bct-uphylane-si.dtsi"
+require conf/machine/p3768-0000-p3767-0000.conf
-TEGRA_FLASHVAR_WB0SDRAM_BCT ?= "tegra234-p3767-0000-wb0sdram-l4t.dts"

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

@@ -22,8 +22,8 @@ require conf/machine/include/devkit-wifi.inc
 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"
+KERNEL_DEVICETREE ?= "tegra234-p3768-0000+p3767-0000-nv.dtb"
-KERNEL_ARGS ?= "mminit_loglevel=4 console=ttyTCU0,115200 firmware_class.path=/etc/firmware fbcon=map:0 net.ifnames=0 nospectre_bhb"
+KERNEL_ARGS ?= "mminit_loglevel=4 console=ttyTCU0,115200 firmware_class.path=/etc/firmware fbcon=map:0 net.ifnames=0 nospectre_bhb video=efifb:off console=tty0"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-r8168 kernel-module-r8169 kernel-module-realtek"
 MACHINE_EXTRA_RDEPENDS += "linux-firmware-rtl8168"
 
@@ -33,13 +33,12 @@ BOOTPART_SIZE ?= "8388608"
 ROOTFSPART_SIZE_DEFAULT ?= "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"
 TEGRA_AUDIO_DEVICE ?= "tegra-hda-p3767-p3509"
 
 OTABOOTDEV ?= "/dev/mtdblock0"
 OTAGPTDEV ?= "/dev/mtdblock0"
 
-TEGRA_PLUGIN_MANAGER_OVERLAYS ?= "tegra234-p3767-overlay.dtbo tegra234-p3768-overlay.dtbo"
+TEGRA_PLUGIN_MANAGER_OVERLAYS ?= "tegra234-carveouts.dtbo tegra-optee.dtbo tegra234-p3768-0000+p3767-0000-dynamic.dtbo"
 
 TEGRA_FLASHVAR_BPFDTB_FILE ?= "tegra234-bpmp-3767-0000-@BPFDTBREV@-3509-a02.dtb"
 TEGRA_FLASHVAR_BPF_FILE ?= "bpmp_t234-TE980M-A1_prod.bin"

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

@@ -7,7 +7,7 @@ NVPMODEL ?= "nvpmodel_p3767_0001"
 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"
+KERNEL_DEVICETREE ?= "tegra234-p3768-0000+p3767-0001-nv.dtb"
 EMMC_BCT ?= "tegra234-p3767-0001-sdram-l4t.dts"
 
 TEGRA_FLASHVAR_WB0SDRAM_BCT ?= "tegra234-p3767-0001-wb0sdram-l4t.dts"

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

@@ -8,13 +8,16 @@ TNSPEC_BOOTDEV ?= "nvme0n1p1"
 PARTITION_LAYOUT_TEMPLATE_DEFAULT ?= "flash_t234_qspi.xml"
 PARTITION_LAYOUT_TEMPLATE_DEFAULT_SUPPORTS_REDUNDANT ?= "1"
 PARTITION_LAYOUT_EXTERNAL_DEFAULT ?= "flash_l4t_t234_nvme.xml"
+TEGRAFLASH_NO_INTERNAL_STORAGE = "1"
 
 TEGRA_BOARDSKU = "0004"
-KERNEL_DEVICETREE = "tegra234-p3767-0004-p3768-0000-a0.dtb"
+KERNEL_DEVICETREE ?= "tegra234-p3768-0000+p3767-0004-nv.dtb"
 NVPMODEL ?= "nvpmodel_p3767_0004"
+EMMC_BCT ?= "tegra234-p3767-0004-sdram-l4t.dts"
 
 TEGRA_FLASHVAR_BPFDTB_FILE ?= "tegra234-bpmp-3767-0004-3509-a02.dtb"
 TEGRA_FLASHVAR_RAMCODE ?= "4"
+TEGRA_FLASHVAR_WB0SDRAM_BCT ?= "tegra234-p3767-0004-wb0sdram-l4t.dts"
 
 TEGRA_BUPGEN_SPECS ?= "fab=000;boardsku=0004;boardrev=;chipsku=00:00:00:D6;bup_type=bl \
                        fab=000;boardsku=0004;boardrev=;bup_type=kernel"