From c451702f146b4dffb10a5d76002e09d2e37315a9 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 8 Jun 2016 19:32:41 -0700 Subject: colibri_vf: synchronize/improve memory options Synchronize initramfs related configuration options and improve memory layout. The memory layout with an offset of 16MiB allows to boot bigger kernels. With AUTO_ZRELADDR, which is pretty much the standard nowadays, the kernel relacates itself to PC masked with 0xf8000000 plus a text offset of 0x8000 (hence 0x80008000 for Vybrid). With a 16MiB offset from the start of memory and a 16MiB distance to the device-tree, we allow kernel up to ~16MiB. Signed-off-by: Stefan Agner Acked-by: Marcel Ziswiler --- include/configs/colibri_vf.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index e1c9313cea..98d9804fd2 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -94,6 +94,13 @@ #define CONFIG_SYS_TEXT_BASE 0x3f408000 #define CONFIG_BOARD_SIZE_LIMIT 524288 +#define MEM_LAYOUT_ENV_SETTINGS \ + "fdt_addr_r=0x82000000\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ + "kernel_addr_r=0x81000000\0" \ + "ramdisk_addr_r=0x82100000\0" + #define SD_BOOTCMD \ "sdargs=root=/dev/mmcblk0p2 rw rootwait\0" \ "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${mtdparts} " \ @@ -127,8 +134,6 @@ #define DFU_ALT_NAND_INFO "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4" #define CONFIG_EXTRA_ENV_SETTINGS \ - "kernel_addr_r=0x82000000\0" \ - "fdt_addr_r=0x84000000\0" \ "kernel_file=zImage\0" \ "fdt_board=eval-v3\0" \ "fdt_file=${soc}-colibri-${fdt_board}.dtb\0" \ @@ -148,6 +153,7 @@ "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \ "flash_eth.img && source ${loadaddr}\0" \ "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ + MEM_LAYOUT_ENV_SETTINGS \ "mtdparts=" MTDPARTS_DEFAULT "\0" \ "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \ SD_BOOTCMD \ -- cgit v1.2.3