summaryrefslogtreecommitdiff
path: root/target/linux/generic-2.6/patches-2.6.30/021-mips_image_cmdline_hack.patch
blob: 75dc2b06826c32240666b391c28500da54afb64c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -546,8 +546,28 @@ static void __init resource_init(void)
 	}
 }
 
+#ifdef CONFIG_IMAGE_CMDLINE_HACK
+static void __init process__image_cmdline(void)
+{
+	extern char __image_cmdline[];
+
+	if (__image_cmdline[0] == '\0')
+		return;
+
+	if (__image_cmdline[0] == '-') {
+		strlcpy(arcs_cmdline, __image_cmdline, sizeof(arcs_cmdline));
+	} else {
+		strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
+		strlcat(arcs_cmdline, __image_cmdline, sizeof(arcs_cmdline));
+	}
+}
+#else
+static void inline process__image_cmdline(void) {}
+#endif
+
 void __init setup_arch(char **cmdline_p)
 {
+	process__image_cmdline();
 	cpu_probe();
 	prom_init();
 
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -806,6 +806,10 @@ config SYNC_R4K
 config MIPS_MACHINE
 	def_bool n
 
+config IMAGE_CMDLINE_HACK
+	bool "OpenWrt specific image command line hack"
+	default n
+
 config NO_IOPORT
 	def_bool n
 
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
@@ -143,6 +143,12 @@ FEXPORT(__kernel_entry)
 	j	kernel_entry
 #endif
 
+#ifdef CONFIG_IMAGE_CMDLINE_HACK
+	.ascii	"CMDLINE:"
+EXPORT(__image_cmdline)
+	.fill	0x400
+#endif /* CONFIG_IMAGE_CMDLINE_HACK */
+
 	__REF
 
 NESTED(kernel_entry, 16, sp)			# kernel entry point