Author: andrew Date: Tue Dec 22 09:08:21 2015 New Revision: 292591 URL: https://svnweb.freebsd.org/changeset/base/292591
Log: Remove the arm KERNPHYSADDR option as it is no longer used. The make option is still in existance as it is used to build the trampoline code. Modified: head/sys/arm/at91/std.bwct head/sys/arm/at91/std.eb9200 head/sys/arm/at91/std.ethernut5 head/sys/arm/at91/std.hl200 head/sys/arm/at91/std.hl201 head/sys/arm/at91/std.kb920x head/sys/arm/at91/std.qila9g20 head/sys/arm/at91/std.sam9260ek head/sys/arm/at91/std.sam9g20ek head/sys/arm/at91/std.sam9x25ek head/sys/arm/at91/std.sn9g45 head/sys/arm/at91/std.tsc4370 head/sys/arm/cavium/cns11xx/std.econa head/sys/arm/conf/ATMEL head/sys/arm/conf/CNS11XXNAS head/sys/arm/conf/CRB head/sys/arm/conf/GUMSTIX head/sys/arm/conf/NOTES head/sys/arm/conf/NSLU head/sys/arm/lpc/std.lpc head/sys/arm/mv/discovery/std.db78xxx head/sys/arm/mv/orion/std.db88f5xxx head/sys/arm/mv/orion/std.ts7800 head/sys/arm/xscale/ixp425/std.avila head/sys/conf/options.arm Modified: head/sys/arm/at91/std.bwct ============================================================================== --- head/sys/arm/at91/std.bwct Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/at91/std.bwct Tue Dec 22 09:08:21 2015 (r292591) @@ -2,7 +2,6 @@ include "../at91/std.at91" makeoptions KERNPHYSADDR=0x20000000 -options KERNPHYSADDR=0x20000000 makeoptions KERNVIRTADDR=0xc0000000 options KERNVIRTADDR=0xc0000000 Modified: head/sys/arm/at91/std.eb9200 ============================================================================== --- head/sys/arm/at91/std.eb9200 Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/at91/std.eb9200 Tue Dec 22 09:08:21 2015 (r292591) @@ -2,7 +2,6 @@ include "../at91/std.at91" makeoptions KERNPHYSADDR=0x20000000 -options KERNPHYSADDR=0x20000000 makeoptions KERNVIRTADDR=0xc0000000 options KERNVIRTADDR=0xc0000000 Modified: head/sys/arm/at91/std.ethernut5 ============================================================================== --- head/sys/arm/at91/std.ethernut5 Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/at91/std.ethernut5 Tue Dec 22 09:08:21 2015 (r292591) @@ -3,7 +3,6 @@ include "../at91/std.at91sam9" makeoptions KERNPHYSADDR=0x20000000 makeoptions KERNVIRTADDR=0xc0000000 -options KERNPHYSADDR=0x20000000 options KERNVIRTADDR=0xc0000000 device at91_board_ethernut5 Modified: head/sys/arm/at91/std.hl200 ============================================================================== --- head/sys/arm/at91/std.hl200 Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/at91/std.hl200 Tue Dec 22 09:08:21 2015 (r292591) @@ -2,7 +2,6 @@ include "../at91/std.at91" makeoptions KERNPHYSADDR=0x20100000 -options KERNPHYSADDR=0x20100000 makeoptions KERNVIRTADDR=0xc0100000 options KERNVIRTADDR=0xc0100000 Modified: head/sys/arm/at91/std.hl201 ============================================================================== --- head/sys/arm/at91/std.hl201 Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/at91/std.hl201 Tue Dec 22 09:08:21 2015 (r292591) @@ -3,7 +3,6 @@ include "../at91/std.at91sam9" makeoptions KERNPHYSADDR=0x20000000 makeoptions KERNVIRTADDR=0xc0000000 -options KERNPHYSADDR=0x20000000 options KERNVIRTADDR=0xc0000000 device at91_board_hl201 Modified: head/sys/arm/at91/std.kb920x ============================================================================== --- head/sys/arm/at91/std.kb920x Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/at91/std.kb920x Tue Dec 22 09:08:21 2015 (r292591) @@ -2,7 +2,6 @@ include "../at91/std.at91" makeoptions KERNPHYSADDR=0x20000000 -options KERNPHYSADDR=0x20000000 makeoptions KERNVIRTADDR=0xc0000000 options KERNVIRTADDR=0xc0000000 Modified: head/sys/arm/at91/std.qila9g20 ============================================================================== --- head/sys/arm/at91/std.qila9g20 Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/at91/std.qila9g20 Tue Dec 22 09:08:21 2015 (r292591) @@ -3,7 +3,6 @@ include "../at91/std.at91sam9" makeoptions KERNPHYSADDR=0x20000000 makeoptions KERNVIRTADDR=0xc0000000 -options KERNPHYSADDR=0x20000000 options KERNVIRTADDR=0xc0000000 device at91_board_qila9g20 Modified: head/sys/arm/at91/std.sam9260ek ============================================================================== --- head/sys/arm/at91/std.sam9260ek Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/at91/std.sam9260ek Tue Dec 22 09:08:21 2015 (r292591) @@ -3,7 +3,6 @@ include "../at91/std.at91sam9" makeoptions KERNPHYSADDR=0x20000000 makeoptions KERNVIRTADDR=0xc0000000 -options KERNPHYSADDR=0x20000000 options KERNVIRTADDR=0xc0000000 device at91_board_sam9260ek Modified: head/sys/arm/at91/std.sam9g20ek ============================================================================== --- head/sys/arm/at91/std.sam9g20ek Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/at91/std.sam9g20ek Tue Dec 22 09:08:21 2015 (r292591) @@ -3,7 +3,6 @@ include "../at91/std.at91sam9" makeoptions KERNPHYSADDR=0x20000000 makeoptions KERNVIRTADDR=0xc0000000 -options KERNPHYSADDR=0x20000000 options KERNVIRTADDR=0xc0000000 device at91_board_sam9g20ek Modified: head/sys/arm/at91/std.sam9x25ek ============================================================================== --- head/sys/arm/at91/std.sam9x25ek Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/at91/std.sam9x25ek Tue Dec 22 09:08:21 2015 (r292591) @@ -3,7 +3,6 @@ include "../at91/std.at91sam9" makeoptions KERNPHYSADDR=0x20000000 makeoptions KERNVIRTADDR=0xc0000000 -options KERNPHYSADDR=0x20000000 options KERNVIRTADDR=0xc0000000 device at91_board_sam9x25ek Modified: head/sys/arm/at91/std.sn9g45 ============================================================================== --- head/sys/arm/at91/std.sn9g45 Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/at91/std.sn9g45 Tue Dec 22 09:08:21 2015 (r292591) @@ -2,7 +2,6 @@ include "../at91/std.at91sam9g45" makeoptions KERNPHYSADDR=0x70008000 -options KERNPHYSADDR=0x70008000 makeoptions KERNVIRTADDR=0xc0008000 options KERNVIRTADDR=0xc0008000 Modified: head/sys/arm/at91/std.tsc4370 ============================================================================== --- head/sys/arm/at91/std.tsc4370 Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/at91/std.tsc4370 Tue Dec 22 09:08:21 2015 (r292591) @@ -3,7 +3,6 @@ include "../at91/std.at91" makeoptions KERNPHYSADDR=0x20000000 makeoptions KERNVIRTADDR=0xc0000000 -options KERNPHYSADDR=0x20000000 options KERNVIRTADDR=0xc0000000 device at91_board_tsc4370 Modified: head/sys/arm/cavium/cns11xx/std.econa ============================================================================== --- head/sys/arm/cavium/cns11xx/std.econa Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/cavium/cns11xx/std.econa Tue Dec 22 09:08:21 2015 (r292591) @@ -8,7 +8,6 @@ options PHYSADDR=0x00000000 makeoptions KERNPHYSADDR=0x01000000 makeoptions KERNVIRTADDR=0xc1000000 -options KERNPHYSADDR=0x01000000 options KERNVIRTADDR=0xc1000000 # Used in ldscript.arm options FLASHADDR=0xD0000000 options LOADERRAMADDR=0x00000000 Modified: head/sys/arm/conf/ATMEL ============================================================================== --- head/sys/arm/conf/ATMEL Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/conf/ATMEL Tue Dec 22 09:08:21 2015 (r292591) @@ -13,7 +13,6 @@ include "../at91/std.atmel" # at91sam9g45 or on some boards with non u-boot boot loaders. makeoptions KERNPHYSADDR=0x20000000 makeoptions KERNVIRTADDR=0xc0000000 -options KERNPHYSADDR=0x20000000 options KERNVIRTADDR=0xc0000000 makeoptions MODULES_OVERRIDE="dtb/atmel" Modified: head/sys/arm/conf/CNS11XXNAS ============================================================================== --- head/sys/arm/conf/CNS11XXNAS Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/conf/CNS11XXNAS Tue Dec 22 09:08:21 2015 (r292591) @@ -22,7 +22,6 @@ ident CNS11XXNAS include "std.arm" #options PHYSADDR=0x10000000 -#options KERNPHYSADDR=0x10200000 #options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm #options FLASHADDR=0x50000000 #options LOADERRAMADDR=0x00000000 Modified: head/sys/arm/conf/CRB ============================================================================== --- head/sys/arm/conf/CRB Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/conf/CRB Tue Dec 22 09:08:21 2015 (r292591) @@ -21,7 +21,6 @@ ident CRB include "std.arm" options PHYSADDR=0x00000000 -options KERNPHYSADDR=0x00200000 options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm options COUNTS_PER_SEC=400000000 Modified: head/sys/arm/conf/GUMSTIX ============================================================================== --- head/sys/arm/conf/GUMSTIX Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/conf/GUMSTIX Tue Dec 22 09:08:21 2015 (r292591) @@ -28,7 +28,6 @@ cpu CPU_XSCALE_PXA2X0 hints "GUMSTIX.hints" options PHYSADDR=0xa0000000 -options KERNPHYSADDR=0xa0200000 options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm include "../xscale/pxa/std.pxa" Modified: head/sys/arm/conf/NOTES ============================================================================== --- head/sys/arm/conf/NOTES Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/conf/NOTES Tue Dec 22 09:08:21 2015 (r292591) @@ -26,7 +26,6 @@ files "../xscale/ixp425/files.ixp425" files "../xscale/pxa/files.pxa" options PHYSADDR=0x00000000 -options KERNPHYSADDR=0x00000000 options KERNVIRTADDR=0xc0000000 makeoptions LDFLAGS="-zmuldefs" Modified: head/sys/arm/conf/NSLU ============================================================================== --- head/sys/arm/conf/NSLU Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/conf/NSLU Tue Dec 22 09:08:21 2015 (r292591) @@ -24,7 +24,6 @@ ident NSLU include "std.arm" # XXX What is defined in std.avila does not exactly match the following: #options PHYSADDR=0x10000000 -#options KERNPHYSADDR=0x10200000 #options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm #options FLASHADDR=0x50000000 #options LOADERRAMADDR=0x00000000 Modified: head/sys/arm/lpc/std.lpc ============================================================================== --- head/sys/arm/lpc/std.lpc Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/lpc/std.lpc Tue Dec 22 09:08:21 2015 (r292591) @@ -9,6 +9,5 @@ machine arm makeoptions CONF_CFLAGS="-march=armv5te" options PHYSADDR=0x80000000 makeoptions KERNPHYSADDR=0x80100000 -options KERNPHYSADDR=0x80100000 makeoptions KERNVIRTADDR=0xc0100000 options KERNVIRTADDR=0xc0100000 Modified: head/sys/arm/mv/discovery/std.db78xxx ============================================================================== --- head/sys/arm/mv/discovery/std.db78xxx Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/mv/discovery/std.db78xxx Tue Dec 22 09:08:21 2015 (r292591) @@ -5,7 +5,5 @@ files "../mv/discovery/files.db78xxx" makeoptions KERNPHYSADDR=0x00900000 makeoptions KERNVIRTADDR=0xc0900000 - -options KERNPHYSADDR=0x00900000 options KERNVIRTADDR=0xc0900000 options PHYSADDR=0x00000000 Modified: head/sys/arm/mv/orion/std.db88f5xxx ============================================================================== --- head/sys/arm/mv/orion/std.db88f5xxx Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/mv/orion/std.db88f5xxx Tue Dec 22 09:08:21 2015 (r292591) @@ -5,7 +5,5 @@ files "../mv/orion/files.db88f5xxx" makeoptions KERNPHYSADDR=0x00900000 makeoptions KERNVIRTADDR=0xc0900000 - -options KERNPHYSADDR=0x00900000 options KERNVIRTADDR=0xc0900000 options PHYSADDR=0x00000000 Modified: head/sys/arm/mv/orion/std.ts7800 ============================================================================== --- head/sys/arm/mv/orion/std.ts7800 Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/mv/orion/std.ts7800 Tue Dec 22 09:08:21 2015 (r292591) @@ -5,8 +5,6 @@ files "../mv/orion/files.ts7800" makeoptions KERNPHYSADDR=0x00900000 makeoptions KERNVIRTADDR=0xc0900000 - -options KERNPHYSADDR=0x00900000 options KERNVIRTADDR=0xc0900000 options PHYSADDR=0x00000000 options LOADERRAMADDR=0x00000000 Modified: head/sys/arm/xscale/ixp425/std.avila ============================================================================== --- head/sys/arm/xscale/ixp425/std.avila Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/arm/xscale/ixp425/std.avila Tue Dec 22 09:08:21 2015 (r292591) @@ -13,7 +13,6 @@ files "../xscale/ixp425/files.avila" # be remapped away from 0. # options PHYSADDR=0x00000000 -options KERNPHYSADDR=0x00200000 makeoptions KERNPHYSADDR=0x00200000 options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm makeoptions KERNVIRTADDR=0xc0200000 Modified: head/sys/conf/options.arm ============================================================================== --- head/sys/conf/options.arm Tue Dec 22 09:02:51 2015 (r292590) +++ head/sys/conf/options.arm Tue Dec 22 09:08:21 2015 (r292591) @@ -32,7 +32,6 @@ IPI_IRQ_END opt_smp.h FREEBSD_BOOT_LOADER opt_global.h IXP4XX_FLASH_SIZE opt_global.h KERNBASE opt_global.h -KERNPHYSADDR opt_global.h KERNVIRTADDR opt_global.h LINUX_BOOT_ABI opt_global.h LOADERRAMADDR opt_global.h _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
