From ecea3012e6462a73b0edc4b5a701e95b5a9fc6a5 Mon Sep 17 00:00:00 2001
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Thu, 17 Jan 2013 14:18:26 +0100
Subject: [PATCH] meta-digi-arm: Add support to compile u-boot variants.

U-Boot has a set of pre-defined make targets per platform that allow
to configure u-boot for different variants (128sdram,4Kpage,dbg etc.)

This change allows to use a UBOOT_CONFIG_VARIANT variable in your
local.conf file to choose which variant to build.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
 meta-digi-arm/conf/machine/ccardxmx28js.conf         |  9 ++++++---
 meta-digi-arm/conf/machine/ccxmx51js.conf            |  2 --
 meta-digi-arm/conf/machine/ccxmx53js.conf            |  2 --
 meta-digi-arm/conf/machine/include/imx-digi-base.inc | 11 +++++++++++
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/meta-digi-arm/conf/machine/ccardxmx28js.conf b/meta-digi-arm/conf/machine/ccardxmx28js.conf
index 378cb8998..4151f9678 100644
--- a/meta-digi-arm/conf/machine/ccardxmx28js.conf
+++ b/meta-digi-arm/conf/machine/ccardxmx28js.conf
@@ -6,12 +6,15 @@ include conf/machine/include/mxs-digi-base.inc
 
 UBOOT_ENTRYPOINT = "0x41008000"
 UBOOT_LOADADDRESS = "0x41008000"
-UBOOT_MACHINE = "ccardxmx28js_config"
+
+# 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}-ivt-${PV}-${PR}.${UBOOT_SUFFIX}"
+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}-ivt.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}ivt.${UBOOT_SUFFIX}'
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/meta-digi-arm/conf/machine/ccxmx51js.conf b/meta-digi-arm/conf/machine/ccxmx51js.conf
index 5c71455c1..743c2af2a 100644
--- a/meta-digi-arm/conf/machine/ccxmx51js.conf
+++ b/meta-digi-arm/conf/machine/ccxmx51js.conf
@@ -10,8 +10,6 @@ SOC_FAMILY = "mx51:mx5"
 # Digi's kernel does not use device trees.
 # KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/ccxmx51js.dts"
 
-UBOOT_MACHINE = "ccxmx51js_config"
-
 MACHINE_FEATURES += " wifi accel-video"
 
 UBOOT_ENTRYPOINT_mx51  = "0x94000000"
diff --git a/meta-digi-arm/conf/machine/ccxmx53js.conf b/meta-digi-arm/conf/machine/ccxmx53js.conf
index fd5c8e496..e97255ea5 100644
--- a/meta-digi-arm/conf/machine/ccxmx53js.conf
+++ b/meta-digi-arm/conf/machine/ccxmx53js.conf
@@ -10,8 +10,6 @@ SOC_FAMILY = "mx53:mx5"
 # Digi's kernel does not use device tree.
 # KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-qsb.dts"
 
-UBOOT_MACHINE = "ccxmx53js_config"
-
 MACHINE_FEATURES += " wifi accel-video"
 
 UBOOT_ENTRYPOINT_mx53  = "0x70800000"
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 5629e3a6c..7d064d3c6 100644
--- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
@@ -10,6 +10,17 @@ 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}'
+
 # Flash image types
 IMAGE_FSTYPES += "sum.jffs2 ubifs"