Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1433780

[PATCH v4 05/22] sh: command line passing chosen/bootargs in devicetree

Show all headers | View raw

Changes v4
none

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
 arch/sh/kernel/setup.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 8e3b099..bdf57e5 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -280,6 +280,7 @@ void __init setup_arch(char **cmdline_p)
 #endif
 	enable_mmu();
 
+#ifndef CONFIG_OF
 	ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
 
 	printk(KERN_NOTICE "Boot params:\n"
@@ -301,6 +302,7 @@ void __init setup_arch(char **cmdline_p)
 
 	if (!MOUNT_ROOT_RDONLY)
 		root_mountflags &= ~MS_RDONLY;
+#endif
 	init_mm.start_code = (unsigned long) _text;
 	init_mm.end_code = (unsigned long) _etext;
 	init_mm.end_data = (unsigned long) _edata;
@@ -323,9 +325,13 @@ void __init setup_arch(char **cmdline_p)
 #endif
 #endif
 
+#if !defined(CONFIG_OF) || defined(CONFIG_USE_BUILTIN_DTB)
 	/* Save unparsed command line copy for /proc/cmdline */
 	memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
 	*cmdline_p = command_line;
+#else
+	*cmdline_p = boot_command_line;
+#endif
 
 	parse_early_param();
 
-- 
2.7.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v4 00/22] sh: LANDISK and R2Dplus convert to device tree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:00 +0200
  [PATCH v4 15/22] sh: Move common PCI stuff to arch/sh/kernel Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 04/22] sh: Use P1SEGADDR Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 13/22] sh: irqchip: SH7751 IRQCHIP Driver Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 12/22] sh: Add PCI host bridge driver for SH7751 Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
    Re: [PATCH v4 12/22] sh: Add PCI host bridge driver for SH7751 Arnd Bergmann <arnd@arndb.de> - 2016-06-29 17:00 +0200
      Re: [PATCH v4 12/22] sh: Add PCI host bridge driver for SH7751 Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-30 17:00 +0200
    Re: [PATCH v4 12/22] sh: Add PCI host bridge driver for SH7751 Rob Herring <robh@kernel.org> - 2016-07-01 03:50 +0200
  [PATCH v4 07/22] sh: Passing FDT address on zImage Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 18/22] sh: Add separate DTB build rule Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 09/22] sh: Use GENERIC_IOMAP on device tree mode Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 20/22] sh: IO-DATA HDL-U (a,k.a landisk) DeviceTree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 22/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) DeviceTree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
    Re: [PATCH v4 22/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus)  DeviceTree Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-06-29 16:20 +0200
      Re: [PATCH v4 22/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) DeviceTree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-30 16:50 +0200
  [PATCH v4 17/22] pci: PCI_HOST_GENERIC enable for SH Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 05/22] sh: command line passing chosen/bootargs in devicetree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 16/22] pci: pci_config_window move to linux/pci.h Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 08/22] sh: Disable board specific code on device tree mode Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 14/22] sh: SH7751 core dtsi Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
    Re: [PATCH v4 14/22] sh: SH7751 core dtsi Geert Uytterhoeven <geert@linux-m68k.org> - 2016-07-01 11:00 +0200
      Re: [PATCH v4 14/22] sh: SH7751 core dtsi Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-07-03 13:40 +0200
    Re: [PATCH v4 14/22] sh: SH7751 core dtsi Geert Uytterhoeven <geert@linux-m68k.org> - 2016-07-04 09:20 +0200
      Re: [PATCH v4 14/22] sh: SH7751 core dtsi Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-07-04 18:20 +0200
  [PATCH v4 03/22] sh: set preset_lpj Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 21/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) IRQCHIP Driver Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
    Re: [PATCH v4 21/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus)  IRQCHIP Driver Rob Herring <robh@kernel.org> - 2016-07-01 04:10 +0200
      Re: [PATCH v4 21/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) IRQCHIP Driver Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-07-03 13:40 +0200
  [PATCH v4 02/22] sh: More early unflatten device tree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200

csiph-web