From b5d7aaa6acec114fb1a09847f44e6c25b2c5a101 Mon Sep 17 00:00:00 2001
From: Michel Stempin <michel.stempin@wanadoo.fr>
Date: Wed, 14 Oct 2020 23:34:04 +0200
Subject: [PATCH] moved kernel and dtb to rootfs

Signed-off-by: Michel Stempin <michel.stempin@wanadoo.fr>
---
 FunKey/board/funkey/genimage.cfg              | 26 ++-----------------
 .../funkey/rootfs-overlay/etc/u-boot.env      |  8 +++---
 FunKey/configs/funkey_defconfig               |  1 +
 3 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/FunKey/board/funkey/genimage.cfg b/FunKey/board/funkey/genimage.cfg
index 3e98825..5c54d1c 100644
--- a/FunKey/board/funkey/genimage.cfg
+++ b/FunKey/board/funkey/genimage.cfg
@@ -1,23 +1,3 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"sun8i-v3s-funkey.dtb",
-		}
-	}
-	size = 8M
-}
-
-image boot_alt.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"sun8i-v3s-funkey.dtb",
-		}
-	}
-	size = 8M
-}
-
 image sdcard.img {
 	hdimage {
 		gpt = true
@@ -58,15 +38,13 @@ image sdcard.img {
 	partition boot {
 		offset = 1M
 		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
+		size = 8M
 	}
 
 	partition boot_alt {
 		offset = 9M
 		partition-type = 0xC
-		bootable = "true"
-		image = "boot_alt.vfat"
+		size = 8M
 	}
 
 	partition rootfs {
diff --git a/FunKey/board/funkey/rootfs-overlay/etc/u-boot.env b/FunKey/board/funkey/rootfs-overlay/etc/u-boot.env
index c19fec5..a825419 100644
--- a/FunKey/board/funkey/rootfs-overlay/etc/u-boot.env
+++ b/FunKey/board/funkey/rootfs-overlay/etc/u-boot.env
@@ -1,7 +1,7 @@
 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_bootcmd=run alt_args_mmc; run alt_loadfdt; run alt_loadimage; bootz ${loadaddr} - ${fdtaddr}
-alt_loadfdt=load mmc 0:2 ${fdtaddr} sun8i-v3s-funkey.dtb
-alt_loadimage=load mmc 0:2 ${loadaddr} zImage
+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
 baudrate=115200
 bootcmd=run args_mmc; run loadfdt; run loadimage; bootz ${loadaddr} - ${fdtaddr}
@@ -10,8 +10,8 @@ console=ttyS0,115200
 fdt_high=0xffffffff
 fdtaddr=0x41800000
 loadaddr=0x41000000
-loadfdt=load mmc 0:1 ${fdtaddr} sun8i-v3s-funkey.dtb
-loadimage=load mmc 0:1 ${loadaddr} zImage
+loadfdt=load mmc 0:3 ${fdtaddr} /boot/sun8i-v3s-funkey.dtb
+loadimage=load mmc 0:3 ${loadaddr} /boot/zImage
 stderr=serial@01c28000
 stdin=serial@01c28000
 stdout=serial@01c28000
diff --git a/FunKey/configs/funkey_defconfig b/FunKey/configs/funkey_defconfig
index 522bdcd..59078e8 100644
--- a/FunKey/configs/funkey_defconfig
+++ b/FunKey/configs/funkey_defconfig
@@ -25,6 +25,7 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/li
 BR2_LINUX_KERNEL_LZO=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-v3s-funkey"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_ALSA_UTILS=y