diff options
30 files changed, 166 insertions, 55 deletions
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index 68bf1b9025..baa2e55dc1 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" @@ -25,12 +25,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-gta01-pm-gsm \ kernel-module-gta01kbd \ kernel-module-s3cmci \ - kernel-module-ext2 \ - kernel-module-vfat \ kernel-module-snd-soc-neo1973-wm8753 \ kernel-module-snd-soc-smdk2440 \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-cp437 \ " # do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index 25c3878ee3..2b2d016089 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" @@ -25,12 +25,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-gta01-pm-gsm \ kernel-module-gta01kbd \ kernel-module-s3cmci \ - kernel-module-ext2 \ - kernel-module-vfat \ kernel-module-snd-soc-neo1973-gta02-wm8753 \ kernel-module-snd-soc-smdk2440 \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-cp437 \ " SERIAL_CONSOLE = "115200 ttySAC2" diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index fcd6cfa0b9..c4c1237bae 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -26,13 +26,15 @@ EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootf MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \ - kernel-module-h5400-battery" + kernel-module-h5400-battery \ + kernel-module-snd-soc-h5000" # # Modules autoload and other boot properties # module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_snd-soc-h5000 = "snd-soc-h5000" module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 1c1d08afb1..ac565559aa 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -53,16 +53,16 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf # # Modules autoload and other boot properties # -module_autoload_magician_ts = "magician_ts" -module_autoload_leds-magician = "leds-magician" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_hci_usb = "hci_usb" module_autoload_pxa27x_udc = "pxa27x_udc" +module_autoload_magician_ts = "magician_ts" +module_autoload_leds-magician = "leds-magician" module_autoload_magician_phone = "magician_phone" module_autoload_magician_pm = "magician_pm" module_autoload_n_tihtc = "n_tihtc" module_autoload_snd-soc-magician = "snd-soc-magician" -module_autoload_hci_usb = "hci_usb" #FIXME: this should be controlled by a userspace utility later. module_autoload_g_ether = "g_ether" diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig index c19c4dad38..68e39e7019 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:44 2007 +# Wed Dec 26 16:55:31 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig index 677bde82ea..3c1cfbad8f 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:44 2007 +# Wed Dec 26 16:55:31 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig index 47a8254a68..8e845fb396 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:44 2007 +# Wed Dec 26 16:55:32 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig index 3950f3997f..49a907e5fe 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:45 2007 +# Wed Dec 26 16:55:32 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig index a4cb10f2b1..dd20e0baff 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:45 2007 +# Wed Dec 26 16:55:32 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig index bf2c1ca72a..532752a44f 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:46 2007 +# Wed Dec 26 16:55:33 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig index 4256607553..2a29e61877 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:46 2007 +# Wed Dec 26 16:55:33 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig index 9bbe63ae6b..2132550832 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:47 2007 +# Wed Dec 26 16:55:34 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig index 29cbc0920e..53bbe32ec0 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:47 2007 +# Wed Dec 26 16:55:34 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig index 7c2f3b103f..d3b7c58d08 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:47 2007 +# Wed Dec 26 16:55:34 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig index c7c6360351..b72cc16514 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:48 2007 +# Wed Dec 26 16:55:35 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -799,9 +799,9 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set -CONFIG_GPIODEV_KEYS=y -# CONFIG_GPIODEV_KEYS2 is not set -CONFIG_GPIODEV_DIAGONAL=y +# CONFIG_GPIODEV_KEYS is not set +CONFIG_GPIODEV_KEYS2=y +# CONFIG_GPIODEV_DIAGONAL is not set # CONFIG_KEYBOARD_GPIO is not set CONFIG_INPUT_MOUSE=y # CONFIG_MOUSE_PS2 is not set @@ -882,7 +882,42 @@ CONFIG_LEGACY_PTY_COUNT=32 # # I2C support # -# CONFIG_I2C is not set +CONFIG_I2C=m +# CONFIG_I2C_CHARDEV is not set + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +CONFIG_I2C_PXA=m +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCA9535 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_RTC8564 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set # # SPI support @@ -898,6 +933,7 @@ CONFIG_W1=y # # 1-wire Bus Masters # +# CONFIG_W1_MASTER_DS2482 is not set CONFIG_W1_MASTER_DS1WM=y # @@ -1064,7 +1100,82 @@ CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -# CONFIG_SND is not set +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +# CONFIG_SND_H5XXX_AK4535 is not set +# CONFIG_SND_PXA2XX_AC97 is not set +# CONFIG_SND_RECON is not set + +# +# SoC audio support +# +CONFIG_SND_SOC=m + +# +# SoC Platforms +# + +# +# SoC Audio for the Atmel AT91 +# + +# +# SoC Audio for the Intel PXA2xx +# +CONFIG_SND_PXA2XX_SOC=m +CONFIG_SND_PXA2XX_SOC_I2S=m +# CONFIG_SND_PXA2XX_SOC_MAGICIAN is not set +# CONFIG_SND_PXA2XX_SOC_BLUEANGEL is not set +CONFIG_SND_PXA2XX_SOC_H5000=m + +# +# SoC Audio for the Freescale i.MX +# + +# +# SoC Audio for the Samsung S3C24XX +# +# CONFIG_SND_SOC_AC97_CODEC is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8772 is not set +# CONFIG_SND_SOC_WM8971 is not set +# CONFIG_SND_SOC_WM8956 is not set +# CONFIG_SND_SOC_WM8960 is not set +# CONFIG_SND_SOC_WM8976 is not set +# CONFIG_SND_SOC_WM8974 is not set +# CONFIG_SND_SOC_WM8980 is not set +# CONFIG_SND_SOC_WM9705 is not set +# CONFIG_SND_SOC_WM9713 is not set +# CONFIG_SND_SOC_WM9712 is not set +# CONFIG_SND_SOC_UDA1380 is not set +CONFIG_SND_SOC_AK4535=m # # Open Sound System @@ -1150,8 +1261,14 @@ CONFIG_RTC_INTF_DEV=y # RTC drivers # # CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1307 is not set # CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_DS1672 is not set # CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_RS5C372 is not set # CONFIG_RTC_DRV_M48T86 is not set CONFIG_RTC_DRV_SA1100=y # CONFIG_RTC_DRV_TEST is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig index bbf1c1e700..457ed57863 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:49 2007 +# Wed Dec 26 16:55:36 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig index 39729375c1..24a0ba0bb3 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:49 2007 +# Wed Dec 26 16:55:37 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig index 7c3164a9ba..bc71c235e3 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:50 2007 +# Wed Dec 26 16:55:37 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig index 1ead176a58..41012c93a0 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:50 2007 +# Wed Dec 26 16:55:37 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1121,13 +1121,13 @@ CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -CONFIG_SND=y -CONFIG_SND_TIMER=y -CONFIG_SND_PCM=y +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m # CONFIG_SND_SEQUENCER is not set CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y # CONFIG_SND_DYNAMIC_MINORS is not set CONFIG_SND_SUPPORT_OLD_API=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig index edba03db84..51cf1468da 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:51 2007 +# Wed Dec 26 16:55:38 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig index 6f029a5dcc..9aea8e2d09 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:51 2007 +# Wed Dec 26 16:55:38 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig index 3b2cb77f0b..538258dca9 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:52 2007 +# Wed Dec 26 16:55:39 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig index 53eb1bbaa1..c4f636f1ba 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:52 2007 +# Wed Dec 26 16:55:39 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig index 76219d61dd..d8a7c87f24 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:48 2007 +# Wed Dec 26 16:55:35 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig index 645be4f89d..065435406d 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:52 2007 +# Wed Dec 26 16:55:39 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig index 065e542ecd..e3712ec2e5 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:49 2007 +# Wed Dec 26 16:55:36 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1106,13 +1106,13 @@ CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -CONFIG_SND=y -CONFIG_SND_TIMER=y -CONFIG_SND_PCM=y +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m # CONFIG_SND_SEQUENCER is not set CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y # CONFIG_SND_DYNAMIC_MINORS is not set CONFIG_SND_SUPPORT_OLD_API=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig index ce6c15a6f1..5c59ed5282 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:53 2007 +# Wed Dec 26 16:55:40 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig index 40575b5ded..76a2c5fc0d 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Tue Dec 25 22:59:53 2007 +# Wed Dec 26 16:55:40 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb index c05ad3bbf1..f15b71c325 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r4" +PR = "r6" DEFAULT_PREFERENCE = "-1" diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index da1fdf97cd..cbb639ac3d 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r54" +PR = "r55" inherit task |