From 3b0d4e179713631f61b8e7a782d163b9db1278c0 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Mon, 5 Oct 2015 17:22:28 +0200
Subject: [PATCH] meta-digi-arm: rework u-boot 2015.04 recipe

* Merge u-boot-dey-rev_2015.04.inc into the recipe. There is no need to
  split the recipe, as there is no other recipe using this u-boot code.

* Update uboot configurations to the new format '_defconfig'. Also add
  the new 2GB variant.

* Remove PREFERRED_VERSION_u-boot-dey for CC6, as there is only one
  version available for this platform.

https://jira.digi.com/browse/DEL-1829

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-arm/conf/machine/ccimx6sbc.conf     | 13 +++++-----
 .../conf/machine/include/digi-defaults.inc    |  1 -
 .../u-boot/u-boot-dey-rev_2015.04.inc         | 12 ---------
 .../recipes-bsp/u-boot/u-boot-dey_2015.04.bb  | 26 ++++++++++++++-----
 4 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2015.04.inc

diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf
index 5af984588..bcaf05f20 100644
--- a/meta-digi-arm/conf/machine/ccimx6sbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf
@@ -7,12 +7,13 @@ include conf/machine/include/ccimx6.inc
 
 # U-Boot configurations
 # Last one is the default (the one the symlinks point at)
-UBOOT_CONFIG ??= "ccimx6dlsbc256MB ccimx6dlsbc512MB ccimx6dlsbc ccimx6qsbc512MB ccimx6qsbc"
-UBOOT_CONFIG[ccimx6dlsbc256MB] = "ccimx6dlsbc256MB_config"
-UBOOT_CONFIG[ccimx6dlsbc512MB] = "ccimx6dlsbc512MB_config"
-UBOOT_CONFIG[ccimx6dlsbc] = "ccimx6dlsbc_config"
-UBOOT_CONFIG[ccimx6qsbc512MB] = "ccimx6qsbc512MB_config"
-UBOOT_CONFIG[ccimx6qsbc] = "ccimx6qsbc_config"
+UBOOT_CONFIG ??= "ccimx6dlsbc256MB ccimx6dlsbc512MB ccimx6dlsbc ccimx6qsbc2GB ccimx6qsbc512MB ccimx6qsbc"
+UBOOT_CONFIG[ccimx6dlsbc256MB] = "ccimx6dlsbc256MB_defconfig"
+UBOOT_CONFIG[ccimx6dlsbc512MB] = "ccimx6dlsbc512MB_defconfig"
+UBOOT_CONFIG[ccimx6dlsbc] = "ccimx6dlsbc_defconfig"
+UBOOT_CONFIG[ccimx6qsbc2GB] = "ccimx6qsbc2GB_defconfig"
+UBOOT_CONFIG[ccimx6qsbc512MB] = "ccimx6qsbc512MB_defconfig"
+UBOOT_CONFIG[ccimx6qsbc] = "ccimx6qsbc_defconfig"
 
 KERNEL_DEVICETREE ?= " \
     imx6dl-ccimx6sbc.dtb \
diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index 772b12dda..586766895 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -20,7 +20,6 @@ PREFERRED_VERSION_linux-dey_ccimx5 ?= "2.6.35.14"
 PREFERRED_VERSION_linux-dey_ccimx6 ?= "3.14"
 PREFERRED_VERSION_u-boot-dey ?= "2013.01"
 PREFERRED_VERSION_u-boot-dey_ccimx5 ?= "2009.08"
-PREFERRED_VERSION_u-boot-dey_ccimx6 ?= "2015.04"
 
 # Help variables used in recipes
 HAVE_WIFI    = "${@base_contains('MACHINE_FEATURES', 'wifi', '1', '', d)}"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2015.04.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2015.04.inc
deleted file mode 100644
index ce769c592..000000000
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2015.04.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (C) 2015 Digi International
-
-# Internal repo branch
-SRCBRANCH = "v2015.04/master"
-
-SRCREV_external = ""
-SRCREV_internal = "${AUTOREV}"
-SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
-
-SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git;nobranch=1"
-SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git;branch=${SRCBRANCH}"
-SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
index a3822eb95..59fa0e82c 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
@@ -1,19 +1,31 @@
 # Copyright (C) 2012-2015 Digi International
 
-DESCRIPTION = "Bootloader for Digi platforms"
 require recipes-bsp/u-boot/u-boot.inc
-include u-boot-dey-rev_${PV}.inc
 
-inherit fsl-u-boot-localversion
+DESCRIPTION = "Bootloader for Digi platforms"
+
+DEPENDS += "dtc-native u-boot-mkimage-native"
 
 PROVIDES += "u-boot"
 
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
+# Internal repo branch
+SRCBRANCH = "v2015.04/master"
 
-SRC_URI += "file://boot.txt"
+SRCREV_external = ""
+SRCREV_internal = "${AUTOREV}"
+SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
-DEPENDS += "u-boot-mkimage-native"
+SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git;nobranch=1"
+SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git;branch=${SRCBRANCH}"
+SRC_URI = " \
+    ${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)} \
+    file://boot.txt \
+"
+
+LOCALVERSION ?= ""
+inherit fsl-u-boot-localversion
+
+EXTRA_OEMAKE_append = " KCFLAGS=-fgnu89-inline"
 
 do_deploy_append() {
 	mkimage -T script -n bootscript -C none -d ${WORKDIR}/boot.txt ${DEPLOYDIR}/boot.scr