diff options
author | Dale Rahn <drahn@cvs.openbsd.org> | 2005-01-13 16:24:17 +0000 |
---|---|---|
committer | Dale Rahn <drahn@cvs.openbsd.org> | 2005-01-13 16:24:17 +0000 |
commit | 4c4e0325428e4811979aa69f98b441d31ee922df (patch) | |
tree | f9ba0da6fb406d94b3218616b1869b549a2692c1 | |
parent | e85a44915755c00ff54abc8ea03cf1becb1792e1 (diff) |
Drop obio, attach lcd directly to pxaip. Fixes interrupt problems.
-rw-r--r-- | sys/arch/zaurus/conf/GENERIC | 7 | ||||
-rw-r--r-- | sys/arch/zaurus/conf/files.zaurus | 32 |
2 files changed, 16 insertions, 23 deletions
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC index c7f43942445..5e71a72247f 100644 --- a/sys/arch/zaurus/conf/GENERIC +++ b/sys/arch/zaurus/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.8 2005/01/13 16:11:02 drahn Exp $ +# $OpenBSD: GENERIC,v 1.9 2005/01/13 16:24:16 drahn Exp $ # # GENERIC machine description file # @@ -177,12 +177,13 @@ urlphy* at mii? # Realtek RTL8150L internal PHY ukphy* at mii? # "unknown" PHYs # On-board device support -obio0 at pxaip? intr 8 +#obio0 at pxaip? intr 8 #sm0 at obio? addr 0x0c000000 intr 3 # on-board SMC 91C96 #options LUBBOCK_SMC91C96_16BIT # LCD -lcd0 at obio? +#lcd0 at obio? +lcd0 at pxaip? wsdisplay* at lcd? console ? options WSEMUL_VT100 # VT100 / VT220 emulation diff --git a/sys/arch/zaurus/conf/files.zaurus b/sys/arch/zaurus/conf/files.zaurus index 52582ce93c6..21a68bd6e07 100644 --- a/sys/arch/zaurus/conf/files.zaurus +++ b/sys/arch/zaurus/conf/files.zaurus @@ -6,8 +6,6 @@ maxpartitions 16 maxusers 2 8 64 -include "../../../scsi/files.scsi" -include "../../../dev/atapiscsi/files.atapiscsi" major {wd = 16} major {sd = 24} major {cd = 26} @@ -17,35 +15,29 @@ file arch/arm/arm/conf.c file arch/zaurus/zaurus/zaurus_machdep.c +# +# Machine-independent SCSI drivers +# +include "../../../scsi/files.scsi" +include "../../../dev/atapiscsi/files.atapiscsi" + # CPU support and integrated peripherals include "arch/arm/xscale/files.pxa2x0" -# LUBBOCK on-board devices (including CPLD) -device obio {[addr = -1], [size = -1], [width = -1], [intr = -1]}: bus_space_generic -attach obio at pxaip -file arch/zaurus/zaurus/obio.c obio - -#device sacpcic: pcmciabus -#attach sacpcic at sacc -#file arch/arm/sa11x0/sa11x1_pcic.c sacpcic needs-flag -#file arch/arm/sa11x0/sa11xx_pcic.c sacpcic -#file arch/zaurus/zaurus/zaurus_pcic.c sacpcic - - # LCD frame buffer -attach lcd at obio with lcd_obio +attach lcd at pxaip with lcd_obio file arch/zaurus/zaurus/zaurus_lcd.c lcd_obio +# GPIO keyboard +device zkbd +attach zkbd at pxaip +file arch/zaurus/dev/zaurus_kbd.c zkbd + # # Machine-independent ATA drivers # include "dev/ata/files.ata" -# -# Machine-independent SCSI drivers -# - - # Generic MD files file arch/zaurus/zaurus/autoconf.c |