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

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/17 14:06:01+01:00 uni-frankfurt.de!mickeyl
add sd module for spitz and tweak some spitz things

BKrev: 4214977eXKi1nAzngKLvb65L7VvfGQ

3 files changed, 89 insertions, 2 deletions

diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index e69de29bb2..798d52e3d2 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-C3000
+#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
+
+include conf/machine/zaurus-clamshell.conf
+include conf/machine/zaurus-clamshell-2.4.conf
+
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-spitz"
+
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \
+kernel-module-net-fd kernel-module-registers kernel-module-pxa27x-bi \
+kernel-module-usbdcore kernel-module-usbdmonitor chkhinge"
+
+ROOT_FLASH_SIZE = "16"
diff --git a/packages/linux/openzaurus-spitz_2.4.20-rmk2-embedix20041116.bb b/packages/linux/openzaurus-spitz_2.4.20-rmk2-embedix20041116.bb
index e69de29bb2..b78a6a5d35 100644
--- a/packages/linux/openzaurus-spitz_2.4.20-rmk2-embedix20041116.bb
+++ b/packages/linux/openzaurus-spitz_2.4.20-rmk2-embedix20041116.bb
@@ -0,0 +1,73 @@
+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 = "r0"
+
+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://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/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
index 652703361e..7b9492faf7 100644
--- a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
+++ b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
@@ -4,9 +4,9 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "CLOSED"
 RDEPENDS = "kernel (${KERNEL_VERSION})"
-PR = "r12"
+PR = "r13"
 
-SRC_URI = "http://www.openzaurus.org/mirror/sd-modules-2.4.18-rmk7-pxa3-embedix-r1.tar.bz2 \
+SRC_URI = "http://www.openzaurus.org/mirror/sd-modules-2.4.18-rmk7-pxa3-embedix-r2.tar.bz2 \
 	   file://sd \
 	   file://sdmgr \
 	   file://sdcontrol"