diff options
| -rw-r--r-- | conf/machine/ipaq-pxa270.conf | 14 | ||||
| -rw-r--r-- | packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig | 39 |
2 files changed, 21 insertions, 32 deletions
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index b9925852e5..626b5cf218 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -17,9 +17,9 @@ ROOT_FLASH_SIZE = "80" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" -PXA270_MODULES = "g_ether g_file_storage g_serial pxa27x_udc \ +PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \ snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \ - nls_cp437 nls_utf8" + nls_cp437 nls_iso8859-1 nls_utf8" SERIAL_CONSOLE = "115200 ttyS0" @@ -27,15 +27,15 @@ include conf/machine/ipaq-common.conf include conf/machine/handheld-common.conf GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS += "gaim sylpheed" -GPE_EXTRA_INSTALL += "gaim sylpheed" +GPE_EXTRA_DEPENDS += "gaim" +GPE_EXTRA_INSTALL += "gaim" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/tune-xscale.conf BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ - hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700 hx4700_power" + hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power" module_autoload_hx4700_power = "hx4700_power" module_autoload_pcmcia = "pcmcia" @@ -45,9 +45,9 @@ module_autoload_mmc_block = "mmc_block" module_autoload_hx4700_ts = "hx4700_ts" module_autoload_hx4700_navpt = "hx4700_navpt" module_autoload_hx4700_bt = "hx4700_bt" -module_autoload_snd-pxa-i2sound-hx4700 = "snd-pxa-i2sound-hx4700" +module_autoload_snd-hx4700_audio = "snd-hx4700_audio" module_autoload_snd-pcm-oss = "snd-pcm-oss" -module_autoload_snd-pcm-oss = "snd-mixer-oss" +module_autoload_snd-mixer-oss = "snd-mixer-oss" module_autoload_pxa27x_udc = "pxa27x_udc" #FIXME: this should be controlled by a userspace utility later. diff --git a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig b/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig index f90fb80edf..9bd18034ed 100644 --- a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig +++ b/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.12-hh2 -# Mon Aug 15 19:13:48 2005 +# Linux kernel version: 2.6.12-hh1 +# Wed Jul 13 18:54:32 2005 # CONFIG_ARM=y CONFIG_MMU=y @@ -102,7 +102,6 @@ CONFIG_PXA27x=y CONFIG_PXA_KEYS=y # CONFIG_ARCH_ESERIES is not set # CONFIG_MACH_A620 is not set -# CONFIG_MACH_A716 is not set # CONFIG_ARCH_H1900 is not set # CONFIG_ARCH_H2200 is not set # CONFIG_ARCH_H3900 is not set @@ -125,9 +124,6 @@ CONFIG_HX4700_LEDS=m # CONFIG_ARCH_ROVERP1 is not set # CONFIG_ARCH_ROVERP5P is not set # CONFIG_PXA_SHARPSL is not set -# CONFIG_SA1100_H3100 is not set -# CONFIG_SA1100_H3600 is not set -# CONFIG_SA1100_H3800 is not set # # Linux As Bootloader @@ -153,32 +149,24 @@ CONFIG_ARM_THUMB=y CONFIG_XSCALE_PMU=y # -# Compaq/iPAQ Platforms -# -CONFIG_PXA_IPAQ=y - -# -# XScale-based iPAQ +# Bus support # -CONFIG_IPAQ_HANDHELD=y +CONFIG_ISA_DMA_API=y # -# Compaq/iPAQ Drivers +# Compaq/iPAQ Options # +CONFIG_PXA_IPAQ=y # -# Compaq/HP iPAQ Drivers +# XScale-based iPAQ # +CONFIG_IPAQ_HANDHELD=y # CONFIG_IPAQ_SLEEVE is not set # CONFIG_IPAQ_SAMCOP is not set # CONFIG_IPAQ_HAMCOP is not set # -# Bus support -# -CONFIG_ISA_DMA_API=y - -# # PCCARD (PCMCIA/CardBus) support # CONFIG_PCCARD=m @@ -377,6 +365,7 @@ CONFIG_BLK_DEV_IDECS=m # CONFIG_BLK_DEV_IDECD is not set # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_BLK_DEV_IDESCSI is not set # CONFIG_IDE_TASK_IOCTL is not set # @@ -699,6 +688,7 @@ CONFIG_NET_RADIO=y # # CONFIG_AIRO_CS is not set # CONFIG_PCMCIA_WL3501 is not set +# CONFIG_PCMCIA_ACX100 is not set CONFIG_NET_WIRELESS=y # CONFIG_HOSTAP is not set @@ -745,6 +735,7 @@ CONFIG_INPUT=y # Userland interfaces # # CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=m @@ -1047,8 +1038,6 @@ CONFIG_SND_GENERIC_PM=y # # ALSA ARM devices # -# CONFIG_SND_A716 is not set -# CONFIG_SND_H1910 is not set # CONFIG_SND_H2200 is not set CONFIG_SND_HX4700=m # CONFIG_SND_PXA2XX_UDA1380 is not set @@ -1099,7 +1088,7 @@ CONFIG_USB_PXA27X=m # CONFIG_USB_ZERO is not set CONFIG_USB_ETH=m # CONFIG_USB_ETH_RNDIS is not set -# CONFIG_USB_GADGETFS is not set +CONFIG_USB_GADGETFS=m CONFIG_USB_FILE_STORAGE=m # CONFIG_USB_FILE_STORAGE_TEST is not set CONFIG_USB_G_SERIAL=m @@ -1131,7 +1120,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y # CONFIG_EXT2_FS_SECURITY is not set # CONFIG_EXT3_FS is not set # CONFIG_JBD is not set -CONFIG_FS_MBCACHE=m +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y @@ -1242,7 +1231,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=m -CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set |