Add the SOC_IMX51, SOC_IMX53, and SOC_IMX6 options. These are used to

select which SoCs the kernel config will support.

Use these options to merge files.imx51 and files.imx53.
This commit is contained in:
Andrew Turner 2015-04-23 22:20:43 +00:00
parent bb135ad6af
commit 092b8f61cd
8 changed files with 13 additions and 54 deletions

View File

@ -24,6 +24,8 @@ include "../freescale/imx/std.imx51"
makeoptions WITHOUT_MODULES="ahc" makeoptions WITHOUT_MODULES="ahc"
options SOC_IMX51
options SCHED_4BSD # 4BSD scheduler options SCHED_4BSD # 4BSD scheduler
options PREEMPTION # Enable kernel thread preemption options PREEMPTION # Enable kernel thread preemption
options INET # InterNETworking options INET # InterNETworking

View File

@ -22,6 +22,8 @@ ident IMX53
include "../freescale/imx/std.imx53" include "../freescale/imx/std.imx53"
options SOC_IMX53
options SCHED_4BSD # 4BSD scheduler options SCHED_4BSD # 4BSD scheduler
options PREEMPTION # Enable kernel thread preemption options PREEMPTION # Enable kernel thread preemption
options INET # InterNETworking options INET # InterNETworking

View File

@ -21,6 +21,8 @@
ident IMX6 ident IMX6
include "../freescale/imx/std.imx6" include "../freescale/imx/std.imx6"
options SOC_IMX6
options HZ=500 # Scheduling quantum is 2 milliseconds. options HZ=500 # Scheduling quantum is 2 milliseconds.
options SCHED_ULE # ULE scheduler options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption options PREEMPTION # Enable kernel thread preemption

View File

@ -6,7 +6,8 @@ kern/kern_clocksource.c standard
# Init # Init
arm/freescale/imx/imx_common.c standard arm/freescale/imx/imx_common.c standard
arm/freescale/imx/imx_machdep.c standard arm/freescale/imx/imx_machdep.c standard
arm/freescale/imx/imx53_machdep.c standard arm/freescale/imx/imx51_machdep.c optional soc_imx51
arm/freescale/imx/imx53_machdep.c optional soc_imx53
arm/arm/bus_space_base.c standard arm/arm/bus_space_base.c standard
# Special serial console for debuging early boot code # Special serial console for debuging early boot code

View File

@ -1,49 +0,0 @@
# $FreeBSD$
arm/arm/bus_space_asm_generic.S standard
arm/arm/bus_space_generic.c standard
kern/kern_clocksource.c standard
# Init
arm/freescale/imx/imx_common.c standard
arm/freescale/imx/imx_machdep.c standard
arm/freescale/imx/imx51_machdep.c standard
arm/arm/bus_space_base.c standard
# Special serial console for debuging early boot code
#arm/freescale/imx/console.c standard
# UART driver (includes serial console support)
dev/uart/uart_dev_imx.c optional uart
# TrustZone Interrupt Controller
arm/freescale/imx/tzic.c standard
# IOMUX - external pins multiplexor
arm/freescale/imx/imx_iomux.c standard
# GPIO
arm/freescale/imx/imx_gpio.c optional gpio
# Generic Periodic Timer
arm/freescale/imx/imx_gpt.c standard
# Clock Configuration Manager
arm/freescale/imx/imx51_ccm.c standard
# i.MX5xx PATA controller
dev/ata/chipsets/ata-fsl.c optional imxata
# USB OH3 controller (1 OTG, 3 EHCI)
arm/freescale/imx/imx_nop_usbphy.c optional ehci
dev/usb/controller/ehci_imx.c optional ehci
# Watchdog
arm/freescale/imx/imx_wdog.c optional imxwdt
# i2c
arm/freescale/imx/imx_i2c.c optional fsliic
# IPU - Image Processing Unit (frame buffer also)
arm/freescale/imx/imx51_ipuv3.c optional sc
arm/freescale/imx/imx51_ipuv3_fbd.c optional vt
dev/vt/hw/fb/vt_early_fb.c optional vt

View File

@ -13,5 +13,4 @@ options PHYSADDR=0x90000000
device fdt_pinctrl device fdt_pinctrl
files "../freescale/imx/files.imx51" files "../freescale/imx/files.imx5"

View File

@ -13,5 +13,4 @@ options PHYSADDR=0x70000000
device fdt_pinctrl device fdt_pinctrl
files "../freescale/imx/files.imx53" files "../freescale/imx/files.imx5"

View File

@ -40,6 +40,9 @@ PV_STATS opt_pmap.h
QEMU_WORKAROUNDS opt_global.h QEMU_WORKAROUNDS opt_global.h
SOC_BCM2835 opt_global.h SOC_BCM2835 opt_global.h
SOC_BCM2836 opt_global.h SOC_BCM2836 opt_global.h
SOC_IMX51 opt_global.h
SOC_IMX53 opt_global.h
SOC_IMX6 opt_global.h
SOC_MV_ARMADAXP opt_global.h SOC_MV_ARMADAXP opt_global.h
SOC_MV_DISCOVERY opt_global.h SOC_MV_DISCOVERY opt_global.h
SOC_MV_DOVE opt_global.h SOC_MV_DOVE opt_global.h