Merge android-msm-pixel-4.19 into android-msm-barbet-4.19

Bug: 187909050
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: I733f40c91d84882e434bb34eeb5a197e94e22f98

qcom/Makefile

diff --git a/qcom/Makefile b/qcom/Makefile
index 7003b24..82469d5 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -1,4 +1,4 @@
-ifeq (,$(filter y, $(CONFIG_BOARD_BRAMBLE) $(CONFIG_BOARD_REDFIN)))
+ifeq (,$(filter y, $(CONFIG_BOARD_BRAMBLE) $(CONFIG_BOARD_REDFIN) $(CONFIG_BOARD_BARBET)))
 
 ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
         dtbo-$(CONFIG_ARCH_KONA) += \
@@ -357,7 +357,7 @@
 	sda429-mtp.dtb \
 	sda429-cdp.dtb
 endif
-endif #CONFIG_BOARD_BRAMBLE CONFIG_BOARD_REDFIN
+endif #CONFIG_BOARD_BRAMBLE CONFIG_BOARD_REDFIN CONFIG_BOARD_BARBET
 
 always		:= $(dtb-y)
 subdir-y	:= $(dts-dirs)