adm5120: use the generic image_cmdline hack

[openwrt/openwrt.git] / target / linux / adm5120 / files / arch / mips / adm5120 / common / prom.c

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 85b61ab8a497a1023d066ed3a149497e441d7a4d..5b2e45defec77827bc0920f33c9e429cba80578d 100644 (file)
--- 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;
 }
 
        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 */
 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));
 
 }
        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)))
 
 #define UART_READ(r) \
        __raw_readl((void __iomem *)(KSEG1ADDR(ADM5120_UART0_BASE)+(r)))