From 8a7255ef275a27435e36025c539c268b973c3d8a Mon Sep 17 00:00:00 2001
From: drebrez <drebrez@gmail.com>
Date: Fri, 14 Jul 2017 22:35:59 +0200
Subject: [PATCH] Update heimdall script to flash both (kernel+initramfs) at
 once

---
 device-samsung-i9070/APKBUILD     |  2 +-
 heimdall/APKBUILD                 |  2 +-
 heimdall/heimdall_flash_kernel.sh | 15 +++------------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/device-samsung-i9070/APKBUILD b/device-samsung-i9070/APKBUILD
index a95deed6b..77b023720 100644
--- a/device-samsung-i9070/APKBUILD
+++ b/device-samsung-i9070/APKBUILD
@@ -32,7 +32,7 @@ package() {
 		"$pkgdir"/etc/modules-load.d/00-${pkgname}.conf
 }
 
-sha512sums="aa23264c03aba01e573bb427f0f14d8b3c5f2cbdc7402ec763aa6da85d9c13d55cc4d596b2df3845c04c1f5784a13aa41bbe0449cbc44483c7cfc165b4c05292  deviceinfo
+sha512sums="352d7778a6ae6b19e10aed8506c074510c9b504f31bbd447f295c14a3baa7dd809b2d425ef2f20ff1be631a6d9e2189b0f10f8083c92f43808c523591c43cc8d  deviceinfo
 098187f6ab56d2542f98f1b5fbcf493431f665a4300db05e859357366e39b02a3d508bfd94c1d1bd7c669261e7ef0d4e1aef1fdbb15541fe34f3f48a6caa247f  initfs-hook.sh
 ffa8ba47539f0b4a931c560811d7842c7f5270631066c270322859c1ef77e63fba09a8462c2533bd6d095056b2c7936c2d4fc4e225f3cff45169f121bf93d8ed  90-android.rules
 61e8becbf6fa7c1c6c42e481083f5981ae7af33a48cbc53e817d8ac2c6a8e4f67a54b32ae3b8f5f25f7b412165a849dc93a629110dc47b0d16927bf2a12eb7e1  modules-load.conf"
diff --git a/heimdall/APKBUILD b/heimdall/APKBUILD
index dc0ce7d33..2995013e9 100644
--- a/heimdall/APKBUILD
+++ b/heimdall/APKBUILD
@@ -26,5 +26,5 @@ package() {
 }
 
 sha512sums="c554662f9ccb763a8e9867a0c563618879d2533af985d44db3c237d3ee51add44c1681d13b1a83b72b30ba6e5b32d7c2f9c02b31114c67c5fbe01cbb010acfe7  heimdall-1.4.2.tar.gz
-49573b44c0b6526ec3367d9e0c5fb727f01030f116aaaebe49ae05400923c04ffddd4a688bc15af981f8777ebb0e6b0a818b2b19b7c2917c3ac82a351a85ffa8  heimdall_flash_kernel.sh
+f2cae8ee8bd598ca7e2ca8ccb01318dc3b7b049f6177e41a1a3b82906de86cae4f789438d9ed319ec06fd957814d59ec8b5a0f0096630cad0f2ef89825d4fd1a  heimdall_flash_kernel.sh
 45e742bb3a8c8d0bc6806a4e9f860b04f255cad72a8602c04759178284c66e0a90d3ea22249b5fa69de1dd1d6ecd6221adaa63d611aa20d2a54aa20868e86a9f  heimdall_wait_for_device.sh"
diff --git a/heimdall/heimdall_flash_kernel.sh b/heimdall/heimdall_flash_kernel.sh
index d046ae8de..7c5799e15 100644
--- a/heimdall/heimdall_flash_kernel.sh
+++ b/heimdall/heimdall_flash_kernel.sh
@@ -23,18 +23,9 @@ for file in "$INITFS" "$KERNEL"; do
 	exit 1
 done
 
-echo "(1/2) Flash initramfs to the '$INITFS_PARTITION' partition (isorec-style)"
+echo "Flash initramfs to the '$INITFS_PARTITION' partition (isorec-style) and"
+echo "kernel to the '$KERNEL_PARTITION' partition"
 heimdall_wait_for_device.sh
 gunzip -c "$INITFS" | lzop > /tmp/initramfs.lzo
-heimdall flash --"$INITFS_PARTITION" /tmp/initramfs.lzo
+heimdall flash --"$INITFS_PARTITION" /tmp/initramfs.lzo --"$KERNEL_PARTITION" "$KERNEL"
 rm /tmp/initramfs.lzo
-
-# Sleeping is necessary here, because when directly connecting again, the
-# flashing of the kernel has always failed (at least on the i9100).
-echo "Sleeping for 20 seconds..."
-sleep 20
-
-echo "(2/2) Flash kernel to the '$KERNEL_PARTITION' partition"
-echo "NOTE: Press ^C if you only wanted to flash the initramfs."
-heimdall_wait_for_device.sh
-heimdall flash --"$KERNEL_PARTITION" "$KERNEL"