From 0a817917fbdba4c1524170c1f01df93ace9527ba Mon Sep 17 00:00:00 2001
From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Mon, 10 Jun 2024 01:35:29 -0400
Subject: [PATCH] odroidc4: Split g12a/sm1 proprietary files

Change-Id: Ifb6554802f32809c93110a492393f6c3bd8122d8
---
 BoardConfig.mk        | 3 +++
 device.mk             | 6 ++++++
 extract-files.sh      | 4 +++-
 proprietary-files.txt | 1 +
 setup-makefiles.sh    | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 proprietary-files.txt

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6c42a44..041f6f3 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -21,3 +21,6 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
 
 ## Include the common tree BoardConfig makefile
 include device/amlogic/g12-common/BoardConfigCommon.mk
+
+## Include the proprietary BoardConfig makefile
+include vendor/amlogic/odroidc4/BoardConfigVendor.mk
diff --git a/device.mk b/device.mk
index 59e19aa..37d97d7 100644
--- a/device.mk
+++ b/device.mk
@@ -11,6 +11,9 @@ BOARD_HAVE_BLUETOOTH := false
 PRODUCT_HOST_PACKAGES += \
     aml_image_packer
 
+## Platform
+TARGET_AMLOGIC_SOC := sm1
+
 ## TEE
 TARGET_HAS_TEE := false
 
@@ -19,3 +22,6 @@ BOARD_HAVE_WIFI := false
 
 ## 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/odroidc4/odroidc4-vendor.mk)
diff --git a/extract-files.sh b/extract-files.sh
index 11c8328..c7293e5 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -16,7 +16,9 @@ set -e
 
 export DEVICE=odroidc4
 export DEVICE_COMMON=g12-common
-export VENDOR=hardkernel
+export TARGET_SOC=sm1
+export VENDOR=amlogic
+export VENDOR_BRAND=hardkernel
 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 3c0fc73..a77f05a 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -10,7 +10,9 @@ set -e
 
 export DEVICE=odroidc4
 export DEVICE_COMMON=g12-common
-export VENDOR=hardkernel
+export TARGET_SOC=sm1
+export VENDOR=amlogic
+export VENDOR_BRAND=hardkernel
 export VENDOR_COMMON=amlogic
 
 "./../../${VENDOR_COMMON}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"
-- 
2.20.1