From a77d53c8ce86a320447038098ead3428babc55a2 Mon Sep 17 00:00:00 2001
From: Ting Liu <ting.liu@nxp.com>
Date: Wed, 15 Jun 2016 15:07:55 +0800
Subject: u-boot-qoriq: sync with u-boot.inc from poky

* remove duplicate settings
* sync the definition of EXTRA_OEMAKE

Signed-off-by: Ting Liu <ting.liu@nxp.com>
---
 recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb
index d43a4a6..9128c65 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb
@@ -2,9 +2,7 @@ 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"
+PROVIDES += "u-boot"
 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 \
@@ -19,20 +17,19 @@ INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "libgcc virtual/${TARGET_PREFIX}gcc"
 DEPENDS_append_qoriq-ppc = " boot-format-native"
 
-inherit deploy
-
 SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=sdk-v2.0.x \
     file://fix-build-error-under-gcc6.patch \
 "
 SRCREV = "a9b437f50e2051f8d42ec9e1a6df52de4bc00e1e"
 
+S = "${WORKDIR}/git"
+
 python () {
     if d.getVar("TCMODE", True) == "external-fsl":
         return
 
     ml = d.getVar("MULTILIB_VARIANTS", True)
     arch = d.getVar("OVERRIDES", True)
-
     if "e5500-64b:" in arch or "e6500-64b:" in arch:
         if not "lib32" in ml:
             raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
@@ -44,16 +41,11 @@ python () {
 }
 
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-USRC ?= ""
-S = '${@base_conditional("USRC", "", "${WORKDIR}/git", "${USRC}", d)}'
+EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" V=1'
+EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
 
 LOCALVERSION = "+fsl"
 
-EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
-
 do_compile_append_qoriq-ppc () {
     unset i j
     if [ -n "${UBOOT_CONFIG}" ];then
-- 
cgit v1.2.3-54-g00ecf