aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/files/arch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-09-10 18:30:06 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-09-10 18:30:06 +0000
commit211b8fd286c699d91e3c85488e40429a5d08e907 (patch)
tree95109ee02be9d449a73d72905db2b5baa6bb8c2b /target/linux/adm5120/files/arch
parentd59f5b3a987a48508257a0ddbaeadc7909f9f976 (diff)
downloadupstream-211b8fd286c699d91e3c85488e40429a5d08e907.tar.gz
upstream-211b8fd286c699d91e3c85488e40429a5d08e907.tar.bz2
upstream-211b8fd286c699d91e3c85488e40429a5d08e907.zip
adm5120: use the generic image_cmdline hack
SVN-Revision: 17564
Diffstat (limited to 'target/linux/adm5120/files/arch')
-rw-r--r--target/linux/adm5120/files/arch/mips/adm5120/common/prom.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c b/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c
index 85b61ab8a4..5b2e45defe 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c
@@ -237,18 +237,22 @@ static void __init prom_detect_machtype(void)
adm5120_mach_type = MACH_ADM5120_GENERIC;
}
-/* TODO: this is an ugly hack for RouterBOARDS */
-extern char _image_cmdline;
+#ifdef CONFIG_IMAGE_CMDLINE_HACK
+extern char __image_cmdline[];
+
static void __init prom_init_cmdline(void)
{
char *cmd;
/* init command line, register a default kernel command line */
- cmd = &_image_cmdline + 8;
+ cmd = __image_cmdline;
if (strlen(cmd) > 0)
strlcpy(arcs_cmdline, cmd, sizeof(arcs_cmdline));
}
+#else
+static void inline prom_init_cmdline(void) {}
+#endif /* CONFIG_IMAGE_CMDLINE_HACK */
#define UART_READ(r) \
__raw_readl((void __iomem *)(KSEG1ADDR(ADM5120_UART0_BASE)+(r)))