[oe-commits] org.oe.dev merge of '6114e88c0acc202895c41c560c0546244d2c5227'
xjqian commit
openembedded-commits at lists.openembedded.org
Fri Nov 23 05:29:16 UTC 2007
merge of '6114e88c0acc202895c41c560c0546244d2c5227'
and '90ff90e827783136b60ae8c162bf1deef26db750'
Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: 4ddcde2cef4794d1b3f1a9b16da170dd6f4a97a6
ViewMTN: http://monotone.openembedded.org/revision/info/4ddcde2cef4794d1b3f1a9b16da170dd6f4a97a6
Files:
1
packages/octave/octave_2.1.71.bb
packages/octave/octave_2.1.73.bb
packages/octave/files
packages/octave/files/configure.patch
packages/octave/octave.inc
packages/octave/octave_2.9.17.bb
MAINTAINERS
packages/fftw/fftw.inc
packages/gcc/gcc-package.inc
packages/gcc/gcc3-build.inc
packages/gcc/gcc_4.1.2.bb
packages/autofs/autofs-4.1.4/no-bash.patch
packages/linux/linux-openmoko/glamo-report-vram-size-to-userspace.patch
packages/portmap/portmap-6.0/no-pie.patch
packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch
packages/xorg-xserver/xserver-kdrive-1.3.0.0/smedia-glamo.patch
conf/distro/include/sane-srcrevs.inc
conf/local.conf.sample
packages/autofs/autofs_4.1.4.bb
packages/cryptsetup/cryptsetup_1.0.5.bb
packages/linux/linux-openmoko/defconfig-2.6.22.5
packages/linux/linux-openmoko_2.6.22.5.bb
packages/meta/slugos-packages.bb
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
packages/portmap/portmap_6.0.bb
packages/slugos-init/files/turnup
packages/slugos-init/slugos-init_0.10.bb
packages/xorg-xserver/xserver-kdrive-common.inc
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
Diffs:
#
# mt diff -r6114e88c0acc202895c41c560c0546244d2c5227 -r4ddcde2cef4794d1b3f1a9b16da170dd6f4a97a6
#
#
#
# rename "packages/octave/octave_2.1.71.bb"
# to "packages/octave/octave_2.1.73.bb"
#
# add_dir "packages/octave/files"
#
# add_file "packages/octave/files/configure.patch"
# content [70d1b41778702736488c58c82728937a3091901e]
#
# add_file "packages/octave/octave.inc"
# content [ee444b2bd09390c3cf0f543fd839457a3a0fb8c3]
#
# add_file "packages/octave/octave_2.9.17.bb"
# content [028a53a764b76cb30a096e4ddaa61129061e6629]
#
# patch "MAINTAINERS"
# from [1ded1e429f8171d33e507e4cebb7bd6cd431d85f]
# to [bf1ee44523aae87cd663a75d807708a6419b0343]
#
# patch "packages/fftw/fftw.inc"
# from [e7bfbc9da005bf47d582dff8d6b4c26e0c98ea0a]
# to [65b61e991db9e392a7740d8b38268470d8f36e00]
#
# patch "packages/gcc/gcc-package.inc"
# from [b77b1684159d4b5050a27f6b70d7a246d5a94153]
# to [fb44f67e25ac9898fae35ea8786446b7969aa444]
#
# patch "packages/gcc/gcc3-build.inc"
# from [6a501794e83ad070120fbf96a142d7c1dd57b9d2]
# to [fd1d8e1a435e000a557d01da93aafa359e8f84ba]
#
# patch "packages/gcc/gcc_4.1.2.bb"
# from [520d602fe4601361883e3c07caf5990c6203f558]
# to [a5f44bb9fbea67e32cb70527b86d211308a2bf94]
#
# patch "packages/octave/octave_2.1.73.bb"
# from [78e27523063cd8236102912792240a3029e2e1b5]
# to [028ace8fc5a864067196732b53fb3568c0000830]
#
============================================================
--- packages/octave/files/configure.patch 70d1b41778702736488c58c82728937a3091901e
+++ packages/octave/files/configure.patch 70d1b41778702736488c58c82728937a3091901e
@@ -0,0 +1,15 @@
+--- octave-2.9.17/configure.old 2007-11-17 18:57:35.000000000 -0600
++++ octave-2.9.17/configure 2007-11-17 19:08:33.000000000 -0600
+@@ -22598,11 +22598,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
============================================================
--- packages/octave/octave.inc ee444b2bd09390c3cf0f543fd839457a3a0fb8c3
+++ packages/octave/octave.inc ee444b2bd09390c3cf0f543fd839457a3a0fb8c3
@@ -0,0 +1,29 @@
+DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numerical computations. \
+It provides a convenient command line interface for solving linear and nonlinear problems numerically, \
+and for performing other numerical experiments using a language that is mostly compatible with Matlab. \
+It may also be used as a batch-oriented language."
+HOMEPAGE = "http://www.gnu.org/software/octave/"
+SECTION = "console/scientific"
+LICENSE = "GPL"
+DEPENDS = "readline ncurses fftw"
+RDEPENDS = "libfftw3"
+# fftw compiled with --disable-fortran
+
+inherit autotools
+
+EXTRA_OECONF = "--without-hdf5"
+
+do_configure() {
+ gnu-configize
+ oe_runconf
+}
+
+PACKAGES =+ "octave-m"
+
+# octave-m provides matlab routines in .m file format
+FILES_${PN}-m = "${datadir}/${PN}/*"
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/octave/octave_2.9.17.bb 028a53a764b76cb30a096e4ddaa61129061e6629
+++ packages/octave/octave_2.9.17.bb 028a53a764b76cb30a096e4ddaa61129061e6629
@@ -0,0 +1,27 @@
+require octave.inc
+
+SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
+ file://configure.patch;patch=1"
+
+PR = "r0"
+
+PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
+ libcruft-dev liboctave-dev liboctinterp-dev \
+ libcruft-dbg liboctave-dbg liboctinterp-dbg"
+
+FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*"
+FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so"
+FILES_libcruft-dbg = "${libdir}/${PN}-${PV}/.debug/libcruft*"
+
+FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*"
+FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so"
+FILES_liboctave-dbg = "${libdir}/${PN}-${PV}/.debug/liboctave*"
+
+FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*"
+FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so"
+FILES_liboctinterp-dbg = "${libdir}/${PN}-${PV}/.debug/liboctinterp*"
+
+# octave-oct provides subroutines in .oct file format
+FILES_${PN}-oct = "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/*.oct"
+
+FILES_${PN}-dbg += "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug"
============================================================
--- MAINTAINERS 1ded1e429f8171d33e507e4cebb7bd6cd431d85f
+++ MAINTAINERS bf1ee44523aae87cd663a75d807708a6419b0343
@@ -94,7 +94,7 @@ Distros: Ångström
Mail: xjqian at gmail.com
Machines: tosa, borzoi, nokia770
Distros: Ångström
-Recipes: gnuplot
+Recipes: gnuplot octave
Person: Justin Patrin
Mail: papercrane at reversefold.com
============================================================
--- packages/fftw/fftw.inc e7bfbc9da005bf47d582dff8d6b4c26e0c98ea0a
+++ packages/fftw/fftw.inc 65b61e991db9e392a7740d8b38268470d8f36e00
@@ -1,7 +1,8 @@ LICENSE = "GPL"
DESCRIPTION = "FFTW"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL"
+RPROVIDES += "libfftw3"
PR = "r1"
============================================================
--- packages/gcc/gcc-package.inc b77b1684159d4b5050a27f6b70d7a246d5a94153
+++ packages/gcc/gcc-package.inc fb44f67e25ac9898fae35ea8786446b7969aa444
@@ -5,6 +5,7 @@ PACKAGES = "libgcc ${PN} ${PN}-symlinks
g++ g++-symlinks \
cpp cpp-symlinks \
g77 g77-symlinks \
+ gfortran gfortran-symlinks \
gcov gcov-symlinks \
libmudflap libmudflap-dev \
libstdc++ libg2c \
@@ -28,6 +29,11 @@ FILES_g77-symlinks = "${bindir}/g77 \
FILES_g77-symlinks = "${bindir}/g77 \
${bindir}/f77"
+FILES_gfortran = "${bindir}/${TARGET_PREFIX}gfortran \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951"
+FILES_gfortran-symlinks = "${bindir}/gfortran \
+ ${bindir}/f95"
+
FILES_cpp = "${bindir}/${TARGET_PREFIX}cpp \
${base_libdir}/cpp"
FILES_cpp-symlinks = "${bindir}/cpp"
@@ -115,9 +121,11 @@ do_install () {
# Symlinks so we can use these trivially on the target
ln -sf ${TARGET_SYS}-g77 g77
+ ln -sf ${TARGET_SYS}-gfortran gfortran
ln -sf ${TARGET_SYS}-g++ g++
ln -sf ${TARGET_SYS}-gcc gcc
ln -sf g77 f77
+ ln -sf gfortran f95
ln -sf g++ c++
ln -sf gcc cc
ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${base_libdir}/cpp
============================================================
--- packages/gcc/gcc3-build.inc 6a501794e83ad070120fbf96a142d7c1dd57b9d2
+++ packages/gcc/gcc3-build.inc fd1d8e1a435e000a557d01da93aafa359e8f84ba
@@ -16,7 +16,7 @@ JAVA_sh3 ?= ""
JAVA_armeb ?= ""
JAVA_mipsel ?= ""
JAVA_sh3 ?= ""
-# gcc4-build sets this to f95
+# gcc4-build sets this to fortran
FORTRAN ?= ",f77"
LANGUAGES ?= "c,c++${FORTRAN}${JAVA}"
============================================================
--- packages/gcc/gcc_4.1.2.bb 520d602fe4601361883e3c07caf5990c6203f558
+++ packages/gcc/gcc_4.1.2.bb a5f44bb9fbea67e32cb70527b86d211308a2bf94
@@ -39,6 +39,7 @@ FORTRAN = ""
#Set the fortran bits
# ',fortran' or '', not 'f77' like gcc3 had
FORTRAN = ""
+FORTRAN_linux-gnueabi = ",fortran"
#Set the java bits
JAVA = ""
============================================================
--- packages/octave/octave_2.1.71.bb 78e27523063cd8236102912792240a3029e2e1b5
+++ packages/octave/octave_2.1.73.bb 028ace8fc5a864067196732b53fb3568c0000830
@@ -1,17 +1,11 @@
-DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numerical computations. \
-It provides a convenient command line interface for solving linear and nonlinear problems numerically, \
-and for performing other numerical experiments using a language that is mostly compatible with Matlab. \
-It may also be used as a batch-oriented language."
-SECTION = "console/utils"
-LICENSE = "GPL"
-DEPENDS = "readline ncurses"
-SRC_URI = "ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-${PV}.tar.gz"
+require octave.inc
-inherit autotools
+SRC_URI = "ftp://ftp.octave.org/pub/octave/obsolete/${PN}-${PV}.tar.gz"
-FILES_${PN}-dev += "${libdir}/octave-${PV}/*.la ${libdir}/octave-${PV}/*.a"
+PR = "r0"
+PACKAGES =+ "libcruft-dev liboctave-dev liboctinterp-dev"
+
+FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft*"
+FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave*"
+FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp*"
-do_configure() {
- gnu-configize
- oe_runconf
-}
#
# mt diff -r90ff90e827783136b60ae8c162bf1deef26db750 -r4ddcde2cef4794d1b3f1a9b16da170dd6f4a97a6
#
#
#
# add_file "packages/autofs/autofs-4.1.4/no-bash.patch"
# content [4eb3ed80313c234e6bd2311751e62211135fe24e]
#
# add_file "packages/linux/linux-openmoko/glamo-report-vram-size-to-userspace.patch"
# content [c9d35297bee6c1f0e66123fe4919e96dc632cf70]
#
# add_file "packages/portmap/portmap-6.0/no-pie.patch"
# content [39990f66702db50dd93420291a2edf4e018b16f0]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch"
# content [cc0e9b8762c22daff42051281744706d62d5803b]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/smedia-glamo.patch"
# content [9e6bb0c7c7556483765850cbd03efcd3fd9a55d8]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [a7241387cffe65ec6d95b9d1ba03094818c4c4fd]
# to [b1e3777e41aa3fe56bbd5ae76a0a3062c64c1cdd]
#
# patch "conf/local.conf.sample"
# from [beeeba5a341dd121dacd9a8b5f5a41f720c15f6d]
# to [3861d3e815459d94527022232b83f9e4c6699f55]
#
# patch "packages/autofs/autofs_4.1.4.bb"
# from [a424c6e4fee37df1589d0181c14420a3bc3267c2]
# to [5f81c9c9ebfabe495127eafbda0ce1c2d3ffa5b7]
#
# patch "packages/cryptsetup/cryptsetup_1.0.5.bb"
# from [d653b004099b8765af985015ba352ac8fa3cbc93]
# to [2523bf24ec0cfefc7fdd530d42d221ada86b4894]
#
# patch "packages/linux/linux-openmoko/defconfig-2.6.22.5"
# from [5e689013fe1bfa8136d80ab711b5dc1f1bd4d254]
# to [0ad0a08d6c357e7ddb1c404f4d28dfc5841533ba]
#
# patch "packages/linux/linux-openmoko_2.6.22.5.bb"
# from [ceab318f69d73c5b803a6c4c045abd2c43d97495]
# to [d9fa586ff6b631d3fe9d2a2c351310abc09112b3]
#
# patch "packages/meta/slugos-packages.bb"
# from [710798742d5727a86f4c0272ea66e003273c4b35]
# to [9c53992007de6add7732c5842fecc57b3f45128e]
#
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
# from [0d9b673125099a19dc66faba6b28c9b8b9d3b631]
# to [1455e724ba6335f63471c0c3d4a4117393aff80b]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [fbe2c5b1b35022fd032e2c27d0770f76a8a26d9e]
# to [cc58c28564075391245e716a991d21f7ead4d3f4]
#
# patch "packages/portmap/portmap_6.0.bb"
# from [03ff99fa49ea46ef110fd480411ca9033f51e14e]
# to [241baf929c36235b1a707377a729d0d306119226]
#
# patch "packages/slugos-init/files/turnup"
# from [0c939e1149cd95e3b6553c5766ba09a3a3984ada]
# to [9b5fe01bdf98e32a3d849b4f44d57f5329ac5862]
#
# patch "packages/slugos-init/slugos-init_0.10.bb"
# from [35c419193e544a8d85ce740472291aa93c87fd37]
# to [e7df4dcb886e06a53c2e126edfc7dd3ce44f636c]
#
# patch "packages/xorg-xserver/xserver-kdrive-common.inc"
# from [41111959110e4d02e8cbcb965b17cd1d2494d5b9]
# to [243bcb1cf8f6d81256ea0e31b07b0478b9bb5174]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
# from [bc48ac913bf5619e2ef613e1dcc2f78c81bcd221]
# to [590c157e0e46a16b445eca5e6f9890d7b346afb4]
#
============================================================
--- packages/autofs/autofs-4.1.4/no-bash.patch 4eb3ed80313c234e6bd2311751e62211135fe24e
+++ packages/autofs/autofs-4.1.4/no-bash.patch 4eb3ed80313c234e6bd2311751e62211135fe24e
@@ -0,0 +1,18 @@
+diff -Naur autofs-4.1.4/samples.orig/auto.net autofs-4.1.4/samples/auto.net
+--- autofs-4.1.4/samples.orig/auto.net 2007-11-21 11:29:57.000000000 -0600
++++ autofs-4.1.4/samples/auto.net 2007-11-21 11:30:27.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ # $Id: auto.net,v 1.8 2005/04/05 13:02:09 raven Exp $
+
+diff -Naur autofs-4.1.4/samples.orig/auto.smb autofs-4.1.4/samples/auto.smb
+--- autofs-4.1.4/samples.orig/auto.smb 2007-11-21 11:29:57.000000000 -0600
++++ autofs-4.1.4/samples/auto.smb 2007-11-21 11:30:34.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ # $Id: auto.smb,v 1.3 2005/04/05 13:02:09 raven Exp $
+
============================================================
--- packages/linux/linux-openmoko/glamo-report-vram-size-to-userspace.patch c9d35297bee6c1f0e66123fe4919e96dc632cf70
+++ packages/linux/linux-openmoko/glamo-report-vram-size-to-userspace.patch c9d35297bee6c1f0e66123fe4919e96dc632cf70
@@ -0,0 +1,67 @@
+From ff1564e5100eeccd53ee6b007813ea722f8cf8b6 Mon Sep 17 00:00:00 2001
+From: Chia-I Wu <olv at openmoko.com>
+Date: Mon, 1 Oct 2007 21:16:46 +0800
+Subject: [PATCH] glamo: report vram size to userspace
+
+Set fb_fix_screeninfo.smem_len to RESSIZE(fb_res). This is not the real
+vram size, as it is a hardcoded value in glamo-core.c for now.
+---
+ drivers/video/glamo/glamo-fb.c | 13 +++++--------
+ 1 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/video/glamo/glamo-fb.c b/drivers/video/glamo/glamo-fb.c
+index 451de75..160a5b1 100644
+--- a/drivers/video/glamo/glamo-fb.c
++++ b/drivers/video/glamo/glamo-fb.c
+@@ -54,8 +54,6 @@
+
+ #define RESSIZE(ressource) (((ressource)->end - (ressource)->start)+1)
+
+-#define GLAMO_FB_ALLOC (640*480*2)
+-
+ struct glamofb_handle {
+ struct fb_info *fb;
+ struct device *dev;
+@@ -224,7 +222,6 @@ static int glamofb_set_par(struct fb_info *info)
+ }
+
+ glamo->fb->fix.line_length = (var->width * var->bits_per_pixel) / 8;
+- glamo->fb->fix.smem_len = info->fix.line_length * var->yres_virtual;
+
+ return 0;
+ }
+@@ -453,7 +450,7 @@ static int __init glamofb_probe(struct platform_device *pdev)
+ }
+
+ glamofb->fb_res = request_mem_region(glamofb->fb_res->start,
+- GLAMO_FB_ALLOC, pdev->name);
++ RESSIZE(glamofb->fb_res), pdev->name);
+ if (!glamofb->fb_res) {
+ dev_err(&pdev->dev, "failed to request vram region\n");
+ goto out_release_reg;
+@@ -467,6 +464,7 @@ static int __init glamofb_probe(struct platform_device *pdev)
+ goto out_release_fb;
+ }
+ fbinfo->fix.smem_start = (unsigned long) glamofb->fb_res->start;
++ fbinfo->fix.smem_len = RESSIZE(glamofb->fb_res);
+
+ fbinfo->screen_base = ioremap(glamofb->fb_res->start,
+ RESSIZE(glamofb->fb_res));
+@@ -522,11 +520,10 @@ static int __init glamofb_probe(struct platform_device *pdev)
+ fbinfo->var.green.length = 6;
+ fbinfo->var.blue.length = 5;
+ fbinfo->var.transp.length = 0;
+- fbinfo->fix.smem_len = mach_info->xres.max *
+- mach_info->yres.max *
+- mach_info->bpp.max / 8;
+
+- memset(fbinfo->screen_base, 0, fbinfo->fix.smem_len);
++ memset(fbinfo->screen_base, 0, mach_info->xres.max *
++ mach_info->yres.max *
++ mach_info->bpp.max / 8);
+
+ glamo_engine_enable(mach_info->glamo, GLAMO_ENGINE_LCD);
+ glamo_engine_reset(mach_info->glamo, GLAMO_ENGINE_LCD);
+--
+1.5.3.1
+
============================================================
--- packages/portmap/portmap-6.0/no-pie.patch 39990f66702db50dd93420291a2edf4e018b16f0
+++ packages/portmap/portmap-6.0/no-pie.patch 39990f66702db50dd93420291a2edf4e018b16f0
@@ -0,0 +1,14 @@
+--- portmap_6.0/Makefile.orig 2007-11-21 00:35:52.000000000 -0600
++++ portmap_6.0/Makefile 2007-11-21 00:37:23.000000000 -0600
+@@ -125,9 +125,9 @@
+ all: portmap pmap_dump pmap_set portmap.man
+
+ CPPFLAGS += $(HOSTS_ACCESS)
+-portmap: CFLAGS += -fpie
++#portmap: CFLAGS += -fpie
+ portmap: LDLIBS += $(WRAP_LIB)
+-portmap: LDFLAGS += -pie
++#portmap: LDFLAGS += -pie
+ portmap: portmap.o pmap_check.o from_local.o
+
+ from_local: CPPFLAGS += -DTEST
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch cc0e9b8762c22daff42051281744706d62d5803b
+++ packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch cc0e9b8762c22daff42051281744706d62d5803b
@@ -0,0 +1,76 @@
+diff --git a/configure.ac b/configure.ac
+index 76d33f0..2807c50 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1824,6 +1824,7 @@ hw/kdrive/ati/Makefile
+ hw/kdrive/chips/Makefile
+ hw/kdrive/ephyr/Makefile
+ hw/kdrive/epson/Makefile
++hw/kdrive/glamo/Makefile
+ hw/kdrive/fake/Makefile
+ hw/kdrive/fbdev/Makefile
+ hw/kdrive/w100/Makefile
+diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
+index 8075a56..b97912d 100644
+--- a/hw/kdrive/Makefile.am
++++ b/hw/kdrive/Makefile.am
+@@ -4,7 +4,7 @@ VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \
+ endif
+
+ if KDRIVEFBDEV
+-FBDEV_SUBDIRS = fbdev epson
++FBDEV_SUBDIRS = fbdev epson glamo
+ endif
+
+ if KDRIVEW100
+@@ -34,4 +34,4 @@ SUBDIRS = \
+ fake
+
+ DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \
+- smi via fbdev sdl ephyr src linux fake sis300
++ smi via fbdev sdl ephyr src linux fake sis300 glamo
+diff --git a/hw/kdrive/glamo/Makefile.am b/hw/kdrive/glamo/Makefile.am
+index e8c48a4..ffb7a30 100644
+--- a/hw/kdrive/glamo/Makefile.am
++++ b/hw/kdrive/glamo/Makefile.am
+@@ -41,11 +41,14 @@ GLAMO_LIBS = \
+
+ Xglamo_LDADD = \
+ $(GLAMO_LIBS) \
+- @KDRIVE_LIBS@
++ @KDRIVE_LIBS@ \
++ @XSERVER_LIBS@
+
+ Xglamo_DEPENDENCIES = \
+ libglamo.a \
+- @KDRIVE_LOCAL_LIBS@
++ $(FBDEV_LIBS) \
++ $(VESA_LIBS) \
++ $(DRI_LIBS)
+
+ relink:
+ rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
+diff --git a/hw/kdrive/glamo/glamo_stub.c b/hw/kdrive/glamo/glamo_stub.c
+index d772671..df43455 100644
+--- a/hw/kdrive/glamo/glamo_stub.c
++++ b/hw/kdrive/glamo/glamo_stub.c
+@@ -49,16 +49,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
+ void
+ InitInput(int argc, char **argv)
+ {
+- KdKeyboardInfo *ki;
+-
+- KdAddKeyboardDriver(&LinuxKeyboardDriver);
+- KdAddPointerDriver(&LinuxMouseDriver);
+-#ifdef TSLIB
+- KdAddPointerDriver(&TsDriver);
++ KdInitInput (&LinuxEvdevMouseFuncs, &LinuxEvdevKeyboardFuncs);
++#ifdef TOUCHSCREEN
++ KdAddMouseDriver (&TsFuncs);
+ #endif
+-
+- ki = KdParseKeyboard("keybd");
+- KdAddKeyboard(ki);
+ }
+
+ void
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.3.0.0/smedia-glamo.patch 9e6bb0c7c7556483765850cbd03efcd3fd9a55d8
+++ packages/xorg-xserver/xserver-kdrive-1.3.0.0/smedia-glamo.patch 9e6bb0c7c7556483765850cbd03efcd3fd9a55d8
@@ -0,0 +1,3702 @@
+Index: xserver/hw/kdrive/glamo/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xserver/hw/kdrive/glamo/Makefile.am 2007-09-25 19:32:10.000000000 +0800
+@@ -0,0 +1,51 @@
++if KDRIVEFBDEV
++FBDEV_INCLUDES =-I$(top_srcdir)/hw/kdrive/fbdev
++FBDEV_LIBS = $(top_builddir)/hw/kdrive/fbdev/libfbdev.a
++endif
++
++if KDRIVEVESA
++VESA_INCLUDES = -I$(top_srcdir)/hw/kdrive/vesa
++VESA_LIBS = $(top_builddir)/hw/kdrive/vesa/libvesa.a
++endif
++
++INCLUDES = \
++ @KDRIVE_INCS@ \
++ $(DRI_INCLUDES) \
++ $(FBDEV_INCLUDES) \
++ $(VESA_INCLUDES) \
++ @KDRIVE_CFLAGS@
++
++bin_PROGRAMS = Xglamo
++
++noinst_LIBRARIES = libglamo.a
++
++libglamo_a_SOURCES = \
++ glamo_dma.c \
++ glamo_dma.h \
++ glamo_draw.c \
++ glamo_draw.h \
++ glamo.c \
++ glamo.h \
++ glamo-regs.h \
++ glamo_video.c
++
++Xglamo_SOURCES = \
++ glamo_stub.c
++
++GLAMO_LIBS = \
++ libglamo.a \
++ $(FBDEV_LIBS) \
++ $(VESA_LIBS) \
++ $(DRI_LIBS) \
++ @KDRIVE_LIBS@
++
++Xglamo_LDADD = \
++ $(GLAMO_LIBS) \
++ @KDRIVE_LIBS@
++
++Xglamo_DEPENDENCIES = \
++ libglamo.a \
++ @KDRIVE_LOCAL_LIBS@
++
++relink:
++ rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
+Index: xserver/hw/kdrive/glamo/glamo-regs.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xserver/hw/kdrive/glamo/glamo-regs.h 2007-09-25 19:00:20.000000000 +0800
+@@ -0,0 +1,685 @@
++#ifndef _GLAMO_REGS_H
++#define _GLAMO_REGS_H
++
++/* Smedia Glamo 336x/337x driver
++ *
++ * (C) 2007 by OpenMoko, Inc.
++ * Author: Harald Welte <laforge at openmoko.org>
++ * All rights reserved.
++ *
++ * 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, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++enum glamo_regster_offsets {
++ GLAMO_REGOFS_GENERIC = 0x0000,
++ GLAMO_REGOFS_HOSTBUS = 0x0200,
++ GLAMO_REGOFS_MEMORY = 0x0300,
++ GLAMO_REGOFS_VIDCAP = 0x0400,
++ GLAMO_REGOFS_ISP = 0x0500,
++ GLAMO_REGOFS_JPEG = 0x0800,
++ GLAMO_REGOFS_MPEG = 0x0c00,
++ GLAMO_REGOFS_LCD = 0x1100,
++ GLAMO_REGOFS_MMC = 0x1400,
++ GLAMO_REGOFS_MPROC0 = 0x1500,
++ GLAMO_REGOFS_MPROC1 = 0x1580,
++ GLAMO_REGOFS_CMDQUEUE = 0x1600,
++ GLAMO_REGOFS_RISC = 0x1680,
++ GLAMO_REGOFS_2D = 0x1700,
++ GLAMO_REGOFS_3D = 0x1b00,
++};
++
++
++enum glamo_register_generic {
++ GLAMO_REG_GCONF1 = 0x0000,
++ GLAMO_REG_GCONF2 = 0x0002,
++#define GLAMO_REG_DEVICE_ID GLAMO_REG_GCONF2
++ GLAMO_REG_GCONF3 = 0x0004,
++#define GLAMO_REG_REVISION_ID GLAMO_REG_GCONF3
++ GLAMO_REG_IRQ_GEN1 = 0x0006,
++#define GLAMO_REG_IRQ_ENABLE GLAMO_REG_IRQ_GEN1
++ GLAMO_REG_IRQ_GEN2 = 0x0008,
++#define GLAMO_REG_IRQ_SET GLAMO_REG_IRQ_GEN2
++ GLAMO_REG_IRQ_GEN3 = 0x000a,
++#define GLAMO_REG_IRQ_CLEAR GLAMO_REG_IRQ_GEN3
++ GLAMO_REG_IRQ_GEN4 = 0x000c,
++#define GLAMO_REG_IRQ_STATUS GLAMO_REG_IRQ_GEN4
++ GLAMO_REG_CLOCK_HOST = 0x0010,
++ GLAMO_REG_CLOCK_MEMORY = 0x0012,
++ GLAMO_REG_CLOCK_LCD = 0x0014,
++ GLAMO_REG_CLOCK_MMC = 0x0016,
++ GLAMO_REG_CLOCK_ISP = 0x0018,
++ GLAMO_REG_CLOCK_JPEG = 0x001a,
++ GLAMO_REG_CLOCK_3D = 0x001c,
++ GLAMO_REG_CLOCK_2D = 0x001e,
++ GLAMO_REG_CLOCK_RISC1 = 0x0020, /* 3365 only? */
++ GLAMO_REG_CLOCK_RISC2 = 0x0022, /* 3365 only? */
++ GLAMO_REG_CLOCK_MPEG = 0x0024,
++ GLAMO_REG_CLOCK_MPROC = 0x0026,
++
++ GLAMO_REG_CLOCK_GEN5_1 = 0x0030,
++ GLAMO_REG_CLOCK_GEN5_2 = 0x0032,
++ GLAMO_REG_CLOCK_GEN6 = 0x0034,
++ GLAMO_REG_CLOCK_GEN7 = 0x0036,
++ GLAMO_REG_CLOCK_GEN8 = 0x0038,
++ GLAMO_REG_CLOCK_GEN9 = 0x003a,
++ GLAMO_REG_CLOCK_GEN10 = 0x003c,
++ GLAMO_REG_CLOCK_GEN11 = 0x003e,
++ GLAMO_REG_PLL_GEN1 = 0x0040,
++ GLAMO_REG_PLL_GEN2 = 0x0042,
++ GLAMO_REG_PLL_GEN3 = 0x0044,
++ GLAMO_REG_PLL_GEN4 = 0x0046,
++ GLAMO_REG_PLL_GEN5 = 0x0048,
++ GLAMO_REG_GPIO_GEN1 = 0x0050,
++ GLAMO_REG_GPIO_GEN2 = 0x0052,
++ GLAMO_REG_GPIO_GEN3 = 0x0054,
++ GLAMO_REG_GPIO_GEN4 = 0x0056,
++ GLAMO_REG_GPIO_GEN5 = 0x0058,
++ GLAMO_REG_GPIO_GEN6 = 0x005a,
++ GLAMO_REG_GPIO_GEN7 = 0x005c,
++ GLAMO_REG_GPIO_GEN8 = 0x005e,
++ GLAMO_REG_GPIO_GEN9 = 0x0060,
++ GLAMO_REG_GPIO_GEN10 = 0x0062,
++ GLAMO_REG_DFT_GEN1 = 0x0070,
++ GLAMO_REG_DFT_GEN2 = 0x0072,
++ GLAMO_REG_DFT_GEN3 = 0x0074,
++ GLAMO_REG_DFT_GEN4 = 0x0076,
++
++ GLAMO_REG_DFT_GEN5 = 0x01e0,
++ GLAMO_REG_DFT_GEN6 = 0x01f0,
++};
++
++#define GLAMO_REG_HOSTBUS(x) (GLAMO_REGOFS_HOSTBUS-2+(x*2))
++
++#define REG_MEM(x) (GLAMO_REGOFS_MEMORY+(x))
++#define GLAMO_REG_MEM_TIMING(x) (GLAMO_REG_MEM_TIMING1-2+(x*2))
++
++enum glamo_register_mem {
++ GLAMO_REG_MEM_TYPE = REG_MEM(0x00),
++ GLAMO_REG_MEM_GEN = REG_MEM(0x02),
++ GLAMO_REG_MEM_TIMING1 = REG_MEM(0x04),
++ GLAMO_REG_MEM_TIMING2 = REG_MEM(0x06),
++ GLAMO_REG_MEM_TIMING3 = REG_MEM(0x08),
++ GLAMO_REG_MEM_TIMING4 = REG_MEM(0x0a),
++ GLAMO_REG_MEM_TIMING5 = REG_MEM(0x0c),
++ GLAMO_REG_MEM_TIMING6 = REG_MEM(0x0e),
++ GLAMO_REG_MEM_TIMING7 = REG_MEM(0x10),
++ GLAMO_REG_MEM_TIMING8 = REG_MEM(0x12),
++ GLAMO_REG_MEM_TIMING9 = REG_MEM(0x14),
++ GLAMO_REG_MEM_TIMING10 = REG_MEM(0x16),
++ GLAMO_REG_MEM_TIMING11 = REG_MEM(0x18),
++ GLAMO_REG_MEM_POWER1 = REG_MEM(0x1a),
++ GLAMO_REG_MEM_POWER2 = REG_MEM(0x1c),
++ GLAMO_REG_MEM_LCD_BUF1 = REG_MEM(0x1e),
++ GLAMO_REG_MEM_LCD_BUF2 = REG_MEM(0x20),
++ GLAMO_REG_MEM_LCD_BUF3 = REG_MEM(0x22),
++ GLAMO_REG_MEM_LCD_BUF4 = REG_MEM(0x24),
++ GLAMO_REG_MEM_BIST1 = REG_MEM(0x26),
++ GLAMO_REG_MEM_BIST2 = REG_MEM(0x28),
++ GLAMO_REG_MEM_BIST3 = REG_MEM(0x2a),
++ GLAMO_REG_MEM_BIST4 = REG_MEM(0x2c),
++ GLAMO_REG_MEM_BIST5 = REG_MEM(0x2e),
++ GLAMO_REG_MEM_MAH1 = REG_MEM(0x30),
++ GLAMO_REG_MEM_MAH2 = REG_MEM(0x32),
++ GLAMO_REG_MEM_DRAM1 = REG_MEM(0x34),
++ GLAMO_REG_MEM_DRAM2 = REG_MEM(0x36),
++ GLAMO_REG_MEM_CRC = REG_MEM(0x38),
++};
++
++#define GLAMO_MEM_TYPE_MASK 0x03
++
++enum glamo_reg_mem_dram1 {
++ GLAMO_MEM_DRAM1_EN_SDRAM_CLK = (1 <<%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list