Module Name: src
Committed By: jmcneill
Date: Sat Jan 10 12:18:09 UTC 2015
Modified Files:
src/sys/arch/arm/imx: files.imx23
src/sys/arch/evbarm/conf: IMX23_OLINUXINO files.imx23_olinuxino
src/sys/arch/evbarm/imx23_olinuxino: imx23_olinuxino_machdep.c
Log Message:
Petri Laakso <[email protected]>
- New audio driver
- Add new devices rtc and digfilt
- Use BOOT_ARGS if defined in kernel configuration
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/files.imx23
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/IMX23_OLINUXINO
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/files.imx23_olinuxino
cvs rdiff -u -r1.5 -r1.6 \
src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/imx/files.imx23
diff -u src/sys/arch/arm/imx/files.imx23:1.3 src/sys/arch/arm/imx/files.imx23:1.4
--- src/sys/arch/arm/imx/files.imx23:1.3 Sat Jan 10 12:11:39 2015
+++ src/sys/arch/arm/imx/files.imx23 Sat Jan 10 12:18:09 2015
@@ -1,10 +1,12 @@
-# $Id: files.imx23,v 1.3 2015/01/10 12:11:39 jmcneill Exp $
+# $Id: files.imx23,v 1.4 2015/01/10 12:18:09 jmcneill Exp $
#
# Freescale i.MX23 applications processor configuration info.
#
defparam opt_imx.h MEMSIZE
+defflag opt_imx.h IMX23
+
file arch/arm/arm32/irq_dispatch.S icoll
file arch/arm/imx/imx23_space.c ahb|apbh|apbx
file arch/arm/imx/imx23_dma.c ahb|apbh|apbx
@@ -82,3 +84,13 @@ file arch/arm/imx/imx23_usb.c imxusbc
# EHCI
attach ehci at imxusbc with imxehci
file arch/arm/imx/imxusb.c imxehci
+
+# RTC
+device rtc
+attach rtc at apbx
+file arch/arm/imx/imx23_rtc.c rtc
+
+# Digital filter: Audio I/O
+device digfilt: audiobus
+attach digfilt at apbx with digfilt
+file arch/arm/imx/imx23_digfilt.c digfilt
Index: src/sys/arch/evbarm/conf/IMX23_OLINUXINO
diff -u src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.10 src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.11
--- src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.10 Sat Oct 11 11:55:07 2014
+++ src/sys/arch/evbarm/conf/IMX23_OLINUXINO Sat Jan 10 12:18:09 2015
@@ -1,4 +1,4 @@
-# $Id: IMX23_OLINUXINO,v 1.10 2014/10/11 11:55:07 uebayasi Exp $
+# $Id: IMX23_OLINUXINO,v 1.11 2015/01/10 12:18:09 jmcneill Exp $
#
# IMX23_OLINUXINO -- Olimex i.MX23 OLinuXino kernel configuration file.
#
@@ -66,6 +66,13 @@ usbphy0 at apbx? addr 0x8007C000 size 0
# Clock control
clkctrl0 at apbx? addr 0x80040000 size 0x2000 irq -1
+# RTC
+rtc0 at apbx? addr 0x8005C000 size 0x2000 irq -1
+
+# Digital filter: Audio I/O
+digfilt0 at apbx? addr 0x80048000 size 0x8000 irq -1
+audio0 at digfilt0
+
# USB host
ehci0 at imxusbc0 unit 0 irq 11
# USB OTG
Index: src/sys/arch/evbarm/conf/files.imx23_olinuxino
diff -u src/sys/arch/evbarm/conf/files.imx23_olinuxino:1.2 src/sys/arch/evbarm/conf/files.imx23_olinuxino:1.3
--- src/sys/arch/evbarm/conf/files.imx23_olinuxino:1.2 Mon Oct 7 17:36:40 2013
+++ src/sys/arch/evbarm/conf/files.imx23_olinuxino Sat Jan 10 12:18:09 2015
@@ -1,4 +1,4 @@
-# $Id: files.imx23_olinuxino,v 1.2 2013/10/07 17:36:40 matt Exp $
+# $Id: files.imx23_olinuxino,v 1.3 2015/01/10 12:18:09 jmcneill Exp $
#
# Olimex i.MX23 OLinuXino board configuration info.
#
@@ -6,6 +6,9 @@
# Pull in SoC support
include "arch/arm/imx/files.imx23"
+# Kernel boot arguments
+defparam opt_machdep.h BOOT_ARGS
+
file arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
file arch/arm/arm32/arm32_kvminit.c
file arch/arm/arm32/arm32_boot.c
Index: src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
diff -u src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.5 src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.6
--- src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.5 Sat Jan 10 12:11:39 2015
+++ src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c Sat Jan 10 12:18:09 2015
@@ -1,4 +1,4 @@
-/* $Id: imx23_olinuxino_machdep.c,v 1.5 2015/01/10 12:11:39 jmcneill Exp $ */
+/* $Id: imx23_olinuxino_machdep.c,v 1.6 2015/01/10 12:18:09 jmcneill Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -67,6 +67,7 @@
#endif
#include "opt_evbarm_boardtype.h"
+#include "opt_machdep.h"
#define KERNEL_VM_BASE (KERNEL_BASE + 0x8000000)
#define KERNEL_VM_SIZE 0x20000000
@@ -163,6 +164,9 @@ initarm(void *arg)
/* Copy boot arguments passed from bootimx23. */
boot_args = (char *)KERN_PHYSTOV(BOOTIMX23_ARGS);
memcpy(kernel_boot_args, boot_args, MAX_BOOT_STRING);
+#ifdef BOOT_ARGS
+ strcpy(kernel_boot_args, BOOT_ARGS);
+#endif
boot_args = kernel_boot_args;
#ifdef VERBOSE_INIT_ARM
printf("boot_args @ %lx: '%s'\n", KERN_PHYSTOV(BOOTIMX23_ARGS),
