From 27c615de5a9c4029259c4c0fe90363f97103f3c9 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 14 Mar 2017 13:29:15 -0500
Subject: Allow u-boot to be reflashed by itsef.

---
 recipes-core/initscripts/initscripts-1.0/umountfs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'recipes-core')

diff --git a/recipes-core/initscripts/initscripts-1.0/umountfs b/recipes-core/initscripts/initscripts-1.0/umountfs
index 3403cca..8c12ebe 100644
--- a/recipes-core/initscripts/initscripts-1.0/umountfs
+++ b/recipes-core/initscripts/initscripts-1.0/umountfs
@@ -61,6 +61,7 @@ flash_upgrade() {
   local upgrade_file=${flash_dir}/upgrade.bin
   local kernel_solo_file=${flash_dir}/uImage.bin
   local rootfs_solo_file=${flash_dir}/rootfs.jffs2
+  local uboot_solo_file=${flash_dir}/u-boot.bin
 
   local reboot_cmd=/usr/sbin/upgrade-reboot
   local nandwrite_cmd=/usr/bin/nandwrite.static
@@ -179,7 +180,7 @@ flash_upgrade() {
   echo ""
   if [ -f "${upgrade_file}" ]; then
     echo "Starting flash upgrade from ${upgrade_file}..."
-  elif [ -f "${kernel_solo_file}" ] || [ -f "${rootfs_solo_file}" ]; then
+  elif [ -f "${kernel_solo_file}" ] || [ -f "${rootfs_solo_file}" ] || [ -f "${uboot_solo_file}" ] ; then
     echo "Starting flash upgrade from ${flash_dir}..."
   else
     return
@@ -217,6 +218,15 @@ flash_upgrade() {
       fi
     done
   else
+    if [ -f ${uboot_solo_file} ]; then
+      echo "Flashing ${uboot_mtd} (u-boot) with ${uboot_solo_file}..."
+
+      flash_erase ${uboot_mtd} 0 0
+      ${flash_dir}/nandwrite.static -p ${uboot_mtd} ${uboot_solo_file}
+    else
+      echo "u-boot file ${uboot_solo_file} not found"
+    fi
+
     if [ -f ${kernel_solo_file} ]; then
       echo "Flashing ${kernel_mtd} (uImage) with ${kernel_solo_file}..."
 
-- 
cgit v1.2.3


From 2f1108eceed0c91eac381d062fc2a55ec00d5c64 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 4 Apr 2017 16:31:09 -0500
Subject: bump level on initscripts

---
 recipes-core/initscripts/initscripts_1.0.bbappend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'recipes-core')

diff --git a/recipes-core/initscripts/initscripts_1.0.bbappend b/recipes-core/initscripts/initscripts_1.0.bbappend
index 600060e..b23b771 100644
--- a/recipes-core/initscripts/initscripts_1.0.bbappend
+++ b/recipes-core/initscripts/initscripts_1.0.bbappend
@@ -3,4 +3,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
 # flash on reboot/umountfs needs regular umount (not busybox)
 RDEPENDS_${PN} += "util-linux-umount util-linux-mount bash"
 
-PR .= ".2"
+PR .= ".3"
-- 
cgit v1.2.3