mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-05 13:30:38 +02:00
dde03ff97a
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27406 3c298f89-4303-0410-b956-a3cf2f4a3e73
57 lines
1.1 KiB
Diff
57 lines
1.1 KiB
Diff
--- a/arch/mips/lantiq/prom.c
|
|
+++ b/arch/mips/lantiq/prom.c
|
|
@@ -39,20 +39,51 @@ void prom_free_prom_memory(void)
|
|
{
|
|
}
|
|
|
|
+#ifdef CONFIG_IMAGE_CMDLINE_HACK
|
|
+extern char __image_cmdline[];
|
|
+
|
|
+static void __init
|
|
+prom_init_image_cmdline(void)
|
|
+{
|
|
+ char *p = __image_cmdline;
|
|
+ int replace = 0;
|
|
+
|
|
+ if (*p == '-') {
|
|
+ replace = 1;
|
|
+ p++;
|
|
+ }
|
|
+
|
|
+ if (*p == '\0')
|
|
+ return;
|
|
+
|
|
+ if (replace) {
|
|
+ strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline));
|
|
+ } else {
|
|
+ strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
|
|
+ strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
|
|
+ }
|
|
+}
|
|
+#else
|
|
+static void __init prom_init_image_cmdline(void) { return; }
|
|
+#endif
|
|
+
|
|
static void __init prom_init_cmdline(void)
|
|
{
|
|
int argc = fw_arg0;
|
|
char **argv = (char **) KSEG1ADDR(fw_arg1);
|
|
int i;
|
|
|
|
+ arcs_cmdline[0] = '\0';
|
|
+
|
|
for (i = 0; i < argc; i++) {
|
|
- char *p = (char *) KSEG1ADDR(argv[i]);
|
|
+ char *p = (char *) KSEG1ADDR(argv[i]);
|
|
|
|
- if (p && *p) {
|
|
+ if (CPHYSADDR(p) && *p) {
|
|
strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
|
|
strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
|
|
}
|
|
}
|
|
+ prom_init_image_cmdline();
|
|
}
|
|
|
|
void __init prom_init(void)
|