From aeef645f928dfc76fa991e727f29f834fbffa431 Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Fri, 20 Nov 2015 16:12:22 +0000 Subject: [PATCH] Stop setting {KERN,}PHYSADDR on armv6, it's unneeded. Sponsored by: ABT Systems Ltd --- sys/arm/allwinner/a20/std.a20 | 8 -------- sys/arm/allwinner/std.a10 | 8 -------- sys/arm/altera/socfpga/std.socfpga | 5 ----- sys/arm/annapurna/alpine/std.alpine | 3 --- sys/arm/broadcom/bcm2835/std.rpi | 3 --- sys/arm/conf/VERSATILEPB | 3 --- sys/arm/freescale/imx/std.imx51 | 3 --- sys/arm/freescale/imx/std.imx53 | 3 --- sys/arm/freescale/imx/std.imx6 | 3 --- sys/arm/freescale/vybrid/std.vybrid | 5 ----- sys/arm/mv/armadaxp/std.armadaxp | 10 ---------- sys/arm/rockchip/std.rk30xx | 9 --------- sys/arm/samsung/exynos/std.exynos5250 | 5 ----- sys/arm/samsung/exynos/std.exynos5420 | 5 ----- sys/arm/ti/am335x/std.am335x | 7 ------- sys/arm/ti/omap4/std.omap4 | 7 ------- sys/arm/xilinx/std.zynq7 | 7 ------- 17 files changed, 94 deletions(-) diff --git a/sys/arm/allwinner/a20/std.a20 b/sys/arm/allwinner/a20/std.a20 index eb4fa3f7b60..77870592bcc 100644 --- a/sys/arm/allwinner/a20/std.a20 +++ b/sys/arm/allwinner/a20/std.a20 @@ -6,14 +6,6 @@ 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 diff --git a/sys/arm/allwinner/std.a10 b/sys/arm/allwinner/std.a10 index 8d99ab8e77f..2285fe4439d 100644 --- a/sys/arm/allwinner/std.a10 +++ b/sys/arm/allwinner/std.a10 @@ -6,14 +6,6 @@ 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 diff --git a/sys/arm/altera/socfpga/std.socfpga b/sys/arm/altera/socfpga/std.socfpga index 7fa5c88a8e5..5808df26c16 100644 --- a/sys/arm/altera/socfpga/std.socfpga +++ b/sys/arm/altera/socfpga/std.socfpga @@ -6,11 +6,6 @@ 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 diff --git a/sys/arm/annapurna/alpine/std.alpine b/sys/arm/annapurna/alpine/std.alpine index b5774750d7b..8959c85528f 100644 --- a/sys/arm/annapurna/alpine/std.alpine +++ b/sys/arm/annapurna/alpine/std.alpine @@ -6,9 +6,6 @@ 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 diff --git a/sys/arm/broadcom/bcm2835/std.rpi b/sys/arm/broadcom/bcm2835/std.rpi index b4a07470fb0..c53c7207dd6 100644 --- a/sys/arm/broadcom/bcm2835/std.rpi +++ b/sys/arm/broadcom/bcm2835/std.rpi @@ -2,8 +2,5 @@ options KERNVIRTADDR=0xc0100000 makeoptions KERNVIRTADDR=0xc0100000 -options KERNPHYSADDR=0x00100000 -makeoptions KERNPHYSADDR=0x00100000 -options PHYSADDR=0x00000000 options FREEBSD_BOOT_LOADER options LINUX_BOOT_ABI diff --git a/sys/arm/conf/VERSATILEPB b/sys/arm/conf/VERSATILEPB index d1fc77ab2c4..8ba960d25ad 100644 --- a/sys/arm/conf/VERSATILEPB +++ b/sys/arm/conf/VERSATILEPB @@ -28,9 +28,6 @@ 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 diff --git a/sys/arm/freescale/imx/std.imx51 b/sys/arm/freescale/imx/std.imx51 index eca33c26396..d7a5b8eeb5a 100644 --- a/sys/arm/freescale/imx/std.imx51 +++ b/sys/arm/freescale/imx/std.imx51 @@ -7,9 +7,6 @@ options ARM_L2_PIPT options KERNVIRTADDR=0xc0100000 makeoptions KERNVIRTADDR=0xc0100000 -options KERNPHYSADDR=0x90100000 -makeoptions KERNPHYSADDR=0x90100000 -options PHYSADDR=0x90000000 device fdt_pinctrl diff --git a/sys/arm/freescale/imx/std.imx53 b/sys/arm/freescale/imx/std.imx53 index 1da484ceebd..d7a5b8eeb5a 100644 --- a/sys/arm/freescale/imx/std.imx53 +++ b/sys/arm/freescale/imx/std.imx53 @@ -7,9 +7,6 @@ options ARM_L2_PIPT options KERNVIRTADDR=0xc0100000 makeoptions KERNVIRTADDR=0xc0100000 -options KERNPHYSADDR=0x70100000 -makeoptions KERNPHYSADDR=0x70100000 -options PHYSADDR=0x70000000 device fdt_pinctrl diff --git a/sys/arm/freescale/imx/std.imx6 b/sys/arm/freescale/imx/std.imx6 index 08fa4410ab5..4e4c586fcea 100644 --- a/sys/arm/freescale/imx/std.imx6 +++ b/sys/arm/freescale/imx/std.imx6 @@ -7,9 +7,6 @@ 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 diff --git a/sys/arm/freescale/vybrid/std.vybrid b/sys/arm/freescale/vybrid/std.vybrid index 5d732a512c4..9872502a45b 100644 --- a/sys/arm/freescale/vybrid/std.vybrid +++ b/sys/arm/freescale/vybrid/std.vybrid @@ -6,11 +6,6 @@ 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 diff --git a/sys/arm/mv/armadaxp/std.armadaxp b/sys/arm/mv/armadaxp/std.armadaxp index d53a8033f1b..23e5423ff30 100644 --- a/sys/arm/mv/armadaxp/std.armadaxp +++ b/sys/arm/mv/armadaxp/std.armadaxp @@ -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 diff --git a/sys/arm/rockchip/std.rk30xx b/sys/arm/rockchip/std.rk30xx index 1f20cdd7f86..6e62dc17c2e 100644 --- a/sys/arm/rockchip/std.rk30xx +++ b/sys/arm/rockchip/std.rk30xx @@ -6,15 +6,6 @@ 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 diff --git a/sys/arm/samsung/exynos/std.exynos5250 b/sys/arm/samsung/exynos/std.exynos5250 index bbcb64ed042..124048b77a8 100644 --- a/sys/arm/samsung/exynos/std.exynos5250 +++ b/sys/arm/samsung/exynos/std.exynos5250 @@ -6,11 +6,6 @@ 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 diff --git a/sys/arm/samsung/exynos/std.exynos5420 b/sys/arm/samsung/exynos/std.exynos5420 index 36c23db4de8..124048b77a8 100644 --- a/sys/arm/samsung/exynos/std.exynos5420 +++ b/sys/arm/samsung/exynos/std.exynos5420 @@ -6,11 +6,6 @@ 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 diff --git a/sys/arm/ti/am335x/std.am335x b/sys/arm/ti/am335x/std.am335x index 7bcc7468db6..0e6a98fff8c 100644 --- a/sys/arm/ti/am335x/std.am335x +++ b/sys/arm/ti/am335x/std.am335x @@ -4,13 +4,6 @@ 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 diff --git a/sys/arm/ti/omap4/std.omap4 b/sys/arm/ti/omap4/std.omap4 index 02fc8a2d28a..b20eb045f2f 100644 --- a/sys/arm/ti/omap4/std.omap4 +++ b/sys/arm/ti/omap4/std.omap4 @@ -4,13 +4,6 @@ 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 diff --git a/sys/arm/xilinx/std.zynq7 b/sys/arm/xilinx/std.zynq7 index 10f3ecc7a3c..a5c6c577fa5 100644 --- a/sys/arm/xilinx/std.zynq7 +++ b/sys/arm/xilinx/std.zynq7 @@ -9,13 +9,6 @@ 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