Date: Fri, 20 Nov 2015 16:12:23 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291102 - in head/sys/arm: allwinner allwinner/a20 altera/socfpga annapurna/alpine broadcom/bcm2835 conf freescale/imx freescale/vybrid mv/armadaxp rockchip samsung/exynos ti/am335x ti/... Message-ID: <201511201612.tAKGCNHq037256@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Fri Nov 20 16:12:22 2015 New Revision: 291102 URL: https://svnweb.freebsd.org/changeset/base/291102 Log: Stop setting {KERN,}PHYSADDR on armv6, it's unneeded. Sponsored by: ABT Systems Ltd Modified: head/sys/arm/allwinner/a20/std.a20 head/sys/arm/allwinner/std.a10 head/sys/arm/altera/socfpga/std.socfpga head/sys/arm/annapurna/alpine/std.alpine head/sys/arm/broadcom/bcm2835/std.rpi head/sys/arm/conf/VERSATILEPB head/sys/arm/freescale/imx/std.imx51 head/sys/arm/freescale/imx/std.imx53 head/sys/arm/freescale/imx/std.imx6 head/sys/arm/freescale/vybrid/std.vybrid head/sys/arm/mv/armadaxp/std.armadaxp head/sys/arm/rockchip/std.rk30xx head/sys/arm/samsung/exynos/std.exynos5250 head/sys/arm/samsung/exynos/std.exynos5420 head/sys/arm/ti/am335x/std.am335x head/sys/arm/ti/omap4/std.omap4 head/sys/arm/xilinx/std.zynq7 Modified: head/sys/arm/allwinner/a20/std.a20 ============================================================================== --- head/sys/arm/allwinner/a20/std.a20 Fri Nov 20 16:10:58 2015 (r291101) +++ head/sys/arm/allwinner/a20/std.a20 Fri Nov 20 16:12:22 2015 (r291102) @@ -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 Modified: head/sys/arm/allwinner/std.a10 ============================================================================== --- head/sys/arm/allwinner/std.a10 Fri Nov 20 16:10:58 2015 (r291101) +++ head/sys/arm/allwinner/std.a10 Fri Nov 20 16:12:22 2015 (r291102) @@ -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 Modified: head/sys/arm/altera/socfpga/std.socfpga ============================================================================== --- head/sys/arm/altera/socfpga/std.socfpga Fri Nov 20 16:10:58 2015 (r291101) +++ head/sys/arm/altera/socfpga/std.socfpga Fri Nov 20 16:12:22 2015 (r291102) @@ -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 Modified: head/sys/arm/annapurna/alpine/std.alpine ============================================================================== --- head/sys/arm/annapurna/alpine/std.alpine Fri Nov 20 16:10:58 2015 (r291101) +++ head/sys/arm/annapurna/alpine/std.alpine Fri Nov 20 16:12:22 2015 (r291102) @@ -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 Modified: head/sys/arm/broadcom/bcm2835/std.rpi ============================================================================== --- head/sys/arm/broadcom/bcm2835/std.rpi Fri Nov 20 16:10:58 2015 (r291101) +++ head/sys/arm/broadcom/bcm2835/std.rpi Fri Nov 20 16:12:22 2015 (r291102) @@ -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 Modified: head/sys/arm/conf/VERSATILEPB ============================================================================== --- head/sys/arm/conf/VERSATILEPB Fri Nov 20 16:10:58 2015 (r291101) +++ head/sys/arm/conf/VERSATILEPB Fri Nov 20 16:12:22 2015 (r291102) @@ -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 Modified: head/sys/arm/freescale/imx/std.imx51 ============================================================================== --- head/sys/arm/freescale/imx/std.imx51 Fri Nov 20 16:10:58 2015 (r291101) +++ head/sys/arm/freescale/imx/std.imx51 Fri Nov 20 16:12:22 2015 (r291102) @@ -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 Modified: head/sys/arm/freescale/imx/std.imx53 ============================================================================== --- head/sys/arm/freescale/imx/std.imx53 Fri Nov 20 16:10:58 2015 (r291101) +++ head/sys/arm/freescale/imx/std.imx53 Fri Nov 20 16:12:22 2015 (r291102) @@ -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 Modified: head/sys/arm/freescale/imx/std.imx6 ============================================================================== --- head/sys/arm/freescale/imx/std.imx6 Fri Nov 20 16:10:58 2015 (r291101) +++ head/sys/arm/freescale/imx/std.imx6 Fri Nov 20 16:12:22 2015 (r291102) @@ -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 Modified: head/sys/arm/freescale/vybrid/std.vybrid ============================================================================== --- head/sys/arm/freescale/vybrid/std.vybrid Fri Nov 20 16:10:58 2015 (r291101) +++ head/sys/arm/freescale/vybrid/std.vybrid Fri Nov 20 16:12:22 2015 (r291102) @@ -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 Modified: head/sys/arm/mv/armadaxp/std.armadaxp ============================================================================== --- head/sys/arm/mv/armadaxp/std.armadaxp Fri Nov 20 16:10:58 2015 (r291101) +++ head/sys/arm/mv/armadaxp/std.armadaxp Fri Nov 20 16:12:22 2015 (r291102) @@ -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 Modified: head/sys/arm/rockchip/std.rk30xx ============================================================================== --- head/sys/arm/rockchip/std.rk30xx Fri Nov 20 16:10:58 2015 (r291101) +++ head/sys/arm/rockchip/std.rk30xx Fri Nov 20 16:12:22 2015 (r291102) @@ -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 Modified: head/sys/arm/samsung/exynos/std.exynos5250 ============================================================================== --- head/sys/arm/samsung/exynos/std.exynos5250 Fri Nov 20 16:10:58 2015 (r291101) +++ head/sys/arm/samsung/exynos/std.exynos5250 Fri Nov 20 16:12:22 2015 (r291102) @@ -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 Modified: head/sys/arm/samsung/exynos/std.exynos5420 ============================================================================== --- head/sys/arm/samsung/exynos/std.exynos5420 Fri Nov 20 16:10:58 2015 (r291101) +++ head/sys/arm/samsung/exynos/std.exynos5420 Fri Nov 20 16:12:22 2015 (r291102) @@ -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 Modified: head/sys/arm/ti/am335x/std.am335x ============================================================================== --- head/sys/arm/ti/am335x/std.am335x Fri Nov 20 16:10:58 2015 (r291101) +++ head/sys/arm/ti/am335x/std.am335x Fri Nov 20 16:12:22 2015 (r291102) @@ -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 Modified: head/sys/arm/ti/omap4/std.omap4 ============================================================================== --- head/sys/arm/ti/omap4/std.omap4 Fri Nov 20 16:10:58 2015 (r291101) +++ head/sys/arm/ti/omap4/std.omap4 Fri Nov 20 16:12:22 2015 (r291102) @@ -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 Modified: head/sys/arm/xilinx/std.zynq7 ============================================================================== --- head/sys/arm/xilinx/std.zynq7 Fri Nov 20 16:10:58 2015 (r291101) +++ head/sys/arm/xilinx/std.zynq7 Fri Nov 20 16:12:22 2015 (r291102) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511201612.tAKGCNHq037256>