summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Bompart <frederic@unknown.openembedded.org>2006-02-20 14:42:46 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-02-20 14:42:46 +0000
commitbfbf756a212041e4ab772ea1c24064a9d3f133d8 (patch)
tree085331f47b2ea65f9e9c69207f49ff15ddf1e6a8
parentdf2798e7b8b0f32597b700eabaa6167cf92f8a2f (diff)
disapproval of revision 'd36f69289f03c75db72375cba8d47b713a10221e'
-rw-r--r--packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/defconfig-simpad2
-rw-r--r--packages/linux/opensimpad-2.4.27-vrs1-pxa1-jpm1/defconfig-simpad2
-rw-r--r--packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb4
-rw-r--r--packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb4
4 files changed, 4 insertions, 8 deletions
diff --git a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/defconfig-simpad b/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/defconfig-simpad
index da3037f465..dd67df8a5b 100644
--- a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/defconfig-simpad
+++ b/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/defconfig-simpad
@@ -560,7 +560,7 @@ CONFIG_NETDEVICES=y
CONFIG_DUMMY=m
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
-CONFIG_TUN=m
+# CONFIG_TUN is not set
# CONFIG_ETHERTAP is not set
#
diff --git a/packages/linux/opensimpad-2.4.27-vrs1-pxa1-jpm1/defconfig-simpad b/packages/linux/opensimpad-2.4.27-vrs1-pxa1-jpm1/defconfig-simpad
index ed09ffbf0a..ebeab96e23 100644
--- a/packages/linux/opensimpad-2.4.27-vrs1-pxa1-jpm1/defconfig-simpad
+++ b/packages/linux/opensimpad-2.4.27-vrs1-pxa1-jpm1/defconfig-simpad
@@ -561,7 +561,7 @@ CONFIG_NETDEVICES=y
CONFIG_DUMMY=m
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
-CONFIG_TUN=m
+# CONFIG_TUN is not set
# CONFIG_ETHERTAP is not set
#
diff --git a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
index fd5d161cc1..e846f7f17a 100644
--- a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
@@ -6,7 +6,7 @@ KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
VRSV = "${@bb.data.getVar('PV',d,True).split('-')[1]}"
PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}"
JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}"
-PR = "r22"
+PR = "r21"
FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
@@ -28,8 +28,6 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
file://simpad-pm-updates.patch;patch=1;pnum=0 \
file://support-128mb-ram.patch;patch=1 \
file://mmc-spi.patch;patch=1 \
- file://iw249_we17-13.diff;patch=1 \
- file://iw240_we18-5.diff;patch=1 \
"
# apply this when we have a patch that allows building with gcc 3.x:
diff --git a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
index fff45f20e9..18327a09b2 100644
--- a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
@@ -7,7 +7,7 @@ VRSV = "${@bb.data.getVar('PV',d,True).split('-')[1]}"
PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}"
JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}"
USBV= "usb20040610"
-PR = "r4"
+PR = "r3"
FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
@@ -34,8 +34,6 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
file://mppe-20040216.patch;patch=1 \
file://sa1100-usb-tcl1.patch;patch=1 \
file://mmc-spi.patch;patch=1 \
- file://iw249_we17-13.diff;patch=1 \
- file://iw240_we18-5.diff;patch=1 \
"
# This applies right after the jpm patch but is useless until we
# have sa1100_udc.c