=================================================================== RCS file: /cvs/sys/arch/jornada/conf/RAMDISK,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sys/arch/jornada/conf/RAMDISK 2008/03/04 16:09:00 1.1 +++ sys/arch/jornada/conf/RAMDISK 2008/05/11 10:26:11 1.2 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.1 2008/03/04 16:09:00 nbrk Exp $ +# $OpenBSD: RAMDISK,v 1.2 2008/05/11 09:26:11 nbrk Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -11,7 +11,7 @@ machine jornada arm include "../../../conf/GENERIC" -maxusers 4 # estimated number of users +maxusers 32 # estimated number of users options ARM32 @@ -20,8 +20,8 @@ makeoptions BOARDTYPE="jornada720" # XXX Jornada 728 differs only by doubling RAM makeoptions DEBUG="-g" -rmoption DDB -rmoption USER_CONF +#rmoption DDB +#rmoption USER_CONF options CPU_SA1110 # Support the StrongARM 1110 core options VERBOSE_PMAP_DEVMAP @@ -29,8 +29,8 @@ #options BOOTCONSOLE_COM # use UART3 as boot console (instead of framebuffer) -#config bsd root on nfs swap on nfs -config bsd root on rd0a swap on rd0b +#config bsd swap generic +config bsd root on rd0a swap on nfs # The main bus device mainbus0 at root @@ -40,7 +40,10 @@ saip0 at mainbus? # Chip companion (SA1111) -#sacc0 at saip? addr 0x40000000 +# sacc's INT line is connected to GPIO 0 on sa11x0 +#sacc0 at saip? addr 0x40000000 intr 0 +#sacic0 at sacc? +#sacgpio0 at sacc? # Jornada framebuffer jfb0 at saip? addr 0x48200000 @@ -53,22 +56,27 @@ 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 +# Jornada ts +#jts0 at jmcu? +#wsmouse* at jts? # RAMDISK stuff option MINIROOTSIZE=5120 option RAMDISK_HOOKS +#pseudo-device crypto 1 pseudo-device rd 1 +