diff options
| author | Rob Herring <rob.herring@linaro.org> | 2015-01-19 17:41:11 -0600 |
|---|---|---|
| committer | Rob Herring <rob.herring@linaro.org> | 2015-01-27 17:04:47 -0600 |
| commit | d1fbf0c389e9fa3a950604e87c684b78bb824e1d (patch) | |
| tree | 59730537d74b6e535fb49e432165feaa5e5cbc3a | |
| parent | 92dcbd98601cfee0ddd4d1b98f19433cd8d7c6cb (diff) | |
pxa1928ara: adjust memory start and load addresses
Newer kernels expect to be at an offset less than 2MB from start of RAM, so
we should include all 18MB reserved from Trustzone. This plus the smaller
kernel offset causes problems with the dtb load address so shuffle around
the load addresses. Now we have 32MB for kernel, 16MB for dtb, and
effectively unlimited for ramdisk.
Change-Id: I5735f1b67486a65b2089566aadf1d1faf1b0bde3
Signed-off-by: Rob Herring <rob.herring@linaro.org>
| -rw-r--r-- | include/configs/pxa1928_ara.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/pxa1928_ara.h b/include/configs/pxa1928_ara.h index d445e6a1ce..4ffa017822 100644 --- a/include/configs/pxa1928_ara.h +++ b/include/configs/pxa1928_ara.h @@ -41,7 +41,7 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SRAM_BASE + 0x1000) #define CONFIG_SYS_RELOC_END 0x09700000 -#define CONFIG_TZ_HYPERVISOR_SIZE (0x01000000) +#define CONFIG_TZ_HYPERVISOR_SIZE (0x01200000) /* * Commands configuration @@ -103,7 +103,7 @@ #define CONFIG_BOOTCOMMAND "fastboot; mrvlboot" #define CONFIG_MMC_BOOT_DEV "mmc dev 0 0" -#define RAMDISK_LOADADDR (CONFIG_TZ_HYPERVISOR_SIZE + 0x02000000) +#define RAMDISK_LOADADDR (CONFIG_TZ_HYPERVISOR_SIZE + 0x03000000) #define BOOTIMG_EMMC_ADDR 0x01000000 #define RECOVERYIMG_EMMC_ADDR 0x00500000 /* Kernel size is set to 4MB for legacy non-boot.img format */ @@ -112,7 +112,7 @@ #define RECOVERY_KERNEL_LOADADDR (CONFIG_TZ_HYPERVISOR_SIZE + 0x01080000) #define RECOVERY_RAMDISK_LOADADDR (CONFIG_TZ_HYPERVISOR_SIZE + 0x02A00000) #define CONFIG_OF_LIBFDT -#define DTB_LOADADDR (CONFIG_TZ_HYPERVISOR_SIZE + 0x000e0000) +#define DTB_LOADADDR (CONFIG_TZ_HYPERVISOR_SIZE + 0x02000000) #define DTB_EMMC_ADDR (BOOTIMG_EMMC_ADDR + 0xF00000) #define RECOVERY_DTB_EMMC_ADDR (RECOVERYIMG_EMMC_ADDR + 0x900000) #define DTB_SIZE 0x00040000 |