From b72f1d8eb52b5abc72e0ce35c4a223d9b0535d4d Mon Sep 17 00:00:00 2001 From: Nolen Johnson Date: Sat, 11 Jan 2025 00:16:08 -0500 Subject: [PATCH] nx: Fetch nx HOS FW and bl33 blobs using external source type Change-Id: Ifbfcfd9c60ea759d6366dcf5cd5d09341b42d65c --- build/tasks/bootloader.mk | 2 +- extract/extract_sources.sh | 1 - extract/file.list | 7 +++++++ extract/patches.sh | 34 ---------------------------------- vendor/nx-vendor.mk | 12 ++++++------ 5 files changed, 14 insertions(+), 42 deletions(-) delete mode 100644 extract/patches.sh diff --git a/build/tasks/bootloader.mk b/build/tasks/bootloader.mk index f0a5a39..7d2e3a6 100644 --- a/build/tasks/bootloader.mk +++ b/build/tasks/bootloader.mk @@ -17,7 +17,7 @@ ifneq ($(filter nx nx_tab,$(TARGET_DEVICE)),) UBOOT_PATH := $(BUILD_TOP)/hardware/nintendo/u-boot NX_BOOTFILES_PATH := $(BUILD_TOP)/device/nintendo/nx/bootfiles -NX_FIRMWARE_PATH := $(BUILD_TOP)/vendor/nintendo/nx/swr/u-boot +NX_FIRMWARE_PATH := $(BUILD_TOP)/vendor/nintendo/nx/external/u-boot ifneq ($(TARGET_TEGRA_UBOOT),prebuilt) diff --git a/extract/extract_sources.sh b/extract/extract_sources.sh index 902c73f..d87bd3a 100644 --- a/extract/extract_sources.sh +++ b/extract/extract_sources.sh @@ -15,4 +15,3 @@ # FILELIST_PATHS+=("nintendo/nx"); -PATCH_PATHS+=("nintendo/nx"); diff --git a/extract/file.list b/extract/file.list index 6eb12ad..4e27515 100644 --- a/extract/file.list +++ b/extract/file.list @@ -1 +1,8 @@ stock-t210 vendor/firmware/brcmfmac4356-pcie.clm_blob bcm/bcm4356/ + +# HOS FW +external https://gitlab.com/switchroot/android/nx-firmware/-/raw/main/brcmfmac4356A3-pcie.txt?ref_type=heads bcm/bcm4356/brcmfmac4356A3-pcie.txt +external https://gitlab.com/switchroot/android/nx-firmware/-/raw/main/CYW4356A3_001.004.009.0092.0095.bin?ref_type=heads bcm/bcm4356/CYW4356A3_001.004.009.0092.0095.bin + +# u-boot +external https://gitlab.com/switchroot/android/nx-firmware/-/raw/main/bl33.bin?ref_type=heads u-boot/bl33.bin diff --git a/extract/patches.sh b/extract/patches.sh deleted file mode 100644 index 863508e..0000000 --- a/extract/patches.sh +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2024 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. - -# The previous default crashes the current firmware -function fetch_nx_firmware() { - echo -n "Fetching Wi-Fi firmware for NX from SWR..."; - - mkdir -p ${LINEAGE_ROOT}/vendor/nintendo/nx/swr/bcm/bcm4356 - mkdir -p ${LINEAGE_ROOT}/vendor/nintendo/nx/swr/u-boot - wget -q https://gitlab.com/switchroot/android/nx-firmware/-/raw/main/brcmfmac4356A3-pcie.txt?ref_type=heads -O ${LINEAGE_ROOT}/vendor/nintendo/nx/swr/bcm/bcm4356/brcmfmac4356A3-pcie.txt - wget -q https://gitlab.com/switchroot/android/nx-firmware/-/raw/main/CYW4356A3_001.004.009.0092.0095.bin?ref_type=heads -O ${LINEAGE_ROOT}/vendor/nintendo/nx/swr/bcm/bcm4356/CYW4356A3_001.004.009.0092.0095.bin - - echo ""; - - echo -n "Fetching BL33 for NX from SWR..."; - - wget -q https://gitlab.com/switchroot/android/nx-firmware/-/raw/main/bl33.bin?ref_type=heads -O ${LINEAGE_ROOT}/vendor/nintendo/nx/swr/u-boot/bl33.bin - - echo ""; - -} - -fetch_nx_firmware; diff --git a/vendor/nx-vendor.mk b/vendor/nx-vendor.mk index 44faddf..344d755 100644 --- a/vendor/nx-vendor.mk +++ b/vendor/nx-vendor.mk @@ -29,15 +29,15 @@ ATF_PARAMS += CRASH_REPORTING=1 ENABLE_ASSERTIONS=1 LOG_LEVEL=0 PLAT_LOG_LEVEL_A COMMON_BCM_PATH := vendor/nvidia/common/rel-shield-r/bcm NX_BCM_PATH := vendor/nintendo/nx/rel-shield-r/bcm -NX_BCM_SWR_PATH := vendor/nintendo/nx/swr/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_SWR_PATH)/bcm4356/brcmfmac4356A3-pcie.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/brcmfmac4356-pcie.nvidia,odin.txt \ - $(NX_BCM_SWR_PATH)/bcm4356/brcmfmac4356A3-pcie.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/brcmfmac4356-pcie.nvidia,modin.txt \ - $(NX_BCM_SWR_PATH)/bcm4356/brcmfmac4356A3-pcie.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/brcmfmac4356-pcie.nvidia,vali.txt \ - $(NX_BCM_SWR_PATH)/bcm4356/brcmfmac4356A3-pcie.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/brcmfmac4356-pcie.nvidia,fric.txt \ - $(NX_BCM_SWR_PATH)/bcm4356/CYW4356A3_001.004.009.0092.0095.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/BCM4356A3.hcd + $(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