From bcbe0c92231781af938ef64e5d87151d863e226b Mon Sep 17 00:00:00 2001
From: Alistair Delva <adelva@google.com>
Date: Mon, 13 Dec 2021 12:41:30 -0800
Subject: [PATCH] ANDROID: rockpi4: Use new DTS_EXT_DIR feature

This allows us to compartmentalize a hack used to disable BT UART so we
can drop a non-upstream change to the rockpi4b dts.

Bug: 183963484
Change-Id: I312c2d4ac661e9e0ae2cdbac081ea1447bee6d21
Signed-off-by: Alistair Delva <adelva@google.com>
---
 build.config.rockpi4 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.config.rockpi4 b/build.config.rockpi4
index 424e568f018c..c9c9776dbb33 100644
--- a/build.config.rockpi4
+++ b/build.config.rockpi4
@@ -10,10 +10,12 @@ FRAGMENT_CONFIG=${KERNEL_DIR}/arch/arm64/configs/rockpi4_gki.fragment
 PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${FRAGMENT_CONFIG}"
 POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
 
+DTS_EXT_DIR=common-modules/virtual-device
+DTC_INCLUDE=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/boot/dts/rockchip
 MAKE_GOALS="${MAKE_GOALS}
-rockchip/rk3399-rock-pi-4b.dtb
+rk3399-rock-pi-4b.dtb
 "
 
 FILES="${FILES}
-arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dtb
+../common-modules/virtual-device/rk3399-rock-pi-4b.dtb
 "