commit 5e4432a7da7541985055246c5124ce685fcc5947
author Gregory Poist <poist@google.com> Mon Oct 03 17:31:29 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 03 17:31:29 2016 +0000
tree 2adf8c001663c1beda039c3ccd037490e7c2b108
parent c442b55e35fc74a54f9f7136e503658772b364a9
parent ab78e46e9df26c29d8eaba3c7c27281ef9749b32

Merge "Pass bootargs to the kernel when available."

lib_arc/arclinux.c

diff --git a/lib_arc/arclinux.c b/lib_arc/arclinux.c
index 2a3bab4..05e67a5 100644
--- a/lib_arc/arclinux.c
+++ b/lib_arc/arclinux.c
@@ -49,6 +49,9 @@
 static void setup_commandline_tag (bd_t *bd, char *commandline);
 static void setup_hwid_tag(void);
 static void setup_spiflashprotect_tag(u32 qtn_flags);
+#ifdef CONFIG_CMDLINE_TAG
+char *commandline_tag = NULL;
+#endif
 
 #if 0
 static void setup_ramdisk_tag (bd_t *bd);
@@ -109,7 +112,15 @@
 	cleanup_before_linux ();
 
 	int arch = read_new_aux_reg(0x04 /*IDENTITY*/);
+#if defined(GFRG240) && defined(CONFIG_CMDLINE_TAG)
+	if (commandline_tag != NULL) {
+	  theKernel (1, arch, commandline_tag);
+	  /* no return */
+	}
+	/* otherwise FALL THROUGH to no-command line args jump */
+#endif
 	theKernel (0, arch, bd->bi_boot_params);
+	/* no return */
 }
 
 #if defined (CONFIG_SETUP_MEMORY_TAGS) || \
@@ -175,7 +186,9 @@
 	strcpy (params->u.cmdline.cmdline, p);
     printf("Params->u.cmdline.cmdline %s\n", params->u.cmdline.cmdline);
     printf("p %s\n", p);
-
+#ifdef CONFIG_CMDLINE_TAG
+	commandline_tag = params->u.cmdline.cmdline;
+#endif
 
 	params = tag_next (params);
 }