svn commit: r343708 - stable/12/sys/mips/ingenic

Oleksandr Tymoshenko gonzo at FreeBSD.org
Sun Feb 3 08:45:02 UTC 2019


Author: gonzo
Date: Sun Feb  3 08:45:01 2019
New Revision: 343708
URL: https://svnweb.freebsd.org/changeset/base/343708

Log:
  MFC r343450:
  
  [mips] Unbreak kernel build for CI20
  
  - Include header required for boot_parse_XXX functions
  - Use boot_parse_args when parsing argc/argv style arguments
  - Remove unused function

Modified:
  stable/12/sys/mips/ingenic/jz4780_machdep.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/mips/ingenic/jz4780_machdep.c
==============================================================================
--- stable/12/sys/mips/ingenic/jz4780_machdep.c	Sun Feb  3 08:28:02 2019	(r343707)
+++ stable/12/sys/mips/ingenic/jz4780_machdep.c	Sun Feb  3 08:45:01 2019	(r343708)
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
+#include <sys/boot.h>
 #include <sys/cons.h>
 #include <sys/kdb.h>
 #include <sys/reboot.h>
@@ -173,20 +174,6 @@ mips_init(void)
 #endif
 }
 
-#ifdef FDT
-static void
-_parse_bootargs(char *cmdline)
-{
-	char *v;
-
-	while ((v = strsep(&cmdline, " \n")) != NULL) {
-		if (*v == '\0')
-			continue;
-		boothowto |= boot_parse_arg(v);
-	}
-}
-#endif
-
 void
 platform_start(__register_t a0,  __register_t a1,
     __register_t a2 __unused, __register_t a3 __unused)
@@ -247,7 +234,7 @@ platform_start(__register_t a0,  __register_t a1,
 	/* Parse cmdline from U-Boot */
 	argc = a0;
 	argv = (char **)a1;
-	boothowto |= boot_parse_cmdline(argc, argv);
+	boothowto |= boot_parse_args(argc, argv);
 
 	mips_init();
 }


More information about the svn-src-stable mailing list