Date: Thu, 23 Apr 2015 22:20:43 +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: r281909 - in head/sys: arm/conf arm/freescale/imx conf Message-ID: <201504232220.t3NMKhDX036421@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Thu Apr 23 22:20:43 2015 New Revision: 281909 URL: https://svnweb.freebsd.org/changeset/base/281909 Log: 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. Added: head/sys/arm/freescale/imx/files.imx5 - copied, changed from r281907, head/sys/arm/freescale/imx/files.imx53 Deleted: head/sys/arm/freescale/imx/files.imx51 head/sys/arm/freescale/imx/files.imx53 Modified: head/sys/arm/conf/EFIKA_MX head/sys/arm/conf/IMX53 head/sys/arm/conf/IMX6 head/sys/arm/freescale/imx/std.imx51 head/sys/arm/freescale/imx/std.imx53 head/sys/conf/options.arm Modified: head/sys/arm/conf/EFIKA_MX ============================================================================== --- head/sys/arm/conf/EFIKA_MX Thu Apr 23 22:06:02 2015 (r281908) +++ head/sys/arm/conf/EFIKA_MX Thu Apr 23 22:20:43 2015 (r281909) @@ -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 Modified: head/sys/arm/conf/IMX53 ============================================================================== --- head/sys/arm/conf/IMX53 Thu Apr 23 22:06:02 2015 (r281908) +++ head/sys/arm/conf/IMX53 Thu Apr 23 22:20:43 2015 (r281909) @@ -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 Modified: head/sys/arm/conf/IMX6 ============================================================================== --- head/sys/arm/conf/IMX6 Thu Apr 23 22:06:02 2015 (r281908) +++ head/sys/arm/conf/IMX6 Thu Apr 23 22:20:43 2015 (r281909) @@ -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 Copied and modified: head/sys/arm/freescale/imx/files.imx5 (from r281907, head/sys/arm/freescale/imx/files.imx53) ============================================================================== --- head/sys/arm/freescale/imx/files.imx53 Thu Apr 23 21:39:32 2015 (r281907, copy source) +++ head/sys/arm/freescale/imx/files.imx5 Thu Apr 23 22:20:43 2015 (r281909) @@ -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 Modified: head/sys/arm/freescale/imx/std.imx51 ============================================================================== --- head/sys/arm/freescale/imx/std.imx51 Thu Apr 23 22:06:02 2015 (r281908) +++ head/sys/arm/freescale/imx/std.imx51 Thu Apr 23 22:20:43 2015 (r281909) @@ -13,5 +13,4 @@ options PHYSADDR=0x90000000 device fdt_pinctrl -files "../freescale/imx/files.imx51" - +files "../freescale/imx/files.imx5" Modified: head/sys/arm/freescale/imx/std.imx53 ============================================================================== --- head/sys/arm/freescale/imx/std.imx53 Thu Apr 23 22:06:02 2015 (r281908) +++ head/sys/arm/freescale/imx/std.imx53 Thu Apr 23 22:20:43 2015 (r281909) @@ -13,5 +13,4 @@ options PHYSADDR=0x70000000 device fdt_pinctrl -files "../freescale/imx/files.imx53" - +files "../freescale/imx/files.imx5" Modified: head/sys/conf/options.arm ============================================================================== --- head/sys/conf/options.arm Thu Apr 23 22:06:02 2015 (r281908) +++ head/sys/conf/options.arm Thu Apr 23 22:20:43 2015 (r281909) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504232220.t3NMKhDX036421>