aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.30/021-mips_image_cmdline_hack.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-09-10 18:30:01 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-09-10 18:30:01 +0000
commitd59f5b3a987a48508257a0ddbaeadc7909f9f976 (patch)
tree944623c1f22bfc09509cf26e1555501a1eb129cd /target/linux/generic-2.6/patches-2.6.30/021-mips_image_cmdline_hack.patch
parent47ac8caa622d58cf91938a7896b03298a7b05f1a (diff)
downloadupstream-d59f5b3a987a48508257a0ddbaeadc7909f9f976.tar.gz
upstream-d59f5b3a987a48508257a0ddbaeadc7909f9f976.tar.bz2
upstream-d59f5b3a987a48508257a0ddbaeadc7909f9f976.zip
kernel: add generic image_cmdline hack to MIPS targets
SVN-Revision: 17563
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30/021-mips_image_cmdline_hack.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/021-mips_image_cmdline_hack.patch59
1 files changed, 59 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.30/021-mips_image_cmdline_hack.patch
new file mode 100644
index 0000000000..75dc2b0682
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.30/021-mips_image_cmdline_hack.patch
@@ -0,0 +1,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