u-boot-qoriq: set LOCALVERSION to +fsl

SDK_VERSION defaults to nodistro.0 which is not expected in
this recipe.
Also adjust the location of some settings, no code change.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

1 files changed, 5 insertions, 6 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 63b53904..002066d8 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2016.01.bb
@@ -1,5 +1,4 @@
 require recipes-bsp/u-boot/u-boot.inc
-inherit fsl-u-boot-localversion
 
 DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ boards"
 PROVIDES += "u-boot"
@@ -25,6 +24,8 @@ SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH} \
 "
 SRCREV = "a9b437f50e2051f8d42ec9e1a6df52de4bc00e1e"
 
+S = "${WORKDIR}/git"
+
 python () {
     if d.getVar("TCMODE", True) == "external-fsl":
         return
@@ -43,13 +44,11 @@ python () {
 }
 
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
-
-LOCALVERSION = "${@d.getVar('SDK_VERSION', True).partition(' ')[0]}"
-
-S = "${WORKDIR}/git"
-
 EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
 
+inherit fsl-u-boot-localversion
+LOCALVERSION = "+fsl"
+
 do_compile_append_qoriq () {
     unset i j
     if [ -n "${UBOOT_CONFIG}" ];then