diff options
194 files changed, 3258 insertions, 7668 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index a936259fe6..c3e4b41b97 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1506,7 +1506,7 @@ PREFERRED_VERSION_python24-sip ?= "4.1.1" PREFERRED_VERSION_python ?= "2.5.2" PREFERRED_VERSION_python-ao ?= "0.82" PREFERRED_VERSION_python-constraint ?= "1.1" -PREFERRED_VERSION_python-dbus ?= "0.82.4" +PREFERRED_VERSION_python-dbus ?= "0.83.0" PREFERRED_VERSION_python-fam ?= "1.1.1" PREFERRED_VERSION_python-fnorb ?= "1.3" PREFERRED_VERSION_python-fpconst ?= "0.6.0" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 612baa8756..c63a202629 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE ?= "20080727" +EFL_SRCDATE ?= "20080802" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 8e48ba407b..d8c3686b64 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -37,7 +37,7 @@ SRCREV_pn-ezxd ?= "2074" SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7837" SRCREV_pn-fbgrab-viewer-native ?= "1943" -SRCREV_pn-frameworkd ?= "f4e22aeeeeab16eee5f13151f184da4f899d7ff1" +SRCREV_pn-frameworkd ?= "5b0878b69037b68e64f4048a51003416c9b1261b" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" @@ -171,7 +171,7 @@ SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" -SRCREV_pn-webkit-gtk ?= "35062" +SRCREV_pn-webkit-gtk ?= "35533" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index d1e19aa3e4..cbd82fa467 100644 --- a/conf/machine/beagleboard.conf +++ b/conf/machine/beagleboard.conf @@ -32,6 +32,8 @@ KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" +PREFERRED_VERSION_u-boot = "git" +EXTRA_IMAGEDEPENDS += "u-boot x-load" # and sdio MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa" diff --git a/conf/machine/htcpolaris.conf b/conf/machine/htcpolaris.conf new file mode 100644 index 0000000000..e2fc46889e --- /dev/null +++ b/conf/machine/htcpolaris.conf @@ -0,0 +1,23 @@ +#@TYPE: Machine +#@NAME: HTC Polaris phone +#@DESCRIPTION: Machine configuration for HTC Polaris phone +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +XSERVER = "xserver-kdrive-fbdev" + +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" + +TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s" +FEED_ARCH = "armv6" +BASE_PACKAGE_ARCH = "armv6" + + +IMAGE_FSTYPES ?= "tar.gz cpio.gz" + +PREFERRED_PROVIDER_virtual/kernel = "linux-kaiser" + +MACHINE_FEATURES = "kernel26 touchscreen screen keyboard bluetooth" diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 4bea25a0ed..c16707be84 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -19,6 +19,7 @@ SERIAL_CONSOLE_collie = "115200 ttySA0" PREFERRED_PROVIDER_virtual/kernel = "linux-rp" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon" PCMCIA_MANAGER ?= "pcmciautils" @@ -80,4 +81,4 @@ zaurus_make_installkit () { RDEPENDS_kernel-base = "" # collie is an exception. We use mmc as root, include kernel and use another small kernel to boot it. RDEPENDS_kernel-base_collie = "kernel-image" -KERNEL_IMAGETYPE = "zImage" +KERNEL_IMAGETYPE ?= "zImage" diff --git a/packages/flac/flac-1.1.0/.mtn2git_empty b/conf/machine/nonworking/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/flac/flac-1.1.0/.mtn2git_empty +++ b/conf/machine/nonworking/.mtn2git_empty diff --git a/conf/machine/db1200.conf b/conf/machine/nonworking/db1200.conf index cbde602824..cbde602824 100644 --- a/conf/machine/db1200.conf +++ b/conf/machine/nonworking/db1200.conf diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py index 08a8a47f15..da5f7ccf8c 100755 --- a/contrib/python/generate-manifest-2.5.py +++ b/contrib/python/generate-manifest-2.5.py @@ -240,7 +240,7 @@ if __name__ == "__main__": "atexit.* bisect.* code.* codeop.* dis.* heapq.* inspect.* keyword.* opcode.* repr.* token.* tokenize.* " + "traceback.* linecache.* weakref.*" ) - m.addPackage( 0, "python-logging", "Python Logging Support", "python-core python-io python-lang python-stringold", + m.addPackage( 1, "python-logging", "Python Logging Support", "python-core python-io python-lang python-pickle python-stringold", "logging" ) # package m.addPackage( 0, "python-lib-old-and-deprecated", "Python Deprecated Libraries", "python-core", diff --git a/packages/bash/bash_3.0.bb b/packages/bash/bash_3.0.bb index a3aa25dee5..e23887aefe 100644 --- a/packages/bash/bash_3.0.bb +++ b/packages/bash/bash_3.0.bb @@ -1,7 +1,8 @@ require bash.inc -PR = "r10" +PR = "r11" SRC_URI += "\ file://bash-3.0-fixes.patch;patch=1 \ + file://default_path.patch;patch=1 \ file://signames-mipsel.diff;patch=1 \ " diff --git a/packages/bash/bash_3.2.bb b/packages/bash/bash_3.2.bb index 568f8206f5..6a48a4bd60 100644 --- a/packages/bash/bash_3.2.bb +++ b/packages/bash/bash_3.2.bb @@ -1,6 +1,6 @@ require bash.inc -PR = "r5" +PR = "r7" SRC_URI += "\ file://builtins.patch;patch=1 \ @@ -37,4 +37,11 @@ SRC_URI += "\ http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-031;patch=1;pnum=0 \ http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-032;patch=1;pnum=0 \ http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-033;patch=1;pnum=0 \ + http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-034;patch=1;pnum=0 \ + http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-035;patch=1;pnum=0 \ + http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-036;patch=1;pnum=0 \ + http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-037;patch=1;pnum=0 \ + http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-038;patch=1;pnum=0 \ + http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-039;patch=1;pnum=0 \ + file://default_path.patch;patch=1 \ " diff --git a/packages/bash/files/default_path.patch b/packages/bash/files/default_path.patch new file mode 100644 index 0000000000..7d87850965 --- /dev/null +++ b/packages/bash/files/default_path.patch @@ -0,0 +1,12 @@ +diff -Naur bash-3.0.orig/config-top.h bash-3.0/config-top.h +--- bash-3.0.orig/config-top.h 2003-08-05 16:36:12.000000000 +0200 ++++ bash-3.0/config-top.h 2007-08-29 22:30:57.059985318 +0200 +@@ -52,7 +52,7 @@ + /* The default value of the PATH variable. */ + #ifndef DEFAULT_PATH_VALUE + #define DEFAULT_PATH_VALUE \ +- "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:." ++ "/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" + #endif + + /* The value for PATH when invoking `command -p'. This is only used when diff --git a/packages/blueprobe/blueprobe_0.18.bb b/packages/blueprobe/blueprobe_0.18.bb index 08fb6798bf..b76c16b7d9 100644 --- a/packages/blueprobe/blueprobe_0.18.bb +++ b/packages/blueprobe/blueprobe_0.18.bb @@ -1,6 +1,7 @@ require blueprobe.inc -PR = "r3" +PR = "r4" SRC_URI += "file://h4000.patch;patch=1 \ - file://uclibc-fix.patch;patch=1" + file://uclibc-fix.patch;patch=1 \ + file://rx3000.patch;patch=1" diff --git a/packages/blueprobe/files/rx3000.patch b/packages/blueprobe/files/rx3000.patch new file mode 100644 index 0000000000..8c6c3367b1 --- /dev/null +++ b/packages/blueprobe/files/rx3000.patch @@ -0,0 +1,16 @@ +--- blueprobe-0.18/blueprobe.init 2007-01-11 12:54:09.000000000 +0100 ++++ blueprobe-0.18/blueprobe.init 2007-01-14 12:16:25.000000000 +0100 +@@ -102,6 +102,13 @@ + PROTO=texas + PROBE=no + ;; ++ "HP iPAQ RX3000") ++ BLUETOOTH=yes ++ PORT=/dev/ttySAC0 ++ SPEED=115200 ++ PROTO=texas ++ PROBE=no ++ ;; + + *) + BLUETOOTH=no diff --git a/packages/busybox/busybox-static_1.2.1.bb b/packages/busybox/busybox-static_1.2.1.bb index e51bb86da0..abc127ad93 100644 --- a/packages/busybox/busybox-static_1.2.1.bb +++ b/packages/busybox/busybox-static_1.2.1.bb @@ -1,5 +1,4 @@ require busybox_${PV}.bb -PR = "r2" S = "${WORKDIR}/busybox-1.2.1" diff --git a/packages/busybox/busybox.inc b/packages/busybox/busybox.inc index 0fb3b5efff..04decf61b2 100644 --- a/packages/busybox/busybox.inc +++ b/packages/busybox/busybox.inc @@ -32,7 +32,10 @@ SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1" export EXTRA_CFLAGS = "${CFLAGS}" EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}" PACKAGES =+ "${PN}-httpd ${PN}-udhcpd" - +# We need this RRECOMMENDS because libc dlopens libgcc +# and shlib mechanism can not detect it because its not +# listed in the NEEDED field. +RDEPENDS += "libgcc" FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" diff --git a/packages/busybox/busybox_1.11.1.bb b/packages/busybox/busybox_1.11.1.bb index 945ab7f718..e170a20512 100644 --- a/packages/busybox/busybox_1.11.1.bb +++ b/packages/busybox/busybox_1.11.1.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r1" +PR = "r2" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb index 1accc790a2..4ef3cfeb66 100644 --- a/packages/busybox/busybox_1.2.1.bb +++ b/packages/busybox/busybox_1.2.1.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r16" +PR = "r17" SRC_URI += "file://wget-long-options.patch;patch=1 \ file://df_rootfs.patch;patch=1 \ diff --git a/packages/busybox/busybox_1.2.2.bb b/packages/busybox/busybox_1.2.2.bb index fbf05e7182..14379a5da6 100644 --- a/packages/busybox/busybox_1.2.2.bb +++ b/packages/busybox/busybox_1.2.2.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-1" diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb index 1eea1edea2..31a2f1abe7 100644 --- a/packages/busybox/busybox_1.3.1.bb +++ b/packages/busybox/busybox_1.3.1.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-1" diff --git a/packages/busybox/busybox_1.7.2.bb b/packages/busybox/busybox_1.7.2.bb index 75f59cf932..53304df387 100644 --- a/packages/busybox/busybox_1.7.2.bb +++ b/packages/busybox/busybox_1.7.2.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r8" +PR = "r9" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://busybox-cron \ diff --git a/packages/busybox/busybox_1.9.2.bb b/packages/busybox/busybox_1.9.2.bb index 5da0f03093..c9440e7b4f 100644 --- a/packages/busybox/busybox_1.9.2.bb +++ b/packages/busybox/busybox_1.9.2.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r0" +PR = "r1" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://udhcpscript.patch;patch=1 \ diff --git a/packages/busybox/slingbox_1.3.1.bb b/packages/busybox/slingbox_1.3.1.bb index a680efc843..cbcce6c675 100644 --- a/packages/busybox/slingbox_1.3.1.bb +++ b/packages/busybox/slingbox_1.3.1.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r2" +PR = "r3" COMPATIBLE_MACHINE = "nslu2" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ diff --git a/packages/classpath/classpath-native_0.97.2.bb b/packages/classpath/classpath-native_0.97.2.bb index e744b3378e..c25b1849ca 100644 --- a/packages/classpath/classpath-native_0.97.2.bb +++ b/packages/classpath/classpath-native_0.97.2.bb @@ -1,6 +1,6 @@ require classpath-native.inc -PR = "r0" +PR = "r1" # The code affected by the javanet-local patch # is usually not compiled. However if someone changes @@ -9,5 +9,6 @@ SRC_URI += "\ file://netif_16.patch;patch=1;pnum=0 \ file://SimpleName.diff;patch=1;pnum=0 \ file://javanet-local.patch;patch=1;pnum=0 \ + file://sun-security-getproperty_0.96.1.patch;patch=1;pnum=0 \ " diff --git a/packages/dsplink/codec-engine_2.10.bb b/packages/dsplink/codec-engine_2.10.bb index 83102a0afe..0e85d38a82 100644 --- a/packages/dsplink/codec-engine_2.10.bb +++ b/packages/dsplink/codec-engine_2.10.bb @@ -14,7 +14,6 @@ PV = "2.10" SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_10_01.tar.gz \ file://xdcpaths.mak \ - file://ticel-config \ " S = "${WORKDIR}/codec_engine_2_10_01" @@ -137,10 +136,6 @@ do_stage() { cp -pPr $header ${STAGING_INCDIR}/codec-engine/$(echo $header | sed s:${S}::g) done - sed -i -e s:SEDME_CFLAGS:"-I${TITOOLSDIR}/${TIBIOSDIR}/xdctools/packages -I${STAGING_INCDIR}/codec-engine/packages -I${STAGING_INCDIR}/codec-engine/cetools/packages/":g \ - -e s:SEDME_STAGINGLIBDIR:${STAGING_LIBDIR}:g \ - ${WORKDIR}/ticel-config - install -m 0755 ${WORKDIR}/ticel-config ${STAGING_BINDIR_CROSS} } pkg_postinst_${PN}-module () { diff --git a/packages/dsplink/dsplink_1.50.bb b/packages/dsplink/dsplink_1.50.bb index 965c735798..62a352e43c 100644 --- a/packages/dsplink/dsplink_1.50.bb +++ b/packages/dsplink/dsplink_1.50.bb @@ -1,6 +1,6 @@ require dsplink.inc -PR = "r9" +PR = "r10" PE = "1" PV = "1.50" diff --git a/packages/dsplink/files/ticel-config b/packages/dsplink/files/ticel-config deleted file mode 100644 index 75ebddae75..0000000000 --- a/packages/dsplink/files/ticel-config +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -LIBS="" -for lib in \ - TraceUtil.a \ - bioslog.a \ - video.a \ - audio.a \ - speech.a \ - ce.a \ - Algorithm_noOS.a \ - alg.a \ - osal_linux_470.a \ - dman3Cfg.a \ - acpy3.a \ - cmem.a \ - dsplink.lib \ - XdmUtils.a \ - gt.a -do - LIBS="${LIBS} SEDME_STAGINGLIBDIR/${lib}" -done - -CFLAGS="SEDME_CFLAGS" - -usage() -{ - echo "Usage : $0 [--cflags] [--libs]" - exit 1 -} - -test "$#" = 0 && usage - -OUT="" -while test "$#" -gt 0; -do - case "$1" in - "--cflags") - OUT="${OUT} ${CFLAGS}" - ;; - "--libs") - OUT="${OUT} ${LIBDIRS} ${LIBS}" - ;; - *) - usage - ;; - esac - - shift -done - -echo "${OUT}" -exit 0 diff --git a/packages/eglibc/eglibc.inc b/packages/eglibc/eglibc.inc index 0309a7f1b2..e91ddaa40e 100644 --- a/packages/eglibc/eglibc.inc +++ b/packages/eglibc/eglibc.inc @@ -11,10 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" #RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv" -# We need this RRECOMMENDS because libc dlopens libgcc -# and shlib mechanism can not detect it because its not -# listed in the NEEDED field. -RRECOMMENDS += "libgcc" inherit autotools LEAD_SONAME = "libc.so" diff --git a/packages/eglibc/eglibc_svn.bb b/packages/eglibc/eglibc_svn.bb index 3e8a5a0c99..a47e94ef2e 100644 --- a/packages/eglibc/eglibc_svn.bb +++ b/packages/eglibc/eglibc_svn.bb @@ -3,7 +3,7 @@ require eglibc.inc # DEFAULT_PREFERENCE = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.8+svnr${SRCREV}" -PR = "r8" +PR = "r9" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ file://etc/ld.so.conf \ diff --git a/packages/espgs/espgs_8.15.3.bb b/packages/espgs/espgs_8.15.3.bb index 50f2ca2d36..13cfad6d12 100644 --- a/packages/espgs/espgs_8.15.3.bb +++ b/packages/espgs/espgs_8.15.3.bb @@ -2,31 +2,21 @@ DESCRIPTION = "ESP Ghostscript is an up-to-date GNU Ghostscript distribution \ including bug fixes, new drivers, and additional support for CUPS." HOMEPAGE = "http://www.cups.org/espgs/" SECTION = "libs" -DEPENDS = "jpeg zlib libpng fontconfig" +DEPENDS = "jpeg zlib libpng tiff fontconfig" LICENSE = "GPL" +PR = "r1" SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/${PV}/espgs-${PV}-source.tar.bz2" -S = "${WORKDIR}/espgs-${PV}" PARALLEL_MAKE = "" inherit autotools -PACKAGES += "espgs-examples espgs-resources" - -# I added the lib dir to the central package, since espgs complained of a missing file when run. -# If I find exactly which files are needed for operation, I'll just add those, and split the package. - -FILES_${PN} += "${datadir}/ghostscript/8.15/lib/*" -FILES_${PN}-doc += "${datadir}/ghostscript/8.15/doc/*" -FILES_${PN}-examples += "${datadir}/ghostscript/8.15/examples/*" -FILES_${PN}-resources += "${datadir}/ghostscript/8.15/Resource/*" - -EXTRA_OECONF = "--with-drivers= \ - --disable-cups \ - --disable-gtk \ +EXTRA_OECONF = "--with-drivers=ALL \ + --enable-cups \ --without-ijs \ - --without-gimp-print \ + --disable-gtk \ + --without-gimp-print \ --without-x \ --without-omni" @@ -34,12 +24,32 @@ do_compile() { oe_runmake CCAUX="${BUILD_CC}" } + do_install () { oe_runmake 'prefix=${D}${prefix}' \ 'bindir=${D}${bindir}' \ 'datadir=${D}${datadir}' \ + 'cups_datadir=${D}${datadir}/cups' \ + 'cups_serverroot=${D}${sysconfdir}/cups' \ + 'cups_serverbin= ${D}${libdir}/cups' \ + 'CUPSSERVER=${cups_serverbin}' \ + 'CUPSCONFIG=${cups_serverroot}' \ + 'CUPSDATA=${cups_datadir}' \ + 'sysconfdir=${D}${sysconfdir}' \ 'gsdir=${D}${datadir}/ghostscript' \ 'gsdatadir=${D}${datadir}/ghostscript/8.15' \ 'mandir=${D}${mandir}' \ - 'docdir=${D}${datadir}/doc/espgs/' install + 'docdir=${D}${datadir}/doc/espgs/' install } + +PACKAGES += "espgs-examples espgs-resources" + +# I added the lib dir to the central package, since espgs complained of a missing file when run. +# If I find exactly which files are needed for operation, I'll just add those, and split the package. + +FILES_${PN} += "${datadir}/ghostscript/8.15/lib/* \ + ${libdir}/cups/filter/* \ + ${datadir}/cups/model/* \" +FILES_${PN}-doc += "${datadir}/ghostscript/8.15/doc/*" +FILES_${PN}-examples += "${datadir}/ghostscript/8.15/examples/*" +FILES_${PN}-resources += "${datadir}/ghostscript/8.15/Resource/*" diff --git a/packages/expat/expat-1.95.7/expat-XMLCALL.patch b/packages/expat/expat-1.95.7/expat-XMLCALL.patch new file mode 100644 index 0000000000..c688f06426 --- /dev/null +++ b/packages/expat/expat-1.95.7/expat-XMLCALL.patch @@ -0,0 +1,17 @@ +--- + lib/expat.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: expat-1.95.7/lib/expat.h +=================================================================== +--- expat-1.95.7.orig/lib/expat.h 2008-07-31 15:56:39.000000000 -0700 ++++ expat-1.95.7/lib/expat.h 2008-07-31 15:58:38.000000000 -0700 +@@ -45,7 +45,7 @@ + #ifndef XMLCALL + #if defined(XML_USE_MSC_EXTENSIONS) + #define XMLCALL __cdecl +-#elif defined(__GNUC__) ++#elif defined(__GNUC__) && defined(__i386) && !defined(__INTEL_COMPILER) + #define XMLCALL __attribute__((cdecl)) + #else + /* For any platform which uses this definition and supports more than diff --git a/packages/expat/expat_1.95.7.bb b/packages/expat/expat_1.95.7.bb index a4dda4dcb6..7b48305933 100644 --- a/packages/expat/expat_1.95.7.bb +++ b/packages/expat/expat_1.95.7.bb @@ -1,7 +1,9 @@ require expat.inc -PR = "r1" +PR = "r2" -SRC_URI += "file://autotools.patch;patch=1" +SRC_URI += "file://autotools.patch;patch=1 \ + file://expat-XMLCALL.patch;patch=1 \ + " inherit lib_package diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index e45ea4b6e6..d05e65d281 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -3,16 +3,18 @@ require ffmpeg.inc DEPENDS += "libgsm" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r18" +PR = "r20" DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_armv5te = "1" +DEFAULT_PREFERENCE_armv6 = "1" DEFAULT_PREFERENCE_armv7a = "1" FFBRANCH_arm = "arm-neon" FFBRANCH ?= "master" SRCREV = "3692b8de9fae73860be636606cb6344f26e28b1a" -SRCREV_arm = "c6bbb0c33f6f681b8265a43f8744735de5a9d45e" +SRCREV_arm = "af7bda5224b6cdfb0c1f03686d2a6b631a455668" SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ " diff --git a/packages/ffmpeg/omapfbplay_git.bb b/packages/ffmpeg/omapfbplay_git.bb index 1260c0ecc1..890ed31e20 100644 --- a/packages/ffmpeg/omapfbplay_git.bb +++ b/packages/ffmpeg/omapfbplay_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays" DEPENDS = "bzip2 lame ffmpeg virtual/kernel" LICENSE = "MIT" -PR = "r8" +PR = "r9" inherit module-base @@ -15,7 +15,7 @@ SRC_URI = "git://git.mansr.com/${PN};protocol=git \ S = "${WORKDIR}/git" -CFLAGS += " -static -I${STAGING_KERNEL_DIR}/include " +CFLAGS += " -I${STAGING_KERNEL_DIR}/include " do_compile() { oe_runmake -e diff --git a/packages/flac/flac-1.1.2/.mtn2git_empty b/packages/flac/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/flac/flac-1.1.2/.mtn2git_empty +++ b/packages/flac/files/.mtn2git_empty diff --git a/packages/flac/flac-1.1.0/disable-xmms-plugin.patch b/packages/flac/files/disable-xmms-plugin.patch index e42fcbd84d..e42fcbd84d 100644 --- a/packages/flac/flac-1.1.0/disable-xmms-plugin.patch +++ b/packages/flac/files/disable-xmms-plugin.patch diff --git a/packages/flac/flac-1.1.0/xmms.m4 b/packages/flac/files/xmms.m4 index 6d1489bf19..6d1489bf19 100644 --- a/packages/flac/flac-1.1.0/xmms.m4 +++ b/packages/flac/files/xmms.m4 diff --git a/packages/flac/flac-1.1.2/disable-xmms-plugin.patch b/packages/flac/flac-1.1.2/disable-xmms-plugin.patch deleted file mode 100644 index e42fcbd84d..0000000000 --- a/packages/flac/flac-1.1.2/disable-xmms-plugin.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- flac-1.1.0/src/Makefile.am.orig 2004-12-25 01:11:45.000000000 +0100 -+++ flac-1.1.0/src/Makefile.am 2004-12-25 01:12:10.000000000 +0100 -@@ -15,10 +15,6 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - --if FLaC__HAS_XMMS --XMMS_DIRS = plugin_xmms --endif -- - if FLaC__HAS_OGG - OGGFLAC_DIRS = libOggFLAC libOggFLAC++ - OGGFLAC_TEST_DIRS = test_libOggFLAC test_libOggFLAC++ -@@ -33,7 +29,6 @@ - metaflac \ - monkeys_audio_utilities \ - plugin_common \ -- $(XMMS_DIRS) \ - plugin_winamp2 \ - plugin_winamp3 \ - test_grabbag \ diff --git a/packages/flac/flac-1.1.2/xmms.m4 b/packages/flac/flac-1.1.2/xmms.m4 deleted file mode 100644 index 6d1489bf19..0000000000 --- a/packages/flac/flac-1.1.2/xmms.m4 +++ /dev/null @@ -1,148 +0,0 @@ -# CFLAGS and library paths for XMMS -# written 15 December 1999 by Ben Gertzfield <che@debian.org> - -dnl Usage: -dnl AM_PATH_XMMS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl -dnl Example: -dnl AM_PATH_XMMS(0.9.5.1, , AC_MSG_ERROR([*** XMMS >= 0.9.5.1 not installed - please install first ***])) -dnl -dnl Defines XMMS_CFLAGS, XMMS_LIBS, XMMS_DATA_DIR, XMMS_PLUGIN_DIR, -dnl XMMS_VISUALIZATION_PLUGIN_DIR, XMMS_INPUT_PLUGIN_DIR, -dnl XMMS_OUTPUT_PLUGIN_DIR, XMMS_GENERAL_PLUGIN_DIR, XMMS_EFFECT_PLUGIN_DIR, -dnl and XMMS_VERSION for your plugin pleasure. -dnl - -dnl XMMS_TEST_VERSION(AVAILABLE-VERSION, NEEDED-VERSION [, ACTION-IF-OKAY [, ACTION-IF-NOT-OKAY]]) -AC_DEFUN(XMMS_TEST_VERSION, [ - -# Determine which version number is greater. Prints 2 to stdout if -# the second number is greater, 1 if the first number is greater, -# 0 if the numbers are equal. - -# Written 15 December 1999 by Ben Gertzfield <che@debian.org> -# Revised 15 December 1999 by Jim Monty <monty@primenet.com> - - AC_PROG_AWK - xmms_got_version=[` $AWK ' \ -BEGIN { \ - print vercmp(ARGV[1], ARGV[2]); \ -} \ - \ -function vercmp(ver1, ver2, ver1arr, ver2arr, \ - ver1len, ver2len, \ - ver1int, ver2int, len, i, p) { \ - \ - ver1len = split(ver1, ver1arr, /\./); \ - ver2len = split(ver2, ver2arr, /\./); \ - \ - len = ver1len > ver2len ? ver1len : ver2len; \ - \ - for (i = 1; i <= len; i++) { \ - p = 1000 ^ (len - i); \ - ver1int += ver1arr[i] * p; \ - ver2int += ver2arr[i] * p; \ - } \ - \ - if (ver1int < ver2int) \ - return 2; \ - else if (ver1int > ver2int) \ - return 1; \ - else \ - return 0; \ -}' $1 $2`] - - if test $xmms_got_version -eq 2; then # failure - ifelse([$4], , :, $4) - else # success! - ifelse([$3], , :, $3) - fi -]) - -AC_DEFUN(AM_PATH_XMMS, -[ -AC_ARG_WITH(xmms-prefix,[ --with-xmms-prefix=PFX Prefix where XMMS is installed (optional)], - xmms_config_prefix="$withval", xmms_config_prefix="") -AC_ARG_WITH(xmms-exec-prefix,[ --with-xmms-exec-prefix=PFX Exec prefix where XMMS is installed (optional)], - xmms_config_exec_prefix="$withval", xmms_config_exec_prefix="") - -if test x$xmms_config_exec_prefix != x; then - xmms_config_args="$xmms_config_args --exec-prefix=$xmms_config_exec_prefix" - if test x${XMMS_CONFIG+set} != xset; then - XMMS_CONFIG=$xmms_config_exec_prefix/bin/xmms-config - fi -fi - -if test x$xmms_config_prefix != x; then - xmms_config_args="$xmms_config_args --prefix=$xmms_config_prefix" - if test x${XMMS_CONFIG+set} != xset; then - XMMS_CONFIG=$xmms_config_prefix/bin/xmms-config - fi -fi - -AC_PATH_PROG(XMMS_CONFIG, xmms-config, no) -min_xmms_version=ifelse([$1], ,0.9.5.1, $1) - -if test "$XMMS_CONFIG" = "no"; then - no_xmms=yes -else - XMMS_CFLAGS=`$XMMS_CONFIG $xmms_config_args --cflags` - XMMS_LIBS=`$XMMS_CONFIG $xmms_config_args --libs` - XMMS_VERSION=`$XMMS_CONFIG $xmms_config_args --version` - XMMS_DATA_DIR=`$XMMS_CONFIG $xmms_config_args --data-dir` - XMMS_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --plugin-dir` - XMMS_VISUALIZATION_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args \ - --visualization-plugin-dir` - XMMS_INPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --input-plugin-dir` - XMMS_OUTPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --output-plugin-dir` - XMMS_EFFECT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --effect-plugin-dir` - XMMS_GENERAL_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --general-plugin-dir` - - XMMS_TEST_VERSION($XMMS_VERSION, $min_xmms_version, ,no_xmms=version) -fi - -AC_MSG_CHECKING(for XMMS - version >= $min_xmms_version) - -if test "x$no_xmms" = x; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) -else - AC_MSG_RESULT(no) - - if test "$XMMS_CONFIG" = "no" ; then - echo "*** The xmms-config script installed by XMMS could not be found." - echo "*** If XMMS was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the XMMS_CONFIG environment variable to the" - echo "*** full path to xmms-config." - else - if test "$no_xmms" = "version"; then - echo "*** An old version of XMMS, $XMMS_VERSION, was found." - echo "*** You need a version of XMMS newer than $min_xmms_version." - echo "*** The latest version of XMMS is always available from" - echo "*** http://www.xmms.org/" - echo "***" - - echo "*** If you have already installed a sufficiently new version, this error" - echo "*** probably means that the wrong copy of the xmms-config shell script is" - echo "*** being found. The easiest way to fix this is to remove the old version" - echo "*** of XMMS, but you can also set the XMMS_CONFIG environment to point to the" - echo "*** correct copy of xmms-config. (In this case, you will have to" - echo "*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf" - echo "*** so that the correct libraries are found at run-time)" - fi - fi - XMMS_CFLAGS="" - XMMS_LIBS="" - ifelse([$3], , :, [$3]) -fi -AC_SUBST(XMMS_CFLAGS) -AC_SUBST(XMMS_LIBS) -AC_SUBST(XMMS_VERSION) -AC_SUBST(XMMS_DATA_DIR) -AC_SUBST(XMMS_PLUGIN_DIR) -AC_SUBST(XMMS_VISUALIZATION_PLUGIN_DIR) -AC_SUBST(XMMS_INPUT_PLUGIN_DIR) -AC_SUBST(XMMS_OUTPUT_PLUGIN_DIR) -AC_SUBST(XMMS_GENERAL_PLUGIN_DIR) -AC_SUBST(XMMS_EFFECT_PLUGIN_DIR) -]) diff --git a/packages/flac/flac.inc b/packages/flac/flac.inc new file mode 100644 index 0000000000..79fa504fec --- /dev/null +++ b/packages/flac/flac.inc @@ -0,0 +1,81 @@ +DESCRIPTION = "FLAC is a Free Lossless Audio Codec." +LICENSE = "BSD GPL" +SECTION = "libs" +DEPENDS = "libogg" + +SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \ + file://disable-xmms-plugin.patch;patch=1 \ + file://xmms.m4" + +inherit autotools + +EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \ + --with-ogg-libraries=${STAGING_LIBDIR} \ + --with-ogg-includes=${STAGING_INCDIR} \ + --without-xmms-prefix \ + --without-xmms-exec-prefix \ + --without-libiconv-prefix \ + --without-id3lib" + +do_configure () { + install -d ${S}/m4 + install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/ + autotools_do_configure + # removes '-read-only-relocs' which is enabled for PowerPC builds. + # It makes the build fail, other archs are not affected. Fixes #1775. + sed -i 's/-Wl,-read_only_relocs,warning//g' src/libFLAC/Makefile +} + +do_stage () { + install -d ${STAGING_DATADIR}/aclocal + + oe_libinstall -a -so -C src/libOggFLAC libOggFLAC ${STAGING_LIBDIR}/ + install -d ${STAGING_INCDIR}/OggFLAC + install -m 0644 ${S}/include/OggFLAC/export.h ${STAGING_INCDIR}/OggFLAC/export.h + + install -m 0644 ${S}/include/OggFLAC/all.h ${STAGING_INCDIR}/OggFLAC/all.h + install -m 0644 ${S}/include/OggFLAC/stream_encoder.h ${STAGING_INCDIR}/OggFLAC/stream_encoder.h + install -m 0644 ${S}/include/OggFLAC/stream_decoder.h ${STAGING_INCDIR}/OggFLAC/stream_decoder.h + install -m 0644 ${S}/src/libOggFLAC/libOggFLAC.m4 ${STAGING_DATADIR}/aclocal/ + + oe_libinstall -a -so -C src/libFLAC libFLAC ${STAGING_LIBDIR}/ + install -d ${STAGING_INCDIR}/FLAC + install -m 0644 ${S}/include/FLAC/export.h ${STAGING_INCDIR}/FLAC/export.h + install -m 0644 ${S}/include/FLAC/metadata.h ${STAGING_INCDIR}/FLAC/metadata.h + install -m 0644 ${S}/include/FLAC/all.h ${STAGING_INCDIR}/FLAC/all.h + install -m 0644 ${S}/include/FLAC/format.h ${STAGING_INCDIR}/FLAC/format.h + install -m 0644 ${S}/include/FLAC/stream_encoder.h ${STAGING_INCDIR}/FLAC/stream_encoder.h + install -m 0644 ${S}/include/FLAC/stream_decoder.h ${STAGING_INCDIR}/FLAC/stream_decoder.h + install -m 0644 ${S}/include/FLAC/ordinals.h ${STAGING_INCDIR}/FLAC/ordinals.h + install -m 0644 ${S}/include/FLAC/seekable_stream_encoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_encoder.h + install -m 0644 ${S}/include/FLAC/file_encoder.h ${STAGING_INCDIR}/FLAC/file_encoder.h + install -m 0644 ${S}/include/FLAC/seekable_stream_decoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_decoder.h + install -m 0644 ${S}/include/FLAC/file_decoder.h ${STAGING_INCDIR}/FLAC/file_decoder.h + install -m 0644 ${S}/include/FLAC/assert.h ${STAGING_INCDIR}/FLAC/assert.h + install -m 0644 ${S}/include/FLAC/callback.h ${STAGING_INCDIR}/FLAC/callback.h + install -m 0644 ${S}/src/libFLAC/libFLAC.m4 ${STAGING_DATADIR}/aclocal/ + + oe_libinstall -a -so -C src/libFLAC++ libFLAC++ ${STAGING_LIBDIR}/ + install -d ${STAGING_INCDIR}/FLAC++ + install -m 0644 ${S}/include/FLAC++/export.h ${STAGING_INCDIR}/FLAC++/export.h + install -m 0644 ${S}/include/FLAC++/metadata.h ${STAGING_INCDIR}/FLAC++/metadata.h + install -m 0644 ${S}/include/FLAC++/all.h ${STAGING_INCDIR}/FLAC++/all.h + install -m 0644 ${S}/include/FLAC++/encoder.h ${STAGING_INCDIR}/FLAC++/encoder.h + install -m 0644 ${S}/include/FLAC++/decoder.h ${STAGING_INCDIR}/FLAC++/decoder.h + install -m 0644 ${S}/src/libFLAC++/libFLAC++.m4 ${STAGING_DATADIR}/aclocal/ + + oe_libinstall -a -so -C src/libOggFLAC++ libOggFLAC++ ${STAGING_LIBDIR}/ + install -d ${STAGING_INCDIR}/OggFLAC++ + install -m 0644 ${S}/include/OggFLAC++/export.h ${STAGING_INCDIR}/OggFLAC++/export.h + install -m 0644 ${S}/include/OggFLAC++/all.h ${STAGING_INCDIR}/OggFLAC++/all.h + install -m 0644 ${S}/include/OggFLAC++/encoder.h ${STAGING_INCDIR}/OggFLAC++/encoder.h + install -m 0644 ${S}/include/OggFLAC++/decoder.h ${STAGING_INCDIR}/OggFLAC++/decoder.h + install -m 0644 ${S}/src/libOggFLAC++/libOggFLAC++.m4 ${STAGING_DATADIR}/aclocal/ +} + +PACKAGES += "libflac libflac++ liboggflac liboggflac++" +FILES_${PN} = "${bindir}/*" +FILES_libflac = "${libdir}/libFLAC.so.*" +FILES_libflac++ = "${libdir}/libFLAC++.so.*" +FILES_liboggflac = "${libdir}/libOggFLAC.so.*" +FILES_liboggflac++ = "${libdir}/libOggFLAC++.so.*" diff --git a/packages/flac/flac_1.1.0.bb b/packages/flac/flac_1.1.0.bb index bcc4e01048..debe8d73de 100644 --- a/packages/flac/flac_1.1.0.bb +++ b/packages/flac/flac_1.1.0.bb @@ -1,78 +1,3 @@ -DESCRIPTION = "FLAC is a Free Lossless Audio Codec." -LICENSE = "BSD GPL" -SECTION = "libs" -DEPENDS = "libogg" -PR = "r5" +require flac.inc -SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \ - file://disable-xmms-plugin.patch;patch=1 \ - file://xmms.m4" -S = "${WORKDIR}/flac-${PV}" - -inherit autotools - -EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \ - --with-ogg-libraries=${STAGING_LIBDIR} \ - --with-ogg-includes=${STAGING_INCDIR} \ - --without-xmms-prefix \ - --without-xmms-exec-prefix \ - --without-libiconv-prefix \ - --without-id3lib" - -PACKAGES += "libflac libflac++ liboggflac liboggflac++" -FILES_${PN} = "${bindir}/*" -FILES_libflac = "${libdir}/libFLAC.so.*" -FILES_libflac++ = "${libdir}/libFLAC++.so.*" -FILES_liboggflac = "${libdir}/libOggFLAC.so.*" -FILES_liboggflac++ = "${libdir}/libOggFLAC++.so.*" - -do_configure () { - install -d ${S}/m4 - install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/ - autotools_do_configure -} - -do_stage () { - install -d ${STAGING_DATADIR}/aclocal - - oe_libinstall -a -so -C src/libOggFLAC libOggFLAC ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/OggFLAC - install -m 0644 ${S}/include/OggFLAC/export.h ${STAGING_INCDIR}/OggFLAC/export.h - install -m 0644 ${S}/include/OggFLAC/all.h ${STAGING_INCDIR}/OggFLAC/all.h - install -m 0644 ${S}/include/OggFLAC/stream_encoder.h ${STAGING_INCDIR}/OggFLAC/stream_encoder.h - install -m 0644 ${S}/include/OggFLAC/stream_decoder.h ${STAGING_INCDIR}/OggFLAC/stream_decoder.h - install -m 0644 ${S}/src/libOggFLAC/libOggFLAC.m4 ${STAGING_DATADIR}/aclocal/ - - oe_libinstall -a -so -C src/libFLAC libFLAC ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/FLAC - install -m 0644 ${S}/include/FLAC/export.h ${STAGING_INCDIR}/FLAC/export.h - install -m 0644 ${S}/include/FLAC/metadata.h ${STAGING_INCDIR}/FLAC/metadata.h - install -m 0644 ${S}/include/FLAC/all.h ${STAGING_INCDIR}/FLAC/all.h - install -m 0644 ${S}/include/FLAC/format.h ${STAGING_INCDIR}/FLAC/format.h - install -m 0644 ${S}/include/FLAC/stream_encoder.h ${STAGING_INCDIR}/FLAC/stream_encoder.h - install -m 0644 ${S}/include/FLAC/stream_decoder.h ${STAGING_INCDIR}/FLAC/stream_decoder.h - install -m 0644 ${S}/include/FLAC/ordinals.h ${STAGING_INCDIR}/FLAC/ordinals.h - install -m 0644 ${S}/include/FLAC/seekable_stream_encoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_encoder.h - install -m 0644 ${S}/include/FLAC/file_encoder.h ${STAGING_INCDIR}/FLAC/file_encoder.h - install -m 0644 ${S}/include/FLAC/seekable_stream_decoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_decoder.h - install -m 0644 ${S}/include/FLAC/file_decoder.h ${STAGING_INCDIR}/FLAC/file_decoder.h - install -m 0644 ${S}/include/FLAC/assert.h ${STAGING_INCDIR}/FLAC/assert.h - install -m 0644 ${S}/src/libFLAC/libFLAC.m4 ${STAGING_DATADIR}/aclocal/ - - oe_libinstall -a -so -C src/libFLAC++ libFLAC++ ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/FLAC++ - install -m 0644 ${S}/include/FLAC++/export.h ${STAGING_INCDIR}/FLAC++/export.h - install -m 0644 ${S}/include/FLAC++/metadata.h ${STAGING_INCDIR}/FLAC++/metadata.h - install -m 0644 ${S}/include/FLAC++/all.h ${STAGING_INCDIR}/FLAC++/all.h - install -m 0644 ${S}/include/FLAC++/encoder.h ${STAGING_INCDIR}/FLAC++/encoder.h - install -m 0644 ${S}/include/FLAC++/decoder.h ${STAGING_INCDIR}/FLAC++/decoder.h - install -m 0644 ${S}/src/libFLAC++/libFLAC++.m4 ${STAGING_DATADIR}/aclocal/ - - oe_libinstall -a -so -C src/libOggFLAC++ libOggFLAC++ ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/OggFLAC++ - install -m 0644 ${S}/include/OggFLAC++/export.h ${STAGING_INCDIR}/OggFLAC++/export.h - install -m 0644 ${S}/include/OggFLAC++/all.h ${STAGING_INCDIR}/OggFLAC++/all.h - install -m 0644 ${S}/include/OggFLAC++/encoder.h ${STAGING_INCDIR}/OggFLAC++/encoder.h - install -m 0644 ${S}/include/OggFLAC++/decoder.h ${STAGING_INCDIR}/OggFLAC++/decoder.h - install -m 0644 ${S}/src/libOggFLAC++/libOggFLAC++.m4 ${STAGING_DATADIR}/aclocal/ -} +PR = "r6" diff --git a/packages/flac/flac_1.1.2.bb b/packages/flac/flac_1.1.2.bb index 85ffc9beb9..69eb07125e 100644 --- a/packages/flac/flac_1.1.2.bb +++ b/packages/flac/flac_1.1.2.bb @@ -1,84 +1,13 @@ -DESCRIPTION = "FLAC is a Free Lossless Audio Codec." -LICENSE = "BSD GPL" -SECTION = "libs" -DEPENDS = "libogg" -PR = "r5" +require flac.inc -SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \ - file://disable-xmms-plugin.patch;patch=1 \ - file://xmms.m4" +PR = "r6" -S = "${WORKDIR}/flac-${PV}" - -inherit autotools - -EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \ - --with-ogg-libraries=${STAGING_LIBDIR} \ - --with-ogg-includes=${STAGING_INCDIR} \ - --without-xmms-prefix \ - --without-xmms-exec-prefix \ - --without-libiconv-prefix \ - --without-id3lib" - -PACKAGES += "libflac libflac++ liboggflac liboggflac++" -FILES_${PN} = "${bindir}/*" -FILES_libflac = "${libdir}/libFLAC.so.*" -FILES_libflac++ = "${libdir}/libFLAC++.so.*" -FILES_liboggflac = "${libdir}/libOggFLAC.so.*" -FILES_liboggflac++ = "${libdir}/libOggFLAC++.so.*" - -do_configure () { - install -d ${S}/m4 - install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/ - autotools_do_configure +do_configure_append () { # removes '-read-only-relocs' which is enabled for PowerPC builds. # It makes the build fail, other archs are not affected. Fixes #1775. sed -i 's/-Wl,-read_only_relocs,warning//g' src/libFLAC/Makefile } -do_stage () { - install -d ${STAGING_DATADIR}/aclocal - - oe_libinstall -a -so -C src/libOggFLAC libOggFLAC ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/OggFLAC - install -m 0644 ${S}/include/OggFLAC/export.h ${STAGING_INCDIR}/OggFLAC/export.h - - install -m 0644 ${S}/include/OggFLAC/all.h ${STAGING_INCDIR}/OggFLAC/all.h - install -m 0644 ${S}/include/OggFLAC/stream_encoder.h ${STAGING_INCDIR}/OggFLAC/stream_encoder.h - install -m 0644 ${S}/include/OggFLAC/stream_decoder.h ${STAGING_INCDIR}/OggFLAC/stream_decoder.h - install -m 0644 ${S}/src/libOggFLAC/libOggFLAC.m4 ${STAGING_DATADIR}/aclocal/ - - oe_libinstall -a -so -C src/libFLAC libFLAC ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/FLAC - install -m 0644 ${S}/include/FLAC/export.h ${STAGING_INCDIR}/FLAC/export.h - install -m 0644 ${S}/include/FLAC/metadata.h ${STAGING_INCDIR}/FLAC/metadata.h - install -m 0644 ${S}/include/FLAC/all.h ${STAGING_INCDIR}/FLAC/all.h - install -m 0644 ${S}/include/FLAC/format.h ${STAGING_INCDIR}/FLAC/format.h - install -m 0644 ${S}/include/FLAC/stream_encoder.h ${STAGING_INCDIR}/FLAC/stream_encoder.h - install -m 0644 ${S}/include/FLAC/stream_decoder.h ${STAGING_INCDIR}/FLAC/stream_decoder.h - install -m 0644 ${S}/include/FLAC/ordinals.h ${STAGING_INCDIR}/FLAC/ordinals.h - install -m 0644 ${S}/include/FLAC/seekable_stream_encoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_encoder.h - install -m 0644 ${S}/include/FLAC/file_encoder.h ${STAGING_INCDIR}/FLAC/file_encoder.h - install -m 0644 ${S}/include/FLAC/seekable_stream_decoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_decoder.h - install -m 0644 ${S}/include/FLAC/file_decoder.h ${STAGING_INCDIR}/FLAC/file_decoder.h - install -m 0644 ${S}/include/FLAC/assert.h ${STAGING_INCDIR}/FLAC/assert.h +do_stage_append () { install -m 0644 ${S}/include/FLAC/callback.h ${STAGING_INCDIR}/FLAC/callback.h - install -m 0644 ${S}/src/libFLAC/libFLAC.m4 ${STAGING_DATADIR}/aclocal/ - - oe_libinstall -a -so -C src/libFLAC++ libFLAC++ ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/FLAC++ - install -m 0644 ${S}/include/FLAC++/export.h ${STAGING_INCDIR}/FLAC++/export.h - install -m 0644 ${S}/include/FLAC++/metadata.h ${STAGING_INCDIR}/FLAC++/metadata.h - install -m 0644 ${S}/include/FLAC++/all.h ${STAGING_INCDIR}/FLAC++/all.h - install -m 0644 ${S}/include/FLAC++/encoder.h ${STAGING_INCDIR}/FLAC++/encoder.h - install -m 0644 ${S}/include/FLAC++/decoder.h ${STAGING_INCDIR}/FLAC++/decoder.h - install -m 0644 ${S}/src/libFLAC++/libFLAC++.m4 ${STAGING_DATADIR}/aclocal/ - - oe_libinstall -a -so -C src/libOggFLAC++ libOggFLAC++ ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/OggFLAC++ - install -m 0644 ${S}/include/OggFLAC++/export.h ${STAGING_INCDIR}/OggFLAC++/export.h - install -m 0644 ${S}/include/OggFLAC++/all.h ${STAGING_INCDIR}/OggFLAC++/all.h - install -m 0644 ${S}/include/OggFLAC++/encoder.h ${STAGING_INCDIR}/OggFLAC++/encoder.h - install -m 0644 ${S}/include/OggFLAC++/decoder.h ${STAGING_INCDIR}/OggFLAC++/decoder.h - install -m 0644 ${S}/src/libOggFLAC++/libOggFLAC++.m4 ${STAGING_DATADIR}/aclocal/ } diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb index 08c43f907a..0f364c0dd7 100644 --- a/packages/freesmartphone/frameworkd_git.bb +++ b/packages/freesmartphone/frameworkd_git.bb @@ -4,8 +4,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de> et. al." SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" -PV = "0.8.1+gitr${SRCREV}" -PR = "r12" +PV = "0.8.2+gitr${SRCREV}" +PR = "r2" inherit distutils update-rc.d @@ -21,8 +21,6 @@ do_install_append() { install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/frameworkd ${D}${sysconfdir}/init.d/ install -m 0644 ${WORKDIR}/frameworkd.conf ${D}${sysconfdir} - install -d ${D}${sysconfdir}/dbus-1/system.d/ - mv -f ${D}${datadir}/etc/dbus-1/system.d/frameworkd.conf ${D}${sysconfdir}/dbus-1/system.d/ } RDEPENDS_${PN} += "\ @@ -33,6 +31,7 @@ RDEPENDS_${PN} += "\ python-pyserial \ python-pyyaml \ python-shell \ + python-subprocess \ python-syslog \ \ ${PN}-config \ @@ -42,8 +41,9 @@ RDEPENDS_${PN} += "\ PACKAGES =+ "${PN}-config" PACKAGE_ARCH_${PN}-config = "${MACHINE_ARCH}" -FILES_${PN}-config = "${sysconfdir}" +FILES_${PN}-config = "${sysconfdir}/frameworkd.conf" +CONFFILES_${PN}-config = "${sysconfdir}/frameworkd.conf" PACKAGE_ARCH_${PN} = "${BASE_PACKAGE_ARCH}" -FILES_${PN} += "${datadir}" +FILES_${PN} += "${sysconfdir}/dbus-1 ${sysconfdir}/freesmartphone ${sysconfdir}/init.d ${datadir}" FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/framework/subsystems/*/.debug" diff --git a/packages/gcc/gcc-cross-intermediate.inc b/packages/gcc/gcc-cross-intermediate.inc index 4fa12886f1..4746140346 100644 --- a/packages/gcc/gcc-cross-intermediate.inc +++ b/packages/gcc/gcc-cross-intermediate.inc @@ -16,6 +16,13 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ --with-build-sysroot=${STAGING_DIR_TARGET} \ ${@get_gcc_fpu_setting(bb, d)}" +do_stage_append () { + # get rid of dummy libc.so + if [ -z "`file ${STAGING_DIR_TARGET}${layout_libdir}/libc.so | grep "ASCII C program text"`" ]; then + rm -rf ${STAGING_DIR_TARGET}${layout_libdir}/libc.so + fi +} + do_install () { : } diff --git a/packages/glibc/glibc.inc b/packages/glibc/glibc.inc index e8d56c2a42..8f9b34b252 100644 --- a/packages/glibc/glibc.inc +++ b/packages/glibc/glibc.inc @@ -7,8 +7,6 @@ LICENSE = "LGPL" DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" #this leads to circular deps, so lets not add it yet #RDEPENDS_ldd += " bash" -# nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this -RRECOMMENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv" diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index 2d37d5cf7f..3e57d857ae 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 = "r17" +PR = "r18" 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 7bb7cf5e43..c53c2dd620 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 = "r28" +PR = "r29" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb index 22fa33ec44..05b46ba2e9 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 = "r17" +PR = "r18" 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 89dd366c86..a2492f6801 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 = "r13" +PR = "r14" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb index 3d21504842..16525029da 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 = "r13" +PR = "r14" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb index fdb9ad1519..bd394921b9 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 = "r11" +PR = "r12" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb index 1b527fbc10..2908baf4cb 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 = "r14" +PR = "r15" 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 e00836b7be..54a1654404 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 = "r20" +PR = "r21" #Doesnt build for sh3 DEFAULT_PREFERENCE_sh3="-1" diff --git a/packages/glibc/glibc_2.3.6.bb b/packages/glibc/glibc_2.3.6.bb index 31a06de9cd..edf15cab61 100644 --- a/packages/glibc/glibc_2.3.6.bb +++ b/packages/glibc/glibc_2.3.6.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r2" +PR = "r3" #FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.3.6', '${FILE_DIRNAME}/orig/glibc', '${FILE_DIRNAME}/orig/files', '${FILE_DIRNAME}/orig' ], d)}" diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index 62a4e36768..17cebf8921 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r18" +PR = "r19" #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 c58561a679..701556d35a 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -1,5 +1,5 @@ require glibc.inc -PR = "r15" +PR = "r16" ARM_INSTRUCTION_SET = "arm" diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb index 8d38c4890d..60eb071032 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 = "r9" +PR = "r10" ARM_INSTRUCTION_SET = "arm" diff --git a/packages/glibc/glibc_2.7.bb b/packages/glibc/glibc_2.7.bb index 8c82203024..0e5a96234b 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 = "r5" +PR = "r6" # 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 14de0300cf..186c7d6be7 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 = "r10" +PR = "r11" PV = "2.3.5+cvs${SRCDATE}" GLIBC_ADDONS ?= "ports,linuxthreads" diff --git a/packages/gpe-plucker/gpe-plucker_0.4.bb b/packages/gpe-plucker/gpe-plucker_0.4.bb index 6e9f6b5d3b..8e90d2f06b 100644 --- a/packages/gpe-plucker/gpe-plucker_0.4.bb +++ b/packages/gpe-plucker/gpe-plucker_0.4.bb @@ -8,6 +8,7 @@ PRIORITY = "optional" SRC_URI += " file://plucker-no-host-includes.patch;patch=1" PARALLEL_MAKE="" +EXTRA_OEMAKE="RANLIB=${RANLIB}" PR = "r2" diff --git a/packages/gpe-scap/gpe-scap_1.3.bb b/packages/gpe-scap/gpe-scap_1.3.bb index 438a80f4a3..c90bfd075d 100644 --- a/packages/gpe-scap/gpe-scap_1.3.bb +++ b/packages/gpe-scap/gpe-scap_1.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "GPE screenshot application" LICENSE = "GPL" PRIORITY = "optional" SECTION = "gpe" -PR = "r0" +PR = "r1" RREPLACES = "gpe-screenshot" diff --git a/packages/gstreamer/gst-ffmpeg_0.10.4.bb b/packages/gstreamer/gst-ffmpeg_0.10.4.bb index 34ae157094..5bd5f987b6 100644 --- a/packages/gstreamer/gst-ffmpeg_0.10.4.bb +++ b/packages/gstreamer/gst-ffmpeg_0.10.4.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "LGPL" HOMEPAGE = "http://www.gstreamer.net/" DEPENDS = "ffmpeg gstreamer zlib" -PR = "r1" +PR = "r2" # This uses the systems ffmpeg, which is unsupported, but we can't build the internal one with the current autotools (ab)usage DEFAULT_PREFERENCE = "-1" diff --git a/packages/gypsy/gypsy.inc b/packages/gypsy/gypsy.inc index 57f88dc3bd..df5e1c7da3 100644 --- a/packages/gypsy/gypsy.inc +++ b/packages/gypsy/gypsy.inc @@ -1,7 +1,7 @@ DESCRIPTION = "GPS Controlling Daemon" LICENSE = "GPL" SECTION = "x11" -DEPENDS = "glib-2.0 dbus bluez-libs" +DEPENDS = "glib-2.0 dbus-glib bluez-libs libxslt-native" inherit autotools pkgconfig diff --git a/packages/gypsy/gypsy_svn.bb b/packages/gypsy/gypsy_svn.bb index ed5d45537b..1fcc47e828 100644 --- a/packages/gypsy/gypsy_svn.bb +++ b/packages/gypsy/gypsy_svn.bb @@ -1,13 +1,9 @@ require gypsy.inc -DEFAULT_PREFERENCE = "-1" - SRC_URI = "svn://svn.o-hand.com/repos/${PN}/trunk;module=${PN};proto=http \ file://fixups.patch;patch=1;maxrev=107 \ file://docs-reference-am.patch;patch=1;minrev=134" - -PR = "1" -PV = "0.0+svnr${SRCREV}" S = "${WORKDIR}/${PN}" -DEPENDS = "libxslt-native" +PV = "0.0+svnr${SRCREV}" +PR = "r1" diff --git a/packages/images/fso-image-console.bb b/packages/images/fso-image-console.bb deleted file mode 100644 index 8e0e360f9c..0000000000 --- a/packages/images/fso-image-console.bb +++ /dev/null @@ -1,13 +0,0 @@ -#------------------------------------------------------ -# freesmartphone.org Console Image Recipe -#------------------------------------------------------ - -require fso-image.bb - -IMAGE_INSTALL = "\ - ${BASE_INSTALL} \ - ${AUDIO_INSTALL} \ - ${TOOLS_INSTALL} \ - ${PYTHON_INSTALL} \ -" - diff --git a/packages/irssi/irssi_svn.bb b/packages/irssi/irssi_svn.bb index 7d09f116e5..1fc31515d9 100644 --- a/packages/irssi/irssi_svn.bb +++ b/packages/irssi/irssi_svn.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://irssi.org/" SECTION = "console/network" LICENSE = "GPL" DEPENDS += "ncurses glib-2.0" -PV = "0.8.10+svn${SRCDATE}" -PR = "r3" +PV = "0.8.11+svn${SRCDATE}" +PR = "r4" DEFAULT_PREFERENCE = "-1" @@ -15,8 +15,9 @@ RDEPENDS_${PN} += "${PN}-common" inherit autotools +SVN_REPO_URI = "http://svn.irssi.org/repos/irssi/trunk" SRC_URI = "svn://svn.irssi.org/repos/irssi/;module=trunk;proto=http \ - file://autofoo.patch;patch=1" + " S = "${WORKDIR}/trunk" EXTRA_OECONF = "--enable-ipv6 \ @@ -34,6 +35,9 @@ EXTRA_OECONF = "--enable-ipv6 \ --with-ncurses=${STAGING_LIBDIR}/.." do_configure () { + # create the ChangeLog file that hold irssi date and time version + TZ=UTC svn log -v "${SVN_REPO_URI}" > ChangeLog + # create help files echo "Creating help files..." perl syntax.pl diff --git a/packages/jamvm/jamvm-native.inc b/packages/jamvm/jamvm-native.inc index 07eecb52b3..fc9023a62c 100644 --- a/packages/jamvm/jamvm-native.inc +++ b/packages/jamvm/jamvm-native.inc @@ -1,6 +1,7 @@ require jamvm.inc DEPENDS = "zlib-native classpath-native virtual/javac-native" +RDEPENDS = "" PROVIDES_jamvm = "virtual/java-native" diff --git a/packages/konqueror/konqueror-embedded-20070212/.mtn2git_empty b/packages/konqueror/konqueror-embedded-20070316/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/konqueror/konqueror-embedded-20070212/.mtn2git_empty +++ b/packages/konqueror/konqueror-embedded-20070316/.mtn2git_empty diff --git a/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch b/packages/konqueror/konqueror-embedded-20070316/dont-use-kde-config.patch index c9f40c8a5f..c9f40c8a5f 100644 --- a/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch +++ b/packages/konqueror/konqueror-embedded-20070316/dont-use-kde-config.patch diff --git a/packages/konqueror/konqueror-embedded-20070212/konqe-kapplication.patch b/packages/konqueror/konqueror-embedded-20070316/konqe-kapplication.patch index 6feb0060c5..6feb0060c5 100644 --- a/packages/konqueror/konqueror-embedded-20070212/konqe-kapplication.patch +++ b/packages/konqueror/konqueror-embedded-20070316/konqe-kapplication.patch diff --git a/packages/konqueror/konqueror-embedded-20070212/konqe_new_opie.patch b/packages/konqueror/konqueror-embedded-20070316/konqe_new_opie.patch index 1079d23fbf..a662acbd42 100644 --- a/packages/konqueror/konqueror-embedded-20070212/konqe_new_opie.patch +++ b/packages/konqueror/konqueror-embedded-20070316/konqe_new_opie.patch @@ -1,6 +1,6 @@ -diff -urNd --exclude-from=excludelist kdenox/acinclude.m4 kdenox_new/acinclude.m4 +diff -urNd --exclude-from=excludelist kdenox/acinclude.m4 kdenox/acinclude.m4 --- kdenox/acinclude.m4 2007-02-12 22:26:21.000000000 +1300 -+++ kdenox_new/acinclude.m4 2007-02-25 22:00:27.000000000 +1300 ++++ kdenox/acinclude.m4 2007-02-25 22:00:27.000000000 +1300 @@ -880,7 +880,7 @@ ) @@ -10,9 +10,9 @@ diff -urNd --exclude-from=excludelist kdenox/acinclude.m4 kdenox_new/acinclude.m AC_HELP_STRING([--enable-rtti-embedded],[enable rtti support for Qt-embedded]), kde_use_qt_emb_rtti=$enableval, kde_use_qt_emb_rtti=no -diff -urNd --exclude-from=excludelist kdenox/configure.in kdenox_new/configure.in +diff -urNd --exclude-from=excludelist kdenox/configure.in kdenox/configure.in --- kdenox/configure.in 2007-02-12 22:26:21.000000000 +1300 -+++ kdenox_new/configure.in 2007-02-25 17:49:59.000000000 +1300 ++++ kdenox/configure.in 2007-02-25 17:49:59.000000000 +1300 @@ -60,10 +60,10 @@ @@ -26,9 +26,9 @@ diff -urNd --exclude-from=excludelist kdenox/configure.in kdenox_new/configure.i fi dnl Checks for header files. -diff -urNd --exclude-from=excludelist kdenox/configure.in.in kdenox_new/configure.in.in +diff -urNd --exclude-from=excludelist kdenox/configure.in.in kdenox/configure.in.in --- kdenox/configure.in.in 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/configure.in.in 2007-02-25 17:49:27.000000000 +1300 ++++ kdenox/configure.in.in 2007-02-25 17:49:27.000000000 +1300 @@ -56,10 +56,10 @@ @@ -42,9 +42,9 @@ diff -urNd --exclude-from=excludelist kdenox/configure.in.in kdenox_new/configur fi dnl Checks for header files. -diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kfiledialog.cpp kdenox_new/konq-embed/dropin/kfiledialog.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kfiledialog.cpp kdenox/konq-embed/dropin/kfiledialog.cpp --- kdenox/konq-embed/dropin/kfiledialog.cpp 2007-02-12 22:25:57.000000000 +1300 -+++ kdenox_new/konq-embed/dropin/kfiledialog.cpp 2007-02-24 03:29:25.000000000 +1300 ++++ kdenox/konq-embed/dropin/kfiledialog.cpp 2007-02-24 03:29:25.000000000 +1300 @@ -23,6 +23,7 @@ @@ -53,9 +53,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kfiledialog.cpp k #include <qlayout.h> #include <qconfig.h> -diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp kdenox_new/konq-embed/dropin/kio/kprotocolmanager.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp --- kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/dropin/kio/kprotocolmanager.cpp 2007-02-24 03:32:31.000000000 +1300 ++++ kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp 2007-02-24 03:32:31.000000000 +1300 @@ -23,7 +23,9 @@ */ @@ -66,9 +66,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/kprotocolmana #include <kconfig.h> #include <ioslave_defaults.h> #include <kdeversion.h> -diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/progressbase.cpp kdenox_new/konq-embed/dropin/kio/progressbase.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/progressbase.cpp kdenox/konq-embed/dropin/kio/progressbase.cpp --- kdenox/konq-embed/dropin/kio/progressbase.cpp 2007-02-12 22:25:56.000000000 +1300 -+++ kdenox_new/konq-embed/dropin/kio/progressbase.cpp 2007-02-24 03:33:10.000000000 +1300 ++++ kdenox/konq-embed/dropin/kio/progressbase.cpp 2007-02-24 03:33:10.000000000 +1300 @@ -18,6 +18,7 @@ #include "jobclasses.h" @@ -77,9 +77,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/progressbase. //namespace KIO { -diff -urNd --exclude-from=excludelist kdenox/konq-embed/ipkg/preinst kdenox_new/konq-embed/ipkg/preinst +diff -urNd --exclude-from=excludelist kdenox/konq-embed/ipkg/preinst kdenox/konq-embed/ipkg/preinst --- kdenox/konq-embed/ipkg/preinst 1970-01-01 12:00:00.000000000 +1200 -+++ kdenox_new/konq-embed/ipkg/preinst 2007-02-25 21:20:10.000000000 +1300 ++++ kdenox/konq-embed/ipkg/preinst 2007-02-25 21:20:10.000000000 +1300 @@ -0,0 +1,15 @@ +#!/bin/sh + @@ -96,9 +96,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/ipkg/preinst kdenox_new/ + fi +done + -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h kdenox_new/konq-embed/kdesrc/kdecore/kmultipledrag.h +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h --- kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h 2007-02-12 21:31:39.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/kdecore/kmultipledrag.h 2007-02-25 16:15:28.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h 2007-02-25 16:15:28.000000000 +1300 @@ -26,6 +26,8 @@ #include <qvaluelist.h> #include "kdelibs_export.h" @@ -108,9 +108,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kdecore/kmultiple class KMultipleDragPrivate; /** * This class makes it easy for applications to provide a drag object -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/css/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/css/Makefile.am +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/css/Makefile.am kdenox/konq-embed/kdesrc/khtml/css/Makefile.am --- kdenox/konq-embed/kdesrc/khtml/css/Makefile.am 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/css/Makefile.am 2007-02-25 16:36:23.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/css/Makefile.am 2007-02-25 16:36:23.000000000 +1300 @@ -39,7 +39,7 @@ INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \ -I$(top_srcdir)/khtml -I$(top_srcdir)/libltdl -I$(top_srcdir) \ @@ -120,9 +120,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/css/Makefil cssdir = $(kde_datadir)/khtml/css css_DATA = html4.css quirks.css -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/dom/Makefile.am +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am --- kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/dom/Makefile.am 2007-02-25 16:35:07.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am 2007-02-25 16:35:07.000000000 +1300 @@ -47,7 +47,7 @@ # css_extensions.h @@ -132,9 +132,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/dom/Makefil SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/ecma/Makefile.am +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am --- kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/ecma/Makefile.am 2007-02-25 17:24:35.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am 2007-02-25 17:24:35.000000000 +1300 @@ -16,7 +16,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. @@ -144,9 +144,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/Makefi KDE_CXXFLAGS = $(USE_EXCEPTIONS) -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp kdenox_new/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp --- kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp 2007-02-25 17:27:39.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp 2007-02-25 17:27:39.000000000 +1300 @@ -38,6 +38,10 @@ #include <qobject.h> #include <kdebug.h> @@ -158,9 +158,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/xmlhtt #ifdef APPLE_CHANGES #include "KWQLoader.h" #else -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/html/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/html/Makefile.am +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/html/Makefile.am kdenox/konq-embed/kdesrc/khtml/html/Makefile.am --- kdenox/konq-embed/kdesrc/khtml/html/Makefile.am 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/html/Makefile.am 2007-02-25 16:39:50.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/html/Makefile.am 2007-02-25 16:39:50.000000000 +1300 @@ -43,7 +43,7 @@ -I$(top_srcdir)/kio/kssl \ -I$(top_srcdir)/kjs -I$(top_srcdir)/khtml -I$(top_srcdir) \ @@ -170,9 +170,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/html/Makefi # Use "make doctypes" to regenerate doctypes.cpp from doctypes.gperf doctypes: $(srcdir)/doctypes.gperf $(srcdir)/Makefile.am -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp kdenox_new/konq-embed/kdesrc/khtml/khtml_part.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp --- kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/khtml_part.cpp 2007-02-25 17:22:46.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp 2007-02-25 17:22:46.000000000 +1300 @@ -3221,14 +3221,14 @@ { khtml::RenderTextArea *parent= static_cast<khtml::RenderTextArea *>(obj->parent()); @@ -211,9 +211,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/khtml_part. connect( kapp->clipboard(), SIGNAL( selectionChanged()), SLOT( slotClearSelection())); #endif //kdDebug( 6000 ) << "selectedText = " << text << endl; -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/misc/Makefile.am +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am --- kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/misc/Makefile.am 2007-02-25 16:33:47.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am 2007-02-25 16:33:47.000000000 +1300 @@ -32,7 +32,7 @@ stringit.h htmlhashes.h helper.h shared.h arena.h @@ -223,9 +223,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/misc/Makefi SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/rendering/Makefile.am +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am --- kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/Makefile.am 2007-02-25 16:40:50.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am 2007-02-25 16:40:50.000000000 +1300 @@ -42,7 +42,7 @@ render_generated.h enumerate.h @@ -235,9 +235,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/M SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h kdenox_new/konq-embed/kdesrc/khtml/rendering/render_layer.h +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h --- kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h 2007-02-12 21:31:42.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_layer.h 2007-02-25 16:56:00.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h 2007-02-25 16:56:00.000000000 +1300 @@ -46,12 +46,14 @@ #include <qcolor.h> @@ -254,9 +254,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/r namespace khtml { class RenderStyle; -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp kdenox_new/konq-embed/kdesrc/khtml/rendering/render_object.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp --- kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_object.cpp 2007-02-25 16:44:58.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp 2007-02-25 16:44:58.000000000 +1300 @@ -46,6 +46,7 @@ #include <kdebug.h> #include <kglobal.h> @@ -265,9 +265,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/r #include "khtmlview.h" #include <khtml_part.h> -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h kdenox_new/konq-embed/kdesrc/khtml/rendering/render_table.h +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h --- kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_table.h 2007-02-25 16:56:49.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h 2007-02-25 16:56:49.000000000 +1300 @@ -30,6 +30,7 @@ #include <qcolor.h> #include <qptrvector.h> @@ -276,9 +276,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/r #include "rendering/render_box.h" #include "rendering/render_block.h" -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h kdenox_new/konq-embed/kdesrc/khtml/rendering/render_text.h +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h --- kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_text.h 2007-02-25 16:46:39.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h 2007-02-25 16:46:39.000000000 +1300 @@ -31,6 +31,7 @@ #include "rendering/render_line.h" @@ -287,9 +287,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/r #include <assert.h> class QPainter; -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/xml/Makefile.am +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am --- kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/xml/Makefile.am 2007-02-25 16:38:27.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am 2007-02-25 16:38:27.000000000 +1300 @@ -37,7 +37,7 @@ INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \ @@ -299,9 +299,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/xml/Makefil SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.cpp kdenox_new/konq-embed/kdesrc/kjs/dtoa.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.cpp kdenox/konq-embed/kdesrc/kjs/dtoa.cpp --- kdenox/konq-embed/kdesrc/kjs/dtoa.cpp 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/kjs/dtoa.cpp 2007-02-25 18:22:33.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/kjs/dtoa.cpp 2007-02-25 18:22:33.000000000 +1300 @@ -1,4 +1,9 @@ -#ifndef KONQ_EMBEDDED +#include <config.h> @@ -322,9 +322,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.cpp kden #include "stdlib.h" #ifdef WORDS_BIGENDIAN -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.h kdenox_new/konq-embed/kdesrc/kjs/dtoa.h +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.h kdenox/konq-embed/kdesrc/kjs/dtoa.h --- kdenox/konq-embed/kdesrc/kjs/dtoa.h 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/kjs/dtoa.h 2007-02-25 18:20:51.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/kjs/dtoa.h 2007-02-25 18:20:51.000000000 +1300 @@ -23,14 +23,11 @@ #ifndef _KJS_DTOA_H_ #define _KJS_DTOA_H_ @@ -342,9 +342,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.h kdenox - + #endif /* _KJS_DTOA_H */ -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/number_object.cpp kdenox_new/konq-embed/kdesrc/kjs/number_object.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/number_object.cpp kdenox/konq-embed/kdesrc/kjs/number_object.cpp --- kdenox/konq-embed/kdesrc/kjs/number_object.cpp 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/kjs/number_object.cpp 2007-02-25 18:05:36.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/kjs/number_object.cpp 2007-02-25 18:05:36.000000000 +1300 @@ -20,6 +20,8 @@ * */ @@ -354,9 +354,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/number_object #include "value.h" #include "object.h" #include "types.h" -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/ustring.cpp kdenox_new/konq-embed/kdesrc/kjs/ustring.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/ustring.cpp kdenox/konq-embed/kdesrc/kjs/ustring.cpp --- kdenox/konq-embed/kdesrc/kjs/ustring.cpp 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/kjs/ustring.cpp 2007-02-25 18:10:22.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/kjs/ustring.cpp 2007-02-25 18:10:22.000000000 +1300 @@ -21,9 +21,7 @@ * */ @@ -367,9 +367,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/ustring.cpp k #include <stdlib.h> #include <stdio.h> -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/actions/konqe.rc kdenox_new/konq-embed/src/actions/konqe.rc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/actions/konqe.rc kdenox/konq-embed/src/actions/konqe.rc --- kdenox/konq-embed/src/actions/konqe.rc 1970-01-01 12:00:00.000000000 +1200 -+++ kdenox_new/konq-embed/src/actions/konqe.rc 2007-02-25 21:20:10.000000000 +1300 ++++ kdenox/konq-embed/src/actions/konqe.rc 2007-02-25 21:20:10.000000000 +1300 @@ -0,0 +1,107 @@ +<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> +<kpartgui name="konqe" version="1"> @@ -478,9 +478,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/actions/konqe.rc kde + <Action name="edit_paste"/> +</ToolBar> +</kpartgui> -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditimpl.cc kdenox_new/konq-embed/src/bookmarkeditimpl.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditimpl.cc kdenox/konq-embed/src/bookmarkeditimpl.cc --- kdenox/konq-embed/src/bookmarkeditimpl.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/bookmarkeditimpl.cc 2007-02-25 19:17:29.000000000 +1300 ++++ kdenox/konq-embed/src/bookmarkeditimpl.cc 2007-02-25 19:17:29.000000000 +1300 @@ -24,6 +24,8 @@ #include "bookmarkeditimpl.h" @@ -490,9 +490,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditimpl.cc #if defined(ENABLE_BOOKMARKS) #include "mainwindowbase.h" -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditor.cc kdenox_new/konq-embed/src/bookmarkeditor.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditor.cc kdenox/konq-embed/src/bookmarkeditor.cc --- kdenox/konq-embed/src/bookmarkeditor.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/bookmarkeditor.cc 2007-02-25 17:40:34.000000000 +1300 ++++ kdenox/konq-embed/src/bookmarkeditor.cc 2007-02-25 17:40:34.000000000 +1300 @@ -16,6 +16,8 @@ #include <qimage.h> #include <qpixmap.h> @@ -502,9 +502,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditor.cc kd namespace { QPixmap getPngPixmap( const QString &name ) -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.cc kdenox_new/konq-embed/src/bookmarkeditorhierarchical.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.cc kdenox/konq-embed/src/bookmarkeditorhierarchical.cc --- kdenox/konq-embed/src/bookmarkeditorhierarchical.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/bookmarkeditorhierarchical.cc 2007-02-25 20:46:27.000000000 +1300 ++++ kdenox/konq-embed/src/bookmarkeditorhierarchical.cc 2007-02-25 20:46:27.000000000 +1300 @@ -22,11 +22,20 @@ */ @@ -535,9 +535,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierar edit->location->setEnabled(false); edit->location->hide(); edit->TextLabel2->hide(); -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.h kdenox_new/konq-embed/src/bookmarkeditorhierarchical.h +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.h kdenox/konq-embed/src/bookmarkeditorhierarchical.h --- kdenox/konq-embed/src/bookmarkeditorhierarchical.h 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/bookmarkeditorhierarchical.h 2007-02-25 18:27:17.000000000 +1300 ++++ kdenox/konq-embed/src/bookmarkeditorhierarchical.h 2007-02-25 18:27:17.000000000 +1300 @@ -22,9 +22,10 @@ #ifndef __bookmarkeditorhierarchical_h__ #define __bookmarkeditorhierarchical_h__ @@ -550,9 +550,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierar #include "bookmarkeditorimpl.h" class XMLElement; -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorimpl.cc kdenox_new/konq-embed/src/bookmarkeditorimpl.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorimpl.cc kdenox/konq-embed/src/bookmarkeditorimpl.cc --- kdenox/konq-embed/src/bookmarkeditorimpl.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/bookmarkeditorimpl.cc 2007-02-25 19:16:40.000000000 +1300 ++++ kdenox/konq-embed/src/bookmarkeditorimpl.cc 2007-02-25 19:16:40.000000000 +1300 @@ -23,12 +23,12 @@ #include "bookmarkeditorimpl.h" @@ -568,9 +568,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorimpl.c #include "bookmarks.h" #include "xmltree.h" -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.cc kdenox_new/konq-embed/src/bookmarks.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.cc kdenox/konq-embed/src/bookmarks.cc --- kdenox/konq-embed/src/bookmarks.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/bookmarks.cc 2007-02-25 18:28:08.000000000 +1300 ++++ kdenox/konq-embed/src/bookmarks.cc 2007-02-25 18:28:08.000000000 +1300 @@ -24,6 +24,8 @@ #if defined(ENABLE_BOOKMARKS) @@ -588,9 +588,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.cc kdenox_ #include <klocale.h> #include <kstandarddirs.h> -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.h kdenox_new/konq-embed/src/bookmarks.h +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.h kdenox/konq-embed/src/bookmarks.h --- kdenox/konq-embed/src/bookmarks.h 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/bookmarks.h 2007-02-25 18:26:32.000000000 +1300 ++++ kdenox/konq-embed/src/bookmarks.h 2007-02-25 18:26:32.000000000 +1300 @@ -34,6 +34,8 @@ #include <kurl.h> @@ -600,9 +600,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.h kdenox_n class QPopupMenu; class XMLElement; class ActionMenu; -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.cc kdenox_new/konq-embed/src/mainwindow_qpe.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.cc kdenox/konq-embed/src/mainwindow_qpe.cc --- kdenox/konq-embed/src/mainwindow_qpe.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/mainwindow_qpe.cc 2007-02-25 17:46:32.000000000 +1300 ++++ kdenox/konq-embed/src/mainwindow_qpe.cc 2007-02-25 17:46:32.000000000 +1300 @@ -90,7 +90,7 @@ return iconSet; } @@ -621,9 +621,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.cc kd { statusJustText( _msg, visible ); } -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.h kdenox_new/konq-embed/src/mainwindow_qpe.h +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.h kdenox/konq-embed/src/mainwindow_qpe.h --- kdenox/konq-embed/src/mainwindow_qpe.h 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/mainwindow_qpe.h 2007-02-25 17:47:23.000000000 +1300 ++++ kdenox/konq-embed/src/mainwindow_qpe.h 2007-02-25 17:47:23.000000000 +1300 @@ -39,6 +39,10 @@ protected: @@ -635,9 +635,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.h kde }; #endif -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_road.cc kdenox_new/konq-embed/src/mainwindow_road.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_road.cc kdenox/konq-embed/src/mainwindow_road.cc --- kdenox/konq-embed/src/mainwindow_road.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/mainwindow_road.cc 2007-02-25 20:32:12.000000000 +1300 ++++ kdenox/konq-embed/src/mainwindow_road.cc 2007-02-25 20:32:12.000000000 +1300 @@ -20,10 +20,11 @@ #ifdef KONQ_GUI_ROAD @@ -651,9 +651,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_road.cc k #include <qpopupmenu.h> #include <qtoolbar.h> #include <qaction.h> -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_x11.cc kdenox_new/konq-embed/src/mainwindow_x11.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_x11.cc kdenox/konq-embed/src/mainwindow_x11.cc --- kdenox/konq-embed/src/mainwindow_x11.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/mainwindow_x11.cc 2007-02-25 20:33:10.000000000 +1300 ++++ kdenox/konq-embed/src/mainwindow_x11.cc 2007-02-25 20:33:10.000000000 +1300 @@ -21,6 +21,8 @@ // Implementation of the X11 GUI @@ -663,9 +663,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_x11.cc kd #include "mainwindow_x11.h" #include "popupaction.h" -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.cc kdenox_new/konq-embed/src/roadtabbar.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.cc kdenox/konq-embed/src/roadtabbar.cc --- kdenox/konq-embed/src/roadtabbar.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/roadtabbar.cc 2007-02-25 17:44:19.000000000 +1300 ++++ kdenox/konq-embed/src/roadtabbar.cc 2007-02-25 17:44:19.000000000 +1300 @@ -18,6 +18,9 @@ Boston, MA 02110-1301, USA. */ @@ -700,9 +700,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.cc kdenox // the caption may not exceed a given width, so shorten it if necessary // the following is inefficient, but clear, correct, and unlikely to be a bottleneck if ( m_params.fontMetrics.width( caption ) > m_params.maxWidth ) -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.h kdenox_new/konq-embed/src/roadtabbar.h +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.h kdenox/konq-embed/src/roadtabbar.h --- kdenox/konq-embed/src/roadtabbar.h 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/roadtabbar.h 2007-02-25 17:42:40.000000000 +1300 ++++ kdenox/konq-embed/src/roadtabbar.h 2007-02-25 17:42:40.000000000 +1300 @@ -22,6 +22,9 @@ #define __roadtabbar_h__ @@ -713,9 +713,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.h kdenox_ struct RoadTabParams { -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/run.cc kdenox_new/konq-embed/src/run.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/run.cc kdenox/konq-embed/src/run.cc --- kdenox/konq-embed/src/run.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/run.cc 2007-02-25 17:34:35.000000000 +1300 ++++ kdenox/konq-embed/src/run.cc 2007-02-25 17:34:35.000000000 +1300 @@ -24,6 +24,7 @@ #include "view.h" @@ -733,9 +733,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/run.cc kdenox_new/ko m_bFinished = true; emit error(); -diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/khtml/khtml_ext.cpp kdenox_new/konq-embed/dropin/khtml/khtml_ext.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/khtml/khtml_ext.cpp kdenox/konq-embed/dropin/khtml/khtml_ext.cpp --- kdenox/konq-embed/dropin/khtml/khtml_ext.cpp 2007-02-12 22:25:56.000000000 +1300 -+++ kdenox_new/konq-embed/dropin/khtml/khtml_ext.cpp 2007-02-24 03:38:24.000000000 +1300 ++++ kdenox/konq-embed/dropin/khtml/khtml_ext.cpp 2007-02-24 03:38:24.000000000 +1300 @@ -115,7 +115,8 @@ const QString &filter, long cacheId, const QString & suggestedFilename, const QString& mimeType ) diff --git a/packages/konqueror/konqueror-embedded-20070212/konqueror.desktop b/packages/konqueror/konqueror-embedded-20070316/konqueror.desktop index 1f473117e9..cb84c96be1 100644 --- a/packages/konqueror/konqueror-embedded-20070212/konqueror.desktop +++ b/packages/konqueror/konqueror-embedded-20070316/konqueror.desktop @@ -2,5 +2,5 @@ Exec=konqueror Icon=konqueror/konqueror Type=Application -Name=konqueror +Name=Konqueror Comment=Konqueror browser diff --git a/packages/konqueror/konqueror-embedded-20070212/konqueror.png b/packages/konqueror/konqueror-embedded-20070316/konqueror.png Binary files differindex 879d470bbf..879d470bbf 100644 --- a/packages/konqueror/konqueror-embedded-20070212/konqueror.png +++ b/packages/konqueror/konqueror-embedded-20070316/konqueror.png diff --git a/packages/konqueror/konqueror-embedded_20070212.bb b/packages/konqueror/konqueror-embedded_20070316.bb index 3fb8a5cfa6..5a127515bb 100644 --- a/packages/konqueror/konqueror-embedded_20070212.bb +++ b/packages/konqueror/konqueror-embedded_20070316.bb @@ -10,10 +10,11 @@ PR = "r5" inherit autotools -SRC_URI = "http://www.basyskom.de/uploads/175/35/kdenox_snapshot_Qt2_2007.02.12.tar.bz2 \ +SRC_URI = "http://www.basyskom.de/uploads/175/37/kdenox_snapshot_qt2_20070316.tar.bz2 \ file://dont-use-kde-config.patch;patch=1 \ file://konqe_new_opie.patch;patch=1 \ - file://konqe-kapplication.patch;patch=1" + file://konqe-kapplication.patch;patch=1 \ + file://fix_configure.patch;patch=1" S = "${WORKDIR}/kdenox" export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake" diff --git a/packages/libmatchbox/files/reset-sigchld.patch b/packages/libmatchbox/files/reset-sigchld.patch new file mode 100644 index 0000000000..5792385d27 --- /dev/null +++ b/packages/libmatchbox/files/reset-sigchld.patch @@ -0,0 +1,15 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libmatchbox-1.9/libmb/mbutil.c~reset-sigchld ++++ libmatchbox-1.9/libmb/mbutil.c +@@ -92,6 +92,7 @@ + } + + argv[nargs] = NULL; ++ signal(SIGCHLD, SIG_DFL); + rc = execvp (argv[0], argv); + + for (i = 0; i < nargs; i++) diff --git a/packages/libmatchbox/libmatchbox_1.7.bb b/packages/libmatchbox/libmatchbox_1.7.bb deleted file mode 100644 index 7900d4e085..0000000000 --- a/packages/libmatchbox/libmatchbox_1.7.bb +++ /dev/null @@ -1,12 +0,0 @@ -require libmatchbox.inc -PR = "r2" - -SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \ - file://svn-explicit-types.patch;patch=1 \ - file://svn-autofu-xsettings.patch;patch=1 \ - file://svn-code-misc-xsettings.patch;patch=1 \ - file://check.m4" - -do_configure_prepend () { - mv ${WORKDIR}/check.m4 ${S}/ -} diff --git a/packages/libmatchbox/libmatchbox_1.8.bb b/packages/libmatchbox/libmatchbox_1.8.bb deleted file mode 100644 index d87eb09150..0000000000 --- a/packages/libmatchbox/libmatchbox_1.8.bb +++ /dev/null @@ -1,9 +0,0 @@ -require libmatchbox.inc -PR = "r0" - -SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \ - file://check.m4" - -do_configure_prepend () { - mv ${WORKDIR}/check.m4 ${S}/ -} diff --git a/packages/libmatchbox/libmatchbox_1.9.bb b/packages/libmatchbox/libmatchbox_1.9.bb index a0c5e272c0..b462dc5aca 100644 --- a/packages/libmatchbox/libmatchbox_1.9.bb +++ b/packages/libmatchbox/libmatchbox_1.9.bb @@ -1,11 +1,13 @@ require libmatchbox.inc +PR = "r6" -PR = "r5" - -SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \ - file://16bppfixes.patch;patch=1 \ - file://configure_fixes.patch;patch=1 \ - file://check.m4" +SRC_URI = "\ + http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \ + file://16bppfixes.patch;patch=1 \ + file://configure_fixes.patch;patch=1 \ + file://reset-sigchld.patch;patch=1 \ + file://check.m4\ +" do_configure_prepend () { cp ${WORKDIR}/check.m4 ${S}/ diff --git a/packages/libmatchbox/libmatchbox_svn.bb b/packages/libmatchbox/libmatchbox_svn.bb deleted file mode 100644 index f22b676cd9..0000000000 --- a/packages/libmatchbox/libmatchbox_svn.bb +++ /dev/null @@ -1,14 +0,0 @@ -require libmatchbox.inc - -PV = "1.7+svn${SRCDATE}" -DEFAULT_PREFERENCE = "-1" -PR="1" - -SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http\ - file://check.m4 \ - file://16bppfixes.patch;patch=1" -S = "${WORKDIR}/libmatchbox" - -do_configure_prepend () { - mv ${WORKDIR}/check.m4 ${S}/ -} diff --git a/packages/qt4/qt-embedded-4.4.0/.mtn2git_empty b/packages/libmpcdec/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qt4/qt-embedded-4.4.0/.mtn2git_empty +++ b/packages/libmpcdec/.mtn2git_empty diff --git a/packages/libmpcdec/libmpcdec_1.2.6.bb b/packages/libmpcdec/libmpcdec_1.2.6.bb new file mode 100644 index 0000000000..43249248a2 --- /dev/null +++ b/packages/libmpcdec/libmpcdec_1.2.6.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Portable Musepack decoder library" +AUTHOR = "Meni Berman <musepack@gmail.com>" +HOMEPAGE = "http://www.musepack.net" +SECTION = "libs" +LICENSE = "BSD GPL" +PR = "r0" + +SRC_URI = "http://files.musepack.net/source/libmpcdec-${PV}.tar.bz2" + +inherit autotools + +EXTRA_OECONF += "ac_cv_func_memcmp_working=yes" + +do_configure () { + oe_runconf +} + +do_stage () { + autotools_stage_all +} diff --git a/packages/qt4/qt4-x11-free-4.4.0/.mtn2git_empty b/packages/libstroke/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/.mtn2git_empty +++ b/packages/libstroke/.mtn2git_empty diff --git a/packages/libstroke/libstroke-0.5.1/.mtn2git_empty b/packages/libstroke/libstroke-0.5.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libstroke/libstroke-0.5.1/.mtn2git_empty diff --git a/packages/libstroke/libstroke-0.5.1/Makefile.am.patch b/packages/libstroke/libstroke-0.5.1/Makefile.am.patch new file mode 100644 index 0000000000..631da1d25a --- /dev/null +++ b/packages/libstroke/libstroke-0.5.1/Makefile.am.patch @@ -0,0 +1,11 @@ +--- libstroke-0.5.1/Makefile.am.orig 2008-06-11 14:10:49.000000000 +0400 ++++ libstroke-0.5.1/Makefile.am 2008-06-11 14:12:06.000000000 +0400 +@@ -5,7 +5,7 @@ + GSTROKE_SUBDS = + endif + +-SUBDIRS = libstroke $(GSTROKE_SUBDS) tests doc javastroke ++SUBDIRS = libstroke $(GSTROKE_SUBDS) doc + + EXTRA_DIST = COPYRIGHT CREDITS README.javastroke README.libgstroke + diff --git a/packages/libstroke/libstroke-0.5.1/configure.in.patch b/packages/libstroke/libstroke-0.5.1/configure.in.patch new file mode 100644 index 0000000000..d0ed97b88e --- /dev/null +++ b/packages/libstroke/libstroke-0.5.1/configure.in.patch @@ -0,0 +1,24 @@ +--- libstroke-0.5.1/configure.in.orig 2008-06-11 12:54:29.000000000 +0400 ++++ libstroke-0.5.1/configure.in 2008-06-11 12:54:35.000000000 +0400 +@@ -83,14 +83,14 @@ + + dnl check for GTK + dnl we won't build libgstroke if it's not found +-AC_MSG_CHECKING(gtk+ library) +-AM_PATH_GTK(1.2.7, HAVE_LIBGTK=yes +- AC_DEFINE(HAVE_LIBGTK, 1, [Define if libgtk is available]), +- AC_MSG_WARN( +-***** NOTE: The GNOME stroke support won't be built +-) ++dnl AC_MSG_CHECKING(gtk+ library) ++dnl AM_PATH_GTK(1.2.7, HAVE_LIBGTK=yes ++dnl AC_DEFINE(HAVE_LIBGTK, 1, [Define if libgtk is available]), ++dnl AC_MSG_WARN( ++dnl ***** NOTE: The GNOME stroke support won't be built ++dnl ) + HAVE_LIBGTK=no, +-) ++dnl ) + AM_CONDITIONAL(HAVE_LIBGTK, test "x$HAVE_LIBGTK" = "xyes") + + diff --git a/packages/libstroke/libstroke-0.5.1/libgstroke-Makefile.am.patch b/packages/libstroke/libstroke-0.5.1/libgstroke-Makefile.am.patch new file mode 100644 index 0000000000..b3251f3548 --- /dev/null +++ b/packages/libstroke/libstroke-0.5.1/libgstroke-Makefile.am.patch @@ -0,0 +1,11 @@ +--- libstroke-0.5.1/libgstroke/Makefile.am.orig 2008-06-11 13:01:29.000000000 +0400 ++++ libstroke-0.5.1/libgstroke/Makefile.am 2008-06-11 13:01:44.000000000 +0400 +@@ -21,7 +21,7 @@ + INCLUDES = @GTK_CFLAGS@ + LDADD = @GTK_LIBS@ + +-EXTRA_DIST = ++#EXTRA_DIST = + + MOSTLYCLEANFILES = core *~ + CLEANFILES = core *~ diff --git a/packages/libstroke/libstroke-0.5.1/libstroke-Makefile.am.patch b/packages/libstroke/libstroke-0.5.1/libstroke-Makefile.am.patch new file mode 100644 index 0000000000..98707faf09 --- /dev/null +++ b/packages/libstroke/libstroke-0.5.1/libstroke-Makefile.am.patch @@ -0,0 +1,15 @@ +--- libstroke-0.5.1/libstroke/Makefile.am.orig 2008-06-11 13:01:54.000000000 +0400 ++++ libstroke-0.5.1/libstroke/Makefile.am 2008-06-11 13:02:02.000000000 +0400 +@@ -5,10 +5,10 @@ + # level Makefile. + AUTOMAKE_OPTIONS = foreign + +-EXTRA_DIST = ++#EXTRA_DIST = + + #tclpath:: +- #echo ${ENABLE_TCL} ++# echo ${ENABLE_TCL} + + #if ENABLE_TCL + #SEL_BIB = libstroke.la libstroke_tcl.la diff --git a/packages/libstroke/libstroke-0.5.1/tests-Makefile.am.patch b/packages/libstroke/libstroke-0.5.1/tests-Makefile.am.patch new file mode 100644 index 0000000000..abd55d676f --- /dev/null +++ b/packages/libstroke/libstroke-0.5.1/tests-Makefile.am.patch @@ -0,0 +1,15 @@ +--- libstroke-0.5.1/tests/Makefile.am.orig 2008-06-11 13:46:40.000000000 +0400 ++++ libstroke-0.5.1/tests/Makefile.am 2008-06-11 13:47:23.000000000 +0400 +@@ -14,7 +14,11 @@ + gnome_stroke_test_SOURCES = gnome_stroke_test.c + + INCLUDES = -I$(top_srcdir)/libstroke -I$(top_srcdir)/libgstroke \ +- @X_CFLAGS@ @GTK_CFLAGS@ ++ @X_CFLAGS@ ++ ++if HAVE_LIBGTK ++INCLUDES += @GTK_CFLAGS@ ++endif + + stroke_test_LDADD = ../libstroke/libstroke.la @X_LDFLAGS@ + gnome_stroke_test_LDADD = ../libgstroke/libgstroke.la @GTK_LIBS@ diff --git a/packages/libstroke/libstroke_0.5.1.bb b/packages/libstroke/libstroke_0.5.1.bb new file mode 100644 index 0000000000..2b1b6e7275 --- /dev/null +++ b/packages/libstroke/libstroke_0.5.1.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "LibStroke - a stroke translation library" +LICENSE = "GPL" +SECTION = "x11" +PRIORITY = "optional" +#DEPENDS = "virtual/libx11 libxau libxdmcp" +DEPENDS = "virtual/libx11" + +SRC_URI = "http://www.etla.net/libstroke/${P}.tar.gz \ + file://configure.in.patch;patch=1 \ + file://libstroke-Makefile.am.patch;patch=1 \ + file://tests-Makefile.am.patch;patch=1 \ + " +# file://Makefile.am.patch;patch=1 \ +# file://libgstroke-Makefile.am.patch;patch=1 \ + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/linux/linux-kaiser_2.6.24+git.bb b/packages/linux/linux-kaiser_2.6.24+git.bb index 758cbdcc0b..879c6e23be 100644 --- a/packages/linux/linux-kaiser_2.6.24+git.bb +++ b/packages/linux/linux-kaiser_2.6.24+git.bb @@ -4,13 +4,14 @@ PV = "2.6.24+git${SRCREV}" PR = "r1" COMPATIBLE_MACHINE = "htckaiser" +COMPATIBLE_MACHINE = "htcpolaris" + SRC_URI = "git://git.linuxtogo.org/home/groups/mobile-linux/kernel.git;branch=htc-msm;protocol=git" S = "${WORKDIR}/git" do_configure_prepend() { - cp arch/arm/configs/htckaiser_defconfig ../defconfig + cp arch/arm/configs/${MACHINE}_defconfig ../defconfig } - diff --git a/packages/linux/linux-omap2-git/beagleboard/01-gptimer_clear_isrs_on_init b/packages/linux/linux-omap2-git/beagleboard/01-gptimer_clear_isrs_on_init new file mode 100644 index 0000000000..5123bafe54 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/01-gptimer_clear_isrs_on_init @@ -0,0 +1,25 @@ +clear + +From: Paul Walmsley <paul@pwsan.com> + + +--- + + arch/arm/plat-omap/dmtimer.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c +index f22506a..e38a11e 100644 +--- a/arch/arm/plat-omap/dmtimer.c ++++ b/arch/arm/plat-omap/dmtimer.c +@@ -703,6 +703,10 @@ int __init omap_dm_timer_init(void) + timer->fclk = clk_get(NULL, clk_name); + } + #endif ++ omap_dm_timer_write_status(timer, OMAP_TIMER_INT_OVERFLOW | ++ OMAP_TIMER_INT_MATCH | ++ OMAP_TIMER_INT_CAPTURE); ++ + } + + return 0; diff --git a/packages/linux/linux-omap2-git/beagleboard/02-gptimer_use_match_for_tick b/packages/linux/linux-omap2-git/beagleboard/02-gptimer_use_match_for_tick new file mode 100644 index 0000000000..6eb6c9b477 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/02-gptimer_use_match_for_tick @@ -0,0 +1,97 @@ +OMAP2/3 system tick GPTIMER: use match interrupts rather than overflow interrupts + +From: Paul Walmsley <paul@pwsan.com> + +On some OMAP3 chips, GPTIMER1 will occasionally decline to interrupt +the MPU when a timer overflow event occurs. The timer stops running; +and TOCR is sometimes incremented; but the MPU apparently never receives +the interrupt. This patch was an experiment in using the GPTIMER +match interrupt to determine if it resolves the problem. +Unfortunately, it does not; the same problem occurs with match +interrupts; but this patch is preserved as the base for a +match+overflow interrupt workaround used in a following patch. +--- + + arch/arm/mach-omap2/timer-gp.c | 32 ++++++++++---------------------- + 1 files changed, 10 insertions(+), 22 deletions(-) + +diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c +index 557603f..51996ba 100644 +--- a/arch/arm/mach-omap2/timer-gp.c ++++ b/arch/arm/mach-omap2/timer-gp.c +@@ -36,6 +36,8 @@ + #include <asm/mach/time.h> + #include <asm/arch/dmtimer.h> + ++#define GPTIMER_MATCH_VAL 0xffff0000 ++ + static struct omap_dm_timer *gptimer; + static struct clock_event_device clockevent_gpt; + +@@ -44,7 +46,7 @@ static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id) + struct omap_dm_timer *gpt = (struct omap_dm_timer *)dev_id; + struct clock_event_device *evt = &clockevent_gpt; + +- omap_dm_timer_write_status(gpt, OMAP_TIMER_INT_OVERFLOW); ++ omap_dm_timer_write_status(gpt, OMAP_TIMER_INT_MATCH); + + evt->event_handler(evt); + return IRQ_HANDLED; +@@ -59,7 +61,7 @@ static struct irqaction omap2_gp_timer_irq = { + static int omap2_gp_timer_set_next_event(unsigned long cycles, + struct clock_event_device *evt) + { +- omap_dm_timer_set_load_start(gptimer, 0, 0xffffffff - cycles); ++ omap_dm_timer_set_load_start(gptimer, 0, GPTIMER_MATCH_VAL - cycles); + + return 0; + } +@@ -67,29 +69,12 @@ static int omap2_gp_timer_set_next_event(unsigned long cycles, + static void omap2_gp_timer_set_mode(enum clock_event_mode mode, + struct clock_event_device *evt) + { +- u32 period; +- + omap_dm_timer_stop(gptimer); +- +- switch (mode) { +- case CLOCK_EVT_MODE_PERIODIC: +- period = clk_get_rate(omap_dm_timer_get_fclk(gptimer)) / HZ; +- period -= 1; +- +- omap_dm_timer_set_load_start(gptimer, 1, 0xffffffff - period); +- break; +- case CLOCK_EVT_MODE_ONESHOT: +- break; +- case CLOCK_EVT_MODE_UNUSED: +- case CLOCK_EVT_MODE_SHUTDOWN: +- case CLOCK_EVT_MODE_RESUME: +- break; +- } + } + + static struct clock_event_device clockevent_gpt = { + .name = "gp timer", +- .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, ++ .features = CLOCK_EVT_FEAT_ONESHOT, + .shift = 32, + .set_next_event = omap2_gp_timer_set_next_event, + .set_mode = omap2_gp_timer_set_mode, +@@ -111,12 +96,15 @@ static void __init omap2_gp_clockevent_init(void) + + omap2_gp_timer_irq.dev_id = (void *)gptimer; + setup_irq(omap_dm_timer_get_irq(gptimer), &omap2_gp_timer_irq); +- omap_dm_timer_set_int_enable(gptimer, OMAP_TIMER_INT_OVERFLOW); ++ omap_dm_timer_stop(gptimer); ++ /* omap_dm_timer_set_load(gptimer, 0, 0);*/ ++ omap_dm_timer_set_match(gptimer, 1, GPTIMER_MATCH_VAL); ++ omap_dm_timer_set_int_enable(gptimer, OMAP_TIMER_INT_MATCH); + + clockevent_gpt.mult = div_sc(tick_rate, NSEC_PER_SEC, + clockevent_gpt.shift); + clockevent_gpt.max_delta_ns = +- clockevent_delta2ns(0xffffffff, &clockevent_gpt); ++ clockevent_delta2ns(GPTIMER_MATCH_VAL, &clockevent_gpt); + clockevent_gpt.min_delta_ns = + clockevent_delta2ns(1, &clockevent_gpt); + diff --git a/packages/linux/linux-omap2-git/beagleboard/03-gptimer_match_plus_ovf b/packages/linux/linux-omap2-git/beagleboard/03-gptimer_match_plus_ovf new file mode 100644 index 0000000000..3de6e05042 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/03-gptimer_match_plus_ovf @@ -0,0 +1,94 @@ +OMAP2/3 system tick GPTIMER: use overflow interrupts to detect missing match interrupts + +From: Paul Walmsley <paul@pwsan.com> + +GPTIMER1 on some OMAP3 chips occasionally misses match conditions +between the timer counter and the target register value, and does not +interrupt to the MPU. This patch adds another line of defense by +setting the timer to generate an overflow interrupt 0.5 seconds after the +timer passes the original comparison value. + +If interrupts are masked for a long period of time, one would expect +both a match and an overflow interrupt to be logged. This is considered +a normal condition. However, if only an overflow interrupt is logged, +this is considered evidence of a hardware bug and the kernel will issue +a warning. + +This workaround is unlikely to be 100% effective, since GPTIMER1 has +also been observed to lose overflow interrupts occasionally. It is +hoped that the probability of losing both will be significantly lower +than the probability of losing either one. +--- + + arch/arm/mach-omap2/timer-gp.c | 36 ++++++++++++++++++++++++++++++++---- + 1 files changed, 32 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c +index 51996ba..ce5c2b4 100644 +--- a/arch/arm/mach-omap2/timer-gp.c ++++ b/arch/arm/mach-omap2/timer-gp.c +@@ -36,17 +36,43 @@ + #include <asm/mach/time.h> + #include <asm/arch/dmtimer.h> + +-#define GPTIMER_MATCH_VAL 0xffff0000 ++/* ++ * The number of timer ticks to delay will be subtracted from ++ * GPTIMER_MATCH_VAL before loading into the timer. So GPTIMER_MATCH_VAL ++ * constrains the longest delay that can be generated with the timer. ++ * Since the current code uses overflow interrupts as protection against ++ * missed comparison interrupts, this value should also be sufficiently ++ * large such that there is not an excessively long delay between ticks ++ * if the comparison interrupt fails to arrive. The 0xfffff800 value ++ * below results in a half-second delay in such a case when using ++ * the 32kHz timer as source. ++ */ ++#define GPTIMER_MATCH_VAL (0xffffffff - (32768/2)) + + static struct omap_dm_timer *gptimer; + static struct clock_event_device clockevent_gpt; + ++static u32 last_load; ++ + static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id) + { + struct omap_dm_timer *gpt = (struct omap_dm_timer *)dev_id; + struct clock_event_device *evt = &clockevent_gpt; +- +- omap_dm_timer_write_status(gpt, OMAP_TIMER_INT_MATCH); ++ u32 v; ++ ++ v = omap_dm_timer_read_status(gpt); ++ if ((v & OMAP_TIMER_INT_OVERFLOW) && !(v & OMAP_TIMER_INT_MATCH)) { ++ /* ++ * Should never happen. Current belief is that this is ++ * due to a hardware bug in the GPTIMER block on some ++ * OMAP3 revisions. ++ */ ++ pr_err("*** GPTIMER missed match interrupt! last load: %08x\n", ++ last_load); ++ WARN_ON(1); ++ } ++ ++ omap_dm_timer_write_status(gpt, v); + + evt->event_handler(evt); + return IRQ_HANDLED; +@@ -61,6 +87,7 @@ static struct irqaction omap2_gp_timer_irq = { + static int omap2_gp_timer_set_next_event(unsigned long cycles, + struct clock_event_device *evt) + { ++ last_load = GPTIMER_MATCH_VAL - cycles; + omap_dm_timer_set_load_start(gptimer, 0, GPTIMER_MATCH_VAL - cycles); + + return 0; +@@ -99,7 +126,8 @@ static void __init omap2_gp_clockevent_init(void) + omap_dm_timer_stop(gptimer); + /* omap_dm_timer_set_load(gptimer, 0, 0);*/ + omap_dm_timer_set_match(gptimer, 1, GPTIMER_MATCH_VAL); +- omap_dm_timer_set_int_enable(gptimer, OMAP_TIMER_INT_MATCH); ++ omap_dm_timer_set_int_enable(gptimer, OMAP_TIMER_INT_MATCH | ++ OMAP_TIMER_INT_OVERFLOW); + + clockevent_gpt.mult = div_sc(tick_rate, NSEC_PER_SEC, + clockevent_gpt.shift); diff --git a/packages/linux/linux-omap2-git/beagleboard/04-gptimer_add_debug_to_sysrq_q b/packages/linux/linux-omap2-git/beagleboard/04-gptimer_add_debug_to_sysrq_q new file mode 100644 index 0000000000..aa9f09811a --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/04-gptimer_add_debug_to_sysrq_q @@ -0,0 +1,110 @@ +Add extra debug for the q_d_w_o() when work fn is already active. + +From: Paul Walmsley <paul@pwsan.com> + + +--- + + arch/arm/mach-omap2/timer-gp.c | 3 ++- + arch/arm/plat-omap/dmtimer.c | 20 ++++++++++++++++++++ + include/asm-arm/arch-omap/dmtimer.h | 1 + + kernel/time/timer_list.c | 8 ++++++++ + 4 files changed, 31 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c +index ce5c2b4..e3ed368 100644 +--- a/arch/arm/mach-omap2/timer-gp.c ++++ b/arch/arm/mach-omap2/timer-gp.c +@@ -50,6 +50,7 @@ + #define GPTIMER_MATCH_VAL (0xffffffff - (32768/2)) + + static struct omap_dm_timer *gptimer; ++struct omap_dm_timer *gptimer_pub; + static struct clock_event_device clockevent_gpt; + + static u32 last_load; +@@ -111,7 +112,7 @@ static void __init omap2_gp_clockevent_init(void) + { + u32 tick_rate; + +- gptimer = omap_dm_timer_request_specific(1); ++ gptimer = gptimer_pub = omap_dm_timer_request_specific(1); + BUG_ON(gptimer == NULL); + + #if defined(CONFIG_OMAP_32K_TIMER) +diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c +index e38a11e..b10f8ac 100644 +--- a/arch/arm/plat-omap/dmtimer.c ++++ b/arch/arm/plat-omap/dmtimer.c +@@ -614,6 +614,26 @@ void omap_dm_timer_set_int_enable(struct omap_dm_timer *timer, + omap_dm_timer_write_reg(timer, OMAP_TIMER_WAKEUP_EN_REG, value); + } + ++void omap_dm_timer_dump_int_enable(struct omap_dm_timer *timer) ++{ ++ u32 l; ++ l = omap_dm_timer_read_reg(timer, OMAP_TIMER_COUNTER_REG); ++ pr_err("GPT TCRR: %08x\n", l); ++ l = omap_dm_timer_read_reg(timer, OMAP_TIMER_MATCH_REG); ++ pr_err("GPT TMAT: %08x\n", l); ++ l = omap_dm_timer_read_reg(timer, OMAP_TIMER_STAT_REG); ++ pr_err("GPT TISR: %08x\n", l); ++ l = omap_dm_timer_read_reg(timer, OMAP_TIMER_INT_EN_REG); ++ pr_err("GPT TIER: %08x\n", l); ++ l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG); ++ pr_err("GPT TCLR: %08x\n", l); ++ l = omap_dm_timer_read_reg(timer, OMAP_TIMER_TICK_INT_MASK_SET_REG); ++ pr_err("GPT TOCR: %08x\n", l); ++ l = omap_dm_timer_read_reg(timer, OMAP_TIMER_TICK_INT_MASK_COUNT_REG); ++ pr_err("GPT TOWR: %08x\n", l); ++} ++ ++ + unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer) + { + unsigned int l; +diff --git a/include/asm-arm/arch-omap/dmtimer.h b/include/asm-arm/arch-omap/dmtimer.h +index 02b29e8..a8123e9 100644 +--- a/include/asm-arm/arch-omap/dmtimer.h ++++ b/include/asm-arm/arch-omap/dmtimer.h +@@ -73,6 +73,7 @@ void omap_dm_timer_set_prescaler(struct omap_dm_timer *timer, int prescaler); + + void omap_dm_timer_set_int_enable(struct omap_dm_timer *timer, unsigned int value); + ++void omap_dm_timer_dump_int_enable(struct omap_dm_timer *timer); + unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer); + void omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned int value); + unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer); +diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c +index a40e20f..452eab7 100644 +--- a/kernel/time/timer_list.c ++++ b/kernel/time/timer_list.c +@@ -18,6 +18,8 @@ + #include <linux/kallsyms.h> + #include <linux/tick.h> + ++#include <asm/arch/dmtimer.h> ++ + #include <asm/uaccess.h> + + typedef void (*print_fn_t)(struct seq_file *m, unsigned int *classes); +@@ -239,6 +241,8 @@ static void timer_list_show_tickdevices(struct seq_file *m) + static void timer_list_show_tickdevices(struct seq_file *m) { } + #endif + ++extern struct omap_dm_timer *gptimer_pub; ++ + static int timer_list_show(struct seq_file *m, void *v) + { + u64 now = ktime_to_ns(ktime_get()); +@@ -254,6 +258,10 @@ static int timer_list_show(struct seq_file *m, void *v) + SEQ_printf(m, "\n"); + timer_list_show_tickdevices(m); + ++ SEQ_printf(m, "\n"); ++ ++ omap_dm_timer_dump_int_enable(gptimer_pub); ++ + return 0; + } + diff --git a/packages/linux/linux-omap2-git/beagleboard/ASoC-TWL4030-codec-driver.patch b/packages/linux/linux-omap2-git/beagleboard/ASoC-TWL4030-codec-driver.patch new file mode 100644 index 0000000000..ef9a0ed0fe --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/ASoC-TWL4030-codec-driver.patch @@ -0,0 +1,831 @@ +From: Steve Sakoman <steve@sakoman.com> +Date: Fri, 18 Jul 2008 16:41:27 +0000 (-0700) +Subject: ASoC TWL4030 codec driver +X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=67b73de03016cc31b1f91af93c57b8e749c13520;hp=d3b3ae0fe6c71641da19c8de466ec366d39847e3 + +ASoC TWL4030 codec driver + +Basic audio support for the TWL4030 + +Signed-off-by: Steve Sakoman <steve@sakoman.com> +--- + +diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig +index 3903ab7..468536d 100644 +--- a/sound/soc/codecs/Kconfig ++++ b/sound/soc/codecs/Kconfig +@@ -44,3 +44,7 @@ config SND_SOC_CS4270_VD33_ERRATA + config SND_SOC_TLV320AIC3X + tristate + depends on SND_SOC && I2C ++ ++config SND_SOC_TWL4030 ++ tristate ++ depends on SND_SOC && I2C +diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile +index 4e1314c..d2c0b12 100644 +--- a/sound/soc/codecs/Makefile ++++ b/sound/soc/codecs/Makefile +@@ -6,6 +6,7 @@ snd-soc-wm9712-objs := wm9712.o + snd-soc-wm9713-objs := wm9713.o + snd-soc-cs4270-objs := cs4270.o + snd-soc-tlv320aic3x-objs := tlv320aic3x.o ++snd-soc-twl4030-objs := twl4030.o + + obj-$(CONFIG_SND_SOC_AC97_CODEC) += snd-soc-ac97.o + obj-$(CONFIG_SND_SOC_WM8731) += snd-soc-wm8731.o +@@ -15,3 +16,4 @@ obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o + obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o + obj-$(CONFIG_SND_SOC_CS4270) += snd-soc-cs4270.o + obj-$(CONFIG_SND_SOC_TLV320AIC3X) += snd-soc-tlv320aic3x.o ++obj-$(CONFIG_SND_SOC_TWL4030) += snd-soc-twl4030.o +diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c +new file mode 100644 +index 0000000..25a154c +--- /dev/null ++++ b/sound/soc/codecs/twl4030.c +@@ -0,0 +1,626 @@ ++/* ++ * ALSA SoC TWL4030 codec driver ++ * ++ * Author: Steve Sakoman, <steve@sakoman.com> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include <linux/module.h> ++#include <linux/moduleparam.h> ++#include <linux/init.h> ++#include <linux/delay.h> ++#include <linux/pm.h> ++#include <linux/i2c.h> ++#include <linux/platform_device.h> ++#include <linux/i2c/twl4030.h> ++#include <sound/core.h> ++#include <sound/pcm.h> ++#include <sound/pcm_params.h> ++#include <sound/soc.h> ++#include <sound/soc-dapm.h> ++#include <sound/initval.h> ++ ++#include "twl4030.h" ++ ++/* ++ * twl4030 register cache & default register settings ++ */ ++static const u8 twl4030_reg[TWL4030_CACHEREGNUM] = { ++ 0x00, /* this register not used */ ++ 0x93, /* REG_CODEC_MODE (0x1) */ ++ 0xc3, /* REG_OPTION (0x2) */ ++ 0x00, /* REG_UNKNOWN (0x3) */ ++ 0x00, /* REG_MICBIAS_CTL (0x4) */ ++ 0x34, /* REG_ANAMICL (0x5) */ ++ 0x14, /* REG_ANAMICR (0x6) */ ++ 0x0a, /* REG_AVADC_CTL (0x7) */ ++ 0x00, /* REG_ADCMICSEL (0x8) */ ++ 0x00, /* REG_DIGMIXING (0x9) */ ++ 0x0c, /* REG_ATXL1PGA (0xA) */ ++ 0x0c, /* REG_ATXR1PGA (0xB) */ ++ 0x00, /* REG_AVTXL2PGA (0xC) */ ++ 0x00, /* REG_AVTXR2PGA (0xD) */ ++ 0x01, /* REG_AUDIO_IF (0xE) */ ++ 0x00, /* REG_VOICE_IF (0xF) */ ++ 0x00, /* REG_ARXR1PGA (0x10) */ ++ 0x00, /* REG_ARXL1PGA (0x11) */ ++ 0x6c, /* REG_ARXR2PGA (0x12) */ ++ 0x6c, /* REG_ARXL2PGA (0x13) */ ++ 0x00, /* REG_VRXPGA (0x14) */ ++ 0x00, /* REG_VSTPGA (0x15) */ ++ 0x00, /* REG_VRX2ARXPGA (0x16) */ ++ 0x0c, /* REG_AVDAC_CTL (0x17) */ ++ 0x00, /* REG_ARX2VTXPGA (0x18) */ ++ 0x00, /* REG_ARXL1_APGA_CTL (0x19) */ ++ 0x00, /* REG_ARXR1_APGA_CTL (0x1A) */ ++ 0x4b, /* REG_ARXL2_APGA_CTL (0x1B) */ ++ 0x4b, /* REG_ARXR2_APGA_CTL (0x1C) */ ++ 0x00, /* REG_ATX2ARXPGA (0x1D) */ ++ 0x00, /* REG_BT_IF (0x1E) */ ++ 0x00, /* REG_BTPGA (0x1F) */ ++ 0x00, /* REG_BTSTPGA (0x20) */ ++ 0x00, /* REG_EAR_CTL (0x21) */ ++ 0x24, /* REG_HS_SEL (0x22) */ ++ 0x0a, /* REG_HS_GAIN_SET (0x23) */ ++ 0x00, /* REG_HS_POPN_SET (0x24) */ ++ 0x00, /* REG_PREDL_CTL (0x25) */ ++ 0x00, /* REG_PREDR_CTL (0x26) */ ++ 0x00, /* REG_PRECKL_CTL (0x27) */ ++ 0x00, /* REG_PRECKR_CTL (0x28) */ ++ 0x00, /* REG_HFL_CTL (0x29) */ ++ 0x00, /* REG_HFR_CTL (0x2A) */ ++ 0x00, /* REG_ALC_CTL (0x2B) */ ++ 0x00, /* REG_ALC_SET1 (0x2C) */ ++ 0x00, /* REG_ALC_SET2 (0x2D) */ ++ 0x00, /* REG_BOOST_CTL (0x2E) */ ++ 0x01, /* REG_SOFTVOL_CTL (0x2F) */ ++ 0x00, /* REG_DTMF_FREQSEL (0x30) */ ++ 0x00, /* REG_DTMF_TONEXT1H (0x31) */ ++ 0x00, /* REG_DTMF_TONEXT1L (0x32) */ ++ 0x00, /* REG_DTMF_TONEXT2H (0x33) */ ++ 0x00, /* REG_DTMF_TONEXT2L (0x34) */ ++ 0x00, /* REG_DTMF_TONOFF (0x35) */ ++ 0x00, /* REG_DTMF_WANONOFF (0x36) */ ++ 0x00, /* REG_I2S_RX_SCRAMBLE_H (0x37) */ ++ 0x00, /* REG_I2S_RX_SCRAMBLE_M (0x38) */ ++ 0x00, /* REG_I2S_RX_SCRAMBLE_L (0x39) */ ++ 0x16, /* REG_APLL_CTL (0x3A) */ ++ 0x00, /* REG_DTMF_CTL (0x3B) */ ++ 0x00, /* REG_DTMF_PGA_CTL2 (0x3C) */ ++ 0x00, /* REG_DTMF_PGA_CTL1 (0x3D) */ ++ 0x00, /* REG_MISC_SET_1 (0x3E) */ ++ 0x00, /* REG_PCMBTMUX (0x3F) */ ++ 0x00, /* not used (0x40) */ ++ 0x00, /* not used (0x41) */ ++ 0x00, /* not used (0x42) */ ++ 0x00, /* REG_RX_PATH_SEL (0x43) */ ++ 0x00, /* REG_VDL_APGA_CTL (0x44) */ ++ 0x00, /* REG_VIBRA_CTL (0x45) */ ++ 0x00, /* REG_VIBRA_SET (0x46) */ ++ 0x00, /* REG_VIBRA_PWM_SET (0x47) */ ++ 0x00, /* REG_ANAMIC_GAIN (0x48) */ ++ 0x00, /* REG_MISC_SET_2 (0x49) */ ++}; ++ ++static void twl4030_dump_registers(void) ++{ ++ int i = 0; ++ u8 data; ++ ++ printk(KERN_INFO "TWL 4030 Register dump for Audio Module\n"); ++ ++ for (i = REG_CODEC_MODE; i <= REG_MISC_SET_2; i++) { ++ twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &data, i); ++ printk(KERN_INFO "Register[0x%02x]=0x%02x\n", i, data); ++ } ++} ++ ++struct twl4030_priv { ++ unsigned int dummy; ++}; ++ ++/* ++ * read twl4030 register cache ++ */ ++static inline unsigned int twl4030_read_reg_cache(struct snd_soc_codec *codec, ++ unsigned int reg) ++{ ++ u8 *cache = codec->reg_cache; ++ ++ return cache[reg]; ++} ++ ++/* ++ * write twl4030 register cache ++ */ ++static inline void twl4030_write_reg_cache(struct snd_soc_codec *codec, ++ u8 reg, u8 value) ++{ ++ u8 *cache = codec->reg_cache; ++ ++ if (reg >= TWL4030_CACHEREGNUM) ++ return; ++ cache[reg] = value; ++} ++ ++/* ++ * write to the twl4030 register space ++ */ ++static int twl4030_write(struct snd_soc_codec *codec, ++ unsigned int reg, unsigned int value) ++{ ++ twl4030_write_reg_cache(codec, reg, value); ++ return twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, value, reg); ++} ++ ++static void twl4030_init_chip(void) ++{ ++ unsigned char byte; ++ int i; ++ ++ twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, ++ twl4030_reg[REG_CODEC_MODE] & 0xfd, REG_CODEC_MODE); ++ ++ udelay(10); /* delay for power settling */ ++ ++ for (i = REG_OPTION; i <= REG_MISC_SET_2; i++) ++ twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, ++ twl4030_reg[i], i); ++ ++ twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, ++ twl4030_reg[REG_CODEC_MODE], REG_CODEC_MODE); ++ ++ udelay(10); /* delay for power settling */ ++ ++ /* initiate offset cancellation */ ++ twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, ++ twl4030_reg[REG_ANAMICL] | 0x80, REG_ANAMICL); ++ ++ /* wait for offset cancellation to complete */ ++ twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &byte, REG_ANAMICL); ++ while ((byte & 0x80) == 0x80) ++ twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, ++ &byte, REG_ANAMICL); ++ ++ twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, ++ twl4030_reg[REG_MISC_SET_1] | 0x02, REG_MISC_SET_1); ++ ++} ++ ++static const struct snd_kcontrol_new twl4030_snd_controls[] = { ++ SOC_DOUBLE_R("Master Playback Volume", ++ REG_ARXL2PGA, REG_ARXR2PGA, ++ 0, 127, 0), ++ SOC_DOUBLE_R("Capture Volume", ++ REG_ATXL1PGA, REG_ATXR1PGA, ++ 0, 127, 0), ++}; ++ ++/* add non dapm controls */ ++static int twl4030_add_controls(struct snd_soc_codec *codec) ++{ ++ int err, i; ++ ++ for (i = 0; i < ARRAY_SIZE(twl4030_snd_controls); i++) { ++ err = snd_ctl_add(codec->card, ++ snd_soc_cnew(&twl4030_snd_controls[i], ++ codec, NULL)); ++ if (err < 0) ++ return err; ++ } ++ ++ return 0; ++} ++ ++static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { ++ SND_SOC_DAPM_INPUT("INL"), ++ SND_SOC_DAPM_INPUT("INR"), ++ ++ SND_SOC_DAPM_OUTPUT("OUTL"), ++ SND_SOC_DAPM_OUTPUT("OUTR"), ++ ++ SND_SOC_DAPM_DAC("DACL", "Left Playback", SND_SOC_NOPM, 0, 0), ++ SND_SOC_DAPM_DAC("DACR", "Right Playback", SND_SOC_NOPM, 0, 0), ++ ++ SND_SOC_DAPM_ADC("ADCL", "Left Capture", SND_SOC_NOPM, 0, 0), ++ SND_SOC_DAPM_ADC("ADCR", "Right Capture", SND_SOC_NOPM, 0, 0), ++}; ++ ++static const char *intercon[][3] = { ++ /* outputs */ ++ {"OUTL", NULL, "DACL"}, ++ {"OUTR", NULL, "DACR"}, ++ ++ /* inputs */ ++ {"ADCL", NULL, "INL"}, ++ {"ADCR", NULL, "INR"}, ++ ++ /* terminator */ ++ {NULL, NULL, NULL}, ++}; ++ ++static int twl4030_add_widgets(struct snd_soc_codec *codec) ++{ ++ int i; ++ ++ for (i = 0; i < ARRAY_SIZE(twl4030_dapm_widgets); i++) ++ snd_soc_dapm_new_control(codec, &twl4030_dapm_widgets[i]); ++ ++ /* set up audio path interconnects */ ++ for (i = 0; intercon[i][0] != NULL; i++) ++ snd_soc_dapm_connect_input(codec, intercon[i][0], ++ intercon[i][1], intercon[i][2]); ++ ++ snd_soc_dapm_new_widgets(codec); ++ return 0; ++} ++ ++static int twl4030_dapm_event(struct snd_soc_codec *codec, int event) ++{ ++ ++ printk(KERN_INFO "TWL4030 Audio Codec dapm event\n"); ++ switch (event) { ++ case SNDRV_CTL_POWER_D0: /* full On */ ++ break; ++ case SNDRV_CTL_POWER_D1: /* partial On */ ++ case SNDRV_CTL_POWER_D2: /* partial On */ ++ break; ++ case SNDRV_CTL_POWER_D3hot: /* off, with power */ ++ break; ++ case SNDRV_CTL_POWER_D3cold: /* off, without power */ ++ break; ++ } ++ codec->dapm_state = event; ++ ++ return 0; ++} ++ ++static void twl4030_power_up(struct snd_soc_codec *codec, u8 mode) ++{ ++ u8 popn, hsgain; ++ ++ twl4030_write(codec, REG_CODEC_MODE, mode & ~CODECPDZ); ++ twl4030_write(codec, REG_CODEC_MODE, mode | CODECPDZ); ++ udelay(10); ++ ++ popn = twl4030_read_reg_cache(codec, REG_HS_POPN_SET); ++ popn &= RAMP_DELAY; ++ popn |= VMID_EN | RAMP_DELAY_161MS; ++ twl4030_write(codec, REG_HS_POPN_SET, popn); ++ ++ hsgain = HSR_GAIN_0DB | HSL_GAIN_0DB; ++ twl4030_write(codec, REG_HS_GAIN_SET, hsgain); ++ ++ popn |= RAMP_EN; ++ twl4030_write(codec, REG_HS_POPN_SET, popn); ++} ++ ++static void twl4030_power_down(struct snd_soc_codec *codec) ++{ ++ u8 popn, hsgain, mode; ++ ++ popn = twl4030_read_reg_cache(codec, REG_HS_POPN_SET); ++ popn &= ~RAMP_EN; ++ twl4030_write(codec, REG_HS_POPN_SET, popn); ++ ++ hsgain = HSR_GAIN_PWR_DOWN | HSL_GAIN_PWR_DOWN; ++ twl4030_write(codec, REG_HS_GAIN_SET, hsgain); ++ ++ popn &= ~VMID_EN; ++ twl4030_write(codec, REG_HS_POPN_SET, popn); ++ ++ mode = twl4030_read_reg_cache(codec, REG_CODEC_MODE); ++ mode &= ~CODECPDZ; ++ twl4030_write(codec, REG_CODEC_MODE, mode); ++ udelay(10); ++} ++ ++ ++static int twl4030_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_device *socdev = rtd->socdev; ++ struct snd_soc_codec *codec = socdev->codec; ++ struct twl4030_priv *twl4030 = codec->private_data; ++ u8 mode, old_mode, format, old_format; ++ ++ ++ /* bit rate */ ++ old_mode = twl4030_read_reg_cache(codec, REG_CODEC_MODE) & ~CODECPDZ; ++ mode = old_mode; ++ mode &= ~APLL_RATE; ++ switch (params_rate(params)) { ++ case 44100: ++ mode |= APLL_RATE_44100; ++ break; ++ case 48000: ++ mode |= APLL_RATE_48000; ++ break; ++ default: ++ printk(KERN_INFO "TWL4030 hw params: unknown rate %d\n", ++ params_rate(params)); ++ return -EINVAL; ++ } ++ ++ if (mode != old_mode) { ++ /* change rate and turn codec back on */ ++ twl4030_write(codec, REG_CODEC_MODE, mode); ++ mode |= CODECPDZ; ++ twl4030_write(codec, REG_CODEC_MODE, mode); ++ } ++ ++ /* sample size */ ++ old_format = twl4030_read_reg_cache(codec, REG_AUDIO_IF); ++ format = old_format; ++ format &= ~DATA_WIDTH; ++ switch (params_format(params)) { ++ case SNDRV_PCM_FORMAT_S16_LE: ++ format |= DATA_WIDTH_16S_16W; ++ break; ++ case SNDRV_PCM_FORMAT_S24_LE: ++ format |= DATA_WIDTH_32S_24W; ++ break; ++ default: ++ printk(KERN_INFO "TWL4030 hw params: unknown format %d\n", ++ params_format(params)); ++ return -EINVAL; ++ } ++ ++ if (format != old_format) { ++ ++ /* turn off codec before changing format */ ++ mode = twl4030_read_reg_cache(codec, REG_CODEC_MODE); ++ mode &= ~CODECPDZ; ++ twl4030_write(codec, REG_CODEC_MODE, mode); ++ ++ /* change format */ ++ twl4030_write(codec, REG_AUDIO_IF, format); ++ ++ /* turn on codec */ ++ mode |= CODECPDZ; ++ twl4030_write(codec, REG_CODEC_MODE, mode); ++ } ++ return 0; ++} ++ ++static int twl4030_mute(struct snd_soc_codec_dai *dai, int mute) ++{ ++ struct snd_soc_codec *codec = dai->codec; ++ ++ u8 ldac_reg = twl4030_read_reg_cache(codec, REG_ARXL2PGA); ++ u8 rdac_reg = twl4030_read_reg_cache(codec, REG_ARXR2PGA); ++ ++ if (mute) { ++ twl4030_write(codec, REG_ARXL2PGA, 0x00); ++ twl4030_write(codec, REG_ARXR2PGA, 0x00); ++ twl4030_write_reg_cache(codec, REG_ARXL2PGA, ldac_reg); ++ twl4030_write_reg_cache(codec, REG_ARXR2PGA, rdac_reg); ++ } else { ++ twl4030_write(codec, REG_ARXL2PGA, ldac_reg); ++ twl4030_write(codec, REG_ARXR2PGA, rdac_reg); ++ } ++ ++ return 0; ++} ++ ++static int twl4030_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, ++ unsigned int fmt) ++{ ++ struct snd_soc_codec *codec = codec_dai->codec; ++ struct twl4030_priv *twl4030 = codec->private_data; ++ u8 mode, old_format, format; ++ ++ /* get format */ ++ old_format = twl4030_read_reg_cache(codec, REG_AUDIO_IF); ++ format = old_format; ++ ++ /* set master/slave audio interface */ ++ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { ++ case SND_SOC_DAIFMT_CBM_CFM: ++ format &= ~(AIF_SLAVE_EN); ++ format |= CLK256FS_EN; ++ break; ++ case SND_SOC_DAIFMT_CBS_CFS: ++ format &= ~(CLK256FS_EN); ++ format |= AIF_SLAVE_EN; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ /* interface format */ ++ format &= ~AIF_FORMAT; ++ switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { ++ case SND_SOC_DAIFMT_I2S: ++ /* printk(KERN_INFO "TWL4030 set dai fmt: i2s\n"); */ ++ format |= AIF_FORMAT_CODEC; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ if (format != old_format) { ++ ++ /* turn off codec before changing format */ ++ mode = twl4030_read_reg_cache(codec, REG_CODEC_MODE); ++ mode &= ~CODECPDZ; ++ twl4030_write(codec, REG_CODEC_MODE, mode); ++ ++ /* change format */ ++ twl4030_write(codec, REG_AUDIO_IF, format); ++ ++ mode |= CODECPDZ; ++ twl4030_write(codec, REG_CODEC_MODE, mode); ++ } ++ ++ return 0; ++} ++ ++#define TWL4030_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000) ++#define TWL4030_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FORMAT_S24_LE) ++ ++struct snd_soc_codec_dai twl4030_dai = { ++ .name = "twl4030", ++ .playback = { ++ .stream_name = "Playback", ++ .channels_min = 2, ++ .channels_max = 2, ++ .rates = TWL4030_RATES, ++ .formats = TWL4030_FORMATS,}, ++ .capture = { ++ .stream_name = "Capture", ++ .channels_min = 2, ++ .channels_max = 2, ++ .rates = TWL4030_RATES, ++ .formats = TWL4030_FORMATS,}, ++ .ops = { ++ .hw_params = twl4030_hw_params, ++ }, ++ .dai_ops = { ++ .digital_mute = twl4030_mute, ++ .set_fmt = twl4030_set_dai_fmt, ++ } ++}; ++EXPORT_SYMBOL_GPL(twl4030_dai); ++ ++static int twl4030_suspend(struct platform_device *pdev, pm_message_t state) ++{ ++ struct snd_soc_device *socdev = platform_get_drvdata(pdev); ++ struct snd_soc_codec *codec = socdev->codec; ++ ++ printk(KERN_INFO "TWL4030 Audio Codec suspend\n"); ++ twl4030_dapm_event(codec, SNDRV_CTL_POWER_D3cold); ++ ++ return 0; ++} ++ ++static int twl4030_resume(struct platform_device *pdev) ++{ ++ struct snd_soc_device *socdev = platform_get_drvdata(pdev); ++ struct snd_soc_codec *codec = socdev->codec; ++ int i; ++ u16 *cache = codec->reg_cache; ++ ++ printk(KERN_INFO "TWL4030 Audio Codec resume\n"); ++ /* Sync reg_cache with the hardware */ ++ for (i = REG_CODEC_MODE; i <= REG_MISC_SET_2; i++) ++ twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, cache[i], i); ++ ++ twl4030_dapm_event(codec, SNDRV_CTL_POWER_D3hot); ++ twl4030_dapm_event(codec, codec->suspend_dapm_state); ++ return 0; ++} ++ ++/* ++ * initialize the driver ++ * register the mixer and dsp interfaces with the kernel ++ */ ++ ++static int twl4030_init(struct snd_soc_device *socdev) ++{ ++ struct snd_soc_codec *codec = socdev->codec; ++ int ret = 0; ++ ++ printk(KERN_INFO "TWL4030 Audio Codec init \n"); ++ ++ codec->name = "twl4030"; ++ codec->owner = THIS_MODULE; ++ codec->read = twl4030_read_reg_cache; ++ codec->write = twl4030_write; ++ codec->dapm_event = twl4030_dapm_event; ++ codec->dai = &twl4030_dai; ++ codec->num_dai = 1; ++ codec->reg_cache_size = sizeof(twl4030_reg); ++ codec->reg_cache = kmemdup(twl4030_reg, sizeof(twl4030_reg), ++ GFP_KERNEL); ++ if (codec->reg_cache == NULL) ++ return -ENOMEM; ++ ++ /* register pcms */ ++ ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); ++ if (ret < 0) { ++ printk(KERN_ERR "twl4030: failed to create pcms\n"); ++ goto pcm_err; ++ } ++ ++ twl4030_add_controls(codec); ++ twl4030_add_widgets(codec); ++ ++ ret = snd_soc_register_card(socdev); ++ if (ret < 0) { ++ printk(KERN_ERR "twl4030: failed to register card\n"); ++ goto card_err; ++ } ++ ++ twl4030_init_chip(); ++ twl4030_power_up(codec, APLL_RATE_44100 | OPT_MODE); ++ ++ return ret; ++ ++card_err: ++ printk(KERN_INFO "TWL4030 Audio Codec init card error\n"); ++ snd_soc_free_pcms(socdev); ++ snd_soc_dapm_free(socdev); ++pcm_err: ++ printk(KERN_INFO "TWL4030 Audio Codec init pcm error\n"); ++ kfree(codec->reg_cache); ++ return ret; ++} ++ ++static struct snd_soc_device *twl4030_socdev; ++ ++static int twl4030_probe(struct platform_device *pdev) ++{ ++ struct snd_soc_device *socdev = platform_get_drvdata(pdev); ++ struct snd_soc_codec *codec; ++ struct twl4030_priv *twl4030; ++ ++ codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); ++ if (codec == NULL) ++ return -ENOMEM; ++ ++ twl4030 = kzalloc(sizeof(struct twl4030_priv), GFP_KERNEL); ++ if (twl4030 == NULL) { ++ kfree(codec); ++ return -ENOMEM; ++ } ++ ++ codec->private_data = twl4030; ++ socdev->codec = codec; ++ mutex_init(&codec->mutex); ++ INIT_LIST_HEAD(&codec->dapm_widgets); ++ INIT_LIST_HEAD(&codec->dapm_paths); ++ ++ twl4030_socdev = socdev; ++ twl4030_init(socdev); ++ ++ return 0; ++} ++ ++static int twl4030_remove(struct platform_device *pdev) ++{ ++ struct snd_soc_device *socdev = platform_get_drvdata(pdev); ++ struct snd_soc_codec *codec = socdev->codec; ++ ++ printk(KERN_INFO "TWL4030 Audio Codec remove\n"); ++ kfree(codec->private_data); ++ kfree(codec); ++ ++ return 0; ++} ++ ++struct snd_soc_codec_device soc_codec_dev_twl4030 = { ++ .probe = twl4030_probe, ++ .remove = twl4030_remove, ++ .suspend = twl4030_suspend, ++ .resume = twl4030_resume, ++}; ++EXPORT_SYMBOL_GPL(soc_codec_dev_twl4030); ++ ++MODULE_DESCRIPTION("ASoC TWL4030 codec driver"); ++MODULE_AUTHOR("Steve Sakoman"); ++MODULE_LICENSE("GPL"); +diff --git a/sound/soc/codecs/twl4030.h b/sound/soc/codecs/twl4030.h +new file mode 100644 +index 0000000..6eecde1 +--- /dev/null ++++ b/sound/soc/codecs/twl4030.h +@@ -0,0 +1,152 @@ ++/* ++ * ALSA SoC TWL4030 codec driver ++ * ++ * Author: Steve Sakoman, <steve@sakoman.com> ++ * ++ * 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. ++ */ ++ ++#ifndef __TWL4030_AUDIO_H__ ++#define __TWL4030_AUDIO_H__ ++ ++#define REG_CODEC_MODE 0x1 ++#define REG_OPTION 0x2 ++#define REG_UNKNOWN 0x3 ++#define REG_MICBIAS_CTL 0x4 ++#define REG_ANAMICL 0x5 ++#define REG_ANAMICR 0x6 ++#define REG_AVADC_CTL 0x7 ++#define REG_ADCMICSEL 0x8 ++#define REG_DIGMIXING 0x9 ++#define REG_ATXL1PGA 0xA ++#define REG_ATXR1PGA 0xB ++#define REG_AVTXL2PGA 0xC ++#define REG_AVTXR2PGA 0xD ++#define REG_AUDIO_IF 0xE ++#define REG_VOICE_IF 0xF ++#define REG_ARXR1PGA 0x10 ++#define REG_ARXL1PGA 0x11 ++#define REG_ARXR2PGA 0x12 ++#define REG_ARXL2PGA 0x13 ++#define REG_VRXPGA 0x14 ++#define REG_VSTPGA 0x15 ++#define REG_VRX2ARXPGA 0x16 ++#define REG_AVDAC_CTL 0x17 ++#define REG_ARX2VTXPGA 0x18 ++#define REG_ARXL1_APGA_CTL 0x19 ++#define REG_ARXR1_APGA_CTL 0x1A ++#define REG_ARXL2_APGA_CTL 0x1B ++#define REG_ARXR2_APGA_CTL 0x1C ++#define REG_ATX2ARXPGA 0x1D ++#define REG_BT_IF 0x1E ++#define REG_BTPGA 0x1F ++#define REG_BTSTPGA 0x20 ++#define REG_EAR_CTL 0x21 ++#define REG_HS_SEL 0x22 ++#define REG_HS_GAIN_SET 0x23 ++#define REG_HS_POPN_SET 0x24 ++#define REG_PREDL_CTL 0x25 ++#define REG_PREDR_CTL 0x26 ++#define REG_PRECKL_CTL 0x27 ++#define REG_PRECKR_CTL 0x28 ++#define REG_HFL_CTL 0x29 ++#define REG_HFR_CTL 0x2A ++#define REG_ALC_CTL 0x2B ++#define REG_ALC_SET1 0x2C ++#define REG_ALC_SET2 0x2D ++#define REG_BOOST_CTL 0x2E ++#define REG_SOFTVOL_CTL 0x2F ++#define REG_DTMF_FREQSEL 0x30 ++#define REG_DTMF_TONEXT1H 0x31 ++#define REG_DTMF_TONEXT1L 0x32 ++#define REG_DTMF_TONEXT2H 0x33 ++#define REG_DTMF_TONEXT2L 0x34 ++#define REG_DTMF_TONOFF 0x35 ++#define REG_DTMF_WANONOFF 0x36 ++#define REG_I2S_RX_SCRAMBLE_H 0x37 ++#define REG_I2S_RX_SCRAMBLE_M 0x38 ++#define REG_I2S_RX_SCRAMBLE_L 0x39 ++#define REG_APLL_CTL 0x3A ++#define REG_DTMF_CTL 0x3B ++#define REG_DTMF_PGA_CTL2 0x3C ++#define REG_DTMF_PGA_CTL1 0x3D ++#define REG_MISC_SET_1 0x3E ++#define REG_PCMBTMUX 0x3F ++#define REG_RX_PATH_SEL 0x43 ++#define REG_VDL_APGA_CTL 0x44 ++#define REG_VIBRA_CTL 0x45 ++#define REG_VIBRA_SET 0x46 ++#define REG_VIBRA_PWM_SET 0x47 ++#define REG_ANAMIC_GAIN 0x48 ++#define REG_MISC_SET_2 0x49 ++ ++#define TWL4030_CACHEREGNUM (REG_MISC_SET_2 + 1) ++ ++/* Bitfield Definitions */ ++ ++/* CODEC_MODE (0x01) Fields */ ++ ++#define APLL_RATE 0xF0 ++#define APLL_RATE_8000 0x00 ++#define APLL_RATE_11025 0x10 ++#define APLL_RATE_12000 0x20 ++#define APLL_RATE_16000 0x40 ++#define APLL_RATE_22050 0x50 ++#define APLL_RATE_24000 0x60 ++#define APLL_RATE_32000 0x80 ++#define APLL_RATE_44100 0x90 ++#define APLL_RATE_48000 0xa0 ++#define SEL_16K 0x04 ++#define CODECPDZ 0x02 ++#define OPT_MODE 0x01 ++ ++/* AUDIO_IF (0x0E) Fields */ ++ ++#define AIF_SLAVE_EN 0x80 ++#define DATA_WIDTH 0x60 ++#define DATA_WIDTH_16S_16W 0x00 ++#define DATA_WIDTH_32S_16W 0x40 ++#define DATA_WIDTH_32S_24W 0x60 ++#define AIF_FORMAT 0x18 ++#define AIF_FORMAT_CODEC 0x00 ++#define AIF_FORMAT_LEFT 0x08 ++#define AIF_FORMAT_RIGHT 0x10 ++#define AIF_FORMAT_TDM 0x18 ++#define AIF_TRI_EN 0x04 ++#define CLK256FS_EN 0x02 ++#define AIF_EN 0x01 ++ ++/* HS_GAIN_SET (0x23) Fields */ ++ ++#define HSR_GAIN 0x0c ++#define HSR_GAIN_PWR_DOWN 0x00 ++#define HSR_GAIN_PLUS_6DB 0x04 ++#define HSR_GAIN_0DB 0x08 ++#define HSR_GAIN_MINUS_6DB 0x0c ++#define HSL_GAIN 0x0c ++#define HSL_GAIN_PWR_DOWN 0x00 ++#define HSL_GAIN_PLUS_6DB 0x01 ++#define HSL_GAIN_0DB 0x02 ++#define HSL_GAIN_MINUS_6DB 0x03 ++ ++/* HS_POPN_SET (0x24) Fields */ ++ ++#define VMID_EN 0x40 ++#define EXTMUTE 0x20 ++#define RAMP_DELAY 0x1C ++#define RAMP_DELAY_20MS 0x00 ++#define RAMP_DELAY_40MS 0x04 ++#define RAMP_DELAY_81MS 0x08 ++#define RAMP_DELAY_161MS 0x0c ++#define RAMP_DELAY_323MS 0x10 ++#define RAMP_DELAY_645MS 0x14 ++#define RAMP_DELAY_1291MS 0x18 ++#define RAMP_DELAY_2581MS 0x1c ++#define RAMP_EN 0x02 ++ ++extern struct snd_soc_codec_dai twl4030_dai; ++extern struct snd_soc_codec_device soc_codec_dev_twl4030; ++ ++#endif /* End of __TWL4030_AUDIO_H__ */ diff --git a/packages/linux/linux-omap2-git/beagleboard/ASoC-machine-driver-for-OMAP3-EVM.patch b/packages/linux/linux-omap2-git/beagleboard/ASoC-machine-driver-for-OMAP3-EVM.patch new file mode 100644 index 0000000000..ea8108e090 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/ASoC-machine-driver-for-OMAP3-EVM.patch @@ -0,0 +1,278 @@ +From: Steve Sakoman <steve@sakoman.com> +Date: Fri, 18 Jul 2008 16:41:37 +0000 (-0700) +Subject: ASoC machine driver for OMAP3 EVM +X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=2e6af042b4af677e62e32d048e770f6755e67a7f + +ASoC machine driver for OMAP3 EVM + +Add basic audio support for OMAP3 EVM + +Signed-off-by: Steve Sakoman <steve@sakoman.com> +--- + +diff --git a/arch/arm/configs/omap3_beagle_defconfig b/arch/arm/configs/omap3_beagle_defconfig +index cce83e5..a48780a 100644 +--- a/arch/arm/configs/omap3_beagle_defconfig ++++ b/arch/arm/configs/omap3_beagle_defconfig +@@ -735,7 +735,82 @@ CONFIG_FONT_8x16=y + # + # Sound + # +-# CONFIG_SOUND is not set ++CONFIG_SOUND=y ++ ++# ++# Advanced Linux Sound Architecture ++# ++CONFIG_SND=y ++CONFIG_SND_TIMER=y ++CONFIG_SND_PCM=y ++CONFIG_SND_HWDEP=y ++CONFIG_SND_RAWMIDI=y ++# CONFIG_SND_SEQUENCER is not set ++CONFIG_SND_OSSEMUL=y ++CONFIG_SND_MIXER_OSS=y ++CONFIG_SND_PCM_OSS=y ++CONFIG_SND_PCM_OSS_PLUGINS=y ++# CONFIG_SND_DYNAMIC_MINORS is not set ++CONFIG_SND_SUPPORT_OLD_API=y ++CONFIG_SND_VERBOSE_PROCFS=y ++CONFIG_SND_VERBOSE_PRINTK=y ++CONFIG_SND_DEBUG=y ++CONFIG_SND_DEBUG_DETECT=y ++CONFIG_SND_PCM_XRUN_DEBUG=y ++ ++# ++# Generic devices ++# ++# CONFIG_SND_DUMMY is not set ++# CONFIG_SND_MTPAV is not set ++# CONFIG_SND_SERIAL_U16550 is not set ++# CONFIG_SND_MPU401 is not set ++ ++# ++# ALSA ARM devices ++# ++# CONFIG_SND_OMAP_AIC23 is not set ++# CONFIG_SND_OMAP_TSC2101 is not set ++# CONFIG_SND_SX1 is not set ++# CONFIG_SND_OMAP_TSC2102 is not set ++# CONFIG_SND_OMAP24XX_EAC is not set ++ ++# ++# SPI devices ++# ++ ++# ++# USB devices ++# ++CONFIG_SND_USB_AUDIO=y ++# CONFIG_SND_USB_CAIAQ is not set ++ ++# ++# System on Chip audio support ++# ++CONFIG_SND_SOC=y ++ ++# ++# ALSA SoC audio for Freescale SOCs ++# ++ ++# ++# SoC Audio for the Texas Instruments OMAP ++# ++CONFIG_SND_OMAP_SOC=y ++CONFIG_SND_OMAP_SOC_MCBSP=y ++CONFIG_SND_OMAP_SOC_OMAP3BEAGLE=y ++CONFIG_SND_SOC_TWL4030=y ++ ++# ++# Open Sound System ++# ++CONFIG_SOUND_PRIME=y ++CONFIG_HID_SUPPORT=y ++CONFIG_HID=y ++# CONFIG_HID_DEBUG is not set ++# CONFIG_HIDRAW is not set ++ + # CONFIG_HID_SUPPORT is not set + CONFIG_USB_SUPPORT=y + CONFIG_USB_ARCH_HAS_HCD=y +diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig +index 0230d83..0def5ba 100644 +--- a/sound/soc/omap/Kconfig ++++ b/sound/soc/omap/Kconfig +@@ -16,4 +16,12 @@ config SND_OMAP_SOC_N810 + help + Say Y if you want to add support for SoC audio on Nokia N810. + ++config SND_OMAP_SOC_OMAP3EVM ++ tristate "SoC Audio support for OMAP3 EVM" ++ depends on SND_OMAP_SOC && MACH_OMAP3EVM ++ select SND_OMAP_SOC_MCBSP ++ select SND_SOC_TWL4030 ++ help ++ Say Y if you want to add support for SoC audio on the OMAP3 EVM. ++ + endmenu +diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile +index d8d8d58..985eddc 100644 +--- a/sound/soc/omap/Makefile ++++ b/sound/soc/omap/Makefile +@@ -7,5 +7,8 @@ obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o + + # OMAP Machine Support + snd-soc-n810-objs := n810.o ++snd-soc-omap3evm-objs := omap3evm.o + + obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o ++obj-$(CONFIG_SND_OMAP_SOC_OMAP3EVM) += snd-soc-omap3evm.o ++ +diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c +new file mode 100644 +index 0000000..d436bb4 +--- /dev/null ++++ b/sound/soc/omap/omap3evm.c +@@ -0,0 +1,142 @@ ++/* ++ * omap3evm.c -- SoC audio for OMAP3 EVM ++ * ++ * Author: Steve Sakoman <steve@sakoman.com> ++ * ++ * 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. ++ * ++ * 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., 51 Franklin St, Fifth Floor, Boston, MA ++ * 02110-1301 USA ++ * ++ */ ++ ++#include <linux/clk.h> ++#include <linux/platform_device.h> ++#include <sound/core.h> ++#include <sound/pcm.h> ++#include <sound/soc.h> ++#include <sound/soc-dapm.h> ++ ++#include <asm/mach-types.h> ++#include <asm/arch/hardware.h> ++#include <asm/arch/gpio.h> ++#include <asm/arch/mcbsp.h> ++ ++#include "omap-mcbsp.h" ++#include "omap-pcm.h" ++#include "../codecs/twl4030.h" ++ ++static int omap3evm_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; ++ struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; ++ int ret; ++ ++ /* Set codec DAI configuration */ ++ ret = codec_dai->dai_ops.set_fmt(codec_dai, ++ SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBM_CFM); ++ if (ret < 0) { ++ printk(KERN_INFO "can't set codec DAI configuration\n"); ++ return ret; ++ } ++ ++ /* Set cpu DAI configuration */ ++ ret = cpu_dai->dai_ops.set_fmt(cpu_dai, ++ SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBM_CFM); ++ if (ret < 0) { ++ printk(KERN_INFO "can't set cpu DAI configuration\n"); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static struct snd_soc_ops omap3evm_ops = { ++ .hw_params = omap3evm_hw_params, ++}; ++ ++/* Digital audio interface glue - connects codec <--> CPU */ ++static struct snd_soc_dai_link omap3evm_dai = { ++ .name = "TWL4030", ++ .stream_name = "TWL4030", ++ .cpu_dai = &omap_mcbsp_dai[0], ++ .codec_dai = &twl4030_dai, ++ .ops = &omap3evm_ops, ++}; ++ ++/* Audio machine driver */ ++static struct snd_soc_machine snd_soc_machine_omap3evm = { ++ .name = "omap3evm", ++ .dai_link = &omap3evm_dai, ++ .num_links = 1, ++}; ++ ++/* Audio subsystem */ ++static struct snd_soc_device omap3evm_snd_devdata = { ++ .machine = &snd_soc_machine_omap3evm, ++ .platform = &omap_soc_platform, ++ .codec_dev = &soc_codec_dev_twl4030, ++}; ++ ++static struct platform_device *omap3evm_snd_device; ++ ++static int __init omap3evm_soc_init(void) ++{ ++ int ret; ++ ++ printk(KERN_INFO "OMAP3 EVM SoC init\n"); ++ if (!machine_is_omap3evm()) { ++ printk(KERN_INFO "Not OMAP3 EVM!\n"); ++ return -ENODEV; ++ } ++ ++ omap3evm_snd_device = platform_device_alloc("soc-audio", -1); ++ if (!omap3evm_snd_device) { ++ printk(KERN_INFO "Platform device allocation failed\n"); ++ return -ENOMEM; ++ } ++ ++ platform_set_drvdata(omap3evm_snd_device, &omap3evm_snd_devdata); ++ omap3evm_snd_devdata.dev = &omap3evm_snd_device->dev; ++ *(unsigned int *)omap3evm_dai.cpu_dai->private_data = 1; /* McBSP2 */ ++ ++ ret = platform_device_add(omap3evm_snd_device); ++ if (ret) ++ goto err1; ++ ++ return 0; ++ ++err1: ++ printk(KERN_INFO "Unable to add platform device\n"); ++ platform_device_put(omap3evm_snd_device); ++ ++ return ret; ++} ++ ++static void __exit omap3evm_soc_exit(void) ++{ ++ printk(KERN_INFO "OMAP3 EVM SoC exit\n"); ++ platform_device_unregister(omap3evm_snd_device); ++} ++ ++module_init(omap3evm_soc_init); ++module_exit(omap3evm_soc_exit); ++ ++MODULE_AUTHOR("Steve Sakoman <steve@sakoman.com>"); ++MODULE_DESCRIPTION("ALSA SoC OMAP3 EVM"); ++MODULE_LICENSE("GPL"); diff --git a/packages/linux/linux-omap2-git/beagleboard/ASoC-machine-driver-for_OMAP3-Beagle.patch b/packages/linux/linux-omap2-git/beagleboard/ASoC-machine-driver-for_OMAP3-Beagle.patch new file mode 100644 index 0000000000..9343a9c59a --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/ASoC-machine-driver-for_OMAP3-Beagle.patch @@ -0,0 +1,279 @@ +From: Steve Sakoman <steve@sakoman.com> +Date: Fri, 18 Jul 2008 16:41:49 +0000 (-0700) +Subject: ASoC machine driver for OMAP3 Beagle +X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=543a3a0cd4c6f68be6f084ccfe63ec5a514eba59 + +ASoC machine driver for OMAP3 Beagle + +Add basic audio support for OMAP3 Beagle + +Signed-off-by: Steve Sakoman <steve@sakoman.com> +--- + +diff --git a/arch/arm/configs/omap3_evm_defconfig b/arch/arm/configs/omap3_evm_defconfig +index 718c914..4ac730c 100644 +--- a/arch/arm/configs/omap3_evm_defconfig ++++ b/arch/arm/configs/omap3_evm_defconfig +@@ -835,7 +835,82 @@ CONFIG_DUMMY_CONSOLE=y + # + # Sound + # +-# CONFIG_SOUND is not set ++CONFIG_SOUND=y ++ ++# ++# Advanced Linux Sound Architecture ++# ++CONFIG_SND=y ++CONFIG_SND_TIMER=y ++CONFIG_SND_PCM=y ++CONFIG_SND_HWDEP=y ++CONFIG_SND_RAWMIDI=y ++# CONFIG_SND_SEQUENCER is not set ++CONFIG_SND_OSSEMUL=y ++CONFIG_SND_MIXER_OSS=y ++CONFIG_SND_PCM_OSS=y ++CONFIG_SND_PCM_OSS_PLUGINS=y ++# CONFIG_SND_DYNAMIC_MINORS is not set ++CONFIG_SND_SUPPORT_OLD_API=y ++CONFIG_SND_VERBOSE_PROCFS=y ++CONFIG_SND_VERBOSE_PRINTK=y ++CONFIG_SND_DEBUG=y ++CONFIG_SND_DEBUG_DETECT=y ++CONFIG_SND_PCM_XRUN_DEBUG=y ++ ++# ++# Generic devices ++# ++# CONFIG_SND_DUMMY is not set ++# CONFIG_SND_MTPAV is not set ++# CONFIG_SND_SERIAL_U16550 is not set ++# CONFIG_SND_MPU401 is not set ++ ++# ++# ALSA ARM devices ++# ++# CONFIG_SND_OMAP_AIC23 is not set ++# CONFIG_SND_OMAP_TSC2101 is not set ++# CONFIG_SND_SX1 is not set ++# CONFIG_SND_OMAP_TSC2102 is not set ++# CONFIG_SND_OMAP24XX_EAC is not set ++ ++# ++# SPI devices ++# ++ ++# ++# USB devices ++# ++CONFIG_SND_USB_AUDIO=y ++# CONFIG_SND_USB_CAIAQ is not set ++ ++# ++# System on Chip audio support ++# ++CONFIG_SND_SOC=y ++ ++# ++# ALSA SoC audio for Freescale SOCs ++# ++ ++# ++# SoC Audio for the Texas Instruments OMAP ++# ++CONFIG_SND_OMAP_SOC=y ++CONFIG_SND_OMAP_SOC_MCBSP=y ++CONFIG_SND_OMAP_SOC_OMAP3EVM=y ++CONFIG_SND_SOC_TWL4030=y ++ ++# ++# Open Sound System ++# ++CONFIG_SOUND_PRIME=y ++CONFIG_HID_SUPPORT=y ++CONFIG_HID=y ++# CONFIG_HID_DEBUG is not set ++# CONFIG_HIDRAW is not set ++ + # CONFIG_HID_SUPPORT is not set + # CONFIG_USB_SUPPORT is not set + # CONFIG_MMC is not set +diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig +index 0def5ba..8703cea 100644 +--- a/sound/soc/omap/Kconfig ++++ b/sound/soc/omap/Kconfig +@@ -24,4 +24,12 @@ config SND_OMAP_SOC_OMAP3EVM + help + Say Y if you want to add support for SoC audio on the OMAP3 EVM. + ++config SND_OMAP_SOC_OMAP3BEAGLE ++ tristate "SoC Audio support for OMAP3 Beagle" ++ depends on SND_OMAP_SOC && MACH_OMAP3_BEAGLE ++ select SND_OMAP_SOC_MCBSP ++ select SND_SOC_TWL4030 ++ help ++ Say Y if you want to add support for SoC audio on the OMAP3 Beagle. ++ + endmenu +diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile +index 985eddc..638a240 100644 +--- a/sound/soc/omap/Makefile ++++ b/sound/soc/omap/Makefile +@@ -8,7 +8,9 @@ obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o + # OMAP Machine Support + snd-soc-n810-objs := n810.o + snd-soc-omap3evm-objs := omap3evm.o ++snd-soc-omap3beagle-objs := omap3beagle.o + + obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o + obj-$(CONFIG_SND_OMAP_SOC_OMAP3EVM) += snd-soc-omap3evm.o ++obj-$(CONFIG_SND_OMAP_SOC_OMAP3BEAGLE) += snd-soc-omap3beagle.o + +diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c +new file mode 100644 +index 0000000..336d50a +--- /dev/null ++++ b/sound/soc/omap/omap3beagle.c +@@ -0,0 +1,142 @@ ++/* ++ * omap3beagle.c -- SoC audio for OMAP3 Beagle ++ * ++ * Author: Steve Sakoman <steve@sakoman.com> ++ * ++ * 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. ++ * ++ * 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., 51 Franklin St, Fifth Floor, Boston, MA ++ * 02110-1301 USA ++ * ++ */ ++ ++#include <linux/clk.h> ++#include <linux/platform_device.h> ++#include <sound/core.h> ++#include <sound/pcm.h> ++#include <sound/soc.h> ++#include <sound/soc-dapm.h> ++ ++#include <asm/mach-types.h> ++#include <asm/arch/hardware.h> ++#include <asm/arch/gpio.h> ++#include <asm/arch/mcbsp.h> ++ ++#include "omap-mcbsp.h" ++#include "omap-pcm.h" ++#include "../codecs/twl4030.h" ++ ++static int omap3beagle_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; ++ struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; ++ int ret; ++ ++ /* Set codec DAI configuration */ ++ ret = codec_dai->dai_ops.set_fmt(codec_dai, ++ SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBM_CFM); ++ if (ret < 0) { ++ printk(KERN_INFO "can't set codec DAI configuration\n"); ++ return ret; ++ } ++ ++ /* Set cpu DAI configuration */ ++ ret = cpu_dai->dai_ops.set_fmt(cpu_dai, ++ SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBM_CFM); ++ if (ret < 0) { ++ printk(KERN_INFO "can't set cpu DAI configuration\n"); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static struct snd_soc_ops omap3beagle_ops = { ++ .hw_params = omap3beagle_hw_params, ++}; ++ ++/* Digital audio interface glue - connects codec <--> CPU */ ++static struct snd_soc_dai_link omap3beagle_dai = { ++ .name = "TWL4030", ++ .stream_name = "TWL4030", ++ .cpu_dai = &omap_mcbsp_dai[0], ++ .codec_dai = &twl4030_dai, ++ .ops = &omap3beagle_ops, ++}; ++ ++/* Audio machine driver */ ++static struct snd_soc_machine snd_soc_machine_omap3beagle = { ++ .name = "omap3beagle", ++ .dai_link = &omap3beagle_dai, ++ .num_links = 1, ++}; ++ ++/* Audio subsystem */ ++static struct snd_soc_device omap3beagle_snd_devdata = { ++ .machine = &snd_soc_machine_omap3beagle, ++ .platform = &omap_soc_platform, ++ .codec_dev = &soc_codec_dev_twl4030, ++}; ++ ++static struct platform_device *omap3beagle_snd_device; ++ ++static int __init omap3beagle_soc_init(void) ++{ ++ int ret; ++ ++ printk(KERN_INFO "OMAP3 Beagle SoC init\n"); ++ if (!machine_is_omap3_beagle()) { ++ printk(KERN_INFO "Not OMAP3 Beagle!\n"); ++ return -ENODEV; ++ } ++ ++ omap3beagle_snd_device = platform_device_alloc("soc-audio", -1); ++ if (!omap3beagle_snd_device) { ++ printk(KERN_INFO "Platform device allocation failed\n"); ++ return -ENOMEM; ++ } ++ ++ platform_set_drvdata(omap3beagle_snd_device, &omap3beagle_snd_devdata); ++ omap3beagle_snd_devdata.dev = &omap3beagle_snd_device->dev; ++ *(unsigned int *)omap3beagle_dai.cpu_dai->private_data = 1; /* McBSP2 */ ++ ++ ret = platform_device_add(omap3beagle_snd_device); ++ if (ret) ++ goto err1; ++ ++ return 0; ++ ++err1: ++ printk(KERN_INFO "Unable to add platform device\n"); ++ platform_device_put(omap3beagle_snd_device); ++ ++ return ret; ++} ++ ++static void __exit omap3beagle_soc_exit(void) ++{ ++ printk(KERN_INFO "OMAP3 Beagle SoC exit\n"); ++ platform_device_unregister(omap3beagle_snd_device); ++} ++ ++module_init(omap3beagle_soc_init); ++module_exit(omap3beagle_soc_exit); ++ ++MODULE_AUTHOR("Steve Sakoman <steve@sakoman.com>"); ++MODULE_DESCRIPTION("ALSA SoC OMAP3 Beagle"); ++MODULE_LICENSE("GPL"); diff --git a/packages/linux/linux-omap2-git/beagleboard/read_die_ids.patch b/packages/linux/linux-omap2-git/beagleboard/read_die_ids.patch new file mode 100644 index 0000000000..3f6c930cc1 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/read_die_ids.patch @@ -0,0 +1,23 @@ +OMAP2/3 TAP: enable debug messages + +From: Paul Walmsley <paul@pwsan.com> + +This patch causes the OMAP2/3 chip ID code to display the full DIE_ID registers at boot. + +--- + + arch/arm/mach-omap2/id.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c +index c7f9ab7..a154b5e 100644 +--- a/arch/arm/mach-omap2/id.c ++++ b/arch/arm/mach-omap2/id.c +@@ -10,6 +10,7 @@ + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ ++#define DEBUG + + #include <linux/module.h> + #include <linux/kernel.h> diff --git a/packages/linux/linux-omap2-git/beagleboard/serialfix.diff b/packages/linux/linux-omap2-git/beagleboard/serialfix.diff deleted file mode 100644 index 74c2ebaa69..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/serialfix.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- /tmp/pm34xx.c 2008-07-14 18:09:08.000000000 +0200 -+++ git/arch/arm/mach-omap2/pm34xx.c 2008-07-14 18:09:42.453198000 +0200 -@@ -398,13 +398,13 @@ - INT_34XX_PRCM_MPU_IRQ); - goto err1; - } -- -+/* - ret = pwrdm_for_each(pwrdms_setup); - if (ret) { - printk(KERN_ERR "Failed to setup powerdomains\n"); - goto err2; - } -- -+*/ - mpu_pwrdm = pwrdm_lookup("mpu_pwrdm"); - if (mpu_pwrdm == NULL) { - printk(KERN_ERR "Failed to get mpu_pwrdm\n"); diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index 589f1d1458..670cd0f073 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -6,7 +6,7 @@ SRCREV = "d3b3ae0fe6c71641da19c8de466ec366d39847e3" PV = "2.6.26" #PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}" -PR = "r50" +PR = "r54" SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ file://defconfig" @@ -17,7 +17,9 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ file://0001-omap3-cpuidle.patch;patch=1 \ file://0002-omap3-cpuidle.patch;patch=1 \ file://timer-suppression.patch;patch=1 \ - file://soc.patch;patch=1 \ + file://ASoC-TWL4030-codec-driver.patch;patch=1 \ + file://ASoC-machine-driver-for-OMAP3-EVM.patch;patch=1 \ + file://ASoC-machine-driver-for_OMAP3-Beagle.patch;patch=1 \ file://16bpp.patch;patch=1 \ file://no-empty-flash-warnings.patch;patch=1 \ file://logo_linux_clut224.ppm \ @@ -29,7 +31,6 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ file://06-ensure-fclk.diff;patch=1 \ file://07-set-burst-size.diff;patch=1 \ file://cache-display-fix.patch;patch=1 \ - file://serialfix.diff;patch=1 \ file://i2c-omap-race-fix.diff;patch=1 \ file://TWL4030-01.patch;patch=1 \ file://TWL4030-02.patch;patch=1 \ @@ -46,6 +47,11 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ file://4bitmmc.diff;patch=1 \ file://400khz-i2c.diff;patch=1 \ file://no-cortex-deadlock.patch;patch=1 \ + file://01-gptimer_clear_isrs_on_init;patch=1 \ + file://02-gptimer_use_match_for_tick;patch=1 \ + file://03-gptimer_match_plus_ovf;patch=1 \ + file://04-gptimer_add_debug_to_sysrq_q;patch=1 \ + file://read_die_ids.patch;patch=1 \ " SRC_URI_append_omap3evm = " file://no-harry-potter.diff;patch=1 \ diff --git a/packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch b/packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch index 40214e42b0..e0db0746cd 100644 --- a/packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch +++ b/packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch @@ -14,15 +14,42 @@ Stanislav. Reported-by: Stanislav Brabec <utx@penguin.cz> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> --- + arch/arm/mach-pxa/corgi.c | 2 ++ arch/arm/mach-pxa/poodle.c | 2 ++ arch/arm/mach-pxa/spitz.c | 2 ++ - 2 files changed, 4 insertions(+), 0 deletions(-) + 3 files changed, 6 insertions(+) -diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c -index 39612cf..510018b 100644 ---- a/arch/arm/mach-pxa/poodle.c -+++ b/arch/arm/mach-pxa/poodle.c -@@ -36,6 +36,7 @@ +--- linux-2.6.26.orig/arch/arm/mach-pxa/corgi.c ++++ linux-2.6.26/arch/arm/mach-pxa/corgi.c +@@ -38,10 +38,11 @@ + #include <asm/arch/pxa-regs.h> + #include <asm/arch/pxa2xx-gpio.h> + #include <asm/arch/irda.h> + #include <asm/arch/mmc.h> + #include <asm/arch/udc.h> ++#include <asm/arch/i2c.h> + #include <asm/arch/corgi.h> + #include <asm/arch/sharpsl.h> + + #include <asm/mach/sharpsl_param.h> + #include <asm/hardware/scoop.h> +@@ -529,10 +530,11 @@ static void __init corgi_init(void) + pxa_gpio_mode(CORGI_GPIO_HSYNC | GPIO_IN); + + pxa_set_udc_info(&udc_info); + pxa_set_mci_info(&corgi_mci_platform_data); + pxa_set_ficp_info(&corgi_ficp_platform_data); ++ pxa_set_i2c_info(NULL); + + platform_scoop_config = &corgi_pcmcia_config; + + platform_add_devices(devices, ARRAY_SIZE(devices)); + } +--- linux-2.6.26.orig/arch/arm/mach-pxa/poodle.c ++++ linux-2.6.26/arch/arm/mach-pxa/poodle.c +@@ -33,10 +33,11 @@ + + #include <asm/arch/pxa-regs.h> #include <asm/arch/pxa2xx-gpio.h> #include <asm/arch/mmc.h> #include <asm/arch/udc.h> @@ -30,7 +57,11 @@ index 39612cf..510018b 100644 #include <asm/arch/irda.h> #include <asm/arch/poodle.h> #include <asm/arch/pxafb.h> -@@ -387,6 +388,7 @@ static void __init poodle_init(void) + #include <asm/arch/sharpsl.h> + #include <asm/arch/ssp.h> +@@ -386,10 +387,11 @@ static void __init poodle_init(void) + pxa_gpio_mode(POODLE_GPIO_USB_PULLUP | GPIO_OUT); + pxa_gpio_mode(POODLE_GPIO_IR_ON | GPIO_OUT); pxa_set_udc_info(&udc_info); pxa_set_mci_info(&poodle_mci_platform_data); pxa_set_ficp_info(&poodle_ficp_platform_data); @@ -38,11 +69,13 @@ index 39612cf..510018b 100644 platform_scoop_config = &poodle_pcmcia_config; -diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c -index 35616a5..e2bde09 100644 ---- a/arch/arm/mach-pxa/spitz.c -+++ b/arch/arm/mach-pxa/spitz.c -@@ -38,6 +38,7 @@ + ret = platform_add_devices(devices, ARRAY_SIZE(devices)); + if (ret) { +--- linux-2.6.26.orig/arch/arm/mach-pxa/spitz.c ++++ linux-2.6.26/arch/arm/mach-pxa/spitz.c +@@ -36,10 +36,11 @@ + #include <asm/mach/irq.h> + #include <asm/arch/pxa-regs.h> #include <asm/arch/pxa2xx-regs.h> #include <asm/arch/pxa2xx-gpio.h> @@ -50,7 +83,11 @@ index 35616a5..e2bde09 100644 #include <asm/arch/irda.h> #include <asm/arch/mmc.h> #include <asm/arch/ohci.h> -@@ -572,6 +573,7 @@ static void __init common_init(void) + #include <asm/arch/udc.h> + #include <asm/arch/pxafb.h> +@@ -579,10 +580,11 @@ static void __init common_init(void) + pxa_set_mci_info(&spitz_mci_platform_data); + pxa_set_ohci_info(&spitz_ohci_platform_data); pxa_set_ficp_info(&spitz_ficp_platform_data); set_pxa_fb_parent(&spitzssp_device.dev); set_pxa_fb_info(&spitz_pxafb_info); @@ -58,11 +95,5 @@ index 35616a5..e2bde09 100644 } #if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI) --- -1.5.6.2 - - -------------------------------------------------------------------- -List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel -FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php -Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php + static void spitz_bl_set_intensity(int intensity) + { diff --git a/packages/linux/linux-rp_2.6.26.bb b/packages/linux/linux-rp_2.6.26.bb index 012721fd5c..f871bedfee 100644 --- a/packages/linux/linux-rp_2.6.26.bb +++ b/packages/linux/linux-rp_2.6.26.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_qemuarm = "-1" diff --git a/packages/lrzsz/lrzsz_0.12.20.bb b/packages/lrzsz/lrzsz_0.12.20.bb index 0a194f9a05..b44945e35f 100644 --- a/packages/lrzsz/lrzsz_0.12.20.bb +++ b/packages/lrzsz/lrzsz_0.12.20.bb @@ -3,7 +3,7 @@ SECTION = "console/network" PRIORITY = "standard" DESCRIPTION = "Tools for zmodem/xmodem/ymodem file transfer" DEPENDS = "" -PR = "r3" +PR = "r4" SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \ file://autotools.patch;patch=1 \ @@ -18,13 +18,19 @@ do_install() { } pkg_postinst() { - for util in rz rx rb sz sx sb; do + for util in rz rx rb; do update-alternatives --install ${bindir}/$util $util lrz 100 done + for util in sz sx sb; do + update-alternatives --install ${bindir}/$util $util lsz 100 + done } pkg_postrm() { - for util in rz rx rb sz sx sb; do + for util in rz rx rb; do update-alternatives --remove $util ${bindir}/lrz done + for util in sz sx sb; do + update-alternatives --remove $util ${bindir}/lsz + done }
\ No newline at end of file diff --git a/packages/mesa/mesa-dri_6.5.2.bb b/packages/mesa/mesa-dri_6.5.2.bb index 29d169b1a8..c39a3eb5b9 100644 --- a/packages/mesa/mesa-dri_6.5.2.bb +++ b/packages/mesa/mesa-dri_6.5.2.bb @@ -6,7 +6,7 @@ FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" PACKAGES_DYNAMIC = "mesa-dri-driver-*" -PR = "r1" +PR = "r2" DEPENDS += "libdrm" # DRI is useless without the kernel drivers @@ -36,6 +36,6 @@ FILES_${PN}-dbg += "${libdir}/dri/.debug" python populate_packages_prepend () { import re, os.path - do_split_packages(d, root=bb.data.expand('${libdir}/dri', d), file_regex='(.*)_dri\.so', output_pattern='mesa-dri-driver-%s', description='%s DRI driver') + do_split_packages(d, root=bb.data.expand('${libdir}/dri', d), file_regex='(.*)_dri\.so', output_pattern='mesa-dri-driver-%s', description='%s DRI driver', extra_depends='') } diff --git a/packages/mesa/mesa-dri_7.0.3.bb b/packages/mesa/mesa-dri_7.0.3.bb index 87b3dcf9e1..7617b87cd7 100644 --- a/packages/mesa/mesa-dri_7.0.3.bb +++ b/packages/mesa/mesa-dri_7.0.3.bb @@ -7,7 +7,7 @@ FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" PACKAGES_DYNAMIC = "mesa-dri-driver-*" -PR = "r0" +PR = "r1" DEPENDS += "libdrm" # DRI is useless without the kernel drivers @@ -37,6 +37,6 @@ FILES_${PN}-dbg += "${libdir}/dri/.debug" python populate_packages_prepend () { import re, os.path - do_split_packages(d, root=bb.data.expand('${libdir}/dri', d), file_regex='(.*)_dri\.so', output_pattern='mesa-dri-driver-%s', description='%s DRI driver') + do_split_packages(d, root=bb.data.expand('${libdir}/dri', d), file_regex='(.*)_dri\.so', output_pattern='mesa-dri-driver-%s', description='%s DRI driver', extra_depends='') } diff --git a/packages/oneko/.mtn2git_empty b/packages/oneko/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/oneko/.mtn2git_empty diff --git a/packages/oneko/files/.mtn2git_empty b/packages/oneko/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/oneko/files/.mtn2git_empty diff --git a/packages/oneko/files/kill-oneko.desktop b/packages/oneko/files/kill-oneko.desktop new file mode 100644 index 0000000000..54f7f16334 --- /dev/null +++ b/packages/oneko/files/kill-oneko.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Kill oneko +Comment=Kills cute cat chasing mouse cursor +Icon=kill-oneko.png +Exec=killall oneko +Type=Application +Categories=Game;Amusement; +Terminal=false + diff --git a/packages/oneko/files/kill-oneko.png b/packages/oneko/files/kill-oneko.png Binary files differnew file mode 100644 index 0000000000..136265245d --- /dev/null +++ b/packages/oneko/files/kill-oneko.png diff --git a/packages/oneko/files/oneko.desktop b/packages/oneko/files/oneko.desktop new file mode 100644 index 0000000000..b2c78ff325 --- /dev/null +++ b/packages/oneko/files/oneko.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Oneko +Comment=Cute cat chasing around your mouse cursor. +Icon=oneko.png +Exec=/usr/bin/oneko +Type=Application +Categories=Game;Amusement; +Terminal=false + diff --git a/packages/oneko/files/oneko.png b/packages/oneko/files/oneko.png Binary files differnew file mode 100644 index 0000000000..8980e0e990 --- /dev/null +++ b/packages/oneko/files/oneko.png diff --git a/packages/oneko/files/remove-bsd-daemon-logo.patch b/packages/oneko/files/remove-bsd-daemon-logo.patch new file mode 100644 index 0000000000..7c0415593c --- /dev/null +++ b/packages/oneko/files/remove-bsd-daemon-logo.patch @@ -0,0 +1,250 @@ +--- oneko-1.2.sakura.5.orig/cursors/cursor.include ++++ oneko-1.2.sakura.5/cursors/cursor.include +@@ -2,8 +2,6 @@ + #include "mouse_cursor_mask.xbm" + #include "bone_cursor.xbm" + #include "bone_cursor_mask.xbm" +-#include "bsd_cursor.xbm" +-#include "bsd_cursor_mask.xbm" + #include "card_cursor.xbm" + #include "card_cursor_mask.xbm" + #include "petal_cursor.xbm" +--- oneko-1.2.sakura.5.orig/oneko.h ++++ oneko-1.2.sakura.5/oneko.h +@@ -36,7 +36,6 @@ + #include "bitmaps/neko/neko.include" + #include "bitmaps/tora/tora.include" + #include "bitmaps/dog/dog.include" +-#include "bitmaps/bsd/bsd.include" + #include "bitmaps/sakura/sakura.include" + #include "bitmaps/tomoyo/tomoyo.include" + +@@ -44,7 +43,6 @@ + + #include "bitmasks/neko/neko.mask.include" + #include "bitmasks/dog/dog.mask.include" +-#include "bitmasks/bsd/bsd.mask.include" + #include "bitmasks/sakura/sakura.mask.include" + #include "bitmasks/tomoyo/tomoyo.mask.include" + +--- oneko-1.2.sakura.5.orig/oneko.c ++++ oneko-1.2.sakura.5/oneko.c +@@ -33,7 +33,7 @@ + + int Synchronous = False; + /* Types of animals */ +-#define BITMAPTYPES 6 ++#define BITMAPTYPES 5 + typedef struct _AnimalDefaults { + char *name; + int speed, idle, bitmap_width, bitmap_height; +@@ -51,8 +51,6 @@ + mouse_cursor_width,mouse_cursor_height, mouse_cursor_x_hot,mouse_cursor_y_hot }, + { "dog" , 10, 6, 32, 32, 125000L, 0, 0, bone_cursor_bits,bone_cursor_mask_bits, + bone_cursor_width,bone_cursor_height, bone_cursor_x_hot,bone_cursor_y_hot }, +- { "bsd_daemon" , 16, 6, 32, 32, 300000L, 22, 20, bsd_cursor_bits,bsd_cursor_mask_bits, +- bsd_cursor_width,bsd_cursor_height, bsd_cursor_x_hot,bsd_cursor_y_hot }, + { "sakura" , 13, 6, 32, 32, 125000L, 0, 0, card_cursor_bits,card_cursor_mask_bits, + card_cursor_width,card_cursor_height, card_cursor_x_hot,card_cursor_y_hot }, + { "tomoyo" , 10, 6, 32, 32, 125000L, 32, 32, petal_cursor_bits,petal_cursor_mask_bits, +@@ -154,70 +152,70 @@ + + BitmapGCData BitmapGCDataTable[] = + { +- { &Mati2GC, &Mati2Xbm, mati2_bits, mati2_tora_bits, mati2_dog_bits, mati2_bsd_bits, mati2_sakura_bits, mati2_tomoyo_bits, +- &Mati2Msk, mati2_mask_bits, mati2_mask_bits, mati2_dog_mask_bits, mati2_bsd_mask_bits, mati2_sakura_mask_bits, mati2_tomoyo_mask_bits }, +- { &Jare2GC, &Jare2Xbm, jare2_bits, jare2_tora_bits, jare2_dog_bits, jare2_bsd_bits, jare2_sakura_bits, jare2_tomoyo_bits, +- &Jare2Msk, jare2_mask_bits, jare2_mask_bits, jare2_dog_mask_bits, jare2_bsd_mask_bits, jare2_sakura_mask_bits, jare2_tomoyo_mask_bits }, +- { &Kaki1GC, &Kaki1Xbm, kaki1_bits, kaki1_tora_bits, kaki1_dog_bits, kaki1_bsd_bits, kaki1_sakura_bits, kaki1_tomoyo_bits, +- &Kaki1Msk, kaki1_mask_bits, kaki1_mask_bits, kaki1_dog_mask_bits, kaki1_bsd_mask_bits, kaki1_sakura_mask_bits, kaki1_tomoyo_mask_bits }, +- { &Kaki2GC, &Kaki2Xbm, kaki2_bits, kaki2_tora_bits, kaki2_dog_bits, kaki2_bsd_bits, kaki2_sakura_bits, kaki2_tomoyo_bits, +- &Kaki2Msk, kaki2_mask_bits, kaki2_mask_bits, kaki2_dog_mask_bits, kaki2_bsd_mask_bits, kaki2_sakura_mask_bits, kaki2_tomoyo_mask_bits }, +- { &Mati3GC, &Mati3Xbm, mati3_bits, mati3_tora_bits, mati3_dog_bits, mati3_bsd_bits, mati3_sakura_bits, mati3_tomoyo_bits, +- &Mati3Msk, mati3_mask_bits, mati3_mask_bits, mati3_dog_mask_bits, mati3_bsd_mask_bits, mati3_sakura_mask_bits, mati3_tomoyo_mask_bits }, +- { &Sleep1GC, &Sleep1Xbm, sleep1_bits, sleep1_tora_bits, sleep1_dog_bits, sleep1_bsd_bits, sleep1_sakura_bits, sleep1_tomoyo_bits, +- &Sleep1Msk, sleep1_mask_bits, sleep1_mask_bits, sleep1_dog_mask_bits, sleep1_bsd_mask_bits, sleep1_sakura_mask_bits, sleep1_tomoyo_mask_bits }, +- { &Sleep2GC, &Sleep2Xbm, sleep2_bits, sleep2_tora_bits, sleep2_dog_bits, sleep2_bsd_bits, sleep2_sakura_bits, sleep2_tomoyo_bits, +- &Sleep2Msk, sleep2_mask_bits, sleep2_mask_bits, sleep2_dog_mask_bits, sleep2_bsd_mask_bits, sleep2_sakura_mask_bits, sleep2_tomoyo_mask_bits }, +- { &AwakeGC, &AwakeXbm, awake_bits, awake_tora_bits, awake_dog_bits, awake_bsd_bits, awake_sakura_bits, awake_tomoyo_bits, +- &AwakeMsk, awake_mask_bits, awake_mask_bits, awake_dog_mask_bits, awake_bsd_mask_bits, awake_sakura_mask_bits, awake_tomoyo_mask_bits }, +- { &Up1GC, &Up1Xbm, up1_bits, up1_tora_bits, up1_dog_bits, up1_bsd_bits, up1_sakura_bits, up1_tomoyo_bits, +- &Up1Msk, up1_mask_bits, up1_mask_bits, up1_dog_mask_bits, up1_bsd_mask_bits, up1_sakura_mask_bits, up1_tomoyo_mask_bits }, +- { &Up2GC, &Up2Xbm, up2_bits, up2_tora_bits, up2_dog_bits, up2_bsd_bits, up2_sakura_bits, up2_tomoyo_bits, +- &Up2Msk, up2_mask_bits, up2_mask_bits, up2_dog_mask_bits, up2_bsd_mask_bits, up2_sakura_mask_bits, up2_tomoyo_mask_bits }, +- { &Down1GC, &Down1Xbm, down1_bits, down1_tora_bits, down1_dog_bits, down1_bsd_bits, down1_sakura_bits, down1_tomoyo_bits, +- &Down1Msk, down1_mask_bits, down1_mask_bits, down1_dog_mask_bits, down1_bsd_mask_bits, down1_sakura_mask_bits, down1_tomoyo_mask_bits }, +- { &Down2GC, &Down2Xbm, down2_bits, down2_tora_bits, down2_dog_bits, down2_bsd_bits, down2_sakura_bits, down2_tomoyo_bits, +- &Down2Msk, down2_mask_bits, down2_mask_bits, down2_dog_mask_bits, down2_bsd_mask_bits, down2_sakura_mask_bits, down2_tomoyo_mask_bits }, +- { &Left1GC, &Left1Xbm, left1_bits, left1_tora_bits, left1_dog_bits, left1_bsd_bits, left1_sakura_bits, left1_tomoyo_bits, +- &Left1Msk, left1_mask_bits, left1_mask_bits, left1_dog_mask_bits, left1_bsd_mask_bits, left1_sakura_mask_bits, left1_tomoyo_mask_bits }, +- { &Left2GC, &Left2Xbm, left2_bits, left2_tora_bits, left2_dog_bits, left2_bsd_bits, left2_sakura_bits, left2_tomoyo_bits, +- &Left2Msk, left2_mask_bits, left2_mask_bits, left2_dog_mask_bits, left2_bsd_mask_bits, left2_sakura_mask_bits, left2_tomoyo_mask_bits }, +- { &Right1GC, &Right1Xbm, right1_bits, right1_tora_bits, right1_dog_bits, right1_bsd_bits, right1_sakura_bits, right1_tomoyo_bits, +- &Right1Msk, right1_mask_bits, right1_mask_bits,right1_dog_mask_bits, right1_bsd_mask_bits, right1_sakura_mask_bits, right1_tomoyo_mask_bits }, +- { &Right2GC, &Right2Xbm, right2_bits, right2_tora_bits, right2_dog_bits, right2_bsd_bits, right2_sakura_bits, right2_tomoyo_bits, +- &Right2Msk, right2_mask_bits, right2_mask_bits, right2_dog_mask_bits, right2_bsd_mask_bits, right2_sakura_mask_bits, right2_tomoyo_mask_bits }, +- { &UpLeft1GC, &UpLeft1Xbm, upleft1_bits, upleft1_tora_bits, upleft1_dog_bits, upleft1_bsd_bits, upleft1_sakura_bits, upleft1_tomoyo_bits, +- &UpLeft1Msk, upleft1_mask_bits, upleft1_mask_bits, upleft1_dog_mask_bits, upleft1_bsd_mask_bits, upleft1_sakura_mask_bits, upleft1_tomoyo_mask_bits }, +- { &UpLeft2GC, &UpLeft2Xbm, upleft2_bits, upleft2_tora_bits, upleft2_dog_bits, upleft2_bsd_bits, upleft2_sakura_bits, upleft2_tomoyo_bits, +- &UpLeft2Msk, upleft2_mask_bits, upleft2_mask_bits,upleft2_dog_mask_bits, upleft2_bsd_mask_bits, upleft2_sakura_mask_bits, upleft2_tomoyo_mask_bits }, +- { &UpRight1GC, &UpRight1Xbm, upright1_bits, upright1_tora_bits, upright1_dog_bits, upright1_bsd_bits, upright1_sakura_bits, upright1_tomoyo_bits, +- &UpRight1Msk, upright1_mask_bits, upright1_mask_bits,upright1_dog_mask_bits, upright1_bsd_mask_bits, upright1_sakura_mask_bits, upright1_tomoyo_mask_bits }, +- { &UpRight2GC, &UpRight2Xbm, upright2_bits, upright2_tora_bits, upright2_dog_bits, upright2_bsd_bits, upright2_sakura_bits, upright2_tomoyo_bits, +- &UpRight2Msk, upright2_mask_bits, upright2_mask_bits,upright2_dog_mask_bits, upright2_bsd_mask_bits, upright2_sakura_mask_bits, upright2_tomoyo_mask_bits }, +- { &DownLeft1GC, &DownLeft1Xbm, dwleft1_bits, dwleft1_tora_bits, dwleft1_dog_bits, dwleft1_bsd_bits, dwleft1_sakura_bits, dwleft1_tomoyo_bits, +- &DownLeft1Msk, dwleft1_mask_bits, dwleft1_mask_bits, dwleft1_dog_mask_bits, dwleft1_bsd_mask_bits, dwleft1_sakura_mask_bits, dwleft1_tomoyo_mask_bits }, +- { &DownLeft2GC, &DownLeft2Xbm, dwleft2_bits, dwleft2_tora_bits, dwleft2_dog_bits, dwleft2_bsd_bits, dwleft2_sakura_bits, dwleft2_tomoyo_bits, +- &DownLeft2Msk, dwleft2_mask_bits, dwleft2_mask_bits, dwleft2_dog_mask_bits, dwleft2_bsd_mask_bits, dwleft2_sakura_mask_bits, dwleft2_tomoyo_mask_bits }, +- { &DownRight1GC, &DownRight1Xbm, dwright1_bits, dwright1_tora_bits, dwright1_dog_bits, dwright1_bsd_bits, dwright1_sakura_bits, dwright1_tomoyo_bits, +- &DownRight1Msk, dwright1_mask_bits, dwright1_mask_bits, dwright1_dog_mask_bits, dwright1_bsd_mask_bits, dwright1_sakura_mask_bits, dwright1_tomoyo_mask_bits }, +- { &DownRight2GC, &DownRight2Xbm, dwright2_bits, dwright2_tora_bits, dwright2_dog_bits, dwright2_bsd_bits, dwright2_sakura_bits, dwright2_tomoyo_bits, +- &DownRight2Msk, dwright2_mask_bits, dwright2_mask_bits, dwright2_dog_mask_bits, dwright2_bsd_mask_bits, dwright2_sakura_mask_bits, dwright2_tomoyo_mask_bits }, +- { &UpTogi1GC, &UpTogi1Xbm, utogi1_bits, utogi1_tora_bits, utogi1_dog_bits, utogi1_bsd_bits, utogi1_sakura_bits, utogi1_tomoyo_bits, +- &UpTogi1Msk, utogi1_mask_bits, utogi1_mask_bits, utogi1_dog_mask_bits, utogi1_bsd_mask_bits, utogi1_sakura_mask_bits, utogi1_tomoyo_mask_bits }, +- { &UpTogi2GC, &UpTogi2Xbm, utogi2_bits, utogi2_tora_bits, utogi2_dog_bits, utogi2_bsd_bits, utogi2_sakura_bits, utogi2_tomoyo_bits, +- &UpTogi2Msk, utogi2_mask_bits, utogi2_mask_bits, utogi2_dog_mask_bits, utogi2_bsd_mask_bits, utogi2_sakura_mask_bits, utogi2_tomoyo_mask_bits }, +- { &DownTogi1GC, &DownTogi1Xbm, dtogi1_bits, dtogi1_tora_bits, dtogi1_dog_bits, dtogi1_bsd_bits, dtogi1_sakura_bits, dtogi1_tomoyo_bits, +- &DownTogi1Msk, dtogi1_mask_bits, dtogi1_mask_bits, dtogi1_dog_mask_bits, dtogi1_bsd_mask_bits, dtogi1_sakura_mask_bits, dtogi1_tomoyo_mask_bits }, +- { &DownTogi2GC, &DownTogi2Xbm, dtogi2_bits, dtogi2_tora_bits, dtogi2_dog_bits, dtogi2_bsd_bits, dtogi2_sakura_bits, dtogi2_tomoyo_bits, +- &DownTogi2Msk, dtogi2_mask_bits, dtogi2_mask_bits, dtogi2_dog_mask_bits, dtogi2_bsd_mask_bits, dtogi2_sakura_mask_bits, dtogi2_tomoyo_mask_bits }, +- { &LeftTogi1GC, &LeftTogi1Xbm, ltogi1_bits, ltogi1_tora_bits, ltogi1_dog_bits, ltogi1_bsd_bits, ltogi1_sakura_bits, ltogi1_tomoyo_bits, +- &LeftTogi1Msk, ltogi1_mask_bits, ltogi1_mask_bits,ltogi1_dog_mask_bits, ltogi1_bsd_mask_bits, ltogi1_sakura_mask_bits, ltogi1_tomoyo_mask_bits }, +- { &LeftTogi2GC, &LeftTogi2Xbm, ltogi2_bits, ltogi2_tora_bits, ltogi2_dog_bits, ltogi2_bsd_bits, ltogi2_sakura_bits, ltogi2_tomoyo_bits, +- &LeftTogi2Msk, ltogi2_mask_bits, ltogi2_mask_bits,ltogi2_dog_mask_bits, ltogi2_bsd_mask_bits, ltogi2_sakura_mask_bits, ltogi2_tomoyo_mask_bits }, +- { &RightTogi1GC, &RightTogi1Xbm, rtogi1_bits, rtogi1_tora_bits, rtogi1_dog_bits, rtogi1_bsd_bits, rtogi1_sakura_bits, rtogi1_tomoyo_bits, +- &RightTogi1Msk, rtogi1_mask_bits, rtogi1_mask_bits,rtogi1_dog_mask_bits, rtogi1_bsd_mask_bits, rtogi1_sakura_mask_bits, rtogi1_tomoyo_mask_bits }, +- { &RightTogi2GC, &RightTogi2Xbm, rtogi2_bits, rtogi2_tora_bits, rtogi2_dog_bits, rtogi2_bsd_bits, rtogi2_sakura_bits, rtogi2_tomoyo_bits, +- &RightTogi2Msk, rtogi2_mask_bits, rtogi2_mask_bits,rtogi2_dog_mask_bits, rtogi2_bsd_mask_bits, rtogi2_sakura_mask_bits, rtogi2_tomoyo_mask_bits }, ++ { &Mati2GC, &Mati2Xbm, mati2_bits, mati2_tora_bits, mati2_dog_bits, mati2_sakura_bits, mati2_tomoyo_bits, ++ &Mati2Msk, mati2_mask_bits, mati2_mask_bits, mati2_dog_mask_bits, mati2_sakura_mask_bits, mati2_tomoyo_mask_bits }, ++ { &Jare2GC, &Jare2Xbm, jare2_bits, jare2_tora_bits, jare2_dog_bits, jare2_sakura_bits, jare2_tomoyo_bits, ++ &Jare2Msk, jare2_mask_bits, jare2_mask_bits, jare2_dog_mask_bits, jare2_sakura_mask_bits, jare2_tomoyo_mask_bits }, ++ { &Kaki1GC, &Kaki1Xbm, kaki1_bits, kaki1_tora_bits, kaki1_dog_bits, kaki1_sakura_bits, kaki1_tomoyo_bits, ++ &Kaki1Msk, kaki1_mask_bits, kaki1_mask_bits, kaki1_dog_mask_bits, kaki1_sakura_mask_bits, kaki1_tomoyo_mask_bits }, ++ { &Kaki2GC, &Kaki2Xbm, kaki2_bits, kaki2_tora_bits, kaki2_dog_bits, kaki2_sakura_bits, kaki2_tomoyo_bits, ++ &Kaki2Msk, kaki2_mask_bits, kaki2_mask_bits, kaki2_dog_mask_bits, kaki2_sakura_mask_bits, kaki2_tomoyo_mask_bits }, ++ { &Mati3GC, &Mati3Xbm, mati3_bits, mati3_tora_bits, mati3_dog_bits, mati3_sakura_bits, mati3_tomoyo_bits, ++ &Mati3Msk, mati3_mask_bits, mati3_mask_bits, mati3_dog_mask_bits, mati3_sakura_mask_bits, mati3_tomoyo_mask_bits }, ++ { &Sleep1GC, &Sleep1Xbm, sleep1_bits, sleep1_tora_bits, sleep1_dog_bits, sleep1_sakura_bits, sleep1_tomoyo_bits, ++ &Sleep1Msk, sleep1_mask_bits, sleep1_mask_bits, sleep1_dog_mask_bits, sleep1_sakura_mask_bits, sleep1_tomoyo_mask_bits }, ++ { &Sleep2GC, &Sleep2Xbm, sleep2_bits, sleep2_tora_bits, sleep2_dog_bits, sleep2_sakura_bits, sleep2_tomoyo_bits, ++ &Sleep2Msk, sleep2_mask_bits, sleep2_mask_bits, sleep2_dog_mask_bits, sleep2_sakura_mask_bits, sleep2_tomoyo_mask_bits }, ++ { &AwakeGC, &AwakeXbm, awake_bits, awake_tora_bits, awake_dog_bits, awake_sakura_bits, awake_tomoyo_bits, ++ &AwakeMsk, awake_mask_bits, awake_mask_bits, awake_dog_mask_bits, awake_sakura_mask_bits, awake_tomoyo_mask_bits }, ++ { &Up1GC, &Up1Xbm, up1_bits, up1_tora_bits, up1_dog_bits, up1_sakura_bits, up1_tomoyo_bits, ++ &Up1Msk, up1_mask_bits, up1_mask_bits, up1_dog_mask_bits, up1_sakura_mask_bits, up1_tomoyo_mask_bits }, ++ { &Up2GC, &Up2Xbm, up2_bits, up2_tora_bits, up2_dog_bits, up2_sakura_bits, up2_tomoyo_bits, ++ &Up2Msk, up2_mask_bits, up2_mask_bits, up2_dog_mask_bits, up2_sakura_mask_bits, up2_tomoyo_mask_bits }, ++ { &Down1GC, &Down1Xbm, down1_bits, down1_tora_bits, down1_dog_bits, down1_sakura_bits, down1_tomoyo_bits, ++ &Down1Msk, down1_mask_bits, down1_mask_bits, down1_dog_mask_bits, down1_sakura_mask_bits, down1_tomoyo_mask_bits }, ++ { &Down2GC, &Down2Xbm, down2_bits, down2_tora_bits, down2_dog_bits, down2_sakura_bits, down2_tomoyo_bits, ++ &Down2Msk, down2_mask_bits, down2_mask_bits, down2_dog_mask_bits, down2_sakura_mask_bits, down2_tomoyo_mask_bits }, ++ { &Left1GC, &Left1Xbm, left1_bits, left1_tora_bits, left1_dog_bits, left1_sakura_bits, left1_tomoyo_bits, ++ &Left1Msk, left1_mask_bits, left1_mask_bits, left1_dog_mask_bits, left1_sakura_mask_bits, left1_tomoyo_mask_bits }, ++ { &Left2GC, &Left2Xbm, left2_bits, left2_tora_bits, left2_dog_bits, left2_sakura_bits, left2_tomoyo_bits, ++ &Left2Msk, left2_mask_bits, left2_mask_bits, left2_dog_mask_bits, left2_sakura_mask_bits, left2_tomoyo_mask_bits }, ++ { &Right1GC, &Right1Xbm, right1_bits, right1_tora_bits, right1_dog_bits, right1_sakura_bits, right1_tomoyo_bits, ++ &Right1Msk, right1_mask_bits, right1_mask_bits,right1_dog_mask_bits, right1_sakura_mask_bits, right1_tomoyo_mask_bits }, ++ { &Right2GC, &Right2Xbm, right2_bits, right2_tora_bits, right2_dog_bits, right2_sakura_bits, right2_tomoyo_bits, ++ &Right2Msk, right2_mask_bits, right2_mask_bits, right2_dog_mask_bits, right2_sakura_mask_bits, right2_tomoyo_mask_bits }, ++ { &UpLeft1GC, &UpLeft1Xbm, upleft1_bits, upleft1_tora_bits, upleft1_dog_bits, upleft1_sakura_bits, upleft1_tomoyo_bits, ++ &UpLeft1Msk, upleft1_mask_bits, upleft1_mask_bits, upleft1_dog_mask_bits, upleft1_sakura_mask_bits, upleft1_tomoyo_mask_bits }, ++ { &UpLeft2GC, &UpLeft2Xbm, upleft2_bits, upleft2_tora_bits, upleft2_dog_bits, upleft2_sakura_bits, upleft2_tomoyo_bits, ++ &UpLeft2Msk, upleft2_mask_bits, upleft2_mask_bits,upleft2_dog_mask_bits, upleft2_sakura_mask_bits, upleft2_tomoyo_mask_bits }, ++ { &UpRight1GC, &UpRight1Xbm, upright1_bits, upright1_tora_bits, upright1_dog_bits, upright1_sakura_bits, upright1_tomoyo_bits, ++ &UpRight1Msk, upright1_mask_bits, upright1_mask_bits,upright1_dog_mask_bits, upright1_sakura_mask_bits, upright1_tomoyo_mask_bits }, ++ { &UpRight2GC, &UpRight2Xbm, upright2_bits, upright2_tora_bits, upright2_dog_bits, upright2_sakura_bits, upright2_tomoyo_bits, ++ &UpRight2Msk, upright2_mask_bits, upright2_mask_bits,upright2_dog_mask_bits, upright2_sakura_mask_bits, upright2_tomoyo_mask_bits }, ++ { &DownLeft1GC, &DownLeft1Xbm, dwleft1_bits, dwleft1_tora_bits, dwleft1_dog_bits, dwleft1_sakura_bits, dwleft1_tomoyo_bits, ++ &DownLeft1Msk, dwleft1_mask_bits, dwleft1_mask_bits, dwleft1_dog_mask_bits, dwleft1_sakura_mask_bits, dwleft1_tomoyo_mask_bits }, ++ { &DownLeft2GC, &DownLeft2Xbm, dwleft2_bits, dwleft2_tora_bits, dwleft2_dog_bits, dwleft2_sakura_bits, dwleft2_tomoyo_bits, ++ &DownLeft2Msk, dwleft2_mask_bits, dwleft2_mask_bits, dwleft2_dog_mask_bits, dwleft2_sakura_mask_bits, dwleft2_tomoyo_mask_bits }, ++ { &DownRight1GC, &DownRight1Xbm, dwright1_bits, dwright1_tora_bits, dwright1_dog_bits, dwright1_sakura_bits, dwright1_tomoyo_bits, ++ &DownRight1Msk, dwright1_mask_bits, dwright1_mask_bits, dwright1_dog_mask_bits, dwright1_sakura_mask_bits, dwright1_tomoyo_mask_bits }, ++ { &DownRight2GC, &DownRight2Xbm, dwright2_bits, dwright2_tora_bits, dwright2_dog_bits, dwright2_sakura_bits, dwright2_tomoyo_bits, ++ &DownRight2Msk, dwright2_mask_bits, dwright2_mask_bits, dwright2_dog_mask_bits, dwright2_sakura_mask_bits, dwright2_tomoyo_mask_bits }, ++ { &UpTogi1GC, &UpTogi1Xbm, utogi1_bits, utogi1_tora_bits, utogi1_dog_bits, utogi1_sakura_bits, utogi1_tomoyo_bits, ++ &UpTogi1Msk, utogi1_mask_bits, utogi1_mask_bits, utogi1_dog_mask_bits, utogi1_sakura_mask_bits, utogi1_tomoyo_mask_bits }, ++ { &UpTogi2GC, &UpTogi2Xbm, utogi2_bits, utogi2_tora_bits, utogi2_dog_bits, utogi2_sakura_bits, utogi2_tomoyo_bits, ++ &UpTogi2Msk, utogi2_mask_bits, utogi2_mask_bits, utogi2_dog_mask_bits, utogi2_sakura_mask_bits, utogi2_tomoyo_mask_bits }, ++ { &DownTogi1GC, &DownTogi1Xbm, dtogi1_bits, dtogi1_tora_bits, dtogi1_dog_bits, dtogi1_sakura_bits, dtogi1_tomoyo_bits, ++ &DownTogi1Msk, dtogi1_mask_bits, dtogi1_mask_bits, dtogi1_dog_mask_bits, dtogi1_sakura_mask_bits, dtogi1_tomoyo_mask_bits }, ++ { &DownTogi2GC, &DownTogi2Xbm, dtogi2_bits, dtogi2_tora_bits, dtogi2_dog_bits, dtogi2_sakura_bits, dtogi2_tomoyo_bits, ++ &DownTogi2Msk, dtogi2_mask_bits, dtogi2_mask_bits, dtogi2_dog_mask_bits, dtogi2_sakura_mask_bits, dtogi2_tomoyo_mask_bits }, ++ { &LeftTogi1GC, &LeftTogi1Xbm, ltogi1_bits, ltogi1_tora_bits, ltogi1_dog_bits, ltogi1_sakura_bits, ltogi1_tomoyo_bits, ++ &LeftTogi1Msk, ltogi1_mask_bits, ltogi1_mask_bits,ltogi1_dog_mask_bits, ltogi1_sakura_mask_bits, ltogi1_tomoyo_mask_bits }, ++ { &LeftTogi2GC, &LeftTogi2Xbm, ltogi2_bits, ltogi2_tora_bits, ltogi2_dog_bits, ltogi2_sakura_bits, ltogi2_tomoyo_bits, ++ &LeftTogi2Msk, ltogi2_mask_bits, ltogi2_mask_bits,ltogi2_dog_mask_bits, ltogi2_sakura_mask_bits, ltogi2_tomoyo_mask_bits }, ++ { &RightTogi1GC, &RightTogi1Xbm, rtogi1_bits, rtogi1_tora_bits, rtogi1_dog_bits, rtogi1_sakura_bits, rtogi1_tomoyo_bits, ++ &RightTogi1Msk, rtogi1_mask_bits, rtogi1_mask_bits,rtogi1_dog_mask_bits, rtogi1_sakura_mask_bits, rtogi1_tomoyo_mask_bits }, ++ { &RightTogi2GC, &RightTogi2Xbm, rtogi2_bits, rtogi2_tora_bits, rtogi2_dog_bits, rtogi2_sakura_bits, rtogi2_tomoyo_bits, ++ &RightTogi2Msk, rtogi2_mask_bits, rtogi2_mask_bits,rtogi2_dog_mask_bits, rtogi2_sakura_mask_bits, rtogi2_tomoyo_mask_bits }, + { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } + }; + +@@ -1512,8 +1510,6 @@ + } + else { + char *av = argv[ArgCounter] + 1; +- if (strcmp(av, "bsd") == 0) +- av = "bsd_daemon"; + for (loop=0;loop<BITMAPTYPES;loop++) { + if (strcmp(av,AnimalDefaultsDataTable[loop].name)==0) + {NekoMoyou = loop;found=1;} +--- oneko-1.2.sakura.5.orig/oneko.man ++++ oneko-1.2.sakura.5/oneko.man +@@ -4,7 +4,7 @@ + .SH SYNOPSIS + .B oneko + [\fB-help\fP] [\fB-tora\fP] +-[\fB-dog\fP] [\fB-bsd_daemon\fP] [\fB-bsd\fP] ++[\fB-dog\fP] + [\fB-sakura\fP] [\fB-tomoyo\fP] + [\fB-time\fP \fIn\fP] [\fB-speed\fP \fIn\fP] [\fB-idle\fP \fIn\fP] + [\fB-name\fP \fIname\fP] [\fB-towindow\fP] [\fB-toname\fP \fIname\fP] +@@ -22,19 +22,11 @@ + Prints help message on usage. + .TP + .B -tora +-Make cat into "tora-neko". "Tora-neko" means cat wite tiger-like stripe. +-I don't know how to say it in English. ++Make cat into "tora-neko", a cat with tiger-like stripe. + .TP + .B -dog + Runs a dog instead of a cat. + .TP +-.B -bsd_daemon +-Runs a 4.3BSD daemon instead of a cat. +-.TP +-.B -bsd +-Same as +-.B -bsd_daemon. +-.TP + .B -sakura + Runs Sakura Kinomoto instead of a cat. + .TP +--- oneko-1.2.sakura.5.orig/oneko.man.jp ++++ oneko-1.2.sakura.5/oneko.man.jp +@@ -4,7 +4,7 @@ + .SH $@=q<0(J + .B oneko + [\fB-help\fP] [\fB-tora\fP] +-[\fB-dog\fP] [\fB-bsd_daemon\fP] [\fB-bsd\fP] ++[\fB-dog\fP] + [\fB-sakura\fP] [\fB-tomoyo\fP] + [\fB-time\fP \fIn\fP] [\fB-speed\fP \fIn\fP] [\fB-idle\fP \fIn\fP] + [\fB-name\fP \fIname\fP] [\fB-towindow\fP] [\fB-toname\fP \fIname\fP] +@@ -27,13 +27,6 @@ + .B -dog + $@G-$KBe$o$j8$$,Av$j$^$9!#(J + .TP +-.B -bsd_daemon +-$@G-$KBe$o$j(J 4.3BSD $@%G!<%b%s$,Av$j$^$9!#(J +-.TP +-.B -bsd +-.B -bsd_daemon +-$@$KF1$8!#(J +-.TP + .B -sakura + $@G-$KBe$o$jLZG7K\:y$,Av$j$^$9!#(J + .TP diff --git a/packages/oneko/oneko_1.2.sakura.5.bb b/packages/oneko/oneko_1.2.sakura.5.bb new file mode 100644 index 0000000000..efec192cc6 --- /dev/null +++ b/packages/oneko/oneko_1.2.sakura.5.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Small cat chasing mouse cursor" +AUTHOR = "Tatsuya Kato" +HOMEPAGE = "http://www.daidouji.com/oneko/" +SECTION = "x11/applications" +PRIORITY = "optional" +LICENSE = "PD" +DEPENDS = "virtual/libx11 libxext" + +SRC_URI = "http://www.daidouji.com/oneko/distfiles/oneko-${PV}.tar.gz \ + file://oneko.desktop \ + file://kill-oneko.desktop \ + file://oneko.png \ + file://kill-oneko.png \ + file://remove-bsd-daemon-logo.patch;patch=1" + +inherit pkgconfig + +do_compile() { + ${CC} oneko.c -o oneko -lm `pkg-config --cflags --libs x11 xext` \ + -DSHAPE +} + +do_install() { + install -d ${D}/${bindir} + install -d ${D}/${datadir}/applications + install -d ${D}/${datadir}/pixmaps + install -d ${D}/${mandir}/man6 + install -m 0755 ${S}/oneko ${D}/${bindir} + install -m 0644 ${WORKDIR}/*oneko.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/*oneko.desktop ${D}/${datadir}/applications + install -m 0644 ${S}/oneko.man ${D}/${mandir}/man6/oneko.6 +} + + + diff --git a/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb index c3ab1305e6..7f821a8343 100644 --- a/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb +++ b/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Shows the battery/AC status in the Openmoko panel" -DEPENDS = "apmd" -PV = "0.1.0+svn${SVNREV}" +DEPENDS = "apmd libnotify" +PV = "0.1.1+svn${SVNREV}" inherit openmoko-panel-plugin diff --git a/packages/openmoko-projects/illume/module.illume.src b/packages/openmoko-projects/illume/module.illume.src new file mode 100644 index 0000000000..2657ca3dd8 --- /dev/null +++ b/packages/openmoko-projects/illume/module.illume.src @@ -0,0 +1,17 @@ +group "Illume_Cfg" struct { + value "config_version" int: 1; + value "launcher.mode" int: 1; + value "launcher.icon_size" int: 120; + value "launcher.single_click" int: 1; + value "power.auto_suspend" int: 1; + value "power.auto_suspend_delay" int: 1; + value "performance.cache_level" int: 3; + value "performance.fps" int: 25; + value "slipshelf.main_gadget_size" int: 42; + value "slipshelf.extra_gagdet_size" int: 32; + value "sliding.slipshelf.duration" int: 1000; + value "sliding.kbd.duration" int: 1000; + value "sliding.busywin.duration" int: 1000; + value "sliding.layout.duration" int: 0; + value "kbd.use_internal" int: 1; +} diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects/illume_svn.bb index 52150a00dc..5f4127b5ab 100644 --- a/packages/openmoko-projects/illume_svn.bb +++ b/packages/openmoko-projects/illume_svn.bb @@ -2,13 +2,14 @@ DESCRIPTION = "Illume - A mobile UI module for the Enlightenment Window Manager" HOMEPAGE = "http://illume.projects.openmoko.org" AUTHOR = "Rasterman" LICENSE = "MIT/BSD" -DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native" +DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native eet-native" PV = "0.0+svnr${SRCREV}" -PR = "r10" +PR = "r11" SRC_URI = "\ svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=http \ - file://configure-keyboard.patch;patch=1;pnum=0 \ + file://configure-keyboard.patch;patch=1;pnum=0;maxrev=170 \ + file://module.illume.src \ " S = "${WORKDIR}/${PN}" @@ -19,6 +20,7 @@ EXTRA_OECONF = "\ --x-libraries=${STAGING_LIBDIR} \ --enable-simple-x11 \ --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ + --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ \ --enable-illume-keyboard \ " @@ -54,3 +56,7 @@ FILES_${PN} = "\ ${libdir}/enlightenment/modules/*/*/* \ " FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/" + +do_configure_append() { + mv ${WORKDIR}/module.illume.src ${S}/config/illume/ +} diff --git a/packages/otpcalc/.mtn2git_empty b/packages/otpcalc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/otpcalc/.mtn2git_empty diff --git a/packages/otpcalc/otpcalc-0.97/.mtn2git_empty b/packages/otpcalc/otpcalc-0.97/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/otpcalc/otpcalc-0.97/.mtn2git_empty diff --git a/packages/otpcalc/otpcalc-0.97/otpcalc-0.97-badindex.diff b/packages/otpcalc/otpcalc-0.97/otpcalc-0.97-badindex.diff new file mode 100644 index 0000000000..92ccf0f03a --- /dev/null +++ b/packages/otpcalc/otpcalc-0.97/otpcalc-0.97-badindex.diff @@ -0,0 +1,15 @@ +upstream: all patches sent upstream to Anthony D. Urso <anthonyu@killa.net> by Yuri Bushmelev. +status: pending +origin: http://packages.gentoo.org/package/sys-auth/otpcalc?full_cat + +--- otpCalc-0.97.orig/callbacks.c 2004-11-24 05:57:45.000000000 +0000 ++++ otpCalc-0.97/callbacks.c 2006-02-24 22:36:56.602831704 +0000 +@@ -81,7 +81,7 @@ + void calculate(void) + { + +- void (*hashes[4])(); ++ void (*hashes[5])(); + + gchar *challenge, *passwd, *message, *response; + struct tokens *set; diff --git a/packages/otpcalc/otpcalc-0.97/otpcalc-0.97-gtk2-gentoo.patch b/packages/otpcalc/otpcalc-0.97/otpcalc-0.97-gtk2-gentoo.patch new file mode 100644 index 0000000000..4157374cd3 --- /dev/null +++ b/packages/otpcalc/otpcalc-0.97/otpcalc-0.97-gtk2-gentoo.patch @@ -0,0 +1,74 @@ +upstream: all patches sent upstream to Anthony D. Urso <anthonyu@killa.net> by Yuri Bushmelev. +status: pending +origin: http://packages.gentoo.org/package/sys-auth/otpcalc?full_cat + +--- otpCalc-0.97-orig/Makefile.in 2004-11-24 07:44:12.000000000 +0100 ++++ otpCalc-0.97/Makefile.in 2007-12-26 00:38:52.000000000 +0100 +@@ -3,8 +3,8 @@ + + CC = @CC@ + DEFS = -DVERSION=\"$(VER)\" @DEFS@ +-CFLAGS = -s -O3 -Wall -pipe `gtk-config --cflags` +-LIBS = `gtk-config --libs` @LIBS@ ++CFLAGS += -Wall -pipe `pkg-config --cflags gtk+-2.0` ++LIBS = `pkg-config --libs gtk+-2.0` @LIBS@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ +--- otpCalc-0.97-orig/callbacks.c 2004-11-24 06:57:45.000000000 +0100 ++++ otpCalc-0.97/callbacks.c 2007-12-26 00:38:52.000000000 +0100 +@@ -236,7 +236,7 @@ + } + + +-void focus(GtkWidget *widget, gpointer data) ++gboolean focus(GtkWidget *widget, GdkEvent *event, gpointer data) + { + + static GdkAtom targets; +@@ -244,12 +244,12 @@ + + + if (!autopaste) +- return; ++ return FALSE; + + targets = gdk_atom_intern("STRING", FALSE); + + gtk_selection_convert(widget, GDK_SELECTION_PRIMARY, targets, + GDK_CURRENT_TIME); + +- ++ return FALSE; + } +--- otpCalc-0.97-orig/gui.c 2004-11-24 07:46:53.000000000 +0100 ++++ otpCalc-0.97/gui.c 2007-12-26 00:38:52.000000000 +0100 +@@ -29,7 +29,7 @@ + GtkWidget *te_response; + + unsigned short hash; +-unsigned short newline = 1; ++unsigned short newline = 0; + unsigned short autopaste = 1; + + int main(int argc, char *argv[]) +@@ -147,7 +147,7 @@ + + /* Setup the menu bar... */ + mb_top = gtk_menu_bar_new(); +- gtk_menu_bar_set_shadow_type(GTK_MENU_BAR(mb_top), GTK_SHADOW_NONE); ++ /*gtk_menu_bar_set_shadow_type(GTK_MENU_BAR(mb_top), GTK_SHADOW_NONE);*/ + gtk_table_attach(GTK_TABLE(ta_top), mb_top, 0, 3, 0, 1, + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); +--- otpCalc-0.97-orig/utility.c 2004-11-24 06:59:09.000000000 +0100 ++++ otpCalc-0.97/utility.c 2007-12-26 00:38:52.000000000 +0100 +@@ -422,7 +422,7 @@ + words[extract(message, 33, 11)], + words[extract(message, 44, 11)], + words[extract(message, 55, 11)], +- (newline == 1) ? "\n" : NULL); ++ (newline == 1) ? "\n" : ""); + + return response; + diff --git a/packages/otpcalc/otpcalc-0.97/otpcalc-crypto-proto.diff b/packages/otpcalc/otpcalc-0.97/otpcalc-crypto-proto.diff new file mode 100644 index 0000000000..ff51173255 --- /dev/null +++ b/packages/otpcalc/otpcalc-0.97/otpcalc-crypto-proto.diff @@ -0,0 +1,16 @@ +upstream: all patches sent upstream to Anthony D. Urso <anthonyu@killa.net> by Yuri Bushmelev. +status: pending +origin: http://packages.gentoo.org/package/sys-auth/otpcalc?full_cat + +diff -urN otpCalc-0.97.orig/crypto.h otpCalc-0.97/crypto.h +--- otpCalc-0.97.orig/crypto.h 2001-05-12 02:04:54.000000000 -0400 ++++ otpCalc-0.97/crypto.h 2006-03-21 17:24:54.000000000 -0500 +@@ -1,4 +1,4 @@ +-void md4lite(char *, size_t); +-void md5lite(char *, size_t); +-void rmd160lite(char *, size_t); +-void sha1lite(char *, size_t); ++void md4lite(char *message, unsigned int len); ++void md5lite(char *message, unsigned int len); ++void rmd160lite(char *message, unsigned int len); ++void sha1lite(char *message, unsigned int len); diff --git a/packages/otpcalc/otpcalc-0.97/otpcalc-man-table-format.diff b/packages/otpcalc/otpcalc-0.97/otpcalc-man-table-format.diff new file mode 100644 index 0000000000..bbe6e19e61 --- /dev/null +++ b/packages/otpcalc/otpcalc-0.97/otpcalc-man-table-format.diff @@ -0,0 +1,37 @@ +upstream: all patches sent upstream to Anthony D. Urso <anthonyu@killa.net> by Yuri Bushmelev. +status: pending +origin: http://packages.gentoo.org/package/sys-auth/otpcalc?full_cat + +--- otpCalc-0.97.orig/otpCalc.man 2005-04-29 23:17:06.000000000 +0100 ++++ otpCalc-0.97/otpCalc.man 2005-04-29 23:19:03.000000000 +0100 +@@ -24,18 +24,20 @@ + the Challenge input: + .IP + .TS +-s/key MD4 +-.br +-otp-md4 MD4 +-.br +-otp-md5 MD5 +-.br +-otp-rmd160 RIPEMD-160 +-.br +-otp-sha1 SHA1 +-.br ++allbox tab(#); ++cb l ++cb l ++cb l ++cb l ++cb l. ++s/key#MD4 ++otp-md4#MD4 ++otp-md5#MD5 ++otp-rmd160#RIPEMD-160 ++otp-sha1#SHA1 + .TE + .LP ++.LP + In the absence of a prefix, the default hash, specified in the Settings menu, + is used. + .SH "SEE ALSO" diff --git a/packages/otpcalc/otpcalc_0.97.bb b/packages/otpcalc/otpcalc_0.97.bb new file mode 100644 index 0000000000..baeddd91a9 --- /dev/null +++ b/packages/otpcalc/otpcalc_0.97.bb @@ -0,0 +1,26 @@ +HOMEPAGE = "http://killa.net/infosec/otpCalc/" +DESCRIPTION = "An OTP and S/Key calculator for X" +SECTION = "x11" +LICENSE = "GPL" +DEPENDS = "gtk+ openssl" +PR = "r1" + +S = "${WORKDIR}/otpCalc-${PV}" + +SRC_URI = "http://killa.net/infosec/otpCalc/otpCalc-${PV}.tar.gz \ + file://otpcalc-man-table-format.diff;patch=1 \ + file://otpcalc-0.97-badindex.diff;patch=1 \ + file://otpcalc-crypto-proto.diff;patch=1 \ + file://otpcalc-0.97-gtk2-gentoo.patch;patch=1 \ + " + +inherit autotools pkgconfig + +do_install() { + install -d ${D}${bindir} + install -d ${D}${mandir}/man1 + cat ${S}/otpCalc.man | sed -e "s/VERSION/${PV}/g" | gzip -c9 > ${D}${mandir}/man1/otpCalc.1.gz + install -m 755 otpCalc ${D}${bindir} +} + + diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index 95a7bd8e0b..a0ec692095 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -1,16 +1,11 @@ -######################################################################################################################## -### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Mon Jul 21 17:03:43 2008 -### -### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy -### -### Warning: Manual edits will be lost! -### -######################################################################################################################## +# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file. +# Generator: './generate-manifest-2.5.py' Version 20080722 (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de> +# Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy -PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-doctest python-tests python-core-dbg python-resource python-devel python-difflib python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " +PROVIDES+="python-profile python-threading python-distutils python-doctest python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " -PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-doctest python-tests python-core-dbg python-resource python-devel python-difflib python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " +PACKAGES="python-profile python-threading python-distutils python-doctest python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " DESCRIPTION_python-profile="Python Basic Profiling Support" PR_python-profile="ml0" @@ -27,10 +22,10 @@ PR_python-distutils="ml0" RDEPENDS_python-distutils="python-core" FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils " -DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" -PR_python-textutils="ml0" -RDEPENDS_python-textutils="python-core python-io python-re python-stringold" -FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* " +DESCRIPTION_python-doctest="Python framework for running examples in docstrings." +PR_python-doctest="ml0" +RDEPENDS_python-doctest="python-core python-lang python-io python-re python-unittest python-debugger python-difflib" +FILES_python-doctest="${libdir}/python2.5/doctest.* " DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" PR_python-codecs="ml0" @@ -97,11 +92,6 @@ PR_python-image="ml0" RDEPENDS_python-image="python-core" FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so " -DESCRIPTION_python-doctest="Python framework for running examples in docstrings." -PR_python-doctest="ml0" -RDEPENDS_python-doctest="python-core python-lang python-io python-re python-unittest python-debugger python-difflib" -FILES_python-doctest="${libdir}/python2.5/doctest.* " - DESCRIPTION_python-tests="Python Tests" PR_python-tests="ml0" RDEPENDS_python-tests="python-core" @@ -132,6 +122,11 @@ PR_python-math="ml0" RDEPENDS_python-math="python-core" FILES_python-math="${libdir}/python2.5/lib-dynload/cmath.so ${libdir}/python2.5/lib-dynload/math.so ${libdir}/python2.5/lib-dynload/_random.so ${libdir}/python2.5/random.* ${libdir}/python2.5/sets.* " +DESCRIPTION_python-syslog="Python's Syslog Interface" +PR_python-syslog="ml0" +RDEPENDS_python-syslog="python-core" +FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so " + DESCRIPTION_python-hotshot="Python Hotshot Profiler" PR_python-hotshot="ml0" RDEPENDS_python-hotshot="python-core" @@ -142,10 +137,10 @@ PR_python-unixadmin="ml0" RDEPENDS_python-unixadmin="python-core" FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* " -DESCRIPTION_python-syslog="Python's Syslog Interface" -PR_python-syslog="ml0" -RDEPENDS_python-syslog="python-core" -FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so " +DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" +PR_python-textutils="ml0" +RDEPENDS_python-textutils="python-core python-io python-re python-stringold" +FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* " DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings" PR_python-tkinter="ml0" @@ -208,8 +203,8 @@ RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.5/pydoc.* " DESCRIPTION_python-logging="Python Logging Support" -PR_python-logging="ml0" -RDEPENDS_python-logging="python-core python-io python-lang python-stringold" +PR_python-logging="ml1" +RDEPENDS_python-logging="python-core python-io python-lang python-pickle python-stringold" FILES_python-logging="${libdir}/python2.5/logging " DESCRIPTION_python-mailbox="Python Mailbox Format Support" diff --git a/packages/python/python-dbus_0.82.4.bb b/packages/python/python-dbus_0.83.0.bb index 6940adf223..4ccecc0aa1 100644 --- a/packages/python/python-dbus_0.82.4.bb +++ b/packages/python/python-dbus_0.83.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus" LICENSE = "MIT" DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" RDEPENDS = "python-io python-logging python-stringold python-threading python-xml" -PR = "ml4" +PR = "ml0" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz" S = "${WORKDIR}/dbus-python-${PV}" diff --git a/packages/python/python-evas_cvs.bb b/packages/python/python-evas_cvs.bb index 57e28b28ed..92f4466a24 100644 --- a/packages/python/python-evas_cvs.bb +++ b/packages/python/python-evas_cvs.bb @@ -3,10 +3,6 @@ DEPENDS += "evas" PV = "0.2.1+cvs${SRCDATE}" PR = "r0" -do_compile_prepend() { - touch include/evas/__init__.py -} - do_stage() { distutils_stage_all } diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb index b47ed0b7cf..707c0f562e 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 = "ml7" +PR = "ml8" PYTHON_MAJMIN = "2.5" diff --git a/packages/qmake/files/0001-fix-mkspecs.patch b/packages/qmake/files/0001-fix-mkspecs.patch index e0ebe512c8..c6f55906bc 100644 --- a/packages/qmake/files/0001-fix-mkspecs.patch +++ b/packages/qmake/files/0001-fix-mkspecs.patch @@ -1,25 +1,13 @@ -From aa0377910cfd8d0fce6bdc9355994a4e267b1696 Mon Sep 17 00:00:00 2001 -From: Michael Krelin <hacker@klever.net> -Date: Sat, 2 Jun 2007 16:39:58 +0200 -Subject: [PATCH] fix mkspecs - ---- - mkspecs/common/g++.conf | 18 +++++++++--------- - mkspecs/common/linux.conf | 26 +++++++++++++------------- - 2 files changed, 22 insertions(+), 22 deletions(-) - -Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf -=================================================================== ---- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/g++.conf 2007-12-04 18:07:53.000000000 +0100 -+++ qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf 2007-12-26 19:47:02.000000000 +0100 +--- /tmp/g++.conf 2008-07-08 10:32:18.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.0/mkspecs/common/g++.conf 2008-07-08 10:34:15.000000000 +0200 @@ -2,12 +2,12 @@ # qmake configuration for common gcc # -QMAKE_CC = gcc -QMAKE_CFLAGS += -pipe -+QMAKE_CC = $(OE_QMAKE_CC) -+QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) ++QMAKE_CC = $(OE_QMAKE_CC) ++QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w @@ -34,8 +22,8 @@ Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf -QMAKE_CXX = g++ -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS -+QMAKE_CXX = $(OE_QMAKE_CXX) -+QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) ++QMAKE_CXX = $(OE_QMAKE_CXX) ++QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF @@ -46,26 +34,24 @@ Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf -QMAKE_LINK = g++ -QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS += -+QMAKE_LINK = $(OE_QMAKE_LINK) -+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) -+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) ++QMAKE_LINK = $(OE_QMAKE_LINK) ++QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) ++QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) QMAKE_LFLAGS_RELEASE += QMAKE_LFLAGS_DEBUG += QMAKE_LFLAGS_APP += -@@ -40,7 +40,7 @@ - QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB +@@ -41,7 +41,7 @@ QMAKE_LFLAGS_SONAME += -Wl,-soname, QMAKE_LFLAGS_THREAD += + QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined -QMAKE_RPATH = -Wl,-rpath, -+QMAKE_RPATH = -Wl,-rpath-link, ++QMAKE_RPATH = -Wl,-rpath-link, QMAKE_PCH_OUTPUT_EXT = .gch -Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf -=================================================================== ---- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/linux.conf 2007-12-04 18:07:53.000000000 +0100 -+++ qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf 2007-12-26 19:47:02.000000000 +0100 -@@ -7,26 +7,26 @@ +--- /tmp/linux.conf 2008-07-08 10:32:18.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.0/mkspecs/common/linux.conf 2008-07-08 10:38:37.000000000 +0200 +@@ -7,26 +7,27 @@ QMAKE_INCDIR = QMAKE_LIBDIR = @@ -75,12 +61,13 @@ Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] -QMAKE_INCDIR_OPENGL = /usr/X11R6/include -QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -+QMAKE_INCDIR_X11 = -+QMAKE_LIBDIR_X11 = ++QMAKE_INCDIR_X11 = ++QMAKE_LIBDIR_X11 = +QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) +QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) -+QMAKE_INCDIR_OPENGL = -+QMAKE_LIBDIR_OPENGL = ++QMAKE_INCDIR_OPENGL = ++QMAKE_LIBDIR_OPENGL = ++ QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl @@ -100,10 +87,10 @@ Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf -QMAKE_AR = ar cqs +QMAKE_AR = $(OE_QMAKE_AR) cqs + QMAKE_OBJCOPY = objcopy QMAKE_RANLIB = - QMAKE_TAR = tar -cf -@@ -38,11 +38,11 @@ +@@ -39,7 +40,7 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir @@ -112,35 +99,3 @@ Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf QMAKE_STRIPFLAGS_LIB += --strip-unneeded QMAKE_CHK_DIR_EXISTS = test -d QMAKE_MKDIR = mkdir -p - QMAKE_INSTALL_FILE = install -m 644 -p - QMAKE_INSTALL_PROGRAM = install -m 755 -p - --include(unix.conf) -\ No newline at end of file -+include(unix.conf) -Index: qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf -=================================================================== ---- qtopia-core-opensource-src-4.3.3.orig/mkspecs/linux-g++/qmake.conf 2007-12-04 18:07:53.000000000 +0100 -+++ qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf 2007-12-26 19:47:02.000000000 +0100 -@@ -5,7 +5,7 @@ - MAKEFILE_GENERATOR = UNIX - TEMPLATE = app - CONFIG += qt warn_on release incremental link_prl --QT += core gui -+QT += core gui $$(OE_QMAKE_EXTRA_MODULES) - QMAKE_INCREMENTAL_STYLE = sublib - - include(../common/g++.conf) -Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/unix.conf -=================================================================== ---- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/unix.conf 2007-12-26 19:48:20.000000000 +0100 -+++ qtopia-core-opensource-src-4.3.3/mkspecs/common/unix.conf 2007-12-26 19:49:50.000000000 +0100 -@@ -10,6 +10,8 @@ - QMAKE_YACC_HEADER = $base.tab.h - QMAKE_YACC_SOURCE = $base.tab.c - -+QMAKE_RCC = $$(OE_QMAKE_RCC) -+ - QMAKE_SEPARATE_DEBUG_INFO = (test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; targ=`basename $(TARGET)`; objcopy --only-keep-debug \"\$\$targ\" \"\$\$targ.debug\" && objcopy --strip-debug \"\$\$targ\" && objcopy --add-gnu-debuglink=\"\$\$targ.debug\" \"\$\$targ\" && chmod -x \"\$\$targ.debug\" ) ; - - QMAKE_INSTALL_SEPARATE_DEBUG_INFO = test -z "$(DESTDIR)" || cd \"$(DESTDIR)\" ; $(INSTALL_FILE) `basename $(TARGET)`.debug $(INSTALL_ROOT)/\$\$target_path/ diff --git a/packages/qmake/files/qt-config.patch b/packages/qmake/files/qt-config.patch index b2d86de2c5..3aa041aa51 100644 --- a/packages/qmake/files/qt-config.patch +++ b/packages/qmake/files/qt-config.patch @@ -1,20 +1,14 @@ -Allow to set a qt.conf from the outside using the environment. This allows -to inject new prefixes and other paths into qmake. This is needed when using -the same qmake binary to build qt/x11 and qt/embedded - -Index: qtopia-core-opensource-src-4.3.3/src/corelib/global/qlibraryinfo.cpp -=================================================================== ---- qtopia-core-opensource-src-4.3.3.orig/src/corelib/global/qlibraryinfo.cpp 2007-12-25 00:55:32.000000000 +0100 -+++ qtopia-core-opensource-src-4.3.3/src/corelib/global/qlibraryinfo.cpp 2007-12-25 01:20:18.000000000 +0100 -@@ -42,6 +42,7 @@ - #include "qpointer.h" - #ifdef QT_BUILD_QMAKE +--- /tmp/qlibraryinfo.cpp 2008-08-02 17:16:41.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.1/src/corelib/global/qlibraryinfo.cpp 2008-08-02 17:17:42.000000000 +0200 +@@ -47,6 +47,7 @@ + QT_BEGIN_NAMESPACE extern QString qmake_libraryInfoFile(); + QT_END_NAMESPACE +#include <stdlib.h> #else # include "qcoreapplication.h" #endif -@@ -107,6 +108,10 @@ +@@ -113,6 +114,10 @@ #ifdef QT_BUILD_QMAKE if(!QFile::exists(qtconfig)) qtconfig = qmake_libraryInfoFile(); diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc index f7bdd7836b..642adf874a 100644 --- a/packages/qmake/qmake2-native.inc +++ b/packages/qmake/qmake2-native.inc @@ -3,13 +3,15 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" LICENSE = "GPL" -PR = "r2" +PR = "r3" -QTVER = "qtopia-core-opensource-src-${QTVERSION}" +# We call 'moc' during the build +DEPENDS = "uicmoc4-native" -SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.gz \ +QTVER = "qt-embedded-linux-opensource-src-${QTVERSION}" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.bz2 \ file://0001-fix-mkspecs.patch;patch=1 \ - file://0008-backport-qt-lib-infix.patch;patch=1 \ file://qt-config.patch;patch=1 \ file://use-lflags-last.patch;patch=1 \ file://linux-oe-qmake.conf" @@ -23,6 +25,8 @@ export QTDIR = "${S}" EXTRA_OEMAKE = "-e" do_configure() { + # Make sure we regenerate all Makefiles + find ${S} -name "Makefile" | xargs rm # Install the OE build templates for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ do @@ -43,8 +47,9 @@ do_configure() { export OE_QMAKE_LINK="${CCLD}" export OE_QMAKE_AR="${AR}" export OE_QMAKE_STRIP="${STRIP}" - export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic" - export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc" + export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic4" + export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc4" + export QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc4" export OE_QMAKE_RCC="non-existant" export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" export OE_QMAKE_RPATH="-Wl,-rpath-link," diff --git a/packages/qmake/qmake2-native_2.10a.bb b/packages/qmake/qmake2-native_2.10a.bb index 0e1aa2c61e..42b24105d8 100644 --- a/packages/qmake/qmake2-native_2.10a.bb +++ b/packages/qmake/qmake2-native_2.10a.bb @@ -1,9 +1,10 @@ -QTVERSION="4.3.3" +QTVERSION="4.4.1" FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native" -require ${PN}.inc inherit cross +require ${PN}.inc + do_install() { : } diff --git a/packages/qt4/qt-embedded-4.4.1/.mtn2git_empty b/packages/qt4/qt-embedded-4.4.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qt4/qt-embedded-4.4.1/.mtn2git_empty diff --git a/packages/qt4/qt4-x11-free-4.4.0/0001-cross-compile.patch b/packages/qt4/qt-embedded-4.4.1/0001-cross-compile.patch index 310f1931bc..f20576b45e 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/0001-cross-compile.patch +++ b/packages/qt4/qt-embedded-4.4.1/0001-cross-compile.patch @@ -1,6 +1,6 @@ ---- /tmp/configure 2008-07-08 10:01:36.000000000 +0200 -+++ qt-embedded-linux-opensource-src-4.4.0/configure 2008-07-08 10:23:04.000000000 +0200 -@@ -762,7 +762,7 @@ +--- /tmp/configure 2008-08-01 20:59:48.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.1/configure 2008-08-01 21:02:05.000000000 +0200 +@@ -765,7 +765,7 @@ UNKNOWN_ARG=yes fi ;; @@ -9,7 +9,7 @@ VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL="$1" -@@ -1179,7 +1179,10 @@ +@@ -1182,7 +1182,10 @@ xplatform) XPLATFORM="$VAL" ;; @@ -21,12 +21,12 @@ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_DEBUG_RELEASE="$VAL" else -@@ -2417,6 +2420,8 @@ - ARCH=$HOST_ARCH +@@ -2437,6 +2440,8 @@ + CFG_ARCH=$CFG_HOST_ARCH fi -+ARCH="$CROSSARCH" ++CFG_ARCH="$CROSSARCH" + - if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then + if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$ARCH' is supported" + echo " '$CFG_ARCH' is supported" diff --git a/packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch b/packages/qt4/qt-embedded-4.4.1/0003-no-tools.patch index bb36444f80..bb36444f80 100644 --- a/packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch +++ b/packages/qt4/qt-embedded-4.4.1/0003-no-tools.patch diff --git a/packages/qt4/qt-embedded-4.4.0/0004-no-qmake.patch b/packages/qt4/qt-embedded-4.4.1/0004-no-qmake.patch index 28f8d3ad9d..28f8d3ad9d 100644 --- a/packages/qt4/qt-embedded-4.4.0/0004-no-qmake.patch +++ b/packages/qt4/qt-embedded-4.4.1/0004-no-qmake.patch diff --git a/packages/qt4/qt-embedded-4.4.0/0005-fix-mkspecs.patch b/packages/qt4/qt-embedded-4.4.1/0005-fix-mkspecs.patch index c6f55906bc..c6f55906bc 100644 --- a/packages/qt4/qt-embedded-4.4.0/0005-fix-mkspecs.patch +++ b/packages/qt4/qt-embedded-4.4.1/0005-fix-mkspecs.patch diff --git a/packages/qt4/qt-embedded-4.4.0/0006-freetype-host-includes.patch b/packages/qt4/qt-embedded-4.4.1/0006-freetype-host-includes.patch index cc8e115fee..cc8e115fee 100644 --- a/packages/qt4/qt-embedded-4.4.0/0006-freetype-host-includes.patch +++ b/packages/qt4/qt-embedded-4.4.1/0006-freetype-host-includes.patch diff --git a/packages/qt4/qt-embedded-4.4.0/0007-openssl-host-includes.patch b/packages/qt4/qt-embedded-4.4.1/0007-openssl-host-includes.patch index 35b71d9694..35b71d9694 100644 --- a/packages/qt4/qt-embedded-4.4.0/0007-openssl-host-includes.patch +++ b/packages/qt4/qt-embedded-4.4.1/0007-openssl-host-includes.patch diff --git a/packages/qt4/qt-embedded-4.4.0/allow-configure-plugins.patch b/packages/qt4/qt-embedded-4.4.1/allow-configure-plugins.patch index 601f2fc369..601f2fc369 100644 --- a/packages/qt4/qt-embedded-4.4.0/allow-configure-plugins.patch +++ b/packages/qt4/qt-embedded-4.4.1/allow-configure-plugins.patch diff --git a/packages/qt4/qt-embedded-4.4.0/build-tools.patch b/packages/qt4/qt-embedded-4.4.1/build-tools.patch index 54ad666374..54ad666374 100644 --- a/packages/qt4/qt-embedded-4.4.0/build-tools.patch +++ b/packages/qt4/qt-embedded-4.4.1/build-tools.patch diff --git a/packages/qt4/qt-embedded-4.4.0/linux-oe-qmake.conf b/packages/qt4/qt-embedded-4.4.1/linux-oe-qmake.conf index fc5ac6dc5c..fc5ac6dc5c 100644 --- a/packages/qt4/qt-embedded-4.4.0/linux-oe-qmake.conf +++ b/packages/qt4/qt-embedded-4.4.1/linux-oe-qmake.conf diff --git a/packages/qt4/qt-embedded-4.4.0/qconfig-oe.h b/packages/qt4/qt-embedded-4.4.1/qconfig-oe.h index f820c01da8..f820c01da8 100644 --- a/packages/qt4/qt-embedded-4.4.0/qconfig-oe.h +++ b/packages/qt4/qt-embedded-4.4.1/qconfig-oe.h diff --git a/packages/qt4/qt-embedded_4.4.0.bb b/packages/qt4/qt-embedded_4.4.1.bb index f83b2516d7..70a461d2d2 100644 --- a/packages/qt4/qt-embedded_4.4.0.bb +++ b/packages/qt4/qt-embedded_4.4.1.bb @@ -3,7 +3,7 @@ require qtopia-core.inc PROVIDES += "qtopia-core" RPROVIDES_${PN} = "qtopia-core" -PR = "r4" +PR = "r0" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ file://qconfig-oe.h \ diff --git a/packages/qt4/qt4-x11-free-4.4.1/.mtn2git_empty b/packages/qt4/qt4-x11-free-4.4.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.4.1/.mtn2git_empty diff --git a/packages/qt4/qt-embedded-4.4.0/0001-cross-compile.patch b/packages/qt4/qt4-x11-free-4.4.1/0001-cross-compile.patch index 310f1931bc..f20576b45e 100644 --- a/packages/qt4/qt-embedded-4.4.0/0001-cross-compile.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/0001-cross-compile.patch @@ -1,6 +1,6 @@ ---- /tmp/configure 2008-07-08 10:01:36.000000000 +0200 -+++ qt-embedded-linux-opensource-src-4.4.0/configure 2008-07-08 10:23:04.000000000 +0200 -@@ -762,7 +762,7 @@ +--- /tmp/configure 2008-08-01 20:59:48.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.1/configure 2008-08-01 21:02:05.000000000 +0200 +@@ -765,7 +765,7 @@ UNKNOWN_ARG=yes fi ;; @@ -9,7 +9,7 @@ VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL="$1" -@@ -1179,7 +1179,10 @@ +@@ -1182,7 +1182,10 @@ xplatform) XPLATFORM="$VAL" ;; @@ -21,12 +21,12 @@ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_DEBUG_RELEASE="$VAL" else -@@ -2417,6 +2420,8 @@ - ARCH=$HOST_ARCH +@@ -2437,6 +2440,8 @@ + CFG_ARCH=$CFG_HOST_ARCH fi -+ARCH="$CROSSARCH" ++CFG_ARCH="$CROSSARCH" + - if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then + if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$ARCH' is supported" + echo " '$CFG_ARCH' is supported" diff --git a/packages/qt4/qt4-x11-free-4.4.0/0002-fix-resinit-declaration.patch b/packages/qt4/qt4-x11-free-4.4.1/0002-fix-resinit-declaration.patch index e479a64a2b..e479a64a2b 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/0002-fix-resinit-declaration.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/0002-fix-resinit-declaration.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/0003-no-tools.patch b/packages/qt4/qt4-x11-free-4.4.1/0003-no-tools.patch index bb36444f80..bb36444f80 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/0003-no-tools.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/0003-no-tools.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/0004-no-qmake.patch b/packages/qt4/qt4-x11-free-4.4.1/0004-no-qmake.patch index 28f8d3ad9d..28f8d3ad9d 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/0004-no-qmake.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/0004-no-qmake.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/0005-fix-mkspecs.patch b/packages/qt4/qt4-x11-free-4.4.1/0005-fix-mkspecs.patch index c6f55906bc..c6f55906bc 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/0005-fix-mkspecs.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/0005-fix-mkspecs.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/0006-freetype-host-includes.patch b/packages/qt4/qt4-x11-free-4.4.1/0006-freetype-host-includes.patch index cc8e115fee..cc8e115fee 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/0006-freetype-host-includes.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/0006-freetype-host-includes.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/0007-openssl-host-includes.patch b/packages/qt4/qt4-x11-free-4.4.1/0007-openssl-host-includes.patch index 35b71d9694..35b71d9694 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/0007-openssl-host-includes.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/0007-openssl-host-includes.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/allow-configure-plugins.patch b/packages/qt4/qt4-x11-free-4.4.1/allow-configure-plugins.patch index 601f2fc369..601f2fc369 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/allow-configure-plugins.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/allow-configure-plugins.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/build-tools.patch b/packages/qt4/qt4-x11-free-4.4.1/build-tools.patch index 54ad666374..54ad666374 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/build-tools.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/build-tools.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/linux-oe-qmake.conf b/packages/qt4/qt4-x11-free-4.4.1/linux-oe-qmake.conf index fc5ac6dc5c..fc5ac6dc5c 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/linux-oe-qmake.conf +++ b/packages/qt4/qt4-x11-free-4.4.1/linux-oe-qmake.conf diff --git a/packages/qt4/qt4-x11-free-4.4.0/qconfig-oe.h b/packages/qt4/qt4-x11-free-4.4.1/qconfig-oe.h index f820c01da8..f820c01da8 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/qconfig-oe.h +++ b/packages/qt4/qt4-x11-free-4.4.1/qconfig-oe.h diff --git a/packages/qt4/qt4-x11-free_4.4.0.bb b/packages/qt4/qt4-x11-free_4.4.1.bb index 7d30503c07..7d30503c07 100644 --- a/packages/qt4/qt4-x11-free_4.4.0.bb +++ b/packages/qt4/qt4-x11-free_4.4.1.bb diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc index 705ae14f8d..de941df1df 100644 --- a/packages/qt4/qt_staging.inc +++ b/packages/qt4/qt_staging.inc @@ -15,6 +15,12 @@ do_stage_append() { cd ${STAGING_LIBDIR} sed -i s#"-L${S}/lib"##g libQt*.la sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g libQt*.la + + install -d ${STAGING_DIR_TARGET}/qt4/bin + cp ${STAGING_DIR_NATIVE}/qt4/bin/* ${STAGING_DIR_TARGET}/qt4/bin/ + for qttool in ${STAGING_DIR_TARGET}/qt4/bin/*4 ; do + ln -sf $qttool ${STAGING_DIR_TARGET}/qt4/bin/$(basename $qttool |sed s:4::g) + done } STAGE_TEMP = "${WORKDIR}/temp-staging" diff --git a/packages/qt4/qtopia-core_4.4.0.bb b/packages/qt4/qtopia-core_4.4.1.bb index 71a702b965..158e29c432 100644 --- a/packages/qt4/qtopia-core_4.4.0.bb +++ b/packages/qt4/qtopia-core_4.4.1.bb @@ -2,5 +2,5 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" -#keep in sync with qt-embedded_4.4.0.bb -PR = "r4" +#keep in sync with qt-embedded_${PV}.bb +PR = "r0" diff --git a/packages/rrdtool/rrdtool_1.0.49.bb b/packages/rrdtool/rrdtool_1.0.49.bb index 7eecbd4468..408cf50fbf 100644 --- a/packages/rrdtool/rrdtool_1.0.49.bb +++ b/packages/rrdtool/rrdtool_1.0.49.bb @@ -1,14 +1,16 @@ -DESCRIPTION = "RRD is the Acronym for Round Robin Database. RRD is a system to store and display time-series data (i.e. network bandwidth, machine-room temperature, server load average)." -HOMEPAGE = "http://people.ee.ethz.ch/~oetiker/webtools/rrdtool" +DESCRIPTION = "High performance data logging and graphing system for time series data." +HOMEPAGE = "http://oss.oetiker.ch/rrdtool/" +SECTION = "utils" LICENSE = "GPLv2" DEPENDS = "libpng zlib" -PR = "r1" -SRC_URI = "http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x/rrdtool-${PV}.tar.gz \ +DEPENDS_rddtool-perl = "perl-module-lib perl-module-dynaloader" +PR = "r2" +SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/rdtool-${PV}.tar.gz \ file://perl-make-options.diff;patch=1;pnum=0" inherit autotools -EXTRA_OECONF = "--enable-shared --enable-local-libpng --enable-local-zlib --program-prefix=''" +EXTRA_OECONF = "rd_cv_ieee_works=yes --enable-shared --enable-local-libpng --enable-local-zlib --program-prefix=''" do_install_append() { install -d ${D}${docdir}/rrdtool/ @@ -18,6 +20,8 @@ do_install_append() { mv ${D}/usr/contrib ${D}${docdir}/rrdtool/ } -FILES_${PN} += "${libdir}/perl" +do_stage () { + autotools_stage_all +} -DEPENDS_rddtool-perl = "perl-module-lib perl-module-dynaloader" +FILES_${PN} += "${libdir}/perl" diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc index ab9ab42372..e7b92127a8 100644 --- a/packages/samba/samba.inc +++ b/packages/samba/samba.inc @@ -3,8 +3,8 @@ LICENSE = "GPL" DEPENDS = "readline virtual/libiconv" SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ - file://configure.patch;patch=1 \ - file://cifs.patch;patch=1" + file://configure.patch;patch=1" + S = "${WORKDIR}/samba-${PV}/source" inherit autotools diff --git a/packages/samba/samba_3.0.10.bb b/packages/samba/samba_3.0.10.bb deleted file mode 100644 index 265f695a1d..0000000000 --- a/packages/samba/samba_3.0.10.bb +++ /dev/null @@ -1,3 +0,0 @@ -require samba.inc - -PR = "r1" diff --git a/packages/samba/samba_3.0.14a.bb b/packages/samba/samba_3.0.14a.bb deleted file mode 100644 index 90d3c947d6..0000000000 --- a/packages/samba/samba_3.0.14a.bb +++ /dev/null @@ -1,51 +0,0 @@ -require samba.inc -inherit update-rc.d - -PR = "r16" - -SRC_URI += "file://config-lfs.patch;patch=1 \ - file://init \ - file://quota.patch;patch=1;pnum=0 \ - " - -INITSCRIPT_NAME = "samba" -# No dependencies, goes in at level 20 (NOTE: take care with the -# level, later levels put the shutdown later too - see the links -# in rc6.d, the shutdown must precede network shutdown). -INITSCRIPT_PARAMS = "defaults" -CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" - -# The file system settings --foodir=dirfoo and overridden unconditionally -# in the samba config by --with-foodir=dirfoo - even if the --with is not -# specified! Fix that here. Set the privatedir to /etc/samba/private. -EXTRA_OECONF += "\ - --with-configdir=${sysconfdir}/samba \ - --with-privatedir=${sysconfdir}/samba/private \ - --with-lockdir=${localstatedir}/lock \ - --with-piddir=${localstatedir}/run \ - --with-logfilebase=${localstatedir}/log \ - --with-libdir=${libdir} \ - --with-mandir=${mandir} \ - --with-swatdir=${datadir}/swat \ - " - -do_install_append() { - install -d "${D}${localstatedir}/log" - rm -f ${D}/sbin/mount.smbfs - rmdir ${D}/sbin - install -d ${D}${sbindir} - ln -sf smbmount ${D}${sbindir}/mount.smbfs - install -d "${D}${sysconfdir}/init.d" - install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba - install -d "${D}${sysconfdir}/samba" - install -c -m 644 ../examples/smb.conf.default ${D}${sysconfdir}/samba/smb.conf -} - -PACKAGES =+ "swat" - -FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg" -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" diff --git a/packages/samba/samba_3.0.20.bb b/packages/samba/samba_3.0.20.bb deleted file mode 100644 index a4ca7e9265..0000000000 --- a/packages/samba/samba_3.0.20.bb +++ /dev/null @@ -1,51 +0,0 @@ -require samba.inc -inherit update-rc.d - -PR = "r6" - -SRC_URI += "file://config-lfs.patch;patch=1 \ - file://init \ - file://quota.patch;patch=1;pnum=0 \ - " - -INITSCRIPT_NAME = "samba" -# No dependencies, goes in at level 20 (NOTE: take care with the -# level, later levels put the shutdown later too - see the links -# in rc6.d, the shutdown must precede network shutdown). -INITSCRIPT_PARAMS = "defaults" -CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" - -# The file system settings --foodir=dirfoo and overridden unconditionally -# in the samba config by --with-foodir=dirfoo - even if the --with is not -# specified! Fix that here. Set the privatedir to /etc/samba/private. -EXTRA_OECONF += "\ - samba_cv_struct_timespec=yes \ - --with-configdir=${sysconfdir}/samba \ - --with-privatedir=${sysconfdir}/samba/private \ - --with-lockdir=${localstatedir}/lock \ - --with-piddir=${localstatedir}/run \ - --with-logfilebase=${localstatedir}/log \ - --with-libdir=${libdir} \ - --with-mandir=${mandir} \ - --with-swatdir=${datadir}/swat \ - " - -do_install_append() { - install -d "${D}${localstatedir}/log" - rm -f ${D}/sbin/mount.smbfs - rmdir ${D}/sbin - ln -sf smbmount ${D}${sbindir}/mount.smbfs - install -d "${D}${sysconfdir}/init.d" - install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba - install -d "${D}${sysconfdir}/samba" - install -c -m 644 ../examples/smb.conf.default ${D}${sysconfdir}/samba/smb.conf -} - -PACKAGES =+ "swat" - -FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg" -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" diff --git a/packages/samba/samba_3.0.23c.bb b/packages/samba/samba_3.0.23c.bb index ef1359c79b..fdbc67d1bc 100644 --- a/packages/samba/samba_3.0.23c.bb +++ b/packages/samba/samba_3.0.23c.bb @@ -6,6 +6,7 @@ PR = "r2" SRC_URI += "file://config-lfs.patch;patch=1 \ file://init \ file://quota.patch;patch=1;pnum=0 \ + file://cifs.patch;patch=1 \ " INITSCRIPT_NAME = "samba" diff --git a/packages/samba/samba_3.0.5.bb b/packages/samba/samba_3.0.5.bb deleted file mode 100644 index 265f695a1d..0000000000 --- a/packages/samba/samba_3.0.5.bb +++ /dev/null @@ -1,3 +0,0 @@ -require samba.inc - -PR = "r1" diff --git a/packages/samba/samba_3.0.9.bb b/packages/samba/samba_3.0.9.bb deleted file mode 100644 index 265f695a1d..0000000000 --- a/packages/samba/samba_3.0.9.bb +++ /dev/null @@ -1,3 +0,0 @@ -require samba.inc - -PR = "r1" diff --git a/packages/swfdec/swfdec-mozilla_0.7.4.bb b/packages/swfdec/swfdec-mozilla_0.7.4.bb new file mode 100644 index 0000000000..2bc6a00a84 --- /dev/null +++ b/packages/swfdec/swfdec-mozilla_0.7.4.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Swfdec plugin for browsers using NPAPI. Swfdec is a decoder/renderer for Macromedia Flash animations." +LICENSE = "LGPL" + +DEPENDS = "gst-ffmpeg swfdec gstreamer libsoup-2.4 pango cairo liboil zlib libmad gtk+ alsa-lib" +RDEPENDS = "gst-ffmpeg" + +SRC_URI = "http://swfdec.freedesktop.org/download/swfdec-mozilla/0.7/${P}.tar.gz \ +" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + +FILES_${PN} += "${libdir}/mozilla/plugins/*.so" +FILES_${PN}-dev += "${libdir}/mozilla/plugins/*a" +FILES_${PN}-dbg += "${libdir}/mozilla/plugins/.debug" + diff --git a/packages/swfdec/swfdec_0.7.4.bb b/packages/swfdec/swfdec_0.7.4.bb new file mode 100644 index 0000000000..05d4977eae --- /dev/null +++ b/packages/swfdec/swfdec_0.7.4.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Swfdec is a decoder/renderer for Macromedia Flash animations." +LICENSE = "LGPL" + +DEPENDS = "gstreamer libsoup-2.4 pango cairo liboil zlib libmad gtk+ alsa-lib" + +SRC_URI = "http://swfdec.freedesktop.org/download/swfdec/0.7/${P}.tar.gz \ +" + +inherit autotools pkgconfig + +do_install_append() { + install -d ${D}/${bindir} + install -m 0755 ${S}/player/.libs/swfplay ${D}/${bindir} +} + +do_stage() { + autotools_stage_all +} + +PACKAGES =+ "libswfdecgtk libswfdec" + +FILES_${PN} += "${datadir}/icons" +FILES_libswfdec = "${libdir}/libswfdec-0.7.so.*" +FILES_libswfdecgtk = "${libdir}/libswfdec-gtk-0.7.so*" + + diff --git a/packages/tangogps/tangogps.inc b/packages/tangogps/tangogps.inc index a96ed8988f..4c9e427cdd 100644 --- a/packages/tangogps/tangogps.inc +++ b/packages/tangogps/tangogps.inc @@ -1,10 +1,13 @@ -DESCRIPTION = "A lightweight and fast mapping application" -LICENSE = "GPLv2" +DESCRIPTION = "tangoGPS is a map and GPS application using Openstreetmap" +AUTHOR = "Marcus Bauer <marcus.bauer@gmail.com>" +HOMEPAGE = "http://tangogps.org/" SECTION = "x11/applications" +LICENSE = "GPLv2" PRIORITY = "optional" DEPENDS = "curl gtk+ gconf gypsy" +RRECOMMENDS = "gpsd" SRC_URI = "http://www.tangogps.org/downloads/tangogps-${PV}.tar.gz" S = "${WORKDIR}/tangogps-${PV}" -inherit autotools +inherit autotools pkgconfig diff --git a/packages/tangogps/tangogps_0.9.0.3.bb b/packages/tangogps/tangogps_0.9.0.3.bb index 66c7c9d3ef..a023594b53 100644 --- a/packages/tangogps/tangogps_0.9.0.3.bb +++ b/packages/tangogps/tangogps_0.9.0.3.bb @@ -2,3 +2,4 @@ require tangogps.inc DEPENDS += "gpsd" RDEPENDS = "gpsd" +PR = "r2" diff --git a/packages/tangogps/tangogps_0.9.2.bb b/packages/tangogps/tangogps_0.9.2.bb new file mode 100644 index 0000000000..83465c1da9 --- /dev/null +++ b/packages/tangogps/tangogps_0.9.2.bb @@ -0,0 +1,4 @@ +require tangogps.inc + +DEPENDS += "sqlite3" +PR = "r1" diff --git a/packages/u-boot/u-boot-git/beagleboard/base.patch b/packages/u-boot/u-boot-git/beagleboard/base.patch deleted file mode 100644 index d4f726c006..0000000000 --- a/packages/u-boot/u-boot-git/beagleboard/base.patch +++ /dev/null @@ -1,6713 +0,0 @@ -diff --git a/Makefile b/Makefile -index e557d0d..3eac691 100644 ---- a/Makefile -+++ b/Makefile -@@ -141,7 +141,7 @@ ifeq ($(ARCH),ppc) - CROSS_COMPILE = ppc_8xx- - endif - ifeq ($(ARCH),arm) --CROSS_COMPILE = arm-linux- -+CROSS_COMPILE = arm-none-linux-gnueabi- - endif - ifeq ($(ARCH),i386) - CROSS_COMPILE = i386-linux- -@@ -253,7 +253,7 @@ LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).a - LIBBOARD := $(addprefix $(obj),$(LIBBOARD)) - - # Add GCC lib --PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc -+PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc -lgcc_eh - - # The "tools" are needed early, so put this first - # Don't include stuff already done in $(LIBS) -@@ -2569,6 +2569,12 @@ SMN42_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm720t SMN42 siemens lpc2292 - - ######################################################################### -+## ARM CORTEX Systems -+######################################################################### -+omap3530beagle_config : unconfig -+ @./mkconfig $(@:_config=) arm omap3 omap3530beagle -+ -+######################################################################### - ## XScale Systems - ######################################################################### - -diff --git a/board/omap3530beagle/Makefile b/board/omap3530beagle/Makefile -new file mode 100644 -index 0000000..7065345 ---- /dev/null -+++ b/board/omap3530beagle/Makefile -@@ -0,0 +1,47 @@ -+# -+# (C) Copyright 2000, 2001, 2002 -+# Wolfgang Denk, DENX Software Engineering, wd@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 -+# -+ -+include $(TOPDIR)/config.mk -+ -+LIB = lib$(BOARD).a -+ -+OBJS := omap3530beagle.o mem.o clock.o syslib.o sys_info.o nand.o -+SOBJS := lowlevel_init.o -+ -+$(LIB): $(OBJS) $(SOBJS) -+ $(AR) crv $@ $^ -+ -+clean: -+ rm -f $(SOBJS) $(OBJS) -+ -+distclean: clean -+ rm -f $(LIB) core *.bak .depend -+ -+######################################################################### -+ -+.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) -+ $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ -+ -+-include .depend -+ -+######################################################################### -diff --git a/board/omap3530beagle/clock.c b/board/omap3530beagle/clock.c -new file mode 100644 -index 0000000..1f4b4f3 ---- /dev/null -+++ b/board/omap3530beagle/clock.c -@@ -0,0 +1,314 @@ -+/* -+ * (C) Copyright 2008 -+ * Texas Instruments, <www.ti.com> -+ * -+ * Author : -+ * Sunil Kumar <sunilsaini05@gmail.com> -+ * Shashi Ranjan <shashiranjanmca05@gmail.com> -+ * -+ * Derived from Beagle Board and OMAP3 SDP code by -+ * Richard Woodruff <r-woodruff2@ti.com> -+ * Syed Mohammed Khasim <khasim@ti.com> -+ * -+ * 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 <common.h> -+#include <asm/io.h> -+#include <asm/arch/bits.h> -+#include <asm/arch/clocks.h> -+#include <asm/arch/clocks_omap3.h> -+#include <asm/arch/mem.h> -+#include <asm/arch/sys_proto.h> -+#include <environment.h> -+#include <command.h> -+ -+/****************************************************************************** -+ * get_sys_clk_speed() - determine reference oscillator speed -+ * based on known 32kHz clock and gptimer. -+ *****************************************************************************/ -+u32 get_osc_clk_speed(void) -+{ -+ u32 start, cstart, cend, cdiff, val; -+ -+ val = __raw_readl(PRM_CLKSRC_CTRL); -+ -+ /* If SYS_CLK is being divided by 2, remove for now */ -+ val = (val & (~BIT7)) | BIT6; -+ __raw_writel(val, PRM_CLKSRC_CTRL); -+ -+ /* enable timer2 */ -+ val = __raw_readl(CM_CLKSEL_WKUP) | BIT0; -+ __raw_writel(val, CM_CLKSEL_WKUP); /* select sys_clk for GPT1 */ -+ -+ /* Enable I and F Clocks for GPT1 */ -+ val = __raw_readl(CM_ICLKEN_WKUP) | BIT0 | BIT2; -+ __raw_writel(val, CM_ICLKEN_WKUP); -+ val = __raw_readl(CM_FCLKEN_WKUP) | BIT0; -+ __raw_writel(val, CM_FCLKEN_WKUP); -+ -+ __raw_writel(0, OMAP34XX_GPT1 + TLDR); /* start counting at 0 */ -+ __raw_writel(GPT_EN, OMAP34XX_GPT1 + TCLR); /* enable clock */ -+ -+ /* enable 32kHz source, determine sys_clk via gauging */ -+ start = 20 + __raw_readl(S32K_CR); /* start time in 20 cycles */ -+ while (__raw_readl(S32K_CR) < start) ; /* dead loop till start time */ -+ /* get start sys_clk count */ -+ cstart = __raw_readl(OMAP34XX_GPT1 + TCRR); -+ /* wait for 40 cycles */ -+ while (__raw_readl(S32K_CR) < (start + 20)) ; -+ cend = __raw_readl(OMAP34XX_GPT1 + TCRR); /* get end sys_clk count */ -+ cdiff = cend - cstart; /* get elapsed ticks */ -+ -+ /* based on number of ticks assign speed */ -+ if (cdiff > 19000) -+ return (S38_4M); -+ else if (cdiff > 15200) -+ return (S26M); -+ else if (cdiff > 13000) -+ return (S24M); -+ else if (cdiff > 9000) -+ return (S19_2M); -+ else if (cdiff > 7600) -+ return (S13M); -+ else -+ return (S12M); -+} -+ -+/****************************************************************************** -+ * get_sys_clkin_sel() - returns the sys_clkin_sel field value based on -+ * input oscillator clock frequency. -+ *****************************************************************************/ -+void get_sys_clkin_sel(u32 osc_clk, u32 *sys_clkin_sel) -+{ -+ if (osc_clk == S38_4M) -+ *sys_clkin_sel = 4; -+ else if (osc_clk == S26M) -+ *sys_clkin_sel = 3; -+ else if (osc_clk == S19_2M) -+ *sys_clkin_sel = 2; -+ else if (osc_clk == S13M) -+ *sys_clkin_sel = 1; -+ else if (osc_clk == S12M) -+ *sys_clkin_sel = 0; -+} -+ -+/****************************************************************************** -+ * prcm_init() - inits clocks for PRCM as defined in clocks.h -+ * called from SRAM, or Flash (using temp SRAM stack). -+ *****************************************************************************/ -+void prcm_init(void) -+{ -+ void (*f_lock_pll) (u32, u32, u32, u32); -+ int xip_safe, p0, p1, p2, p3; -+ u32 osc_clk = 0, sys_clkin_sel; -+ u32 clk_index, sil_index; -+ dpll_param *dpll_param_p; -+ -+ f_lock_pll = (void *) ((u32) &_end_vect - (u32) &_start + -+ SRAM_VECT_CODE); -+ -+ xip_safe = running_in_sram(); -+ -+ /* Gauge the input clock speed and find out the sys_clkin_sel -+ * value corresponding to the input clock. -+ */ -+ osc_clk = get_osc_clk_speed(); -+ get_sys_clkin_sel(osc_clk, &sys_clkin_sel); -+ -+ sr32(PRM_CLKSEL, 0, 3, sys_clkin_sel); /* set input crystal speed */ -+ -+ /* If the input clock is greater than 19.2M always divide/2 */ -+ if (sys_clkin_sel > 2) { -+ sr32(PRM_CLKSRC_CTRL, 6, 2, 2); /* input clock divider */ -+ clk_index = sys_clkin_sel / 2; -+ } else { -+ sr32(PRM_CLKSRC_CTRL, 6, 2, 1); /* input clock divider */ -+ clk_index = sys_clkin_sel; -+ } -+ -+ /* The DPLL tables are defined according to sysclk value and -+ * silicon revision. The clk_index value will be used to get -+ * the values for that input sysclk from the DPLL param table -+ * and sil_index will get the values for that SysClk for the -+ * appropriate silicon rev. -+ */ -+ sil_index = get_cpu_rev() - 1; -+ /* Unlock MPU DPLL (slows things down, and needed later) */ -+ sr32(CM_CLKEN_PLL_MPU, 0, 3, PLL_LOW_POWER_BYPASS); -+ wait_on_value(BIT0, 0, CM_IDLEST_PLL_MPU, LDELAY); -+ -+ /* Getting the base address of Core DPLL param table */ -+ dpll_param_p = (dpll_param *) get_core_dpll_param(); -+ /* Moving it to the right sysclk and ES rev base */ -+ dpll_param_p = dpll_param_p + 3 * clk_index + sil_index; -+ if (xip_safe) { -+ /* CORE DPLL */ -+ /* sr32(CM_CLKSEL2_EMU) set override to work when asleep */ -+ sr32(CM_CLKEN_PLL, 0, 3, PLL_FAST_RELOCK_BYPASS); -+ wait_on_value(BIT0, 0, CM_IDLEST_CKGEN, LDELAY); -+ /* For OMAP3 ES1.0 Errata 1.50, default value directly doesnt -+ work. write another value and then default value. */ -+ sr32(CM_CLKSEL1_EMU, 16, 5, CORE_M3X2 + 1); /* m3x2 */ -+ sr32(CM_CLKSEL1_EMU, 16, 5, CORE_M3X2); /* m3x2 */ -+ sr32(CM_CLKSEL1_PLL, 27, 2, dpll_param_p->m2); /* Set M2 */ -+ sr32(CM_CLKSEL1_PLL, 16, 11, dpll_param_p->m); /* Set M */ -+ sr32(CM_CLKSEL1_PLL, 8, 7, dpll_param_p->n); /* Set N */ -+ sr32(CM_CLKSEL1_PLL, 6, 1, 0); /* 96M Src */ -+ sr32(CM_CLKSEL_CORE, 8, 4, CORE_SSI_DIV); /* ssi */ -+ sr32(CM_CLKSEL_CORE, 4, 2, CORE_FUSB_DIV); /* fsusb */ -+ sr32(CM_CLKSEL_CORE, 2, 2, CORE_L4_DIV); /* l4 */ -+ sr32(CM_CLKSEL_CORE, 0, 2, CORE_L3_DIV); /* l3 */ -+ sr32(CM_CLKSEL_GFX, 0, 3, GFX_DIV); /* gfx */ -+ sr32(CM_CLKSEL_WKUP, 1, 2, WKUP_RSM); /* reset mgr */ -+ sr32(CM_CLKEN_PLL, 4, 4, dpll_param_p->fsel); /* FREQSEL */ -+ sr32(CM_CLKEN_PLL, 0, 3, PLL_LOCK); /* lock mode */ -+ wait_on_value(BIT0, 1, CM_IDLEST_CKGEN, LDELAY); -+ } else if (running_in_flash()) { -+ /* if running from flash, jump to small relocated code -+ area in SRAM. */ -+ p0 = __raw_readl(CM_CLKEN_PLL); -+ sr32((u32) &p0, 0, 3, PLL_FAST_RELOCK_BYPASS); -+ sr32((u32) &p0, 4, 4, dpll_param_p->fsel); /* FREQSEL */ -+ -+ p1 = __raw_readl(CM_CLKSEL1_PLL); -+ sr32((u32) &p1, 27, 2, dpll_param_p->m2); /* Set M2 */ -+ sr32((u32) &p1, 16, 11, dpll_param_p->m); /* Set M */ -+ sr32((u32) &p1, 8, 7, dpll_param_p->n); /* Set N */ -+ sr32((u32) &p1, 6, 1, 0); /* set source for 96M */ -+ p2 = __raw_readl(CM_CLKSEL_CORE); -+ sr32((u32) &p2, 8, 4, CORE_SSI_DIV); /* ssi */ -+ sr32((u32) &p2, 4, 2, CORE_FUSB_DIV); /* fsusb */ -+ sr32((u32) &p2, 2, 2, CORE_L4_DIV); /* l4 */ -+ sr32((u32) &p2, 0, 2, CORE_L3_DIV); /* l3 */ -+ -+ p3 = CM_IDLEST_CKGEN; -+ -+ (*f_lock_pll) (p0, p1, p2, p3); -+ } -+ -+ /* PER DPLL */ -+ sr32(CM_CLKEN_PLL, 16, 3, PLL_STOP); -+ wait_on_value(BIT1, 0, CM_IDLEST_CKGEN, LDELAY); -+ -+ /* Getting the base address to PER DPLL param table */ -+ /* Set N */ -+ dpll_param_p = (dpll_param *) get_per_dpll_param(); -+ /* Moving it to the right sysclk base */ -+ dpll_param_p = dpll_param_p + clk_index; -+ /* Errata 1.50 Workaround for OMAP3 ES1.0 only */ -+ /* If using default divisors, write default divisor + 1 -+ and then the actual divisor value */ -+ /* Need to change it to silicon and revision check */ -+ if (1) { -+ sr32(CM_CLKSEL1_EMU, 24, 5, PER_M6X2 + 1); /* set M6 */ -+ sr32(CM_CLKSEL1_EMU, 24, 5, PER_M6X2); /* set M6 */ -+ sr32(CM_CLKSEL_CAM, 0, 5, PER_M5X2 + 1); /* set M5 */ -+ sr32(CM_CLKSEL_CAM, 0, 5, PER_M5X2); /* set M5 */ -+ sr32(CM_CLKSEL_DSS, 0, 5, PER_M4X2 + 1); /* set M4 */ -+ sr32(CM_CLKSEL_DSS, 0, 5, PER_M4X2); /* set M4 */ -+ sr32(CM_CLKSEL_DSS, 8, 5, PER_M3X2 + 1); /* set M3 */ -+ sr32(CM_CLKSEL_DSS, 8, 5, PER_M3X2); /* set M3 */ -+ sr32(CM_CLKSEL3_PLL, 0, 5, dpll_param_p->m2 + 1); /* set M2 */ -+ sr32(CM_CLKSEL3_PLL, 0, 5, dpll_param_p->m2); /* set M2 */ -+ } else { -+ sr32(CM_CLKSEL1_EMU, 24, 5, PER_M6X2); /* set M6 */ -+ sr32(CM_CLKSEL_CAM, 0, 5, PER_M5X2); /* set M5 */ -+ sr32(CM_CLKSEL_DSS, 0, 5, PER_M4X2); /* set M4 */ -+ sr32(CM_CLKSEL_DSS, 8, 5, PER_M3X2); /* set M3 */ -+ sr32(CM_CLKSEL3_PLL, 0, 5, dpll_param_p->m2); /* set M2 */ -+ } -+ sr32(CM_CLKSEL2_PLL, 8, 11, dpll_param_p->m); /* set m */ -+ sr32(CM_CLKSEL2_PLL, 0, 7, dpll_param_p->n); /* set n */ -+ sr32(CM_CLKEN_PLL, 20, 4, dpll_param_p->fsel); /* FREQSEL */ -+ sr32(CM_CLKEN_PLL, 16, 3, PLL_LOCK); /* lock mode */ -+ wait_on_value(BIT1, 2, CM_IDLEST_CKGEN, LDELAY); -+ -+ /* Getting the base address to MPU DPLL param table */ -+ dpll_param_p = (dpll_param *) get_mpu_dpll_param(); -+ /* Moving it to the right sysclk and ES rev base */ -+ dpll_param_p = dpll_param_p + 3 * clk_index + sil_index; -+ /* MPU DPLL (unlocked already) */ -+ sr32(CM_CLKSEL2_PLL_MPU, 0, 5, dpll_param_p->m2); /* Set M2 */ -+ sr32(CM_CLKSEL1_PLL_MPU, 8, 11, dpll_param_p->m); /* Set M */ -+ sr32(CM_CLKSEL1_PLL_MPU, 0, 7, dpll_param_p->n); /* Set N */ -+ sr32(CM_CLKEN_PLL_MPU, 4, 4, dpll_param_p->fsel); /* FREQSEL */ -+ sr32(CM_CLKEN_PLL_MPU, 0, 3, PLL_LOCK); /* lock mode */ -+ wait_on_value(BIT0, 1, CM_IDLEST_PLL_MPU, LDELAY); -+ -+ /* Getting the base address to IVA DPLL param table */ -+ dpll_param_p = (dpll_param *) get_iva_dpll_param(); -+ /* Moving it to the right sysclk and ES rev base */ -+ dpll_param_p = dpll_param_p + 3 * clk_index + sil_index; -+ /* IVA DPLL (set to 12*20=240MHz) */ -+ sr32(CM_CLKEN_PLL_IVA2, 0, 3, PLL_STOP); -+ wait_on_value(BIT0, 0, CM_IDLEST_PLL_IVA2, LDELAY); -+ sr32(CM_CLKSEL2_PLL_IVA2, 0, 5, dpll_param_p->m2); /* set M2 */ -+ sr32(CM_CLKSEL1_PLL_IVA2, 8, 11, dpll_param_p->m); /* set M */ -+ sr32(CM_CLKSEL1_PLL_IVA2, 0, 7, dpll_param_p->n); /* set N */ -+ sr32(CM_CLKEN_PLL_IVA2, 4, 4, dpll_param_p->fsel); /* FREQSEL */ -+ sr32(CM_CLKEN_PLL_IVA2, 0, 3, PLL_LOCK); /* lock mode */ -+ wait_on_value(BIT0, 1, CM_IDLEST_PLL_IVA2, LDELAY); -+ -+ /* Set up GPTimers to sys_clk source only */ -+ sr32(CM_CLKSEL_PER, 0, 8, 0xff); -+ sr32(CM_CLKSEL_WKUP, 0, 1, 1); -+ -+ sdelay(5000); -+} -+ -+/****************************************************************************** -+ * peripheral_enable() - Enable the clks & power for perifs (GPT2, UART1,...) -+ *****************************************************************************/ -+void per_clocks_enable(void) -+{ -+ /* Enable GP2 timer. */ -+ sr32(CM_CLKSEL_PER, 0, 1, 0x1); /* GPT2 = sys clk */ -+ sr32(CM_ICLKEN_PER, 3, 1, 0x1); /* ICKen GPT2 */ -+ sr32(CM_FCLKEN_PER, 3, 1, 0x1); /* FCKen GPT2 */ -+ -+#ifdef CFG_NS16550 -+ /* Enable UART1 clocks */ -+ sr32(CM_FCLKEN1_CORE, 13, 1, 0x1); -+ sr32(CM_ICLKEN1_CORE, 13, 1, 0x1); -+ -+ /* UART 3 Clocks */ -+ sr32(CM_FCLKEN_PER, 11, 1, 0x1); -+ sr32(CM_ICLKEN_PER, 11, 1, 0x1); -+#endif -+#ifdef CONFIG_DRIVER_OMAP34XX_I2C -+ /* Turn on all 3 I2C clocks */ -+ sr32(CM_FCLKEN1_CORE, 15, 3, 0x7); -+ sr32(CM_ICLKEN1_CORE, 15, 3, 0x7); /* I2C1,2,3 = on */ -+#endif -+ /* Enable the ICLK for 32K Sync Timer as its used in udelay */ -+ sr32(CM_ICLKEN_WKUP, 2, 1, 0x1); -+ -+ sr32(CM_FCLKEN_IVA2, 0, 32, FCK_IVA2_ON); -+ sr32(CM_FCLKEN1_CORE, 0, 32, FCK_CORE1_ON); -+ sr32(CM_ICLKEN1_CORE, 0, 32, ICK_CORE1_ON); -+ sr32(CM_ICLKEN2_CORE, 0, 32, ICK_CORE2_ON); -+ sr32(CM_FCLKEN_WKUP, 0, 32, FCK_WKUP_ON); -+ sr32(CM_ICLKEN_WKUP, 0, 32, ICK_WKUP_ON); -+ sr32(CM_FCLKEN_DSS, 0, 32, FCK_DSS_ON); -+ sr32(CM_ICLKEN_DSS, 0, 32, ICK_DSS_ON); -+ sr32(CM_FCLKEN_CAM, 0, 32, FCK_CAM_ON); -+ sr32(CM_ICLKEN_CAM, 0, 32, ICK_CAM_ON); -+ sr32(CM_FCLKEN_PER, 0, 32, FCK_PER_ON); -+ sr32(CM_ICLKEN_PER, 0, 32, ICK_PER_ON); -+ -+ sdelay(1000); -+} -diff --git a/board/omap3530beagle/config.mk b/board/omap3530beagle/config.mk -new file mode 100644 -index 0000000..9639c43 ---- /dev/null -+++ b/board/omap3530beagle/config.mk -@@ -0,0 +1,17 @@ -+# -+# (C) Copyright 2006 -+# Texas Instruments, <www.ti.com> -+# -+# Begale Board uses OMAP3 (ARM-CortexA8) cpu -+# see http://www.ti.com/ for more information on Texas Instruments -+# -+# Physical Address: -+# 8000'0000 (bank0) -+# A000/0000 (bank1) -+# Linux-Kernel is expected to be at 8000'8000, entry 8000'8000 -+# (mem base + reserved) -+ -+# For use with external or internal boots. -+TEXT_BASE = 0x80e80000 -+ -+ -diff --git a/board/omap3530beagle/lowlevel_init.S b/board/omap3530beagle/lowlevel_init.S -new file mode 100644 -index 0000000..1f9a0e9 ---- /dev/null -+++ b/board/omap3530beagle/lowlevel_init.S -@@ -0,0 +1,360 @@ -+/* -+ * Board specific setup info -+ * -+ * (C) Copyright 2008 -+ * Texas Instruments, <www.ti.com> -+ * -+ * Initial Code by: -+ * Richard Woodruff <r-woodruff2@ti.com> -+ * Syed Mohammed Khasim <khasim@ti.com> -+ * -+ * 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 <config.h> -+#include <version.h> -+#include <asm/arch/mem.h> -+#include <asm/arch/clocks_omap3.h> -+ -+_TEXT_BASE: -+ .word TEXT_BASE /* sdram load addr from config.mk */ -+ -+#if !defined(CFG_NAND_BOOT) && !defined(CFG_NAND_BOOT) -+/************************************************************************** -+ * cpy_clk_code: relocates clock code into SRAM where its safer to execute -+ * R1 = SRAM destination address. -+ *************************************************************************/ -+.global cpy_clk_code -+ cpy_clk_code: -+ /* Copy DPLL code into SRAM */ -+ adr r0, go_to_speed /* get addr of clock setting code */ -+ mov r2, #384 /* r2 size to copy (div by 32 bytes) */ -+ mov r1, r1 /* r1 <- dest address (passed in) */ -+ add r2, r2, r0 /* r2 <- source end address */ -+next2: -+ ldmia r0!, {r3-r10} /* copy from source address [r0] */ -+ stmia r1!, {r3-r10} /* copy to target address [r1] */ -+ cmp r0, r2 /* until source end address [r2] */ -+ bne next2 -+ mov pc, lr /* back to caller */ -+ -+/* *************************************************************************** -+ * go_to_speed: -Moves to bypass, -Commits clock dividers, -puts dpll at speed -+ * -executed from SRAM. -+ * R0 = CM_CLKEN_PLL-bypass value -+ * R1 = CM_CLKSEL1_PLL-m, n, and divider values -+ * R2 = CM_CLKSEL_CORE-divider values -+ * R3 = CM_IDLEST_CKGEN - addr dpll lock wait -+ * -+ * Note: If core unlocks/relocks and SDRAM is running fast already it gets -+ * confused. A reset of the controller gets it back. Taking away its -+ * L3 when its not in self refresh seems bad for it. Normally, this -+ * code runs from flash before SDR is init so that should be ok. -+ ****************************************************************************/ -+.global go_to_speed -+ go_to_speed: -+ stmfd sp!, {r4-r6} -+ -+ /* move into fast relock bypass */ -+ ldr r4, pll_ctl_add -+ str r0, [r4] -+wait1: -+ ldr r5, [r3] /* get status */ -+ and r5, r5, #0x1 /* isolate core status */ -+ cmp r5, #0x1 /* still locked? */ -+ beq wait1 /* if lock, loop */ -+ -+ /* set new dpll dividers _after_ in bypass */ -+ ldr r5, pll_div_add1 -+ str r1, [r5] /* set m, n, m2 */ -+ ldr r5, pll_div_add2 -+ str r2, [r5] /* set l3/l4/.. dividers*/ -+ ldr r5, pll_div_add3 /* wkup */ -+ ldr r2, pll_div_val3 /* rsm val */ -+ str r2, [r5] -+ ldr r5, pll_div_add4 /* gfx */ -+ ldr r2, pll_div_val4 -+ str r2, [r5] -+ ldr r5, pll_div_add5 /* emu */ -+ ldr r2, pll_div_val5 -+ str r2, [r5] -+ -+ /* now prepare GPMC (flash) for new dpll speed */ -+ /* flash needs to be stable when we jump back to it */ -+ ldr r5, flash_cfg3_addr -+ ldr r2, flash_cfg3_val -+ str r2, [r5] -+ ldr r5, flash_cfg4_addr -+ ldr r2, flash_cfg4_val -+ str r2, [r5] -+ ldr r5, flash_cfg5_addr -+ ldr r2, flash_cfg5_val -+ str r2, [r5] -+ ldr r5, flash_cfg1_addr -+ ldr r2, [r5] -+ orr r2, r2, #0x3 /* up gpmc divider */ -+ str r2, [r5] -+ -+ /* lock DPLL3 and wait a bit */ -+ orr r0, r0, #0x7 /* set up for lock mode */ -+ str r0, [r4] /* lock */ -+ nop /* ARM slow at this point working at sys_clk */ -+ nop -+ nop -+ nop -+wait2: -+ ldr r5, [r3] /* get status */ -+ and r5, r5, #0x1 /* isolate core status */ -+ cmp r5, #0x1 /* still locked? */ -+ bne wait2 /* if lock, loop */ -+ nop -+ nop -+ nop -+ nop -+ ldmfd sp!, {r4-r6} -+ mov pc, lr /* back to caller, locked */ -+ -+_go_to_speed: .word go_to_speed -+ -+/* these constants need to be close for PIC code */ -+/* The Nor has to be in the Flash Base CS0 for this condition to happen */ -+flash_cfg1_addr: -+ .word (GPMC_CONFIG_CS0 + GPMC_CONFIG1) -+flash_cfg3_addr: -+ .word (GPMC_CONFIG_CS0 + GPMC_CONFIG3) -+flash_cfg3_val: -+ .word STNOR_GPMC_CONFIG3 -+flash_cfg4_addr: -+ .word (GPMC_CONFIG_CS0 + GPMC_CONFIG4) -+flash_cfg4_val: -+ .word STNOR_GPMC_CONFIG4 -+flash_cfg5_val: -+ .word STNOR_GPMC_CONFIG5 -+flash_cfg5_addr: -+ .word (GPMC_CONFIG_CS0 + GPMC_CONFIG5) -+pll_ctl_add: -+ .word CM_CLKEN_PLL -+pll_div_add1: -+ .word CM_CLKSEL1_PLL -+pll_div_add2: -+ .word CM_CLKSEL_CORE -+pll_div_add3: -+ .word CM_CLKSEL_WKUP -+pll_div_val3: -+ .word (WKUP_RSM << 1) -+pll_div_add4: -+ .word CM_CLKSEL_GFX -+pll_div_val4: -+ .word (GFX_DIV << 0) -+pll_div_add5: -+ .word CM_CLKSEL1_EMU -+pll_div_val5: -+ .word CLSEL1_EMU_VAL -+ -+#endif -+ -+.globl lowlevel_init -+lowlevel_init: -+ ldr sp, SRAM_STACK -+ str ip, [sp] /* stash old link register */ -+ mov ip, lr /* save link reg across call */ -+ bl s_init /* go setup pll,mux,memory */ -+ ldr ip, [sp] /* restore save ip */ -+ mov lr, ip /* restore link reg */ -+ -+ /* back to arch calling code */ -+ mov pc, lr -+ -+ /* the literal pools origin */ -+ .ltorg -+ -+REG_CONTROL_STATUS: -+ .word CONTROL_STATUS -+SRAM_STACK: -+ .word LOW_LEVEL_SRAM_STACK -+ -+/* DPLL(1-4) PARAM TABLES */ -+/* Each of the tables has M, N, FREQSEL, M2 values defined for nominal -+ * OPP (1.2V). The fields are defined according to dpll_param struct(clock.c). -+ * The values are defined for all possible sysclk and for ES1 and ES2. -+ */ -+ -+mpu_dpll_param: -+/* 12MHz */ -+/* ES1 */ -+.word 0x0FE,0x07,0x05,0x01 -+/* ES2 */ -+.word 0x0FA,0x05,0x07,0x01 -+/* 3410 */ -+.word 0x085,0x05,0x07,0x01 -+ -+/* 13MHz */ -+/* ES1 */ -+.word 0x17D,0x0C,0x03,0x01 -+/* ES2 */ -+.word 0x1F4,0x0C,0x03,0x01 -+/* 3410 */ -+.word 0x10A,0x0C,0x03,0x01 -+ -+/* 19.2MHz */ -+/* ES1 */ -+.word 0x179,0x12,0x04,0x01 -+/* ES2 */ -+.word 0x271,0x17,0x03,0x01 -+/* 3410 */ -+.word 0x14C,0x17,0x03,0x01 -+ -+/* 26MHz */ -+/* ES1 */ -+.word 0x17D,0x19,0x03,0x01 -+/* ES2 */ -+.word 0x0FA,0x0C,0x07,0x01 -+/* 3410 */ -+.word 0x085,0x0C,0x07,0x01 -+ -+/* 38.4MHz */ -+/* ES1 */ -+.word 0x1FA,0x32,0x03,0x01 -+/* ES2 */ -+.word 0x271,0x2F,0x03,0x01 -+/* 3410 */ -+.word 0x14C,0x2F,0x03,0x01 -+ -+ -+.globl get_mpu_dpll_param -+get_mpu_dpll_param: -+ adr r0, mpu_dpll_param -+ mov pc, lr -+ -+iva_dpll_param: -+/* 12MHz */ -+/* ES1 */ -+.word 0x07D,0x05,0x07,0x01 -+/* ES2 */ -+.word 0x0B4,0x05,0x07,0x01 -+/* 3410 */ -+.word 0x085,0x05,0x07,0x01 -+ -+/* 13MHz */ -+/* ES1 */ -+.word 0x0FA,0x0C,0x03,0x01 -+/* ES2 */ -+.word 0x168,0x0C,0x03,0x01 -+/* 3410 */ -+.word 0x10A,0x0C,0x03,0x01 -+ -+/* 19.2MHz */ -+/* ES1 */ -+.word 0x082,0x09,0x07,0x01 -+/* ES2 */ -+.word 0x0E1,0x0B,0x06,0x01 -+/* 3410 */ -+.word 0x14C,0x17,0x03,0x01 -+ -+/* 26MHz */ -+/* ES1 */ -+.word 0x07D,0x0C,0x07,0x01 -+/* ES2 */ -+.word 0x0B4,0x0C,0x07,0x01 -+/* 3410 */ -+.word 0x085,0x0C,0x07,0x01 -+ -+/* 38.4MHz */ -+/* ES1 */ -+.word 0x13F,0x30,0x03,0x01 -+/* ES2 */ -+.word 0x0E1,0x17,0x06,0x01 -+/* 3410 */ -+.word 0x14C,0x2F,0x03,0x01 -+ -+ -+.globl get_iva_dpll_param -+get_iva_dpll_param: -+ adr r0, iva_dpll_param -+ mov pc, lr -+ -+/* Core DPLL targets for L3 at 166 & L133 */ -+core_dpll_param: -+/* 12MHz */ -+/* ES1 */ -+.word M_12_ES1,M_12_ES1,FSL_12_ES1,M2_12_ES1 -+/* ES2 */ -+.word M_12,N_12,FSEL_12,M2_12 -+/* 3410 */ -+.word M_12,N_12,FSEL_12,M2_12 -+ -+/* 13MHz */ -+/* ES1 */ -+.word M_13_ES1,N_13_ES1,FSL_13_ES1,M2_13_ES1 -+/* ES2 */ -+.word M_13,N_13,FSEL_13,M2_13 -+/* 3410 */ -+.word M_13,N_13,FSEL_13,M2_13 -+ -+/* 19.2MHz */ -+/* ES1 */ -+.word M_19p2_ES1,N_19p2_ES1,FSL_19p2_ES1,M2_19p2_ES1 -+/* ES2 */ -+.word M_19p2,N_19p2,FSEL_19p2,M2_19p2 -+/* 3410 */ -+.word M_19p2,N_19p2,FSEL_19p2,M2_19p2 -+ -+/* 26MHz */ -+/* ES1 */ -+.word M_26_ES1,N_26_ES1,FSL_26_ES1,M2_26_ES1 -+/* ES2 */ -+.word M_26,N_26,FSEL_26,M2_26 -+/* 3410 */ -+.word M_26,N_26,FSEL_26,M2_26 -+ -+/* 38.4MHz */ -+/* ES1 */ -+.word M_38p4_ES1,N_38p4_ES1,FSL_38p4_ES1,M2_38p4_ES1 -+/* ES2 */ -+.word M_38p4,N_38p4,FSEL_38p4,M2_38p4 -+/* 3410 */ -+.word M_38p4,N_38p4,FSEL_38p4,M2_38p4 -+ -+.globl get_core_dpll_param -+get_core_dpll_param: -+ adr r0, core_dpll_param -+ mov pc, lr -+ -+/* PER DPLL values are same for both ES1 and ES2 */ -+per_dpll_param: -+/* 12MHz */ -+.word 0xD8,0x05,0x07,0x09 -+ -+/* 13MHz */ -+.word 0x1B0,0x0C,0x03,0x09 -+ -+/* 19.2MHz */ -+.word 0xE1,0x09,0x07,0x09 -+ -+/* 26MHz */ -+.word 0xD8,0x0C,0x07,0x09 -+ -+/* 38.4MHz */ -+.word 0xE1,0x13,0x07,0x09 -+ -+.globl get_per_dpll_param -+get_per_dpll_param: -+ adr r0, per_dpll_param -+ mov pc, lr -+ -diff --git a/board/omap3530beagle/mem.c b/board/omap3530beagle/mem.c -new file mode 100644 -index 0000000..fb803be ---- /dev/null -+++ b/board/omap3530beagle/mem.c -@@ -0,0 +1,250 @@ -+/* -+ * (C) Copyright 2008 -+ * Texas Instruments, <www.ti.com> -+ * -+ * Initial Code from: -+ * Richard Woodruff <r-woodruff2@ti.com> -+ * Syed Mohammed Khasim <khasim@ti.com> -+ * -+ * 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 <common.h> -+#include <asm/io.h> -+#include <asm/arch/bits.h> -+#include <asm/arch/mem.h> -+#include <asm/arch/sys_proto.h> -+#include <command.h> -+ -+/* Only One NAND allowed on board at a time. -+ * The GPMC CS Base for the same -+ */ -+unsigned int nand_cs_base; -+unsigned int boot_flash_base; -+unsigned int boot_flash_off; -+unsigned int boot_flash_sec; -+unsigned int boot_flash_type; -+volatile unsigned int boot_flash_env_addr; -+ -+/* help common/env_flash.c */ -+#ifdef ENV_IS_VARIABLE -+ -+uchar(*boot_env_get_char_spec) (int index); -+int (*boot_env_init) (void); -+int (*boot_saveenv) (void); -+void (*boot_env_relocate_spec) (void); -+ -+/* 16 bit NAND */ -+uchar env_get_char_spec(int index); -+int env_init(void); -+int saveenv(void); -+void env_relocate_spec(void); -+extern char *env_name_spec; -+ -+u8 is_nand; -+ -+#endif /* ENV_IS_VARIABLE */ -+ -+static u32 gpmc_m_nand[GPMC_MAX_REG] = { -+ M_NAND_GPMC_CONFIG1, -+ M_NAND_GPMC_CONFIG2, -+ M_NAND_GPMC_CONFIG3, -+ M_NAND_GPMC_CONFIG4, -+ M_NAND_GPMC_CONFIG5, -+ M_NAND_GPMC_CONFIG6, 0 -+}; -+ -+/************************************************************************** -+ * make_cs1_contiguous() - for es2 and above remap cs1 behind cs0 to allow -+ * command line mem=xyz use all memory with out discontinuous support -+ * compiled in. Could do it at the ATAG, but there really is two banks... -+ * Called as part of 2nd phase DDR init. -+ **************************************************************************/ -+void make_cs1_contiguous(void) -+{ -+ u32 size, a_add_low, a_add_high; -+ -+ size = get_sdr_cs_size(SDRC_CS0_OSET); -+ size /= SZ_32M; /* find size to offset CS1 */ -+ a_add_high = (size & 3) << 8; /* set up low field */ -+ a_add_low = (size & 0x3C) >> 2; /* set up high field */ -+ __raw_writel((a_add_high | a_add_low), SDRC_CS_CFG); -+ -+} -+ -+/******************************************************** -+ * mem_ok() - test used to see if timings are correct -+ * for a part. Helps in guessing which part -+ * we are currently using. -+ *******************************************************/ -+u32 mem_ok(void) -+{ -+ u32 val1, val2, addr; -+ u32 pattern = 0x12345678; -+ -+ addr = OMAP34XX_SDRC_CS0; -+ -+ __raw_writel(0x0, addr + 0x400); /* clear pos A */ -+ __raw_writel(pattern, addr); /* pattern to pos B */ -+ __raw_writel(0x0, addr + 4); /* remove pattern off the bus */ -+ val1 = __raw_readl(addr + 0x400); /* get pos A value */ -+ val2 = __raw_readl(addr); /* get val2 */ -+ -+ if ((val1 != 0) || (val2 != pattern)) /* see if pos A value changed */ -+ return (0); -+ else -+ return (1); -+} -+ -+/******************************************************** -+ * sdrc_init() - init the sdrc chip selects CS0 and CS1 -+ * - early init routines, called from flash or -+ * SRAM. -+ *******************************************************/ -+void sdrc_init(void) -+{ -+ /* only init up first bank here */ -+ do_sdrc_init(SDRC_CS0_OSET, EARLY_INIT); -+} -+ -+/************************************************************************* -+ * do_sdrc_init(): initialize the SDRAM for use. -+ * -code sets up SDRAM basic SDRC timings for CS0 -+ * -optimal settings can be placed here, or redone after i2c -+ * inspection of board info -+ * -+ * - code called ones in C-Stack only context for CS0 and a possible 2nd -+ * time depending on memory configuration from stack+global context -+ **************************************************************************/ -+ -+void do_sdrc_init(u32 offset, u32 early) -+{ -+ -+ /* reset sdrc controller */ -+ __raw_writel(SOFTRESET, SDRC_SYSCONFIG); -+ wait_on_value(BIT0, BIT0, SDRC_STATUS, 12000000); -+ __raw_writel(0, SDRC_SYSCONFIG); -+ -+ /* setup sdrc to ball mux */ -+ __raw_writel(SDP_SDRC_SHARING, SDRC_SHARING); -+ -+ /* SDRC_MCFG0 register */ -+ (*(unsigned int *) 0x6D000080) = 0x02584099; /* from Micron */ -+ -+ /* SDRC_RFR_CTRL0 register */ -+ (*(unsigned int *) 0x6D0000a4) = 0x54601; /* for 166M */ -+ -+ /* SDRC_ACTIM_CTRLA0 register */ -+ (*(unsigned int *) 0x6D00009c) = 0xa29db4c6; /* for 166M */ -+ -+ /* SDRC_ACTIM_CTRLB0 register */ -+ (*(unsigned int *) 0x6D0000a0) = 0x12214; /* for 166M */ -+ -+ /* Disble Power Down of CKE cuz of 1 CKE on combo part */ -+ (*(unsigned int *) 0x6D000070) = 0x00000081; -+ -+ /* SDRC_Manual command register */ -+ (*(unsigned int *) 0x6D0000a8) = 0x00000000; /* NOP command */ -+ (*(unsigned int *) 0x6D0000a8) = 0x00000001; /* Precharge command */ -+ (*(unsigned int *) 0x6D0000a8) = 0x00000002; /* Auto-refresh command */ -+ (*(unsigned int *) 0x6D0000a8) = 0x00000002; /* Auto-refresh command */ -+ -+ /* SDRC MR0 register */ -+ (*(int *) 0x6D000084) = 0x00000032; /* Burst length = 4 */ -+ /* CAS latency = 3, Write Burst = Read Burst Serial Mode */ -+ -+ /* SDRC DLLA control register */ -+ (*(unsigned int *) 0x6D000060) = 0x0000A; -+ sdelay(0x20000); -+} -+ -+void enable_gpmc_config(u32 *gpmc_config, u32 gpmc_base, u32 base, u32 size) -+{ -+ __raw_writel(0, GPMC_CONFIG7 + gpmc_base); -+ sdelay(1000); -+ /* Delay for settling */ -+ __raw_writel(gpmc_config[0], GPMC_CONFIG1 + gpmc_base); -+ __raw_writel(gpmc_config[1], GPMC_CONFIG2 + gpmc_base); -+ __raw_writel(gpmc_config[2], GPMC_CONFIG3 + gpmc_base); -+ __raw_writel(gpmc_config[3], GPMC_CONFIG4 + gpmc_base); -+ __raw_writel(gpmc_config[4], GPMC_CONFIG5 + gpmc_base); -+ __raw_writel(gpmc_config[5], GPMC_CONFIG6 + gpmc_base); -+ /* Enable the config */ -+ __raw_writel((((size & 0xF) << 8) | ((base >> 24) & 0x3F) | -+ (1 << 6)), GPMC_CONFIG7 + gpmc_base); -+ sdelay(2000); -+} -+ -+/***************************************************** -+ * gpmc_init(): init gpmc bus -+ * Init GPMC for x16, MuxMode (SDRAM in x32). -+ * This code can only be executed from SRAM or SDRAM. -+ *****************************************************/ -+void gpmc_init(void) -+{ -+ /* putting a blanket check on GPMC based on ZeBu for now */ -+ u32 mux = 0, mwidth; -+ u32 *gpmc_config = NULL; -+ u32 gpmc_base = 0; -+ u32 base = 0; -+ u32 size = 0; -+ u32 f_off = CFG_MONITOR_LEN; -+ u32 f_sec = 0; -+ u32 config = 0; -+ -+ mux = BIT9; -+ mwidth = get_gpmc0_width(); -+ -+ /* global settings */ -+ __raw_writel(0x0, GPMC_IRQENABLE); /* isr's sources masked */ -+ __raw_writel(0, GPMC_TIMEOUT_CONTROL); /* timeout disable */ -+ -+ config = __raw_readl(GPMC_CONFIG); -+ config &= (~0xf00); -+ __raw_writel(config, GPMC_CONFIG); -+ -+ /* Disable the GPMC0 config set by ROM code -+ * It conflicts with our MPDB (both at 0x08000000) -+ */ -+ __raw_writel(0, GPMC_CONFIG7 + GPMC_CONFIG_CS0); -+ sdelay(1000); -+ -+ /* CS 0 */ -+ gpmc_config = gpmc_m_nand; -+ gpmc_base = GPMC_CONFIG_CS0 + (0 * GPMC_CONFIG_WIDTH); -+ base = PISMO1_NAND_BASE; -+ size = PISMO1_NAND_SIZE; -+ enable_gpmc_config(gpmc_config, gpmc_base, base, size); -+ -+ f_off = SMNAND_ENV_OFFSET; -+ f_sec = SZ_128K; -+ is_nand = 1; -+ nand_cs_base = gpmc_base; -+ -+ /* env setup */ -+ boot_flash_base = base; -+ boot_flash_off = f_off; -+ boot_flash_sec = f_sec; -+ boot_flash_env_addr = f_off; -+ -+#ifdef ENV_IS_VARIABLE -+ boot_env_get_char_spec = env_get_char_spec; -+ boot_env_init = env_init; -+ boot_saveenv = saveenv; -+ boot_env_relocate_spec = env_relocate_spec; -+#endif -+ -+} -diff --git a/board/omap3530beagle/nand.c b/board/omap3530beagle/nand.c -new file mode 100644 -index 0000000..2f94684 ---- /dev/null -+++ b/board/omap3530beagle/nand.c -@@ -0,0 +1,408 @@ -+/* -+ * (C) Copyright 2004-2008 Texas Instruments, <www.ti.com> -+ * Rohit Choraria <rohitkc@ti.com> -+ * -+ * 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 <common.h> -+#include <asm/io.h> -+#include <asm/arch/mem.h> -+#include <linux/mtd/nand_ecc.h> -+ -+#if defined(CONFIG_CMD_NAND) -+ -+#include <nand.h> -+ -+unsigned char cs; -+volatile unsigned long gpmc_cs_base_add; -+ -+#define GPMC_BUF_EMPTY 0 -+#define GPMC_BUF_FULL 1 -+ -+#define ECC_P1_128_E(val) ((val) & 0x000000FF) /* Bit 0 to 7 */ -+#define ECC_P512_2048_E(val) (((val) & 0x00000F00)>>8) /* Bit 8 to 11 */ -+#define ECC_P1_128_O(val) (((val) & 0x00FF0000)>>16) /* Bit 16 to Bit 23 */ -+#define ECC_P512_2048_O(val) (((val) & 0x0F000000)>>24) /* Bit 24 to Bit 27 */ -+ -+/* -+ * omap_nand_hwcontrol - Set the address pointers corretly for the -+ * following address/data/command operation -+ * @mtd: MTD device structure -+ * @ctrl: Says whether Address or Command or Data is following. -+ */ -+static void omap_nand_hwcontrol(struct mtd_info *mtd, int ctrl) -+{ -+ register struct nand_chip *this = mtd->priv; -+ -+ /* Point the IO_ADDR to DATA and ADDRESS registers instead -+ of chip address */ -+ switch (ctrl) { -+ case NAND_CTL_SETCLE: -+ this->IO_ADDR_W = (void *) gpmc_cs_base_add + GPMC_NAND_CMD; -+ this->IO_ADDR_R = (void *) gpmc_cs_base_add + GPMC_NAND_DAT; -+ break; -+ case NAND_CTL_SETALE: -+ this->IO_ADDR_W = (void *) gpmc_cs_base_add + GPMC_NAND_ADR; -+ this->IO_ADDR_R = (void *) gpmc_cs_base_add + GPMC_NAND_DAT; -+ break; -+ case NAND_CTL_CLRCLE: -+ this->IO_ADDR_W = (void *) gpmc_cs_base_add + GPMC_NAND_DAT; -+ this->IO_ADDR_R = (void *) gpmc_cs_base_add + GPMC_NAND_DAT; -+ break; -+ case NAND_CTL_CLRALE: -+ this->IO_ADDR_W = (void *) gpmc_cs_base_add + GPMC_NAND_DAT; -+ this->IO_ADDR_R = (void *) gpmc_cs_base_add + GPMC_NAND_DAT; -+ break; -+ } -+} -+ -+/* -+ * omap_nand_wait - called primarily after a program/erase operation -+ * so that we access NAND again only after the device -+ * is ready again. -+ * @mtd: MTD device structure -+ * @chip: nand_chip structure -+ * @state: State from which wait function is being called i.e write/erase. -+ */ -+static int omap_nand_wait(struct mtd_info *mtd, struct nand_chip *chip, -+ int state) -+{ -+ register struct nand_chip *this = mtd->priv; -+ int status = 0; -+ -+ this->IO_ADDR_W = (void *) gpmc_cs_base_add + GPMC_NAND_CMD; -+ this->IO_ADDR_R = (void *) gpmc_cs_base_add + GPMC_NAND_DAT; -+ /* Send the status command and loop until the device is free */ -+ while (!(status & 0x40)) { -+ __raw_writeb(NAND_CMD_STATUS & 0xFF, this->IO_ADDR_W); -+ status = __raw_readb(this->IO_ADDR_R); -+ } -+ return status; -+} -+ -+#ifdef CFG_NAND_WIDTH_16 -+/* -+ * omap_nand_write_buf16 - [DEFAULT] write buffer to chip -+ * @mtd: MTD device structure -+ * @buf: data buffer -+ * @len: number of bytes to write -+ * -+ * Default write function for 16bit buswith -+ */ -+static void omap_nand_write_buf(struct mtd_info *mtd, const u_char *buf, -+ int len) -+{ -+ int i; -+ struct nand_chip *this = mtd->priv; -+ u16 *p = (u16 *) buf; -+ len >>= 1; -+ -+ for (i = 0; i < len; i++) { -+ writew(p[i], this->IO_ADDR_W); -+ while (GPMC_BUF_EMPTY == (readl(GPMC_STATUS) & GPMC_BUF_FULL)) ; -+ } -+} -+ -+/* -+ * nand_read_buf16 - [DEFAULT] read chip data into buffer -+ * @mtd: MTD device structure -+ * @buf: buffer to store date -+ * @len: number of bytes to read -+ * -+ * Default read function for 16bit buswith -+ */ -+static void omap_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len) -+{ -+ int i; -+ struct nand_chip *this = mtd->priv; -+ u16 *p = (u16 *) buf; -+ len >>= 1; -+ -+ for (i = 0; i < len; i++) -+ p[i] = readw(this->IO_ADDR_R); -+} -+ -+#else -+/* -+ * omap_nand_write_buf - write buffer to NAND controller -+ * @mtd: MTD device structure -+ * @buf: data buffer -+ * @len: number of bytes to write -+ * -+ */ -+static void omap_nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, -+ int len) -+{ -+ int i; -+ int j = 0; -+ struct nand_chip *chip = mtd->priv; -+ -+ for (i = 0; i < len; i++) { -+ writeb(buf[i], chip->IO_ADDR_W); -+ for (j = 0; j < 10; j++) ; -+ } -+ -+} -+ -+/* -+ * omap_nand_read_buf - read data from NAND controller into buffer -+ * @mtd: MTD device structure -+ * @buf: buffer to store date -+ * @len: number of bytes to read -+ * -+ */ -+static void omap_nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len) -+{ -+ int i; -+ int j = 0; -+ struct nand_chip *chip = mtd->priv; -+ -+ for (i = 0; i < len; i++) { -+ buf[i] = readb(chip->IO_ADDR_R); -+ while (GPMC_BUF_EMPTY == (readl(GPMC_STATUS) & GPMC_BUF_FULL)); -+ } -+} -+#endif /* CFG_NAND_WIDTH_16 */ -+ -+/* -+ * omap_hwecc_init - Initialize the Hardware ECC for NAND flash in -+ * GPMC controller -+ * @mtd: MTD device structure -+ * -+ */ -+static void omap_hwecc_init(struct nand_chip *chip) -+{ -+ unsigned long val = 0x0; -+ -+ /* Init ECC Control Register */ -+ /* Clear all ECC | Enable Reg1 */ -+ val = ((0x00000001 << 8) | 0x00000001); -+ __raw_writel(val, GPMC_BASE + GPMC_ECC_CONTROL); -+ __raw_writel(0x3fcff000, GPMC_BASE + GPMC_ECC_SIZE_CONFIG); -+} -+ -+/* -+ * omap_correct_data - Compares the ecc read from nand spare area with -+ * ECC registers values -+ * and corrects one bit error if it has occured -+ * @mtd: MTD device structure -+ * @dat: page data -+ * @read_ecc: ecc read from nand flash -+ * @calc_ecc: ecc read from ECC registers -+ */ -+static int omap_correct_data(struct mtd_info *mtd, u_char *dat, -+ u_char *read_ecc, u_char *calc_ecc) -+{ -+ return 0; -+} -+ -+/* -+ * omap_calculate_ecc - Generate non-inverted ECC bytes. -+ * -+ * Using noninverted ECC can be considered ugly since writing a blank -+ * page ie. padding will clear the ECC bytes. This is no problem as -+ * long nobody is trying to write data on the seemingly unused page. -+ * Reading an erased page will produce an ECC mismatch between -+ * generated and read ECC bytes that has to be dealt with separately. -+ * @mtd: MTD structure -+ * @dat: unused -+ * @ecc_code: ecc_code buffer -+ */ -+static int omap_calculate_ecc(struct mtd_info *mtd, const u_char *dat, -+ u_char *ecc_code) -+{ -+ unsigned long val = 0x0; -+ unsigned long reg; -+ -+ /* Start Reading from HW ECC1_Result = 0x200 */ -+ reg = (unsigned long) (GPMC_BASE + GPMC_ECC1_RESULT); -+ val = __raw_readl(reg); -+ -+ *ecc_code++ = ECC_P1_128_E(val); -+ *ecc_code++ = ECC_P1_128_O(val); -+ *ecc_code++ = ECC_P512_2048_E(val) | ECC_P512_2048_O(val) << 4; -+ -+ return 0; -+} -+ -+/* -+ * omap_enable_ecc - This function enables the hardware ecc functionality -+ * @mtd: MTD device structure -+ * @mode: Read/Write mode -+ */ -+static void omap_enable_hwecc(struct mtd_info *mtd, int mode) -+{ -+ struct nand_chip *chip = mtd->priv; -+ unsigned int val = __raw_readl(GPMC_BASE + GPMC_ECC_CONFIG); -+ unsigned int dev_width = (chip->options & NAND_BUSWIDTH_16) >> 1; -+ -+ switch (mode) { -+ case NAND_ECC_READ: -+ __raw_writel(0x101, GPMC_BASE + GPMC_ECC_CONTROL); -+ /* ECC col width | CS | ECC Enable */ -+ val = (dev_width << 7) | (cs << 1) | (0x1); -+ break; -+ case NAND_ECC_READSYN: -+ __raw_writel(0x100, GPMC_BASE + GPMC_ECC_CONTROL); -+ /* ECC col width | CS | ECC Enable */ -+ val = (dev_width << 7) | (cs << 1) | (0x1); -+ break; -+ case NAND_ECC_WRITE: -+ __raw_writel(0x101, GPMC_BASE + GPMC_ECC_CONTROL); -+ /* ECC col width | CS | ECC Enable */ -+ val = (dev_width << 7) | (cs << 1) | (0x1); -+ break; -+ default: -+ printf("Error: Unrecognized Mode[%d]!\n", mode); -+ break; -+ } -+ -+ __raw_writel(val, GPMC_BASE + GPMC_ECC_CONFIG); -+} -+ -+static struct nand_oobinfo hw_nand_oob_64 = { -+ .useecc = MTD_NANDECC_AUTOPLACE, -+ .eccbytes = 12, -+ .eccpos = { -+ 2, 3, 4, 5, -+ 6, 7, 8, 9, -+ 10, 11, 12, 13}, -+ .oobfree = { {20, 50} } /* don't care */ -+}; -+ -+static struct nand_oobinfo sw_nand_oob_64 = { -+ .useecc = MTD_NANDECC_AUTOPLACE, -+ .eccbytes = 24, -+ .eccpos = { -+ 40, 41, 42, 43, 44, 45, 46, 47, -+ 48, 49, 50, 51, 52, 53, 54, 55, -+ 56, 57, 58, 59, 60, 61, 62, 63}, -+ .oobfree = { {2, 38} } -+}; -+ -+void omap_nand_switch_ecc(struct mtd_info *mtd, int hardware) -+{ -+ struct nand_chip *nand = mtd->priv; -+ -+ if (!hardware) { -+ nand->eccmode = NAND_ECC_SOFT; -+ nand->autooob = &sw_nand_oob_64; -+ nand->eccsize = 256; /* set default eccsize */ -+ nand->eccbytes = 3; -+ nand->eccsteps = 8; -+ nand->enable_hwecc = 0; -+ nand->calculate_ecc = nand_calculate_ecc; -+ nand->correct_data = nand_correct_data; -+ } else { -+ nand->eccmode = NAND_ECC_HW3_512; -+ nand->autooob = &hw_nand_oob_64; -+ nand->eccsize = 512; -+ nand->eccbytes = 3; -+ nand->eccsteps = 4; -+ nand->enable_hwecc = omap_enable_hwecc; -+ nand->correct_data = omap_correct_data; -+ nand->calculate_ecc = omap_calculate_ecc; -+ -+ omap_hwecc_init(nand); -+ } -+ -+ mtd->eccsize = nand->eccsize; -+ nand->oobdirty = 1; -+ -+ if (nand->options & NAND_BUSWIDTH_16) { -+ mtd->oobavail = mtd->oobsize - (nand->autooob->eccbytes + 2); -+ if (nand->autooob->eccbytes & 0x01) -+ mtd->oobavail--; -+ } else -+ mtd->oobavail = mtd->oobsize - (nand->autooob->eccbytes + 1); -+} -+ -+/* -+ * Board-specific NAND initialization. The following members of the -+ * argument are board-specific (per include/linux/mtd/nand_new.h): -+ * - IO_ADDR_R?: address to read the 8 I/O lines of the flash device -+ * - IO_ADDR_W?: address to write the 8 I/O lines of the flash device -+ * - hwcontrol: hardwarespecific function for accesing control-lines -+ * - dev_ready: hardwarespecific function for accesing device ready/busy line -+ * - enable_hwecc?: function to enable (reset) hardware ecc generator. Must -+ * only be provided if a hardware ECC is available -+ * - eccmode: mode of ecc, see defines -+ * - chip_delay: chip dependent delay for transfering data from array to -+ * read regs (tR) -+ * - options: various chip options. They can partly be set to inform -+ * nand_scan about special functionality. See the defines for further -+ * explanation -+ * Members with a "?" were not set in the merged testing-NAND branch, -+ * so they are not set here either. -+ */ -+int board_nand_init(struct nand_chip *nand) -+{ -+ int gpmc_config = 0; -+ cs = 0; -+ while (cs <= GPMC_MAX_CS) { -+ /* Each GPMC set for a single CS is at offset 0x30 */ -+ /* already remapped for us */ -+ gpmc_cs_base_add = (GPMC_CONFIG_CS0 + (cs * 0x30)); -+ /* xloader/Uboot would have written the NAND type for us -+ * NOTE: This is a temporary measure and cannot handle ONENAND. -+ * The proper way of doing this is to pass the setup of -+ * u-boot up to kernel using kernel params - something on -+ * the lines of machineID -+ */ -+ /* Check if NAND type is set */ -+ if ((__raw_readl(gpmc_cs_base_add + GPMC_CONFIG1) & 0xC00) == -+ 0x800) { -+ /* Found it!! */ -+ break; -+ } -+ cs++; -+ } -+ if (cs > GPMC_MAX_CS) { -+ printf("NAND: Unable to find NAND settings in " \ -+ "GPMC Configuration - quitting\n"); -+ } -+ -+ gpmc_config = __raw_readl(GPMC_CONFIG); -+ /* Disable Write protect */ -+ gpmc_config |= 0x10; -+ __raw_writel(gpmc_config, GPMC_CONFIG); -+ -+ nand->IO_ADDR_R = (int *) gpmc_cs_base_add + GPMC_NAND_DAT; -+ nand->IO_ADDR_W = (int *) gpmc_cs_base_add + GPMC_NAND_CMD; -+ -+ nand->hwcontrol = omap_nand_hwcontrol; -+ nand->options = NAND_NO_PADDING | NAND_CACHEPRG | NAND_NO_AUTOINCR | -+ NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR; -+ nand->read_buf = omap_nand_read_buf; -+ nand->write_buf = omap_nand_write_buf; -+ nand->eccmode = NAND_ECC_SOFT; -+ /* if RDY/BSY line is connected to OMAP then use the omap ready -+ * function and the generic nand_wait function which reads the -+ * status register after monitoring the RDY/BSY line. Otherwise -+ * use a standard chip delay which is slightly more than tR -+ * (AC Timing) of the NAND device and read the status register -+ * until you get a failure or success -+ */ -+ nand->waitfunc = omap_nand_wait; -+ nand->chip_delay = 50; -+ -+ return 0; -+} -+#endif /* (CONFIG_COMMANDS & CFG_CMD_NAND) */ -diff --git a/board/omap3530beagle/omap3530beagle.c b/board/omap3530beagle/omap3530beagle.c -new file mode 100644 -index 0000000..7d9a566 ---- /dev/null -+++ b/board/omap3530beagle/omap3530beagle.c -@@ -0,0 +1,388 @@ -+/* -+ * (C) Copyright 2004-2008 -+ * Texas Instruments, <www.ti.com> -+ * -+ * Author : -+ * Sunil Kumar <sunilsaini05@gmail.com> -+ * Shashi Ranjan <shashiranjanmca05@gmail.com> -+ * -+ * Derived from Beagle Board and 3430 SDP code by -+ * Richard Woodruff <r-woodruff2@ti.com> -+ * Syed Mohammed Khasim <khasim@ti.com> -+ * -+ * -+ * 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 <common.h> -+#include <asm/io.h> -+#include <asm/arch/bits.h> -+#include <asm/arch/mux.h> -+#include <asm/arch/sys_proto.h> -+#include <asm/arch/mem.h> -+#include <i2c.h> -+#include <asm/mach-types.h> -+ -+#if (CONFIG_COMMANDS & CFG_CMD_NAND) && defined(CFG_NAND_LEGACY) -+#include <linux/mtd/nand_legacy.h> -+extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE]; -+#endif -+ -+#define NOT_EARLY 0 -+ -+/* Permission values for registers -Full fledged permissions to all */ -+#define UNLOCK_1 0xFFFFFFFF -+#define UNLOCK_2 0x00000000 -+#define UNLOCK_3 0x0000FFFF -+ -+/****************************************************************************** -+ * Routine: delay -+ * Description: spinning delay to use before udelay works -+ *****************************************************************************/ -+static inline void delay(unsigned long loops) -+{ -+ __asm__ volatile ("1:\n" "subs %0, %1, #1\n" -+ "bne 1b":"=r" (loops):"0"(loops)); -+} -+ -+/****************************************************************************** -+ * Routine: board_init -+ * Description: Early hardware init. -+ *****************************************************************************/ -+int board_init(void) -+{ -+ DECLARE_GLOBAL_DATA_PTR; -+ -+ gpmc_init(); /* in SRAM or SDRAM, finish GPMC */ -+ /* board id for Linux */ -+ gd->bd->bi_arch_number = MACH_TYPE_OMAP3_BEAGLE; -+ /* boot param addr */ -+ gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100); -+ -+ return 0; -+} -+ -+/****************************************************************************** -+ * Routine: secure_unlock -+ * Description: Setup security registers for access -+ * (GP Device only) -+ *****************************************************************************/ -+void secure_unlock_mem(void) -+{ -+ /* Protection Module Register Target APE (PM_RT) */ -+ __raw_writel(UNLOCK_1, RT_REQ_INFO_PERMISSION_1); -+ __raw_writel(UNLOCK_1, RT_READ_PERMISSION_0); -+ __raw_writel(UNLOCK_1, RT_WRITE_PERMISSION_0); -+ __raw_writel(UNLOCK_2, RT_ADDR_MATCH_1); -+ -+ __raw_writel(UNLOCK_3, GPMC_REQ_INFO_PERMISSION_0); -+ __raw_writel(UNLOCK_3, GPMC_READ_PERMISSION_0); -+ __raw_writel(UNLOCK_3, GPMC_WRITE_PERMISSION_0); -+ -+ __raw_writel(UNLOCK_3, OCM_REQ_INFO_PERMISSION_0); -+ __raw_writel(UNLOCK_3, OCM_READ_PERMISSION_0); -+ __raw_writel(UNLOCK_3, OCM_WRITE_PERMISSION_0); -+ __raw_writel(UNLOCK_2, OCM_ADDR_MATCH_2); -+ -+ /* IVA Changes */ -+ __raw_writel(UNLOCK_3, IVA2_REQ_INFO_PERMISSION_0); -+ __raw_writel(UNLOCK_3, IVA2_READ_PERMISSION_0); -+ __raw_writel(UNLOCK_3, IVA2_WRITE_PERMISSION_0); -+ -+ __raw_writel(UNLOCK_1, SMS_RG_ATT0); /* SDRC region 0 public */ -+} -+ -+/****************************************************************************** -+ * Routine: secureworld_exit() -+ * Description: If chip is EMU and boot type is external -+ * configure secure registers and exit secure world -+ * general use. -+ *****************************************************************************/ -+void secureworld_exit() -+{ -+ unsigned long i; -+ -+ /* configrue non-secure access control register */ -+ __asm__ __volatile__("mrc p15, 0, %0, c1, c1, 2":"=r"(i)); -+ /* enabling co-processor CP10 and CP11 accesses in NS world */ -+ __asm__ __volatile__("orr %0, %0, #0xC00":"=r"(i)); -+ /* allow allocation of locked TLBs and L2 lines in NS world */ -+ /* allow use of PLE registers in NS world also */ -+ __asm__ __volatile__("orr %0, %0, #0x70000":"=r"(i)); -+ __asm__ __volatile__("mcr p15, 0, %0, c1, c1, 2":"=r"(i)); -+ -+ /* Enable ASA in ACR register */ -+ __asm__ __volatile__("mrc p15, 0, %0, c1, c0, 1":"=r"(i)); -+ __asm__ __volatile__("orr %0, %0, #0x10":"=r"(i)); -+ __asm__ __volatile__("mcr p15, 0, %0, c1, c0, 1":"=r"(i)); -+ -+ /* Exiting secure world */ -+ __asm__ __volatile__("mrc p15, 0, %0, c1, c1, 0":"=r"(i)); -+ __asm__ __volatile__("orr %0, %0, #0x31":"=r"(i)); -+ __asm__ __volatile__("mcr p15, 0, %0, c1, c1, 0":"=r"(i)); -+} -+ -+/****************************************************************************** -+ * Routine: setup_auxcr() -+ * Description: Write to AuxCR desired value using SMI. -+ * general use. -+ *****************************************************************************/ -+void setup_auxcr() -+{ -+ unsigned long i; -+ volatile unsigned int j; -+ /* Save r0, r12 and restore them after usage */ -+ __asm__ __volatile__("mov %0, r12":"=r"(j)); -+ __asm__ __volatile__("mov %0, r0":"=r"(i)); -+ -+ /* GP Device ROM code API usage here */ -+ /* r12 = AUXCR Write function and r0 value */ -+ __asm__ __volatile__("mov r12, #0x3"); -+ __asm__ __volatile__("mrc p15, 0, r0, c1, c0, 1"); -+ /* Enabling ASA */ -+ __asm__ __volatile__("orr r0, r0, #0x10"); -+ /* SMI instruction to call ROM Code API */ -+ __asm__ __volatile__(".word 0xE1600070"); -+ __asm__ __volatile__("mov r0, %0":"=r"(i)); -+ __asm__ __volatile__("mov r12, %0":"=r"(j)); -+} -+ -+/****************************************************************************** -+ * Routine: try_unlock_sram() -+ * Description: If chip is GP/EMU(special) type, unlock the SRAM for -+ * general use. -+ *****************************************************************************/ -+void try_unlock_memory() -+{ -+ int mode; -+ int in_sdram = running_in_sdram(); -+ -+ /* if GP device unlock device SRAM for general use */ -+ /* secure code breaks for Secure/Emulation device - HS/E/T */ -+ mode = get_device_type(); -+ if (mode == GP_DEVICE) -+ secure_unlock_mem(); -+ -+ /* If device is EMU and boot is XIP external booting -+ * Unlock firewalls and disable L2 and put chip -+ * out of secure world -+ */ -+ /* Assuming memories are unlocked by the demon who put us in SDRAM */ -+ if ((mode <= EMU_DEVICE) && (get_boot_type() == 0x1F) -+ && (!in_sdram)) { -+ secure_unlock_mem(); -+ secureworld_exit(); -+ } -+ -+ return; -+} -+ -+/****************************************************************************** -+ * Routine: s_init -+ * Description: Does early system init of muxing and clocks. -+ * - Called path is with SRAM stack. -+ *****************************************************************************/ -+void s_init(void) -+{ -+ int in_sdram = running_in_sdram(); -+ -+ watchdog_init(); -+ -+ try_unlock_memory(); -+ -+ /* Right now flushing at low MPU speed. -+ Need to move after clock init */ -+ v7_flush_dcache_all(get_device_type()); -+#ifndef CONFIG_ICACHE_OFF -+ icache_enable(); -+#endif -+ -+#ifdef CONFIG_L2_OFF -+ l2cache_disable(); -+#else -+ l2cache_enable(); -+#endif -+ /* Writing to AuxCR in U-boot using SMI for GP DEV */ -+ /* Currently SMI in Kernel on ES2 devices seems to have an isse -+ * Once that is resolved, we can postpone this config to kernel -+ */ -+ if (get_device_type() == GP_DEVICE) -+ setup_auxcr(); -+ -+ set_muxconf_regs(); -+ delay(100); -+ -+ prcm_init(); -+ -+ per_clocks_enable(); -+ -+ if (!in_sdram) -+ sdrc_init(); -+} -+ -+/****************************************************************************** -+ * Routine: misc_init_r -+ * Description: Init ethernet (done here so udelay works) -+ *****************************************************************************/ -+int misc_init_r(void) -+{ -+ -+ unsigned char byte; -+ -+#ifdef CONFIG_DRIVER_OMAP34XX_I2C -+ i2c_init(CFG_I2C_SPEED, CFG_I2C_SLAVE); -+#endif -+ byte = 0x20; -+ i2c_write(0x4B, 0x7A, 1, &byte, 1); -+ byte = 0x03; -+ i2c_write(0x4B, 0x7D, 1, &byte, 1); -+ byte = 0xE0; -+ i2c_write(0x4B, 0x8E, 1, &byte, 1); -+ byte = 0x05; -+ i2c_write(0x4B, 0x91, 1, &byte, 1); -+ byte = 0x20; -+ i2c_write(0x4B, 0x96, 1, &byte, 1); -+ byte = 0x03; -+ i2c_write(0x4B, 0x99, 1, &byte, 1); -+ byte = 0x33; -+ i2c_write(0x4A, 0xEE, 1, &byte, 1); -+ -+ *((uint *) 0x49058034) = 0xFFFFFAF9; -+ *((uint *) 0x49056034) = 0x0F9F0FFF; -+ *((uint *) 0x49058094) = 0x00000506; -+ *((uint *) 0x49056094) = 0xF060F000; -+ -+ return (0); -+} -+ -+ -+/****************************************************************************** -+ * Routine: wait_for_command_complete -+ * Description: Wait for posting to finish on watchdog -+ *****************************************************************************/ -+void wait_for_command_complete(unsigned int wd_base) -+{ -+ int pending = 1; -+ do { -+ pending = __raw_readl(wd_base + WWPS); -+ } while (pending); -+} -+ -+/****************************************************************************** -+ * Routine: watchdog_init -+ * Description: Shut down watch dogs -+ *****************************************************************************/ -+void watchdog_init(void) -+{ -+ /* There are 3 watch dogs WD1=Secure, WD2=MPU, WD3=IVA. WD1 is -+ * either taken care of by ROM (HS/EMU) or not accessible (GP). -+ * We need to take care of WD2-MPU or take a PRCM reset. WD3 -+ * should not be running and does not generate a PRCM reset. -+ */ -+ -+ sr32(CM_FCLKEN_WKUP, 5, 1, 1); -+ sr32(CM_ICLKEN_WKUP, 5, 1, 1); -+ wait_on_value(BIT5, 0x20, CM_IDLEST_WKUP, 5); /* some issue here */ -+ -+ __raw_writel(WD_UNLOCK1, WD2_BASE + WSPR); -+ wait_for_command_complete(WD2_BASE); -+ __raw_writel(WD_UNLOCK2, WD2_BASE + WSPR); -+} -+ -+/****************************************************************************** -+ * Routine: dram_init -+ * Description: sets uboots idea of sdram size -+ *****************************************************************************/ -+int dram_init(void) -+{ -+ DECLARE_GLOBAL_DATA_PTR; -+ unsigned int size0 = 0, size1 = 0; -+ u32 mtype, btype; -+ -+ btype = get_board_type(); -+ mtype = get_mem_type(); -+ -+ display_board_info(btype); -+ -+ /* If a second bank of DDR is attached to CS1 this is -+ * where it can be started. Early init code will init -+ * memory on CS0. -+ */ -+ if ((mtype == DDR_COMBO) || (mtype == DDR_STACKED)) -+ do_sdrc_init(SDRC_CS1_OSET, NOT_EARLY); -+ -+ size0 = get_sdr_cs_size(SDRC_CS0_OSET); -+ size1 = get_sdr_cs_size(SDRC_CS1_OSET); -+ -+ gd->bd->bi_dram[0].start = PHYS_SDRAM_1; -+ gd->bd->bi_dram[0].size = size0; -+ gd->bd->bi_dram[1].start = PHYS_SDRAM_1 + size0; -+ gd->bd->bi_dram[1].size = size1; -+ -+ return 0; -+} -+ -+/****************************************************************************** -+ * Routine: set_muxconf_regs -+ * Description: Setting up the configuration Mux registers specific to the -+ * hardware. Many pins need to be moved from protect to primary -+ * mode. -+ *****************************************************************************/ -+void set_muxconf_regs(void) -+{ -+ MUX_DEFAULT_ES2(); -+} -+ -+#if (CONFIG_COMMANDS & CFG_CMD_NAND) && defined(CFG_NAND_LEGACY) -+/****************************************************************************** -+ * Routine: nand+_init -+ * Description: Set up nand for nand and jffs2 commands -+ *****************************************************************************/ -+void nand_init(void) -+{ -+ extern flash_info_t flash_info[]; -+ -+ nand_probe(CFG_NAND_ADDR); -+ if (nand_dev_desc[0].ChipID != NAND_ChipID_UNKNOWN) -+ print_size(nand_dev_desc[0].totlen, "\n"); -+ -+#ifdef CFG_JFFS2_MEM_NAND -+ flash_info[CFG_JFFS2_FIRST_BANK].flash_id = nand_dev_desc[0].id; -+ /* only read kernel single meg partition */ -+ flash_info[CFG_JFFS2_FIRST_BANK].size = 1024 * 1024 * 2; -+ /* 1024 blocks in 16meg chip (use less for raw/copied partition) */ -+ flash_info[CFG_JFFS2_FIRST_BANK].sector_count = 1024; -+ /* ?, ram for now, open question, copy to RAM or adapt for NAND */ -+ flash_info[CFG_JFFS2_FIRST_BANK].start[0] = 0x80200000; -+#endif -+} -+#endif -+ -+/****************************************************************************** -+ * Dummy function to handle errors for EABI incompatibility -+ *****************************************************************************/ -+void raise(void) -+{ -+} -+ -+/****************************************************************************** -+ * Dummy function to handle errors for EABI incompatibility -+ *****************************************************************************/ -+void abort(void) -+{ -+} -diff --git a/board/omap3530beagle/sys_info.c b/board/omap3530beagle/sys_info.c -new file mode 100644 -index 0000000..a275557 ---- /dev/null -+++ b/board/omap3530beagle/sys_info.c -@@ -0,0 +1,309 @@ -+/* -+ * (C) Copyright 2008 -+ * Texas Instruments, <www.ti.com> -+ * -+ * Derived from Beagle Board and 3430 SDP code by -+ * Richard Woodruff <r-woodruff2@ti.com> -+ * Syed Mohammed Khasim <khasim@ti.com> -+ * -+ * 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 <common.h> -+#include <asm/io.h> -+#include <asm/arch/bits.h> -+#include <asm/arch/mem.h> /* get mem tables */ -+#include <asm/arch/sys_proto.h> -+#include <i2c.h> -+ -+/************************************************************************** -+ * get_gpmc0_type() -+ ***************************************************************************/ -+u32 get_gpmc0_type(void) -+{ -+ /* Default NAND */ -+ return (2); -+} -+ -+/**************************************************** -+ * get_cpu_type() - low level get cpu type -+ * - no C globals yet. -+ ****************************************************/ -+u32 get_cpu_type(void) -+{ -+ /* fixme, need to get register defines for OMAP3 */ -+ return (CPU_3430); -+} -+ -+/****************************************** -+ * get_cpu_rev(void) - extract version info -+ ******************************************/ -+u32 get_cpu_rev(void) -+{ -+ u32 cpuid = 0; -+ /* On ES1.0 the IDCODE register is not exposed on L4 -+ * so using CPU ID to differentiate -+ * between ES2.0 and ES1.0. -+ */ -+ __asm__ __volatile__("mrc p15, 0, %0, c0, c0, 0":"=r"(cpuid)); -+ if ((cpuid & 0xf) == 0x0) -+ return CPU_3430_ES1; -+ else -+ return CPU_3430_ES2; -+ -+} -+ -+/**************************************************** -+ * is_mem_sdr() - return 1 if mem type in use is SDR -+ ****************************************************/ -+u32 is_mem_sdr(void) -+{ -+ volatile u32 *burst = (volatile u32 *) (SDRC_MR_0 + SDRC_CS0_OSET); -+ if (*burst == SDP_SDRC_MR_0_SDR) -+ return (1); -+ return (0); -+} -+ -+/*********************************************************** -+ * get_mem_type() - identify type of mDDR part used. -+ ***********************************************************/ -+u32 get_mem_type(void) -+{ -+ /* Current SDP3430 uses 2x16 MDDR Infenion parts */ -+ return (DDR_DISCRETE); -+} -+ -+/*********************************************************************** -+ * get_cs0_size() - get size of chip select 0/1 -+ ************************************************************************/ -+u32 get_sdr_cs_size(u32 offset) -+{ -+ u32 size; -+ -+ /* get ram size field */ -+ size = __raw_readl(SDRC_MCFG_0 + offset) >> 8; -+ size &= 0x3FF; /* remove unwanted bits */ -+ size *= SZ_2M; /* find size in MB */ -+ return (size); -+} -+ -+/*********************************************************************** -+ * get_board_type() - get board type based on current production stats. -+ * - NOTE-1-: 2 I2C EEPROMs will someday be populated with proper info. -+ * when they are available we can get info from there. This should -+ * be correct of all known boards up until today. -+ * - NOTE-2- EEPROMs are populated but they are updated very slowly. To -+ * avoid waiting on them we will use ES version of the chip to get info. -+ * A later version of the FPGA migth solve their speed issue. -+ ************************************************************************/ -+u32 get_board_type(void) -+{ -+ if (get_cpu_rev() == CPU_3430_ES2) -+ return SDP_3430_V2; -+ else -+ return SDP_3430_V1; -+} -+ -+/****************************************************************** -+ * get_sysboot_value() - get init word settings -+ ******************************************************************/ -+inline u32 get_sysboot_value(void) -+{ -+ return (0x0000003F & __raw_readl(CONTROL_STATUS)); -+} -+ -+/*************************************************************************** -+ * get_gpmc0_base() - Return current address hardware will be -+ * fetching from. The below effectively gives what is correct, its a bit -+ * mis-leading compared to the TRM. For the most general case the mask -+ * needs to be also taken into account this does work in practice. -+ * - for u-boot we currently map: -+ * -- 0 to nothing, -+ * -- 4 to flash -+ * -- 8 to enent -+ * -- c to wifi -+ ****************************************************************************/ -+u32 get_gpmc0_base(void) -+{ -+ u32 b; -+ -+ b = __raw_readl(GPMC_CONFIG_CS0 + GPMC_CONFIG7); -+ b &= 0x1F; /* keep base [5:0] */ -+ b = b << 24; /* ret 0x0b000000 */ -+ return (b); -+} -+ -+/******************************************************************* -+ * get_gpmc0_width() - See if bus is in x8 or x16 (mainly for nand) -+ *******************************************************************/ -+u32 get_gpmc0_width(void) -+{ -+ return (WIDTH_16BIT); -+} -+ -+/************************************************************************* -+ * get_board_rev() - setup to pass kernel board revision information -+ * returns:(bit[0-3] sub version, higher bit[7-4] is higher version) -+ *************************************************************************/ -+u32 get_board_rev(void) -+{ -+ return (0x20); -+} -+ -+/********************************************************************* -+ * display_board_info() - print banner with board info. -+ *********************************************************************/ -+void display_board_info(u32 btype) -+{ -+ char *bootmode[] = { -+ "NOR", -+ "ONND", -+ "NAND", -+ "P2a", -+ "NOR", -+ "NOR", -+ "P2a", -+ "P2b", -+ }; -+ u32 brev = get_board_rev(); -+ char cpu_3430s[] = "3530"; -+ char db_ver[] = "0.0"; /* board type */ -+ char mem_sdr[] = "mSDR"; /* memory type */ -+ char mem_ddr[] = "LPDDR"; -+ char t_tst[] = "TST"; /* security level */ -+ char t_emu[] = "EMU"; -+ char t_hs[] = "HS"; -+ char t_gp[] = "GP"; -+ char unk[] = "?"; -+#ifdef CONFIG_LED_INFO -+ char led_string[CONFIG_LED_LEN] = { 0 }; -+#endif -+ char p_l3[] = "165"; -+ char p_cpu[] = "2"; -+ -+ char *cpu_s, *db_s, *mem_s, *sec_s; -+ u32 cpu, rev, sec; -+ -+ rev = get_cpu_rev(); -+ cpu = get_cpu_type(); -+ sec = get_device_type(); -+ -+ if (is_mem_sdr()) -+ mem_s = mem_sdr; -+ else -+ mem_s = mem_ddr; -+ -+ cpu_s = cpu_3430s; -+ -+ db_s = db_ver; -+ db_s[0] += (brev >> 4) & 0xF; -+ db_s[2] += brev & 0xF; -+ -+ switch (sec) { -+ case TST_DEVICE: -+ sec_s = t_tst; -+ break; -+ case EMU_DEVICE: -+ sec_s = t_emu; -+ break; -+ case HS_DEVICE: -+ sec_s = t_hs; -+ break; -+ case GP_DEVICE: -+ sec_s = t_gp; -+ break; -+ default: -+ sec_s = unk; -+ } -+ -+ printf("OMAP%s-%s rev %d, CPU-OPP%s L3-%sMHz\n", cpu_s, sec_s, rev, -+ p_cpu, p_l3); -+ printf("OMAP3 Beagle Board + %s/%s\n", -+ mem_s, bootmode[get_gpmc0_type()]); -+ -+} -+ -+/******************************************************** -+ * get_base(); get upper addr of current execution -+ *******************************************************/ -+u32 get_base(void) -+{ -+ u32 val; -+ -+ __asm__ __volatile__("mov %0, pc \n":"=r"(val)::"memory"); -+ val &= 0xF0000000; -+ val >>= 28; -+ return (val); -+} -+ -+/******************************************************** -+ * running_in_flash() - tell if currently running in -+ * flash. -+ *******************************************************/ -+u32 running_in_flash(void) -+{ -+ if (get_base() < 4) -+ return (1); /* in flash */ -+ -+ return (0); /* running in SRAM or SDRAM */ -+} -+ -+/******************************************************** -+ * running_in_sram() - tell if currently running in -+ * sram. -+ *******************************************************/ -+u32 running_in_sram(void) -+{ -+ if (get_base() == 4) -+ return (1); /* in SRAM */ -+ -+ return (0); /* running in FLASH or SDRAM */ -+} -+ -+/******************************************************** -+ * running_in_sdram() - tell if currently running in -+ * flash. -+ *******************************************************/ -+u32 running_in_sdram(void) -+{ -+ if (get_base() > 4) -+ return (1); /* in sdram */ -+ -+ return (0); /* running in SRAM or FLASH */ -+} -+ -+/*************************************************************** -+ * get_boot_type() - Is this an XIP type device or a stream one -+ * bits 4-0 specify type. Bit 5 sys mem/perif -+ ***************************************************************/ -+u32 get_boot_type(void) -+{ -+ u32 v; -+ -+ v = get_sysboot_value() & (BIT4 | BIT3 | BIT2 | BIT1 | BIT0); -+ return v; -+} -+ -+/************************************************************* -+ * get_device_type(): tell if GP/HS/EMU/TST -+ *************************************************************/ -+u32 get_device_type(void) -+{ -+ int mode; -+ -+ mode = __raw_readl(CONTROL_STATUS) & (DEVICE_MASK); -+ return (mode >>= 8); -+} -diff --git a/board/omap3530beagle/syslib.c b/board/omap3530beagle/syslib.c -new file mode 100644 -index 0000000..002c6e8 ---- /dev/null -+++ b/board/omap3530beagle/syslib.c -@@ -0,0 +1,72 @@ -+/* -+ * (C) Copyright 2008 -+ * Texas Instruments, <www.ti.com> -+ * -+ * Richard Woodruff <r-woodruff2@ti.com> -+ * Syed Mohammed Khasim <khasim@ti.com> -+ * -+ * 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 <common.h> -+#include <asm/io.h> -+#include <asm/arch/bits.h> -+#include <asm/arch/mem.h> -+#include <asm/arch/clocks.h> -+#include <asm/arch/sys_proto.h> -+ -+/************************************************************ -+ * sdelay() - simple spin loop. Will be constant time as -+ * its generally used in bypass conditions only. This -+ * is necessary until timers are accessible. -+ * -+ * not inline to increase chances its in cache when called -+ *************************************************************/ -+void sdelay(unsigned long loops) -+{ -+ __asm__ volatile ("1:\n" "subs %0, %1, #1\n" -+ "bne 1b":"=r" (loops):"0"(loops)); -+} -+ -+/***************************************************************** -+ * sr32 - clear & set a value in a bit range for a 32 bit address -+ *****************************************************************/ -+void sr32(u32 addr, u32 start_bit, u32 num_bits, u32 value) -+{ -+ u32 tmp, msk = 0; -+ msk = 1 << num_bits; -+ --msk; -+ tmp = __raw_readl(addr) & ~(msk << start_bit); -+ tmp |= value << start_bit; -+ __raw_writel(tmp, addr); -+} -+ -+/********************************************************************* -+ * wait_on_value() - common routine to allow waiting for changes in -+ * volatile regs. -+ *********************************************************************/ -+u32 wait_on_value(u32 read_bit_mask, u32 match_value, u32 read_addr, u32 bound) -+{ -+ u32 i = 0, val; -+ do { -+ ++i; -+ val = __raw_readl(read_addr) & read_bit_mask; -+ if (val == match_value) -+ return (1); -+ if (i == bound) -+ return (0); -+ } while (1); -+} -diff --git a/board/omap3530beagle/u-boot.lds b/board/omap3530beagle/u-boot.lds -new file mode 100644 -index 0000000..72f15f6 ---- /dev/null -+++ b/board/omap3530beagle/u-boot.lds -@@ -0,0 +1,63 @@ -+/* -+ * January 2004 - Changed to support H4 device -+ * Copyright (c) 2004 Texas Instruments -+ * -+ * (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/omap3/start.o (.text) -+ *(.text) -+ } -+ -+ . = ALIGN(4); -+ .rodata : { *(.rodata) } -+ -+ .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } -+ __exidx_start = .; -+ .ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } -+ __exidx_end = .; -+ -+ . = 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 : { *(.bss) } -+ _end = .; -+} -diff --git a/common/cmd_nand.c b/common/cmd_nand.c -index 9e38bf7..0ae362c 100644 ---- a/common/cmd_nand.c -+++ b/common/cmd_nand.c -@@ -37,6 +37,12 @@ int find_dev_and_part(const char *id, struct mtd_device **dev, - u8 *part_num, struct part_info **part); - #endif - -+#if defined(CONFIG_OMAP) && (defined(CONFIG_OMAP3_BEAGLE)) -+extern void omap_nand_switch_ecc(nand_info_t *nand, int hardware); -+#else -+#define omap_nand_switch_ecc(x, y) do {} while(0) -+#endif -+ - static int nand_dump_oob(nand_info_t *nand, ulong off) - { - return 0; -@@ -222,7 +228,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) - strncmp(cmd, "dump", 4) != 0 && - strncmp(cmd, "read", 4) != 0 && strncmp(cmd, "write", 5) != 0 && - strcmp(cmd, "scrub") != 0 && strcmp(cmd, "markbad") != 0 && -- strcmp(cmd, "biterr") != 0 && -+ strcmp(cmd, "biterr") != 0 && strncmp(cmd, "ecc", 3) != 0 && - strcmp(cmd, "lock") != 0 && strcmp(cmd, "unlock") != 0 ) - goto usage; - -@@ -307,6 +313,19 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) - - } - -+ if (strncmp(cmd, "ecc", 3) == 0) { -+ if (argc < 2) -+ goto usage; -+ if (strncmp(argv[2], "hw", 2) == 0) -+ omap_nand_switch_ecc(nand, 1); -+ else if (strncmp(argv[2], "sw", 2) == 0) -+ omap_nand_switch_ecc(nand, 0); -+ else -+ goto usage; -+ -+ return 0; -+ } -+ - /* read write */ - if (strncmp(cmd, "read", 4) == 0 || strncmp(cmd, "write", 5) == 0) { - int read; -@@ -472,6 +491,7 @@ U_BOOT_CMD(nand, 5, 1, do_nand, - "nand scrub - really clean NAND erasing bad blocks (UNSAFE)\n" - "nand markbad off - mark bad block at offset (UNSAFE)\n" - "nand biterr off - make a bit error at offset (UNSAFE)\n" -+ "nand ecc [hw/sw] - switch the ecc calculation algorithm \n" - "nand lock [tight] [status] - bring nand to lock state or display locked pages\n" - "nand unlock [offset] [size] - unlock section\n"); - -diff --git a/cpu/omap3/Makefile b/cpu/omap3/Makefile -new file mode 100644 -index 0000000..097447a ---- /dev/null -+++ b/cpu/omap3/Makefile -@@ -0,0 +1,43 @@ -+# -+# (C) Copyright 2000-2003 -+# Wolfgang Denk, DENX Software Engineering, wd@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 -+# -+ -+include $(TOPDIR)/config.mk -+ -+LIB = lib$(CPU).a -+ -+START = start.o -+OBJS = interrupts.o cpu.o mmc.o -+ -+all: .depend $(START) $(LIB) -+ -+$(LIB): $(OBJS) -+ $(AR) crv $@ $(OBJS) -+ -+######################################################################### -+ -+.depend: Makefile $(START:.o=.S) $(OBJS:.o=.c) -+ $(CC) -M $(CFLAGS) $(START:.o=.S) $(OBJS:.o=.c) > $@ -+ -+sinclude .depend -+ -+######################################################################### -diff --git a/cpu/omap3/config.mk b/cpu/omap3/config.mk -new file mode 100644 -index 0000000..7551677 ---- /dev/null -+++ b/cpu/omap3/config.mk -@@ -0,0 +1,34 @@ -+# -+# (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 -+# -+PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \ -+ -msoft-float -+ -+PLATFORM_CPPFLAGS += -march=armv7a -+# ========================================================================= -+# -+# Supply options according to compiler version -+# -+# ========================================================================= -+#PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) -+PLATFORM_CPPFLAGS +=$(call cc-option) -+PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -diff --git a/cpu/omap3/cpu.c b/cpu/omap3/cpu.c -new file mode 100644 -index 0000000..59e6a58 ---- /dev/null -+++ b/cpu/omap3/cpu.c -@@ -0,0 +1,221 @@ -+/* -+ * (C) Copyright 2008 Texas Insturments -+ * -+ * (C) Copyright 2002 -+ * Sysgo Real-Time Solutions, GmbH <www.elinos.com> -+ * Marius Groeger <mgroeger@sysgo.de> -+ * -+ * (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 -+ */ -+ -+/* -+ * CPU specific code -+ */ -+ -+#include <common.h> -+#include <command.h> -+#include <asm/arch/sys_proto.h> -+ -+#ifdef CONFIG_USE_IRQ -+DECLARE_GLOBAL_DATA_PTR; -+#endif -+ -+#ifndef CONFIG_L2_OFF -+void l2cache_disable(void); -+#endif -+ -+/* read co-processor 15, register #1 (control register) */ -+static unsigned long read_p15_c1(void) -+{ -+ unsigned long value; -+ -+ __asm__ __volatile__("mrc p15, 0, %0, c1, c0, 0\ -+ @ read control reg\n":"=r"(value) -+ ::"memory"); -+ return value; -+} -+ -+/* write to co-processor 15, register #1 (control register) */ -+static void write_p15_c1(unsigned long value) -+{ -+ __asm__ __volatile__("mcr p15, 0, %0, c1, c0, 0\ -+ @ write it back\n"::"r"(value) -+ : "memory"); -+ -+ read_p15_c1(); -+} -+ -+static void cp_delay(void) -+{ -+ volatile int i; -+ -+ /* Many OMAP regs need at least 2 nops */ -+ for (i = 0; i < 100; i++) ; -+} -+ -+/* See also ARM Ref. Man. */ -+#define C1_MMU (1<<0) /* mmu off/on */ -+#define C1_ALIGN (1<<1) /* alignment faults off/on */ -+#define C1_DC (1<<2) /* dcache off/on */ -+#define C1_WB (1<<3) /* merging write buffer on/off */ -+#define C1_BIG_ENDIAN (1<<7) /* big endian off/on */ -+#define C1_SYS_PROT (1<<8) /* system protection */ -+#define C1_ROM_PROT (1<<9) /* ROM protection */ -+#define C1_IC (1<<12) /* icache off/on */ -+#define C1_HIGH_VECTORS (1<<13) /* location of vectors: low/high addresses */ -+#define RESERVED_1 (0xf << 3) /* must be 111b for R/W */ -+ -+int cpu_init(void) -+{ -+ /* -+ * setup up stacks if necessary -+ */ -+#ifdef CONFIG_USE_IRQ -+ IRQ_STACK_START = -+ _armboot_start - CFG_MALLOC_LEN - CFG_GBL_DATA_SIZE - 4; -+ FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ; -+#endif -+ return 0; -+} -+ -+int cleanup_before_linux(void) -+{ -+ unsigned int i; -+ -+ /* -+ * this function is called just before we call linux -+ * it prepares the processor for linux -+ * -+ * we turn off caches etc ... -+ */ -+ disable_interrupts(); -+ -+ /* turn off I/D-cache */ -+ asm("mrc p15, 0, %0, c1, c0, 0":"=r"(i)); -+ i &= ~(C1_DC | C1_IC); -+ asm("mcr p15, 0, %0, c1, c0, 0": :"r"(i)); -+ -+ /* invalidate I-cache */ -+ arm_cache_flush(); -+#ifndef CONFIG_L2_OFF -+ /* turn off L2 cache */ -+ l2cache_disable(); -+ /* invalidate L2 cache also */ -+ v7_flush_dcache_all(get_device_type()); -+#endif -+ i = 0; -+ /* mem barrier to sync up things */ -+ asm("mcr p15, 0, %0, c7, c10, 4": :"r"(i)); -+ -+#ifndef CONFIG_L2_OFF -+ l2cache_enable(); -+#endif -+ -+ return (0); -+} -+ -+int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) -+{ -+ disable_interrupts(); -+ reset_cpu(0); -+ -+ /* NOTREACHED */ -+ return (0); -+} -+ -+void icache_enable(void) -+{ -+ ulong reg; -+ -+ reg = read_p15_c1(); /* get control reg. */ -+ cp_delay(); -+ write_p15_c1(reg | C1_IC); -+} -+ -+void icache_disable(void) -+{ -+ ulong reg; -+ -+ reg = read_p15_c1(); -+ cp_delay(); -+ write_p15_c1(reg & ~C1_IC); -+} -+ -+void l2cache_enable() -+{ -+ unsigned long i; -+ volatile unsigned int j; -+ -+ /* ES2 onwards we can disable/enable L2 ourselves */ -+ if (get_cpu_rev() == CPU_3430_ES2) { -+ __asm__ __volatile__("mrc p15, 0, %0, c1, c0, 1":"=r"(i)); -+ __asm__ __volatile__("orr %0, %0, #0x2":"=r"(i)); -+ __asm__ __volatile__("mcr p15, 0, %0, c1, c0, 1":"=r"(i)); -+ } else { -+ /* Save r0, r12 and restore them after usage */ -+ __asm__ __volatile__("mov %0, r12":"=r"(j)); -+ __asm__ __volatile__("mov %0, r0":"=r"(i)); -+ -+ /* GP Device ROM code API usage here */ -+ /* r12 = AUXCR Write function and r0 value */ -+ __asm__ __volatile__("mov r12, #0x3"); -+ __asm__ __volatile__("mrc p15, 0, r0, c1, c0, 1"); -+ __asm__ __volatile__("orr r0, r0, #0x2"); -+ /* SMI instruction to call ROM Code API */ -+ __asm__ __volatile__(".word 0xE1600070"); -+ __asm__ __volatile__("mov r0, %0":"=r"(i)); -+ __asm__ __volatile__("mov r12, %0":"=r"(j)); -+ } -+ -+} -+ -+void l2cache_disable() -+{ -+ unsigned long i; -+ volatile unsigned int j; -+ -+ /* ES2 onwards we can disable/enable L2 ourselves */ -+ if (get_cpu_rev() == CPU_3430_ES2) { -+ __asm__ __volatile__("mrc p15, 0, %0, c1, c0, 1":"=r"(i)); -+ __asm__ __volatile__("bic %0, %0, #0x2":"=r"(i)); -+ __asm__ __volatile__("mcr p15, 0, %0, c1, c0, 1":"=r"(i)); -+ } else { -+ /* Save r0, r12 and restore them after usage */ -+ __asm__ __volatile__("mov %0, r12":"=r"(j)); -+ __asm__ __volatile__("mov %0, r0":"=r"(i)); -+ -+ /* GP Device ROM code API usage here */ -+ /* r12 = AUXCR Write function and r0 value */ -+ __asm__ __volatile__("mov r12, #0x3"); -+ __asm__ __volatile__("mrc p15, 0, r0, c1, c0, 1"); -+ __asm__ __volatile__("bic r0, r0, #0x2"); -+ /* SMI instruction to call ROM Code API */ -+ __asm__ __volatile__(".word 0xE1600070"); -+ __asm__ __volatile__("mov r0, %0":"=r"(i)); -+ __asm__ __volatile__("mov r12, %0":"=r"(j)); -+ } -+} -+ -+int icache_status(void) -+{ -+ return (read_p15_c1() & C1_IC) != 0; -+} -diff --git a/cpu/omap3/interrupts.c b/cpu/omap3/interrupts.c -new file mode 100644 -index 0000000..818b833 ---- /dev/null -+++ b/cpu/omap3/interrupts.c -@@ -0,0 +1,304 @@ -+/* -+ * (C) Copyright 2008 -+ * Texas Instruments -+ * -+ * Richard Woodruff <r-woodruff2@ti.com> -+ * Syed Moahmmed Khasim <khasim@ti.com> -+ * -+ * (C) Copyright 2002 -+ * Sysgo Real-Time Solutions, GmbH <www.elinos.com> -+ * Marius Groeger <mgroeger@sysgo.de> -+ * Alex Zuepke <azu@sysgo.de> -+ * -+ * (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 -+ */ -+ -+#include <common.h> -+#include <asm/arch/bits.h> -+ -+#include <asm/proc-armv/ptrace.h> -+ -+#define TIMER_LOAD_VAL 0 -+ -+/* macro to read the 32 bit timer */ -+#define READ_TIMER (*(volatile ulong *)(CFG_TIMERBASE+TCRR)) -+ -+#ifdef CONFIG_USE_IRQ -+/* enable IRQ interrupts */ -+void enable_interrupts(void) -+{ -+ unsigned long temp; -+ __asm__ __volatile__("mrs %0, cpsr\n" -+ "bic %0, %0, #0x80\n" "msr cpsr_c, %0":"=r"(temp) -+ ::"memory"); -+} -+ -+/* -+ * disable IRQ/FIQ interrupts -+ * returns true if interrupts had been enabled before we disabled them -+ */ -+int disable_interrupts(void) -+{ -+ unsigned long old, temp; -+ __asm__ __volatile__("mrs %0, cpsr\n" -+ "orr %1, %0, #0xc0\n" -+ "msr cpsr_c, %1":"=r"(old), "=r"(temp) -+ ::"memory"); -+ return (old & 0x80) == 0; -+} -+#else -+void enable_interrupts(void) -+{ -+ return; -+} -+int disable_interrupts(void) -+{ -+ return 0; -+} -+#endif -+ -+void bad_mode(void) -+{ -+ panic("Resetting CPU ...\n"); -+ reset_cpu(0); -+} -+ -+void show_regs(struct pt_regs *regs) -+{ -+ unsigned long flags; -+ const char *processor_modes[] = { -+ "USER_26", "FIQ_26", "IRQ_26", "SVC_26", -+ "UK4_26", "UK5_26", "UK6_26", "UK7_26", -+ "UK8_26", "UK9_26", "UK10_26", "UK11_26", -+ "UK12_26", "UK13_26", "UK14_26", "UK15_26", -+ "USER_32", "FIQ_32", "IRQ_32", "SVC_32", -+ "UK4_32", "UK5_32", "UK6_32", "ABT_32", -+ "UK8_32", "UK9_32", "UK10_32", "UND_32", -+ "UK12_32", "UK13_32", "UK14_32", "SYS_32", -+ }; -+ -+ flags = condition_codes(regs); -+ -+ printf("pc : [<%08lx>] lr : [<%08lx>]\n" -+ "sp : %08lx ip : %08lx fp : %08lx\n", -+ instruction_pointer(regs), -+ regs->ARM_lr, regs->ARM_sp, regs->ARM_ip, regs->ARM_fp); -+ printf("r10: %08lx r9 : %08lx r8 : %08lx\n", -+ regs->ARM_r10, regs->ARM_r9, regs->ARM_r8); -+ printf("r7 : %08lx r6 : %08lx r5 : %08lx r4 : %08lx\n", -+ regs->ARM_r7, regs->ARM_r6, regs->ARM_r5, regs->ARM_r4); -+ printf("r3 : %08lx r2 : %08lx r1 : %08lx r0 : %08lx\n", -+ regs->ARM_r3, regs->ARM_r2, regs->ARM_r1, regs->ARM_r0); -+ printf("Flags: %c%c%c%c", -+ flags & CC_N_BIT ? 'N' : 'n', -+ flags & CC_Z_BIT ? 'Z' : 'z', -+ flags & CC_C_BIT ? 'C' : 'c', flags & CC_V_BIT ? 'V' : 'v'); -+ printf(" IRQs %s FIQs %s Mode %s%s\n", -+ interrupts_enabled(regs) ? "on" : "off", -+ fast_interrupts_enabled(regs) ? "on" : "off", -+ processor_modes[processor_mode(regs)], -+ thumb_mode(regs) ? " (T)" : ""); -+} -+ -+void do_undefined_instruction(struct pt_regs *pt_regs) -+{ -+ printf("undefined instruction\n"); -+ show_regs(pt_regs); -+ bad_mode(); -+} -+ -+void do_software_interrupt(struct pt_regs *pt_regs) -+{ -+ printf("software interrupt\n"); -+ show_regs(pt_regs); -+ bad_mode(); -+} -+ -+void do_prefetch_abort(struct pt_regs *pt_regs) -+{ -+ printf("prefetch abort\n"); -+ show_regs(pt_regs); -+ bad_mode(); -+} -+ -+void do_data_abort(struct pt_regs *pt_regs) -+{ -+ printf("data abort\n"); -+ show_regs(pt_regs); -+ bad_mode(); -+} -+ -+void do_not_used(struct pt_regs *pt_regs) -+{ -+ printf("not used\n"); -+ show_regs(pt_regs); -+ bad_mode(); -+} -+ -+void do_fiq(struct pt_regs *pt_regs) -+{ -+ printf("fast interrupt request\n"); -+ show_regs(pt_regs); -+ bad_mode(); -+} -+ -+void do_irq(struct pt_regs *pt_regs) -+{ -+ printf("interrupt request\n"); -+ show_regs(pt_regs); -+ bad_mode(); -+} -+ -+ -+static ulong timestamp; -+static ulong lastinc; -+ -+/* nothing really to do with interrupts, just starts up a counter. */ -+int interrupt_init(void) -+{ -+ int32_t val; -+ -+ /* Start the counter ticking up */ -+ /* reload value on overflow */ -+ *((int32_t *) (CFG_TIMERBASE + TLDR)) = TIMER_LOAD_VAL; -+ /* mask to enable timer */ -+ val = (CFG_PVT << 2) | BIT5 | BIT1 | BIT0; -+ *((int32_t *) (CFG_TIMERBASE + TCLR)) = val; /* start timer */ -+ -+ reset_timer_masked(); /* init the timestamp and lastinc value */ -+ -+ return (0); -+} -+ -+/* -+ * timer without interrupts -+ */ -+void reset_timer(void) -+{ -+ reset_timer_masked(); -+} -+ -+ulong get_timer(ulong base) -+{ -+ return get_timer_masked() - base; -+} -+ -+void set_timer(ulong t) -+{ -+ timestamp = t; -+} -+ -+/* delay x useconds AND perserve advance timstamp value */ -+void udelay(unsigned long usec) -+{ -+ ulong tmo, tmp; -+ -+ /* if "big" number, spread normalization to seconds */ -+ if (usec >= 1000) { -+ /* if "big" number, spread normalization to seconds */ -+ tmo = usec / 1000; -+ /* find number of "ticks" to wait to achieve target */ -+ tmo *= CFG_HZ; -+ tmo /= 1000; /* finish normalize. */ -+ } else {/* else small number, don't kill it prior to HZ multiply */ -+ tmo = usec * CFG_HZ; -+ tmo /= (1000 * 1000); -+ } -+ -+ tmp = get_timer(0); /* get current timestamp */ -+ /* if setting this forward will roll time stamp */ -+ if ((tmo + tmp + 1) < tmp) -+ /* reset "advancing" timestamp to 0, set lastinc value */ -+ reset_timer_masked(); -+ else -+ tmo += tmp; /* else, set advancing stamp wake up time */ -+ while (get_timer_masked() < tmo) /* loop till event */ -+ /*NOP*/; -+} -+ -+void reset_timer_masked(void) -+{ -+ /* reset time */ -+ lastinc = READ_TIMER; /* capture current incrementer value time */ -+ timestamp = 0; /* start "advancing" time stamp from 0 */ -+} -+ -+ulong get_timer_masked(void) -+{ -+ ulong now = READ_TIMER; /* current tick value */ -+ -+ if (now >= lastinc) /* normal mode (non roll) */ -+ /* move stamp fordward with absoulte diff ticks */ -+ timestamp += (now - lastinc); -+ else /* we have rollover of incrementer */ -+ timestamp += (0xFFFFFFFF - lastinc) + now; -+ lastinc = now; -+ return timestamp; -+} -+ -+/* waits specified delay value and resets timestamp */ -+void udelay_masked(unsigned long usec) -+{ -+ ulong tmo; -+ ulong endtime; -+ signed long diff; -+ -+ /* if "big" number, spread normalization to seconds */ -+ if (usec >= 1000) { -+ /* start to normalize for usec to ticks per sec */ -+ tmo = usec / 1000; -+ /* find number of "ticks" to wait to achieve target */ -+ tmo *= CFG_HZ; -+ tmo /= 1000; /* finish normalize. */ -+ } else { /* else small number, */ -+ /* don't kill it prior to HZ multiply */ -+ tmo = usec * CFG_HZ; -+ tmo /= (1000 * 1000); -+ } -+ endtime = get_timer_masked() + tmo; -+ -+ do { -+ ulong now = get_timer_masked(); -+ diff = endtime - now; -+ } while (diff >= 0); -+} -+ -+/* -+ * This function is derived from PowerPC code (read timebase as long long). -+ * On ARM it just returns the timer value. -+ */ -+unsigned long long get_ticks(void) -+{ -+ return get_timer(0); -+} -+ -+/* -+ * This function is derived from PowerPC code (timebase clock frequency). -+ * On ARM it returns the number of timer ticks per second. -+ */ -+ulong get_tbclk(void) -+{ -+ ulong tbclk; -+ tbclk = CFG_HZ; -+ return tbclk; -+} -+ -diff --git a/cpu/omap3/mmc.c b/cpu/omap3/mmc.c -new file mode 100644 -index 0000000..741360b ---- /dev/null -+++ b/cpu/omap3/mmc.c -@@ -0,0 +1,559 @@ -+/* -+ * (C) Copyright 2008 -+ * Texas Instruments, <www.ti.com> -+ * Syed Mohammed Khasim <khasim@ti.com> -+ * -+ * 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's version 2 of -+ * the License. -+ * -+ * 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> -+#include <common.h> -+#include <fat.h> -+#include <mmc.h> -+#include <part.h> -+#include <i2c.h> -+ -+const unsigned short mmc_transspeed_val[15][4] = { -+ {CLKD(10, 1), CLKD(10, 10), CLKD(10, 100), CLKD(10, 1000)}, -+ {CLKD(12, 1), CLKD(12, 10), CLKD(12, 100), CLKD(12, 1000)}, -+ {CLKD(13, 1), CLKD(13, 10), CLKD(13, 100), CLKD(13, 1000)}, -+ {CLKD(15, 1), CLKD(15, 10), CLKD(15, 100), CLKD(15, 1000)}, -+ {CLKD(20, 1), CLKD(20, 10), CLKD(20, 100), CLKD(20, 1000)}, -+ {CLKD(26, 1), CLKD(26, 10), CLKD(26, 100), CLKD(26, 1000)}, -+ {CLKD(30, 1), CLKD(30, 10), CLKD(30, 100), CLKD(30, 1000)}, -+ {CLKD(35, 1), CLKD(35, 10), CLKD(35, 100), CLKD(35, 1000)}, -+ {CLKD(40, 1), CLKD(40, 10), CLKD(40, 100), CLKD(40, 1000)}, -+ {CLKD(45, 1), CLKD(45, 10), CLKD(45, 100), CLKD(45, 1000)}, -+ {CLKD(52, 1), CLKD(52, 10), CLKD(52, 100), CLKD(52, 1000)}, -+ {CLKD(55, 1), CLKD(55, 10), CLKD(55, 100), CLKD(55, 1000)}, -+ {CLKD(60, 1), CLKD(60, 10), CLKD(60, 100), CLKD(60, 1000)}, -+ {CLKD(70, 1), CLKD(70, 10), CLKD(70, 100), CLKD(70, 1000)}, -+ {CLKD(80, 1), CLKD(80, 10), CLKD(80, 100), CLKD(80, 1000)} -+}; -+ -+mmc_card_data cur_card_data; -+static block_dev_desc_t mmc_blk_dev; -+ -+block_dev_desc_t *mmc_get_dev(int dev) -+{ -+ return ((block_dev_desc_t *) &mmc_blk_dev); -+} -+ -+void twl4030_mmc_config(void) -+{ -+ unsigned char data; -+ -+ data = 0x20; -+ i2c_write(0x4B, 0x82, 1, &data, 1); -+ data = 0x2; -+ i2c_write(0x4B, 0x85, 1, &data, 1); -+} -+ -+unsigned char mmc_board_init(void) -+{ -+ unsigned int value = 0; -+ -+ twl4030_mmc_config(); -+ -+ value = CONTROL_PBIAS_LITE; -+ CONTROL_PBIAS_LITE = value | (1 << 2) | (1 << 1) | (1 << 9); -+ -+ value = CONTROL_DEV_CONF0; -+ CONTROL_DEV_CONF0 = value | (1 << 24); -+ -+ return 1; -+} -+ -+void mmc_init_stream(void) -+{ -+ volatile unsigned int mmc_stat; -+ -+ OMAP_HSMMC_CON |= INIT_INITSTREAM; -+ -+ OMAP_HSMMC_CMD = MMC_CMD0; -+ do { -+ mmc_stat = OMAP_HSMMC_STAT; -+ } while (!(mmc_stat & CC_MASK)); -+ -+ OMAP_HSMMC_STAT = CC_MASK; -+ -+ OMAP_HSMMC_CMD = MMC_CMD0; -+ do { -+ mmc_stat = OMAP_HSMMC_STAT; -+ } while (!(mmc_stat & CC_MASK)); -+ -+ OMAP_HSMMC_STAT = OMAP_HSMMC_STAT; -+ OMAP_HSMMC_CON &= ~INIT_INITSTREAM; -+} -+ -+unsigned char mmc_clock_config(unsigned int iclk, unsigned short clk_div) -+{ -+ unsigned int val; -+ -+ mmc_reg_out(OMAP_HSMMC_SYSCTL, (ICE_MASK | DTO_MASK | CEN_MASK), -+ (ICE_STOP | DTO_15THDTO | CEN_DISABLE)); -+ -+ switch (iclk) { -+ case CLK_INITSEQ: -+ val = MMC_INIT_SEQ_CLK / 2; -+ break; -+ case CLK_400KHZ: -+ val = MMC_400kHz_CLK; -+ break; -+ case CLK_MISC: -+ val = clk_div; -+ break; -+ default: -+ return 0; -+ } -+ mmc_reg_out(OMAP_HSMMC_SYSCTL, -+ ICE_MASK | CLKD_MASK, (val << CLKD_OFFSET) | ICE_OSCILLATE); -+ -+ while ((OMAP_HSMMC_SYSCTL & ICS_MASK) == ICS_NOTREADY) { -+ } -+ -+ OMAP_HSMMC_SYSCTL |= CEN_ENABLE; -+ return 1; -+} -+ -+unsigned char mmc_init_setup(void) -+{ -+ unsigned int reg_val; -+ -+ mmc_board_init(); -+ -+ OMAP_HSMMC_SYSCONFIG |= MMC_SOFTRESET; -+ while ((OMAP_HSMMC_SYSSTATUS & RESETDONE) == 0) ; -+ -+ OMAP_HSMMC_SYSCTL |= SOFTRESETALL; -+ while ((OMAP_HSMMC_SYSCTL & SOFTRESETALL) != 0x0) ; -+ -+ OMAP_HSMMC_HCTL = DTW_1_BITMODE | SDBP_PWROFF | SDVS_3V0; -+ OMAP_HSMMC_CAPA |= VS30_3V0SUP | VS18_1V8SUP; -+ -+ reg_val = OMAP_HSMMC_CON & RESERVED_MASK; -+ -+ OMAP_HSMMC_CON = CTPL_MMC_SD | reg_val | WPP_ACTIVEHIGH | -+ CDP_ACTIVEHIGH | MIT_CTO | DW8_1_4BITMODE | MODE_FUNC | -+ STR_BLOCK | HR_NOHOSTRESP | INIT_NOINIT | NOOPENDRAIN; -+ -+ mmc_clock_config(CLK_INITSEQ, 0); -+ OMAP_HSMMC_HCTL |= SDBP_PWRON; -+ -+ OMAP_HSMMC_IE = 0x307f0033; -+ -+ mmc_init_stream(); -+ return 1; -+} -+ -+unsigned char mmc_send_cmd(unsigned int cmd, unsigned int arg, -+ unsigned int *response) -+{ -+ volatile unsigned int mmc_stat; -+ -+ while ((OMAP_HSMMC_PSTATE & DATI_MASK) == DATI_CMDDIS) { -+ } -+ -+ OMAP_HSMMC_BLK = BLEN_512BYTESLEN | NBLK_STPCNT; -+ OMAP_HSMMC_STAT = 0xFFFFFFFF; -+ OMAP_HSMMC_ARG = arg; -+ OMAP_HSMMC_CMD = cmd | CMD_TYPE_NORMAL | CICE_NOCHECK | -+ CCCE_NOCHECK | MSBS_SGLEBLK | ACEN_DISABLE | BCE_DISABLE | -+ DE_DISABLE; -+ -+ while (1) { -+ do { -+ mmc_stat = OMAP_HSMMC_STAT; -+ } while (mmc_stat == 0); -+ -+ if ((mmc_stat & ERRI_MASK) != 0) -+ return (unsigned char) mmc_stat; -+ -+ if (mmc_stat & CC_MASK) { -+ OMAP_HSMMC_STAT = CC_MASK; -+ response[0] = OMAP_HSMMC_RSP10; -+ if ((cmd & RSP_TYPE_MASK) == RSP_TYPE_LGHT136) { -+ response[1] = OMAP_HSMMC_RSP32; -+ response[2] = OMAP_HSMMC_RSP54; -+ response[3] = OMAP_HSMMC_RSP76; -+ } -+ break; -+ } -+ } -+ return 1; -+} -+ -+unsigned char mmc_read_data(unsigned int *output_buf) -+{ -+ volatile unsigned int mmc_stat; -+ unsigned int read_count = 0; -+ -+ /* -+ * Start Polled Read -+ */ -+ while (1) { -+ do { -+ mmc_stat = OMAP_HSMMC_STAT; -+ } while (mmc_stat == 0); -+ -+ if ((mmc_stat & ERRI_MASK) != 0) -+ return (unsigned char) mmc_stat; -+ -+ if (mmc_stat & BRR_MASK) { -+ unsigned int k; -+ -+ OMAP_HSMMC_STAT |= BRR_MASK; -+ for (k = 0; k < MMCSD_SECTOR_SIZE / 4; k++) { -+ *output_buf = OMAP_HSMMC_DATA; -+ output_buf++; -+ read_count += 4; -+ } -+ } -+ -+ if (mmc_stat & BWR_MASK) -+ OMAP_HSMMC_STAT |= BWR_MASK; -+ -+ if (mmc_stat & TC_MASK) { -+ OMAP_HSMMC_STAT |= TC_MASK; -+ break; -+ } -+ } -+ return 1; -+} -+ -+unsigned char mmc_detect_card(mmc_card_data *mmc_card_cur) -+{ -+ unsigned char err; -+ unsigned int argument = 0; -+ unsigned int ocr_value, ocr_recvd, ret_cmd41, hcs_val; -+ unsigned int resp[4]; -+ unsigned short retry_cnt = 2000; -+ -+ /* Set to Initialization Clock */ -+ err = mmc_clock_config(CLK_400KHZ, 0); -+ if (err != 1) -+ return err; -+ -+ mmc_card_cur->RCA = MMC_RELATIVE_CARD_ADDRESS; -+ argument = 0x00000000; -+ -+ ocr_value = (0x1FF << 15); -+ err = mmc_send_cmd(MMC_CMD0, argument, resp); -+ if (err != 1) -+ return err; -+ -+ argument = SD_CMD8_CHECK_PATTERN | SD_CMD8_2_7_3_6_V_RANGE; -+ err = mmc_send_cmd(MMC_SDCMD8, argument, resp); -+ hcs_val = (err == 1) ? -+ MMC_OCR_REG_HOST_CAPACITY_SUPPORT_SECTOR : -+ MMC_OCR_REG_HOST_CAPACITY_SUPPORT_BYTE; -+ -+ argument = 0x0000 << 16; -+ err = mmc_send_cmd(MMC_CMD55, argument, resp); -+ if (err == 1) { -+ mmc_card_cur->card_type = SD_CARD; -+ ocr_value |= hcs_val; -+ ret_cmd41 = MMC_ACMD41; -+ } else { -+ mmc_card_cur->card_type = MMC_CARD; -+ ocr_value |= MMC_OCR_REG_ACCESS_MODE_SECTOR; -+ ret_cmd41 = MMC_CMD1; -+ OMAP_HSMMC_CON &= ~OD; -+ OMAP_HSMMC_CON |= OPENDRAIN; -+ } -+ -+ argument = ocr_value; -+ err = mmc_send_cmd(ret_cmd41, argument, resp); -+ if (err != 1) -+ return err; -+ -+ ocr_recvd = ((mmc_resp_r3 *) resp)->ocr; -+ -+ while (!(ocr_recvd & (0x1 << 31)) && (retry_cnt > 0)) { -+ retry_cnt--; -+ if (mmc_card_cur->card_type == SD_CARD) { -+ argument = 0x0000 << 16; -+ err = mmc_send_cmd(MMC_CMD55, argument, resp); -+ } -+ -+ argument = ocr_value; -+ err = mmc_send_cmd(ret_cmd41, argument, resp); -+ if (err != 1) -+ return err; -+ ocr_recvd = ((mmc_resp_r3 *) resp)->ocr; -+ } -+ -+ if (!(ocr_recvd & (0x1 << 31))) -+ return 0; -+ -+ if (mmc_card_cur->card_type == MMC_CARD) { -+ if ((ocr_recvd & MMC_OCR_REG_ACCESS_MODE_MASK) == -+ MMC_OCR_REG_ACCESS_MODE_SECTOR) { -+ mmc_card_cur->mode = SECTOR_MODE; -+ } else { -+ mmc_card_cur->mode = BYTE_MODE; -+ } -+ -+ ocr_recvd &= ~MMC_OCR_REG_ACCESS_MODE_MASK; -+ } else { -+ if ((ocr_recvd & MMC_OCR_REG_HOST_CAPACITY_SUPPORT_MASK) -+ == MMC_OCR_REG_HOST_CAPACITY_SUPPORT_SECTOR) { -+ mmc_card_cur->mode = SECTOR_MODE; -+ } else { -+ mmc_card_cur->mode = BYTE_MODE; -+ } -+ ocr_recvd &= ~MMC_OCR_REG_HOST_CAPACITY_SUPPORT_MASK; -+ } -+ -+ ocr_recvd &= ~(0x1 << 31); -+ if (!(ocr_recvd & ocr_value)) -+ return 0; -+ -+ err = mmc_send_cmd(MMC_CMD2, argument, resp); -+ if (err != 1) -+ return err; -+ -+ if (mmc_card_cur->card_type == MMC_CARD) { -+ argument = mmc_card_cur->RCA << 16; -+ err = mmc_send_cmd(MMC_CMD3, argument, resp); -+ if (err != 1) -+ return err; -+ } else { -+ argument = 0x00000000; -+ err = mmc_send_cmd(MMC_SDCMD3, argument, resp); -+ if (err != 1) -+ return err; -+ -+ mmc_card_cur->RCA = ((mmc_resp_r6 *) resp)->newpublishedrca; -+ } -+ -+ OMAP_HSMMC_CON &= ~OD; -+ OMAP_HSMMC_CON |= NOOPENDRAIN; -+ return 1; -+} -+ -+unsigned char mmc_read_cardsize(mmc_card_data *mmc_dev_data, -+ mmc_csd_reg_t *cur_csd) -+{ -+ mmc_extended_csd_reg_t ext_csd; -+ unsigned int size, count, blk_len, blk_no, card_size, argument; -+ unsigned char err; -+ unsigned int resp[4]; -+ -+ if (mmc_dev_data->mode == SECTOR_MODE) { -+ if (mmc_dev_data->card_type == SD_CARD) { -+ card_size = -+ (((mmc_sd2_csd_reg_t *) cur_csd)-> -+ c_size_lsb & MMC_SD2_CSD_C_SIZE_LSB_MASK) | -+ ((((mmc_sd2_csd_reg_t *) cur_csd)-> -+ c_size_msb & MMC_SD2_CSD_C_SIZE_MSB_MASK) -+ << MMC_SD2_CSD_C_SIZE_MSB_OFFSET); -+ mmc_dev_data->size = card_size * 1024; -+ if (mmc_dev_data->size == 0) -+ return 0; -+ } else { -+ argument = 0x00000000; -+ err = mmc_send_cmd(MMC_CMD8, argument, resp); -+ if (err != 1) -+ return err; -+ err = mmc_read_data((unsigned int *) &ext_csd); -+ if (err != 1) -+ return err; -+ mmc_dev_data->size = ext_csd.sectorcount; -+ -+ if (mmc_dev_data->size == 0) -+ mmc_dev_data->size = 8388608; -+ } -+ } else { -+ if (cur_csd->c_size_mult >= 8) -+ return 0; -+ -+ if (cur_csd->read_bl_len >= 12) -+ return 0; -+ -+ /* Compute size */ -+ count = 1 << (cur_csd->c_size_mult + 2); -+ card_size = (cur_csd->c_size_lsb & MMC_CSD_C_SIZE_LSB_MASK) | -+ ((cur_csd->c_size_msb & MMC_CSD_C_SIZE_MSB_MASK) -+ << MMC_CSD_C_SIZE_MSB_OFFSET); -+ blk_no = (card_size + 1) * count; -+ blk_len = 1 << cur_csd->read_bl_len; -+ size = blk_no * blk_len; -+ mmc_dev_data->size = size / MMCSD_SECTOR_SIZE; -+ if (mmc_dev_data->size == 0) -+ return 0; -+ } -+ return 1; -+} -+ -+unsigned char omap_mmc_read_sect(unsigned int start_sec, unsigned int num_bytes, -+ mmc_card_data *mmc_c, -+ unsigned long *output_buf) -+{ -+ unsigned char err; -+ unsigned int argument; -+ unsigned int resp[4]; -+ unsigned int num_sec_val = -+ (num_bytes + (MMCSD_SECTOR_SIZE - 1)) / MMCSD_SECTOR_SIZE; -+ unsigned int sec_inc_val; -+ -+ if (num_sec_val == 0) -+ return 1; -+ -+ if (mmc_c->mode == SECTOR_MODE) { -+ argument = start_sec; -+ sec_inc_val = 1; -+ } else { -+ argument = start_sec * MMCSD_SECTOR_SIZE; -+ sec_inc_val = MMCSD_SECTOR_SIZE; -+ } -+ -+ while (num_sec_val) { -+ err = mmc_send_cmd(MMC_CMD17, argument, resp); -+ if (err != 1) -+ return err; -+ -+ err = mmc_read_data((unsigned int *) output_buf); -+ if (err != 1) -+ return err; -+ -+ output_buf += (MMCSD_SECTOR_SIZE / 4); -+ argument += sec_inc_val; -+ num_sec_val--; -+ } -+ return 1; -+} -+ -+unsigned char configure_mmc(mmc_card_data *mmc_card_cur) -+{ -+ unsigned char ret_val; -+ unsigned int argument; -+ unsigned int resp[4]; -+ unsigned int trans_clk, trans_fact, trans_unit, retries = 2; -+ mmc_csd_reg_t Card_CSD; -+ unsigned char trans_speed; -+ -+ ret_val = mmc_init_setup(); -+ -+ if (ret_val != 1) -+ return ret_val; -+ -+ do { -+ ret_val = mmc_detect_card(mmc_card_cur); -+ retries--; -+ } while ((retries > 0) && (ret_val != 1)); -+ -+ argument = mmc_card_cur->RCA << 16; -+ ret_val = mmc_send_cmd(MMC_CMD9, argument, resp); -+ if (ret_val != 1) -+ return ret_val; -+ -+ ((unsigned int *) &Card_CSD)[3] = resp[3]; -+ ((unsigned int *) &Card_CSD)[2] = resp[2]; -+ ((unsigned int *) &Card_CSD)[1] = resp[1]; -+ ((unsigned int *) &Card_CSD)[0] = resp[0]; -+ -+ if (mmc_card_cur->card_type == MMC_CARD) -+ mmc_card_cur->version = Card_CSD.spec_vers; -+ -+ trans_speed = Card_CSD.tran_speed; -+ -+ ret_val = mmc_send_cmd(MMC_CMD4, MMC_DSR_DEFAULT << 16, resp); -+ if (ret_val != 1) -+ return ret_val; -+ -+ trans_unit = trans_speed & MMC_CSD_TRAN_SPEED_UNIT_MASK; -+ trans_fact = trans_speed & MMC_CSD_TRAN_SPEED_FACTOR_MASK; -+ -+ if (trans_unit > MMC_CSD_TRAN_SPEED_UNIT_100MHZ) -+ return 0; -+ -+ if ((trans_fact < MMC_CSD_TRAN_SPEED_FACTOR_1_0) || -+ (trans_fact > MMC_CSD_TRAN_SPEED_FACTOR_8_0)) -+ return 0; -+ -+ trans_unit >>= 0; -+ trans_fact >>= 3; -+ -+ trans_clk = mmc_transspeed_val[trans_fact - 1][trans_unit] * 2; -+ ret_val = mmc_clock_config(CLK_MISC, trans_clk); -+ -+ if (ret_val != 1) -+ return ret_val; -+ -+ argument = mmc_card_cur->RCA << 16; -+ ret_val = mmc_send_cmd(MMC_CMD7_SELECT, argument, resp); -+ if (ret_val != 1) -+ return ret_val; -+ -+ /* Configure the block length to 512 bytes */ -+ argument = MMCSD_SECTOR_SIZE; -+ ret_val = mmc_send_cmd(MMC_CMD16, argument, resp); -+ if (ret_val != 1) -+ return ret_val; -+ -+ /* get the card size in sectors */ -+ ret_val = mmc_read_cardsize(mmc_card_cur, &Card_CSD); -+ if (ret_val != 1) -+ return ret_val; -+ -+ return 1; -+} -+unsigned long mmc_bread(int dev_num, unsigned long blknr, lbaint_t blkcnt, -+ void *dst) -+{ -+ omap_mmc_read_sect(blknr, (blkcnt * MMCSD_SECTOR_SIZE), &cur_card_data, -+ (unsigned long *) dst); -+ return 1; -+} -+ -+int mmc_init(int verbose) -+{ -+ configure_mmc(&cur_card_data); -+ -+ mmc_blk_dev.if_type = IF_TYPE_MMC; -+ mmc_blk_dev.part_type = PART_TYPE_DOS; -+ mmc_blk_dev.dev = 0; -+ mmc_blk_dev.lun = 0; -+ mmc_blk_dev.type = 0; -+ -+ /* FIXME fill in the correct size (is set to 32MByte) */ -+ mmc_blk_dev.blksz = MMCSD_SECTOR_SIZE; -+ mmc_blk_dev.lba = 0x10000; -+ mmc_blk_dev.removable = 0; -+ mmc_blk_dev.block_read = mmc_bread; -+ -+ fat_register_device(&mmc_blk_dev, 1); -+ return 0; -+} -+ -+int mmc_read(ulong src, uchar *dst, int size) -+{ -+ return 0; -+} -+ -+int mmc_write(uchar *src, ulong dst, int size) -+{ -+ return 0; -+} -+ -+int mmc2info(ulong addr) -+{ -+ return 0; -+} -diff --git a/cpu/omap3/start.S b/cpu/omap3/start.S -new file mode 100644 -index 0000000..98706ad ---- /dev/null -+++ b/cpu/omap3/start.S -@@ -0,0 +1,517 @@ -+/* -+ * armboot - Startup Code for OMAP3530/ARM Cortex CPU-core -+ * -+ * Copyright (c) 2004 Texas Instruments <r-woodruff2@ti.com> -+ * -+ * Copyright (c) 2001 Marius Gröger <mag@sysgo.de> -+ * Copyright (c) 2002 Alex Züpke <azu@sysgo.de> -+ * Copyright (c) 2002 Gary Jennejohn <gj@denx.de> -+ * Copyright (c) 2003 Richard Woodruff <r-woodruff2@ti.com> -+ * Copyright (c) 2003 Kshitij <kshitij@ti.com> -+ * Copyright (c) 2006-2008 Syed Mohammed Khasim <x0khasim@ti.com> -+ * -+ * 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 <config.h> -+#include <version.h> -+ -+.globl _start -+_start: b reset -+ ldr pc, _undefined_instruction -+ ldr pc, _software_interrupt -+ ldr pc, _prefetch_abort -+ ldr pc, _data_abort -+ ldr pc, _not_used -+ ldr pc, _irq -+ ldr pc, _fiq -+ -+_undefined_instruction: .word undefined_instruction -+_software_interrupt: .word software_interrupt -+_prefetch_abort: .word prefetch_abort -+_data_abort: .word data_abort -+_not_used: .word not_used -+_irq: .word irq -+_fiq: .word fiq -+_pad: .word 0x12345678 /* now 16*4=64 */ -+.global _end_vect -+_end_vect: -+ -+ .balignl 16,0xdeadbeef -+/************************************************************************* -+ * -+ * Startup Code (reset vector) -+ * -+ * do important init only if we don't start from memory! -+ * setup Memory and board specific bits prior to relocation. -+ * relocate armboot to ram -+ * setup stack -+ * -+ *************************************************************************/ -+ -+_TEXT_BASE: -+ .word TEXT_BASE -+ -+.globl _armboot_start -+_armboot_start: -+ .word _start -+ -+/* -+ * These are defined in the board-specific linker script. -+ */ -+.globl _bss_start -+_bss_start: -+ .word __bss_start -+ -+.globl _bss_end -+_bss_end: -+ .word _end -+ -+#ifdef CONFIG_USE_IRQ -+/* IRQ stack memory (calculated at run-time) */ -+.globl IRQ_STACK_START -+IRQ_STACK_START: -+ .word 0x0badc0de -+ -+/* IRQ stack memory (calculated at run-time) */ -+.globl FIQ_STACK_START -+FIQ_STACK_START: -+ .word 0x0badc0de -+#endif -+ -+/* -+ * the actual reset code -+ */ -+ -+reset: -+ /* -+ * set the cpu to SVC32 mode -+ */ -+ mrs r0,cpsr -+ bic r0,r0,#0x1f -+ orr r0,r0,#0xd3 -+ msr cpsr,r0 -+ -+#if (CONFIG_OMAP34XX) -+ /* Copy vectors to mask ROM indirect addr */ -+ adr r0, _start @ r0 <- current position of code -+ add r0, r0, #4 @ skip reset vector -+ mov r2, #64 @ r2 <- size to copy -+ add r2, r0, r2 @ r2 <- source end address -+ mov r1, #SRAM_OFFSET0 @ build vect addr -+ mov r3, #SRAM_OFFSET1 -+ add r1, r1, r3 -+ mov r3, #SRAM_OFFSET2 -+ add r1, r1, r3 -+next: -+ ldmia r0!, {r3-r10} @ copy from source address [r0] -+ stmia r1!, {r3-r10} @ copy to target address [r1] -+ cmp r0, r2 @ until source end address [r2] -+ bne next @ loop until equal */ -+#if !defined(CFG_NAND_BOOT) && !defined(CFG_ONENAND_BOOT) -+ /* No need to copy/exec the clock code - DPLL adjust already done -+ * in NAND/oneNAND Boot. -+ */ -+ bl cpy_clk_code @ put dpll adjust code behind vectors -+#endif /* NAND Boot */ -+#endif -+ /* the mask ROM code should have PLL and others stable */ -+#ifndef CONFIG_SKIP_LOWLEVEL_INIT -+ bl cpu_init_crit -+#endif -+ -+#ifndef CONFIG_SKIP_RELOCATE_UBOOT -+relocate: @ relocate U-Boot to RAM -+ adr r0, _start @ r0 <- current position of code -+ ldr r1, _TEXT_BASE @ test if we run from flash or RAM -+ cmp r0, r1 @ don't reloc during debug -+ beq stack_setup -+ -+ ldr r2, _armboot_start -+ ldr r3, _bss_start -+ sub r2, r3, r2 @ r2 <- size of armboot -+ add r2, r0, r2 @ r2 <- source end address -+ -+copy_loop: @ copy 32 bytes at a time -+ ldmia r0!, {r3-r10} @ copy from source address [r0] -+ stmia r1!, {r3-r10} @ copy to target address [r1] -+ cmp r0, r2 @ until source end addreee [r2] -+ ble copy_loop -+#endif /* CONFIG_SKIP_RELOCATE_UBOOT */ -+ -+ /* Set up the stack */ -+stack_setup: -+ ldr r0, _TEXT_BASE @ upper 128 KiB: relocated uboot -+ sub r0, r0, #CFG_MALLOC_LEN @ malloc area -+ sub r0, r0, #CFG_GBL_DATA_SIZE @ bdinfo -+#ifdef CONFIG_USE_IRQ -+ sub r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ) -+#endif -+ sub sp, r0, #12 @ leave 3 words for abort-stack -+ and sp, sp, #~7 @ 8 byte alinged for (ldr/str)d -+ -+ /* Clear BSS (if any). Is below tx (watch load addr - need space) */ -+clear_bss: -+ ldr r0, _bss_start @ find start of bss segment -+ ldr r1, _bss_end @ stop here -+ mov r2, #0x00000000 @ clear value -+clbss_l: -+ str r2, [r0] @ clear BSS location -+ cmp r0, r1 @ are we at the end yet -+ add r0, r0, #4 @ increment clear index pointer -+ bne clbss_l @ keep clearing till at end -+ -+ ldr pc, _start_armboot @ jump to C code -+ -+_start_armboot: .word start_armboot -+ -+ -+/************************************************************************* -+ * -+ * CPU_init_critical registers -+ * -+ * setup important registers -+ * setup memory timing -+ * -+ *************************************************************************/ -+cpu_init_crit: -+ /* -+ * Invalidate L1 I/D -+ */ -+ mov r0, #0 @ set up for MCR -+ mcr p15, 0, r0, c8, c7, 0 @ invalidate TLBs -+ mcr p15, 0, r0, c7, c5, 0 @ invalidate icache -+ -+ /* -+ * disable MMU stuff and caches -+ */ -+ mrc p15, 0, r0, c1, c0, 0 -+ bic r0, r0, #0x00002000 @ clear bits 13 (--V-) -+ bic r0, r0, #0x00000007 @ clear bits 2:0 (-CAM) -+ orr r0, r0, #0x00000002 @ set bit 1 (--A-) Align -+ orr r0, r0, #0x00000800 @ set bit 12 (Z---) BTB -+ mcr p15, 0, r0, c1, c0, 0 -+ -+ /* -+ * Jump to board specific initialization... -+ * The Mask ROM will have already initialized -+ * basic memory. Go here to bump up clock rate and handle -+ * wake up conditions. -+ */ -+ mov ip, lr @ persevere link reg across call -+ bl lowlevel_init @ go setup pll,mux,memory -+ mov lr, ip @ restore link -+ mov pc, lr @ back to my caller -+/* -+ ************************************************************************* -+ * -+ * Interrupt handling -+ * -+ ************************************************************************* -+ */ -+@ -+@ IRQ stack frame. -+@ -+#define S_FRAME_SIZE 72 -+ -+#define S_OLD_R0 68 -+#define S_PSR 64 -+#define S_PC 60 -+#define S_LR 56 -+#define S_SP 52 -+ -+#define S_IP 48 -+#define S_FP 44 -+#define S_R10 40 -+#define S_R9 36 -+#define S_R8 32 -+#define S_R7 28 -+#define S_R6 24 -+#define S_R5 20 -+#define S_R4 16 -+#define S_R3 12 -+#define S_R2 8 -+#define S_R1 4 -+#define S_R0 0 -+ -+#define MODE_SVC 0x13 -+#define I_BIT 0x80 -+ -+/* -+ * use bad_save_user_regs for abort/prefetch/undef/swi ... -+ * use irq_save_user_regs / irq_restore_user_regs for IRQ/FIQ handling -+ */ -+ -+ .macro bad_save_user_regs -+ sub sp, sp, #S_FRAME_SIZE @ carve out a frame on current -+ @ user stack -+ stmia sp, {r0 - r12} @ Save user registers (now in -+ @ svc mode) r0-r12 -+ -+ ldr r2, _armboot_start -+ sub r2, r2, #(CFG_MALLOC_LEN) -+ sub r2, r2, #(CFG_GBL_DATA_SIZE+8) @ set base 2 words into abort -+ @ stack -+ ldmia r2, {r2 - r3} @ get values for "aborted" pc -+ @ and cpsr (into parm regs) -+ add r0, sp, #S_FRAME_SIZE @ grab pointer to old stack -+ -+ add r5, sp, #S_SP -+ mov r1, lr -+ stmia r5, {r0 - r3} @ save sp_SVC, lr_SVC, pc, cpsr -+ mov r0, sp @ save current stack into r0 -+ @ (param register) -+ .endm -+ -+ .macro irq_save_user_regs -+ sub sp, sp, #S_FRAME_SIZE -+ stmia sp, {r0 - r12} @ Calling r0-r12 -+ add r8, sp, #S_PC @ !! R8 NEEDS to be saved !! -+ @ a reserved stack spot would -+ @ be good. -+ stmdb r8, {sp, lr}^ @ Calling SP, LR -+ str lr, [r8, #0] @ Save calling PC -+ mrs r6, spsr -+ str r6, [r8, #4] @ Save CPSR -+ str r0, [r8, #8] @ Save OLD_R0 -+ mov r0, sp -+ .endm -+ -+ .macro irq_restore_user_regs -+ ldmia sp, {r0 - lr}^ @ Calling r0 - lr -+ mov r0, r0 -+ ldr lr, [sp, #S_PC] @ Get PC -+ add sp, sp, #S_FRAME_SIZE -+ subs pc, lr, #4 @ return & move spsr_svc into -+ @ cpsr -+ .endm -+ -+ .macro get_bad_stack -+ ldr r13, _armboot_start @ setup our mode stack (enter -+ @ in banked mode) -+ sub r13, r13, #(CFG_MALLOC_LEN) @ move past malloc pool -+ sub r13, r13, #(CFG_GBL_DATA_SIZE+8) @ move to reserved a couple -+ @ spots for abort stack -+ -+ str lr, [r13] @ save caller lr in position 0 -+ @ of saved stack -+ mrs lr, spsr @ get the spsr -+ str lr, [r13, #4] @ save spsr in position 1 of -+ @ saved stack -+ -+ mov r13, #MODE_SVC @ prepare SVC-Mode -+ @ msr spsr_c, r13 -+ msr spsr, r13 @ switch modes, make sure -+ @ moves will execute -+ mov lr, pc @ capture return pc -+ movs pc, lr @ jump to next instruction & -+ @ switch modes. -+ .endm -+ -+ .macro get_bad_stack_swi -+ sub r13, r13, #4 @ space on current stack for -+ @ scratch reg. -+ str r0, [r13] @ save R0's value. -+ ldr r0, _armboot_start @ get data regions start -+ sub r0, r0, #(CFG_MALLOC_LEN) @ move past malloc pool -+ sub r0, r0, #(CFG_GBL_DATA_SIZE+8) @ move past gbl and a couple -+ @ spots for abort stack -+ str lr, [r0] @ save caller lr in position 0 -+ @ of saved stack -+ mrs r0, spsr @ get the spsr -+ str lr, [r0, #4] @ save spsr in position 1 of -+ @ saved stack -+ ldr r0, [r13] @ restore r0 -+ add r13, r13, #4 @ pop stack entry -+ .endm -+ -+ .macro get_irq_stack @ setup IRQ stack -+ ldr sp, IRQ_STACK_START -+ .endm -+ -+ .macro get_fiq_stack @ setup FIQ stack -+ ldr sp, FIQ_STACK_START -+ .endm -+ -+/* -+ * exception handlers -+ */ -+ .align 5 -+undefined_instruction: -+ get_bad_stack -+ bad_save_user_regs -+ bl do_undefined_instruction -+ -+ .align 5 -+software_interrupt: -+ get_bad_stack_swi -+ bad_save_user_regs -+ bl do_software_interrupt -+ -+ .align 5 -+prefetch_abort: -+ get_bad_stack -+ bad_save_user_regs -+ bl do_prefetch_abort -+ -+ .align 5 -+data_abort: -+ get_bad_stack -+ bad_save_user_regs -+ bl do_data_abort -+ -+ .align 5 -+not_used: -+ get_bad_stack -+ bad_save_user_regs -+ bl do_not_used -+ -+#ifdef CONFIG_USE_IRQ -+ -+ .align 5 -+irq: -+ get_irq_stack -+ irq_save_user_regs -+ bl do_irq -+ irq_restore_user_regs -+ -+ .align 5 -+fiq: -+ get_fiq_stack -+ /* someone ought to write a more effiction fiq_save_user_regs */ -+ irq_save_user_regs -+ bl do_fiq -+ irq_restore_user_regs -+ -+#else -+ -+ .align 5 -+irq: -+ get_bad_stack -+ bad_save_user_regs -+ bl do_irq -+ -+ .align 5 -+fiq: -+ get_bad_stack -+ bad_save_user_regs -+ bl do_fiq -+ -+#endif -+ .align 5 -+.global arm_cache_flush -+arm_cache_flush: -+ mcr p15, 0, r1, c7, c5, 0 @ invalidate I cache -+ mov pc, lr @ back to caller -+ -+/* -+ * v7_flush_dcache_all() -+ * -+ * Flush the whole D-cache. -+ * -+ * Corrupted registers: r0-r5, r7, r9-r11 -+ * -+ * - mm - mm_struct describing address space -+ */ -+ .align 5 -+.global v7_flush_dcache_all -+v7_flush_dcache_all: -+ stmfd r13!, {r0-r5, r7, r9-r12,r14} -+ -+ mov r7, r0 @ take a backup of device type -+ cmp r0, #0x3 @ check if the device type is -+ @ GP -+ moveq r12, #0x1 @ set up to invalide L2 -+smi: .word 0x01600070 @ Call SMI monitor (smieq) -+ cmp r7, #0x3 @ compare again in case its -+ @ lost -+ beq finished_inval @ if GP device, inval done -+ @ above -+ -+ mrc p15, 1, r0, c0, c0, 1 @ read clidr -+ ands r3, r0, #0x7000000 @ extract loc from clidr -+ mov r3, r3, lsr #23 @ left align loc bit field -+ beq finished_inval @ if loc is 0, then no need to -+ @ clean -+ mov r10, #0 @ start clean at cache level 0 -+inval_loop1: -+ add r2, r10, r10, lsr #1 @ work out 3x current cache -+ @ level -+ mov r1, r0, lsr r2 @ extract cache type bits from -+ @ clidr -+ and r1, r1, #7 @ mask of the bits for current -+ @ cache only -+ cmp r1, #2 @ see what cache we have at -+ @ this level -+ blt skip_inval @ skip if no cache, or just -+ @ i-cache -+ mcr p15, 2, r10, c0, c0, 0 @ select current cache level -+ @ in cssr -+ isb @ isb to sych the new -+ @ cssr&csidr -+ mrc p15, 1, r1, c0, c0, 0 @ read the new csidr -+ and r2, r1, #7 @ extract the length of the -+ @ cache lines -+ add r2, r2, #4 @ add 4 (line length offset) -+ ldr r4, =0x3ff -+ ands r4, r4, r1, lsr #3 @ find maximum number on the -+ @ way size -+ clz r5, r4 @ find bit position of way -+ @ size increment -+ ldr r7, =0x7fff -+ ands r7, r7, r1, lsr #13 @ extract max number of the -+ @ index size -+inval_loop2: -+ mov r9, r4 @ create working copy of max -+ @ way size -+inval_loop3: -+ orr r11, r10, r9, lsl r5 @ factor way and cache number -+ @ into r11 -+ orr r11, r11, r7, lsl r2 @ factor index number into r11 -+ mcr p15, 0, r11, c7, c6, 2 @ invalidate by set/way -+ subs r9, r9, #1 @ decrement the way -+ bge inval_loop3 -+ subs r7, r7, #1 @ decrement the index -+ bge inval_loop2 -+skip_inval: -+ add r10, r10, #2 @ increment cache number -+ cmp r3, r10 -+ bgt inval_loop1 -+finished_inval: -+ mov r10, #0 @ swith back to cache level 0 -+ mcr p15, 2, r10, c0, c0, 0 @ select current cache level -+ @ in cssr -+ isb -+ -+ ldmfd r13!, {r0-r5, r7, r9-r12,pc} -+ -+ -+ .align 5 -+.global reset_cpu -+reset_cpu: -+ ldr r1, rstctl @ get addr for global reset -+ @ reg -+ mov r3, #0x2 @ full reset pll + mpu -+ str r3, [r1] @ force reset -+ mov r0, r0 -+_loop_forever: -+ b _loop_forever -+rstctl: -+ .word PRM_RSTCTRL -+ -diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c -index 7dab786..7782e9d 100644 ---- a/drivers/i2c/omap24xx_i2c.c -+++ b/drivers/i2c/omap24xx_i2c.c -@@ -22,11 +22,13 @@ - - #include <common.h> - --#ifdef CONFIG_DRIVER_OMAP24XX_I2C -+#if defined(CONFIG_DRIVER_OMAP24XX_I2C) || defined(CONFIG_DRIVER_OMAP34XX_I2C) - - #include <asm/arch/i2c.h> - #include <asm/io.h> - -+#define inb(a) __raw_readb(a) -+#define outb(a,v) __raw_writeb(a,v) - #define inw(a) __raw_readw(a) - #define outw(a,v) __raw_writew(a,v) - -@@ -114,7 +116,11 @@ static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 * value) - - status = wait_for_pin (); - if (status & I2C_STAT_RRDY) { -- *value = inw (I2C_DATA); -+#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) -+ *value = inb(I2C_DATA); -+#else -+ *value = inw(I2C_DATA); -+#endif - udelay (20000); - } else { - i2c_error = 1; -@@ -155,8 +161,23 @@ static int i2c_write_byte (u8 devaddr, u8 regoffset, u8 value) - status = wait_for_pin (); - - if (status & I2C_STAT_XRDY) { -- /* send out two bytes */ -- outw ((value << 8) + regoffset, I2C_DATA); -+#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) -+ /* send out 1 byte */ -+ outb(regoffset, I2C_DATA); -+ outw(I2C_STAT_XRDY, I2C_STAT); -+ status = wait_for_pin(); -+ if ((status & I2C_STAT_XRDY)) { -+ /* send out next 1 byte */ -+ outb(value, I2C_DATA); -+ outw(I2C_STAT_XRDY, I2C_STAT); -+ } else { -+ i2c_error = 1; -+ } -+#else -+ /* send out two bytes */ -+ outw ((value << 8) + regoffset, I2C_DATA); -+#endif -+ - /* must have enough delay to allow BB bit to go low */ - udelay (50000); - if (inw (I2C_STAT) & I2C_STAT_NACK) { -@@ -193,7 +214,11 @@ static void flush_fifo(void) - while(1){ - stat = inw(I2C_STAT); - if(stat == I2C_STAT_RRDY){ -- inw(I2C_DATA); -+#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) -+ inb(I2C_DATA); -+#else -+ inw(I2C_DATA); -+#endif - outw(I2C_STAT_RRDY,I2C_STAT); - udelay(1000); - }else -diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c -index d1423c1..a75c606 100644 ---- a/fs/jffs2/jffs2_1pass.c -+++ b/fs/jffs2/jffs2_1pass.c -@@ -304,7 +304,9 @@ static inline void *get_node_mem_nor(u32 off) - */ - static inline void *get_fl_mem(u32 off, u32 size, void *ext_buf) - { -+#if (defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)) || defined(ONFIG_CMD_FLASH) - struct mtdids *id = current_part->dev->id; -+#endif - - #if defined(CONFIG_CMD_FLASH) - if (id->type == MTD_DEV_TYPE_NOR) -@@ -322,7 +324,9 @@ static inline void *get_fl_mem(u32 off, u32 size, void *ext_buf) - - static inline void *get_node_mem(u32 off) - { -- struct mtdids *id = current_part->dev->id; -+#if (defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)) || defined(ONFIG_CMD_FLASH) -+ struct mtdids *id = current_part->dev->id; -+#endif - - #if defined(CONFIG_CMD_FLASH) - if (id->type == MTD_DEV_TYPE_NOR) -diff --git a/include/asm-arm/arch-omap3/bits.h b/include/asm-arm/arch-omap3/bits.h -new file mode 100644 -index 0000000..8522335 ---- /dev/null -+++ b/include/asm-arm/arch-omap3/bits.h -@@ -0,0 +1,48 @@ -+/* bits.h -+ * Copyright (c) 2004 Texas Instruments -+ * -+ * This package is free software; you can redistribute it and/or -+ * modify it under the terms of the license found in the file -+ * named COPYING that should have accompanied this file. -+ * -+ * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. -+ */ -+#ifndef __bits_h -+#define __bits_h 1 -+ -+#define BIT0 (1<<0) -+#define BIT1 (1<<1) -+#define BIT2 (1<<2) -+#define BIT3 (1<<3) -+#define BIT4 (1<<4) -+#define BIT5 (1<<5) -+#define BIT6 (1<<6) -+#define BIT7 (1<<7) -+#define BIT8 (1<<8) -+#define BIT9 (1<<9) -+#define BIT10 (1<<10) -+#define BIT11 (1<<11) -+#define BIT12 (1<<12) -+#define BIT13 (1<<13) -+#define BIT14 (1<<14) -+#define BIT15 (1<<15) -+#define BIT16 (1<<16) -+#define BIT17 (1<<17) -+#define BIT18 (1<<18) -+#define BIT19 (1<<19) -+#define BIT20 (1<<20) -+#define BIT21 (1<<21) -+#define BIT22 (1<<22) -+#define BIT23 (1<<23) -+#define BIT24 (1<<24) -+#define BIT25 (1<<25) -+#define BIT26 (1<<26) -+#define BIT27 (1<<27) -+#define BIT28 (1<<28) -+#define BIT29 (1<<29) -+#define BIT30 (1<<30) -+#define BIT31 (1<<31) -+ -+#endif -diff --git a/include/asm-arm/arch-omap3/clocks.h b/include/asm-arm/arch-omap3/clocks.h -new file mode 100644 -index 0000000..7cdd58c ---- /dev/null -+++ b/include/asm-arm/arch-omap3/clocks.h -@@ -0,0 +1,62 @@ -+/* -+ * (C) Copyright 2006-2008 -+ * Texas Instruments, <www.ti.com> -+ * Richard Woodruff <r-woodruff2@ti.com> -+ * -+ * 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 _CLOCKS_H_ -+#define _CLOCKS_H_ -+ -+#define LDELAY 12000000 -+ -+#define S12M 12000000 -+#define S13M 13000000 -+#define S19_2M 19200000 -+#define S24M 24000000 -+#define S26M 26000000 -+#define S38_4M 38400000 -+ -+#define FCK_IVA2_ON 0x00000001 -+#define FCK_CORE1_ON 0x03fffe29 -+#define ICK_CORE1_ON 0x3ffffffb -+#define ICK_CORE2_ON 0x0000001f -+#define FCK_WKUP_ON 0x000000e9 -+#define ICK_WKUP_ON 0x0000003f -+#define FCK_DSS_ON 0x00000005 -+#define ICK_DSS_ON 0x00000001 -+#define FCK_CAM_ON 0x00000001 -+#define ICK_CAM_ON 0x00000001 -+#define FCK_PER_ON 0x0003ffff -+#define ICK_PER_ON 0x0003ffff -+ -+/* Used to index into DPLL parameter tables */ -+typedef struct { -+ unsigned int m; -+ unsigned int n; -+ unsigned int fsel; -+ unsigned int m2; -+} dpll_param; -+ -+/* Following functions are exported from lowlevel_init.S */ -+extern dpll_param *get_mpu_dpll_param(void); -+extern dpll_param *get_iva_dpll_param(void); -+extern dpll_param *get_core_dpll_param(void); -+extern dpll_param *get_per_dpll_param(void); -+ -+extern void *_end_vect, *_start; -+ -+#endif -diff --git a/include/asm-arm/arch-omap3/clocks_omap3.h b/include/asm-arm/arch-omap3/clocks_omap3.h -new file mode 100644 -index 0000000..fdb0c4c ---- /dev/null -+++ b/include/asm-arm/arch-omap3/clocks_omap3.h -@@ -0,0 +1,101 @@ -+/* -+ * (C) Copyright 2006-2008 -+ * Texas Instruments, <www.ti.com> -+ * Richard Woodruff <r-woodruff2@ti.com> -+ * -+ * 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 _CLOCKS_OMAP3_H_ -+#define _CLOCKS_OMAP3_H_ -+ -+#define PLL_STOP 1 /* PER & IVA */ -+#define PLL_LOW_POWER_BYPASS 5 /* MPU, IVA & CORE */ -+#define PLL_FAST_RELOCK_BYPASS 6 /* CORE */ -+#define PLL_LOCK 7 /* MPU, IVA, CORE & PER */ -+ -+/* The following configurations are OPP and SysClk value independant -+ * and hence are defined here. All the other DPLL related values are -+ * tabulated in lowlevel_init.S. -+ */ -+ -+/* CORE DPLL */ -+# define CORE_M3X2 2 /* 332MHz : CM_CLKSEL1_EMU */ -+# define CORE_SSI_DIV 3 /* 221MHz : CM_CLKSEL_CORE */ -+# define CORE_FUSB_DIV 2 /* 41.5MHz: */ -+# define CORE_L4_DIV 2 /* 83MHz : L4 */ -+# define CORE_L3_DIV 2 /* 166MHz : L3 {DDR} */ -+# define GFX_DIV 2 /* 83MHz : CM_CLKSEL_GFX */ -+# define WKUP_RSM 2 /* 41.5MHz: CM_CLKSEL_WKUP */ -+ -+/* PER DPLL */ -+# define PER_M6X2 3 /* 288MHz: CM_CLKSEL1_EMU */ -+# define PER_M5X2 4 /* 216MHz: CM_CLKSEL_CAM */ -+# define PER_M4X2 2 /* 432MHz : CM_CLKSEL_DSS-dss1 */ -+# define PER_M3X2 16 /* 54MHz : CM_CLKSEL_DSS-tv */ -+ -+# define CLSEL1_EMU_VAL ((CORE_M3X2 << 16) | (PER_M6X2 << 24) | (0x0a50)) -+ -+# define M_12 0xA6 -+# define N_12 0x05 -+# define FSEL_12 0x07 -+# define M2_12 0x01 /* M3 of 2 */ -+ -+# define M_12_ES1 0x19F -+# define N_12_ES1 0x0E -+# define FSL_12_ES1 0x03 -+# define M2_12_ES1 0x1 /* M3 of 2 */ -+ -+# define M_13 0x14C -+# define N_13 0x0C -+# define FSEL_13 0x03 -+# define M2_13 0x01 /* M3 of 2 */ -+ -+# define M_13_ES1 0x1B2 -+# define N_13_ES1 0x10 -+# define FSL_13_ES1 0x03 -+# define M2_13_ES1 0x01 /* M3 of 2 */ -+ -+# define M_19p2 0x19F -+# define N_19p2 0x17 -+# define FSEL_19p2 0x03 -+# define M2_19p2 0x01 /* M3 of 2 */ -+ -+# define M_19p2_ES1 0x19F -+# define N_19p2_ES1 0x17 -+# define FSL_19p2_ES1 0x03 -+# define M2_19p2_ES1 0x01 /* M3 of 2 */ -+ -+# define M_26 0xA6 -+# define N_26 0x0C -+# define FSEL_26 0x07 -+# define M2_26 0x01 /* M3 of 2 */ -+ -+# define M_26_ES1 0x1B2 -+# define N_26_ES1 0x21 -+# define FSL_26_ES1 0x03 -+# define M2_26_ES1 0x01 /* M3 of 2 */ -+ -+# define M_38p4 0x19F -+# define N_38p4 0x2F -+# define FSEL_38p4 0x03 -+# define M2_38p4 0x01 /* M3 of 2 */ -+ -+# define M_38p4_ES1 0x19F -+# define N_38p4_ES1 0x2F -+# define FSL_38p4_ES1 0x03 -+# define M2_38p4_ES1 0x01 /* M3 of 2 */ -+ -+#endif /* endif _CLOCKS_OMAP3_H_ */ -diff --git a/include/asm-arm/arch-omap3/cpu.h b/include/asm-arm/arch-omap3/cpu.h -new file mode 100644 -index 0000000..d47defb ---- /dev/null -+++ b/include/asm-arm/arch-omap3/cpu.h -@@ -0,0 +1,250 @@ -+/* -+ * (C) Copyright 2006-2008 -+ * Texas Instruments, <www.ti.com> -+ * -+ * 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 -+ * -+ */ -+ -+#ifndef _CPU_H -+#define _CPU_H -+ -+/* Register offsets of common modules */ -+/* Control */ -+#define CONTROL_STATUS (OMAP34XX_CTRL_BASE + 0x2F0) -+#define OMAP34XX_MCR (OMAP34XX_CTRL_BASE + 0x8C) -+#define CONTROL_SCALABLE_OMAP_STATUS (OMAP34XX_CTRL_BASE + 0x44C) -+#define CONTROL_SCALABLE_OMAP_OCP (OMAP34XX_CTRL_BASE + 0x534) -+ -+/* Tap Information */ -+#define TAP_IDCODE_REG (OMAP34XX_TAP_BASE+0x204) -+#define PRODUCTION_ID (OMAP34XX_TAP_BASE+0x208) -+ -+/* device type */ -+#define DEVICE_MASK (BIT8|BIT9|BIT10) -+#define TST_DEVICE 0x0 -+#define EMU_DEVICE 0x1 -+#define HS_DEVICE 0x2 -+#define GP_DEVICE 0x3 -+ -+/* GPMC CS3/cs4/cs6 not avaliable */ -+#define GPMC_BASE (OMAP34XX_GPMC_BASE) -+#define GPMC_SYSCONFIG (OMAP34XX_GPMC_BASE+0x10) -+#define GPMC_IRQSTATUS (OMAP34XX_GPMC_BASE+0x18) -+#define GPMC_IRQENABLE (OMAP34XX_GPMC_BASE+0x1C) -+#define GPMC_TIMEOUT_CONTROL (OMAP34XX_GPMC_BASE+0x40) -+#define GPMC_CONFIG (OMAP34XX_GPMC_BASE+0x50) -+#define GPMC_STATUS (OMAP34XX_GPMC_BASE+0x54) -+ -+#define GPMC_CONFIG_CS0 (OMAP34XX_GPMC_BASE+0x60) -+#define GPMC_CONFIG_WIDTH (0x30) -+ -+#define GPMC_CONFIG1 (0x00) -+#define GPMC_CONFIG2 (0x04) -+#define GPMC_CONFIG3 (0x08) -+#define GPMC_CONFIG4 (0x0C) -+#define GPMC_CONFIG5 (0x10) -+#define GPMC_CONFIG6 (0x14) -+#define GPMC_CONFIG7 (0x18) -+#define GPMC_NAND_CMD (0x1C) -+#define GPMC_NAND_ADR (0x20) -+#define GPMC_NAND_DAT (0x24) -+ -+#define GPMC_ECC_CONFIG (0x1F4) -+#define GPMC_ECC_CONTROL (0x1F8) -+#define GPMC_ECC_SIZE_CONFIG (0x1FC) -+#define GPMC_ECC1_RESULT (0x200) -+#define GPMC_ECC2_RESULT (0x204) -+#define GPMC_ECC3_RESULT (0x208) -+#define GPMC_ECC4_RESULT (0x20C) -+#define GPMC_ECC5_RESULT (0x210) -+#define GPMC_ECC6_RESULT (0x214) -+#define GPMC_ECC7_RESULT (0x218) -+#define GPMC_ECC8_RESULT (0x21C) -+#define GPMC_ECC9_RESULT (0x220) -+ -+/* GPMC Mapping */ -+# define FLASH_BASE 0x10000000 /* NOR flash, */ -+ /* aligned to 256 Meg */ -+# define FLASH_BASE_SDPV1 0x04000000 /* NOR flash, */ -+ /* aligned to 64 Meg */ -+# define FLASH_BASE_SDPV2 0x10000000 /* NOR flash, */ -+ /* aligned to 256 Meg */ -+# define DEBUG_BASE 0x08000000 /* debug board */ -+# define NAND_BASE 0x30000000 /* NAND addr */ -+ /* (actual size small port) */ -+# define PISMO2_BASE 0x18000000 /* PISMO2 CS1/2 */ -+# define ONENAND_MAP 0x20000000 /* OneNand addr */ -+ /* (actual size small port) */ -+ -+/* SMS */ -+#define SMS_SYSCONFIG (OMAP34XX_SMS_BASE+0x10) -+#define SMS_RG_ATT0 (OMAP34XX_SMS_BASE+0x48) -+#define SMS_CLASS_ARB0 (OMAP34XX_SMS_BASE+0xD0) -+#define BURSTCOMPLETE_GROUP7 BIT31 -+ -+/* SDRC */ -+#define SDRC_SYSCONFIG (OMAP34XX_SDRC_BASE+0x10) -+#define SDRC_STATUS (OMAP34XX_SDRC_BASE+0x14) -+#define SDRC_CS_CFG (OMAP34XX_SDRC_BASE+0x40) -+#define SDRC_SHARING (OMAP34XX_SDRC_BASE+0x44) -+#define SDRC_DLLA_CTRL (OMAP34XX_SDRC_BASE+0x60) -+#define SDRC_DLLA_STATUS (OMAP34XX_SDRC_BASE+0x64) -+#define SDRC_DLLB_CTRL (OMAP34XX_SDRC_BASE+0x68) -+#define SDRC_DLLB_STATUS (OMAP34XX_SDRC_BASE+0x6C) -+#define DLLPHASE BIT1 -+#define LOADDLL BIT2 -+#define DLL_DELAY_MASK 0xFF00 -+#define DLL_NO_FILTER_MASK (BIT8|BIT9) -+ -+#define SDRC_POWER (OMAP34XX_SDRC_BASE+0x70) -+#define WAKEUPPROC BIT26 -+ -+#define SDRC_MCFG_0 (OMAP34XX_SDRC_BASE+0x80) -+#define SDRC_MR_0 (OMAP34XX_SDRC_BASE+0x84) -+#define SDRC_ACTIM_CTRLA_0 (OMAP34XX_SDRC_BASE+0x9C) -+#define SDRC_ACTIM_CTRLB_0 (OMAP34XX_SDRC_BASE+0xA0) -+#define SDRC_ACTIM_CTRLA_1 (OMAP34XX_SDRC_BASE+0xC4) -+#define SDRC_ACTIM_CTRLB_1 (OMAP34XX_SDRC_BASE+0xC8) -+#define SDRC_RFR_CTRL (OMAP34XX_SDRC_BASE+0xA4) -+#define SDRC_RFR_CTRL (OMAP34XX_SDRC_BASE+0xA4) -+#define SDRC_MANUAL_0 (OMAP34XX_SDRC_BASE+0xA8) -+#define OMAP34XX_SDRC_CS0 0x80000000 -+#define OMAP34XX_SDRC_CS1 0xA0000000 -+#define CMD_NOP 0x0 -+#define CMD_PRECHARGE 0x1 -+#define CMD_AUTOREFRESH 0x2 -+#define CMD_ENTR_PWRDOWN 0x3 -+#define CMD_EXIT_PWRDOWN 0x4 -+#define CMD_ENTR_SRFRSH 0x5 -+#define CMD_CKE_HIGH 0x6 -+#define CMD_CKE_LOW 0x7 -+#define SOFTRESET BIT1 -+#define SMART_IDLE (0x2 << 3) -+#define REF_ON_IDLE (0x1 << 6) -+ -+/* timer regs offsets (32 bit regs) */ -+#define TIDR 0x0 /* r */ -+#define TIOCP_CFG 0x10 /* rw */ -+#define TISTAT 0x14 /* r */ -+#define TISR 0x18 /* rw */ -+#define TIER 0x1C /* rw */ -+#define TWER 0x20 /* rw */ -+#define TCLR 0x24 /* rw */ -+#define TCRR 0x28 /* rw */ -+#define TLDR 0x2C /* rw */ -+#define TTGR 0x30 /* rw */ -+#define TWPS 0x34 /* r */ -+#define TMAR 0x38 /* rw */ -+#define TCAR1 0x3c /* r */ -+#define TSICR 0x40 /* rw */ -+#define TCAR2 0x44 /* r */ -+ /* enable sys_clk NO-prescale /1 */ -+#define GPT_EN ((0<<2)|BIT1|BIT0) -+ -+/* Watchdog */ -+#define WWPS 0x34 /* r */ -+#define WSPR 0x48 /* rw */ -+#define WD_UNLOCK1 0xAAAA -+#define WD_UNLOCK2 0x5555 -+ -+/* PRCM */ -+#define CM_FCLKEN_IVA2 0x48004000 -+#define CM_CLKEN_PLL_IVA2 0x48004004 -+#define CM_IDLEST_PLL_IVA2 0x48004024 -+#define CM_CLKSEL1_PLL_IVA2 0x48004040 -+#define CM_CLKSEL2_PLL_IVA2 0x48004044 -+#define CM_CLKEN_PLL_MPU 0x48004904 -+#define CM_IDLEST_PLL_MPU 0x48004924 -+#define CM_CLKSEL1_PLL_MPU 0x48004940 -+#define CM_CLKSEL2_PLL_MPU 0x48004944 -+#define CM_FCLKEN1_CORE 0x48004a00 -+#define CM_ICLKEN1_CORE 0x48004a10 -+#define CM_ICLKEN2_CORE 0x48004a14 -+#define CM_CLKSEL_CORE 0x48004a40 -+#define CM_FCLKEN_GFX 0x48004b00 -+#define CM_ICLKEN_GFX 0x48004b10 -+#define CM_CLKSEL_GFX 0x48004b40 -+#define CM_FCLKEN_WKUP 0x48004c00 -+#define CM_ICLKEN_WKUP 0x48004c10 -+#define CM_CLKSEL_WKUP 0x48004c40 -+#define CM_IDLEST_WKUP 0x48004c20 -+#define CM_CLKEN_PLL 0x48004d00 -+#define CM_IDLEST_CKGEN 0x48004d20 -+#define CM_CLKSEL1_PLL 0x48004d40 -+#define CM_CLKSEL2_PLL 0x48004d44 -+#define CM_CLKSEL3_PLL 0x48004d48 -+#define CM_FCLKEN_DSS 0x48004e00 -+#define CM_ICLKEN_DSS 0x48004e10 -+#define CM_CLKSEL_DSS 0x48004e40 -+#define CM_FCLKEN_CAM 0x48004f00 -+#define CM_ICLKEN_CAM 0x48004f10 -+#define CM_CLKSEL_CAM 0x48004F40 -+#define CM_FCLKEN_PER 0x48005000 -+#define CM_ICLKEN_PER 0x48005010 -+#define CM_CLKSEL_PER 0x48005040 -+#define CM_CLKSEL1_EMU 0x48005140 -+ -+#define PRM_CLKSEL 0x48306d40 -+#define PRM_RSTCTRL 0x48307250 -+#define PRM_CLKSRC_CTRL 0x48307270 -+ -+/* SMX-APE */ -+#define PM_RT_APE_BASE_ADDR_ARM (SMX_APE_BASE + 0x10000) -+#define PM_GPMC_BASE_ADDR_ARM (SMX_APE_BASE + 0x12400) -+#define PM_OCM_RAM_BASE_ADDR_ARM (SMX_APE_BASE + 0x12800) -+#define PM_OCM_ROM_BASE_ADDR_ARM (SMX_APE_BASE + 0x12C00) -+#define PM_IVA2_BASE_ADDR_ARM (SMX_APE_BASE + 0x14000) -+ -+#define RT_REQ_INFO_PERMISSION_1 (PM_RT_APE_BASE_ADDR_ARM + 0x68) -+#define RT_READ_PERMISSION_0 (PM_RT_APE_BASE_ADDR_ARM + 0x50) -+#define RT_WRITE_PERMISSION_0 (PM_RT_APE_BASE_ADDR_ARM + 0x58) -+#define RT_ADDR_MATCH_1 (PM_RT_APE_BASE_ADDR_ARM + 0x60) -+ -+#define GPMC_REQ_INFO_PERMISSION_0 (PM_GPMC_BASE_ADDR_ARM + 0x48) -+#define GPMC_READ_PERMISSION_0 (PM_GPMC_BASE_ADDR_ARM + 0x50) -+#define GPMC_WRITE_PERMISSION_0 (PM_GPMC_BASE_ADDR_ARM + 0x58) -+ -+#define OCM_REQ_INFO_PERMISSION_0 (PM_OCM_RAM_BASE_ADDR_ARM + 0x48) -+#define OCM_READ_PERMISSION_0 (PM_OCM_RAM_BASE_ADDR_ARM + 0x50) -+#define OCM_WRITE_PERMISSION_0 (PM_OCM_RAM_BASE_ADDR_ARM + 0x58) -+#define OCM_ADDR_MATCH_2 (PM_OCM_RAM_BASE_ADDR_ARM + 0x80) -+ -+#define IVA2_REQ_INFO_PERMISSION_0 (PM_IVA2_BASE_ADDR_ARM + 0x48) -+#define IVA2_READ_PERMISSION_0 (PM_IVA2_BASE_ADDR_ARM + 0x50) -+#define IVA2_WRITE_PERMISSION_0 (PM_IVA2_BASE_ADDR_ARM + 0x58) -+ -+#define IVA2_REQ_INFO_PERMISSION_1 (PM_IVA2_BASE_ADDR_ARM + 0x68) -+#define IVA2_READ_PERMISSION_1 (PM_IVA2_BASE_ADDR_ARM + 0x70) -+#define IVA2_WRITE_PERMISSION_1 (PM_IVA2_BASE_ADDR_ARM + 0x78) -+ -+#define IVA2_REQ_INFO_PERMISSION_2 (PM_IVA2_BASE_ADDR_ARM + 0x88) -+#define IVA2_READ_PERMISSION_2 (PM_IVA2_BASE_ADDR_ARM + 0x90) -+#define IVA2_WRITE_PERMISSION_2 (PM_IVA2_BASE_ADDR_ARM + 0x98) -+ -+#define IVA2_REQ_INFO_PERMISSION_3 (PM_IVA2_BASE_ADDR_ARM + 0xA8) -+#define IVA2_READ_PERMISSION_3 (PM_IVA2_BASE_ADDR_ARM + 0xB0) -+#define IVA2_WRITE_PERMISSION_3 (PM_IVA2_BASE_ADDR_ARM + 0xB8) -+ -+/* I2C base */ -+#define I2C_BASE1 (OMAP34XX_CORE_L4_IO_BASE + 0x70000) -+#define I2C_BASE2 (OMAP34XX_CORE_L4_IO_BASE + 0x72000) -+#define I2C_BASE3 (OMAP34XX_CORE_L4_IO_BASE + 0x60000) -+ -+#endif /* _CPU_H */ -diff --git a/include/asm-arm/arch-omap3/i2c.h b/include/asm-arm/arch-omap3/i2c.h -new file mode 100644 -index 0000000..5fb0979 ---- /dev/null -+++ b/include/asm-arm/arch-omap3/i2c.h -@@ -0,0 +1,128 @@ -+/* -+ * (C) Copyright 2004-2008 -+ * Texas Instruments, <www.ti.com> -+ * -+ * 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 -+ */ -+#ifndef _I2C_H_ -+#define _I2C_H_ -+ -+#define I2C_DEFAULT_BASE I2C_BASE1 -+ -+#define I2C_REV (I2C_DEFAULT_BASE + 0x00) -+#define I2C_IE (I2C_DEFAULT_BASE + 0x04) -+#define I2C_STAT (I2C_DEFAULT_BASE + 0x08) -+#define I2C_IV (I2C_DEFAULT_BASE + 0x0c) -+#define I2C_BUF (I2C_DEFAULT_BASE + 0x14) -+#define I2C_CNT (I2C_DEFAULT_BASE + 0x18) -+#define I2C_DATA (I2C_DEFAULT_BASE + 0x1c) -+#define I2C_SYSC (I2C_DEFAULT_BASE + 0x20) -+#define I2C_CON (I2C_DEFAULT_BASE + 0x24) -+#define I2C_OA (I2C_DEFAULT_BASE + 0x28) -+#define I2C_SA (I2C_DEFAULT_BASE + 0x2c) -+#define I2C_PSC (I2C_DEFAULT_BASE + 0x30) -+#define I2C_SCLL (I2C_DEFAULT_BASE + 0x34) -+#define I2C_SCLH (I2C_DEFAULT_BASE + 0x38) -+#define I2C_SYSTEST (I2C_DEFAULT_BASE + 0x3c) -+ -+/* I2C masks */ -+ -+/* I2C Interrupt Enable Register (I2C_IE): */ -+#define I2C_IE_GC_IE (1 << 5) -+#define I2C_IE_XRDY_IE (1 << 4) /* Transmit data ready interrupt enable */ -+#define I2C_IE_RRDY_IE (1 << 3) /* Receive data ready interrupt enable */ -+#define I2C_IE_ARDY_IE (1 << 2) /* Register access ready interrupt enable */ -+#define I2C_IE_NACK_IE (1 << 1) /* No acknowledgment interrupt enable */ -+#define I2C_IE_AL_IE (1 << 0) /* Arbitration lost interrupt enable */ -+ -+/* I2C Status Register (I2C_STAT): */ -+ -+#define I2C_STAT_SBD (1 << 15) /* Single byte data */ -+#define I2C_STAT_BB (1 << 12) /* Bus busy */ -+#define I2C_STAT_ROVR (1 << 11) /* Receive overrun */ -+#define I2C_STAT_XUDF (1 << 10) /* Transmit underflow */ -+#define I2C_STAT_AAS (1 << 9) /* Address as slave */ -+#define I2C_STAT_GC (1 << 5) -+#define I2C_STAT_XRDY (1 << 4) /* Transmit data ready */ -+#define I2C_STAT_RRDY (1 << 3) /* Receive data ready */ -+#define I2C_STAT_ARDY (1 << 2) /* Register access ready */ -+#define I2C_STAT_NACK (1 << 1) /* No acknowledgment interrupt enable */ -+#define I2C_STAT_AL (1 << 0) /* Arbitration lost interrupt enable */ -+ -+/* I2C Interrupt Code Register (I2C_INTCODE): */ -+ -+#define I2C_INTCODE_MASK 7 -+#define I2C_INTCODE_NONE 0 -+#define I2C_INTCODE_AL 1 /* Arbitration lost */ -+#define I2C_INTCODE_NAK 2 /* No acknowledgement/general call */ -+#define I2C_INTCODE_ARDY 3 /* Register access ready */ -+#define I2C_INTCODE_RRDY 4 /* Rcv data ready */ -+#define I2C_INTCODE_XRDY 5 /* Xmit data ready */ -+ -+/* I2C Buffer Configuration Register (I2C_BUF): */ -+ -+#define I2C_BUF_RDMA_EN (1 << 15) /* Receive DMA channel enable */ -+#define I2C_BUF_XDMA_EN (1 << 7) /* Transmit DMA channel enable */ -+ -+/* I2C Configuration Register (I2C_CON): */ -+ -+#define I2C_CON_EN (1 << 15) /* I2C module enable */ -+#define I2C_CON_BE (1 << 14) /* Big endian mode */ -+#define I2C_CON_STB (1 << 11) /* Start byte mode (master mode only) */ -+#define I2C_CON_MST (1 << 10) /* Master/slave mode */ -+#define I2C_CON_TRX (1 << 9) /* Transmitter/receiver mode /* -+ /* (master mode only) */ -+#define I2C_CON_XA (1 << 8) /* Expand address */ -+#define I2C_CON_STP (1 << 1) /* Stop condition (master mode only) */ -+#define I2C_CON_STT (1 << 0) /* Start condition (master mode only) */ -+ -+/* I2C System Test Register (I2C_SYSTEST): */ -+ -+#define I2C_SYSTEST_ST_EN (1 << 15) /* System test enable */ -+#define I2C_SYSTEST_FREE (1 << 14) /* Free running mode, on brkpoint) */ -+#define I2C_SYSTEST_TMODE_MASK (3 << 12) /* Test mode select */ -+#define I2C_SYSTEST_TMODE_SHIFT (12) /* Test mode select */ -+#define I2C_SYSTEST_SCL_I (1 << 3) /* SCL line sense input value */ -+#define I2C_SYSTEST_SCL_O (1 << 2) /* SCL line drive output value */ -+#define I2C_SYSTEST_SDA_I (1 << 1) /* SDA line sense input value */ -+#define I2C_SYSTEST_SDA_O (1 << 0) /* SDA line drive output value */ -+ -+#define I2C_SCLL_SCLL (0) -+#define I2C_SCLL_SCLL_M (0xFF) -+#define I2C_SCLL_HSSCLL (8) -+#define I2C_SCLH_HSSCLL_M (0xFF) -+#define I2C_SCLH_SCLH (0) -+#define I2C_SCLH_SCLH_M (0xFF) -+#define I2C_SCLH_HSSCLH (8) -+#define I2C_SCLH_HSSCLH_M (0xFF) -+ -+#define OMAP_I2C_STANDARD 100 -+#define OMAP_I2C_FAST_MODE 400 -+#define OMAP_I2C_HIGH_SPEED 3400 -+ -+#define SYSTEM_CLOCK_12 12000 -+#define SYSTEM_CLOCK_13 13000 -+#define SYSTEM_CLOCK_192 19200 -+#define SYSTEM_CLOCK_96 96000 -+ -+#define I2C_IP_CLK SYSTEM_CLOCK_96 -+#define I2C_PSC_MAX (0x0f) -+#define I2C_PSC_MIN (0x00) -+ -+#endif /* _I2C_H_ */ -diff --git a/include/asm-arm/arch-omap3/mem.h b/include/asm-arm/arch-omap3/mem.h -new file mode 100644 -index 0000000..2c5cc51 ---- /dev/null -+++ b/include/asm-arm/arch-omap3/mem.h -@@ -0,0 +1,220 @@ -+/* -+ * (C) Copyright 2006-2008 -+ * Texas Instruments, <www.ti.com> -+ * Richard Woodruff <r-woodruff2@ti.com> -+ * -+ * 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 -+ */ -+ -+#ifndef _MEM_H_ -+#define _MEM_H_ -+ -+#define SDRC_CS0_OSET 0x0 -+#define SDRC_CS1_OSET 0x30 /* mirror CS1 regs appear offset 0x30 from CS0 */ -+ -+#ifndef __ASSEMBLY__ -+ -+typedef enum { -+ STACKED = 0, -+ IP_DDR = 1, -+ COMBO_DDR = 2, -+ IP_SDR = 3, -+} mem_t; -+ -+#endif /* __ASSEMBLY__ */ -+ -+#define EARLY_INIT 1 -+ -+/* Slower full frequency range default timings for x32 operation*/ -+#define SDP_SDRC_SHARING 0x00000100 -+#define SDP_SDRC_MR_0_SDR 0x00000031 -+ -+/* optimized timings good for current shipping parts */ -+#define SDP_3430_SDRC_RFR_CTRL_165MHz 0x0004e201 /* 7.8us/6ns - 50=0x4e2 */ -+ -+#define DLL_OFFSET 0 -+#define DLL_WRITEDDRCLKX2DIS 1 -+#define DLL_ENADLL 1 -+#define DLL_LOCKDLL 0 -+#define DLL_DLLPHASE_72 0 -+#define DLL_DLLPHASE_90 1 -+ -+/* rkw - need to find of 90/72 degree recommendation for speed like before */ -+#define SDP_SDRC_DLLAB_CTRL ((DLL_ENADLL << 3) | \ -+ (DLL_LOCKDLL << 2) | (DLL_DLLPHASE_90 << 1)) -+ -+/* Infineon part of 3430SDP (165MHz optimized) 6.06ns -+ * ACTIMA -+ * TDAL = Twr/Tck + Trp/tck = 15/6 + 18/6 = 2.5 + 3 = 5.5 -> 6 -+ * TDPL (Twr) = 15/6 = 2.5 -> 3 -+ * TRRD = 12/6 = 2 -+ * TRCD = 18/6 = 3 -+ * TRP = 18/6 = 3 -+ * TRAS = 42/6 = 7 -+ * TRC = 60/6 = 10 -+ * TRFC = 72/6 = 12 -+ * ACTIMB -+ * TCKE = 2 -+ * XSR = 120/6 = 20 -+ */ -+#define TDAL_165 6 -+#define TDPL_165 3 -+#define TRRD_165 2 -+#define TRCD_165 3 -+#define TRP_165 3 -+#define TRAS_165 7 -+#define TRC_165 10 -+#define TRFC_165 12 -+#define V_ACTIMA_165 ((TRFC_165 << 27) | (TRC_165 << 22) | (TRAS_165 << 18) \ -+ | (TRP_165 << 15) | (TRCD_165 << 12) | (TRRD_165 << 9) | \ -+ (TDPL_165 << 6) | (TDAL_165)) -+ -+#define TWTR_165 1 -+#define TCKE_165 2 -+#define TXP_165 2 -+#define XSR_165 20 -+#define V_ACTIMB_165 (((TCKE_165 << 12) | (XSR_165 << 0)) | \ -+ (TXP_165 << 8) | (TWTR_165 << 16)) -+ -+# define SDP_SDRC_ACTIM_CTRLA_0 V_ACTIMA_165 -+# define SDP_SDRC_ACTIM_CTRLB_0 V_ACTIMB_165 -+# define SDP_SDRC_RFR_CTRL SDP_3430_SDRC_RFR_CTRL_165MHz -+ -+/* -+ * GPMC settings - -+ * Definitions is as per the following format -+ * # define <PART>_GPMC_CONFIG<x> <value> -+ * Where: -+ * PART is the part name e.g. STNOR - Intel Strata Flash -+ * x is GPMC config registers from 1 to 6 (there will be 6 macros) -+ * Value is corresponding value -+ * -+ * For every valid PRCM configuration there should be only one definition of -+ * the same. if values are independent of the board, this definition will be -+ * present in this file if values are dependent on the board, then this should -+ * go into corresponding mem-boardName.h file -+ * -+ * Currently valid part Names are (PART): -+ * STNOR - Intel Strata Flash -+ * SMNAND - Samsung NAND -+ * MPDB - H4 MPDB board -+ * SBNOR - Sibley NOR -+ * MNAND - Micron Large page x16 NAND -+ * ONNAND - Samsung One NAND -+ * -+ * include/configs/file.h contains the defn - for all CS we are interested -+ * #define OMAP34XX_GPMC_CSx PART -+ * #define OMAP34XX_GPMC_CSx_SIZE Size -+ * #define OMAP34XX_GPMC_CSx_MAP Map -+ * Where: -+ * x - CS number -+ * PART - Part Name as defined above -+ * SIZE - how big is the mapping to be -+ * GPMC_SIZE_128M - 0x8 -+ * GPMC_SIZE_64M - 0xC -+ * GPMC_SIZE_32M - 0xE -+ * GPMC_SIZE_16M - 0xF -+ * MAP - Map this CS to which address(GPMC address space)- Absolute address -+ * >>24 before being used. -+ */ -+#define GPMC_SIZE_128M 0x8 -+#define GPMC_SIZE_64M 0xC -+#define GPMC_SIZE_32M 0xE -+#define GPMC_SIZE_16M 0xF -+ -+# define SMNAND_GPMC_CONFIG1 0x00000800 -+# define SMNAND_GPMC_CONFIG2 0x00141400 -+# define SMNAND_GPMC_CONFIG3 0x00141400 -+# define SMNAND_GPMC_CONFIG4 0x0F010F01 -+# define SMNAND_GPMC_CONFIG5 0x010C1414 -+# define SMNAND_GPMC_CONFIG6 0x1F0F0A80 -+# define SMNAND_GPMC_CONFIG7 0x00000C44 -+ -+# define M_NAND_GPMC_CONFIG1 0x00001800 -+# define M_NAND_GPMC_CONFIG2 0x00141400 -+# define M_NAND_GPMC_CONFIG3 0x00141400 -+# define M_NAND_GPMC_CONFIG4 0x0F010F01 -+# define M_NAND_GPMC_CONFIG5 0x010C1414 -+# define M_NAND_GPMC_CONFIG6 0x1f0f0A80 -+# define M_NAND_GPMC_CONFIG7 0x00000C44 -+ -+# define STNOR_GPMC_CONFIG1 0x3 -+# define STNOR_GPMC_CONFIG2 0x00151501 -+# define STNOR_GPMC_CONFIG3 0x00060602 -+# define STNOR_GPMC_CONFIG4 0x11091109 -+# define STNOR_GPMC_CONFIG5 0x01141F1F -+# define STNOR_GPMC_CONFIG6 0x000004c4 -+ -+# define SIBNOR_GPMC_CONFIG1 0x1200 -+# define SIBNOR_GPMC_CONFIG2 0x001f1f00 -+# define SIBNOR_GPMC_CONFIG3 0x00080802 -+# define SIBNOR_GPMC_CONFIG4 0x1C091C09 -+# define SIBNOR_GPMC_CONFIG5 0x01131F1F -+# define SIBNOR_GPMC_CONFIG6 0x1F0F03C2 -+ -+# define SDPV2_MPDB_GPMC_CONFIG1 0x00611200 -+# define SDPV2_MPDB_GPMC_CONFIG2 0x001F1F01 -+# define SDPV2_MPDB_GPMC_CONFIG3 0x00080803 -+# define SDPV2_MPDB_GPMC_CONFIG4 0x1D091D09 -+# define SDPV2_MPDB_GPMC_CONFIG5 0x041D1F1F -+# define SDPV2_MPDB_GPMC_CONFIG6 0x1D0904C4 -+ -+# define MPDB_GPMC_CONFIG1 0x00011000 -+# define MPDB_GPMC_CONFIG2 0x001f1f01 -+# define MPDB_GPMC_CONFIG3 0x00080803 -+# define MPDB_GPMC_CONFIG4 0x1c0b1c0a -+# define MPDB_GPMC_CONFIG5 0x041f1F1F -+# define MPDB_GPMC_CONFIG6 0x1F0F04C4 -+ -+# define P2_GPMC_CONFIG1 0x0 -+# define P2_GPMC_CONFIG2 0x0 -+# define P2_GPMC_CONFIG3 0x0 -+# define P2_GPMC_CONFIG4 0x0 -+# define P2_GPMC_CONFIG5 0x0 -+# define P2_GPMC_CONFIG6 0x0 -+ -+# define ONENAND_GPMC_CONFIG1 0x00001200 -+# define ONENAND_GPMC_CONFIG2 0x000F0F01 -+# define ONENAND_GPMC_CONFIG3 0x00030301 -+# define ONENAND_GPMC_CONFIG4 0x0F040F04 -+# define ONENAND_GPMC_CONFIG5 0x010F1010 -+# define ONENAND_GPMC_CONFIG6 0x1F060000 -+ -+/* max number of GPMC Chip Selects */ -+#define GPMC_MAX_CS 8 -+/* max number of GPMC regs */ -+#define GPMC_MAX_REG 7 -+ -+#define PISMO1_NOR 1 -+#define PISMO1_NAND 2 -+#define PISMO2_CS0 3 -+#define PISMO2_CS1 4 -+#define PISMO1_ONENAND 5 -+#define DBG_MPDB 6 -+#define PISMO2_NAND_CS0 7 -+#define PISMO2_NAND_CS1 8 -+ -+/* make it readable for the gpmc_init */ -+#define PISMO1_NOR_BASE FLASH_BASE -+#define PISMO1_NAND_BASE NAND_BASE -+#define PISMO2_CS0_BASE PISMO2_MAP1 -+#define PISMO1_ONEN_BASE ONENAND_MAP -+#define DBG_MPDB_BASE DEBUG_BASE -+ -+#endif /* endif _MEM_H_ */ -diff --git a/include/asm-arm/arch-omap3/mmc.h b/include/asm-arm/arch-omap3/mmc.h -new file mode 100644 -index 0000000..8631aae ---- /dev/null -+++ b/include/asm-arm/arch-omap3/mmc.h -@@ -0,0 +1,235 @@ -+/* -+ * (C) Copyright 2008 -+ * Texas Instruments, <www.ti.com> -+ * Syed Mohammed Khasim <khasim@ti.com> -+ * -+ * 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's version 2 of -+ * the License. -+ * -+ * 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 MMC_H -+#define MMC_H -+ -+#include "mmc_host_def.h" -+ -+/* Responses */ -+#define RSP_TYPE_NONE (RSP_TYPE_NORSP | CCCE_NOCHECK | CICE_NOCHECK) -+#define RSP_TYPE_R1 (RSP_TYPE_LGHT48 | CCCE_CHECK | CICE_CHECK) -+#define RSP_TYPE_R1B (RSP_TYPE_LGHT48B | CCCE_CHECK | CICE_CHECK) -+#define RSP_TYPE_R2 (RSP_TYPE_LGHT136 | CCCE_CHECK | CICE_NOCHECK) -+#define RSP_TYPE_R3 (RSP_TYPE_LGHT48 | CCCE_NOCHECK | CICE_NOCHECK) -+#define RSP_TYPE_R4 (RSP_TYPE_LGHT48 | CCCE_NOCHECK | CICE_NOCHECK) -+#define RSP_TYPE_R5 (RSP_TYPE_LGHT48 | CCCE_CHECK | CICE_CHECK) -+#define RSP_TYPE_R6 (RSP_TYPE_LGHT48 | CCCE_CHECK | CICE_CHECK) -+#define RSP_TYPE_R7 (RSP_TYPE_LGHT48 | CCCE_CHECK | CICE_CHECK) -+ -+/* All supported commands */ -+#define MMC_CMD0 (INDEX(0) | RSP_TYPE_NONE | DP_NO_DATA | DDIR_WRITE) -+#define MMC_CMD1 (INDEX(1) | RSP_TYPE_R3 | DP_NO_DATA | DDIR_WRITE) -+#define MMC_CMD2 (INDEX(2) | RSP_TYPE_R2 | DP_NO_DATA | DDIR_WRITE) -+#define MMC_CMD3 (INDEX(3) | RSP_TYPE_R1 | DP_NO_DATA | DDIR_WRITE) -+#define MMC_SDCMD3 (INDEX(3) | RSP_TYPE_R6 | DP_NO_DATA | DDIR_WRITE) -+#define MMC_CMD4 (INDEX(4) | RSP_TYPE_NONE | DP_NO_DATA | DDIR_WRITE) -+#define MMC_CMD6 (INDEX(6) | RSP_TYPE_R1B | DP_NO_DATA | DDIR_WRITE) -+#define MMC_CMD7_SELECT (INDEX(7) | RSP_TYPE_R1B | DP_NO_DATA | DDIR_WRITE) -+#define MMC_CMD7_DESELECT (INDEX(7) | RSP_TYPE_NONE | DP_NO_DATA | DDIR_WRITE) -+#define MMC_CMD8 (INDEX(8) | RSP_TYPE_R1 | DP_DATA | DDIR_READ) -+#define MMC_SDCMD8 (INDEX(8) | RSP_TYPE_R7 | DP_NO_DATA | DDIR_WRITE) -+#define MMC_CMD9 (INDEX(9) | RSP_TYPE_R2 | DP_NO_DATA | DDIR_WRITE) -+#define MMC_CMD12 (INDEX(12) | RSP_TYPE_R1B | DP_NO_DATA | DDIR_WRITE) -+#define MMC_CMD13 (INDEX(13) | RSP_TYPE_R1 | DP_NO_DATA | DDIR_WRITE) -+#define MMC_CMD15 (INDEX(15) | RSP_TYPE_NONE | DP_NO_DATA | DDIR_WRITE) -+#define MMC_CMD16 (INDEX(16) | RSP_TYPE_R1 | DP_NO_DATA | DDIR_WRITE) -+#define MMC_CMD17 (INDEX(17) | RSP_TYPE_R1 | DP_DATA | DDIR_READ) -+#define MMC_CMD24 (INDEX(24) | RSP_TYPE_R1 | DP_DATA | DDIR_WRITE) -+#define MMC_ACMD6 (INDEX(6) | RSP_TYPE_R1 | DP_NO_DATA | DDIR_WRITE) -+#define MMC_ACMD41 (INDEX(41) | RSP_TYPE_R3 | DP_NO_DATA | DDIR_WRITE) -+#define MMC_ACMD51 (INDEX(51) | RSP_TYPE_R1 | DP_DATA | DDIR_READ) -+#define MMC_CMD55 (INDEX(55) | RSP_TYPE_R1 | DP_NO_DATA | DDIR_WRITE) -+ -+#define MMC_AC_CMD_RCA_MASK (unsigned int)(0xFFFF << 16) -+#define MMC_BC_CMD_DSR_MASK (unsigned int)(0xFFFF << 16) -+#define MMC_DSR_DEFAULT (0x0404) -+#define SD_CMD8_CHECK_PATTERN (0xAA) -+#define SD_CMD8_2_7_3_6_V_RANGE (0x01 << 8) -+ -+/* Clock Configurations and Macros */ -+ -+#define MMC_CLOCK_REFERENCE (96) -+#define MMC_RELATIVE_CARD_ADDRESS (0x1234) -+#define MMC_INIT_SEQ_CLK (MMC_CLOCK_REFERENCE * 1000 / 80) -+#define MMC_400kHz_CLK (MMC_CLOCK_REFERENCE * 1000 / 400) -+#define CLKDR(r, f, u) ((((r)*100) / ((f)*(u))) + 1) -+#define CLKD(f, u) (CLKDR(MMC_CLOCK_REFERENCE, f, u)) -+ -+#define MMC_OCR_REG_ACCESS_MODE_MASK (0x3 << 29) -+#define MMC_OCR_REG_ACCESS_MODE_BYTE (0x0 << 29) -+#define MMC_OCR_REG_ACCESS_MODE_SECTOR (0x2 << 29) -+ -+#define MMC_OCR_REG_HOST_CAPACITY_SUPPORT_MASK (0x1 << 30) -+#define MMC_OCR_REG_HOST_CAPACITY_SUPPORT_BYTE (0x0 << 30) -+#define MMC_OCR_REG_HOST_CAPACITY_SUPPORT_SECTOR (0x1 << 30) -+ -+#define MMC_SD2_CSD_C_SIZE_LSB_MASK (0xFFFF) -+#define MMC_SD2_CSD_C_SIZE_MSB_MASK (0x003F) -+#define MMC_SD2_CSD_C_SIZE_MSB_OFFSET (16) -+#define MMC_CSD_C_SIZE_LSB_MASK (0x0003) -+#define MMC_CSD_C_SIZE_MSB_MASK (0x03FF) -+#define MMC_CSD_C_SIZE_MSB_OFFSET (2) -+ -+#define MMC_CSD_TRAN_SPEED_UNIT_MASK (0x07 << 0) -+#define MMC_CSD_TRAN_SPEED_FACTOR_MASK (0x0F << 3) -+#define MMC_CSD_TRAN_SPEED_UNIT_100MHZ (0x3 << 0) -+#define MMC_CSD_TRAN_SPEED_FACTOR_1_0 (0x01 << 3) -+#define MMC_CSD_TRAN_SPEED_FACTOR_8_0 (0x0F << 3) -+ -+typedef struct { -+ unsigned not_used:1; -+ unsigned crc:7; -+ unsigned ecc:2; -+ unsigned file_format:2; -+ unsigned tmp_write_protect:1; -+ unsigned perm_write_protect:1; -+ unsigned copy:1; -+ unsigned file_format_grp:1; -+ unsigned content_prot_app:1; -+ unsigned reserved_1:4; -+ unsigned write_bl_partial:1; -+ unsigned write_bl_len:4; -+ unsigned r2w_factor:3; -+ unsigned default_ecc:2; -+ unsigned wp_grp_enable:1; -+ unsigned wp_grp_size:5; -+ unsigned erase_grp_mult:5; -+ unsigned erase_grp_size:5; -+ unsigned c_size_mult:3; -+ unsigned vdd_w_curr_max:3; -+ unsigned vdd_w_curr_min:3; -+ unsigned vdd_r_curr_max:3; -+ unsigned vdd_r_curr_min:3; -+ unsigned c_size_lsb:2; -+ unsigned c_size_msb:10; -+ unsigned reserved_2:2; -+ unsigned dsr_imp:1; -+ unsigned read_blk_misalign:1; -+ unsigned write_blk_misalign:1; -+ unsigned read_bl_partial:1; -+ unsigned read_bl_len:4; -+ unsigned ccc:12; -+ unsigned tran_speed:8; -+ unsigned nsac:8; -+ unsigned taac:8; -+ unsigned reserved_3:2; -+ unsigned spec_vers:4; -+ unsigned csd_structure:2; -+} mmc_csd_reg_t; -+ -+/* csd for sd2.0 */ -+typedef struct { -+ unsigned not_used:1; -+ unsigned crc:7; -+ unsigned reserved_1:2; -+ unsigned file_format:2; -+ unsigned tmp_write_protect:1; -+ unsigned perm_write_protect:1; -+ unsigned copy:1; -+ unsigned file_format_grp:1; -+ unsigned reserved_2:5; -+ unsigned write_bl_partial:1; -+ unsigned write_bl_len:4; -+ unsigned r2w_factor:3; -+ unsigned reserved_3:2; -+ unsigned wp_grp_enable:1; -+ unsigned wp_grp_size:7; -+ unsigned sector_size:7; -+ unsigned erase_blk_len:1; -+ unsigned reserved_4:1; -+ unsigned c_size_lsb:16; -+ unsigned c_size_msb:6; -+ unsigned reserved_5:6; -+ unsigned dsr_imp:1; -+ unsigned read_blk_misalign:1; -+ unsigned write_blk_misalign:1; -+ unsigned read_bl_partial:1; -+ unsigned read_bl_len:4; -+ unsigned ccc:12; -+ unsigned tran_speed:8; -+ unsigned nsac:8; -+ unsigned taac:8; -+ unsigned reserved_6:6; -+ unsigned csd_structure:2; -+} mmc_sd2_csd_reg_t; -+ -+/* extended csd - 512 bytes long */ -+typedef struct { -+ unsigned char reserved_1[181]; -+ unsigned char erasedmemorycontent; -+ unsigned char reserved_2; -+ unsigned char buswidthmode; -+ unsigned char reserved_3; -+ unsigned char highspeedinterfacetiming; -+ unsigned char reserved_4; -+ unsigned char powerclass; -+ unsigned char reserved_5; -+ unsigned char commandsetrevision; -+ unsigned char reserved_6; -+ unsigned char commandset; -+ unsigned char extendedcsdrevision; -+ unsigned char reserved_7; -+ unsigned char csdstructureversion; -+ unsigned char reserved_8; -+ unsigned char cardtype; -+ unsigned char reserved_9[3]; -+ unsigned char powerclass_52mhz_1_95v; -+ unsigned char powerclass_26mhz_1_95v; -+ unsigned char powerclass_52mhz_3_6v; -+ unsigned char powerclass_26mhz_3_6v; -+ unsigned char reserved_10; -+ unsigned char minreadperf_4b_26mhz; -+ unsigned char minwriteperf_4b_26mhz; -+ unsigned char minreadperf_8b_26mhz_4b_52mhz; -+ unsigned char minwriteperf_8b_26mhz_4b_52mhz; -+ unsigned char minreadperf_8b_52mhz; -+ unsigned char minwriteperf_8b_52mhz; -+ unsigned char reserved_11; -+ unsigned int sectorcount; -+ unsigned char reserved_12[288]; -+ unsigned char supportedcommandsets; -+ unsigned char reserved_13[7]; -+} mmc_extended_csd_reg_t; -+ -+/* mmc sd responce */ -+typedef struct { -+ unsigned int ocr; -+} mmc_resp_r3; -+ -+typedef struct { -+ unsigned short cardstatus; -+ unsigned short newpublishedrca; -+} mmc_resp_r6; -+ -+extern mmc_card_data mmc_dev; -+ -+unsigned char mmc_lowlevel_init(void); -+unsigned char mmc_send_command(unsigned int cmd, unsigned int arg, -+ unsigned int *response); -+unsigned char mmc_setup_clock(unsigned int iclk, unsigned short clkd); -+unsigned char mmc_set_opendrain(unsigned char state); -+unsigned char mmc_read_data(unsigned int *output_buf); -+ -+#endif /* MMC_H */ -diff --git a/include/asm-arm/arch-omap3/mmc_host_def.h b/include/asm-arm/arch-omap3/mmc_host_def.h -new file mode 100644 -index 0000000..37aaa08 ---- /dev/null -+++ b/include/asm-arm/arch-omap3/mmc_host_def.h -@@ -0,0 +1,166 @@ -+/* -+ * (C) Copyright 2008 -+ * Texas Instruments, <www.ti.com> -+ * Syed Mohammed Khasim <khasim@ti.com> -+ * -+ * 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's version 2 of -+ * the License. -+ * -+ * 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 MMC_HOST_DEF_H -+#define MMC_HOST_DEF_H -+ -+/* -+ * OMAP HSMMC register definitions -+ */ -+#define OMAP_HSMMC_SYSCONFIG (*(unsigned int *) 0x4809C010) -+#define OMAP_HSMMC_SYSSTATUS (*(unsigned int *) 0x4809C014) -+#define OMAP_HSMMC_CON (*(unsigned int *) 0x4809C02C) -+#define OMAP_HSMMC_BLK (*(unsigned int *) 0x4809C104) -+#define OMAP_HSMMC_ARG (*(unsigned int *) 0x4809C108) -+#define OMAP_HSMMC_CMD (*(unsigned int *) 0x4809C10C) -+#define OMAP_HSMMC_RSP10 (*(unsigned int *) 0x4809C110) -+#define OMAP_HSMMC_RSP32 (*(unsigned int *) 0x4809C114) -+#define OMAP_HSMMC_RSP54 (*(unsigned int *) 0x4809C118) -+#define OMAP_HSMMC_RSP76 (*(unsigned int *) 0x4809C11C) -+#define OMAP_HSMMC_DATA (*(unsigned int *) 0x4809C120) -+#define OMAP_HSMMC_PSTATE (*(unsigned int *) 0x4809C124) -+#define OMAP_HSMMC_HCTL (*(unsigned int *) 0x4809C128) -+#define OMAP_HSMMC_SYSCTL (*(unsigned int *) 0x4809C12C) -+#define OMAP_HSMMC_STAT (*(unsigned int *) 0x4809C130) -+#define OMAP_HSMMC_IE (*(unsigned int *) 0x4809C134) -+#define OMAP_HSMMC_CAPA (*(unsigned int *) 0x4809C140) -+ -+/* T2 Register definitions */ -+#define CONTROL_DEV_CONF0 (*(unsigned int *) 0x48002274) -+#define CONTROL_PBIAS_LITE (*(unsigned int *) 0x48002520) -+ -+/* -+ * OMAP HS MMC Bit definitions -+ */ -+#define MMC_SOFTRESET (0x1 << 1) -+#define RESETDONE (0x1 << 0) -+#define NOOPENDRAIN (0x0 << 0) -+#define OPENDRAIN (0x1 << 0) -+#define OD (0x1 << 0) -+#define INIT_NOINIT (0x0 << 1) -+#define INIT_INITSTREAM (0x1 << 1) -+#define HR_NOHOSTRESP (0x0 << 2) -+#define STR_BLOCK (0x0 << 3) -+#define MODE_FUNC (0x0 << 4) -+#define DW8_1_4BITMODE (0x0 << 5) -+#define MIT_CTO (0x0 << 6) -+#define CDP_ACTIVEHIGH (0x0 << 7) -+#define WPP_ACTIVEHIGH (0x0 << 8) -+#define RESERVED_MASK (0x3 << 9) -+#define CTPL_MMC_SD (0x0 << 11) -+#define BLEN_512BYTESLEN (0x200 << 0) -+#define NBLK_STPCNT (0x0 << 16) -+#define DE_DISABLE (0x0 << 0) -+#define BCE_DISABLE (0x0 << 1) -+#define ACEN_DISABLE (0x0 << 2) -+#define DDIR_OFFSET (4) -+#define DDIR_MASK (0x1 << 4) -+#define DDIR_WRITE (0x0 << 4) -+#define DDIR_READ (0x1 << 4) -+#define MSBS_SGLEBLK (0x0 << 5) -+#define RSP_TYPE_OFFSET (16) -+#define RSP_TYPE_MASK (0x3 << 16) -+#define RSP_TYPE_NORSP (0x0 << 16) -+#define RSP_TYPE_LGHT136 (0x1 << 16) -+#define RSP_TYPE_LGHT48 (0x2 << 16) -+#define RSP_TYPE_LGHT48B (0x3 << 16) -+#define CCCE_NOCHECK (0x0 << 19) -+#define CCCE_CHECK (0x1 << 19) -+#define CICE_NOCHECK (0x0 << 20) -+#define CICE_CHECK (0x1 << 20) -+#define DP_OFFSET (21) -+#define DP_MASK (0x1 << 21) -+#define DP_NO_DATA (0x0 << 21) -+#define DP_DATA (0x1 << 21) -+#define CMD_TYPE_NORMAL (0x0 << 22) -+#define INDEX_OFFSET (24) -+#define INDEX_MASK (0x3f << 24) -+#define INDEX(i) (i << 24) -+#define DATI_MASK (0x1 << 1) -+#define DATI_CMDDIS (0x1 << 1) -+#define DTW_1_BITMODE (0x0 << 1) -+#define DTW_4_BITMODE (0x1 << 1) -+#define SDBP_PWROFF (0x0 << 8) -+#define SDBP_PWRON (0x1 << 8) -+#define SDVS_1V8 (0x5 << 9) -+#define SDVS_3V0 (0x6 << 9) -+#define ICE_MASK (0x1 << 0) -+#define ICE_STOP (0x0 << 0) -+#define ICS_MASK (0x1 << 1) -+#define ICS_NOTREADY (0x0 << 1) -+#define ICE_OSCILLATE (0x1 << 0) -+#define CEN_MASK (0x1 << 2) -+#define CEN_DISABLE (0x0 << 2) -+#define CEN_ENABLE (0x1 << 2) -+#define CLKD_OFFSET (6) -+#define CLKD_MASK (0x3FF << 6) -+#define DTO_MASK (0xF << 16) -+#define DTO_15THDTO (0xE << 16) -+#define SOFTRESETALL (0x1 << 24) -+#define CC_MASK (0x1 << 0) -+#define TC_MASK (0x1 << 1) -+#define BWR_MASK (0x1 << 4) -+#define BRR_MASK (0x1 << 5) -+#define ERRI_MASK (0x1 << 15) -+#define IE_CC (0x01 << 0) -+#define IE_TC (0x01 << 1) -+#define IE_BWR (0x01 << 4) -+#define IE_BRR (0x01 << 5) -+#define IE_CTO (0x01 << 16) -+#define IE_CCRC (0x01 << 17) -+#define IE_CEB (0x01 << 18) -+#define IE_CIE (0x01 << 19) -+#define IE_DTO (0x01 << 20) -+#define IE_DCRC (0x01 << 21) -+#define IE_DEB (0x01 << 22) -+#define IE_CERR (0x01 << 28) -+#define IE_BADA (0x01 << 29) -+ -+#define VS30_3V0SUP (1 << 25) -+#define VS18_1V8SUP (1 << 26) -+ -+/* Driver definitions */ -+#define MMCSD_SECTOR_SIZE (512) -+#define MMC_CARD 0 -+#define SD_CARD 1 -+#define BYTE_MODE 0 -+#define SECTOR_MODE 1 -+#define CLK_INITSEQ 0 -+#define CLK_400KHZ 1 -+#define CLK_MISC 2 -+ -+typedef struct { -+ unsigned int card_type; -+ unsigned int version; -+ unsigned int mode; -+ unsigned int size; -+ unsigned int RCA; -+} mmc_card_data; -+ -+#define mmc_reg_out(addr, mask, val)\ -+ (addr) = (((addr)) & (~(mask))) | ((val) & (mask)); -+#define mmc_reg_out(addr, mask, val)\ -+ (addr) = (((addr)) & (~(mask))) | ((val) & (mask)); -+ -+#endif /* MMC_HOST_DEF_H */ -diff --git a/include/asm-arm/arch-omap3/mux.h b/include/asm-arm/arch-omap3/mux.h -new file mode 100644 -index 0000000..ec4aeb0 ---- /dev/null -+++ b/include/asm-arm/arch-omap3/mux.h -@@ -0,0 +1,757 @@ -+/* -+ * (C) Copyright 2006-2008 -+ * Texas Instruments, <www.ti.com> -+ * Syed Mohammed Khasim <x0khasim@ti.com> -+ * -+ * 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 _MUX_H_ -+#define _MUX_H_ -+ -+/* -+ * IEN - Input Enable -+ * IDIS - Input Disable -+ * PTD - Pull type Down -+ * PTU - Pull type Up -+ * DIS - Pull type selection is inactive -+ * EN - Pull type selection is active -+ * M0 - Mode 0 -+ */ -+ -+#define IEN (1 << 8) -+ -+#define IDIS (0 << 8) -+#define PTU (1 << 4) -+#define PTD (0 << 4) -+#define EN (1 << 3) -+#define DIS (0 << 3) -+ -+#define M0 0 -+#define M1 1 -+#define M2 2 -+#define M3 3 -+#define M4 4 -+#define M5 5 -+#define M6 6 -+#define M7 7 -+ -+/* -+ * To get the actual address the offset has to added -+ * with OMAP34XX_CTRL_BASE to get the actual address -+ */ -+ -+ /*SDRC*/ -+#define CONTROL_PADCONF_SDRC_D0 0x0030 -+#define CONTROL_PADCONF_SDRC_D1 0x0032 -+#define CONTROL_PADCONF_SDRC_D2 0x0034 -+#define CONTROL_PADCONF_SDRC_D3 0x0036 -+#define CONTROL_PADCONF_SDRC_D4 0x0038 -+#define CONTROL_PADCONF_SDRC_D5 0x003A -+#define CONTROL_PADCONF_SDRC_D6 0x003C -+#define CONTROL_PADCONF_SDRC_D7 0x003E -+#define CONTROL_PADCONF_SDRC_D8 0x0040 -+#define CONTROL_PADCONF_SDRC_D9 0x0042 -+#define CONTROL_PADCONF_SDRC_D10 0x0044 -+#define CONTROL_PADCONF_SDRC_D11 0x0046 -+#define CONTROL_PADCONF_SDRC_D12 0x0048 -+#define CONTROL_PADCONF_SDRC_D13 0x004A -+#define CONTROL_PADCONF_SDRC_D14 0x004C -+#define CONTROL_PADCONF_SDRC_D15 0x004E -+#define CONTROL_PADCONF_SDRC_D16 0x0050 -+#define CONTROL_PADCONF_SDRC_D17 0x0052 -+#define CONTROL_PADCONF_SDRC_D18 0x0054 -+#define CONTROL_PADCONF_SDRC_D19 0x0056 -+#define CONTROL_PADCONF_SDRC_D20 0x0058 -+#define CONTROL_PADCONF_SDRC_D21 0x005A -+#define CONTROL_PADCONF_SDRC_D22 0x005C -+#define CONTROL_PADCONF_SDRC_D23 0x005E -+#define CONTROL_PADCONF_SDRC_D24 0x0060 -+#define CONTROL_PADCONF_SDRC_D25 0x0062 -+#define CONTROL_PADCONF_SDRC_D26 0x0064 -+#define CONTROL_PADCONF_SDRC_D27 0x0066 -+#define CONTROL_PADCONF_SDRC_D28 0x0068 -+#define CONTROL_PADCONF_SDRC_D29 0x006A -+#define CONTROL_PADCONF_SDRC_D30 0x006C -+#define CONTROL_PADCONF_SDRC_D31 0x006E -+#define CONTROL_PADCONF_SDRC_CLK 0x0070 -+#define CONTROL_PADCONF_SDRC_DQS0 0x0072 -+#define CONTROL_PADCONF_SDRC_DQS1 0x0074 -+#define CONTROL_PADCONF_SDRC_DQS2 0x0076 -+#define CONTROL_PADCONF_SDRC_DQS3 0x0078 -+ /*GPMC*/ -+#define CONTROL_PADCONF_GPMC_A1 0x007A -+#define CONTROL_PADCONF_GPMC_A2 0x007C -+#define CONTROL_PADCONF_GPMC_A3 0x007E -+#define CONTROL_PADCONF_GPMC_A4 0x0080 -+#define CONTROL_PADCONF_GPMC_A5 0x0082 -+#define CONTROL_PADCONF_GPMC_A6 0x0084 -+#define CONTROL_PADCONF_GPMC_A7 0x0086 -+#define CONTROL_PADCONF_GPMC_A8 0x0088 -+#define CONTROL_PADCONF_GPMC_A9 0x008A -+#define CONTROL_PADCONF_GPMC_A10 0x008C -+#define CONTROL_PADCONF_GPMC_D0 0x008E -+#define CONTROL_PADCONF_GPMC_D1 0x0090 -+#define CONTROL_PADCONF_GPMC_D2 0x0092 -+#define CONTROL_PADCONF_GPMC_D3 0x0094 -+#define CONTROL_PADCONF_GPMC_D4 0x0096 -+#define CONTROL_PADCONF_GPMC_D5 0x0098 -+#define CONTROL_PADCONF_GPMC_D6 0x009A -+#define CONTROL_PADCONF_GPMC_D7 0x009C -+#define CONTROL_PADCONF_GPMC_D8 0x009E -+#define CONTROL_PADCONF_GPMC_D9 0x00A0 -+#define CONTROL_PADCONF_GPMC_D10 0x00A2 -+#define CONTROL_PADCONF_GPMC_D11 0x00A4 -+#define CONTROL_PADCONF_GPMC_D12 0x00A6 -+#define CONTROL_PADCONF_GPMC_D13 0x00A8 -+#define CONTROL_PADCONF_GPMC_D14 0x00AA -+#define CONTROL_PADCONF_GPMC_D15 0x00AC -+#define CONTROL_PADCONF_GPMC_nCS0 0x00AE -+#define CONTROL_PADCONF_GPMC_nCS1 0x00B0 -+#define CONTROL_PADCONF_GPMC_nCS2 0x00B2 -+#define CONTROL_PADCONF_GPMC_nCS3 0x00B4 -+#define CONTROL_PADCONF_GPMC_nCS4 0x00B6 -+#define CONTROL_PADCONF_GPMC_nCS5 0x00B8 -+#define CONTROL_PADCONF_GPMC_nCS6 0x00BA -+#define CONTROL_PADCONF_GPMC_nCS7 0x00BC -+#define CONTROL_PADCONF_GPMC_CLK 0x00BE -+#define CONTROL_PADCONF_GPMC_nADV_ALE 0x00C0 -+#define CONTROL_PADCONF_GPMC_nOE 0x00C2 -+#define CONTROL_PADCONF_GPMC_nWE 0x00C4 -+#define CONTROL_PADCONF_GPMC_nBE0_CLE 0x00C6 -+#define CONTROL_PADCONF_GPMC_nBE1 0x00C8 -+#define CONTROL_PADCONF_GPMC_nWP 0x00CA -+#define CONTROL_PADCONF_GPMC_WAIT0 0x00CC -+#define CONTROL_PADCONF_GPMC_WAIT1 0x00CE -+#define CONTROL_PADCONF_GPMC_WAIT2 0x00D0 -+#define CONTROL_PADCONF_GPMC_WAIT3 0x00D2 -+ /*DSS*/ -+#define CONTROL_PADCONF_DSS_PCLK 0x00D4 -+#define CONTROL_PADCONF_DSS_HSYNC 0x00D6 -+#define CONTROL_PADCONF_DSS_VSYNC 0x00D8 -+#define CONTROL_PADCONF_DSS_ACBIAS 0x00DA -+#define CONTROL_PADCONF_DSS_DATA0 0x00DC -+#define CONTROL_PADCONF_DSS_DATA1 0x00DE -+#define CONTROL_PADCONF_DSS_DATA2 0x00E0 -+#define CONTROL_PADCONF_DSS_DATA3 0x00E2 -+#define CONTROL_PADCONF_DSS_DATA4 0x00E4 -+#define CONTROL_PADCONF_DSS_DATA5 0x00E6 -+#define CONTROL_PADCONF_DSS_DATA6 0x00E8 -+#define CONTROL_PADCONF_DSS_DATA7 0x00EA -+#define CONTROL_PADCONF_DSS_DATA8 0x00EC -+#define CONTROL_PADCONF_DSS_DATA9 0x00EE -+#define CONTROL_PADCONF_DSS_DATA10 0x00F0 -+#define CONTROL_PADCONF_DSS_DATA11 0x00F2 -+#define CONTROL_PADCONF_DSS_DATA12 0x00F4 -+#define CONTROL_PADCONF_DSS_DATA13 0x00F6 -+#define CONTROL_PADCONF_DSS_DATA14 0x00F8 -+#define CONTROL_PADCONF_DSS_DATA15 0x00FA -+#define CONTROL_PADCONF_DSS_DATA16 0x00FC -+#define CONTROL_PADCONF_DSS_DATA17 0x00FE -+#define CONTROL_PADCONF_DSS_DATA18 0x0100 -+#define CONTROL_PADCONF_DSS_DATA19 0x0102 -+#define CONTROL_PADCONF_DSS_DATA20 0x0104 -+#define CONTROL_PADCONF_DSS_DATA21 0x0106 -+#define CONTROL_PADCONF_DSS_DATA22 0x0108 -+#define CONTROL_PADCONF_DSS_DATA23 0x010A -+ /*CAMERA*/ -+#define CONTROL_PADCONF_CAM_HS 0x010C -+#define CONTROL_PADCONF_CAM_VS 0x010E -+#define CONTROL_PADCONF_CAM_XCLKA 0x0110 -+#define CONTROL_PADCONF_CAM_PCLK 0x0112 -+#define CONTROL_PADCONF_CAM_FLD 0x0114 -+#define CONTROL_PADCONF_CAM_D0 0x0116 -+#define CONTROL_PADCONF_CAM_D1 0x0118 -+#define CONTROL_PADCONF_CAM_D2 0x011A -+#define CONTROL_PADCONF_CAM_D3 0x011C -+#define CONTROL_PADCONF_CAM_D4 0x011E -+#define CONTROL_PADCONF_CAM_D5 0x0120 -+#define CONTROL_PADCONF_CAM_D6 0x0122 -+#define CONTROL_PADCONF_CAM_D7 0x0124 -+#define CONTROL_PADCONF_CAM_D8 0x0126 -+#define CONTROL_PADCONF_CAM_D9 0x0128 -+#define CONTROL_PADCONF_CAM_D10 0x012A -+#define CONTROL_PADCONF_CAM_D11 0x012C -+#define CONTROL_PADCONF_CAM_XCLKB 0x012E -+#define CONTROL_PADCONF_CAM_WEN 0x0130 -+#define CONTROL_PADCONF_CAM_STROBE 0x0132 -+#define CONTROL_PADCONF_CSI2_DX0 0x0134 -+#define CONTROL_PADCONF_CSI2_DY0 0x0136 -+#define CONTROL_PADCONF_CSI2_DX1 0x0138 -+#define CONTROL_PADCONF_CSI2_DY1 0x013A -+/*Audio Interface */ -+#define CONTROL_PADCONF_McBSP2_FSX 0x013C -+#define CONTROL_PADCONF_McBSP2_CLKX 0x013E -+#define CONTROL_PADCONF_McBSP2_DR 0x0140 -+#define CONTROL_PADCONF_McBSP2_DX 0x0142 -+#define CONTROL_PADCONF_MMC1_CLK 0x0144 -+#define CONTROL_PADCONF_MMC1_CMD 0x0146 -+#define CONTROL_PADCONF_MMC1_DAT0 0x0148 -+#define CONTROL_PADCONF_MMC1_DAT1 0x014A -+#define CONTROL_PADCONF_MMC1_DAT2 0x014C -+#define CONTROL_PADCONF_MMC1_DAT3 0x014E -+#define CONTROL_PADCONF_MMC1_DAT4 0x0150 -+#define CONTROL_PADCONF_MMC1_DAT5 0x0152 -+#define CONTROL_PADCONF_MMC1_DAT6 0x0154 -+#define CONTROL_PADCONF_MMC1_DAT7 0x0156 -+/*Wireless LAN */ -+#define CONTROL_PADCONF_MMC2_CLK 0x0158 -+#define CONTROL_PADCONF_MMC2_CMD 0x015A -+#define CONTROL_PADCONF_MMC2_DAT0 0x015C -+#define CONTROL_PADCONF_MMC2_DAT1 0x015E -+#define CONTROL_PADCONF_MMC2_DAT2 0x0160 -+#define CONTROL_PADCONF_MMC2_DAT3 0x0162 -+#define CONTROL_PADCONF_MMC2_DAT4 0x0164 -+#define CONTROL_PADCONF_MMC2_DAT5 0x0166 -+#define CONTROL_PADCONF_MMC2_DAT6 0x0168 -+#define CONTROL_PADCONF_MMC2_DAT7 0x016A -+/*Bluetooth*/ -+#define CONTROL_PADCONF_McBSP3_DX 0x016C -+#define CONTROL_PADCONF_McBSP3_DR 0x016E -+#define CONTROL_PADCONF_McBSP3_CLKX 0x0170 -+#define CONTROL_PADCONF_McBSP3_FSX 0x0172 -+#define CONTROL_PADCONF_UART2_CTS 0x0174 -+#define CONTROL_PADCONF_UART2_RTS 0x0176 -+#define CONTROL_PADCONF_UART2_TX 0x0178 -+#define CONTROL_PADCONF_UART2_RX 0x017A -+/*Modem Interface */ -+#define CONTROL_PADCONF_UART1_TX 0x017C -+#define CONTROL_PADCONF_UART1_RTS 0x017E -+#define CONTROL_PADCONF_UART1_CTS 0x0180 -+#define CONTROL_PADCONF_UART1_RX 0x0182 -+#define CONTROL_PADCONF_McBSP4_CLKX 0x0184 -+#define CONTROL_PADCONF_McBSP4_DR 0x0186 -+#define CONTROL_PADCONF_McBSP4_DX 0x0188 -+#define CONTROL_PADCONF_McBSP4_FSX 0x018A -+#define CONTROL_PADCONF_McBSP1_CLKR 0x018C -+#define CONTROL_PADCONF_McBSP1_FSR 0x018E -+#define CONTROL_PADCONF_McBSP1_DX 0x0190 -+#define CONTROL_PADCONF_McBSP1_DR 0x0192 -+#define CONTROL_PADCONF_McBSP_CLKS 0x0194 -+#define CONTROL_PADCONF_McBSP1_FSX 0x0196 -+#define CONTROL_PADCONF_McBSP1_CLKX 0x0198 -+/*Serial Interface*/ -+#define CONTROL_PADCONF_UART3_CTS_RCTX 0x019A -+#define CONTROL_PADCONF_UART3_RTS_SD 0x019C -+#define CONTROL_PADCONF_UART3_RX_IRRX 0x019E -+#define CONTROL_PADCONF_UART3_TX_IRTX 0x01A0 -+#define CONTROL_PADCONF_HSUSB0_CLK 0x01A2 -+#define CONTROL_PADCONF_HSUSB0_STP 0x01A4 -+#define CONTROL_PADCONF_HSUSB0_DIR 0x01A6 -+#define CONTROL_PADCONF_HSUSB0_NXT 0x01A8 -+#define CONTROL_PADCONF_HSUSB0_DATA0 0x01AA -+#define CONTROL_PADCONF_HSUSB0_DATA1 0x01AC -+#define CONTROL_PADCONF_HSUSB0_DATA2 0x01AE -+#define CONTROL_PADCONF_HSUSB0_DATA3 0x01B0 -+#define CONTROL_PADCONF_HSUSB0_DATA4 0x01B2 -+#define CONTROL_PADCONF_HSUSB0_DATA5 0x01B4 -+#define CONTROL_PADCONF_HSUSB0_DATA6 0x01B6 -+#define CONTROL_PADCONF_HSUSB0_DATA7 0x01B8 -+#define CONTROL_PADCONF_I2C1_SCL 0x01BA -+#define CONTROL_PADCONF_I2C1_SDA 0x01BC -+#define CONTROL_PADCONF_I2C2_SCL 0x01BE -+#define CONTROL_PADCONF_I2C2_SDA 0x01C0 -+#define CONTROL_PADCONF_I2C3_SCL 0x01C2 -+#define CONTROL_PADCONF_I2C3_SDA 0x01C4 -+#define CONTROL_PADCONF_I2C4_SCL 0x0A00 -+#define CONTROL_PADCONF_I2C4_SDA 0x0A02 -+#define CONTROL_PADCONF_HDQ_SIO 0x01C6 -+#define CONTROL_PADCONF_McSPI1_CLK 0x01C8 -+#define CONTROL_PADCONF_McSPI1_SIMO 0x01CA -+#define CONTROL_PADCONF_McSPI1_SOMI 0x01CC -+#define CONTROL_PADCONF_McSPI1_CS0 0x01CE -+#define CONTROL_PADCONF_McSPI1_CS1 0x01D0 -+#define CONTROL_PADCONF_McSPI1_CS2 0x01D2 -+#define CONTROL_PADCONF_McSPI1_CS3 0x01D4 -+#define CONTROL_PADCONF_McSPI2_CLK 0x01D6 -+#define CONTROL_PADCONF_McSPI2_SIMO 0x01D8 -+#define CONTROL_PADCONF_McSPI2_SOMI 0x01DA -+#define CONTROL_PADCONF_McSPI2_CS0 0x01DC -+#define CONTROL_PADCONF_McSPI2_CS1 0x01DE -+/*Control and debug */ -+#define CONTROL_PADCONF_SYS_32K 0x0A04 -+#define CONTROL_PADCONF_SYS_CLKREQ 0x0A06 -+#define CONTROL_PADCONF_SYS_nIRQ 0x01E0 -+#define CONTROL_PADCONF_SYS_BOOT0 0x0A0A -+#define CONTROL_PADCONF_SYS_BOOT1 0x0A0C -+#define CONTROL_PADCONF_SYS_BOOT2 0x0A0E -+#define CONTROL_PADCONF_SYS_BOOT3 0x0A10 -+#define CONTROL_PADCONF_SYS_BOOT4 0x0A12 -+#define CONTROL_PADCONF_SYS_BOOT5 0x0A14 -+#define CONTROL_PADCONF_SYS_BOOT6 0x0A16 -+#define CONTROL_PADCONF_SYS_OFF_MODE 0x0A18 -+#define CONTROL_PADCONF_SYS_CLKOUT1 0x0A1A -+#define CONTROL_PADCONF_SYS_CLKOUT2 0x01E2 -+#define CONTROL_PADCONF_JTAG_nTRST 0x0A1C -+#define CONTROL_PADCONF_JTAG_TCK 0x0A1E -+#define CONTROL_PADCONF_JTAG_TMS 0x0A20 -+#define CONTROL_PADCONF_JTAG_TDI 0x0A22 -+#define CONTROL_PADCONF_JTAG_EMU0 0x0A24 -+#define CONTROL_PADCONF_JTAG_EMU1 0x0A26 -+#define CONTROL_PADCONF_ETK_CLK 0x0A28 -+#define CONTROL_PADCONF_ETK_CTL 0x0A2A -+#define CONTROL_PADCONF_ETK_D0 0x0A2C -+#define CONTROL_PADCONF_ETK_D1 0x0A2E -+#define CONTROL_PADCONF_ETK_D2 0x0A30 -+#define CONTROL_PADCONF_ETK_D3 0x0A32 -+#define CONTROL_PADCONF_ETK_D4 0x0A34 -+#define CONTROL_PADCONF_ETK_D5 0x0A36 -+#define CONTROL_PADCONF_ETK_D6 0x0A38 -+#define CONTROL_PADCONF_ETK_D7 0x0A3A -+#define CONTROL_PADCONF_ETK_D8 0x0A3C -+#define CONTROL_PADCONF_ETK_D9 0x0A3E -+#define CONTROL_PADCONF_ETK_D10 0x0A40 -+#define CONTROL_PADCONF_ETK_D11 0x0A42 -+#define CONTROL_PADCONF_ETK_D12 0x0A44 -+#define CONTROL_PADCONF_ETK_D13 0x0A46 -+#define CONTROL_PADCONF_ETK_D14 0x0A48 -+#define CONTROL_PADCONF_ETK_D15 0x0A4A -+#define CONTROL_PADCONF_ETK_CLK_ES2 0x05D8 -+#define CONTROL_PADCONF_ETK_CTL_ES2 0x05DA -+#define CONTROL_PADCONF_ETK_D0_ES2 0x05DC -+#define CONTROL_PADCONF_ETK_D1_ES2 0x05DE -+#define CONTROL_PADCONF_ETK_D2_ES2 0x05E0 -+#define CONTROL_PADCONF_ETK_D3_ES2 0x05E2 -+#define CONTROL_PADCONF_ETK_D4_ES2 0x05E4 -+#define CONTROL_PADCONF_ETK_D5_ES2 0x05E6 -+#define CONTROL_PADCONF_ETK_D6_ES2 0x05E8 -+#define CONTROL_PADCONF_ETK_D7_ES2 0x05EA -+#define CONTROL_PADCONF_ETK_D8_ES2 0x05EC -+#define CONTROL_PADCONF_ETK_D9_ES2 0x05EE -+#define CONTROL_PADCONF_ETK_D10_ES2 0x05F0 -+#define CONTROL_PADCONF_ETK_D11_ES2 0x05F2 -+#define CONTROL_PADCONF_ETK_D12_ES2 0x05F4 -+#define CONTROL_PADCONF_ETK_D13_ES2 0x05F6 -+#define CONTROL_PADCONF_ETK_D14_ES2 0x05F8 -+#define CONTROL_PADCONF_ETK_D15_ES2 0x05FA -+/*Die to Die */ -+#define CONTROL_PADCONF_d2d_mcad0 0x01E4 -+#define CONTROL_PADCONF_d2d_mcad1 0x01E6 -+#define CONTROL_PADCONF_d2d_mcad2 0x01E8 -+#define CONTROL_PADCONF_d2d_mcad3 0x01EA -+#define CONTROL_PADCONF_d2d_mcad4 0x01EC -+#define CONTROL_PADCONF_d2d_mcad5 0x01EE -+#define CONTROL_PADCONF_d2d_mcad6 0x01F0 -+#define CONTROL_PADCONF_d2d_mcad7 0x01F2 -+#define CONTROL_PADCONF_d2d_mcad8 0x01F4 -+#define CONTROL_PADCONF_d2d_mcad9 0x01F6 -+#define CONTROL_PADCONF_d2d_mcad10 0x01F8 -+#define CONTROL_PADCONF_d2d_mcad11 0x01FA -+#define CONTROL_PADCONF_d2d_mcad12 0x01FC -+#define CONTROL_PADCONF_d2d_mcad13 0x01FE -+#define CONTROL_PADCONF_d2d_mcad14 0x0200 -+#define CONTROL_PADCONF_d2d_mcad15 0x0202 -+#define CONTROL_PADCONF_d2d_mcad16 0x0204 -+#define CONTROL_PADCONF_d2d_mcad17 0x0206 -+#define CONTROL_PADCONF_d2d_mcad18 0x0208 -+#define CONTROL_PADCONF_d2d_mcad19 0x020A -+#define CONTROL_PADCONF_d2d_mcad20 0x020C -+#define CONTROL_PADCONF_d2d_mcad21 0x020E -+#define CONTROL_PADCONF_d2d_mcad22 0x0210 -+#define CONTROL_PADCONF_d2d_mcad23 0x0212 -+#define CONTROL_PADCONF_d2d_mcad24 0x0214 -+#define CONTROL_PADCONF_d2d_mcad25 0x0216 -+#define CONTROL_PADCONF_d2d_mcad26 0x0218 -+#define CONTROL_PADCONF_d2d_mcad27 0x021A -+#define CONTROL_PADCONF_d2d_mcad28 0x021C -+#define CONTROL_PADCONF_d2d_mcad29 0x021E -+#define CONTROL_PADCONF_d2d_mcad30 0x0220 -+#define CONTROL_PADCONF_d2d_mcad31 0x0222 -+#define CONTROL_PADCONF_d2d_mcad32 0x0224 -+#define CONTROL_PADCONF_d2d_mcad33 0x0226 -+#define CONTROL_PADCONF_d2d_mcad34 0x0228 -+#define CONTROL_PADCONF_d2d_mcad35 0x022A -+#define CONTROL_PADCONF_d2d_mcad36 0x022C -+#define CONTROL_PADCONF_d2d_clk26mi 0x022E -+#define CONTROL_PADCONF_d2d_nrespwron 0x0230 -+#define CONTROL_PADCONF_d2d_nreswarm 0x0232 -+#define CONTROL_PADCONF_d2d_arm9nirq 0x0234 -+#define CONTROL_PADCONF_d2d_uma2p6fiq 0x0236 -+#define CONTROL_PADCONF_d2d_spint 0x0238 -+#define CONTROL_PADCONF_d2d_frint 0x023A -+#define CONTROL_PADCONF_d2d_dmareq0 0x023C -+#define CONTROL_PADCONF_d2d_dmareq1 0x023E -+#define CONTROL_PADCONF_d2d_dmareq2 0x0240 -+#define CONTROL_PADCONF_d2d_dmareq3 0x0242 -+#define CONTROL_PADCONF_d2d_n3gtrst 0x0244 -+#define CONTROL_PADCONF_d2d_n3gtdi 0x0246 -+#define CONTROL_PADCONF_d2d_n3gtdo 0x0248 -+#define CONTROL_PADCONF_d2d_n3gtms 0x024A -+#define CONTROL_PADCONF_d2d_n3gtck 0x024C -+#define CONTROL_PADCONF_d2d_n3grtck 0x024E -+#define CONTROL_PADCONF_d2d_mstdby 0x0250 -+#define CONTROL_PADCONF_d2d_swakeup 0x0A4C -+#define CONTROL_PADCONF_d2d_idlereq 0x0252 -+#define CONTROL_PADCONF_d2d_idleack 0x0254 -+#define CONTROL_PADCONF_d2d_mwrite 0x0256 -+#define CONTROL_PADCONF_d2d_swrite 0x0258 -+#define CONTROL_PADCONF_d2d_mread 0x025A -+#define CONTROL_PADCONF_d2d_sread 0x025C -+#define CONTROL_PADCONF_d2d_mbusflag 0x025E -+#define CONTROL_PADCONF_d2d_sbusflag 0x0260 -+#define CONTROL_PADCONF_sdrc_cke0 0x0262 -+#define CONTROL_PADCONF_sdrc_cke1 0x0264 -+ -+#define MUX_VAL(OFFSET,VALUE)\ -+ __raw_writew((VALUE), OMAP34XX_CTRL_BASE + (OFFSET)); -+ -+#define CP(x) (CONTROL_PADCONF_##x) -+ -+/* -+ * IEN - Input Enable -+ * IDIS - Input Disable -+ * PTD - Pull type Down -+ * PTU - Pull type Up -+ * DIS - Pull type selection is inactive -+ * EN - Pull type selection is active -+ * M0 - Mode 0 -+ * The commented string gives the final mux configuration for that pin -+ */ -+#define MUX_DEFAULT_ES2() \ -+ /*SDRC*/\ -+ MUX_VAL(CP(SDRC_D0), (IEN | PTD | DIS | M0)) /*SDRC_D0*/\ -+ MUX_VAL(CP(SDRC_D1), (IEN | PTD | DIS | M0)) /*SDRC_D1*/\ -+ MUX_VAL(CP(SDRC_D2), (IEN | PTD | DIS | M0)) /*SDRC_D2*/\ -+ MUX_VAL(CP(SDRC_D3), (IEN | PTD | DIS | M0)) /*SDRC_D3*/\ -+ MUX_VAL(CP(SDRC_D4), (IEN | PTD | DIS | M0)) /*SDRC_D4*/\ -+ MUX_VAL(CP(SDRC_D5), (IEN | PTD | DIS | M0)) /*SDRC_D5*/\ -+ MUX_VAL(CP(SDRC_D6), (IEN | PTD | DIS | M0)) /*SDRC_D6*/\ -+ MUX_VAL(CP(SDRC_D7), (IEN | PTD | DIS | M0)) /*SDRC_D7*/\ -+ MUX_VAL(CP(SDRC_D8), (IEN | PTD | DIS | M0)) /*SDRC_D8*/\ -+ MUX_VAL(CP(SDRC_D9), (IEN | PTD | DIS | M0)) /*SDRC_D9*/\ -+ MUX_VAL(CP(SDRC_D10), (IEN | PTD | DIS | M0)) /*SDRC_D10*/\ -+ MUX_VAL(CP(SDRC_D11), (IEN | PTD | DIS | M0)) /*SDRC_D11*/\ -+ MUX_VAL(CP(SDRC_D12), (IEN | PTD | DIS | M0)) /*SDRC_D12*/\ -+ MUX_VAL(CP(SDRC_D13), (IEN | PTD | DIS | M0)) /*SDRC_D13*/\ -+ MUX_VAL(CP(SDRC_D14), (IEN | PTD | DIS | M0)) /*SDRC_D14*/\ -+ MUX_VAL(CP(SDRC_D15), (IEN | PTD | DIS | M0)) /*SDRC_D15*/\ -+ MUX_VAL(CP(SDRC_D16), (IEN | PTD | DIS | M0)) /*SDRC_D16*/\ -+ MUX_VAL(CP(SDRC_D17), (IEN | PTD | DIS | M0)) /*SDRC_D17*/\ -+ MUX_VAL(CP(SDRC_D18), (IEN | PTD | DIS | M0)) /*SDRC_D18*/\ -+ MUX_VAL(CP(SDRC_D19), (IEN | PTD | DIS | M0)) /*SDRC_D19*/\ -+ MUX_VAL(CP(SDRC_D20), (IEN | PTD | DIS | M0)) /*SDRC_D20*/\ -+ MUX_VAL(CP(SDRC_D21), (IEN | PTD | DIS | M0)) /*SDRC_D21*/\ -+ MUX_VAL(CP(SDRC_D22), (IEN | PTD | DIS | M0)) /*SDRC_D22*/\ -+ MUX_VAL(CP(SDRC_D23), (IEN | PTD | DIS | M0)) /*SDRC_D23*/\ -+ MUX_VAL(CP(SDRC_D24), (IEN | PTD | DIS | M0)) /*SDRC_D24*/\ -+ MUX_VAL(CP(SDRC_D25), (IEN | PTD | DIS | M0)) /*SDRC_D25*/\ -+ MUX_VAL(CP(SDRC_D26), (IEN | PTD | DIS | M0)) /*SDRC_D26*/\ -+ MUX_VAL(CP(SDRC_D27), (IEN | PTD | DIS | M0)) /*SDRC_D27*/\ -+ MUX_VAL(CP(SDRC_D28), (IEN | PTD | DIS | M0)) /*SDRC_D28*/\ -+ MUX_VAL(CP(SDRC_D29), (IEN | PTD | DIS | M0)) /*SDRC_D29*/\ -+ MUX_VAL(CP(SDRC_D30), (IEN | PTD | DIS | M0)) /*SDRC_D30*/\ -+ MUX_VAL(CP(SDRC_D31), (IEN | PTD | DIS | M0)) /*SDRC_D31*/\ -+ MUX_VAL(CP(SDRC_CLK), (IEN | PTD | DIS | M0)) /*SDRC_CLK*/\ -+ MUX_VAL(CP(SDRC_DQS0), (IEN | PTD | DIS | M0)) /*SDRC_DQS0*/\ -+ MUX_VAL(CP(SDRC_DQS1), (IEN | PTD | DIS | M0)) /*SDRC_DQS1*/\ -+ MUX_VAL(CP(SDRC_DQS2), (IEN | PTD | DIS | M0)) /*SDRC_DQS2*/\ -+ MUX_VAL(CP(SDRC_DQS3), (IEN | PTD | DIS | M0)) /*SDRC_DQS3*/\ -+ /*GPMC*/\ -+ MUX_VAL(CP(GPMC_A1), (IDIS | PTD | DIS | M0)) /*GPMC_A1*/\ -+ MUX_VAL(CP(GPMC_A2), (IDIS | PTD | DIS | M0)) /*GPMC_A2*/\ -+ MUX_VAL(CP(GPMC_A3), (IDIS | PTD | DIS | M0)) /*GPMC_A3*/\ -+ MUX_VAL(CP(GPMC_A4), (IDIS | PTD | DIS | M0)) /*GPMC_A4*/\ -+ MUX_VAL(CP(GPMC_A5), (IDIS | PTD | DIS | M0)) /*GPMC_A5*/\ -+ MUX_VAL(CP(GPMC_A6), (IDIS | PTD | DIS | M0)) /*GPMC_A6*/\ -+ MUX_VAL(CP(GPMC_A7), (IDIS | PTD | DIS | M0)) /*GPMC_A7*/\ -+ MUX_VAL(CP(GPMC_A8), (IDIS | PTD | DIS | M0)) /*GPMC_A8*/\ -+ MUX_VAL(CP(GPMC_A9), (IDIS | PTD | DIS | M0)) /*GPMC_A9*/\ -+ MUX_VAL(CP(GPMC_A10), (IDIS | PTD | DIS | M0)) /*GPMC_A10*/\ -+ MUX_VAL(CP(GPMC_D0), (IEN | PTD | DIS | M0)) /*GPMC_D0*/\ -+ MUX_VAL(CP(GPMC_D1), (IEN | PTD | DIS | M0)) /*GPMC_D1*/\ -+ MUX_VAL(CP(GPMC_D2), (IEN | PTD | DIS | M0)) /*GPMC_D2*/\ -+ MUX_VAL(CP(GPMC_D3), (IEN | PTD | DIS | M0)) /*GPMC_D3*/\ -+ MUX_VAL(CP(GPMC_D4), (IEN | PTD | DIS | M0)) /*GPMC_D4*/\ -+ MUX_VAL(CP(GPMC_D5), (IEN | PTD | DIS | M0)) /*GPMC_D5*/\ -+ MUX_VAL(CP(GPMC_D6), (IEN | PTD | DIS | M0)) /*GPMC_D6*/\ -+ MUX_VAL(CP(GPMC_D7), (IEN | PTD | DIS | M0)) /*GPMC_D7*/\ -+ MUX_VAL(CP(GPMC_D8), (IEN | PTD | DIS | M0)) /*GPMC_D8*/\ -+ MUX_VAL(CP(GPMC_D9), (IEN | PTD | DIS | M0)) /*GPMC_D9*/\ -+ MUX_VAL(CP(GPMC_D10), (IEN | PTD | DIS | M0)) /*GPMC_D10*/\ -+ MUX_VAL(CP(GPMC_D11), (IEN | PTD | DIS | M0)) /*GPMC_D11*/\ -+ MUX_VAL(CP(GPMC_D12), (IEN | PTD | DIS | M0)) /*GPMC_D12*/\ -+ MUX_VAL(CP(GPMC_D13), (IEN | PTD | DIS | M0)) /*GPMC_D13*/\ -+ MUX_VAL(CP(GPMC_D14), (IEN | PTD | DIS | M0)) /*GPMC_D14*/\ -+ MUX_VAL(CP(GPMC_D15), (IEN | PTD | DIS | M0)) /*GPMC_D15*/\ -+ MUX_VAL(CP(GPMC_nCS0), (IDIS | PTU | EN | M0)) /*GPMC_nCS0*/\ -+ MUX_VAL(CP(GPMC_nCS1), (IDIS | PTU | EN | M0)) /*GPMC_nCS1*/\ -+ MUX_VAL(CP(GPMC_nCS2), (IDIS | PTU | EN | M0)) /*GPMC_nCS2*/\ -+ MUX_VAL(CP(GPMC_nCS3), (IDIS | PTU | EN | M0)) /*GPMC_nCS3*/\ -+ /* For Beagle Rev 2 boards*/\ -+ MUX_VAL(CP(GPMC_nCS4), (IDIS | PTU | EN | M0))\ -+ MUX_VAL(CP(GPMC_nCS5), (IDIS | PTD | DIS | M0))\ -+ MUX_VAL(CP(GPMC_nCS6), (IEN | PTD | DIS | M1))\ -+ MUX_VAL(CP(GPMC_nCS7), (IEN | PTU | EN | M1))\ -+ MUX_VAL(CP(GPMC_nBE1), (IEN | PTD | DIS | M0))\ -+ MUX_VAL(CP(GPMC_WAIT2), (IEN | PTU | EN | M0))\ -+ MUX_VAL(CP(GPMC_WAIT3), (IEN | PTU | EN | M0))\ -+ /* till here */ \ -+ MUX_VAL(CP(GPMC_CLK), (IDIS | PTD | DIS | M0)) /*GPMC_CLK*/\ -+ MUX_VAL(CP(GPMC_nADV_ALE), (IDIS | PTD | DIS | M0)) /*GPMC_nADV_ALE*/\ -+ MUX_VAL(CP(GPMC_nOE), (IDIS | PTD | DIS | M0)) /*GPMC_nOE*/\ -+ MUX_VAL(CP(GPMC_nWE), (IDIS | PTD | DIS | M0)) /*GPMC_nWE*/\ -+ MUX_VAL(CP(GPMC_nBE0_CLE), (IDIS | PTD | DIS | M0)) /*GPMC_nBE0_CLE*/\ -+ MUX_VAL(CP(GPMC_nWP), (IEN | PTD | DIS | M0)) /*GPMC_nWP*/\ -+ MUX_VAL(CP(GPMC_WAIT0), (IEN | PTU | EN | M0)) /*GPMC_WAIT0*/\ -+ MUX_VAL(CP(GPMC_WAIT1), (IEN | PTU | EN | M0)) /*GPMC_WAIT1*/\ -+ /*DSS*/\ -+ MUX_VAL(CP(DSS_PCLK), (IDIS | PTD | DIS | M0)) /*DSS_PCLK*/\ -+ MUX_VAL(CP(DSS_HSYNC), (IDIS | PTD | DIS | M0)) /*DSS_HSYNC*/\ -+ MUX_VAL(CP(DSS_VSYNC), (IDIS | PTD | DIS | M0)) /*DSS_VSYNC*/\ -+ MUX_VAL(CP(DSS_ACBIAS), (IDIS | PTD | DIS | M0)) /*DSS_ACBIAS*/\ -+ MUX_VAL(CP(DSS_DATA0), (IDIS | PTD | DIS | M0)) /*DSS_DATA0*/\ -+ MUX_VAL(CP(DSS_DATA1), (IDIS | PTD | DIS | M0)) /*DSS_DATA1*/\ -+ MUX_VAL(CP(DSS_DATA2), (IDIS | PTD | DIS | M0)) /*DSS_DATA2*/\ -+ MUX_VAL(CP(DSS_DATA3), (IDIS | PTD | DIS | M0)) /*DSS_DATA3*/\ -+ MUX_VAL(CP(DSS_DATA4), (IDIS | PTD | DIS | M0)) /*DSS_DATA4*/\ -+ MUX_VAL(CP(DSS_DATA5), (IDIS | PTD | DIS | M0)) /*DSS_DATA5*/\ -+ MUX_VAL(CP(DSS_DATA6), (IDIS | PTD | DIS | M0)) /*DSS_DATA6*/\ -+ MUX_VAL(CP(DSS_DATA7), (IDIS | PTD | DIS | M0)) /*DSS_DATA7*/\ -+ MUX_VAL(CP(DSS_DATA8), (IDIS | PTD | DIS | M0)) /*DSS_DATA8*/\ -+ MUX_VAL(CP(DSS_DATA9), (IDIS | PTD | DIS | M0)) /*DSS_DATA9*/\ -+ MUX_VAL(CP(DSS_DATA10), (IDIS | PTD | DIS | M0)) /*DSS_DATA10*/\ -+ MUX_VAL(CP(DSS_DATA11), (IDIS | PTD | DIS | M0)) /*DSS_DATA11*/\ -+ MUX_VAL(CP(DSS_DATA12), (IDIS | PTD | DIS | M0)) /*DSS_DATA12*/\ -+ MUX_VAL(CP(DSS_DATA13), (IDIS | PTD | DIS | M0)) /*DSS_DATA13*/\ -+ MUX_VAL(CP(DSS_DATA14), (IDIS | PTD | DIS | M0)) /*DSS_DATA14*/\ -+ MUX_VAL(CP(DSS_DATA15), (IDIS | PTD | DIS | M0)) /*DSS_DATA15*/\ -+ MUX_VAL(CP(DSS_DATA16), (IDIS | PTD | DIS | M0)) /*DSS_DATA16*/\ -+ MUX_VAL(CP(DSS_DATA17), (IDIS | PTD | DIS | M0)) /*DSS_DATA17*/\ -+ MUX_VAL(CP(DSS_DATA18), (IDIS | PTD | DIS | M0)) /*DSS_DATA18*/\ -+ MUX_VAL(CP(DSS_DATA19), (IDIS | PTD | DIS | M0)) /*DSS_DATA19*/\ -+ MUX_VAL(CP(DSS_DATA20), (IDIS | PTD | DIS | M0)) /*DSS_DATA20*/\ -+ MUX_VAL(CP(DSS_DATA21), (IDIS | PTD | DIS | M0)) /*DSS_DATA21*/\ -+ MUX_VAL(CP(DSS_DATA22), (IDIS | PTD | DIS | M0)) /*DSS_DATA22*/\ -+ MUX_VAL(CP(DSS_DATA23), (IDIS | PTD | DIS | M0)) /*DSS_DATA23*/\ -+ /*CAMERA*/\ -+ MUX_VAL(CP(CAM_HS), (IEN | PTU | EN | M0)) /*CAM_HS */\ -+ MUX_VAL(CP(CAM_VS), (IEN | PTU | EN | M0)) /*CAM_VS */\ -+ MUX_VAL(CP(CAM_XCLKA), (IDIS | PTD | DIS | M0)) /*CAM_XCLKA*/\ -+ MUX_VAL(CP(CAM_PCLK), (IEN | PTU | EN | M0)) /*CAM_PCLK*/\ -+ MUX_VAL(CP(CAM_FLD), (IDIS | PTD | DIS | M4)) /*GPIO_98*/\ -+ /* - CAM_RESET*/\ -+ MUX_VAL(CP(CAM_D0), (IEN | PTD | DIS | M0)) /*CAM_D0*/\ -+ MUX_VAL(CP(CAM_D1), (IEN | PTD | DIS | M0)) /*CAM_D1*/\ -+ MUX_VAL(CP(CAM_D2), (IEN | PTD | DIS | M0)) /*CAM_D2*/\ -+ MUX_VAL(CP(CAM_D3), (IEN | PTD | DIS | M0)) /*CAM_D3*/\ -+ MUX_VAL(CP(CAM_D4), (IEN | PTD | DIS | M0)) /*CAM_D4*/\ -+ MUX_VAL(CP(CAM_D5), (IEN | PTD | DIS | M0)) /*CAM_D5*/\ -+ MUX_VAL(CP(CAM_D6), (IEN | PTD | DIS | M0)) /*CAM_D6*/\ -+ MUX_VAL(CP(CAM_D7), (IEN | PTD | DIS | M0)) /*CAM_D7*/\ -+ MUX_VAL(CP(CAM_D8), (IEN | PTD | DIS | M0)) /*CAM_D8*/\ -+ MUX_VAL(CP(CAM_D9), (IEN | PTD | DIS | M0)) /*CAM_D9*/\ -+ MUX_VAL(CP(CAM_D10), (IEN | PTD | DIS | M0)) /*CAM_D10*/\ -+ MUX_VAL(CP(CAM_D11), (IEN | PTD | DIS | M0)) /*CAM_D11*/\ -+ MUX_VAL(CP(CAM_XCLKB), (IDIS | PTD | DIS | M0)) /*CAM_XCLKB*/\ -+ MUX_VAL(CP(CAM_WEN), (IEN | PTD | DIS | M4)) /*GPIO_167*/\ -+ MUX_VAL(CP(CAM_STROBE), (IDIS | PTD | DIS | M0)) /*CAM_STROBE*/\ -+ MUX_VAL(CP(CSI2_DX0), (IEN | PTD | DIS | M0)) /*CSI2_DX0*/\ -+ MUX_VAL(CP(CSI2_DY0), (IEN | PTD | DIS | M0)) /*CSI2_DY0*/\ -+ MUX_VAL(CP(CSI2_DX1), (IEN | PTD | DIS | M0)) /*CSI2_DX1*/\ -+ MUX_VAL(CP(CSI2_DY1), (IEN | PTD | DIS | M0)) /*CSI2_DY1*/\ -+ /*Audio Interface */\ -+ MUX_VAL(CP(McBSP2_FSX), (IEN | PTD | DIS | M0)) /*McBSP2_FSX*/\ -+ MUX_VAL(CP(McBSP2_CLKX), (IEN | PTD | DIS | M0)) /*McBSP2_CLKX*/\ -+ MUX_VAL(CP(McBSP2_DR), (IEN | PTD | DIS | M0)) /*McBSP2_DR*/\ -+ MUX_VAL(CP(McBSP2_DX), (IDIS | PTD | DIS | M0)) /*McBSP2_DX*/\ -+ /*Expansion card */\ -+ MUX_VAL(CP(MMC1_CLK), (IDIS | PTU | EN | M0)) /*MMC1_CLK*/\ -+ MUX_VAL(CP(MMC1_CMD), (IEN | PTU | EN | M0)) /*MMC1_CMD*/\ -+ MUX_VAL(CP(MMC1_DAT0), (IEN | PTU | EN | M0)) /*MMC1_DAT0*/\ -+ MUX_VAL(CP(MMC1_DAT1), (IEN | PTU | EN | M0)) /*MMC1_DAT1*/\ -+ MUX_VAL(CP(MMC1_DAT2), (IEN | PTU | EN | M0)) /*MMC1_DAT2*/\ -+ MUX_VAL(CP(MMC1_DAT3), (IEN | PTU | EN | M0)) /*MMC1_DAT3*/\ -+ MUX_VAL(CP(MMC1_DAT4), (IEN | PTU | EN | M0)) /*MMC1_DAT4*/\ -+ MUX_VAL(CP(MMC1_DAT5), (IEN | PTU | EN | M0)) /*MMC1_DAT5*/\ -+ MUX_VAL(CP(MMC1_DAT6), (IEN | PTU | EN | M0)) /*MMC1_DAT6*/\ -+ MUX_VAL(CP(MMC1_DAT7), (IEN | PTU | EN | M0)) /*MMC1_DAT7*/\ -+ /*Wireless LAN */\ -+ MUX_VAL(CP(MMC2_CLK), (IEN | PTU | EN | M4)) /*GPIO_130*/\ -+ MUX_VAL(CP(MMC2_CMD), (IEN | PTU | EN | M4)) /*GPIO_131*/\ -+ MUX_VAL(CP(MMC2_DAT0), (IEN | PTU | EN | M4)) /*GPIO_132*/\ -+ MUX_VAL(CP(MMC2_DAT1), (IEN | PTU | EN | M4)) /*GPIO_133*/\ -+ MUX_VAL(CP(MMC2_DAT2), (IEN | PTU | EN | M4)) /*GPIO_134*/\ -+ MUX_VAL(CP(MMC2_DAT3), (IEN | PTU | EN | M4)) /*GPIO_135*/\ -+ MUX_VAL(CP(MMC2_DAT4), (IEN | PTU | EN | M4)) /*GPIO_136*/\ -+ MUX_VAL(CP(MMC2_DAT5), (IEN | PTU | EN | M4)) /*GPIO_137*/\ -+ MUX_VAL(CP(MMC2_DAT6), (IEN | PTU | EN | M4)) /*GPIO_138*/\ -+ MUX_VAL(CP(MMC2_DAT7), (IEN | PTU | EN | M4)) /*GPIO_139*/\ -+ /*Bluetooth*/\ -+ MUX_VAL(CP(McBSP3_DX), (IDIS | PTD | DIS | M4)) /*GPIO_140*/\ -+ MUX_VAL(CP(McBSP3_DR), (IDIS | PTD | DIS | M4)) /*GPIO_142*/\ -+ MUX_VAL(CP(McBSP3_CLKX), (IDIS | PTD | DIS | M4)) /*GPIO_141*/\ -+ MUX_VAL(CP(McBSP3_FSX), (IDIS | PTD | DIS | M4)) /*GPIO_143*/\ -+ MUX_VAL(CP(UART2_CTS), (IEN | PTU | EN | M0)) /*UART2_CTS*/\ -+ MUX_VAL(CP(UART2_RTS), (IDIS | PTD | DIS | M0)) /*UART2_RTS*/\ -+ MUX_VAL(CP(UART2_TX), (IDIS | PTD | DIS | M0)) /*UART2_TX*/\ -+ MUX_VAL(CP(UART2_RX), (IEN | PTD | DIS | M0)) /*UART2_RX*/\ -+ /*Modem Interface */\ -+ MUX_VAL(CP(UART1_TX), (IDIS | PTD | DIS | M0)) /*UART1_TX*/\ -+ MUX_VAL(CP(UART1_RTS), (IDIS | PTD | DIS | M4)) /*GPIO_149*/ \ -+ MUX_VAL(CP(UART1_CTS), (IDIS | PTD | DIS | M4)) /*GPIO_150*/ \ -+ MUX_VAL(CP(UART1_RX), (IEN | PTD | DIS | M0)) /*UART1_RX*/\ -+ MUX_VAL(CP(McBSP4_CLKX), (IEN | PTD | DIS | M1)) /*SSI1_DAT_RX*/\ -+ MUX_VAL(CP(McBSP4_DR), (IEN | PTD | DIS | M1)) /*SSI1_FLAG_RX*/\ -+ MUX_VAL(CP(McBSP4_DX), (IEN | PTD | DIS | M1)) /*SSI1_RDY_RX*/\ -+ MUX_VAL(CP(McBSP4_FSX), (IEN | PTD | DIS | M1)) /*SSI1_WAKE*/\ -+ MUX_VAL(CP(McBSP1_CLKR), (IDIS | PTD | DIS | M4)) /*GPIO_156*/\ -+ MUX_VAL(CP(McBSP1_FSR), (IDIS | PTU | EN | M4)) /*GPIO_157*/\ -+ /* - BT_WAKEUP*/\ -+ MUX_VAL(CP(McBSP1_DX), (IDIS | PTD | DIS | M4)) /*GPIO_158*/\ -+ MUX_VAL(CP(McBSP1_DR), (IDIS | PTD | DIS | M4)) /*GPIO_159*/\ -+ MUX_VAL(CP(McBSP_CLKS), (IEN | PTU | DIS | M0)) /*McBSP_CLKS*/\ -+ MUX_VAL(CP(McBSP1_FSX), (IDIS | PTD | DIS | M4)) /*GPIO_161*/\ -+ MUX_VAL(CP(McBSP1_CLKX), (IDIS | PTD | DIS | M4)) /*GPIO_162*/\ -+ /*Serial Interface*/\ -+ MUX_VAL(CP(UART3_CTS_RCTX), (IEN | PTD | EN | M0)) /*UART3_CTS_*/\ -+ /* RCTX*/\ -+ MUX_VAL(CP(UART3_RTS_SD), (IDIS | PTD | DIS | M0)) /*UART3_RTS_SD */\ -+ MUX_VAL(CP(UART3_RX_IRRX), (IEN | PTD | DIS | M0)) /*UART3_RX_IRRX*/\ -+ MUX_VAL(CP(UART3_TX_IRTX), (IDIS | PTD | DIS | M0)) /*UART3_TX_IRTX*/\ -+ MUX_VAL(CP(HSUSB0_CLK), (IEN | PTD | DIS | M0)) /*HSUSB0_CLK*/\ -+ MUX_VAL(CP(HSUSB0_STP), (IDIS | PTU | EN | M0)) /*HSUSB0_STP*/\ -+ MUX_VAL(CP(HSUSB0_DIR), (IEN | PTD | DIS | M0)) /*HSUSB0_DIR*/\ -+ MUX_VAL(CP(HSUSB0_NXT), (IEN | PTD | DIS | M0)) /*HSUSB0_NXT*/\ -+ MUX_VAL(CP(HSUSB0_DATA0), (IEN | PTD | DIS | M0)) /*HSUSB0_DATA0*/\ -+ MUX_VAL(CP(HSUSB0_DATA1), (IEN | PTD | DIS | M0)) /*HSUSB0_DATA1*/\ -+ MUX_VAL(CP(HSUSB0_DATA2), (IEN | PTD | DIS | M0)) /*HSUSB0_DATA2*/\ -+ MUX_VAL(CP(HSUSB0_DATA3), (IEN | PTD | DIS | M0)) /*HSUSB0_DATA3*/\ -+ MUX_VAL(CP(HSUSB0_DATA4), (IEN | PTD | DIS | M0)) /*HSUSB0_DATA4*/\ -+ MUX_VAL(CP(HSUSB0_DATA5), (IEN | PTD | DIS | M0)) /*HSUSB0_DATA5*/\ -+ MUX_VAL(CP(HSUSB0_DATA6), (IEN | PTD | DIS | M0)) /*HSUSB0_DATA6*/\ -+ MUX_VAL(CP(HSUSB0_DATA7), (IEN | PTD | DIS | M0)) /*HSUSB0_DATA7*/\ -+ MUX_VAL(CP(I2C1_SCL), (IEN | PTU | EN | M0)) /*I2C1_SCL*/\ -+ MUX_VAL(CP(I2C1_SDA), (IEN | PTU | EN | M0)) /*I2C1_SDA*/\ -+ MUX_VAL(CP(I2C2_SCL), (IEN | PTU | EN | M0)) /*I2C2_SCL*/\ -+ MUX_VAL(CP(I2C2_SDA), (IEN | PTU | EN | M0)) /*I2C2_SDA*/\ -+ MUX_VAL(CP(I2C3_SCL), (IEN | PTU | EN | M0)) /*I2C3_SCL*/\ -+ MUX_VAL(CP(I2C3_SDA), (IEN | PTU | EN | M0)) /*I2C3_SDA*/\ -+ MUX_VAL(CP(I2C4_SCL), (IEN | PTU | EN | M0)) /*I2C4_SCL*/\ -+ MUX_VAL(CP(I2C4_SDA), (IEN | PTU | EN | M0)) /*I2C4_SDA*/\ -+ MUX_VAL(CP(HDQ_SIO), (IDIS | PTU | EN | M4)) /*HDQ_SIO*/\ -+ MUX_VAL(CP(McSPI1_CLK), (IEN | PTD | DIS | M0)) /*McSPI1_CLK*/\ -+ MUX_VAL(CP(McSPI1_SIMO), (IEN | PTD | DIS | M0)) /*McSPI1_SIMO */\ -+ MUX_VAL(CP(McSPI1_SOMI), (IEN | PTD | DIS | M0)) /*McSPI1_SOMI */\ -+ MUX_VAL(CP(McSPI1_CS0), (IEN | PTD | EN | M0)) /*McSPI1_CS0*/\ -+ MUX_VAL(CP(McSPI1_CS1), (IDIS | PTD | EN | M0)) /*McSPI1_CS1*/\ -+ MUX_VAL(CP(McSPI1_CS2), (IDIS | PTD | DIS | M4)) /*GPIO_176*/\ -+ /* - NOR_DPD*/\ -+ MUX_VAL(CP(McSPI1_CS3), (IEN | PTD | EN | M0)) /*McSPI1_CS3*/\ -+ MUX_VAL(CP(McSPI2_CLK), (IEN | PTD | DIS | M0)) /*McSPI2_CLK*/\ -+ MUX_VAL(CP(McSPI2_SIMO), (IEN | PTD | DIS | M0)) /*McSPI2_SIMO*/\ -+ MUX_VAL(CP(McSPI2_SOMI), (IEN | PTD | DIS | M0)) /*McSPI2_SOMI*/\ -+ MUX_VAL(CP(McSPI2_CS0), (IEN | PTD | EN | M0)) /*McSPI2_CS0*/\ -+ MUX_VAL(CP(McSPI2_CS1), (IEN | PTD | EN | M0)) /*McSPI2_CS1*/\ -+ /*Control and debug */\ -+ MUX_VAL(CP(SYS_32K), (IEN | PTD | DIS | M0)) /*SYS_32K*/\ -+ MUX_VAL(CP(SYS_CLKREQ), (IEN | PTD | DIS | M0)) /*SYS_CLKREQ*/\ -+ MUX_VAL(CP(SYS_nIRQ), (IEN | PTU | EN | M0)) /*SYS_nIRQ*/\ -+ MUX_VAL(CP(SYS_BOOT0), (IEN | PTD | DIS | M4)) /*GPIO_2*/\ -+ /* - PEN_IRQ */\ -+ MUX_VAL(CP(SYS_BOOT1), (IEN | PTD | DIS | M4)) /*GPIO_3 */\ -+ MUX_VAL(CP(SYS_BOOT2), (IEN | PTD | DIS | M4)) /*GPIO_4*/\ -+ /* - MMC1_WP */\ -+ MUX_VAL(CP(SYS_BOOT3), (IEN | PTD | DIS | M4)) /*GPIO_5*/\ -+ /* - LCD_ENVDD*/\ -+ MUX_VAL(CP(SYS_BOOT4), (IEN | PTD | DIS | M4)) /*GPIO_6*/\ -+ /* - LAN_INTR0*/\ -+ MUX_VAL(CP(SYS_BOOT5), (IEN | PTD | DIS | M4)) /*GPIO_7*/\ -+ /* - MMC2_WP*/\ -+ MUX_VAL(CP(SYS_BOOT6), (IDIS | PTD | DIS | M4)) /*GPIO_8*/\ -+ /* - LCD_ENBKL*/\ -+ MUX_VAL(CP(SYS_OFF_MODE), (IEN | PTD | DIS | M0)) /*SYS_OFF_MODE*/\ -+ MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTD | DIS | M0)) /*SYS_CLKOUT1*/\ -+ MUX_VAL(CP(SYS_CLKOUT2), (IEN | PTU | EN | M4)) /*GPIO_186*/\ -+ MUX_VAL(CP(ETK_CLK_ES2), (IDIS | PTU | EN | M3)) /*HSUSB1_STP*/\ -+ MUX_VAL(CP(ETK_CTL_ES2), (IDIS | PTD | DIS | M3)) /*HSUSB1_CLK*/\ -+ MUX_VAL(CP(ETK_D0_ES2), (IEN | PTD | DIS | M3)) /*HSUSB1_DATA0*/\ -+ MUX_VAL(CP(ETK_D1_ES2), (IEN | PTD | DIS | M3)) /*HSUSB1_DATA1*/\ -+ MUX_VAL(CP(ETK_D2_ES2), (IEN | PTD | DIS | M3)) /*HSUSB1_DATA2*/\ -+ MUX_VAL(CP(ETK_D3_ES2), (IEN | PTD | DIS | M3)) /*HSUSB1_DATA7*/\ -+ MUX_VAL(CP(ETK_D4_ES2), (IEN | PTD | DIS | M3)) /*HSUSB1_DATA4*/\ -+ MUX_VAL(CP(ETK_D5_ES2), (IEN | PTD | DIS | M3)) /*HSUSB1_DATA5*/\ -+ MUX_VAL(CP(ETK_D6_ES2), (IEN | PTD | DIS | M3)) /*HSUSB1_DATA6*/\ -+ MUX_VAL(CP(ETK_D7_ES2), (IEN | PTD | DIS | M3)) /*HSUSB1_DATA3*/\ -+ MUX_VAL(CP(ETK_D8_ES2), (IEN | PTD | DIS | M3)) /*HSUSB1_DIR*/\ -+ MUX_VAL(CP(ETK_D9_ES2), (IEN | PTD | DIS | M3)) /*HSUSB1_NXT*/\ -+ MUX_VAL(CP(ETK_D10_ES2), (IDIS | PTU | EN | M4)) /*GPIO_24*/\ -+ MUX_VAL(CP(ETK_D15), (IEN | PTU | EN | M4)) /*GPIO_29*/\ -+ MUX_VAL(CP(d2d_mcad1), (IEN | PTD | EN | M0)) /*d2d_mcad1*/\ -+ MUX_VAL(CP(d2d_mcad2), (IEN | PTD | EN | M0)) /*d2d_mcad2*/\ -+ MUX_VAL(CP(d2d_mcad3), (IEN | PTD | EN | M0)) /*d2d_mcad3*/\ -+ MUX_VAL(CP(d2d_mcad4), (IEN | PTD | EN | M0)) /*d2d_mcad4*/\ -+ MUX_VAL(CP(d2d_mcad5), (IEN | PTD | EN | M0)) /*d2d_mcad5*/\ -+ MUX_VAL(CP(d2d_mcad6), (IEN | PTD | EN | M0)) /*d2d_mcad6*/\ -+ MUX_VAL(CP(d2d_mcad7), (IEN | PTD | EN | M0)) /*d2d_mcad7*/\ -+ MUX_VAL(CP(d2d_mcad8), (IEN | PTD | EN | M0)) /*d2d_mcad8*/\ -+ MUX_VAL(CP(d2d_mcad9), (IEN | PTD | EN | M0)) /*d2d_mcad9*/\ -+ MUX_VAL(CP(d2d_mcad10), (IEN | PTD | EN | M0)) /*d2d_mcad10*/\ -+ MUX_VAL(CP(d2d_mcad11), (IEN | PTD | EN | M0)) /*d2d_mcad11*/\ -+ MUX_VAL(CP(d2d_mcad12), (IEN | PTD | EN | M0)) /*d2d_mcad12*/\ -+ MUX_VAL(CP(d2d_mcad13), (IEN | PTD | EN | M0)) /*d2d_mcad13*/\ -+ MUX_VAL(CP(d2d_mcad14), (IEN | PTD | EN | M0)) /*d2d_mcad14*/\ -+ MUX_VAL(CP(d2d_mcad15), (IEN | PTD | EN | M0)) /*d2d_mcad15*/\ -+ MUX_VAL(CP(d2d_mcad16), (IEN | PTD | EN | M0)) /*d2d_mcad16*/\ -+ MUX_VAL(CP(d2d_mcad17), (IEN | PTD | EN | M0)) /*d2d_mcad17*/\ -+ MUX_VAL(CP(d2d_mcad18), (IEN | PTD | EN | M0)) /*d2d_mcad18*/\ -+ MUX_VAL(CP(d2d_mcad19), (IEN | PTD | EN | M0)) /*d2d_mcad19*/\ -+ MUX_VAL(CP(d2d_mcad20), (IEN | PTD | EN | M0)) /*d2d_mcad20*/\ -+ MUX_VAL(CP(d2d_mcad21), (IEN | PTD | EN | M0)) /*d2d_mcad21*/\ -+ MUX_VAL(CP(d2d_mcad22), (IEN | PTD | EN | M0)) /*d2d_mcad22*/\ -+ MUX_VAL(CP(d2d_mcad23), (IEN | PTD | EN | M0)) /*d2d_mcad23*/\ -+ MUX_VAL(CP(d2d_mcad24), (IEN | PTD | EN | M0)) /*d2d_mcad24*/\ -+ MUX_VAL(CP(d2d_mcad25), (IEN | PTD | EN | M0)) /*d2d_mcad25*/\ -+ MUX_VAL(CP(d2d_mcad26), (IEN | PTD | EN | M0)) /*d2d_mcad26*/\ -+ MUX_VAL(CP(d2d_mcad27), (IEN | PTD | EN | M0)) /*d2d_mcad27*/\ -+ MUX_VAL(CP(d2d_mcad28), (IEN | PTD | EN | M0)) /*d2d_mcad28*/\ -+ MUX_VAL(CP(d2d_mcad29), (IEN | PTD | EN | M0)) /*d2d_mcad29*/\ -+ MUX_VAL(CP(d2d_mcad30), (IEN | PTD | EN | M0)) /*d2d_mcad30*/\ -+ MUX_VAL(CP(d2d_mcad31), (IEN | PTD | EN | M0)) /*d2d_mcad31*/\ -+ MUX_VAL(CP(d2d_mcad32), (IEN | PTD | EN | M0)) /*d2d_mcad32*/\ -+ MUX_VAL(CP(d2d_mcad33), (IEN | PTD | EN | M0)) /*d2d_mcad33*/\ -+ MUX_VAL(CP(d2d_mcad34), (IEN | PTD | EN | M0)) /*d2d_mcad34*/\ -+ MUX_VAL(CP(d2d_mcad35), (IEN | PTD | EN | M0)) /*d2d_mcad35*/\ -+ MUX_VAL(CP(d2d_mcad36), (IEN | PTD | EN | M0)) /*d2d_mcad36*/\ -+ MUX_VAL(CP(d2d_clk26mi), (IEN | PTD | DIS | M0)) /*d2d_clk26mi*/\ -+ MUX_VAL(CP(d2d_nrespwron), (IEN | PTD | EN | M0)) /*d2d_nrespwron*/\ -+ MUX_VAL(CP(d2d_nreswarm), (IEN | PTU | EN | M0)) /*d2d_nreswarm */\ -+ MUX_VAL(CP(d2d_arm9nirq), (IEN | PTD | DIS | M0)) /*d2d_arm9nirq */\ -+ MUX_VAL(CP(d2d_uma2p6fiq), (IEN | PTD | DIS | M0)) /*d2d_uma2p6fiq*/\ -+ MUX_VAL(CP(d2d_spint), (IEN | PTD | EN | M0)) /*d2d_spint*/\ -+ MUX_VAL(CP(d2d_frint), (IEN | PTD | EN | M0)) /*d2d_frint*/\ -+ MUX_VAL(CP(d2d_dmareq0), (IEN | PTD | DIS | M0)) /*d2d_dmareq0*/\ -+ MUX_VAL(CP(d2d_dmareq1), (IEN | PTD | DIS | M0)) /*d2d_dmareq1*/\ -+ MUX_VAL(CP(d2d_dmareq2), (IEN | PTD | DIS | M0)) /*d2d_dmareq2*/\ -+ MUX_VAL(CP(d2d_dmareq3), (IEN | PTD | DIS | M0)) /*d2d_dmareq3*/\ -+ MUX_VAL(CP(d2d_n3gtrst), (IEN | PTD | DIS | M0)) /*d2d_n3gtrst*/\ -+ MUX_VAL(CP(d2d_n3gtdi), (IEN | PTD | DIS | M0)) /*d2d_n3gtdi*/\ -+ MUX_VAL(CP(d2d_n3gtdo), (IEN | PTD | DIS | M0)) /*d2d_n3gtdo*/\ -+ MUX_VAL(CP(d2d_n3gtms), (IEN | PTD | DIS | M0)) /*d2d_n3gtms*/\ -+ MUX_VAL(CP(d2d_n3gtck), (IEN | PTD | DIS | M0)) /*d2d_n3gtck*/\ -+ MUX_VAL(CP(d2d_n3grtck), (IEN | PTD | DIS | M0)) /*d2d_n3grtck*/\ -+ MUX_VAL(CP(d2d_mstdby), (IEN | PTU | EN | M0)) /*d2d_mstdby*/\ -+ MUX_VAL(CP(d2d_swakeup), (IEN | PTD | EN | M0)) /*d2d_swakeup*/\ -+ MUX_VAL(CP(d2d_idlereq), (IEN | PTD | DIS | M0)) /*d2d_idlereq*/\ -+ MUX_VAL(CP(d2d_idleack), (IEN | PTU | EN | M0)) /*d2d_idleack*/\ -+ MUX_VAL(CP(d2d_mwrite), (IEN | PTD | DIS | M0)) /*d2d_mwrite*/\ -+ MUX_VAL(CP(d2d_swrite), (IEN | PTD | DIS | M0)) /*d2d_swrite*/\ -+ MUX_VAL(CP(d2d_mread), (IEN | PTD | DIS | M0)) /*d2d_mread*/\ -+ MUX_VAL(CP(d2d_sread), (IEN | PTD | DIS | M0)) /*d2d_sread*/\ -+ MUX_VAL(CP(d2d_mbusflag), (IEN | PTD | DIS | M0)) /*d2d_mbusflag*/\ -+ MUX_VAL(CP(d2d_sbusflag), (IEN | PTD | DIS | M0)) /*d2d_sbusflag*/\ -+ MUX_VAL(CP(sdrc_cke0), (IDIS | PTU | EN | M0)) /*sdrc_cke0*/\ -+ MUX_VAL(CP(sdrc_cke1), (IDIS | PTD | DIS | M7)) /*sdrc_cke1*/\ -+ /* - not used */ -+#endif -diff --git a/include/asm-arm/arch-omap3/omap3.h b/include/asm-arm/arch-omap3/omap3.h -new file mode 100644 -index 0000000..095bb29 ---- /dev/null -+++ b/include/asm-arm/arch-omap3/omap3.h -@@ -0,0 +1,131 @@ -+/* -+ * (C) Copyright 2006-2008 -+ * Texas Instruments, <www.ti.com> -+ * Richard Woodruff <r-woodruff2@ti.com> -+ * Syed Mohammed Khasim <x0khasim@ti.com> -+ * -+ * 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 -+ */ -+ -+#ifndef _OMAP3_H_ -+#define _OMAP3_H_ -+ -+/* Stuff on L3 Interconnect */ -+#define SMX_APE_BASE 0x68000000 -+ -+/* GPMC */ -+#define OMAP34XX_GPMC_BASE (0x6E000000) -+ -+/* SMS */ -+#define OMAP34XX_SMS_BASE 0x6C000000 -+ -+/* SDRC */ -+#define OMAP34XX_SDRC_BASE 0x6D000000 -+ -+/* -+ * L4 Peripherals - L4 Wakeup and L4 Core now -+ */ -+#define OMAP34XX_CORE_L4_IO_BASE 0x48000000 -+#define OMAP34XX_WAKEUP_L4_IO_BASE 0x48300000 -+#define OMAP34XX_L4_PER 0x49000000 -+#define OMAP34XX_L4_IO_BASE OMAP34XX_CORE_L4_IO_BASE -+ -+/* CONTROL */ -+#define OMAP34XX_CTRL_BASE (OMAP34XX_L4_IO_BASE+0x2000) -+ -+/* UART */ -+#define OMAP34XX_UART1 (OMAP34XX_L4_IO_BASE+0x6a000) -+#define OMAP34XX_UART2 (OMAP34XX_L4_IO_BASE+0x6c000) -+#define OMAP34XX_UART3 (OMAP34XX_L4_PER+0x20000) -+ -+/* General Purpose Timers */ -+#define OMAP34XX_GPT1 0x48318000 -+#define OMAP34XX_GPT2 0x49032000 -+#define OMAP34XX_GPT3 0x49034000 -+#define OMAP34XX_GPT4 0x49036000 -+#define OMAP34XX_GPT5 0x49038000 -+#define OMAP34XX_GPT6 0x4903A000 -+#define OMAP34XX_GPT7 0x4903C000 -+#define OMAP34XX_GPT8 0x4903E000 -+#define OMAP34XX_GPT9 0x49040000 -+#define OMAP34XX_GPT10 0x48086000 -+#define OMAP34XX_GPT11 0x48088000 -+#define OMAP34XX_GPT12 0x48304000 -+ -+/* WatchDog Timers (1 secure, 3 GP) */ -+#define WD1_BASE (0x4830C000) -+#define WD2_BASE (0x48314000) -+#define WD3_BASE (0x49030000) -+ -+/* 32KTIMER */ -+#define SYNC_32KTIMER_BASE (0x48320000) -+#define S32K_CR (SYNC_32KTIMER_BASE+0x10) -+ -+/* omap3 GPIO registers */ -+#define OMAP34XX_GPIO1_BASE 0x48310000 -+#define OMAP34XX_GPIO2_BASE 0x49050000 -+#define OMAP34XX_GPIO3_BASE 0x49052000 -+#define OMAP34XX_GPIO4_BASE 0x49054000 -+#define OMAP34XX_GPIO5_BASE 0x49056000 -+#define OMAP34XX_GPIO6_BASE 0x49058000 -+ -+/* base address for indirect vectors (internal boot mode) */ -+#define SRAM_OFFSET0 0x40000000 -+#define SRAM_OFFSET1 0x00200000 -+#define SRAM_OFFSET2 0x0000F800 -+#define SRAM_VECT_CODE (SRAM_OFFSET0|SRAM_OFFSET1|\ -+ SRAM_OFFSET2) -+ -+#define LOW_LEVEL_SRAM_STACK 0x4020FFFC -+ -+#define DEBUG_LED1 149 /* gpio */ -+#define DEBUG_LED2 150 /* gpio */ -+ -+#define XDR_POP 5 /* package on package part */ -+#define SDR_DISCRETE 4 /* 128M memory SDR module */ -+#define DDR_STACKED 3 /* stacked part on 2422 */ -+#define DDR_COMBO 2 /* combo part on cpu daughter card */ -+#define DDR_DISCRETE 1 /* 2x16 parts on daughter card */ -+ -+#define DDR_100 100 /* type found on most mem d-boards */ -+#define DDR_111 111 /* some combo parts */ -+#define DDR_133 133 /* most combo, some mem d-boards */ -+#define DDR_165 165 /* future parts */ -+ -+#define CPU_3430 0x3430 -+ -+/* 343x real hardware: -+ * ES1 = rev 0 -+ */ -+ -+/* 343x code defines: -+ * ES1 = 0+1 = 1 -+ * ES1 = 1+1 = 1 -+ */ -+#define CPU_3430_ES1 1 -+#define CPU_3430_ES2 2 -+ -+#define WIDTH_8BIT 0x0000 -+#define WIDTH_16BIT 0x1000 /* bit pos for 16 bit in gpmc */ -+ -+/* SDP definitions according to FPGA Rev. Is this OK?? */ -+#define SDP_3430_V1 0x1 -+#define SDP_3430_V2 0x2 -+ -+#endif -diff --git a/include/asm-arm/arch-omap3/sys_proto.h b/include/asm-arm/arch-omap3/sys_proto.h -new file mode 100644 -index 0000000..271b554 ---- /dev/null -+++ b/include/asm-arm/arch-omap3/sys_proto.h -@@ -0,0 +1,64 @@ -+/* -+ * (C) Copyright 2004-2008 -+ * Texas Instruments, <www.ti.com> -+ * Richard Woodruff <r-woodruff2@ti.com> -+ * -+ * 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 _SYS_PROTO_H_ -+#define _SYS_PROTO_H_ -+ -+void prcm_init(void); -+void per_clocks_enable(void); -+ -+void memif_init(void); -+void sdrc_init(void); -+void do_sdrc_init(u32, u32); -+void gpmc_init(void); -+ -+void watchdog_init(void); -+void set_muxconf_regs(void); -+ -+u32 get_cpu_type(void); -+u32 get_cpu_rev(void); -+u32 get_mem_type(void); -+u32 get_sysboot_value(void); -+u32 get_gpmc0_base(void); -+u32 is_gpmc_muxed(void); -+u32 get_gpmc0_type(void); -+u32 get_gpmc0_width(void); -+u32 get_board_type(void); -+void display_board_info(u32); -+u32 get_sdr_cs_size(u32 offset); -+u32 running_in_sdram(void); -+u32 running_in_sram(void); -+u32 running_in_flash(void); -+u32 running_from_internal_boot(void); -+u32 get_device_type(void); -+void l2cache_enable(void); -+void secureworld_exit(void); -+void setup_auxcr(void); -+void try_unlock_memory(void); -+u32 get_boot_type(void); -+void audio_init(void); -+void dss_init(void); -+void arm_cache_flush(void); -+void v7_flush_dcache_all(u32); -+void sr32(u32 addr, u32 start_bit, u32 num_bits, u32 value); -+u32 wait_on_value(u32 read_bit_mask, u32 match_value, u32 read_addr, u32 bound); -+void sdelay(unsigned long loops); -+ -+#endif -diff --git a/include/configs/omap3530beagle.h b/include/configs/omap3530beagle.h -new file mode 100644 -index 0000000..20efbf3 ---- /dev/null -+++ b/include/configs/omap3530beagle.h -@@ -0,0 +1,292 @@ -+/* -+ * (C) Copyright 2006-2008 -+ * Texas Instruments. -+ * Richard Woodruff <r-woodruff2@ti.com> -+ * Syed Mohammed Khasim <x0khasim@ti.com> -+ * -+ * Configuration settings for the TI OMAP3530 Beagle board. -+ * -+ * 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 -+ */ -+ -+#ifndef __CONFIG_H -+#define __CONFIG_H -+#include <asm/sizes.h> -+ -+/* -+ * High Level Configuration Options -+ */ -+#define CONFIG_ARMCORTEXA8 1 /* This is an ARM V7 CPU core */ -+#define CONFIG_OMAP 1 /* in a TI OMAP core */ -+#define CONFIG_OMAP34XX 1 /* which is a 34XX */ -+#define CONFIG_OMAP3430 1 /* which is in a 3430 */ -+#define CONFIG_OMAP3_BEAGLE 1 /* working with BEAGLE */ -+#define CONFIG_DOS_PARTITION 1 -+ -+#include <asm/arch/cpu.h> /* get chip and board defs */ -+#include <asm/arch/omap3.h> -+ -+/* Clock Defines */ -+#define V_OSCK 26000000 /* Clock output from T2 */ -+#define V_SCLK (V_OSCK >> 1) -+ -+#undef CONFIG_USE_IRQ /* no support for IRQs */ -+#define CONFIG_MISC_INIT_R -+ -+#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -+#define CONFIG_SETUP_MEMORY_TAGS 1 -+#define CONFIG_INITRD_TAG 1 -+#define CONFIG_REVISION_TAG 1 -+ -+/* -+ * Size of malloc() pool -+ */ -+#define CFG_ENV_SIZE SZ_128K /* Total Size Environment Sector */ -+#define CFG_MALLOC_LEN (CFG_ENV_SIZE + SZ_128K) -+#define CFG_GBL_DATA_SIZE 128 /* bytes reserved for initial data */ -+ -+/* -+ * Hardware drivers -+ */ -+ -+/* -+ * NS16550 Configuration -+ */ -+#define V_NS16550_CLK (48000000) /* 48MHz (APLL96/2) */ -+ -+#define CFG_NS16550 -+#define CFG_NS16550_SERIAL -+#define CFG_NS16550_REG_SIZE (-4) -+#define CFG_NS16550_CLK V_NS16550_CLK -+ -+/* -+ * select serial console configuration -+ */ -+#define CONFIG_CONS_INDEX 3 -+#define CFG_NS16550_COM3 OMAP34XX_UART3 -+#define CONFIG_SERIAL3 3 /* UART3 on Beagle Rev 2 */ -+ -+/* allow to overwrite serial and ethaddr */ -+#define CONFIG_ENV_OVERWRITE -+#define CONFIG_BAUDRATE 115200 -+#define CFG_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200} -+#define CONFIG_MMC 1 -+#define CFG_MMC_BASE 0xF0000000 -+#define CONFIG_DOS_PARTITION 1 -+ -+/* commands to include */ -+ -+#define CONFIG_CMD_EXT2 /* EXT2 Support */ -+#define CONFIG_CMD_FAT /* FAT support */ -+#define CONFIG_CMD_JFFS2 /* JFFS2 Support */ -+ -+#define CONFIG_CMD_I2C /* I2C serial bus support */ -+#define CONFIG_CMD_MMC /* MMC support */ -+#define CONFIG_CMD_NAND /* NAND support */ -+ -+#define CONFIG_CMD_AUTOSCRIPT /* autoscript support */ -+#define CONFIG_CMD_BDI /* bdinfo */ -+#define CONFIG_CMD_BOOTD /* bootd */ -+#define CONFIG_CMD_CONSOLE /* coninfo */ -+#define CONFIG_CMD_ECHO /* echo arguments */ -+#define CONFIG_CMD_ENV /* saveenv */ -+#define CONFIG_CMD_ITEST /* Integer (and string) test */ -+#define CONFIG_CMD_LOADB /* loadb */ -+#define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop mtest */ -+#define CONFIG_CMD_MISC /* misc functions like sleep etc*/ -+#define CONFIG_CMD_RUN /* run command in env variable */ -+ -+#define CFG_NO_FLASH -+#define CFG_I2C_SPEED 100 -+#define CFG_I2C_SLAVE 1 -+#define CFG_I2C_BUS 0 -+#define CFG_I2C_BUS_SELECT 1 -+#define CONFIG_DRIVER_OMAP34XX_I2C 1 -+ -+/* -+ * Board NAND Info. -+ */ -+#define CFG_NAND_ADDR NAND_BASE /* physical address to access nand */ -+#define CFG_NAND_BASE NAND_BASE /* physical address to access nand at CS0 */ -+#define CFG_NAND_WIDTH_16 -+ -+#define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ -+#define SECTORSIZE 512 -+ -+#define NAND_ALLOW_ERASE_ALL -+#define ADDR_COLUMN 1 -+#define ADDR_PAGE 2 -+#define ADDR_COLUMN_PAGE 3 -+ -+#define NAND_ChipID_UNKNOWN 0x00 -+#define NAND_MAX_FLOORS 1 -+#define NAND_MAX_CHIPS 1 -+#define NAND_NO_RB 1 -+#define CFG_NAND_WP -+ -+#define CONFIG_JFFS2_NAND -+/* nand device jffs2 lives on */ -+#define CONFIG_JFFS2_DEV "nand0" -+/* start of jffs2 partition */ -+#define CONFIG_JFFS2_PART_OFFSET 0x680000 -+#define CONFIG_JFFS2_PART_SIZE 0xf980000 /* size of jffs2 partition */ -+ -+/* Environment information */ -+#define CONFIG_BOOTDELAY 10 -+ -+#define CONFIG_BOOTCOMMAND "nand read 80200000 280000 400000 ; bootm 80200000" -+ -+#define CONFIG_BOOTARGS "setenv bootargs console=ttyS2,115200n8 noinitrd root=/dev/mtdblock4 rw rootfstype=jffs2" -+ -+#define CONFIG_NETMASK 255.255.254.0 -+#define CONFIG_IPADDR 128.247.77.90 -+#define CONFIG_SERVERIP 128.247.77.158 -+#define CONFIG_BOOTFILE "uImage" -+#define CONFIG_AUTO_COMPLETE 1 -+/* -+ * Miscellaneous configurable options -+ */ -+#define V_PROMPT "OMAP3 beagleboard.org # " -+ -+#define CFG_LONGHELP /* undef to save memory */ -+#define CFG_PROMPT V_PROMPT -+#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ -+/* Print Buffer Size */ -+#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) -+#define CFG_MAXARGS 16 /* max number of command args */ -+#define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */ -+ -+#define CFG_MEMTEST_START (OMAP34XX_SDRC_CS0) /* memtest works on */ -+#define CFG_MEMTEST_END (OMAP34XX_SDRC_CS0+0x01F00000) /* 31MB */ -+ -+#undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */ -+ -+#define CFG_LOAD_ADDR (OMAP34XX_SDRC_CS0) /* default load address */ -+ -+/* 2430 has 12 GP timers, they can be driven by the SysClk (12/13/19.2) or by -+ * 32KHz clk, or from external sig. This rate is divided by a local divisor. -+ */ -+#define V_PVT 7 -+ -+#define CFG_TIMERBASE OMAP34XX_GPT2 -+#define CFG_PVT V_PVT /* 2^(pvt+1) */ -+#define CFG_HZ ((V_SCLK)/(2 << CFG_PVT)) -+ -+/*----------------------------------------------------------------------- -+ * Stack sizes -+ * -+ * The stack sizes are set up in start.S using the settings below -+ */ -+#define CONFIG_STACKSIZE SZ_128K /* regular stack */ -+#ifdef CONFIG_USE_IRQ -+#define CONFIG_STACKSIZE_IRQ SZ_4K /* IRQ stack */ -+#define CONFIG_STACKSIZE_FIQ SZ_4K /* FIQ stack */ -+#endif -+ -+/*----------------------------------------------------------------------- -+ * Physical Memory Map -+ */ -+#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ -+#define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 -+#define PHYS_SDRAM_1_SIZE SZ_32M /* at least 32 meg */ -+#define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1 -+ -+/* SDRAM Bank Allocation method */ -+#define SDRC_R_B_C 1 -+ -+/*----------------------------------------------------------------------- -+ * FLASH and environment organization -+ */ -+ -+/* **** PISMO SUPPORT *** */ -+ -+/* Configure the PISMO */ -+#define PISMO1_NOR_SIZE_SDPV2 GPMC_SIZE_128M -+#define PISMO1_NOR_SIZE GPMC_SIZE_64M -+ -+#define PISMO1_NAND_SIZE GPMC_SIZE_128M -+#define PISMO1_ONEN_SIZE GPMC_SIZE_128M -+#define DBG_MPDB_SIZE GPMC_SIZE_16M -+#define PISMO2_SIZE 0 -+ -+#define CFG_MAX_FLASH_SECT (520) /* max number of sectors on one chip */ -+#define CFG_MAX_FLASH_BANKS 2 /* max number of flash banks */ -+#define CFG_MONITOR_LEN SZ_256K /* Reserve 2 sectors */ -+ -+#define PHYS_FLASH_SIZE_SDPV2 SZ_128M -+#define PHYS_FLASH_SIZE SZ_32M -+ -+#define CFG_FLASH_BASE boot_flash_base -+#define PHYS_FLASH_SECT_SIZE boot_flash_sec -+/* Dummy declaration of flash banks to get compilation right */ -+#define CFG_FLASH_BANKS_LIST {0, 0} -+ -+#define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at start of flash */ -+#define CFG_ONENAND_BASE ONENAND_MAP -+ -+#define CFG_ENV_IS_IN_NAND 1 -+#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */ -+#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ -+ -+#define CFG_ENV_SECT_SIZE boot_flash_sec -+#define CFG_ENV_OFFSET boot_flash_off -+#define CFG_ENV_ADDR SMNAND_ENV_OFFSET -+ -+/*----------------------------------------------------------------------- -+ * CFI FLASH driver setup -+ */ -+/* timeout values are in ticks */ -+#define CFG_FLASH_ERASE_TOUT (100*CFG_HZ) /* Timeout for Flash Erase */ -+#define CFG_FLASH_WRITE_TOUT (100*CFG_HZ) /* Timeout for Flash Write */ -+ -+/* Flash banks JFFS2 should use */ -+#define CFG_MAX_MTD_BANKS (CFG_MAX_FLASH_BANKS+CFG_MAX_NAND_DEVICE) -+#define CFG_JFFS2_MEM_NAND -+#define CFG_JFFS2_FIRST_BANK CFG_MAX_FLASH_BANKS /* use flash_info[2] */ -+#define CFG_JFFS2_NUM_BANKS 1 -+ -+#define ENV_IS_VARIABLE 1 -+ -+#ifndef __ASSEMBLY__ -+extern unsigned int nand_cs_base; -+extern unsigned int boot_flash_base; -+extern volatile unsigned int boot_flash_env_addr; -+extern unsigned int boot_flash_off; -+extern unsigned int boot_flash_sec; -+extern unsigned int boot_flash_type; -+#endif -+ -+ -+#define WRITE_NAND_COMMAND(d, adr)\ -+ __raw_writew(d, (nand_cs_base + GPMC_NAND_CMD)) -+#define WRITE_NAND_ADDRESS(d, adr)\ -+ __raw_writew(d, (nand_cs_base + GPMC_NAND_ADR)) -+#define WRITE_NAND(d, adr) __raw_writew(d, (nand_cs_base + GPMC_NAND_DAT)) -+#define READ_NAND(adr) __raw_readw((nand_cs_base + GPMC_NAND_DAT)) -+ -+/* Other NAND Access APIs */ -+#define NAND_WP_OFF()\ -+ do {*(volatile u32 *)(GPMC_CONFIG) |= 0x00000010; } while (0) -+#define NAND_WP_ON()\ -+ do {*(volatile u32 *)(GPMC_CONFIG) &= ~0x00000010; } while (0) -+#define NAND_DISABLE_CE(nand) -+#define NAND_ENABLE_CE(nand) -+#define NAND_WAIT_READY(nand) udelay(10) -+ -+#endif /* __CONFIG_H */ diff --git a/packages/u-boot/u-boot-git/beagleboard/name.patch b/packages/u-boot/u-boot-git/beagleboard/name.patch index 1729662234..ac03e47774 100644 --- a/packages/u-boot/u-boot-git/beagleboard/name.patch +++ b/packages/u-boot/u-boot-git/beagleboard/name.patch @@ -1,14 +1,14 @@ ---- u-boot/Makefile-orig 2008-05-29 14:00:30.000000000 -0700 -+++ u-boot/Makefile 2008-05-29 13:59:13.000000000 -0700 -@@ -2550,8 +2550,8 @@ omap2430sdp_config : unconfig +--- git/Makefile.orig 2008-07-25 16:21:22.000000000 -0700 ++++ git/Makefile 2008-07-27 06:49:08.000000000 -0700 +@@ -2582,8 +2582,8 @@ SMN42_config : unconfig ######################################################################### ## ARM CORTEX Systems ######################################################################### --omap3530beagle_config : unconfig -- @./mkconfig $(@:_config=) arm omap3 omap3530beagle -+beagleboard_config : unconfig -+ @./mkconfig omap3530beagle arm omap3 omap3530beagle +-omap3530beagle_config : unconfig +- @$(MKCONFIG) $(@:_config=) arm omap3 omap3530beagle ++beagleboard_config : unconfig ++ @$(MKCONFIG) omap3530beagle arm omap3 omap3530beagle - ######################################################################### - ## XScale Systems + overo_config : unconfig + @$(MKCONFIG) $(@:_config=) arm omap3 overo diff --git a/packages/u-boot/u-boot.inc b/packages/u-boot/u-boot.inc index 5a5bdb21c1..93d6037339 100644 --- a/packages/u-boot/u-boot.inc +++ b/packages/u-boot/u-boot.inc @@ -24,10 +24,12 @@ do_compile () { do_deploy () { install -d ${DEPLOY_DIR_IMAGE} install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} + package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} cd ${DEPLOY_DIR_IMAGE} rm -f ${UBOOT_SYMLINK} ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} + package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${UBOOT_SYMLINK} } do_deploy[dirs] = "${S}" addtask deploy before do_build after do_compile diff --git a/packages/u-boot/u-boot_git.bb b/packages/u-boot/u-boot_git.bb index 6ccc6f2614..ea2f024d33 100644 --- a/packages/u-boot/u-boot_git.bb +++ b/packages/u-boot/u-boot_git.bb @@ -1,19 +1,18 @@ require u-boot.inc -PR="r11" +PR="r13" -SRCREV_davinci-sffsdr = "699f05125509249072a0b865c8d35520d97cd501" -SRCREV_davinci-dvevm = "699f05125509249072a0b865c8d35520d97cd501" -SRCREV_beagleboard = "bde63587622c4b830a27d1ddf7265843de9e994f" -SRCREV_neuros-osd2 = "70ee511d37ca99afee00edc27be36d0af2832bbc" +SRCREV_davinci-sffsdr = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" +SRCREV_davinci-dvevm = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" +SRCREV_beagleboard = "2d77381a184df7b5017b4a1301d2c02300f3ca3d" +SRCREV_neuros-osd2 = "a56f1723a6869428996038ff0496a093a04af157" 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_neuros-osd2 = "git://git.neurostechnology.com/git/u-boot;protocol=git;branch=neuros" - -SRC_URI_append_beagleboard = "file://base.patch;patch=1 \ - file://name.patch;patch=1 \ - file://armv7-a.patch;patch=1 \ - " +SRC_URI_beagleboard = "git://www.sakoman.net/git/u-boot-omap3.git;branch=test;protocol=git \ + file://name.patch;patch=1 \ + file://armv7-a.patch;patch=1 \ + " SRC_URI_neuros-osd2 += "file://Makefile-fix.patch;patch=1" diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb index 8368903277..ad62481800 100644 --- a/packages/uclibc/uclibc_0.9.29.bb +++ b/packages/uclibc/uclibc_0.9.29.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r20" +PR = "r21" DEFAULT_PREFERENCE = "1" require uclibc.inc @@ -29,6 +29,7 @@ SRC_URI += "file://uClibc.machine file://uClibc.distro \ file://uClibc-0.9.29-avr32-bzero.patch;patch=1 \ file://uClibc-0.9.29-nonposix_bashisms.patch;patch=1 \ file://arm_fix_alignment.patch;patch=1 \ + file://uclibc-arm-ftruncate64.patch;patch=1 \ " #recent versions uclibc require real kernel headers diff --git a/packages/uicmoc/uicmoc4-native.inc b/packages/uicmoc/uicmoc4-native.inc index 8d7f3111dc..f198ef5240 100644 --- a/packages/uicmoc/uicmoc4-native.inc +++ b/packages/uicmoc/uicmoc4-native.inc @@ -56,6 +56,7 @@ do_compile() { } do_stage() { + install -d ${STAGING_BINDIR}/ install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34 diff --git a/packages/uicmoc/uicmoc4-native_4.4.0.bb b/packages/uicmoc/uicmoc4-native_4.4.0.bb index 6e13ccbf13..c1282f9805 100644 --- a/packages/uicmoc/uicmoc4-native_4.4.0.bb +++ b/packages/uicmoc/uicmoc4-native_4.4.0.bb @@ -7,4 +7,15 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${ S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" inherit native +do_stage() { + install -d ${STAGING_BINDIR}/ + install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 + install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 + install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34 + install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 + install -m 0755 bin/lrelease ${STAGING_BINDIR}/lrelease4 + install -m 0755 bin/lupdate ${STAGING_BINDIR}/lupdate4 + install -d ${STAGING_DIR_NATIVE}/qt4/ + install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/ +} diff --git a/packages/webkit/webkit-gtk/GNUmakefile.am b/packages/webkit/webkit-gtk/GNUmakefile.am index a6ae299039..9b2f06f88d 100644 --- a/packages/webkit/webkit-gtk/GNUmakefile.am +++ b/packages/webkit/webkit-gtk/GNUmakefile.am @@ -216,8 +216,8 @@ libWebCore_la_LIBADD = \ $(GSTREAMER_LIBS) \ $(LIBXSLT_LIBS) \ $(HILDON_LIBS) \ - -lpthread \ - -ljpeg + $(JPEG_LIBS) \ + -lpthread # WebKit webkitgtk_h_api := @@ -320,8 +320,8 @@ webkitgtk_h_api += \ WebKit/gtk/webkit/webkitwebview.h webkitgtk_built_sources += \ - DerivedSources/webkit-marshal.h \ - DerivedSources/webkit-marshal.cpp \ + DerivedSources/webkitmarshal.h \ + DerivedSources/webkitmarshal.cpp \ DerivedSources/webkitenumtypes.cpp \ WebKit/gtk/webkit/webkitenumtypes.h @@ -367,26 +367,37 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc stamp_files := \ - stamp-webkit-marshal.cpp \ - stamp-webkit-marshal.h \ + stamp-webkitmarshal.cpp \ + stamp-webkitmarshal.h \ stamp-webkitenumtypes.cpp \ stamp-webkitenumtypes.h -WEBKIT_MARSHAL = $(GENSOURCES)/webkit-marshal -WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list - -DerivedSources/webkit-marshal.cpp: stamp-webkit-marshal.cpp +WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal +WEBKIT_MARSHAL_LIST = $(WEBKIT_MARSHAL).list + +$(WEBKIT_MARSHAL_LIST): $(webkitgtk_sources) GNUmakefile.am + ( cd $(top_srcdir) && \ + sed -n -e 's/.*webkit_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \ + $(webkitgtk_sources) ) \ + | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp + if cmp -s $@.tmp $@; then \ + rm $@.tmp; \ + else \ + mv $@.tmp $@; \ + fi + +$(WEBKIT_MARSHAL).cpp: stamp-webkitmarshal.cpp @true -DerivedSources/webkit-marshal.h: stamp-webkit-marshal.h +$(WEBKIT_MARSHAL).h: stamp-webkitmarshal.h @true -stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST) +stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST) echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \ $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \ echo timestamp > $(@F) -stamp-webkit-marshal.h: $(WEBKIT_MARSHAL_LIST) +stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST) $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \ echo timestamp > $(@F) diff --git a/packages/webkit/webkit-gtk/configure.ac b/packages/webkit/webkit-gtk/configure.ac index d0aa7c84d1..768ae9f9f2 100644 --- a/packages/webkit/webkit-gtk/configure.ac +++ b/packages/webkit/webkit-gtk/configure.ac @@ -137,8 +137,29 @@ AC_CHECK_HEADERS([pthread.h], AC_MSG_ERROR([pthread support is required to build WebKit])) fi -# libjpeg headers -AC_CHECK_HEADERS([jpeglib.h]) +# check for libjpeg the way Gtk does it. +AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, + jpeg_ok=yes, jpeg_ok=no + AC_MSG_ERROR([JPEG library (libjpeg) not found])) +if test "$jpeg_ok" = yes; then + AC_MSG_CHECKING([for jpeglib]) + AC_TRY_CPP( +[#include <stdio.h> +#undef PACKAGE +#undef VERSION +#undef HAVE_STDLIB_H +#include <jpeglib.h>], + jpeg_ok=yes, + jpeg_ok=no) + AC_MSG_RESULT($jpeg_ok) + if test "$jpeg_ok" = yes; then + JPEG_LIBS="-ljpeg" + # should we check for progressive JPEG like GTK+ as well? + else + AC_MSG_ERROR([JPEG library (libjpeg) not found]) + fi +fi +AC_SUBST([JPEG_LIBS]) # check for pkg-config AC_PATH_PROG(PKG_CONFIG, pkg-config, no) diff --git a/packages/x-load/.mtn2git_empty b/packages/x-load/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/x-load/.mtn2git_empty diff --git a/packages/x-load/files/.mtn2git_empty b/packages/x-load/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/x-load/files/.mtn2git_empty diff --git a/packages/x-load/files/signGP.c b/packages/x-load/files/signGP.c new file mode 100644 index 0000000000..0e8ed07f52 --- /dev/null +++ b/packages/x-load/files/signGP.c @@ -0,0 +1,73 @@ +// +// signGP.c +// Read the x-load.bin file and write out the x-load.bin.ift file. +// The signed image is the original pre-pended with the size of the image +// and the load address. If not entered on command line, file name is +// assumed to be x-load.bin in current directory and load address is +// 0x40200800. + +#include <stdio.h> +#include <stdlib.h> +#include <fcntl.h> +#include <sys/stat.h> +#include <string.h> +#include <malloc.h> + + +main(int argc, char *argv[]) +{ + int i; + char ifname[FILENAME_MAX], ofname[FILENAME_MAX], ch; + FILE *ifile, *ofile; + unsigned long loadaddr, len; + struct stat sinfo; + + + // Default to x-load.bin and 0x40200800. + strcpy(ifname, "x-load.bin"); + loadaddr = 0x40200800; + + if ((argc == 2) || (argc == 3)) + strcpy(ifname, argv[1]); + + if (argc == 3) + loadaddr = strtol(argv[2], NULL, 16); + + // Form the output file name. + strcpy(ofname, ifname); + strcat(ofname, ".ift"); + + // Open the input file. + ifile = fopen(ifname, "rb"); + if (ifile == NULL) { + printf("Cannot open %s\n", ifname); + exit(0); + } + + // Get file length. + stat(ifname, &sinfo); + len = sinfo.st_size; + + // Open the output file and write it. + ofile = fopen(ofname, "wb"); + if (ofile == NULL) { + printf("Cannot open %s\n", ofname); + fclose(ifile); + exit(0); + } + + // Pad 1 sector of zeroes. + //ch = 0x00; + //for (i=0; i<0x200; i++) + // fwrite(&ch, 1, 1, ofile); + + fwrite(&len, 1, 4, ofile); + fwrite(&loadaddr, 1, 4, ofile); + for (i=0; i<len; i++) { + fread(&ch, 1, 1, ifile); + fwrite(&ch, 1, 1, ofile); + } + + fclose(ifile); + fclose(ofile); +} diff --git a/packages/x-load/signgp-native.bb b/packages/x-load/signgp-native.bb new file mode 100644 index 0000000000..1cbd001932 --- /dev/null +++ b/packages/x-load/signgp-native.bb @@ -0,0 +1,14 @@ +LICENSE = "unknown" +DESCRIPTION = "Tool to sign omap3 x-loader images" + +inherit native +SRC_URI = "file://signGP.c" + +do_compile() { + ${CC} ${WORKDIR}/signGP.c -o signGP +} + +do_stage() { + install -d ${STAGING_BINDIR_NATIVE} + install -m 0755 signGP ${STAGING_BINDIR_NATIVE} +} diff --git a/packages/x-load/x-load-git/.mtn2git_empty b/packages/x-load/x-load-git/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/x-load/x-load-git/.mtn2git_empty diff --git a/packages/x-load/x-load-git/beagleboard/.mtn2git_empty b/packages/x-load/x-load-git/beagleboard/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/x-load/x-load-git/beagleboard/.mtn2git_empty diff --git a/packages/x-load/x-load-git/beagleboard/armv7-a.patch b/packages/x-load/x-load-git/beagleboard/armv7-a.patch new file mode 100644 index 0000000000..3131cda6bb --- /dev/null +++ b/packages/x-load/x-load-git/beagleboard/armv7-a.patch @@ -0,0 +1,11 @@ +--- git/cpu/omap3/config.mk-orig 2008-05-27 16:46:45.000000000 -0700 ++++ git/cpu/omap3/config.mk 2008-05-29 12:50:49.000000000 -0700 +@@ -23,7 +23,7 @@ + PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \ + -msoft-float + +-PLATFORM_CPPFLAGS += -march=armv7a ++PLATFORM_CPPFLAGS += -march=armv7-a + # ========================================================================= + # + # Supply options according to compiler version diff --git a/packages/x-load/x-load-git/beagleboard/name.patch b/packages/x-load/x-load-git/beagleboard/name.patch new file mode 100644 index 0000000000..98dcbae497 --- /dev/null +++ b/packages/x-load/x-load-git/beagleboard/name.patch @@ -0,0 +1,14 @@ +--- git/Makefile-orig 2008-07-29 22:31:03.000000000 -0700 ++++ git/Makefile 2008-07-29 22:34:36.000000000 -0700 +@@ -152,9 +152,9 @@ omap3evm_config : unconfig + overo_config : unconfig + @./mkconfig $(@:_config=) arm omap3 overo + +-omap3530beagle_config : unconfig ++beagleboard_config : unconfig + +- @./mkconfig $(@:_config=) arm omap3 omap3530beagle ++ @./mkconfig omap3530beagle arm omap3 omap3530beagle + + ######################################################################### + diff --git a/packages/x-load/x-load-git/omap3evm/.mtn2git_empty b/packages/x-load/x-load-git/omap3evm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/x-load/x-load-git/omap3evm/.mtn2git_empty diff --git a/packages/x-load/x-load-git/omap3evm/armv7-a.patch b/packages/x-load/x-load-git/omap3evm/armv7-a.patch new file mode 100644 index 0000000000..3131cda6bb --- /dev/null +++ b/packages/x-load/x-load-git/omap3evm/armv7-a.patch @@ -0,0 +1,11 @@ +--- git/cpu/omap3/config.mk-orig 2008-05-27 16:46:45.000000000 -0700 ++++ git/cpu/omap3/config.mk 2008-05-29 12:50:49.000000000 -0700 +@@ -23,7 +23,7 @@ + PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \ + -msoft-float + +-PLATFORM_CPPFLAGS += -march=armv7a ++PLATFORM_CPPFLAGS += -march=armv7-a + # ========================================================================= + # + # Supply options according to compiler version diff --git a/packages/x-load/x-load-git/overo/.mtn2git_empty b/packages/x-load/x-load-git/overo/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/x-load/x-load-git/overo/.mtn2git_empty diff --git a/packages/x-load/x-load-git/overo/armv7-a.patch b/packages/x-load/x-load-git/overo/armv7-a.patch new file mode 100644 index 0000000000..3131cda6bb --- /dev/null +++ b/packages/x-load/x-load-git/overo/armv7-a.patch @@ -0,0 +1,11 @@ +--- git/cpu/omap3/config.mk-orig 2008-05-27 16:46:45.000000000 -0700 ++++ git/cpu/omap3/config.mk 2008-05-29 12:50:49.000000000 -0700 +@@ -23,7 +23,7 @@ + PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \ + -msoft-float + +-PLATFORM_CPPFLAGS += -march=armv7a ++PLATFORM_CPPFLAGS += -march=armv7-a + # ========================================================================= + # + # Supply options according to compiler version diff --git a/packages/x-load/x-load.inc b/packages/x-load/x-load.inc new file mode 100644 index 0000000000..01db413b12 --- /dev/null +++ b/packages/x-load/x-load.inc @@ -0,0 +1,46 @@ +DESCRIPTION = "x-load bootloader loader" +SECTION = "bootloaders" +PRIORITY = "optional" +LICENSE = "GPL" + +DEPENDS = "signgp-native" + +PARALLEL_MAKE="" + +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" + +XLOAD_MACHINE ?= "${MACHINE}_config" + +XLOAD_IMAGE ?= "x-load-${MACHINE}-${PV}-${PR}.bin.ift" +XLOAD_SYMLINK ?= "x-load-${MACHINE}.bin.ift" +MLO_IMAGE ?= "MLO-${MACHINE}-${PV}-${PR}" +MLO_SYMLINK ?= "MLO-${MACHINE}" + +do_compile () { + unset LDFLAGS + unset CFLAGS + unset CPPFLAGS + oe_runmake distclean + oe_runmake ${XLOAD_MACHINE} + oe_runmake +} + +do_deploy () { + signGP ${S}/x-load.bin + install -d ${DEPLOY_DIR_IMAGE} + install ${S}/x-load.bin.ift ${DEPLOY_DIR_IMAGE}/${XLOAD_IMAGE} + install ${S}/x-load.bin.ift ${DEPLOY_DIR_IMAGE}/${MLO_IMAGE} + package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${XLOAD_IMAGE} + package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${MLO_IMAGE} + + cd ${DEPLOY_DIR_IMAGE} + rm -f ${XLOAD_SYMLINK} + ln -sf ${XLOAD_IMAGE} ${XLOAD_SYMLINK} + rm -f ${MLO_SYMLINK} + ln -sf ${MLO_IMAGE} ${MLO_SYMLINK} + package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${XLOAD_SYMLINK} + package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${MLO_SYMLINK} +} +do_deploy[dirs] = "${S}" +addtask deploy before do_build after do_compile + diff --git a/packages/x-load/x-load_git.bb b/packages/x-load/x-load_git.bb new file mode 100644 index 0000000000..ab926eddca --- /dev/null +++ b/packages/x-load/x-load_git.bb @@ -0,0 +1,27 @@ +require x-load.inc + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/x-load-git/${MACHINE}" + +SRCREV = "04ad40d5c8bca196aa4a5dfe945a007e21f1b149" + +PV = "1.41+${PR}+git${SRCREV}" +PR="r6" + +SRC_URI = "git://www.sakoman.net/git/x-load-omap3.git;branch=master;protocol=git" + +SRC_URI_append_beagleboard = " \ + file://name.patch;patch=1 \ + file://armv7-a.patch;patch=1 \ + " + +SRC_URI_append_omap3evm = " \ + file://armv7-a.patch;patch=1 \ + " + +SRC_URI_append_overo = " \ + file://armv7-a.patch;patch=1 \ + " + +S = "${WORKDIR}/git" + +PACKAGE_ARCH = "${MACHINE_ARCH}" |
