generic: add linux 4.1 support
Boot tested: http://pastebin.com/L6aAb9xj Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> [jogo: update to 4.1 final add patches added since submission delete patches applied in later rcs restore commit messages in 220-gc-sections and 304-mips_disable_fpu fix 050-backport_netfilter_rtcache to match new API update inlined dma ops with upstream changes add missing config symbols enabled CONFIG_MULTIUSER update kmod defintions for 4.1 ] Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46112
This commit is contained in:
58
target/linux/generic/patches-4.1/995-mangle_bootargs.patch
Normal file
58
target/linux/generic/patches-4.1/995-mangle_bootargs.patch
Normal file
@@ -0,0 +1,58 @@
|
||||
--- a/init/main.c
|
||||
+++ b/init/main.c
|
||||
@@ -352,6 +352,29 @@ static inline void setup_nr_cpu_ids(void
|
||||
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
|
||||
#endif
|
||||
|
||||
+#ifdef CONFIG_MANGLE_BOOTARGS
|
||||
+static void __init mangle_bootargs(char *command_line)
|
||||
+{
|
||||
+ char *rootdev;
|
||||
+ char *rootfs;
|
||||
+
|
||||
+ rootdev = strstr(command_line, "root=/dev/mtdblock");
|
||||
+
|
||||
+ if (rootdev)
|
||||
+ strncpy(rootdev, "mangled_rootblock=", 18);
|
||||
+
|
||||
+ rootfs = strstr(command_line, "rootfstype");
|
||||
+
|
||||
+ if (rootfs)
|
||||
+ strncpy(rootfs, "mangled_fs", 10);
|
||||
+
|
||||
+}
|
||||
+#else
|
||||
+static void __init mangle_bootargs(char *command_line)
|
||||
+{
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* We need to store the untouched command line for future reference.
|
||||
* We also need to store the touched command line since the parameter
|
||||
@@ -522,6 +545,7 @@ asmlinkage __visible void __init start_k
|
||||
pr_notice("%s", linux_banner);
|
||||
setup_arch(&command_line);
|
||||
mm_init_cpumask(&init_mm);
|
||||
+ mangle_bootargs(command_line);
|
||||
setup_command_line(command_line);
|
||||
setup_nr_cpu_ids();
|
||||
setup_per_cpu_areas();
|
||||
--- a/init/Kconfig
|
||||
+++ b/init/Kconfig
|
||||
@@ -1607,6 +1607,15 @@ config EMBEDDED
|
||||
an embedded system so certain expert options are available
|
||||
for configuration.
|
||||
|
||||
+config MANGLE_BOOTARGS
|
||||
+ bool "Rename offending bootargs"
|
||||
+ depends on EXPERT
|
||||
+ help
|
||||
+ Sometimes the bootloader passed bogus root= and rootfstype=
|
||||
+ parameters to the kernel, and while you want to ignore them,
|
||||
+ you need to know the values f.e. to support dual firmware
|
||||
+ layouts on the flash.
|
||||
+
|
||||
config HAVE_PERF_EVENTS
|
||||
bool
|
||||
help
|
||||
Reference in New Issue
Block a user