summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2005-04-20 22:13:49 +0000
committerMichael Lauer <mickey@vanille-media.de>2005-04-20 22:13:49 +0000
commit739fc4c85d231a2297b488d9bf66d958293afc21 (patch)
tree2707896401c239ad82aa1a5331d39bc7a8f7d464 /packages/linux
parenta5c12aed368a43233c2afc6703814312c77ad09e (diff)
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/04/21 00:13:40+02:00 uni-frankfurt.de!mickeyl c7x0 2.6.x kernels: apply a serial hack to allow coexistence of pxa_serial and 8250 (necessary for GPS, BlueTooth, and serial cards like that) BKrev: 4266d41dy8idO1gAancbpU1QKx7cpQ
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/linux-openzaurus-2.6.11/pxa-serial-hack.patch0
-rw-r--r--packages/linux/linux-openzaurus-2.6.12-rc2-mm3/defconfig-c7x08
-rw-r--r--packages/linux/linux-openzaurus-2.6.12-rc2-mm3/pxa-serial-hack.patch0
-rw-r--r--packages/linux/linux-openzaurus_2.6.11.bb3
-rw-r--r--packages/linux/linux-openzaurus_2.6.12-rc2-mm3.bb3
5 files changed, 8 insertions, 6 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.11/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.11/pxa-serial-hack.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-openzaurus-2.6.11/pxa-serial-hack.patch
diff --git a/packages/linux/linux-openzaurus-2.6.12-rc2-mm3/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.12-rc2-mm3/defconfig-c7x0
index 0827aed09d..ad54ef9560 100644
--- a/packages/linux/linux-openzaurus-2.6.12-rc2-mm3/defconfig-c7x0
+++ b/packages/linux/linux-openzaurus-2.6.12-rc2-mm3/defconfig-c7x0
@@ -378,16 +378,16 @@ CONFIG_BT_SCO=m
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
+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_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIBT3C=m
CONFIG_BT_HCIBLUECARD=m
diff --git a/packages/linux/linux-openzaurus-2.6.12-rc2-mm3/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.12-rc2-mm3/pxa-serial-hack.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-openzaurus-2.6.12-rc2-mm3/pxa-serial-hack.patch
diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb
index ea436d34ad..a41f2c95da 100644
--- a/packages/linux/linux-openzaurus_2.6.11.bb
+++ b/packages/linux/linux-openzaurus_2.6.11.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
KV = "${@bb.data.getVar('PV',d,True)}"
-PR = "r14"
+PR = "r15"
DOSRC = "http://www.do13.in-berlin.de/openzaurus"
RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -66,6 +66,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \
file://add-oz-release-string.patch;patch=1 \
file://add-elpp-stuff.patch;patch=1 \
+ file://pxa-serial-hack.patch;patch=1 \
${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \
file://defconfig-c7x0 \
file://defconfig-collie \
diff --git a/packages/linux/linux-openzaurus_2.6.12-rc2-mm3.bb b/packages/linux/linux-openzaurus_2.6.12-rc2-mm3.bb
index b9804190f9..465b6c0432 100644
--- a/packages/linux/linux-openzaurus_2.6.12-rc2-mm3.bb
+++ b/packages/linux/linux-openzaurus_2.6.12-rc2-mm3.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
KV = "${@bb.data.getVar('PV',d,True)}"
-PR = "r1"
+PR = "r2"
DOSRC = "http://www.do13.in-berlin.de/openzaurus"
RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -46,6 +46,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \
file://add-oz-release-string.patch;patch=1 \
file://add-elpp-stuff.patch;patch=1 \
+ file://pxa-serial-hack.patch;patch=1 \
${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \
file://defconfig-c7x0 \
file://defconfig-collie \