From 333ce3b51efcddaa114ba0b163a7bf61ef304fac Mon Sep 17 00:00:00 2001 From: Nolen Johnson Date: Mon, 10 Jun 2024 01:35:29 -0400 Subject: [PATCH] radxa0: Split g12a/sm1 proprietary files Change-Id: Ifb6554802f32809c93110a492393f6c3bd8122d8 --- BoardConfig.mk | 3 +++ device.mk | 3 +++ extract-files.sh | 4 +++- proprietary-files.txt | 1 + setup-makefiles.sh | 4 +++- 5 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 proprietary-files.txt diff --git a/BoardConfig.mk b/BoardConfig.mk index b9d27e4..30c729a 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -35,3 +35,6 @@ WPA_SUPPLICANT_VERSION := VER_0_8_X ## Include the common tree BoardConfig makefile include device/amlogic/g12-common/BoardConfigCommon.mk + +## Include the proprietary BoardConfig makefile +include vendor/amlogic/radxa0/BoardConfigVendor.mk diff --git a/device.mk b/device.mk index a1c2ebe..4b5fe48 100644 --- a/device.mk +++ b/device.mk @@ -29,3 +29,6 @@ include hardware/amlogic/kernel-modules/dhd-driver/firmware/firmware.mk ## Inherit from the common tree product makefile $(call inherit-product, device/amlogic/g12-common/g12.mk) + +## Inherit from the proprietary files makefile +$(call inherit-product, vendor/amlogic/radxa0/radxa0-vendor.mk) diff --git a/extract-files.sh b/extract-files.sh index 8bb756f..3d88997 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -16,7 +16,9 @@ set -e export DEVICE=radxa0 export DEVICE_COMMON=g12-common -export VENDOR=radxa +export TARGET_SOC=g12a +export VENDOR=amlogic +export VENDOR_BRAND=radxa export VENDOR_COMMON=amlogic "./../../${VENDOR_COMMON}/${DEVICE_COMMON}/extract-files.sh" "$@" diff --git a/proprietary-files.txt b/proprietary-files.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/proprietary-files.txt @@ -0,0 +1 @@ + diff --git a/setup-makefiles.sh b/setup-makefiles.sh index a48e7c8..daf1005 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -10,7 +10,9 @@ set -e export DEVICE=radxa0 export DEVICE_COMMON=g12-common -export VENDOR=radxa +export TARGET_SOC=g12a +export VENDOR=amlogic +export VENDOR_BRAND=radxa export VENDOR_COMMON=amlogic "./../../${VENDOR_COMMON}/${DEVICE_COMMON}/setup-makefiles.sh" "$@" -- 2.20.1