Index: head/sys/arm/allwinner/a20/std.a20
===================================================================
--- head/sys/arm/allwinner/a20/std.a20	(revision 291101)
+++ head/sys/arm/allwinner/a20/std.a20	(revision 291102)
@@ -1,26 +1,18 @@
 # Allwinner A20 common options
 #$FreeBSD$
 
 cpu		CPU_CORTEXA
 machine 	arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoption	ARM_LITTLE_ENDIAN
 
-# Physical memory starts at 0x40200000.  We assume images are loaded at
-# 0x40200000, e.g. from u-boot with 'fatload mmc 0 0x40200000 kernel'
-#
-#
-options 	PHYSADDR=0x40000000
-
-makeoptions	KERNPHYSADDR=0x40200000
-options 	KERNPHYSADDR=0x40200000
 makeoptions	KERNVIRTADDR=0xc0200000
 options 	KERNVIRTADDR=0xc0200000
 
 options 	ARM_L2_PIPT
 
 options 	IPI_IRQ_START=0
 options 	IPI_IRQ_END=15
 
 files		"../allwinner/files.allwinner"
 files		"../allwinner/a20/files.a20"
Index: head/sys/arm/allwinner/std.a10
===================================================================
--- head/sys/arm/allwinner/std.a10	(revision 291101)
+++ head/sys/arm/allwinner/std.a10	(revision 291102)
@@ -1,23 +1,15 @@
 # Allwinner A10 common options
 #$FreeBSD$
 
 cpu		CPU_CORTEXA
 machine 	arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoption	ARM_LITTLE_ENDIAN
 
-# Physical memory starts at 0x40200000.  We assume images are loaded at
-# 0x40200000, e.g. from u-boot with 'fatload mmc 0 0x40200000 kernel'
-#
-#
-options 	PHYSADDR=0x40000000
-
-makeoptions	KERNPHYSADDR=0x40200000
-options 	KERNPHYSADDR=0x40200000
 makeoptions	KERNVIRTADDR=0xc0200000
 options 	KERNVIRTADDR=0xc0200000
 
 options 	ARM_L2_PIPT
 
 files		"../allwinner/files.allwinner"
 files		"../allwinner/files.a10"
Index: head/sys/arm/altera/socfpga/std.socfpga
===================================================================
--- head/sys/arm/altera/socfpga/std.socfpga	(revision 291101)
+++ head/sys/arm/altera/socfpga/std.socfpga	(revision 291102)
@@ -1,22 +1,17 @@
 # $FreeBSD$
 
 makeoption	ARM_LITTLE_ENDIAN
 
 cpu		CPU_CORTEXA
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
-options		PHYSADDR=0x00000000
-
-makeoptions	KERNPHYSADDR=0x00f00000
-options		KERNPHYSADDR=0x00f00000
-
 makeoptions	KERNVIRTADDR=0xc0f00000
 options		KERNVIRTADDR=0xc0f00000
 
 options		ARM_L2_PIPT
 
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
 files		"../altera/socfpga/files.socfpga"
Index: head/sys/arm/annapurna/alpine/std.alpine
===================================================================
--- head/sys/arm/annapurna/alpine/std.alpine	(revision 291101)
+++ head/sys/arm/annapurna/alpine/std.alpine	(revision 291102)
@@ -1,23 +1,20 @@
 # $FreeBSD$
 
 makeoption	ARM_LITTLE_ENDIAN
 
 cpu		CPU_CORTEXA
 machine 	arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a -DAL_HAVE_TYPES"
 
-makeoptions	KERNPHYSADDR=0x00200000
-options 	KERNPHYSADDR=0x00200000
-
 makeoptions	KERNVIRTADDR=0xa0200000
 options 	KERNVIRTADDR=0xa0200000
 
 makeoptions	KERNBASE=0xa0000000
 options 	KERNBASE=0xa0000000
 
 options 	ARM_L2_PIPT
 
 options 	IPI_IRQ_START=0
 options 	IPI_IRQ_END=15
 
 files		"../annapurna/alpine/files.alpine"
Index: head/sys/arm/broadcom/bcm2835/std.rpi
===================================================================
--- head/sys/arm/broadcom/bcm2835/std.rpi	(revision 291101)
+++ head/sys/arm/broadcom/bcm2835/std.rpi	(revision 291102)
@@ -1,9 +1,6 @@
 # $FreeBSD$
 
 options		KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000
-options		KERNPHYSADDR=0x00100000
-makeoptions	KERNPHYSADDR=0x00100000
-options		PHYSADDR=0x00000000
 options		FREEBSD_BOOT_LOADER
 options		LINUX_BOOT_ABI
Index: head/sys/arm/conf/VERSATILEPB
===================================================================
--- head/sys/arm/conf/VERSATILEPB	(revision 291101)
+++ head/sys/arm/conf/VERSATILEPB	(revision 291102)
@@ -1,88 +1,85 @@
 #
 # VERSATILEPB - Configuration for QEMU version of Versatile Platform Board
 #
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
 #    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
 # FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
 # device lines is also present in the ../../conf/NOTES and NOTES files.
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
 # $FreeBSD$
 
 ident		VERSATILEPB
 machine		arm	armv6
 cpu 		CPU_ARM1176
 
 include 	"std.armv6"
 files		"../versatile/files.versatile"
 makeoptions	MODULES_OVERRIDE=""
 
 options 	KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000
-options 	KERNPHYSADDR=0x00100000
-makeoptions	KERNPHYSADDR=0x00100000
-options 	PHYSADDR=0x00000000
 
 options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	LINUX_BOOT_ABI		# Process metadata passed from Linux boot loaders
 
 # Debugging for use in -current
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 options 	KDB			# Enable kernel debugger support
 # For minimum debugger support (stable branch) use:
 #options 	KDB_TRACE		# Print a stack trace for a panic
 # For full debugger support use this instead:
 options 	DDB			# Enable the kernel debugger
 options 	INVARIANTS		# Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
 
 options 	ROOTDEVNAME=\"ufs:da0s1a\"
 
 device		bpf
 device		loop
 device		mii
 device		mii_bitbang
 device		smc
 device		smcphy
 device		ether
 device		uart
 device		pl011
 device		pl190
 
 device		pty
 device		snp
 
 device		pci
 
 # SCSI Controllers
 device		sym			# NCR/Symbios/LSI Logic 53C8XX/53C1010/53C1510D
 
 # ATA/SCSI peripherals
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # NOTE: serial console is disabled if syscons enabled
 # Comment following lines for headless setup
 device		sc
 device		kbdmux
 options 	SC_DFLT_FONT    	# compile font in
 makeoptions	SC_DFLT_FONT=cp437
 
 device		md
 device		random			# Entropy device
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=versatilepb.dts
Index: head/sys/arm/freescale/imx/std.imx51
===================================================================
--- head/sys/arm/freescale/imx/std.imx51	(revision 291101)
+++ head/sys/arm/freescale/imx/std.imx51	(revision 291102)
@@ -1,16 +1,13 @@
 # $FreeBSD$
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	ARM_LITTLE_ENDIAN
 options		ARM_L2_PIPT
 
 options		KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000
-options		KERNPHYSADDR=0x90100000
-makeoptions	KERNPHYSADDR=0x90100000
-options		PHYSADDR=0x90000000
 
 device  	fdt_pinctrl
 
 files "../freescale/imx/files.imx5"
Index: head/sys/arm/freescale/imx/std.imx53
===================================================================
--- head/sys/arm/freescale/imx/std.imx53	(revision 291101)
+++ head/sys/arm/freescale/imx/std.imx53	(revision 291102)
@@ -1,16 +1,13 @@
 # $FreeBSD$
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	ARM_LITTLE_ENDIAN
 options		ARM_L2_PIPT
 
 options		KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000
-options		KERNPHYSADDR=0x70100000
-makeoptions	KERNPHYSADDR=0x70100000
-options		PHYSADDR=0x70000000
 
 device  	fdt_pinctrl
 
 files "../freescale/imx/files.imx5"
Index: head/sys/arm/freescale/imx/std.imx6
===================================================================
--- head/sys/arm/freescale/imx/std.imx6	(revision 291101)
+++ head/sys/arm/freescale/imx/std.imx6	(revision 291102)
@@ -1,20 +1,17 @@
 # $FreeBSD$
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	ARM_LITTLE_ENDIAN
 options		ARM_L2_PIPT
 
 options		KERNVIRTADDR		= 0xc2000000
 makeoptions	KERNVIRTADDR		= 0xc2000000
-options		KERNPHYSADDR		= 0x12000000
-makeoptions	KERNPHYSADDR		= 0x12000000
-options		PHYSADDR		= 0x10000000
 
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
 device  	fdt_pinctrl
 
 files "../freescale/imx/files.imx6"
 
Index: head/sys/arm/freescale/vybrid/std.vybrid
===================================================================
--- head/sys/arm/freescale/vybrid/std.vybrid	(revision 291101)
+++ head/sys/arm/freescale/vybrid/std.vybrid	(revision 291102)
@@ -1,19 +1,14 @@
 # $FreeBSD$
 
 makeoption	ARM_LITTLE_ENDIAN
 
 cpu		CPU_CORTEXA
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
-options		PHYSADDR=0x80000000
-
-makeoptions	KERNPHYSADDR=0x80100000
-options		KERNPHYSADDR=0x80100000
-
 makeoptions	KERNVIRTADDR=0xc0100000
 options		KERNVIRTADDR=0xc0100000
 
 options		ARM_L2_PIPT
 
 files		"../freescale/vybrid/files.vybrid"
Index: head/sys/arm/mv/armadaxp/std.armadaxp
===================================================================
--- head/sys/arm/mv/armadaxp/std.armadaxp	(revision 291101)
+++ head/sys/arm/mv/armadaxp/std.armadaxp	(revision 291102)
@@ -1,16 +1,6 @@
 # $FreeBSD$
 
-# kernel gets loaded at 0x00200000 by the loader, but runs at virtual address
-# 0xc0200000.  RAM starts at 0.  We put the pagetable at a reasonable place
-# in memory, but may need to bounce it higher if there's a problem with this.
-# We could paper over this by loading the kernel at 0xc0000000 virtual, but
-# that leads to other complications, so we'll just reclaim the lower region of
-# ram after we're loaded.  Put the page tables for startup at 1MB.
-makeoptions	KERNPHYSADDR=0x00200000
 makeoptions	KERNVIRTADDR=0xc0200000
-
-options		KERNPHYSADDR=0x00200000
 options		KERNVIRTADDR=0xc0200000
-options		PHYSADDR=0x00000000
 
 options		ARM_L2_PIPT
Index: head/sys/arm/rockchip/std.rk30xx
===================================================================
--- head/sys/arm/rockchip/std.rk30xx	(revision 291101)
+++ head/sys/arm/rockchip/std.rk30xx	(revision 291102)
@@ -1,26 +1,17 @@
 # Rockchip rk30xx common options
 #$FreeBSD$
 
 cpu		CPU_CORTEXA
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoption	ARM_LITTLE_ENDIAN
 
-# Physical memory starts at 0x60400000.  We assume images are loaded at
-# 0x60400000.
-#
-#
-options		PHYSADDR=0x60000000
-
-makeoptions	KERNPHYSADDR=0x60400000
-options		KERNPHYSADDR=0x60400000
-
 makeoptions	KERNVIRTADDR=0xc0400000
 options		KERNVIRTADDR=0xc0400000
 
 options		ARM_L2_PIPT
 
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
 files		"../rockchip/files.rk30xx"
Index: head/sys/arm/samsung/exynos/std.exynos5250
===================================================================
--- head/sys/arm/samsung/exynos/std.exynos5250	(revision 291101)
+++ head/sys/arm/samsung/exynos/std.exynos5250	(revision 291102)
@@ -1,22 +1,17 @@
 # $FreeBSD$
 
 makeoption	ARM_LITTLE_ENDIAN
 
 cpu		CPU_CORTEXA
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
-options		PHYSADDR=0x40000000
-
-makeoptions	KERNPHYSADDR=0x40f00000
-options		KERNPHYSADDR=0x40f00000
-
 makeoptions	KERNVIRTADDR=0xc0f00000
 options		KERNVIRTADDR=0xc0f00000
 
 options		ARM_L2_PIPT
 
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
 files		"../samsung/exynos/files.exynos5"
Index: head/sys/arm/samsung/exynos/std.exynos5420
===================================================================
--- head/sys/arm/samsung/exynos/std.exynos5420	(revision 291101)
+++ head/sys/arm/samsung/exynos/std.exynos5420	(revision 291102)
@@ -1,22 +1,17 @@
 # $FreeBSD$
 
 makeoption	ARM_LITTLE_ENDIAN
 
 cpu		CPU_CORTEXA
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
-options		PHYSADDR=0x20000000
-
-makeoptions	KERNPHYSADDR=0x20f00000
-options		KERNPHYSADDR=0x20f00000
-
 makeoptions	KERNVIRTADDR=0xc0f00000
 options		KERNVIRTADDR=0xc0f00000
 
 options		ARM_L2_PIPT
 
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
 files		"../samsung/exynos/files.exynos5"
Index: head/sys/arm/ti/am335x/std.am335x
===================================================================
--- head/sys/arm/ti/am335x/std.am335x	(revision 291101)
+++ head/sys/arm/ti/am335x/std.am335x	(revision 291102)
@@ -1,19 +1,12 @@
 # AM335x generic configuration
 #$FreeBSD$
 files		"../ti/am335x/files.am335x"
 include		"../ti/std.ti"
 makeoption	ARM_LITTLE_ENDIAN
 
-# Physical memory starts at 0x80000000.  We assume images are loaded at
-# 0x80200000, e.g. from u-boot with 'fatload mmc 0 0x80200000 kernel.bin'
-#
-#
-options		PHYSADDR=0x80000000
-options		KERNPHYSADDR=0x80200000
-makeoptions	KERNPHYSADDR=0x80200000
 options		KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
 makeoptions	KERNVIRTADDR=0xc0200000
 
 options		SOC_TI_AM335X
 
 options		ARM_L2_PIPT
Index: head/sys/arm/ti/omap4/std.omap4
===================================================================
--- head/sys/arm/ti/omap4/std.omap4	(revision 291101)
+++ head/sys/arm/ti/omap4/std.omap4	(revision 291102)
@@ -1,19 +1,12 @@
 # Omap4430 generic configuration
 #$FreeBSD$
 files		"../ti/omap4/files.omap4"
 include		"../ti/std.ti"
 makeoption	ARM_LITTLE_ENDIAN
 
-# Physical memory starts at 0x80000000.  We assume images are loaded at
-# 0x80200000, e.g. from u-boot with 'fatload mmc 0 0x80200000 kernel.bin'
-#
-#
-options		PHYSADDR=0x80000000
-options		KERNPHYSADDR=0x80200000
-makeoptions	KERNPHYSADDR=0x80200000
 options		KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
 makeoptions	KERNVIRTADDR=0xc0200000
 
 options		SOC_OMAP4
 
 options		ARM_L2_PIPT
Index: head/sys/arm/xilinx/std.zynq7
===================================================================
--- head/sys/arm/xilinx/std.zynq7	(revision 291101)
+++ head/sys/arm/xilinx/std.zynq7	(revision 291102)
@@ -1,25 +1,18 @@
 #
 # std.zynq7		- Generic configuration for Xilinx Zynq-7000 PS.
 #
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
 machine		arm	armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 files		"../xilinx/files.zynq7"
 
-# Physical memory starts at 0x00000000.  We assume images are loaded at
-# 0x00100000, e.g. from u-boot with 'fatload mmc 0 0x100000 kernel.bin'
-#
-#
-options		PHYSADDR=0x00000000
-options		KERNPHYSADDR=0x00100000
-makeoptions	KERNPHYSADDR=0x00100000
 options		KERNVIRTADDR=0xc0100000		# Used in ldscript.arm
 makeoptions	KERNVIRTADDR=0xc0100000
 
 options		ARM_L2_PIPT
 
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15