summaryrefslogtreecommitdiff
path: root/lib_arm
diff options
context:
space:
mode:
authorPeter Pearse <peter.pearse@arm.com>2008-02-15 12:59:56 +0000
committerPeter Pearse <peter.pearse@arm.com>2008-02-15 12:59:56 +0000
commitd7d9afa48cfa5b07089e3694859a377676a81bd1 (patch)
tree3ceed89914020c067a3a47d06862deab077c3b1f /lib_arm
parentae92069abecc278d7b8de88ffa62de0c2c0ed2bf (diff)
parentea8d989f4ef8203e1c0291e62435a8c62e3cfb29 (diff)
downloadu-boot-imx-d7d9afa48cfa5b07089e3694859a377676a81bd1.zip
u-boot-imx-d7d9afa48cfa5b07089e3694859a377676a81bd1.tar.gz
u-boot-imx-d7d9afa48cfa5b07089e3694859a377676a81bd1.tar.bz2
Merge branch '080131_artila' of git://linux-arm.org/u-boot-armdev
Diffstat (limited to 'lib_arm')
-rw-r--r--lib_arm/armlinux.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib_arm/armlinux.c b/lib_arm/armlinux.c
index 62185f0..42098fc 100644
--- a/lib_arm/armlinux.c
+++ b/lib_arm/armlinux.c
@@ -168,7 +168,8 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
do_reset (cmdtp, flag, argc, argv);
}
-#if defined(CONFIG_B2) || defined(CONFIG_EVB4510) || defined(CONFIG_ARMADILLO)
+#if defined(CONFIG_B2) || defined(CONFIG_EVB4510) || \
+ defined(CONFIG_ARMADILLO) || defined(CONFIG_M501SK)
/*
*we need to copy the ramdisk to SRAM to let Linux boot
*/