Merge pull request #1 from advancedtelematic/feat/ostuboot

Add u-boot environment for OSTree

4 files changed, 68 insertions, 1 deletions

diff --git a/meta-sota-minnowboard/recipes-bsp/bootfiles/files/uEnv-ota.txt b/meta-sota-minnowboard/recipes-bsp/bootfiles/files/uEnv-ota.txt
new file mode 100644
index 0000000..2b0f293
--- /dev/null
+++ b/meta-sota-minnowboard/recipes-bsp/bootfiles/files/uEnv-ota.txt
@@ -0,0 +1,17 @@
+bootkaddr=0x01000000
+bootiaddr=0x04000000
+
+bootargs_console=console=ttyS0,115200
+bootargs_extra=rw rootfstype=ext4 rootwait rootdelay=2
+
+bootargs_root=ostree_root=/dev/mmcblk0p2 root=/dev/ram0 ramdisk_size=16384
+
+bootmmc=1:2
+
+booteload_sd=ext4load mmc ${bootmmc} ${bootkaddr} boot/loader/uEnv.txt; env import -t ${bootkaddr} ${filesize}
+
+bootkload_sd=ext4load mmc ${bootmmc} ${bootkaddr} boot/${kernel_image}
+bootiload_sd=ext4load mmc ${bootmmc} ${bootiaddr} boot/${ramdisk_image}
+
+bootcmd=run booteload_sd; setenv bootargs ${bootargs} ${bootargs_console} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; run bootiload_sd; zboot ${bootkaddr} - ${bootiaddr} ${filesize}
+
diff --git a/meta-sota-minnowboard/recipes-bsp/bootfiles/minnowboard-bootfiles.bb b/meta-sota-minnowboard/recipes-bsp/bootfiles/minnowboard-bootfiles.bb
new file mode 100644
index 0000000..74d1f18
--- /dev/null
+++ b/meta-sota-minnowboard/recipes-bsp/bootfiles/minnowboard-bootfiles.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Boot files (bootscripts etc.) for Minnowboard Max/Turbot"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit deploy
+
+COMPATIBLE_MACHINE = "intel-corei7-64"
+
+S = "${WORKDIR}"
+
+SRC_URI_append_sota = "file://uEnv-ota.txt"
+
+do_deploy() {
+    install -d ${DEPLOYDIR}/${PN}
+}
+
+do_deploy_append_sota() {
+    install -m 0755 ${WORKDIR}/uEnv-ota.txt ${DEPLOYDIR}/${PN}/uEnv.txt
+}
+
+addtask deploy before do_package after do_install
+do_deploy[dirs] += "${DEPLOYDIR}/${PN}"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
diff --git a/meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota/0001-Load-environment-from-the-boot-partition.patch b/meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota/0001-Load-environment-from-the-boot-partition.patch
new file mode 100644
index 0000000..02d0e4c
--- /dev/null
+++ b/meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota/0001-Load-environment-from-the-boot-partition.patch
@@ -0,0 +1,24 @@
+From 0161adf28590d95eaf234acc97156bc7dd989c8c Mon Sep 17 00:00:00 2001
+From: Anton Gerasimov <anton@advancedtelematic.com>
+Date: Wed, 28 Dec 2016 16:53:35 +0100
+Subject: [PATCH] Load environment from the boot partition
+
+---
+ include/configs/minnowmax.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
+index 3aa22d2..02f6980 100644
+--- a/include/configs/minnowmax.h
++++ b/include/configs/minnowmax.h
+@@ -41,4 +41,7 @@
+ #define CONFIG_ENV_SECT_SIZE           0x1000
+ #define CONFIG_ENV_OFFSET              0x006ef000
+ 
++#undef CONFIG_BOOTCOMMAND
++#define CONFIG_BOOTCOMMAND "fatload mmc 1:1 0x01000000 uEnv.txt; env import -t 0x01000000 ${filesize}; run bootcmd"
++
+ #endif /* __CONFIG_H */
+-- 
+2.9.3
+
diff --git a/meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota_2016.11.bb b/meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota_2016.11.bb
index fe60489..c0603f0 100644
--- a/meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota_2016.11.bb
+++ b/meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota_2016.11.bb
@@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
 # repo during parse
 SRCREV = "29e0cfb4f77f7aa369136302cee14a91e22dca71"
 
-SRC_URI += "file://0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch \
+SRC_URI += "file://0001-Load-environment-from-the-boot-partition.patch \
+            file://0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch \
             http://firmware.intel.com/sites/default/files/MinnowBoard.MAX_.X64.92.R01.zip \
             "