enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed issues with sunxi overlay kernel patches

Browse Source 
removed conflicting patches from "general-sunxi64-overlays.patch" as they are
already provided by "general-sunxi-overlays.patch"
This commit is contained in:
5kft 2018-07-20 22:11:16 -07:00
parent 2d92ef44ca
commit ddc52ce4de
2 changed files with 20 additions and 1763 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
patch/kernel/sunxi-next/general-sunxi-overlays.patch
View File

@ -4520,6 +4520,16 @@ index 0000000..f4ccb7f
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
index 94de6044..1e85fd7c 100644
--- a/arch/arm64/boot/dts/allwinner/Makefile
+++ b/arch/arm64/boot/dts/allwinner/Makefile
@@ -14,3 +14,4 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo-plus2.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb
+subdir-y := $(dts-dirs) overlay
\ No newline at end of file
diff --git a/arch/arm64/boot/dts/allwinner/overlay/Makefile b/arch/arm64/boot/dts/allwinner/overlay/Makefile
new file mode 100644
index 0000000..5cad268
@ -4531,7 +4541,7 @@ index 0000000..5cad268
+ sun50i-a64-i2c0.dtbo \
+ sun50i-a64-i2c1.dtbo \
+ sun50i-a64-pps-gpio.dtbo \
+ sun50i-a64/sun50i-a64-spi-add-cs1.dtbo \
+ sun50i-a64-spi-add-cs1.dtbo \
+ sun50i-a64-spi-jedec-nor.dtbo \
+ sun50i-a64-spi-spidev.dtbo \
+ sun50i-a64-uart1.dtbo \
@ -4559,13 +4569,18 @@ index 0000000..5cad268
+ sun50i-h5-usbhost3.dtbo \
+ sun50i-h5-w1-gpio.dtbo
+
+scr-$(CONFIG_ARCH_SUNXI) += sun50i-a64-fixup.scr
+scr-$(CONFIG_ARCH_SUNXI) += sun50i-h5-fixup.scr
+scr-$(CONFIG_ARCH_SUNXI) += \
+ sun50i-a64-fixup.scr \
+ sun50i-h5-fixup.scr
+
+dtbotxt-$(CONFIG_ARCH_SUNXI) += README.sun50i-a64-overlays
+dtbotxt-$(CONFIG_ARCH_SUNXI) += README.sun50i-h5-overlays
+dtbotxt-$(CONFIG_ARCH_SUNXI) += \
+ README.sun50i-a64-overlays \
+ README.sun50i-h5-overlays
+
+targets += $(dtbo-y) $(scr-y) $(dtbotxt-y)
+
+always := $(dtbo-y) $(scr-y) $(dtbotxt-y)
+clean-files := *.dtbo *.scr
diff --git a/arch/arm64/boot/dts/allwinner/overlay/README.sun50i-a64-overlays b/arch/arm64/boot/dts/allwinner/overlay/README.sun50i-a64-overlays
new file mode 100644
index 0000000..cd9dbc6

1758
patch/kernel/sunxi-next/general-sunxi64-overlays.patch
View File

File diff suppressed because it is too large Load Diff