diff options
| -rw-r--r-- | sys/arm/conf/EFIKA_MX | 2 | ||||
| -rw-r--r-- | sys/arm/conf/IMX53 | 2 | ||||
| -rw-r--r-- | sys/arm/conf/IMX6 | 2 | ||||
| -rw-r--r-- | sys/arm/freescale/imx/files.imx5 (renamed from sys/arm/freescale/imx/files.imx53) | 3 | ||||
| -rw-r--r-- | sys/arm/freescale/imx/files.imx51 | 49 | ||||
| -rw-r--r-- | sys/arm/freescale/imx/std.imx51 | 3 | ||||
| -rw-r--r-- | sys/arm/freescale/imx/std.imx53 | 3 | ||||
| -rw-r--r-- | sys/conf/options.arm | 3 |
8 files changed, 13 insertions, 54 deletions
diff --git a/sys/arm/conf/EFIKA_MX b/sys/arm/conf/EFIKA_MX index 6ea9d8a1286b..a4690f6964fc 100644 --- a/sys/arm/conf/EFIKA_MX +++ b/sys/arm/conf/EFIKA_MX @@ -24,6 +24,8 @@ include "../freescale/imx/std.imx51" makeoptions WITHOUT_MODULES="ahc" +options SOC_IMX51 + options SCHED_4BSD # 4BSD scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking diff --git a/sys/arm/conf/IMX53 b/sys/arm/conf/IMX53 index d627c25b9043..9f78f303d76a 100644 --- a/sys/arm/conf/IMX53 +++ b/sys/arm/conf/IMX53 @@ -22,6 +22,8 @@ ident IMX53 include "../freescale/imx/std.imx53" +options SOC_IMX53 + options SCHED_4BSD # 4BSD scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6 index ada4eeaab463..f1baf296667b 100644 --- a/sys/arm/conf/IMX6 +++ b/sys/arm/conf/IMX6 @@ -21,6 +21,8 @@ ident IMX6 include "../freescale/imx/std.imx6" +options SOC_IMX6 + options HZ=500 # Scheduling quantum is 2 milliseconds. options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption diff --git a/sys/arm/freescale/imx/files.imx53 b/sys/arm/freescale/imx/files.imx5 index 39dcf01c6e79..58e925b25934 100644 --- a/sys/arm/freescale/imx/files.imx53 +++ b/sys/arm/freescale/imx/files.imx5 @@ -6,7 +6,8 @@ kern/kern_clocksource.c standard # Init arm/freescale/imx/imx_common.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 # Special serial console for debuging early boot code diff --git a/sys/arm/freescale/imx/files.imx51 b/sys/arm/freescale/imx/files.imx51 deleted file mode 100644 index b09d303c1d74..000000000000 --- a/sys/arm/freescale/imx/files.imx51 +++ /dev/null @@ -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 diff --git a/sys/arm/freescale/imx/std.imx51 b/sys/arm/freescale/imx/std.imx51 index fbc134968ee5..eca33c263962 100644 --- a/sys/arm/freescale/imx/std.imx51 +++ b/sys/arm/freescale/imx/std.imx51 @@ -13,5 +13,4 @@ options PHYSADDR=0x90000000 device fdt_pinctrl -files "../freescale/imx/files.imx51" - +files "../freescale/imx/files.imx5" diff --git a/sys/arm/freescale/imx/std.imx53 b/sys/arm/freescale/imx/std.imx53 index cbef21aedb96..1da484ceebde 100644 --- a/sys/arm/freescale/imx/std.imx53 +++ b/sys/arm/freescale/imx/std.imx53 @@ -13,5 +13,4 @@ options PHYSADDR=0x70000000 device fdt_pinctrl -files "../freescale/imx/files.imx53" - +files "../freescale/imx/files.imx5" diff --git a/sys/conf/options.arm b/sys/conf/options.arm index 239be2a73e69..b712b02fec5a 100644 --- a/sys/conf/options.arm +++ b/sys/conf/options.arm @@ -40,6 +40,9 @@ PV_STATS opt_pmap.h QEMU_WORKAROUNDS opt_global.h SOC_BCM2835 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_DISCOVERY opt_global.h SOC_MV_DOVE opt_global.h |