Brad Bishop | 0028d5a | 2015-10-08 15:15:52 -0400 | [diff] [blame] | 1 | From 5701384cea4a829b772bf7a96a74825b58c22385 Mon Sep 17 00:00:00 2001 |
| 2 | From: Denys Dmytriyenko <denys@ti.com> |
| 3 | Date: Thu, 17 Apr 2014 12:25:40 -0400 |
| 4 | Subject: [PATCH] am335x_evm.h: Add, use DEFAULT_LINUX_BOOT_ENV environment |
| 5 | string |
| 6 | |
| 7 | Modified version of the patch currently being reviewed for mainline: |
| 8 | http://patchwork.ozlabs.org/patch/334861/ |
| 9 | |
| 10 | To deal with a reoccurring problem properly we need to specify addresses |
| 11 | for the Linux kernel, Flatted Device Tree and ramdisk that obey the |
| 12 | constraints within the kernel's Documentation/arm/Booting file but also |
| 13 | make sure that we relocate things within a valid address range. |
| 14 | |
| 15 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> |
| 16 | Signed-off-by: Tom Rini <trini@ti.com> |
| 17 | |
| 18 | Upstream-Status: Pending |
| 19 | --- |
| 20 | include/configs/am335x_evm.h | 31 ++++++++++++++++++++++++++----- |
| 21 | 1 file changed, 26 insertions(+), 5 deletions(-) |
| 22 | |
| 23 | diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h |
| 24 | index 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 | -- |
| 73 | 1.9.2 |
| 74 | |