From 3efeeffc430a0d67211034e14132bf0a97f20f95 Mon Sep 17 00:00:00 2001
From: Michel Stempin <michel.stempin@wanadoo.fr>
Date: Tue, 13 Oct 2020 13:41:02 +0200
Subject: [PATCH] double boot and rootfs partitions

Signed-off-by: Michel Stempin <michel.stempin@wanadoo.fr>
---
 FunKey/board/funkey/boot.cmd     |  2 +-
 FunKey/board/funkey/boot_alt.cmd |  4 ++++
 FunKey/board/funkey/genimage.cfg | 35 ++++++++++++++++++++++++++++----
 3 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 FunKey/board/funkey/boot_alt.cmd

diff --git a/FunKey/board/funkey/boot.cmd b/FunKey/board/funkey/boot.cmd
index f9b1bc0..79e1bdd 100644
--- a/FunKey/board/funkey/boot.cmd
+++ b/FunKey/board/funkey/boot.cmd
@@ -1,4 +1,4 @@
-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
+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
 load mmc 0:1 0x41000000 uImage
 load mmc 0:1 0x41800000 sun8i-v3s-funkey.dtb
 bootm 0x41000000 - 0x41800000
diff --git a/FunKey/board/funkey/boot_alt.cmd b/FunKey/board/funkey/boot_alt.cmd
new file mode 100644
index 0000000..e7df9bf
--- /dev/null
+++ b/FunKey/board/funkey/boot_alt.cmd
@@ -0,0 +1,4 @@
+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
+load mmc 0:2 0x41000000 uImage
+load mmc 0:2 0x41800000 sun8i-v3s-funkey.dtb
+bootm 0x41000000 - 0x41800000
diff --git a/FunKey/board/funkey/genimage.cfg b/FunKey/board/funkey/genimage.cfg
index 511d7fa..20dd696 100644
--- a/FunKey/board/funkey/genimage.cfg
+++ b/FunKey/board/funkey/genimage.cfg
@@ -28,22 +28,49 @@ image sdcard.img {
 		size = 536K # 544KB - 8KB
 	}
 
-#	partition u-boot-env {
+#	partition u-boot-env0 {
 #		in-partition-table = "no"
 #		offset = 544K
 #		size = 128K
 #	}
 
-	partition boot {
+#	partition u-boot-env1 {
+#		in-partition-table = "no"
+#		offset = 672K
+#		size = 128K
+#	}
+
+#	partition gpt-table {
+#		in-partition-table = "no"
+#		offset = 800K
+#		size = 16K
+#	}
+
+	partition boot0 {
 		offset = 1M
 		partition-type = 0xC
 		bootable = "true"
 		image = "boot.vfat"
 	}
 
-	partition rootfs {
+	partition boot1 {
+		offset = 9M
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs0 {
+		offset = 17M
 		partition-type = 0x83
 		image = "rootfs.ext4"
-		size = 0
+		size = 111M
+	}
+
+	partition rootfs1 {
+		offset = 128M
+		partition-type = 0x83
+		image = "rootfs.ext4"
+		size = 128M
 	}
 }