diff options
3 files changed, 4 insertions, 83 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_2013.07%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_2013.07%.bbappend index 6d4a18fc4..12fddbfe3 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_2013.07%.bbappend +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_2013.07%.bbappend @@ -1,10 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -#SRC_URI += "file://fw_env.config -SRC_URI += "file://patch-2013.07/0000-u-boot-aspeed-064.patch \ - file://patch-2013.07/0001-u-boot-openbmc.patch \ - file://config.patch \ - " +SRC_URI += "file://config.patch" # Do not install u-boot in rootfs #do_install[postfuncs] += "remove_uboot_from_rootfs" diff --git a/meta-phosphor/common/recipes-bsp/u-boot/files/0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch b/meta-phosphor/common/recipes-bsp/u-boot/files/0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch deleted file mode 100644 index 77e35bbc7..000000000 --- a/meta-phosphor/common/recipes-bsp/u-boot/files/0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch +++ /dev/null @@ -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 - diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2013.07.bb b/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2013.07.bb index f3e2f5603..80715e7c1 100644 --- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2013.07.bb +++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2013.07.bb @@ -12,13 +12,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ # 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" +SRCREV = "${AUTOREV}" PV = "v2013.07+git${SRCPV}" -SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ - file://0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch \ - " +UBRANCH = "v2013.07-aspeed-openbmc" +SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https" S = "${WORKDIR}/git" |