Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/28 15:04:32+02:00 uni-frankfurt.de!mickeyl
add qte defines for Akita

2005/03/28 14:54:39+02:00 uni-frankfurt.de!mickeyl
add a kernel and a machine configuration for the SHarp SL-C1000 (Akita)

BKrev: 424817a1Q8EjDSZdr_DqqHr9xRSY0Q

22 files changed, 3 insertions, 75 deletions

diff --git a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/1764-1.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/1764-1.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/1764-1.patch
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/1764-1.patch
diff --git a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/bluecard_cs.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/bluecard_cs.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/bluecard_cs.patch
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/bluecard_cs.patch
diff --git a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/compile.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/compile.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/compile.patch
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/compile.patch
diff --git a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/corgi-default-brightness.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/corgi-default-brightness.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/corgi-default-brightness.patch
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/corgi-default-brightness.patch
diff --git a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/corgi-fbcon-logo.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/corgi-fbcon-logo.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/corgi-fbcon-logo.patch
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/corgi-fbcon-logo.patch
diff --git a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/defconfig-spitz b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/defconfig-akita
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/defconfig-spitz
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/defconfig-akita
diff --git a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/deviceinfo.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/defconfig-spitz
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/deviceinfo.patch
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/defconfig-spitz
diff --git a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/disable-pcmcia-probe.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/deviceinfo.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/disable-pcmcia-probe.patch
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/deviceinfo.patch
diff --git a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/enable-sysrq.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/disable-pcmcia-probe.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/enable-sysrq.patch
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/disable-pcmcia-probe.patch
diff --git a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/idecs.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/enable-sysrq.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/idecs.patch
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/enable-sysrq.patch
diff --git a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/initsh.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/idecs.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/initsh.patch
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/idecs.patch
diff --git a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/iw240_we15-6.diff b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/initsh.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/iw240_we15-6.diff
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/initsh.patch
diff --git a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/iw241_we16-6.diff b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/iw240_we15-6.diff
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/iw241_we16-6.diff
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/iw240_we15-6.diff
diff --git a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/keyboard-ctrl+alt.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/iw241_we16-6.diff
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/keyboard-ctrl+alt.patch
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/iw241_we16-6.diff
diff --git a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/keymap-more-sane.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/keyboard-ctrl+alt.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/keymap-more-sane.patch
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/keyboard-ctrl+alt.patch
diff --git a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/logo.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/keymap-more-sane.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/logo.patch
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/keymap-more-sane.patch
diff --git a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/swap-performance.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/logo.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/swap-performance.patch
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/logo.patch
diff --git a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/tosa_ts.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/swap-performance.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openzaurus-spitz-2.4.20-rmk2-embedix20041116/tosa_ts.patch
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/swap-performance.patch
diff --git a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/tosa_ts.patch b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/tosa_ts.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20041116/tosa_ts.patch
diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20041116.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20041116.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20041116.bb
diff --git a/packages/linux/openzaurus-spitz_2.4.20-rmk2-embedix20041116.bb b/packages/linux/openzaurus-spitz_2.4.20-rmk2-embedix20041116.bb
deleted file mode 100644
index 7b38808d82..0000000000
--- a/packages/linux/openzaurus-spitz_2.4.20-rmk2-embedix20041116.bb
+++ /dev/null
@@ -1,74 +0,0 @@
-DESCRIPTION = "Linux kernel for Sharp SL-C3000 processor based devices."
-MAINTAINER = "NOT Michael 'Mickey' Lauer <mickey@Vanille.de>"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-spitz-2.4.20-rmk2-embedix20041116"
-SECTION = "kernel"
-PV = "2.4.20-rmk2-embedix"
-LICENSE = "GPL"
-KV = "2.4.20"
-PR = "r1"
-
-ALLOW_EMPTY_kernel = "1"
-
-SRC_URI = "http://developer.ezaurus.com/sl_j/source/c3000/20041116/linux-c3000-20041116-rom1_01.tar.bz2 \
-           file://swap-performance.patch;patch=1 \
-           file://iw240_we15-6.diff;patch=1 \
-           file://iw241_we16-6.diff;patch=1 \
-           file://bluecard_cs.patch;patch=1 \
-           file://enable-sysrq.patch;patch=1 \
-           file://compile.patch;patch=1 \
-           file://idecs.patch;patch=1 \
-           file://logo.patch;patch=1 \
-           file://initsh.patch;patch=1 \
-           file://keyboard-ctrl+alt.patch;patch=1 \
-           file://keymap-more-sane.patch;patch=1 \
-           file://disable-pcmcia-probe.patch;patch=1 \
-           file://deviceinfo.patch;patch=1 \  
-           file://tosa_ts.patch;patch=1 \
-           file://corgi-fbcon-logo.patch;patch=1 \
-           file://corgi-default-brightness.patch;patch=1 \
-           file://1764-1.patch;patch=1 \
-           http://us1.samba.org/samba/ftp/cifs-cvs/cifs-1.20c-2.4.tar.gz \
-           file://defconfig-${MACHINE} "
-
-S = "${WORKDIR}/linux"
-
-inherit kernel
-
-#
-# Compensate for sucky bootloader on all Sharp Zaurus models
-#
-FILES_kernel = ""
-
-#
-# mtd layout
-#
-# dev:    size   erasesize  name
-# mtd0: 006b0000 00020000 "Filesystem"
-# mtd1: 00700000 00004000 "smf"
-# mtd2: 00500000 00004000 "root"
-# mtd3: 00400000 00004000 "home"
-
-CMDLINE_MTDPARTS   = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home)"
-
-EXTRA_OEMAKE = " EMBEDIXRELEASE=-${DISTRO_VERSION}"
-KERNEL_CCSUFFIX = "-2.95"
-KERNEL_LDSUFFIX = "-2.11.2"
-COMPATIBLE_HOST = "arm.*-linux"
-
-module_conf_usbdmonitor = "alias usbd0 usbdmonitor"
-module_conf_pxa_bi = "below pxa27x_bi net_fd usbdcore "
-module_autoload_pxa_bi = "pxa27x_bi"
-
-do_configure_prepend() {
-	patch -p1 < cifs_24.patch
-	install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
-}
-
-do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PACKAGE_ARCH}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index 18cdc49ffd..346aa7d0ec 100644
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL QPL"
 DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
 DEPENDS_ramses = "zlib libpng jpeg uicmoc-native"
 PROVIDES = "virtual/qte virtual/libqte2"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
    	   file://qpe.patch;patch=1 \
@@ -30,6 +30,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
 SRC_URI_append_simpad   	= "file://devfs.patch;patch=1 "
 SRC_URI_append_c7x0		= "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 "
 SRC_URI_append_spitz		= "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 "
+SRC_URI_append_akita            = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 "
 SRC_URI_append_tosa		= "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 "
 SRC_URI_append_beagle   	= "file://beagle.patch;patch=1 "
 SRC_URI_append_jornada720       = "file://kernel-keymap.patch;patch=1 "
@@ -79,6 +80,7 @@ EXTRA_DEFINES_jornada720	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_simpad		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ   -DQT_QWS_SIMPAD -DQT_QWS_DEVFS"
 EXTRA_DEFINES_c7x0		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
 EXTRA_DEFINES_spitz		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
+EXTRA_DEFINES_akita             = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
 EXTRA_DEFINES_beagle		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ   -DQT_QWS_BEAGLE"
 EXTRA_DEFINES_ramses 		= "                               -DQT_QWS_RAMSES                 -DQT_QWS_DEVFS"