[oe-commits] org.oe.dev merge of '032b986959813efab3fbef3ac58254ea62417eea'
thebohemian commit
oe at amethyst.openembedded.net
Fri Jun 6 14:27:35 UTC 2008
merge of '032b986959813efab3fbef3ac58254ea62417eea'
and 'b099f51e6cdab1cf887a065a32d2951453ff375c'
Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: e8b3409511829c8c35d2859b5756d0206fbb3016
ViewMTN: http://monotone.openembedded.org/revision/info/e8b3409511829c8c35d2859b5756d0206fbb3016
Files:
1
packages/classpath/classpath-minimal_0.97.1.bb
packages/classpath/classpath-minimal_0.97.2.bb
packages/classpath/classpath_0.97.1.bb
packages/classpath/classpath_0.97.2.bb
packages/classpath/files/getopt-filelist.patch
packages/classpath/files/sun-security-getproperty_0.96.1.patch
conf/distro/chinook-compat.conf
conf/distro/include/preferred-om-2008-versions.inc
packages/classpath/classpath-native_0.96.1.bb
packages/classpath/files/netif_16.patch
packages/gpe-conf/gpe-conf-0.2.7
packages/gpe-conf/gpe-conf-0.2.7/poweroff.patch
packages/gpe-login/gpe-login_0.93.bb
packages/gpe-conf/gpe-conf_0.2.7.bb
packages/linux/linux-omap2-git/beagleboard/0002-ARM-OMAP-SmartReflex-driver.patch
packages/linux/linux-omap2-git/beagleboard/0003-ARM-OMAP-SmartReflex-driver.patch
packages/linux/linux-omap2_git.bb
packages/zlib/zlib_1.2.3.bb
Diffs:
#
# mt diff -r032b986959813efab3fbef3ac58254ea62417eea -re8b3409511829c8c35d2859b5756d0206fbb3016
#
#
#
# rename "packages/classpath/classpath-minimal_0.97.1.bb"
# to "packages/classpath/classpath-minimal_0.97.2.bb"
#
# rename "packages/classpath/classpath_0.97.1.bb"
# to "packages/classpath/classpath_0.97.2.bb"
#
# add_file "packages/classpath/files/getopt-filelist.patch"
# content [4ae8c4b2501c899d1aa8e83620275072982326a5]
#
# add_file "packages/classpath/files/sun-security-getproperty_0.96.1.patch"
# content [ae460fe343c1bebc5fa267a1fecbd91b6061507a]
#
# patch "conf/distro/chinook-compat.conf"
# from [6f4774c59d5c8589f1b8d21db8f3fed3f209e847]
# to [576a8c254f5676e6cb52f2b2a4b80e52a03f0c50]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [bd38ba62b84633750ea6d6d25577916cf8bf645a]
# to [b3bb0751aa30b51468709221b4b693ab53b1c6e0]
#
# patch "packages/classpath/classpath-minimal_0.97.2.bb"
# from [ff46d0cb295bca189b6ab07f6506b2e039917ae0]
# to [eeed706438d6b4b51f8ecb1582addd8a6820f098]
#
# patch "packages/classpath/classpath-native_0.96.1.bb"
# from [de2308a46658542392eb7d94031a5a997a9dd987]
# to [ffc871c9e7df81665b6682029ed081d535b07521]
#
# patch "packages/classpath/classpath_0.97.2.bb"
# from [924cfdaf2daafe993d70dba55a853c4eb5250f64]
# to [4fbb51684632f12c592c40ad772a35edea74b77e]
#
# patch "packages/classpath/files/netif_16.patch"
# from [65f812866975ec98e775dd6add8c19c08ca527d3]
# to [09fd61fe07227c2cae095f4bc5913c20ddef8b55]
#
============================================================
--- packages/classpath/files/getopt-filelist.patch 4ae8c4b2501c899d1aa8e83620275072982326a5
+++ packages/classpath/files/getopt-filelist.patch 4ae8c4b2501c899d1aa8e83620275072982326a5
@@ -0,0 +1,271 @@
+? tools/generated
+Index: tools/gnu/classpath/tools/common/ClasspathToolParser.java
+===================================================================
+RCS file: /sources/classpath/classpath/tools/gnu/classpath/tools/common/ClasspathToolParser.java,v
+retrieving revision 1.1
+diff -u -r1.1 ClasspathToolParser.java
+--- tools/gnu/classpath/tools/common/ClasspathToolParser.java 22 Sep 2006 01:01:26 -0000 1.1
++++ tools/gnu/classpath/tools/common/ClasspathToolParser.java 3 Jun 2008 16:34:45 -0000
+@@ -38,9 +38,16 @@
+
+ package gnu.classpath.tools.common;
+
++import java.io.BufferedReader;
++import java.io.IOException;
++import java.io.FileNotFoundException;
++import java.io.FileReader;
++import java.io.Reader;
+ import java.text.MessageFormat;
++import java.util.ArrayList;
+
+ import gnu.classpath.Configuration;
++import gnu.classpath.tools.getopt.FileArgumentCallback;
+ import gnu.classpath.tools.getopt.Option;
+ import gnu.classpath.tools.getopt.OptionException;
+ import gnu.classpath.tools.getopt.Parser;
+@@ -84,4 +91,137 @@
+ }
+ });
+ }
++
++ public void parse(String[] inArgs, FileArgumentCallback files,
++ boolean handleFileLists)
++ {
++ FileArgumentCallback cb;
++
++ if (handleFileLists)
++ cb = new AtFileArgumentCallback(files);
++ else
++ cb = files;
++
++ parse(inArgs, cb);
++ }
++
++ public String[] parse(String[] inArgs, boolean handleFileLists)
++ {
++ final ArrayList fileResult = new ArrayList();
++
++ final FileArgumentCallback cb = new FileArgumentCallback()
++ {
++ public void notifyFile(String fileArgument)
++ {
++ fileResult.add(fileArgument);
++ }
++ };
++
++ if (handleFileLists)
++ parse(inArgs, new AtFileArgumentCallback(cb));
++ else
++ parse(inArgs, cb);
++
++ return (String[]) fileResult.toArray(new String[0]);
++ }
++
++
++ /** Simple function that takes the given {@link Reader}, treats it like
++ * a textfile and reads all the whitespace separated entries from it
++ * and adds them to the @{link FileArgumentCallback} instance.
++ */
++ public void parseFileList(Reader reader, FileArgumentCallback cb)
++ throws OptionException
++ {
++ BufferedReader breader = new BufferedReader(reader);
++ String line = null;
++
++ try
++ {
++ while ((line = breader.readLine()) != null)
++ parseLine(line, cb);
++
++ reader.close();
++ }
++ catch (IOException ioe)
++ {
++ System.err.println(programName + ": IO error while reading from inputstream");
++ System.exit(1);
++ }
++
++ }
++
++ /** Parses whitespace separated file entries.
++ *
++ * Note: This is not coping with whitespace in files or quoting.
++ */
++ private void parseLine(String line, FileArgumentCallback cb)
++ throws IOException, OptionException
++ {
++ final int length = line.length();
++ int start = 0;
++ int end = 0;
++
++ // While not reached end of line ...
++ while (start < length)
++ {
++ // Search for first non-whitespace character for the start of a word.
++ while (Character.isWhitespace(line.codePointAt(start)))
++ {
++ start++;
++
++ if (start == length)
++ return;
++ }
++
++ end = start + 1;
++
++ // Search for first whitespace character for the end of a word.
++ while (end < length && !Character.isWhitespace(line.codePointAt(end)))
++ end++;
++
++ cb.notifyFile(line.substring(start, end));
++
++ start = end + 1;
++ }
++ }
++
++ /** Implementation of {@link FileArgumentCallback} that handles
++ * file arguments in {@link #notifyFile} starting with a <code>@</code>
++ * through {@link ClasspathToolParser#parseFileList}.
++ */
++ class AtFileArgumentCallback extends FileArgumentCallback
++ {
++ FileArgumentCallback cb;
++
++ AtFileArgumentCallback(FileArgumentCallback cb)
++ {
++ this.cb = cb;
++ }
++
++ public void notifyFile(String fileArgument)
++ throws OptionException
++ {
++ if (fileArgument.codePointAt(0) == '@')
++ {
++ FileReader fr = null;
++
++ try
++ {
++ fr = new FileReader(fileArgument.substring(1));
++ }
++ catch (FileNotFoundException fnfe)
++ {
++ System.err.println(programName + ": file not found " + fileArgument.substring(1));
++ System.exit(1);
++ }
++
++ ClasspathToolParser.this.parseFileList(fr, cb);
++ }
++ else
++ cb.notifyFile(fileArgument);
++ }
++
++ }
++
+ }
+Index: tools/gnu/classpath/tools/getopt/Parser.java
+===================================================================
+RCS file: /sources/classpath/classpath/tools/gnu/classpath/tools/getopt/Parser.java,v
+retrieving revision 1.10
+diff -u -r1.10 Parser.java
+--- tools/gnu/classpath/tools/getopt/Parser.java 20 Mar 2008 18:04:44 -0000 1.10
++++ tools/gnu/classpath/tools/getopt/Parser.java 3 Jun 2008 16:34:45 -0000
+@@ -58,7 +58,7 @@
+ /** The maximum right column position. */
+ public static final int MAX_LINE_LENGTH = 80;
+
+- private String programName;
++ protected String programName;
+
+ private String headerText;
+
+Index: tools/gnu/classpath/tools/jar/Main.java
+===================================================================
+RCS file: /sources/classpath/classpath/tools/gnu/classpath/tools/jar/Main.java,v
+retrieving revision 1.11
+diff -u -r1.11 Main.java
+--- tools/gnu/classpath/tools/jar/Main.java 3 Jun 2008 14:02:13 -0000 1.11
++++ tools/gnu/classpath/tools/jar/Main.java 3 Jun 2008 16:34:45 -0000
+@@ -172,9 +172,9 @@
+ }
+ }
+
+- private Parser initializeParser()
++ private ClasspathToolParser initializeParser()
+ {
+- Parser p = new JarParser("jar"); //$NON-NLS-1$
++ ClasspathToolParser p = new JarParser("jar"); //$NON-NLS-1$
+ p.setHeader(Messages.getString("Main.Usage")); //$NON-NLS-1$
+
+ OptionGroup grp = new OptionGroup(Messages.getString("Main.OpMode")); //$NON-NLS-1$
+@@ -265,11 +265,11 @@
+ private void run(String[] args)
+ throws InstantiationException, IllegalAccessException, IOException
+ {
+- Parser p = initializeParser();
++ ClasspathToolParser p = initializeParser();
+ // Special hack to emulate old tar-style commands.
+ if (args.length > 0 && args[0].charAt(0) != '-')
+ args[0] = '-' + args[0];
+- p.parse(args, new HandleFile());
++ p.parse(args, new HandleFile(), true);
+ if (readNamesFromStdin)
+ readNames();
+ Action t = (Action) operationMode.newInstance();
+Index: tools/gnu/classpath/tools/javah/GcjhMain.java
+===================================================================
+RCS file: /sources/classpath/classpath/tools/gnu/classpath/tools/javah/GcjhMain.java,v
+retrieving revision 1.1
+diff -u -r1.1 GcjhMain.java
+--- tools/gnu/classpath/tools/javah/GcjhMain.java 6 Mar 2007 18:52:34 -0000 1.1
++++ tools/gnu/classpath/tools/javah/GcjhMain.java 3 Jun 2008 16:34:46 -0000
+@@ -38,10 +38,11 @@
+
+ package gnu.classpath.tools.javah;
+
++import gnu.classpath.tools.common.ClasspathToolParser;
++
+ import gnu.classpath.tools.getopt.Option;
+ import gnu.classpath.tools.getopt.OptionException;
+ import gnu.classpath.tools.getopt.OptionGroup;
+-import gnu.classpath.tools.getopt.Parser;
+
+ import java.io.IOException;
+ import java.util.ArrayList;
+@@ -60,9 +61,9 @@
+ return "gcjh";
+ }
+
+- protected Parser getParser()
++ protected ClasspathToolParser getParser()
+ {
+- Parser result = super.getParser();
++ ClasspathToolParser result = super.getParser();
+
+ result.setHeader("usage: gcjh [OPTION]... CLASS...");
+
+Index: tools/gnu/classpath/tools/javah/Main.java
+===================================================================
+RCS file: /sources/classpath/classpath/tools/gnu/classpath/tools/javah/Main.java,v
+retrieving revision 1.10
+diff -u -r1.10 Main.java
+--- tools/gnu/classpath/tools/javah/Main.java 31 Jul 2007 16:15:53 -0000 1.10
++++ tools/gnu/classpath/tools/javah/Main.java 3 Jun 2008 16:34:46 -0000
+@@ -188,7 +188,7 @@
+ return "javah";
+ }
+
+- protected Parser getParser()
++ protected ClasspathToolParser getParser()
+ {
+ ClasspathToolParser result = new ClasspathToolParser(getName(), true);
+ result.setHeader("usage: javah [OPTIONS] CLASS...");
+@@ -339,8 +339,8 @@
+
+ protected void run(String[] args) throws IOException
+ {
+- Parser p = getParser();
+- String[] classNames = p.parse(args);
++ ClasspathToolParser p = getParser();
++ String[] classNames = p.parse(args, true);
+ postParse(classNames);
+ loader = classpath.getLoader();
+
============================================================
--- packages/classpath/files/sun-security-getproperty_0.96.1.patch ae460fe343c1bebc5fa267a1fecbd91b6061507a
+++ packages/classpath/files/sun-security-getproperty_0.96.1.patch ae460fe343c1bebc5fa267a1fecbd91b6061507a
@@ -0,0 +1,503 @@
+Index: gnu/classpath/debug/Simple1LineFormatter.java
+===================================================================
+--- gnu/classpath/debug/Simple1LineFormatter.java.orig 2006-07-11 18:03:59.000000000 +0200
++++ gnu/classpath/debug/Simple1LineFormatter.java 2008-06-04 11:14:14.000000000 +0200
+@@ -38,8 +38,6 @@
+
+ package gnu.classpath.debug;
+
+-import gnu.java.security.action.GetPropertyAction;
+-
+ import java.io.PrintWriter;
+ import java.io.StringWriter;
+ import java.security.AccessController;
+@@ -51,6 +49,8 @@
+ import java.util.logging.Formatter;
+ import java.util.logging.LogRecord;
+
++import sun.security.action.GetPropertyAction;
++
+ /**
+ * A simple 1-line formatter to use instead of the 2-line SimpleFormatter used
+ * by default in the JDK logging handlers.
+Index: gnu/classpath/debug/SystemLogger.java
+===================================================================
+--- gnu/classpath/debug/SystemLogger.java.orig 2006-12-10 21:25:41.000000000 +0100
++++ gnu/classpath/debug/SystemLogger.java 2008-06-04 11:14:14.000000000 +0200
+@@ -38,13 +38,13 @@
+
+ package gnu.classpath.debug;
+
+-import gnu.java.security.action.GetPropertyAction;
+-
+ import java.security.AccessController;
+ import java.util.StringTokenizer;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+
++import sun.security.action.GetPropertyAction;
++
+ public final class SystemLogger extends Logger
+ {
+ public static final SystemLogger SYSTEM = new SystemLogger();
+Index: gnu/java/security/PolicyFile.java
+===================================================================
+--- gnu/java/security/PolicyFile.java.orig 2006-07-11 18:03:59.000000000 +0200
++++ gnu/java/security/PolicyFile.java 2008-06-04 11:14:50.000000000 +0200
+@@ -39,7 +39,6 @@
+
+ import gnu.classpath.debug.Component;
+ import gnu.classpath.debug.SystemLogger;
+-import gnu.java.security.action.GetPropertyAction;
+
+ import java.io.File;
+ import java.io.IOException;
+@@ -72,6 +71,8 @@
+ import java.util.StringTokenizer;
+ import java.util.logging.Logger;
+
++import sun.security.action.GetPropertyAction;
++
+ /**
+ * An implementation of a {@link java.security.Policy} object whose
+ * permissions are specified by a <em>policy file</em>.
+Index: gnu/java/security/action/GetPropertyAction.java
+===================================================================
+--- gnu/java/security/action/GetPropertyAction.java 2006-12-10 21:25:42.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,89 +0,0 @@
+-/* GetPropertyAction.java
+- Copyright (C) 2004 Free Software Foundation, Inc.
+-
+-This file is part of GNU Classpath.
+-
+-GNU Classpath 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, or (at your option)
+-any later version.
+-
+-GNU Classpath 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 GNU Classpath; see the file COPYING. If not, write to the
+-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+-02110-1301 USA.
+-
+-Linking this library statically or dynamically with other modules is
+-making a combined work based on this library. Thus, the terms and
+-conditions of the GNU General Public License cover the whole
+-combination.
+-
+-As a special exception, the copyright holders of this library give you
+-permission to link this library with independent modules to produce an
+-executable, regardless of the license terms of these independent
+-modules, and to copy and distribute the resulting executable under
+-terms of your choice, provided that you also meet, for each linked
+-independent module, the terms and conditions of the license of that
+-module. An independent module is a module which is not derived from
+-or based on this library. If you modify this library, you may extend
+-this exception to your version of the library, but you are not
+-obligated to do so. If you do not wish to do so, delete this
+-exception statement from your version. */
+-
+-package gnu.java.security.action;
+-
+-import java.security.PrivilegedAction;
+-
+-/**
+- * PrivilegedAction implementation that calls System.getProperty() with
+- * the property name passed to its constructor.
+- *
+- * Example of use:
+- * <code>
+- * GetPropertyAction action = new GetPropertyAction("http.proxyPort");
+- * String port = AccessController.doPrivileged(action);
+- * </code>
+- */
+-public class GetPropertyAction implements PrivilegedAction<String>
+-{
+- String name;
+- String value = null;
+-
+- public GetPropertyAction()
+- {
+- }
+-
+- public GetPropertyAction(String propName)
+- {
+- setParameters(propName);
+- }
+-
+- public GetPropertyAction(String propName, String defaultValue)
+- {
+- setParameters(propName, defaultValue);
+- }
+-
+- public String run()
+- {
+- return System.getProperty(name, value);
+- }
+-
+- public GetPropertyAction setParameters(String propName)
+- {
+- this.name = propName;
+- this.value = null;
+- return this;
+- }
+-
+- public GetPropertyAction setParameters(String propName, String defaultValue)
+- {
+- this.name = propName;
+- this.value = defaultValue;
+- return this;
+- }
+-}
+Index: gnu/java/security/key/dss/DSSKey.java
+===================================================================
+--- gnu/java/security/key/dss/DSSKey.java.orig 2006%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rb099f51e6cdab1cf887a065a32d2951453ff375c -re8b3409511829c8c35d2859b5756d0206fbb3016
#
#
#
# add_dir "packages/gpe-conf/gpe-conf-0.2.7"
#
# add_file "packages/gpe-conf/gpe-conf-0.2.7/poweroff.patch"
# content [6ab00b3206763a0a6da1971b569bed117002e6ce]
#
# add_file "packages/gpe-login/gpe-login_0.93.bb"
# content [37a976053be7e397317ee38072b254e3fac7a435]
#
# patch "packages/gpe-conf/gpe-conf_0.2.7.bb"
# from [68996b4d73e9f850d50609f764d56d76224be052]
# to [aec6e705144ef2c216329da9981aabf1bc351607]
#
# patch "packages/linux/linux-omap2-git/beagleboard/0002-ARM-OMAP-SmartReflex-driver.patch"
# from [f607feeebbd16cdd656e679bd16c7c86a930485f]
# to [60a4cfc3baeb42717cd3d587170266fde55853f5]
#
# patch "packages/linux/linux-omap2-git/beagleboard/0003-ARM-OMAP-SmartReflex-driver.patch"
# from [fd4898e49e30b7e445b457d50fdb9e359f7acd9d]
# to [c217e7265da8f9240d101a9d29fde6d43fa4435e]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [ecb7cdb5198df6553fd08189f0dbb14396e42319]
# to [bd91b3c4445c1e2d79946495f640cce338977b64]
#
# patch "packages/zlib/zlib_1.2.3.bb"
# from [29e47c464b402bc8f8366f8f3bba8bf991d595f6]
# to [5b7396f7a9126e153751bf2083c858125b44e365]
#
============================================================
--- packages/gpe-conf/gpe-conf-0.2.7/poweroff.patch 6ab00b3206763a0a6da1971b569bed117002e6ce
+++ packages/gpe-conf/gpe-conf-0.2.7/poweroff.patch 6ab00b3206763a0a6da1971b569bed117002e6ce
@@ -0,0 +1,11 @@
+--- gpe-conf/suid.c~ 2008-06-05 12:41:26.000000000 +0200
++++ gpe-conf/suid.c 2008-06-05 12:41:26.000000000 +0200
+@@ -454,7 +454,7 @@
+ else if (strcmp (cmd, "SHDN") == 0) // shutdown device
+ {
+ fscanf (in, "%100s", arg2);
+- system ("poweroff");
++ system ("/sbin/poweroff");
+ }
+ else if (strcmp (cmd, "MODP") == 0) /* modprobe kernel module */
+ {
============================================================
--- packages/gpe-login/gpe-login_0.93.bb 37a976053be7e397317ee38072b254e3fac7a435
+++ packages/gpe-login/gpe-login_0.93.bb 37a976053be7e397317ee38072b254e3fac7a435
@@ -0,0 +1,24 @@
+DESCRIPTION = "GPE user login screen"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
+RDEPENDS = "xkbd gpe-theme-clearlooks"
+RPROVIDES_${PN} = "gpe-session-starter"
+PR = "r0"
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpe autotools pkgconfig
+
+
+SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
+SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
+SRC_URI += " file://c-locale.patch;patch=1 "
+
+SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+
============================================================
--- packages/gpe-conf/gpe-conf_0.2.7.bb 68996b4d73e9f850d50609f764d56d76224be052
+++ packages/gpe-conf/gpe-conf_0.2.7.bb aec6e705144ef2c216329da9981aabf1bc351607
@@ -10,12 +10,14 @@ RCONFLICTS_${PN} = "bl"
RPROVIDES_${PN} += " bl"
RCONFLICTS_${PN} = "bl"
-PR = "r0"
+PR = "r1"
GPE_TARBALL_SUFFIX = "bz2"
inherit gpe autotools pkgconfig
+SRC_URI += "file://poweroff.patch;patch=1"
+
PACKAGES += "gpe-conf-panel"
FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \
============================================================
--- packages/linux/linux-omap2-git/beagleboard/0002-ARM-OMAP-SmartReflex-driver.patch f607feeebbd16cdd656e679bd16c7c86a930485f
+++ packages/linux/linux-omap2-git/beagleboard/0002-ARM-OMAP-SmartReflex-driver.patch 60a4cfc3baeb42717cd3d587170266fde55853f5
@@ -2,19 +2,19 @@ Subject: [PATCH 2/3] ARM: OMAP: SmartRef
To: linux-omap at vger.kernel.org
Cc: Kalle Jokiniemi <ext-kalle.jokiniemi at nokia.com>
Subject: [PATCH 2/3] ARM: OMAP: SmartReflex driver: added required register and bit definitions.
-Date: Fri, 30 May 2008 17:12:26 +0300
+Date: Fri, 6 Jun 2008 12:49:48 +0300
Added new register and bit definitions to enable Smartreflex driver integration.
Also PRM_VC_SMPS_SA bit definitions' naming was changed to match the naming of
other similar bit definitions.
-
Signed-off-by: Kalle Jokiniemi <ext-kalle.jokiniemi at nokia.com>
---
arch/arm/mach-omap2/prm-regbits-34xx.h | 27 ++++++--
arch/arm/mach-omap2/smartreflex.h | 124 ++++++++++++++++++++++++++++++-
+ include/asm-arm/arch-omap/control.h | 19 +++++
include/asm-arm/arch-omap/omap34xx.h | 2 +
- 3 files changed, 144 insertions(+), 9 deletions(-)
+ 4 files changed, 163 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-omap2/prm-regbits-34xx.h b/arch/arm/mach-omap2/prm-regbits-34xx.h
index c6a7940..f82b5a7 100644
@@ -224,6 +224,43 @@ index 62907ef..2091a15 100644
+#endif
+
+diff --git a/include/asm-arm/arch-omap/control.h b/include/asm-arm/arch-omap/control.h
+index 12bc22a..6e64fe7 100644
+--- a/include/asm-arm/arch-omap/control.h
++++ b/include/asm-arm/arch-omap/control.h
+@@ -138,6 +138,15 @@
+ #define OMAP343X_CONTROL_TEST_KEY_11 (OMAP2_CONTROL_GENERAL + 0x00f4)
+ #define OMAP343X_CONTROL_TEST_KEY_12 (OMAP2_CONTROL_GENERAL + 0x00f8)
+ #define OMAP343X_CONTROL_TEST_KEY_13 (OMAP2_CONTROL_GENERAL + 0x00fc)
++#define OMAP343X_CONTROL_FUSE_OPP1_VDD1 (OMAP2_CONTROL_GENERAL + 0x0110)
++#define OMAP343X_CONTROL_FUSE_OPP2_VDD1 (OMAP2_CONTROL_GENERAL + 0x0114)
++#define OMAP343X_CONTROL_FUSE_OPP3_VDD1 (OMAP2_CONTROL_GENERAL + 0x0118)
++#define OMAP343X_CONTROL_FUSE_OPP4_VDD1 (OMAP2_CONTROL_GENERAL + 0x011c)
++#define OMAP343X_CONTROL_FUSE_OPP5_VDD1 (OMAP2_CONTROL_GENERAL + 0x0120)
++#define OMAP343X_CONTROL_FUSE_OPP1_VDD2 (OMAP2_CONTROL_GENERAL + 0x0124)
++#define OMAP343X_CONTROL_FUSE_OPP2_VDD2 (OMAP2_CONTROL_GENERAL + 0x0128)
++#define OMAP343X_CONTROL_FUSE_OPP3_VDD2 (OMAP2_CONTROL_GENERAL + 0x012c)
++#define OMAP343X_CONTROL_FUSE_SR (OMAP2_CONTROL_GENERAL + 0x0130)
+ #define OMAP343X_CONTROL_IVA2_BOOTADDR (OMAP2_CONTROL_GENERAL + 0x0190)
+ #define OMAP343X_CONTROL_IVA2_BOOTMOD (OMAP2_CONTROL_GENERAL + 0x0194)
+ #define OMAP343X_CONTROL_TEMP_SENSOR (OMAP2_CONTROL_GENERAL + 0x02b4)
+@@ -172,6 +181,16 @@
+ #define OMAP2_SYSBOOT_1_MASK (1 << 1)
+ #define OMAP2_SYSBOOT_0_MASK (1 << 0)
+
++/* CONTROL_FUSE_SR bits */
++#define OMAP343X_SR2_SENNENABLE_MASK (0x3 << 10)
++#define OMAP343X_SR2_SENNENABLE_SHIFT 10
++#define OMAP343X_SR2_SENPENABLE_MASK (0x3 << 8)
++#define OMAP343X_SR2_SENPENABLE_SHIFT 8
++#define OMAP343X_SR1_SENNENABLE_MASK (0x3 << 2)
++#define OMAP343X_SR1_SENNENABLE_SHIFT 2
++#define OMAP343X_SR1_SENPENABLE_MASK (0x3 << 0)
++#define OMAP343X_SR1_SENPENABLE_SHIFT 0
++
+ #ifndef __ASSEMBLY__
+ #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
+ extern void __iomem *omap_ctrl_base_get(void);
diff --git a/include/asm-arm/arch-omap/omap34xx.h b/include/asm-arm/arch-omap/omap34xx.h
index 6a0459a..3667fd6 100644
--- a/include/asm-arm/arch-omap/omap34xx.h
@@ -239,4 +276,3 @@ 1.5.4.3
#if defined(CONFIG_ARCH_OMAP3430)
--
1.5.4.3
-
============================================================
--- packages/linux/linux-omap2-git/beagleboard/0003-ARM-OMAP-SmartReflex-driver.patch fd4898e49e30b7e445b457d50fdb9e359f7acd9d
+++ packages/linux/linux-omap2-git/beagleboard/0003-ARM-OMAP-SmartReflex-driver.patch c217e7265da8f9240d101a9d29fde6d43fa4435e
@@ -2,7 +2,8 @@ Subject: [PATCH 3/3] ARM: OMAP: SmartRef
To: linux-omap at vger.kernel.org
Cc: Kalle Jokiniemi <ext-kalle.jokiniemi at nokia.com>
Subject: [PATCH 3/3] ARM: OMAP: SmartReflex driver: integration to linux-omap
-Date: Mon, 2 Jun 2008 14:30:14 +0300
+Date: Fri, 6 Jun 2008 12:49:49 +0300
+Message-Id: <1212745789-13926-3-git-send-email-ext-kalle.jokiniemi at nokia.com>
- Changed register accesses to use prm_{read,write}_mod_reg and
prm_{set,clear,rmw}_mod_reg_bits() functions instread of
@@ -12,21 +13,24 @@ Date: Mon, 2 Jun 2008 14:30:14 +0300
- replaced cpu-related #ifdefs with if (cpu_is_xxxx()) calls.
-- removed EFUSE related ifdefs
+- Added E-fuse support: Use silicon characteristics parameters from E-fuse
- added smartreflex_disable/enable calls to pm34xx.c suspend function.
- Added "SmartReflex support" entry into Kconfig under "System type->TI OMAP
Implementations". It depends on ARCH_OMAP34XX and TWL4030_CORE.
+- Added "SmartReflex testing support" Kconfig option for using hard coded
+ software parameters instead of E-fuse parameters.
+
Signed-off-by: Kalle Jokiniemi <ext-kalle.jokiniemi at nokia.com>
---
arch/arm/mach-omap2/Makefile | 3 +
arch/arm/mach-omap2/pm34xx.c | 9 +
- arch/arm/mach-omap2/smartreflex.c | 457 ++++++++++++++++++++++---------------
- arch/arm/mach-omap2/smartreflex.h | 2 +-
- arch/arm/plat-omap/Kconfig | 17 ++
- 5 files changed, 302 insertions(+), 186 deletions(-)
+ arch/arm/mach-omap2/smartreflex.c | 531 +++++++++++++++++++++++--------------
+ arch/arm/mach-omap2/smartreflex.h | 9 +-
+ arch/arm/plat-omap/Kconfig | 31 +++
+ 5 files changed, 385 insertions(+), 198 deletions(-)
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 50c6657..f645b6e 100644
@@ -77,7 +81,7 @@ diff --git a/arch/arm/mach-omap2/smartre
}
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
-index dae7460..253369b 100644
+index dae7460..0b10a5d 100644
--- a/arch/arm/mach-omap2/smartreflex.c
+++ b/arch/arm/mach-omap2/smartreflex.c
@@ -3,6 +3,9 @@
@@ -90,7 +94,7 @@ index dae7460..253369b 100644
* Copyright (C) 2007 Texas Instruments, Inc.
* Lesly A M <x0080970 at ti.com>
*
-@@ -20,13 +23,15 @@
+@@ -20,13 +23,16 @@
#include <linux/err.h>
#include <linux/clk.h>
#include <linux/sysfs.h>
@@ -103,6 +107,7 @@ index dae7460..253369b 100644
-#include "prcm-regs.h"
+#include <asm/arch/omap34xx.h>
++#include <asm/arch/control.h>
+
+#include "prm.h"
#include "smartreflex.h"
@@ -110,7 +115,7 @@ index dae7460..253369b 100644
/* #define DEBUG_SR 1 */
-@@ -37,11 +42,16 @@
+@@ -37,11 +43,16 @@
# define DPRINTK(fmt, args...)
#endif
@@ -127,7 +132,7 @@ index dae7460..253369b 100644
u32 req_opp_no;
u32 opp1_nvalue, opp2_nvalue, opp3_nvalue, opp4_nvalue, opp5_nvalue;
u32 senp_mod, senn_mod;
-@@ -53,6 +63,7 @@ static struct omap_sr sr1 = {
+@@ -53,6 +64,7 @@ static struct omap_sr sr1 = {
.srid = SR1,
.is_sr_reset = 1,
.is_autocomp_active = 0,
@@ -135,7 +140,7 @@ index dae7460..253369b 100644
.srbase_addr = OMAP34XX_SR1_BASE,
};
-@@ -60,6 +71,7 @@ static struct omap_sr sr2 = {
+@@ -60,6 +72,7 @@ static struct omap_sr sr2 = {
.srid = SR2,
.is_sr_reset = 1,
.is_autocomp_active = 0,
@@ -143,7 +148,7 @@ index dae7460..253369b 100644
.srbase_addr = OMAP34XX_SR2_BASE,
};
-@@ -85,8 +97,6 @@ static inline u32 sr_read_reg(struct omap_sr *sr, int offset)
+@@ -85,8 +98,6 @@ static inline u32 sr_read_reg(struct omap_sr *sr, int offset)
return omap_readl(sr->srbase_addr + offset);
}
@@ -152,7 +157,7 @@ index dae7460..253369b 100644
static void cal_reciprocal(u32 sensor, u32 *sengain, u32 *rnsen)
{
u32 gn, rn, mul;
-@@ -100,7 +110,21 @@ static void cal_reciprocal(u32 sensor, u32 *sengain, u32 *rnsen)
+@@ -100,7 +111,21 @@ static void cal_reciprocal(u32 sensor, u32 *sengain, u32 *rnsen)
}
}
}
@@ -175,10 +180,11 @@ index dae7460..253369b 100644
static int sr_clk_enable(struct omap_sr *sr)
{
-@@ -131,20 +155,48 @@ static int sr_clk_disable(struct omap_sr *sr)
+@@ -131,22 +156,86 @@ static int sr_clk_disable(struct omap_sr *sr)
return 0;
}
+-static void sr_set_nvalues(struct omap_sr *sr)
+static void sr_set_clk_length(struct omap_sr *sr)
+{
+ struct clk *osc_sys_ck;
@@ -210,11 +216,47 @@ index dae7460..253369b 100644
+ }
+}
+
-+/*
-+ * TODO: once EFUSE is available, it should be used instead of these
-+ * pre-calculated values.
-+ */
- static void sr_set_nvalues(struct omap_sr *sr)
++static void sr_set_efuse_nvalues(struct omap_sr *sr)
++{
++ if (sr->srid == SR1) {
++ sr->senn_mod = (omap_ctrl_readl(OMAP343X_CONTROL_FUSE_SR) &
++ OMAP343X_SR1_SENNENABLE_MASK) >>
++ OMAP343X_SR1_SENNENABLE_SHIFT;
++
++ sr->senp_mod = (omap_ctrl_readl(OMAP343X_CONTROL_FUSE_SR) &
++ OMAP343X_SR1_SENPENABLE_MASK) >>
++ OMAP343X_SR1_SENPENABLE_SHIFT;
++
++ sr->opp5_nvalue = omap_ctrl_readl(
++ OMAP343X_CONTROL_FUSE_OPP5_VDD1);
++ sr->opp4_nvalue = omap_ctrl_readl(
++ OMAP343X_CONTROL_FUSE_OPP4_VDD1);
++ sr->opp3_nvalue = omap_ctrl_readl(
++ OMAP343X_CONTROL_FUSE_OPP3_VDD1);
++ sr->opp2_nvalue = omap_ctrl_readl(
++ OMAP343X_CONTROL_FUSE_OPP2_VDD1);
++ sr->opp1_nvalue = omap_ctrl_readl(
++ OMAP343X_CONTROL_FUSE_OPP1_VDD1);
++ } else if (sr->srid == SR2) {
++ sr->senn_mod = (omap_ctrl_readl(OMAP343X_CONTROL_FUSE_SR) &
++ OMAP343X_SR2_SENNENABLE_MASK) >>
++ OMAP343X_SR2_SENNENABLE_SHIFT;
++
++ sr->senp_mod = (omap_ctrl_readl(OMAP343X_CONTROL_FUSE_SR) &
++ OMAP343X_SR2_SENPENABLE_MASK) >>
++ OMAP343X_SR2_SENPENABLE_SHIFT;
++
++ sr->opp3_nvalue = omap_ctrl_readl(
++ OMAP343X_CONTROL_FUSE_OPP3_VDD2);
++ sr->opp2_nvalue = omap_ctrl_readl(
++ OMAP343X_CONTROL_FUSE_OPP2_VDD2);
++ sr->opp1_nvalue = omap_ctrl_readl(
++ OMAP343X_CONTROL_FUSE_OPP1_VDD2);
++ }
++}
++
++/* Hard coded nvalues for testing purposes, may cause device to hang! */
++static void sr_set_testing_nvalues(struct omap_sr *sr)
{
-#ifdef USE_EFUSE_VALUES
- u32 n1, n2;
@@ -228,10 +270,14 @@ index dae7460..253369b 100644
-#ifdef USE_EFUSE_VALUES
- /* Read values for VDD1 from EFUSE */
-#else
- /* since E-Fuse Values are not available, calculating the
- * reciprocal of the SenN and SenP values for SR1
+- /* since E-Fuse Values are not available, calculating the
+- * reciprocal of the SenN and SenP values for SR1
++ /* Calculating the reciprocal of the SenN and SenP values
++ * for SR1
*/
-@@ -216,15 +268,16 @@ static void sr_set_nvalues(struct omap_sr *sr)
+ sr->senp_mod = 0x03; /* SenN-M5 enabled */
+ sr->senn_mod = 0x03;
+@@ -216,15 +305,16 @@ static void sr_set_nvalues(struct omap_sr *sr)
(rnsenp << NVALUERECIPROCAL_RNSENP_SHIFT) |
(rnsenn << NVALUERECIPROCAL_RNSENN_SHIFT));
@@ -252,7 +298,7 @@ index dae7460..253369b 100644
/* since E-Fuse Values are not available, calculating the
* reciprocal of the SenN and SenP values for SR2
*/
-@@ -269,8 +322,6 @@ static void sr_set_nvalues(struct omap_sr *sr)
+@@ -269,134 +359,163 @@ static void sr_set_nvalues(struct omap_sr *sr)
(senngain << NVALUERECIPROCAL_SENNGAIN_SHIFT) |
(rnsenp << NVALUERECIPROCAL_RNSENP_SHIFT) |
(rnsenn << NVALUERECIPROCAL_RNSENN_SHIFT));
@@ -261,8 +307,19 @@ index dae7460..253369b 100644
}
}
-@@ -281,122 +332,145 @@ static void sr_configure_vp(int srid)
++static void sr_set_nvalues(struct omap_sr *sr)
++{
++ if (SR_TESTING_NVALUES)
++ sr_set_testing_nvalues(sr);
++ else
++ sr_set_efuse_nvalues(sr);
++}
++
+ static void sr_configure_vp(int srid)
+ {
+ u32 vpconfig;
+
if (srid == SR1) {
vpconfig = PRM_VP1_CONFIG_ERROROFFSET | PRM_VP1_CONFIG_ERRORGAIN
- | PRM_VP1_CONFIG_INITVOLTAGE | PRM_VP1_CONFIG_TIMEOUTEN;
@@ -492,7 +549,7 @@ index dae7460..253369b 100644
sr_write_reg(sr, SRCONFIG, sr_config);
sr_write_reg(sr, AVGWEIGHT, SR1_AVGWEIGHT_SENPAVGWEIGHT |
-@@ -408,18 +482,18 @@ static void sr_configure(struct omap_sr *sr)
+@@ -408,18 +527,18 @@ static void sr_configure(struct omap_sr *sr)
} else if (sr->srid == SR2) {
sr_config = SR2_SRCONFIG_ACCUMDATA |
@@ -514,15 +571,35 @@ index dae7460..253369b 100644
sr_modify_reg(sr, ERRCONFIG, (SR_ERRWEIGHT_MASK |
SR_ERRMAXLIMIT_MASK | SR_ERRMINLIMIT_MASK),
(SR2_ERRWEIGHT | SR2_ERRMAXLIMIT | SR2_ERRMINLIMIT));
-@@ -476,7 +550,6 @@ static void sr_enable(struct omap_sr *sr, u32 target_opp_no)
+@@ -428,9 +547,9 @@ static void sr_configure(struct omap_sr *sr)
+ sr->is_sr_reset = 0;
+ }
- if (current_nvalue == nvalue_reciprocal) {
- DPRINTK("System is already at the desired voltage level\n");
+-static void sr_enable(struct omap_sr *sr, u32 target_opp_no)
++static int sr_enable(struct omap_sr *sr, u32 target_opp_no)
+ {
+- u32 nvalue_reciprocal, current_nvalue;
++ u32 nvalue_reciprocal;
+
+ sr->req_opp_no = target_opp_no;
+
+@@ -472,11 +591,10 @@ static void sr_enable(struct omap_sr *sr, u32 target_opp_no)
+ }
+ }
+
+- current_nvalue = sr_read_reg(sr, NVALU%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list