summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2016-10-18 23:55:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-28 16:15:19 +0100
commita40f5d34065129ab19a3c981cbb38f854e9ae0ec (patch)
tree8ec6ab78d8c0a0e7a531ec33ff61712bfa0d2d28 /meta/recipes-bsp
parent2031738d28768ebd95cce9c355521142dd1a88c4 (diff)
downloadpoky-a40f5d34065129ab19a3c981cbb38f854e9ae0ec.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. (From OE-Core rev: b36056af20e981433f143556d511dec5644930fc) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-common_2016.03.inc16
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb16
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb17
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc8
-rw-r--r--meta/recipes-bsp/u-boot/u-boot_2016.03.bb8
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 0000000000..403e31618b
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot-common_2016.03.inc
@@ -0,0 +1,16 @@
1HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
2SECTION = "bootloaders"
3
4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
6
7# This revision corresponds to the tag "v2016.03"
8# We use the revision in order to avoid having to fetch it from the
9# repo during parse
10SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
11
12PV = "v2016.03+git${SRCPV}"
13
14SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
15
16S = "${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 79f1548ef0..f56862cb27 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 @@
1require u-boot-common_${PV}.inc
2
1SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" 3SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
4SECTION = "bootloader"
5DEPENDS = "mtd-utils" 4DEPENDS = "mtd-utils"
6 5
7# This revision corresponds to the tag "v2016.03"
8# We use the revision in order to avoid having to fetch it from the
9# repo during parse
10SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
11
12PV = "v2016.03+git${SRCPV}"
13
14SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
15
16S = "${WORKDIR}/git"
17
18INSANE_SKIP_${PN} = "already-stripped" 6INSANE_SKIP_${PN} = "already-stripped"
19EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' 7EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
20EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' 8EXTRA_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 d5921a0443..5025961f91 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 @@
1SUMMARY = "U-Boot bootloader image creation tool" 1require u-boot-common_${PV}.inc
2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
4SECTION = "bootloader"
5 2
3SUMMARY = "U-Boot bootloader image creation tool"
6DEPENDS = "openssl" 4DEPENDS = "openssl"
7 5
8# This revision corresponds to the tag "v2016.03"
9# We use the revision in order to avoid having to fetch it from the
10# repo during parse
11SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
12
13PV = "v2016.03+git${SRCPV}"
14
15SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
16
17S = "${WORKDIR}/git"
18
19EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1' 6EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1'
20 7
21do_compile () { 8do_compile () {
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 252aae945c..afe3fe91f2 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -1,14 +1,6 @@
1SUMMARY = "Universal Boot Loader for embedded devices" 1SUMMARY = "Universal Boot Loader for embedded devices"
2HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
3SECTION = "bootloaders"
4PROVIDES = "virtual/bootloader" 2PROVIDES = "virtual/bootloader"
5 3
6LICENSE = "GPLv2+"
7LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
8
9SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
10
11S = "${WORKDIR}/git"
12B = "${WORKDIR}/build" 4B = "${WORKDIR}/build"
13 5
14PACKAGE_ARCH = "${MACHINE_ARCH}" 6PACKAGE_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 836b0ce03e..dabe709df0 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 @@
1require u-boot-common_${PV}.inc
1require u-boot.inc 2require u-boot.inc
2 3
3DEPENDS += "dtc-native" 4DEPENDS += "dtc-native"
4
5# This revision corresponds to the tag "v2016.03"
6# We use the revision in order to avoid having to fetch it from the
7# repo during parse
8SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
9
10PV = "v2016.03+git${SRCPV}"