[oe-commits] org.oe.dev merge of '9ee75dbc81277b54460c4e8c5212693a1fb2fd03'
florian commit
openembedded-commits at lists.openembedded.org
Tue Aug 14 18:03:33 UTC 2007
merge of '9ee75dbc81277b54460c4e8c5212693a1fb2fd03'
and 'ab50357e49cac0db516d16c090278324f3999d80'
Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 55a6d6c3852b2ced2a7f078fa495586c25a3a8e7
ViewMTN: http://monotone.openembedded.org/revision.psp?id=55a6d6c3852b2ced2a7f078fa495586c25a3a8e7
Files:
1
packages/minimix/minimix_0.9.bb
conf/distro/include/preferred-gpe-versions-2.8.inc
packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch
packages/fbreader/fbreader_0.8.2a.bb
packages/ffmpeg/ffmpeg_svn.bb
packages/vlc/vlc-gpe_0.8.4.bb
packages/bluez/bluez-gnome_0.6.bb
packages/bluez/bluez-gnome_0.7.bb
packages/bluez/bluez-gnome_0.9.bb
packages/linux/compulab-pxa270-2.6.20
packages/linux/compulab-pxa270-2.6.20/0001-gitignore.patch
packages/linux/compulab-pxa270-2.6.20/0002-cm-x270-base.patch
packages/linux/compulab-pxa270-2.6.20/0003-ramdisk_load.patch
packages/linux/compulab-pxa270-2.6.20/0004-nand-driver.patch
packages/linux/compulab-pxa270-2.6.20/0005-mmcsd_large_cards-r0.patch
packages/linux/compulab-pxa270-2.6.20/0006-mmcsd_no_scr_check-r0.patch
packages/linux/compulab-pxa270-2.6.20/defconfig
packages/linux/compulab-pxa270_2.6.20.bb
packages/linux/compulab-pxa270_2.6.22.bb
packages/linux/linux-nokia770-2.6.12.3-osso14
packages/linux/linux-nokia770-2.6.12.3-osso14/nokia770
packages/linux/linux-nokia770-2.6.12.3-osso14/nokia770/defconfig
packages/linux/linux-nokia770-2.6.16-osso26
packages/linux/linux-nokia770-2.6.16-osso26/fix_tlv320aic23_compile.patch
packages/linux/linux-nokia770-2.6.16-osso26/fix_usb_hub_compile.patch
packages/linux/linux-nokia770-2.6.16-osso26/nokia770
packages/linux/linux-nokia770-2.6.16-osso26/nokia770/defconfig
packages/linux/linux-nokia770_2.6.12.3-osso14.bb
packages/linux/linux-nokia770_2.6.16-osso26.bb
packages/linux/linux-davinci-2.6.x+git-davinci
packages/linux/linux-davinci
packages/linux/linux-nokia800-2.6.18-osso29
packages/linux/linux-nokia800-2.6.18-osso40
packages/linux/linux-nokia800_2.6.18-osso29.bb
packages/linux/linux-nokia800_2.6.18-osso40.bb
packages/fastjar/fastjar-native_0.95.bb
packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch
packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom.inc
conf/local.conf.sample
conf/machine/nokia770.conf
packages/0xFFFF/0xffff-native_0.1.bb
packages/0xFFFF/0xffff-native_0.2.bb
packages/bluez/bluez-gnome_0.13.bb
packages/linux/linux-davinci_2.6.x+git-davinci.bb
packages/linux/linux-nokia800-2.6.18-osso40/nokia770/defconfig
packages/linux/linux-nokia800-2.6.18-osso40/nokia800/defconfig
packages/linux/linux-nokia800.inc
packages/maemo/nokia770-init_1.0.bb
packages/maemo/xpext_1.0-5.bb
packages/maemo/xsp_1.0.0-8.bb
packages/midpath/midpath_svn.bb
packages/sylpheed/claws-mail.inc
Diffs:
#
# mt diff -r9ee75dbc81277b54460c4e8c5212693a1fb2fd03 -r55a6d6c3852b2ced2a7f078fa495586c25a3a8e7
#
#
#
# add_file "packages/minimix/minimix_0.9.bb"
# content [835efa46eeb9d2938bab80dbc6affdd6a0b15c80]
#
# patch "conf/distro/include/preferred-gpe-versions-2.8.inc"
# from [fa020aa138cff1662245ee01559d9b3ad76e31be]
# to [4b14c35b3986ab4908cc77104d4e8bedda37428e]
#
# patch "packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch"
# from [8b922bc76887bc8127d62d1af083f6868a493c90]
# to [fc88b8e91f46ae81818e65b7ee832fc7b3db915f]
#
# patch "packages/fbreader/fbreader_0.8.2a.bb"
# from [ecb0b59a9f10624f83793fcfa9429e2f50131a9f]
# to [ffa657fea62b85620be6838f5166e8c9d3be06ee]
#
# patch "packages/ffmpeg/ffmpeg_svn.bb"
# from [1099166a95deeab073e0b8b841b47e4b1f534cd0]
# to [3b45e6e26bc71117b35e2213f1dc4abfe0a41900]
#
# patch "packages/vlc/vlc-gpe_0.8.4.bb"
# from [96c0d6a6bac04a1132a148c0803ff8e6bb58d9ad]
# to [fe5c6e8601baabed8236c03aa11ba3a8153b0fe1]
#
============================================================
--- packages/minimix/minimix_0.9.bb 835efa46eeb9d2938bab80dbc6affdd6a0b15c80
+++ packages/minimix/minimix_0.9.bb 835efa46eeb9d2938bab80dbc6affdd6a0b15c80
@@ -0,0 +1,8 @@
+DESCRIPTION = "Volume Control Applet for GPE"
+LICENSE = "GPL"
+SECTION = "gpe"
+
+DEPENDS = "libgpewidget"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpe autotools
============================================================
--- conf/distro/include/preferred-gpe-versions-2.8.inc fa020aa138cff1662245ee01559d9b3ad76e31be
+++ conf/distro/include/preferred-gpe-versions-2.8.inc 4b14c35b3986ab4908cc77104d4e8bedda37428e
@@ -61,7 +61,7 @@ PREFERRED_VERSION_miniclipboard ?= "0.3"
PREFERRED_VERSION_gpe-taskmanager ?= "0.20"
PREFERRED_VERSION_minilite ?= "0.50"
PREFERRED_VERSION_miniclipboard ?= "0.3"
-PREFERRED_VERSION_minimix ?= "0.8"
+PREFERRED_VERSION_minimix ?= "0.9"
PREFERRED_VERSION_gpe-edit ?= "0.40"
PREFERRED_VERSION_gpe-gallery ?= "0.97"
PREFERRED_VERSION_gpe-calculator ?= "0.2"
============================================================
--- packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch 8b922bc76887bc8127d62d1af083f6868a493c90
+++ packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch fc88b8e91f46ae81818e65b7ee832fc7b3db915f
@@ -18,7 +18,7 @@ diff -Nur fbreader-0.8.2a.orig/makefiles
+ UILIBS = -lqt-mt
else
- UILIBS = -lgpewidget -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0
-+ UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget
++ UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget -liconv
endif
-CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG -DQWS -fno-exceptions -fno-rtti -march=armv4 -mtune=xscale --param large-function-growth=2000 --param inline-unit-growth=200 -Wall -Wno-ctor-dtor-privacy -W -Winline
============================================================
--- packages/fbreader/fbreader_0.8.2a.bb ecb0b59a9f10624f83793fcfa9429e2f50131a9f
+++ packages/fbreader/fbreader_0.8.2a.bb ffa657fea62b85620be6838f5166e8c9d3be06ee
@@ -1,10 +1,10 @@ DEPENDS = "gtk+ enca expat bzip2 libgpew
DESCRIPTION = "FBreader is an ebook reader"
LICENSE = "GPL2"
HOMEPAGE = "http://only.mawhrin.net/fbreader/"
SECTION = "x11/utils"
PRIORITY = "optional"
DEPENDS = "gtk+ enca expat bzip2 libgpewidget"
-PR = "r4"
+PR = "r5"
# The RESOLUTION is defined at compile time which makes
# this package MACHINE specific.
@@ -20,6 +20,9 @@ SRC_URI_append_akita = "\
SRC_URI_append_akita = "\
file://zaurus-VGA.patch;patch=1"
+SRC_URI_append_htcuniversal = "\
+ file://zaurus-VGA.patch;patch=1"
+
# Set the defaults
READER_RESOLUTION = "240x320"
READER_ARCH = "openzaurus"
@@ -30,12 +33,15 @@ READER_RESOLUTION_akita = "640x480"
READER_RESOLUTION_fic-gta01 = "480x640"
READER_RESOLUTION_spitz = "640x480"
READER_RESOLUTION_akita = "640x480"
+READER_RESOLUTION_htcuniversal = "640x480"
FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary"
CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=/usr"
EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' OE_CFLAGS='${CXXFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'"
+LDFLAGS_append = " -liconv"
+
inherit pkgconfig
do_configure() {
============================================================
--- packages/ffmpeg/ffmpeg_svn.bb 1099166a95deeab073e0b8b841b47e4b1f534cd0
+++ packages/ffmpeg/ffmpeg_svn.bb 3b45e6e26bc71117b35e2213f1dc4abfe0a41900
@@ -1,9 +1,10 @@ PV = "0.4.9+svn${SRCDATE}"
DESCRIPTION = "ffmpeg"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "libogg zlib libvorbis faac liba52 lame"
PV = "0.4.9+svn${SRCDATE}"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
@@ -104,6 +105,14 @@ do_stage() {
${STAGING_INCDIR}/ffmpeg/mathematics.h
install -m 0644 ${S}/libavutil/rational.h \
${STAGING_INCDIR}/ffmpeg/rational.h
+ install -m 0644 ${S}/libavutil/mem.h \
+ ${STAGING_INCDIR}/ffmpeg/mem.h
+ install -m 0644 ${S}/libavutil/log.h \
+ ${STAGING_INCDIR}/ffmpeg/log.h
+
+ install -d ${STAGING_INCDIR}/libpostproc
+ install -m 0644 ${S}/libpostproc/postprocess.h \
+ ${STAGING_INCDIR}/libpostproc/postprocess.h
}
PACKAGES += "libavcodec libavcodec-dev \
============================================================
--- packages/vlc/vlc-gpe_0.8.4.bb 96c0d6a6bac04a1132a148c0803ff8e6bb58d9ad
+++ packages/vlc/vlc-gpe_0.8.4.bb fe5c6e8601baabed8236c03aa11ba3a8153b0fe1
@@ -1,9 +1,9 @@ SECTION = "gpe"
DESCRIPTION = "Video player and streamer - GPE edition"
HOMEPAGE = "http://www.videolan.org"
LICENSE = "GPL"
PRIORITY = "optional"
SECTION = "gpe"
-PR = "r1"
+PR = "r2"
DEPENDS = "gtk+ freetype gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
@@ -15,6 +15,8 @@ export vlc_WORKAROUNDLDFLAGS = "lib/libv
export GTK2_LIBS = "`pkg-config --libs gtk+-2.0 gthread-2.0`"
export vlc_WORKAROUNDLDFLAGS = "lib/libvlc.a"
+LDFLAGS_append = " -L${STAGING_LIBDIR} -lpostproc"
+
inherit autotools
EXTRA_OECONF = "\
#
# mt diff -rab50357e49cac0db516d16c090278324f3999d80 -r55a6d6c3852b2ced2a7f078fa495586c25a3a8e7
#
#
#
# delete "packages/bluez/bluez-gnome_0.6.bb"
#
# delete "packages/bluez/bluez-gnome_0.7.bb"
#
# delete "packages/bluez/bluez-gnome_0.9.bb"
#
# delete "packages/linux/compulab-pxa270-2.6.20"
#
# delete "packages/linux/compulab-pxa270-2.6.20/0001-gitignore.patch"
#
# delete "packages/linux/compulab-pxa270-2.6.20/0002-cm-x270-base.patch"
#
# delete "packages/linux/compulab-pxa270-2.6.20/0003-ramdisk_load.patch"
#
# delete "packages/linux/compulab-pxa270-2.6.20/0004-nand-driver.patch"
#
# delete "packages/linux/compulab-pxa270-2.6.20/0005-mmcsd_large_cards-r0.patch"
#
# delete "packages/linux/compulab-pxa270-2.6.20/0006-mmcsd_no_scr_check-r0.patch"
#
# delete "packages/linux/compulab-pxa270-2.6.20/defconfig"
#
# delete "packages/linux/compulab-pxa270_2.6.20.bb"
#
# delete "packages/linux/compulab-pxa270_2.6.22.bb"
#
# delete "packages/linux/linux-nokia770-2.6.12.3-osso14"
#
# delete "packages/linux/linux-nokia770-2.6.12.3-osso14/nokia770"
#
# delete "packages/linux/linux-nokia770-2.6.12.3-osso14/nokia770/defconfig"
#
# delete "packages/linux/linux-nokia770-2.6.16-osso26"
#
# delete "packages/linux/linux-nokia770-2.6.16-osso26/fix_tlv320aic23_compile.patch"
#
# delete "packages/linux/linux-nokia770-2.6.16-osso26/fix_usb_hub_compile.patch"
#
# delete "packages/linux/linux-nokia770-2.6.16-osso26/nokia770"
#
# delete "packages/linux/linux-nokia770-2.6.16-osso26/nokia770/defconfig"
#
# delete "packages/linux/linux-nokia770_2.6.12.3-osso14.bb"
#
# delete "packages/linux/linux-nokia770_2.6.16-osso26.bb"
#
# rename "packages/linux/linux-davinci-2.6.x+git-davinci"
# to "packages/linux/linux-davinci"
#
# rename "packages/linux/linux-nokia800-2.6.18-osso29"
# to "packages/linux/linux-nokia800-2.6.18-osso40"
#
# rename "packages/linux/linux-nokia800_2.6.18-osso29.bb"
# to "packages/linux/linux-nokia800_2.6.18-osso40.bb"
#
# add_file "packages/fastjar/fastjar-native_0.95.bb"
# content [3c4528fae3a802f047b2afe2a77ec390f93bba35]
#
# add_file "packages/linux/compulab-pxa270_2.6.22.bb"
# content [1bdb034c9f1a50b53b64d34bec8b58051d785b39]
#
# add_file "packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch"
# content [c56995add77d0c6266cf96e014fae27ba0b1ec1d]
#
# add_file "packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch"
# content [79031ff75ee9237e749692c9311a4ae85ee90c33]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [2088874891974b3204e2218dbdbdefd2fc9b2280]
# to [cbb26b56003ff6c1919690adefb14b18f3846797]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [db66ecf290b2cc5303e089d928c440e0e7fb7614]
# to [783879e52665932b7ebc461dd753e4481635d326]
#
# patch "conf/distro/include/angstrom.inc"
# from [372f7c2d334de7c0bd564fab1b098f77a81b4b28]
# to [130b27cd1f01aa7501986af41f5aa3ec2ef4b767]
#
# patch "conf/local.conf.sample"
# from [1ff6d0cc7db3274777e6a8ed833701e308a6cb07]
# to [beeeba5a341dd121dacd9a8b5f5a41f720c15f6d]
#
# patch "conf/machine/nokia770.conf"
# from [c749c8d6db7ffaf93285d6780002db17ad815af9]
# to [69e4e555b27d6664f5cb50b730dcf4f7c8f571b8]
#
# patch "packages/0xFFFF/0xffff-native_0.1.bb"
# from [959e24359ef14785c97c6811de8c9643c2220911]
# to [9fe366f3c4a323fa13c2760d0a98dccd34c7b039]
#
# patch "packages/0xFFFF/0xffff-native_0.2.bb"
# from [959e24359ef14785c97c6811de8c9643c2220911]
# to [6445347dafc9298970ccd8e2389c8f4a0c1d84f6]
#
# patch "packages/bluez/bluez-gnome_0.13.bb"
# from [6841233421c5e08a0657919d990abdc76ffac9e7]
# to [6cbb9f5eeecaf368ffa6b829edd445c7877dc847]
#
# patch "packages/linux/linux-davinci_2.6.x+git-davinci.bb"
# from [714ecc1c0690c34190e49d301e23fbdf74de8a13]
# to [2819e17abe4e3733ead05d9cb2ecd933dabd0466]
#
# patch "packages/linux/linux-nokia800-2.6.18-osso40/nokia770/defconfig"
# from [83984950b5f16c72590ba4cdad931c9d3719053c]
# to [0c90d49ce8bad4a01318e88d4300bb9783bb99b0]
#
# patch "packages/linux/linux-nokia800-2.6.18-osso40/nokia800/defconfig"
# from [fe49a173d4a67d90ef5e0b47a86cc7b5a4d72750]
# to [e86e6559444ad8443469928527615201bdcf2853]
#
# patch "packages/linux/linux-nokia800.inc"
# from [9c6cddb232a5b4c68ca6421351f0715a67a4a91a]
# to [c099bf50d2367d56a7a7f92d7972a909ef3f1c8b]
#
# patch "packages/linux/linux-nokia800_2.6.18-osso40.bb"
# from [a7a41c0847c0ff1e127f056153fd3807610a3003]
# to [4f90826f9fe700b59636abc46e661fe893051730]
#
# patch "packages/maemo/nokia770-init_1.0.bb"
# from [e5a60e0b7b8720865500e60e11655879f7deab18]
# to [e3c214434e1d0078821d1182c096dd223935d40c]
#
# patch "packages/maemo/xpext_1.0-5.bb"
# from [6e21dfa4685b4dbd95c9e89724af1b752a63de31]
# to [57bd673cacfc8db18925885216e8e5e57f44b5be]
#
# patch "packages/maemo/xsp_1.0.0-8.bb"
# from [80417d2a980e0b4834a501bf61be5a7d865f231e]
# to [d9a79489682141e292a24eba759a7cc8149700b9]
#
# patch "packages/midpath/midpath_svn.bb"
# from [746724449d034c259adac0c1deb3a12a0c152ea9]
# to [7182fd9408851ae61c1a33db310b59724cf340c7]
#
# patch "packages/sylpheed/claws-mail.inc"
# from [70dc56c3455d2a0844a513547e62dd0a066acb6f]
# to [e5e9e5019fbe720b04bda75c8c0d5f602d636ffa]
#
============================================================
--- packages/fastjar/fastjar-native_0.95.bb 3c4528fae3a802f047b2afe2a77ec390f93bba35
+++ packages/fastjar/fastjar-native_0.95.bb 3c4528fae3a802f047b2afe2a77ec390f93bba35
@@ -0,0 +1,26 @@
+DESCRIPTION = "jar replacement written in C."
+HOMEPAGE = "http://savannah.nongnu.org/projects/fastjar/"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = "zlib-native"
+
+SRC_URI = "http://download.savannah.nongnu.org/releases/fastjar/fastjar-${PV}.tar.gz"
+
+S = "${WORKDIR}/fastjar-${PV}"
+
+inherit autotools native
+
+EXTRA_OECONF = "--with-system-zlib --with-fastjar"
+
+do_configure () {
+ gnu-configize || die "failure running gnu-configize"
+ oe_runconf
+}
+
+do_stage() {
+ install -d ${STAGING_BINDIR}
+ install -m 755 fastjar ${STAGING_BINDIR}/fastjar
+ install -m 755 grepjar ${STAGING_BINDIR}
+}
============================================================
--- packages/linux/compulab-pxa270_2.6.22.bb 1bdb034c9f1a50b53b64d34bec8b58051d785b39
+++ packages/linux/compulab-pxa270_2.6.22.bb 1bdb034c9f1a50b53b64d34bec8b58051d785b39
@@ -0,0 +1,67 @@
+require linux.inc
+
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for the Compulab PXA270 system"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+ file://0001-cm-x270-base2.patch;patch=1 \
+ file://0002-cm-x270-match-type.patch;patch=1 \
+ file://0003-cm-x270-ide.patch;patch=1 \
+ file://0004-cm-x270-it8152.patch;patch=1 \
+ file://0005-cm-x270-pcmcia.patch;patch=1 \
+ file://0006-ramdisk_load.patch;patch=1 \
+ file://0007-mmcsd_large_cards-r0.patch;patch=1 \
+ file://0008-cm-x270-nand-simplify-name.patch;patch=1 \
+ file://defconfig \
+ "
+
+# file://0009-cursor-fix.patch
+
+
+
+# Note, for 2.6.22, we are no longer using the compulab binary
+# flash driver -- use JFFS2 instead
+# see notes in conf/machine/compulab-pxa270.conf
+
+S = "${WORKDIR}/linux-${PV}"
+
+COMPATIBLE_HOST = 'arm.*-linux'
+COMPATIBLE_MACHINE = "compulab-pxa270"
+
+inherit kernel
+inherit package
+
+ARCH = "arm"
+KERNEL_IMAGETYPE = "zImage"
+
+FILES_kernel-image = ""
+
+python do_compulab_image() {
+ import os
+ import os.path
+ import struct
+
+ deploy_dir = bb.data.getVar('DEPLOY_DIR_IMAGE', d, 1)
+ kernel_name = os.path.join(deploy_dir, bb.data.expand('${KERNEL_IMAGETYPE}-${MACHINE}.bin', d))
+
+ img_file = os.path.join(deploy_dir, 'zImage-compulab-pxa270.cmx270')
+
+ fo = open(img_file, 'wb')
+
+ image_data = open(kernel_name, 'rb').read()
+
+ # first write size into first 4 bytes
+ size_s = struct.pack('i', len(image_data))
+
+ # truncate size if we are running on a 64-bit host
+ size_s = size_s[:4]
+
+ fo.write(size_s)
+ fo.write(image_data)
+ fo.close()
+}
+
+addtask compulab_image before do_install after do_deploy
+
============================================================
--- packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch c56995add77d0c6266cf96e014fae27ba0b1ec1d
+++ packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch c56995add77d0c6266cf96e014fae27ba0b1ec1d
@@ -0,0 +1,30 @@
+---
+ arch/arm/oprofile/op_model_v6.c | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+Index: linux-g/arch/arm/oprofile/op_model_v6.c
+===================================================================
+--- linux-g.orig/arch/arm/oprofile/op_model_v6.c 2006-11-08 12:18:41.000000000 +0000
++++ linux-g/arch/arm/oprofile/op_model_v6.c 2007-05-23 14:11:19.000000000 +0100
+@@ -54,12 +54,6 @@
+ #define EVT_DCACHE_MISS 0x0B
+ #define EVT_DCACE_WRITE_BACK 0x0C
+ #define EVT_PC_CHANGED 0x0D
+-#define EVT_BCU_REQUEST 0x10
+-#define EVT_BCU_FULL 0x11
+-#define EVT_BCU_DRAIN 0x12
+-#define EVT_BCU_ECC_NO_ELOG 0x14
+-#define EVT_BCU_1_BIT_ERR 0x15
+-#define EVT_RMW 0x16
+ /* EVT_CCNT is not hardware defined */
+ #define EVT_CCNT 0xFE
+ #define EVT_UNUSED 0xFF
+@@ -88,7 +82,7 @@ struct pmu_type {
+ static struct pmu_type pmu_parms[] = {
+ {
+ .id = PMU_ARM11,
+- .name = "arm/arm11",
++ .name = "arm/armv6",
+ .num_counters = 3,
+ #ifdef CONFIG_ARCH_OMAP2
+ .interrupt = 3,
============================================================
--- packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch 79031ff75ee9237e749692c9311a4ae85ee90c33
+++ packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch 79031ff75ee9237e749692c9311a4ae85ee90c33
@@ -0,0 +1,415 @@
+---
+ arch/arm/mach-omap1/board-nokia770.c | 60 +++++++++++++++++++++++++++++++----
+ arch/arm/mach-omap1/mmu.c | 1
+ drivers/cbus/tahvo-usb.c | 4 +-
+ drivers/i2c/chips/isp1301_omap.c | 1
+ drivers/mtd/mtdchar.c | 6 +++
+ drivers/mtd/mtdpart.c | 5 ++
+ drivers/mtd/nand/omap-hw.c | 55 +++++++++++++++-----------------
+ drivers/serial/8250.c | 2 +
+ drivers/video/omap/omapfb_main.c | 4 +-
+ include/asm-arm/arch-omap/keypad.h | 3 +
+ include/asm-arm/arch-omap/serial.h | 16 +++++++++
+ 11 files changed, 118 insertions(+), 39 deletions(-)
+
+Index: linux-g/arch/arm/mach-omap1/board-nokia770.c
+===================================================================
+--- linux-g.orig/arch/arm/mach-omap1/board-nokia770.c 2006-11-08 13:18:39.000000000 +0100
++++ linux-g/arch/arm/mach-omap1/board-nokia770.c 2007-08-13 16:23:15.000000000 +0200
+@@ -16,6 +16,8 @@
+
+ #include <linux/spi/spi.h>
+ #include <linux/spi/ads7846.h>
++#include <linux/workqueue.h>
++#include <linux/delay.h>
+
+ #include <asm/hardware.h>
+ #include <asm/mach-types.h>
+@@ -33,9 +35,12 @@
+ #include <asm/arch/gpio.h>
+ #include <asm/arch/omapfb.h>
+ #include <asm/arch/hwa742.h>
++#include <asm/arch/lcd_mipid.h>
+
+ #include "../plat-omap/dsp/dsp_common.h"
+
++#define ADS7846_PENDOWN_GPIO 15
++
+ static void __init omap_nokia770_init_irq(void)
+ {
+ /* On Nokia 770, the SleepX signal is masked with an
+@@ -75,9 +80,11 @@
+ };
+
+ static struct omap_kp_platform_data nokia770_kp_data = {
+- .rows = 8,
+- .cols = 8,
+- .keymap = nokia770_keymap
++ .rows = 8,
++ .cols = 8,
++ .keymap = nokia770_keymap,
++ .keymapsize = ARRAY_SIZE(nokia770_keymap),
++ .delay = 4,
+ };
+
+ static struct platform_device nokia770_kp_device = {
+@@ -94,6 +101,41 @@
+ &nokia770_kp_device,
+ };
+
++static void mipid_shutdown(struct mipid_platform_data *pdata)
++{
++ if (pdata->nreset_gpio != -1) {
++ printk(KERN_INFO "shutdown LCD\n");
++ omap_set_gpio_dataout(pdata->nreset_gpio, 0);
++ msleep(120);
++ }
++}
++
++static struct mipid_platform_data nokia770_mipid_platform_data = {
++ .shutdown = mipid_shutdown,
++};
++
++static void mipid_dev_init(void)
++{
++ const struct omap_lcd_config *conf;
++
++ conf = omap_get_config(OMAP_TAG_LCD, struct omap_lcd_config);
++ if (conf != NULL) {
++ nokia770_mipid_platform_data.nreset_gpio = conf->nreset_gpio;
++ nokia770_mipid_platform_data.data_lines = conf->data_lines;
++ }
++}
++
++static void ads7846_dev_init(void)
++{
++ if (omap_request_gpio(ADS7846_PENDOWN_GPIO) < 0)
++ printk(KERN_ERR "can't get ads7846 pen down GPIO\n");
++}
++
++static int ads7846_get_pendown_state(void)
++{
++ return !omap_get_gpio_datain(ADS7846_PENDOWN_GPIO);
++}
++
+ static struct ads7846_platform_data nokia770_ads7846_platform_data __initdata = {
+ .x_max = 0x0fff,
+ .y_max = 0x0fff,
+@@ -101,14 +143,17 @@
+ .pressure_max = 255,
+ .debounce_max = 10,
+ .debounce_tol = 3,
++ .debounce_rep = 1,
++ .get_pendown_state = ads7846_get_pendown_state,
+ };
+
+ static struct spi_board_info nokia770_spi_board_info[] __initdata = {
+ [0] = {
+- .modalias = "lcd_lph8923",
++ .modalias = "lcd_mipid",
+ .bus_num = 2,
+ .chip_select = 3,
+ .max_speed_hz = 12000000,
++ .platform_data = &nokia770_mipid_platform_data,
+ },
+ [1] = {
+ .modalias = "ads7846",
+@@ -189,7 +234,7 @@
+ },
+ };
+
+-static struct omap_board_config_kernel nokia770_config[] = {
++static struct omap_board_config_kernel nokia770_config[] __initdata = {
+ { OMAP_TAG_USB, NULL },
+ { OMAP_TAG_MMC, &nokia770_mmc_config },
+ };
+@@ -235,7 +280,7 @@
+ printk("HP connected\n");
+ }
+
+-static void codec_delayed_power_down(void *arg)
++static void codec_delayed_power_down(struct work_struct *work)
+ {
+ down(&audio_pwr_sem);
+ if (audio_pwr_state == -1)
+@@ -326,9 +371,12 @@
+ ARRAY_SIZE(nokia770_spi_board_info));
+ omap_board_config = nokia770_config;
+ omap_board_config_size = ARRAY_SIZE(nokia770_config);
++ omap_gpio_init();
+ omap_serial_init();
+ omap_dsp_init();
+ hwa742_dev_init();
++ ads7846_dev_init();
++ mipid_dev_init();
+ }
+
+ static void __init omap_nokia770_map_io(void)
+Index: linux-g/arch/arm/mach-omap1/mmu.c
+===================================================================
+--- linux-g.orig/arch/arm/mach-omap1/mmu.c 2007-08-13 13:54:01.000000000 +0200
++++ linux-g/arch/arm/mach-omap1/mmu.c 2007-08-13 16:23:15.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include <linux/kernel.h>
+ #include <linux/mm.h>
+ #include <linux/err.h>
++#include <linux/delay.h>
+ #include "mmu.h"
+ #include <asm/tlbflush.h>
+
+Index: linux-g/drivers/cbus/tahvo-usb.c
+===================================================================
+--- linux-g.orig/drivers/cbus/tahvo-usb.c 2006-11-08 13:18:51.000000000 +0100
++++ linux-g/drivers/cbus/tahvo-usb.c 2007-08-13 16:23:15.000000000 +0200
+@@ -135,8 +135,8 @@
+ if ((!(OTG_CTRL_REG & OTG_DRIVER_SEL)) &&
+ tu->otg.host && tu->otg.state == OTG_STATE_A_HOST) {
+ /* role is host */
+- usb_bus_start_enum(tu->otg.host,
+- tu->otg.host->otg_port);
++ //usb_bus_start_enum(tu->otg.host,
++ // tu->otg.host->otg_port);
+ }
+ OTG_IRQ_SRC_REG = DRIVER_SWITCH;
+ } else
+Index: linux-g/drivers/i2c/chips/isp1301_omap.c
+===================================================================
+--- linux-g.orig/drivers/i2c/chips/isp1301_omap.c 2006-11-08 13:18:51.000000000 +0100
++++ linux-g/drivers/i2c/chips/isp1301_omap.c 2007-08-13 16:23:15.000000000 +0200
+@@ -32,6 +32,7 @@
+ #include <linux/usb_gadget.h>
+ #include <linux/usb.h>
+ #include <linux/usb_otg.h>
++#include <linux/usb/otg.h>
+ #include <linux/i2c.h>
+ #include <linux/workqueue.h>
+
+Index: linux-g/drivers/mtd/mtdchar.c
+===================================================================
+--- linux-g.orig/drivers/mtd/mtdchar.c 2006-11-08 13:18:55.000000000 +0100
++++ linux-g/drivers/mtd/mtdchar.c 2007-08-13 16:23:15.000000000 +0200
+@@ -622,6 +622,12 @@
+ break;
+ }
+
++ case MEMSETOOBSEL:
++ {
++ break;
++ }
++
++
+ case MEMGETBADBLOCK:
+ {
+ loff_t offs;
+Index: linux-g/drivers/mtd/mtdpart.c
+===================================================================
+--- linux-g.orig/drivers/mtd/mtdpart.c 2006-11-08 13:18:55.000000000 +0100
++++ linux-g/drivers/mtd/mtdpart.c 2007-08-13 16:23:15.000000000 +0200
+@@ -200,6 +200,11 @@
+ return -EINVAL;
+ instr->addr += part->offset;
+ ret = part->master->erase(part->master, instr);
++ if (ret) {
++ if (instr->fail_addr != 0xffffffff)
++ instr->fail_addr -= part->offset;
++ instr->addr -= part->offset;
++ }
+ return ret;
+ }
+
+Index: linux-g/drivers/mtd/nand/omap-hw.c
+========%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list