diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2013-12-16 20:44:04 -0200 | 
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-01-03 15:44:05 +0100 | 
| commit | 6584a1b52624d60249c3d5115b176315dbac3939 (patch) | |
| tree | a1c16cddf8c15f34687e1f47a06dc0fcbb21292a /include | |
| parent | 8ae269d41e2551439284d2c837c476ae4a357032 (diff) | |
| download | olio-uboot-2014.01-6584a1b52624d60249c3d5115b176315dbac3939.tar.xz olio-uboot-2014.01-6584a1b52624d60249c3d5115b176315dbac3939.zip | |
ARM: mx6: Change the FDT loading address to avoid overlaping
This patch fixes allow for the DeviceTree and initrd relocation fixing
the boot of FSL 3.10.9-1.0.0-alpha kernel.
This changes following boards:
 - mx6sabreauto
 - mx6sabresd
 - wandboard
 - udoo
 - nitrogen6x
 - cgtqmx6eval
The reasoning, as explained by Hui Liu, is:
,----
| The FDT blob will be placed at DDR physical addr: 0x11000000. When Linux kernel
| Boot up, it will decompress the compressed kernel image and place the decompressed
| kernel image at the low end of the DDR memory and start running from it. If the
| decompressed kernel image is bigger for example than 16M, it may over written the
| fdt blob which u-boot loaded to the DDR memory @0x11000000 with fdt_addr=0x11000000
|
| To expand the fdt_addr from 0x11000000 to 0x18000000, which can avoid the override
| Since we will not likely have one kernel image larger than 128MB.
`----
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/cgtqmx6eval.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6sabre_common.h | 2 | ||||
| -rw-r--r-- | include/configs/nitrogen6x.h | 2 | ||||
| -rw-r--r-- | include/configs/udoo.h | 2 | ||||
| -rw-r--r-- | include/configs/wandboard.h | 2 | 
5 files changed, 5 insertions, 5 deletions
| diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index d5db8f504..29a023c49 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -81,7 +81,7 @@  	"console=ttymxc1\0" \  	"fdt_high=0xffffffff\0" \  	"initrd_high=0xffffffff\0" \ -	"fdt_addr=0x11000000\0" \ +	"fdt_addr=0x18000000\0" \  	"boot_fdt=try\0" \  	"mmcdev=1\0" \  	"mmcpart=1\0" \ diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 63405aa70..21c848f90 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -99,7 +99,7 @@  	"script=boot.scr\0" \  	"uimage=uImage\0" \  	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ -	"fdt_addr=0x11000000\0" \ +	"fdt_addr=0x18000000\0" \  	"boot_fdt=try\0" \  	"ip_dyn=yes\0" \  	"console=" CONFIG_CONSOLE_DEV "\0" \ diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 9c9f8f7a7..f4ff5cd1b 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -180,7 +180,7 @@  	"fdt_high=0xffffffff\0" \  	"initrd_high=0xffffffff\0" \  	"fdt_file=imx6q-sabrelite.dtb\0" \ -	"fdt_addr=0x11000000\0" \ +	"fdt_addr=0x18000000\0" \  	"boot_fdt=try\0" \  	"ip_dyn=yes\0" \  	"mmcdev=0\0" \ diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 4d96f18b0..614e1fe3b 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -106,7 +106,7 @@  	"fdt_high=0xffffffff\0" \  	"initrd_high=0xffffffff\0" \  	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ -	"fdt_addr=0x11000000\0" \ +	"fdt_addr=0x18000000\0" \  	"boot_fdt=try\0" \  	"ip_dyn=yes\0" \  	"mmcdev=0\0" \ diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 8ce2d6e17..ae8480dd2 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -114,7 +114,7 @@  	"fdt_high=0xffffffff\0" \  	"initrd_high=0xffffffff\0" \  	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ -	"fdt_addr=0x11000000\0" \ +	"fdt_addr=0x18000000\0" \  	"boot_fdt=try\0" \  	"ip_dyn=yes\0" \  	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ |