From 211b8fd286c699d91e3c85488e40429a5d08e907 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Thu, 10 Sep 2009 18:30:06 +0000 Subject: adm5120: use the generic image_cmdline hack SVN-Revision: 17564 --- target/linux/adm5120/files/arch/mips/adm5120/common/prom.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'target/linux/adm5120/files/arch') 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))) -- cgit v1.2.3