[meta-freescale] [PATCH 4/8] unify the u-boot recipe for QorIQ ARM and QorIQ PPC

[Zhenhua Luo]

* update u-boot-qoriq recipe to support QorIQ ARM and QorIQ PPC
* remove u-boot-ls1 recipe which is replaced by u-boot-qoriq
* update PREFERRED_PROVIDER_u-boot for LS1 targets to use u-boot-qoriq

Signed-off-by: Zhenhua Luo <zhenhua.luo at freescale.com>
---
 conf/machine/include/qoriq-arm.inc         |  4 +--
 recipes-bsp/u-boot/u-boot-ls1_2015.01.bb   | 47 ------------------------------
 recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb | 38 +++++++++++++++---------
 3 files changed, 27 insertions(+), 62 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-ls1_2015.01.bb

diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc
index f93a0b2..9fb4146 100644
--- a/conf/machine/include/qoriq-arm.inc
+++ b/conf/machine/include/qoriq-arm.inc
@@ -1,8 +1,8 @@
 require conf/machine/include/soc-family.inc
 
 # Freescale BSP default providers
-PREFERRED_PROVIDER_u-boot_ls102xa ?= "u-boot-ls1"
-PREFERRED_PROVIDER_virtual/bootloader_ls102xa ?= "u-boot-ls1"
+PREFERRED_PROVIDER_u-boot_ls102xa ?= "u-boot-qoriq"
+PREFERRED_PROVIDER_virtual/bootloader_ls102xa ?= "u-boot-qoriq"
 PREFERRED_PROVIDER_virtual/kernel_ls102xa ?= "linux-ls1"
 PREFERRED_PROVIDER_cryptodev_ls102xa = "cryptodev-qoriq"
 PREFERRED_PROVIDER_cryptodev-module_ls102xa = "cryptodev-qoriq-module"
diff --git a/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb b/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb
deleted file mode 100644
index 0a1fb80..0000000
--- a/recipes-bsp/u-boot/u-boot-ls1_2015.01.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-require recipes-bsp/u-boot/u-boot.inc
-
-DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ Layerscape1 boards"
-LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1"
-LIC_FILES_CHKSUM = " \
-    file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
-    file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
-    file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
-    file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
-"
-
-SRCBRANCH = "master"
-SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH}"
-SRCREV = "6ba8eedbcdc4b063f59a63e6288b938af739e8ad"
-
-LOCALVERSION ?= "+ls1"
-
-S = "${WORKDIR}/git"
-
-inherit fsl-u-boot-localversion
-
-DEPENDS += "change-file-endianess-native dtc-native"
-PROVIDES += "u-boot"
-
-do_compile_append () {
-    if [ "x${UBOOT_CONFIG}" != "x" ]
-    then
-        for config in ${UBOOT_MACHINE}; do
-            case "${config}" in
-                *spi*) tclsh ${STAGING_BINDIR_NATIVE}/byte_swap.tcl ${S}/${config}/u-boot-dtb.bin ${S}/${config}/u-boot.swap.bin 8
-                mv ${S}/${config}/u-boot.swap.bin ${S}/u-boot-${type}.${UBOOT_SUFFIX};;
-                *nand* | *sdcard*)  mv ${S}/${config}/u-boot-with-spl-pbl.bin  ${S}/${config}/u-boot.bin;;
-            esac
-        done
-    fi
-
-}
-
-PACKAGES += "${PN}-images"
-FILES_${PN}-images += "/boot"
-
-ALLOW_EMPTY_${PN} = "1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ls102xa)"
-
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
index eebd979..d3a30a6 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
@@ -1,4 +1,7 @@
-DESCRIPTION = "U-boot bootloader"
+require recipes-bsp/u-boot/u-boot.inc
+inherit fsl-u-boot-localversion
+
+DESCRIPTION = "U-boot provided by Freescale with focus on QorIQ boards"
 HOMEPAGE = "http://u-boot.sf.net"
 SECTION = "bootloaders"
 PROVIDES = "virtual/bootloader u-boot"
@@ -14,6 +17,8 @@ LIC_FILES_CHKSUM = " \
 PV_append = "+fslgit"
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "boot-format-native libgcc ${@base_contains('TCMODE', 'external-fsl', '', 'virtual/${TARGET_PREFIX}gcc', d)}"
+DEPENDS_append_qoriq-arm = " change-file-endianess-native dtc-native tcl-native"
+DEPENDS_append_qoriq-ppc = " boot-format-native"
 
 inherit deploy
 
@@ -47,23 +52,15 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 UBOOT_LOCALVERSION = "${@d.getVar('SDK_VERSION', True).partition(' ')[0]}"
 
-USRC ?= ""
-S = '${@base_conditional("USRC", "", "${WORKDIR}/git", "${USRC}", d)}'
+S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
 
-do_compile () {
+do_compile_qoriq-ppc() {
     unset LDFLAGS
     unset CFLAGS
     unset CPPFLAGS
 
-    if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
-    then
-        head=`git rev-parse --verify --short HEAD 2> /dev/null`
-        printf "%s%s%s" ${UBOOT_LOCALVERSION} +g $head > ${B}/.scmversion
-        printf "%s%s%s" ${UBOOT_LOCALVERSION} +g $head > ${S}/.scmversion
-    fi
-
     if [ "x${UBOOT_MACHINES}" = "x" ]; then
         UBOOT_MACHINES=${UBOOT_MACHINE}
     fi
@@ -130,7 +127,20 @@ do_compile () {
     done
 }
 
-do_install(){
+do_compile_append_qoriq-arm () {
+    if [ "x${UBOOT_CONFIG}" != "x" ]
+    then
+        for config in ${UBOOT_MACHINE}; do
+            case "${config}" in
+                *spi*) tclsh ${STAGING_BINDIR_NATIVE}/byte_swap.tcl ${S}/${config}/u-boot-dtb.bin ${S}/${config}/u-boot.swap.bin 8
+                mv ${S}/${config}/u-boot.swap.bin ${S}/u-boot-${type}.${UBOOT_SUFFIX};;
+                *nand* | *sdcard*) mv ${S}/${config}/u-boot-with-spl-pbl.bin ${S}/${config}/u-boot.bin;;
+            esac
+        done
+    fi
+}
+
+do_install_append_qoriq-ppc() {
     if [ "x${UBOOT_MACHINES}" = "x" ]; then
         UBOOT_MACHINES=${UBOOT_MACHINE}
     fi
@@ -156,7 +166,7 @@ do_install(){
     done
 }
 
-do_deploy(){
+do_deploy_append_qoriq-ppc() {
     if [ "x${UBOOT_MACHINES}" = "x" ]; then
         UBOOT_MACHINES=${UBOOT_MACHINE}
     fi
@@ -189,4 +199,6 @@ addtask deploy after do_install
 PACKAGES += "${PN}-images"
 FILES_${PN}-images += "/boot"
 
+COMPATIBLE_MACHINE = "(qoriq)"
+
 ALLOW_EMPTY_${PN} = "1"
-- 
2.4.3