diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-06-18 05:59:27 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-06-18 05:59:27 +0000 |
| commit | ec3a50600dffe1c1ea70d3fd02c150b08f8b10d6 (patch) | |
| tree | aee17dc40dc94a04a344df7fea47eb56c6c41a6f /sys/arch/armv7/conf | |
| parent | a0fec8fc19a5b246013610bcb53e4a093a3f9372 (diff) | |
Dynamically attach ommmc with fdt. Offset the start of the memory region
by 0x100 for nodes compatible with "ti,omap4-hsmmc" to get the same
offsets as omap3. Handle both the nintr 1 (omap3/am335x) and nintr 3
(omap4) cases in attach. Ideally the "interrupts" property will be
handled by the interrupt controller drivers directly in future.
Diffstat (limited to 'sys/arch/armv7/conf')
| -rw-r--r-- | sys/arch/armv7/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/conf/RAMDISK | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC index 01612fe4529..6c535e12ea7 100644 --- a/sys/arch/armv7/conf/GENERIC +++ b/sys/arch/armv7/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.21 2016/06/13 23:43:58 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.22 2016/06/18 05:59:26 jsg Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -74,7 +74,7 @@ dmtimer* at omap? # am335x dual mode timers omusbtll* at omap? cpsw* at omap? com* at omap? # onboard uarts -ommmc* at omap? # SD/MMC card controller +ommmc* at fdt? # SD/MMC card controller sdmmc* at ommmc? # SD/MMC bus ehci* at omap? # EHCI (shim) diff --git a/sys/arch/armv7/conf/RAMDISK b/sys/arch/armv7/conf/RAMDISK index c8c3b1ebf76..aaab98e8f61 100644 --- a/sys/arch/armv7/conf/RAMDISK +++ b/sys/arch/armv7/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.18 2016/06/14 06:32:47 kettenis Exp $ +# $OpenBSD: RAMDISK,v 1.19 2016/06/18 05:59:26 jsg Exp $ machine armv7 arm @@ -73,7 +73,7 @@ dmtimer* at omap? # am335x dual mode timers omusbtll* at omap? cpsw* at omap? com* at omap? # onboard uarts -ommmc* at omap? # SD/MMC card controller +ommmc* at fdt? # SD/MMC card controller sdmmc* at ommmc? # SD/MMC bus ehci* at omap? # EHCI (shim) |