fix overlays patch and re-enble it

This commit is contained in:
Martin Ayotte 2019-10-23 11:05:14 -04:00
parent 01229d6672
commit 72f04c43a8

View File

@ -30,13 +30,13 @@ Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com>
create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-w1AB-gpio.dts
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index 84afecba9ec0..f726804d32ed 100644
index 07b861f..9d12b15 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -36,3 +36,5 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb
@@ -32,3 +32,5 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb
+
+subdir-y := $(dts-dirs) overlay
diff --git a/arch/arm64/boot/dts/amlogic/Makefile.rej b/arch/arm64/boot/dts/amlogic/Makefile.rej