samsung-j1mini3g: switch to dtbtool-sprd (!1103)

device/testing/linux-samsung-j1mini3g/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname="linux-samsung-j1mini3g"
 pkgver=3.10.106
-pkgrel=1
+pkgrel=2
 pkgdesc="Samsung Galaxy J1 mini kernel fork"
 arch="armv7"
 _carch="arm"
@@ -11,7 +11,7 @@ _flavor="samsung-j1mini3g"
 url="https://kernel.org"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps"
-makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool"
+makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool-sprd"
 
 # Source
 _repository="android_kernel_samsung_j1mini3g"
@@ -22,7 +22,6 @@ source="
 	$_config
 	gcc7-give-up-on-ilog2-const-optimizations.patch
 	gcc8-fix-put-user.patch
-	fix-dts.patch
 	sprdfb-fix-swapped-colors.patch
 	sprdfb-check-for-buffering.patch
 "
@@ -39,7 +38,7 @@ build() {
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
 
 	# Generate master DTB (deviceinfo_bootimg_qcdt)
-	dtbTool -s 2048 -p "scripts/dtc/" -o "arch/arm/boot/dt.img" "arch/arm/boot/"
+	dtbTool-sprd -s 2048 -p "scripts/dtc/" -o "arch/arm/boot/dt.img" "arch/arm/boot/dts/"
 }
 
 package() {
@@ -54,6 +53,5 @@ sha512sums="f1686df6ee6e1f24c6460295c830b67b2146ab5b34ead2291fa92c3f83ba12884db8
 6828c7c82b11f98bfc185b50c186922ca555026a2c648cfd460a5262f879e278f32aa467b8bdfdca2827d7f0c8fc9342a859b105fa76ea9345ff640b2064cd26  config-samsung-j1mini3g.armv7
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
-a4c04f8f0bd70ab8090faf08fe17592fe275a6be6d5a052f3dc3405062b8d11f08aba637d2ca5cecefcfecf64738a1e1704042ef747ecbef845579dba9b43b5d  fix-dts.patch
 6836001b24508d413a059f19b0c6f6f547037f68886c22159ad51be91d1a089e3d1d9ed79c3c62724648df7f810cd81d96a83f4a34368b373524b649e5539656  sprdfb-fix-swapped-colors.patch
 e33ed12de874c1c8bc9231aea3b0389b18ee0ff804e39c0f47d9cbf657ea19015370d6114846c2d142fbdb88f472f0e65811c53b9b335feb8ae2f30dffdf4846  sprdfb-check-for-buffering.patch"

device/testing/linux-samsung-j1mini3g/fix-dts.patch

-This patch fixed 'No valid dts found' error.
-diff --git a/arch/arm/boot/dts/sprd-scx20_j1mini3g_r00.dts b/arch/arm/boot/dts/sprd-scx20_j1mini3g_r00.dts
-index e87c172f..38f95e69 100644
---- a/arch/arm/boot/dts/sprd-scx20_j1mini3g_r00.dts
-+++ b/arch/arm/boot/dts/sprd-scx20_j1mini3g_r00.dts
-@@ -33,7 +33,7 @@
- / {
- 	model = "Spreadtrum SP8835EB board";
- 	compatible = "sprd,sp8835eb";
--	sprd,sc-id = <8830 0 0x20000>;
-+	qcom,msm-id = <8830 0 0x20000>;
- 	#address-cells = <1>;
- 	#size-cells = <1>;
- 	interrupt-parent = <&gic>;
-diff --git a/arch/arm/boot/dts/sprd-scx20_j1mini3g_r01.dts b/arch/arm/boot/dts/sprd-scx20_j1mini3g_r01.dts
-index 55a729d0..caff8fe9 100644
---- a/arch/arm/boot/dts/sprd-scx20_j1mini3g_r01.dts
-+++ b/arch/arm/boot/dts/sprd-scx20_j1mini3g_r01.dts
-@@ -33,7 +33,7 @@
- / {
- 	model = "Spreadtrum SP8835EB board";
- 	compatible = "sprd,sp8835eb";
--	sprd,sc-id = <8830 1 0x20000>;
-+	qcom,msm-id = <8830 1 0x20000>;
- 	#address-cells = <1>;
- 	#size-cells = <1>;
- 	interrupt-parent = <&gic>;
-diff --git a/arch/arm/boot/dts/sprd-scx20_j1mini3g_r02.dts b/arch/arm/boot/dts/sprd-scx20_j1mini3g_r02.dts
-index 8d8ad48a..73c28dba 100644
---- a/arch/arm/boot/dts/sprd-scx20_j1mini3g_r02.dts
-+++ b/arch/arm/boot/dts/sprd-scx20_j1mini3g_r02.dts
-@@ -33,7 +33,7 @@
- / {
- 	model = "Spreadtrum SP8835EB board";
- 	compatible = "sprd,sp8835eb";
--	sprd,sc-id = <8830 2 0x20000>;
-+	qcom,msm-id = <8830 2 0x20000>;
- 	#address-cells = <1>;
- 	#size-cells = <1>;
- 	interrupt-parent = <&gic>;
-diff --git a/arch/arm/boot/dts/sprd-scx20_j1mini3g_r03.dts b/arch/arm/boot/dts/sprd-scx20_j1mini3g_r03.dts
-index 9690db02..becf5503 100644
---- a/arch/arm/boot/dts/sprd-scx20_j1mini3g_r03.dts
-+++ b/arch/arm/boot/dts/sprd-scx20_j1mini3g_r03.dts
-@@ -33,7 +33,7 @@
- / {
- 	model = "Spreadtrum SP8835EB board";
- 	compatible = "sprd,sp8835eb";
--	sprd,sc-id = <8830 3 0x20000>;
-+	qcom,msm-id = <8830 3 0x20000>;
- 	#address-cells = <1>;
- 	#size-cells = <1>;
- 	interrupt-parent = <&gic>;