From owner-p4-projects@FreeBSD.ORG  Sun Jul 16 15:09:32 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5B94116A4E2; Sun, 16 Jul 2006 15:09:32 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 38BA816A4DA
	for <perforce@freebsd.org>; Sun, 16 Jul 2006 15:09:32 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 13A9C43D4C
	for <perforce@freebsd.org>; Sun, 16 Jul 2006 15:09:31 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6GF9Ugm040971
	for <perforce@freebsd.org>; Sun, 16 Jul 2006 15:09:30 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6GF9UcO040968
	for perforce@freebsd.org; Sun, 16 Jul 2006 15:09:30 GMT
	(envelope-from imp@freebsd.org)
Date: Sun, 16 Jul 2006 15:09:30 GMT
Message-Id: <200607161509.k6GF9UcO040968@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 101700 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Jul 2006 15:09:32 -0000

http://perforce.freebsd.org/chv.cgi?CH=101700

Change 101700 by imp@imp_paco-paco on 2006/07/16 15:09:07

	Remove duplicate entries from moving stuff in config files.
	NO_SYSCTL_DESCR

Affected files ...

.. //depot/projects/arm/src/sys/arm/conf/TSC4370#6 edit
.. //depot/projects/arm/src/sys/conf/options#24 edit
.. //depot/projects/arm/src/sys/sys/sysctl.h#8 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/conf/TSC4370#6 (text+ko) ====

@@ -21,10 +21,6 @@
 machine		arm
 ident		KB920X
 
-options		KERNPHYSADDR=0x20000000	
-options		KERNVIRTADDR=0xc0000000	
-options		PHYSADDR=0x20000000
-options		STARTUP_PAGETABLE_ADDR=0x20800000
 options		AT91_TSC
 include		"../at91/std.kb920x"
 #To statically compile in device wiring instead of /boot/device.hints
@@ -32,7 +28,6 @@
 #hints		"KB920X.hints"		#Default places to look for devices.
 
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-makeoptions	CONF_CFLAGS=-mcpu=arm9
 options		DDB
 options		KDB
 options 	BREAK_TO_DEBUGGER
@@ -64,7 +59,7 @@
 options 	SYSVSEM			#SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
-#options 	SYSCTL_OMIT_DESCR
+options 	NO_SYSCTL_DESCR
 options 	MUTEX_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING

==== //depot/projects/arm/src/sys/conf/options#24 (text+ko) ====

@@ -56,7 +56,7 @@
 KDB_UNATTENDED	opt_kdb.h
 SYSCTL_DEBUG	opt_sysctl.h
 
-SYSCTL_OMIT_DESCR	opt_global.h
+NO_SYSCTL_DESCR	opt_global.h
 
 # Miscellaneous options.
 ADAPTIVE_GIANT	opt_adaptive_mutexes.h

==== //depot/projects/arm/src/sys/sys/sysctl.h#8 (text+ko) ====

@@ -205,7 +205,7 @@
 #define SYSCTL_NODE_CHILDREN(parent, name) \
 	sysctl_##parent##_##name##_children
 
-#ifndef SYSCTL_OMIT_DESCR
+#ifndef NO_SYSCTL_DESCR
 #define __DESCR(d) d
 #else
 #define __DESCR(d) ""