summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeresa Gámez <t.gamez@phytec.de>2015-02-25 14:50:42 (GMT)
committerWadim Egorov <w.egorov@phytec.de>2015-03-02 08:08:24 (GMT)
commit30438c752701e8bd84f571b5d48e987d7e959cef (patch)
treeaf4d825447f4e0d89a3a507c2edf21e5ea56e048
parentb65b0253192b7d0b4cf63ba05cbb3e78f3898528 (diff)
downloadmeta-phytec-30438c752701e8bd84f571b5d48e987d7e959cef.zip
meta-phytec-30438c752701e8bd84f571b5d48e987d7e959cef.tar.bz2
barebox: Update version for beaglebone
We needed a special barebox 2014.07.0 version for beaglebone. As this was broken. But it is not needed any more. Removed it and update to the new version. Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
-rw-r--r--conf/machine/beagleboneblack-1.conf2
-rw-r--r--recipes-bsp/barebox/2014.07.0/remove-default-environment.patch40
-rw-r--r--recipes-bsp/barebox/barebox-ipl_2014.07.0.bbappend1
-rw-r--r--recipes-bsp/barebox/barebox/beagleboneblack-1/environment/boot/sd6
-rw-r--r--recipes-bsp/barebox/barebox/beagleboneblack-1/environment/config-expansions3
-rw-r--r--recipes-bsp/barebox/barebox_2014.07.0.bbappend27
6 files changed, 9 insertions, 70 deletions
diff --git a/conf/machine/beagleboneblack-1.conf b/conf/machine/beagleboneblack-1.conf
index 4c277e6..a1c1065 100644
--- a/conf/machine/beagleboneblack-1.conf
+++ b/conf/machine/beagleboneblack-1.conf
@@ -8,7 +8,5 @@ require conf/machine/include/phyam335x.inc
KERNEL_DEVICETREE = "am335x-boneblack.dtb"
# Barebox
-PREFERRED_VERSION_barebox = "2014.07.0"
-PREFERRED_VERSION_barebox-ipl = "2014.07.0"
BAREBOX_BIN = "images/barebox-am33xx-beaglebone.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-beaglebone-mlo.img"
diff --git a/recipes-bsp/barebox/2014.07.0/remove-default-environment.patch b/recipes-bsp/barebox/2014.07.0/remove-default-environment.patch
deleted file mode 100644
index 56d0f39..0000000
--- a/recipes-bsp/barebox/2014.07.0/remove-default-environment.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: barebox-2014.07.0/arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/sd
-===================================================================
---- barebox-2014.07.0.orig/arch/arm/boards/beaglebone/defaultenv-beaglebone/boot/sd 2014-07-04 16:58:13.000000000 +0200
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,11 +0,0 @@
--#!/bin/sh
--
--if [ "$1" = menu ]; then
-- boot-menu-add-entry "$0" "kernel & rootfs on SD card"
-- exit
--fi
--
--global.bootm.image=/boot/uImage
--global.bootm.oftree=/boot/oftree
--#global.bootm.initrd=<path to initrd>
--global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
-Index: barebox-2014.07.0/arch/arm/boards/beaglebone/defaultenv-beaglebone/config
-===================================================================
---- barebox-2014.07.0.orig/arch/arm/boards/beaglebone/defaultenv-beaglebone/config 2014-07-04 16:58:13.000000000 +0200
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,19 +0,0 @@
--#!/bin/sh
--
--# change network settings in /env/network/eth0
--# change mtd partition settings and automountpoints in /env/init/*
--
--# set to false if you do not want to have colors
--global.allow_color=true
--
--# user (used for network filenames)
--global.user=none
--
--# timeout in seconds before the default boot entry is started
--global.autoboot_timeout=3
--
--# default boot entry (one of /env/boot/*)
--global.boot.default=sd
--
--# base bootargs
--global.linux.bootargs.base="console=ttyO0,115200n8"
diff --git a/recipes-bsp/barebox/barebox-ipl_2014.07.0.bbappend b/recipes-bsp/barebox/barebox-ipl_2014.07.0.bbappend
deleted file mode 100644
index 51621ee..0000000
--- a/recipes-bsp/barebox/barebox-ipl_2014.07.0.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-COMPATIBLE_MACHINE = "beagleboneblack-1"
diff --git a/recipes-bsp/barebox/barebox/beagleboneblack-1/environment/boot/sd b/recipes-bsp/barebox/barebox/beagleboneblack-1/environment/boot/sd
new file mode 100644
index 0000000..6100274
--- /dev/null
+++ b/recipes-bsp/barebox/barebox/beagleboneblack-1/environment/boot/sd
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+global.bootm.image=/boot/linuximage
+global.bootm.oftree=/boot/oftree
+
+global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootwait"
diff --git a/recipes-bsp/barebox/barebox/beagleboneblack-1/environment/config-expansions b/recipes-bsp/barebox/barebox/beagleboneblack-1/environment/config-expansions
new file mode 100644
index 0000000..e4b4270
--- /dev/null
+++ b/recipes-bsp/barebox/barebox/beagleboneblack-1/environment/config-expansions
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+# Beaglebone has capes. Does not need this.
diff --git a/recipes-bsp/barebox/barebox_2014.07.0.bbappend b/recipes-bsp/barebox/barebox_2014.07.0.bbappend
deleted file mode 100644
index 14734da..0000000
--- a/recipes-bsp/barebox/barebox_2014.07.0.bbappend
+++ /dev/null
@@ -1,27 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${THISDIR}/${PV}:${THISDIR}/${PN}/features:"
-
-SRC_URI += " \
- file://commonenv \
- file://environment \
- file://ext4.cfg \
- file://remove-default-environment.patch \
-"
-
-COMPATIBLE_MACHINE = "beagleboneblack-1"
-
-do_appendbootconfig_to_configboard () {
- bbnote "config-board: append bootconfig"
- cat >> ${S}/.commonenv/config-board <<EOF
-if [ \$bootsource = mmc ]; then
- global.boot.default="mmc nand spi net"
-elif [ \$bootsource = nand ]; then
- global.boot.default="nand spi mmc net"
-elif [ \$bootsource = spi ]; then
- global.boot.default="spi nand mmc net"
-elif [ \$bootsource = net ]; then
- global.boot.default="net nand spi mmc"
-fi
-EOF
-}
-addtask appendbootconfig_to_configboard after do_prepare_env before do_configure
-