Get rid of unused options: KERNPHYSADDR, KERNVIRTADDR, PHYSADDR, PHYS_ADDR_64BIT

Discussed with: gonzo, imp

9 files changed, 0 insertions, 17 deletions

diff --git a/sys/conf/options.mips b/sys/conf/options.mips
index d3b8767..f9ff6b5 100644
--- a/sys/conf/options.mips
+++ b/sys/conf/options.mips
@@ -48,10 +48,6 @@ CFE_CONSOLE	opt_global.h
 CFE_ENV		opt_global.h
 CFE_ENV_SIZE	opt_global.h
 
-KERNPHYSADDR	opt_global.h
-KERNVIRTADDR	opt_global.h
-PHYSADDR	opt_global.h
-PHYS_ADDR_64BIT	opt_global.h
 NOFPU		opt_global.h
 TARGET_OCTEON	opt_global.h
 TARGET_EMULATOR	opt_ddb.h
diff --git a/sys/mips/conf/ADM5120 b/sys/mips/conf/ADM5120
index 4e3057a..a834c16 100644
--- a/sys/mips/conf/ADM5120
+++ b/sys/mips/conf/ADM5120
@@ -25,7 +25,6 @@ makeoptions	MIPS_LITTLE_ENDIAN=defined
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
 
-options 	KERNVIRTADDR=0x80100000
 include		"../adm5120/std.adm5120"
 
 hints		"ADM5120.hints"		#Default places to look for devices.
diff --git a/sys/mips/conf/MALTA b/sys/mips/conf/MALTA
index 91684f1..77e072c 100644
--- a/sys/mips/conf/MALTA
+++ b/sys/mips/conf/MALTA
@@ -28,7 +28,6 @@ options 	YAMON
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
 
-options 	KERNVIRTADDR=0x80100000
 options 	TICK_USE_YAMON_FREQ=defined
 #options 	TICK_USE_MALTA_RTC=defined
 
diff --git a/sys/mips/conf/MALTA64 b/sys/mips/conf/MALTA64
index 3dc5d1b..e7f01c7 100644
--- a/sys/mips/conf/MALTA64
+++ b/sys/mips/conf/MALTA64
@@ -29,7 +29,6 @@ options 	YAMON
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
 
-options 	KERNVIRTADDR=0x80100000
 options 	TICK_USE_YAMON_FREQ=defined
 #options 	TICK_USE_MALTA_RTC=defined
 
diff --git a/sys/mips/conf/OCTEON1 b/sys/mips/conf/OCTEON1
index 4542bd8..b326823 100644
--- a/sys/mips/conf/OCTEON1
+++ b/sys/mips/conf/OCTEON1
@@ -37,7 +37,6 @@ makeoptions     TARGET_BIG_ENDIAN=defined
 makeoptions     TARGET_64BIT=defined
 makeoptions	KERNLOADADDR=0xffffffff80100000
 
-options		KERNVIRTADDR=0xffffffff80100000
 include		"../cavium/std.octeon1"
 
 hints		"OCTEON1.hints"		#Default places to look for devices.
diff --git a/sys/mips/conf/OCTEON1-32 b/sys/mips/conf/OCTEON1-32
index 0196ad3..7962a06 100644
--- a/sys/mips/conf/OCTEON1-32
+++ b/sys/mips/conf/OCTEON1-32
@@ -26,7 +26,6 @@ makeoptions	MODULES_OVERRIDE=""
 makeoptions     TARGET_BIG_ENDIAN=defined
 makeoptions     LDSCRIPT_NAME=ldscript.mips.octeon1.32
 
-options		KERNVIRTADDR=0x81000000
 makeoptions	KERNLOADADDR=0x81000000
 include		"../cavium/std.octeon1"
 
diff --git a/sys/mips/conf/QEMU b/sys/mips/conf/QEMU
index 8f830b7..ebb09f8 100644
--- a/sys/mips/conf/QEMU
+++ b/sys/mips/conf/QEMU
@@ -27,7 +27,6 @@ makeoptions	ARCH_FLAGS=-march=mips32
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
 
-options 	KERNVIRTADDR=0x80100000
 include		"../adm5120/std.adm5120"
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
diff --git a/sys/mips/conf/SWARM b/sys/mips/conf/SWARM
index 5679e69..3189bcb 100644
--- a/sys/mips/conf/SWARM
+++ b/sys/mips/conf/SWARM
@@ -19,11 +19,6 @@ options		CFE_CONSOLE
 options		CFE_ENV
 options		ALT_BREAK_TO_DEBUGGER
 
-# cfe loader expects kernel at 0x80001000 for mips32 w/o backwards
-# offsets in the linked elf image (see ldscript hack)
-# XXX can we conditionalize the linker stuff on options CFE?
-options		KERNVIRTADDR=0x80001000
-
 makeoptions	LDSCRIPT_NAME=	ldscript.mips.cfe
 
 #cpu		CPU_MIPS64
diff --git a/sys/mips/conf/XLR b/sys/mips/conf/XLR
index 9818388..d743c1b 100644
--- a/sys/mips/conf/XLR
+++ b/sys/mips/conf/XLR
@@ -53,7 +53,6 @@ makeoptions	MODULES_OVERRIDE=""
 makeoptions     TARGET_BIG_ENDIAN
 #
 
-options		KERNVIRTADDR=0x80100000
 include		"../rmi/std.xlr"
 
 
@@ -87,7 +86,6 @@ options		ROOTDEVNAME=\"nfs:10.1.1.8:/usr/extra/nfsroot\"
 #options		ROOTDEVNAME=\"ufs:md0\"
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 options 	HZ=1000	
-options 	PHYS_ADDR_64BIT
 options 	NO_SWAPPING
 
 #Debugging options