diff options
| author | Michael Brandt <michael.brandt@stericsson.com> | 2010-07-06 16:36:12 +0200 |
|---|---|---|
| committer | Michael BRANDT <michael.brandt@stericsson.com> | 2010-07-07 13:11:48 +0200 |
| commit | 7e89ff95e5b71ccb1d428965d13da91c2d2a8e3f (patch) | |
| tree | d6f590cdf72ec40bc4239201c83f88f014757758 /include/configs/u8500.h | |
| parent | 6fbd684fc8572277a65109a3f0296ba9377a9863 (diff) | |
memory bootargs change
Related to ER 265783 "Existing SI memory map no more compatible for MM"
and ER 260608 "VC: Black incoming call screen".
The Linux kernel and graphics memory parameters have changed.
Furthermore there are different layouts for 256 MB and 512 MB SDRAM resp.
With this change U-Boot detects dynamically the memory size by making some
fixed assumptions about the memory chip and controller and by reading the
number of actually used rows and columns.
It then sets the environment variable memargs to add either memargs256
or memargs512 to "bootargs". "memargs256" and "memargs512" are stored in the
U-Boot environment area. The default values are set in include/configs/u5000.h
Also the default uImage copy size was increased from 2 MiB to 3 MiB, since
the released uImage size is close to 2 MiB and some developers uImage is
already above.
Tested with HREF ED (256 MB) (LBP only), HREF 1.0 V20 OM (256 MB) and
HREF+ 1.1 V31 (512 MB).
Erase the U-Boot environment first, if you want the new settings.
ST-Ericsson ID: ER265783
Signed-off-by: Michael Brandt <michael.brandt@stericsson.com>
Change-Id: I2467c9e410738a3655fc0fd25548cd6f4eb8351c
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2464
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Reviewed-by: Per-Daniel OLSSON <per-daniel.olsson@stericsson.com>
Reviewed-by: Dan JOHANSSON <dan.johansson@stericsson.com>
Diffstat (limited to 'include/configs/u8500.h')
| -rw-r--r-- | include/configs/u8500.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/include/configs/u8500.h b/include/configs/u8500.h index b829de92b..7ae82dc2d 100644 --- a/include/configs/u8500.h +++ b/include/configs/u8500.h @@ -120,9 +120,13 @@ "verify=n\0" \ "loadaddr=0x00100000\0" \ "console=ttyAMA2,115200n8\0" \ + "memargs256=mem=96M@0 mem_modem=32M@96M mem=30M@128M " \ + "pmem=22M@158M pmem_hwb=44M@180M mem_mali=32@224M\0" \ + "memargs512=mem=96M@0 mem_modem=32M@96M mem=44M@128M " \ + "pmem=22M@172M mem=30M@194M mem_mali=32M@224M " \ + "pmem_hwb=54M@256M mem=202M@310M\0" \ "commonargs=setenv bootargs cachepolicy=writealloc noinitrd " \ - "init=init mem=96M@0 mem=34M@128M " \ - "pmem=22M@162M pmem_mio=8M@184M pmem_hwb=32M@192M " \ + "init=init " \ "board_id=${board_id} " \ "logo.${logo} " \ "startup_graphics=${startup_graphics}\0" \ @@ -132,8 +136,8 @@ "addcons=setenv bootargs ${bootargs} " \ "console=${console}\0" \ "emmcboot=echo Booting from eMMC ...; " \ - "run commonargs emmcargs addcons;" \ - "emmc_read ${loadaddr} 0x14000000 0x200000; " \ + "run commonargs emmcargs addcons memargs;" \ + "emmc_read ${loadaddr} 0x14000000 0x300000; " \ "bootm ${loadaddr}\0" \ "cmdfile=mmc init 1;mmc_read_cmd_file;run bootcmd\0" \ "flash=mmc init 1;fatload mmc 1 ${loadaddr} flash.scr;" \ @@ -150,12 +154,12 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_PROMPT "U8500 $ " /* Monitor Command Prompt */ -#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ +#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ + sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ +#define CONFIG_SYS_MAXARGS 32 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Arg Buffer Size */ #undef CONFIG_SYS_CLKS_IN_HZ /* everything, incl board info, in Hz */ |