From 7ad6a5e63a6afdb4fd9cbfd35e64b3944135b180 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 4 Jun 2013 13:49:52 +0200
Subject: [PATCH] meta-digi-arm: create complete u-boot recipe (instead of
 bbappend)

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../conf/machine/include/digi-defaults.inc    |  2 +-
 ...2009.08.bbappend => u-boot-del_2009.08.bb} | 21 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)
 rename meta-digi-arm/recipes-bsp/u-boot/{u-boot-imx_2009.08.bbappend => u-boot-del_2009.08.bb} (70%)

diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index f9cb50c73..42521bf9c 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -1,6 +1,6 @@
 # Digi BSP default providers
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-imx"
-PREFERRED_PROVIDER_u-boot ?= "u-boot-imx"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-del"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-del"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bbappend b/meta-digi-arm/recipes-bsp/u-boot/u-boot-del_2009.08.bb
similarity index 70%
rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bbappend
rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-del_2009.08.bb
index 6ad775f8d..5c4c76102 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bbappend
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-del_2009.08.bb
@@ -1,15 +1,19 @@
 # Copyright (C) 2012 Digi International
 
-DESCRIPTION = "bootloader for Digi platforms"
+DESCRIPTION = "Bootloader for Digi platforms"
+require recipes-bsp/u-boot/u-boot.inc
 
-PRINC := "${@int(PRINC) + 1}"
-PR_append = "+${DISTRO}"
+PROVIDES += "u-boot"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b"
+
+PR = "r0"
 
 # Uncomment to build the from sources (internal use only)
 # UBOOT_BUILD_SRC ?= "1"
 
-SRCREV_mxs = "4af0b5f73215c6f075e17f866d831a948d777a2a"
-SRCREV_mx5 = "4af0b5f73215c6f075e17f866d831a948d777a2a"
+SRCREV = "4af0b5f73215c6f075e17f866d831a948d777a2a"
 SRCREV_SHORT = "${@'${SRCREV}'[:7]}"
 
 # Checksums for 'u-boot-denx-${SRCREV_SHORT}.tar.gz' tarballs
@@ -24,15 +28,12 @@ SRC_URI_tarball = " \
 SRC_URI  = "${@base_conditional('UBOOT_BUILD_SRC', '1' , '${SRC_URI_git}', '${SRC_URI_tarball}', d)}"
 
 S  = "${@base_conditional('UBOOT_BUILD_SRC', '1' , '${WORKDIR}/git', '${WORKDIR}/u-boot-denx-${SRCREV_SHORT}', d)}"
+EXTRA_OEMAKE += 'HOSTSTRIP=true'
 
 DEPENDS_mxs += "elftosb-native imx-bootlets-del"
 
 BOOTLETSDIR_mxs = "BOOTLETS_DIR=${STAGING_DIR_TARGET}/boot/"
 EXTRA_OEMAKE += '${BOOTLETSDIR}'
 
-# The meta-fsl-arm recipe overrides this so it needs to be done here again.
-UBOOT_MAKE_TARGET_ccardimx28js = "u-boot-ivt.sb"
-UBOOT_MAKE_TARGET_cpx2 = "u-boot-ivt.sb"
-UBOOT_MAKE_TARGET_wr21 = "u-boot-ivt.sb"
-
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(ccardimx28js|ccimx51js|ccimx53js|cpx2|wr21)"