[oe-commits] org.oe.dev merge of '2bc8a3eb9ed9de9cc86448fe66997525637bb09d'
florian commit
openembedded-commits at lists.openembedded.org
Tue Aug 28 10:28:32 UTC 2007
merge of '2bc8a3eb9ed9de9cc86448fe66997525637bb09d'
and '4dafb02cdb0534d362beafb2ee3a1a6e136bc5c2'
Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 7e7d5c00fa124d2cd39eb2c97ebb7730f0e6ca1a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7e7d5c00fa124d2cd39eb2c97ebb7730f0e6ca1a
Files:
1
conf/machine/include/palm.conf
conf/machine/palmtx.conf
packages/linux/linux-hackndev-2.6/palmtx/defconfig
packages/linux/linux-hackndev-2.6_svn.bb
packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01
packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01
packages/linux/linux-gta01_2.6.21.5.bb
packages/lyx/lyx_1.4.4+1.5.0rc1.bb
packages/lyx/lyx_1.5.1.bb
packages/base-files/base-files/gumstix-connex
packages/base-files/base-files/gumstix-verdex
packages/openmoko-panel-plugins/files
packages/openmoko2/openmoko-dialer2
packages/uclibc/uclibc-0.9.29/gumstix-connex
packages/uclibc/uclibc-0.9.29/gumstix-verdex
packages/base-files/base-files/gumstix-connex/fstab
packages/base-files/base-files/gumstix-verdex/fstab
packages/linux/linux/alix/geode-mfgpt-clock-event-device-support.patch
packages/linux/linux/alix/geode-mfgpt-support-for-geode-class-machines.patch
packages/linux/linux-gta01/defconfig-2.6.22.5-fic-gta01
packages/linux/linux-gta01_2.6.22.5.bb
packages/openmoko-panel-plugins/files/panel-bluetooth.patch
packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch
packages/openssl/openssl-0.9.7g/armeb.patch.lock
packages/openssl/openssl-0.9.7g/debian.patch.lock
packages/openssl/openssl-0.9.7g/gnueabi-arm.patch.lock
packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch.lock
packages/openssl/openssl-0.9.7g/uclibcgnueabi.patch
packages/qemu/qemu-gcc3-check.inc
packages/uclibc/uclibc-0.9.29/gumstix-connex/uClibc.machine
packages/uclibc/uclibc-0.9.29/gumstix-verdex/uClibc.machine
classes/rootfs_deb.bbclass
classes/rootfs_ipk.bbclass
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom.inc
conf/machine/gumstix-connex.conf
conf/machine/gumstix-verdex.conf
conf/machine/include/gumstix.inc
conf/machine/include/tune-arm1136jf-s.conf
conf/machine/include/tune-arm920t.conf
conf/machine/include/tune-arm926ejs.conf
conf/machine/include/tune-xscale.conf
conf/machine/omap5912osk.conf
packages/avahi/avahi-python_0.6.21.bb
packages/avahi/avahi.inc
packages/base-files/base-files/omap5912osk/fstab
packages/linux/linux/alix/defconfig
packages/linux/linux-handhelds-2.6/h2200/defconfig
packages/linux/linux_2.6.22+2.6.23-rc3.bb
packages/linux/linux_2.6.22.bb
packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
packages/openmoko2/openmoko-dialer2_svn.bb
packages/openssl/openssl_0.9.7g.bb
packages/qemu/qemu-native.inc
packages/qemu/qemu-native_20070613.bb
packages/qt/qt4-x11-free_4.3.0.bb
packages/uclibc/uclibc.inc
packages/udev/files/network.sh
packages/udev/udev_092.bb
packages/udev/udev_097.bb
packages/udev/udev_100.bb
Diffs:
#
# mt diff -r2bc8a3eb9ed9de9cc86448fe66997525637bb09d -r7e7d5c00fa124d2cd39eb2c97ebb7730f0e6ca1a
#
#
#
# patch "conf/machine/include/palm.conf"
# from [02a8ab95afa85b4244a8bbfd6bce7a8f6891b86e]
# to [331af80bcf618ef789a759aa1dcf21d38ffa3496]
#
# patch "conf/machine/palmtx.conf"
# from [38355b635339a2229931554bb4d724e928cca980]
# to [0ab04730edaa56ce124a7b8ee93d02f7125a9811]
#
# patch "packages/linux/linux-hackndev-2.6/palmtx/defconfig"
# from [03195d325dd6c207fded62e835101f013daf00f2]
# to [8e1ca3d391e838d6c5fef3ac094093a63a7dd444]
#
# patch "packages/linux/linux-hackndev-2.6_svn.bb"
# from [1725ff1db30bd8101e2f391992c78f4d0251b1cf]
# to [d44ac26422caf12e88dfe59add0418269bcdba54]
#
============================================================
--- conf/machine/include/palm.conf 02a8ab95afa85b4244a8bbfd6bce7a8f6891b86e
+++ conf/machine/include/palm.conf 331af80bcf618ef789a759aa1dcf21d38ffa3496
@@ -57,7 +57,7 @@ module_autoload_pxa27x-keyboard = "pxa27
module_autoload_soundcore = "soundcore"
module_autoload_wm97xx-ts = "wm97xx-ts"
module_autoload_pxa27x-keyboard = "pxa27x-keyboard"
-module_autoload_palmtx-battery = "palmtx-battery"
+module_autoload_palmtx_battery = "palmtx_battery"
module_autoload_palmz72_battery = "palmz72_battery"
module_autoload_i2c-dev = "i2c-dev"
module_autoload_i2c-pxa = "i2c-pxa"
============================================================
--- conf/machine/palmtx.conf 38355b635339a2229931554bb4d724e928cca980
+++ conf/machine/palmtx.conf 0ab04730edaa56ce124a7b8ee93d02f7125a9811
@@ -15,4 +15,15 @@ MACHINE_EXTRA_RRECOMMENDS += "kernel-mod
MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \
kernel-module-wm97xx-ts \
+ kernel-module-palmtx-battery \
+ kernel-module-palmtx-border \
+ kernel-module-bcm2035-uart \
+ kernel-module-palmtx-pcmcia \
+ kernel-module-pcmcia-core \
+ kernel-module-pda-power \
+ kernel-module-pxa2xx-core \
+ kernel-module-snd-pxa2xx-ac97 \
+ kernel-module-snd-pxa2xx-pcm"
+
+
+module_autoload_g_ether = "g_ether"
- kernel-module-palmtx-battery"
============================================================
--- packages/linux/linux-hackndev-2.6/palmtx/defconfig 03195d325dd6c207fded62e835101f013daf00f2
+++ packages/linux/linux-hackndev-2.6/palmtx/defconfig 8e1ca3d391e838d6c5fef3ac094093a63a7dd444
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hnd3
-# Wed Aug 8 12:55:12 2007
+# Mon Aug 27 18:29:55 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -165,30 +165,31 @@ CONFIG_ARCH_PXA=y
# CONFIG_MACH_MAGICIAN is not set
# CONFIG_MACH_HTCAPACHE is not set
# CONFIG_MACH_BLUEANGEL is not set
-# CONFIG_MACH_HTCBEETLES is not set
-# CONFIG_MACH_HW6900 is not set
+# CONFIG_HTC_HW6X00 is not set
# CONFIG_MACH_HTCATHENA is not set
# CONFIG_ARCH_AXIMX3 is not set
# CONFIG_ARCH_AXIMX5 is not set
# CONFIG_MACH_X50 is not set
# CONFIG_ARCH_ROVERP1 is not set
# CONFIG_ARCH_ROVERP5P is not set
-# CONFIG_MACH_XSCALE_PALMLD is not set
-# CONFIG_MACH_XSCALE_PALMTREO650 is not set
-# CONFIG_MACH_XSCALE_TREO680 is not set
-# CONFIG_MACH_T700WX is not set
# CONFIG_MACH_TUNGE2 is not set
+# CONFIG_MACH_OMAP_PALMTC is not set
# CONFIG_MACH_T3XSCALE is not set
# CONFIG_MACH_XSCALE_PALMTT5 is not set
CONFIG_MACH_XSCALE_PALMTX=y
# CONFIG_PALMTX_DEBUG is not set
CONFIG_PALMTX_BATTERY=m
CONFIG_PALMTX_PM=y
-# CONFIG_MACH_PALMZ72 is not set
-# CONFIG_MACH_OMAP_PALMTC is not set
+CONFIG_PALMTX_PCMCIA=m
+CONFIG_PALMTX_BORDER=m
+# CONFIG_MACH_XSCALE_PALMLD is not set
# CONFIG_MACH_ZIRE31 is not set
CONFIG_GPIOED=m
CONFIG_GPIOEDNG=m
+# CONFIG_MACH_PALMZ72 is not set
+# CONFIG_MACH_XSCALE_PALMTREO650 is not set
+# CONFIG_MACH_XSCALE_TREO680 is not set
+# CONFIG_MACH_T700WX is not set
# CONFIG_MACH_GHI270HG is not set
# CONFIG_MACH_GHI270 is not set
# CONFIG_MACH_LOOXC550 is not set
@@ -230,9 +231,18 @@ CONFIG_XSCALE_PMU=y
#
# PCCARD (PCMCIA/CardBus) support
#
-# CONFIG_PCCARD is not set
+CONFIG_PCCARD=m
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
#
+# PC-card bridges
+#
+CONFIG_PCMCIA_PXA2XX=m
+
+#
# Kernel Features
#
CONFIG_PREEMPT=y
@@ -422,16 +432,26 @@ CONFIG_BT=m
#
CONFIG_PXA_FICP=y
CONFIG_BT=m
-# CONFIG_BT_L2CAP is not set
-# CONFIG_BT_SCO is not set
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
#
# Bluetooth device drivers
#
CONFIG_BT_HCIUART=m
-# CONFIG_BT_HCIUART_H4 is not set
-# CONFIG_BT_HCIUART_BCSP is not set
-# CONFIG_BT_BCM2035UART is not set
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIBT3C is not set
+CONFIG_BT_BCM2035UART=m
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBTUART is not set
# CONFIG_BT_HCIVHCI is not set
CONFIG_IEEE80211=m
# CONFIG_IEEE80211_DEBUG is not set
@@ -448,9 +468,9 @@ CONFIG_WIRELESS_EXT=y
#
# Generic Driver Options
#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
+# CONFIG_STANDALONE is not set
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+CONFIG_FW_LOADER=m
# CONFIG_SYS_HYPERVISOR is not set
#
@@ -563,6 +583,11 @@ CONFIG_MII=y
# CONFIG_NET_RADIO is not set
#
+# PCMCIA network device support
+#
+# CONFIG_NET_PCMCIA is not set
+
+#
# Wan interfaces
#
# CONFIG_WAN is not set
@@ -674,7 +699,7 @@ CONFIG_LEGACY_PTYS=y
# CONFIG_RS232_SERIAL is not set
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTY_COUNT=16
#
# IPMI
@@ -690,6 +715,13 @@ CONFIG_HW_RANDOM=m
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_TIHTC is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
# CONFIG_RAW_DRIVER is not set
#
@@ -700,9 +732,48 @@ CONFIG_HW_RANDOM=m
#
# I2C support
#
-# CONFIG_I2C is not set
+CONFIG_I2C=m
+CONFIG_I2C_CHARDEV=m
#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+# CONFIG_I2C_ALGOPXA 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_I2C_ADCM2650 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_OV9640 is not set
+# CONFIG_I2C_OV96XX 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
#
CONFIG_SPI=y
@@ -816,6 +887,9 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
CONFIG_VIDEO_ADV_DEBUG=y
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_TUNER_3036 is not set
# CONFIG_PXACI is not set
#
@@ -834,7 +908,6 @@ CONFIG_BACKLIGHT_CORGI=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_LCD_CLASS_DEVICE is not set
CONFIG_BACKLIGHT_CORGI=y
-# CONFIG_BACKLIGHT_PXAPWM is not set
CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
# CONFIG_FB_DDC is not set
@@ -922,8 +995,15 @@ CONFIG_SND_PXA2XX_AC97=y
# CONFIG_SND_PXA2xx_I2SOUND is not set
CONFIG_SND_PXA2XX_PCM=y
CONFIG_SND_PXA2XX_AC97=y
+# CONFIG_SND_RECON is not set
#
+# PCMCIA devices
+#
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_PDAUDIOCF is not set
+
+#
# SoC audio support
#
# CONFIG_SND_SOC is not set
@@ -980,7 +1060,7 @@ CONFIG_USB_ETH=m
# CONFIG_USB_G_SERIAL is not set
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_CHAR is not set
-# CONFIG_USB_PXA2XX_GPIO is not set
+CONFIG_USB_PXA2XX_GPIO=y
#
# MMC/SD Card support
@@ -996,8 +1076,11 @@ CONFIG_RTC_LIB=y
# Real Time Clock
#
CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=m
-CONFIG_RTC_EPOCH=1970
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_EPOCH=1904
+# CONFIG_RTC_DEBUG is not set
#
# RTC interfaces
@@ -1011,9 +1094,15 @@ CONFIG_RTC_INTF_DEV=m
# 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_RS5C348 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
# CONFIG_RTC_DRV_M48T86 is not set
CONFIG_RTC_DRV_SA1100=m
# CONFIG_RTC_DRV_TEST is not set
@@ -1026,8 +1115,11 @@ CONFIG_EXT2_FS=y
CONFIG_EXT2_FS=y
# CONFIG_EXT2_FS_XATTR is not set
# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_FS_XATTR is not set
# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
# CONFIG_FS_POSIX_ACL is not set
============================================================
--- packages/linux/linux-hackndev-2.6_svn.bb 1725ff1db30bd8101e2f391992c78f4d0251b1cf
+++ packages/linux/linux-hackndev-2.6_svn.bb d44ac26422caf12e88dfe59add0418269bcdba54
@@ -1,8 +1,8 @@ LICENSE = "GPL"
DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices."
HOMEPAGE = "http://www.hackndev.com/"
SECTION = "kernel"
LICENSE = "GPL"
-PR = "r9"
+PR = "r11"
COMPATIBLE_MACHINE = "(palmld|palmtc|palmtt3|palmtt5|palmtx|palmz31|palmz72|palmt650)"
#
# mt diff -r4dafb02cdb0534d362beafb2ee3a1a6e136bc5c2 -r7e7d5c00fa124d2cd39eb2c97ebb7730f0e6ca1a
#
#
#
# delete "packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01"
#
# delete "packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01"
#
# delete "packages/linux/linux-gta01_2.6.21.5.bb"
#
# rename "packages/lyx/lyx_1.4.4+1.5.0rc1.bb"
# to "packages/lyx/lyx_1.5.1.bb"
#
# add_dir "packages/base-files/base-files/gumstix-connex"
#
# add_dir "packages/base-files/base-files/gumstix-verdex"
#
# add_dir "packages/openmoko-panel-plugins/files"
#
# add_dir "packages/openmoko2/openmoko-dialer2"
#
# add_dir "packages/uclibc/uclibc-0.9.29/gumstix-connex"
#
# add_dir "packages/uclibc/uclibc-0.9.29/gumstix-verdex"
#
# add_file "packages/base-files/base-files/gumstix-connex/fstab"
# content [41dbd341dd76afdef10b78b4333320b8ed4752ca]
#
# add_file "packages/base-files/base-files/gumstix-verdex/fstab"
# content [60ebb29ec9fb9e06dc20abd4fd3b49d9c21f277c]
#
# add_file "packages/linux/linux/alix/geode-mfgpt-clock-event-device-support.patch"
# content [d0e230915059acdf6b19ea60e86d9936b545c098]
#
# add_file "packages/linux/linux/alix/geode-mfgpt-support-for-geode-class-machines.patch"
# content [c55a38ac6a13fc66730cc600ffa2effc475670a6]
#
# add_file "packages/linux/linux-gta01/defconfig-2.6.22.5-fic-gta01"
# content [d0e30d670e0eb15b4371c0cbe0172aaa7184af72]
#
# add_file "packages/linux/linux-gta01_2.6.22.5.bb"
# content [ef0f1c24d6a7f6f65653201f99d3cd5c60bbe2ee]
#
# add_file "packages/openmoko-panel-plugins/files/panel-bluetooth.patch"
# content [9af47324f3cfaec964652bfd97e83c7bfc901861]
#
# add_file "packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch"
# content [f6901d3a99791ccbdc632a2d73fb0f07a2844a6e]
#
# add_file "packages/openssl/openssl-0.9.7g/armeb.patch.lock"
# content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
#
# add_file "packages/openssl/openssl-0.9.7g/debian.patch.lock"
# content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
#
# add_file "packages/openssl/openssl-0.9.7g/gnueabi-arm.patch.lock"
# content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
#
# add_file "packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch.lock"
# content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
#
# add_file "packages/openssl/openssl-0.9.7g/uclibcgnueabi.patch"
# content [bd1bc954b5c2e8539a39128f09661d686716eba9]
#
# add_file "packages/qemu/qemu-gcc3-check.inc"
# content [2e11e76ecd0c388cdcfd1319c8601c429ba5888e]
#
# add_file "packages/uclibc/uclibc-0.9.29/gumstix-connex/uClibc.machine"
# content [55b4a5c7c3dcf81fc96e330e74fc84374f0bc276]
#
# add_file "packages/uclibc/uclibc-0.9.29/gumstix-verdex/uClibc.machine"
# content [55b4a5c7c3dcf81fc96e330e74fc84374f0bc276]
#
# patch "classes/rootfs_deb.bbclass"
# from [879ba74c1e013701649d53858c52b79d09441ccd]
# to [707eb78db91916253acef44e2f1a8ff049193cff]
#
# patch "classes/rootfs_ipk.bbclass"
# from [731a40ee3d0b40e7e6d9bdc838728a484250233e]
# to [237808776045be08b7c6b05f62ed82bb94daada8]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [4d18aa56eca5e569ebbf0b616734cb7b5ca678fe]
# to [854daa8fca5bd432a53da00b9cfe542bb9051a48]
#
# patch "conf/distro/include/angstrom.inc"
# from [cd8e6ee81497e36eceda2ade49b5706c6f03d464]
# to [bc404e4b107f132331ca124ae5f643298bdf3840]
#
# patch "conf/machine/gumstix-connex.conf"
# from [40931b717032f2f77d845644dd98f36188404e43]
# to [0903ecc3169560cf41fbd2d7ac041fe5500bae63]
#
# patch "conf/machine/gumstix-verdex.conf"
# from [634247a26215a0709ef800ab53ad7f65b87b5342]
# to [04af755da5ac1ae0a6ca0357f3ebd3488923d7ba]
#
# patch "conf/machine/include/gumstix.inc"
# from [a650e6c9c2788b0d9289abdda0b9ed9e3e8ded38]
# to [8cece65d17833204e5ccdd15bd8c7c456a999ebd]
#
# patch "conf/machine/include/tune-arm1136jf-s.conf"
# from [5a3e5932acd2c4060744b80a29575afe2d4371c9]
# to [eb16d920f5e4b5c23d60ef7eeb3c4dc30ba84f11]
#
# patch "conf/machine/include/tune-arm920t.conf"
# from [207e404a30f6a151d53f88ddffbff128b41d77b3]
# to [90b20a2b9db56011eaade4f5842ba8b4a8584126]
#
# patch "conf/machine/include/tune-arm926ejs.conf"
# from [e966494e533757a3d1a62411aad183ba18be3ea3]
# to [c76a174d9339a3b351d5f39e293bf9321cac008f]
#
# patch "conf/machine/include/tune-xscale.conf"
# from [32838c82d74894c143d5d6c15c5202f982358479]
# to [8823c4bff3c359eb9700b6eafb600e2820f129a3]
#
# patch "conf/machine/omap5912osk.conf"
# from [ee00da09140e71d024034162717e88ea68d14d11]
# to [86e7eca5b6d5f581a0d4cfe3327b0782cbb54d26]
#
# patch "packages/avahi/avahi-python_0.6.21.bb"
# from [3d4b1b5c3ed23ff0bab2bd72c1cdb67561178a56]
# to [91ec6e3aec765ad2c28ed09baa8424126d0b5baa]
#
# patch "packages/avahi/avahi.inc"
# from [8b9c1e9f1c3c321d890f95dad3f772fd5e727b12]
# to [caffb4223742bd86a6d49f717b86d9172d22e5e6]
#
# patch "packages/base-files/base-files/omap5912osk/fstab"
# from [2e8d39b7b7fcf8fc007b1e25a9cab4b21e409ff9]
# to [b1424544f95fef68b0973f843d84ed26a12f2fc0]
#
# patch "packages/linux/linux/alix/defconfig"
# from [ae7429017290047c958a445063d17fcfbc5e4133]
# to [a71cc6d35024db907629ab4665daee048393e9fc]
#
# patch "packages/linux/linux-handhelds-2.6/h2200/defconfig"
# from [5567dff5dd14cc8563bdc9ccd4f03ae945e4c1d2]
# to [09af962af20bc3d0a2a4b656f06577e664c2ec7c]
#
# patch "packages/linux/linux_2.6.22+2.6.23-rc3.bb"
# from [077937f15108c34d551011de6665dfaddab3a820]
# to [f63ff8e509848ae02d7ff9d16a56f9b200db0082]
#
# patch "packages/linux/linux_2.6.22.bb"
# from [a7c4f5a30592c11bb5188d028c5c20b6ee98188e]
# to [75d1a2f2d12313c50fdfb2b412412a7b675c00d0]
#
# patch "packages/lyx/lyx_1.5.1.bb"
# from [473b500d624d02e11fc4f57fe6c7023584d07365]
# to [5541c792ef4a873fa0fcb9ed299cb24666497562]
#
# patch "packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb"
# from [de0f23e02d59acbd6e4e117219493b427db63b57]
# to [6e521caad13fbaa7a8b7e22d99d9897266550696]
#
# patch "packages/openmoko2/openmoko-dialer2_svn.bb"
# from [84fe6bcd1b497984a1f6ee8ecf67a73ecca545ad]
# to [ddf08c9ec19b24e123f2901415b40738b0cd4311]
#
# patch "packages/openssl/openssl_0.9.7g.bb"
# from [68560d0bda19a0b32c7f514bdb9cf445479e7406]
# to [145744ceb1c1d90a5eb05ddcd4947d5f569402ab]
#
# patch "packages/qemu/qemu-native.inc"
# from [740a86de6db274cb5c05df97968b02f1bc33a4cf]
# to [22b8987bdaa1e51e0eaff486b9303f0957b086d5]
#
# patch "packages/qemu/qemu-native_20070613.bb"
# from [342f872dda508387c0cfd231275c9f7fa10f3a9e]
# to [750dd1e695e2d0105b93941f87c372ddd4f9f0a1]
#
# patch "packages/qt/qt4-x11-free_4.3.0.bb"
# from [b40fdda327f4da1d37441a34c084f97335ce58a5]
# to [457aaaa25dd85451f4252d6535b8e314cce24ea4]
#
# patch "packages/uclibc/uclibc.inc"
# from [8e5578d208eaebc7f9cec32d1f12aa26433b0678]
# to [5c336b467c3dc6d7c09520eadca98583a16be540]
#
# patch "packages/udev/files/network.sh"
# from [a083d5cd7833b8ff451f248b0dbcd1587b7a13bc]
# to [7169aa720c36abbb0944803afeae9661dd61e539]
#
# patch "packages/udev/udev_092.bb"
# from [3b1cae0e753955c3ad4b534712c7f13582d9a938]
# to [261bf47eb53a38f69251861775e906eac12d7b70]
#
# patch "packages/udev/udev_097.bb"
# from [1944d7e0e7e54cc38dcca0c59c66c7080828011f]
# to [c276f997f284152ada372fc31e2497b23a297b98]
#
# patch "packages/udev/udev_100.bb"
# from [3a32c3de3de21597a8c1984dbf4e9892cafda3b0]
# to [ba7ba1e986f3e6a91b52b018b80113898d5f8cab]
#
============================================================
--- packages/base-files/base-files/gumstix-connex/fstab 41dbd341dd76afdef10b78b4333320b8ed4752ca
+++ packages/base-files/base-files/gumstix-connex/fstab 41dbd341dd76afdef10b78b4333320b8ed4752ca
@@ -0,0 +1,11 @@
+# fstab for gumstix-connex
+
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+sysfs /sys sysfs defaults 0 0
+tmpfs /dev tmpfs defaults 0 0
+devpts /dev/pts devpts gid=5,mode=620 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /media/ram tmpfs defaults 0 0
+
============================================================
--- packages/base-files/base-files/gumstix-verdex/fstab 60ebb29ec9fb9e06dc20abd4fd3b49d9c21f277c
+++ packages/base-files/base-files/gumstix-verdex/fstab 60ebb29ec9fb9e06dc20abd4fd3b49d9c21f277c
@@ -0,0 +1,11 @@
+# fstab for gumstix-verdex
+
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+sysfs /sys sysfs defaults 0 0
+tmpfs /dev tmpfs defaults 0 0
+devpts /dev/pts devpts gid=5,mode=620 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /media/ram tmpfs defaults 0 0
+
============================================================
--- packages/linux/linux/alix/geode-mfgpt-clock-event-device-support.patch d0e230915059acdf6b19ea60e86d9936b545c098
+++ packages/linux/linux/alix/geode-mfgpt-clock-event-device-support.patch d0e230915059acdf6b19ea60e86d9936b545c098
@@ -0,0 +1,237 @@
+From: Andres Salomon <dilinger at queued.net>
+
+Add support for an MFGPT clock event device; this allows us to use MFGPTs as
+the basis for high-resolution timers.
+
+Signed-off-by: Jordan Crouse <jordan.crouse at amd.com>
+Signed-off-by: Andres Salomon <dilinger at debian.org>
+Cc: Andi Kleen <ak at suse.de>
+Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
+Cc: john stultz <johnstul at us.ibm.com>
+Cc: Thomas Gleixner <tglx at linutronix.de>
+Cc: Ingo Molnar <mingo at elte.hu>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+---
+
+ Documentation/kernel-parameters.txt | 4
+ arch/i386/Kconfig | 10 +
+ arch/i386/kernel/mfgpt.c | 165 ++++++++++++++++++++++++++
+ 3 files changed, 179 insertions(+)
+
+--- linux-2.6.22.orig/Documentation/kernel-parameters.txt
++++ linux-2.6.22/Documentation/kernel-parameters.txt
+@@ -1012,6 +1012,10 @@
+ meye.*= [HW] Set MotionEye Camera parameters
+ See Documentation/video4linux/meye.txt.
+
++ mfgpt_irq= [IA-32] Specify the IRQ to use for the
++ Multi-Function General Purpose Timers on AMD Geode
++ platforms.
++
+ mga= [HW,DRM]
+
+ migration_cost=
+--- linux-2.6.22.orig/arch/i386/Kconfig
++++ linux-2.6.22/arch/i386/Kconfig
+@@ -1190,6 +1190,16 @@
+ processor goes idle (as is done by the scheduler). The
+ other workaround is idle=poll boot option.
+
++config GEODE_MFGPT_TIMER
++ bool "Geode Multi-Function General Purpose Timer (MFGPT) events"
++ depends on MGEODE_LX && GENERIC_TIME && GENERIC_CLOCKEVENTS
++ default y
++ help
++ This driver provides a clock event source based on the MFGPT
++ timer(s) in the CS5535 and CS5536 companion chip for the geode.
++ MFGPTs have a better resolution and max interval than the
++ generic PIT, and are suitable for use as high-res timers.
++
+ config K8_NB
+ def_bool y
+ depends on AGP_AMD64
+--- linux-2.6.22.orig/arch/i386/kernel/mfgpt.c
++++ linux-2.6.22/arch/i386/kernel/mfgpt.c
+@@ -48,6 +48,12 @@
+ #define MFGPT_HZ (32000 / MFGPT_DIVISOR)
+ #define MFGPT_PERIODIC (MFGPT_HZ / HZ)
+
++#ifdef CONFIG_GEODE_MFGPT_TIMER
++static int __init mfgpt_timer_setup(void);
++#else
++#define mfgpt_timer_setup() (0)
++#endif
++
+ /* Allow for disabling of MFGPTs */
+ static int disable;
+ static int __init mfgpt_disable(char *s)
+@@ -82,6 +88,9 @@
+ }
+ }
+
++ /* set up clock event device, if desired */
++ i = mfgpt_timer_setup();
++
+ return count;
+ }
+
+@@ -197,3 +206,159 @@
+ return -1;
+ }
+ EXPORT_SYMBOL(geode_mfgpt_alloc_timer);
++
++#ifdef CONFIG_GEODE_MFGPT_TIMER
++
++/*
++ * The MFPGT timers on the CS5536 provide us with suitable timers to use
++ * as clock event sources - not as good as a HPET or APIC, but certainly
++ * better then the PIT. This isn't a general purpose MFGPT driver, but
++ * a simplified one designed specifically to act as a clock event source.
++ * For full details about the MFGPT, please consult the CS5536 data sheet.
++ */
++
++#include <linux/clocksource.h>
++#include <linux/clockchips.h>
++
++static unsigned int mfgpt_tick_mode = CLOCK_EVT_MODE_SHUTDOWN;
++static u16 mfgpt_event_clock;
++
++static int irq = 7;
++static int __init mfgpt_setup(char *str)
++{
++ get_option(&str, &irq);
++ return 1;
++}
++__setup("mfgpt_irq=", mfgpt_setup);
++
++static inline void mfgpt_disable_timer(u16 clock)
++{
++ u16 val = geode_mfgpt_read(clock, MFGPT_REG_SETUP);
++ geode_mfgpt_write(clock, MFGPT_REG_SETUP, val & ~MFGPT_SETUP_CNTEN);
++}
++
++static int mfgpt_next_event(unsigned long, struct clock_event_device *);
++static void mfgpt_set_mode(enum clock_event_mode, struct clock_event_device *);
++
++static struct clock_event_device mfgpt_clockevent = {
++ .name = "mfgpt-timer",
++ .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
++ .set_mode = mfgpt_set_mode,
++ .set_next_event = mfgpt_next_event,
++ .rating = 250,
++ .cpumask = CPU_MASK_ALL,
++ .shift = 32
++};
++
++static inline void mfgpt_start_timer(u16 clock, u16 delta)
++{
++ geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_CMP2, (u16) delta);
++ geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_COUNTER, 0);
++
++ geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_SETUP,
++ MFGPT_SETUP_CNTEN | MFGPT_SETUP_CMP2);
++}
++
++static void mfgpt_set_mode(enum clock_event_mode mode,
++ struct clock_event_device *evt)
++{
++ mfgpt_disable_timer(mfgpt_event_clock);
++
++ if (mode == CLOCK_EVT_MODE_PERIODIC)
++ mfgpt_start_timer(mfgpt_event_clock, MFGPT_PERIODIC);
++
++ mfgpt_tick_mode = mode;
++}
++
++static int mfgpt_next_event(unsigned long delta, struct clock_event_device *evt)
++{
++ mfgpt_start_timer(mfgpt_event_clock, delta);
++ return 0;
++}
++
++/* Assume (foolishly?), that this interrupt was due to our tick */
++
++static irqreturn_t mfgpt_tick(int irq, void *dev_id)
++{
++ if (mfgpt_tick_mode == CLOCK_EVT_MODE_SHUTDOWN)
++ return IRQ_HANDLED;
++
++ /* Turn off the clock */
++ mfgpt_disable_timer(mfgpt_event_clock);
++
++ /* Clear the counter */
++ geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_COUNTER, 0);
++
++ /* Restart the clock in periodic mode */
++
++ if (mfgpt_tick_mode == CLOCK_EVT_MODE_PERIODIC) {
++ geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_SETUP,
++ MFGPT_SETUP_CNTEN | MFGPT_SETUP_CMP2);
++ }
++
++ mfgpt_clockevent.event_handler(&mfgpt_clockevent);
++ return IRQ_HANDLED;
++}
++
++static struct irqaction mfgptirq = {
++ .handler = mfgpt_tick,
++ .flags = IRQF_DISABLED | IRQF_NOBALANCING,
++ .mask = CPU_MASK_NONE,
++ .name = "mfgpt-timer"
++};
++
++static int __init mfgpt_timer_setup(void)
++{
++ int timer, ret;
++ u16 val;
++
++ timer = geode_mfgpt_alloc_timer(MFGPT_TIMER_ANY, MFGPT_DOMAIN_WORKING,
++ THIS_MODULE);
++ if (timer < 0) {
++ printk(KERN_ERR "mfgpt-timer: Could not allocate a MFPGT "
++ "timer\n");
++ return -ENODEV;
++ }
++
++ mfgpt_event_clock = timer;
++ /* Set the clock scale and enable the event mode for CMP2 */
++ val = MFGPT_SCALE | (3 << 8);
++
++ geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_SETUP, val);
++
++ /* Set up the IRQ on the MFGPT side */
++ if (geode_mfgpt_setup_irq(mfgpt_event_clock, MFGPT_CMP2, irq)) {
++ printk(KERN_ERR "mfgpt-timer: Could not set up IRQ %d\n", irq);
++ return -EIO;
++ }
++
++ /* And register it with the kernel */
++ ret = setup_irq(irq, &mfgptirq);
++
++ if (ret) {
++ printk(KERN_ERR "mfgpt-timer: Unable to set up the "
++ "interrupt.\n");
++ goto err;
++ }
++
++ /* Set up the clock event */
++ mfgpt_clockevent.mult = div_sc(MFGPT_HZ, NSEC_PER_SEC, 32);
++ mfgpt_clockevent.min_delta_ns = clockevent_delta2ns(0xF,
++ &mfgpt_clockevent);
++ mfgpt_clockevent.max_delta_ns = clockevent_delta2ns(0xFFFE,
++ &mfgpt_clockevent);
++
++ printk(KERN_INFO "mfgpt-timer: registering the MFGT timer as a "
++ "clock event.\n");
++ clockevents_register_device(&mfgpt_clockevent);
++
++ return 0;
++
++err:
++ geode_mfgpt_release_irq(mfgpt_event_clock, MFGPT_CMP2, irq);
++ printk(KER%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list