barebox: rebase to 2015.06

This commit is contained in:
Jan Luebbe 2015-06-14 12:36:19 +02:00
parent 66aa807866
commit 2d2854e820
6 changed files with 12 additions and 12 deletions

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Barebox/arm 2015.05.0 Configuration # Barebox/arm 2015.06.0 Configuration
# #
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARM_LINUX=y CONFIG_ARM_LINUX=y

View File

@ -1,12 +1,12 @@
require barebox.inc require barebox.inc
SRCREV = "6825fb56576b78be47a1dae292bac14ec18bdd2e" SRCREV = "05bacd6d5a587dfc74267735c2c1812c5b0fd829"
SRC_URI = " \ SRC_URI = " \
git://git.sysmocom.de/barebox.git;branch=v2015.05 \ git://git.sysmocom.de/barebox.git;branch=v2015.06 \
file://defconfig \ file://defconfig \
" "
PV = "v2015.05+git${SRCPV}" PV = "v2015.06+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
BAREBOX_ELF_IMAGE ?= "barebox-${MACHINE}-${PKGV}-${PKGR}.elf" BAREBOX_ELF_IMAGE ?= "barebox-${MACHINE}-${PKGV}-${PKGR}.elf"

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Barebox/arm 2015.05.0 Configuration # Barebox/arm 2015.06.0 Configuration
# #
CONFIG_ARM=y CONFIG_ARM=y

View File

@ -1,12 +1,12 @@
require barebox.inc require barebox.inc
SRCREV = "6825fb56576b78be47a1dae292bac14ec18bdd2e" SRCREV = "05bacd6d5a587dfc74267735c2c1812c5b0fd829"
SRC_URI = " \ SRC_URI = " \
git://git.sysmocom.de/barebox.git;branch=v2015.05 \ git://git.sysmocom.de/barebox.git;branch=v2015.06 \
file://defconfig \ file://defconfig \
" "
PV = "v2015.05+git${SRCPV}" PV = "v2015.06+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
BAREBOX_IMAGE ?= "barebox-${MACHINE}-mlo-${PKGV}-${PKGR}.img" BAREBOX_IMAGE ?= "barebox-${MACHINE}-mlo-${PKGV}-${PKGR}.img"

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Barebox/arm 2015.05.0 Configuration # Barebox/arm 2015.06.0 Configuration
# #
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARM_LINUX=y CONFIG_ARM_LINUX=y

View File

@ -2,13 +2,13 @@ require barebox.inc
RDEPENDS_${PN} += "${PN}-mlo" RDEPENDS_${PN} += "${PN}-mlo"
SRCREV = "6825fb56576b78be47a1dae292bac14ec18bdd2e" SRCREV = "05bacd6d5a587dfc74267735c2c1812c5b0fd829"
SRC_URI = " \ SRC_URI = " \
git://git.sysmocom.de/barebox.git;branch=v2015.05 \ git://git.sysmocom.de/barebox.git;branch=v2015.06 \
file://defconfig \ file://defconfig \
" "
PV = "v2015.05+git${SRCPV}" PV = "v2015.06+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
BAREBOX_IMAGE ?= "barebox-${MACHINE}-${PKGV}-${PKGR}.img" BAREBOX_IMAGE ?= "barebox-${MACHINE}-${PKGV}-${PKGR}.img"