diff --git a/AndroidBoard.mk b/AndroidBoard.mk
index f40f2cf..00f9279 100644
--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -41,8 +41,8 @@ ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_DTBIMAGE_TARGET)
 
 INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_DTBIMAGE_TARGET)
 
-CEC_XML_SYMLINK := $(TARGET_OUT_VENDOR)/etc/permissions/android.hardware.hdmi.cec.xml
-$(CEC_XML_SYMLINK): $(LOCAL_INSTALLED_MODULE)
-	$(hide) ln -sf /data/vendor/permissions/android.hardware.hdmi.cec.xml $@
+#CEC_XML_SYMLINK := $(TARGET_OUT_VENDOR)/etc/permissions/android.hardware.hdmi.cec.xml
+#$(CEC_XML_SYMLINK): $(LOCAL_INSTALLED_MODULE)
+#	$(hide) ln -sf /data/vendor/permissions/android.hardware.hdmi.cec.xml $@
 
 ALL_DEFAULT_INSTALLED_MODULES += $(CEC_XML_SYMLINK)
diff --git a/vendor/linux-firmware/nx.mk b/vendor/linux-firmware/nx.mk
new file mode 100644
index 0000000..0035874
--- /dev/null
+++ b/vendor/linux-firmware/nx.mk
@@ -0,0 +1,33 @@
+# Copyright (C) 2026 The LineageOS Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := device/nintendo/nx/vendor/linux-firmware
+PRODUCT_SOONG_NAMESPACES += $(LOCAL_PATH)
+
+COMMON_BCM_PATH := vendor/nvidia/common/rel-shield-r/bcm
+NX_BCM_PATH := vendor/nintendo/nx/rel-shield-r/bcm
+NX_BCM_EXTERNAL_PATH := vendor/nintendo/nx/external/bcm
+
+include device/nvidia/tegra-common/vendor/$(TARGET_TEGRA_FIRMWARE_BRANCH)/bcm/bcm4356.mk
+
+PRODUCT_COPY_FILES += \
+    $(NX_BCM_PATH)/bcm4356/brcmfmac4356-pcie.clm_blob:$(TARGET_COPY_OUT_VENDOR)/firmware/brcmfmac4356-pcie.clm_blob \
+    $(NX_BCM_EXTERNAL_PATH)/bcm4356/brcmfmac4356A3-pcie.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/brcmfmac4356-pcie.nvidia,odin.txt \
+    $(NX_BCM_EXTERNAL_PATH)/bcm4356/brcmfmac4356A3-pcie.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/brcmfmac4356-pcie.nvidia,modin.txt \
+    $(NX_BCM_EXTERNAL_PATH)/bcm4356/brcmfmac4356A3-pcie.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/brcmfmac4356-pcie.nvidia,vali.txt \
+    $(NX_BCM_EXTERNAL_PATH)/bcm4356/brcmfmac4356A3-pcie.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/brcmfmac4356-pcie.nvidia,fric.txt \
+    $(NX_BCM_EXTERNAL_PATH)/bcm4356/CYW4356A3_001.004.009.0092.0095.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/BCM4356A3.hcd
+
+PRODUCT_COPY_FILES += \
+    $(COMMON_BCM_PATH)/bcm4356/brcmfmac4356-pcie.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/brcmfmac4356-pcie.bin
diff --git a/vendor/nx-vendor.mk b/vendor/nx-vendor.mk
index 344d755..ad38f45 100644
--- a/vendor/nx-vendor.mk
+++ b/vendor/nx-vendor.mk
@@ -14,6 +14,7 @@
 
 include device/nvidia/t210-common/vendor/t210-by-flags.mk
 include device/nvidia/tegra-common/vendor/common-by-flags.mk
+include device/nintendo/nx/vendor/$(TARGET_TEGRA_FIRMWARE_BRANCH)/nx.mk
 
 ATF_PATH   := $(abspath hardware/nintendo/arm-trusted-firmware)
 
@@ -26,18 +27,3 @@ ATF_PARAMS += SDEI_SUPPORT=0
 
 # Error reporting
 ATF_PARAMS += CRASH_REPORTING=1 ENABLE_ASSERTIONS=1 LOG_LEVEL=0 PLAT_LOG_LEVEL_ASSERT=0
-
-COMMON_BCM_PATH := vendor/nvidia/common/rel-shield-r/bcm
-NX_BCM_PATH := vendor/nintendo/nx/rel-shield-r/bcm
-NX_BCM_EXTERNAL_PATH := vendor/nintendo/nx/external/bcm
-
-PRODUCT_COPY_FILES += \
-    $(NX_BCM_PATH)/bcm4356/brcmfmac4356-pcie.clm_blob:$(TARGET_COPY_OUT_VENDOR)/firmware/brcmfmac4356-pcie.clm_blob \
-    $(NX_BCM_EXTERNAL_PATH)/bcm4356/brcmfmac4356A3-pcie.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/brcmfmac4356-pcie.nvidia,odin.txt \
-    $(NX_BCM_EXTERNAL_PATH)/bcm4356/brcmfmac4356A3-pcie.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/brcmfmac4356-pcie.nvidia,modin.txt \
-    $(NX_BCM_EXTERNAL_PATH)/bcm4356/brcmfmac4356A3-pcie.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/brcmfmac4356-pcie.nvidia,vali.txt \
-    $(NX_BCM_EXTERNAL_PATH)/bcm4356/brcmfmac4356A3-pcie.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/brcmfmac4356-pcie.nvidia,fric.txt \
-    $(NX_BCM_EXTERNAL_PATH)/bcm4356/CYW4356A3_001.004.009.0092.0095.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/BCM4356A3.hcd
-
-PRODUCT_COPY_FILES += \
-    $(COMMON_BCM_PATH)/bcm4356/brcmfmac4356-pcie.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/brcmfmac4356-pcie.bin