Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5c965ed901c09bd046a99c7dc9269e3be2829604

Authored by Hans de Goede
1 parent daf6d399ae
Exists in v2017.01-smarct4x and in 31 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

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.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>

Showing 1 changed file with 5 additions and 9 deletions Side-by-side Diff

include/configs/sunxi-common.h
Diff comments   View file @ 5c965ed
... ... @@ -145,8 +145,8 @@
145 145 #define CONFIG_SYS_MMC_ENV_DEV 0 /* first detected MMC controller */
146 146 #endif
147 147  
148   -/* 4MB of malloc() pool */
149   -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (4 << 20))
  148 +/* 64MB of malloc() pool */
  149 +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (64 << 20))
150 150  
151 151 /*
152 152 * Miscellaneous configurable options
... ... @@ -275,11 +275,7 @@
275 275 * The amount of RAM to keep free at the top of RAM when relocating u-boot,
276 276 * to use as framebuffer. This must be a multiple of 4096.
277 277 */
278   -#ifdef CONFIG_VIDEO_LCD_PANEL_EDP_4_LANE_1620M_VIA_ANX9804
279   -#define CONFIG_SUNXI_MAX_FB_SIZE (12 << 20)
280   -#else
281   -#define CONFIG_SUNXI_MAX_FB_SIZE (9 << 20)
282   -#endif
  278 +#define CONFIG_SUNXI_MAX_FB_SIZE (16 << 20)
283 279  
284 280 /* Do we want to initialize a simple FB? */
285 281 #define CONFIG_VIDEO_DT_SIMPLEFB
286 282  
... ... @@ -386,12 +382,12 @@
386 382 #define CONFIG_PRE_CON_BUF_SZ 4096 /* Aprox 2 80*25 screens */
387 383  
388 384 /*
389   - * 240M RAM (256M minimum minus space for the framebuffer),
  385 + * 160M RAM (256M minimum minus 64MB heap + 32MB for u-boot, stack, fb, etc.
390 386 * 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
391 387 * 1M script, 1M pxe and the ramdisk at the end.
392 388 */
393 389 #define MEM_LAYOUT_ENV_SETTINGS \
394   - "bootm_size=0xf000000000000\0" \" \
  390 + "bootm_size=0xa000000000000\0" \" \
395 391 "kernel_addr_r=" __stringify(SDRAM_OFFSET(2000000)) "\0" \
396 392 "fdt_addr_r=" __stringify(SDRAM_OFFSET(3000000)) "\0" \
397 393 "scriptaddr=" __stringify(SDRAM_OFFSET(3100000)) "\0" \