From 106b275a737d82c767dc18861b9c006db2e11ddd Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 5 May 2007 15:20:43 +0000 Subject: gpe-ownerinfo: unify --- packages/gpe-ownerinfo/gpe-ownerinfo.inc | 13 +++++++++++++ packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb | 12 +----------- packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb | 12 +----------- packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb | 12 +----------- packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb | 12 +----------- packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb | 12 +----------- packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb | 12 +----------- packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb | 12 ++---------- 8 files changed, 21 insertions(+), 76 deletions(-) create mode 100644 packages/gpe-ownerinfo/gpe-ownerinfo.inc diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo.inc b/packages/gpe-ownerinfo/gpe-ownerinfo.inc new file mode 100644 index 0000000000..704044f09b --- /dev/null +++ b/packages/gpe-ownerinfo/gpe-ownerinfo.inc @@ -0,0 +1,13 @@ +inherit gpe + +DESCRIPTION = "GPE owner information dialog" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget" + +do_stage () { + oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} + install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ +} + diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb index 2eb1b947a8..c5d8184cbf 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb @@ -1,13 +1,3 @@ -inherit gpe +require gpe-ownerinfo.inc -DESCRIPTION = "GPE owner information dialog" -SECTION = "gpe" -PRIORITY = "optional" -DEPENDS = "gtk+ libgpewidget" -LICENSE = "GPL" PR = "r1" - -do_stage () { - oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ -} diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb index e0709fe1ed..e63a6172a2 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb @@ -1,15 +1,5 @@ -inherit gpe +require gpe-ownerinfo.inc -DESCRIPTION = "GPE owner information dialog" -SECTION = "gpe" -PRIORITY = "optional" -DEPENDS = "gtk+ libgpewidget" PR = "r2" -LICENSE = "GPL" SRC_URI += "file://fixloop.patch;patch=1;pnum=0" - -do_stage () { - oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ -} diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb index f04b9c19be..e7ef651bc4 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb @@ -1,13 +1,3 @@ -inherit gpe +require gpe-ownerinfo.inc -DESCRIPTION = "GPE owner information dialog" -SECTION = "gpe" -PRIORITY = "optional" -DEPENDS = "gtk+ libgpewidget" -LICENSE = "GPL" PR = "r0" - -do_stage () { - oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ -} diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb index f04b9c19be..e7ef651bc4 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb @@ -1,13 +1,3 @@ -inherit gpe +require gpe-ownerinfo.inc -DESCRIPTION = "GPE owner information dialog" -SECTION = "gpe" -PRIORITY = "optional" -DEPENDS = "gtk+ libgpewidget" -LICENSE = "GPL" PR = "r0" - -do_stage () { - oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ -} diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb index f04b9c19be..e7ef651bc4 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb @@ -1,13 +1,3 @@ -inherit gpe +require gpe-ownerinfo.inc -DESCRIPTION = "GPE owner information dialog" -SECTION = "gpe" -PRIORITY = "optional" -DEPENDS = "gtk+ libgpewidget" -LICENSE = "GPL" PR = "r0" - -do_stage () { - oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ -} diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb index e17c6a6798..b00cc7cc66 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb @@ -1,15 +1,5 @@ -inherit gpe +require gpe-ownerinfo.inc -DESCRIPTION = "GPE owner information dialog" -SECTION = "gpe" -PRIORITY = "optional" -DEPENDS = "gtk+ libgpewidget" -LICENSE = "GPL" PR = "r1" SRC_URI += "file://compile.patch;patch=1" - -do_stage () { - oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ -} diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb index 90fb6faf14..036f70eaf1 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "GPE owner information dialog" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "gtk+ libgpewidget" +require gpe-ownerinfo.inc + PR = "r1" PV = "0.28+svn-${SRCDATE}" @@ -12,8 +9,3 @@ SRC_URI += "${GPE_SVN} \ file://svn-build.patch;patch=1" S = "${WORKDIR}/${PN}" - -do_stage () { - oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ -} -- cgit v1.2.3 From 15df48be127ab405f0696157b522a4d2a6048c22 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 7 May 2007 11:29:02 +0000 Subject: packages/mozilla/* : removing old broken detritous --- packages/mozilla/firefox-1.5.0.6/.mtn2git_empty | 0 packages/mozilla/firefox-1.5.0.6/mozconfig | 53 ------------ packages/mozilla/firefox-2.0.0.1/.mtn2git_empty | 0 .../firefox-2.0.0.1/jsautocfg-dontoverwrite.patch | 23 ------ .../firefox-2.0.0.1/jsdtoa-float-type.patch | 13 --- packages/mozilla/firefox-2.0.0.1/mozconfig | 57 ------------- .../mozilla/firefox-2.0.0.1/mult-crash-fix.patch | 14 ---- .../mozilla/firefox-2.0.0.1/security-cross.patch | 93 ---------------------- .../mozilla/firefox-2.0.0.1/xptcinvoke-arm.patch | 11 --- packages/mozilla/firefox-2.0.0.1/xptcstubs.patch | 13 --- packages/mozilla/firefox-2.0/.mtn2git_empty | 0 .../firefox-2.0/jsautocfg-dontoverwrite.patch | 23 ------ packages/mozilla/firefox-2.0/mozconfig | 53 ------------ packages/mozilla/firefox-2.0/security-cross.patch | 93 ---------------------- packages/mozilla/firefox_1.5.0.6.bb | 18 ----- packages/mozilla/firefox_2.0.0.1.bb | 37 --------- packages/mozilla/firefox_2.0.bb | 35 -------- 17 files changed, 536 deletions(-) delete mode 100644 packages/mozilla/firefox-1.5.0.6/.mtn2git_empty delete mode 100644 packages/mozilla/firefox-1.5.0.6/mozconfig delete mode 100644 packages/mozilla/firefox-2.0.0.1/.mtn2git_empty delete mode 100644 packages/mozilla/firefox-2.0.0.1/jsautocfg-dontoverwrite.patch delete mode 100644 packages/mozilla/firefox-2.0.0.1/jsdtoa-float-type.patch delete mode 100644 packages/mozilla/firefox-2.0.0.1/mozconfig delete mode 100644 packages/mozilla/firefox-2.0.0.1/mult-crash-fix.patch delete mode 100644 packages/mozilla/firefox-2.0.0.1/security-cross.patch delete mode 100644 packages/mozilla/firefox-2.0.0.1/xptcinvoke-arm.patch delete mode 100644 packages/mozilla/firefox-2.0.0.1/xptcstubs.patch delete mode 100644 packages/mozilla/firefox-2.0/.mtn2git_empty delete mode 100644 packages/mozilla/firefox-2.0/jsautocfg-dontoverwrite.patch delete mode 100644 packages/mozilla/firefox-2.0/mozconfig delete mode 100644 packages/mozilla/firefox-2.0/security-cross.patch delete mode 100644 packages/mozilla/firefox_1.5.0.6.bb delete mode 100644 packages/mozilla/firefox_2.0.0.1.bb delete mode 100644 packages/mozilla/firefox_2.0.bb diff --git a/packages/mozilla/firefox-1.5.0.6/.mtn2git_empty b/packages/mozilla/firefox-1.5.0.6/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mozilla/firefox-1.5.0.6/mozconfig b/packages/mozilla/firefox-1.5.0.6/mozconfig deleted file mode 100644 index 025b396ac7..0000000000 --- a/packages/mozilla/firefox-1.5.0.6/mozconfig +++ /dev/null @@ -1,53 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -# use GTK+-2 widget set with XFT font rendering -ac_add_options --enable-default-toolkit=gtk2 -ac_add_options --enable-xft -ac_add_options --disable-freetype2 - -# enable minimal profile support -ac_add_options --disable-profilesharing -ac_add_options --disable-profilelocking -ac_add_options --enable-single-profile - -ac_add_options --with-system-zlib -ac_add_options --with-system-jpeg -ac_add_options --with-system-png - -ac_add_options --disable-accessibility -ac_add_options --disable-composer -#ac_add_options --enable-plaintext-editor-only -ac_add_options --disable-mailnews -ac_add_options --disable-ldap -#ac_add_options --disable-postscript -ac_add_options --disable-mathml -ac_add_options --disable-jsd -ac_add_options --disable-installer -ac_add_options --disable-xprint -ac_add_options --disable-necko-disk-cache - -# configure necko to allocate smaller network buffers -ac_add_options --enable-necko-small-buffers - -# disable debug logging and tests -#ac_add_options --disable-dtd-debug -ac_add_options --disable-logging -ac_add_options --disable-debug -ac_add_options --disable-gtktest -ac_add_options --disable-tests - -# build crypto module (PSM + NSS) -ac_add_options --enable-crypto - -# build minimal set of protocol handlers -ac_add_options --enable-necko-protocols=http,file,res,jar,ftp,about,viewsource - -# build minimal set of image decoders -ac_add_options --enable-image-decoders=png,gif,jpeg - -#ac_add_options --enable-reorder -#ac_add_options --enable-elf-dynstr-gc - -# enable static build -#ac_add_options --disable-shared -#ac_add_options --enable-static diff --git a/packages/mozilla/firefox-2.0.0.1/.mtn2git_empty b/packages/mozilla/firefox-2.0.0.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mozilla/firefox-2.0.0.1/jsautocfg-dontoverwrite.patch b/packages/mozilla/firefox-2.0.0.1/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/packages/mozilla/firefox-2.0.0.1/jsautocfg-dontoverwrite.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ - - jsopcode.h jsopcode.c: jsopcode.tbl - --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) --jsautocfg.h: -- touch $@ --else --jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) -- @rm -f $@ jsautocfg.tmp -- ./jscpucfg > jsautocfg.tmp -- mv jsautocfg.tmp $@ --endif --endif - - # jscpucfg is a strange target - # Needs to be built with the host compiler but needs to include diff --git a/packages/mozilla/firefox-2.0.0.1/jsdtoa-float-type.patch b/packages/mozilla/firefox-2.0.0.1/jsdtoa-float-type.patch deleted file mode 100644 index 028900fa1b..0000000000 --- a/packages/mozilla/firefox-2.0.0.1/jsdtoa-float-type.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: mozilla/js/src/jsdtoa.c -=================================================================== ---- mozilla.orig/js/src/jsdtoa.c -+++ mozilla/js/src/jsdtoa.c -@@ -175,7 +175,7 @@ - * #define NO_IEEE_Scale to disable new (Feb. 1997) logic in strtod that - * avoids underflows on inputs whose result does not underflow. - */ --#ifdef IS_LITTLE_ENDIAN -+#if defined(IS_LITTLE_ENDIAN) && (!defined(__arm__) || defined(__VFP_FP__)) - #define IEEE_8087 - #else - #define IEEE_MC68k diff --git a/packages/mozilla/firefox-2.0.0.1/mozconfig b/packages/mozilla/firefox-2.0.0.1/mozconfig deleted file mode 100644 index 9737330a77..0000000000 --- a/packages/mozilla/firefox-2.0.0.1/mozconfig +++ /dev/null @@ -1,57 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -# use GTK+-2 widget set with XFT font rendering -ac_add_options --enable-default-toolkit=gtk2 -ac_add_options --enable-xft -ac_add_options --disable-freetype2 - -# enable minimal profile support -ac_add_options --disable-profilesharing -ac_add_options --disable-profilelocking -ac_add_options --enable-single-profile - -ac_add_options --with-system-zlib -ac_add_options --with-system-jpeg -ac_add_options --with-system-png - -ac_add_options --disable-accessibility -ac_add_options --disable-composer -#ac_add_options --enable-plaintext-editor-only -ac_add_options --disable-mailnews -ac_add_options --disable-ldap -#ac_add_options --disable-postscript -ac_add_options --disable-mathml -ac_add_options --disable-jsd -ac_add_options --disable-installer -ac_add_options --disable-xprint -ac_add_options --disable-necko-disk-cache - -# configure necko to allocate smaller network buffers -ac_add_options --enable-necko-small-buffers - -# disable debug logging and tests -#ac_add_options --disable-dtd-debug -ac_add_options --disable-logging -ac_add_options --enable-debug=-ggdb -ac_add_options --disable-gtktest -ac_add_options --disable-tests -ac_add_options --disable-printing -ac_add_options --disable-gnomevfs -ac_add_options --disable-gnomeui - -# build crypto module (PSM + NSS) -ac_add_options --enable-crypto - -# build minimal set of protocol handlers -ac_add_options --enable-necko-protocols=http,file,res,jar,ftp,about,viewsource - -# build minimal set of image decoders -ac_add_options --enable-image-decoders=png,gif,jpeg - -#ac_add_options --enable-reorder -#ac_add_options --enable-elf-dynstr-gc - -# enable static build -#ac_add_options --disable-shared -#ac_add_options --enable-static -ac_add_options --enable-optimize=-O1 diff --git a/packages/mozilla/firefox-2.0.0.1/mult-crash-fix.patch b/packages/mozilla/firefox-2.0.0.1/mult-crash-fix.patch deleted file mode 100644 index cb30f896ed..0000000000 --- a/packages/mozilla/firefox-2.0.0.1/mult-crash-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-nsprpub_pr_src_misc_prdtoa_c,v 1.1 2005/11/03 00:59:43 pvalchev Exp $ -Index: mozilla/nsprpub/pr/src/misc/prdtoa.c -=================================================================== ---- mozilla.orig/nsprpub/pr/src/misc/prdtoa.c -+++ mozilla/nsprpub/pr/src/misc/prdtoa.c -@@ -855,7 +855,7 @@ mult - wc = wa + wb; - if (wc > a->maxwds) - k++; -- c = Balloc(k); -+ c = Balloc(k*2); - for(x = c->x, xa = x + wc; x < xa; x++) - *x = 0; - xa = a->x; diff --git a/packages/mozilla/firefox-2.0.0.1/security-cross.patch b/packages/mozilla/firefox-2.0.0.1/security-cross.patch deleted file mode 100644 index 56c8d04a9e..0000000000 --- a/packages/mozilla/firefox-2.0.0.1/security-cross.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- mozilla/security/coreconf/Linux.mk.orig 2006-12-12 10:53:12.000000000 +0000 -+++ mozilla/security/coreconf/Linux.mk 2006-12-12 10:54:13.000000000 +0000 -@@ -52,88 +52,8 @@ - - DEFAULT_COMPILER = gcc - --ifeq ($(OS_TEST),m68k) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = m68k --else --ifeq ($(OS_TEST),ppc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --ifeq ($(USE_64),1) -- ARCHFLAG = -m64 --endif --else --ifeq ($(OS_TEST),ppc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --else --ifeq ($(OS_TEST),alpha) -- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = alpha --else --ifeq ($(OS_TEST),ia64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ia64 --else --ifeq ($(OS_TEST),x86_64) --ifeq ($(USE_64),1) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = x86_64 --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 -- ARCHFLAG = -m32 --endif --else --ifeq ($(OS_TEST),sparc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq ($(OS_TEST),sparc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq (,$(filter-out arm% sa110,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = arm --else --ifeq ($(OS_TEST),parisc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),parisc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),s390) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390 --else --ifeq ($(OS_TEST),s390x) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390x --else --ifeq ($(OS_TEST),mips) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = mips --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif -- -+OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -+CPU_ARCH = - - LIBC_TAG = _glibc - diff --git a/packages/mozilla/firefox-2.0.0.1/xptcinvoke-arm.patch b/packages/mozilla/firefox-2.0.0.1/xptcinvoke-arm.patch deleted file mode 100644 index bc0c6f4e5c..0000000000 --- a/packages/mozilla/firefox-2.0.0.1/xptcinvoke-arm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- iceweasel-2.0.0.1+dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp -+++ iceweasel-2.0.0.1+dfsg/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp -@@ -212,7 +212,7 @@ - "add sp, sp, r4 \n\t" /* restore stack pointer */ - "mov %0, r0 \n\t" /* the result... */ - : "=r" (result) -- : "r" (&my_params) -+ : "r" (&my_params), "m" (my_params) - : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp" - ); - diff --git a/packages/mozilla/firefox-2.0.0.1/xptcstubs.patch b/packages/mozilla/firefox-2.0.0.1/xptcstubs.patch deleted file mode 100644 index f2645690f4..0000000000 --- a/packages/mozilla/firefox-2.0.0.1/xptcstubs.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- iceweasel-2.0.0.1+dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp -+++ iceweasel-2.0.0.1+dfsg/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp -@@ -45,7 +45,8 @@ - #endif - - /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ --static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); -+static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch") -+__attribute__((used)); - - static nsresult - PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) - diff --git a/packages/mozilla/firefox-2.0/.mtn2git_empty b/packages/mozilla/firefox-2.0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mozilla/firefox-2.0/jsautocfg-dontoverwrite.patch b/packages/mozilla/firefox-2.0/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/packages/mozilla/firefox-2.0/jsautocfg-dontoverwrite.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ - - jsopcode.h jsopcode.c: jsopcode.tbl - --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) --jsautocfg.h: -- touch $@ --else --jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) -- @rm -f $@ jsautocfg.tmp -- ./jscpucfg > jsautocfg.tmp -- mv jsautocfg.tmp $@ --endif --endif - - # jscpucfg is a strange target - # Needs to be built with the host compiler but needs to include diff --git a/packages/mozilla/firefox-2.0/mozconfig b/packages/mozilla/firefox-2.0/mozconfig deleted file mode 100644 index 025b396ac7..0000000000 --- a/packages/mozilla/firefox-2.0/mozconfig +++ /dev/null @@ -1,53 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -# use GTK+-2 widget set with XFT font rendering -ac_add_options --enable-default-toolkit=gtk2 -ac_add_options --enable-xft -ac_add_options --disable-freetype2 - -# enable minimal profile support -ac_add_options --disable-profilesharing -ac_add_options --disable-profilelocking -ac_add_options --enable-single-profile - -ac_add_options --with-system-zlib -ac_add_options --with-system-jpeg -ac_add_options --with-system-png - -ac_add_options --disable-accessibility -ac_add_options --disable-composer -#ac_add_options --enable-plaintext-editor-only -ac_add_options --disable-mailnews -ac_add_options --disable-ldap -#ac_add_options --disable-postscript -ac_add_options --disable-mathml -ac_add_options --disable-jsd -ac_add_options --disable-installer -ac_add_options --disable-xprint -ac_add_options --disable-necko-disk-cache - -# configure necko to allocate smaller network buffers -ac_add_options --enable-necko-small-buffers - -# disable debug logging and tests -#ac_add_options --disable-dtd-debug -ac_add_options --disable-logging -ac_add_options --disable-debug -ac_add_options --disable-gtktest -ac_add_options --disable-tests - -# build crypto module (PSM + NSS) -ac_add_options --enable-crypto - -# build minimal set of protocol handlers -ac_add_options --enable-necko-protocols=http,file,res,jar,ftp,about,viewsource - -# build minimal set of image decoders -ac_add_options --enable-image-decoders=png,gif,jpeg - -#ac_add_options --enable-reorder -#ac_add_options --enable-elf-dynstr-gc - -# enable static build -#ac_add_options --disable-shared -#ac_add_options --enable-static diff --git a/packages/mozilla/firefox-2.0/security-cross.patch b/packages/mozilla/firefox-2.0/security-cross.patch deleted file mode 100644 index 56c8d04a9e..0000000000 --- a/packages/mozilla/firefox-2.0/security-cross.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- mozilla/security/coreconf/Linux.mk.orig 2006-12-12 10:53:12.000000000 +0000 -+++ mozilla/security/coreconf/Linux.mk 2006-12-12 10:54:13.000000000 +0000 -@@ -52,88 +52,8 @@ - - DEFAULT_COMPILER = gcc - --ifeq ($(OS_TEST),m68k) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = m68k --else --ifeq ($(OS_TEST),ppc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --ifeq ($(USE_64),1) -- ARCHFLAG = -m64 --endif --else --ifeq ($(OS_TEST),ppc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --else --ifeq ($(OS_TEST),alpha) -- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = alpha --else --ifeq ($(OS_TEST),ia64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ia64 --else --ifeq ($(OS_TEST),x86_64) --ifeq ($(USE_64),1) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = x86_64 --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 -- ARCHFLAG = -m32 --endif --else --ifeq ($(OS_TEST),sparc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq ($(OS_TEST),sparc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq (,$(filter-out arm% sa110,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = arm --else --ifeq ($(OS_TEST),parisc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),parisc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),s390) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390 --else --ifeq ($(OS_TEST),s390x) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390x --else --ifeq ($(OS_TEST),mips) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = mips --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif -- -+OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -+CPU_ARCH = - - LIBC_TAG = _glibc - diff --git a/packages/mozilla/firefox_1.5.0.6.bb b/packages/mozilla/firefox_1.5.0.6.bb deleted file mode 100644 index 5f21212bd5..0000000000 --- a/packages/mozilla/firefox_1.5.0.6.bb +++ /dev/null @@ -1,18 +0,0 @@ -PR = "r1" -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ - file://xptcstubs.patch;patch=1 \ - file://no-xmb.patch;patch=1 \ - file://jsautocfg.h \ - file://extensions-hack.patch;patch=1" - -S = "${WORKDIR}/mozilla" -DEFAULT_PREFERENCE = "-1" - -inherit mozilla - -require firefox.inc - -do_compile_prepend() { - cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ -} - diff --git a/packages/mozilla/firefox_2.0.0.1.bb b/packages/mozilla/firefox_2.0.0.1.bb deleted file mode 100644 index db3c0f4902..0000000000 --- a/packages/mozilla/firefox_2.0.0.1.bb +++ /dev/null @@ -1,37 +0,0 @@ -PR = "r1" -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ - file://xptcstubs.patch;patch=1 \ - file://no-xmb.patch;patch=1 \ - file://jsautocfg.h \ - file://extensions-hack.patch;patch=1 \ - file://security-cross.patch;patch=1 \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ - file://xptcinvoke-arm.patch;patch=1 \ - file://jsdtoa-float-type.patch;patch=1 \ - " -S = "${WORKDIR}/mozilla" -DEFAULT_PREFERENCE = "-1" - -inherit mozilla - -require firefox.inc - -do_compile_prepend() { - cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ - - sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk -} - -do_stage() { - - install -d ${STAGING_INCDIR}/${P} - cd dist/sdk/include - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/${P}/$f - done - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/${P}/nsIServiceManager.h -} - diff --git a/packages/mozilla/firefox_2.0.bb b/packages/mozilla/firefox_2.0.bb deleted file mode 100644 index c8fbccc2bf..0000000000 --- a/packages/mozilla/firefox_2.0.bb +++ /dev/null @@ -1,35 +0,0 @@ -PR = "r1" -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ - file://xptcstubs.patch;patch=1 \ - file://no-xmb.patch;patch=1 \ - file://jsautocfg.h \ - file://extensions-hack.patch;patch=1 \ - file://security-cross.patch;patch=1 \ - file://jsautocfg-dontoverwrite.patch;patch=1" - -S = "${WORKDIR}/mozilla" -DEFAULT_PREFERENCE = "-1" - -inherit mozilla - -require firefox.inc - -do_compile_prepend() { - cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ - - sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk -} - -do_stage() { - - install -d ${STAGING_INCDIR}/${P} - cd dist/sdk/include - headers=`find . -name "*.h"` - for f in $headers - do - install -m 0644 $f ${STAGING_INCDIR}/${P}/$f - done - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/${P}/nsIServiceManager.h -} - -- cgit v1.2.3 From 9bde98efe0f773f113eefe26762c2fd1bcc64b16 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 7 May 2007 11:31:23 +0000 Subject: firefox_1.0.7.bb : add patch from http://article.gmane.org/gmane.linux.debian.ports.arm/4082 by Lennert Buytenhek fix a small QA issue firefox_2.0.0.3 : new version with same patch as above added. --- packages/mozilla/firefox-1.0.7/mozilla-eabi.patch | 28 +++++++ .../mozilla/firefox-1.0.7/xptcinvoke-arm.patch | 11 +++ packages/mozilla/firefox-2.0.0.3/.mtn2git_empty | 0 .../firefox-2.0.0.3/jsautocfg-dontoverwrite.patch | 23 ++++++ .../firefox-2.0.0.3/jsdtoa-float-type.patch | 13 +++ packages/mozilla/firefox-2.0.0.3/mozconfig | 57 +++++++++++++ .../mozilla/firefox-2.0.0.3/mozilla-eabi.patch | 42 ++++++++++ .../mozilla/firefox-2.0.0.3/mult-crash-fix.patch | 14 ++++ .../mozilla/firefox-2.0.0.3/security-cross.patch | 93 ++++++++++++++++++++++ .../mozilla/firefox-2.0.0.3/xptcinvoke-arm.patch | 11 +++ packages/mozilla/firefox-2.0.0.3/xptcstubs.patch | 13 +++ packages/mozilla/firefox_1.0.7.bb | 6 +- packages/mozilla/firefox_2.0.0.3.bb | 37 +++++++++ 13 files changed, 347 insertions(+), 1 deletion(-) create mode 100644 packages/mozilla/firefox-1.0.7/mozilla-eabi.patch create mode 100644 packages/mozilla/firefox-1.0.7/xptcinvoke-arm.patch create mode 100644 packages/mozilla/firefox-2.0.0.3/.mtn2git_empty create mode 100644 packages/mozilla/firefox-2.0.0.3/jsautocfg-dontoverwrite.patch create mode 100644 packages/mozilla/firefox-2.0.0.3/jsdtoa-float-type.patch create mode 100644 packages/mozilla/firefox-2.0.0.3/mozconfig create mode 100644 packages/mozilla/firefox-2.0.0.3/mozilla-eabi.patch create mode 100644 packages/mozilla/firefox-2.0.0.3/mult-crash-fix.patch create mode 100644 packages/mozilla/firefox-2.0.0.3/security-cross.patch create mode 100644 packages/mozilla/firefox-2.0.0.3/xptcinvoke-arm.patch create mode 100644 packages/mozilla/firefox-2.0.0.3/xptcstubs.patch create mode 100644 packages/mozilla/firefox_2.0.0.3.bb diff --git a/packages/mozilla/firefox-1.0.7/mozilla-eabi.patch b/packages/mozilla/firefox-1.0.7/mozilla-eabi.patch new file mode 100644 index 0000000000..c12f6ef04e --- /dev/null +++ b/packages/mozilla/firefox-1.0.7/mozilla-eabi.patch @@ -0,0 +1,28 @@ +Index: mozilla/nsprpub/pr/src/misc/prdtoa.c +=================================================================== +--- mozilla.orig/nsprpub/pr/src/misc/prdtoa.c 2004-03-12 07:30:50.000000000 +0000 ++++ mozilla/nsprpub/pr/src/misc/prdtoa.c 2007-05-07 11:35:10.000000000 +0100 +@@ -132,8 +132,8 @@ + * is not strictly legal and can cause trouble with aggressively + * optimizing compilers (e.g., gcc 2.95.1 under -O2). + */ +-#if defined(__arm) || defined(__arm__) || defined(__arm26__) \ +- || defined(__arm32__) ++#if (defined(__arm) || defined(__arm__) || defined(__arm26__) \ ++ || defined(__arm32__)) && !defined(__ARM_EABI__) && !defined(__ARMEB__) + #define IEEE_ARM + #elif defined(IS_LITTLE_ENDIAN) + #define IEEE_8087 +Index: mozilla/nsprpub/pr/include/md/_linux.h +=================================================================== +--- mozilla.orig/nsprpub/pr/include/md/_linux.h 2005-05-04 19:06:17.000000000 +0100 ++++ mozilla/nsprpub/pr/include/md/_linux.h 2007-05-07 11:34:16.000000000 +0100 +@@ -285,7 +285,7 @@ + #error "Linux/MIPS pre-glibc2 not supported yet" + #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ + +-#elif defined(__arm__) ++#elif defined(__arm__) && !defined(__ARM_EABI__) + /* ARM/Linux */ + #if defined(__GLIBC__) && __GLIBC__ >= 2 + #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20] diff --git a/packages/mozilla/firefox-1.0.7/xptcinvoke-arm.patch b/packages/mozilla/firefox-1.0.7/xptcinvoke-arm.patch new file mode 100644 index 0000000000..bc0c6f4e5c --- /dev/null +++ b/packages/mozilla/firefox-1.0.7/xptcinvoke-arm.patch @@ -0,0 +1,11 @@ +--- iceweasel-2.0.0.1+dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp ++++ iceweasel-2.0.0.1+dfsg/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +@@ -212,7 +212,7 @@ + "add sp, sp, r4 \n\t" /* restore stack pointer */ + "mov %0, r0 \n\t" /* the result... */ + : "=r" (result) +- : "r" (&my_params) ++ : "r" (&my_params), "m" (my_params) + : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp" + ); + diff --git a/packages/mozilla/firefox-2.0.0.3/.mtn2git_empty b/packages/mozilla/firefox-2.0.0.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mozilla/firefox-2.0.0.3/jsautocfg-dontoverwrite.patch b/packages/mozilla/firefox-2.0.0.3/jsautocfg-dontoverwrite.patch new file mode 100644 index 0000000000..39978cfd11 --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.3/jsautocfg-dontoverwrite.patch @@ -0,0 +1,23 @@ +--- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 ++++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 +@@ -319,20 +319,8 @@ + + jsopcode.h jsopcode.c: jsopcode.tbl + +-ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) + jsautocfg.h: + touch $@ +-else +-ifeq ($(OS_ARCH),WINCE) +-jsautocfg.h: +- touch $@ +-else +-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) +- @rm -f $@ jsautocfg.tmp +- ./jscpucfg > jsautocfg.tmp +- mv jsautocfg.tmp $@ +-endif +-endif + + # jscpucfg is a strange target + # Needs to be built with the host compiler but needs to include diff --git a/packages/mozilla/firefox-2.0.0.3/jsdtoa-float-type.patch b/packages/mozilla/firefox-2.0.0.3/jsdtoa-float-type.patch new file mode 100644 index 0000000000..028900fa1b --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.3/jsdtoa-float-type.patch @@ -0,0 +1,13 @@ +Index: mozilla/js/src/jsdtoa.c +=================================================================== +--- mozilla.orig/js/src/jsdtoa.c ++++ mozilla/js/src/jsdtoa.c +@@ -175,7 +175,7 @@ + * #define NO_IEEE_Scale to disable new (Feb. 1997) logic in strtod that + * avoids underflows on inputs whose result does not underflow. + */ +-#ifdef IS_LITTLE_ENDIAN ++#if defined(IS_LITTLE_ENDIAN) && (!defined(__arm__) || defined(__VFP_FP__)) + #define IEEE_8087 + #else + #define IEEE_MC68k diff --git a/packages/mozilla/firefox-2.0.0.3/mozconfig b/packages/mozilla/firefox-2.0.0.3/mozconfig new file mode 100644 index 0000000000..9737330a77 --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.3/mozconfig @@ -0,0 +1,57 @@ +. $topsrcdir/browser/config/mozconfig + +# use GTK+-2 widget set with XFT font rendering +ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --enable-xft +ac_add_options --disable-freetype2 + +# enable minimal profile support +ac_add_options --disable-profilesharing +ac_add_options --disable-profilelocking +ac_add_options --enable-single-profile + +ac_add_options --with-system-zlib +ac_add_options --with-system-jpeg +ac_add_options --with-system-png + +ac_add_options --disable-accessibility +ac_add_options --disable-composer +#ac_add_options --enable-plaintext-editor-only +ac_add_options --disable-mailnews +ac_add_options --disable-ldap +#ac_add_options --disable-postscript +ac_add_options --disable-mathml +ac_add_options --disable-jsd +ac_add_options --disable-installer +ac_add_options --disable-xprint +ac_add_options --disable-necko-disk-cache + +# configure necko to allocate smaller network buffers +ac_add_options --enable-necko-small-buffers + +# disable debug logging and tests +#ac_add_options --disable-dtd-debug +ac_add_options --disable-logging +ac_add_options --enable-debug=-ggdb +ac_add_options --disable-gtktest +ac_add_options --disable-tests +ac_add_options --disable-printing +ac_add_options --disable-gnomevfs +ac_add_options --disable-gnomeui + +# build crypto module (PSM + NSS) +ac_add_options --enable-crypto + +# build minimal set of protocol handlers +ac_add_options --enable-necko-protocols=http,file,res,jar,ftp,about,viewsource + +# build minimal set of image decoders +ac_add_options --enable-image-decoders=png,gif,jpeg + +#ac_add_options --enable-reorder +#ac_add_options --enable-elf-dynstr-gc + +# enable static build +#ac_add_options --disable-shared +#ac_add_options --enable-static +ac_add_options --enable-optimize=-O1 diff --git a/packages/mozilla/firefox-2.0.0.3/mozilla-eabi.patch b/packages/mozilla/firefox-2.0.0.3/mozilla-eabi.patch new file mode 100644 index 0000000000..fe9adf088e --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.3/mozilla-eabi.patch @@ -0,0 +1,42 @@ +--- nspr-4.6.6/mozilla/nsprpub/pr/src/misc/prdtoa.c.orig 2007-05-06 02:39:00.000000000 +0200 ++++ nspr-4.6.6/mozilla/nsprpub/pr/src/misc/prdtoa.c 2007-05-06 02:39:22.000000000 +0200 +@@ -59,8 +59,8 @@ + /* FIXME: deal with freelist and p5s. */ + } + +-#if defined(__arm) || defined(__arm__) || defined(__arm26__) \ +- || defined(__arm32__) ++#if (defined(__arm) || defined(__arm__) || defined(__arm26__) \ ++ || defined(__arm32__)) && !defined(__ARM_EABI__) && !defined(__ARMEB__) + #define IEEE_ARM + #elif defined(IS_LITTLE_ENDIAN) + #define IEEE_8087 +--- nspr-4.6.6/mozilla/nsprpub/pr/include/md/_linux.h.orig 2007-05-06 02:39:45.000000000 +0200 ++++ nspr-4.6.6/mozilla/nsprpub/pr/include/md/_linux.h 2007-05-06 02:40:57.000000000 +0200 +@@ -346,7 +346,7 @@ + #error "Linux/MIPS pre-glibc2 not supported yet" + #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ + +-#elif defined(__arm__) ++#elif defined(__arm__) && !defined(__ARM_EABI__) + /* ARM/Linux */ + #if defined(__GLIBC__) && __GLIBC__ >= 2 + #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20] + -358,6 +358,18 + #error "ARM/Linux pre-glibc2 not supported yet" + #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ + ++#elif defined(__arm__) && defined(__ARM_EABI__) ++/* ARM/Linux */ ++#if defined(__GLIBC__) && __GLIBC__ >= 2 ++#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[8] ++#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[7] = (val)) ++#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t)) ++#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[7]) ++#define _MD_SP_TYPE __ptr_t ++#else ++#error "ARM/Linux pre-glibc2 not supported yet" ++#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ ++ + #else + diff --git a/packages/mozilla/firefox-2.0.0.3/mult-crash-fix.patch b/packages/mozilla/firefox-2.0.0.3/mult-crash-fix.patch new file mode 100644 index 0000000000..cb30f896ed --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.3/mult-crash-fix.patch @@ -0,0 +1,14 @@ +$OpenBSD: patch-nsprpub_pr_src_misc_prdtoa_c,v 1.1 2005/11/03 00:59:43 pvalchev Exp $ +Index: mozilla/nsprpub/pr/src/misc/prdtoa.c +=================================================================== +--- mozilla.orig/nsprpub/pr/src/misc/prdtoa.c ++++ mozilla/nsprpub/pr/src/misc/prdtoa.c +@@ -855,7 +855,7 @@ mult + wc = wa + wb; + if (wc > a->maxwds) + k++; +- c = Balloc(k); ++ c = Balloc(k*2); + for(x = c->x, xa = x + wc; x < xa; x++) + *x = 0; + xa = a->x; diff --git a/packages/mozilla/firefox-2.0.0.3/security-cross.patch b/packages/mozilla/firefox-2.0.0.3/security-cross.patch new file mode 100644 index 0000000000..56c8d04a9e --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.3/security-cross.patch @@ -0,0 +1,93 @@ +--- mozilla/security/coreconf/Linux.mk.orig 2006-12-12 10:53:12.000000000 +0000 ++++ mozilla/security/coreconf/Linux.mk 2006-12-12 10:54:13.000000000 +0000 +@@ -52,88 +52,8 @@ + + DEFAULT_COMPILER = gcc + +-ifeq ($(OS_TEST),m68k) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = m68k +-else +-ifeq ($(OS_TEST),ppc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = ppc +-ifeq ($(USE_64),1) +- ARCHFLAG = -m64 +-endif +-else +-ifeq ($(OS_TEST),ppc) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = ppc +-else +-ifeq ($(OS_TEST),alpha) +- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = alpha +-else +-ifeq ($(OS_TEST),ia64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = ia64 +-else +-ifeq ($(OS_TEST),x86_64) +-ifeq ($(USE_64),1) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = x86_64 +-else +- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE +- CPU_ARCH = x86 +- ARCHFLAG = -m32 +-endif +-else +-ifeq ($(OS_TEST),sparc) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = sparc +-else +-ifeq ($(OS_TEST),sparc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = sparc +-else +-ifeq (,$(filter-out arm% sa110,$(OS_TEST))) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = arm +-else +-ifeq ($(OS_TEST),parisc) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = hppa +-else +-ifeq ($(OS_TEST),parisc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = hppa +-else +-ifeq ($(OS_TEST),s390) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = s390 +-else +-ifeq ($(OS_TEST),s390x) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = s390x +-else +-ifeq ($(OS_TEST),mips) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = mips +-else +- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE +- CPU_ARCH = x86 +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +- ++OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE ++CPU_ARCH = + + LIBC_TAG = _glibc + diff --git a/packages/mozilla/firefox-2.0.0.3/xptcinvoke-arm.patch b/packages/mozilla/firefox-2.0.0.3/xptcinvoke-arm.patch new file mode 100644 index 0000000000..bc0c6f4e5c --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.3/xptcinvoke-arm.patch @@ -0,0 +1,11 @@ +--- iceweasel-2.0.0.1+dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp ++++ iceweasel-2.0.0.1+dfsg/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +@@ -212,7 +212,7 @@ + "add sp, sp, r4 \n\t" /* restore stack pointer */ + "mov %0, r0 \n\t" /* the result... */ + : "=r" (result) +- : "r" (&my_params) ++ : "r" (&my_params), "m" (my_params) + : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp" + ); + diff --git a/packages/mozilla/firefox-2.0.0.3/xptcstubs.patch b/packages/mozilla/firefox-2.0.0.3/xptcstubs.patch new file mode 100644 index 0000000000..f2645690f4 --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.3/xptcstubs.patch @@ -0,0 +1,13 @@ +--- iceweasel-2.0.0.1+dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp ++++ iceweasel-2.0.0.1+dfsg/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp +@@ -45,7 +45,8 @@ + #endif + + /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ +-static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); ++static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch") ++__attribute__((used)); + + static nsresult + PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) + diff --git a/packages/mozilla/firefox_1.0.7.bb b/packages/mozilla/firefox_1.0.7.bb index 3a82dafd92..dd4d734f89 100644 --- a/packages/mozilla/firefox_1.0.7.bb +++ b/packages/mozilla/firefox_1.0.7.bb @@ -5,7 +5,9 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/ file://firefox-cc-fix.patch;patch=1 \ file://jsautocfg.h \ file://extensions-hack.patch;patch=1 \ - file://firefox-1.0-gcc4-compile.patch;patch=1;pnum=0" + file://firefox-1.0-gcc4-compile.patch;patch=1;pnum=0 \ + file://xptcinvoke-arm.patch;patch=1 \ + file://mozilla-eabi.patch;patch=1" S = "${WORKDIR}/mozilla" @@ -13,6 +15,8 @@ inherit mozilla require firefox.inc +EXTRA_OECONF += " --with-gssapi=${STAGINGLIBDIR}/../" + do_compile_prepend() { cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ } diff --git a/packages/mozilla/firefox_2.0.0.3.bb b/packages/mozilla/firefox_2.0.0.3.bb new file mode 100644 index 0000000000..db3729c274 --- /dev/null +++ b/packages/mozilla/firefox_2.0.0.3.bb @@ -0,0 +1,37 @@ +PR = "r1" +SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ + file://xptcstubs.patch;patch=1 \ + file://no-xmb.patch;patch=1 \ + file://jsautocfg.h \ + file://extensions-hack.patch;patch=1 \ + file://security-cross.patch;patch=1 \ + file://jsautocfg-dontoverwrite.patch;patch=1 \ + file://xptcinvoke-arm.patch;patch=1 \ + file://mozilla-eabi.patch;patch=1;pnum=2 \ + " +S = "${WORKDIR}/mozilla" +DEFAULT_PREFERENCE = "-1" + +inherit mozilla + +require firefox.inc + +do_compile_prepend() { + cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ + + sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk +} + +do_stage() { + + install -d ${STAGING_INCDIR}/${P} + cd dist/sdk/include + headers=`find . -name "*.h"` + for f in $headers + do + install -D -m 0644 $f ${STAGING_INCDIR}/${P}/$f + done + # removes 2 lines that call absent headers + sed -e '178,179d' ${STAGING_INCDIR}/${P}/nsIServiceManager.h +} + -- cgit v1.2.3 From de2533a6a8aef13f003384d1654980bbb434b67b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 May 2007 12:12:11 +0000 Subject: angstrom-x11-image: add task-base-wifi --- packages/angstrom/angstrom-x11-image.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/angstrom/angstrom-x11-image.bb b/packages/angstrom/angstrom-x11-image.bb index c5d2675b60..14e83818a0 100644 --- a/packages/angstrom/angstrom-x11-image.bb +++ b/packages/angstrom/angstrom-x11-image.bb @@ -1,6 +1,6 @@ #Angstrom X11 image LICENSE = "MIT" -PR = "r6" +PR = "r8" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_tslib ?= "tslib" @@ -8,7 +8,7 @@ PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" -ANGSTROM_EXTRA_INSTALL ?= "" +ANGSTROM_EXTRA_INSTALL ?= "hal gstreamer" XSERVER ?= "xserver-kdrive-fbdev" export IMAGE_BASENAME = "x11-image" @@ -17,6 +17,7 @@ DEPENDS = "task-base" RDEPENDS = "\ ${XSERVER} \ task-base \ + task-base-wifi \ angstrom-x11-base-depends \ angstrom-gpe-task-base \ angstrom-gpe-task-settings \ -- cgit v1.2.3 From 4bd652681d099c3bc0bd7fbfda386b780816fe4c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 May 2007 13:23:47 +0000 Subject: bcm2035tool: takes BDADDR as a commandline argument. Patch from Jan Herman --- packages/bluez/bcm2035-tool/.mtn2git_empty | 0 packages/bluez/bcm2035-tool/addr-as-arg.patch | 104 ++++++++++++++++++++++++++ packages/bluez/bcm2035-tool_0.0.bb | 6 +- 3 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 packages/bluez/bcm2035-tool/.mtn2git_empty create mode 100644 packages/bluez/bcm2035-tool/addr-as-arg.patch diff --git a/packages/bluez/bcm2035-tool/.mtn2git_empty b/packages/bluez/bcm2035-tool/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/bluez/bcm2035-tool/addr-as-arg.patch b/packages/bluez/bcm2035-tool/addr-as-arg.patch new file mode 100644 index 0000000000..28618c5bbb --- /dev/null +++ b/packages/bluez/bcm2035-tool/addr-as-arg.patch @@ -0,0 +1,104 @@ +--- bcm2035-tool/bcm2035-tool.c 2007/05/07 12:48:06 2000 ++++ bcm2035-tool/bcm2035-tool.c 2007/05/07 12:55:47 2001 +@@ -1,6 +1,8 @@ +-/* bcm2035-tool - bcm2035 tool for Motorola EZX phones ++/* bcm2035-tool + * + * (C) 2007 by Daniel Ribeiro ++ * ++ * MAC address as argument extension by: Jan Herman <2hp@seznam.cz> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 +@@ -17,10 +19,10 @@ + * + */ + ++/* Default MAC address */ ++#define BDADDR "\x06\x05\x04\x03\x02\x01" + + //#define PATCH_FIRMWARE +-#define BDADDR "\xab\x89\x67\x45\x23\x01" +- + + #include + #include +@@ -33,6 +35,7 @@ + #include + #include + #include "bcm2035-tool.h" ++//#include "bluetooth.h" + + #ifdef PATCH_FIRMWARE + #include "motorola_patches.h" +@@ -180,18 +183,51 @@ + + } + ++void mac2hex(const char *mac, u_char *dst) ++{ ++ ++ int i; ++ long l; ++ char *pp; ++ ++ while (isspace(*mac)) ++ mac++; ++ ++ /* expect 6 hex octets separated by ':' or space/NUL if last octet */ ++ for (i = 0; i < 6; i++) { ++ l = strtol(mac, &pp, 16); ++ if (pp == mac || l > 0xFF || l < 0) ++ return; ++ if (!(*pp == ':' || (i == 5 && (isspace(*pp) || *pp == '\0')))) ++ return; ++ /* 5-i swaps hex chars */ ++ dst[5-i] = (u_char) l; ++ mac = pp + 1; ++ } ++ } ++ ++char bdaddr[6]; ++ + int main(int argc, char **argv) + { + int fd, i; + struct termios term; + char buf[1024]; +- char bdaddr[6]; +- +- if (argc < 2) { +- printf("use: %s \n", argv[0]); ++ ++ if (argc < 3) { ++ printf("BCM2035 Tool:\n"); ++ printf("Usage: %s \n", argv[0]); + exit(1); + } + ++ if (strlen(argv[2]) < 17) { ++ printf("invalid argument %s!\n", argv[2]); ++ exit(1); ++ } ++ ++ /* Converts MAC address to swapped HEX */ ++ mac2hex(argv[2], bdaddr); ++ + fd = open (argv[1], O_RDWR | O_NOCTTY ); + + if(fd < 0) exit(-1); +@@ -212,7 +248,7 @@ + #endif + set_baud(fd, 460800); + +- send_cmd(fd, CMD_SET_BDADDR, BDADDR, 6); ++ send_cmd(fd, CMD_SET_BDADDR, bdaddr, 6); + + i = N_HCI; + if (ioctl(fd, TIOCSETD, &i) < 0) { +@@ -228,5 +264,3 @@ + while (1) sleep(999999999); + return 0; + } +- +- diff --git a/packages/bluez/bcm2035-tool_0.0.bb b/packages/bluez/bcm2035-tool_0.0.bb index bd3c9012ec..636841de6f 100644 --- a/packages/bluez/bcm2035-tool_0.0.bb +++ b/packages/bluez/bcm2035-tool_0.0.bb @@ -1,9 +1,11 @@ DESCRIPTION = "Bluetooth firmware poker for bccm2035 chips (motorola phones and palms)" LICENSE = "GPLv2" -SRC_URI = "http://people.openezx.org/wyrm/bcm2035-tool.tgz" +PR = "r1" -# Note: everyone will have the same BDADDR for the time being +SRC_URI = "http://people.openezx.org/wyrm/bcm2035-tool.tgz \ + file://addr-as-arg.patch;patch=1 \ + " S = "${WORKDIR}/${PN}" -- cgit v1.2.3 From 840675f5036042778054dab3cc0d138874877d73 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 May 2007 14:44:29 +0000 Subject: fuse 2.5.3: fix FILES for libfuse --- packages/fuse/fuse_2.5.3.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fuse/fuse_2.5.3.bb b/packages/fuse/fuse_2.5.3.bb index 5f5ce701d3..b3f45381a0 100644 --- a/packages/fuse/fuse_2.5.3.bb +++ b/packages/fuse/fuse_2.5.3.bb @@ -1,10 +1,10 @@ require fuse.inc -PR = "r1" +PR = "r2" #package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils PACKAGES += "fuse-utils" -FILES_${PN} = "${libdir}/*.so*" +FILES_${PN} = "${libdir}/*.so.*" FILES_${PN}-dev += "${libdir}/*.la" FILES_fuse-utils = "${bindir} ${base_sbindir}" DEBIAN_NOAUTONAME_fuse-utils = "1" -- cgit v1.2.3 From 78e64ab514fbc640d7c2d557c29cf9d407f09d75 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 May 2007 16:16:21 +0000 Subject: libxcb: fix FILES, spotted by Junqian Gordon Xu --- packages/xcb/libxcb_0.9.93.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/xcb/libxcb_0.9.93.bb b/packages/xcb/libxcb_0.9.93.bb index 5f5f870482..5b926d093f 100644 --- a/packages/xcb/libxcb_0.9.93.bb +++ b/packages/xcb/libxcb_0.9.93.bb @@ -2,7 +2,7 @@ DESCRIPTION = "XCB: an X protocol C binding" SECTION = "x11/libs" LICENSE = "MIT-X" HOMEPAGE = "http://xcb.freedesktop.org" -PR = "r1" +PR = "r2" PARALLEL_MAKE = "" DEPENDS = "xcb-proto libxau libxslt-native" @@ -18,7 +18,7 @@ PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \ FILES_${PN} = "${libdir}/libxcb.so.*" #FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h" -FILES_libxcb-composite = "${libdir}/libxcb-composite.so*" +FILES_libxcb-composite = "${libdir}/libxcb-composite.so.*" FILES_libxcb-damage = "${libdir}/libxcb-damage.so.*" FILES_libxcb-dpms = "${libdir}/libxcb-dpms.so.*" FILES_libxcb-glx = "${libdir}/libxcb-glx.so.*" -- cgit v1.2.3 From 5c26128521303cbf8d77621d758daeba9e2c73f8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 May 2007 16:50:46 +0000 Subject: ep93xx-kernel: fix do_deploy --- packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb b/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb index 81c359f7fa..4c39b0fc90 100644 --- a/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb +++ b/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb @@ -51,6 +51,7 @@ do_deploy() { do_deploy[dirs] = "${S}" -addtask deploy before do_build after do_compile +addtask deploy before do_package after do_install + -- cgit v1.2.3 From 6114ba8eaa8d149324204d27d574462f43c52856 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 May 2007 16:52:44 +0000 Subject: openssl: fix FILES, spotted by Junqian Gordon Xu --- packages/openssl/openssl-native_0.9.7g.bb | 2 +- packages/openssl/openssl.inc | 4 ++-- packages/openssl/openssl_0.9.7e.bb | 2 +- packages/openssl/openssl_0.9.7g.bb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/openssl/openssl-native_0.9.7g.bb b/packages/openssl/openssl-native_0.9.7g.bb index dd4ba1a5ef..115d4011d9 100644 --- a/packages/openssl/openssl-native_0.9.7g.bb +++ b/packages/openssl/openssl-native_0.9.7g.bb @@ -2,7 +2,7 @@ inherit pkgconfig native require openssl.inc -PR = "r0" +PR = "r1" SRC_URI += "file://debian.patch;patch=1 \ file://armeb.patch;patch=1;pnum=0 \ diff --git a/packages/openssl/openssl.inc b/packages/openssl/openssl.inc index e7e3b37e3c..9c648f0ba8 100644 --- a/packages/openssl/openssl.inc +++ b/packages/openssl/openssl.inc @@ -18,8 +18,8 @@ export EX_LIBS = "-lgcc -ldl -L${STAGING_LIBDIR}" export AS = "${CC} -c" PACKAGES =+ "libcrypto libssl" -FILES_libcrypto = "${libdir}/libcrypto.so*" -FILES_libssl = "${libdir}/libssl.so*" +FILES_libcrypto = "${libdir}/libcrypto.so.*" +FILES_libssl = "${libdir}/libssl.so.*" do_compile () { cd util diff --git a/packages/openssl/openssl_0.9.7e.bb b/packages/openssl/openssl_0.9.7e.bb index d9b8d91cdc..a7d3670758 100644 --- a/packages/openssl/openssl_0.9.7e.bb +++ b/packages/openssl/openssl_0.9.7e.bb @@ -1,6 +1,6 @@ require openssl.inc -PR = "r4" +PR = "r5" SRC_URI += "file://debian.patch;patch=1 \ file://armeb.patch;patch=1 \ diff --git a/packages/openssl/openssl_0.9.7g.bb b/packages/openssl/openssl_0.9.7g.bb index 4af1fbfd48..cc9162c1cf 100644 --- a/packages/openssl/openssl_0.9.7g.bb +++ b/packages/openssl/openssl_0.9.7g.bb @@ -2,7 +2,7 @@ inherit pkgconfig require openssl.inc -PR = "r2" +PR = "r3" SRC_URI += "file://debian.patch;patch=1 \ file://armeb.patch;patch=1;pnum=0 \ -- cgit v1.2.3 From 6a03b70703bd0f335b9709c0b2386858f7b82291 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 7 May 2007 17:34:46 +0000 Subject: linux 2.6.20: drop Simpad and Progear support --- packages/linux/linux/progear/progear_bl-r6.patch | 200 -- .../linux/simpad/linux-2.6.20.SIMpad-mq200.patch | 2303 -------------------- .../linux-2.6.20.SIMpad-ucb1x00-switches.patch | 189 -- packages/linux/linux_2.6.20.bb | 11 +- 4 files changed, 1 insertion(+), 2702 deletions(-) delete mode 100644 packages/linux/linux/progear/progear_bl-r6.patch delete mode 100644 packages/linux/linux/simpad/linux-2.6.20.SIMpad-mq200.patch delete mode 100644 packages/linux/linux/simpad/linux-2.6.20.SIMpad-ucb1x00-switches.patch diff --git a/packages/linux/linux/progear/progear_bl-r6.patch b/packages/linux/linux/progear/progear_bl-r6.patch deleted file mode 100644 index 6ac01714b7..0000000000 --- a/packages/linux/linux/progear/progear_bl-r6.patch +++ /dev/null @@ -1,200 +0,0 @@ -From: Marcin Juszkiewicz - -Add control of LCD backlight for Frontpath ProGear HX1050+. -Patch is based on http://downloads.sf.net/progear/progear-lcd-0.2.tar.gz -driver by M Schacht. - -Signed-Off-By: Marcin Juszkiewicz - ---- -Patch follow kernel version 2.6.20 - - Kconfig | 8 +++ - Makefile | 1 - progear_bl.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 163 insertions(+) - -Index: git/drivers/video/backlight/Kconfig -=================================================================== ---- git.orig/drivers/video/backlight/Kconfig 2006-12-29 17:31:36.511043439 +0100 -+++ git/drivers/video/backlight/Kconfig 2007-02-07 08:57:31.020095845 +0100 -@@ -66,3 +66,11 @@ - If you have a HP Jornada 680, say y to enable the - backlight driver. - -+config BACKLIGHT_PROGEAR -+ tristate "Frontpath ProGear Backlight Driver" -+ depends on BACKLIGHT_DEVICE && PCI && X86 -+ default y -+ help -+ If you have a Frontpath ProGear say Y to enable the -+ backlight driver. -+ -Index: git/drivers/video/backlight/progear_bl.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ git/drivers/video/backlight/progear_bl.c 2007-02-07 08:55:46.813993140 +0100 -@@ -0,0 +1,154 @@ -+/* -+ * Backlight Driver for Frontpath ProGear HX1050+ -+ * -+ * Copyright (c) 2006 Marcin Juszkiewicz -+ * -+ * Based on Progear LCD driver by M Schacht -+ * -+ * -+ * Based on Sharp's Corgi Backlight Driver -+ * Based on Backlight Driver for HP Jornada 680 -+ * -+ * 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. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define PMU_LPCR 0xB0 -+#define SB_MPS1 0x61 -+#define HW_LEVEL_MAX 0x77 -+#define HW_LEVEL_MIN 0x4f -+ -+static struct pci_dev *pmu_dev = NULL; -+static struct pci_dev *sb_dev = NULL; -+ -+static int progearbl_set_intensity(struct backlight_device *bd) -+{ -+ int intensity = bd->props->brightness; -+ -+ if (bd->props->power != FB_BLANK_UNBLANK) -+ intensity = 0; -+ if (bd->props->fb_blank != FB_BLANK_UNBLANK) -+ intensity = 0; -+ -+ pci_write_config_byte(pmu_dev, PMU_LPCR, intensity + HW_LEVEL_MIN); -+ -+ return 0; -+} -+ -+static int progearbl_get_intensity(struct backlight_device *bd) -+{ -+ u8 intensity; -+ pci_read_config_byte(pmu_dev, PMU_LPCR, &intensity); -+ -+ return intensity - HW_LEVEL_MIN; -+} -+ -+static struct backlight_properties progearbl_data = { -+ .owner = THIS_MODULE, -+ .get_brightness = progearbl_get_intensity, -+ .update_status = progearbl_set_intensity, -+}; -+ -+static int progearbl_probe(struct platform_device *pdev) -+{ -+ u8 temp; -+ struct backlight_device *progear_backlight_device; -+ -+ pmu_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, 0); -+ if (!pmu_dev) { -+ printk("ALI M7101 PMU not found.\n"); -+ return -ENODEV; -+ } -+ -+ sb_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, 0); -+ if (!sb_dev) { -+ printk("ALI 1533 SB not found.\n"); -+ pci_dev_put(pmu_dev); -+ return -ENODEV; -+ } -+ -+ /* Set SB_MPS1 to enable brightness control. */ -+ pci_read_config_byte(sb_dev, SB_MPS1, &temp); -+ pci_write_config_byte(sb_dev, SB_MPS1, temp | 0x20); -+ -+ progear_backlight_device = backlight_device_register("progear-bl", -+ &pdev->dev, NULL, -+ &progearbl_data); -+ if (IS_ERR(progear_backlight_device)) -+ return PTR_ERR(progear_backlight_device); -+ -+ platform_set_drvdata(pdev, progear_backlight_device); -+ -+ progearbl_data.power = FB_BLANK_UNBLANK; -+ progearbl_data.brightness = HW_LEVEL_MAX - HW_LEVEL_MIN; -+ progearbl_data.max_brightness = HW_LEVEL_MAX - HW_LEVEL_MIN; -+ progearbl_set_intensity(progear_backlight_device); -+ -+ return 0; -+} -+ -+static int progearbl_remove(struct platform_device *pdev) -+{ -+ struct backlight_device *bd = platform_get_drvdata(pdev); -+ backlight_device_unregister(bd); -+ -+ return 0; -+} -+ -+static struct platform_driver progearbl_driver = { -+ .probe = progearbl_probe, -+ .remove = progearbl_remove, -+ .driver = { -+ .name = "progear-bl", -+ }, -+}; -+ -+static struct platform_device *progearbl_device; -+ -+static int __init progearbl_init(void) -+{ -+ int ret = platform_driver_register(&progearbl_driver); -+ -+ if (!ret) { -+ progearbl_device = platform_device_alloc("progear-bl", -1); -+ if (!progearbl_device) -+ return -ENOMEM; -+ -+ ret = platform_device_add(progearbl_device); -+ -+ if (ret) { -+ platform_device_put(progearbl_device); -+ platform_driver_unregister(&progearbl_driver); -+ } -+ } -+ -+ return ret; -+} -+ -+static void __exit progearbl_exit(void) -+{ -+ pci_dev_put(pmu_dev); -+ pci_dev_put(sb_dev); -+ -+ platform_device_unregister(progearbl_device); -+ platform_driver_unregister(&progearbl_driver); -+} -+ -+module_init(progearbl_init); -+module_exit(progearbl_exit); -+ -+MODULE_AUTHOR("Marcin Juszkiewicz "); -+MODULE_DESCRIPTION("ProGear Backlight Driver"); -+MODULE_LICENSE("GPL"); -Index: git/drivers/video/backlight/Makefile -=================================================================== ---- git.orig/drivers/video/backlight/Makefile 2006-12-29 17:31:36.511043439 +0100 -+++ git/drivers/video/backlight/Makefile 2007-02-06 21:34:54.503712923 +0100 -@@ -5,3 +5,4 @@ - obj-$(CONFIG_BACKLIGHT_CORGI) += corgi_bl.o - obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o - obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomolcd.o -+obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o diff --git a/packages/linux/linux/simpad/linux-2.6.20.SIMpad-mq200.patch b/packages/linux/linux/simpad/linux-2.6.20.SIMpad-mq200.patch deleted file mode 100644 index 841cf4566c..0000000000 --- a/packages/linux/linux/simpad/linux-2.6.20.SIMpad-mq200.patch +++ /dev/null @@ -1,2303 +0,0 @@ -diff -uNr linux-2.6.20.vanilla/drivers/video/Kconfig linux-2.6.20/drivers/video/Kconfig ---- linux-2.6.20.vanilla/drivers/video/Kconfig 2007-03-24 21:25:52.000000000 +0100 -+++ linux-2.6.20/drivers/video/Kconfig 2007-03-28 22:53:44.000000000 +0200 -@@ -1147,6 +1147,15 @@ - help - If you have a S3 Trio say Y. Say N for S3 Virge. - -+config FB_MQ200 -+ bool "MQ200 Driver" -+ depends on (FB = y) && ARM && ARCH_SA1100 -+ select FB_CFB_FILLRECT -+ select FB_CFB_COPYAREA -+ select FB_CFB_IMAGEBLIT -+ help -+ This is a MQ200 driver tested only on Siemens SIMpads. -+ - config FB_SAVAGE - tristate "S3 Savage support" - depends on FB && PCI && EXPERIMENTAL -diff -uNr linux-2.6.20.vanilla/drivers/video/Makefile linux-2.6.20/drivers/video/Makefile ---- linux-2.6.20.vanilla/drivers/video/Makefile 2007-03-24 21:25:52.000000000 +0100 -+++ linux-2.6.20/drivers/video/Makefile 2007-03-28 22:53:44.000000000 +0200 -@@ -30,6 +30,7 @@ - obj-$(CONFIG_FB_PM2) += pm2fb.o - obj-$(CONFIG_FB_PM3) += pm3fb.o - -+obj-$(CONFIG_FB_MQ200) += mq200/ - obj-$(CONFIG_FB_MATROX) += matrox/ - obj-$(CONFIG_FB_RIVA) += riva/ vgastate.o - obj-$(CONFIG_FB_NVIDIA) += nvidia/ -diff -uNr linux-2.6.20.vanilla/drivers/video/backlight/Kconfig linux-2.6.20/drivers/video/backlight/Kconfig ---- linux-2.6.20.vanilla/drivers/video/backlight/Kconfig 2007-03-24 21:25:53.000000000 +0100 -+++ linux-2.6.20/drivers/video/backlight/Kconfig 2007-03-28 22:53:44.000000000 +0200 -@@ -66,3 +66,10 @@ - If you have a HP Jornada 680, say y to enable the - backlight driver. - -+config FB_MQ200_LCD -+ bool "MQ200 LCD class implemetation" -+ depends on SA1100_SIMPAD && LCD_DEVICE -+ -+config FB_MQ200_BACKLIGHT -+ bool "MQ200 Backlight class implementation" -+ depends on SA1100_SIMPAD && BACKLIGHT_DEVICE -diff -uNr linux-2.6.20.vanilla/drivers/video/backlight/Makefile linux-2.6.20/drivers/video/backlight/Makefile ---- linux-2.6.20.vanilla/drivers/video/backlight/Makefile 2007-03-24 21:25:53.000000000 +0100 -+++ linux-2.6.20/drivers/video/backlight/Makefile 2007-03-28 22:53:44.000000000 +0200 -@@ -5,3 +5,5 @@ - obj-$(CONFIG_BACKLIGHT_CORGI) += corgi_bl.o - obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o - obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomolcd.o -+obj-$(CONFIG_FB_MQ200_BACKLIGHT) += simpad_bl.o -+obj-$(CONFIG_FB_MQ200_LCD) += simpad_lcd.o -diff -uNr linux-2.6.20.vanilla/drivers/video/backlight/simpad_bl.c linux-2.6.20/drivers/video/backlight/simpad_bl.c ---- linux-2.6.20.vanilla/drivers/video/backlight/simpad_bl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20/drivers/video/backlight/simpad_bl.c 2007-03-28 22:53:44.000000000 +0200 -@@ -0,0 +1,109 @@ -+/* -+ * GPLv2 backlight_device_register -+ * -+ * 2007/03/24 mrdata -+ * - added .brightness=127 in -+ * struct backlight_properties simpad_bl_props() -+ */ -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+#include "../mq200/mq200_data.h" -+ -+#define SIMPAD_BACKLIGHT_MASK 0x00a10044 -+#define MAX_BRIGHT 254 -+#define REGISTER_BASE 0xf2e00000 -+ -+ -+static int simpad_bl_get_brightness(struct backlight_device *dev) -+{ -+ u32 pwmctl; -+ -+ pwmctl = readl(FP0FR(REGISTER_BASE)); -+ pwmctl &= ~SIMPAD_BACKLIGHT_MASK; -+ pwmctl = pwmctl >> 8; -+ pwmctl = MAX_BRIGHT - pwmctl; -+ -+ return pwmctl; -+} -+ -+static int simpad_bl_set_brightness(int bright) -+{ -+ union fp0fr fp0fr; -+ unsigned long dutyCycle, pwmcontrol; -+ -+ if(bright > MAX_BRIGHT) -+ bright = MAX_BRIGHT; -+ -+ /* -+ * Determine dutyCycle. -+ * Note: the lower the value, the brighter the display! -+ */ -+ -+ dutyCycle = MAX_BRIGHT - bright; -+ -+ /* -+ *Configure PWM0 (source clock = oscillator clock, pwm always enabled, -+ *zero, clock pre-divider = 4) pwm frequency = 12.0kHz -+ */ -+ fp0fr.whole = readl(FP0FR(REGISTER_BASE)); -+ pwmcontrol = fp0fr.whole & 0xffff00ff; -+ fp0fr.whole &= 0xffffff00; -+ fp0fr.whole |= 0x00000044; -+ writel(fp0fr.whole, FP0FR(REGISTER_BASE)); -+ -+ /* Write to pwm duty cycle register. */ -+ fp0fr.whole = dutyCycle << 8; -+ fp0fr.whole &= 0x0000ff00; -+ fp0fr.whole |= pwmcontrol; -+ writel(fp0fr.whole, FP0FR(REGISTER_BASE)); -+ -+ return 0; -+} -+ -+static int simpad_bl_update_status(struct backlight_device *dev) -+{ -+ return simpad_bl_set_brightness(dev->props->brightness); -+} -+ -+static struct backlight_properties simpad_bl_props = { -+ .owner = THIS_MODULE, -+ .update_status = simpad_bl_update_status, -+ .get_brightness = simpad_bl_get_brightness, -+ .brightness=127, -+ .max_brightness = MAX_BRIGHT, -+}; -+ -+static struct backlight_device *simpad_bl_device = NULL; -+ -+static int __init simpad_bl_init(void) { -+ simpad_bl_device = backlight_device_register("mq200_fb0", NULL, -+ NULL, &simpad_bl_props); -+ return simpad_bl_device != NULL; -+} -+ -+static void __exit simpad_bl_exit(void) { -+ backlight_device_unregister(simpad_bl_device); -+} -+ -+ -+module_init(simpad_bl_init); -+module_exit(simpad_bl_exit); -+MODULE_AUTHOR("Holger Hans Peter Freyther"); -+MODULE_LICENSE("GPL"); -diff -uNr linux-2.6.20.vanilla/drivers/video/backlight/simpad_lcd.c linux-2.6.20/drivers/video/backlight/simpad_lcd.c ---- linux-2.6.20.vanilla/drivers/video/backlight/simpad_lcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20/drivers/video/backlight/simpad_lcd.c 2007-03-28 22:58:41.000000000 +0200 -@@ -0,0 +1,80 @@ -+/* -+ * GPLv2 -+#include -+ -+#include -+#include -+ -+extern long get_cs3_shadow(void); -+extern void set_cs3_bit(int); -+extern void clear_cs3_bit(int); -+ -+#define UNUSED(x) x=x -+ -+static int simpad_lcd_get_power(struct lcd_device* dev) -+{ -+ UNUSED(dev); -+ -+ return (get_cs3_shadow() & DISPLAY_ON) ? 0 : 4; -+} -+ -+static int simpad_lcd_set_power(struct lcd_device* dev, int power) -+{ -+ UNUSED(dev); -+ -+ if( power == 4 ) -+ clear_cs3_bit(DISPLAY_ON); -+ else -+ set_cs3_bit(DISPLAY_ON); -+ -+ return 0; -+} -+ -+static int simpad_lcd_get_contrast(struct lcd_device* dev) -+{ -+ UNUSED(dev); -+ -+ return 0; -+} -+ -+static int simpad_lcd_set_contrast(struct lcd_device* dev, int contrast) -+{ -+ UNUSED(dev); -+ -+ UNUSED(contrast); -+ -+ return 0; -+} -+ -+static struct lcd_properties simpad_lcd_props = { -+ .owner = THIS_MODULE, -+ .get_power = simpad_lcd_get_power, -+ .set_power = simpad_lcd_set_power, -+ .get_contrast = simpad_lcd_get_contrast, -+ .set_contrast = simpad_lcd_set_contrast, -+ .max_contrast = 0 -+}; -+ -+static struct lcd_device* simpad_lcd_device = NULL; -+ -+static int __init simpad_lcd_init(void) { -+ simpad_lcd_device = lcd_device_register("mq200_fb0", NULL, -+ &simpad_lcd_props); -+ return simpad_lcd_device != NULL; -+} -+ -+static void __exit simpad_lcd_exit(void) { -+ lcd_device_unregister(simpad_lcd_device); -+} -+ -+module_init(simpad_lcd_init); -+module_exit(simpad_lcd_exit); -diff -uNr linux-2.6.20.vanilla/drivers/video/mq200/Makefile linux-2.6.20/drivers/video/mq200/Makefile ---- linux-2.6.20.vanilla/drivers/video/mq200/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20/drivers/video/mq200/Makefile 2007-03-28 22:53:44.000000000 +0200 -@@ -0,0 +1,6 @@ -+# Makefile for mq200 video driver -+# 4 Aug 2003, Holger Hans Peter Freyther -+# -+ -+obj-$(CONFIG_FB_MQ200) += mq_skeleton.o mq_external.o -+ -diff -uNr linux-2.6.20.vanilla/drivers/video/mq200/mq200_data.h linux-2.6.20/drivers/video/mq200/mq200_data.h ---- linux-2.6.20.vanilla/drivers/video/mq200/mq200_data.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20/drivers/video/mq200/mq200_data.h 2007-03-28 22:53:44.000000000 +0200 -@@ -0,0 +1,1120 @@ -+/* -+ * From ucLinux mq200fb.c and mq200fb.h -+ * -+ * 2007/03/11 mrdata: -+ * insert registers for graphics controller 2 module -+ */ -+ -+#ifndef __MQ200_FB_H__ -+#define __MQ200_FB_H__ -+ -+struct mq200_io_regions { -+ u32 fb_size; /* framebuffer size */ -+ unsigned long phys_mmio_base; /* physical register memory base */ -+ unsigned long virt_mmio_base; /* virtual start of registers */ -+ unsigned long phys_fb_base; /* physical address of frame buffer */ -+ unsigned long virt_fb_base; /* virtual start of the framebuffer */ -+}; -+ -+#define MQ200_MONITOR_HORI_RES(info) info->monitor_info.horizontal_res -+#define MQ200_MONITOR_VERT_RES(info) info->monitor_info.vertical_res -+#define MQ200_MONITOR_DEPTH(info) info->monitor_info.depth -+#define MQ200_MONITOR_LINE_LENGTH(info) info->monitor_info.line_length -+ -+struct mq200_monitor_info { -+ unsigned int horizontal_res; -+ unsigned int vertical_res; -+ unsigned int depth; -+ unsigned int refresh; -+ unsigned int line_length; -+ unsigned long flags; -+}; -+ -+ -+/** -+ * Addresses of Module -+ */ -+#define MQ200_FB_BASE (x) (x + 0x1800000) /* framebuffer */ -+#define MQ200_FB_SIZE 0x200000 /* framebuffer size in bytes */ -+#define MQ200_REGS_BASE(x) (x + 0x1e00000) /* start of registers area */ -+#define MQ200_REGS_SIZE 0x200000 /* registers area size */ -+ -+#define PMU_OFFSET 0x00000 /* power management */ -+#define CPU_OFFSET 0x02000 /* CPU interface */ -+#define MIU_OFFSET 0x04000 /* memory controller */ -+#define IN_OFFSET 0x08000 /* interrupt controller */ -+#define GC_OFFSET 0x0a000 /* graphics controller 1&2 */ -+#define GE_OFFSET 0x0c000 /* graphics engine */ -+#define FPI_OFFSET 0x0e000 /* flat panel controller */ -+#define CP1_OFFSET 0x10000 /* color palette 1 */ -+#define DC_OFFSET 0x14000 /* device configuration */ -+#define PCI_OFFSET 0x16000 /* PCI configuration */ -+#define PSF_OFFSET 0x18000 /* ??? */ -+ -+ -+/**** -+ * Registers -+ */ -+ -+/* power management unit */ -+#define PMR(addr) (addr + PCI_OFFSET + 0x40)/* power management -+ register */ -+#define PMR_VALUE 0x06210001 /* expected read value of PMR register */ -+#define PM00R(addr) (addr + PMU_OFFSET + 0x00) /* power management unit -+ configuration -+ register */ -+#define PM01R(addr) (addr + PMU_OFFSET + 0x04) /* D1 state control */ -+#define PM02R(addr) (addr + PMU_OFFSET + 0x08) /* d2 state control */ -+#define PM06R(addr) (addr + PMU_OFFSET + 0x18) /* PLL 2 programming */ -+#define PM07R(addr) (addr + PMU_OFFSET + 0x1c) /* PLL 3 programming */ -+ -+#define PMCSR(addr) (addr + PCI_OFFSET + 0x44) /* power management -+ control/status -+ register */ -+ -+/* memory interface unit */ -+#define MM00R(addr) (addr + MIU_OFFSET + 0x00)/* MIU interface control -+ 0 */ -+#define MM01R(addr) (addr + MIU_OFFSET + 0x04) /* MIU interface control -+ 1 */ -+#define MM02R(addr) (addr + MIU_OFFSET + 0x08) /* memory interface -+ control 2 */ -+#define MM03R(addr) (addr + MIU_OFFSET + 0x0c) /* memory interface -+ control 3 */ -+#define MM04R(addr) (addr + MIU_OFFSET + 0x10) /* memory interface -+ control 4 */ -+/* graphics controller 1 module */ -+#define GC00R(addr) (addr + GC_OFFSET + 0x00) /* graphics controller 1 -+ control */ -+#define GC01R(addr) (addr + GC_OFFSET + 0x04) /* graphics controller -+ CRT control */ -+#define GC02R(addr) (addr + GC_OFFSET + 0x08) /* horizontal display 1 -+ control */ -+#define GC03R(addr) (addr + GC_OFFSET + 0x0c) /* vertical display 1 -+ control */ -+#define GC04R(addr) (addr + GC_OFFSET + 0x10) /* horizontal sync 1 -+ control */ -+#define GC05R(addr) (addr + GC_OFFSET + 0x14) /* vertical sync 1 -+ control */ -+#define GC07R(addr) (addr + GC_OFFSET + 0x1c) /* vertical display 1 -+ count */ -+#define GC08R(addr) (addr + GC_OFFSET + 0x20) /* horizontal window 1 -+ control */ -+#define GC09R(addr) (addr + GC_OFFSET + 0x24) /* vertical window 1 -+ control */ -+#define GC0AR(addr) (addr + GC_OFFSET + 0x28) /* alternate horizontal -+ window 1 control */ -+#define GC0BR(addr) (addr + GC_OFFSET + 0x2c) /* alternate vertical -+ window 1 control */ -+#define GC0CR(addr) (addr + GC_OFFSET + 0x30) /* window 1 -+ start address */ -+#define GC0DR(addr) (addr + GC_OFFSET + 0x34) /* alternate window 1 -+ start address */ -+#define GC0ER(addr) (addr + GC_OFFSET + 0x38) /* alternate window 1 -+ stride */ -+#define GC0FR(addr) (addr + GC_OFFSET + 0x3c) /* alternate window 1 -+ line size */ -+#define GC10R(addr) (addr + GC_OFFSET + 0x40) /* hardware cursor 1 -+ position */ -+#define GC11R(addr) (addr + GC_OFFSET + 0x44) /* hardware cursor 1 -+ start address and -+ offset */ -+#define GC12R(addr) (addr + GC_OFFSET + 0x48) /* hardware cursor 1 -+ foreground color */ -+#define GC13R(addr) (addr + GC_OFFSET + 0x4c) /* hardware cursor 1 -+ background color */ -+ -+/* graphics controller 2 module */ -+#define GC20R(addr) (addr + GC_OFFSET + 0x80) /* graphics controller 2 -+ control */ -+#define GC21R(addr) (addr + GC_OFFSET + 0x84) /* graphics controller -+ CRC control */ -+#define GC22R(addr) (addr + GC_OFFSET + 0x88) /* horizontal display 2 -+ control */ -+#define GC23R(addr) (addr + GC_OFFSET + 0x8c) /* vertical display 2 -+ control */ -+#define GC24R(addr) (addr + GC_OFFSET + 0x90) /* horizontal sync 2 -+ control */ -+#define GC25R(addr) (addr + GC_OFFSET + 0x94) /* vertical sync 2 -+ control */ -+#define GC27R(addr) (addr + GC_OFFSET + 0x9c) /* vertical display 2 -+ count */ -+#define GC28R(addr) (addr + GC_OFFSET + 0xa0) /* horizontal window 2 -+ control */ -+#define GC29R(addr) (addr + GC_OFFSET + 0xa4) /* vertical window 2 -+ control */ -+#define GC2AR(addr) (addr + GC_OFFSET + 0xa8) /* alternate horizontal -+ window 2 control */ -+#define GC2BR(addr) (addr + GC_OFFSET + 0xac) /* alternate vertical -+ window 2 control */ -+#define GC2CR(addr) (addr + GC_OFFSET + 0xb0) /* window 2 -+ start address */ -+#define GC2DR(addr) (addr + GC_OFFSET + 0xb4) /* alternate window 2 -+ start address */ -+#define GC2ER(addr) (addr + GC_OFFSET + 0xb8) /* alternate window 2 -+ stride */ -+#define GC2FR(addr) (addr + GC_OFFSET + 0xbc) /* alternate window 2 -+ line size */ -+#define GC30R(addr) (addr + GC_OFFSET + 0xc0) /* hardware cursor 2 -+ position */ -+#define GC31R(addr) (addr + GC_OFFSET + 0xc4) /* hardware cursor 2 -+ start address and -+ offset */ -+#define GC32R(addr) (addr + GC_OFFSET + 0xc8) /* hardware cursor 2 -+ foreground color */ -+#define GC33R(addr) (addr + GC_OFFSET + 0xcc) /* hardware cursor 2 -+ background color */ -+ -+/* graphics engine */ -+#define ROP_SRCCOPY 0xCC /* dest = source */ -+#define ROP_SRCPAINT 0xEE /* dest = source OR dest */ -+#define ROP_SRCAND 0x88 /* dest = source AND dest */ -+#define ROP_SRCINVERT 0x66 /* dest = source XOR dest */ -+#define ROP_SRCERASE 0x44 /* dest = source AND (NOT dest) */ -+#define ROP_NOTSRCCOPY 0x33 /* dest = NOT source */ -+#define ROP_NOTSRCERASE 0x11 /* dest = (NOT source) AND (NOT dest) */ -+#define ROP_MERGECOPY 0xC0 /* dest = source AND pattern */ -+#define ROP_MERGEPAINT 0xBB /* dest = (NOT source) OR dest */ -+#define ROP_PATCOPY 0xF0 /* dest = pattern */ -+#define ROP_PATPAINT 0xFB /* dest = DPSnoo */ -+#define ROP_PATINVERT 0x5A /* dest = pattern XOR dest */ -+#define ROP_DSTINVERT 0x55 /* dest = NOT dest */ -+#define ROP_BLACKNESS 0x00 /* dest = BLACK */ -+#define ROP_WHITENESS 0xFF /* dest = WHITE */ -+ -+#define GE00R(addr) (addr + GE_OFFSET + 0x00) /* primary drawing command -+ register */ -+#define GE01R(addr) (addr + GE_OFFSET + 0x04) /* primary width and -+ height register */ -+#define GE02R(addr) (addr + GE_OFFSET + 0x08) /* primary destination -+ address register */ -+#define GE03R(addr) (addr + GE_OFFSET + 0x0c) /* primary source XY -+ register */ -+#define GE04R(addr) (addr + GE_OFFSET + 0x10) /* primary color compare -+ register */ -+#define GE05R(addr) (addr + GE_OFFSET + 0x14) /* primary clip left/top -+ register */ -+#define GE06R(addr) (addr + GE_OFFSET + 0x18) /* primary clip -+ right/bottom register -+ */ -+#define GE07R(addr) (addr + GE_OFFSET + 0x1c) /* primary source and -+ pattern offset -+ register */ -+#define GE08R(addr) (addr + GE_OFFSET + 0x20) /* primary foreground -+ color -+ register/rectangle -+ fill register */ -+#define GE09R(addr) (addr + GE_OFFSET + 0x24) /* source stride/offset -+ register */ -+#define GE0AR(addr) (addr + GE_OFFSET + 0x28) /* destination stride -+ register and color -+ depth */ -+#define GE0BR(addr) (addr + GE_OFFSET + 0x2c) /* image base address -+ register */ -+#define GE40R(addr) (addr + GE_OFFSET + 0x100) /* mono pattern register -+ 0 */ -+#define GE41R(addr) (addr + GE_OFFSET + 0x104) /* mono pattern register -+ 1 */ -+#define GE42R(addr) (addr + GE_OFFSET + 0x108) /* foreground color -+ register */ -+#define GE43R(addr) (addr + GE_OFFSET + 0x10c) /* background color -+ register */ -+/* color palette */ -+#define C1xxR(addr, regno) \ -+ (addr + CP1_OFFSET + (regno) * 4) /* graphics controller color -+ palette 1 */ -+/* device configuration */ -+#define DC00R(addr) (addr + DC_OFFSET + 0x00) /* device configuration -+ register 0 */ -+#define DC_RESET 0x4000 -+/* PCI configuration space */ -+#define PC00R(addr) (addr + PCI_OFFSET + 0x00)/* device ID/vendor ID -+ register */ -+/* Flatpanel Control */ -+#define FP00R(addr) (addr + FPI_OFFSET + 0x00) /* Flat Panel Control 0 */ -+#define FP01R(addr) (addr + FPI_OFFSET + 0x04) /* Flat Panel Output Pin */ -+#define FP02R(addr) (addr + FPI_OFFSET + 0x08) /* Flat Panel Gener Purpose -+ Outout Control Register */ -+#define FP03R(addr) (addr + FPI_OFFSET + 0x0c) /* General Purpose I/O Port -+ Control Register */ -+#define FP04R(addr) (addr + FPI_OFFSET + 0x10) /* STN Panel Control Register */ -+#define FP05R(addr) (addr + FPI_OFFSET + 0x14) /* D-STN Half Frame Buffer -+ Control Register -By Guess */ -+#define FP0FR(addr) (addr + FPI_OFFSET + 0x3c) /* Pulse Width Modulation -+ Control Register */ -+#define FRCTL_PATTERN_COUNT 32 -+#define FP10R(addr) (addr + FPI_OFFSET + 0x40) /* Frame-Rate Control Pattern -+ Register */ -+#define FP11R(addr) (addr + FPI_OFFSET + 0x44) -+#define FP2FR(addr) (addr + FPI_OFFSET + 0xc0) /* Frame-Rate Control Weight -+ Registers */ -+ -+ -+ -+ -+/* power management miscellaneous control */ -+union pm00r { -+ struct { -+ u32 pll1_n_b5 :1; /* PLL 1 N parameter bit 5 is 0 */ -+ u32 reserved_1 :1; -+ u32 pll2_enbl :1; /* PLL 2 enable */ -+ u32 pll3_enbl :1; /* PLL 3 enable */ -+ u32 reserved_2 :1; -+ u32 pwr_st_ctrl :1; /* power state status control */ -+ u32 reserved_3 :2; -+ -+ u32 ge_enbl :1; /* graphics engine enable */ -+ u32 ge_bsy_gl :1; /* graphics engine force busy (global) */ -+ u32 ge_bsy_lcl :1; /* graphics engine force busy (local) */ -+ u32 ge_clock :2; /* graphics engine clock select */ -+ u32 ge_cmd_fifo :1; /* graphics engine command FIFO reset */ -+ u32 ge_src_fifo :1; /* graphics engine CPU source FIFO reset */ -+ u32 miu_pwr_seq :1; /* memory interface unit power sequencing -+ enable */ -+ -+ u32 d3_mem_rfsh :1; /* D3 memory refresh */ -+ u32 d4_mem_rfsh :1; /* D4 memory refresh */ -+ u32 gpwr_intrvl :2; /* general power sequencing interval */ -+ u32 fppwr_intrvl:2; /* flat panel power sequencing interval */ -+ u32 gpwr_seq_ctr:1; /* general power sequencing interval control */ -+ u32 pmu_tm :1; /* PMU test mode */ -+ -+ u32 pwr_state :2; /* power state (read only) */ -+ u32 pwr_seq_st :1; /* power sequencing active status (read -+ only) */ -+ u32 reserved_4 :5; -+ } part; -+ u32 whole; -+}; -+ -+/* D1 state control */ -+union pm01r { -+ struct { -+ u32 osc_enbl :1; /* D1 oscillator enable */ -+ u32 pll1_enbl :1; /* D1 PLL 1 enable */ -+ u32 pll2_enbl :1; /* D1 PLL 2 enable */ -+ u32 pll3_enbl :1; /* D1 PLL 3 enable */ -+ u32 miu_enbl :1; /* D1 Memory Interface Unit (MIU) enable */ -+ u32 mem_rfsh :1; /* D1 memory refresh enable */ -+ u32 ge_enbl :1; /* D1 Graphics Engine (GE) enable */ -+ u32 reserved_1 :1; -+ -+ u32 crt_enbl :1; /* D1 CRT enable */ -+ u32 fpd_enbl :1; /* D1 Flat Panel enable */ -+ u32 reserved_2 :6; -+ -+ u32 ctl1_enbl :1; /* D1 controller 1 enable */ -+ u32 win1_enbl :1; /* D1 window 1 enable */ -+ u32 awin1_enbl :1; /* D1 alternate window 1 enable */ -+ u32 cur1_enbl :1; /* D1 cursor 1 enable */ -+ u32 reserved_3 :4; -+ -+ u32 ctl2_enbl :1; /* D1 controller 2 enable */ -+ u32 win2_enbl :1; /* D1 window 2 enable */ -+ u32 awin2_enbl :1; /* D1 alternate window 2 enable */ -+ u32 cur2_enbl :1; /* D1 cursor 2 enable */ -+ u32 reserved_4 :4; -+ } part; -+ u32 whole; -+}; -+ -+/* D2 state control */ -+union pm02r { -+ struct { -+ u32 osc_enbl :1; /* D2 oscillator enable */ -+ u32 pll1_enbl :1; /* D2 PLL 1 enable */ -+ u32 pll2_enbl :1; /* D2 PLL 2 enable */ -+ u32 pll3_enbl :1; /* D2 PLL 3 enable */ -+ u32 miu_enbl :1; /* D2 Memory Interface Unit (MIU) enable */ -+ u32 mem_rfsh :1; /* D2 memory refresh enable */ -+ u32 ge_enbl :1; /* D2 Graphics Engine (GE) enable */ -+ u32 reserved_1 :1; -+ -+ u32 crt_enbl :1; /* D2 CRT enable */ -+ u32 fpd_enbl :1; /* D2 Flat Panel enable */ -+ u32 reserved_2 :6; -+ -+ u32 ctl1_enbl :1; /* D2 controller 1 enable */ -+ u32 win1_enbl :1; /* D2 window 1 enable */ -+ u32 awin1_enbl :1; /* D2 alternate window 1 enable */ -+ u32 cur1_enbl :1; /* D2 cursor 1 enable */ -+ u32 reserved_3 :4; -+ -+ u32 ctl2_enbl :1; /* D2 controller 2 enable */ -+ u32 win2_enbl :1; /* D2 window 2 enable */ -+ u32 awin2_enbl :1; /* D2 alternate window 2 enable */ -+ u32 cur2_enbl :1; /* D2 cursor 2 enable */ -+ u32 reserved_4 :4; -+ } part; -+ u32 whole; -+}; -+ -+/* PLL 2 programming */ -+union pm06r { -+ struct { -+ u32 clk_src :1; /* PLL 2 reference clock source */ -+ u32 bypass :1; /* PLL 2 bypass */ -+ u32 reserved_1 :2; -+ u32 p_par :3; /* PLL 2 P parameter */ -+ u32 reserved_2 :1; -+ -+ u32 n_par :5; /* PLL 2 N parameter */ -+ u32 reserved_3 :3; -+ -+ u32 m_par :8; /* PLL 2 M parameter */ -+ -+ u32 reserved_4 :4; -+ u32 trim :4; /* PLL 2 trim value */ -+ } part; -+ u32 whole; -+}; -+ -+/* PLL 3 programming */ -+union pm07r { -+ struct { -+ u32 clk_src :1; /* PLL 3 reference clock source */ -+ u32 bypass :1; /* PLL 3 bypass */ -+ u32 reserved_1 :2; -+ u32 p_par :3; /* PLL 3 P parameter */ -+ u32 reserved_2 :1; -+ -+ u32 n_par :5; /* PLL 3 N parameter */ -+ u32 reserved_3 :3; -+ -+ u32 m_par :8; /* PLL 3 M parameter */ -+ -+ u32 reserved_4 :4; -+ u32 trim :4; /* PLL 3 trim value */ -+ } part; -+ u32 whole; -+}; -+ -+ -+ -+/* MIU interface control 1 */ -+union mm00r { -+ struct { -+ u32 miu_enbl :1; /* MIU enable bit */ -+ u32 mr_dsbl :1; /* MIU reset disable bit */ -+ u32 edr_dsbl :1; /* embedded DRAM reset disable bit */ -+ u32 reserved_1 :29; -+ } part; -+ u32 whole; -+}; -+ -+/* MIU interface control 2 */ -+union mm01r { -+ struct { -+ u32 mc_src :1; /* memory clock source */ -+ u32 msr_enbl :1; /* memory slow refresh enable bit */ -+ u32 pb_cpu :1; /* page break enable for CPU */ -+ u32 pb_gc1 :1; /* page break enable for GC1 */ -+ u32 pb_gc2 :1; /* page break enable for GC2 */ -+ u32 pb_stn_r :1; /* page break enable for STN read */ -+ u32 pb_stn_w :1; /* page break enable for STN write */ -+ u32 pb_ge :1; /* page break enable for GE */ -+ u32 reserved_1 :4; -+ u32 mr_interval :14; /* normal memory refresh time interval */ -+ u32 reserved_2 :4; -+ u32 edarm_enbl :1; /* embedded DRAM auto-refresh mode enable */ -+ u32 eds_enbl :1; /* EDRAM standby enable for EDRAM normal -+ mode operation */ -+ } part; -+ u32 whole; -+}; -+ -+/* memory interface control 3 */ -+union mm02r { -+ struct { -+ u32 bs_ :2; -+ u32 bs_stnr :2; /* burst count for STN read memory cycles */ -+ u32 bs_stnw :2; /* burst count for STN write memroy cycles */ -+ u32 bs_ge :2; /* burst count for graphics engine -+ read/write memroy cycles */ -+ u32 bs_cpuw :2; /* burst count for CPU write memory cycles */ -+ u32 fifo_gc1 :4; /* GC1 display refresh FIFO threshold */ -+ u32 fifo_gc2 :4; /* GC2 display refresh FIFO threshold */ -+ u32 fifo_stnr :4; /* STN read FIFO threshold */ -+ u32 fifo_stnw :4; /* STN write FIFO threshold */ -+ u32 fifo_ge_src :3; /* GE source read FIFO threshold */ -+ u32 fifo_ge_dst :3; /* GE destination read FIFO threshold */ -+ } part; -+ u32 whole; -+}; -+ -+/* memory interface control 4 */ -+union mm03r { -+ struct { -+ u32 rd_late_req :1; /* read latency request */ -+ u32 reserved_1 :31; -+ } part; -+ u32 whole; -+}; -+ -+/* memory interface control 5 */ -+union mm04r { -+ struct { -+ u32 latency :3; /* EDRAM latency */ -+ u32 dmm_cyc :1; /* enable for the dummy cycle insertion -+ between read and write cycles */ -+ u32 pre_dmm_cyc :1; /* enable for the dummy cycle insertion -+ between read/write and precharge cycles -+ for the same bank */ -+ u32 reserved_1 :3; -+ u32 bnk_act_cls :2; /* bank activate command to bank close -+ command timing interval control */ -+ u32 bnk_act_rw :1; /* bank activate command to read/wirte -+ command timing interval control */ -+ u32 bnk_cls_act :1; /* bank close command to bank activate -+ command timing interval control */ -+ u32 trc :1; /* row cycle time */ -+ u32 reserved_2 :3; -+ u32 delay_r :2; /* programmable delay for read clock */ -+ u32 delay_m :2; /* programmable delay for internal memory -+ clock */ -+ } part; -+ u32 whole; -+}; -+ -+/* graphics controller 1 register */ -+union gc00r { -+ struct { -+ u32 ctl_enbl :1; /* Controller 1 Enable */ -+ u32 hc_reset :1; /* Horizontal Counter 1 Reset */ -+ u32 vc_reset :1; /* Vertical Counter 1 Reset */ -+ u32 iwin_enbl :1; /* Image Window 1 Enable */ -+ u32 gcd :4; /* Graphics Color Depth (GCD) */ -+ -+ u32 hc_enbl :1; /* Hardware Cursor 1 Enable */ -+ u32 reserved_1 :2; -+ u32 aiwin_enbl :1; /* Alternate Image Window Enable */ -+ u32 agcd :4; /* Alternate Graphics Color Depth (AGCD) */ -+ -+ u32 g1rclk_src :2; /* G1RCLK Source */ -+ u32 tm0 :1; /* Test Mode 0 */ -+ u32 tm1 :1; /* Test Mode 1 */ -+ u32 fd :3; /* G1MCLK First Clock Divisor (FD1) */ -+ u32 reserved_2 :1; -+ -+ u32 sd :8; /* G1MCLK Second Clock Divisor (SD1) */ -+ } part; -+ u32 whole; -+}; -+ -+/* graphics controller CRT control */ -+union gc01r { -+ struct { -+ u32 dac_enbl :2; /* CRT DAC enable */ -+ u32 hsync_out :1; /* CRT HSYNC output during power down mode */ -+ u32 vsync_out :1; /* CRT VSYNC output during power down mode */ -+ u32 hsync_ctl :2; /* CRT HSYNC control */ -+ u32 vsync_ctl :2; /* CRT VSYNC control */ -+ /**/ -+ u32 hsync_pol :1; /* CRT HSYNC polarity */ -+ u32 vsync_pol :1; /* CRT VSYNC polarity */ -+ u32 sync_p_enbl :1; /* sync pedestal enable */ -+ u32 blnk_p_enbl :1; /* blank pedestal enable */ -+ u32 c_sync_enbl :1; /* composite sync enable */ -+ u32 vref_sel :1; /* VREF select */ -+ u32 mn_sns_enbl :1; /* monitor sense enable */ -+ u32 ct_out_enbl :1; /* constant output enable */ -+ /**/ -+ u32 dac_out_lvl :8; /* monitor sense DAC output level */ -+ /**/ -+ u32 blue_dac_r :1; /* blue DAC sense result */ -+ u32 green_dac_r :1; /* green DAC sense result */ -+ u32 red_dac_r :1; /* red DAC sense result */ -+ u32 reserved_1 :1; -+ u32 mon_col_sel :1; /* mono/color monitor select */ -+ u32 reserved_2 :3; -+ } part; -+ u32 whole; -+}; -+ -+/* horizontal display 1 control */ -+union gc02r { -+ struct { -+ u32 hd1t :12; /* horizontal display 1 total */ -+ u32 reserved_1 :4; -+ -+ u32 hd1e :12; /* horizontal display 1 end */ -+ u32 reserved_2 :4; -+ } part; -+ u32 whole; -+}; -+ -+/* vertical display 1 control */ -+union gc03r { -+ struct { -+ u32 vd1t :12; /* vertical display 1 total */ -+ u32 reserved_1 :4; -+ -+ u32 vd1e :12; /* vertical display 1 end */ -+ u32 reserved_2 :4; -+ } part; -+ u32 whole; -+}; -+ -+/* horizontal sync 1 control */ -+union gc04r { -+ struct { -+ u32 hs1s :12; /* horizontal sync 1 start */ -+ u32 reserved_1 :4; -+ -+ u32 hs1e :12; /* horizontal sync 1 end */ -+ u32 reserved_2 :4; -+ } part; -+ u32 whole; -+}; -+ -+/* vertical sync 1 control */ -+union gc05r { -+ struct { -+ u32 vs1s :12; /* vertical sync 1 start */ -+ u32 reserved_1 :4; -+ -+ u32 vs1e :12; /* vertical sync 1 end */ -+ u32 reserved_2 :4; -+ } part; -+ u32 whole; -+}; -+ -+/* vertical display 1 count */ -+union gc07r { -+ struct { -+ u32 vd_cnt :12; /* vertical display 1 count */ -+ u32 reverved_1 :20; -+ } part; -+ u32 whole; -+}; -+ -+/* horizontal window 1 control */ -+union gc08r { -+ struct { -+ u32 hw1s :12; /* horizontal window 1 start (HW1S) */ -+ u32 reserved_1 :4; -+ -+ u32 hw1w :12; /* horizontal window 1 width (HW1W) */ -+ u32 w1ald :4; /* window 1 additional line data */ -+ } part; -+ u32 whole; -+}; -+ -+/* vertical window 1 control */ -+union gc09r { -+ struct { -+ u32 vw1s :12; /* vertical window 1 start */ -+ u32 reserved_1 :4; -+ u32 vw1h :12; /* vertical window 1 height */ -+ u32 reserved_2 :4; -+ } part; -+ u32 whole; -+}; -+ -+/* window 1 start address */ -+union gc0cr { -+ struct { -+ u32 w1sa :21; /* window 1 start address */ -+ u32 reserved_1 :11; -+ } part; -+ u32 whole; -+}; -+ -+/* window 1 stride */ -+union gc0er { -+ struct { -+ s16 w1st; /* window 1 stride */ -+ s16 aw1st; /* alternate window 1 stride */ -+ } part; -+ u32 whole; -+}; -+ -+/* hardware cursor 1 position */ -+union gc10r { -+ struct { -+ u32 hc1s :12; /* horizontal cursor 1 start */ -+ u32 reserved_1 :4; -+ u32 vc1s :12; /* vertical cursor 1 start */ -+ u32 reserved_2 :4; -+ } part; -+ u32 whole; -+}; -+ -+/* hardware cursor 1 start address and offset */ -+union gc11r { -+ struct { -+ u32 hc1sa :11; /* hardware cursor 1 start address */ -+ u32 reserved_1 :5; -+ u32 hc1o :6; /* horizontal cursor 1 offset */ -+ u32 reserved_2 :2; -+ u32 vc1o :6; /* vertical cursor 1 offset */ -+ u32 reserved_3 :2; -+ } part; -+ u32 whole; -+}; -+ -+/* hardware cursor 1 foreground color */ -+union gc12r { -+ struct { -+ u32 hc1fc :24; /* hardware cursor 1 foreground color */ -+ u32 reserved_1 :8; -+ } part; -+ u32 whole; -+}; -+ -+/* hardware cursor 1 background color */ -+union gc13r { -+ struct { -+ u32 hc1bc :24; /* hardware cursor 1 background color */ -+ u32 reserved_1 :8; -+ } part; -+ u32 whole; -+}; -+ -+ -+/* graphics controller 2 register */ -+union gc20r { -+ struct { -+ u32 ctl_enbl :1; /* Controller 2 Enable */ -+ u32 hc_reset :1; /* Horizontal Counter 2 Reset */ -+ u32 vc_reset :1; /* Vertical Counter 2 Reset */ -+ u32 iwin_enbl :1; /* Image Window 2 Enable */ -+ u32 gcd :4; /* Graphics Color Depth (GCD) */ -+ -+ u32 hc_enbl :1; /* Hardware Cursor 2 Enable */ -+ u32 reserved_1 :2; -+ u32 aiwin_enbl :1; /* Alternate Image Window Enable */ -+ u32 agcd :4; /* Alternate Graphics Color Depth (AGCD) */ -+ -+ u32 g2rclk_src :2; /* G2RCLK Source */ -+ u32 tm0 :1; /* Test Mode 0 */ -+ u32 tm1 :1; /* Test Mode 1 */ -+ u32 fd :3; /* G2MCLK First Clock Divisor (FD1) */ -+ u32 reserved_2 :1; -+ -+ u32 sd :8; /* G2MCLK Second Clock Divisor (SD1) */ -+ } part; -+ u32 whole; -+}; -+ -+/* graphics controller CRC control */ -+union gc21r { -+ struct { -+ u32 crc_enbl :1; /* CRC enable */ -+ u32 vsync_wait :1; /* CRC input data control waitime of VSYNC */ -+ u32 crc_o_sel :2; /* CRC output select */ -+ u32 reserved_1 :4; -+ u32 crc_result :22; /* CRC result (read only) */ -+ u32 reserved_2 :2; -+ } part; -+ u32 whole; -+}; -+ -+/* horizontal display 2 control */ -+union gc22r { -+ struct { -+ u32 hd2t :12; /* horizontal display 2 total */ -+ u32 reserved_1 :4; -+ -+ u32 hd2e :12; /* horizontal display 2 end */ -+ u32 reserved_2 :4; -+ } part; -+ u32 whole; -+}; -+ -+/* vertical display 2 control */ -+union gc23r { -+ struct { -+ u32 vd2t :12; /* vertical display 2 total */ -+ u32 reserved_1 :4; -+ -+ u32 vd2e :12; /* vertical display 2 end */ -+ u32 reserved_2 :4; -+ } part; -+ u32 whole; -+}; -+ -+/* horizontal sync 2 control */ -+union gc24r { -+ struct { -+ u32 hs2s :12; /* horizontal sync 2 start */ -+ u32 reserved_1 :4; -+ -+ u32 hs2e :12; /* horizontal sync 2 end */ -+ u32 reserved_2 :4; -+ } part; -+ u32 whole; -+}; -+ -+/* vertical sync 2 control */ -+union gc25r { -+ struct { -+ u32 vs2s :12; /* vertical sync 2 start */ -+ u32 reserved_1 :4; -+ -+ u32 vs2e :12; /* vertical sync 2 end */ -+ u32 reserved_2 :4; -+ } part; -+ u32 whole; -+}; -+ -+/* vertical display 2 count */ -+union gc27r { -+ struct { -+ u32 vd_cnt :12; /* vertical display 2 count */ -+ u32 reverved_1 :20; -+ } part; -+ u32 whole; -+}; -+ -+/* horizontal window 2 control */ -+union gc28r { -+ struct { -+ u32 hw2s :12; /* horizontal window 2 start (HW2S) */ -+ u32 reserved_1 :4; -+ -+ u32 hw2w :12; /* horizontal window 2 width (HW2W) */ -+ u32 w2ald :4; /* window 2 additional line data */ -+ } part; -+ u32 whole; -+}; -+ -+/* vertical window 2 control */ -+union gc29r { -+ struct { -+ u32 vw2s :12; /* vertical window 2 start */ -+ u32 reserved_1 :4; -+ u32 vw2h :12; /* vertical window 2 height */ -+ u32 reserved_2 :4; -+ } part; -+ u32 whole; -+}; -+ -+/* window 2 start address */ -+union gc2cr { -+ struct { -+ u32 w2sa :21; /* window 2 start address */ -+ u32 reserved_1 :11; -+ } part; -+ u32 whole; -+}; -+ -+/* window 2 stride */ -+union gc2er { -+ struct { -+ s16 w2st; /* window 2 stride */ -+ s16 aw2st; /* alternate window 2 stride */ -+ } part; -+ u32 whole; -+}; -+ -+/* hardware cursor 2 position */ -+union gc30r { -+ struct { -+ u32 hc2s :12; /* horizontal cursor 2 start */ -+ u32 reserved_1 :4; -+ u32 vc2s :12; /* vertical cursor 2 start */ -+ u32 reserved_2 :4; -+ } part; -+ u32 whole; -+}; -+ -+/* hardware cursor 2 start address and offset */ -+union gc31r { -+ struct { -+ u32 hc2sa :11; /* hardware cursor 2 start address */ -+ u32 reserved_1 :5; -+ u32 hc2o :6; /* horizontal cursor 2 offset */ -+ u32 reserved_2 :2; -+ u32 vc2o :6; /* vertical cursor 2 offset */ -+ u32 reserved_3 :2; -+ } part; -+ u32 whole; -+}; -+ -+/* hardware cursor 2 foreground color */ -+union gc32r { -+ struct { -+ u32 hc2fc :24; /* hardware cursor 2 foreground color */ -+ u32 reserved_1 :8; -+ } part; -+ u32 whole; -+}; -+ -+/* hardware cursor 2 background color */ -+union gc33r { -+ struct { -+ u32 hc2bc :24; /* hardware cursor 2 background color */ -+ u32 reserved_1 :8; -+ } part; -+ u32 whole; -+}; -+ -+ -+/* primary drawing command register */ -+union ge00r { -+ struct { -+ u32 rop :8; /* raster operation */ -+ /**/ -+ u32 cmd_typ :3; /* command type */ -+ u32 x_dir :1; /* x direction */ -+ u32 y_dir :1; /* y direction */ -+ u32 src_mem :1; /* source memory */ -+ u32 mon_src :1; /* mono source */ -+ u32 mon_ptn :1; /* mono pattern */ -+ /**/ -+ u32 dst_trns_e :1; /* destination transparency enable */ -+ u32 dst_trns_p :1; /* destination transparency polarity */ -+ u32 mon_trns_e :1; /* mono source or mono pattern transparency -+ enable */ -+ u32 mon_trns_p :1; /* mono transparency polarity */ -+ u32 mod_sel :1; /* memory to screen or off screen to screen -+ mode select */ -+ u32 alpha_sel :2; /* Alpha byte mask selection */ -+ u32 sol_col :1; /* solid color */ -+ /**/ -+ u32 stride_eq :1; /* source stride is equal to destination -+ stride */ -+ u32 rop2_sel :1; /* ROP2 code selection */ -+ u32 clipping :1; /* enable clipping */ -+ u32 auto_exec :1; /* auto execute */ -+ u32 reserved_1 :4; -+ } part; -+ u32 whole; -+}; -+ -+/* primary width and height register */ -+union ge01r { -+ struct { -+ u32 width :12; /* source/destination window width */ -+ u32 reserved_1 :4; -+ -+ u32 height :12; /* source/destination window height */ -+ u32 reserved_2 :1; -+ u32 reserved_3 :3; -+ } bitblt; -+ struct { -+ u32 dm :17; -+ u32 axis_major :12; -+ u32 x_y :1; /* x-major or y-major */ -+ u32 last_pix :1; /* decision to draw or not to draw the last -+ pixel of the line */ -+ u32 reserved_1 :1; -+ } bresenham; -+ u32 whole; -+}; -+ -+/* primary destination address register */ -+union ge02r { -+ struct { -+ u32 dst_x :12; /* destination x position */ -+ u32 reserved_1 :1; -+ u32 h_offset :3; /* mono/color pattern horizontal offset */ -+ -+ u32 dst_y :12; /* destination y position */ -+ u32 reserved_2 :1; -+ u32 v_offset :3; /* mono/color pattern vertical offset */ -+ } window; -+ struct { -+ u32 x :12; /* starting x coordinate */ -+ u32 dm :17; /* 17 bits major-axis delta */ -+ u32 reserved_1 :3; -+ } line; -+ u32 whole; -+}; -+ -+/* source XY register/line draw starting Y coordinate and mintor axis delta */ -+union ge03r { -+ struct { -+ u32 src_x :12; /* source X position */ -+ u32 reserved_1 :4; -+ -+ u32 src_y :12; /* source Y position */ -+ u32 reserved_2 :4; -+ } window; -+ struct { -+ u32 start_y :12; /* starting Y coordinate */ -+ u32 dn :17; /* 17 bits minor-axis delta */ -+ u32 reserved_1 :3; -+ } line; -+ u32 whole; -+}; -+ -+/* clip left/top register */ -+union ge05r { -+ struct { -+ u32 left :12; /* left edge of clipping rectangle */ -+ u32 reserved_1 :4; -+ -+ u32 top :12; /* top edge of clipping rectangle */ -+ u32 reserved_2 :4; -+ } part; -+ u32 whole; -+}; -+ -+/* source stride/offset register */ -+union ge09r { -+ struct { -+ u32 src_strid :12; /* source line stride */ -+ u32 reserved_1 :13; -+ u32 strt_bit :3; /* initial mono source bit offset */ -+ u32 strt_byte :3; /* initial mono/color source byte offset */ -+ u32 reserved_2 :1; -+ } line; -+ struct { -+ u32 strt_bit :5; /* initial mono source bit offset */ -+ u32 reserved_1 :1; -+ u32 amount :10; /* number of 16 bytes amount that MIU need -+ to fetch from frame buffer */ -+ -+ u32 reserved_2 :9; -+ u32 bit_spc :7; /* bit space between lines */ -+ } pack_mono; -+ struct { -+ u32 strt_bit :3; /* initial mono source bit offset */ -+ u32 strt_byte :3; /* initial mono/color source byte offset */ -+ u32 amount :10; /* number of 16 bytes amount that MIU need -+ to fetch from frame buffer */ -+ -+ u32 reserved_1 :9; -+ u32 bit_spc :3; /* bit space between lines */ -+ u32 byt_spc :4; /* byte space between lines */ -+ } pack_color; -+ u32 whole; -+}; -+ -+/* destination stride register and color depth */ -+union ge0ar { -+ struct { -+ u32 dst_strid :12; /* destination line stride and color depth */ -+ u32 reserved_1 :18; -+ u32 col_dpth :2; /* color depth */ -+ } part; -+ u32 whole; -+}; -+ -+/* graphics controller color pallete */ -+union c1xxr { -+ struct { -+ u8 red; /* red color pallete */ -+ u8 green; /* green/gray color pallete */ -+ u8 blue; /* blue color palette */ -+ u8 reserved_1; -+ } part; -+ u32 whole; -+}; -+ -+/* devicee configuration register 0 */ -+union dc00r { -+ struct { -+ u32 osc_bypass :1; /* oscillator bypass */ -+ u32 osc_enbl :1; /* oscillator enable */ -+ u32 pll1_bypass :1; /* PLL1 bypass */ -+ u32 pll1_enbl :1; /* PLL1 enable */ -+ u32 pll1_p_par :3; /* PLL1 P parameter */ -+ u32 cpu_div :1; /* CPU interface clock divisor */ -+ u32 pll1_n_par :5; /* PLL1 N parameter */ -+ u32 saisc :1; /* StrongARM interface synchronizer control */ -+ u32 s_chp_reset :1; /* software chip reset */ -+ u32 mem_enbl :1; /* memory standby enable */ -+ u32 pll1_m_par :8; /* PLL 1 M parameter */ -+ u32 osc_shaper :1; /* oscillator shaper disable */ -+ u32 fast_pwr :1; /* fast power sequencing */ -+ u32 osc_frq :2; /* oscillator frequency select */ -+ u32 pll1_trim :4; /* PLL 1 trim value */ -+ } part; -+ u32 whole; -+}; -+ -+/* device ID/vendor ID register */ -+union pc00r { -+ struct { -+ u16 device; /* device ID */ -+ u16 vendor; /* vendor ID */ -+ } part; -+ u32 whole; -+}; -+ -+/* Flat Panel Control Register */ -+union fp00r { -+ struct { -+ u32 flatp_enbl : 2; /* Flat Panel Interface Enable */ -+ u32 flatp_type : 2; /* Flat Panel Type */ -+ u32 mono : 1; /* Mono/Color Panel Select */ -+ u32 flatp_intf : 3; /* Flat Panel Interface */ -+ u32 dither_pat : 2; /* Dither Pattern */ -+ u32 reserved : 2; /* Reserved Must Be 0*/ -+ u32 dither_col : 3; /* Dither Base Color */ -+ u32 alt_win_ctl: 1; /* Alternate Window Control */ -+ u32 frc_ctl : 2; /* FRC Control */ -+ u32 dither_adj1: 6; /* Dither Pattern Adjust 1 */ -+ u32 dither_adj2: 3; /* Dither Pattern Adjust 2 */ -+ u32 dither_adj3: 1; /* Dither Pattern Adjust 3 */ -+ u32 test_mode0 : 1; /* Test Mode 0 */ -+ u32 test_mode1 : 1; /* Test Mode 1 */ -+ u32 test_mode2 : 1; /* Test Mode 2 */ -+ u32 test_mode3 : 1; /* Test Mode 3 */ -+ } part; -+ u32 whole; -+}; -+ -+union fp01r { -+ struct { -+ u32 dummy; -+ } part; -+ u32 whole; -+}; -+ -+union fp02r { -+ struct { -+ u32 dummy; -+ } part; -+ u32 whole; -+}; -+ -+union fp03r { -+ struct { -+ u32 dummy; -+ } part; -+ u32 whole; -+}; -+ -+union fp04r { -+ struct { -+ u32 dummy; -+ } part; -+ u32 whole; -+}; -+ -+union fp05r { -+ struct { -+ u32 dummy; -+ } part; -+ u32 whole; -+}; -+ -+union fp0fr { -+ struct { -+ u32 dummy; -+ } part; -+ u32 whole; -+}; -+ -+ -+ -+ -+/**** -+ * Others -+ */ -+ -+#define CHIPNAME "MQ-200" -+ -+extern void mq200_external_setpal(unsigned regno, unsigned long color, unsigned long addr); -+extern void mq200_external_setqmode(struct mq200_monitor_info*, unsigned long, spinlock_t *); -+extern void mq200_external_offdisplay(unsigned long); -+extern void mq200_external_ondisplay (unsigned long); -+extern int mq200_external_probe(unsigned long); -+ -+ -+ -+#endif -diff -uNr linux-2.6.20.vanilla/drivers/video/mq200/mq_external.c linux-2.6.20/drivers/video/mq200/mq_external.c ---- linux-2.6.20.vanilla/drivers/video/mq200/mq_external.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20/drivers/video/mq200/mq_external.c 2007-03-28 22:53:44.000000000 +0200 -@@ -0,0 +1,513 @@ -+/* -+ * Copyright (C) 2005 Holger Hans Peter Freyther -+ * -+ * Based ON: -+ * -+ * linux/drivers/video/mq200fb.c -- MQ-200 for a frame buffer device -+ * based on linux/driver/video/pm2fb.c -+ * -+ * 2007/03/11 mrdata: -+ * bug found in gc1_reset(), renaming to gc1_gc2_reset() -+ * extend mq200_external_ondisplay() -> LCD for GC2 and CRT for GC1 -+ * -+ * Copyright (C) 2000 Lineo, Japan -+ * -+ * This file is subject to the terms and conditions of the GNU General Public -+ * License. See the file COPYING in the main directory of this archive -+ * for more details. -+ */ -+ -+#include -+#include -+#include -+#include -+ -+#include -+ -+#include "mq200_data.h" -+ -+ -+#if 1 -+#define PRINTK(args...) printk(args) -+#else -+#define PRINTK(args...) -+#endif -+ -+ -+/**** -+ * power state transition to "state". -+ */ -+static void -+power_state_transition(unsigned long register_base, int state) -+{ -+ int i; -+ writel(state, PMCSR(register_base)); -+ mdelay(300); -+ for (i = 1; ; i++) { -+ udelay(100); -+ if ((readl(PMCSR(register_base)) & 0x3) == state) { -+ break; -+ } -+ } -+} -+ -+ -+/**** -+ * device configuration initialization. -+ */ -+static void -+dc_reset(unsigned long register_base) -+{ -+ union dc00r dc00r; -+ -+ /* Reset First */ -+ dc00r.whole = DC_RESET; -+ writel(dc00r.whole, DC00R(register_base)); -+ mdelay(100); -+ -+ dc00r.whole = 0xEF2082A; -+ writel(dc00r.whole, DC00R(register_base)); -+ mdelay(300); -+ PRINTK(CHIPNAME ": DC00R = 0x%08X\n", readl(DC00R(register_base))); -+} -+ -+ -+/**** -+ * initialize memory interface unit. -+ */ -+static void -+miu_reset(unsigned long register_base) -+{ -+ union mm00r mm00r; -+ union mm01r mm01r; -+ union mm02r mm02r; -+ union mm03r mm03r; -+ union mm04r mm04r; -+ -+ /* MIU interface control 1 */ -+ mm00r.whole = 0x4; -+ writel(mm00r.whole, MM00R(register_base)); -+ mdelay(50); -+ writel(0, MM00R(register_base)); -+ mdelay(50); -+ -+ /* MIU interface control 2 -+ * o PLL 1 output is used as memory clock source. -+ */ -+ mm01r.whole = 0x4143e086; -+ writel(mm01r.whole, MM01R(register_base)); -+ -+ /* memory interface control 3 */ -+ mm02r.whole = 0x6d6aabff; -+ writel(mm02r.whole, MM02R(register_base)); -+ -+ /* memory interface control 5 */ -+ mm04r.whole = 0x10d; -+ writel(mm04r.whole, MM04R(register_base)); -+ -+ /* memory interface control 4 */ -+ mm03r.whole = 0x1; -+ writel(mm03r.whole, MM03R(register_base)); -+ mdelay(50); -+ -+ /* MIU interface control 1 */ -+ mm00r.whole = 0x3; -+ writel(mm00r.whole, MM00R(register_base)); -+ mdelay(50); -+} -+ -+/**** -+ * -+ */ -+static -+void fpctrl_reset(unsigned long addr) -+{ -+ /* -+ * We're in D0 State, let us set the FPCTRL -+ */ -+ union fp00r fp00r; -+ union fp01r fp01r; -+ union fp02r fp02r; -+ union fp03r fp03r; -+ union fp04r fp04r; -+ union fp0fr fp0fr; -+ -+ fp00r.whole = 0x6320; -+ writel(fp00r.whole, FP00R(addr)); -+ -+ fp01r.whole = 0x20; -+ writel(fp01r.whole, FP01R(addr)); -+ -+ fp04r.whole = 0xBD0001; -+ writel(fp04r.whole, FP04R(addr)); -+ -+ /* Set Flat Panel General Purpose register first */ -+ fp02r.whole = 0x0; -+ writel(fp02r.whole, FP02R(addr)); -+ -+ fp03r.whole = 0x0; -+ writel(fp03r.whole, FP03R(addr)); -+ -+ fp0fr.whole = 0xA16c44; -+ writel(fp0fr.whole, FP0FR(addr)); -+ -+ /* Set them again */ -+ fp02r.whole = 0x0; -+ writel(fp02r.whole, FP02R(addr)); -+ -+ fp03r.whole = 0x0; -+ writel(fp03r.whole, FP03R(addr)); -+} -+ -+ -+/**** -+ * initialize power management unit. -+ */ -+static void -+pmu_reset(unsigned long register_base) -+{ -+ union pm00r pm00r; -+ union pm01r pm01r; -+ union pm02r pm02r; -+ -+ /* power management miscellaneous control -+ * o GE is driven by PLL 1 clock. -+ */ -+ pm00r.whole = 0xc0900; -+ writel(pm00r.whole, PM00R(register_base)); -+ -+ /* D1 state control */ -+ pm01r.whole = 0x5000271; -+ writel(pm01r.whole, PM01R(register_base)); -+ -+ /* D2 state control */ -+ pm02r.whole = 0x271; -+ writel(pm02r.whole, PM02R(register_base)); -+} -+ -+/**** -+ * initialize graphics controller 1 -+ * and graphics controller 2 -+ */ -+static void -+gc1_gc2_reset(unsigned long register_base, spinlock_t *lock ) -+{ -+ unsigned long flags; -+ union gc00r gc00r; -+ union gc01r gc01r; -+ union gc02r gc02r; -+ union gc03r gc03r; -+ union gc04r gc04r; -+ union gc05r gc05r; -+ union gc08r gc08r; -+ union gc09r gc09r; -+ union gc0cr gc0cr; -+ union gc0er gc0er; -+ union gc20r gc20r; -+ union gc22r gc22r; -+ union gc23r gc23r; -+ union gc24r gc24r; -+ union gc25r gc25r; -+ union gc28r gc28r; -+ union gc29r gc29r; -+ union gc2cr gc2cr; -+ union gc2er gc2er; -+ -+ union pm00r pm00r; -+ union pm06r pm06r; -+ union pm06r pm07r; -+ -+ spin_lock_irqsave(lock, flags); -+ -+ /* alternate window 1 stride */ -+ gc0er.whole = 0x640; -+ writel(gc0er.whole, GC0ER(register_base)); -+ -+ /* image window 1 start address */ -+ gc0cr.whole = 0x0; -+ writel(gc0cr.whole, GC0CR(register_base)); -+ -+ /* alternate window 2 stride */ -+ gc2er.whole = 0x640; -+ writel(gc0er.whole, GC2ER(register_base)); -+ -+ /* image window 2 start address */ -+ gc2cr.whole = 0x0; -+ writel(gc2cr.whole, GC2CR(register_base)); -+ -+ /* read PM Register */ -+ pm00r.whole = readl(PM00R(register_base)); -+ -+ /* horizontal window 1 control */ -+ gc08r.whole = 0x131f0000; -+ writel(gc08r.whole, GC08R(register_base)); -+ -+ /* vertical window 1 control */ -+ gc09r.whole = 0x12570000; -+ writel(gc09r.whole, GC09R(register_base)); -+ -+ /* horizontal display 1 control */ -+ gc02r.whole = 0x320041e; -+ writel(gc02r.whole, GC02R(register_base)); -+ -+ /* vertical display 1 control */ -+ gc03r.whole = 0x2570273; -+ writel(gc03r.whole, GC03R(register_base)); -+ -+ /* horizontal sync 1 control */ -+ gc04r.whole = 0x3c70347; -+ writel(gc04r.whole, GC04R(register_base)); -+ -+ /* vertical sync 1 control */ -+ gc05r.whole = 0x25d0259; -+ writel(gc05r.whole, GC05R(register_base)); -+ -+ /* graphics controller CRT control */ -+ gc01r.whole = 0x800; -+ writel(gc01r.whole, GC01R(register_base)); -+ -+ /* PLL 2 programming */ -+ pm06r.whole = 0xE90830; -+ writel(pm06r.whole, PM06R(register_base)); -+ -+ /* graphics controller 1 register -+ * o GC1 clock source is PLL 2. -+ * o hardware cursor is disabled. -+ */ -+ gc00r.whole = 0x10000C8 | 0x20000; -+ writel(gc00r.whole, GC00R(register_base)); -+ -+#if 0 -+ /* alternate horizontal window 1 control */ -+ writel(0, GC0AR(register_base)); -+ -+ /* alternate vertical window 1 control */ -+ writel(0, GC0BR(register_base)); -+ -+ /* window 1 start address */ -+ writel(0x2004100, GC0CR(register_base)); -+ -+ /* alternate window 1 start address */ -+ writel(0, GC0DR(register_base)); -+ -+ /* window 1 stride */ -+ gc0er.whole = 0x5100048; -+ writel(gc0er.whole, GC0ER(register_base)); -+ -+ /* reserved register - ??? - */ -+ writel(0x31f, GC0FR(register_base)); -+#endif -+ -+#if 0 -+ /* hardware cursor 1 position */ -+ writel(0, GC10R(register_base)); -+ -+ /* hardware cursor 1 start address and offset */ -+ gc11r.whole = 0x5100048; -+ writel(gc11r.whole, GC11R(register_base)); -+ -+ /* hardware cursor 1 foreground color */ -+ writel(0x00ffffff, GC12R(register_base)); -+ -+ /* hardware cursor 1 background color */ -+ writel(0x00000000, GC13R(register_base)); -+#endif -+ -+ /* horizontal window 2 control */ -+ gc28r.whole = 0x31f0000; -+ writel(gc28r.whole, GC28R(register_base)); -+ -+ /* vertical window 2 control */ -+ gc29r.whole = 0x2570000; -+ writel(gc29r.whole, GC29R(register_base)); -+ -+ /* horizontal display 2 control */ -+ gc22r.whole = 0x320041e; -+ writel(gc22r.whole, GC22R(register_base)); -+ -+ /* vertical display 2 control */ -+ gc23r.whole = 0x2570273; -+ writel(gc23r.whole, GC23R(register_base)); -+ -+ /* horizontal sync 2 control */ -+ gc24r.whole = 0x3c70347; -+ writel(gc24r.whole, GC24R(register_base)); -+ -+ /* vertical sync 2 control */ -+ gc25r.whole = 0x25d0259; -+ writel(gc25r.whole, GC25R(register_base)); -+ -+ /* graphics controller CRT control */ -+ gc01r.whole = 0x800; -+ writel(gc01r.whole, GC01R(register_base)); -+ -+ /* PLL 3 programming */ -+ pm07r.whole = 0xE90830; -+ writel(pm07r.whole, PM07R(register_base)); -+ -+ /* graphics controller 2 register -+ * o GC2 clock source is PLL 3. -+ * o hardware cursor is disabled. -+ */ -+ gc20r.whole = 0x10000C8 | 0x30000; -+ writel(gc20r.whole, GC20R(register_base)); -+ -+ /* -+ * Enable PLL2 and PLL3 in the PM Register -+ */ -+ pm00r.part.pll2_enbl = 0x1; -+ pm00r.part.pll3_enbl = 0x1; -+ writel(pm00r.whole, PM00R(register_base)); -+ -+ spin_unlock_irqrestore(lock, flags); -+} -+ -+ -+/**** -+ * initialize graphics engine. -+ */ -+static void -+ge_reset(unsigned long register_base) -+{ -+ /* drawing command register */ -+ writel(0, GE00R(register_base)); -+ -+ /* promary width and height register */ -+ writel(0, GE01R(register_base)); -+ -+ /* primary destination address register */ -+ writel(0, GE02R(register_base)); -+ -+ /* primary source XY register */ -+ writel(0, GE03R(register_base)); -+ -+ /* primary color compare register */ -+ writel(0, GE04R(register_base)); -+ -+ /* primary clip left/top register */ -+ writel(0, GE05R(register_base)); -+ -+ /* primary clip right/bottom register */ -+ writel(0, GE06R(register_base)); -+ -+ /* primary source and pattern offset register */ -+ writel(0, GE07R(register_base)); -+ -+ /* primary foreground color register/rectangle fill color depth */ -+ writel(0, GE08R(register_base)); -+ -+ /* source stride/offset register */ -+ writel(0, GE09R(register_base)); -+ -+ /* destination stride register and color depth */ -+ writel(0, GE0AR(register_base)); -+ -+ /* image base address register */ -+ writel(0, GE0BR(register_base)); -+} -+ -+/**** -+ * initialize Color Palette 1. -+ */ -+static void -+cp1_reset(unsigned long addr_info) -+{ -+ int i; -+ -+ for (i = 0; i < 256; i++) -+ writel(0, C1xxR(addr_info, i)); -+} -+ -+ -+/* -+ * Below functions are called from the skeleton -+ */ -+void mq200_external_setpal(unsigned regno, unsigned long color, unsigned long addr) -+{ -+ writel(color,C1xxR(addr,regno)); -+} -+ -+void mq200_external_setqmode(struct mq200_monitor_info* info, -+ unsigned long addr, spinlock_t *lock) -+{ -+ dc_reset(addr); /* device configuration */ -+ -+ power_state_transition(addr, 0); /* transition to D0 state */ -+ -+ pmu_reset(addr); /* power management unit */ -+ -+ miu_reset(addr); /* memory interface unit */ -+ -+ ge_reset(addr); /* graphics engine */ -+ -+ fpctrl_reset(addr); /* reset the panel settings */ -+ -+ gc1_gc2_reset(addr, lock); /* graphics controller 1 and 2 */ -+ -+ cp1_reset(addr); /* color palette 1 */ -+ -+ mq200_external_ondisplay(addr); /* LCD and CRT */ -+} -+ -+void mq200_external_offdisplay(unsigned long addr) -+{ -+ /* -+ * Move the MQ200 to D3 mode -+ */ -+ power_state_transition(addr, 3); -+} -+ -+/** -+ * to be called after mq200_external_setqmode -+ */ -+void mq200_external_ondisplay (unsigned long addr) -+{ -+ /* -+ * Set the framebuffer details -+ */ -+ union gc00r gc00r; -+ union gc01r gc01r; -+ union gc20r gc20r; -+ union fp00r fp00r; -+ -+ /* enable LCD for GC2 */ -+ fp00r.whole = readl(FP00R(addr)); -+ fp00r.whole &= 0xfffffffc; -+ -+ gc20r.whole = readl(GC20R(addr)); -+ -+ if(!(gc20r.whole & 0x1)) { -+ gc20r.whole |= 0x1; -+ writel(gc20r.whole, GC20R(addr)); -+ } -+ -+ fp00r.whole |= 0x3; -+ writel(fp00r.whole, FP00R(addr)); -+ -+ /* enable CRT for GC1 */ -+ gc00r.whole = readl(GC00R(addr)); -+ -+ if(!(gc00r.whole & 0x1)) { -+ gc00r.whole |= 0x1; -+ writel(gc00r.whole, GC00R(addr)); -+ } -+ -+ gc01r.whole = readl(GC01R(addr)); -+ gc01r.whole &= 0xfffffffc; -+ -+ gc01r.whole |= 0x1; -+ writel(gc01r.whole, GC01R(addr)); -+ -+} -+ -+int mq200_external_probe(unsigned long addr) -+{ -+ union pc00r pc00r; -+ if(readl(PMR(addr)) != PMR_VALUE) -+ return 0; -+ -+ pc00r.whole = readl(PC00R(addr)); -+ printk(KERN_INFO "mq200 video driver found Vendor: 0x%X Device: 0x%X\n", -+ pc00r.part.device, pc00r.part.vendor); -+ return 1; -+} -diff -uNr linux-2.6.20.vanilla/drivers/video/mq200/mq_skeleton.c linux-2.6.20/drivers/video/mq200/mq_skeleton.c ---- linux-2.6.20.vanilla/drivers/video/mq200/mq_skeleton.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20/drivers/video/mq200/mq_skeleton.c 2007-03-28 22:53:44.000000000 +0200 -@@ -0,0 +1,398 @@ -+/* -+ * Author: Holger Hans Peter Freyther -+ * -+ * -+ * This implements the frame buffer driver interface to communicate -+ * with the kernel. -+ * It uses the mq200 routines from the ucLinux driver from Lineo -+ * -+ * 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. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "mq200_data.h" -+ -+#if CONFIG_SA1100_SIMPAD -+/* -+ * Siemens SIMpad specefic data -+ */ -+#include -+#include -+ -+#define MQ200_REGIONS simpad_mq200_regions -+#define MQ200_MONITOR simpad_mq200_panel -+ -+static struct mq200_io_regions simpad_mq200_regions = { -+ .fb_size = MQ200_FB_SIZE, -+ .phys_mmio_base = 0x4be00000, -+ .virt_mmio_base = 0xf2e00000, -+ .phys_fb_base = 0x4b800000, -+ .virt_fb_base = 0xf2800000, -+}; -+ -+static struct mq200_monitor_info simpad_mq200_panel = { -+ .horizontal_res = 800, -+ .vertical_res = 600, -+ .depth = 16, -+ .refresh = 60, -+ .line_length = 1600, -+ .flags = 0x00130004, -+}; -+ -+extern long get_cs3_shadow(void); -+extern void set_cs3_bit(int value); -+extern void clear_cs3_bit(int value); -+#endif -+ -+ -+ -+struct mq200_info { -+ struct fb_info fb_info; -+ struct mq200_io_regions io_regions; -+ struct mq200_monitor_info monitor_info; -+ -+ /* palette */ -+ u32 pseudo_palette[17]; /* 16 colors + 1 in reserve not that well documented... */ -+ spinlock_t lock; -+}; -+ -+ -+ -+static int mq200_blank( int blank_mode, struct fb_info *info ) -+{ -+#ifdef CONFIG_SA1100_SIMPAD -+ if(blank_mode ){ -+ clear_cs3_bit(DISPLAY_ON); -+ }else { -+ set_cs3_bit(DISPLAY_ON); -+ } -+#endif -+ return 0; -+} -+ -+ -+static int mq200_check_var(struct fb_var_screeninfo *var, -+ struct fb_info *info ) -+{ /* TODO do we need sanity checks here */ -+ return 0; -+} -+ -+ -+static int mq200_set_par( struct fb_info *info ) -+{ -+ /* TODO set paraemeter */ -+ return 0; -+} -+ -+static int mq200_setcolreg(unsigned regno, unsigned red, unsigned green, -+ unsigned blue, unsigned transp, -+ struct fb_info *info ) -+{ -+ struct mq200_info *p; -+ unsigned long color; -+ u32* pal = info->pseudo_palette; -+ -+ p = info->par; -+ -+ if(regno > 255 ) -+ return 1; -+ -+ switch( info->var.bits_per_pixel ){ -+ case 16: -+ pal[regno] = -+ ((red & 0xf800) >> 0) | -+ ((green & 0xf800) >> 5) | ((blue & 0xf800) >> 11); -+ break; -+ case 24: -+ pal[regno] = -+ ((red & 0xff00) << 8) | -+ ((green & 0xff00)) | ((blue & 0xff00) >> 8); -+ break; -+ case 32: -+ pal[regno] = -+ ((red & 0xff00) >> 8) | -+ ((green & 0xff00)) | ((blue & 0xff00) << 8); -+ break; -+ default: -+ break; -+ } -+ -+ red &= 0xFF; -+ green &= 0xFF; -+ blue &= 0xFF; -+ -+ color = red | (green << 8) | (blue << 16); -+ mq200_external_setpal(regno, color, p->io_regions.virt_mmio_base); -+ -+ return 0; -+} -+ -+ -+static struct fb_ops mq200_ops = { -+ .owner = THIS_MODULE, -+ .fb_check_var = mq200_check_var, -+ .fb_set_par = mq200_set_par, -+ .fb_setcolreg = mq200_setcolreg, -+#ifdef FB_SOFT_CURSOR -+ .fb_cursor = soft_cursor, /* FIXME use hardware cursor */ -+#endif -+ .fb_fillrect = cfb_fillrect, -+ .fb_copyarea = cfb_copyarea, -+ .fb_imageblit = cfb_imageblit, -+ .fb_blank = mq200_blank, -+}; -+ -+ -+/********************************************************************* -+ * -+ * Device driver and module init code -+ * this will register to the fb layer later -+ * -+ *********************************************************************/ -+static void mq200_internal_init_color( struct fb_bitfield* red, -+ struct fb_bitfield* green, -+ struct fb_bitfield* blue, -+ int bpp ) -+{ -+ switch ( bpp ) -+ { -+ case 16: -+ red->offset = 11; -+ green->offset = 5; -+ blue->offset = 0; -+ -+ red->length = 5; -+ green->length = 6; -+ blue->length = 5; -+ break; -+ case 24: -+ red->offset = 16; -+ green->offset = 8; -+ blue->offset = 0; -+ -+ red->length = 8; -+ green->length = 8; -+ blue->length = 8; -+ break; -+ case 32: -+ red->offset = 0; -+ green->offset = 8; -+ blue->offset = 16; -+ -+ red->length = 8; -+ green->length = 8; -+ blue->length = 8; -+ case 8: /* fall through */ -+ default: -+ red->offset = green->offset = blue->offset = 0; -+ red->length = green->length = blue->length = bpp; -+ break; -+ } -+ -+} -+ -+ -+static struct mq200_info* __init mq200_internal_init_fbinfo(void) -+{ -+ struct mq200_info *info = NULL; -+ -+ info = (struct mq200_info*)kmalloc(sizeof(*info), GFP_KERNEL); -+ if(!info) -+ return NULL; -+ -+ /* -+ * Initialize memory -+ */ -+ memset(info, 0, sizeof(struct mq200_info) ); -+ spin_lock_init(&info->lock); -+ -+ /* set the base IO addresses */ -+ info->io_regions = MQ200_REGIONS; -+ info->monitor_info = MQ200_MONITOR; -+ -+ info->fb_info.screen_base = (char *)info->io_regions.virt_fb_base; -+ -+ /* fb_fix_screeninfo filling */ -+ strcpy(info->fb_info.fix.id, "MQ200_FB" ); -+ info->fb_info.fix.smem_start = info->io_regions.phys_fb_base; -+ info->fb_info.fix.smem_len = info->io_regions.fb_size; /* - CURSOR_IMAGE */ -+ info->fb_info.fix.mmio_start = info->io_regions.phys_mmio_base; -+ info->fb_info.fix.mmio_len = MQ200_REGS_SIZE; -+ info->fb_info.fix.type = FB_TYPE_PACKED_PIXELS; -+ info->fb_info.fix.accel = FB_ACCEL_NONE; -+ info->fb_info.fix.line_length = MQ200_MONITOR_LINE_LENGTH(info); -+ -+ if(MQ200_MONITOR_DEPTH(info) <= 8 ) -+ info->fb_info.fix.visual = FB_VISUAL_PSEUDOCOLOR; -+ else if( MQ200_MONITOR_DEPTH(info) >= 16 ) -+ info->fb_info.fix.visual = FB_VISUAL_DIRECTCOLOR; -+ else -+ panic("Calling mq200 with wrong display data\n"); -+ -+ /* set the variable screen info */ -+ info->fb_info.var.xres = MQ200_MONITOR_HORI_RES(info); -+ info->fb_info.var.yres = MQ200_MONITOR_VERT_RES(info); -+ info->fb_info.var.xres_virtual = MQ200_MONITOR_HORI_RES(info); -+ info->fb_info.var.yres_virtual = MQ200_MONITOR_VERT_RES(info); -+ info->fb_info.var.bits_per_pixel = MQ200_MONITOR_DEPTH(info); -+ -+ mq200_internal_init_color(&info->fb_info.var.red, -+ &info->fb_info.var.green, -+ &info->fb_info.var.blue, -+ MQ200_MONITOR_DEPTH(info) ); -+ -+ info->fb_info.var.transp.length = info->fb_info.var.transp.offset = 0; -+ info->fb_info.var.height = info->fb_info.var.width = -1; -+ -+ info->fb_info.var.vmode = FB_VMODE_NONINTERLACED; -+ info->fb_info.var.pixclock = 10000; -+ info->fb_info.var.left_margin = info->fb_info.var.right_margin = 16; -+ info->fb_info.var.upper_margin = info->fb_info.var.lower_margin = 16; -+ info->fb_info.var.hsync_len = info->fb_info.var.vsync_len = 8; -+ -+ info->fb_info.var.nonstd = 0; -+ info->fb_info.var.activate = FB_ACTIVATE_NOW; -+ info->fb_info.var.accel_flags = 0; -+ -+ return info; -+} -+ -+ -+extern void mq200_register_attributes(struct device* ); -+/* -+ * gets called from the bus -+ * we will register our framebuffer from here -+ */ -+static int __init mq200_probe(struct device *dev) -+{ -+ struct mq200_info *info = NULL; -+ int retv= 0; -+ -+ info = mq200_internal_init_fbinfo(); -+ if(!mq200_external_probe(info->io_regions.virt_mmio_base)) -+ goto error_out; -+ -+ GPDR |= (1<<3); -+ GAFR &= ~(1<<3); -+ GPSR |= (1<<3); -+ -+ mq200_external_setqmode(&info->monitor_info, -+ info->io_regions.virt_mmio_base, -+ &info->lock); -+ -+ info->fb_info.fbops = &mq200_ops; -+ info->fb_info.flags = FBINFO_FLAG_DEFAULT; -+ -+ mq200_check_var(&info->fb_info.var, &info->fb_info ); -+ -+ fb_alloc_cmap(&info->fb_info.cmap, 1 << MQ200_MONITOR_DEPTH(info), 0 ); -+ -+ info->fb_info.pseudo_palette = (void*)info->pseudo_palette; -+ -+ /* save the pointer to the mq200 struct in var */ -+ info->fb_info.par = info; -+ -+ retv = register_framebuffer(&info->fb_info ); -+ if(retv < 0) -+ goto error_out; -+ -+ -+ /* will get unset if retv != 0 */ -+ dev_set_drvdata(dev, info ); -+ return retv; -+ -+/* -+ * Free the info and exit -+ */ -+error_out: -+ kfree(info); -+ return -EINVAL; -+} -+ -+#ifdef CONFIG_PM -+static struct mq200_info* get_mq200_info( struct device *dev) -+{ -+ return dev_get_drvdata(dev); -+} -+ -+static unsigned long get_mmio_base( struct device *dev ) -+{ -+ struct mq200_info *info = get_mq200_info(dev); -+ return info->io_regions.virt_mmio_base; -+} -+ -+static struct mq200_monitor_info* get_monitor_info( struct device *dev) -+{ -+ struct mq200_info *info = get_mq200_info(dev); -+ return &info->monitor_info; -+} -+ -+static spinlock_t* get_spinlock( struct device *dev) -+{ -+ return &get_mq200_info(dev)->lock; -+} -+ -+/* -+ * FIXME: make sure we only call mq200_external_offdisplay only once -+ * a 2nd time will hang the kernel -zecke -+ * -+ * FIXME: save the content of the framebuffer inside dev->saved_state -+ * so on resume we can memcpy it back into the buffer and userspace -+ * does not need to redraw -+ * -+ * functions for suspending and resuming -+ */ -+static int mq200_suspend(struct device *dev, pm_message_t state) -+{ -+ -+ mq200_external_offdisplay( get_mmio_base(dev) ); -+ clear_cs3_bit(DISPLAY_ON); -+ -+ -+ return 0; -+} -+ -+static int mq200_resume(struct device *dev) -+{ -+ unsigned long mem = get_mmio_base(dev); -+ struct mq200_monitor_info *monitor = get_monitor_info(dev); -+ mq200_external_setqmode(monitor, mem, get_spinlock(dev) ); -+ -+ -+ /* -+ * Set display on if it was on -+ */ -+ set_cs3_bit(DISPLAY_ON); -+ -+ return 0; -+} -+ -+ -+#endif -+ -+ -+static struct device_driver mq200fb_driver = { -+ .name = "simpad-mq200", -+ .bus = &platform_bus_type, -+ .probe = mq200_probe, /* will be called after we've registered the driver */ -+ .suspend = mq200_suspend, -+ .resume = mq200_resume -+}; -+ -+int __devinit mq200_init(void) -+{ -+ return driver_register(&mq200fb_driver); -+} -+ -+module_init(mq200_init); -+MODULE_DESCRIPTION("MQ200 framebuffer driver"); -+MODULE_LICENSE("GPL"); -+MODULE_AUTHOR("Holger Hans Peter Freyther"); diff --git a/packages/linux/linux/simpad/linux-2.6.20.SIMpad-ucb1x00-switches.patch b/packages/linux/linux/simpad/linux-2.6.20.SIMpad-ucb1x00-switches.patch deleted file mode 100644 index 7cf2f28c89..0000000000 --- a/packages/linux/linux/simpad/linux-2.6.20.SIMpad-ucb1x00-switches.patch +++ /dev/null @@ -1,189 +0,0 @@ -diff -uNr linux-2.6.20.vanilla/drivers/mfd/Kconfig linux-2.6.20/drivers/mfd/Kconfig ---- linux-2.6.20.vanilla/drivers/mfd/Kconfig 2007-02-10 19:01:56.000000000 +0100 -+++ linux-2.6.20/drivers/mfd/Kconfig 2007-02-28 16:36:01.000000000 +0100 -@@ -23,4 +23,7 @@ - tristate "Touchscreen interface support" - depends on MCP_UCB1200 && INPUT - -+config MCP_UCB1200_SWITCHES -+ tristate "SIMpad Switches support" -+ depends on MCP_UCB1200 && INPUT - endmenu -diff -uNr linux-2.6.20.vanilla/drivers/mfd/Makefile linux-2.6.20/drivers/mfd/Makefile ---- linux-2.6.20.vanilla/drivers/mfd/Makefile 2007-02-10 19:01:56.000000000 +0100 -+++ linux-2.6.20/drivers/mfd/Makefile 2007-02-28 16:36:01.000000000 +0100 -@@ -6,7 +6,7 @@ - obj-$(CONFIG_MCP_SA11X0) += mcp-sa11x0.o - obj-$(CONFIG_MCP_UCB1200) += ucb1x00-core.o - obj-$(CONFIG_MCP_UCB1200_TS) += ucb1x00-ts.o -- -+obj-$(CONFIG_MCP_UCB1200_SWITCHES) += ucb1x00-switches.o - ifeq ($(CONFIG_SA1100_ASSABET),y) - obj-$(CONFIG_MCP_UCB1200) += ucb1x00-assabet.o - endif -diff -uNr linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c linux-2.6.20/drivers/mfd/ucb1x00-switches.c ---- linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20/drivers/mfd/ucb1x00-switches.c 2007-02-28 16:36:43.000000000 +0100 -@@ -0,0 +1,162 @@ -+/* -+ * linux/drivers/mfd/ucb1x00-switches.c -+ * -+ * Copyright (C) 2007 Bernhard Guillon. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License. -+ * -+ * This driver is for the Switches of Siemens SIMpad (CL4,SL4,SLC), T-Sinus-Pad and -+ * Swisscom WP50 devices. -+ * -+ * Six switches are routed to GPIO pins on the UCB1300: S3 -- S8. -+ * -+ * This driver is based on the 2.4 ucb1x00-switches, the 2.6 ucb1x00-assabet -+ * and the ucb1x00-ts driver. -+ * -+ */ -+#include -+#include -+#include -+#include -+ -+#include -+ -+#include "ucb1x00.h" -+ -+static int key [6] = { KEY_PROG1,KEY_PROG2,KEY_UP,KEY_DOWN,KEY_LEFT,KEY_RIGHT }; -+ -+struct ucb1x00_switches { -+ struct input_dev *idev; -+ struct ucb1x00 *ucb; -+}; -+ -+static void ucb1x00_dev_irq(int idx, void *id) -+{ -+ static unsigned short int last; -+ unsigned short int this; -+ struct ucb1x00_switches *switches = id; -+ struct input_dev *idev = switches->idev; -+ -+ ucb1x00_enable(switches->ucb); -+ -+ this=~ucb1x00_io_read(switches->ucb); -+ if (this==last) { -+ return; -+ } -+ -+ last=this; -+ -+ if ((idx >=0) && (idx <=5)) { -+ if ((this & (1<ucb = dev->ucb; -+ -+ idev->private = switches; -+ idev->name = "SIMpad Switches"; -+ idev->id.product = switches->ucb->id; -+ -+ __set_bit(EV_KEY, idev->evbit); -+ __set_bit(EV_REP, idev->evbit); -+ __set_bit(KEY_PROG1, idev->keybit); -+ __set_bit(KEY_PROG2, idev->keybit); -+ __set_bit(KEY_UP, idev->keybit); -+ __set_bit(KEY_DOWN, idev->keybit); -+ __set_bit(KEY_LEFT, idev->keybit); -+ __set_bit(KEY_RIGHT, idev->keybit); -+ -+ err = input_register_device(idev); -+ if (err) -+ goto fail; -+ switches->idev = idev; -+ dev->priv = switches; -+ -+ ucb1x00_enable(switches->ucb); -+ -+ ucb1x00_io_set_dir(switches->ucb, -+ UCB_IO_0 | UCB_IO_1 | UCB_IO_2 | -+ UCB_IO_3 | UCB_IO_4 | UCB_IO_5, -+ UCB_IO_8 | UCB_IO_9); -+ -+ ucb1x00_disable(switches->ucb); -+ -+ for (i = 0; i < 6; ++i) { -+ ucb1x00_enable_irq(switches->ucb, i, UCB_RISING | UCB_FALLING); -+ if (ucb1x00_hook_irq(switches->ucb, i, ucb1x00_dev_irq, switches) < 0) { -+ printk(KERN_ERR "unable to hook IRQ for " -+ "UCB1300 SWITCH_%d\n", i); -+ return -EBUSY; -+ } -+ } -+ -+ return 0; -+ -+fail: -+ input_free_device(idev); -+ kfree(switches); -+ return err; -+ -+} -+ -+static void ucb1x00_switches_remove(struct ucb1x00_dev *dev) -+{ -+ int i; -+ struct ucb1x00_switches *switches = dev->priv; -+ input_unregister_device(switches->idev); -+ -+ for (i = 5; i >= 0; --i) { -+ ucb1x00_disable_irq(switches->ucb, i, UCB_RISING | UCB_FALLING); -+ -+ /* Only error conditions are ENOENT and EINVAL; silently -+ * ignore: -+ */ -+ ucb1x00_free_irq(switches->ucb, i, NULL); -+ } -+ ucb1x00_disable(switches->ucb); -+ kfree(switches); -+} -+ -+static struct ucb1x00_driver ucb1x00_switches_driver = { -+ .add = ucb1x00_switches_add, -+ .remove = ucb1x00_switches_remove, -+}; -+ -+static int __init ucb1x00_switches_init(void) -+{ -+ return ucb1x00_register_driver(&ucb1x00_switches_driver); -+} -+ -+static void __exit ucb1x00_switches_exit(void) -+{ -+ ucb1x00_unregister_driver(&ucb1x00_switches_driver); -+} -+ -+module_init(ucb1x00_switches_init); -+module_exit(ucb1x00_switches_exit); -+ -+MODULE_AUTHOR("Bernhard Guillon "); -+MODULE_DESCRIPTION("UCB1x00 Switches driver for Siemens SIMpad"); -+MODULE_LICENSE("GPL"); diff --git a/packages/linux/linux_2.6.20.bb b/packages/linux/linux_2.6.20.bb index 178a44dd14..80f6c71442 100644 --- a/packages/linux/linux_2.6.20.bb +++ b/packages/linux/linux_2.6.20.bb @@ -1,19 +1,11 @@ DESCRIPTION = "Linux Kernel" SECTION = "kernel" LICENSE = "GPL" -PR = "r5" +PR = "r6" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://defconfig" -SRC_URI_append_progear = " \ - file://progear_bl-r6.patch;patch=1 \ - " -SRC_URI_append_simpad = "\ - file://linux-2.6.20.SIMpad-battery.patch;patch=1\ - file://linux-2.6.20.SIMpad-mq200.patch;patch=1 \ - file://linux-2.6.20.SIMpad-ucb1x00-switches.patch;patch=1 \ - " SRC_URI_append_n2100 = "\ file://n2100-r8169-parity.patch;patch=1 \ file://rtc-rs5c372-n2100.patch;patch=1 \ @@ -22,7 +14,6 @@ SRC_URI_append_n2100 = "\ inherit kernel KERNEL_IMAGETYPE = "bzImage" -KERNEL_IMAGETYPE_simpad = "zImage" KERNEL_IMAGETYPE_n2100 = "zImage" do_configure_prepend() { -- cgit v1.2.3 From 32eac857b106e0bcc42c792499917950a2c64d4b Mon Sep 17 00:00:00 2001 From: Bernhard Guillon Date: Mon, 7 May 2007 17:39:17 +0000 Subject: linux: added 2.6.21 for Simpad (progear need refresh of config) - close #2247 --- packages/linux/linux/simpad/defconfig | 161 +- .../simpad/linux-2.6.21-SIMpad-cs3-simpad.patch | 315 +++ .../linux/simpad/linux-2.6.21-SIMpad-mq200.patch | 2511 ++++++++++++++++++++ .../linux-2.6.21-SIMpad-serial-and-gpio_keys.patch | 194 ++ .../linux-2.6.21-SIMpad-ucb1x00-switches.patch | 189 ++ ...x-2.6.21-pcmcia-device-to-platform-driver.patch | 54 + packages/linux/linux_2.6.21.bb | 23 + 7 files changed, 3344 insertions(+), 103 deletions(-) create mode 100644 packages/linux/linux/simpad/linux-2.6.21-SIMpad-cs3-simpad.patch create mode 100644 packages/linux/linux/simpad/linux-2.6.21-SIMpad-mq200.patch create mode 100644 packages/linux/linux/simpad/linux-2.6.21-SIMpad-serial-and-gpio_keys.patch create mode 100644 packages/linux/linux/simpad/linux-2.6.21-SIMpad-ucb1x00-switches.patch create mode 100644 packages/linux/linux/simpad/linux-2.6.21-pcmcia-device-to-platform-driver.patch create mode 100644 packages/linux/linux_2.6.21.bb diff --git a/packages/linux/linux/simpad/defconfig b/packages/linux/linux/simpad/defconfig index 2115d30a2c..36d5e942b4 100644 --- a/packages/linux/linux/simpad/defconfig +++ b/packages/linux/linux/simpad/defconfig @@ -1,11 +1,14 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.20 -# Mon Apr 2 11:51:54 2007 +# Linux kernel version: 2.6.21 +# Sun May 6 14:01:42 2007 # CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y # CONFIG_GENERIC_TIME is not set CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set CONFIG_GENERIC_HARDIRQS=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y @@ -15,6 +18,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y CONFIG_ARCH_MTD_XIP=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -35,6 +39,7 @@ CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y # CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set @@ -43,7 +48,7 @@ CONFIG_SYSVIPC=y # CONFIG_IKCONFIG is not set CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set -CONFIG_INITRAMFS_SOURCE="" +# CONFIG_BLK_DEV_INITRD is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_EMBEDDED=y @@ -71,9 +76,8 @@ CONFIG_BASE_SMALL=0 # Loadable module support # CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y +# CONFIG_MODULE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y @@ -122,6 +126,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set # CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_NS9XXX is not set # CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set @@ -167,6 +172,7 @@ CONFIG_CPU_CP15_MMU=y # # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_OUTER_CACHE is not set # # Bus support @@ -177,7 +183,7 @@ CONFIG_ISA=y # PCCARD (PCMCIA/CardBus) support # CONFIG_PCCARD=y -CONFIG_PCMCIA_DEBUG=y +# CONFIG_PCMCIA_DEBUG is not set CONFIG_PCMCIA=y CONFIG_PCMCIA_LOAD_CIS=y CONFIG_PCMCIA_IOCTL=y @@ -208,6 +214,7 @@ CONFIG_NEED_MULTIPLE_NODES=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 # CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 CONFIG_LEDS=y CONFIG_LEDS_TIMER=y # CONFIG_LEDS_CPU is not set @@ -220,6 +227,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="mtdparts=sa1100:512k(boot),1m(kernel),-(root) console=ttySA0 root=1f02 noinitrd mem=64M jffs2_orphaned_inodes=delete rootfstype=jffs2" # CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set # # CPU Frequency scaling @@ -249,11 +257,10 @@ CONFIG_BINFMT_MISC=m # Power management options # CONFIG_PM=y -CONFIG_PM_LEGACY=y -CONFIG_PM_DEBUG=y -CONFIG_DISABLE_CONSOLE_SUSPEND=y +# CONFIG_PM_LEGACY is not set +# CONFIG_PM_DEBUG is not set # CONFIG_PM_SYSFS_DEPRECATED is not set -CONFIG_APM=y +# CONFIG_APM_EMULATION is not set # # Networking @@ -270,6 +277,7 @@ CONFIG_UNIX=y CONFIG_XFRM=y # CONFIG_XFRM_USER is not set # CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set # CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set @@ -403,12 +411,7 @@ CONFIG_BT_BNEP_PROTO_FILTER=y # CONFIG_BT_HCIBLUECARD is not set # CONFIG_BT_HCIBTUART is not set # CONFIG_BT_HCIVHCI is not set -CONFIG_IEEE80211=m -# CONFIG_IEEE80211_DEBUG is not set -CONFIG_IEEE80211_CRYPT_WEP=m -# CONFIG_IEEE80211_CRYPT_CCMP is not set -# CONFIG_IEEE80211_CRYPT_TKIP is not set -# CONFIG_IEEE80211_SOFTMAC is not set +# CONFIG_IEEE80211 is not set CONFIG_WIRELESS_EXT=y # @@ -422,6 +425,7 @@ CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y # CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set # @@ -528,6 +532,7 @@ CONFIG_MTD_SA1100=y # Plug and Play support # # CONFIG_PNP is not set +# CONFIG_PNPACPI is not set # # Block devices @@ -540,38 +545,13 @@ CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 -# CONFIG_BLK_DEV_INITRD is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # # ATA/ATAPI/MFM/RLL support # -CONFIG_IDE=y -CONFIG_IDE_MAX_HWIFS=4 -CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_BLK_DEV_IDEDISK=y -# CONFIG_IDEDISK_MULTI_MODE is not set -CONFIG_BLK_DEV_IDECS=y -# CONFIG_BLK_DEV_IDECD is not set -# CONFIG_BLK_DEV_IDETAPE is not set -# CONFIG_BLK_DEV_IDEFLOPPY is not set -# CONFIG_IDE_TASK_IOCTL is not set - -# -# IDE chipset support/bugfixes -# -# CONFIG_IDE_GENERIC is not set -# CONFIG_IDE_ARM is not set -# CONFIG_IDE_CHIPSETS is not set -# CONFIG_BLK_DEV_IDEDMA is not set -# CONFIG_IDEDMA_AUTO is not set -# CONFIG_BLK_DEV_HD is not set +# CONFIG_IDE is not set # # SCSI device support @@ -749,7 +729,14 @@ CONFIG_INPUT_EVBUG=y # # Input Device Drivers # -# CONFIG_INPUT_KEYBOARD is not set +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +CONFIG_KEYBOARD_GPIO=y # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set @@ -798,7 +785,7 @@ CONFIG_LEGACY_PTY_COUNT=256 # Watchdog Cards # # CONFIG_WATCHDOG is not set -CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM=m # CONFIG_NVRAM is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set @@ -836,12 +823,6 @@ CONFIG_HW_RANDOM=y # Hardware Monitoring support # CONFIG_HWMON=y - -# -# Hardware Monitoring - Battery -# -CONFIG_BATTERY_MONITOR=y -CONFIG_MCP_UCB1200_SIMPAD_BATTERY=y # CONFIG_HWMON_VID is not set # CONFIG_SENSORS_ABITUGURU is not set # CONFIG_SENSORS_F71805F is not set @@ -852,7 +833,11 @@ CONFIG_MCP_UCB1200_SIMPAD_BATTERY=y # # Misc devices # -# CONFIG_TIFM_CORE is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set # # Multimedia Capabilities Port drivers @@ -889,15 +874,26 @@ CONFIG_MCP_UCB1200_SWITCHES=y # # Graphics support # -CONFIG_FIRMWARE_EDID=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_BACKLIGHT_SIMPAD=y +CONFIG_LCD_SIMPAD=y CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set + +# +# Frambuffer hardware drivers +# # CONFIG_FB_SA1100 is not set # CONFIG_FB_S1D13XXX is not set CONFIG_FB_MQ200=y @@ -922,13 +918,6 @@ CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y CONFIG_LOGO_LINUX_CLUT224=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_DEVICE=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_LCD_DEVICE=y -CONFIG_FB_MQ200_LCD=y -CONFIG_FB_MQ200_BACKLIGHT=y # # Sound @@ -949,6 +938,7 @@ CONFIG_SOUND=y # HID Devices # CONFIG_HID=y +# CONFIG_HID_DEBUG is not set # # USB support @@ -997,7 +987,7 @@ CONFIG_REISERFS_FS=m CONFIG_REISERFS_PROC_INFO=y # CONFIG_REISERFS_FS_XATTR is not set # CONFIG_JFS_FS is not set -CONFIG_FS_POSIX_ACL=y +# CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set @@ -1010,7 +1000,6 @@ CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set # CONFIG_FUSE_FS is not set -CONFIG_GENERIC_ACL=y # # CD-ROM/DVD Filesystems @@ -1034,8 +1023,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" CONFIG_PROC_FS=y CONFIG_PROC_SYSCTL=y CONFIG_SYSFS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y +# CONFIG_TMPFS is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y # CONFIG_CONFIGFS_FS is not set @@ -1160,16 +1148,17 @@ CONFIG_ENABLE_MUST_CHECK=y # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set CONFIG_LOG_BUF_SHIFT=14 CONFIG_DETECT_SOFTLOCKUP=y # CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_SLAB is not set CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_RWSEMS is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set @@ -1180,6 +1169,7 @@ CONFIG_DEBUG_BUGVERBOSE=y CONFIG_FRAME_POINTER=y CONFIG_FORCED_INLINING=y # CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set CONFIG_DEBUG_USER=y CONFIG_DEBUG_ERRORS=y CONFIG_DEBUG_LL=y @@ -1194,43 +1184,7 @@ CONFIG_DEBUG_LL=y # # Cryptographic options # -CONFIG_CRYPTO=y -CONFIG_CRYPTO_ALGAPI=m -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_MANAGER=m -# CONFIG_CRYPTO_HMAC is not set -# CONFIG_CRYPTO_XCBC is not set -# CONFIG_CRYPTO_NULL is not set -# CONFIG_CRYPTO_MD4 is not set -# CONFIG_CRYPTO_MD5 is not set -# CONFIG_CRYPTO_SHA1 is not set -# CONFIG_CRYPTO_SHA256 is not set -# CONFIG_CRYPTO_SHA512 is not set -# CONFIG_CRYPTO_WP512 is not set -# CONFIG_CRYPTO_TGR192 is not set -# CONFIG_CRYPTO_GF128MUL is not set -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=m -# CONFIG_CRYPTO_LRW is not set -# CONFIG_CRYPTO_DES is not set -# CONFIG_CRYPTO_BLOWFISH is not set -# CONFIG_CRYPTO_TWOFISH is not set -# CONFIG_CRYPTO_SERPENT is not set -# CONFIG_CRYPTO_AES is not set -# CONFIG_CRYPTO_CAST5 is not set -# CONFIG_CRYPTO_CAST6 is not set -# CONFIG_CRYPTO_TEA is not set -CONFIG_CRYPTO_ARC4=m -# CONFIG_CRYPTO_KHAZAD is not set -# CONFIG_CRYPTO_ANUBIS is not set -# CONFIG_CRYPTO_DEFLATE is not set -# CONFIG_CRYPTO_MICHAEL_MIC is not set -# CONFIG_CRYPTO_CRC32C is not set -# CONFIG_CRYPTO_TEST is not set - -# -# Hardware crypto devices -# +# CONFIG_CRYPTO is not set # # Library routines @@ -1243,4 +1197,5 @@ CONFIG_CRC32=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_PLIST=y -CONFIG_IOMAP_COPY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y diff --git a/packages/linux/linux/simpad/linux-2.6.21-SIMpad-cs3-simpad.patch b/packages/linux/linux/simpad/linux-2.6.21-SIMpad-cs3-simpad.patch new file mode 100644 index 0000000000..6d6c373271 --- /dev/null +++ b/packages/linux/linux/simpad/linux-2.6.21-SIMpad-cs3-simpad.patch @@ -0,0 +1,315 @@ +diff -uNr linux-2.6.21.vanilla/arch/arm/mach-sa1100/Makefile linux-2.6.21/arch/arm/mach-sa1100/Makefile +--- linux-2.6.21.vanilla/arch/arm/mach-sa1100/Makefile 2007-05-01 16:40:44.000000000 +0200 ++++ linux-2.6.21/arch/arm/mach-sa1100/Makefile 2007-05-01 16:52:10.000000000 +0200 +@@ -40,6 +40,7 @@ + obj-$(CONFIG_SA1100_SHANNON) += shannon.o + + obj-$(CONFIG_SA1100_SIMPAD) += simpad.o ++obj-$(CONFIG_SA1100_SIMPAD) += cs3-simpad.o + led-$(CONFIG_SA1100_SIMPAD) += leds-simpad.o + + # LEDs support +diff -uNr linux-2.6.21.vanilla/arch/arm/mach-sa1100/cs3-simpad.c linux-2.6.21/arch/arm/mach-sa1100/cs3-simpad.c +--- linux-2.6.21.vanilla/arch/arm/mach-sa1100/cs3-simpad.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.21/arch/arm/mach-sa1100/cs3-simpad.c 2007-05-01 16:52:10.000000000 +0200 +@@ -0,0 +1,300 @@ ++/* ++ * cs3-simpad.c ++ * ++ * This driver shows the GPIO states of the cs3 latch. You can also ++ * switch some GPIOS. ++ * ++ * (c) 2007 Bernhard Guillon ++ * ++ * You may use this code as per GPL version 2 ++ * ++ * Some parts are based on battery.c ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++ ++#include ++ ++extern long get_cs3_shadow(void); ++extern void set_cs3_bit(int value); ++extern void clear_cs3_bit(int value); ++ ++struct cs3 { ++ struct class_device class_dev; ++ const char *name; ++ char *id; ++ int type; ++}; ++ ++struct cs3 cs3 ={ ++ .name = "latch_cs3", ++}; ++ ++static ssize_t get_VCC_5V_EN (struct class_device *class_dev, char *buf) { ++ if (get_cs3_shadow() & VCC_5V_EN ) ++ return sprintf(buf, "1\n"); ++ else ++ return sprintf(buf, "0\n"); ++} ++ ++static ssize_t get_VCC_3V_EN (struct class_device *class_dev, char *buf) { ++ if (get_cs3_shadow() & VCC_3V_EN) ++ return sprintf(buf, "1\n"); ++ else ++ return sprintf(buf, "0\n"); ++} ++ ++static ssize_t get_EN1 (struct class_device *class_dev, char *buf) { ++ if (get_cs3_shadow() & EN1) ++ return sprintf(buf, "1\n"); ++ else ++ return sprintf(buf, "0\n"); ++} ++ ++static ssize_t get_EN0 (struct class_device *class_dev, char *buf) { ++ if (get_cs3_shadow() & EN0) ++ return sprintf(buf, "1\n"); ++ else ++ return sprintf(buf, "0\n"); ++} ++ ++static ssize_t get_DISPLAY_ON (struct class_device *class_dev, char *buf) { ++ if (get_cs3_shadow() & DISPLAY_ON) ++ return sprintf(buf, "1\n"); ++ else ++ return sprintf(buf, "0\n"); ++} ++ ++static ssize_t get_PCMCIA_BUFF_DIS (struct class_device *class_dev, char *buf) { ++ if (get_cs3_shadow() & PCMCIA_BUFF_DIS) ++ return sprintf(buf, "1\n"); ++ else ++ return sprintf(buf, "0\n"); ++} ++ ++static ssize_t get_MQ_RESET (struct class_device *class_dev, char *buf) { ++ if (get_cs3_shadow() & MQ_RESET) ++ return sprintf(buf, "1\n"); ++ else ++ return sprintf(buf, "0\n"); ++} ++ ++static ssize_t get_PCMCIA_RESET (struct class_device *class_dev, char *buf) { ++ if (get_cs3_shadow() & PCMCIA_RESET) ++ return sprintf(buf, "1\n"); ++ else ++ return sprintf(buf, "0\n"); ++} ++ ++static ssize_t get_DECT_POWER_ON (struct class_device *class_dev, char *buf) { ++ if (get_cs3_shadow() & DECT_POWER_ON) ++ return sprintf(buf, "1\n"); ++ else ++ return sprintf(buf, "0\n"); ++} ++ ++static ssize_t get_IRDA_SD (struct class_device *class_dev, char *buf) { ++ if (get_cs3_shadow() & IRDA_SD) ++ return sprintf(buf, "1\n"); ++ else ++ return sprintf(buf, "0\n"); ++} ++ ++static ssize_t get_RS232_ON (struct class_device *class_dev, char *buf) { ++ if (get_cs3_shadow() & RS232_ON) ++ return sprintf(buf, "1\n"); ++ else ++ return sprintf(buf, "0\n"); ++} ++ ++static ssize_t get_SD_MEDIAQ (struct class_device *class_dev, char *buf) { ++ if (get_cs3_shadow() & SD_MEDIAQ) ++ return sprintf(buf, "1\n"); ++ else ++ return sprintf(buf, "0\n"); ++} ++ ++static ssize_t get_LED2_ON (struct class_device *class_dev, char *buf) { ++ if (get_cs3_shadow() & LED2_ON) ++ return sprintf(buf, "1\n"); ++ else ++ return sprintf(buf, "0\n"); ++} ++ ++static ssize_t get_IRDA_MODE (struct class_device *class_dev, char *buf) { ++ if (get_cs3_shadow() & IRDA_MODE) ++ return sprintf(buf, "1\n"); ++ else ++ return sprintf(buf, "0\n"); ++} ++ ++static ssize_t get_ENABLE_5V (struct class_device *class_dev, char *buf) { ++ if (get_cs3_shadow() & ENABLE_5V) ++ return sprintf(buf, "1\n"); ++ else ++ return sprintf(buf, "0\n"); ++} ++ ++static ssize_t get_RESET_SIMCARD (struct class_device *class_dev, char *buf) { ++ if (get_cs3_shadow() & RESET_SIMCARD) ++ return sprintf(buf, "1\n"); ++ else ++ return sprintf(buf, "0\n"); ++} ++ ++ ++static ssize_t write_DISPLAY_ON (struct class_device *cdev, const char * buf, size_t count){ ++ char val; ++ if (sscanf(buf, "%c",&val) !=1) ++ return -EINVAL; ++ if (val=='1') ++ set_cs3_bit(DISPLAY_ON); ++ else if (val=='0') ++ clear_cs3_bit(DISPLAY_ON); ++ return strlen(buf); ++} ++ ++static ssize_t write_DECT_POWER_ON (struct class_device *cdev, const char * buf, size_t count){ ++ char val; ++ if (sscanf(buf, "%c",&val) !=1) ++ return -EINVAL; ++ if (val=='1') ++ set_cs3_bit(DECT_POWER_ON); ++ else if (val=='0') ++ clear_cs3_bit(DECT_POWER_ON); ++ return strlen(buf); ++} ++ ++static ssize_t write_IRDA_SD (struct class_device *cdev, const char * buf, size_t count){ ++ char val; ++ if (sscanf(buf, "%c",&val) !=1) ++ return -EINVAL; ++ if (val=='1') ++ set_cs3_bit(IRDA_SD); ++ else if (val=='0') ++ clear_cs3_bit(IRDA_SD); ++ return strlen(buf); ++} ++ ++static ssize_t write_SD_MEDIAQ (struct class_device *cdev, const char * buf, size_t count){ ++ char val; ++ if (sscanf(buf, "%c",&val) !=1) ++ return -EINVAL; ++ if (val=='1') ++ set_cs3_bit(SD_MEDIAQ); ++ else if (val=='0') ++ clear_cs3_bit(SD_MEDIAQ); ++ return strlen(buf); ++} ++ ++static ssize_t write_LED2_ON (struct class_device *cdev, const char * buf, size_t count){ ++ char val; ++ if (sscanf(buf, "%c",&val) !=1) ++ return -EINVAL; ++ if (val=='1') ++ set_cs3_bit(LED2_ON); ++ else if (val=='0') ++ clear_cs3_bit(LED2_ON); ++ return strlen(buf); ++} ++ ++static ssize_t write_IRDA_MODE (struct class_device *cdev, const char * buf, size_t count){ ++ char val; ++ if (sscanf(buf, "%c",&val) !=1) ++ return -EINVAL; ++ if (val=='1') ++ set_cs3_bit(IRDA_MODE); ++ else if (val=='0') ++ clear_cs3_bit(IRDA_MODE); ++ return strlen(buf); ++} ++ ++static ssize_t write_RESET_SIMCARD (struct class_device *cdev, const char * buf, size_t count){ ++ char val; ++ if (sscanf(buf, "%c",&val) !=1) ++ return -EINVAL; ++ if (val=='1') ++ set_cs3_bit(RESET_SIMCARD); ++ else if (val=='0') ++ clear_cs3_bit(RESET_SIMCARD); ++ return strlen(buf); ++} ++ ++static CLASS_DEVICE_ATTR(vcc_5v_en, 0444, get_VCC_5V_EN, NULL); ++static CLASS_DEVICE_ATTR(vcc_3v_en, 0444, get_VCC_3V_EN, NULL); ++static CLASS_DEVICE_ATTR(en1, 0444, get_EN1, NULL); ++static CLASS_DEVICE_ATTR(en0, 0444, get_EN0, NULL); ++static CLASS_DEVICE_ATTR(display_on, 0664, get_DISPLAY_ON, write_DISPLAY_ON); ++static CLASS_DEVICE_ATTR(pcmcia_buff_dis, 0444, get_PCMCIA_BUFF_DIS, NULL); ++static CLASS_DEVICE_ATTR(mq_reset, 0444, get_MQ_RESET, NULL); ++static CLASS_DEVICE_ATTR(pcmcia_reset, 0444, get_PCMCIA_RESET, NULL); ++static CLASS_DEVICE_ATTR(dect_power_on, 0664, get_DECT_POWER_ON, write_DECT_POWER_ON); ++static CLASS_DEVICE_ATTR(irda_sd, 0664, get_IRDA_SD, write_IRDA_SD); ++static CLASS_DEVICE_ATTR(rs232_on, 0444, get_RS232_ON, NULL); ++static CLASS_DEVICE_ATTR(sd_mediaq, 0664, get_SD_MEDIAQ, write_SD_MEDIAQ); ++static CLASS_DEVICE_ATTR(led2_on, 0664, get_LED2_ON, write_LED2_ON); ++static CLASS_DEVICE_ATTR(irda_mode, 0664, get_IRDA_MODE, write_IRDA_MODE); ++static CLASS_DEVICE_ATTR(enable_5v, 0444, get_ENABLE_5V, NULL); ++static CLASS_DEVICE_ATTR(reset_simcard, 0664, get_RESET_SIMCARD, write_RESET_SIMCARD); ++ ++static struct class simpad_gpios_class = { ++ .name = "simpad" ++}; ++ ++#define create_entry_conditional(name) \ ++ rc = class_device_create_file(&cs3->class_dev, &class_device_attr_##name); \ ++ if (rc) goto out; \ ++ ++static int register_cs3_latch(struct cs3 *cs3){ ++ int rc = 0; ++ cs3->class_dev.class = &simpad_gpios_class; ++ strcpy(cs3->class_dev.class_id, cs3->name); ++ rc = class_device_register(&cs3->class_dev); ++ if(rc) ++ goto out; ++ ++ create_entry_conditional(vcc_5v_en); ++ create_entry_conditional(vcc_3v_en); ++ create_entry_conditional(en1); ++ create_entry_conditional(en0); ++ create_entry_conditional(display_on); ++ create_entry_conditional(pcmcia_buff_dis); ++ create_entry_conditional(mq_reset); ++ create_entry_conditional(pcmcia_reset); ++ create_entry_conditional(dect_power_on); ++ create_entry_conditional(irda_sd); ++ create_entry_conditional(rs232_on); ++ create_entry_conditional(sd_mediaq); ++ create_entry_conditional(led2_on); ++ create_entry_conditional(irda_mode); ++ create_entry_conditional(enable_5v); ++ create_entry_conditional(reset_simcard); ++ ++out: ++ return rc; ++} ++ ++static int __init simpad_gpios_class_init(void) ++{ ++ if (class_register(&simpad_gpios_class) != 0) ++ printk(KERN_ERR "cs3 latch class failed " ++ "to register properly\n"); ++ register_cs3_latch(&cs3); ++ return 0; ++} ++ ++static void __exit simpad_gpios_class_exit(void) ++{ ++ class_unregister(&simpad_gpios_class); ++} ++ ++module_init(simpad_gpios_class_init); ++module_exit(simpad_gpios_class_exit); ++ ++MODULE_DESCRIPTION("CS3_latch driver"); ++MODULE_AUTHOR("Bernhard Guillon"); ++MODULE_LICENSE("GPL"); diff --git a/packages/linux/linux/simpad/linux-2.6.21-SIMpad-mq200.patch b/packages/linux/linux/simpad/linux-2.6.21-SIMpad-mq200.patch new file mode 100644 index 0000000000..5726779ad6 --- /dev/null +++ b/packages/linux/linux/simpad/linux-2.6.21-SIMpad-mq200.patch @@ -0,0 +1,2511 @@ +diff -uNr linux-2.6.21.vanilla/drivers/video/Kconfig linux-2.6.21/drivers/video/Kconfig +--- linux-2.6.21.vanilla/drivers/video/Kconfig 2007-05-01 16:40:48.000000000 +0200 ++++ linux-2.6.21/drivers/video/Kconfig 2007-05-01 17:02:17.000000000 +0200 +@@ -139,7 +139,7 @@ + This is particularly important to one driver, matroxfb. If + unsure, say N. + +-comment "Frame buffer hardware drivers" ++comment "Frambuffer hardware drivers" + depends on FB + + config FB_CIRRUS +@@ -1120,6 +1120,15 @@ + ---help--- + Driver for graphics boards with S3 Trio / S3 Virge chip. + ++config FB_MQ200 ++ bool "MQ200 Driver" ++ depends on (FB = y) && ARM && ARCH_SA1100 ++ select FB_CFB_FILLRECT ++ select FB_CFB_COPYAREA ++ select FB_CFB_IMAGEBLIT ++ help ++ This is a MQ200 driver tested only on Siemens SIMpads. ++ + config FB_SAVAGE + tristate "S3 Savage support" + depends on FB && PCI && EXPERIMENTAL +diff -uNr linux-2.6.21.vanilla/drivers/video/Makefile linux-2.6.21/drivers/video/Makefile +--- linux-2.6.21.vanilla/drivers/video/Makefile 2007-05-01 16:40:48.000000000 +0200 ++++ linux-2.6.21/drivers/video/Makefile 2007-05-01 17:02:17.000000000 +0200 +@@ -29,6 +29,7 @@ + obj-$(CONFIG_FB_PM2) += pm2fb.o + obj-$(CONFIG_FB_PM3) += pm3fb.o + ++obj-$(CONFIG_FB_MQ200) += mq200/ + obj-$(CONFIG_FB_MATROX) += matrox/ + obj-$(CONFIG_FB_RIVA) += riva/ vgastate.o + obj-$(CONFIG_FB_NVIDIA) += nvidia/ +diff -uNr linux-2.6.21.vanilla/drivers/video/backlight/Kconfig linux-2.6.21/drivers/video/backlight/Kconfig +--- linux-2.6.21.vanilla/drivers/video/backlight/Kconfig 2007-05-01 16:40:48.000000000 +0200 ++++ linux-2.6.21/drivers/video/backlight/Kconfig 2007-05-01 17:02:17.000000000 +0200 +@@ -63,3 +63,20 @@ + help + If you have a Frontpath ProGear say Y to enable the + backlight driver. ++ ++config BACKLIGHT_SIMPAD ++ tristate "SIMpad MQ200 Backlight driver" ++ depends on SA1100_SIMPAD && BACKLIGHT_CLASS_DEVICE ++ default y ++ help ++ If you have a Siemens SIMpad say Y to enable the ++ backlight driver. ++ ++config LCD_SIMPAD ++ tristate "SIMpad MQ200 LCD driver" ++ depends on SA1100_SIMPAD && LCD_CLASS_DEVICE ++ default y ++ help ++ If you have a Siemens SIMpad say Y to enable the ++ LCD driver. ++ +diff -uNr linux-2.6.21.vanilla/drivers/video/backlight/Makefile linux-2.6.21/drivers/video/backlight/Makefile +--- linux-2.6.21.vanilla/drivers/video/backlight/Makefile 2007-05-01 16:40:48.000000000 +0200 ++++ linux-2.6.21/drivers/video/backlight/Makefile 2007-05-01 17:02:17.000000000 +0200 +@@ -6,3 +6,5 @@ + obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o + obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomolcd.o + obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o ++obj-$(CONFIG_BACKLIGHT_SIMPAD) += simpad_bl.o ++obj-$(CONFIG_LCD_SIMPAD) += simpad_lcd.o +diff -uNr linux-2.6.21.vanilla/drivers/video/backlight/simpad_bl.c linux-2.6.21/drivers/video/backlight/simpad_bl.c +--- linux-2.6.21.vanilla/drivers/video/backlight/simpad_bl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.21/drivers/video/backlight/simpad_bl.c 2007-05-01 17:02:17.000000000 +0200 +@@ -0,0 +1,208 @@ ++/* ++ * GPLv2 backlight_device_register ++ * ++ * 2007/03/24 mrdata ++ * - added .brightness=127 in ++ * struct backlight_properties simpad_bl_props() ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#include "../mq200/mq200_data.h" ++ ++#define SIMPAD_BACKLIGHT_MASK 0x00a10044 ++#define SIMPAD_DEFAULT_INTENSITY 127 ++#define SIMPAD_MAX_INTENSITY 254 ++#define REGISTER_BASE 0xf2e00000 ++ ++static int simpad_bl_suspended; ++static int current_intensity = 0; ++ ++static void simpad_bl_send_intensity(struct backlight_device *bd) ++{ ++ int intensity = bd->props.brightness; ++ ++ union fp0fr fp0fr; ++ unsigned long dutyCycle, pwmcontrol; ++ ++ if (intensity > SIMPAD_MAX_INTENSITY) ++ intensity = SIMPAD_MAX_INTENSITY; ++ ++ if (bd->props.power != FB_BLANK_UNBLANK) ++ intensity = 0; ++ ++ if (bd->props.fb_blank != FB_BLANK_UNBLANK) ++ intensity = 0; ++ ++ if (simpad_bl_suspended) ++ intensity = 0; ++ ++ if (intensity != current_intensity) ++ { ++ /* ++ * Determine dutyCycle. ++ * Note: the lower the value, the brighter the display! ++ */ ++ ++ dutyCycle = SIMPAD_MAX_INTENSITY - intensity; ++ ++ /* ++ * Configure PWM0 (source clock = oscillator clock, pwm always enabled, ++ * zero, clock pre-divider = 4) pwm frequency = 12.0kHz ++ */ ++ ++ fp0fr.whole = readl(FP0FR(REGISTER_BASE)); ++ pwmcontrol = fp0fr.whole & 0xffff00ff; ++ fp0fr.whole &= 0xffffff00; ++ fp0fr.whole |= 0x00000044; ++ writel(fp0fr.whole, FP0FR(REGISTER_BASE)); ++ ++ /* Write to pwm duty cycle register. */ ++ fp0fr.whole = dutyCycle << 8; ++ fp0fr.whole &= 0x0000ff00; ++ fp0fr.whole |= pwmcontrol; ++ writel(fp0fr.whole, FP0FR(REGISTER_BASE)); ++ ++ current_intensity = intensity; ++ } ++} ++ ++ ++#ifdef CONFIG_PM ++static int simpad_bl_suspend(struct platform_device *pdev, pm_message_t state) ++{ ++ struct backlight_device *bd = platform_get_drvdata(pdev); ++ ++ simpad_bl_suspended = 1; ++ simpad_bl_send_intensity(bd); ++ return 0; ++} ++ ++static int simpad_bl_resume(struct platform_device *pdev) ++{ ++ struct backlight_device *bd = platform_get_drvdata(pdev); ++ ++ simpad_bl_suspended = 0; ++ simpad_bl_send_intensity(bd); ++ return 0; ++} ++#else ++#define simpad_bl_suspend NULL ++#define simpad_bl_resume NULL ++#endif ++ ++ ++static int simpad_bl_set_intensity(struct backlight_device *bd) ++{ ++ simpad_bl_send_intensity(bd); ++ return 0; ++} ++ ++ ++static int simpad_bl_get_intensity(struct backlight_device *bd) ++{ ++ return current_intensity; ++} ++ ++ ++static struct backlight_ops simpad_bl_ops = { ++ .get_brightness = simpad_bl_get_intensity, ++ .update_status = simpad_bl_set_intensity, ++}; ++ ++ ++static int __init simpad_bl_probe(struct platform_device *pdev) ++{ ++ struct backlight_device *bd; ++ ++ bd = backlight_device_register("simpad-mq200-bl", &pdev->dev, NULL, &simpad_bl_ops); ++ ++ if (IS_ERR (bd)) ++ return PTR_ERR (bd); ++ ++ platform_set_drvdata(pdev, bd); ++ ++ bd->props.max_brightness = SIMPAD_MAX_INTENSITY; ++ bd->props.brightness = SIMPAD_DEFAULT_INTENSITY; ++ simpad_bl_send_intensity(bd); ++ ++ return 0; ++} ++ ++ ++static int simpad_bl_remove(struct platform_device *pdev) ++{ ++ struct backlight_device *bd = platform_get_drvdata(pdev); ++ ++ bd->props.brightness = 0; ++ bd->props.power = 0; ++ simpad_bl_send_intensity(bd); ++ ++ backlight_device_unregister(bd); ++ ++ return 0; ++} ++ ++static struct platform_driver simpad_bl_driver = { ++ .probe = simpad_bl_probe, ++ .remove = simpad_bl_remove, ++ .suspend = simpad_bl_suspend, ++ .resume = simpad_bl_resume, ++ .driver = { ++ .name = "simpad-mq200-bl", ++ }, ++}; ++ ++static struct platform_device *simpad_bl_device = NULL; ++ ++static int __init simpad_bl_init(void) ++{ ++ int ret; ++ ++ ret = platform_driver_register(&simpad_bl_driver); ++ if (!ret) { ++ simpad_bl_device = platform_device_alloc("simpad-mq200-bl", -1); ++ if (!simpad_bl_device) ++ return -ENOMEM; ++ ++ ret = platform_device_add(simpad_bl_device); ++ ++ if (ret) { ++ platform_device_put(simpad_bl_device); ++ platform_driver_unregister(&simpad_bl_driver); ++ } ++ } ++ return ret; ++} ++ ++static void __exit simpad_bl_exit(void) ++{ ++ platform_device_unregister(simpad_bl_device); ++ platform_driver_unregister(&simpad_bl_driver); ++} ++ ++ ++module_init(simpad_bl_init); ++module_exit(simpad_bl_exit); ++MODULE_AUTHOR("Holger Hans Peter Freyther"); ++MODULE_LICENSE("GPL"); +diff -uNr linux-2.6.21.vanilla/drivers/video/backlight/simpad_lcd.c linux-2.6.21/drivers/video/backlight/simpad_lcd.c +--- linux-2.6.21.vanilla/drivers/video/backlight/simpad_lcd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.21/drivers/video/backlight/simpad_lcd.c 2007-05-01 17:02:17.000000000 +0200 +@@ -0,0 +1,170 @@ ++/* ++ * GPLv2 ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++extern long get_cs3_shadow(void); ++extern void set_cs3_bit(int); ++extern void clear_cs3_bit(int); ++ ++#define UNUSED(x) x=x ++ ++static int simpad_lcd_get_power(struct lcd_device* dev) ++{ ++ UNUSED(dev); ++ ++ return (get_cs3_shadow() & DISPLAY_ON) ? 0 : 4; ++} ++ ++static int simpad_lcd_set_power(struct lcd_device* dev, int power) ++{ ++ UNUSED(dev); ++ ++ if( power == 4 ) ++ clear_cs3_bit(DISPLAY_ON); ++ else ++ set_cs3_bit(DISPLAY_ON); ++ ++ return 0; ++} ++ ++static int simpad_lcd_get_contrast(struct lcd_device* dev) ++{ ++ UNUSED(dev); ++ ++ return 0; ++} ++ ++static int simpad_lcd_set_contrast(struct lcd_device* dev, int contrast) ++{ ++ UNUSED(dev); ++ ++ UNUSED(contrast); ++ ++ return 0; ++} ++ ++#ifdef CONFIG_PM ++static int simpad_lcd_suspend(struct platform_device *pdev, pm_message_t state) ++{ ++ UNUSED(state); ++ static int ret; ++ ++ struct lcd_device* ld; ++ ++ ld = platform_get_drvdata(pdev); ++ ++ ret = simpad_lcd_set_power(ld, 4); ++ ++ return ret; ++} ++ ++static int simpad_lcd_resume(struct platform_device *pdev) ++{ ++ struct lcd_device *ld; ++ static int ret; ++ ++ ld = platform_get_drvdata(pdev); ++ ++ ret = simpad_lcd_set_power(ld, 0); ++ ++ return ret; ++} ++#else ++#define simpad_lcd_suspend NULL ++#define simpad_lcd_resume NULL ++#endif ++ ++static struct lcd_properties simpad_lcd_props = { ++ .max_contrast = 0, ++}; ++ ++ ++static struct lcd_ops simpad_lcd_ops = { ++ .get_power = simpad_lcd_get_power, ++ .set_power = simpad_lcd_set_power, ++ .get_contrast = simpad_lcd_get_contrast, ++ .set_contrast = simpad_lcd_set_contrast, ++}; ++ ++static int __init simpad_lcd_probe(struct platform_device *pdev) ++{ ++ struct lcd_device *ld; ++ ++ ld = lcd_device_register ("simpad-mq200-lcd", &pdev->dev, &simpad_lcd_ops); ++ ++ if (IS_ERR(ld)) ++ return PTR_ERR(ld); ++ ++ platform_set_drvdata(pdev, ld); ++ ++ ld->props.max_contrast = 0; ++ ++ return 0; ++} ++ ++static int simpad_lcd_remove(struct platform_device *pdev) ++{ ++ struct lcd_device *ld = platform_get_drvdata(pdev); ++ ++ lcd_device_unregister(ld); ++ ++ return 0; ++} ++ ++static struct platform_driver simpad_lcd_driver = { ++ .probe = simpad_lcd_probe, ++ .remove = simpad_lcd_remove, ++ .suspend = simpad_lcd_suspend, ++ .resume = simpad_lcd_resume, ++ .driver = { ++ .name = "simpad-mq200-lcd", ++ }, ++}; ++ ++static struct platform_device *simpad_lcd_device = NULL; ++ ++static int __init simpad_lcd_init(void) ++{ ++ int ret; ++ ++ ret = platform_driver_register(&simpad_lcd_driver); ++ if (!ret) { ++ simpad_lcd_device = platform_device_alloc("simpad-mq200-lcd", -1); ++ if (!simpad_lcd_device) ++ return -ENOMEM; ++ ++ ret = platform_device_add(simpad_lcd_device); ++ ++ if (ret) { ++ platform_device_put(simpad_lcd_device); ++ platform_driver_unregister(&simpad_lcd_driver); ++ } ++ } ++ return ret; ++} ++ ++static void __exit simpad_lcd_exit(void) { ++ platform_driver_unregister(&simpad_lcd_driver); ++ platform_device_unregister(simpad_lcd_device); ++} ++ ++module_init(simpad_lcd_init); ++module_exit(simpad_lcd_exit); ++MODULE_AUTHOR("Holger Hans Peter Freyther"); ++MODULE_LICENSE("GPL"); +diff -uNr linux-2.6.21.vanilla/drivers/video/mq200/Makefile linux-2.6.21/drivers/video/mq200/Makefile +--- linux-2.6.21.vanilla/drivers/video/mq200/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.21/drivers/video/mq200/Makefile 2007-05-01 17:02:17.000000000 +0200 +@@ -0,0 +1,6 @@ ++# Makefile for mq200 video driver ++# 4 Aug 2003, Holger Hans Peter Freyther ++# ++ ++obj-$(CONFIG_FB_MQ200) += mq_skeleton.o mq_external.o ++ +diff -uNr linux-2.6.21.vanilla/drivers/video/mq200/mq200_data.h linux-2.6.21/drivers/video/mq200/mq200_data.h +--- linux-2.6.21.vanilla/drivers/video/mq200/mq200_data.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.21/drivers/video/mq200/mq200_data.h 2007-05-01 17:02:17.000000000 +0200 +@@ -0,0 +1,1120 @@ ++/* ++ * From ucLinux mq200fb.c and mq200fb.h ++ * ++ * 2007/03/11 mrdata: ++ * insert registers for graphics controller 2 module ++ */ ++ ++#ifndef __MQ200_FB_H__ ++#define __MQ200_FB_H__ ++ ++struct mq200_io_regions { ++ u32 fb_size; /* framebuffer size */ ++ unsigned long phys_mmio_base; /* physical register memory base */ ++ unsigned long virt_mmio_base; /* virtual start of registers */ ++ unsigned long phys_fb_base; /* physical address of frame buffer */ ++ unsigned long virt_fb_base; /* virtual start of the framebuffer */ ++}; ++ ++#define MQ200_MONITOR_HORI_RES(info) info->monitor_info.horizontal_res ++#define MQ200_MONITOR_VERT_RES(info) info->monitor_info.vertical_res ++#define MQ200_MONITOR_DEPTH(info) info->monitor_info.depth ++#define MQ200_MONITOR_LINE_LENGTH(info) info->monitor_info.line_length ++ ++struct mq200_monitor_info { ++ unsigned int horizontal_res; ++ unsigned int vertical_res; ++ unsigned int depth; ++ unsigned int refresh; ++ unsigned int line_length; ++ unsigned long flags; ++}; ++ ++ ++/** ++ * Addresses of Module ++ */ ++#define MQ200_FB_BASE (x) (x + 0x1800000) /* framebuffer */ ++#define MQ200_FB_SIZE 0x200000 /* framebuffer size in bytes */ ++#define MQ200_REGS_BASE(x) (x + 0x1e00000) /* start of registers area */ ++#define MQ200_REGS_SIZE 0x200000 /* registers area size */ ++ ++#define PMU_OFFSET 0x00000 /* power management */ ++#define CPU_OFFSET 0x02000 /* CPU interface */ ++#define MIU_OFFSET 0x04000 /* memory controller */ ++#define IN_OFFSET 0x08000 /* interrupt controller */ ++#define GC_OFFSET 0x0a000 /* graphics controller 1&2 */ ++#define GE_OFFSET 0x0c000 /* graphics engine */ ++#define FPI_OFFSET 0x0e000 /* flat panel controller */ ++#define CP1_OFFSET 0x10000 /* color palette 1 */ ++#define DC_OFFSET 0x14000 /* device configuration */ ++#define PCI_OFFSET 0x16000 /* PCI configuration */ ++#define PSF_OFFSET 0x18000 /* ??? */ ++ ++ ++/**** ++ * Registers ++ */ ++ ++/* power management unit */ ++#define PMR(addr) (addr + PCI_OFFSET + 0x40)/* power management ++ register */ ++#define PMR_VALUE 0x06210001 /* expected read value of PMR register */ ++#define PM00R(addr) (addr + PMU_OFFSET + 0x00) /* power management unit ++ configuration ++ register */ ++#define PM01R(addr) (addr + PMU_OFFSET + 0x04) /* D1 state control */ ++#define PM02R(addr) (addr + PMU_OFFSET + 0x08) /* d2 state control */ ++#define PM06R(addr) (addr + PMU_OFFSET + 0x18) /* PLL 2 programming */ ++#define PM07R(addr) (addr + PMU_OFFSET + 0x1c) /* PLL 3 programming */ ++ ++#define PMCSR(addr) (addr + PCI_OFFSET + 0x44) /* power management ++ control/status ++ register */ ++ ++/* memory interface unit */ ++#define MM00R(addr) (addr + MIU_OFFSET + 0x00)/* MIU interface control ++ 0 */ ++#define MM01R(addr) (addr + MIU_OFFSET + 0x04) /* MIU interface control ++ 1 */ ++#define MM02R(addr) (addr + MIU_OFFSET + 0x08) /* memory interface ++ control 2 */ ++#define MM03R(addr) (addr + MIU_OFFSET + 0x0c) /* memory interface ++ control 3 */ ++#define MM04R(addr) (addr + MIU_OFFSET + 0x10) /* memory interface ++ control 4 */ ++/* graphics controller 1 module */ ++#define GC00R(addr) (addr + GC_OFFSET + 0x00) /* graphics controller 1 ++ control */ ++#define GC01R(addr) (addr + GC_OFFSET + 0x04) /* graphics controller ++ CRT control */ ++#define GC02R(addr) (addr + GC_OFFSET + 0x08) /* horizontal display 1 ++ control */ ++#define GC03R(addr) (addr + GC_OFFSET + 0x0c) /* vertical display 1 ++ control */ ++#define GC04R(addr) (addr + GC_OFFSET + 0x10) /* horizontal sync 1 ++ control */ ++#define GC05R(addr) (addr + GC_OFFSET + 0x14) /* vertical sync 1 ++ control */ ++#define GC07R(addr) (addr + GC_OFFSET + 0x1c) /* vertical display 1 ++ count */ ++#define GC08R(addr) (addr + GC_OFFSET + 0x20) /* horizontal window 1 ++ control */ ++#define GC09R(addr) (addr + GC_OFFSET + 0x24) /* vertical window 1 ++ control */ ++#define GC0AR(addr) (addr + GC_OFFSET + 0x28) /* alternate horizontal ++ window 1 control */ ++#define GC0BR(addr) (addr + GC_OFFSET + 0x2c) /* alternate vertical ++ window 1 control */ ++#define GC0CR(addr) (addr + GC_OFFSET + 0x30) /* window 1 ++ start address */ ++#define GC0DR(addr) (addr + GC_OFFSET + 0x34) /* alternate window 1 ++ start address */ ++#define GC0ER(addr) (addr + GC_OFFSET + 0x38) /* alternate window 1 ++ stride */ ++#define GC0FR(addr) (addr + GC_OFFSET + 0x3c) /* alternate window 1 ++ line size */ ++#define GC10R(addr) (addr + GC_OFFSET + 0x40) /* hardware cursor 1 ++ position */ ++#define GC11R(addr) (addr + GC_OFFSET + 0x44) /* hardware cursor 1 ++ start address and ++ offset */ ++#define GC12R(addr) (addr + GC_OFFSET + 0x48) /* hardware cursor 1 ++ foreground color */ ++#define GC13R(addr) (addr + GC_OFFSET + 0x4c) /* hardware cursor 1 ++ background color */ ++ ++/* graphics controller 2 module */ ++#define GC20R(addr) (addr + GC_OFFSET + 0x80) /* graphics controller 2 ++ control */ ++#define GC21R(addr) (addr + GC_OFFSET + 0x84) /* graphics controller ++ CRC control */ ++#define GC22R(addr) (addr + GC_OFFSET + 0x88) /* horizontal display 2 ++ control */ ++#define GC23R(addr) (addr + GC_OFFSET + 0x8c) /* vertical display 2 ++ control */ ++#define GC24R(addr) (addr + GC_OFFSET + 0x90) /* horizontal sync 2 ++ control */ ++#define GC25R(addr) (addr + GC_OFFSET + 0x94) /* vertical sync 2 ++ control */ ++#define GC27R(addr) (addr + GC_OFFSET + 0x9c) /* vertical display 2 ++ count */ ++#define GC28R(addr) (addr + GC_OFFSET + 0xa0) /* horizontal window 2 ++ control */ ++#define GC29R(addr) (addr + GC_OFFSET + 0xa4) /* vertical window 2 ++ control */ ++#define GC2AR(addr) (addr + GC_OFFSET + 0xa8) /* alternate horizontal ++ window 2 control */ ++#define GC2BR(addr) (addr + GC_OFFSET + 0xac) /* alternate vertical ++ window 2 control */ ++#define GC2CR(addr) (addr + GC_OFFSET + 0xb0) /* window 2 ++ start address */ ++#define GC2DR(addr) (addr + GC_OFFSET + 0xb4) /* alternate window 2 ++ start address */ ++#define GC2ER(addr) (addr + GC_OFFSET + 0xb8) /* alternate window 2 ++ stride */ ++#define GC2FR(addr) (addr + GC_OFFSET + 0xbc) /* alternate window 2 ++ line size */ ++#define GC30R(addr) (addr + GC_OFFSET + 0xc0) /* hardware cursor 2 ++ position */ ++#define GC31R(addr) (addr + GC_OFFSET + 0xc4) /* hardware cursor 2 ++ start address and ++ offset */ ++#define GC32R(addr) (addr + GC_OFFSET + 0xc8) /* hardware cursor 2 ++ foreground color */ ++#define GC33R(addr) (addr + GC_OFFSET + 0xcc) /* hardware cursor 2 ++ background color */ ++ ++/* graphics engine */ ++#define ROP_SRCCOPY 0xCC /* dest = source */ ++#define ROP_SRCPAINT 0xEE /* dest = source OR dest */ ++#define ROP_SRCAND 0x88 /* dest = source AND dest */ ++#define ROP_SRCINVERT 0x66 /* dest = source XOR dest */ ++#define ROP_SRCERASE 0x44 /* dest = source AND (NOT dest) */ ++#define ROP_NOTSRCCOPY 0x33 /* dest = NOT source */ ++#define ROP_NOTSRCERASE 0x11 /* dest = (NOT source) AND (NOT dest) */ ++#define ROP_MERGECOPY 0xC0 /* dest = source AND pattern */ ++#define ROP_MERGEPAINT 0xBB /* dest = (NOT source) OR dest */ ++#define ROP_PATCOPY 0xF0 /* dest = pattern */ ++#define ROP_PATPAINT 0xFB /* dest = DPSnoo */ ++#define ROP_PATINVERT 0x5A /* dest = pattern XOR dest */ ++#define ROP_DSTINVERT 0x55 /* dest = NOT dest */ ++#define ROP_BLACKNESS 0x00 /* dest = BLACK */ ++#define ROP_WHITENESS 0xFF /* dest = WHITE */ ++ ++#define GE00R(addr) (addr + GE_OFFSET + 0x00) /* primary drawing command ++ register */ ++#define GE01R(addr) (addr + GE_OFFSET + 0x04) /* primary width and ++ height register */ ++#define GE02R(addr) (addr + GE_OFFSET + 0x08) /* primary destination ++ address register */ ++#define GE03R(addr) (addr + GE_OFFSET + 0x0c) /* primary source XY ++ register */ ++#define GE04R(addr) (addr + GE_OFFSET + 0x10) /* primary color compare ++ register */ ++#define GE05R(addr) (addr + GE_OFFSET + 0x14) /* primary clip left/top ++ register */ ++#define GE06R(addr) (addr + GE_OFFSET + 0x18) /* primary clip ++ right/bottom register ++ */ ++#define GE07R(addr) (addr + GE_OFFSET + 0x1c) /* primary source and ++ pattern offset ++ register */ ++#define GE08R(addr) (addr + GE_OFFSET + 0x20) /* primary foreground ++ color ++ register/rectangle ++ fill register */ ++#define GE09R(addr) (addr + GE_OFFSET + 0x24) /* source stride/offset ++ register */ ++#define GE0AR(addr) (addr + GE_OFFSET + 0x28) /* destination stride ++ register and color ++ depth */ ++#define GE0BR(addr) (addr + GE_OFFSET + 0x2c) /* image base address ++ register */ ++#define GE40R(addr) (addr + GE_OFFSET + 0x100) /* mono pattern register ++ 0 */ ++#define GE41R(addr) (addr + GE_OFFSET + 0x104) /* mono pattern register ++ 1 */ ++#define GE42R(addr) (addr + GE_OFFSET + 0x108) /* foreground color ++ register */ ++#define GE43R(addr) (addr + GE_OFFSET + 0x10c) /* background color ++ register */ ++/* color palette */ ++#define C1xxR(addr, regno) \ ++ (addr + CP1_OFFSET + (regno) * 4) /* graphics controller color ++ palette 1 */ ++/* device configuration */ ++#define DC00R(addr) (addr + DC_OFFSET + 0x00) /* device configuration ++ register 0 */ ++#define DC_RESET 0x4000 ++/* PCI configuration space */ ++#define PC00R(addr) (addr + PCI_OFFSET + 0x00)/* device ID/vendor ID ++ register */ ++/* Flatpanel Control */ ++#define FP00R(addr) (addr + FPI_OFFSET + 0x00) /* Flat Panel Control 0 */ ++#define FP01R(addr) (addr + FPI_OFFSET + 0x04) /* Flat Panel Output Pin */ ++#define FP02R(addr) (addr + FPI_OFFSET + 0x08) /* Flat Panel Gener Purpose ++ Outout Control Register */ ++#define FP03R(addr) (addr + FPI_OFFSET + 0x0c) /* General Purpose I/O Port ++ Control Register */ ++#define FP04R(addr) (addr + FPI_OFFSET + 0x10) /* STN Panel Control Register */ ++#define FP05R(addr) (addr + FPI_OFFSET + 0x14) /* D-STN Half Frame Buffer ++ Control Register -By Guess */ ++#define FP0FR(addr) (addr + FPI_OFFSET + 0x3c) /* Pulse Width Modulation ++ Control Register */ ++#define FRCTL_PATTERN_COUNT 32 ++#define FP10R(addr) (addr + FPI_OFFSET + 0x40) /* Frame-Rate Control Pattern ++ Register */ ++#define FP11R(addr) (addr + FPI_OFFSET + 0x44) ++#define FP2FR(addr) (addr + FPI_OFFSET + 0xc0) /* Frame-Rate Control Weight ++ Registers */ ++ ++ ++ ++ ++/* power management miscellaneous control */ ++union pm00r { ++ struct { ++ u32 pll1_n_b5 :1; /* PLL 1 N parameter bit 5 is 0 */ ++ u32 reserved_1 :1; ++ u32 pll2_enbl :1; /* PLL 2 enable */ ++ u32 pll3_enbl :1; /* PLL 3 enable */ ++ u32 reserved_2 :1; ++ u32 pwr_st_ctrl :1; /* power state status control */ ++ u32 reserved_3 :2; ++ ++ u32 ge_enbl :1; /* graphics engine enable */ ++ u32 ge_bsy_gl :1; /* graphics engine force busy (global) */ ++ u32 ge_bsy_lcl :1; /* graphics engine force busy (local) */ ++ u32 ge_clock :2; /* graphics engine clock select */ ++ u32 ge_cmd_fifo :1; /* graphics engine command FIFO reset */ ++ u32 ge_src_fifo :1; /* graphics engine CPU source FIFO reset */ ++ u32 miu_pwr_seq :1; /* memory interface unit power sequencing ++ enable */ ++ ++ u32 d3_mem_rfsh :1; /* D3 memory refresh */ ++ u32 d4_mem_rfsh :1; /* D4 memory refresh */ ++ u32 gpwr_intrvl :2; /* general power sequencing interval */ ++ u32 fppwr_intrvl:2; /* flat panel power sequencing interval */ ++ u32 gpwr_seq_ctr:1; /* general power sequencing interval control */ ++ u32 pmu_tm :1; /* PMU test mode */ ++ ++ u32 pwr_state :2; /* power state (read only) */ ++ u32 pwr_seq_st :1; /* power sequencing active status (read ++ only) */ ++ u32 reserved_4 :5; ++ } part; ++ u32 whole; ++}; ++ ++/* D1 state control */ ++union pm01r { ++ struct { ++ u32 osc_enbl :1; /* D1 oscillator enable */ ++ u32 pll1_enbl :1; /* D1 PLL 1 enable */ ++ u32 pll2_enbl :1; /* D1 PLL 2 enable */ ++ u32 pll3_enbl :1; /* D1 PLL 3 enable */ ++ u32 miu_enbl :1; /* D1 Memory Interface Unit (MIU) enable */ ++ u32 mem_rfsh :1; /* D1 memory refresh enable */ ++ u32 ge_enbl :1; /* D1 Graphics Engine (GE) enable */ ++ u32 reserved_1 :1; ++ ++ u32 crt_enbl :1; /* D1 CRT enable */ ++ u32 fpd_enbl :1; /* D1 Flat Panel enable */ ++ u32 reserved_2 :6; ++ ++ u32 ctl1_enbl :1; /* D1 controller 1 enable */ ++ u32 win1_enbl :1; /* D1 window 1 enable */ ++ u32 awin1_enbl :1; /* D1 alternate window 1 enable */ ++ u32 cur1_enbl :1; /* D1 cursor 1 enable */ ++ u32 reserved_3 :4; ++ ++ u32 ctl2_enbl :1; /* D1 controller 2 enable */ ++ u32 win2_enbl :1; /* D1 window 2 enable */ ++ u32 awin2_enbl :1; /* D1 alternate window 2 enable */ ++ u32 cur2_enbl :1; /* D1 cursor 2 enable */ ++ u32 reserved_4 :4; ++ } part; ++ u32 whole; ++}; ++ ++/* D2 state control */ ++union pm02r { ++ struct { ++ u32 osc_enbl :1; /* D2 oscillator enable */ ++ u32 pll1_enbl :1; /* D2 PLL 1 enable */ ++ u32 pll2_enbl :1; /* D2 PLL 2 enable */ ++ u32 pll3_enbl :1; /* D2 PLL 3 enable */ ++ u32 miu_enbl :1; /* D2 Memory Interface Unit (MIU) enable */ ++ u32 mem_rfsh :1; /* D2 memory refresh enable */ ++ u32 ge_enbl :1; /* D2 Graphics Engine (GE) enable */ ++ u32 reserved_1 :1; ++ ++ u32 crt_enbl :1; /* D2 CRT enable */ ++ u32 fpd_enbl :1; /* D2 Flat Panel enable */ ++ u32 reserved_2 :6; ++ ++ u32 ctl1_enbl :1; /* D2 controller 1 enable */ ++ u32 win1_enbl :1; /* D2 window 1 enable */ ++ u32 awin1_enbl :1; /* D2 alternate window 1 enable */ ++ u32 cur1_enbl :1; /* D2 cursor 1 enable */ ++ u32 reserved_3 :4; ++ ++ u32 ctl2_enbl :1; /* D2 controller 2 enable */ ++ u32 win2_enbl :1; /* D2 window 2 enable */ ++ u32 awin2_enbl :1; /* D2 alternate window 2 enable */ ++ u32 cur2_enbl :1; /* D2 cursor 2 enable */ ++ u32 reserved_4 :4; ++ } part; ++ u32 whole; ++}; ++ ++/* PLL 2 programming */ ++union pm06r { ++ struct { ++ u32 clk_src :1; /* PLL 2 reference clock source */ ++ u32 bypass :1; /* PLL 2 bypass */ ++ u32 reserved_1 :2; ++ u32 p_par :3; /* PLL 2 P parameter */ ++ u32 reserved_2 :1; ++ ++ u32 n_par :5; /* PLL 2 N parameter */ ++ u32 reserved_3 :3; ++ ++ u32 m_par :8; /* PLL 2 M parameter */ ++ ++ u32 reserved_4 :4; ++ u32 trim :4; /* PLL 2 trim value */ ++ } part; ++ u32 whole; ++}; ++ ++/* PLL 3 programming */ ++union pm07r { ++ struct { ++ u32 clk_src :1; /* PLL 3 reference clock source */ ++ u32 bypass :1; /* PLL 3 bypass */ ++ u32 reserved_1 :2; ++ u32 p_par :3; /* PLL 3 P parameter */ ++ u32 reserved_2 :1; ++ ++ u32 n_par :5; /* PLL 3 N parameter */ ++ u32 reserved_3 :3; ++ ++ u32 m_par :8; /* PLL 3 M parameter */ ++ ++ u32 reserved_4 :4; ++ u32 trim :4; /* PLL 3 trim value */ ++ } part; ++ u32 whole; ++}; ++ ++ ++ ++/* MIU interface control 1 */ ++union mm00r { ++ struct { ++ u32 miu_enbl :1; /* MIU enable bit */ ++ u32 mr_dsbl :1; /* MIU reset disable bit */ ++ u32 edr_dsbl :1; /* embedded DRAM reset disable bit */ ++ u32 reserved_1 :29; ++ } part; ++ u32 whole; ++}; ++ ++/* MIU interface control 2 */ ++union mm01r { ++ struct { ++ u32 mc_src :1; /* memory clock source */ ++ u32 msr_enbl :1; /* memory slow refresh enable bit */ ++ u32 pb_cpu :1; /* page break enable for CPU */ ++ u32 pb_gc1 :1; /* page break enable for GC1 */ ++ u32 pb_gc2 :1; /* page break enable for GC2 */ ++ u32 pb_stn_r :1; /* page break enable for STN read */ ++ u32 pb_stn_w :1; /* page break enable for STN write */ ++ u32 pb_ge :1; /* page break enable for GE */ ++ u32 reserved_1 :4; ++ u32 mr_interval :14; /* normal memory refresh time interval */ ++ u32 reserved_2 :4; ++ u32 edarm_enbl :1; /* embedded DRAM auto-refresh mode enable */ ++ u32 eds_enbl :1; /* EDRAM standby enable for EDRAM normal ++ mode operation */ ++ } part; ++ u32 whole; ++}; ++ ++/* memory interface control 3 */ ++union mm02r { ++ struct { ++ u32 bs_ :2; ++ u32 bs_stnr :2; /* burst count for STN read memory cycles */ ++ u32 bs_stnw :2; /* burst count for STN write memroy cycles */ ++ u32 bs_ge :2; /* burst count for graphics engine ++ read/write memroy cycles */ ++ u32 bs_cpuw :2; /* burst count for CPU write memory cycles */ ++ u32 fifo_gc1 :4; /* GC1 display refresh FIFO threshold */ ++ u32 fifo_gc2 :4; /* GC2 display refresh FIFO threshold */ ++ u32 fifo_stnr :4; /* STN read FIFO threshold */ ++ u32 fifo_stnw :4; /* STN write FIFO threshold */ ++ u32 fifo_ge_src :3; /* GE source read FIFO threshold */ ++ u32 fifo_ge_dst :3; /* GE destination read FIFO threshold */ ++ } part; ++ u32 whole; ++}; ++ ++/* memory interface control 4 */ ++union mm03r { ++ struct { ++ u32 rd_late_req :1; /* read latency request */ ++ u32 reserved_1 :31; ++ } part; ++ u32 whole; ++}; ++ ++/* memory interface control 5 */ ++union mm04r { ++ struct { ++ u32 latency :3; /* EDRAM latency */ ++ u32 dmm_cyc :1; /* enable for the dummy cycle insertion ++ between read and write cycles */ ++ u32 pre_dmm_cyc :1; /* enable for the dummy cycle insertion ++ between read/write and precharge cycles ++ for the same bank */ ++ u32 reserved_1 :3; ++ u32 bnk_act_cls :2; /* bank activate command to bank close ++ command timing interval control */ ++ u32 bnk_act_rw :1; /* bank activate command to read/wirte ++ command timing interval control */ ++ u32 bnk_cls_act :1; /* bank close command to bank activate ++ command timing interval control */ ++ u32 trc :1; /* row cycle time */ ++ u32 reserved_2 :3; ++ u32 delay_r :2; /* programmable delay for read clock */ ++ u32 delay_m :2; /* programmable delay for internal memory ++ clock */ ++ } part; ++ u32 whole; ++}; ++ ++/* graphics controller 1 register */ ++union gc00r { ++ struct { ++ u32 ctl_enbl :1; /* Controller 1 Enable */ ++ u32 hc_reset :1; /* Horizontal Counter 1 Reset */ ++ u32 vc_reset :1; /* Vertical Counter 1 Reset */ ++ u32 iwin_enbl :1; /* Image Window 1 Enable */ ++ u32 gcd :4; /* Graphics Color Depth (GCD) */ ++ ++ u32 hc_enbl :1; /* Hardware Cursor 1 Enable */ ++ u32 reserved_1 :2; ++ u32 aiwin_enbl :1; /* Alternate Image Window Enable */ ++ u32 agcd :4; /* Alternate Graphics Color Depth (AGCD) */ ++ ++ u32 g1rclk_src :2; /* G1RCLK Source */ ++ u32 tm0 :1; /* Test Mode 0 */ ++ u32 tm1 :1; /* Test Mode 1 */ ++ u32 fd :3; /* G1MCLK First Clock Divisor (FD1) */ ++ u32 reserved_2 :1; ++ ++ u32 sd :8; /* G1MCLK Second Clock Divisor (SD1) */ ++ } part; ++ u32 whole; ++}; ++ ++/* graphics controller CRT control */ ++union gc01r { ++ struct { ++ u32 dac_enbl :2; /* CRT DAC enable */ ++ u32 hsync_out :1; /* CRT HSYNC output during power down mode */ ++ u32 vsync_out :1; /* CRT VSYNC output during power down mode */ ++ u32 hsync_ctl :2; /* CRT HSYNC control */ ++ u32 vsync_ctl :2; /* CRT VSYNC control */ ++ /**/ ++ u32 hsync_pol :1; /* CRT HSYNC polarity */ ++ u32 vsync_pol :1; /* CRT VSYNC polarity */ ++ u32 sync_p_enbl :1; /* sync pedestal enable */ ++ u32 blnk_p_enbl :1; /* blank pedestal enable */ ++ u32 c_sync_enbl :1; /* composite sync enable */ ++ u32 vref_sel :1; /* VREF select */ ++ u32 mn_sns_enbl :1; /* monitor sense enable */ ++ u32 ct_out_enbl :1; /* constant output enable */ ++ /**/ ++ u32 dac_out_lvl :8; /* monitor sense DAC output level */ ++ /**/ ++ u32 blue_dac_r :1; /* blue DAC sense result */ ++ u32 green_dac_r :1; /* green DAC sense result */ ++ u32 red_dac_r :1; /* red DAC sense result */ ++ u32 reserved_1 :1; ++ u32 mon_col_sel :1; /* mono/color monitor select */ ++ u32 reserved_2 :3; ++ } part; ++ u32 whole; ++}; ++ ++/* horizontal display 1 control */ ++union gc02r { ++ struct { ++ u32 hd1t :12; /* horizontal display 1 total */ ++ u32 reserved_1 :4; ++ ++ u32 hd1e :12; /* horizontal display 1 end */ ++ u32 reserved_2 :4; ++ } part; ++ u32 whole; ++}; ++ ++/* vertical display 1 control */ ++union gc03r { ++ struct { ++ u32 vd1t :12; /* vertical display 1 total */ ++ u32 reserved_1 :4; ++ ++ u32 vd1e :12; /* vertical display 1 end */ ++ u32 reserved_2 :4; ++ } part; ++ u32 whole; ++}; ++ ++/* horizontal sync 1 control */ ++union gc04r { ++ struct { ++ u32 hs1s :12; /* horizontal sync 1 start */ ++ u32 reserved_1 :4; ++ ++ u32 hs1e :12; /* horizontal sync 1 end */ ++ u32 reserved_2 :4; ++ } part; ++ u32 whole; ++}; ++ ++/* vertical sync 1 control */ ++union gc05r { ++ struct { ++ u32 vs1s :12; /* vertical sync 1 start */ ++ u32 reserved_1 :4; ++ ++ u32 vs1e :12; /* vertical sync 1 end */ ++ u32 reserved_2 :4; ++ } part; ++ u32 whole; ++}; ++ ++/* vertical display 1 count */ ++union gc07r { ++ struct { ++ u32 vd_cnt :12; /* vertical display 1 count */ ++ u32 reverved_1 :20; ++ } part; ++ u32 whole; ++}; ++ ++/* horizontal window 1 control */ ++union gc08r { ++ struct { ++ u32 hw1s :12; /* horizontal window 1 start (HW1S) */ ++ u32 reserved_1 :4; ++ ++ u32 hw1w :12; /* horizontal window 1 width (HW1W) */ ++ u32 w1ald :4; /* window 1 additional line data */ ++ } part; ++ u32 whole; ++}; ++ ++/* vertical window 1 control */ ++union gc09r { ++ struct { ++ u32 vw1s :12; /* vertical window 1 start */ ++ u32 reserved_1 :4; ++ u32 vw1h :12; /* vertical window 1 height */ ++ u32 reserved_2 :4; ++ } part; ++ u32 whole; ++}; ++ ++/* window 1 start address */ ++union gc0cr { ++ struct { ++ u32 w1sa :21; /* window 1 start address */ ++ u32 reserved_1 :11; ++ } part; ++ u32 whole; ++}; ++ ++/* window 1 stride */ ++union gc0er { ++ struct { ++ s16 w1st; /* window 1 stride */ ++ s16 aw1st; /* alternate window 1 stride */ ++ } part; ++ u32 whole; ++}; ++ ++/* hardware cursor 1 position */ ++union gc10r { ++ struct { ++ u32 hc1s :12; /* horizontal cursor 1 start */ ++ u32 reserved_1 :4; ++ u32 vc1s :12; /* vertical cursor 1 start */ ++ u32 reserved_2 :4; ++ } part; ++ u32 whole; ++}; ++ ++/* hardware cursor 1 start address and offset */ ++union gc11r { ++ struct { ++ u32 hc1sa :11; /* hardware cursor 1 start address */ ++ u32 reserved_1 :5; ++ u32 hc1o :6; /* horizontal cursor 1 offset */ ++ u32 reserved_2 :2; ++ u32 vc1o :6; /* vertical cursor 1 offset */ ++ u32 reserved_3 :2; ++ } part; ++ u32 whole; ++}; ++ ++/* hardware cursor 1 foreground color */ ++union gc12r { ++ struct { ++ u32 hc1fc :24; /* hardware cursor 1 foreground color */ ++ u32 reserved_1 :8; ++ } part; ++ u32 whole; ++}; ++ ++/* hardware cursor 1 background color */ ++union gc13r { ++ struct { ++ u32 hc1bc :24; /* hardware cursor 1 background color */ ++ u32 reserved_1 :8; ++ } part; ++ u32 whole; ++}; ++ ++ ++/* graphics controller 2 register */ ++union gc20r { ++ struct { ++ u32 ctl_enbl :1; /* Controller 2 Enable */ ++ u32 hc_reset :1; /* Horizontal Counter 2 Reset */ ++ u32 vc_reset :1; /* Vertical Counter 2 Reset */ ++ u32 iwin_enbl :1; /* Image Window 2 Enable */ ++ u32 gcd :4; /* Graphics Color Depth (GCD) */ ++ ++ u32 hc_enbl :1; /* Hardware Cursor 2 Enable */ ++ u32 reserved_1 :2; ++ u32 aiwin_enbl :1; /* Alternate Image Window Enable */ ++ u32 agcd :4; /* Alternate Graphics Color Depth (AGCD) */ ++ ++ u32 g2rclk_src :2; /* G2RCLK Source */ ++ u32 tm0 :1; /* Test Mode 0 */ ++ u32 tm1 :1; /* Test Mode 1 */ ++ u32 fd :3; /* G2MCLK First Clock Divisor (FD1) */ ++ u32 reserved_2 :1; ++ ++ u32 sd :8; /* G2MCLK Second Clock Divisor (SD1) */ ++ } part; ++ u32 whole; ++}; ++ ++/* graphics controller CRC control */ ++union gc21r { ++ struct { ++ u32 crc_enbl :1; /* CRC enable */ ++ u32 vsync_wait :1; /* CRC input data control waitime of VSYNC */ ++ u32 crc_o_sel :2; /* CRC output select */ ++ u32 reserved_1 :4; ++ u32 crc_result :22; /* CRC result (read only) */ ++ u32 reserved_2 :2; ++ } part; ++ u32 whole; ++}; ++ ++/* horizontal display 2 control */ ++union gc22r { ++ struct { ++ u32 hd2t :12; /* horizontal display 2 total */ ++ u32 reserved_1 :4; ++ ++ u32 hd2e :12; /* horizontal display 2 end */ ++ u32 reserved_2 :4; ++ } part; ++ u32 whole; ++}; ++ ++/* vertical display 2 control */ ++union gc23r { ++ struct { ++ u32 vd2t :12; /* vertical display 2 total */ ++ u32 reserved_1 :4; ++ ++ u32 vd2e :12; /* vertical display 2 end */ ++ u32 reserved_2 :4; ++ } part; ++ u32 whole; ++}; ++ ++/* horizontal sync 2 control */ ++union gc24r { ++ struct { ++ u32 hs2s :12; /* horizontal sync 2 start */ ++ u32 reserved_1 :4; ++ ++ u32 hs2e :12; /* horizontal sync 2 end */ ++ u32 reserved_2 :4; ++ } part; ++ u32 whole; ++}; ++ ++/* vertical sync 2 control */ ++union gc25r { ++ struct { ++ u32 vs2s :12; /* vertical sync 2 start */ ++ u32 reserved_1 :4; ++ ++ u32 vs2e :12; /* vertical sync 2 end */ ++ u32 reserved_2 :4; ++ } part; ++ u32 whole; ++}; ++ ++/* vertical display 2 count */ ++union gc27r { ++ struct { ++ u32 vd_cnt :12; /* vertical display 2 count */ ++ u32 reverved_1 :20; ++ } part; ++ u32 whole; ++}; ++ ++/* horizontal window 2 control */ ++union gc28r { ++ struct { ++ u32 hw2s :12; /* horizontal window 2 start (HW2S) */ ++ u32 reserved_1 :4; ++ ++ u32 hw2w :12; /* horizontal window 2 width (HW2W) */ ++ u32 w2ald :4; /* window 2 additional line data */ ++ } part; ++ u32 whole; ++}; ++ ++/* vertical window 2 control */ ++union gc29r { ++ struct { ++ u32 vw2s :12; /* vertical window 2 start */ ++ u32 reserved_1 :4; ++ u32 vw2h :12; /* vertical window 2 height */ ++ u32 reserved_2 :4; ++ } part; ++ u32 whole; ++}; ++ ++/* window 2 start address */ ++union gc2cr { ++ struct { ++ u32 w2sa :21; /* window 2 start address */ ++ u32 reserved_1 :11; ++ } part; ++ u32 whole; ++}; ++ ++/* window 2 stride */ ++union gc2er { ++ struct { ++ s16 w2st; /* window 2 stride */ ++ s16 aw2st; /* alternate window 2 stride */ ++ } part; ++ u32 whole; ++}; ++ ++/* hardware cursor 2 position */ ++union gc30r { ++ struct { ++ u32 hc2s :12; /* horizontal cursor 2 start */ ++ u32 reserved_1 :4; ++ u32 vc2s :12; /* vertical cursor 2 start */ ++ u32 reserved_2 :4; ++ } part; ++ u32 whole; ++}; ++ ++/* hardware cursor 2 start address and offset */ ++union gc31r { ++ struct { ++ u32 hc2sa :11; /* hardware cursor 2 start address */ ++ u32 reserved_1 :5; ++ u32 hc2o :6; /* horizontal cursor 2 offset */ ++ u32 reserved_2 :2; ++ u32 vc2o :6; /* vertical cursor 2 offset */ ++ u32 reserved_3 :2; ++ } part; ++ u32 whole; ++}; ++ ++/* hardware cursor 2 foreground color */ ++union gc32r { ++ struct { ++ u32 hc2fc :24; /* hardware cursor 2 foreground color */ ++ u32 reserved_1 :8; ++ } part; ++ u32 whole; ++}; ++ ++/* hardware cursor 2 background color */ ++union gc33r { ++ struct { ++ u32 hc2bc :24; /* hardware cursor 2 background color */ ++ u32 reserved_1 :8; ++ } part; ++ u32 whole; ++}; ++ ++ ++/* primary drawing command register */ ++union ge00r { ++ struct { ++ u32 rop :8; /* raster operation */ ++ /**/ ++ u32 cmd_typ :3; /* command type */ ++ u32 x_dir :1; /* x direction */ ++ u32 y_dir :1; /* y direction */ ++ u32 src_mem :1; /* source memory */ ++ u32 mon_src :1; /* mono source */ ++ u32 mon_ptn :1; /* mono pattern */ ++ /**/ ++ u32 dst_trns_e :1; /* destination transparency enable */ ++ u32 dst_trns_p :1; /* destination transparency polarity */ ++ u32 mon_trns_e :1; /* mono source or mono pattern transparency ++ enable */ ++ u32 mon_trns_p :1; /* mono transparency polarity */ ++ u32 mod_sel :1; /* memory to screen or off screen to screen ++ mode select */ ++ u32 alpha_sel :2; /* Alpha byte mask selection */ ++ u32 sol_col :1; /* solid color */ ++ /**/ ++ u32 stride_eq :1; /* source stride is equal to destination ++ stride */ ++ u32 rop2_sel :1; /* ROP2 code selection */ ++ u32 clipping :1; /* enable clipping */ ++ u32 auto_exec :1; /* auto execute */ ++ u32 reserved_1 :4; ++ } part; ++ u32 whole; ++}; ++ ++/* primary width and height register */ ++union ge01r { ++ struct { ++ u32 width :12; /* source/destination window width */ ++ u32 reserved_1 :4; ++ ++ u32 height :12; /* source/destination window height */ ++ u32 reserved_2 :1; ++ u32 reserved_3 :3; ++ } bitblt; ++ struct { ++ u32 dm :17; ++ u32 axis_major :12; ++ u32 x_y :1; /* x-major or y-major */ ++ u32 last_pix :1; /* decision to draw or not to draw the last ++ pixel of the line */ ++ u32 reserved_1 :1; ++ } bresenham; ++ u32 whole; ++}; ++ ++/* primary destination address register */ ++union ge02r { ++ struct { ++ u32 dst_x :12; /* destination x position */ ++ u32 reserved_1 :1; ++ u32 h_offset :3; /* mono/color pattern horizontal offset */ ++ ++ u32 dst_y :12; /* destination y position */ ++ u32 reserved_2 :1; ++ u32 v_offset :3; /* mono/color pattern vertical offset */ ++ } window; ++ struct { ++ u32 x :12; /* starting x coordinate */ ++ u32 dm :17; /* 17 bits major-axis delta */ ++ u32 reserved_1 :3; ++ } line; ++ u32 whole; ++}; ++ ++/* source XY register/line draw starting Y coordinate and mintor axis delta */ ++union ge03r { ++ struct { ++ u32 src_x :12; /* source X position */ ++ u32 reserved_1 :4; ++ ++ u32 src_y :12; /* source Y position */ ++ u32 reserved_2 :4; ++ } window; ++ struct { ++ u32 start_y :12; /* starting Y coordinate */ ++ u32 dn :17; /* 17 bits minor-axis delta */ ++ u32 reserved_1 :3; ++ } line; ++ u32 whole; ++}; ++ ++/* clip left/top register */ ++union ge05r { ++ struct { ++ u32 left :12; /* left edge of clipping rectangle */ ++ u32 reserved_1 :4; ++ ++ u32 top :12; /* top edge of clipping rectangle */ ++ u32 reserved_2 :4; ++ } part; ++ u32 whole; ++}; ++ ++/* source stride/offset register */ ++union ge09r { ++ struct { ++ u32 src_strid :12; /* source line stride */ ++ u32 reserved_1 :13; ++ u32 strt_bit :3; /* initial mono source bit offset */ ++ u32 strt_byte :3; /* initial mono/color source byte offset */ ++ u32 reserved_2 :1; ++ } line; ++ struct { ++ u32 strt_bit :5; /* initial mono source bit offset */ ++ u32 reserved_1 :1; ++ u32 amount :10; /* number of 16 bytes amount that MIU need ++ to fetch from frame buffer */ ++ ++ u32 reserved_2 :9; ++ u32 bit_spc :7; /* bit space between lines */ ++ } pack_mono; ++ struct { ++ u32 strt_bit :3; /* initial mono source bit offset */ ++ u32 strt_byte :3; /* initial mono/color source byte offset */ ++ u32 amount :10; /* number of 16 bytes amount that MIU need ++ to fetch from frame buffer */ ++ ++ u32 reserved_1 :9; ++ u32 bit_spc :3; /* bit space between lines */ ++ u32 byt_spc :4; /* byte space between lines */ ++ } pack_color; ++ u32 whole; ++}; ++ ++/* destination stride register and color depth */ ++union ge0ar { ++ struct { ++ u32 dst_strid :12; /* destination line stride and color depth */ ++ u32 reserved_1 :18; ++ u32 col_dpth :2; /* color depth */ ++ } part; ++ u32 whole; ++}; ++ ++/* graphics controller color pallete */ ++union c1xxr { ++ struct { ++ u8 red; /* red color pallete */ ++ u8 green; /* green/gray color pallete */ ++ u8 blue; /* blue color palette */ ++ u8 reserved_1; ++ } part; ++ u32 whole; ++}; ++ ++/* devicee configuration register 0 */ ++union dc00r { ++ struct { ++ u32 osc_bypass :1; /* oscillator bypass */ ++ u32 osc_enbl :1; /* oscillator enable */ ++ u32 pll1_bypass :1; /* PLL1 bypass */ ++ u32 pll1_enbl :1; /* PLL1 enable */ ++ u32 pll1_p_par :3; /* PLL1 P parameter */ ++ u32 cpu_div :1; /* CPU interface clock divisor */ ++ u32 pll1_n_par :5; /* PLL1 N parameter */ ++ u32 saisc :1; /* StrongARM interface synchronizer control */ ++ u32 s_chp_reset :1; /* software chip reset */ ++ u32 mem_enbl :1; /* memory standby enable */ ++ u32 pll1_m_par :8; /* PLL 1 M parameter */ ++ u32 osc_shaper :1; /* oscillator shaper disable */ ++ u32 fast_pwr :1; /* fast power sequencing */ ++ u32 osc_frq :2; /* oscillator frequency select */ ++ u32 pll1_trim :4; /* PLL 1 trim value */ ++ } part; ++ u32 whole; ++}; ++ ++/* device ID/vendor ID register */ ++union pc00r { ++ struct { ++ u16 device; /* device ID */ ++ u16 vendor; /* vendor ID */ ++ } part; ++ u32 whole; ++}; ++ ++/* Flat Panel Control Register */ ++union fp00r { ++ struct { ++ u32 flatp_enbl : 2; /* Flat Panel Interface Enable */ ++ u32 flatp_type : 2; /* Flat Panel Type */ ++ u32 mono : 1; /* Mono/Color Panel Select */ ++ u32 flatp_intf : 3; /* Flat Panel Interface */ ++ u32 dither_pat : 2; /* Dither Pattern */ ++ u32 reserved : 2; /* Reserved Must Be 0*/ ++ u32 dither_col : 3; /* Dither Base Color */ ++ u32 alt_win_ctl: 1; /* Alternate Window Control */ ++ u32 frc_ctl : 2; /* FRC Control */ ++ u32 dither_adj1: 6; /* Dither Pattern Adjust 1 */ ++ u32 dither_adj2: 3; /* Dither Pattern Adjust 2 */ ++ u32 dither_adj3: 1; /* Dither Pattern Adjust 3 */ ++ u32 test_mode0 : 1; /* Test Mode 0 */ ++ u32 test_mode1 : 1; /* Test Mode 1 */ ++ u32 test_mode2 : 1; /* Test Mode 2 */ ++ u32 test_mode3 : 1; /* Test Mode 3 */ ++ } part; ++ u32 whole; ++}; ++ ++union fp01r { ++ struct { ++ u32 dummy; ++ } part; ++ u32 whole; ++}; ++ ++union fp02r { ++ struct { ++ u32 dummy; ++ } part; ++ u32 whole; ++}; ++ ++union fp03r { ++ struct { ++ u32 dummy; ++ } part; ++ u32 whole; ++}; ++ ++union fp04r { ++ struct { ++ u32 dummy; ++ } part; ++ u32 whole; ++}; ++ ++union fp05r { ++ struct { ++ u32 dummy; ++ } part; ++ u32 whole; ++}; ++ ++union fp0fr { ++ struct { ++ u32 dummy; ++ } part; ++ u32 whole; ++}; ++ ++ ++ ++ ++/**** ++ * Others ++ */ ++ ++#define CHIPNAME "MQ-200" ++ ++extern void mq200_external_setpal(unsigned regno, unsigned long color, unsigned long addr); ++extern void mq200_external_setqmode(struct mq200_monitor_info*, unsigned long, spinlock_t *); ++extern void mq200_external_offdisplay(unsigned long); ++extern void mq200_external_ondisplay (unsigned long); ++extern int mq200_external_probe(unsigned long); ++ ++ ++ ++#endif +diff -uNr linux-2.6.21.vanilla/drivers/video/mq200/mq_external.c linux-2.6.21/drivers/video/mq200/mq_external.c +--- linux-2.6.21.vanilla/drivers/video/mq200/mq_external.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.21/drivers/video/mq200/mq_external.c 2007-05-01 17:02:17.000000000 +0200 +@@ -0,0 +1,513 @@ ++/* ++ * Copyright (C) 2005 Holger Hans Peter Freyther ++ * ++ * Based ON: ++ * ++ * linux/drivers/video/mq200fb.c -- MQ-200 for a frame buffer device ++ * based on linux/driver/video/pm2fb.c ++ * ++ * 2007/03/11 mrdata: ++ * bug found in gc1_reset(), renaming to gc1_gc2_reset() ++ * extend mq200_external_ondisplay() -> LCD for GC2 and CRT for GC1 ++ * ++ * Copyright (C) 2000 Lineo, Japan ++ * ++ * This file is subject to the terms and conditions of the GNU General Public ++ * License. See the file COPYING in the main directory of this archive ++ * for more details. ++ */ ++ ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include "mq200_data.h" ++ ++ ++#if 1 ++#define PRINTK(args...) printk(args) ++#else ++#define PRINTK(args...) ++#endif ++ ++ ++/**** ++ * power state transition to "state". ++ */ ++static void ++power_state_transition(unsigned long register_base, int state) ++{ ++ int i; ++ writel(state, PMCSR(register_base)); ++ mdelay(300); ++ for (i = 1; ; i++) { ++ udelay(100); ++ if ((readl(PMCSR(register_base)) & 0x3) == state) { ++ break; ++ } ++ } ++} ++ ++ ++/**** ++ * device configuration initialization. ++ */ ++static void ++dc_reset(unsigned long register_base) ++{ ++ union dc00r dc00r; ++ ++ /* Reset First */ ++ dc00r.whole = DC_RESET; ++ writel(dc00r.whole, DC00R(register_base)); ++ mdelay(100); ++ ++ dc00r.whole = 0xEF2082A; ++ writel(dc00r.whole, DC00R(register_base)); ++ mdelay(300); ++ PRINTK(CHIPNAME ": DC00R = 0x%08X\n", readl(DC00R(register_base))); ++} ++ ++ ++/**** ++ * initialize memory interface unit. ++ */ ++static void ++miu_reset(unsigned long register_base) ++{ ++ union mm00r mm00r; ++ union mm01r mm01r; ++ union mm02r mm02r; ++ union mm03r mm03r; ++ union mm04r mm04r; ++ ++ /* MIU interface control 1 */ ++ mm00r.whole = 0x4; ++ writel(mm00r.whole, MM00R(register_base)); ++ mdelay(50); ++ writel(0, MM00R(register_base)); ++ mdelay(50); ++ ++ /* MIU interface control 2 ++ * o PLL 1 output is used as memory clock source. ++ */ ++ mm01r.whole = 0x4143e086; ++ writel(mm01r.whole, MM01R(register_base)); ++ ++ /* memory interface control 3 */ ++ mm02r.whole = 0x6d6aabff; ++ writel(mm02r.whole, MM02R(register_base)); ++ ++ /* memory interface control 5 */ ++ mm04r.whole = 0x10d; ++ writel(mm04r.whole, MM04R(register_base)); ++ ++ /* memory interface control 4 */ ++ mm03r.whole = 0x1; ++ writel(mm03r.whole, MM03R(register_base)); ++ mdelay(50); ++ ++ /* MIU interface control 1 */ ++ mm00r.whole = 0x3; ++ writel(mm00r.whole, MM00R(register_base)); ++ mdelay(50); ++} ++ ++/**** ++ * ++ */ ++static ++void fpctrl_reset(unsigned long addr) ++{ ++ /* ++ * We're in D0 State, let us set the FPCTRL ++ */ ++ union fp00r fp00r; ++ union fp01r fp01r; ++ union fp02r fp02r; ++ union fp03r fp03r; ++ union fp04r fp04r; ++ union fp0fr fp0fr; ++ ++ fp00r.whole = 0x6320; ++ writel(fp00r.whole, FP00R(addr)); ++ ++ fp01r.whole = 0x20; ++ writel(fp01r.whole, FP01R(addr)); ++ ++ fp04r.whole = 0xBD0001; ++ writel(fp04r.whole, FP04R(addr)); ++ ++ /* Set Flat Panel General Purpose register first */ ++ fp02r.whole = 0x0; ++ writel(fp02r.whole, FP02R(addr)); ++ ++ fp03r.whole = 0x0; ++ writel(fp03r.whole, FP03R(addr)); ++ ++ fp0fr.whole = 0xA16c44; ++ writel(fp0fr.whole, FP0FR(addr)); ++ ++ /* Set them again */ ++ fp02r.whole = 0x0; ++ writel(fp02r.whole, FP02R(addr)); ++ ++ fp03r.whole = 0x0; ++ writel(fp03r.whole, FP03R(addr)); ++} ++ ++ ++/**** ++ * initialize power management unit. ++ */ ++static void ++pmu_reset(unsigned long register_base) ++{ ++ union pm00r pm00r; ++ union pm01r pm01r; ++ union pm02r pm02r; ++ ++ /* power management miscellaneous control ++ * o GE is driven by PLL 1 clock. ++ */ ++ pm00r.whole = 0xc0900; ++ writel(pm00r.whole, PM00R(register_base)); ++ ++ /* D1 state control */ ++ pm01r.whole = 0x5000271; ++ writel(pm01r.whole, PM01R(register_base)); ++ ++ /* D2 state control */ ++ pm02r.whole = 0x271; ++ writel(pm02r.whole, PM02R(register_base)); ++} ++ ++/**** ++ * initialize graphics controller 1 ++ * and graphics controller 2 ++ */ ++static void ++gc1_gc2_reset(unsigned long register_base, spinlock_t *lock ) ++{ ++ unsigned long flags; ++ union gc00r gc00r; ++ union gc01r gc01r; ++ union gc02r gc02r; ++ union gc03r gc03r; ++ union gc04r gc04r; ++ union gc05r gc05r; ++ union gc08r gc08r; ++ union gc09r gc09r; ++ union gc0cr gc0cr; ++ union gc0er gc0er; ++ union gc20r gc20r; ++ union gc22r gc22r; ++ union gc23r gc23r; ++ union gc24r gc24r; ++ union gc25r gc25r; ++ union gc28r gc28r; ++ union gc29r gc29r; ++ union gc2cr gc2cr; ++ union gc2er gc2er; ++ ++ union pm00r pm00r; ++ union pm06r pm06r; ++ union pm06r pm07r; ++ ++ spin_lock_irqsave(lock, flags); ++ ++ /* alternate window 1 stride */ ++ gc0er.whole = 0x640; ++ writel(gc0er.whole, GC0ER(register_base)); ++ ++ /* image window 1 start address */ ++ gc0cr.whole = 0x0; ++ writel(gc0cr.whole, GC0CR(register_base)); ++ ++ /* alternate window 2 stride */ ++ gc2er.whole = 0x640; ++ writel(gc0er.whole, GC2ER(register_base)); ++ ++ /* image window 2 start address */ ++ gc2cr.whole = 0x0; ++ writel(gc2cr.whole, GC2CR(register_base)); ++ ++ /* read PM Register */ ++ pm00r.whole = readl(PM00R(register_base)); ++ ++ /* horizontal window 1 control */ ++ gc08r.whole = 0x131f0000; ++ writel(gc08r.whole, GC08R(register_base)); ++ ++ /* vertical window 1 control */ ++ gc09r.whole = 0x12570000; ++ writel(gc09r.whole, GC09R(register_base)); ++ ++ /* horizontal display 1 control */ ++ gc02r.whole = 0x320041e; ++ writel(gc02r.whole, GC02R(register_base)); ++ ++ /* vertical display 1 control */ ++ gc03r.whole = 0x2570273; ++ writel(gc03r.whole, GC03R(register_base)); ++ ++ /* horizontal sync 1 control */ ++ gc04r.whole = 0x3c70347; ++ writel(gc04r.whole, GC04R(register_base)); ++ ++ /* vertical sync 1 control */ ++ gc05r.whole = 0x25d0259; ++ writel(gc05r.whole, GC05R(register_base)); ++ ++ /* graphics controller CRT control */ ++ gc01r.whole = 0x800; ++ writel(gc01r.whole, GC01R(register_base)); ++ ++ /* PLL 2 programming */ ++ pm06r.whole = 0xE90830; ++ writel(pm06r.whole, PM06R(register_base)); ++ ++ /* graphics controller 1 register ++ * o GC1 clock source is PLL 2. ++ * o hardware cursor is disabled. ++ */ ++ gc00r.whole = 0x10000C8 | 0x20000; ++ writel(gc00r.whole, GC00R(register_base)); ++ ++#if 0 ++ /* alternate horizontal window 1 control */ ++ writel(0, GC0AR(register_base)); ++ ++ /* alternate vertical window 1 control */ ++ writel(0, GC0BR(register_base)); ++ ++ /* window 1 start address */ ++ writel(0x2004100, GC0CR(register_base)); ++ ++ /* alternate window 1 start address */ ++ writel(0, GC0DR(register_base)); ++ ++ /* window 1 stride */ ++ gc0er.whole = 0x5100048; ++ writel(gc0er.whole, GC0ER(register_base)); ++ ++ /* reserved register - ??? - */ ++ writel(0x31f, GC0FR(register_base)); ++#endif ++ ++#if 0 ++ /* hardware cursor 1 position */ ++ writel(0, GC10R(register_base)); ++ ++ /* hardware cursor 1 start address and offset */ ++ gc11r.whole = 0x5100048; ++ writel(gc11r.whole, GC11R(register_base)); ++ ++ /* hardware cursor 1 foreground color */ ++ writel(0x00ffffff, GC12R(register_base)); ++ ++ /* hardware cursor 1 background color */ ++ writel(0x00000000, GC13R(register_base)); ++#endif ++ ++ /* horizontal window 2 control */ ++ gc28r.whole = 0x31f0000; ++ writel(gc28r.whole, GC28R(register_base)); ++ ++ /* vertical window 2 control */ ++ gc29r.whole = 0x2570000; ++ writel(gc29r.whole, GC29R(register_base)); ++ ++ /* horizontal display 2 control */ ++ gc22r.whole = 0x320041e; ++ writel(gc22r.whole, GC22R(register_base)); ++ ++ /* vertical display 2 control */ ++ gc23r.whole = 0x2570273; ++ writel(gc23r.whole, GC23R(register_base)); ++ ++ /* horizontal sync 2 control */ ++ gc24r.whole = 0x3c70347; ++ writel(gc24r.whole, GC24R(register_base)); ++ ++ /* vertical sync 2 control */ ++ gc25r.whole = 0x25d0259; ++ writel(gc25r.whole, GC25R(register_base)); ++ ++ /* graphics controller CRT control */ ++ gc01r.whole = 0x800; ++ writel(gc01r.whole, GC01R(register_base)); ++ ++ /* PLL 3 programming */ ++ pm07r.whole = 0xE90830; ++ writel(pm07r.whole, PM07R(register_base)); ++ ++ /* graphics controller 2 register ++ * o GC2 clock source is PLL 3. ++ * o hardware cursor is disabled. ++ */ ++ gc20r.whole = 0x10000C8 | 0x30000; ++ writel(gc20r.whole, GC20R(register_base)); ++ ++ /* ++ * Enable PLL2 and PLL3 in the PM Register ++ */ ++ pm00r.part.pll2_enbl = 0x1; ++ pm00r.part.pll3_enbl = 0x1; ++ writel(pm00r.whole, PM00R(register_base)); ++ ++ spin_unlock_irqrestore(lock, flags); ++} ++ ++ ++/**** ++ * initialize graphics engine. ++ */ ++static void ++ge_reset(unsigned long register_base) ++{ ++ /* drawing command register */ ++ writel(0, GE00R(register_base)); ++ ++ /* promary width and height register */ ++ writel(0, GE01R(register_base)); ++ ++ /* primary destination address register */ ++ writel(0, GE02R(register_base)); ++ ++ /* primary source XY register */ ++ writel(0, GE03R(register_base)); ++ ++ /* primary color compare register */ ++ writel(0, GE04R(register_base)); ++ ++ /* primary clip left/top register */ ++ writel(0, GE05R(register_base)); ++ ++ /* primary clip right/bottom register */ ++ writel(0, GE06R(register_base)); ++ ++ /* primary source and pattern offset register */ ++ writel(0, GE07R(register_base)); ++ ++ /* primary foreground color register/rectangle fill color depth */ ++ writel(0, GE08R(register_base)); ++ ++ /* source stride/offset register */ ++ writel(0, GE09R(register_base)); ++ ++ /* destination stride register and color depth */ ++ writel(0, GE0AR(register_base)); ++ ++ /* image base address register */ ++ writel(0, GE0BR(register_base)); ++} ++ ++/**** ++ * initialize Color Palette 1. ++ */ ++static void ++cp1_reset(unsigned long addr_info) ++{ ++ int i; ++ ++ for (i = 0; i < 256; i++) ++ writel(0, C1xxR(addr_info, i)); ++} ++ ++ ++/* ++ * Below functions are called from the skeleton ++ */ ++void mq200_external_setpal(unsigned regno, unsigned long color, unsigned long addr) ++{ ++ writel(color,C1xxR(addr,regno)); ++} ++ ++void mq200_external_setqmode(struct mq200_monitor_info* info, ++ unsigned long addr, spinlock_t *lock) ++{ ++ dc_reset(addr); /* device configuration */ ++ ++ power_state_transition(addr, 0); /* transition to D0 state */ ++ ++ pmu_reset(addr); /* power management unit */ ++ ++ miu_reset(addr); /* memory interface unit */ ++ ++ ge_reset(addr); /* graphics engine */ ++ ++ fpctrl_reset(addr); /* reset the panel settings */ ++ ++ gc1_gc2_reset(addr, lock); /* graphics controller 1 and 2 */ ++ ++ cp1_reset(addr); /* color palette 1 */ ++ ++ mq200_external_ondisplay(addr); /* LCD and CRT */ ++} ++ ++void mq200_external_offdisplay(unsigned long addr) ++{ ++ /* ++ * Move the MQ200 to D3 mode ++ */ ++ power_state_transition(addr, 3); ++} ++ ++/** ++ * to be called after mq200_external_setqmode ++ */ ++void mq200_external_ondisplay (unsigned long addr) ++{ ++ /* ++ * Set the framebuffer details ++ */ ++ union gc00r gc00r; ++ union gc01r gc01r; ++ union gc20r gc20r; ++ union fp00r fp00r; ++ ++ /* enable LCD for GC2 */ ++ fp00r.whole = readl(FP00R(addr)); ++ fp00r.whole &= 0xfffffffc; ++ ++ gc20r.whole = readl(GC20R(addr)); ++ ++ if(!(gc20r.whole & 0x1)) { ++ gc20r.whole |= 0x1; ++ writel(gc20r.whole, GC20R(addr)); ++ } ++ ++ fp00r.whole |= 0x3; ++ writel(fp00r.whole, FP00R(addr)); ++ ++ /* enable CRT for GC1 */ ++ gc00r.whole = readl(GC00R(addr)); ++ ++ if(!(gc00r.whole & 0x1)) { ++ gc00r.whole |= 0x1; ++ writel(gc00r.whole, GC00R(addr)); ++ } ++ ++ gc01r.whole = readl(GC01R(addr)); ++ gc01r.whole &= 0xfffffffc; ++ ++ gc01r.whole |= 0x1; ++ writel(gc01r.whole, GC01R(addr)); ++ ++} ++ ++int mq200_external_probe(unsigned long addr) ++{ ++ union pc00r pc00r; ++ if(readl(PMR(addr)) != PMR_VALUE) ++ return 0; ++ ++ pc00r.whole = readl(PC00R(addr)); ++ printk(KERN_INFO "mq200 video driver found Vendor: 0x%X Device: 0x%X\n", ++ pc00r.part.device, pc00r.part.vendor); ++ return 1; ++} +diff -uNr linux-2.6.21.vanilla/drivers/video/mq200/mq_skeleton.c linux-2.6.21/drivers/video/mq200/mq_skeleton.c +--- linux-2.6.21.vanilla/drivers/video/mq200/mq_skeleton.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.21/drivers/video/mq200/mq_skeleton.c 2007-05-01 17:02:17.000000000 +0200 +@@ -0,0 +1,398 @@ ++/* ++ * Author: Holger Hans Peter Freyther ++ * ++ * ++ * This implements the frame buffer driver interface to communicate ++ * with the kernel. ++ * It uses the mq200 routines from the ucLinux driver from Lineo ++ * ++ * 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. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "mq200_data.h" ++ ++#if CONFIG_SA1100_SIMPAD ++/* ++ * Siemens SIMpad specefic data ++ */ ++#include ++#include ++ ++#define MQ200_REGIONS simpad_mq200_regions ++#define MQ200_MONITOR simpad_mq200_panel ++ ++static struct mq200_io_regions simpad_mq200_regions = { ++ .fb_size = MQ200_FB_SIZE, ++ .phys_mmio_base = 0x4be00000, ++ .virt_mmio_base = 0xf2e00000, ++ .phys_fb_base = 0x4b800000, ++ .virt_fb_base = 0xf2800000, ++}; ++ ++static struct mq200_monitor_info simpad_mq200_panel = { ++ .horizontal_res = 800, ++ .vertical_res = 600, ++ .depth = 16, ++ .refresh = 60, ++ .line_length = 1600, ++ .flags = 0x00130004, ++}; ++ ++extern long get_cs3_shadow(void); ++extern void set_cs3_bit(int value); ++extern void clear_cs3_bit(int value); ++#endif ++ ++ ++ ++struct mq200_info { ++ struct fb_info fb_info; ++ struct mq200_io_regions io_regions; ++ struct mq200_monitor_info monitor_info; ++ ++ /* palette */ ++ u32 pseudo_palette[17]; /* 16 colors + 1 in reserve not that well documented... */ ++ spinlock_t lock; ++}; ++ ++ ++ ++static int mq200_blank( int blank_mode, struct fb_info *info ) ++{ ++#ifdef CONFIG_SA1100_SIMPAD ++ if(blank_mode ){ ++ clear_cs3_bit(DISPLAY_ON); ++ }else { ++ set_cs3_bit(DISPLAY_ON); ++ } ++#endif ++ return 0; ++} ++ ++ ++static int mq200_check_var(struct fb_var_screeninfo *var, ++ struct fb_info *info ) ++{ /* TODO do we need sanity checks here */ ++ return 0; ++} ++ ++ ++static int mq200_set_par( struct fb_info *info ) ++{ ++ /* TODO set paraemeter */ ++ return 0; ++} ++ ++static int mq200_setcolreg(unsigned regno, unsigned red, unsigned green, ++ unsigned blue, unsigned transp, ++ struct fb_info *info ) ++{ ++ struct mq200_info *p; ++ unsigned long color; ++ u32* pal = info->pseudo_palette; ++ ++ p = info->par; ++ ++ if(regno > 255 ) ++ return 1; ++ ++ switch( info->var.bits_per_pixel ){ ++ case 16: ++ pal[regno] = ++ ((red & 0xf800) >> 0) | ++ ((green & 0xf800) >> 5) | ((blue & 0xf800) >> 11); ++ break; ++ case 24: ++ pal[regno] = ++ ((red & 0xff00) << 8) | ++ ((green & 0xff00)) | ((blue & 0xff00) >> 8); ++ break; ++ case 32: ++ pal[regno] = ++ ((red & 0xff00) >> 8) | ++ ((green & 0xff00)) | ((blue & 0xff00) << 8); ++ break; ++ default: ++ break; ++ } ++ ++ red &= 0xFF; ++ green &= 0xFF; ++ blue &= 0xFF; ++ ++ color = red | (green << 8) | (blue << 16); ++ mq200_external_setpal(regno, color, p->io_regions.virt_mmio_base); ++ ++ return 0; ++} ++ ++ ++static struct fb_ops mq200_ops = { ++ .owner = THIS_MODULE, ++ .fb_check_var = mq200_check_var, ++ .fb_set_par = mq200_set_par, ++ .fb_setcolreg = mq200_setcolreg, ++#ifdef FB_SOFT_CURSOR ++ .fb_cursor = soft_cursor, /* FIXME use hardware cursor */ ++#endif ++ .fb_fillrect = cfb_fillrect, ++ .fb_copyarea = cfb_copyarea, ++ .fb_imageblit = cfb_imageblit, ++ .fb_blank = mq200_blank, ++}; ++ ++ ++/********************************************************************* ++ * ++ * Device driver and module init code ++ * this will register to the fb layer later ++ * ++ *********************************************************************/ ++static void mq200_internal_init_color( struct fb_bitfield* red, ++ struct fb_bitfield* green, ++ struct fb_bitfield* blue, ++ int bpp ) ++{ ++ switch ( bpp ) ++ { ++ case 16: ++ red->offset = 11; ++ green->offset = 5; ++ blue->offset = 0; ++ ++ red->length = 5; ++ green->length = 6; ++ blue->length = 5; ++ break; ++ case 24: ++ red->offset = 16; ++ green->offset = 8; ++ blue->offset = 0; ++ ++ red->length = 8; ++ green->length = 8; ++ blue->length = 8; ++ break; ++ case 32: ++ red->offset = 0; ++ green->offset = 8; ++ blue->offset = 16; ++ ++ red->length = 8; ++ green->length = 8; ++ blue->length = 8; ++ case 8: /* fall through */ ++ default: ++ red->offset = green->offset = blue->offset = 0; ++ red->length = green->length = blue->length = bpp; ++ break; ++ } ++ ++} ++ ++ ++static struct mq200_info* __init mq200_internal_init_fbinfo(void) ++{ ++ struct mq200_info *info = NULL; ++ ++ info = (struct mq200_info*)kmalloc(sizeof(*info), GFP_KERNEL); ++ if(!info) ++ return NULL; ++ ++ /* ++ * Initialize memory ++ */ ++ memset(info, 0, sizeof(struct mq200_info) ); ++ spin_lock_init(&info->lock); ++ ++ /* set the base IO addresses */ ++ info->io_regions = MQ200_REGIONS; ++ info->monitor_info = MQ200_MONITOR; ++ ++ info->fb_info.screen_base = (char *)info->io_regions.virt_fb_base; ++ ++ /* fb_fix_screeninfo filling */ ++ strcpy(info->fb_info.fix.id, "MQ200_FB" ); ++ info->fb_info.fix.smem_start = info->io_regions.phys_fb_base; ++ info->fb_info.fix.smem_len = info->io_regions.fb_size; /* - CURSOR_IMAGE */ ++ info->fb_info.fix.mmio_start = info->io_regions.phys_mmio_base; ++ info->fb_info.fix.mmio_len = MQ200_REGS_SIZE; ++ info->fb_info.fix.type = FB_TYPE_PACKED_PIXELS; ++ info->fb_info.fix.accel = FB_ACCEL_NONE; ++ info->fb_info.fix.line_length = MQ200_MONITOR_LINE_LENGTH(info); ++ ++ if(MQ200_MONITOR_DEPTH(info) <= 8 ) ++ info->fb_info.fix.visual = FB_VISUAL_PSEUDOCOLOR; ++ else if( MQ200_MONITOR_DEPTH(info) >= 16 ) ++ info->fb_info.fix.visual = FB_VISUAL_DIRECTCOLOR; ++ else ++ panic("Calling mq200 with wrong display data\n"); ++ ++ /* set the variable screen info */ ++ info->fb_info.var.xres = MQ200_MONITOR_HORI_RES(info); ++ info->fb_info.var.yres = MQ200_MONITOR_VERT_RES(info); ++ info->fb_info.var.xres_virtual = MQ200_MONITOR_HORI_RES(info); ++ info->fb_info.var.yres_virtual = MQ200_MONITOR_VERT_RES(info); ++ info->fb_info.var.bits_per_pixel = MQ200_MONITOR_DEPTH(info); ++ ++ mq200_internal_init_color(&info->fb_info.var.red, ++ &info->fb_info.var.green, ++ &info->fb_info.var.blue, ++ MQ200_MONITOR_DEPTH(info) ); ++ ++ info->fb_info.var.transp.length = info->fb_info.var.transp.offset = 0; ++ info->fb_info.var.height = info->fb_info.var.width = -1; ++ ++ info->fb_info.var.vmode = FB_VMODE_NONINTERLACED; ++ info->fb_info.var.pixclock = 10000; ++ info->fb_info.var.left_margin = info->fb_info.var.right_margin = 16; ++ info->fb_info.var.upper_margin = info->fb_info.var.lower_margin = 16; ++ info->fb_info.var.hsync_len = info->fb_info.var.vsync_len = 8; ++ ++ info->fb_info.var.nonstd = 0; ++ info->fb_info.var.activate = FB_ACTIVATE_NOW; ++ info->fb_info.var.accel_flags = 0; ++ ++ return info; ++} ++ ++ ++extern void mq200_register_attributes(struct device* ); ++/* ++ * gets called from the bus ++ * we will register our framebuffer from here ++ */ ++static int __init mq200_probe(struct device *dev) ++{ ++ struct mq200_info *info = NULL; ++ int retv= 0; ++ ++ info = mq200_internal_init_fbinfo(); ++ if(!mq200_external_probe(info->io_regions.virt_mmio_base)) ++ goto error_out; ++ ++ GPDR |= (1<<3); ++ GAFR &= ~(1<<3); ++ GPSR |= (1<<3); ++ ++ mq200_external_setqmode(&info->monitor_info, ++ info->io_regions.virt_mmio_base, ++ &info->lock); ++ ++ info->fb_info.fbops = &mq200_ops; ++ info->fb_info.flags = FBINFO_FLAG_DEFAULT; ++ ++ mq200_check_var(&info->fb_info.var, &info->fb_info ); ++ ++ fb_alloc_cmap(&info->fb_info.cmap, 1 << MQ200_MONITOR_DEPTH(info), 0 ); ++ ++ info->fb_info.pseudo_palette = (void*)info->pseudo_palette; ++ ++ /* save the pointer to the mq200 struct in var */ ++ info->fb_info.par = info; ++ ++ retv = register_framebuffer(&info->fb_info ); ++ if(retv < 0) ++ goto error_out; ++ ++ ++ /* will get unset if retv != 0 */ ++ dev_set_drvdata(dev, info ); ++ return retv; ++ ++/* ++ * Free the info and exit ++ */ ++error_out: ++ kfree(info); ++ return -EINVAL; ++} ++ ++#ifdef CONFIG_PM ++static struct mq200_info* get_mq200_info( struct device *dev) ++{ ++ return dev_get_drvdata(dev); ++} ++ ++static unsigned long get_mmio_base( struct device *dev ) ++{ ++ struct mq200_info *info = get_mq200_info(dev); ++ return info->io_regions.virt_mmio_base; ++} ++ ++static struct mq200_monitor_info* get_monitor_info( struct device *dev) ++{ ++ struct mq200_info *info = get_mq200_info(dev); ++ return &info->monitor_info; ++} ++ ++static spinlock_t* get_spinlock( struct device *dev) ++{ ++ return &get_mq200_info(dev)->lock; ++} ++ ++/* ++ * FIXME: make sure we only call mq200_external_offdisplay only once ++ * a 2nd time will hang the kernel -zecke ++ * ++ * FIXME: save the content of the framebuffer inside dev->saved_state ++ * so on resume we can memcpy it back into the buffer and userspace ++ * does not need to redraw ++ * ++ * functions for suspending and resuming ++ */ ++static int mq200_suspend(struct device *dev, pm_message_t state) ++{ ++ ++ mq200_external_offdisplay( get_mmio_base(dev) ); ++ clear_cs3_bit(DISPLAY_ON); ++ ++ ++ return 0; ++} ++ ++static int mq200_resume(struct device *dev) ++{ ++ unsigned long mem = get_mmio_base(dev); ++ struct mq200_monitor_info *monitor = get_monitor_info(dev); ++ mq200_external_setqmode(monitor, mem, get_spinlock(dev) ); ++ ++ ++ /* ++ * Set display on if it was on ++ */ ++ set_cs3_bit(DISPLAY_ON); ++ ++ return 0; ++} ++ ++ ++#endif ++ ++ ++static struct device_driver mq200fb_driver = { ++ .name = "simpad-mq200", ++ .bus = &platform_bus_type, ++ .probe = mq200_probe, /* will be called after we've registered the driver */ ++ .suspend = mq200_suspend, ++ .resume = mq200_resume ++}; ++ ++int __devinit mq200_init(void) ++{ ++ return driver_register(&mq200fb_driver); ++} ++ ++module_init(mq200_init); ++MODULE_DESCRIPTION("MQ200 framebuffer driver"); ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("Holger Hans Peter Freyther"); diff --git a/packages/linux/linux/simpad/linux-2.6.21-SIMpad-serial-and-gpio_keys.patch b/packages/linux/linux/simpad/linux-2.6.21-SIMpad-serial-and-gpio_keys.patch new file mode 100644 index 0000000000..90ce4cb009 --- /dev/null +++ b/packages/linux/linux/simpad/linux-2.6.21-SIMpad-serial-and-gpio_keys.patch @@ -0,0 +1,194 @@ +diff -uNr linux-2.6.21.vanilla/arch/arm/mach-sa1100/simpad.c linux-2.6.21/arch/arm/mach-sa1100/simpad.c +--- linux-2.6.21.vanilla/arch/arm/mach-sa1100/simpad.c 2007-05-01 16:40:44.000000000 +0200 ++++ linux-2.6.21/arch/arm/mach-sa1100/simpad.c 2007-05-01 19:23:29.000000000 +0200 +@@ -1,5 +1,14 @@ + /* + * linux/arch/arm/mach-sa1100/simpad.c ++ * ++ * 2007/04/11 mrdata: ++ * - insert simpad_uart_set_mctrl() ++ * simpad_uart_get_mctrl() ++ * - internal RS232/DECT/Bluetooth ++ * works again (based on 2.4 simpad-serial.patch) ++ * ++ * 2007/04/12 Bernhard Guillon: ++ * -added gpio_keys (based on h3000.c from hh.org) + */ + + #include +@@ -27,6 +36,8 @@ + + #include + #include ++#include ++#include + #include + + #include "generic.h" +@@ -55,6 +66,7 @@ + *(CS3BUSTYPE *)(CS3_BASE) = cs3_shadow; + } + ++EXPORT_SYMBOL(get_cs3_shadow); + EXPORT_SYMBOL(set_cs3_bit); + EXPORT_SYMBOL(clear_cs3_bit); + +@@ -73,23 +85,71 @@ + }; + + ++static void simpad_uart_set_mctrl(struct uart_port *port, u_int mctrl) ++{ ++ if (port->mapbase == _Ser1UTCR0) { ++ /* internal serial port (ttySA1, DECT/Bluetooth) */ ++ if (mctrl & TIOCM_RTS) GPCR = GPIO_UART1_RTS; ++ else GPSR = GPIO_UART1_RTS; ++ ++ if (mctrl & TIOCM_DTR) GPCR = GPIO_UART1_DTR; ++ else GPSR = GPIO_UART1_DTR; ++ } ++ ++ else if (port->mapbase == _Ser3UTCR0) { ++ /* external serial port (ttySA0, RS232) */ ++ if (mctrl & TIOCM_RTS) GPCR = GPIO_UART3_RTS; ++ else GPSR = GPIO_UART3_RTS; ++ ++ if (mctrl & TIOCM_DTR) GPCR = GPIO_UART3_DTR; ++ else GPSR = GPIO_UART3_DTR; ++ } ++} ++ ++ ++static u_int simpad_uart_get_mctrl(struct uart_port *port) ++{ ++ u_int ret = TIOCM_CD | TIOCM_CTS | TIOCM_DSR; ++ ++ if (port->mapbase == _Ser1UTCR0) { ++ /* internal serial port (ttySA1, DECT/Bluetooth) */ ++ int gplr = GPLR; ++ if (gplr & GPIO_UART1_DCD) ret &= ~TIOCM_CD; ++ if (gplr & GPIO_UART1_CTS) ret &= ~TIOCM_CTS; ++ if (gplr & GPIO_UART1_DSR) ret &= ~TIOCM_DSR; ++ } ++ ++ else if (port->mapbase == _Ser3UTCR0) { ++ /* external serial port (ttySA0, RS232) */ ++ int gplr = GPLR; ++ if (gplr & GPIO_UART3_DCD) ret &= ~TIOCM_CD; ++ if (gplr & GPIO_UART3_CTS) ret &= ~TIOCM_CTS; ++ if (gplr & GPIO_UART3_DSR) ret &= ~TIOCM_DSR; ++ } ++ return ret; ++} ++ ++ + static void simpad_uart_pm(struct uart_port *port, u_int state, u_int oldstate) + { +- if (port->mapbase == (u_int)&Ser1UTCR0) { +- if (state) +- { +- clear_cs3_bit(RS232_ON); +- clear_cs3_bit(DECT_POWER_ON); +- }else +- { +- set_cs3_bit(RS232_ON); +- set_cs3_bit(DECT_POWER_ON); +- } +- } ++ if (port->mapbase == (u_int)&Ser3UTCR0) { ++ if (state) ++ { ++ clear_cs3_bit(RS232_ON); ++ /* clear_cs3_bit(DECT_POWER_ON); */ ++ }else ++ { ++ set_cs3_bit(RS232_ON); ++ /* set_cs3_bit(DECT_POWER_ON); */ ++ } ++ } + } + ++ + static struct sa1100_port_fns simpad_port_fns __initdata = { +- .pm = simpad_uart_pm, ++ .set_mctrl = simpad_uart_set_mctrl, ++ .get_mctrl = simpad_uart_get_mctrl, ++ .pm = simpad_uart_pm, + }; + + +@@ -150,7 +210,7 @@ + sa1100_register_uart(0, 3); /* serial interface */ + sa1100_register_uart(1, 1); /* DECT */ + +- // Reassign UART 1 pins ++ /* Reassign UART 1 pins */ + GAFR |= GPIO_UART_TXD | GPIO_UART_RXD; + GPDR |= GPIO_UART_TXD | GPIO_LDD13 | GPIO_LDD15; + GPDR &= ~GPIO_UART_RXD; +@@ -173,7 +233,7 @@ + + static void simpad_power_off(void) + { +- local_irq_disable(); // was cli ++ local_irq_disable(); /* was cli */ + set_cs3(0x800); /* only SD_MEDIAQ */ + + /* disable internal oscillator, float CS lines */ +@@ -197,19 +257,42 @@ + + + /* ++ * gpio_keys ++*/ ++ ++static struct gpio_keys_button simpad_button_table[] = { ++ { KEY_POWER, IRQ_GPIO_POWER_BUTTON, 0, "power button" }, ++}; ++ ++static struct gpio_keys_platform_data simpad_keys_data = { ++ .buttons = simpad_button_table, ++ .nbuttons = ARRAY_SIZE(simpad_button_table), ++}; ++ ++static struct platform_device simpad_keys = { ++ .name = "gpio-keys", ++ .dev = { ++ .platform_data = &simpad_keys_data, ++ }, ++}; ++ ++ ++/* + * MediaQ Video Device + */ ++ + static struct platform_device simpad_mq200fb = { + .name = "simpad-mq200", + .id = 0, + }; + ++ + static struct platform_device *devices[] __initdata = { +- &simpad_mq200fb ++ &simpad_keys, ++ &simpad_mq200fb, + }; + + +- + static int __init simpad_init(void) + { + int ret; +diff -uNr linux-2.6.21.vanilla/include/asm-arm/arch-sa1100/simpad.h linux-2.6.21/include/asm-arm/arch-sa1100/simpad.h +--- linux-2.6.21.vanilla/include/asm-arm/arch-sa1100/simpad.h 2007-05-01 16:40:51.000000000 +0200 ++++ linux-2.6.21/include/asm-arm/arch-sa1100/simpad.h 2007-05-01 19:22:45.000000000 +0200 +@@ -12,7 +12,7 @@ + #define __ASM_ARCH_SIMPAD_H + + +-#define GPIO_UART1_RTS GPIO_GPIO14 ++#define GPIO_UART1_RTS GPIO_GPIO9 + #define GPIO_UART1_DTR GPIO_GPIO7 + #define GPIO_UART1_CTS GPIO_GPIO8 + #define GPIO_UART1_DCD GPIO_GPIO23 diff --git a/packages/linux/linux/simpad/linux-2.6.21-SIMpad-ucb1x00-switches.patch b/packages/linux/linux/simpad/linux-2.6.21-SIMpad-ucb1x00-switches.patch new file mode 100644 index 0000000000..ff2f50566c --- /dev/null +++ b/packages/linux/linux/simpad/linux-2.6.21-SIMpad-ucb1x00-switches.patch @@ -0,0 +1,189 @@ +diff -uNr linux-2.6.21.vanilla/drivers/mfd/Kconfig linux-2.6.21/drivers/mfd/Kconfig +--- linux-2.6.21.vanilla/drivers/mfd/Kconfig 2007-05-01 16:40:45.000000000 +0200 ++++ linux-2.6.21/drivers/mfd/Kconfig 2007-05-01 16:55:38.000000000 +0200 +@@ -37,4 +37,7 @@ + tristate "Touchscreen interface support" + depends on MCP_UCB1200 && INPUT + ++config MCP_UCB1200_SWITCHES ++ tristate "SIMpad Switches support" ++ depends on MCP_UCB1200 && INPUT + endmenu +diff -uNr linux-2.6.21.vanilla/drivers/mfd/Makefile linux-2.6.21/drivers/mfd/Makefile +--- linux-2.6.21.vanilla/drivers/mfd/Makefile 2007-05-01 16:40:45.000000000 +0200 ++++ linux-2.6.21/drivers/mfd/Makefile 2007-05-01 16:55:38.000000000 +0200 +@@ -8,7 +8,7 @@ + obj-$(CONFIG_MCP_SA11X0) += mcp-sa11x0.o + obj-$(CONFIG_MCP_UCB1200) += ucb1x00-core.o + obj-$(CONFIG_MCP_UCB1200_TS) += ucb1x00-ts.o +- ++obj-$(CONFIG_MCP_UCB1200_SWITCHES) += ucb1x00-switches.o + ifeq ($(CONFIG_SA1100_ASSABET),y) + obj-$(CONFIG_MCP_UCB1200) += ucb1x00-assabet.o + endif +diff -uNr linux-2.6.21.vanilla/drivers/mfd/ucb1x00-switches.c linux-2.6.21/drivers/mfd/ucb1x00-switches.c +--- linux-2.6.21.vanilla/drivers/mfd/ucb1x00-switches.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.21/drivers/mfd/ucb1x00-switches.c 2007-05-01 16:55:38.000000000 +0200 +@@ -0,0 +1,162 @@ ++/* ++ * linux/drivers/mfd/ucb1x00-switches.c ++ * ++ * Copyright (C) 2007 Bernhard Guillon. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License. ++ * ++ * This driver is for the Switches of Siemens SIMpad (CL4,SL4,SLC), T-Sinus-Pad and ++ * Swisscom WP50 devices. ++ * ++ * Six switches are routed to GPIO pins on the UCB1300: S3 -- S8. ++ * ++ * This driver is based on the 2.4 ucb1x00-switches, the 2.6 ucb1x00-assabet ++ * and the ucb1x00-ts driver. ++ * ++ */ ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include "ucb1x00.h" ++ ++static int key [6] = { KEY_PROG1,KEY_PROG2,KEY_UP,KEY_DOWN,KEY_LEFT,KEY_RIGHT }; ++ ++struct ucb1x00_switches { ++ struct input_dev *idev; ++ struct ucb1x00 *ucb; ++}; ++ ++static void ucb1x00_dev_irq(int idx, void *id) ++{ ++ static unsigned short int last; ++ unsigned short int this; ++ struct ucb1x00_switches *switches = id; ++ struct input_dev *idev = switches->idev; ++ ++ ucb1x00_enable(switches->ucb); ++ ++ this=~ucb1x00_io_read(switches->ucb); ++ if (this==last) { ++ return; ++ } ++ ++ last=this; ++ ++ if ((idx >=0) && (idx <=5)) { ++ if ((this & (1<ucb = dev->ucb; ++ ++ idev->private = switches; ++ idev->name = "SIMpad Switches"; ++ idev->id.product = switches->ucb->id; ++ ++ __set_bit(EV_KEY, idev->evbit); ++ __set_bit(EV_REP, idev->evbit); ++ __set_bit(KEY_PROG1, idev->keybit); ++ __set_bit(KEY_PROG2, idev->keybit); ++ __set_bit(KEY_UP, idev->keybit); ++ __set_bit(KEY_DOWN, idev->keybit); ++ __set_bit(KEY_LEFT, idev->keybit); ++ __set_bit(KEY_RIGHT, idev->keybit); ++ ++ err = input_register_device(idev); ++ if (err) ++ goto fail; ++ switches->idev = idev; ++ dev->priv = switches; ++ ++ ucb1x00_enable(switches->ucb); ++ ++ ucb1x00_io_set_dir(switches->ucb, ++ UCB_IO_0 | UCB_IO_1 | UCB_IO_2 | ++ UCB_IO_3 | UCB_IO_4 | UCB_IO_5, ++ UCB_IO_8 | UCB_IO_9); ++ ++ ucb1x00_disable(switches->ucb); ++ ++ for (i = 0; i < 6; ++i) { ++ ucb1x00_enable_irq(switches->ucb, i, UCB_RISING | UCB_FALLING); ++ if (ucb1x00_hook_irq(switches->ucb, i, ucb1x00_dev_irq, switches) < 0) { ++ printk(KERN_ERR "unable to hook IRQ for " ++ "UCB1300 SWITCH_%d\n", i); ++ return -EBUSY; ++ } ++ } ++ ++ return 0; ++ ++fail: ++ input_free_device(idev); ++ kfree(switches); ++ return err; ++ ++} ++ ++static void ucb1x00_switches_remove(struct ucb1x00_dev *dev) ++{ ++ int i; ++ struct ucb1x00_switches *switches = dev->priv; ++ input_unregister_device(switches->idev); ++ ++ for (i = 5; i >= 0; --i) { ++ ucb1x00_disable_irq(switches->ucb, i, UCB_RISING | UCB_FALLING); ++ ++ /* Only error conditions are ENOENT and EINVAL; silently ++ * ignore: ++ */ ++ ucb1x00_free_irq(switches->ucb, i, NULL); ++ } ++ ucb1x00_disable(switches->ucb); ++ kfree(switches); ++} ++ ++static struct ucb1x00_driver ucb1x00_switches_driver = { ++ .add = ucb1x00_switches_add, ++ .remove = ucb1x00_switches_remove, ++}; ++ ++static int __init ucb1x00_switches_init(void) ++{ ++ return ucb1x00_register_driver(&ucb1x00_switches_driver); ++} ++ ++static void __exit ucb1x00_switches_exit(void) ++{ ++ ucb1x00_unregister_driver(&ucb1x00_switches_driver); ++} ++ ++module_init(ucb1x00_switches_init); ++module_exit(ucb1x00_switches_exit); ++ ++MODULE_AUTHOR("Bernhard Guillon "); ++MODULE_DESCRIPTION("UCB1x00 Switches driver for Siemens SIMpad"); ++MODULE_LICENSE("GPL"); diff --git a/packages/linux/linux/simpad/linux-2.6.21-pcmcia-device-to-platform-driver.patch b/packages/linux/linux/simpad/linux-2.6.21-pcmcia-device-to-platform-driver.patch new file mode 100644 index 0000000000..e6233cbe30 --- /dev/null +++ b/packages/linux/linux/simpad/linux-2.6.21-pcmcia-device-to-platform-driver.patch @@ -0,0 +1,54 @@ +diff -uNr linux-2.6.21.vanilla/drivers/pcmcia/sa1100_generic.c linux-2.6.21/drivers/pcmcia/sa1100_generic.c +--- linux-2.6.21.vanilla/drivers/pcmcia/sa1100_generic.c 2007-05-01 16:40:46.000000000 +0200 ++++ linux-2.6.21/drivers/pcmcia/sa1100_generic.c 2007-05-01 19:38:05.000000000 +0200 +@@ -28,6 +28,9 @@ + the provisions above, a recipient may use your version of this + file under either the MPL or the GPL. + ++ 2007 mrnice: added thesings changes from device_driver ++ to platform_driver - many thx to thesing ++ + ======================================================================*/ + + #include +@@ -81,13 +84,15 @@ + return ret; + } + +-static struct device_driver sa11x0_pcmcia_driver = { +- .probe = sa11x0_drv_pcmcia_probe, +- .remove = soc_common_drv_pcmcia_remove, +- .name = "sa11x0-pcmcia", +- .bus = &platform_bus_type, +- .suspend = pcmcia_socket_dev_suspend, +- .resume = pcmcia_socket_dev_resume, ++static struct platform_driver sa11x0_pcmcia_driver = { ++ .driver = { ++ .name = "sa11x0-pcmcia", ++ .probe = sa11x0_drv_pcmcia_probe, ++ .remove = soc_common_drv_pcmcia_remove, ++ .suspend= pcmcia_socket_dev_suspend, ++ .resume = pcmcia_socket_dev_resume, ++ //.bus = &platform_bus_type, ++ }, + }; + + /* sa11x0_pcmcia_init() +@@ -100,7 +105,7 @@ + */ + static int __init sa11x0_pcmcia_init(void) + { +- return driver_register(&sa11x0_pcmcia_driver); ++ return platform_driver_register(&sa11x0_pcmcia_driver); + } + + /* sa11x0_pcmcia_exit() +@@ -110,7 +115,7 @@ + */ + static void __exit sa11x0_pcmcia_exit(void) + { +- driver_unregister(&sa11x0_pcmcia_driver); ++ platform_driver_unregister(&sa11x0_pcmcia_driver); + } + + MODULE_AUTHOR("John Dorsey "); diff --git a/packages/linux/linux_2.6.21.bb b/packages/linux/linux_2.6.21.bb new file mode 100644 index 0000000000..d801f88507 --- /dev/null +++ b/packages/linux/linux_2.6.21.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Linux Kernel" +SECTION = "kernel" +LICENSE = "GPL" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ + file://defconfig" + +SRC_URI_append_simpad = "\ + file://linux-2.6.21-SIMpad-cs3-simpad.patch;patch=1 \ + file://linux-2.6.21-SIMpad-mq200.patch;patch=1 \ + file://linux-2.6.21-SIMpad-serial-and-gpio_keys.patch;patch=1 \ + file://linux-2.6.21-SIMpad-ucb1x00-switches.patch;patch=1 \ + file://linux-2.6.21-pcmcia-device-to-platform-driver.patch;patch=1 \ + " + +inherit kernel + +KERNEL_IMAGETYPE_simpad = "zImage" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config +} + -- cgit v1.2.3 From 557ecc1478abec9dc5ef19246ba9a753ce4a3f49 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 May 2007 17:44:57 +0000 Subject: fuse 2.6.3: fix packaging --- packages/fuse/fuse_2.6.3.bb | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/packages/fuse/fuse_2.6.3.bb b/packages/fuse/fuse_2.6.3.bb index f85860f175..1cc9cbe57d 100644 --- a/packages/fuse/fuse_2.6.3.bb +++ b/packages/fuse/fuse_2.6.3.bb @@ -1,22 +1,20 @@ -DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" -HOMEPAGE = "http://fuse.sf.net" -LICENSE = "GPL" -DEPENDS = "fakeroot-native" -PR = "r0" +require fuse.inc -SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz \ - file://not-run-updaterc.d-on-host.patch;patch=1" +PR = "r2" -inherit autotools pkgconfig +SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1" EXTRA_OECONF = " --disable-kernel-module" +#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils +PACKAGES += "fuse-utils" +FILES_${PN} = "${libdir}/*.so.*" +FILES_${PN}-dev += "${libdir}/*.la" +FILES_fuse-utils = "${bindir} ${base_sbindir}" +DEBIAN_NOAUTONAME_fuse-utils = "1" + fakeroot do_stage() { - autotools_stage_all + autotools_stage_all } -# Package the fuse utils and libs in seperate packages -PACKAGES += "lib${PN} libulockmgr" -FILES_${PN}-dev += "${libdir}/*.la" -FILES_lib${PN} = "${libdir}/libfuse*.so.*" -FILES_libulockmgr = "${libdir}/libulockmgr.so.*" + -- cgit v1.2.3 From b5c35fad6b345e26547421f614fc2ac5a1f54cf6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 May 2007 17:54:20 +0000 Subject: python-fuse: fix packaging and depends, spotted by Junqian Gordon Xu --- packages/python/python-fuse_cvs.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/python/python-fuse_cvs.bb b/packages/python/python-fuse_cvs.bb index e803b7fc62..d017e28536 100644 --- a/packages/python/python-fuse_cvs.bb +++ b/packages/python/python-fuse_cvs.bb @@ -1,11 +1,15 @@ DESCRIPTION = "FUSE Python bindings." LICENSE = "GPLv2" +DEPENDS = "fuse" PV = "0.0+cvs${SRCDATE}" +PR = "r1" + SRC_URI = "cvs://anonymous@fuse.cvs.sourceforge.net/cvsroot/fuse;module=python" inherit distutils S = "${WORKDIR}/python" +FILES_${PN}-dbg += "${libdir}/python*/site-packages/fuseparts/.debu*" -- cgit v1.2.3 From a25b19a8f6a8342aa621e3a55571f2b2aa44d923 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 May 2007 18:15:07 +0000 Subject: fuse: update to 2.6.5 and make packaging more granular --- packages/fuse/fuse-2.6.3/.mtn2git_empty | 0 .../fuse-2.6.3/not-run-updaterc.d-on-host.patch | 21 ----------------- packages/fuse/fuse-2.6.5/.mtn2git_empty | 0 .../fuse-2.6.5/not-run-updaterc.d-on-host.patch | 21 +++++++++++++++++ packages/fuse/fuse_2.6.3.bb | 20 ---------------- packages/fuse/fuse_2.6.5.bb | 27 ++++++++++++++++++++++ 6 files changed, 48 insertions(+), 41 deletions(-) delete mode 100644 packages/fuse/fuse-2.6.3/.mtn2git_empty delete mode 100644 packages/fuse/fuse-2.6.3/not-run-updaterc.d-on-host.patch create mode 100644 packages/fuse/fuse-2.6.5/.mtn2git_empty create mode 100644 packages/fuse/fuse-2.6.5/not-run-updaterc.d-on-host.patch delete mode 100644 packages/fuse/fuse_2.6.3.bb create mode 100644 packages/fuse/fuse_2.6.5.bb diff --git a/packages/fuse/fuse-2.6.3/.mtn2git_empty b/packages/fuse/fuse-2.6.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/fuse/fuse-2.6.3/not-run-updaterc.d-on-host.patch b/packages/fuse/fuse-2.6.3/not-run-updaterc.d-on-host.patch deleted file mode 100644 index 2496b77f70..0000000000 --- a/packages/fuse/fuse-2.6.3/not-run-updaterc.d-on-host.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- fuse-2.6.3/util/Makefile.am~ 2007-02-27 22:50:15.000000000 -0600 -+++ fuse-2.6.3/util/Makefile.am 2007-02-27 22:53:31.000000000 -0600 -@@ -29,10 +29,6 @@ - $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse - $(mkdir_p) $(DESTDIR)$(INIT_D_PATH) - $(INSTALL_PROGRAM) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse -- @if test -x /usr/sbin/update-rc.d; then \ -- echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \ -- /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \ -- fi - - install-data-local: - $(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH) -@@ -42,7 +38,3 @@ - rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse - rm -f $(DESTDIR)$(UDEV_RULES_PATH)/99-fuse.rules - rm -f $(DESTDIR)$(INIT_D_PATH)/fuse -- @if test -x /usr/sbin/update-rc.d; then \ -- echo "/usr/sbin/update-rc.d fuse remove || true"; \ -- /usr/sbin/update-rc.d fuse remove || true; \ -- fi diff --git a/packages/fuse/fuse-2.6.5/.mtn2git_empty b/packages/fuse/fuse-2.6.5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/fuse/fuse-2.6.5/not-run-updaterc.d-on-host.patch b/packages/fuse/fuse-2.6.5/not-run-updaterc.d-on-host.patch new file mode 100644 index 0000000000..2496b77f70 --- /dev/null +++ b/packages/fuse/fuse-2.6.5/not-run-updaterc.d-on-host.patch @@ -0,0 +1,21 @@ +--- fuse-2.6.3/util/Makefile.am~ 2007-02-27 22:50:15.000000000 -0600 ++++ fuse-2.6.3/util/Makefile.am 2007-02-27 22:53:31.000000000 -0600 +@@ -29,10 +29,6 @@ + $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse + $(mkdir_p) $(DESTDIR)$(INIT_D_PATH) + $(INSTALL_PROGRAM) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse +- @if test -x /usr/sbin/update-rc.d; then \ +- echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \ +- /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \ +- fi + + install-data-local: + $(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH) +@@ -42,7 +38,3 @@ + rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse + rm -f $(DESTDIR)$(UDEV_RULES_PATH)/99-fuse.rules + rm -f $(DESTDIR)$(INIT_D_PATH)/fuse +- @if test -x /usr/sbin/update-rc.d; then \ +- echo "/usr/sbin/update-rc.d fuse remove || true"; \ +- /usr/sbin/update-rc.d fuse remove || true; \ +- fi diff --git a/packages/fuse/fuse_2.6.3.bb b/packages/fuse/fuse_2.6.3.bb deleted file mode 100644 index 1cc9cbe57d..0000000000 --- a/packages/fuse/fuse_2.6.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -require fuse.inc - -PR = "r2" - -SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1" - -EXTRA_OECONF = " --disable-kernel-module" - -#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils -PACKAGES += "fuse-utils" -FILES_${PN} = "${libdir}/*.so.*" -FILES_${PN}-dev += "${libdir}/*.la" -FILES_fuse-utils = "${bindir} ${base_sbindir}" -DEBIAN_NOAUTONAME_fuse-utils = "1" - -fakeroot do_stage() { - autotools_stage_all -} - - diff --git a/packages/fuse/fuse_2.6.5.bb b/packages/fuse/fuse_2.6.5.bb new file mode 100644 index 0000000000..a1795e7f0c --- /dev/null +++ b/packages/fuse/fuse_2.6.5.bb @@ -0,0 +1,27 @@ +require fuse.inc + +PR = "r0" + +SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1" + +EXTRA_OECONF = " --disable-kernel-module" + +#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils +PACKAGES =+ "fuse-utils-dbg fuse-utils libulockmgr libulockmgr-dev libulockmgr-dbg" +FILES_${PN} += "${libdir}/libfuse.so.*" +FILES_${PN}-dev += "${libdir}/libfuse*.la" + +FILES_libulockmgr = "${libdir}/libulockmgr.so.*" +FILES_libulockmgr-dev += "${libdir}/libulock*.la" +FILES_libulockmgr-dbg += "${libdir}/.debug/libulock*" + +FILES_fuse-utils = "${bindir} ${base_sbindir}" +FILES_fuse-utils-dbg = "${bindir}/.debug ${base_sbindir}/.debug" +DEBIAN_NOAUTONAME_fuse-utils = "1" +DEBIAN_NOAUTONAME_fuse-utils-dbg = "1" + +fakeroot do_stage() { + autotools_stage_all +} + + -- cgit v1.2.3 From b3e367567e55830ee21129a7bd32d8596cefc827 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Mon, 7 May 2007 18:41:13 +0000 Subject: sshfs-fuse: update to 1.7 --- packages/fuse/sshfs-fuse_1.7.bb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 packages/fuse/sshfs-fuse_1.7.bb diff --git a/packages/fuse/sshfs-fuse_1.7.bb b/packages/fuse/sshfs-fuse_1.7.bb new file mode 100644 index 0000000000..24b70c518b --- /dev/null +++ b/packages/fuse/sshfs-fuse_1.7.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "This is a filesystem client based on the SSH File Transfer Protocol using FUSE." +AUTHOR = "Miklos Szeredi " +HOMEPAGE = "http://fuse.sourceforge.net/sshfs.html" +SECTION = "console/network" +PRIORITY = "optional" +LICENSE = "GPLv2" +DEPENDS = "glib-2.0 fuse" +RDEPENDS = "fuse" + +SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz" + +S = "${WORKDIR}/${P}" + +inherit autotools -- cgit v1.2.3 From 25c6d0a0f6386086ec089114ca71c766aa54e574 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 7 May 2007 18:42:51 +0000 Subject: entice: clean up. Bump PR. Partly fixes 2234. --- packages/e17/entice_20060128.bb | 4 ++-- packages/e17/entice_20060416.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/e17/entice_20060128.bb b/packages/e17/entice_20060128.bb index 776f652b96..5b433de015 100644 --- a/packages/e17/entice_20060128.bb +++ b/packages/e17/entice_20060128.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Entice is the E17 picture viewer" # can also depend on GIMP for editing -DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" LICENSE = "MIT" -PR = "r3" +DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" +PR = "r4" inherit e diff --git a/packages/e17/entice_20060416.bb b/packages/e17/entice_20060416.bb index 87434e3d3b..663ee97cd8 100644 --- a/packages/e17/entice_20060416.bb +++ b/packages/e17/entice_20060416.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Entice is the E17 picture viewer" # can also depend on GIMP for editing -DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" LICENSE = "MIT" -PR = "r0" +DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" +PR = "r1" inherit e -- cgit v1.2.3 From 50dfa90e673752a4bc000b311687c0206e9a8fc1 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 7 May 2007 18:52:13 +0000 Subject: links: clean up. Bump PR. partly closes 2234. --- packages/links/links-x11_2.0+2.1pre26.bb | 3 ++- packages/links/links_2.0+2.1pre26.bb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/links/links-x11_2.0+2.1pre26.bb b/packages/links/links-x11_2.0+2.1pre26.bb index c026ca7e02..9ee70d9ad4 100644 --- a/packages/links/links-x11_2.0+2.1pre26.bb +++ b/packages/links/links-x11_2.0+2.1pre26.bb @@ -2,7 +2,8 @@ require links.inc DEPENDS += "virtual/libx11" RCONFLICTS = "links" -PR = "r0" +PR = "r1" + SRC_URI += " file://links2.desktop \ http://www.xora.org.uk/oe/links2.png" diff --git a/packages/links/links_2.0+2.1pre26.bb b/packages/links/links_2.0+2.1pre26.bb index 6fcf8cef84..c46a64f380 100644 --- a/packages/links/links_2.0+2.1pre26.bb +++ b/packages/links/links_2.0+2.1pre26.bb @@ -1,8 +1,8 @@ require links.inc DEPENDS += "gpm" -RCONFLICTS="links-x11" -PR = "r0" +RCONFLICTS = "links-x11" +PR = "r1" EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \ --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ -- cgit v1.2.3 From ffaf408217a8ba850f6be82a334269486336a36c Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 7 May 2007 18:57:24 +0000 Subject: gphoto2: clean up. Bump PR. Partly closes 2234. --- packages/gphoto2/gphoto2_2.1.4.bb | 5 +++-- packages/gphoto2/gphoto2_2.1.5.bb | 5 +++-- packages/gphoto2/gphoto2_2.1.6.bb | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/gphoto2/gphoto2_2.1.4.bb b/packages/gphoto2/gphoto2_2.1.4.bb index 5ebed8f8bf..80d0ee0f27 100644 --- a/packages/gphoto2/gphoto2_2.1.4.bb +++ b/packages/gphoto2/gphoto2_2.1.4.bb @@ -1,7 +1,8 @@ -LICENSE = "GPL" +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" SECTION = "console/utils" +LICENSE = "GPL" DEPENDS = "libgphoto2 popt" -DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2" diff --git a/packages/gphoto2/gphoto2_2.1.5.bb b/packages/gphoto2/gphoto2_2.1.5.bb index dc49ce74b0..0913b9743c 100644 --- a/packages/gphoto2/gphoto2_2.1.5.bb +++ b/packages/gphoto2/gphoto2_2.1.5.bb @@ -1,7 +1,8 @@ -LICENSE = "GPL" +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" SECTION = "console/utils" +LICENSE = "GPL" DEPENDS = "libgphoto2 popt" -DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz" diff --git a/packages/gphoto2/gphoto2_2.1.6.bb b/packages/gphoto2/gphoto2_2.1.6.bb index ff6531a572..63dad91f14 100644 --- a/packages/gphoto2/gphoto2_2.1.6.bb +++ b/packages/gphoto2/gphoto2_2.1.6.bb @@ -1,8 +1,8 @@ -LICENSE = "GPL" +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" SECTION = "console/utils" +LICENSE = "GPL" DEPENDS = "libgphoto2 popt" -DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" -PR="r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz" -- cgit v1.2.3 From 21c6c59abb6b2af68309f4004c0372995a23de31 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 7 May 2007 18:58:54 +0000 Subject: fltk: clean up. Bump PR. Partly closes 2234. --- packages/fltk/fltk_1.1.4.bb | 3 +-- packages/fltk/fltk_1.1.7.bb | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/fltk/fltk_1.1.4.bb b/packages/fltk/fltk_1.1.4.bb index 39e3279a4f..66c4b214ec 100644 --- a/packages/fltk/fltk_1.1.4.bb +++ b/packages/fltk/fltk_1.1.4.bb @@ -4,8 +4,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "jpeg libpng mesa zlib" - -PR = "FLDevice-r0" +PR = "r1" SRC_URI = "ftp://ftp-fourier.ujf-grenoble.fr/xcas/devel/sources/fltk-${PV}-device.tar.gz" diff --git a/packages/fltk/fltk_1.1.7.bb b/packages/fltk/fltk_1.1.7.bb index dca48837a8..3e095b45a3 100644 --- a/packages/fltk/fltk_1.1.7.bb +++ b/packages/fltk/fltk_1.1.7.bb @@ -3,9 +3,8 @@ HOMEPAGE = "http://www.fltk.org" SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -PR= "r1" - DEPENDS = "zlib jpeg libpng libxext libxft" +PR = "r2" SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2" -- cgit v1.2.3 From 12d235bb4d804f365464087c118b52e8c7e20709 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 May 2007 19:01:54 +0000 Subject: sshfs-fuse: package all files, closes #2047 --- packages/fuse/sshfs-fuse_1.7.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/fuse/sshfs-fuse_1.7.bb b/packages/fuse/sshfs-fuse_1.7.bb index 24b70c518b..1f40ac8c8c 100644 --- a/packages/fuse/sshfs-fuse_1.7.bb +++ b/packages/fuse/sshfs-fuse_1.7.bb @@ -5,10 +5,13 @@ SECTION = "console/network" PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS = "glib-2.0 fuse" -RDEPENDS = "fuse" + +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz" S = "${WORKDIR}/${P}" inherit autotools + +FILES_${PN} += "${libdir}/sshnodelay.so" -- cgit v1.2.3 From ac5f9e37bdbe2acca8b9d24f645c29a1ae9705fc Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 7 May 2007 19:02:00 +0000 Subject: mb-desktop-xine: clean up. Bump PR. Partly closes 2234. --- packages/mb-desktop-xine/mb-desktop-xine_0.4.bb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/mb-desktop-xine/mb-desktop-xine_0.4.bb b/packages/mb-desktop-xine/mb-desktop-xine_0.4.bb index 885177de01..e7a933ee0c 100644 --- a/packages/mb-desktop-xine/mb-desktop-xine_0.4.bb +++ b/packages/mb-desktop-xine/mb-desktop-xine_0.4.bb @@ -1,8 +1,6 @@ DESCRIPTION = "foo" -LICENSE = "GPL" HOMEPAGE = "http://projects.o-hand.com/matchbox/" - -SRC_URI="http://projects.o-hand.com/matchbox/sources/mb-desktop-xine/0.4/mb-desktop-xine-${PV}.tar.bz2" +LICENSE = "GPL" DEPENDS = "matchbox-desktop libxine-x11" RDEPENDS = "libxine-plugin-vo-out-xshm \ libxine-plugin-vo-out-none \ @@ -27,10 +25,11 @@ RDEPENDS = "libxine-plugin-vo-out-xshm \ libxine-plugin-dmx-avi \ libxine-plugin-ao-out-oss \ matchbox-desktop " +PR = "r1" +SRC_URI="http://projects.o-hand.com/matchbox/sources/mb-desktop-xine/0.4/mb-desktop-xine-${PV}.tar.bz2" FILES_${PN} += " /usr/share/themes/mbmediabox/matchbox/ \ /usr/share/matchbox/desktop/modules/*.so" - inherit autotools pkgconfig -- cgit v1.2.3 From 5c44948c75ff5c783c66cacdc3f71341af49b58d Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 7 May 2007 19:05:12 +0000 Subject: povray: Clean up. Bump PR. Partly closes 2234. --- packages/povray/povray_3.6.1.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/povray/povray_3.6.1.bb b/packages/povray/povray_3.6.1.bb index e1c60570be..107c86cfb8 100644 --- a/packages/povray/povray_3.6.1.bb +++ b/packages/povray/povray_3.6.1.bb @@ -3,11 +3,10 @@ HOMEPAGE = "http://www.povray.org" SECTION = "console/graphics" #Make this a weak assigment to allow branding of the povray binary LICENSE = "povray" - DEPENDS = "virtual/libx11 zlib jpeg libpng tiff" RDEPENDS = "" -PR = "r1" +PR = "r2" #We apply a patch that subverts the checks for jpeg, zlib, png and tiff because we know OE has the required versions, but it is still a hack. SRC_URI = "http://www.povray.org/redirect/www.povray.org/ftp/pub/povray/Official/Unix/${P}.tar.bz2 \ -- cgit v1.2.3 From c71a8fcaf3c5cd7990eec02559e209d34b4019d6 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 7 May 2007 19:07:10 +0000 Subject: ntpbm: clean up. Bump PR. Partly closes 2234. --- packages/netpbm/netpbm_10.28.bb | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/packages/netpbm/netpbm_10.28.bb b/packages/netpbm/netpbm_10.28.bb index dde0d17d57..cfe2a5cc88 100644 --- a/packages/netpbm/netpbm_10.28.bb +++ b/packages/netpbm/netpbm_10.28.bb @@ -1,14 +1,14 @@ -# bitbake configuration file for NetPBM, a command line image (sampled -# data) processing package derived from PBMPlus -# -# For documentation see: http://netpbm.sourceforge.net/doc/ +DESCRIPTION = "Netpbm is a toolkit for manipulation of graphic images, including\ +conversion of images between a variety of different formats. There\ +are over 220 separate tools in the package including converters for\ +about 100 graphics formats." +HOMEPAGE = "http://netpbm.sourceforge.net" +SECTION = "console/utils" LICENSE = "GPL MIT Artistic" # NOTE: individual command line utilities are covered by different # licenses. The compiled and linked command line utilties are # subject to the licenses of the libraries they use too - including # libpng libz, IJG, and libtiff licenses - -SECTION = "console/utils" DEPENDS = "jpeg zlib libpng tiff install-native flex-native" RDEPENDS = "perl\ perl-module-cwd\ @@ -25,12 +25,7 @@ RDEPENDS = "perl\ RDEPENDS += "perl-module-exporter-heavy" RDEPENDS += "perl-module-file-spec-unix" -HOMEPAGE = "http://netpbm.sourceforge.net" -DESCRIPTION = "Netpbm is a toolkit for manipulation of graphic images, including\ -conversion of images between a variety of different formats. There\ -are over 220 separate tools in the package including converters for\ -about 100 graphics formats." -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/netpbm/netpbm-${PV}.tgz \ file://ppmtojpeg.patch;patch=42 \ -- cgit v1.2.3 From 13686edad2feafdbd1ad212f5a888f3141bb9887 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 7 May 2007 19:17:40 +0000 Subject: gpe-timesheet: drop all versions prior to 0.3. Consulted with philippe and got the go before committing. --- packages/gpe-timesheet/gpe-timesheet_0.18.bb | 9 --------- packages/gpe-timesheet/gpe-timesheet_0.19.bb | 9 --------- packages/gpe-timesheet/gpe-timesheet_0.20.bb | 9 --------- packages/gpe-timesheet/gpe-timesheet_0.21.bb | 9 --------- 4 files changed, 36 deletions(-) delete mode 100644 packages/gpe-timesheet/gpe-timesheet_0.18.bb delete mode 100644 packages/gpe-timesheet/gpe-timesheet_0.19.bb delete mode 100644 packages/gpe-timesheet/gpe-timesheet_0.20.bb delete mode 100644 packages/gpe-timesheet/gpe-timesheet_0.21.bb diff --git a/packages/gpe-timesheet/gpe-timesheet_0.18.bb b/packages/gpe-timesheet/gpe-timesheet_0.18.bb deleted file mode 100644 index 0cd8b539f0..0000000000 --- a/packages/gpe-timesheet/gpe-timesheet_0.18.bb +++ /dev/null @@ -1,9 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -DESCRIPTION = "GPE time tracker" -DEPENDS = "libgpewidget gtk+ sqlite" -SECTION = "gpe" -RDEPENDS = "gpe-icons" - -SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz" diff --git a/packages/gpe-timesheet/gpe-timesheet_0.19.bb b/packages/gpe-timesheet/gpe-timesheet_0.19.bb deleted file mode 100644 index 0cd8b539f0..0000000000 --- a/packages/gpe-timesheet/gpe-timesheet_0.19.bb +++ /dev/null @@ -1,9 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -DESCRIPTION = "GPE time tracker" -DEPENDS = "libgpewidget gtk+ sqlite" -SECTION = "gpe" -RDEPENDS = "gpe-icons" - -SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz" diff --git a/packages/gpe-timesheet/gpe-timesheet_0.20.bb b/packages/gpe-timesheet/gpe-timesheet_0.20.bb deleted file mode 100644 index 0cd8b539f0..0000000000 --- a/packages/gpe-timesheet/gpe-timesheet_0.20.bb +++ /dev/null @@ -1,9 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -DESCRIPTION = "GPE time tracker" -DEPENDS = "libgpewidget gtk+ sqlite" -SECTION = "gpe" -RDEPENDS = "gpe-icons" - -SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz" diff --git a/packages/gpe-timesheet/gpe-timesheet_0.21.bb b/packages/gpe-timesheet/gpe-timesheet_0.21.bb deleted file mode 100644 index 0cd8b539f0..0000000000 --- a/packages/gpe-timesheet/gpe-timesheet_0.21.bb +++ /dev/null @@ -1,9 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -DESCRIPTION = "GPE time tracker" -DEPENDS = "libgpewidget gtk+ sqlite" -SECTION = "gpe" -RDEPENDS = "gpe-icons" - -SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz" -- cgit v1.2.3 From f9aac45244be2995907833e7ceab149f3de6680f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 May 2007 20:35:33 +0000 Subject: fuse: (hopefully) fix all remaining issues --- packages/fuse/fuse-module_2.5.3.bb | 29 ----------------------------- packages/fuse/fuse-module_2.6.5.bb | 29 +++++++++++++++++++++++++++++ packages/fuse/fuse.inc | 2 +- 3 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 packages/fuse/fuse-module_2.5.3.bb create mode 100644 packages/fuse/fuse-module_2.6.5.bb diff --git a/packages/fuse/fuse-module_2.5.3.bb b/packages/fuse/fuse-module_2.5.3.bb deleted file mode 100644 index 4c71b0b9f9..0000000000 --- a/packages/fuse/fuse-module_2.5.3.bb +++ /dev/null @@ -1,29 +0,0 @@ -require fuse.inc - -RRECOMMENDS = "fuse" -PR = "r1" - -S = "${WORKDIR}/fuse-${PV}" -FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}" -EXTRA_OECONF = " --with-kernel=${STAGING_KERNEL_DIR}" - -inherit module - -do_configure() { - cd ${S} ; oe_runconf -} - -do_compile(){ - LDFLAGS="" - cd ${S}/kernel - oe_runmake -} - -fakeroot do_install() { - LDFLAGS="" - install -d ${D}${sysconfdir}/udev/rules.d/ - install -m 644 util/udev.rules ${D}${sysconfdir}/udev/rules.d/ - cd ${S}/kernel - oe_runmake install DESTDIR=${D} -} - diff --git a/packages/fuse/fuse-module_2.6.5.bb b/packages/fuse/fuse-module_2.6.5.bb new file mode 100644 index 0000000000..6d516185be --- /dev/null +++ b/packages/fuse/fuse-module_2.6.5.bb @@ -0,0 +1,29 @@ +require fuse.inc + +RRECOMMENDS = "fuse" +PR = "r1" + +S = "${WORKDIR}/fuse-${PV}" +FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}" +EXTRA_OECONF = " --enable-kernel-module --with-kernel=${STAGING_KERNEL_DIR}" + +inherit module + +do_configure() { + cd ${S} ; oe_runconf +} + +do_compile(){ + LDFLAGS="" + cd ${S}/kernel + oe_runmake +} + +fakeroot do_install() { + LDFLAGS="" + install -d ${D}${sysconfdir}/udev/rules.d/ + install -m 644 util/udev.rules ${D}${sysconfdir}/udev/rules.d/ + cd ${S}/kernel + oe_runmake install DESTDIR=${D} +} + diff --git a/packages/fuse/fuse.inc b/packages/fuse/fuse.inc index abc408561a..41952050a4 100644 --- a/packages/fuse/fuse.inc +++ b/packages/fuse/fuse.inc @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "fakeroot-native" RRECOMMENDS_fuse = "fuse-module kernel-module-fuse" -SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz" inherit autotools pkgconfig -- cgit v1.2.3 From 1c484102d87944ebda3f30bcffce3e788cfe0cf3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 May 2007 21:49:05 +0000 Subject: linux-magicbox: add COMPATIBLE_MACHINE --- packages/linux/linux-magicbox_2.6.18.6.bb | 2 ++ packages/linux/linux-magicbox_2.6.19.2.bb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/linux/linux-magicbox_2.6.18.6.bb b/packages/linux/linux-magicbox_2.6.18.6.bb index e306c54e7b..fde955ce9a 100644 --- a/packages/linux/linux-magicbox_2.6.18.6.bb +++ b/packages/linux/linux-magicbox_2.6.18.6.bb @@ -4,6 +4,8 @@ LICENSE = "GPL" PR = "r2" DEPENDS = "u-boot" +COMPATIBLE_MACHINE = "magicbox" + KERNEL_CCSUFFIX = "-3.4.4" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ diff --git a/packages/linux/linux-magicbox_2.6.19.2.bb b/packages/linux/linux-magicbox_2.6.19.2.bb index 50e05bd6a0..bbec2801b9 100644 --- a/packages/linux/linux-magicbox_2.6.19.2.bb +++ b/packages/linux/linux-magicbox_2.6.19.2.bb @@ -4,6 +4,8 @@ LICENSE = "GPL" PR = "r0" DEPENDS = "u-boot" +COMPATIBLE_MACHINE = "magicbox" + #KERNEL_CCSUFFIX = "-3.4.4" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ -- cgit v1.2.3 From 518527b6271e8f0adf22ba8a69984047ed238228 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Mon, 7 May 2007 21:58:16 +0000 Subject: packages/psplash: added psplash-zap package with initscript to quit psplash before going for login prompt on console image. --- packages/psplash/files/zzapsplash-init | 4 ++++ packages/psplash/psplash-zap_1.0.bb | 13 +++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 packages/psplash/files/zzapsplash-init create mode 100644 packages/psplash/psplash-zap_1.0.bb diff --git a/packages/psplash/files/zzapsplash-init b/packages/psplash/files/zzapsplash-init new file mode 100644 index 0000000000..5a713e5701 --- /dev/null +++ b/packages/psplash/files/zzapsplash-init @@ -0,0 +1,4 @@ +#!/bin/sh +TMPDIR=/mnt/.psplash psplash-write "QUIT" || true +sleep 1 +umount /mnt/.psplash >/dev/null 2>/dev/null diff --git a/packages/psplash/psplash-zap_1.0.bb b/packages/psplash/psplash-zap_1.0.bb new file mode 100644 index 0000000000..58fa3ed52b --- /dev/null +++ b/packages/psplash/psplash-zap_1.0.bb @@ -0,0 +1,13 @@ + +SRC_URI = "file://zzapsplash-init" + +do_install_prepend() { + install -d "${D}${sysconfdir}/init.d/" + install -m 0755 "${WORKDIR}/zzapsplash-init" "${D}${sysconfdir}/init.d/zzapsplash" +} + +inherit update-rc.d + +INITSCRIPT_NAME = "zzapsplash" +INITSCRIPT_PARAMS = "start 99 5 S ." + -- cgit v1.2.3 From 75d5df36b5cfd0f51ffbaa89ca997e9c45075ccd Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Tue, 8 May 2007 00:54:41 +0000 Subject: perl 5.8.8: Allow debian.bbclass to mess with perl-lib's naming. This will cause issues with upgrading from earlier 5.8.8 versions (perl-lib will remain instead of upgrading to libperl5) but it'll actually make upgrades from 5.8.7 work. I can't see how to fix the 5.8.8 upgrading easily. The renaming was disabled due to a mistake on my part. --- packages/perl/perl_5.8.8.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/perl/perl_5.8.8.bb b/packages/perl/perl_5.8.8.bb index 77ac5c96e2..51466f82e9 100644 --- a/packages/perl/perl_5.8.8.bb +++ b/packages/perl/perl_5.8.8.bb @@ -5,7 +5,7 @@ LICENSE = "Artistic|GPL" PRIORITY = "optional" # We need gnugrep (for -I) DEPENDS = "virtual/db perl-native grep-native" -PR = "r13" +PR = "r15" # Major part of version PVM = "5.8" @@ -164,7 +164,6 @@ FILES_${PN}-doc = "${datadir}/perl/${PV}/*/*.txt \ ${datadir}/perl/${PV}/unicore/mktables.lst \ ${datadir}/perl/${PV}/unicore/version" -DEBIAN_NOAUTONAME_perl-lib = "1" RPROVIDES_perl-lib = "perl-lib" # Create a perl-modules package recommending all the other perl -- cgit v1.2.3 From 8cab11d75ce64da1ba3ed5bafb976c9a304b9c1e Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Tue, 8 May 2007 00:56:32 +0000 Subject: perl/perl-native 5.8.8: Remove -DEFAULT_PREFERENCE = "-1" for version 5.8.8. Some distributions have already started to use this so it's probably about time to promote it to the default. --- packages/perl/perl-native_5.8.8.bb | 4 +--- packages/perl/perl_5.8.8.bb | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/perl/perl-native_5.8.8.bb b/packages/perl/perl-native_5.8.8.bb index 84311d3f59..c9d9b51771 100644 --- a/packages/perl/perl-native_5.8.8.bb +++ b/packages/perl/perl-native_5.8.8.bb @@ -3,12 +3,10 @@ HOMEPAGE = "http://www.perl.org/" SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "virtual/db-native gdbm-native" -PR = "r6" +PR = "r7" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}" -DEFAULT_PREFERENCE = "-1" - SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ file://perl-5.8.8-gcc-4.2.patch;patch=1 \ file://Configure-multilib.patch;patch=1 \ diff --git a/packages/perl/perl_5.8.8.bb b/packages/perl/perl_5.8.8.bb index 51466f82e9..c8e7afebc7 100644 --- a/packages/perl/perl_5.8.8.bb +++ b/packages/perl/perl_5.8.8.bb @@ -5,13 +5,11 @@ LICENSE = "Artistic|GPL" PRIORITY = "optional" # We need gnugrep (for -I) DEPENDS = "virtual/db perl-native grep-native" -PR = "r15" +PR = "r16" # Major part of version PVM = "5.8" -DEFAULT_PREFERENCE = "-1" - SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ file://Makefile.patch;patch=1 \ file://Makefile.SH.patch \ -- cgit v1.2.3 From 83afd0d6983be7ab795e66f49cb8a9e7e0d9faf6 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Tue, 8 May 2007 01:08:49 +0000 Subject: perl modules: Bump PR since the directories they install into have changed with the new version of perl. --- packages/perl/libalgorithm-diff-perl_1.1902.bb | 2 +- packages/perl/libarchive-tar-perl_1.30.bb | 2 +- packages/perl/libcache-cache-perl_1.05.bb | 2 +- packages/perl/libclass-container-perl_0.12.bb | 2 +- packages/perl/libclass-data-inheritable-perl_0.06.bb | 2 +- packages/perl/libcompress-zlib-perl_1.42.bb | 2 +- packages/perl/libdata-optlist-perl_0.101.bb | 2 +- packages/perl/libdevel-stacktrace-perl_1.13.bb | 2 +- packages/perl/libdigest-sha1-perl_2.11.bb | 2 +- packages/perl/liberror-perl_0.17004.bb | 2 +- packages/perl/libexception-class-perl_1.23.bb | 2 +- packages/perl/libextutils-cbuilder-perl_0.18.bb | 2 +- packages/perl/libextutils-parsexs-perl_2.16.bb | 2 +- packages/perl/libintl-perl_1.16.bb | 2 +- packages/perl/libio-zlib-perl_1.04.bb | 2 +- packages/perl/libipc-sharelite-perl_0.09.bb | 2 +- packages/perl/liblocale-gettext-perl_1.05.bb | 2 +- packages/perl/liblog-dispatch-perl_2.13.bb | 2 +- packages/perl/liblog-log4perl-perl_1.06.bb | 2 +- packages/perl/libmail-sendmail-perl_0.79.bb | 2 +- packages/perl/libmath-bigint-gmp-perl_1.18.bb | 2 +- packages/perl/libmodule-build-perl_0.2805.bb | 2 +- packages/perl/libnet-ip-perl_1.25.bb | 2 +- packages/perl/libnetserver-generic-perl_1.03.bb | 2 +- packages/perl/libparams-util-perl_0.20.bb | 2 +- packages/perl/libparams-validate-perl_0.86.bb | 2 +- packages/perl/libperl6-junction-perl_1.10.bb | 2 +- packages/perl/libsub-exporter-perl_0.970.bb | 2 +- packages/perl/libsub-install-perl_0.922.bb | 2 +- packages/perl/libsub-uplevel-perl_0.13.bb | 2 +- packages/perl/libtest-builder-tester-perl_1.01.bb | 2 +- packages/perl/libtest-differences-perl_0.47.bb | 2 +- packages/perl/libtest-exception-perl_0.22.bb | 2 +- packages/perl/libtest-mockmodule-perl_0.05.bb | 2 +- packages/perl/libtest-output-perl_0.10.bb | 2 +- packages/perl/libtext-diff-perl_0.35.bb | 2 +- packages/perl/libversion-perl_0.6701.bb | 2 +- packages/perl/libxml-parser-perl_2.34.bb | 2 +- packages/perl/libyaml-perl_0.62.bb | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/packages/perl/libalgorithm-diff-perl_1.1902.bb b/packages/perl/libalgorithm-diff-perl_1.1902.bb index bd5c12f08c..947b1a1191 100644 --- a/packages/perl/libalgorithm-diff-perl_1.1902.bb +++ b/packages/perl/libalgorithm-diff-perl_1.1902.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" RDEPENDS += "perl-module-exporter perl-module-strict perl-module-vars \ perl-module-strict perl-module-vars" -PR = "r1" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TY/TYEMQ/Algorithm-Diff-${PV}.tar.gz" diff --git a/packages/perl/libarchive-tar-perl_1.30.bb b/packages/perl/libarchive-tar-perl_1.30.bb index 978879be2c..1c7a1d88c9 100644 --- a/packages/perl/libarchive-tar-perl_1.30.bb +++ b/packages/perl/libarchive-tar-perl_1.30.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS += "libio-zlib-perl-native" RDEPENDS += "libio-zlib-perl" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KA/KANE/Archive-Tar-${PV}.tar.gz" diff --git a/packages/perl/libcache-cache-perl_1.05.bb b/packages/perl/libcache-cache-perl_1.05.bb index d33edc595e..2a810b7815 100644 --- a/packages/perl/libcache-cache-perl_1.05.bb +++ b/packages/perl/libcache-cache-perl_1.05.bb @@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL" DEPENDS = "libdigest-sha1-perl-native liberror-perl-native \ libipc-sharelite-perl-native" RDEPENDS = "libdigest-sha1-perl liberror-perl libipc-sharelite-perl" -PR = "r4" +PR = "r5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DC/DCLINTON/Cache-Cache-${PV}.tar.gz" diff --git a/packages/perl/libclass-container-perl_0.12.bb b/packages/perl/libclass-container-perl_0.12.bb index 5bb8968225..7122d83601 100644 --- a/packages/perl/libclass-container-perl_0.12.bb +++ b/packages/perl/libclass-container-perl_0.12.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "libparams-validate-perl-native" RDEPENDS = "libparams-validate-perl" -PR = "r4" +PR = "r5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Class-Container-${PV}.tar.gz" diff --git a/packages/perl/libclass-data-inheritable-perl_0.06.bb b/packages/perl/libclass-data-inheritable-perl_0.06.bb index a1f666ad7e..837968f93a 100644 --- a/packages/perl/libclass-data-inheritable-perl_0.06.bb +++ b/packages/perl/libclass-data-inheritable-perl_0.06.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Class::Data::Inheritable - Inheritable, overridable class data" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r4" +PR = "r5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-Data-Inheritable-${PV}.tar.gz" diff --git a/packages/perl/libcompress-zlib-perl_1.42.bb b/packages/perl/libcompress-zlib-perl_1.42.bb index 2fa12f9cd6..f30692f576 100644 --- a/packages/perl/libcompress-zlib-perl_1.42.bb +++ b/packages/perl/libcompress-zlib-perl_1.42.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Compress::Zlib - Interface to zlib compression library" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r6" +PR = "r7" SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-${PV}.tar.gz" diff --git a/packages/perl/libdata-optlist-perl_0.101.bb b/packages/perl/libdata-optlist-perl_0.101.bb index 3b7652d165..2b3cc2a979 100644 --- a/packages/perl/libdata-optlist-perl_0.101.bb +++ b/packages/perl/libdata-optlist-perl_0.101.bb @@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL" DEPENDS += "libsub-install-perl-native libparams-util-perl-native" RDEPENDS += "perl-module-list-util libparams-util-perl perl-module-strict \ libsub-install-perl perl-module-warnings " -PR = "r1" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Data-OptList-${PV}.tar.gz" diff --git a/packages/perl/libdevel-stacktrace-perl_1.13.bb b/packages/perl/libdevel-stacktrace-perl_1.13.bb index e4c5158d67..e5e3dcaada 100644 --- a/packages/perl/libdevel-stacktrace-perl_1.13.bb +++ b/packages/perl/libdevel-stacktrace-perl_1.13.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Devel::StackTrace - Stack trace and stack trace frame objects" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r4" +PR = "r5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Devel-StackTrace-${PV}.tar.gz" diff --git a/packages/perl/libdigest-sha1-perl_2.11.bb b/packages/perl/libdigest-sha1-perl_2.11.bb index 67bb6830fa..fa9f2bcbcc 100644 --- a/packages/perl/libdigest-sha1-perl_2.11.bb +++ b/packages/perl/libdigest-sha1-perl_2.11.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Digest::SHA1 - Perl interface to the SHA-1 algorithm" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r10" +PR = "r11" SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-${PV}.tar.gz" diff --git a/packages/perl/liberror-perl_0.17004.bb b/packages/perl/liberror-perl_0.17004.bb index 7647c630ed..a2ba120148 100644 --- a/packages/perl/liberror-perl_0.17004.bb +++ b/packages/perl/liberror-perl_0.17004.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Error - Error/exception handling in an OO-ish way" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r5" +PR = "r6" SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/Error-${PV}.tar.gz" diff --git a/packages/perl/libexception-class-perl_1.23.bb b/packages/perl/libexception-class-perl_1.23.bb index 8acfec6ee9..62df7e58c6 100644 --- a/packages/perl/libexception-class-perl_1.23.bb +++ b/packages/perl/libexception-class-perl_1.23.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "libclass-data-inheritable-perl-native libdevel-stacktrace-perl-native" RDEPENDS = "libclass-data-inheritable-perl libdevel-stacktrace-perl" -PR = "r5" +PR = "r6" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Exception-Class-${PV}.tar.gz" diff --git a/packages/perl/libextutils-cbuilder-perl_0.18.bb b/packages/perl/libextutils-cbuilder-perl_0.18.bb index 7e92155177..d446c9934a 100644 --- a/packages/perl/libextutils-cbuilder-perl_0.18.bb +++ b/packages/perl/libextutils-cbuilder-perl_0.18.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ExtUtils::CBuilder - Compile and link C code for Perl modules" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-${PV}.tar.gz" diff --git a/packages/perl/libextutils-parsexs-perl_2.16.bb b/packages/perl/libextutils-parsexs-perl_2.16.bb index 070ce931b2..bf18dadd38 100644 --- a/packages/perl/libextutils-parsexs-perl_2.16.bb +++ b/packages/perl/libextutils-parsexs-perl_2.16.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ExtUtils::ParseXS - converts Perl XS code into C code" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-${PV}.tar.gz" diff --git a/packages/perl/libintl-perl_1.16.bb b/packages/perl/libintl-perl_1.16.bb index 3cb0a9d796..e987934c65 100644 --- a/packages/perl/libintl-perl_1.16.bb +++ b/packages/perl/libintl-perl_1.16.bb @@ -3,7 +3,7 @@ LICENSE = "Artistic|GPL" RDEPENDS = "perl-module-vars perl-module-locale perl-module-io-handle \ perl-module-symbol perl-module-selectsaver perl-module-io \ perl-module-integer perl-module-exporter-heavy" -PR = "r1" +PR = "r2" SRC_URI = "http://www.cpan.org/authors/id/G/GU/GUIDO/libintl-perl-${PV}.tar.gz" diff --git a/packages/perl/libio-zlib-perl_1.04.bb b/packages/perl/libio-zlib-perl_1.04.bb index 15a71edee8..1c99166e16 100644 --- a/packages/perl/libio-zlib-perl_1.04.bb +++ b/packages/perl/libio-zlib-perl_1.04.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "libcompress-zlib-perl-native" RDEPENDS += "libcompress-zlib-perl" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TO/TOMHUGHES/IO-Zlib-${PV}.tar.gz" diff --git a/packages/perl/libipc-sharelite-perl_0.09.bb b/packages/perl/libipc-sharelite-perl_0.09.bb index 65657ee4ae..d56f0a99d4 100644 --- a/packages/perl/libipc-sharelite-perl_0.09.bb +++ b/packages/perl/libipc-sharelite-perl_0.09.bb @@ -1,7 +1,7 @@ DESCRIPTION = "IPC::ShareLite - Light-weight interface to shared memory" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r10" +PR = "r11" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MAURICE/IPC-ShareLite-${PV}.tar.gz" diff --git a/packages/perl/liblocale-gettext-perl_1.05.bb b/packages/perl/liblocale-gettext-perl_1.05.bb index 1fb6ff5af3..f9490c0c41 100644 --- a/packages/perl/liblocale-gettext-perl_1.05.bb +++ b/packages/perl/liblocale-gettext-perl_1.05.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Locale::gettext - message handling functions" SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "virtual/libintl" -PR = "r6" +PR = "r7" SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-${PV}.tar.gz" diff --git a/packages/perl/liblog-dispatch-perl_2.13.bb b/packages/perl/liblog-dispatch-perl_2.13.bb index d44aea9329..85fdf7e616 100644 --- a/packages/perl/liblog-dispatch-perl_2.13.bb +++ b/packages/perl/liblog-dispatch-perl_2.13.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Log::Dispatch - Dispatches messages to one or more outputs" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Log-Dispatch-${PV}.tar.gz" diff --git a/packages/perl/liblog-log4perl-perl_1.06.bb b/packages/perl/liblog-log4perl-perl_1.06.bb index 49cd33fcd7..16ec9f57f9 100644 --- a/packages/perl/liblog-log4perl-perl_1.06.bb +++ b/packages/perl/liblog-log4perl-perl_1.06.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Log::Log4perl - Log4j implementation for Perl" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MS/MSCHILLI/Log-Log4perl-${PV}.tar.gz" diff --git a/packages/perl/libmail-sendmail-perl_0.79.bb b/packages/perl/libmail-sendmail-perl_0.79.bb index 2b933dd331..1ed84fd150 100644 --- a/packages/perl/libmail-sendmail-perl_0.79.bb +++ b/packages/perl/libmail-sendmail-perl_0.79.bb @@ -1,6 +1,6 @@ SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://www.cpan.org/modules/by-module/Mail/Mail-Sendmail-${PV}.tar.gz" diff --git a/packages/perl/libmath-bigint-gmp-perl_1.18.bb b/packages/perl/libmath-bigint-gmp-perl_1.18.bb index eed99e1284..3eb24eda10 100644 --- a/packages/perl/libmath-bigint-gmp-perl_1.18.bb +++ b/packages/perl/libmath-bigint-gmp-perl_1.18.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS += "gmp-native" RDEPENDS += "gmp" -PR = "r4" +PR = "r5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TE/TELS/math/Math-BigInt-GMP-${PV}.tar.gz" diff --git a/packages/perl/libmodule-build-perl_0.2805.bb b/packages/perl/libmodule-build-perl_0.2805.bb index 2c6a772bca..ae7ac7e973 100644 --- a/packages/perl/libmodule-build-perl_0.2805.bb +++ b/packages/perl/libmodule-build-perl_0.2805.bb @@ -8,7 +8,7 @@ DEPENDS = "libyaml-perl-native libversion-perl-native \ libarchive-tar-perl-native" RDEPENDS = "libyaml-perl libversion-perl libextutils-cbuilder-perl \ libextutils-parsexs-perl libarchive-tar-perl" -PR = "r3" +PR = "r4" S = "${WORKDIR}/Module-Build-${PV}" diff --git a/packages/perl/libnet-ip-perl_1.25.bb b/packages/perl/libnet-ip-perl_1.25.bb index e25aaad290..f51cc18fc7 100644 --- a/packages/perl/libnet-ip-perl_1.25.bb +++ b/packages/perl/libnet-ip-perl_1.25.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS += "libio-zlib-perl-native" RDEPENDS += "libio-zlib-perl perl-module-math-bigint" -PR = "r3" +PR = "r4" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MANU/Net-IP-${PV}.tar.gz" diff --git a/packages/perl/libnetserver-generic-perl_1.03.bb b/packages/perl/libnetserver-generic-perl_1.03.bb index 1cd2e7634e..5b0ecb1800 100644 --- a/packages/perl/libnetserver-generic-perl_1.03.bb +++ b/packages/perl/libnetserver-generic-perl_1.03.bb @@ -1,6 +1,6 @@ SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://www.cpan.org/modules/by-module/NetServer/NetServer-Generic-${PV}.tar.gz" diff --git a/packages/perl/libparams-util-perl_0.20.bb b/packages/perl/libparams-util-perl_0.20.bb index cff204fd3a..b6d1feabaf 100644 --- a/packages/perl/libparams-util-perl_0.20.bb +++ b/packages/perl/libparams-util-perl_0.20.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" RDEPENDS += "perl-module-exporter perl-module-overload \ perl-module-scalar-util perl-module-strict perl-module-vars" -PR = "r1" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-${PV}.tar.gz" diff --git a/packages/perl/libparams-validate-perl_0.86.bb b/packages/perl/libparams-validate-perl_0.86.bb index bc42b47a33..f3a11d2d60 100644 --- a/packages/perl/libparams-validate-perl_0.86.bb +++ b/packages/perl/libparams-validate-perl_0.86.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Params::Validate - Validate method/function parameters" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r10" +PR = "r11" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-${PV}.tar.gz" diff --git a/packages/perl/libperl6-junction-perl_1.10.bb b/packages/perl/libperl6-junction-perl_1.10.bb index fc953707f1..81840b0b11 100644 --- a/packages/perl/libperl6-junction-perl_1.10.bb +++ b/packages/perl/libperl6-junction-perl_1.10.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Perl6::Junction - Perl6 style Junction operators in Perl5." SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r1" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/Perl6-Junction-${PV}.tar.gz" diff --git a/packages/perl/libsub-exporter-perl_0.970.bb b/packages/perl/libsub-exporter-perl_0.970.bb index e44a4a4ef7..b6ac2b17ee 100644 --- a/packages/perl/libsub-exporter-perl_0.970.bb +++ b/packages/perl/libsub-exporter-perl_0.970.bb @@ -5,7 +5,7 @@ DEPENDS += "libdata-optlist-perl-native libsub-install-perl-native \ libparams-util-perl-native" RDEPENDS += "perl-module-carp libdata-optlist-perl libparams-util-perl \ perl-module-strict libsub-install-perl perl-module-warnings" -PR = "r1" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Sub-Exporter-${PV}.tar.gz" diff --git a/packages/perl/libsub-install-perl_0.922.bb b/packages/perl/libsub-install-perl_0.922.bb index b1ff7b1fa0..119094bf95 100644 --- a/packages/perl/libsub-install-perl_0.922.bb +++ b/packages/perl/libsub-install-perl_0.922.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" RDEPENDS += "perl-module-carp perl-module-scalar-util perl-module-strict \ perl-module-warnings" -PR = "r1" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Sub-Install-${PV}.tar.gz" diff --git a/packages/perl/libsub-uplevel-perl_0.13.bb b/packages/perl/libsub-uplevel-perl_0.13.bb index 9243fada20..38d3fcd593 100644 --- a/packages/perl/libsub-uplevel-perl_0.13.bb +++ b/packages/perl/libsub-uplevel-perl_0.13.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Sub::Uplevel - apparently run a function in a higher stack frame" SECTION = "libs" LICENSE = "Artistic|GPL" RDEPENDS += "perl-module-exporter perl-module-strict perl-module-vars" -PR = "r1" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-${PV}.tar.gz" diff --git a/packages/perl/libtest-builder-tester-perl_1.01.bb b/packages/perl/libtest-builder-tester-perl_1.01.bb index b40da5b7b4..1fd884cfff 100644 --- a/packages/perl/libtest-builder-tester-perl_1.01.bb +++ b/packages/perl/libtest-builder-tester-perl_1.01.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" RDEPENDS += "perl-module-strict perl-module-carp perl-module-exporter \ perl-module-symbol perl-module-vars" -PR = "r1" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MARKF/Test-Builder-Tester-${PV}.tar.gz" diff --git a/packages/perl/libtest-differences-perl_0.47.bb b/packages/perl/libtest-differences-perl_0.47.bb index c1457ab015..a66a39182e 100644 --- a/packages/perl/libtest-differences-perl_0.47.bb +++ b/packages/perl/libtest-differences-perl_0.47.bb @@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL" DEPENDS += "libtext-diff-perl-native" RDEPENDS += "perl-module-carp perl-module-constant perl-module-exporter \ perl-module-strict libtext-diff-perl" -PR = "r1" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RB/RBS/Test-Differences-${PV}.tar.gz" diff --git a/packages/perl/libtest-exception-perl_0.22.bb b/packages/perl/libtest-exception-perl_0.22.bb index 10298d689c..b095ea3e4a 100644 --- a/packages/perl/libtest-exception-perl_0.22.bb +++ b/packages/perl/libtest-exception-perl_0.22.bb @@ -5,7 +5,7 @@ DEPENDS += "libsub-uplevel-perl-native" RDEPENDS += "perl-module-base perl-module-carp perl-module-strict \ libsub-uplevel-perl perl-module-test-builder \ perl-module-warnings" -PR = "r1" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/A/AD/ADIE/Test-Exception-${PV}.tar.gz" diff --git a/packages/perl/libtest-mockmodule-perl_0.05.bb b/packages/perl/libtest-mockmodule-perl_0.05.bb index 15c1fcc787..e30a81cb18 100644 --- a/packages/perl/libtest-mockmodule-perl_0.05.bb +++ b/packages/perl/libtest-mockmodule-perl_0.05.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" RDEPENDS += "perl-module-carp perl-module-scalar-util perl-module-strict \ perl-module-vars " -PR = "r1" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SI/SIMONFLK/Test-MockModule-${PV}.tar.gz" diff --git a/packages/perl/libtest-output-perl_0.10.bb b/packages/perl/libtest-output-perl_0.10.bb index 990dd51e3e..fb5bebdefe 100644 --- a/packages/perl/libtest-output-perl_0.10.bb +++ b/packages/perl/libtest-output-perl_0.10.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS += "libsub-exporter-perl-native" RDEPENDS += "libsub-exporter-perl" -PR = "r1" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SS/SSORICHE/Test-Output-${PV}.tar.gz" diff --git a/packages/perl/libtext-diff-perl_0.35.bb b/packages/perl/libtext-diff-perl_0.35.bb index 69568c6fe4..126d091d8e 100644 --- a/packages/perl/libtext-diff-perl_0.35.bb +++ b/packages/perl/libtext-diff-perl_0.35.bb @@ -5,7 +5,7 @@ DEPENDS += "libalgorithm-diff-perl-native" RDEPENDS += "libalgorithm-diff-perl perl-module-carp perl-module-constant \ perl-module-exporter perl-module-strict perl-module-carp \ perl-module-strict " -PR = "r1" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RB/RBS/Text-Diff-${PV}.tar.gz" diff --git a/packages/perl/libversion-perl_0.6701.bb b/packages/perl/libversion-perl_0.6701.bb index a4de6715e8..1081d98135 100644 --- a/packages/perl/libversion-perl_0.6701.bb +++ b/packages/perl/libversion-perl_0.6701.bb @@ -1,7 +1,7 @@ DESCRIPTION = "version - Perl extension for Version Objects" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r5" +PR = "r6" SRC_URI = "http://search.cpan.org/CPAN/authors/id/J/JP/JPEACOCK/version-${PV}.tar.gz" diff --git a/packages/perl/libxml-parser-perl_2.34.bb b/packages/perl/libxml-parser-perl_2.34.bb index f088c26784..b1676bb2fd 100644 --- a/packages/perl/libxml-parser-perl_2.34.bb +++ b/packages/perl/libxml-parser-perl_2.34.bb @@ -1,7 +1,7 @@ SECTION = "libs" LICENSE = "Artistic" DEPENDS += "expat-native" -PR = "r6" +PR = "r7" SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz" diff --git a/packages/perl/libyaml-perl_0.62.bb b/packages/perl/libyaml-perl_0.62.bb index ab4d58e841..f8b75b10b7 100644 --- a/packages/perl/libyaml-perl_0.62.bb +++ b/packages/perl/libyaml-perl_0.62.bb @@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL" DEPENDS = "libdigest-sha1-perl-native liberror-perl-native \ libipc-sharelite-perl-native" RDEPENDS = "libdigest-sha1-perl liberror-perl libipc-sharelite-perl" -PR = "r2" +PR = "r3" SRC_URI = "http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-${PV}.tar.gz" -- cgit v1.2.3 From 77448d4e55644b22eac8cb853ee2dcd85cb3e5c9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 8 May 2007 06:34:16 +0000 Subject: angstrom-console-image: add psplash-zap to kill the bootsplash after booting --- packages/angstrom/angstrom-console-image.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/angstrom/angstrom-console-image.bb b/packages/angstrom/angstrom-console-image.bb index e5a6dcc2a3..8f37c9d71c 100644 --- a/packages/angstrom/angstrom-console-image.bb +++ b/packages/angstrom/angstrom-console-image.bb @@ -1,12 +1,13 @@ #Angstrom bootstrap image LICENSE = "MIT" -PR = "r4" +PR = "r5" ANGSTROM_EXTRA_INSTALL ?= "" -DEPENDS = "task-base" +DEPENDS = "task-base psplash-zap" RDEPENDS = "task-base \ ${ANGSTROM_EXTRA_INSTALL} \ + psplash-zap " export IMAGE_BASENAME = "console-image" -- cgit v1.2.3 From f48c311273ddb1bc2d7e3335e114751f84d230de Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 8 May 2007 06:40:19 +0000 Subject: angstrom-console-image: make it parse --- packages/angstrom/angstrom-console-image.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/angstrom/angstrom-console-image.bb b/packages/angstrom/angstrom-console-image.bb index 8f37c9d71c..5368b0deaa 100644 --- a/packages/angstrom/angstrom-console-image.bb +++ b/packages/angstrom/angstrom-console-image.bb @@ -7,7 +7,7 @@ ANGSTROM_EXTRA_INSTALL ?= "" DEPENDS = "task-base psplash-zap" RDEPENDS = "task-base \ ${ANGSTROM_EXTRA_INSTALL} \ - psplash-zap + psplash-zap \ " export IMAGE_BASENAME = "console-image" -- cgit v1.2.3 From 4e3a92fe8455a3d05eeaf9f725eca8448e5c68d6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 8 May 2007 07:54:39 +0000 Subject: angstrom: stop locking down gstreamer versions --- conf/distro/angstrom-2007.1.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index be2a5b88bf..b97a1332e4 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -247,8 +247,6 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_VERSION_dbus ?= "1.0.2" PREFERRED_VERSION_dbus-glib ?= "0.72" -PREFERRED_VERSION_gstreamer ?= "0.10.11" - PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" -- cgit v1.2.3 From 4349522d76edb8429e89139175a3f70ee563db25 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 8 May 2007 08:24:12 +0000 Subject: libgemwidget: make it work with a recent gtk. * NOTE: see the remark in the recipe about the condionality of the patch --- packages/gpephone/libgemwidget/.mtn2git_empty | 0 .../gpephone/libgemwidget/gemfilechooser-NULL-callback.patch | 12 ++++++++++++ packages/gpephone/libgemwidget_0.1.bb | 4 ++++ 3 files changed, 16 insertions(+) create mode 100644 packages/gpephone/libgemwidget/.mtn2git_empty create mode 100644 packages/gpephone/libgemwidget/gemfilechooser-NULL-callback.patch diff --git a/packages/gpephone/libgemwidget/.mtn2git_empty b/packages/gpephone/libgemwidget/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpephone/libgemwidget/gemfilechooser-NULL-callback.patch b/packages/gpephone/libgemwidget/gemfilechooser-NULL-callback.patch new file mode 100644 index 0000000000..8b5b372ff6 --- /dev/null +++ b/packages/gpephone/libgemwidget/gemfilechooser-NULL-callback.patch @@ -0,0 +1,12 @@ +--- /tmp/gemfilechooser.c 2007-05-08 10:05:21.000000000 +0200 ++++ libgemwidget-0.1/src/gemfilechooser.c 2007-05-08 10:13:59.015251000 +0200 +@@ -640,7 +640,8 @@ + folder = gtk_file_system_get_folder(filechooser->file_system, + path, + GTK_FILE_INFO_ALL, +- &error); ++ NULL, ++ &error); + if (folder == NULL) + { + g_print("%s(): get folder error: %s\n", diff --git a/packages/gpephone/libgemwidget_0.1.bb b/packages/gpephone/libgemwidget_0.1.bb index 0cce92532f..0b670e485d 100644 --- a/packages/gpephone/libgemwidget_0.1.bb +++ b/packages/gpephone/libgemwidget_0.1.bb @@ -8,6 +8,10 @@ PR = "r1" GPE_TARBALL_SUFFIX = "bz2" inherit gpephone pkgconfig autotools +# This really is not angstrom specific, but gtk 2.10 specific +# for a better solution: "patches accepted" +SRC_URI_append_angstrom = " file://gemfilechooser-NULL-callback.patch;patch=1" + do_stage () { autotools_stage_all } -- cgit v1.2.3 From a4117112fc97e5259d333da6d0dde88007540fa2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 8 May 2007 09:06:22 +0000 Subject: libvocenabler: fix cross-compile badness with linphone --- packages/gpephone/libvocenabler_0.1.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/gpephone/libvocenabler_0.1.bb b/packages/gpephone/libvocenabler_0.1.bb index 0b2d23747c..1dfa5068d0 100644 --- a/packages/gpephone/libvocenabler_0.1.bb +++ b/packages/gpephone/libvocenabler_0.1.bb @@ -9,6 +9,12 @@ GPE_TARBALL_SUFFIX = "gz" inherit gpephone pkgconfig autotools +do_compile_prepend() { + for i in `find . -name "Makefile"` ; do + sed -i -e s:I/usr/include:I${STAGING_INCDIR}:g $i + done +} + do_stage () { autotools_stage_all } -- cgit v1.2.3 From 2ebf00886dba29ae2182ac6130c461c5c9392b40 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 8 May 2007 10:36:24 +0000 Subject: 0xFFFF: add native and cross versions of the GPL flasher for nokia internet tablets --- packages/0xFFFF/.mtn2git_empty | 0 packages/0xFFFF/0xffff-native_0.1.bb | 17 +++++++++++++++++ packages/0xFFFF/0xffff.inc | 14 ++++++++++++++ packages/0xFFFF/0xffff_0.1.bb | 6 ++++++ 4 files changed, 37 insertions(+) create mode 100644 packages/0xFFFF/.mtn2git_empty create mode 100644 packages/0xFFFF/0xffff-native_0.1.bb create mode 100644 packages/0xFFFF/0xffff.inc create mode 100644 packages/0xFFFF/0xffff_0.1.bb diff --git a/packages/0xFFFF/.mtn2git_empty b/packages/0xFFFF/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/0xFFFF/0xffff-native_0.1.bb b/packages/0xFFFF/0xffff-native_0.1.bb new file mode 100644 index 0000000000..b709977179 --- /dev/null +++ b/packages/0xFFFF/0xffff-native_0.1.bb @@ -0,0 +1,17 @@ +require 0xffff.inc + +inherit native + +do_stage() { + install -m 755 0xFFFF ${STAGING_BINDIR_NATIVE} +} + +do_deploy[dirs] = "${S}" + +do_deploy() { + install -m 755 0xFFFF ${DEPLOY_DIR_IMAGE} +} + +addtask deploy before do_package after do_install + + diff --git a/packages/0xFFFF/0xffff.inc b/packages/0xFFFF/0xffff.inc new file mode 100644 index 0000000000..2618a3b6bc --- /dev/null +++ b/packages/0xFFFF/0xffff.inc @@ -0,0 +1,14 @@ +DESCRIPTION = "The 'Open Free Fiasco Firmware Flasher' aka 0xFFFF utility aims to implement a free (GPL'd) userspace handler for the NOLO bootloader." +LICENSE = "GPLv2" + +SRC_URI = "http://www.nopcode.org/0xFFFF/get/0xFFFF-${PV}.tar.gz" + +S = "${WORKDIR}/0xFFFF-${PV}/src" + +CFLAGS += '-DVERSION="${PV}"' +BUILD_CFLAGS += '-DVERSION="${PV}"' + +do_compile() { + oe_runmake +} + diff --git a/packages/0xFFFF/0xffff_0.1.bb b/packages/0xFFFF/0xffff_0.1.bb new file mode 100644 index 0000000000..fb3b93d415 --- /dev/null +++ b/packages/0xFFFF/0xffff_0.1.bb @@ -0,0 +1,6 @@ +require 0xffff.inc + +do_install() { + install -d ${D}${bindir} + install -m 755 0xFFFF ${D}${bindir} +} -- cgit v1.2.3 From 0aa9625dcc4f6d36a72208689da9b89460645d11 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 8 May 2007 10:40:10 +0000 Subject: nokia tablets: build open source flasher for images --- conf/machine/nokia770.conf | 4 ++++ conf/machine/nokia800.conf | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 2b66d6c921..070cdcdd05 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -32,3 +32,7 @@ ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost screen" MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init" + +# build tools +EXTRA_IMAGEDEPENDS += "0xffff-native" + diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf index fd1486e752..e31438819e 100644 --- a/conf/machine/nokia800.conf +++ b/conf/machine/nokia800.conf @@ -9,6 +9,7 @@ XSERVER = "xserver-kdrive-xomap" GUI_MACHINE_CLASS = "bigscreen" +TARGET_FPU = "hard" include conf/machine/include/tune-arm1136jf-s.conf ROOT_FLASH_SIZE = "174" @@ -25,3 +26,6 @@ ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost" MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init" + +# build tools +EXTRA_IMAGEDEPENDS += "0xffff-native" -- cgit v1.2.3 From 397955bf9ffc367df8f979d1e441e3f405bed2ee Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Tue, 8 May 2007 15:43:09 +0000 Subject: base-files: only set TERM in profile if it's not set to allow more or less comfortable ssh. Closes #805 --- packages/base-files/base-files/profile | 4 ++-- packages/base-files/base-files_3.0.14.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/base-files/base-files/profile b/packages/base-files/base-files/profile index a4c16944b9..3dc22f316a 100644 --- a/packages/base-files/base-files/profile +++ b/packages/base-files/base-files/profile @@ -2,8 +2,8 @@ # and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). PATH="/usr/local/bin:/usr/bin:/bin" -EDITOR="/bin/vi" # needed for packages like cron -TERM="vt100" # Basic terminal capab. For screen etc. +EDITOR="/bin/vi" # needed for packages like cron +test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. if [ ! -e /etc/localtime ]; then TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 393e0e3ec2..1e80f4c7f3 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r64" +PR = "r65" LICENSE = "GPL" SRC_URI = " \ -- cgit v1.2.3 From cfc067b7935b039556c6867710889ca726d8e908 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Tue, 8 May 2007 15:48:50 +0000 Subject: git: minor fixes to make git work on the device. Closes #2226 and #2240 - Adjust path to templates directory to fix `git init-db` - Make it depend on cpio and findutils as at least local `git clone` relies on them. --- packages/git/git_1.4.4.2.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/git/git_1.4.4.2.bb b/packages/git/git_1.4.4.2.bb index 37f71cfb04..5a22f040f3 100644 --- a/packages/git/git_1.4.4.2.bb +++ b/packages/git/git_1.4.4.2.bb @@ -1,3 +1,11 @@ require git.inc DEPENDS = "openssl curl" -RDEPENDS = "perl perl-module-file-path" +RDEPENDS = "perl perl-module-file-path cpio findutils" + +PR="r1" + +do_install() { + oe_runmake install DESTDIR="${D}" bindir="${bindir}" \ + template_dir="${datadir}/git-core/templates" \ + GIT_PYTHON_DIR="${datadir}/git-core/python" +} -- cgit v1.2.3 From 12e67884da766a69ee3b46f908da105a1c92187a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 8 May 2007 17:17:40 +0000 Subject: pidgin: add first stab at a 2.0.0 recipes Known defects: ls image/usr/lib/purple-2/ libjabber.so libjabber.so.0 libjabber.so.0.0.0 liboscar.so liboscar.so.0 liboscar.so.0.0.0 log_reader.so The jabber and oscor protocol don't get packaged because do_split_packages doesn't do symlinks. Since I don't know whether pidgin scans for *.so or lib* on startup I haven't packaged these. Improvements welcome --- packages/gaim/pidgin.inc | 74 ++++++++++++++++++++++++ packages/gaim/pidgin/.mtn2git_empty | 0 packages/gaim/pidgin/gconf-no-errors.patch | 12 ++++ packages/gaim/pidgin/sanitize-configure.ac.patch | 33 +++++++++++ packages/gaim/pidgin_2.0.0.bb | 8 +++ 5 files changed, 127 insertions(+) create mode 100644 packages/gaim/pidgin.inc create mode 100644 packages/gaim/pidgin/.mtn2git_empty create mode 100644 packages/gaim/pidgin/gconf-no-errors.patch create mode 100644 packages/gaim/pidgin/sanitize-configure.ac.patch create mode 100644 packages/gaim/pidgin_2.0.0.bb diff --git a/packages/gaim/pidgin.inc b/packages/gaim/pidgin.inc new file mode 100644 index 0000000000..797be7a6f2 --- /dev/null +++ b/packages/gaim/pidgin.inc @@ -0,0 +1,74 @@ +SECTION = "x11/network" +DESCRIPTION = "multi-protocol instant messaging client" +LICENSE = "GPL" + +DEPENDS = "gtk+ ncurses gnutls virtual/libintl gstreamer dbus" +RRECOMMENDS_${PN} = "pidgin-protocol-irc pidgin-protocol-jabber pidgin-plugin-docklet" + +EXTRA_OECONF = " \ + --disable-audio \ + --disable-perl \ + --disable-tcl \ + --disable-deprecated \ + --disable-gevolution \ + --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-gnutls=yes \ + --with-ncurses-headers=${STAGING_INCDIR} \ + --with-gnutls-includes=${STAGING_INCDIR} \ + --with-gnutls-libs=${STAGING_LIBDIR} \ + " + +PACKAGES =+ "libpurple libpurple-dev libpurple-dbg finch finch-dev finch-dbg" + + +LEAD_SONAME = "libpurple.so.0" +FILES_libpurple = "${libdir}/libpurple*.so.*" +FILES_libpurple-dev = "${libdir}/libpurple* \ + ${libdir}/purple-2/*.la " +FILES_libpurple-dbg = "${libdir}/.debug/libpurple* \ + ${libdir}/purple-2/.debug" +FILES_finch = "${bindir}/finch" +FILES_finch-dev = "${libdir}/finch/*.la" +FILES_finch-dbg = "${bindir}/.debug/finch \ + ${libdir}/finch/.debug" + +FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ + ${sysconfdir} ${sharedstatedir} ${localstatedir} \ + /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/*.so \ + ${datadir}/pixmaps ${datadir}/applications \ + ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ + ${libdir}/bonobo/servers ${datadir}/icons" +FILES_${PN}-dev += "${libdir}/pidgin/*.la" + +inherit autotools gettext pkgconfig gconf + +PACKAGES_DYNAMIC = "libpurple-protocol-* libpurple-plugin-* pidgin-plugin-* finch-plugin-*" + +python populate_packages_prepend () { + root = bb.data.expand('${libdir}/pidgin', d) + purple = bb.data.expand('${libdir}/purple-2', d) + finch = bb.data.expand('${libdir}/finch', d) + + do_split_packages(d, root, '^([^l][^i][^b].*)\.so$', + output_pattern='pidgin-plugin-%s', + description='Pidgin plugin %s', + prepend=True) + + do_split_packages(d, purple, '^lib(.*)\.so$', + output_pattern='libpurple-protocol-%s', + description='Libpurple protocol plugin for %s', + prepend=True) + + do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$', + output_pattern='libpurple-plugin-%s', + description='libpurple plugin %s', + prepend=True) + + do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$', + output_pattern='finch-plugin-%s', + description='Finch plugin %s', + prepend=True) + + +} diff --git a/packages/gaim/pidgin/.mtn2git_empty b/packages/gaim/pidgin/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gaim/pidgin/gconf-no-errors.patch b/packages/gaim/pidgin/gconf-no-errors.patch new file mode 100644 index 0000000000..9a95175ac9 --- /dev/null +++ b/packages/gaim/pidgin/gconf-no-errors.patch @@ -0,0 +1,12 @@ +--- /tmp/Makefile.am 2007-05-08 18:39:49.000000000 +0200 ++++ pidgin-2.0.0/libpurple/gconf/Makefile.am 2007-05-08 18:40:13.755251000 +0200 +@@ -8,8 +8,7 @@ + + if GCONF_SCHEMAS_INSTALL + install-data-local: +- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \ +- grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2 ++ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 + else + install-data-local: + endif diff --git a/packages/gaim/pidgin/sanitize-configure.ac.patch b/packages/gaim/pidgin/sanitize-configure.ac.patch new file mode 100644 index 0000000000..a77d64f40b --- /dev/null +++ b/packages/gaim/pidgin/sanitize-configure.ac.patch @@ -0,0 +1,33 @@ +--- /tmp/configure.ac 2007-05-08 17:29:02.000000000 +0200 ++++ pidgin-2.0.0/configure.ac 2007-05-08 17:30:30.325251000 +0200 +@@ -472,7 +472,7 @@ + if test "x$enable_consoleui" = "xyes"; then + dnl # Some distros put the headers in ncursesw/, some don't + found_ncurses_h=no +- for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include ++ for location in $ac_ncurses_includes $NCURSES_HEADERS + do + f="$location/ncurses.h" + AC_CHECK_HEADER($f,[ +@@ -1860,10 +1860,6 @@ + KRB4_CFLAGS="$KRB4_CFLAGS -I${kerberos}/include/kerberosIV" + fi + KRB4_LDFLAGS="-L${kerberos}/lib" +- elif test -d /usr/local/include/kerberosIV ; then +- KRB4_CFLAGS="-I/usr/local/include/kerberosIV" +- elif test -d /usr/include/kerberosIV ; then +- KRB4_CFLAGS="-I/usr/include/kerberosIV" + fi + AC_DEFINE(ZEPHYR_USES_KERBEROS, 1, [Define if kerberos should be used in Zephyr.]) + +@@ -1896,10 +1892,6 @@ + ZEPHYR_LDFLAGS="-L${zephyr}/lib" + elif test -d /usr/athena/include/zephyr ; then + ZEPHYR_CFLAGS="-I/usr/athena/include" +- elif test -d /usr/include/zephyr ; then +- ZEPHYR_CFLAGS="-I/usr/include" +- elif test -d /usr/local/include/zephyr ; then +- ZEPHYR_CFLAGS="-I/usr/local/include" + fi + AC_DEFINE(LIBZEPHYR_EXT, 1 , [Define if external libzephyr should be used.]) + AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno") diff --git a/packages/gaim/pidgin_2.0.0.bb b/packages/gaim/pidgin_2.0.0.bb new file mode 100644 index 0000000000..a39e7aeaf9 --- /dev/null +++ b/packages/gaim/pidgin_2.0.0.bb @@ -0,0 +1,8 @@ +require pidgin.inc + +SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ + file://sanitize-configure.ac.patch;patch=1 \ + file://gconf-no-errors.patch;patch=1 \ + " + + -- cgit v1.2.3 From f3546367eb39445b9b75f800c8fc12e523eae095 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 8 May 2007 18:13:38 +0000 Subject: pidgin: fix rrecommends --- packages/gaim/pidgin.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gaim/pidgin.inc b/packages/gaim/pidgin.inc index 797be7a6f2..37fa996b53 100644 --- a/packages/gaim/pidgin.inc +++ b/packages/gaim/pidgin.inc @@ -3,7 +3,7 @@ DESCRIPTION = "multi-protocol instant messaging client" LICENSE = "GPL" DEPENDS = "gtk+ ncurses gnutls virtual/libintl gstreamer dbus" -RRECOMMENDS_${PN} = "pidgin-protocol-irc pidgin-protocol-jabber pidgin-plugin-docklet" +RRECOMMENDS_${PN} = "libpurple-protocol-irc libpurple-protocol-jabber" EXTRA_OECONF = " \ --disable-audio \ -- cgit v1.2.3 From 4e3a51b3ce62ef79e27952ffa2f9349fe6884590 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Tue, 8 May 2007 19:09:57 +0000 Subject: libxcb: package libxcb-xinerama, again spotted by xjqian --- packages/xcb/libxcb_0.9.93.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/xcb/libxcb_0.9.93.bb b/packages/xcb/libxcb_0.9.93.bb index 5b926d093f..2046e53721 100644 --- a/packages/xcb/libxcb_0.9.93.bb +++ b/packages/xcb/libxcb_0.9.93.bb @@ -13,8 +13,8 @@ SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2" PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \ libxcb-randr libxcb-record libxcb-render libxcb-res \ libxcb-screensaver libxcb-shape libxcb-shm libxcb-sync \ - libxcb-xevie libxcb-xf86dri libxcb-xfixes libxcb-xlib \ - libxcb-xprint libxcb-xtest libxcb-xv libxcb-xvmc" + libxcb-xevie libxcb-xf86dri libxcb-xfixes libxcb-xinerama \ + libxcb-xlib libxcb-xprint libxcb-xtest libxcb-xv libxcb-xvmc" FILES_${PN} = "${libdir}/libxcb.so.*" #FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h" @@ -33,6 +33,7 @@ FILES_libxcb-sync = "${libdir}/libxcb-sync.so.*" FILES_libxcb-xevie = "${libdir}/libxcb-xevie.so.*" FILES_libxcb-xf86dri = "${libdir}/libxcb-xf86dri.so.*" FILES_libxcb-xfixes = "${libdir}/libxcb-xfixes.so.*" +FILES_libxcb-xinerama = "${libdir}/libxcb-xinerama.so.*" FILES_libxcb-xlib = "${libdir}/libxcb-xlib.so.*" FILES_libxcb-xprint = "${libdir}/libxcb-xprint.so.*" FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*" -- cgit v1.2.3 From 2f1e00624712c31cfc2bd55a8d46ae5dab187de9 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Tue, 8 May 2007 19:20:49 +0000 Subject: neon: stage pkgconfig stuff --- packages/neon/neon_0.25.5.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/neon/neon_0.25.5.bb b/packages/neon/neon_0.25.5.bb index eec428136d..08723e9bfb 100644 --- a/packages/neon/neon_0.25.5.bb +++ b/packages/neon/neon_0.25.5.bb @@ -4,11 +4,11 @@ SECTION = "libs" LICENSE = "LGPL" DEPENDS = "zlib libxml2 expat time" -PR = "r1" +PR = "r2" SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz" -inherit autotools binconfig lib_package +inherit autotools binconfig lib_package pkgconfig EXTRA_OECONF = "--without-ssl --with-libxml2 --with-expat --enable-shared" -- cgit v1.2.3 From 02fb4610922c0944aa90b668b1238949a6bb3535 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Tue, 8 May 2007 19:22:08 +0000 Subject: subversion: added a patch to detect neon and enable dav protocol handler --- packages/subversion/files/neon-detection.patch | 36 ++++++++++++++++++++++++++ packages/subversion/subversion_1.4.0.bb | 9 ++++--- 2 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 packages/subversion/files/neon-detection.patch diff --git a/packages/subversion/files/neon-detection.patch b/packages/subversion/files/neon-detection.patch new file mode 100644 index 0000000000..b567d5c050 --- /dev/null +++ b/packages/subversion/files/neon-detection.patch @@ -0,0 +1,36 @@ +diff --git a/build/ac-macros/neon.m4 b/build/ac-macros/neon.m4 +index 9fcf859..8d964f3 100644 +--- a/build/ac-macros/neon.m4 ++++ b/build/ac-macros/neon.m4 +@@ -38,7 +38,7 @@ AC_DEFUN(SVN_LIB_NEON, + if test "$withval" = "yes" ; then + AC_MSG_ERROR([--with-neon requires an argument.]) + else +- neon_config="$withval/bin/neon-config" ++ neon_config="env env PKG_CONFIG_PATH=${withval}:${PKG_CONFIG_PATH} pkg-config neon" + fi + + SVN_NEON_CONFIG() +@@ -117,10 +117,10 @@ dnl SVN_NEON_CONFIG() + dnl neon-config found, gather relevant information from it + AC_DEFUN(SVN_NEON_CONFIG, + [ +- if test -f "$neon_config"; then +- if test "$neon_config" != ""; then ++ if true; then ++ if true; then + AC_MSG_CHECKING([neon library version]) +- NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'` ++ NEON_VERSION=`$neon_config --modversion | sed -e 's/^neon //'` + AC_MSG_RESULT([$NEON_VERSION]) + + if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then +@@ -133,7 +133,7 @@ AC_DEFUN(SVN_NEON_CONFIG, + test "$svn_allowed_neon" = "any"; then + svn_allowed_neon_on_system="yes" + SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`] +- NEON_LIBS=`$neon_config --la-file` ++ NEON_LIBS=`$neon_config --libs` + CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"] + svn_lib_neon="yes" + break diff --git a/packages/subversion/subversion_1.4.0.bb b/packages/subversion/subversion_1.4.0.bb index 3c65d1d0a8..a608aac063 100644 --- a/packages/subversion/subversion_1.4.0.bb +++ b/packages/subversion/subversion_1.4.0.bb @@ -1,14 +1,16 @@ DESCRIPTION = "The Subversion (svn) client" SECTION = "console/network" DEPENDS = "apr-util neon" +RDEPENDS = "neon" LICENSE = "Apache/BSD" HOMEPAGE = "http://subversion.tigris.org" -PR = "r0" +PR = "r1" SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ - file://disable-revision-install.patch;patch=1" + file://disable-revision-install.patch;patch=1 \ + file://neon-detection.patch;patch=1" -EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \ +EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \ --without-berkeley-db --without-apxs --without-apache \ --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ --with-apr-util=${STAGING_BINDIR_CROSS}" @@ -21,5 +23,6 @@ export LDFLAGS += " -L${STAGING_LIBDIR} " do_configure() { gnu-configize libtoolize --force + aclocal -I build/ -I build/ac-macros/ && autoconf oe_runconf } -- cgit v1.2.3 From a1da152a12837b54328d9f6bae672c23815df67c Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Tue, 8 May 2007 23:12:41 +0000 Subject: gnutls: stage pkgconfig stuff --- packages/gnutls/gnutls.inc | 2 +- packages/gnutls/gnutls_1.6.2.bb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/gnutls/gnutls.inc b/packages/gnutls/gnutls.inc index da0d2b0041..ed96e3f588 100644 --- a/packages/gnutls/gnutls.inc +++ b/packages/gnutls/gnutls.inc @@ -9,7 +9,7 @@ SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \ file://onceonly.m4 \ file://gnutls-texinfo-euro.patch;patch=1" -inherit autotools binconfig +inherit autotools binconfig pkgconfig EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1" diff --git a/packages/gnutls/gnutls_1.6.2.bb b/packages/gnutls/gnutls_1.6.2.bb index a5fd4bb2d5..68077c0c5a 100644 --- a/packages/gnutls/gnutls_1.6.2.bb +++ b/packages/gnutls/gnutls_1.6.2.bb @@ -1,4 +1,5 @@ require gnutls.inc +PR = "r1" do_configure_prepend() { sed -i "s/2.60/2.59/" ${S}/configure.in -- cgit v1.2.3