emmc entirely on mmcblk0

3 files changed, 5 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f193f89824c..976c13c663e1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-bpir64-git
 	pkgver = 6.2.6.bpir
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.kernel.org/
 	arch = aarch64
 	license = GPL2
diff --git a/PKGBUILD b/PKGBUILD
index 65889d6c0e62..e55353a70252 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ _r3dts="https://github.com/torvalds/linux/raw/master/arch/arm64/boot/dts/mediate
 _r3dtsi="https://github.com/torvalds/linux/raw/master/arch/arm64/boot/dts/mediatek/mt7986a.dtsi"
 #_lto="true"  # Uncomment this line to enable CLANG-LTO
 pkgver=6.2.6.bpir
-pkgrel=1
+pkgrel=2
 arch=('aarch64')
 url="http://www.kernel.org/"
 license=('GPL2')
diff --git a/bpir3-flash2emmc b/bpir3-flash2emmc
index 8ae71573abf1..973fa331ded1 100755
--- a/bpir3-flash2emmc
+++ b/bpir3-flash2emmc
@@ -16,20 +16,14 @@ while [ ! -e /sys/block/mmcblk0boot0 ]; do
   echo 11230000.mmc >/sys/bus/platform/drivers/mtk-msdc/unbind
   sleep 0.1
   echo 11230000.mmc >/sys/bus/platform/drivers/mtk-msdc/bind
-  echo "Flip SD/EMMC switch now (most near to power plug)!"
+  echo "Flip SD/EMMC switch down (most near to power plug), the rest stay up!"
   sleep 1.9
 done
 
-echo "Setting up EMMC so that mmcblk0boot0 is the bootdevice."
-mmc bootpart enable 1 1 /dev/mmcblk0
+echo "Setting up EMMC so that mmcblk0 is the bootdevice."
+mmc bootpart enable 7 1 /dev/mmcblk0
 echo "Writing $1 to EMMC now..."
 xz -dcv "/tmp/tempfile" | dd of=/dev/mmcblk0 conv=fsync,notrunc
 
-echo "Copying atf partition to mmcblk0boot0"
-echo 0 >/sys/block/mmcblk0boot0/force_ro
-dd if=/dev/mmcblk0 of=/dev/mmcblk0boot0 bs=512 skip=34 count=1024 conv=fsync,notrunc
-echo 1 >/sys/block/mmcblk0boot0/force_ro
-
-echo "Flip other switch now (most far away from power plug)!"
 echo "Reboot and enjoy booting from EMMC."