diff options
author | Marek Vasut <marex@denx.de> | 2016-10-18 23:55:09 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-28 11:27:33 +0100 |
commit | b36056af20e981433f143556d511dec5644930fc (patch) | |
tree | bee7e0be3f973b669c7793075b371f9b9e68ab5c /meta/recipes-bsp | |
parent | ac82bd95ec62a6af8286289889a9d36fa5f58005 (diff) | |
download | openembedded-core-contrib-b36056af20e981433f143556d511dec5644930fc.tar.gz |
u-boot: Factor out common bits
The u-boot recipes share a couple of common variables, which makes
updating of the recipes error prone and a toil. Factor those common
bits into u-boot-common_${PV}.inc so that they are in one place.
The u-boot_${PV}.bb now explicitly require u-boot-common_${PV}.inc
before require u-boot.inc , as doing require u-boot-common_${PV}.inc
from u-boot.inc would fail due to ${PV} not being set. This is a
functional change.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-common_2016.03.inc | 16 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb | 16 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb | 17 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot.inc | 8 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot_2016.03.bb | 8 |
5 files changed, 21 insertions, 44 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2016.03.inc b/meta/recipes-bsp/u-boot/u-boot-common_2016.03.inc new file mode 100644 index 00000000000..403e31618b9 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-common_2016.03.inc @@ -0,0 +1,16 @@ +HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome" +SECTION = "bootloaders" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" + +# This revision corresponds to the tag "v2016.03" +# We use the revision in order to avoid having to fetch it from the +# repo during parse +SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa" + +PV = "v2016.03+git${SRCPV}" + +SRC_URI = "git://git.denx.de/u-boot.git;branch=master" + +S = "${WORKDIR}/git" diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb index 79f1548ef0e..f56862cb279 100644 --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb @@ -1,20 +1,8 @@ +require u-boot-common_${PV}.inc + SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" -SECTION = "bootloader" DEPENDS = "mtd-utils" -# This revision corresponds to the tag "v2016.03" -# We use the revision in order to avoid having to fetch it from the -# repo during parse -SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa" - -PV = "v2016.03+git${SRCPV}" - -SRC_URI = "git://git.denx.de/u-boot.git;branch=master" - -S = "${WORKDIR}/git" - INSANE_SKIP_${PN} = "already-stripped" EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb index d5921a0443d..5025961f912 100644 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb +++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb @@ -1,21 +1,8 @@ -SUMMARY = "U-Boot bootloader image creation tool" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" -SECTION = "bootloader" +require u-boot-common_${PV}.inc +SUMMARY = "U-Boot bootloader image creation tool" DEPENDS = "openssl" -# This revision corresponds to the tag "v2016.03" -# We use the revision in order to avoid having to fetch it from the -# repo during parse -SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa" - -PV = "v2016.03+git${SRCPV}" - -SRC_URI = "git://git.denx.de/u-boot.git;branch=master" - -S = "${WORKDIR}/git" - EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1' do_compile () { diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 252aae945c1..afe3fe91f2b 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -1,14 +1,6 @@ SUMMARY = "Universal Boot Loader for embedded devices" -HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome" -SECTION = "bootloaders" PROVIDES = "virtual/bootloader" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" - -SRC_URI = "git://git.denx.de/u-boot.git;branch=master" - -S = "${WORKDIR}/git" B = "${WORKDIR}/build" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta/recipes-bsp/u-boot/u-boot_2016.03.bb b/meta/recipes-bsp/u-boot/u-boot_2016.03.bb index 836b0ce03e1..dabe709df0e 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2016.03.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2016.03.bb @@ -1,10 +1,4 @@ +require u-boot-common_${PV}.inc require u-boot.inc DEPENDS += "dtc-native" - -# This revision corresponds to the tag "v2016.03" -# We use the revision in order to avoid having to fetch it from the -# repo during parse -SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa" - -PV = "v2016.03+git${SRCPV}" |