From ff7b0dfbc38b609b2018a4481deb86dd5e98769f Mon Sep 17 00:00:00 2001
From: Dalon Westergreen <dalon.westergreen@intel.com>
Date: Fri, 20 Jan 2017 15:39:43 -0800
Subject: add support to generate uboot environment images

create uboot environment images to populate the sdcard
images.  This allows non-default uboot environments to be
used without the need for changing / patching uboot

Initially add de0-nano-soc environment
---
 classes/sdcard_image-socfpga.bbclass          | 3 ++-
 recipes-bsp/u-boot/u-boot-socfpga-env.inc     | 7 ++++---
 recipes-bsp/u-boot/u-boot-socfpga_v2016.11.bb | 7 +++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/classes/sdcard_image-socfpga.bbclass b/classes/sdcard_image-socfpga.bbclass
index 8ac12b1..672ea6d 100644
--- a/classes/sdcard_image-socfpga.bbclass
+++ b/classes/sdcard_image-socfpga.bbclass
@@ -26,6 +26,7 @@ FAT_SPACE ?= "102400"
 
 # uBoot ENV offset
 SDIMG_UBOOT_ENV_OFFSET ?= "512"
+ENV_BASE_NAME ??= "${UBOOT_CONFIG}" 
 
 # Boot partition begin at sector 1024
 # This is required as for c5/a5 mainline uboot hard codes the location
@@ -173,7 +174,7 @@ IMAGE_CMD_socfpga-sdimg () {
 	fi
 	
 	if [ -e "${DEPLOY_DIR_IMAGE}/u-boot-env-${ENV_BASE_NAME}.bin" ]; then 
-		dd if=${DEPLOY_DIR_IMAGE}/u-boot-env-${ENV_BASE_NAME}.bin of=${SDIMG} bs=1 seek=${SDIMG_UBOOT_ENV_OFFSET}
+		dd if=${DEPLOY_DIR_IMAGE}/u-boot-env-${ENV_BASE_NAME}.bin of=${SDIMG} conv=notrunc bs=1 seek=${SDIMG_UBOOT_ENV_OFFSET} && sync && sync
 	fi
 	
 }
diff --git a/recipes-bsp/u-boot/u-boot-socfpga-env.inc b/recipes-bsp/u-boot/u-boot-socfpga-env.inc
index 55621b9..1798d27 100644
--- a/recipes-bsp/u-boot/u-boot-socfpga-env.inc
+++ b/recipes-bsp/u-boot/u-boot-socfpga-env.inc
@@ -10,13 +10,14 @@ ENV_BASE_NAME ??= "${UBOOT_CONFIG}"
 ENV_BASE_FILE = "${WORKDIR}/${ENV_BASE_NAME}.env"
 
 do_environment_mkimage() {
-	if  [ -e ${WORKDIR}/${PV}/${ENV_BASE_NAME}.env ]; then
-		mkenvimage -s ${ENV_SIZE} -o ${WORKDIR}/${ENV_BASE_NAME}.bin ${WORKDIR}/${PV}/${ENV_BASE_NAME}.env
+	if  [ -e "${WORKDIR}/${ENV_BASE_NAME}.env" ]; then
+		mkenvimage -s ${ENV_SIZE} -o ${WORKDIR}/${ENV_BASE_NAME}.bin ${WORKDIR}/${ENV_BASE_NAME}.env
 	fi
 }
 
 do_deploy_append() {
-    if [ -e ${WORKDIR}/${ENV_BASE_NAME}.bin]; then
+
+    if [ -e "${WORKDIR}/${ENV_BASE_NAME}.bin" ]; then
 	install -d ${DEPLOYDIR}
     	install -m 644 ${WORKDIR}/${ENV_BASE_NAME}.bin ${DEPLOYDIR}/u-boot-env-${ENV_BASE_NAME}.bin
     fi
diff --git a/recipes-bsp/u-boot/u-boot-socfpga_v2016.11.bb b/recipes-bsp/u-boot/u-boot-socfpga_v2016.11.bb
index 356f88a..8dd0fc5 100644
--- a/recipes-bsp/u-boot/u-boot-socfpga_v2016.11.bb
+++ b/recipes-bsp/u-boot/u-boot-socfpga_v2016.11.bb
@@ -2,14 +2,17 @@ require u-boot-socfpga-common.inc
 require u-boot-socfpga-env.inc
 require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
 
+FILESEXTRAPATHS =. "files/v2016.11:"
+
 # This revision corresponds to the tag "v2016.11"
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse 
 SRCREV = "29e0cfb4f77f7aa369136302cee14a91e22dca71"
 
+PR = "r1"
+
 SRC_URI_append = "\
-	file://v2016.11/de0-nano-soc.env \
+	file://de0-nano-soc.env \
 	"
-PR = "r1"
 
 DEPENDS += "dtc-native"
-- 
cgit v1.2.3-54-g00ecf