[oe-commits] org.oe.dev merge of '4a6e894ff08f0d4e0d6af803eec158fb40198ad7'
pfalcon commit
openembedded-commits at lists.openembedded.org
Thu Jan 3 11:25:12 UTC 2008
merge of '4a6e894ff08f0d4e0d6af803eec158fb40198ad7'
and 'a9cf4a7fde005b20905192e310ca984ba3cbdab4'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: e073022cc54795bb1f1d4970d0785a18d25a5136
ViewMTN: http://monotone.openembedded.org/revision/info/e073022cc54795bb1f1d4970d0785a18d25a5136
Files:
1
packages/speechd
packages/speechd/speechd_0.56.bb
packages/docbook-sgml-dtd/docbook-sgml-dtd-native_3.1.bb
packages/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native.bb
packages/gpsd/gpsd_2.34.bb
packages/gpsd/gpsd_2.35.bb
packages/dotconf
packages/dotconf/files
packages/gpsd/gpsd-2.35
packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302
packages/linux/linux-2.6.23+2.6.24-rc6
packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek
packages/sgmlspl
packages/sgmlspl/files
packages/speech-dispatcher
packages/speech-dispatcher/files
packages/util-linux-ng
conf/machine/gesbc-9302.conf
packages/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb
packages/docbook-sgml-dtd/docbook-sgml-dtd-4.4-native.bb
packages/docbook-sgml-dtd/docbook-sgml-dtd-native.inc
packages/dotconf/dotconf_1.0.13.bb
packages/dotconf/files/srcMakefile.am_00.patch
packages/gpsd/gpsd-2.35/gpsd_dbus.patch
packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/0001-gesbc-nand.patch
packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/defconfig
packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/0001-2.6.23-at91.patch
packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/0002-at91sam9260ek_defconfig.patch
packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/defconfig
packages/linux/linux_2.6.23+2.6.24-rc6.bb
packages/navit/files/navit.desktop
packages/sgmlspl/files/combined.patch
packages/sgmlspl/sgmlspl-native_1.03ii.bb
packages/speech-dispatcher/files/srcMakefile.am.patch
packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
packages/util-linux-ng/util-linux-ng.inc
packages/util-linux-ng/util-linux-ng_2.13.1.bb
MAINTAINERS
packages/docbook-utils/docbook-utils-native_0.6.14.bb
packages/linux/linux-rp-2.6.23/defconfig-poodle
packages/linux/linux-rp_2.6.23.bb
packages/linux/linux_2.6.23+2.6.24-rc5.bb
packages/navit/navit_0.0.3.bb
packages/navit/navit_cvs.bb
packages/opie-taskbar/opie-taskbar/firstuse-path.patch
packages/opie-taskbar/opie-taskbar_1.2.3.bb
packages/opie-taskbar/opie-taskbar_cvs.bb
packages/xrestop/xrestop_0.4.bb
Diffs:
#
# mt diff -r4a6e894ff08f0d4e0d6af803eec158fb40198ad7 -re073022cc54795bb1f1d4970d0785a18d25a5136
#
#
#
# delete "packages/speechd"
#
# delete "packages/speechd/speechd_0.56.bb"
#
# rename "packages/docbook-sgml-dtd/docbook-sgml-dtd-native_3.1.bb"
# to "packages/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native.bb"
#
# rename "packages/gpsd/gpsd_2.34.bb"
# to "packages/gpsd/gpsd_2.35.bb"
#
# add_dir "packages/dotconf"
#
# add_dir "packages/dotconf/files"
#
# add_dir "packages/gpsd/gpsd-2.35"
#
# add_dir "packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302"
#
# add_dir "packages/linux/linux-2.6.23+2.6.24-rc6"
#
# add_dir "packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek"
#
# add_dir "packages/sgmlspl"
#
# add_dir "packages/sgmlspl/files"
#
# add_dir "packages/speech-dispatcher"
#
# add_dir "packages/speech-dispatcher/files"
#
# add_dir "packages/util-linux-ng"
#
# add_file "conf/machine/gesbc-9302.conf"
# content [dc5cebcd4e8515d7e65c4053f016747909663f28]
#
# add_file "packages/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb"
# content [8af8a43ede5d17504c520bf8d4329c50aeb479f1]
#
# add_file "packages/docbook-sgml-dtd/docbook-sgml-dtd-4.4-native.bb"
# content [e8096a2fc94fd8c1d952962f9e9a3172902171fb]
#
# add_file "packages/docbook-sgml-dtd/docbook-sgml-dtd-native.inc"
# content [01a0574c4b3118881ffd717a2614da49aad139af]
#
# add_file "packages/dotconf/dotconf_1.0.13.bb"
# content [e67a233b6b36af1e1166969497a8065fc964af7b]
#
# add_file "packages/dotconf/files/srcMakefile.am_00.patch"
# content [7cf891b5ee3b478c01d747bf23bb96cf877712cc]
#
# add_file "packages/gpsd/gpsd-2.35/gpsd_dbus.patch"
# content [58ce1f485d1ba4521baeafb4cf46bde9fe4e8ea7]
#
# add_file "packages/gpsd/gpsd_2.34.bb"
# content [8e241bbd828101019cda7b30a6725fd6759f50f4]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/0001-gesbc-nand.patch"
# content [ab4bd36055349047026603f7f1035fe82b99c6e6]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/defconfig"
# content [9dd09f9d70607d6a484fe477d1ad29e3da5382a9]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/0001-2.6.23-at91.patch"
# content [707e51aa6cd3708350eac84d75dac92c331ebcb6]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/0002-at91sam9260ek_defconfig.patch"
# content [1c329717e813ec3539ae5ede3b9e483408c66fe5]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/defconfig"
# content [4a6da18c95a3d28a7e9e1d26bdcb8e1f265a4078]
#
# add_file "packages/linux/linux_2.6.23+2.6.24-rc6.bb"
# content [484f320fd5570d9501196799d9d68a36d909f36f]
#
# add_file "packages/navit/files/navit.desktop"
# content [abe450116dc6bb7263347dd948f736d0e612f95e]
#
# add_file "packages/sgmlspl/files/combined.patch"
# content [4ca5a624cdcc66efa1d3aa936c8a9a116486d189]
#
# add_file "packages/sgmlspl/sgmlspl-native_1.03ii.bb"
# content [d31e81ad7221fd62d1b0de0b029adda659ed88a2]
#
# add_file "packages/speech-dispatcher/files/srcMakefile.am.patch"
# content [7c2fd881a766fc549324acfbb465e7c40a936749]
#
# add_file "packages/speech-dispatcher/speech-dispatcher_0.6.5.bb"
# content [990e0945a62343c1db6ea8b85b8b82ce5e35151c]
#
# add_file "packages/util-linux-ng/util-linux-ng.inc"
# content [5cc612853b6855e2f4df6b91f5f06801c6b029aa]
#
# add_file "packages/util-linux-ng/util-linux-ng_2.13.1.bb"
# content [506c0f835de96a1c5623a992679b614ef4a4555f]
#
# patch "MAINTAINERS"
# from [4feb68bdd9be0d74c5e83609ed81cdb2f0e33169]
# to [8be8b1832f42218d3cc6ae809b61dc80fcd70003]
#
# patch "packages/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native.bb"
# from [dc639dcc8d259f0b47f5c3350b926cc213ffe48f]
# to [1fc1597723f6cd7f859c6ab5cb7cd2829205a052]
#
# patch "packages/docbook-utils/docbook-utils-native_0.6.14.bb"
# from [1a0a22dd392f60cedcc86e8ef30f293786d3ebc9]
# to [a71a90f95c1e63d6e70e783d56e0e3d756600f16]
#
# patch "packages/gpsd/gpsd_2.35.bb"
# from [8e241bbd828101019cda7b30a6725fd6759f50f4]
# to [47bd5369a4431a93392a18786271350401f12f9e]
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-poodle"
# from [09d7ed3a857d79fd98b743e6eb0e827e353a6ada]
# to [d11e4161fb755938b4e6bae34a26fbc99e3c8005]
#
# patch "packages/linux/linux-rp_2.6.23.bb"
# from [cae2b6640f80fb88e382ef42fd697c013b99999d]
# to [08d45cd12fcab8632fad9c0dd6c9a29f3e37ca2b]
#
# patch "packages/linux/linux_2.6.23+2.6.24-rc5.bb"
# from [13ddabf2aeaf44b5315cb84028c6cae9a8168953]
# to [8cef3230be1ba924b6e2c80492f1092a17566910]
#
# patch "packages/navit/navit_0.0.3.bb"
# from [45cadbb58c918bee75079075b7ef9d209507941e]
# to [bfc46c9ba7af3efe915f63a8e5dac60eb2cc69e0]
#
# patch "packages/navit/navit_cvs.bb"
# from [68ae9f449982f15699c5e966c7d4cd4b8ccd2f73]
# to [537deb351fc223dc40a33d489f2edf10bd7f67dd]
#
============================================================
--- conf/machine/gesbc-9302.conf dc5cebcd4e8515d7e65c4053f016747909663f28
+++ conf/machine/gesbc-9302.conf dc5cebcd4e8515d7e65c4053f016747909663f28
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@Name: Glomation GESBC-9302 single board computer
+#@DESCRIPTION: Low cost SBC based on Cirrus Logic EP9302 CPU
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux ?= "2.6.23+2.6.24-rc5"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "57600 ttyAM0"
+
+# used by some images
+ROOT_FLASH_SIZE = "8"
+#extra jffs2 tweaks
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 "
+
+#tune for ep93xx cpus
+#can be used for crunch support later on
+#require conf/machine/include/tune-ep9312.inc
+
+require conf/machine/include/tune-arm920t.inc
+
============================================================
--- packages/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb 8af8a43ede5d17504c520bf8d4329c50aeb479f1
+++ packages/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb 8af8a43ede5d17504c520bf8d4329c50aeb479f1
@@ -0,0 +1,12 @@
+require docbook-sgml-dtd-native.inc
+
+DTD_VERSION = "4.1"
+
+SRC_URI = "http://docbook.org/sgml/4.1/docbk41.zip"
+
+do_compile() {
+ # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/sgml-dtd.html
+ # for details.
+ sed -i -e '/ISO 8879/d' -e '/gml/d' docbook.cat
+}
+
============================================================
--- packages/docbook-sgml-dtd/docbook-sgml-dtd-4.4-native.bb e8096a2fc94fd8c1d952962f9e9a3172902171fb
+++ packages/docbook-sgml-dtd/docbook-sgml-dtd-4.4-native.bb e8096a2fc94fd8c1d952962f9e9a3172902171fb
@@ -0,0 +1,10 @@
+require docbook-sgml-dtd-native.inc
+
+DTD_VERSION = "4.4"
+
+do_compile() {
+ # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/sgml-dtd.html
+ # for details.
+ sed -i -e '/ISO 8879/d' -e '/gml/d' docbook.cat
+}
+
============================================================
--- packages/docbook-sgml-dtd/docbook-sgml-dtd-native.inc 01a0574c4b3118881ffd717a2614da49aad139af
+++ packages/docbook-sgml-dtd/docbook-sgml-dtd-native.inc 01a0574c4b3118881ffd717a2614da49aad139af
@@ -0,0 +1,31 @@
+# The DTDs of the various versions have to be installed in parallel and should
+# not replace each other. The installation step is common for all versions
+# and just differs in the DTD_VERSION.
+#
+# However the DTDs need some quirks (see LFS documentation).
+
+DESCRIPTION = "Document type definitions for verification of SGML data files against the DocBook rule set"
+
+DEPENDS = "sgml-common-native"
+
+SRC_URI = "http://www.docbook.org/sgml/${DTD_VERSION}/docbook-${DTD_VERSION}.zip"
+
+S = "${WORKDIR}"
+
+inherit native
+
+do_stage () {
+ # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/sgml-dtd.html
+ # for details.
+ install -d -m 755 ${STAGING_DATADIR}/sgml/docbook/sgml-dtd-${DTD_VERSION}
+ install docbook.cat ${STAGING_DATADIR}/sgml/docbook/sgml-dtd-${DTD_VERSION}/catalog
+ cp -dpr *.dtd *.mod *.dcl ${STAGING_DATADIR}/sgml/docbook/sgml-dtd-${DTD_VERSION}
+
+ install-catalog --add ${sysconfdir}/sgml/sgml-docbook-dtd-${DTD_VERSION}.cat \
+ ${STAGING_DATADIR}/sgml/docbook/sgml-dtd-${DTD_VERSION}/catalog
+
+ install-catalog --add ${sysconfdir}/sgml/sgml-docbook-dtd-${DTD_VERSION}.cat \
+ ${sysconfdir}/sgml/sgml-docbook.cat
+}
+
+PACKAGES = ""
============================================================
--- packages/dotconf/dotconf_1.0.13.bb e67a233b6b36af1e1166969497a8065fc964af7b
+++ packages/dotconf/dotconf_1.0.13.bb e67a233b6b36af1e1166969497a8065fc964af7b
@@ -0,0 +1,15 @@
+DESCRIPTION = " dot.conf is an easy to use and powerful configuration file parser library"
+HOMEPAGE = "http://www.azzit.de/dotconf/"
+LICENSE = "LGPLv2"
+
+PR = "r0"
+
+inherit autotools
+
+SRC_URI = "http://www.azzit.de/dotconf/download/v1.0/${PN}-${PV}.tar.gz \
+ file://srcMakefile.am_00.patch;patch=1"
+
+do_stage () {
+ install -m 0644 ${S}/src/*.h ${STAGING_INCDIR}/
+ oe_libinstall -C src -a -so libdotconf ${STAGING_LIBDIR}/
+}
============================================================
--- packages/dotconf/files/srcMakefile.am_00.patch 7cf891b5ee3b478c01d747bf23bb96cf877712cc
+++ packages/dotconf/files/srcMakefile.am_00.patch 7cf891b5ee3b478c01d747bf23bb96cf877712cc
@@ -0,0 +1,9 @@
+--- dotconf-1.0.13/src/Makefile.am.orig 2008-01-02 11:48:16.000000000 +0000
++++ dotconf-1.0.13/src/Makefile.am 2008-01-02 11:48:22.000000000 +0000
+@@ -1,5 +1,5 @@
+
+-INCLUDES = -I. -I$(includedir)
++INCLUDES = -I.
+
+ include_HEADERS = dotconf.h
+ noinst_HEADERS = readdir.h
============================================================
--- packages/gpsd/gpsd-2.35/gpsd_dbus.patch 58ce1f485d1ba4521baeafb4cf46bde9fe4e8ea7
+++ packages/gpsd/gpsd-2.35/gpsd_dbus.patch 58ce1f485d1ba4521baeafb4cf46bde9fe4e8ea7
@@ -0,0 +1,11 @@
+--- gpsd-2.35/gpsd_dbus.h.old 2008-01-02 20:54:33.000000000 -0600
++++ gpsd-2.35/gpsd_dbus.h 2008-01-02 20:55:35.000000000 -0600
+@@ -6,6 +6,8 @@
+
+ #include <dbus/dbus.h>
+
++#include "gpsd.h"
++
+ int initialize_dbus_connection (void);
+ void send_dbus_fix (struct gps_device_t* channel);
+
============================================================
--- packages/gpsd/gpsd_2.34.bb 8e241bbd828101019cda7b30a6725fd6759f50f4
+++ packages/gpsd/gpsd_2.34.bb 8e241bbd828101019cda7b30a6725fd6759f50f4
@@ -0,0 +1,4 @@
+require gpsd.inc
+
+PR = "r6"
+
============================================================
--- packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/0001-gesbc-nand.patch ab4bd36055349047026603f7f1035fe82b99c6e6
+++ packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/0001-gesbc-nand.patch ab4bd36055349047026603f7f1035fe82b99c6e6
@@ -0,0 +1,306 @@
+From 9819226a16a12ba0545e90b475fa70d408544971 Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake at happy.(none)>
+Date: Mon, 17 Dec 2007 16:45:47 -0500
+Subject: [PATCH] gesbc-nand
+
+---
+ drivers/mtd/nand/Kconfig | 7 ++
+ drivers/mtd/nand/Makefile | 1 +
+ drivers/mtd/nand/gesbc.c | 255 +++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 263 insertions(+), 0 deletions(-)
+ create mode 100644 drivers/mtd/nand/gesbc.c
+
+diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
+index 246d451..cde3146 100644
+--- a/drivers/mtd/nand/Kconfig
++++ b/drivers/mtd/nand/Kconfig
+@@ -51,6 +51,13 @@ config MTD_NAND_EDB7312
+ This enables the driver for the Cirrus Logic EBD7312 evaluation
+ board to access the onboard NAND Flash.
+
++config MTD_NAND_GESBC
++ tristate "Support for Glomation GESBC-93xx board"
++ depends on MTD_NAND && MACH_EDB9302
++ help
++ This enables the driver for the Glomation GESBC-93xx
++ board to access the onboard NAND Flash.
++
+ config MTD_NAND_H1900
+ tristate "iPAQ H1900 flash"
+ depends on ARCH_PXA && MTD_PARTITIONS
+diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
+index 3ad6c01..58c1961 100644
+--- a/drivers/mtd/nand/Makefile
++++ b/drivers/mtd/nand/Makefile
+@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_NAND_AMS_DELTA) += ams-delta.o
+ obj-$(CONFIG_MTD_NAND_TOTO) += toto.o
+ obj-$(CONFIG_MTD_NAND_AUTCPU12) += autcpu12.o
+ obj-$(CONFIG_MTD_NAND_EDB7312) += edb7312.o
++obj-$(CONFIG_MTD_NAND_GESBC) += gesbc.o
+ obj-$(CONFIG_MTD_NAND_AU1550) += au1550nd.o
+ obj-$(CONFIG_MTD_NAND_BF5XX) += bf5xx_nand.o
+ obj-$(CONFIG_MTD_NAND_PPCHAMELEONEVB) += ppchameleonevb.o
+diff --git a/drivers/mtd/nand/gesbc.c b/drivers/mtd/nand/gesbc.c
+new file mode 100644
+index 0000000..a5844b1
+--- /dev/null
++++ b/drivers/mtd/nand/gesbc.c
+@@ -0,0 +1,255 @@
++/*
++ * drivers/mtd/nand/gesbc-9302.c
++ *
++ * Copyright (C) 2004 Glomation (support at glomationinc.com)
++ *
++ * Derived from drivers/mtd/nand/edb7312.c
++ * Copyright (C) 2004 Marius Grer (mag at sysgo.de)
++ *
++ * Derived from drivers/mtd/nand/autcpu12.c
++ * Copyright (c) 2001 Thomas Gleixner (gleixner at autronix.de)
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ * Overview:
++ * This is a device driver for the NAND flash device found on the
++ * GESBC-93xx board with Samsung 128/256/512 Mbyte part.
++ */
++
++#include <linux/slab.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/mtd/mtd.h>
++#include <linux/mtd/nand.h>
++#include <linux/mtd/partitions.h>
++#include <asm/io.h>
++#include <asm/arch/hardware.h>
++#include <asm/sizes.h>
++
++#define GESBC_NAND_FLASH_DATA 0x10000000
++
++#define GPIO_PADR EP93XX_GPIO_REG(0x0)
++#define GPIO_PADDR EP93XX_GPIO_REG(0x10)
++#define SMCBCR1 (EP93XX_AHB_VIRT_BASE + 0x00082000 + 0x04)
++
++/*
++ * MTD structure for GESBC-93xx board
++ */
++static struct mtd_info *gesbc_mtd = NULL;
++
++
++/*
++ * Module stuff
++ */
++static unsigned long gesbc_fio_pbase = GESBC_NAND_FLASH_DATA;
++
++#ifdef CONFIG_MTD_PARTITIONS
++/*
++ * Define static partitions for flash device
++ */
++static struct mtd_partition partition_info32[] = {
++ { .name= "GESBC NAND FLASH",
++ .offset= 0,
++ .size= 128*1024*1024 },
++};
++/*
++ * Define static partitions for flash device
++ */
++static struct mtd_partition partition_info128[] = {
++ { .name= "GESBC NAND FLASH",
++ .offset= 0,
++ .size= 128*1024*1024 },
++};
++
++/*
++ * Define static partitions for flash device
++ */
++static struct mtd_partition partition_info256[] = {
++ { .name= "GESBC NAND FLASH",
++ .offset= 0,
++ .size= 256*1024*1024 },
++};
++
++/*
++ * Define static partitions for flash device
++ */
++static struct mtd_partition partition_info512[] = {
++ { .name= "GESBC NAND FLASH",
++ .offset= 0,
++ .size= 512*1024*1024 },
++};
++
++#define NUM_PARTITIONS 1
++#endif
++
++
++/*
++ * hardware specific access to control-lines
++ * NAND_NCE: bit 0 -> bit 3
++ * NAND_CLE: bit 1 -> bit 4
++ * NAND_ALE: bit 2 -> bit 6
++ */
++static void gesbc_hwcontrol(struct mtd_info *mtd, int cmd, int ctrl)
++{
++ unsigned long flags;
++ struct nand_chip *chip = mtd->priv;
++
++ /* Disbale interrupt to avoid race condition */
++ local_irq_save(flags);
++
++ if (ctrl & NAND_CTRL_CHANGE) {
++ unsigned char bits;
++
++ bits = (ctrl & NAND_CLE) << 3;
++ bits |= (ctrl & NAND_ALE) << 4;
++ if (ctrl & NAND_NCE)
++ bits &= ~0x08;
++ else
++ bits |= 0x08;
++
++ __raw_writel( (__raw_readl(GPIO_PADR) & ~0x58 )| bits, GPIO_PADR);
++ }
++ if (cmd != NAND_CMD_NONE)
++ writeb(cmd, chip->IO_ADDR_W);
++ /* Restore interrupt state */
++ local_irq_restore(flags);
++}
++
++/*
++ * read device ready pin
++ */
++static int gesbc_device_ready(struct mtd_info *mtd)
++{
++ return (__raw_readl(GPIO_PADR) & 0x80) >> 7;
++}
++
++#define MTDID "s3c2440-nand"
++
++static const char *probes[] = { "cmdlinepart", NULL };
++
++
++
++/*
++ * Main initialization routine
++ */
++static int __init gesbc_nand_init (void)
++{
++ struct nand_chip *this;
++ const char *part_type = 0;
++ int mtd_parts_nb = 0;
++ struct mtd_partition *mtd_parts = 0;
++ unsigned long flags;
++ void * gesbc_fio_base;
++
++ /* Allocate memory for MTD device structure and private data */
++ gesbc_mtd = kmalloc(sizeof(struct mtd_info) +
++ sizeof(struct nand_chip),
++ GFP_KERNEL);
++ if (!gesbc_mtd) {
++ printk("Unable to allocate GESBC NAND MTD device structure.\n");
++ return -ENOMEM;
++ }
++
++ /* map physical adress */
++ ge%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -ra9cf4a7fde005b20905192e310ca984ba3cbdab4 -re073022cc54795bb1f1d4970d0785a18d25a5136
#
#
#
# add_file "packages/opie-taskbar/opie-taskbar/firstuse-path.patch"
# content [3daabb637a289e05a96e0c4ac8364ea64b7edcf4]
#
# patch "packages/opie-taskbar/opie-taskbar_1.2.3.bb"
# from [0112ad577e4b14c11a22556dd9de7e2c22083f02]
# to [15845323fc8ba58771813583d4029baff27ca2b0]
#
# patch "packages/opie-taskbar/opie-taskbar_cvs.bb"
# from [61a236fc7e91c5eab32ed70a7bd08065ed5186a2]
# to [edbbc176136c3e3d59b88a9c7ca445855ffe7c96]
#
# patch "packages/xrestop/xrestop_0.4.bb"
# from [db89658b7bd6b24b3f7e98e50641efe9b4e25bb3]
# to [0a3c25fb100d4201cfed337558f772d41d2ba1fb]
#
============================================================
--- packages/opie-taskbar/opie-taskbar/firstuse-path.patch 3daabb637a289e05a96e0c4ac8364ea64b7edcf4
+++ packages/opie-taskbar/opie-taskbar/firstuse-path.patch 3daabb637a289e05a96e0c4ac8364ea64b7edcf4
@@ -0,0 +1,11 @@
+--- launcher/firstuse.cpp 2007-10-14 12:47:55.000000000 +1300
++++ launcher/firstuse.cpp 2007-10-14 13:58:54.000000000 +1300
+@@ -124,7 +124,7 @@
+ #endif
+
+ for ( int i = 0; settingsTable[i].app; i++ ) {
+- QString file = QPEApplication::qpeDir() + "bin/";
++ QString file = OPIE_BINDIR + QString("/");
+ file += settingsTable[i].app;
+ file += exeSuffix;
+ if ( QFile::exists(file) )
============================================================
--- packages/opie-taskbar/opie-taskbar_1.2.3.bb 0112ad577e4b14c11a22556dd9de7e2c22083f02
+++ packages/opie-taskbar/opie-taskbar_1.2.3.bb 15845323fc8ba58771813583d4029baff27ca2b0
@@ -13,4 +13,5 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};m
file://kbdlocks-runtime.patch;patch=1 \
file://restart-from-bindir.patch;patch=1 \
file://server.pro \
+ file://firstuse-path.patch;patch=1 \
"
============================================================
--- packages/opie-taskbar/opie-taskbar_cvs.bb 61a236fc7e91c5eab32ed70a7bd08065ed5186a2
+++ packages/opie-taskbar/opie-taskbar_cvs.bb edbbc176136c3e3d59b88a9c7ca445855ffe7c96
@@ -1,6 +1,6 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r15"
+PR = "r16"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
@@ -14,4 +14,5 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/
file://kbdlocks-runtime.patch;patch=1 \
file://restart-from-bindir.patch;patch=1 \
file://server.pro \
+ file://firstuse-path.patch;patch=1 \
"
============================================================
--- packages/xrestop/xrestop_0.4.bb db89658b7bd6b24b3f7e98e50641efe9b4e25bb3
+++ packages/xrestop/xrestop_0.4.bb 0a3c25fb100d4201cfed337558f772d41d2ba1fb
@@ -1,5 +1,8 @@
+DESCRIPTION = "top-like statistics of X11 server resource usage by clients"
+SECTION = "x11/utils"
HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xrestop"
LICENSE = "GPL"
+PR = "r1"
DEPENDS = "libxres libxext virtual/libx11"
More information about the Openembedded-commits
mailing list