[Midnightbsd-cvs] src [10186] trunk/sys/boot/ofw/libofw/ofw_net.c: sync

[laffer1 at midnightbsd.org]

Revision: 10186
          http://svnweb.midnightbsd.org/src/?rev=10186
Author:   laffer1
Date:     2018-06-01 19:24:25 -0400 (Fri, 01 Jun 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/sys/boot/ofw/Makefile
    trunk/sys/boot/ofw/Makefile.inc
    trunk/sys/boot/ofw/common/main.c
    trunk/sys/boot/ofw/libofw/ofw_net.c

Property Changed:
----------------
    trunk/sys/boot/ofw/Makefile.inc
    trunk/sys/boot/ofw/common/Makefile.inc

Modified: trunk/sys/boot/ofw/Makefile
===================================================================
--- trunk/sys/boot/ofw/Makefile	2018-06-01 23:21:18 UTC (rev 10185)
+++ trunk/sys/boot/ofw/Makefile	2018-06-01 23:24:25 UTC (rev 10186)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/boot/ofw/Makefile 67204 2000-10-16 10:46:22Z obrien $
 
 SUBDIR=		libofw
 

Modified: trunk/sys/boot/ofw/Makefile.inc
===================================================================
--- trunk/sys/boot/ofw/Makefile.inc	2018-06-01 23:21:18 UTC (rev 10185)
+++ trunk/sys/boot/ofw/Makefile.inc	2018-06-01 23:24:25 UTC (rev 10186)
@@ -1,3 +1,9 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/boot/ofw/Makefile.inc 227739 2011-11-19 19:25:57Z andreast $
 
+.if ${MACHINE_ARCH} == "powerpc64"
+CFLAGS+=	-m32 -mcpu=powerpc
+LDFLAGS+=	-m elf32ppc_fbsd
+.endif
+
 .include "../Makefile.inc"


Property changes on: trunk/sys/boot/ofw/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Index: trunk/sys/boot/ofw/common/Makefile.inc
===================================================================
--- trunk/sys/boot/ofw/common/Makefile.inc	2018-06-01 23:21:18 UTC (rev 10185)
+++ trunk/sys/boot/ofw/common/Makefile.inc	2018-06-01 23:24:25 UTC (rev 10186)

Property changes on: trunk/sys/boot/ofw/common/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/boot/ofw/common/main.c
===================================================================
--- trunk/sys/boot/ofw/common/main.c	2018-06-01 23:21:18 UTC (rev 10185)
+++ trunk/sys/boot/ofw/common/main.c	2018-06-01 23:24:25 UTC (rev 10186)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2000 Benno Rice <benno at jeamland.net>
  * Copyright (c) 2000 Stephane Potvin <sepotvin at videotron.ca>
@@ -26,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/boot/ofw/common/main.c 229403 2012-01-03 18:51:58Z ed $");
 
 #include <stand.h>
 #include "openfirm.h"
@@ -133,7 +134,7 @@
 	printf("Memory: %lldKB\n", memsize() / 1024);
 
 	OF_getprop(chosen, "bootpath", bootpath, 64);
-	ch = index(bootpath, ':');
+	ch = strchr(bootpath, ':');
 	*ch = '\0';
 	printf("Booted from: %s\n", bootpath);
 

Modified: trunk/sys/boot/ofw/libofw/ofw_net.c
===================================================================
--- trunk/sys/boot/ofw/libofw/ofw_net.c	2018-06-01 23:21:18 UTC (rev 10185)
+++ trunk/sys/boot/ofw/libofw/ofw_net.c	2018-06-01 23:24:25 UTC (rev 10186)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2000-2001 Benno Rice
  * All rights reserved.
@@ -25,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/boot/ofw/libofw/ofw_net.c 229403 2012-01-03 18:51:58Z ed $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -185,7 +186,7 @@
 	int		pathlen;
 
 	pathlen = OF_getprop(chosen, "bootpath", path, 64);
-	if ((ch = index(path, ':')) != NULL)
+	if ((ch = strchr(path, ':')) != NULL)
 		*ch = '\0';
 	netdev = OF_finddevice(path);
 #ifdef __sparc64__