aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2006-06-16 08:55:41 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-06-16 08:55:41 +0000
commita9c3cb833444f85e0913a1ad00773c048755dc14 (patch)
tree94d7ba30f845833cda1afb2591643a89ca555cf4
parent79550c1b518c69df0f6821dd188ac4eb7e36a27f (diff)
downloadopenembedded-a9c3cb833444f85e0913a1ad00773c048755dc14.tar.gz
linux-openzaurus: added pcnet_cs patch, added me to maintainers
- 10-pcnet.patch adds TrendNet Ethernet card into pcnet_cs driver (merged upstream) - added myself into list of Maintainers - changed SRC_URI a bit: - restructured order of few hack patches - added 'status' field for few patches
-rw-r--r--packages/linux/linux-openzaurus-2.6.16/10-pcnet.patch27
-rw-r--r--packages/linux/linux-openzaurus.inc4
-rw-r--r--packages/linux/linux-openzaurus_2.6.16.bb21
3 files changed, 44 insertions, 8 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.16/10-pcnet.patch b/packages/linux/linux-openzaurus-2.6.16/10-pcnet.patch
new file mode 100644
index 0000000000..2e1966e837
--- /dev/null
+++ b/packages/linux/linux-openzaurus-2.6.16/10-pcnet.patch
@@ -0,0 +1,27 @@
+
+From: Marcin Juszkiewicz <openembedded@hrw.one.pl>
+
+Add TRENDnet TE-CF100 ethernet adapter to pcnet_cs list.
+
+product info: "Fast Ethernet", "CF Size PC Card", "1.0", ""
+ manfid: 0x0149, 0xc1ab
+
+Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
+
+ drivers/net/pcmcia/pcnet_cs.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: netdev-2.6/drivers/net/pcmcia/pcnet_cs.c
+===================================================================
+--- netdev-2.6.orig/drivers/net/pcmcia/pcnet_cs.c 2006-05-18 11:06:43.294022480 +0200
++++ netdev-2.6/drivers/net/pcmcia/pcnet_cs.c 2006-05-18 11:10:31.548322552 +0200
+@@ -1768,6 +1768,8 @@
+ PCMCIA_DEVICE_CIS_PROD_ID12("NDC", "Ethernet", 0x01c43ae1, 0x00b2e941, "NE2K.cis"),
+ PCMCIA_DEVICE_CIS_PROD_ID12("PMX ", "PE-200", 0x34f3f1c8, 0x10b59f8c, "PE-200.cis"),
+ PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "tamarack.cis"),
++ PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0",
++ 0xb4be14e3, 0x43ac239b, 0x0877b627),
+ PCMCIA_DEVICE_NULL
+ };
+ MODULE_DEVICE_TABLE(pcmcia, pcnet_ids);
+
diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc
index 64da31ea7a..984002784a 100644
--- a/packages/linux/linux-openzaurus.inc
+++ b/packages/linux/linux-openzaurus.inc
@@ -1,6 +1,8 @@
DESCRIPTION = "2.6 Linux Development Kernel for Zaurus devices and iPAQ hx2750."
SECTION = "kernel"
-MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, Michael 'Mickey' Lauer <mickey@vanille.de>"
+MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, \
+ Michael 'Mickey' Lauer <mickey@vanille.de>, \
+ Marcin 'Hrw' Juszkiewicz <openembedded@hrw.one.pl>"
LICENSE = "GPL"
inherit kernel
diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb
index b0a0a6c0e7..f64fcf77dc 100644
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@ -1,6 +1,6 @@
include linux-openzaurus.inc
-PR = "r37"
+PR = "r38"
# Handy URLs
# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -13,6 +13,7 @@ PR = "r37"
# Patches submitted upstream are towards top of this list
# Hacks should clearly named and at the bottom
SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
+ \
file://rmk-mmc1.patch;patch=1;status=merged \
file://rmk-mmc2.patch;patch=1;status=merged \
${RPSRC}/led_core-r15.patch;patch=1;status=merged \
@@ -61,9 +62,13 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
${RPSRC}/backlight_sysfs_fix-r0.patch;patch=1;status=merged \
${RPSRC}/pxaohci_pwrlimit-r0.patch;patch=1;status=merged \
${RPSRC}/mmc_oops_fix-r1.patch;patch=1;status=merged \
+ file://00-hostap.patch;patch=1;status=merged \
+ file://10-pcnet.patch;patch=1;status=merged \
+ \
${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \
${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \
${RPSRC}/poodle_partsize-r0.patch;patch=1;status=pending \
+ \
${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \
${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \
${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \
@@ -86,22 +91,24 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \
${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \
${DOSRC}/kexec-arm-r2.patch;patch=1 \
- ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
- ${RPSRC}/poodle_ts_hack-r0.patch;patch=1 \
${RPSRC}/integrator_rgb-r0.patch;patch=1 \
${RPSRC}/logo_oh-r0.patch.bz2;patch=1 \
${RPSRC}/logo_oz-r1.patch.bz2;patch=1 \
file://add-oz-release-string.patch;patch=1 \
- file://pxa-serial-hack.patch;patch=1 \
${RPSRC}/pxa-linking-bug.patch;patch=1 \
file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
- file://connectplus-remove-ide-HACK.patch;patch=1 \
file://hrw-pcmcia-ids-r2.patch;patch=1 \
- file://00-hostap.patch;patch=1 \
file://locomo-kbd-hotkeys.patch;patch=1 \
file://locomo-sysrq+keyrepeat.patch;patch=1 \
file://locomo-lcd-def-bightness.patch;patch=1 \
- file://squashfs3.0-2.6.15.patch;patch=1 \
+ \
+ file://pxa-serial-hack.patch;patch=1;status=hack \
+ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
+ ${RPSRC}/poodle_ts_hack-r0.patch;patch=1;status=hack \
+ file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
+ \
+ file://squashfs3.0-2.6.15.patch;patch=1;status=external \
+ \
file://defconfig-c7x0 \
file://defconfig-ipaq-pxa270 \
file://defconfig-collie \