summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-bsp/u-boot')
-rw-r--r--meta/recipes-bsp/u-boot/files/0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch74
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb38
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb33
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb29
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc88
-rw-r--r--meta/recipes-bsp/u-boot/u-boot_2013.07.bb25
6 files changed, 287 insertions, 0 deletions
diff --git a/meta/recipes-bsp/u-boot/files/0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch b/meta/recipes-bsp/u-boot/files/0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch
new file mode 100644
index 0000000000..77e35bbc7c
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/files/0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch
@@ -0,0 +1,74 @@
1From 5701384cea4a829b772bf7a96a74825b58c22385 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com>
3Date: Thu, 17 Apr 2014 12:25:40 -0400
4Subject: [PATCH] am335x_evm.h: Add, use DEFAULT_LINUX_BOOT_ENV environment
5 string
6
7Modified version of the patch currently being reviewed for mainline:
8http://patchwork.ozlabs.org/patch/334861/
9
10To deal with a reoccurring problem properly we need to specify addresses
11for the Linux kernel, Flatted Device Tree and ramdisk that obey the
12constraints within the kernel's Documentation/arm/Booting file but also
13make sure that we relocate things within a valid address range.
14
15Signed-off-by: Denys Dmytriyenko <denys@ti.com>
16Signed-off-by: Tom Rini <trini@ti.com>
17
18Upstream-Status: Pending
19---
20 include/configs/am335x_evm.h | 31 ++++++++++++++++++++++++++-----
21 1 file changed, 26 insertions(+), 5 deletions(-)
22
23diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
24index c5a6d4b..01e32b3 100644
25--- a/include/configs/am335x_evm.h
26+++ b/include/configs/am335x_evm.h
27@@ -54,10 +54,7 @@
28 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
29 #ifndef CONFIG_SPL_BUILD
30 #define CONFIG_EXTRA_ENV_SETTINGS \
31- "loadaddr=0x80200000\0" \
32- "fdtaddr=0x80F80000\0" \
33- "fdt_high=0xffffffff\0" \
34- "rdaddr=0x81000000\0" \
35+ DEFAULT_LINUX_BOOT_ENV \
36 "bootdir=/boot\0" \
37 "bootfile=uImage\0" \
38 "fdtfile=undefined\0" \
39@@ -197,7 +194,31 @@
40 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START \
41 + (8 * 1024 * 1024))
42
43-#define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */
44+/*
45+ * Our DDR memory always starts at 0x80000000 and U-Boot shall have
46+ * relocated itself to higher in memory by the time this value is used.
47+ * However, set this to a 32MB offset to allow for easier Linux kernel
48+ * booting as the default is often used as the kernel load address.
49+ */
50+#define CONFIG_SYS_LOAD_ADDR 0x82000000 /* Default load address */
51+
52+/*
53+ * We setup defaults based on constraints from the Linux kernel, which should
54+ * also be safe elsewhere. We have the default load at 32MB into DDR (for
55+ * the kernel), FDT above 128MB (the maximum location for the end of the
56+ * kernel), and the ramdisk 512KB above that (allowing for hopefully never
57+ * seen large trees). We say all of this must be within the first 256MB
58+ * as that will normally be within the kernel lowmem and thus visible via
59+ * bootm_size and we only run on platforms with 256MB or more of memory.
60+ */
61+#define DEFAULT_LINUX_BOOT_ENV \
62+ "loadaddr=0x82000000\0" \
63+ "kernel_addr_r=0x82000000\0" \
64+ "fdtaddr=0x88000000\0" \
65+ "fdt_addr_r=0x88000000\0" \
66+ "rdaddr=0x88080000\0" \
67+ "ramdisk_addr_r=0x88080000\0" \
68+ "bootm_size=0x10000000\0"
69
70 #define CONFIG_MMC
71 #define CONFIG_GENERIC_MMC
72--
731.9.2
74
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
new file mode 100644
index 0000000000..e6163972dc
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb
@@ -0,0 +1,38 @@
1SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
4SECTION = "bootloader"
5DEPENDS = "mtd-utils"
6
7# This revision corresponds to the tag "v2013.07"
8# We use the revision in order to avoid having to fetch it from the
9# repo during parse
10SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c"
11
12PV = "v2013.07+git${SRCPV}"
13
14SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
15
16S = "${WORKDIR}/git"
17
18inherit uboot-config cross
19
20EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
21
22do_compile () {
23 oe_runmake ${UBOOT_MACHINE}
24 oe_runmake env
25}
26
27do_install () {
28 install -d ${D}${bindir_cross}
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
31}
32
33SYSROOT_PREPROCESS_FUNCS = "uboot_fw_utils_cross"
34uboot_fw_utils_cross() {
35 sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
36}
37
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
new file mode 100644
index 0000000000..14b09761e1
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
@@ -0,0 +1,33 @@
1SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
4SECTION = "bootloader"
5DEPENDS = "mtd-utils"
6
7# This revision corresponds to the tag "v2013.07"
8# We use the revision in order to avoid having to fetch it from the
9# repo during parse
10SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c"
11
12PV = "v2013.07+git${SRCPV}"
13
14SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
15
16S = "${WORKDIR}/git"
17
18EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTSTRIP="true"'
19
20inherit uboot-config
21
22do_compile () {
23 oe_runmake ${UBOOT_MACHINE}
24 oe_runmake env
25}
26
27do_install () {
28 install -d ${D}${base_sbindir}
29 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_setenv
31}
32
33PACKAGE_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
new file mode 100644
index 0000000000..2ca6050bf9
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb
@@ -0,0 +1,29 @@
1SUMMARY = "U-Boot bootloader image creation tool"
2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
4SECTION = "bootloader"
5
6# This revision corresponds to the tag "v2013.07"
7# We use the revision in order to avoid having to fetch it from the
8# repo during parse
9SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c"
10
11PV = "v2013.07+git${SRCPV}"
12
13SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
14
15S = "${WORKDIR}/git"
16
17EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTLD="${LD}" HOSTLDFLAGS="${LDFLAGS}" HOSTSTRIP=true'
18
19do_compile () {
20 oe_runmake tools
21}
22
23do_install () {
24 install -d ${D}${bindir}
25 install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage
26 ln -sf uboot-mkimage ${D}${bindir}/mkimage
27}
28
29BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
new file mode 100644
index 0000000000..f49bb5db1d
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -0,0 +1,88 @@
1SUMMARY = "Universal Boot Loader for embedded devices"
2HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
3SECTION = "bootloaders"
4PROVIDES = "virtual/bootloader"
5
6inherit uboot-config deploy
7
8EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
9
10# Allow setting an additional version string that will be picked up by the
11# u-boot build system and appended to the u-boot version. If the .scmversion
12# file already exists it will not be overwritten.
13UBOOT_LOCALVERSION ?= ""
14
15# Some versions of u-boot use .bin and others use .img. By default use .bin
16# but enable individual recipes to change this value.
17UBOOT_SUFFIX ?= "bin"
18UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
19UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
20UBOOT_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
21UBOOT_MAKE_TARGET ?= "all"
22
23# Some versions of u-boot build an SPL (Second Program Loader) image that
24# should be packaged along with the u-boot binary as well as placed in the
25# deploy directory. For those versions they can set the following variables
26# to allow packaging the SPL.
27SPL_BINARY ?= ""
28SPL_IMAGE ?= "${SPL_BINARY}-${MACHINE}-${PV}-${PR}"
29SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}"
30
31do_compile () {
32 if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
33 sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk
34 fi
35
36 unset LDFLAGS
37 unset CFLAGS
38 unset CPPFLAGS
39
40 if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
41 then
42 echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion
43 echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
44 fi
45
46 oe_runmake ${UBOOT_MACHINE}
47 oe_runmake ${UBOOT_MAKE_TARGET}
48}
49
50do_install () {
51 install -d ${D}/boot
52 install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
53 ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
54
55 if [ -e ${WORKDIR}/fw_env.config ] ; then
56 install -d ${D}${sysconfdir}
57 install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
58 fi
59
60 if [ "x${SPL_BINARY}" != "x" ]
61 then
62 install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}
63 ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY}
64 fi
65}
66
67FILES_${PN} = "/boot ${sysconfdir}"
68FILESPATH =. "${FILE_DIRNAME}/u-boot-git/${MACHINE}:"
69
70do_deploy () {
71 install -d ${DEPLOYDIR}
72 install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
73
74 cd ${DEPLOYDIR}
75 rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK}
76 ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
77 ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
78
79 if [ "x${SPL_BINARY}" != "x" ]
80 then
81 install ${S}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}
82 rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK}
83 ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARY}
84 ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK}
85 fi
86}
87
88addtask deploy before do_build after do_compile
diff --git a/meta/recipes-bsp/u-boot/u-boot_2013.07.bb b/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
new file mode 100644
index 0000000000..f8a88568d2
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
@@ -0,0 +1,25 @@
1require u-boot.inc
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"
14# We use the revision in order to avoid having to fetch it from the repo during parse
15SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c"
16
17PV = "v2013.07+git${SRCPV}"
18
19SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
20 file://0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch \
21"
22
23S = "${WORKDIR}/git"
24
25PACKAGE_ARCH = "${MACHINE_ARCH}"