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>
This commit is contained in:
Alistair Delva 2021-12-13 12:41:30 -08:00
parent b3a2cd885d
commit bcbe0c9223

View File

@ -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
"