Skip to contentSkip to conversation

Upgrade barebox to version 2015.05.0

PATCH In review Gyorgy Kovesdi 2 participants 2 messages Jun 16, 2015

lore
Share & tools
lore

Gyorgy Kovesdi

author
#0 lore raw

PATCH 1/1 Upgrade barebox to version 2015.05.0

Add support to Embedsky E9 mini PC board and also upgrade to version 2015.05.0

Some changes in deploy: using img files instead of bin files. Added defconfig support for different boards by using variable BAREBOX_CONFIG.

Many thanks to Панов Андрей <[email protected]>

Signed-off-by György Kövesdi <[email protected]>

---

 4 files changed, 695 insertions(+), 37 deletions(-)
 create mode 100644 recipes-bsp/barebox/barebox/defconfig/embedsky-e9.config
 delete mode 100644 recipes-bsp/barebox/barebox_2013.08.0.bb
 create mode 100644 recipes-bsp/barebox/barebox_2015.05.0.bb
recipes-bsp/barebox/barebox.inc +35 -28
index 0d5c127..d55046f 100644
@@ -12,52 +12,59 @@ inherit kernel-arch
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
 
-BAREBOX_BINARY ?= "barebox.bin"
-BAREBOX_IMAGE ?= "barebox-${MACHINE}-${PV}-${PR}.bin"
+BAREBOX_BINARY ?= "barebox.img"
+BAREBOX_IMAGE ?= "barebox-${MACHINE}-${PV}-${PR}.img"
 BAREBOXENV_BIN ?= "bareboxenv-${MACHINE}-${PV}-${PR}.bin"
-BAREBOX_SYMLINK ?= "barebox-${MACHINE}.bin"
+BAREBOX_SYMLINK ?= "barebox-${MACHINE}.img"
 BAREBOXENV_SYMLINK ?= "bareboxenv-${MACHINE}.bin"
 
 INSANE_SKIP_${PN} = "True"
 
+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
+    if test ! "${BAREBOX_CONFIG}"; then \
+        echo "ERROR: variable BAREBOX_CONFIG is not set!" >&2; \
+        exit 1; \
+    fi
+    cp ${WORKDIR}/defconfig/${BAREBOX_CONFIG}.config ${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
 }
 
 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
+
recipes-bsp/barebox/barebox/defconfig/embedsky-e9.config new file +649 -0

649 lines not on this page · raw message

recipes-bsp/barebox/barebox_2013.08.0.bb deleted +0 -9
deleted file mode 100644
index e4e3717..0000000
@@ -1,9 +0,0 @@
-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"
-
-COMPATIBLE_MACHINE = "Invalid!"
recipes-bsp/barebox/barebox_2015.05.0.bb new file +11 -0
new file mode 100644
index 0000000..1e7598a
@@ -0,0 +1,11 @@
+require recipes-bsp/barebox/barebox.inc
+
+SRC_URI = " \
+    http://barebox.org/download/${PN}-${PV}.tar.bz2 \
+    file://defconfig/embedsky-e9.config \
+"
+
+SRC_URI[md5sum] = "3b4f2c72ec3b7cc2f1f294fd2baf0c4d"
+SRC_URI[sha256sum] = "f650e15c7a6da8cb779bb1787829fa4184b3189baf604c8af3af4e0deefa5e8e"
+
+COMPATIBLE_MACHINE = "(mx6)"

--
1.8

--

#1 lore raw

Hello Gyorgy,

First I would like to thank you for your work on this. Please see the comments below ...

Quoted 8 lines · Gyorgy Kovesdi

Add support to Embedsky E9 mini PC board and also upgrade to version 2015.05.0

Some changes in deploy: using img files instead of bin files. Added defconfig support for different boards by using variable BAREBOX_CONFIG.

Many thanks to Панов Андрей <[email protected]>

Signed-off-by György Kövesdi <[email protected]>

This patch must to be split in two.

One which targets meta-fsl-arm and upgrades the recipe. This must remain the old support running and if you don't have the boards to do the tests we can find someone to do the runtime tests.

The second patch should target meta-fsl-arm-extra and should add the defconfig for your specific board.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750