diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2015-10-11 19:08:08 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2015-10-11 19:08:08 +0000 |
| commit | ebc8ef9e87b724526a60e1670834fff4d3bc4698 (patch) | |
| tree | 190d5518cb8fca114ade113bd2689f1b54852d08 /target/linux/generic/patches-4.3/995-mangle_bootargs.patch | |
| parent | 0ab09e313739ebe5a2d9c3c35354422149760383 (diff) | |
| download | master-187ad058-ebc8ef9e87b724526a60e1670834fff4d3bc4698.tar.gz master-187ad058-ebc8ef9e87b724526a60e1670834fff4d3bc4698.tar.bz2 master-187ad058-ebc8ef9e87b724526a60e1670834fff4d3bc4698.zip | |
kernel: generic: add kernel 4.3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47182 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.3/995-mangle_bootargs.patch')
| -rw-r--r-- | target/linux/generic/patches-4.3/995-mangle_bootargs.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.3/995-mangle_bootargs.patch b/target/linux/generic/patches-4.3/995-mangle_bootargs.patch new file mode 100644 index 0000000000..eb525618aa --- /dev/null +++ b/target/linux/generic/patches-4.3/995-mangle_bootargs.patch @@ -0,0 +1,58 @@ +--- a/init/main.c ++++ b/init/main.c +@@ -355,6 +355,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 +@@ -527,6 +550,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 +@@ -1638,6 +1638,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 |