@ -145,8 +145,8 @@
# define CONFIG_SYS_MMC_ENV_DEV 0 /* first detected MMC controller */
# define CONFIG_SYS_MMC_ENV_DEV 0 /* first detected MMC controller */
# endif
# endif
/* 4MB of malloc() pool */
/* 6 4MB of malloc() pool */
# define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (4 << 20))
# define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (6 4 << 20))
/*
/*
* Miscellaneous configurable options
* Miscellaneous configurable options
@ -275,11 +275,7 @@ extern int soft_i2c_gpio_scl;
* The amount of RAM to keep free at the top of RAM when relocating u - boot ,
* 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.
* 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 (16 << 20)
# define CONFIG_SUNXI_MAX_FB_SIZE (12 << 20)
# else
# define CONFIG_SUNXI_MAX_FB_SIZE (9 << 20)
# endif
/* Do we want to initialize a simple FB? */
/* Do we want to initialize a simple FB? */
# define CONFIG_VIDEO_DT_SIMPLEFB
# define CONFIG_VIDEO_DT_SIMPLEFB
@ -386,12 +382,12 @@ extern int soft_i2c_gpio_scl;
# define CONFIG_PRE_CON_BUF_SZ 4096 /* Aprox 2 80*25 screens */
# define CONFIG_PRE_CON_BUF_SZ 4096 /* Aprox 2 80*25 screens */
/*
/*
* 24 0M RAM ( 256 M minimum minus spac e for the framebuffer ) ,
* 16 0M RAM ( 256 M minimum minus 64 MB h eap + 32 MB for u - boot , stack , fb , etc .
* 32 M uncompressed kernel , 16 M compressed kernel , 1 M fdt ,
* 32 M uncompressed kernel , 16 M compressed kernel , 1 M fdt ,
* 1 M script , 1 M pxe and the ramdisk at the end .
* 1 M script , 1 M pxe and the ramdisk at the end .
*/
*/
# define MEM_LAYOUT_ENV_SETTINGS \
# define MEM_LAYOUT_ENV_SETTINGS \
" bootm_size=0xf 000000 \0 " \
" bootm_size=0xa 000000 \0 " \
" kernel_addr_r= " __stringify ( SDRAM_OFFSET ( 2000000 ) ) " \0 " \
" kernel_addr_r= " __stringify ( SDRAM_OFFSET ( 2000000 ) ) " \0 " \
" fdt_addr_r= " __stringify ( SDRAM_OFFSET ( 3000000 ) ) " \0 " \
" fdt_addr_r= " __stringify ( SDRAM_OFFSET ( 3000000 ) ) " \0 " \
" scriptaddr= " __stringify ( SDRAM_OFFSET ( 3100000 ) ) " \0 " \
" scriptaddr= " __stringify ( SDRAM_OFFSET ( 3100000 ) ) " \0 " \