[oe-commits] org.oe.dev merge of '2a03e34bdcc2e0c0f1a0fc21e23f3410bf721570'
mickeyl commit
openembedded-commits at lists.openembedded.org
Wed Aug 15 12:59:01 UTC 2007
merge of '2a03e34bdcc2e0c0f1a0fc21e23f3410bf721570'
and 'c7f491129542b0c8e72a670a0ce2395920494179'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: a505ece6d3699f2da6fbe6590ac611befdcc5bdf
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a505ece6d3699f2da6fbe6590ac611befdcc5bdf
Files:
1
packages/bluez/bluez-gnome_0.6.bb
packages/bluez/bluez-gnome_0.7.bb
packages/bluez/bluez-gnome_0.9.bb
packages/linux/compulab-pxa270-2.6.20
packages/linux/compulab-pxa270-2.6.20/0001-gitignore.patch
packages/linux/compulab-pxa270-2.6.20/0002-cm-x270-base.patch
packages/linux/compulab-pxa270-2.6.20/0003-ramdisk_load.patch
packages/linux/compulab-pxa270-2.6.20/0004-nand-driver.patch
packages/linux/compulab-pxa270-2.6.20/0005-mmcsd_large_cards-r0.patch
packages/linux/compulab-pxa270-2.6.20/0006-mmcsd_no_scr_check-r0.patch
packages/linux/compulab-pxa270-2.6.20/defconfig
packages/linux/compulab-pxa270_2.6.20.bb
packages/linux/compulab-pxa270_2.6.22.bb
packages/linux/linux-nokia770-2.6.12.3-osso14
packages/linux/linux-nokia770-2.6.12.3-osso14/nokia770
packages/linux/linux-nokia770-2.6.12.3-osso14/nokia770/defconfig
packages/linux/linux-nokia770-2.6.16-osso26
packages/linux/linux-nokia770-2.6.16-osso26/fix_tlv320aic23_compile.patch
packages/linux/linux-nokia770-2.6.16-osso26/fix_usb_hub_compile.patch
packages/linux/linux-nokia770-2.6.16-osso26/nokia770
packages/linux/linux-nokia770-2.6.16-osso26/nokia770/defconfig
packages/linux/linux-nokia770_2.6.12.3-osso14.bb
packages/linux/linux-nokia770_2.6.16-osso26.bb
conf/machine/davinci_dvevm.conf
conf/machine/davinci-dvevm.conf
packages/linux/linux-davinci-2.6.x+git-davinci
packages/linux/linux-davinci
packages/linux/linux-davinci-2.6.x+git-davinci/defconfig
packages/linux/linux-davinci/davinci-dvevm/defconfig
packages/linux/linux-davinci-2.6.x+git-davinci/defconfig.eabi
packages/linux/linux-davinci/davinci-dvevm/defconfig.eabi
packages/linux/linux-nokia800-2.6.18-osso29
packages/linux/linux-nokia800-2.6.18-osso40
packages/linux/linux-nokia800_2.6.18-osso29.bb
packages/linux/linux-nokia800_2.6.18-osso40.bb
packages/bluez/bluez-utils-3.14
packages/linux/linux-davinci/davinci-dvevm
packages/linux/linux-omap2-git
packages/sqlite/sqlite3-3.4.1
packages/uboot/u-boot-omap2430sdp-1.1.4
conf/machine/omap2430sdp.conf
packages/bluez/bluez-libs_3.14.bb
packages/bluez/bluez-utils-3.14/hciattach-ti-bts.patch
packages/bluez/bluez-utils_3.14.bb
packages/fastjar/fastjar-native_0.95.bb
packages/gpephone/libsettings_0.3.bb
packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch
packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch
packages/linux/linux-omap2-git/defconfig
packages/linux/linux-omap2-git/defconfig.eabi
packages/linux/linux-omap2-git/omap-2430-lcd.patch
packages/linux/linux-omap2_git.bb
packages/minimix/minimix_0.9.bb
packages/patchutils/patchutils_0.2.31.bb
packages/sqlite/sqlite3-3.4.1/libtool.patch
packages/sqlite/sqlite3_3.4.1.bb
packages/uboot/u-boot-omap2430sdp-1.1.4/u-boot-makefile-3.81.patch
packages/uboot/u-boot-omap2430sdp_1.1.4.bb
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom.inc
conf/distro/include/preferred-gpe-versions-2.8.inc
conf/local.conf.sample
conf/machine/htcuniversal.conf
conf/machine/include/tune-arm1136jf-s.conf
conf/machine/nokia770.conf
packages/0xFFFF/0xffff-native_0.1.bb
packages/0xFFFF/0xffff-native_0.2.bb
packages/bluez/bluez-gnome_0.13.bb
packages/cacao/cacaoh-cldc-native_0.98.bb
packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch
packages/fbreader/fbreader_0.8.2a.bb
packages/ffmpeg/ffmpeg_svn.bb
packages/hal/ohm_git.bb
packages/linux/linux-davinci_2.6.x+git-davinci.bb
packages/linux/linux-nokia800-2.6.18-osso40/nokia770/defconfig
packages/linux/linux-nokia800-2.6.18-osso40/nokia800/defconfig
packages/linux/linux-nokia800.inc
packages/linux/linux-omap.inc
packages/maemo/nokia770-init_1.0.bb
packages/maemo/xpext_1.0-5.bb
packages/maemo/xsp_1.0.0-8.bb
packages/midpath/midpath-native_svn.bb
packages/midpath/midpath_svn.bb
packages/perl/perl-5.8.8/Makefile.patch
packages/sylpheed/claws-mail.inc
packages/tasks/task-gpe-base.bb
packages/tasks/task-gpe-pim.bb
packages/tinymail/tinymail_svn.bb
packages/vlc/vlc-gpe_0.8.4.bb
packages/xorg-lib/libxrandr_1.2.1.bb
packages/images/openmoko-image.bb
packages/initscripts/initscripts-1.0/bootmisc.sh
packages/initscripts/initscripts-1.0/save-rtc.sh
packages/initscripts/initscripts_1.0.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.inc
packages/linux/linux-gta01_2.6.21.5.bb
Diffs:
#
# mt diff -r2a03e34bdcc2e0c0f1a0fc21e23f3410bf721570 -ra505ece6d3699f2da6fbe6590ac611befdcc5bdf
#
#
#
# delete "packages/bluez/bluez-gnome_0.6.bb"
#
# delete "packages/bluez/bluez-gnome_0.7.bb"
#
# delete "packages/bluez/bluez-gnome_0.9.bb"
#
# delete "packages/linux/compulab-pxa270-2.6.20"
#
# delete "packages/linux/compulab-pxa270-2.6.20/0001-gitignore.patch"
#
# delete "packages/linux/compulab-pxa270-2.6.20/0002-cm-x270-base.patch"
#
# delete "packages/linux/compulab-pxa270-2.6.20/0003-ramdisk_load.patch"
#
# delete "packages/linux/compulab-pxa270-2.6.20/0004-nand-driver.patch"
#
# delete "packages/linux/compulab-pxa270-2.6.20/0005-mmcsd_large_cards-r0.patch"
#
# delete "packages/linux/compulab-pxa270-2.6.20/0006-mmcsd_no_scr_check-r0.patch"
#
# delete "packages/linux/compulab-pxa270-2.6.20/defconfig"
#
# delete "packages/linux/compulab-pxa270_2.6.20.bb"
#
# delete "packages/linux/compulab-pxa270_2.6.22.bb"
#
# delete "packages/linux/linux-nokia770-2.6.12.3-osso14"
#
# delete "packages/linux/linux-nokia770-2.6.12.3-osso14/nokia770"
#
# delete "packages/linux/linux-nokia770-2.6.12.3-osso14/nokia770/defconfig"
#
# delete "packages/linux/linux-nokia770-2.6.16-osso26"
#
# delete "packages/linux/linux-nokia770-2.6.16-osso26/fix_tlv320aic23_compile.patch"
#
# delete "packages/linux/linux-nokia770-2.6.16-osso26/fix_usb_hub_compile.patch"
#
# delete "packages/linux/linux-nokia770-2.6.16-osso26/nokia770"
#
# delete "packages/linux/linux-nokia770-2.6.16-osso26/nokia770/defconfig"
#
# delete "packages/linux/linux-nokia770_2.6.12.3-osso14.bb"
#
# delete "packages/linux/linux-nokia770_2.6.16-osso26.bb"
#
# rename "conf/machine/davinci_dvevm.conf"
# to "conf/machine/davinci-dvevm.conf"
#
# rename "packages/linux/linux-davinci-2.6.x+git-davinci"
# to "packages/linux/linux-davinci"
#
# rename "packages/linux/linux-davinci-2.6.x+git-davinci/defconfig"
# to "packages/linux/linux-davinci/davinci-dvevm/defconfig"
#
# rename "packages/linux/linux-davinci-2.6.x+git-davinci/defconfig.eabi"
# to "packages/linux/linux-davinci/davinci-dvevm/defconfig.eabi"
#
# rename "packages/linux/linux-nokia800-2.6.18-osso29"
# to "packages/linux/linux-nokia800-2.6.18-osso40"
#
# rename "packages/linux/linux-nokia800_2.6.18-osso29.bb"
# to "packages/linux/linux-nokia800_2.6.18-osso40.bb"
#
# add_dir "packages/bluez/bluez-utils-3.14"
#
# add_dir "packages/linux/linux-davinci/davinci-dvevm"
#
# add_dir "packages/linux/linux-omap2-git"
#
# add_dir "packages/sqlite/sqlite3-3.4.1"
#
# add_dir "packages/uboot/u-boot-omap2430sdp-1.1.4"
#
# add_file "conf/machine/omap2430sdp.conf"
# content [ab16aa3e111396e0fe20e0af0b385e54abc6b999]
#
# add_file "packages/bluez/bluez-libs_3.14.bb"
# content [dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d]
#
# add_file "packages/bluez/bluez-utils-3.14/hciattach-ti-bts.patch"
# content [8e41c30080c87b426fcd390ead9489c3b9dbb703]
#
# add_file "packages/bluez/bluez-utils_3.14.bb"
# content [25a3823df1759cd938c75896135d2737dc6bae81]
#
# add_file "packages/fastjar/fastjar-native_0.95.bb"
# content [3c4528fae3a802f047b2afe2a77ec390f93bba35]
#
# add_file "packages/gpephone/libsettings_0.3.bb"
# content [61c18c3f3f7c85c3f6b358e60597da6b601f3126]
#
# add_file "packages/linux/compulab-pxa270_2.6.22.bb"
# content [1bdb034c9f1a50b53b64d34bec8b58051d785b39]
#
# add_file "packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch"
# content [c56995add77d0c6266cf96e014fae27ba0b1ec1d]
#
# add_file "packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch"
# content [79031ff75ee9237e749692c9311a4ae85ee90c33]
#
# add_file "packages/linux/linux-omap2-git/defconfig"
# content [1a3c9f95b52621fc6a3168761f0bf72f84cf6e8a]
#
# add_file "packages/linux/linux-omap2-git/defconfig.eabi"
# content [1a3c9f95b52621fc6a3168761f0bf72f84cf6e8a]
#
# add_file "packages/linux/linux-omap2-git/omap-2430-lcd.patch"
# content [2f8c5ea918ed5d423562462babce0fea7c1fe9e4]
#
# add_file "packages/linux/linux-omap2_git.bb"
# content [ab62a543cf001bbe863e1adb93758519b57f7036]
#
# add_file "packages/minimix/minimix_0.9.bb"
# content [835efa46eeb9d2938bab80dbc6affdd6a0b15c80]
#
# add_file "packages/patchutils/patchutils_0.2.31.bb"
# content [3179c8b178371ab422e9606f11e57b1099b5ab83]
#
# add_file "packages/sqlite/sqlite3-3.4.1/libtool.patch"
# content [9301b88cfee311e677873cae9b461f3fc90eb8a8]
#
# add_file "packages/sqlite/sqlite3_3.4.1.bb"
# content [864e21b3ffae637c9108c0c4da631438c43fe2a8]
#
# add_file "packages/uboot/u-boot-omap2430sdp-1.1.4/u-boot-makefile-3.81.patch"
# content [1a2e14e36c26e6bc9eef79c970975f202c1b1fbf]
#
# add_file "packages/uboot/u-boot-omap2430sdp_1.1.4.bb"
# content [fe281ead4f04210e0876f455ed429333d5f6d40d]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [2088874891974b3204e2218dbdbdefd2fc9b2280]
# to [cbb26b56003ff6c1919690adefb14b18f3846797]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [db66ecf290b2cc5303e089d928c440e0e7fb7614]
# to [783879e52665932b7ebc461dd753e4481635d326]
#
# patch "conf/distro/include/angstrom.inc"
# from [372f7c2d334de7c0bd564fab1b098f77a81b4b28]
# to [130b27cd1f01aa7501986af41f5aa3ec2ef4b767]
#
# patch "conf/distro/include/preferred-gpe-versions-2.8.inc"
# from [95d8384bd258f6fdf1d0b790aeb71658730dfb06]
# to [4b14c35b3986ab4908cc77104d4e8bedda37428e]
#
# patch "conf/local.conf.sample"
# from [1ff6d0cc7db3274777e6a8ed833701e308a6cb07]
# to [beeeba5a341dd121dacd9a8b5f5a41f720c15f6d]
#
# patch "conf/machine/davinci-dvevm.conf"
# from [0bc4c944a1f6ff3d9dc5d11e1ae0420ade6c1c1e]
# to [e9f21b6a37024cda89bab889af2959652df27a9e]
#
# patch "conf/machine/htcuniversal.conf"
# from [946c0b5be45fdaa05899265e5908a704dd88a293]
# to [4d1341f27ea5a29d604a458fb6974a2aa4fc933c]
#
# patch "conf/machine/include/tune-arm1136jf-s.conf"
# from [b8cdf4c6533420f583f03a1a756edec48bc2e823]
# to [5a3e5932acd2c4060744b80a29575afe2d4371c9]
#
# patch "conf/machine/nokia770.conf"
# from [c749c8d6db7ffaf93285d6780002db17ad815af9]
# to [69e4e555b27d6664f5cb50b730dcf4f7c8f571b8]
#
# patch "packages/0xFFFF/0xffff-native_0.1.bb"
# from [959e24359ef14785c97c6811de8c9643c2220911]
# to [9fe366f3c4a323fa13c2760d0a98dccd34c7b039]
#
# patch "packages/0xFFFF/0xffff-native_0.2.bb"
# from [959e24359ef14785c97c6811de8c9643c2220911]
# to [6445347dafc9298970ccd8e2389c8f4a0c1d84f6]
#
# patch "packages/bluez/bluez-gnome_0.13.bb"
# from [6841233421c5e08a0657919d990abdc76ffac9e7]
# to [6cbb9f5eeecaf368ffa6b829edd445c7877dc847]
#
# patch "packages/cacao/cacaoh-cldc-native_0.98.bb"
# from [80dbefd60462f32de95373690a2c248477fe9183]
# to [5aa5f424cbcebd9908f562377e94c17a036798e8]
#
# patch "packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch"
# from [8b922bc76887bc8127d62d1af083f6868a493c90]
# to [fc88b8e91f46ae81818e65b7ee832fc7b3db915f]
#
# patch "packages/fbreader/fbreader_0.8.2a.bb"
# from [ecb0b59a9f10624f83793fcfa9429e2f50131a9f]
# to [ffa657fea62b85620be6838f5166e8c9d3be06ee]
#
# patch "packages/ffmpeg/ffmpeg_svn.bb"
# from [1099166a95deeab073e0b8b841b47e4b1f534cd0]
# to [3b45e6e26bc71117b35e2213f1dc4abfe0a41900]
#
# patch "packages/hal/ohm_git.bb"
# from [23d27f7a2380b1f011b3981ea4c4cbc22cdd721a]
# to [690f87493050de6333be4cd4a7b98e07531dffd3]
#
# patch "packages/linux/linux-davinci_2.6.x+git-davinci.bb"
# from [2eaf1e75e2275c05053d27298823b4a2af2a8221]
# to [2819e17abe4e3733ead05d9cb2ecd933dabd0466]
#
# patch "packages/linux/linux-nokia800-2.6.18-osso40/nokia770/defconfig"
# from [83984950b5f16c72590ba4cdad931c9d3719053c]
# to [0c90d49ce8bad4a01318e88d4300bb9783bb99b0]
#
# patch "packages/linux/linux-nokia800-2.6.18-osso40/nokia800/defconfig"
# from [fe49a173d4a67d90ef5e0b47a86cc7b5a4d72750]
# to [e86e6559444ad8443469928527615201bdcf2853]
#
# patch "packages/linux/linux-nokia800.inc"
# from [9c6cddb232a5b4c68ca6421351f0715a67a4a91a]
# to [c099bf50d2367d56a7a7f92d7972a909ef3f1c8b]
#
# patch "packages/linux/linux-nokia800_2.6.18-osso40.bb"
# from [a7a41c0847c0ff1e127f056153fd3807610a3003]
# to [4f90826f9fe700b59636abc46e661fe893051730]
#
# patch "packages/linux/linux-omap.inc"
# from [ff6da4cf18858ff86d431fd697ecc2483306b177]
# to [98e6168e01dd9b80e9214f21cee13ae406eeebdd]
#
# patch "packages/maemo/nokia770-init_1.0.bb"
# from [e5a60e0b7b8720865500e60e11655879f7deab18]
# to [e3c214434e1d0078821d1182c096dd223935d40c]
#
# patch "packages/maemo/xpext_1.0-5.bb"
# from [6e21dfa4685b4dbd95c9e89724af1b752a63de31]
# to [57bd673cacfc8db18925885216e8e5e57f44b5be]
#
# patch "packages/maemo/xsp_1.0.0-8.bb"
# from [80417d2a980e0b4834a501bf61be5a7d865f231e]
# to [d9a79489682141e292a24eba759a7cc8149700b9]
#
# patch "packages/midpath/midpath-native_svn.bb"
# from [d5f1cdf7fe2c541f753f4b5bd7a09e6524916905]
# to [475af2536e2be424a741fb3fb8474bc922661dbb]
#
# patch "packages/midpath/midpath_svn.bb"
# from [746724449d034c259adac0c1deb3a12a0c152ea9]
# to [1b064ce492cfa8ba318e23f4a4af8ab1b0bc8184]
#
# patch "packages/perl/perl-5.8.8/Makefile.patch"
# from [2ab735b5d45bce841767d68fbf8da78ae4499a95]
# to [9a0556807b0a059611e9579e0c531cadd6f717d0]
#
# patch "packages/sylpheed/claws-mail.inc"
# from [70dc56c3455d2a0844a513547e62dd0a066acb6f]
# to [e5e9e5019fbe720b04bda75c8c0d5f602d636ffa]
#
# patch "packages/tasks/task-gpe-base.bb"
# from [45d607f3e11edf402d5e91f0cc3f7444e0713c27]
# to [248daeca565cf97b75e833c4dcd52f3d687f634e]
#
# patch "packages/tasks/task-gpe-pim.bb"
# from [226c8d0060c7c7bc81289d6dbbb78e0ec0c18ac1]
# to [820d21530a16077c66ee1e05f9b90d472c4829ff]
#
# patch "packages/tinymail/tinymail_svn.bb"
# from [5dce4fb46d7a9edce192ee7fef92021d0cce21be]
# to [e208f4dc14e0d54aa306a071db2a4abb3da2a8fe]
#
# patch "packages/vlc/vlc-gpe_0.8.4.bb"
# from [96c0d6a6bac04a1132a148c0803ff8e6bb58d9ad]
# to [fe5c6e8601baabed8236c03aa11ba3a8153b0fe1]
#
# patch "packages/xorg-lib/libxrandr_1.2.1.bb"
# from [ac59c5bdb3d0bc126cbc59269521530d22da0e56]
# to [546f95b921ac752c43433b10bcbe198c24a8853a]
#
============================================================
--- conf/machine/omap2430sdp.conf ab16aa3e111396e0fe20e0af0b385e54abc6b999
+++ conf/machine/omap2430sdp.conf ab16aa3e111396e0fe20e0af0b385e54abc6b999
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: ARM 1136 cpu on OMAP2430 SDP board
+#@DESCRIPTION: Machine configuration for the OMAP 2430 SDP development board with a arm1136 processor.
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te armv6"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
+PREFERRED_VERSION_u-boot = "1.1.4"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
+
+MACHINE_FEATURES = "kernel26"
+
+require conf/machine/include/tune-arm1136jf-s.conf
============================================================
--- packages/bluez/bluez-libs_3.14.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
+++ packages/bluez/bluez-libs_3.14.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
@@ -0,0 +1 @@
+require bluez-libs.inc
============================================================
--- packages/bluez/bluez-utils-3.14/hciattach-ti-bts.patch 8e41c30080c87b426fcd390ead9489c3b9dbb703
+++ packages/bluez/bluez-utils-3.14/hciattach-ti-bts.patch 8e41c30080c87b426fcd390ead9489c3b9dbb703
@@ -0,0 +1,498 @@
+Index: bluez-utils-3.9/tools/hciattach.c
+===================================================================
+--- bluez-utils-3.9.orig/tools/hciattach.c 2007-01-28 21:16:48.000000000 +0100
++++ bluez-utils-3.9/tools/hciattach.c 2007-01-29 22:51:30.000000000 +0100
+@@ -59,6 +59,8 @@
+ #define HCI_UART_3WIRE 2
+ #define HCI_UART_H4DS 3
+
++#include "ti_bts.h"
++
+ struct uart_t {
+ char *type;
+ int m_id;
+@@ -68,6 +70,7 @@
+ int speed;
+ int flags;
+ int (*init) (int fd, struct uart_t *u, struct termios *ti);
++ char *bts; /* bluetooth script */
+ };
+
+ #define FLOW_CTL 0x0001
+@@ -257,6 +260,114 @@
+ return 0;
+ }
+
++static int brf6150(int fd, struct uart_t *u, struct termios *ti)
++{
++ bts_t *bfp;
++ int i;
++ unsigned long vers;
++ unsigned char actionbuf[256];
++ unsigned char resp[128]; /* Response */
++ unsigned long count;
++ unsigned short atype;
++
++ if (u->bts == NULL) /* no script, ignore */
++ return 0;
++
++ bfp = bts_load_script( u->bts, &vers );
++ if (bfp == NULL)
++ return -1;
++
++ fprintf( stderr, "Loading BTS script version %lu\n", vers );
++
++ while ((count = bts_next_action( bfp, actionbuf,
++ sizeof actionbuf - 1, &atype )) != 0) {
++ if (atype == ACTION_REMARKS) {
++ if (actionbuf[0] != 0)
++ fprintf( stderr, "%s\n", actionbuf );
++ }
++ else if (atype == ACTION_SEND_COMMAND) {
++#if 0
++ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype );
++ for (i=0; i<count; i++) {
++ fprintf( stderr, "0x%02x ", actionbuf[i] );
++ }
++ fprintf( stderr, "\n" );
++#endif
++ int n;
++ n = write(fd, actionbuf, count);
++ if (n < 0 || n < count) {
++ perror("Failed to write TI action command");
++ return -1;
++ }
++ }
++ else if (atype == ACTION_WAIT_EVENT) {
++ action_wait_t *wait = (action_wait_t *)actionbuf;
++#if 0
++ fprintf( stderr, "ACTION_WAIT_EVENT: %u msec, %u size, data = ", wait->msec, wait->size );
++ for (i=0; i<wait->size; i++) {
++ fprintf( stderr, "0x%02x ", wait->data[i] );
++ }
++ fprintf( stderr, "\n" );
++#endif
++ usleep(wait->msec); /* seems they give usec, not msec */
++ /* Read reply. */
++ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) {
++ perror("Failed to read TI command response");
++ return -1;
++ }
++ if (count < wait->size) {
++ fprintf( stderr, "TI command response is short.");
++ }
++ for (i=0; i<wait->size; i++) {
++ if (i == 3) continue; /* ignore */
++ if (resp[i] != wait->data[i]) {
++ fprintf( stderr, "TI command response does not match expected result.\n" );
++ }
++ }
++ }
++ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) {
++ action_serial_t *sercmd = (action_serial_t *)actionbuf;
++
++ /* Set actual baudrate */
++ fprintf( stderr,
++ "BTS changing baud rate to %u, flow control to %u\n",
++ sercmd->baud, sercmd->flow_control );
++
++ tcflush(fd, TCIOFLUSH);
++
++ if (sercmd->flow_control)
++ ti->c_cflag |= CRTSCTS;
++ else
++ ti->c_cflag &= ~CRTSCTS;
++ if (tcsetattr(fd, TCSANOW, ti) < 0) {
++ perror("Can't set port settings");
++ return -1;
++ }
++
++ u->speed = sercmd->baud;
++
++ tcflush(fd, TCIOFLUSH);
++ if (set_speed(fd, ti, sercmd->baud) < 0) {
++ perror("Can't set baud rate");
++ return -1;
++ }
++ }
++ else if (atype == ACTION_DELAY) {
++ action_delay_t *delay = (action_delay_t *)actionbuf;
++ usleep(delay->msec); /* seems they give usec, not msec */
++ }
++ else {
++ fprintf( stderr, "BTS action type = %d: ", (int)atype );
++ for (i=0; i<count; i++) {
++ fprintf( stderr, "0x%02x ", actionbuf[i] );
++ }
++ fprintf( stderr, "\n" );
++ }
++ }
++ bts_unload_script( bfp );
++ return 0;
++}
++
+ static int texas(int fd, struct uart_t *u, struct termios *ti)
+ {
+ struct timespec tm = {0, 50000};
+@@ -297,15 +408,26 @@
+ } while (resp[4] != cmd[1] && resp[5] != cmd[2]);
+
+ /* Verify manufacturer */
+- if ((resp[11] & 0xFF) != 0x0d)
++ if (resp[11] != 0x0d)
+ fprintf(stderr,"WARNING : module's manufacturer is not Texas Instrument\n");
+
+ /* Print LMP version */
+- fprintf(stderr, "Texas module LMP version : 0x%02x\n", resp[10] & 0xFF);
++ fprintf(stderr, "TI module LMP version : 0x%02x\n", resp[10]);
+
+ /* Print LMP subversion */
+- fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF);
+-
++ fprintf(stderr, "TI module LMP sub-version : 0x%02x%02x\n", resp[14], resp[13]);
++ if ((resp[14] >> 2) == 3) {
++ int err;
++ nanosleep(&tm, NULL);
++
++ /* BRF6150 */
++ if ((err=brf6150( fd, u, ti )) != 0) {
++ fprintf( stderr, "TI script failed (err=%d)\n",
++ err );
++ return -1;
++ }
++ }
++
+ nanosleep(&tm, NULL);
+ return 0;
+ }
+@@ -1128,7 +1250,7 @@
+ {
+ printf("hciattach - HCI UART driver initialization utility\n");
+ printf("Usage:\n");
+- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
++ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] <tty> <type %s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rc7f491129542b0c8e72a670a0ce2395920494179 -ra505ece6d3699f2da6fbe6590ac611befdcc5bdf
#
#
#
# patch "packages/images/openmoko-image.bb"
# from [baa68f491ce9ac84c3a47b7904190c6b594cb0ef]
# to [97b5722f7eef6ce6117016cc573067e30da5f2ee]
#
# patch "packages/initscripts/initscripts-1.0/bootmisc.sh"
# from [04ee5c8267f42bb17d0b7465f613854b9f79b352]
# to [43ecc46db9908042b08383318d0d5821022e2b74]
#
# patch "packages/initscripts/initscripts-1.0/save-rtc.sh"
# from [353d869c5dce5dc015a458b99ee7526623ac136b]
# to [9b1d470537af18827367537206420cc5f66f877e]
#
# patch "packages/initscripts/initscripts_1.0.bb"
# from [987f1ca2c2c0d5cd92451cb463f65beb68b9a89d]
# to [6c15812e6872f15d45072ac63fb02065a0639077]
#
# patch "packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01"
# from [d37b0d7a88ff3c521069869b88eb1d365aceeffb]
# to [a4fce0d73552488787ac6ff3486cdf1c84546f65]
#
# patch "packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01"
# from [b13800e54f61edf724b8c70fbf5b508ea11f79e9]
# to [e33e541e6f793d94d9fa783562429ff4ac0e7189]
#
# patch "packages/linux/linux-gta01.inc"
# from [7538e9a0489178797d787503f993d57517becf9c]
# to [44323377f4017d36e02429fa4c056b0b73c70cdd]
#
# patch "packages/linux/linux-gta01_2.6.21.5.bb"
# from [e6db6ff2a3c5110427abc294b19a748b07070848]
# to [42a58603d3240f81b7d74124c8ec6cdaa5255b22]
#
============================================================
--- packages/images/openmoko-image.bb baa68f491ce9ac84c3a47b7904190c6b594cb0ef
+++ packages/images/openmoko-image.bb 97b5722f7eef6ce6117016cc573067e30da5f2ee
@@ -26,3 +26,5 @@ LICENSE = MIT
inherit image
LICENSE = MIT
+
+ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp'
============================================================
--- packages/initscripts/initscripts-1.0/bootmisc.sh 04ee5c8267f42bb17d0b7465f613854b9f79b352
+++ packages/initscripts/initscripts-1.0/bootmisc.sh 43ecc46db9908042b08383318d0d5821022e2b74
@@ -62,10 +62,15 @@ fi
/sbin/ldconfig
#
-# Recover the time, if there is a time file
+# Recover the time, if there is a time file (first boot only)
+# If not, set system clock from hardware clock
#
if test -e /etc/timestamp
then
date -s `cat /etc/timestamp`
+ mv -f /etc/timestamp /etc/timestamp.done
+ /etc/init.d/hwclock.sh stop
+else
+ /etc/init.d/hwclock.sh start
fi
: exit 0
============================================================
--- packages/initscripts/initscripts-1.0/save-rtc.sh 353d869c5dce5dc015a458b99ee7526623ac136b
+++ packages/initscripts/initscripts-1.0/save-rtc.sh 9b1d470537af18827367537206420cc5f66f877e
@@ -1,16 +1,3 @@
#! /bin/sh
+#FIXME readd timestamp handling for systems where RTC doesn't survive a reboot
+/etc/init.d/hwclock stop
-#
-# Copyright Matthias Hentges <devel at hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: save-rtc.sh
-# Date: 03-Jul-06
-
-
-# Update the timestamp, if there is already one
-if test -e /etc/timestamp
-then
- echo "Will restore RCT from /etc/timestamp on next boot"
- echo "Delete that file to disable this feature."
- date +%2m%2d%2H%2M%Y > /etc/timestamp
-fi
============================================================
--- packages/initscripts/initscripts_1.0.bb 987f1ca2c2c0d5cd92451cb463f65beb68b9a89d
+++ packages/initscripts/initscripts_1.0.bb 6c15812e6872f15d45072ac63fb02065a0639077
@@ -1,10 +1,10 @@ LICENSE = "GPL"
DESCRIPTION = "SysV init scripts"
SECTION = "base"
PRIORITY = "required"
DEPENDS = "makedevs"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r96"
+PR = "r97"
SRC_URI = "file://halt \
file://ramdisk \
@@ -30,7 +30,7 @@ SRC_URI = "file://halt \
file://device_table.txt \
file://populate-volatile.sh \
file://volatiles \
- file://save-rtc.sh"
+ file://save-rtc.sh"
SRC_URI_append_arm = " file://alignment.sh"
============================================================
--- packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01 d37b0d7a88ff3c521069869b88eb1d365aceeffb
+++ packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01 a4fce0d73552488787ac6ff3486cdf1c84546f65
@@ -1205,10 +1205,10 @@ CONFIG_FONT_6x11=y
#
# Logo configuration
#
-CONFIG_LOGO=y
+# CONFIG_LOGO is not set
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO_LINUX_CLUT224 is not set
#
# Sound
============================================================
--- packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01 b13800e54f61edf724b8c70fbf5b508ea11f79e9
+++ packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01 e33e541e6f793d94d9fa783562429ff4ac0e7189
@@ -1205,10 +1205,10 @@ CONFIG_FONT_6x11=y
#
# Logo configuration
#
-CONFIG_LOGO=y
+# CONFIG_LOGO is not set
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO_LINUX_CLUT224 is not set
#
# Sound
============================================================
--- packages/linux/linux-gta01.inc 7538e9a0489178797d787503f993d57517becf9c
+++ packages/linux/linux-gta01.inc 44323377f4017d36e02429fa4c056b0b73c70cdd
@@ -13,7 +13,8 @@ SRC_URI = "http://ftp.de.kernel.org/pub/
# source and patches
#
SRC_URI = "http://ftp.de.kernel.org/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
- file://defconfig-${VANILLA_VERSION}-${MACHINE}"
+ file://defconfig-${VANILLA_VERSION}-${MACHINE} \
+ file://logo_linux_clut224.ppm"
S = "${WORKDIR}/linux-${VANILLA_VERSION}"
##############################################################
@@ -49,12 +50,13 @@ do_prepatch() {
module_autoload_s3cmci = "s3cmci"
do_prepatch() {
- mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
- rm -Rf patches .pc
+ mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
+ mv patches patches.old
+ mv .pc .pc.old
}
do_configure() {
- #install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
+ install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
if [ ! -e ${WORKDIR}/defconfig-${VANILLA_VERSION}-${MACHINE} ]; then
die "No default configuration for ${MACHINE} available."
============================================================
--- packages/linux/linux-gta01_2.6.21.5.bb e6db6ff2a3c5110427abc294b19a748b07070848
+++ packages/linux/linux-gta01_2.6.21.5.bb 42a58603d3240f81b7d74124c8ec6cdaa5255b22
@@ -1,10 +1,10 @@ MOKOR = "moko10"
require linux-gta01.inc
SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http"
SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1"
MOKOR = "moko10"
-PR = "r2"
+PR = "r3"
VANILLA_VERSION = "2.6.21.5"
More information about the Openembedded-commits
mailing list