[meta-freescale] [fsl-community-bsp-platform][PATCH] Added barebox_2015-06

[Gyorgy Kovesdi]

See other patch: Added embedsky-e9 board support to barebox_2015-06
--- 8< ---
Signed-off-by: Gyorgy Kovesdi <kgy at teledigit.eu>
---
 classes/image_types_fsl.bbclass          |  2 +-
 recipes-bsp/barebox/barebox.inc          | 68 ++++++++++++++++++--------------
 recipes-bsp/barebox/barebox_2013.08.0.bb |  3 --
 recipes-bsp/barebox/barebox_2015.06.0.bb |  6 +++
 4 files changed, 46 insertions(+), 33 deletions(-)
 create mode 100644 recipes-bsp/barebox/barebox_2015.06.0.bb

diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index b542549..c5f3b8b 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -138,7 +138,7 @@ generate_imx_sdcard () {
 		fi
 		;;
 		barebox)
-		dd if=${DEPLOY_DIR_IMAGE}/barebox-${MACHINE}.bin of=${SDCARD} conv=notrunc seek=1 skip=1 bs=512
+		dd if=${DEPLOY_DIR_IMAGE}/barebox-${MACHINE}.img of=${SDCARD} conv=notrunc seek=1 skip=1 bs=512
 		dd if=${DEPLOY_DIR_IMAGE}/bareboxenv-${MACHINE}.bin of=${SDCARD} conv=notrunc seek=1 bs=512k
 		;;
 		"")
diff --git a/recipes-bsp/barebox/barebox.inc b/recipes-bsp/barebox/barebox.inc
index 0d5c127..3148efa 100644
--- a/recipes-bsp/barebox/barebox.inc
+++ b/recipes-bsp/barebox/barebox.inc
@@ -6,58 +6,68 @@ PRIORITY = "optional"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=057bf9e50e1ca857d0eb97bfe4ba8e5d"
 
+DEPENDS += "lzop-native"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit kernel-arch
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
 
-BAREBOX_BINARY ?= "barebox.bin"
-BAREBOX_IMAGE ?= "barebox-${MACHINE}-${PV}-${PR}.bin"
-BAREBOXENV_BIN ?= "bareboxenv-${MACHINE}-${PV}-${PR}.bin"
-BAREBOX_SYMLINK ?= "barebox-${MACHINE}.bin"
+BAREBOX_BINARY ?= "barebox.img"
+BAREBOX_IMAGE ?= "barebox-${MACHINE}-${PV}-${PR}.img"
+BAREBOXENV_BIN ?= "bareboxenv-${MACHINE}-${PV}-${PR}.img"
+BAREBOX_SYMLINK ?= "barebox-${MACHINE}.img"
 BAREBOXENV_SYMLINK ?= "bareboxenv-${MACHINE}.bin"
+BAREBOX_CONFIG ?= "${MACHINE}"
 
 INSANE_SKIP_${PN} = "True"
 
+SRC_URI = " \
+    http://barebox.org/download/${PN}-${PV}.tar.bz2 \
+"
+
+addtask deploy before do_build after do_compile
+addtask env_deploy before do_build after do_deploy
+addtask pre_configure before do_configure after do_patch
+
 do_pre_configure() {
-	   cp ${WORKDIR}/defconfig ${S}/.config
-	   oe_runmake oldconfig
+    cp ${WORKDIR}/configs/${BAREBOX_CONFIG}/defconfig ${S}/.config
+    oe_runmake oldconfig
 }
-addtask pre_configure before do_configure after do_patch
 
 do_compile () {
-	if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
-		sed -i 's/$(CROSS_COMPILE)ld/$(CROSS_COMPILE)ld.bfd/g' Makefile
-	fi
-	unset LDFLAGS
-	unset CFLAGS
-	unset CPPFLAGS
-	oe_runmake all
+    if test "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold"
+    then
+        sed -i 's/$(CROSS_COMPILE)ld/$(CROSS_COMPILE)ld.bfd/g' Makefile
+    fi
+    unset LDFLAGS
+    unset CFLAGS
+    unset CPPFLAGS
+    oe_runmake CC="${CC}"
 }
 
 do_deploy () {
-	install -d ${DEPLOY_DIR_IMAGE}
-	install ${S}/${BAREBOX_BINARY} ${DEPLOY_DIR_IMAGE}/${BAREBOX_IMAGE}
+    install -d ${DEPLOY_DIR_IMAGE}
+    install ${S}/${BAREBOX_BINARY} ${DEPLOY_DIR_IMAGE}/${BAREBOX_IMAGE}
 
-	cd ${DEPLOY_DIR_IMAGE}
-	rm -f ${BAREBOX_SYMLINK}
-	ln -sf ${BAREBOX_IMAGE} ${BAREBOX_SYMLINK}
+    cd ${DEPLOY_DIR_IMAGE}
+    rm -f ${BAREBOX_SYMLINK}
+    ln -sf ${BAREBOX_IMAGE} ${BAREBOX_SYMLINK}
 
-	install -d ${STAGING_BINDIR_NATIVE}
-	cd ${S}
-	install -m 755 scripts/mkimage ${STAGING_BINDIR_NATIVE}/
-	install -m 755 scripts/bareboxenv ${STAGING_BINDIR_NATIVE}/
+    install -d ${STAGING_BINDIR_NATIVE}
+    cd ${S}
+    install -m 755 scripts/mkimage ${STAGING_BINDIR_NATIVE}/
+    install -m 755 scripts/bareboxenv ${STAGING_BINDIR_NATIVE}/
 }
 
 do_deploy[dirs] = "${S}"
-addtask deploy before do_build after do_compile
 
 do_env_deploy() {
-	install ${S}/common/barebox_default_env ${DEPLOY_DIR_IMAGE}/${BAREBOXENV_BIN}
+    install ${S}/defaultenv/barebox_default_env ${DEPLOY_DIR_IMAGE}/${BAREBOXENV_BIN}
 
-	cd ${DEPLOY_DIR_IMAGE}
-	rm -f ${BAREBOXENV_SYMLINK}
-	ln -sf ${BAREBOXENV_BIN} ${BAREBOXENV_SYMLINK}
+    cd ${DEPLOY_DIR_IMAGE}
+    rm -f ${BAREBOXENV_SYMLINK}
+    ln -sf ${BAREBOXENV_BIN} ${BAREBOXENV_SYMLINK}
 }
-addtask env_deploy before do_build after do_deploy
+
diff --git a/recipes-bsp/barebox/barebox_2013.08.0.bb b/recipes-bsp/barebox/barebox_2013.08.0.bb
index e4e3717..c32aa8e 100644
--- a/recipes-bsp/barebox/barebox_2013.08.0.bb
+++ b/recipes-bsp/barebox/barebox_2013.08.0.bb
@@ -1,8 +1,5 @@
 require recipes-bsp/barebox/barebox.inc
 
-SRC_URI = "http://barebox.org/download/${PN}-${PV}.tar.bz2 \
-           file://defconfig"
-
 SRC_URI[md5sum] = "a61b97a2fedebc808d4b182c2ca18a0c"
 SRC_URI[sha256sum] = "d9e46dd3c68b04ab4cbc37135dc34907dbebef393da4b3e54abb203c295c1620"
 
diff --git a/recipes-bsp/barebox/barebox_2015.06.0.bb b/recipes-bsp/barebox/barebox_2015.06.0.bb
new file mode 100644
index 0000000..0961a60
--- /dev/null
+++ b/recipes-bsp/barebox/barebox_2015.06.0.bb
@@ -0,0 +1,6 @@
+require recipes-bsp/barebox/barebox.inc
+
+SRC_URI[md5sum] = "481756e428b0516e5737c487f557d693"
+SRC_URI[sha256sum] = "77f94a6ee20e57b25ccdef8bf3cf0d493b6d100efe2a2725dd4a1e4ce36f1404"
+
+COMPATIBLE_MACHINE = "(mx6)"
-- 
2.1.4