From 93d275a43dc0d4ebb2fe204bb02a194c6bac4899 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Fri, 2 Aug 2013 14:45:16 +0200
Subject: [PATCH] meta-digi-arm: fix u-boot broken build

The build was failing for any IMX platform because it was trying to
build a bootstream u-boot.

The u-boot variables (UBOOT_*) used by yocto were incorrectly set,
so I reworked and simplified them to fix the bug and ease maintenance.

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

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-arm/conf/machine/cpx2.conf              |  9 ---------
 meta-digi-arm/conf/machine/include/ccardimx28.inc | 10 +++-------
 .../conf/machine/include/digi-defaults.inc        |  9 +++++++++
 .../conf/machine/include/imx-digi-base.inc        | 15 ---------------
 meta-digi-arm/conf/machine/wr21.conf              | 10 ----------
 .../recipes-bsp/u-boot/u-boot-dey_2009.08.bb      |  7 ++-----
 .../recipes-bsp/u-boot/u-boot-dey_2013.01.bb      |  6 +-----
 7 files changed, 15 insertions(+), 51 deletions(-)

diff --git a/meta-digi-arm/conf/machine/cpx2.conf b/meta-digi-arm/conf/machine/cpx2.conf
index 8a481b085..3d0fc326d 100644
--- a/meta-digi-arm/conf/machine/cpx2.conf
+++ b/meta-digi-arm/conf/machine/cpx2.conf
@@ -9,15 +9,6 @@ SOC_FAMILY = "mxs"
 UBOOT_ENTRYPOINT  = "0x41008000"
 UBOOT_LOADADDRESS = "0x41008000"
 
-# Set UBOOT_CONFIG_VARIANT in local.conf accordingly, default is empty: 261MHz,360MHz,test,dbg
-UBOOT_CONFIG_VARIANT ?= ""
-UBOOT_MACHINE = '${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "_", "_${UBOOT_CONFIG_VARIANT}_", d )}config'
-UBOOT_MAKE_TARGET = "u-boot-ivt.sb"
-UBOOT_SUFFIX = "sb"
-UBOOT_IMAGE = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}ivt-${PV}-${PR}.${UBOOT_SUFFIX}'
-UBOOT_BINARY = "u-boot-ivt.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}ivt.${UBOOT_SUFFIX}'
-
 SERIAL_CONSOLE = "115200 ttyAM0"
 
 # wpa_supplicant driver to use in '/etc/network/interfaces'
diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc
index de957473e..340b39647 100644
--- a/meta-digi-arm/conf/machine/include/ccardimx28.inc
+++ b/meta-digi-arm/conf/machine/include/ccardimx28.inc
@@ -9,10 +9,6 @@ SOC_FAMILY = "mxs"
 UBOOT_ENTRYPOINT  = "0x41008000"
 UBOOT_LOADADDRESS = "0x41008000"
 
-# Set UBOOT_CONFIG_VARIANT in local.conf accordingly, default is empty: 261MHz,360MHz,test,dbg
-UBOOT_CONFIG_VARIANT ?= ""
-UBOOT_MACHINE = '${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "_", "_${UBOOT_CONFIG_VARIANT}_", d )}config'
-
 # wpa_supplicant driver to use in '/etc/network/interfaces'
 WPA_DRIVER = "nl80211"
 
@@ -44,6 +40,6 @@ MACHINE_FEATURES_append_wb = " wifi bluetooth"
 MACHINE_FEATURES_append_web = " wifi ext-eth bluetooth"
 MACHINE_FEATURES_append_web1 = " wifi ext-eth bluetooth 1-wire"
 
-# Variants for different CPU speed
-#UBOOT_CONFIG_VARIANT = "261MHz"
-#UBOOT_CONFIG_VARIANT = "360MHz"
+# UBOOT_CONFIG_VARIANT for different CPU speed (default is empty)
+#UBOOT_CONFIG_VARIANT ?= "261MHz"
+#UBOOT_CONFIG_VARIANT ?= "360MHz"
diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index 92a0c932f..2771e7a41 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -19,3 +19,12 @@ USE_VT = "0"
 # Add the machine variant to the valid machine override
 MACHINEOVERRIDES =. "${@['', '${MACHINE_VARIANT}:']['${MACHINE_VARIANT}' != '']}"
 MACHINE_VARIANT ?= ""
+
+# U-Boot settings
+UBOOT_BSTR           ??= ""
+UBOOT_CONFIG_VARIANT ??= ""
+UBOOT_BINARY          ?= "u-boot${UBOOT_BSTR}.${UBOOT_SUFFIX}"
+UBOOT_IMAGE           ?= 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "", "_${UBOOT_CONFIG_VARIANT}", d )}${UBOOT_BSTR}-${PV}-${PR}.${UBOOT_SUFFIX}'
+UBOOT_MACHINE         ?= '${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "", "_${UBOOT_CONFIG_VARIANT}", d )}_config'
+UBOOT_MAKE_TARGET     ?= "${UBOOT_BINARY}"
+UBOOT_SYMLINK         ?= 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "", "_${UBOOT_CONFIG_VARIANT}", d )}${UBOOT_BSTR}.${UBOOT_SUFFIX}'
diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
index 4ffbd1f71..4a4e093a2 100644
--- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
@@ -6,21 +6,6 @@ include conf/machine/include/tune-cortexa8.inc
 # Disable perf features as 2.6.35.3 fail to build otherwise
 PERF_FEATURES_ENABLE = ""
 
-UBOOT_MAKE_TARGET = "u-boot.bin"
-UBOOT_SUFFIX = "bin"
-UBOOT_PADDING = "2"
-
-# Set UBOOT_CONFIG_VARIANT in local.conf accordingly, default is empty:
-# MX5X: 128sdram,ext_eth,128sdram_test,128sdram_dbg,test,dbg,test_dbg,db_pp,db_pa,db_rp,db_ra
-# MX51: EAK
-# MX53: 4Kpage
-
-UBOOT_CONFIG_VARIANT ?= ""
-
-UBOOT_MACHINE = '${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "_", "_${UBOOT_CONFIG_VARIANT}_", d )}config'
-UBOOT_IMAGE = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "_${UBOOT_CONFIG_VARIANT}-", d )}${PV}-${PR}.${UBOOT_SUFFIX}'
-UBOOT_SYMLINK = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "", "_${UBOOT_CONFIG_VARIANT}", d )}.${UBOOT_SUFFIX}'
-
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-video-imxfb"
diff --git a/meta-digi-arm/conf/machine/wr21.conf b/meta-digi-arm/conf/machine/wr21.conf
index c8a4415f4..b082df79c 100644
--- a/meta-digi-arm/conf/machine/wr21.conf
+++ b/meta-digi-arm/conf/machine/wr21.conf
@@ -9,14 +9,4 @@ SOC_FAMILY = "mxs"
 UBOOT_ENTRYPOINT  = "0x41008000"
 UBOOT_LOADADDRESS = "0x41008000"
 
-# Set UBOOT_CONFIG_VARIANT in local.conf accordingly, default is empty: 261MHz,360MHz,test,dbg
-UBOOT_CONFIG_VARIANT ?= ""
-UBOOT_MACHINE = '${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "_", "_${UBOOT_CONFIG_VARIANT}_", d )}config'
-UBOOT_MAKE_TARGET = "u-boot-ivt.sb"
-UBOOT_SUFFIX = "sb"
-UBOOT_IMAGE = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}ivt-${PV}-${PR}.${UBOOT_SUFFIX}'
-UBOOT_BINARY = "u-boot-ivt.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}ivt.${UBOOT_SUFFIX}'
-
 SERIAL_CONSOLE = "115200 ttySP1"
-
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb
index 15ebee819..2051ec841 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb
@@ -13,11 +13,8 @@ PR = "r0"
 
 S = "${WORKDIR}/git"
 
-UBOOT_MAKE_TARGET = "u-boot-ivt.sb"
-UBOOT_SUFFIX = "sb"
-UBOOT_IMAGE = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}ivt-${PV}-${PR}.${UBOOT_SUFFIX}'
-UBOOT_BINARY = "u-boot-ivt.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}ivt.${UBOOT_SUFFIX}'
+UBOOT_BSTR_mxs   = "-ivt"
+UBOOT_SUFFIX_mxs = "sb"
 
 DEPENDS_mxs += "elftosb-native imx-bootlets-dey"
 
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.01.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.01.bb
index cc85b5d9f..7f3e91675 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.01.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.01.bb
@@ -13,11 +13,7 @@ PR = "r0"
 
 S = "${WORKDIR}/git"
 
-UBOOT_MAKE_TARGET = "u-boot.sb"
-UBOOT_SUFFIX = "sb"
-UBOOT_IMAGE = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}${PV}-${PR}.${UBOOT_SUFFIX}'
-UBOOT_BINARY = "u-boot.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = 'u-boot-${MACHINE}.${UBOOT_SUFFIX}'
+UBOOT_SUFFIX_mxs = "sb"
 
 DEPENDS_mxs += "elftosb-native"