summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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_2014.07.bb (renamed from meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb)10
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb (renamed from meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb)10
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-mkimage_2014.07.bb (renamed from meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb)12
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc5
-rw-r--r--meta/recipes-bsp/u-boot/u-boot_2013.07.bb9
-rw-r--r--meta/recipes-bsp/u-boot/u-boot_2014.07.bb9
7 files changed, 28 insertions, 101 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
deleted file mode 100644
index 77e35bbc7c..0000000000
--- a/meta/recipes-bsp/u-boot/files/0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch
+++ /dev/null
@@ -1,74 +0,0 @@
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_2014.07.bb
index d686b33621..d1f1f9a38b 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_2014.07.bb
@@ -1,15 +1,15 @@
1SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" 1SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
2LICENSE = "GPLv2+" 2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" 3LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
4SECTION = "bootloader" 4SECTION = "bootloader"
5DEPENDS = "mtd-utils" 5DEPENDS = "mtd-utils"
6 6
7# This revision corresponds to the tag "v2013.07" 7# This revision corresponds to the tag "v2014.07"
8# We use the revision in order to avoid having to fetch it from the 8# We use the revision in order to avoid having to fetch it from the
9# repo during parse 9# repo during parse
10SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c" 10SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
11 11
12PV = "v2013.07+git${SRCPV}" 12PV = "v2014.07+git${SRCPV}"
13 13
14SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" 14SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
15 15
@@ -17,7 +17,7 @@ S = "${WORKDIR}/git"
17 17
18inherit uboot-config cross 18inherit uboot-config cross
19 19
20EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"' 20EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} ${TOOLCHAIN_OPTIONS}"'
21 21
22do_compile () { 22do_compile () {
23 oe_runmake ${UBOOT_MACHINE} 23 oe_runmake ${UBOOT_MACHINE}
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_2014.07.bb
index 8bab432a76..a626c9599a 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb
@@ -1,21 +1,21 @@
1SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" 1SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
2LICENSE = "GPLv2+" 2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" 3LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
4SECTION = "bootloader" 4SECTION = "bootloader"
5DEPENDS = "mtd-utils" 5DEPENDS = "mtd-utils"
6 6
7# This revision corresponds to the tag "v2013.07" 7# This revision corresponds to the tag "v2014.07"
8# We use the revision in order to avoid having to fetch it from the 8# We use the revision in order to avoid having to fetch it from the
9# repo during parse 9# repo during parse
10SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c" 10SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
11 11
12PV = "v2013.07+git${SRCPV}" 12PV = "v2014.07+git${SRCPV}"
13 13
14SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" 14SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
18EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTSTRIP="true"' 18INSANE_SKIP_${PN} = "already-stripped"
19 19
20inherit uboot-config 20inherit uboot-config
21 21
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2014.07.bb
index 3173b0ac73..eabf680ec6 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2014.07.bb
@@ -1,14 +1,14 @@
1SUMMARY = "U-Boot bootloader image creation tool" 1SUMMARY = "U-Boot bootloader image creation tool"
2LICENSE = "GPLv2+" 2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" 3LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
4SECTION = "bootloader" 4SECTION = "bootloader"
5 5
6# This revision corresponds to the tag "v2013.07" 6# This revision corresponds to the tag "v2014.07"
7# We use the revision in order to avoid having to fetch it from the 7# We use the revision in order to avoid having to fetch it from the
8# repo during parse 8# repo during parse
9SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c" 9SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
10 10
11PV = "v2013.07+git${SRCPV}" 11PV = "v2014.07+git${SRCPV}"
12 12
13SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" 13SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
14 14
@@ -20,7 +20,9 @@ do_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 make HOSTCC="${BUILD_CC}" HOSTLD="${BUILD_LD}" HOSTLDFLAGS="${BUILD_LDFLAGS}" HOSTSTRIP=true dot-config=0 scripts_basic
24 sed 's/^tools-only: scripts_basic /tools-only: /' -i Makefile
25 oe_runmake tools-only
24} 26}
25 27
26do_install () { 28do_install () {
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 602b71f39d..c695b73b48 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -4,8 +4,7 @@ SECTION = "bootloaders"
4PROVIDES = "virtual/bootloader" 4PROVIDES = "virtual/bootloader"
5 5
6LICENSE = "GPLv2+" 6LICENSE = "GPLv2+"
7LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ 7LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
8 file://README;beginline=1;endline=22;md5=78b195c11cb6ef63e6985140db7d7bab"
9 8
10SRC_URI = "git://git.denx.de/u-boot.git;branch=master" 9SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
11 10
@@ -24,7 +23,7 @@ UBOOT_LOCALVERSION ?= ""
24 23
25# Some versions of u-boot use .bin and others use .img. By default use .bin 24# Some versions of u-boot use .bin and others use .img. By default use .bin
26# but enable individual recipes to change this value. 25# but enable individual recipes to change this value.
27UBOOT_SUFFIX ?= "bin" 26UBOOT_SUFFIX ??= "bin"
28UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" 27UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
29UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" 28UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
30UBOOT_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_SUFFIX}" 29UBOOT_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
diff --git a/meta/recipes-bsp/u-boot/u-boot_2013.07.bb b/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
deleted file mode 100644
index f07fd7c567..0000000000
--- a/meta/recipes-bsp/u-boot/u-boot_2013.07.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require u-boot.inc
2
3# This revision corresponds to the tag "v2013.07"
4# We use the revision in order to avoid having to fetch it from the repo during parse
5SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c"
6
7PV = "v2013.07+git${SRCPV}"
8
9SRC_URI += "file://0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch"
diff --git a/meta/recipes-bsp/u-boot/u-boot_2014.07.bb b/meta/recipes-bsp/u-boot/u-boot_2014.07.bb
new file mode 100644
index 0000000000..44cc52eb6c
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot_2014.07.bb
@@ -0,0 +1,9 @@
1require u-boot.inc
2
3DEPENDS += "dtc-native"
4
5# This revision corresponds to the tag "v2014.07"
6# We use the revision in order to avoid having to fetch it from the repo during parse
7SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
8
9PV = "v2014.07+git${SRCPV}"