summaryrefslogtreecommitdiffstats
path: root/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch
diff options
context:
space:
mode:
authorDennis Gilmore <dennis@ausil.us>2014-03-15 10:33:03 -0500
committerDennis Gilmore <dennis@ausil.us>2014-03-15 10:33:03 -0500
commitf0eb5e434f160f23d912a14100119ee567a114b1 (patch)
tree0ecc9d94b96cff789f7fb60591c185a0ee7aa9aa /0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch
parentbcb02e56432f409f0a7fd30697fe1b238528b51a (diff)
downloaduboot-tools-f0eb5e434f160f23d912a14100119ee567a114b1.tar.gz
uboot-tools-f0eb5e434f160f23d912a14100119ee567a114b1.tar.xz
uboot-tools-f0eb5e434f160f23d912a14100119ee567a114b1.zip
Add missing header
- pull in patches on their way upstream to fix some issues with ti - systems. - refactor beaglebone and pandaboard patches
Diffstat (limited to '0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch')
-rw-r--r--0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch125
1 files changed, 125 insertions, 0 deletions
diff --git a/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch b/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch
new file mode 100644
index 0000000..3afdc93
--- /dev/null
+++ b/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch
@@ -0,0 +1,125 @@
+From b2f0945f9542a53960d8e394725f9de199059974 Mon Sep 17 00:00:00 2001
+From: Tom Rini <trini@ti.com>
+Date: Tue, 11 Mar 2014 15:42:01 -0400
+Subject: [PATCH 1/8] TI: Add, use a DEFAULT_LINUX_BOOT_ENV environment string
+
+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.
+
+It is possible with these addresses to also set fdt_high and initrd_high
+to the value of 0xffffffff. We don't do this by default to allow for
+the most likely success of people using custom addresses however.
+
+Signed-off-by: Tom Rini <trini@ti.com>
+---
+ include/configs/am335x_evm.h | 5 +----
+ include/configs/am43xx_evm.h | 5 +----
+ include/configs/ti_armv7_common.h | 22 +++++++++++++++++++++-
+ include/configs/ti_omap4_common.h | 4 +---
+ include/configs/ti_omap5_common.h | 5 +----
+ 5 files changed, 25 insertions(+), 16 deletions(-)
+
+diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
+index 2020e7f..6bd8aec 100644
+--- a/include/configs/am335x_evm.h
++++ b/include/configs/am335x_evm.h
+@@ -61,11 +61,8 @@
+
+ #ifndef CONFIG_SPL_BUILD
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+- "loadaddr=0x80200000\0" \
+- "fdtaddr=0x80F80000\0" \
+- "fdt_high=0xffffffff\0" \
++ DEFAULT_LINUX_BOOT_ENV \
+ "boot_fdt=try\0" \
+- "rdaddr=0x81000000\0" \
+ "bootpart=0:2\0" \
+ "bootdir=/boot\0" \
+ "bootfile=zImage\0" \
+diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
+index 614857d..27777c5 100644
+--- a/include/configs/am43xx_evm.h
++++ b/include/configs/am43xx_evm.h
+@@ -112,10 +112,7 @@
+
+ #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 \
+ "fdtfile=undefined\0" \
+ "bootpart=0:2\0" \
+ "bootdir=/boot\0" \
+diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
+index 69d69a5..fda99fb 100644
+--- a/include/configs/ti_armv7_common.h
++++ b/include/configs/ti_armv7_common.h
+@@ -36,8 +36,28 @@
+ /*
+ * 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 0x80000000
++#define CONFIG_SYS_LOAD_ADDR 0x82000000
++
++/*
++ * 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 512MB
++ * as that will always be within the kernel lowmem and thus visible via
++ * bootm_size.
++ */
++#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=0x20000000\0"
+
+ /*
+ * Default to a quick boot delay.
+diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
+index bcb5eab..387f570 100644
+--- a/include/configs/ti_omap4_common.h
++++ b/include/configs/ti_omap4_common.h
+@@ -87,10 +87,8 @@
+ * Environment setup
+ */
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+- "loadaddr=0x82000000\0" \
++ DEFAULT_LINUX_BOOT_ENV \
+ "console=ttyO2,115200n8\0" \
+- "fdt_high=0xffffffff\0" \
+- "fdtaddr=0x80f80000\0" \
+ "fdtfile=undefined\0" \
+ "bootpart=0:2\0" \
+ "bootdir=/boot\0" \
+diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
+index 7b10fbd..2443d55 100644
+--- a/include/configs/ti_omap5_common.h
++++ b/include/configs/ti_omap5_common.h
+@@ -70,10 +70,7 @@
+ #endif
+
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+- "loadaddr=0x80200000\0" \
+- "fdtaddr=0x80F80000\0" \
+- "fdt_high=0xffffffff\0" \
+- "rdaddr=0x81000000\0" \
++ DEFAULT_LINUX_BOOT_ENV \
+ "console=" CONSOLEDEV ",115200n8\0" \
+ "fdtfile=undefined\0" \
+ "bootpart=0:2\0" \
+--
+1.9.0
+