From a7f37954b9705cff8b5db656dca8683940c360e9 Mon Sep 17 00:00:00 2001
From: Kenneth Johansson <kenneth@southpole.se>
Date: Mon, 17 Dec 2018 19:16:31 +0100
Subject: [PATCH] uboot intel: fix u-boot inteno version.

    On intel it is not possible to grep for the compiled in version string
    so another one was created and put in SPL. but missed the " so it's not
    correct json anymore.

    that combined with the fact that board_late_init() was never called due
    to missing define in config made the update logic fail.

Change the PKG_RELEASE to 7 as a previous bug in the Makefile made it
actually 6 even if the value was set to 5.
---
 uboot/Makefile               | 6 +++---
 uboot/files/etc/init.d/uboot | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/uboot/Makefile b/uboot/Makefile
index 69b73639e..ab6e8f7f1 100644
--- a/uboot/Makefile
+++ b/uboot/Makefile
@@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git
 
 ifdef CONFIG_TARGET_intel_mips
 PKG_SOURCE_URL:=git@dev.iopsys.eu:intel/uboot.git
-PKG_SOURCE_VERSION:=b3bc3af5831f14d9cd4d983522bc45a1fd9fa26c
+PKG_SOURCE_VERSION:=30fbffbb9725013e01b4c1ea2d58c0a4f78ebab6
 else
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/uboot.git
 PKG_SOURCE_VERSION:=3ef2ba866a99205496e0ce01935c89a1778d9b85
@@ -59,14 +59,14 @@ define uboot/grx500
   TITLE:=U-Boot for the grx
   UBOOT_IMG:=u-boot-nand.bin
   DEPENDS:=@TARGET_intel_mips
-  PKG_RELEASE:=5
+  PKG_RELEASE:=7
 endef
 
 define uboot/grx500_speedport_smart3
   TITLE:=U-Boot for the Speedport Smart3
   UBOOT_IMG:=u-boot-nand.bin
   DEPENDS:=@TARGET_intel_mips
-  PKG_RELEASE:=5
+  PKG_RELEASE:=7
 endef
 
 UBOOTS := \
diff --git a/uboot/files/etc/init.d/uboot b/uboot/files/etc/init.d/uboot
index 65077a70c..c50799cc9 100755
--- a/uboot/files/etc/init.d/uboot
+++ b/uboot/files/etc/init.d/uboot
@@ -40,6 +40,10 @@ uboot_upgrade(){
 start() {
     iver=$(fw_printenv -n uboot_inteno_version 2>/dev/null)
 
+    # Fixup improper json string for major and minor key.
+    # this adds the missing "
+    iver=$(echo $iver | sed -e 's/{Major:/{"Major":/' | sed -e 's/,Minor:/,"Minor":/')
+    
     if [ -z "$iver" ]
     then
 	# if this variable is not set by u-boot the u-boot version is too old.