===================================================================
RCS file: /cvs/sys/arch/jornada/conf/GENERIC,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sys/arch/jornada/conf/GENERIC	2008/03/05 13:36:22	1.3
+++ sys/arch/jornada/conf/GENERIC	2008/05/11 10:26:11	1.4
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.3 2008/03/05 13:36:22 nbrk Exp $ 
+# $OpenBSD: GENERIC,v 1.4 2008/05/11 09:26:11 nbrk Exp $ 
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -18,10 +18,9 @@
 makeoptions	KERNEL_BASE_PHYS="0xc0200000"
 makeoptions	KERNEL_BASE_VIRT="0xc0200000"
 makeoptions	BOARDTYPE="jornada720"	# XXX Jornada 728 differs only by doubling RAM
-makeoptions DEBUG="-g"
+#makeoptions DEBUG="-g"
 
 #rmoption	DDB
-#rmoption	USER_CONF
 
 options		CPU_SA1110		# Support the StrongARM 1110 core
 options		VERBOSE_PMAP_DEVMAP
@@ -30,7 +29,8 @@
 #options	BOOTCONSOLE_COM	# use UART3 as boot console (instead of framebuffer)
 
 #config	bsd	swap generic
-config bsd root on nfs swap on nfs
+#config bsd root on nfs swap on nfs
+config bsd root on wd0a swap on wd0b
 
 # The main bus device
 mainbus0	at root
@@ -41,10 +41,21 @@
 
 # Chip companion (SA1111)
 # sacc's INT line is connected to GPIO 0 on sa11x0
-sacc0		at saip? addr 0x40000000 intr 0
+sacc0		at saip? addr 0x40000000 intr 0 size 0x2000
 sacic0		at sacc?
 sacgpio0	at sacc?
+sacpcic0	at sacc?
 
+options		PCMCIADEBUG
+options		PCMCIAVERBOSE
+
+pcmcia*		at sacpcic?
+
+com*		at pcmcia?
+wdc*		at pcmcia?
+
+wd*			at wdc? flags 0x0000
+
 # Jornada framebuffer
 jfb0		at saip? addr 0x48200000
 wsdisplay*	at jfb?
@@ -56,15 +67,15 @@
 saost0		at saip? addr 0x90000000 size 0x20
 
 # Serial Port 3 (UART)
-sacom0		at saip? addr 0x80050000 size 0x24 intr 17
+#sacom0		at saip? addr 0x80050000 size 0x24
 
 # MCP/SSP (Serial Port 4)
 sassp0		at saip? addr 0x80070000
 spibus*		at sassp?
 
 # Onboard MCU (keyboard, touchscreen)
-#jmcu0		at spibus?
-#wskbd*		at jmcu?
+jmcu0		at spibus?
+wskbd*		at jmcu?
 
 # GPIO controller
 sagpio0		at saip? addr 0x90040000