d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Create std.arm and std.armv6 config files and include the right one from

Browse Source 
each of the existing kernel configs.  This gives a place to put config
that applies to the entire arch.

Add the ARM_NEW_PMAP option to std.armv6.  This is working well in early
testing and it's time for wide exposure, but it's still nice to be able
to fall back to the old implementation for testing when a problem comes
along.  Eventually the option and the old implementation will go away.

The opportunity now exists to move a whole lot of boilerplate from all the
arm kernel config files into std.arm*, but that's a commit for another day.
This commit is contained in:
Ian Lepore 2015-05-05 16:09:25 +00:00
parent 4b9b2a3781
commit 65c3de4e62
49 changed files with 60 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/arm/conf/AML8726
View File

@ -19,6 +19,8 @@
# $FreeBSD$ # $FreeBSD$
ident AML8726 ident AML8726
include "std.armv6"
include "../amlogic/aml8726/std.aml8726" include "../amlogic/aml8726/std.aml8726"
options HZ=100 options HZ=100

2
sys/arm/conf/ARMADAXP
View File

@ -19,6 +19,8 @@
# $FreeBSD$ # $FreeBSD$
ident MV-88F78XX0 ident MV-88F78XX0
include "std.armv6"
include "../mv/armadaxp/std.mv78x60" include "../mv/armadaxp/std.mv78x60"
options SOC_MV_ARMADAXP options SOC_MV_ARMADAXP

1
sys/arm/conf/ATMEL
View File

@ -6,6 +6,7 @@
ident ATMEL ident ATMEL
include "std.arm"
include "../at91/std.atmel" include "../at91/std.atmel"
# Typical values for most SoCs and board configurations. Will not work for # Typical values for most SoCs and board configurations. Will not work for

1
sys/arm/conf/AVILA
View File

@ -20,6 +20,7 @@
ident AVILA ident AVILA
include "std.arm"
include "../xscale/ixp425/std.ixp425" include "../xscale/ixp425/std.ixp425"
# NB: memory mapping is defined in std.avila # NB: memory mapping is defined in std.avila
include "../xscale/ixp425/std.avila" include "../xscale/ixp425/std.avila"

2
sys/arm/conf/BEAGLEBONE
View File

@ -23,6 +23,7 @@
ident BEAGLEBONE ident BEAGLEBONE
include "std.armv6"
include "../ti/am335x/std.am335x" include "../ti/am335x/std.am335x"
makeoptions MODULES_EXTRA="dtb/am335x" makeoptions MODULES_EXTRA="dtb/am335x"
@ -67,7 +68,6 @@ options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options PLATFORM options PLATFORM
options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8) options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8)
options VFP # Enable floating point hardware support options VFP # Enable floating point hardware support
options ARM_NEW_PMAP # Enable the new v6 pmap
# Debugging for use in -current # Debugging for use in -current
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols

1
sys/arm/conf/BWCT
View File

@ -21,6 +21,7 @@
ident BWCT ident BWCT
include "std.arm"
options VERBOSE_INIT_ARM options VERBOSE_INIT_ARM
include "../at91/std.bwct" include "../at91/std.bwct"

1
sys/arm/conf/CAMBRIA
View File

@ -20,6 +20,7 @@
ident CAMBRIA ident CAMBRIA
include "std.arm"
include "../xscale/ixp425/std.ixp435" include "../xscale/ixp425/std.ixp435"
# NB: memory mapping is defined in std.avila # NB: memory mapping is defined in std.avila
include "../xscale/ixp425/std.avila" include "../xscale/ixp425/std.avila"

1
sys/arm/conf/CNS11XXNAS
View File

@ -20,6 +20,7 @@
ident CNS11XXNAS ident CNS11XXNAS
include "std.arm"
#options PHYSADDR=0x10000000 #options PHYSADDR=0x10000000
#options KERNPHYSADDR=0x10200000 #options KERNPHYSADDR=0x10200000
#options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm #options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm

1
sys/arm/conf/CRB
View File

@ -19,6 +19,7 @@
ident CRB ident CRB
include "std.arm"
options PHYSADDR=0x00000000 options PHYSADDR=0x00000000
options KERNPHYSADDR=0x00200000 options KERNPHYSADDR=0x00200000
options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm

1
sys/arm/conf/CUBIEBOARD
View File

@ -21,6 +21,7 @@
ident CUBIEBOARD ident CUBIEBOARD
include "std.armv6"
include "../allwinner/std.a10" include "../allwinner/std.a10"
options HZ=100 options HZ=100

1
sys/arm/conf/CUBIEBOARD2
View File

@ -21,6 +21,7 @@
ident CUBIEBOARD2 ident CUBIEBOARD2
include "std.armv6"
include "../allwinner/a20/std.a20" include "../allwinner/a20/std.a20"
options HZ=100 options HZ=100

1
sys/arm/conf/DB-78XXX
View File

@ -5,6 +5,7 @@
# #
ident DB-88F78XX ident DB-88F78XX
include "std.arm"
include "../mv/discovery/std.db78xxx" include "../mv/discovery/std.db78xxx"
options SOC_MV_DISCOVERY options SOC_MV_DISCOVERY

1
sys/arm/conf/DB-88F5XXX
View File

@ -5,6 +5,7 @@
# #
ident DB-88F5XXX ident DB-88F5XXX
include "std.arm"
include "../mv/orion/std.db88f5xxx" include "../mv/orion/std.db88f5xxx"
options SOC_MV_ORION options SOC_MV_ORION

1
sys/arm/conf/DB-88F6XXX
View File

@ -5,6 +5,7 @@
# #
ident DB-88F6XXX ident DB-88F6XXX
include "std.arm"
include "../mv/kirkwood/std.db88f6xxx" include "../mv/kirkwood/std.db88f6xxx"
options SOC_MV_KIRKWOOD options SOC_MV_KIRKWOOD

1
sys/arm/conf/DOCKSTAR
View File

@ -21,6 +21,7 @@
ident DOCKSTAR ident DOCKSTAR
include "std.arm"
include "../mv/kirkwood/std.db88f6xxx" include "../mv/kirkwood/std.db88f6xxx"
makeoptions FDT_DTS_FILE=dockstar.dts makeoptions FDT_DTS_FILE=dockstar.dts

1
sys/arm/conf/DREAMPLUG-1001
View File

@ -24,6 +24,7 @@
ident DREAMPLUG-1001 ident DREAMPLUG-1001
include "std.arm"
include "../mv/kirkwood/std.db88f6xxx" include "../mv/kirkwood/std.db88f6xxx"
makeoptions FDT_DTS_FILE=dreamplug-1001.dts makeoptions FDT_DTS_FILE=dreamplug-1001.dts

1
sys/arm/conf/EA3250
View File

@ -5,6 +5,7 @@
# #
ident EA3250 ident EA3250
include "std.arm"
include "../lpc/std.lpc" include "../lpc/std.lpc"
hints "EA3250.hints" hints "EA3250.hints"

1
sys/arm/conf/EB9200
View File

@ -16,6 +16,7 @@
ident EB9200 ident EB9200
include "std.arm"
include "../at91/std.eb9200" include "../at91/std.eb9200"
# The AT91 platform doesn't use /boot/loader, so we have to statically wire # The AT91 platform doesn't use /boot/loader, so we have to statically wire
# hints. # hints.

1
sys/arm/conf/EFIKA_MX
View File

@ -20,6 +20,7 @@
ident EFIKA_MX ident EFIKA_MX
include "std.armv6"
include "../freescale/imx/std.imx51" include "../freescale/imx/std.imx51"
makeoptions WITHOUT_MODULES="ahc" makeoptions WITHOUT_MODULES="ahc"

1
sys/arm/conf/EP80219
View File

@ -19,6 +19,7 @@
ident EP80219 ident EP80219
include "std.arm"
options PHYSADDR=0xa0000000 options PHYSADDR=0xa0000000
options KERNPHYSADDR=0xa0200000 options KERNPHYSADDR=0xa0200000
options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm

1
sys/arm/conf/ETHERNUT5
View File

@ -21,6 +21,7 @@
ident ETHERNUT5 ident ETHERNUT5
include "std.arm"
include "../at91/std.ethernut5" include "../at91/std.ethernut5"
# To statically compile in device wiring instead of /boot/device.hints # To statically compile in device wiring instead of /boot/device.hints

1
sys/arm/conf/EXYNOS5.common
View File

@ -20,6 +20,7 @@
makeoptions WERROR="-Werror" makeoptions WERROR="-Werror"
include "std.armv6"
options HZ=100 options HZ=100
options SCHED_ULE # ULE scheduler options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption options PREEMPTION # Enable kernel thread preemption

1
sys/arm/conf/GUMSTIX
View File

@ -19,6 +19,7 @@
# $FreeBSD$ # $FreeBSD$
ident GUMSTIX ident GUMSTIX
include "std.arm"
cpu CPU_XSCALE_PXA2X0 cpu CPU_XSCALE_PXA2X0
# This probably wants to move somewhere else. Maybe we can create a basic # This probably wants to move somewhere else. Maybe we can create a basic

1
sys/arm/conf/HL200
View File

@ -21,6 +21,7 @@
ident HL200 ident HL200
include "std.arm"
include "../at91/std.hl200" include "../at91/std.hl200"
#To statically compile in device wiring instead of /boot/device.hints #To statically compile in device wiring instead of /boot/device.hints

1
sys/arm/conf/HL201
View File

@ -21,6 +21,7 @@
ident HL201 ident HL201
include "std.arm"
include "../at91/std.hl201" include "../at91/std.hl201"
makeoptions MODULES_OVERRIDE="" makeoptions MODULES_OVERRIDE=""

1
sys/arm/conf/IMX53
View File

@ -20,6 +20,7 @@
ident IMX53 ident IMX53
include "std.armv6"
include "../freescale/imx/std.imx53" include "../freescale/imx/std.imx53"
options SOC_IMX53 options SOC_IMX53

1
sys/arm/conf/IMX6
View File

@ -19,6 +19,7 @@
# $FreeBSD$ # $FreeBSD$
ident IMX6 ident IMX6
include "std.armv6"
include "../freescale/imx/std.imx6" include "../freescale/imx/std.imx6"
options SOC_IMX6 options SOC_IMX6

1
sys/arm/conf/IQ31244
View File

@ -19,6 +19,7 @@
ident IQ31244 ident IQ31244
include "std.arm"
options PHYSADDR=0xa0000000 options PHYSADDR=0xa0000000
options KERNPHYSADDR=0xa0200000 options KERNPHYSADDR=0xa0200000
options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm

1
sys/arm/conf/KB920X
View File

@ -22,6 +22,7 @@
ident KB920X ident KB920X
include "std.arm"
include "../at91/std.kb920x" include "../at91/std.kb920x"
# The AT91 platform doesn't use /boot/loader, so we have to statically wire # The AT91 platform doesn't use /boot/loader, so we have to statically wire
# hints. # hints.

1
sys/arm/conf/LN2410SBC
View File

@ -19,6 +19,7 @@
ident LN2410SBC ident LN2410SBC
include "std.arm"
include "../samsung/s3c2xx0/std.ln2410sbc" include "../samsung/s3c2xx0/std.ln2410sbc"
#To statically compile in device wiring instead of /boot/device.hints #To statically compile in device wiring instead of /boot/device.hints
#hints "GENERIC.hints" # Default places to look for devices. #hints "GENERIC.hints" # Default places to look for devices.

1
sys/arm/conf/NSLU
View File

@ -21,6 +21,7 @@
ident NSLU ident NSLU
include "std.arm"
# XXX What is defined in std.avila does not exactly match the following: # XXX What is defined in std.avila does not exactly match the following:
#options PHYSADDR=0x10000000 #options PHYSADDR=0x10000000
#options KERNPHYSADDR=0x10200000 #options KERNPHYSADDR=0x10200000

2
sys/arm/conf/PANDABOARD
View File

@ -27,6 +27,7 @@ ident PANDABOARD
hints "PANDABOARD.hints" hints "PANDABOARD.hints"
include "std.armv6"
include "../ti/omap4/pandaboard/std.pandaboard" include "../ti/omap4/pandaboard/std.pandaboard"
options HZ=100 options HZ=100
@ -64,7 +65,6 @@ options PLATFORM
options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8) options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8)
options VFP # Enable floating point hardware support options VFP # Enable floating point hardware support
options SMP # Enable multiple cores options SMP # Enable multiple cores
options ARM_NEW_PMAP # Enable the new v6 pmap
# Debugging for use in -current # Debugging for use in -current
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols

1
sys/arm/conf/QILA9G20
View File

@ -22,6 +22,7 @@
ident QILA9G20 ident QILA9G20
include "std.arm"
include "../at91/std.qila9g20" include "../at91/std.qila9g20"
#To statically compile in device wiring instead of /boot/device.hints #To statically compile in device wiring instead of /boot/device.hints

1
sys/arm/conf/RK3188
View File

@ -20,6 +20,7 @@
ident RK3188 ident RK3188
include "std.armv6"
include "../rockchip/std.rk30xx" include "../rockchip/std.rk30xx"
options HZ=100 options HZ=100

2
sys/arm/conf/RPI-B
View File

@ -20,6 +20,7 @@
ident RPI-B ident RPI-B
include "std.armv6"
include "../broadcom/bcm2835/std.rpi" include "../broadcom/bcm2835/std.rpi"
include "../broadcom/bcm2835/std.bcm2835" include "../broadcom/bcm2835/std.bcm2835"
@ -57,7 +58,6 @@ options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options PLATFORM options PLATFORM
options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8) options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8)
options VFP # Enable floating point hardware support options VFP # Enable floating point hardware support
options ARM_NEW_PMAP # Enable the new v6 pmap
# Debugging for use in -current # Debugging for use in -current
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols

2
sys/arm/conf/RPI2
View File

@ -20,6 +20,7 @@
ident RPI2 ident RPI2
include "std.armv6"
include "../broadcom/bcm2835/std.rpi" include "../broadcom/bcm2835/std.rpi"
include "../broadcom/bcm2835/std.bcm2836" include "../broadcom/bcm2835/std.bcm2836"
@ -57,7 +58,6 @@ options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options PLATFORM options PLATFORM
options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8) options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8)
options VFP # Enable floating point hardware support options VFP # Enable floating point hardware support
options ARM_NEW_PMAP # Enable the new v6 pmap
# Debugging for use in -current # Debugging for use in -current
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols

1
sys/arm/conf/SAM9260EK
View File

@ -21,6 +21,7 @@
ident SAM9260EK ident SAM9260EK
include "std.arm"
include "../at91/std.sam9260ek" include "../at91/std.sam9260ek"
# To statically compile in device wiring instead of /boot/device.hints # To statically compile in device wiring instead of /boot/device.hints

1
sys/arm/conf/SAM9G20EK
View File

@ -19,6 +19,7 @@
ident SAM9G20EK ident SAM9G20EK
include "std.arm"
include "../at91/std.sam9g20ek" include "../at91/std.sam9g20ek"
#To statically compile in device wiring instead of /boot/device.hints #To statically compile in device wiring instead of /boot/device.hints

1
sys/arm/conf/SAM9X25EK
View File

@ -21,6 +21,7 @@
ident SAM9X25EK ident SAM9X25EK
include "std.arm"
include "../at91/std.sam9x25ek" include "../at91/std.sam9x25ek"
#To statically compile in device wiring instead of /boot/device.hints #To statically compile in device wiring instead of /boot/device.hints

1
sys/arm/conf/SHEEVAPLUG
View File

@ -6,6 +6,7 @@
#NO_UNIVERSE #NO_UNIVERSE
ident SHEEVAPLUG ident SHEEVAPLUG
include "std.arm"
include "../mv/kirkwood/std.db88f6xxx" include "../mv/kirkwood/std.db88f6xxx"
options SOC_MV_KIRKWOOD options SOC_MV_KIRKWOOD

1
sys/arm/conf/SN9G45
View File

@ -21,6 +21,7 @@
ident SN9G45 ident SN9G45
include "std.arm"
include "../at91/std.sn9g45" include "../at91/std.sn9g45"
#To statically compile in device wiring instead of /boot/device.hints #To statically compile in device wiring instead of /boot/device.hints

1
sys/arm/conf/SOCKIT.common
View File

@ -18,6 +18,7 @@
# #
# $FreeBSD$ # $FreeBSD$
include "std.armv6"
include "../altera/socfpga/std.socfpga" include "../altera/socfpga/std.socfpga"
makeoptions MODULES_OVERRIDE="" makeoptions MODULES_OVERRIDE=""

1
sys/arm/conf/TS7800
View File

@ -5,6 +5,7 @@
# #
ident TS7800 ident TS7800
include "std.arm"
include "../mv/orion/std.ts7800" include "../mv/orion/std.ts7800"
options SOC_MV_ORION options SOC_MV_ORION

1
sys/arm/conf/VERSATILEPB
View File

@ -22,6 +22,7 @@ ident VERSATILEPB
machine arm armv6 machine arm armv6
cpu CPU_ARM1176 cpu CPU_ARM1176
include "std.armv6"
files "../versatile/files.versatile" files "../versatile/files.versatile"
makeoptions MODULES_OVERRIDE="" makeoptions MODULES_OVERRIDE=""

2
sys/arm/conf/VIRT
View File

@ -20,6 +20,7 @@
ident VIRT ident VIRT
include "std.arm"
include "../qemu/std.virt" include "../qemu/std.virt"
options HZ=100 options HZ=100
@ -57,7 +58,6 @@ options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options PLATFORM options PLATFORM
options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8) options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8)
options VFP # Enable floating point hardware support options VFP # Enable floating point hardware support
options ARM_NEW_PMAP # Enable the new v6 pmap
# Debugging for use in -current # Debugging for use in -current
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols

1
sys/arm/conf/VYBRID
View File

@ -19,6 +19,7 @@
# $FreeBSD$ # $FreeBSD$
ident VYBRID ident VYBRID
include "std.armv6"
include "../freescale/vybrid/std.vybrid" include "../freescale/vybrid/std.vybrid"
makeoptions WERROR="-Werror" makeoptions WERROR="-Werror"

2
sys/arm/conf/ZEDBOARD
View File

@ -21,6 +21,7 @@
ident ZEDBOARD ident ZEDBOARD
include "std.armv6"
include "../xilinx/zedboard/std.zedboard" include "../xilinx/zedboard/std.zedboard"
options SCHED_ULE # ULE scheduler options SCHED_ULE # ULE scheduler
@ -56,7 +57,6 @@ options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8) options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8)
options VFP # Enable floating point hardware support options VFP # Enable floating point hardware support
options SMP # Enable multiple cores options SMP # Enable multiple cores
options ARM_NEW_PMAP # Enable the new v6 pmap
# Debugging for use in -current # Debugging for use in -current
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols

5
sys/arm/conf/std.arm Normal file
View File

@ -0,0 +1,5 @@
# Standard kernel config items for all ARMv4/v5 systems.
#
# $FreeBSD$

6
sys/arm/conf/std.armv6 Normal file
View File

@ -0,0 +1,6 @@
# Standard kernel config items for all ARMv6/v7 systems.
#
# $FreeBSD$
options ARM_NEW_PMAP # Use new pmap code.