From 4951443488d1d62ae1ecd217d2bb18f0cf8d2659 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 21 Aug 2009 00:51:50 +0200 Subject: [PATCH 09/10] Palm config fixes --- sys/arch/palm/conf/GENERIC | 21 ++++++++++++--------- sys/arch/palm/conf/RAMDISK | 9 +++++---- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/sys/arch/palm/conf/GENERIC b/sys/arch/palm/conf/GENERIC index 1ac797f..6074820 100644 --- a/sys/arch/palm/conf/GENERIC +++ b/sys/arch/palm/conf/GENERIC @@ -35,7 +35,8 @@ option WSDISPLAY_COMPAT_PCVT # emulate some ioctls; needed for X11 option USBVERBOSE -config bsd swap generic +config bsd root on sd1a swap on sd1b +#config bsd swap generic #config bsd root on wd0a # The main bus device @@ -54,7 +55,7 @@ ohci0 at pxaip? # Open Host Controller # USB function support usbf* at pxaudc? # USB logical device -cdcef* at usbf? # CDC ethernet function +#cdcef* at usbf? # CDC ethernet function # USB bus support usb* at ohci? @@ -141,20 +142,22 @@ com1 at pxaip? addr 0x40200000 intr 21 # BlueTooth UART com2 at pxaip? addr 0x40700000 intr 20 # Standard UART (for IrDA) # integrated PCMCIA/CF controller -pxapcic0 at pxaip? +#pxapcic0 at pxaip? # PCMCIA bus support -pcmcia* at pxapcic? +#pcmcia* at pxapcic? # PCMCIA (CF) devices -com* at pcmcia? # PCMCIA modems/serial ports -wi* at pcmcia? # WaveLAN IEEE 802.11DS -malo* at pcmcia? # Marvell 88W8385 -ne* at pcmcia? # PCMCIA based NE2000 ethernet -wdc* at pcmcia? # hard disk controller +#com* at pcmcia? # PCMCIA modems/serial ports +#wi* at pcmcia? # WaveLAN IEEE 802.11DS +#malo* at pcmcia? # Marvell 88W8385 +#ne* at pcmcia? # PCMCIA based NE2000 ethernet +#wdc* at pcmcia? # hard disk controller #cfxga* at pcmcia? # VoyagerVGA frame buffer #wsdisplay* at cfxga? +wdc0 at pxaip? + # IDE hard drives wd* at wdc? flags 0x0000 diff --git a/sys/arch/palm/conf/RAMDISK b/sys/arch/palm/conf/RAMDISK index cb8692a..d0fb2b7 100644 --- a/sys/arch/palm/conf/RAMDISK +++ b/sys/arch/palm/conf/RAMDISK @@ -32,10 +32,10 @@ options CPU_XSCALE_PXA2X0 # Support the XScale core options XSCALE_CACHE_WRITE_BACK makeoptions CPUFLAGS="-mcpu=xscale" -#option WSDISPLAY_COMPAT_USL # VT handling -#option WSDISPLAY_COMPAT_RAWKBD # provide raw scancodes; needed for X11 -#option WSDISPLAY_DEFAULTSCREENS=2 # initial number of text consoles -#option WSDISPLAY_COMPAT_PCVT # emulate some ioctls; needed for X11 +option WSDISPLAY_COMPAT_USL # VT handling +option WSDISPLAY_COMPAT_RAWKBD # provide raw scancodes; needed for X11 +option WSDISPLAY_DEFAULTSCREENS=2 # initial number of text consoles +option WSDISPLAY_COMPAT_PCVT # emulate some ioctls; needed for X11 config bsd root on rd0a swap on rd0b @@ -151,6 +151,7 @@ wd* at wdc? flags 0x0000 # Input pxa27x_kpc0 at pxaip? wskbd0 at pxa27x_kpc0 mux 1 + # LCD lcd0 at pxaip? wsdisplay* at lcd? console ? -- 1.6.3.4