summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-03-09 23:08:08 +0000
committerRod Whitby <rod@whitby.id.au>2007-03-09 23:08:08 +0000
commit67312f42893043c9c86cd06eb37832d8fc7c9bcd (patch)
treecf289aa8bb2bd74923b7cb006903ba88b8ebf3ea
parentf0538870969c76fea25d8c0b119a28ee6d20268c (diff)
parentbd880b0b46465d3c10e9d8ebc46bc57e672b1238 (diff)
merge of '6aeac16d88adfacea342067ea5b2bc44f9f19ddc'
and 'b2d9cd46c2dfa6e43c84754934f6b089af67c1d8'
-rw-r--r--packages/libftdi/files/ftdi_eeprom-0.2-moko.patch16
-rw-r--r--packages/libftdi/ftdi-eeprom-native_0.2.bb8
-rw-r--r--packages/libftdi/ftdi-eeprom_0.2.bb13
-rw-r--r--packages/libftdi/libftdi_0.8.bb2
-rw-r--r--packages/tasks/task-mokogateway.bb10
5 files changed, 48 insertions, 1 deletions
diff --git a/packages/libftdi/files/ftdi_eeprom-0.2-moko.patch b/packages/libftdi/files/ftdi_eeprom-0.2-moko.patch
new file mode 100644
index 0000000000..ae0ee6235a
--- /dev/null
+++ b/packages/libftdi/files/ftdi_eeprom-0.2-moko.patch
@@ -0,0 +1,16 @@
+--- ftdi_eeprom-0.2/ftdi_eeprom/main.c 2004-03-25 19:58:08.000000000 +0100
++++ ftdi_eeprom-0.2-moko/ftdi_eeprom/main.c 2007-02-16 01:23:40.000000000 +0100
+@@ -135,8 +135,11 @@
+
+ i = ftdi_usb_open(&ftdi, 0x0403, 0x6001);
+ if (i != 0) {
+- printf("Sorry, unable to find FTDI USB chip\n");
+- exit (-1);
++ i = ftdi_usb_open(&ftdi, 0x0403, 0x6010);
++ if (i != 0) {
++ printf("Sorry, unable to find FTDI USB chip\n");
++ exit (-1);
++ }
+ }
+ }
+ }
diff --git a/packages/libftdi/ftdi-eeprom-native_0.2.bb b/packages/libftdi/ftdi-eeprom-native_0.2.bb
new file mode 100644
index 0000000000..1b48bd08f7
--- /dev/null
+++ b/packages/libftdi/ftdi-eeprom-native_0.2.bb
@@ -0,0 +1,8 @@
+require ftdi-eeprom_${PV}.bb
+
+DEPENDS = "libftdi-native confuse-native"
+
+do_stage() {
+ install -m 0755 ftdi_eeprom/ftdi_eeprom ${STAGING_BINDIR_NATIVE}
+}
+
diff --git a/packages/libftdi/ftdi-eeprom_0.2.bb b/packages/libftdi/ftdi-eeprom_0.2.bb
new file mode 100644
index 0000000000..c71ac8d0c3
--- /dev/null
+++ b/packages/libftdi/ftdi-eeprom_0.2.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "ftdi-eeprom is a flashing utility for FTDI chips."
+HOMEPAGE = "http://www.intra2net.com/de/produkte/opensource/ftdi"
+LICENSE = "GPL"
+DEPENDS = "libftdi confuse"
+PR = "r1"
+
+SRC_URI = "http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/ftdi_eeprom-${PV}.tar.gz \
+ file://ftdi_eeprom-0.2-moko.patch;patch=1"
+S = "${WORKDIR}/ftdi_eeprom-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-docs"
diff --git a/packages/libftdi/libftdi_0.8.bb b/packages/libftdi/libftdi_0.8.bb
index f7426ceb1a..451d2e302f 100644
--- a/packages/libftdi/libftdi_0.8.bb
+++ b/packages/libftdi/libftdi_0.8.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/libftdi-${PV
file://doxygen-configure.patch;patch=1"
S = "${WORKDIR}/libftdi-${PV}"
-inherit autotools
+inherit autotools binconfig pkgconfig lib_package
EXTRA_OECONF = "--disable-docs"
diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb
index 2f7668b36a..4fbf450cdf 100644
--- a/packages/tasks/task-mokogateway.bb
+++ b/packages/tasks/task-mokogateway.bb
@@ -14,6 +14,7 @@ MOKOGATEWAY_PACKAGES = "\
task-mokogateway-usbnet \
task-mokogateway-bluetooth \
task-mokogateway-wifi \
+ task-mokogateway-debug \
"
RDEPENDS_task-mokogateway-everything = "${MOKOGATEWAY_PACKAGES}"
@@ -65,3 +66,12 @@ RRECOMMENDS_task-mokogateway-wifi = "\
${@base_contains("COMBINED_FEATURES", "usbhost", "zd1211-firmware", "",d)} \
"
+DESCRIPTION_task-mokogateway-debug = "MokoGateway: Debug"
+RDEPENDS_task-mokogateway-debug = "\
+ dfu-util \
+ ftdi-eeprom \
+ openocd \
+"
+RRECOMMENDS_task-mokogateway-debug = "\
+"
+