mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

u-boot: update to version 2014.07

Browse Source 
u-boot doesn't really support building its tools for the target, as they are
built with HOSTCC compiler, which is also used to compile fixdep utility
that gets executed during the build. Since it might be beneficial to have a
target version of mkimage, let's hack it to build fixdep in a separate step.

(From OE-Core rev: a8692184d25cb7d8cb3b617e1dfb901fe1b0ca3d)

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Denys Dmytriyenko
2014-09-16 19:10:01 -04:00
committed by Richard Purdie
parent 2abfdcfd1c
commit 5c23ec681c
7 changed files with 28 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-bsp/u-boot/files/0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch
-74
View File
@@ -1,74 +0,0 @@
From 5701384cea4a829b772bf7a96a74825b58c22385 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Thu, 17 Apr 2014 12:25:40 -0400
Subject: [PATCH] am335x_evm.h: Add, use DEFAULT_LINUX_BOOT_ENV environment
string
Modified version of the patch currently being reviewed for mainline:
http://patchwork.ozlabs.org/patch/334861/
To deal with a reoccurring problem properly we need to specify addresses
for the Linux kernel, Flatted Device Tree and ramdisk that obey the
constraints within the kernel's Documentation/arm/Booting file but also
make sure that we relocate things within a valid address range.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
Upstream-Status: Pending
---
include/configs/am335x_evm.h | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index c5a6d4b..01e32b3 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -54,10 +54,7 @@
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \
- "loadaddr=0x80200000\0" \
- "fdtaddr=0x80F80000\0" \
- "fdt_high=0xffffffff\0" \
- "rdaddr=0x81000000\0" \
+ DEFAULT_LINUX_BOOT_ENV \
"bootdir=/boot\0" \
"bootfile=uImage\0" \
"fdtfile=undefined\0" \
@@ -197,7 +194,31 @@
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START \
+ (8 * 1024 * 1024))
-#define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */
+/*
+ * Our DDR memory always starts at 0x80000000 and U-Boot shall have
+ * relocated itself to higher in memory by the time this value is used.
+ * However, set this to a 32MB offset to allow for easier Linux kernel
+ * booting as the default is often used as the kernel load address.
+ */
+#define CONFIG_SYS_LOAD_ADDR 0x82000000 /* Default load address */
+
+/*
+ * We setup defaults based on constraints from the Linux kernel, which should
+ * also be safe elsewhere. We have the default load at 32MB into DDR (for
+ * the kernel), FDT above 128MB (the maximum location for the end of the
+ * kernel), and the ramdisk 512KB above that (allowing for hopefully never
+ * seen large trees). We say all of this must be within the first 256MB
+ * as that will normally be within the kernel lowmem and thus visible via
+ * bootm_size and we only run on platforms with 256MB or more of memory.
+ */
+#define DEFAULT_LINUX_BOOT_ENV \
+ "loadaddr=0x82000000\0" \
+ "kernel_addr_r=0x82000000\0" \
+ "fdtaddr=0x88000000\0" \
+ "fdt_addr_r=0x88000000\0" \
+ "rdaddr=0x88080000\0" \
+ "ramdisk_addr_r=0x88080000\0" \
+ "bootm_size=0x10000000\0"
#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
--
1.9.2
meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb → meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2014.07.bb
+5 -5
View File
@@ -1,15 +1,15 @@
SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
SECTION = "bootloader"
DEPENDS = "mtd-utils"
# This revision corresponds to the tag "v2013.07"
# This revision corresponds to the tag "v2014.07"
# We use the revision in order to avoid having to fetch it from the
# repo during parse
SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c"
SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
PV = "v2013.07+git${SRCPV}"
PV = "v2014.07+git${SRCPV}"
SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
@@ -17,7 +17,7 @@ S = "${WORKDIR}/git"
inherit uboot-config cross
EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} ${TOOLCHAIN_OPTIONS}"'
do_compile () {
oe_runmake ${UBOOT_MACHINE}
meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb → meta/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb
+5 -5
View File
@@ -1,21 +1,21 @@
SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
SECTION = "bootloader"
DEPENDS = "mtd-utils"
# This revision corresponds to the tag "v2013.07"
# This revision corresponds to the tag "v2014.07"
# We use the revision in order to avoid having to fetch it from the
# repo during parse
SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c"
SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
PV = "v2013.07+git${SRCPV}"
PV = "v2014.07+git${SRCPV}"
SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
S = "${WORKDIR}/git"
EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTSTRIP="true"'
INSANE_SKIP_${PN} = "already-stripped"
inherit uboot-config
meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb → meta/recipes-bsp/u-boot/u-boot-mkimage_2014.07.bb
+7 -5
View File
@@ -1,14 +1,14 @@
SUMMARY = "U-Boot bootloader image creation tool"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
SECTION = "bootloader"
# This revision corresponds to the tag "v2013.07"
# This revision corresponds to the tag "v2014.07"
# We use the revision in order to avoid having to fetch it from the
# repo during parse
SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c"
SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
PV = "v2013.07+git${SRCPV}"
PV = "v2014.07+git${SRCPV}"
SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
@@ -20,7 +20,9 @@ do_compile () {
# Make sure the recompile is OK
rm -f ${B}/tools/.depend
oe_runmake tools
make HOSTCC="${BUILD_CC}" HOSTLD="${BUILD_LD}" HOSTLDFLAGS="${BUILD_LDFLAGS}" HOSTSTRIP=true dot-config=0 scripts_basic
sed 's/^tools-only: scripts_basic /tools-only: /' -i Makefile
oe_runmake tools-only
}
do_install () {
meta/recipes-bsp/u-boot/u-boot.inc
+2 -3
View File
@@ -4,8 +4,7 @@ SECTION = "bootloaders"
PROVIDES = "virtual/bootloader"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
file://README;beginline=1;endline=22;md5=78b195c11cb6ef63e6985140db7d7bab"
LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
@@ -24,7 +23,7 @@ UBOOT_LOCALVERSION ?= ""
# Some versions of u-boot use .bin and others use .img. By default use .bin
# but enable individual recipes to change this value.
UBOOT_SUFFIX ?= "bin"
UBOOT_SUFFIX ??= "bin"
UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
UBOOT_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
meta/recipes-bsp/u-boot/u-boot_2013.07.bb
-9
View File
@@ -1,9 +0,0 @@
require u-boot.inc
# This revision corresponds to the tag "v2013.07"
# We use the revision in order to avoid having to fetch it from the repo during parse
SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c"
PV = "v2013.07+git${SRCPV}"
SRC_URI += "file://0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch"
meta/recipes-bsp/u-boot/u-boot_2014.07.bb
+9
View File
@@ -0,0 +1,9 @@
require u-boot.inc
DEPENDS += "dtc-native"
# This revision corresponds to the tag "v2014.07"
# We use the revision in order to avoid having to fetch it from the repo during parse
SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
PV = "v2014.07+git${SRCPV}"