radxa0: Inherit common tree after device vars are set

* Allows several variables to be read in common tree.

Change-Id: Ic8f3a4d210568254d814b013b67d8f06efff5e63

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6f0b9739500e3119f9f15555ab78dfd3a9f5e5e9..b54bf042795b2ece38804fab579061bfa793e9fa 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,11 +1,9 @@
 #
-# Copyright (C) 2021 The LineageOS Project
+# Copyright (C) 2021-2022 The LineageOS Project
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
-include device/amlogic/g12-common/BoardConfigCommon.mk
-
 DEVICE_PATH := device/radxa/radxa0
 
 ## Bluetooth
@@ -32,3 +30,6 @@ WIFI_DRIVER_FW_PATH_AP := "/vendor/etc/wifi/buildin/fw_fw_bcm4356a2_ag_apsta.bin
 WIFI_DRIVER_FW_PATH_STA := "/vendor/etc/wifi/buildin/fw_bcm4356a2_ag.bin"
 WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/dhd/parameters/firmware_path"
 WPA_SUPPLICANT_VERSION := VER_0_8_X
+
+## Include the common tree BoardConfig makefile
+include device/amlogic/g12-common/BoardConfigCommon.mk

diff --git a/device.mk b/device.mk
index 6adc6ddfe23b48ab09770bb3e7ed17935498ebb6..81a63fbc4011cc0795da2e9923095ce9d6aad43a 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-$(call inherit-product, device/amlogic/g12-common/g12.mk)
-
 ## Bluetooth
 PRODUCT_PACKAGES += \
     libbt-vendor
@@ -28,4 +26,9 @@ DEVICE_PACKAGE_OVERLAYS += \
 
 # Wi-Fi
 TARGET_DHD_VERSION := bcmdhd.100.10.545.x
+
+# Wi-Fi Firmware
 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)