[oe-commits] org.oe.dev merge of '159abf710e505eb360cea20e22b6f1fa84eb6e4a'
oe commit
oe at amethyst.openembedded.net
Sun Jun 22 10:39:13 UTC 2008
merge of '159abf710e505eb360cea20e22b6f1fa84eb6e4a'
and '3f37d09caa1458ff05bbfdf2d47ff7dfc82d2f10'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: fcaa336068b9697eb2e8236103ae4865056796c1
ViewMTN: http://monotone.openembedded.org/revision/info/fcaa336068b9697eb2e8236103ae4865056796c1
Files:
1
packages/bluez/bluez-utils-3.33
packages/bluez/bluez-hcidump_1.42.bb
packages/bluez/bluez-libs_3.33.bb
packages/bluez/bluez-utils-3.33/hciattach-ti-bts.patch
packages/bluez/bluez-utils_3.33.bb
packages/apex/apex-nslu2-1.5.8
packages/apex/apex-nslu2-1.5.8/defconfig
packages/apex/apex-nslu2-16mb-1.5.8
packages/apex/apex-nslu2-16mb-1.5.8/defconfig
packages/apex/apex-nslu2-16mb_1.5.8.bb
packages/apex/apex-nslu2_1.5.8.bb
packages/apex/apex-env_1.5.13.bb
packages/apex/apex-env_1.5.14.bb
packages/apex/apex-nslu2-1.5.13
packages/apex/apex-nslu2-1.5.14
packages/apex/apex-nslu2-16mb-1.5.13
packages/apex/apex-nslu2-16mb-1.5.14
packages/apex/apex-nslu2-16mb_1.5.13.bb
packages/apex/apex-nslu2-16mb_1.5.14.bb
packages/apex/apex-nslu2_1.5.13.bb
packages/apex/apex-nslu2_1.5.14.bb
packages/freesmartphone/frameworkd
packages/freesmartphone/frameworkd/om-gta02
packages/dropbear/dropbear-0.51/no-host-lookup.patch
packages/freesmartphone/frameworkd/frameworkd
packages/freesmartphone/frameworkd/frameworkd.conf
packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf
packages/freesmartphone/frameworkd_git.bb
packages/lcd4linux/files/libusb-compat.diff
packages/linux/linux-omap2-git/beagleboard/fix-dispc-clocks.patch
conf/distro/include/fso-autorev.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/davinci-dvevm.conf
conf/machine/davinci-sffsdr.conf
packages/dropbear/dropbear_0.51.bb
packages/gdb/gdb-cross-sdk_6.8.bb
packages/lcd4linux/lcd4linux_0.10.0.bb
packages/libusb/libusb1_0.9.0.bb
packages/linux/linux-omap2_git.bb
packages/meta/meta-toolchain.bb
Diffs:
#
# mt diff -r159abf710e505eb360cea20e22b6f1fa84eb6e4a -rfcaa336068b9697eb2e8236103ae4865056796c1
#
#
#
# add_dir "packages/bluez/bluez-utils-3.33"
#
# add_file "packages/bluez/bluez-hcidump_1.42.bb"
# content [d6f52cd2d74e198d022f5fd58a152c8d4eb73945]
#
# add_file "packages/bluez/bluez-libs_3.33.bb"
# content [dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d]
#
# add_file "packages/bluez/bluez-utils-3.33/hciattach-ti-bts.patch"
# content [2325160feaae636c3e834dcf0b73984945c0899f]
#
# add_file "packages/bluez/bluez-utils_3.33.bb"
# content [bd21943c7ca29d617bfd9492d34e92de11134575]
#
============================================================
--- packages/bluez/bluez-hcidump_1.42.bb d6f52cd2d74e198d022f5fd58a152c8d4eb73945
+++ packages/bluez/bluez-hcidump_1.42.bb d6f52cd2d74e198d022f5fd58a152c8d4eb73945
@@ -0,0 +1,13 @@
+DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
+S = "${WORKDIR}/bluez-hcidump-${PV}"
+
+EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
+
+inherit autotools
============================================================
--- packages/bluez/bluez-libs_3.33.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
+++ packages/bluez/bluez-libs_3.33.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
@@ -0,0 +1 @@
+require bluez-libs.inc
============================================================
--- packages/bluez/bluez-utils-3.33/hciattach-ti-bts.patch 2325160feaae636c3e834dcf0b73984945c0899f
+++ packages/bluez/bluez-utils-3.33/hciattach-ti-bts.patch 2325160feaae636c3e834dcf0b73984945c0899f
@@ -0,0 +1,477 @@
+--- bluez-utils-3.1/tools/hciattach.c.orig 2006-07-23 14:02:14.000000000 +0200
++++ bluez-utils-3.1/tools/hciattach.c 2006-07-23 14:06:29.000000000 +0200
+@@ -60,6 +60,8 @@
+ #define HCI_UART_3WIRE 2
+ #define HCI_UART_H4DS 3
+
++#include "ti_bts.h"
++
+ struct uart_t {
+ char *type;
+ int m_id;
+@@ -70,6 +72,7 @@
+ int flags;
+ char *bdaddr;
+ int (*init) (int fd, struct uart_t *u, struct termios *ti);
++ char *bts; /* bluetooth script */
+ };
+
+ #define FLOW_CTL 0x0001
+@@ -279,6 +282,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};
+@@ -328,6 +439,17 @@
+ /* Print LMP subversion */
+ fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF);
+
++ if ((resp[14] >> 2) == 3) {
++ /* BRF6150 */
++ int err;
++
++ nanosleep(&tm, NULL);
++ if ((err = brf6150(fd, u, ti)) != 0) {
++ fprintf(stderr, "Texas module script failed (err=%d)\n", err);
++ return -1;
++ }
++ }
++
+ nanosleep(&tm, NULL);
+ return 0;
+ }
+@@ -1204,7 +1326,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 | id> [speed] [flow|noflow] [bdaddr]\n");
+ printf("\thciattach -l\n");
+ }
+
+@@ -1219,11 +1341,12 @@
+ struct sigaction sa;
+ struct pollfd p;
+ char dev[PATH_MAX];
++ char *bts = NULL;
+
+ detach = 1;
+ printpid = 0;
+
+- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) {
++ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) {
+ switch(opt) {
+ case 'b':
+ send_break = 1;
+@@ -1245,6 +1368,10 @@
+ init_speed = atoi(optarg);
+ break;
+
++ case 'S':
++ bts = optarg;
++ break;
++
+ case 'l':
+ for (i = 0; uart[i].type; i++) {
+ printf("%-10s0x%04x,0x%04x\n", uart[i].type,
+@@ -1320,6 +1447,8 @@
+ if (init_speed)
+ u->init_speed = init_speed;
+
++ u->bts = bts;
++
+ memset(&sa, 0, sizeof(sa));
+ sa.sa_flags = SA_NOCLDSTOP;
+ sa.sa_handler = sig_alarm;
+--- bluez-utils-3.1/tools/ti_bts.h.orig 2006-07-23 14:07:26.000000000 +0200
++++ bluez-utils-3.1/tools/ti_bts.h 2006-07-23 14:07:46.000000000 +0200
+@@ -0,0 +1,116 @@
++/*
++ * Copyright (c) 2005 Texas Instruments, Inc.
++ * Ported by SDG Systems, LLC
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation;
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
++ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
++ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ *
++ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
++ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
++ * SOFTWARE IS DISCLAIMED.
++ *
++ */
++
++#ifndef BT_SCRIPT_H
++#define BT_SCRIPT_H
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/*
++ * Define the interface of Bluetooth Script
++ */
++
++typedef void bts_t;
++
++
++#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */
++#define ACTION_WAIT_EVENT 2 /* Wait for data */
++#define ACTION_SERIAL_PORT_PARAMETERS 3
++#define ACTION_DELAY 4
++#define ACTION_RUN_SCRIPT 5
++#define ACTION_REMARKS 6
++
++/*
++ * Structure for ACTION_SEND_COMMAND
++ */
++typedef struct tagCActionCommand
++{
++ unsigned char data[1]; /* Data to send */
++} action_command_t;
++
++/*
++ * Structure for ACTION_WAIT_EVENT
++ */
++typedef struct tagCActionWaitEvent
++{
++ unsigned long msec; /* in milliseconds */
++ unsigned long size;
++ unsigned char data[1]; /* Data to wait for */
++} action_wait_t;
++
++
++/*
++ * Structure for ACTION_SERIAL_PORT_PARAMETERS
++ */
++typedef struct tagCActionSerialPortParameters
++{
++ unsigned long baud;
++ unsigned long flow_control;
++} action_serial_t;
++
++/* Flow Control Type */
++#define FCT_NONE 0
++#define FCT_HARDWARE 1
++
++#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */
++
++
++/*
++ * Structure for ACTION_DELAY
++ */
++typedef struct tagCActionDelay
++{
++ unsigned long msec; /* in milliseconds */
++} action_delay_t;
++
++/*
++ * Structure for ACTION_RUN_SCRIPT
++ */
++typedef struct tagCActionRunScript
++{
++ char filename[1];
++} action_run_t;
++
++/*
++ * Structure for ACTION_REMARKS
++ */
++typedef struct tagCActionRemarks
++{
++ char m_szRemarks[1];
++} action_remarks_t;
++
++
++const char *cis_create_filename(const unsigned char* cmdparms);
++bts_t * bts_load_script(const char* fname, unsigned long* version);
++unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf,
++ unsigned long nMaxSize, unsigned short* ptype);
++void bts_unload_script(bts_t* bts_fp);
++
++#ifdef __cplusplus
++};
++#endif
++
++#endif /* BT_SCRIPT_H */
++
+--- bluez-utils-3.1/tools/ti_bts.c.orig 2006-07-23 14:07:28.000000000 +0200
++++ bluez-utils-3.1/tools/ti_bts.c 2006-07-23 14:07:46.000000000 +0200
+@@ -0,0 +1,149 @@
++/*
++ * Copyright (c) 2005 Texas Instruments, Inc.
++ * Ported by SDG Systems, LLC
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation;
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
++ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
++ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ *
++ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
++ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
++ * SOFTWARE IS DISCLAIMED.
++ *
++ */
++
++
++#include <stdio.h>
++#include <stdlib.h>
++#include "ti_bts.h"
++
++#ifndef MAKEWORD
++#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8))
++#endif
++
++#define TI_MANUFACTURER_ID 13
++
++/*
++ * Common Init Script specific
++ */
++const char *
++cis_create_filename(const unsigned char* cmdparms)
++{
++ static char bts_file[50];
++
++ /* Check for TI's id */
++ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]);
++
++ if (TI_MANUFACTURER_ID == manfid) {
++ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]);
++
++ unsigned short chip = (version & 0x7C00) >> 10;
++ unsigned short min_ver = (version & 0x007F);
++ unsigned short maj_ver = (version & 0x0380) >> 7;
++
++ if (0 != (version & 0x8000)) {
++ maj_ver |= 0x0008;
++ }
++
++ sprintf( bts_file, "TIInit_%d.%d.%d.bts",
++ (int)chip, (int)maj_ver, (int)min_ver);
++
++ return &bts_file[0];
++ }
++ return NULL;
++}
++
++typedef struct tagCHeader
++{
++ unsigned long magic;
++ unsigned long version;
++ unsigned char future[24];
++} cheader_t;
++
++
++/* The value 0x42535442 stands for (in ASCII) BTSB */
++/* which is Bluetooth Script Binary */
++#define FILE_HEADER_MAGIC 0x42535442
++
++
++bts_t *
++bts_load_script(const char* fname, unsigned long* version)
++{
++ bts_t* bts = NULL;
++ FILE* fp = fopen(fname, "rb");
++
++ if (NULL != fp) {
++ /* Read header */
++ cheader_t header;
++
++ /* Read header */
++ if (1 == fread(&header, sizeof(header), 1, fp)) {
++ /* Check magic number for correctness */
++ if (header.magic == FILE_HEADER_MAGIC) {
++ /* If user wants the version number */
++ if (NULL != version) {
++ *version = header.version;
++ }
++ bts = (bts_t*)fp;
++ }
++ }
++ /* If failed reading the file, close it */
++ if (NULL == bts) {
++ fclose(fp);
++ }
++ }
++ return bts;
++}
++
++unsigned long
++bts_next_action(const bts_t* bts_fp, unsigned char* action_buf,
++ unsigned long nMaxSize, unsigned short* ptype)
++{
++ unsigned long bytes = 0;
++ FILE* fp = (FILE*)bts_fp;
++ unsigned char action_hdr[4];
++
++ if (bts_fp == NULL)
++ return 0;
++
++ /* Each Action has the following: */
++ /* UINT16 type of this action */
++ /* UINT16 size of rest */
++ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */
++
++ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) {
++ unsigned short type = *(unsigned short*)&action_hdr[0];
++ unsigned short size = *(unsigned short*)&action_hdr[2];
++
++ if (size <= nMaxSize) {
++ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp);
++
++ if (nread == size) {
++ *ptype = type;
++ bytes = (unsigned long)size;
++ }
++ }
++ }
++
++ return bytes;
++}
++
++void
++bts_unload_script(bts_t* bts_fp)
++{
++ FILE* fp = (FILE*)bts_fp;
++
++ if (NULL != fp) {
++ fclose(fp);
++ }
++}
++
+--- bluez-utils-3.1/tools/Makefile.am.orig 2006-07-23 14:06:59.000000000 +0200
++++ bluez-utils-3.1/tools/Makefile.am 2006-07-23 14:07:18.000000000 +0200
+@@ -45,7 +45,7 @@
+
+ noinst_PROGRAMS = hcisecfilter ppporc
+
+-hciattach_SOURCES = hciattach.c hciattach_st.c
++hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c
+ hciattach_LDADD = @BLUEZ_LIBS@
+
+ hciconfig_SOURCES = hciconfig.c csr.h csr.c
============================================================
--- packages/bluez/bluez-utils_3.33.bb bd21943c7ca29d617bfd9492d34e92de11134575
+++ packages/bluez/bluez-utils_3.33.bb bd21943c7ca29d617bfd9492d34e92de11134575
@@ -0,0 +1,55 @@
+require bluez-utils3.inc
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --disable-alsa \
+ --disable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+CONFFILES_${PN} = " \
+ ${sysconfdir}/bluetooth/hcid.conf \
+ ${sysconfdir}/default/bluetooth \
+ "
+
+CONFFILES_${PN}-compat = " \
+ ${sysconfdir}/bluetooth/rfcomm.conf \
+ "
+
+PACKAGES =+ "bluez-audio"
+
+FILES_${%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r3f37d09caa1458ff05bbfdf2d47ff7dfc82d2f10 -rfcaa336068b9697eb2e8236103ae4865056796c1
#
#
#
# delete "packages/apex/apex-nslu2-1.5.8"
#
# delete "packages/apex/apex-nslu2-1.5.8/defconfig"
#
# delete "packages/apex/apex-nslu2-16mb-1.5.8"
#
# delete "packages/apex/apex-nslu2-16mb-1.5.8/defconfig"
#
# delete "packages/apex/apex-nslu2-16mb_1.5.8.bb"
#
# delete "packages/apex/apex-nslu2_1.5.8.bb"
#
# rename "packages/apex/apex-env_1.5.13.bb"
# to "packages/apex/apex-env_1.5.14.bb"
#
# rename "packages/apex/apex-nslu2-1.5.13"
# to "packages/apex/apex-nslu2-1.5.14"
#
# rename "packages/apex/apex-nslu2-16mb-1.5.13"
# to "packages/apex/apex-nslu2-16mb-1.5.14"
#
# rename "packages/apex/apex-nslu2-16mb_1.5.13.bb"
# to "packages/apex/apex-nslu2-16mb_1.5.14.bb"
#
# rename "packages/apex/apex-nslu2_1.5.13.bb"
# to "packages/apex/apex-nslu2_1.5.14.bb"
#
# add_dir "packages/freesmartphone/frameworkd"
#
# add_dir "packages/freesmartphone/frameworkd/om-gta02"
#
# add_file "packages/dropbear/dropbear-0.51/no-host-lookup.patch"
# content [a4988c75a94c31c13218511a9c00f72a944849d9]
#
# add_file "packages/freesmartphone/frameworkd/frameworkd"
# content [f1cbedf0f6d51a7bb5f05cef6a71e28531f064db]
#
# add_file "packages/freesmartphone/frameworkd/frameworkd.conf"
# content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
#
# add_file "packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf"
# content [658db2f7fe7fe3928fc05e76a952a169b2bc9c64]
#
# add_file "packages/freesmartphone/frameworkd_git.bb"
# content [bf243f9340ade510c77ae6438ab331a53e498bfb]
#
# add_file "packages/lcd4linux/files/libusb-compat.diff"
# content [fa0cc8a51d2f9e70cb2d500ad1f7fc8a5bab00a1]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/fix-dispc-clocks.patch"
# content [d4754ea80e0f0bdb6d98843867b0505738c47471]
#
# patch "conf/distro/include/fso-autorev.inc"
# from [e1b0456452cc19ca7b0be9d08342f5254aeb8618]
# to [d5c69660919c5a3424379a0705eeaa21c0220e0e]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [337718e35e20ddb11e0cbf618f12f0c7818e3405]
# to [6d5bc1b8492128dba5438635e85ece76202ee397]
#
# patch "conf/machine/davinci-dvevm.conf"
# from [9530fb28d85fd4598e3dbdb4fbae20cda4e983e5]
# to [fc1df96b8886e6db104be2687885c7947b76452d]
#
# patch "conf/machine/davinci-sffsdr.conf"
# from [3b4784ac301d7f628129f269d9e9420fe71d44be]
# to [be522fecc7b21c6304b0e1afb6a2572c608667a7]
#
# patch "packages/apex/apex-env_1.5.14.bb"
# from [359fb1dbc4e89bd1fa66fbbfdb2b96f46db67097]
# to [cdfe2857ee8d53ed638a0c59d277b10836e771bf]
#
# patch "packages/apex/apex-nslu2-16mb_1.5.14.bb"
# from [d13cace235a834af614789e2565e82f20efe237e]
# to [e66601fff19b5d7a7b205bdf34659ceb7088b71e]
#
# patch "packages/apex/apex-nslu2_1.5.14.bb"
# from [df2de59d3c83a0d3d5904cc5096a51b237c8a62e]
# to [8489eecbdb57d0746f9fe1725fc0fe555f9d3e8c]
#
# patch "packages/dropbear/dropbear_0.51.bb"
# from [a4301884c313f620730585fd24ee66b6cc27dded]
# to [867899cae1259828b125f4f85cfef68825f2eeed]
#
# patch "packages/gdb/gdb-cross-sdk_6.8.bb"
# from [5a17d4bb8b6c6ca0898a2259915958824f5a1f26]
# to [bc7fd33d3623d6dba25375741cce9ac6178e24fd]
#
# patch "packages/lcd4linux/lcd4linux_0.10.0.bb"
# from [02f2636911d463e26528fe113ecd38dbc9eee95f]
# to [88dad79f87ed32ec0895aa8c75781aea20ad1307]
#
# patch "packages/libusb/libusb1_0.9.0.bb"
# from [d74bef59c611e01bb983c9c2f67f52485a89846d]
# to [a977b91549cceea4f52b08ffa82e045f1f21e109]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [578677c5bf9ddbd4891e17732466d071c86b1090]
# to [0fd69a8856fcd40e868ab5e308dc566f0a0a24f2]
#
# patch "packages/meta/meta-toolchain.bb"
# from [653be1fcb3f433216d391a1e48cde9fd4e56e7a3]
# to [e86aa883e47c8340b87069c5e5bd23c81b3ee28e]
#
============================================================
--- packages/dropbear/dropbear-0.51/no-host-lookup.patch a4988c75a94c31c13218511a9c00f72a944849d9
+++ packages/dropbear/dropbear-0.51/no-host-lookup.patch a4988c75a94c31c13218511a9c00f72a944849d9
@@ -0,0 +1,12 @@
+diff -urN dropbear-0.51/options.h dropbear-0.51.new/options.h
+--- dropbear-0.51/options.h 2008-03-27 14:34:39.000000000 +0100
++++ dropbear-0.51.new/options.h 2008-06-22 00:22:09.000000000 +0200
+@@ -112,7 +112,7 @@
+ /* #define DSS_PROTOK */
+
+ /* Whether to do reverse DNS lookups. */
+-#define DO_HOST_LOOKUP
++/* #define DO_HOST_LOOKUP */
+
+ /* Whether to print the message of the day (MOTD). This doesn't add much code
+ * size */
============================================================
--- packages/freesmartphone/frameworkd/frameworkd f1cbedf0f6d51a7bb5f05cef6a71e28531f064db
+++ packages/freesmartphone/frameworkd/frameworkd f1cbedf0f6d51a7bb5f05cef6a71e28531f064db
@@ -0,0 +1,40 @@
+#! /bin/sh
+#
+# frameworkd -- This shell script starts and stops the freemsmartphone.org framework daemon.
+#
+# chkconfig: 345 90 20
+# description: frameworkd is the freesmartphone.org framework daemon
+# processname: python
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+NAME=frameworkd
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+
+case "$1" in
+ start)
+ echo -n "Starting freesmartphone.org framework daemon: "
+ start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/frameworkd
+ if [ $? = 0 ]; then
+ echo "(ok)"
+ else
+ echo "(failed)"
+ fi
+ ;;
+ stop)
+ echo -n "Stopping freesmartphone.org framework daemon: "
+ start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo
+ rm -f /var/run/${NAME}.pid
+ echo "(done)"
+ ;;
+ restart|force-reload)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "Usage: /etc/init.d/odeviced {start|stop|restart|force-reload}"
+ exit 1
+ ;;
+esac
+
+exit 0
============================================================
--- packages/freesmartphone/frameworkd/frameworkd.conf da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ packages/freesmartphone/frameworkd/frameworkd.conf da39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf 658db2f7fe7fe3928fc05e76a952a169b2bc9c64
+++ packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf 658db2f7fe7fe3928fc05e76a952a169b2bc9c64
@@ -0,0 +1,8 @@
+[idlenotifier]
+# don't read from accellerometers for now
+ignoreinput=2,3
+
+[input]
+# don't read from accellerometers for now
+ignoreinput=2,3
+
============================================================
--- packages/freesmartphone/frameworkd_git.bb bf243f9340ade510c77ae6438ab331a53e498bfb
+++ packages/freesmartphone/frameworkd_git.bb bf243f9340ade510c77ae6438ab331a53e498bfb
@@ -0,0 +1,37 @@
+DESCRIPTION = "The freesmartphon.org Framework Daemon"
+HOMEPAGE = "http://www.freesmartphone.org"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
+SECTION = "console/network"
+DEPENDS = "python-cython-native python-pyrex-native"
+LICENSE = "GPL"
+PV = "0.8.0+gitr${SRCREV}"
+PR = "r0"
+
+inherit distutils update-rc.d
+
+INITSCRIPT_NAME = "frameworkd"
+INITSCRIPT_PARAMS = "defaults 29"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \
+ file://frameworkd \
+ file://frameworkd.conf"
+S = "${WORKDIR}/git"
+
+do_install_append() {
+ install -d ${D}${sysconfdir}/init.d/
+ install -m 0755 ${WORKDIR}/frameworkd ${D}${sysconfdir}/init.d/
+ install -m 0644 ${WORKDIR}/frameworkd.conf ${D}${sysconfdir}
+ install -d ${D}${sysconfdir}/dbus-1/system.d/
+ mv -f ${D}${datadir}/etc/dbus-1/system.d/frameworkd.conf ${D}${sysconfdir}/dbus-1/system.d/
+}
+
+RDEPENDS_${PN} += "\
+ python-dbus \
+ python-pygobject \
+ python-pyrtc \
+ python-pyserial \
+ python-syslog \
+"
+
+FILES_${PN} += "${sysconfdir}"
+FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/framework/subsystems/*/.debug"
============================================================
--- packages/lcd4linux/files/libusb-compat.diff fa0cc8a51d2f9e70cb2d500ad1f7fc8a5bab00a1
+++ packages/lcd4linux/files/libusb-compat.diff fa0cc8a51d2f9e70cb2d500ad1f7fc8a5bab00a1
@@ -0,0 +1,95 @@
+diff -Nurd lcd4linux-0.10.1-RC2.orig/drv_BWCT.c lcd4linux-0.10.1-RC2/drv_BWCT.c
+--- lcd4linux-0.10.1-RC2.orig/drv_BWCT.c 2007-02-25 13:39:09.000000000 +0100
++++ lcd4linux-0.10.1-RC2/drv_BWCT.c 2008-06-22 11:57:01.000000000 +0200
+@@ -72,7 +72,6 @@
+ static usb_dev_handle *lcd;
+ static int interface;
+
+-extern int usb_debug;
+ extern int got_signal;
+
+
+@@ -89,7 +88,6 @@
+
+ info("%s: scanning USB for BWCT LCD...", Name);
+
+- usb_debug = 0;
+
+ usb_init();
+ usb_find_busses();
+diff -Nurd lcd4linux-0.10.1-RC2.orig/drv_LCD2USB.c lcd4linux-0.10.1-RC2/drv_LCD2USB.c
+--- lcd4linux-0.10.1-RC2.orig/drv_LCD2USB.c 2007-02-25 13:39:10.000000000 +0100
++++ lcd4linux-0.10.1-RC2/drv_LCD2USB.c 2008-06-22 11:57:47.000000000 +0200
+@@ -98,7 +98,6 @@
+ static usb_dev_handle *lcd;
+ static int controllers = 0;
+
+-extern int usb_debug;
+ extern int got_signal;
+
+ /****************************************/
+@@ -120,7 +119,6 @@
+ if (device_id != NULL)
+ info("%s: scanning for device id: %s", Name, device_id);
+
+- usb_debug = 0;
+
+ usb_init();
+ usb_find_busses();
+diff -Nurd lcd4linux-0.10.1-RC2.orig/drv_picoLCD.c lcd4linux-0.10.1-RC2/drv_picoLCD.c
+--- lcd4linux-0.10.1-RC2.orig/drv_picoLCD.c 2007-02-25 13:39:10.000000000 +0100
++++ lcd4linux-0.10.1-RC2/drv_picoLCD.c 2008-06-22 11:58:10.000000000 +0200
+@@ -75,7 +75,6 @@
+ static char *BufPtr;
+
+ static usb_dev_handle *lcd;
+-extern int usb_debug;
+
+
+
+@@ -97,7 +96,6 @@
+
+ info("%s: scanning for picoLCD...", Name);
+
+- usb_debug = 0;
+
+ usb_init();
+ usb_find_busses();
+diff -Nurd lcd4linux-0.10.1-RC2.orig/drv_Trefon.c lcd4linux-0.10.1-RC2/drv_Trefon.c
+--- lcd4linux-0.10.1-RC2.orig/drv_Trefon.c 2007-02-25 13:39:10.000000000 +0100
++++ lcd4linux-0.10.1-RC2/drv_Trefon.c 2008-06-22 11:58:50.000000000 +0200
+@@ -72,7 +72,6 @@
+ static usb_dev_handle *lcd;
+ static int interface;
+
+-extern int usb_debug;
+
+
+ /****************************************/
+@@ -88,7 +87,6 @@
+
+ info("%s: scanning USB for TREFON LCD...", Name);
+
+- usb_debug = 0;
+
+ usb_init();
+ usb_find_busses();
+diff -Nurd lcd4linux-0.10.1-RC2.orig/drv_USBLCD.c lcd4linux-0.10.1-RC2/drv_USBLCD.c
+--- lcd4linux-0.10.1-RC2.orig/drv_USBLCD.c 2007-02-25 13:39:10.000000000 +0100
++++ lcd4linux-0.10.1-RC2/drv_USBLCD.c 2008-06-22 11:58:57.000000000 +0200
+@@ -86,7 +86,6 @@
+ static usb_dev_handle *lcd;
+ static int interface;
+
+-extern int usb_debug;
+
+ #endif
+
+@@ -107,7 +106,6 @@
+
+ info("%s: scanning for USBLCD...", Name);
+
+- usb_debug = 0;
+
+ usb_init();
+ usb_find_busses();
============================================================
--- packages/linux/linux-omap2-git/beagleboard/fix-dispc-clocks.patch d4754ea80e0f0bdb6d98843867b0505738c47471
+++ packages/linux/linux-omap2-git/beagleboard/fix-dispc-clocks.patch d4754ea80e0f0bdb6d98843867b0505738c47471
@@ -0,0 +1,147 @@
+From linux-omap-owner at vger.kernel.org Sun Jun 22 10:11:39 2008
+Received: from localhost
+ ([127.0.0.1] helo=dominion ident=koen)
+ by dominion.dominion.void with esmtp (Exim 4.63)
+ (envelope-from <linux-omap-owner at vger.kernel.org>)
+ id 1KAKfj-0008Qc-FC
+ for koen at localhost; Sun, 22 Jun 2008 10:11:39 +0200
+Received: from xs.service.utwente.nl [130.89.5.250]
+ by dominion with POP3 (fetchmail-6.3.6)
+ for <koen at localhost> (single-drop); Sun, 22 Jun 2008 10:11:39 +0200 (CEST)
+Received: from mail.service.utwente.nl ([130.89.5.253]) by exchange.service.utwente.nl with Microsoft SMTPSVC(6.0.3790.3959);
+ Sat, 21 Jun 2008 19:06:02 +0200
+Received: from smtp.utwente.nl ([130.89.2.9]) by mail.service.utwente.nl with Microsoft SMTPSVC(6.0.3790.3959);
+ Sat, 21 Jun 2008 19:06:01 +0200
+Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
+ by smtp.utwente.nl (8.12.10/SuSE Linux 0.7) with ESMTP id m5LH5TSm026212
+ for <k.kooi at student.utwente.nl>; Sat, 21 Jun 2008 19:05:30 +0200
+Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
+ id S1753396AbYFURFN (ORCPT <rfc822;k.kooi at student.utwente.nl>);
+ Sat, 21 Jun 2008 13:05:13 -0400
+Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1753305AbYFURFN
+ (ORCPT <rfc822;linux-omap-outgoing>);
+ Sat, 21 Jun 2008 13:05:13 -0400
+Received: from utopia.booyaka.com ([72.9.107.138]:41675 "EHLO
+ utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
+ with ESMTP id S1753145AbYFURFL (ORCPT
+ <rfc822;linux-omap at vger.kernel.org>); Sat, 21 Jun 2008 13:05:11 -0400
+Received: (qmail 20532 invoked by uid 526); 21 Jun 2008 17:05:10 -0000
+Date: Sat, 21 Jun 2008 11:05:10 -0600 (MDT)
+From: Paul Walmsley <paul at pwsan.com>
+To: "Gadiyar, Anand" <gadiyar at ti.com>,
+ "linux-omap at vger.kernel.org" <linux-omap at vger.kernel.org>
+cc: Dirk Behme <dirk.behme at googlemail.com>,
+ "jouni.hogander at nokia.com" <jouni.hogander at nokia.com>
+Subject: [PATCH] OMAP3 clock: fix omap2_clk_wait_ready for OMAP3430ES2 DSS
+In-Reply-To: <5A47E75E594F054BAF48C5E4FC4B92AB022BB66209 at dbde02.ent.ti.com>
+Message-ID: <alpine.DEB.1.00.0806211054100.19765 at utopia.booyaka.com>
+References: <5A47E75E594F054BAF48C5E4FC4B92AB022BE46296 at dbde02.ent.ti.com>,<485CA347.909 at googlemail.com> <5A47E75E594F054BAF48C5E4FC4B92AB022BB66209 at dbde02.ent.ti.com>
+User-Agent: Alpine 1.00 (DEB 882 2007-12-20)
+MIME-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+Sender: linux-omap-owner at vger.kernel.org
+Precedence: bulk
+List-ID: <linux-omap.vger.kernel.org>
+X-Mailing-List: linux-omap at vger.kernel.org
+X-UTwente-MailScanner-Information: Scanned by MailScanner. Contact servicedesk at icts.utwente.nl for more information.
+X-UTwente-MailScanner: Found to be clean
+X-UTwente-MailScanner-From: linux-omap-owner at vger.kernel.org
+X-Spam-Status: No
+X-OriginalArrivalTime: 21 Jun 2008 17:06:02.0187 (UTC) FILETIME=[157001B0:01C8D3C1]
+
+
+On OMAP3430ES2, DSS has both an initiator standby CM_IDLEST bit, and a
+target idle CM_IDLEST bit. This is a departure from previous silicon,
+which only had an initiator standby bit.
+
+This means we need to test the target idle bit after enabling
+dss1_alwon_fclk. Previous clock code has done the wrong thing since ES2
+came out: it's either tested the wrong bit, causing intermittent
+
+ Clock dss1_alwon_fck didn't enable in 100000 tries
+
+messages; or not tested anything at all, causing intermittent crashes
+during DISPC initialization with:
+
+ Unhandled fault: external abort on non-linefetch (0x1028)
+
+This patch modifies omap2_clk_wait_ready() to wait for the DSS to become
+accessible after dss1_alwon_fclk is enabled.
+
+Thanks to Anand Gadiyar <gadiyar at ti.com> for identifying one of the
+problem patches.
+
+Signed-off-by: Paul Walmsley <paul at pwsan.com>
+---
+
+ arch/arm/mach-omap2/clock.c | 30 ++++++++++++++++++++++++------
+ arch/arm/mach-omap2/cm-regbits-34xx.h | 4 +++-
+ 2 files changed, 27 insertions(+), 7 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
+index ed15868..1820f75 100644
+--- a/arch/arm/mach-omap2/clock.c
++++ b/arch/arm/mach-omap2/clock.c
+@@ -244,18 +244,36 @@ static void omap2_clk_wait_ready(struct clk *clk)
+ }
+
+ /* REVISIT: What are the appropriate exclusions for 34XX? */
+- /* OMAP3: ignore DSS-mod clocks */
+- if (cpu_is_omap34xx() &&
+- ((reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(OMAP3430_DSS_MOD, 0) ||
+- (((reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(CORE_MOD, 0)) &&
+- clk->enable_bit == OMAP3430_EN_SSI_SHIFT)))
+- return;
++ if (cpu_is_omap34xx()) {
++
++ /* 3430ES1 DSS and SSI have no target idlest bits */
++ if (is_sil_rev_equal_to(OMAP3430_REV_ES1_0) &&
++ ((reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(OMAP3430_DSS_MOD, 0) ||
++ ((reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(CORE_MOD, 0) &&
++ clk->enable_bit == OMAP3430_EN_SSI_SHIFT)))
++ return;
++
++ /* Even for 3430ES2 DSS, only wait for dss1_alwon_fclk */
++ if (is_sil_rev_greater_than(OMAP3430_REV_ES1_0) &&
++ (reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(OMAP3430_DSS_MOD, 0) &&
++ clk->enable_bit != OMAP3430_EN_DSS1_SHIFT)
++ return;
++
++ }
+
+ /* Check if both functional and interface clocks
+ * are%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list