diff options
| author | Andreas Huber <andreas.huber@keymile.com> | 2011-09-13 23:06:11 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-22 00:29:09 +0200 |
| commit | 2a7714ce64cfd954535f0c96f2809e2fd80d84f0 (patch) | |
| tree | b84c02276f7145a3b1f5bf720e1128db7d60b2c1 /board/keymile | |
| parent | 0eb0e59ed3955cd73548c8769bf594c665025dd5 (diff) | |
km/common: fix ramfs development target
Calucations of PRAM needs to take into account the 'rootfssize'.
Memory available to the linux kernel 'mem=' is in all cases set to the total
memory size minus the pram size.
Signed-off-by: Andreas Huber <andreas.huber@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/keymile')
| -rw-r--r-- | board/keymile/common/common.c | 16 | ||||
| -rw-r--r-- | board/keymile/scripts/develop-common.txt | 1 | ||||
| -rw-r--r-- | board/keymile/scripts/ramfs-common.txt | 5 |
3 files changed, 17 insertions, 5 deletions
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index fce9d582f..a585f17fe 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -64,20 +64,32 @@ int set_km_env(void) unsigned int pnvramaddr; unsigned int pram; unsigned int varaddr; + unsigned int kernelmem; + char *p; + unsigned long rootfssize = 0; pnvramaddr = gd->ram_size - CONFIG_KM_RESERVED_PRAM - CONFIG_KM_PHRAM - CONFIG_KM_PNVRAM; sprintf((char *)buf, "0x%x", pnvramaddr); setenv("pnvramaddr", (char *)buf); - pram = (CONFIG_KM_RESERVED_PRAM + CONFIG_KM_PHRAM + CONFIG_KM_PNVRAM) / - 0x400; + /* try to read rootfssize (ram image) from envrionment */ + p = getenv("rootfssize"); + if (p != NULL) + strict_strtoul(p, 16, &rootfssize); + pram = (rootfssize + CONFIG_KM_RESERVED_PRAM + CONFIG_KM_PHRAM + + CONFIG_KM_PNVRAM) / 0x400; sprintf((char *)buf, "0x%x", pram); setenv("pram", (char *)buf); varaddr = gd->ram_size - CONFIG_KM_RESERVED_PRAM - CONFIG_KM_PHRAM; sprintf((char *)buf, "0x%x", varaddr); setenv("varaddr", (char *)buf); + + kernelmem = gd->ram_size - 0x400 * pram; + sprintf((char *)buf, "0x%x", kernelmem); + setenv("kernelmem", (char *)buf); + return 0; } diff --git a/board/keymile/scripts/develop-common.txt b/board/keymile/scripts/develop-common.txt index 3ccd0397b..93e296745 100644 --- a/board/keymile/scripts/develop-common.txt +++ b/board/keymile/scripts/develop-common.txt @@ -4,3 +4,4 @@ configure=km_setboardid && saveenv && reset subbootcmds=tftpfdt tftpkernel nfsargs add_default boot nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:/opt/eldk/${arch} tftpkernel=tftpboot ${load_addr_r} ${hostname}/uImage +rootfssize=0 diff --git a/board/keymile/scripts/ramfs-common.txt b/board/keymile/scripts/ramfs-common.txt index 9315500af..c1b45ab02 100644 --- a/board/keymile/scripts/ramfs-common.txt +++ b/board/keymile/scripts/ramfs-common.txt @@ -1,11 +1,10 @@ -addramfs=setenv bootargs "${bootargs} mem=${rootfsaddr} phram.phram=rootfs${boot_bank},${rootfsaddr},${rootfssize}" +addramfs=setenv bootargs "${bootargs} phram.phram=rootfs${boot_bank},${rootfsaddr},${rootfssize}" actual_bank=-1 altbootcmd=run ${subbootcmds} bootcmd=run ${subbootcmds} subbootcmds=tftpfdt tftpkernel setrootfsaddr tftpramfs flashargs add_default addpanic addramfs boot nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} -configure=km_setboardid && run setramfspram && saveenv && reset -setramfspram=setexpr value 0 + ${rootfssize} && setexpr value 0x${value} / 0x400 && setexpr value 0x${value} + ${pram} && setenv pram 0x${value} +configure=km_setboardid && saveenv && reset rootfsfile=${hostname}/rootfsImage setrootfsaddr=setexpr value ${pnvramaddr} - ${rootfssize} && setenv rootfsaddr 0x${value} tftpkernel=tftpboot ${load_addr_r} ${hostname}/uImage |