diff options
author | Felix Fietkau <nbd@openwrt.org> | 2016-01-29 23:19:36 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-29 23:19:36 +0000 |
commit | 7434ac100896fd746b11f6c007cc6e74c723a8cd (patch) | |
tree | 9e531506fc984c07d714d85626ef7104acea2821 /target/linux/octeon/patches-4.4/160-cmdline-hack.patch | |
parent | 3dd3913679b2849fb1eb3b41c28a897118355ba8 (diff) | |
download | master-187ad058-7434ac100896fd746b11f6c007cc6e74c723a8cd.tar.gz master-187ad058-7434ac100896fd746b11f6c007cc6e74c723a8cd.tar.bz2 master-187ad058-7434ac100896fd746b11f6c007cc6e74c723a8cd.zip |
octeon: update to linux 4.4
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48557 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/octeon/patches-4.4/160-cmdline-hack.patch')
-rw-r--r-- | target/linux/octeon/patches-4.4/160-cmdline-hack.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/target/linux/octeon/patches-4.4/160-cmdline-hack.patch b/target/linux/octeon/patches-4.4/160-cmdline-hack.patch new file mode 100644 index 0000000000..6e042ef714 --- /dev/null +++ b/target/linux/octeon/patches-4.4/160-cmdline-hack.patch @@ -0,0 +1,47 @@ +--- a/arch/mips/cavium-octeon/setup.c ++++ b/arch/mips/cavium-octeon/setup.c +@@ -611,6 +611,35 @@ void octeon_user_io_init(void) + write_c0_derraddr1(0); + } + ++#ifdef CONFIG_IMAGE_CMDLINE_HACK ++extern char __image_cmdline[]; ++ ++static int __init octeon_use_image_cmdline(void) ++{ ++ char *p = __image_cmdline; ++ int replace = 0; ++ ++ if (*p == '-') { ++ replace = 1; ++ p++; ++ } ++ ++ if (*p == '\0') ++ return 0; ++ ++ if (replace) { ++ strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline)); ++ } else { ++ strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline)); ++ strlcat(arcs_cmdline, p, sizeof(arcs_cmdline)); ++ } ++ ++ return 1; ++} ++#else ++static inline int octeon_use_image_cmdline(void) { return 0; } ++#endif ++ + /** + * Early entry point for arch setup + */ +@@ -842,6 +871,8 @@ void __init prom_init(void) + } + } + ++ octeon_use_image_cmdline(); ++ + if (strstr(arcs_cmdline, "console=") == NULL) { + #ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL + strcat(arcs_cmdline, " console=ttyS0,115200"); |