fly-iq4404: fix boot.img and kernel freezes at high disk load (MR 1285)

device/testing/device-fly-iq4404/APKBUILD

@@ -2,12 +2,12 @@
 pkgname=device-fly-iq4404
 pkgdesc="Fly Spark"
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-fly-iq4404 mkbootimg msm-fb-refresher mesa-dri-swrast"
+depends="postmarketos-base linux-fly-iq4404 mkbootimg msm-fb-refresher mesa-dri-swrast mtk-mkimage"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
@@ -20,4 +20,4 @@ package() {
 }
 
 
-sha512sums="89b4939d3d3c7a31f68a12237c27fa952249d3deb188f173fb856943ad570131ee727f7fc916afc45b7af05dda59cc8d11541d6d9cdea3e39babf019cd61c5a7  deviceinfo"
+sha512sums="e00854ede7b4db643fcc96b935d03381951712628a90a9e2f204f88f3f5f11f22b41cb828a00c257e89e8c82d4487f72d2406daa355955b7ab64b2ba5f1f29b5  deviceinfo"

device/testing/device-fly-iq4404/deviceinfo

@@ -20,9 +20,10 @@ deviceinfo_screen_height="854"
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline=""
-deviceinfo_generate_bootimg="false"
+deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
+deviceinfo_bootimg_mtk_mkimage="true"
 deviceinfo_flash_offset_base="0x80100000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x04000000"

device/testing/linux-fly-iq4404/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=linux-fly-iq4404
 pkgver=3.10.89
-pkgrel=0
+pkgrel=1
 pkgdesc="Fly Spark kernel fork"
 arch="armv7"
 _carch="arm"
@@ -11,7 +11,14 @@ _flavor="fly-iq4404"
 url="https://kernel.org"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps pmb:cross-native"
-makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev xz"
+makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev xz  mtk-mkimage gcc6"
+
+# Compiler: >GCC 6 (Hangs on disk load)
+if [ "${CC:0:5}" != "gcc6-" ]; then
+	CC="gcc6-$CC"
+	HOSTCC="gcc6-gcc"
+	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
+fi
 
 # Source
 _repository="kernel-3.10-iq4404_mt6572"
@@ -20,8 +27,6 @@ _config="config-$_flavor.$arch"
 source="
 	$pkgname-$_commit.tar.gz::https://github.com/ave4/$_repository/archive/$_commit.tar.gz
 	$_config
-	gcc7-give-up-on-ilog2-const-optimizations.patch
-	gcc8-fix-put-user.patch
 "
 builddir="$srcdir/$_repository-$_commit"
 
@@ -37,10 +42,16 @@ build() {
 }
 
 package() {
-	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir"
+	# kernel.release
+	install -D "$builddir/include/config/kernel.release" \
+		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
+
+	cd "$builddir/arch/$_carch/boot"
+	# Add mediatek header to zImage
+	mtk-mkimage KERNEL zImage zImage-mtk
+	# Install modified zImage
+	install -Dm644 zImage-mtk "$pkgdir/boot/vmlinuz-$_flavor"
 }
 
 sha512sums="ae53fe32e91a46ddc553ca6ea27bebb9ec3bb0dd01f15336d4570fa789c04ec1a52146fdd03f7ee409f16a11f8f90625546b447a39d7b6d2f10032c91283788e  linux-fly-iq4404-a619869f394bc2f00226efa230bc33894648af4e.tar.gz
-8b8d9f5c393b8df2978b34bde91be58f6073f1d43dc7e7cae4b0ce20ae522f7d1da25f3dfd8a255ae39b82989cb58c244d4033e266530a017972847745fc9b44  config-fly-iq4404.armv7
-77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
-197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch"
+84419c429911b1a529d60c9a1c7c9724e94f54de6c3dda63d7ad6cd84ac5cb1e2f2e1ba65eb8ac202eab920c8c2ce760e7c7319a40eca2820ac0f5c8ca2fa0d7  config-fly-iq4404.armv7"

device/testing/linux-fly-iq4404/config-fly-iq4404.armv7

@@ -430,7 +430,7 @@ CONFIG_ATAGS=y
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZBOOT_ROM_BSS=0
 # CONFIG_COMPAT_CPUINFO is not set
-CONFIG_CMDLINE="console=tty0 console=ttyMT3,921600n1 root=/dev/ram vmalloc=496M slub_max_order=0 slub_debug=O "
+CONFIG_CMDLINE="console=tty0 console=ttyMT0,921600n1 root=/dev/ram lcm=1-otm8018b_dsi_vdo fps=6447 pl_t=1922 lk_t=1437 boot_reason=0"
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set

device/testing/linux-fly-iq4404/gcc7-give-up-on-ilog2-const-optimizations.patch

-../../.shared-patches/linux/gcc7-give-up-on-ilog2-const-optimizations.patch
\ No newline at end of file

device/testing/linux-fly-iq4404/gcc8-fix-put-user.patch

-../../.shared-patches/linux/gcc8-fix-put-user.patch
\ No newline at end of file