summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2014-09-16 19:10:00 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-22 13:04:23 +0100
commit4f0cbf59a9106332f26947e5528f4cf1d01cf6e5 (patch)
tree21a68d0480b0c78554d6a91980d741bbebf0cd91 /meta/recipes-bsp/u-boot
parent955bf632a72abc339102fd8b1e1ad27cd300ccd0 (diff)
downloadpoky-4f0cbf59a9106332f26947e5528f4cf1d01cf6e5.tar.gz
u-boot: cleanup indentation and consolidate .inc file
(From OE-Core rev: 71525643909ac765e6b6a4b419cddae7d5812a8d) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/u-boot')
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb12
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb14
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb12
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc10
-rw-r--r--meta/recipes-bsp/u-boot/u-boot_2013.07.bb18
5 files changed, 30 insertions, 36 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb
index e6163972dc..d686b33621 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb
@@ -20,19 +20,19 @@ inherit uboot-config cross
20EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"' 20EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
21 21
22do_compile () { 22do_compile () {
23 oe_runmake ${UBOOT_MACHINE} 23 oe_runmake ${UBOOT_MACHINE}
24 oe_runmake env 24 oe_runmake env
25} 25}
26 26
27do_install () { 27do_install () {
28 install -d ${D}${bindir_cross} 28 install -d ${D}${bindir_cross}
29 install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv 29 install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
30 install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv 30 install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
31} 31}
32 32
33SYSROOT_PREPROCESS_FUNCS = "uboot_fw_utils_cross" 33SYSROOT_PREPROCESS_FUNCS = "uboot_fw_utils_cross"
34uboot_fw_utils_cross() { 34uboot_fw_utils_cross() {
35 sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross} 35 sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
36} 36}
37 37
38PACKAGE_ARCH = "${MACHINE_ARCH}" 38PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
index 89fed8bee4..8bab432a76 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
@@ -20,16 +20,16 @@ EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTSTRIP="true"'
20inherit uboot-config 20inherit uboot-config
21 21
22do_compile () { 22do_compile () {
23 oe_runmake ${UBOOT_MACHINE} 23 oe_runmake ${UBOOT_MACHINE}
24 oe_runmake env 24 oe_runmake env
25} 25}
26 26
27do_install () { 27do_install () {
28 install -d ${D}${base_sbindir} 28 install -d ${D}${base_sbindir}
29 install -d ${D}${sysconfdir} 29 install -d ${D}${sysconfdir}
30 install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv 30 install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv
31 install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv 31 install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
32 install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config 32 install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config
33} 33}
34 34
35PACKAGE_ARCH = "${MACHINE_ARCH}" 35PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb
index 93c8102e73..3173b0ac73 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb
@@ -17,16 +17,16 @@ S = "${WORKDIR}/git"
17EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTLD="${LD}" HOSTLDFLAGS="${LDFLAGS}" HOSTSTRIP=true' 17EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTLD="${LD}" HOSTLDFLAGS="${LDFLAGS}" HOSTSTRIP=true'
18 18
19do_compile () { 19do_compile () {
20 # Make sure the recompile is OK 20 # Make sure the recompile is OK
21 rm -f ${B}/tools/.depend 21 rm -f ${B}/tools/.depend
22 22
23 oe_runmake tools 23 oe_runmake tools
24} 24}
25 25
26do_install () { 26do_install () {
27 install -d ${D}${bindir} 27 install -d ${D}${bindir}
28 install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage 28 install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage
29 ln -sf uboot-mkimage ${D}${bindir}/mkimage 29 ln -sf uboot-mkimage ${D}${bindir}/mkimage
30} 30}
31 31
32BBCLASSEXTEND = "native nativesdk" 32BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 53c87c28f0..602b71f39d 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -3,6 +3,16 @@ HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
3SECTION = "bootloaders" 3SECTION = "bootloaders"
4PROVIDES = "virtual/bootloader" 4PROVIDES = "virtual/bootloader"
5 5
6LICENSE = "GPLv2+"
7LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
8 file://README;beginline=1;endline=22;md5=78b195c11cb6ef63e6985140db7d7bab"
9
10SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
11
12S = "${WORKDIR}/git"
13
14PACKAGE_ARCH = "${MACHINE_ARCH}"
15
6inherit uboot-config deploy 16inherit uboot-config deploy
7 17
8EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"' 18EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
diff --git a/meta/recipes-bsp/u-boot/u-boot_2013.07.bb b/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
index f8a88568d2..f07fd7c567 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
@@ -1,25 +1,9 @@
1require u-boot.inc 1require u-boot.inc
2 2
3# To build u-boot for your machine, provide the following lines in your machine
4# config, replacing the assignments as appropriate for your machine.
5# UBOOT_MACHINE = "omap3_beagle_config"
6# UBOOT_ENTRYPOINT = "0x80008000"
7# UBOOT_LOADADDRESS = "0x80008000"
8
9LICENSE = "GPLv2+"
10LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
11 file://README;beginline=1;endline=22;md5=78b195c11cb6ef63e6985140db7d7bab"
12
13# This revision corresponds to the tag "v2013.07" 3# This revision corresponds to the tag "v2013.07"
14# We use the revision in order to avoid having to fetch it from the repo during parse 4# We use the revision in order to avoid having to fetch it from the repo during parse
15SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c" 5SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c"
16 6
17PV = "v2013.07+git${SRCPV}" 7PV = "v2013.07+git${SRCPV}"
18 8
19SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ 9SRC_URI += "file://0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch"
20 file://0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch \
21"
22
23S = "${WORKDIR}/git"
24
25PACKAGE_ARCH = "${MACHINE_ARCH}"