From 32b078701fb5ffdb29d174834f9382f62b654d85 Mon Sep 17 00:00:00 2001
From: Michel Stempin <michel.stempin@wanadoo.fr>
Date: Wed, 14 Oct 2020 23:44:39 +0200
Subject: [PATCH] removed boot partitions

Signed-off-by: Michel Stempin <michel.stempin@wanadoo.fr>
---
 FunKey/board/funkey/genimage.cfg              | 22 +++++--------------
 .../funkey/rootfs-overlay/etc/u-boot.env      | 12 +++++-----
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/FunKey/board/funkey/genimage.cfg b/FunKey/board/funkey/genimage.cfg
index 5c54d1c..2a06001 100644
--- a/FunKey/board/funkey/genimage.cfg
+++ b/FunKey/board/funkey/genimage.cfg
@@ -35,34 +35,22 @@ image sdcard.img {
 #		size = 16K
 #	}
 
-	partition boot {
-		offset = 1M
-		partition-type = 0xC
-		size = 8M
-	}
-
-	partition boot_alt {
-		offset = 9M
-		partition-type = 0xC
-		size = 8M
-	}
-
 	partition rootfs {
-		offset = 17M
+		offset = 1M
 		partition-type = 0x83
 		image = "rootfs.ext4"
-		size = 111M
+		size = 100M
 	}
 
 	partition rootfs_alt {
-		offset = 128M
+		offset = 101M
 		partition-type = 0x83
 		image = "rootfs.ext4"
-		size = 128M
+		size = 100M
 	}
 
 #	partition share {
-#		offset = 256M
+#		offset = 201M
 #		partition-type = 0xC
 #		bootable = "false"
 #		size = 0
diff --git a/FunKey/board/funkey/rootfs-overlay/etc/u-boot.env b/FunKey/board/funkey/rootfs-overlay/etc/u-boot.env
index a825419..b26a333 100644
--- a/FunKey/board/funkey/rootfs-overlay/etc/u-boot.env
+++ b/FunKey/board/funkey/rootfs-overlay/etc/u-boot.env
@@ -1,8 +1,8 @@
-alt_args_mmc=setenv bootargs console=ttyS0,115200 panic=5 rootwait fbcon=map:10 fbcon=font:VGA8x8 vt.global_cursor_default=0 root=/dev/mmcblk0p4 rootfstype=ext4 rootflags=commit=120,data=writeback,barrier=0,journal_async_commit rw quiet
+alt_args_mmc=setenv bootargs console=ttyS0,115200 panic=5 rootwait fbcon=map:10 fbcon=font:VGA8x8 vt.global_cursor_default=0 root=/dev/mmcblk0p1 rootfstype=ext4 rootflags=commit=120,data=writeback,barrier=0,journal_async_commit rw quiet
 alt_bootcmd=run alt_args_mmc; run alt_loadfdt; run alt_loadimage; bootz ${loadaddr} - ${fdtaddr}
-alt_loadfdt=load mmc 0:4 ${fdtaddr} /boot/sun8i-v3s-funkey.dtb
-alt_loadimage=load mmc 0:4 ${loadaddr} /boot/zImage
-args_mmc=setenv bootargs console=ttyS0,115200 panic=5 rootwait fbcon=map:10 fbcon=font:VGA8x8 vt.global_cursor_default=0 root=/dev/mmcblk0p3 rootfstype=ext4 rootflags=commit=120,data=writeback,barrier=0,journal_async_commit rw quiet
+alt_loadfdt=load mmc 0:1 ${fdtaddr} /boot/sun8i-v3s-funkey.dtb
+alt_loadimage=load mmc 0:1 ${loadaddr} /boot/zImage
+args_mmc=setenv bootargs console=ttyS0,115200 panic=5 rootwait fbcon=map:10 fbcon=font:VGA8x8 vt.global_cursor_default=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootflags=commit=120,data=writeback,barrier=0,journal_async_commit rw quiet
 baudrate=115200
 bootcmd=run args_mmc; run loadfdt; run loadimage; bootz ${loadaddr} - ${fdtaddr}
 bootdelay=0
@@ -10,8 +10,8 @@ console=ttyS0,115200
 fdt_high=0xffffffff
 fdtaddr=0x41800000
 loadaddr=0x41000000
-loadfdt=load mmc 0:3 ${fdtaddr} /boot/sun8i-v3s-funkey.dtb
-loadimage=load mmc 0:3 ${loadaddr} /boot/zImage
+loadfdt=load mmc 0:2 ${fdtaddr} /boot/sun8i-v3s-funkey.dtb
+loadimage=load mmc 0:2 ${loadaddr} /boot/zImage
 stderr=serial@01c28000
 stdin=serial@01c28000
 stdout=serial@01c28000