Palm: cleanup kernel configuration files

3 files changed, 20 insertions, 28 deletions

diff --git a/sys/arch/palm/conf/GENERIC b/sys/arch/palm/conf/GENERIC
index 390f5ff01f8..ef06a2829b6 100644
--- a/sys/arch/palm/conf/GENERIC
+++ b/sys/arch/palm/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.1 2009/09/05 01:22:11 marex Exp $
+#	$OpenBSD: GENERIC,v 1.2 2009/09/06 00:51:28 marex Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -36,8 +36,6 @@ option	WSDISPLAY_COMPAT_PCVT		# emulate some ioctls; needed for X11
 option USBVERBOSE
 
 config		bsd	root on sd1a swap on sd1b 
-#config		bsd	swap generic
-#config		bsd	root on wd0a
 
 # The main bus device
 mainbus0	at root
@@ -156,7 +154,7 @@ com2	at pxaip? addr 0x40700000 intr 20	# Standard UART (for IrDA)
 #cfxga*		at pcmcia?		# VoyagerVGA frame buffer
 #wsdisplay*	at cfxga?
 
-wdc0		at pxaip?
+wdc0		at pxaip? addr 0x20000000
 
 # IDE hard drives
 wd*		at wdc? flags 0x0000
@@ -188,13 +186,13 @@ urlphy*	at mii?				# Realtek RTL8150L internal PHY
 ukphy*	at mii?				# "unknown" PHYs
 
 # Input
-pxa27x_kpc0	at pxaip?
+pxa27x_kpc0	at pxaip? addr 0x41500000
 wskbd0		at pxa27x_kpc0 mux 1
 
-lcd0		at pxaip?		# LCD
+lcd0		at pxaip? addr 0x44000000	# LCD
 wsdisplay*	at lcd? console ?
 
-pxammc0		at pxaip?		# MMC/SD/SDIO controller
+pxammc0		at pxaip? addr 0x41100000	# MMC/SD/SDIO controller
 sdmmc*		at pxammc?		# SD/MMC bus
 scsibus*	at sdmmc?		# SCSI emulation
 
diff --git a/sys/arch/palm/conf/RAMDISK b/sys/arch/palm/conf/RAMDISK
index 32e37a5a001..e0868bae0f7 100644
--- a/sys/arch/palm/conf/RAMDISK
+++ b/sys/arch/palm/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.1 2009/09/05 01:22:11 marex Exp $
+#	$OpenBSD: RAMDISK,v 1.2 2009/09/06 00:51:28 marex Exp $
 
 machine	palm	arm
 
@@ -44,8 +44,8 @@ mainbus0	at root
 cpu0		at mainbus?
 pxaip0		at mainbus?
 
-pxaintc0	at pxaip?	# interrupt controller
-pxagpio0	at pxaip?	# GPIO
+pxaintc0	at pxaip?		# interrupt controller
+pxagpio0	at pxaip?		# GPIO controller
 pxaost0		at pxaip? addr 0x40a00000 size 0x20
 
 # USB controllers
@@ -68,8 +68,8 @@ ukbd*		at uhidev?		# USB HID Keyboard devices
 wskbd*		at ukbd? mux 1
 #ums*		at uhub?		# USB Mice
 #wsmouse*	at ums? mux 0
-#ulpt*		at uhub?		# USB Printer
-#atu*		at uhub?		# Atmel AT76C50x based 802.11b
+ulpt*		at uhub?		# USB Printer
+atu*		at uhub?		# Atmel AT76C50x based 802.11b
 #aue*		at uhub?		# ADMtek AN986 Pegasus Ethernet
 #axe*		at uhub?		# ASIX Electronics AX88172 USB Ethernet
 cdce*		at uhub?		# CDC Ethernet
@@ -80,16 +80,16 @@ ural*		at uhub?		# Ralink RT2500
 #url*		at uhub?		# Realtek RTL8150L based adapters
 wi*		at uhub?		# WaveLAN IEEE 802.11DS
 upl*		at uhub?		# Prolific PL2301/PL2302 host-to-host
-#uscanner*	at uhub?		# USB Scanner driver
-#usscanner*	at uhub?		# USB SCSI scanners
-#scsibus*	at usscanner?
-#uyap*		at uhub?		# Y@P firmware loader
-#ugen*		at uhub?		# USB Generic driver
+uscanner*	at uhub?		# USB Scanner driver
+usscanner*	at uhub?		# USB SCSI scanners
+scsibus*	at usscanner?
+uyap*		at uhub?		# Y@P firmware loader
+ugen*		at uhub?		# USB Generic driver
 umass*		at uhub?		# USB Mass Storage devices
 scsibus*	at umass?
 
 # SD/MMC support
-pxammc0		at pxaip?		# MMC/SD/SDIO controller
+pxammc0		at pxaip? addr 0x41100000	# MMC/SD/SDIO controller
 sdmmc*		at pxammc?		# SD/MMC bus
 scsibus*	at sdmmc?		# SCSI emulation
 softraid0	at root			# Software RAID
@@ -117,7 +117,7 @@ com2	at pxaip? addr 0x40700000 intr 20	# Standard UART (for IrDA)
 #ne*		at pcmcia?
 #wdc*		at pcmcia?
 
-wdc0		at pxaip?
+wdc0		at pxaip? addr 0x20000000
 
 # IDE hard drives
 wd*		at wdc? flags 0x0000
@@ -149,11 +149,11 @@ wd*		at wdc? flags 0x0000
 #ukphy*	at mii?			# "unknown" PHYs
 
 # Input
-pxa27x_kpc0	at pxaip?
+pxa27x_kpc0	at pxaip? addr 0x41500000
 wskbd0		at pxa27x_kpc0 mux 1
 
 # LCD
-lcd0		at pxaip?
+lcd0		at pxaip? addr 0x44000000
 wsdisplay*	at lcd? console ?
 
 # Pseudo-Devices
diff --git a/sys/arch/palm/conf/files.palm b/sys/arch/palm/conf/files.palm
index a8346e15bb1..bb756a8db84 100644
--- a/sys/arch/palm/conf/files.palm
+++ b/sys/arch/palm/conf/files.palm
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.palm,v 1.1 2009/09/05 01:22:11 marex Exp $
+#	$OpenBSD: files.palm,v 1.2 2009/09/06 00:51:28 marex Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -37,12 +37,6 @@ file arch/palm/dev/palm_mmc.c		pxammc_palm
 #
 include "dev/ata/files.ata"
 
-# Drive
-#define palmvlio { [port = -1], [size = 0], [iomem = -1], [iosiz = 0], [irq = -1] }
-#device palmvlio: palmvlio
-#attach palmvlio at pxaip
-#file arch/palm/dev/palmvlio.c		palmvlio
-
 #attach wdc at palmvlio with palmhdd
 attach wdc at pxaip with palm_hdd
 file arch/palm/dev/palm_hdd.c		palm_hdd