sunxi: Tweak various memory addresses
PATCH 1/1 sunxi: Tweak various memory addresses
For the upcoming nand support we need a bigger heap, esp. ubi[fs] uses quite a bit of memory, increase the heap size to 64 MB.
Our video code returns unused reserved framebuffer memory to the kernel before booting it. Drop the #ifdef-ery and simply always reserve 16 MB.
Adjust bootm_size for the above changes.
--- include/configs/sunxi-common.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
include/configs/sunxi-common.h +5 -9
@@ -173,8 +173,8 @@#define CONFIG_SYS_MMC_ENV_DEV 0/* first detected MMC controller */ #endif -/* 4MB of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (4 << 20)) +/* 64MB of malloc() pool */ +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (64 << 20))/* * Miscellaneous configurable options
@@ -303,11 +303,7 @@ extern int soft_i2c_gpio_scl;* The amount of RAM to keep free at the top of RAM when relocating u-boot, * to use as framebuffer. This must be a multiple of 4096. */ -#ifdef CONFIG_VIDEO_LCD_PANEL_EDP_4_LANE_1620M_VIA_ANX9804 -#define CONFIG_SUNXI_MAX_FB_SIZE (12 << 20) -#else -#define CONFIG_SUNXI_MAX_FB_SIZE (9 << 20) -#endif +#define CONFIG_SUNXI_MAX_FB_SIZE (16 << 20)/* Do we want to initialize a simple FB? */ #define CONFIG_VIDEO_DT_SIMPLEFB
@@ -414,12 +410,12 @@ extern int soft_i2c_gpio_scl;#define CONFIG_PRE_CON_BUF_SZ 4096/* Aprox 2 80*25 screens */ /* -* 240M RAM (256M minimum minus space for the framebuffer), +* 160M RAM (256M minimum minus 64MB heap + 32MB for u-boot, stack, fb, etc. * 32M uncompressed kernel, 16M compressed kernel, 1M fdt, * 1M script, 1M pxe and the ramdisk@the end. */ #define MEM_LAYOUT_ENV_SETTINGS \ - "bootm_size=0xf000000\0" \ + "bootm_size=0xa000000\0" \ "kernel_addr_r=" __stringify(SDRAM_OFFSET(2000000)) "\0" \ "fdt_addr_r=" __stringify(SDRAM_OFFSET(3000000)) "\0" \ "scriptaddr=" __stringify(SDRAM_OFFSET(3100000)) "\0" \
Signature · 1 line
2.4.3
PATCH 1/1 sunxi: Tweak various memory addresses
Quoted 4 lines · Hans de Goede
For the upcoming nand support we need a bigger heap, esp. ubi[fs] uses
quite a bit of memory, increase the heap size to 64 MB.
Quoted 8 lines
Our video code returns unused reserved framebuffer memory to the kernel
before booting it. Drop the #ifdef-ery and simply always reserve 16 MB.Adjust
bootm_sizefor the above changes.Signed-off-by Hans de Goede <[email protected]>
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 sunxi: Tweak various memory addresses
Hi,
Quoted 26 lines · Karsten Merker
Quoted 2 lines · Hans de Goede
For the upcoming nand support we need a bigger heap, esp. ubi[fs] uses quite a bit of memory, increase the heap size to 64 MB.
[...]
include/configs/sunxi-common.h extern int soft_i2c_gpio_scl; · line 421
Quoted 12 lines
/*
- * 240M RAM (256M minimum minus space for the framebuffer),
+ * 160M RAM (256M minimum minus 64MB heap + 32MB for u-boot, stack, fb, etc.
* 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
* 1M script, 1M pxe and the ramdisk at the end.
*/
#defineMEM_LAYOUT_ENV_SETTINGS\include/configs/sunxi-common.h +1
-1-"bootm_size=0xf000000\0" \ +"bootm_size=0xa000000\0" \ "kernel_addr_r=" __stringify(SDRAM_OFFSET(2000000)) "\0" \ "fdt_addr_r=" __stringify(SDRAM_OFFSET(3000000)) "\0" \ "scriptaddr=" __stringify(SDRAM_OFFSET(3100000)) "\0" \Hello,
I am just thinking about the case where somebody upgrades an existing u-boot on an SD card to a new version with NAND support and then tries to run NAND-related commands. In that case there would still be the old
bootm_sizesetting in the environment, so that NAND-related commands might fail due to not enough heap.
Quoted 3 lines
Is there some kind of "release notes" document where we could note that on upgrading the user should run "env default
bootm_size; saveenv" or something alike?
Actually bootm_size is only used to determine where to relocate the kernel / initrd when doing a bootm command, and that relocation rarely happens. And the new bootm_size is only needed on 256M boards, of which we have only 1.
Moreover I do not expect a lot people to have ever done a saveenv command.
Regards,
Hans