diff options
| author | Mathieu J. Poirier <mathieu.poirier@linaro.org> | 2011-05-30 16:39:09 -0600 |
|---|---|---|
| committer | Mats Bergstrom <mats.m.bergstrom@stericsson.com> | 2011-10-06 12:46:34 +0200 |
| commit | 5d12da656c5a27d5a27aaabc1e9cb822d9a434c6 (patch) | |
| tree | d4188dc508d7552d17233cbd48d362b8ec5a36bc | |
| parent | e0184bba1ebe389a62762d902a370fa511de100e (diff) | |
The code should not hard-code memargs, environment variables are meant to be flexible. Confining the change to snowball.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
| -rw-r--r-- | board/st/u8500/u8500.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/board/st/u8500/u8500.c b/board/st/u8500/u8500.c index bff0a7937..59f5f79dd 100644 --- a/board/st/u8500/u8500.c +++ b/board/st/u8500/u8500.c @@ -630,13 +630,20 @@ out: * memargs512 environment variable, depending on the memory size. * memargs is used to build the bootargs, memargs256 and memargs512 are * stored in the environment. + * + * Don't disturb if snowball. */ - if (gd->bd->bi_dram[0].size == 0x10000000) { - setenv("memargs", "setenv bootargs ${bootargs} ${memargs256}"); - setenv("mem", "256M"); - } else { - setenv("memargs", "setenv bootargs ${bootargs} ${memargs512}"); - setenv("mem", "512M"); + + if (!u8500_is_snowball()){ + if (gd->bd->bi_dram[0].size == 0x10000000) { + setenv("memargs", "setenv bootargs ${bootargs} \ + ${memargs256}"); + setenv("mem", "256M"); + } else { + setenv("memargs", "setenv bootargs ${bootargs} \ + ${memargs512}"); + setenv("mem", "512M"); + } } /* |