diff options
84 files changed, 2808 insertions, 308 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 7ffb472058..3c6f5a15a1 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -706,6 +706,17 @@ def base_get_scmbasepath(d): path_to_bbfiles = bb.data.getVar( 'BBFILES', d, 1 ).split() return path_to_bbfiles[0][:path_to_bbfiles[0].rindex( "packages" )] +def base_get_metadata_monotone_branch(d): + monotone_branch = "<unknown>" + try: + monotone_branch = file( "%s/_MTN/options" % base_get_scmbasepath(d) ).read().strip() + if monotone_branch.startswith( "database" ): + monotone_branch_words = monotone_branch.split() + monotone_branch = monotone_branch_words[ monotone_branch_words.index( "branch" )+1][1:-1] + except: + pass + return monotone_branch + def base_get_metadata_monotone_revision(d): monotone_revision = "<unknown>" try: @@ -725,6 +736,7 @@ def base_get_metadata_svn_revision(d): pass return revision +METADATA_BRANCH ?= "${@base_get_metadata_monotone_branch(d)}" METADATA_REVISION ?= "${@base_get_metadata_monotone_revision(d)}" addhandler base_eventhandler @@ -757,7 +769,7 @@ python base_eventhandler() { if name.startswith("BuildStarted"): bb.data.setVar( 'BB_VERSION', bb.__version__, e.data ) - statusvars = ['BB_VERSION', 'METADATA_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU'] + statusvars = ['BB_VERSION', 'METADATA_BRANCH', 'METADATA_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU'] statuslines = ["%-17s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars] statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines) print statusmsg diff --git a/classes/devshell.bbclass b/classes/devshell.bbclass index 35456b517b..2944dbbfc2 100644 --- a/classes/devshell.bbclass +++ b/classes/devshell.bbclass @@ -3,6 +3,9 @@ EXTRA_OEMAKE[export] = "1" do_devshell[dirs] = "${S}" do_devshell[nostamp] = "1" +export DISPLAY +export XAUTHORITY + devshell_do_devshell() { export TERMWINDOWTITLE="Bitbake Developer Shell" ${TERMCMD} diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass index b86562890a..b256365175 100644 --- a/classes/gtk-icon-cache.bbclass +++ b/classes/gtk-icon-cache.bbclass @@ -3,14 +3,18 @@ RDEPENDS += "hicolor-icon-theme" # This could run on the host as icon cache files are architecture independent, # but there is no gtk-update-icon-cache built natively. -gtk-icon-cache_postinst() { +gtk_icon_cache_postinst() { if [ "x$D" != "x" ]; then exit 1 fi + +# Update the pixbuf loaders in case they haven't been registered yet +gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders + gtk-update-icon-cache -q /usr/share/icons/hicolor } -gtk-icon-cache_postrm() { +gtk_icon_cache_postrm() { gtk-update-icon-cache -q /usr/share/icons/hicolor } @@ -29,13 +33,13 @@ python populate_packages_append () { postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1) if not postinst: postinst = '#!/bin/sh\n' - postinst += bb.data.getVar('gtk-icon-cache_postinst', d, 1) + postinst += bb.data.getVar('gtk_icon_cache_postinst', d, 1) bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d) postrm = bb.data.getVar('pkg_postrm_%s' % pkg, d, 1) or bb.data.getVar('pkg_postrm', d, 1) if not postrm: postrm = '#!/bin/sh\n' - postrm += bb.data.getVar('gtk-icon-cache_postrm', d, 1) + postrm += bb.data.getVar('gtk_icon_cache_postrm', d, 1) bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d) } diff --git a/classes/image.bbclass b/classes/image.bbclass index 35080c19eb..6350a733e8 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -45,17 +45,33 @@ python () { # is searched for in the BBPATH (same as the old version.) # def get_devtable_list(d): - import bb - devtable = bb.data.getVar('IMAGE_DEVICE_TABLE', d, 1) - if devtable != None: - return devtable - str = "" - devtables = bb.data.getVar('IMAGE_DEVICE_TABLES', d, 1) - if devtables == None: - devtables = 'files/device_table-minimal.txt' - for devtable in devtables.split(): - str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable) - return str + import bb + devtable = bb.data.getVar('IMAGE_DEVICE_TABLE', d, 1) + if devtable != None: + return devtable + str = "" + devtables = bb.data.getVar('IMAGE_DEVICE_TABLES', d, 1) + if devtables == None: + devtables = 'files/device_table-minimal.txt' + for devtable in devtables.split(): + str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable) + return str + +def get_imagecmds(d): + import bb + cmds = "\n" + old_overrides = bb.data.getVar('OVERRIDES', d, 0) + for type in bb.data.getVar('IMAGE_FSTYPES', d, True).split(): + localdata = bb.data.createCopy(d) + bb.data.setVar('OVERRIDES', '%s:%s' % (type, old_overrides), localdata) + bb.data.update_data(localdata) + cmd = "\t#Code for image type " + type + "\n" + cmd += "\t${IMAGE_CMD_" + type + "}\n" + cmd += "\tcd ${DEPLOY_DIR_IMAGE}/\n" + cmd += "\trm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n" + cmd += "\tln -s ${IMAGE_NAME}.rootfs." + type + " ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n\n" + cmds += bb.data.expand(cmd, localdata) + return cmds IMAGE_POSTPROCESS_COMMAND ?= "" MACHINE_POSTPROCESS_COMMAND ?= "" @@ -86,25 +102,11 @@ fakeroot do_rootfs () { rootfs_${IMAGE_PKGTYPE}_do_rootfs - insert_feed_uris + insert_feed_uris ${IMAGE_PREPROCESS_COMMAND} - - export TOPDIR=${TOPDIR} - export DISTRO=${USERDISTRO} - export MACHINE=${MACHINE} - - for type in ${IMAGE_FSTYPES}; do - if test -z "$FAKEROOTKEY"; then - fakeroot -i ${TMPDIR}/fakedb.image ${PYTHON} `which bbimage` -t $type -e ${FILE} - else - ${PYTHON} `which bbimage` -n "${IMAGE_NAME}" -t "$type" -e "${FILE}" - fi - cd ${DEPLOY_DIR_IMAGE}/ - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type - ln -s ${IMAGE_NAME}.rootfs.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type - done + ${@get_imagecmds(d)} ${IMAGE_POSTPROCESS_COMMAND} @@ -122,19 +124,19 @@ do_deploy_to () { insert_feed_uris () { echo "Building feeds for [${DISTRO}].." - + for line in ${FEED_URIS} do # strip leading and trailing spaces/tabs, then split into name and uri line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`" feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`" - feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" + feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" echo "Added $feed_name feed with URL $feed_uri" # insert new feed-sources echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/opkg/${feed_name}-feed.conf - done + done # Allow to use package deploy directory contents as quick devel-testing # feed. This creates individual feed configs for each arch subdir of those @@ -162,7 +164,7 @@ log_check() { else echo "Cannot find logfile [$lf_path]" fi - echo "Logfile is clean" + echo "Logfile is clean" done set -x @@ -173,7 +175,7 @@ log_check() { zap_root_password () { sed 's%^root:[^:]*:%root:*:%' < ${IMAGE_ROOTFS}/etc/passwd >${IMAGE_ROOTFS}/etc/passwd.new - mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd + mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd } create_etc_timestamp() { diff --git a/classes/oestats-client.bbclass b/classes/oestats-client.bbclass index 69c708c151..ed81a0377e 100644 --- a/classes/oestats-client.bbclass +++ b/classes/oestats-client.bbclass @@ -5,7 +5,7 @@ # To make use of this class, add to your local.conf: # # INHERIT += "oestats-client" -# OESTATS_SERVER = "some.server.org:8000" +# OESTATS_SERVER = "some.server.org" # OESTATS_BUILDER = "some_nickname" def oestats_setid(d, val): @@ -44,7 +44,7 @@ def oestats_send(server, action, vars = {}, files = {}): # build headers headers = { - "User-agent": "oestats-client/0.1", + "User-agent": "oestats-client/0.4", "Content-type": "multipart/form-data; boundary=%s" % bound, "Content-length": str(len(body))} @@ -64,8 +64,9 @@ def oestats_start(server, builder, d): # send report id = "" try: - data = oestats_send(server, "/builds/start/", { + data = oestats_send(server, "/builds/", { 'builder': builder, + 'branch': bb.data.getVar('METADATA_BRANCH', d, True), 'revision': bb.data.getVar('METADATA_REVISION', d, True), 'machine': bb.data.getVar('MACHINE', d, True), 'distro': bb.data.getVar('DISTRO', d, True), @@ -81,7 +82,7 @@ def oestats_start(server, builder, d): bb.note("oestats: error starting build, disabling stats") oestats_setid(d, id) -def oestats_stop(server, d, status): +def oestats_stop(server, d, failures): import bb # retrieve build id @@ -89,8 +90,13 @@ def oestats_stop(server, d, status): if not id: return # send report + if failures > 0: + status = "Failed" + else: + status = "Succeeded" + try: - response = oestats_send(server, "/builds/stop/%s/" % id, { + response = oestats_send(server, "/builds/%s/" % id, { 'status': status, }) except: @@ -125,10 +131,12 @@ def oestats_task(server, d, task, status): # send report try: - response = oestats_send(server, "/builds/task/%s/" % id, { + response = oestats_send(server, "/tasks/", { + 'build': id, 'package': bb.data.getVar('PN', d, True), 'version': bb.data.getVar('PV', d, True), 'revision': bb.data.getVar('PR', d, True), + 'depends': bb.data.getVar('DEPENDS', d, True), 'task': task, 'status': status, 'time': str(elapsed), @@ -154,7 +162,7 @@ python oestats_eventhandler () { if getName(e) == 'BuildStarted': oestats_start(server, builder, e.data) elif getName(e) == 'BuildCompleted': - oestats_stop(server, e.data, 'Completed') + oestats_stop(server, e.data, e.getFailures()) elif getName(e) == 'TaskStarted': bb.data.setVar('OESTATS_STAMP', repr(time.time()), e.data) elif getName(e) == 'TaskSucceeded': diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 007c359225..c3263390d3 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -308,7 +308,8 @@ EXTRA_IMAGEDEPENDS = "" CROSS_DIR = "${TMPDIR}/cross" CROSS_DATADIR = "${CROSS_DIR}/share" -export PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbindir}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:${STAGING_DIR_NATIVE}${layout_base_sbindir}:" +PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbindir}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:${STAGING_DIR_NATIVE}${layout_base_sbindir}:" +export PATH ################################################################## # Build utility info. diff --git a/contrib/mtn-bisect.sh b/contrib/mtn-bisect.sh new file mode 100755 index 0000000000..e1c970d974 --- /dev/null +++ b/contrib/mtn-bisect.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +# the revision that we noticed does not longer build +LATEST_BAD_REV=$1 + +# an older revision that is known to build +LAST_KNOWN_GOOD_REV=$2 + +# count the number of commits +COUNT=`mtn log --brief --no-merges --no-graph --to p:$LAST_KNOWN_GOOD_REV --from $LATEST_BAD_REV | tee /tmp/candidates.txt | wc -l` + +echo $COUNT commits + +# if COUNT == 1 stop + +# make binary sections +COUNT=$(($(($COUNT + 1)) / 2)) + +CANDIDATE_REV=`cat /tmp/candidates.txt | head -n $COUNT | tail -n 1 | sed -e 's@\([a-f0-9]*\) .*@\1@'` + +echo $CANDIDATE_REV + +echo mtn up -r $CANDIDATE_REV +mtn up -r $CANDIDATE_REV + + diff --git a/packages/acpid/acpid_1.0.6.bb b/packages/acpid/acpid_1.0.6.bb new file mode 100644 index 0000000000..f48c262254 --- /dev/null +++ b/packages/acpid/acpid_1.0.6.bb @@ -0,0 +1,4 @@ +require acpid.inc +SRC_URI += "file://gcc40.patch;patch=1" +PR = "r3" + diff --git a/packages/cacao/cacao_0.98+hg20080519.bb b/packages/cacao/cacao_0.98+hg20080519.bb new file mode 100644 index 0000000000..efe0fbb898 --- /dev/null +++ b/packages/cacao/cacao_0.98+hg20080519.bb @@ -0,0 +1,24 @@ +require cacao.inc + +PR = "r0" + +SRC_URI = "http://downloads.openmoko.org/sources/cacao-0.98+hg20080519.tar.gz;md5sum=1c6e0530be63ec8a4c0ab2935c2fdc8f \ + file://cacao-hg20080519-classpath_var.patch;patch=1 \ + file://cacao-hg20080519-libdir.patch;patch=1 \ + " + +S = "${WORKDIR}/cacao" + +EXTRA_OECONF = "\ + ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \ + --enable-debug \ + --with-vm-zip=${datadir}/cacao/vm.zip \ + --with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-${PV} \ + --with-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \ + --with-target-java-runtime-library-classes=${datadir}/classpath/glibj.zip \ + --with-java-runtime-library-libdir=${libdir} \ + --with-jni_md_h=${STAGING_INCDIR}/classpath \ + --with-jni_h=${STAGING_INCDIR}/classpath \ + " + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/cacao/cacaoh-native_0.98+hg20080519.bb b/packages/cacao/cacaoh-native_0.98+hg20080519.bb new file mode 100644 index 0000000000..91880b20f9 --- /dev/null +++ b/packages/cacao/cacaoh-native_0.98+hg20080519.bb @@ -0,0 +1,15 @@ +require cacaoh-native.inc + +PR = "r0" + +SRC_URI = "http://downloads.openmoko.org/sources/cacao-0.98+hg20080519.tar.gz;md5sum=1c6e0530be63ec8a4c0ab2935c2fdc8f" + +S = "${WORKDIR}/cacao" + +EXTRA_OECONF = " \ + --with-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \ + --with-jni_md_h=${STAGING_INCDIR}/classpath \ + --with-jni_h=${STAGING_INCDIR}/classpath \ + " + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/cacao/files/cacao-hg20080519-classpath_var.patch b/packages/cacao/files/cacao-hg20080519-classpath_var.patch new file mode 100644 index 0000000000..a3e39e0062 --- /dev/null +++ b/packages/cacao/files/cacao-hg20080519-classpath_var.patch @@ -0,0 +1,67 @@ +Index: cacao/configure.ac +=================================================================== +--- cacao.orig/configure.ac 2008-05-21 14:16:33.000000000 +0800 ++++ cacao/configure.ac 2008-05-21 15:57:42.000000000 +0800 +@@ -772,6 +772,7 @@ + + AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX + AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES ++AC_CHECK_WITH_TARGET_JAVA_RUNTIME_LIBRARY_CLASSES + + if test x"${ENABLE_JRE_LAYOUT}" = "xno"; then + AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR +Index: cacao/m4/java-runtime-library.m4 +=================================================================== +--- cacao.orig/m4/java-runtime-library.m4 2008-05-21 14:16:34.000000000 +0800 ++++ cacao/m4/java-runtime-library.m4 2008-05-21 16:18:23.000000000 +0800 +@@ -106,6 +106,29 @@ + ]) + + ++dnl where are Java runtime library classes installed on the target ++ ++AC_DEFUN([AC_CHECK_WITH_TARGET_JAVA_RUNTIME_LIBRARY_CLASSES],[ ++AC_MSG_CHECKING(where Java runtime library classes are installed on the target) ++AC_ARG_WITH([target-java-runtime-library-classes], ++ [AS_HELP_STRING(--with-target-java-runtime-library-classes=<path>,path to Java runtime library classes (includes the name of the file and may be flat) [[default=(gnuclasspath:${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip,openjdk:${JAVA_RUNTIME_LIBRARY_PREFIX}/control/build/${OS_DIR}-${JAVA_ARCH}/classes,*:${JAVA_RUNTIME_LIBRARY_PREFIX})]])], ++ [TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${withval}], ++ [case "${WITH_JAVA_RUNTIME_LIBRARY}" in ++ gnuclasspath) ++ TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip ++ ;; ++ openjdk) ++ TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/control/build/${OS_DIR}-${JAVA_ARCH}/classes ++ ;; ++ *) ++ TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX} ++ ;; ++ esac]) ++AC_MSG_RESULT(${TARGET_JAVA_RUNTIME_LIBRARY_CLASSES}) ++AC_DEFINE_UNQUOTED([TARGET_JAVA_RUNTIME_LIBRARY_CLASSES], "${TARGET_JAVA_RUNTIME_LIBRARY_CLASSES}", [Java runtime library classes on the target]) ++AC_SUBST(TARGET_JAVA_RUNTIME_LIBRARY_CLASSES) ++]) ++ + dnl where are Java runtime library native libraries installed + + AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR],[ +Index: cacao/src/vm/properties.c +=================================================================== +--- cacao.orig/src/vm/properties.c 2008-05-21 14:16:34.000000000 +0800 ++++ cacao/src/vm/properties.c 2008-05-21 16:16:24.000000000 +0800 +@@ -295,14 +295,14 @@ + len = + strlen(CACAO_VM_ZIP) + + strlen(":") + +- strlen(JAVA_RUNTIME_LIBRARY_CLASSES) + ++ strlen(TARGET_JAVA_RUNTIME_LIBRARY_CLASSES) + + strlen("0"); + + boot_class_path = MNEW(char, len); + + strcpy(boot_class_path, CACAO_VM_ZIP); + strcat(boot_class_path, ":"); +- strcat(boot_class_path, JAVA_RUNTIME_LIBRARY_CLASSES); ++ strcat(boot_class_path, TARGET_JAVA_RUNTIME_LIBRARY_CLASSES); + + # elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK) + diff --git a/packages/cacao/files/cacao-hg20080519-libdir.patch b/packages/cacao/files/cacao-hg20080519-libdir.patch new file mode 100644 index 0000000000..1be13b3cfd --- /dev/null +++ b/packages/cacao/files/cacao-hg20080519-libdir.patch @@ -0,0 +1,30 @@ +Index: cacao/src/vm/properties.c +=================================================================== +--- cacao.orig/src/vm/properties.c 2008-05-21 15:26:21.000000000 +0800 ++++ cacao/src/vm/properties.c 2008-05-21 15:28:59.000000000 +0800 +@@ -211,15 +211,22 @@ + + # if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH) + +- boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR"/classpath"; ++ boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR"/classpath:OE_LIBDIR_JNI"; + + # elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK) + +- boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR; ++ boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR":OE_LIBDIR_JNI"; + + # elif defined(WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1) + +- /* No boot_library_path required. */ ++ /* No boot_library_path required. ++ Well, don't be that strict on Debian-like ++ environments. Setting this to /usr/lib/jni ++ makes it unneccessary to fumble with ++ LD_LIBRARY_PATH to get things like MIDPath ++ running. ++ */ ++ boot_library_path = "OE_LIBDIR_JNI"; + + # else + # error unknown classpath configuration diff --git a/packages/ctorrent/ctcs_1.4.1.bb b/packages/ctorrent/ctcs_1.4.1.bb new file mode 100644 index 0000000000..f56c283b35 --- /dev/null +++ b/packages/ctorrent/ctcs_1.4.1.bb @@ -0,0 +1,12 @@ +require ctorrent.inc + +DESCRIPTION += This is the controller of the enhanced version" +RDEPENDS = "perl perl-module-strict perl-module-socket perl-module-tcntl \ + perl-module-errno perl-module-sys-hostname" + +SRC_URI = "${SOURCEFORGE_MIRROR}/dtorrent/ctcs-${PV}.tar.gz" + +do_install () { + install -d ${D}/usr/bin + install -m 0755 ${S}/ctcs ${D}/usr/bin/ +} diff --git a/packages/ctorrent/ctorrent.inc b/packages/ctorrent/ctorrent.inc index 9557a2bf33..8005fa94e5 100644 --- a/packages/ctorrent/ctorrent.inc +++ b/packages/ctorrent/ctorrent.inc @@ -1,11 +1,10 @@ -DESCRIPTION = "CTorrent is a console BitTorrent client written in the C \ -programming language. This version is with the extensions from \ -http://www.rahul.net/dholmes/ctorrent/ (dnh2 + vfat patch)" -DEPENDS = "openssl" -LICENSE = "GPL" +DESCRIPTION = "CTorrent is a console BitTorrent client \ + with a focus on being lightweight and quick." +HOMEPAGE = "http://www.rahul.net/dholmes/ctorrent/" SECTION = "network" +LICENSE = "GPL" +DEPENDS = "openssl" SRC_URI = "${SOURCEFORGE_MIRROR}/ctorrent/ctorrent-${PV}.tar.bz2" -S = "${WORKDIR}/ctorrent-${PV}" inherit autotools diff --git a/packages/ctorrent/ctorrent_3.3.1.bb b/packages/ctorrent/ctorrent_3.3.1.bb new file mode 100644 index 0000000000..812c0644b0 --- /dev/null +++ b/packages/ctorrent/ctorrent_3.3.1.bb @@ -0,0 +1,5 @@ +require ctorrent.inc + +DESCRIPTION += "This is the Enhanced version from the dtorrent project" + +SRC_URI = "${SOURCEFORGE_MIRROR}/dtorrent/ctorrent-dnh${PV}.tar.gz" diff --git a/packages/dsplink/dsplink_1.50.bb b/packages/dsplink/dsplink_1.50.bb index 7051966ffc..dae3b04999 100644 --- a/packages/dsplink/dsplink_1.50.bb +++ b/packages/dsplink/dsplink_1.50.bb @@ -14,7 +14,7 @@ SRC_URI = "http://install.tarball.in.source.dir/dsplink_1_50.tar.gz \ file://CURRENTCFG.MK \ file://c64xx_5.xx_linux.mk \ file://davinci_mvlpro5.0.mk \ - file://prcs-fix-include.patch;patch=1 \ + file://prcs-fix-include.patch;patch=1;pnum=2 \ " S = "${WORKDIR}/dsplink_1_50/dsplink" diff --git a/packages/efl1/ecore-native_cvs.bb b/packages/efl1/ecore-native_cvs.bb index 9da21d32f6..f21ba5075a 100644 --- a/packages/efl1/ecore-native_cvs.bb +++ b/packages/efl1/ecore-native_cvs.bb @@ -1,7 +1,7 @@ require ecore.inc inherit native DEPENDS = "eet-native evas-native" -PR = "r4" +PR = "r0" EXTRA_OECONF = "\ --enable-ecore-txt \ diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc index 140254f897..a0d040888d 100644 --- a/packages/efl1/ecore.inc +++ b/packages/efl1/ecore.inc @@ -3,7 +3,7 @@ LICENSE = "MIT BSD" DEPENDS = "curl eet evas tslib libxtst libxscrnsaver" # optional # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv" -PV = "0.9.9.042+cvs${SRCDATE}" +PV = "0.9.9.043+cvs${SRCDATE}" inherit efl diff --git a/packages/efl1/ecore_cvs.bb b/packages/efl1/ecore_cvs.bb index 3f1c970b3d..e2ded16111 100644 --- a/packages/efl1/ecore_cvs.bb +++ b/packages/efl1/ecore_cvs.bb @@ -1,5 +1,5 @@ require ecore.inc -PR = "r3" +PR = "r0" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/packages/efl1/edb_cvs.bb b/packages/efl1/edb_cvs.bb index 8b3731412f..9158590b03 100644 --- a/packages/efl1/edb_cvs.bb +++ b/packages/efl1/edb_cvs.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Edb is the Enlightenment database library" LICENSE = "MIT BSD" DEPENDS = "zlib" -PV = "1.0.5.042+cvs${SRCDATE}" +PV = "1.0.5.043+cvs${SRCDATE}" PR = "r0" inherit efl diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb index 812da033ec..e59ba0be1a 100644 --- a/packages/efl1/edbus_cvs.bb +++ b/packages/efl1/edbus_cvs.bb @@ -1,8 +1,8 @@ DESCRIPTION = "DBus and HAL convenience wrappers for EFL" DEPENDS = "dbus ecore efreet ewl" LICENSE = "MIT BSD" -PV = "0.1.0.042+cvs${SRCDATE}" -PR = "r5" +PV = "0.5.0.043+cvs${SRCDATE}" +PR = "r0" inherit efl diff --git a/packages/efl1/edje_cvs.bb b/packages/efl1/edje_cvs.bb index 5e78575efa..757b643e75 100644 --- a/packages/efl1/edje_cvs.bb +++ b/packages/efl1/edje_cvs.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library" DEPENDS = "eet evas ecore embryo edje-native" LICENSE = "MIT BSD" -PV = "0.5.0.042+cvs${SRCDATE}" +PV = "0.9.9.043+cvs${SRCDATE}" PR = "r0" inherit efl diff --git a/packages/efl1/eet_cvs.bb b/packages/efl1/eet_cvs.bb index c834cfa60a..9ed58e100a 100644 --- a/packages/efl1/eet_cvs.bb +++ b/packages/efl1/eet_cvs.bb @@ -1,7 +1,7 @@ DESCRIPTION = "EET is the Enlightenment data storage library" DEPENDS = "zlib jpeg" LICENSE = "MIT BSD" -PV = "0.9.10.042+cvs${SRCDATE}" +PV = "1.0.1+cvs${SRCDATE}" PR = "r0" inherit efl diff --git a/packages/efl1/efreet_cvs.bb b/packages/efl1/efreet_cvs.bb index 3087391312..36a3bdf3cf 100644 --- a/packages/efl1/efreet_cvs.bb +++ b/packages/efl1/efreet_cvs.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The Enlightenment freedesktop.org library" DEPENDS = "ecore" LICENSE = "MIT BSD" -PV = "0.0.3.042+cvs${SRCDATE}" +PV = "0.5.0.043+cvs${SRCDATE}" PR = "r0" inherit efl diff --git a/packages/efl1/embryo_cvs.bb b/packages/efl1/embryo_cvs.bb index f6ae8abe71..02385e9ec7 100644 --- a/packages/efl1/embryo_cvs.bb +++ b/packages/efl1/embryo_cvs.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The Enlightenment C-like scripting language for Edje" LICENSE = "MIT BSD" -PV = "0.9.1.042+cvs${SRCDATE}" +PV = "0.9.9.043+cvs${SRCDATE}" PR = "r0" inherit efl diff --git a/packages/efl1/esmart_cvs.bb b/packages/efl1/esmart_cvs.bb index 6cdae5754d..5a363655c3 100644 --- a/packages/efl1/esmart_cvs.bb +++ b/packages/efl1/esmart_cvs.bb @@ -1,7 +1,8 @@ DESCRIPTION = "ESmart is a collection of smart Evas objects" LICENSE = "MIT BSD" DEPENDS = "evas ecore edje imlib2 epsilon libtool" -PV = "0.9.0.042+cvs${SRCDATE}" +PV = "0.9.0.043+cvs${SRCDATE}" +PR = "r0" inherit efl diff --git a/packages/efl1/evas-native_cvs.bb b/packages/efl1/evas-native_cvs.bb index 3ca8df9e41..b2a235262d 100644 --- a/packages/efl1/evas-native_cvs.bb +++ b/packages/efl1/evas-native_cvs.bb @@ -1,7 +1,7 @@ require evas.inc inherit native DEPENDS = "freetype-native libpng-native jpeg-native eet-native" -PR = "r1" +PR = "r0" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc index 8cfeffbf0b..10dd8ad529 100644 --- a/packages/efl1/evas.inc +++ b/packages/efl1/evas.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Evas is the Enlightenment canvas API" LICENSE = "MIT BSD" # can also depend on valgrind, libsdl-x11, directfb DEPENDS = "eet freetype jpeg libpng virtual/libx11 libxext libxrender" -PV = "0.9.9.042+cvs${SRCDATE}" +PV = "0.9.9.043+cvs${SRCDATE}" inherit efl diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb index e7079615de..ebe604ec2b 100644 --- a/packages/efl1/evas_cvs.bb +++ b/packages/efl1/evas_cvs.bb @@ -1,5 +1,5 @@ require evas.inc -PR = "r1" +PR = "r0" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb index 013f2666cb..ee5b3cfd23 100644 --- a/packages/glibc/eglibc_svn.bb +++ b/packages/glibc/eglibc_svn.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.8+svnr${SRCREV}" -PR = "r5" +PR = "r6" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://eglibc-svn-arm-cargs6.patch;patch=1 \ file://eglibc-svn-arm-check_pf.patch;patch=1 \ diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index bd1cb4f4e4..43a64d8af1 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -79,9 +79,6 @@ do_install() { mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED done rm -f ${D}/etc/rpc - rm -f ${D}${includedir}/scsi/sg.h - rm -f ${D}${includedir}/scsi/scsi_ioctl.h - rm -f ${D}${includedir}/scsi/scsi.h } TMP_LOCALE="/tmp/locale${libdir}/locale" @@ -250,6 +247,9 @@ python package_do_split_gconvs () { def output_locale_binary(name, locale, encoding): target_arch = bb.data.getVar("TARGET_ARCH", d, 1) + if target_arch in ("i586", "i686"): + target_arch = "i386" + qemu = "qemu-%s -r 2.6.16" % target_arch pkgname = 'locale-base-' + legitimize_package_name(name) m = re.match("(.*)\.(.*)", name) diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index bf4a4092fc..4a94dac5b7 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -1,7 +1,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r14" +PR = "r15" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb index 04d5b415bf..c40968dd7f 100644 --- a/packages/glibc/glibc_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r24" +PR = "r25" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb index 7289e0985a..6ea2951eb6 100644 --- a/packages/glibc/glibc_2.3.2.bb +++ b/packages/glibc/glibc_2.3.2.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r13" +PR = "r14" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb index 6bc6ccc0b1..9c344ccc46 100644 --- a/packages/glibc/glibc_2.3.3+cvs20041128.bb +++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r9" +PR = "r10" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb index 5e4ee1ef66..51de036ece 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050221.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r9" +PR = "r10" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb index 0b8376349e..6fb4b12293 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050420.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb @@ -5,7 +5,7 @@ DEFAULT_PREFERENCE_i586 = "0" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r7" +PR = "r8" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb index 6421e6c966..b1eeef30f0 100644 --- a/packages/glibc/glibc_2.3.3.bb +++ b/packages/glibc/glibc_2.3.3.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r10" +PR = "r11" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 1635f6bf77..4e80f90d2c 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -2,7 +2,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" -PR = "r16" +PR = "r17" #Doesnt build for sh3 DEFAULT_PREFERENCE_sh3="-1" diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index 85dfcb7f59..0ab3dbb157 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r14" +PR = "r15" #add the hosts that are confirmed to be working to COMPATIBLE_HOSTi COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)' diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index b48f3e1884..c74a748357 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -1,5 +1,5 @@ require glibc.inc -PR = "r11" +PR = "r12" ARM_INSTRUCTION_SET = "arm" diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb index e44e6bea14..c1c0c3150d 100644 --- a/packages/glibc/glibc_2.6.1.bb +++ b/packages/glibc/glibc_2.6.1.bb @@ -1,5 +1,5 @@ require glibc.inc -PR = "r4" +PR = "r5" ARM_INSTRUCTION_SET = "arm" diff --git a/packages/glibc/glibc_2.7.bb b/packages/glibc/glibc_2.7.bb index 74fc79f586..d355d85360 100644 --- a/packages/glibc/glibc_2.7.bb +++ b/packages/glibc/glibc_2.7.bb @@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev" -PR = "r1" +PR = "r2" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb index 62d4cc53c3..e5832e1f12 100644 --- a/packages/glibc/glibc_cvs.bb +++ b/packages/glibc/glibc_cvs.bb @@ -1,7 +1,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" -PR = "r7" +PR = "r8" PV = "2.3.5+cvs${SRCDATE}" GLIBC_ADDONS ?= "ports,linuxthreads" diff --git a/packages/glibmm/glibmm_2.14.2.bb b/packages/glibmm/glibmm_2.14.2.bb deleted file mode 100644 index aeadede939..0000000000 --- a/packages/glibmm/glibmm_2.14.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require glibmm.inc - -DEFAULT_PREFERENCE = "-1" diff --git a/packages/glibmm/glibmm_2.12.10.bb b/packages/glibmm/glibmm_2.16.2.bb index 90a053fb36..90a053fb36 100644 --- a/packages/glibmm/glibmm_2.12.10.bb +++ b/packages/glibmm/glibmm_2.16.2.bb diff --git a/packages/linux-libc-headers/linux-libc-headers.inc b/packages/linux-libc-headers/linux-libc-headers.inc index aaf528dfb5..b49e855ed1 100644 --- a/packages/linux-libc-headers/linux-libc-headers.inc +++ b/packages/linux-libc-headers/linux-libc-headers.inc @@ -4,3 +4,7 @@ LICENSE = "GPL" RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" + +do_install_append() { + rm -rf ${D}${includedir}/scsi +} diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb index 3f5cc3a0b5..e316a2c6c1 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/" # standard linux kernel license applies. # since we assume GPL for linux i think we can also assume it here INHIBIT_DEFAULT_DEPS = "1" -PR = "r2" +PR = "r3" SRC_URI = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${PV}.tar.bz2 \ file://keyboard.patch;patch=1" diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb index 0dba90dc97..0c61d2acc4 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb @@ -13,7 +13,7 @@ require linux-libc-headers.inc # since we assume GPL for linux i think we can also assume it here DEFAULT_PREFERENCE = "-1" INHIBIT_DEFAULT_DEPS = "1" -PR = "r4" +PR = "r5" SRC_URI = "http://ewi546.ewi.utwente.nl/OE/eabi/linux-libc-headers-${PV}.tar.bz2 \ file://keyboard.patch;patch=1 \ diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb index 014fd23705..d71b68a930 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb @@ -2,7 +2,7 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r2" +PR = "r3" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ file://arm-syscall-define.patch;patch=1" diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb index 8794b17d96..587d21e1e4 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb @@ -2,7 +2,7 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r8" +PR = "r9" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://procinfo.h" diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb index 595edde810..0e5debcfa3 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb @@ -2,7 +2,7 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r1" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://procinfo.h" diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb index 0e5debcfa3..13579f9349 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb @@ -2,7 +2,7 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r2" +PR = "r3" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://procinfo.h" diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb index 932440b9d8..1c7a5885d2 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb @@ -1,7 +1,7 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" -PR = "r3" +PR = "r4" # NOTE: no need to package these headers, since the c library includes them. PACKAGES = "" diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb index 3ca17ea9a3..5e1c71ef1f 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/" # standard linux kernel license applies. # since we assume GPL for linux i think we can also assume it here INHIBIT_DEFAULT_DEPS = "1" -PR = "r7" +PR = "r8" # NOTE: no need to package these headers, since the c library includes them. PACKAGES = "" diff --git a/packages/linux/linux-omap2-git/beagleboard/00001-mcbsp-transform.patch b/packages/linux/linux-omap2-git/beagleboard/00001-mcbsp-transform.patch new file mode 100644 index 0000000000..452370bf3e --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/00001-mcbsp-transform.patch @@ -0,0 +1,1160 @@ +From: Eduardo Valentin <eduardo.valentin@indt.org.br>
+
+This patch transform mcbsp code into a very initial
+implementation of a platform driver.
+
+It also gets ride of ifdefs on mcbsp.c code.
+To do it, a platform data structure was defined.
+
+Platform devices are located in arch/arm/plat-omap/devices.c
+
+Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
+---
+ arch/arm/plat-omap/devices.c | 45 +++
+ arch/arm/plat-omap/mcbsp.c | 660 ++++++++++++++-----------------------
+ include/asm-arm/arch-omap/mcbsp.h | 73 ++++-
+ 3 files changed, 367 insertions(+), 411 deletions(-)
+
+diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
+index 099182b..b3e0147 100644
+--- a/arch/arm/plat-omap/devices.c
++++ b/arch/arm/plat-omap/devices.c
+@@ -27,6 +27,7 @@
+ #include <asm/arch/gpio.h>
+ #include <asm/arch/menelaus.h>
+ #include <asm/arch/dsp_common.h>
++#include <asm/arch/mcbsp.h>
+
+ #if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
+
+@@ -150,6 +151,49 @@ static inline void omap_init_kp(void) {}
+ #endif
+
+ /*-------------------------------------------------------------------------*/
++#if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE)
++
++static struct platform_device omap_mcbsp_devices[OMAP_MAX_MCBSP_COUNT];
++static int mcbsps_configured;
++
++void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,
++ int size)
++{
++ int i;
++
++ if (size > OMAP_MAX_MCBSP_COUNT) {
++ printk(KERN_WARNING "Registered too many McBSPs platform_data."
++ " Using maximum (%d) available.\n",
++ OMAP_MAX_MCBSP_COUNT);
++ size = OMAP_MAX_MCBSP_COUNT;
++ }
++
++ for (i = 0; i < size; i++) {
++ struct platform_device *new_mcbsp = &omap_mcbsp_devices[i];
++ new_mcbsp->name = "omap-mcbsp";
++ new_mcbsp->id = i + 1;
++ new_mcbsp->dev.platform_data = &config[i];
++ }
++ mcbsps_configured = size;
++}
++
++static void __init omap_init_mcbsp(void)
++{
++ int i;
++
++ for (i = 0; i < mcbsps_configured; i++)
++ platform_device_register(&omap_mcbsp_devices[i]);
++}
++#else
++void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,
++ int size)
++{ }
++
++static inline void __init omap_init_mcbsp(void)
++{ }
++#endif
++
++/*-------------------------------------------------------------------------*/
+
+ #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) \
+ || defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
+@@ -511,6 +555,7 @@ static int __init omap_init_devices(void)
+ */
+ omap_init_dsp();
+ omap_init_kp();
++ omap_init_mcbsp();
+ omap_init_mmc();
+ omap_init_uwire();
+ omap_init_wdt();
+diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
+index 053de31..5536223 100644
+--- a/arch/arm/plat-omap/mcbsp.c
++++ b/arch/arm/plat-omap/mcbsp.c
+@@ -15,6 +15,7 @@
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/device.h>
++#include <linux/platform_device.h>
+ #include <linux/wait.h>
+ #include <linux/completion.h>
+ #include <linux/interrupt.h>
+@@ -25,83 +26,53 @@
+ #include <linux/irq.h>
+
+ #include <asm/arch/dma.h>
+-#include <asm/arch/mux.h>
+-#include <asm/arch/irqs.h>
+-#include <asm/arch/dsp_common.h>
+ #include <asm/arch/mcbsp.h>
+
+-#ifdef CONFIG_MCBSP_DEBUG
+-#define DBG(x...) printk(x)
+-#else
+-#define DBG(x...) do { } while (0)
+-#endif
+-
+-struct omap_mcbsp {
+- u32 io_base;
+- u8 id;
+- u8 free;
+- omap_mcbsp_word_length rx_word_length;
+- omap_mcbsp_word_length tx_word_length;
+-
+- omap_mcbsp_io_type_t io_type; /* IRQ or poll */
+- /* IRQ based TX/RX */
+- int rx_irq;
+- int tx_irq;
+-
+- /* DMA stuff */
+- u8 dma_rx_sync;
+- short dma_rx_lch;
+- u8 dma_tx_sync;
+- short dma_tx_lch;
+-
+- /* Completion queues */
+- struct completion tx_irq_completion;
+- struct completion rx_irq_completion;
+- struct completion tx_dma_completion;
+- struct completion rx_dma_completion;
+-
+- /* Protect the field .free, while checking if the mcbsp is in use */
+- spinlock_t lock;
+-};
+-
+ static struct omap_mcbsp mcbsp[OMAP_MAX_MCBSP_COUNT];
+-#ifdef CONFIG_ARCH_OMAP1
+-static struct clk *mcbsp_dsp_ck;
+-static struct clk *mcbsp_api_ck;
+-static struct clk *mcbsp_dspxor_ck;
+-#endif
+-#ifdef CONFIG_ARCH_OMAP2
+-static struct clk *mcbsp1_ick;
+-static struct clk *mcbsp1_fck;
+-static struct clk *mcbsp2_ick;
+-static struct clk *mcbsp2_fck;
+-#endif
++
++#define omap_mcbsp_check_valid_id(id) (mcbsp[id].pdata && \
++ mcbsp[id].pdata->ops && \
++ mcbsp[id].pdata->ops->check && \
++ (mcbsp[id].pdata->ops->check(id) == 0))
+
+ static void omap_mcbsp_dump_reg(u8 id)
+ {
+- DBG("**** MCBSP%d regs ****\n", mcbsp[id].id);
+- DBG("DRR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DRR2));
+- DBG("DRR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DRR1));
+- DBG("DXR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DXR2));
+- DBG("DXR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DXR1));
+- DBG("SPCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR2));
+- DBG("SPCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR1));
+- DBG("RCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, RCR2));
+- DBG("RCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, RCR1));
+- DBG("XCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, XCR2));
+- DBG("XCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, XCR1));
+- DBG("SRGR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR2));
+- DBG("SRGR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR1));
+- DBG("PCR0: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, PCR0));
+- DBG("***********************\n");
++ dev_dbg(mcbsp[id].dev, "**** McBSP%d regs ****\n", mcbsp[id].id);
++ dev_dbg(mcbsp[id].dev, "DRR2: 0x%04x\n",
++ OMAP_MCBSP_READ(mcbsp[id].io_base, DRR2));
++ dev_dbg(mcbsp[id].dev, "DRR1: 0x%04x\n",
++ OMAP_MCBSP_READ(mcbsp[id].io_base, DRR1));
++ dev_dbg(mcbsp[id].dev, "DXR2: 0x%04x\n",
++ OMAP_MCBSP_READ(mcbsp[id].io_base, DXR2));
++ dev_dbg(mcbsp[id].dev, "DXR1: 0x%04x\n",
++ OMAP_MCBSP_READ(mcbsp[id].io_base, DXR1));
++ dev_dbg(mcbsp[id].dev, "SPCR2: 0x%04x\n",
++ OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR2));
++ dev_dbg(mcbsp[id].dev, "SPCR1: 0x%04x\n",
++ OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR1));
++ dev_dbg(mcbsp[id].dev, "RCR2: 0x%04x\n",
++ OMAP_MCBSP_READ(mcbsp[id].io_base, RCR2));
++ dev_dbg(mcbsp[id].dev, "RCR1: 0x%04x\n",
++ OMAP_MCBSP_READ(mcbsp[id].io_base, RCR1));
++ dev_dbg(mcbsp[id].dev, "XCR2: 0x%04x\n",
++ OMAP_MCBSP_READ(mcbsp[id].io_base, XCR2));
++ dev_dbg(mcbsp[id].dev, "XCR1: 0x%04x\n",
++ OMAP_MCBSP_READ(mcbsp[id].io_base, XCR1));
++ dev_dbg(mcbsp[id].dev, "SRGR2: 0x%04x\n",
++ OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR2));
++ dev_dbg(mcbsp[id].dev, "SRGR1: 0x%04x\n",
++ OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR1));
++ dev_dbg(mcbsp[id].dev, "PCR0: 0x%04x\n",
++ OMAP_MCBSP_READ(mcbsp[id].io_base, PCR0));
++ dev_dbg(mcbsp[id].dev, "***********************\n");
+ }
+
+ static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id)
+ {
+ struct omap_mcbsp *mcbsp_tx = dev_id;
+
+- DBG("TX IRQ callback : 0x%x\n",
+- OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2));
++ dev_dbg(mcbsp_tx->dev, "TX IRQ callback : 0x%x\n",
++ OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2));
+
+ complete(&mcbsp_tx->tx_irq_completion);
+
+@@ -112,8 +83,8 @@ static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id)
+ {
+ struct omap_mcbsp *mcbsp_rx = dev_id;
+
+- DBG("RX IRQ callback : 0x%x\n",
+- OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR2));
++ dev_dbg(mcbsp_rx->dev, "RX IRQ callback : 0x%x\n",
++ OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR2));
+
+ complete(&mcbsp_rx->rx_irq_completion);
+
+@@ -124,8 +95,8 @@ static void omap_mcbsp_tx_dma_callback(int lch, u16 ch_status, void *data)
+ {
+ struct omap_mcbsp *mcbsp_dma_tx = data;
+
+- DBG("TX DMA callback : 0x%x\n",
+- OMAP_MCBSP_READ(mcbsp_dma_tx->io_base, SPCR2));
++ dev_dbg(mcbsp_dma_tx->dev, "TX DMA callback : 0x%x\n",
++ OMAP_MCBSP_READ(mcbsp_dma_tx->io_base, SPCR2));
+
+ /* We can free the channels */
+ omap_free_dma(mcbsp_dma_tx->dma_tx_lch);
+@@ -138,8 +109,8 @@ static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data)
+ {
+ struct omap_mcbsp *mcbsp_dma_rx = data;
+
+- DBG("RX DMA callback : 0x%x\n",
+- OMAP_MCBSP_READ(mcbsp_dma_rx->io_base, SPCR2));
++ dev_dbg(mcbsp_dma_rx->dev, "RX DMA callback : 0x%x\n",
++ OMAP_MCBSP_READ(mcbsp_dma_rx->io_base, SPCR2));
+
+ /* We can free the channels */
+ omap_free_dma(mcbsp_dma_rx->dma_rx_lch);
+@@ -156,9 +127,16 @@ static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data)
+ */
+ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config)
+ {
+- u32 io_base = mcbsp[id].io_base;
++ u32 io_base;
++
++ if (!omap_mcbsp_check_valid_id(id)) {
++ printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);
++ return;
++ }
+
+- DBG("OMAP-McBSP: McBSP%d io_base: 0x%8x\n", id + 1, io_base);
++ io_base = mcbsp[id].io_base;
++ dev_dbg(mcbsp[id].dev, "Configuring McBSP%d io_base: 0x%8x\n",
++ mcbsp[id].id, io_base);
+
+ /* We write the given config */
+ OMAP_MCBSP_WRITE(io_base, SPCR2, config->spcr2);
+@@ -175,97 +153,22 @@ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config)
+ }
+ EXPORT_SYMBOL(omap_mcbsp_config);
+
+-static int omap_mcbsp_check(unsigned int id)
+-{
+- if (cpu_is_omap730()) {
+- if (id > OMAP_MAX_MCBSP_COUNT - 1) {
+- printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n",
+- id + 1);
+- return -1;
+- }
+- return 0;
+- }
+-
+- if (cpu_is_omap15xx() || cpu_is_omap16xx() || cpu_is_omap24xx()) {
+- if (id > OMAP_MAX_MCBSP_COUNT) {
+- printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n",
+- id + 1);
+- return -1;
+- }
+- return 0;
+- }
+-
+- return -1;
+-}
+-
+-#ifdef CONFIG_ARCH_OMAP1
+-static void omap_mcbsp_dsp_request(void)
+-{
+- if (cpu_is_omap15xx() || cpu_is_omap16xx()) {
+- int ret;
+-
+- ret = omap_dsp_request_mem();
+- if (ret < 0) {
+- printk(KERN_ERR "Could not get dsp memory: %i\n", ret);
+- return;
+- }
+-
+- clk_enable(mcbsp_dsp_ck);
+- clk_enable(mcbsp_api_ck);
+-
+- /* enable 12MHz clock to mcbsp 1 & 3 */
+- clk_enable(mcbsp_dspxor_ck);
+-
+- /*
+- * DSP external peripheral reset
+- * FIXME: This should be moved to dsp code
+- */
+- __raw_writew(__raw_readw(DSP_RSTCT2) | 1 | 1 << 1,
+- DSP_RSTCT2);
+- }
+-}
+-
+-static void omap_mcbsp_dsp_free(void)
+-{
+- if (cpu_is_omap15xx() || cpu_is_omap16xx()) {
+- omap_dsp_release_mem();
+- clk_disable(mcbsp_dspxor_ck);
+- clk_disable(mcbsp_dsp_ck);
+- clk_disable(mcbsp_api_ck);
+- }
+-}
+-#endif
+-
+-#ifdef CONFIG_ARCH_OMAP2
+-static void omap2_mcbsp2_mux_setup(void)
+-{
+- if (cpu_is_omap2420()) {
+- omap_cfg_reg(Y15_24XX_MCBSP2_CLKX);
+- omap_cfg_reg(R14_24XX_MCBSP2_FSX);
+- omap_cfg_reg(W15_24XX_MCBSP2_DR);
+- omap_cfg_reg(V15_24XX_MCBSP2_DX);
+- omap_cfg_reg(V14_24XX_GPIO117);
+- }
+- /*
+- * Need to add MUX settings for OMAP 2430 SDP
+- */
+-}
+-#endif
+-
+ /*
+ * We can choose between IRQ based or polled IO.
+ * This needs to be called before omap_mcbsp_request().
+ */
+ int omap_mcbsp_set_io_type(unsigned int id, omap_mcbsp_io_type_t io_type)
+ {
+- if (omap_mcbsp_check(id) < 0)
+- return -EINVAL;
++ if (!omap_mcbsp_check_valid_id(id)) {
++ printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);
++ return -ENODEV;
++ }
+
+ spin_lock(&mcbsp[id].lock);
+
+ if (!mcbsp[id].free) {
+- printk(KERN_ERR "OMAP-McBSP: McBSP%d is currently in use\n",
+- id + 1);
++ dev_err(mcbsp[id].dev, "McBSP%d is currently in use\n",
++ mcbsp[id].id);
+ spin_unlock(&mcbsp[id].lock);
+ return -EINVAL;
+ }
+@@ -282,34 +185,20 @@ int omap_mcbsp_request(unsigned int id)
+ {
+ int err;
+
+- if (omap_mcbsp_check(id) < 0)
+- return -EINVAL;
+-
+-#ifdef CONFIG_ARCH_OMAP1
+- /*
+- * On 1510, 1610 and 1710, McBSP1 and McBSP3
+- * are DSP public peripherals.
+- */
+- if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3)
+- omap_mcbsp_dsp_request();
+-#endif
+-
+-#ifdef CONFIG_ARCH_OMAP2
+- if (cpu_is_omap24xx()) {
+- if (id == OMAP_MCBSP1) {
+- clk_enable(mcbsp1_ick);
+- clk_enable(mcbsp1_fck);
+- } else {
+- clk_enable(mcbsp2_ick);
+- clk_enable(mcbsp2_fck);
+- }
++ if (!omap_mcbsp_check_valid_id(id)) {
++ printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);
++ return -ENODEV;
+ }
+-#endif
++
++ if (mcbsp[id].pdata->ops->request)
++ mcbsp[id].pdata->ops->request(id);
++
++ mcbsp_clk_enable(&mcbsp[id]);
+
+ spin_lock(&mcbsp[id].lock);
+ if (!mcbsp[id].free) {
+- printk(KERN_ERR "OMAP-McBSP: McBSP%d is currently in use\n",
+- id + 1);
++ dev_err(mcbsp[id].dev, "McBSP%d is currently in use\n",
++ mcbsp[id].id);
+ spin_unlock(&mcbsp[id].lock);
+ return -1;
+ }
+@@ -322,9 +211,9 @@ int omap_mcbsp_request(unsigned int id)
+ err = request_irq(mcbsp[id].tx_irq, omap_mcbsp_tx_irq_handler,
+ 0, "McBSP", (void *) (&mcbsp[id]));
+ if (err != 0) {
+- printk(KERN_ERR "OMAP-McBSP: Unable to "
+- "request TX IRQ %d for McBSP%d\n",
+- mcbsp[id].tx_irq, mcbsp[id].id);
++ dev_err(mcbsp[id].dev, "Unable to request TX IRQ %d "
++ "for McBSP%d\n", mcbsp[id].tx_irq,
++ mcbsp[id].id);
+ return err;
+ }
+
+@@ -333,9 +222,9 @@ int omap_mcbsp_request(unsigned int id)
+ err = request_irq(mcbsp[id].rx_irq, omap_mcbsp_rx_irq_handler,
+ 0, "McBSP", (void *) (&mcbsp[id]));
+ if (err != 0) {
+- printk(KERN_ERR "OMAP-McBSP: Unable to "
+- "request RX IRQ %d for McBSP%d\n",
+- mcbsp[id].rx_irq, mcbsp[id].id);
++ dev_err(mcbsp[id].dev, "Unable to request RX IRQ %d "
++ "for McBSP%d\n", mcbsp[id].rx_irq,
++ mcbsp[id].id);
+ free_irq(mcbsp[id].tx_irq, (void *) (&mcbsp[id]));
+ return err;
+ }
+@@ -349,32 +238,20 @@ EXPORT_SYMBOL(omap_mcbsp_request);
+
+ void omap_mcbsp_free(unsigned int id)
+ {
+- if (omap_mcbsp_check(id) < 0)
++ if (!omap_mcbsp_check_valid_id(id)) {
++ printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);
+ return;
+-
+-#ifdef CONFIG_ARCH_OMAP1
+- if (cpu_class_is_omap1()) {
+- if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3)
+- omap_mcbsp_dsp_free();
+ }
+-#endif
+-
+-#ifdef CONFIG_ARCH_OMAP2
+- if (cpu_is_omap24xx()) {
+- if (id == OMAP_MCBSP1) {
+- clk_disable(mcbsp1_ick);
+- clk_disable(mcbsp1_fck);
+- } else {
+- clk_disable(mcbsp2_ick);
+- clk_disable(mcbsp2_fck);
+- }
+- }
+-#endif
++
++ if (mcbsp[id].pdata->ops->free)
++ mcbsp[id].pdata->ops->free(id);
++
++ mcbsp_clk_disable(&mcbsp[id]);
+
+ spin_lock(&mcbsp[id].lock);
+ if (mcbsp[id].free) {
+- printk(KERN_ERR "OMAP-McBSP: McBSP%d was not reserved\n",
+- id + 1);
++ dev_err(mcbsp[id].dev, "McBSP%d was not reserved\n",
++ mcbsp[id].id);
+ spin_unlock(&mcbsp[id].lock);
+ return;
+ }
+@@ -400,8 +277,10 @@ void omap_mcbsp_start(unsigned int id)
+ u32 io_base;
+ u16 w;
+
+- if (omap_mcbsp_check(id) < 0)
++ if (!omap_mcbsp_check_valid_id(id)) {
++ printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);
+ return;
++ }
+
+ io_base = mcbsp[id].io_base;
+
+@@ -435,8 +314,10 @@ void omap_mcbsp_stop(unsigned int id)
+ u32 io_base;
+ u16 w;
+
+- if (omap_mcbsp_check(id) < 0)
++ if (!omap_mcbsp_check_valid_id(id)) {
++ printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);
+ return;
++ }
+
+ io_base = mcbsp[id].io_base;
+
+@@ -457,7 +338,14 @@ EXPORT_SYMBOL(omap_mcbsp_stop);
+ /* polled mcbsp i/o operations */
+ int omap_mcbsp_pollwrite(unsigned int id, u16 buf)
+ {
+- u32 base = mcbsp[id].io_base;
++ u32 base;
++
++ if (!omap_mcbsp_check_valid_id(id)) {
++ printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);
++ return -ENODEV;
++ }
++
++ base = mcbsp[id].io_base;
+ writew(buf, base + OMAP_MCBSP_REG_DXR1);
+ /* if frame sync error - clear the error */
+ if (readw(base + OMAP_MCBSP_REG_SPCR2) & XSYNC_ERR) {
+@@ -479,8 +367,8 @@ int omap_mcbsp_pollwrite(unsigned int id, u16 buf)
+ (XRST),
+ base + OMAP_MCBSP_REG_SPCR2);
+ udelay(10);
+- printk(KERN_ERR
+- " Could not write to McBSP Register\n");
++ dev_err(mcbsp[id].dev, "Could not write to"
++ " McBSP%d Register\n", mcbsp[id].id);
+ return -2;
+ }
+ }
+@@ -492,7 +380,14 @@ EXPORT_SYMBOL(omap_mcbsp_pollwrite);
+
+ int omap_mcbsp_pollread(unsigned int id, u16 *buf)
+ {
+- u32 base = mcbsp[id].io_base;
++ u32 base;
++
++ if (!omap_mcbsp_check_valid_id(id)) {
++ printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);
++ return -ENODEV;
++ }
++
++ base = mcbsp[id].io_base;
+ /* if frame sync error - clear the error */
+ if (readw(base + OMAP_MCBSP_REG_SPCR1) & RSYNC_ERR) {
+ /* clear error */
+@@ -513,8 +408,8 @@ int omap_mcbsp_pollread(unsigned int id, u16 *buf)
+ (RRST),
+ base + OMAP_MCBSP_REG_SPCR1);
+ udelay(10);
+- printk(KERN_ERR
+- " Could not read from McBSP Register\n");
++ dev_err(mcbsp[id].dev, "Could not read from"
++ " McBSP%d Register\n", mcbsp[id].id);
+ return -2;
+ }
+ }
+@@ -531,12 +426,15 @@ EXPORT_SYMBOL(omap_mcbsp_pollread);
+ void omap_mcbsp_xmit_word(unsigned int id, u32 word)
+ {
+ u32 io_base;
+- omap_mcbsp_word_length word_length = mcbsp[id].tx_word_length;
++ omap_mcbsp_word_length word_length;
+
+- if (omap_mcbsp_check(id) < 0)
++ if (!omap_mcbsp_check_valid_id(id)) {
++ printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);
+ return;
++ }
+
+ io_base = mcbsp[id].io_base;
++ word_length = mcbsp[id].tx_word_length;
+
+ wait_for_completion(&(mcbsp[id].tx_irq_completion));
+
+@@ -550,11 +448,14 @@ u32 omap_mcbsp_recv_word(unsigned int id)
+ {
+ u32 io_base;
+ u16 word_lsb, word_msb = 0;
+- omap_mcbsp_word_length word_length = mcbsp[id].rx_word_length;
++ omap_mcbsp_word_length word_length;
+
+- if (omap_mcbsp_check(id) < 0)
+- return -EINVAL;
++ if (!omap_mcbsp_check_valid_id(id)) {
++ printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);
++ return -ENODEV;
++ }
+
++ word_length = mcbsp[id].rx_word_length;
+ io_base = mcbsp[id].io_base;
+
+ wait_for_completion(&(mcbsp[id].rx_irq_completion));
+@@ -569,11 +470,20 @@ EXPORT_SYMBOL(omap_mcbsp_recv_word);
+
+ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word)
+ {
+- u32 io_base = mcbsp[id].io_base;
+- omap_mcbsp_word_length tx_word_length = mcbsp[id].tx_word_length;
+- omap_mcbsp_word_length rx_word_length = mcbsp[id].rx_word_length;
++ u32 io_base;
++ omap_mcbsp_word_length tx_word_length;
++ omap_mcbsp_word_length rx_word_length;
+ u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0;
+
++ if (!omap_mcbsp_check_valid_id(id)) {
++ printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);
++ return -ENODEV;
++ }
++
++ io_base = mcbsp[id].io_base;
++ tx_word_length = mcbsp[id].tx_word_length;
++ rx_word_length = mcbsp[id].rx_word_length;
++
+ if (tx_word_length != rx_word_length)
+ return -EINVAL;
+
+@@ -587,7 +497,8 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word)
+ udelay(10);
+ OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST);
+ udelay(10);
+- printk(KERN_ERR "McBSP transmitter not ready\n");
++ dev_err(mcbsp[id].dev, "McBSP%d transmitter not "
++ "ready\n", mcbsp[id].id);
+ return -EAGAIN;
+ }
+ }
+@@ -607,7 +518,8 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word)
+ udelay(10);
+ OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST);
+ udelay(10);
+- printk(KERN_ERR "McBSP receiver not ready\n");
++ dev_err(mcbsp[id].dev, "McBSP%d receiver not "
++ "ready\n", mcbsp[id].id);
+ return -EAGAIN;
+ }
+ }
+@@ -623,11 +535,20 @@ EXPORT_SYMBOL(omap_mcbsp_spi_master_xmit_word_poll);
+
+ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word)
+ {
+- u32 io_base = mcbsp[id].io_base, clock_word = 0;
+- omap_mcbsp_word_length tx_word_length = mcbsp[id].tx_word_length;
+- omap_mcbsp_word_length rx_word_length = mcbsp[id].rx_word_length;
++ u32 io_base, clock_word = 0;
++ omap_mcbsp_word_length tx_word_length;
++ omap_mcbsp_word_length rx_word_length;
+ u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0;
+
++ if (!omap_mcbsp_check_valid_id(id)) {
++ printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);
++ return -ENODEV;
++ }
++
++ io_base = mcbsp[id].io_base;
++ tx_word_length = mcbsp[id].tx_word_length;
++ rx_word_length = mcbsp[id].rx_word_length;
++
+ if (tx_word_length != rx_word_length)
+ return -EINVAL;
+
+@@ -641,7 +562,8 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word)
+ udelay(10);
+ OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST);
+ udelay(10);
+- printk(KERN_ERR "McBSP transmitter not ready\n");
++ dev_err(mcbsp[id].dev, "McBSP%d transmitter not "
++ "ready\n", mcbsp[id].id);
+ return -EAGAIN;
+ }
+ }
+@@ -661,7 +583,8 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word)
+ udelay(10);
+ OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST);
+ udelay(10);
+- printk(KERN_ERR "McBSP receiver not ready\n");
++ dev_err(mcbsp[id].dev, "McBSP%d receiver not "
++ "ready\n", mcbsp[id].id);
+ return -EAGAIN;
+ }
+ }
+@@ -692,20 +615,24 @@ int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer,
+ int dest_port = 0;
+ int sync_dev = 0;
+
+- if (omap_mcbsp_check(id) < 0)
+- return -EINVAL;
++ if (!omap_mcbsp_check_valid_id(id)) {
++ printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);
++ return -ENODEV;
++ }
+
+ if (omap_request_dma(mcbsp[id].dma_tx_sync, "McBSP TX",
+ omap_mcbsp_tx_dma_callback,
+ &mcbsp[id],
+ &dma_tx_ch)) {
+- printk(KERN_ERR "OMAP-McBSP: Unable to request DMA channel for"
+- " McBSP%d TX. Trying IRQ based TX\n", id + 1);
++ dev_err(mcbsp[id].dev, " Unable to request DMA channel for "
++ "McBSP%d TX. Trying IRQ based TX\n",
++ mcbsp[id].id);
+ return -EAGAIN;
+ }
+ mcbsp[id].dma_tx_lch = dma_tx_ch;
+
+- DBG("TX DMA on channel %d\n", dma_tx_ch);
++ dev_err(mcbsp[id].dev, "McBSP%d TX DMA on channel %d\n", mcbsp[id].id,
++ dma_tx_ch);
+
+ init_completion(&(mcbsp[id].tx_dma_completion));
+
+@@ -713,7 +640,7 @@ int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer,
+ src_port = OMAP_DMA_PORT_TIPB;
+ dest_port = OMAP_DMA_PORT_EMIFF;
+ }
+- if (cpu_is_omap24xx())
++ if (cpu_class_is_omap2())
+ sync_dev = mcbsp[id].dma_tx_sync;
+
+ omap_set_dma_transfer_params(mcbsp[id].dma_tx_lch,
+@@ -749,20 +676,24 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer,
+ int dest_port = 0;
+ int sync_dev = 0;
+
+- if (omap_mcbsp_check(id) < 0)
+- return -EINVAL;
++ if (!omap_mcbsp_check_valid_id(id)) {
++ printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);
++ return -ENODEV;
++ }
+
+ if (omap_request_dma(mcbsp[id].dma_rx_sync, "McBSP RX",
+ omap_mcbsp_rx_dma_callback,
+ &mcbsp[id],
+ &dma_rx_ch)) {
+- printk(KERN_ERR "Unable to request DMA channel for McBSP%d RX."
+- " Trying IRQ based RX\n", id + 1);
++ dev_err(mcbsp[id].dev, "Unable to request DMA channel for "
++ "McBSP%d RX. Trying IRQ based RX\n",
++ mcbsp[id].id);
+ return -EAGAIN;
+ }
+ mcbsp[id].dma_rx_lch = dma_rx_ch;
+
+- DBG("RX DMA on channel %d\n", dma_rx_ch);
++ dev_err(mcbsp[id].dev, "McBSP%d RX DMA on channel %d\n", mcbsp[id].id,
++ dma_rx_ch);
+
+ init_completion(&(mcbsp[id].rx_dma_completion));
+
+@@ -770,7 +701,7 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer,
+ src_port = OMAP_DMA_PORT_TIPB;
+ dest_port = OMAP_DMA_PORT_EMIFF;
+ }
+- if (cpu_is_omap24xx())
++ if (cpu_class_is_omap2())
+ sync_dev = mcbsp[id].dma_rx_sync;
+
+ omap_set_dma_transfer_params(mcbsp[id].dma_rx_lch,
+@@ -809,8 +740,10 @@ void omap_mcbsp_set_spi_mode(unsigned int id,
+ {
+ struct omap_mcbsp_reg_cfg mcbsp_cfg;
+
+- if (omap_mcbsp_check(id) < 0)
++ if (!omap_mcbsp_check_valid_id(id)) {
++ printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);
+ return;
++ }
+
+ memset(&mcbsp_cfg, 0, sizeof(struct omap_mcbsp_reg_cfg));
+
+@@ -871,182 +804,91 @@ EXPORT_SYMBOL(omap_mcbsp_set_spi_mode);
+ * McBSP1 and McBSP3 are directly mapped on 1610 and 1510.
+ * 730 has only 2 McBSP, and both of them are MPU peripherals.
+ */
+-struct omap_mcbsp_info {
+- u32 virt_base;
+- u8 dma_rx_sync, dma_tx_sync;
+- u16 rx_irq, tx_irq;
+-};
++static int __init omap_mcbsp_probe(struct platform_device *pdev)
++{
++ struct omap_mcbsp_platform_data *pdata = pdev->dev.platform_data;
++ int id = pdev->id - 1;
++ int ret = 0;
++ int i;
+
+-#ifdef CONFIG_ARCH_OMAP730
+-static const struct omap_mcbsp_info mcbsp_730[] = {
+- [0] = { .virt_base = io_p2v(OMAP730_MCBSP1_BASE),
+- .dma_rx_sync = OMAP_DMA_MCBSP1_RX,
+- .dma_tx_sync = OMAP_DMA_MCBSP1_TX,
+- .rx_irq = INT_730_McBSP1RX,
+- .tx_irq = INT_730_McBSP1TX },
+- [1] = { .virt_base = io_p2v(OMAP730_MCBSP2_BASE),
+- .dma_rx_sync = OMAP_DMA_MCBSP3_RX,
+- .dma_tx_sync = OMAP_DMA_MCBSP3_TX,
+- .rx_irq = INT_730_McBSP2RX,
+- .tx_irq = INT_730_McBSP2TX },
+-};
+-#endif
+-
+-#ifdef CONFIG_ARCH_OMAP15XX
+-static const struct omap_mcbsp_info mcbsp_1510[] = {
+- [0] = { .virt_base = OMAP1510_MCBSP1_BASE,
+- .dma_rx_sync = OMAP_DMA_MCBSP1_RX,
+- .dma_tx_sync = OMAP_DMA_MCBSP1_TX,
+- .rx_irq = INT_McBSP1RX,
+- .tx_irq = INT_McBSP1TX },
+- [1] = { .virt_base = io_p2v(OMAP1510_MCBSP2_BASE),
+- .dma_rx_sync = OMAP_DMA_MCBSP2_RX,
+- .dma_tx_sync = OMAP_DMA_MCBSP2_TX,
+- .rx_irq = INT_1510_SPI_RX,
+- .tx_irq = INT_1510_SPI_TX },
+- [2] = { .virt_base = OMAP1510_MCBSP3_BASE,
+- .dma_rx_sync = OMAP_DMA_MCBSP3_RX,
+- .dma_tx_sync = OMAP_DMA_MCBSP3_TX,
+- .rx_irq = INT_McBSP3RX,
+- .tx_irq = INT_McBSP3TX },
+-};
+-#endif
+-
+-#if defined(CONFIG_ARCH_OMAP16XX)
+-static const struct omap_mcbsp_info mcbsp_1610[] = {
+- [0] = { .virt_base = OMAP1610_MCBSP1_BASE,
+- .dma_rx_sync = OMAP_DMA_MCBSP1_RX,
+- .dma_tx_sync = OMAP_DMA_MCBSP1_TX,
+- .rx_irq = INT_McBSP1RX,
+- .tx_irq = INT_McBSP1TX },
+- [1] = { .virt_base = io_p2v(OMAP1610_MCBSP2_BASE),
+- .dma_rx_sync = OMAP_DMA_MCBSP2_RX,
+- .dma_tx_sync = OMAP_DMA_MCBSP2_TX,
+- .rx_irq = INT_1610_McBSP2_RX,
+- .tx_irq = INT_1610_McBSP2_TX },
+- [2] = { .virt_base = OMAP1610_MCBSP3_BASE,
+- .dma_rx_sync = OMAP_DMA_MCBSP3_RX,
+- .dma_tx_sync = OMAP_DMA_MCBSP3_TX,
+- .rx_irq = INT_McBSP3RX,
+- .tx_irq = INT_McBSP3TX },
+-};
+-#endif
+-
+-#if defined(CONFIG_ARCH_OMAP24XX)
+-static const struct omap_mcbsp_info mcbsp_24xx[] = {
+- [0] = { .virt_base = IO_ADDRESS(OMAP24XX_MCBSP1_BASE),
+- .dma_rx_sync = OMAP24XX_DMA_MCBSP1_RX,
+- .dma_tx_sync = OMAP24XX_DMA_MCBSP1_TX,
+- .rx_irq = INT_24XX_MCBSP1_IRQ_RX,
+- .tx_irq = INT_24XX_MCBSP1_IRQ_TX,
+- },
+- [1] = { .virt_base = IO_ADDRESS(OMAP24XX_MCBSP2_BASE),
+- .dma_rx_sync = OMAP24XX_DMA_MCBSP2_RX,
+- .dma_tx_sync = OMAP24XX_DMA_MCBSP2_TX,
+- .rx_irq = INT_24XX_MCBSP2_IRQ_RX,
+- .tx_irq = INT_24XX_MCBSP2_IRQ_TX,
+- },
+-};
+-#endif
++ if (!pdata) {
++ dev_err(&pdev->dev, "McBSP device initialized without"
++ "platform data\n");
++ ret = -EINVAL;
++ goto exit;
++ }
+
+-static int __init omap_mcbsp_init(void)
++ dev_dbg(&pdev->dev, "Initializing OMAP McBSP (%d).\n", pdev->id);
++
++ if (id >= OMAP_MAX_MCBSP_COUNT) {
++ dev_err(&pdev->dev, "Invalid McBSP device id (%d)\n", id);
++ ret = -EINVAL;
++ goto exit;
++ }
++
++ spin_lock_init(&mcbsp[id].lock);
++ mcbsp[id].id = id + 1;
++ mcbsp[id].free = 1;
++ mcbsp[id].dma_tx_lch = -1;
++ mcbsp[id].dma_rx_lch = -1;
++
++ mcbsp[id].io_base = pdata->virt_base;
++ /* Default I/O is IRQ based */
++ mcbsp[id].io_type = OMAP_MCBSP_IRQ_IO;
++ mcbsp[id].tx_irq = pdata->tx_irq;
++ mcbsp[id].rx_irq = pdata->rx_irq;
++ mcbsp[id].dma_rx_sync = pdata->dma_rx_sync;
++ mcbsp[id].dma_tx_sync = pdata->dma_tx_sync;
++
++ mcbsp[id].nr_clocks = ARRAY_SIZE(pdata->clocks);
++ for (i = 0; i < ARRAY_SIZE(pdata->clocks); i++)
++ mcbsp[id].clocks[i] = clk_get(&pdev->dev, pdata->clocks[i]);
++
++ mcbsp[id].pdata = pdata;
++ mcbsp[id].dev = &pdev->dev;
++ platform_set_drvdata(pdev, &mcbsp[id]);
++
++exit:
++ return ret;
++}
++
++static int omap_mcbsp_remove(struct platform_device *pdev)
+ {
+- int mcbsp_count = 0, i;
+- static const struct omap_mcbsp_info *mcbsp_info;
++ struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev);
+
+- printk(KERN_INFO "Initializing OMAP McBSP system\n");
++ platform_set_drvdata(pdev, NULL);
++ if (mcbsp) {
++ int i;
+
+-#ifdef CONFIG_ARCH_OMAP1
+- mcbsp_dsp_ck = clk_get(0, "dsp_ck");
+- if (IS_ERR(mcbsp_dsp_ck)) {
+- printk(KERN_ERR "mcbsp: could not acquire dsp_ck handle.\n");
+- return PTR_ERR(mcbsp_dsp_ck);
+- }
+- mcbsp_api_ck = clk_get(0, "api_ck");
+- if (IS_ERR(mcbsp_api_ck)) {
+- printk(KERN_ERR "mcbsp: could not acquire api_ck handle.\n");
+- return PTR_ERR(mcbsp_api_ck);
+- }
+- mcbsp_dspxor_ck = clk_get(0, "dspxor_ck");
+- if (IS_ERR(mcbsp_dspxor_ck)) {
+- printk(KERN_ERR "mcbsp: could not acquire dspxor_ck handle.\n");
+- return PTR_ERR(mcbsp_dspxor_ck);
+- }
+-#endif
+-#ifdef CONFIG_ARCH_OMAP2
+- mcbsp1_ick = clk_get(0, "mcbsp1_ick");
+- if (IS_ERR(mcbsp1_ick)) {
+- printk(KERN_ERR "mcbsp: could not acquire "
+- "mcbsp1_ick handle.\n");
+- return PTR_ERR(mcbsp1_ick);
+- }
+- mcbsp1_fck = clk_get(0, "mcbsp1_fck");
+- if (IS_ERR(mcbsp1_fck)) {
+- printk(KERN_ERR "mcbsp: could not acquire "
+- "mcbsp1_fck handle.\n");
+- return PTR_ERR(mcbsp1_fck);
+- }
+- mcbsp2_ick = clk_get(0, "mcbsp2_ick");
+- if (IS_ERR(mcbsp2_ick)) {
+- printk(KERN_ERR "mcbsp: could not acquire "
+- "mcbsp2_ick handle.\n");
+- return PTR_ERR(mcbsp2_ick);
+- }
+- mcbsp2_fck = clk_get(0, "mcbsp2_fck");
+- if (IS_ERR(mcbsp2_fck)) {
+- printk(KERN_ERR "mcbsp: could not acquire "
+- "mcbsp2_fck handle.\n");
+- return PTR_ERR(mcbsp2_fck);
+- }
+-#endif
++ if (mcbsp->pdata && mcbsp->pdata->ops &&
++ mcbsp->pdata->ops->free)
++ mcbsp->pdata->ops->free(mcbsp->id);
+
+-#ifdef CONFIG_ARCH_OMAP730
+- if (cpu_is_omap730()) {
+- mcbsp_info = mcbsp_730;
+- mcbsp_count = ARRAY_SIZE(mcbsp_730);
+- }
+-#endif
+-#ifdef CONFIG_ARCH_OMAP15XX
+- if (cpu_is_omap15xx()) {
+- mcbsp_info = mcbsp_1510;
+- mcbsp_count = ARRAY_SIZE(mcbsp_1510);
+- }
+-#endif
+-#if defined(CONFIG_ARCH_OMAP16XX)
+- if (cpu_is_omap16xx()) {
+- mcbsp_info = mcbsp_1610;
+- mcbsp_count = ARRAY_SIZE(mcbsp_1610);
+- }
+-#endif
+-#if defined(CONFIG_ARCH_OMAP24XX)
+- if (cpu_is_omap24xx()) {
+- mcbsp_info = mcbsp_24xx;
+- mcbsp_count = ARRAY_SIZE(mcbsp_24xx);
+- omap2_mcbsp2_mux_setup();
+- }
+-#endif
+- for (i = 0; i < OMAP_MAX_MCBSP_COUNT ; i++) {
+- if (i >= mcbsp_count) {
+- mcbsp[i].io_base = 0;
+- mcbsp[i].free = 0;
+- continue;
+- }
+- mcbsp[i].id = i + 1;
+- mcbsp[i].free = 1;
+- mcbsp[i].dma_tx_lch = -1;
+- mcbsp[i].dma_rx_lch = -1;
+-
+- mcbsp[i].io_base = mcbsp_info[i].virt_base;
+- /* Default I/O is IRQ based */
+- mcbsp[i].io_type = OMAP_MCBSP_IRQ_IO;
+- mcbsp[i].tx_irq = mcbsp_info[i].tx_irq;
+- mcbsp[i].rx_irq = mcbsp_info[i].rx_irq;
+- mcbsp[i].dma_rx_sync = mcbsp_info[i].dma_rx_sync;
+- mcbsp[i].dma_tx_sync = mcbsp_info[i].dma_tx_sync;
+- spin_lock_init(&mcbsp[i].lock);
++ mcbsp_clk_disable(mcbsp);
++ mcbsp_clk_put(mcbsp);
++
++ for (i = 0; i < mcbsp->nr_clocks; i++)
++ mcbsp->clocks[i] = NULL;
++
++ mcbsp->free = 0;
++ mcbsp->dev = NULL;
+ }
+
+ return 0;
+ }
+
+-arch_initcall(omap_mcbsp_init);
++static struct platform_driver omap_mcbsp_driver = {
++ .probe = omap_mcbsp_probe,
++ .remove = omap_mcbsp_remove,
++ .driver = {
++ .name = "omap-mcbsp",
++ },
++};
++
++int __init omap_mcbsp_init(void)
++{
++ /* Register the McBSP driver */
++ return platform_driver_register(&omap_mcbsp_driver);
++}
++
++
+diff --git a/include/asm-arm/arch-omap/mcbsp.h b/include/asm-arm/arch-omap/mcbsp.h
+index b53c3b2..aa47421 100644
+--- a/include/asm-arm/arch-omap/mcbsp.h
++++ b/include/asm-arm/arch-omap/mcbsp.h
+@@ -24,7 +24,11 @@
+ #ifndef __ASM_ARCH_OMAP_MCBSP_H
+ #define __ASM_ARCH_OMAP_MCBSP_H
+
++#include <linux/completion.h>
++#include <linux/spinlock.h>
++
+ #include <asm/hardware.h>
++#include <asm/arch/clock.h>
+
+ #define OMAP730_MCBSP1_BASE 0xfffb1000
+ #define OMAP730_MCBSP2_BASE 0xfffb1800
+@@ -40,6 +44,9 @@
+ #define OMAP24XX_MCBSP1_BASE 0x48074000
+ #define OMAP24XX_MCBSP2_BASE 0x48076000
+
++#define OMAP34XX_MCBSP1_BASE 0x48074000
++#define OMAP34XX_MCBSP2_BASE 0x49022000
++
+ #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730)
+
+ #define OMAP_MCBSP_REG_DRR2 0x00
+@@ -74,7 +81,8 @@
+ #define OMAP_MCBSP_REG_XCERG 0x3A
+ #define OMAP_MCBSP_REG_XCERH 0x3C
+
+-#define OMAP_MAX_MCBSP_COUNT 3
++#define OMAP_MAX_MCBSP_COUNT 3
++#define MAX_MCBSP_CLOCKS 3
+
+ #define AUDIO_MCBSP_DATAWRITE (OMAP1510_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1)
+ #define AUDIO_MCBSP_DATAREAD (OMAP1510_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1)
+@@ -117,7 +125,8 @@
+ #define OMAP_MCBSP_REG_XCERG 0x74
+ #define OMAP_MCBSP_REG_XCERH 0x78
+
+-#define OMAP_MAX_MCBSP_COUNT 2
++#define OMAP_MAX_MCBSP_COUNT 2
++#define MAX_MCBSP_CLOCKS 2
+
+ #define AUDIO_MCBSP_DATAWRITE (OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DXR1)
+ #define AUDIO_MCBSP_DATAREAD (OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR1)
+@@ -298,6 +307,66 @@ struct omap_mcbsp_spi_cfg {
+ omap_mcbsp_word_length word_length;
+ };
+
++/* Platform specific configuration */
++struct omap_mcbsp_ops {
++ void (*request)(unsigned int);
++ void (*free)(unsigned int);
++ int (*check)(unsigned int);
++};
++
++struct omap_mcbsp_platform_data {
++ u32 virt_base;
++ u8 dma_rx_sync, dma_tx_sync;
++ u16 rx_irq, tx_irq;
++ struct omap_mcbsp_ops *ops;
++ char const *clocks[MAX_MCBSP_CLOCKS];
++};
++
++struct omap_mcbsp {
++ struct device *dev;
++ u32 io_base;
++ u8 id;
++ u8 free;
++ omap_mcbsp_word_length rx_word_length;
++ omap_mcbsp_word_length tx_word_length;
++
++ omap_mcbsp_io_type_t io_type; /* IRQ or poll */
++ /* IRQ based TX/RX */
++ int rx_irq;
++ int tx_irq;
++
++ /* DMA stuff */
++ u8 dma_rx_sync;
++ short dma_rx_lch;
++ u8 dma_tx_sync;
++ short dma_tx_lch;
++
++ /* Completion queues */
++ struct completion tx_irq_completion;
++ struct completion rx_irq_completion;
++ struct completion tx_dma_completion;
++ struct completion rx_dma_completion;
++
++ /* Protect the field .free, while checking if the mcbsp is in use */
++ spinlock_t lock;
++ struct omap_mcbsp_platform_data *pdata;
++ int nr_clocks;
++ struct clk *clocks[MAX_MCBSP_CLOCKS];
++};
++
++#define __mcbsp_clk_op(mcbsp, op) \
++ do { \
++ int i; \
++ for (i = 0; i < mcbsp->nr_clocks; i++) \
++ clk_##op(mcbsp->clocks[i]); \
++ } while (0)
++#define mcbsp_clk_enable(mcbsp) __mcbsp_clk_op((mcbsp), enable)
++#define mcbsp_clk_disable(mcbsp) __mcbsp_clk_op((mcbsp), disable)
++#define mcbsp_clk_put(mcbsp) __mcbsp_clk_op((mcbsp), put)
++
++int omap_mcbsp_init(void);
++void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,
++ int size);
+ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config);
+ int omap_mcbsp_request(unsigned int id);
+ void omap_mcbsp_free(unsigned int id);
+--
+1.5.5.1.67.gbdb8.dirty
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
+
diff --git a/packages/linux/linux-omap2-git/beagleboard/00002-mcbsp-omap1.patch b/packages/linux/linux-omap2-git/beagleboard/00002-mcbsp-omap1.patch new file mode 100644 index 0000000000..76246a9fae --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/00002-mcbsp-omap1.patch @@ -0,0 +1,204 @@ +From: Eduardo Valentin <eduardo.valentin@indt.org.br>
+
+This patch adds support for mach-omap1 based on current
+mcbsp platform driver.
+
+Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
+---
+ arch/arm/mach-omap1/Makefile | 2 +
+ arch/arm/mach-omap1/mcbsp.c | 165 ++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 167 insertions(+), 0 deletions(-)
+ create mode 100644 arch/arm/mach-omap1/mcbsp.c
+
+diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
+index 6ebf23b..09246a7 100644
+--- a/arch/arm/mach-omap1/Makefile
++++ b/arch/arm/mach-omap1/Makefile
+@@ -5,6 +5,8 @@
+ # Common support
+ obj-y := io.o id.o clock.o irq.o mux.o serial.o devices.o
+
++obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
++
+ obj-$(CONFIG_OMAP_MPU_TIMER) += time.o
+ obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o
+
+diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c
+new file mode 100644
+index 0000000..f30624a
+--- /dev/null
++++ b/arch/arm/mach-omap1/mcbsp.c
+@@ -0,0 +1,165 @@
++/*
++ * linux/arch/arm/mach-omap1/mcbsp.c
++ *
++ * Copyright (C) 2008 Instituto Nokia de Tecnologia
++ * Contact: Eduardo Valentin <eduardo.valentin@indt.org.br>
++ *
++ * 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.
++ *
++ * Multichannel mode not supported.
++ */
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/clk.h>
++#include <linux/err.h>
++#include <linux/io.h>
++
++#include <asm/arch/dma.h>
++#include <asm/arch/mux.h>
++#include <asm/arch/cpu.h>
++#include <asm/arch/mcbsp.h>
++#include <asm/arch/dsp_common.h>
++
++#define DPS_RSTCT2_PER_EN (1 << 0)
++#define DSP_RSTCT2_WD_PER_EN (1 << 1)
++
++static int omap1_mcbsp_check(unsigned int id)
++{
++ /* REVISIT: Check correctly for number of registered McBSPs */
++ if (cpu_is_omap730()) {
++ if (id > OMAP_MAX_MCBSP_COUNT - 2) {
++ printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n",
++ id + 1);
++ return -ENODEV;
++ }
++ return 0;
++ }
++
++ if (cpu_is_omap15xx() || cpu_is_omap16xx()) {
++ if (id > OMAP_MAX_MCBSP_COUNT - 1) {
++ printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n",
++ id + 1);
++ return -ENODEV;
++ }
++ return 0;
++ }
++
++ return -ENODEV;
++}
++
++static void omap1_mcbsp_request(unsigned int id)
++{
++ /*
++ * On 1510, 1610 and 1710, McBSP1 and McBSP3
++ * are DSP public peripherals.
++ */
++ if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {
++ omap_dsp_request_mem();
++ /*
++ * DSP external peripheral reset
++ * FIXME: This should be moved to dsp code
++ */
++ __raw_writew(__raw_readw(DSP_RSTCT2) | DPS_RSTCT2_PER_EN |
++ DSP_RSTCT2_WD_PER_EN, DSP_RSTCT2);
++ }
++}
++
++static void omap1_mcbsp_free(unsigned int id)
++{
++ if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3)
++ omap_dsp_release_mem();
++}
++
++static struct omap_mcbsp_ops omap1_mcbsp_ops = {
++ .check = omap1_mcbsp_check,
++ .request = omap1_mcbsp_request,
++ .free = omap1_mcbsp_free,
++};
++
++static struct omap_mcbsp_platform_data omap1_mcbsp_pdata[] = {
++#ifdef CONFIG_ARCH_OMAP730
++ {
++ .virt_base = io_p2v(OMAP730_MCBSP1_BASE),
++ .dma_rx_sync = OMAP_DMA_MCBSP1_RX,
++ .dma_tx_sync = OMAP_DMA_MCBSP1_TX,
++ .rx_irq = INT_730_McBSP1RX,
++ .tx_irq = INT_730_McBSP1TX,
++ .ops = &omap1_mcbsp_ops,
++ },
++ {
++ .virt_base = io_p2v(OMAP730_MCBSP2_BASE),
++ .dma_rx_sync = OMAP_DMA_MCBSP3_RX,
++ .dma_tx_sync = OMAP_DMA_MCBSP3_TX,
++ .rx_irq = INT_730_McBSP2RX,
++ .tx_irq = INT_730_McBSP2TX
++ .ops = &omap1_mcbsp_ops,
++ },
++#endif
++#ifdef CONFIG_ARCH_OMAP15XX
++ {
++ .virt_base = OMAP1510_MCBSP1_BASE,
++ .dma_rx_sync = OMAP_DMA_MCBSP1_RX,
++ .dma_tx_sync = OMAP_DMA_MCBSP1_TX,
++ .rx_irq = INT_McBSP1RX,
++ .tx_irq = INT_McBSP1TX,
++ .ops = &omap1_mcbsp_ops,
++ .clocks = { "dsp_ck", "api_ck", "dspxor_ck" },
++ },
++ {
++ .virt_base = io_p2v(OMAP1510_MCBSP2_BASE),
++ .dma_rx_sync = OMAP_DMA_MCBSP2_RX,
++ .dma_tx_sync = OMAP_DMA_MCBSP2_TX,
++ .rx_irq = INT_1510_SPI_RX,
++ .tx_irq = INT_1510_SPI_TX,
++ .ops = &omap1_mcbsp_ops,
++ },
++ {
++ .virt_base = OMAP1510_MCBSP3_BASE,
++ .dma_rx_sync = OMAP_DMA_MCBSP3_RX,
++ .dma_tx_sync = OMAP_DMA_MCBSP3_TX,
++ .rx_irq = INT_McBSP3RX,
++ .tx_irq = INT_McBSP3TX,
++ .ops = &omap1_mcbsp_ops,
++ .clocks = { "dsp_ck", "api_ck", "dspxor_ck" },
++ },
++#endif
++#ifdef CONFIG_ARCH_OMAP16XX
++ {
++ .virt_base = OMAP1610_MCBSP1_BASE,
++ .dma_rx_sync = OMAP_DMA_MCBSP1_RX,
++ .dma_tx_sync = OMAP_DMA_MCBSP1_TX,
++ .rx_irq = INT_McBSP1RX,
++ .tx_irq = INT_McBSP1TX,
++ .ops = &omap1_mcbsp_ops,
++ .clocks = { "dsp_ck", "api_ck", "dspxor_ck" },
++ },
++ {
++ .virt_base = io_p2v(OMAP1610_MCBSP2_BASE),
++ .dma_rx_sync = OMAP_DMA_MCBSP2_RX,
++ .dma_tx_sync = OMAP_DMA_MCBSP2_TX,
++ .rx_irq = INT_1610_McBSP2_RX,
++ .tx_irq = INT_1610_McBSP2_TX,
++ .ops = &omap1_mcbsp_ops,
++ },
++ {
++ .virt_base = OMAP1610_MCBSP3_BASE,
++ .dma_rx_sync = OMAP_DMA_MCBSP3_RX,
++ .dma_tx_sync = OMAP_DMA_MCBSP3_TX,
++ .rx_irq = INT_McBSP3RX,
++ .tx_irq = INT_McBSP3TX,
++ .ops = &omap1_mcbsp_ops,
++ .clocks = { "dsp_ck", "api_ck", "dspxor_ck" },
++ },
++#endif
++};
++#define mcbsp_count ARRAY_SIZE(omap1_mcbsp_pdata)
++
++int __init omap1_mcbsp_init(void)
++{
++ omap_mcbsp_register_board_cfg(omap1_mcbsp_pdata, mcbsp_count);
++
++ return omap_mcbsp_init();
++}
++arch_initcall(omap1_mcbsp_init);
+--
+1.5.5.1.67.gbdb8.dirty
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
+
diff --git a/packages/linux/linux-omap2-git/beagleboard/00003-mcbsp-omap3-clock.patch b/packages/linux/linux-omap2-git/beagleboard/00003-mcbsp-omap3-clock.patch new file mode 100644 index 0000000000..6d1e7d3f71 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/00003-mcbsp-omap3-clock.patch @@ -0,0 +1,123 @@ +From: Eduardo Valentin <eduardo.valentin@indt.org.br>
+
+This patch fix the clock definition for mcbsps on clock34xx.h.
+Device identification must be done using .id field, not
+only name field.
+
+Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
+---
+ arch/arm/mach-omap2/clock34xx.h | 30 ++++++++++++++++++++----------
+ 1 files changed, 20 insertions(+), 10 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h
+index 85afe1e..3fea82e 100644
+--- a/arch/arm/mach-omap2/clock34xx.h
++++ b/arch/arm/mach-omap2/clock34xx.h
+@@ -1480,7 +1480,8 @@ static const struct clksel mcbsp_15_clksel[] = {
+ };
+
+ static struct clk mcbsp5_fck = {
+- .name = "mcbsp5_fck",
++ .name = "mcbsp_fck",
++ .id = 5,
+ .init = &omap2_init_clksel_parent,
+ .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
+ .enable_bit = OMAP3430_EN_MCBSP5_SHIFT,
+@@ -1493,7 +1494,8 @@ static struct clk mcbsp5_fck = {
+ };
+
+ static struct clk mcbsp1_fck = {
+- .name = "mcbsp1_fck",
++ .name = "mcbsp_fck",
++ .id = 1,
+ .init = &omap2_init_clksel_parent,
+ .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
+ .enable_bit = OMAP3430_EN_MCBSP1_SHIFT,
+@@ -1941,7 +1943,8 @@ static struct clk gpt10_ick = {
+ };
+
+ static struct clk mcbsp5_ick = {
+- .name = "mcbsp5_ick",
++ .name = "mcbsp_ick",
++ .id = 5,
+ .parent = &core_l4_ick,
+ .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
+ .enable_bit = OMAP3430_EN_MCBSP5_SHIFT,
+@@ -1951,7 +1954,8 @@ static struct clk mcbsp5_ick = {
+ };
+
+ static struct clk mcbsp1_ick = {
+- .name = "mcbsp1_ick",
++ .name = "mcbsp_ick",
++ .id = 1,
+ .parent = &core_l4_ick,
+ .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
+ .enable_bit = OMAP3430_EN_MCBSP1_SHIFT,
+@@ -2754,7 +2758,8 @@ static struct clk gpt2_ick = {
+ };
+
+ static struct clk mcbsp2_ick = {
+- .name = "mcbsp2_ick",
++ .name = "mcbsp_ick",
++ .id = 2,
+ .parent = &per_l4_ick,
+ .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),
+ .enable_bit = OMAP3430_EN_MCBSP2_SHIFT,
+@@ -2764,7 +2769,8 @@ static struct clk mcbsp2_ick = {
+ };
+
+ static struct clk mcbsp3_ick = {
+- .name = "mcbsp3_ick",
++ .name = "mcbsp_ick",
++ .id = 3,
+ .parent = &per_l4_ick,
+ .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),
+ .enable_bit = OMAP3430_EN_MCBSP3_SHIFT,
+@@ -2774,7 +2780,8 @@ static struct clk mcbsp3_ick = {
+ };
+
+ static struct clk mcbsp4_ick = {
+- .name = "mcbsp4_ick",
++ .name = "mcbsp_ick",
++ .id = 4,
+ .parent = &per_l4_ick,
+ .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN),
+ .enable_bit = OMAP3430_EN_MCBSP4_SHIFT,
+@@ -2790,7 +2797,8 @@ static const struct clksel mcbsp_234_clksel[] = {
+ };
+
+ static struct clk mcbsp2_fck = {
+- .name = "mcbsp2_fck",
++ .name = "mcbsp_fck",
++ .id = 2,
+ .init = &omap2_init_clksel_parent,
+ .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
+ .enable_bit = OMAP3430_EN_MCBSP2_SHIFT,
+@@ -2803,7 +2811,8 @@ static struct clk mcbsp2_fck = {
+ };
+
+ static struct clk mcbsp3_fck = {
+- .name = "mcbsp3_fck",
++ .name = "mcbsp_fck",
++ .id = 3,
+ .init = &omap2_init_clksel_parent,
+ .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
+ .enable_bit = OMAP3430_EN_MCBSP3_SHIFT,
+@@ -2816,7 +2825,8 @@ static struct clk mcbsp3_fck = {
+ };
+
+ static struct clk mcbsp4_fck = {
+- .name = "mcbsp4_fck",
++ .name = "mcbsp_fck",
++ .id = 4,
+ .init = &omap2_init_clksel_parent,
+ .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN),
+ .enable_bit = OMAP3430_EN_MCBSP4_SHIFT,
+--
+1.5.5.1.67.gbdb8.dirty
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
+
diff --git a/packages/linux/linux-omap2-git/beagleboard/00004-omap2-mcbsp.patch b/packages/linux/linux-omap2-git/beagleboard/00004-omap2-mcbsp.patch new file mode 100644 index 0000000000..f31604d658 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/00004-omap2-mcbsp.patch @@ -0,0 +1,144 @@ +From: Eduardo Valentin <eduardo.valentin@indt.org.br>
+
+This patch adds support for mach-omap2 based on current
+mcbsp platform driver.
+
+Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
+---
+ arch/arm/mach-omap2/Makefile | 2 +
+ arch/arm/mach-omap2/mcbsp.c | 105 ++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 107 insertions(+), 0 deletions(-)
+ create mode 100644 arch/arm/mach-omap2/mcbsp.c
+
+diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
+index 552664c..84fa698 100644
+--- a/arch/arm/mach-omap2/Makefile
++++ b/arch/arm/mach-omap2/Makefile
+@@ -7,6 +7,8 @@ obj-y := irq.o id.o io.o memory.o control.o prcm.o clock.o mux.o \
+ devices.o serial.o gpmc.o timer-gp.o powerdomain.o \
+ clockdomain.o
+
++obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
++
+ # Functions loaded to SRAM
+ obj-$(CONFIG_ARCH_OMAP2) += sram24xx.o
+
+diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
+new file mode 100644
+index 0000000..e2ee8f7
+--- /dev/null
++++ b/arch/arm/mach-omap2/mcbsp.c
+@@ -0,0 +1,105 @@
++/*
++ * linux/arch/arm/mach-omap2/mcbsp.c
++ *
++ * Copyright (C) 2008 Instituto Nokia de Tecnologia
++ * Contact: Eduardo Valentin <eduardo.valentin@indt.org.br>
++ *
++ * 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.
++ *
++ * Multichannel mode not supported.
++ */
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/clk.h>
++#include <linux/err.h>
++
++#include <asm/arch/dma.h>
++#include <asm/arch/mux.h>
++#include <asm/arch/cpu.h>
++#include <asm/arch/mcbsp.h>
++
++static void omap2_mcbsp2_mux_setup(void)
++{
++ omap_cfg_reg(Y15_24XX_MCBSP2_CLKX);
++ omap_cfg_reg(R14_24XX_MCBSP2_FSX);
++ omap_cfg_reg(W15_24XX_MCBSP2_DR);
++ omap_cfg_reg(V15_24XX_MCBSP2_DX);
++ omap_cfg_reg(V14_24XX_GPIO117);
++ /*
++ * TODO: Need to add MUX settings for OMAP 2430 SDP
++ */
++}
++
++static void omap2_mcbsp_request(unsigned int id)
++{
++ if (cpu_is_omap2420() && (id == OMAP_MCBSP2))
++ omap2_mcbsp2_mux_setup();
++}
++
++static int omap2_mcbsp_check(unsigned int id)
++{
++ if (id > OMAP_MAX_MCBSP_COUNT - 1) {
++ printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", id + 1);
++ return -ENODEV;
++ }
++ return 0;
++}
++
++static struct omap_mcbsp_ops omap2_mcbsp_ops = {
++ .request = omap2_mcbsp_request,
++ .check = omap2_mcbsp_check,
++};
++
++static struct omap_mcbsp_platform_data omap2_mcbsp_pdata[] = {
++#ifdef CONFIG_ARCH_OMAP24XX
++ {
++ .virt_base = IO_ADDRESS(OMAP24XX_MCBSP1_BASE),
++ .dma_rx_sync = OMAP24XX_DMA_MCBSP1_RX,
++ .dma_tx_sync = OMAP24XX_DMA_MCBSP1_TX,
++ .rx_irq = INT_24XX_MCBSP1_IRQ_RX,
++ .tx_irq = INT_24XX_MCBSP1_IRQ_TX,
++ .ops = &omap2_mcbsp_ops,
++ .clocks = { "mcbsp_ick", "mcbsp_fck" },
++ },
++ {
++ .virt_base = IO_ADDRESS(OMAP24XX_MCBSP2_BASE),
++ .dma_rx_sync = OMAP24XX_DMA_MCBSP2_RX,
++ .dma_tx_sync = OMAP24XX_DMA_MCBSP2_TX,
++ .rx_irq = INT_24XX_MCBSP2_IRQ_RX,
++ .tx_irq = INT_24XX_MCBSP2_IRQ_TX,
++ .ops = &omap2_mcbsp_ops,
++ .clocks = { "mcbsp_ick", "mcbsp_fck" },
++ },
++#endif
++#ifdef CONFIG_ARCH_OMAP34XX
++ {
++ .virt_base = IO_ADDRESS(OMAP34XX_MCBSP1_BASE),
++ .dma_rx_sync = OMAP24XX_DMA_MCBSP1_RX,
++ .dma_tx_sync = OMAP24XX_DMA_MCBSP1_TX,
++ .rx_irq = INT_24XX_MCBSP1_IRQ_RX,
++ .tx_irq = INT_24XX_MCBSP1_IRQ_TX,
++ .ops = &omap2_mcbsp_ops,
++ .clocks = { "mcbsp_ick", "mcbsp_fck" },
++ },
++ {
++ .virt_base = IO_ADDRESS(OMAP34XX_MCBSP2_BASE),
++ .dma_rx_sync = OMAP24XX_DMA_MCBSP2_RX,
++ .dma_tx_sync = OMAP24XX_DMA_MCBSP2_TX,
++ .rx_irq = INT_24XX_MCBSP2_IRQ_RX,
++ .tx_irq = INT_24XX_MCBSP2_IRQ_TX,
++ .ops = &omap2_mcbsp_ops,
++ .clocks = { "mcbsp_ick", "mcbsp_fck" },
++ },
++#endif
++};
++#define mcbsp_count ARRAY_SIZE(omap2_mcbsp_pdata)
++
++int __init omap2_mcbsp_init(void)
++{
++ omap_mcbsp_register_board_cfg(omap2_mcbsp_pdata, mcbsp_count);
++
++ return omap_mcbsp_init();
++}
++arch_initcall(omap2_mcbsp_init);
+--
+1.5.5.1.67.gbdb8.dirty
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
+
diff --git a/packages/linux/linux-omap2-git/beagleboard/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch b/packages/linux/linux-omap2-git/beagleboard/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch new file mode 100644 index 0000000000..6e31ead2bd --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch @@ -0,0 +1,55 @@ +From a1dbb6dd28e9815a307b87b8d96dcf371d6cfd58 Mon Sep 17 00:00:00 2001 +From: Jarkko Nikula <jarkko.nikula@nokia.com> +Date: Mon, 19 May 2008 13:24:41 +0300 +Subject: [PATCH] ASoC: OMAP: Add basic support for OMAP34xx in McBSP DAI driver + +This adds support for OMAP34xx McBSP port 1 and 2. + +Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com> +--- + sound/soc/omap/omap-mcbsp.c | 20 +++++++++++++++++++- + 1 files changed, 19 insertions(+), 1 deletions(-) + +diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c +index 40d87e6..8e6ec9d 100644 +--- a/sound/soc/omap/omap-mcbsp.c ++++ b/sound/soc/omap/omap-mcbsp.c +@@ -99,6 +99,21 @@ static const unsigned long omap2420_mcbsp_port[][2] = { + static const int omap2420_dma_reqs[][2] = {}; + static const unsigned long omap2420_mcbsp_port[][2] = {}; + #endif ++#if defined(CONFIG_ARCH_OMAP34XX) ++static const int omap34xx_dma_reqs[][2] = { ++ { OMAP24XX_DMA_MCBSP1_TX, OMAP24XX_DMA_MCBSP1_RX }, ++ { OMAP24XX_DMA_MCBSP2_TX, OMAP24XX_DMA_MCBSP2_RX }, ++}; ++static const unsigned long omap34xx_mcbsp_port[][2] = { ++ { OMAP34XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR2, ++ OMAP34XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR2 }, ++ { OMAP34XX_MCBSP2_BASE + OMAP_MCBSP_REG_DXR2, ++ OMAP34XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR2 }, ++}; ++#else ++static const int omap34xx_dma_reqs[][2] = {}; ++static const unsigned long omap34xx_mcbsp_port[][2] = {}; ++#endif + + static int omap_mcbsp_dai_startup(struct snd_pcm_substream *substream) + { +@@ -169,9 +184,12 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, + } else if (cpu_is_omap2420()) { + dma = omap2420_dma_reqs[bus_id][substream->stream]; + port = omap2420_mcbsp_port[bus_id][substream->stream]; ++ } else if (cpu_is_omap343x()) { ++ dma = omap34xx_dma_reqs[bus_id][substream->stream]; ++ port = omap34xx_mcbsp_port[bus_id][substream->stream]; + } else { + /* +- * TODO: Add support for 2430 and 3430 ++ * TODO: Add support for 2430 + */ + return -ENODEV; + } +-- +1.5.5.1 + diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index 5c39ea9c6f..5b8f07209f 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.26-rc2-omap1 -# Sat May 17 13:43:38 2008 +# Linux kernel version: 2.6.26-rc3-omap1 +# Tue May 20 19:38:20 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -179,7 +179,9 @@ CONFIG_OMAP_BOOT_TAG=y CONFIG_OMAP_BOOT_REASON=y # CONFIG_OMAP_COMPONENT_VERSION is not set # CONFIG_OMAP_GPIO_SWITCH is not set -# CONFIG_OMAP_MUX is not set +CONFIG_OMAP_MUX=y +# CONFIG_OMAP_MUX_DEBUG is not set +CONFIG_OMAP_MUX_WARNINGS=y CONFIG_OMAP_MCBSP=y # CONFIG_OMAP_MMU_FWK is not set # CONFIG_OMAP_MBOX_FWK is not set @@ -190,6 +192,7 @@ CONFIG_OMAP_DM_TIMER=y # CONFIG_OMAP_LL_DEBUG_UART1 is not set # CONFIG_OMAP_LL_DEBUG_UART2 is not set CONFIG_OMAP_LL_DEBUG_UART3=y +CONFIG_OMAP_SERIAL_WAKE=y CONFIG_ARCH_OMAP34XX=y CONFIG_ARCH_OMAP3430=y @@ -948,15 +951,15 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_VIDEO_DEV=y CONFIG_VIDEO_V4L2_COMMON=y -CONFIG_VIDEO_ALLOW_V4L1=y -CONFIG_VIDEO_V4L1_COMPAT=y -CONFIG_DVB_CORE=m +# CONFIG_VIDEO_ALLOW_V4L1 is not set +# CONFIG_VIDEO_V4L1_COMPAT is not set +# CONFIG_DVB_CORE is not set CONFIG_VIDEO_MEDIA=y # # Multimedia drivers # -# CONFIG_MEDIA_ATTACH is not set +CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER=y # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set CONFIG_MEDIA_TUNER_SIMPLE=y @@ -965,18 +968,11 @@ CONFIG_MEDIA_TUNER_TDA9887=y CONFIG_MEDIA_TUNER_TEA5761=y CONFIG_MEDIA_TUNER_TEA5767=y CONFIG_MEDIA_TUNER_MT20XX=y -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_QT1010=m CONFIG_MEDIA_TUNER_XC2028=y CONFIG_MEDIA_TUNER_XC5000=y CONFIG_VIDEO_V4L2=y -CONFIG_VIDEO_V4L1=y -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEO_IR_I2C=m -CONFIG_VIDEO_IR=m CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_TUNER=m CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set @@ -1006,21 +1002,12 @@ CONFIG_VIDEO_WM8775=m # # Video decoders # -# CONFIG_VIDEO_BT819 is not set -# CONFIG_VIDEO_BT856 is not set -# CONFIG_VIDEO_BT866 is not set -# CONFIG_VIDEO_KS0127 is not set # CONFIG_VIDEO_OV7670 is not set # CONFIG_VIDEO_TCM825X is not set # CONFIG_VIDEO_OV9640 is not set -# CONFIG_VIDEO_SAA7110 is not set -# CONFIG_VIDEO_SAA7111 is not set -# CONFIG_VIDEO_SAA7114 is not set CONFIG_VIDEO_SAA711X=m # CONFIG_VIDEO_SAA717X is not set -# CONFIG_VIDEO_SAA7191 is not set # CONFIG_VIDEO_TVP5150 is not set -# CONFIG_VIDEO_VPX3220 is not set # # Video and audio decoders @@ -1036,162 +1023,29 @@ CONFIG_VIDEO_CX2341X=m # Video encoders # # CONFIG_VIDEO_SAA7127 is not set -# CONFIG_VIDEO_SAA7185 is not set -# CONFIG_VIDEO_ADV7170 is not set -# CONFIG_VIDEO_ADV7175 is not set # # Video improvement chips # # CONFIG_VIDEO_UPD64031A is not set # CONFIG_VIDEO_UPD64083 is not set -CONFIG_VIDEO_VIVI=m -# CONFIG_VIDEO_CPIA is not set -# CONFIG_VIDEO_CPIA2 is not set -CONFIG_VIDEO_SAA5246A=m -CONFIG_VIDEO_SAA5249=m -# CONFIG_TUNER_3036 is not set -# CONFIG_VIDEO_AU0828 is not set +# CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set CONFIG_V4L_USB_DRIVERS=y CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y -# CONFIG_VIDEO_PVRUSB2_DVB is not set # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m -# CONFIG_VIDEO_EM28XX_DVB is not set -CONFIG_VIDEO_USBVISION=m -# CONFIG_USB_VICAM is not set -# CONFIG_USB_IBMCAM is not set -# CONFIG_USB_KONICAWC is not set -# CONFIG_USB_QUICKCAM_MESSENGER is not set -CONFIG_USB_ET61X251=m -# CONFIG_VIDEO_OVCAMCHIP is not set -# CONFIG_USB_W9968CF is not set -# CONFIG_USB_OV511 is not set -# CONFIG_USB_SE401 is not set +# CONFIG_VIDEO_EM28XX is not set +# CONFIG_VIDEO_USBVISION is not set +# CONFIG_USB_ET61X251 is not set CONFIG_USB_SN9C102=m -# CONFIG_USB_STV680 is not set -CONFIG_USB_ZC0301=m -# CONFIG_USB_PWC is not set -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m +# CONFIG_USB_ZC0301 is not set +# CONFIG_USB_ZR364XX is not set +# CONFIG_USB_STKWEBCAM is not set # CONFIG_SOC_CAMERA is not set # CONFIG_RADIO_ADAPTERS is not set -CONFIG_DVB_CAPTURE_DRIVERS=y -# CONFIG_TTPCI_EEPROM is not set - -# -# Supported USB Adapters -# -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_DVB_CINERGYT2=m -# CONFIG_DVB_CINERGYT2_TUNING is not set - -# -# Supported FlexCopII (B2C2) Adapters -# -# CONFIG_DVB_B2C2_FLEXCOP is not set - -# -# Supported DVB Frontends -# - -# -# Customise DVB Frontends -# -# CONFIG_DVB_FE_CUSTOMISE is not set - -# -# DVB-S (satellite) frontends -# -CONFIG_DVB_CX24110=m -CONFIG_DVB_CX24123=m -CONFIG_DVB_MT312=m -CONFIG_DVB_S5H1420=m -CONFIG_DVB_STV0299=m -CONFIG_DVB_TDA8083=m -CONFIG_DVB_TDA10086=m -CONFIG_DVB_VES1X93=m -# CONFIG_DVB_TUNER_ITD1000 is not set -CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUA6100=m - -# -# DVB-T (terrestrial) frontends -# -CONFIG_DVB_SP8870=m -CONFIG_DVB_SP887X=m -CONFIG_DVB_CX22700=m -CONFIG_DVB_CX22702=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m -CONFIG_DVB_MT352=m -CONFIG_DVB_ZL10353=m -CONFIG_DVB_DIB3000MB=m -CONFIG_DVB_DIB3000MC=m -CONFIG_DVB_DIB7000M=m -CONFIG_DVB_DIB7000P=m -# CONFIG_DVB_TDA10048 is not set - -# -# DVB-C (cable) frontends -# -CONFIG_DVB_VES1820=m -CONFIG_DVB_TDA10021=m -CONFIG_DVB_TDA10023=m -CONFIG_DVB_STV0297=m - -# -# ATSC (North American/Korean Terrestrial/Cable DTV) frontends -# -CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m -CONFIG_DVB_OR51132=m -CONFIG_DVB_BCM3510=m -CONFIG_DVB_LGDT330X=m -CONFIG_DVB_S5H1409=m -# CONFIG_DVB_AU8522 is not set -# CONFIG_DVB_S5H1411 is not set - -# -# Digital terrestrial only tuners/PLL -# -CONFIG_DVB_PLL=m -CONFIG_DVB_TUNER_DIB0070=m - -# -# SEC control devices for DVB-S -# -CONFIG_DVB_LNBP21=m -# CONFIG_DVB_ISL6405 is not set -CONFIG_DVB_ISL6421=m -CONFIG_DAB=y -CONFIG_USB_DABUSB=m +# CONFIG_DAB is not set # # Graphics support @@ -1210,7 +1064,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_SYS_IMAGEBLIT is not set # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_SYS_FOPS is not set -CONFIG_FB_DEFERRED_IO=y # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set @@ -1248,10 +1101,7 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set # # Sound @@ -1455,6 +1305,7 @@ CONFIG_USB_SERIAL=m # CONFIG_USB_SERIAL_MCT_U232 is not set # CONFIG_USB_SERIAL_MOS7720 is not set # CONFIG_USB_SERIAL_MOS7840 is not set +# CONFIG_USB_SERIAL_MOTOROLA is not set # CONFIG_USB_SERIAL_NAVMAN is not set # CONFIG_USB_SERIAL_PL2303 is not set # CONFIG_USB_SERIAL_OTI6858 is not set diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index 38f6df204e..f128d9cc8f 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -2,13 +2,18 @@ require linux-omap.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}" -SRCREV = "fe2c08002adea304a13ccb806aa1ab4058607094" +SRCREV = "41c13615e46ed02a1aaafcc267603be8ea5244e9" -PV = "2.6.25+2.6.26-rc2+git${SRCREV}" -PR = "r15" +PV = "2.6.25+2.6.26-rc3+git${SRCREV}" +PR = "r16" SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ + file://00001-mcbsp-transform.patch;patch=1 \ + file://00002-mcbsp-omap1.patch;patch=1 \ + file://00003-mcbsp-omap3-clock.patch;patch=1 \ + file://00004-omap2-mcbsp.patch;patch=1 \ + file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \ file://defconfig" SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ diff --git a/packages/mtd/mtd-utils_1.1.0.bb b/packages/mtd/mtd-utils_1.1.0.bb index ed9a8b8441..dcab927437 100644 --- a/packages/mtd/mtd-utils_1.1.0.bb +++ b/packages/mtd/mtd-utils_1.1.0.bb @@ -3,10 +3,7 @@ SECTION = "base" DEPENDS = "zlib lzo" HOMEPAGE = "http://www.linux-mtd.infradead.org/" LICENSE = "GPLv2" -PR = "r1" - -# scheduled to enable 15-03-2008 -DEFAULT_PREFERENCE = "-1" +PR = "r3" SRC_URI = "ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.1.0.tar.bz2 \ file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \ diff --git a/packages/mtools/mtools-native_3.9.9.bb b/packages/mtools/mtools-native_3.9.11.bb index c82f7404eb..c82f7404eb 100644 --- a/packages/mtools/mtools-native_3.9.9.bb +++ b/packages/mtools/mtools-native_3.9.11.bb diff --git a/packages/mtools/mtools_3.9.9.bb b/packages/mtools/mtools_3.9.11.bb index eca9909e8f..eca9909e8f 100644 --- a/packages/mtools/mtools_3.9.9.bb +++ b/packages/mtools/mtools_3.9.11.bb diff --git a/packages/python/python-efl.inc b/packages/python/python-efl.inc index 1cbec65fa5..0147813115 100644 --- a/packages/python/python-efl.inc +++ b/packages/python/python-efl.inc @@ -15,13 +15,13 @@ S = "${WORKDIR}/${PN}" do_install_append() { if [ -e examples ]; then for i in `find examples -name "*.edc"`; do - pushd `dirname $i` + cd ${S}/`dirname $i` echo "Generating .edj file for $i..." edje_cc `basename $i` echo "Removing sources in this directory..." rm -f *.edc *.png *.ttf *.jpeg - popd done + cd ${S} install -d ${D}${datadir}/${PN}/ cp -a examples ${D}${datadir}/${PN}/ find ${D}${datadir}/${PN}/examples -name "CVS" | xargs rm -rf diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb index 7f30badfad..22aac7c9ee 100644 --- a/packages/python/python_2.5.2.bb +++ b/packages/python/python_2.5.2.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" # bump this on every change in contrib/python/generate-manifest-2.5.py -PR = "ml3" +PR = "ml4" PYTHON_MAJMIN = "2.5" @@ -68,7 +68,7 @@ do_stage() { do_install() { install -m 0644 Makefile.orig Makefile - + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ STAGING_LIBDIR=${STAGING_LIBDIR} \ @@ -77,6 +77,9 @@ do_install() { DESTDIR=${D} LIBDIR=${libdir} install install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN} + + # remove hardcoded ccache, see http://bugs.openembedded.net/show_bug.cgi?id=4144 + sed -i -e s,ccache,'$(CCACHE)', ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile } require python-${PYTHON_MAJMIN}-manifest.inc diff --git a/packages/rt-tests/rt-tests_0.19.bb b/packages/rt-tests/rt-tests_0.19.bb deleted file mode 100644 index e2c9e17846..0000000000 --- a/packages/rt-tests/rt-tests_0.19.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Real-time tests, such as cyclictest." -HOMEPAGE = "http://rt.wiki.kernel.org/index.php/Cyclictest" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://www.kernel.org/pub/linux/kernel/people/tglx/rt-tests/rt-tests-${PV}.tar.bz2" - -S = "${WORKDIR}/rt-tests" - -do_install() { - install -d ${D}${bindir} - for binary in `find . -perm 0755 -type f` - do - install -m 0755 $binary ${D}${bindir} - done -} - - diff --git a/packages/rt-tests/rt-tests_0.21.bb b/packages/rt-tests/rt-tests_0.21.bb new file mode 100644 index 0000000000..7be7f48f5f --- /dev/null +++ b/packages/rt-tests/rt-tests_0.21.bb @@ -0,0 +1,21 @@ +## Reminder: Tabs should not be used (use spaces instead) in : install -d ${D}${bindir} +## Reminder: Tabs should not be used (use spaces instead) in : for binary in `find . -perm 0755 -type f` +## Reminder: Tabs should not be used (use spaces instead) in : do +## Reminder: Tabs should not be used (use spaces instead) in : install -m 0755 $binary ${D}${bindir} +## Reminder: Tabs should not be used (use spaces instead) in : done +DESCRIPTION = "Real-time tests, such as cyclictest." +HOMEPAGE = "http://rt.wiki.kernel.org/index.php/Cyclictest" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.kernel.org/pub/linux/kernel/people/tglx/rt-tests/rt-tests-${PV}.tar.bz2" + +S = "${WORKDIR}/rt-tests" + +do_install() { + install -d ${D}${bindir} + for binary in `find . -perm 0755 -type f` + do + install -m 0755 $binary ${D}${bindir} + done +} diff --git a/packages/samba/samba-essential_3.0.20.bb b/packages/samba/samba-essential_3.0.20.bb index 75febf4ab1..ecf591dbb5 100644 --- a/packages/samba/samba-essential_3.0.20.bb +++ b/packages/samba/samba-essential_3.0.20.bb @@ -1,7 +1,7 @@ require samba-essential.inc inherit update-rc.d -PR = "r5" +PR = "r6" SRC_URI = "file://config-lfs.patch;patch=1 \ file://init-essential \ diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc index bcae4e7885..ab9ab42372 100644 --- a/packages/samba/samba.inc +++ b/packages/samba/samba.inc @@ -13,9 +13,11 @@ EXTRA_OECONF='--disable-cups --with-readline=${STAGING_LIBDIR}/.. \ --with-libiconv=${STAGING_LIBDIR}/.. \ --without-ads --without-automount --with-smbmount' -PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc" -FILES_cifs = "${bindir}/mount.cifs" -FILES_cifs-doc = "${docdir}/mount.cifs.8" +PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc smbfs smbfs-doc" +FILES_smbfs = "${bindir}/smbmount ${bindir}/smbumount ${bindir}/smbmnt" +FILES_smbfs-doc = "${mandir}/man8/smbmount.8 ${mandir}/man8/smbumount.8 ${mandir}/man8/smbmnt.8" +FILES_cifs = "${sbindir}/mount.cifs ${sbindir}/umount.cifs" +FILES_cifs-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8" FILES_libsmbclient = "${libdir}/libsmbclient.so.*" FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}" diff --git a/packages/samba/samba_3.0.10.bb b/packages/samba/samba_3.0.10.bb index 895ce6b337..265f695a1d 100644 --- a/packages/samba/samba_3.0.10.bb +++ b/packages/samba/samba_3.0.10.bb @@ -1 +1,3 @@ require samba.inc + +PR = "r1" diff --git a/packages/samba/samba_3.0.14a.bb b/packages/samba/samba_3.0.14a.bb index d191363cd6..90d3c947d6 100644 --- a/packages/samba/samba_3.0.14a.bb +++ b/packages/samba/samba_3.0.14a.bb @@ -1,7 +1,7 @@ require samba.inc inherit update-rc.d -PR = "r15" +PR = "r16" SRC_URI += "file://config-lfs.patch;patch=1 \ file://init \ @@ -48,4 +48,4 @@ FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat" FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so" # # bug fix for samba.inc: -FILES_cifs-doc = "${mandir}/man8/mount.cifs.8" +FILES_cifs-doc += "${mandir}/man8/mount.cifs.8" diff --git a/packages/samba/samba_3.0.20.bb b/packages/samba/samba_3.0.20.bb index fb2407c74f..a4ca7e9265 100644 --- a/packages/samba/samba_3.0.20.bb +++ b/packages/samba/samba_3.0.20.bb @@ -1,7 +1,7 @@ require samba.inc inherit update-rc.d -PR = "r5" +PR = "r6" SRC_URI += "file://config-lfs.patch;patch=1 \ file://init \ @@ -48,4 +48,4 @@ FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat" FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so" # # bug fix for samba.inc: -FILES_cifs-doc = "${mandir}/man8/mount.cifs.8" +FILES_cifs-doc += "${mandir}/man8/mount.cifs.8" diff --git a/packages/samba/samba_3.0.23c.bb b/packages/samba/samba_3.0.23c.bb index 74f0593150..ef1359c79b 100644 --- a/packages/samba/samba_3.0.23c.bb +++ b/packages/samba/samba_3.0.23c.bb @@ -1,7 +1,7 @@ require samba.inc inherit update-rc.d -PR = "r1" +PR = "r2" SRC_URI += "file://config-lfs.patch;patch=1 \ file://init \ @@ -46,4 +46,4 @@ FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg" FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat ${libdir}/auth/*.so" # # bug fix for samba.inc: -FILES_cifs-doc = "${mandir}/man8/mount.cifs.8" +FILES_cifs-doc += "${mandir}/man8/mount.cifs.8" diff --git a/packages/samba/samba_3.0.5.bb b/packages/samba/samba_3.0.5.bb index 895ce6b337..265f695a1d 100644 --- a/packages/samba/samba_3.0.5.bb +++ b/packages/samba/samba_3.0.5.bb @@ -1 +1,3 @@ require samba.inc + +PR = "r1" diff --git a/packages/samba/samba_3.0.9.bb b/packages/samba/samba_3.0.9.bb index 895ce6b337..265f695a1d 100644 --- a/packages/samba/samba_3.0.9.bb +++ b/packages/samba/samba_3.0.9.bb @@ -1 +1,3 @@ require samba.inc + +PR = "r1" diff --git a/packages/startup-notification/startup-notification_0.8.bb b/packages/startup-notification/startup-notification_0.8.bb index 0be545d0fc..3233f1cc16 100644 --- a/packages/startup-notification/startup-notification_0.8.bb +++ b/packages/startup-notification/startup-notification_0.8.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Startup notification support" LICENSE = "LGPL" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "virtual/libx11" +DEPENDS = "virtual/libx11 libsm" inherit autotools pkgconfig diff --git a/packages/syslinux/syslinux-native_3.36.bb b/packages/syslinux/syslinux-native_3.63.bb index d9019a4ab4..d9019a4ab4 100644 --- a/packages/syslinux/syslinux-native_3.36.bb +++ b/packages/syslinux/syslinux-native_3.63.bb diff --git a/packages/u-boot/files/sffsdr-u-boot.patch b/packages/u-boot/files/sffsdr-u-boot.patch new file mode 100644 index 0000000000..cf8415330b --- /dev/null +++ b/packages/u-boot/files/sffsdr-u-boot.patch @@ -0,0 +1,718 @@ +X-Mozilla-Status: 0003 +X-Mozilla-Status2: 00000000 +Return-Path: <owner-sffsdr@LISTSERV.VT.EDU> +Received: from mail6.zoneedit.com (mail6.zoneedit.com [66.240.226.247]) + by www.balister.org (8.13.8/8.13.5) with ESMTP id m4GGYUC2017393 + for <balister@www.balister.org>; Fri, 16 May 2008 12:34:31 -0400 +Received: from listserv.vt.edu (listserv.vt.edu [198.82.161.192]) + by mail6.zoneedit.com (Postfix) with ESMTP id B457D5D5B6 + for <philip@BALISTER.ORG>; Fri, 16 May 2008 12:34:29 -0400 (EDT) +Received: from listserv.vt.edu (listserv.vt.edu [127.0.0.1]) + by listserv.vt.edu (8.13.1/8.13.1/LISTSERV) with ESMTP id m4G7PKLG018387; + Fri, 16 May 2008 12:34:28 -0400 +Received: by LISTSERV.VT.EDU (LISTSERV-TCP/IP release 14.4) with spool id + 29624903 for SFFSDR@LISTSERV.VT.EDU; Fri, 16 May 2008 12:34:28 -0400 +Received: from freya.cc.vt.edu (IDENT:mirapoint@freya.cc.vt.edu + [198.82.161.17]) by listserv.vt.edu (8.13.1/8.13.1/LISTSERV) with + ESMTP id m4GGYSHs005336 for <sffsdr@listserv.vt.edu>; Fri, 16 May + 2008 12:34:28 -0400 +Received: from server.hugovil.com (201-217-static-ppp.3menatwork.com + [64.235.217.201]) by freya.cc.vt.edu (MOS 3.8.6-GA) with ESMTP id + AOF41814; Fri, 16 May 2008 12:34:27 -0400 (EDT) +Received: from localhost.localdomain (mail.lyrtech.com [204.101.172.90]) by + server.hugovil.com (8.13.6/8.13.6) with ESMTP id m4GGYOYT028003 for + <sffsdr@listserv.vt.edu>; Fri, 16 May 2008 12:34:24 -0400 +X-Mailer: git-send-email 1.5.4.5 +X-Greylist: Default is to whitelist mail, + not delayed by milter-greylist-3.0 (server.hugovil.com + [64.235.217.201]); Fri, 16 May 2008 12:34:25 -0400 (EDT) +X-Junkmail-Status: score=10/50, host=freya.cc.vt.edu +X-Junkmail-SD-Raw: score=unknown, + refid=str=0001.0A090205.482DB793.02F2,ss=1,fgs=0, + ip=64.235.217.201, so=2007-10-30 19:00:17, + dmn=5.4.3/2007-10-19 +X-Junkmail-IWF: false +Message-ID: <1210970183-26615-1-git-send-email-hugo.villeneuve@lyrtech.com> +Date: Fri, 16 May 2008 16:36:23 -0400 +Reply-To: sffsdr Discussion List <SFFSDR@LISTSERV.VT.EDU> +Sender: sffsdr Discussion List <SFFSDR@LISTSERV.VT.EDU> +From: Hugo Villeneuve <hugo.villeneuve@LYRTECH.COM> +Subject: [PATCH] Add support for Lyrtech SFF-SDR board (ARM926EJS) +To: SFFSDR@LISTSERV.VT.EDU +Precedence: list + +Philip, +this is the patch I´m planning on sending to the U-Boot +folks so that the SFFSDR is integrated into mainline +U-Boot. + +It is mostly based on the work you have done. + +I added code to make the EEPROM accessible through +the I2C bus. This is needed because we use an I2C +switch on the SFFSDR that is turned OFF by default. +I also added code to read the MAC address from the +EEPROM. + +I also removed unused stuff specific to the +Schmoogie board. + +The network and NAND are both working fine with +that patch. + +I´m looking forward to your comments. + +Hugo V. + +--- + +This patch adds support for the Lyrtech SFF-SDR, based +on the TI DaVinci architecture (ARM926EJS). + +Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com> +--- + + MAKEALL | 1 + + Makefile | 3 + + board/davinci/sffsdr/Makefile | 52 +++++++++ + board/davinci/sffsdr/board_init.S | 29 +++++ + board/davinci/sffsdr/config.mk | 24 ++++ + board/davinci/sffsdr/dv_board.c | 211 +++++++++++++++++++++++++++++++++++++ + board/davinci/sffsdr/u-boot.lds | 52 +++++++++ + include/asm-arm/mach-types.h | 13 +++ + include/configs/davinci_sffsdr.h | 171 ++++++++++++++++++++++++++++++ + 9 files changed, 556 insertions(+), 0 deletions(-) + +diff --git a/MAKEALL b/MAKEALL +index 791eabc..1a0cb37 100755 +--- a/MAKEALL ++++ b/MAKEALL +@@ -495,6 +495,7 @@ LIST_ARM9=" \ + voiceblue \ + davinci_dvevm \ + davinci_schmoogie \ ++ davinci_sffsdr \ + davinci_sonata \ + " + +diff --git a/Makefile b/Makefile +index 167a717..6280a59 100644 +--- a/Makefile ++++ b/Makefile +@@ -2402,6 +2402,9 @@ davinci_dvevm_config : unconfig + davinci_schmoogie_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs schmoogie davinci davinci + ++davinci_sffsdr_config : unconfig ++ @$(MKCONFIG) $(@:_config=) arm arm926ejs sffsdr davinci davinci ++ + davinci_sonata_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs sonata davinci davinci + +diff --git a/board/davinci/sffsdr/Makefile b/board/davinci/sffsdr/Makefile +new file mode 100644 +index 0000000..fa00138 +--- /dev/null ++++ b/board/davinci/sffsdr/Makefile +@@ -0,0 +1,52 @@ ++# ++# (C) Copyright 2000, 2001, 2002 ++# Wolfgang Denk, DENX Software Engineering, wd@denx.de. ++# ++# Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net> ++# ++# See file CREDITS for list of people who contributed to this ++# project. ++# ++# 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 ++# ++ ++include $(TOPDIR)/config.mk ++ ++LIB = $(obj)lib$(BOARD).a ++ ++COBJS := dv_board.o ++SOBJS := board_init.o ++ ++SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) ++OBJS := $(addprefix $(obj),$(COBJS)) ++SOBJS := $(addprefix $(obj),$(SOBJS)) ++ ++$(LIB): $(obj).depend $(OBJS) $(SOBJS) ++ $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) ++ ++clean: ++ rm -f $(SOBJS) $(OBJS) ++ ++distclean: clean ++ rm -f $(LIB) core *.bak *~ .depend ++ ++######################################################################### ++# This is for $(obj).depend target ++include $(SRCTREE)/rules.mk ++ ++sinclude $(obj).depend ++ ++######################################################################### +diff --git a/board/davinci/sffsdr/board_init.S b/board/davinci/sffsdr/board_init.S +new file mode 100644 +index 0000000..22d8adc +--- /dev/null ++++ b/board/davinci/sffsdr/board_init.S +@@ -0,0 +1,29 @@ ++/* ++ * Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net> ++ * ++ * Board-specific low level initialization code. Called at the very end ++ * of cpu/arm926ejs/davinci/lowlevel_init.S. Just returns if there is no ++ * initialization required. ++ * ++ * 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 ++ */ ++ ++#include <config.h> ++ ++.globl dv_board_init ++dv_board_init: ++ ++ mov pc, lr +diff --git a/board/davinci/sffsdr/config.mk b/board/davinci/sffsdr/config.mk +new file mode 100644 +index 0000000..e8a329c +--- /dev/null ++++ b/board/davinci/sffsdr/config.mk +@@ -0,0 +1,24 @@ ++# ++# (C) Copyright 2002 ++# Gary Jennejohn, DENX Software Engineering, <gj@denx.de> ++# David Mueller, ELSOFT AG, <d.mueller@elsoft.ch> ++# ++# Lyrtech SFF SDR board (ARM926EJS) cpu ++# see http://www.lyrtech.com/ for more information on Lyrtech ++# ++# SFF SDR board has 1 bank of 128 MB DDR RAM ++# Physical Address: ++# 8000'0000 to 87FF'FFFF ++# ++# Linux-Kernel is expected to be at 8000'8000, entry 8000'8000 ++# (mem base + reserved) ++# ++# Integrity kernel is expected to be at 8000'0000, entry 8000'00D0, ++# up to 81FF'FFFF (uses up to 32 MB of memory for text, heap, etc). ++# ++# we load ourself to 8400'0000 ++# ++# ++ ++# Provide at least 32MB spacing between us and the Integrity kernel image ++TEXT_BASE = 0x84000000 +diff --git a/board/davinci/sffsdr/dv_board.c b/board/davinci/sffsdr/dv_board.c +new file mode 100644 +index 0000000..a3f60cb +--- /dev/null ++++ b/board/davinci/sffsdr/dv_board.c +@@ -0,0 +1,211 @@ ++/* ++ * Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net> ++ * ++ * Parts are shamelessly stolen from various TI sources, original copyright ++ * follows: ++ * ----------------------------------------------------------------- ++ * ++ * Copyright (C) 2004 Texas Instruments. ++ * ++ * ---------------------------------------------------------------------------- ++ * 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., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ---------------------------------------------------------------------------- ++ */ ++ ++#include <common.h> ++#include <i2c.h> ++#include <asm/arch/hardware.h> ++#include <asm/arch/emac_defs.h> ++ ++DECLARE_GLOBAL_DATA_PTR; ++ ++extern void i2c_init(int speed, int slaveaddr); ++extern void timer_init(void); ++extern int eth_hw_init(void); ++extern phy_t phy; ++ ++ ++/* Works on Always On power domain only (no PD argument) */ ++void lpsc_on(unsigned int id) ++{ ++ dv_reg_p mdstat, mdctl; ++ ++ if (id >= DAVINCI_LPSC_GEM) ++ return; /* Don't work on DSP Power Domain */ ++ ++ mdstat = REG_P(PSC_MDSTAT_BASE + (id * 4)); ++ mdctl = REG_P(PSC_MDCTL_BASE + (id * 4)); ++ ++ while (REG(PSC_PTSTAT) & 0x01) {;} ++ ++ if ((*mdstat & 0x1f) == 0x03) ++ return; /* Already on and enabled */ ++ ++ *mdctl |= 0x03; ++ ++ /* Special treatment for some modules as for sprue14 p.7.4.2 */ ++ if ( (id == DAVINCI_LPSC_VPSSSLV) || ++ (id == DAVINCI_LPSC_EMAC) || ++ (id == DAVINCI_LPSC_EMAC_WRAPPER) || ++ (id == DAVINCI_LPSC_MDIO) || ++ (id == DAVINCI_LPSC_USB) || ++ (id == DAVINCI_LPSC_ATA) || ++ (id == DAVINCI_LPSC_VLYNQ) || ++ (id == DAVINCI_LPSC_UHPI) || ++ (id == DAVINCI_LPSC_DDR_EMIF) || ++ (id == DAVINCI_LPSC_AEMIF) || ++ (id == DAVINCI_LPSC_MMC_SD) || ++ (id == DAVINCI_LPSC_MEMSTICK) || ++ (id == DAVINCI_LPSC_McBSP) || ++ (id == DAVINCI_LPSC_GPIO) ++ ) ++ *mdctl |= 0x200; ++ ++ REG(PSC_PTCMD) = 0x01; ++ ++ while (REG(PSC_PTSTAT) & 0x03) {;} ++ while ((*mdstat & 0x1f) != 0x03) {;} /* Probably an overkill... */ ++} ++ ++void dsp_on(void) ++{ ++ int i; ++ ++ if (REG(PSC_PDSTAT1) & 0x1f) ++ return; /* Already on */ ++ ++ REG(PSC_GBLCTL) |= 0x01; ++ REG(PSC_PDCTL1) |= 0x01; ++ REG(PSC_PDCTL1) &= ~0x100; ++ REG(PSC_MDCTL_BASE + (DAVINCI_LPSC_GEM * 4)) |= 0x03; ++ REG(PSC_MDCTL_BASE + (DAVINCI_LPSC_GEM * 4)) &= 0xfffffeff; ++ REG(PSC_MDCTL_BASE + (DAVINCI_LPSC_IMCOP * 4)) |= 0x03; ++ REG(PSC_MDCTL_BASE + (DAVINCI_LPSC_IMCOP * 4)) &= 0xfffffeff; ++ REG(PSC_PTCMD) = 0x02; ++ ++ for (i = 0; i < 100; i++) { ++ if (REG(PSC_EPCPR) & 0x02) ++ break; ++ } ++ ++ REG(PSC_CHP_SHRTSW) = 0x01; ++ REG(PSC_PDCTL1) |= 0x100; ++ REG(PSC_EPCCR) = 0x02; ++ ++ for (i = 0; i < 100; i++) { ++ if (!(REG(PSC_PTSTAT) & 0x02)) ++ break; ++ } ++ ++ REG(PSC_GBLCTL) &= ~0x1f; ++} ++ ++ ++int board_init(void) ++{ ++ /* arch number of the board */ ++ gd->bd->bi_arch_number = MACH_TYPE_SFFSDR; ++ ++ /* address of boot parameters */ ++ gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR; ++ ++ /* Workaround for TMS320DM6446 errata 1.3.22 */ ++ REG(PSC_SILVER_BULLET) = 0; ++ ++ /* Power on required peripherals */ ++ lpsc_on(DAVINCI_LPSC_EMAC); ++ lpsc_on(DAVINCI_LPSC_EMAC_WRAPPER); ++ lpsc_on(DAVINCI_LPSC_MDIO); ++ lpsc_on(DAVINCI_LPSC_I2C); ++ lpsc_on(DAVINCI_LPSC_UART0); ++ lpsc_on(DAVINCI_LPSC_TIMER1); ++ lpsc_on(DAVINCI_LPSC_GPIO); ++ ++ /* Powerup the DSP */ ++ dsp_on(); ++ ++ /* Bringup UART0 out of reset */ ++ REG(UART0_PWREMU_MGMT) = 0x0000e003; ++ ++ /* Enable GIO3.3V cells used for EMAC */ ++ REG(VDD3P3V_PWDN) = 0; ++ ++ /* Enable UART0 MUX lines */ ++ REG(PINMUX1) |= 1; ++ ++ /* Enable EMAC and AEMIF pins */ ++ REG(PINMUX0) = 0x80000c1f; ++ ++ /* Enable I2C pin Mux */ ++ REG(PINMUX1) |= (1 << 7); ++ ++ /* Set the Bus Priority Register to appropriate value */ ++ REG(VBPR) = 0x20; ++ ++ timer_init(); ++ ++ return(0); ++} ++ ++int misc_init_r (void) ++{ ++ u_int8_t tmp[20], buf[10]; ++ int i = 0; ++ int clk = 0; ++ ++ clk = ((REG(PLL2_PLLM) + 1) * 27) / ((REG(PLL2_DIV2) & 0x1f) + 1); ++ ++ printf ("ARM Clock: %dMHz\n", ((REG(PLL1_PLLM) + 1) * 27 ) / 2); ++ printf ("DDR Clock: %dMHz\n", (clk / 2)); ++ ++ /* Configure I2C switch (PCA9543) to enable channel 0. */ ++ tmp[0] = CFG_I2C_PCA9543_ENABLE_CH0; ++ if (i2c_write(CFG_I2C_PCA9543_ADDR, 0, CFG_I2C_PCA9543_ADDR_LEN, tmp, 1)) { ++ printf ("Write to MUX @ 0x%02x failed\n", CFG_I2C_PCA9543_ADDR); ++ } ++ ++ /* Set Ethernet MAC address from EEPROM. ++ * We must read 8 bytes because data is stored in little-endian. */ ++ if (i2c_read(CFG_I2C_EEPROM_ADDR, 0x05A8, CFG_I2C_EEPROM_ADDR_LEN, buf, 8)) { ++ printf ("Read from EEPROM @ 0x%02x failed\n", CFG_I2C_EEPROM_ADDR); ++ } else { ++ tmp[0] = 0xff; ++ for (i = 0; i < 6; i++) ++ tmp[0] &= buf[i]; ++ ++ if ((tmp[0] != 0xff) && (getenv("ethaddr") == NULL)) { ++ sprintf ((char *)&tmp[0], "%02x:%02x:%02x:%02x:%02x:%02x", ++ buf[3], buf[2], buf[1], buf[0], ++ buf[7], buf[6]); ++ setenv ("ethaddr", (char *)&tmp[0]); ++ } ++ } ++ ++ if (!eth_hw_init()) { ++ printf ("Ethernet init failed\n"); ++ } else { ++ printf ("ETH PHY: %s\n", phy.name); ++ } ++ ++ return(0); ++} ++ ++int dram_init(void) ++{ ++ gd->bd->bi_dram[0].start = PHYS_SDRAM_1; ++ gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; ++ ++ return(0); ++} +diff --git a/board/davinci/sffsdr/u-boot.lds b/board/davinci/sffsdr/u-boot.lds +new file mode 100644 +index 0000000..a4fcd1a +--- /dev/null ++++ b/board/davinci/sffsdr/u-boot.lds +@@ -0,0 +1,52 @@ ++/* ++ * (C) Copyright 2002 ++ * Gary Jennejohn, DENX Software Engineering, <gj@denx.de> ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * 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 ++ */ ++ ++OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") ++OUTPUT_ARCH(arm) ++ENTRY(_start) ++SECTIONS ++{ ++ . = 0x00000000; ++ . = ALIGN(4); ++ .text : ++ { ++ cpu/arm926ejs/start.o (.text) ++ *(.text) ++ } ++ . = ALIGN(4); ++ .rodata : { *(.rodata) } ++ . = ALIGN(4); ++ .data : { *(.data) } ++ . = ALIGN(4); ++ .got : { *(.got) } ++ ++ . = .; ++ __u_boot_cmd_start = .; ++ .u_boot_cmd : { *(.u_boot_cmd) } ++ __u_boot_cmd_end = .; ++ ++ . = ALIGN(4); ++ __bss_start = .; ++ .bss (NOLOAD) : { *(.bss) } ++ _end = .; ++} +diff --git a/include/asm-arm/mach-types.h b/include/asm-arm/mach-types.h +index aaf2ea2..b347857 100644 +--- a/include/asm-arm/mach-types.h ++++ b/include/asm-arm/mach-types.h +@@ -1595,6 +1595,7 @@ extern unsigned int __machine_arch_type; + #define MACH_TYPE_P300 1602 + #define MACH_TYPE_XDACOMET 1603 + #define MACH_TYPE_DEXFLEX2 1604 ++#define MACH_TYPE_SFFSDR 1657 + + #ifdef CONFIG_ARCH_EBSA110 + # ifdef machine_arch_type +@@ -16500,6 +16501,18 @@ extern unsigned int __machine_arch_type; + # define machine_is_schmoogie() (0) + #endif + ++#ifdef CONFIG_MACH_SFFSDR ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_SFFSDR ++# endif ++# define machine_is_sffsdr() (machine_arch_type == MACH_TYPE_SFFSDR) ++#else ++# define machine_is_sffsdr() (0) ++#endif ++ + #ifdef CONFIG_MACH_AZTOOL + # ifdef machine_arch_type + # undef machine_arch_type +diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h +new file mode 100644 +index 0000000..a9b480b +--- /dev/null ++++ b/include/configs/davinci_sffsdr.h +@@ -0,0 +1,171 @@ ++/* ++ * Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net> ++ * ++ * 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 ++ */ ++ ++#ifndef __CONFIG_H ++#define __CONFIG_H ++#include <asm/sizes.h> ++ ++/*=======*/ ++/* Board */ ++/*=======*/ ++#define SFFSDR ++#define CFG_NAND_LARGEPAGE ++#define CFG_USE_NAND ++/*===================*/ ++/* SoC Configuration */ ++/*===================*/ ++#define CONFIG_ARM926EJS /* arm926ejs CPU core */ ++#define CONFIG_SYS_CLK_FREQ 297000000 /* Arm Clock frequency */ ++#define CFG_TIMERBASE 0x01c21400 /* use timer 0 */ ++#define CFG_HZ_CLOCK 27000000 /* Timer Input clock freq */ ++#define CFG_HZ 1000 ++/*==================================================*/ ++/* EEPROM definitions for Atmel 24LC64 EEPROM chip */ ++/*==================================================*/ ++#define CFG_I2C_EEPROM_ADDR_LEN 2 ++#define CFG_I2C_EEPROM_ADDR 0x50 ++#define CFG_EEPROM_PAGE_WRITE_BITS 5 ++#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 20 ++/*=============*/ ++/* Memory Info */ ++/*=============*/ ++#define CFG_MALLOC_LEN (0x10000 + 256*1024) /* malloc() len */ ++#define CFG_GBL_DATA_SIZE 128 /* reserved for initial data */ ++#define CFG_MEMTEST_START 0x80000000 /* memtest start address */ ++#define CFG_MEMTEST_END 0x81000000 /* 16MB RAM test */ ++#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ ++#define CONFIG_STACKSIZE (256*1024) /* regular stack */ ++#define PHYS_SDRAM_1 0x80000000 /* DDR Start */ ++#define PHYS_SDRAM_1_SIZE 0x08000000 /* DDR size 128MB */ ++#define DDR_4BANKS /* 4-bank DDR2 (128MB) */ ++/*====================*/ ++/* Serial Driver info */ ++/*====================*/ ++#define CFG_NS16550 ++#define CFG_NS16550_SERIAL ++#define CFG_NS16550_REG_SIZE 4 /* NS16550 register size */ ++#define CFG_NS16550_COM1 0x01c20000 /* Base address of UART0 */ ++#define CFG_NS16550_CLK 27000000 /* Input clock to NS16550 */ ++#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ ++#define CONFIG_BAUDRATE 115200 /* Default baud rate */ ++#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } ++/*===================*/ ++/* I2C Configuration */ ++/*===================*/ ++#define CONFIG_HARD_I2C ++#define CONFIG_DRIVER_DAVINCI_I2C ++#define CFG_I2C_SPEED 80000 /* 100Kbps won't work, silicon bug */ ++#define CFG_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */ ++/*==================================*/ ++/* Network & Ethernet Configuration */ ++/*==================================*/ ++#define CONFIG_DRIVER_TI_EMAC ++#define CONFIG_MII ++#define CONFIG_BOOTP_DEFAULT ++#define CONFIG_BOOTP_DNS ++#define CONFIG_BOOTP_DNS2 ++#define CONFIG_BOOTP_SEND_HOSTNAME ++#define CONFIG_NET_RETRY_COUNT 10 ++#define CONFIG_OVERWRITE_ETHADDR_ONCE ++/*=====================*/ ++/* Flash & Environment */ ++/*=====================*/ ++#undef CFG_ENV_IS_IN_FLASH ++#define CFG_NO_FLASH ++#define CFG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ ++#define CFG_ENV_SECT_SIZE 2048 /* Env sector Size */ ++#define CFG_ENV_SIZE SZ_128K ++#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ ++#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */ ++#define CFG_NAND_BASE 0x02000000 ++#define CFG_NAND_HW_ECC ++#define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ ++#define NAND_MAX_CHIPS 1 ++#define CFG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ ++/*=====================*/ ++/* Board related stuff */ ++/*=====================*/ ++/*==========================================*/ ++/* I2C switch definitions for PCA9543 chip */ ++/* on Lyrtech SFF SDR board. */ ++/*==========================================*/ ++#define CFG_I2C_PCA9543_ADDR 0x70 ++#define CFG_I2C_PCA9543_ADDR_LEN 0 /* This chip has a single register. */ ++#define CFG_I2C_PCA9543_ENABLE_CH0 0x01 /* Enable channel 0. */ ++/*==============================*/ ++/* U-Boot general configuration */ ++/*==============================*/ ++#undef CONFIG_USE_IRQ /* No IRQ/FIQ in U-Boot */ ++#define CONFIG_MISC_INIT_R ++#undef CONFIG_BOOTDELAY ++#define CONFIG_BOOTFILE "uImage" /* Boot file name */ ++#define CFG_PROMPT "U-Boot > " /* Monitor Command Prompt */ ++#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */ ++#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print buffer sz */ ++#define CFG_MAXARGS 16 /* max number of command args */ ++#define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */ ++#define CFG_LOAD_ADDR 0x80700000 /* default Linux kernel load address */ ++#define CONFIG_VERSION_VARIABLE ++#define CONFIG_AUTO_COMPLETE /* Won't work with hush so far, may be later */ ++#define CFG_HUSH_PARSER ++#define CFG_PROMPT_HUSH_PS2 "> " ++#define CONFIG_CMDLINE_EDITING ++#define CFG_LONGHELP ++#define CONFIG_CRC32_VERIFY ++#define CONFIG_MX_CYCLIC ++/* ++ * Define this to load an Integrity kernel. ++ * ++#define CONFIG_CMD_ELF ++ */ ++ ++/*===================*/ ++/* Linux Information */ ++/*===================*/ ++#define LINUX_BOOT_PARAM_ADDR 0x80000100 ++#define CONFIG_CMDLINE_TAG ++#define CONFIG_SETUP_MEMORY_TAGS ++#define CONFIG_BOOTARGS "mem=56M console=ttyS0,115200n8 root=/dev/hda1 rw noinitrd ip=dhcp" ++#define CONFIG_BOOTCOMMAND "setenv setboot setenv bootargs \\$(bootargs) video=dm64xxfb:output=\\$(videostd);run setboot" ++/*=================*/ ++/* U-Boot commands */ ++/*=================*/ ++#include <config_cmd_default.h> ++#define CONFIG_CMD_ASKENV ++#define CONFIG_CMD_DHCP ++#define CONFIG_CMD_DIAG ++#define CONFIG_CMD_I2C ++#define CONFIG_CMD_MII ++#define CONFIG_CMD_PING ++#define CONFIG_CMD_SAVES ++#define CONFIG_CMD_NAND ++#define CONFIG_CMD_EEPROM ++#undef CONFIG_CMD_BDI ++#undef CONFIG_CMD_FPGA ++#undef CONFIG_CMD_SETGETDCR ++#undef CONFIG_CMD_FLASH ++#undef CONFIG_CMD_IMLS ++/*=======================*/ ++/* KGDB support (if any) */ ++/*=======================*/ ++#ifdef CONFIG_CMD_KGDB ++#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */ ++#define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */ ++#endif ++#endif /* __CONFIG_H */ + diff --git a/packages/u-boot/u-boot_git.bb b/packages/u-boot/u-boot_git.bb index 60ab0ab3f6..a05422ef50 100644 --- a/packages/u-boot/u-boot_git.bb +++ b/packages/u-boot/u-boot_git.bb @@ -2,9 +2,13 @@ require u-boot.inc PR="r1" DEFAULT_PREFERENCE = "-1" +SRCREV_davinci-sffsdr = "4ce1e23b5e12283579828b3d23e8fd6e1328a7aa" + SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git " SRC_URI_sequoia = "git://www.denx.de/git/u-boot.git;protocol=git;tag=cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093 " +SRC_URI_append_davinci-sffsdr = " file://sffsdr-u-boot.patch;patch=1 " + S = "${WORKDIR}/git" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/vnc/x11vnc_0.9.3.bb b/packages/vnc/x11vnc_0.9.3.bb index 04ac87b444..7714a4fffa 100644 --- a/packages/vnc/x11vnc_0.9.3.bb +++ b/packages/vnc/x11vnc_0.9.3.bb @@ -3,7 +3,7 @@ SECTION = "x11/utils" HOMEPAGE = "http://www.karlrunge.com/x11vnc/" AUTHOR = "Karl Runge" LICENSE = "GPL" -DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib" +DEPENDS = "openssl virtual/libx11 libxtst libxext avahi jpeg zlib" SRC_URI = "http://www.karlrunge.com/x11vnc/x11vnc-0.9.3.tar.gz" diff --git a/packages/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch b/packages/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch new file mode 100644 index 0000000000..6955727405 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch @@ -0,0 +1,10 @@ +--- xorg-server-1.3.0.0/render/glyphstr.h~ 2006-09-18 03:04:18.000000000 -0300 ++++ xorg-server-1.3.0.0/render/glyphstr.h 2008-02-03 22:14:23.187159732 -0200 +@@ -25,6 +25,7 @@ + #ifndef _GLYPHSTR_H_ + #define _GLYPHSTR_H_ + ++#include <X11/X.h> + #include <X11/extensions/renderproto.h> + #include "picture.h" + #include "screenint.h" diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb index 0a37ab39fd..a9b8afc8b3 100644 --- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb @@ -4,7 +4,8 @@ require xorg-xserver-common.inc PE = "1" PR = "r4" -SRC_URI += "file://drmfix.patch;patch=1" +SRC_URI += "file://drmfix.patch;patch=1 \ + file://glyphstr.patch;patch=1" EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no " |