From fb3ad9bd923daafed9818c579d841f05c8ecbeb0 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 28 Mar 2014 15:03:29 -0400 Subject: 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 --- include/configs/ti_omap5_common.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'include/configs/ti_omap5_common.h') diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 7b10fbd28a..2443d55934 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" \ -- cgit From 2737f0112b83172df433a034ce68c43a170db25c Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 3 Apr 2014 07:52:52 -0400 Subject: TI:omap5: Move CONFIG_ENV_SIZE to board config files The size of the environment depends on the backing store, move this to the board config files. Signed-off-by: Tom Rini --- include/configs/ti_omap5_common.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/configs/ti_omap5_common.h') diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 2443d55934..642ca0a735 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -46,8 +46,6 @@ #include #include -#define CONFIG_ENV_SIZE (128 << 10) - #include /* -- cgit From d3289aac64c5785d782b8a6e1ab2112e1e463b33 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 3 Apr 2014 07:52:53 -0400 Subject: TI:armv7: Change Falcon Mode DT load address In general, we want to load the DT at base+128MB, so that we ahve sufficient room for the kernel and a larger device tree. In the case of OMAP3, use 64MB instead as we have a number of boards with 128MB DDR. Signed-off-by: Tom Rini --- include/configs/ti_omap5_common.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/configs/ti_omap5_common.h') diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 642ca0a735..a582fa4041 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -140,6 +140,8 @@ #define CONFIG_SPL_MAX_SIZE (0x4031E000 - CONFIG_SPL_TEXT_BASE) #define CONFIG_SPL_DISPLAY_PRINT #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" +#define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ + (128 << 20)) #ifdef CONFIG_NAND #define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */ -- cgit