summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu J. Poirier <mathieu.poirier@linaro.org>2011-05-30 16:39:09 -0600
committerMathieu J. Poirier <mathieu.poirier@linaro.org>2011-05-30 16:47:48 -0600
commit6b4e4eec91267e7f2841dc0d95c9b8c08cfb628b (patch)
tree6afe3d09d5d8a024be3927958d65ed21eca61256
parentfc71db106648f786bf47bce76b7cb7a67dbba740 (diff)
downloadu-boot-lt-ux500-6b4e4eec91267e7f2841dc0d95c9b8c08cfb628b.tar.gz
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.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/board/st/u8500/u8500.c b/board/st/u8500/u8500.c
index 1685e52e8..cf6c73d58 100644
--- a/board/st/u8500/u8500.c
+++ b/board/st/u8500/u8500.c
@@ -694,13 +694,20 @@ int board_late_init(void)
* 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");
+ }
}
/*