TI: Add, use a DEFAULT_LINUX_BOOT_ENV environment string
PATCH v2 1/3 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.
---
Changes in v2:
- Change to 256MB as this is a must-use uppper value rather than a limit compared with known memory size, so was failing on some platforms. We only use this stanza on platforms we know have more than 256MB memory.
--- 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(-)
include/configs/am335x_evm.h +1 -4
@@ -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" \
include/configs/am43xx_evm.h +1 -4
@@ -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" \
include/configs/ti_armv7_common.h +21 -1
@@ -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 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"/* * Default to a quick boot delay.
include/configs/ti_omap4_common.h +1 -3
@@ -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" \
include/configs/ti_omap5_common.h +1 -4
@@ -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" \
Signature · 1 line
1.7.9.5
PATCH v2 1/3 TI: Add, use a DEFAULT_LINUX_BOOT_ENV environment string
Quoted 10 lines · Tom Rini
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/Bootingfile but also make sure that we relocate things within a valid address range.It is possible with these addresses to also set
fdt_highandinitrd_highto the value of0xffffffff. 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 <[email protected]>
Applied to u-boot-ti/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140418/8414d61d/attachment.pgp>
PATCH v2 2/3 am335x_evm: Update the ramdisk args, we pass things in just fine via DT
In reply to Tom Rini--- include/configs/am335x_evm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/am335x_evm.h +1 -1
@@ -79,7 +79,7 @@"nfsopts=nolock\0" \"static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \"::off\0" \ -"ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \ +"ramroot=/dev/ram0 rw\0" \"ramrootfstype=ext2\0" \"mmcargs=setenv bootargs console=${console} " \"${optargs} " \
Signature · 1 line
1.7.9.5
PATCH v2 2/3 am335x_evm: Update the ramdisk args, we pass things in just fine via DT
Quoted 1 line · Tom Rini
Signed-off-by Tom Rini <[email protected]>
Applied to u-boot-ti/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140418/150c32d6/attachment.pgp>
PATCH v2 3/3 am43xx_evm: Update the ramdisk args, we pass things in just fine via DT
In reply to Tom Rini--- include/configs/am43xx_evm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/am43xx_evm.h +1 -1
@@ -128,7 +128,7 @@"usbroot=/dev/sda2 rw\0" \"usbrootfstype=ext4 rootwait\0" \"usbdev=0\0" \ -"ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \ +"ramroot=/dev/ram0 rw\0" \"ramrootfstype=ext2\0" \"mmcargs=setenv bootargs console=${console} " \"${optargs} " \
Signature · 1 line
1.7.9.5
PATCH v2 3/3 am43xx_evm: Update the ramdisk args, we pass things in just fine via DT
Quoted 1 line · Tom Rini
Signed-off-by Tom Rini <[email protected]>
Applied to u-boot-ti/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140418/a46db562/attachment.pgp>