Author: neel
Date: Sat Feb 20 06:39:14 2010
New Revision: 204108
URL: http://svn.freebsd.org/changeset/base/204108
Log:
  Get rid of unused options: KERNPHYSADDR, KERNVIRTADDR, PHYSADDR, 
PHYS_ADDR_64BIT
  
  Discussed with: gonzo, imp

Modified:
  head/sys/conf/options.mips
  head/sys/mips/conf/ADM5120
  head/sys/mips/conf/MALTA
  head/sys/mips/conf/MALTA64
  head/sys/mips/conf/OCTEON1
  head/sys/mips/conf/OCTEON1-32
  head/sys/mips/conf/QEMU
  head/sys/mips/conf/SWARM
  head/sys/mips/conf/XLR

Modified: head/sys/conf/options.mips
==============================================================================
--- head/sys/conf/options.mips  Sat Feb 20 01:23:15 2010        (r204107)
+++ head/sys/conf/options.mips  Sat Feb 20 06:39:14 2010        (r204108)
@@ -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

Modified: head/sys/mips/conf/ADM5120
==============================================================================
--- head/sys/mips/conf/ADM5120  Sat Feb 20 01:23:15 2010        (r204107)
+++ head/sys/mips/conf/ADM5120  Sat Feb 20 06:39:14 2010        (r204108)
@@ -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.

Modified: head/sys/mips/conf/MALTA
==============================================================================
--- head/sys/mips/conf/MALTA    Sat Feb 20 01:23:15 2010        (r204107)
+++ head/sys/mips/conf/MALTA    Sat Feb 20 06:39:14 2010        (r204108)
@@ -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
 

Modified: head/sys/mips/conf/MALTA64
==============================================================================
--- head/sys/mips/conf/MALTA64  Sat Feb 20 01:23:15 2010        (r204107)
+++ head/sys/mips/conf/MALTA64  Sat Feb 20 06:39:14 2010        (r204108)
@@ -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
 

Modified: head/sys/mips/conf/OCTEON1
==============================================================================
--- head/sys/mips/conf/OCTEON1  Sat Feb 20 01:23:15 2010        (r204107)
+++ head/sys/mips/conf/OCTEON1  Sat Feb 20 06:39:14 2010        (r204108)
@@ -37,7 +37,6 @@ makeoptions     TARGET_BIG_ENDIAN=define
 makeoptions     TARGET_64BIT=defined
 makeoptions    KERNLOADADDR=0xffffffff80100000
 
-options                KERNVIRTADDR=0xffffffff80100000
 include                "../cavium/std.octeon1"
 
 hints          "OCTEON1.hints"         #Default places to look for devices.

Modified: head/sys/mips/conf/OCTEON1-32
==============================================================================
--- head/sys/mips/conf/OCTEON1-32       Sat Feb 20 01:23:15 2010        
(r204107)
+++ head/sys/mips/conf/OCTEON1-32       Sat Feb 20 06:39:14 2010        
(r204108)
@@ -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"
 

Modified: head/sys/mips/conf/QEMU
==============================================================================
--- head/sys/mips/conf/QEMU     Sat Feb 20 01:23:15 2010        (r204107)
+++ head/sys/mips/conf/QEMU     Sat Feb 20 06:39:14 2010        (r204108)
@@ -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

Modified: head/sys/mips/conf/SWARM
==============================================================================
--- head/sys/mips/conf/SWARM    Sat Feb 20 01:23:15 2010        (r204107)
+++ head/sys/mips/conf/SWARM    Sat Feb 20 06:39:14 2010        (r204108)
@@ -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

Modified: head/sys/mips/conf/XLR
==============================================================================
--- head/sys/mips/conf/XLR      Sat Feb 20 01:23:15 2010        (r204107)
+++ head/sys/mips/conf/XLR      Sat Feb 20 06:39:14 2010        (r204108)
@@ -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
 #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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to