[src/netbsd-8]: src/sys/arch/evbmips/stand/sbmips Adjust reality of the branc...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6e3a214f2aae
branches:  netbsd-8
changeset: 850977:6e3a214f2aae
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Aug 31 08:18:08 2017 +0000

description:
Adjust reality of the branch to what the previous commit message and
the CHANGES-8.0 entry for Ticket #231 claim.

diffstat:

 sys/arch/evbmips/stand/sbmips/Makefile.bootprogs  |  16 ++++++++++------
 sys/arch/evbmips/stand/sbmips/Makefile.inc        |   6 +++---
 sys/arch/evbmips/stand/sbmips/common/blkdev.c     |   6 +++---
 sys/arch/evbmips/stand/sbmips/common/boot.c       |   8 ++++----
 sys/arch/evbmips/stand/sbmips/common/booted_dev.c |   6 +++---
 sys/arch/evbmips/stand/sbmips/netboot/getsecs.c   |   4 ++--
 sys/arch/evbmips/stand/sbmips/netboot/if_cfe.c    |  10 +++++-----
 7 files changed, 30 insertions(+), 26 deletions(-)

diffs (173 lines):

diff -r 437c2806a59d -r 6e3a214f2aae sys/arch/evbmips/stand/sbmips/Makefile.bootprogs
--- a/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs  Thu Aug 31 08:07:09 2017 +0000
+++ b/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs  Thu Aug 31 08:18:08 2017 +0000
@@ -1,11 +1,15 @@
-# $NetBSD: Makefile.bootprogs,v 1.3.4.2 2017/08/30 15:45:04 martin Exp $
+# $NetBSD: Makefile.bootprogs,v 1.3.4.3 2017/08/31 08:18:08 martin Exp $
+
+NOSSP=yes
+NOPIE=yes
 
 .include <bsd.own.mk>
 .include <bsd.klinks.mk>
 
-S=     ${.CURDIR}/../../../..
+S=     ${.CURDIR}/../../../../..
+COMMON=        ${.CURDIR}/../common
 
-.PATH: ${.CURDIR}/../common
+.PATH: ${COMMON}
 
 STRIPFLAG=
 BINMODE= 444
@@ -19,7 +23,7 @@
 
 STRIP?=        strip
 
-CHECKSIZE_CMD= SIZE=${SIZE} ${HOST_SH} ${.CURDIR}/../common/checksize.sh
+CHECKSIZE_CMD= SIZE=${SIZE} ${HOST_SH} ${COMMON}/checksize.sh
 
 AFLAGS+=       -DASSEMBLER -D_LOCORE -mno-abicalls -mips64
 # -I${.CURDIR}/../.. done by Makefile.inc
@@ -28,7 +32,7 @@
 CFLAGS+=       -mips64
 CFLAGS+=       -Werror ${CWARNFLAGS}
 
-NETBSD_VERS!=${HOST_SH} ${.CURDIR}/../../../../conf/osrelease.sh
+NETBSD_VERS!=${HOST_SH} ${S}/conf/osrelease.sh
 CPPFLAGS+= -DNETBSD_VERS='"${NETBSD_VERS}"'
 
 CWARNFLAGS+=   -Wno-main 
@@ -45,7 +49,7 @@
 REGION1_START=         0x20000000              # "Region 1 start"
 REGION1_SIZE!=         expr 256 \* 1024        # 256k
 
-LDSCRIPT=              ${.CURDIR}/../common/boot.ldscript
+LDSCRIPT=              ${COMMON}/boot.ldscript
 
 # our memory lauout:
 
diff -r 437c2806a59d -r 6e3a214f2aae sys/arch/evbmips/stand/sbmips/Makefile.inc
--- a/sys/arch/evbmips/stand/sbmips/Makefile.inc        Thu Aug 31 08:07:09 2017 +0000
+++ b/sys/arch/evbmips/stand/sbmips/Makefile.inc        Thu Aug 31 08:18:08 2017 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.3.4.2 2017/08/30 15:45:04 martin Exp $
+# $NetBSD: Makefile.inc,v 1.3.4.3 2017/08/31 08:18:08 martin Exp $
 
 .include <bsd.own.mk>
 
-BINDIR?=               /usr/mdec
+BINDIR?=               /usr/mdec/sbmips
 WARNS?=                        1
 
 MKMAN=                 no
 
-CPPFLAGS+=             -I${.CURDIR}/../..
+CPPFLAGS+=             -I${.CURDIR}/../../..
 LDSTATIC?=             -static
diff -r 437c2806a59d -r 6e3a214f2aae sys/arch/evbmips/stand/sbmips/common/blkdev.c
--- a/sys/arch/evbmips/stand/sbmips/common/blkdev.c     Thu Aug 31 08:07:09 2017 +0000
+++ b/sys/arch/evbmips/stand/sbmips/common/blkdev.c     Thu Aug 31 08:18:08 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: blkdev.c,v 1.2.4.2 2017/08/30 15:45:04 martin Exp $ */
+/* $NetBSD: blkdev.c,v 1.2.4.3 2017/08/31 08:18:08 martin Exp $ */
 
 /*
  * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
@@ -70,9 +70,9 @@
 #include <sys/param.h>
 #include <sys/disklabel.h>
 
-#include "stand/common/cfe_api.h"
+#include "stand/sbmips/common/cfe_api.h"
 
-#include "stand/common/common.h"
+#include "stand/sbmips/common/common.h"
 #include "blkdev.h"
 
 /*
diff -r 437c2806a59d -r 6e3a214f2aae sys/arch/evbmips/stand/sbmips/common/boot.c
--- a/sys/arch/evbmips/stand/sbmips/common/boot.c       Thu Aug 31 08:07:09 2017 +0000
+++ b/sys/arch/evbmips/stand/sbmips/common/boot.c       Thu Aug 31 08:18:08 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.2.4.2 2017/08/30 15:45:04 martin Exp $ */
+/* $NetBSD: boot.c,v 1.2.4.3 2017/08/31 08:18:08 martin Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -42,10 +42,10 @@
 #include <sys/exec.h>
 #include <sys/exec_ecoff.h>
 
-#include "stand/common/common.h"
-#include "stand/common/cfe_api.h"
+#include "stand/sbmips/common/common.h"
+#include "stand/sbmips/common/cfe_api.h"
 
-#include <machine/autoconf.h>
+#include <sbmips/autoconf.h>
 
 #if !defined(UNIFIED_BOOTBLOCK) && !defined(SECONDARY_BOOTBLOCK)
 #error not UNIFIED_BOOTBLOCK and not SECONDARY_BOOTBLOCK
diff -r 437c2806a59d -r 6e3a214f2aae sys/arch/evbmips/stand/sbmips/common/booted_dev.c
--- a/sys/arch/evbmips/stand/sbmips/common/booted_dev.c Thu Aug 31 08:07:09 2017 +0000
+++ b/sys/arch/evbmips/stand/sbmips/common/booted_dev.c Thu Aug 31 08:18:08 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: booted_dev.c,v 1.2.4.2 2017/08/30 15:45:04 martin Exp $ */
+/* $NetBSD: booted_dev.c,v 1.2.4.3 2017/08/31 08:18:08 martin Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -35,8 +35,8 @@
 #include <lib/libsa/stand.h>
 #include <lib/libkern/libkern.h>
 
-#include "stand/common/common.h"
-#include "stand/common/cfe_api.h"
+#include "stand/sbmips/common/common.h"
+#include "stand/sbmips/common/cfe_api.h"
 
 int    booted_dev_fd;
 #if defined(PRIMARY_BOOTBLOCK) || defined(UNIFIED_BOOTBLOCK)
diff -r 437c2806a59d -r 6e3a214f2aae sys/arch/evbmips/stand/sbmips/netboot/getsecs.c
--- a/sys/arch/evbmips/stand/sbmips/netboot/getsecs.c   Thu Aug 31 08:07:09 2017 +0000
+++ b/sys/arch/evbmips/stand/sbmips/netboot/getsecs.c   Thu Aug 31 08:18:08 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: getsecs.c,v 1.2.4.2 2017/08/30 15:45:03 martin Exp $ */
+/* $NetBSD: getsecs.c,v 1.2.4.3 2017/08/31 08:18:08 martin Exp $ */
 
 /*
  * Copyright 2001
@@ -42,7 +42,7 @@
 #include <lib/libsa/stand.h>
 #include <lib/libsa/net.h>
 
-#include "stand/common/cfe_api.h"
+#include "stand/sbmips/common/cfe_api.h"
 
 satime_t
 getsecs(void)
diff -r 437c2806a59d -r 6e3a214f2aae sys/arch/evbmips/stand/sbmips/netboot/if_cfe.c
--- a/sys/arch/evbmips/stand/sbmips/netboot/if_cfe.c    Thu Aug 31 08:07:09 2017 +0000
+++ b/sys/arch/evbmips/stand/sbmips/netboot/if_cfe.c    Thu Aug 31 08:18:08 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cfe.c,v 1.2.4.2 2017/08/30 15:45:03 martin Exp $ */
+/* $NetBSD: if_cfe.c,v 1.2.4.3 2017/08/31 08:18:08 martin Exp $ */
 
 /*
  * Copyright (c) 1997 Christopher G. Demetriou.  All rights reserved.
@@ -43,10 +43,10 @@
 #include <lib/libsa/netif.h>
 #include <lib/libkern/libkern.h>
 
-#include "stand/common/common.h"
-#include "stand/common/bbinfo.h"
-#include "stand/common/cfe_api.h"
-#include "stand/common/cfe_ioctl.h"
+#include "stand/sbmips/common/common.h"
+#include "stand/sbmips/common/bbinfo.h"
+#include "stand/sbmips/common/cfe_api.h"
+#include "stand/sbmips/common/cfe_ioctl.h"
 
 int cfenet_probe(struct netif *, void *);
 int cfenet_match(struct netif *, void *);