From c9242281d1b15b151ee0e930d1c60d7eb004e13a Mon Sep 17 00:00:00 2001
From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Wed, 8 Jun 2022 22:41:02 -0400
Subject: [PATCH] m5: Inherit common tree after device vars are set

* Allows several variables to be read in common tree.

Change-Id: Ic8f3a4d210568254d814b013b67d8f06efff5e63
---
 BoardConfig.mk | 7 ++++---
 device.mk      | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index ec27ac6..9b14b08 100644
--- 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/bananapi/m5
 
 ## Bootloader
@@ -26,3 +24,6 @@ BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_rtl
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_rtl
 WIFI_DRIVER_SOCKET_IFACE := wlan0
 PRODUCT_CFI_INCLUDE_PATHS += hardware/realtek/wlan/wpa_supplicant_8_lib
+
+## Include the common tree BoardConfig makefile
+include device/amlogic/g12-common/BoardConfigCommon.mk
diff --git a/device.mk b/device.mk
index 4df23cc..b75390d 100644
--- 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
 BOARD_HAVE_BLUETOOTH_RTK_TV := true
 include hardware/realtek/rtkbt/rtkbt.mk
@@ -26,3 +24,6 @@ PRODUCT_PACKAGES += \
 ## Overlays
 DEVICE_PACKAGE_OVERLAYS += \
     $(LOCAL_PATH)/overlay
+
+## Inherit from the common tree product makefile
+$(call inherit-product, device/amlogic/g12-common/g12.mk)
-- 
2.20.1