svn commit: r261492 - head/sys/conf

[Warner Losh]

Author: imp
Date: Tue Feb  4 18:24:25 2014
New Revision: 261492
URL: http://svnweb.freebsd.org/changeset/base/261492

Log:
  Bump the version of config to the latest (3 year old, so upgrade
  worries are long past). Also remove redundant MACHINE= declarations
  and passing MACHINE/MACHINE_ARCH to module builds. That's now done in
  common code.

Modified:
  head/sys/conf/Makefile.amd64
  head/sys/conf/Makefile.arm
  head/sys/conf/Makefile.i386
  head/sys/conf/Makefile.ia64
  head/sys/conf/Makefile.mips
  head/sys/conf/Makefile.pc98
  head/sys/conf/Makefile.powerpc
  head/sys/conf/Makefile.sparc64

Modified: head/sys/conf/Makefile.amd64
==============================================================================
--- head/sys/conf/Makefile.amd64	Tue Feb  4 17:35:41 2014	(r261491)
+++ head/sys/conf/Makefile.amd64	Tue Feb  4 18:24:25 2014	(r261492)
@@ -18,7 +18,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600004
+%VERSREQ=	600012
 
 STD8X16FONT?=	iso
 
@@ -37,8 +37,6 @@ INCLUDES+= -I$S/contrib/libfdt
 CFLAGS+=	-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
 .endif
 
-MKMODULESENV+= MACHINE=amd64
-
 # XXX: clang integrated-as doesn't grok .codeNN directives yet
 ASM_CFLAGS.acpi_wakecode.S=	${CLANG_NO_IAS}
 ASM_CFLAGS.mpboot.S=		${CLANG_NO_IAS}

Modified: head/sys/conf/Makefile.arm
==============================================================================
--- head/sys/conf/Makefile.arm	Tue Feb  4 17:35:41 2014	(r261491)
+++ head/sys/conf/Makefile.arm	Tue Feb  4 18:24:25 2014	(r261492)
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600004
+%VERSREQ=	600012
 
 STD8X16FONT?=	iso
 
@@ -126,8 +126,6 @@ ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$
 	rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \
 	    inflate-tramp.o tmphack.S
 
-MKMODULESENV+=	MACHINE=${MACHINE}
-
 %BEFORE_DEPEND
 
 %OBJS

Modified: head/sys/conf/Makefile.i386
==============================================================================
--- head/sys/conf/Makefile.i386	Tue Feb  4 17:35:41 2014	(r261491)
+++ head/sys/conf/Makefile.i386	Tue Feb  4 18:24:25 2014	(r261492)
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600004
+%VERSREQ=	600012
 
 STD8X16FONT?=	iso
 
@@ -32,10 +32,6 @@ S=	../../..
 
 INCLUDES+= -I$S/contrib/libfdt
 
-MACHINE=i386
-
-MKMODULESENV+=	MACHINE=${MACHINE}
-
 # XXX: clang integrated-as doesn't grok .codeNN directives yet
 ASM_CFLAGS.acpi_wakecode.S=	${CLANG_NO_IAS}
 ASM_CFLAGS.mpboot.s=		${CLANG_NO_IAS}

Modified: head/sys/conf/Makefile.ia64
==============================================================================
--- head/sys/conf/Makefile.ia64	Tue Feb  4 17:35:41 2014	(r261491)
+++ head/sys/conf/Makefile.ia64	Tue Feb  4 18:24:25 2014	(r261492)
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600004
+%VERSREQ=	600012
 
 STD8X16FONT?=	iso
 

Modified: head/sys/conf/Makefile.mips
==============================================================================
--- head/sys/conf/Makefile.mips	Tue Feb  4 17:35:41 2014	(r261491)
+++ head/sys/conf/Makefile.mips	Tue Feb  4 18:24:25 2014	(r261492)
@@ -15,7 +15,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600004
+%VERSREQ=	600012
 
 STD8X16FONT?=	iso
 
@@ -39,8 +39,6 @@ KERNLOADADDR?=0x80001000
 # To be changed later
 TRAMPLOADADDR?=0x807963c0
 
-MKMODULESENV+=	MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH}
-
 # We default to the MIPS32 ISA, if none specified in the
 # kernel configuration file.
 ARCH_FLAGS?=-march=mips32
@@ -60,7 +58,6 @@ TRAMP_ELFSIZE=64
 TRAMP_ELFSIZE=32
 .endif
 
-# XXX hardcoded kernel entry point
 ASM_CFLAGS+=${CFLAGS} -D_LOCORE -DLOCORE
 
 .if !defined(WITHOUT_KERNEL_TRAMPOLINE)

Modified: head/sys/conf/Makefile.pc98
==============================================================================
--- head/sys/conf/Makefile.pc98	Tue Feb  4 17:35:41 2014	(r261491)
+++ head/sys/conf/Makefile.pc98	Tue Feb  4 18:24:25 2014	(r261492)
@@ -19,7 +19,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600004
+%VERSREQ=	600012
 
 .if !defined(S)
 .if exists(./@/.)
@@ -30,10 +30,6 @@ S=	../../..
 .endif
 .include "$S/conf/kern.pre.mk"
 
-MACHINE=pc98
-
-MKMODULESENV+=	MACHINE=${MACHINE}
-
 # XXX: clang integrated-as doesn't grok .codeNN directives yet
 ASM_CFLAGS.mpboot.s=		${CLANG_NO_IAS}
 ASM_CFLAGS+=			${ASM_CFLAGS.${.IMPSRC:T}}

Modified: head/sys/conf/Makefile.powerpc
==============================================================================
--- head/sys/conf/Makefile.powerpc	Tue Feb  4 17:35:41 2014	(r261491)
+++ head/sys/conf/Makefile.powerpc	Tue Feb  4 18:24:25 2014	(r261492)
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600010
+%VERSREQ=	600012
 
 STD8X16FONT?=	iso
 

Modified: head/sys/conf/Makefile.sparc64
==============================================================================
--- head/sys/conf/Makefile.sparc64	Tue Feb  4 17:35:41 2014	(r261491)
+++ head/sys/conf/Makefile.sparc64	Tue Feb  4 18:24:25 2014	(r261492)
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600004
+%VERSREQ=	600012
 
 STD8X16FONT?=	iso