From 0a4cae5e4e4b8c2314de93df37425e14160fb733 Mon Sep 17 00:00:00 2001 From: pingswept Date: Fri, 25 Feb 2011 20:03:10 -0500 Subject: [PATCH 001/509] Added some basic packages and init scripts --- recipes/base-files/base-files/angstrom/issue | 21 +++++---- .../base-files/base-files/angstrom/issue.net | 19 ++++---- recipes/base-files/base-files/motd | 8 ++++ recipes/base-files/base-files/profile | 45 +++++++++++++++---- recipes/base-files/base-files_3.0.14.bb | 2 +- recipes/images/rascal-image.bb | 24 ++++++++++ recipes/initscripts/files/rascal-gpio | 5 +++ recipes/initscripts/files/rascal-webserver | 35 +++++++++++++++ recipes/initscripts/initscripts_1.0.bb | 8 +++- recipes/tasks/task-boot.bb | 1 + tmp/abi_version | 1 + tmp/distro_pr | 1 + tmp/saved_tmpdir | 1 + 13 files changed, 138 insertions(+), 33 deletions(-) create mode 100644 recipes/images/rascal-image.bb create mode 100644 recipes/initscripts/files/rascal-gpio create mode 100644 recipes/initscripts/files/rascal-webserver create mode 100644 tmp/abi_version create mode 100644 tmp/distro_pr create mode 100644 tmp/saved_tmpdir diff --git a/recipes/base-files/base-files/angstrom/issue b/recipes/base-files/base-files/angstrom/issue index 302ba10e3d..d00b4d619d 100644 --- a/recipes/base-files/base-files/angstrom/issue +++ b/recipes/base-files/base-files/angstrom/issue @@ -1,11 +1,10 @@ -.-------. -| | .-. -| | |-----.-----.-----.| | .----..-----.-----. -| | | __ | ---'| '--.| .-'| | | -| | | | | |--- || --'| | | ' | | | | -'---'---'--'--'--. |-----''----''--' '-----'-'-'-' - -' | - '---' - -The Angstrom Distribution \n \l - +///////////////////////////////////////// +// // +// Rascal Micro // +// Small computers for art and science // +// // +///////////////////////////////////////// +issue +Rascal beta test %h +date: \d +release: \r diff --git a/recipes/base-files/base-files/angstrom/issue.net b/recipes/base-files/base-files/angstrom/issue.net index 182fc83759..7b0fac8f2c 100644 --- a/recipes/base-files/base-files/angstrom/issue.net +++ b/recipes/base-files/base-files/angstrom/issue.net @@ -1,12 +1,9 @@ -.-------. -| | .-. -| | |-----.-----.-----.| | .----..-----.-----. -| | | __ | ---'| '--.| .-'| | | -| | | | | |--- || --'| | | ' | | | | -'---'---'--'--'--. |-----''----''--' '-----'-'-'-' - -' | - '---' - -The Angstrom Distribution %h - +///////////////////////////////////////// +// // +// Rascal Micro // +// Small computers for art and science // +// // +///////////////////////////////////////// +date: \d +release: \r diff --git a/recipes/base-files/base-files/motd b/recipes/base-files/base-files/motd index e69de29bb2..dbd6e6d121 100644 --- a/recipes/base-files/base-files/motd +++ b/recipes/base-files/base-files/motd @@ -0,0 +1,8 @@ + +///////////////////////////////////////// +// // +// Rascal Micro // +// Small computers for art and science // +// // +///////////////////////////////////////// + diff --git a/recipes/base-files/base-files/profile b/recipes/base-files/base-files/profile index 8f7f6b5047..2a401e3f31 100644 --- a/recipes/base-files/base-files/profile +++ b/recipes/base-files/base-files/profile @@ -2,23 +2,47 @@ # and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). PATH="/usr/local/bin:/usr/bin:/bin" -EDITOR="/bin/vi" # needed for packages like cron -test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. +EDITOR="/bin/vi" # needed for packages like cron +test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. -if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then - TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html - # for an explanation of how to set this to your local timezone. - export TZ +if [ ! -e /etc/localtime ]; then + TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html + # for an explanation of how to set this to your local timezone. + export TZ fi if [ "`id -u`" -eq 0 ]; then PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin fi + +# Codes for use in prompt + +local BOLD_GRAY="\[\033[1;30m\]" # AKA "bright black" +local LIGHT_GRAY="\[\033[0;37m\]" +local BOLD_RED="\[\033[1;31m\]" +local NO_COLOR="\[\033[0m\]" +local USER="\u" +local HOST="\h" +local CURRENT_DIR="\w" + + if [ "$PS1" ]; then # works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' + case "$TERM" in + xterm) # Default for Ubuntu Linux and others + PS1='$BOLD_GRAY[$USER@$BOLD_RED$HOST$BOLD_GRAY:$CURRENT_DIR]: $NO_COLOR' + ;; + xterm-color) # Default for OS X and others + PS1='$LIGHT_GRAY[$USER@$BOLD_RED$HOST$LIGHT_GRAY:$CURRENT_DIR]: $NO_COLOR' + ;; + *) + PS1='[$USER@$HOST$:$CURRENT_DIR]: ' + ;; + esac fi +GIT_SSH=git-ssh # To make Dropbear SSH work with Github + if [ -d /etc/profile.d ]; then for i in /etc/profile.d/*.sh; do if [ -r $i ]; then @@ -28,7 +52,10 @@ if [ -d /etc/profile.d ]; then unset i fi -export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM +export GIT_SSH PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM -umask 022 +alias w="who -a" +alias vi="vim" +alias git-ssh="ssh -i ~/.ssh/id_rsa $*" +umask 022 diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb index acd12a422a..874c4e7c5e 100644 --- a/recipes/base-files/base-files_3.0.14.bb +++ b/recipes/base-files/base-files_3.0.14.bb @@ -89,7 +89,7 @@ do_install () { done if [ -n "${MACHINE}" -a "${hostname}" = "openembedded" ]; then - echo ${MACHINE} > ${D}${sysconfdir}/hostname + echo "rascal" > ${D}${sysconfdir}/hostname else echo ${hostname} > ${D}${sysconfdir}/hostname fi diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb new file mode 100644 index 0000000000..f0982c72ce --- /dev/null +++ b/recipes/images/rascal-image.bb @@ -0,0 +1,24 @@ +require recipes/images/minimal-image.bb + +IMAGE_INSTALL += "\ + gcc \ + git \ + i2c-tools \ + iperf \ + lighttpd \ + lighttpd-module-access \ + lighttpd-module-accesslog \ + lighttpd-module-dirlisting \ + lighttpd-module-indexfile \ + lighttpd-module-staticfile \ + nano \ + python \ + python-modules \ + python-pyserial \ + ruby \ + usbutils \ + usb-gadget-mode \ + vim \ + " + +export IMAGE_BASENAME = "rascal-image" diff --git a/recipes/initscripts/files/rascal-gpio b/recipes/initscripts/files/rascal-gpio new file mode 100644 index 0000000000..1f53bba028 --- /dev/null +++ b/recipes/initscripts/files/rascal-gpio @@ -0,0 +1,5 @@ +for pin in 64 65 66 67 68 69 70 71 72 73 96 97 98 99 100 101 +do + echo $pin > /sys/class/gpio/export + echo out > /sys/class/gpio/gpio$pin/direction +done diff --git a/recipes/initscripts/files/rascal-webserver b/recipes/initscripts/files/rascal-webserver new file mode 100644 index 0000000000..56f67c408e --- /dev/null +++ b/recipes/initscripts/files/rascal-webserver @@ -0,0 +1,35 @@ +#!/bin/sh + +PATH=/sbin:/bin:/usr/bin + +test -f /home/root/rascal/bin/paster || exit 0 + +BASE_DIR="/home/root/helloworld" +PASTER_CONFIG="/home/root/helloworld/development.ini" +test -f $PASTER_CONFIG || exit 0 + +cd $BASE_DIR + +case "$1" in +start) + echo "Starting Rascal webserver..." + /home/root/rascal/bin/paster serve --daemon $PASTER_CONFIG start + echo "done" + ;; +restart) + echo "Restarting Rascal webserver..." + /home/root/rascal/bin/paster serve --daemon $PASTER_CONFIG restart + echo "done" + ;; +stop) + echo "Stopping Rascal webserver..." + /home/root/rascal/bin/paster serve --daemon $PASTER_CONFIG stop + echo "done" + ;; +*) + echo "Bad argument supplied to rascal-webserver script." + echo "Usage: /etc/init.d/rascal-webserver {start|stop|restart}" + exit 1 +esac + +exit 0 diff --git a/recipes/initscripts/initscripts_1.0.bb b/recipes/initscripts/initscripts_1.0.bb index fc0086e175..013ecbb0b7 100644 --- a/recipes/initscripts/initscripts_1.0.bb +++ b/recipes/initscripts/initscripts_1.0.bb @@ -32,7 +32,9 @@ SRC_URI = "file://functions \ file://populate-volatile.sh \ file://volatiles \ file://save-rtc.sh \ - file://save-rtc-uclibc.sh" + file://save-rtc-uclibc.sh \ + file://rascal-gpio \ + file://rascal-webserver" SRC_URI_append_arm = " file://alignment.sh" @@ -76,6 +78,8 @@ do_install () { install -m 0755 ${WORKDIR}/sysfs.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/rascal-gpio ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/rascal-webserver ${D}${sysconfdir}/init.d install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core if [ "${TARGET_ARCH}" = "arm" ]; then install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d @@ -116,6 +120,8 @@ do_install () { ln -sf ../init.d/mountnfs.sh ${D}${sysconfdir}/rcS.d/S45mountnfs.sh ln -sf ../init.d/bootmisc.sh ${D}${sysconfdir}/rcS.d/S55bootmisc.sh # ln -sf ../init.d/urandom ${D}${sysconfdir}/rcS.d/S55urandom + ln -sf ../init.d/rascal-gpio ${D}${sysconfdir}/rc5.d/S60rascal-gpio + ln -sf ../init.d/rascal-webserver ${D}${sysconfdir}/rc5.d/S65rascal-webserver ln -sf ../init.d/finish.sh ${D}${sysconfdir}/rcS.d/S99finish.sh ln -sf ../init.d/devices ${D}${sysconfdir}/rcS.d/S05devices # udev will run at S04 if installed diff --git a/recipes/tasks/task-boot.bb b/recipes/tasks/task-boot.bb index 0eb34a8e0a..b6ac687a58 100644 --- a/recipes/tasks/task-boot.bb +++ b/recipes/tasks/task-boot.bb @@ -32,6 +32,7 @@ RDEPENDS_task-boot = "\ ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ modutils-initscripts \ netbase \ + ntp \ ${DISTRO_UPDATE_ALTERNATIVES} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ " diff --git a/tmp/abi_version b/tmp/abi_version new file mode 100644 index 0000000000..7813681f5b --- /dev/null +++ b/tmp/abi_version @@ -0,0 +1 @@ +5 \ No newline at end of file diff --git a/tmp/distro_pr b/tmp/distro_pr new file mode 100644 index 0000000000..ed443211d2 --- /dev/null +++ b/tmp/distro_pr @@ -0,0 +1 @@ +.6 \ No newline at end of file diff --git a/tmp/saved_tmpdir b/tmp/saved_tmpdir new file mode 100644 index 0000000000..d2f7a6335c --- /dev/null +++ b/tmp/saved_tmpdir @@ -0,0 +1 @@ +/home/brandon/rascal-repos/oe-build/openembedded/tmp \ No newline at end of file From 286edbc492697443a1b07b9a737bad04b2368b35 Mon Sep 17 00:00:00 2001 From: pingswept Date: Wed, 2 Mar 2011 17:38:18 -0500 Subject: [PATCH 002/509] Reorganized files and changed paths to make build smoother --- .gitignore | 4 ++++ build/conf/local.conf | 36 ++++++++++++++++++++++++++++++++++++ env.sh | 19 +++++++++++++++++++ tmp/abi_version | 1 - tmp/distro_pr | 1 - tmp/saved_tmpdir | 1 - 6 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 build/conf/local.conf create mode 100755 env.sh delete mode 100644 tmp/abi_version delete mode 100644 tmp/distro_pr delete mode 100644 tmp/saved_tmpdir diff --git a/.gitignore b/.gitignore index 00b6ce1e97..b6bb45c206 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,7 @@ lib/oe/*.pyc lib/oe/*.pyo contrib/*/*.pyc contrib/*/*.pyo +tmp +oe_sources +bitbake +!.gitignore diff --git a/build/conf/local.conf b/build/conf/local.conf new file mode 100644 index 0000000000..cb5faa40eb --- /dev/null +++ b/build/conf/local.conf @@ -0,0 +1,36 @@ +# Use this to specify where BitBake should place the downloaded sources +DL_DIR = "${TOPDIR}/oe_sources/" + +BBFILES = "${TOPDIR}/recipes/*/*.bb" + +# Use the BBMASK below to instruct BitBake to _NOT_ consider some .bb files +# This is a regular expression, so be sure to get your parentheses balanced. +BBMASK = "" + +# Select between multiple alternative providers, if more than one is eligible. +PREFERRED_PROVIDERS = "virtual/qte:qte virtual/libqpe:libqpe-opie" +PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-x11" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" + +MACHINE ?= "at91sam9g20ek" + +DISTRO = "angstrom-2008.1" + +IMAGE_FSTYPES = "jffs2 tar.bz2" + +IMAGE_KEEPROOTFS = "1" + +PARALLEL_MAKE = "-j 4" + +BB_NUMBER_THREADS = "2" + +BBINCLUDELOGS = "yes" + +# To save space +INHERIT += "rm_work" + +# Cache values of all SRCREV variables first time it runs +BB_SRCREV_POLICY = "cache" diff --git a/env.sh b/env.sh new file mode 100755 index 0000000000..1189d08f7f --- /dev/null +++ b/env.sh @@ -0,0 +1,19 @@ +export OE_DIR=${PWD} +export PATH=${OE_DIR}/bitbake/bin:$PATH +export BBPATH=${OE_DIR}/build:${OE_DIR} +export BBFILES=${OE_DIR}/recipes/*/*.bb + +if [ -z ${ORG_PATH} ] ; then + ORG_PATH=${PATH} + export ORG_PATH +fi + +if [ -z ${ORG_LD_LIBRARY_PATH} ] ; then + ORG_LD_LIBRARY_PATH=${LD_LIBRARY_PATH} + export ORG_LD_LIBRARY_PATH +fi + +LD_LIBRARY_PATH= +export PATH LD_LIBRARY_PATH BBPATH +export LANG=C +export BB_ENV_EXTRAWHITE="MACHINE DISTRO ANGSTROM_MODE" diff --git a/tmp/abi_version b/tmp/abi_version deleted file mode 100644 index 7813681f5b..0000000000 --- a/tmp/abi_version +++ /dev/null @@ -1 +0,0 @@ -5 \ No newline at end of file diff --git a/tmp/distro_pr b/tmp/distro_pr deleted file mode 100644 index ed443211d2..0000000000 --- a/tmp/distro_pr +++ /dev/null @@ -1 +0,0 @@ -.6 \ No newline at end of file diff --git a/tmp/saved_tmpdir b/tmp/saved_tmpdir deleted file mode 100644 index d2f7a6335c..0000000000 --- a/tmp/saved_tmpdir +++ /dev/null @@ -1 +0,0 @@ -/home/brandon/rascal-repos/oe-build/openembedded/tmp \ No newline at end of file From a084c1035a886610eb50998eba4008a26274f1c0 Mon Sep 17 00:00:00 2001 From: pingswept Date: Tue, 8 Mar 2011 23:31:16 -0500 Subject: [PATCH 003/509] Start recipe for python-daemon --- recipes/python/python-daemon_1.5.5.bb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 recipes/python/python-daemon_1.5.5.bb diff --git a/recipes/python/python-daemon_1.5.5.bb b/recipes/python/python-daemon_1.5.5.bb new file mode 100644 index 0000000000..163342d316 --- /dev/null +++ b/recipes/python/python-daemon_1.5.5.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Library to implement a well-behaved Unix daemon process" +HOMEPAGE = "http://pypi.python.org/pypi/python-daemon/" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "PSF" +SRCNAME = "daemon" +PR = "ml1" + +SRC_URI = "http://pypi.python.org/packages/source/p/python-daemon/python-daemon-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit setuptools + +RDEPENDS_${PN} = "\ + python-core \ +" + +SRC_URI[md5sum] = "1f6cd41473c2e201021a0aeef395b2b1" +SRC_URI[sha256sum] = "1406962e48ce03642c6057f40f9ffd49493792a7b34357fe9e264708748c83c0" From abdb562c79f11d612123d001c0ea4967857dfbd8 Mon Sep 17 00:00:00 2001 From: pingswept Date: Thu, 10 Mar 2011 10:13:30 -0500 Subject: [PATCH 004/509] Add Python daemon and clean up webserver init script --- recipes/images/rascal-image.bb | 12 +++---- recipes/initscripts/files/rascal-webserver | 41 +++++++++++----------- recipes/python/python-daemon_1.5.5.bb | 2 +- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index f0982c72ce..7978566c25 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -2,17 +2,14 @@ require recipes/images/minimal-image.bb IMAGE_INSTALL += "\ gcc \ + gcc-symlinks \ git \ i2c-tools \ iperf \ - lighttpd \ - lighttpd-module-access \ - lighttpd-module-accesslog \ - lighttpd-module-dirlisting \ - lighttpd-module-indexfile \ - lighttpd-module-staticfile \ + libgcc-dev \ nano \ python \ + python-daemon \ python-modules \ python-pyserial \ ruby \ @@ -21,4 +18,7 @@ IMAGE_INSTALL += "\ vim \ " +PREFERRED_VERSION_gcc = "4.5" +PREFERRED_PROVIDER_virtual/libgcc-dev = "gcc" + export IMAGE_BASENAME = "rascal-image" diff --git a/recipes/initscripts/files/rascal-webserver b/recipes/initscripts/files/rascal-webserver index 56f67c408e..83bc53c29d 100644 --- a/recipes/initscripts/files/rascal-webserver +++ b/recipes/initscripts/files/rascal-webserver @@ -1,35 +1,36 @@ #!/bin/sh PATH=/sbin:/bin:/usr/bin - -test -f /home/root/rascal/bin/paster || exit 0 - BASE_DIR="/home/root/helloworld" -PASTER_CONFIG="/home/root/helloworld/development.ini" -test -f $PASTER_CONFIG || exit 0 +WEBSERVER="/home/root/rascal/bin/paster" +WEBSERVER_CONFIG="/home/root/helloworld/development.ini" + +test -d $BASE_DIR || exit 0 +test -f $WEBSERVER || exit 0 +test -f $WEBSERVER_CONFIG || exit 0 cd $BASE_DIR case "$1" in start) - echo "Starting Rascal webserver..." - /home/root/rascal/bin/paster serve --daemon $PASTER_CONFIG start - echo "done" - ;; + echo "Starting Rascal webserver..." + $WEBSERVER serve --daemon $WEBSERVER_CONFIG start + echo "done" + ;; restart) - echo "Restarting Rascal webserver..." - /home/root/rascal/bin/paster serve --daemon $PASTER_CONFIG restart - echo "done" - ;; + echo "Restarting Rascal webserver..." + $WEBSERVER serve --daemon $WEBSERVER_CONFIG restart + echo "done" + ;; stop) - echo "Stopping Rascal webserver..." - /home/root/rascal/bin/paster serve --daemon $PASTER_CONFIG stop - echo "done" - ;; + echo "Stopping Rascal webserver..." + $WEBSERVER serve --daemon $WEBSERVER_CONFIG stop + echo "done" + ;; *) - echo "Bad argument supplied to rascal-webserver script." - echo "Usage: /etc/init.d/rascal-webserver {start|stop|restart}" - exit 1 + echo "Bad argument supplied to rascal-webserver script." + echo "Usage: /etc/init.d/rascal-webserver {start|stop|restart}" + exit 1 esac exit 0 diff --git a/recipes/python/python-daemon_1.5.5.bb b/recipes/python/python-daemon_1.5.5.bb index 163342d316..79adcc3ada 100644 --- a/recipes/python/python-daemon_1.5.5.bb +++ b/recipes/python/python-daemon_1.5.5.bb @@ -7,7 +7,7 @@ SRCNAME = "daemon" PR = "ml1" SRC_URI = "http://pypi.python.org/packages/source/p/python-daemon/python-daemon-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" +S = "${WORKDIR}/python-daemon-${PV}" inherit setuptools From f81ed6af4e6be6f94c7d78929027dc094a3885fa Mon Sep 17 00:00:00 2001 From: root Date: Sun, 27 Mar 2011 03:37:23 -0700 Subject: [PATCH 005/509] Just testing (whitespace only change) --- recipes/initscripts/initscripts_1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/initscripts/initscripts_1.0.bb b/recipes/initscripts/initscripts_1.0.bb index 013ecbb0b7..0210312f32 100644 --- a/recipes/initscripts/initscripts_1.0.bb +++ b/recipes/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS_${PN} = "makedevs" LICENSE = "GPL" -PR = "r126" +PR = "r126" SRC_URI = "file://functions \ file://halt \ From 2dd7f2cb687ddc0502e3c15dd9bc343049f0ea7b Mon Sep 17 00:00:00 2001 From: Mike Goelzer Date: Sun, 27 Mar 2011 03:49:32 -0700 Subject: [PATCH 006/509] Sets root pw on startup if is blank --- recipes/initscripts/files/rascal-init | 62 ++++++++++++++++++++++++++ recipes/initscripts/initscripts_1.0.bb | 5 ++- 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 recipes/initscripts/files/rascal-init diff --git a/recipes/initscripts/files/rascal-init b/recipes/initscripts/files/rascal-init new file mode 100644 index 0000000000..5d606884b3 --- /dev/null +++ b/recipes/initscripts/files/rascal-init @@ -0,0 +1,62 @@ +#!/bin/sh + +# void log_msg(char*) +log_msg() +{ + /usr/bin/logger -s $1 +} + +# +# Busybos's chpasswd applet should do this for us, but +# it fails on root so i wrote this function instead +# +# int change_pw(char* username,char* pw_hash) +change_pw() +{ + local USERNAME=$1 + local NEW_PWHASH=$2 + + local PASSWDFILE=/etc/passwd + local TEMPFILE=/etc/passwd.tmp + + rm -f $TEMPFILE + while IFS=: read -r f1 f2 f3 f4 f5 f6 f7 + do + if [ $f1 = $USERNAME ]; then + f2=$NEW_PWHASH + fi + echo "$f1:$f2:$f3:$f4:$f5:$f6:$f7" >> $TEMPFILE + done < $PASSWDFILE + + # Comment this out for dry-run + mv $TEMPFILE $PASSWDFILE +} + +log_msg "Rascal initialization..." + +# +# If root's password is blank, set it to board-speciifc default +# +PASSWDFILE=/etc/passwd +IS_BLANK=0 +DEF_PW_HASH=XnugPeUjnLedI + +while IFS=: read -r f1 f2 f3 f4 f5 f6 f7 +do + if [ $f1 = "root" ]; then + if [ -z $f2 ]; then + IS_BLANK=1 + fi + break + fi +done < $PASSWDFILE + +if [ $IS_BLANK != 0 ]; then + log_msg "root's password was blank; defaulted" + change_pw root $DEF_PW_HASH +else + log_msg "root's password is not blank -- good job" +fi + + +exit 0 diff --git a/recipes/initscripts/initscripts_1.0.bb b/recipes/initscripts/initscripts_1.0.bb index 0210312f32..01ceed0ab7 100644 --- a/recipes/initscripts/initscripts_1.0.bb +++ b/recipes/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS_${PN} = "makedevs" LICENSE = "GPL" -PR = "r126" +PR = "r126" SRC_URI = "file://functions \ file://halt \ @@ -33,6 +33,7 @@ SRC_URI = "file://functions \ file://volatiles \ file://save-rtc.sh \ file://save-rtc-uclibc.sh \ + file://rascal-init \ file://rascal-gpio \ file://rascal-webserver" @@ -78,6 +79,7 @@ do_install () { install -m 0755 ${WORKDIR}/sysfs.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/rascal-init ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/rascal-gpio ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/rascal-webserver ${D}${sysconfdir}/init.d install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core @@ -120,6 +122,7 @@ do_install () { ln -sf ../init.d/mountnfs.sh ${D}${sysconfdir}/rcS.d/S45mountnfs.sh ln -sf ../init.d/bootmisc.sh ${D}${sysconfdir}/rcS.d/S55bootmisc.sh # ln -sf ../init.d/urandom ${D}${sysconfdir}/rcS.d/S55urandom + ln -sf ../init.d/rascal-init ${D}${sysconfdir}/rc5.d/S50rascal-init ln -sf ../init.d/rascal-gpio ${D}${sysconfdir}/rc5.d/S60rascal-gpio ln -sf ../init.d/rascal-webserver ${D}${sysconfdir}/rc5.d/S65rascal-webserver ln -sf ../init.d/finish.sh ${D}${sysconfdir}/rcS.d/S99finish.sh From f78b1154f173a4fb47f4ff084537a57e434f0245 Mon Sep 17 00:00:00 2001 From: Mike Goelzer Date: Sun, 27 Mar 2011 03:55:14 -0700 Subject: [PATCH 007/509] Set syslog to write to /var/log/syslog --- recipes/busybox/files/syslog.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/busybox/files/syslog.conf b/recipes/busybox/files/syslog.conf index fc7ff8b37a..0e6bd1456e 100644 --- a/recipes/busybox/files/syslog.conf +++ b/recipes/busybox/files/syslog.conf @@ -1,8 +1,8 @@ -DESTINATION="buffer" # log destinations (buffer file remote) +DESTINATION="files" # log destinations (buffer file remote) MARKINT=20 # interval between --mark-- entries [min] REDUCE=no # reduced-size logging BUFFERSIZE=64 # buffer: size of circular buffer [kByte] -LOGFILE=/var/log/messages # file: where to log +LOGFILE=/var/log/syslog # file: where to log ROTATESIZE=32 # file: rotate log if grown beyond X [kByte] (busybox 1.2+) ROTATEGENS=1 # file: keep X generations of rotated logs (busybox 1.2+) REMOTE=loghost:514 # remote: where to log From 60ac3dcd0b289920d84d19f8260d5103b54928c2 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Mon, 28 Mar 2011 17:16:12 -0400 Subject: [PATCH 008/509] Fix a few typos, regularize variable names --- recipes/initscripts/files/rascal-init | 39 +++++++++++++------------- recipes/initscripts/initscripts_1.0.bb | 6 ++-- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/recipes/initscripts/files/rascal-init b/recipes/initscripts/files/rascal-init index 5d606884b3..4ee0b4d3d2 100644 --- a/recipes/initscripts/files/rascal-init +++ b/recipes/initscripts/files/rascal-init @@ -7,37 +7,37 @@ log_msg() } # -# Busybos's chpasswd applet should do this for us, but -# it fails on root so i wrote this function instead +# Busybox's chpasswd applet should do this for us, but +# it fails on root so we use this function instead # -# int change_pw(char* username,char* pw_hash) +# int change_pw(char* username, char* pw_hash) change_pw() { - local USERNAME=$1 - local NEW_PWHASH=$2 + local USER_NAME=$1 + local NEW_PW_HASH=$2 - local PASSWDFILE=/etc/passwd - local TEMPFILE=/etc/passwd.tmp + local PASSWD_FILE=/etc/passwd + local TEMP_FILE=/etc/passwd.tmp - rm -f $TEMPFILE + rm -f $TEMP_FILE while IFS=: read -r f1 f2 f3 f4 f5 f6 f7 do - if [ $f1 = $USERNAME ]; then - f2=$NEW_PWHASH + if [ $f1 = $USER_NAME ]; then + f2=$NEW_PW_HASH fi - echo "$f1:$f2:$f3:$f4:$f5:$f6:$f7" >> $TEMPFILE - done < $PASSWDFILE + echo "$f1:$f2:$f3:$f4:$f5:$f6:$f7" >> $TEMP_FILE + done < $PASSWD_FILE # Comment this out for dry-run - mv $TEMPFILE $PASSWDFILE + mv $TEMP_FILE $PASSWD_FILE } -log_msg "Rascal initialization..." +log_msg "Initializing Rascal" # -# If root's password is blank, set it to board-speciifc default +# If root's password is blank, set it to board-specific default # -PASSWDFILE=/etc/passwd +PASSWD_FILE=/etc/passwd IS_BLANK=0 DEF_PW_HASH=XnugPeUjnLedI @@ -49,14 +49,13 @@ do fi break fi -done < $PASSWDFILE +done < $PASSWD_FILE if [ $IS_BLANK != 0 ]; then - log_msg "root's password was blank; defaulted" + log_msg "Root's password was blank. It is now set to the default password for this board." change_pw root $DEF_PW_HASH else - log_msg "root's password is not blank -- good job" + log_msg "Root's password is not blank -- good job." fi - exit 0 diff --git a/recipes/initscripts/initscripts_1.0.bb b/recipes/initscripts/initscripts_1.0.bb index 01ceed0ab7..07e410b7bf 100644 --- a/recipes/initscripts/initscripts_1.0.bb +++ b/recipes/initscripts/initscripts_1.0.bb @@ -122,9 +122,9 @@ do_install () { ln -sf ../init.d/mountnfs.sh ${D}${sysconfdir}/rcS.d/S45mountnfs.sh ln -sf ../init.d/bootmisc.sh ${D}${sysconfdir}/rcS.d/S55bootmisc.sh # ln -sf ../init.d/urandom ${D}${sysconfdir}/rcS.d/S55urandom - ln -sf ../init.d/rascal-init ${D}${sysconfdir}/rc5.d/S50rascal-init - ln -sf ../init.d/rascal-gpio ${D}${sysconfdir}/rc5.d/S60rascal-gpio - ln -sf ../init.d/rascal-webserver ${D}${sysconfdir}/rc5.d/S65rascal-webserver + ln -sf ../init.d/rascal-init ${D}${sysconfdir}/rc5.d/S60rascal-init + ln -sf ../init.d/rascal-gpio ${D}${sysconfdir}/rc5.d/S65rascal-gpio + ln -sf ../init.d/rascal-webserver ${D}${sysconfdir}/rc5.d/S70rascal-webserver ln -sf ../init.d/finish.sh ${D}${sysconfdir}/rcS.d/S99finish.sh ln -sf ../init.d/devices ${D}${sysconfdir}/rcS.d/S05devices # udev will run at S04 if installed From 050613a69691a3a86747612d4ab3852c4ac48241 Mon Sep 17 00:00:00 2001 From: user Date: Thu, 14 Apr 2011 16:25:07 -0700 Subject: [PATCH 009/509] Add uWSGI and nginx (the nginx builds an executable, but not a pkg yet) --- recipes/images/rascal-image.bb | 3 ++ recipes/nginx/files/allow-cross.patch | 49 +++++++++++++++++++++++++++ recipes/nginx/nginx_1.0.0.bb | 28 +++++++++++++++ recipes/uwsgi/uwsgi_0.9.7.2.bb | 36 ++++++++++++++++++++ 4 files changed, 116 insertions(+) create mode 100644 recipes/nginx/files/allow-cross.patch create mode 100644 recipes/nginx/nginx_1.0.0.bb create mode 100644 recipes/uwsgi/uwsgi_0.9.7.2.bb diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 7978566c25..11c97e9e7f 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -7,7 +7,9 @@ IMAGE_INSTALL += "\ i2c-tools \ iperf \ libgcc-dev \ + libxml2 \ nano \ + nginx \ python \ python-daemon \ python-modules \ @@ -15,6 +17,7 @@ IMAGE_INSTALL += "\ ruby \ usbutils \ usb-gadget-mode \ + uwsgi \ vim \ " diff --git a/recipes/nginx/files/allow-cross.patch b/recipes/nginx/files/allow-cross.patch new file mode 100644 index 0000000000..b98a96341f --- /dev/null +++ b/recipes/nginx/files/allow-cross.patch @@ -0,0 +1,49 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../nginx/allow_cross.patch +# Copyright (C) 2009 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./auto/types/sizeof.orig 2009-09-02 15:57:09.264008454 -0400 ++++ ./auto/types/sizeof 2009-09-02 16:10:29.856009072 -0400 +@@ -38,8 +38,15 @@ + + + if [ -x $NGX_AUTOTEST ]; then +- ngx_size=`$NGX_AUTOTEST` ++ cachename=$(echo "ngx_cache_sizeof_$ngx_type" | tr ' *' '_p') ++ cacheval=$(eval echo "\$$cachename") ++ if [ -n "$cacheval" ]; then ++ ngx_size="$cacheval" ++ else ++ ngx_size=`$NGX_AUTOTEST` ++ fi ++ ngx_size=4 + echo " $ngx_size bytes" + fi + + +--- ./auto/feature.orig 2009-09-03 07:10:21.608009461 -0400 ++++ ./auto/feature 2009-09-03 07:15:24.048354979 -0400 +@@ -48,6 +48,10 @@ + + if [ -x $NGX_AUTOTEST ]; then + ++ if [ "$cross_compiling" = "yes" ]; then ++ ngx_feature_run=no ++ fi ++ + case "$ngx_feature_run" in + + yes) + diff --git a/recipes/nginx/nginx_1.0.0.bb b/recipes/nginx/nginx_1.0.0.bb new file mode 100644 index 0000000000..507d2053b4 --- /dev/null +++ b/recipes/nginx/nginx_1.0.0.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "NNginx is a free, open-source, high-performance HTTP server and reverse proxy, as well as an IMAP/POP3 proxy server." +HOMEPAGE = "http://wiki.nginx.org" +SECTION = "net" +PRIORITY = "optional" +LICENSE = "BSD" +SRCNAME = "nginx" +PR = "r27" + +SRC_URI = "http://nginx.org/download/nginx-${PV}.tar.gz \ + file://allow-cross.patch" + +S = "${WORKDIR}/${PN}-${PV}" + +do_configure() { + export cross_compiling="yes" + ${S}/configure --with-cc=/home/user/openembedded-rascal/tmp/sysroots/i686-linux/usr/armv5te/bin/arm-angstrom-linux-gnueabi-gcc --without-http_rewrite_module --sbin-path=${S}/usr/sbin --error-log-path=/var/log/nginx/error --conf-path=/etc/nginx/nginx.conf +} + +do_install() { + make DESTDIR=${S} install +} + +do_package() { + +} + +SRC_URI[md5sum] = "5751c920c266ea5bb5fc38af77e9c71c" +SRC_URI[sha256sum] = "3de3d6caeed56751c24ebc5cfb03475620b9eb0fa999c766a01d44dca674c001" diff --git a/recipes/uwsgi/uwsgi_0.9.7.2.bb b/recipes/uwsgi/uwsgi_0.9.7.2.bb new file mode 100644 index 0000000000..b70a55f184 --- /dev/null +++ b/recipes/uwsgi/uwsgi_0.9.7.2.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "uWSGI is a WSGI web server for Python web applications" +HOMEPAGE = "http://projects.unbit.it/uwsgi/wiki" +SECTION = "net" +PRIORITY = "optional" +LICENSE = "GPLv2" +SRCNAME = "uwsgi" +PR = "r0" + +SRC_URI = "http://projects.unbit.it/downloads/uwsgi-${PV}.tar.gz" +S = "${WORKDIR}/${PN}-${PV}" + +DEPENDS = "libxml2" + +RDEPENDS_${PN} = "\ + python-core \ +" + +do_compile_prepend() { + export BUILD_SYS=${BUILD_SYS} + export HOST_SYS=${HOST_SYS} + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} +} + +do_compile() { + python uwsgiconfig.py --build +} + +do_install() { + echo ${S} + install -m 0755 -d ${D}${sbindir} + install -m 0755 ${S}/uwsgi ${D}${sbindir} +} + +SRC_URI[md5sum] = "9bdf8ed5c8b32ace085dbd0f9488f880" +SRC_URI[sha256sum] = "6eccf3c7ead324c6af9a6196f0d4faf4c8472ca3b728a01a0070b472b0784bba" From 8eccb4960b144980f131cb4f0e54e25ada5e74bf Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 15 Apr 2011 09:35:56 -0700 Subject: [PATCH 010/509] Fix rev on Python daemon recipe --- recipes/python/python-daemon_1.5.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/python/python-daemon_1.5.5.bb b/recipes/python/python-daemon_1.5.5.bb index 79adcc3ada..3f138866a0 100644 --- a/recipes/python/python-daemon_1.5.5.bb +++ b/recipes/python/python-daemon_1.5.5.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" PRIORITY = "optional" LICENSE = "PSF" SRCNAME = "daemon" -PR = "ml1" +PR = "r0" SRC_URI = "http://pypi.python.org/packages/source/p/python-daemon/python-daemon-${PV}.tar.gz" S = "${WORKDIR}/python-daemon-${PV}" From 17dec4477274f656c030f8c5c7aa07e40e1e9067 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 15 Apr 2011 11:17:44 -0700 Subject: [PATCH 011/509] Remove hardcoded paths from nginx compile step --- recipes/nginx/nginx_1.0.0.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/nginx/nginx_1.0.0.bb b/recipes/nginx/nginx_1.0.0.bb index 507d2053b4..3725084a8f 100644 --- a/recipes/nginx/nginx_1.0.0.bb +++ b/recipes/nginx/nginx_1.0.0.bb @@ -1,10 +1,10 @@ -DESCRIPTION = "NNginx is a free, open-source, high-performance HTTP server and reverse proxy, as well as an IMAP/POP3 proxy server." +DESCRIPTION = "Nginx is a free, open-source, high-performance HTTP server and reverse proxy, as well as an IMAP/POP3 proxy server." HOMEPAGE = "http://wiki.nginx.org" SECTION = "net" PRIORITY = "optional" LICENSE = "BSD" SRCNAME = "nginx" -PR = "r27" +PR = "r28" SRC_URI = "http://nginx.org/download/nginx-${PV}.tar.gz \ file://allow-cross.patch" @@ -13,7 +13,7 @@ S = "${WORKDIR}/${PN}-${PV}" do_configure() { export cross_compiling="yes" - ${S}/configure --with-cc=/home/user/openembedded-rascal/tmp/sysroots/i686-linux/usr/armv5te/bin/arm-angstrom-linux-gnueabi-gcc --without-http_rewrite_module --sbin-path=${S}/usr/sbin --error-log-path=/var/log/nginx/error --conf-path=/etc/nginx/nginx.conf + ${S}/configure --with-cc=${HOST_PREFIX}gcc --without-http_rewrite_module --sbin-path=${S}${sbindir} --error-log-path=${localstatedir}/log/nginx/error --conf-path=${sysconfdir}/nginx/nginx.conf } do_install() { From f1a394c905027a66e5dd7ad39dc237fc2af80c16 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 15 Apr 2011 14:48:49 -0700 Subject: [PATCH 012/509] Fix packaging, but (working) binary is still generated in wrong place --- recipes/nginx/nginx_1.0.0.bb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/recipes/nginx/nginx_1.0.0.bb b/recipes/nginx/nginx_1.0.0.bb index 3725084a8f..0ed61ec830 100644 --- a/recipes/nginx/nginx_1.0.0.bb +++ b/recipes/nginx/nginx_1.0.0.bb @@ -4,24 +4,21 @@ SECTION = "net" PRIORITY = "optional" LICENSE = "BSD" SRCNAME = "nginx" -PR = "r28" +PR = "r0" SRC_URI = "http://nginx.org/download/nginx-${PV}.tar.gz \ file://allow-cross.patch" - S = "${WORKDIR}/${PN}-${PV}" +DEPENDS = "libpcre" + do_configure() { export cross_compiling="yes" - ${S}/configure --with-cc=${HOST_PREFIX}gcc --without-http_rewrite_module --sbin-path=${S}${sbindir} --error-log-path=${localstatedir}/log/nginx/error --conf-path=${sysconfdir}/nginx/nginx.conf + ${S}/configure --with-cc=${HOST_PREFIX}gcc --sbin-path=${S}${sbindir} --error-log-path=${localstatedir}/log/nginx/error --conf-path=${sysconfdir}/nginx/nginx.conf } do_install() { - make DESTDIR=${S} install -} - -do_package() { - + make DESTDIR=${S}/../image install } SRC_URI[md5sum] = "5751c920c266ea5bb5fc38af77e9c71c" From 63cf2904a46685f3e6483227a6622eba4ff7c6a1 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 15 Apr 2011 16:36:18 -0700 Subject: [PATCH 013/509] Fix nginx binary path and install path, rm some spurious stuff, disable QA to squelch GNU_HASH warning --- recipes/nginx/nginx_1.0.0.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/recipes/nginx/nginx_1.0.0.bb b/recipes/nginx/nginx_1.0.0.bb index 0ed61ec830..d598e3aaf4 100644 --- a/recipes/nginx/nginx_1.0.0.bb +++ b/recipes/nginx/nginx_1.0.0.bb @@ -3,22 +3,24 @@ HOMEPAGE = "http://wiki.nginx.org" SECTION = "net" PRIORITY = "optional" LICENSE = "BSD" -SRCNAME = "nginx" PR = "r0" SRC_URI = "http://nginx.org/download/nginx-${PV}.tar.gz \ file://allow-cross.patch" -S = "${WORKDIR}/${PN}-${PV}" DEPENDS = "libpcre" do_configure() { export cross_compiling="yes" - ${S}/configure --with-cc=${HOST_PREFIX}gcc --sbin-path=${S}${sbindir} --error-log-path=${localstatedir}/log/nginx/error --conf-path=${sysconfdir}/nginx/nginx.conf + ${S}/configure --with-cc=${HOST_PREFIX}gcc --sbin-path=${sbindir}/nginx --error-log-path=${localstatedir}/log/nginx/error --conf-path=${sysconfdir}/nginx/nginx.conf } do_install() { - make DESTDIR=${S}/../image install + oe_runmake DESTDIR=${D} install +} + +do_package_qa() { + : } SRC_URI[md5sum] = "5751c920c266ea5bb5fc38af77e9c71c" From 9aad8fd3d394eeb365b42fcd0c0469bd7f99ea77 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Tue, 19 Apr 2011 11:30:27 -0400 Subject: [PATCH 014/509] Fix perl-native on Ubuntu 11.04. Combination of patches from Scott Ellis and Khem Raj. See https://gist.github.com/925006 and http://patches.openembedded.org/patch/1659/ --- recipes/perl/files/ubuntu-11.04-multiarch.patch | 12 ++++++++++++ recipes/perl/perl-native_5.10.1.bb | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 recipes/perl/files/ubuntu-11.04-multiarch.patch diff --git a/recipes/perl/files/ubuntu-11.04-multiarch.patch b/recipes/perl/files/ubuntu-11.04-multiarch.patch new file mode 100644 index 0000000000..f0aeed5e3b --- /dev/null +++ b/recipes/perl/files/ubuntu-11.04-multiarch.patch @@ -0,0 +1,12 @@ +diff --git perl-5.10.1/Configure-orig perl-5.10.1/Configure +index 5508fd2..8ee7dae 100755 +--- perl-5.10.1/Configure-orig ++++ perl-5.10.1/Configure +@@ -1311,6 +1311,7 @@ glibpth="/lib /usr/lib /lib64 /usr/lib64 $xlibpth" + glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" + test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" + test -f /shlib/libc.so && glibpth="/shlib $glibpth" ++test -f /usr/lib/`uname -m`-linux-gnu/libc.so && glibpth="/usr/lib/`uname -m`-linux-gnu $glibpth" + test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" + + : Private path used by Configure to find libraries. Its value diff --git a/recipes/perl/perl-native_5.10.1.bb b/recipes/perl/perl-native_5.10.1.bb index 5aa0c7b123..6655be0634 100644 --- a/recipes/perl/perl-native_5.10.1.bb +++ b/recipes/perl/perl-native_5.10.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Perl is a popular scripting language." HOMEPAGE = "http://www.perl.org/" SECTION = "libs" LICENSE = "Artistic|GPLv1+" -PR = "r10" +PR = "r11" NATIVE_INSTALL_WORKS = "1" INHIBIT_DEFAULT_DEPS = "1" PATCHTOOL = "patch" @@ -20,6 +20,7 @@ SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz;name=perl-${PV} \ file://native-nopacklist.patch \ file://native-perlinc.patch \ file://perl-fix-cross-library-check.patch \ + file://ubuntu-11.04-multiarch.patch \ " SRC_URI[perl-5.10.1.md5sum] = "b9b2fdb957f50ada62d73f43ee75d044" @@ -29,6 +30,8 @@ S = "${WORKDIR}/perl-${PV}" inherit native +export LD="${CC}" + do_configure () { ./Configure \ -Dcc="${CC}" \ From 1d07064c9bf43b26e411b0688502ba9864577635 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Tue, 19 Apr 2011 14:39:42 -0400 Subject: [PATCH 015/509] Fix LD flag for perl-native build based on Khem Raj's patch --- recipes/perl/perl-native_5.10.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/perl/perl-native_5.10.1.bb b/recipes/perl/perl-native_5.10.1.bb index 6655be0634..396daeac6f 100644 --- a/recipes/perl/perl-native_5.10.1.bb +++ b/recipes/perl/perl-native_5.10.1.bb @@ -30,7 +30,7 @@ S = "${WORKDIR}/perl-${PV}" inherit native -export LD="${CC}" +export LD="${CCLD}" do_configure () { ./Configure \ From c070cedf8d8aee8a5403b49455e1d6cc39063172 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 20 Apr 2011 17:21:29 -0400 Subject: [PATCH 016/509] First cut at moving Rascal hardware lib to its proper home in site-packages --- recipes/images/rascal-image.bb | 1 + recipes/initscripts/files/rascal-analogger | 8 +++ recipes/initscripts/initscripts_1.0.bb | 63 +++++++++++----------- recipes/python/python-rascal_0.1.bb | 22 ++++++++ 4 files changed, 64 insertions(+), 30 deletions(-) create mode 100644 recipes/initscripts/files/rascal-analogger create mode 100644 recipes/python/python-rascal_0.1.bb diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 11c97e9e7f..d02b764906 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -14,6 +14,7 @@ IMAGE_INSTALL += "\ python-daemon \ python-modules \ python-pyserial \ + python-rascal \ ruby \ usbutils \ usb-gadget-mode \ diff --git a/recipes/initscripts/files/rascal-analogger b/recipes/initscripts/files/rascal-analogger new file mode 100644 index 0000000000..3fcf886bb7 --- /dev/null +++ b/recipes/initscripts/files/rascal-analogger @@ -0,0 +1,8 @@ +#!/usr/bin/env python + +import daemon + +from rascal import analogger + +with daemon.DaemonContext(): + analogger() diff --git a/recipes/initscripts/initscripts_1.0.bb b/recipes/initscripts/initscripts_1.0.bb index 07e410b7bf..c726dc16e7 100644 --- a/recipes/initscripts/initscripts_1.0.bb +++ b/recipes/initscripts/initscripts_1.0.bb @@ -33,8 +33,9 @@ SRC_URI = "file://functions \ file://volatiles \ file://save-rtc.sh \ file://save-rtc-uclibc.sh \ - file://rascal-init \ + file://rascal-analogger \ file://rascal-gpio \ + file://rascal-init \ file://rascal-webserver" SRC_URI_append_arm = " file://alignment.sh" @@ -59,30 +60,31 @@ do_install () { install -d ${D}${sysconfdir}/default install -d ${D}${sysconfdir}/default/volatiles - install -m 0755 ${WORKDIR}/functions ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/bootmisc.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/checkroot ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/finish.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/halt ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/hostname.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/mountall.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/mountnfs.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/ramdisk ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/reboot ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/rmnologin ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/sendsigs ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/single ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/umountnfs.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/urandom ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/devpts.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/devpts ${D}${sysconfdir}/default - install -m 0755 ${WORKDIR}/sysfs.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/functions ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/bootmisc.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/checkroot ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/finish.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/halt ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/hostname.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/mountall.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/mountnfs.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/ramdisk ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/reboot ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/rmnologin ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/sendsigs ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/single ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/umountnfs.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/urandom ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/devpts.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/devpts ${D}${sysconfdir}/default + install -m 0755 ${WORKDIR}/sysfs.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/rascal-init ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/rascal-gpio ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/rascal-webserver ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core + install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/rascal-analogger ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/rascal-gpio ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/rascal-init ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/rascal-webserver ${D}${sysconfdir}/init.d + install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core if [ "${TARGET_ARCH}" = "arm" ]; then install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d fi @@ -114,19 +116,20 @@ do_install () { ln -sf ../init.d/halt ${D}${sysconfdir}/rc0.d/S90halt ln -sf ../init.d/save-rtc.sh ${D}${sysconfdir}/rc0.d/S25save-rtc.sh ln -sf ../init.d/save-rtc.sh ${D}${sysconfdir}/rc6.d/S25save-rtc.sh - ln -sf ../init.d/banner ${D}${sysconfdir}/rcS.d/S02banner + ln -sf ../init.d/banner ${D}${sysconfdir}/rcS.d/S02banner ln -sf ../init.d/checkroot ${D}${sysconfdir}/rcS.d/S10checkroot # ln -sf ../init.d/checkfs.sh ${D}${sysconfdir}/rcS.d/S30checkfs.sh ln -sf ../init.d/mountall.sh ${D}${sysconfdir}/rcS.d/S35mountall.sh ln -sf ../init.d/hostname.sh ${D}${sysconfdir}/rcS.d/S39hostname.sh ln -sf ../init.d/mountnfs.sh ${D}${sysconfdir}/rcS.d/S45mountnfs.sh ln -sf ../init.d/bootmisc.sh ${D}${sysconfdir}/rcS.d/S55bootmisc.sh -# ln -sf ../init.d/urandom ${D}${sysconfdir}/rcS.d/S55urandom - ln -sf ../init.d/rascal-init ${D}${sysconfdir}/rc5.d/S60rascal-init - ln -sf ../init.d/rascal-gpio ${D}${sysconfdir}/rc5.d/S65rascal-gpio +# ln -sf ../init.d/urandom ${D}${sysconfdir}/rcS.d/S55urandom + # rascal-analogger not enabled by default + ln -sf ../init.d/rascal-gpio ${D}${sysconfdir}/rc5.d/S60rascal-gpio + ln -sf ../init.d/rascal-init ${D}${sysconfdir}/rc5.d/S65rascal-init ln -sf ../init.d/rascal-webserver ${D}${sysconfdir}/rc5.d/S70rascal-webserver - ln -sf ../init.d/finish.sh ${D}${sysconfdir}/rcS.d/S99finish.sh - ln -sf ../init.d/devices ${D}${sysconfdir}/rcS.d/S05devices + ln -sf ../init.d/finish.sh ${D}${sysconfdir}/rcS.d/S99finish.sh + ln -sf ../init.d/devices ${D}${sysconfdir}/rcS.d/S05devices # udev will run at S04 if installed ln -sf ../init.d/sysfs.sh ${D}${sysconfdir}/rcS.d/S03sysfs ln -sf ../init.d/populate-volatile.sh ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh diff --git a/recipes/python/python-rascal_0.1.bb b/recipes/python/python-rascal_0.1.bb new file mode 100644 index 0000000000..53512df292 --- /dev/null +++ b/recipes/python/python-rascal_0.1.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Hardware control library for the Rascal, a small computer for art and science" +HOMEPAGE = "http://rascalmicro.com" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPLv3" +SRCNAME = "rascal" +PR = "r0" + +S = "${WORKDIR}/git" + +SRCREV = "0.1" +SRC_URI = "git://github.com/rascalmicro/hardware-api.git;protocol=git;branch=master" + + +inherit distutils + +RDEPENDS_${PN} = "\ + python-core \ +" + +SRC_URI[md5sum] = "35726c7d0708a244a39faf93f82c3a24" +SRC_URI[sha256sum] = "ce3c88135d1c15a5d1e0f6dae6e171e77b15ec6ac6a3d6ad5a6ca37fcd2d0a8d" From ff170dfcd6d64e3935cfdc0076c29ef4482b8569 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Thu, 21 Apr 2011 14:19:07 -0400 Subject: [PATCH 017/509] Add more GPIO pins and clean up network settings. --- recipes/busybox/files/simple.script | 3 + recipes/initscripts/files/rascal-gpio | 2 +- recipes/netbase/netbase/interfaces | 90 +++++---------------------- 3 files changed, 21 insertions(+), 74 deletions(-) diff --git a/recipes/busybox/files/simple.script b/recipes/busybox/files/simple.script index 5cc21b9de2..92cee624fb 100644 --- a/recipes/busybox/files/simple.script +++ b/recipes/busybox/files/simple.script @@ -66,6 +66,9 @@ case "$1" in echo adding dns $i echo nameserver $i >> $RESOLV_CONF done + echo "# Google public DNS as backup" >> $RESOLV_CONF + echo nameserver 8.8.8.8 >> $RESOLV_CONF + echo nameserver 8.8.4.4 >> $RESOLV_CONF ;; esac diff --git a/recipes/initscripts/files/rascal-gpio b/recipes/initscripts/files/rascal-gpio index 1f53bba028..d3b504fd06 100644 --- a/recipes/initscripts/files/rascal-gpio +++ b/recipes/initscripts/files/rascal-gpio @@ -1,4 +1,4 @@ -for pin in 64 65 66 67 68 69 70 71 72 73 96 97 98 99 100 101 +for pin in 55 56 64 65 66 67 68 69 70 71 72 73 96 97 98 99 100 101 107 do echo $pin > /sys/class/gpio/export echo out > /sys/class/gpio/gpio$pin/direction diff --git a/recipes/netbase/netbase/interfaces b/recipes/netbase/netbase/interfaces index c615642e35..3aa7318c09 100644 --- a/recipes/netbase/netbase/interfaces +++ b/recipes/netbase/netbase/interfaces @@ -4,80 +4,24 @@ auto lo iface lo inet loopback - -# Wireless interfaces -# -# Example of an unencrypted (no WEP or WPA) wireless connection -# that connects to any available access point: -# -iface wlan0 inet dhcp - wireless_mode managed - wireless_essid any -# -# -# Same as above but locked to a specific access point: -# -#iface wlan0 inet dhcp -# wireless_mode managed -# wireless-essid some-essid -# -# A WEP encrypted connection locked to a specific access point: -# -#iface wlan0 inet dhcp -# wireless-essid some-essid -# wireless-key s:My-PlainText-Password -# wireless-mode managed -# -# A WPA1 or WPA2 encrypted connection locked to a specific access point. -# This is the best option for non-roaming, single-network usage. -# Note that your card may require a firmware update to use WPA. -# Some distributions install a temporary volatile firmware update on ifup. -# -#iface wlan0 inet dhcp -# wpa-essid some-essid -# wpa-psk My-PlainText-Password -# -# A WPA1 or WPA2 encrypted connection using an external configuration file -# for wpa-supplicant. This is the way to go if you need to configure multiple -# networks with different keys and / or WPA settings and roaming support. -# -# iface wlan0 inet dhcp -# wpa-conf /etc/wpa_supplicant.conf -# wpa-driver hostap - - - -iface atml0 inet dhcp - -# Wired or wireless interfaces +# Wired interface auto eth0 iface eth0 inet dhcp -iface eth1 inet dhcp - -# Ethernet/RNDIS gadget (g_ether) -# ... or on host side, usbnet and random hwaddr -iface usb0 inet static - address 192.168.0.202 - netmask 255.255.255.0 - network 192.168.0.0 - gateway 192.168.0.200 - - -# Zaurus 2.4 Lineo net_fd; obsolete -iface usbd0 inet static - address 192.168.129.201 - netmask 255.255.255.0 - network 192.168.129.0 - gateway 192.168.129.200 - -# iPAQ 2.4 mach-sa1100/usb-eth -# (192.168.0.202 is the iPAQ's IP, 192.168.0.200 is the host's IP) -iface usbf inet static - address 192.168.0.202 - netmask 255.255.255.0 - network 192.168.0.0 - gateway 192.168.0.200 -# Bluetooth networking -iface bnep0 inet dhcp +# If you want to assign a static IP address, you could comment +# out the dhcp line above and uncomment the five lines below. +# You might need to tweak the addresses for your network. + +# iface eth0 inet static +# address 192.168.1.189 +# netmask 255.255.255.0 +# network 192.168.1.0 +# gateway 192.168.1.1 + +# Ethernet over USB (g_ether) +# iface usb0 inet static +# address 192.168.1.191 +# netmask 255.255.255.0 +# network 192.168.1.0 +# gateway 192.168.1.1 From 9a915d5806720fc4f52b7c78310b35abb4ec9c1d Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 22 Apr 2011 15:28:58 -0400 Subject: [PATCH 018/509] Clean up debug boot message --- recipes/base-files/base-files/angstrom/issue | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/recipes/base-files/base-files/angstrom/issue b/recipes/base-files/base-files/angstrom/issue index d00b4d619d..d1fa72a8a8 100644 --- a/recipes/base-files/base-files/angstrom/issue +++ b/recipes/base-files/base-files/angstrom/issue @@ -1,10 +1,2 @@ -///////////////////////////////////////// -// // -// Rascal Micro // -// Small computers for art and science // -// // -///////////////////////////////////////// -issue -Rascal beta test %h -date: \d -release: \r +Date: \d +Kernel release: \r From 9b201031565dd3204c276cb20a1455c0bd9d5291 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Mon, 25 Apr 2011 15:03:49 -0400 Subject: [PATCH 019/509] Fix GNU_HASH error by passing flag to ld via gcc, add install dirs, reformat --- recipes/nginx/nginx_1.0.0.bb | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/recipes/nginx/nginx_1.0.0.bb b/recipes/nginx/nginx_1.0.0.bb index d598e3aaf4..6cb69ed3ae 100644 --- a/recipes/nginx/nginx_1.0.0.bb +++ b/recipes/nginx/nginx_1.0.0.bb @@ -12,16 +12,26 @@ DEPENDS = "libpcre" do_configure() { export cross_compiling="yes" - ${S}/configure --with-cc=${HOST_PREFIX}gcc --sbin-path=${sbindir}/nginx --error-log-path=${localstatedir}/log/nginx/error --conf-path=${sysconfdir}/nginx/nginx.conf + ${S}/configure \ + --with-cc="${HOST_PREFIX}gcc -Wl,--hash-style=gnu" \ + --sbin-path=${sbindir}/nginx \ + --pid-path=${localstatedir}/run/nginx.pid \ + --lock-path=${localstatedir}/lock/nginx.lock \ + --error-log-path=${localstatedir}/log/nginx/error \ + --conf-path=${sysconfdir}/nginx/nginx.conf \ + --http-log-path=${localstatedir}/log/nginx/access \ + --http-client-body-temp-path=${localstatedir}/lib/nginx/client_body_temp \ + --http-proxy-temp-path=${localstatedir}/lib/nginx/proxy_temp \ + --http-fastcgi-temp-path=${localstatedir}/lib/nginx/fastcgi_temp \ + --http-uwsgi-temp-path=${localstatedir}/lib/nginx/uwsgi_temp \ + --http-scgi-temp-path=${localstatedir}/lib/nginx/scgi_temp } do_install() { + install -d ${D}${localstatedir}/lib/nginx + install -d ${D}${localstatedir}/log/nginx oe_runmake DESTDIR=${D} install } -do_package_qa() { - : -} - SRC_URI[md5sum] = "5751c920c266ea5bb5fc38af77e9c71c" SRC_URI[sha256sum] = "3de3d6caeed56751c24ebc5cfb03475620b9eb0fa999c766a01d44dca674c001" From 08da1889a7e3493d374f332a524c857fdf434a1e Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Mon, 25 Apr 2011 20:38:34 -0400 Subject: [PATCH 020/509] Add Flask, Jinja2, and Werkzeug recipes --- recipes/images/rascal-image.bb | 3 +++ recipes/python/python-flask_0.6.1.bb | 28 +++++++++++++++++++++++++ recipes/python/python-jinja2_2.5.5.bb | 26 +++++++++++++++++++++++ recipes/python/python-rascal_0.1.bb | 1 - recipes/python/python-werkzeug_0.6.2.bb | 26 +++++++++++++++++++++++ 5 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 recipes/python/python-flask_0.6.1.bb create mode 100644 recipes/python/python-jinja2_2.5.5.bb create mode 100644 recipes/python/python-werkzeug_0.6.2.bb diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index d02b764906..932ddf1aa2 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -12,9 +12,12 @@ IMAGE_INSTALL += "\ nginx \ python \ python-daemon \ + python-flask \ + python-jinja2 \ python-modules \ python-pyserial \ python-rascal \ + python-werkzeug \ ruby \ usbutils \ usb-gadget-mode \ diff --git a/recipes/python/python-flask_0.6.1.bb b/recipes/python/python-flask_0.6.1.bb new file mode 100644 index 0000000000..ef3401e757 --- /dev/null +++ b/recipes/python/python-flask_0.6.1.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Web microframework for Python based on Werkzeug, Jinja 2 and good intentions" +HOMEPAGE = "http://flask.pocoo.org/" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "BSD" +SRCNAME = "flask" +PR = "r0" + +S = "${WORKDIR}/git" + +SRCREV = "0.6.1" +SRC_URI = "git://github.com/mitsuhiko/flask.git;protocol=git;branch=master" + +inherit distutils + +RDEPENDS_${PN} = "\ + python-core \ + python-jinja2 \ + python-werkzeug \ +" + +do_install_append() { + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py +} + +SRC_URI[md5sum] = "7af56e33fb6a35db2818c20e604c8698" +SRC_URI[sha256sum] = "fe0e31bf71a1fc1d2e0786052855c94cd9ee43546d3e15ff98ccee0c5bc21f70" diff --git a/recipes/python/python-jinja2_2.5.5.bb b/recipes/python/python-jinja2_2.5.5.bb new file mode 100644 index 0000000000..62276d896b --- /dev/null +++ b/recipes/python/python-jinja2_2.5.5.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Modern and designer-friendly templating language for Python, modelled after Django’s templates" +HOMEPAGE = "http://jinja.pocoo.org/" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "BSD" +SRCNAME = "jinja2" +PR = "r0" + +S = "${WORKDIR}/git" + +SRCREV = "2.5.5" +SRC_URI = "git://github.com/mitsuhiko/jinja2.git;protocol=git;branch=master" + +inherit distutils + +RDEPENDS_${PN} = "\ + python-core \ +" + +do_install_append() { + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py +} + +SRC_URI[md5sum] = "e5209ee12f5e984b9963086f936621fb" +SRC_URI[sha256sum] = "aaac90088c957cad4272dcf38aee1736889bbc568ef1a25d3d75310526f616ba" diff --git a/recipes/python/python-rascal_0.1.bb b/recipes/python/python-rascal_0.1.bb index 53512df292..88139f2d14 100644 --- a/recipes/python/python-rascal_0.1.bb +++ b/recipes/python/python-rascal_0.1.bb @@ -11,7 +11,6 @@ S = "${WORKDIR}/git" SRCREV = "0.1" SRC_URI = "git://github.com/rascalmicro/hardware-api.git;protocol=git;branch=master" - inherit distutils RDEPENDS_${PN} = "\ diff --git a/recipes/python/python-werkzeug_0.6.2.bb b/recipes/python/python-werkzeug_0.6.2.bb new file mode 100644 index 0000000000..26ed2cf364 --- /dev/null +++ b/recipes/python/python-werkzeug_0.6.2.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "WSGI utility library for Python" +HOMEPAGE = "http://werkzeug.pocoo.org" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "BSD" +SRCNAME = "werkzeug" +PR = "r0" + +S = "${WORKDIR}/git" + +SRCREV = "0.6.2" +SRC_URI = "git://github.com/mitsuhiko/werkzeug.git;protocol=git;branch=master" + +inherit distutils + +RDEPENDS_${PN} = "\ + python-core \ +" + +do_install_append() { + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py +} + +SRC_URI[md5sum] = "dda6be061c9158ee4371c27b34e6b521" +SRC_URI[sha256sum] = "f749c0eb77ee7fec24d09770e71a3503e5444066bc872a1e91bb08001a7f7cc1" From 401a2a788375b5442781c6acb51b729dd67d54cf Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 27 Apr 2011 17:06:51 -0400 Subject: [PATCH 021/509] Add binutils and cpp to Rascal image recipe, remove old gcc junk --- recipes/images/rascal-image.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 932ddf1aa2..9adc440264 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -1,6 +1,9 @@ require recipes/images/minimal-image.bb IMAGE_INSTALL += "\ + binutils \ + cpp \ + cpp-symlinks \ gcc \ gcc-symlinks \ git \ @@ -25,7 +28,4 @@ IMAGE_INSTALL += "\ vim \ " -PREFERRED_VERSION_gcc = "4.5" -PREFERRED_PROVIDER_virtual/libgcc-dev = "gcc" - export IMAGE_BASENAME = "rascal-image" From c6602b97905477ac4a54d9499707cdcf54db1fff Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Thu, 28 Apr 2011 17:01:18 -0400 Subject: [PATCH 022/509] Add a few more packages, add vimrc and gitconfig --- recipes/base-files/base-files/profile | 8 +- recipes/git/git-1.7.3.5/gitconfig | 7 ++ recipes/git/git_1.7.3.5.bb | 6 +- recipes/images/rascal-image.bb | 4 + recipes/vim/files/vimrc | 132 +++++++------------------- 5 files changed, 55 insertions(+), 102 deletions(-) create mode 100644 recipes/git/git-1.7.3.5/gitconfig diff --git a/recipes/base-files/base-files/profile b/recipes/base-files/base-files/profile index 2a401e3f31..7bff1a0228 100644 --- a/recipes/base-files/base-files/profile +++ b/recipes/base-files/base-files/profile @@ -41,8 +41,6 @@ if [ "$PS1" ]; then esac fi -GIT_SSH=git-ssh # To make Dropbear SSH work with Github - if [ -d /etc/profile.d ]; then for i in /etc/profile.d/*.sh; do if [ -r $i ]; then @@ -52,10 +50,10 @@ if [ -d /etc/profile.d ]; then unset i fi -export GIT_SSH PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM +export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM -alias w="who -a" +alias ls="ls --color=auto" alias vi="vim" -alias git-ssh="ssh -i ~/.ssh/id_rsa $*" +alias w="who -a" umask 022 diff --git a/recipes/git/git-1.7.3.5/gitconfig b/recipes/git/git-1.7.3.5/gitconfig new file mode 100644 index 0000000000..61bcb1c5d0 --- /dev/null +++ b/recipes/git/git-1.7.3.5/gitconfig @@ -0,0 +1,7 @@ +[color] + diff = auto + status = auto + branch = auto + +[core] + pager = more diff --git a/recipes/git/git_1.7.3.5.bb b/recipes/git/git_1.7.3.5.bb index e17f5a9dac..8cf3695c04 100644 --- a/recipes/git/git_1.7.3.5.bb +++ b/recipes/git/git_1.7.3.5.bb @@ -1,6 +1,8 @@ require git.inc -SRC_URI += "file://git-less-hardlinks.diff" +SRC_URI += "file://git-less-hardlinks.diff \ + file://gitconfig \ + " EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes" @@ -25,6 +27,8 @@ do_install_append() { ln -sf ${bindir}/$gitprog ${D}${libexecdir}/git-core/$gitprog done rm ${D}${libexecdir}/git-core/git && ln -sf ${bindir}/git ${D}${libexecdir}/git-core/git + install -m 0755 -d ${D}${sysconfdir} + install -m 0755 ${WORKDIR}/gitconfig ${D}${sysconfdir} } FILES_${PN}-dbg += "${libexecdir}/git-core/.debug" diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 9adc440264..c051f12de1 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -11,12 +11,15 @@ IMAGE_INSTALL += "\ iperf \ libgcc-dev \ libxml2 \ + make \ nano \ nginx \ + ntpdate \ python \ python-daemon \ python-flask \ python-jinja2 \ + python-misc \ python-modules \ python-pyserial \ python-rascal \ @@ -26,6 +29,7 @@ IMAGE_INSTALL += "\ usb-gadget-mode \ uwsgi \ vim \ + vim-vimrc \ " export IMAGE_BASENAME = "rascal-image" diff --git a/recipes/vim/files/vimrc b/recipes/vim/files/vimrc index df65555af8..611a69f5af 100644 --- a/recipes/vim/files/vimrc +++ b/recipes/vim/files/vimrc @@ -1,96 +1,36 @@ -" An example for a vimrc file. -" -" Maintainer: Bram Moolenaar -" Last change: 2008 Jul 02 -" -" To use it, copy it to -" for Unix and OS/2: ~/.vimrc -" for Amiga: s:.vimrc -" for MS-DOS and Win32: $VIM\_vimrc -" for OpenVMS: sys$login:.vimrc - -" When started as "evim", evim.vim will already have done these settings. -if v:progname =~? "evim" - finish -endif - -" Use Vim settings, rather then Vi settings (much better!). -" This must be first, because it changes other options as a side effect. -set nocompatible - -" allow backspacing over everything in insert mode -set backspace=indent,eol,start - -if has("vms") - set nobackup " do not keep a backup file, use versions instead -else - set backup " keep a backup file -endif -set history=50 " keep 50 lines of command line history -set ruler " show the cursor position all the time -set showcmd " display incomplete commands -set incsearch " do incremental searching - -" For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries -" let &guioptions = substitute(&guioptions, "t", "", "g") - -" Don't use Ex mode, use Q for formatting -map Q gq - -" CTRL-U in insert mode deletes a lot. Use CTRL-G u to first break undo, -" so that you can undo CTRL-U after inserting a line break. -inoremap u - -" In many terminal emulators the mouse works just fine, thus enable it. -if has('mouse') - set mouse=a -endif - -" Switch syntax highlighting on, when the terminal has colors -" Also switch on highlighting the last used search pattern. -"if &t_Co > 2 || has("gui_running") -" syntax on -" set hlsearch -"endif - -" Only do this part when compiled with support for autocommands. -if has("autocmd") - - " Enable file type detection. - " Use the default filetype settings, so that mail gets 'tw' set to 72, - " 'cindent' is on in C files, etc. - " Also load indent files, to automatically do language-dependent indenting. - filetype plugin indent on - - " Put these in an autocmd group, so that we can delete them easily. - augroup vimrcEx - au! - - " For all text files set 'textwidth' to 78 characters. - autocmd FileType text setlocal textwidth=78 - - " When editing a file, always jump to the last known cursor position. - " Don't do it when the position is invalid or when inside an event handler - " (happens when dropping a file on gvim). - " Also don't do it when the mark is in the first line, that is the default - " position when opening a file. - autocmd BufReadPost * - \ if line("'\"") > 1 && line("'\"") <= line("$") | - \ exe "normal! g`\"" | - \ endif - - augroup END - -else - - set autoindent " always set autoindenting on - -endif " has("autocmd") - -" Convenient command to see the difference between the current buffer and the -" file it was loaded from, thus the changes you made. -" Only define it when not defined already. -if !exists(":DiffOrig") - command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis - \ | wincmd p | diffthis -endif +set tabstop=4 +set shiftwidth=4 +set expandtab +set autoindent + +syntax on + +nnoremap :set invpaste paste? +set pastetoggle= +set showmode + +" mapping to make movements operate on 1 screen line in wrap mode + +function! ScreenMovement(movement) + if &wrap + return "g" . a:movement + else + return a:movement + endif +endfunction + +onoremap j ScreenMovement("j") +onoremap k ScreenMovement("k") +onoremap 0 ScreenMovement("0") +onoremap ^ ScreenMovement("") +onoremap $ ScreenMovement("$") +nnoremap j ScreenMovement("j") +nnoremap k ScreenMovement("k") +nnoremap 0 ScreenMovement("0") +nnoremap ^ ScreenMovement("") +nnoremap $ ScreenMovement("$") + +augroup mkd + autocmd BufRead *.mkd set ai formatoptions=tcroqn2 comments=n:> + au BufRead,BufNewFile *.mako setfiletype mako +augroup END From 6134acb8501ebd7da5b675a124dc8f3ffc2c77c8 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Mon, 2 May 2011 14:22:21 -0400 Subject: [PATCH 023/509] Decruft vimrc and add backspace fixes --- recipes/vim/files/vimrc | 43 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 34 deletions(-) diff --git a/recipes/vim/files/vimrc b/recipes/vim/files/vimrc index 611a69f5af..2e74b9f83a 100644 --- a/recipes/vim/files/vimrc +++ b/recipes/vim/files/vimrc @@ -1,36 +1,11 @@ -set tabstop=4 -set shiftwidth=4 -set expandtab -set autoindent +set tabstop=4 " Make tabs as wide as 4 spaces +set shiftwidth=4 " Make >> and << shift text to match tab width +set expandtab " Insert spaces when is pressed +" (You can use in insert mode to insert a TAB character if you need to.) -syntax on +set ruler " Add line and column numbers at bottom of screen +set backspace=indent,eol,start " Make backspace not stop for anything +syntax on " Turn on syntax highlighting -nnoremap :set invpaste paste? -set pastetoggle= -set showmode - -" mapping to make movements operate on 1 screen line in wrap mode - -function! ScreenMovement(movement) - if &wrap - return "g" . a:movement - else - return a:movement - endif -endfunction - -onoremap j ScreenMovement("j") -onoremap k ScreenMovement("k") -onoremap 0 ScreenMovement("0") -onoremap ^ ScreenMovement("") -onoremap $ ScreenMovement("$") -nnoremap j ScreenMovement("j") -nnoremap k ScreenMovement("k") -nnoremap 0 ScreenMovement("0") -nnoremap ^ ScreenMovement("") -nnoremap $ ScreenMovement("$") - -augroup mkd - autocmd BufRead *.mkd set ai formatoptions=tcroqn2 comments=n:> - au BufRead,BufNewFile *.mako setfiletype mako -augroup END +" Make backspace delete preceding character in normal mode +nmap X From 19790cb5bc97ff0af95f0b08329f75f7bc490a24 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Thu, 12 May 2011 19:35:53 -0400 Subject: [PATCH 024/509] Make /var/log not volatile so Nginx log won't vanish. Eliminate useless nginx dir. --- recipes/base-files/base-files_3.0.14.bb | 4 ++-- recipes/nginx/nginx_1.0.0.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb index 874c4e7c5e..ace513286d 100644 --- a/recipes/base-files/base-files_3.0.14.bb +++ b/recipes/base-files/base-files_3.0.14.bb @@ -41,7 +41,7 @@ dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \ /sys ${localstatedir}/lib/misc ${localstatedir}/spool \ ${localstatedir}/volatile ${localstatedir}/volatile/cache \ ${localstatedir}/volatile/lock/subsys \ - ${localstatedir}/volatile/log \ + ${localstatedir}/log \ ${localstatedir}/volatile/run \ /mnt /media /media/card /media/cf /media/net /media/ram \ /media/union /media/realroot /media/hdd \ @@ -54,7 +54,7 @@ dirs1777_micro = "/tmp" media = "card cf net ram" media_micro = "" -volatiles = "cache run log lock tmp" +volatiles = "cache run lock tmp" conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \ ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \ diff --git a/recipes/nginx/nginx_1.0.0.bb b/recipes/nginx/nginx_1.0.0.bb index 6cb69ed3ae..57f58f6d07 100644 --- a/recipes/nginx/nginx_1.0.0.bb +++ b/recipes/nginx/nginx_1.0.0.bb @@ -18,7 +18,7 @@ do_configure() { --pid-path=${localstatedir}/run/nginx.pid \ --lock-path=${localstatedir}/lock/nginx.lock \ --error-log-path=${localstatedir}/log/nginx/error \ - --conf-path=${sysconfdir}/nginx/nginx.conf \ + --conf-path=${sysconfdir}/nginx.conf \ --http-log-path=${localstatedir}/log/nginx/access \ --http-client-body-temp-path=${localstatedir}/lib/nginx/client_body_temp \ --http-proxy-temp-path=${localstatedir}/lib/nginx/proxy_temp \ From 92f8d8444ace20f7848fa1d5a079ff978f46a138 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Thu, 12 May 2011 19:38:30 -0400 Subject: [PATCH 025/509] Add VIM environment variable so that Vim system-wide config file is read correctly. --- recipes/base-files/base-files/profile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/base-files/base-files/profile b/recipes/base-files/base-files/profile index 7bff1a0228..9316e61c66 100644 --- a/recipes/base-files/base-files/profile +++ b/recipes/base-files/base-files/profile @@ -50,7 +50,9 @@ if [ -d /etc/profile.d ]; then unset i fi -export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM +VIM="/usr/share/vim" + +export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM VIM alias ls="ls --color=auto" alias vi="vim" From 5b68afdff6b0afd89f63846a809ae4b2ce8b7e46 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 13 May 2011 14:23:42 -0400 Subject: [PATCH 026/509] Fix behavior of arrow keys in Vim with Mac terminal --- recipes/vim/files/vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/vim/files/vimrc b/recipes/vim/files/vimrc index 2e74b9f83a..869bcbd741 100644 --- a/recipes/vim/files/vimrc +++ b/recipes/vim/files/vimrc @@ -1,3 +1,4 @@ +set nocompatible " Prevent vim from using legacy vi behavior as defaults set tabstop=4 " Make tabs as wide as 4 spaces set shiftwidth=4 " Make >> and << shift text to match tab width set expandtab " Insert spaces when is pressed From e879e5832a5221bb783f6a6c7d76edb631c23f10 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 13 May 2011 14:59:03 -0400 Subject: [PATCH 027/509] Add OpenSSH packages --- recipes/images/rascal-image.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index c051f12de1..2c5dd149c5 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -15,6 +15,8 @@ IMAGE_INSTALL += "\ nano \ nginx \ ntpdate \ + openssh \ + openssh-keygen \ python \ python-daemon \ python-flask \ From 6c20ab7d844a6cb77194abddbaabd2cae0177c73 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 13 May 2011 15:00:08 -0400 Subject: [PATCH 028/509] Add init script to pull hostname from kernel commandline, rename and clean up init scripts. --- .../{rascal-analogger => rascal-analogger.py} | 0 .../files/{rascal-gpio => rascal-gpio.sh} | 0 recipes/initscripts/files/rascal-hostname.sh | 10 +++ .../files/{rascal-init => rascal-set-pw.sh} | 0 .../{rascal-webserver => rascal-webserver.sh} | 0 recipes/initscripts/initscripts_1.0.bb | 89 ++++++++++--------- 6 files changed, 56 insertions(+), 43 deletions(-) rename recipes/initscripts/files/{rascal-analogger => rascal-analogger.py} (100%) rename recipes/initscripts/files/{rascal-gpio => rascal-gpio.sh} (100%) create mode 100644 recipes/initscripts/files/rascal-hostname.sh rename recipes/initscripts/files/{rascal-init => rascal-set-pw.sh} (100%) rename recipes/initscripts/files/{rascal-webserver => rascal-webserver.sh} (100%) diff --git a/recipes/initscripts/files/rascal-analogger b/recipes/initscripts/files/rascal-analogger.py similarity index 100% rename from recipes/initscripts/files/rascal-analogger rename to recipes/initscripts/files/rascal-analogger.py diff --git a/recipes/initscripts/files/rascal-gpio b/recipes/initscripts/files/rascal-gpio.sh similarity index 100% rename from recipes/initscripts/files/rascal-gpio rename to recipes/initscripts/files/rascal-gpio.sh diff --git a/recipes/initscripts/files/rascal-hostname.sh b/recipes/initscripts/files/rascal-hostname.sh new file mode 100644 index 0000000000..25d7e3a89b --- /dev/null +++ b/recipes/initscripts/files/rascal-hostname.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +HOSTNAME="`sed -ne 's/^[^:]*:[^:]*:[^:]*:[^:]*:\([^:]*\):.*/\1/p' /proc/cmdline`" + +if [ -z "$HOSTNAME" ] +then + HOSTNAME="rascal" +fi + +echo "$HOSTNAME" > /etc/hostname diff --git a/recipes/initscripts/files/rascal-init b/recipes/initscripts/files/rascal-set-pw.sh similarity index 100% rename from recipes/initscripts/files/rascal-init rename to recipes/initscripts/files/rascal-set-pw.sh diff --git a/recipes/initscripts/files/rascal-webserver b/recipes/initscripts/files/rascal-webserver.sh similarity index 100% rename from recipes/initscripts/files/rascal-webserver rename to recipes/initscripts/files/rascal-webserver.sh diff --git a/recipes/initscripts/initscripts_1.0.bb b/recipes/initscripts/initscripts_1.0.bb index c726dc16e7..993a6ba8f7 100644 --- a/recipes/initscripts/initscripts_1.0.bb +++ b/recipes/initscripts/initscripts_1.0.bb @@ -33,10 +33,11 @@ SRC_URI = "file://functions \ file://volatiles \ file://save-rtc.sh \ file://save-rtc-uclibc.sh \ - file://rascal-analogger \ - file://rascal-gpio \ - file://rascal-init \ - file://rascal-webserver" + file://rascal-analogger.py \ + file://rascal-gpio.sh \ + file://rascal-hostname.sh \ + file://rascal-set-hash.sh \ + file://rascal-webserver.sh" SRC_URI_append_arm = " file://alignment.sh" @@ -80,10 +81,11 @@ do_install () { install -m 0755 ${WORKDIR}/sysfs.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/rascal-analogger ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/rascal-gpio ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/rascal-init ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/rascal-webserver ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/rascal-analogger.py ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/rascal-gpio.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/rascal-hostname.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/rascal-set-hash.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/rascal-webserver.sh ${D}${sysconfdir}/init.d install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core if [ "${TARGET_ARCH}" = "arm" ]; then install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d @@ -97,45 +99,46 @@ do_install () { # # Create runlevel links # - ln -sf ../init.d/rmnologin ${D}${sysconfdir}/rc2.d/S99rmnologin - ln -sf ../init.d/rmnologin ${D}${sysconfdir}/rc3.d/S99rmnologin - ln -sf ../init.d/rmnologin ${D}${sysconfdir}/rc4.d/S99rmnologin - ln -sf ../init.d/rmnologin ${D}${sysconfdir}/rc5.d/S99rmnologin - ln -sf ../init.d/sendsigs ${D}${sysconfdir}/rc6.d/S20sendsigs -# ln -sf ../init.d/urandom ${D}${sysconfdir}/rc6.d/S30urandom - ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc6.d/S31umountnfs.sh - ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc6.d/S40umountfs + ln -sf ../init.d/rmnologin ${D}${sysconfdir}/rc2.d/S99rmnologin + ln -sf ../init.d/rmnologin ${D}${sysconfdir}/rc3.d/S99rmnologin + ln -sf ../init.d/rmnologin ${D}${sysconfdir}/rc4.d/S99rmnologin + ln -sf ../init.d/rmnologin ${D}${sysconfdir}/rc5.d/S99rmnologin + ln -sf ../init.d/sendsigs ${D}${sysconfdir}/rc6.d/S20sendsigs +# ln -sf ../init.d/urandom ${D}${sysconfdir}/rc6.d/S30urandom + ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc6.d/S31umountnfs.sh + ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc6.d/S40umountfs # udev will run at S55 if installed - ln -sf ../init.d/ramdisk ${D}${sysconfdir}/rcS.d/S30ramdisk - ln -sf ../init.d/reboot ${D}${sysconfdir}/rc6.d/S90reboot - ln -sf ../init.d/sendsigs ${D}${sysconfdir}/rc0.d/S20sendsigs -# ln -sf ../init.d/urandom ${D}${sysconfdir}/rc0.d/S30urandom - ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc0.d/S31umountnfs.sh - ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc0.d/S40umountfs + ln -sf ../init.d/ramdisk ${D}${sysconfdir}/rcS.d/S30ramdisk + ln -sf ../init.d/reboot ${D}${sysconfdir}/rc6.d/S90reboot + ln -sf ../init.d/sendsigs ${D}${sysconfdir}/rc0.d/S20sendsigs +# ln -sf ../init.d/urandom ${D}${sysconfdir}/rc0.d/S30urandom + ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc0.d/S31umountnfs.sh + ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc0.d/S40umountfs # udev will run at S55 if installed - ln -sf ../init.d/halt ${D}${sysconfdir}/rc0.d/S90halt - ln -sf ../init.d/save-rtc.sh ${D}${sysconfdir}/rc0.d/S25save-rtc.sh - ln -sf ../init.d/save-rtc.sh ${D}${sysconfdir}/rc6.d/S25save-rtc.sh - ln -sf ../init.d/banner ${D}${sysconfdir}/rcS.d/S02banner - ln -sf ../init.d/checkroot ${D}${sysconfdir}/rcS.d/S10checkroot -# ln -sf ../init.d/checkfs.sh ${D}${sysconfdir}/rcS.d/S30checkfs.sh - ln -sf ../init.d/mountall.sh ${D}${sysconfdir}/rcS.d/S35mountall.sh - ln -sf ../init.d/hostname.sh ${D}${sysconfdir}/rcS.d/S39hostname.sh - ln -sf ../init.d/mountnfs.sh ${D}${sysconfdir}/rcS.d/S45mountnfs.sh - ln -sf ../init.d/bootmisc.sh ${D}${sysconfdir}/rcS.d/S55bootmisc.sh -# ln -sf ../init.d/urandom ${D}${sysconfdir}/rcS.d/S55urandom - # rascal-analogger not enabled by default - ln -sf ../init.d/rascal-gpio ${D}${sysconfdir}/rc5.d/S60rascal-gpio - ln -sf ../init.d/rascal-init ${D}${sysconfdir}/rc5.d/S65rascal-init - ln -sf ../init.d/rascal-webserver ${D}${sysconfdir}/rc5.d/S70rascal-webserver - ln -sf ../init.d/finish.sh ${D}${sysconfdir}/rcS.d/S99finish.sh - ln -sf ../init.d/devices ${D}${sysconfdir}/rcS.d/S05devices + ln -sf ../init.d/halt ${D}${sysconfdir}/rc0.d/S90halt + ln -sf ../init.d/save-rtc.sh ${D}${sysconfdir}/rc0.d/S25save-rtc.sh + ln -sf ../init.d/save-rtc.sh ${D}${sysconfdir}/rc6.d/S25save-rtc.sh + ln -sf ../init.d/banner ${D}${sysconfdir}/rcS.d/S02banner + ln -sf ../init.d/checkroot ${D}${sysconfdir}/rcS.d/S10checkroot +# ln -sf ../init.d/checkfs.sh ${D}${sysconfdir}/rcS.d/S30checkfs.sh + ln -sf ../init.d/mountall.sh ${D}${sysconfdir}/rcS.d/S35mountall.sh + ln -sf ../init.d/rascal-hostname.sh ${D}${sysconfdir}/rcS.d/S36rascal-hostname.sh + ln -sf ../init.d/hostname.sh ${D}${sysconfdir}/rcS.d/S39hostname.sh + ln -sf ../init.d/mountnfs.sh ${D}${sysconfdir}/rcS.d/S45mountnfs.sh + ln -sf ../init.d/bootmisc.sh ${D}${sysconfdir}/rcS.d/S55bootmisc.sh +# ln -sf ../init.d/urandom ${D}${sysconfdir}/rcS.d/S55urandom + # rascal-analogger.py not enabled by default + ln -sf ../init.d/rascal-gpio.sh ${D}${sysconfdir}/rc5.d/S60rascal-gpio.sh + ln -sf ../init.d/rascal-set-hash.sh ${D}${sysconfdir}/rc5.d/S65rascal-set-hash.sh + ln -sf ../init.d/rascal-webserver.sh ${D}${sysconfdir}/rc5.d/S70rascal-webserver.sh + ln -sf ../init.d/finish.sh ${D}${sysconfdir}/rcS.d/S99finish.sh + ln -sf ../init.d/devices ${D}${sysconfdir}/rcS.d/S05devices # udev will run at S04 if installed - ln -sf ../init.d/sysfs.sh ${D}${sysconfdir}/rcS.d/S03sysfs - ln -sf ../init.d/populate-volatile.sh ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh - ln -sf ../init.d/devpts.sh ${D}${sysconfdir}/rcS.d/S38devpts.sh + ln -sf ../init.d/sysfs.sh ${D}${sysconfdir}/rcS.d/S03sysfs + ln -sf ../init.d/populate-volatile.sh ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh + ln -sf ../init.d/devpts.sh ${D}${sysconfdir}/rcS.d/S38devpts.sh if [ "${TARGET_ARCH}" = "arm" ]; then - ln -sf ../init.d/alignment.sh ${D}${sysconfdir}/rcS.d/S06alignment + ln -sf ../init.d/alignment.sh ${D}${sysconfdir}/rcS.d/S06alignment fi install -m 0755 ${WORKDIR}/device_table.txt ${D}${sysconfdir}/device_table From c16e14b11f0ddbcf08b70e8db1abdb907561a885 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 13 May 2011 15:58:33 -0400 Subject: [PATCH 029/509] Make git find the system-wide config file by overriding configureopts in autotools.bbclass --- recipes/git/git_1.7.3.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/git/git_1.7.3.5.bb b/recipes/git/git_1.7.3.5.bb index 8cf3695c04..7d9f327635 100644 --- a/recipes/git/git_1.7.3.5.bb +++ b/recipes/git/git_1.7.3.5.bb @@ -4,7 +4,7 @@ SRC_URI += "file://git-less-hardlinks.diff \ file://gitconfig \ " -EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes" +EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes --prefix=''" DEPENDS = "openssl curl zlib expat tcl-native" From b56f30a1e38ff76bad380273a1540b0c1db4d516 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Tue, 17 May 2011 12:48:41 -0400 Subject: [PATCH 030/509] Rename init script that pulls hash of root pw from U-boot --- .../initscripts/files/{rascal-set-pw.sh => rascal-set-hash.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename recipes/initscripts/files/{rascal-set-pw.sh => rascal-set-hash.sh} (100%) diff --git a/recipes/initscripts/files/rascal-set-pw.sh b/recipes/initscripts/files/rascal-set-hash.sh similarity index 100% rename from recipes/initscripts/files/rascal-set-pw.sh rename to recipes/initscripts/files/rascal-set-hash.sh From 56f1da346d05ff33dd7aafee7dd1eb442dfd8f70 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Tue, 17 May 2011 16:05:31 -0400 Subject: [PATCH 031/509] Switch Flask, Jinja2, and Werkzeug to use setuptools, add Nginx conf patch, re-add "useless" Nginx directory, make python-rascal pull HEAD from Github, switch from Dropbear to OpenSSH --- build/conf/local.conf | 2 + recipes/nginx/files/rascal-conf.patch | 128 ++++++++++++++++++++++++ recipes/nginx/nginx_1.0.0.bb | 5 +- recipes/python/python-flask_0.6.1.bb | 2 +- recipes/python/python-jinja2_2.5.5.bb | 2 +- recipes/python/python-rascal_0.1.bb | 5 +- recipes/python/python-werkzeug_0.6.2.bb | 2 +- 7 files changed, 137 insertions(+), 9 deletions(-) create mode 100644 recipes/nginx/files/rascal-conf.patch diff --git a/build/conf/local.conf b/build/conf/local.conf index cb5faa40eb..f8dd939d5d 100644 --- a/build/conf/local.conf +++ b/build/conf/local.conf @@ -19,6 +19,8 @@ MACHINE ?= "at91sam9g20ek" DISTRO = "angstrom-2008.1" +DISTRO_SSH_DAEMON = "openssh" + IMAGE_FSTYPES = "jffs2 tar.bz2" IMAGE_KEEPROOTFS = "1" diff --git a/recipes/nginx/files/rascal-conf.patch b/recipes/nginx/files/rascal-conf.patch new file mode 100644 index 0000000000..b82827ad43 --- /dev/null +++ b/recipes/nginx/files/rascal-conf.patch @@ -0,0 +1,128 @@ +diff --git a/./conf/nginx.conf b/./conf/rascal-nginx.conf +index 672ce8c..f27efff 100644 +--- a/./conf/nginx.conf ++++ b/./conf/rascal-nginx.conf +@@ -1,118 +1,33 @@ +- +-#user nobody; + worker_processes 1; + +-#error_log logs/error.log; +-#error_log logs/error.log notice; +-#error_log logs/error.log info; +- +-#pid logs/nginx.pid; +- +- + events { + worker_connections 1024; + } + +- + http { + include mime.types; + default_type application/octet-stream; + +- #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' +- # '$status $body_bytes_sent "$http_referer" ' +- # '"$http_user_agent" "$http_x_forwarded_for"'; +- +- #access_log logs/access.log main; +- + sendfile on; +- #tcp_nopush on; + +- #keepalive_timeout 0; + keepalive_timeout 65; + +- #gzip on; +- + server { + listen 80; + server_name localhost; + +- #charset koi8-r; +- +- #access_log logs/host.access.log main; ++ location ^~ /static/ { ++ root /var/www; ++ } + + location / { +- root html; +- index index.html index.htm; ++ uwsgi_pass 127.0.0.1:5000; ++ include uwsgi_params; + } + +- #error_page 404 /404.html; +- +- # redirect server error pages to the static page /50x.html +- # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } +- +- # proxy the PHP scripts to Apache listening on 127.0.0.1:80 +- # +- #location ~ \.php$ { +- # proxy_pass http://127.0.0.1; +- #} +- +- # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 +- # +- #location ~ \.php$ { +- # root html; +- # fastcgi_pass 127.0.0.1:9000; +- # fastcgi_index index.php; +- # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; +- # include fastcgi_params; +- #} +- +- # deny access to .htaccess files, if Apache's document root +- # concurs with nginx's one +- # +- #location ~ /\.ht { +- # deny all; +- #} + } +- +- +- # another virtual host using mix of IP-, name-, and port-based configuration +- # +- #server { +- # listen 8000; +- # listen somename:8080; +- # server_name somename alias another.alias; +- +- # location / { +- # root html; +- # index index.html index.htm; +- # } +- #} +- +- +- # HTTPS server +- # +- #server { +- # listen 443; +- # server_name localhost; +- +- # ssl on; +- # ssl_certificate cert.pem; +- # ssl_certificate_key cert.key; +- +- # ssl_session_timeout 5m; +- +- # ssl_protocols SSLv2 SSLv3 TLSv1; +- # ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP; +- # ssl_prefer_server_ciphers on; +- +- # location / { +- # root html; +- # index index.html index.htm; +- # } +- #} +- + } diff --git a/recipes/nginx/nginx_1.0.0.bb b/recipes/nginx/nginx_1.0.0.bb index 57f58f6d07..133306c554 100644 --- a/recipes/nginx/nginx_1.0.0.bb +++ b/recipes/nginx/nginx_1.0.0.bb @@ -6,7 +6,8 @@ LICENSE = "BSD" PR = "r0" SRC_URI = "http://nginx.org/download/nginx-${PV}.tar.gz \ - file://allow-cross.patch" + file://allow-cross.patch \ + file://rascal-conf.patch" DEPENDS = "libpcre" @@ -18,7 +19,7 @@ do_configure() { --pid-path=${localstatedir}/run/nginx.pid \ --lock-path=${localstatedir}/lock/nginx.lock \ --error-log-path=${localstatedir}/log/nginx/error \ - --conf-path=${sysconfdir}/nginx.conf \ + --conf-path=${sysconfdir}/nginx/nginx.conf \ --http-log-path=${localstatedir}/log/nginx/access \ --http-client-body-temp-path=${localstatedir}/lib/nginx/client_body_temp \ --http-proxy-temp-path=${localstatedir}/lib/nginx/proxy_temp \ diff --git a/recipes/python/python-flask_0.6.1.bb b/recipes/python/python-flask_0.6.1.bb index ef3401e757..1fbfa4778b 100644 --- a/recipes/python/python-flask_0.6.1.bb +++ b/recipes/python/python-flask_0.6.1.bb @@ -11,7 +11,7 @@ S = "${WORKDIR}/git" SRCREV = "0.6.1" SRC_URI = "git://github.com/mitsuhiko/flask.git;protocol=git;branch=master" -inherit distutils +inherit setuptools RDEPENDS_${PN} = "\ python-core \ diff --git a/recipes/python/python-jinja2_2.5.5.bb b/recipes/python/python-jinja2_2.5.5.bb index 62276d896b..5412051a43 100644 --- a/recipes/python/python-jinja2_2.5.5.bb +++ b/recipes/python/python-jinja2_2.5.5.bb @@ -11,7 +11,7 @@ S = "${WORKDIR}/git" SRCREV = "2.5.5" SRC_URI = "git://github.com/mitsuhiko/jinja2.git;protocol=git;branch=master" -inherit distutils +inherit setuptools RDEPENDS_${PN} = "\ python-core \ diff --git a/recipes/python/python-rascal_0.1.bb b/recipes/python/python-rascal_0.1.bb index 88139f2d14..4e7f73229f 100644 --- a/recipes/python/python-rascal_0.1.bb +++ b/recipes/python/python-rascal_0.1.bb @@ -8,7 +8,7 @@ PR = "r0" S = "${WORKDIR}/git" -SRCREV = "0.1" +SRCREV = "${AUTOREV}" SRC_URI = "git://github.com/rascalmicro/hardware-api.git;protocol=git;branch=master" inherit distutils @@ -16,6 +16,3 @@ inherit distutils RDEPENDS_${PN} = "\ python-core \ " - -SRC_URI[md5sum] = "35726c7d0708a244a39faf93f82c3a24" -SRC_URI[sha256sum] = "ce3c88135d1c15a5d1e0f6dae6e171e77b15ec6ac6a3d6ad5a6ca37fcd2d0a8d" diff --git a/recipes/python/python-werkzeug_0.6.2.bb b/recipes/python/python-werkzeug_0.6.2.bb index 26ed2cf364..d1f114592c 100644 --- a/recipes/python/python-werkzeug_0.6.2.bb +++ b/recipes/python/python-werkzeug_0.6.2.bb @@ -11,7 +11,7 @@ S = "${WORKDIR}/git" SRCREV = "0.6.2" SRC_URI = "git://github.com/mitsuhiko/werkzeug.git;protocol=git;branch=master" -inherit distutils +inherit setuptools RDEPENDS_${PN} = "\ python-core \ From a5ae6cc36cce5506279c6a243df90572dd131b54 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Tue, 17 May 2011 17:13:14 -0400 Subject: [PATCH 032/509] Remove executable flag from gitconfig file --- recipes/git/git_1.7.3.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/git/git_1.7.3.5.bb b/recipes/git/git_1.7.3.5.bb index 7d9f327635..4c4a922019 100644 --- a/recipes/git/git_1.7.3.5.bb +++ b/recipes/git/git_1.7.3.5.bb @@ -28,7 +28,7 @@ do_install_append() { done rm ${D}${libexecdir}/git-core/git && ln -sf ${bindir}/git ${D}${libexecdir}/git-core/git install -m 0755 -d ${D}${sysconfdir} - install -m 0755 ${WORKDIR}/gitconfig ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/gitconfig ${D}${sysconfdir} } FILES_${PN}-dbg += "${libexecdir}/git-core/.debug" From 512cdd486a32e9169d4f50f29e1f3a9970128852 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Tue, 17 May 2011 17:14:01 -0400 Subject: [PATCH 033/509] Add default uWSGI config file --- recipes/uwsgi/files/uwsgi.ini | 8 ++++++++ recipes/uwsgi/uwsgi_0.9.7.2.bb | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 recipes/uwsgi/files/uwsgi.ini diff --git a/recipes/uwsgi/files/uwsgi.ini b/recipes/uwsgi/files/uwsgi.ini new file mode 100644 index 0000000000..4d808708a3 --- /dev/null +++ b/recipes/uwsgi/files/uwsgi.ini @@ -0,0 +1,8 @@ +[uwsgi] +socket = 127.0.0.1:5000 +master = true +daemonize = /var/log/uwsgi.log +processes = 1 +env = PYTHONPATH=$PYTHONPATH:/var/www +module = demo +callable = app diff --git a/recipes/uwsgi/uwsgi_0.9.7.2.bb b/recipes/uwsgi/uwsgi_0.9.7.2.bb index b70a55f184..34d5255e7a 100644 --- a/recipes/uwsgi/uwsgi_0.9.7.2.bb +++ b/recipes/uwsgi/uwsgi_0.9.7.2.bb @@ -6,7 +6,9 @@ LICENSE = "GPLv2" SRCNAME = "uwsgi" PR = "r0" -SRC_URI = "http://projects.unbit.it/downloads/uwsgi-${PV}.tar.gz" +SRC_URI = "http://projects.unbit.it/downloads/uwsgi-${PV}.tar.gz \ + file://uwsgi.ini" + S = "${WORKDIR}/${PN}-${PV}" DEPENDS = "libxml2" @@ -30,6 +32,7 @@ do_install() { echo ${S} install -m 0755 -d ${D}${sbindir} install -m 0755 ${S}/uwsgi ${D}${sbindir} + install -m 0644 ${WORKDIR}/uwsgi.ini ${D}${sysconfdir} } SRC_URI[md5sum] = "9bdf8ed5c8b32ace085dbd0f9488f880" From 27cc79413283c22e7ba0aac7c84d6bd4d2dda2a7 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Tue, 17 May 2011 17:14:39 -0400 Subject: [PATCH 034/509] Make Nginx and uWSGI start at boot --- recipes/initscripts/files/rascal-webserver.sh | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/recipes/initscripts/files/rascal-webserver.sh b/recipes/initscripts/files/rascal-webserver.sh index 83bc53c29d..92dd32f77c 100644 --- a/recipes/initscripts/files/rascal-webserver.sh +++ b/recipes/initscripts/files/rascal-webserver.sh @@ -1,35 +1,36 @@ #!/bin/sh -PATH=/sbin:/bin:/usr/bin -BASE_DIR="/home/root/helloworld" -WEBSERVER="/home/root/rascal/bin/paster" -WEBSERVER_CONFIG="/home/root/helloworld/development.ini" +PATH=/sbin:/bin:/usr/bin:/usr/sbin +WEBSERVER="/usr/sbin/nginx" +WEBSERVER_CONFIG="/etc/nginx/nginx.conf" +APPSERVER="/usr/sbin/uwsgi" +APPSERVER_CONFIG="/etc/uwsgi.ini" -test -d $BASE_DIR || exit 0 test -f $WEBSERVER || exit 0 test -f $WEBSERVER_CONFIG || exit 0 - -cd $BASE_DIR +test -f $APPSERVER || exit 0 +test -f $APPSERVER_CONFIG || exit 0 case "$1" in start) echo "Starting Rascal webserver..." - $WEBSERVER serve --daemon $WEBSERVER_CONFIG start + $WEBSERVER -c $WEBSERVER_CONFIG + $APPSERVER --ini $APPSERVER_CONFIG echo "done" ;; -restart) - echo "Restarting Rascal webserver..." - $WEBSERVER serve --daemon $WEBSERVER_CONFIG restart +reload) + echo "Reloading Rascal webserver..." + $WEBSERVER -c $WEBSERVER_CONFIG -s reload echo "done" ;; stop) echo "Stopping Rascal webserver..." - $WEBSERVER serve --daemon $WEBSERVER_CONFIG stop + $WEBSERVER -s stop echo "done" ;; *) echo "Bad argument supplied to rascal-webserver script." - echo "Usage: /etc/init.d/rascal-webserver {start|stop|restart}" + echo "Usage: /etc/init.d/rascal-webserver {start|stop|reload}" exit 1 esac From 1052f867a663578c07a3f07f9b211eeb3cf46c81 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Tue, 17 May 2011 17:15:46 -0400 Subject: [PATCH 035/509] Remove already-implied openssh-keygen package --- recipes/images/rascal-image.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 2c5dd149c5..5eb269bb6d 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -16,7 +16,6 @@ IMAGE_INSTALL += "\ nginx \ ntpdate \ openssh \ - openssh-keygen \ python \ python-daemon \ python-flask \ From 8da7e5e66db1211ace6ad45a9ae19d5ba197b07f Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Tue, 17 May 2011 18:39:25 -0400 Subject: [PATCH 036/509] Fix uWSGI conf file and add control-freak recipe --- recipes/control-freak/control-freak_0.1.bb | 23 ++++++++++++++++++++++ recipes/images/rascal-image.bb | 1 + recipes/uwsgi/uwsgi_0.9.7.2.bb | 1 + 3 files changed, 25 insertions(+) create mode 100644 recipes/control-freak/control-freak_0.1.bb diff --git a/recipes/control-freak/control-freak_0.1.bb b/recipes/control-freak/control-freak_0.1.bb new file mode 100644 index 0000000000..60da8ec3f0 --- /dev/null +++ b/recipes/control-freak/control-freak_0.1.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Demonstration web interface for the Rascal, a small computer for art and science" +HOMEPAGE = "http://rascalmicro.com" +LICENSE = "GPLv3" +SRCNAME = "control-freak" +PR = "r0" + +S = "${WORKDIR}/git" + +SRCREV = "${AUTOREV}" +SRC_URI = "git://github.com/rascalmicro/control-freak.git;protocol=git;branch=master" + +FILES_${PN} = "/var" + +do_configure () { +} + +do_compile () { +} + +do_install () { + install -d ${D}/var/www + cp -r ${S}/* ${D}/var/www/ +} diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 5eb269bb6d..2ec8f4a63a 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -2,6 +2,7 @@ require recipes/images/minimal-image.bb IMAGE_INSTALL += "\ binutils \ + control-freak \ cpp \ cpp-symlinks \ gcc \ diff --git a/recipes/uwsgi/uwsgi_0.9.7.2.bb b/recipes/uwsgi/uwsgi_0.9.7.2.bb index 34d5255e7a..50c01f747d 100644 --- a/recipes/uwsgi/uwsgi_0.9.7.2.bb +++ b/recipes/uwsgi/uwsgi_0.9.7.2.bb @@ -32,6 +32,7 @@ do_install() { echo ${S} install -m 0755 -d ${D}${sbindir} install -m 0755 ${S}/uwsgi ${D}${sbindir} + install -m 0755 -d ${D}${sysconfdir} install -m 0644 ${WORKDIR}/uwsgi.ini ${D}${sysconfdir} } From 2ea0320e99b1b42876d0ceb2bc3d77ede318fda6 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Thu, 19 May 2011 15:06:21 -0400 Subject: [PATCH 037/509] Add recipe for Scott Ellis' command-line tool for BlinkM --- recipes/blinkm/blinkm_0.1.bb | 25 +++++++++++++++++++++++ recipes/blinkm/rascal-use-i2c-bus-0.patch | 13 ++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 recipes/blinkm/blinkm_0.1.bb create mode 100644 recipes/blinkm/rascal-use-i2c-bus-0.patch diff --git a/recipes/blinkm/blinkm_0.1.bb b/recipes/blinkm/blinkm_0.1.bb new file mode 100644 index 0000000000..3cf5fcbc3d --- /dev/null +++ b/recipes/blinkm/blinkm_0.1.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Command-line tool for controlling blinkM leds over an I2C bus" +HOMEPAGE = "https://github.com/scottellis/overo-blinkm" +PRIORITY = "optional" +LICENSE = "BSD" +PR = "r0" + +S = "${WORKDIR}/git" + +SRCREV = "71fbc4860b40548acd31008db33ff2a57d2a333a" +SRC_URI = "git://github.com/scottellis/overo-blinkm.git;protocol=git \ + file://rascal-use-i2c-bus-0.patch" + +do_compile () { + ${CC} ${LDFLAGS} -o blinkm *.c +} + +do_install () { + install -d ${D}${bindir}/ + install -m 0755 ${S}/blinkm ${D}${bindir}/ +} + +PACKAGES = "${PN}" +FILES_${PN}-dbg = "${bindir}/*" +FILES_${PN} = "${bindir}/*" +FILES_${PN} += "${sysconfdir}/*" diff --git a/recipes/blinkm/rascal-use-i2c-bus-0.patch b/recipes/blinkm/rascal-use-i2c-bus-0.patch new file mode 100644 index 0000000000..7db59c507b --- /dev/null +++ b/recipes/blinkm/rascal-use-i2c-bus-0.patch @@ -0,0 +1,13 @@ +diff --git a/i2c_functions.c b/i2c_functions.c +index 68ef17a..fe2ffff 100644 +--- a/i2c_functions.c ++++ b/i2c_functions.c +@@ -40,7 +40,7 @@ + #include + + +-static char _i2c_bus[] = "/dev/i2c-3"; ++static char _i2c_bus[] = "/dev/i2c-0"; + + + /* some local functions */ From e95b3009dd7023d5f3c82cf87d4b46d521fab4c4 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Sat, 4 Jun 2011 10:50:57 -0400 Subject: [PATCH 038/509] Add avahi, while removing X11 and Tk libs, which were also pulled in by dbus, git and python --- build/conf/local.conf | 2 ++ recipes/avahi/avahi-python_0.6.21.bb | 2 +- recipes/avahi/avahi.inc | 15 ++------------- recipes/avahi/avahi_0.6.25.bb | 1 + recipes/dbus/dbus.inc | 4 ++-- recipes/git/git_1.7.3.5.bb | 14 +++++++------- recipes/images/rascal-image.bb | 1 + 7 files changed, 16 insertions(+), 23 deletions(-) diff --git a/build/conf/local.conf b/build/conf/local.conf index f8dd939d5d..0345fcdc68 100644 --- a/build/conf/local.conf +++ b/build/conf/local.conf @@ -36,3 +36,5 @@ INHERIT += "rm_work" # Cache values of all SRCREV variables first time it runs BB_SRCREV_POLICY = "cache" + +DISTRO_FEATURES_local = "largefile ipv4 ipv6 nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci pam thumb-interwork thumb-interwork" diff --git a/recipes/avahi/avahi-python_0.6.21.bb b/recipes/avahi/avahi-python_0.6.21.bb index f9b2ce41bc..1d05e1f6d8 100644 --- a/recipes/avahi/avahi-python_0.6.21.bb +++ b/recipes/avahi/avahi-python_0.6.21.bb @@ -5,7 +5,7 @@ PR = "${INC_PR}.0" # FIXME: without --enable-gtk, avahi-discover (pygtk) won't be built FILES_avahi-discover = "" -PROVIDES = "avahi" +PROVIDES = "python-avahi" DEPENDS += "python-native" SRC_URI += "file://dbus-pre-1.1.1-support.patch \ diff --git a/recipes/avahi/avahi.inc b/recipes/avahi/avahi.inc index f4dff0ac96..add1897bd1 100644 --- a/recipes/avahi/avahi.inc +++ b/recipes/avahi/avahi.inc @@ -19,8 +19,7 @@ inherit autotools pkgconfig update-rc.d python-dir # anything but avahi-daemon and avahi-autoipd # TODO: build and enable all the extra stuff avahi offers -EXTRA_OECONF = "--with-distro=debian --disable-stack-protector --disable-nls --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}" -AVAHI_PYTHON ?= "--enable-python" +EXTRA_OECONF = "--with-distro=debian --disable-stack-protector --disable-nls --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4" AVAHI_GTK ?= "-disable-gtk" LDFLAGS_append_libc-uclibc = " -lintl" @@ -31,7 +30,7 @@ do_configure_prepend() { } -PACKAGES =+ "python-avahi avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils" +PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils" FILES_libavahi-common = "${libdir}/libavahi-common.so.*" FILES_libavahi-core = "${libdir}/libavahi-core.so.*" @@ -45,7 +44,6 @@ FILES_avahi-daemon = "${sbindir}/avahi-daemon \ ${datadir}/avahi/avahi-service.dtd \ ${datadir}/avahi/service-types" FILES_libavahi-client = "${libdir}/libavahi-client.so.*" -FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*" FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ ${sysconfdir}/avahi/avahi-dnsconfd.action \ ${sysconfdir}/init.d/avahi-dnsconfd" @@ -55,17 +53,8 @@ FILES_avahi-utils = "${bindir}/avahi-*" FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ ${sysconfdir}/avahi/avahi-autoipd.action \ ${sysconfdir}/udhcpc.d/*avahi-autoipd" -FILES_python-avahi = "${PYTHON_SITEPACKAGES_DIR}/avahi/*" -FILES_avahi-discover = "${bindir}/avahi-discover \ - ${datadir}/applications/avahi-discover.desktop \ - ${datadir}/avahi/interfaces/avahi-discover.glade" -FILES_avahi-discover-standalone = "${bindir}/avahi-discover-standalone \ - ${datadir}/avahi/interfaces/avahi-discover.glade" CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" -RDEPENDS_avahi-discover = "python-avahi python-pygtk" -RDEPENDS_python-avahi = "python-dbus" - INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" diff --git a/recipes/avahi/avahi_0.6.25.bb b/recipes/avahi/avahi_0.6.25.bb index 4b598a0313..74e69d093d 100644 --- a/recipes/avahi/avahi_0.6.25.bb +++ b/recipes/avahi/avahi_0.6.25.bb @@ -2,6 +2,7 @@ require avahi.inc PR = "${INC_PR}.0" +PROVIDES = "avahi" DEPENDS += "intltool-native" PACKAGES =+ "libavahi-gobject" diff --git a/recipes/dbus/dbus.inc b/recipes/dbus/dbus.inc index 86dc62b945..7360c37fcf 100644 --- a/recipes/dbus/dbus.inc +++ b/recipes/dbus/dbus.inc @@ -2,7 +2,7 @@ DESCRIPTION = "A message bus system for inter-process communication" HOMEPAGE = "http://dbus.freedesktop.org" SECTION = "base" LICENSE = "GPLv2+ AFLv2.1" -DEPENDS = "expat glib-2.0 virtual/libintl libsm libice virtual/libx11" +DEPENDS = "expat glib-2.0 virtual/libintl" INC_PR = "r20" @@ -19,7 +19,7 @@ S = "${WORKDIR}/dbus-${PV}" inherit autotools pkgconfig update-rc.d gettext -EXTRA_OECONF_X = "--with-x" +EXTRA_OECONF_X = "--without-x" EXTRA_OECONF = "\ --disable-qt \ diff --git a/recipes/git/git_1.7.3.5.bb b/recipes/git/git_1.7.3.5.bb index 4c4a922019..0ecf15bd10 100644 --- a/recipes/git/git_1.7.3.5.bb +++ b/recipes/git/git_1.7.3.5.bb @@ -76,13 +76,13 @@ FILES_${PN}-large += " \ RDEPENDS_${PN}-large = "${PN}" # git-tk package with gitk and git-gui -PACKAGES =+ "${PN}-tk" -RDEPENDS_${PN}-tk = "${PN} tk tcl" -EXTRA_OEMAKE = "TCL_PATH=${STAGING_BINDIR_CROSS}/tclsh" -FILES_${PN}-tk = " \ - ${bindir}/gitk \ - ${datadir}/gitk \ -" +# PACKAGES =+ "${PN}-tk" +# RDEPENDS_${PN}-tk = "${PN} tk tcl" +# EXTRA_OEMAKE = "TCL_PATH=${STAGING_BINDIR_CROSS}/tclsh" +# FILES_${PN}-tk = " \ +# ${bindir}/gitk \ +# ${datadir}/gitk \ +#" # git gui does not start at all at this time #FILES_${PN}-tk += " \ # ${libexecdir}/git-core/git-gui \ diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 2ec8f4a63a..10eb1c5897 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -1,6 +1,7 @@ require recipes/images/minimal-image.bb IMAGE_INSTALL += "\ + avahi-daemon \ binutils \ control-freak \ cpp \ From 75b5aa8d60b24171201a1801a7cc0505cb28bbef Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Sat, 4 Jun 2011 12:37:51 -0400 Subject: [PATCH 039/509] Add curl, htop, iotop, mtr, and sysstat --- recipes/images/rascal-image.bb | 5 +++++ recipes/mtr/{mtr_0.65.bb => mtr_0.80.bb} | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) rename recipes/mtr/{mtr_0.65.bb => mtr_0.80.bb} (69%) diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 10eb1c5897..691f97a5d3 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -6,14 +6,18 @@ IMAGE_INSTALL += "\ control-freak \ cpp \ cpp-symlinks \ + curl \ gcc \ gcc-symlinks \ git \ + htop \ i2c-tools \ + iotop \ iperf \ libgcc-dev \ libxml2 \ make \ + mtr \ nano \ nginx \ ntpdate \ @@ -28,6 +32,7 @@ IMAGE_INSTALL += "\ python-rascal \ python-werkzeug \ ruby \ + sysstat \ usbutils \ usb-gadget-mode \ uwsgi \ diff --git a/recipes/mtr/mtr_0.65.bb b/recipes/mtr/mtr_0.80.bb similarity index 69% rename from recipes/mtr/mtr_0.65.bb rename to recipes/mtr/mtr_0.80.bb index d206deef8c..e19509c0df 100644 --- a/recipes/mtr/mtr_0.65.bb +++ b/recipes/mtr/mtr_0.80.bb @@ -10,5 +10,6 @@ EXTRA_OECONF = "--without-gtk" do_configure() { oe_runconf } -SRC_URI[md5sum] = "32de3cb8f0763e352124ff4fd74690ab" -SRC_URI[sha256sum] = "82da36fd013f33237a26f1a291e21fc041ebfeac90177a82cb8862732d824bc6" + +SRC_URI[md5sum] = "fa68528eaec1757f52bacf9fea8c68a9" +SRC_URI[sha256sum] = "76bbdd97faf3b805933a50858549ddba895911d6891c6cc51db472567cff0ec0" From 8998353df8a4639f202cd9cc6bfc688afdd3e2b8 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Thu, 9 Jun 2011 14:03:55 -0700 Subject: [PATCH 040/509] Made init script attempt to stop and restart uWSGI correctly --- recipes/initscripts/files/rascal-webserver.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/initscripts/files/rascal-webserver.sh b/recipes/initscripts/files/rascal-webserver.sh index 92dd32f77c..fac4f68c06 100644 --- a/recipes/initscripts/files/rascal-webserver.sh +++ b/recipes/initscripts/files/rascal-webserver.sh @@ -18,14 +18,16 @@ start) $APPSERVER --ini $APPSERVER_CONFIG echo "done" ;; -reload) +reload|restart) echo "Reloading Rascal webserver..." $WEBSERVER -c $WEBSERVER_CONFIG -s reload + touch /tmp/uwsgi.reload echo "done" ;; stop) echo "Stopping Rascal webserver..." $WEBSERVER -s stop + ps | grep uwsgi | awk '{print $1}'| xargs kill -9 echo "done" ;; *) From 3d6fecd4b97a6a8b3bf6a6833bbf4d740df52762 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Mon, 13 Jun 2011 13:35:58 -0400 Subject: [PATCH 041/509] Add new ack recipe, and add Perl to rascal-image --- recipes/ack/ack_1.94.bb | 16 ++++++++++++++++ recipes/images/rascal-image.bb | 3 +++ 2 files changed, 19 insertions(+) create mode 100644 recipes/ack/ack_1.94.bb diff --git a/recipes/ack/ack_1.94.bb b/recipes/ack/ack_1.94.bb new file mode 100644 index 0000000000..f3f4133cbf --- /dev/null +++ b/recipes/ack/ack_1.94.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Ack is a tool like grep, designed for programmers with large trees of heterogeneous source code." +HOMEPAGE = "http://betterthangrep.com" +PRIORITY = "optional" +LICENSE = "Artistic License 2.0" + +RDEPENDS = "perl perl-modules" +PR = "r0" + +SRCREV = "39cd1f31cc379b2df4b63ca6564c80b6b4caa929" +SRC_URI = "git://github.com/petdance/ack.git;protocol=git" +S = "${WORKDIR}/git" + +do_install () { + install -d ${D}${bindir}/ + install -m 0755 ${S}/ack ${D}${bindir}/ +} diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 691f97a5d3..6a55d8540f 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -1,6 +1,7 @@ require recipes/images/minimal-image.bb IMAGE_INSTALL += "\ + ack \ avahi-daemon \ binutils \ control-freak \ @@ -22,6 +23,8 @@ IMAGE_INSTALL += "\ nginx \ ntpdate \ openssh \ + perl \ + perl-modules \ python \ python-daemon \ python-flask \ From ced4145b6f2c4abaad21ad9c670e2e9acf15b721 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Tue, 14 Jun 2011 11:17:59 -0400 Subject: [PATCH 042/509] Rename hardware-api to pytronics --- .../python/{python-rascal_0.1.bb => python-pytronics_0.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename recipes/python/{python-rascal_0.1.bb => python-pytronics_0.1.bb} (79%) diff --git a/recipes/python/python-rascal_0.1.bb b/recipes/python/python-pytronics_0.1.bb similarity index 79% rename from recipes/python/python-rascal_0.1.bb rename to recipes/python/python-pytronics_0.1.bb index 4e7f73229f..3ecf2e2c00 100644 --- a/recipes/python/python-rascal_0.1.bb +++ b/recipes/python/python-pytronics_0.1.bb @@ -9,7 +9,7 @@ PR = "r0" S = "${WORKDIR}/git" SRCREV = "${AUTOREV}" -SRC_URI = "git://github.com/rascalmicro/hardware-api.git;protocol=git;branch=master" +SRC_URI = "git://github.com/rascalmicro/pytronics.git;protocol=git;branch=master" inherit distutils From 74b1afbf059511bdcb2b99d861e9def37af612f2 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Thu, 30 Jun 2011 16:50:07 -0700 Subject: [PATCH 043/509] Make Linux read pwhash from command line options passed from U-boot, clean up. --- recipes/initscripts/files/rascal-set-hash.sh | 26 ++++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/recipes/initscripts/files/rascal-set-hash.sh b/recipes/initscripts/files/rascal-set-hash.sh index 4ee0b4d3d2..6c84445c9b 100644 --- a/recipes/initscripts/files/rascal-set-hash.sh +++ b/recipes/initscripts/files/rascal-set-hash.sh @@ -3,7 +3,8 @@ # void log_msg(char*) log_msg() { - /usr/bin/logger -s $1 + local MSG=$1 + /usr/bin/logger -s -- $MSG } # @@ -39,7 +40,12 @@ log_msg "Initializing Rascal" # PASSWD_FILE=/etc/passwd IS_BLANK=0 -DEF_PW_HASH=XnugPeUjnLedI +BACKUP_PW_HASH=LosSvlkIAcGLk # "rascalmicro" +PW_HASH="`sed -ne 's/^.* pwhash=\(.\{13\}\)/\1/p' /proc/cmdline`" + +if [ -z "$PW_HASH" ]; then + PW_HASH=$BACKUP_PW_HASH +fi while IFS=: read -r f1 f2 f3 f4 f5 f6 f7 do @@ -52,10 +58,20 @@ do done < $PASSWD_FILE if [ $IS_BLANK != 0 ]; then - log_msg "Root's password was blank. It is now set to the default password for this board." - change_pw root $DEF_PW_HASH + log_msg "Root's password was blank." + change_pw root $PW_HASH + if [ "$PW_HASH" == "$BACKUP_PW_HASH" ]; then + log_msg "The root hash was not found in kernel command line." + log_msg "A hardcoded default hash has been used instead." + log_msg "This is *bad*. You should reset the root password immediately." + else + log_msg "The root password is now set to the default for this board." + log_msg "Ask milo@rascalmicro.com for the password if you've lost it." + fi + log_msg "For reference, the hash used is $PW_HASH." else - log_msg "Root's password is not blank -- good job." + log_msg "Root's password is not blank; good job." + log_msg "You are part of the solution." fi exit 0 From 46a64de19d91a9324d53c0183f5215d3189258e4 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Thu, 30 Jun 2011 16:51:22 -0700 Subject: [PATCH 044/509] Add explanation of sed expression for finding hostname. --- recipes/initscripts/files/rascal-hostname.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/recipes/initscripts/files/rascal-hostname.sh b/recipes/initscripts/files/rascal-hostname.sh index 25d7e3a89b..f13d703f1f 100644 --- a/recipes/initscripts/files/rascal-hostname.sh +++ b/recipes/initscripts/files/rascal-hostname.sh @@ -1,5 +1,18 @@ #!/bin/sh +# Explanation of the sed command below +# +# sed -ne s/thing1/thing2/p /path/to/file means: +# "Search the file for thing1, replace it with thing2, +# and only print the lines that you changed." +# [^:]* means zero or more characters from the set "not colons" +# \(something\) means "save this for later" +# \1 means "retrieve the first thing you saved" +# +# Overall, the command means: +# "Search /proc/cmdline for 5 colons, +# and print what's between colons 4 and 5." + HOSTNAME="`sed -ne 's/^[^:]*:[^:]*:[^:]*:[^:]*:\([^:]*\):.*/\1/p' /proc/cmdline`" if [ -z "$HOSTNAME" ] From 31fcfac66805b8807baf97461b08dd593a8af69a Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 31 Aug 2011 08:43:17 -0400 Subject: [PATCH 045/509] Add Flask and uWSGI recipes --- recipes/python/python-flask_0.7.2.bb | 25 +++++++++++++++++ recipes/uwsgi/uwsgi_0.9.8.bb | 40 +++++++++++++++++++++++++++ recipes/uwsgi/uwsgi_9cf01578184a.bb | 41 ++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 recipes/python/python-flask_0.7.2.bb create mode 100644 recipes/uwsgi/uwsgi_0.9.8.bb create mode 100644 recipes/uwsgi/uwsgi_9cf01578184a.bb diff --git a/recipes/python/python-flask_0.7.2.bb b/recipes/python/python-flask_0.7.2.bb new file mode 100644 index 0000000000..5e9184e714 --- /dev/null +++ b/recipes/python/python-flask_0.7.2.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Web microframework for Python based on Werkzeug, Jinja 2 and good intentions" +HOMEPAGE = "http://flask.pocoo.org/" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "BSD" +SRCNAME = "flask" +PR = "r0" + +S = "${WORKDIR}/git" + +SRCREV = "0.7.2" +SRC_URI = "git://github.com/mitsuhiko/flask.git;protocol=git;branch=master" + +inherit setuptools + +RDEPENDS_${PN} = "\ + python-core \ + python-jinja2 \ + python-werkzeug \ +" + +do_install_append() { + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py +} diff --git a/recipes/uwsgi/uwsgi_0.9.8.bb b/recipes/uwsgi/uwsgi_0.9.8.bb new file mode 100644 index 0000000000..0859602e62 --- /dev/null +++ b/recipes/uwsgi/uwsgi_0.9.8.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "uWSGI is a WSGI web server for Python web applications" +HOMEPAGE = "http://projects.unbit.it/uwsgi/wiki" +SECTION = "net" +PRIORITY = "optional" +LICENSE = "GPLv2" +SRCNAME = "uwsgi" +PR = "r0" + +SRC_URI = "http://projects.unbit.it/downloads/uwsgi-${PV}.tar.gz \ + file://uwsgi.ini" + +S = "${WORKDIR}/${PN}-${PV}" + +DEPENDS = "libxml2" + +RDEPENDS_${PN} = "\ + python-core \ +" + +do_compile_prepend() { + export BUILD_SYS=${BUILD_SYS} + export HOST_SYS=${HOST_SYS} + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} +} + +do_compile() { + python uwsgiconfig.py --build +} + +do_install() { + echo ${S} + install -m 0755 -d ${D}${sbindir} + install -m 0755 ${S}/uwsgi ${D}${sbindir} + install -m 0755 -d ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/uwsgi.ini ${D}${sysconfdir} +} + +SRC_URI[md5sum] = "bef44af218b110f58a945dc922b62731" +SRC_URI[sha256sum] = "63a33006ea93f87aa24aaffda9e8b3bfc2d598b1d7bc4d9cd13c587f25500899" diff --git a/recipes/uwsgi/uwsgi_9cf01578184a.bb b/recipes/uwsgi/uwsgi_9cf01578184a.bb new file mode 100644 index 0000000000..2fdffe6cda --- /dev/null +++ b/recipes/uwsgi/uwsgi_9cf01578184a.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "uWSGI is a WSGI web server for Python web applications" +HOMEPAGE = "http://projects.unbit.it/uwsgi/wiki" +SECTION = "net" +PRIORITY = "optional" +LICENSE = "GPLv2" +SRCNAME = "uwsgi" +PR = "r0" + +SRCREV = "9cf01578184a" +SRC_URI = "hg://projects.unbit.it/hg/uwsgi;module=${PN};rev=${SRCREV} \ + file://uwsgi.ini" + +S = "${WORKDIR}/${PN}" + +DEPENDS = "libxml2" + +RDEPENDS_${PN} = "\ + python-core \ +" + +do_compile_prepend() { + export BUILD_SYS=${BUILD_SYS} + export HOST_SYS=${HOST_SYS} + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} +} + +do_compile() { + python uwsgiconfig.py --build +} + +do_install() { + echo ${S} + install -m 0755 -d ${D}${sbindir} + install -m 0755 ${S}/uwsgi ${D}${sbindir} + install -m 0755 -d ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/uwsgi.ini ${D}${sysconfdir} +} + +SRC_URI[md5sum] = "bef44af218b110f58a945dc922b62731" +SRC_URI[sha256sum] = "63a33006ea93f87aa24aaffda9e8b3bfc2d598b1d7bc4d9cd13c587f25500899" From 9b1888de1e6759862689bd7b188da34df192850d Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 7 Sep 2011 12:06:20 -0400 Subject: [PATCH 046/509] Finish rename to Pytronics --- recipes/images/rascal-image.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 6a55d8540f..32b3cc24b8 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -32,7 +32,7 @@ IMAGE_INSTALL += "\ python-misc \ python-modules \ python-pyserial \ - python-rascal \ + python-pytronics \ python-werkzeug \ ruby \ sysstat \ From 0ee7d671f7bf30e5002650072acc122c5b2632a9 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 7 Sep 2011 12:07:25 -0400 Subject: [PATCH 047/509] Update Nginx conf for new editor and improve logging --- recipes/nginx/files/rascal-conf.patch | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/recipes/nginx/files/rascal-conf.patch b/recipes/nginx/files/rascal-conf.patch index b82827ad43..2f6503f2e6 100644 --- a/recipes/nginx/files/rascal-conf.patch +++ b/recipes/nginx/files/rascal-conf.patch @@ -1,8 +1,8 @@ diff --git a/./conf/nginx.conf b/./conf/rascal-nginx.conf -index 672ce8c..f27efff 100644 +index 672ce8c..83d3f83 100644 --- a/./conf/nginx.conf +++ b/./conf/rascal-nginx.conf -@@ -1,118 +1,33 @@ +@@ -1,118 +1,41 @@ - -#user nobody; worker_processes 1; @@ -36,16 +36,22 @@ index 672ce8c..f27efff 100644 keepalive_timeout 65; - #gzip on; -- ++ log_format comb-with-links '$remote_addr [$time_local] ' ++ '$request => generated $body_bytes_sent bytes in $request_time s ($status)'; + server { listen 80; server_name localhost; ++ access_log /var/log/nginx/access comb-with-links; - #charset koi8-r; -- ++ location ^~ /editor/static/ { ++ root /var/www/; ++ } + - #access_log logs/host.access.log main; + location ^~ /static/ { -+ root /var/www; ++ root /var/www/public/; + } location / { From 8a07b6bb533c390a0ec28654bcbd35758ecaae94 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 7 Sep 2011 12:36:19 -0400 Subject: [PATCH 048/509] More Pytronics renaming --- recipes/python/python-pytronics_0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/python/python-pytronics_0.1.bb b/recipes/python/python-pytronics_0.1.bb index 3ecf2e2c00..8183fc6ce2 100644 --- a/recipes/python/python-pytronics_0.1.bb +++ b/recipes/python/python-pytronics_0.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://rascalmicro.com" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "GPLv3" -SRCNAME = "rascal" +SRCNAME = "pytronics" PR = "r0" S = "${WORKDIR}/git" From d9cc588a7b51ddd286c2b6f43088add4be6abd3f Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 7 Sep 2011 12:53:36 -0400 Subject: [PATCH 049/509] Update webserver boot script --- recipes/initscripts/files/rascal-webserver.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/initscripts/files/rascal-webserver.sh b/recipes/initscripts/files/rascal-webserver.sh index fac4f68c06..0751ff185a 100644 --- a/recipes/initscripts/files/rascal-webserver.sh +++ b/recipes/initscripts/files/rascal-webserver.sh @@ -21,18 +21,18 @@ start) reload|restart) echo "Reloading Rascal webserver..." $WEBSERVER -c $WEBSERVER_CONFIG -s reload - touch /tmp/uwsgi.reload + touch /etc/uwsgi.reload echo "done" ;; stop) echo "Stopping Rascal webserver..." $WEBSERVER -s stop - ps | grep uwsgi | awk '{print $1}'| xargs kill -9 + ps | awk '/uwsgi/ && !/awk/ {print $1}'| xargs kill -9 echo "done" ;; *) - echo "Bad argument supplied to rascal-webserver script." - echo "Usage: /etc/init.d/rascal-webserver {start|stop|reload}" + echo "Bad command passed to Rascal webserver boot script." + echo "Correct usage: /etc/init.d/rascal-webserver.sh {start|stop|reload}" exit 1 esac From c62efbe721eb24f5792adb2996caa51b6293055e Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 7 Sep 2011 12:54:19 -0400 Subject: [PATCH 050/509] Update uWSGI config to work with new editor --- recipes/uwsgi/files/uwsgi.ini | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/uwsgi/files/uwsgi.ini b/recipes/uwsgi/files/uwsgi.ini index 4d808708a3..cb936a7fe0 100644 --- a/recipes/uwsgi/files/uwsgi.ini +++ b/recipes/uwsgi/files/uwsgi.ini @@ -3,6 +3,7 @@ socket = 127.0.0.1:5000 master = true daemonize = /var/log/uwsgi.log processes = 1 -env = PYTHONPATH=$PYTHONPATH:/var/www -module = demo +env = PYTHONPATH=$PYTHONPATH:/var +module = www callable = app +touch-reload = /etc/uwsgi.reload From 98b99392e70a9c86a784fa791b6f16aee8360f49 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 9 Sep 2011 15:52:35 -0400 Subject: [PATCH 051/509] Another pytronics name update --- recipes/initscripts/files/rascal-analogger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/initscripts/files/rascal-analogger.py b/recipes/initscripts/files/rascal-analogger.py index 3fcf886bb7..1eaa8bc316 100644 --- a/recipes/initscripts/files/rascal-analogger.py +++ b/recipes/initscripts/files/rascal-analogger.py @@ -2,7 +2,7 @@ import daemon -from rascal import analogger +from pytronics import analogger with daemon.DaemonContext(): analogger() From 634baacb80bcb5e80cb6afbe89a53bf80c02c9a7 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 16 Sep 2011 14:58:54 -0400 Subject: [PATCH 052/509] Update uWSGI recipe to 0.9.9.2 because Mercurial fetching appeared broken --- .../uwsgi/{uwsgi_9cf01578184a.bb => uwsgi_0.9.9.2.bb} | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) rename recipes/uwsgi/{uwsgi_9cf01578184a.bb => uwsgi_0.9.9.2.bb} (74%) diff --git a/recipes/uwsgi/uwsgi_9cf01578184a.bb b/recipes/uwsgi/uwsgi_0.9.9.2.bb similarity index 74% rename from recipes/uwsgi/uwsgi_9cf01578184a.bb rename to recipes/uwsgi/uwsgi_0.9.9.2.bb index 2fdffe6cda..319ee497ad 100644 --- a/recipes/uwsgi/uwsgi_9cf01578184a.bb +++ b/recipes/uwsgi/uwsgi_0.9.9.2.bb @@ -6,11 +6,10 @@ LICENSE = "GPLv2" SRCNAME = "uwsgi" PR = "r0" -SRCREV = "9cf01578184a" -SRC_URI = "hg://projects.unbit.it/hg/uwsgi;module=${PN};rev=${SRCREV} \ +SRC_URI = "http://projects.unbit.it/downloads/uwsgi-${PV}.tar.gz \ file://uwsgi.ini" -S = "${WORKDIR}/${PN}" +S = "${WORKDIR}/${PN}-${PV}" DEPENDS = "libxml2" @@ -37,5 +36,5 @@ do_install() { install -m 0644 ${WORKDIR}/uwsgi.ini ${D}${sysconfdir} } -SRC_URI[md5sum] = "bef44af218b110f58a945dc922b62731" -SRC_URI[sha256sum] = "63a33006ea93f87aa24aaffda9e8b3bfc2d598b1d7bc4d9cd13c587f25500899" +SRC_URI[md5sum] = "fafecf7dc86a36f003d2fadaa44483f1" +SRC_URI[sha256sum] = "1f9da496dd8556644513208640c302aa38a4fe8cabe476ca3ed0b7c2b5b0ed73" From 622741fd7999d683e9863227fd91cfebac687622 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Mon, 17 Oct 2011 18:32:44 -0400 Subject: [PATCH 053/509] Update uWSGI to use split config files for editor and public apps --- recipes/uwsgi/files/editor.ini | 7 +++++++ recipes/uwsgi/files/public.ini | 7 +++++++ recipes/uwsgi/files/uwsgi.ini | 9 --------- recipes/uwsgi/uwsgi_0.9.9.2.bb | 7 +++++-- 4 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 recipes/uwsgi/files/editor.ini create mode 100644 recipes/uwsgi/files/public.ini delete mode 100644 recipes/uwsgi/files/uwsgi.ini diff --git a/recipes/uwsgi/files/editor.ini b/recipes/uwsgi/files/editor.ini new file mode 100644 index 0000000000..e2369f818c --- /dev/null +++ b/recipes/uwsgi/files/editor.ini @@ -0,0 +1,7 @@ +[uwsgi] +socket = 127.0.0.1:5001 +logto = /var/log/uwsgi/editor.log +processes = 1 +env = PYTHONPATH=$PYTHONPATH:/var/www +module = editor +callable = editor diff --git a/recipes/uwsgi/files/public.ini b/recipes/uwsgi/files/public.ini new file mode 100644 index 0000000000..7e4ef76e9d --- /dev/null +++ b/recipes/uwsgi/files/public.ini @@ -0,0 +1,7 @@ +[uwsgi] +socket = 127.0.0.1:5000 +logto = /var/log/uwsgi/public.log +processes = 1 +env = PYTHONPATH=$PYTHONPATH:/var/www +module = public +callable = public diff --git a/recipes/uwsgi/files/uwsgi.ini b/recipes/uwsgi/files/uwsgi.ini deleted file mode 100644 index cb936a7fe0..0000000000 --- a/recipes/uwsgi/files/uwsgi.ini +++ /dev/null @@ -1,9 +0,0 @@ -[uwsgi] -socket = 127.0.0.1:5000 -master = true -daemonize = /var/log/uwsgi.log -processes = 1 -env = PYTHONPATH=$PYTHONPATH:/var -module = www -callable = app -touch-reload = /etc/uwsgi.reload diff --git a/recipes/uwsgi/uwsgi_0.9.9.2.bb b/recipes/uwsgi/uwsgi_0.9.9.2.bb index 319ee497ad..78563b90ef 100644 --- a/recipes/uwsgi/uwsgi_0.9.9.2.bb +++ b/recipes/uwsgi/uwsgi_0.9.9.2.bb @@ -7,7 +7,8 @@ SRCNAME = "uwsgi" PR = "r0" SRC_URI = "http://projects.unbit.it/downloads/uwsgi-${PV}.tar.gz \ - file://uwsgi.ini" + file://editor.ini \ + file://public.ini" S = "${WORKDIR}/${PN}-${PV}" @@ -33,7 +34,9 @@ do_install() { install -m 0755 -d ${D}${sbindir} install -m 0755 ${S}/uwsgi ${D}${sbindir} install -m 0755 -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/uwsgi.ini ${D}${sysconfdir} + install -m 0755 -d ${D}${sysconfdir}/uwsgi + install -m 0644 ${WORKDIR}/editor.ini ${D}${sysconfdir}/uwsgi + install -m 0644 ${WORKDIR}/public.ini ${D}${sysconfdir}/uwsgi } SRC_URI[md5sum] = "fafecf7dc86a36f003d2fadaa44483f1" From c6c3f24f0c882cdee8cd62e13700b95f5bc4c825 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 19 Oct 2011 15:13:10 -0400 Subject: [PATCH 054/509] Add avahi-autoipd so link-local fallback works --- recipes/images/rascal-image.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 32b3cc24b8..f49e9885d8 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -2,6 +2,7 @@ require recipes/images/minimal-image.bb IMAGE_INSTALL += "\ ack \ + avahi-autoipd \ avahi-daemon \ binutils \ control-freak \ From 1b0bcd907d3e6d29a74f4a679d97885c3e2309b7 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 19 Oct 2011 20:34:33 -0400 Subject: [PATCH 055/509] Add SFTP server to default build --- recipes/images/rascal-image.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index f49e9885d8..8529f6f079 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -24,6 +24,7 @@ IMAGE_INSTALL += "\ nginx \ ntpdate \ openssh \ + openssh-sftp-server \ perl \ perl-modules \ python \ From 31593233aa3c6c2ff3ebf9f37cdd318c0c74beb0 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Tue, 25 Oct 2011 15:13:46 -0400 Subject: [PATCH 056/509] Add rascalmicro.com as mirror for sources --- classes/mirrors.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/mirrors.bbclass b/classes/mirrors.bbclass index 71ee5f63bf..c030fa5f0a 100644 --- a/classes/mirrors.bbclass +++ b/classes/mirrors.bbclass @@ -56,6 +56,8 @@ ftp://.*/.* http://mirrors.openembedded.org/ https?$://.*/.* http://mirrors.openembedded.org/ ftp://.*/.* http://sources.openembedded.org/ https?$://.*/.* http://sources.openembedded.org/ +ftp://.*/.* http://rascalmicro.com/sources/ +https?$://.*/.* http://rascalmicro.com/sources/ } From df929cba9e69064c23ca81fedd08132b303251c6 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Tue, 25 Oct 2011 15:14:48 -0400 Subject: [PATCH 057/509] Remove patch that prevented OpenSSL from building on Ubuntu 11.10 --- recipes/openssl/openssl-native_1.0.0d.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/openssl/openssl-native_1.0.0d.bb b/recipes/openssl/openssl-native_1.0.0d.bb index bbee5f98a6..7dc55181a9 100644 --- a/recipes/openssl/openssl-native_1.0.0d.bb +++ b/recipes/openssl/openssl-native_1.0.0d.bb @@ -17,7 +17,7 @@ export BUILD_OPTIMIZATION = " " SRC_URI += "file://configure-targets.patch \ file://shared-libs.patch \ file://debian.patch \ - file://libdeps-first.patch \ +# file://libdeps-first.patch \ " PARALLEL_MAKE = "" From 21b20931c40a4e5bdeba2a182c6ee1830093b083 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Tue, 25 Oct 2011 15:16:03 -0400 Subject: [PATCH 058/509] Correct hashes because FSF released two identical tarballs without incrementing version, due to some licensing problem --- recipes/binutils/binutils_2.18.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/binutils/binutils_2.18.bb b/recipes/binutils/binutils_2.18.bb index 6ba551ebf0..9d53a3f8d0 100644 --- a/recipes/binutils/binutils_2.18.bb +++ b/recipes/binutils/binutils_2.18.bb @@ -26,5 +26,5 @@ SRC_URI += "\ # ep93xx crunch patches SRC_URI_append_ep9312 = " file://binutils-crunch.patch" -SRC_URI[md5sum] = "9d22ee4dafa3a194457caf4706f9cf01" -SRC_URI[sha256sum] = "487a33a452f0edcf1f8bb8fc23dff5c7a82edec3f3f8b65632b6c945e961ee9b" +SRC_URI[md5sum] = "ccd264a5fa9ed992a21427c69cba91d3" +SRC_URI[sha256sum] = "4515254f55ec3d8c4d91e7633f3850ff28f60652b2d90dc88eef47c74c194bc9" From 51893b7a1a8395f63c7579e2528ac5fc79f87302 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 26 Oct 2011 12:06:15 -0400 Subject: [PATCH 059/509] Add patch from Ulf Samuelsson to make Python 2.6.6 cross-compile on Ubuntu 11.10 (Linux 3.0.0+) --- .../python-2.6.6/07-linux3-regen-fix.patch | 19 +++++++++++++++++++ recipes/python/python_2.6.6.bb | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 recipes/python/python-2.6.6/07-linux3-regen-fix.patch diff --git a/recipes/python/python-2.6.6/07-linux3-regen-fix.patch b/recipes/python/python-2.6.6/07-linux3-regen-fix.patch new file mode 100644 index 0000000000..ef360c5f12 --- /dev/null +++ b/recipes/python/python-2.6.6/07-linux3-regen-fix.patch @@ -0,0 +1,19 @@ +Upstream-Status: Inappropriate [embedded specific] + +Without this patch it calls cross-compiled python if host is running linux-3.0 +python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h +| ./regen: line 3: /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/python-2.6.6-nk2.8/Python-2.6.6/python: cannot execute binary file + +diff -uNr Python-2.6.6.orig//Lib/plat-linux3/regen Python-2.6.6/Lib/plat-linux3/regen +--- Python-2.6.6.orig//Lib/plat-linux3/regen 1970-01-01 01:00:00.000000000 +0100 ++++ Python-2.6.6/Lib/plat-linux3/regen 2001-08-09 14:48:17.000000000 +0200 +@@ -0,0 +1,8 @@ ++#! /bin/sh ++case `uname` in ++Linux*) ;; ++*) echo Probably not on a Linux system 1>&2 ++ exit 1;; ++esac ++set -v ++h2py -i '(u_long)' /usr/include/sys/types.h /usr/include/netinet/in.h /usr/include/dlfcn.h + diff --git a/recipes/python/python_2.6.6.bb b/recipes/python/python_2.6.6.bb index 3c054bbf6b..53362fa9f4 100644 --- a/recipes/python/python_2.6.6.bb +++ b/recipes/python/python_2.6.6.bb @@ -3,7 +3,7 @@ DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl zlib\ ${@base_contains('DISTRO_FEATURES', 'tk', 'tk', '', d)}" DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" # set to .0 on every increase of INC_PR -PR = "${INC_PR}.2" +PR = "${INC_PR}.4" SRC_URI = "\ http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ @@ -14,6 +14,7 @@ SRC_URI = "\ file://04-default-is-optimized.patch \ file://05-enable-ctypes-cross-build.patch \ file://06-ctypes-libffi-fix-configure.patch \ + file://07-linux3-regen-fix.patch \ file://ipv6-cross.patch \ file://python-module-rpath-fix.patch \ file://sitecustomize.py \ From 7a357b1b175ae9ec11192f2c6b7c76dd01883477 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 26 Oct 2011 16:11:58 -0400 Subject: [PATCH 060/509] Make rascalmicro.com opkg feed source --- conf/distro/include/angstrom.inc | 2 +- recipes/angstrom/angstrom-feed-configs.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 5a027232d0..0aa8f60e15 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -63,7 +63,7 @@ THUMB_INTERWORK = "yes" #Use this variable in feeds and other parts that need a URI -ANGSTROM_URI ?= "http://feeds.angstrom-distribution.org" +ANGSTROM_URI ?= "http://rascalmicro.com/packages" #Use this variable to select which recipe you want to use to get feed configs (/etc/ipkg/, /etc/apt/sources.list) # usefull for derivative distros and local testing diff --git a/recipes/angstrom/angstrom-feed-configs.bb b/recipes/angstrom/angstrom-feed-configs.bb index 9d76d51f22..dbaf36ac61 100644 --- a/recipes/angstrom/angstrom-feed-configs.bb +++ b/recipes/angstrom/angstrom-feed-configs.bb @@ -7,7 +7,7 @@ RRECOMMENDS_${PN} += "opkg" PR = "r14" PACKAGE_ARCH = "${MACHINE_ARCH}" -FEED_BASEPATH ?= "unstable/feed/" +FEED_BASEPATH = "beta/" # Note that this may override other definitions of FEED_BASEPATH IWMMXT_FEED = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '',d)}" From 7bf0e1e25c5f6fb4151a0aed334d0527e3439f40 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 26 Oct 2011 16:12:37 -0400 Subject: [PATCH 061/509] Disable timerfd in uWSGI so it compiles --- recipes/uwsgi/files/arm-timer-syscall.patch | 23 +++++++++++++++++++++ recipes/uwsgi/uwsgi_0.9.9.2.bb | 1 + 2 files changed, 24 insertions(+) create mode 100644 recipes/uwsgi/files/arm-timer-syscall.patch diff --git a/recipes/uwsgi/files/arm-timer-syscall.patch b/recipes/uwsgi/files/arm-timer-syscall.patch new file mode 100644 index 0000000000..316c8331f6 --- /dev/null +++ b/recipes/uwsgi/files/arm-timer-syscall.patch @@ -0,0 +1,23 @@ +diff -crB orig-uwsgi-0.9.9.2/event.c uwsgi-0.9.9.2/event.c +*** orig-uwsgi-0.9.9.2/event.c Wed Oct 26 11:59:32 2011 +--- uwsgi-0.9.9.2/event.c Wed Oct 26 12:00:44 2011 +*************** +*** 692,697 **** +--- 692,698 ---- + #elif defined(__i386__) + return syscall(322, __clock_id, __flags); + #endif ++ return -1; + } + + static int timerfd_settime (int __ufd, int __flags, +*************** +*** 702,707 **** +--- 703,709 ---- + #elif defined(__i386__) + return syscall(325, __ufd, __flags, __utmr, __otmr); + #endif ++ return -1; + } + #endif + diff --git a/recipes/uwsgi/uwsgi_0.9.9.2.bb b/recipes/uwsgi/uwsgi_0.9.9.2.bb index 319ee497ad..e4b9164468 100644 --- a/recipes/uwsgi/uwsgi_0.9.9.2.bb +++ b/recipes/uwsgi/uwsgi_0.9.9.2.bb @@ -7,6 +7,7 @@ SRCNAME = "uwsgi" PR = "r0" SRC_URI = "http://projects.unbit.it/downloads/uwsgi-${PV}.tar.gz \ + file://arm-timer-syscall.patch \ file://uwsgi.ini" S = "${WORKDIR}/${PN}-${PV}" From 53347554ee70cd1d16e2789a228d38c09a3819ea Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Thu, 24 Feb 2011 18:04:04 +0000 Subject: [PATCH 062/509] libimobiledevice-1.0.0: depend on libtasn1 * Fixes the following error: | checking for libtasn1... configure: error: Package requirements (libtasn1 >= 1.1) were not met: | | No package 'libtasn1' found | | Consider adjusting the PKG_CONFIG_PATH environment variable if you | installed software in a non-standard prefix. | | Alternatively, you may set the environment variables libtasn1_CFLAGS | and libtasn1_LIBS to avoid the need to call pkg-config. | See the pkg-config man page for more details. | NOTE: package libimobiledevice-1.0.0-r0: task do_configure: Failed Signed-off-by: Andreas Oberritter --- recipes/libgpod/libimobiledevice_1.0.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libgpod/libimobiledevice_1.0.0.bb b/recipes/libgpod/libimobiledevice_1.0.0.bb index 8744874f19..5e988024e4 100644 --- a/recipes/libgpod/libimobiledevice_1.0.0.bb +++ b/recipes/libgpod/libimobiledevice_1.0.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A protocol library to access an iPhone or iPod Touch in Linux" LICENSE = "GPLv2/LGPLv2.1" -DEPENDS = "libplist swig usbmuxd glib-2.0 gnutls libgcrypt" +DEPENDS = "libplist swig usbmuxd glib-2.0 gnutls libgcrypt libtasn1" inherit autotools From 11a35b4ddb7af7af93f03d27ba7e031beac890e6 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 24 Feb 2011 12:37:54 -0700 Subject: [PATCH 063/509] libcanberra: Add gconf to DEPENDS Signed-off-by: Tom Rini --- recipes/pulseaudio/libcanberra_0.12.bb | 4 ++-- recipes/pulseaudio/libcanberra_0.14.bb | 4 ++-- recipes/pulseaudio/libcanberra_0.17.bb | 4 ++-- recipes/pulseaudio/libcanberra_0.26.bb | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/recipes/pulseaudio/libcanberra_0.12.bb b/recipes/pulseaudio/libcanberra_0.12.bb index 017d3a7285..94b767986c 100644 --- a/recipes/pulseaudio/libcanberra_0.12.bb +++ b/recipes/pulseaudio/libcanberra_0.12.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops." LICENSE = "LGPL" -DEPENDS = "gtk+ pulseaudio alsa-lib gstreamer" +DEPENDS = "gtk+ pulseaudio alsa-lib gstreamer gconf" -PR = "r2" +PR = "r3" inherit gnome diff --git a/recipes/pulseaudio/libcanberra_0.14.bb b/recipes/pulseaudio/libcanberra_0.14.bb index 445d3425fd..892e305383 100644 --- a/recipes/pulseaudio/libcanberra_0.14.bb +++ b/recipes/pulseaudio/libcanberra_0.14.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name \ Specifications, for generating event sounds on free desktops." LICENSE = "LGPL" -DEPENDS = "alsa-lib gstreamer gtk+ libvorbis pulseaudio" +DEPENDS = "alsa-lib gstreamer gtk+ libvorbis pulseaudio gconf" SECTION = "libs/multimedia" AUTHOR = "Lennart Poettering" HOMEPAGE = "http://0pointer.de/lennart/projects/libcanberra" -PR = "r2" +PR = "r3" inherit autotools diff --git a/recipes/pulseaudio/libcanberra_0.17.bb b/recipes/pulseaudio/libcanberra_0.17.bb index 52414bffc5..0b735fc525 100644 --- a/recipes/pulseaudio/libcanberra_0.17.bb +++ b/recipes/pulseaudio/libcanberra_0.17.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name \ Specifications, for generating event sounds on free desktops." LICENSE = "LGPL" -DEPENDS = "alsa-lib gstreamer gtk+ libtool libvorbis" +DEPENDS = "alsa-lib gstreamer gtk+ libtool libvorbis gconf" SECTION = "libs/multimedia" AUTHOR = "Lennart Poettering" HOMEPAGE = "http://0pointer.de/lennart/projects/libcanberra" -PR = "r4" +PR = "r5" inherit autotools vala diff --git a/recipes/pulseaudio/libcanberra_0.26.bb b/recipes/pulseaudio/libcanberra_0.26.bb index 29737c6a1b..feac127115 100644 --- a/recipes/pulseaudio/libcanberra_0.26.bb +++ b/recipes/pulseaudio/libcanberra_0.26.bb @@ -1,10 +1,11 @@ DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name \ Specifications, for generating event sounds on free desktops." LICENSE = "LGPL" -DEPENDS = "alsa-lib gstreamer gtk+ libtool libvorbis" +DEPENDS = "alsa-lib gstreamer gtk+ libtool libvorbis gconf" SECTION = "libs/multimedia" AUTHOR = "Lennart Poettering" HOMEPAGE = "http://0pointer.de/lennart/projects/libcanberra" +PR = "r1" inherit autotools vala From 3364608a476439673b540e37581f9be129211e96 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 24 Feb 2011 12:38:46 -0700 Subject: [PATCH 064/509] gnome-doc-utils: Fix xml2po and long path to python Signed-off-by: Tom Rini --- recipes/gnome/gnome-doc-utils.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/gnome/gnome-doc-utils.inc b/recipes/gnome/gnome-doc-utils.inc index b5bbae1529..a1ae11e4b0 100644 --- a/recipes/gnome/gnome-doc-utils.inc +++ b/recipes/gnome/gnome-doc-utils.inc @@ -2,7 +2,7 @@ LICENSE = "GPL LGPL" DEPENDS = "libxml2 libxslt libxslt-native libxml2-native gettext-native" DEPENDS_virtclass-native = "libxslt-native libxml2-native gettext-native" -INC_PR = "r5" +INC_PR = "r6" inherit gnomebase @@ -15,7 +15,7 @@ do_configure_prepend() { do_install_append() { mkdir -p ${D}${datadir}/xml/gnome/xslt/ cp -pPr ${S}/xslt/* ${D}${datadir}/xml/gnome/xslt/ - sed -i "1s:/.*/python:${bindir}/python:" ${D}${bindir}/xml2po + sed -i "1s:.*:#!/usr/bin/env python:" ${D}${bindir}/xml2po } FILES_${PN} += "${datadir}/xml*" From baf72f0d83e052d8224725e6ced47ea85f6e743f Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 24 Feb 2011 12:39:17 -0700 Subject: [PATCH 065/509] gthumb: Fix long path to perl in local intltools scripts Signed-off-by: Tom Rini --- recipes/gthumb/gthumb_2.10.11.bb | 7 ++++++- recipes/gthumb/gthumb_2.6.9.bb | 8 +++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/recipes/gthumb/gthumb_2.10.11.bb b/recipes/gthumb/gthumb_2.10.11.bb index 079e3bd477..42dc02a32b 100644 --- a/recipes/gthumb/gthumb_2.10.11.bb +++ b/recipes/gthumb/gthumb_2.10.11.bb @@ -7,7 +7,7 @@ inherit gnome SRC_URI += "file://pkg-config-hack.patch" -PR = "r2" +PR = "r3" FILES_${PN} += "${libdir}/*.so ${datadir}/gnome* ${datadir}/application-registry/*" FILES_${PN}-dbg += "${libdir}/gthumb/modules/.debug" @@ -16,5 +16,10 @@ do_configure_prepend() { sed -i "s|HACK_STAGING_DIR_HOST|${STAGING_DIR_HOST}|" ${S}/add-include-prefix } +do_configure_append() { + # replace paths to STAGING_BINDIR_NATIVE/perl with ${bindir}/perl + sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${S}/intltool*.in +} + SRC_URI[archive.md5sum] = "498c583800a05593f7493e8f27991c7d" SRC_URI[archive.sha256sum] = "68ac6835afdbe32cba09504b4d61ad4f5d98a97776bfb58698338add56eb520e" diff --git a/recipes/gthumb/gthumb_2.6.9.bb b/recipes/gthumb/gthumb_2.6.9.bb index 3eb0661395..b1963420c5 100644 --- a/recipes/gthumb/gthumb_2.6.9.bb +++ b/recipes/gthumb/gthumb_2.6.9.bb @@ -1,15 +1,17 @@ DESCRIPTION = "gThumb is an image viewer and browser for the GNOME Desktop." LICENSE = "GPL" - DEPENDS = "gtk+ libexif libgnome libgnomeui libgnomeprintui" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" inherit autotools pkgconfig FILES_${PN} += "${datadir}/gnome* ${datadir}/application-registry/*" - - +do_configure_append() { + # replace paths to STAGING_BINDIR_NATIVE/perl with ${bindir}/perl + sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${S}/intltool*.in +} SRC_URI[md5sum] = "2819ec911a7cc4f46b95240b65f2b3e2" SRC_URI[sha256sum] = "b02423f0dc9f82a3e1a56cfd470c1cee5d351654fdc55c1a3cd5cff150828b3c" From af0ad66b7e3f63390209d16d66de8f043cb91626 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 24 Feb 2011 12:39:47 -0700 Subject: [PATCH 066/509] icon-naming-utils-native: Fix long path to perl in icon-name-mapping Signed-off-by: Tom Rini --- .../icon-naming-utils/icon-naming-utils-native_0.8.7.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/icon-naming-utils/icon-naming-utils-native_0.8.7.bb b/recipes/icon-naming-utils/icon-naming-utils-native_0.8.7.bb index eb12bb040f..d2405a998d 100644 --- a/recipes/icon-naming-utils/icon-naming-utils-native_0.8.7.bb +++ b/recipes/icon-naming-utils/icon-naming-utils-native_0.8.7.bb @@ -1,11 +1,16 @@ LICENSE = "GPLv2" DEPENDS = "libxml-simple-perl-native" - +PR = "r1" SRC_URI = "http://tango.freedesktop.org/releases/icon-naming-utils-${PV}.tar.gz" S = "${WORKDIR}/icon-naming-utils-${PV}" inherit autotools native +do_configure_append() { + # replace paths to STAGING_BINDIR_NATIVE/perl with ${bindir}/perl + sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${S}/icon-name-mapping.pl.in +} + SRC_URI[md5sum] = "4abe604721ce2ccb67f451aa7ceb44d6" SRC_URI[sha256sum] = "1cb49ce6a04626939893a447da696f20003903d61bd80c6d74d29dd79ca340d2" From 9401d9375cb2bf3161c22ec8ada194efb1030880 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 24 Feb 2011 12:40:09 -0700 Subject: [PATCH 067/509] loudmouth 1.4.3: Switch from gnutls to openssl This version of loudmouth wants gnutls 1.4 rather than 2.0 so switch to openssl instead. Signed-off-by: Tom Rini --- recipes/loudmouth/loudmouth_1.4.3.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes/loudmouth/loudmouth_1.4.3.bb b/recipes/loudmouth/loudmouth_1.4.3.bb index 875183e577..b6b22676ef 100644 --- a/recipes/loudmouth/loudmouth_1.4.3.bb +++ b/recipes/loudmouth/loudmouth_1.4.3.bb @@ -1,12 +1,14 @@ DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol." HOMEPAGE = "http://www.loudmouth-project.org/" LICENSE = "LGPL" -DEPENDS = "glib-2.0 gnutls check" -PR = "r1" +DEPENDS = "glib-2.0 check openssl" +PR = "r2" SRC_URI += "file://04-use-pkg-config-for-gnutls.patch" inherit gnomebase +EXTRA_OECONF = "--with-ssl=openssl" + SRC_URI[archive.md5sum] = "55339ca42494690c3942ee1465a96937" SRC_URI[archive.sha256sum] = "95a93f5d009b71ea8193d994aa11f311bc330a3efe1b7cd74dc48f11c7f929e3" From d07e4709dcc0855a68bd6ad447b307f4a71b9008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Lanzend=C3=B6rfer?= Date: Thu, 24 Feb 2011 21:51:40 +0100 Subject: [PATCH 068/509] conf/machine/beaglehyb.conf: new machine Goldelico's Beagle Board Hybrid linux-gta04: add kernel for Beagle Board Hybrid and the forthcoming Goldelico GTA04 Machine --- conf/machine/beaglehyb.conf | 44 + .../linux-gta04/omap3_beaglehyb_defconfig | 2850 +++++++++++++++++ recipes/linux/linux-gta04_git.bb | 16 + 3 files changed, 2910 insertions(+) create mode 100644 conf/machine/beaglehyb.conf create mode 100644 recipes/linux/linux-gta04/omap3_beaglehyb_defconfig create mode 100644 recipes/linux/linux-gta04_git.bb diff --git a/conf/machine/beaglehyb.conf b/conf/machine/beaglehyb.conf new file mode 100644 index 0000000000..b4ec3f0700 --- /dev/null +++ b/conf/machine/beaglehyb.conf @@ -0,0 +1,44 @@ +#@TYPE: Machine +#@NAME: Beagleboard machine +#@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-video-omapfb \ + xf86-input-keyboard" + +# Only has DVI connector for external screen +GUI_MACHINE_CLASS = "bigscreen" + +require conf/machine/include/omap3.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-gta04" + +IMAGE_FSTYPES += "tar.bz2 ubi" +EXTRA_IMAGECMD_jffs2 = "-lnp " + +# Guesswork +SERIAL_CONSOLE = "115200 ttyS2" + +UBOOT_MACHINE = "omap3_beagle_config" + +# do ubiattach /dev/ubi_ctrl -m 4 +# From dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: logical eraseblock size: 129024 bytes +# from ubiattach stdout: +# UBI device number 0, total 1996 LEBs +MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" + +# do ubiattach /dev/ubi_ctrl -m 4 +# from dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: physical eraseblock size: 131072 bytes (128 KiB) +# UBI: sub-page size: 512 +UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" + +# and sdio +MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" diff --git a/recipes/linux/linux-gta04/omap3_beaglehyb_defconfig b/recipes/linux/linux-gta04/omap3_beaglehyb_defconfig new file mode 100644 index 0000000000..e89a5b047b --- /dev/null +++ b/recipes/linux/linux-gta04/omap3_beaglehyb_defconfig @@ -0,0 +1,2850 @@ +# +# Automatically generated make config: don't edit +# Linux/arm 2.6.37-rc5 Kernel Configuration +# Mon Dec 13 20:44:23 2010 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +# CONFIG_ARCH_USES_GETTIMEOFFSET is not set +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_ARCH_HAS_CPUFREQ=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_ARM_L1_CACHE_SHIFT_6=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y +CONFIG_HAVE_IRQ_WORK=y +CONFIG_IRQ_WORK=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_LZO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +# CONFIG_AUDIT is not set +# CONFIG_HAVE_GENERIC_HARDIRQS is not set +# CONFIG_SPARSE_IRQ is not set + +# +# RCU Subsystem +# +CONFIG_TREE_PREEMPT_RCU=y +# CONFIG_TINY_RCU is not set +# CONFIG_TINY_PREEMPT_RCU is not set +CONFIG_PREEMPT_RCU=y +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_TREE_RCU_TRACE is not set +CONFIG_SRCU_SYNCHRONIZE_DELAY=10 +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=16 +# CONFIG_CGROUPS is not set +# CONFIG_NAMESPACES is not set +# CONFIG_SCHED_AUTOGROUP is not set +# CONFIG_SYSFS_DEPRECATED is not set +# CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_RD_LZO is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +# CONFIG_ELF_CORE is not set +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_PERF_USE_VMALLOC=y + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +# CONFIG_PERF_COUNTERS is not set +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_COMPAT_BRK is not set +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_PROFILING=y +CONFIG_OPROFILE=y +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_HW_BREAKPOINT=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +CONFIG_BLK_DEV_BSG=y +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +# CONFIG_INLINE_SPIN_UNLOCK is not set +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +# CONFIG_INLINE_READ_UNLOCK is not set +# CONFIG_INLINE_READ_UNLOCK_BH is not set +# CONFIG_INLINE_READ_UNLOCK_IRQ is not set +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +# CONFIG_INLINE_WRITE_UNLOCK is not set +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set +CONFIG_FREEZER=y + +# +# System Type +# +CONFIG_MMU=y +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_VEXPRESS is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_BCMRING is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CNS3XXX is not set +# CONFIG_ARCH_GEMINI is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_STMP3XXX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_DOVE is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_LPC32XX is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_MMP is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_W90X900 is not set +# CONFIG_ARCH_NUC93X is not set +# CONFIG_ARCH_TEGRA is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_MSM is not set +# CONFIG_ARCH_SHMOBILE is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_S5P64X0 is not set +# CONFIG_ARCH_S5P6442 is not set +# CONFIG_ARCH_S5PC100 is not set +# CONFIG_ARCH_S5PV210 is not set +# CONFIG_ARCH_S5PV310 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_TCC_926 is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_U300 is not set +# CONFIG_ARCH_U8500 is not set +# CONFIG_ARCH_NOMADIK is not set +# CONFIG_ARCH_DAVINCI is not set +CONFIG_ARCH_OMAP=y +# CONFIG_PLAT_SPEAR is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_KEYBOARD_GPIO_POLLED is not set + +# +# TI OMAP Common Features +# +CONFIG_ARCH_OMAP_OTG=y +# CONFIG_ARCH_OMAP1 is not set +CONFIG_ARCH_OMAP2PLUS=y + +# +# OMAP Feature Selections +# +CONFIG_OMAP_RESET_CLOCKS=y +CONFIG_OMAP_MUX=y +# CONFIG_OMAP_MUX_DEBUG is not set +CONFIG_OMAP_MUX_WARNINGS=y +CONFIG_OMAP_MCBSP=y +CONFIG_OMAP_MBOX_FWK=m +CONFIG_OMAP_MBOX_KFIFO_SIZE=256 +# CONFIG_OMAP_MPU_TIMER is not set +CONFIG_OMAP_32K_TIMER=y +# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set +CONFIG_OMAP_32K_TIMER_HZ=128 +CONFIG_OMAP_DM_TIMER=y +# CONFIG_OMAP_PM_NONE is not set +CONFIG_OMAP_PM_NOOP=y + +# +# TI OMAP2/3/4 Specific Features +# +CONFIG_ARCH_OMAP2PLUS_TYPICAL=y +# CONFIG_ARCH_OMAP2 is not set +CONFIG_ARCH_OMAP3=y +# CONFIG_ARCH_OMAP4 is not set +CONFIG_ARCH_OMAP3430=y +CONFIG_OMAP_PACKAGE_CBB=y + +# +# OMAP Board Type +# +CONFIG_MACH_OMAP3_BEAGLE=y +CONFIG_OMAP3_BEAGLE_OPENMOKO_HYBRID=y +# CONFIG_MACH_GTA04 is not set +# CONFIG_MACH_DEVKIT8000 is not set +# CONFIG_MACH_OMAP_LDP is not set +# CONFIG_MACH_OMAP3530_LV_SOM is not set +# CONFIG_MACH_OMAP3_TORPEDO is not set +# CONFIG_MACH_OVERO is not set +# CONFIG_MACH_OMAP3EVM is not set +# CONFIG_MACH_OMAP3517EVM is not set +# CONFIG_MACH_CRANEBOARD is not set +# CONFIG_MACH_OMAP3_PANDORA is not set +# CONFIG_MACH_OMAP3_TOUCHBOOK is not set +# CONFIG_MACH_OMAP_3430SDP is not set +CONFIG_MACH_NOKIA_RM680=y +# CONFIG_MACH_NOKIA_RX51 is not set +# CONFIG_MACH_OMAP_ZOOM2 is not set +# CONFIG_MACH_OMAP_ZOOM3 is not set +# CONFIG_MACH_CM_T35 is not set +# CONFIG_MACH_CM_T3517 is not set +# CONFIG_MACH_IGEP0020 is not set +# CONFIG_MACH_IGEP0030 is not set +# CONFIG_MACH_SBC3530 is not set +# CONFIG_MACH_OMAP_3630SDP is not set +# CONFIG_OMAP3_EMU is not set +# CONFIG_OMAP3_SDRC_AC_TIMING is not set + +# +# Processor Type +# +CONFIG_CPU_32v6K=y +CONFIG_CPU_V7=y +CONFIG_CPU_32v7=y +CONFIG_CPU_ABRT_EV7=y +CONFIG_CPU_PABRT_V7=y +CONFIG_CPU_CACHE_V7=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y +CONFIG_CPU_TLB_V7=y +CONFIG_CPU_HAS_ASID=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +CONFIG_ARM_THUMBEE=y +# CONFIG_SWP_EMULATE is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_ARM_L1_CACHE_SHIFT=6 +CONFIG_ARM_DMA_MEM_BUFFERABLE=y +# CONFIG_ARM_ERRATA_430973 is not set +# CONFIG_ARM_ERRATA_458693 is not set +# CONFIG_ARM_ERRATA_460075 is not set +# CONFIG_ARM_ERRATA_743622 is not set + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_HZ=128 +# CONFIG_THUMB2_KERNEL is not set +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_HIGHMEM is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_VIRT_TO_BUS=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_NEED_PER_CPU_KM=y +CONFIG_CLEANCACHE=y +CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_LEDS=y +CONFIG_ALIGNMENT_TRAP=y +# CONFIG_UACCESS_WITH_MEMCPY is not set +# CONFIG_SECCOMP is not set +# CONFIG_CC_STACKPROTECTOR is not set +# CONFIG_DEPRECATED_PARAM_STRUCT is not set + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE=" debug " +# CONFIG_CMDLINE_FORCE is not set +# CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y +# CONFIG_CRASH_DUMP is not set +# CONFIG_AUTO_ZRELADDR is not set + +# +# CPU Power Management +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +# CONFIG_CPU_IDLE is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_VFP=y +CONFIG_VFPv3=y +CONFIG_NEON=y + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +CONFIG_HAVE_AOUT=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=y + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_DEBUG=y +# CONFIG_PM_ADVANCED_DEBUG is not set +# CONFIG_PM_VERBOSE is not set +CONFIG_CAN_PM_TRACE=y +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND_NVS=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_APM_EMULATION is not set +CONFIG_PM_RUNTIME=y +CONFIG_PM_OPS=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=y +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +CONFIG_NET_IPIP=m +# CONFIG_NET_IPGRE_DEMUX is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m +# CONFIG_IPV6_SIT_6RD is not set +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_MROUTE=y +# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set +# CONFIG_IPV6_PIMSM_V2 is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set +# CONFIG_NETFILTER is not set +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_TFRC_LIB=y + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +# CONFIG_SCTP_HMAC_SHA1 is not set +CONFIG_SCTP_HMAC_MD5=y +# CONFIG_RDS is not set +CONFIG_TIPC=m +# CONFIG_TIPC_ADVANCED is not set +# CONFIG_TIPC_DEBUG is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +# CONFIG_L2TP is not set +CONFIG_STP=m +CONFIG_GARP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +# CONFIG_NET_DSA is not set +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y +# CONFIG_DECNET is not set +CONFIG_LLC=m +# CONFIG_LLC2 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +CONFIG_WAN_ROUTER=m +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_ROUTE=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set +CONFIG_DNS_RESOLVER=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m + +# +# CAN Device Drivers +# +CONFIG_CAN_VCAN=m +# CONFIG_CAN_SLCAN is not set +# CONFIG_CAN_DEV is not set +# CONFIG_CAN_DEBUG_DEVICES is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +# CONFIG_ACT200L_DONGLE is not set +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +# CONFIG_BT_HCIUART_ATH3K is not set +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +# CONFIG_BT_HCIVHCI is not set +# CONFIG_BT_MRVL is not set +# CONFIG_BT_ATH3K is not set +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +# CONFIG_RXKAD is not set +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_REG_DEBUG is not set +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_WEXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_LIB80211=y +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_PID=y +# CONFIG_MAC80211_RC_MINSTREL is not set +CONFIG_MAC80211_RC_DEFAULT_PID=y +CONFIG_MAC80211_RC_DEFAULT="pid" +# CONFIG_MAC80211_MESH is not set +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_INPUT=y +CONFIG_NET_9P=m +# CONFIG_NET_9P_DEBUG is not set +# CONFIG_CAIF is not set +# CONFIG_CEPH_LIB is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_TESTS is not set +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_SM_FTL is not set +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND_ECC=y +# CONFIG_MTD_NAND_ECC_SMC is not set +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_SM_COMMON is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_GPIO is not set +CONFIG_MTD_NAND_OMAP2=y +CONFIG_MTD_NAND_OMAP_PREFETCH=y +# CONFIG_MTD_NAND_OMAP_PREFETCH_DMA is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_NANDSIM is not set +CONFIG_MTD_NAND_PLATFORM=y +# CONFIG_MTD_ALAUDA is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set + +# +# UBI debugging options +# +# CONFIG_MTD_UBI_DEBUG is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_CRYPTOLOOP=m + +# +# DRBD disabled because PROC_FS, INET or CONNECTOR not selected +# +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_XIP is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_MG_DISK is not set +# CONFIG_BLK_DEV_RBD is not set +CONFIG_MISC_DEVICES=y +# CONFIG_AD525X_DPOT is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_APDS9802ALS is not set +# CONFIG_ISL29003 is not set +# CONFIG_ISL29020 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_SENSORS_BH1780 is not set +# CONFIG_SENSORS_BH1770 is not set +# CONFIG_SENSORS_APDS990X is not set +# CONFIG_HMC6352 is not set +# CONFIG_DS1682 is not set +# CONFIG_TI_DAC7512 is not set +CONFIG_BMP085=m +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT24 is not set +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +CONFIG_EEPROM_93CX6=y +CONFIG_IWMC3200TOP=m +# CONFIG_IWMC3200TOP_DEBUG is not set +# CONFIG_IWMC3200TOP_DEBUGFS is not set + +# +# Texas Instruments shared transport line discipline +# +# CONFIG_TI_ST is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=y +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=y +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +# CONFIG_ISCSI_BOOT_SYSFS is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +# CONFIG_ATA is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +# CONFIG_DM_LOG_USERSPACE is not set +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +# CONFIG_DM_MULTIPATH_QL is not set +# CONFIG_DM_MULTIPATH_ST is not set +CONFIG_DM_DELAY=m +# CONFIG_DM_UEVENT is not set +CONFIG_NETDEVICES=y +CONFIG_DUMMY=m +CONFIG_BONDING=m +CONFIG_MACVLAN=m +# CONFIG_MACVTAP is not set +CONFIG_EQUALIZER=m +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_MII=y +# CONFIG_PHYLIB is not set +# CONFIG_NET_ETHERNET is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set +CONFIG_WLAN=y +# CONFIG_LIBERTAS_THINFIRM is not set +CONFIG_AT76C50X_USB=m +CONFIG_USB_ZD1201=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8187=m +# CONFIG_MAC80211_HWSIM is not set +# CONFIG_ATH_COMMON is not set +CONFIG_B43=m +# CONFIG_B43_SDIO is not set +CONFIG_B43_PIO=y +# CONFIG_B43_PHY_N is not set +CONFIG_B43_PHY_LP=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +# CONFIG_B43LEGACY is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y +# CONFIG_IWM is not set +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +# CONFIG_LIBERTAS_SDIO is not set +# CONFIG_LIBERTAS_SPI is not set +# CONFIG_LIBERTAS_DEBUG is not set +# CONFIG_LIBERTAS_MESH is not set +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +# CONFIG_P54_SPI is not set +CONFIG_RT2X00=m +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +# CONFIG_RT2800USB is not set +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_WL1251=m +CONFIG_WL1251_SPI=m +CONFIG_WL1251_SDIO=m +# CONFIG_WL12XX_MENU is not set +CONFIG_WL12XX_PLATFORM_DATA=y +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_SDIO=m +CONFIG_WIMAX_IWMC3200_SDIO=y +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 + +# +# USB Network Adapters +# +CONFIG_USB_CATC=y +CONFIG_USB_KAWETH=y +CONFIG_USB_PEGASUS=y +CONFIG_USB_RTL8150=y +CONFIG_USB_USBNET=y +CONFIG_USB_NET_AX8817X=y +CONFIG_USB_NET_CDCETHER=y +CONFIG_USB_NET_CDC_EEM=y +CONFIG_USB_NET_CDC_NCM=y +CONFIG_USB_NET_DM9601=y +# CONFIG_USB_NET_SMSC75XX is not set +CONFIG_USB_NET_SMSC95XX=y +CONFIG_USB_NET_GL620A=y +CONFIG_USB_NET_NET1080=y +CONFIG_USB_NET_PLUSB=y +CONFIG_USB_NET_MCS7830=y +CONFIG_USB_NET_RNDIS_HOST=y +CONFIG_USB_NET_CDC_SUBSET=y +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=y +# CONFIG_USB_NET_CX82310_ETH is not set +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +# CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set +# CONFIG_WAN is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +# CONFIG_ATM_TCP is not set + +# +# CAIF transport drivers +# +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +# CONFIG_PPPOATM is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y +# CONFIG_ISDN is not set +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=y +CONFIG_INPUT_POLLDEV=y +# CONFIG_INPUT_SPARSEKMAP is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_QT2160 is not set +# CONFIG_KEYBOARD_LKKBD is not set +CONFIG_KEYBOARD_GPIO=y +# CONFIG_KEYBOARD_TCA6416 is not set +# CONFIG_KEYBOARD_MATRIX is not set +# CONFIG_KEYBOARD_MAX7359 is not set +# CONFIG_KEYBOARD_MCS is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_TWL4030 is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_ELANTECH is not set +# CONFIG_MOUSE_PS2_SENTELIC is not set +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_BCM5974 is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_GPIO is not set +# CONFIG_MOUSE_SYNAPTICS_I2C is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_BU21013 is not set +# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set +# CONFIG_TOUCHSCREEN_DYNAPRO is not set +# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set +# CONFIG_TOUCHSCREEN_EETI is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_MCS5000 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_QT602240 is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +CONFIG_TOUCHSCREEN_TSC2007=y +# CONFIG_TOUCHSCREEN_W90X900 is not set +# CONFIG_TOUCHSCREEN_TPS6507X is not set +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_AD714X is not set +# CONFIG_INPUT_ATI_REMOTE is not set +# CONFIG_INPUT_ATI_REMOTE2 is not set +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_POWERMATE is not set +# CONFIG_INPUT_YEALINK is not set +# CONFIG_INPUT_CM109 is not set +CONFIG_INPUT_TWL4030_PWRBUTTON=y +# CONFIG_INPUT_TWL4030_VIBRA is not set +CONFIG_INPUT_UINPUT=y +# CONFIG_INPUT_PCF8574 is not set +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +# CONFIG_INPUT_ADXL34X is not set +# CONFIG_INPUT_CMA3000 is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_SERIO_ALTERA_PS2 is not set +# CONFIG_SERIO_PS2MULT is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_DEVKMEM=y +# CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_N_GSM is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX3107 is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_OMAP=y +CONFIG_SERIAL_OMAP_CONSOLE=y +# CONFIG_SERIAL_TIMBERDALE is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set +# CONFIG_SERIAL_IFX6X60 is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +# CONFIG_LEGACY_PTYS is not set +# CONFIG_TTY_PRINTK is not set +# CONFIG_HVC_DCC is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=y +# CONFIG_HW_RANDOM_TIMERIOMEM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +# CONFIG_RAMOOPS is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=y +# CONFIG_I2C_MUX is not set +CONFIG_I2C_HELPER_AUTO=y +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE is not set +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_OMAP=y +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_GPIO is not set +CONFIG_SPI_OMAP24XX=y +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +CONFIG_SPI_SPIDEV=y +# CONFIG_SPI_TLE62X0 is not set + +# +# PPS support +# +# CONFIG_PPS is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y + +# +# Memory mapped GPIO expanders: +# +# CONFIG_GPIO_BASIC_MMIO is not set +# CONFIG_GPIO_IT8761E is not set +# CONFIG_GPIO_VX855 is not set + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_SX150X is not set +CONFIG_GPIO_TWL4030=y +# CONFIG_GPIO_ADP5588 is not set + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_74X164 is not set + +# +# AC97 GPIO expanders: +# + +# +# MODULbus GPIO expanders: +# +# CONFIG_W1 is not set +CONFIG_POWER_SUPPLY=m +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +# CONFIG_TEST_POWER is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_BQ20Z75 is not set +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_CHARGER_ISP1704 is not set +# CONFIG_CHARGER_TWL4030 is not set +# CONFIG_CHARGER_GPIO is not set +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +# CONFIG_SENSORS_AD7414 is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADCXX is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ADT7411 is not set +# CONFIG_SENSORS_ADT7462 is not set +# CONFIG_SENSORS_ADT7470 is not set +# CONFIG_SENSORS_ADT7475 is not set +# CONFIG_SENSORS_ASC7621 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_G760A is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_GPIO_FAN is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_JC42 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM70 is not set +# CONFIG_SENSORS_LM73 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_LM93 is not set +# CONFIG_SENSORS_LTC4215 is not set +# CONFIG_SENSORS_LTC4245 is not set +# CONFIG_SENSORS_LTC4261 is not set +# CONFIG_SENSORS_LM95241 is not set +# CONFIG_SENSORS_MAX1111 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX6650 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_SHT15 is not set +# CONFIG_SENSORS_SMM665 is not set +# CONFIG_SENSORS_DME1737 is not set +# CONFIG_SENSORS_EMC1403 is not set +# CONFIG_SENSORS_EMC2103 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_ADS7828 is not set +# CONFIG_SENSORS_ADS7871 is not set +# CONFIG_SENSORS_AMC6821 is not set +# CONFIG_SENSORS_THMC50 is not set +# CONFIG_SENSORS_TMP102 is not set +# CONFIG_SENSORS_TMP401 is not set +# CONFIG_SENSORS_TMP421 is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83795 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83L786NG is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_SENSORS_LIS3_SPI is not set +# CONFIG_SENSORS_LIS3_I2C is not set +CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_OMAP_WATCHDOG=y +# CONFIG_TWL4030_WATCHDOG is not set +# CONFIG_MAX63XX_WATCHDOG is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +# CONFIG_SSB_SDIOHOST is not set +# CONFIG_SSB_SILENT is not set +# CONFIG_SSB_DEBUG is not set +CONFIG_MFD_SUPPORT=y +CONFIG_MFD_CORE=y +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_HTC_I2CPLD is not set +# CONFIG_TPS65010 is not set +# CONFIG_TPS6507X is not set +CONFIG_TWL4030_CORE=y +CONFIG_TWL4030_POWER=y +CONFIG_TWL4030_CODEC=y +# CONFIG_TWL6030_PWM is not set +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_TC35892 is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_MAX8998 is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X_I2C is not set +# CONFIG_MFD_WM831X_SPI is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_MFD_MC13XXX is not set +# CONFIG_ABX500_CORE is not set +# CONFIG_EZX_PCAP is not set +# CONFIG_MFD_TPS6586X is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +# CONFIG_REGULATOR_DUMMY is not set +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_BQ24022 is not set +# CONFIG_REGULATOR_MAX1586 is not set +# CONFIG_REGULATOR_MAX8649 is not set +# CONFIG_REGULATOR_MAX8660 is not set +# CONFIG_REGULATOR_MAX8952 is not set +CONFIG_REGULATOR_TWL4030=y +# CONFIG_REGULATOR_LP3971 is not set +# CONFIG_REGULATOR_LP3972 is not set +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set +# CONFIG_REGULATOR_ISL6271A is not set +# CONFIG_REGULATOR_AD5398 is not set +# CONFIG_REGULATOR_TPS6524X is not set +CONFIG_MEDIA_SUPPORT=y + +# +# Multimedia core support +# +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_COMMON=y +CONFIG_VIDEO_ALLOW_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +# CONFIG_DVB_CORE is not set +CONFIG_VIDEO_MEDIA=y + +# +# Multimedia drivers +# +CONFIG_RC_CORE=y +CONFIG_LIRC=y +CONFIG_RC_MAP=y +CONFIG_IR_NEC_DECODER=y +CONFIG_IR_RC5_DECODER=y +CONFIG_IR_RC6_DECODER=y +CONFIG_IR_JVC_DECODER=y +CONFIG_IR_SONY_DECODER=y +CONFIG_IR_RC5_SZ_DECODER=y +CONFIG_IR_LIRC_CODEC=y +# CONFIG_IR_IMON is not set +# CONFIG_IR_MCEUSB is not set +# CONFIG_IR_STREAMZAP is not set +# CONFIG_RC_LOOPBACK is not set +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=y +CONFIG_MEDIA_TUNER_CUSTOMISE=y + +# +# Customize TV tuners +# +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEOBUF_GEN=y +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DMA_CONTIG=y +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_TUNER=m +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set +CONFIG_VIDEO_IR_I2C=m + +# +# Encoders/decoders and other helper chips +# + +# +# Audio decoders +# +# CONFIG_VIDEO_TVAUDIO is not set +# CONFIG_VIDEO_TDA7432 is not set +# CONFIG_VIDEO_TDA9840 is not set +# CONFIG_VIDEO_TDA9875 is not set +# CONFIG_VIDEO_TEA6415C is not set +# CONFIG_VIDEO_TEA6420 is not set +CONFIG_VIDEO_MSP3400=m +# CONFIG_VIDEO_CS5345 is not set +CONFIG_VIDEO_CS53L32A=m +# CONFIG_VIDEO_M52790 is not set +# CONFIG_VIDEO_TLV320AIC23B is not set +CONFIG_VIDEO_WM8775=m +# CONFIG_VIDEO_WM8739 is not set +# CONFIG_VIDEO_VP27SMPX is not set + +# +# RDS decoders +# +# CONFIG_VIDEO_SAA6588 is not set + +# +# Video decoders +# +# CONFIG_VIDEO_ADV7180 is not set +# CONFIG_VIDEO_BT819 is not set +# CONFIG_VIDEO_BT856 is not set +# CONFIG_VIDEO_BT866 is not set +# CONFIG_VIDEO_KS0127 is not set +# CONFIG_VIDEO_OV7670 is not set +CONFIG_VIDEO_MT9V011=m +# CONFIG_VIDEO_TCM825X is not set +# CONFIG_VIDEO_SAA7110 is not set +CONFIG_VIDEO_SAA711X=m +# CONFIG_VIDEO_SAA717X is not set +# CONFIG_VIDEO_SAA7191 is not set +# CONFIG_VIDEO_TVP514X is not set +# CONFIG_VIDEO_TVP5150 is not set +# CONFIG_VIDEO_TVP7002 is not set +# CONFIG_VIDEO_VPX3220 is not set + +# +# Video and audio decoders +# +CONFIG_VIDEO_CX25840=m + +# +# MPEG video encoders +# +CONFIG_VIDEO_CX2341X=m + +# +# Video encoders +# +# CONFIG_VIDEO_SAA7127 is not set +# CONFIG_VIDEO_SAA7185 is not set +# CONFIG_VIDEO_ADV7170 is not set +# CONFIG_VIDEO_ADV7175 is not set +# CONFIG_VIDEO_THS7303 is not set +# CONFIG_VIDEO_ADV7343 is not set +# CONFIG_VIDEO_AK881X is not set + +# +# Video improvement chips +# +# CONFIG_VIDEO_UPD64031A is not set +# CONFIG_VIDEO_UPD64083 is not set +CONFIG_VIDEO_VIVI=m +CONFIG_VIDEO_VPFE_CAPTURE=y +# CONFIG_VIDEO_DM6446_CCDC is not set +CONFIG_VIDEO_OMAP2_VOUT=y +# CONFIG_VIDEO_CPIA2 is not set +# CONFIG_VIDEO_TIMBERDALE is not set +# CONFIG_VIDEO_SR030PC30 is not set +# CONFIG_SOC_CAMERA is not set +CONFIG_V4L_USB_DRIVERS=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +# CONFIG_USB_GL860 is not set +# CONFIG_USB_GSPCA_BENQ is not set +CONFIG_USB_GSPCA_CONEX=m +# CONFIG_USB_GSPCA_CPIA1 is not set +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +# CONFIG_USB_GSPCA_JEILINJ is not set +# CONFIG_USB_GSPCA_KONICA is not set +CONFIG_USB_GSPCA_MARS=m +# CONFIG_USB_GSPCA_MR97310A is not set +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +# CONFIG_USB_GSPCA_OV534_9 is not set +CONFIG_USB_GSPCA_PAC207=m +# CONFIG_USB_GSPCA_PAC7302 is not set +CONFIG_USB_GSPCA_PAC7311=m +# CONFIG_USB_GSPCA_SN9C2028 is not set +# CONFIG_USB_GSPCA_SN9C20X is not set +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +# CONFIG_USB_GSPCA_SPCA1528 is not set +# CONFIG_USB_GSPCA_SQ905 is not set +# CONFIG_USB_GSPCA_SQ905C is not set +# CONFIG_USB_GSPCA_SQ930X is not set +CONFIG_USB_GSPCA_STK014=m +# CONFIG_USB_GSPCA_STV0680 is not set +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +# CONFIG_USB_GSPCA_XIRLINK_CIT is not set +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +# CONFIG_VIDEO_EM28XX is not set +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +# CONFIG_VIDEO_CX231XX_ALSA is not set +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_ET61X251=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +# CONFIG_V4L_MEM2MEM_DRIVERS is not set +CONFIG_RADIO_ADAPTERS=y +CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI4713=m +# CONFIG_USB_DSBR is not set +CONFIG_RADIO_SI470X=y +# CONFIG_USB_SI470X is not set +CONFIG_I2C_SI470X=m +# CONFIG_USB_MR800 is not set +# CONFIG_RADIO_TEA5764 is not set +# CONFIG_RADIO_SAA7706H is not set +# CONFIG_RADIO_TEF6862 is not set +# CONFIG_DAB is not set + +# +# Graphics support +# +# CONFIG_DRM is not set +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_WMT_GE_ROPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_TMIO is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +CONFIG_FB_OMAP_BOOTLOADER_INIT=y +CONFIG_OMAP2_VRAM=y +CONFIG_OMAP2_VRFB=y +CONFIG_OMAP2_DSS=y +CONFIG_OMAP2_VRAM_SIZE=14 +CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y +# CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set +CONFIG_OMAP2_DSS_DPI=y +# CONFIG_OMAP2_DSS_RFBI is not set +CONFIG_OMAP2_DSS_VENC=y +# CONFIG_OMAP2_DSS_SDI is not set +CONFIG_OMAP2_DSS_DSI=y +CONFIG_OMAP2_DSS_USE_DSI_PLL=y +# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set +CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 +CONFIG_FB_OMAP2=y +CONFIG_FB_OMAP2_DEBUG_SUPPORT=y +CONFIG_FB_OMAP2_NUM_FBS=3 + +# +# OMAP2/3 Display Device Drivers +# +CONFIG_PANEL_GENERIC=y +# CONFIG_PANEL_SHARP_LS037V7DW01 is not set +# CONFIG_PANEL_SHARP_LQ043T1DG01 is not set +# CONFIG_PANEL_TAAL is not set +# CONFIG_PANEL_TOPPOLY_TDO35S is not set +# CONFIG_PANEL_TPO_TD043MTEA1 is not set +CONFIG_PANEL_TPO_TD028TTEC1=y +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +CONFIG_DISPLAY_SUPPORT=y + +# +# Display hardware drivers +# + +# +# Console display driver support +# +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y +CONFIG_SOUND=y +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=y +CONFIG_SND_RAWMIDI=y +CONFIG_SND_JACK=y +CONFIG_SND_SEQUENCER=m +# CONFIG_SND_SEQ_DUMMY 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_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_RAWMIDI_SEQ=m +# CONFIG_SND_OPL3_LIB_SEQ is not set +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +# CONFIG_SND_EMU10K1_SEQ is not set +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_ALOOP is not set +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +# CONFIG_SND_ARM is not set +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=y +# CONFIG_SND_USB_UA101 is not set +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_SOC=y +CONFIG_SND_OMAP_SOC=y +CONFIG_SND_OMAP_SOC_MCBSP=y +CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y +CONFIG_SND_SOC_I2C_AND_SPI=y +# CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_TWL4030=y +# CONFIG_SOUND_PRIME is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set + +# +# Special HID drivers +# +# CONFIG_HID_3M_PCT is not set +CONFIG_HID_A4TECH=y +# CONFIG_HID_ACRUX_FF is not set +CONFIG_HID_APPLE=y +CONFIG_HID_BELKIN=y +# CONFIG_HID_CANDO is not set +CONFIG_HID_CHERRY=y +CONFIG_HID_CHICONY=y +# CONFIG_HID_PRODIKEYS is not set +CONFIG_HID_CYPRESS=y +# CONFIG_HID_DRAGONRISE is not set +# CONFIG_HID_EMS_FF is not set +# CONFIG_HID_EGALAX is not set +# CONFIG_HID_ELECOM is not set +CONFIG_HID_EZKEY=y +# CONFIG_HID_KYE is not set +# CONFIG_HID_UCLOGIC is not set +# CONFIG_HID_WALTOP is not set +CONFIG_HID_GYRATION=y +# CONFIG_HID_TWINHAN is not set +# CONFIG_HID_KENSINGTON is not set +CONFIG_HID_LOGITECH=y +# CONFIG_LOGITECH_FF is not set +# CONFIG_LOGIRUMBLEPAD2_FF is not set +# CONFIG_LOGIG940_FF is not set +# CONFIG_LOGIWII_FF is not set +# CONFIG_HID_MAGICMOUSE is not set +CONFIG_HID_MICROSOFT=y +# CONFIG_HID_MOSART is not set +CONFIG_HID_MONTEREY=y +CONFIG_HID_NTRIG=y +# CONFIG_HID_ORTEK is not set +CONFIG_HID_PANTHERLORD=y +# CONFIG_PANTHERLORD_FF is not set +CONFIG_HID_PETALYNX=y +# CONFIG_HID_PICOLCD is not set +# CONFIG_HID_QUANTA is not set +# CONFIG_HID_ROCCAT is not set +# CONFIG_HID_ROCCAT_KONE is not set +# CONFIG_HID_ROCCAT_KONEPLUS is not set +# CONFIG_HID_ROCCAT_PYRA is not set +CONFIG_HID_SAMSUNG=y +CONFIG_HID_SONY=y +# CONFIG_HID_STANTUM is not set +CONFIG_HID_SUNPLUS=y +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +CONFIG_HID_TOPSEED=y +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_WACOM is not set +# CONFIG_HID_ZEROPLUS is not set +# CONFIG_HID_ZYDACRON is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +CONFIG_USB_SUSPEND=y +CONFIG_USB_OTG=y +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_MON=y +# CONFIG_USB_WUSB is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +CONFIG_USB_EHCI_HCD=y +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_EHCI_HCD_OMAP=y +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_ISP1362_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +# CONFIG_USB_U132_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_HWA_HCD is not set +CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_MUSB_SOC=y + +# +# OMAP 343x high speed USB support +# +# CONFIG_USB_MUSB_AM35X is not set +# CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MUSB_PERIPHERAL is not set +CONFIG_USB_MUSB_OTG=y +CONFIG_USB_GADGET_MUSB_HDRC=y +CONFIG_USB_MUSB_HDRC_HCD=y +# CONFIG_MUSB_PIO_ONLY is not set +CONFIG_USB_INVENTRA_DMA=y +# CONFIG_USB_TI_CPPI_DMA is not set +# CONFIG_USB_MUSB_DEBUG is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set +# CONFIG_USB_UAS is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +CONFIG_USB_SERIAL=m +CONFIG_USB_EZUSB=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +# CONFIG_USB_SERIAL_CP210X is not set +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +# CONFIG_USB_SERIAL_QCAUX is not set +# CONFIG_USB_SERIAL_QUALCOMM is not set +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +# CONFIG_USB_SERIAL_SAMBA is not set +CONFIG_USB_SERIAL_SIEMENS_MPI=m +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +# CONFIG_USB_SERIAL_SYMBOL is not set +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_WWAN=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set +# CONFIG_USB_SERIAL_ZIO is not set +# CONFIG_USB_SERIAL_SSU100 is not set +CONFIG_USB_SERIAL_DEBUG=m + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +# CONFIG_USB_APPLEDISPLAY is not set +CONFIG_USB_SISUSBVGA=m +CONFIG_USB_SISUSBVGA_CON=y +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +# CONFIG_USB_IOWARRIOR is not set +CONFIG_USB_TEST=m +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_YUREX is not set +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_DEBUG_FS=y +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_R8A66597 is not set +# CONFIG_USB_GADGET_PXA_U2O is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +CONFIG_USB_ZERO=m +CONFIG_USB_ZERO_HNPTEST=y +# CONFIG_USB_AUDIO is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_ETH_EEM is not set +# CONFIG_USB_G_NCM is not set +CONFIG_USB_GADGETFS=m +# CONFIG_USB_FUNCTIONFS is not set +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +# CONFIG_USB_MASS_STORAGE is not set +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m +CONFIG_USB_G_PRINTER=m +CONFIG_USB_CDC_COMPOSITE=m +# CONFIG_USB_G_MULTI is not set +# CONFIG_USB_G_HID is not set +# CONFIG_USB_G_DBGP is not set +# CONFIG_USB_G_WEBCAM is not set + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +CONFIG_USB_GPIO_VBUS=y +# CONFIG_ISP1301_OMAP is not set +# CONFIG_USB_ULPI is not set +CONFIG_TWL4030_USB=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_UNSAFE_RESUME=y +# CONFIG_MMC_CLKGATE is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=y +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +# CONFIG_MMC_OMAP is not set +CONFIG_MMC_OMAP_HS=y +CONFIG_MMC_SPI=m +# CONFIG_MMC_USHC is not set +# CONFIG_MEMSTICK is not set +CONFIG_NEW_LEDS=y + +# +# LED drivers +# + +# +# LED Triggers +# +# CONFIG_ACCESSIBILITY is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=m + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_DS3232 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_ISL12022 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_BQ32K is not set +CONFIG_RTC_DRV_TWL4030=m +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set +# CONFIG_RTC_DRV_PCF2123 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_MSM6242 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_RP5C01 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +# CONFIG_DMADEVICES is not set +# CONFIG_AUXDISPLAY is not set +CONFIG_UIO=m +CONFIG_UIO_PDRV=m +CONFIG_UIO_PDRV_GENIRQ=m +CONFIG_STAGING=y +CONFIG_STAGING_EXCLUDE_BUILD=y +CONFIG_CLKDEV_LOOKUP=y + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_XATTR=y +# CONFIG_EXT4_FS_POSIX_ACL is not set +# CONFIG_EXT4_FS_SECURITY is not set +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +# CONFIG_REISERFS_FS_POSIX_ACL is not set +# CONFIG_REISERFS_FS_SECURITY is not set +CONFIG_JFS_FS=m +# CONFIG_JFS_POSIX_ACL is not set +# CONFIG_JFS_SECURITY is not set +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_XFS_FS=m +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +# CONFIG_GFS2_FS_LOCKING_DLM is not set +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +CONFIG_OCFS2_DEBUG_MASKLOG=y +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +# CONFIG_BTRFS_FS_POSIX_ACL is not set +# CONFIG_NILFS2_FS is not set +CONFIG_EXPORTFS=m +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_FANOTIFY is not set +CONFIG_QUOTA=y +# CONFIG_QUOTA_NETLINK_INTERFACE is not set +CONFIG_PRINT_QUOTA_WARNING=y +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=y +# CONFIG_QFMT_V1 is not set +CONFIG_QFMT_V2=y +CONFIG_QUOTACTL=y +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m +# CONFIG_CUSE is not set +CONFIG_GENERIC_ACL=y + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_CONFIGFS_FS=m +CONFIG_MISC_FILESYSTEMS=y +CONFIG_AFFS_FS=m +# CONFIG_ECRYPT_FS is not set +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_FS_XATTR=y +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +# CONFIG_JFFS2_CMODE_PRIORITY is not set +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_JFFS2_CMODE_FAVOURLZO=y +CONFIG_UBIFS_FS=y +CONFIG_UBIFS_FS_XATTR=y +CONFIG_UBIFS_FS_ADVANCED_COMPR=y +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set +# CONFIG_LOGFS is not set +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=y +# CONFIG_SQUASHFS_XATTR is not set +# CONFIG_SQUASHFS_LZO is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +CONFIG_VXFS_FS=m +CONFIG_MINIX_FS=m +CONFIG_OMFS_FS=m +CONFIG_QNX4FS_FS=m +CONFIG_ROMFS_FS=m +CONFIG_ROMFS_BACKED_BY_BLOCK=y +# CONFIG_ROMFS_BACKED_BY_MTD is not set +# CONFIG_ROMFS_BACKED_BY_BOTH is not set +CONFIG_ROMFS_ON_BLOCK=y +CONFIG_SYSV_FS=m +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set +CONFIG_ROOT_NFS=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +# CONFIG_NFS_USE_NEW_IDMAPPER is not set +CONFIG_NFSD=m +CONFIG_NFSD_DEPRECATED=y +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_CEPH_FS is not set +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +CONFIG_CIFS_STATS2=y +# CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_UPCALL is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_DFS_UPCALL is not set +CONFIG_CIFS_EXPERIMENTAL=y +CONFIG_NCP_FS=m +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +# CONFIG_NCPFS_NFS_NS is not set +# CONFIG_NCPFS_OS2_NS is not set +# CONFIG_NCPFS_SMALLDOS is not set +# CONFIG_NCPFS_NLS is not set +# CONFIG_NCPFS_EXTRAS is not set +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_9P_FS=m +# CONFIG_9P_FS_POSIX_ACL is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_UNIXWARE_DISKLABEL is not set +CONFIG_LDM_PARTITION=y +CONFIG_LDM_DEBUG=y +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=y +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set + +# +# Kernel hacking +# +CONFIG_PRINTK_TIME=y +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +CONFIG_MAGIC_SYSRQ=y +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_LOCKUP_DETECTOR is not set +# CONFIG_HARDLOCKUP_DETECTOR is not set +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y +CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_KMEMLEAK is not set +CONFIG_DEBUG_PREEMPT=y +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_LKDTM is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_SYSCTL_SYSCALL_CHECK is not set +# CONFIG_PAGE_POISONING is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_RING_BUFFER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING_SUPPORT=y +# CONFIG_FTRACE is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_ATOMIC64_SELFTEST is not set +# CONFIG_ASYNC_RAID6_TEST is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +# CONFIG_STRICT_DEVMEM is not set +# CONFIG_ARM_UNWIND is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_ERRORS is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_LL is not set +# CONFIG_OC_ETM is not set + +# +# Security options +# +CONFIG_KEYS=y +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set +# CONFIG_SECURITY_DMESG_RESTRICT is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=y +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=y +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=y +# CONFIG_CRYPTO_ZLIB is not set +CONFIG_CRYPTO_LZO=y + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +# CONFIG_CRYPTO_USER_API_HASH is not set +# CONFIG_CRYPTO_USER_API_SKCIPHER is not set +CONFIG_CRYPTO_HW=y +# CONFIG_CRYPTO_DEV_OMAP_SHAM is not set +# CONFIG_CRYPTO_DEV_OMAP_AES is not set +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +CONFIG_CRC_CCITT=y +CONFIG_CRC16=y +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=y +CONFIG_CRC32=y +CONFIG_CRC7=y +CONFIG_LIBCRC32C=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_DECOMPRESS_GZIP=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y +CONFIG_GENERIC_ATOMIC64=y +CONFIG_AVERAGE=y +# CONFIG_SHM_SIGNAL is not set +# CONFIG_IOQ is not set diff --git a/recipes/linux/linux-gta04_git.bb b/recipes/linux/linux-gta04_git.bb new file mode 100644 index 0000000000..22dbb16322 --- /dev/null +++ b/recipes/linux/linux-gta04_git.bb @@ -0,0 +1,16 @@ +SRCREV="${AUTOREV}" +PV = "2.6.37+${PR}+gitr${SRCREV}" +PR = "r1" + +inherit kernel + +COMPATIBLE_MACHINE = "beaglehyb" + +SRC_URI = "git://projects.goldelico.com/gta04-kernel.git;protocol=git " +SRC_URI_append_beaglehyb = "file://omap3_beaglehyb_defconfig" + +S = "${WORKDIR}/git" + +do_configure_prepend_beaglehyb() { + install -m 0644 ${WORKDIR}/omap3_beaglehyb_defconfig ${S}/.config +} From 0ffbe5fdb64910bd95f4318f7210f5d6c4209082 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 24 Feb 2011 15:01:24 -0800 Subject: [PATCH 069/509] gcc-4.5: Fix GCC found on xscale with Os * This enables linaro patch 45177 and a patch on top to fix an ICE discovered because of this backport Signed-off-by: Khem Raj --- recipes/gcc/gcc-4.5.inc | 7 +- .../tune-xscale-infinite-loop-PR45177.patch | 103 ++++++++++++++++++ 2 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 recipes/gcc/gcc-4.5/tune-xscale-infinite-loop-PR45177.patch diff --git a/recipes/gcc/gcc-4.5.inc b/recipes/gcc/gcc-4.5.inc index 0239a29127..0a43bc7ef4 100644 --- a/recipes/gcc/gcc-4.5.inc +++ b/recipes/gcc/gcc-4.5.inc @@ -8,9 +8,9 @@ DEPENDS = "mpfr gmp libmpc libelf" NATIVEDEPS = "mpfr-native gmp-native libmpc-native" -INC_PR = "r32" +INC_PR = "r33" -SRCREV = "170123" +SRCREV = "170443" PV = "4.5" # BINV should be incremented after updating to a revision # after a minor gcc release (e.g. 4.5.1 or 4.5.2) has been made @@ -167,7 +167,8 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH} \ file://linaro/gcc-4.5-linaro-r99468.patch \ file://linaro/gcc-4.5-linaro-r99473.patch \ # file://linaro/gcc-4.5-linaro-r99474.patch \ -# file://linaro/gcc-4.5-linaro-r99475.patch \ + file://linaro/gcc-4.5-linaro-r99475.patch \ + file://tune-xscale-infinite-loop-PR45177.patch \ file://gcc-scalar-widening-pr45847.patch \ file://gcc-arm-volatile-bitfield-fix.patch \ " diff --git a/recipes/gcc/gcc-4.5/tune-xscale-infinite-loop-PR45177.patch b/recipes/gcc/gcc-4.5/tune-xscale-infinite-loop-PR45177.patch new file mode 100644 index 0000000000..55c6f90cb9 --- /dev/null +++ b/recipes/gcc/gcc-4.5/tune-xscale-infinite-loop-PR45177.patch @@ -0,0 +1,103 @@ +commit dcb4aa7b04d03ba107fd628ec3dc663d0a01c397 +Author: bernds +Date: Tue Aug 10 18:45:10 2010 +0000 + + PR bootstrap/45177 + * config/arm/arm.c (multiple_operation_profitable_p): Move xscale + test here from arm_gen_load_multiple_1. + (arm_gen_load_multiple_1, arm_gen_store_multiple_1): Use + multiple_operation_profitable_p. + + + git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163077 138bc75d-0d04-0410-961f-82ee72b054a4 + +Index: gcc-4_5-branch/gcc/config/arm/arm.c +=================================================================== +--- gcc-4_5-branch.orig/gcc/config/arm/arm.c ++++ gcc-4_5-branch/gcc/config/arm/arm.c +@@ -9716,6 +9716,36 @@ multiple_operation_profitable_p (bool is + if (nops == 2 && arm_ld_sched && add_offset != 0) + return false; + ++ /* XScale has load-store double instructions, but they have stricter ++ alignment requirements than load-store multiple, so we cannot ++ use them. ++ ++ For XScale ldm requires 2 + NREGS cycles to complete and blocks ++ the pipeline until completion. ++ ++ NREGS CYCLES ++ 1 3 ++ 2 4 ++ 3 5 ++ 4 6 ++ ++ An ldr instruction takes 1-3 cycles, but does not block the ++ pipeline. ++ ++ NREGS CYCLES ++ 1 1-3 ++ 2 2-6 ++ 3 3-9 ++ 4 4-12 ++ ++ Best case ldr will always win. However, the more ldr instructions ++ we issue, the less likely we are to be able to schedule them well. ++ Using ldr instructions also increases code size. ++ ++ As a compromise, we use ldr for counts of 1 or 2 regs, and ldm ++ for counts of 3 or 4 regs. */ ++ if (nops <= 2 && arm_tune_xscale && !optimize_size) ++ return false; + return true; + } + +@@ -10073,36 +10103,7 @@ arm_gen_load_multiple_1 (int count, int + { + int i = 0, j; + rtx result; +- +- /* XScale has load-store double instructions, but they have stricter +- alignment requirements than load-store multiple, so we cannot +- use them. +- +- For XScale ldm requires 2 + NREGS cycles to complete and blocks +- the pipeline until completion. +- +- NREGS CYCLES +- 1 3 +- 2 4 +- 3 5 +- 4 6 +- +- An ldr instruction takes 1-3 cycles, but does not block the +- pipeline. +- +- NREGS CYCLES +- 1 1-3 +- 2 2-6 +- 3 3-9 +- 4 4-12 +- +- Best case ldr will always win. However, the more ldr instructions +- we issue, the less likely we are to be able to schedule them well. +- Using ldr instructions also increases code size. +- +- As a compromise, we use ldr for counts of 1 or 2 regs, and ldm +- for counts of 3 or 4 regs. */ +- if (low_irq_latency || (arm_tune_xscale && count <= 2 && ! optimize_size)) ++ if (!multiple_operation_profitable_p (false, count, 0)) + { + rtx seq; + +@@ -10154,9 +10155,7 @@ arm_gen_store_multiple_1 (int count, int + if (GET_CODE (basereg) == PLUS) + basereg = XEXP (basereg, 0); + +- /* See arm_gen_load_multiple_1 for discussion of +- the pros/cons of ldm/stm usage for XScale. */ +- if (low_irq_latency || (arm_tune_xscale && count <= 2 && ! optimize_size)) ++ if (!multiple_operation_profitable_p (false, count, 0)) + { + rtx seq; + From 31a400b4aab89459037eef58c8e01834573800b9 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 24 Feb 2011 16:11:25 -0700 Subject: [PATCH 070/509] sane-toolchain.inc: Fix a thinko in compute_os_portion_of_target_triplet Reported by by Pau Espin Pedrol Signed-off-by: Tom Rini --- conf/distro/include/sane-toolchain.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index dd066508b3..5882fd7a90 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -199,8 +199,8 @@ def compute_os_portion_of_target_triplet (d): bb.note("DISTRO_FEATURES is not set abi suffix not set") abi_suffix = "" - if bb.data.getVar('TOOLCHAIN_BRAND',d,1) is not None and \ - bb.data.getVar('TOOLCHAIN_BRAND',d,1) in "csl": + if bb.data.getVar('TOOLCHAIN_BRAND', d, 1) is not None and \ + "csl" in bb.data.getVar('TOOLCHAIN_BRAND', d, 1): gnu_suffix = "gnu" if libc_suffix + gnu_suffix + abi_suffix is not "": From 1b5d32865a8a6b1f368deb895fbdbb5c006b738a Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 24 Feb 2011 19:24:21 +0100 Subject: [PATCH 071/509] klibc: update jffs2 and vfat patch. Fix gcc warnings. Signed-off-by: Andrea Adami --- .../fstype-sane-vfat-and-jffs2-for-1.5.patch | 72 ++++++++++--------- 1 file changed, 39 insertions(+), 33 deletions(-) diff --git a/recipes/klibc/klibc-1.5.21/fstype-sane-vfat-and-jffs2-for-1.5.patch b/recipes/klibc/klibc-1.5.21/fstype-sane-vfat-and-jffs2-for-1.5.patch index 041f67988c..4448fe26e9 100644 --- a/recipes/klibc/klibc-1.5.21/fstype-sane-vfat-and-jffs2-for-1.5.patch +++ b/recipes/klibc/klibc-1.5.21/fstype-sane-vfat-and-jffs2-for-1.5.patch @@ -1,7 +1,7 @@ -Index: klibc-1.5/usr/kinit/fstype/fstype.c +Index: klibc-1.5.21/usr/kinit/fstype/fstype.c =================================================================== ---- klibc-1.5.orig/usr/kinit/fstype/fstype.c 2008-02-28 00:48:35.319254938 +0100 -+++ klibc-1.5/usr/kinit/fstype/fstype.c 2008-02-28 00:52:20.583257793 +0100 +--- a/usr/kinit/fstype/fstype.c ++++ b/usr/kinit/fstype/fstype.c @@ -20,7 +20,7 @@ #include #include @@ -9,12 +9,12 @@ Index: klibc-1.5/usr/kinit/fstype/fstype.c - +#include #define cpu_to_be32(x) __cpu_to_be32(x) /* Needed by romfs_fs.h */ - - #include "romfs_fs.h" -@@ -37,6 +37,12 @@ - #include "ocfs2_fs.h" - #include "nilfs_fs.h" - + + #include "btrfs.h" +@@ -38,6 +38,12 @@ + #include "squashfs_fs.h" + #include "xfs_sb.h" + +#if __BYTE_ORDER == __BIG_ENDIAN +#include +#else @@ -24,40 +24,46 @@ Index: klibc-1.5/usr/kinit/fstype/fstype.c /* * Slightly cleaned up version of jfs_superblock to * avoid pulling in other kernel header files. -@@ -59,6 +65,27 @@ +@@ -60,6 +66,30 @@ /* Swap needs the definition of block size */ #include "swap_fs.h" - -+static int jffs2_image(const unsigned char *buf, unsigned long *blocks) + ++static int jffs2_image(const void *buf, unsigned long long *blocks) +{ -+ // Very sloppy! ;-E -+ if (*buf == 0x85 && buf[1] == 0x19) -+ return 1; ++ const unsigned char *p = buf; + -+ return 0; ++ if (p[0] == 0x85 && p[1] == 0x19) { ++ *blocks=0; ++ return 1; ++ } ++ return 0; +} + -+static int vfat_image(const unsigned char *buf, unsigned long *blocks) ++static int vfat_image(const void *buf, unsigned long long *blocks) +{ -+ const struct romfs_super_block *sb = -+ (const struct romfs_super_block *)buf; -+ if (!strncmp(buf + 54, "FAT12 ", 8) -+ || !strncmp(buf + 54, "FAT16 ", 8) -+ || !strncmp(buf + 82, "FAT32 ", 8)) -+ return 1; ++ const char *p = buf; + -+ return 0; ++ if (!strncmp(p + 54, "FAT12 ", 8) ++ || !strncmp(p + 54, "FAT16 ", 8) ++ || !strncmp(p + 82, "FAT32 ", 8)) { ++ *blocks=0; ++ return 1; ++ } ++ return 0; +} + static int gzip_image(const void *buf, unsigned long long *bytes) - {277 304 - const unsigned char *p = buf; -@@ -490,6 +517,8 @@ - {1, "ext3", ext3_image}, - {1, "ext2", ext2_image}, - {1, "minix", minix_image}, + { + const unsigned char *p = buf; +@@ -495,6 +525,8 @@ static struct imagetype images[] = { + {1, "ext3", ext3_image}, + {1, "ext2", ext2_image}, + {1, "minix", minix_image}, + {0, "jffs2", jffs2_image}, + {0, "vfat", vfat_image}, - {1, "nilfs2", nilfs2_image}, - {2, "ocfs2", ocfs2_image}, - {8, "reiserfs", reiserfs_image}, + {1, "nilfs2", nilfs2_image}, + {2, "ocfs2", ocfs2_image}, + {8, "reiserfs", reiserfs_image}, +-- +1.7.3.4 + From 217ac47cd82eaa42289673f435c56cc1ad4f4178 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 24 Feb 2011 09:31:41 +0000 Subject: [PATCH 072/509] busybox: fix udhcp check for NFS rootfs for new style /proc/mounts * Newer kernels change the format of /proc/mounts slightly when rootfs is mounted over NFS. * Old style: /dev/root / nfs 0 0 * New style: : / nfs 0 0 * The regexp in grep can be simplified and rolled into one, but may become less strict... Signed-off-by: Denys Dmytriyenko Acked-by: Khem Raj --- .../busybox-1.13.2/udhcpc-new-nfsroot.patch | 16 ++++++++++++++++ .../busybox-1.18.3/udhcpc-new-nfsroot.patch | 16 ++++++++++++++++ recipes/busybox/busybox_1.13.2.bb | 2 +- recipes/busybox/busybox_1.18.3.bb | 2 +- recipes/busybox/busybox_1.1x.inc | 1 + 5 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 recipes/busybox/busybox-1.13.2/udhcpc-new-nfsroot.patch create mode 100644 recipes/busybox/busybox-1.18.3/udhcpc-new-nfsroot.patch diff --git a/recipes/busybox/busybox-1.13.2/udhcpc-new-nfsroot.patch b/recipes/busybox/busybox-1.13.2/udhcpc-new-nfsroot.patch new file mode 100644 index 0000000000..46aaab97be --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/udhcpc-new-nfsroot.patch @@ -0,0 +1,16 @@ +diff -uNr busybox-1.13.2.orig/examples/udhcp/simple.script busybox-1.13.2/examples/udhcp/simple.script +--- busybox-1.13.2.orig/examples/udhcp/simple.script 2011-02-23 00:30:32.000000000 -0500 ++++ busybox-1.13.2/examples/udhcp/simple.script 2011-02-23 17:05:37.873381763 -0500 +@@ -10,7 +10,12 @@ + + # return 0 if root is mounted on a network filesystem + root_is_nfs() { ++ # old style mounts + grep -qe '^/dev/root.*\(nfs\|smbfs\|ncp\|coda\) .*' /proc/mounts ++ if ! $? ; then ++ # new style mounts ++ grep -qe '^.*:.* / \(nfs\|smbfs\|ncp\|coda\) .*' /proc/mounts ++ fi + } + + case "$1" in diff --git a/recipes/busybox/busybox-1.18.3/udhcpc-new-nfsroot.patch b/recipes/busybox/busybox-1.18.3/udhcpc-new-nfsroot.patch new file mode 100644 index 0000000000..46aaab97be --- /dev/null +++ b/recipes/busybox/busybox-1.18.3/udhcpc-new-nfsroot.patch @@ -0,0 +1,16 @@ +diff -uNr busybox-1.13.2.orig/examples/udhcp/simple.script busybox-1.13.2/examples/udhcp/simple.script +--- busybox-1.13.2.orig/examples/udhcp/simple.script 2011-02-23 00:30:32.000000000 -0500 ++++ busybox-1.13.2/examples/udhcp/simple.script 2011-02-23 17:05:37.873381763 -0500 +@@ -10,7 +10,12 @@ + + # return 0 if root is mounted on a network filesystem + root_is_nfs() { ++ # old style mounts + grep -qe '^/dev/root.*\(nfs\|smbfs\|ncp\|coda\) .*' /proc/mounts ++ if ! $? ; then ++ # new style mounts ++ grep -qe '^.*:.* / \(nfs\|smbfs\|ncp\|coda\) .*' /proc/mounts ++ fi + } + + case "$1" in diff --git a/recipes/busybox/busybox_1.13.2.bb b/recipes/busybox/busybox_1.13.2.bb index ef20c62d3b..fca3e938ae 100644 --- a/recipes/busybox/busybox_1.13.2.bb +++ b/recipes/busybox/busybox_1.13.2.bb @@ -1,5 +1,5 @@ require busybox_1.1x.inc -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" SRC_URI += "\ file://busybox-1.13.2-awk.patch \ diff --git a/recipes/busybox/busybox_1.18.3.bb b/recipes/busybox/busybox_1.18.3.bb index 633b70bc73..f85de86c74 100644 --- a/recipes/busybox/busybox_1.18.3.bb +++ b/recipes/busybox/busybox_1.18.3.bb @@ -1,5 +1,5 @@ require busybox_1.1x.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI += " \ http://busybox.net/downloads/fixes-1.18.3/busybox-1.18.3-buildsys.patch;name=patch01 \ diff --git a/recipes/busybox/busybox_1.1x.inc b/recipes/busybox/busybox_1.1x.inc index 7623944403..aefa57fd2b 100644 --- a/recipes/busybox/busybox_1.1x.inc +++ b/recipes/busybox/busybox_1.1x.inc @@ -5,6 +5,7 @@ SRC_URI = "\ file://fdisk_nios2.patch \ file://udhcpscript.patch \ file://udhcpc-fix-nfsroot.patch \ + file://udhcpc-new-nfsroot.patch \ file://B921600.patch \ file://get_header_tar.patch \ file://busybox-appletlib-dependency.patch \ From 1d138f37c714d616b731e83db229ac43d7fb96d0 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 25 Feb 2011 07:39:16 +0000 Subject: [PATCH 073/509] bitbake.conf, native*.bbclass: pass --sysroot to TOOLCHAIN_OPTIONS Commit 9c5b9db29738a89837917b1a2d8ee5a1cae0b4cc (bitbake.conf: Simplify TARGET_CPPFLAGS/LDFLAGS) potentially breaks external toolchains, when their default sysroot is different from our sysroot/staging location. Pass default --sysroot to compiler/linker through TOOLCHAIN_OPTIONS, avoiding native and nativesdk packages. This matches the corresponding changes in Poky. cross.bbclass was already doing it, since it originated from Poky, AFAIK. Signed-off-by: Denys Dmytriyenko Acked-by: Tom Rini --- classes/native.bbclass | 2 ++ classes/nativesdk.bbclass | 2 ++ conf/bitbake.conf | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/native.bbclass b/classes/native.bbclass index 000ad61fc4..b8a792f735 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -37,6 +37,8 @@ CXXFLAGS = "${BUILD_CFLAGS}" LDFLAGS = "${BUILD_LDFLAGS}" LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE} " +TOOLCHAIN_OPTIONS = "" + STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}" STAGING_BINDIR_CROSS = "${STAGING_BINDIR_NATIVE}" diff --git a/classes/nativesdk.bbclass b/classes/nativesdk.bbclass index 6f2153436a..66893995d0 100644 --- a/classes/nativesdk.bbclass +++ b/classes/nativesdk.bbclass @@ -36,6 +36,8 @@ CFLAGS = "${BUILDSDK_CFLAGS}" CXXFLAGS = "${BUILDSDK_CFLAGS}" LDFLAGS = "${BUILDSDK_LDFLAGS}" +TOOLCHAIN_OPTIONS = "" + # Change to place files in SDKPATH prefix = "${SDKPATH}" exec_prefix = "${SDKPATH}" diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 34f77260d0..1002c01a06 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -460,7 +460,7 @@ export PATH ################################################################## CCACHE ?= "" -TOOLCHAIN_OPTIONS = "" +TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" TOOLCHAIN_PATH ?= "${STAGING_DIR_NATIVE}${prefix_native}/${BASE_PACKAGE_ARCH}" TOOLCHAIN_SYSPATH ?= "${TOOLCHAIN_PATH}/${TARGET_SYS}" From 4f28b9ce6446dc367b4c880de24d7fef082137af Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 25 Feb 2011 07:39:17 +0000 Subject: [PATCH 074/509] ffmpeg: pass --sysroot to configure script directly ffmpeg's custom configure script fails some checks for specific headers, even though we pass --sysroot through CFLAGS. Use configure's specific --sysroot option to fix that. Signed-off-by: Denys Dmytriyenko Acked-by: Tom Rini --- recipes/ffmpeg/ffmpeg_0.5.bb | 3 ++- recipes/ffmpeg/ffmpeg_0.6.1.bb | 3 ++- recipes/ffmpeg/ffmpeg_git.bb | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb index f3a6d219ca..623c369a6d 100644 --- a/recipes/ffmpeg/ffmpeg_0.5.bb +++ b/recipes/ffmpeg/ffmpeg_0.5.bb @@ -2,7 +2,7 @@ require ffmpeg.inc DEPENDS += "schroedinger libgsm" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" DEFAULT_PREFERENCE = "1" @@ -47,6 +47,7 @@ EXTRA_OECONF = " \ --enable-cross-compile \ --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ --extra-ldflags="${TARGET_LDFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ + --sysroot="${STAGING_DIR_TARGET}" \ --enable-hardcoded-tables \ ${EXTRA_FFCONF} \ " diff --git a/recipes/ffmpeg/ffmpeg_0.6.1.bb b/recipes/ffmpeg/ffmpeg_0.6.1.bb index fb941a5262..74a1161df4 100644 --- a/recipes/ffmpeg/ffmpeg_0.6.1.bb +++ b/recipes/ffmpeg/ffmpeg_0.6.1.bb @@ -2,7 +2,7 @@ require ffmpeg.inc LICENSE = "LGPLv2.1+" DEPENDS += "schroedinger libgsm" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "http://ffmpeg.org/releases/ffmpeg-${PV}.tar.bz2" SRC_URI[md5sum] = "4f5d732d25eedfb072251b5314ba2093" @@ -26,6 +26,7 @@ EXTRA_OECONF = " \ --enable-swscale \ --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ --extra-ldflags="${TARGET_LDFLAGS}" \ + --sysroot="${STAGING_DIR_TARGET}" \ --prefix=${prefix}/ \ --target-os=linux \ ${EXTRA_FFCONF} \ diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb index 27e88ea7b2..24c81ea24e 100644 --- a/recipes/ffmpeg/ffmpeg_git.bb +++ b/recipes/ffmpeg/ffmpeg_git.bb @@ -6,7 +6,7 @@ DEPENDS += "virtual/libsdl schroedinger libgsm libvpx" SRCREV = "a4f5af13fb00d7f55946470bb0f52e1dbf5f3c6a" PV = "0.6.1+${PR}+gitr${SRCPV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" @@ -47,6 +47,7 @@ EXTRA_OECONF = " \ --enable-cross-compile \ --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ --extra-ldflags="${TARGET_LDFLAGS}" \ + --sysroot="${STAGING_DIR_TARGET}" \ --enable-hardcoded-tables \ ${EXTRA_FFCONF} \ " From d464c100dbbb7b60ed3ebaa0cb138cbfb74b2861 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 25 Feb 2011 07:39:18 +0000 Subject: [PATCH 075/509] gst-ffmpeg: remove 4-year old hack that sets CC directly The hack that sets CC variable directly is 4 year old and no longer required. On the other hand, it now breaks setups when --sysroot needs to be passed to the toolchain. Hence, remove the hack. Signed-off-by: Denys Dmytriyenko Acked-by: Tom Rini --- recipes/gstreamer/gst-ffmpeg_0.10.11.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.11.bb b/recipes/gstreamer/gst-ffmpeg_0.10.11.bb index 3a6533a9dd..563521e7c4 100644 --- a/recipes/gstreamer/gst-ffmpeg_0.10.11.bb +++ b/recipes/gstreamer/gst-ffmpeg_0.10.11.bb @@ -5,6 +5,8 @@ LICENSE = "LGPL" HOMEPAGE = "http://www.gstreamer.net/" DEPENDS = "ffmpeg gstreamer gst-plugins-base zlib" +PR = "r1" + inherit autotools pkgconfig SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \ @@ -23,7 +25,3 @@ EXTRA_OECONF = " --with-system-ffmpeg " # We do this because the install program is called with -s which causes it to # call "strip" and it then mangles cross compiled stuff.. PATH_prepend := "${TOOLCHAIN_PATH}/${TARGET_SYS}/bin:" - -# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg -CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}" - From 2549561d6d9907635f9180fa81471ef39f8753b8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 25 Feb 2011 13:28:26 +0100 Subject: [PATCH 076/509] litephone: bump PR and fix QA issues * 459110a17e59594c4fd9183a5684413ffa1479dd added generate_qt_config_file task which is executed in empty workdir if builder is using rm_work * remove files subdir from SRC_URI and rename it for faster lookup Signed-off-by: Martin Jansa --- recipes/litephone/{files => litephone}/litephone.desktop | 2 +- recipes/litephone/litephone_git.bb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename recipes/litephone/{files => litephone}/litephone.desktop (83%) diff --git a/recipes/litephone/files/litephone.desktop b/recipes/litephone/litephone/litephone.desktop similarity index 83% rename from recipes/litephone/files/litephone.desktop rename to recipes/litephone/litephone/litephone.desktop index f58bc58da7..a21f20f61a 100644 --- a/recipes/litephone/files/litephone.desktop +++ b/recipes/litephone/litephone/litephone.desktop @@ -5,5 +5,5 @@ Exec=litephone Icon=litephone-mobile Terminal=false Type=Application -Categories=Applications; +Categories=Network;Telephony; StartupNotify=true diff --git a/recipes/litephone/litephone_git.bb b/recipes/litephone/litephone_git.bb index 4fc5441dc1..4e640a6006 100644 --- a/recipes/litephone/litephone_git.bb +++ b/recipes/litephone/litephone_git.bb @@ -2,10 +2,10 @@ require litephone.inc SRCREV = "4c9f16d9acc6cd18fc3f647b7e4f44a2d3bdd7b6" PV = "0.1+gitr${SRCPV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "git://git.senfdax.de/git/litephone;protocol=http \ - file://files/litephone.desktop" + file://litephone.desktop" S = "${WORKDIR}/git/" @@ -19,7 +19,7 @@ do_install() { install -d ${D}/${datadir}/litephone/translations install ${S}/translations/*.qm ${D}/${datadir}/litephone/translations/ install -d ${D}/${datadir}/applications - install ${WORKDIR}/files/litephone.desktop ${D}/${datadir}/applications/ + install ${WORKDIR}/litephone.desktop ${D}/${datadir}/applications/ } FILES_${PN}-locale-pl-pl += "/usr/share/litephone/translations/litephone_pl.qm" From b9dd77915be6e25ae2cbf0ddbc0d6b76f65fd317 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 25 Feb 2011 13:29:10 +0100 Subject: [PATCH 077/509] evopedia, qgpslog, stopwatch, wpa-gui: bump PR * 459110a17e59594c4fd9183a5684413ffa1479dd added generate_qt_config_file * task which is executed in empty workdir if builder is using rm_work Signed-off-by: Martin Jansa --- recipes/evopedia/evopedia_git.bb | 1 + recipes/qgpslog/qgpslog_0.2.1.bb | 2 +- recipes/stopwatch/stopwatch_1.4.0.bb | 2 +- recipes/wpa-supplicant/wpa-gui_0.6.9.bb | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes/evopedia/evopedia_git.bb b/recipes/evopedia/evopedia_git.bb index e939c03b74..0d833e7c41 100644 --- a/recipes/evopedia/evopedia_git.bb +++ b/recipes/evopedia/evopedia_git.bb @@ -7,6 +7,7 @@ RRECOMMENDS_${PN} = "midori" RRECOMMENDS_${PN}_shr = "eve" PV = "0.4.2+gitr${SRCPV}" +PR = "r1" SRC_URI = "git://gitorious.org/evopedia/evopedia.git;protocol=git;branch=master" diff --git a/recipes/qgpslog/qgpslog_0.2.1.bb b/recipes/qgpslog/qgpslog_0.2.1.bb index 7952d2bffc..726bedae29 100644 --- a/recipes/qgpslog/qgpslog_0.2.1.bb +++ b/recipes/qgpslog/qgpslog_0.2.1.bb @@ -5,7 +5,7 @@ SECTION = "x11/applications" PRIORITY = "optional" LICENSE = "GPL QPL PD" DEPENDS = "librsvg-native" -PR = "r0" +PR = "r1" SRC_URI = "http://openmoko.senfdax.de/sources/${PN}-${PV}.tar.gz;name=archive" diff --git a/recipes/stopwatch/stopwatch_1.4.0.bb b/recipes/stopwatch/stopwatch_1.4.0.bb index 91a19486b6..b4125f9bc3 100644 --- a/recipes/stopwatch/stopwatch_1.4.0.bb +++ b/recipes/stopwatch/stopwatch_1.4.0.bb @@ -4,7 +4,7 @@ SECTION = "x11/applications" PRIORITY = "optional" HOMEPAGE = "http://git.senfdax.de" LICENSE = "GPL QPL" -PR = "r0" +PR = "r1" inherit qt4x11 diff --git a/recipes/wpa-supplicant/wpa-gui_0.6.9.bb b/recipes/wpa-supplicant/wpa-gui_0.6.9.bb index 84c593f02a..386fd88ebf 100644 --- a/recipes/wpa-supplicant/wpa-gui_0.6.9.bb +++ b/recipes/wpa-supplicant/wpa-gui_0.6.9.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" DEPENDS = "librsvg-native imagemagick-native" RDEPENDS_${PN} = "wpa-supplicant" RRECOMMENDS_${PN} = "${LIBC}-gconv-utf-16" -PR = "r2" +PR = "r3" SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz;name=archive\ file://icons.patch \ From 4ec92977df4698a8bc8e7f5ab6b15662051dd537 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Fri, 25 Feb 2011 11:48:10 +0000 Subject: [PATCH 078/509] emtooth2_svn: bump PR to rev 129 Signed-off-by: Pau Espin Pedrol Signed-off-by: Martin Jansa --- recipes/openmoko-3rdparty/emtooth2_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/openmoko-3rdparty/emtooth2_svn.bb b/recipes/openmoko-3rdparty/emtooth2_svn.bb index 79a5bfd595..6be2dbb7e2 100644 --- a/recipes/openmoko-3rdparty/emtooth2_svn.bb +++ b/recipes/openmoko-3rdparty/emtooth2_svn.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2" DEPENDS = "glib-2.0 libeflvala" RDEPENDS_${PN} = "bluez4 obexd" -SRCREV = "127" +SRCREV = "129" PV = "0.1+svnr${SRCPV}" PR = "r0" From 0e18dca7bb4f50a0a8bd44937497a723da10fb84 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 24 Feb 2011 17:07:24 -0700 Subject: [PATCH 079/509] gthumb: Oops, regex needs to be a prepend Signed-off-by: Tom Rini --- recipes/gthumb/gthumb_2.10.11.bb | 3 --- recipes/gthumb/gthumb_2.6.9.bb | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/recipes/gthumb/gthumb_2.10.11.bb b/recipes/gthumb/gthumb_2.10.11.bb index 42dc02a32b..e6a7c1ebc0 100644 --- a/recipes/gthumb/gthumb_2.10.11.bb +++ b/recipes/gthumb/gthumb_2.10.11.bb @@ -14,9 +14,6 @@ FILES_${PN}-dbg += "${libdir}/gthumb/modules/.debug" do_configure_prepend() { sed -i "s|HACK_STAGING_DIR_HOST|${STAGING_DIR_HOST}|" ${S}/add-include-prefix -} - -do_configure_append() { # replace paths to STAGING_BINDIR_NATIVE/perl with ${bindir}/perl sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${S}/intltool*.in } diff --git a/recipes/gthumb/gthumb_2.6.9.bb b/recipes/gthumb/gthumb_2.6.9.bb index b1963420c5..2061fda96d 100644 --- a/recipes/gthumb/gthumb_2.6.9.bb +++ b/recipes/gthumb/gthumb_2.6.9.bb @@ -8,7 +8,7 @@ inherit autotools pkgconfig FILES_${PN} += "${datadir}/gnome* ${datadir}/application-registry/*" -do_configure_append() { +do_configure_prepend() { # replace paths to STAGING_BINDIR_NATIVE/perl with ${bindir}/perl sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${S}/intltool*.in } From 8bff073a8f1cd04601470b94a6ac1d7b2df0371d Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 25 Feb 2011 07:30:57 -0700 Subject: [PATCH 080/509] libnl2: Fix thinko in last patch Signed-off-by: Tom Rini --- recipes/libnl/libnl2/fix-pktloc-dep-race.patch | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/recipes/libnl/libnl2/fix-pktloc-dep-race.patch b/recipes/libnl/libnl2/fix-pktloc-dep-race.patch index 50acee4d26..ee217441b6 100644 --- a/recipes/libnl/libnl2/fix-pktloc-dep-race.patch +++ b/recipes/libnl/libnl2/fix-pktloc-dep-race.patch @@ -1,7 +1,3 @@ ---- - lib/Makefile.am | 3 +++ - 1 file changed, 3 insertions(+) - Index: libnl-2.0/lib/Makefile.am =================================================================== --- libnl-2.0.orig/lib/Makefile.am @@ -14,9 +10,8 @@ Index: libnl-2.0/lib/Makefile.am + # Hack to avoid using ylwrap. It does not function correctly in combination # with --header-file= --route/pktloc_grammar.c: route/pktloc_grammar.l +route/pktloc_grammar.h: route/pktloc_grammar.c -+route/pktloc_grammar.c: route/pktloc_grammar.y + route/pktloc_grammar.c: route/pktloc_grammar.l $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^ +route/pktloc_syntax.h: route/pktloc_syntax.c From d4d5b619443fb3c1db526bceb2286f2d869ac907 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 25 Feb 2011 07:49:53 -0700 Subject: [PATCH 081/509] unifdef: update from 2.4 to 2.6 As far as I can see, all the changes are bugfixes, and only one of those affects behavior in a noticable way to the user (-o now obeys -n, emitting line numbers to the specified output file). Signed-off-by: Chris Larson --- recipes/unifdef/{unifdef_2.4.bb => unifdef_2.6.bb} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename recipes/unifdef/{unifdef_2.4.bb => unifdef_2.6.bb} (78%) diff --git a/recipes/unifdef/unifdef_2.4.bb b/recipes/unifdef/unifdef_2.6.bb similarity index 78% rename from recipes/unifdef/unifdef_2.4.bb rename to recipes/unifdef/unifdef_2.6.bb index 89bc350da6..0fb40956ae 100644 --- a/recipes/unifdef/unifdef_2.4.bb +++ b/recipes/unifdef/unifdef_2.6.bb @@ -6,8 +6,9 @@ LICENSE = "BSD" PR = "0" SRC_URI = "http://dotat.at/prog/unifdef/unifdef-${PV}.tar.gz" -SRC_URI[md5sum] = "9aba8b30187244677f25834cbc11bfe2" -SRC_URI[sha256sum] = "52b8b5c411b3d33646b6a7518c37c3a2a308887c45ac58a13122823b02fd4f4a" +SRC_URI[md5sum] = "18b832baea2c7b6b00bd7d4f3db38f62" +SRC_URI[sha256sum] = "e4cbc673d32ebe10e00bc00b985c974e327e65d4b32a564d21358e458079e419" + EXTRA_OEMAKE = "-e" From de10d3ccb828c9f95c994326c658ccced52fa1ad Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 25 Feb 2011 08:09:35 -0700 Subject: [PATCH 082/509] Revert "autotools: symlink where we can" This is nice in theory, but there's a risk that a broken source tree could try to modify the files through the symlinks, screwing up everybody else using them. Of course, per-recipe sysroots would resolve this, so we can revisit this if/when that gets implemented. This reverts commit 302395545185b4e85bf76a8f319bc71bd3a7be1d. Signed-off-by: Chris Larson --- classes/autotools.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index a88a4d1e30..974458928a 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -137,11 +137,11 @@ oe_autoreconf () { if grep "sed.*POTFILES" $CONFIGURE_AC >/dev/null; then : do nothing -- we still have an old unmodified configure.ac else - echo "no" | glib-gettextize --force + echo "no" | glib-gettextize --force --copy fi else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then if [ -e ${STAGING_DATADIR}/gettext/config.rpath ]; then - ln -sf ${STAGING_DATADIR}/gettext/config.rpath ${S}/ + cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/ else oenote ${STAGING_DATADIR}/gettext/config.rpath not found. gettext is not installed. fi @@ -151,9 +151,9 @@ oe_autoreconf () { for aux in m4 `sed -n -e '/^[[:space:]]*AC_CONFIG_MACRO_DIR/s|[^(]*([[]*\([^])]*\)[]]*)|\1|p' $CONFIGURE_AC`; do mkdir -p ${aux} done - autoreconf -Wcross --verbose --install --symlink --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed." + autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed." if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then - intltoolize --force --automake + intltoolize --copy --force --automake fi } From bbc10db2e6ec706c91058047d66350a2a364d596 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Fri, 25 Feb 2011 15:48:44 +0100 Subject: [PATCH 083/509] freetpye: fix the manual call of libtool by freetype * remove unessary and not used patches * add rpath-link to the LDFLAGS, prevents libtool using relink at make install * bump PR --- .../freetype-2.4.3/fix-configure.patch | 13 ----- recipes/freetype/freetype/configure.patch | 47 ------------------- recipes/freetype/freetype_2.4.3.bb | 9 ++-- 3 files changed, 5 insertions(+), 64 deletions(-) delete mode 100644 recipes/freetype/freetype-2.4.3/fix-configure.patch delete mode 100644 recipes/freetype/freetype/configure.patch diff --git a/recipes/freetype/freetype-2.4.3/fix-configure.patch b/recipes/freetype/freetype-2.4.3/fix-configure.patch deleted file mode 100644 index ecd96738d4..0000000000 --- a/recipes/freetype/freetype-2.4.3/fix-configure.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: freetype-2.3.6/builds/unix/configure.ac -=================================================================== ---- freetype-2.3.6.orig/builds/unix/configure.ac -+++ freetype-2.3.6/builds/unix/configure.ac -@@ -506,8 +506,6 @@ AC_SUBST([FT2_EXTRA_LIBS]) - AC_SUBST([SYSTEM_ZLIB]) - - --LT_INIT(win32-dll) -- - AC_SUBST([hardcode_libdir_flag_spec]) - AC_SUBST([wl]) - AC_SUBST([build_libtool_libs]) diff --git a/recipes/freetype/freetype/configure.patch b/recipes/freetype/freetype/configure.patch deleted file mode 100644 index f11cf96be0..0000000000 --- a/recipes/freetype/freetype/configure.patch +++ /dev/null @@ -1,47 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - -Index: freetype-2.1.8/builds/unix/configure.ac -=================================================================== ---- freetype-2.1.8.orig/builds/unix/configure.ac 2004-04-14 04:49:11.000000000 -0400 -+++ freetype-2.1.8/builds/unix/configure.ac 2005-03-12 03:14:23.000000000 -0500 -@@ -111,8 +111,8 @@ - # Check for system zlib - - AC_ARG_WITH([zlib], -- dnl don't quote AS_HELP_STRING! -- AS_HELP_STRING([--without-zlib], -+ dnl don't quote AC_HELP_STRING! -+ AC_HELP_STRING([--without-zlib], - [use internal zlib instead of system-wide])) - if test x$with_zlib != xno && test -z "$LIBZ"; then - AC_CHECK_LIB([z], [gzsetparams], [AC_CHECK_HEADER([zlib.h], [LIBZ='-lz'])]) -@@ -127,7 +127,7 @@ - # Whether to use Mac OS resource-based fonts or not - - AC_ARG_WITH([old-mac-fonts], -- dnl don't quote AS_HELP_STRING! -- AS_HELP_STRING([--with-old-mac-fonts], -+ dnl don't quote AC_HELP_STRING! -+ AC_HELP_STRING([--with-old-mac-fonts], - [allow Mac resource-based fonts to be used])) - if test x$with_old_mac_fonts = xyes; then -Index: freetype-2.1.8/builds/unix/unix-cc.in -=================================================================== ---- freetype-2.1.8.orig/builds/unix/unix-cc.in 2003-11-09 03:37:13.000000000 -0500 -+++ freetype-2.1.8/builds/unix/unix-cc.in 2005-03-12 18:37:24.613693760 -0500 -@@ -14,9 +14,11 @@ - - CC := @CC@ - COMPILER_SEP := $(SEP) -+SHELL := @SHELL@ -+top_builddir := $(BUILD_DIR) - - ifndef LIBTOOL -- LIBTOOL := $(BUILD_DIR)/libtool -+ LIBTOOL := @LIBTOOL@ - endif - - diff --git a/recipes/freetype/freetype_2.4.3.bb b/recipes/freetype/freetype_2.4.3.bb index 90a0fe8c49..66d2e51fe2 100644 --- a/recipes/freetype/freetype_2.4.3.bb +++ b/recipes/freetype/freetype_2.4.3.bb @@ -1,13 +1,12 @@ DESCRIPTION = "Freetype font rendering library" SECTION = "libs" LICENSE = "freetype GPLv2" -PR = "r0" +PR = "r1" DEPENDS = "zlib" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ file://no-hardcode.patch \ - file://fix-configure.patch \ file://libtool-tag.patch \ " S = "${WORKDIR}/freetype-${PV}" @@ -17,14 +16,16 @@ SRC_URI[sha256sum] = "b4e626db62fd1b4549ff5d57f5eca3a41631fd6066adf8a31c11879b51 inherit autotools pkgconfig binconfig -LIBTOOL = "${HOST_SYS}-libtool" +LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" +LDFLAGS_append = " -Wl,-rpath-link -Wl,${STAGING_DIR_TARGET}${libdir}" + do_configure() { cd builds/unix - libtoolize --force --copy gnu-configize --force aclocal -I . + libtoolize --force --copy autoconf cd ${S} oe_runconf From e1ab24b73e5202887fe57c4ea6aad5c65a697d00 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Fri, 25 Feb 2011 20:22:31 +0100 Subject: [PATCH 084/509] libnl2: add flex-native and bison-native to the depends and bump PR --- recipes/libnl/libnl2_2.0.bb | 4 +++- recipes/libnl/libnl2_git.bb | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/recipes/libnl/libnl2_2.0.bb b/recipes/libnl/libnl2_2.0.bb index 3484f24543..7e9336e68a 100644 --- a/recipes/libnl/libnl2_2.0.bb +++ b/recipes/libnl/libnl2_2.0.bb @@ -3,7 +3,9 @@ SECTION = "libs/network" LICENSE = "LGPL" HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" PE = "1" -PR = "r1" +PR = "r2" + +DEPENDS = "flex-native bison-native" inherit autotools pkgconfig diff --git a/recipes/libnl/libnl2_git.bb b/recipes/libnl/libnl2_git.bb index 9c6ff42032..b667815924 100644 --- a/recipes/libnl/libnl2_git.bb +++ b/recipes/libnl/libnl2_git.bb @@ -5,7 +5,9 @@ HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" SRCREV = "d378220c96c3c8b6f27dca33e7d8ba03318f9c2d" PV = "1.9+gitr${SRCPV}" PE = "1" -PR = "r2" +PR = "r3" + +DEPENDS = "flex-native bison-native" inherit autotools From 13af40e169eb93ea86efa22248f20a8e8f070d86 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 25 Feb 2011 20:14:34 +0000 Subject: [PATCH 085/509] freerdp: bump SRCREV and change license to Apache-2.0 Signed-off-by: Otavio Salvador Signed-off-by: Tom Rini --- recipes/freerdp/freerdp.inc | 4 ++-- recipes/freerdp/freerdp_git.bb | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/recipes/freerdp/freerdp.inc b/recipes/freerdp/freerdp.inc index 0b9c9ace64..c75175ee17 100644 --- a/recipes/freerdp/freerdp.inc +++ b/recipes/freerdp/freerdp.inc @@ -5,9 +5,9 @@ DESCRIPTION = "FreeRDP RDP client" HOMEPAGE = "http://freerdp.sourceforge.net" DEPENDS = "virtual/libx11 openssl libxcursor cups alsa-lib" SECTION = "x11/network" -LICENSE = "GPL" +LICENSE = "Apache-2.0" -INC_PR = "r4" +INC_PR = "r5" inherit pkgconfig autotools diff --git a/recipes/freerdp/freerdp_git.bb b/recipes/freerdp/freerdp_git.bb index 37d0041f51..1ed2a19158 100644 --- a/recipes/freerdp/freerdp_git.bb +++ b/recipes/freerdp/freerdp_git.bb @@ -7,11 +7,9 @@ inherit gitpkgv PV = "gitr${SRCPV}" PKGV = "${GITPKGVTAG}" +PR = "${INC_PR}.0" -SRCREV = "aec5dd5807dbcd0989bb15124dcac157bb0412bc" -PR = "${INC_PR}.4" +SRCREV = "6f7eb2abb077d60a09eeb66a10ad97d102336d3c" +SRC_URI = "git://freerdp.git.sourceforge.net/gitroot/freerdp/freerdp.git;protocol=git" S = "${WORKDIR}/git" - - -SRC_URI = "git://freerdp.git.sourceforge.net/gitroot/freerdp/freerdp.git;protocol=git" From 0cc981d2e2a6bdcf83b5295a5b54944828aceb63 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 25 Feb 2011 22:45:28 +0000 Subject: [PATCH 086/509] linux: update 2.6.37 to 2.6.37.2 Signed-off-by: Otavio Salvador Acked-by: Martin Jansa Signed-off-by: Tom Rini --- recipes/linux/linux_2.6.37.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/linux/linux_2.6.37.bb b/recipes/linux/linux_2.6.37.bb index e11af813c4..1cd40f433c 100644 --- a/recipes/linux/linux_2.6.37.bb +++ b/recipes/linux/linux_2.6.37.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r3" +PR = "r4" # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" @@ -20,7 +20,7 @@ DEFAULT_PREFERENCE_visstrim_m10 = "1" # DEFAULT_PREFERENCE_om-gta01 = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.1.bz2;apply=yes;name=stablepatch \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.2.bz2;apply=yes;name=stablepatch \ file://defconfig " SRC_URI_append_om-gta02 = " \ @@ -34,5 +34,5 @@ SRC_URI_append_om-gta01 = " \ SRC_URI[kernel.md5sum] = "c8ee37b4fdccdb651e0603d35350b434" SRC_URI[kernel.sha256sum] = "edbf091805414739cf57a3bbfeba9e87f5e74f97e38f04d12060e9e0c71e383a" -SRC_URI[stablepatch.md5sum] = "7693d1d32ed39346cc988e0f027e5890" -SRC_URI[stablepatch.sha256sum] = "c33bfa59828a9ff6916993ec008967a8c1d71a18b743ee15f4280e773ef4baaf" +SRC_URI[stablepatch.md5sum] = "bb5798f2a2a5af13219d1a250c4dad11" +SRC_URI[stablepatch.sha256sum] = "3d65f2fb5f0018e8dafda4abe68d947d2ab5e21c386062cb0d6e011244a16aef" From 4625773a48cf5aedfac253c0272cb29e2d6f6451 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 25 Feb 2011 20:14:35 +0000 Subject: [PATCH 087/509] src_distribute.bbclass: distribute only SRC_DISTRIBUTE_LICENSES A distro can require conf/licenses.conf or set SRC_DISTRIBUTE_LICENSES selecting which licenses are wanted to be distributed. In case it is empty or undefined we default to distribute all licenses to not break backward compatibility. Signed-off-by: Otavio Salvador Signed-off-by: Tom Rini --- classes/src_distribute.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/classes/src_distribute.bbclass b/classes/src_distribute.bbclass index 242d70ceec..f3d3cbacd1 100644 --- a/classes/src_distribute.bbclass +++ b/classes/src_distribute.bbclass @@ -16,6 +16,7 @@ python do_distribute_sources () { dldir = os.path.realpath(d.getVar("DL_DIR", 1) or "") licenses = (bb.data.getVar('LICENSE', d, 1) or "unknown").split() + distribute_licenses = (bb.data.getVar('SRC_DISTRIBUTE_LICENSES', d, 1) or "All").split() urldatadict = bb.fetch.init(d.getVar("SRC_URI", True).split(), d, True) src_uri = oe.data.typed_value("SRC_URI", d) if not src_uri: @@ -33,8 +34,9 @@ python do_distribute_sources () { bb.data.setVar('SRC', os.path.abspath(local), d) for license in licenses: for entry in license.split("|"): - bb.data.setVar('LIC', entry, d) - bb.build.exec_func('SRC_DISTRIBUTECOMMAND', d) + if entry in distribute_licenses or "All" in distribute_licenses: + bb.data.setVar('LIC', entry, d) + bb.build.exec_func('SRC_DISTRIBUTECOMMAND', d) } addtask distribute_sources_all after do_distribute_sources From 387f784b73ce57075d2ed138195f0f051c79e8f6 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 25 Feb 2011 13:22:46 -0700 Subject: [PATCH 088/509] insane.bbclas: Add locking in package_qa_check_staged Signed-off-by: Tom Rini --- classes/insane.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 11e671c7ce..f2da284601 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -342,9 +342,9 @@ def package_qa_check_staged(path,d): pkgconfigcheck = workdir iscrossnative = True - # find all .la and .pc files - # read the content - # and check for stuff that looks wrong + # Grab the lock, find all .la and .pc files, read the content and check for + # stuff that looks wrong + lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d)) for root, dirs, files in os.walk(path): for file in files: path = os.path.join(root,file) @@ -363,6 +363,7 @@ def package_qa_check_staged(path,d): if pkgconfigcheck in file_content: error_msg = "%s failed sanity test (tmpdir) in path %s" % (file,root) sane = package_qa_handle_error(6, error_msg, "staging", path, d) + bb.utils.unlockfile(lf) return sane From b533c79e286a8b978ef9c55baba6a02bf62ab50e Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 25 Feb 2011 13:23:44 -0700 Subject: [PATCH 089/509] package.bbclass: Update locking now that pstaging is always on. In a few functions we checked if pstagingactive was set and if so, grabbed the lock. But really, we should always be locking here. And inside of package_do_shlibs we need to keep the lock a little longer than we had been otherwise we can run into a race.. Signed-off-by: Tom Rini --- classes/package.bbclass | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/classes/package.bbclass b/classes/package.bbclass index ce7ff869e4..901ad9d1c3 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -543,9 +543,7 @@ python emit_pkgdata() { pkgdest = bb.data.getVar('PKGDEST', d, 1) pkgdatadir = bb.data.getVar('PKGDATA_DIR', d, True) - pstageactive = bb.data.getVar('PSTAGING_ACTIVE', d, True) - if pstageactive == "1": - lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d)) + lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d)) data_file = pkgdatadir + bb.data.expand("/${PN}" , d) f = open(data_file, 'w') @@ -593,8 +591,7 @@ python emit_pkgdata() { packagedfile = pkgdatadir + '/runtime/%s.packaged' % pkg file(packagedfile, 'w').close() package_stagefile(packagedfile, d) - if pstageactive == "1": - bb.utils.unlockfile(lf) + bb.utils.unlockfile(lf) } emit_pkgdata[dirs] = "${PKGDATA_DIR}/runtime" @@ -634,10 +631,6 @@ python package_do_shlibs() { shlibs_dir = bb.data.getVar('SHLIBSDIR', d, True) bb.mkdirhier(shlibs_dir) - pstageactive = bb.data.getVar('PSTAGING_ACTIVE', d, True) - if pstageactive == "1": - lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d)) - if bb.data.getVar('PACKAGE_SNAP_LIB_SYMLINKS', d, True) == "1": snap_symlinks = True else: @@ -650,6 +643,8 @@ python package_do_shlibs() { needed = {} private_libs = bb.data.getVar('PRIVATE_LIBS', d, True) + + lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d)) for pkg in packages.split(): needs_ldconfig = False bb.debug(2, "calculating shlib provides for %s" % pkg) @@ -715,9 +710,6 @@ python package_do_shlibs() { postinst += bb.data.getVar('ldconfig_postinst_fragment', d, True) bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d) - if pstageactive == "1": - bb.utils.unlockfile(lf) - shlib_provider = {} list_re = re.compile('^(.*)\.list$') for dir in [shlibs_dir]: @@ -738,6 +730,7 @@ python package_do_shlibs() { fd.close() for l in lines: shlib_provider[l.rstrip()] = (dep_pkg, lib_ver) + bb.utils.unlockfile(lf) assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, True) if assumed_libs: @@ -831,9 +824,7 @@ python package_do_pkgconfig () { if hdr == 'Requires': pkgconfig_needed[pkg] += exp.replace(',', ' ').split() - pstageactive = bb.data.getVar('PSTAGING_ACTIVE', d, True) - if pstageactive == "1": - lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d)) + lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d)) for pkg in packages.split(): pkgs_file = os.path.join(shlibs_dir, pkg + ".pclist") @@ -881,8 +872,7 @@ python package_do_pkgconfig () { fd.close() package_stagefile(deps_file, d) - if pstageactive == "1": - bb.utils.unlockfile(lf) + bb.utils.unlockfile(lf) } python read_shlibdeps () { From 5db493c2e814b3860409a9b0f609feded64a8fe1 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 25 Feb 2011 15:35:30 -0700 Subject: [PATCH 090/509] phoneme-advanced: Fix SRC_URI java.net stuff has moved and we no longer need to do guest:''@ Signed-off-by: Tom Rini --- recipes/phoneme/phoneme-advanced.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/recipes/phoneme/phoneme-advanced.inc b/recipes/phoneme/phoneme-advanced.inc index 380126362d..2f1d109ee2 100644 --- a/recipes/phoneme/phoneme-advanced.inc +++ b/recipes/phoneme/phoneme-advanced.inc @@ -8,11 +8,10 @@ DEPENDS = "classpath-tools-native virtual/javac-native linux-libc-headers" inherit java update-alternatives # The PhoneME Advanced build system is documented here: http://java.sun.com/javame/reference/docs/cdc_build_system.pdf -# NOTE: We need to provide an empty password. pswd='' seems not to be the correct way. SRC_URI = "\ - svn://guest:''@phoneme.dev.java.net/svn/phoneme/builds/phoneme_advanced-mr2-dev-${BUILDREV};module=cdc;proto=https;localdir=cdc \ - svn://guest:''@phoneme.dev.java.net/svn/phoneme/builds/phoneme_advanced-mr2-dev-${BUILDREV};module=tools;proto=https;localdir=tools \ - svn://guest:''@phoneme.dev.java.net/svn/phoneme;module=legal;localdir=legal;proto=https \ + svn://svn.java.net/svn/phoneme~svn/builds/phoneme_advanced-mr2-dev-${BUILDREV};module=cdc;proto=https;localdir=cdc \ + svn://svn.java.net/svn/phoneme~svn/builds/phoneme_advanced-mr2-dev-${BUILDREV};module=tools;proto=https;localdir=tools \ + svn://svn.java.net/svn/phoneme~svn;module=legal;localdir=legal;proto=https \ " PROVIDES = "virtual/java-cdc java-cdc-runtime" From 35b468a74c725c5d8159051e3554a5eda7ddc9d4 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 25 Feb 2011 16:10:13 -0700 Subject: [PATCH 091/509] tzdata: Updated to 2011b Signed-off-by: Tom Rini --- recipes/tzdata/{tzdata_2011a.bb => tzdata_2011b.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename recipes/tzdata/{tzdata_2011a.bb => tzdata_2011b.bb} (62%) diff --git a/recipes/tzdata/tzdata_2011a.bb b/recipes/tzdata/tzdata_2011b.bb similarity index 62% rename from recipes/tzdata/tzdata_2011a.bb rename to recipes/tzdata/tzdata_2011b.bb index 7bd1ba0c7a..87ba61983b 100644 --- a/recipes/tzdata/tzdata_2011a.bb +++ b/recipes/tzdata/tzdata_2011b.bb @@ -6,6 +6,6 @@ require tzdata.inc PR = "${INC_PR}.0" -SRC_URI[tar.md5sum] = "d60f168fb7307d8c1b926c7dc3a6c5c1" -SRC_URI[tar.sha256sum] = "782c691b4750bdefeb84063128db685a8b8f31dc2efb887ee841ae105bfa747b" +SRC_URI[tar.md5sum] = "9eaf3ca354c42a32bd28e623539bf0e0" +SRC_URI[tar.sha256sum] = "ff45f5ddc2ec925249626d00d7bc2ffff587e0956a1d8245517a023bf27e4cc9" From 4d19f4f3428248b492a8bca6926d8f4d24b010c4 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 26 Feb 2011 08:04:36 -0700 Subject: [PATCH 092/509] local.conf.sample: Update BBMASK example Since bitbake.conf has a real BBMASK (and has for some time) we shouldn't suggest that people start out by wiping that out. Signed-off-by: Tom Rini --- conf/local.conf.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/local.conf.sample b/conf/local.conf.sample index bb76dbe089..ff3da96613 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -27,8 +27,8 @@ DL_DIR = "${HOME}/sources" BBFILES := "${@bb.fatal('Edit your conf/local.conf: BBFILES')}" # Use the BBMASK below to instruct BitBake to _NOT_ consider some .bb files -# This is a regulary expression, so be sure to get your parenthesis balanced. -BBMASK = "" +# This is a regular expression, so be sure to get your parenthesis balanced. +# BBMASK = "/(nonworking|obsolete)/" # Comment this if your host distribution does not provide the # help2man tool. From 047ba6539acdb1a491383c5b7327b298cbd26081 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 26 Feb 2011 08:10:30 -0700 Subject: [PATCH 093/509] libcap2: Fix uClibc build On uClibc we have not Signed-off-by: Tom Rini --- recipes/libcap/libcap2/fix-uclibc-build.patch | 16 ++++++++++++++++ recipes/libcap/libcap2_2.20.bb | 1 + 2 files changed, 17 insertions(+) create mode 100644 recipes/libcap/libcap2/fix-uclibc-build.patch diff --git a/recipes/libcap/libcap2/fix-uclibc-build.patch b/recipes/libcap/libcap2/fix-uclibc-build.patch new file mode 100644 index 0000000000..d42736eb1b --- /dev/null +++ b/recipes/libcap/libcap2/fix-uclibc-build.patch @@ -0,0 +1,16 @@ +Index: libcap-2.20/libcap/cap_file.c +=================================================================== +--- libcap-2.20.orig/libcap/cap_file.c ++++ libcap-2.20/libcap/cap_file.c +@@ -5,7 +5,11 @@ + */ + + #include ++#ifdef __UCLIBC__ ++#include ++#else + #include ++#endif + #include + #include + #include diff --git a/recipes/libcap/libcap2_2.20.bb b/recipes/libcap/libcap2_2.20.bb index 8f7dc3bf8d..f4b8401c1f 100644 --- a/recipes/libcap/libcap2_2.20.bb +++ b/recipes/libcap/libcap2_2.20.bb @@ -11,6 +11,7 @@ LDFLAGS =+ "-L../libcap" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/libcap2/libcap-${PV}.tar.bz2 \ file://make.patch \ + file://fix-uclibc-build.patch \ " SRC_URI[md5sum] = "10e47ed32ca2214eb0e58780282d27b4" From cb8371b7eda632997e87d9cd812dccbcde5bd318 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 26 Feb 2011 08:13:46 -0700 Subject: [PATCH 094/509] sdk.bbclass: Need to mask TOOLCHAIN_OPTIONS here as well Signed-off-by: Tom Rini --- classes/sdk.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass index bf77744eb6..8d5b3dc330 100644 --- a/classes/sdk.bbclass +++ b/classes/sdk.bbclass @@ -34,6 +34,8 @@ CFLAGS = "${BUILD_CFLAGS}" CXXFLAGS = "${BUILD_CFLAGS}" LDFLAGS = "${BUILD_LDFLAGS}" +TOOLCHAIN_OPTIONS = "" + # Path prefixes prefix = "${SDK_PATH}" exec_prefix = "${prefix}" From b17d6facf4c63aa2cba18baeffb24c50982a9801 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 26 Feb 2011 09:53:39 -0600 Subject: [PATCH 095/509] SlugOS: remove TARGET_ARCH (set in machine conf instead), bump up distro to v6.0 --- conf/distro/include/slugos.inc | 2 +- conf/distro/slugos.conf | 8 ++------ conf/distro/ucslugc.conf | 3 +-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 32ec09d196..994b2c15cb 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "5.8" +SLUGOS_VERSION = "6.0" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 049e24ebed..4679d95c3b 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -2,14 +2,9 @@ #@NAME: SlugOS #@DESCRIPTION: SlugOS Linux Distribution for the NSLU2 -#---------------------------------------------------------------------------------- -# STANDARD SlugOS/BE DEFINITIONS -#---------------------------------------------------------------------------------- DISTRO_NAME = "SlugOS" -# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" -# DISTRO_FEED = "unstable" DISTRO_TYPE = "alpha" -TARGET_ARCH ?= "armeb" + ARM_INSTRUCTION_SET = "thumb" IPKG_VARIANT ?= "opkg" PREFERRED_PROVIDER_opkg ?= "opkg" @@ -18,6 +13,7 @@ IMAGE_INITSCRIPTS ?= "initscripts-slugos" IMAGE_DEV_MANAGER = "udev" # Disable installing ldconfig USE_LDCONFIG = "0" + require conf/distro/include/slugos.inc require conf/distro/include/sane-toolchain.inc require conf/distro/include/arm-thumb.inc diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index 8f6fbe58a9..e9109f167d 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -5,15 +5,14 @@ DISTRO_NAME = "UcSlugC" DISTRO_TYPE = "alpha" IMAGE_BASENAME = "ucslugc" -TARGET_ARCH = "armeb" ARM_INSTRUCTION_SET = "thumb" IPKG_VARIANT ?= "opkg" PREFERRED_PROVIDER_opkg ?= "opkg" PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg" IMAGE_INITSCRIPTS ?= "initscripts-slugos" +IMAGE_DEV_MANAGER = "busybox-mdev" LIBC = "uclibc" -IMAGE_DEV_MANAGER = "busybox-mdev" require conf/distro/include/slugos.inc require conf/distro/include/sane-toolchain.inc From 2731168e8a315a5e417ace4ec379d3dc68574602 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 26 Feb 2011 08:56:11 -0700 Subject: [PATCH 096/509] gnome.bbclass: Add --disable-scrollkeeper to EXTRA_OECONF Virtually all gnome recipes pass this already, this just fixes a few such as zenity. Signed-off-by: Tom Rini --- classes/gnome.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass index 7bc5d9c14e..6bc5530456 100644 --- a/classes/gnome.bbclass +++ b/classes/gnome.bbclass @@ -1,4 +1,4 @@ inherit gnomebase gtk-icon-cache gconf mime -EXTRA_OECONF += "--enable-introspection=no" +EXTRA_OECONF += "--enable-introspection=no --disable-scrollkeeper" From 734e49749a651e97b1bfd32abd3b8d65cd279e02 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 26 Feb 2011 09:10:07 -0700 Subject: [PATCH 097/509] gimp.inc: Drop sed-native from DEPENDS This was introduced forever ago and doesn't look to make sense anymore (there's no non-standard regexes being applied). This is also racy with 'sed' being invoked elsewhere. If we really can't rely on host sed we need to tackle this early and for everyone. Signed-off-by: Tom Rini --- recipes/gimp/gimp.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/gimp/gimp.inc b/recipes/gimp/gimp.inc index c3f2393243..c07d0dde00 100644 --- a/recipes/gimp/gimp.inc +++ b/recipes/gimp/gimp.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gimp.org" SECTION = "x11/graphics" LICENSE = "GPL" -DEPENDS = "sed-native gdk-pixbuf-csource-native libart-lgpl gtk+ jpeg libpng libexif tiff" +DEPENDS = "gdk-pixbuf-csource-native libart-lgpl gtk+ jpeg libpng libexif tiff" SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \ file://configure-libwmf.patch" From 5c6793fa320cd1dad055cca0ed7b6128a7757656 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 26 Feb 2011 09:43:31 -0700 Subject: [PATCH 098/509] Revert "libcap2: Fix uClibc build" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Petr Štetiar pointed out that I just switched this to using attr/xattr.h from e2fsprogs or similar rather than correctly fixing this. This reverts commit 150102aaf8226fcb56101ad0fbeda00ca95aef72. --- recipes/libcap/libcap2/fix-uclibc-build.patch | 16 ---------------- recipes/libcap/libcap2_2.20.bb | 1 - 2 files changed, 17 deletions(-) delete mode 100644 recipes/libcap/libcap2/fix-uclibc-build.patch diff --git a/recipes/libcap/libcap2/fix-uclibc-build.patch b/recipes/libcap/libcap2/fix-uclibc-build.patch deleted file mode 100644 index d42736eb1b..0000000000 --- a/recipes/libcap/libcap2/fix-uclibc-build.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: libcap-2.20/libcap/cap_file.c -=================================================================== ---- libcap-2.20.orig/libcap/cap_file.c -+++ libcap-2.20/libcap/cap_file.c -@@ -5,7 +5,11 @@ - */ - - #include -+#ifdef __UCLIBC__ -+#include -+#else - #include -+#endif - #include - #include - #include diff --git a/recipes/libcap/libcap2_2.20.bb b/recipes/libcap/libcap2_2.20.bb index f4b8401c1f..8f7dc3bf8d 100644 --- a/recipes/libcap/libcap2_2.20.bb +++ b/recipes/libcap/libcap2_2.20.bb @@ -11,7 +11,6 @@ LDFLAGS =+ "-L../libcap" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/libcap2/libcap-${PV}.tar.bz2 \ file://make.patch \ - file://fix-uclibc-build.patch \ " SRC_URI[md5sum] = "10e47ed32ca2214eb0e58780282d27b4" From 12939ce081140ef0fc60cc52b300079c44a5ebca Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 26 Feb 2011 09:51:54 -0700 Subject: [PATCH 099/509] minimal-uclibc.conf: Add xattr to DISTRO_FEATURES Signed-off-by: Tom Rini --- conf/distro/minimal-uclibc.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf index bc9615b79f..b85ed1e7e1 100644 --- a/conf/distro/minimal-uclibc.conf +++ b/conf/distro/minimal-uclibc.conf @@ -42,6 +42,8 @@ DISTRO_FEATURES += "eabi" DISTRO_FEATURES += "pam" # large file support is needed for libsndfile DISTRO_FEATURES += "largefile" +# libcap2 is pulled in via avahi +DISTRO_FEATURES += "xattr" # glib-2.0 needs ipv6 and there is no knob to control it DISTRO_FEATURES += "ipv4 ipv6" DISTRO_FEATURES += ' ${@["", "thumb-interwork"][bb.data.getVar('THUMB_INTERWORK', d, 1) == "yes"]}' From acc0e60471bb5129f59879bc376565640e3eccfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sat, 26 Feb 2011 11:49:06 +0100 Subject: [PATCH 100/509] jack: fix wrong configure check on the build host MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit | checking existing, conflicting JACK installs... | You appear to have at least one existing installation of JACK. | Complete or partial JACK installs exist in: /usr/lib [...] NOTE: package jack-0.118.0-r2: task do_configure: Failed Signed-off-by: Petr Štetiar Signed-off-by: Tom Rini --- .../jack/files/remove-wrong-host-test.patch | 66 +++++++++++++++++++ recipes/jack/jack_0.118.0.bb | 6 +- 2 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 recipes/jack/files/remove-wrong-host-test.patch diff --git a/recipes/jack/files/remove-wrong-host-test.patch b/recipes/jack/files/remove-wrong-host-test.patch new file mode 100644 index 0000000000..54c4a833f7 --- /dev/null +++ b/recipes/jack/files/remove-wrong-host-test.patch @@ -0,0 +1,66 @@ +| checking existing, conflicting JACK installs... +| +| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +| You appear to have at least one existing installation of JACK. +| Complete or partial JACK installs exist in: /usr/lib + +[...] + +NOTE: package jack-0.118.0-r2: task do_configure: Failed + +Index: RELEASE_0_118_0/configure.ac +=================================================================== +--- RELEASE_0_118_0.orig/configure.ac 2011-02-26 06:54:25.711716288 +0100 ++++ RELEASE_0_118_0/configure.ac 2011-02-26 06:54:47.061718126 +0100 +@@ -3,51 +3,6 @@ + + AC_INIT(jackd/jackd.c) + +- +-dnl +-dnl Check for existing JACK installs +-dnl +- +-AC_MSG_CHECKING([existing, conflicting JACK installs]) +-not_overwriting=0 +-installs= +-for dir in /usr/lib /usr/local/lib /opt/lib ; do +- if test -d $dir ; then +- if test $(find $dir/ -name 'libjack.*' 2>/dev/null | wc -l) -gt 0 ; then +- if echo $prefix/lib | grep -vs $dir >/dev/null 2>&1 ; then +- not_overwriting=$(expr $not_overwriting + 1) +- fi +- installs="$installs $dir" +- fi +- fi +-done +- +-if test $not_overwriting -gt 0 ; then +- echo +- echo +- echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" +- echo "You appear to have at least one existing installation of JACK." +- echo +- echo "Complete or partial JACK installs exist in:$installs" +- echo +- echo "Installing this version will leave at least one of these" +- echo "existing installations installed and this will probably break" +- echo "JACK on your machine. " +- echo +- echo "Before building, you should first remove the existing JACK" +- echo "installation(s). " +- echo +- echo "Alternatively use ./configure --prefix=... to force overwriting" +- echo "the existing install." +- echo +- echo "WARNING: ON ANY DEBIAN-DERIVED DISTRIBUTION (Debian, Ubuntu etc)" +- echo "CHANGING THE INSTALLATION PREFIX WILL NOT PRODUCE A WORKING JACK" +- echo "INSTALL. Please contact the distribution packager for JACK and" +- echo "ask them to fix their packaging." +- echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" +- exit 1 +-fi +- + AC_CONFIG_AUX_DIR(config) + AC_CANONICAL_TARGET + diff --git a/recipes/jack/jack_0.118.0.bb b/recipes/jack/jack_0.118.0.bb index 5ca9d658c3..e979c7a57c 100644 --- a/recipes/jack/jack_0.118.0.bb +++ b/recipes/jack/jack_0.118.0.bb @@ -8,11 +8,13 @@ LICENSE = "GPLv2 LGPLv2.1" DEPENDS = "alsa-lib" -PR = "r2" +PR = "r3" SVNPV = "${@'${PV}'.replace('.', '_')}" SRCREV = "4084" -SRC_URI = "svn://subversion.jackaudio.org/jack/tags;module=RELEASE_${SVNPV};proto=http" +SRC_URI = "svn://subversion.jackaudio.org/jack/tags;module=RELEASE_${SVNPV};proto=http \ + file://remove-wrong-host-test.patch \ + " # This is not omap3 specific, but there is a strong correlation between using twl4030 and using omap3 SRC_URI_append_omap3 = " file://jack_fix_TWL4030_alsa_capture.patch" From 01fa99d42338594a6d5aaeb2bb7c10b4906f3192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sat, 26 Feb 2011 11:49:07 +0100 Subject: [PATCH 101/509] jack: remove old versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The jack is not pinned anywhere and according to the git log it seems, that just the latest stable version is maintained and used. Signed-off-by: Petr Štetiar Signed-off-by: Tom Rini --- recipes/jack/jack_0.103.0.bb | 30 ------------------------------ recipes/jack/jack_0.116.2.bb | 32 -------------------------------- 2 files changed, 62 deletions(-) delete mode 100644 recipes/jack/jack_0.103.0.bb delete mode 100644 recipes/jack/jack_0.116.2.bb diff --git a/recipes/jack/jack_0.103.0.bb b/recipes/jack/jack_0.103.0.bb deleted file mode 100644 index f7bd62ae1c..0000000000 --- a/recipes/jack/jack_0.103.0.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "JACK is a low-latency audio server. It can \ -connect a number of different applications to an audio \ -device, as well as allowing them to share audio between \ -themselves." -SECTION = "libs/multimedia" -PRIORITY = "optional" -LICENSE = "GPL LGPL" -PR = "r0" - -DEPENDS = "alsa-lib" - -SRC_URI = "${SOURCEFORGE_MIRROR}/jackit/jack-audio-connection-kit-${PV}.tar.gz" -S = "${WORKDIR}/jack-audio-connection-kit-${PV}" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-timestamps --disable-capabilities --disable-oldtrans \ - --disable-portaudio --disable-coreaudio --enable-oss --enable-alsa" - -EXTRA_OEMAKE = 'transform="s,^,,"' -LDFLAGS_append = " -ldl -L${STAGING_LIBDIR}" - -PACKAGES =+ "libjack jack-server jack-examples" - -FILES_libjack = "${libdir}/*.so.* ${libdir}/jack/*.so" -FILES_jack-server = "${bindir}/jackd" -FILES_jack-examples = "${bindir}/*" - -SRC_URI[md5sum] = "03a0f63b997ce7b83a1eeaa6b80f4388" -SRC_URI[sha256sum] = "a5d9fd696d7ee4a1c7679b5a688155bc1e0abbdf5f144d6762dbbee874df235f" diff --git a/recipes/jack/jack_0.116.2.bb b/recipes/jack/jack_0.116.2.bb deleted file mode 100644 index d97043ab97..0000000000 --- a/recipes/jack/jack_0.116.2.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "JACK is a low-latency audio server. It can \ -connect a number of different applications to an audio \ -device, as well as allowing them to share audio between \ -themselves." -SECTION = "libs/multimedia" -PRIORITY = "optional" -LICENSE = "GPL LGPL" -PR = "r1" - -DEPENDS = "alsa-lib" - -SRC_URI = "http://jackaudio.org/downloads/jack-audio-connection-kit-${PV}.tar.gz" -S = "${WORKDIR}/jack-audio-connection-kit-${PV}" - -inherit autotools - -EXTRA_OECONF = "--enable-timestamps --disable-capabilities --disable-oldtrans \ - --disable-portaudio --disable-coreaudio --enable-oss --enable-alsa" - -EXTRA_OEMAKE = 'transform="s,^,,"' -LDFLAGS_append = " -ldl -L${STAGING_LIBDIR}" - -PACKAGES =+ "libjack jack-server jack-examples" - -FILES_libjack = "${libdir}/*.so.* ${libdir}/jack/*.so" -FILES_jack-server = "${bindir}/jackd" -FILES_jack-examples = "${bindir}/*" -FILES_${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/* " - - -SRC_URI[md5sum] = "9c0ae9880e9b6e081f1a238fe6a28bd5" -SRC_URI[sha256sum] = "ce6e1f61a3b003137af56b749e5ed4274584167c0877ea9ef2d83f47b11c8d3d" From 7a16a59c1fdb6e54f0922c42a4678e57f5325a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Fri, 25 Feb 2011 16:07:05 +0100 Subject: [PATCH 102/509] libvpx: fix fetch errors, remove older releases and add security fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - remove old and unfetchable versions v0.9.0, v0.9.1, v0.9.2 - add v0.9.5 patch for CVE-2010-4203 security fix - fix fetch errors for v0.9.2 and v0.9.5: ERROR: Function 'Fetch failed: Unable to fetch URL git://review.webmproject.org/libvpx.git;protocol=git;tag=v0.9.5 from any source.' failed this happens because of some errors in the git repo: error: missing object referenced by 'refs/tags/v0.9.5' error: missing object referenced by 'refs/tags/v0.9.2' error: missing object referenced by 'refs/tags/v0.9.1' error: missing object referenced by 'refs/tags/v0.9.0' error: refs/remotes/origin/aylesbury does not point to a valid object! Signed-off-by: Petr Štetiar Signed-off-by: Tom Rini --- recipes/webm/libvpx.inc | 6 +-- recipes/webm/libvpx/CVE-2010-4203.patch | 69 +++++++++++++++++++++++++ recipes/webm/libvpx_0.9.0.bb | 17 ------ recipes/webm/libvpx_0.9.1.bb | 14 ----- recipes/webm/libvpx_0.9.2.bb | 14 ----- recipes/webm/libvpx_0.9.5.bb | 8 +-- 6 files changed, 77 insertions(+), 51 deletions(-) create mode 100644 recipes/webm/libvpx/CVE-2010-4203.patch delete mode 100644 recipes/webm/libvpx_0.9.0.bb delete mode 100644 recipes/webm/libvpx_0.9.1.bb delete mode 100644 recipes/webm/libvpx_0.9.2.bb diff --git a/recipes/webm/libvpx.inc b/recipes/webm/libvpx.inc index 9913d5b653..a1e02b112f 100644 --- a/recipes/webm/libvpx.inc +++ b/recipes/webm/libvpx.inc @@ -1,10 +1,10 @@ DESCRIPTION = "vpx Multi-Format Codec SDK" LICENSE = "BSD" -INC_PR = "r5" +INC_PR = "r6" -SRC_URI = "git://review.webmproject.org/libvpx.git;protocol=git;tag=v${PV}" -S = "${WORKDIR}/git" +SRC_URI = "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2" +S = "${WORKDIR}/libvpx-v${PV}" CFLAGS += "-fPIC" diff --git a/recipes/webm/libvpx/CVE-2010-4203.patch b/recipes/webm/libvpx/CVE-2010-4203.patch new file mode 100644 index 0000000000..37f5108a51 --- /dev/null +++ b/recipes/webm/libvpx/CVE-2010-4203.patch @@ -0,0 +1,69 @@ +From: John Koleszar +Date: Thu, 4 Nov 2010 20:59:26 +0000 (-0400) +Subject: fix integer promotion bug in partition size check +X-Git-Url: https://review.webmproject.org/gitweb?p=libvpx.git;a=commitdiff_plain;h=9fb80f7170ec48e23c3c7b477149eeb37081c699 + +fix integer promotion bug in partition size check + +The check '(user_data_end - partition < partition_size)' must be +evaluated as a signed comparison, but because partition_size was +unsigned, the LHS was promoted to unsigned, causing an incorrect +result on 32-bit. Instead, check the upper and lower bounds of +the segment separately. + +Change-Id: I6266aba7fd7de084268712a3d2a81424ead7aa06 +--- + +diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c +index 2d81d61..f5e49a1 100644 +--- a/vp8/decoder/decodframe.c ++++ b/vp8/decoder/decodframe.c +@@ -462,7 +462,8 @@ static void setup_token_decoder(VP8D_COMP *pbi, + partition_size = user_data_end - partition; + } + +- if (user_data_end - partition < partition_size) ++ if (partition + partition_size > user_data_end ++ || partition + partition_size < partition) + vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME, + "Truncated packet or corrupt partition " + "%d length", i + 1); +@@ -580,7 +581,8 @@ int vp8_decode_frame(VP8D_COMP *pbi) + (data[0] | (data[1] << 8) | (data[2] << 16)) >> 5; + data += 3; + +- if (data_end - data < first_partition_length_in_bytes) ++ if (data + first_partition_length_in_bytes > data_end ++ || data + first_partition_length_in_bytes < data) + vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME, + "Truncated packet or corrupt partition 0 length"); + vp8_setup_version(pc); +diff --git a/vp8/vp8_dx_iface.c b/vp8/vp8_dx_iface.c +index e7e5356..f0adf5b 100644 +--- a/vp8/vp8_dx_iface.c ++++ b/vp8/vp8_dx_iface.c +@@ -253,8 +253,11 @@ static vpx_codec_err_t vp8_peek_si(const uint8_t *data, + unsigned int data_sz, + vpx_codec_stream_info_t *si) + { +- + vpx_codec_err_t res = VPX_CODEC_OK; ++ ++ if(data + data_sz <= data) ++ res = VPX_CODEC_INVALID_PARAM; ++ else + { + /* Parse uncompresssed part of key frame header. + * 3 bytes:- including version, frame type and an offset +@@ -331,7 +334,10 @@ static vpx_codec_err_t vp8_decode(vpx_codec_alg_priv_t *ctx, + + ctx->img_avail = 0; + +- /* Determine the stream parameters */ ++ /* Determine the stream parameters. Note that we rely on peek_si to ++ * validate that we have a buffer that does not wrap around the top ++ * of the heap. ++ */ + if (!ctx->si.h) + res = ctx->base.iface->dec.peek_si(data, data_sz, &ctx->si); + diff --git a/recipes/webm/libvpx_0.9.0.bb b/recipes/webm/libvpx_0.9.0.bb deleted file mode 100644 index bce50a6df9..0000000000 --- a/recipes/webm/libvpx_0.9.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -require libvpx.inc - -LICENSE = "VP8" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "9eb8e818d2f3263623c258fe66924082" -SRC_URI[sha256sum] = "a0096ac6859cfb61cf06dd9bc0a79a3333a4ec389ba311911d84df8ff2a1b9dc" - -do_install() { - oe_runmake install - install -d ${D}${prefix} - cp -R ${S}/vpx-vp8-nopost-nodocs*${PV}/* ${D}${prefix}/ - install -d ${D}${includedir}/vpx - mv ${D}${includedir}/*.h ${D}${includedir}/vpx -} - diff --git a/recipes/webm/libvpx_0.9.1.bb b/recipes/webm/libvpx_0.9.1.bb deleted file mode 100644 index bcb73587d3..0000000000 --- a/recipes/webm/libvpx_0.9.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -require libvpx.inc - -PR = "${INC_PR}.0" - -SRC_URI += "file://libvpx-configure-support-blank-prefix.patch;apply=yes" - -CONFIGUREOPTS += " \ - --prefix=${prefix} \ - --libdir=${libdir} \ -" - -SRC_URI[md5sum] = "e1442e74d0cca228785083fa520735a2" -SRC_URI[sha256sum] = "c4e8e463e079ffde5b6948366a1d0873f1bf685dccd89ca137585c2b8247ec59" - diff --git a/recipes/webm/libvpx_0.9.2.bb b/recipes/webm/libvpx_0.9.2.bb deleted file mode 100644 index b7ced8f1da..0000000000 --- a/recipes/webm/libvpx_0.9.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -require libvpx.inc - -PR = "${INC_PR}.0" - -SRC_URI += "file://libvpx-configure-support-blank-prefix.patch;apply=yes" - -SRC_URI[md5sum] = "609370925b274aeaa29e94fc34c74957" -SRC_URI[sha256sum] = "7425853d06443a0ce8e9cfc7cd3b0a43228b22c10dca813da68af9b114510b3b" - -CONFIGUREOPTS += " \ - --prefix=${prefix} \ - --libdir=${libdir} \ -" - diff --git a/recipes/webm/libvpx_0.9.5.bb b/recipes/webm/libvpx_0.9.5.bb index b7ced8f1da..42b4199e2a 100644 --- a/recipes/webm/libvpx_0.9.5.bb +++ b/recipes/webm/libvpx_0.9.5.bb @@ -2,10 +2,12 @@ require libvpx.inc PR = "${INC_PR}.0" -SRC_URI += "file://libvpx-configure-support-blank-prefix.patch;apply=yes" +SRC_URI += "file://libvpx-configure-support-blank-prefix.patch \ + file://CVE-2010-4203.patch \ + " -SRC_URI[md5sum] = "609370925b274aeaa29e94fc34c74957" -SRC_URI[sha256sum] = "7425853d06443a0ce8e9cfc7cd3b0a43228b22c10dca813da68af9b114510b3b" +SRC_URI[md5sum] = "4bf2f2c76700202c1fe9201fcb0680e3" +SRC_URI[sha256sum] = "2e93968afcded113a7e218de047feecf6659a089058803a9e40fb687de5f9bfa" CONFIGUREOPTS += " \ --prefix=${prefix} \ From 963ef3f3f11df7fe9aa86a7afa49bf2bcfafaf40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sat, 26 Feb 2011 18:44:13 +0100 Subject: [PATCH 103/509] micro-uclibc: add xattr to distro features to fix build failure of libcap2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cap_file.c:8:23: fatal error: sys/xattr.h: No such file or directory Signed-off-by: Petr Štetiar Signed-off-by: Tom Rini --- conf/distro/micro-uclibc.conf | 1 + conf/distro/micro.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/distro/micro-uclibc.conf b/conf/distro/micro-uclibc.conf index 85ea9b3bf5..55b4ebd3ed 100644 --- a/conf/distro/micro-uclibc.conf +++ b/conf/distro/micro-uclibc.conf @@ -12,6 +12,7 @@ ############################################################################# DISTRO_NAME = "micro-uclibc" +DISTRO_FEATURES = "xattr" ############################################################################# # TOOLCHAIN diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf index b1f8f1e42c..bb417b1cd9 100644 --- a/conf/distro/micro.conf +++ b/conf/distro/micro.conf @@ -19,7 +19,7 @@ DISTRO_VERSION = "${SRCDATE}" # DISTRO FEATURE SELECTION ############################################################################# # No features selected -DISTRO_FEATURES = "eabi" +DISTRO_FEATURES += "eabi" ############################################################################# # LIBRARY NAMES From 15766e783fbdc57c5e7ddd027cdc2075433c21b8 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Fri, 25 Feb 2011 23:15:14 +0100 Subject: [PATCH 104/509] fs: fix header inclusions and bump PR --- recipes/fs/files/fontsproto.patch | 27 +++++++++++++++++++++++++++ recipes/fs/files/xtrans.patch | 21 +++++++++++++++++++++ recipes/fs/fs_cvs.bb | 8 +++++++- 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 recipes/fs/files/fontsproto.patch create mode 100644 recipes/fs/files/xtrans.patch diff --git a/recipes/fs/files/fontsproto.patch b/recipes/fs/files/fontsproto.patch new file mode 100644 index 0000000000..1032b486af --- /dev/null +++ b/recipes/fs/files/fontsproto.patch @@ -0,0 +1,27 @@ +Index: FS/FSlibint.h +=================================================================== +--- FS.orig/FSlibint.h 2011-02-25 22:34:43.884558121 +0100 ++++ FS/FSlibint.h 2011-02-25 22:35:15.230223119 +0100 +@@ -72,8 +72,8 @@ + #endif /* USG */ + + #include "FSlib.h" +-#include "FSproto.h" + #include "FSlibos.h" ++#include + #include + #include + +Index: FS/configure.ac +=================================================================== +--- FS.orig/configure.ac 2011-02-25 22:35:23.977928121 +0100 ++++ FS/configure.ac 2011-02-25 22:35:39.622413120 +0100 +@@ -19,7 +19,7 @@ + AC_PROG_CC + + # Checks for pkg-config packages +-PKG_CHECK_MODULES(FS, xfont xtrans) ++PKG_CHECK_MODULES(FS, xfont xtrans fontsproto) + + # Checks for libraries. + diff --git a/recipes/fs/files/xtrans.patch b/recipes/fs/files/xtrans.patch new file mode 100644 index 0000000000..e628a2604d --- /dev/null +++ b/recipes/fs/files/xtrans.patch @@ -0,0 +1,21 @@ +Index: FS/fs_trans.h +=================================================================== +--- FS.orig/fs_trans.h 2011-02-25 23:00:34.025908119 +0100 ++++ FS/fs_trans.h 2011-02-25 23:01:19.165133120 +0100 +@@ -24,4 +24,4 @@ + + #define FS_t + #define TRANS_CLIENT +-#include ++#include +Index: FS/fs_trans.c +=================================================================== +--- FS.orig/fs_trans.c 2011-02-25 23:08:51.177693119 +0100 ++++ FS/fs_trans.c 2011-02-25 23:09:00.378958118 +0100 +@@ -28,5 +28,5 @@ + + #define FS_t + #define TRANS_CLIENT +-#include ++#include + diff --git a/recipes/fs/fs_cvs.bb b/recipes/fs/fs_cvs.bb index 9dcba5708b..b4baee6fe5 100644 --- a/recipes/fs/fs_cvs.bb +++ b/recipes/fs/fs_cvs.bb @@ -4,7 +4,13 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "libxfont xtrans" -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=FS" +PR = "r1" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=FS \ + file://fontsproto.patch \ + file://xtrans.patch \ + " + S = "${WORKDIR}/FS" inherit autotools pkgconfig From cd89339902c38af483a7faf8395a62592209537a Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sat, 26 Feb 2011 22:14:53 +0100 Subject: [PATCH 105/509] fbv: fix cflags and libs and enable libungif * remove missleading patch * bump PR --- recipes/fbv/fbv-1.0b/cflags.patch | 13 +++++++++++++ recipes/fbv/fbv-1.0b/fbv-1.0b.patch | 12 ------------ recipes/fbv/fbv-1.0b/libs.patch | 13 +++++++++++++ recipes/fbv/fbv_1.0b.bb | 14 ++++++++------ 4 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 recipes/fbv/fbv-1.0b/cflags.patch delete mode 100644 recipes/fbv/fbv-1.0b/fbv-1.0b.patch create mode 100644 recipes/fbv/fbv-1.0b/libs.patch diff --git a/recipes/fbv/fbv-1.0b/cflags.patch b/recipes/fbv/fbv-1.0b/cflags.patch new file mode 100644 index 0000000000..1259c6b511 --- /dev/null +++ b/recipes/fbv/fbv-1.0b/cflags.patch @@ -0,0 +1,13 @@ +Index: fbv-1.0b/Makefile +=================================================================== +--- fbv-1.0b.orig/Makefile 2011-02-26 21:50:39.786273304 +0100 ++++ fbv-1.0b/Makefile 2011-02-26 21:53:44.051693304 +0100 +@@ -6,7 +6,7 @@ + include Make.conf + + CC = gcc +-CFLAGS = -O2 -Wall -D_GNU_SOURCE ++CFLAGS += -D_GNU_SOURCE + + SOURCES = main.c jpeg.c gif.c png.c bmp.c fb_display.c transforms.c + OBJECTS = ${SOURCES:.c=.o} diff --git a/recipes/fbv/fbv-1.0b/fbv-1.0b.patch b/recipes/fbv/fbv-1.0b/fbv-1.0b.patch deleted file mode 100644 index 2ca9d522b9..0000000000 --- a/recipes/fbv/fbv-1.0b/fbv-1.0b.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN fbv-1.0b-0rig/Makefile fbv-1.0b/Makefile ---- fbv-1.0b-0rig/Makefile 2009-08-20 00:33:58.000000000 +0200 -+++ fbv-1.0b/Makefile 2009-08-20 00:34:16.000000000 +0200 -@@ -12,7 +12,7 @@ - OBJECTS = ${SOURCES:.c=.o} - - OUT = fbv --#LIBS = -lungif -L/usr/X11R6/lib -ljpeg -lpng -+LIBS = -L/usr/lib -ljpeg -lpng #-lungif - - all: $(OUT) - @echo Build DONE. diff --git a/recipes/fbv/fbv-1.0b/libs.patch b/recipes/fbv/fbv-1.0b/libs.patch new file mode 100644 index 0000000000..47f5d918ed --- /dev/null +++ b/recipes/fbv/fbv-1.0b/libs.patch @@ -0,0 +1,13 @@ +Index: fbv-1.0b/Makefile +=================================================================== +--- fbv-1.0b.orig/Makefile 2004-09-07 14:34:29.000000000 +0200 ++++ fbv-1.0b/Makefile 2011-02-26 22:11:03.217683306 +0100 +@@ -12,7 +12,7 @@ + OBJECTS = ${SOURCES:.c=.o} + + OUT = fbv +-#LIBS = -lungif -L/usr/X11R6/lib -ljpeg -lpng ++#LIBS = -lungif -ljpeg -lpng + + all: $(OUT) + @echo Build DONE. diff --git a/recipes/fbv/fbv_1.0b.bb b/recipes/fbv/fbv_1.0b.bb index 3629fe4d93..d8ca180642 100644 --- a/recipes/fbv/fbv_1.0b.bb +++ b/recipes/fbv/fbv_1.0b.bb @@ -1,21 +1,23 @@ DESCRIPTION = "Frame Buffer Viewer" LICENSE = "GPL" -DEPENDS = "libpng jpeg" -PR = "r3" +DEPENDS = "libpng jpeg libungif" +PR = "r4" SRC_URI = "http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz \ file://cross_compile.patch \ - file://fbv-1.0b.patch \ file://fbv-1.0b-BGR666.patch \ + file://libs.patch \ + file://cflags.patch \ " +CFLAGS += "-D_GNU_SOURCE -D__KERNEL_STRICT_NAMES" + do_configure() { - CC="${CC}" ./configure --without-libungif + CC="${CC}" ./configure } do_compile() { - oe_runmake CC="${CC}" \ - CFLAGS="-O2 -Wall -D_GNU_SOURCE -D__KERNEL_STRICT_NAMES" + oe_runmake CC="${CC}" } do_install() { From 6dcd3eb90654a620e42c45b5895cb9e5b6cc4a4d Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sat, 26 Feb 2011 22:48:11 +0100 Subject: [PATCH 106/509] xawtv: update to version 3.95 * added usefull debian-patches * convert sys_siglist to strsignal fixes uclibc build * enable alsa * remove older version 3.93 --- recipes/xawtv/xawtv-3.95/01_gcc4.patch | 11 ++ .../xawtv/xawtv-3.95/03_libquicktime.patch | 32 ++++ recipes/xawtv/xawtv-3.95/04_man_typo.patch | 170 ++++++++++++++++++ recipes/xawtv/xawtv-3.95/05_man_section.patch | 18 ++ recipes/xawtv/xawtv-3.95/07_page_size.patch | 44 +++++ recipes/xawtv/xawtv-3.95/08_oss_audio.patch | 12 ++ .../xawtv/xawtv-3.95/09_audio_unmute.patch | 13 ++ recipes/xawtv/xawtv-3.95/10_radio_fixes.patch | 80 +++++++++ .../xawtv-3.95/11_plugins_memory_leaks.patch | 56 ++++++ .../xawtv/xawtv-3.95/12_fbtv_radeonfb.patch | 151 ++++++++++++++++ .../xawtv-3.95/13_libquicktime_compat.patch | 28 +++ .../xawtv-3.95/14_scantv_input_override.patch | 64 +++++++ .../xawtv-3.95/15_xawtv_bin_cutoff.patch | 21 +++ .../xawtv-3.95/16_xawtv_v4l2_buffer.patch | 11 ++ .../xawtv/xawtv-3.95/17_scantv_man_typo.patch | 12 ++ recipes/xawtv/xawtv-3.95/18_glib2.patch | 24 +++ .../{xawtv-3.93 => xawtv-3.95}/make.patch | 65 ++++--- recipes/xawtv/xawtv-3.95/sys_siglist.patch | 47 +++++ recipes/xawtv/xawtv_3.93.bb | 35 ---- recipes/xawtv/xawtv_3.95.bb | 52 ++++++ 20 files changed, 891 insertions(+), 55 deletions(-) create mode 100644 recipes/xawtv/xawtv-3.95/01_gcc4.patch create mode 100644 recipes/xawtv/xawtv-3.95/03_libquicktime.patch create mode 100644 recipes/xawtv/xawtv-3.95/04_man_typo.patch create mode 100644 recipes/xawtv/xawtv-3.95/05_man_section.patch create mode 100644 recipes/xawtv/xawtv-3.95/07_page_size.patch create mode 100644 recipes/xawtv/xawtv-3.95/08_oss_audio.patch create mode 100644 recipes/xawtv/xawtv-3.95/09_audio_unmute.patch create mode 100644 recipes/xawtv/xawtv-3.95/10_radio_fixes.patch create mode 100644 recipes/xawtv/xawtv-3.95/11_plugins_memory_leaks.patch create mode 100644 recipes/xawtv/xawtv-3.95/12_fbtv_radeonfb.patch create mode 100644 recipes/xawtv/xawtv-3.95/13_libquicktime_compat.patch create mode 100644 recipes/xawtv/xawtv-3.95/14_scantv_input_override.patch create mode 100644 recipes/xawtv/xawtv-3.95/15_xawtv_bin_cutoff.patch create mode 100644 recipes/xawtv/xawtv-3.95/16_xawtv_v4l2_buffer.patch create mode 100644 recipes/xawtv/xawtv-3.95/17_scantv_man_typo.patch create mode 100644 recipes/xawtv/xawtv-3.95/18_glib2.patch rename recipes/xawtv/{xawtv-3.93 => xawtv-3.95}/make.patch (62%) create mode 100644 recipes/xawtv/xawtv-3.95/sys_siglist.patch delete mode 100644 recipes/xawtv/xawtv_3.93.bb create mode 100644 recipes/xawtv/xawtv_3.95.bb diff --git a/recipes/xawtv/xawtv-3.95/01_gcc4.patch b/recipes/xawtv/xawtv-3.95/01_gcc4.patch new file mode 100644 index 0000000000..ad45a7a2da --- /dev/null +++ b/recipes/xawtv/xawtv-3.95/01_gcc4.patch @@ -0,0 +1,11 @@ +diff -urNad motv-3.95~/x11/vbi-gui.c motv-3.95/x11/vbi-gui.c +--- motv-3.95~/x11/vbi-gui.c ++++ motv-3.95/x11/vbi-gui.c +@@ -44,6 +44,7 @@ + #include "vbi-x11.h" + #include "vbi-gui.h" + ++#include "grab-ng.h" + #include "channel.h" + + static int tt_debug = 1; diff --git a/recipes/xawtv/xawtv-3.95/03_libquicktime.patch b/recipes/xawtv/xawtv-3.95/03_libquicktime.patch new file mode 100644 index 0000000000..958a265d8b --- /dev/null +++ b/recipes/xawtv/xawtv-3.95/03_libquicktime.patch @@ -0,0 +1,32 @@ +diff -urNad xawtv-3.95~/libng/plugins/read-qt.c xawtv-3.95/libng/plugins/read-qt.c +--- xawtv-3.95~/libng/plugins/read-qt.c ++++ xawtv-3.95/libng/plugins/read-qt.c +@@ -4,9 +4,9 @@ + #include + #include + #include +-#include +-#include +-#include ++#include ++#include ++#include + + #include "grab-ng.h" + +diff -urNad xawtv-3.95~/libng/plugins/write-qt.c xawtv-3.95/libng/plugins/write-qt.c +--- xawtv-3.95~/libng/plugins/write-qt.c ++++ xawtv-3.95/libng/plugins/write-qt.c +@@ -4,9 +4,9 @@ + #include + #include + #include +-#include +-#include +-#include ++#include ++#include ++#include + + #include "grab-ng.h" + diff --git a/recipes/xawtv/xawtv-3.95/04_man_typo.patch b/recipes/xawtv/xawtv-3.95/04_man_typo.patch new file mode 100644 index 0000000000..ea00df13b5 --- /dev/null +++ b/recipes/xawtv/xawtv-3.95/04_man_typo.patch @@ -0,0 +1,170 @@ +diff -urNad xawtv-3.95~/man/fbtv.1 xawtv-3.95/man/fbtv.1 +--- xawtv-3.95~/man/fbtv.1 ++++ xawtv-3.95/man/fbtv.1 +@@ -98,7 +98,7 @@ + The BT8xx cards can produce images up to 768x576 pixels. In order to + have fbtv make use of your entire monitor-size and get maximum image + quality, you need to create a 768x576 pixels framebufferconsole. This +-can be accomplished with the fbset(1) utility, which is availabile at ++can be accomplished with the fbset(1) utility, which is available at + various locations. See: http://www.cs.kuleuven.ac.be/~geert/bin/ + .P + Or, you can let fbtv handle the videomode changes with the -m switch. +diff -urNad xawtv-3.95~/man/pia.1 xawtv-3.95/man/pia.1 +--- xawtv-3.95~/man/pia.1 ++++ xawtv-3.95/man/pia.1 +@@ -5,7 +5,7 @@ + .B pia [ options ] movie + .SH DESCRIPTION + .B pia +-is a small X11 tool which playes movie files. ++is a small X11 tool which plays movie files. + .SH OPTIONS + .B pia + understands the usual toolkit options (-geometry + friends). +@@ -24,7 +24,7 @@ + Use OSS device for sound. + .TP + .B -noxv +-Disable Xvideo extention. ++Disable Xvideo extension. + .TP + .B -nogl + Disable OpenGL. +@@ -41,7 +41,7 @@ + .SH SUPPORTED MOVIE FORMATS + Main purpose of this utility is to playback movie files recorded by + xawtv, motv and streamer. It should be able to playback every AVI or +-QuickTime movie written by one of the mentioned utilites. Feel free ++QuickTime movie written by one of the mentioned utilities. Feel free + to submit a bug report if this doesn't work for some file. + .SS QuickTime + .B pia +diff -urNad xawtv-3.95~/man/record.1 xawtv-3.95/man/record.1 +--- xawtv-3.95~/man/record.1 ++++ xawtv-3.95/man/record.1 +@@ -16,7 +16,7 @@ + .TP + .B -o file + basename for the output file(s), a number and the .wav +-extention are added by record. Default is "record". ++extension are added by record. Default is "record". + .TP + .B -i dev + mixer control. This should be the one where you can adjust the record +diff -urNad xawtv-3.95~/man/rootv.1 xawtv-3.95/man/rootv.1 +--- xawtv-3.95~/man/rootv.1 ++++ xawtv-3.95/man/rootv.1 +@@ -1,6 +1,6 @@ + .TH rootv 1 "(c) 2000-2002 Gerd Knorr" + .SH NAME +-rootv - display TV using the Xvideo extention ++rootv - display TV using the Xvideo extension + .SH SYNOPSIS + .B rootv [ options ] + .SH DESCRIPTION +@@ -9,7 +9,7 @@ + but you can also ask it to use the root window (thus the name) or any + other window. + .B rootv +-needs the Xvideo extention. ++needs the Xvideo extension. + .P + .B rootv + itself provides no way to control video/audio/tuner. You can use +diff -urNad xawtv-3.95~/man/subtitles.1 xawtv-3.95/man/subtitles.1 +--- xawtv-3.95~/man/subtitles.1 ++++ xawtv-3.95/man/subtitles.1 +@@ -8,7 +8,7 @@ + fetches the given teletext page with the alevt-cap utility and + displays it using xawtv-remote in an endless loop. It's most + useful for pages which carry subtitles for the current TV program. +-It's page 150 in germany. ++It's page 150 in Germany. + .SH OPTIONS + .TP + .B -help +diff -urNad xawtv-3.95~/man/v4l-conf.8 xawtv-3.95/man/v4l-conf.8 +--- xawtv-3.95~/man/v4l-conf.8 ++++ xawtv-3.95/man/v4l-conf.8 +@@ -20,7 +20,7 @@ + knows three ways to get the informations: + .TP 3 + * +-Query the X-Server using the XF86 DGA extention. This is the default ++Query the X-Server using the XF86 DGA extension. This is the default + if the DISPLAY environment variable is set. + .TP 3 + * +@@ -63,7 +63,7 @@ + work because the X-Server lacks DGA support. You can put this into + /etc/conf.modules, as "post-install bttv ..." for example. + .SH BUGS +-Hope I havn't any security flaws in there. If you find one, drop me a ++Hope I haven't any security flaws in there. If you find one, drop me a + note. Mails with patches are preferred :-) + .SH SEE ALSO + xawtv(1), fbtv(1) +diff -urNad xawtv-3.95~/man/webcam.1 xawtv-3.95/man/webcam.1 +--- xawtv-3.95~/man/webcam.1 ++++ xawtv-3.95/man/webcam.1 +@@ -150,7 +150,7 @@ + paper "Correcting Distortion of Image by Image Registration" of Toru + Tamaki, Tsuyoshi Yamamura and Noboru Ahnishi. More your lens has an + important distortion, more 'distor_k' must be neared of 0. 700 is the +-défault value. Coefficient k of program is x100 than article. ++default value. Coefficient k of program is x100 than article. + .TP + .B distor_cx = 192 + .TP +diff -urNad xawtv-3.95~/man/xawtv-remote.1 xawtv-3.95/man/xawtv-remote.1 +--- xawtv-3.95~/man/xawtv-remote.1 ++++ xawtv-3.95/man/xawtv-remote.1 +@@ -136,14 +136,14 @@ + .TP + .B vtx line1 line2 [ ... ] + Display subtitles. It pops up a small window at the bottom of the screen. +-It is supported to be used as interface for displaying subtitles (often on +-videotext page 150 in europe, thats why the name) by external programs. ++It is intended to be used as an interface for displaying subtitles (often on ++videotext page 150 in Europe, that's why the name) by external programs. + .br + Every command line argument is one line, zero lines removes the window. + You can colorize the text with the control sequence "ESC foreground + background". foreground/background has the range 0-7 (ansi term colors). + Example: "\\03347 hello world " is blue on white. "\\033" must be a real +-escape character, the string does'nt work. With the bash you'll get it ++escape character, the string doesn't work. With the bash you'll get it + with ^V ESC. vtx does also understand the ANSI tty escape sequences for + color. + .TP +diff -urNad xawtv-3.95~/man/xawtv.1 xawtv-3.95/man/xawtv.1 +--- xawtv-3.95~/man/xawtv.1 ++++ xawtv-3.95/man/xawtv.1 +@@ -70,7 +70,7 @@ + .TP + \fB-remote\fP + X11 display is remote. This basically disables overlay mode, you +-might need this if xawtv failes to autodetect a remote X11 display. ++might need this if xawtv fails to autodetect a remote X11 display. + .br + Resource: xawtv.remote (bool). + .TP +@@ -155,7 +155,7 @@ + more details and hints on how to setup Xvideo. + .SH GETTING STARTED + Just start xawtv. Then verify the settings in the options menu (right +-mouse button) and adjust the settings (TV norm, Video source, freqency ++mouse button) and adjust the settings (TV norm, Video source, frequency + table). With the cursor keys you can control the tuner and look for + TV Stations. Other useful hotkeys are listed below. + .P +@@ -190,7 +190,7 @@ + Z Channel Hopper (\fIz\fPapping, tune in every + station a few seconds) + Ctrl+Z Fast Channel Hopping (grab the images for the +- Channel Bottons) ++ Channel Buttons) + + up/down tune up/down one channel + left/right fine tuning diff --git a/recipes/xawtv/xawtv-3.95/05_man_section.patch b/recipes/xawtv/xawtv-3.95/05_man_section.patch new file mode 100644 index 0000000000..06ebee3bce --- /dev/null +++ b/recipes/xawtv/xawtv-3.95/05_man_section.patch @@ -0,0 +1,18 @@ +diff -urNad xawtv-3.95~/man/es/v4l-conf.8 xawtv-3.95/man/es/v4l-conf.8 +--- xawtv-3.95~/man/es/v4l-conf.8 ++++ xawtv-3.95/man/es/v4l-conf.8 +@@ -1,4 +1,4 @@ +-.TH v4l-conf 1 "(c) 1997-99 Gerd Knorr" ++.TH v4l-conf 8 "(c) 1997-99 Gerd Knorr" + .SH NOMBRE + v4l-conf - configura un driver video4linux + .SH SINOPSIS +diff -urNad xawtv-3.95~/man/v4l-conf.8 xawtv-3.95/man/v4l-conf.8 +--- xawtv-3.95~/man/v4l-conf.8 ++++ xawtv-3.95/man/v4l-conf.8 +@@ -1,4 +1,4 @@ +-.TH v4l-conf 1 "(c) 1997-99 Gerd Knorr" ++.TH v4l-conf 8 "(c) 1997-99 Gerd Knorr" + .SH NAME + v4l-conf - configure a video4linux driver + .SH SYNOPSIS diff --git a/recipes/xawtv/xawtv-3.95/07_page_size.patch b/recipes/xawtv/xawtv-3.95/07_page_size.patch new file mode 100644 index 0000000000..1580886984 --- /dev/null +++ b/recipes/xawtv/xawtv-3.95/07_page_size.patch @@ -0,0 +1,44 @@ +diff -urN xawtv-3.95.orig/console/fbtools.c xawtv-3.95/console/fbtools.c +--- xawtv-3.95.orig/console/fbtools.c 2003-02-14 14:14:04.000000000 +0000 ++++ xawtv-3.95./console/fbtools.c 2006-08-23 10:57:40.000000000 +0000 +@@ -21,8 +21,6 @@ + #include + #include + +-#include +- + #include "fbtools.h" + + /* -------------------------------------------------------------------- */ +@@ -424,7 +422,7 @@ + goto err; + } + #endif +- fb_mem_offset = (unsigned long)(fb_fix.smem_start) & (~PAGE_MASK); ++ fb_mem_offset = (unsigned long)(fb_fix.smem_start) & (sysconf(_SC_PAGE_SIZE)-1); + fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset, + PROT_READ|PROT_WRITE,MAP_SHARED,fb,0); + if (-1L == (long)fb_mem) { +diff -urN xawtv-3.95.orig/console/matrox.c xawtv-3.95/console/matrox.c +--- xawtv-3.95.orig/console/matrox.c 2005-02-03 10:40:41.000000000 +0000 ++++ xawtv-3.95/console/matrox.c 2006-08-23 11:09:51.000000000 +0000 +@@ -9,7 +9,6 @@ + #include + #include + +-#include /* PAGE_SIZE */ + #include + + #include "byteswap.h" +@@ -226,7 +225,7 @@ + return -1; + } + off = (unsigned long)fb_fix.mmio_start - +- ((unsigned long)fb_fix.mmio_start & ~(PAGE_SIZE-1)); ++ ((unsigned long)fb_fix.mmio_start & ~(sysconf(_SC_PAGE_SIZE)-1)); + bmmio += off; + mmio = (uint32_t*)bmmio; + return 0; + + + diff --git a/recipes/xawtv/xawtv-3.95/08_oss_audio.patch b/recipes/xawtv/xawtv-3.95/08_oss_audio.patch new file mode 100644 index 0000000000..529fddbceb --- /dev/null +++ b/recipes/xawtv/xawtv-3.95/08_oss_audio.patch @@ -0,0 +1,12 @@ +diff -urNad xawtv-3.95.dfsg.1~/libng/plugins/snd-oss.c xawtv-3.95.dfsg.1/libng/plugins/snd-oss.c +--- xawtv-3.95.dfsg.1~/libng/plugins/snd-oss.c 2003-02-14 15:14:05.000000000 +0100 ++++ xawtv-3.95.dfsg.1/libng/plugins/snd-oss.c 2007-07-28 23:43:41.000000000 +0200 +@@ -441,7 +441,7 @@ + for (;;) { + rc = read(fd,buffer+count,blocksize-count); + if (rc < 0) { +- if (EINTR == errno) ++ if ((EINTR == errno) || (EAGAIN == errno)) + continue; + perror("oss: read"); + exit(1); diff --git a/recipes/xawtv/xawtv-3.95/09_audio_unmute.patch b/recipes/xawtv/xawtv-3.95/09_audio_unmute.patch new file mode 100644 index 0000000000..9d4f1c5c65 --- /dev/null +++ b/recipes/xawtv/xawtv-3.95/09_audio_unmute.patch @@ -0,0 +1,13 @@ +diff -urNad xawtv-3.95.dfsg.1~/x11/xt.c xawtv-3.95.dfsg.1/x11/xt.c +--- xawtv-3.95.dfsg.1~/x11/xt.c 2005-01-11 10:26:43.000000000 +0100 ++++ xawtv-3.95.dfsg.1/x11/xt.c 2007-07-29 00:03:50.000000000 +0200 +@@ -313,6 +313,9 @@ + void + ExitCB(Widget widget, XtPointer client_data, XtPointer calldata) + { ++ if (cur_attrs[ATTR_ID_MUTE]) { ++ do_va_cmd(2,"volume","mute","off"); ++ } + audio_off(); + video_overlay(0); + video_close(); diff --git a/recipes/xawtv/xawtv-3.95/10_radio_fixes.patch b/recipes/xawtv/xawtv-3.95/10_radio_fixes.patch new file mode 100644 index 0000000000..c40a607848 --- /dev/null +++ b/recipes/xawtv/xawtv-3.95/10_radio_fixes.patch @@ -0,0 +1,80 @@ +diff -urNad xawtv-3.95.dfsg.1~/console/radio.c xawtv-3.95.dfsg.1/console/radio.c +--- xawtv-3.95.dfsg.1~/console/radio.c 2003-04-16 17:35:13.000000000 +0200 ++++ xawtv-3.95.dfsg.1/console/radio.c 2007-07-29 00:12:03.000000000 +0200 +@@ -40,7 +40,8 @@ + /* JMMV: WINDOWS for radio */ + int ncurses = 0; + int debug = 0; +-char *device = "/dev/radio"; ++char *device_list[4] = {NULL, "/dev/radio", "/dev/v4l/radio0", NULL}; ++char **device = &device_list[1]; + WINDOW *wfreq, *woptions, *wstations, *wcommand; + int freqfact = 16; + +@@ -186,7 +187,7 @@ + while (NULL != fgets(file,255,fp)) { + if (2 == sscanf(file,"%c=%d",&n,&ifreq) && n >= '1' && n <= '8') { + fkeys[n - '1'] = ifreq; +- } else if (2 == sscanf(file,"%d=%30[^\n]",&ifreq,name) && stations < 99) { ++ } else if (2 == sscanf(file,"%d=%50[^\n]",&ifreq,name) && stations < 99) { + freqs[stations] = ifreq; + labels[stations] = strdup(name); + stations++; +@@ -371,7 +372,7 @@ + " -d enable debug output\n" + " -m mute radio\n" + " -f freq tune given frequency (also unmutes)\n" +- " -c dev use given device [default: %s]\n" ++ " -c dev try to use given device [defaults: %s and %s]\n" + " -s scan\n" + " -S scan + write radio.fmmap\n" + " -i scan, write initial ~/.radio config file to\n" +@@ -383,7 +384,7 @@ + "(c) 1998-2001 Gerd Knorr \n" + "interface by Juli Merino \n" + "channel scan by Gunther Mayer \n", +- device); ++ device_list[1], device_list[2]); + } + + int +@@ -432,7 +433,8 @@ + } + break; + case 'c': +- device = optarg; ++ device_list[0] = optarg; ++ device = &device_list[0]; + break; + case 'h': + usage(stdout); +@@ -443,9 +445,14 @@ + } + } + +- if (-1 == (fd = open(device, O_RDONLY))) { +- fprintf(stderr,"open %s: %s\n",device,strerror(errno)); +- exit(1); ++ while (-1 == (fd = open(*device, O_RDONLY))) { ++ fprintf(stderr,"Warning: open %s: %s\n",*device,strerror(errno)); ++ if(NULL == *(++device)) { ++ fprintf(stderr,"Giving up.\n"); ++ exit(1); ++ } else { ++ fprintf(stderr,"Trying alternate device: %s\n", *device); ++ } + } + + memset(&tuner,0,sizeof(tuner)); +@@ -627,8 +634,10 @@ + } + if (i != stations) { + i += (key == KEY_NPAGE) ? -1 : 1; +- if (i < 0 || i >= stations) ++ if (i >= stations) + i = 0; ++ if (i < 0) ++ i = stations - 1; + ifreq = freqs[i]; + } + } diff --git a/recipes/xawtv/xawtv-3.95/11_plugins_memory_leaks.patch b/recipes/xawtv/xawtv-3.95/11_plugins_memory_leaks.patch new file mode 100644 index 0000000000..6ea2502e7d --- /dev/null +++ b/recipes/xawtv/xawtv-3.95/11_plugins_memory_leaks.patch @@ -0,0 +1,56 @@ +diff -urNad xawtv-3.95.dfsg.1~/libng/plugins/drv0-v4l2.c xawtv-3.95.dfsg.1/libng/plugins/drv0-v4l2.c +--- xawtv-3.95.dfsg.1~/libng/plugins/drv0-v4l2.c 2005-02-11 18:56:24.000000000 +0100 ++++ xawtv-3.95.dfsg.1/libng/plugins/drv0-v4l2.c 2007-07-29 00:39:54.000000000 +0200 +@@ -509,7 +509,22 @@ + fprintf(stderr, "v4l2: close\n"); + + close(h->fd); ++ ++ if (NULL != h->attr) { ++ int i; ++ for (i = 0; i < h->nattr; ++i) { ++ if ((NULL != h->attr[i].choices) && ++ (stereo != h->attr[i].choices)) { ++ free(h->attr[i].choices); ++ h->attr[i].choices = NULL; ++ } ++ } ++ free(h->attr); ++ h->attr = NULL; ++ } ++ + free(h); ++ h = NULL; + return 0; + } + +diff -urNad xawtv-3.95.dfsg.1~/libng/plugins/drv1-v4l.c xawtv-3.95.dfsg.1/libng/plugins/drv1-v4l.c +--- xawtv-3.95.dfsg.1~/libng/plugins/drv1-v4l.c 2003-02-14 15:14:05.000000000 +0100 ++++ xawtv-3.95.dfsg.1/libng/plugins/drv1-v4l.c 2007-07-29 00:39:54.000000000 +0200 +@@ -469,7 +469,26 @@ + munmap(h->mmap,h->mbuf.size); + + close(h->fd); ++ ++ if (NULL != h->attr) { ++ int i; ++ for (i = 0; i < h->nattr; ++i) { ++ if ((NULL != h->attr[i].choices) && ++ (stereo != h->attr[i].choices)) { ++ free(h->attr[i].choices); ++ h->attr[i].choices = NULL; ++ } ++ } ++ free(h->attr); ++ h->attr = NULL; ++ } ++ ++ if (NULL != h->channels) { free(h->channels); h->channels = NULL; } ++ if (NULL != h->buf_v4l) { free(h->buf_v4l); h->buf_v4l = NULL; } ++ if (NULL != h->buf_me) { free(h->buf_me); h->buf_me = NULL; } ++ + free(h); ++ h = NULL; + return 0; + } + diff --git a/recipes/xawtv/xawtv-3.95/12_fbtv_radeonfb.patch b/recipes/xawtv/xawtv-3.95/12_fbtv_radeonfb.patch new file mode 100644 index 0000000000..3b002c9bce --- /dev/null +++ b/recipes/xawtv/xawtv-3.95/12_fbtv_radeonfb.patch @@ -0,0 +1,151 @@ +diff -urNad xawtv-3.95.dfsg.1~/console/fbtools.c xawtv-3.95.dfsg.1/console/fbtools.c +--- xawtv-3.95.dfsg.1~/console/fbtools.c 2007-07-29 00:54:44.000000000 +0200 ++++ xawtv-3.95.dfsg.1/console/fbtools.c 2007-07-29 00:55:39.000000000 +0200 +@@ -447,7 +447,7 @@ + fb_activate_current(tty); + + /* cls */ +- fb_memset(fb_mem+fb_mem_offset,0,fb_fix.smem_len); ++ fb_memset(fb_mem+fb_mem_offset,0,fb_var.yres * fb_fix.line_length); + return fb; + + err: +@@ -458,15 +458,33 @@ + void + fb_cleanup(void) + { ++ struct fb_var_screeninfo var; ++ + /* restore console */ ++ if (0 == ioctl(fb,FBIOGET_VSCREENINFO,&var)) { ++ if (!memcmp(&var, &fb_ovar, sizeof(var))) { ++ goto skip_var; ++ } ++ } + if (-1 == ioctl(fb,FBIOPUT_VSCREENINFO,&fb_ovar)) + perror("ioctl FBIOPUT_VSCREENINFO"); ++skip_var: + if (-1 == ioctl(fb,FBIOGET_FSCREENINFO,&fb_fix)) + perror("ioctl FBIOGET_FSCREENINFO"); + if (fb_ovar.bits_per_pixel == 8 || + fb_fix.visual == FB_VISUAL_DIRECTCOLOR) { +- if (-1 == ioctl(fb,FBIOPUTCMAP,&ocmap)) +- perror("ioctl FBIOPUTCMAP"); ++ if (-1 == ioctl(fb,FBIOPUTCMAP,&ocmap)) { ++ /* ++ * radeonfb in 15/16bpp returns EINVAL when color ++ * map retrieved by FBIOGETCMAP is programmed back ++ * by FBIOPUTCMAP. It still programs palette ++ * correctly, just instead of ignoring items 64-255 ++ * it returns an error. ++ */ ++ if (errno != EINVAL) { ++ perror("ioctl FBIOPUTCMAP"); ++ } ++ } + } + close(fb); + +diff -urNad xawtv-3.95.dfsg.1~/console/fbtv.c xawtv-3.95.dfsg.1/console/fbtv.c +--- xawtv-3.95.dfsg.1~/console/fbtv.c 2005-09-30 12:09:22.000000000 +0200 ++++ xawtv-3.95.dfsg.1/console/fbtv.c 2007-07-29 00:55:39.000000000 +0200 +@@ -230,6 +230,26 @@ + } + + static void ++fb_loadpalette(int fd) ++{ ++ if (fb_var.bits_per_pixel == 8 || ++ fb_fix.visual == FB_VISUAL_DIRECTCOLOR) { ++ if (-1 == ioctl(fd,FBIOPUTCMAP,&cmap)) { ++ /* ++ * radeonfb in 15/16bpp returns EINVAL when color ++ * map retrieved by FBIOGETCMAP is programmed back ++ * by FBIOPUTCMAP. It still programs palette ++ * correctly, just instead of ignoring items 64-255 ++ * it returns an error. ++ */ ++ if (errno != EINVAL) { ++ perror("ioctl FBIOPUTCMAP"); ++ } ++ } ++ } ++} ++ ++static void + fb_initcolors(int fd, int gray) + { + /* get colormap */ +@@ -288,11 +308,7 @@ + } + + /* set colormap */ +- if (fb_var.bits_per_pixel == 8 || +- fb_fix.visual == FB_VISUAL_DIRECTCOLOR) { +- if (-1 == ioctl(fd,FBIOPUTCMAP,&cmap)) +- perror("ioctl FBIOPUTCMAP"); +- } ++ fb_loadpalette(fd); + } + + static void +@@ -511,11 +527,17 @@ + } + + static void ++clear_video(void) ++{ ++ fb_memset(fb_mem+fb_mem_offset,0,fb_var.yres * fb_fix.line_length); ++} ++ ++static void + do_fullscreen(void) + { + do_va_cmd(2,"capture","off"); + quiet = !quiet; +- fb_memset(fb_mem+fb_mem_offset,0,fb_fix.smem_len); ++ clear_video(); + do_va_cmd(2,"capture","on"); + } + +@@ -553,8 +575,9 @@ + case FB_ACQ_REQ: + switch_last = fb_switch_state; + fb_switch_acquire(); +- fb_memset(fb_mem+fb_mem_offset,0,fb_fix.smem_len); ++ clear_video(); + ioctl(fb,FBIOPAN_DISPLAY,&fb_var); ++ fb_loadpalette(fb); + do_va_cmd(2,"capture","on"); + break; + case FB_ACTIVE: +@@ -748,7 +771,7 @@ + } + #endif + +- fb_memset(fb_mem+fb_mem_offset,0,fb_fix.smem_len); ++ clear_video(); + for (;!sig;) { + if ((fb_switch_state == FB_ACTIVE || keep_dma_on) && !quiet) { + /* clear first lines */ +@@ -918,7 +941,7 @@ + audio_off(); + drv->close(h_drv); + if (fb_switch_state == FB_ACTIVE) +- fb_memset(fb_mem+fb_mem_offset,0,fb_fix.smem_len); ++ clear_video(); + tty_cleanup(); + fb_cleanup(); + exit(0); +diff -urNad xawtv-3.95.dfsg.1~/console/v4l-conf.c xawtv-3.95.dfsg.1/console/v4l-conf.c +--- xawtv-3.95.dfsg.1~/console/v4l-conf.c 2005-02-09 13:27:36.000000000 +0100 ++++ xawtv-3.95.dfsg.1/console/v4l-conf.c 2007-07-29 00:55:39.000000000 +0200 +@@ -347,7 +347,7 @@ + /* set values */ + fb.fmt.width = d->width; + fb.fmt.height = d->height; +- switch (d->bpp) { ++ switch (d->bpp != 16 ? d->bpp : d->depth) { + case 8: fb.fmt.pixelformat = V4L2_PIX_FMT_HI240; break; + #if BYTE_ORDER == BIG_ENDIAN + case 15: fb.fmt.pixelformat = V4L2_PIX_FMT_RGB555X; break; diff --git a/recipes/xawtv/xawtv-3.95/13_libquicktime_compat.patch b/recipes/xawtv/xawtv-3.95/13_libquicktime_compat.patch new file mode 100644 index 0000000000..f9c725916c --- /dev/null +++ b/recipes/xawtv/xawtv-3.95/13_libquicktime_compat.patch @@ -0,0 +1,28 @@ +diff -urNad xawtv-3.95.dfsg.1~/libng/plugins/write-qt.c xawtv-3.95.dfsg.1/libng/plugins/write-qt.c +--- xawtv-3.95.dfsg.1~/libng/plugins/write-qt.c 2007-08-15 16:52:45.538908656 +0200 ++++ xawtv-3.95.dfsg.1/libng/plugins/write-qt.c 2007-08-15 16:54:28.400770420 +0200 +@@ -348,10 +348,10 @@ + info[i]->name,info[i]->long_name); + for (j = 0; j < info[i]->num_fourccs; j++) + fprintf(stderr," fcc : %s\n",info[i]->fourccs[j]); +- for (j = 0; j < info[i]->num_encoding_colormodels; j++) ++ for (j = 0; j < lqt_num_colormodels(); j++) + fprintf(stderr," cmodel: %d [%s]\n", +- info[i]->encoding_colormodels[j], +- lqt_get_colormodel_string(info[i]->encoding_colormodels[j])); ++ lqt_get_colormodel(j), ++ lqt_get_colormodel_string(j)); + } + + /* sanity checks */ +@@ -378,8 +378,8 @@ + /* pick colormodel */ + fmtid = VIDEO_NONE; + cmodel = 0; +- for (j = 0; j < info[i]->num_encoding_colormodels; j++) { +- cmodel = info[i]->encoding_colormodels[j]; ++ for (j = 0; j < lqt_num_colormodels(); j++) { ++ cmodel = lqt_get_colormodel(j); + if (cmodel>= sizeof(cmodels)/sizeof(int)) + continue; + if (!cmodels[cmodel]) diff --git a/recipes/xawtv/xawtv-3.95/14_scantv_input_override.patch b/recipes/xawtv/xawtv-3.95/14_scantv_input_override.patch new file mode 100644 index 0000000000..5439aebcd6 --- /dev/null +++ b/recipes/xawtv/xawtv-3.95/14_scantv_input_override.patch @@ -0,0 +1,64 @@ +diff -urNad xawtv-3.95.dfsg.1~/console/scantv.c xawtv-3.95.dfsg.1/console/scantv.c +--- xawtv-3.95.dfsg.1~/console/scantv.c 2005-09-30 12:07:02.000000000 +0200 ++++ xawtv-3.95.dfsg.1/console/scantv.c 2007-08-15 17:47:02.000483826 +0200 +@@ -116,6 +116,7 @@ + "options:\n" + " -h print this text\n" + " -o outfile set output file. [%s]\n" ++ " -i input set input.\n" + " -n norm set tv norm.\n" + " -f table set frequency table.\n" + " -c device set video device file. [%s]\n" +@@ -137,6 +138,7 @@ + unsigned int f,f1,f2,fc; + char *name,dummy[32]; + char *tvnorm = NULL; ++ char *tvinput = NULL; + char *freqtab = NULL; + char *outfile = NULL; + FILE *conf = stdout; +@@ -144,7 +146,7 @@ + /* parse options */ + ng_init(); + for (;;) { +- if (-1 == (c = getopt(argc, argv, "hsadn:f:o:c:C:"))) ++ if (-1 == (c = getopt(argc, argv, "hsadi:n:f:o:c:C:"))) + break; + switch (c) { + case 'd': +@@ -156,6 +158,9 @@ + case 'a': + fullscan=1; + break; ++ case 'i': ++ tvinput = optarg; ++ break; + case 'n': + tvnorm = optarg; + break; +@@ -203,12 +208,15 @@ + attr = ng_attr_byid(attrs,ATTR_ID_NORM); + i = menu("please select your TV norm",attr->choices,tvnorm); + j = menu("please select a frequency table",chanlist_names,freqtab); ++ if (tvinput == NULL) { ++ tvinput = "Television"; ++ } + + fprintf(conf,"[global]\n"); + fprintf(conf,"freqtab = %s\n",chanlist_names[j].str); + fprintf(conf,"\n"); + fprintf(conf,"[defaults]\n"); +- fprintf(conf,"input = Television\n"); ++ fprintf(conf,"input = %s\n", tvinput); + fprintf(conf,"norm = %s\n",ng_attr_getstr(attr,i)); + fprintf(conf,"\n"); + fflush(conf); +@@ -220,7 +228,7 @@ + exit(0); + } + set_defaults(); +- do_va_cmd(2,"setinput","television"); ++ do_va_cmd(2,"setinput",tvinput); + do_va_cmd(2,"setnorm",ng_attr_getstr(attr,i)); + do_va_cmd(2,"setfreqtab",chanlist_names[j].str); + diff --git a/recipes/xawtv/xawtv-3.95/15_xawtv_bin_cutoff.patch b/recipes/xawtv/xawtv-3.95/15_xawtv_bin_cutoff.patch new file mode 100644 index 0000000000..0a1ba52891 --- /dev/null +++ b/recipes/xawtv/xawtv-3.95/15_xawtv_bin_cutoff.patch @@ -0,0 +1,21 @@ +diff -urNad xawtv-3.95.dfsg.1~/x11/xawtv.c xawtv-3.95.dfsg.1/x11/xawtv.c +--- xawtv-3.95.dfsg.1~/x11/xawtv.c 2003-04-11 11:42:04.000000000 +0200 ++++ xawtv-3.95.dfsg.1/x11/xawtv.c 2007-09-26 00:00:57.221442822 +0200 +@@ -1579,11 +1579,16 @@ + main(int argc, char *argv[]) + { + int i; ++ char * cut; + unsigned long freq; + + hello_world("xawtv"); + progname = strdup(argv[0]); +- ++ ++ /* cut off .bin from command name */ ++ if ((cut = strstr(argv[0], ".bin"))) ++ *cut = '\0'; ++ + /* toplevel */ + XtSetLanguageProc(NULL,NULL,NULL); + app_shell = XtVaAppInitialize(&app_context, "Xawtv", diff --git a/recipes/xawtv/xawtv-3.95/16_xawtv_v4l2_buffer.patch b/recipes/xawtv/xawtv-3.95/16_xawtv_v4l2_buffer.patch new file mode 100644 index 0000000000..2c48aeee91 --- /dev/null +++ b/recipes/xawtv/xawtv-3.95/16_xawtv_v4l2_buffer.patch @@ -0,0 +1,11 @@ +diff -urNad xawtv-3.95.dfsg.1~/libng/plugins/drv0-v4l2.c xawtv-3.95.dfsg.1/libng/plugins/drv0-v4l2.c +--- xawtv-3.95.dfsg.1~/libng/plugins/drv0-v4l2.c 2007-10-16 19:23:11.111287329 +0200 ++++ xawtv-3.95.dfsg.1/libng/plugins/drv0-v4l2.c 2007-10-16 19:26:14.641746134 +0200 +@@ -768,6 +768,7 @@ + /* get it */ + memset(&buf,0,sizeof(buf)); + buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; ++ buf.memory = V4L2_MEMORY_MMAP; + if (-1 == xioctl(h->fd,VIDIOC_DQBUF,&buf, 0)) + return -1; + h->waiton++; diff --git a/recipes/xawtv/xawtv-3.95/17_scantv_man_typo.patch b/recipes/xawtv/xawtv-3.95/17_scantv_man_typo.patch new file mode 100644 index 0000000000..c27d95c50b --- /dev/null +++ b/recipes/xawtv/xawtv-3.95/17_scantv_man_typo.patch @@ -0,0 +1,12 @@ +diff -urNad xawtv-3.95.dfsg.1~/man/scantv.1 xawtv-3.95.dfsg.1/man/scantv.1 +--- xawtv-3.95.dfsg.1~/man/scantv.1 2003-02-14 15:14:07.000000000 +0100 ++++ xawtv-3.95.dfsg.1/man/scantv.1 2007-11-24 19:13:46.097835274 +0100 +@@ -18,7 +18,7 @@ + none is given. + .TP + .B -o outfile +-specify \fBo\fPutput file. If none is specified, scantv write ++specify \fBo\fPutput file. If none is specified, scantv writes + to stdout. + .TP + .B -c device diff --git a/recipes/xawtv/xawtv-3.95/18_glib2.patch b/recipes/xawtv/xawtv-3.95/18_glib2.patch new file mode 100644 index 0000000000..e2a7efc2f2 --- /dev/null +++ b/recipes/xawtv/xawtv-3.95/18_glib2.patch @@ -0,0 +1,24 @@ +diff -urNad xawtv_3.95.dfsg.1~/configure xawtv_3.95.dfsg.1/configure +--- xawtv_3.95.dfsg.1~/configure 2005-09-30 12:10:03.000000000 +0200 ++++ xawtv_3.95.dfsg.1/configure 2007-12-14 15:09:47.132603414 +0100 +@@ -5971,7 +5971,7 @@ + echo "*** DV disabled" + fi + +-dashlglib=$(glib-config --libs 2>/dev/null) ++dashlglib=$(pkg-config glib-2.0 --libs 2>/dev/null) + if test "$enable_quicktime" != "no"; then + echo "$as_me:$LINENO: checking for lqt_query_registry in -lquicktime" >&5 + echo $ECHO_N "checking for lqt_query_registry in -lquicktime... $ECHO_C" >&6 +diff -urNad xawtv_3.95.dfsg.1~/configure.ac xawtv_3.95.dfsg.1/configure.ac +--- xawtv_3.95.dfsg.1~/configure.ac 2004-08-18 17:48:09.000000000 +0200 ++++ xawtv_3.95.dfsg.1/configure.ac 2007-12-14 15:08:24.003866177 +0100 +@@ -223,7 +223,7 @@ + echo "*** DV disabled" + fi + +-dashlglib=$(glib-config --libs 2>/dev/null) ++dashlglib=$(pkg-config glib-2.0 --libs 2>/dev/null) + if test "$enable_quicktime" != "no"; then + AC_CHECK_LIB(quicktime, lqt_query_registry, + FOUND_LQT="yes"; AC_DEFINE(HAVE_LIBQUICKTIME,1,"have libquicktime"),, diff --git a/recipes/xawtv/xawtv-3.93/make.patch b/recipes/xawtv/xawtv-3.95/make.patch similarity index 62% rename from recipes/xawtv/xawtv-3.93/make.patch rename to recipes/xawtv/xawtv-3.95/make.patch index 481e945bea..5df8368b68 100644 --- a/recipes/xawtv/xawtv-3.93/make.patch +++ b/recipes/xawtv/xawtv-3.95/make.patch @@ -1,16 +1,20 @@ ---- tmp/base/xawtv-3.93-r0/xawtv-3.93/common/Subdir.mk 2003-02-14 09:14:04.000000000 -0500 -+++ xawtv-3.93/common/Subdir.mk 2004-06-08 16:50:35.382555000 -0400 +Index: xawtv-3.95/common/Subdir.mk +=================================================================== +--- xawtv-3.95.orig/common/Subdir.mk 2003-02-14 15:14:04.000000000 +0100 ++++ xawtv-3.95/common/Subdir.mk 2011-02-26 22:40:51.864893305 +0100 @@ -17,7 +17,7 @@ # RegEdit.c is good old K&R ... common/RegEdit.o: CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes -common/channel-no-x11.o: CFLAGS += -DNO_X11=1 -+common/channel-no-x11.o: DEFS += -DNO_X11=1 ++common/channel-no-x11.o: DEFS += -DNO_X11=1 common/channel-no-x11.o: common/channel.c @$(echo_compile_c) ---- tmp/base/xawtv-3.93-r0/xawtv-3.93/configure.ac 2004-03-10 11:34:37.000000000 -0500 -+++ xawtv-3.93/configure.ac 2004-06-08 17:01:42.023414000 -0400 +Index: xawtv-3.95/configure.ac +=================================================================== +--- xawtv-3.95.orig/configure.ac 2011-02-26 22:40:51.814868305 +0100 ++++ xawtv-3.95/configure.ac 2011-02-26 22:40:51.864893305 +0100 @@ -150,6 +150,12 @@ ATHENA="" FSLIB="" @@ -24,8 +28,10 @@ AC_SUBST(X_CFLAGS) AC_SUBST(X_PRE_LIBS) AC_SUBST(X_EXTRA_LIBS) ---- tmp/base/xawtv-3.93-r0/xawtv-3.93/console/Subdir.mk 2003-02-14 09:14:04.000000000 -0500 -+++ xawtv-3.93/console/Subdir.mk 2004-06-08 16:54:22.296488000 -0400 +Index: xawtv-3.95/console/Subdir.mk +=================================================================== +--- xawtv-3.95.orig/console/Subdir.mk 2003-02-14 15:14:04.000000000 +0100 ++++ xawtv-3.95/console/Subdir.mk 2011-02-26 22:44:38.017913306 +0100 @@ -84,11 +84,11 @@ console/v4l-conf : LDLIBS += $(ATHENA_LIBS) @@ -43,8 +49,19 @@ # global targets all:: $(TARGETS-console) $(TARGETS-v4l-conf) ---- tmp/base/xawtv-3.93-r0/xawtv-3.93/libng/contrib-plugins/Subdir.mk 2003-02-14 09:14:05.000000000 -0500 -+++ xawtv-3.93/libng/contrib-plugins/Subdir.mk 2004-06-08 16:53:10.545928000 -0400 +@@ -96,7 +96,7 @@ + install:: + $(INSTALL_PROGRAM) $(TARGETS-console) $(bindir) + ifeq ($(FOUND_OS),linux) +- $(INSTALL_PROGRAM) $(SUID_ROOT) $(TARGETS-v4l-conf) $(bindir) ++ $(INSTALL_PROGRAM) $(TARGETS-v4l-conf) $(bindir) + endif + + distclean:: +Index: xawtv-3.95/libng/contrib-plugins/Subdir.mk +=================================================================== +--- xawtv-3.95.orig/libng/contrib-plugins/Subdir.mk 2003-02-14 15:14:05.000000000 +0100 ++++ xawtv-3.95/libng/contrib-plugins/Subdir.mk 2011-02-26 22:40:51.864893305 +0100 @@ -18,7 +18,7 @@ # linear-blend has mmx support ... @@ -54,8 +71,10 @@ endif # global targets ---- tmp/base/xawtv-3.93-r0/xawtv-3.93/Makefile.in 2004-04-22 10:52:29.000000000 -0400 -+++ xawtv-3.93/Makefile.in 2004-06-08 17:06:40.828711000 -0400 +Index: xawtv-3.95/Makefile.in +=================================================================== +--- xawtv-3.95.orig/Makefile.in 2004-04-22 16:52:29.000000000 +0200 ++++ xawtv-3.95/Makefile.in 2011-02-26 22:40:51.864893305 +0100 @@ -28,12 +28,13 @@ # for CFLAGS @@ -109,8 +128,10 @@ ######################################################### ---- tmp/base/xawtv-3.93-r0/xawtv-3.93/mk/Compile.mk 2003-02-14 09:14:08.000000000 -0500 -+++ xawtv-3.93/mk/Compile.mk 2004-06-08 16:53:52.030861000 -0400 +Index: xawtv-3.95/mk/Compile.mk +=================================================================== +--- xawtv-3.95.orig/mk/Compile.mk 2003-02-14 15:14:08.000000000 +0100 ++++ xawtv-3.95/mk/Compile.mk 2011-02-26 22:40:51.864893305 +0100 @@ -20,8 +20,8 @@ depfile = mk/$(subst /,_,$*).dep depfiles = mk/*.dep @@ -122,20 +143,24 @@ fixup_deps = sed -e "s|.*\.o:|$@:|" < $(tmpdep) > $(depfile) && rm -f $(tmpdep) link_app = $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) ---- tmp/base/xawtv-3.93-r0/xawtv-3.93/x11/Subdir.mk 2004-01-12 12:56:17.000000000 -0500 -+++ xawtv-3.93/x11/Subdir.mk 2004-06-08 16:53:36.097733000 -0400 -@@ -110,14 +110,14 @@ +Index: xawtv-3.95/x11/Subdir.mk +=================================================================== +--- xawtv-3.95.orig/x11/Subdir.mk 2005-01-05 11:25:03.000000000 +0100 ++++ xawtv-3.95/x11/Subdir.mk 2011-02-26 22:40:51.864893305 +0100 +@@ -110,15 +110,15 @@ x11/propwatch : LDLIBS += $(ATHENA_LIBS) # linker flags -x11/xawtv : LDFLAGS := $(DLFLAGS) -x11/motv : LDFLAGS := $(DLFLAGS) +-x11/mtt : LDFLAGS := $(DLFLAGS) -x11/v4lctl : LDFLAGS := $(DLFLAGS) -x11/pia : LDFLAGS := $(DLFLAGS) -+x11/xawtv : LDLIBS += $(DLFLAGS) -+x11/motv : LDLIBS += $(DLFLAGS) -+x11/v4lctl : LDLIBS += $(DLFLAGS) -+x11/pia : LDLIBS += $(DLFLAGS) ++x11/xawtv : LDFLAGS += $(DLFLAGS) ++x11/motv : LDFLAGS += $(DLFLAGS) ++x11/mtt : LDFLAGS += $(DLFLAGS) ++x11/v4lctl : LDFLAGS += $(DLFLAGS) ++x11/pia : LDFLAGS += $(DLFLAGS) # compile flags -x11/complete-xaw.o : CFLAGS += -DATHENA=1 diff --git a/recipes/xawtv/xawtv-3.95/sys_siglist.patch b/recipes/xawtv/xawtv-3.95/sys_siglist.patch new file mode 100644 index 0000000000..f97b0bf492 --- /dev/null +++ b/recipes/xawtv/xawtv-3.95/sys_siglist.patch @@ -0,0 +1,47 @@ +Index: xawtv-3.95/console/fbtools.c +=================================================================== +--- xawtv-3.95.orig/console/fbtools.c 2011-02-26 22:38:35.406698306 +0100 ++++ xawtv-3.95/console/fbtools.c 2011-02-26 22:39:48.986803306 +0100 +@@ -534,6 +534,6 @@ + + /* cleanup */ + fb_cleanup(); +- fprintf(stderr,"Oops: %s\n",sys_siglist[termsig]); ++ fprintf(stderr,"Oops: %s\n", strsignal(termsig)); + exit(42); + } +Index: xawtv-3.95/console/record.c +=================================================================== +--- xawtv-3.95.orig/console/record.c 2003-04-03 12:51:00.000000000 +0200 ++++ xawtv-3.95/console/record.c 2011-02-26 22:39:34.836398305 +0100 +@@ -428,7 +428,7 @@ + { + if (verbose) + fprintf(stderr,"\n%s - exiting\n", +- sys_siglist[signal]); ++ strsignal(signal)); + stop = 1; + } + +Index: xawtv-3.95/x11/rootv.c +=================================================================== +--- xawtv-3.95.orig/x11/rootv.c 2003-02-14 15:14:08.000000000 +0100 ++++ xawtv-3.95/x11/rootv.c 2011-02-26 22:38:35.810233306 +0100 +@@ -133,7 +133,7 @@ + termsig = signal; + if (verbose) + fprintf(stderr,"received signal %d [%s]\n", +- termsig,sys_siglist[termsig]); ++ termsig, strsignal(termsig)); + } + + static void usage(FILE *fp) +@@ -423,7 +423,7 @@ + } + if (verbose && termsig) + fprintf(stderr,"exiting on signal %d [%s]\n", +- termsig,sys_siglist[termsig]); ++ termsig, strsignal(termsig)); + if (do_mute && have_mute) + XvSetPortAttribute(dpy,port,XV_MUTE,1); + XvStopVideo(dpy,port,win); diff --git a/recipes/xawtv/xawtv_3.93.bb b/recipes/xawtv/xawtv_3.93.bb deleted file mode 100644 index 39d4af4cb1..0000000000 --- a/recipes/xawtv/xawtv_3.93.bb +++ /dev/null @@ -1,35 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -DESCRIPTION = "XawTV is a simple Xaw-based TV program which uses the bttw \ -driver or video4linux. It also contains various command-line utilities for \ -grabbing images and AVI movies, tuning in TV stations, etc." -DEPENDS = "libxaw libxmu libxt libxpm libxext virtual/libx11 ncurses libxft fs jpeg" -PR = "r1" - -SRC_URI = "http://dl.bytesex.org/releases/xawtv/xawtv-${PV}.tar.gz \ - file://make.patch" -S = "${WORKDIR}/xawtv-${PV}" - -inherit autotools - -# FIXME: libXaw needs a full x11, not diet -BROKEN = "1" - -EXTRA_OECONF = "--disable-xfree-ext \ - --disable-xvideo \ - --disable-lirc \ - --disable-quicktime \ - --disable-motif \ - --disable-aa \ - --disable-alsa \ - --disable-zvbi \ - --disable-gl \ - --disable-dv \ - --disable-mmx \ - --enable-xft \ - --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR}" -EXTRA_OEMAKE += " 'verbose=yes'" - -SRC_URI[md5sum] = "8d2731e6e95f173f41a0ddc875d55804" -SRC_URI[sha256sum] = "d5e333bc74c0a534bf96f40ea89b7e700f137d46f1fdbaea13fa552ad6227af8" diff --git a/recipes/xawtv/xawtv_3.95.bb b/recipes/xawtv/xawtv_3.95.bb new file mode 100644 index 0000000000..3d6351c57e --- /dev/null +++ b/recipes/xawtv/xawtv_3.95.bb @@ -0,0 +1,52 @@ +LICENSE = "GPL" +SECTION = "x11/utils" +DESCRIPTION = "XawTV is a simple Xaw-based TV program which uses the bttw \ +driver or video4linux. It also contains various command-line utilities for \ +grabbing images and AVI movies, tuning in TV stations, etc." +DEPENDS = "alsa-lib libxaw libxmu libxt libxpm libxext virtual/libx11 ncurses libxft fs jpeg" +PR = "r0" + +SRC_URI = "http://dl.bytesex.org/releases/xawtv/xawtv-${PV}.tar.gz \ + file://01_gcc4.patch \ + file://04_man_typo.patch \ + file://05_man_section.patch \ + file://07_page_size.patch \ + file://08_oss_audio.patch \ + file://09_audio_unmute.patch \ + file://10_radio_fixes.patch \ + file://11_plugins_memory_leaks.patch \ + file://12_fbtv_radeonfb.patch \ + file://13_libquicktime_compat.patch \ + file://14_scantv_input_override.patch \ + file://15_xawtv_bin_cutoff.patch \ + file://16_xawtv_v4l2_buffer.patch \ + file://17_scantv_man_typo.patch \ + file://18_glib2.patch \ + file://make.patch \ + file://sys_siglist.patch \ + " + +S = "${WORKDIR}/xawtv-${PV}" + +inherit autotools + +# FIXME: libXaw needs a full x11, not diet +BROKEN = "1" + +EXTRA_OECONF = "--disable-xfree-ext \ + --disable-xvideo \ + --disable-lirc \ + --disable-quicktime \ + --disable-motif \ + --disable-aa \ + --disable-zvbi \ + --disable-gl \ + --disable-dv \ + --disable-mmx \ + --enable-xft \ + --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR}" +EXTRA_OEMAKE += " 'verbose=yes'" + +SRC_URI[md5sum] = "ad25e03f7e128b318e392cb09f52207d" +SRC_URI[sha256sum] = "1204212c59d10df4e29a9a0ddce96cab78342859ec44bf6fd1c5f260b5c7216f" From 8c28bad615618daa659e82d675501584d9eda9f6 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sat, 26 Feb 2011 23:06:33 +0100 Subject: [PATCH 107/509] linux-kexecboot: rework 2.6.24 defconfig for Zaurus poodle. * add boot from CF * add vfat and ext3 filesystems Signed-off-by: Andrea Adami --- .../linux-kexecboot-2.6.24/poodle/defconfig | 184 ++++++++++++------ 1 file changed, 124 insertions(+), 60 deletions(-) diff --git a/recipes/linux/linux-kexecboot-2.6.24/poodle/defconfig b/recipes/linux/linux-kexecboot-2.6.24/poodle/defconfig index 6ad99c785d..db25ff11db 100644 --- a/recipes/linux/linux-kexecboot-2.6.24/poodle/defconfig +++ b/recipes/linux/linux-kexecboot-2.6.24/poodle/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24 -# Sun Feb 1 20:09:19 2009 +# Sat Feb 26 01:12:42 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -31,12 +31,15 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y -# CONFIG_SWAP is not set -# CONFIG_SYSVIPC is not set -# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y # CONFIG_USER_NS is not set # CONFIG_PID_NS is not set # CONFIG_IKCONFIG is not set @@ -52,25 +55,27 @@ CONFIG_INITRAMFS_ROOT_GID=0 CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_EMBEDDED=y -# CONFIG_UID16 is not set -# CONFIG_SYSCTL_SYSCALL is not set -# CONFIG_KALLSYMS is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y -# CONFIG_BUG is not set -# CONFIG_ELF_CORE is not set +CONFIG_BUG=y +CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y -# CONFIG_FUTEX is not set +CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y -# CONFIG_VM_EVENT_COUNTERS is not set +CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 # CONFIG_MODULES is not set @@ -84,14 +89,14 @@ CONFIG_BLOCK=y # IO Schedulers # CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_AS is not set +CONFIG_IOSCHED_AS=y # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set -# CONFIG_DEFAULT_AS is not set +CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_CFQ is not set -CONFIG_DEFAULT_NOOP=y -CONFIG_DEFAULT_IOSCHED="noop" +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" # # System Type @@ -196,8 +201,8 @@ CONFIG_SHARP_SCOOP=y CONFIG_PCCARD=y # CONFIG_PCMCIA_DEBUG is not set CONFIG_PCMCIA=y -# CONFIG_PCMCIA_LOAD_CIS is not set -# CONFIG_PCMCIA_IOCTL is not set +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y # # PC-card bridges @@ -207,11 +212,11 @@ CONFIG_PCMCIA_PXA2XX=y # # Kernel Features # -# CONFIG_TICK_ONESHOT is not set -# CONFIG_NO_HZ is not set -# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -# CONFIG_PREEMPT is not set +CONFIG_PREEMPT=y CONFIG_HZ=100 CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set @@ -236,7 +241,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 fbcon=rotate:1" +CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y @@ -245,6 +250,10 @@ CONFIG_ATAGS_PROC=y # CPU Frequency scaling # # CONFIG_CPU_FREQ is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set # # Floating point emulation @@ -267,8 +276,9 @@ CONFIG_BINFMT_ELF=y CONFIG_PM=y # CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP=y CONFIG_SUSPEND_UP_POSSIBLE=y -# CONFIG_SUSPEND is not set +CONFIG_SUSPEND=y CONFIG_APM_EMULATION=y # @@ -369,7 +379,8 @@ CONFIG_MTD_NAND_SHARPSL=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set -# CONFIG_BLK_DEV_LOOP is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_MISC_DEVICES is not set @@ -381,7 +392,7 @@ CONFIG_BLK_DEV_IDE=y # Please see Documentation/ide.txt for help/info on IDE drives # # CONFIG_BLK_DEV_IDE_SATA is not set -# CONFIG_BLK_DEV_IDEDISK is not set +CONFIG_BLK_DEV_IDEDISK=y # CONFIG_IDEDISK_MULTI_MODE is not set CONFIG_BLK_DEV_IDECS=y # CONFIG_BLK_DEV_IDECD is not set @@ -389,12 +400,12 @@ CONFIG_BLK_DEV_IDECS=y # CONFIG_BLK_DEV_IDEFLOPPY is not set # CONFIG_BLK_DEV_IDESCSI is not set # CONFIG_IDE_TASK_IOCTL is not set -# CONFIG_IDE_PROC_FS is not set +CONFIG_IDE_PROC_FS=y # # IDE chipset support/bugfixes # -# CONFIG_IDE_GENERIC is not set +CONFIG_IDE_GENERIC=y # CONFIG_BLK_DEV_PLATFORM is not set # CONFIG_IDE_ARM is not set # CONFIG_BLK_DEV_IDEDMA is not set @@ -437,10 +448,13 @@ CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SRP_ATTRS is not set -# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_SCSI_DEBUG is not set # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set # CONFIG_ATA is not set -# CONFIG_MD is not set +CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set +# CONFIG_BLK_DEV_DM is not set # # Input device support @@ -511,12 +525,7 @@ CONFIG_HW_CONSOLE=y # # Serial drivers # -CONFIG_SERIAL_8250=y -# CONFIG_SERIAL_8250_CONSOLE is not set -# CONFIG_SERIAL_8250_CS is not set -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -# CONFIG_SERIAL_8250_EXTENDED is not set +# CONFIG_SERIAL_8250 is not set # # Non-8250 serial port support @@ -528,7 +537,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_IPMI_HANDLER is not set -CONFIG_HW_RANDOM=y +# CONFIG_HW_RANDOM is not set # CONFIG_NVRAM is not set # CONFIG_R3964 is not set @@ -605,20 +614,8 @@ CONFIG_SSB_POSSIBLE=y # # Multimedia devices # -CONFIG_VIDEO_DEV=y -CONFIG_VIDEO_V4L1=y -CONFIG_VIDEO_V4L1_COMPAT=y -CONFIG_VIDEO_V4L2=y -CONFIG_VIDEO_CAPTURE_DRIVERS=y -# CONFIG_VIDEO_ADV_DEBUG is not set -CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -# CONFIG_VIDEO_VIVI is not set -# CONFIG_VIDEO_CPIA is not set -# CONFIG_VIDEO_SAA5246A is not set -# CONFIG_VIDEO_SAA5249 is not set -# CONFIG_TUNER_3036 is not set -CONFIG_RADIO_ADAPTERS=y -CONFIG_DAB=y +# CONFIG_VIDEO_DEV is not set +# CONFIG_DAB is not set # # Graphics support @@ -711,9 +708,71 @@ CONFIG_MMC_BLOCK_BOUNCE=y # MMC/SD Host Controller Drivers # CONFIG_MMC_PXA=y -# CONFIG_NEW_LEDS is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_LOCOMO=y +# CONFIG_LEDS_TOSA is not set +# CONFIG_LEDS_GPIO is not set + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_IDE_DISK=y +# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set CONFIG_RTC_LIB=y -# CONFIG_RTC_CLASS is not set +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_SA1100=y # # File systems @@ -721,8 +780,10 @@ CONFIG_RTC_LIB=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_FS_XATTR is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -747,8 +808,11 @@ CONFIG_DNOTIFY=y # # DOS/FAT/NT Filesystems # +CONFIG_FAT_FS=y # CONFIG_MSDOS_FS is not set -# CONFIG_VFAT_FS is not set +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_NTFS_FS is not set # @@ -788,10 +852,8 @@ CONFIG_JFFS2_RUBIN=y CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_JFFS2_CMODE_SIZE is not set # CONFIG_JFFS2_CMODE_FAVOURLZO is not set -CONFIG_CRAMFS=y -CONFIG_SQUASHFS=y -# CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_CRAMFS is not set +# CONFIG_SQUASHFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set @@ -845,7 +907,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set CONFIG_NLS_ASCII=y -# CONFIG_NLS_ISO8859_1 is not set +CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set @@ -872,6 +934,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set +# CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_FRAME_POINTER=y # CONFIG_SAMPLES is not set # CONFIG_DEBUG_USER is not set @@ -898,6 +961,7 @@ CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y +CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y From 107736905b94dcf84d84048b97106bdf4a43027d Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 27 Feb 2011 00:19:54 +0100 Subject: [PATCH 108/509] linux-kexecboot: rework defconfig for Zaurus poodle * sync kernel config with other Zaurus models Signed-off-by: Andrea Adami --- .../linux-kexecboot-2.6.26/poodle/defconfig | 1090 +++-------------- 1 file changed, 176 insertions(+), 914 deletions(-) diff --git a/recipes/linux/linux-kexecboot-2.6.26/poodle/defconfig b/recipes/linux/linux-kexecboot-2.6.26/poodle/defconfig index 4d40205111..079443c374 100644 --- a/recipes/linux/linux-kexecboot-2.6.26/poodle/defconfig +++ b/recipes/linux/linux-kexecboot-2.6.26/poodle/defconfig @@ -1,6 +1,7 @@ +# # Automatically generated make config: don't edit -# Linux kernel version: 2.6.24-rc8 -# Fri Jan 25 22:13:14 2008 +# Linux kernel version: 2.6.26 +# Sun Feb 27 00:14:01 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -20,6 +21,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_SUPPORTS_AOUT=y CONFIG_ZONE_DMA=y CONFIG_ARCH_MTD_XIP=y CONFIG_VECTORS_BASE=0xffff0000 @@ -33,77 +35,80 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y -# CONFIG_POSIX_MQUEUE is not set CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y -# CONFIG_TASKSTATS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set -# CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 # CONFIG_CGROUPS is not set -CONFIG_FAIR_GROUP_SCHED=y -CONFIG_FAIR_USER_SCHED=y -# CONFIG_FAIR_CGROUP_SCHED is not set -CONFIG_SYSFS_DEPRECATED=y +# CONFIG_GROUP_SCHED is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set -# CONFIG_BLK_DEV_INITRD is not set +# CONFIG_NAMESPACES is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="initramfs.cpio.gz" +CONFIG_INITRAMFS_ROOT_UID=0 +CONFIG_INITRAMFS_ROOT_GID=0 CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y +CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y +CONFIG_COMPAT_BRK=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set +CONFIG_PROFILING=y +# CONFIG_MARKERS is not set +# CONFIG_OPROFILE is not set +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +# CONFIG_HAVE_DMA_ATTRS is not set +CONFIG_PROC_PAGE_MONITOR=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_MODVERSIONS is not set -# CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_KMOD=y +# CONFIG_MODULES is not set CONFIG_BLOCK=y # CONFIG_LBD is not set # CONFIG_BLK_DEV_IO_TRACE is not set # CONFIG_LSF is not set -# CONFIG_BLK_DEV_BSG is not set +CONFIG_BLK_DEV_BSG=y # # IO Schedulers # CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=m -CONFIG_IOSCHED_CFQ=m +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="anticipatory" +CONFIG_CLASSIC_RCU=y # # System Type @@ -132,6 +137,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_ARCH_KS8695 is not set # CONFIG_ARCH_NS9XXX is not set # CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_ORION5X is not set # CONFIG_ARCH_PNX4008 is not set CONFIG_ARCH_PXA=y # CONFIG_ARCH_RPC is not set @@ -141,23 +147,30 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_MSM7X00A is not set # # Intel PXA2xx/PXA3xx Implementations # +# CONFIG_ARCH_GUMSTIX is not set # CONFIG_ARCH_LUBBOCK is not set # CONFIG_MACH_LOGICPD_PXA270 is not set # CONFIG_MACH_MAINSTONE is not set # CONFIG_ARCH_PXA_IDP is not set CONFIG_PXA_SHARPSL=y +# CONFIG_ARCH_PXA_ESERIES is not set # CONFIG_MACH_TRIZEPS4 is not set # CONFIG_MACH_HX2750 is not set # CONFIG_MACH_EM_X270 is not set +# CONFIG_MACH_COLIBRI is not set # CONFIG_MACH_ZYLONITE is not set +# CONFIG_MACH_LITTLETON is not set # CONFIG_MACH_ARMCORE is not set +# CONFIG_MACH_MAGICIAN is not set +# CONFIG_MACH_PCM027 is not set +# CONFIG_MACH_HTCUNIVERSAL is not set CONFIG_PXA_SHARPSL_25x=y # CONFIG_PXA_SHARPSL_27x is not set -# CONFIG_MACH_HTCUNIVERSAL is not set CONFIG_MACH_POODLE=y # CONFIG_MACH_CORGI is not set # CONFIG_MACH_SHEPHERD is not set @@ -182,6 +195,7 @@ CONFIG_CPU_32=y CONFIG_CPU_XSCALE=y CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_PABRT_NOIFAR=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_TLB_V4WBI=y CONFIG_CPU_CP15=y @@ -205,16 +219,16 @@ CONFIG_SHARP_SCOOP=y # # CONFIG_PCI_SYSCALL is not set # CONFIG_ARCH_SUPPORTS_MSI is not set -CONFIG_PCCARD=m +CONFIG_PCCARD=y # CONFIG_PCMCIA_DEBUG is not set -CONFIG_PCMCIA=m +CONFIG_PCMCIA=y CONFIG_PCMCIA_LOAD_CIS=y CONFIG_PCMCIA_IOCTL=y # # PC-card bridges # -CONFIG_PCMCIA_PXA2XX=m +CONFIG_PCMCIA_PXA2XX=y # # Kernel Features @@ -226,7 +240,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_PREEMPT=y CONFIG_HZ=100 CONFIG_AEABI=y -CONFIG_OABI_COMPAT=y +# CONFIG_OABI_COMPAT is not set # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -236,6 +250,7 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set +CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4096 # CONFIG_RESOURCES_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 @@ -248,29 +263,15 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 dyntick=enable debug" +CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y -CONFIG_CPU_FREQ_PXA25x=y # # CPU Frequency scaling # -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=y -CONFIG_CPU_FREQ_DEBUG=y -CONFIG_CPU_FREQ_STAT=y -# CONFIG_CPU_FREQ_STAT_DETAILS is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +# CONFIG_CPU_FREQ is not set # # Floating point emulation @@ -279,271 +280,29 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y # # At least one emulation must be selected # -CONFIG_FPE_NWFPE=y -# CONFIG_FPE_NWFPE_XP is not set -# CONFIG_FPE_FASTFPE is not set # # Userspace binary formats # CONFIG_BINFMT_ELF=y -CONFIG_BINFMT_AOUT=m -CONFIG_BINFMT_MISC=m +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set # # Power management options # CONFIG_PM=y -# CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set CONFIG_PM_SLEEP=y -CONFIG_SUSPEND_UP_POSSIBLE=y CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y CONFIG_APM_EMULATION=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y # # Networking # -CONFIG_NET=y - -# -# Networking options -# -CONFIG_PACKET=m -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=y -CONFIG_XFRM=y -CONFIG_XFRM_USER=m -# CONFIG_XFRM_SUB_POLICY is not set -# CONFIG_XFRM_MIGRATE is not set -# CONFIG_NET_KEY is not set -CONFIG_INET=y -# CONFIG_IP_MULTICAST is not set -# CONFIG_IP_ADVANCED_ROUTER is not set -CONFIG_IP_FIB_HASH=y -# CONFIG_IP_PNP is not set -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE is not set -# CONFIG_ARPD is not set -CONFIG_SYN_COOKIES=y -# CONFIG_INET_AH is not set -# CONFIG_INET_ESP is not set -# CONFIG_INET_IPCOMP is not set -# CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INET_TUNNEL=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m -# CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=m -CONFIG_INET_TCP_DIAG=m -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_CUBIC=y -CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set -# CONFIG_IP_VS is not set -CONFIG_IPV6=m -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -# CONFIG_IPV6_MIP6 is not set -CONFIG_INET6_XFRM_TUNNEL=m -CONFIG_INET6_TUNNEL=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=m -CONFIG_IPV6_TUNNEL=m -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_NETWORK_SECMARK is not set -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set - -# -# Core Netfilter Configuration -# -# CONFIG_NETFILTER_NETLINK is not set -# CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NF_CONNTRACK is not set -CONFIG_NETFILTER_XTABLES=m -# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set -# CONFIG_NETFILTER_XT_TARGET_DSCP is not set -# CONFIG_NETFILTER_XT_TARGET_MARK is not set -# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set -# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set -# CONFIG_NETFILTER_XT_TARGET_TRACE is not set -# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set -# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set -# CONFIG_NETFILTER_XT_MATCH_DCCP is not set -# CONFIG_NETFILTER_XT_MATCH_DSCP is not set -# CONFIG_NETFILTER_XT_MATCH_ESP is not set -# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set -# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set -# CONFIG_NETFILTER_XT_MATCH_MAC is not set -# CONFIG_NETFILTER_XT_MATCH_MARK is not set -# CONFIG_NETFILTER_XT_MATCH_POLICY is not set -# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set -# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set -# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set -# CONFIG_NETFILTER_XT_MATCH_REALM is not set -# CONFIG_NETFILTER_XT_MATCH_SCTP is not set -# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set -# CONFIG_NETFILTER_XT_MATCH_STRING is not set -# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set -# CONFIG_NETFILTER_XT_MATCH_TIME is not set -# CONFIG_NETFILTER_XT_MATCH_U32 is not set -# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set - -# -# IP: Netfilter Configuration -# -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_IPRANGE=m -CONFIG_IP_NF_MATCH_TOS=m -CONFIG_IP_NF_MATCH_RECENT=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_MATCH_OWNER=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_TOS=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m - -# -# IPv6: Netfilter Configuration (EXPERIMENTAL) -# -# CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set -# CONFIG_IP_DCCP is not set -# CONFIG_IP_SCTP is not set -# CONFIG_TIPC is not set -# CONFIG_ATM is not set -# CONFIG_BRIDGE is not set -# CONFIG_VLAN_8021Q is not set -# CONFIG_DECNET is not set -# CONFIG_LLC2 is not set -# CONFIG_IPX is not set -# CONFIG_ATALK is not set -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_ECONET is not set -# CONFIG_WAN_ROUTER is not set -# CONFIG_NET_SCHED is not set - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set -# CONFIG_HAMRADIO is not set -CONFIG_IRDA=m - -# -# IrDA protocols -# -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -# CONFIG_IRDA_ULTRA is not set - -# -# IrDA options -# -# CONFIG_IRDA_CACHE_LAST_LSAP is not set -# CONFIG_IRDA_FAST_RR is not set -# CONFIG_IRDA_DEBUG is not set - -# -# Infrared-port device drivers -# - -# -# SIR device drivers -# -# CONFIG_IRTTY_SIR is not set - -# -# Dongle support -# -# CONFIG_KINGSUN_DONGLE is not set -# CONFIG_KSDAZZLE_DONGLE is not set -# CONFIG_KS959_DONGLE is not set - -# -# Old SIR device drivers -# -# CONFIG_IRPORT_SIR is not set - -# -# Old Serial dongle support -# - -# -# FIR device drivers -# -# CONFIG_USB_IRDA is not set -# CONFIG_SIGMATEL_FIR is not set -CONFIG_PXA_FICP=m -# CONFIG_MCS_FIR is not set -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m - -# -# Bluetooth device drivers -# -CONFIG_BT_HCIUSB=m -# CONFIG_BT_HCIUSB_SCO is not set -# CONFIG_BT_HCIBTSDIO is not set -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -# CONFIG_BT_HCIUART_LL is not set -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIDTL1=m -CONFIG_BT_HCIBT3C=m -CONFIG_BT_HCIBLUECARD=m -CONFIG_BT_HCIBTUART=m -CONFIG_BT_HCIVHCI=m -# CONFIG_AF_RXRPC is not set - -# -# Wireless -# -# CONFIG_CFG80211 is not set -CONFIG_WIRELESS_EXT=y -# CONFIG_MAC80211 is not set -CONFIG_IEEE80211=m -# CONFIG_IEEE80211_DEBUG is not set -CONFIG_IEEE80211_CRYPT_WEP=m -CONFIG_IEEE80211_CRYPT_CCMP=m -CONFIG_IEEE80211_CRYPT_TKIP=m -CONFIG_IEEE80211_SOFTMAC=m -# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set -# CONFIG_RFKILL is not set -# CONFIG_NET_9P is not set +# CONFIG_NET is not set # # Device Drivers @@ -552,14 +311,11 @@ CONFIG_IEEE80211_SOFTMAC=m # # Generic Driver Options # -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_UEVENT_HELPER_PATH="" CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y -# CONFIG_DEBUG_DRIVER is not set -# CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set -# CONFIG_CONNECTOR is not set CONFIG_MTD=y # CONFIG_MTD_DEBUG is not set # CONFIG_MTD_CONCAT is not set @@ -567,6 +323,7 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set CONFIG_MTD_CMDLINE_PARTS=y # CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set # # User Modules And Translation Layers @@ -632,7 +389,6 @@ CONFIG_MTD_NAND_IDS=y CONFIG_MTD_NAND_SHARPSL=y # CONFIG_MTD_NAND_NANDSIM is not set # CONFIG_MTD_NAND_PLATFORM is not set -# CONFIG_MTD_ALAUDA is not set # CONFIG_MTD_ONENAND is not set # @@ -644,186 +400,47 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set -# CONFIG_BLK_DEV_NBD is not set -# CONFIG_BLK_DEV_UB is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set -# CONFIG_ATA_OVER_ETH is not set CONFIG_MISC_DEVICES=y # CONFIG_EEPROM_93CX6 is not set -CONFIG_IDE=m +# CONFIG_ENCLOSURE_SERVICES is not set +CONFIG_HAVE_IDE=y +CONFIG_IDE=y CONFIG_IDE_MAX_HWIFS=4 -CONFIG_BLK_DEV_IDE=m +CONFIG_BLK_DEV_IDE=y # -# Please see Documentation/ide.txt for help/info on IDE drives +# Please see Documentation/ide/ide.txt for help/info on IDE drives # # CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_BLK_DEV_IDEDISK=m +CONFIG_BLK_DEV_IDEDISK=y # CONFIG_IDEDISK_MULTI_MODE is not set -CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_IDECS=y # CONFIG_BLK_DEV_IDECD is not set # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set -# CONFIG_BLK_DEV_IDESCSI is not set # CONFIG_IDE_TASK_IOCTL is not set CONFIG_IDE_PROC_FS=y # # IDE chipset support/bugfixes # -CONFIG_IDE_GENERIC=m # CONFIG_BLK_DEV_PLATFORM is not set -# CONFIG_IDE_ARM is not set # CONFIG_BLK_DEV_IDEDMA is not set -CONFIG_IDE_ARCH_OBSOLETE_INIT=y # CONFIG_BLK_DEV_HD is not set # # SCSI device support # # CONFIG_RAID_ATTRS is not set -CONFIG_SCSI=m -CONFIG_SCSI_DMA=y -# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_DMA is not set # CONFIG_SCSI_NETLINK is not set -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=m -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=m -# CONFIG_BLK_DEV_SR_VENDOR is not set -CONFIG_CHR_DEV_SG=m -# CONFIG_CHR_DEV_SCH is not set - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# -CONFIG_SCSI_MULTI_LUN=y -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set -CONFIG_SCSI_WAIT_SCAN=m - -# -# SCSI Transports -# -# CONFIG_SCSI_SPI_ATTRS is not set -# CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set -# CONFIG_SCSI_SAS_LIBSAS is not set -# CONFIG_SCSI_SRP_ATTRS is not set -CONFIG_SCSI_LOWLEVEL=y -# CONFIG_ISCSI_TCP is not set -# CONFIG_SCSI_DEBUG is not set -# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set # CONFIG_ATA is not set CONFIG_MD=y # CONFIG_BLK_DEV_MD is not set -CONFIG_BLK_DEV_DM=m -# CONFIG_DM_DEBUG is not set -CONFIG_DM_CRYPT=m -CONFIG_DM_SNAPSHOT=m -CONFIG_DM_MIRROR=m -CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_EMC=m -# CONFIG_DM_MULTIPATH_RDAC is not set -# CONFIG_DM_MULTIPATH_HP is not set -# CONFIG_DM_DELAY is not set -# CONFIG_DM_UEVENT is not set -CONFIG_NETDEVICES=y -# CONFIG_NETDEVICES_MULTIQUEUE is not set -# CONFIG_DUMMY is not set -# CONFIG_BONDING is not set -# CONFIG_MACVLAN is not set -# CONFIG_EQUALIZER is not set -CONFIG_TUN=m -# CONFIG_VETH is not set -# CONFIG_PHYLIB is not set -CONFIG_NET_ETHERNET=y -CONFIG_MII=m -# CONFIG_AX88796 is not set -# CONFIG_SMC91X is not set -# CONFIG_DM9000 is not set -# CONFIG_SMC911X is not set -# CONFIG_IBM_NEW_EMAC_ZMII is not set -# CONFIG_IBM_NEW_EMAC_RGMII is not set -# CONFIG_IBM_NEW_EMAC_TAH is not set -# CONFIG_IBM_NEW_EMAC_EMAC4 is not set -# CONFIG_B44 is not set -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set - -# -# Wireless LAN -# -# CONFIG_WLAN_PRE80211 is not set -CONFIG_WLAN_80211=y -# CONFIG_PCMCIA_RAYCS is not set -# CONFIG_LIBERTAS is not set -CONFIG_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -# CONFIG_ATMEL is not set -CONFIG_AIRO_CS=m -# CONFIG_PCMCIA_WL3501 is not set -# CONFIG_USB_ZD1201 is not set -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set -CONFIG_HOSTAP_CS=m -# CONFIG_ZD1211RW is not set - -# -# USB Network Adapters -# -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_DM9601 is not set -# CONFIG_USB_NET_GL620A is not set -CONFIG_USB_NET_NET1080=m -# CONFIG_USB_NET_PLUSB is not set -# CONFIG_USB_NET_MCS7830 is not set -# CONFIG_USB_NET_RNDIS_HOST is not set -# CONFIG_USB_NET_CDC_SUBSET is not set -CONFIG_USB_NET_ZAURUS=m -CONFIG_NET_PCMCIA=y -# CONFIG_PCMCIA_3C589 is not set -# CONFIG_PCMCIA_3C574 is not set -# CONFIG_PCMCIA_FMVJ18X is not set -CONFIG_PCMCIA_PCNET=m -# CONFIG_PCMCIA_NMCLAN is not set -# CONFIG_PCMCIA_SMC91C92 is not set -# CONFIG_PCMCIA_XIRC2PS is not set -# CONFIG_PCMCIA_AXNET is not set -# CONFIG_WAN is not set -CONFIG_PPP=m -# CONFIG_PPP_MULTILINK is not set -# CONFIG_PPP_FILTER is not set -CONFIG_PPP_ASYNC=m -# CONFIG_PPP_SYNC_TTY is not set -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -# CONFIG_PPP_MPPE is not set -# CONFIG_PPPOE is not set -# CONFIG_PPPOL2TP is not set -# CONFIG_SLIP is not set -CONFIG_SLHC=m -# CONFIG_SHAPER is not set -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set -# CONFIG_ISDN is not set +# CONFIG_BLK_DEV_DM is not set # # Input device support @@ -835,14 +452,14 @@ CONFIG_INPUT=y # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_MOUSEDEV_SCREEN_X=240 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set -CONFIG_INPUT_POWER=y +CONFIG_INPUT_APMPOWER=y # # Input Device Drivers @@ -857,6 +474,7 @@ CONFIG_KEYBOARD_LOCOMO=y # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_CORGI is not set # CONFIG_KEYBOARD_SPITZ is not set +# CONFIG_SHARPSL_RC is not set # CONFIG_KEYBOARD_GPIO is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set @@ -879,7 +497,7 @@ CONFIG_INPUT_MISC=y # CONFIG_INPUT_KEYSPAN_REMOTE is not set # CONFIG_INPUT_POWERMATE is not set # CONFIG_INPUT_YEALINK is not set -CONFIG_INPUT_UINPUT=m +# CONFIG_INPUT_UINPUT is not set # # Hardware I/O ports @@ -894,16 +512,13 @@ CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y # CONFIG_SERIAL_NONSTANDARD is not set # # Serial drivers # -CONFIG_SERIAL_8250=m -CONFIG_SERIAL_8250_CS=m -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -# CONFIG_SERIAL_8250_EXTENDED is not set +# CONFIG_SERIAL_8250 is not set # # Non-8250 serial port support @@ -915,7 +530,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_IPMI_HANDLER is not set -CONFIG_HW_RANDOM=m +CONFIG_HW_RANDOM=y # CONFIG_NVRAM is not set # CONFIG_R3964 is not set @@ -931,13 +546,6 @@ CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_CHARDEV is not set -# -# I2C Algorithms -# -CONFIG_I2C_ALGOBIT=y -# CONFIG_I2C_ALGOPCF is not set -# CONFIG_I2C_ALGOPCA is not set - # # I2C Hardware Bus support # @@ -948,31 +556,39 @@ CONFIG_I2C_PXA=y # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_SIMTEC is not set # CONFIG_I2C_TAOS_EVM is not set -# CONFIG_I2C_STUB is not set -# CONFIG_I2C_TINY_USB is not set +# CONFIG_I2C_PCA_PLATFORM is not set # # Miscellaneous I2C Chip support # -# CONFIG_SENSORS_DS1337 is not set -# CONFIG_SENSORS_DS1374 is not set # CONFIG_DS1682 is not set # CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_PCF8574 is not set -# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_PCF8575 is not set # CONFIG_SENSORS_PCF8591 is not set +# CONFIG_TPS65010 is not set # CONFIG_SENSORS_MAX6875 is not set # CONFIG_SENSORS_TSL2550 is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set # CONFIG_I2C_DEBUG_CHIP is not set +# CONFIG_SPI is not set +CONFIG_HAVE_GPIO_LIB=y # -# SPI support +# GPIO Support +# + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set + +# +# SPI GPIO expanders: # -# CONFIG_SPI is not set -# CONFIG_SPI_MASTER is not set # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set @@ -988,55 +604,32 @@ CONFIG_SSB_POSSIBLE=y # Multifunction device drivers # # CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set # CONFIG_HTC_ASIC3 is not set # CONFIG_HTC_ASIC3_DS1WM is not set # # Multimedia devices # -CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L1=y -CONFIG_VIDEO_V4L1_COMPAT=y -CONFIG_VIDEO_V4L2=y -CONFIG_VIDEO_CAPTURE_DRIVERS=y -# CONFIG_VIDEO_ADV_DEBUG is not set -CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -# CONFIG_VIDEO_VIVI is not set -# CONFIG_VIDEO_CPIA is not set -# CONFIG_VIDEO_CPIA2 is not set -# CONFIG_VIDEO_SAA5246A is not set -# CONFIG_VIDEO_SAA5249 is not set -# CONFIG_TUNER_3036 is not set -CONFIG_V4L_USB_DRIVERS=y -# CONFIG_VIDEO_PVRUSB2 is not set -# CONFIG_VIDEO_EM28XX is not set -# CONFIG_VIDEO_USBVISION is not set -CONFIG_VIDEO_USBVIDEO=m -CONFIG_USB_VICAM=m -CONFIG_USB_IBMCAM=m -CONFIG_USB_KONICAWC=m -# CONFIG_USB_QUICKCAM_MESSENGER is not set -# CONFIG_USB_ET61X251 is not set -# CONFIG_VIDEO_OVCAMCHIP is not set -# CONFIG_USB_W9968CF is not set -CONFIG_USB_OV511=m -CONFIG_USB_SE401=m -CONFIG_USB_SN9C102=m -CONFIG_USB_STV680=m -# CONFIG_USB_ZC0301 is not set -# CONFIG_USB_PWC is not set -# CONFIG_USB_ZR364XX is not set -CONFIG_RADIO_ADAPTERS=y -CONFIG_USB_DSBR=m -# CONFIG_DVB_CORE is not set -CONFIG_DAB=y -CONFIG_USB_DABUSB=m + +# +# Multimedia core support +# +# CONFIG_VIDEO_DEV is not set +# CONFIG_VIDEO_MEDIA is not set + +# +# Multimedia drivers +# +# CONFIG_DAB is not set # # Graphics support # # CONFIG_VGASTATE is not set -CONFIG_VIDEO_OUTPUT_CONTROL=m +# CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y # CONFIG_FIRMWARE_EDID is not set # CONFIG_FB_DDC is not set @@ -1047,8 +640,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_SYS_FILLRECT is not set # CONFIG_FB_SYS_COPYAREA is not set # CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_SYS_FOPS is not set -# CONFIG_FB_DEFERRED_IO is not set # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set @@ -1060,12 +653,11 @@ CONFIG_FB_CFB_IMAGEBLIT=y # # CONFIG_FB_S1D13XXX is not set CONFIG_FB_PXA=y -CONFIG_FB_PXA_LCD_QVGA=y -# CONFIG_FB_PXA_LCD_VGA is not set -# CONFIG_FB_PXA_OVERLAY is not set +# CONFIG_FB_PXA_SMARTPANEL is not set # CONFIG_FB_PXA_PARAMETERS is not set # CONFIG_FB_MBX is not set # CONFIG_FB_W100 is not set +# CONFIG_FB_AM200EPD is not set # CONFIG_FB_VIRTUAL is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_LCD_CLASS_DEVICE is not set @@ -1097,260 +689,36 @@ CONFIG_FONT_MINI_4x6=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -# CONFIG_LOGO is not set +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y # # Sound # -CONFIG_SOUND=m - -# -# Advanced Linux Sound Architecture -# -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_HWDEP=m -CONFIG_SND_RAWMIDI=m -CONFIG_SND_SEQUENCER=m -# CONFIG_SND_SEQ_DUMMY is not set -CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_PCM_OSS_PLUGINS=y -# CONFIG_SND_SEQUENCER_OSS is not set -# CONFIG_SND_DYNAMIC_MINORS is not set -CONFIG_SND_SUPPORT_OLD_API=y -CONFIG_SND_VERBOSE_PROCFS=y -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set - -# -# Generic devices -# -CONFIG_SND_AC97_CODEC=m -# CONFIG_SND_DUMMY is not set -# CONFIG_SND_VIRMIDI 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_PXA2XX_PCM=m -CONFIG_SND_PXA2XX_AC97=m - -# -# USB devices -# -CONFIG_SND_USB_AUDIO=m -# CONFIG_SND_USB_CAIAQ is not set - -# -# PCMCIA devices -# -# CONFIG_SND_VXPOCKET is not set -# CONFIG_SND_PDAUDIOCF is not set - -# -# System on Chip audio support -# -CONFIG_SND_SOC=m -CONFIG_SND_PXA2XX_SOC=m -CONFIG_SND_PXA2XX_SOC_I2S=m -CONFIG_SND_PXA2XX_SOC_POODLE=m - -# -# SoC Audio support for SuperH -# -CONFIG_SND_SOC_WM8731=m - -# -# Open Sound System -# -# CONFIG_SOUND_PRIME is not set -# CONFIG_AC97_BUS is not set +# CONFIG_SOUND is not set CONFIG_HID_SUPPORT=y -CONFIG_HID=m +CONFIG_HID=y # CONFIG_HID_DEBUG is not set # CONFIG_HIDRAW is not set - -# -# USB Input Devices -# -CONFIG_USB_HID=m -# CONFIG_USB_HIDINPUT_POWERBOOK is not set -# CONFIG_HID_FF is not set -# CONFIG_USB_HIDDEV is not set - -# -# USB HID Boot Protocol drivers -# -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y # CONFIG_USB_ARCH_HAS_OHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set -CONFIG_USB=m -# CONFIG_USB_DEBUG is not set - -# -# Miscellaneous USB options -# -CONFIG_USB_DEVICEFS=y -CONFIG_USB_DEVICE_CLASS=y -# CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_SUSPEND is not set -# CONFIG_USB_PERSIST is not set -# CONFIG_USB_OTG is not set - -# -# USB Host Controller Drivers -# -# CONFIG_USB_ISP116X_HCD is not set -CONFIG_USB_SL811_HCD=m -CONFIG_USB_SL811_CS=m -# CONFIG_USB_R8A66597_HCD is not set - -# -# USB Device Class drivers -# -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m +# CONFIG_USB is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # - -# -# may also be needed; see USB_STORAGE Help for more information -# -CONFIG_USB_STORAGE=m -# CONFIG_USB_STORAGE_DEBUG is not set -# CONFIG_USB_STORAGE_DATAFAB is not set -# CONFIG_USB_STORAGE_FREECOM is not set -# CONFIG_USB_STORAGE_ISD200 is not set -# CONFIG_USB_STORAGE_DPCM is not set -# CONFIG_USB_STORAGE_USBAT is not set -# CONFIG_USB_STORAGE_SDDR09 is not set -# CONFIG_USB_STORAGE_SDDR55 is not set -# CONFIG_USB_STORAGE_JUMPSHOT is not set -# CONFIG_USB_STORAGE_ALAUDA is not set -# CONFIG_USB_STORAGE_KARMA is not set -# CONFIG_USB_LIBUSUAL is not set - -# -# USB Imaging devices -# -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m -CONFIG_USB_MON=y - -# -# USB port drivers -# - -# -# USB Serial Converter support -# -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -# CONFIG_USB_SERIAL_AIRCABLE is not set -# CONFIG_USB_SERIAL_AIRPRIME is not set -# CONFIG_USB_SERIAL_ARK3116 is not set -CONFIG_USB_SERIAL_BELKIN=m -# CONFIG_USB_SERIAL_CH341 is not set -# CONFIG_USB_SERIAL_WHITEHEAT is not set -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_CP2101=m -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -# CONFIG_USB_SERIAL_FUNSOFT is not set -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -# CONFIG_USB_SERIAL_MOS7720 is not set -# CONFIG_USB_SERIAL_MOS7840 is not set -# CONFIG_USB_SERIAL_NAVMAN is not set -CONFIG_USB_SERIAL_PL2303=m -# CONFIG_USB_SERIAL_OTI6858 is not set -# CONFIG_USB_SERIAL_HP4X is not set -CONFIG_USB_SERIAL_SAFE=m -# CONFIG_USB_SERIAL_SAFE_PADDED is not set -# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set -CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -# CONFIG_USB_SERIAL_OPTION is not set -CONFIG_USB_SERIAL_OMNINET=m -# CONFIG_USB_SERIAL_DEBUG is not set -CONFIG_USB_EZUSB=y - -# -# USB Miscellaneous drivers -# -CONFIG_USB_EMI62=m -CONFIG_USB_EMI26=m -# CONFIG_USB_ADUTUX is not set -CONFIG_USB_AUERSWALD=m -CONFIG_USB_RIO500=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_LCD=m -# CONFIG_USB_BERRY_CHARGE is not set -CONFIG_USB_LED=m -# CONFIG_USB_CYPRESS_CY7C63 is not set -CONFIG_USB_CYTHERM=m -# CONFIG_USB_PHIDGET is not set -CONFIG_USB_IDMOUSE=m -# CONFIG_USB_FTDI_ELAN is not set -# CONFIG_USB_APPLEDISPLAY is not set -# CONFIG_USB_LD is not set -# CONFIG_USB_TRANCEVIBRATOR is not set -# CONFIG_USB_IOWARRIOR is not set -# CONFIG_USB_TEST is not set - -# -# USB DSL modem support -# - -# -# USB Gadget Support -# -CONFIG_USB_GADGET=y -# CONFIG_USB_GADGET_DEBUG is not set -# CONFIG_USB_GADGET_DEBUG_FILES is not set -CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET is not set # CONFIG_USB_GADGET_AMD5536UDC is not set # CONFIG_USB_GADGET_ATMEL_USBA is not set # CONFIG_USB_GADGET_FSL_USB2 is not set # CONFIG_USB_GADGET_NET2280 is not set -CONFIG_USB_GADGET_PXA2XX=y -CONFIG_USB_PXA2XX=y -# CONFIG_USB_PXA2XX_SMALL is not set +# CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_M66592 is not set # CONFIG_USB_GADGET_PXA27X is not set # CONFIG_USB_GADGET_GOKU is not set @@ -1359,15 +727,13 @@ CONFIG_USB_PXA2XX=y # CONFIG_USB_GADGET_S3C2410 is not set # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set -# CONFIG_USB_GADGET_DUALSPEED is not set -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_G_SERIAL=m +# CONFIG_USB_ZERO is not set +# CONFIG_USB_ETH is not set +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set # CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_UNSAFE_RESUME=y @@ -1378,6 +744,7 @@ CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_BLOCK=y CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set # # MMC/SD Host Controller Drivers @@ -1390,7 +757,6 @@ CONFIG_LEDS_CLASS=y # LED drivers # CONFIG_LEDS_LOCOMO=y -# CONFIG_LEDS_TOSA is not set # CONFIG_LEDS_GPIO is not set # @@ -1400,6 +766,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_IDE_DISK=y # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y @@ -1428,6 +795,8 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set # # SPI RTC drivers @@ -1437,9 +806,10 @@ CONFIG_RTC_INTF_DEV=y # Platform RTC drivers # # CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1511 is not set # CONFIG_RTC_DRV_DS1553 is not set -# CONFIG_RTC_DRV_STK17TA8 is not set # CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set # CONFIG_RTC_DRV_M48T86 is not set # CONFIG_RTC_DRV_M48T59 is not set # CONFIG_RTC_DRV_V3020 is not set @@ -1448,6 +818,7 @@ CONFIG_RTC_INTF_DEV=y # on-CPU RTC drivers # CONFIG_RTC_DRV_SA1100=y +# CONFIG_UIO is not set # # File systems @@ -1455,22 +826,18 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m +CONFIG_EXT3_FS=y # CONFIG_EXT3_FS_XATTR is not set # CONFIG_EXT4DEV_FS is not set -CONFIG_JBD=m +CONFIG_JBD=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -CONFIG_FS_POSIX_ACL=y +# CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set -# CONFIG_GFS2_FS is not set -# CONFIG_OCFS2_FS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_ROMFS_FS is not set +CONFIG_DNOTIFY=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set -CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set # CONFIG_FUSE_FS is not set @@ -1528,47 +895,14 @@ CONFIG_JFFS2_RUBIN=y CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_JFFS2_CMODE_SIZE is not set # CONFIG_JFFS2_CMODE_FAVOURLZO is not set -CONFIG_CRAMFS=m -CONFIG_SQUASHFS=m -# CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set -CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -# CONFIG_NFS_V3_ACL is not set -CONFIG_NFS_V4=y -# CONFIG_NFS_DIRECTIO is not set -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -# CONFIG_NFSD_V3_ACL is not set -CONFIG_NFSD_V4=y -CONFIG_NFSD_TCP=y -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -# CONFIG_SUNRPC_BIND34 is not set -CONFIG_RPCSEC_GSS_KRB5=m -# CONFIG_RPCSEC_GSS_SPKM3 is not set -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp437" -CONFIG_CIFS=m -# CONFIG_CIFS_STATS is not set -# CONFIG_CIFS_WEAK_PW_HASH is not set -# CONFIG_CIFS_XATTR is not set -# CONFIG_CIFS_DEBUG2 is not set -# CONFIG_CIFS_EXPERIMENTAL is not set -# CONFIG_NCP_FS is not set -# CONFIG_CODA_FS is not set -# CONFIG_AFS_FS is not set # # Partition Types @@ -1594,48 +928,43 @@ CONFIG_MSDOS_PARTITION=y CONFIG_NLS=y CONFIG_NLS_DEFAULT="cp437" CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=y -# CONFIG_DLM is not set -CONFIG_INSTRUMENTATION=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=m -# CONFIG_MARKERS is not set # # Kernel hacking @@ -1643,42 +972,16 @@ CONFIG_OPROFILE=m # CONFIG_PRINTK_TIME is not set CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_SHIRQ is not set -# CONFIG_DETECT_SOFTLOCKUP is not set -# CONFIG_SCHED_DEBUG is not set -# CONFIG_SCHEDSTATS is not set -CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_SLAB is not set -# CONFIG_DEBUG_PREEMPT is not set -# CONFIG_DEBUG_RT_MUTEXES is not set -# CONFIG_RT_MUTEX_TESTER is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_LOCK_ALLOC is not set -# CONFIG_PROVE_LOCKING is not set -# CONFIG_LOCK_STAT is not set -# CONFIG_DEBUG_SPINLOCK_SLEEP is not set -# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -# CONFIG_DEBUG_KOBJECT is not set -CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_INFO is not set -# CONFIG_DEBUG_VM is not set -# CONFIG_DEBUG_LIST is not set -# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_FRAME_POINTER=y -# CONFIG_FORCED_INLINING is not set -# CONFIG_BOOT_PRINTK_DELAY is not set -# CONFIG_RCU_TORTURE_TEST is not set -# CONFIG_FAULT_INJECTION is not set # CONFIG_SAMPLES is not set # CONFIG_DEBUG_USER is not set -CONFIG_DEBUG_ERRORS=y -# CONFIG_DEBUG_LL is not set # # Security options @@ -1686,61 +989,20 @@ CONFIG_DEBUG_ERRORS=y # CONFIG_KEYS is not set # CONFIG_SECURITY is not set # CONFIG_SECURITY_FILE_CAPABILITIES is not set -CONFIG_CRYPTO=y -CONFIG_CRYPTO_ALGAPI=m -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_HASH=m -CONFIG_CRYPTO_MANAGER=m -CONFIG_CRYPTO_HMAC=m -# CONFIG_CRYPTO_XCBC is not set -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -# CONFIG_CRYPTO_TGR192 is not set -# CONFIG_CRYPTO_GF128MUL is not set -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_PCBC=m -# CONFIG_CRYPTO_LRW is not set -# CONFIG_CRYPTO_XTS is not set -# CONFIG_CRYPTO_CRYPTD is not set -CONFIG_CRYPTO_DES=m -# CONFIG_CRYPTO_FCRYPT is not set -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -# CONFIG_CRYPTO_SEED is not set -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_LZO=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_CAMELLIA=m -CONFIG_CRYPTO_TEST=m -# CONFIG_CRYPTO_AUTHENC is not set -# CONFIG_CRYPTO_HW is not set +# CONFIG_CRYPTO is not set # # Library routines # CONFIG_BITREVERSE=y +# CONFIG_GENERIC_FIND_FIRST_BIT is not set +# CONFIG_GENERIC_FIND_NEXT_BIT is not set CONFIG_CRC_CCITT=y # CONFIG_CRC16 is not set # CONFIG_CRC_ITU_T is not set CONFIG_CRC32=y # CONFIG_CRC7 is not set -CONFIG_LIBCRC32C=m +# CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y From b3a0ad67a8bfbdec368e94836db1607edc26eb2e Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Fri, 25 Feb 2011 22:12:11 +0100 Subject: [PATCH 109/509] tsmd: return of the old init script Signed-off-by: Simon Busch --- recipes/palmpre/tsmd/tsmd | 38 +++++++++++++++++++++++++++++++++++++ recipes/palmpre/tsmd_git.bb | 13 +++++++++++-- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100755 recipes/palmpre/tsmd/tsmd diff --git a/recipes/palmpre/tsmd/tsmd b/recipes/palmpre/tsmd/tsmd new file mode 100755 index 0000000000..5444d7b347 --- /dev/null +++ b/recipes/palmpre/tsmd/tsmd @@ -0,0 +1,38 @@ +#! /bin/sh +# +# tsmd -- This shell script starts and stops the tsmd daemon +# +# chkconfig: 345 10 10 +# description: a simple utility daemon which forwards all events from a independent device node to a more general uinput one +# processname: tsmd + +PATH=/bin:/usr/bin:/sbin:/usr/sbin +NAME=tsmd + +case "$1" in + start) + echo -n "Starting tsmd: " + start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/${NAME} -- -n /dev/touchscreen -f + if [ $? = 0 ]; then + echo "(ok)" + else + echo "(failed)" + fi + ;; + stop) + echo -n "Stopping tsmd: " + start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo + rm -f /var/run/${NAME}.pid + echo "(done)" + ;; + restart|force-reload) + $0 stop + $0 start + ;; + *) + echo "Usage: /etc/init.d/tsmd {start|stop|restart|force-reload}" + exit 1 + ;; +esac + +exit 0 diff --git a/recipes/palmpre/tsmd_git.bb b/recipes/palmpre/tsmd_git.bb index eeac86de67..a7c6054037 100644 --- a/recipes/palmpre/tsmd_git.bb +++ b/recipes/palmpre/tsmd_git.bb @@ -6,16 +6,25 @@ LICENSE = "GPL" DEPENDS = "tslib" -PR = "r1" +PR = "r2" PV = "1.0.0+gitr${SRCPV}" SRCREV = "9262a2e4f8f6e6c7bcacf1eeae0ad348cbfcce06" SRC_URI = " \ ${FREESMARTPHONE_GIT}/utilities.git;protocol=git;branch=master \ + file://tsmd \ " S = "${WORKDIR}/git/palmpre/tsmd" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit autotools +inherit autotools update-rc.d + +INITSCRIPT_NAME = "tsmd" +INITSCRIPT_PARAMS = "defaults 10" + +do_install_append() { + install -d 0644 ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/ +} From 19851ae23b75b7a64357d07f1ec1b54ffdb2ae43 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Fri, 25 Feb 2011 22:43:59 +0100 Subject: [PATCH 110/509] tsmd: install also a little helper script to control the touchscreen daemon Signed-off-by: Simon Busch --- recipes/palmpre/tsmd/tsmd_control | 12 ++++++++++++ recipes/palmpre/tsmd_git.bb | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100755 recipes/palmpre/tsmd/tsmd_control diff --git a/recipes/palmpre/tsmd/tsmd_control b/recipes/palmpre/tsmd/tsmd_control new file mode 100755 index 0000000000..a7668d4d1a --- /dev/null +++ b/recipes/palmpre/tsmd/tsmd_control @@ -0,0 +1,12 @@ +#!/bin/sh + +case "$1" in + enable) + kill -USR2 `pidof tsmd` + ;; + disable) + kill -USR1 `pidof tsmd` + ;; + *) + ;; +esac diff --git a/recipes/palmpre/tsmd_git.bb b/recipes/palmpre/tsmd_git.bb index a7c6054037..0cef19edc1 100644 --- a/recipes/palmpre/tsmd_git.bb +++ b/recipes/palmpre/tsmd_git.bb @@ -6,13 +6,14 @@ LICENSE = "GPL" DEPENDS = "tslib" -PR = "r2" +PR = "r3" PV = "1.0.0+gitr${SRCPV}" SRCREV = "9262a2e4f8f6e6c7bcacf1eeae0ad348cbfcce06" SRC_URI = " \ ${FREESMARTPHONE_GIT}/utilities.git;protocol=git;branch=master \ file://tsmd \ + file://tsmd_control \ " S = "${WORKDIR}/git/palmpre/tsmd" @@ -27,4 +28,6 @@ INITSCRIPT_PARAMS = "defaults 10" do_install_append() { install -d 0644 ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/ + install -d 0644 ${D}${base_bindir}/ + install -m 0755 ${WORKDIR}/tsmd_control ${D}${base_bindir}/tsmd_control } From 2b112eb5414f785f0742f224b94357bfe881b339 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Sat, 26 Feb 2011 18:26:15 +0100 Subject: [PATCH 111/509] libphone-ui: refactor recipe to make it possible to use machine specific configs Signed-off-by: Simon Busch --- recipes/shr/libphone-ui/libphoneui.conf | 82 +++++++++++++++++++++++++ recipes/shr/libphone-ui_git.bb | 27 ++++++-- 2 files changed, 104 insertions(+), 5 deletions(-) create mode 100644 recipes/shr/libphone-ui/libphoneui.conf diff --git a/recipes/shr/libphone-ui/libphoneui.conf b/recipes/shr/libphone-ui/libphoneui.conf new file mode 100644 index 0000000000..ae7005413e --- /dev/null +++ b/recipes/shr/libphone-ui/libphoneui.conf @@ -0,0 +1,82 @@ +# The following sections are "view" specific settings +# every view must have a "module" field that specifies the name of the +# module that should be used for that view, and additional view specific +# settings if supported by that view. +[dialer] +module = shr + +[messages] +module = shr +request_message_receipt = 0 + +[contacts] +module = shr + +[calls] +module = shr + +[phonelog] +module = shr + +[notification] +module = shr + +[idle_screen] +module = shr + +[settings] +module = shr + +#Alsa configuration for the sound utility functions +# The general alsa section +[alsa] +hardware_control_name = hw:0 + +#Each section describs a sound state +#each section can accept the following fields: +#speaker: the name of the corrosponding alsa control +#microphone: the name of the corrosponding alsa control +#speaker_min: the wanted lower bound to allow setting this control to +#speaker_max: the wanted upper bound to allow setting this control to +#microphone_min: the wanted lower bound to allow setting this control to +#microphone_max: the wanted upper bound to allow setting this control to + +[alsa_control_idle] +#speaker = PCM Volume + +[alsa_control_speaker] +speaker = Headphone Playback Volume +microphone = Mono Playback Volume +microphone_mute = Mono Mixer Sidetone Playback Switch + +[alsa_control_handset] +speaker = Speaker Playback Volume +speaker_min = 90 +microphone = Mono Playback Volume +microphone_mute = Mono Mixer Sidetone Playback Switch + +[alsa_control_headset] +speaker = Headphone Playback Volume +microphone = Mono Playback Volume +microphone_mute = Mono Mixer Sidetone Playback Switch + +[alsa_control_bluetooth] +speaker = Speaker Playback Volume +microphone = Mono Playback Volume + +#Remove the segfaulting stuff +#[device] +# sysfs node for the vibrator to use +#vibrator = /sys/class/leds/neo1973:vibrator/brightness +# sysfs node to set the backlight brightness +#backlight = /sys/class/backlight/gta02-bl + + +#[feedback_error] + +#[feedback_warning] + +#[feedback_notice] + +#[feedback_click] + diff --git a/recipes/shr/libphone-ui_git.bb b/recipes/shr/libphone-ui_git.bb index c002ea1716..b6500201e7 100644 --- a/recipes/shr/libphone-ui_git.bb +++ b/recipes/shr/libphone-ui_git.bb @@ -4,14 +4,31 @@ LICENSE = "GPL" SECTION = "libs" SRCREV = "4ad47c4db9ad766ad2b38ffc3bd181a85575fd75" PV = "0.0.1+gitr${SRCPV}" -PR = "r0" +PR = "r1" DEPENDS="glib-2.0 libshr-glib libfso-glib libfsoframework libphone-utils alsa-lib" -inherit pkgconfig autotools autotools +SRC_URI = " \ + git://git.shr-project.org/repo/libphone-ui.git;protocol=http;branch=master \ + file://libphoneui.conf \ +" -SRC_URI = "git://git.shr-project.org/repo/libphone-ui.git;protocol=http;branch=master" +S = "${WORKDIR}/git" -S="${WORKDIR}/git" +inherit autotools pkgconfig -CONFFILES_${PN} = "${sysconfdir}/libphoneui.conf" +do_install_append() { + install -d ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/libphoneui.conf ${D}${sysconfdir}/libphoneui.conf +} + +PACKAGES =+ "${PN}-config" +PACKAGE_ARCH_${PN}-config = "${MACHINE_ARCH}" + +FILES_${PN}-config = " \ + ${sysconfdir}/libphoneui.conf \ +" + +CONFFILES_${PN}-config = "\ + ${sysconfdir}/libphoneui.conf \ +" From 95a39728d212d7f34bb957ddfbeab0b6d9424a6a Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Sat, 26 Feb 2011 18:32:16 +0100 Subject: [PATCH 112/509] libphone-ui: add config file for palmpre machine Signed-off-by: Simon Busch Acked-by: Klaus Kurzmann --- .../shr/libphone-ui/palmpre/libphoneui.conf | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 recipes/shr/libphone-ui/palmpre/libphoneui.conf diff --git a/recipes/shr/libphone-ui/palmpre/libphoneui.conf b/recipes/shr/libphone-ui/palmpre/libphoneui.conf new file mode 100644 index 0000000000..14db6bf521 --- /dev/null +++ b/recipes/shr/libphone-ui/palmpre/libphoneui.conf @@ -0,0 +1,28 @@ +# The following sections are "view" specific settings +# every view must have a "module" field that specifies the name of the +# module that should be used for that view, and additional view specific +# settings if supported by that view. +[dialer] +module = shr + +[messages] +module = shr +request_message_receipt = 0 + +[contacts] +module = shr + +[calls] +module = shr + +[phonelog] +module = shr + +[notification] +module = shr + +[idle_screen] +module = shr + +[settings] +module = shr From 60315c53ca4e3edaa9dd3c65a631a4b274027197 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Sun, 27 Feb 2011 13:31:19 +0100 Subject: [PATCH 113/509] task-shr-minimal-apps: add libphone-ui-config due to changes on libphone-ui and bump PR Signed-off-by: Simon Busch Acked-by: Klaus Kurzmann --- recipes/tasks/task-shr-minimal.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb index 97f1135425..decee5235f 100644 --- a/recipes/tasks/task-shr-minimal.bb +++ b/recipes/tasks/task-shr-minimal.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SHR Lite Image Feed" -PR = "r36" +PR = "r37" PV = "2.0" LICENSE = "GPL" @@ -127,6 +127,7 @@ RDEPENDS_${PN}-apps = "\ phonefsod \ phoneuid \ libphone-ui \ + libphone-ui-config \ libphone-ui-shr \ ffalarms \ shr-settings \ From e980454d1a12c84f9a567482d4bfb370107b7b58 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Sun, 27 Feb 2011 13:56:13 +0100 Subject: [PATCH 114/509] libphone-ui: bump SRCREV Signed-off-by: Simon Busch --- recipes/shr/libphone-ui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/shr/libphone-ui_git.bb b/recipes/shr/libphone-ui_git.bb index b6500201e7..f6ac8a5014 100644 --- a/recipes/shr/libphone-ui_git.bb +++ b/recipes/shr/libphone-ui_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A generic framework for phone ui" HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "libs" -SRCREV = "4ad47c4db9ad766ad2b38ffc3bd181a85575fd75" +SRCREV = "304538f6296b1da8390783d9c2a2f83435599e70" PV = "0.0.1+gitr${SRCPV}" PR = "r1" From 0ffa21d4fd13a3ed56f362d3c04c4aca7f4a8278 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Sun, 27 Feb 2011 15:53:20 +0100 Subject: [PATCH 115/509] shr-e-gadgets: update SRC_REV This fixes a segfault when the GSM resource isn't initialized properly Signed-off-by: Thomas Zimmermann --- recipes/shr/shr-e-gadgets_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/shr/shr-e-gadgets_git.bb b/recipes/shr/shr-e-gadgets_git.bb index 40d81b16de..acb56b4fad 100644 --- a/recipes/shr/shr-e-gadgets_git.bb +++ b/recipes/shr/shr-e-gadgets_git.bb @@ -5,7 +5,7 @@ DEPENDS = "e-wm" RDEPENDS_${PN} = "e-wm" SECTION = "x11/application" -SRCREV = "0638e17d76861ca1e4f89a2d955fab03fa143634" +SRCREV = "5c9d0f8f778565f3ae69e45b8c35b04529156345" PV = "0.0.0+gitr${SRCPV}" PR = "r10" From 15c3d6de07fe4fe8d501a1c40787e833b5103c18 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 27 Feb 2011 16:43:01 +0100 Subject: [PATCH 116/509] linux-kexecboot: pick collie fix from upstream for 2.6.36 Signed-off-by: Andrea Adami --- .../collie/collie-locomo-kb.patch | 31 +++++++++++++++++++ recipes/linux/linux-kexecboot_2.6.36.bb | 4 ++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 recipes/linux/linux-kexecboot-2.6.36/collie/collie-locomo-kb.patch diff --git a/recipes/linux/linux-kexecboot-2.6.36/collie/collie-locomo-kb.patch b/recipes/linux/linux-kexecboot-2.6.36/collie/collie-locomo-kb.patch new file mode 100644 index 0000000000..8b783e7906 --- /dev/null +++ b/recipes/linux/linux-kexecboot-2.6.36/collie/collie-locomo-kb.patch @@ -0,0 +1,31 @@ +ARM: 6658/1: collie: do actually pass locomo_info to locomo driver + +locomo_info isn't actually used as a platform_data on collie platform: + arm/mach-sa1100/collie.c:237: warning: locomo_info defined but not used + +So locomo driver doesn't setup IRQs correctly. Pass locomo_info to the +driver. + +Signed-off-by: Dmitry Eremin-Solenikov +Signed-off-by: Russell King +--- + arch/arm/mach-sa1100/collie.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c +index d43c5ef..bd3e1bf 100644 +--- a/arch/arm/mach-sa1100/collie.c ++++ b/arch/arm/mach-sa1100/collie.c +@@ -241,6 +241,9 @@ static struct locomo_platform_data locomo_info = { + struct platform_device collie_locomo_device = { + .name = "locomo", + .id = 0, ++ .dev = { ++ .platform_data = &locomo_info, ++ }, + .num_resources = ARRAY_SIZE(locomo_resources), + .resource = locomo_resources, + }; +-- +1.7.4.1 + diff --git a/recipes/linux/linux-kexecboot_2.6.36.bb b/recipes/linux/linux-kexecboot_2.6.36.bb index 02b09ae00c..d36328faa7 100644 --- a/recipes/linux/linux-kexecboot_2.6.36.bb +++ b/recipes/linux/linux-kexecboot_2.6.36.bb @@ -1,6 +1,6 @@ require linux-kexecboot.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" S = "${WORKDIR}/linux-${PV}" @@ -10,5 +10,7 @@ DEFAULT_PREFERENCE = "-1" SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ file://defconfig" +SRC_URI_append_collie = " file://collie-locomo-kb.patch;status=upstream " + SRC_URI[kernel.md5sum] = "61f3739a73afb6914cb007f37fb09b62" SRC_URI[kernel.sha256sum] = "15a076d1a435a6bf8e92834eba4b390b4ec094ce06d47f89d071ca9e5788ce04" From f5b79e229a0218caf591f5e603692d3b018f1ab7 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 27 Feb 2011 16:45:02 +0100 Subject: [PATCH 117/509] linux-kexecboot: pick collie fix from upstream for 2.6.37 Signed-off-by: Andrea Adami --- .../collie/collie-locomo-kb.patch | 31 +++++++++++++++++++ recipes/linux/linux-kexecboot_2.6.37.bb | 4 ++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 recipes/linux/linux-kexecboot-2.6.37/collie/collie-locomo-kb.patch diff --git a/recipes/linux/linux-kexecboot-2.6.37/collie/collie-locomo-kb.patch b/recipes/linux/linux-kexecboot-2.6.37/collie/collie-locomo-kb.patch new file mode 100644 index 0000000000..8b783e7906 --- /dev/null +++ b/recipes/linux/linux-kexecboot-2.6.37/collie/collie-locomo-kb.patch @@ -0,0 +1,31 @@ +ARM: 6658/1: collie: do actually pass locomo_info to locomo driver + +locomo_info isn't actually used as a platform_data on collie platform: + arm/mach-sa1100/collie.c:237: warning: locomo_info defined but not used + +So locomo driver doesn't setup IRQs correctly. Pass locomo_info to the +driver. + +Signed-off-by: Dmitry Eremin-Solenikov +Signed-off-by: Russell King +--- + arch/arm/mach-sa1100/collie.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c +index d43c5ef..bd3e1bf 100644 +--- a/arch/arm/mach-sa1100/collie.c ++++ b/arch/arm/mach-sa1100/collie.c +@@ -241,6 +241,9 @@ static struct locomo_platform_data locomo_info = { + struct platform_device collie_locomo_device = { + .name = "locomo", + .id = 0, ++ .dev = { ++ .platform_data = &locomo_info, ++ }, + .num_resources = ARRAY_SIZE(locomo_resources), + .resource = locomo_resources, + }; +-- +1.7.4.1 + diff --git a/recipes/linux/linux-kexecboot_2.6.37.bb b/recipes/linux/linux-kexecboot_2.6.37.bb index c33ef19396..8cbd84bc2e 100644 --- a/recipes/linux/linux-kexecboot_2.6.37.bb +++ b/recipes/linux/linux-kexecboot_2.6.37.bb @@ -1,6 +1,6 @@ require linux-kexecboot.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" S = "${WORKDIR}/linux-${PV}" @@ -10,5 +10,7 @@ DEFAULT_PREFERENCE = "-1" SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ file://defconfig" +SRC_URI_append_collie = " file://collie-locomo-kb.patch;status=upstream " + SRC_URI[kernel.md5sum] = "c8ee37b4fdccdb651e0603d35350b434" SRC_URI[kernel.sha256sum] = "edbf091805414739cf57a3bbfeba9e87f5e74f97e38f04d12060e9e0c71e383a" From 7d4d55fc1ddfa41519d6e0d2851bc1889d919718 Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Sun, 27 Feb 2011 21:07:37 +0100 Subject: [PATCH 118/509] initscripts-shr_0.0.1.bb: install g_ether.sh for om-gta02 only Furthermore set the correct PACKAGE_ARCH for om-gta02 and nokia900. Signed-off-by: Klaus Kurzmann --- .../shr/initscripts-shr/{ => om-gta02}/g_ether.sh | 0 recipes/shr/initscripts-shr_0.0.1.bb | 14 ++++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) rename recipes/shr/initscripts-shr/{ => om-gta02}/g_ether.sh (100%) diff --git a/recipes/shr/initscripts-shr/g_ether.sh b/recipes/shr/initscripts-shr/om-gta02/g_ether.sh similarity index 100% rename from recipes/shr/initscripts-shr/g_ether.sh rename to recipes/shr/initscripts-shr/om-gta02/g_ether.sh diff --git a/recipes/shr/initscripts-shr_0.0.1.bb b/recipes/shr/initscripts-shr_0.0.1.bb index 8e45239cc4..86ffe0656d 100644 --- a/recipes/shr/initscripts-shr_0.0.1.bb +++ b/recipes/shr/initscripts-shr_0.0.1.bb @@ -5,7 +5,7 @@ DEPENDS = "" RDEPENDS_${PN} = "procps" LICENSE = "GPL" PV = "0.0.1" -PR = "r24" +PR = "r25" RCONFLICTS_${PN} = "initscripts" @@ -14,7 +14,6 @@ SRC_URI = "file://alignment.sh \ file://checkroot.sh \ file://finish.sh \ file://functions \ - file://g_ether.sh \ file://hostname.sh \ file://mountall.sh \ file://mountdevsubfs.sh \ @@ -32,7 +31,11 @@ SRC_URI = "file://alignment.sh \ file://umountnfs.sh \ " +SRC_URI_append_om-gta02 = " file://g_ether.sh" +PACKAGE_ARCH_om-gta02 = "om-gta02 + SRC_URI_append_nokia900 = " file://nokia-n900-cmt-gpio.sh" +PACKAGE_ARCH_nokia900 = "nokia900" inherit base @@ -57,7 +60,6 @@ do_install () { install -m 0755 ${WORKDIR}/checkroot.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/finish.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/functions ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/g_ether.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/hostname.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/mountall.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/mountnfs.sh ${D}${sysconfdir}/init.d @@ -76,6 +78,11 @@ do_install () { install -m 0755 ${WORKDIR}/umountfs ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/umountnfs.sh ${D}${sysconfdir}/init.d + if [ "${MACHINE}" = "om-gta02" ]; then + install -m 0755 ${WORKDIR}/g_ether.sh ${D}${sysconfdir}/init.d + ln -sf ../init.d/g_ether.sh ${D}${sysconfdir}/rcS.d/S02g_ether.sh + fi + if [ "${MACHINE}" = "nokia900" ]; then install -m 0755 ${WORKDIR}/nokia-n900-cmt-gpio.sh ${D}${sysconfdir}/init.d ln -sf ../init.d/nokia-n900-cmt-gpio.sh ${D}${sysconfdir}/rcS.d/S40nokia-n900-cmt-gpio.sh @@ -85,7 +92,6 @@ do_install () { # Create runlevel links # ln -sf ../init.d/mountkernfs.sh ${D}${sysconfdir}/rcS.d/S01mountkernfs.sh - ln -sf ../init.d/g_ether.sh ${D}${sysconfdir}/rcS.d/S02g_ether.sh ln -sf ../init.d/hostname.sh ${D}${sysconfdir}/rcS.d/S02hostname.sh ln -sf ../init.d/checkroot.sh ${D}${sysconfdir}/rcS.d/S02checkroot.sh ln -sf ../init.d/mountdevsubfs.sh ${D}${sysconfdir}/rcS.d/S04mountdevsubfs.sh From f76dd9aa7b14f0133835645779bb5b5c49b7a5d1 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Sun, 27 Feb 2011 20:09:34 +0100 Subject: [PATCH 119/509] shr-settings: add specific elementary.sh for palmpre machine Signed-off-by: Simon Busch --- recipes/shr/shr-settings/palmpre/elementary.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 recipes/shr/shr-settings/palmpre/elementary.sh diff --git a/recipes/shr/shr-settings/palmpre/elementary.sh b/recipes/shr/shr-settings/palmpre/elementary.sh new file mode 100644 index 0000000000..2e2534d26d --- /dev/null +++ b/recipes/shr/shr-settings/palmpre/elementary.sh @@ -0,0 +1,4 @@ +export ELM_ENGINE=x11 +export ELM_THEME=default +export ELM_SCALE=1.0 +export ELM_FINGER_SIZE=50 From 2a44303f16819f652de07c0ac3cc472124626c9d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 24 Feb 2011 09:19:47 +0100 Subject: [PATCH 120/509] SHR: bump SRCREVs Signed-off-by: Martin Jansa --- recipes/shr/libphone-ui-shr_git.bb | 2 +- recipes/shr/libshr-glib_git.bb | 2 +- recipes/shr/phonefsod_git.bb | 2 +- recipes/shr/phoneuid_git.bb | 2 +- recipes/shr/shr-settings_git.bb | 2 +- recipes/shr/shr-specs_git.bb | 5 ++--- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/recipes/shr/libphone-ui-shr_git.bb b/recipes/shr/libphone-ui-shr_git.bb index cfb08ffec1..e13e907282 100644 --- a/recipes/shr/libphone-ui-shr_git.bb +++ b/recipes/shr/libphone-ui-shr_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR default module for the Phone UI daemon" SECTION = "e/apps" DEPENDS += " libphone-ui evas ecore edje edje-native elementary" -SRCREV = "9c1b8d63ea313822532f45f5c0389e53f730abd4" +SRCREV = "e50e9927fac05664bf1d6b1e0d3a953484038495" PE = "1" PV = "0.0.1+gitr${SRCPV}" PR = "r3" diff --git a/recipes/shr/libshr-glib_git.bb b/recipes/shr/libshr-glib_git.bb index 2bc1e12862..e5438f0861 100644 --- a/recipes/shr/libshr-glib_git.bb +++ b/recipes/shr/libshr-glib_git.bb @@ -3,7 +3,7 @@ AUTHOR = "Klaus 'mrmoku' Kurzmann" LICENSE = "LGPL" SECTION = "devel" DEPENDS = "gdbus-binding-tool glib-2.0 shr-specs" -SRCREV = "926654296339d88f69cd481d1cf8eb9facdf9bf3" +SRCREV = "761dea6463326714c00342cb53ba28a1c2dfea63" PV = "2011.01.04.1+gitr${SRCPV}" PR = "r0" diff --git a/recipes/shr/phonefsod_git.bb b/recipes/shr/phonefsod_git.bb index 6e1574ffc6..6283901263 100644 --- a/recipes/shr/phonefsod_git.bb +++ b/recipes/shr/phonefsod_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += " libfso-glib libshr-glib sqlite3 shr-specs libfsoframework" -SRCREV = "374548a6d9d53f4b3d26b70cbb5ab7257e6ce26d" +SRCREV = "cc19fc95ae1a36f1a3d12bd13fce751cf4cf095f" PV = "0.0.0+gitr${SRCPV}" PR = "r5" diff --git a/recipes/shr/phoneuid_git.bb b/recipes/shr/phoneuid_git.bb index 054d4e5c6e..c4f9cba2bd 100644 --- a/recipes/shr/phoneuid_git.bb +++ b/recipes/shr/phoneuid_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += " libfso-glib libshr-glib libphone-ui sqlite3 shr-specs" -SRCREV = "ce5fc12bca878abd52825ba33dc6e57b78b00a92" +SRCREV = "ff77b47658203d642507332d1ea8618245b4021b" PV = "0.0.0+gitr${SRCPV}" PR = "r7" diff --git a/recipes/shr/shr-settings_git.bb b/recipes/shr/shr-settings_git.bb index 28d10c8f0f..5a094f459d 100644 --- a/recipes/shr/shr-settings_git.bb +++ b/recipes/shr/shr-settings_git.bb @@ -4,7 +4,7 @@ SHR_RELEASE ?= "shr" LICENSE ?= "GPL" RDEPENDS_${PN} = "python-elementary python-dbus python-codecs python-shell python-pyrtc python python-core python-edbus dbus-x11 frameworkd python-phoneutils python-pexpect" SECTION = "x11/application" -SRCREV = "a3cdb92ee8246648cc5d0de949afc7f1284f3f0e" +SRCREV = "f712a5ec5617b3de2700794389ada07297b3ff8e" PE = "1" PV = "0.1.1+gitr${SRCPV}" PR = "r12" diff --git a/recipes/shr/shr-specs_git.bb b/recipes/shr/shr-specs_git.bb index 7b237027aa..af22edbaef 100644 --- a/recipes/shr/shr-specs_git.bb +++ b/recipes/shr/shr-specs_git.bb @@ -4,9 +4,8 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "BSD" DEPENDS = "libxslt-native" SECTION = "devel/specifications" -SRCREV = "0e50703bcb5bc036fb5b295eceb2b7c6a2f1d455" -PV = "0.0.0+gitr${SRCPV}" -PR = "r1" +SRCREV = "2752ded90581cfd2259ab65be7f9c2b9fb4a2638" +PV = "2010.12.27.1+gitr${SRCPV}" SRC_URI = "git://git.shr-project.org/repo/shr-specs.git;protocol=http;branch=master" S = "${WORKDIR}/git" From 41cb3e70d82499ef8afc881e036f70ddeb6033b4 Mon Sep 17 00:00:00 2001 From: ?ukasz Pankowski Date: Sun, 27 Feb 2011 14:01:18 +0000 Subject: [PATCH 121/509] ffphonelog: bump SRCREV to latest git, now using EXTRA_OEMAKE Signed-off-by: ?ukasz Pankowski Signed-off-by: Martin Jansa --- recipes/ffphonelog/ffphonelog_git.bb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/recipes/ffphonelog/ffphonelog_git.bb b/recipes/ffphonelog/ffphonelog_git.bb index 7978cc2f58..0aee94cbe8 100644 --- a/recipes/ffphonelog/ffphonelog_git.bb +++ b/recipes/ffphonelog/ffphonelog_git.bb @@ -11,13 +11,20 @@ PR = "r1" SRC_URI = "git://git.shr-project.org/repo/ffphonelog.git;protocol=http;branch=master" -SRCREV = "f257edad1b046d5efcc83f80c1bef314773c2bc2" +SRCREV = "9f7b682c4be9c0f23908dc888462399d939ffa11" S = "${WORKDIR}/git" FILES_${PN} += "${datadir}/applications ${datadir}/pixmaps" +EXTRA_OEMAKE = " \ + CC='${CC}' \ + CFLAGS_APPEND='${CFLAGS}' \ + LDFLAGS_APPEND='${LDFLAGS}' \ + DESTDIR='${D}' \ + PREFIX=/usr" + do_install() { - oe_runmake install DESTDIR=${D} + oe_runmake install } MAINTAINER = "Lukasz Pankowski " From 4fd0086338433ebb5e4ce4db62712765396f59cf Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Mon, 28 Feb 2011 00:25:59 +0100 Subject: [PATCH 122/509] linux-kexecboot: bump 2.6.37 to 2.6.37.2 Signed-off-by: Andrea Adami --- recipes/linux/linux-kexecboot_2.6.37.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes/linux/linux-kexecboot_2.6.37.bb b/recipes/linux/linux-kexecboot_2.6.37.bb index 8cbd84bc2e..ee94106cbe 100644 --- a/recipes/linux/linux-kexecboot_2.6.37.bb +++ b/recipes/linux/linux-kexecboot_2.6.37.bb @@ -1,6 +1,6 @@ require linux-kexecboot.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" S = "${WORKDIR}/linux-${PV}" @@ -8,9 +8,12 @@ S = "${WORKDIR}/linux-${PV}" DEFAULT_PREFERENCE = "-1" SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ - file://defconfig" + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.2.bz2;name=stablepatch \ + file://defconfig " SRC_URI_append_collie = " file://collie-locomo-kb.patch;status=upstream " SRC_URI[kernel.md5sum] = "c8ee37b4fdccdb651e0603d35350b434" SRC_URI[kernel.sha256sum] = "edbf091805414739cf57a3bbfeba9e87f5e74f97e38f04d12060e9e0c71e383a" +SRC_URI[stablepatch.md5sum] = "bb5798f2a2a5af13219d1a250c4dad11" +SRC_URI[stablepatch.sha256sum] = "3d65f2fb5f0018e8dafda4abe68d947d2ab5e21c386062cb0d6e011244a16aef" From 19ce36173e7a3d41e2359f5421a7da2933aa0720 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 27 Feb 2011 15:58:00 -0700 Subject: [PATCH 123/509] common-linux: Add ac_cv_have_variable_fdset Signed-off-by: Tom Rini --- site/common-linux | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/common-linux b/site/common-linux index aa6f06822f..977f31286c 100644 --- a/site/common-linux +++ b/site/common-linux @@ -32,3 +32,6 @@ ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes} # rp-pppoe rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev} + +# asterisk +ac_cv_have_variable_fdset=${ac_cv_have_variable_fdset=no} From a8674bc4c414eb074362885e57c8f746dd3b48be Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 27 Feb 2011 16:21:30 -0700 Subject: [PATCH 124/509] asterisk: Update to 1.4.39.2 This fixes a few security problems and has a little recipe clean-up while I'm in here. Signed-off-by: Tom Rini --- .../Makefile.patch | 0 .../asterisk-1.4-bugid18301.patch | 43 +++++++++++++++++++ .../init | 0 .../logrotate | 0 .../sounds.xml.patch | 0 .../volatiles | 0 ...erisk_1.4.23.1.bb => asterisk_1.4.39.2.bb} | 31 +++++++------ 7 files changed, 61 insertions(+), 13 deletions(-) rename recipes/asterisk/{asterisk-1.4.23.1 => asterisk-1.4.39.2}/Makefile.patch (100%) create mode 100644 recipes/asterisk/asterisk-1.4.39.2/asterisk-1.4-bugid18301.patch rename recipes/asterisk/{asterisk-1.4.23.1 => asterisk-1.4.39.2}/init (100%) rename recipes/asterisk/{asterisk-1.4.23.1 => asterisk-1.4.39.2}/logrotate (100%) rename recipes/asterisk/{asterisk-1.4.23.1 => asterisk-1.4.39.2}/sounds.xml.patch (100%) rename recipes/asterisk/{asterisk-1.4.23.1 => asterisk-1.4.39.2}/volatiles (100%) rename recipes/asterisk/{asterisk_1.4.23.1.bb => asterisk_1.4.39.2.bb} (87%) diff --git a/recipes/asterisk/asterisk-1.4.23.1/Makefile.patch b/recipes/asterisk/asterisk-1.4.39.2/Makefile.patch similarity index 100% rename from recipes/asterisk/asterisk-1.4.23.1/Makefile.patch rename to recipes/asterisk/asterisk-1.4.39.2/Makefile.patch diff --git a/recipes/asterisk/asterisk-1.4.39.2/asterisk-1.4-bugid18301.patch b/recipes/asterisk/asterisk-1.4.39.2/asterisk-1.4-bugid18301.patch new file mode 100644 index 0000000000..4a80d01145 --- /dev/null +++ b/recipes/asterisk/asterisk-1.4.39.2/asterisk-1.4-bugid18301.patch @@ -0,0 +1,43 @@ +--- asterisk-1.4.39-rc1/configure.ac.orig 2011-01-09 12:46:51.000000000 -0600 ++++ asterisk-1.4.39-rc1/configure.ac 2011-01-09 12:48:28.000000000 -0600 +@@ -485,40 +485,6 @@ + AC_MSG_RESULT(cross-compile) + ) + +-ac_cv_have_variable_fdset=0 +-AC_MSG_CHECKING(if we can increase the maximum select-able file descriptor) +-AC_RUN_IFELSE( +-AC_LANG_PROGRAM([ +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-], [[ +- struct rlimit rlim = { FD_SETSIZE + 2, FD_SETSIZE + 2 }; +- int fd[[2]]; +- struct timeval tv = { 0, }; +- struct ast_fdset { long fds_bits[[1024]]; } fds = { { 0, } }; +- if (setrlimit(RLIMIT_NOFILE, &rlim)) { exit(1); } +- if ((fd0 = open("/dev/null", O_RDONLY)) < 0) { exit(1); } +- if (dup2(fd0, (fd1 = FD_SETSIZE + 1)) < 0) { exit(1); } +- FD_SET(fd[[0]], (fd_set *) &fds); +- FD_SET(fd[[1]], (fd_set *) &fds); +- if (select(FD_SETSIZE + 2, (fd_set *) &fds, NULL, NULL, &tv) < 0) { exit(1); } +- exit(0)]]), +- AC_MSG_RESULT(yes) +- ac_cv_have_variable_fdset=1 +- AC_DEFINE([HAVE_VARIABLE_FDSET], 1, [Define to 1 if your system can support larger than default select bitmasks.]), +- AC_MSG_RESULT(no), +- AC_MSG_RESULT(cross-compile) +-) +- + if test "${ac_cv_have_variable_fdset}x" = "0x"; then + AC_RUN_IFELSE( + AC_LANG_PROGRAM([ diff --git a/recipes/asterisk/asterisk-1.4.23.1/init b/recipes/asterisk/asterisk-1.4.39.2/init similarity index 100% rename from recipes/asterisk/asterisk-1.4.23.1/init rename to recipes/asterisk/asterisk-1.4.39.2/init diff --git a/recipes/asterisk/asterisk-1.4.23.1/logrotate b/recipes/asterisk/asterisk-1.4.39.2/logrotate similarity index 100% rename from recipes/asterisk/asterisk-1.4.23.1/logrotate rename to recipes/asterisk/asterisk-1.4.39.2/logrotate diff --git a/recipes/asterisk/asterisk-1.4.23.1/sounds.xml.patch b/recipes/asterisk/asterisk-1.4.39.2/sounds.xml.patch similarity index 100% rename from recipes/asterisk/asterisk-1.4.23.1/sounds.xml.patch rename to recipes/asterisk/asterisk-1.4.39.2/sounds.xml.patch diff --git a/recipes/asterisk/asterisk-1.4.23.1/volatiles b/recipes/asterisk/asterisk-1.4.39.2/volatiles similarity index 100% rename from recipes/asterisk/asterisk-1.4.23.1/volatiles rename to recipes/asterisk/asterisk-1.4.39.2/volatiles diff --git a/recipes/asterisk/asterisk_1.4.23.1.bb b/recipes/asterisk/asterisk_1.4.39.2.bb similarity index 87% rename from recipes/asterisk/asterisk_1.4.23.1.bb rename to recipes/asterisk/asterisk_1.4.39.2.bb index ed445089b4..90877c6070 100644 --- a/recipes/asterisk/asterisk_1.4.23.1.bb +++ b/recipes/asterisk/asterisk_1.4.39.2.bb @@ -11,6 +11,7 @@ DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis" SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${PV}.tar.gz \ # file://sounds.xml.patch \ file://Makefile.patch \ + file://asterisk-1.4-bugid18301.patch \ file://logrotate \ file://volatiles \ file://init" @@ -54,29 +55,33 @@ export ASTCFLAGS = "-fsigned-char -I${STAGING_INCDIR} -DPATH_MAX=4096" export ASTLDFLAGS="${LDFLAGS} -lpthread -ldl -lresolv " export PROC="${ARCH}" -do_configure_prepend () { +do_configure_prepend() { sed -i 's:/var:${localstatedir}:' ${WORKDIR}/logrotate sed -i 's:/etc/init.d:${sysconfdir}/init.d:' ${WORKDIR}/logrotate sed -i 's:/var:${localstatedir}:' ${WORKDIR}/volatiles -} -do_configure () { - # Looks like rebuilding configure doesn't work, so we are skipping - # that and are just using the shipped one - # gnu-configize - # libtoolize --force - oe_runconf + # Due to menuselect below we want to save off these configures + mv ${S}/menuselect/configure ${S}/menuselect/configure.SAVE + mv ${S}/menuselect/mxml/configure ${S}/menuselect/mxml/configure.SAVE + mv ${S}/main/editline/configure ${S}/main/editline/configure.SAVE } +do_configure_append() { + # Put this back + mv ${S}/menuselect/configure.SAVE ${S}/menuselect/configure + mv ${S}/menuselect/mxml/configure.SAVE ${S}/menuselect/mxml/configure + mv ${S}/main/editline/configure.SAVE ${S}/main/editline/configure +} do_compile() { ( - #make sure that menuselect gets build using host toolchain - unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS RANLIB + # Make sure that menuselect gets build using host toolchain + unset CC CPP LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS RANLIB + unset CONFIG_SITE + export ac_cv_prog_PKGCONFIG=No cd menuselect ./configure oe_runmake - cd ../ ) || exit 1 oe_runmake } @@ -160,5 +165,5 @@ CONFFILES_${PN} += "${sysconfdir}/asterisk/voicemail.conf" CONFFILES_${PN} += "${sysconfdir}/asterisk/vpb.conf" CONFFILES_${PN} += "${sysconfdir}/logrotate.d/asterisk" -SRC_URI[md5sum] = "f5fdaa7e4a6d9b8dfc9e2bef8ee81681" -SRC_URI[sha256sum] = "e78e73de5d9b920070b778cbb2ab077119a86a71a59755d67aa2c3a82b4239c4" +SRC_URI[md5sum] = "b3c0102860cf8b5ca44660636d6eac87" +SRC_URI[sha256sum] = "b2eb49e2198a4f05e4254cf224e0f13755889ba421a70c772ffafb3a6775271e" From 63aa331c144da76861c378c19f1387e6dcf9e266 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 27 Feb 2011 16:45:36 -0700 Subject: [PATCH 125/509] avahi: Fix for CVE-2011-1002 As in the patch comments, based on upstream but with a minor change. Signed-off-by: Tom Rini --- .../avahi-0.6.25/fix-CVE-2011-1002.patch | 37 +++++++++++++++++++ recipes/avahi/avahi_0.6.25.bb | 3 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 recipes/avahi/avahi-0.6.25/fix-CVE-2011-1002.patch diff --git a/recipes/avahi/avahi-0.6.25/fix-CVE-2011-1002.patch b/recipes/avahi/avahi-0.6.25/fix-CVE-2011-1002.patch new file mode 100644 index 0000000000..f45af44eb8 --- /dev/null +++ b/recipes/avahi/avahi-0.6.25/fix-CVE-2011-1002.patch @@ -0,0 +1,37 @@ +Based on the official fix (46109dfec75534fe270c0ab902576f685d5ab3a6) but +since we missed having 2b2844b10d7b7e5c97f9c667d664d9418bb7769a we are +two hunks smaller. + +Index: avahi-0.6.25/avahi-core/socket.c +=================================================================== +--- avahi-0.6.25.orig/avahi-core/socket.c ++++ avahi-0.6.25/avahi-core/socket.c +@@ -684,10 +684,14 @@ AvahiDnsPacket *avahi_recv_dns_packet_ip + goto fail; + } + +- if (sa.sin_addr.s_addr == INADDR_ANY) { ++ /* For corrupt packets FIONREAD returns zero size (See rhbz #607297). So ++ * fail after having read them. */ ++ if (!ms) ++ goto fail; ++ ++ if (sa.sin_addr.s_addr == INADDR_ANY) + /* Linux 2.4 behaves very strangely sometimes! */ + goto fail; +- } + + assert(!(msg.msg_flags & MSG_CTRUNC)); + assert(!(msg.msg_flags & MSG_TRUNC)); +@@ -839,6 +843,11 @@ AvahiDnsPacket *avahi_recv_dns_packet_ip + goto fail; + } + ++ /* For corrupt packets FIONREAD returns zero size (See rhbz #607297). So ++ * fail after having read them. */ ++ if (!ms) ++ goto fail; ++ + assert(!(msg.msg_flags & MSG_CTRUNC)); + assert(!(msg.msg_flags & MSG_TRUNC)); + diff --git a/recipes/avahi/avahi_0.6.25.bb b/recipes/avahi/avahi_0.6.25.bb index 74e69d093d..f297946fbe 100644 --- a/recipes/avahi/avahi_0.6.25.bb +++ b/recipes/avahi/avahi_0.6.25.bb @@ -7,7 +7,8 @@ DEPENDS += "intltool-native" PACKAGES =+ "libavahi-gobject" -SRC_URI += "file://disable-ipv6.patch" +SRC_URI += "file://disable-ipv6.patch \ + file://fix-CVE-2011-1002.patch" noipv6 = "${@base_contains('DISTRO_FEATURES', 'ipv6', '', '-DDISABLE_IPV6', d)}" EXTRA_OEMAKE_append = " 'CFLAGS=${CFLAGS} ${noipv6}'" From 970a97f5026a4dd0ca24b5506f438df86b323d9e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 23 Feb 2011 21:56:07 +0100 Subject: [PATCH 126/509] qcanobserver: move to r43 Signed-off-by: Koen Kooi --- ...erface.cpp-add-sys-socket.h-as-inclu.patch | 31 +++++++++++-------- recipes/qcanobserver/qcanobserver_svn.bb | 2 +- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/recipes/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch b/recipes/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch index 6a19d8ddbf..7a2b96dfe5 100644 --- a/recipes/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch +++ b/recipes/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch @@ -13,22 +13,27 @@ Signed-off-by: Koen Kooi messagebufferinterface.cpp | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) + diff --git a/messagebufferinterface.cpp b/messagebufferinterface.cpp -index e26b52d..117ebb4 100644 +index 86e6c87..7f76b56 100644 --- a/messagebufferinterface.cpp +++ b/messagebufferinterface.cpp -@@ -19,8 +19,9 @@ - #include "errordialog.h" - #include - #include --#include --#include +@@ -25,14 +25,15 @@ + #include + #include + +#include +#include +#include - #include - #include - #include --- -1.6.6.1 - ++ + #include + #include + #include + + #include "configdialog.h" +-#include +-#include +-#include + + + void MessageBufferInterface::configChanged(__config cfg) diff --git a/recipes/qcanobserver/qcanobserver_svn.bb b/recipes/qcanobserver/qcanobserver_svn.bb index 4a7bd62e99..8b31aaadc9 100644 --- a/recipes/qcanobserver/qcanobserver_svn.bb +++ b/recipes/qcanobserver/qcanobserver_svn.bb @@ -6,7 +6,7 @@ inherit qt4x11 DEPENDS += "qwt" PV = "0.5+svnr${SRCPV}" -SRCREV = "41" +SRCREV = "43" SRC_URI = "svn://qcanobserver.svn.sourceforge.net/svnroot;module=qcanobserver;proto=https \ file://0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch \ file://candemo.xml" From 2ea1ee843d6f07fc175949597e0f6f68a5ee7d59 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 27 Feb 2011 20:59:01 +0100 Subject: [PATCH 127/509] ffmpeg git: bump SRCREV * NEON acceleration for VP* * libavcore is no more Signed-off-by: Koen Kooi --- recipes/ffmpeg/ffmpeg_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb index 24c81ea24e..d84653a2df 100644 --- a/recipes/ffmpeg/ffmpeg_git.bb +++ b/recipes/ffmpeg/ffmpeg_git.bb @@ -3,7 +3,7 @@ require ffmpeg.inc DEPENDS += "virtual/libsdl schroedinger libgsm libvpx" # When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes -SRCREV = "a4f5af13fb00d7f55946470bb0f52e1dbf5f3c6a" +SRCREV = "0b32da90f893b3e04ead18a546252e241a6a0988" PV = "0.6.1+${PR}+gitr${SRCPV}" PR = "${INC_PR}.1" From 495dda3bdbf4ca5f3c1c6e7605dccc87cba4a609 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 27 Feb 2011 20:59:32 +0100 Subject: [PATCH 128/509] omapfbplay: bump SRCREV for ffmpeg change Signed-off-by: Koen Kooi --- recipes/ffmpeg/omapfbplay.inc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/recipes/ffmpeg/omapfbplay.inc b/recipes/ffmpeg/omapfbplay.inc index c301d1dce3..082f28e26a 100644 --- a/recipes/ffmpeg/omapfbplay.inc +++ b/recipes/ffmpeg/omapfbplay.inc @@ -2,15 +2,12 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays" DEPENDS = "bzip2 lame ffmpeg virtual/kernel" LICENSE = "MIT" -PR = "r28" +PR = "r29" PV = "0.0+${PR}+gitr${SRCREV}" -SRCREV = "1d217676ba71e8740524e9814c47da39880ed3bc" +SRCREV = "9ce728cf67dd1c0a7dbf4e54e899f28bd0c5fbe1" SRC_URI = "git://git.mansr.com/omapfbplay;protocol=git \ - file://0001-Remove-pointless-function-frame_format.patch \ - file://0002-avcodec-fix-frame-size-calculation.patch \ - file://0003-Print-allocated-and-displayed-frame-size.patch \ " S = "${WORKDIR}/git" From dd55475724dc23fa13889eeafc4a120535522192 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Mon, 28 Feb 2011 15:32:33 +0100 Subject: [PATCH 129/509] ristretto: updated SRC_URI thanks for brolin on irc for pointing this out Signed-off-by: Frans Meulenbroeks --- recipes/xfce-extras/ristretto_0.0.21.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/xfce-extras/ristretto_0.0.21.bb b/recipes/xfce-extras/ristretto_0.0.21.bb index 77af926c7c..7f7aa34b14 100644 --- a/recipes/xfce-extras/ristretto_0.0.21.bb +++ b/recipes/xfce-extras/ristretto_0.0.21.bb @@ -9,7 +9,7 @@ inherit xfce46 XFCE_VERSION = "4.6.1" -SRC_URI = "http://goodies.xfce.org/releases/ristretto/${PN}-${PV}.tar.gz" +SRC_URI = "http://archive.xfce.org/src/apps/ristretto/0.0/${PN}-${PV}.tar.gz" SRC_URI[md5sum] = "7774dcafdc365e70b8d981c0a52d6250" SRC_URI[sha256sum] = "b3e63ef1d4a582c2a3f4e99f097ec28273edf9feb51162b470d4c12c61a51378" From 7ac2ef0d23dec679bb522f65b37117473fcaffc7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 28 Feb 2011 15:41:20 +0100 Subject: [PATCH 130/509] angstrom: add xattr to DISTRO_FEATURES to keep things working. *sigh* Signed-off-by: Koen Kooi --- conf/distro/include/angstrom.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 0aa8f60e15..199cf724a7 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -178,7 +178,7 @@ SEPPUKU_COMPONENT = "org.openembedded.dev" OESTATS_SERVER ?= "tinderbox.openembedded.org" # We want images supporting the following features (for task-base) -DISTRO_FEATURES = "largefile ipv4 ipv6 nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci pam" +DISTRO_FEATURES = "xattr largefile ipv4 ipv6 nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci pam" # Use-like features DISTRO_FEATURES += "tk" From f6cc39df77d5143094d10ee4f0d996ce7b8bef84 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Mon, 28 Feb 2011 09:09:52 -0600 Subject: [PATCH 131/509] SlugOS: slugos.inc - Add xattr to DISTRO_FEATURES to keep parity. --- conf/distro/include/slugos.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 994b2c15cb..0451fc1f38 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -30,7 +30,7 @@ THUMB_INTERWORK = "yes" # arm system and vice versa. It is strongly recommended that DISTROs not # turn this off - the actual cost is very small. # We want images supporting the following features (for task-base) -DISTRO_FEATURES = "largefile ipv4 ipv6 nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbhost pci eabi" +DISTRO_FEATURES = "largefile ipv4 ipv6 nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbhost pci eabi xattr" # We may also wish to enable raid support at some point (space permitting) #DISTRO_FEATURES += " raid" From a5d16bb59e6c87eb6440b27dd6f14eca8092ec5e Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 28 Feb 2011 08:38:47 -0700 Subject: [PATCH 132/509] flex.inc: Fixup DEPENDS We added perl here incorrectly (this problem is now solved by perl-native being used by automake/autoconf, always). We don't need gettext here now that we have 'inherit gettext' which does this for us. Signed-off-by: Tom Rini --- recipes/flex/flex.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipes/flex/flex.inc b/recipes/flex/flex.inc index e35d594a9b..7ca229fa3b 100644 --- a/recipes/flex/flex.inc +++ b/recipes/flex/flex.inc @@ -2,9 +2,7 @@ DESCRIPTION = "Flex is a tool for generating programs that recognize lexical pat SECTION = "devel" LICENSE = "BSD" -DEPENDS = "gettext perl" - -INC_PR = "r6" +INC_PR = "r7" BBCLASSEXTEND = "native" From d0fe04c882a49f2b7c1d5fde53c11640ed65f7dd Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 28 Feb 2011 10:21:32 -0700 Subject: [PATCH 133/509] perl: Drop grep-native from DEPENDS, update grep line Both OS X 10.6 and FreeBSD (for some time) ship with GNU grep. Also, we can use -l rather than passing on to cut to get the files to mangle and put -r in with -I and -l. Signed-off-by: Tom Rini --- recipes/perl/perl_5.10.1.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes/perl/perl_5.10.1.bb b/recipes/perl/perl_5.10.1.bb index a53b157359..6c0dcb16da 100644 --- a/recipes/perl/perl_5.10.1.bb +++ b/recipes/perl/perl_5.10.1.bb @@ -3,8 +3,7 @@ HOMEPAGE = "http://www.perl.org/" SECTION = "devel/perl" LICENSE = "Artistic|GPLv1+" PRIORITY = "optional" -# We need gnugrep (for -I) -DEPENDS = "virtual/db perl-native grep-native" +DEPENDS = "virtual/db perl-native" PR = "r22" # 5.10.1 has Module::Build built-in @@ -158,7 +157,7 @@ do_configure() { esac # These are strewn all over the source tree - for foo in `grep -I -m1 \/usr\/include\/.*\\.h ${WORKDIR}/* -r | cut -f 1 -d ":"` ; do + for foo in `grep -lrI -m1 \/usr\/include\/.*\\.h ${WORKDIR}/*` ; do echo Fixing: $foo sed -e "s%/usr/include/%${STAGING_INCDIR}/%g" -i $foo done From 3db53d6d57b0ff03a83e20e94feb078e480679e8 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Mon, 28 Feb 2011 21:21:31 +0100 Subject: [PATCH 134/509] initscripts-shr: add correct commands for halt/reboot for palmpre machine Signed-off-by: Simon Busch --- recipes/shr/initscripts-shr/palmpre/halt | 2 +- recipes/shr/initscripts-shr/palmpre/reboot | 2 +- recipes/shr/initscripts-shr_0.0.1.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/shr/initscripts-shr/palmpre/halt b/recipes/shr/initscripts-shr/palmpre/halt index 6b3dc0d8ed..293d9b27a8 100644 --- a/recipes/shr/initscripts-shr/palmpre/halt +++ b/recipes/shr/initscripts-shr/palmpre/halt @@ -20,6 +20,6 @@ then hddown="" fi -/sbin/tellbootie shutdown +halt -d -f : exit 0 diff --git a/recipes/shr/initscripts-shr/palmpre/reboot b/recipes/shr/initscripts-shr/palmpre/reboot index 195f540d2f..fcd312a11d 100644 --- a/recipes/shr/initscripts-shr/palmpre/reboot +++ b/recipes/shr/initscripts-shr/palmpre/reboot @@ -8,4 +8,4 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin echo -n "Rebooting... " -/sbin/tellbootie +reboot -f -d diff --git a/recipes/shr/initscripts-shr_0.0.1.bb b/recipes/shr/initscripts-shr_0.0.1.bb index 86ffe0656d..1434048165 100644 --- a/recipes/shr/initscripts-shr_0.0.1.bb +++ b/recipes/shr/initscripts-shr_0.0.1.bb @@ -5,7 +5,7 @@ DEPENDS = "" RDEPENDS_${PN} = "procps" LICENSE = "GPL" PV = "0.0.1" -PR = "r25" +PR = "r26" RCONFLICTS_${PN} = "initscripts" From a2b5215d82fd92899846820bdd40c0935d413cbf Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 28 Feb 2011 13:39:05 -0700 Subject: [PATCH 135/509] linux.inc: Add more machines to the lzma-native logic Signed-off-by: Tom Rini --- recipes/linux/linux.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc index a0d16c24ac..bae0cb41b1 100644 --- a/recipes/linux/linux.inc +++ b/recipes/linux/linux.inc @@ -67,7 +67,7 @@ python __anonymous () { bb.data.setVar("DEPENDS", "%s dtc-native" % depends, d) packages = bb.data.getVar("PACKAGES", d, 1) bb.data.setVar("PACKAGES", "%s kernel-devicetree" % packages, d) - if 'nokia900' in machine: + if 'nokia900' in machine or 'om-gta0' in machine or 'eee701' in machine: depends = bb.data.getVar("DEPENDS", d, 1) bb.data.setVar("DEPENDS", "%s lzma-native" % depends, d) } From 37f6fd673ff1d2f66894e6ffb6289d42a3295287 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 28 Feb 2011 13:39:19 -0700 Subject: [PATCH 136/509] linux-kexecboot.inc: Sometimes add lzma-native to DEPENDS Using the same logic that switches on lzma compression add lzma-native to DEPENDS. Signed-off-by: Tom Rini --- recipes/linux/linux-kexecboot.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/linux/linux-kexecboot.inc b/recipes/linux/linux-kexecboot.inc index 40f41d69ab..e3dde6afa7 100644 --- a/recipes/linux/linux-kexecboot.inc +++ b/recipes/linux/linux-kexecboot.inc @@ -50,6 +50,7 @@ def kernel_version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d) # force lzma compression for kernel (linux-kexecboot >= 2.6.32) # force lzma compression for initramfs (linux-kexecboot >= 2.6.30) +DEPENDS += '${@kernel_version_less_or_equal("PV", "2.6.29", "", "lzma-native", d)}' KERNEL_COMPRESSION = '${@kernel_version_less_or_equal("PV", "2.6.31", "", "CONFIG_KERNEL_LZMA=y", d)}' From f1557634da24c16fd78bf861ef920c0c99177c2f Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Mon, 28 Feb 2011 21:44:02 +0100 Subject: [PATCH 137/509] efreet: fix segfault * when installing a new .desktop file on the desktop e segfaults if there is a file without . in that dir * this fixes SHR bug #1295 Signed-off-by: Thomas Zimmermann --- recipes/efl1/efreet/changeset_trunk_r57435.patch | 11 +++++++++++ recipes/efl1/efreet_1.0.0.bb | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 recipes/efl1/efreet/changeset_trunk_r57435.patch diff --git a/recipes/efl1/efreet/changeset_trunk_r57435.patch b/recipes/efl1/efreet/changeset_trunk_r57435.patch new file mode 100644 index 0000000000..58692758f9 --- /dev/null +++ b/recipes/efl1/efreet/changeset_trunk_r57435.patch @@ -0,0 +1,11 @@ +Index: efreet/src/lib/efreet_desktop.c +=================================================================== +--- efreet/src/lib/efreet_desktop.c (revision 57257) ++++ efreet/src/lib/efreet_desktop.c (revision 57435) +@@ -1206,5 +1206,5 @@ + case ECORE_FILE_EVENT_MODIFIED: + ext = strrchr(path, '.'); +- if (!strcmp(ext, ".desktop") || !strcmp(ext, ".directory")) ++ if (ext && (!strcmp(ext, ".desktop") || !strcmp(ext, ".directory"))) + efreet_cache_desktop_update(); + break; diff --git a/recipes/efl1/efreet_1.0.0.bb b/recipes/efl1/efreet_1.0.0.bb index dd50c62e23..d2d7f2fd86 100644 --- a/recipes/efl1/efreet_1.0.0.bb +++ b/recipes/efl1/efreet_1.0.0.bb @@ -1,9 +1,10 @@ require efreet.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "\ ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ + file://changeset_trunk_r57435.patch \ " SRC_URI[md5sum] = "ce7dd05138335312c7eb9ac8e5e62467" From 504bd41baca3b94a6b2394e7da0d75772d4d8477 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Mon, 28 Feb 2011 21:46:38 +0100 Subject: [PATCH 138/509] openjdk: change jaxp download from java.net to the icedtea repo --- recipes/openjdk/openjdk-6-release-6b18.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/openjdk/openjdk-6-release-6b18.inc b/recipes/openjdk/openjdk-6-release-6b18.inc index 97a0a2777d..58d0be336c 100644 --- a/recipes/openjdk/openjdk-6-release-6b18.inc +++ b/recipes/openjdk/openjdk-6-release-6b18.inc @@ -29,7 +29,7 @@ JAF_URI = "http://icedtea.classpath.org/download/source/drops/jdk6-jaf-2009_10_2 SRC_URI[jaf.md5sum] = "7a50bb540a27cdd0001885630088b758" SRC_URI[jaf.sha256sum] = "fdc51476fc6bcc69ea1f099f33e84601a126bfa8b11c8fa11c25dc574345aa9f" -JAXP_URI = "https://jaxp.dev.java.net/files/nidaba/documents/913/147329/jdk6-jaxp-2009_10_13.zip;name=jaxp" +JAXP_URI = "https://icedtea.classpath.org/download/source/drops/jdk6-jaxp-2009_10_13.zip;name=jaxp" SRC_URI[jaxp.md5sum] = "a2f7b972124cd776ff71e7754eb9a429" SRC_URI[jaxp.sha256sum] = "8714d55de18db48ca9da0ee986202005082f44cf4c215da8683342b70e61792b" From d3a5cfac89a7189317a1d4fe68bfdebdcd56a18b Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Tue, 1 Mar 2011 01:53:11 +0100 Subject: [PATCH 139/509] linux-kexecboot.inc: Customize recipe, do not include linux.inc anymore. * linux.inc is deprecated, use only kernel.bbclass * bump PR Signed-off-by: Andrea Adami --- recipes/linux/linux-kexecboot.inc | 140 ++++++++++++++++++++---------- 1 file changed, 96 insertions(+), 44 deletions(-) diff --git a/recipes/linux/linux-kexecboot.inc b/recipes/linux/linux-kexecboot.inc index e3dde6afa7..b6599fe24e 100644 --- a/recipes/linux/linux-kexecboot.inc +++ b/recipes/linux/linux-kexecboot.inc @@ -1,32 +1,34 @@ # We set INC_PR here, since a change in the kexecboot recipe will need to get picked up by *all* the kernels: -INC_PR = "r28" +INC_PR = "r29" +inherit kernel siteinfo + +# Additional Sources for 2.6.24 and 2.6.26 +RPSRC = "http://www.rpsys.net/openzaurus/patches/archive" +TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches" + +# Kernel bootlogo is distro-specific (default is OE logo). +# Logo resolution (qvga, vga, ...) is machine-specific. LOGO_SIZE ?= "." SRC_URI = "file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2" -require linux.inc - -# we want the smallest size -INITRAMFS_IMAGE = "initramfs-kexecboot-klibc-image" +# Note how we set master console on serial to protect bootlogo. +CMDLINE_c7x0 = "console=tty1 console=ttyS0,115200n8" +CMDLINE_tosa = "console=tty1 console=ttyS0,115200n8" +CMDLINE_poodle = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" +CMDLINE_akita = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" +CMDLINE_collie = "console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M" +CMDLINE_spitz = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" +CMDLINE_hx4700 = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" -# here we set master console on serial -CMDLINE_c7x0 = "console=tty1 console=ttyS0,115200n8 ${CMDLINE_DEBUG}" -CMDLINE_tosa = "console=tty1 console=ttyS0,115200n8 ${CMDLINE_DEBUG}" -CMDLINE_poodle = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 ${CMDLINE_DEBUG}" -CMDLINE_akita = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 ${CMDLINE_DEBUG}" -CMDLINE_collie = "console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M ${CMDLINE_DEBUG}" -CMDLINE_spitz = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 ${CMDLINE_DEBUG}" -CMDLINE_hx4700 = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 ${CMDLINE_DEBUG}" +# Set the verbosity of kernel messages during runtime +# You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour.. +CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "loglevel=3", "debug", d)}' +CMDLINE += "${CMDLINE_DEBUG}" PACKAGES = "" PROVIDES = "" -DOSRC = "http://www.do13.de/openzaurus/patches" -JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files" -BASRC = "http://www.orca.cx/zaurus/patches" -CHSRC = "http://oz.drigon.com/patches" -TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches" - # Zaurus machines need kernel size-check KERNEL_IMAGE_MAXSIZE_akita = "1294336" KERNEL_IMAGE_MAXSIZE_c7x0 = "1294336" @@ -38,6 +40,11 @@ KERNEL_IMAGE_MAXSIZE_spitz = "1294336" KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-kexecboot-${PV}-${PR}-${MACHINE}" KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}" +LOCALVERSION ?= "" + +# we want the smallest size +INITRAMFS_IMAGE = "initramfs-kexecboot-klibc-image" + # use custom function until base_version_less_or_equal is fixed # def kernel_version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): @@ -58,31 +65,76 @@ INITRAMFS_COMPRESSION = '${@kernel_version_less_or_equal("PV", "2.6.29", "", "CO INITRAMFS_COMPRESSION_SUFFIX = '${@kernel_version_less_or_equal("PV", "2.6.29", "gz", "lzma", d)}' RD_COMPRESSION = '${@kernel_version_less_or_equal("PV", "2.6.29", "", "CONFIG_RD_LZMA=y", d)}' -do_configure_append() { -sed -i -e /CONFIG_BLK_DEV_INITRD/d \ - -e /CONFIG_KEXEC/d \ - -e /CONFIG_KERNEL/d \ - -e /CONFIG_INITRAMFS_SOURCE/d \ - -e /CONFIG_INITRAMFS_COMPRESSION/d \ - -e /CONFIG_RD/d \ - -e /=m/d \ - -e /CONFIG_MODULES/d \ - -e /CONFIG_DEBUG_ERRORS/d \ - -e /CONFIG_DEBUG_BUGVERBOSE/d \ - -e /CONFIG_DEBUG_KERNEL/d \ - ${S}/.config - -# Remove last tag appended by linux.inc (output messes screen) -sed -i -e /CONFIG_CMDLINE/s/quiet/loglevel=3/1 ${S}/.config -sed -i -e /CONFIG_CMDLINE/s/debug/loglevel=3/1 ${S}/.config - -echo 'CONFIG_BLK_DEV_INITRD=y -CONFIG_KEXEC=y -${KERNEL_COMPRESSION} -${INITRAMFS_COMPRESSION} -CONFIG_INITRAMFS_SOURCE="initramfs.cpio.${INITRAMFS_COMPRESSION_SUFFIX}" -${RD_COMPRESSION} -CONFIG_MODULES=n' >> ${S}/.config +do_configure_prepend() { + + # Rename getline in ./scripts/unifdef.c + # Kernels up to 2.6.29 are currently failing to build unifdef.c, + # clashing with exposed getline() from + # see https://patchwork.kernel.org/patch/11166/ + # committed in 2.6.29 (commit d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7) + + if [ -e ${S}/scripts/unifdef.c ]; then + sed -i -e 's/getline/parseline/g' ${S}/scripts/unifdef.c + fi + + echo "" > ${S}/.config + + echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config + + # + # endian support + # + if [ "${SITEINFO_ENDIANNESS}" = "be" ]; then + echo "CONFIG_CPU_BIG_ENDIAN=y" >> ${S}/.config + fi + + # + # logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it is going to be used + # + if [ -e ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm ]; then + install -m 0644 ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm + echo "CONFIG_LOGO=y" >> ${S}/.config + echo "CONFIG_LOGO_LINUX_CLUT224=y" >> ${S}/.config + fi + + # When enabling thumb for userspace we also need thumb support in the kernel + if [ "${ARM_INSTRUCTION_SET}" = "thumb" ] ; then + sed -i -e /CONFIG_ARM_THUMB/d ${WORKDIR}/defconfig + echo "CONFIG_ARM_THUMB=y" >> ${S}/.config + fi + + sed -e '/CONFIG_CMDLINE=/d' \ + -e '/CONFIG_CPU_BIG_ENDIAN/d' \ + -e '/CONFIG_LOGO=/d' \ + -e '/CONFIG_LOGO_LINUX_CLUT224=/d' \ + -e '/CONFIG_LOCALVERSION/d' \ + -e '/CONFIG_LOCALVERSION_AUTO/d' \ + < '${WORKDIR}/defconfig' >>'${S}/.config' + + echo 'CONFIG_LOCALVERSION="${LOCALVERSION}"' >>${S}/.config + echo '# CONFIG_LOCALVERSION_AUTO is not set' >>${S}/.config + + # Force sane defaults for kexec-enabled kernels and keep size small + sed -i -e /CONFIG_BLK_DEV_INITRD/d \ + -e /CONFIG_KEXEC/d \ + -e /CONFIG_KERNEL/d \ + -e /CONFIG_INITRAMFS_COMPRESSION/d \ + -e /CONFIG_INITRAMFS_SOURCE/d \ + -e /CONFIG_RD/d \ + -e /=m/d \ + -e /CONFIG_MODULES/d \ + -e /CONFIG_DEBUG_ERRORS/d \ + -e /CONFIG_DEBUG_BUGVERBOSE/d \ + -e /CONFIG_DEBUG_KERNEL/d \ + ${S}/.config + + echo 'CONFIG_BLK_DEV_INITRD=y' >>${S}/.config + echo 'CONFIG_KEXEC=y' >>${S}/.config + echo '${KERNEL_COMPRESSION}' >>${S}/.config + echo '"${INITRAMFS_COMPRESSION}"' >>${S}/.config + echo 'CONFIG_INITRAMFS_SOURCE="initramfs.cpio.${INITRAMFS_COMPRESSION_SUFFIX}"' >>${S}/.config + echo '"${RD_COMPRESSION}"' >>${S}/.config + echo 'CONFIG_MODULES=n' >> ${S}/.config yes '' | oe_runmake oldconfig } From f0e837520822ded0164521b57560de7636175f87 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Tue, 1 Mar 2011 02:05:20 +0100 Subject: [PATCH 140/509] linux-kexecboot: add initial ben-nanonote support * temporarly use custom task for uImage * will be fixed when mips kernel will have uImage target (pending) Signed-off-by: Andrea Adami --- recipes/linux/linux-kexecboot.inc | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/recipes/linux/linux-kexecboot.inc b/recipes/linux/linux-kexecboot.inc index b6599fe24e..90ee7c28ce 100644 --- a/recipes/linux/linux-kexecboot.inc +++ b/recipes/linux/linux-kexecboot.inc @@ -1,5 +1,5 @@ # We set INC_PR here, since a change in the kexecboot recipe will need to get picked up by *all* the kernels: -INC_PR = "r29" +INC_PR = "r30" inherit kernel siteinfo @@ -20,6 +20,8 @@ CMDLINE_akita = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" CMDLINE_collie = "console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M" CMDLINE_spitz = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" CMDLINE_hx4700 = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" +CMDLINE_ben-nanonote = "console=tty0 console=ttyS0,57600n8 mem=32M" + # Set the verbosity of kernel messages during runtime # You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour.. @@ -147,3 +149,22 @@ do_install() { python do_package() { } + + +# With 2.6.37 mips has no uImage target upstream. +# use custom task in the meantime + +do_uboot_mkimage_ben-nanonote() { + cd ${S} + kernel_entry=`nm vmlinux | grep " kernel_entry" | cut -d' ' -f1` + + cd ${S}/arch/mips/boot + rm -f vmlinux.bin.gz + gzip -c9 vmlinux.bin > vmlinux.bin.gz + + mkimage -A mips -O linux -T kernel -C gzip -a 0x80010000 -e 0x${kernel_entry} \ + -n 'MIPS' -d vmlinux.bin.gz uImage-kexecboot-${PV}-${PR}-${MACHINE}.bin + + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 uImage-kexecboot-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE} +} From 6babef896ebdfac27983e26962c6d22935926c72 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 27 Feb 2011 12:20:35 +0100 Subject: [PATCH 141/509] kexecboot: prefer uImage for ben-nanonote. Signed-off-by: Andrea Adami --- recipes/kexecboot/kexecboot.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/kexecboot/kexecboot.inc b/recipes/kexecboot/kexecboot.inc index 829df19a6f..4931e45b8e 100644 --- a/recipes/kexecboot/kexecboot.inc +++ b/recipes/kexecboot/kexecboot.inc @@ -40,7 +40,7 @@ EXTRA_OECONF_spitz = "--enable-zaurus --enable-delay=3" EXTRA_OECONF_poodle = "--enable-zaurus --enable-delay=2" EXTRA_OECONF_tosa = "--enable-zaurus --enable-delay=2" EXTRA_OECONF_collie = "--enable-delay=2" - +EXTRA_OECONF_ben-nanonote = "--enable-uimage" EXTRA_OECONF_omap3 = "--enable-uimage" do_configure_prepend () { From 451d0f288aeeb317ca5e60583dfd307d38a787bd Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 27 Feb 2011 12:21:15 +0100 Subject: [PATCH 142/509] kexecboot-cfg: add ben-nanonote cmdline. Signed-off-by: Andrea Adami --- recipes/kexecboot/kexecboot-cfg_0.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/kexecboot/kexecboot-cfg_0.1.bb b/recipes/kexecboot/kexecboot-cfg_0.1.bb index f6dfbaca55..32e5881628 100644 --- a/recipes/kexecboot/kexecboot-cfg_0.1.bb +++ b/recipes/kexecboot/kexecboot-cfg_0.1.bb @@ -8,8 +8,10 @@ SRC_URI = "file://icon.xpm" CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" CMDLINE_CON_collie = "console=ttySA0,115200n8 console=tty1 noinitrd rw" CMDLINE_CON_qemuarm = "console=ttyAMA0,115200n8 console=tty1 noinitrd" +CMDLINE_CON_ben-nanonote = "console=ttyS0,57600n8 console=tty0" CMDLINE_MEM = "" CMDLINE_MEM_collie = "mem=64M" +CMDLINE_MEM_ben-nanonote = "mem=32M" CMDLINE_ROTATE = "" CMDLINE_ROTATE_spitz = "fbcon=rotate:1" CMDLINE_ROTATE_akita = "fbcon=rotate:1" From e3f980f9ffc9041b4d44316f07415da1552e47e1 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Tue, 1 Mar 2011 02:16:03 +0100 Subject: [PATCH 143/509] ben-nanonote: build linux-kexecboot uImage (disabled by default) Signed-off-by: Andrea Adami --- conf/machine/ben-nanonote.conf | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/conf/machine/ben-nanonote.conf b/conf/machine/ben-nanonote.conf index f9632cf576..fd4aba48f8 100644 --- a/conf/machine/ben-nanonote.conf +++ b/conf/machine/ben-nanonote.conf @@ -6,7 +6,10 @@ TARGET_ARCH = "mipsel" require conf/machine/include/tune-mips32.inc PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-ben-nanonote" -KERNEL_IMAGETYPE = "uImage" + +# With 2.6.37 there is not yet uImage target (pending patches) +#KERNEL_IMAGETYPE = "uImage" +KERNEL_IMAGETYPE = "vmlinux.bin" IMAGE_FSTYPES ?= "jffs2" @@ -21,3 +24,9 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "320" MACHINE_DISPLAY_HEIGHT_PIXELS = "240" LOGO_SIZE = "qvga" +################################## +# build kexecboot kernel while +# making sure rootfs is compatible +################################## + +# require conf/machine/include/initramfs-kexecboot.inc From 4f74f6a07b01ae5ae8a14a7a186f5e39d18960b1 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Tue, 1 Mar 2011 03:05:44 +0100 Subject: [PATCH 144/509] linux-kexecboot: add initial 2.6.37 defconfig for ben-nanonote * needs more test... Signed-off-by: Andrea Adami --- .../ben-nanonote/defconfig | 1339 +++++++++ .../ben-nanonote/jz4740-udc.patch | 2561 +++++++++++++++++ .../ben-nanonote/logo_linux_clut224.tar.gz | Bin 0 -> 8416 bytes .../ben-nanonote/modifier-keys.patch | 604 ++++ recipes/linux/linux-kexecboot_2.6.37.bb | 9 +- 5 files changed, 4512 insertions(+), 1 deletion(-) create mode 100644 recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/defconfig create mode 100644 recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/jz4740-udc.patch create mode 100644 recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/logo_linux_clut224.tar.gz create mode 100644 recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/modifier-keys.patch diff --git a/recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/defconfig b/recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/defconfig new file mode 100644 index 0000000000..361569e464 --- /dev/null +++ b/recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/defconfig @@ -0,0 +1,1339 @@ +# +# Automatically generated make config: don't edit +# Linux/mips 2.6.37 Kernel Configuration +# Tue Mar 1 02:56:10 2011 +# +CONFIG_MIPS=y + +# +# Machine selection +# +# CONFIG_MIPS_ALCHEMY is not set +# CONFIG_AR7 is not set +# CONFIG_BCM47XX is not set +# CONFIG_BCM63XX is not set +# CONFIG_MIPS_COBALT is not set +# CONFIG_MACH_DECSTATION is not set +# CONFIG_MACH_JAZZ is not set +CONFIG_MACH_JZ4740=y +# CONFIG_LASAT is not set +# CONFIG_MACH_LOONGSON is not set +# CONFIG_MIPS_MALTA is not set +# CONFIG_MIPS_SIM is not set +# CONFIG_NEC_MARKEINS is not set +# CONFIG_MACH_VR41XX is not set +# CONFIG_NXP_STB220 is not set +# CONFIG_NXP_STB225 is not set +# CONFIG_PNX8550_JBS is not set +# CONFIG_PNX8550_STB810 is not set +# CONFIG_PMC_MSP is not set +# CONFIG_PMC_YOSEMITE is not set +# CONFIG_POWERTV is not set +# CONFIG_SGI_IP22 is not set +# CONFIG_SGI_IP27 is not set +# CONFIG_SGI_IP28 is not set +# CONFIG_SGI_IP32 is not set +# CONFIG_SIBYTE_CRHINE is not set +# CONFIG_SIBYTE_CARMEL is not set +# CONFIG_SIBYTE_CRHONE is not set +# CONFIG_SIBYTE_RHONE is not set +# CONFIG_SIBYTE_SWARM is not set +# CONFIG_SIBYTE_LITTLESUR is not set +# CONFIG_SIBYTE_SENTOSA is not set +# CONFIG_SIBYTE_BIGSUR is not set +# CONFIG_SNI_RM is not set +# CONFIG_MACH_TX39XX is not set +# CONFIG_MACH_TX49XX is not set +# CONFIG_MIKROTIK_RB532 is not set +# CONFIG_WR_PPMC is not set +# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set +# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set +# CONFIG_ALCHEMY_GPIO_INDIRECT is not set +CONFIG_JZ4740_QI_LB60=y +CONFIG_HAVE_PWM=y +CONFIG_LOONGSON_UART_BASE=y +# CONFIG_LOONGSON_MC146818 is not set +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_ARCH_SUPPORTS_OPROFILE=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_DMA_NONCOHERENT=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_SYS_HAS_EARLY_PRINTK=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_GPIO=y +CONFIG_CPU_LITTLE_ENDIAN=y +CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y +CONFIG_IRQ_CPU=y +CONFIG_MIPS_L1_CACHE_SHIFT=5 + +# +# CPU selection +# +CONFIG_CPU_MIPS32_R1=y +CONFIG_SYS_HAS_CPU_MIPS32_R1=y +CONFIG_CPU_MIPS32=y +CONFIG_CPU_MIPSR1=y +CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y +CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y +CONFIG_HARDWARE_WATCHPOINTS=y + +# +# Kernel type +# +CONFIG_32BIT=y +CONFIG_PAGE_SIZE_4KB=y +# CONFIG_PAGE_SIZE_16KB is not set +# CONFIG_PAGE_SIZE_64KB is not set +CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_CPU_HAS_PREFETCH=y +CONFIG_MIPS_MT_DISABLED=y +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +CONFIG_CPU_HAS_SYNC=y +CONFIG_CPU_SUPPORTS_HIGHMEM=y +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_POPULATES_NODE_MAP=y +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_VIRT_TO_BUS=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_NEED_PER_CPU_KM=y +# CONFIG_NO_HZ is not set +# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +# CONFIG_HZ_48 is not set +CONFIG_HZ_100=y +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +# CONFIG_HZ_1000 is not set +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=100 +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_KEXEC=y +# CONFIG_SECCOMP is not set +# CONFIG_USE_OF is not set +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set +CONFIG_HAVE_GENERIC_HARDIRQS=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_HARDIRQS=y +# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set +# CONFIG_HAVE_SPARSE_IRQ is not set +CONFIG_GENERIC_IRQ_PROBE=y +# CONFIG_GENERIC_PENDING_IRQ is not set +# CONFIG_AUTO_IRQ_AFFINITY is not set +# CONFIG_IRQ_PER_CPU is not set +# CONFIG_HARDIRQS_SW_RESEND is not set + +# +# RCU Subsystem +# +# CONFIG_TREE_PREEMPT_RCU is not set +CONFIG_TINY_RCU=y +# CONFIG_TINY_PREEMPT_RCU is not set +# CONFIG_PREEMPT_RCU is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_CGROUPS is not set +# CONFIG_NAMESPACES is not set +# CONFIG_SYSFS_DEPRECATED is not set +# CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="initramfs.cpio.lzma" +CONFIG_INITRAMFS_ROOT_UID=0 +CONFIG_INITRAMFS_ROOT_GID=0 +CONFIG_RD_GZIP=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_RD_LZO is not set +# CONFIG_INITRAMFS_COMPRESSION_NONE is not set +CONFIG_INITRAMFS_COMPRESSION_GZIP=y +# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_EMBEDDED=y +CONFIG_SYSCTL_SYSCALL=y +# CONFIG_KALLSYMS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +# CONFIG_PCSPKR_PLATFORM is not set +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_PERF_USE_VMALLOC=y + +# +# Kernel Performance Events And Counters +# +# CONFIG_PERF_EVENTS is not set +# CONFIG_PERF_COUNTERS is not set +# CONFIG_VM_EVENT_COUNTERS is not set +# CONFIG_COMPAT_BRK is not set +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_API_DEBUG=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +# CONFIG_MODULES is not set +CONFIG_BLOCK=y +CONFIG_LBDAF=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="deadline" +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +# CONFIG_INLINE_SPIN_UNLOCK is not set +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +# CONFIG_INLINE_READ_UNLOCK is not set +# CONFIG_INLINE_READ_UNLOCK_BH is not set +# CONFIG_INLINE_READ_UNLOCK_IRQ is not set +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +# CONFIG_INLINE_WRITE_UNLOCK is not set +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set +CONFIG_FREEZER=y + +# +# Bus options (PCI, PCMCIA, EISA, ISA, TC) +# +# CONFIG_ARCH_SUPPORTS_MSI is not set +CONFIG_MMU=y +# CONFIG_PCCARD is not set + +# +# Executable file formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_HAVE_AOUT is not set +# CONFIG_BINFMT_MISC is not set +CONFIG_TRAD_SIGNALS=y + +# +# Power management options +# +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND_NVS=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_HIBERNATION is not set +# CONFIG_PM_RUNTIME is not set +CONFIG_PM_OPS=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE_DEMUX is not set +CONFIG_IP_MROUTE=y +CONFIG_IP_MROUTE_MULTIPLE_TABLES=y +# CONFIG_IP_PIMSM_V1 is not set +# CONFIG_IP_PIMSM_V2 is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +# CONFIG_INET_DIAG is not set +CONFIG_TCP_CONG_ADVANCED=y +# CONFIG_TCP_CONG_BIC is not set +# CONFIG_TCP_CONG_CUBIC is not set +CONFIG_TCP_CONG_WESTWOOD=y +# CONFIG_TCP_CONG_HTCP is not set +# CONFIG_TCP_CONG_HSTCP is not set +# CONFIG_TCP_CONG_HYBLA is not set +# CONFIG_TCP_CONG_VEGAS is not set +# CONFIG_TCP_CONG_SCALABLE is not set +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +# CONFIG_TCP_CONG_YEAH is not set +# CONFIG_TCP_CONG_ILLINOIS is not set +CONFIG_DEFAULT_WESTWOOD=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="westwood" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_L2TP is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +# CONFIG_CFG80211 is not set +# CONFIG_LIB80211 is not set + +# +# CFG80211 needs to be enabled for MAC80211 +# + +# +# Some wireless drivers require a rate control algorithm +# +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set +# CONFIG_CAIF is not set +# CONFIG_CEPH_LIB is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_DEVTMPFS is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_FIRMWARE_IN_KERNEL is not set +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_SM_FTL is not set +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND_ECC=y +# CONFIG_MTD_NAND_ECC_SMC is not set +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_SM_COMMON is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_PLATFORM is not set +CONFIG_MTD_NAND_JZ4740=y +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set + +# +# UBI debugging options +# +# CONFIG_MTD_UBI_DEBUG is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +# CONFIG_BLK_DEV_LOOP is not set + +# +# DRBD disabled because PROC_FS, INET or CONNECTOR not selected +# +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_BLK_DEV_HD is not set +# CONFIG_BLK_DEV_RBD is not set +CONFIG_MISC_DEVICES=y +# CONFIG_AD525X_DPOT is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_TI_DAC7512 is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_IWMC3200TOP is not set + +# +# Texas Instruments shared transport line discipline +# +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=y +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_DMA is not set +# CONFIG_SCSI_NETLINK is not set +# CONFIG_ATA is not set +# CONFIG_MD is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +# CONFIG_MII is not set +# CONFIG_PHYLIB is not set +# CONFIG_NET_ETHERNET is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set +CONFIG_WLAN=y +# CONFIG_HOSTAP is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# +# CONFIG_WAN is not set + +# +# CAIF transport drivers +# +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +CONFIG_ISDN=y +# CONFIG_ISDN_I4L is not set +# CONFIG_ISDN_CAPI is not set +# CONFIG_ISDN_DRV_GIGASET is not set +# CONFIG_MISDN is not set +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set +# CONFIG_INPUT_SPARSEKMAP is not set + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +CONFIG_KEYBOARD_GPIO=y +# CONFIG_KEYBOARD_GPIO_POLLED is not set +CONFIG_KEYBOARD_MATRIX=y +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_AD714X is not set +# CONFIG_INPUT_ATI_REMOTE is not set +# CONFIG_INPUT_ATI_REMOTE2 is not set +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_POWERMATE is not set +# CONFIG_INPUT_YEALINK is not set +# CONFIG_INPUT_CM109 is not set +# CONFIG_INPUT_UINPUT is not set +CONFIG_INPUT_PWM_BEEPER=y +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +# CONFIG_INPUT_ADXL34X is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +# CONFIG_DEVKMEM is not set +# CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_N_GSM is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX3107 is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_TIMBERDALE is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=2 +# CONFIG_TTY_PRINTK is not set +# CONFIG_IPMI_HANDLER is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +# CONFIG_RAMOOPS is not set +# CONFIG_I2C is not set +CONFIG_SPI=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=y +CONFIG_SPI_GPIO=y +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set + +# +# PPS support +# +# CONFIG_PPS is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_GPIO_SYSFS is not set + +# +# Memory mapped GPIO expanders: +# +# CONFIG_GPIO_BASIC_MMIO is not set +# CONFIG_GPIO_IT8761E is not set +# CONFIG_GPIO_VX855 is not set + +# +# I2C GPIO expanders: +# + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_74X164 is not set + +# +# AC97 GPIO expanders: +# + +# +# MODULbus GPIO expanders: +# +# CONFIG_W1 is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +# CONFIG_TEST_POWER is not set +CONFIG_BATTERY_JZ4740=y +# CONFIG_HWMON is not set +# CONFIG_THERMAL is not set +# CONFIG_WATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set +CONFIG_MFD_SUPPORT=y +CONFIG_MFD_CORE=y +# CONFIG_MFD_SM501 is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_WM831X_SPI is not set +# CONFIG_MFD_MC13XXX is not set +# CONFIG_ABX500_CORE is not set +# CONFIG_EZX_PCAP is not set +CONFIG_MFD_JZ4740_ADC=y +# CONFIG_REGULATOR is not set +# CONFIG_MEDIA_SUPPORT is not set + +# +# Graphics support +# +# CONFIG_DRM is not set +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +# CONFIG_FB_CFB_FILLRECT is not set +# CONFIG_FB_CFB_COPYAREA is not set +# CONFIG_FB_CFB_IMAGEBLIT is not set +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_TMIO is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +CONFIG_FB_JZ4740=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=y +# CONFIG_LCD_L4F00242T03 is not set +# CONFIG_LCD_LMS283GF05 is not set +# CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_TDO24M is not set +# CONFIG_LCD_VGG2432A4 is not set +# CONFIG_LCD_PLATFORM is not set +# CONFIG_BACKLIGHT_CLASS_DEVICE is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +CONFIG_FONT_ACORN_8x8=y +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y +CONFIG_SOUND=y +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_JACK=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 is not set +# CONFIG_SND_VERBOSE_PROCFS is not set +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +# CONFIG_SND_RAWMIDI_SEQ is not set +# CONFIG_SND_OPL3_LIB_SEQ is not set +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +# CONFIG_SND_EMU10K1_SEQ is not set +# CONFIG_SND_DRIVERS is not set +# CONFIG_SND_SPI is not set +# CONFIG_SND_MIPS is not set +CONFIG_SND_SOC=y +CONFIG_SND_JZ4740_SOC=y +CONFIG_SND_JZ4740_SOC_I2S=y +CONFIG_SND_JZ4740_SOC_QI_LB60=y +CONFIG_SND_SOC_I2C_AND_SPI=y +# CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_JZ4740_CODEC=y +# CONFIG_SOUND_PRIME is not set +# CONFIG_HID_SUPPORT is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_SELECTED=y +CONFIG_USB_GADGET_R8A66597=y +CONFIG_USB_R8A66597=y +# CONFIG_USB_GADGET_M66592 is not set +CONFIG_USB_GADGET_DUALSPEED=y +# CONFIG_USB_ZERO is not set +# CONFIG_USB_AUDIO is not set +CONFIG_USB_ETH=y +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_ETH_EEM is not set +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FUNCTIONFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_MASS_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +# CONFIG_USB_CDC_COMPOSITE is not set +# CONFIG_USB_G_MULTI is not set +# CONFIG_USB_G_HID is not set +# CONFIG_USB_G_DBGP is not set + +# +# OTG and related infrastructure +# +# CONFIG_USB_GPIO_VBUS is not set +# CONFIG_NOP_USB_XCEIV is not set +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_UNSAFE_RESUME=y + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_MINORS=8 +# CONFIG_MMC_BLOCK_BOUNCE is not set +# CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +# CONFIG_MMC_SPI is not set +CONFIG_MMC_JZ4740=y +# CONFIG_MEMSTICK is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_ACCESSIBILITY is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set +# CONFIG_RTC_DRV_PCF2123 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_MSM6242 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_RP5C01 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_JZ4740=y +# CONFIG_DMADEVICES is not set +# CONFIG_AUXDISPLAY is not set +# CONFIG_UIO is not set +# CONFIG_STAGING is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +# CONFIG_EXT3_FS_XATTR is not set +# CONFIG_EXT4_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_FANOTIFY is not set +# CONFIG_QUOTA is not set +# CONFIG_QUOTACTL is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +# CONFIG_MSDOS_FS is not set +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +# CONFIG_PROC_PAGE_MONITOR is not set +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_SUMMARY=y +# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +# CONFIG_JFFS2_ZLIB is not set +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +# CONFIG_JFFS2_CMODE_FAVOURLZO is not set +CONFIG_UBIFS_FS=y +# CONFIG_UBIFS_FS_XATTR is not set +CONFIG_UBIFS_FS_ADVANCED_COMPR=y +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set +# CONFIG_LOGFS is not set +# CONFIG_CRAMFS is not set +# CONFIG_SQUASHFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +# CONFIG_NETWORK_FILESYSTEMS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=y +CONFIG_NLS_CODEPAGE_775=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_CODEPAGE_852=y +CONFIG_NLS_CODEPAGE_855=y +CONFIG_NLS_CODEPAGE_857=y +CONFIG_NLS_CODEPAGE_860=y +CONFIG_NLS_CODEPAGE_861=y +CONFIG_NLS_CODEPAGE_862=y +CONFIG_NLS_CODEPAGE_863=y +CONFIG_NLS_CODEPAGE_864=y +CONFIG_NLS_CODEPAGE_865=y +CONFIG_NLS_CODEPAGE_866=y +CONFIG_NLS_CODEPAGE_869=y +CONFIG_NLS_CODEPAGE_936=y +CONFIG_NLS_CODEPAGE_950=y +CONFIG_NLS_CODEPAGE_932=y +CONFIG_NLS_CODEPAGE_949=y +CONFIG_NLS_CODEPAGE_874=y +CONFIG_NLS_ISO8859_8=y +CONFIG_NLS_CODEPAGE_1250=y +CONFIG_NLS_CODEPAGE_1251=y +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=y +CONFIG_NLS_ISO8859_3=y +CONFIG_NLS_ISO8859_4=y +CONFIG_NLS_ISO8859_5=y +CONFIG_NLS_ISO8859_6=y +CONFIG_NLS_ISO8859_7=y +CONFIG_NLS_ISO8859_9=y +CONFIG_NLS_ISO8859_13=y +CONFIG_NLS_ISO8859_14=y +CONFIG_NLS_ISO8859_15=y +CONFIG_NLS_KOI8_R=y +CONFIG_NLS_KOI8_U=y +CONFIG_NLS_UTF8=y +# CONFIG_DLM is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_PRINTK_TIME=y +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +# CONFIG_MAGIC_SYSRQ is not set +CONFIG_STRIP_ASM_SYMS=y +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_HARDLOCKUP_DETECTOR is not set +CONFIG_BKL=y +# CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_LKDTM is not set +CONFIG_SYSCTL_SYSCALL_CHECK=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACING_SUPPORT=y +# CONFIG_FTRACE is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_ATOMIC64_SELFTEST is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_EARLY_PRINTK=y +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="" +# CONFIG_CMDLINE_OVERRIDE is not set +# CONFIG_SPINLOCK_TEST is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY_DMESG_RESTRICT is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_PCOMP=y +CONFIG_CRYPTO_PCOMP2=y +# CONFIG_CRYPTO_MANAGER is not set +# CONFIG_CRYPTO_MANAGER2 is not set +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC is not set + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +# CONFIG_CRYPTO_CBC is not set +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +# CONFIG_CRYPTO_ECB is not set +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_GHASH is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_ZLIB=y +CONFIG_CRYPTO_LZO=y + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_HW=y +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +# CONFIG_CRC_CCITT is not set +CONFIG_CRC16=y +# CONFIG_CRC_T10DIF is not set +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_DECOMPRESS_GZIP=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y +CONFIG_GENERIC_ATOMIC64=y diff --git a/recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/jz4740-udc.patch b/recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/jz4740-udc.patch new file mode 100644 index 0000000000..67dca3381b --- /dev/null +++ b/recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/jz4740-udc.patch @@ -0,0 +1,2561 @@ +diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig +index 607d0db..35d5fbc 100644 +--- a/drivers/usb/gadget/Kconfig ++++ b/drivers/usb/gadget/Kconfig +@@ -121,11 +121,25 @@ choice + # + # Integrated controllers + # ++config USB_GADGET_JZ4740 ++ boolean "JZ4740 UDC" ++ depends on MACH_JZ4740 ++ select USB_GADGET_SELECTED ++ select USB_GADGET_DUALSPEED ++ help ++ Select this to support the Ingenic JZ4740 processor ++ high speed USB device controller. ++ ++config USB_JZ4740 ++ tristate ++ depends on USB_GADGET_JZ4740 ++ default USB_GADGET + + config USB_GADGET_AT91 + boolean "Atmel AT91 USB Device Port" + depends on ARCH_AT91 && !ARCH_AT91SAM9RL && !ARCH_AT91CAP9 && !ARCH_AT91SAM9G45 + select USB_GADGET_SELECTED ++ + help + Many Atmel AT91 processors (such as the AT91RM2000) have a + full speed USB Device Port with support for five configurable +diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile +index 5780db4..c148025 100644 +--- a/drivers/usb/gadget/Makefile ++++ b/drivers/usb/gadget/Makefile +@@ -24,6 +24,7 @@ obj-$(CONFIG_USB_FSL_QE) += fsl_qe_udc.o + obj-$(CONFIG_USB_CI13XXX) += ci13xxx_udc.o + obj-$(CONFIG_USB_S3C_HSOTG) += s3c-hsotg.o + obj-$(CONFIG_USB_LANGWELL) += langwell_udc.o ++obj-$(CONFIG_USB_JZ4740) += jz4740_udc.o + + # + # USB gadget drivers +diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h +index e511fec..b2ec5fb 100644 +--- a/drivers/usb/gadget/gadget_chips.h ++++ b/drivers/usb/gadget/gadget_chips.h +@@ -15,6 +15,12 @@ + #ifndef __GADGET_CHIPS_H + #define __GADGET_CHIPS_H + ++#ifdef CONFIG_USB_GADGET_JZ4740 ++#define gadget_is_jz4740(g) !strcmp("ingenic_hsusb", (g)->name) ++#else ++#define gadget_is_jz4740(g) 0 ++#endif ++ + #ifdef CONFIG_USB_GADGET_NET2280 + #define gadget_is_net2280(g) !strcmp("net2280", (g)->name) + #else +@@ -200,6 +206,9 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget) + return 0x25; + else if (gadget_is_s3c_hsotg(gadget)) + return 0x26; ++ else if (gadget_is_jz4740(gadget)) ++ return 0x27; ++ + return -ENOENT; + } + +diff --git a/drivers/usb/gadget/jz4740_udc.c b/drivers/usb/gadget/jz4740_udc.c +new file mode 100644 +index 0000000..68e511a +--- /dev/null ++++ b/drivers/usb/gadget/jz4740_udc.c +@@ -0,0 +1,2377 @@ ++/* ++ * linux/drivers/usb/gadget/jz4740_udc.c ++ * ++ * Ingenic JZ4740 on-chip high speed USB device controller ++ * ++ * Copyright (C) 2006 - 2008 Ingenic Semiconductor Inc. ++ * Author: ++ * ++ * 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 device has ep0, two bulk-in/interrupt-in endpoints, and one bulk-out endpoint. ++ * ++ * - Endpoint numbering is fixed: ep0, ep1in-int, ep2in-bulk, ep1out-bulk. ++ * - DMA works with bulk-in (channel 1) and bulk-out (channel 2) endpoints. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include "jz4740_udc.h" ++ ++#define JZ_REG_UDC_FADDR 0x00 /* Function Address 8-bit */ ++#define JZ_REG_UDC_POWER 0x01 /* Power Management 8-bit */ ++#define JZ_REG_UDC_INTRIN 0x02 /* Interrupt IN 16-bit */ ++#define JZ_REG_UDC_INTROUT 0x04 /* Interrupt OUT 16-bit */ ++#define JZ_REG_UDC_INTRINE 0x06 /* Intr IN enable 16-bit */ ++#define JZ_REG_UDC_INTROUTE 0x08 /* Intr OUT enable 16-bit */ ++#define JZ_REG_UDC_INTRUSB 0x0a /* Interrupt USB 8-bit */ ++#define JZ_REG_UDC_INTRUSBE 0x0b /* Interrupt USB Enable 8-bit */ ++#define JZ_REG_UDC_FRAME 0x0c /* Frame number 16-bit */ ++#define JZ_REG_UDC_INDEX 0x0e /* Index register 8-bit */ ++#define JZ_REG_UDC_TESTMODE 0x0f /* USB test mode 8-bit */ ++ ++#define JZ_REG_UDC_CSR0 0x12 /* EP0 CSR 8-bit */ ++#define JZ_REG_UDC_INMAXP 0x10 /* EP1-2 IN Max Pkt Size 16-bit */ ++#define JZ_REG_UDC_INCSR 0x12 /* EP1-2 IN CSR LSB 8/16bit */ ++#define JZ_REG_UDC_INCSRH 0x13 /* EP1-2 IN CSR MSB 8-bit */ ++#define JZ_REG_UDC_OUTMAXP 0x14 /* EP1 OUT Max Pkt Size 16-bit */ ++#define JZ_REG_UDC_OUTCSR 0x16 /* EP1 OUT CSR LSB 8/16bit */ ++#define JZ_REG_UDC_OUTCSRH 0x17 /* EP1 OUT CSR MSB 8-bit */ ++#define JZ_REG_UDC_OUTCOUNT 0x18 /* bytes in EP0/1 OUT FIFO 16-bit */ ++ ++#define JZ_REG_UDC_EP_FIFO(x) (4 * (x) + 0x20) ++ ++#define JZ_REG_UDC_EPINFO 0x78 /* Endpoint information */ ++#define JZ_REG_UDC_RAMINFO 0x79 /* RAM information */ ++ ++#define JZ_REG_UDC_INTR 0x200 /* DMA pending interrupts */ ++#define JZ_REG_UDC_CNTL1 0x204 /* DMA channel 1 control */ ++#define JZ_REG_UDC_ADDR1 0x208 /* DMA channel 1 AHB memory addr */ ++#define JZ_REG_UDC_COUNT1 0x20c /* DMA channel 1 byte count */ ++#define JZ_REG_UDC_CNTL2 0x214 /* DMA channel 2 control */ ++#define JZ_REG_UDC_ADDR2 0x218 /* DMA channel 2 AHB memory addr */ ++#define JZ_REG_UDC_COUNT2 0x21c /* DMA channel 2 byte count */ ++ ++/* Power register bit masks */ ++#define USB_POWER_SUSPENDM 0x01 ++#define USB_POWER_RESUME 0x04 ++#define USB_POWER_HSMODE 0x10 ++#define USB_POWER_HSENAB 0x20 ++#define USB_POWER_SOFTCONN 0x40 ++ ++/* Interrupt register bit masks */ ++#define USB_INTR_SUSPEND 0x01 ++#define USB_INTR_RESUME 0x02 ++#define USB_INTR_RESET 0x04 ++ ++#define USB_INTR_EP0 0x0001 ++#define USB_INTR_INEP1 0x0002 ++#define USB_INTR_INEP2 0x0004 ++#define USB_INTR_OUTEP1 0x0002 ++ ++/* CSR0 bit masks */ ++#define USB_CSR0_OUTPKTRDY 0x01 ++#define USB_CSR0_INPKTRDY 0x02 ++#define USB_CSR0_SENTSTALL 0x04 ++#define USB_CSR0_DATAEND 0x08 ++#define USB_CSR0_SETUPEND 0x10 ++#define USB_CSR0_SENDSTALL 0x20 ++#define USB_CSR0_SVDOUTPKTRDY 0x40 ++#define USB_CSR0_SVDSETUPEND 0x80 ++ ++/* Endpoint CSR register bits */ ++#define USB_INCSRH_AUTOSET 0x80 ++#define USB_INCSRH_ISO 0x40 ++#define USB_INCSRH_MODE 0x20 ++#define USB_INCSRH_DMAREQENAB 0x10 ++#define USB_INCSRH_DMAREQMODE 0x04 ++#define USB_INCSR_CDT 0x40 ++#define USB_INCSR_SENTSTALL 0x20 ++#define USB_INCSR_SENDSTALL 0x10 ++#define USB_INCSR_FF 0x08 ++#define USB_INCSR_UNDERRUN 0x04 ++#define USB_INCSR_FFNOTEMPT 0x02 ++#define USB_INCSR_INPKTRDY 0x01 ++#define USB_OUTCSRH_AUTOCLR 0x80 ++#define USB_OUTCSRH_ISO 0x40 ++#define USB_OUTCSRH_DMAREQENAB 0x20 ++#define USB_OUTCSRH_DNYT 0x10 ++#define USB_OUTCSRH_DMAREQMODE 0x08 ++#define USB_OUTCSR_CDT 0x80 ++#define USB_OUTCSR_SENTSTALL 0x40 ++#define USB_OUTCSR_SENDSTALL 0x20 ++#define USB_OUTCSR_FF 0x10 ++#define USB_OUTCSR_DATAERR 0x08 ++#define USB_OUTCSR_OVERRUN 0x04 ++#define USB_OUTCSR_FFFULL 0x02 ++#define USB_OUTCSR_OUTPKTRDY 0x01 ++ ++/* DMA control bits */ ++#define USB_CNTL_ENA 0x01 ++#define USB_CNTL_DIR_IN 0x02 ++#define USB_CNTL_MODE_1 0x04 ++#define USB_CNTL_INTR_EN 0x08 ++#define USB_CNTL_EP(n) ((n) << 4) ++#define USB_CNTL_BURST_0 (0 << 9) ++#define USB_CNTL_BURST_4 (1 << 9) ++#define USB_CNTL_BURST_8 (2 << 9) ++#define USB_CNTL_BURST_16 (3 << 9) ++ ++ ++#ifndef DEBUG ++# define DEBUG(fmt,args...) do {} while(0) ++#endif ++#ifndef DEBUG_EP0 ++# define NO_STATES ++# define DEBUG_EP0(fmt,args...) do {} while(0) ++#endif ++#ifndef DEBUG_SETUP ++# define DEBUG_SETUP(fmt,args...) do {} while(0) ++#endif ++ ++static unsigned int use_dma = 0; /* 1: use DMA, 0: use PIO */ ++ ++module_param(use_dma, int, 0); ++MODULE_PARM_DESC(use_dma, "DMA mode enable flag"); ++ ++static struct jz4740_udc jz4740_udc_controller; ++ ++/* ++ * Local declarations. ++ */ ++static void jz4740_ep0_kick(struct jz4740_udc *dev, struct jz4740_ep *ep); ++static void jz4740_handle_ep0(struct jz4740_udc *dev, uint32_t intr); ++ ++static void done(struct jz4740_ep *ep, struct jz4740_request *req, ++ int status); ++static void pio_irq_enable(struct jz4740_ep *ep); ++static void pio_irq_disable(struct jz4740_ep *ep); ++static void stop_activity(struct jz4740_udc *dev, ++ struct usb_gadget_driver *driver); ++static void nuke(struct jz4740_ep *ep, int status); ++static void flush(struct jz4740_ep *ep); ++static void udc_set_address(struct jz4740_udc *dev, unsigned char address); ++ ++/*-------------------------------------------------------------------------*/ ++ ++/* inline functions of register read/write/set/clear */ ++ ++static inline uint8_t usb_readb(struct jz4740_udc *udc, size_t reg) ++{ ++ return readb(udc->base + reg); ++} ++ ++static inline uint16_t usb_readw(struct jz4740_udc *udc, size_t reg) ++{ ++ return readw(udc->base + reg); ++} ++ ++static inline uint32_t usb_readl(struct jz4740_udc *udc, size_t reg) ++{ ++ return readl(udc->base + reg); ++} ++ ++static inline void usb_writeb(struct jz4740_udc *udc, size_t reg, uint8_t val) ++{ ++ writeb(val, udc->base + reg); ++} ++ ++static inline void usb_writew(struct jz4740_udc *udc, size_t reg, uint16_t val) ++{ ++ writew(val, udc->base + reg); ++} ++ ++static inline void usb_writel(struct jz4740_udc *udc, size_t reg, uint32_t val) ++{ ++ writel(val, udc->base + reg); ++} ++ ++static inline void usb_setb(struct jz4740_udc *udc, size_t reg, uint8_t mask) ++{ ++ usb_writeb(udc, reg, usb_readb(udc, reg) | mask); ++} ++ ++static inline void usb_setw(struct jz4740_udc *udc, size_t reg, uint8_t mask) ++{ ++ usb_writew(udc, reg, usb_readw(udc, reg) | mask); ++} ++ ++static inline void usb_clearb(struct jz4740_udc *udc, size_t reg, uint8_t mask) ++{ ++ usb_writeb(udc, reg, usb_readb(udc, reg) & ~mask); ++} ++ ++static inline void usb_clearw(struct jz4740_udc *udc, size_t reg, uint16_t mask) ++{ ++ usb_writew(udc, reg, usb_readw(udc, reg) & ~mask); ++} ++ ++/*-------------------------------------------------------------------------*/ ++ ++static inline void jz_udc_set_index(struct jz4740_udc *udc, uint8_t index) ++{ ++ usb_writeb(udc, JZ_REG_UDC_INDEX, index); ++} ++ ++static inline void jz_udc_select_ep(struct jz4740_ep *ep) ++{ ++ jz_udc_set_index(ep->dev, ep_index(ep)); ++} ++ ++static inline int write_packet(struct jz4740_ep *ep, ++ struct jz4740_request *req, unsigned int count) ++{ ++ uint8_t *buf; ++ unsigned int length, nlong, nbyte; ++ void __iomem *fifo = ep->dev->base + ep->fifo; ++ ++ DEBUG("%s:%s[%d]\n", __FILE__, __func__, __LINE__); ++ ++ buf = req->req.buf + req->req.actual; ++ prefetch(buf); ++ ++ length = req->req.length - req->req.actual; ++ if (length > count) ++ length = count; ++ req->req.actual += length; ++ ++ DEBUG("Write %d (count %d), fifo %x\n", length, count, ep->fifo); ++ ++ nlong = length >> 2; ++ nbyte = length & 0x3; ++ while (nlong--) { ++ writel(*((uint32_t *)buf), fifo); ++ buf += 4; ++ } ++ while (nbyte--) ++ writeb(*buf++, fifo); ++ ++ return length; ++} ++ ++static int read_packet(struct jz4740_ep *ep, ++ struct jz4740_request *req, unsigned int count) ++{ ++ uint8_t *buf; ++ unsigned int length, nlong, nbyte; ++ void __iomem *fifo = ep->dev->base + ep->fifo; ++ DEBUG("%s:%s[%d]\n", __FILE__, __func__, __LINE__); ++ ++ buf = req->req.buf + req->req.actual; ++ prefetchw(buf); ++ ++ length = req->req.length - req->req.actual; ++ if (length > count) ++ length = count; ++ req->req.actual += length; ++ ++ DEBUG("Read %d, fifo %x\n", length, ep->fifo); ++ nlong = length >> 2; ++ nbyte = length & 0x3; ++ while (nlong--) { ++ *((uint32_t *)buf) = readl(fifo); ++ buf += 4; ++ } ++ while (nbyte--) ++ *buf++ = readb(fifo); ++ ++ return length; ++} ++ ++/*-------------------------------------------------------------------------*/ ++ ++/* ++ * udc_disable - disable USB device controller ++ */ ++static void udc_disable(struct jz4740_udc *dev) ++{ ++ DEBUG("%s:%s[%d]\n", __FILE__, __func__, __LINE__); ++ ++ udc_set_address(dev, 0); ++ ++ /* Disable interrupts */ ++ usb_writew(dev, JZ_REG_UDC_INTRINE, 0); ++ usb_writew(dev, JZ_REG_UDC_INTROUTE, 0); ++ usb_writeb(dev, JZ_REG_UDC_INTRUSBE, 0); ++ ++ /* Disable DMA */ ++ usb_writel(dev, JZ_REG_UDC_CNTL1, 0); ++ usb_writel(dev, JZ_REG_UDC_CNTL2, 0); ++ ++ /* Disconnect from usb */ ++ usb_clearb(dev, JZ_REG_UDC_POWER, USB_POWER_SOFTCONN); ++ ++ /* Disable the USB PHY */ ++ clk_disable(dev->clk); ++ ++ dev->ep0state = WAIT_FOR_SETUP; ++ dev->gadget.speed = USB_SPEED_UNKNOWN; ++ ++ return; ++} ++ ++/* ++ * udc_reinit - initialize software state ++ */ ++static void udc_reinit(struct jz4740_udc *dev) ++{ ++ int i; ++ DEBUG("%s:%s[%d]\n", __FILE__, __func__, __LINE__); ++ ++ /* device/ep0 records init */ ++ INIT_LIST_HEAD(&dev->gadget.ep_list); ++ INIT_LIST_HEAD(&dev->gadget.ep0->ep_list); ++ dev->ep0state = WAIT_FOR_SETUP; ++ ++ for (i = 0; i < UDC_MAX_ENDPOINTS; i++) { ++ struct jz4740_ep *ep = &dev->ep[i]; ++ ++ if (i != 0) ++ list_add_tail(&ep->ep.ep_list, &dev->gadget.ep_list); ++ ++ INIT_LIST_HEAD(&ep->queue); ++ ep->desc = 0; ++ ep->stopped = 0; ++ } ++} ++ ++/* until it's enabled, this UDC should be completely invisible ++ * to any USB host. ++ */ ++static void udc_enable(struct jz4740_udc *dev) ++{ ++ int i; ++ DEBUG("%s:%s[%d]\n", __FILE__, __func__, __LINE__); ++ ++ /* UDC state is incorrect - Added by River */ ++ if (dev->state != UDC_STATE_ENABLE) { ++ return; ++ } ++ ++ dev->gadget.speed = USB_SPEED_UNKNOWN; ++ ++ /* Flush FIFO for each */ ++ for (i = 0; i < UDC_MAX_ENDPOINTS; i++) { ++ struct jz4740_ep *ep = &dev->ep[i]; ++ ++ jz_udc_set_index(dev, ep_index(ep)); ++ flush(ep); ++ } ++ ++ /* Set this bit to allow the UDC entering low-power mode when ++ * there are no actions on the USB bus. ++ * UDC still works during this bit was set. ++ */ ++ jz4740_clock_udc_enable_auto_suspend(); ++ ++ /* Enable the USB PHY */ ++ clk_enable(dev->clk); ++ ++ /* Disable interrupts */ ++/* usb_writew(dev, JZ_REG_UDC_INTRINE, 0); ++ usb_writew(dev, JZ_REG_UDC_INTROUTE, 0); ++ usb_writeb(dev, JZ_REG_UDC_INTRUSBE, 0);*/ ++ ++ /* Enable interrupts */ ++ usb_setw(dev, JZ_REG_UDC_INTRINE, USB_INTR_EP0); ++ usb_setb(dev, JZ_REG_UDC_INTRUSBE, USB_INTR_RESET); ++ /* Don't enable rest of the interrupts */ ++ /* usb_setw(dev, JZ_REG_UDC_INTRINE, USB_INTR_INEP1 | USB_INTR_INEP2); ++ usb_setw(dev, JZ_REG_UDC_INTROUTE, USB_INTR_OUTEP1); */ ++ ++ /* Enable SUSPEND */ ++ /* usb_setb(dev, JZ_REG_UDC_POWER, USB_POWER_SUSPENDM); */ ++ ++ /* Enable HS Mode */ ++ usb_setb(dev, JZ_REG_UDC_POWER, USB_POWER_HSENAB); ++ ++ /* Let host detect UDC: ++ * Software must write a 1 to the PMR:USB_POWER_SOFTCONN bit to turn this ++ * transistor on and pull the USBDP pin HIGH. ++ */ ++ usb_setb(dev, JZ_REG_UDC_POWER, USB_POWER_SOFTCONN); ++ ++ return; ++} ++ ++/*-------------------------------------------------------------------------*/ ++ ++/* keeping it simple: ++ * - one bus driver, initted first; ++ * - one function driver, initted second ++ */ ++ ++/* ++ * Register entry point for the peripheral controller driver. ++ */ ++ ++int usb_gadget_register_driver(struct usb_gadget_driver *driver) ++{ ++ struct jz4740_udc *dev = &jz4740_udc_controller; ++ int retval; ++ ++ if (!driver || !driver->bind) ++ return -EINVAL; ++ ++ if (!dev) ++ return -ENODEV; ++ ++ if (dev->driver) ++ return -EBUSY; ++ ++ /* hook up the driver */ ++ dev->driver = driver; ++ dev->gadget.dev.driver = &driver->driver; ++ ++ retval = driver->bind(&dev->gadget); ++ if (retval) { ++ DEBUG("%s: bind to driver %s --> error %d\n", dev->gadget.name, ++ driver->driver.name, retval); ++ dev->driver = 0; ++ return retval; ++ } ++ ++ /* then enable host detection and ep0; and we're ready ++ * for set_configuration as well as eventual disconnect. ++ */ ++ udc_enable(dev); ++ ++ DEBUG("%s: registered gadget driver '%s'\n", dev->gadget.name, ++ driver->driver.name); ++ ++ return 0; ++} ++EXPORT_SYMBOL(usb_gadget_register_driver); ++ ++static void stop_activity(struct jz4740_udc *dev, ++ struct usb_gadget_driver *driver) ++{ ++ int i; ++ ++ DEBUG("%s:%s[%d]\n", __FILE__, __func__, __LINE__); ++ ++ /* don't disconnect drivers more than once */ ++ if (dev->gadget.speed == USB_SPEED_UNKNOWN) ++ driver = 0; ++ dev->gadget.speed = USB_SPEED_UNKNOWN; ++ ++ /* prevent new request submissions, kill any outstanding requests */ ++ for (i = 0; i < UDC_MAX_ENDPOINTS; i++) { ++ struct jz4740_ep *ep = &dev->ep[i]; ++ ++ ep->stopped = 1; ++ ++ jz_udc_set_index(dev, ep_index(ep)); ++ nuke(ep, -ESHUTDOWN); ++ } ++ ++ /* report disconnect; the driver is already quiesced */ ++ if (driver) { ++ spin_unlock(&dev->lock); ++ driver->disconnect(&dev->gadget); ++ spin_lock(&dev->lock); ++ } ++ ++ /* re-init driver-visible data structures */ ++ udc_reinit(dev); ++} ++ ++ ++/* ++ * Unregister entry point for the peripheral controller driver. ++ */ ++int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) ++{ ++ struct jz4740_udc *dev = &jz4740_udc_controller; ++ unsigned long flags; ++ DEBUG("%s:%s[%d]\n", __FILE__, __func__, __LINE__); ++ ++ if (!dev) ++ return -ENODEV; ++ if (!driver || driver != dev->driver) ++ return -EINVAL; ++ if (!driver->unbind) ++ return -EBUSY; ++ ++ spin_lock_irqsave(&dev->lock, flags); ++ dev->driver = 0; ++ stop_activity(dev, driver); ++ spin_unlock_irqrestore(&dev->lock, flags); ++ ++ driver->unbind(&dev->gadget); ++ ++ udc_disable(dev); ++ ++ DEBUG("unregistered driver '%s'\n", driver->driver.name); ++ ++ return 0; ++} ++ ++EXPORT_SYMBOL(usb_gadget_unregister_driver); ++ ++/*-------------------------------------------------------------------------*/ ++ ++/* ++ * Starting DMA using mode 1 ++ */ ++static void kick_dma(struct jz4740_ep *ep, struct jz4740_request *req) ++{ ++ struct jz4740_udc *dev = ep->dev; ++ uint32_t count = req->req.length; ++ uint32_t physaddr = virt_to_phys((void *)req->req.buf); ++ ++ DEBUG("%s:%s[%d]\n", __FILE__, __func__, __LINE__); ++ ++ jz_udc_select_ep(ep); ++ ++ if (ep_is_in(ep)) { /* Bulk-IN transfer using DMA channel 1 */ ++ ep->reg_addr = JZ_REG_UDC_ADDR1; ++ ++ dma_cache_wback_inv((unsigned long)req->req.buf, count); ++ ++ pio_irq_enable(ep); ++ ++ usb_writeb(dev, JZ_REG_UDC_INCSRH, ++ USB_INCSRH_DMAREQENAB | USB_INCSRH_AUTOSET | USB_INCSRH_DMAREQMODE); ++ ++ usb_writel(dev, JZ_REG_UDC_ADDR1, physaddr); ++ usb_writel(dev, JZ_REG_UDC_COUNT1, count); ++ usb_writel(dev, JZ_REG_UDC_CNTL1, USB_CNTL_ENA | USB_CNTL_DIR_IN | USB_CNTL_MODE_1 | ++ USB_CNTL_INTR_EN | USB_CNTL_BURST_16 | USB_CNTL_EP(ep_index(ep))); ++ } ++ else { /* Bulk-OUT transfer using DMA channel 2 */ ++ ep->reg_addr = JZ_REG_UDC_ADDR2; ++ ++ dma_cache_wback_inv((unsigned long)req->req.buf, count); ++ ++ pio_irq_enable(ep); ++ ++ usb_setb(dev, JZ_REG_UDC_OUTCSRH, ++ USB_OUTCSRH_DMAREQENAB | USB_OUTCSRH_AUTOCLR | USB_OUTCSRH_DMAREQMODE); ++ ++ usb_writel(dev, JZ_REG_UDC_ADDR2, physaddr); ++ usb_writel(dev, JZ_REG_UDC_COUNT2, count); ++ usb_writel(dev, JZ_REG_UDC_CNTL2, USB_CNTL_ENA | USB_CNTL_MODE_1 | ++ USB_CNTL_INTR_EN | USB_CNTL_BURST_16 | USB_CNTL_EP(ep_index(ep))); ++ } ++} ++ ++/*-------------------------------------------------------------------------*/ ++ ++/** Write request to FIFO (max write == maxp size) ++ * Return: 0 = still running, 1 = completed, negative = errno ++ * NOTE: INDEX register must be set for EP ++ */ ++static int write_fifo(struct jz4740_ep *ep, struct jz4740_request *req) ++{ ++ struct jz4740_udc *dev = ep->dev; ++ uint32_t max, csr; ++ uint32_t physaddr = virt_to_phys((void *)req->req.buf); ++ ++ DEBUG("%s:%s[%d]\n", __FILE__, __func__, __LINE__); ++ max = le16_to_cpu(ep->desc->wMaxPacketSize); ++ ++ if (use_dma) { ++ uint32_t dma_count; ++ ++ /* DMA interrupt generated due to the last packet loaded into the FIFO */ ++ ++ dma_count = usb_readl(dev, ep->reg_addr) - physaddr; ++ req->req.actual += dma_count; ++ ++ if (dma_count % max) { ++ /* If the last packet is less than MAXP, set INPKTRDY manually */ ++ usb_setb(dev, ep->csr, USB_INCSR_INPKTRDY); ++ } ++ ++ done(ep, req, 0); ++ if (list_empty(&ep->queue)) { ++ pio_irq_disable(ep); ++ return 1; ++ } ++ else { ++ /* advance the request queue */ ++ req = list_entry(ep->queue.next, struct jz4740_request, queue); ++ kick_dma(ep, req); ++ return 0; ++ } ++ } ++ ++ /* ++ * PIO mode handling starts here ... ++ */ ++ ++ csr = usb_readb(dev, ep->csr); ++ ++ if (!(csr & USB_INCSR_FFNOTEMPT)) { ++ unsigned count; ++ int is_last, is_short; ++ ++ count = write_packet(ep, req, max); ++ usb_setb(dev, ep->csr, USB_INCSR_INPKTRDY); ++ ++ /* last packet is usually short (or a zlp) */ ++ if (unlikely(count != max)) ++ is_last = is_short = 1; ++ else { ++ if (likely(req->req.length != req->req.actual) ++ || req->req.zero) ++ is_last = 0; ++ else ++ is_last = 1; ++ /* interrupt/iso maxpacket may not fill the fifo */ ++ is_short = unlikely(max < ep_maxpacket(ep)); ++ } ++ ++ DEBUG("%s: wrote %s %d bytes%s%s %d left %p\n", __FUNCTION__, ++ ep->ep.name, count, ++ is_last ? "/L" : "", is_short ? "/S" : "", ++ req->req.length - req->req.actual, req); ++ ++ /* requests complete when all IN data is in the FIFO */ ++ if (is_last) { ++ done(ep, req, 0); ++ if (list_empty(&ep->queue)) { ++ pio_irq_disable(ep); ++ } ++ return 1; ++ } ++ } else { ++ DEBUG("Hmm.. %d ep FIFO is not empty!\n", ep_index(ep)); ++ } ++ ++ return 0; ++} ++ ++/** Read to request from FIFO (max read == bytes in fifo) ++ * Return: 0 = still running, 1 = completed, negative = errno ++ * NOTE: INDEX register must be set for EP ++ */ ++static int read_fifo(struct jz4740_ep *ep, struct jz4740_request *req) ++{ ++ struct jz4740_udc *dev = ep->dev; ++ uint32_t csr; ++ unsigned count, is_short; ++ ++#if 0 ++ uint32_t physaddr = virt_to_phys((void *)req->req.buf); ++ ++ if (use_dma) { ++ uint32_t dma_count; ++ ++ /* DMA interrupt generated due to a packet less than MAXP loaded into the FIFO */ ++ ++ dma_count = usb_readl(dev, ep->reg_addr) - physaddr; ++ req->req.actual += dma_count; ++ ++ /* Disable interrupt and DMA */ ++ pio_irq_disable(ep); ++ usb_writel(dev, JZ_REG_UDC_CNTL2, 0); ++ ++ /* Read all bytes from this packet */ ++ count = usb_readw(dev, JZ_REG_UDC_OUTCOUNT); ++ count = read_packet(ep, req, count); ++ ++ if (count) { ++ /* If the last packet is greater than zero, clear OUTPKTRDY manually */ ++ usb_clearb(dev, ep->csr, USB_OUTCSR_OUTPKTRDY); ++ } ++ done(ep, req, 0); ++ ++ if (!list_empty(&ep->queue)) { ++ /* advance the request queue */ ++ req = list_entry(ep->queue.next, struct jz4740_request, queue); ++ kick_dma(ep, req); ++ } ++ ++ return 1; ++ } ++#endif ++ /* ++ * PIO mode handling starts here ... ++ */ ++ ++ /* make sure there's a packet in the FIFO. */ ++ csr = usb_readb(dev, ep->csr); ++ if (!(csr & USB_OUTCSR_OUTPKTRDY)) { ++ DEBUG("%s: Packet NOT ready!\n", __FUNCTION__); ++ return -EINVAL; ++ } ++ ++ /* read all bytes from this packet */ ++ count = usb_readw(dev, JZ_REG_UDC_OUTCOUNT); ++ ++ is_short = (count < ep->ep.maxpacket); ++ ++ count = read_packet(ep, req, count); ++ ++ DEBUG("read %s %02x, %d bytes%s req %p %d/%d\n", ++ ep->ep.name, csr, count, ++ is_short ? "/S" : "", req, req->req.actual, req->req.length); ++ ++ /* Clear OutPktRdy */ ++ usb_clearb(dev, ep->csr, USB_OUTCSR_OUTPKTRDY); ++ ++ /* completion */ ++ if (is_short || req->req.actual == req->req.length) { ++ done(ep, req, 0); ++ ++ if (list_empty(&ep->queue)) ++ pio_irq_disable(ep); ++ return 1; ++ } ++ ++ /* finished that packet. the next one may be waiting... */ ++ return 0; ++} ++ ++/* ++ * done - retire a request; caller blocked irqs ++ * INDEX register is preserved to keep same ++ */ ++static void done(struct jz4740_ep *ep, struct jz4740_request *req, int status) ++{ ++ unsigned int stopped = ep->stopped; ++ uint32_t index; ++ ++ DEBUG("%s, %p\n", __FUNCTION__, ep); ++ list_del_init(&req->queue); ++ ++ if (likely(req->req.status == -EINPROGRESS)) ++ req->req.status = status; ++ else ++ status = req->req.status; ++ ++ if (status && status != -ESHUTDOWN) ++ DEBUG("complete %s req %p stat %d len %u/%u\n", ++ ep->ep.name, &req->req, status, ++ req->req.actual, req->req.length); ++ ++ /* don't modify queue heads during completion callback */ ++ ep->stopped = 1; ++ /* Read current index (completion may modify it) */ ++ index = usb_readb(ep->dev, JZ_REG_UDC_INDEX); ++ spin_unlock_irqrestore(&ep->dev->lock, ep->dev->lock_flags); ++ ++ req->req.complete(&ep->ep, &req->req); ++ ++ spin_lock_irqsave(&ep->dev->lock, ep->dev->lock_flags); ++ /* Restore index */ ++ jz_udc_set_index(ep->dev, index); ++ ep->stopped = stopped; ++} ++ ++/** Enable EP interrupt */ ++static void pio_irq_enable(struct jz4740_ep *ep) ++{ ++ uint8_t index = ep_index(ep); ++ struct jz4740_udc *dev = ep->dev; ++ DEBUG("%s: EP%d %s\n", __FUNCTION__, ep_index(ep), ep_is_in(ep) ? "IN": "OUT"); ++ ++ if (ep_is_in(ep)) { ++ switch (index) { ++ case 1: ++ case 2: ++ usb_setw(dev, JZ_REG_UDC_INTRINE, BIT(index)); ++ break; ++ default: ++ DEBUG("Unknown endpoint: %d\n", index); ++ break; ++ } ++ } ++ else { ++ switch (index) { ++ case 1: ++ usb_setw(dev, JZ_REG_UDC_INTROUTE, BIT(index)); ++ break; ++ default: ++ DEBUG("Unknown endpoint: %d\n", index); ++ break; ++ } ++ } ++} ++ ++/** Disable EP interrupt */ ++static void pio_irq_disable(struct jz4740_ep *ep) ++{ ++ uint8_t index = ep_index(ep); ++ ++ DEBUG("%s: EP%d %s\n", __FUNCTION__, ep_index(ep), ep_is_in(ep) ? "IN": "OUT"); ++ ++ if (ep_is_in(ep)) { ++ switch (ep_index(ep)) { ++ case 1: ++ case 2: ++ usb_clearw(ep->dev, JZ_REG_UDC_INTRINE, BIT(index)); ++ break; ++ default: ++ DEBUG("Unknown endpoint: %d\n", index); ++ break; ++ } ++ } ++ else { ++ switch (ep_index(ep)) { ++ case 1: ++ usb_clearw(ep->dev, JZ_REG_UDC_INTROUTE, BIT(index)); ++ break; ++ default: ++ DEBUG("Unknown endpoint: %d\n", index); ++ break; ++ } ++ } ++} ++ ++/* ++ * nuke - dequeue ALL requests ++ */ ++static void nuke(struct jz4740_ep *ep, int status) ++{ ++ struct jz4740_request *req; ++ ++ DEBUG("%s, %p\n", __FUNCTION__, ep); ++ ++ /* Flush FIFO */ ++ flush(ep); ++ ++ /* called with irqs blocked */ ++ while (!list_empty(&ep->queue)) { ++ req = list_entry(ep->queue.next, struct jz4740_request, queue); ++ done(ep, req, status); ++ } ++ ++ /* Disable IRQ if EP is enabled (has descriptor) */ ++ if (ep->desc) ++ pio_irq_disable(ep); ++} ++ ++/** Flush EP FIFO ++ * NOTE: INDEX register must be set before this call ++ */ ++static void flush(struct jz4740_ep *ep) ++{ ++ DEBUG("%s: %s\n", __FUNCTION__, ep->ep.name); ++ ++ switch (ep->type) { ++ case ep_bulk_in: ++ case ep_interrupt: ++ usb_setb(ep->dev, ep->csr, USB_INCSR_FF); ++ break; ++ case ep_bulk_out: ++ usb_setb(ep->dev, ep->csr, USB_OUTCSR_FF); ++ break; ++ case ep_control: ++ break; ++ } ++} ++ ++/** ++ * jz4740_in_epn - handle IN interrupt ++ */ ++static void jz4740_in_epn(struct jz4740_udc *dev, uint32_t ep_idx, uint32_t intr) ++{ ++ uint32_t csr; ++ struct jz4740_ep *ep = &dev->ep[ep_idx + 1]; ++ struct jz4740_request *req; ++ DEBUG("%s:%s[%d]\n", __FILE__, __func__, __LINE__); ++ ++ jz_udc_set_index(dev, ep_index(ep)); ++ ++ csr = usb_readb(dev, ep->csr); ++ DEBUG("%s: %d, csr %x\n", __FUNCTION__, ep_idx, csr); ++ ++ if (csr & USB_INCSR_SENTSTALL) { ++ DEBUG("USB_INCSR_SENTSTALL\n"); ++ usb_clearb(dev, ep->csr, USB_INCSR_SENTSTALL); ++ return; ++ } ++ ++ if (!ep->desc) { ++ DEBUG("%s: NO EP DESC\n", __FUNCTION__); ++ return; ++ } ++ ++ if (!list_empty(&ep->queue)) { ++ req = list_first_entry(&ep->queue, struct jz4740_request, queue); ++ write_fifo(ep, req); ++ } ++} ++ ++/* ++ * Bulk OUT (recv) ++ */ ++static void jz4740_out_epn(struct jz4740_udc *dev, uint32_t ep_idx, uint32_t intr) ++{ ++ struct jz4740_ep *ep = &dev->ep[ep_idx]; ++ struct jz4740_request *req; ++ ++ DEBUG("%s: %d\n", __FUNCTION__, ep_idx); ++ ++ jz_udc_select_ep(ep); ++ if (ep->desc) { ++ uint32_t csr; ++ ++ if (use_dma) { ++ /* DMA starts here ... */ ++ if (!list_empty(&ep->queue)) { ++ req = list_first_entry(&ep->queue, struct jz4740_request, queue); ++ read_fifo(ep, req); ++ } ++ return; ++ } ++ ++ /* ++ * PIO mode starts here ... ++ */ ++ ++ while ((csr = usb_readb(dev, ep->csr)) & ++ (USB_OUTCSR_OUTPKTRDY | USB_OUTCSR_SENTSTALL)) { ++ DEBUG("%s: %x\n", __FUNCTION__, csr); ++ ++ if (csr & USB_OUTCSR_SENTSTALL) { ++ DEBUG("%s: stall sent, flush fifo\n", ++ __FUNCTION__); ++ /* usb_set(USB_OUT_CSR1_FIFO_FLUSH, ep->csr1); */ ++ flush(ep); ++ } else if (csr & USB_OUTCSR_OUTPKTRDY) { ++ if (list_empty(&ep->queue)) ++ req = 0; ++ else ++ req = ++ list_entry(ep->queue.next, ++ struct jz4740_request, ++ queue); ++ ++ if (!req) { ++ DEBUG("%s: NULL REQ %d\n", ++ __FUNCTION__, ep_idx); ++ break; ++ } else { ++ read_fifo(ep, req); ++ } ++ } ++ } ++ } else { ++ /* Throw packet away.. */ ++ DEBUG("%s: ep %p ep_indx %d No descriptor?!?\n", __FUNCTION__, ep, ep_idx); ++ flush(ep); ++ } ++} ++ ++/** Halt specific EP ++ * Return 0 if success ++ * NOTE: Sets INDEX register to EP ! ++ */ ++static int jz4740_set_halt(struct usb_ep *_ep, int value) ++{ ++ struct jz4740_udc *dev; ++ struct jz4740_ep *ep; ++ unsigned long flags; ++ ++ DEBUG("%s:%s[%d]\n", __FILE__, __func__, __LINE__); ++ ++ ep = container_of(_ep, struct jz4740_ep, ep); ++ if (unlikely(!_ep || (!ep->desc && ep->type != ep_control))) { ++ DEBUG("%s, bad ep\n", __FUNCTION__); ++ return -EINVAL; ++ } ++ ++ dev = ep->dev; ++ ++ spin_lock_irqsave(&dev->lock, flags); ++ ++ jz_udc_select_ep(ep); ++ ++ DEBUG("%s, ep %d, val %d\n", __FUNCTION__, ep_index(ep), value); ++ ++ if (ep_index(ep) == 0) { ++ /* EP0 */ ++ usb_setb(dev, JZ_REG_UDC_CSR0, USB_CSR0_SENDSTALL); ++ } else if (ep_is_in(ep)) { ++ uint32_t csr = usb_readb(dev, ep->csr); ++ if (value && ((csr & USB_INCSR_FFNOTEMPT) ++ || !list_empty(&ep->queue))) { ++ /* ++ * Attempts to halt IN endpoints will fail (returning -EAGAIN) ++ * if any transfer requests are still queued, or if the controller ++ * FIFO still holds bytes that the host hasn’t collected. ++ */ ++ spin_unlock_irqrestore(&dev->lock, flags); ++ DEBUG ++ ("Attempt to halt IN endpoint failed (returning -EAGAIN) %d %d\n", ++ (csr & USB_INCSR_FFNOTEMPT), ++ !list_empty(&ep->queue)); ++ return -EAGAIN; ++ } ++ flush(ep); ++ if (value) { ++ usb_setb(dev, ep->csr, USB_INCSR_SENDSTALL); ++ } else { ++ usb_clearb(dev, ep->csr, USB_INCSR_SENDSTALL); ++ usb_setb(dev, ep->csr, USB_INCSR_CDT); ++ } ++ } else { ++ ++ flush(ep); ++ if (value) { ++ usb_setb(dev, ep->csr, USB_OUTCSR_SENDSTALL); ++ } else { ++ usb_clearb(dev, ep->csr, USB_OUTCSR_SENDSTALL); ++ usb_setb(dev, ep->csr, USB_OUTCSR_CDT); ++ } ++ } ++ ++ ep->stopped = value; ++ ++ spin_unlock_irqrestore(&dev->lock, flags); ++ ++ DEBUG("%s %s halted\n", _ep->name, value == 0 ? "NOT" : "IS"); ++ ++ return 0; ++} ++ ++ ++static int jz4740_ep_enable(struct usb_ep *_ep, ++ const struct usb_endpoint_descriptor *desc) ++{ ++ struct jz4740_ep *ep; ++ struct jz4740_udc *dev; ++ unsigned long flags; ++ uint32_t max, csrh = 0; ++ ++ DEBUG("%s: trying to enable %s\n", __FUNCTION__, _ep->name); ++ ++ if (!_ep || !desc) ++ return -EINVAL; ++ ++ ep = container_of(_ep, struct jz4740_ep, ep); ++ if (ep->desc || ep->type == ep_control ++ || desc->bDescriptorType != USB_DT_ENDPOINT ++ || ep->bEndpointAddress != desc->bEndpointAddress) { ++ DEBUG("%s, bad ep or descriptor\n", __FUNCTION__); ++ return -EINVAL; ++ } ++ ++ /* xfer types must match, except that interrupt ~= bulk */ ++ if (ep->bmAttributes != desc->bmAttributes ++ && ep->bmAttributes != USB_ENDPOINT_XFER_BULK ++ && desc->bmAttributes != USB_ENDPOINT_XFER_INT) { ++ DEBUG("%s, %s type mismatch\n", __FUNCTION__, _ep->name); ++ return -EINVAL; ++ } ++ ++ dev = ep->dev; ++ if (!dev->driver || dev->gadget.speed == USB_SPEED_UNKNOWN) { ++ DEBUG("%s, bogus device state\n", __FUNCTION__); ++ return -ESHUTDOWN; ++ } ++ ++ max = le16_to_cpu(desc->wMaxPacketSize); ++ ++ spin_lock_irqsave(&ep->dev->lock, flags); ++ ++ /* Configure the endpoint */ ++ jz_udc_select_ep(ep); ++ if (ep_is_in(ep)) { ++ usb_writew(dev, JZ_REG_UDC_INMAXP, max); ++ switch (desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) { ++ case USB_ENDPOINT_XFER_BULK: ++ case USB_ENDPOINT_XFER_INT: ++ csrh &= ~USB_INCSRH_ISO; ++ break; ++ case USB_ENDPOINT_XFER_ISOC: ++ csrh |= USB_INCSRH_ISO; ++ break; ++ } ++ usb_writeb(dev, JZ_REG_UDC_INCSRH, csrh); ++ } ++ else { ++ usb_writew(dev, JZ_REG_UDC_OUTMAXP, max); ++ switch (desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) { ++ case USB_ENDPOINT_XFER_BULK: ++ csrh &= ~USB_OUTCSRH_ISO; ++ break; ++ case USB_ENDPOINT_XFER_INT: ++ csrh &= ~USB_OUTCSRH_ISO; ++ csrh |= USB_OUTCSRH_DNYT; ++ break; ++ case USB_ENDPOINT_XFER_ISOC: ++ csrh |= USB_OUTCSRH_ISO; ++ break; ++ } ++ usb_writeb(dev, JZ_REG_UDC_OUTCSRH, csrh); ++ } ++ ++ ++ ep->stopped = 0; ++ ep->desc = desc; ++ ep->ep.maxpacket = max; ++ ++ spin_unlock_irqrestore(&ep->dev->lock, flags); ++ ++ /* Reset halt state (does flush) */ ++ jz4740_set_halt(_ep, 0); ++ ++ DEBUG("%s: enabled %s\n", __FUNCTION__, _ep->name); ++ ++ return 0; ++} ++ ++/** Disable EP ++ * NOTE: Sets INDEX register ++ */ ++static int jz4740_ep_disable(struct usb_ep *_ep) ++{ ++ struct jz4740_ep *ep; ++ unsigned long flags; ++ ++ DEBUG("%s, %p\n", __FUNCTION__, _ep); ++ ++ ep = container_of(_ep, struct jz4740_ep, ep); ++ if (!_ep || !ep->desc) { ++ DEBUG("%s, %s not enabled\n", __FUNCTION__, ++ _ep ? ep->ep.name : NULL); ++ return -EINVAL; ++ } ++ ++ spin_lock_irqsave(&ep->dev->lock, flags); ++ ++ jz_udc_select_ep(ep); ++ ++ /* Nuke all pending requests (does flush) */ ++ nuke(ep, -ESHUTDOWN); ++ ++ /* Disable ep IRQ */ ++ pio_irq_disable(ep); ++ ++ ep->desc = 0; ++ ep->stopped = 1; ++ ++ spin_unlock_irqrestore(&ep->dev->lock, flags); ++ ++ DEBUG("%s: disabled %s\n", __FUNCTION__, _ep->name); ++ return 0; ++} ++ ++static struct usb_request *jz4740_alloc_request(struct usb_ep *ep, gfp_t gfp_flags) ++{ ++ struct jz4740_request *req; ++ ++ req = kzalloc(sizeof(*req), gfp_flags); ++ if (!req) ++ return NULL; ++ ++ INIT_LIST_HEAD(&req->queue); ++ ++ return &req->req; ++} ++ ++static void jz4740_free_request(struct usb_ep *ep, struct usb_request *_req) ++{ ++ struct jz4740_request *req; ++ ++ DEBUG("%s, %p\n", __FUNCTION__, ep); ++ ++ req = container_of(_req, struct jz4740_request, req); ++ WARN_ON(!list_empty(&req->queue)); ++ kfree(req); ++} ++ ++/*--------------------------------------------------------------------*/ ++ ++/** Queue one request ++ * Kickstart transfer if needed ++ * NOTE: Sets INDEX register ++ */ ++static int jz4740_queue(struct usb_ep *_ep, struct usb_request *_req, ++ gfp_t gfp_flags) ++{ ++ struct jz4740_request *req; ++ struct jz4740_ep *ep; ++ struct jz4740_udc *dev; ++ ++ DEBUG("%s, %p\n", __FUNCTION__, _ep); ++ ++ req = container_of(_req, struct jz4740_request, req); ++ if (unlikely ++ (!_req || !_req->complete || !_req->buf ++ || !list_empty(&req->queue))) { ++ DEBUG("%s, bad params\n", __FUNCTION__); ++ return -EINVAL; ++ } ++ ++ ep = container_of(_ep, struct jz4740_ep, ep); ++ if (unlikely(!_ep || (!ep->desc && ep->type != ep_control))) { ++ DEBUG("%s, bad ep\n", __FUNCTION__); ++ return -EINVAL; ++ } ++ ++ dev = ep->dev; ++ if (unlikely(!dev->driver || dev->gadget.speed == USB_SPEED_UNKNOWN)) { ++ DEBUG("%s, bogus device state %p\n", __FUNCTION__, dev->driver); ++ return -ESHUTDOWN; ++ } ++ ++ DEBUG("%s queue req %p, len %d buf %p\n", _ep->name, _req, _req->length, ++ _req->buf); ++ ++ spin_lock_irqsave(&dev->lock, dev->lock_flags); ++ ++ _req->status = -EINPROGRESS; ++ _req->actual = 0; ++ ++ /* kickstart this i/o queue? */ ++ DEBUG("Add to %d Q %d %d\n", ep_index(ep), list_empty(&ep->queue), ++ ep->stopped); ++ if (list_empty(&ep->queue) && likely(!ep->stopped)) { ++ uint32_t csr; ++ ++ if (unlikely(ep_index(ep) == 0)) { ++ /* EP0 */ ++ list_add_tail(&req->queue, &ep->queue); ++ jz4740_ep0_kick(dev, ep); ++ req = 0; ++ } else if (use_dma) { ++ /* DMA */ ++ kick_dma(ep, req); ++ } ++ /* PIO */ ++ else if (ep_is_in(ep)) { ++ /* EP1 & EP2 */ ++ jz_udc_select_ep(ep); ++ csr = usb_readb(dev, ep->csr); ++ pio_irq_enable(ep); ++ if (!(csr & USB_INCSR_FFNOTEMPT)) { ++ if (write_fifo(ep, req) == 1) ++ req = 0; ++ } ++ } else { ++ /* EP1 */ ++ jz_udc_select_ep(ep); ++ csr = usb_readb(dev, ep->csr); ++ pio_irq_enable(ep); ++ if (csr & USB_OUTCSR_OUTPKTRDY) { ++ if (read_fifo(ep, req) == 1) ++ req = 0; ++ } ++ } ++ } ++ ++ /* pio or dma irq handler advances the queue. */ ++ if (likely(req != 0)) ++ list_add_tail(&req->queue, &ep->queue); ++ ++ spin_unlock_irqrestore(&dev->lock, dev->lock_flags); ++ ++ return 0; ++} ++ ++/* dequeue JUST ONE request */ ++static int jz4740_dequeue(struct usb_ep *_ep, struct usb_request *_req) ++{ ++ struct jz4740_ep *ep; ++ struct jz4740_request *req; ++ unsigned long flags; ++ ++ DEBUG("%s, %p\n", __FUNCTION__, _ep); ++ ++ ep = container_of(_ep, struct jz4740_ep, ep); ++ if (!_ep || ep->type == ep_control) ++ return -EINVAL; ++ ++ spin_lock_irqsave(&ep->dev->lock, flags); ++ ++ /* make sure it's actually queued on this endpoint */ ++ list_for_each_entry(req, &ep->queue, queue) { ++ if (&req->req == _req) ++ break; ++ } ++ if (&req->req != _req) { ++ spin_unlock_irqrestore(&ep->dev->lock, flags); ++ return -EINVAL; ++ } ++ done(ep, req, -ECONNRESET); ++ ++ spin_unlock_irqrestore(&ep->dev->lock, flags); ++ return 0; ++} ++ ++/** Return bytes in EP FIFO ++ * NOTE: Sets INDEX register to EP ++ */ ++static int jz4740_fifo_status(struct usb_ep *_ep) ++{ ++ uint32_t csr; ++ int count = 0; ++ struct jz4740_ep *ep; ++ unsigned long flags; ++ ++ ep = container_of(_ep, struct jz4740_ep, ep); ++ if (!_ep) { ++ DEBUG("%s, bad ep\n", __FUNCTION__); ++ return -ENODEV; ++ } ++ ++ DEBUG("%s, %d\n", __FUNCTION__, ep_index(ep)); ++ ++ /* LPD can't report unclaimed bytes from IN fifos */ ++ if (ep_is_in(ep)) ++ return -EOPNOTSUPP; ++ ++ spin_lock_irqsave(&ep->dev->lock, flags); ++ jz_udc_select_ep(ep); ++ ++ csr = usb_readb(ep->dev, ep->csr); ++ if (ep->dev->gadget.speed != USB_SPEED_UNKNOWN || ++ csr & 0x1) { ++ count = usb_readw(ep->dev, JZ_REG_UDC_OUTCOUNT); ++ } ++ ++ spin_unlock_irqrestore(&ep->dev->lock, flags); ++ ++ return count; ++} ++ ++/** Flush EP FIFO ++ * NOTE: Sets INDEX register to EP ++ */ ++static void jz4740_fifo_flush(struct usb_ep *_ep) ++{ ++ struct jz4740_ep *ep; ++ unsigned long flags; ++ ++ DEBUG("%s:%s[%d]\n", __FILE__, __func__, __LINE__); ++ ++ ep = container_of(_ep, struct jz4740_ep, ep); ++ if (unlikely(!_ep || (!ep->desc && ep->type == ep_control))) { ++ DEBUG("%s, bad ep\n", __FUNCTION__); ++ return; ++ } ++ ++ spin_lock_irqsave(&ep->dev->lock, flags); ++ ++ jz_udc_select_ep(ep); ++ flush(ep); ++ ++ spin_unlock_irqrestore(&ep->dev->lock, flags); ++} ++ ++/****************************************************************/ ++/* End Point 0 related functions */ ++/****************************************************************/ ++ ++/* return: 0 = still running, 1 = completed, negative = errno */ ++static int write_fifo_ep0(struct jz4740_ep *ep, struct jz4740_request *req) ++{ ++ uint32_t max; ++ unsigned count; ++ int is_last; ++ ++ DEBUG("%s:%s[%d]\n", __FILE__, __func__, __LINE__); ++ max = ep_maxpacket(ep); ++ ++ count = write_packet(ep, req, max); ++ ++ /* last packet is usually short (or a zlp) */ ++ if (unlikely(count != max)) ++ is_last = 1; ++ else { ++ if (likely(req->req.length != req->req.actual) || req->req.zero) ++ is_last = 0; ++ else ++ is_last = 1; ++ } ++ ++ DEBUG_EP0("%s: wrote %s %d bytes%s %d left %p\n", __FUNCTION__, ++ ep->ep.name, count, ++ is_last ? "/L" : "", req->req.length - req->req.actual, req); ++ ++ /* requests complete when all IN data is in the FIFO */ ++ if (is_last) { ++ done(ep, req, 0); ++ return 1; ++ } ++ ++ return 0; ++} ++ ++static inline int jz4740_fifo_read(struct jz4740_ep *ep, ++ unsigned char *cp, int max) ++{ ++ int bytes; ++ int count = usb_readw(ep->dev, JZ_REG_UDC_OUTCOUNT); ++ ++ if (count > max) ++ count = max; ++ bytes = count; ++ while (count--) ++ *cp++ = usb_readb(ep->dev, ep->fifo); ++ ++ return bytes; ++} ++ ++static inline void jz4740_fifo_write(struct jz4740_ep *ep, ++ unsigned char *cp, int count) ++{ ++ DEBUG("fifo_write: %d %d\n", ep_index(ep), count); ++ while (count--) ++ usb_writeb(ep->dev, ep->fifo, *cp++); ++} ++ ++static int read_fifo_ep0(struct jz4740_ep *ep, struct jz4740_request *req) ++{ ++ struct jz4740_udc *dev = ep->dev; ++ uint32_t csr; ++ uint8_t *buf; ++ unsigned bufferspace, count, is_short; ++ ++ DEBUG_EP0("%s\n", __FUNCTION__); ++ ++ csr = usb_readb(dev, JZ_REG_UDC_CSR0); ++ if (!(csr & USB_CSR0_OUTPKTRDY)) ++ return 0; ++ ++ buf = req->req.buf + req->req.actual; ++ prefetchw(buf); ++ bufferspace = req->req.length - req->req.actual; ++ ++ /* read all bytes from this packet */ ++ if (likely(csr & USB_CSR0_OUTPKTRDY)) { ++ count = usb_readw(dev, JZ_REG_UDC_OUTCOUNT); ++ req->req.actual += min(count, bufferspace); ++ } else /* zlp */ ++ count = 0; ++ ++ is_short = (count < ep->ep.maxpacket); ++ DEBUG_EP0("read %s %02x, %d bytes%s req %p %d/%d\n", ++ ep->ep.name, csr, count, ++ is_short ? "/S" : "", req, req->req.actual, req->req.length); ++ ++ while (likely(count-- != 0)) { ++ uint8_t byte = (uint8_t)usb_readl(dev, ep->fifo); ++ ++ if (unlikely(bufferspace == 0)) { ++ /* this happens when the driver's buffer ++ * is smaller than what the host sent. ++ * discard the extra data. ++ */ ++ if (req->req.status != -EOVERFLOW) ++ DEBUG_EP0("%s overflow %d\n", ep->ep.name, ++ count); ++ req->req.status = -EOVERFLOW; ++ } else { ++ *buf++ = byte; ++ bufferspace--; ++ } ++ } ++ ++ /* completion */ ++ if (is_short || req->req.actual == req->req.length) { ++ done(ep, req, 0); ++ return 1; ++ } ++ ++ /* finished that packet. the next one may be waiting... */ ++ return 0; ++} ++ ++/** ++ * udc_set_address - set the USB address for this device ++ * @address: ++ * ++ * Called from control endpoint function after it decodes a set address setup packet. ++ */ ++static void udc_set_address(struct jz4740_udc *dev, unsigned char address) ++{ ++ DEBUG_EP0("%s: %d\n", __FUNCTION__, address); ++ ++ usb_writeb(dev, JZ_REG_UDC_FADDR, address); ++} ++ ++/* ++ * DATA_STATE_RECV (USB_CSR0_OUTPKTRDY) ++ * - if error ++ * set USB_CSR0_SVDOUTPKTRDY | USB_CSR0_DATAEND | USB_CSR0_SENDSTALL bits ++ * - else ++ * set USB_CSR0_SVDOUTPKTRDY bit ++ if last set USB_CSR0_DATAEND bit ++ */ ++static void jz4740_ep0_out(struct jz4740_udc *dev, uint32_t csr, int kickstart) ++{ ++ struct jz4740_request *req; ++ struct jz4740_ep *ep = &dev->ep[0]; ++ int ret; ++ ++ DEBUG_EP0("%s: %x\n", __FUNCTION__, csr); ++ ++ if (list_empty(&ep->queue)) ++ req = 0; ++ else ++ req = list_entry(ep->queue.next, struct jz4740_request, queue); ++ ++ if (req) { ++ if (req->req.length == 0) { ++ DEBUG_EP0("ZERO LENGTH OUT!\n"); ++ usb_setb(dev, JZ_REG_UDC_CSR0, (USB_CSR0_SVDOUTPKTRDY | USB_CSR0_DATAEND)); ++ dev->ep0state = WAIT_FOR_SETUP; ++ return; ++ } else if (kickstart) { ++ usb_setb(dev, JZ_REG_UDC_CSR0, (USB_CSR0_SVDOUTPKTRDY)); ++ return; ++ } ++ ret = read_fifo_ep0(ep, req); ++ if (ret) { ++ /* Done! */ ++ DEBUG_EP0("%s: finished, waiting for status\n", ++ __FUNCTION__); ++ usb_setb(dev, JZ_REG_UDC_CSR0, (USB_CSR0_SVDOUTPKTRDY | USB_CSR0_DATAEND)); ++ dev->ep0state = WAIT_FOR_SETUP; ++ } else { ++ /* Not done yet.. */ ++ DEBUG_EP0("%s: not finished\n", __FUNCTION__); ++ usb_setb(dev, JZ_REG_UDC_CSR0, USB_CSR0_SVDOUTPKTRDY); ++ } ++ } else { ++ DEBUG_EP0("NO REQ??!\n"); ++ } ++} ++ ++/* ++ * DATA_STATE_XMIT ++ */ ++static int jz4740_ep0_in(struct jz4740_udc *dev, uint32_t csr) ++{ ++ struct jz4740_request *req; ++ struct jz4740_ep *ep = &dev->ep[0]; ++ int ret, need_zlp = 0; ++ ++ DEBUG_EP0("%s: %x\n", __FUNCTION__, csr); ++ ++ if (list_empty(&ep->queue)) ++ req = 0; ++ else ++ req = list_entry(ep->queue.next, struct jz4740_request, queue); ++ ++ if (!req) { ++ DEBUG_EP0("%s: NULL REQ\n", __FUNCTION__); ++ return 0; ++ } ++ ++ if (req->req.length == 0) { ++ usb_setb(dev, JZ_REG_UDC_CSR0, (USB_CSR0_INPKTRDY | USB_CSR0_DATAEND)); ++ dev->ep0state = WAIT_FOR_SETUP; ++ return 1; ++ } ++ ++ if (req->req.length - req->req.actual == EP0_MAXPACKETSIZE) { ++ /* Next write will end with the packet size, */ ++ /* so we need zero-length-packet */ ++ need_zlp = 1; ++ } ++ ++ ret = write_fifo_ep0(ep, req); ++ ++ if (ret == 1 && !need_zlp) { ++ /* Last packet */ ++ DEBUG_EP0("%s: finished, waiting for status\n", __FUNCTION__); ++ ++ usb_setb(dev, JZ_REG_UDC_CSR0, (USB_CSR0_INPKTRDY | USB_CSR0_DATAEND)); ++ dev->ep0state = WAIT_FOR_SETUP; ++ } else { ++ DEBUG_EP0("%s: not finished\n", __FUNCTION__); ++ usb_setb(dev, JZ_REG_UDC_CSR0, USB_CSR0_INPKTRDY); ++ } ++ ++ if (need_zlp) { ++ DEBUG_EP0("%s: Need ZLP!\n", __FUNCTION__); ++ usb_setb(dev, JZ_REG_UDC_CSR0, USB_CSR0_INPKTRDY); ++ dev->ep0state = DATA_STATE_NEED_ZLP; ++ } ++ ++ return 1; ++} ++ ++static int jz4740_handle_get_status(struct jz4740_udc *dev, ++ struct usb_ctrlrequest *ctrl) ++{ ++ struct jz4740_ep *ep0 = &dev->ep[0]; ++ struct jz4740_ep *qep; ++ int reqtype = (ctrl->bRequestType & USB_RECIP_MASK); ++ uint16_t val = 0; ++ ++ DEBUG("%s:%s[%d]\n", __FILE__, __func__, __LINE__); ++ ++ if (reqtype == USB_RECIP_INTERFACE) { ++ /* This is not supported. ++ * And according to the USB spec, this one does nothing.. ++ * Just return 0 ++ */ ++ DEBUG_SETUP("GET_STATUS: USB_RECIP_INTERFACE\n"); ++ } else if (reqtype == USB_RECIP_DEVICE) { ++ DEBUG_SETUP("GET_STATUS: USB_RECIP_DEVICE\n"); ++ val |= (1 << 0); /* Self powered */ ++ /*val |= (1<<1); *//* Remote wakeup */ ++ } else if (reqtype == USB_RECIP_ENDPOINT) { ++ int ep_num = (ctrl->wIndex & ~USB_DIR_IN); ++ ++ DEBUG_SETUP ++ ("GET_STATUS: USB_RECIP_ENDPOINT (%d), ctrl->wLength = %d\n", ++ ep_num, ctrl->wLength); ++ ++ if (ctrl->wLength > 2 || ep_num > 3) ++ return -EOPNOTSUPP; ++ ++ qep = &dev->ep[ep_num]; ++ if (ep_is_in(qep) != ((ctrl->wIndex & USB_DIR_IN) ? 1 : 0) ++ && ep_index(qep) != 0) { ++ return -EOPNOTSUPP; ++ } ++ ++ jz_udc_set_index(dev, ep_index(qep)); ++ ++ /* Return status on next IN token */ ++ switch (qep->type) { ++ case ep_control: ++ val = ++ (usb_readb(dev, qep->csr) & USB_CSR0_SENDSTALL) == ++ USB_CSR0_SENDSTALL; ++ break; ++ case ep_bulk_in: ++ case ep_interrupt: ++ val = ++ (usb_readb(dev, qep->csr) & USB_INCSR_SENDSTALL) == ++ USB_INCSR_SENDSTALL; ++ break; ++ case ep_bulk_out: ++ val = ++ (usb_readb(dev, qep->csr) & USB_OUTCSR_SENDSTALL) == ++ USB_OUTCSR_SENDSTALL; ++ break; ++ } ++ ++ /* Back to EP0 index */ ++ jz_udc_set_index(dev, 0); ++ ++ DEBUG_SETUP("GET_STATUS, ep: %d (%x), val = %d\n", ep_num, ++ ctrl->wIndex, val); ++ } else { ++ DEBUG_SETUP("Unknown REQ TYPE: %d\n", reqtype); ++ return -EOPNOTSUPP; ++ } ++ ++ /* Clear "out packet ready" */ ++ usb_setb(dev, JZ_REG_UDC_CSR0, USB_CSR0_SVDOUTPKTRDY); ++ /* Put status to FIFO */ ++ jz4740_fifo_write(ep0, (uint8_t *)&val, sizeof(val)); ++ /* Issue "In packet ready" */ ++ usb_setb(dev, JZ_REG_UDC_CSR0, (USB_CSR0_INPKTRDY | USB_CSR0_DATAEND)); ++ ++ return 0; ++} ++ ++/* ++ * WAIT_FOR_SETUP (OUTPKTRDY) ++ * - read data packet from EP0 FIFO ++ * - decode command ++ * - if error ++ * set USB_CSR0_SVDOUTPKTRDY | USB_CSR0_DATAEND | USB_CSR0_SENDSTALL bits ++ * - else ++ * set USB_CSR0_SVDOUTPKTRDY | USB_CSR0_DATAEND bits ++ */ ++static void jz4740_ep0_setup(struct jz4740_udc *dev, uint32_t csr) ++{ ++ struct jz4740_ep *ep = &dev->ep[0]; ++ struct usb_ctrlrequest ctrl; ++ int i; ++ ++ DEBUG_SETUP("%s: %x\n", __FUNCTION__, csr); ++ ++ /* Nuke all previous transfers */ ++ nuke(ep, -EPROTO); ++ ++ /* read control req from fifo (8 bytes) */ ++ jz4740_fifo_read(ep, (unsigned char *)&ctrl, 8); ++ ++ DEBUG_SETUP("SETUP %02x.%02x v%04x i%04x l%04x\n", ++ ctrl.bRequestType, ctrl.bRequest, ++ ctrl.wValue, ctrl.wIndex, ctrl.wLength); ++ ++ /* Set direction of EP0 */ ++ if (likely(ctrl.bRequestType & USB_DIR_IN)) { ++ ep->bEndpointAddress |= USB_DIR_IN; ++ } else { ++ ep->bEndpointAddress &= ~USB_DIR_IN; ++ } ++ ++ /* Handle some SETUP packets ourselves */ ++ switch (ctrl.bRequest) { ++ case USB_REQ_SET_ADDRESS: ++ if (ctrl.bRequestType != (USB_TYPE_STANDARD | USB_RECIP_DEVICE)) ++ break; ++ ++ DEBUG_SETUP("USB_REQ_SET_ADDRESS (%d)\n", ctrl.wValue); ++ udc_set_address(dev, ctrl.wValue); ++ usb_setb(dev, JZ_REG_UDC_CSR0, (USB_CSR0_SVDOUTPKTRDY | USB_CSR0_DATAEND)); ++ return; ++ ++ case USB_REQ_SET_CONFIGURATION: ++ if (ctrl.bRequestType != (USB_TYPE_STANDARD | USB_RECIP_DEVICE)) ++ break; ++ ++ DEBUG_SETUP("USB_REQ_SET_CONFIGURATION (%d)\n", ctrl.wValue); ++/* usb_setb(JZ_REG_UDC_CSR0, (USB_CSR0_SVDOUTPKTRDY | USB_CSR0_DATAEND));*/ ++ ++ /* Enable RESUME and SUSPEND interrupts */ ++ usb_setb(dev, JZ_REG_UDC_INTRUSBE, (USB_INTR_RESUME | USB_INTR_SUSPEND)); ++ break; ++ ++ case USB_REQ_SET_INTERFACE: ++ if (ctrl.bRequestType != (USB_TYPE_STANDARD | USB_RECIP_DEVICE)) ++ break; ++ ++ DEBUG_SETUP("USB_REQ_SET_INTERFACE (%d)\n", ctrl.wValue); ++/* usb_setb(JZ_REG_UDC_CSR0, (USB_CSR0_SVDOUTPKTRDY | USB_CSR0_DATAEND));*/ ++ break; ++ ++ case USB_REQ_GET_STATUS: ++ if (jz4740_handle_get_status(dev, &ctrl) == 0) ++ return; ++ ++ case USB_REQ_CLEAR_FEATURE: ++ case USB_REQ_SET_FEATURE: ++ if (ctrl.bRequestType == USB_RECIP_ENDPOINT) { ++ struct jz4740_ep *qep; ++ int ep_num = (ctrl.wIndex & 0x0f); ++ ++ /* Support only HALT feature */ ++ if (ctrl.wValue != 0 || ctrl.wLength != 0 ++ || ep_num > 3 || ep_num < 1) ++ break; ++ ++ qep = &dev->ep[ep_num]; ++ spin_unlock(&dev->lock); ++ if (ctrl.bRequest == USB_REQ_SET_FEATURE) { ++ DEBUG_SETUP("SET_FEATURE (%d)\n", ++ ep_num); ++ jz4740_set_halt(&qep->ep, 1); ++ } else { ++ DEBUG_SETUP("CLR_FEATURE (%d)\n", ++ ep_num); ++ jz4740_set_halt(&qep->ep, 0); ++ } ++ spin_lock(&dev->lock); ++ ++ jz_udc_set_index(dev, 0); ++ ++ /* Reply with a ZLP on next IN token */ ++ usb_setb(dev, JZ_REG_UDC_CSR0, ++ (USB_CSR0_SVDOUTPKTRDY | USB_CSR0_DATAEND)); ++ return; ++ } ++ break; ++ ++ default: ++ break; ++ } ++ ++ /* gadget drivers see class/vendor specific requests, ++ * {SET,GET}_{INTERFACE,DESCRIPTOR,CONFIGURATION}, ++ * and more. ++ */ ++ if (dev->driver) { ++ /* device-2-host (IN) or no data setup command, process immediately */ ++ spin_unlock(&dev->lock); ++ ++ i = dev->driver->setup(&dev->gadget, &ctrl); ++ spin_lock(&dev->lock); ++ ++ if (unlikely(i < 0)) { ++ /* setup processing failed, force stall */ ++ DEBUG_SETUP ++ (" --> ERROR: gadget setup FAILED (stalling), setup returned %d\n", ++ i); ++ jz_udc_set_index(dev, 0); ++ usb_setb(dev, JZ_REG_UDC_CSR0, (USB_CSR0_SVDOUTPKTRDY | USB_CSR0_DATAEND | USB_CSR0_SENDSTALL)); ++ ++ /* ep->stopped = 1; */ ++ dev->ep0state = WAIT_FOR_SETUP; ++ } ++ else { ++ DEBUG_SETUP("gadget driver setup ok (%d)\n", ctrl.wLength); ++/* if (!ctrl.wLength) { ++ usb_setb(JZ_REG_UDC_CSR0, USB_CSR0_SVDOUTPKTRDY); ++ }*/ ++ } ++ } ++} ++ ++/* ++ * DATA_STATE_NEED_ZLP ++ */ ++static void jz4740_ep0_in_zlp(struct jz4740_udc *dev, uint32_t csr) ++{ ++ DEBUG_EP0("%s: %x\n", __FUNCTION__, csr); ++ ++ usb_setb(dev, JZ_REG_UDC_CSR0, (USB_CSR0_INPKTRDY | USB_CSR0_DATAEND)); ++ dev->ep0state = WAIT_FOR_SETUP; ++} ++ ++/* ++ * handle ep0 interrupt ++ */ ++static void jz4740_handle_ep0(struct jz4740_udc *dev, uint32_t intr) ++{ ++ struct jz4740_ep *ep = &dev->ep[0]; ++ uint32_t csr; ++ ++ DEBUG("%s:%s[%d]\n", __FILE__, __func__, __LINE__); ++ /* Set index 0 */ ++ jz_udc_set_index(dev, 0); ++ csr = usb_readb(dev, JZ_REG_UDC_CSR0); ++ ++ DEBUG_EP0("%s: csr = %x state = \n", __FUNCTION__, csr);//, state_names[dev->ep0state]); ++ ++ /* ++ * if SENT_STALL is set ++ * - clear the SENT_STALL bit ++ */ ++ if (csr & USB_CSR0_SENTSTALL) { ++ DEBUG_EP0("%s: USB_CSR0_SENTSTALL is set: %x\n", __FUNCTION__, csr); ++ usb_clearb(dev, JZ_REG_UDC_CSR0, USB_CSR0_SENDSTALL | USB_CSR0_SENTSTALL); ++ nuke(ep, -ECONNABORTED); ++ dev->ep0state = WAIT_FOR_SETUP; ++ return; ++ } ++ ++ /* ++ * if a transfer is in progress && INPKTRDY and OUTPKTRDY are clear ++ * - fill EP0 FIFO ++ * - if last packet ++ * - set IN_PKT_RDY | DATA_END ++ * - else ++ * set IN_PKT_RDY ++ */ ++ if (!(csr & (USB_CSR0_INPKTRDY | USB_CSR0_OUTPKTRDY))) { ++ DEBUG_EP0("%s: INPKTRDY and OUTPKTRDY are clear\n", ++ __FUNCTION__); ++ ++ switch (dev->ep0state) { ++ case DATA_STATE_XMIT: ++ DEBUG_EP0("continue with DATA_STATE_XMIT\n"); ++ jz4740_ep0_in(dev, csr); ++ return; ++ case DATA_STATE_NEED_ZLP: ++ DEBUG_EP0("continue with DATA_STATE_NEED_ZLP\n"); ++ jz4740_ep0_in_zlp(dev, csr); ++ return; ++ default: ++ /* Stall? */ ++// DEBUG_EP0("Odd state!! state = %s\n", ++// state_names[dev->ep0state]); ++ dev->ep0state = WAIT_FOR_SETUP; ++ /* nuke(ep, 0); */ ++ /* usb_setb(ep->csr, USB_CSR0_SENDSTALL); */ ++// break; ++ return; ++ } ++ } ++ ++ /* ++ * if SETUPEND is set ++ * - abort the last transfer ++ * - set SERVICED_SETUP_END_BIT ++ */ ++ if (csr & USB_CSR0_SETUPEND) { ++ DEBUG_EP0("%s: USB_CSR0_SETUPEND is set: %x\n", __FUNCTION__, csr); ++ ++ usb_setb(dev, JZ_REG_UDC_CSR0, USB_CSR0_SVDSETUPEND); ++ nuke(ep, 0); ++ dev->ep0state = WAIT_FOR_SETUP; ++ } ++ ++ /* ++ * if USB_CSR0_OUTPKTRDY is set ++ * - read data packet from EP0 FIFO ++ * - decode command ++ * - if error ++ * set SVDOUTPKTRDY | DATAEND | SENDSTALL bits ++ * - else ++ * set SVDOUTPKTRDY | DATAEND bits ++ */ ++ if (csr & USB_CSR0_OUTPKTRDY) { ++ ++ DEBUG_EP0("%s: EP0_OUT_PKT_RDY is set: %x\n", __FUNCTION__, ++ csr); ++ ++ switch (dev->ep0state) { ++ case WAIT_FOR_SETUP: ++ DEBUG_EP0("WAIT_FOR_SETUP\n"); ++ jz4740_ep0_setup(dev, csr); ++ break; ++ ++ case DATA_STATE_RECV: ++ DEBUG_EP0("DATA_STATE_RECV\n"); ++ jz4740_ep0_out(dev, csr, 0); ++ break; ++ ++ default: ++ /* send stall? */ ++ DEBUG_EP0("strange state!! 2. send stall? state = %d\n", ++ dev->ep0state); ++ break; ++ } ++ } ++} ++ ++static void jz4740_ep0_kick(struct jz4740_udc *dev, struct jz4740_ep *ep) ++{ ++ uint32_t csr; ++ ++ jz_udc_set_index(dev, 0); ++ ++ DEBUG_EP0("%s: %x\n", __FUNCTION__, csr); ++ ++ /* Clear "out packet ready" */ ++ ++ if (ep_is_in(ep)) { ++ usb_setb(dev, JZ_REG_UDC_CSR0, USB_CSR0_SVDOUTPKTRDY); ++ csr = usb_readb(dev, JZ_REG_UDC_CSR0); ++ dev->ep0state = DATA_STATE_XMIT; ++ jz4740_ep0_in(dev, csr); ++ } else { ++ csr = usb_readb(dev, JZ_REG_UDC_CSR0); ++ dev->ep0state = DATA_STATE_RECV; ++ jz4740_ep0_out(dev, csr, 1); ++ } ++} ++ ++/** Handle USB RESET interrupt ++ */ ++static void jz4740_reset_irq(struct jz4740_udc *dev) ++{ ++ dev->gadget.speed = (usb_readb(dev, JZ_REG_UDC_POWER) & USB_POWER_HSMODE) ? ++ USB_SPEED_HIGH : USB_SPEED_FULL; ++ ++ DEBUG_SETUP("%s: address = %d, speed = %s\n", __FUNCTION__, 0, ++ (dev->gadget.speed == USB_SPEED_HIGH) ? "HIGH":"FULL" ); ++} ++ ++/* ++ * jz4740 usb device interrupt handler. ++ */ ++static irqreturn_t jz4740_udc_irq(int irq, void *devid) ++{ ++ struct jz4740_udc *jz4740_udc = devid; ++ uint8_t index; ++ ++ uint32_t intr_usb = usb_readb(jz4740_udc, JZ_REG_UDC_INTRUSB) & 0x7; /* mask SOF */ ++ uint32_t intr_in = usb_readw(jz4740_udc, JZ_REG_UDC_INTRIN); ++ uint32_t intr_out = usb_readw(jz4740_udc, JZ_REG_UDC_INTROUT); ++ uint32_t intr_dma = usb_readb(jz4740_udc, JZ_REG_UDC_INTR); ++ ++ if (!intr_usb && !intr_in && !intr_out && !intr_dma) ++ return IRQ_HANDLED; ++ ++ ++ DEBUG("intr_out=%x intr_in=%x intr_usb=%x\n", ++ intr_out, intr_in, intr_usb); ++ ++ spin_lock(&jz4740_udc->lock); ++ index = usb_readb(jz4740_udc, JZ_REG_UDC_INDEX); ++ ++ /* Check for resume from suspend mode */ ++ if ((intr_usb & USB_INTR_RESUME) && ++ (usb_readb(jz4740_udc, JZ_REG_UDC_INTRUSBE) & USB_INTR_RESUME)) { ++ DEBUG("USB resume\n"); ++ jz4740_udc->driver->resume(&jz4740_udc->gadget); /* We have suspend(), so we must have resume() too. */ ++ } ++ ++ /* Check for system interrupts */ ++ if (intr_usb & USB_INTR_RESET) { ++ DEBUG("USB reset\n"); ++ jz4740_reset_irq(jz4740_udc); ++ } ++ ++ /* Check for endpoint 0 interrupt */ ++ if (intr_in & USB_INTR_EP0) { ++ DEBUG("USB_INTR_EP0 (control)\n"); ++ jz4740_handle_ep0(jz4740_udc, intr_in); ++ } ++ ++ /* Check for Bulk-IN DMA interrupt */ ++ if (intr_dma & 0x1) { ++ int ep_num; ++ struct jz4740_ep *ep; ++ ep_num = (usb_readl(jz4740_udc, JZ_REG_UDC_CNTL1) >> 4) & 0xf; ++ ep = &jz4740_udc->ep[ep_num + 1]; ++ jz_udc_set_index(jz4740_udc, ep_num); ++ usb_setb(jz4740_udc, ep->csr, USB_INCSR_INPKTRDY); ++/* jz4740_in_epn(jz4740_udc, ep_num, intr_in);*/ ++ } ++ ++ /* Check for Bulk-OUT DMA interrupt */ ++ if (intr_dma & 0x2) { ++ int ep_num; ++ ep_num = (usb_readl(jz4740_udc, JZ_REG_UDC_CNTL2) >> 4) & 0xf; ++ jz4740_out_epn(jz4740_udc, ep_num, intr_out); ++ } ++ ++ /* Check for each configured endpoint interrupt */ ++ if (intr_in & USB_INTR_INEP1) { ++ DEBUG("USB_INTR_INEP1\n"); ++ jz4740_in_epn(jz4740_udc, 1, intr_in); ++ } ++ ++ if (intr_in & USB_INTR_INEP2) { ++ DEBUG("USB_INTR_INEP2\n"); ++ jz4740_in_epn(jz4740_udc, 2, intr_in); ++ } ++ ++ if (intr_out & USB_INTR_OUTEP1) { ++ DEBUG("USB_INTR_OUTEP1\n"); ++ jz4740_out_epn(jz4740_udc, 1, intr_out); ++ } ++ ++ /* Check for suspend mode */ ++ if ((intr_usb & USB_INTR_SUSPEND) && ++ (usb_readb(jz4740_udc, JZ_REG_UDC_INTRUSBE) & USB_INTR_SUSPEND)) { ++ DEBUG("USB suspend\n"); ++ jz4740_udc->driver->suspend(&jz4740_udc->gadget); ++ /* Host unloaded from us, can do something, such as flushing ++ the NAND block cache etc. */ ++ } ++ ++ jz_udc_set_index(jz4740_udc, index); ++ ++ spin_unlock(&jz4740_udc->lock); ++ ++ return IRQ_HANDLED; ++} ++ ++ ++ ++/*-------------------------------------------------------------------------*/ ++ ++ ++static inline struct jz4740_udc *gadget_to_udc(struct usb_gadget *gadget) ++{ ++ return container_of(gadget, struct jz4740_udc, gadget); ++} ++ ++static int jz4740_udc_get_frame(struct usb_gadget *_gadget) ++{ ++ DEBUG("%s, %p\n", __FUNCTION__, _gadget); ++ return usb_readw(gadget_to_udc(_gadget), JZ_REG_UDC_FRAME); ++} ++ ++static int jz4740_udc_wakeup(struct usb_gadget *_gadget) ++{ ++ /* host may not have enabled remote wakeup */ ++ /*if ((UDCCS0 & UDCCS0_DRWF) == 0) ++ return -EHOSTUNREACH; ++ udc_set_mask_UDCCR(UDCCR_RSM); */ ++ return -ENOTSUPP; ++} ++ ++static int jz4740_udc_pullup(struct usb_gadget *_gadget, int on) ++{ ++ struct jz4740_udc *udc = gadget_to_udc(_gadget); ++ unsigned long flags; ++ ++ local_irq_save(flags); ++ ++ if (on) { ++ udc->state = UDC_STATE_ENABLE; ++ udc_enable(udc); ++ } else { ++ udc->state = UDC_STATE_DISABLE; ++ udc_disable(udc); ++ } ++ ++ local_irq_restore(flags); ++ ++ return 0; ++} ++ ++ ++static const struct usb_gadget_ops jz4740_udc_ops = { ++ .get_frame = jz4740_udc_get_frame, ++ .wakeup = jz4740_udc_wakeup, ++ .pullup = jz4740_udc_pullup, ++}; ++ ++static struct usb_ep_ops jz4740_ep_ops = { ++ .enable = jz4740_ep_enable, ++ .disable = jz4740_ep_disable, ++ ++ .alloc_request = jz4740_alloc_request, ++ .free_request = jz4740_free_request, ++ ++ .queue = jz4740_queue, ++ .dequeue = jz4740_dequeue, ++ ++ .set_halt = jz4740_set_halt, ++ .fifo_status = jz4740_fifo_status, ++ .fifo_flush = jz4740_fifo_flush, ++}; ++ ++ ++/*-------------------------------------------------------------------------*/ ++ ++static struct jz4740_udc jz4740_udc_controller = { ++ .gadget = { ++ .ops = &jz4740_udc_ops, ++ .ep0 = &jz4740_udc_controller.ep[0].ep, ++ .name = "jz4740-udc", ++ .dev = { ++ .init_name = "gadget", ++ }, ++ }, ++ ++ /* control endpoint */ ++ .ep[0] = { ++ .ep = { ++ .name = "ep0", ++ .ops = &jz4740_ep_ops, ++ .maxpacket = EP0_MAXPACKETSIZE, ++ }, ++ .dev = &jz4740_udc_controller, ++ ++ .bEndpointAddress = 0, ++ .bmAttributes = 0, ++ ++ .type = ep_control, ++ .fifo = JZ_REG_UDC_EP_FIFO(0), ++ .csr = JZ_REG_UDC_CSR0, ++ }, ++ ++ /* bulk out endpoint */ ++ .ep[1] = { ++ .ep = { ++ .name = "ep1out-bulk", ++ .ops = &jz4740_ep_ops, ++ .maxpacket = EPBULK_MAXPACKETSIZE, ++ }, ++ .dev = &jz4740_udc_controller, ++ ++ .bEndpointAddress = 1, ++ .bmAttributes = USB_ENDPOINT_XFER_BULK, ++ ++ .type = ep_bulk_out, ++ .fifo = JZ_REG_UDC_EP_FIFO(1), ++ .csr = JZ_REG_UDC_OUTCSR, ++ }, ++ ++ /* bulk in endpoint */ ++ .ep[2] = { ++ .ep = { ++ .name = "ep1in-bulk", ++ .ops = &jz4740_ep_ops, ++ .maxpacket = EPBULK_MAXPACKETSIZE, ++ }, ++ .dev = &jz4740_udc_controller, ++ ++ .bEndpointAddress = 1 | USB_DIR_IN, ++ .bmAttributes = USB_ENDPOINT_XFER_BULK, ++ ++ .type = ep_bulk_in, ++ .fifo = JZ_REG_UDC_EP_FIFO(1), ++ .csr = JZ_REG_UDC_INCSR, ++ }, ++ ++ /* interrupt in endpoint */ ++ .ep[3] = { ++ .ep = { ++ .name = "ep2in-int", ++ .ops = &jz4740_ep_ops, ++ .maxpacket = EPINTR_MAXPACKETSIZE, ++ }, ++ .dev = &jz4740_udc_controller, ++ ++ .bEndpointAddress = 2 | USB_DIR_IN, ++ .bmAttributes = USB_ENDPOINT_XFER_INT, ++ ++ .type = ep_interrupt, ++ .fifo = JZ_REG_UDC_EP_FIFO(2), ++ .csr = JZ_REG_UDC_INCSR, ++ }, ++}; ++ ++static int __devinit jz4740_udc_probe(struct platform_device *pdev) ++{ ++ struct jz4740_udc *jz4740_udc = &jz4740_udc_controller; ++ int ret; ++ ++ spin_lock_init(&jz4740_udc->lock); ++ ++ jz4740_udc->dev = &pdev->dev; ++ jz4740_udc->gadget.dev.parent = &pdev->dev; ++ jz4740_udc->gadget.dev.dma_mask = pdev->dev.dma_mask; ++ ++ ret = device_register(&jz4740_udc->gadget.dev); ++ if (ret) ++ return ret; ++ ++ jz4740_udc->clk = clk_get(&pdev->dev, "udc"); ++ if (IS_ERR(jz4740_udc->clk)) { ++ ret = PTR_ERR(jz4740_udc->clk); ++ dev_err(&pdev->dev, "Failed to get udc clock: %d\n", ret); ++ goto err_device_unregister; ++ } ++ ++ platform_set_drvdata(pdev, jz4740_udc); ++ ++ jz4740_udc->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ ++ if (!jz4740_udc->mem) { ++ ret = -ENOENT; ++ dev_err(&pdev->dev, "Failed to get mmio memory resource\n"); ++ goto err_clk_put; ++ } ++ ++ jz4740_udc->mem = request_mem_region(jz4740_udc->mem->start, ++ resource_size(jz4740_udc->mem), pdev->name); ++ ++ if (!jz4740_udc->mem) { ++ ret = -EBUSY; ++ dev_err(&pdev->dev, "Failed to request mmio memory region\n"); ++ goto err_device_unregister; ++ } ++ ++ jz4740_udc->base = ioremap(jz4740_udc->mem->start, resource_size(jz4740_udc->mem)); ++ ++ if (!jz4740_udc->base) { ++ ret = -EBUSY; ++ dev_err(&pdev->dev, "Failed to ioremap mmio memory\n"); ++ goto err_release_mem_region; ++ } ++ ++ jz4740_udc->irq = platform_get_irq(pdev, 0); ++ ret = request_irq(jz4740_udc->irq, jz4740_udc_irq, 0, pdev->name, ++ jz4740_udc); ++ if (ret) { ++ dev_err(&pdev->dev, "Failed to request irq: %d\n", ret); ++ goto err_iounmap; ++ } ++ ++ udc_disable(jz4740_udc); ++ udc_reinit(jz4740_udc); ++ ++ return 0; ++ ++err_iounmap: ++ iounmap(jz4740_udc->base); ++err_release_mem_region: ++ release_mem_region(jz4740_udc->mem->start, resource_size(jz4740_udc->mem)); ++err_clk_put: ++ clk_put(jz4740_udc->clk); ++err_device_unregister: ++ device_unregister(&jz4740_udc->gadget.dev); ++ platform_set_drvdata(pdev, NULL); ++ ++ return ret; ++} ++ ++static int __devexit jz4740_udc_remove(struct platform_device *pdev) ++{ ++ struct jz4740_udc *dev = platform_get_drvdata(pdev); ++ ++ if (dev->driver) ++ return -EBUSY; ++ ++ udc_disable(dev); ++ ++ free_irq(dev->irq, dev); ++ iounmap(dev->base); ++ release_mem_region(dev->mem->start, resource_size(dev->mem)); ++ clk_put(dev->clk); ++ ++ platform_set_drvdata(pdev, NULL); ++ device_unregister(&dev->gadget.dev); ++ ++ return 0; ++} ++ ++#ifdef CONFIG_PM ++ ++static int jz4740_udc_suspend(struct device *dev) ++{ ++ struct jz4740_udc *jz4740_udc = dev_get_drvdata(dev); ++ ++ if (jz4740_udc->state == UDC_STATE_ENABLE) ++ udc_disable(jz4740_udc); ++ ++ return 0; ++} ++ ++static int jz4740_udc_resume(struct device *dev) ++{ ++ struct jz4740_udc *jz4740_udc = dev_get_drvdata(dev); ++ ++ if (jz4740_udc->state == UDC_STATE_ENABLE) ++ udc_enable(jz4740_udc); ++ ++ return 0; ++} ++ ++static const struct dev_pm_ops jz4740_udc_pm_ops = { ++ .suspend = jz4740_udc_suspend, ++ .resume = jz4740_udc_resume, ++}; ++ ++#define JZ4740_UDC_PM_OPS (&jz4740_udc_pm_ops) ++ ++#else ++#define JZ4740_UDC_PM_OPS NULL ++#endif ++ ++static struct platform_driver udc_driver = { ++ .probe = jz4740_udc_probe, ++ .remove = __devexit_p(jz4740_udc_remove), ++ .driver = { ++ .name = "jz-udc", ++ .owner = THIS_MODULE, ++ .pm = JZ4740_UDC_PM_OPS, ++ }, ++}; ++ ++/*-------------------------------------------------------------------------*/ ++ ++static int __init udc_init (void) ++{ ++ return platform_driver_register(&udc_driver); ++} ++module_init(udc_init); ++ ++static void __exit udc_exit (void) ++{ ++ platform_driver_unregister(&udc_driver); ++} ++module_exit(udc_exit); ++ ++MODULE_DESCRIPTION("JZ4740 USB Device Controller"); ++MODULE_AUTHOR("Wei Jianli "); ++MODULE_LICENSE("GPL"); +diff --git a/drivers/usb/gadget/jz4740_udc.h b/drivers/usb/gadget/jz4740_udc.h +new file mode 100644 +index 0000000..53fd1da +--- /dev/null ++++ b/drivers/usb/gadget/jz4740_udc.h +@@ -0,0 +1,101 @@ ++/* ++ * linux/drivers/usb/gadget/jz4740_udc.h ++ * ++ * Ingenic JZ4740 on-chip high speed USB device controller ++ * ++ * Copyright (C) 2006 Ingenic Semiconductor Inc. ++ * Author: ++ * ++ * 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. ++ */ ++ ++#ifndef __USB_GADGET_JZ4740_H__ ++#define __USB_GADGET_JZ4740_H__ ++ ++/*-------------------------------------------------------------------------*/ ++ ++// Max packet size ++#define EP0_MAXPACKETSIZE 64 ++#define EPBULK_MAXPACKETSIZE 512 ++#define EPINTR_MAXPACKETSIZE 64 ++ ++#define UDC_MAX_ENDPOINTS 4 ++ ++/*-------------------------------------------------------------------------*/ ++ ++enum ep_type { ++ ep_control, ep_bulk_in, ep_bulk_out, ep_interrupt ++}; ++ ++struct jz4740_ep { ++ struct usb_ep ep; ++ struct jz4740_udc *dev; ++ ++ const struct usb_endpoint_descriptor *desc; ++ ++ uint8_t stopped; ++ uint8_t bEndpointAddress; ++ uint8_t bmAttributes; ++ ++ enum ep_type type; ++ size_t fifo; ++ uint32_t csr; ++ ++ uint32_t reg_addr; ++ struct list_head queue; ++}; ++ ++struct jz4740_request { ++ struct usb_request req; ++ struct list_head queue; ++}; ++ ++enum ep0state { ++ WAIT_FOR_SETUP, /* between STATUS ack and SETUP report */ ++ DATA_STATE_XMIT, /* data tx stage */ ++ DATA_STATE_NEED_ZLP, /* data tx zlp stage */ ++ WAIT_FOR_OUT_STATUS, /* status stages */ ++ DATA_STATE_RECV, /* data rx stage */ ++}; ++ ++/* For function binding with UDC Disable - Added by River */ ++typedef enum { ++ UDC_STATE_ENABLE = 0, ++ UDC_STATE_DISABLE, ++}udc_state_t; ++ ++struct jz4740_udc { ++ struct usb_gadget gadget; ++ struct usb_gadget_driver *driver; ++ struct device *dev; ++ spinlock_t lock; ++ unsigned long lock_flags; ++ ++ enum ep0state ep0state; ++ struct jz4740_ep ep[UDC_MAX_ENDPOINTS]; ++ ++ udc_state_t state; ++ ++ struct resource *mem; ++ void __iomem *base; ++ int irq; ++ ++ struct clk *clk; ++}; ++ ++#define ep_maxpacket(EP) ((EP)->ep.maxpacket) ++ ++static inline bool ep_is_in(const struct jz4740_ep *ep) ++{ ++ return (ep->bEndpointAddress & USB_DIR_IN) == USB_DIR_IN; ++} ++ ++static inline uint8_t ep_index(const struct jz4740_ep *ep) ++{ ++ return ep->bEndpointAddress & 0xf; ++} ++ ++#endif /* __USB_GADGET_JZ4740_H__ */ + + diff --git a/recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/logo_linux_clut224.tar.gz b/recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/logo_linux_clut224.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..06de727a05c99d3e487982ee007d710c0bc11162 GIT binary patch literal 8416 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 +Date: Sat, 24 Apr 2010 12:22:25 +0200 +Subject: [PATCH] Modify keymap for ben nanonote + +--- + drivers/char/defkeymap.c_shipped | 308 +++++++++++++++++++++++++++++--------- + drivers/char/defkeymap.map | 74 +++++++--- + 2 files changed, 286 insertions(+), 96 deletions(-) + +--- a/drivers/tty/vt/defkeymap.c_shipped ++++ b/drivers/tty/vt/defkeymap.c_shipped +@@ -9,10 +9,10 @@ u_short plain_map[NR_KEYS] = { + 0xf200, 0xf01b, 0xf031, 0xf032, 0xf033, 0xf034, 0xf035, 0xf036, + 0xf037, 0xf038, 0xf039, 0xf030, 0xf02d, 0xf03d, 0xf07f, 0xf009, + 0xfb71, 0xfb77, 0xfb65, 0xfb72, 0xfb74, 0xfb79, 0xfb75, 0xfb69, +- 0xfb6f, 0xfb70, 0xf05b, 0xf05d, 0xf201, 0xf702, 0xfb61, 0xfb73, ++ 0xfb6f, 0xfb70, 0xf05b, 0xf05d, 0xf201, 0xf706, 0xfb61, 0xfb73, + 0xfb64, 0xfb66, 0xfb67, 0xfb68, 0xfb6a, 0xfb6b, 0xfb6c, 0xf03b, + 0xf027, 0xf060, 0xf700, 0xf05c, 0xfb7a, 0xfb78, 0xfb63, 0xfb76, +- 0xfb62, 0xfb6e, 0xfb6d, 0xf02c, 0xf02e, 0xf02f, 0xf700, 0xf30c, ++ 0xfb62, 0xfb6e, 0xfb6d, 0xf02c, 0xf02e, 0xf02f, 0xf701, 0xf30c, + 0xf703, 0xf020, 0xf207, 0xf100, 0xf101, 0xf102, 0xf103, 0xf104, + 0xf105, 0xf106, 0xf107, 0xf108, 0xf109, 0xf208, 0xf209, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, +@@ -22,54 +22,102 @@ u_short plain_map[NR_KEYS] = { + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + }; + +-u_short shift_map[NR_KEYS] = { ++static u_short shift_map[NR_KEYS] = { + 0xf200, 0xf01b, 0xf021, 0xf040, 0xf023, 0xf024, 0xf025, 0xf05e, + 0xf026, 0xf02a, 0xf028, 0xf029, 0xf05f, 0xf02b, 0xf07f, 0xf009, + 0xfb51, 0xfb57, 0xfb45, 0xfb52, 0xfb54, 0xfb59, 0xfb55, 0xfb49, +- 0xfb4f, 0xfb50, 0xf07b, 0xf07d, 0xf201, 0xf702, 0xfb41, 0xfb53, ++ 0xfb4f, 0xfb50, 0xf07b, 0xf07d, 0xf201, 0xf706, 0xfb41, 0xfb53, + 0xfb44, 0xfb46, 0xfb47, 0xfb48, 0xfb4a, 0xfb4b, 0xfb4c, 0xf03a, + 0xf022, 0xf07e, 0xf700, 0xf07c, 0xfb5a, 0xfb58, 0xfb43, 0xfb56, +- 0xfb42, 0xfb4e, 0xfb4d, 0xf03c, 0xf03e, 0xf03f, 0xf700, 0xf30c, ++ 0xfb42, 0xfb4e, 0xfb4d, 0xf03b, 0xf03a, 0xf03f, 0xf701, 0xf30c, + 0xf703, 0xf020, 0xf207, 0xf10a, 0xf10b, 0xf10c, 0xf10d, 0xf10e, + 0xf10f, 0xf110, 0xf111, 0xf112, 0xf113, 0xf213, 0xf203, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, + 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf03e, 0xf10a, + 0xf10b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, +- 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, ++ 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf20b, 0xf601, 0xf602, 0xf117, 0xf600, 0xf20a, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + }; + +-u_short altgr_map[NR_KEYS] = { ++static u_short altgr_map[NR_KEYS] = { + 0xf200, 0xf200, 0xf200, 0xf040, 0xf200, 0xf024, 0xf200, 0xf200, +- 0xf07b, 0xf05b, 0xf05d, 0xf07d, 0xf05c, 0xf200, 0xf200, 0xf200, +- 0xfb71, 0xfb77, 0xf918, 0xfb72, 0xfb74, 0xfb79, 0xfb75, 0xfb69, +- 0xfb6f, 0xfb70, 0xf200, 0xf07e, 0xf201, 0xf702, 0xf914, 0xfb73, +- 0xf917, 0xf919, 0xfb67, 0xfb68, 0xfb6a, 0xfb6b, 0xfb6c, 0xf200, +- 0xf200, 0xf200, 0xf700, 0xf200, 0xfb7a, 0xfb78, 0xf916, 0xfb76, +- 0xf915, 0xfb6e, 0xfb6d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, +- 0xf703, 0xf200, 0xf207, 0xf50c, 0xf50d, 0xf50e, 0xf50f, 0xf510, +- 0xf511, 0xf512, 0xf513, 0xf514, 0xf515, 0xf208, 0xf202, 0xf911, ++ 0xf07b, 0xf05b, 0xf05d, 0xf07d, 0xf05c, 0xf07e, 0xf008, 0xf200, ++ 0xf021, 0xf040, 0xf023, 0xf024, 0xf025, 0xf05e, 0xf026, 0xf02a, ++ 0xf028, 0xf029, 0xf200, 0xf07e, 0xf201, 0xf706, 0xf0b0, 0xf0a8, ++ 0xf0a4, 0xf02d, 0xf05f, 0xf07b, 0xf05b, 0xf05d, 0xf07d, 0xf200, ++ 0xf200, 0xf200, 0xf700, 0xf200, 0xf039, 0xf030, 0xf916, 0xfb76, ++ 0xf915, 0xf03c, 0xf03e, 0xf027, 0xf022, 0xf200, 0xf701, 0xf30c, ++ 0xf703, 0xf200, 0xf207, 0xf031, 0xf032, 0xf033, 0xf034, 0xf035, ++ 0xf036, 0xf037, 0xf038, 0xf514, 0xf515, 0xf208, 0xf202, 0xf911, + 0xf912, 0xf913, 0xf30b, 0xf90e, 0xf90f, 0xf910, 0xf30a, 0xf90b, + 0xf90c, 0xf90d, 0xf90a, 0xf310, 0xf206, 0xf200, 0xf07c, 0xf516, + 0xf517, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, +- 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, ++ 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + }; + +-u_short ctrl_map[NR_KEYS] = { ++static u_short ctrl_map[NR_KEYS] = { + 0xf200, 0xf200, 0xf200, 0xf000, 0xf01b, 0xf01c, 0xf01d, 0xf01e, +- 0xf01f, 0xf07f, 0xf200, 0xf200, 0xf01f, 0xf200, 0xf008, 0xf200, ++ 0xf01f, 0xf07f, 0xf200, 0xf200, 0xf01f, 0xf200, 0xf200, 0xf200, + 0xf011, 0xf017, 0xf005, 0xf012, 0xf014, 0xf019, 0xf015, 0xf009, +- 0xf00f, 0xf010, 0xf01b, 0xf01d, 0xf201, 0xf702, 0xf001, 0xf013, ++ 0xf00f, 0xf010, 0xf01b, 0xf01d, 0xf201, 0xf706, 0xf001, 0xf013, + 0xf004, 0xf006, 0xf007, 0xf008, 0xf00a, 0xf00b, 0xf00c, 0xf200, + 0xf007, 0xf000, 0xf700, 0xf01c, 0xf01a, 0xf018, 0xf003, 0xf016, +- 0xf002, 0xf00e, 0xf00d, 0xf200, 0xf20e, 0xf07f, 0xf700, 0xf30c, ++ 0xf002, 0xf00e, 0xf00d, 0xf200, 0xf20e, 0xf07f, 0xf701, 0xf30c, + 0xf703, 0xf000, 0xf207, 0xf100, 0xf101, 0xf102, 0xf103, 0xf104, + 0xf105, 0xf106, 0xf107, 0xf108, 0xf109, 0xf208, 0xf204, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, +@@ -79,35 +127,67 @@ u_short ctrl_map[NR_KEYS] = { + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + }; + +-u_short shift_ctrl_map[NR_KEYS] = { ++static u_short shift_ctrl_map[NR_KEYS] = { + 0xf200, 0xf200, 0xf200, 0xf000, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf01f, 0xf200, 0xf200, 0xf200, + 0xf011, 0xf017, 0xf005, 0xf012, 0xf014, 0xf019, 0xf015, 0xf009, +- 0xf00f, 0xf010, 0xf200, 0xf200, 0xf201, 0xf702, 0xf001, 0xf013, ++ 0xf00f, 0xf010, 0xf200, 0xf200, 0xf201, 0xf706, 0xf001, 0xf013, + 0xf004, 0xf006, 0xf007, 0xf008, 0xf00a, 0xf00b, 0xf00c, 0xf200, + 0xf200, 0xf200, 0xf700, 0xf200, 0xf01a, 0xf018, 0xf003, 0xf016, +- 0xf002, 0xf00e, 0xf00d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, ++ 0xf002, 0xf00e, 0xf00d, 0xf200, 0xf200, 0xf200, 0xf701, 0xf30c, + 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, + 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, +- 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, ++ 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + }; + +-u_short alt_map[NR_KEYS] = { ++static u_short alt_map[NR_KEYS] = { + 0xf200, 0xf81b, 0xf831, 0xf832, 0xf833, 0xf834, 0xf835, 0xf836, + 0xf837, 0xf838, 0xf839, 0xf830, 0xf82d, 0xf83d, 0xf87f, 0xf809, + 0xf871, 0xf877, 0xf865, 0xf872, 0xf874, 0xf879, 0xf875, 0xf869, +- 0xf86f, 0xf870, 0xf85b, 0xf85d, 0xf80d, 0xf702, 0xf861, 0xf873, ++ 0xf86f, 0xf870, 0xf85b, 0xf85d, 0xf80d, 0xf706, 0xf861, 0xf873, + 0xf864, 0xf866, 0xf867, 0xf868, 0xf86a, 0xf86b, 0xf86c, 0xf83b, + 0xf827, 0xf860, 0xf700, 0xf85c, 0xf87a, 0xf878, 0xf863, 0xf876, +- 0xf862, 0xf86e, 0xf86d, 0xf82c, 0xf82e, 0xf82f, 0xf700, 0xf30c, ++ 0xf862, 0xf86e, 0xf86d, 0xf200, 0xf200, 0xf82f, 0xf701, 0xf30c, + 0xf703, 0xf820, 0xf207, 0xf500, 0xf501, 0xf502, 0xf503, 0xf504, + 0xf505, 0xf506, 0xf507, 0xf508, 0xf509, 0xf208, 0xf209, 0xf907, + 0xf908, 0xf909, 0xf30b, 0xf904, 0xf905, 0xf906, 0xf30a, 0xf901, +@@ -117,35 +197,115 @@ u_short alt_map[NR_KEYS] = { + 0xf118, 0xf210, 0xf211, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + }; + +-u_short ctrl_alt_map[NR_KEYS] = { ++static u_short ctrl_alt_map[NR_KEYS] = { + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + 0xf811, 0xf817, 0xf805, 0xf812, 0xf814, 0xf819, 0xf815, 0xf809, +- 0xf80f, 0xf810, 0xf200, 0xf200, 0xf201, 0xf702, 0xf801, 0xf813, ++ 0xf80f, 0xf810, 0xf200, 0xf200, 0xf201, 0xf706, 0xf801, 0xf813, + 0xf804, 0xf806, 0xf807, 0xf808, 0xf80a, 0xf80b, 0xf80c, 0xf200, + 0xf200, 0xf200, 0xf700, 0xf200, 0xf81a, 0xf818, 0xf803, 0xf816, +- 0xf802, 0xf80e, 0xf80d, 0xf200, 0xf200, 0xf200, 0xf700, 0xf30c, ++ 0xf802, 0xf80e, 0xf80d, 0xf200, 0xf200, 0xf200, 0xf701, 0xf30c, + 0xf703, 0xf200, 0xf207, 0xf500, 0xf501, 0xf502, 0xf503, 0xf504, + 0xf505, 0xf506, 0xf507, 0xf508, 0xf509, 0xf208, 0xf200, 0xf307, + 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, + 0xf302, 0xf303, 0xf300, 0xf20c, 0xf206, 0xf200, 0xf200, 0xf50a, + 0xf50b, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, +- 0xf30e, 0xf702, 0xf30d, 0xf200, 0xf701, 0xf205, 0xf114, 0xf603, ++ 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, + 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf20c, + 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, + 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++}; ++ ++static u_short ctl_map[NR_KEYS] = { ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf033, 0xf200, 0xf200, ++ 0xfb71, 0xfb77, 0xfb65, 0xfb72, 0xfb74, 0xfb79, 0xf037, 0xf038, ++ 0xf039, 0xfb70, 0xf200, 0xf200, 0xf201, 0xf706, 0xfb61, 0xfb73, ++ 0xfb64, 0xfb66, 0xfb67, 0xfb68, 0xf034, 0xf035, 0xf036, 0xf200, ++ 0xf200, 0xf200, 0xf700, 0xf200, 0xfb7a, 0xfb78, 0xfb63, 0xfb76, ++ 0xfb62, 0xf031, 0xf032, 0xf200, 0xf200, 0xf030, 0xf701, 0xf30c, ++ 0xf703, 0xf200, 0xf207, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf208, 0xf200, 0xf307, ++ 0xf308, 0xf309, 0xf30b, 0xf304, 0xf305, 0xf306, 0xf30a, 0xf301, ++ 0xf302, 0xf303, 0xf300, 0xf310, 0xf206, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf30e, 0xf702, 0xf30d, 0xf01c, 0xf701, 0xf205, 0xf114, 0xf603, ++ 0xf118, 0xf601, 0xf602, 0xf117, 0xf600, 0xf119, 0xf115, 0xf116, ++ 0xf11a, 0xf10c, 0xf10d, 0xf11b, 0xf11c, 0xf110, 0xf311, 0xf11d, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, ++ 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, + }; + + ushort *key_maps[MAX_NR_KEYMAPS] = { +- plain_map, shift_map, altgr_map, NULL, +- ctrl_map, shift_ctrl_map, NULL, NULL, +- alt_map, NULL, NULL, NULL, +- ctrl_alt_map, NULL ++ plain_map, shift_map, altgr_map, 0, ++ ctrl_map, shift_ctrl_map, 0, 0, ++ alt_map, 0, 0, 0, ++ ctrl_alt_map, 0, 0, 0, ++ 0, 0, 0, 0, ++ 0, 0, 0, 0, ++ 0, 0, 0, 0, ++ 0, 0, 0, 0, ++ 0, 0, 0, 0, ++ 0, 0, 0, 0, ++ 0, 0, 0, 0, ++ 0, 0, 0, 0, ++ 0, 0, 0, 0, ++ 0, 0, 0, 0, ++ 0, 0, 0, 0, ++ 0, 0, 0, 0, ++ ctl_map, 0 + }; + +-unsigned int keymap_count = 7; ++unsigned int keymap_count = 8; + + /* + * Philosophy: most people do not define more strings, but they who do +@@ -216,47 +376,47 @@ char *func_table[MAX_NR_FUNC] = { + func_buf + 135, + func_buf + 140, + func_buf + 145, +- NULL, +- NULL, ++ 0, ++ 0, + func_buf + 149, +- NULL, ++ 0, + }; + +-struct kbdiacruc accent_table[MAX_DIACR] = { +- {'`', 'A', 0300}, {'`', 'a', 0340}, +- {'\'', 'A', 0301}, {'\'', 'a', 0341}, +- {'^', 'A', 0302}, {'^', 'a', 0342}, +- {'~', 'A', 0303}, {'~', 'a', 0343}, +- {'"', 'A', 0304}, {'"', 'a', 0344}, +- {'O', 'A', 0305}, {'o', 'a', 0345}, +- {'0', 'A', 0305}, {'0', 'a', 0345}, +- {'A', 'A', 0305}, {'a', 'a', 0345}, +- {'A', 'E', 0306}, {'a', 'e', 0346}, +- {',', 'C', 0307}, {',', 'c', 0347}, +- {'`', 'E', 0310}, {'`', 'e', 0350}, +- {'\'', 'E', 0311}, {'\'', 'e', 0351}, +- {'^', 'E', 0312}, {'^', 'e', 0352}, +- {'"', 'E', 0313}, {'"', 'e', 0353}, +- {'`', 'I', 0314}, {'`', 'i', 0354}, +- {'\'', 'I', 0315}, {'\'', 'i', 0355}, +- {'^', 'I', 0316}, {'^', 'i', 0356}, +- {'"', 'I', 0317}, {'"', 'i', 0357}, +- {'-', 'D', 0320}, {'-', 'd', 0360}, +- {'~', 'N', 0321}, {'~', 'n', 0361}, +- {'`', 'O', 0322}, {'`', 'o', 0362}, +- {'\'', 'O', 0323}, {'\'', 'o', 0363}, +- {'^', 'O', 0324}, {'^', 'o', 0364}, +- {'~', 'O', 0325}, {'~', 'o', 0365}, +- {'"', 'O', 0326}, {'"', 'o', 0366}, +- {'/', 'O', 0330}, {'/', 'o', 0370}, +- {'`', 'U', 0331}, {'`', 'u', 0371}, +- {'\'', 'U', 0332}, {'\'', 'u', 0372}, +- {'^', 'U', 0333}, {'^', 'u', 0373}, +- {'"', 'U', 0334}, {'"', 'u', 0374}, +- {'\'', 'Y', 0335}, {'\'', 'y', 0375}, +- {'T', 'H', 0336}, {'t', 'h', 0376}, +- {'s', 's', 0337}, {'"', 'y', 0377}, +- {'s', 'z', 0337}, {'i', 'j', 0377}, ++struct kbdiacr accent_table[MAX_DIACR] = { ++ {'`', 'A', '\300'}, {'`', 'a', '\340'}, ++ {'\'', 'A', '\301'}, {'\'', 'a', '\341'}, ++ {'^', 'A', '\302'}, {'^', 'a', '\342'}, ++ {'~', 'A', '\303'}, {'~', 'a', '\343'}, ++ {'"', 'A', '\304'}, {'"', 'a', '\344'}, ++ {'O', 'A', '\305'}, {'o', 'a', '\345'}, ++ {'0', 'A', '\305'}, {'0', 'a', '\345'}, ++ {'A', 'A', '\305'}, {'a', 'a', '\345'}, ++ {'A', 'E', '\306'}, {'a', 'e', '\346'}, ++ {',', 'C', '\307'}, {',', 'c', '\347'}, ++ {'`', 'E', '\310'}, {'`', 'e', '\350'}, ++ {'\'', 'E', '\311'}, {'\'', 'e', '\351'}, ++ {'^', 'E', '\312'}, {'^', 'e', '\352'}, ++ {'"', 'E', '\313'}, {'"', 'e', '\353'}, ++ {'`', 'I', '\314'}, {'`', 'i', '\354'}, ++ {'\'', 'I', '\315'}, {'\'', 'i', '\355'}, ++ {'^', 'I', '\316'}, {'^', 'i', '\356'}, ++ {'"', 'I', '\317'}, {'"', 'i', '\357'}, ++ {'-', 'D', '\320'}, {'-', 'd', '\360'}, ++ {'~', 'N', '\321'}, {'~', 'n', '\361'}, ++ {'`', 'O', '\322'}, {'`', 'o', '\362'}, ++ {'\'', 'O', '\323'}, {'\'', 'o', '\363'}, ++ {'^', 'O', '\324'}, {'^', 'o', '\364'}, ++ {'~', 'O', '\325'}, {'~', 'o', '\365'}, ++ {'"', 'O', '\326'}, {'"', 'o', '\366'}, ++ {'/', 'O', '\330'}, {'/', 'o', '\370'}, ++ {'`', 'U', '\331'}, {'`', 'u', '\371'}, ++ {'\'', 'U', '\332'}, {'\'', 'u', '\372'}, ++ {'^', 'U', '\333'}, {'^', 'u', '\373'}, ++ {'"', 'U', '\334'}, {'"', 'u', '\374'}, ++ {'\'', 'Y', '\335'}, {'\'', 'y', '\375'}, ++ {'T', 'H', '\336'}, {'t', 'h', '\376'}, ++ {'s', 's', '\337'}, {'"', 'y', '\377'}, ++ {'s', 'z', '\337'}, {'i', 'j', '\377'}, + }; + + unsigned int accent_table_size = 68; +--- a/drivers/tty/vt/defkeymap.map ++++ b/drivers/tty/vt/defkeymap.map +@@ -1,5 +1,5 @@ + # Default kernel keymap. This uses 7 modifier combinations. +-keymaps 0-2,4-5,8,12 ++keymaps 0-2,4-5,8,12,64 + # Change the above line into + # keymaps 0-2,4-6,8,12 + # in case you want the entries +@@ -45,24 +45,38 @@ keycode 12 = minus underscor + control keycode 12 = Control_underscore + shift control keycode 12 = Control_underscore + alt keycode 12 = Meta_minus +-keycode 13 = equal plus ++keycode 13 = equal plus + alt keycode 13 = Meta_equal ++ altgr keycode 13 = asciitilde ++ ctrll keycode 13 = three + keycode 14 = Delete Delete +- control keycode 14 = BackSpace ++ altgr keycode 14 = BackSpace + alt keycode 14 = Meta_Delete + keycode 15 = Tab Tab + alt keycode 15 = Meta_Tab + keycode 16 = q ++ altgr keycode 16 = exclam + keycode 17 = w ++ altgr keycode 17 = at + keycode 18 = e +- altgr keycode 18 = Hex_E ++ altgr keycode 18 = numbersign + keycode 19 = r ++ altgr keycode 19 = dollar + keycode 20 = t ++ altgr keycode 20 = percent + keycode 21 = y ++ altgr keycode 21 = asciicircum + keycode 22 = u ++ altgr keycode 22 = ampersand ++ ctrll keycode 22 = seven + keycode 23 = i ++ altgr keycode 23 = asterisk ++ ctrll keycode 23 = eight + keycode 24 = o ++ altgr keycode 24 = parenleft ++ ctrll keycode 24 = nine + keycode 25 = p ++ altgr keycode 25 = parenright + keycode 26 = bracketleft braceleft + control keycode 26 = Escape + alt keycode 26 = Meta_bracketleft +@@ -71,19 +85,28 @@ keycode 27 = bracketright bracerigh + alt keycode 27 = Meta_bracketright + keycode 28 = Return + alt keycode 28 = Meta_Control_m +-keycode 29 = Control ++keycode 29 = CtrlL + keycode 30 = a +- altgr keycode 30 = Hex_A ++ altgr keycode 30 = U+00B0 + keycode 31 = s ++ altgr keycode 31 = U+00A8 + keycode 32 = d +- altgr keycode 32 = Hex_D ++ altgr keycode 32 = U+20AC + keycode 33 = f +- altgr keycode 33 = Hex_F ++ altgr keycode 33 = minus + keycode 34 = g ++ altgr keycode 34 = underscore + keycode 35 = h ++ altgr keycode 35 = braceleft + keycode 36 = j ++ altgr keycode 36 = bracketleft ++ ctrll keycode 36 = four + keycode 37 = k ++ altgr keycode 37 = bracketright ++ ctrll keycode 37 = five + keycode 38 = l ++ altgr keycode 38 = braceright ++ ctrll keycode 38 = six + keycode 39 = semicolon colon + alt keycode 39 = Meta_semicolon + keycode 40 = apostrophe quotedbl +@@ -97,58 +120,65 @@ keycode 43 = backslash bar + control keycode 43 = Control_backslash + alt keycode 43 = Meta_backslash + keycode 44 = z ++ altgr keycode 44 = nine + keycode 45 = x ++ altgr keycode 45 = zero + keycode 46 = c + altgr keycode 46 = Hex_C + keycode 47 = v + keycode 48 = b + altgr keycode 48 = Hex_B + keycode 49 = n ++ altgr keycode 49 = less ++ ctrll keycode 49 = one + keycode 50 = m +-keycode 51 = comma less +- alt keycode 51 = Meta_comma +-keycode 52 = period greater ++ altgr keycode 50 = greater ++ ctrll keycode 50 = two ++keycode 51 = comma semicolon ++ altgr keycode 51 = apostrophe ++keycode 52 = period colon + control keycode 52 = Compose +- alt keycode 52 = Meta_period ++ altgr keycode 52 = quotedbl + keycode 53 = slash question + control keycode 53 = Delete + alt keycode 53 = Meta_slash +-keycode 54 = Shift ++ ctrll keycode 53 = zero ++keycode 54 = AltGr + keycode 55 = KP_Multiply + keycode 56 = Alt + keycode 57 = space space + control keycode 57 = nul + alt keycode 57 = Meta_space + keycode 58 = Caps_Lock +-keycode 59 = F1 F11 Console_13 ++keycode 59 = F1 F11 one + control keycode 59 = F1 + alt keycode 59 = Console_1 + control alt keycode 59 = Console_1 +-keycode 60 = F2 F12 Console_14 ++keycode 60 = F2 F12 two + control keycode 60 = F2 + alt keycode 60 = Console_2 + control alt keycode 60 = Console_2 +-keycode 61 = F3 F13 Console_15 ++keycode 61 = F3 F13 three + control keycode 61 = F3 + alt keycode 61 = Console_3 + control alt keycode 61 = Console_3 +-keycode 62 = F4 F14 Console_16 ++keycode 62 = F4 F14 four + control keycode 62 = F4 + alt keycode 62 = Console_4 + control alt keycode 62 = Console_4 +-keycode 63 = F5 F15 Console_17 ++keycode 63 = F5 F15 five + control keycode 63 = F5 + alt keycode 63 = Console_5 + control alt keycode 63 = Console_5 +-keycode 64 = F6 F16 Console_18 ++keycode 64 = F6 F16 six + control keycode 64 = F6 + alt keycode 64 = Console_6 + control alt keycode 64 = Console_6 +-keycode 65 = F7 F17 Console_19 ++keycode 65 = F7 F17 seven + control keycode 65 = F7 + alt keycode 65 = Console_7 + control alt keycode 65 = Console_7 +-keycode 66 = F8 F18 Console_20 ++keycode 66 = F8 F18 eight + control keycode 66 = F8 + alt keycode 66 = Console_8 + control alt keycode 66 = Console_8 +@@ -220,7 +250,7 @@ keycode 93 = + keycode 94 = + keycode 95 = + keycode 96 = KP_Enter +-keycode 97 = Control ++keycode 97 = Control + keycode 98 = KP_Divide + keycode 99 = Control_backslash + control keycode 99 = Control_backslash diff --git a/recipes/linux/linux-kexecboot_2.6.37.bb b/recipes/linux/linux-kexecboot_2.6.37.bb index ee94106cbe..192548887f 100644 --- a/recipes/linux/linux-kexecboot_2.6.37.bb +++ b/recipes/linux/linux-kexecboot_2.6.37.bb @@ -1,18 +1,25 @@ require linux-kexecboot.inc -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" S = "${WORKDIR}/linux-${PV}" # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_ben-nanonote = "1" + SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.2.bz2;name=stablepatch \ file://defconfig " SRC_URI_append_collie = " file://collie-locomo-kb.patch;status=upstream " +SRC_URI_append_ben-nanonote = "file://modifier-keys.patch \ + file://defconfig \ +# file://jz4740-udc.patch \ + " + SRC_URI[kernel.md5sum] = "c8ee37b4fdccdb651e0603d35350b434" SRC_URI[kernel.sha256sum] = "edbf091805414739cf57a3bbfeba9e87f5e74f97e38f04d12060e9e0c71e383a" SRC_URI[stablepatch.md5sum] = "bb5798f2a2a5af13219d1a250c4dad11" From be3df3f3d41277f5a149c8de21a5169059f7799a Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Tue, 1 Mar 2011 08:43:43 +0100 Subject: [PATCH 145/509] linux-kexecboot.inc: fix CMDLINE_DEBUG tag * bump INC_PR Signed-off-by: Andrea Adami --- recipes/linux/linux-kexecboot.inc | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/recipes/linux/linux-kexecboot.inc b/recipes/linux/linux-kexecboot.inc index 90ee7c28ce..ec78848dbe 100644 --- a/recipes/linux/linux-kexecboot.inc +++ b/recipes/linux/linux-kexecboot.inc @@ -1,5 +1,5 @@ # We set INC_PR here, since a change in the kexecboot recipe will need to get picked up by *all* the kernels: -INC_PR = "r30" +INC_PR = "r31" inherit kernel siteinfo @@ -12,21 +12,19 @@ TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches" LOGO_SIZE ?= "." SRC_URI = "file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2" -# Note how we set master console on serial to protect bootlogo. -CMDLINE_c7x0 = "console=tty1 console=ttyS0,115200n8" -CMDLINE_tosa = "console=tty1 console=ttyS0,115200n8" -CMDLINE_poodle = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" -CMDLINE_akita = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" -CMDLINE_collie = "console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M" -CMDLINE_spitz = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" -CMDLINE_hx4700 = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" -CMDLINE_ben-nanonote = "console=tty0 console=ttyS0,57600n8 mem=32M" - - # Set the verbosity of kernel messages during runtime # You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour.. CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "loglevel=3", "debug", d)}' -CMDLINE += "${CMDLINE_DEBUG}" + +# Note how we set master console on serial to protect bootlogo. +CMDLINE_c7x0 = "console=tty1 console=ttyS0,115200n8 ${CMDLINE_DEBUG}" +CMDLINE_tosa = "console=tty1 console=ttyS0,115200n8 ${CMDLINE_DEBUG}" +CMDLINE_poodle = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 ${CMDLINE_DEBUG}" +CMDLINE_akita = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 ${CMDLINE_DEBUG}" +CMDLINE_collie = "console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M ${CMDLINE_DEBUG}" +CMDLINE_spitz = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 ${CMDLINE_DEBUG}" +CMDLINE_hx4700 = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 ${CMDLINE_DEBUG}" +CMDLINE_ben-nanonote = "console=tty0 console=ttyS0,57600n8 mem=32M ${CMDLINE_DEBUG}" PACKAGES = "" PROVIDES = "" From 554cadbaa40e60be645303664184dfc4c6ef1433 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 28 Feb 2011 21:56:59 +0100 Subject: [PATCH 146/509] alsa-lib: add 1.0.24.1, gives us UCM Signed-off-by: Koen Kooi --- recipes/alsa/alsa-lib_1.0.24.1.bb | 48 +++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 recipes/alsa/alsa-lib_1.0.24.1.bb diff --git a/recipes/alsa/alsa-lib_1.0.24.1.bb b/recipes/alsa/alsa-lib_1.0.24.1.bb new file mode 100644 index 0000000000..8532a4123d --- /dev/null +++ b/recipes/alsa/alsa-lib_1.0.24.1.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "Alsa sound library" +HOMEPAGE = "http://www.alsa-project.org" +SECTION = "libs/multimedia" +LICENSE = "LGPLv2.1" + +# configure.in sets -D__arm__ on the command line for any arm system +# (not just those with the ARM instruction set), this should be removed, +# (or replaced by a permitted #define). +#FIXME: remove the following +ARM_INSTRUCTION_SET = "arm" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ + file://fix-tstamp-declaration.patch \ + file://fix_libmath.patch \ + " + +SRC_URI[md5sum] = "7cc05f25e1d5b65da8fb3fdcd540f226" +SRC_URI[sha256sum] = "a32f7c21015b6c71f9a80ff70a2b6a50e4ff4d5c77c744ff0793dea7ba7a2517" + +inherit autotools pkgconfig + + +EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python --enable-shared --enable-static" + + +require alsa-fpu.inc +EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " + + +require alsa-versym.inc +EXTRA_OECONF += "${@get_alsa_versym_setting(bb, d)} " + + +PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev" +FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*" +FILES_libasound = "${libdir}/libasound.so.*" +FILES_alsa-server = "${bindir}/*" +FILES_alsa-conf = "${datadir}/alsa/" +FILES_alsa-dev += "${libdir}/libasound.so ${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" +FILES_alsa-conf-base = "\ +${datadir}/alsa/alsa.conf \ +${datadir}/alsa/cards/aliases.conf \ +${datadir}/alsa/pcm/default.conf \ +${datadir}/alsa/pcm/dmix.conf \ +${datadir}/alsa/pcm/dsnoop.conf" + +RDEPENDS_libasound = "alsa-conf-base" + From 2da4911455f33b36427b9e965ce0b3c956c95eba Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 1 Mar 2011 08:39:16 +0100 Subject: [PATCH 147/509] alsa-utils: add 1.0.24.2 Signed-off-by: Koen Kooi --- .../alsa-utils-1.0.24.2/remove-xmlto.patch | 33 ++++++++++ recipes/alsa/alsa-utils_1.0.24.2.bb | 62 +++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 recipes/alsa/alsa-utils-1.0.24.2/remove-xmlto.patch create mode 100644 recipes/alsa/alsa-utils_1.0.24.2.bb diff --git a/recipes/alsa/alsa-utils-1.0.24.2/remove-xmlto.patch b/recipes/alsa/alsa-utils-1.0.24.2/remove-xmlto.patch new file mode 100644 index 0000000000..41691a917b --- /dev/null +++ b/recipes/alsa/alsa-utils-1.0.24.2/remove-xmlto.patch @@ -0,0 +1,33 @@ +From 4fa1ac725e8d8376e99a383501cdaeedfed0ed8f Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Tue, 1 Mar 2011 08:37:09 +0100 +Subject: [PATCH] alsa-utils: don't run xmlto when crosscompiling + +Signed-off-by: Koen Kooi +--- + alsactl/Makefile.am | 5 ----- + 1 files changed, 0 insertions(+), 5 deletions(-) + +diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am +index 5cfc415..e1fa44a 100644 +--- a/alsactl/Makefile.am ++++ b/alsactl/Makefile.am +@@ -2,9 +2,6 @@ SUBDIRS = init + + sbin_PROGRAMS=alsactl + man_MANS=alsactl.1 +-if USE_XMLTO +-man_MANS += alsactl_init.7 +-endif + EXTRA_DIST=alsactl.1 alsactl_init.xml + + alsactl_SOURCES=alsactl.c state.c utils.c init_parse.c +@@ -55,5 +52,3 @@ CLEANFILES = \ + alsa-restore.service \ + 90-alsa-restore.rules + +-%.7: %.xml +- xmlto man $? +-- +1.6.6.1 + diff --git a/recipes/alsa/alsa-utils_1.0.24.2.bb b/recipes/alsa/alsa-utils_1.0.24.2.bb new file mode 100644 index 0000000000..a2a92533c5 --- /dev/null +++ b/recipes/alsa/alsa-utils_1.0.24.2.bb @@ -0,0 +1,62 @@ +DESCRIPTION = "ALSA Utilities" +HOMEPAGE = "http://www.alsa-project.org" +SECTION = "console/utils" +LICENSE = "GPLv2" +DEPENDS = "alsa-lib ncurses" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ + file://remove-xmlto.patch \ + " + +SRC_URI[md5sum] = "8238cd57cb301d1c36bcf0ecb59ce6b2" +SRC_URI[sha256sum] = "95127f740291086486c06c28118cabca0814bde48fd14dac041a9812a5ac1be2" + +inherit gettext autotools + +EXTRA_OECONF += " --with-alsa-prefix=${STAGING_LIBDIR} --with-alsa-inc-prefix=${STAGING_INCDIR}" + +# This are all packages that we need to make. Also, the now empty alsa-utils +# ipk depend on them. + +PACKAGES += "\ + alsa-utils-alsamixer \ + alsa-utils-midi \ + alsa-utils-aplay \ + alsa-utils-amixer \ + alsa-utils-aconnect \ + alsa-utils-iecset \ + alsa-utils-speakertest \ + alsa-utils-aseqnet \ + alsa-utils-aseqdump \ + alsa-utils-alsaconf \ + alsa-utils-alsactl " + +# We omit alsaconf, because +# a) this is a bash script +# b) it creates config files not suitable for OE-based distros + +FILES_${PN} = "" +FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" +FILES_alsa-utils-amixer = "${bindir}/amixer" +FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" +FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/" +FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" +FILES_alsa-utils-aconnect = "${bindir}/aconnect" +FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" +FILES_alsa-utils-iecset = "${bindir}/iecset" +FILES_alsa-utils-alsactl = "${sbindir}/alsactl" +FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" +FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf" + +DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" +DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" +DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" +DESCRIPTION_alsa-utils-speakertest = "ALSA surround speaker test utility" +DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" +DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" +DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" +DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" +DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" + +ALLOW_EMPTY_alsa-utils = "1" + From a41f8a126d50366b00810459c25207ae4cafbdfb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 1 Mar 2011 10:37:40 +0100 Subject: [PATCH 148/509] libphone-ui: add libphone-ui-config to libphone-ui RDEPENDS instead of task-shr-minimal-apps Signed-off-by: Martin Jansa --- recipes/shr/libphone-ui_git.bb | 4 +++- recipes/tasks/task-shr-minimal.bb | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes/shr/libphone-ui_git.bb b/recipes/shr/libphone-ui_git.bb index f6ac8a5014..1bd11f5560 100644 --- a/recipes/shr/libphone-ui_git.bb +++ b/recipes/shr/libphone-ui_git.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" SECTION = "libs" SRCREV = "304538f6296b1da8390783d9c2a2f83435599e70" PV = "0.0.1+gitr${SRCPV}" -PR = "r1" +PR = "r2" DEPENDS="glib-2.0 libshr-glib libfso-glib libfsoframework libphone-utils alsa-lib" @@ -25,6 +25,8 @@ do_install_append() { PACKAGES =+ "${PN}-config" PACKAGE_ARCH_${PN}-config = "${MACHINE_ARCH}" +RDEPENDS_${PN} = "${PN}-config" + FILES_${PN}-config = " \ ${sysconfdir}/libphoneui.conf \ " diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb index decee5235f..a3377cc11b 100644 --- a/recipes/tasks/task-shr-minimal.bb +++ b/recipes/tasks/task-shr-minimal.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SHR Lite Image Feed" -PR = "r37" +PR = "r38" PV = "2.0" LICENSE = "GPL" @@ -127,7 +127,6 @@ RDEPENDS_${PN}-apps = "\ phonefsod \ phoneuid \ libphone-ui \ - libphone-ui-config \ libphone-ui-shr \ ffalarms \ shr-settings \ From 30894f081357e4bab7bb6767118e1de3e2160228 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 1 Mar 2011 11:05:21 +0100 Subject: [PATCH 149/509] opkg: move to r609 This fixes a few segfaults Signed-off-by: Koen Kooi --- recipes/opkg/opkg.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc index a4878e2151..6970f2fae5 100644 --- a/recipes/opkg/opkg.inc +++ b/recipes/opkg/opkg.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Opkg Package Manager" DESCRIPTION_libopkg = "Opkg Package Manager Library" SECTION = "base" LICENSE = "GPLv2" -SRCREV = "599" +SRCREV = "609" PV = "0.1.8+svnr${SRCPV}" CONFLICTS = "ipkg" INC_PR = "r4" From 67b6eaf9e6e58c182b012298eb3254e92803877e Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Mon, 28 Feb 2011 15:16:30 +0000 Subject: [PATCH 150/509] llvm.inc: Empty TOOLCHAIN_OPTIONS to fix the build. This fixes a problem introduced by ebd905685a339814c36bf658a8e58bf8f457f14e Signed-off-by: Stefan Schmidt Acked-by: Khem Raj --- recipes/llvm/llvm.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/llvm/llvm.inc b/recipes/llvm/llvm.inc index 03ff61da0e..b53af6e756 100644 --- a/recipes/llvm/llvm.inc +++ b/recipes/llvm/llvm.inc @@ -60,6 +60,8 @@ EXTRA_OECMAKE = "\ -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ -DBUILD_SHARED_LIBS:BOOL=ON \ " +# We need to reset this to avoid breakage as we build out of tree +TOOLCHAIN_OPTIONS = "" PACKAGES = "${PN} ${PN}-dev ${PN}-dbg ${PN}-doc" From 0c70a0f32c59aa3889fcd567234fccc5372d9d8e Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Tue, 1 Mar 2011 05:27:19 -0600 Subject: [PATCH 151/509] SlugOS: opkg_svn.bb -- remove SlugOS-specific patch that no longer applies. This patch has been pushed upstream. No PR bump required. --- recipes/opkg/opkg_svn.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/opkg/opkg_svn.bb b/recipes/opkg/opkg_svn.bb index cc377b755e..f43fdb4279 100644 --- a/recipes/opkg/opkg_svn.bb +++ b/recipes/opkg/opkg_svn.bb @@ -2,8 +2,6 @@ require opkg.inc PR = "${INC_PR}" -SRC_URI_append_slugos = " file://opkg_use_vfork_gunzip.patch" - PROVIDES =+ "virtual/update-alternatives" RPROVIDES_${PN} = "update-alternatives" PACKAGES =+ "libopkg-dev libopkg" From 40129dab5c1547a5052007938cbfa9ea3bee98a7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 1 Mar 2011 12:36:45 +0100 Subject: [PATCH 152/509] initscripts-shr: fix missing quote Signed-off-by: Martin Jansa --- recipes/shr/initscripts-shr_0.0.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/shr/initscripts-shr_0.0.1.bb b/recipes/shr/initscripts-shr_0.0.1.bb index 1434048165..662fc055c6 100644 --- a/recipes/shr/initscripts-shr_0.0.1.bb +++ b/recipes/shr/initscripts-shr_0.0.1.bb @@ -5,7 +5,7 @@ DEPENDS = "" RDEPENDS_${PN} = "procps" LICENSE = "GPL" PV = "0.0.1" -PR = "r26" +PR = "r27" RCONFLICTS_${PN} = "initscripts" @@ -32,7 +32,7 @@ SRC_URI = "file://alignment.sh \ " SRC_URI_append_om-gta02 = " file://g_ether.sh" -PACKAGE_ARCH_om-gta02 = "om-gta02 +PACKAGE_ARCH_om-gta02 = "om-gta02" SRC_URI_append_nokia900 = " file://nokia-n900-cmt-gpio.sh" PACKAGE_ARCH_nokia900 = "nokia900" From f107b9f59446d5d011cbd4229791117a7cc16330 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 1 Mar 2011 12:44:06 +0100 Subject: [PATCH 153/509] libphone-ui: move config files back to libphone-ui repo * install right one in do_install_append if machine specific is available * this helps keeping OE config and libphone-ui sources consistent Signed-off-by: Martin Jansa --- recipes/shr/libphone-ui/libphoneui.conf | 82 ------------------- .../shr/libphone-ui/palmpre/libphoneui.conf | 28 ------- recipes/shr/libphone-ui_git.bb | 19 +++-- 3 files changed, 14 insertions(+), 115 deletions(-) delete mode 100644 recipes/shr/libphone-ui/libphoneui.conf delete mode 100644 recipes/shr/libphone-ui/palmpre/libphoneui.conf diff --git a/recipes/shr/libphone-ui/libphoneui.conf b/recipes/shr/libphone-ui/libphoneui.conf deleted file mode 100644 index ae7005413e..0000000000 --- a/recipes/shr/libphone-ui/libphoneui.conf +++ /dev/null @@ -1,82 +0,0 @@ -# The following sections are "view" specific settings -# every view must have a "module" field that specifies the name of the -# module that should be used for that view, and additional view specific -# settings if supported by that view. -[dialer] -module = shr - -[messages] -module = shr -request_message_receipt = 0 - -[contacts] -module = shr - -[calls] -module = shr - -[phonelog] -module = shr - -[notification] -module = shr - -[idle_screen] -module = shr - -[settings] -module = shr - -#Alsa configuration for the sound utility functions -# The general alsa section -[alsa] -hardware_control_name = hw:0 - -#Each section describs a sound state -#each section can accept the following fields: -#speaker: the name of the corrosponding alsa control -#microphone: the name of the corrosponding alsa control -#speaker_min: the wanted lower bound to allow setting this control to -#speaker_max: the wanted upper bound to allow setting this control to -#microphone_min: the wanted lower bound to allow setting this control to -#microphone_max: the wanted upper bound to allow setting this control to - -[alsa_control_idle] -#speaker = PCM Volume - -[alsa_control_speaker] -speaker = Headphone Playback Volume -microphone = Mono Playback Volume -microphone_mute = Mono Mixer Sidetone Playback Switch - -[alsa_control_handset] -speaker = Speaker Playback Volume -speaker_min = 90 -microphone = Mono Playback Volume -microphone_mute = Mono Mixer Sidetone Playback Switch - -[alsa_control_headset] -speaker = Headphone Playback Volume -microphone = Mono Playback Volume -microphone_mute = Mono Mixer Sidetone Playback Switch - -[alsa_control_bluetooth] -speaker = Speaker Playback Volume -microphone = Mono Playback Volume - -#Remove the segfaulting stuff -#[device] -# sysfs node for the vibrator to use -#vibrator = /sys/class/leds/neo1973:vibrator/brightness -# sysfs node to set the backlight brightness -#backlight = /sys/class/backlight/gta02-bl - - -#[feedback_error] - -#[feedback_warning] - -#[feedback_notice] - -#[feedback_click] - diff --git a/recipes/shr/libphone-ui/palmpre/libphoneui.conf b/recipes/shr/libphone-ui/palmpre/libphoneui.conf deleted file mode 100644 index 14db6bf521..0000000000 --- a/recipes/shr/libphone-ui/palmpre/libphoneui.conf +++ /dev/null @@ -1,28 +0,0 @@ -# The following sections are "view" specific settings -# every view must have a "module" field that specifies the name of the -# module that should be used for that view, and additional view specific -# settings if supported by that view. -[dialer] -module = shr - -[messages] -module = shr -request_message_receipt = 0 - -[contacts] -module = shr - -[calls] -module = shr - -[phonelog] -module = shr - -[notification] -module = shr - -[idle_screen] -module = shr - -[settings] -module = shr diff --git a/recipes/shr/libphone-ui_git.bb b/recipes/shr/libphone-ui_git.bb index 1bd11f5560..e73aa1eab2 100644 --- a/recipes/shr/libphone-ui_git.bb +++ b/recipes/shr/libphone-ui_git.bb @@ -2,15 +2,14 @@ DESCRIPTION = "A generic framework for phone ui" HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "libs" -SRCREV = "304538f6296b1da8390783d9c2a2f83435599e70" +SRCREV = "5567443a48599c22c362fb28924701f81627c8dc" PV = "0.0.1+gitr${SRCPV}" -PR = "r2" +PR = "r3" DEPENDS="glib-2.0 libshr-glib libfso-glib libfsoframework libphone-utils alsa-lib" SRC_URI = " \ git://git.shr-project.org/repo/libphone-ui.git;protocol=http;branch=master \ - file://libphoneui.conf \ " S = "${WORKDIR}/git" @@ -18,8 +17,18 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig do_install_append() { - install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/libphoneui.conf ${D}${sysconfdir}/libphoneui.conf + libphone_ui_install_machine_specific_configs +} + +libphone_ui_install_machine_specific_configs() { + # Check for machine specific conf. + CONF_PATH="${S}/conf" + CONF_PATH_MACHINE="${CONF_PATH}" + if [ -d "${CONF_PATH}/${MACHINE}" ] ; then + CONF_PATH_MACHINE="${CONF_PATH}/${MACHINE}" + fi + install -d ${D}${sysconfdir} + install -m 0644 ${CONF_PATH_MACHINE}/libphoneui.conf ${D}${sysconfdir}/libphoneui.conf } PACKAGES =+ "${PN}-config" From 8ce012192eca116a68754da6902a7beab0e37424 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 1 Mar 2011 13:23:27 +0100 Subject: [PATCH 154/509] boost: fix rpath isusse with version 1.45 and add bzip do depends * add a patch to rip out -Wl,R stuff from gcc jam defs * add bzip to depends as on the recipes before * remove the doubled icu depend * bump INC_PR und PR --- recipes/boost/boost-1.45.0/no_rpath.patch | 42 +++++++++++++++++++++++ recipes/boost/boost-with-bjam.inc | 4 +-- recipes/boost/boost_1.45.0.bb | 7 ++-- 3 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 recipes/boost/boost-1.45.0/no_rpath.patch diff --git a/recipes/boost/boost-1.45.0/no_rpath.patch b/recipes/boost/boost-1.45.0/no_rpath.patch new file mode 100644 index 0000000000..28dfcf1916 --- /dev/null +++ b/recipes/boost/boost-1.45.0/no_rpath.patch @@ -0,0 +1,42 @@ +Index: boost_1_45_0/tools/build/v2/tools/gcc.jam +=================================================================== +--- boost_1_45_0.orig/tools/build/v2/tools/gcc.jam 2011-03-01 12:58:14.260753119 +0100 ++++ boost_1_45_0/tools/build/v2/tools/gcc.jam 2011-03-01 12:59:19.683448119 +0100 +@@ -823,7 +823,7 @@ + + actions link bind LIBRARIES + { +- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) ++ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) + + } + +@@ -888,7 +888,7 @@ + # Differs from 'link' above only by -shared. + actions link.dll bind LIBRARIES + { +- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) ++ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) + } + + rule setup-threading ( targets * : sources * : properties * ) +Index: boost_1_45_0/tools/build/v2/tools/gcc.py +=================================================================== +--- boost_1_45_0.orig/tools/build/v2/tools/gcc.py 2011-03-01 12:59:22.784998119 +0100 ++++ boost_1_45_0/tools/build/v2/tools/gcc.py 2011-03-01 12:59:49.821843119 +0100 +@@ -586,7 +586,6 @@ + engine.register_action( + 'gcc.link', + '"$(CONFIG_COMMAND)" -L"$(LINKPATH)" ' + +- '-Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" ' + + '-Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" ' + + '$(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) ' + + '-l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) ' + +@@ -648,7 +647,6 @@ + 'gcc.link.dll', + # Differ from 'link' above only by -shared. + '"$(CONFIG_COMMAND)" -L"$(LINKPATH)" ' + +- '-Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" ' + + '"$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" ' + + '$(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) ' + + '-shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) ' + diff --git a/recipes/boost/boost-with-bjam.inc b/recipes/boost/boost-with-bjam.inc index ac6f485a10..68d9e748ed 100644 --- a/recipes/boost/boost-with-bjam.inc +++ b/recipes/boost/boost-with-bjam.inc @@ -10,10 +10,10 @@ DESCRIPTION = "Free peer-reviewed portable C++ source libraries" HOMEPAGE = "http://www.boost.org/" SECTION = "libs" -DEPENDS = "zlib icu" +DEPENDS = "zlib bzip2 icu" PRIORITY = "optional" LICENSE = "Boost Software License" -INC_PR = "r9" +INC_PR = "r10" BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" diff --git a/recipes/boost/boost_1.45.0.bb b/recipes/boost/boost_1.45.0.bb index 1d9373601d..fc9bcf6c4b 100644 --- a/recipes/boost/boost_1.45.0.bb +++ b/recipes/boost/boost_1.45.0.bb @@ -1,17 +1,16 @@ require boost-with-bjam.inc -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" ARM_INSTRUCTION_SET = "arm" SRC_URI = " \ http://downloads.sourceforge.net/project/boost/boost/1.45.0/boost_1_45_0.tar.gz \ file://01-fix-default-python-config.patch \ + file://no_rpath.patch \ " + S = "${WORKDIR}/boost_1_45_0" SRC_URI[md5sum] = "739792c98fafb95e7a6b5da23a30062c" SRC_URI[sha256sum] = "7cd7a327ebe0f43db829eccce024b7f3b0d9d4d382422d59dc710793d55c6a12" - -DEPENDS += " icu " - From eeec016b53591c1bf94516b33128a420303ecb7f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 1 Mar 2011 14:14:53 +0100 Subject: [PATCH 155/509] pulseaudio: add git version armv4t/armv4t patches were not forward ported, so don't use this on those archs Signed-off-by: Koen Kooi --- recipes/pulseaudio/pulseaudio_git.bb | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 recipes/pulseaudio/pulseaudio_git.bb diff --git a/recipes/pulseaudio/pulseaudio_git.bb b/recipes/pulseaudio/pulseaudio_git.bb new file mode 100644 index 0000000000..28c581421a --- /dev/null +++ b/recipes/pulseaudio/pulseaudio_git.bb @@ -0,0 +1,36 @@ +require pulseaudio.inc + +SRCREV = "f834150aceccd753e3ac5bab9f7d64bed9993624" +PV = "0.9.22+git" +PR = "${INC_PR}.0-r${SRCPV}" + +DEPENDS += "orc gdbm speex" + +DEFAULT_PREFERENCE = "-1" + +FILESPATHPKG =. "pulseaudio-0.9.21:" + +inherit gettext + +SRC_URI = "git://git.0pointer.de/pulseaudio.git;protocol=git \ + file://gcc4-compile-fix.patch \ + file://volatiles.04_pulse \ + file://autoconf_version.patch \ + file://tls_m4.patch \ +" + +S = "${WORKDIR}/git" + +do_configure_prepend() { + touch config.rpath +} + +# orc.m4 calls pkg-config ----variable=orcc orc-0.4 to get the path to orcc, +# resulting in /usr/bin/orcc. Force it to use the staged orcc. +do_configure_append() { + for i in $(find ${S} -name "Makefile") ; do + sed -i -e s:${bindir}/orcc:${STAGING_BINDIR_NATIVE}/orcc:g $i + done +} + + From 8581a6113cf2f5011da178d662837a046400a454 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 1 Mar 2011 16:27:44 +0100 Subject: [PATCH 156/509] linux-ea3250-2.6.27.8: refresh lpc32xx-spwm.patch, so it can apply cleanly --- .../linux-ea3250-2.6.27.8/lpc32xx-spwm.patch | 58 ++++++++++++------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/recipes/linux/linux-ea3250-2.6.27.8/lpc32xx-spwm.patch b/recipes/linux/linux-ea3250-2.6.27.8/lpc32xx-spwm.patch index 64e9fff1eb..d7edd90802 100644 --- a/recipes/linux/linux-ea3250-2.6.27.8/lpc32xx-spwm.patch +++ b/recipes/linux/linux-ea3250-2.6.27.8/lpc32xx-spwm.patch @@ -1,6 +1,7 @@ -diff -Naur -X linux/Documentation/dontdiff linux-2.6.27.8/arch/arm/mach-lpc32xx/arch-lpc32xx.c linux-2.6.27.8-new/arch/arm/mach-lpc32xx/arch-lpc32xx.c ---- linux-2.6.27.8/arch/arm/mach-lpc32xx/arch-lpc32xx.c 2009-11-24 15:42:39.000000000 +0100 -+++ linux-2.6.27.8-new/arch/arm/mach-lpc32xx/arch-lpc32xx.c 2009-11-24 15:52:40.000000000 +0100 +Index: linux-2.6.27.8/arch/arm/mach-lpc32xx/arch-lpc32xx.c +=================================================================== +--- linux-2.6.27.8.orig/arch/arm/mach-lpc32xx/arch-lpc32xx.c 2011-03-01 16:09:18.000000000 +0100 ++++ linux-2.6.27.8/arch/arm/mach-lpc32xx/arch-lpc32xx.c 2011-03-01 16:13:03.165618120 +0100 @@ -342,6 +342,9 @@ tmp |= UART_UART6_IRDAMOD_BYPASS; #endif @@ -11,9 +12,10 @@ diff -Naur -X linux/Documentation/dontdiff linux-2.6.27.8/arch/arm/mach-lpc32xx/ } static struct map_desc lpc32xx_io_desc[] __initdata = { -diff -Naur -X linux/Documentation/dontdiff linux-2.6.27.8/arch/arm/mach-lpc32xx/include/mach/lpc32xx_pwm.h linux-2.6.27.8-new/arch/arm/mach-lpc32xx/include/mach/lpc32xx_pwm.h ---- linux-2.6.27.8/arch/arm/mach-lpc32xx/include/mach/lpc32xx_pwm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.27.8-new/arch/arm/mach-lpc32xx/include/mach/lpc32xx_pwm.h 2009-11-24 15:54:09.000000000 +0100 +Index: linux-2.6.27.8/arch/arm/mach-lpc32xx/include/mach/lpc32xx_pwm.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.27.8/arch/arm/mach-lpc32xx/include/mach/lpc32xx_pwm.h 2011-03-01 16:13:03.165618120 +0100 @@ -0,0 +1,31 @@ +/* + * linux/arch/arm/mach-lpc32xx/include/mach/lpc32xx_pwm.h @@ -46,9 +48,10 @@ diff -Naur -X linux/Documentation/dontdiff linux-2.6.27.8/arch/arm/mach-lpc32xx/ +#define PERIPH_CLK 0x01 + +#endif -diff -Naur -X linux/Documentation/dontdiff linux-2.6.27.8/arch/arm/mach-lpc32xx/Kconfig linux-2.6.27.8-new/arch/arm/mach-lpc32xx/Kconfig ---- linux-2.6.27.8/arch/arm/mach-lpc32xx/Kconfig 2009-11-24 15:42:39.000000000 +0100 -+++ linux-2.6.27.8-new/arch/arm/mach-lpc32xx/Kconfig 2009-11-24 16:01:16.000000000 +0100 +Index: linux-2.6.27.8/arch/arm/mach-lpc32xx/Kconfig +=================================================================== +--- linux-2.6.27.8.orig/arch/arm/mach-lpc32xx/Kconfig 2011-03-01 16:09:19.000000000 +0100 ++++ linux-2.6.27.8/arch/arm/mach-lpc32xx/Kconfig 2011-03-01 16:13:03.165618120 +0100 @@ -185,6 +185,12 @@ which support is selected, the ethernet interface driver needs to be selected in the device driver networking section. @@ -62,9 +65,10 @@ diff -Naur -X linux/Documentation/dontdiff linux-2.6.27.8/arch/arm/mach-lpc32xx/ menu "Standard UARTS" config MACH_LPC32XX_UART5_ENABLE -diff -Naur -X linux/Documentation/dontdiff linux-2.6.27.8/arch/arm/mach-lpc32xx/Makefile linux-2.6.27.8-new/arch/arm/mach-lpc32xx/Makefile ---- linux-2.6.27.8/arch/arm/mach-lpc32xx/Makefile 2009-11-24 15:42:39.000000000 +0100 -+++ linux-2.6.27.8-new/arch/arm/mach-lpc32xx/Makefile 2009-11-24 16:01:39.000000000 +0100 +Index: linux-2.6.27.8/arch/arm/mach-lpc32xx/Makefile +=================================================================== +--- linux-2.6.27.8.orig/arch/arm/mach-lpc32xx/Makefile 2011-03-01 16:09:19.000000000 +0100 ++++ linux-2.6.27.8/arch/arm/mach-lpc32xx/Makefile 2011-03-01 16:13:03.165618120 +0100 @@ -7,6 +7,7 @@ obj-y := timer-lpc32xx.o irq-lpc32xx.o arch-lpc32xx.o obj-y += serial-lpc32xx.o clocks-lpc32xx.o @@ -73,9 +77,10 @@ diff -Naur -X linux/Documentation/dontdiff linux-2.6.27.8/arch/arm/mach-lpc32xx/ obj-m := obj-n := obj- := -diff -Naur -X linux/Documentation/dontdiff linux-2.6.27.8/arch/arm/mach-lpc32xx/spwm-lpc32xx.c linux-2.6.27.8-new/arch/arm/mach-lpc32xx/spwm-lpc32xx.c ---- linux-2.6.27.8/arch/arm/mach-lpc32xx/spwm-lpc32xx.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.27.8-new/arch/arm/mach-lpc32xx/spwm-lpc32xx.c 2009-11-24 16:07:20.000000000 +0100 +Index: linux-2.6.27.8/arch/arm/mach-lpc32xx/spwm-lpc32xx.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.27.8/arch/arm/mach-lpc32xx/spwm-lpc32xx.c 2011-03-01 16:13:03.168953120 +0100 @@ -0,0 +1,126 @@ +/* + * linux/arch/arm/mach-lpc32xx/spwm-lpc32xx.c @@ -203,9 +208,19 @@ diff -Naur -X linux/Documentation/dontdiff linux-2.6.27.8/arch/arm/mach-lpc32xx/ + lpc32xx_spwm_set_clockdiv(PWM1, 1); + lpc32xx_spwm_set_clockdiv(PWM2, 1); +} -diff -Naur -X linux/Documentation/dontdiff linux-2.6.27.8/arch/arm/mach-lpc32xx/sys-lpc32xx.h linux-2.6.27.8-new/arch/arm/mach-lpc32xx/sys-lpc32xx.h ---- linux-2.6.27.8/arch/arm/mach-lpc32xx/sys-lpc32xx.h 2009-11-24 15:42:39.000000000 +0100 -+++ linux-2.6.27.8-new/arch/arm/mach-lpc32xx/sys-lpc32xx.h 2009-11-24 16:08:24.000000000 +0100 +Index: linux-2.6.27.8/arch/arm/mach-lpc32xx/sys-lpc32xx.h +=================================================================== +--- linux-2.6.27.8.orig/arch/arm/mach-lpc32xx/sys-lpc32xx.h 2011-03-01 16:09:19.000000000 +0100 ++++ linux-2.6.27.8/arch/arm/mach-lpc32xx/sys-lpc32xx.h 2011-03-01 16:18:36.725648119 +0100 +@@ -30,7 +30,7 @@ + #include + + #define TIMER0_IOBASE io_p2v(TIMER0_BASE) +-#define TIMER1_IOBASE io_p2v(TIMER1_BASE) ++#define TIMER1_IOBASE io_p2v(TIMER1_BASE) + #define CLKPWR_IOBASE io_p2v(CLK_PM_BASE) + #define GPIO_IOBASE io_p2v(GPIO_BASE) + @@ -83,14 +83,17 @@ #endif @@ -220,8 +235,9 @@ diff -Naur -X linux/Documentation/dontdiff linux-2.6.27.8/arch/arm/mach-lpc32xx/ extern void __init lpc32xx_init (void); extern void __init lpc32xx_map_io(void); extern int __init clk_init(void); -+#if defined(CONFIG_SPWM_LPC32XX) -+extern void lpc32xx_spwm_init(void); -+#endif +++#if defined(CONFIG_SPWM_LPC32XX) +++extern void lpc32xx_spwm_init(void); +++#endif #endif + From ef973d588e43bc5d95ce6483b8f897c719a69266 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 1 Mar 2011 09:46:49 -0700 Subject: [PATCH 157/509] avahi: Drop older versions We drop a number of un-pinned older versions and clean up slightly the files directory. Signed-off-by: Tom Rini --- .../configure-check-pymod.patch | 0 .../dbus-pre-1.1.1-support.patch | 0 recipes/avahi/avahi-ui_0.6.21.bb | 23 ---------- recipes/avahi/avahi_0.6.19.bb | 5 --- recipes/avahi/avahi_0.6.21.bb | 9 ---- recipes/avahi/avahi_0.6.22.bb | 9 ---- recipes/avahi/avahi_0.6.23.bb | 9 ---- recipes/avahi/avahi_0.6.24.bb | 10 ----- recipes/avahi/files/avr32-ipv6-fix.patch | 42 ------------------- 9 files changed, 107 deletions(-) rename recipes/avahi/{files => avahi-python}/configure-check-pymod.patch (100%) rename recipes/avahi/{files => avahi-python}/dbus-pre-1.1.1-support.patch (100%) delete mode 100644 recipes/avahi/avahi-ui_0.6.21.bb delete mode 100644 recipes/avahi/avahi_0.6.19.bb delete mode 100644 recipes/avahi/avahi_0.6.21.bb delete mode 100644 recipes/avahi/avahi_0.6.22.bb delete mode 100644 recipes/avahi/avahi_0.6.23.bb delete mode 100644 recipes/avahi/avahi_0.6.24.bb delete mode 100644 recipes/avahi/files/avr32-ipv6-fix.patch diff --git a/recipes/avahi/files/configure-check-pymod.patch b/recipes/avahi/avahi-python/configure-check-pymod.patch similarity index 100% rename from recipes/avahi/files/configure-check-pymod.patch rename to recipes/avahi/avahi-python/configure-check-pymod.patch diff --git a/recipes/avahi/files/dbus-pre-1.1.1-support.patch b/recipes/avahi/avahi-python/dbus-pre-1.1.1-support.patch similarity index 100% rename from recipes/avahi/files/dbus-pre-1.1.1-support.patch rename to recipes/avahi/avahi-python/dbus-pre-1.1.1-support.patch diff --git a/recipes/avahi/avahi-ui_0.6.21.bb b/recipes/avahi/avahi-ui_0.6.21.bb deleted file mode 100644 index e3e5e5be99..0000000000 --- a/recipes/avahi/avahi-ui_0.6.21.bb +++ /dev/null @@ -1,23 +0,0 @@ -require avahi.inc -PR = "${INC_PR}.0" - -DEPENDS += "avahi gtk+" - -SRC_URI += "file://dbus-pre-1.1.1-support.patch" -AVAHI_GTK = "--enable-gtk" - -S = "${WORKDIR}/avahi-${PV}" - -do_stage() { - install -d ${STAGING_INCDIR}/avahi-ui - cp ${S}/avahi-ui/*.h ${STAGING_INCDIR}/avahi-ui/ - oe_libinstall -C avahi-ui -a -so libavahi-ui ${STAGING_LIBDIR} -} - -PACKAGES = "${PN} ${PN}-dbg" - -FILES_${PN} = "${libdir}/libavahi-ui*.so.*" -FILES_${PN}-dbg += "${libdir}/.debug/libavah-ui*" - -SRC_URI[md5sum] = "9cc68f79c50c9dd9e419990c3c9b05b9" -SRC_URI[sha256sum] = "d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561" diff --git a/recipes/avahi/avahi_0.6.19.bb b/recipes/avahi/avahi_0.6.19.bb deleted file mode 100644 index 6a6825c4e3..0000000000 --- a/recipes/avahi/avahi_0.6.19.bb +++ /dev/null @@ -1,5 +0,0 @@ -require avahi.inc - -PR = "${INC_PR}.0" -SRC_URI[md5sum] = "a06782435d1c994ecd00a66e95a5d9d4" -SRC_URI[sha256sum] = "a742dceda38f242f5eac72f2c3bc1bda76adf497d6913e88a9cbc624bf2dd68a" diff --git a/recipes/avahi/avahi_0.6.21.bb b/recipes/avahi/avahi_0.6.21.bb deleted file mode 100644 index 5372334336..0000000000 --- a/recipes/avahi/avahi_0.6.21.bb +++ /dev/null @@ -1,9 +0,0 @@ -require avahi.inc - -PR = "${INC_PR}.0" - -SRC_URI += "file://dbus-pre-1.1.1-support.patch" -SRC_URI += "file://avr32-ipv6-fix.patch" - -SRC_URI[md5sum] = "9cc68f79c50c9dd9e419990c3c9b05b9" -SRC_URI[sha256sum] = "d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561" diff --git a/recipes/avahi/avahi_0.6.22.bb b/recipes/avahi/avahi_0.6.22.bb deleted file mode 100644 index 6e9608ae19..0000000000 --- a/recipes/avahi/avahi_0.6.22.bb +++ /dev/null @@ -1,9 +0,0 @@ -require avahi.inc - -DEPENDS += "intltool-native" -PR = "${INC_PR}.0" - -PACKAGES =+ "libavahi-gobject" - -SRC_URI[md5sum] = "c84b1a8a23126e188426728710414dc8" -SRC_URI[sha256sum] = "9dc6f870b6ce050059054a26bfc15d6e7a836fa299edd1b89c63c1089bfedd52" diff --git a/recipes/avahi/avahi_0.6.23.bb b/recipes/avahi/avahi_0.6.23.bb deleted file mode 100644 index abf0fbf3d9..0000000000 --- a/recipes/avahi/avahi_0.6.23.bb +++ /dev/null @@ -1,9 +0,0 @@ -require avahi.inc - -PR = "${INC_PR}.0" -DEPENDS += "intltool-native" - -PACKAGES =+ "libavahi-gobject" - -SRC_URI[md5sum] = "aab1a304851d8145ea5f6a85c10af9e9" -SRC_URI[sha256sum] = "dedf5325105f071e5d9f898fdb7337a7fe88a3a8a1f832a6056ba00477b8cc3d" diff --git a/recipes/avahi/avahi_0.6.24.bb b/recipes/avahi/avahi_0.6.24.bb deleted file mode 100644 index 786f58ffdc..0000000000 --- a/recipes/avahi/avahi_0.6.24.bb +++ /dev/null @@ -1,10 +0,0 @@ -require avahi.inc - -PR = "${INC_PR}.0" - -DEPENDS += "intltool-native" - -PACKAGES =+ "libavahi-gobject" - -SRC_URI[md5sum] = "068c1d220b07037e64caf87d4a7a0504" -SRC_URI[sha256sum] = "260070d46188ed58f5dc1174ce632c096679f6391a2b729366e7aba349d4b950" diff --git a/recipes/avahi/files/avr32-ipv6-fix.patch b/recipes/avahi/files/avr32-ipv6-fix.patch deleted file mode 100644 index f0710a1002..0000000000 --- a/recipes/avahi/files/avr32-ipv6-fix.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- /tmp/socket.c 2007-09-14 14:03:01.395330465 +0200 -+++ avahi-0.6.21/avahi-core/socket.c 2007-09-14 14:08:42.081140297 +0200 -@@ -66,6 +66,39 @@ - #endif - #endif - -+#define IPV6_ADDRFORM 1 -+#define IPV6_2292PKTINFO 2 -+#define IPV6_2292HOPOPTS 3 -+#define IPV6_2292DSTOPTS 4 -+#define IPV6_2292RTHDR 5 -+#define IPV6_2292PKTOPTIONS 6 -+#define IPV6_CHECKSUM 7 -+#define IPV6_2292HOPLIMIT 8 -+#define IPV6_NEXTHOP 9 -+#define IPV6_AUTHHDR 10 /* obsolete */ -+#define IPV6_FLOWINFO 11 -+ -+#define IPV6_UNICAST_HOPS 16 -+#define IPV6_MULTICAST_IF 17 -+#define IPV6_MULTICAST_HOPS 18 -+#define IPV6_MULTICAST_LOOP 19 -+#define IPV6_ADD_MEMBERSHIP 20 -+#define IPV6_DROP_MEMBERSHIP 21 -+#define IPV6_ROUTER_ALERT 22 -+#define IPV6_MTU_DISCOVER 23 -+#define IPV6_MTU 24 -+#define IPV6_RECVERR 25 -+#define IPV6_V6ONLY 26 -+#define IPV6_JOIN_ANYCAST 27 -+#define IPV6_LEAVE_ANYCAST 28 -+ -+/* IPV6_MTU_DISCOVER values */ -+#define IPV6_PMTUDISC_DONT 0 -+#define IPV6_PMTUDISC_WANT 1 -+#define IPV6_PMTUDISC_DO 2 -+#define IPV6_PMTUDISC_PROBE 3 -+ -+ - static void mdns_mcast_group_ipv4(struct sockaddr_in *ret_sa) { - assert(ret_sa); - From 87f33d0e07593aee3bb9dcdd5270fd20f7f4539b Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 1 Mar 2011 18:24:30 +0100 Subject: [PATCH 158/509] linux-ea3250-2.6.27.8: fix my stupid cut and paste in lpc32xx-spwm.patch --- .../linux-ea3250-2.6.27.8/lpc32xx-spwm.patch | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/recipes/linux/linux-ea3250-2.6.27.8/lpc32xx-spwm.patch b/recipes/linux/linux-ea3250-2.6.27.8/lpc32xx-spwm.patch index d7edd90802..fef3fb750c 100644 --- a/recipes/linux/linux-ea3250-2.6.27.8/lpc32xx-spwm.patch +++ b/recipes/linux/linux-ea3250-2.6.27.8/lpc32xx-spwm.patch @@ -1,7 +1,7 @@ Index: linux-2.6.27.8/arch/arm/mach-lpc32xx/arch-lpc32xx.c =================================================================== ---- linux-2.6.27.8.orig/arch/arm/mach-lpc32xx/arch-lpc32xx.c 2011-03-01 16:09:18.000000000 +0100 -+++ linux-2.6.27.8/arch/arm/mach-lpc32xx/arch-lpc32xx.c 2011-03-01 16:13:03.165618120 +0100 +--- linux-2.6.27.8.orig/arch/arm/mach-lpc32xx/arch-lpc32xx.c 2011-03-01 17:33:29.480903120 +0100 ++++ linux-2.6.27.8/arch/arm/mach-lpc32xx/arch-lpc32xx.c 2011-03-01 17:33:29.550938120 +0100 @@ -342,6 +342,9 @@ tmp |= UART_UART6_IRDAMOD_BYPASS; #endif @@ -15,7 +15,7 @@ Index: linux-2.6.27.8/arch/arm/mach-lpc32xx/arch-lpc32xx.c Index: linux-2.6.27.8/arch/arm/mach-lpc32xx/include/mach/lpc32xx_pwm.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.27.8/arch/arm/mach-lpc32xx/include/mach/lpc32xx_pwm.h 2011-03-01 16:13:03.165618120 +0100 ++++ linux-2.6.27.8/arch/arm/mach-lpc32xx/include/mach/lpc32xx_pwm.h 2011-03-01 17:33:29.550938120 +0100 @@ -0,0 +1,31 @@ +/* + * linux/arch/arm/mach-lpc32xx/include/mach/lpc32xx_pwm.h @@ -50,8 +50,8 @@ Index: linux-2.6.27.8/arch/arm/mach-lpc32xx/include/mach/lpc32xx_pwm.h +#endif Index: linux-2.6.27.8/arch/arm/mach-lpc32xx/Kconfig =================================================================== ---- linux-2.6.27.8.orig/arch/arm/mach-lpc32xx/Kconfig 2011-03-01 16:09:19.000000000 +0100 -+++ linux-2.6.27.8/arch/arm/mach-lpc32xx/Kconfig 2011-03-01 16:13:03.165618120 +0100 +--- linux-2.6.27.8.orig/arch/arm/mach-lpc32xx/Kconfig 2011-03-01 17:33:29.530928120 +0100 ++++ linux-2.6.27.8/arch/arm/mach-lpc32xx/Kconfig 2011-03-01 17:33:29.550938120 +0100 @@ -185,6 +185,12 @@ which support is selected, the ethernet interface driver needs to be selected in the device driver networking section. @@ -67,8 +67,8 @@ Index: linux-2.6.27.8/arch/arm/mach-lpc32xx/Kconfig config MACH_LPC32XX_UART5_ENABLE Index: linux-2.6.27.8/arch/arm/mach-lpc32xx/Makefile =================================================================== ---- linux-2.6.27.8.orig/arch/arm/mach-lpc32xx/Makefile 2011-03-01 16:09:19.000000000 +0100 -+++ linux-2.6.27.8/arch/arm/mach-lpc32xx/Makefile 2011-03-01 16:13:03.165618120 +0100 +--- linux-2.6.27.8.orig/arch/arm/mach-lpc32xx/Makefile 2011-03-01 17:33:29.530928120 +0100 ++++ linux-2.6.27.8/arch/arm/mach-lpc32xx/Makefile 2011-03-01 17:33:29.550938120 +0100 @@ -7,6 +7,7 @@ obj-y := timer-lpc32xx.o irq-lpc32xx.o arch-lpc32xx.o obj-y += serial-lpc32xx.o clocks-lpc32xx.o @@ -80,7 +80,7 @@ Index: linux-2.6.27.8/arch/arm/mach-lpc32xx/Makefile Index: linux-2.6.27.8/arch/arm/mach-lpc32xx/spwm-lpc32xx.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.27.8/arch/arm/mach-lpc32xx/spwm-lpc32xx.c 2011-03-01 16:13:03.168953120 +0100 ++++ linux-2.6.27.8/arch/arm/mach-lpc32xx/spwm-lpc32xx.c 2011-03-01 17:33:29.550938120 +0100 @@ -0,0 +1,126 @@ +/* + * linux/arch/arm/mach-lpc32xx/spwm-lpc32xx.c @@ -210,8 +210,8 @@ Index: linux-2.6.27.8/arch/arm/mach-lpc32xx/spwm-lpc32xx.c +} Index: linux-2.6.27.8/arch/arm/mach-lpc32xx/sys-lpc32xx.h =================================================================== ---- linux-2.6.27.8.orig/arch/arm/mach-lpc32xx/sys-lpc32xx.h 2011-03-01 16:09:19.000000000 +0100 -+++ linux-2.6.27.8/arch/arm/mach-lpc32xx/sys-lpc32xx.h 2011-03-01 16:18:36.725648119 +0100 +--- linux-2.6.27.8.orig/arch/arm/mach-lpc32xx/sys-lpc32xx.h 2011-03-01 17:33:29.517588120 +0100 ++++ linux-2.6.27.8/arch/arm/mach-lpc32xx/sys-lpc32xx.h 2011-03-01 17:34:00.286298119 +0100 @@ -30,7 +30,7 @@ #include @@ -235,9 +235,9 @@ Index: linux-2.6.27.8/arch/arm/mach-lpc32xx/sys-lpc32xx.h extern void __init lpc32xx_init (void); extern void __init lpc32xx_map_io(void); extern int __init clk_init(void); -++#if defined(CONFIG_SPWM_LPC32XX) -++extern void lpc32xx_spwm_init(void); -++#endif ++#if defined(CONFIG_SPWM_LPC32XX) ++extern void lpc32xx_spwm_init(void); ++#endif #endif From 215a5c65701f417a8eecfd4837462a3bdc264df2 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Tue, 1 Mar 2011 22:55:14 +0000 Subject: [PATCH 159/509] angstrom-jalimo.conf: Bump openjdk version to include security and build fixes Signed-off-by: Stefan Schmidt Acked-by: Koen Kooi --- conf/distro/include/angstrom-jalimo.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/angstrom-jalimo.conf b/conf/distro/include/angstrom-jalimo.conf index 76cd5f1674..9ba4c70999 100644 --- a/conf/distro/include/angstrom-jalimo.conf +++ b/conf/distro/include/angstrom-jalimo.conf @@ -22,7 +22,7 @@ PREFERRED_VERSION_jamvm = "1.5.2" PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk" PREFERRED_PROVIDER_classpath = "classpath" -PREFERRED_VERSION_openjdk-6-jre = "6b18-1.8" +PREFERRED_VERSION_openjdk-6-jre = "6b18-1.8.5" PREFERRED_VERSION_icedtea6-native = "1.7.6" # Stage JAR files not into ARCH related dirs From a852e085f0a1d1908728d9ce7c5895c56939e5e8 Mon Sep 17 00:00:00 2001 From: Marc Reilly Date: Mon, 28 Feb 2011 07:27:57 +0000 Subject: [PATCH 160/509] qt-4.7.1: patch gstreamer phonon plugin to use host rgb endianess This patch was obtained from Nokia bug tracker. Without it, the R and B channels are wrong when playing on ARM system. Signed-off-by: Marc Reilly Signed-off-by: Tom Rini --- recipes/qt4/qt-4.7.1.inc | 1 + .../0010-phonon-gstreamer-rgb-endianess.patch | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 recipes/qt4/qt-4.7.1/0010-phonon-gstreamer-rgb-endianess.patch diff --git a/recipes/qt4/qt-4.7.1.inc b/recipes/qt4/qt-4.7.1.inc index ef54753172..be7275dbd8 100644 --- a/recipes/qt4/qt-4.7.1.inc +++ b/recipes/qt4/qt-4.7.1.inc @@ -9,6 +9,7 @@ SRC_URI = "\ file://hack-out-pg2-4.7.0.patch \ file://0006-freetype-host-includes.patch \ file://0001-Added-Openembedded-crossarch-option.patch \ + file://0010-phonon-gstreamer-rgb-endianess.patch \ file://g++.conf \ file://linux.conf \ " diff --git a/recipes/qt4/qt-4.7.1/0010-phonon-gstreamer-rgb-endianess.patch b/recipes/qt4/qt-4.7.1/0010-phonon-gstreamer-rgb-endianess.patch new file mode 100644 index 0000000000..d43366c3a4 --- /dev/null +++ b/recipes/qt4/qt-4.7.1/0010-phonon-gstreamer-rgb-endianess.patch @@ -0,0 +1,23 @@ +--- a/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp ++++ b/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp +@@ -18,6 +18,7 @@ + #include + #include "videowidget.h" + #include "qwidgetvideosink.h" ++#include + + QT_BEGIN_NAMESPACE + +@@ -106,11 +107,7 @@ static GstStaticPadTemplate template_factory_rgb = + GST_STATIC_PAD_TEMPLATE("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, +- GST_STATIC_CAPS("video/x-raw-rgb, " +- "framerate = (fraction) [ 0, MAX ], " +- "width = (int) [ 1, MAX ], " +- "height = (int) [ 1, MAX ]," +- "bpp = (int) 32")); ++ GST_STATIC_CAPS(GST_VIDEO_CAPS_xRGB_HOST_ENDIAN)); + + template + struct template_factory; From c5d1488f6499204f9f5fa504df977d437f793f05 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 1 Mar 2011 01:28:22 +0000 Subject: [PATCH 161/509] freerdp: rdepends on xprop Signed-off-by: Otavio Salvador Acked-by: Phil Blundell Signed-off-by: Tom Rini --- recipes/freerdp/freerdp.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/freerdp/freerdp.inc b/recipes/freerdp/freerdp.inc index c75175ee17..0690d6e9ec 100644 --- a/recipes/freerdp/freerdp.inc +++ b/recipes/freerdp/freerdp.inc @@ -4,10 +4,11 @@ DESCRIPTION = "FreeRDP RDP client" HOMEPAGE = "http://freerdp.sourceforge.net" DEPENDS = "virtual/libx11 openssl libxcursor cups alsa-lib" +RDEPENDS_${PN} += "xprop" SECTION = "x11/network" LICENSE = "Apache-2.0" -INC_PR = "r5" +INC_PR = "r6" inherit pkgconfig autotools From 98d9b3005a537742f014276df3d3bac00ca6a219 Mon Sep 17 00:00:00 2001 From: Denis Carikli Date: Wed, 2 Mar 2011 01:45:32 +0000 Subject: [PATCH 162/509] netbase and opkg: reorder init scripts to make networking come up at first boot Without that fix, usb0 doesn't come up at first boot (tested on the bug machine, with Angstrom on a console-image). Signed-off-by: Denis 'GNUtoo' Carikli Signed-off-by: Tom Rini --- recipes/netbase/netbase_4.21.bb | 2 +- recipes/opkg/files/configure | 2 +- recipes/opkg/opkg.inc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/netbase/netbase_4.21.bb b/recipes/netbase/netbase_4.21.bb index f3ae6e9383..075c9dbc77 100644 --- a/recipes/netbase/netbase_4.21.bb +++ b/recipes/netbase/netbase_4.21.bb @@ -9,7 +9,7 @@ inherit update-rc.d SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" INITSCRIPT_NAME = "networking" -INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ." +INITSCRIPT_PARAMS = "start 41 S . stop 41 0 6 1 ." # On MNCI etc, start very late so that our own apps come up faster INITSCRIPT_PARAMS_openmn = "start 85 1 2 3 4 5 . stop 85 0 6 1 ." # On SlugOS (NSLU2) delay the stop until after network apps have exited diff --git a/recipes/opkg/files/configure b/recipes/opkg/files/configure index d5dd74dbf3..633d8d3371 100644 --- a/recipes/opkg/files/configure +++ b/recipes/opkg/files/configure @@ -22,4 +22,4 @@ else fi # delete myself -rm -f /etc/rcS.d/S98configure +rm -f /etc/rcS.d/S40configure diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc index 6970f2fae5..8980c1481e 100644 --- a/recipes/opkg/opkg.inc +++ b/recipes/opkg/opkg.inc @@ -5,7 +5,7 @@ LICENSE = "GPLv2" SRCREV = "609" PV = "0.1.8+svnr${SRCPV}" CONFLICTS = "ipkg" -INC_PR = "r4" +INC_PR = "r5" SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \ file://configure \ @@ -17,7 +17,7 @@ inherit autotools pkgconfig do_install_prepend() { install -d ${D}${sysconfdir}/rcS.d - install -m 0755 ${WORKDIR}/configure ${D}${sysconfdir}/rcS.d/S98configure + install -m 0755 ${WORKDIR}/configure ${D}${sysconfdir}/rcS.d/S40configure } EXTRA_OECONF += " --disable-gpg \ From bb62598d365e614258c0d709023b3b74b01f3726 Mon Sep 17 00:00:00 2001 From: Jan Kobler Date: Tue, 1 Mar 2011 21:01:37 +0000 Subject: [PATCH 163/509] New machine pcm043 Phytec phyCORE-i.MX35 The new machine pcm043 is the board Phytec phyCORE-i.MX35. The machine name pcm043 is chosen, because it is already used in the linux kernel for this board. BSP is derived from BSP of machine mx31ads. Linux kernel is based on Phytec Linux BSP for phyCORE-i.MX35 PD 10.1.1 Vendor page: http://www.phytec.com/products/rdk/ARM-XScale/phyCORE-ARM11-i.MX35.html Tutorial: http://en.gentoo-wiki.com/wiki/Phytec_phyCORE-iMX35/Openembedded Signed-off-by: Jan Kobler Signed-off-by: Tom Rini --- MAINTAINERS | 5 ++ conf/distro/include/sane-feed.inc | 1 + conf/machine/pcm043.conf | 25 +++++++ contrib/angstrom/sort.sh | 2 +- contrib/feed-browser/includes/config.inc | 5 ++ recipes/clutter/clutter.inc | 5 ++ recipes/images/illume-image.bb | 1 + recipes/linux/linux_2.6.31.bb | 89 ++++++++++++++++++++++++ 8 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 conf/machine/pcm043.conf diff --git a/MAINTAINERS b/MAINTAINERS index 096e766943..45e92d11c2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -138,6 +138,11 @@ Recipes: quagga, iputils, ndic6, hping2, lilo-sh, conserver, ipsec-tools, Recipes: lilo-sh, clamav, havp, p3scan, clamsmtp, librsync, rdiff-backup, Recipes: net-snmp, ebtables, ethtool, arpwatch, lib*-perl +Person: Jan Kobler +Mail: eng1@koblersystems.de +Interests: embedded systems, powerpc, arm +Machines: pcm043 + Person: Jan Luebbe Mail: jluebbe@lasnet.de Website: http://sicherheitsschwankung.de diff --git a/conf/distro/include/sane-feed.inc b/conf/distro/include/sane-feed.inc index 873972f5aa..70fc7a9470 100644 --- a/conf/distro/include/sane-feed.inc +++ b/conf/distro/include/sane-feed.inc @@ -119,6 +119,7 @@ FEED_ARCH_mx31moboard = "armv6" FEED_ARCH_nokia800 = "armv6" FEED_ARCH_omap2420h4 = "armv6" FEED_ARCH_omap2430sdp = "armv6" +FEED_ARCH_pcm043 = "armv6" # i486 machines FEED_ARCH_geodegx = "i486" diff --git a/conf/machine/pcm043.conf b/conf/machine/pcm043.conf new file mode 100644 index 0000000000..fdf2f0e3e6 --- /dev/null +++ b/conf/machine/pcm043.conf @@ -0,0 +1,25 @@ +#@TYPE: Machine +#@Name: Phytec phyCORE-i.MX35 +#@DESCRIPTION: Machine configuration for Phytec phyCORE-i.MX35 + +TARGET_ARCH = "arm" + +MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget touchscreen" + +GUI_MACHINE_CLASS = "smallscreen" + +PREFERRED_PROVIDER_virtual/kernel = "linux" + +require conf/machine/include/tune-arm1136jf-s.inc + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttymxc0" + +# used by opie-collections.inc +ROOT_FLASH_SIZE = "32" + +IMAGE_FSTYPES += "tar.gz" + +KERNEL_IMAGETYPE = "uImage" + +UBOOT_ENTRYPOINT = "0x80008000" diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh index 893d9285b5..225ca08b81 100755 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@ -75,7 +75,7 @@ case "$arch" in "armv5teb") machines="fsg3be ixp4xxbe nslu2be" ;; "armv6") - machines="bug iphone mx31ads mx31moboard mini6410 nokia800 omap2420h4 omap2430sdp smartq5 smartqv7 smdk6410" ;; + machines="bug iphone mx31ads mx31moboard mini6410 nokia800 omap2420h4 omap2430sdp pcm043 smartq5 smartqv7 smdk6410" ;; "armv6-novfp") machines="htcblackstone htcdiamond htcdream htckaiser htcnike htcpolaris htcraphael htctitan htcvogue" ;; "armv7a") diff --git a/contrib/feed-browser/includes/config.inc b/contrib/feed-browser/includes/config.inc index 341ba87c36..667fcc6db0 100644 --- a/contrib/feed-browser/includes/config.inc +++ b/contrib/feed-browser/includes/config.inc @@ -244,6 +244,11 @@ $feeds = array( 'url'=>'armv6/machine/mx31ads', ), + array( + 'name'=>'Phytec phyCORE-i.MX35', + 'url'=>'armv6/machine/pcm043', + ), + array( 'name'=>'Tyan thunder K7 s2462 mainboard (guinness)', 'url'=>'i686/machine/guinness', diff --git a/recipes/clutter/clutter.inc b/recipes/clutter/clutter.inc index 7f3324bfde..b5f630e60b 100644 --- a/recipes/clutter/clutter.inc +++ b/recipes/clutter/clutter.inc @@ -41,6 +41,11 @@ EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative" PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}" LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ " +DEPENDS_pcm043 = "${STDDEPENDS} libgles-mx31 tslib" +EXTRA_OECONF_pcm043 = "${BASE_CONF} --with-flavour=eglnative" +PACKAGE_ARCH_pcm043 = "${MACHINE_ARCH}" +LDFLAGS_append_pcm043 = " -lpvrNULLWSEGL -lstdc++ " + INC_PR = "r3" inherit autotools pkgconfig gtk-doc diff --git a/recipes/images/illume-image.bb b/recipes/images/illume-image.bb index 7e16c937cd..e01ef276ee 100644 --- a/recipes/images/illume-image.bb +++ b/recipes/images/illume-image.bb @@ -122,6 +122,7 @@ GLES_INSTALL_append_omap3evm = "libgles-omap3" #GLES_INSTALL_append_overo = "libgles-omap3" GLES_INSTALL_append_mx31ads = "libgles-mx31" GLES_INSTALL_append_mx31litekit = "libgles-mx31" +GLES_INSTALL_append_pcm043 = "libgles-mx31" GLES_INSTALL_append_zylonite = "libgles-zylonite" # python diff --git a/recipes/linux/linux_2.6.31.bb b/recipes/linux/linux_2.6.31.bb index 8dc0f4b866..c7448f4515 100644 --- a/recipes/linux/linux_2.6.31.bb +++ b/recipes/linux/linux_2.6.31.bb @@ -15,6 +15,7 @@ DEFAULT_PREFERENCE_iei-nanogx-466 = "1" DEFAULT_PREFERENCE_cm-x300 = "1" DEFAULT_PREFERENCE_babbage = "1" DEFAULT_PREFERENCE_mx25-3stack = "1" +DEFAULT_PREFERENCE_pcm043 = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.12.bz2;apply=yes;name=stablepatch \ @@ -83,6 +84,94 @@ SRC_URI_append_mx25-3stack = " \ file://defconfig \ " +SRC_URI_append_pcm043 = " \ + file://0001-spi-add-SPI-driver-for-most-known-i.MX-SoCs.patch \ + file://0002-mfd-Add-Freescale-MC13783-driver.patch \ + file://0003-mx3-Add-SSI-pins-to-iomux-table.patch \ + file://0004-mxc-iomux-v3-remove-resource-handling.patch \ + file://0005-i.MX31-clock-rename-SSI-clocks-to-driver-name.patch \ + file://0006-i.MX2-Add-sound-ssi-resources.patch \ + file://0007-i.MX3-Add-sound-ssi-resources.patch \ + file://0008-MXC-Add-a-digital-audio-multiplexer-driver.patch \ + file://0009-MX31-Fix-spi-clock-names.patch \ + file://0010-i.MX35-Fix-audmux-clock.patch \ + file://0011-MX31-add-spi-controller-devices-resources.patch \ + file://0012-i.MX27-clock-rename-spi-clocks-to-match-device.patch \ + file://0013-add-a-mc13783-codec-driver.patch \ + file://0014-imx-ssi-sound-driver.patch \ + file://0015-add-phycore-ac97-sound-support.patch \ + file://0016-add-phycore-mc13783-sound-support.patch \ + file://0017-pcm043-add-sound-support.patch \ + file://0018-pcm038-Add-SPI-MC13783-support.patch \ + file://0019-mx27-add-support-for-phytec-pca100-phyCARD-s-board.patch \ + file://0020-MX2-Add-SPI-devices-resources.patch \ + file://0021-mxc-mx1-mx2-DMA-add-a-possibility-to-create-an-endle.patch \ + file://0022-ASoC-Allow-32-bit-registers-for-DAPM.patch \ + file://0023-pca100-add-sound-support.patch \ + file://0024-pcm038-add-sound-support.patch \ + file://0025-pcm037-Add-sound-support.patch \ + file://0026-imx-ssi-Fix-AC97-rates.patch \ + file://0027-imx-ssi-flush-fifos.patch \ + file://0028-imx-ssi-Fix-occasional-AC97-reset-failure.patch \ + file://0021-Early-printk.patch \ + file://0024-MX31-Clock-updates.patch;striplevel=0 \ + file://Update-PCM043-board-support.patch \ + file://0027-Add-EHCI-support-for-MX27-and-MX31-based-boards.patch \ + file://0029-MX31-Add-USB-platform-devices-and-resources.patch \ + file://0053-Watchdog-driver-for-IMX-MXC.patch \ + file://0066-HACK-increase-default-tx_queue_len-to-10000.patch \ + file://0084-i.MX35-clock-support-Add-USB-clocks.patch \ + file://0088-ehci-mxc-Fix-clocks.patch \ + file://0090-mx3x-Fixup-USB-base-addresses.patch \ + file://0091-mx31-clock-remove-obsolete-FIXME-comment.patch \ + file://0092-mx35-clock-give-ehci-clocks-names.patch \ + file://0096-i.MX35-implement-get_rate-for-usb-otg-clock.patch \ + file://0097-fsl-udc-driver-add-mx35-support.patch \ + file://0001-mxcv2-nand-driver.patch;striplevel=0 \ + file://0002-MXC-NFC-Remove-useless-structure-member.patch \ + file://0003-MXC-NFC-Add-a-real-NAND-flash-data-width-setup-func.patch \ + file://0004-MXC-NFC-Use-generic-bad-block-detection.patch \ + file://0005-MXC-NFC-Divide-flash-device-detection-into-two-step.patch \ + file://0006-MXC-NFC-Reorder-structure-setup-to-use-NAND-informa.patch \ + file://0007-MXC-NFC-Fix-OOB-layout.patch \ + file://0008-MXC-NFC-The-i.MX35-CPU-also-uses-a-V2.1-NFC.patch \ + file://0009-MXC-NFC-Fix-NFC-s-address-area-on-i.MX35.patch;striplevel=0 \ + file://0010-MXC-NFC-Add-the-clock-resource-to-support-NFC-in-i.patch;striplevel=0 \ + file://0011-MXC-NFC-Fix-NFC-s-clock-name.patch \ + file://0012-MXC-NFC-i.MX35-can-work-with-the-v2-not-with-v1-of.patch;striplevel=0 \ + file://0013-MXC-NFC-Add-the-cpu_is_mx25-macro.patch;striplevel=0 \ + file://0014-MXC-NFC-Add-NAND-device-to-the-pcm043-platform.patch;striplevel=0 \ + file://0015-MXC-NFC-unlock_addr-is-only-used-while-__init-pha.patch \ + file://fix_oob_layout.diff;striplevel=0 \ + file://0002-mxc_nand-cleanup-eccoob-descriptions.patch \ + file://0003-mxc_nand-cleanup-initialization.patch \ + file://0004-mxc_nand-merge-send_read_page-and-send_prog_page.patch \ + file://0005-mxc_nand-introduce-mxc_do_addr_cycle.patch \ + file://0006-mxc-nand-remove-debug-param.patch \ + file://0007-mxc-nand-remove-dead-code.patch \ + file://0008-mxc-nand-use-resource_size.patch \ + file://0009-mxc-nand-use-buffers.patch \ + file://0010-mxc-nand-simplify-command-processing.patch \ + file://0011-mxc-nand-modify-send_page-to-send-all-pages-not-on.patch \ + file://0012-mxc_nand-remove-unused-defines.patch \ + file://0013-mxc_nand-Make-main-spare-areas-runtime-configurable.patch \ + file://0014-mxc_nand-Get-rid-of-pagesize_2k-flag.patch \ + file://0015-mxc_nand-Add-NFC-V2-support.patch \ + file://0016-mxc_nand-disable-sp_en-bit-only-once.patch \ + file://0017-mxc_nand-Allow-flash-based-bbt.patch \ + file://0018-mxc_nand-remove-TROP_US_DELAY.patch \ + file://0019-mxc_nand-use-DRIVER_NAME-where-appropriate.patch \ + file://linux-2.6.31.6-flexcan.patch \ + file://fix_owire_clk.patch \ + file://w1_master.patch \ + file://add-led-gpio.patch \ + file://linux-2.6.31.6-spi.patch \ + file://fix_max7301.patch \ + file://fix_clock_calc.patch \ + file://add_mmc.diff;striplevel=0 \ + file://fix_mmc_for_highspeed.diff \ + file://fix_can.patch " + do_devicetree_image_append_boc01() { dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o devicetree.v1 ${KERNEL_DEVICETREE}.v1 install -m 0644 devicetree.v1 ${D}/boot/devicetree-${KERNEL_VERSION}.v1 From caf693ee9802cb691fc8eaa71d1aeb06fb5b52a4 Mon Sep 17 00:00:00 2001 From: Jan Kobler Date: Tue, 1 Mar 2011 14:01:38 +0100 Subject: [PATCH 164/509] linux-2.6.31 config and patch files for pcm043 These config and patch files are from the Phytec Linux BSP for phyCORE-i.MX35 PD10.1.1. They were taken from the archive ftp://ftp.phytec.de/pub/Products/phyCORE-iMX350/Linux/PD10.1.1/OSELAS.BSP-Phytec-phyCORE-i.MX35-PD10.1.1.tar.gz The patch files are from the folder in this archive OSELAS.BSP-Phytec-phyCORE-i.MX35-PD10.1.1/configs/phyCORE-i.MX35-2010.08.0/patches/linux-2.6.31.6/generic The patch files have been shipped for linux-2.6.31.6 and are used here on linux-2.6.31.12. Because it seems to work, pcm043 is added to linux-2.6.31.bb. The sequence of the patches for pcm043 in linux-2.6.31.bb is derived from the file OSELAS.BSP-Phytec-phyCORE-i.MX35-PD10.1.1/configs/phyCORE-i.MX35-2010.08.0/patches/linux-2.6.31.6/generic/series The defconfig file is the file OSELAS.BSP-Phytec-phyCORE-i.MX35-PD10.1.1/configs/phyCORE-i.MX35-2010.08.0/kernelconfig These patch files from the folder OSELAS.BSP-Phytec-phyCORE-i.MX35-PD10.1.1/configs/phyCORE-i.MX35-2010.08.0/patches/linux-2.6.31.6/generic are NOT used: 0063-add-generic-platform-bus-based-sja1000-driver.patch 0076-mx3fb-pretty-printing-update.patch 0078-sja1000-driver-Fix-net-device-stats.patch patch-2.6.31.6-rt19.gz because they are not referenced by the file OSELAS.BSP-Phytec-phyCORE-i.MX35-PD10.1.1/configs/phyCORE-i.MX35-2010.08.0/patches/linux-2.6.31.6/generic/series Signed-off-by: Jan Kobler Signed-off-by: Tom Rini --- .../pcm043/0001-mxcv2-nand-driver.patch | 1130 ++++++++ ...-SPI-driver-for-most-known-i.MX-SoCs.patch | 2337 +++++++++++++++++ ...-NFC-Remove-useless-structure-member.patch | 45 + ...002-mfd-Add-Freescale-MC13783-driver.patch | 984 +++++++ ...mxc_nand-cleanup-eccoob-descriptions.patch | 111 + ...eal-NAND-flash-data-width-setup-func.patch | 51 + ...0003-mx3-Add-SSI-pins-to-iomux-table.patch | 48 + ...0003-mxc_nand-cleanup-initialization.patch | 124 + ...-NFC-Use-generic-bad-block-detection.patch | 148 ++ ...xc-iomux-v3-remove-resource-handling.patch | 111 + ...ge-send_read_page-and-send_prog_page.patch | 104 + ...flash-device-detection-into-two-step.patch | 48 + ...ock-rename-SSI-clocks-to-driver-name.patch | 28 + ...mxc_nand-introduce-mxc_do_addr_cycle.patch | 122 + ...-structure-setup-to-use-NAND-informa.patch | 129 + .../0006-i.MX2-Add-sound-ssi-resources.patch | 132 + .../0006-mxc-nand-remove-debug-param.patch | 82 + .../pcm043/0007-MXC-NFC-Fix-OOB-layout.patch | 104 + .../0007-i.MX3-Add-sound-ssi-resources.patch | 101 + .../0007-mxc-nand-remove-dead-code.patch | 41 + ...d-a-digital-audio-multiplexer-driver.patch | 281 ++ ...-The-i.MX35-CPU-also-uses-a-V2.1-NFC.patch | 26 + .../0008-mxc-nand-use-resource_size.patch | 26 + .../0009-MX31-Fix-spi-clock-names.patch | 32 + ...NFC-Fix-NFC-s-address-area-on-i.MX35.patch | 28 + .../pcm043/0009-mxc-nand-use-buffers.patch | 473 ++++ ...e-clock-resource-to-support-NFC-in-i.patch | 61 + .../pcm043/0010-i.MX35-Fix-audmux-clock.patch | 52 + ...mxc-nand-simplify-command-processing.patch | 143 + ...add-spi-controller-devices-resources.patch | 97 + .../0011-MXC-NFC-Fix-NFC-s-clock-name.patch | 28 + ...y-send_page-to-send-all-pages-not-on.patch | 87 + ...-can-work-with-the-v2-not-with-v1-of.patch | 34 + ...ck-rename-spi-clocks-to-match-device.patch | 30 + .../0012-mxc_nand-remove-unused-defines.patch | 31 + ...13-MXC-NFC-Add-the-cpu_is_mx25-macro.patch | 38 + .../0013-add-a-mc13783-codec-driver.patch | 834 ++++++ ...ain-spare-areas-runtime-configurable.patch | 142 + ...d-NAND-device-to-the-pcm043-platform.patch | 47 + .../pcm043/0014-imx-ssi-sound-driver.patch | 1911 ++++++++++++++ ...mxc_nand-Get-rid-of-pagesize_2k-flag.patch | 128 + ...k_addr-is-only-used-while-__init-pha.patch | 28 + .../0015-add-phycore-ac97-sound-support.patch | 140 + .../0015-mxc_nand-Add-NFC-V2-support.patch | 191 ++ ...16-add-phycore-mc13783-sound-support.patch | 211 ++ ...mxc_nand-disable-sp_en-bit-only-once.patch | 66 + .../0017-mxc_nand-Allow-flash-based-bbt.patch | 79 + .../0017-pcm043-add-sound-support.patch | 161 ++ .../0018-mxc_nand-remove-TROP_US_DELAY.patch | 88 + .../0018-pcm038-Add-SPI-MC13783-support.patch | 146 + ...rt-for-phytec-pca100-phyCARD-s-board.patch | 293 +++ ...nd-use-DRIVER_NAME-where-appropriate.patch | 35 + .../0020-MX2-Add-SPI-devices-resources.patch | 92 + .../pcm043/0021-Early-printk.patch | 106 + ...add-a-possibility-to-create-an-endle.patch | 50 + ...ASoC-Allow-32-bit-registers-for-DAPM.patch | 203 ++ .../0023-pca100-add-sound-support.patch | 99 + .../pcm043/0024-MX31-Clock-updates.patch | 40 + .../0024-pcm038-add-sound-support.patch | 72 + .../0025-pcm037-Add-sound-support.patch | 144 + .../pcm043/0026-imx-ssi-Fix-AC97-rates.patch | 37 + ...pport-for-MX27-and-MX31-based-boards.patch | 347 +++ .../pcm043/0027-imx-ssi-flush-fifos.patch | 29 + ...si-Fix-occasional-AC97-reset-failure.patch | 37 + ...d-USB-platform-devices-and-resources.patch | 100 + .../0053-Watchdog-driver-for-IMX-MXC.patch | 490 ++++ ...crease-default-tx_queue_len-to-10000.patch | 36 + ...-i.MX35-clock-support-Add-USB-clocks.patch | 30 + .../pcm043/0088-ehci-mxc-Fix-clocks.patch | 33 + .../0090-mx3x-Fixup-USB-base-addresses.patch | 93 + ...-clock-remove-obsolete-FIXME-comment.patch | 25 + ...92-mx35-clock-give-ehci-clocks-names.patch | 30 + ...implement-get_rate-for-usb-otg-clock.patch | 54 + ...0097-fsl-udc-driver-add-mx35-support.patch | 83 + .../pcm043/Update-PCM043-board-support.patch | 134 + .../linux-2.6.31/pcm043/add-led-gpio.patch | 17 + .../linux/linux-2.6.31/pcm043/add_mmc.diff | 1396 ++++++++++ .../linux/linux-2.6.31/pcm043/fix_can.patch | 16 + .../linux-2.6.31/pcm043/fix_clock_calc.patch | 27 + .../linux-2.6.31/pcm043/fix_max7301.patch | 28 + .../pcm043/fix_mmc_for_highspeed.diff | 63 + .../linux-2.6.31/pcm043/fix_oob_layout.diff | 67 + .../linux-2.6.31/pcm043/fix_owire_clk.patch | 17 + .../pcm043/linux-2.6.31.6-flexcan.patch | 2168 +++++++++++++++ .../pcm043/linux-2.6.31.6-spi.patch | 116 + .../linux/linux-2.6.31/pcm043/w1_master.patch | 26 + recipes/linux/linux/pcm043/defconfig | 1659 ++++++++++++ 87 files changed, 19911 insertions(+) create mode 100644 recipes/linux/linux-2.6.31/pcm043/0001-mxcv2-nand-driver.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0001-spi-add-SPI-driver-for-most-known-i.MX-SoCs.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0002-MXC-NFC-Remove-useless-structure-member.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0002-mfd-Add-Freescale-MC13783-driver.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0002-mxc_nand-cleanup-eccoob-descriptions.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0003-MXC-NFC-Add-a-real-NAND-flash-data-width-setup-func.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0003-mx3-Add-SSI-pins-to-iomux-table.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0003-mxc_nand-cleanup-initialization.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0004-MXC-NFC-Use-generic-bad-block-detection.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0004-mxc-iomux-v3-remove-resource-handling.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0004-mxc_nand-merge-send_read_page-and-send_prog_page.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0005-MXC-NFC-Divide-flash-device-detection-into-two-step.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0005-i.MX31-clock-rename-SSI-clocks-to-driver-name.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0005-mxc_nand-introduce-mxc_do_addr_cycle.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0006-MXC-NFC-Reorder-structure-setup-to-use-NAND-informa.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0006-i.MX2-Add-sound-ssi-resources.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0006-mxc-nand-remove-debug-param.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0007-MXC-NFC-Fix-OOB-layout.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0007-i.MX3-Add-sound-ssi-resources.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0007-mxc-nand-remove-dead-code.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0008-MXC-Add-a-digital-audio-multiplexer-driver.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0008-MXC-NFC-The-i.MX35-CPU-also-uses-a-V2.1-NFC.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0008-mxc-nand-use-resource_size.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0009-MX31-Fix-spi-clock-names.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0009-MXC-NFC-Fix-NFC-s-address-area-on-i.MX35.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0009-mxc-nand-use-buffers.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0010-MXC-NFC-Add-the-clock-resource-to-support-NFC-in-i.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0010-i.MX35-Fix-audmux-clock.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0010-mxc-nand-simplify-command-processing.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0011-MX31-add-spi-controller-devices-resources.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0011-MXC-NFC-Fix-NFC-s-clock-name.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0011-mxc-nand-modify-send_page-to-send-all-pages-not-on.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0012-MXC-NFC-i.MX35-can-work-with-the-v2-not-with-v1-of.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0012-i.MX27-clock-rename-spi-clocks-to-match-device.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0012-mxc_nand-remove-unused-defines.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0013-MXC-NFC-Add-the-cpu_is_mx25-macro.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0013-add-a-mc13783-codec-driver.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0013-mxc_nand-Make-main-spare-areas-runtime-configurable.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0014-MXC-NFC-Add-NAND-device-to-the-pcm043-platform.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0014-imx-ssi-sound-driver.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0014-mxc_nand-Get-rid-of-pagesize_2k-flag.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0015-MXC-NFC-unlock_addr-is-only-used-while-__init-pha.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0015-add-phycore-ac97-sound-support.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0015-mxc_nand-Add-NFC-V2-support.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0016-add-phycore-mc13783-sound-support.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0016-mxc_nand-disable-sp_en-bit-only-once.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0017-mxc_nand-Allow-flash-based-bbt.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0017-pcm043-add-sound-support.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0018-mxc_nand-remove-TROP_US_DELAY.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0018-pcm038-Add-SPI-MC13783-support.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0019-mx27-add-support-for-phytec-pca100-phyCARD-s-board.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0019-mxc_nand-use-DRIVER_NAME-where-appropriate.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0020-MX2-Add-SPI-devices-resources.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0021-Early-printk.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0021-mxc-mx1-mx2-DMA-add-a-possibility-to-create-an-endle.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0022-ASoC-Allow-32-bit-registers-for-DAPM.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0023-pca100-add-sound-support.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0024-MX31-Clock-updates.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0024-pcm038-add-sound-support.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0025-pcm037-Add-sound-support.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0026-imx-ssi-Fix-AC97-rates.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0027-Add-EHCI-support-for-MX27-and-MX31-based-boards.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0027-imx-ssi-flush-fifos.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0028-imx-ssi-Fix-occasional-AC97-reset-failure.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0029-MX31-Add-USB-platform-devices-and-resources.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0053-Watchdog-driver-for-IMX-MXC.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0066-HACK-increase-default-tx_queue_len-to-10000.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0084-i.MX35-clock-support-Add-USB-clocks.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0088-ehci-mxc-Fix-clocks.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0090-mx3x-Fixup-USB-base-addresses.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0091-mx31-clock-remove-obsolete-FIXME-comment.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0092-mx35-clock-give-ehci-clocks-names.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0096-i.MX35-implement-get_rate-for-usb-otg-clock.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/0097-fsl-udc-driver-add-mx35-support.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/Update-PCM043-board-support.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/add-led-gpio.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/add_mmc.diff create mode 100644 recipes/linux/linux-2.6.31/pcm043/fix_can.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/fix_clock_calc.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/fix_max7301.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/fix_mmc_for_highspeed.diff create mode 100644 recipes/linux/linux-2.6.31/pcm043/fix_oob_layout.diff create mode 100644 recipes/linux/linux-2.6.31/pcm043/fix_owire_clk.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/linux-2.6.31.6-flexcan.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/linux-2.6.31.6-spi.patch create mode 100644 recipes/linux/linux-2.6.31/pcm043/w1_master.patch create mode 100644 recipes/linux/linux/pcm043/defconfig diff --git a/recipes/linux/linux-2.6.31/pcm043/0001-mxcv2-nand-driver.patch b/recipes/linux/linux-2.6.31/pcm043/0001-mxcv2-nand-driver.patch new file mode 100644 index 0000000000..fbbf023fcb --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0001-mxcv2-nand-driver.patch @@ -0,0 +1,1130 @@ +From cd56a2552db22ae5464b68074ad35bf0700bb790 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 4 Jun 2009 11:26:22 +0200 +Subject: [PATCH 01/15] mxcv2 nand driver + +Signed-off-by: Sascha Hauer + +rebased to 2.6.31.6 +Signed-off-by: Jan Weitzel +--- + drivers/mtd/nand/Kconfig | 7 + drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/mxc_nand_v2.c | 1079 +++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 1087 insertions(+) + create mode 100644 drivers/mtd/nand/mxc_nand_v2.c + +Index: drivers/mtd/nand/Kconfig +=================================================================== +--- drivers/mtd/nand/Kconfig.orig 2009-12-08 10:02:55.061888995 +0100 ++++ drivers/mtd/nand/Kconfig 2009-12-08 10:02:59.468654404 +0100 +@@ -426,6 +426,13 @@ + This enables the driver for the NAND flash controller on the + MXC processors. + ++config MTD_NAND_MXC_V2 ++ tristate "MXC NAND support" ++ depends on ARCH_MX25 ++ help ++ This enables the driver for the NAND flash controller on the ++ MXC processors. ++ + config MTD_NAND_SH_FLCTL + tristate "Support for NAND on Renesas SuperH FLCTL" + depends on MTD_NAND && SUPERH && CPU_SUBTYPE_SH7723 +Index: drivers/mtd/nand/Makefile +=================================================================== +--- drivers/mtd/nand/Makefile.orig 2009-12-08 10:02:55.079723657 +0100 ++++ drivers/mtd/nand/Makefile 2009-12-08 10:02:59.468654404 +0100 +@@ -38,6 +38,7 @@ + obj-$(CONFIG_MTD_NAND_FSL_UPM) += fsl_upm.o + obj-$(CONFIG_MTD_NAND_SH_FLCTL) += sh_flctl.o + obj-$(CONFIG_MTD_NAND_MXC) += mxc_nand.o ++obj-$(CONFIG_MTD_NAND_MXC_V2) += mxc_nand_v2.o + obj-$(CONFIG_MTD_NAND_SOCRATES) += socrates_nand.o + obj-$(CONFIG_MTD_NAND_TXX9NDFMC) += txx9ndfmc.o + +Index: drivers/mtd/nand/mxc_nand_v2.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ drivers/mtd/nand/mxc_nand_v2.c 2009-12-08 10:02:59.468654404 +0100 +@@ -0,0 +1,1079 @@ ++/* ++ * Copyright 2004-2008 Freescale Semiconductor, Inc. All Rights Reserved. ++ * Copyright 2009 Sascha Hauer, kernel@pengutronix.de ++ * ++ * 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., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#define NFC_SET_RBA 0xe04 ++#define NFC_FLASH_ADDR 0xe06 ++#define NFC_FLASH_CMD 0xe08 ++#define NFC_BLS 0xe0a ++#define NFC_ECC_STATUS_RESULT 0xe0c ++#define NFC_V21_SPAS 0xe10 ++#define NFC_WR_PROT 0xe12 ++ ++#define NFC_CONFIG1 0xe1a ++#define NFC_CONFIG2 0xe1c ++ ++#define NFC_V21_UNLOCKSTART_BLKADDR 0xe20 ++#define NFC_V21_UNLOCKEND_BLKADDR 0xe22 ++#define NFC_V1_UNLOCKSTART_BLKADDR 0xe14 ++#define NFC_V1_UNLOCKEND_BLKADDR 0xe16 ++ ++#define nfc_is_v21() cpu_is_mx25() ++#define nfc_is_v2x() cpu_is_mx31() ++ ++#define NFC_ECC_EN (1 << 3) ++ ++#define NFC_WPC_UNLOCK (1 << 2) ++ ++#define NFC_CMD (1 << 0) ++#define NFC_ADDR (1 << 1) ++#define NFC_INPUT (1 << 2) ++#define NFC_OUTPUT (1 << 3) ++#define NFC_ID (1 << 4) ++#define NFC_STATUS (1 << 5) ++ ++#define NFC_RBA_SHIFT 4 ++ ++#define NFC_INT (1 << 15) ++ ++#define NFC_BLS_RESET (3 << 16) ++#define NFC_V2_BLS_UNLOCKED 2 ++ ++#define NFC_V2_SP_EN (1 << 2) ++ ++#define NFC_INT_MSK (1 << 4) ++ ++#define NFMS_NF_DWIDTH 0 ++#define NFMS_NF_PG_SZ 1 ++#define NFC_SPAS_WIDTH 8 ++#define NFC_SPAS_SHIFT 16 ++ ++#define NFC_V21_SPAS_SHIFT (0) ++#define NFC_V21_SPAS_MASK (0xFF00) ++ ++struct mxc_nand_host { ++ struct mtd_info mtd; ++ struct nand_chip nand; ++ struct mtd_partition *parts; ++ struct device *dev; ++ ++ int version; ++ void *spare0; ++ int spare_len; ++ int spare_size; ++ void *main_area0; ++ void *main_area1; ++ void __iomem *base; ++ void __iomem *regs; ++ ++ int status_request; ++ ++ unsigned int buf_start; ++ ++ wait_queue_head_t irq_waitq; ++ int g_page_mask; ++ ++ struct clk *clk; ++ int clk_enabled; ++ ++ uint8_t *data_buf; ++ ++ int irq; ++}; ++ ++/* Define delays in microsec for NAND device operations */ ++#define TROP_US_DELAY 2000 ++ ++/* ++ * OOB placement block for use with hardware ecc generation ++ */ ++static struct nand_ecclayout nand_hw_eccoob_512 = { ++ .eccbytes = 9, ++ .eccpos = {7, 8, 9, 10, 11, 12, 13, 14, 15}, ++ .oobavail = 4, ++ .oobfree = {{0, 4}} ++}; ++ ++static struct nand_ecclayout nand_hw_eccoob_2k = { ++ .eccbytes = 9, ++ .eccpos = {7, 8, 9, 10, 11, 12, 13, 14, 15}, ++ .oobavail = 4, ++ .oobfree = {{2, 4}} ++}; ++ ++static struct nand_ecclayout nand_hw_eccoob_4k = { ++ .eccbytes = 9, ++ .eccpos = {7, 8, 9, 10, 11, 12, 13, 14, 15}, ++ .oobavail = 4, ++ .oobfree = {{2, 4}} ++}; ++ ++#ifdef CONFIG_MTD_PARTITIONS ++static const char *part_probes[] = { "RedBoot", "cmdlinepart", NULL }; ++#endif ++ ++static irqreturn_t mxc_nfc_irq(int irq, void *dev_id) ++{ ++ struct mxc_nand_host *host = dev_id; ++ ++ uint16_t tmp; ++ ++ tmp = readw(host->regs + NFC_CONFIG1); ++ tmp |= NFC_INT_MSK; /* Disable interrupt */ ++ writew(tmp, host->regs + NFC_CONFIG1); ++ ++ wake_up(&host->irq_waitq); ++ ++ return IRQ_HANDLED; ++} ++ ++/* This function polls the NANDFC to wait for the basic operation to ++ * complete by checking the INT bit of config2 register. ++ */ ++static void wait_op_done(struct mxc_nand_host *host, int max_retries, ++ int useirq) ++{ ++ uint32_t tmp; ++ ++ if (useirq) { ++ if ((readw(host->regs + NFC_CONFIG2) & NFC_INT) == 0) { ++ ++ tmp = readw(host->regs + NFC_CONFIG1); ++ tmp &= ~NFC_INT_MSK; /* Enable interrupt */ ++ writew(tmp, host->regs + NFC_CONFIG1); ++ ++ wait_event(host->irq_waitq, ++ readw(host->regs + NFC_CONFIG2) & NFC_INT); ++ ++ tmp = readw(host->regs + NFC_CONFIG2); ++ tmp &= ~NFC_INT; ++ writew(tmp, host->regs + NFC_CONFIG2); ++ } ++ } else { ++ while (max_retries-- > 0) { ++ if (readw(host->regs + NFC_CONFIG2) & NFC_INT) { ++ tmp = readw(host->regs + NFC_CONFIG2); ++ tmp &= ~NFC_INT; ++ writew(tmp, host->regs + NFC_CONFIG2); ++ break; ++ } ++ udelay(1); ++ } ++ if (max_retries <= 0) { ++ printk("%s timed out: 0x%04x\n", __func__, readw(host->regs + NFC_CONFIG2)); ++ BUG(); ++ } ++ } ++} ++ ++/* This function issues the specified command to the NAND device and ++ * waits for completion. */ ++static void send_cmd(struct mxc_nand_host *host, uint16_t cmd, int useirq) ++{ ++ DEBUG(MTD_DEBUG_LEVEL3, "send_cmd(host, 0x%x, %d)\n", cmd, useirq); ++ ++ writew(cmd, host->regs + NFC_FLASH_CMD); ++ writew(NFC_CMD, host->regs + NFC_CONFIG2); ++ ++ /* Wait for operation to complete */ ++ wait_op_done(host, TROP_US_DELAY, useirq); ++} ++ ++/* ++ * This function sends an address (or partial address) to the ++ * NAND device. The address is used to select the source/destination for ++ * a NAND command. ++ */ ++static void send_addr(struct mxc_nand_host *host, u16 addr) ++{ ++ DEBUG(MTD_DEBUG_LEVEL3, "send_addr(0x%x)\n", addr); ++ ++ writew(addr, host->regs + NFC_FLASH_ADDR); ++ writew(NFC_ADDR, host->regs + NFC_CONFIG2); ++ ++ /* Wait for operation to complete */ ++ wait_op_done(host, TROP_US_DELAY, 0); ++} ++ ++/* ++ * This function requests the NFC to initate the transfer ++ * of data currently in the NFC RAM buffer to the NAND device. ++ * ++ */ ++static void send_page(struct mtd_info *mtd, unsigned int ops) ++{ ++ struct nand_chip *this = mtd->priv; ++ struct mxc_nand_host *host = this->priv; ++ int bufs, i; ++ ++ if (nfc_is_v2x() && mtd->writesize > 512) ++ bufs = 4; ++ else ++ bufs = 1; ++ ++ for (i = 0; i < bufs; i++) { ++ ++ /* set ram buffer id */ ++ writew(i, host->regs + NFC_SET_RBA); ++ ++ /* transfer data from NFC ram to nand */ ++ writew(ops, host->regs + NFC_CONFIG2); ++ ++ /* Wait for operation to complete */ ++ wait_op_done(host, TROP_US_DELAY, false); ++ } ++} ++ ++/* This function requests the NANDFC to perform a read of the ++ * NAND device status and returns the current status. */ ++static uint16_t get_dev_status(struct mxc_nand_host *host) ++{ ++ uint16_t ret; ++ ++ /* Set ram buffer id */ ++ writew(1, host->regs + NFC_SET_RBA); ++ ++ /* Read status into main buffer */ ++ writew(NFC_STATUS, host->regs + NFC_CONFIG2); ++ ++ /* Wait for operation to complete */ ++ wait_op_done(host, TROP_US_DELAY, true); ++ ++ /* Status is placed in first word of main buffer */ ++ /* get status, then recovery area 1 data */ ++ ret = readw(host->main_area1); ++ ++ return ret; ++} ++ ++static void mxc_nand_hwecc(struct mxc_nand_host *host, int on) ++{ ++ unsigned int tmp; ++ ++ tmp = readw(host->regs + NFC_CONFIG1); ++ ++ if (on) ++ tmp |= NFC_ECC_EN; ++ else ++ tmp &= ~NFC_ECC_EN; ++ ++ writew(tmp, host->regs + NFC_CONFIG1); ++} ++ ++static void mxc_nand_enable_hwecc(struct mtd_info *mtd, int mode) ++{ ++ struct nand_chip *this = mtd->priv; ++ struct mxc_nand_host *host = this->priv; ++ ++ mxc_nand_hwecc(host, 1); ++ return; ++} ++ ++/* ++ * Function to correct the detected errors. This NFC corrects all the errors ++ * detected. So this function just return 0. ++ */ ++static int mxc_nand_correct_data(struct mtd_info *mtd, u_char * dat, ++ u_char * read_ecc, u_char * calc_ecc) ++{ ++ return 0; ++} ++ ++/* ++ * Function to calculate the ECC for the data to be stored in the Nand device. ++ * This NFC has a hardware RS(511,503) ECC engine together with the RS ECC ++ * CONTROL blocks are responsible for detection and correction of up to ++ * 8 symbols of 9 bits each in 528 byte page. ++ * So this function is just return 0. ++ */ ++static int mxc_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, ++ u_char *ecc_code) ++{ ++ return 0; ++} ++ ++static uint8_t mxc_nand_read_byte(struct mtd_info *mtd) ++{ ++ struct nand_chip *this = mtd->priv; ++ struct mxc_nand_host *host = this->priv; ++ uint8_t ret; ++ ++ /* Check for status request */ ++ if (host->status_request) ++ return get_dev_status(host) & 0xff; ++ ++ ret = *(uint8_t *)(host->data_buf + host->buf_start); ++ host->buf_start++; ++ ++ return ret; ++} ++ ++static uint16_t mxc_nand_read_word(struct mtd_info *mtd) ++{ ++ struct nand_chip *nand_chip = mtd->priv; ++ struct mxc_nand_host *host = nand_chip->priv; ++ uint16_t ret; ++ ++ ret = *(uint16_t *)(host->data_buf + host->buf_start); ++ host->buf_start += 2; ++ ++ return ret; ++} ++ ++/* Write data of length len to buffer buf. The data to be ++ * written on NAND Flash is first copied to RAMbuffer. After the Data Input ++ * Operation by the NFC, the data is written to NAND Flash */ ++static void mxc_nand_write_buf(struct mtd_info *mtd, ++ const u_char *buf, int len) ++{ ++ struct nand_chip *nand_chip = mtd->priv; ++ struct mxc_nand_host *host = nand_chip->priv; ++ u16 col = host->buf_start; ++ int n = mtd->oobsize + mtd->writesize - col; ++ ++ n = min(n, len); ++ ++ memcpy(host->data_buf + col, buf, n); ++ ++ host->buf_start += n; ++} ++ ++/* Read the data buffer from the NAND Flash. To read the data from NAND ++ * Flash first the data output cycle is initiated by the NFC, which copies ++ * the data to RAMbuffer. This data of length len is then copied to buffer buf. ++ */ ++static void mxc_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len) ++{ ++ struct nand_chip *nand_chip = mtd->priv; ++ struct mxc_nand_host *host = nand_chip->priv; ++ u16 col = host->buf_start; ++ int n = mtd->oobsize + mtd->writesize - col; ++ ++ n = min(n, len); ++ ++ memcpy(buf, host->data_buf + col, len); ++ ++ host->buf_start += len; ++} ++ ++/* Used by the upper layer to verify the data in NAND Flash ++ * with the data in the buf. */ ++static int mxc_nand_verify_buf(struct mtd_info *mtd, const uint8_t *buf, ++ int len) ++{ ++ struct nand_chip *this = mtd->priv; ++ struct mxc_nand_host *host = this->priv; ++ ++ return memcmp(buf, host->data_buf, len) ? -EFAULT : 0; ++} ++ ++/* This function is used by upper layer for select and ++ * deselect of the NAND chip */ ++static void mxc_nand_select_chip(struct mtd_info *mtd, int chip) ++{ ++ struct nand_chip *nand_chip = mtd->priv; ++ struct mxc_nand_host *host = nand_chip->priv; ++ ++ switch (chip) { ++ case -1: ++ if (host->clk_enabled) { ++ clk_disable(host->clk); ++ host->clk_enabled = 0; ++ } ++ break; ++ case 0 ... 7: ++ if (!host->clk_enabled) { ++ clk_enable(host->clk); ++ host->clk_enabled = 1; ++ } ++ break; ++ ++ default: ++ break; ++ } ++} ++ ++/* ++ * Function to transfer data to/from spare area. ++ */ ++static void copy_spare(struct mtd_info *mtd, bool bfrom) ++{ ++ struct nand_chip *this = mtd->priv; ++ struct mxc_nand_host *host = this->priv; ++ u16 i, j; ++ u16 n = mtd->writesize >> 9; ++ u8 *d = host->data_buf + mtd->writesize; ++ u8 *s = host->spare0; ++ u16 t = host->spare_len; ++ ++ j = (mtd->oobsize / n >> 1) << 1; ++ ++ if (bfrom) { ++ for (i = 0; i < n - 1; i++) ++ memcpy(d + i * j, s + i * t, j); ++ ++ /* the last section */ ++ memcpy(d + i * j, s + i * t, mtd->oobsize - i * j); ++ } else { ++ for (i = 0; i < n - 1; i++) ++ memcpy(&s[i * t], &d[i * j], j); ++ ++ /* the last section */ ++ memcpy(&s[i * t], &d[i * j], mtd->oobsize - i * j); ++ } ++} ++ ++#define NFC_V2_ECC_MODE_4 (1 << 0) ++ ++#define NFC_SPAS_16 8 ++#define NFC_SPAS_64 32 ++#define NFC_SPAS_128 64 ++#define NFC_SPAS_218 109 ++#define NFC_IPC_CREQ (1 << 0) ++#define NFC_IPC_ACK (1 << 1) ++ ++/* ++ * Function to perform the address cycles. ++ */ ++static void mxc_do_addr_cycle(struct mtd_info *mtd, int column, int page_addr) ++{ ++ struct nand_chip *nand_chip = mtd->priv; ++ struct mxc_nand_host *host = nand_chip->priv; ++ ++ u32 page_mask = host->g_page_mask; ++ ++ if (column != -1) { ++ send_addr(host, column & 0xFF); ++ if (mtd->writesize == 2048) { ++ /* another col addr cycle for 2k page */ ++ send_addr(host, (column >> 8) & 0xF); ++ } else if (mtd->writesize == 4096) { ++ /* another col addr cycle for 4k page */ ++ send_addr(host, (column >> 8) & 0x1F); ++ } ++ } ++ if (page_addr != -1) { ++ do { ++ send_addr(host, (page_addr & 0xff)); ++ page_mask >>= 8; ++ page_addr >>= 8; ++ } while (page_mask != 0); ++ } ++} ++ ++/* ++ * Function to record the ECC corrected/uncorrected errors resulted ++ * after a page read. This NFC detects and corrects upto to 4 symbols ++ * of 9-bits each. ++ */ ++ ++static int mxc_check_ecc_status(struct mtd_info *mtd) ++{ ++ struct nand_chip *this = mtd->priv; ++ struct mxc_nand_host *host = this->priv; ++ u32 ecc_stat, err; ++ int no_subpages = 1; ++ int ret = 0, is_4bit_ecc = 0; ++ u8 ecc_bit_mask, err_limit; ++ ++ if (nfc_is_v21()) { ++ is_4bit_ecc = readw(host->regs + NFC_CONFIG1) & NFC_V2_ECC_MODE_4; ++ ecc_stat = readw(host->regs + NFC_ECC_STATUS_RESULT); ++ } else if (nfc_is_v2x()) { ++ is_4bit_ecc = 1; ++ ecc_stat = readw(host->regs + NFC_ECC_STATUS_RESULT); ++ } else ++ BUG(); ++ ++ ecc_bit_mask = is_4bit_ecc ? 0x7 : 0xf; ++ err_limit = is_4bit_ecc ? 0x4 : 0x8; ++ ++ no_subpages = mtd->writesize >> 9; ++ ++ do { ++ err = ecc_stat & ecc_bit_mask; ++ if (err > err_limit) { ++ mtd->ecc_stats.failed++; ++ printk(KERN_WARNING "uncorrectable RS-ECC Error\n"); ++ return -1; ++ } else { ++ ret += err; ++ } ++ ecc_stat >>= 4; ++ } while (--no_subpages); ++ ++ mtd->ecc_stats.corrected += ret; ++ pr_debug("%d Symbol Correctable RS-ECC Error\n", ret); ++ ++ return ret; ++} ++ ++/* ++ * This function reads byte from the NAND Flash ++ * ++ * @param mtd MTD structure for the NAND Flash ++ * ++ * @return data read from the NAND Flash ++ */ ++static u_char mxc_nand_read_byte16(struct mtd_info *mtd) ++{ ++ struct nand_chip *this = mtd->priv; ++ struct mxc_nand_host *host = this->priv; ++ ++ if (host->status_request) ++ return get_dev_status(host) & 0xff; ++ ++ return mxc_nand_read_word(mtd) & 0xff; ++} ++ ++/* Used by the upper layer to write command to NAND Flash for ++ * different operations to be carried out on NAND Flash */ ++static void mxc_nand_command(struct mtd_info *mtd, unsigned command, ++ int column, int page_addr) ++{ ++ struct nand_chip *nand_chip = mtd->priv; ++ struct mxc_nand_host *host = nand_chip->priv; ++ ++ DEBUG(MTD_DEBUG_LEVEL3, ++ "mxc_nand_command (cmd = 0x%x, col = 0x%x, page = 0x%x)\n", ++ command, column, page_addr); ++ ++ /* ++ * Reset command state information ++ */ ++ host->status_request = false; ++ ++ switch (command) { ++ ++ case NAND_CMD_STATUS: ++ host->buf_start = 0; ++ host->status_request = true; ++ ++ send_cmd(host, command, true); ++ mxc_do_addr_cycle(mtd, column, page_addr); ++ break; ++ ++ case NAND_CMD_READOOB: ++ command = NAND_CMD_READ0; ++ /* Fallthrough */ ++ ++ case NAND_CMD_READ0: ++ host->buf_start = column; ++ ++ send_cmd(host, command, false); ++ mxc_do_addr_cycle(mtd, column, page_addr); ++ ++ if (mtd->writesize > 512) ++ /* send read confirm command */ ++ send_cmd(host, NAND_CMD_READSTART, true); ++ ++ send_page(mtd, NFC_OUTPUT); ++ ++ memcpy(host->data_buf, host->main_area0, mtd->writesize); ++ copy_spare(mtd, true); ++ ++ break; ++ ++ case NAND_CMD_SEQIN: ++ ++ /* FIXME: before send SEQIN command for ++ * partial write,We need read one page out. ++ * FSL NFC does not support partial write ++ * It always sends out 512 + ecc + 512 + ecc ... ++ * for large page nand flash. But for small ++ * page nand flash, it did support SPARE ++ * ONLY operation. But to make driver ++ * simple. We take the same as large page,read ++ * whole page out and update. As for MLC nand ++ * NOP(num of operation) = 1. Partial written ++ * on one programed page is not allowed! We ++ * can't limit it on the driver, it need the ++ * upper layer applicaiton take care it ++ */ ++ ++ if (column) ++ mxc_nand_command(mtd, NAND_CMD_READ0, 0, page_addr); ++ ++ host->buf_start = column; ++ send_cmd(host, command, false); ++ mxc_do_addr_cycle(mtd, column, page_addr); ++ break; ++ ++ case NAND_CMD_PAGEPROG: ++ memcpy(host->main_area0, host->data_buf, mtd->writesize); ++ copy_spare(mtd, false); ++ ++ send_page(mtd, NFC_INPUT); ++ ++ send_cmd(host, command, true); ++ mxc_do_addr_cycle(mtd, column, page_addr); ++ break; ++ ++ case NAND_CMD_ERASE1: ++ case NAND_CMD_ERASE2: ++ send_cmd(host, command, false); ++ mxc_do_addr_cycle(mtd, column, page_addr); ++ break; ++ ++ case NAND_CMD_READID: ++ send_cmd(host, command, true); ++ mxc_do_addr_cycle(mtd, column, page_addr); ++ /* Set RBA bits for BUFFER0 */ ++ writew(0, host->regs + NFC_SET_RBA); ++ ++ /* Read ID into main buffer */ ++ writew(NFC_ID, host->regs + NFC_CONFIG2); ++ ++ wait_op_done(host, TROP_US_DELAY, true); ++ host->buf_start = column; ++ memcpy(host->data_buf, host->main_area0, 2048); ++ break; ++ ++ case NAND_CMD_RESET: ++ send_cmd(host, command, true); ++ mxc_do_addr_cycle(mtd, column, page_addr); ++ break; ++ } ++} ++ ++static int mxc_nand_read_oob(struct mtd_info *mtd, ++ struct nand_chip *chip, int page, int sndcmd) ++{ ++ struct nand_chip *this = mtd->priv; ++ struct mxc_nand_host *host = this->priv; ++ ++ if (sndcmd) { ++ chip->cmdfunc(mtd, NAND_CMD_READOOB, 0x00, page); ++ sndcmd = 0; ++ } ++ ++ memcpy(chip->oob_poi, host->data_buf + mtd->writesize, mtd->oobsize); ++ ++ return sndcmd; ++} ++ ++static int mxc_nand_read_page(struct mtd_info *mtd, struct nand_chip *chip, ++ uint8_t *buf) ++{ ++ struct nand_chip *this = mtd->priv; ++ struct mxc_nand_host *host = this->priv; ++ ++ mxc_check_ecc_status(mtd); ++ ++ memcpy(buf, host->data_buf, mtd->writesize); ++ memcpy(chip->oob_poi, host->data_buf + mtd->writesize, mtd->oobsize); ++ ++ return 0; ++} ++ ++static void mxc_nand_write_page(struct mtd_info *mtd, struct nand_chip *chip, ++ const uint8_t *buf) ++{ ++ struct nand_chip *this = mtd->priv; ++ struct mxc_nand_host *host = this->priv; ++ ++ memcpy(host->data_buf, buf, mtd->writesize); ++ memcpy(host->data_buf + mtd->writesize, chip->oob_poi, mtd->oobsize); ++} ++ ++/* Define some generic bad / good block scan pattern which are used ++ * while scanning a device for factory marked good / bad blocks. */ ++static uint8_t scan_ff_pattern[] = { 0xff, 0xff }; ++ ++static struct nand_bbt_descr smallpage_memorybased = { ++ .options = NAND_BBT_SCAN2NDPAGE, ++ .offs = 5, ++ .len = 1, ++ .pattern = scan_ff_pattern ++}; ++ ++static struct nand_bbt_descr largepage_memorybased = { ++ .options = 0, ++ .offs = 0, ++ .len = 2, ++ .pattern = scan_ff_pattern ++}; ++ ++/* Generic flash bbt decriptors ++*/ ++static uint8_t bbt_pattern[] = { 'B', 'b', 't', '0' }; ++static uint8_t mirror_pattern[] = { '1', 't', 'b', 'B' }; ++ ++static struct nand_bbt_descr bbt_main_descr = { ++ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE ++ | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP, ++ .offs = 0, ++ .len = 4, ++ .veroffs = 4, ++ .maxblocks = 4, ++ .pattern = bbt_pattern ++}; ++ ++static struct nand_bbt_descr bbt_mirror_descr = { ++ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE ++ | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP, ++ .offs = 0, ++ .len = 4, ++ .veroffs = 4, ++ .maxblocks = 4, ++ .pattern = mirror_pattern ++}; ++ ++static void mxc_set_nfms_v21(struct mtd_info *mtd, unsigned int val) ++{ ++ struct nand_chip *this = mtd->priv; ++ struct mxc_nand_host *host = this->priv; ++ unsigned int spas, tmp; ++ ++// NFMS |= val; /* FIXME */ ++ ++ if (val & (1 << NFMS_NF_PG_SZ)) { ++ if (mtd->writesize == 2048) ++ spas = NFC_SPAS_64; ++ else if (mtd->writesize == 4096) ++ spas = NFC_SPAS_128; ++ else ++ spas = NFC_SPAS_16; ++ ++ tmp = readw(host->regs + NFC_CONFIG1); ++ tmp |= NFC_V2_ECC_MODE_4; ++ writew(tmp, host->regs + NFC_CONFIG1); ++ ++ tmp = readw(host->regs + NFC_V21_SPAS); ++ tmp &= NFC_V21_SPAS_MASK; ++ tmp |= spas << NFC_V21_SPAS_SHIFT; ++ writew(tmp, host->regs + NFC_V21_SPAS); ++ } ++} ++ ++static void mxc_set_nfms(struct mtd_info *mtd, unsigned int val) ++{ ++ if (nfc_is_v21()) ++ mxc_set_nfms_v21(mtd, val); ++} ++ ++static int mxc_nand_scan_bbt(struct mtd_info *mtd) ++{ ++ struct nand_chip *this = mtd->priv; ++ struct mxc_nand_host *host = this->priv; ++ ++ host->g_page_mask = this->pagemask; ++ ++ if (mtd->writesize == 2048) { ++ mxc_set_nfms(mtd, 1 << NFMS_NF_PG_SZ); ++ this->ecc.layout = &nand_hw_eccoob_2k; ++ } else if (mtd->writesize == 4096) { ++ mxc_set_nfms(mtd, 1 << NFMS_NF_PG_SZ); ++ this->ecc.layout = &nand_hw_eccoob_4k; ++ } else { ++ this->ecc.layout = &nand_hw_eccoob_512; ++ } ++ ++ /* propagate ecc.layout to mtd_info */ ++ mtd->ecclayout = this->ecc.layout; ++ ++ /* use flash based bbt */ ++ this->bbt_td = &bbt_main_descr; ++ this->bbt_md = &bbt_mirror_descr; ++ ++ /* update flash based bbt */ ++ this->options |= NAND_USE_FLASH_BBT; ++ ++ if (!this->badblock_pattern) { ++ this->badblock_pattern = (mtd->writesize > 512) ? ++ &largepage_memorybased : &smallpage_memorybased; ++ } ++ ++ /* Build bad block table */ ++ return nand_scan_bbt(mtd, this->badblock_pattern); ++} ++ ++static void unlock_addr(struct mxc_nand_host *host, unsigned int start_addr, unsigned int end_addr) ++{ ++ if (nfc_is_v21()) { ++ writew(start_addr, host->regs + NFC_V21_UNLOCKSTART_BLKADDR); ++ writew(end_addr, host->regs + NFC_V21_UNLOCKEND_BLKADDR); ++ } else if (nfc_is_v2x()) { ++ writew(start_addr, host->regs + NFC_V1_UNLOCKSTART_BLKADDR); ++ writew(end_addr, host->regs + NFC_V1_UNLOCKEND_BLKADDR); ++ } else ++ BUG(); ++} ++ ++static int __init mxcnd_probe(struct platform_device *pdev) ++{ ++ struct nand_chip *this; ++ struct mtd_info *mtd; ++ struct mxc_nand_platform_data *pdata = pdev->dev.platform_data; ++ struct mxc_nand_host *host; ++ int nr_parts = 0, err = 0; ++ struct resource *res; ++ ++ /* Allocate memory for MTD device structure and private data */ ++ host = kzalloc(sizeof(*host) + NAND_MAX_PAGESIZE + NAND_MAX_OOBSIZE, GFP_KERNEL); ++ if (!host) ++ return -ENOMEM; ++ ++ host->data_buf = (uint8_t *)(host + 1); ++ ++ host->dev = &pdev->dev; ++ ++ this = &host->nand; ++ mtd = &host->mtd; ++ mtd->priv = this; ++ mtd->owner = THIS_MODULE; ++ mtd->name = "mxc_nand"; ++ ++ this->priv = host; ++ this->cmdfunc = mxc_nand_command; ++ this->select_chip = mxc_nand_select_chip; ++ this->read_byte = mxc_nand_read_byte; ++ this->read_word = mxc_nand_read_word; ++ this->write_buf = mxc_nand_write_buf; ++ this->read_buf = mxc_nand_read_buf; ++ this->verify_buf = mxc_nand_verify_buf; ++ this->scan_bbt = mxc_nand_scan_bbt; ++ ++ host->clk = clk_get(&pdev->dev, "nfc_clk"); ++ if (IS_ERR(host->clk)) { ++ err = PTR_ERR(host->clk); ++ goto eclk; ++ } ++ ++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ if (!res) { ++ err = -ENODEV; ++ goto eres; ++ } ++ ++ host->base = ioremap(res->start, resource_size(res)); ++ if (!host->base) { ++ err = -EIO; ++ goto eres; ++ } ++ ++ host->main_area0 = host->base; ++ host->main_area1 = host->base + 0x200; ++ ++ if (nfc_is_v21()) { ++ host->regs = host->base + 0x1000; ++ host->spare0 = host->base + 0x1000; ++ host->spare_size = 64 * 8; ++ host->spare_len = 64; ++ } else if (nfc_is_v2x()) { ++ host->regs = host->base; ++ host->spare0 = host->base + 0x800; ++ host->spare_size = 16 * 4; ++ host->spare_len = 16; ++ } else ++ BUG(); ++ ++ /* NAND bus width determines access funtions used by upper layer */ ++ if (pdata->width == 2) { ++ this->read_byte = mxc_nand_read_byte16; ++ this->options |= NAND_BUSWIDTH_16; ++ mxc_set_nfms(mtd, 1 << NFMS_NF_DWIDTH); ++ } ++ ++ init_waitqueue_head(&host->irq_waitq); ++ ++ host->irq = platform_get_irq(pdev, 0); ++ ++ err = request_irq(host->irq, mxc_nfc_irq, 0, "mxc_nd", host); ++ if (err) ++ goto eirq; ++ ++ if (pdata->hw_ecc) { ++ this->ecc.read_page = mxc_nand_read_page; ++ this->ecc.write_page = mxc_nand_write_page; ++ this->ecc.read_oob = mxc_nand_read_oob; ++ this->ecc.layout = &nand_hw_eccoob_512; ++ this->ecc.calculate = mxc_nand_calculate_ecc; ++ this->ecc.hwctl = mxc_nand_enable_hwecc; ++ this->ecc.correct = mxc_nand_correct_data; ++ this->ecc.mode = NAND_ECC_HW; ++ this->ecc.size = 512; ++ this->ecc.bytes = 9; ++ mxc_nand_hwecc(host, 1); ++ } else { ++ this->ecc.mode = NAND_ECC_SOFT; ++ mxc_nand_hwecc(host, 0); ++ } ++ ++ clk_enable(host->clk); ++ ++ /* Disable interrupt */ ++ writew(readw(host->regs + NFC_CONFIG1) | NFC_INT_MSK, host->regs + NFC_CONFIG1); ++ ++ /* disable spare enable */ ++ writew(readw(host->regs + NFC_CONFIG1) & ~NFC_V2_SP_EN, host->regs + NFC_CONFIG1); ++ ++ /* Unlock the internal RAM Buffer */ ++ writew(NFC_V2_BLS_UNLOCKED, host->regs + NFC_BLS); ++ ++ /* Blocks to be unlocked */ ++ unlock_addr(host, 0x0, 0xFFFF); ++ ++ /* Unlock Block Command for given address range */ ++ writew(NFC_WPC_UNLOCK, host->regs + NFC_WR_PROT); ++ ++ clk_disable(host->clk); ++ ++ /* Scan to find existence of the device */ ++ if (nand_scan(mtd, 1)) { ++ DEBUG(MTD_DEBUG_LEVEL0, ++ "MXC_ND2: Unable to find any NAND device.\n"); ++ err = -ENXIO; ++ goto escan; ++ } ++ ++ /* Register the partitions */ ++#ifdef CONFIG_MTD_PARTITIONS ++ nr_parts = ++ parse_mtd_partitions(mtd, part_probes, &host->parts, 0); ++ if (nr_parts > 0) ++ add_mtd_partitions(mtd, host->parts, nr_parts); ++ else ++#endif ++ { ++ pr_info("Registering %s as whole device\n", mtd->name); ++ add_mtd_device(mtd); ++ } ++ ++ platform_set_drvdata(pdev, mtd); ++ ++ return 0; ++ ++escan: ++ free_irq(host->irq, NULL); ++eirq: ++ iounmap(host->regs); ++eres: ++ clk_put(host->clk); ++eclk: ++ kfree(host); ++ ++ return err; ++ ++} ++ ++static int __exit mxcnd_remove(struct platform_device *pdev) ++{ ++ struct mtd_info *mtd = platform_get_drvdata(pdev); ++ struct nand_chip *this = mtd->priv; ++ struct mxc_nand_host *host = this->priv; ++ ++ clk_disable(host->clk); ++ clk_put(host->clk); ++ platform_set_drvdata(pdev, NULL); ++ ++ nand_release(mtd); ++ free_irq(host->irq, NULL); ++ kfree(host); ++ ++ return 0; ++} ++ ++#ifdef CONFIG_PM ++static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state) ++{ ++ struct mtd_info *mtd = platform_get_drvdata(pdev); ++ struct nand_chip *this = mtd->priv; ++ struct mxc_nand_host *host = this->priv; ++ int ret = 0; ++ ++ if (mtd) ++ ret = mtd->suspend(mtd); ++ ++ /* Disable the NFC clock */ ++ clk_disable(host->clk); ++ ++ return ret; ++} ++ ++static int mxcnd_resume(struct platform_device *pdev) ++{ ++ struct mtd_info *mtd = platform_get_drvdata(pdev); ++ struct nand_chip *this = mtd->priv; ++ struct mxc_nand_host *host = this->priv; ++ ++ /* Enable the NFC clock */ ++ clk_enable(host->clk); ++ ++ if (mtd) ++ mtd->resume(mtd); ++ ++ return 0; ++} ++ ++#else ++#define mxcnd_suspend NULL ++#define mxcnd_resume NULL ++#endif /* CONFIG_PM */ ++ ++static struct platform_driver mxcnd_driver = { ++ .driver = { ++ .name = "mxc_nand", ++ }, ++ .probe = mxcnd_probe, ++ .remove = __exit_p(mxcnd_remove), ++ .suspend = mxcnd_suspend, ++ .resume = mxcnd_resume, ++}; ++ ++static int __init mxc_nd_init(void) ++{ ++ /* Register the device driver structure. */ ++ pr_info("MXC MTD nand Driver\n"); ++ if (platform_driver_register(&mxcnd_driver) != 0) { ++ printk(KERN_ERR "Driver register failed for mxcnd_driver\n"); ++ return -ENODEV; ++ } ++ return 0; ++} ++ ++static void __exit mxc_nd_cleanup(void) ++{ ++ /* Unregister the device structure */ ++ platform_driver_unregister(&mxcnd_driver); ++} ++ ++module_init(mxc_nd_init); ++module_exit(mxc_nd_cleanup); ++ ++MODULE_AUTHOR("Freescale Semiconductor, Inc."); ++MODULE_DESCRIPTION("MXC NAND MTD driver"); ++MODULE_LICENSE("GPL"); diff --git a/recipes/linux/linux-2.6.31/pcm043/0001-spi-add-SPI-driver-for-most-known-i.MX-SoCs.patch b/recipes/linux/linux-2.6.31/pcm043/0001-spi-add-SPI-driver-for-most-known-i.MX-SoCs.patch new file mode 100644 index 0000000000..19981d68e0 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0001-spi-add-SPI-driver-for-most-known-i.MX-SoCs.patch @@ -0,0 +1,2337 @@ +From 9cb993fcb56f4033b6336c88e3f45bdd990403cd Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Tue, 22 Sep 2009 16:45:56 -0700 +Subject: [PATCH 01/28] spi: add SPI driver for most known i.MX SoCs + +This driver has been tested on i.MX1/i.MX27/i.MX35 with an AT25 type +EEPROM and on i.MX27/i.MX31 with a Freescale MC13783 PMIC. + +Signed-off-by: Sascha Hauer +Tested-by: Guennadi Liakhovetski +Acked-by: David Brownell +Cc: Andrea Paterniani +Cc: Russell King +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +--- + arch/arm/plat-mxc/include/mach/spi.h | 27 + + drivers/spi/Kconfig | 7 +- + drivers/spi/spi_imx.c | 2060 ++++++++-------------------------- + 3 files changed, 516 insertions(+), 1578 deletions(-) + create mode 100644 arch/arm/plat-mxc/include/mach/spi.h + +diff --git a/arch/arm/plat-mxc/include/mach/spi.h b/arch/arm/plat-mxc/include/mach/spi.h +new file mode 100644 +index 0000000..08be445 +--- /dev/null ++++ b/arch/arm/plat-mxc/include/mach/spi.h +@@ -0,0 +1,27 @@ ++ ++#ifndef __MACH_SPI_H_ ++#define __MACH_SPI_H_ ++ ++/* ++ * struct spi_imx_master - device.platform_data for SPI controller devices. ++ * @chipselect: Array of chipselects for this master. Numbers >= 0 mean gpio ++ * pins, numbers < 0 mean internal CSPI chipselects according ++ * to MXC_SPI_CS(). Normally you want to use gpio based chip ++ * selects as the CSPI module tries to be intelligent about ++ * when to assert the chipselect: The CSPI module deasserts the ++ * chipselect once it runs out of input data. The other problem ++ * is that it is not possible to mix between high active and low ++ * active chipselects on one single bus using the internal ++ * chipselects. Unfortunately Freescale decided to put some ++ * chipselects on dedicated pins which are not usable as gpios, ++ * so we have to support the internal chipselects. ++ * @num_chipselect: ARRAY_SIZE(chipselect) ++ */ ++struct spi_imx_master { ++ int *chipselect; ++ int num_chipselect; ++}; ++ ++#define MXC_SPI_CS(no) ((no) - 32) ++ ++#endif /* __MACH_SPI_H_*/ +diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig +index 2c733c2..885d6c4 100644 +--- a/drivers/spi/Kconfig ++++ b/drivers/spi/Kconfig +@@ -117,10 +117,11 @@ config SPI_GPIO + speed with a custom version of this driver; see the source code. + + config SPI_IMX +- tristate "Freescale iMX SPI controller" +- depends on ARCH_MX1 && EXPERIMENTAL ++ tristate "Freescale i.MX SPI controllers" ++ depends on ARCH_MXC ++ select SPI_BITBANG + help +- This enables using the Freescale iMX SPI controller in master ++ This enables using the Freescale i.MX SPI controllers in master + mode. + + config SPI_LM70_LLP +diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c +index c195e45..89c22ef 100644 +--- a/drivers/spi/spi_imx.c ++++ b/drivers/spi/spi_imx.c +@@ -1,1770 +1,680 @@ + /* +- * drivers/spi/spi_imx.c +- * +- * Copyright (C) 2006 SWAPP +- * Andrea Paterniani +- * +- * Initial version inspired by: +- * linux-2.6.17-rc3-mm1/drivers/spi/pxa2xx_spi.c +- * +- * 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. ++ * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved. ++ * Copyright (C) 2008 Juergen Beisert + * ++ * 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 ++ * 51 Franklin Street, Fifth Floor ++ * Boston, MA 02110-1301, USA. + */ + ++#include ++#include ++#include ++#include ++#include + #include +-#include +-#include +-#include +-#include + #include ++#include ++#include ++#include ++#include + #include +-#include + #include +-#include +-#include +-#include ++#include ++#include + +-#include +-#include +-#include +- +-#include +-#include +-#include +- +-/*-------------------------------------------------------------------------*/ +-/* SPI Registers offsets from peripheral base address */ +-#define SPI_RXDATA (0x00) +-#define SPI_TXDATA (0x04) +-#define SPI_CONTROL (0x08) +-#define SPI_INT_STATUS (0x0C) +-#define SPI_TEST (0x10) +-#define SPI_PERIOD (0x14) +-#define SPI_DMA (0x18) +-#define SPI_RESET (0x1C) +- +-/* SPI Control Register Bit Fields & Masks */ +-#define SPI_CONTROL_BITCOUNT_MASK (0xF) /* Bit Count Mask */ +-#define SPI_CONTROL_BITCOUNT(n) (((n) - 1) & SPI_CONTROL_BITCOUNT_MASK) +-#define SPI_CONTROL_POL (0x1 << 4) /* Clock Polarity Mask */ +-#define SPI_CONTROL_POL_ACT_HIGH (0x0 << 4) /* Active high pol. (0=idle) */ +-#define SPI_CONTROL_POL_ACT_LOW (0x1 << 4) /* Active low pol. (1=idle) */ +-#define SPI_CONTROL_PHA (0x1 << 5) /* Clock Phase Mask */ +-#define SPI_CONTROL_PHA_0 (0x0 << 5) /* Clock Phase 0 */ +-#define SPI_CONTROL_PHA_1 (0x1 << 5) /* Clock Phase 1 */ +-#define SPI_CONTROL_SSCTL (0x1 << 6) /* /SS Waveform Select Mask */ +-#define SPI_CONTROL_SSCTL_0 (0x0 << 6) /* Master: /SS stays low between SPI burst +- Slave: RXFIFO advanced by BIT_COUNT */ +-#define SPI_CONTROL_SSCTL_1 (0x1 << 6) /* Master: /SS insert pulse between SPI burst +- Slave: RXFIFO advanced by /SS rising edge */ +-#define SPI_CONTROL_SSPOL (0x1 << 7) /* /SS Polarity Select Mask */ +-#define SPI_CONTROL_SSPOL_ACT_LOW (0x0 << 7) /* /SS Active low */ +-#define SPI_CONTROL_SSPOL_ACT_HIGH (0x1 << 7) /* /SS Active high */ +-#define SPI_CONTROL_XCH (0x1 << 8) /* Exchange */ +-#define SPI_CONTROL_SPIEN (0x1 << 9) /* SPI Module Enable */ +-#define SPI_CONTROL_MODE (0x1 << 10) /* SPI Mode Select Mask */ +-#define SPI_CONTROL_MODE_SLAVE (0x0 << 10) /* SPI Mode Slave */ +-#define SPI_CONTROL_MODE_MASTER (0x1 << 10) /* SPI Mode Master */ +-#define SPI_CONTROL_DRCTL (0x3 << 11) /* /SPI_RDY Control Mask */ +-#define SPI_CONTROL_DRCTL_0 (0x0 << 11) /* Ignore /SPI_RDY */ +-#define SPI_CONTROL_DRCTL_1 (0x1 << 11) /* /SPI_RDY falling edge triggers input */ +-#define SPI_CONTROL_DRCTL_2 (0x2 << 11) /* /SPI_RDY active low level triggers input */ +-#define SPI_CONTROL_DATARATE (0x7 << 13) /* Data Rate Mask */ +-#define SPI_PERCLK2_DIV_MIN (0) /* PERCLK2:4 */ +-#define SPI_PERCLK2_DIV_MAX (7) /* PERCLK2:512 */ +-#define SPI_CONTROL_DATARATE_MIN (SPI_PERCLK2_DIV_MAX << 13) +-#define SPI_CONTROL_DATARATE_MAX (SPI_PERCLK2_DIV_MIN << 13) +-#define SPI_CONTROL_DATARATE_BAD (SPI_CONTROL_DATARATE_MIN + 1) +- +-/* SPI Interrupt/Status Register Bit Fields & Masks */ +-#define SPI_STATUS_TE (0x1 << 0) /* TXFIFO Empty Status */ +-#define SPI_STATUS_TH (0x1 << 1) /* TXFIFO Half Status */ +-#define SPI_STATUS_TF (0x1 << 2) /* TXFIFO Full Status */ +-#define SPI_STATUS_RR (0x1 << 3) /* RXFIFO Data Ready Status */ +-#define SPI_STATUS_RH (0x1 << 4) /* RXFIFO Half Status */ +-#define SPI_STATUS_RF (0x1 << 5) /* RXFIFO Full Status */ +-#define SPI_STATUS_RO (0x1 << 6) /* RXFIFO Overflow */ +-#define SPI_STATUS_BO (0x1 << 7) /* Bit Count Overflow */ +-#define SPI_STATUS (0xFF) /* SPI Status Mask */ +-#define SPI_INTEN_TE (0x1 << 8) /* TXFIFO Empty Interrupt Enable */ +-#define SPI_INTEN_TH (0x1 << 9) /* TXFIFO Half Interrupt Enable */ +-#define SPI_INTEN_TF (0x1 << 10) /* TXFIFO Full Interrupt Enable */ +-#define SPI_INTEN_RE (0x1 << 11) /* RXFIFO Data Ready Interrupt Enable */ +-#define SPI_INTEN_RH (0x1 << 12) /* RXFIFO Half Interrupt Enable */ +-#define SPI_INTEN_RF (0x1 << 13) /* RXFIFO Full Interrupt Enable */ +-#define SPI_INTEN_RO (0x1 << 14) /* RXFIFO Overflow Interrupt Enable */ +-#define SPI_INTEN_BO (0x1 << 15) /* Bit Count Overflow Interrupt Enable */ +-#define SPI_INTEN (0xFF << 8) /* SPI Interrupt Enable Mask */ +- +-/* SPI Test Register Bit Fields & Masks */ +-#define SPI_TEST_TXCNT (0xF << 0) /* TXFIFO Counter */ +-#define SPI_TEST_RXCNT_LSB (4) /* RXFIFO Counter LSB */ +-#define SPI_TEST_RXCNT (0xF << 4) /* RXFIFO Counter */ +-#define SPI_TEST_SSTATUS (0xF << 8) /* State Machine Status */ +-#define SPI_TEST_LBC (0x1 << 14) /* Loop Back Control */ +- +-/* SPI Period Register Bit Fields & Masks */ +-#define SPI_PERIOD_WAIT (0x7FFF << 0) /* Wait Between Transactions */ +-#define SPI_PERIOD_MAX_WAIT (0x7FFF) /* Max Wait Between +- Transactions */ +-#define SPI_PERIOD_CSRC (0x1 << 15) /* Period Clock Source Mask */ +-#define SPI_PERIOD_CSRC_BCLK (0x0 << 15) /* Period Clock Source is +- Bit Clock */ +-#define SPI_PERIOD_CSRC_32768 (0x1 << 15) /* Period Clock Source is +- 32.768 KHz Clock */ +- +-/* SPI DMA Register Bit Fields & Masks */ +-#define SPI_DMA_RHDMA (0x1 << 4) /* RXFIFO Half Status */ +-#define SPI_DMA_RFDMA (0x1 << 5) /* RXFIFO Full Status */ +-#define SPI_DMA_TEDMA (0x1 << 6) /* TXFIFO Empty Status */ +-#define SPI_DMA_THDMA (0x1 << 7) /* TXFIFO Half Status */ +-#define SPI_DMA_RHDEN (0x1 << 12) /* RXFIFO Half DMA Request Enable */ +-#define SPI_DMA_RFDEN (0x1 << 13) /* RXFIFO Full DMA Request Enable */ +-#define SPI_DMA_TEDEN (0x1 << 14) /* TXFIFO Empty DMA Request Enable */ +-#define SPI_DMA_THDEN (0x1 << 15) /* TXFIFO Half DMA Request Enable */ +- +-/* SPI Soft Reset Register Bit Fields & Masks */ +-#define SPI_RESET_START (0x1) /* Start */ +- +-/* Default SPI configuration values */ +-#define SPI_DEFAULT_CONTROL \ +-( \ +- SPI_CONTROL_BITCOUNT(16) | \ +- SPI_CONTROL_POL_ACT_HIGH | \ +- SPI_CONTROL_PHA_0 | \ +- SPI_CONTROL_SPIEN | \ +- SPI_CONTROL_SSCTL_1 | \ +- SPI_CONTROL_MODE_MASTER | \ +- SPI_CONTROL_DRCTL_0 | \ +- SPI_CONTROL_DATARATE_MIN \ +-) +-#define SPI_DEFAULT_ENABLE_LOOPBACK (0) +-#define SPI_DEFAULT_ENABLE_DMA (0) +-#define SPI_DEFAULT_PERIOD_WAIT (8) +-/*-------------------------------------------------------------------------*/ +- +- +-/*-------------------------------------------------------------------------*/ +-/* TX/RX SPI FIFO size */ +-#define SPI_FIFO_DEPTH (8) +-#define SPI_FIFO_BYTE_WIDTH (2) +-#define SPI_FIFO_OVERFLOW_MARGIN (2) +- +-/* DMA burst length for half full/empty request trigger */ +-#define SPI_DMA_BLR (SPI_FIFO_DEPTH * SPI_FIFO_BYTE_WIDTH / 2) +- +-/* Dummy char output to achieve reads. +- Choosing something different from all zeroes may help pattern recogition +- for oscilloscope analysis, but may break some drivers. */ +-#define SPI_DUMMY_u8 0 +-#define SPI_DUMMY_u16 ((SPI_DUMMY_u8 << 8) | SPI_DUMMY_u8) +-#define SPI_DUMMY_u32 ((SPI_DUMMY_u16 << 16) | SPI_DUMMY_u16) +- +-/** +- * Macro to change a u32 field: +- * @r : register to edit +- * @m : bit mask +- * @v : new value for the field correctly bit-alligned +-*/ +-#define u32_EDIT(r, m, v) r = (r & ~(m)) | (v) +- +-/* Message state */ +-#define START_STATE ((void*)0) +-#define RUNNING_STATE ((void*)1) +-#define DONE_STATE ((void*)2) +-#define ERROR_STATE ((void*)-1) +- +-/* Queue state */ +-#define QUEUE_RUNNING (0) +-#define QUEUE_STOPPED (1) +- +-#define IS_DMA_ALIGNED(x) (((u32)(x) & 0x03) == 0) +-#define DMA_ALIGNMENT 4 +-/*-------------------------------------------------------------------------*/ +- +- +-/*-------------------------------------------------------------------------*/ +-/* Driver data structs */ +- +-/* Context */ +-struct driver_data { +- /* Driver model hookup */ +- struct platform_device *pdev; +- +- /* SPI framework hookup */ +- struct spi_master *master; ++#include + +- /* IMX hookup */ +- struct spi_imx_master *master_info; +- +- /* Memory resources and SPI regs virtual address */ +- struct resource *ioarea; +- void __iomem *regs; +- +- /* SPI RX_DATA physical address */ +- dma_addr_t rd_data_phys; +- +- /* Driver message queue */ +- struct workqueue_struct *workqueue; +- struct work_struct work; +- spinlock_t lock; +- struct list_head queue; +- int busy; +- int run; +- +- /* Message Transfer pump */ +- struct tasklet_struct pump_transfers; +- +- /* Current message, transfer and state */ +- struct spi_message *cur_msg; +- struct spi_transfer *cur_transfer; +- struct chip_data *cur_chip; +- +- /* Rd / Wr buffers pointers */ +- size_t len; +- void *tx; +- void *tx_end; +- void *rx; +- void *rx_end; +- +- u8 rd_only; +- u8 n_bytes; +- int cs_change; +- +- /* Function pointers */ +- irqreturn_t (*transfer_handler)(struct driver_data *drv_data); +- void (*cs_control)(u32 command); +- +- /* DMA setup */ +- int rx_channel; +- int tx_channel; +- dma_addr_t rx_dma; +- dma_addr_t tx_dma; +- int rx_dma_needs_unmap; +- int tx_dma_needs_unmap; +- size_t tx_map_len; +- u32 dummy_dma_buf ____cacheline_aligned; ++#define DRIVER_NAME "spi_imx" + +- struct clk *clk; +-}; ++#define MXC_CSPIRXDATA 0x00 ++#define MXC_CSPITXDATA 0x04 ++#define MXC_CSPICTRL 0x08 ++#define MXC_CSPIINT 0x0c ++#define MXC_RESET 0x1c + +-/* Runtime state */ +-struct chip_data { +- u32 control; +- u32 period; +- u32 test; ++/* generic defines to abstract from the different register layouts */ ++#define MXC_INT_RR (1 << 0) /* Receive data ready interrupt */ ++#define MXC_INT_TE (1 << 1) /* Transmit FIFO empty interrupt */ + +- u8 enable_dma:1; +- u8 bits_per_word; +- u8 n_bytes; +- u32 max_speed_hz; +- +- void (*cs_control)(u32 command); ++struct spi_imx_config { ++ unsigned int speed_hz; ++ unsigned int bpw; ++ unsigned int mode; ++ int cs; + }; +-/*-------------------------------------------------------------------------*/ +- + +-static void pump_messages(struct work_struct *work); ++struct spi_imx_data { ++ struct spi_bitbang bitbang; + +-static void flush(struct driver_data *drv_data) +-{ +- void __iomem *regs = drv_data->regs; +- u32 control; ++ struct completion xfer_done; ++ void *base; ++ int irq; ++ struct clk *clk; ++ unsigned long spi_clk; ++ int *chipselect; ++ ++ unsigned int count; ++ void (*tx)(struct spi_imx_data *); ++ void (*rx)(struct spi_imx_data *); ++ void *rx_buf; ++ const void *tx_buf; ++ unsigned int txfifo; /* number of words pushed in tx FIFO */ ++ ++ /* SoC specific functions */ ++ void (*intctrl)(struct spi_imx_data *, int); ++ int (*config)(struct spi_imx_data *, struct spi_imx_config *); ++ void (*trigger)(struct spi_imx_data *); ++ int (*rx_available)(struct spi_imx_data *); ++}; + +- dev_dbg(&drv_data->pdev->dev, "flush\n"); ++#define MXC_SPI_BUF_RX(type) \ ++static void spi_imx_buf_rx_##type(struct spi_imx_data *spi_imx) \ ++{ \ ++ unsigned int val = readl(spi_imx->base + MXC_CSPIRXDATA); \ ++ \ ++ if (spi_imx->rx_buf) { \ ++ *(type *)spi_imx->rx_buf = val; \ ++ spi_imx->rx_buf += sizeof(type); \ ++ } \ ++} ++ ++#define MXC_SPI_BUF_TX(type) \ ++static void spi_imx_buf_tx_##type(struct spi_imx_data *spi_imx) \ ++{ \ ++ type val = 0; \ ++ \ ++ if (spi_imx->tx_buf) { \ ++ val = *(type *)spi_imx->tx_buf; \ ++ spi_imx->tx_buf += sizeof(type); \ ++ } \ ++ \ ++ spi_imx->count -= sizeof(type); \ ++ \ ++ writel(val, spi_imx->base + MXC_CSPITXDATA); \ ++} ++ ++MXC_SPI_BUF_RX(u8) ++MXC_SPI_BUF_TX(u8) ++MXC_SPI_BUF_RX(u16) ++MXC_SPI_BUF_TX(u16) ++MXC_SPI_BUF_RX(u32) ++MXC_SPI_BUF_TX(u32) ++ ++/* First entry is reserved, second entry is valid only if SDHC_SPIEN is set ++ * (which is currently not the case in this driver) ++ */ ++static int mxc_clkdivs[] = {0, 3, 4, 6, 8, 12, 16, 24, 32, 48, 64, 96, 128, 192, ++ 256, 384, 512, 768, 1024}; + +- /* Wait for end of transaction */ +- do { +- control = readl(regs + SPI_CONTROL); +- } while (control & SPI_CONTROL_XCH); ++/* MX21, MX27 */ ++static unsigned int spi_imx_clkdiv_1(unsigned int fin, ++ unsigned int fspi) ++{ ++ int i, max; + +- /* Release chip select if requested, transfer delays are +- handled in pump_transfers */ +- if (drv_data->cs_change) +- drv_data->cs_control(SPI_CS_DEASSERT); ++ if (cpu_is_mx21()) ++ max = 18; ++ else ++ max = 16; + +- /* Disable SPI to flush FIFOs */ +- writel(control & ~SPI_CONTROL_SPIEN, regs + SPI_CONTROL); +- writel(control, regs + SPI_CONTROL); +-} ++ for (i = 2; i < max; i++) ++ if (fspi * mxc_clkdivs[i] >= fin) ++ return i; + +-static void restore_state(struct driver_data *drv_data) +-{ +- void __iomem *regs = drv_data->regs; +- struct chip_data *chip = drv_data->cur_chip; +- +- /* Load chip registers */ +- dev_dbg(&drv_data->pdev->dev, +- "restore_state\n" +- " test = 0x%08X\n" +- " control = 0x%08X\n", +- chip->test, +- chip->control); +- writel(chip->test, regs + SPI_TEST); +- writel(chip->period, regs + SPI_PERIOD); +- writel(0, regs + SPI_INT_STATUS); +- writel(chip->control, regs + SPI_CONTROL); ++ return max; + } + +-static void null_cs_control(u32 command) ++/* MX1, MX31, MX35 */ ++static unsigned int spi_imx_clkdiv_2(unsigned int fin, ++ unsigned int fspi) + { +-} ++ int i, div = 4; + +-static inline u32 data_to_write(struct driver_data *drv_data) +-{ +- return ((u32)(drv_data->tx_end - drv_data->tx)) / drv_data->n_bytes; +-} ++ for (i = 0; i < 7; i++) { ++ if (fspi * div >= fin) ++ return i; ++ div <<= 1; ++ } + +-static inline u32 data_to_read(struct driver_data *drv_data) +-{ +- return ((u32)(drv_data->rx_end - drv_data->rx)) / drv_data->n_bytes; ++ return 7; + } + +-static int write(struct driver_data *drv_data) +-{ +- void __iomem *regs = drv_data->regs; +- void *tx = drv_data->tx; +- void *tx_end = drv_data->tx_end; +- u8 n_bytes = drv_data->n_bytes; +- u32 remaining_writes; +- u32 fifo_avail_space; +- u32 n; +- u16 d; +- +- /* Compute how many fifo writes to do */ +- remaining_writes = (u32)(tx_end - tx) / n_bytes; +- fifo_avail_space = SPI_FIFO_DEPTH - +- (readl(regs + SPI_TEST) & SPI_TEST_TXCNT); +- if (drv_data->rx && (fifo_avail_space > SPI_FIFO_OVERFLOW_MARGIN)) +- /* Fix misunderstood receive overflow */ +- fifo_avail_space -= SPI_FIFO_OVERFLOW_MARGIN; +- n = min(remaining_writes, fifo_avail_space); +- +- dev_dbg(&drv_data->pdev->dev, +- "write type %s\n" +- " remaining writes = %d\n" +- " fifo avail space = %d\n" +- " fifo writes = %d\n", +- (n_bytes == 1) ? "u8" : "u16", +- remaining_writes, +- fifo_avail_space, +- n); +- +- if (n > 0) { +- /* Fill SPI TXFIFO */ +- if (drv_data->rd_only) { +- tx += n * n_bytes; +- while (n--) +- writel(SPI_DUMMY_u16, regs + SPI_TXDATA); +- } else { +- if (n_bytes == 1) { +- while (n--) { +- d = *(u8*)tx; +- writel(d, regs + SPI_TXDATA); +- tx += 1; +- } +- } else { +- while (n--) { +- d = *(u16*)tx; +- writel(d, regs + SPI_TXDATA); +- tx += 2; +- } +- } +- } +- +- /* Trigger transfer */ +- writel(readl(regs + SPI_CONTROL) | SPI_CONTROL_XCH, +- regs + SPI_CONTROL); ++#define MX31_INTREG_TEEN (1 << 0) ++#define MX31_INTREG_RREN (1 << 3) + +- /* Update tx pointer */ +- drv_data->tx = tx; +- } ++#define MX31_CSPICTRL_ENABLE (1 << 0) ++#define MX31_CSPICTRL_MASTER (1 << 1) ++#define MX31_CSPICTRL_XCH (1 << 2) ++#define MX31_CSPICTRL_POL (1 << 4) ++#define MX31_CSPICTRL_PHA (1 << 5) ++#define MX31_CSPICTRL_SSCTL (1 << 6) ++#define MX31_CSPICTRL_SSPOL (1 << 7) ++#define MX31_CSPICTRL_BC_SHIFT 8 ++#define MX35_CSPICTRL_BL_SHIFT 20 ++#define MX31_CSPICTRL_CS_SHIFT 24 ++#define MX35_CSPICTRL_CS_SHIFT 12 ++#define MX31_CSPICTRL_DR_SHIFT 16 + +- return (tx >= tx_end); +-} ++#define MX31_CSPISTATUS 0x14 ++#define MX31_STATUS_RR (1 << 3) + +-static int read(struct driver_data *drv_data) ++/* These functions also work for the i.MX35, but be aware that ++ * the i.MX35 has a slightly different register layout for bits ++ * we do not use here. ++ */ ++static void mx31_intctrl(struct spi_imx_data *spi_imx, int enable) + { +- void __iomem *regs = drv_data->regs; +- void *rx = drv_data->rx; +- void *rx_end = drv_data->rx_end; +- u8 n_bytes = drv_data->n_bytes; +- u32 remaining_reads; +- u32 fifo_rxcnt; +- u32 n; +- u16 d; +- +- /* Compute how many fifo reads to do */ +- remaining_reads = (u32)(rx_end - rx) / n_bytes; +- fifo_rxcnt = (readl(regs + SPI_TEST) & SPI_TEST_RXCNT) >> +- SPI_TEST_RXCNT_LSB; +- n = min(remaining_reads, fifo_rxcnt); +- +- dev_dbg(&drv_data->pdev->dev, +- "read type %s\n" +- " remaining reads = %d\n" +- " fifo rx count = %d\n" +- " fifo reads = %d\n", +- (n_bytes == 1) ? "u8" : "u16", +- remaining_reads, +- fifo_rxcnt, +- n); +- +- if (n > 0) { +- /* Read SPI RXFIFO */ +- if (n_bytes == 1) { +- while (n--) { +- d = readl(regs + SPI_RXDATA); +- *((u8*)rx) = d; +- rx += 1; +- } +- } else { +- while (n--) { +- d = readl(regs + SPI_RXDATA); +- *((u16*)rx) = d; +- rx += 2; +- } +- } ++ unsigned int val = 0; + +- /* Update rx pointer */ +- drv_data->rx = rx; +- } ++ if (enable & MXC_INT_TE) ++ val |= MX31_INTREG_TEEN; ++ if (enable & MXC_INT_RR) ++ val |= MX31_INTREG_RREN; + +- return (rx >= rx_end); ++ writel(val, spi_imx->base + MXC_CSPIINT); + } + +-static void *next_transfer(struct driver_data *drv_data) ++static void mx31_trigger(struct spi_imx_data *spi_imx) + { +- struct spi_message *msg = drv_data->cur_msg; +- struct spi_transfer *trans = drv_data->cur_transfer; +- +- /* Move to next transfer */ +- if (trans->transfer_list.next != &msg->transfers) { +- drv_data->cur_transfer = +- list_entry(trans->transfer_list.next, +- struct spi_transfer, +- transfer_list); +- return RUNNING_STATE; +- } ++ unsigned int reg; + +- return DONE_STATE; ++ reg = readl(spi_imx->base + MXC_CSPICTRL); ++ reg |= MX31_CSPICTRL_XCH; ++ writel(reg, spi_imx->base + MXC_CSPICTRL); + } + +-static int map_dma_buffers(struct driver_data *drv_data) ++static int mx31_config(struct spi_imx_data *spi_imx, ++ struct spi_imx_config *config) + { +- struct spi_message *msg; +- struct device *dev; +- void *buf; +- +- drv_data->rx_dma_needs_unmap = 0; +- drv_data->tx_dma_needs_unmap = 0; +- +- if (!drv_data->master_info->enable_dma || +- !drv_data->cur_chip->enable_dma) +- return -1; +- +- msg = drv_data->cur_msg; +- dev = &msg->spi->dev; +- if (msg->is_dma_mapped) { +- if (drv_data->tx_dma) +- /* The caller provided at least dma and cpu virtual +- address for write; pump_transfers() will consider the +- transfer as write only if cpu rx virtual address is +- NULL */ +- return 0; +- +- if (drv_data->rx_dma) { +- /* The caller provided dma and cpu virtual address to +- performe read only transfer --> +- use drv_data->dummy_dma_buf for dummy writes to +- achive reads */ +- buf = &drv_data->dummy_dma_buf; +- drv_data->tx_map_len = sizeof(drv_data->dummy_dma_buf); +- drv_data->tx_dma = dma_map_single(dev, +- buf, +- drv_data->tx_map_len, +- DMA_TO_DEVICE); +- if (dma_mapping_error(dev, drv_data->tx_dma)) +- return -1; +- +- drv_data->tx_dma_needs_unmap = 1; +- +- /* Flags transfer as rd_only for pump_transfers() DMA +- regs programming (should be redundant) */ +- drv_data->tx = NULL; +- +- return 0; +- } +- } ++ unsigned int reg = MX31_CSPICTRL_ENABLE | MX31_CSPICTRL_MASTER; + +- if (!IS_DMA_ALIGNED(drv_data->rx) || !IS_DMA_ALIGNED(drv_data->tx)) +- return -1; +- +- if (drv_data->tx == NULL) { +- /* Read only message --> use drv_data->dummy_dma_buf for dummy +- writes to achive reads */ +- buf = &drv_data->dummy_dma_buf; +- drv_data->tx_map_len = sizeof(drv_data->dummy_dma_buf); +- } else { +- buf = drv_data->tx; +- drv_data->tx_map_len = drv_data->len; ++ reg |= spi_imx_clkdiv_2(spi_imx->spi_clk, config->speed_hz) << ++ MX31_CSPICTRL_DR_SHIFT; ++ ++ if (cpu_is_mx31()) ++ reg |= (config->bpw - 1) << MX31_CSPICTRL_BC_SHIFT; ++ else if (cpu_is_mx35()) { ++ reg |= (config->bpw - 1) << MX35_CSPICTRL_BL_SHIFT; ++ reg |= MX31_CSPICTRL_SSCTL; + } +- drv_data->tx_dma = dma_map_single(dev, +- buf, +- drv_data->tx_map_len, +- DMA_TO_DEVICE); +- if (dma_mapping_error(dev, drv_data->tx_dma)) +- return -1; +- drv_data->tx_dma_needs_unmap = 1; +- +- /* NULL rx means write-only transfer and no map needed +- * since rx DMA will not be used */ +- if (drv_data->rx) { +- buf = drv_data->rx; +- drv_data->rx_dma = dma_map_single(dev, +- buf, +- drv_data->len, +- DMA_FROM_DEVICE); +- if (dma_mapping_error(dev, drv_data->rx_dma)) { +- if (drv_data->tx_dma) { +- dma_unmap_single(dev, +- drv_data->tx_dma, +- drv_data->tx_map_len, +- DMA_TO_DEVICE); +- drv_data->tx_dma_needs_unmap = 0; +- } +- return -1; +- } +- drv_data->rx_dma_needs_unmap = 1; ++ ++ if (config->mode & SPI_CPHA) ++ reg |= MX31_CSPICTRL_PHA; ++ if (config->mode & SPI_CPOL) ++ reg |= MX31_CSPICTRL_POL; ++ if (config->mode & SPI_CS_HIGH) ++ reg |= MX31_CSPICTRL_SSPOL; ++ if (config->cs < 0) { ++ if (cpu_is_mx31()) ++ reg |= (config->cs + 32) << MX31_CSPICTRL_CS_SHIFT; ++ else if (cpu_is_mx35()) ++ reg |= (config->cs + 32) << MX35_CSPICTRL_CS_SHIFT; + } + ++ writel(reg, spi_imx->base + MXC_CSPICTRL); ++ + return 0; + } + +-static void unmap_dma_buffers(struct driver_data *drv_data) ++static int mx31_rx_available(struct spi_imx_data *spi_imx) + { +- struct spi_message *msg = drv_data->cur_msg; +- struct device *dev = &msg->spi->dev; +- +- if (drv_data->rx_dma_needs_unmap) { +- dma_unmap_single(dev, +- drv_data->rx_dma, +- drv_data->len, +- DMA_FROM_DEVICE); +- drv_data->rx_dma_needs_unmap = 0; +- } +- if (drv_data->tx_dma_needs_unmap) { +- dma_unmap_single(dev, +- drv_data->tx_dma, +- drv_data->tx_map_len, +- DMA_TO_DEVICE); +- drv_data->tx_dma_needs_unmap = 0; +- } ++ return readl(spi_imx->base + MX31_CSPISTATUS) & MX31_STATUS_RR; + } + +-/* Caller already set message->status (dma is already blocked) */ +-static void giveback(struct spi_message *message, struct driver_data *drv_data) +-{ +- void __iomem *regs = drv_data->regs; +- +- /* Bring SPI to sleep; restore_state() and pump_transfer() +- will do new setup */ +- writel(0, regs + SPI_INT_STATUS); +- writel(0, regs + SPI_DMA); +- +- /* Unconditioned deselct */ +- drv_data->cs_control(SPI_CS_DEASSERT); ++#define MX27_INTREG_RR (1 << 4) ++#define MX27_INTREG_TEEN (1 << 9) ++#define MX27_INTREG_RREN (1 << 13) + +- message->state = NULL; +- if (message->complete) +- message->complete(message->context); ++#define MX27_CSPICTRL_POL (1 << 5) ++#define MX27_CSPICTRL_PHA (1 << 6) ++#define MX27_CSPICTRL_SSPOL (1 << 8) ++#define MX27_CSPICTRL_XCH (1 << 9) ++#define MX27_CSPICTRL_ENABLE (1 << 10) ++#define MX27_CSPICTRL_MASTER (1 << 11) ++#define MX27_CSPICTRL_DR_SHIFT 14 ++#define MX27_CSPICTRL_CS_SHIFT 19 + +- drv_data->cur_msg = NULL; +- drv_data->cur_transfer = NULL; +- drv_data->cur_chip = NULL; +- queue_work(drv_data->workqueue, &drv_data->work); +-} +- +-static void dma_err_handler(int channel, void *data, int errcode) ++static void mx27_intctrl(struct spi_imx_data *spi_imx, int enable) + { +- struct driver_data *drv_data = data; +- struct spi_message *msg = drv_data->cur_msg; +- +- dev_dbg(&drv_data->pdev->dev, "dma_err_handler\n"); +- +- /* Disable both rx and tx dma channels */ +- imx_dma_disable(drv_data->rx_channel); +- imx_dma_disable(drv_data->tx_channel); +- unmap_dma_buffers(drv_data); ++ unsigned int val = 0; + +- flush(drv_data); ++ if (enable & MXC_INT_TE) ++ val |= MX27_INTREG_TEEN; ++ if (enable & MXC_INT_RR) ++ val |= MX27_INTREG_RREN; + +- msg->state = ERROR_STATE; +- tasklet_schedule(&drv_data->pump_transfers); ++ writel(val, spi_imx->base + MXC_CSPIINT); + } + +-static void dma_tx_handler(int channel, void *data) ++static void mx27_trigger(struct spi_imx_data *spi_imx) + { +- struct driver_data *drv_data = data; ++ unsigned int reg; + +- dev_dbg(&drv_data->pdev->dev, "dma_tx_handler\n"); +- +- imx_dma_disable(channel); +- +- /* Now waits for TX FIFO empty */ +- writel(SPI_INTEN_TE, drv_data->regs + SPI_INT_STATUS); ++ reg = readl(spi_imx->base + MXC_CSPICTRL); ++ reg |= MX27_CSPICTRL_XCH; ++ writel(reg, spi_imx->base + MXC_CSPICTRL); + } + +-static irqreturn_t dma_transfer(struct driver_data *drv_data) ++static int mx27_config(struct spi_imx_data *spi_imx, ++ struct spi_imx_config *config) + { +- u32 status; +- struct spi_message *msg = drv_data->cur_msg; +- void __iomem *regs = drv_data->regs; +- +- status = readl(regs + SPI_INT_STATUS); ++ unsigned int reg = MX27_CSPICTRL_ENABLE | MX27_CSPICTRL_MASTER; + +- if ((status & (SPI_INTEN_RO | SPI_STATUS_RO)) +- == (SPI_INTEN_RO | SPI_STATUS_RO)) { +- writel(status & ~SPI_INTEN, regs + SPI_INT_STATUS); ++ reg |= spi_imx_clkdiv_1(spi_imx->spi_clk, config->speed_hz) << ++ MX27_CSPICTRL_DR_SHIFT; ++ reg |= config->bpw - 1; + +- imx_dma_disable(drv_data->tx_channel); +- imx_dma_disable(drv_data->rx_channel); +- unmap_dma_buffers(drv_data); ++ if (config->mode & SPI_CPHA) ++ reg |= MX27_CSPICTRL_PHA; ++ if (config->mode & SPI_CPOL) ++ reg |= MX27_CSPICTRL_POL; ++ if (config->mode & SPI_CS_HIGH) ++ reg |= MX27_CSPICTRL_SSPOL; ++ if (config->cs < 0) ++ reg |= (config->cs + 32) << MX27_CSPICTRL_CS_SHIFT; + +- flush(drv_data); ++ writel(reg, spi_imx->base + MXC_CSPICTRL); + +- dev_warn(&drv_data->pdev->dev, +- "dma_transfer - fifo overun\n"); +- +- msg->state = ERROR_STATE; +- tasklet_schedule(&drv_data->pump_transfers); +- +- return IRQ_HANDLED; +- } +- +- if (status & SPI_STATUS_TE) { +- writel(status & ~SPI_INTEN_TE, regs + SPI_INT_STATUS); +- +- if (drv_data->rx) { +- /* Wait end of transfer before read trailing data */ +- while (readl(regs + SPI_CONTROL) & SPI_CONTROL_XCH) +- cpu_relax(); +- +- imx_dma_disable(drv_data->rx_channel); +- unmap_dma_buffers(drv_data); +- +- /* Release chip select if requested, transfer delays are +- handled in pump_transfers() */ +- if (drv_data->cs_change) +- drv_data->cs_control(SPI_CS_DEASSERT); +- +- /* Calculate number of trailing data and read them */ +- dev_dbg(&drv_data->pdev->dev, +- "dma_transfer - test = 0x%08X\n", +- readl(regs + SPI_TEST)); +- drv_data->rx = drv_data->rx_end - +- ((readl(regs + SPI_TEST) & +- SPI_TEST_RXCNT) >> +- SPI_TEST_RXCNT_LSB)*drv_data->n_bytes; +- read(drv_data); +- } else { +- /* Write only transfer */ +- unmap_dma_buffers(drv_data); +- +- flush(drv_data); +- } +- +- /* End of transfer, update total byte transfered */ +- msg->actual_length += drv_data->len; +- +- /* Move to next transfer */ +- msg->state = next_transfer(drv_data); +- +- /* Schedule transfer tasklet */ +- tasklet_schedule(&drv_data->pump_transfers); +- +- return IRQ_HANDLED; +- } +- +- /* Opps problem detected */ +- return IRQ_NONE; ++ return 0; + } + +-static irqreturn_t interrupt_wronly_transfer(struct driver_data *drv_data) ++static int mx27_rx_available(struct spi_imx_data *spi_imx) + { +- struct spi_message *msg = drv_data->cur_msg; +- void __iomem *regs = drv_data->regs; +- u32 status; +- irqreturn_t handled = IRQ_NONE; +- +- status = readl(regs + SPI_INT_STATUS); +- +- if (status & SPI_INTEN_TE) { +- /* TXFIFO Empty Interrupt on the last transfered word */ +- writel(status & ~SPI_INTEN, regs + SPI_INT_STATUS); +- dev_dbg(&drv_data->pdev->dev, +- "interrupt_wronly_transfer - end of tx\n"); +- +- flush(drv_data); ++ return readl(spi_imx->base + MXC_CSPIINT) & MX27_INTREG_RR; ++} + +- /* Update total byte transfered */ +- msg->actual_length += drv_data->len; ++#define MX1_INTREG_RR (1 << 3) ++#define MX1_INTREG_TEEN (1 << 8) ++#define MX1_INTREG_RREN (1 << 11) + +- /* Move to next transfer */ +- msg->state = next_transfer(drv_data); ++#define MX1_CSPICTRL_POL (1 << 4) ++#define MX1_CSPICTRL_PHA (1 << 5) ++#define MX1_CSPICTRL_XCH (1 << 8) ++#define MX1_CSPICTRL_ENABLE (1 << 9) ++#define MX1_CSPICTRL_MASTER (1 << 10) ++#define MX1_CSPICTRL_DR_SHIFT 13 + +- /* Schedule transfer tasklet */ +- tasklet_schedule(&drv_data->pump_transfers); ++static void mx1_intctrl(struct spi_imx_data *spi_imx, int enable) ++{ ++ unsigned int val = 0; + +- return IRQ_HANDLED; +- } else { +- while (status & SPI_STATUS_TH) { +- dev_dbg(&drv_data->pdev->dev, +- "interrupt_wronly_transfer - status = 0x%08X\n", +- status); +- +- /* Pump data */ +- if (write(drv_data)) { +- /* End of TXFIFO writes, +- now wait until TXFIFO is empty */ +- writel(SPI_INTEN_TE, regs + SPI_INT_STATUS); +- return IRQ_HANDLED; +- } +- +- status = readl(regs + SPI_INT_STATUS); +- +- /* We did something */ +- handled = IRQ_HANDLED; +- } +- } ++ if (enable & MXC_INT_TE) ++ val |= MX1_INTREG_TEEN; ++ if (enable & MXC_INT_RR) ++ val |= MX1_INTREG_RREN; + +- return handled; ++ writel(val, spi_imx->base + MXC_CSPIINT); + } + +-static irqreturn_t interrupt_transfer(struct driver_data *drv_data) ++static void mx1_trigger(struct spi_imx_data *spi_imx) + { +- struct spi_message *msg = drv_data->cur_msg; +- void __iomem *regs = drv_data->regs; +- u32 status, control; +- irqreturn_t handled = IRQ_NONE; +- unsigned long limit; +- +- status = readl(regs + SPI_INT_STATUS); +- +- if (status & SPI_INTEN_TE) { +- /* TXFIFO Empty Interrupt on the last transfered word */ +- writel(status & ~SPI_INTEN, regs + SPI_INT_STATUS); +- dev_dbg(&drv_data->pdev->dev, +- "interrupt_transfer - end of tx\n"); +- +- if (msg->state == ERROR_STATE) { +- /* RXFIFO overrun was detected and message aborted */ +- flush(drv_data); +- } else { +- /* Wait for end of transaction */ +- do { +- control = readl(regs + SPI_CONTROL); +- } while (control & SPI_CONTROL_XCH); +- +- /* Release chip select if requested, transfer delays are +- handled in pump_transfers */ +- if (drv_data->cs_change) +- drv_data->cs_control(SPI_CS_DEASSERT); +- +- /* Read trailing bytes */ +- limit = loops_per_jiffy << 1; +- while ((read(drv_data) == 0) && --limit) +- cpu_relax(); +- +- if (limit == 0) +- dev_err(&drv_data->pdev->dev, +- "interrupt_transfer - " +- "trailing byte read failed\n"); +- else +- dev_dbg(&drv_data->pdev->dev, +- "interrupt_transfer - end of rx\n"); +- +- /* Update total byte transfered */ +- msg->actual_length += drv_data->len; +- +- /* Move to next transfer */ +- msg->state = next_transfer(drv_data); +- } +- +- /* Schedule transfer tasklet */ +- tasklet_schedule(&drv_data->pump_transfers); ++ unsigned int reg; + +- return IRQ_HANDLED; +- } else { +- while (status & (SPI_STATUS_TH | SPI_STATUS_RO)) { +- dev_dbg(&drv_data->pdev->dev, +- "interrupt_transfer - status = 0x%08X\n", +- status); +- +- if (status & SPI_STATUS_RO) { +- /* RXFIFO overrun, abort message end wait +- until TXFIFO is empty */ +- writel(SPI_INTEN_TE, regs + SPI_INT_STATUS); +- +- dev_warn(&drv_data->pdev->dev, +- "interrupt_transfer - fifo overun\n" +- " data not yet written = %d\n" +- " data not yet read = %d\n", +- data_to_write(drv_data), +- data_to_read(drv_data)); +- +- msg->state = ERROR_STATE; +- +- return IRQ_HANDLED; +- } +- +- /* Pump data */ +- read(drv_data); +- if (write(drv_data)) { +- /* End of TXFIFO writes, +- now wait until TXFIFO is empty */ +- writel(SPI_INTEN_TE, regs + SPI_INT_STATUS); +- return IRQ_HANDLED; +- } +- +- status = readl(regs + SPI_INT_STATUS); +- +- /* We did something */ +- handled = IRQ_HANDLED; +- } +- } +- +- return handled; ++ reg = readl(spi_imx->base + MXC_CSPICTRL); ++ reg |= MX1_CSPICTRL_XCH; ++ writel(reg, spi_imx->base + MXC_CSPICTRL); + } + +-static irqreturn_t spi_int(int irq, void *dev_id) ++static int mx1_config(struct spi_imx_data *spi_imx, ++ struct spi_imx_config *config) + { +- struct driver_data *drv_data = (struct driver_data *)dev_id; ++ unsigned int reg = MX1_CSPICTRL_ENABLE | MX1_CSPICTRL_MASTER; + +- if (!drv_data->cur_msg) { +- dev_err(&drv_data->pdev->dev, +- "spi_int - bad message state\n"); +- /* Never fail */ +- return IRQ_HANDLED; +- } ++ reg |= spi_imx_clkdiv_2(spi_imx->spi_clk, config->speed_hz) << ++ MX1_CSPICTRL_DR_SHIFT; ++ reg |= config->bpw - 1; + +- return drv_data->transfer_handler(drv_data); +-} ++ if (config->mode & SPI_CPHA) ++ reg |= MX1_CSPICTRL_PHA; ++ if (config->mode & SPI_CPOL) ++ reg |= MX1_CSPICTRL_POL; + +-static inline u32 spi_speed_hz(struct driver_data *drv_data, u32 data_rate) +-{ +- return clk_get_rate(drv_data->clk) / (4 << ((data_rate) >> 13)); ++ writel(reg, spi_imx->base + MXC_CSPICTRL); ++ ++ return 0; + } + +-static u32 spi_data_rate(struct driver_data *drv_data, u32 speed_hz) ++static int mx1_rx_available(struct spi_imx_data *spi_imx) + { +- u32 div; +- u32 quantized_hz = clk_get_rate(drv_data->clk) >> 2; +- +- for (div = SPI_PERCLK2_DIV_MIN; +- div <= SPI_PERCLK2_DIV_MAX; +- div++, quantized_hz >>= 1) { +- if (quantized_hz <= speed_hz) +- /* Max available speed LEQ required speed */ +- return div << 13; +- } +- return SPI_CONTROL_DATARATE_BAD; ++ return readl(spi_imx->base + MXC_CSPIINT) & MX1_INTREG_RR; + } + +-static void pump_transfers(unsigned long data) ++static void spi_imx_chipselect(struct spi_device *spi, int is_active) + { +- struct driver_data *drv_data = (struct driver_data *)data; +- struct spi_message *message; +- struct spi_transfer *transfer, *previous; +- struct chip_data *chip; +- void __iomem *regs; +- u32 tmp, control; +- +- dev_dbg(&drv_data->pdev->dev, "pump_transfer\n"); ++ struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master); ++ int gpio = spi_imx->chipselect[spi->chip_select]; ++ int active = is_active != BITBANG_CS_INACTIVE; ++ int dev_is_lowactive = !(spi->mode & SPI_CS_HIGH); + +- message = drv_data->cur_msg; +- +- /* Handle for abort */ +- if (message->state == ERROR_STATE) { +- message->status = -EIO; +- giveback(message, drv_data); +- return; +- } +- +- /* Handle end of message */ +- if (message->state == DONE_STATE) { +- message->status = 0; +- giveback(message, drv_data); ++ if (gpio < 0) + return; +- } +- +- chip = drv_data->cur_chip; +- +- /* Delay if requested at end of transfer*/ +- transfer = drv_data->cur_transfer; +- if (message->state == RUNNING_STATE) { +- previous = list_entry(transfer->transfer_list.prev, +- struct spi_transfer, +- transfer_list); +- if (previous->delay_usecs) +- udelay(previous->delay_usecs); +- } else { +- /* START_STATE */ +- message->state = RUNNING_STATE; +- drv_data->cs_control = chip->cs_control; +- } + +- transfer = drv_data->cur_transfer; +- drv_data->tx = (void *)transfer->tx_buf; +- drv_data->tx_end = drv_data->tx + transfer->len; +- drv_data->rx = transfer->rx_buf; +- drv_data->rx_end = drv_data->rx + transfer->len; +- drv_data->rx_dma = transfer->rx_dma; +- drv_data->tx_dma = transfer->tx_dma; +- drv_data->len = transfer->len; +- drv_data->cs_change = transfer->cs_change; +- drv_data->rd_only = (drv_data->tx == NULL); +- +- regs = drv_data->regs; +- control = readl(regs + SPI_CONTROL); +- +- /* Bits per word setup */ +- tmp = transfer->bits_per_word; +- if (tmp == 0) { +- /* Use device setup */ +- tmp = chip->bits_per_word; +- drv_data->n_bytes = chip->n_bytes; +- } else +- /* Use per-transfer setup */ +- drv_data->n_bytes = (tmp <= 8) ? 1 : 2; +- u32_EDIT(control, SPI_CONTROL_BITCOUNT_MASK, tmp - 1); +- +- /* Speed setup (surely valid because already checked) */ +- tmp = transfer->speed_hz; +- if (tmp == 0) +- tmp = chip->max_speed_hz; +- tmp = spi_data_rate(drv_data, tmp); +- u32_EDIT(control, SPI_CONTROL_DATARATE, tmp); +- +- writel(control, regs + SPI_CONTROL); +- +- /* Assert device chip-select */ +- drv_data->cs_control(SPI_CS_ASSERT); +- +- /* DMA cannot read/write SPI FIFOs other than 16 bits at a time; hence +- if bits_per_word is less or equal 8 PIO transfers are performed. +- Moreover DMA is convinient for transfer length bigger than FIFOs +- byte size. */ +- if ((drv_data->n_bytes == 2) && +- (drv_data->len > SPI_FIFO_DEPTH*SPI_FIFO_BYTE_WIDTH) && +- (map_dma_buffers(drv_data) == 0)) { +- dev_dbg(&drv_data->pdev->dev, +- "pump dma transfer\n" +- " tx = %p\n" +- " tx_dma = %08X\n" +- " rx = %p\n" +- " rx_dma = %08X\n" +- " len = %d\n", +- drv_data->tx, +- (unsigned int)drv_data->tx_dma, +- drv_data->rx, +- (unsigned int)drv_data->rx_dma, +- drv_data->len); +- +- /* Ensure we have the correct interrupt handler */ +- drv_data->transfer_handler = dma_transfer; +- +- /* Trigger transfer */ +- writel(readl(regs + SPI_CONTROL) | SPI_CONTROL_XCH, +- regs + SPI_CONTROL); +- +- /* Setup tx DMA */ +- if (drv_data->tx) +- /* Linear source address */ +- CCR(drv_data->tx_channel) = +- CCR_DMOD_FIFO | +- CCR_SMOD_LINEAR | +- CCR_SSIZ_32 | CCR_DSIZ_16 | +- CCR_REN; +- else +- /* Read only transfer -> fixed source address for +- dummy write to achive read */ +- CCR(drv_data->tx_channel) = +- CCR_DMOD_FIFO | +- CCR_SMOD_FIFO | +- CCR_SSIZ_32 | CCR_DSIZ_16 | +- CCR_REN; +- +- imx_dma_setup_single( +- drv_data->tx_channel, +- drv_data->tx_dma, +- drv_data->len, +- drv_data->rd_data_phys + 4, +- DMA_MODE_WRITE); +- +- if (drv_data->rx) { +- /* Setup rx DMA for linear destination address */ +- CCR(drv_data->rx_channel) = +- CCR_DMOD_LINEAR | +- CCR_SMOD_FIFO | +- CCR_DSIZ_32 | CCR_SSIZ_16 | +- CCR_REN; +- imx_dma_setup_single( +- drv_data->rx_channel, +- drv_data->rx_dma, +- drv_data->len, +- drv_data->rd_data_phys, +- DMA_MODE_READ); +- imx_dma_enable(drv_data->rx_channel); +- +- /* Enable SPI interrupt */ +- writel(SPI_INTEN_RO, regs + SPI_INT_STATUS); +- +- /* Set SPI to request DMA service on both +- Rx and Tx half fifo watermark */ +- writel(SPI_DMA_RHDEN | SPI_DMA_THDEN, regs + SPI_DMA); +- } else +- /* Write only access -> set SPI to request DMA +- service on Tx half fifo watermark */ +- writel(SPI_DMA_THDEN, regs + SPI_DMA); +- +- imx_dma_enable(drv_data->tx_channel); +- } else { +- dev_dbg(&drv_data->pdev->dev, +- "pump pio transfer\n" +- " tx = %p\n" +- " rx = %p\n" +- " len = %d\n", +- drv_data->tx, +- drv_data->rx, +- drv_data->len); +- +- /* Ensure we have the correct interrupt handler */ +- if (drv_data->rx) +- drv_data->transfer_handler = interrupt_transfer; +- else +- drv_data->transfer_handler = interrupt_wronly_transfer; +- +- /* Enable SPI interrupt */ +- if (drv_data->rx) +- writel(SPI_INTEN_TH | SPI_INTEN_RO, +- regs + SPI_INT_STATUS); +- else +- writel(SPI_INTEN_TH, regs + SPI_INT_STATUS); +- } ++ gpio_set_value(gpio, dev_is_lowactive ^ active); + } + +-static void pump_messages(struct work_struct *work) ++static void spi_imx_push(struct spi_imx_data *spi_imx) + { +- struct driver_data *drv_data = +- container_of(work, struct driver_data, work); +- unsigned long flags; +- +- /* Lock queue and check for queue work */ +- spin_lock_irqsave(&drv_data->lock, flags); +- if (list_empty(&drv_data->queue) || drv_data->run == QUEUE_STOPPED) { +- drv_data->busy = 0; +- spin_unlock_irqrestore(&drv_data->lock, flags); +- return; +- } +- +- /* Make sure we are not already running a message */ +- if (drv_data->cur_msg) { +- spin_unlock_irqrestore(&drv_data->lock, flags); +- return; ++ while (spi_imx->txfifo < 8) { ++ if (!spi_imx->count) ++ break; ++ spi_imx->tx(spi_imx); ++ spi_imx->txfifo++; + } + +- /* Extract head of queue */ +- drv_data->cur_msg = list_entry(drv_data->queue.next, +- struct spi_message, queue); +- list_del_init(&drv_data->cur_msg->queue); +- drv_data->busy = 1; +- spin_unlock_irqrestore(&drv_data->lock, flags); +- +- /* Initial message state */ +- drv_data->cur_msg->state = START_STATE; +- drv_data->cur_transfer = list_entry(drv_data->cur_msg->transfers.next, +- struct spi_transfer, +- transfer_list); +- +- /* Setup the SPI using the per chip configuration */ +- drv_data->cur_chip = spi_get_ctldata(drv_data->cur_msg->spi); +- restore_state(drv_data); +- +- /* Mark as busy and launch transfers */ +- tasklet_schedule(&drv_data->pump_transfers); ++ spi_imx->trigger(spi_imx); + } + +-static int transfer(struct spi_device *spi, struct spi_message *msg) ++static irqreturn_t spi_imx_isr(int irq, void *dev_id) + { +- struct driver_data *drv_data = spi_master_get_devdata(spi->master); +- u32 min_speed_hz, max_speed_hz, tmp; +- struct spi_transfer *trans; +- unsigned long flags; +- +- msg->actual_length = 0; +- +- /* Per transfer setup check */ +- min_speed_hz = spi_speed_hz(drv_data, SPI_CONTROL_DATARATE_MIN); +- max_speed_hz = spi->max_speed_hz; +- list_for_each_entry(trans, &msg->transfers, transfer_list) { +- tmp = trans->bits_per_word; +- if (tmp > 16) { +- dev_err(&drv_data->pdev->dev, +- "message rejected : " +- "invalid transfer bits_per_word (%d bits)\n", +- tmp); +- goto msg_rejected; +- } +- tmp = trans->speed_hz; +- if (tmp) { +- if (tmp < min_speed_hz) { +- dev_err(&drv_data->pdev->dev, +- "message rejected : " +- "device min speed (%d Hz) exceeds " +- "required transfer speed (%d Hz)\n", +- min_speed_hz, +- tmp); +- goto msg_rejected; +- } else if (tmp > max_speed_hz) { +- dev_err(&drv_data->pdev->dev, +- "message rejected : " +- "transfer speed (%d Hz) exceeds " +- "device max speed (%d Hz)\n", +- tmp, +- max_speed_hz); +- goto msg_rejected; +- } +- } +- } +- +- /* Message accepted */ +- msg->status = -EINPROGRESS; +- msg->state = START_STATE; ++ struct spi_imx_data *spi_imx = dev_id; + +- spin_lock_irqsave(&drv_data->lock, flags); +- if (drv_data->run == QUEUE_STOPPED) { +- spin_unlock_irqrestore(&drv_data->lock, flags); +- return -ESHUTDOWN; ++ while (spi_imx->rx_available(spi_imx)) { ++ spi_imx->rx(spi_imx); ++ spi_imx->txfifo--; + } + +- list_add_tail(&msg->queue, &drv_data->queue); +- if (drv_data->run == QUEUE_RUNNING && !drv_data->busy) +- queue_work(drv_data->workqueue, &drv_data->work); +- +- spin_unlock_irqrestore(&drv_data->lock, flags); +- return 0; +- +-msg_rejected: +- /* Message rejected and not queued */ +- msg->status = -EINVAL; +- msg->state = ERROR_STATE; +- if (msg->complete) +- msg->complete(msg->context); +- return -EINVAL; +-} +- +-/* On first setup bad values must free chip_data memory since will cause +- spi_new_device to fail. Bad value setup from protocol driver are simply not +- applied and notified to the calling driver. */ +-static int setup(struct spi_device *spi) +-{ +- struct driver_data *drv_data = spi_master_get_devdata(spi->master); +- struct spi_imx_chip *chip_info; +- struct chip_data *chip; +- int first_setup = 0; +- u32 tmp; +- int status = 0; +- +- /* Get controller data */ +- chip_info = spi->controller_data; +- +- /* Get controller_state */ +- chip = spi_get_ctldata(spi); +- if (chip == NULL) { +- first_setup = 1; +- +- chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL); +- if (!chip) { +- dev_err(&spi->dev, +- "setup - cannot allocate controller state\n"); +- return -ENOMEM; +- } +- chip->control = SPI_DEFAULT_CONTROL; +- +- if (chip_info == NULL) { +- /* spi_board_info.controller_data not is supplied */ +- chip_info = kzalloc(sizeof(struct spi_imx_chip), +- GFP_KERNEL); +- if (!chip_info) { +- dev_err(&spi->dev, +- "setup - " +- "cannot allocate controller data\n"); +- status = -ENOMEM; +- goto err_first_setup; +- } +- /* Set controller data default value */ +- chip_info->enable_loopback = +- SPI_DEFAULT_ENABLE_LOOPBACK; +- chip_info->enable_dma = SPI_DEFAULT_ENABLE_DMA; +- chip_info->ins_ss_pulse = 1; +- chip_info->bclk_wait = SPI_DEFAULT_PERIOD_WAIT; +- chip_info->cs_control = null_cs_control; +- } ++ if (spi_imx->count) { ++ spi_imx_push(spi_imx); ++ return IRQ_HANDLED; + } + +- /* Now set controller state based on controller data */ +- +- if (first_setup) { +- /* SPI loopback */ +- if (chip_info->enable_loopback) +- chip->test = SPI_TEST_LBC; +- else +- chip->test = 0; +- +- /* SPI dma driven */ +- chip->enable_dma = chip_info->enable_dma; +- +- /* SPI /SS pulse between spi burst */ +- if (chip_info->ins_ss_pulse) +- u32_EDIT(chip->control, +- SPI_CONTROL_SSCTL, SPI_CONTROL_SSCTL_1); +- else +- u32_EDIT(chip->control, +- SPI_CONTROL_SSCTL, SPI_CONTROL_SSCTL_0); +- +- /* SPI bclk waits between each bits_per_word spi burst */ +- if (chip_info->bclk_wait > SPI_PERIOD_MAX_WAIT) { +- dev_err(&spi->dev, +- "setup - " +- "bclk_wait exceeds max allowed (%d)\n", +- SPI_PERIOD_MAX_WAIT); +- goto err_first_setup; +- } +- chip->period = SPI_PERIOD_CSRC_BCLK | +- (chip_info->bclk_wait & SPI_PERIOD_WAIT); ++ if (spi_imx->txfifo) { ++ /* No data left to push, but still waiting for rx data, ++ * enable receive data available interrupt. ++ */ ++ spi_imx->intctrl(spi_imx, MXC_INT_RR); ++ return IRQ_HANDLED; + } + +- /* SPI mode */ +- tmp = spi->mode; +- if (tmp & SPI_CS_HIGH) { +- u32_EDIT(chip->control, +- SPI_CONTROL_SSPOL, SPI_CONTROL_SSPOL_ACT_HIGH); +- } +- switch (tmp & SPI_MODE_3) { +- case SPI_MODE_0: +- tmp = 0; +- break; +- case SPI_MODE_1: +- tmp = SPI_CONTROL_PHA_1; +- break; +- case SPI_MODE_2: +- tmp = SPI_CONTROL_POL_ACT_LOW; +- break; +- default: +- /* SPI_MODE_3 */ +- tmp = SPI_CONTROL_PHA_1 | SPI_CONTROL_POL_ACT_LOW; +- break; +- } +- u32_EDIT(chip->control, SPI_CONTROL_POL | SPI_CONTROL_PHA, tmp); +- +- /* SPI word width */ +- tmp = spi->bits_per_word; +- if (tmp > 16) { +- status = -EINVAL; +- dev_err(&spi->dev, +- "setup - " +- "invalid bits_per_word (%d)\n", +- tmp); +- if (first_setup) +- goto err_first_setup; +- else { +- /* Undo setup using chip as backup copy */ +- tmp = chip->bits_per_word; +- spi->bits_per_word = tmp; +- } +- } +- chip->bits_per_word = tmp; +- u32_EDIT(chip->control, SPI_CONTROL_BITCOUNT_MASK, tmp - 1); +- chip->n_bytes = (tmp <= 8) ? 1 : 2; +- +- /* SPI datarate */ +- tmp = spi_data_rate(drv_data, spi->max_speed_hz); +- if (tmp == SPI_CONTROL_DATARATE_BAD) { +- status = -EINVAL; +- dev_err(&spi->dev, +- "setup - " +- "HW min speed (%d Hz) exceeds required " +- "max speed (%d Hz)\n", +- spi_speed_hz(drv_data, SPI_CONTROL_DATARATE_MIN), +- spi->max_speed_hz); +- if (first_setup) +- goto err_first_setup; +- else +- /* Undo setup using chip as backup copy */ +- spi->max_speed_hz = chip->max_speed_hz; +- } else { +- u32_EDIT(chip->control, SPI_CONTROL_DATARATE, tmp); +- /* Actual rounded max_speed_hz */ +- tmp = spi_speed_hz(drv_data, tmp); +- spi->max_speed_hz = tmp; +- chip->max_speed_hz = tmp; +- } ++ spi_imx->intctrl(spi_imx, 0); ++ complete(&spi_imx->xfer_done); + +- /* SPI chip-select management */ +- if (chip_info->cs_control) +- chip->cs_control = chip_info->cs_control; +- else +- chip->cs_control = null_cs_control; +- +- /* Save controller_state */ +- spi_set_ctldata(spi, chip); +- +- /* Summary */ +- dev_dbg(&spi->dev, +- "setup succeded\n" +- " loopback enable = %s\n" +- " dma enable = %s\n" +- " insert /ss pulse = %s\n" +- " period wait = %d\n" +- " mode = %d\n" +- " bits per word = %d\n" +- " min speed = %d Hz\n" +- " rounded max speed = %d Hz\n", +- chip->test & SPI_TEST_LBC ? "Yes" : "No", +- chip->enable_dma ? "Yes" : "No", +- chip->control & SPI_CONTROL_SSCTL ? "Yes" : "No", +- chip->period & SPI_PERIOD_WAIT, +- spi->mode, +- spi->bits_per_word, +- spi_speed_hz(drv_data, SPI_CONTROL_DATARATE_MIN), +- spi->max_speed_hz); +- return status; +- +-err_first_setup: +- kfree(chip); +- return status; ++ return IRQ_HANDLED; + } + +-static void cleanup(struct spi_device *spi) ++static int spi_imx_setupxfer(struct spi_device *spi, ++ struct spi_transfer *t) + { +- kfree(spi_get_ctldata(spi)); +-} ++ struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master); ++ struct spi_imx_config config; + +-static int __init init_queue(struct driver_data *drv_data) +-{ +- INIT_LIST_HEAD(&drv_data->queue); +- spin_lock_init(&drv_data->lock); ++ config.bpw = t ? t->bits_per_word : spi->bits_per_word; ++ config.speed_hz = t ? t->speed_hz : spi->max_speed_hz; ++ config.mode = spi->mode; ++ config.cs = spi_imx->chipselect[spi->chip_select]; + +- drv_data->run = QUEUE_STOPPED; +- drv_data->busy = 0; ++ if (!config.speed_hz) ++ config.speed_hz = spi->max_speed_hz; ++ if (!config.bpw) ++ config.bpw = spi->bits_per_word; ++ if (!config.speed_hz) ++ config.speed_hz = spi->max_speed_hz; + +- tasklet_init(&drv_data->pump_transfers, +- pump_transfers, (unsigned long)drv_data); ++ /* Initialize the functions for transfer */ ++ if (config.bpw <= 8) { ++ spi_imx->rx = spi_imx_buf_rx_u8; ++ spi_imx->tx = spi_imx_buf_tx_u8; ++ } else if (config.bpw <= 16) { ++ spi_imx->rx = spi_imx_buf_rx_u16; ++ spi_imx->tx = spi_imx_buf_tx_u16; ++ } else if (config.bpw <= 32) { ++ spi_imx->rx = spi_imx_buf_rx_u32; ++ spi_imx->tx = spi_imx_buf_tx_u32; ++ } else ++ BUG(); + +- INIT_WORK(&drv_data->work, pump_messages); +- drv_data->workqueue = create_singlethread_workqueue( +- dev_name(drv_data->master->dev.parent)); +- if (drv_data->workqueue == NULL) +- return -EBUSY; ++ spi_imx->config(spi_imx, &config); + + return 0; + } + +-static int start_queue(struct driver_data *drv_data) ++static int spi_imx_transfer(struct spi_device *spi, ++ struct spi_transfer *transfer) + { +- unsigned long flags; ++ struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master); + +- spin_lock_irqsave(&drv_data->lock, flags); ++ spi_imx->tx_buf = transfer->tx_buf; ++ spi_imx->rx_buf = transfer->rx_buf; ++ spi_imx->count = transfer->len; ++ spi_imx->txfifo = 0; + +- if (drv_data->run == QUEUE_RUNNING || drv_data->busy) { +- spin_unlock_irqrestore(&drv_data->lock, flags); +- return -EBUSY; +- } ++ init_completion(&spi_imx->xfer_done); + +- drv_data->run = QUEUE_RUNNING; +- drv_data->cur_msg = NULL; +- drv_data->cur_transfer = NULL; +- drv_data->cur_chip = NULL; +- spin_unlock_irqrestore(&drv_data->lock, flags); ++ spi_imx_push(spi_imx); + +- queue_work(drv_data->workqueue, &drv_data->work); ++ spi_imx->intctrl(spi_imx, MXC_INT_TE); + +- return 0; ++ wait_for_completion(&spi_imx->xfer_done); ++ ++ return transfer->len; + } + +-static int stop_queue(struct driver_data *drv_data) ++static int spi_imx_setup(struct spi_device *spi) + { +- unsigned long flags; +- unsigned limit = 500; +- int status = 0; +- +- spin_lock_irqsave(&drv_data->lock, flags); +- +- /* This is a bit lame, but is optimized for the common execution path. +- * A wait_queue on the drv_data->busy could be used, but then the common +- * execution path (pump_messages) would be required to call wake_up or +- * friends on every SPI message. Do this instead */ +- drv_data->run = QUEUE_STOPPED; +- while (!list_empty(&drv_data->queue) && drv_data->busy && limit--) { +- spin_unlock_irqrestore(&drv_data->lock, flags); +- msleep(10); +- spin_lock_irqsave(&drv_data->lock, flags); +- } ++ struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master); ++ int gpio = spi_imx->chipselect[spi->chip_select]; ++ ++ pr_debug("%s: mode %d, %u bpw, %d hz\n", __func__, ++ spi->mode, spi->bits_per_word, spi->max_speed_hz); + +- if (!list_empty(&drv_data->queue) || drv_data->busy) +- status = -EBUSY; ++ if (gpio >= 0) ++ gpio_direction_output(gpio, spi->mode & SPI_CS_HIGH ? 0 : 1); + +- spin_unlock_irqrestore(&drv_data->lock, flags); ++ spi_imx_chipselect(spi, BITBANG_CS_INACTIVE); + +- return status; ++ return 0; + } + +-static int destroy_queue(struct driver_data *drv_data) ++static void spi_imx_cleanup(struct spi_device *spi) + { +- int status; +- +- status = stop_queue(drv_data); +- if (status != 0) +- return status; +- +- if (drv_data->workqueue) +- destroy_workqueue(drv_data->workqueue); +- +- return 0; + } + + static int __init spi_imx_probe(struct platform_device *pdev) + { +- struct device *dev = &pdev->dev; +- struct spi_imx_master *platform_info; ++ struct spi_imx_master *mxc_platform_info; + struct spi_master *master; +- struct driver_data *drv_data; ++ struct spi_imx_data *spi_imx; + struct resource *res; +- int irq, status = 0; ++ int i, ret; + +- platform_info = dev->platform_data; +- if (platform_info == NULL) { +- dev_err(&pdev->dev, "probe - no platform data supplied\n"); +- status = -ENODEV; +- goto err_no_pdata; ++ mxc_platform_info = (struct spi_imx_master *)pdev->dev.platform_data; ++ if (!mxc_platform_info) { ++ dev_err(&pdev->dev, "can't get the platform data\n"); ++ return -EINVAL; + } + +- /* Allocate master with space for drv_data */ +- master = spi_alloc_master(dev, sizeof(struct driver_data)); +- if (!master) { +- dev_err(&pdev->dev, "probe - cannot alloc spi_master\n"); +- status = -ENOMEM; +- goto err_no_mem; +- } +- drv_data = spi_master_get_devdata(master); +- drv_data->master = master; +- drv_data->master_info = platform_info; +- drv_data->pdev = pdev; ++ master = spi_alloc_master(&pdev->dev, sizeof(struct spi_imx_data)); ++ if (!master) ++ return -ENOMEM; + +- /* the spi->mode bits understood by this driver: */ +- master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; ++ platform_set_drvdata(pdev, master); + + master->bus_num = pdev->id; +- master->num_chipselect = platform_info->num_chipselect; +- master->dma_alignment = DMA_ALIGNMENT; +- master->cleanup = cleanup; +- master->setup = setup; +- master->transfer = transfer; +- +- drv_data->dummy_dma_buf = SPI_DUMMY_u32; +- +- drv_data->clk = clk_get(&pdev->dev, "perclk2"); +- if (IS_ERR(drv_data->clk)) { +- dev_err(&pdev->dev, "probe - cannot get clock\n"); +- status = PTR_ERR(drv_data->clk); +- goto err_no_clk; +- } +- clk_enable(drv_data->clk); +- +- /* Find and map resources */ +- res = platform_get_resource(pdev, IORESOURCE_MEM, 0); +- if (!res) { +- dev_err(&pdev->dev, "probe - MEM resources not defined\n"); +- status = -ENODEV; +- goto err_no_iores; +- } +- drv_data->ioarea = request_mem_region(res->start, +- res->end - res->start + 1, +- pdev->name); +- if (drv_data->ioarea == NULL) { +- dev_err(&pdev->dev, "probe - cannot reserve region\n"); +- status = -ENXIO; +- goto err_no_iores; +- } +- drv_data->regs = ioremap(res->start, res->end - res->start + 1); +- if (drv_data->regs == NULL) { +- dev_err(&pdev->dev, "probe - cannot map IO\n"); +- status = -ENXIO; +- goto err_no_iomap; +- } +- drv_data->rd_data_phys = (dma_addr_t)res->start; +- +- /* Attach to IRQ */ +- irq = platform_get_irq(pdev, 0); +- if (irq < 0) { +- dev_err(&pdev->dev, "probe - IRQ resource not defined\n"); +- status = -ENODEV; +- goto err_no_irqres; +- } +- status = request_irq(irq, spi_int, IRQF_DISABLED, +- dev_name(dev), drv_data); +- if (status < 0) { +- dev_err(&pdev->dev, "probe - cannot get IRQ (%d)\n", status); +- goto err_no_irqres; +- } +- +- /* Setup DMA if requested */ +- drv_data->tx_channel = -1; +- drv_data->rx_channel = -1; +- if (platform_info->enable_dma) { +- /* Get rx DMA channel */ +- drv_data->rx_channel = imx_dma_request_by_prio("spi_imx_rx", +- DMA_PRIO_HIGH); +- if (drv_data->rx_channel < 0) { +- dev_err(dev, +- "probe - problem (%d) requesting rx channel\n", +- drv_data->rx_channel); +- goto err_no_rxdma; +- } else +- imx_dma_setup_handlers(drv_data->rx_channel, NULL, +- dma_err_handler, drv_data); +- +- /* Get tx DMA channel */ +- drv_data->tx_channel = imx_dma_request_by_prio("spi_imx_tx", +- DMA_PRIO_MEDIUM); +- if (drv_data->tx_channel < 0) { +- dev_err(dev, +- "probe - problem (%d) requesting tx channel\n", +- drv_data->tx_channel); +- imx_dma_free(drv_data->rx_channel); +- goto err_no_txdma; +- } else +- imx_dma_setup_handlers(drv_data->tx_channel, +- dma_tx_handler, dma_err_handler, +- drv_data); +- +- /* Set request source and burst length for allocated channels */ +- switch (drv_data->pdev->id) { +- case 1: +- /* Using SPI1 */ +- RSSR(drv_data->rx_channel) = DMA_REQ_SPI1_R; +- RSSR(drv_data->tx_channel) = DMA_REQ_SPI1_T; +- break; +- case 2: +- /* Using SPI2 */ +- RSSR(drv_data->rx_channel) = DMA_REQ_SPI2_R; +- RSSR(drv_data->tx_channel) = DMA_REQ_SPI2_T; +- break; +- default: +- dev_err(dev, "probe - bad SPI Id\n"); +- imx_dma_free(drv_data->rx_channel); +- imx_dma_free(drv_data->tx_channel); +- status = -ENODEV; +- goto err_no_devid; ++ master->num_chipselect = mxc_platform_info->num_chipselect; ++ ++ spi_imx = spi_master_get_devdata(master); ++ spi_imx->bitbang.master = spi_master_get(master); ++ spi_imx->chipselect = mxc_platform_info->chipselect; ++ ++ for (i = 0; i < master->num_chipselect; i++) { ++ if (spi_imx->chipselect[i] < 0) ++ continue; ++ ret = gpio_request(spi_imx->chipselect[i], DRIVER_NAME); ++ if (ret) { ++ i--; ++ while (i > 0) ++ if (spi_imx->chipselect[i] >= 0) ++ gpio_free(spi_imx->chipselect[i--]); ++ dev_err(&pdev->dev, "can't get cs gpios"); ++ goto out_master_put; + } +- BLR(drv_data->rx_channel) = SPI_DMA_BLR; +- BLR(drv_data->tx_channel) = SPI_DMA_BLR; + } + +- /* Load default SPI configuration */ +- writel(SPI_RESET_START, drv_data->regs + SPI_RESET); +- writel(0, drv_data->regs + SPI_RESET); +- writel(SPI_DEFAULT_CONTROL, drv_data->regs + SPI_CONTROL); ++ spi_imx->bitbang.chipselect = spi_imx_chipselect; ++ spi_imx->bitbang.setup_transfer = spi_imx_setupxfer; ++ spi_imx->bitbang.txrx_bufs = spi_imx_transfer; ++ spi_imx->bitbang.master->setup = spi_imx_setup; ++ spi_imx->bitbang.master->cleanup = spi_imx_cleanup; ++ spi_imx->bitbang.master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; + +- /* Initial and start queue */ +- status = init_queue(drv_data); +- if (status != 0) { +- dev_err(&pdev->dev, "probe - problem initializing queue\n"); +- goto err_init_queue; +- } +- status = start_queue(drv_data); +- if (status != 0) { +- dev_err(&pdev->dev, "probe - problem starting queue\n"); +- goto err_start_queue; +- } ++ init_completion(&spi_imx->xfer_done); ++ ++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ if (!res) { ++ dev_err(&pdev->dev, "can't get platform resource\n"); ++ ret = -ENOMEM; ++ goto out_gpio_free; ++ } ++ ++ if (!request_mem_region(res->start, resource_size(res), pdev->name)) { ++ dev_err(&pdev->dev, "request_mem_region failed\n"); ++ ret = -EBUSY; ++ goto out_gpio_free; ++ } ++ ++ spi_imx->base = ioremap(res->start, resource_size(res)); ++ if (!spi_imx->base) { ++ ret = -EINVAL; ++ goto out_release_mem; ++ } ++ ++ spi_imx->irq = platform_get_irq(pdev, 0); ++ if (!spi_imx->irq) { ++ ret = -EINVAL; ++ goto out_iounmap; ++ } ++ ++ ret = request_irq(spi_imx->irq, spi_imx_isr, 0, DRIVER_NAME, spi_imx); ++ if (ret) { ++ dev_err(&pdev->dev, "can't get irq%d: %d\n", spi_imx->irq, ret); ++ goto out_iounmap; ++ } ++ ++ if (cpu_is_mx31() || cpu_is_mx35()) { ++ spi_imx->intctrl = mx31_intctrl; ++ spi_imx->config = mx31_config; ++ spi_imx->trigger = mx31_trigger; ++ spi_imx->rx_available = mx31_rx_available; ++ } else if (cpu_is_mx27() || cpu_is_mx21()) { ++ spi_imx->intctrl = mx27_intctrl; ++ spi_imx->config = mx27_config; ++ spi_imx->trigger = mx27_trigger; ++ spi_imx->rx_available = mx27_rx_available; ++ } else if (cpu_is_mx1()) { ++ spi_imx->intctrl = mx1_intctrl; ++ spi_imx->config = mx1_config; ++ spi_imx->trigger = mx1_trigger; ++ spi_imx->rx_available = mx1_rx_available; ++ } else ++ BUG(); + +- /* Register with the SPI framework */ +- platform_set_drvdata(pdev, drv_data); +- status = spi_register_master(master); +- if (status != 0) { +- dev_err(&pdev->dev, "probe - problem registering spi master\n"); +- goto err_spi_register; ++ spi_imx->clk = clk_get(&pdev->dev, NULL); ++ if (IS_ERR(spi_imx->clk)) { ++ dev_err(&pdev->dev, "unable to get clock\n"); ++ ret = PTR_ERR(spi_imx->clk); ++ goto out_free_irq; + } + +- dev_dbg(dev, "probe succeded\n"); +- return 0; ++ clk_enable(spi_imx->clk); ++ spi_imx->spi_clk = clk_get_rate(spi_imx->clk); + +-err_init_queue: +-err_start_queue: +-err_spi_register: +- destroy_queue(drv_data); ++ if (!cpu_is_mx31() || !cpu_is_mx35()) ++ writel(1, spi_imx->base + MXC_RESET); + +-err_no_rxdma: +-err_no_txdma: +-err_no_devid: +- free_irq(irq, drv_data); ++ spi_imx->intctrl(spi_imx, 0); + +-err_no_irqres: +- iounmap(drv_data->regs); ++ ret = spi_bitbang_start(&spi_imx->bitbang); ++ if (ret) { ++ dev_err(&pdev->dev, "bitbang start failed with %d\n", ret); ++ goto out_clk_put; ++ } + +-err_no_iomap: +- release_resource(drv_data->ioarea); +- kfree(drv_data->ioarea); ++ dev_info(&pdev->dev, "probed\n"); + +-err_no_iores: +- clk_disable(drv_data->clk); +- clk_put(drv_data->clk); ++ return ret; + +-err_no_clk: ++out_clk_put: ++ clk_disable(spi_imx->clk); ++ clk_put(spi_imx->clk); ++out_free_irq: ++ free_irq(spi_imx->irq, spi_imx); ++out_iounmap: ++ iounmap(spi_imx->base); ++out_release_mem: ++ release_mem_region(res->start, resource_size(res)); ++out_gpio_free: ++ for (i = 0; i < master->num_chipselect; i++) ++ if (spi_imx->chipselect[i] >= 0) ++ gpio_free(spi_imx->chipselect[i]); ++out_master_put: + spi_master_put(master); +- +-err_no_pdata: +-err_no_mem: +- return status; ++ kfree(master); ++ platform_set_drvdata(pdev, NULL); ++ return ret; + } + + static int __exit spi_imx_remove(struct platform_device *pdev) + { +- struct driver_data *drv_data = platform_get_drvdata(pdev); +- int irq; +- int status = 0; +- +- if (!drv_data) +- return 0; +- +- tasklet_kill(&drv_data->pump_transfers); ++ struct spi_master *master = platform_get_drvdata(pdev); ++ struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ struct spi_imx_data *spi_imx = spi_master_get_devdata(master); ++ int i; + +- /* Remove the queue */ +- status = destroy_queue(drv_data); +- if (status != 0) { +- dev_err(&pdev->dev, "queue remove failed (%d)\n", status); +- return status; +- } +- +- /* Reset SPI */ +- writel(SPI_RESET_START, drv_data->regs + SPI_RESET); +- writel(0, drv_data->regs + SPI_RESET); +- +- /* Release DMA */ +- if (drv_data->master_info->enable_dma) { +- RSSR(drv_data->rx_channel) = 0; +- RSSR(drv_data->tx_channel) = 0; +- imx_dma_free(drv_data->tx_channel); +- imx_dma_free(drv_data->rx_channel); +- } ++ spi_bitbang_stop(&spi_imx->bitbang); + +- /* Release IRQ */ +- irq = platform_get_irq(pdev, 0); +- if (irq >= 0) +- free_irq(irq, drv_data); ++ writel(0, spi_imx->base + MXC_CSPICTRL); ++ clk_disable(spi_imx->clk); ++ clk_put(spi_imx->clk); ++ free_irq(spi_imx->irq, spi_imx); ++ iounmap(spi_imx->base); + +- clk_disable(drv_data->clk); +- clk_put(drv_data->clk); ++ for (i = 0; i < master->num_chipselect; i++) ++ if (spi_imx->chipselect[i] >= 0) ++ gpio_free(spi_imx->chipselect[i]); + +- /* Release map resources */ +- iounmap(drv_data->regs); +- release_resource(drv_data->ioarea); +- kfree(drv_data->ioarea); ++ spi_master_put(master); + +- /* Disconnect from the SPI framework */ +- spi_unregister_master(drv_data->master); +- spi_master_put(drv_data->master); ++ release_mem_region(res->start, resource_size(res)); + +- /* Prevent double remove */ + platform_set_drvdata(pdev, NULL); + +- dev_dbg(&pdev->dev, "remove succeded\n"); +- + return 0; + } + +-static void spi_imx_shutdown(struct platform_device *pdev) +-{ +- struct driver_data *drv_data = platform_get_drvdata(pdev); +- +- /* Reset SPI */ +- writel(SPI_RESET_START, drv_data->regs + SPI_RESET); +- writel(0, drv_data->regs + SPI_RESET); +- +- dev_dbg(&pdev->dev, "shutdown succeded\n"); +-} +- +-#ifdef CONFIG_PM +- +-static int spi_imx_suspend(struct platform_device *pdev, pm_message_t state) +-{ +- struct driver_data *drv_data = platform_get_drvdata(pdev); +- int status = 0; +- +- status = stop_queue(drv_data); +- if (status != 0) { +- dev_warn(&pdev->dev, "suspend cannot stop queue\n"); +- return status; +- } +- +- dev_dbg(&pdev->dev, "suspended\n"); +- +- return 0; +-} +- +-static int spi_imx_resume(struct platform_device *pdev) +-{ +- struct driver_data *drv_data = platform_get_drvdata(pdev); +- int status = 0; +- +- /* Start the queue running */ +- status = start_queue(drv_data); +- if (status != 0) +- dev_err(&pdev->dev, "problem starting queue (%d)\n", status); +- else +- dev_dbg(&pdev->dev, "resumed\n"); +- +- return status; +-} +-#else +-#define spi_imx_suspend NULL +-#define spi_imx_resume NULL +-#endif /* CONFIG_PM */ +- +-/* work with hotplug and coldplug */ +-MODULE_ALIAS("platform:spi_imx"); +- +-static struct platform_driver driver = { ++static struct platform_driver spi_imx_driver = { + .driver = { +- .name = "spi_imx", +- .owner = THIS_MODULE, +- }, ++ .name = DRIVER_NAME, ++ .owner = THIS_MODULE, ++ }, ++ .probe = spi_imx_probe, + .remove = __exit_p(spi_imx_remove), +- .shutdown = spi_imx_shutdown, +- .suspend = spi_imx_suspend, +- .resume = spi_imx_resume, + }; + + static int __init spi_imx_init(void) + { +- return platform_driver_probe(&driver, spi_imx_probe); ++ return platform_driver_register(&spi_imx_driver); + } +-module_init(spi_imx_init); + + static void __exit spi_imx_exit(void) + { +- platform_driver_unregister(&driver); ++ platform_driver_unregister(&spi_imx_driver); + } ++ ++module_init(spi_imx_init); + module_exit(spi_imx_exit); + +-MODULE_AUTHOR("Andrea Paterniani, "); +-MODULE_DESCRIPTION("iMX SPI Controller Driver"); ++MODULE_DESCRIPTION("SPI Master Controller driver"); ++MODULE_AUTHOR("Sascha Hauer, Pengutronix"); + MODULE_LICENSE("GPL"); +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0002-MXC-NFC-Remove-useless-structure-member.patch b/recipes/linux/linux-2.6.31/pcm043/0002-MXC-NFC-Remove-useless-structure-member.patch new file mode 100644 index 0000000000..1cad5b583f --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0002-MXC-NFC-Remove-useless-structure-member.patch @@ -0,0 +1,45 @@ +From ec0217a98d38662cc058dcc6124c5a1e7a6bc8db Mon Sep 17 00:00:00 2001 +From: Juergen Beisert +Date: Tue, 29 Sep 2009 13:51:19 +0200 +Subject: [PATCH 02/15] MXC NFC: Remove useless structure member + +Remove a local copy of a value always present in other structures. + +Signed-off-by: Juergen Beisert +--- + drivers/mtd/nand/mxc_nand_v2.c | 5 +---- + 1 files changed, 1 insertions(+), 4 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand_v2.c b/drivers/mtd/nand/mxc_nand_v2.c +index b7ae2e0..3483e7d 100644 +--- a/drivers/mtd/nand/mxc_nand_v2.c ++++ b/drivers/mtd/nand/mxc_nand_v2.c +@@ -104,7 +104,6 @@ struct mxc_nand_host { + unsigned int buf_start; + + wait_queue_head_t irq_waitq; +- int g_page_mask; + + struct clk *clk; + int clk_enabled; +@@ -473,7 +472,7 @@ static void mxc_do_addr_cycle(struct mtd_info *mtd, int column, int page_addr) + struct nand_chip *nand_chip = mtd->priv; + struct mxc_nand_host *host = nand_chip->priv; + +- u32 page_mask = host->g_page_mask; ++ u32 page_mask = nand_chip->pagemask; + + if (column != -1) { + send_addr(host, column & 0xFF); +@@ -790,8 +789,6 @@ static int mxc_nand_scan_bbt(struct mtd_info *mtd) + struct nand_chip *this = mtd->priv; + struct mxc_nand_host *host = this->priv; + +- host->g_page_mask = this->pagemask; +- + if (mtd->writesize == 2048) { + mxc_set_nfms(mtd, 1 << NFMS_NF_PG_SZ); + this->ecc.layout = &nand_hw_eccoob_2k; +-- +1.6.1 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0002-mfd-Add-Freescale-MC13783-driver.patch b/recipes/linux/linux-2.6.31/pcm043/0002-mfd-Add-Freescale-MC13783-driver.patch new file mode 100644 index 0000000000..c97566688c --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0002-mfd-Add-Freescale-MC13783-driver.patch @@ -0,0 +1,984 @@ +From b7f6a24d9c7f9715845cc910000618f2c658ea27 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Wed, 19 Aug 2009 01:40:28 +0200 +Subject: [PATCH 02/28] mfd: Add Freescale MC13783 driver + +This driver provides the core Freescale MC13783 support. It +registers the client platform_devices and provides access +to the A/D converter. + +Signed-off-by: Sascha Hauer +Signed-off-by: Samuel Ortiz +--- + drivers/mfd/Kconfig | 10 + + drivers/mfd/Makefile | 2 + + drivers/mfd/mc13783-core.c | 427 +++++++++++++++++++++++++++++++++++ + include/linux/mfd/mc13783-private.h | 396 ++++++++++++++++++++++++++++++++ + include/linux/mfd/mc13783.h | 84 +++++++ + 5 files changed, 919 insertions(+), 0 deletions(-) + create mode 100644 drivers/mfd/mc13783-core.c + create mode 100644 include/linux/mfd/mc13783-private.h + create mode 100644 include/linux/mfd/mc13783.h + +diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig +index 491ac0f..c9aa085 100644 +--- a/drivers/mfd/Kconfig ++++ b/drivers/mfd/Kconfig +@@ -228,6 +228,16 @@ config MFD_PCF50633 + facilities, and registers devices for the various functions + so that function-specific drivers can bind to them. + ++config MFD_MC13783 ++ tristate "Support Freescale MC13783" ++ depends on SPI_MASTER ++ select MFD_CORE ++ help ++ Support for the Freescale (Atlas) MC13783 PMIC and audio CODEC. ++ This driver provides common support for accessing the device, ++ additional drivers must be enabled in order to use the ++ functionality of the device. ++ + config PCF50633_ADC + tristate "Support for NXP PCF50633 ADC" + depends on MFD_PCF50633 +diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile +index 6f8a9a1..7262822 100644 +--- a/drivers/mfd/Makefile ++++ b/drivers/mfd/Makefile +@@ -24,6 +24,8 @@ obj-$(CONFIG_MENELAUS) += menelaus.o + + obj-$(CONFIG_TWL4030_CORE) += twl4030-core.o twl4030-irq.o + ++obj-$(CONFIG_MFD_MC13783) += mc13783-core.o ++ + obj-$(CONFIG_MFD_CORE) += mfd-core.o + + obj-$(CONFIG_EZX_PCAP) += ezx-pcap.o +diff --git a/drivers/mfd/mc13783-core.c b/drivers/mfd/mc13783-core.c +new file mode 100644 +index 0000000..e354d29 +--- /dev/null ++++ b/drivers/mfd/mc13783-core.c +@@ -0,0 +1,427 @@ ++/* ++ * Copyright 2009 Pengutronix, Sascha Hauer ++ * ++ * This code is in parts based on wm8350-core.c and pcf50633-core.c ++ * ++ * Initial development of this code was funded by ++ * Phytec Messtechnik GmbH, http://www.phytec.de ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define MC13783_MAX_REG_NUM 0x3f ++#define MC13783_FRAME_MASK 0x00ffffff ++#define MC13783_MAX_REG_NUM 0x3f ++#define MC13783_REG_NUM_SHIFT 0x19 ++#define MC13783_WRITE_BIT_SHIFT 31 ++ ++static inline int spi_rw(struct spi_device *spi, u8 * buf, size_t len) ++{ ++ struct spi_transfer t = { ++ .tx_buf = (const void *)buf, ++ .rx_buf = buf, ++ .len = len, ++ .cs_change = 0, ++ .delay_usecs = 0, ++ }; ++ struct spi_message m; ++ ++ spi_message_init(&m); ++ spi_message_add_tail(&t, &m); ++ if (spi_sync(spi, &m) != 0 || m.status != 0) ++ return -EINVAL; ++ return len - m.actual_length; ++} ++ ++static int mc13783_read(struct mc13783 *mc13783, int reg_num, u32 *reg_val) ++{ ++ unsigned int frame = 0; ++ int ret = 0; ++ ++ if (reg_num > MC13783_MAX_REG_NUM) ++ return -EINVAL; ++ ++ frame |= reg_num << MC13783_REG_NUM_SHIFT; ++ ++ ret = spi_rw(mc13783->spi_device, (u8 *)&frame, 4); ++ ++ *reg_val = frame & MC13783_FRAME_MASK; ++ ++ return ret; ++} ++ ++static int mc13783_write(struct mc13783 *mc13783, int reg_num, u32 reg_val) ++{ ++ unsigned int frame = 0; ++ ++ if (reg_num > MC13783_MAX_REG_NUM) ++ return -EINVAL; ++ ++ frame |= (1 << MC13783_WRITE_BIT_SHIFT); ++ frame |= reg_num << MC13783_REG_NUM_SHIFT; ++ frame |= reg_val & MC13783_FRAME_MASK; ++ ++ return spi_rw(mc13783->spi_device, (u8 *)&frame, 4); ++} ++ ++int mc13783_reg_read(struct mc13783 *mc13783, int reg_num, u32 *reg_val) ++{ ++ int ret; ++ ++ mutex_lock(&mc13783->io_lock); ++ ret = mc13783_read(mc13783, reg_num, reg_val); ++ mutex_unlock(&mc13783->io_lock); ++ ++ return ret; ++} ++EXPORT_SYMBOL_GPL(mc13783_reg_read); ++ ++int mc13783_reg_write(struct mc13783 *mc13783, int reg_num, u32 reg_val) ++{ ++ int ret; ++ ++ mutex_lock(&mc13783->io_lock); ++ ret = mc13783_write(mc13783, reg_num, reg_val); ++ mutex_unlock(&mc13783->io_lock); ++ ++ return ret; ++} ++EXPORT_SYMBOL_GPL(mc13783_reg_write); ++ ++/** ++ * mc13783_set_bits - Bitmask write ++ * ++ * @mc13783: Pointer to mc13783 control structure ++ * @reg: Register to access ++ * @mask: Mask of bits to change ++ * @val: Value to set for masked bits ++ */ ++int mc13783_set_bits(struct mc13783 *mc13783, int reg, u32 mask, u32 val) ++{ ++ u32 tmp; ++ int ret; ++ ++ mutex_lock(&mc13783->io_lock); ++ ++ ret = mc13783_read(mc13783, reg, &tmp); ++ tmp = (tmp & ~mask) | val; ++ if (ret == 0) ++ ret = mc13783_write(mc13783, reg, tmp); ++ ++ mutex_unlock(&mc13783->io_lock); ++ ++ return ret; ++} ++EXPORT_SYMBOL_GPL(mc13783_set_bits); ++ ++int mc13783_register_irq(struct mc13783 *mc13783, int irq, ++ void (*handler) (int, void *), void *data) ++{ ++ if (irq < 0 || irq > MC13783_NUM_IRQ || !handler) ++ return -EINVAL; ++ ++ if (WARN_ON(mc13783->irq_handler[irq].handler)) ++ return -EBUSY; ++ ++ mutex_lock(&mc13783->io_lock); ++ mc13783->irq_handler[irq].handler = handler; ++ mc13783->irq_handler[irq].data = data; ++ mutex_unlock(&mc13783->io_lock); ++ ++ return 0; ++} ++EXPORT_SYMBOL_GPL(mc13783_register_irq); ++ ++int mc13783_free_irq(struct mc13783 *mc13783, int irq) ++{ ++ if (irq < 0 || irq > MC13783_NUM_IRQ) ++ return -EINVAL; ++ ++ mutex_lock(&mc13783->io_lock); ++ mc13783->irq_handler[irq].handler = NULL; ++ mutex_unlock(&mc13783->io_lock); ++ ++ return 0; ++} ++EXPORT_SYMBOL_GPL(mc13783_free_irq); ++ ++static void mc13783_irq_work(struct work_struct *work) ++{ ++ struct mc13783 *mc13783 = container_of(work, struct mc13783, work); ++ int i; ++ unsigned int adc_sts; ++ ++ /* check if the adc has finished any completion */ ++ mc13783_reg_read(mc13783, MC13783_REG_INTERRUPT_STATUS_0, &adc_sts); ++ mc13783_reg_write(mc13783, MC13783_REG_INTERRUPT_STATUS_0, ++ adc_sts & MC13783_INT_STAT_ADCDONEI); ++ ++ if (adc_sts & MC13783_INT_STAT_ADCDONEI) ++ complete_all(&mc13783->adc_done); ++ ++ for (i = 0; i < MC13783_NUM_IRQ; i++) ++ if (mc13783->irq_handler[i].handler) ++ mc13783->irq_handler[i].handler(i, ++ mc13783->irq_handler[i].data); ++ enable_irq(mc13783->irq); ++} ++ ++static irqreturn_t mc13783_interrupt(int irq, void *dev_id) ++{ ++ struct mc13783 *mc13783 = dev_id; ++ ++ disable_irq_nosync(irq); ++ ++ schedule_work(&mc13783->work); ++ return IRQ_HANDLED; ++} ++ ++/* set adc to ts interrupt mode, which generates touchscreen wakeup interrupt */ ++static inline void mc13783_adc_set_ts_irq_mode(struct mc13783 *mc13783) ++{ ++ unsigned int reg_adc0, reg_adc1; ++ ++ reg_adc0 = MC13783_ADC0_ADREFEN | MC13783_ADC0_ADREFMODE ++ | MC13783_ADC0_TSMOD0; ++ reg_adc1 = MC13783_ADC1_ADEN | MC13783_ADC1_ADTRIGIGN; ++ ++ mc13783_reg_write(mc13783, MC13783_REG_ADC_0, reg_adc0); ++ mc13783_reg_write(mc13783, MC13783_REG_ADC_1, reg_adc1); ++} ++ ++int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode, ++ unsigned int channel, unsigned int *sample) ++{ ++ unsigned int reg_adc0, reg_adc1; ++ int i; ++ ++ mutex_lock(&mc13783->adc_conv_lock); ++ ++ /* set up auto incrementing anyway to make quick read */ ++ reg_adc0 = MC13783_ADC0_ADINC1 | MC13783_ADC0_ADINC2; ++ /* enable the adc, ignore external triggering and set ASC to trigger ++ * conversion */ ++ reg_adc1 = MC13783_ADC1_ADEN | MC13783_ADC1_ADTRIGIGN ++ | MC13783_ADC1_ASC; ++ ++ /* setup channel number */ ++ if (channel > 7) ++ reg_adc1 |= MC13783_ADC1_ADSEL; ++ ++ switch (mode) { ++ case MC13783_ADC_MODE_TS: ++ /* enables touch screen reference mode and set touchscreen mode ++ * to position mode */ ++ reg_adc0 |= MC13783_ADC0_ADREFEN | MC13783_ADC0_ADREFMODE ++ | MC13783_ADC0_TSMOD0 | MC13783_ADC0_TSMOD1; ++ reg_adc1 |= 4 << MC13783_ADC1_CHAN1_SHIFT; ++ break; ++ case MC13783_ADC_MODE_SINGLE_CHAN: ++ reg_adc1 |= (channel & 0x7) << MC13783_ADC1_CHAN0_SHIFT; ++ reg_adc1 |= MC13783_ADC1_RAND; ++ break; ++ case MC13783_ADC_MODE_MULT_CHAN: ++ reg_adc1 |= 4 << MC13783_ADC1_CHAN1_SHIFT; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ mc13783_reg_write(mc13783, MC13783_REG_ADC_0, reg_adc0); ++ mc13783_reg_write(mc13783, MC13783_REG_ADC_1, reg_adc1); ++ ++ wait_for_completion_interruptible(&mc13783->adc_done); ++ ++ for (i = 0; i < 4; i++) ++ mc13783_reg_read(mc13783, MC13783_REG_ADC_2, &sample[i]); ++ ++ if (mc13783->ts_active) ++ mc13783_adc_set_ts_irq_mode(mc13783); ++ ++ mutex_unlock(&mc13783->adc_conv_lock); ++ ++ return 0; ++} ++EXPORT_SYMBOL_GPL(mc13783_adc_do_conversion); ++ ++void mc13783_adc_set_ts_status(struct mc13783 *mc13783, unsigned int status) ++{ ++ mc13783->ts_active = status; ++} ++EXPORT_SYMBOL_GPL(mc13783_adc_set_ts_status); ++ ++static int mc13783_check_revision(struct mc13783 *mc13783) ++{ ++ u32 rev_id, rev1, rev2, finid, icid; ++ ++ mc13783_read(mc13783, MC13783_REG_REVISION, &rev_id); ++ ++ rev1 = (rev_id & 0x018) >> 3; ++ rev2 = (rev_id & 0x007); ++ icid = (rev_id & 0x01C0) >> 6; ++ finid = (rev_id & 0x01E00) >> 9; ++ ++ /* Ver 0.2 is actually 3.2a. Report as 3.2 */ ++ if ((rev1 == 0) && (rev2 == 2)) ++ rev1 = 3; ++ ++ if (rev1 == 0 || icid != 2) { ++ dev_err(mc13783->dev, "No MC13783 detected.\n"); ++ return -ENODEV; ++ } ++ ++ mc13783->revision = ((rev1 * 10) + rev2); ++ dev_info(mc13783->dev, "MC13783 Rev %d.%d FinVer %x detected\n", rev1, ++ rev2, finid); ++ ++ return 0; ++} ++ ++/* ++ * Register a client device. This is non-fatal since there is no need to ++ * fail the entire device init due to a single platform device failing. ++ */ ++static void mc13783_client_dev_register(struct mc13783 *mc13783, ++ const char *name) ++{ ++ struct mfd_cell cell = {}; ++ ++ cell.name = name; ++ ++ mfd_add_devices(mc13783->dev, -1, &cell, 1, NULL, 0); ++} ++ ++static int __devinit mc13783_probe(struct spi_device *spi) ++{ ++ struct mc13783 *mc13783; ++ struct mc13783_platform_data *pdata = spi->dev.platform_data; ++ int ret; ++ ++ mc13783 = kzalloc(sizeof(struct mc13783), GFP_KERNEL); ++ if (!mc13783) ++ return -ENOMEM; ++ ++ dev_set_drvdata(&spi->dev, mc13783); ++ spi->mode = SPI_MODE_0 | SPI_CS_HIGH; ++ spi->bits_per_word = 32; ++ spi_setup(spi); ++ ++ mc13783->spi_device = spi; ++ mc13783->dev = &spi->dev; ++ mc13783->irq = spi->irq; ++ ++ INIT_WORK(&mc13783->work, mc13783_irq_work); ++ mutex_init(&mc13783->io_lock); ++ mutex_init(&mc13783->adc_conv_lock); ++ init_completion(&mc13783->adc_done); ++ ++ if (pdata) { ++ mc13783->flags = pdata->flags; ++ mc13783->regulators = pdata->regulators; ++ mc13783->num_regulators = pdata->num_regulators; ++ } ++ ++ if (mc13783_check_revision(mc13783)) { ++ ret = -ENODEV; ++ goto err_out; ++ } ++ ++ /* clear and mask all interrupts */ ++ mc13783_reg_write(mc13783, MC13783_REG_INTERRUPT_STATUS_0, 0x00ffffff); ++ mc13783_reg_write(mc13783, MC13783_REG_INTERRUPT_MASK_0, 0x00ffffff); ++ mc13783_reg_write(mc13783, MC13783_REG_INTERRUPT_STATUS_1, 0x00ffffff); ++ mc13783_reg_write(mc13783, MC13783_REG_INTERRUPT_MASK_1, 0x00ffffff); ++ ++ /* unmask adcdone interrupts */ ++ mc13783_set_bits(mc13783, MC13783_REG_INTERRUPT_MASK_0, ++ MC13783_INT_MASK_ADCDONEM, 0); ++ ++ ret = request_irq(mc13783->irq, mc13783_interrupt, ++ IRQF_DISABLED | IRQF_TRIGGER_HIGH, "mc13783", ++ mc13783); ++ if (ret) ++ goto err_out; ++ ++ if (mc13783->flags & MC13783_USE_CODEC) ++ mc13783_client_dev_register(mc13783, "mc13783-codec"); ++ if (mc13783->flags & MC13783_USE_ADC) ++ mc13783_client_dev_register(mc13783, "mc13783-adc"); ++ if (mc13783->flags & MC13783_USE_RTC) ++ mc13783_client_dev_register(mc13783, "mc13783-rtc"); ++ if (mc13783->flags & MC13783_USE_REGULATOR) ++ mc13783_client_dev_register(mc13783, "mc13783-regulator"); ++ if (mc13783->flags & MC13783_USE_TOUCHSCREEN) ++ mc13783_client_dev_register(mc13783, "mc13783-ts"); ++ ++ return 0; ++ ++err_out: ++ kfree(mc13783); ++ return ret; ++} ++ ++static int __devexit mc13783_remove(struct spi_device *spi) ++{ ++ struct mc13783 *mc13783; ++ ++ mc13783 = dev_get_drvdata(&spi->dev); ++ ++ free_irq(mc13783->irq, mc13783); ++ ++ mfd_remove_devices(&spi->dev); ++ ++ return 0; ++} ++ ++static struct spi_driver pmic_driver = { ++ .driver = { ++ .name = "mc13783", ++ .bus = &spi_bus_type, ++ .owner = THIS_MODULE, ++ }, ++ .probe = mc13783_probe, ++ .remove = __devexit_p(mc13783_remove), ++}; ++ ++static int __init pmic_init(void) ++{ ++ return spi_register_driver(&pmic_driver); ++} ++subsys_initcall(pmic_init); ++ ++static void __exit pmic_exit(void) ++{ ++ spi_unregister_driver(&pmic_driver); ++} ++module_exit(pmic_exit); ++ ++MODULE_DESCRIPTION("Core/Protocol driver for Freescale MC13783 PMIC"); ++MODULE_AUTHOR("Sascha Hauer "); ++MODULE_LICENSE("GPL"); ++ +diff --git a/include/linux/mfd/mc13783-private.h b/include/linux/mfd/mc13783-private.h +new file mode 100644 +index 0000000..47e698c +--- /dev/null ++++ b/include/linux/mfd/mc13783-private.h +@@ -0,0 +1,396 @@ ++/* ++ * Copyright 2009 Pengutronix, Sascha Hauer ++ * ++ * Initial development of this code was funded by ++ * Phytec Messtechnik GmbH, http://www.phytec.de ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#ifndef __LINUX_MFD_MC13783_PRIV_H ++#define __LINUX_MFD_MC13783_PRIV_H ++ ++#include ++#include ++#include ++#include ++ ++struct mc13783_irq { ++ void (*handler)(int, void *); ++ void *data; ++}; ++ ++#define MC13783_NUM_IRQ 2 ++#define MC13783_IRQ_TS 0 ++#define MC13783_IRQ_REGULATOR 1 ++ ++#define MC13783_ADC_MODE_TS 1 ++#define MC13783_ADC_MODE_SINGLE_CHAN 2 ++#define MC13783_ADC_MODE_MULT_CHAN 3 ++ ++struct mc13783 { ++ int revision; ++ struct device *dev; ++ struct spi_device *spi_device; ++ ++ int (*read_dev)(void *data, char reg, int count, u32 *dst); ++ int (*write_dev)(void *data, char reg, int count, const u32 *src); ++ ++ struct mutex io_lock; ++ void *io_data; ++ int irq; ++ unsigned int flags; ++ ++ struct mc13783_irq irq_handler[MC13783_NUM_IRQ]; ++ struct work_struct work; ++ struct completion adc_done; ++ unsigned int ts_active; ++ struct mutex adc_conv_lock; ++ ++ struct mc13783_regulator_init_data *regulators; ++ int num_regulators; ++}; ++ ++int mc13783_reg_read(struct mc13783 *, int reg_num, u32 *); ++int mc13783_reg_write(struct mc13783 *, int, u32); ++int mc13783_set_bits(struct mc13783 *, int, u32, u32); ++int mc13783_free_irq(struct mc13783 *mc13783, int irq); ++int mc13783_register_irq(struct mc13783 *mc13783, int irq, ++ void (*handler) (int, void *), void *data); ++ ++#define MC13783_REG_INTERRUPT_STATUS_0 0 ++#define MC13783_REG_INTERRUPT_MASK_0 1 ++#define MC13783_REG_INTERRUPT_SENSE_0 2 ++#define MC13783_REG_INTERRUPT_STATUS_1 3 ++#define MC13783_REG_INTERRUPT_MASK_1 4 ++#define MC13783_REG_INTERRUPT_SENSE_1 5 ++#define MC13783_REG_POWER_UP_MODE_SENSE 6 ++#define MC13783_REG_REVISION 7 ++#define MC13783_REG_SEMAPHORE 8 ++#define MC13783_REG_ARBITRATION_PERIPHERAL_AUDIO 9 ++#define MC13783_REG_ARBITRATION_SWITCHERS 10 ++#define MC13783_REG_ARBITRATION_REGULATORS_0 11 ++#define MC13783_REG_ARBITRATION_REGULATORS_1 12 ++#define MC13783_REG_POWER_CONTROL_0 13 ++#define MC13783_REG_POWER_CONTROL_1 14 ++#define MC13783_REG_POWER_CONTROL_2 15 ++#define MC13783_REG_REGEN_ASSIGNMENT 16 ++#define MC13783_REG_CONTROL_SPARE 17 ++#define MC13783_REG_MEMORY_A 18 ++#define MC13783_REG_MEMORY_B 19 ++#define MC13783_REG_RTC_TIME 20 ++#define MC13783_REG_RTC_ALARM 21 ++#define MC13783_REG_RTC_DAY 22 ++#define MC13783_REG_RTC_DAY_ALARM 23 ++#define MC13783_REG_SWITCHERS_0 24 ++#define MC13783_REG_SWITCHERS_1 25 ++#define MC13783_REG_SWITCHERS_2 26 ++#define MC13783_REG_SWITCHERS_3 27 ++#define MC13783_REG_SWITCHERS_4 28 ++#define MC13783_REG_SWITCHERS_5 29 ++#define MC13783_REG_REGULATOR_SETTING_0 30 ++#define MC13783_REG_REGULATOR_SETTING_1 31 ++#define MC13783_REG_REGULATOR_MODE_0 32 ++#define MC13783_REG_REGULATOR_MODE_1 33 ++#define MC13783_REG_POWER_MISCELLANEOUS 34 ++#define MC13783_REG_POWER_SPARE 35 ++#define MC13783_REG_AUDIO_RX_0 36 ++#define MC13783_REG_AUDIO_RX_1 37 ++#define MC13783_REG_AUDIO_TX 38 ++#define MC13783_REG_AUDIO_SSI_NETWORK 39 ++#define MC13783_REG_AUDIO_CODEC 40 ++#define MC13783_REG_AUDIO_STEREO_DAC 41 ++#define MC13783_REG_AUDIO_SPARE 42 ++#define MC13783_REG_ADC_0 43 ++#define MC13783_REG_ADC_1 44 ++#define MC13783_REG_ADC_2 45 ++#define MC13783_REG_ADC_3 46 ++#define MC13783_REG_ADC_4 47 ++#define MC13783_REG_CHARGER 48 ++#define MC13783_REG_USB 49 ++#define MC13783_REG_CHARGE_USB_SPARE 50 ++#define MC13783_REG_LED_CONTROL_0 51 ++#define MC13783_REG_LED_CONTROL_1 52 ++#define MC13783_REG_LED_CONTROL_2 53 ++#define MC13783_REG_LED_CONTROL_3 54 ++#define MC13783_REG_LED_CONTROL_4 55 ++#define MC13783_REG_LED_CONTROL_5 56 ++#define MC13783_REG_SPARE 57 ++#define MC13783_REG_TRIM_0 58 ++#define MC13783_REG_TRIM_1 59 ++#define MC13783_REG_TEST_0 60 ++#define MC13783_REG_TEST_1 61 ++#define MC13783_REG_TEST_2 62 ++#define MC13783_REG_TEST_3 63 ++#define MC13783_REG_NB 64 ++ ++ ++/* ++ * Interrupt Status ++ */ ++#define MC13783_INT_STAT_ADCDONEI (1 << 0) ++#define MC13783_INT_STAT_ADCBISDONEI (1 << 1) ++#define MC13783_INT_STAT_TSI (1 << 2) ++#define MC13783_INT_STAT_WHIGHI (1 << 3) ++#define MC13783_INT_STAT_WLOWI (1 << 4) ++#define MC13783_INT_STAT_CHGDETI (1 << 6) ++#define MC13783_INT_STAT_CHGOVI (1 << 7) ++#define MC13783_INT_STAT_CHGREVI (1 << 8) ++#define MC13783_INT_STAT_CHGSHORTI (1 << 9) ++#define MC13783_INT_STAT_CCCVI (1 << 10) ++#define MC13783_INT_STAT_CHGCURRI (1 << 11) ++#define MC13783_INT_STAT_BPONI (1 << 12) ++#define MC13783_INT_STAT_LOBATLI (1 << 13) ++#define MC13783_INT_STAT_LOBATHI (1 << 14) ++#define MC13783_INT_STAT_UDPI (1 << 15) ++#define MC13783_INT_STAT_USBI (1 << 16) ++#define MC13783_INT_STAT_IDI (1 << 19) ++#define MC13783_INT_STAT_Unused (1 << 20) ++#define MC13783_INT_STAT_SE1I (1 << 21) ++#define MC13783_INT_STAT_CKDETI (1 << 22) ++#define MC13783_INT_STAT_UDMI (1 << 23) ++ ++/* ++ * Interrupt Mask ++ */ ++#define MC13783_INT_MASK_ADCDONEM (1 << 0) ++#define MC13783_INT_MASK_ADCBISDONEM (1 << 1) ++#define MC13783_INT_MASK_TSM (1 << 2) ++#define MC13783_INT_MASK_WHIGHM (1 << 3) ++#define MC13783_INT_MASK_WLOWM (1 << 4) ++#define MC13783_INT_MASK_CHGDETM (1 << 6) ++#define MC13783_INT_MASK_CHGOVM (1 << 7) ++#define MC13783_INT_MASK_CHGREVM (1 << 8) ++#define MC13783_INT_MASK_CHGSHORTM (1 << 9) ++#define MC13783_INT_MASK_CCCVM (1 << 10) ++#define MC13783_INT_MASK_CHGCURRM (1 << 11) ++#define MC13783_INT_MASK_BPONM (1 << 12) ++#define MC13783_INT_MASK_LOBATLM (1 << 13) ++#define MC13783_INT_MASK_LOBATHM (1 << 14) ++#define MC13783_INT_MASK_UDPM (1 << 15) ++#define MC13783_INT_MASK_USBM (1 << 16) ++#define MC13783_INT_MASK_IDM (1 << 19) ++#define MC13783_INT_MASK_SE1M (1 << 21) ++#define MC13783_INT_MASK_CKDETM (1 << 22) ++ ++/* ++ * Reg Regulator Mode 0 ++ */ ++#define MC13783_REGCTRL_VAUDIO_EN (1 << 0) ++#define MC13783_REGCTRL_VAUDIO_STBY (1 << 1) ++#define MC13783_REGCTRL_VAUDIO_MODE (1 << 2) ++#define MC13783_REGCTRL_VIOHI_EN (1 << 3) ++#define MC13783_REGCTRL_VIOHI_STBY (1 << 4) ++#define MC13783_REGCTRL_VIOHI_MODE (1 << 5) ++#define MC13783_REGCTRL_VIOLO_EN (1 << 6) ++#define MC13783_REGCTRL_VIOLO_STBY (1 << 7) ++#define MC13783_REGCTRL_VIOLO_MODE (1 << 8) ++#define MC13783_REGCTRL_VDIG_EN (1 << 9) ++#define MC13783_REGCTRL_VDIG_STBY (1 << 10) ++#define MC13783_REGCTRL_VDIG_MODE (1 << 11) ++#define MC13783_REGCTRL_VGEN_EN (1 << 12) ++#define MC13783_REGCTRL_VGEN_STBY (1 << 13) ++#define MC13783_REGCTRL_VGEN_MODE (1 << 14) ++#define MC13783_REGCTRL_VRFDIG_EN (1 << 15) ++#define MC13783_REGCTRL_VRFDIG_STBY (1 << 16) ++#define MC13783_REGCTRL_VRFDIG_MODE (1 << 17) ++#define MC13783_REGCTRL_VRFREF_EN (1 << 18) ++#define MC13783_REGCTRL_VRFREF_STBY (1 << 19) ++#define MC13783_REGCTRL_VRFREF_MODE (1 << 20) ++#define MC13783_REGCTRL_VRFCP_EN (1 << 21) ++#define MC13783_REGCTRL_VRFCP_STBY (1 << 22) ++#define MC13783_REGCTRL_VRFCP_MODE (1 << 23) ++ ++/* ++ * Reg Regulator Mode 1 ++ */ ++#define MC13783_REGCTRL_VSIM_EN (1 << 0) ++#define MC13783_REGCTRL_VSIM_STBY (1 << 1) ++#define MC13783_REGCTRL_VSIM_MODE (1 << 2) ++#define MC13783_REGCTRL_VESIM_EN (1 << 3) ++#define MC13783_REGCTRL_VESIM_STBY (1 << 4) ++#define MC13783_REGCTRL_VESIM_MODE (1 << 5) ++#define MC13783_REGCTRL_VCAM_EN (1 << 6) ++#define MC13783_REGCTRL_VCAM_STBY (1 << 7) ++#define MC13783_REGCTRL_VCAM_MODE (1 << 8) ++#define MC13783_REGCTRL_VRFBG_EN (1 << 9) ++#define MC13783_REGCTRL_VRFBG_STBY (1 << 10) ++#define MC13783_REGCTRL_VVIB_EN (1 << 11) ++#define MC13783_REGCTRL_VRF1_EN (1 << 12) ++#define MC13783_REGCTRL_VRF1_STBY (1 << 13) ++#define MC13783_REGCTRL_VRF1_MODE (1 << 14) ++#define MC13783_REGCTRL_VRF2_EN (1 << 15) ++#define MC13783_REGCTRL_VRF2_STBY (1 << 16) ++#define MC13783_REGCTRL_VRF2_MODE (1 << 17) ++#define MC13783_REGCTRL_VMMC1_EN (1 << 18) ++#define MC13783_REGCTRL_VMMC1_STBY (1 << 19) ++#define MC13783_REGCTRL_VMMC1_MODE (1 << 20) ++#define MC13783_REGCTRL_VMMC2_EN (1 << 21) ++#define MC13783_REGCTRL_VMMC2_STBY (1 << 22) ++#define MC13783_REGCTRL_VMMC2_MODE (1 << 23) ++ ++/* ++ * Reg Regulator Misc. ++ */ ++#define MC13783_REGCTRL_GPO1_EN (1 << 6) ++#define MC13783_REGCTRL_GPO2_EN (1 << 8) ++#define MC13783_REGCTRL_GPO3_EN (1 << 10) ++#define MC13783_REGCTRL_GPO4_EN (1 << 12) ++#define MC13783_REGCTRL_VIBPINCTRL (1 << 14) ++ ++/* ++ * Reg Switcher 4 ++ */ ++#define MC13783_SWCTRL_SW1A_MODE (1 << 0) ++#define MC13783_SWCTRL_SW1A_STBY_MODE (1 << 2) ++#define MC13783_SWCTRL_SW1A_DVS_SPEED (1 << 6) ++#define MC13783_SWCTRL_SW1A_PANIC_MODE (1 << 8) ++#define MC13783_SWCTRL_SW1A_SOFTSTART (1 << 9) ++#define MC13783_SWCTRL_SW1B_MODE (1 << 10) ++#define MC13783_SWCTRL_SW1B_STBY_MODE (1 << 12) ++#define MC13783_SWCTRL_SW1B_DVS_SPEED (1 << 14) ++#define MC13783_SWCTRL_SW1B_PANIC_MODE (1 << 16) ++#define MC13783_SWCTRL_SW1B_SOFTSTART (1 << 17) ++#define MC13783_SWCTRL_PLL_EN (1 << 18) ++#define MC13783_SWCTRL_PLL_FACTOR (1 << 19) ++ ++/* ++ * Reg Switcher 5 ++ */ ++#define MC13783_SWCTRL_SW2A_MODE (1 << 0) ++#define MC13783_SWCTRL_SW2A_STBY_MODE (1 << 2) ++#define MC13783_SWCTRL_SW2A_DVS_SPEED (1 << 6) ++#define MC13783_SWCTRL_SW2A_PANIC_MODE (1 << 8) ++#define MC13783_SWCTRL_SW2A_SOFTSTART (1 << 9) ++#define MC13783_SWCTRL_SW2B_MODE (1 << 10) ++#define MC13783_SWCTRL_SW2B_STBY_MODE (1 << 12) ++#define MC13783_SWCTRL_SW2B_DVS_SPEED (1 << 14) ++#define MC13783_SWCTRL_SW2B_PANIC_MODE (1 << 16) ++#define MC13783_SWCTRL_SW2B_SOFTSTART (1 << 17) ++#define MC13783_SWSET_SW3 (1 << 18) ++#define MC13783_SWCTRL_SW3_EN (1 << 20) ++#define MC13783_SWCTRL_SW3_STBY (1 << 21) ++#define MC13783_SWCTRL_SW3_MODE (1 << 22) ++ ++/* ++ * ADC/Touch ++ */ ++#define MC13783_ADC0_LICELLCON (1 << 0) ++#define MC13783_ADC0_CHRGICON (1 << 1) ++#define MC13783_ADC0_BATICON (1 << 2) ++#define MC13783_ADC0_RTHEN (1 << 3) ++#define MC13783_ADC0_DTHEN (1 << 4) ++#define MC13783_ADC0_UIDEN (1 << 5) ++#define MC13783_ADC0_ADOUTEN (1 << 6) ++#define MC13783_ADC0_ADOUTPER (1 << 7) ++#define MC13783_ADC0_ADREFEN (1 << 10) ++#define MC13783_ADC0_ADREFMODE (1 << 11) ++#define MC13783_ADC0_TSMOD0 (1 << 12) ++#define MC13783_ADC0_TSMOD1 (1 << 13) ++#define MC13783_ADC0_TSMOD2 (1 << 14) ++#define MC13783_ADC0_CHRGRAWDIV (1 << 15) ++#define MC13783_ADC0_ADINC1 (1 << 16) ++#define MC13783_ADC0_ADINC2 (1 << 17) ++#define MC13783_ADC0_WCOMP (1 << 18) ++#define MC13783_ADC0_ADCBIS0 (1 << 23) ++ ++#define MC13783_ADC1_ADEN (1 << 0) ++#define MC13783_ADC1_RAND (1 << 1) ++#define MC13783_ADC1_ADSEL (1 << 3) ++#define MC13783_ADC1_TRIGMASK (1 << 4) ++#define MC13783_ADC1_ADA10 (1 << 5) ++#define MC13783_ADC1_ADA11 (1 << 6) ++#define MC13783_ADC1_ADA12 (1 << 7) ++#define MC13783_ADC1_ADA20 (1 << 8) ++#define MC13783_ADC1_ADA21 (1 << 9) ++#define MC13783_ADC1_ADA22 (1 << 10) ++#define MC13783_ADC1_ATO0 (1 << 11) ++#define MC13783_ADC1_ATO1 (1 << 12) ++#define MC13783_ADC1_ATO2 (1 << 13) ++#define MC13783_ADC1_ATO3 (1 << 14) ++#define MC13783_ADC1_ATO4 (1 << 15) ++#define MC13783_ADC1_ATO5 (1 << 16) ++#define MC13783_ADC1_ATO6 (1 << 17) ++#define MC13783_ADC1_ATO7 (1 << 18) ++#define MC13783_ADC1_ATOX (1 << 19) ++#define MC13783_ADC1_ASC (1 << 20) ++#define MC13783_ADC1_ADTRIGIGN (1 << 21) ++#define MC13783_ADC1_ADONESHOT (1 << 22) ++#define MC13783_ADC1_ADCBIS1 (1 << 23) ++ ++#define MC13783_ADC1_CHAN0_SHIFT 5 ++#define MC13783_ADC1_CHAN1_SHIFT 8 ++ ++#define MC13783_ADC2_ADD10 (1 << 2) ++#define MC13783_ADC2_ADD11 (1 << 3) ++#define MC13783_ADC2_ADD12 (1 << 4) ++#define MC13783_ADC2_ADD13 (1 << 5) ++#define MC13783_ADC2_ADD14 (1 << 6) ++#define MC13783_ADC2_ADD15 (1 << 7) ++#define MC13783_ADC2_ADD16 (1 << 8) ++#define MC13783_ADC2_ADD17 (1 << 9) ++#define MC13783_ADC2_ADD18 (1 << 10) ++#define MC13783_ADC2_ADD19 (1 << 11) ++#define MC13783_ADC2_ADD20 (1 << 14) ++#define MC13783_ADC2_ADD21 (1 << 15) ++#define MC13783_ADC2_ADD22 (1 << 16) ++#define MC13783_ADC2_ADD23 (1 << 17) ++#define MC13783_ADC2_ADD24 (1 << 18) ++#define MC13783_ADC2_ADD25 (1 << 19) ++#define MC13783_ADC2_ADD26 (1 << 20) ++#define MC13783_ADC2_ADD27 (1 << 21) ++#define MC13783_ADC2_ADD28 (1 << 22) ++#define MC13783_ADC2_ADD29 (1 << 23) ++ ++#define MC13783_ADC3_WHIGH0 (1 << 0) ++#define MC13783_ADC3_WHIGH1 (1 << 1) ++#define MC13783_ADC3_WHIGH2 (1 << 2) ++#define MC13783_ADC3_WHIGH3 (1 << 3) ++#define MC13783_ADC3_WHIGH4 (1 << 4) ++#define MC13783_ADC3_WHIGH5 (1 << 5) ++#define MC13783_ADC3_ICID0 (1 << 6) ++#define MC13783_ADC3_ICID1 (1 << 7) ++#define MC13783_ADC3_ICID2 (1 << 8) ++#define MC13783_ADC3_WLOW0 (1 << 9) ++#define MC13783_ADC3_WLOW1 (1 << 10) ++#define MC13783_ADC3_WLOW2 (1 << 11) ++#define MC13783_ADC3_WLOW3 (1 << 12) ++#define MC13783_ADC3_WLOW4 (1 << 13) ++#define MC13783_ADC3_WLOW5 (1 << 14) ++#define MC13783_ADC3_ADCBIS2 (1 << 23) ++ ++#define MC13783_ADC4_ADDBIS10 (1 << 2) ++#define MC13783_ADC4_ADDBIS11 (1 << 3) ++#define MC13783_ADC4_ADDBIS12 (1 << 4) ++#define MC13783_ADC4_ADDBIS13 (1 << 5) ++#define MC13783_ADC4_ADDBIS14 (1 << 6) ++#define MC13783_ADC4_ADDBIS15 (1 << 7) ++#define MC13783_ADC4_ADDBIS16 (1 << 8) ++#define MC13783_ADC4_ADDBIS17 (1 << 9) ++#define MC13783_ADC4_ADDBIS18 (1 << 10) ++#define MC13783_ADC4_ADDBIS19 (1 << 11) ++#define MC13783_ADC4_ADDBIS20 (1 << 14) ++#define MC13783_ADC4_ADDBIS21 (1 << 15) ++#define MC13783_ADC4_ADDBIS22 (1 << 16) ++#define MC13783_ADC4_ADDBIS23 (1 << 17) ++#define MC13783_ADC4_ADDBIS24 (1 << 18) ++#define MC13783_ADC4_ADDBIS25 (1 << 19) ++#define MC13783_ADC4_ADDBIS26 (1 << 20) ++#define MC13783_ADC4_ADDBIS27 (1 << 21) ++#define MC13783_ADC4_ADDBIS28 (1 << 22) ++#define MC13783_ADC4_ADDBIS29 (1 << 23) ++ ++#endif /* __LINUX_MFD_MC13783_PRIV_H */ ++ +diff --git a/include/linux/mfd/mc13783.h b/include/linux/mfd/mc13783.h +new file mode 100644 +index 0000000..b3a2a72 +--- /dev/null ++++ b/include/linux/mfd/mc13783.h +@@ -0,0 +1,84 @@ ++/* ++ * Copyright 2009 Pengutronix, Sascha Hauer ++ * ++ * Initial development of this code was funded by ++ * Phytec Messtechnik GmbH, http://www.phytec.de ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#ifndef __INCLUDE_LINUX_MFD_MC13783_H ++#define __INCLUDE_LINUX_MFD_MC13783_H ++ ++struct mc13783; ++struct regulator_init_data; ++ ++struct mc13783_regulator_init_data { ++ int id; ++ struct regulator_init_data *init_data; ++}; ++ ++struct mc13783_platform_data { ++ struct mc13783_regulator_init_data *regulators; ++ int num_regulators; ++ unsigned int flags; ++}; ++ ++/* mc13783_platform_data flags */ ++#define MC13783_USE_TOUCHSCREEN (1 << 0) ++#define MC13783_USE_CODEC (1 << 1) ++#define MC13783_USE_ADC (1 << 2) ++#define MC13783_USE_RTC (1 << 3) ++#define MC13783_USE_REGULATOR (1 << 4) ++ ++int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode, ++ unsigned int channel, unsigned int *sample); ++ ++void mc13783_adc_set_ts_status(struct mc13783 *mc13783, unsigned int status); ++ ++#define MC13783_SW_SW1A 0 ++#define MC13783_SW_SW1B 1 ++#define MC13783_SW_SW2A 2 ++#define MC13783_SW_SW2B 3 ++#define MC13783_SW_SW3 4 ++#define MC13783_SW_PLL 5 ++#define MC13783_REGU_VAUDIO 6 ++#define MC13783_REGU_VIOHI 7 ++#define MC13783_REGU_VIOLO 8 ++#define MC13783_REGU_VDIG 9 ++#define MC13783_REGU_VGEN 10 ++#define MC13783_REGU_VRFDIG 11 ++#define MC13783_REGU_VRFREF 12 ++#define MC13783_REGU_VRFCP 13 ++#define MC13783_REGU_VSIM 14 ++#define MC13783_REGU_VESIM 15 ++#define MC13783_REGU_VCAM 16 ++#define MC13783_REGU_VRFBG 17 ++#define MC13783_REGU_VVIB 18 ++#define MC13783_REGU_VRF1 19 ++#define MC13783_REGU_VRF2 20 ++#define MC13783_REGU_VMMC1 21 ++#define MC13783_REGU_VMMC2 22 ++#define MC13783_REGU_GPO1 23 ++#define MC13783_REGU_GPO2 24 ++#define MC13783_REGU_GPO3 25 ++#define MC13783_REGU_GPO4 26 ++#define MC13783_REGU_V1 27 ++#define MC13783_REGU_V2 28 ++#define MC13783_REGU_V3 29 ++#define MC13783_REGU_V4 30 ++ ++#endif /* __INCLUDE_LINUX_MFD_MC13783_H */ ++ +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0002-mxc_nand-cleanup-eccoob-descriptions.patch b/recipes/linux/linux-2.6.31/pcm043/0002-mxc_nand-cleanup-eccoob-descriptions.patch new file mode 100644 index 0000000000..f8258ac2b1 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0002-mxc_nand-cleanup-eccoob-descriptions.patch @@ -0,0 +1,111 @@ +From 6092478fe41d7b58212bc20808dd94ce6170f35b Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Wed, 21 Oct 2009 10:22:01 +0200 +Subject: [PATCH] mxc_nand: cleanup eccoob descriptions + +The original Freescale driver used to have eccoob descriptions like +this: + +static struct nand_ecclayout nand_hw_eccoob_8 = { + .eccbytes = 5, + .eccpos = {6, 7, 8, 9, 10}, + .oobfree = {{0, 5}, {11, 5}} +}; + +static struct nand_ecclayout nand_hw_eccoob_16 = { + .eccbytes = 5, + .eccpos = {6, 7, 8, 9, 10}, + .oobfree = {{0, 6}, {12, 4}} +}; + +The former was used for 8bit flashes and the latter for 16bit flashes. +They honored the fact that the bad block marker on 8bit flashes is on byte 5 +while on 16bit flashes it is on byte 11. +In the Kernel driver this was copied wrong and we ended up with two identical +descriptions. + +Change it so that we have only one description which leaves byte 5 and byte +11 unspecified so that it won't be used by others. + +Also, rename the descriptions to nand_hw_eccoob_smallpage and +nand_hw_eccoob_largepage so that it can't be confused with Nand chip bus +widths (what actually happened in this driver) + +Signed-off-by: Sascha Hauer +--- + drivers/mtd/nand/mxc_nand.c | 24 +++++++++--------------- + 1 files changed, 9 insertions(+), 15 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c +index 76beea4..7a34679 100644 +--- a/drivers/mtd/nand/mxc_nand.c ++++ b/drivers/mtd/nand/mxc_nand.c +@@ -129,19 +129,13 @@ struct mxc_nand_host { + #define SPARE_SINGLEBIT_ERROR 0x1 + + /* OOB placement block for use with hardware ecc generation */ +-static struct nand_ecclayout nand_hw_eccoob_8 = { ++static struct nand_ecclayout nand_hw_eccoob_smallpage = { + .eccbytes = 5, + .eccpos = {6, 7, 8, 9, 10}, +- .oobfree = {{0, 5}, {11, 5}, } ++ .oobfree = {{0, 5}, {12, 4}, } + }; + +-static struct nand_ecclayout nand_hw_eccoob_16 = { +- .eccbytes = 5, +- .eccpos = {6, 7, 8, 9, 10}, +- .oobfree = {{0, 5}, {11, 5}, } +-}; +- +-static struct nand_ecclayout nand_hw_eccoob_64 = { ++static struct nand_ecclayout nand_hw_eccoob_largepage = { + .eccbytes = 20, + .eccpos = {6, 7, 8, 9, 10, 22, 23, 24, 25, 26, + 38, 39, 40, 41, 42, 54, 55, 56, 57, 58}, +@@ -940,7 +934,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) + } else { + this->ecc.size = 512; + this->ecc.bytes = 3; +- this->ecc.layout = &nand_hw_eccoob_8; ++ this->ecc.layout = &nand_hw_eccoob_smallpage; + this->ecc.mode = NAND_ECC_SOFT; + tmp = readw(host->regs + NFC_CONFIG1); + tmp &= ~NFC_ECC_EN; +@@ -964,7 +958,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) + /* NAND bus width determines access funtions used by upper layer */ + if (pdata->width == 2) { + this->options |= NAND_BUSWIDTH_16; +- this->ecc.layout = &nand_hw_eccoob_16; ++ this->ecc.layout = &nand_hw_eccoob_smallpage; + } + + /* first scan to find the device and get the page size */ +@@ -978,20 +972,20 @@ static int __init mxcnd_probe(struct platform_device *pdev) + if (this->ecc.mode == NAND_ECC_HW) { + switch (mtd->oobsize) { + case 8: +- this->ecc.layout = &nand_hw_eccoob_8; ++ this->ecc.layout = &nand_hw_eccoob_smallpage; + break; + case 16: +- this->ecc.layout = &nand_hw_eccoob_16; ++ this->ecc.layout = &nand_hw_eccoob_smallpage; + break; + case 64: +- this->ecc.layout = &nand_hw_eccoob_64; ++ this->ecc.layout = &nand_hw_eccoob_largepage; + break; + default: + /* page size not handled by HW ECC */ + /* switching back to soft ECC */ + this->ecc.size = 512; + this->ecc.bytes = 3; +- this->ecc.layout = &nand_hw_eccoob_8; ++ this->ecc.layout = &nand_hw_eccoob_smallpage; + this->ecc.mode = NAND_ECC_SOFT; + this->ecc.calculate = NULL; + this->ecc.correct = NULL; +-- +1.6.0.4 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0003-MXC-NFC-Add-a-real-NAND-flash-data-width-setup-func.patch b/recipes/linux/linux-2.6.31/pcm043/0003-MXC-NFC-Add-a-real-NAND-flash-data-width-setup-func.patch new file mode 100644 index 0000000000..5a526fa865 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0003-MXC-NFC-Add-a-real-NAND-flash-data-width-setup-func.patch @@ -0,0 +1,51 @@ +From e31e8120d5552c200785a6e2f1958d7f7643a675 Mon Sep 17 00:00:00 2001 +From: Juergen Beisert +Date: Tue, 29 Sep 2009 14:55:47 +0200 +Subject: [PATCH 03/15] MXC NFC: Add a real NAND flash data width setup function + +Provide a real subfunction to setup the NAND flash data width. + +Signed-off-by: Juergen Beisert +--- + drivers/mtd/nand/mxc_nand_v2.c | 15 ++++++++++++--- + 1 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand_v2.c b/drivers/mtd/nand/mxc_nand_v2.c +index 3483e7d..03d1ba4 100644 +--- a/drivers/mtd/nand/mxc_nand_v2.c ++++ b/drivers/mtd/nand/mxc_nand_v2.c +@@ -830,6 +830,14 @@ static void unlock_addr(struct mxc_nand_host *host, unsigned int start_addr, uns + BUG(); + } + ++static void __init mxc_data_width(struct mxc_nand_host *host, unsigned width) ++{ ++ if ((width != 8) && (width != 16)) { ++ BUG(); ++ } ++ /* TODO */ ++} ++ + static int __init mxcnd_probe(struct platform_device *pdev) + { + struct nand_chip *this; +@@ -898,12 +906,13 @@ static int __init mxcnd_probe(struct platform_device *pdev) + } else + BUG(); + +- /* NAND bus width determines access funtions used by upper layer */ ++ /* NAND bus width determines access functions used by upper layer */ + if (pdata->width == 2) { + this->read_byte = mxc_nand_read_byte16; + this->options |= NAND_BUSWIDTH_16; +- mxc_set_nfms(mtd, 1 << NFMS_NF_DWIDTH); +- } ++ mxc_data_width(host, 16); ++ } else ++ mxc_data_width(host, 8); + + init_waitqueue_head(&host->irq_waitq); + +-- +1.6.1 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0003-mx3-Add-SSI-pins-to-iomux-table.patch b/recipes/linux/linux-2.6.31/pcm043/0003-mx3-Add-SSI-pins-to-iomux-table.patch new file mode 100644 index 0000000000..c1e9ab0c1d --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0003-mx3-Add-SSI-pins-to-iomux-table.patch @@ -0,0 +1,48 @@ +From f1f19d863e177c09ca93ee960aa615701649dc9b Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 12 Nov 2009 14:02:22 +0100 +Subject: [PATCH 03/28] mx3: Add SSI pins to iomux table + +Signed-off-by: Sascha Hauer +--- + arch/arm/plat-mxc/include/mach/iomux-mx3.h | 24 ++++++++++++++++++++++++ + 1 files changed, 24 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx3.h b/arch/arm/plat-mxc/include/mach/iomux-mx3.h +index 2eb182f..0fb1ad5 100644 +--- a/arch/arm/plat-mxc/include/mach/iomux-mx3.h ++++ b/arch/arm/plat-mxc/include/mach/iomux-mx3.h +@@ -669,6 +669,30 @@ enum iomux_pins { + #define MX31_PIN_GPIO3_0__GPIO3_0 IOMUX_MODE(MX31_PIN_GPIO3_0, IOMUX_CONFIG_GPIO) + #define MX31_PIN_GPIO3_1__GPIO3_1 IOMUX_MODE(MX31_PIN_GPIO3_1, IOMUX_CONFIG_GPIO) + #define MX31_PIN_TXD2__GPIO1_28 IOMUX_MODE(MX31_PIN_TXD2, IOMUX_CONFIG_GPIO) ++#define MX31_PIN_GPIO1_0__GPIO1_0 IOMUX_MODE(MX31_PIN_GPIO1_0, IOMUX_CONFIG_GPIO) ++#define MX31_PIN_SVEN0__GPIO2_0 IOMUX_MODE(MX31_PIN_SVEN0, IOMUX_CONFIG_GPIO) ++#define MX31_PIN_STX0__GPIO2_1 IOMUX_MODE(MX31_PIN_STX0, IOMUX_CONFIG_GPIO) ++#define MX31_PIN_SRX0__GPIO2_2 IOMUX_MODE(MX31_PIN_SRX0, IOMUX_CONFIG_GPIO) ++#define MX31_PIN_SIMPD0__GPIO2_3 IOMUX_MODE(MX31_PIN_SIMPD0, IOMUX_CONFIG_GPIO) ++#define MX31_PIN_DTR_DCE1__GPIO2_8 IOMUX_MODE(MX31_PIN_DTR_DCE1, IOMUX_CONFIG_GPIO) ++#define MX31_PIN_DSR_DCE1__GPIO2_9 IOMUX_MODE(MX31_PIN_DSR_DCE1, IOMUX_CONFIG_GPIO) ++#define MX31_PIN_RI_DCE1__GPIO2_10 IOMUX_MODE(MX31_PIN_RI_DCE1, IOMUX_CONFIG_GPIO) ++#define MX31_PIN_DCD_DCE1__GPIO2_11 IOMUX_MODE(MX31_PIN_DCD_DCE1, IOMUX_CONFIG_GPIO) ++#define MX31_PIN_STXD5__GPIO1_21 IOMUX_MODE(MX31_PIN_STXD5, IOMUX_CONFIG_GPIO) ++#define MX31_PIN_SRXD5__GPIO1_22 IOMUX_MODE(MX31_PIN_SRXD5, IOMUX_CONFIG_GPIO) ++#define MX31_PIN_GPIO1_3__GPIO1_3 IOMUX_MODE(MX31_PIN_GPIO1_3, IOMUX_CONFIG_GPIO) ++#define MX31_PIN_CSPI2_SS1__CSPI3_SS1 IOMUX_MODE(MX31_PIN_CSPI2_SS1, IOMUX_CONFIG_ALT1) ++#define MX31_PIN_RTS1__GPIO2_6 IOMUX_MODE(MX31_PIN_RTS1, IOMUX_CONFIG_GPIO) ++#define MX31_PIN_CTS1__GPIO2_7 IOMUX_MODE(MX31_PIN_CTS1, IOMUX_CONFIG_GPIO) ++#define MX31_PIN_LCS0__GPIO3_23 IOMUX_MODE(MX31_PIN_LCS0, IOMUX_CONFIG_GPIO) ++#define MX31_PIN_STXD4__STXD4 IOMUX_MODE(MX31_PIN_STXD4, IOMUX_CONFIG_FUNC) ++#define MX31_PIN_SRXD4__SRXD4 IOMUX_MODE(MX31_PIN_SRXD4, IOMUX_CONFIG_FUNC) ++#define MX31_PIN_SCK4__SCK4 IOMUX_MODE(MX31_PIN_SCK4, IOMUX_CONFIG_FUNC) ++#define MX31_PIN_SFS4__SFS4 IOMUX_MODE(MX31_PIN_SFS4, IOMUX_CONFIG_FUNC) ++#define MX31_PIN_STXD5__STXD5 IOMUX_MODE(MX31_PIN_STXD5, IOMUX_CONFIG_FUNC) ++#define MX31_PIN_SRXD5__SRXD5 IOMUX_MODE(MX31_PIN_SRXD5, IOMUX_CONFIG_FUNC) ++#define MX31_PIN_SCK5__SCK5 IOMUX_MODE(MX31_PIN_SCK5, IOMUX_CONFIG_FUNC) ++#define MX31_PIN_SFS5__SFS5 IOMUX_MODE(MX31_PIN_SFS5, IOMUX_CONFIG_FUNC) + + /*XXX: The SS0, SS1, SS2, SS3 lines of spi3 are multiplexed by cspi2_ss0, cspi2_ss1, cspi1_ss0 + * cspi1_ss1*/ +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0003-mxc_nand-cleanup-initialization.patch b/recipes/linux/linux-2.6.31/pcm043/0003-mxc_nand-cleanup-initialization.patch new file mode 100644 index 0000000000..f437724622 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0003-mxc_nand-cleanup-initialization.patch @@ -0,0 +1,124 @@ +From 4521787dcf7e16910e5a0e0ac817283b14e5f11b Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Wed, 21 Oct 2009 10:39:05 +0200 +Subject: [PATCH] mxc_nand: cleanup initialization + +The oob layout was initialized several times. Instead, use +a smallpage layout by default and switch to a largepage +afterwards if necessary. + +Signed-off-by: Sascha Hauer +--- + drivers/mtd/nand/mxc_nand.c | 72 +++++++++++++----------------------------- + 1 files changed, 22 insertions(+), 50 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c +index 7a34679..b28e5f9 100644 +--- a/drivers/mtd/nand/mxc_nand.c ++++ b/drivers/mtd/nand/mxc_nand.c +@@ -921,45 +921,42 @@ static int __init mxcnd_probe(struct platform_device *pdev) + if (err) + goto eirq; + ++ /* Reset NAND */ ++ this->cmdfunc(mtd, NAND_CMD_RESET, -1, -1); ++ ++ /* preset operation */ ++ /* Unlock the internal RAM Buffer */ ++ writew(0x2, host->regs + NFC_CONFIG); ++ ++ /* Blocks to be unlocked */ ++ writew(0x0, host->regs + NFC_UNLOCKSTART_BLKADDR); ++ writew(0x4000, host->regs + NFC_UNLOCKEND_BLKADDR); ++ ++ /* Unlock Block Command for given address range */ ++ writew(0x4, host->regs + NFC_WRPROT); ++ ++ this->ecc.size = 512; ++ this->ecc.bytes = 3; ++ this->ecc.layout = &nand_hw_eccoob_smallpage; ++ + if (pdata->hw_ecc) { + this->ecc.calculate = mxc_nand_calculate_ecc; + this->ecc.hwctl = mxc_nand_enable_hwecc; + this->ecc.correct = mxc_nand_correct_data; + this->ecc.mode = NAND_ECC_HW; +- this->ecc.size = 512; +- this->ecc.bytes = 3; + tmp = readw(host->regs + NFC_CONFIG1); + tmp |= NFC_ECC_EN; + writew(tmp, host->regs + NFC_CONFIG1); + } else { +- this->ecc.size = 512; +- this->ecc.bytes = 3; +- this->ecc.layout = &nand_hw_eccoob_smallpage; + this->ecc.mode = NAND_ECC_SOFT; + tmp = readw(host->regs + NFC_CONFIG1); + tmp &= ~NFC_ECC_EN; + writew(tmp, host->regs + NFC_CONFIG1); + } + +- /* Reset NAND */ +- this->cmdfunc(mtd, NAND_CMD_RESET, -1, -1); +- +- /* preset operation */ +- /* Unlock the internal RAM Buffer */ +- writew(0x2, host->regs + NFC_CONFIG); +- +- /* Blocks to be unlocked */ +- writew(0x0, host->regs + NFC_UNLOCKSTART_BLKADDR); +- writew(0x4000, host->regs + NFC_UNLOCKEND_BLKADDR); +- +- /* Unlock Block Command for given address range */ +- writew(0x4, host->regs + NFC_WRPROT); +- + /* NAND bus width determines access funtions used by upper layer */ +- if (pdata->width == 2) { ++ if (pdata->width == 2) + this->options |= NAND_BUSWIDTH_16; +- this->ecc.layout = &nand_hw_eccoob_smallpage; +- } + + /* first scan to find the device and get the page size */ + if (nand_scan_ident(mtd, 1)) { +@@ -967,34 +964,9 @@ static int __init mxcnd_probe(struct platform_device *pdev) + goto escan; + } + +- host->pagesize_2k = (mtd->writesize == 2048) ? 1 : 0; +- +- if (this->ecc.mode == NAND_ECC_HW) { +- switch (mtd->oobsize) { +- case 8: +- this->ecc.layout = &nand_hw_eccoob_smallpage; +- break; +- case 16: +- this->ecc.layout = &nand_hw_eccoob_smallpage; +- break; +- case 64: +- this->ecc.layout = &nand_hw_eccoob_largepage; +- break; +- default: +- /* page size not handled by HW ECC */ +- /* switching back to soft ECC */ +- this->ecc.size = 512; +- this->ecc.bytes = 3; +- this->ecc.layout = &nand_hw_eccoob_smallpage; +- this->ecc.mode = NAND_ECC_SOFT; +- this->ecc.calculate = NULL; +- this->ecc.correct = NULL; +- this->ecc.hwctl = NULL; +- tmp = readw(host->regs + NFC_CONFIG1); +- tmp &= ~NFC_ECC_EN; +- writew(tmp, host->regs + NFC_CONFIG1); +- break; +- } ++ if (mtd->writesize == 2048) { ++ host->pagesize_2k = 1; ++ this->ecc.layout = &nand_hw_eccoob_largepage; + } + + /* second phase scan */ +-- +1.6.0.4 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0004-MXC-NFC-Use-generic-bad-block-detection.patch b/recipes/linux/linux-2.6.31/pcm043/0004-MXC-NFC-Use-generic-bad-block-detection.patch new file mode 100644 index 0000000000..2c5c37fd1c --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0004-MXC-NFC-Use-generic-bad-block-detection.patch @@ -0,0 +1,148 @@ +From 344bc7de5f142e95a524fe2019b51344d9aa3ea7 Mon Sep 17 00:00:00 2001 +From: Juergen Beisert +Date: Tue, 29 Sep 2009 15:04:11 +0200 +Subject: [PATCH 04/15] MXC NFC: Use generic bad block detection + +There is no need to provide a local bad block detection. The generic +one does a correct job. Due to hardware based ECC we must provide +a local nand_bbt_descr structure, because the generic one conflicts +with our ECC sum byte locations. + +Signed-off-by: Juergen Beisert +--- + drivers/mtd/nand/mxc_nand_v2.c | 98 ++++----------------------------------- + 1 files changed, 10 insertions(+), 88 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand_v2.c b/drivers/mtd/nand/mxc_nand_v2.c +index 03d1ba4..6b1eeb9 100644 +--- a/drivers/mtd/nand/mxc_nand_v2.c ++++ b/drivers/mtd/nand/mxc_nand_v2.c +@@ -708,26 +708,10 @@ static void mxc_nand_write_page(struct mtd_info *mtd, struct nand_chip *chip, + memcpy(host->data_buf + mtd->writesize, chip->oob_poi, mtd->oobsize); + } + +-/* Define some generic bad / good block scan pattern which are used +- * while scanning a device for factory marked good / bad blocks. */ +-static uint8_t scan_ff_pattern[] = { 0xff, 0xff }; +- +-static struct nand_bbt_descr smallpage_memorybased = { +- .options = NAND_BBT_SCAN2NDPAGE, +- .offs = 5, +- .len = 1, +- .pattern = scan_ff_pattern +-}; +- +-static struct nand_bbt_descr largepage_memorybased = { +- .options = 0, +- .offs = 0, +- .len = 2, +- .pattern = scan_ff_pattern +-}; +- +-/* Generic flash bbt decriptors +-*/ ++/* ++ * We must provide a private bbt decriptor, because the settings from ++ * the generic one collide with our ECC hardware. ++ */ + static uint8_t bbt_pattern[] = { 'B', 'b', 't', '0' }; + static uint8_t mirror_pattern[] = { '1', 't', 'b', 'B' }; + +@@ -751,73 +735,6 @@ static struct nand_bbt_descr bbt_mirror_descr = { + .pattern = mirror_pattern + }; + +-static void mxc_set_nfms_v21(struct mtd_info *mtd, unsigned int val) +-{ +- struct nand_chip *this = mtd->priv; +- struct mxc_nand_host *host = this->priv; +- unsigned int spas, tmp; +- +-// NFMS |= val; /* FIXME */ +- +- if (val & (1 << NFMS_NF_PG_SZ)) { +- if (mtd->writesize == 2048) +- spas = NFC_SPAS_64; +- else if (mtd->writesize == 4096) +- spas = NFC_SPAS_128; +- else +- spas = NFC_SPAS_16; +- +- tmp = readw(host->regs + NFC_CONFIG1); +- tmp |= NFC_V2_ECC_MODE_4; +- writew(tmp, host->regs + NFC_CONFIG1); +- +- tmp = readw(host->regs + NFC_V21_SPAS); +- tmp &= NFC_V21_SPAS_MASK; +- tmp |= spas << NFC_V21_SPAS_SHIFT; +- writew(tmp, host->regs + NFC_V21_SPAS); +- } +-} +- +-static void mxc_set_nfms(struct mtd_info *mtd, unsigned int val) +-{ +- if (nfc_is_v21()) +- mxc_set_nfms_v21(mtd, val); +-} +- +-static int mxc_nand_scan_bbt(struct mtd_info *mtd) +-{ +- struct nand_chip *this = mtd->priv; +- struct mxc_nand_host *host = this->priv; +- +- if (mtd->writesize == 2048) { +- mxc_set_nfms(mtd, 1 << NFMS_NF_PG_SZ); +- this->ecc.layout = &nand_hw_eccoob_2k; +- } else if (mtd->writesize == 4096) { +- mxc_set_nfms(mtd, 1 << NFMS_NF_PG_SZ); +- this->ecc.layout = &nand_hw_eccoob_4k; +- } else { +- this->ecc.layout = &nand_hw_eccoob_512; +- } +- +- /* propagate ecc.layout to mtd_info */ +- mtd->ecclayout = this->ecc.layout; +- +- /* use flash based bbt */ +- this->bbt_td = &bbt_main_descr; +- this->bbt_md = &bbt_mirror_descr; +- +- /* update flash based bbt */ +- this->options |= NAND_USE_FLASH_BBT; +- +- if (!this->badblock_pattern) { +- this->badblock_pattern = (mtd->writesize > 512) ? +- &largepage_memorybased : &smallpage_memorybased; +- } +- +- /* Build bad block table */ +- return nand_scan_bbt(mtd, this->badblock_pattern); +-} +- + static void unlock_addr(struct mxc_nand_host *host, unsigned int start_addr, unsigned int end_addr) + { + if (nfc_is_v21()) { +@@ -870,7 +787,6 @@ static int __init mxcnd_probe(struct platform_device *pdev) + this->write_buf = mxc_nand_write_buf; + this->read_buf = mxc_nand_read_buf; + this->verify_buf = mxc_nand_verify_buf; +- this->scan_bbt = mxc_nand_scan_bbt; + + host->clk = clk_get(&pdev->dev, "nfc_clk"); + if (IS_ERR(host->clk)) { +@@ -958,6 +874,12 @@ static int __init mxcnd_probe(struct platform_device *pdev) + + clk_disable(host->clk); + ++ /* use flash based bbt */ ++ this->bbt_td = &bbt_main_descr; ++ this->bbt_md = &bbt_mirror_descr; ++ /* update flash based bbt */ ++ this->options |= NAND_USE_FLASH_BBT; ++ + /* Scan to find existence of the device */ + if (nand_scan(mtd, 1)) { + DEBUG(MTD_DEBUG_LEVEL0, +-- +1.6.1 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0004-mxc-iomux-v3-remove-resource-handling.patch b/recipes/linux/linux-2.6.31/pcm043/0004-mxc-iomux-v3-remove-resource-handling.patch new file mode 100644 index 0000000000..5f04c346bb --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0004-mxc-iomux-v3-remove-resource-handling.patch @@ -0,0 +1,111 @@ +From 88a85f7b168d6ee042ea2634414f2ffd43a99cff Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 29 Oct 2009 17:18:02 +0100 +Subject: [PATCH 04/28] mxc: iomux v3: remove resource handling + +The current model does not allow to put a pad into different modes +once a pins is allocated. Remove the resource handling. + +Signed-off-by: Sascha Hauer +--- + arch/arm/plat-mxc/include/mach/iomux-v3.h | 17 +------------- + arch/arm/plat-mxc/iomux-v3.c | 35 +--------------------------- + 2 files changed, 3 insertions(+), 49 deletions(-) + +diff --git a/arch/arm/plat-mxc/include/mach/iomux-v3.h b/arch/arm/plat-mxc/include/mach/iomux-v3.h +index 7cd8454..f23e579 100644 +--- a/arch/arm/plat-mxc/include/mach/iomux-v3.h ++++ b/arch/arm/plat-mxc/include/mach/iomux-v3.h +@@ -92,9 +92,7 @@ struct pad_desc { + #define PAD_CTL_SLEW_RATE_FAST 1 + + /* +- * setups a single pad: +- * - reserves the pad so that it is not claimed by another driver +- * - setups the iomux according to the configuration ++ * setups a single pad in the iomuxer + */ + int mxc_iomux_v3_setup_pad(struct pad_desc *pad); + +@@ -104,18 +102,5 @@ int mxc_iomux_v3_setup_pad(struct pad_desc *pad); + */ + int mxc_iomux_v3_setup_multiple_pads(struct pad_desc *pad_list, unsigned count); + +-/* +- * releases a single pad: +- * - make it available for a future use by another driver +- * - DOES NOT reconfigure the IOMUX in its reset state +- */ +-void mxc_iomux_v3_release_pad(struct pad_desc *pad); +- +-/* +- * releases multiple pads +- * convenvient way to call the above function with tables +- */ +-void mxc_iomux_v3_release_multiple_pads(struct pad_desc *pad_list, int count); +- + #endif /* __MACH_IOMUX_V3_H__*/ + +diff --git a/arch/arm/plat-mxc/iomux-v3.c b/arch/arm/plat-mxc/iomux-v3.c +index 77a078f..4f0e7fc 100644 +--- a/arch/arm/plat-mxc/iomux-v3.c ++++ b/arch/arm/plat-mxc/iomux-v3.c +@@ -31,19 +31,11 @@ + + #define IOMUX_BASE IO_ADDRESS(IOMUXC_BASE_ADDR) + +-static unsigned long iomux_v3_pad_alloc_map[0x200 / BITS_PER_LONG]; +- + /* +- * setups a single pin: +- * - reserves the pin so that it is not claimed by another driver +- * - setups the iomux according to the configuration ++ * setups a single pad in the iomuxer + */ + int mxc_iomux_v3_setup_pad(struct pad_desc *pad) + { +- unsigned int pad_ofs = pad->pad_ctrl_ofs; +- +- if (test_and_set_bit(pad_ofs >> 2, iomux_v3_pad_alloc_map)) +- return -EBUSY; + if (pad->mux_ctrl_ofs) + __raw_writel(pad->mux_mode, IOMUX_BASE + pad->mux_ctrl_ofs); + +@@ -66,33 +58,10 @@ int mxc_iomux_v3_setup_multiple_pads(struct pad_desc *pad_list, unsigned count) + for (i = 0; i < count; i++) { + ret = mxc_iomux_v3_setup_pad(p); + if (ret) +- goto setup_error; ++ return ret; + p++; + } + return 0; +- +-setup_error: +- mxc_iomux_v3_release_multiple_pads(pad_list, i); +- return ret; + } + EXPORT_SYMBOL(mxc_iomux_v3_setup_multiple_pads); + +-void mxc_iomux_v3_release_pad(struct pad_desc *pad) +-{ +- unsigned int pad_ofs = pad->pad_ctrl_ofs; +- +- clear_bit(pad_ofs >> 2, iomux_v3_pad_alloc_map); +-} +-EXPORT_SYMBOL(mxc_iomux_v3_release_pad); +- +-void mxc_iomux_v3_release_multiple_pads(struct pad_desc *pad_list, int count) +-{ +- struct pad_desc *p = pad_list; +- int i; +- +- for (i = 0; i < count; i++) { +- mxc_iomux_v3_release_pad(p); +- p++; +- } +-} +-EXPORT_SYMBOL(mxc_iomux_v3_release_multiple_pads); +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0004-mxc_nand-merge-send_read_page-and-send_prog_page.patch b/recipes/linux/linux-2.6.31/pcm043/0004-mxc_nand-merge-send_read_page-and-send_prog_page.patch new file mode 100644 index 0000000000..656e680d20 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0004-mxc_nand-merge-send_read_page-and-send_prog_page.patch @@ -0,0 +1,104 @@ +From 9d8a47b34ec9f2a75aefa3ea6e6bc3fa70888cda Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Tue, 2 Jun 2009 11:37:53 +0200 +Subject: [PATCH] mxc_nand: merge send_read_page and send_prog_page + +Signed-off-by: Sascha Hauer +--- + drivers/mtd/nand/mxc_nand.c | 54 ++++++++++-------------------------------- + 1 files changed, 13 insertions(+), 41 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c +index b28e5f9..56db5ac 100644 +--- a/drivers/mtd/nand/mxc_nand.c ++++ b/drivers/mtd/nand/mxc_nand.c +@@ -226,12 +226,10 @@ static void send_addr(struct mxc_nand_host *host, uint16_t addr, int islast) + wait_op_done(host, TROP_US_DELAY, addr, islast); + } + +-/* This function requests the NANDFC to initate the transfer +- * of data currently in the NANDFC RAM buffer to the NAND device. */ +-static void send_prog_page(struct mxc_nand_host *host, uint8_t buf_id, +- int spare_only) ++static void send_page(struct mxc_nand_host *host, uint8_t buf_id, ++ int spare_only, unsigned int ops) + { +- DEBUG(MTD_DEBUG_LEVEL3, "send_prog_page (%d)\n", spare_only); ++ DEBUG(MTD_DEBUG_LEVEL3, "send_page (%d)\n", spare_only); + + /* NANDFC buffer 0 is used for page read/write */ + writew(buf_id, host->regs + NFC_BUF_ADDR); +@@ -246,33 +244,7 @@ static void send_prog_page(struct mxc_nand_host *host, uint8_t buf_id, + writew(config1, host->regs + NFC_CONFIG1); + } + +- writew(NFC_INPUT, host->regs + NFC_CONFIG2); +- +- /* Wait for operation to complete */ +- wait_op_done(host, TROP_US_DELAY, spare_only, true); +-} +- +-/* Requests NANDFC to initated the transfer of data from the +- * NAND device into in the NANDFC ram buffer. */ +-static void send_read_page(struct mxc_nand_host *host, uint8_t buf_id, +- int spare_only) +-{ +- DEBUG(MTD_DEBUG_LEVEL3, "send_read_page (%d)\n", spare_only); +- +- /* NANDFC buffer 0 is used for page read/write */ +- writew(buf_id, host->regs + NFC_BUF_ADDR); +- +- /* Configure spare or page+spare access */ +- if (!host->pagesize_2k) { +- uint32_t config1 = readw(host->regs + NFC_CONFIG1); +- if (spare_only) +- config1 |= NFC_SP_EN; +- else +- config1 &= ~NFC_SP_EN; +- writew(config1, host->regs + NFC_CONFIG1); +- } +- +- writew(NFC_OUTPUT, host->regs + NFC_CONFIG2); ++ writew(ops, host->regs + NFC_CONFIG2); + + /* Wait for operation to complete */ + wait_op_done(host, TROP_US_DELAY, spare_only, true); +@@ -756,13 +728,13 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + break; + + case NAND_CMD_PAGEPROG: +- send_prog_page(host, 0, host->spare_only); ++ send_page(host, 0, host->spare_only, NFC_INPUT); + + if (host->pagesize_2k) { + /* data in 4 areas datas */ +- send_prog_page(host, 1, host->spare_only); +- send_prog_page(host, 2, host->spare_only); +- send_prog_page(host, 3, host->spare_only); ++ send_page(host, 1, host->spare_only, NFC_INPUT); ++ send_page(host, 2, host->spare_only, NFC_INPUT); ++ send_page(host, 3, host->spare_only, NFC_INPUT); + } + + break; +@@ -827,12 +799,12 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + /* send read confirm command */ + send_cmd(host, NAND_CMD_READSTART, true); + /* read for each AREA */ +- send_read_page(host, 0, host->spare_only); +- send_read_page(host, 1, host->spare_only); +- send_read_page(host, 2, host->spare_only); +- send_read_page(host, 3, host->spare_only); ++ send_page(host, 0, host->spare_only, NFC_OUTPUT); ++ send_page(host, 1, host->spare_only, NFC_OUTPUT); ++ send_page(host, 2, host->spare_only, NFC_OUTPUT); ++ send_page(host, 3, host->spare_only, NFC_OUTPUT); + } else +- send_read_page(host, 0, host->spare_only); ++ send_page(host, 0, host->spare_only, NFC_OUTPUT); + break; + + case NAND_CMD_READID: +-- +1.6.0.4 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0005-MXC-NFC-Divide-flash-device-detection-into-two-step.patch b/recipes/linux/linux-2.6.31/pcm043/0005-MXC-NFC-Divide-flash-device-detection-into-two-step.patch new file mode 100644 index 0000000000..2a6d1103b2 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0005-MXC-NFC-Divide-flash-device-detection-into-two-step.patch @@ -0,0 +1,48 @@ +From a3906c7f2019dbcb2aa6b9a356947ea91ade60b8 Mon Sep 17 00:00:00 2001 +From: Juergen Beisert +Date: Tue, 29 Sep 2009 15:10:03 +0200 +Subject: [PATCH 05/15] MXC NFC: Divide flash device detection into two steps + +To be able to setup the NFC hardware in accordance to the connected +NAND device, we must detect some information about the NAND first. +After that we are able to setup the NFC in a correct manner. The last +step is to continue NAND device handling by the framework. + +Signed-off-by: Juergen Beisert +--- + drivers/mtd/nand/mxc_nand_v2.c | 13 +++++++++---- + 1 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand_v2.c b/drivers/mtd/nand/mxc_nand_v2.c +index 6b1eeb9..2ddd6f5 100644 +--- a/drivers/mtd/nand/mxc_nand_v2.c ++++ b/drivers/mtd/nand/mxc_nand_v2.c +@@ -874,16 +874,21 @@ static int __init mxcnd_probe(struct platform_device *pdev) + + clk_disable(host->clk); + ++ /* detect the device data prio setting up the ECC hardware */ ++ if (nand_scan_ident(mtd, 1)) { ++ err = -ENXIO; ++ pr_err("Unable to find any NAND device\n"); ++ goto escan; ++ } ++ + /* use flash based bbt */ + this->bbt_td = &bbt_main_descr; + this->bbt_md = &bbt_mirror_descr; + /* update flash based bbt */ + this->options |= NAND_USE_FLASH_BBT; + +- /* Scan to find existence of the device */ +- if (nand_scan(mtd, 1)) { +- DEBUG(MTD_DEBUG_LEVEL0, +- "MXC_ND2: Unable to find any NAND device.\n"); ++ /* second phase scan */ ++ if (nand_scan_tail(mtd)) { + err = -ENXIO; + goto escan; + } +-- +1.6.1 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0005-i.MX31-clock-rename-SSI-clocks-to-driver-name.patch b/recipes/linux/linux-2.6.31/pcm043/0005-i.MX31-clock-rename-SSI-clocks-to-driver-name.patch new file mode 100644 index 0000000000..dce0282b1a --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0005-i.MX31-clock-rename-SSI-clocks-to-driver-name.patch @@ -0,0 +1,28 @@ +From 04683e53f18930db4f5a9e40a65fea91b949ce21 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 12 Nov 2009 14:09:39 +0100 +Subject: [PATCH 05/28] i.MX31 clock: rename SSI clocks to driver name + +Signed-off-by: Sascha Hauer +--- + arch/arm/mach-mx3/clock.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/mach-mx3/clock.c b/arch/arm/mach-mx3/clock.c +index 8b14239..f25e8be 100644 +--- a/arch/arm/mach-mx3/clock.c ++++ b/arch/arm/mach-mx3/clock.c +@@ -545,8 +545,8 @@ static struct clk_lookup lookups[] = { + _REGISTER_CLOCK("mxc_w1.0", NULL, owire_clk) + _REGISTER_CLOCK("mxc-mmc.0", NULL, sdhc1_clk) + _REGISTER_CLOCK("mxc-mmc.1", NULL, sdhc2_clk) +- _REGISTER_CLOCK(NULL, "ssi", ssi1_clk) +- _REGISTER_CLOCK(NULL, "ssi", ssi2_clk) ++ _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) ++ _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) + _REGISTER_CLOCK(NULL, "firi", firi_clk) + _REGISTER_CLOCK(NULL, "ata", ata_clk) + _REGISTER_CLOCK(NULL, "rtic", rtic_clk) +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0005-mxc_nand-introduce-mxc_do_addr_cycle.patch b/recipes/linux/linux-2.6.31/pcm043/0005-mxc_nand-introduce-mxc_do_addr_cycle.patch new file mode 100644 index 0000000000..539408ec90 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0005-mxc_nand-introduce-mxc_do_addr_cycle.patch @@ -0,0 +1,122 @@ +From ded30b9d4cee1890d2b76956102828c6fb009b6b Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Tue, 2 Jun 2009 11:47:59 +0200 +Subject: [PATCH] mxc_nand: introduce mxc_do_addr_cycle + +This factors the address cycle to a seperate function. This +becomes useful in a later patch where we can simplify the +command processing by making use of this function. + +Signed-off-by: Sascha Hauer +--- + drivers/mtd/nand/mxc_nand.c | 87 +++++++++++++++++++++++-------------------- + 1 files changed, 47 insertions(+), 40 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c +index 56db5ac..325c5be 100644 +--- a/drivers/mtd/nand/mxc_nand.c ++++ b/drivers/mtd/nand/mxc_nand.c +@@ -658,6 +658,52 @@ static void mxc_nand_select_chip(struct mtd_info *mtd, int chip) + } + } + ++static void mxc_do_addr_cycle(struct mtd_info *mtd, int column, int page_addr) ++{ ++ struct nand_chip *nand_chip = mtd->priv; ++ struct mxc_nand_host *host = nand_chip->priv; ++ ++ /* Write out column address, if necessary */ ++ if (column != -1) { ++ /* ++ * MXC NANDFC can only perform full page+spare or ++ * spare-only read/write. When the upper layers ++ * layers perform a read/write buf operation, ++ * we will used the saved column adress to index into ++ * the full page. ++ */ ++ send_addr(host, 0, page_addr == -1); ++ if (host->pagesize_2k) ++ /* another col addr cycle for 2k page */ ++ send_addr(host, 0, false); ++ } ++ ++ /* Write out page address, if necessary */ ++ if (page_addr != -1) { ++ /* paddr_0 - p_addr_7 */ ++ send_addr(host, (page_addr & 0xff), false); ++ ++ if (host->pagesize_2k) { ++ if (mtd->size >= 0x10000000) { ++ /* paddr_8 - paddr_15 */ ++ send_addr(host, (page_addr >> 8) & 0xff, false); ++ send_addr(host, (page_addr >> 16) & 0xff, true); ++ } else ++ /* paddr_8 - paddr_15 */ ++ send_addr(host, (page_addr >> 8) & 0xff, true); ++ } else { ++ /* One more address cycle for higher density devices */ ++ if (mtd->size >= 0x4000000) { ++ /* paddr_8 - paddr_15 */ ++ send_addr(host, (page_addr >> 8) & 0xff, false); ++ send_addr(host, (page_addr >> 16) & 0xff, true); ++ } else ++ /* paddr_8 - paddr_15 */ ++ send_addr(host, (page_addr >> 8) & 0xff, true); ++ } ++ } ++} ++ + /* Used by the upper layer to write command to NAND Flash for + * different operations to be carried out on NAND Flash */ + static void mxc_nand_command(struct mtd_info *mtd, unsigned command, +@@ -746,46 +792,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + + /* Write out the command to the device. */ + send_cmd(host, command, useirq); +- +- /* Write out column address, if necessary */ +- if (column != -1) { +- /* +- * MXC NANDFC can only perform full page+spare or +- * spare-only read/write. When the upper layers +- * layers perform a read/write buf operation, +- * we will used the saved column adress to index into +- * the full page. +- */ +- send_addr(host, 0, page_addr == -1); +- if (host->pagesize_2k) +- /* another col addr cycle for 2k page */ +- send_addr(host, 0, false); +- } +- +- /* Write out page address, if necessary */ +- if (page_addr != -1) { +- /* paddr_0 - p_addr_7 */ +- send_addr(host, (page_addr & 0xff), false); +- +- if (host->pagesize_2k) { +- if (mtd->size >= 0x10000000) { +- /* paddr_8 - paddr_15 */ +- send_addr(host, (page_addr >> 8) & 0xff, false); +- send_addr(host, (page_addr >> 16) & 0xff, true); +- } else +- /* paddr_8 - paddr_15 */ +- send_addr(host, (page_addr >> 8) & 0xff, true); +- } else { +- /* One more address cycle for higher density devices */ +- if (mtd->size >= 0x4000000) { +- /* paddr_8 - paddr_15 */ +- send_addr(host, (page_addr >> 8) & 0xff, false); +- send_addr(host, (page_addr >> 16) & 0xff, true); +- } else +- /* paddr_8 - paddr_15 */ +- send_addr(host, (page_addr >> 8) & 0xff, true); +- } +- } ++ mxc_do_addr_cycle(mtd, column, page_addr); + + /* Command post-processing step */ + switch (command) { +-- +1.6.0.4 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0006-MXC-NFC-Reorder-structure-setup-to-use-NAND-informa.patch b/recipes/linux/linux-2.6.31/pcm043/0006-MXC-NFC-Reorder-structure-setup-to-use-NAND-informa.patch new file mode 100644 index 0000000000..ba7598694d --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0006-MXC-NFC-Reorder-structure-setup-to-use-NAND-informa.patch @@ -0,0 +1,129 @@ +From 91457e95796520ecf21937c3b2578ccfe21e054f Mon Sep 17 00:00:00 2001 +From: Juergen Beisert +Date: Tue, 29 Sep 2009 15:21:44 +0200 +Subject: [PATCH 06/15] MXC NFC: Reorder structure setup to use NAND information + +Reorder some structure and NFC setup to use detected NAND information. + +Signed-off-by: Juergen Beisert +--- + drivers/mtd/nand/mxc_nand_v2.c | 82 +++++++++++++++++++++++++++++++-------- + 1 files changed, 65 insertions(+), 17 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand_v2.c b/drivers/mtd/nand/mxc_nand_v2.c +index 2ddd6f5..3b1011c 100644 +--- a/drivers/mtd/nand/mxc_nand_v2.c ++++ b/drivers/mtd/nand/mxc_nand_v2.c +@@ -84,6 +84,10 @@ + #define NFC_V21_SPAS_SHIFT (0) + #define NFC_V21_SPAS_MASK (0xFF00) + ++/* some NFCs are able to handle different ECC sizes */ ++#define MXC_SMALL_ECC 0 ++#define MXC_BIG_ECC 1 ++ + struct mxc_nand_host { + struct mtd_info mtd; + struct nand_chip nand; +@@ -747,6 +751,30 @@ static void unlock_addr(struct mxc_nand_host *host, unsigned int start_addr, uns + BUG(); + } + ++static void __init mxc_spare_size(struct mxc_nand_host *host, unsigned size_code) ++{ ++ u16 tmp; ++ ++ if (nfc_is_v21()) { ++ tmp = readw(host->regs + NFC_V21_SPAS); ++ tmp &= NFC_V21_SPAS_MASK; ++ tmp |= size_code << NFC_V21_SPAS_SHIFT; ++ writew(tmp, host->regs + NFC_V21_SPAS); ++ } ++} ++ ++/* ignore mode in a first step */ ++static void __init mxc_ecc_mode(struct mxc_nand_host *host, int mode) ++{ ++ u16 tmp; ++ ++ if (nfc_is_v21()) { ++ tmp = readw(host->regs + NFC_CONFIG1); ++ tmp |= NFC_V2_ECC_MODE_4; ++ writew(tmp, host->regs + NFC_CONFIG1); ++ } ++} ++ + static void __init mxc_data_width(struct mxc_nand_host *host, unsigned width) + { + if ((width != 8) && (width != 16)) { +@@ -838,23 +866,6 @@ static int __init mxcnd_probe(struct platform_device *pdev) + if (err) + goto eirq; + +- if (pdata->hw_ecc) { +- this->ecc.read_page = mxc_nand_read_page; +- this->ecc.write_page = mxc_nand_write_page; +- this->ecc.read_oob = mxc_nand_read_oob; +- this->ecc.layout = &nand_hw_eccoob_512; +- this->ecc.calculate = mxc_nand_calculate_ecc; +- this->ecc.hwctl = mxc_nand_enable_hwecc; +- this->ecc.correct = mxc_nand_correct_data; +- this->ecc.mode = NAND_ECC_HW; +- this->ecc.size = 512; +- this->ecc.bytes = 9; +- mxc_nand_hwecc(host, 1); +- } else { +- this->ecc.mode = NAND_ECC_SOFT; +- mxc_nand_hwecc(host, 0); +- } +- + clk_enable(host->clk); + + /* Disable interrupt */ +@@ -887,6 +898,43 @@ static int __init mxcnd_probe(struct platform_device *pdev) + /* update flash based bbt */ + this->options |= NAND_USE_FLASH_BBT; + ++ this->ecc.mode = NAND_ECC_SOFT; /* start with a default */ ++ ++ /* Note: ECC needs at least 16 bytes oob per 512 bytes pagesize */ ++ if (pdata->hw_ecc && (mtd->oobsize >= 16)) { ++ if (mtd->writesize == 512) { ++ this->ecc.mode = NAND_ECC_HW; ++ this->ecc.layout = &nand_hw_eccoob_512; ++ mxc_spare_size(host, NFC_SPAS_16); ++ } ++ if ((mtd->writesize == 2048) && (mtd->oobsize >= 64)) { ++ this->ecc.mode = NAND_ECC_HW; ++ this->ecc.layout = &nand_hw_eccoob_2k; ++ mxc_spare_size(host, NFC_SPAS_64); ++ } ++ if ((mtd->writesize == 4096) && (mtd->oobsize >= 128)) { ++ this->ecc.mode = NAND_ECC_HW; ++ this->ecc.layout = &nand_hw_eccoob_4k; ++ mxc_spare_size(host, NFC_SPAS_128); ++ } ++ /* can we use hardware ECC? */ ++ if (this->ecc.mode == NAND_ECC_HW) { ++ this->ecc.read_page = mxc_nand_read_page; ++ this->ecc.write_page = mxc_nand_write_page; ++ this->ecc.read_oob = mxc_nand_read_oob; ++ this->ecc.calculate = mxc_nand_calculate_ecc; ++ this->ecc.hwctl = mxc_nand_enable_hwecc; ++ this->ecc.correct = mxc_nand_correct_data; ++ this->ecc.size = 512; ++ this->ecc.bytes = 9; ++ mxc_ecc_mode(host, MXC_SMALL_ECC); ++ mxc_nand_hwecc(host, 1); ++ } ++ } ++ ++ if (this->ecc.mode == NAND_ECC_SOFT) ++ mxc_nand_hwecc(host, 0); ++ + /* second phase scan */ + if (nand_scan_tail(mtd)) { + err = -ENXIO; +-- +1.6.1 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0006-i.MX2-Add-sound-ssi-resources.patch b/recipes/linux/linux-2.6.31/pcm043/0006-i.MX2-Add-sound-ssi-resources.patch new file mode 100644 index 0000000000..9de57cf9d9 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0006-i.MX2-Add-sound-ssi-resources.patch @@ -0,0 +1,132 @@ +From 4bdc922cba4f392af2adf57c9aa86c0d2241ac88 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 22 Oct 2009 14:50:33 +0200 +Subject: [PATCH 06/28] i.MX2: Add sound (ssi) resources + +Signed-off-by: Sascha Hauer +--- + arch/arm/mach-mx2/clock_imx27.c | 4 +- + arch/arm/mach-mx2/devices.c | 78 +++++++++++++++++++++++++++++++++++++++ + arch/arm/mach-mx2/devices.h | 5 ++ + 3 files changed, 85 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/mach-mx2/clock_imx27.c b/arch/arm/mach-mx2/clock_imx27.c +index 2c97144..5abb763 100644 +--- a/arch/arm/mach-mx2/clock_imx27.c ++++ b/arch/arm/mach-mx2/clock_imx27.c +@@ -644,8 +644,8 @@ static struct clk_lookup lookups[] = { + _REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk) + _REGISTER_CLOCK(NULL, "csi", csi_clk) + _REGISTER_CLOCK(NULL, "usb", usb_clk) +- _REGISTER_CLOCK(NULL, "ssi1", ssi1_clk) +- _REGISTER_CLOCK(NULL, "ssi2", ssi2_clk) ++ _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) ++ _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) + _REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk) + _REGISTER_CLOCK(NULL, "vpu", vpu_clk) + _REGISTER_CLOCK(NULL, "dma", dma_clk) +diff --git a/arch/arm/mach-mx2/devices.c b/arch/arm/mach-mx2/devices.c +index a0f1b36..f877baa 100644 +--- a/arch/arm/mach-mx2/devices.c ++++ b/arch/arm/mach-mx2/devices.c +@@ -407,6 +407,84 @@ struct platform_device mxc_sdhc_device1 = { + .resource = mxc_sdhc2_resources, + }; + ++static struct resource imx_ssi_resources0[] = { ++ { ++ .start = SSI1_BASE_ADDR, ++ .end = SSI1_BASE_ADDR + 0x6F, ++ .flags = IORESOURCE_MEM, ++ }, { ++ .start = MXC_INT_SSI1, ++ .end = MXC_INT_SSI1, ++ .flags = IORESOURCE_IRQ, ++ }, { ++ .name = "tx0", ++ .start = DMA_REQ_SSI1_TX0, ++ .end = DMA_REQ_SSI1_TX0, ++ .flags = IORESOURCE_DMA, ++ }, { ++ .name = "rx0", ++ .start = DMA_REQ_SSI1_RX0, ++ .end = DMA_REQ_SSI1_RX0, ++ .flags = IORESOURCE_DMA, ++ }, { ++ .name = "tx1", ++ .start = DMA_REQ_SSI1_TX1, ++ .end = DMA_REQ_SSI1_TX1, ++ .flags = IORESOURCE_DMA, ++ }, { ++ .name = "rx1", ++ .start = DMA_REQ_SSI1_RX1, ++ .end = DMA_REQ_SSI1_RX1, ++ .flags = IORESOURCE_DMA, ++ }, ++}; ++ ++static struct resource imx_ssi_resources1[] = { ++ { ++ .start = SSI2_BASE_ADDR, ++ .end = SSI2_BASE_ADDR + 0x6F, ++ .flags = IORESOURCE_MEM, ++ }, { ++ .start = MXC_INT_SSI2, ++ .end = MXC_INT_SSI2, ++ .flags = IORESOURCE_IRQ, ++ }, { ++ .name = "tx0", ++ .start = DMA_REQ_SSI2_TX0, ++ .end = DMA_REQ_SSI2_TX0, ++ .flags = IORESOURCE_DMA, ++ }, { ++ .name = "rx0", ++ .start = DMA_REQ_SSI2_RX0, ++ .end = DMA_REQ_SSI2_RX0, ++ .flags = IORESOURCE_DMA, ++ }, { ++ .name = "tx1", ++ .start = DMA_REQ_SSI2_TX1, ++ .end = DMA_REQ_SSI2_TX1, ++ .flags = IORESOURCE_DMA, ++ }, { ++ .name = "rx1", ++ .start = DMA_REQ_SSI2_RX1, ++ .end = DMA_REQ_SSI2_RX1, ++ .flags = IORESOURCE_DMA, ++ }, ++}; ++ ++struct platform_device imx_ssi_device0 = { ++ .name = "imx-ssi", ++ .id = 0, ++ .num_resources = ARRAY_SIZE(imx_ssi_resources0), ++ .resource = imx_ssi_resources0, ++}; ++ ++struct platform_device imx_ssi_device1 = { ++ .name = "imx-ssi", ++ .id = 1, ++ .num_resources = ARRAY_SIZE(imx_ssi_resources1), ++ .resource = imx_ssi_resources1, ++}; ++ + /* GPIO port description */ + static struct mxc_gpio_port imx_gpio_ports[] = { + [0] = { +diff --git a/arch/arm/mach-mx2/devices.h b/arch/arm/mach-mx2/devices.h +index 049005b..0c1f14d 100644 +--- a/arch/arm/mach-mx2/devices.h ++++ b/arch/arm/mach-mx2/devices.h +@@ -20,3 +20,8 @@ extern struct platform_device mxc_i2c_device0; + extern struct platform_device mxc_i2c_device1; + extern struct platform_device mxc_sdhc_device0; + extern struct platform_device mxc_sdhc_device1; ++extern struct platform_device mxc_spi_device0; ++extern struct platform_device mxc_spi_device1; ++extern struct platform_device mxc_spi_device2; ++extern struct platform_device imx_ssi_device0; ++extern struct platform_device imx_ssi_device1; +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0006-mxc-nand-remove-debug-param.patch b/recipes/linux/linux-2.6.31/pcm043/0006-mxc-nand-remove-debug-param.patch new file mode 100644 index 0000000000..0829ae0e09 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0006-mxc-nand-remove-debug-param.patch @@ -0,0 +1,82 @@ +From 74689944a8d49bcfd0acdaabe1952d368a889eae Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 4 Jun 2009 15:57:20 +0200 +Subject: [PATCH] mxc nand: remove debug param + +Signed-off-by: Sascha Hauer +--- + drivers/mtd/nand/mxc_nand.c | 16 ++++++++-------- + 1 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c +index 325c5be..cd09196 100644 +--- a/drivers/mtd/nand/mxc_nand.c ++++ b/drivers/mtd/nand/mxc_nand.c +@@ -165,7 +165,7 @@ static irqreturn_t mxc_nfc_irq(int irq, void *dev_id) + * complete by checking the INT bit of config2 register. + */ + static void wait_op_done(struct mxc_nand_host *host, int max_retries, +- uint16_t param, int useirq) ++ int useirq) + { + uint32_t tmp; + +@@ -194,8 +194,8 @@ static void wait_op_done(struct mxc_nand_host *host, int max_retries, + udelay(1); + } + if (max_retries < 0) +- DEBUG(MTD_DEBUG_LEVEL0, "%s(%d): INT not set\n", +- __func__, param); ++ DEBUG(MTD_DEBUG_LEVEL0, "%s: INT not set\n", ++ __func__); + } + } + +@@ -209,7 +209,7 @@ static void send_cmd(struct mxc_nand_host *host, uint16_t cmd, int useirq) + writew(NFC_CMD, host->regs + NFC_CONFIG2); + + /* Wait for operation to complete */ +- wait_op_done(host, TROP_US_DELAY, cmd, useirq); ++ wait_op_done(host, TROP_US_DELAY, useirq); + } + + /* This function sends an address (or partial address) to the +@@ -223,7 +223,7 @@ static void send_addr(struct mxc_nand_host *host, uint16_t addr, int islast) + writew(NFC_ADDR, host->regs + NFC_CONFIG2); + + /* Wait for operation to complete */ +- wait_op_done(host, TROP_US_DELAY, addr, islast); ++ wait_op_done(host, TROP_US_DELAY, islast); + } + + static void send_page(struct mxc_nand_host *host, uint8_t buf_id, +@@ -247,7 +247,7 @@ static void send_page(struct mxc_nand_host *host, uint8_t buf_id, + writew(ops, host->regs + NFC_CONFIG2); + + /* Wait for operation to complete */ +- wait_op_done(host, TROP_US_DELAY, spare_only, true); ++ wait_op_done(host, TROP_US_DELAY, true); + } + + /* Request the NANDFC to perform a read of the NAND device ID. */ +@@ -267,7 +267,7 @@ static void send_read_id(struct mxc_nand_host *host) + writew(NFC_ID, host->regs + NFC_CONFIG2); + + /* Wait for operation to complete */ +- wait_op_done(host, TROP_US_DELAY, 0, true); ++ wait_op_done(host, TROP_US_DELAY, true); + + if (this->options & NAND_BUSWIDTH_16) { + void __iomem *main_buf = host->regs + MAIN_AREA0; +@@ -303,7 +303,7 @@ static uint16_t get_dev_status(struct mxc_nand_host *host) + writew(NFC_STATUS, host->regs + NFC_CONFIG2); + + /* Wait for operation to complete */ +- wait_op_done(host, TROP_US_DELAY, 0, true); ++ wait_op_done(host, TROP_US_DELAY, true); + + /* Status is placed in first word of main buffer */ + /* get status, then recovery area 1 data */ +-- +1.6.0.4 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0007-MXC-NFC-Fix-OOB-layout.patch b/recipes/linux/linux-2.6.31/pcm043/0007-MXC-NFC-Fix-OOB-layout.patch new file mode 100644 index 0000000000..0aa5cc63dc --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0007-MXC-NFC-Fix-OOB-layout.patch @@ -0,0 +1,104 @@ +From 1b05f0fbf96df288d1ee6d0bf4175e99b7d04730 Mon Sep 17 00:00:00 2001 +From: Juergen Beisert +Date: Tue, 29 Sep 2009 15:28:21 +0200 +Subject: [PATCH 07/15] MXC NFC: Fix OOB layout + +This data is not from the datasheet because the datasheet conceals these +facts. Its collected from other sources and some hints from the datasheet. +Hope its documentation is useful. + +Signed-off-by: Juergen Beisert +--- + drivers/mtd/nand/mxc_nand_v2.c | 68 ++++++++++++++++++++++++++++++++------- + 1 files changed, 55 insertions(+), 13 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand_v2.c b/drivers/mtd/nand/mxc_nand_v2.c +index 3b1011c..c1cbb05 100644 +--- a/drivers/mtd/nand/mxc_nand_v2.c ++++ b/drivers/mtd/nand/mxc_nand_v2.c +@@ -121,27 +121,69 @@ struct mxc_nand_host { + #define TROP_US_DELAY 2000 + + /* +- * OOB placement block for use with hardware ecc generation ++ * ECC data seems organized in 16 byte planes in this hardware. ++ * 7 bytes can be used for user's purpose, and 9 bytes are used ++ * for the ECC sum. ++ * ++ * 0 1 2 3 4 5 6 7 8 9 A B C D E F ++ * |<----------->|<------------->| ++ * User ECC ++ * ++ * For pages larger than 512 bytes, n structures of this type will be used. + */ ++ ++/* OOB description for 512 byte pages with 16 byte OOB */ + static struct nand_ecclayout nand_hw_eccoob_512 = { +- .eccbytes = 9, +- .eccpos = {7, 8, 9, 10, 11, 12, 13, 14, 15}, +- .oobavail = 4, +- .oobfree = {{0, 4}} ++ .eccbytes = 1 * 9, ++ .eccpos = { ++ 7, 8, 9, 10, 11, 12, 13, 14, 15 ++ }, ++ .oobfree = { ++ {.offset = 0, .length = 7} ++ } + }; + ++/* OOB description for 2048 byte pages with 64 byte OOB */ + static struct nand_ecclayout nand_hw_eccoob_2k = { +- .eccbytes = 9, +- .eccpos = {7, 8, 9, 10, 11, 12, 13, 14, 15}, +- .oobavail = 4, +- .oobfree = {{2, 4}} ++ .eccbytes = 4 * 9, ++ .eccpos = { ++ 7, 8, 9, 10, 11, 12, 13, 14, 15, ++ 23, 24, 25, 26, 27, 28, 29, 30, 31, ++ 39, 40, 41, 42, 43, 44, 45, 46, 47, ++ 55, 56, 57, 58, 59, 60, 61, 62, 63 ++ }, ++ .oobfree = { ++ {.offset = 0, .length = 7}, ++ {.offset = 16, .length = 7}, ++ {.offset = 32, .length = 7}, ++ {.offset = 48, .length = 7} ++ } + }; + ++/* OOB description for 4096 byte pages with 128 byte OOB */ + static struct nand_ecclayout nand_hw_eccoob_4k = { +- .eccbytes = 9, +- .eccpos = {7, 8, 9, 10, 11, 12, 13, 14, 15}, +- .oobavail = 4, +- .oobfree = {{2, 4}} ++ .eccbytes = 8 * 9, ++ .eccpos = { ++ 7, 8, 9, 10, 11, 12, 13, 14, 15, ++ 23, 24, 25, 26, 27, 28, 29, 30, 31, ++ 39, 40, 41, 42, 43, 44, 45, 46, 47, ++ 55, 56, 57, 58, 59, 60, 61, 62, 63, ++ 71, 72, 73, 74, 75, 76, 77, 78, 79, ++ 87, 88, 89, 90, 91, 92, 93, 94, 95, ++ 103, 104, 105, 106, 107, 108, 109, 110, 111, ++/* ouch, only 64 entries allowed */ ++/* 119, 120, 121, 122, 123, 124, 125, 126, 127 */ ++ }, ++ .oobfree = { ++ {.offset = 0, .length = 7}, ++ {.offset = 16, .length = 7}, ++ {.offset = 32, .length = 7}, ++ {.offset = 48, .length = 7}, ++ {.offset = 64, .length = 7}, ++ {.offset = 80, .length = 7}, ++ {.offset = 96, .length = 7}, ++ {.offset = 112, .length = 7} ++ } + }; + + #ifdef CONFIG_MTD_PARTITIONS +-- +1.6.1 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0007-i.MX3-Add-sound-ssi-resources.patch b/recipes/linux/linux-2.6.31/pcm043/0007-i.MX3-Add-sound-ssi-resources.patch new file mode 100644 index 0000000000..10eb2dc574 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0007-i.MX3-Add-sound-ssi-resources.patch @@ -0,0 +1,101 @@ +From cd733f49a7e0fd82164138933157bbdbb9937f2c Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 29 Oct 2009 17:17:42 +0100 +Subject: [PATCH 07/28] i.MX3: Add sound (ssi) resources + +Signed-off-by: Sascha Hauer +--- + arch/arm/mach-mx3/clock-imx35.c | 4 +- + arch/arm/mach-mx3/devices.c | 42 +++++++++++++++++++++++++++++++++++++++ + arch/arm/mach-mx3/devices.h | 3 +- + 3 files changed, 46 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mach-mx3/clock-imx35.c b/arch/arm/mach-mx3/clock-imx35.c +index 577ee83..02b2507 100644 +--- a/arch/arm/mach-mx3/clock-imx35.c ++++ b/arch/arm/mach-mx3/clock-imx35.c +@@ -421,8 +421,8 @@ static struct clk_lookup lookups[] = { + _REGISTER_CLOCK(NULL, "sdma", sdma_clk) + _REGISTER_CLOCK(NULL, "spba", spba_clk) + _REGISTER_CLOCK(NULL, "spdif", spdif_clk) +- _REGISTER_CLOCK(NULL, "ssi", ssi1_clk) +- _REGISTER_CLOCK(NULL, "ssi", ssi2_clk) ++ _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) ++ _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) + _REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk) + _REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk) + _REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk) +diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c +index 9e87e08..06dab5f 100644 +--- a/arch/arm/mach-mx3/devices.c ++++ b/arch/arm/mach-mx3/devices.c +@@ -416,6 +416,44 @@ struct platform_device mxc_fec_device = { + }; + #endif + ++static struct resource imx_ssi_resources0[] = { ++ { ++ .start = SSI1_BASE_ADDR, ++ .end = SSI1_BASE_ADDR + 0xfff, ++ .flags = IORESOURCE_MEM, ++ }, { ++ .start = MX31_INT_SSI1, ++ .end = MX31_INT_SSI1, ++ .flags = IORESOURCE_IRQ, ++ }, ++}; ++ ++static struct resource imx_ssi_resources1[] = { ++ { ++ .start = SSI2_BASE_ADDR, ++ .end = SSI2_BASE_ADDR + 0xfff, ++ .flags = IORESOURCE_MEM ++ }, { ++ .start = MX31_INT_SSI2, ++ .end = MX31_INT_SSI2, ++ .flags = IORESOURCE_IRQ, ++ }, ++}; ++ ++struct platform_device imx_ssi_device0 = { ++ .name = "imx-ssi", ++ .id = 0, ++ .num_resources = ARRAY_SIZE(imx_ssi_resources0), ++ .resource = imx_ssi_resources0, ++}; ++ ++struct platform_device imx_ssi_device1 = { ++ .name = "imx-ssi", ++ .id = 1, ++ .num_resources = ARRAY_SIZE(imx_ssi_resources1), ++ .resource = imx_ssi_resources1, ++}; ++ + static int mx3_devices_init(void) + { + if (cpu_is_mx31()) { +@@ -426,6 +464,10 @@ static int mx3_devices_init(void) + if (cpu_is_mx35()) { + mxc_nand_resources[0].start = MX35_NFC_BASE_ADDR; + mxc_nand_resources[0].end = MX35_NFC_BASE_ADDR + 0xfff; ++ imx_ssi_resources0[1].start = MX35_INT_SSI1; ++ imx_ssi_resources0[1].end = MX35_INT_SSI1; ++ imx_ssi_resources1[1].start = MX35_INT_SSI2; ++ imx_ssi_resources1[1].end = MX35_INT_SSI2; + } + + return 0; +diff --git a/arch/arm/mach-mx3/devices.h b/arch/arm/mach-mx3/devices.h +index ffd494d..224c2eb 100644 +--- a/arch/arm/mach-mx3/devices.h ++++ b/arch/arm/mach-mx3/devices.h +@@ -17,4 +17,5 @@ extern struct platform_device mxcsdhc_device0; + extern struct platform_device mxcsdhc_device1; + extern struct platform_device mxc_otg_udc_device; + extern struct platform_device mxc_rnga_device; +- ++extern struct platform_device imx_ssi_device0; ++extern struct platform_device imx_ssi_device1; +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0007-mxc-nand-remove-dead-code.patch b/recipes/linux/linux-2.6.31/pcm043/0007-mxc-nand-remove-dead-code.patch new file mode 100644 index 0000000000..218b1033db --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0007-mxc-nand-remove-dead-code.patch @@ -0,0 +1,41 @@ +From 406ec8e7472d4435f6f862cd2e8179ee8dddb57e Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 4 Jun 2009 16:12:40 +0200 +Subject: [PATCH] mxc nand: remove dead code + +Signed-off-by: Sascha Hauer +--- + drivers/mtd/nand/mxc_nand.c | 17 ----------------- + 1 files changed, 0 insertions(+), 17 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c +index cd09196..74c5dbc 100644 +--- a/drivers/mtd/nand/mxc_nand.c ++++ b/drivers/mtd/nand/mxc_nand.c +@@ -620,23 +620,6 @@ static void mxc_nand_select_chip(struct mtd_info *mtd, int chip) + struct nand_chip *nand_chip = mtd->priv; + struct mxc_nand_host *host = nand_chip->priv; + +-#ifdef CONFIG_MTD_NAND_MXC_FORCE_CE +- if (chip > 0) { +- DEBUG(MTD_DEBUG_LEVEL0, +- "ERROR: Illegal chip select (chip = %d)\n", chip); +- return; +- } +- +- if (chip == -1) { +- writew(readw(host->regs + NFC_CONFIG1) & ~NFC_CE, +- host->regs + NFC_CONFIG1); +- return; +- } +- +- writew(readw(host->regs + NFC_CONFIG1) | NFC_CE, +- host->regs + NFC_CONFIG1); +-#endif +- + switch (chip) { + case -1: + /* Disable the NFC clock */ +-- +1.6.0.4 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0008-MXC-Add-a-digital-audio-multiplexer-driver.patch b/recipes/linux/linux-2.6.31/pcm043/0008-MXC-Add-a-digital-audio-multiplexer-driver.patch new file mode 100644 index 0000000000..65c7339847 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0008-MXC-Add-a-digital-audio-multiplexer-driver.patch @@ -0,0 +1,281 @@ +From 2ff993c8bed5670aab72ef1d7901fe87e753aa54 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 29 Oct 2009 17:12:39 +0100 +Subject: [PATCH 08/28] MXC: Add a digital audio multiplexer driver + +Signed-off-by: Sascha Hauer +--- + arch/arm/mach-mx2/Kconfig | 2 + + arch/arm/mach-mx3/Kconfig | 2 + + arch/arm/plat-mxc/Kconfig | 7 +++ + arch/arm/plat-mxc/Makefile | 2 + + arch/arm/plat-mxc/audmux-v1.c | 53 ++++++++++++++++++++++ + arch/arm/plat-mxc/audmux-v2.c | 74 +++++++++++++++++++++++++++++++ + arch/arm/plat-mxc/include/mach/audmux.h | 52 +++++++++++++++++++++ + 7 files changed, 192 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/plat-mxc/audmux-v1.c + create mode 100644 arch/arm/plat-mxc/audmux-v2.c + create mode 100644 arch/arm/plat-mxc/include/mach/audmux.h + +diff --git a/arch/arm/mach-mx2/Kconfig b/arch/arm/mach-mx2/Kconfig +index c77da58..0d08c34 100644 +--- a/arch/arm/mach-mx2/Kconfig ++++ b/arch/arm/mach-mx2/Kconfig +@@ -6,11 +6,13 @@ choice + + config MACH_MX21 + bool "i.MX21 support" ++ select ARCH_MXC_AUDMUX_V1 + help + This enables support for Freescale's MX2 based i.MX21 processor. + + config MACH_MX27 + bool "i.MX27 support" ++ select ARCH_MXC_AUDMUX_V1 + help + This enables support for Freescale's MX2 based i.MX27 processor. + +diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig +index 851f245..ffdd211 100644 +--- a/arch/arm/mach-mx3/Kconfig ++++ b/arch/arm/mach-mx3/Kconfig +@@ -2,11 +2,13 @@ if ARCH_MX3 + + config ARCH_MX31 + select ARCH_HAS_RNGA ++ select ARCH_MXC_AUDMUX_V2 + bool + + config ARCH_MX35 + bool + select ARCH_MXC_IOMUX_V3 ++ select ARCH_MXC_AUDMUX_V2 + + comment "MX3 platforms:" + +diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig +index 8986b74..995c357 100644 +--- a/arch/arm/plat-mxc/Kconfig ++++ b/arch/arm/plat-mxc/Kconfig +@@ -58,4 +58,11 @@ config ARCH_HAS_RNGA + + config ARCH_MXC_IOMUX_V3 + bool ++ ++config ARCH_MXC_AUDMUX_V1 ++ bool ++ ++config ARCH_MXC_AUDMUX_V2 ++ bool ++ + endif +diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile +index e3212c8..92fc8b2 100644 +--- a/arch/arm/plat-mxc/Makefile ++++ b/arch/arm/plat-mxc/Makefile +@@ -9,3 +9,5 @@ obj-$(CONFIG_ARCH_MX1) += iomux-mx1-mx2.o dma-mx1-mx2.o + obj-$(CONFIG_ARCH_MX2) += iomux-mx1-mx2.o dma-mx1-mx2.o + obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o + obj-$(CONFIG_MXC_PWM) += pwm.o ++obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o ++obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o +diff --git a/arch/arm/plat-mxc/audmux-v1.c b/arch/arm/plat-mxc/audmux-v1.c +new file mode 100644 +index 0000000..70ab5af +--- /dev/null ++++ b/arch/arm/plat-mxc/audmux-v1.c +@@ -0,0 +1,53 @@ ++/* ++ * Copyright 2009 Pengutronix, Sascha Hauer ++ * ++ * Initial development of this code was funded by ++ * Phytec Messtechnik GmbH, http://www.phytec.de ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static void __iomem *audmux_base; ++ ++#define MXC_AUDMUX_V1_PCR(x) ((x) * 4) ++ ++int mxc_audmux_v1_configure_port(unsigned int port, unsigned int pcr) ++{ ++ if (!audmux_base) { ++ printk("%s: not configured\n", __func__); ++ return -ENOSYS; ++ } ++ ++ writel(pcr, audmux_base + MXC_AUDMUX_V1_PCR(port)); ++ ++ return 0; ++} ++EXPORT_SYMBOL_GPL(mxc_audmux_v1_configure_port); ++ ++static int mxc_audmux_v1_init(void) ++{ ++ if (cpu_is_mx27() || cpu_is_mx21()) ++ audmux_base = IO_ADDRESS(AUDMUX_BASE_ADDR); ++ return 0; ++} ++ ++postcore_initcall(mxc_audmux_v1_init); +diff --git a/arch/arm/plat-mxc/audmux-v2.c b/arch/arm/plat-mxc/audmux-v2.c +new file mode 100644 +index 0000000..6f21096 +--- /dev/null ++++ b/arch/arm/plat-mxc/audmux-v2.c +@@ -0,0 +1,74 @@ ++/* ++ * Copyright 2009 Pengutronix, Sascha Hauer ++ * ++ * Initial development of this code was funded by ++ * Phytec Messtechnik GmbH, http://www.phytec.de ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static struct clk *audmux_clk; ++static void __iomem *audmux_base; ++ ++#define MXC_AUDMUX_V2_PTCR(x) ((x) * 8) ++#define MXC_AUDMUX_V2_PDCR(x) ((x) * 8 + 4) ++ ++int mxc_audmux_v2_configure_port(unsigned int port, unsigned int ptcr, ++ unsigned int pdcr) ++{ ++ if (!audmux_base) ++ return -ENOSYS; ++ ++ if (audmux_clk) ++ clk_enable(audmux_clk); ++ ++ writel(ptcr, audmux_base + MXC_AUDMUX_V2_PTCR(port)); ++ writel(pdcr, audmux_base + MXC_AUDMUX_V2_PDCR(port)); ++ ++ if (audmux_clk) ++ clk_disable(audmux_clk); ++ ++ return 0; ++} ++EXPORT_SYMBOL_GPL(mxc_audmux_v2_configure_port); ++ ++static int mxc_audmux_v2_init(void) ++{ ++ int ret; ++ ++ if (cpu_is_mx35()) { ++ audmux_clk = clk_get(NULL, "audmux"); ++ if (IS_ERR(audmux_clk)) { ++ ret = PTR_ERR(audmux_clk); ++ printk(KERN_ERR "%s: cannot get clock: %d\n", __func__, ++ ret); ++ return ret; ++ } ++ } ++ ++ if (cpu_is_mx31() || cpu_is_mx35()) ++ audmux_base = IO_ADDRESS(AUDMUX_BASE_ADDR); ++ ++ return 0; ++} ++ ++postcore_initcall(mxc_audmux_v2_init); +diff --git a/arch/arm/plat-mxc/include/mach/audmux.h b/arch/arm/plat-mxc/include/mach/audmux.h +new file mode 100644 +index 0000000..5cd6466 +--- /dev/null ++++ b/arch/arm/plat-mxc/include/mach/audmux.h +@@ -0,0 +1,52 @@ ++#ifndef __MACH_AUDMUX_H ++#define __MACH_AUDMUX_H ++ ++#define MX27_AUDMUX_HPCR1_SSI0 0 ++#define MX27_AUDMUX_HPCR2_SSI1 1 ++#define MX27_AUDMUX_HPCR3_SSI_PINS_4 2 ++#define MX27_AUDMUX_PPCR1_SSI_PINS_1 3 ++#define MX27_AUDMUX_PPCR2_SSI_PINS_2 4 ++#define MX27_AUDMUX_PPCR3_SSI_PINS_3 5 ++ ++#define MX31_AUDMUX_PORT1_SSI0 0 ++#define MX31_AUDMUX_PORT2_SSI1 1 ++#define MX31_AUDMUX_PORT3_SSI_PINS_3 2 ++#define MX31_AUDMUX_PORT4_SSI_PINS_4 3 ++#define MX31_AUDMUX_PORT5_SSI_PINS_5 4 ++#define MX31_AUDMUX_PORT6_SSI_PINS_6 5 ++ ++/* Register definitions for the i.MX21/27 Digital Audio Multiplexer */ ++#define MXC_AUDMUX_V1_PCR_INMMASK(x) ((x) & 0xff) ++#define MXC_AUDMUX_V1_PCR_INMEN (1 << 8) ++#define MXC_AUDMUX_V1_PCR_TXRXEN (1 << 10) ++#define MXC_AUDMUX_V1_PCR_SYN (1 << 12) ++#define MXC_AUDMUX_V1_PCR_RXDSEL(x) (((x) & 0x7) << 13) ++#define MXC_AUDMUX_V1_PCR_RFCSEL(x) (((x) & 0xf) << 20) ++#define MXC_AUDMUX_V1_PCR_RCLKDIR (1 << 24) ++#define MXC_AUDMUX_V1_PCR_RFSDIR (1 << 25) ++#define MXC_AUDMUX_V1_PCR_TFCSEL(x) (((x) & 0xf) << 26) ++#define MXC_AUDMUX_V1_PCR_TCLKDIR (1 << 30) ++#define MXC_AUDMUX_V1_PCR_TFSDIR (1 << 31) ++ ++/* Register definitions for the i.MX25/31/35 Digital Audio Multiplexer */ ++#define MXC_AUDMUX_V2_PTCR_TFSDIR (1 << 31) ++#define MXC_AUDMUX_V2_PTCR_TFSEL(x) (((x) & 0xf) << 27) ++#define MXC_AUDMUX_V2_PTCR_TCLKDIR (1 << 26) ++#define MXC_AUDMUX_V2_PTCR_TCSEL(x) (((x) & 0xf) << 22) ++#define MXC_AUDMUX_V2_PTCR_RFSDIR (1 << 21) ++#define MXC_AUDMUX_V2_PTCR_RFSEL(x) (((x) & 0xf) << 17) ++#define MXC_AUDMUX_V2_PTCR_RCLKDIR (1 << 16) ++#define MXC_AUDMUX_V2_PTCR_RCSEL(x) (((x) & 0xf) << 12) ++#define MXC_AUDMUX_V2_PTCR_SYN (1 << 11) ++ ++#define MXC_AUDMUX_V2_PDCR_RXDSEL(x) (((x) & 0x7) << 13) ++#define MXC_AUDMUX_V2_PDCR_TXRXEN (1 << 12) ++#define MXC_AUDMUX_V2_PDCR_MODE(x) (((x) & 0x3) << 8) ++#define MXC_AUDMUX_V2_PDCR_INMMASK(x) ((x) & 0xff) ++ ++int mxc_audmux_v1_configure_port(unsigned int port, unsigned int pcr); ++ ++int mxc_audmux_v2_configure_port(unsigned int port, unsigned int ptcr, ++ unsigned int pdcr); ++ ++#endif /* __MACH_AUDMUX_H */ +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0008-MXC-NFC-The-i.MX35-CPU-also-uses-a-V2.1-NFC.patch b/recipes/linux/linux-2.6.31/pcm043/0008-MXC-NFC-The-i.MX35-CPU-also-uses-a-V2.1-NFC.patch new file mode 100644 index 0000000000..8d2a3c7247 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0008-MXC-NFC-The-i.MX35-CPU-also-uses-a-V2.1-NFC.patch @@ -0,0 +1,26 @@ +From b319bc5f9a9733e534a57b6725b94f438a1e406e Mon Sep 17 00:00:00 2001 +From: Juergen Beisert +Date: Tue, 29 Sep 2009 15:31:18 +0200 +Subject: [PATCH 08/15] MXC NFC: The i.MX35 CPU also uses a V2.1 NFC + +Signed-off-by: Juergen Beisert +--- + drivers/mtd/nand/mxc_nand_v2.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand_v2.c b/drivers/mtd/nand/mxc_nand_v2.c +index c1cbb05..3891d9a 100644 +--- a/drivers/mtd/nand/mxc_nand_v2.c ++++ b/drivers/mtd/nand/mxc_nand_v2.c +@@ -51,7 +51,7 @@ + #define NFC_V1_UNLOCKSTART_BLKADDR 0xe14 + #define NFC_V1_UNLOCKEND_BLKADDR 0xe16 + +-#define nfc_is_v21() cpu_is_mx25() ++#define nfc_is_v21() (cpu_is_mx25() || cpu_is_mx35()) + #define nfc_is_v2x() cpu_is_mx31() + + #define NFC_ECC_EN (1 << 3) +-- +1.6.1 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0008-mxc-nand-use-resource_size.patch b/recipes/linux/linux-2.6.31/pcm043/0008-mxc-nand-use-resource_size.patch new file mode 100644 index 0000000000..ab3b1a30c3 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0008-mxc-nand-use-resource_size.patch @@ -0,0 +1,26 @@ +From de6d94479735ef944c1463f42ed6192b1b226395 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 4 Jun 2009 16:16:01 +0200 +Subject: [PATCH] mxc nand: use resource_size() + +Signed-off-by: Sascha Hauer +--- + drivers/mtd/nand/mxc_nand.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c +index 74c5dbc..127e0b7 100644 +--- a/drivers/mtd/nand/mxc_nand.c ++++ b/drivers/mtd/nand/mxc_nand.c +@@ -865,7 +865,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) + goto eres; + } + +- host->regs = ioremap(res->start, res->end - res->start + 1); ++ host->regs = ioremap(res->start, resource_size(res)); + if (!host->regs) { + err = -ENOMEM; + goto eres; +-- +1.6.0.4 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0009-MX31-Fix-spi-clock-names.patch b/recipes/linux/linux-2.6.31/pcm043/0009-MX31-Fix-spi-clock-names.patch new file mode 100644 index 0000000000..f59d12723d --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0009-MX31-Fix-spi-clock-names.patch @@ -0,0 +1,32 @@ +From 6e58f781f2d5bedae9ff6991ac378212a392b723 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Fri, 20 Mar 2009 19:25:01 +0100 +Subject: [PATCH 09/28] MX31 Fix spi clock names + +Fix the SPI clock names to match the device names. + +Signed-off-by: Sascha Hauer +--- + arch/arm/mach-mx3/clock.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mach-mx3/clock.c b/arch/arm/mach-mx3/clock.c +index f25e8be..664148c 100644 +--- a/arch/arm/mach-mx3/clock.c ++++ b/arch/arm/mach-mx3/clock.c +@@ -518,9 +518,9 @@ DEFINE_CLOCK(ipg_clk, 0, NULL, 0, ipg_get_rate, NULL, &ahb_clk); + + static struct clk_lookup lookups[] = { + _REGISTER_CLOCK(NULL, "emi", emi_clk) +- _REGISTER_CLOCK(NULL, "cspi", cspi1_clk) +- _REGISTER_CLOCK(NULL, "cspi", cspi2_clk) +- _REGISTER_CLOCK(NULL, "cspi", cspi3_clk) ++ _REGISTER_CLOCK("spi_imx.0", NULL, cspi1_clk) ++ _REGISTER_CLOCK("spi_imx.1", NULL, cspi2_clk) ++ _REGISTER_CLOCK("spi_imx.2", NULL, cspi3_clk) + _REGISTER_CLOCK(NULL, "gpt", gpt_clk) + _REGISTER_CLOCK(NULL, "pwm", pwm_clk) + _REGISTER_CLOCK(NULL, "wdog", wdog_clk) +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0009-MXC-NFC-Fix-NFC-s-address-area-on-i.MX35.patch b/recipes/linux/linux-2.6.31/pcm043/0009-MXC-NFC-Fix-NFC-s-address-area-on-i.MX35.patch new file mode 100644 index 0000000000..18096a4c35 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0009-MXC-NFC-Fix-NFC-s-address-area-on-i.MX35.patch @@ -0,0 +1,28 @@ +From aa20693d5b25d2ed31a31265687a66b29d51737b Mon Sep 17 00:00:00 2001 +From: Juergen Beisert +Date: Tue, 29 Sep 2009 15:37:47 +0200 +Subject: [PATCH 09/15] MXC NFC: Fix NFC's address area on i.MX35 + +The address area of the NFS in the i.MX35 silicon is much larger than 4k. + +Signed-off-by: Juergen Beisert + +rebased to 2.6.31.6 +Signed-off-by: Jan Weitzel +--- + arch/arm/mach-mx3/devices.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: arch/arm/mach-mx3/devices.c +=================================================================== +--- arch/arm/mach-mx3/devices.c.orig 2009-12-10 13:38:53.334702610 +0100 ++++ arch/arm/mach-mx3/devices.c 2009-12-10 13:39:18.186144277 +0100 +@@ -585,7 +585,7 @@ + } + if (cpu_is_mx35()) { + mxc_nand_resources[0].start = MX35_NFC_BASE_ADDR; +- mxc_nand_resources[0].end = MX35_NFC_BASE_ADDR + 0xfff; ++ mxc_nand_resources[0].end = MX35_NFC_BASE_ADDR + 0x1fff; + otg_resources[0].start = MX35_OTG_BASE_ADDR; + otg_resources[0].end = MX35_OTG_BASE_ADDR + 0x1ff; + otg_resources[1].start = MXC_INT_USBOTG; diff --git a/recipes/linux/linux-2.6.31/pcm043/0009-mxc-nand-use-buffers.patch b/recipes/linux/linux-2.6.31/pcm043/0009-mxc-nand-use-buffers.patch new file mode 100644 index 0000000000..e48ff64f56 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0009-mxc-nand-use-buffers.patch @@ -0,0 +1,473 @@ +From 714bcc0f142a1f44fb6e15ad7505b9d234e8f914 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 4 Jun 2009 17:12:26 +0200 +Subject: [PATCH] mxc nand: use buffers + +The NAND controller has some limitations how to access the +internal buffers. It only allows 32 bit accesses. The driver +used to work around this by having special alignment aware +copy routines. +We now copy the whole page to a buffer in memory and let the +access functions use this buffer. This simplifies the driver. +A bonnie++ test showed that this has no negative performance +impact on the driver. + +Signed-off-by: Sascha Hauer +--- + drivers/mtd/nand/mxc_nand.c | 310 +++++++++++-------------------------------- + 1 files changed, 77 insertions(+), 233 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c +index 127e0b7..4c338ae 100644 +--- a/drivers/mtd/nand/mxc_nand.c ++++ b/drivers/mtd/nand/mxc_nand.c +@@ -107,15 +107,17 @@ struct mxc_nand_host { + struct device *dev; + + void __iomem *regs; +- int spare_only; + int status_request; + int pagesize_2k; +- uint16_t col_addr; + struct clk *clk; + int clk_act; + int irq; + + wait_queue_head_t irq_waitq; ++ ++ uint8_t *data_buf; ++ unsigned int buf_start; ++ int spare_len; + }; + + /* Define delays in microsec for NAND device operations */ +@@ -227,23 +229,11 @@ static void send_addr(struct mxc_nand_host *host, uint16_t addr, int islast) + } + + static void send_page(struct mxc_nand_host *host, uint8_t buf_id, +- int spare_only, unsigned int ops) ++ unsigned int ops) + { +- DEBUG(MTD_DEBUG_LEVEL3, "send_page (%d)\n", spare_only); +- + /* NANDFC buffer 0 is used for page read/write */ + writew(buf_id, host->regs + NFC_BUF_ADDR); + +- /* Configure spare or page+spare access */ +- if (!host->pagesize_2k) { +- uint16_t config1 = readw(host->regs + NFC_CONFIG1); +- if (spare_only) +- config1 |= NFC_SP_EN; +- else +- config1 &= ~(NFC_SP_EN); +- writew(config1, host->regs + NFC_CONFIG1); +- } +- + writew(ops, host->regs + NFC_CONFIG2); + + /* Wait for operation to complete */ +@@ -278,6 +268,7 @@ static void send_read_id(struct mxc_nand_host *host) + writeb(readb(main_buf + 8), main_buf + 4); + writeb(readb(main_buf + 10), main_buf + 5); + } ++ memcpy(host->data_buf, host->regs + MAIN_AREA0, 16); + } + + /* This function requests the NANDFC to perform a read of the +@@ -363,32 +354,14 @@ static u_char mxc_nand_read_byte(struct mtd_info *mtd) + { + struct nand_chip *nand_chip = mtd->priv; + struct mxc_nand_host *host = nand_chip->priv; +- uint8_t ret = 0; +- uint16_t col, rd_word; +- uint16_t __iomem *main_buf = host->regs + MAIN_AREA0; +- uint16_t __iomem *spare_buf = host->regs + SPARE_AREA0; ++ uint8_t ret; + + /* Check for status request */ + if (host->status_request) + return get_dev_status(host) & 0xFF; + +- /* Get column for 16-bit access */ +- col = host->col_addr >> 1; +- +- /* If we are accessing the spare region */ +- if (host->spare_only) +- rd_word = readw(&spare_buf[col]); +- else +- rd_word = readw(&main_buf[col]); +- +- /* Pick upper/lower byte of word from RAM buffer */ +- if (host->col_addr & 0x1) +- ret = (rd_word >> 8) & 0xFF; +- else +- ret = rd_word & 0xFF; +- +- /* Update saved column address */ +- host->col_addr++; ++ ret = *(uint8_t *)(host->data_buf + host->buf_start); ++ host->buf_start++; + + return ret; + } +@@ -397,33 +370,10 @@ static uint16_t mxc_nand_read_word(struct mtd_info *mtd) + { + struct nand_chip *nand_chip = mtd->priv; + struct mxc_nand_host *host = nand_chip->priv; +- uint16_t col, rd_word, ret; +- uint16_t __iomem *p; ++ uint16_t ret; + +- DEBUG(MTD_DEBUG_LEVEL3, +- "mxc_nand_read_word(col = %d)\n", host->col_addr); +- +- col = host->col_addr; +- /* Adjust saved column address */ +- if (col < mtd->writesize && host->spare_only) +- col += mtd->writesize; +- +- if (col < mtd->writesize) +- p = (host->regs + MAIN_AREA0) + (col >> 1); +- else +- p = (host->regs + SPARE_AREA0) + ((col - mtd->writesize) >> 1); +- +- if (col & 1) { +- rd_word = readw(p); +- ret = (rd_word >> 8) & 0xff; +- rd_word = readw(&p[1]); +- ret |= (rd_word << 8) & 0xff00; +- +- } else +- ret = readw(p); +- +- /* Update saved column address */ +- host->col_addr = col + 2; ++ ret = *(uint16_t *)(host->data_buf + host->buf_start); ++ host->buf_start += 2; + + return ret; + } +@@ -436,94 +386,14 @@ static void mxc_nand_write_buf(struct mtd_info *mtd, + { + struct nand_chip *nand_chip = mtd->priv; + struct mxc_nand_host *host = nand_chip->priv; +- int n, col, i = 0; +- +- DEBUG(MTD_DEBUG_LEVEL3, +- "mxc_nand_write_buf(col = %d, len = %d)\n", host->col_addr, +- len); +- +- col = host->col_addr; +- +- /* Adjust saved column address */ +- if (col < mtd->writesize && host->spare_only) +- col += mtd->writesize; +- +- n = mtd->writesize + mtd->oobsize - col; +- n = min(len, n); +- +- DEBUG(MTD_DEBUG_LEVEL3, +- "%s:%d: col = %d, n = %d\n", __func__, __LINE__, col, n); +- +- while (n) { +- void __iomem *p; +- +- if (col < mtd->writesize) +- p = host->regs + MAIN_AREA0 + (col & ~3); +- else +- p = host->regs + SPARE_AREA0 - +- mtd->writesize + (col & ~3); +- +- DEBUG(MTD_DEBUG_LEVEL3, "%s:%d: p = %p\n", __func__, +- __LINE__, p); +- +- if (((col | (int)&buf[i]) & 3) || n < 16) { +- uint32_t data = 0; +- +- if (col & 3 || n < 4) +- data = readl(p); +- +- switch (col & 3) { +- case 0: +- if (n) { +- data = (data & 0xffffff00) | +- (buf[i++] << 0); +- n--; +- col++; +- } +- case 1: +- if (n) { +- data = (data & 0xffff00ff) | +- (buf[i++] << 8); +- n--; +- col++; +- } +- case 2: +- if (n) { +- data = (data & 0xff00ffff) | +- (buf[i++] << 16); +- n--; +- col++; +- } +- case 3: +- if (n) { +- data = (data & 0x00ffffff) | +- (buf[i++] << 24); +- n--; +- col++; +- } +- } +- +- writel(data, p); +- } else { +- int m = mtd->writesize - col; ++ u16 col = host->buf_start; ++ int n = mtd->oobsize + mtd->writesize - col; + +- if (col >= mtd->writesize) +- m += mtd->oobsize; ++ n = min(n, len); + +- m = min(n, m) & ~3; ++ memcpy(host->data_buf + col, buf, n); + +- DEBUG(MTD_DEBUG_LEVEL3, +- "%s:%d: n = %d, m = %d, i = %d, col = %d\n", +- __func__, __LINE__, n, m, i, col); +- +- memcpy(p, &buf[i], m); +- col += m; +- i += m; +- n -= m; +- } +- } +- /* Update saved column address */ +- host->col_addr = col; ++ host->buf_start += n; + } + + /* Read the data buffer from the NAND Flash. To read the data from NAND +@@ -534,75 +404,14 @@ static void mxc_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len) + { + struct nand_chip *nand_chip = mtd->priv; + struct mxc_nand_host *host = nand_chip->priv; +- int n, col, i = 0; ++ u16 col = host->buf_start; ++ int n = mtd->oobsize + mtd->writesize - col; + +- DEBUG(MTD_DEBUG_LEVEL3, +- "mxc_nand_read_buf(col = %d, len = %d)\n", host->col_addr, len); +- +- col = host->col_addr; +- +- /* Adjust saved column address */ +- if (col < mtd->writesize && host->spare_only) +- col += mtd->writesize; +- +- n = mtd->writesize + mtd->oobsize - col; +- n = min(len, n); +- +- while (n) { +- void __iomem *p; +- +- if (col < mtd->writesize) +- p = host->regs + MAIN_AREA0 + (col & ~3); +- else +- p = host->regs + SPARE_AREA0 - +- mtd->writesize + (col & ~3); +- +- if (((col | (int)&buf[i]) & 3) || n < 16) { +- uint32_t data; +- +- data = readl(p); +- switch (col & 3) { +- case 0: +- if (n) { +- buf[i++] = (uint8_t) (data); +- n--; +- col++; +- } +- case 1: +- if (n) { +- buf[i++] = (uint8_t) (data >> 8); +- n--; +- col++; +- } +- case 2: +- if (n) { +- buf[i++] = (uint8_t) (data >> 16); +- n--; +- col++; +- } +- case 3: +- if (n) { +- buf[i++] = (uint8_t) (data >> 24); +- n--; +- col++; +- } +- } +- } else { +- int m = mtd->writesize - col; ++ n = min(n, len); + +- if (col >= mtd->writesize) +- m += mtd->oobsize; +- +- m = min(n, m) & ~3; +- memcpy(&buf[i], p, m); +- col += m; +- i += m; +- n -= m; +- } +- } +- /* Update saved column address */ +- host->col_addr = col; ++ memcpy(buf, host->data_buf + col, len); + ++ host->buf_start += len; + } + + /* Used by the upper layer to verify the data in NAND Flash +@@ -641,6 +450,36 @@ static void mxc_nand_select_chip(struct mtd_info *mtd, int chip) + } + } + ++/* ++ * Function to transfer data to/from spare area. ++ */ ++static void copy_spare(struct mtd_info *mtd, bool bfrom) ++{ ++ struct nand_chip *this = mtd->priv; ++ struct mxc_nand_host *host = this->priv; ++ u16 i, j; ++ u16 n = mtd->writesize >> 9; ++ u8 *d = host->data_buf + mtd->writesize; ++ u8 *s = host->regs + SPARE_AREA0; ++ u16 t = host->spare_len; ++ ++ j = (mtd->oobsize / n >> 1) << 1; ++ ++ if (bfrom) { ++ for (i = 0; i < n - 1; i++) ++ memcpy(d + i * j, s + i * t, j); ++ ++ /* the last section */ ++ memcpy(d + i * j, s + i * t, mtd->oobsize - i * j); ++ } else { ++ for (i = 0; i < n - 1; i++) ++ memcpy(&s[i * t], &d[i * j], j); ++ ++ /* the last section */ ++ memcpy(&s[i * t], &d[i * j], mtd->oobsize - i * j); ++ } ++} ++ + static void mxc_do_addr_cycle(struct mtd_info *mtd, int column, int page_addr) + { + struct nand_chip *nand_chip = mtd->priv; +@@ -707,19 +546,18 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + switch (command) { + + case NAND_CMD_STATUS: +- host->col_addr = 0; ++ host->buf_start = 0; + host->status_request = true; + break; + + case NAND_CMD_READ0: +- host->col_addr = column; +- host->spare_only = false; ++ host->buf_start = column; + useirq = false; + break; + + case NAND_CMD_READOOB: +- host->col_addr = column; +- host->spare_only = true; ++ host->buf_start = column + mtd->writesize; ++ + useirq = false; + if (host->pagesize_2k) + command = NAND_CMD_READ0; /* only READ0 is valid */ +@@ -739,15 +577,13 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + mxc_nand_command(mtd, NAND_CMD_READ0, 0, + page_addr); + +- host->col_addr = column - mtd->writesize; +- host->spare_only = true; ++ host->buf_start = column; + + /* Set program pointer to spare region */ + if (!host->pagesize_2k) + send_cmd(host, NAND_CMD_READOOB, false); + } else { +- host->spare_only = false; +- host->col_addr = column; ++ host->buf_start = column; + + /* Set program pointer to page start */ + if (!host->pagesize_2k) +@@ -757,13 +593,15 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + break; + + case NAND_CMD_PAGEPROG: +- send_page(host, 0, host->spare_only, NFC_INPUT); ++ memcpy(host->regs + MAIN_AREA0, host->data_buf, mtd->writesize); ++ copy_spare(mtd, false); ++ send_page(host, 0, NFC_INPUT); + + if (host->pagesize_2k) { + /* data in 4 areas datas */ +- send_page(host, 1, host->spare_only, NFC_INPUT); +- send_page(host, 2, host->spare_only, NFC_INPUT); +- send_page(host, 3, host->spare_only, NFC_INPUT); ++ send_page(host, 1, NFC_INPUT); ++ send_page(host, 2, NFC_INPUT); ++ send_page(host, 3, NFC_INPUT); + } + + break; +@@ -789,16 +627,18 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + /* send read confirm command */ + send_cmd(host, NAND_CMD_READSTART, true); + /* read for each AREA */ +- send_page(host, 0, host->spare_only, NFC_OUTPUT); +- send_page(host, 1, host->spare_only, NFC_OUTPUT); +- send_page(host, 2, host->spare_only, NFC_OUTPUT); +- send_page(host, 3, host->spare_only, NFC_OUTPUT); ++ send_page(host, 0, NFC_OUTPUT); ++ send_page(host, 1, NFC_OUTPUT); ++ send_page(host, 2, NFC_OUTPUT); ++ send_page(host, 3, NFC_OUTPUT); + } else +- send_page(host, 0, host->spare_only, NFC_OUTPUT); ++ send_page(host, 0, NFC_OUTPUT); ++ ++ memcpy(host->data_buf, host->regs + MAIN_AREA0, mtd->writesize); ++ copy_spare(mtd, true); + break; + + case NAND_CMD_READID: +- host->col_addr = 0; + send_read_id(host); + break; + +@@ -824,10 +664,14 @@ static int __init mxcnd_probe(struct platform_device *pdev) + int err = 0, nr_parts = 0; + + /* Allocate memory for MTD device structure and private data */ +- host = kzalloc(sizeof(struct mxc_nand_host), GFP_KERNEL); ++ host = kzalloc(sizeof(struct mxc_nand_host) + NAND_MAX_PAGESIZE + ++ NAND_MAX_OOBSIZE, GFP_KERNEL); + if (!host) + return -ENOMEM; + ++ host->data_buf = (uint8_t *)(host + 1); ++ host->spare_len = 16; ++ + host->dev = &pdev->dev; + /* structures must be linked */ + this = &host->nand; +-- +1.6.0.4 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0010-MXC-NFC-Add-the-clock-resource-to-support-NFC-in-i.patch b/recipes/linux/linux-2.6.31/pcm043/0010-MXC-NFC-Add-the-clock-resource-to-support-NFC-in-i.patch new file mode 100644 index 0000000000..294acbc5f3 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0010-MXC-NFC-Add-the-clock-resource-to-support-NFC-in-i.patch @@ -0,0 +1,61 @@ +From db1d93750d22c87b588ade0c8e083f8d94ddf88b Mon Sep 17 00:00:00 2001 +From: Juergen Beisert +Date: Tue, 29 Sep 2009 15:44:00 +0200 +Subject: [PATCH 10/15] MXC NFC: Add the clock resource to support NFC in i.MX35 + +Signed-off-by: Juergen Beisert + +rebased to 2.6.31.6 +Signed-off-by: Jan Weitzel +--- + arch/arm/mach-mx3/clock-imx35.c | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) + +Index: arch/arm/mach-mx3/clock-imx35.c +=================================================================== +--- arch/arm/mach-mx3/clock-imx35.c.orig 2009-12-08 11:03:44.248614597 +0100 ++++ arch/arm/mach-mx3/clock-imx35.c 2009-12-08 11:04:48.958686514 +0100 +@@ -387,6 +387,35 @@ + DEFINE_CLOCK(iim_clk, 0, CCM_CGR3, 2, NULL, NULL); + DEFINE_CLOCK(gpu2d_clk, 0, CCM_CGR3, 4, NULL, NULL); + ++static int clk_dummy_enable(struct clk *clk) ++{ ++ return 0; ++} ++ ++static void clk_dummy_disable(struct clk *clk) ++{ ++} ++ ++static unsigned long get_rate_nfc(struct clk *clk) ++{ ++ unsigned long div1; ++ ++ div1 = (__raw_readl(CCM_BASE + CCM_PDR4) >> 28) + 1; ++ ++ return get_rate_ahb(NULL) / div1; ++} ++ ++/* NAND Controller: It seems it can't be disabled */ ++static struct clk nfc_clk = { ++ .id = 0, ++ .enable_reg = 0, ++ .enable_shift = 0, ++ .get_rate = get_rate_nfc, ++ .set_rate = NULL, /* set_rate_nfc, */ ++ .enable = clk_dummy_enable, ++ .disable = clk_dummy_disable ++}; ++ + #define _REGISTER_CLOCK(d, n, c) \ + { \ + .dev_id = d, \ +@@ -448,6 +477,7 @@ + _REGISTER_CLOCK(NULL, "csi", csi_clk) + _REGISTER_CLOCK(NULL, "iim", iim_clk) + _REGISTER_CLOCK(NULL, "gpu2d", gpu2d_clk) ++ _REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk) + }; + + int __init mx35_clocks_init() diff --git a/recipes/linux/linux-2.6.31/pcm043/0010-i.MX35-Fix-audmux-clock.patch b/recipes/linux/linux-2.6.31/pcm043/0010-i.MX35-Fix-audmux-clock.patch new file mode 100644 index 0000000000..765c783442 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0010-i.MX35-Fix-audmux-clock.patch @@ -0,0 +1,52 @@ +From 4e3f4ad37028ae59f910cff4cf9ce2f1acc62d66 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Mon, 2 Nov 2009 09:49:41 +0100 +Subject: [PATCH 10/28] i.MX35: Fix audmux clock + +Signed-off-by: Sascha Hauer +--- + arch/arm/mach-mx3/clock-imx35.c | 7 +++---- + 1 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/mach-mx3/clock-imx35.c b/arch/arm/mach-mx3/clock-imx35.c +index 02b2507..9c0ec17 100644 +--- a/arch/arm/mach-mx3/clock-imx35.c ++++ b/arch/arm/mach-mx3/clock-imx35.c +@@ -322,7 +322,7 @@ static void clk_cgr_disable(struct clk *clk) + + DEFINE_CLOCK(asrc_clk, 0, CCM_CGR0, 0, NULL, NULL); + DEFINE_CLOCK(ata_clk, 0, CCM_CGR0, 2, get_rate_ipg, NULL); +-DEFINE_CLOCK(audmux_clk, 0, CCM_CGR0, 4, NULL, NULL); ++/* DEFINE_CLOCK(audmux_clk, 0, CCM_CGR0, 4, NULL, NULL); */ + DEFINE_CLOCK(can1_clk, 0, CCM_CGR0, 6, get_rate_ipg, NULL); + DEFINE_CLOCK(can2_clk, 1, CCM_CGR0, 8, get_rate_ipg, NULL); + DEFINE_CLOCK(cspi1_clk, 0, CCM_CGR0, 10, get_rate_ipg, NULL); +@@ -368,7 +368,7 @@ DEFINE_CLOCK(uart3_clk, 2, CCM_CGR2, 20, get_rate_uart, NULL); + DEFINE_CLOCK(usbotg_clk, 0, CCM_CGR2, 22, NULL, NULL); + DEFINE_CLOCK(wdog_clk, 0, CCM_CGR2, 24, NULL, NULL); + DEFINE_CLOCK(max_clk, 0, CCM_CGR2, 26, NULL, NULL); +-DEFINE_CLOCK(admux_clk, 0, CCM_CGR2, 30, NULL, NULL); ++DEFINE_CLOCK(audmux_clk, 0, CCM_CGR2, 30, NULL, NULL); + + DEFINE_CLOCK(csi_clk, 0, CCM_CGR3, 0, get_rate_csi, NULL); + DEFINE_CLOCK(iim_clk, 0, CCM_CGR3, 2, NULL, NULL); +@@ -384,7 +384,6 @@ DEFINE_CLOCK(gpu2d_clk, 0, CCM_CGR3, 4, NULL, NULL); + static struct clk_lookup lookups[] = { + _REGISTER_CLOCK(NULL, "asrc", asrc_clk) + _REGISTER_CLOCK(NULL, "ata", ata_clk) +- _REGISTER_CLOCK(NULL, "audmux", audmux_clk) + _REGISTER_CLOCK(NULL, "can", can1_clk) + _REGISTER_CLOCK(NULL, "can", can2_clk) + _REGISTER_CLOCK("spi_imx.0", NULL, cspi1_clk) +@@ -429,7 +428,7 @@ static struct clk_lookup lookups[] = { + _REGISTER_CLOCK(NULL, "usbotg", usbotg_clk) + _REGISTER_CLOCK("mxc_wdt.0", NULL, wdog_clk) + _REGISTER_CLOCK(NULL, "max", max_clk) +- _REGISTER_CLOCK(NULL, "admux", admux_clk) ++ _REGISTER_CLOCK(NULL, "audmux", audmux_clk) + _REGISTER_CLOCK(NULL, "csi", csi_clk) + _REGISTER_CLOCK(NULL, "iim", iim_clk) + _REGISTER_CLOCK(NULL, "gpu2d", gpu2d_clk) +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0010-mxc-nand-simplify-command-processing.patch b/recipes/linux/linux-2.6.31/pcm043/0010-mxc-nand-simplify-command-processing.patch new file mode 100644 index 0000000000..a7d5cda821 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0010-mxc-nand-simplify-command-processing.patch @@ -0,0 +1,143 @@ +From c1aef45fdb7e5281904ea25c035025d6cc19eff6 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 4 Jun 2009 17:18:01 +0200 +Subject: [PATCH] mxc nand: simplify command processing + +Instead of having two switch/case with other operations +in between, use only one switch/case + +Signed-off-by: Sascha Hauer +--- + drivers/mtd/nand/mxc_nand.c | 81 ++++++++++++++++++------------------------ + 1 files changed, 35 insertions(+), 46 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c +index 4c338ae..e5de71a 100644 +--- a/drivers/mtd/nand/mxc_nand.c ++++ b/drivers/mtd/nand/mxc_nand.c +@@ -533,7 +533,6 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + { + struct nand_chip *nand_chip = mtd->priv; + struct mxc_nand_host *host = nand_chip->priv; +- int useirq = true; + + DEBUG(MTD_DEBUG_LEVEL3, + "mxc_nand_command (cmd = 0x%x, col = 0x%x, page = 0x%x)\n", +@@ -548,19 +547,37 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + case NAND_CMD_STATUS: + host->buf_start = 0; + host->status_request = true; +- break; + +- case NAND_CMD_READ0: +- host->buf_start = column; +- useirq = false; ++ send_cmd(host, command, true); ++ mxc_do_addr_cycle(mtd, column, page_addr); + break; + ++ case NAND_CMD_READ0: + case NAND_CMD_READOOB: +- host->buf_start = column + mtd->writesize; ++ if (command == NAND_CMD_READ0) ++ host->buf_start = column; ++ else ++ host->buf_start = column + mtd->writesize; + +- useirq = false; + if (host->pagesize_2k) + command = NAND_CMD_READ0; /* only READ0 is valid */ ++ ++ send_cmd(host, command, false); ++ mxc_do_addr_cycle(mtd, column, page_addr); ++ ++ if (host->pagesize_2k) { ++ /* send read confirm command */ ++ send_cmd(host, NAND_CMD_READSTART, true); ++ /* read for each AREA */ ++ send_page(host, 0, NFC_OUTPUT); ++ send_page(host, 1, NFC_OUTPUT); ++ send_page(host, 2, NFC_OUTPUT); ++ send_page(host, 3, NFC_OUTPUT); ++ } else ++ send_page(host, 0, NFC_OUTPUT); ++ ++ memcpy(host->data_buf, host->regs + MAIN_AREA0, mtd->writesize); ++ copy_spare(mtd, true); + break; + + case NAND_CMD_SEQIN: +@@ -589,7 +606,9 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + if (!host->pagesize_2k) + send_cmd(host, NAND_CMD_READ0, false); + } +- useirq = false; ++ ++ send_cmd(host, command, false); ++ mxc_do_addr_cycle(mtd, column, page_addr); + break; + + case NAND_CMD_PAGEPROG: +@@ -604,51 +623,21 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + send_page(host, 3, NFC_INPUT); + } + +- break; +- +- case NAND_CMD_ERASE1: +- useirq = false; +- break; +- } +- +- /* Write out the command to the device. */ +- send_cmd(host, command, useirq); +- mxc_do_addr_cycle(mtd, column, page_addr); +- +- /* Command post-processing step */ +- switch (command) { +- +- case NAND_CMD_RESET: +- break; +- +- case NAND_CMD_READOOB: +- case NAND_CMD_READ0: +- if (host->pagesize_2k) { +- /* send read confirm command */ +- send_cmd(host, NAND_CMD_READSTART, true); +- /* read for each AREA */ +- send_page(host, 0, NFC_OUTPUT); +- send_page(host, 1, NFC_OUTPUT); +- send_page(host, 2, NFC_OUTPUT); +- send_page(host, 3, NFC_OUTPUT); +- } else +- send_page(host, 0, NFC_OUTPUT); +- +- memcpy(host->data_buf, host->regs + MAIN_AREA0, mtd->writesize); +- copy_spare(mtd, true); ++ send_cmd(host, command, true); ++ mxc_do_addr_cycle(mtd, column, page_addr); + break; + + case NAND_CMD_READID: ++ send_cmd(host, command, true); ++ mxc_do_addr_cycle(mtd, column, page_addr); + send_read_id(host); + break; + +- case NAND_CMD_PAGEPROG: +- break; +- +- case NAND_CMD_STATUS: +- break; +- ++ case NAND_CMD_ERASE1: + case NAND_CMD_ERASE2: ++ send_cmd(host, command, false); ++ mxc_do_addr_cycle(mtd, column, page_addr); ++ + break; + } + } +-- +1.6.0.4 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0011-MX31-add-spi-controller-devices-resources.patch b/recipes/linux/linux-2.6.31/pcm043/0011-MX31-add-spi-controller-devices-resources.patch new file mode 100644 index 0000000000..66e425bac5 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0011-MX31-add-spi-controller-devices-resources.patch @@ -0,0 +1,97 @@ +From 5a3ba6a98a5822698ad4552a4af47b3230807952 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Fri, 19 Dec 2008 14:32:15 +0100 +Subject: [PATCH 11/28] MX31: add spi controller devices/resources + +Signed-off-by: Sascha Hauer +--- + arch/arm/mach-mx3/devices.c | 61 +++++++++++++++++++++++++++++++++++++++++++ + arch/arm/mach-mx3/devices.h | 3 ++ + 2 files changed, 64 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c +index 06dab5f..c32049a 100644 +--- a/arch/arm/mach-mx3/devices.c ++++ b/arch/arm/mach-mx3/devices.c +@@ -454,6 +454,67 @@ struct platform_device imx_ssi_device1 = { + .resource = imx_ssi_resources1, + }; + ++/* ++ * SPI master controller ++ * 3 channels ++ */ ++static struct resource imx_spi_0_resources[] = { ++ { ++ .start = CSPI1_BASE_ADDR, ++ .end = CSPI1_BASE_ADDR + SZ_4K - 1, ++ .flags = IORESOURCE_MEM, ++ }, { ++ .start = MXC_INT_CSPI1, ++ .end = MXC_INT_CSPI1, ++ .flags = IORESOURCE_IRQ, ++ }, ++}; ++ ++static struct resource imx_spi_1_resources[] = { ++ { ++ .start = CSPI2_BASE_ADDR, ++ .end = CSPI2_BASE_ADDR + SZ_4K - 1, ++ .flags = IORESOURCE_MEM, ++ }, { ++ .start = MXC_INT_CSPI2, ++ .end = MXC_INT_CSPI2, ++ .flags = IORESOURCE_IRQ, ++ }, ++}; ++ ++static struct resource imx_spi_2_resources[] = { ++ { ++ .start = CSPI3_BASE_ADDR, ++ .end = CSPI3_BASE_ADDR + SZ_4K - 1, ++ .flags = IORESOURCE_MEM, ++ }, { ++ .start = MXC_INT_CSPI3, ++ .end = MXC_INT_CSPI3, ++ .flags = IORESOURCE_IRQ, ++ }, ++}; ++ ++struct platform_device imx_spi_device0 = { ++ .name = "spi_imx", ++ .id = 0, ++ .num_resources = ARRAY_SIZE(imx_spi_0_resources), ++ .resource = imx_spi_0_resources, ++}; ++ ++struct platform_device imx_spi_device1 = { ++ .name = "spi_imx", ++ .id = 1, ++ .num_resources = ARRAY_SIZE(imx_spi_1_resources), ++ .resource = imx_spi_1_resources, ++}; ++ ++struct platform_device imx_spi_device2 = { ++ .name = "spi_imx", ++ .id = 2, ++ .num_resources = ARRAY_SIZE(imx_spi_2_resources), ++ .resource = imx_spi_2_resources, ++}; ++ + static int mx3_devices_init(void) + { + if (cpu_is_mx31()) { +diff --git a/arch/arm/mach-mx3/devices.h b/arch/arm/mach-mx3/devices.h +index 224c2eb..402b60e 100644 +--- a/arch/arm/mach-mx3/devices.h ++++ b/arch/arm/mach-mx3/devices.h +@@ -19,3 +19,6 @@ extern struct platform_device mxc_otg_udc_device; + extern struct platform_device mxc_rnga_device; + extern struct platform_device imx_ssi_device0; + extern struct platform_device imx_ssi_device1; ++extern struct platform_device imx_spi_device0; ++extern struct platform_device imx_spi_device1; ++extern struct platform_device imx_spi_device2; +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0011-MXC-NFC-Fix-NFC-s-clock-name.patch b/recipes/linux/linux-2.6.31/pcm043/0011-MXC-NFC-Fix-NFC-s-clock-name.patch new file mode 100644 index 0000000000..a2e1d28e71 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0011-MXC-NFC-Fix-NFC-s-clock-name.patch @@ -0,0 +1,28 @@ +From 3a28735748fbdeb6c8036f8f64998a4d44ab9228 Mon Sep 17 00:00:00 2001 +From: Juergen Beisert +Date: Tue, 29 Sep 2009 15:47:34 +0200 +Subject: [PATCH 11/15] MXC NFC: Fix NFC's clock name + +Use a name in a style like all other clocks. + +Signed-off-by: Juergen Beisert +--- + drivers/mtd/nand/mxc_nand_v2.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand_v2.c b/drivers/mtd/nand/mxc_nand_v2.c +index 3891d9a..bab3712 100644 +--- a/drivers/mtd/nand/mxc_nand_v2.c ++++ b/drivers/mtd/nand/mxc_nand_v2.c +@@ -858,7 +858,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) + this->read_buf = mxc_nand_read_buf; + this->verify_buf = mxc_nand_verify_buf; + +- host->clk = clk_get(&pdev->dev, "nfc_clk"); ++ host->clk = clk_get(&pdev->dev, NULL); + if (IS_ERR(host->clk)) { + err = PTR_ERR(host->clk); + goto eclk; +-- +1.6.1 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0011-mxc-nand-modify-send_page-to-send-all-pages-not-on.patch b/recipes/linux/linux-2.6.31/pcm043/0011-mxc-nand-modify-send_page-to-send-all-pages-not-on.patch new file mode 100644 index 0000000000..80979a897e --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0011-mxc-nand-modify-send_page-to-send-all-pages-not-on.patch @@ -0,0 +1,87 @@ +From 19cd65a26dafcb725b0b3c99b0a0d79534c8c460 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 4 Jun 2009 17:25:53 +0200 +Subject: [PATCH] mxc nand: modify send_page to send all pages, not only one + +Signed-off-by: Sascha Hauer +--- + drivers/mtd/nand/mxc_nand.c | 45 +++++++++++++++++++----------------------- + 1 files changed, 20 insertions(+), 25 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c +index e5de71a..04b2bf2 100644 +--- a/drivers/mtd/nand/mxc_nand.c ++++ b/drivers/mtd/nand/mxc_nand.c +@@ -228,16 +228,25 @@ static void send_addr(struct mxc_nand_host *host, uint16_t addr, int islast) + wait_op_done(host, TROP_US_DELAY, islast); + } + +-static void send_page(struct mxc_nand_host *host, uint8_t buf_id, +- unsigned int ops) ++static void send_page(struct mxc_nand_host *host, unsigned int ops) + { +- /* NANDFC buffer 0 is used for page read/write */ +- writew(buf_id, host->regs + NFC_BUF_ADDR); ++ int bufs, i; + +- writew(ops, host->regs + NFC_CONFIG2); ++ if (host->pagesize_2k) ++ bufs = 4; ++ else ++ bufs = 1; + +- /* Wait for operation to complete */ +- wait_op_done(host, TROP_US_DELAY, true); ++ for (i = 0; i < bufs; i++) { ++ ++ /* NANDFC buffer 0 is used for page read/write */ ++ writew(i, host->regs + NFC_BUF_ADDR); ++ ++ writew(ops, host->regs + NFC_CONFIG2); ++ ++ /* Wait for operation to complete */ ++ wait_op_done(host, TROP_US_DELAY, true); ++ } + } + + /* Request the NANDFC to perform a read of the NAND device ID. */ +@@ -565,16 +574,10 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + send_cmd(host, command, false); + mxc_do_addr_cycle(mtd, column, page_addr); + +- if (host->pagesize_2k) { +- /* send read confirm command */ ++ if (host->pagesize_2k) + send_cmd(host, NAND_CMD_READSTART, true); +- /* read for each AREA */ +- send_page(host, 0, NFC_OUTPUT); +- send_page(host, 1, NFC_OUTPUT); +- send_page(host, 2, NFC_OUTPUT); +- send_page(host, 3, NFC_OUTPUT); +- } else +- send_page(host, 0, NFC_OUTPUT); ++ ++ send_page(host, NFC_OUTPUT); + + memcpy(host->data_buf, host->regs + MAIN_AREA0, mtd->writesize); + copy_spare(mtd, true); +@@ -614,15 +617,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + case NAND_CMD_PAGEPROG: + memcpy(host->regs + MAIN_AREA0, host->data_buf, mtd->writesize); + copy_spare(mtd, false); +- send_page(host, 0, NFC_INPUT); +- +- if (host->pagesize_2k) { +- /* data in 4 areas datas */ +- send_page(host, 1, NFC_INPUT); +- send_page(host, 2, NFC_INPUT); +- send_page(host, 3, NFC_INPUT); +- } +- ++ send_page(host, NFC_INPUT); + send_cmd(host, command, true); + mxc_do_addr_cycle(mtd, column, page_addr); + break; +-- +1.6.0.4 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0012-MXC-NFC-i.MX35-can-work-with-the-v2-not-with-v1-of.patch b/recipes/linux/linux-2.6.31/pcm043/0012-MXC-NFC-i.MX35-can-work-with-the-v2-not-with-v1-of.patch new file mode 100644 index 0000000000..9a88af093b --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0012-MXC-NFC-i.MX35-can-work-with-the-v2-not-with-v1-of.patch @@ -0,0 +1,34 @@ +From 0013249e16bc7527bf63b483486ead97ea59839e Mon Sep 17 00:00:00 2001 +From: Juergen Beisert +Date: Tue, 29 Sep 2009 15:49:52 +0200 +Subject: [PATCH 12/15] MXC NFC: i.MX35 can work with the v2, not with v1 of this driver + +Signed-off-by: Juergen Beisert + +rebased to 2.6.31.6 +Signed-off-by: Jan Weitzel +--- + drivers/mtd/nand/Kconfig | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: drivers/mtd/nand/Kconfig +=================================================================== +--- drivers/mtd/nand/Kconfig.orig 2009-12-08 10:02:59.468654404 +0100 ++++ drivers/mtd/nand/Kconfig 2009-12-08 10:03:38.130073936 +0100 +@@ -421,14 +421,14 @@ + + config MTD_NAND_MXC + tristate "MXC NAND support" +- depends on ARCH_MX2 || ARCH_MX3 ++ depends on ARCH_MX2 || (ARCH_MX3 && !ARCH_MX35) + help + This enables the driver for the NAND flash controller on the + MXC processors. + + config MTD_NAND_MXC_V2 + tristate "MXC NAND support" +- depends on ARCH_MX25 ++ depends on ARCH_MX25 || ARCH_MX35 + help + This enables the driver for the NAND flash controller on the + MXC processors. diff --git a/recipes/linux/linux-2.6.31/pcm043/0012-i.MX27-clock-rename-spi-clocks-to-match-device.patch b/recipes/linux/linux-2.6.31/pcm043/0012-i.MX27-clock-rename-spi-clocks-to-match-device.patch new file mode 100644 index 0000000000..db2474ca72 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0012-i.MX27-clock-rename-spi-clocks-to-match-device.patch @@ -0,0 +1,30 @@ +From 3e3ef3c8c617d291bb674488cd2920ad9088451e Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 24 Sep 2009 09:58:52 +0200 +Subject: [PATCH 12/28] i.MX27 clock: rename spi clocks to match device + +Signed-off-by: Sascha Hauer +--- + arch/arm/mach-mx2/clock_imx27.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mach-mx2/clock_imx27.c b/arch/arm/mach-mx2/clock_imx27.c +index 5abb763..1e9d608 100644 +--- a/arch/arm/mach-mx2/clock_imx27.c ++++ b/arch/arm/mach-mx2/clock_imx27.c +@@ -638,9 +638,9 @@ static struct clk_lookup lookups[] = { + _REGISTER_CLOCK("mxc-mmc.0", NULL, sdhc1_clk) + _REGISTER_CLOCK("mxc-mmc.1", NULL, sdhc2_clk) + _REGISTER_CLOCK("mxc-mmc.2", NULL, sdhc3_clk) +- _REGISTER_CLOCK(NULL, "cspi1", cspi1_clk) +- _REGISTER_CLOCK(NULL, "cspi2", cspi2_clk) +- _REGISTER_CLOCK(NULL, "cspi3", cspi3_clk) ++ _REGISTER_CLOCK("spi_imx.0", NULL, cspi1_clk) ++ _REGISTER_CLOCK("spi_imx.1", NULL, cspi2_clk) ++ _REGISTER_CLOCK("spi_imx.2", NULL, cspi3_clk) + _REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk) + _REGISTER_CLOCK(NULL, "csi", csi_clk) + _REGISTER_CLOCK(NULL, "usb", usb_clk) +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0012-mxc_nand-remove-unused-defines.patch b/recipes/linux/linux-2.6.31/pcm043/0012-mxc_nand-remove-unused-defines.patch new file mode 100644 index 0000000000..8b4a438111 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0012-mxc_nand-remove-unused-defines.patch @@ -0,0 +1,31 @@ +From cf903eff4c30f2eca4a67951f5b66e961f0ba542 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Fri, 5 Jun 2009 10:55:32 +0200 +Subject: [PATCH] mxc_nand: remove unused defines + +Signed-off-by: Sascha Hauer +--- + drivers/mtd/nand/mxc_nand.c | 7 ------- + 1 files changed, 0 insertions(+), 7 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c +index 04b2bf2..2988f1d 100644 +--- a/drivers/mtd/nand/mxc_nand.c ++++ b/drivers/mtd/nand/mxc_nand.c +@@ -122,13 +122,6 @@ struct mxc_nand_host { + + /* Define delays in microsec for NAND device operations */ + #define TROP_US_DELAY 2000 +-/* Macros to get byte and bit positions of ECC */ +-#define COLPOS(x) ((x) >> 3) +-#define BITPOS(x) ((x) & 0xf) +- +-/* Define single bit Error positions in Main & Spare area */ +-#define MAIN_SINGLEBIT_ERROR 0x4 +-#define SPARE_SINGLEBIT_ERROR 0x1 + + /* OOB placement block for use with hardware ecc generation */ + static struct nand_ecclayout nand_hw_eccoob_smallpage = { +-- +1.6.0.4 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0013-MXC-NFC-Add-the-cpu_is_mx25-macro.patch b/recipes/linux/linux-2.6.31/pcm043/0013-MXC-NFC-Add-the-cpu_is_mx25-macro.patch new file mode 100644 index 0000000000..9fec47bf0b --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0013-MXC-NFC-Add-the-cpu_is_mx25-macro.patch @@ -0,0 +1,38 @@ +From 6b82a298e085e6bc47d1c241871578d66208ee0f Mon Sep 17 00:00:00 2001 +From: Juergen Beisert +Date: Tue, 29 Sep 2009 16:10:55 +0200 +Subject: [PATCH 13/15] MXC NFC: Add the cpu_is_mx25 macro + +To be able to compile this NFC driver we need all CPU macros to +distinguish the different revisions of the NFC. +Note: This macro is untested for the i.MX25 case. Tested for a +i.MX35 case only. + +Signed-off-by: Juergen Beisert +--- + arch/arm/plat-mxc/include/mach/mxc.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +Index: arch/arm/plat-mxc/include/mach/mxc.h +=================================================================== +--- arch/arm/plat-mxc/include/mach/mxc.h.orig ++++ arch/arm/plat-mxc/include/mach/mxc.h +@@ -58,6 +58,18 @@ extern unsigned int __mxc_cpu_type; + # define cpu_is_mx21() (0) + #endif + ++#ifdef CONFIG_MACH_MX25 ++# ifdef mxc_cpu_type ++# undef mxc_cpu_type ++# define mxc_cpu_type __mxc_cpu_type ++# else ++# define mxc_cpu_type MXC_CPU_MX25 ++# endif ++# define cpu_is_mx25() (mxc_cpu_type == MXC_CPU_MX25) ++#else ++# define cpu_is_mx25() (0) ++#endif ++ + #ifdef CONFIG_MACH_MX27 + # ifdef mxc_cpu_type + # undef mxc_cpu_type diff --git a/recipes/linux/linux-2.6.31/pcm043/0013-add-a-mc13783-codec-driver.patch b/recipes/linux/linux-2.6.31/pcm043/0013-add-a-mc13783-codec-driver.patch new file mode 100644 index 0000000000..c89b83d34b --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0013-add-a-mc13783-codec-driver.patch @@ -0,0 +1,834 @@ +From a0437114fe666815acb9f7573acdcdc36dc45203 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 22 Oct 2009 14:10:14 +0200 +Subject: [PATCH 13/28] add a mc13783 codec driver + +Signed-off-by: Sascha Hauer +--- + sound/soc/codecs/Kconfig | 4 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/mc13783.c | 730 ++++++++++++++++++++++++++++++++++++++++++++ + sound/soc/codecs/mc13783.h | 32 ++ + 4 files changed, 768 insertions(+), 0 deletions(-) + create mode 100644 sound/soc/codecs/mc13783.c + create mode 100644 sound/soc/codecs/mc13783.h + +diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig +index bbc97fd..34f5c94 100644 +--- a/sound/soc/codecs/Kconfig ++++ b/sound/soc/codecs/Kconfig +@@ -17,6 +17,7 @@ config SND_SOC_ALL_CODECS + select SND_SOC_AK4104 if SPI_MASTER + select SND_SOC_AK4535 if I2C + select SND_SOC_CS4270 if I2C ++ select SND_SOC_MC13783 if SPI + select SND_SOC_PCM3008 + select SND_SOC_SPDIF + select SND_SOC_SSM2602 if I2C +@@ -89,6 +90,9 @@ config SND_SOC_CS4270_VD33_ERRATA + config SND_SOC_L3 + tristate + ++config SND_SOC_MC13783 ++ tristate ++ + config SND_SOC_PCM3008 + tristate + +diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile +index 8b75305..0d3dbc7 100644 +--- a/sound/soc/codecs/Makefile ++++ b/sound/soc/codecs/Makefile +@@ -5,6 +5,7 @@ snd-soc-ak4104-objs := ak4104.o + snd-soc-ak4535-objs := ak4535.o + snd-soc-cs4270-objs := cs4270.o + snd-soc-l3-objs := l3.o ++snd-soc-mc13783-objs := mc13783.o + snd-soc-pcm3008-objs := pcm3008.o + snd-soc-spdif-objs := spdif_transciever.o + snd-soc-ssm2602-objs := ssm2602.o +@@ -42,6 +43,7 @@ obj-$(CONFIG_SND_SOC_AK4104) += snd-soc-ak4104.o + obj-$(CONFIG_SND_SOC_AK4535) += snd-soc-ak4535.o + obj-$(CONFIG_SND_SOC_CS4270) += snd-soc-cs4270.o + obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o ++obj-$(CONFIG_SND_SOC_MC13783) += snd-soc-mc13783.o + obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o + obj-$(CONFIG_SND_SOC_SPDIF) += snd-soc-spdif.o + obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o +diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c +new file mode 100644 +index 0000000..5a7b4e9 +--- /dev/null ++++ b/sound/soc/codecs/mc13783.c +@@ -0,0 +1,730 @@ ++/* ++ * Copyright 2008 Juergen Beisert, kernel@pengutronix.de ++ * Copyright 2009 Sascha Hauer, s.hauer@pengutronix.de ++ * ++ * Initial development of this code was funded by ++ * Phytec Messtechnik GmbH, http://www.phytec.de ++ * ++ * 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., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "mc13783.h" ++ ++#define PMIC_AUDIO_RX_0 36 ++#define PMIC_AUDIO_RX_1 37 ++#define PMIC_AUDIO_TX 38 ++#define PMIC_SSI_NETWORK 39 ++#define PMIC_AUDIO_CODEC 40 ++#define PMIC_AUDIO_DAC 41 ++ ++#define SSI_NETWORK_CDCTXRXSLOT(x) (((x) & 0x3) << 2) ++#define SSI_NETWORK_CDCTXSECSLOT(x) (((x) & 0x3) << 4) ++#define SSI_NETWORK_CDCRXSECSLOT(x) (((x) & 0x3) << 6) ++#define SSI_NETWORK_CDCRXSECGAIN(x) (((x) & 0x3) << 8) ++#define SSI_NETWORK_CDCSUMGAIN(x) (1 << 10) ++#define SSI_NETWORK_CDCFSDLY(x) (1 << 11) ++#define SSI_NETWORK_STDCSLOT(x) (((x) & 0x3) << 12) ++#define SSI_NETWORK_STDCRXSLOT(x) (((x) & 0x3) << 14) ++#define SSI_NETWORK_STDCRXSECSLOT(x) (((x) & 0x3) << 16) ++#define SSI_NETWORK_STDCRXSECGAIN(x) (((x) & 0x3) << 18) ++#define SSI_NETWORK_STDCSUMGAIN (1 << 20) ++ ++#define STEREO_DAC_STD_SSI_SEL (1 << 0) ++#define STEREO_DAC_STD_CLK_SEL (1 << 1) ++#define STEREO_DAC_STD_CSM (1 << 2) ++#define STEREO_DAC_STD_BCL_INV (1 << 3) ++#define STEREO_DAC_STD_CFS_INV (1 << 4) ++#define STEREO_DAC_STD_CFS(x) (((x) & 0x3) << 5) ++#define STEREO_DAC_STD_CLK(x) (((x) & 0x7) << 7) ++#define STEREO_DAC_STD_CFS_DLY_B (1 << 10) ++#define STEREO_DAC_STD_C_EN (1 << 11) ++#define STEREO_DAC_STD_C_CLK_EN (1 << 12) ++#define STEREO_DAC_STD_C_RESET (1 << 15) ++#define STEREO_DAC_SPDIF (1 << 16) ++#define STEREO_DAC_SR(x) (((x) & 0xf) << 17) ++ ++static struct mc13783 *mc13783; ++ ++struct mc13783_priv { ++ struct snd_soc_codec codec; ++ ++ u32 reg_cache[42]; ++ ++ int mc13783_asp_val; ++ int mc13783_alsp_val; ++}; ++ ++static unsigned int mc13783_read(struct snd_soc_codec *codec, ++ unsigned int reg) ++{ ++ struct mc13783_priv *priv = codec->private_data; ++ ++ return priv->reg_cache[reg]; ++} ++ ++static int mc13783_write(struct snd_soc_codec *codec, ++ unsigned int reg, unsigned int value) ++{ ++ struct mc13783_priv *priv = codec->private_data; ++ ++ priv->reg_cache[reg] = value; ++ ++ return mc13783_reg_write(mc13783, reg, value); ++} ++ ++/* Mapping between sample rates and register value */ ++static unsigned int mc13783_rates[] = { ++ 8000, 11025, 12000, 16000, ++ 22050, 24000, 32000, 44100, ++ 48000, 64000, 96000 ++}; ++ ++static int mc13783_pcm_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params, ++ struct snd_soc_dai *dai) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_device *socdev = rtd->socdev; ++ struct snd_soc_codec *codec = socdev->card->codec; ++ unsigned int rate = params_rate(params); ++ int i; ++ unsigned int reg; ++ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { ++ for (i = 0; i < ARRAY_SIZE(mc13783_rates); i++) { ++ if (rate == mc13783_rates[i]) { ++ snd_soc_update_bits(codec, PMIC_AUDIO_DAC, ++ 0xf << 17, i << 17); ++ return 0; ++ } ++ } ++ } else { ++ if (rate == 8000) ++ reg = 0; ++ else ++ reg = (1 << 10); ++ ++ snd_soc_update_bits(codec, PMIC_AUDIO_CODEC, ++ 0x1 << 10, reg); ++ ++ return 0; ++ } ++ ++ return -EINVAL; ++} ++ ++static int mc13783_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) ++{ ++ struct snd_soc_codec *codec = dai->codec; ++ unsigned int reg; ++ ++ if (dai->id == MC13783_ID_STEREO_DAC) ++ reg = mc13783_read(codec, PMIC_AUDIO_DAC); ++ else ++ reg = mc13783_read(codec, PMIC_AUDIO_CODEC); ++ ++ reg &= ~STEREO_DAC_STD_CFS(3); ++ reg &= ~STEREO_DAC_STD_BCL_INV; ++ reg &= ~STEREO_DAC_STD_CFS_INV; ++ reg &= ~STEREO_DAC_STD_CSM; ++ reg &= ~STEREO_DAC_STD_C_CLK_EN; ++ ++ /* DAI mode */ ++ switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { ++ case SND_SOC_DAIFMT_I2S: ++ reg |= STEREO_DAC_STD_CFS(2); ++ break; ++ case SND_SOC_DAIFMT_DSP_A: ++ reg |= STEREO_DAC_STD_CFS(1); ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ /* DAI clock inversion */ ++ switch (fmt & SND_SOC_DAIFMT_INV_MASK) { ++ case SND_SOC_DAIFMT_NB_NF: ++ reg |= STEREO_DAC_STD_BCL_INV; ++ break; ++ case SND_SOC_DAIFMT_NB_IF: ++ reg |= STEREO_DAC_STD_BCL_INV; ++ reg |= STEREO_DAC_STD_CFS_INV; ++ break; ++ case SND_SOC_DAIFMT_IB_NF: ++ break; ++ case SND_SOC_DAIFMT_IB_IF: ++ reg |= STEREO_DAC_STD_CFS_INV; ++ break; ++ } ++ ++ /* DAI clock master masks */ ++ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { ++ case SND_SOC_DAIFMT_CBM_CFM: ++ reg |= STEREO_DAC_STD_C_CLK_EN; ++ break; ++ case SND_SOC_DAIFMT_CBS_CFS: ++ reg |= STEREO_DAC_STD_CSM; ++ case SND_SOC_DAIFMT_CBM_CFS: ++ case SND_SOC_DAIFMT_CBS_CFM: ++ return -EINVAL; ++ } ++ ++ reg |= STEREO_DAC_STD_C_EN; /* DAC power up */ ++ reg |= STEREO_DAC_STD_C_RESET; /* reset filter */ ++ ++ if (dai->id == MC13783_ID_STEREO_DAC) ++ mc13783_write(codec, PMIC_AUDIO_DAC, reg); ++ else ++ mc13783_write(codec, PMIC_AUDIO_CODEC, reg); ++ ++ return 0; ++} ++ ++static int mc13783_set_sysclk(struct snd_soc_dai *dai, ++ int clk_id, unsigned int freq, int dir) ++{ ++ struct snd_soc_codec *codec = dai->codec; ++ int clk; ++ unsigned int reg; ++ ++ if (dai->id == MC13783_ID_STEREO_DAC) ++ reg = mc13783_read(codec, PMIC_AUDIO_DAC); ++ else ++ reg = mc13783_read(codec, PMIC_AUDIO_CODEC); ++ ++ reg &= ~STEREO_DAC_STD_CLK(0x7); ++ reg &= ~STEREO_DAC_STD_CLK_SEL; ++ ++ switch (freq) { ++ case 13000000: ++ clk = 0; ++ break; ++ case 15360000: ++ clk = 1; ++ break; ++ case 16800000: ++ clk = 2; ++ break; ++ case 26000000: ++ clk = 4; ++ break; ++ case 12000000: ++ clk = 5; ++ break; ++ case 3686400: ++ clk = 6; ++ break; ++ case 33600000: ++ clk = 7; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ if (clk_id == MC13783_CLK_CLIB) ++ reg |= STEREO_DAC_STD_CLK_SEL; ++ ++ reg |= STEREO_DAC_STD_CLK(clk); ++ ++ if (dai->id == MC13783_ID_STEREO_DAC) ++ mc13783_write(codec, PMIC_AUDIO_DAC, reg); ++ else ++ mc13783_write(codec, PMIC_AUDIO_CODEC, reg); ++ ++ return 0; ++} ++ ++static int mc13783_set_tdm_slot_codec(struct snd_soc_dai *dai, ++ unsigned int mask, int slots) ++{ ++ struct snd_soc_codec *codec = dai->codec; ++ unsigned int reg; ++ ++ if (slots != 4) ++ return -EINVAL; ++ ++ reg = mc13783_read(codec, PMIC_SSI_NETWORK); ++ ++ reg &= ~(0xfff << 0); ++ reg |= (0x00 << 2); /* primary timeslot RX/TX(?) is 0 */ ++ reg |= (0x01 << 4); /* secondary timeslot TX is 1 */ ++ reg |= (0x01 << 6); /* secondary timeslot RX is 1 */ ++ ++ mc13783_write(codec, PMIC_SSI_NETWORK, reg); ++ ++ return 0; ++} ++ ++static int mc13783_get_alsp(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); ++ struct mc13783_priv *priv = codec->private_data; ++ ++ ucontrol->value.integer.value[0] = priv->mc13783_alsp_val; ++ ++ return 0; ++} ++ ++static int mc13783_put_alsp(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); ++ struct mc13783_priv *priv = codec->private_data; ++ unsigned int reg; ++ ++ priv->mc13783_alsp_val = ucontrol->value.integer.value[0]; ++ ++ reg = mc13783_read(codec, PMIC_AUDIO_RX_0); ++ ++ reg &= ~((1 << 5) | (1 << 7)); ++ ++ if (priv->mc13783_alsp_val) ++ reg |= 1 << 5; ++ ++ if (priv->mc13783_alsp_val == 2) ++ reg |= 1 << 7; ++ ++ mc13783_write(codec, PMIC_AUDIO_RX_0, reg); ++ ++ return 0; ++} ++ ++static int mc13783_pcm_get(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); ++ int val; ++ ++ val = mc13783_read(codec, PMIC_AUDIO_RX_0); ++ ucontrol->value.enumerated.item[0] = (val >> 22) & 1; ++ ++ return 0; ++} ++ ++static int mc13783_pcm_put(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); ++ unsigned int r36, r37; ++ ++ r36 = mc13783_read(codec, PMIC_AUDIO_RX_0); ++ r37 = mc13783_read(codec, PMIC_AUDIO_RX_1); ++ ++ r36 &= ~(1 << 22); ++ r37 &= ~(1 << 5); ++ ++ if (ucontrol->value.enumerated.item[0]) { ++ r36 |= (1 << 22); ++ r37 |= (1 << 5); ++ } else { ++ r36 &= ~(1 << 22); ++ r37 &= ~(1 << 5); ++ } ++ ++ mc13783_write(codec, PMIC_AUDIO_RX_0, r36); ++ mc13783_write(codec, PMIC_AUDIO_RX_1, r37); ++ ++ return 0; ++} ++ ++static int mc13783_linein_get(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); ++ int val; ++ ++ val = mc13783_read(codec, PMIC_AUDIO_RX_0); ++ ucontrol->value.enumerated.item[0] = (val >> 23) & 1; ++ ++ return 0; ++} ++ ++static int mc13783_linein_put(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); ++ unsigned int r36, r37; ++ ++ r36 = mc13783_read(codec, PMIC_AUDIO_RX_0); ++ r37 = mc13783_read(codec, PMIC_AUDIO_RX_1); ++ ++ r36 &= ~(1 << 23); ++ r37 &= ~(1 << 10); ++ ++ if (ucontrol->value.enumerated.item[0]) { ++ r36 |= (1 << 23); ++ r37 |= (1 << 10); ++ } else { ++ r36 &= ~(1 << 23); ++ r37 &= ~(1 << 10); ++ } ++ ++ mc13783_write(codec, PMIC_AUDIO_RX_0, r36); ++ mc13783_write(codec, PMIC_AUDIO_RX_1, r37); ++ ++ return 0; ++} ++ ++static int mc13783_capure_cache; ++ ++static int mc13783_get_capture(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ ucontrol->value.enumerated.item[0] = mc13783_capure_cache; ++ return 0; ++} ++ ++#define AMC1REN (1 << 5) ++#define AMC2EN (1 << 9) ++#define ATXINEN (1 << 11) ++#define RXINREC (1 << 13) ++#define AMC1LEN (1 << 7) ++ ++static int mc13783_put_capture(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); ++ unsigned int r38, change; ++ ++ r38 = mc13783_read(codec, PMIC_AUDIO_TX); ++ ++ change = (mc13783_capure_cache != ucontrol->value.enumerated.item[0]); ++ mc13783_capure_cache = ucontrol->value.enumerated.item[0]; ++ r38 &= ~(AMC1REN | AMC2EN | ATXINEN | RXINREC | AMC1LEN); ++ ++ switch (mc13783_capure_cache) { ++ case 0: ++ break; ++ case 1: ++ r38 |= RXINREC; ++ break; ++ case 2: ++ r38 |= AMC1REN | AMC1LEN; ++ break; ++ case 3: ++ r38 |= AMC1REN; ++ break; ++ case 4: ++ r38 |= AMC2EN; ++ break; ++ case 5: ++ r38 |= AMC1LEN | AMC2EN; ++ break; ++ case 6: ++ r38 |= ATXINEN; ++ break; ++ case 7: ++ r38 |= AMC1LEN | ATXINEN; ++ break; ++ case 8: ++ r38 |= AMC1LEN | RXINREC; ++ break; ++ case 9: ++ r38 |= AMC1LEN; ++ break; ++ default: ++ break; ++ } ++ ++ mc13783_write(codec, PMIC_AUDIO_TX, r38); ++ ++ return change; ++} ++ ++static const char *mc13783_asp[] = {"Off", "Codec", "Right"}; ++static const char *mc13783_alsp[] = {"Off", "Codec", "Right"}; ++ ++static const char *mc13783_ahs[] = {"Codec", "Mixer"}; ++ ++static const char *mc13783_arxout[] = {"Codec", "Mixer"}; ++ ++static const char *mc13783_capture[] = {"off/off", "rxinl/rxinr", ++ "mc1lin/mc1rin", "off/mc1rin", "off/mc2in", "mc1lin/mc2in", ++ "off/txin", "mc1lin/txin", "mc1lin/rxinr", "mc1lin/off"}; ++ ++static const char *mc13783_3d_mixer[] = {"Stereo", "Phase Mix", ++ "Mono", "Mono Mix"}; ++ ++static const struct soc_enum mc13783_enum_asp = ++ SOC_ENUM_SINGLE(PMIC_AUDIO_RX_0, 3, ARRAY_SIZE(mc13783_asp), mc13783_asp); ++ ++static const struct soc_enum mc13783_enum_alsp = ++ SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(mc13783_alsp), mc13783_alsp); ++ ++static const struct soc_enum mc13783_enum_ahs = ++ SOC_ENUM_SINGLE(PMIC_AUDIO_RX_0, 11, ARRAY_SIZE(mc13783_ahs), ++ mc13783_ahs); ++ ++static const struct soc_enum mc13783_enum_arxout = ++ SOC_ENUM_SINGLE(PMIC_AUDIO_RX_0, 17, ARRAY_SIZE(mc13783_arxout), ++ mc13783_arxout); ++ ++static const struct soc_enum mc13783_enum_capture = ++ SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(mc13783_capture), mc13783_capture); ++ ++static const struct soc_enum mc13783_enum_3d_mixer = ++ SOC_ENUM_SINGLE(PMIC_AUDIO_RX_1, 16, ARRAY_SIZE(mc13783_3d_mixer), ++ mc13783_3d_mixer); ++ ++static struct snd_kcontrol_new mc13783_control_list[] = { ++ /* Output Routing */ ++ SOC_ENUM("Asp Source", mc13783_enum_asp), ++ SOC_ENUM_EXT("Alsp Source", mc13783_enum_alsp, mc13783_get_alsp, ++ mc13783_put_alsp), ++ SOC_ENUM("Ahs Source", mc13783_enum_ahs), ++ SOC_SINGLE("Ahsr enable", PMIC_AUDIO_RX_0, 9, 1, 0), ++ SOC_SINGLE("Ahsl enable", PMIC_AUDIO_RX_0, 10, 1, 0), ++ SOC_ENUM("Arxout Source", mc13783_enum_arxout), ++ SOC_SINGLE("ArxoutR enable", PMIC_AUDIO_RX_0, 16, 1, 0), ++ SOC_SINGLE("ArxoutL enable", PMIC_AUDIO_RX_0, 15, 1, 0), ++ SOC_SINGLE_EXT("PCM Playback Switch", 0, 0, 1, 0, mc13783_pcm_get, ++ mc13783_pcm_put), ++ SOC_SINGLE("PCM Playback Volume", PMIC_AUDIO_RX_1, 6, 15, 0), ++ SOC_SINGLE_EXT("Line in Switch", 0, 0, 1, 0, mc13783_linein_get, ++ mc13783_linein_put), ++ SOC_SINGLE("Line in Volume", PMIC_AUDIO_RX_1, 12, 15, 0), ++ SOC_ENUM_EXT("Capture Source", mc13783_enum_capture, mc13783_get_capture, ++ mc13783_put_capture), ++ SOC_DOUBLE("PCM Capture Volume", PMIC_AUDIO_TX, 19, 14, 31, 0), ++ SOC_ENUM("3D Control", mc13783_enum_3d_mixer), ++}; ++ ++static struct snd_soc_codec *mc13783_codec; ++ ++static int mc13783_probe(struct platform_device *pdev) ++{ ++ struct snd_soc_device *socdev = platform_get_drvdata(pdev); ++ struct snd_soc_codec *codec = mc13783_codec; ++ struct mc13783_priv *priv = codec->private_data; ++ int i, ret = 0; ++ ++ if (!mc13783_codec) { ++ dev_err(&pdev->dev, "Codec device not registered\n"); ++ return -ENODEV; ++ } ++ ++ /* these are the reset values */ ++ priv->reg_cache[PMIC_AUDIO_RX_0] = 0x001000; ++ priv->reg_cache[PMIC_AUDIO_RX_1] = 0x00d35A; ++ priv->reg_cache[PMIC_AUDIO_TX] = 0x420000; ++ priv->reg_cache[PMIC_SSI_NETWORK] = 0x013060; ++ priv->reg_cache[PMIC_AUDIO_CODEC] = 0x180027; ++ priv->reg_cache[PMIC_AUDIO_DAC] = 0x0e0004; ++ ++ /* VAUDIOON -> supply audio part, BIAS enable */ ++ priv->reg_cache[PMIC_AUDIO_RX_0] |= 0x3; ++ ++ for (i = 36; i < 42; i++) ++ mc13783_write(codec, i, priv->reg_cache[i]); ++ ++ socdev->card->codec = mc13783_codec; ++ ++ /* register pcms */ ++ ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); ++ if (ret < 0) { ++ dev_err(codec->dev, "failed to create pcms: %d\n", ret); ++ goto pcm_err; ++ } ++ ++ snd_soc_add_controls(codec, mc13783_control_list, ++ ARRAY_SIZE(mc13783_control_list)); ++ ret = snd_soc_init_card(socdev); ++ if (ret < 0) { ++ dev_err(codec->dev, "failed to register card: %d\n", ret); ++ goto card_err; ++ } ++ ++ return ret; ++ ++card_err: ++ snd_soc_free_pcms(socdev); ++ snd_soc_dapm_free(socdev); ++pcm_err: ++ return ret; ++} ++ ++static int mc13783_remove(struct platform_device *pdev) ++{ ++ struct snd_soc_device *socdev = platform_get_drvdata(pdev); ++ struct snd_soc_codec *codec = mc13783_codec; ++ unsigned int reg; ++ ++ reg = mc13783_read(codec, PMIC_AUDIO_RX_0); ++ ++ /* VAUDIOON -> switch off audio part, BIAS disable */ ++ reg &= ~0x3; ++ ++ mc13783_write(codec, PMIC_AUDIO_RX_0, reg); ++ ++ snd_soc_free_pcms(socdev); ++ snd_soc_dapm_free(socdev); ++ ++ return 0; ++} ++ ++#define MC13783_RATES_RECORD (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000) ++ ++#define MC13783_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ ++ SNDRV_PCM_FMTBIT_S24_LE) ++ ++static struct snd_soc_dai_ops mc13783_ops_dac = { ++ .hw_params = mc13783_pcm_hw_params, ++ .set_fmt = mc13783_set_fmt, ++ .set_sysclk = mc13783_set_sysclk, ++}; ++ ++static struct snd_soc_dai_ops mc13783_ops_voice_codec = { ++ .hw_params = mc13783_pcm_hw_params, ++ .set_fmt = mc13783_set_fmt, ++ .set_sysclk = mc13783_set_sysclk, ++ .set_tdm_slot = mc13783_set_tdm_slot_codec, ++}; ++ ++struct snd_soc_dai mc13783_dai[] = { ++ { ++ .name = "MC13783 Playback", ++ .id = MC13783_ID_STEREO_DAC, ++ .playback = { ++ .stream_name = "Playback", ++ .channels_min = 1, ++ .channels_max = 2, ++ .rates = SNDRV_PCM_RATE_8000_96000, ++ .formats = MC13783_FORMATS, ++ }, ++ .ops = &mc13783_ops_dac, ++ }, { ++ .name = "MC13783 Capture", ++ .id = MC13783_ID_STEREO_CODEC, ++ .capture = { ++ .stream_name = "Capture", ++ .channels_min = 1, ++ .channels_max = 2, ++ .rates = MC13783_RATES_RECORD, ++ .formats = MC13783_FORMATS, ++ }, ++ .ops = &mc13783_ops_voice_codec, ++ }, ++}; ++EXPORT_SYMBOL_GPL(mc13783_dai); ++ ++struct snd_soc_codec_device soc_codec_dev_mc13783 = { ++ .probe = mc13783_probe, ++ .remove = mc13783_remove, ++}; ++EXPORT_SYMBOL_GPL(soc_codec_dev_mc13783); ++ ++/* ++ * OK, this stinks. We currently only can support one MC13783. ++ * Lets take it as an intermediate to turn this stuff into SoC ++ * Audio. ++ */ ++static int mc13783_codec_probe(struct platform_device *pdev) ++{ ++ struct mc13783_priv *priv; ++ struct snd_soc_codec *codec; ++ int ret; ++ ++ if (mc13783) ++ return -EBUSY; ++ ++ mc13783 = dev_get_drvdata(pdev->dev.parent); ++ ++ priv = kzalloc(sizeof(struct mc13783_priv), GFP_KERNEL); ++ if (priv == NULL) ++ return -ENOMEM; ++ ++ codec = &priv->codec; ++ codec->private_data = priv; ++ mc13783_codec = codec; ++ ++ mutex_init(&codec->mutex); ++ INIT_LIST_HEAD(&codec->dapm_widgets); ++ INIT_LIST_HEAD(&codec->dapm_paths); ++ ++ codec->name = "mc13783"; ++ codec->owner = THIS_MODULE; ++ codec->read = mc13783_read; ++ codec->write = mc13783_write; ++ codec->dai = mc13783_dai; ++ codec->num_dai = ARRAY_SIZE(mc13783_dai); ++ codec->control_data = priv; ++ codec->dev = &pdev->dev; ++ ++ mc13783_dai[0].dev = codec->dev; ++ mc13783_dai[1].dev = codec->dev; ++ ++ ret = snd_soc_register_codec(codec); ++ if (ret) ++ goto err_register_codec; ++ ++ ret = snd_soc_register_dais(mc13783_dai, ARRAY_SIZE(mc13783_dai)); ++ if (ret) ++ goto err_register_dais; ++ ++ return 0; ++ ++err_register_dais: ++ snd_soc_unregister_codec(codec); ++err_register_codec: ++ dev_err(&pdev->dev, "register codec failed with %d\n", ret); ++ kfree(priv); ++ ++ return ret; ++} ++ ++static int mc13783_codec_remove(struct platform_device *pdev) ++{ ++ snd_soc_unregister_codec(mc13783_codec); ++ snd_soc_unregister_dais(mc13783_dai, ARRAY_SIZE(mc13783_dai)); ++ ++ mc13783 = NULL; ++ ++ return 0; ++} ++ ++static struct platform_driver mc13783_codec_driver = { ++ .driver = { ++ .name = "mc13783-codec", ++ .owner = THIS_MODULE, ++ }, ++ .probe = mc13783_codec_probe, ++ .remove = __devexit_p(mc13783_codec_remove), ++}; ++ ++static __init int mc13783_init(void) ++{ ++ return platform_driver_register(&mc13783_codec_driver); ++} ++ ++static __exit void mc13783_exit(void) ++{ ++ platform_driver_unregister(&mc13783_codec_driver); ++} ++ ++module_init(mc13783_init); ++module_exit(mc13783_exit); ++ ++MODULE_DESCRIPTION("ASoC MC13783 driver"); ++MODULE_AUTHOR("Sascha Hauer, Pengutronix "); ++MODULE_LICENSE("GPL"); +diff --git a/sound/soc/codecs/mc13783.h b/sound/soc/codecs/mc13783.h +new file mode 100644 +index 0000000..b28dbef +--- /dev/null ++++ b/sound/soc/codecs/mc13783.h +@@ -0,0 +1,32 @@ ++/* ++ * Copyright 2008 Juergen Beisert, kernel@pengutronix.de ++ * ++ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++ ++#ifndef MC13783_MIXER_H ++#define MC13783_MIXER_H ++ ++extern int mc13783_add_ctl(struct snd_card*, void *); ++ ++extern struct snd_soc_dai mc13783_dai[]; ++extern struct snd_soc_codec_device soc_codec_dev_mc13783; ++ ++#define MC13783_CLK_CLIA 1 ++#define MC13783_CLK_CLIB 2 ++ ++#define MC13783_ID_STEREO_DAC 1 ++#define MC13783_ID_STEREO_CODEC 2 ++ ++#endif /* MC13783_MIXER_H */ +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0013-mxc_nand-Make-main-spare-areas-runtime-configurable.patch b/recipes/linux/linux-2.6.31/pcm043/0013-mxc_nand-Make-main-spare-areas-runtime-configurable.patch new file mode 100644 index 0000000000..96d2586b07 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0013-mxc_nand-Make-main-spare-areas-runtime-configurable.patch @@ -0,0 +1,142 @@ +From cd3ee0eef0eba058bc5a7a6d42536bc35059ecf9 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Mon, 5 Oct 2009 11:14:35 +0200 +Subject: [PATCH] mxc_nand: Make main/spare areas runtime configurable + +The main/spare areas are on different addresses on later versions +of the controller, so make them configurable. + +Signed-off-by: Sascha Hauer +--- + drivers/mtd/nand/mxc_nand.c | 42 ++++++++++++++++++++---------------------- + 1 files changed, 20 insertions(+), 22 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c +index 2988f1d..450db4e 100644 +--- a/drivers/mtd/nand/mxc_nand.c ++++ b/drivers/mtd/nand/mxc_nand.c +@@ -52,18 +52,6 @@ + #define NFC_CONFIG1 0xE1A + #define NFC_CONFIG2 0xE1C + +-/* Addresses for NFC RAM BUFFER Main area 0 */ +-#define MAIN_AREA0 0x000 +-#define MAIN_AREA1 0x200 +-#define MAIN_AREA2 0x400 +-#define MAIN_AREA3 0x600 +- +-/* Addresses for NFC SPARE BUFFER Spare area 0 */ +-#define SPARE_AREA0 0x800 +-#define SPARE_AREA1 0x810 +-#define SPARE_AREA2 0x820 +-#define SPARE_AREA3 0x830 +- + /* Set INT to 0, FCMD to 1, rest to 0 in NFC_CONFIG2 Register + * for Command operation */ + #define NFC_CMD 0x1 +@@ -106,6 +94,11 @@ struct mxc_nand_host { + struct mtd_partition *parts; + struct device *dev; + ++ void *spare0; ++ void *main_area0; ++ void *main_area1; ++ ++ void __iomem *base; + void __iomem *regs; + int status_request; + int pagesize_2k; +@@ -262,7 +255,7 @@ static void send_read_id(struct mxc_nand_host *host) + wait_op_done(host, TROP_US_DELAY, true); + + if (this->options & NAND_BUSWIDTH_16) { +- void __iomem *main_buf = host->regs + MAIN_AREA0; ++ void __iomem *main_buf = host->main_area0; + /* compress the ID info */ + writeb(readb(main_buf + 2), main_buf + 1); + writeb(readb(main_buf + 4), main_buf + 2); +@@ -270,14 +263,14 @@ static void send_read_id(struct mxc_nand_host *host) + writeb(readb(main_buf + 8), main_buf + 4); + writeb(readb(main_buf + 10), main_buf + 5); + } +- memcpy(host->data_buf, host->regs + MAIN_AREA0, 16); ++ memcpy(host->data_buf, host->main_area0, 16); + } + + /* This function requests the NANDFC to perform a read of the + * NAND device status and returns the current status. */ + static uint16_t get_dev_status(struct mxc_nand_host *host) + { +- void __iomem *main_buf = host->regs + MAIN_AREA1; ++ void __iomem *main_buf = host->main_area1; + uint32_t store; + uint16_t ret, tmp; + /* Issue status request to NAND device */ +@@ -462,7 +455,7 @@ static void copy_spare(struct mtd_info *mtd, bool bfrom) + u16 i, j; + u16 n = mtd->writesize >> 9; + u8 *d = host->data_buf + mtd->writesize; +- u8 *s = host->regs + SPARE_AREA0; ++ u8 *s = host->spare0; + u16 t = host->spare_len; + + j = (mtd->oobsize / n >> 1) << 1; +@@ -572,7 +565,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + + send_page(host, NFC_OUTPUT); + +- memcpy(host->data_buf, host->regs + MAIN_AREA0, mtd->writesize); ++ memcpy(host->data_buf, host->main_area0, mtd->writesize); + copy_spare(mtd, true); + break; + +@@ -608,7 +601,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + break; + + case NAND_CMD_PAGEPROG: +- memcpy(host->regs + MAIN_AREA0, host->data_buf, mtd->writesize); ++ memcpy(host->main_area0, host->data_buf, mtd->writesize); + copy_spare(mtd, false); + send_page(host, NFC_INPUT); + send_cmd(host, command, true); +@@ -686,12 +679,17 @@ static int __init mxcnd_probe(struct platform_device *pdev) + goto eres; + } + +- host->regs = ioremap(res->start, resource_size(res)); +- if (!host->regs) { ++ host->base = ioremap(res->start, resource_size(res)); ++ if (!host->base) { + err = -ENOMEM; + goto eres; + } + ++ host->regs = host->base; ++ host->main_area0 = host->base; ++ host->main_area1 = host->base + 0x200; ++ host->spare0 = host->base + 0x800; ++ + tmp = readw(host->regs + NFC_CONFIG1); + tmp |= NFC_INT_MSK; + writew(tmp, host->regs + NFC_CONFIG1); +@@ -778,7 +776,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) + escan: + free_irq(host->irq, host); + eirq: +- iounmap(host->regs); ++ iounmap(host->base); + eres: + clk_put(host->clk); + eclk: +@@ -797,7 +795,7 @@ static int __devexit mxcnd_remove(struct platform_device *pdev) + + nand_release(&host->mtd); + free_irq(host->irq, host); +- iounmap(host->regs); ++ iounmap(host->base); + kfree(host); + + return 0; +-- +1.6.0.4 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0014-MXC-NFC-Add-NAND-device-to-the-pcm043-platform.patch b/recipes/linux/linux-2.6.31/pcm043/0014-MXC-NFC-Add-NAND-device-to-the-pcm043-platform.patch new file mode 100644 index 0000000000..967b3ba8dd --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0014-MXC-NFC-Add-NAND-device-to-the-pcm043-platform.patch @@ -0,0 +1,47 @@ +From cb9f37d106e5ac9672291f0ce5df5dd955d61d5d Mon Sep 17 00:00:00 2001 +From: Juergen Beisert +Date: Tue, 29 Sep 2009 17:00:18 +0200 +Subject: [PATCH 14/15] MXC NFC: Add NAND device to the pcm043 platform + +Phytec's PCM043 is equipped with a 1 GiB NAND. + +Signed-off-by: Juergen Beisert + +rebased to 2.6.31.6 +Signed-off-by: Jan Weitzel +--- + arch/arm/mach-mx3/pcm043.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +Index: arch/arm/mach-mx3/pcm043.c +=================================================================== +--- arch/arm/mach-mx3/pcm043.c.orig 2009-12-10 11:34:30.754671808 +0100 ++++ arch/arm/mach-mx3/pcm043.c 2009-12-10 11:34:35.157145682 +0100 +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include + + #include "devices.h" + +@@ -359,6 +360,11 @@ + .flags = IMX_SSI_USE_AC97, + }; + ++static struct mxc_nand_platform_data pcm043_nand_board_info = { ++ .width = 1, ++ .hw_ecc = 1, ++}; ++ + /* + * Board specific initialization. + */ +@@ -394,6 +400,7 @@ + mxc_register_device(&mxc_i2c_device0, &pcm043_i2c_1_data); + #endif + ++ mxc_register_device(&mxc_nand_device, &pcm043_nand_board_info); + mxc_register_device(&mx3_ipu, &mx3_ipu_data); + mxc_register_device(&mx3_fb, &mx3fb_pdata); + diff --git a/recipes/linux/linux-2.6.31/pcm043/0014-imx-ssi-sound-driver.patch b/recipes/linux/linux-2.6.31/pcm043/0014-imx-ssi-sound-driver.patch new file mode 100644 index 0000000000..3b935c9615 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0014-imx-ssi-sound-driver.patch @@ -0,0 +1,1911 @@ +From 7947679ebf067e88b61b9185c19d625d975e315c Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 12 Nov 2009 15:00:08 +0100 +Subject: [PATCH 14/28] imx-ssi sound driver + +Signed-off-by: Sascha Hauer +--- + arch/arm/plat-mxc/Makefile | 4 + + arch/arm/plat-mxc/include/mach/ssi.h | 17 + + arch/arm/plat-mxc/ssi-fiq-ksym.c | 20 + + arch/arm/plat-mxc/ssi-fiq.S | 134 ++++++ + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/imx/Kconfig | 13 + + sound/soc/imx/Makefile | 10 + + sound/soc/imx/imx-pcm-dma-mx2.c | 313 ++++++++++++++ + sound/soc/imx/imx-pcm-fiq.c | 277 ++++++++++++ + sound/soc/imx/imx-ssi.c | 766 ++++++++++++++++++++++++++++++++++ + sound/soc/imx/imx-ssi.h | 238 +++++++++++ + 12 files changed, 1794 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/plat-mxc/include/mach/ssi.h + create mode 100644 arch/arm/plat-mxc/ssi-fiq-ksym.c + create mode 100644 arch/arm/plat-mxc/ssi-fiq.S + create mode 100644 sound/soc/imx/Kconfig + create mode 100644 sound/soc/imx/Makefile + create mode 100644 sound/soc/imx/imx-pcm-dma-mx2.c + create mode 100644 sound/soc/imx/imx-pcm-fiq.c + create mode 100644 sound/soc/imx/imx-ssi.c + create mode 100644 sound/soc/imx/imx-ssi.h + +diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile +index 92fc8b2..b0b9fc3 100644 +--- a/arch/arm/plat-mxc/Makefile ++++ b/arch/arm/plat-mxc/Makefile +@@ -11,3 +11,7 @@ obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o + obj-$(CONFIG_MXC_PWM) += pwm.o + obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o + obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o ++ifdef CONFIG_SND_IMX_SOC ++obj-y += ssi-fiq.o ++obj-y += ssi-fiq-ksym.o ++endif +diff --git a/arch/arm/plat-mxc/include/mach/ssi.h b/arch/arm/plat-mxc/include/mach/ssi.h +new file mode 100644 +index 0000000..144a2ac +--- /dev/null ++++ b/arch/arm/plat-mxc/include/mach/ssi.h +@@ -0,0 +1,17 @@ ++#ifndef __MACH_SSI_H ++#define __MACH_SSI_H ++ ++struct snd_ac97; ++ ++extern unsigned char imx_ssi_fiq_start, imx_ssi_fiq_end; ++extern unsigned long imx_ssi_fiq_base, imx_ssi_fiq_tx_buffer, imx_ssi_fiq_rx_buffer; ++ ++struct imx_ssi_platform_data { ++ unsigned int flags; ++#define IMX_SSI_DMA (1 << 0) ++#define IMX_SSI_USE_AC97 (1 << 1) ++ void (*ac97_reset) (struct snd_ac97 *ac97); ++ void (*ac97_warm_reset)(struct snd_ac97 *ac97); ++}; ++ ++#endif /* __MACH_SSI_H */ +diff --git a/arch/arm/plat-mxc/ssi-fiq-ksym.c b/arch/arm/plat-mxc/ssi-fiq-ksym.c +new file mode 100644 +index 0000000..b5fad45 +--- /dev/null ++++ b/arch/arm/plat-mxc/ssi-fiq-ksym.c +@@ -0,0 +1,20 @@ ++/* ++ * Exported ksyms for the SSI FIQ handler ++ * ++ * Copyright (C) 2009, Sascha Hauer ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include ++ ++#include ++ ++EXPORT_SYMBOL(imx_ssi_fiq_tx_buffer); ++EXPORT_SYMBOL(imx_ssi_fiq_rx_buffer); ++EXPORT_SYMBOL(imx_ssi_fiq_start); ++EXPORT_SYMBOL(imx_ssi_fiq_end); ++EXPORT_SYMBOL(imx_ssi_fiq_base); ++ +diff --git a/arch/arm/plat-mxc/ssi-fiq.S b/arch/arm/plat-mxc/ssi-fiq.S +new file mode 100644 +index 0000000..4ddce56 +--- /dev/null ++++ b/arch/arm/plat-mxc/ssi-fiq.S +@@ -0,0 +1,134 @@ ++/* ++ * Copyright (C) 2009 Sascha Hauer ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include ++#include ++ ++/* ++ * r8 = bit 0-15: tx offset, bit 16-31: tx buffer size ++ * r9 = bit 0-15: rx offset, bit 16-31: rx buffer size ++ */ ++ ++#define SSI_STX0 0x00 ++#define SSI_SRX0 0x08 ++#define SSI_SISR 0x14 ++#define SSI_SIER 0x18 ++#define SSI_SACNT 0x38 ++ ++#define SSI_SACNT_AC97EN (1 << 0) ++ ++#define SSI_SIER_TFE0_EN (1 << 0) ++#define SSI_SISR_TFE0 (1 << 0) ++#define SSI_SISR_RFF0 (1 << 2) ++#define SSI_SIER_RFF0_EN (1 << 2) ++ ++ .text ++ .global imx_ssi_fiq_start ++ .global imx_ssi_fiq_end ++ .global imx_ssi_fiq_base ++ .global imx_ssi_fiq_rx_buffer ++ .global imx_ssi_fiq_tx_buffer ++ ++imx_ssi_fiq_start: ++ ldr r12, imx_ssi_fiq_base ++ ++ /* TX */ ++ ldr r11, imx_ssi_fiq_tx_buffer ++ ++ /* shall we send? */ ++ ldr r13, [r12, #SSI_SIER] ++ tst r13, #SSI_SIER_TFE0_EN ++ beq 1f ++ ++ /* TX FIFO empty? */ ++ ldr r13, [r12, #SSI_SISR] ++ tst r13, #SSI_SISR_TFE0 ++ beq 1f ++ ++ mov r10, #0x10000 ++ sub r10, #1 ++ and r10, r10, r8 /* r10: current buffer offset */ ++ ++ add r11, r11, r10 ++ ++ ldrh r13, [r11] ++ strh r13, [r12, #SSI_STX0] ++ ++ ldrh r13, [r11, #2] ++ strh r13, [r12, #SSI_STX0] ++ ++ ldrh r13, [r11, #4] ++ strh r13, [r12, #SSI_STX0] ++ ++ ldrh r13, [r11, #6] ++ strh r13, [r12, #SSI_STX0] ++ ++ add r10, #8 ++ lsr r13, r8, #16 /* r13: buffer size */ ++ cmp r10, r13 ++ lslgt r8, r13, #16 ++ addle r8, #8 ++1: ++ /* RX */ ++ ++ /* shall we receive? */ ++ ldr r13, [r12, #SSI_SIER] ++ tst r13, #SSI_SIER_RFF0_EN ++ beq 1f ++ ++ /* RX FIFO full? */ ++ ldr r13, [r12, #SSI_SISR] ++ tst r13, #SSI_SISR_RFF0 ++ beq 1f ++ ++ ldr r11, imx_ssi_fiq_rx_buffer ++ ++ mov r10, #0x10000 ++ sub r10, #1 ++ and r10, r10, r9 /* r10: current buffer offset */ ++ ++ add r11, r11, r10 ++ ++ ldr r13, [r12, #SSI_SACNT] ++ tst r13, #SSI_SACNT_AC97EN ++ ++ ldr r13, [r12, #SSI_SRX0] ++ strh r13, [r11] ++ ++ ldr r13, [r12, #SSI_SRX0] ++ strh r13, [r11, #2] ++ ++ /* dummy read to skip slot 12 */ ++ ldrne r13, [r12, #SSI_SRX0] ++ ++ ldr r13, [r12, #SSI_SRX0] ++ strh r13, [r11, #4] ++ ++ ldr r13, [r12, #SSI_SRX0] ++ strh r13, [r11, #6] ++ ++ /* dummy read to skip slot 12 */ ++ ldrne r13, [r12, #SSI_SRX0] ++ ++ add r10, #8 ++ lsr r13, r9, #16 /* r13: buffer size */ ++ cmp r10, r13 ++ lslgt r9, r13, #16 ++ addle r9, #8 ++ ++1: ++ @ return from FIQ ++ subs pc, lr, #4 ++imx_ssi_fiq_base: ++ .word 0x0 ++imx_ssi_fiq_rx_buffer: ++ .word 0x0 ++imx_ssi_fiq_tx_buffer: ++ .word 0x0 ++imx_ssi_fiq_end: ++ +diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig +index d3e786a..d57e571 100644 +--- a/sound/soc/Kconfig ++++ b/sound/soc/Kconfig +@@ -35,6 +35,7 @@ source "sound/soc/s3c24xx/Kconfig" + source "sound/soc/s6000/Kconfig" + source "sound/soc/sh/Kconfig" + source "sound/soc/txx9/Kconfig" ++source "sound/soc/imx/Kconfig" + + # Supported codecs + source "sound/soc/codecs/Kconfig" +diff --git a/sound/soc/Makefile b/sound/soc/Makefile +index 6f1e28d..6bcb7f7 100644 +--- a/sound/soc/Makefile ++++ b/sound/soc/Makefile +@@ -8,6 +8,7 @@ obj-$(CONFIG_SND_SOC) += blackfin/ + obj-$(CONFIG_SND_SOC) += davinci/ + obj-$(CONFIG_SND_SOC) += fsl/ + obj-$(CONFIG_SND_SOC) += omap/ ++obj-$(CONFIG_SND_SOC) += imx/ + obj-$(CONFIG_SND_SOC) += pxa/ + obj-$(CONFIG_SND_SOC) += s3c24xx/ + obj-$(CONFIG_SND_SOC) += s6000/ +diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig +new file mode 100644 +index 0000000..84a25e6 +--- /dev/null ++++ b/sound/soc/imx/Kconfig +@@ -0,0 +1,13 @@ ++config SND_IMX_SOC ++ tristate "SoC Audio for Freecale i.MX CPUs" ++ depends on ARCH_MXC ++ select SND_PCM ++ select FIQ ++ select SND_SOC_AC97_BUS ++ help ++ Say Y or M if you want to add support for codecs attached to ++ the i.MX SSI interface. ++ ++config SND_MXC_SOC_SSI ++ tristate ++ +diff --git a/sound/soc/imx/Makefile b/sound/soc/imx/Makefile +new file mode 100644 +index 0000000..d05cc95 +--- /dev/null ++++ b/sound/soc/imx/Makefile +@@ -0,0 +1,10 @@ ++# i.MX Platform Support ++snd-soc-imx-objs := imx-ssi.o imx-pcm-fiq.o ++ ++ifdef CONFIG_MACH_MX27 ++snd-soc-imx-objs += imx-pcm-dma-mx2.o ++endif ++ ++obj-$(CONFIG_SND_IMX_SOC) += snd-soc-imx.o ++ ++# i.MX Machine Support +diff --git a/sound/soc/imx/imx-pcm-dma-mx2.c b/sound/soc/imx/imx-pcm-dma-mx2.c +new file mode 100644 +index 0000000..19452e4 +--- /dev/null ++++ b/sound/soc/imx/imx-pcm-dma-mx2.c +@@ -0,0 +1,313 @@ ++/* ++ * imx-pcm-dma-mx2.c -- ALSA Soc Audio Layer ++ * ++ * Copyright 2009 Sascha Hauer ++ * ++ * This code is based on code copyrighted by Freescale, ++ * Liam Girdwood, Javier Martin and probably others. ++ * ++ * 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. ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include "imx-ssi.h" ++ ++struct imx_pcm_runtime_data { ++ int sg_count; ++ struct scatterlist *sg_list; ++ int period; ++ int periods; ++ unsigned long dma_addr; ++ int dma; ++ struct snd_pcm_substream *substream; ++ unsigned long offset; ++ unsigned long size; ++ unsigned long period_cnt; ++ void *buf; ++ int period_time; ++}; ++ ++/* Called by the DMA framework when a period has elapsed */ ++static void imx_ssi_dma_progression(int channel, void *data, ++ struct scatterlist *sg) ++{ ++ struct snd_pcm_substream *substream = data; ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct imx_pcm_runtime_data *iprtd = runtime->private_data; ++ ++ if (!sg) ++ return; ++ ++ runtime = iprtd->substream->runtime; ++ ++ iprtd->offset = sg->dma_address - runtime->dma_addr; ++ ++ snd_pcm_period_elapsed(iprtd->substream); ++} ++ ++static void imx_ssi_dma_callback(int channel, void *data) ++{ ++ pr_err("%s shouldn't be called\n", __func__); ++} ++ ++static void snd_imx_dma_err_callback(int channel, void *data, int err) ++{ ++ pr_err("DMA error callback called\n"); ++ ++ pr_err("DMA timeout on channel %d -%s%s%s%s\n", ++ channel, ++ err & IMX_DMA_ERR_BURST ? " burst" : "", ++ err & IMX_DMA_ERR_REQUEST ? " request" : "", ++ err & IMX_DMA_ERR_TRANSFER ? " transfer" : "", ++ err & IMX_DMA_ERR_BUFFER ? " buffer" : ""); ++} ++ ++static int imx_ssi_dma_alloc(struct snd_pcm_substream *substream) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct imx_pcm_dma_params *dma_params = rtd->dai->cpu_dai->dma_data; ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct imx_pcm_runtime_data *iprtd = runtime->private_data; ++ int ret; ++ ++ iprtd->dma = imx_dma_request_by_prio(DRV_NAME, DMA_PRIO_HIGH); ++ if (iprtd->dma < 0) { ++ pr_err("Failed to claim the audio DMA\n"); ++ return -ENODEV; ++ } ++ ++ ret = imx_dma_setup_handlers(iprtd->dma, ++ imx_ssi_dma_callback, ++ snd_imx_dma_err_callback, substream); ++ if (ret) ++ goto out; ++ ++ ret = imx_dma_setup_progression_handler(iprtd->dma, ++ imx_ssi_dma_progression); ++ if (ret) { ++ pr_err("Failed to setup the DMA handler\n"); ++ goto out; ++ } ++ ++ ret = imx_dma_config_channel(iprtd->dma, ++ IMX_DMA_MEMSIZE_16 | IMX_DMA_TYPE_FIFO, ++ IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_LINEAR, ++ dma_params->dma, 1); ++ if (ret < 0) { ++ pr_err("Cannot configure DMA channel: %d\n", ret); ++ goto out; ++ } ++ ++ imx_dma_config_burstlen(iprtd->dma, dma_params->burstsize * 2); ++ ++ return 0; ++out: ++ imx_dma_free(iprtd->dma); ++ return ret; ++} ++ ++static int snd_imx_pcm_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct imx_pcm_runtime_data *iprtd = runtime->private_data; ++ int i; ++ unsigned long dma_addr; ++ ++ imx_ssi_dma_alloc(substream); ++ ++ iprtd->size = params_buffer_bytes(params); ++ iprtd->periods = params_periods(params); ++ iprtd->period = params_period_bytes(params); ++ iprtd->offset = 0; ++ iprtd->period_time = HZ / (params_rate(params) / ++ params_period_size(params)); ++ ++ snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); ++ ++ if (iprtd->sg_count != iprtd->periods) { ++ kfree(iprtd->sg_list); ++ ++ iprtd->sg_list = kcalloc(iprtd->periods + 1, ++ sizeof(struct scatterlist), GFP_KERNEL); ++ if (!iprtd->sg_list) ++ return -ENOMEM; ++ iprtd->sg_count = iprtd->periods + 1; ++ } ++ ++ sg_init_table(iprtd->sg_list, iprtd->sg_count); ++ dma_addr = runtime->dma_addr; ++ ++ for (i = 0; i < iprtd->periods; i++) { ++ iprtd->sg_list[i].page_link = 0; ++ iprtd->sg_list[i].offset = 0; ++ iprtd->sg_list[i].dma_address = dma_addr; ++ iprtd->sg_list[i].length = iprtd->period; ++ dma_addr += iprtd->period; ++ } ++ ++ /* close the loop */ ++ iprtd->sg_list[iprtd->sg_count - 1].offset = 0; ++ iprtd->sg_list[iprtd->sg_count - 1].length = 0; ++ iprtd->sg_list[iprtd->sg_count - 1].page_link = ++ ((unsigned long) iprtd->sg_list | 0x01) & ~0x02; ++ return 0; ++} ++ ++static int snd_imx_pcm_hw_free(struct snd_pcm_substream *substream) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct imx_pcm_runtime_data *iprtd = runtime->private_data; ++ ++ if (iprtd->dma >= 0) { ++ imx_dma_free(iprtd->dma); ++ iprtd->dma = -EINVAL; ++ } ++ ++ kfree(iprtd->sg_list); ++ iprtd->sg_list = NULL; ++ ++ return 0; ++} ++ ++static int snd_imx_pcm_prepare(struct snd_pcm_substream *substream) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct imx_pcm_dma_params *dma_params = rtd->dai->cpu_dai->dma_data; ++ struct imx_pcm_runtime_data *iprtd = runtime->private_data; ++ int err; ++ ++ iprtd->substream = substream; ++ iprtd->buf = (unsigned int *)substream->dma_buffer.area; ++ iprtd->period_cnt = 0; ++ ++ pr_debug("%s: buf: %p period: %d periods: %d\n", ++ __func__, iprtd->buf, iprtd->period, iprtd->periods); ++ ++ err = imx_dma_setup_sg(iprtd->dma, iprtd->sg_list, iprtd->sg_count, ++ IMX_DMA_LENGTH_LOOP, dma_params->dma_addr, ++ substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? ++ DMA_MODE_WRITE : DMA_MODE_READ); ++ if (err) ++ return err; ++ ++ return 0; ++} ++ ++static int snd_imx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct imx_pcm_runtime_data *iprtd = runtime->private_data; ++ ++ switch (cmd) { ++ case SNDRV_PCM_TRIGGER_START: ++ case SNDRV_PCM_TRIGGER_RESUME: ++ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: ++ imx_dma_enable(iprtd->dma); ++ ++ break; ++ ++ case SNDRV_PCM_TRIGGER_STOP: ++ case SNDRV_PCM_TRIGGER_SUSPEND: ++ case SNDRV_PCM_TRIGGER_PAUSE_PUSH: ++ imx_dma_disable(iprtd->dma); ++ ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ return 0; ++} ++ ++static snd_pcm_uframes_t snd_imx_pcm_pointer(struct snd_pcm_substream *substream) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct imx_pcm_runtime_data *iprtd = runtime->private_data; ++ ++ return bytes_to_frames(substream->runtime, iprtd->offset); ++} ++ ++static struct snd_pcm_hardware snd_imx_hardware = { ++ .info = SNDRV_PCM_INFO_INTERLEAVED | ++ SNDRV_PCM_INFO_BLOCK_TRANSFER | ++ SNDRV_PCM_INFO_MMAP | ++ SNDRV_PCM_INFO_MMAP_VALID | ++ SNDRV_PCM_INFO_PAUSE | ++ SNDRV_PCM_INFO_RESUME, ++ .formats = SNDRV_PCM_FMTBIT_S16_LE, ++ .rate_min = 8000, ++ .channels_min = 2, ++ .channels_max = 2, ++ .buffer_bytes_max = IMX_SSI_DMABUF_SIZE, ++ .period_bytes_min = 128, ++ .period_bytes_max = 16 * 1024, ++ .periods_min = 2, ++ .periods_max = 255, ++ .fifo_size = 0, ++}; ++ ++static int snd_imx_open(struct snd_pcm_substream *substream) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct imx_pcm_runtime_data *iprtd; ++ int ret; ++ ++ iprtd = kzalloc(sizeof(*iprtd), GFP_KERNEL); ++ runtime->private_data = iprtd; ++ ++ ret = snd_pcm_hw_constraint_integer(substream->runtime, ++ SNDRV_PCM_HW_PARAM_PERIODS); ++ if (ret < 0) ++ return ret; ++ ++ snd_soc_set_runtime_hwparams(substream, &snd_imx_hardware); ++ return 0; ++} ++ ++static struct snd_pcm_ops imx_pcm_ops = { ++ .open = snd_imx_open, ++ .ioctl = snd_pcm_lib_ioctl, ++ .hw_params = snd_imx_pcm_hw_params, ++ .hw_free = snd_imx_pcm_hw_free, ++ .prepare = snd_imx_pcm_prepare, ++ .trigger = snd_imx_pcm_trigger, ++ .pointer = snd_imx_pcm_pointer, ++ .mmap = snd_imx_pcm_mmap, ++}; ++ ++static struct snd_soc_platform imx_soc_platform_dma = { ++ .name = "imx-audio", ++ .pcm_ops = &imx_pcm_ops, ++ .pcm_new = imx_pcm_new, ++ .pcm_free = imx_pcm_free, ++}; ++ ++struct snd_soc_platform *imx_ssi_dma_mx2_init(struct platform_device *pdev, ++ struct imx_ssi *ssi) ++{ ++ ssi->dma_params_tx.burstsize = DMA_TXFIFO_BURST; ++ ssi->dma_params_rx.burstsize = DMA_RXFIFO_BURST; ++ ++ return &imx_soc_platform_dma; ++} ++ +diff --git a/sound/soc/imx/imx-pcm-fiq.c b/sound/soc/imx/imx-pcm-fiq.c +new file mode 100644 +index 0000000..5532579 +--- /dev/null ++++ b/sound/soc/imx/imx-pcm-fiq.c +@@ -0,0 +1,277 @@ ++/* ++ * imx-pcm-fiq.c -- ALSA Soc Audio Layer ++ * ++ * Copyright 2009 Sascha Hauer ++ * ++ * This code is based on code copyrighted by Freescale, ++ * Liam Girdwood, Javier Martin and probably others. ++ * ++ * 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. ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include ++ ++#include "imx-ssi.h" ++ ++struct imx_pcm_runtime_data { ++ int period; ++ int periods; ++ unsigned long dma_addr; ++ int dma; ++ unsigned long offset; ++ unsigned long size; ++ unsigned long period_cnt; ++ void *buf; ++ struct timer_list timer; ++ int period_time; ++}; ++ ++static void imx_ssi_timer_callback(unsigned long data) ++{ ++ struct snd_pcm_substream *substream = (void *)data; ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct imx_pcm_runtime_data *iprtd = runtime->private_data; ++ struct pt_regs regs; ++ ++ get_fiq_regs(®s); ++ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ iprtd->offset = regs.ARM_r8 & 0xffff; ++ else ++ iprtd->offset = regs.ARM_r9 & 0xffff; ++ ++ iprtd->timer.expires = jiffies + iprtd->period_time; ++ add_timer(&iprtd->timer); ++ snd_pcm_period_elapsed(substream); ++} ++ ++static struct fiq_handler fh = { ++ .name = DRV_NAME, ++}; ++ ++static int snd_imx_pcm_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct imx_pcm_runtime_data *iprtd = runtime->private_data; ++ ++ iprtd->size = params_buffer_bytes(params); ++ iprtd->periods = params_periods(params); ++ iprtd->period = params_period_bytes(params); ++ iprtd->offset = 0; ++ iprtd->period_time = HZ / (params_rate(params) / params_period_size(params)); ++ ++ snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); ++ ++ return 0; ++} ++ ++static int snd_imx_pcm_prepare(struct snd_pcm_substream *substream) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct imx_pcm_runtime_data *iprtd = runtime->private_data; ++ struct pt_regs regs; ++ ++ get_fiq_regs(®s); ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ regs.ARM_r8 = (iprtd->period * iprtd->periods - 1) << 16; ++ else ++ regs.ARM_r9 = (iprtd->period * iprtd->periods - 1) << 16; ++ ++ set_fiq_regs(®s); ++ ++ return 0; ++} ++ ++static int fiq_enable; ++static int imx_pcm_fiq; ++ ++static int snd_imx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct imx_pcm_runtime_data *iprtd = runtime->private_data; ++ ++ switch (cmd) { ++ case SNDRV_PCM_TRIGGER_START: ++ case SNDRV_PCM_TRIGGER_RESUME: ++ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: ++ iprtd->timer.expires = jiffies + iprtd->period_time; ++ add_timer(&iprtd->timer); ++ if (++fiq_enable == 1) ++ enable_fiq(imx_pcm_fiq); ++ ++ break; ++ ++ case SNDRV_PCM_TRIGGER_STOP: ++ case SNDRV_PCM_TRIGGER_SUSPEND: ++ case SNDRV_PCM_TRIGGER_PAUSE_PUSH: ++ del_timer(&iprtd->timer); ++ if (--fiq_enable == 0) ++ disable_fiq(imx_pcm_fiq); ++ ++ ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ return 0; ++} ++ ++static snd_pcm_uframes_t snd_imx_pcm_pointer(struct snd_pcm_substream *substream) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct imx_pcm_runtime_data *iprtd = runtime->private_data; ++ ++ return bytes_to_frames(substream->runtime, iprtd->offset); ++} ++ ++static struct snd_pcm_hardware snd_imx_hardware = { ++ .info = SNDRV_PCM_INFO_INTERLEAVED | ++ SNDRV_PCM_INFO_BLOCK_TRANSFER | ++ SNDRV_PCM_INFO_MMAP | ++ SNDRV_PCM_INFO_MMAP_VALID | ++ SNDRV_PCM_INFO_PAUSE | ++ SNDRV_PCM_INFO_RESUME, ++ .formats = SNDRV_PCM_FMTBIT_S16_LE, ++ .rate_min = 8000, ++ .channels_min = 2, ++ .channels_max = 2, ++ .buffer_bytes_max = IMX_SSI_DMABUF_SIZE, ++ .period_bytes_min = 128, ++ .period_bytes_max = 16 * 1024, ++ .periods_min = 2, ++ .periods_max = 255, ++ .fifo_size = 0, ++}; ++ ++static int snd_imx_open(struct snd_pcm_substream *substream) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct imx_pcm_runtime_data *iprtd; ++ int ret; ++ ++ iprtd = kzalloc(sizeof(*iprtd), GFP_KERNEL); ++ runtime->private_data = iprtd; ++ ++ init_timer(&iprtd->timer); ++ iprtd->timer.data = (unsigned long)substream; ++ iprtd->timer.function = imx_ssi_timer_callback; ++ ++ ret = snd_pcm_hw_constraint_integer(substream->runtime, ++ SNDRV_PCM_HW_PARAM_PERIODS); ++ if (ret < 0) ++ return ret; ++ ++ snd_soc_set_runtime_hwparams(substream, &snd_imx_hardware); ++ return 0; ++} ++ ++static int snd_imx_close(struct snd_pcm_substream *substream) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct imx_pcm_runtime_data *iprtd = runtime->private_data; ++ ++ del_timer_sync(&iprtd->timer); ++ kfree(iprtd); ++ ++ return 0; ++} ++ ++static struct snd_pcm_ops imx_pcm_ops = { ++ .open = snd_imx_open, ++ .close = snd_imx_close, ++ .ioctl = snd_pcm_lib_ioctl, ++ .hw_params = snd_imx_pcm_hw_params, ++ .prepare = snd_imx_pcm_prepare, ++ .trigger = snd_imx_pcm_trigger, ++ .pointer = snd_imx_pcm_pointer, ++ .mmap = snd_imx_pcm_mmap, ++}; ++ ++static int imx_pcm_fiq_new(struct snd_card *card, struct snd_soc_dai *dai, ++ struct snd_pcm *pcm) ++{ ++ int ret; ++ ++ ret = imx_pcm_new(card, dai, pcm); ++ if (ret) ++ return ret; ++ ++ if (dai->playback.channels_min) { ++ struct snd_pcm_substream *substream = ++ pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; ++ struct snd_dma_buffer *buf = &substream->dma_buffer; ++ ++ imx_ssi_fiq_tx_buffer = (unsigned long)buf->area; ++ } ++ ++ if (dai->capture.channels_min) { ++ struct snd_pcm_substream *substream = ++ pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream; ++ struct snd_dma_buffer *buf = &substream->dma_buffer; ++ ++ imx_ssi_fiq_rx_buffer = (unsigned long)buf->area; ++ } ++ ++ set_fiq_handler(&imx_ssi_fiq_start, ++ &imx_ssi_fiq_end - &imx_ssi_fiq_start); ++ ++ return 0; ++} ++ ++static struct snd_soc_platform imx_soc_platform_fiq = { ++ .pcm_ops = &imx_pcm_ops, ++ .pcm_new = imx_pcm_fiq_new, ++ .pcm_free = imx_pcm_free, ++}; ++ ++struct snd_soc_platform *imx_ssi_fiq_init(struct platform_device *pdev, ++ struct imx_ssi *ssi) ++{ ++ int ret = 0; ++ ++ ret = claim_fiq(&fh); ++ if (ret) { ++ dev_err(&pdev->dev, "failed to claim fiq: %d", ret); ++ return ERR_PTR(ret); ++ } ++ ++ mxc_set_irq_fiq(ssi->irq, 1); ++ ++ imx_pcm_fiq = ssi->irq; ++ ++ imx_ssi_fiq_base = (unsigned long)ssi->base; ++ ++ ssi->dma_params_tx.burstsize = 4; ++ ssi->dma_params_rx.burstsize = 6; ++ ++ return &imx_soc_platform_fiq; ++} ++ ++void imx_ssi_fiq_exit(struct platform_device *pdev, ++ struct imx_ssi *ssi) ++{ ++ mxc_set_irq_fiq(ssi->irq, 0); ++ release_fiq(&fh); ++} ++ +diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c +new file mode 100644 +index 0000000..9823425 +--- /dev/null ++++ b/sound/soc/imx/imx-ssi.c +@@ -0,0 +1,766 @@ ++/* ++ * imx-ssi.c -- ALSA Soc Audio Layer ++ * ++ * Copyright 2009 Sascha Hauer ++ * ++ * This code is based on code copyrighted by Freescale, ++ * Liam Girdwood, Javier Martin and probably others. ++ * ++ * 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. ++ * ++ * ++ * The i.MX SSI core has some nasty limitations in AC97 mode. While most ++ * sane processor vendors have a FIFO per AC97 slot, the i.MX has only ++ * one FIFO which combines all valid receive slots. We cannot even select ++ * which slots we want to receive. The WM9712 with which this driver ++ * was developped with always sends GPIO status data in slot 12 which ++ * we receive in our (PCM-) data stream. The only chance we have is to ++ * manually skip this data in the FIQ handler. With sampling rates different ++ * from 48000Hz not every frame has valid receive data, so the ratio ++ * between pcm data and GPIO status data changes. Our FIQ handler is not ++ * able to handle this, hence this driver only works with 48000Hz sampling ++ * rate. ++ * Reading and writing AC97 registers is another challange. The core ++ * provides us status bits when the read register is updated with *another* ++ * value. When we read the same register two times (and the register still ++ * contains the same value) these status bits are not set. We work ++ * around this by not polling these bits but only wait a fixed delay. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++#include "imx-ssi.h" ++ ++#define SSI_SACNT_DEFAULT (SSI_SACNT_AC97EN | SSI_SACNT_FV) ++ ++/* ++ * SSI Network Mode or TDM slots configuration. ++ * Should only be called when port is inactive (i.e. SSIEN = 0). ++ */ ++static int imx_ssi_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai, ++ unsigned int mask, int slots) ++{ ++ struct imx_ssi *ssi = container_of(cpu_dai, struct imx_ssi, dai); ++ u32 sccr; ++ ++ sccr = readl(ssi->base + SSI_STCCR); ++ sccr &= ~SSI_STCCR_DC_MASK; ++ sccr |= SSI_STCCR_DC(slots - 1); ++ writel(sccr, ssi->base + SSI_STCCR); ++ ++ sccr = readl(ssi->base + SSI_SRCCR); ++ sccr &= ~SSI_STCCR_DC_MASK; ++ sccr |= SSI_STCCR_DC(slots - 1); ++ writel(sccr, ssi->base + SSI_SRCCR); ++ ++ writel(0, ssi->base + SSI_STMSK); ++ ++ writel(mask, ssi->base + SSI_SRMSK); ++ ++ return 0; ++} ++ ++/* ++ * SSI DAI format configuration. ++ * Should only be called when port is inactive (i.e. SSIEN = 0). ++ * Note: We don't use the I2S modes but instead manually configure the ++ * SSI for I2S because the I2S mode is only a register preset. ++ */ ++static int imx_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) ++{ ++ struct imx_ssi *ssi = container_of(cpu_dai, struct imx_ssi, dai); ++ u32 strcr = 0, scr; ++ ++ scr = readl(ssi->base + SSI_SCR) & ~(SSI_SCR_SYN | SSI_SCR_NET); ++ ++ /* DAI mode */ ++ switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { ++ case SND_SOC_DAIFMT_I2S: ++ /* data on rising edge of bclk, frame low 1clk before data */ ++ strcr |= SSI_STCR_TFSI | SSI_STCR_TEFS | SSI_STCR_TXBIT0; ++ scr |= SSI_SCR_NET; ++ break; ++ case SND_SOC_DAIFMT_LEFT_J: ++ /* data on rising edge of bclk, frame high with data */ ++ strcr |= SSI_STCR_TXBIT0; ++ break; ++ case SND_SOC_DAIFMT_DSP_B: ++ /* data on rising edge of bclk, frame high with data */ ++ strcr |= SSI_STCR_TFSL; ++ break; ++ case SND_SOC_DAIFMT_DSP_A: ++ /* data on rising edge of bclk, frame high 1clk before data */ ++ strcr |= SSI_STCR_TFSL | SSI_STCR_TEFS; ++ break; ++ } ++ ++ /* DAI clock inversion */ ++ switch (fmt & SND_SOC_DAIFMT_INV_MASK) { ++ case SND_SOC_DAIFMT_IB_IF: ++ strcr &= ~(SSI_STCR_TSCKP | SSI_STCR_TFSI); ++ break; ++ case SND_SOC_DAIFMT_IB_NF: ++ strcr |= SSI_STCR_TFSI; ++ strcr &= ~SSI_STCR_TSCKP; ++ break; ++ case SND_SOC_DAIFMT_NB_IF: ++ strcr |= SSI_STCR_TSCKP; ++ strcr &= ~SSI_STCR_TFSI; ++ break; ++ case SND_SOC_DAIFMT_NB_NF: ++ strcr |= SSI_STCR_TFSI | SSI_STCR_TSCKP; ++ break; ++ } ++ ++ /* DAI clock master masks */ ++ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { ++ case SND_SOC_DAIFMT_CBS_CFS: ++ strcr |= SSI_STCR_TFDIR | SSI_STCR_TXDIR; ++ break; ++ case SND_SOC_DAIFMT_CBM_CFS: ++ strcr |= SSI_STCR_TFDIR; ++ break; ++ case SND_SOC_DAIFMT_CBS_CFM: ++ strcr |= SSI_STCR_TXDIR; ++ break; ++ case SND_SOC_DAIFMT_CBM_CFM: ++ strcr &= ~(SSI_STCR_TFDIR | SSI_STCR_TXDIR); ++ break; ++ } ++ ++ strcr |= SSI_STCR_TFEN0; ++ ++ writel(strcr, ssi->base + SSI_STCR); ++ writel(strcr, ssi->base + SSI_SRCR); ++ writel(scr, ssi->base + SSI_SCR); ++ ++ return 0; ++} ++ ++/* ++ * SSI system clock configuration. ++ * Should only be called when port is inactive (i.e. SSIEN = 0). ++ */ ++static int imx_ssi_set_dai_sysclk(struct snd_soc_dai *cpu_dai, ++ int clk_id, unsigned int freq, int dir) ++{ ++ struct imx_ssi *ssi = container_of(cpu_dai, struct imx_ssi, dai); ++ u32 scr; ++ ++ scr = readl(ssi->base + SSI_SCR); ++ ++ switch (clk_id) { ++ case IMX_SSP_SYS_CLK: ++ if (dir == SND_SOC_CLOCK_OUT) ++ scr |= SSI_SCR_SYS_CLK_EN; ++ else ++ scr &= ~SSI_SCR_SYS_CLK_EN; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ writel(scr, ssi->base + SSI_SCR); ++ ++ return 0; ++} ++ ++/* ++ * SSI Clock dividers ++ * Should only be called when port is inactive (i.e. SSIEN = 0). ++ */ ++static int imx_ssi_set_dai_clkdiv(struct snd_soc_dai *cpu_dai, ++ int div_id, int div) ++{ ++ struct imx_ssi *ssi = container_of(cpu_dai, struct imx_ssi, dai); ++ u32 stccr, srccr; ++ ++ stccr = readl(ssi->base + SSI_STCCR); ++ srccr = readl(ssi->base + SSI_SRCCR); ++ ++ switch (div_id) { ++ case IMX_SSI_TX_DIV_2: ++ stccr &= ~SSI_STCCR_DIV2; ++ stccr |= div; ++ break; ++ case IMX_SSI_TX_DIV_PSR: ++ stccr &= ~SSI_STCCR_PSR; ++ stccr |= div; ++ break; ++ case IMX_SSI_TX_DIV_PM: ++ stccr &= ~0xff; ++ stccr |= SSI_STCCR_PM(div); ++ break; ++ case IMX_SSI_RX_DIV_2: ++ stccr &= ~SSI_STCCR_DIV2; ++ stccr |= div; ++ break; ++ case IMX_SSI_RX_DIV_PSR: ++ stccr &= ~SSI_STCCR_PSR; ++ stccr |= div; ++ break; ++ case IMX_SSI_RX_DIV_PM: ++ stccr &= ~0xff; ++ stccr |= SSI_STCCR_PM(div); ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ writel(stccr, ssi->base + SSI_STCCR); ++ writel(srccr, ssi->base + SSI_SRCCR); ++ ++ return 0; ++} ++ ++/* ++ * Should only be called when port is inactive (i.e. SSIEN = 0), ++ * although can be called multiple times by upper layers. ++ */ ++static int imx_ssi_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params, ++ struct snd_soc_dai *cpu_dai) ++{ ++ struct imx_ssi *ssi = container_of(cpu_dai, struct imx_ssi, dai); ++ u32 reg, sccr; ++ ++ /* Tx/Rx config */ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { ++ reg = SSI_STCCR; ++ cpu_dai->dma_data = &ssi->dma_params_tx; ++ } else { ++ reg = SSI_SRCCR; ++ cpu_dai->dma_data = &ssi->dma_params_rx; ++ } ++ ++ sccr = readl(ssi->base + reg) & ~SSI_STCCR_WL_MASK; ++ ++ /* DAI data (word) size */ ++ switch (params_format(params)) { ++ case SNDRV_PCM_FORMAT_S16_LE: ++ sccr |= SSI_SRCCR_WL(16); ++ break; ++ case SNDRV_PCM_FORMAT_S20_3LE: ++ sccr |= SSI_SRCCR_WL(20); ++ break; ++ case SNDRV_PCM_FORMAT_S24_LE: ++ sccr |= SSI_SRCCR_WL(24); ++ break; ++ } ++ ++ writel(sccr, ssi->base + reg); ++ ++ return 0; ++} ++ ++static int imx_ssi_trigger(struct snd_pcm_substream *substream, int cmd, ++ struct snd_soc_dai *dai) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; ++ struct imx_ssi *ssi = container_of(cpu_dai, struct imx_ssi, dai); ++ unsigned int sier_bits, sier; ++ unsigned int scr; ++ ++ scr = readl(ssi->base + SSI_SCR); ++ sier = readl(ssi->base + SSI_SIER); ++ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { ++ if (ssi->flags & IMX_SSI_DMA) ++ sier_bits = SSI_SIER_TDMAE; ++ else ++ sier_bits = SSI_SIER_TIE | SSI_SIER_TFE0_EN; ++ } else { ++ if (ssi->flags & IMX_SSI_DMA) ++ sier_bits = SSI_SIER_RDMAE; ++ else ++ sier_bits = SSI_SIER_RIE | SSI_SIER_RFF0_EN; ++ } ++ ++ switch (cmd) { ++ case SNDRV_PCM_TRIGGER_START: ++ case SNDRV_PCM_TRIGGER_RESUME: ++ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ scr |= SSI_SCR_TE; ++ else ++ scr |= SSI_SCR_RE; ++ sier |= sier_bits; ++ ++ if (++ssi->enabled == 1) ++ scr |= SSI_SCR_SSIEN; ++ ++ break; ++ ++ case SNDRV_PCM_TRIGGER_STOP: ++ case SNDRV_PCM_TRIGGER_SUSPEND: ++ case SNDRV_PCM_TRIGGER_PAUSE_PUSH: ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ scr &= ~SSI_SCR_TE; ++ else ++ scr &= ~SSI_SCR_RE; ++ sier &= ~sier_bits; ++ ++ if (--ssi->enabled == 0) ++ scr &= ~SSI_SCR_SSIEN; ++ ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ if (!(ssi->flags & IMX_SSI_USE_AC97)) ++ /* rx/tx are always enabled to access ac97 registers */ ++ writel(scr, ssi->base + SSI_SCR); ++ ++ writel(sier, ssi->base + SSI_SIER); ++ ++ return 0; ++} ++ ++static struct snd_soc_dai_ops imx_ssi_pcm_dai_ops = { ++ .hw_params = imx_ssi_hw_params, ++ .set_fmt = imx_ssi_set_dai_fmt, ++ .set_clkdiv = imx_ssi_set_dai_clkdiv, ++ .set_sysclk = imx_ssi_set_dai_sysclk, ++ .set_tdm_slot = imx_ssi_set_dai_tdm_slot, ++ .trigger = imx_ssi_trigger, ++}; ++ ++static struct snd_soc_dai imx_ssi_dai = { ++ .playback = { ++ .channels_min = 2, ++ .channels_max = 2, ++ .rates = SNDRV_PCM_RATE_8000_96000, ++ .formats = SNDRV_PCM_FMTBIT_S16_LE, ++ }, ++ .capture = { ++ .channels_min = 2, ++ .channels_max = 2, ++ .rates = SNDRV_PCM_RATE_8000_96000, ++ .formats = SNDRV_PCM_FMTBIT_S16_LE, ++ }, ++ .ops = &imx_ssi_pcm_dai_ops, ++}; ++ ++int snd_imx_pcm_mmap(struct snd_pcm_substream *substream, ++ struct vm_area_struct *vma) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ int ret; ++ ++ ret = dma_mmap_coherent(NULL, vma, runtime->dma_area, ++ runtime->dma_addr, runtime->dma_bytes); ++ ++ pr_debug("%s: ret: %d %p 0x%08x 0x%08x\n", __func__, ret, ++ runtime->dma_area, ++ runtime->dma_addr, ++ runtime->dma_bytes); ++ return ret; ++} ++ ++static int imx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) ++{ ++ struct snd_pcm_substream *substream = pcm->streams[stream].substream; ++ struct snd_dma_buffer *buf = &substream->dma_buffer; ++ size_t size = IMX_SSI_DMABUF_SIZE; ++ ++ buf->dev.type = SNDRV_DMA_TYPE_DEV; ++ buf->dev.dev = pcm->card->dev; ++ buf->private_data = NULL; ++ buf->area = dma_alloc_writecombine(pcm->card->dev, size, ++ &buf->addr, GFP_KERNEL); ++ if (!buf->area) ++ return -ENOMEM; ++ buf->bytes = size; ++ ++ return 0; ++} ++ ++static u64 imx_pcm_dmamask = DMA_BIT_MASK(32); ++ ++int imx_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, ++ struct snd_pcm *pcm) ++{ ++ ++ int ret = 0; ++ ++ if (!card->dev->dma_mask) ++ card->dev->dma_mask = &imx_pcm_dmamask; ++ if (!card->dev->coherent_dma_mask) ++ card->dev->coherent_dma_mask = DMA_BIT_MASK(32); ++ if (dai->playback.channels_min) { ++ ret = imx_pcm_preallocate_dma_buffer(pcm, ++ SNDRV_PCM_STREAM_PLAYBACK); ++ if (ret) ++ goto out; ++ } ++ ++ if (dai->capture.channels_min) { ++ ret = imx_pcm_preallocate_dma_buffer(pcm, ++ SNDRV_PCM_STREAM_CAPTURE); ++ if (ret) ++ goto out; ++ } ++ ++out: ++ return ret; ++} ++ ++void imx_pcm_free(struct snd_pcm *pcm) ++{ ++ struct snd_pcm_substream *substream; ++ struct snd_dma_buffer *buf; ++ int stream; ++ ++ for (stream = 0; stream < 2; stream++) { ++ substream = pcm->streams[stream].substream; ++ if (!substream) ++ continue; ++ ++ buf = &substream->dma_buffer; ++ if (!buf->area) ++ continue; ++ ++ dma_free_writecombine(pcm->card->dev, buf->bytes, ++ buf->area, buf->addr); ++ buf->area = NULL; ++ } ++} ++ ++struct snd_soc_platform imx_soc_platform = { ++ .name = "imx-audio", ++}; ++EXPORT_SYMBOL_GPL(imx_soc_platform); ++ ++static struct snd_soc_dai imx_ac97_dai = { ++ .name = "AC97", ++ .ac97_control = 1, ++ .playback = { ++ .stream_name = "AC97 Playback", ++ .channels_min = 2, ++ .channels_max = 2, ++ .rates = SND_SOC_STD_AC97_FMTS, ++ .formats = SNDRV_PCM_FMTBIT_S16_LE, ++ }, ++ .capture = { ++ .stream_name = "AC97 Capture", ++ .channels_min = 2, ++ .channels_max = 2, ++ .rates = SNDRV_PCM_RATE_48000, ++ .formats = SNDRV_PCM_FMTBIT_S16_LE, ++ }, ++ .ops = &imx_ssi_pcm_dai_ops, ++}; ++ ++static void setup_channel_to_ac97(struct imx_ssi *imx_ssi) ++{ ++ void __iomem *base = imx_ssi->base; ++ ++ writel(0x0, base + SSI_SCR); ++ writel(0x0, base + SSI_STCR); ++ writel(0x0, base + SSI_SRCR); ++ ++ writel(SSI_SCR_SYN | SSI_SCR_NET, base + SSI_SCR); ++ ++ writel(SSI_SFCSR_RFWM0(8) | ++ SSI_SFCSR_TFWM0(8) | ++ SSI_SFCSR_RFWM1(8) | ++ SSI_SFCSR_TFWM1(8), base + SSI_SFCSR); ++ ++ writel(SSI_STCCR_WL(16) | SSI_STCCR_DC(12), base + SSI_STCCR); ++ writel(SSI_STCCR_WL(16) | SSI_STCCR_DC(12), base + SSI_SRCCR); ++ ++ writel(SSI_SCR_SYN | SSI_SCR_NET | SSI_SCR_SSIEN, base + SSI_SCR); ++ writel(SSI_SOR_WAIT(3), base + SSI_SOR); ++ ++ writel(SSI_SCR_SYN | SSI_SCR_NET | SSI_SCR_SSIEN | ++ SSI_SCR_TE | SSI_SCR_RE, ++ base + SSI_SCR); ++ ++ writel(SSI_SACNT_DEFAULT, base + SSI_SACNT); ++ writel(0xff, base + SSI_SACCDIS); ++ writel(0x300, base + SSI_SACCEN); ++} ++ ++static struct imx_ssi *ac97_ssi; ++ ++static void imx_ssi_ac97_write(struct snd_ac97 *ac97, unsigned short reg, ++ unsigned short val) ++{ ++ struct imx_ssi *imx_ssi = ac97_ssi; ++ void __iomem *base = imx_ssi->base; ++ unsigned int lreg; ++ unsigned int lval; ++ ++ if (reg > 0x7f) ++ return; ++ ++ pr_debug("%s: 0x%02x 0x%04x\n", __func__, reg, val); ++ ++ lreg = reg << 12; ++ writel(lreg, base + SSI_SACADD); ++ ++ lval = val << 4; ++ writel(lval , base + SSI_SACDAT); ++ ++ writel(SSI_SACNT_DEFAULT | SSI_SACNT_WR, base + SSI_SACNT); ++ udelay(100); ++} ++ ++static unsigned short imx_ssi_ac97_read(struct snd_ac97 *ac97, ++ unsigned short reg) ++{ ++ struct imx_ssi *imx_ssi = ac97_ssi; ++ void __iomem *base = imx_ssi->base; ++ ++ unsigned short val = -1; ++ unsigned int lreg; ++ ++ lreg = (reg & 0x7f) << 12 ; ++ writel(lreg, base + SSI_SACADD); ++ writel(SSI_SACNT_DEFAULT | SSI_SACNT_RD, base + SSI_SACNT); ++ ++ udelay(100); ++ ++ val = (readl(base + SSI_SACDAT) >> 4) & 0xffff; ++ ++ pr_debug("%s: 0x%02x 0x%04x\n", __func__, reg, val); ++ ++ return val; ++} ++ ++static void imx_ssi_ac97_reset(struct snd_ac97 *ac97) ++{ ++ struct imx_ssi *imx_ssi = ac97_ssi; ++ ++ if (imx_ssi->ac97_reset) ++ imx_ssi->ac97_reset(ac97); ++} ++ ++static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97) ++{ ++ struct imx_ssi *imx_ssi = ac97_ssi; ++ ++ if (imx_ssi->ac97_warm_reset) ++ imx_ssi->ac97_warm_reset(ac97); ++} ++ ++struct snd_ac97_bus_ops soc_ac97_ops = { ++ .read = imx_ssi_ac97_read, ++ .write = imx_ssi_ac97_write, ++ .reset = imx_ssi_ac97_reset, ++ .warm_reset = imx_ssi_ac97_warm_reset ++}; ++EXPORT_SYMBOL_GPL(soc_ac97_ops); ++ ++struct snd_soc_dai *imx_ssi_pcm_dai[2]; ++EXPORT_SYMBOL_GPL(imx_ssi_pcm_dai); ++ ++static int imx_ssi_probe(struct platform_device *pdev) ++{ ++ struct resource *res; ++ struct imx_ssi *ssi; ++ struct imx_ssi_platform_data *pdata = pdev->dev.platform_data; ++ struct snd_soc_platform *platform; ++ int ret = 0; ++ unsigned int val; ++ ++ ssi = kzalloc(sizeof(*ssi), GFP_KERNEL); ++ if (!ssi) ++ return -ENOMEM; ++ ++ if (pdata) { ++ ssi->ac97_reset = pdata->ac97_reset; ++ ssi->ac97_warm_reset = pdata->ac97_warm_reset; ++ ssi->flags = pdata->flags; ++ } ++ ++ imx_ssi_pcm_dai[pdev->id] = &ssi->dai; ++ ++ ssi->irq = platform_get_irq(pdev, 0); ++ ++ ssi->clk = clk_get(&pdev->dev, NULL); ++ if (IS_ERR(ssi->clk)) { ++ ret = PTR_ERR(ssi->clk); ++ dev_err(&pdev->dev, "Cannot get the clock: %d\n", ++ ret); ++ goto failed_clk; ++ } ++ clk_enable(ssi->clk); ++ ++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ if (!res) { ++ ret = -ENODEV; ++ goto failed_get_resource; ++ } ++ ++ if (!request_mem_region(res->start, resource_size(res), DRV_NAME)) { ++ dev_err(&pdev->dev, "request_mem_region failed\n"); ++ ret = -EBUSY; ++ goto failed_get_resource; ++ } ++ ++ ssi->base = ioremap(res->start, resource_size(res)); ++ if (!ssi->base) { ++ dev_err(&pdev->dev, "ioremap failed\n"); ++ ret = -ENODEV; ++ goto failed_ioremap; ++ } ++ ++ if (ssi->flags & IMX_SSI_USE_AC97) { ++ if (ac97_ssi) { ++ ret = -EBUSY; ++ goto failed_ac97; ++ } ++ ac97_ssi = ssi; ++ setup_channel_to_ac97(ssi); ++ memcpy(&ssi->dai, &imx_ac97_dai, sizeof(imx_ac97_dai)); ++ } else ++ memcpy(&ssi->dai, &imx_ssi_dai, sizeof(imx_ssi_dai)); ++ ++ ssi->dai.id = pdev->id; ++ ssi->dai.dev = &pdev->dev; ++ ssi->dai.name = kasprintf(GFP_KERNEL, "imx-ssi.%d", pdev->id); ++ ++ writel(0x0, ssi->base + SSI_SIER); ++ ++ ssi->dma_params_rx.dma_addr = res->start + SSI_SRX0; ++ ssi->dma_params_tx.dma_addr = res->start + SSI_STX0; ++ ++ res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx0"); ++ if (res) ++ ssi->dma_params_tx.dma = res->start; ++ ++ res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "rx0"); ++ if (res) ++ ssi->dma_params_rx.dma = res->start; ++ ++ ssi->dai.id = pdev->id; ++ ssi->dai.dev = &pdev->dev; ++ ssi->dai.name = kasprintf(GFP_KERNEL, "imx-ssi.%d", pdev->id); ++ ++ if ((cpu_is_mx27() || cpu_is_mx21()) && ++ !(ssi->flags & IMX_SSI_USE_AC97)) { ++ ssi->flags |= IMX_SSI_DMA; ++ platform = imx_ssi_dma_mx2_init(pdev, ssi); ++ } else ++ platform = imx_ssi_fiq_init(pdev, ssi); ++ ++ imx_soc_platform.pcm_ops = platform->pcm_ops; ++ imx_soc_platform.pcm_new = platform->pcm_new; ++ imx_soc_platform.pcm_free = platform->pcm_free; ++ ++ val = SSI_SFCSR_TFWM0(ssi->dma_params_tx.burstsize) | ++ SSI_SFCSR_RFWM0(ssi->dma_params_rx.burstsize); ++ writel(val, ssi->base + SSI_SFCSR); ++ ++ ret = snd_soc_register_dai(&ssi->dai); ++ if (ret) { ++ dev_err(&pdev->dev, "register DAI failed\n"); ++ goto failed_register; ++ } ++ ++ platform_set_drvdata(pdev, ssi); ++ ++ return 0; ++ ++failed_register: ++failed_ac97: ++ iounmap(ssi->base); ++failed_ioremap: ++ release_mem_region(res->start, resource_size(res)); ++failed_get_resource: ++ clk_disable(ssi->clk); ++ clk_put(ssi->clk); ++failed_clk: ++ kfree(ssi); ++ ++ return ret; ++} ++ ++static int __devexit imx_ssi_remove(struct platform_device *pdev) ++{ ++ struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ struct imx_ssi *ssi = platform_get_drvdata(pdev); ++ ++ snd_soc_unregister_dai(&ssi->dai); ++ ++ if (ssi->flags & IMX_SSI_USE_AC97) ++ ac97_ssi = NULL; ++ ++ if (!(ssi->flags & IMX_SSI_DMA)) ++ imx_ssi_fiq_exit(pdev, ssi); ++ ++ iounmap(ssi->base); ++ release_mem_region(res->start, resource_size(res)); ++ clk_disable(ssi->clk); ++ clk_put(ssi->clk); ++ kfree(ssi); ++ ++ return 0; ++} ++ ++static struct platform_driver imx_ssi_driver = { ++ .probe = imx_ssi_probe, ++ .remove = __devexit_p(imx_ssi_remove), ++ ++ .driver = { ++ .name = DRV_NAME, ++ .owner = THIS_MODULE, ++ }, ++}; ++ ++static int __init imx_ssi_init(void) ++{ ++ int ret; ++ ++ ret = snd_soc_register_platform(&imx_soc_platform); ++ if (ret) { ++ pr_err("failed to register soc platform: %d\n", ret); ++ return ret; ++ } ++ ++ ret = platform_driver_register(&imx_ssi_driver); ++ if (ret) { ++ snd_soc_unregister_platform(&imx_soc_platform); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static void __exit imx_ssi_exit(void) ++{ ++ platform_driver_unregister(&imx_ssi_driver); ++ snd_soc_unregister_platform(&imx_soc_platform); ++} ++ ++module_init(imx_ssi_init); ++module_exit(imx_ssi_exit); ++ ++/* Module information */ ++MODULE_AUTHOR("Sascha Hauer, "); ++MODULE_DESCRIPTION("i.MX I2S/ac97 SoC Interface"); ++MODULE_LICENSE("GPL"); ++ +diff --git a/sound/soc/imx/imx-ssi.h b/sound/soc/imx/imx-ssi.h +new file mode 100644 +index 0000000..2823fd0 +--- /dev/null ++++ b/sound/soc/imx/imx-ssi.h +@@ -0,0 +1,238 @@ ++/* ++ * 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 _IMX_SSI_H ++#define _IMX_SSI_H ++ ++#define SSI_STX0 0x00 ++#define SSI_STX1 0x04 ++#define SSI_SRX0 0x08 ++#define SSI_SRX1 0x0c ++ ++#define SSI_SCR 0x10 ++#define SSI_SCR_CLK_IST (1 << 9) ++#define SSI_SCR_CLK_IST_SHIFT 9 ++#define SSI_SCR_TCH_EN (1 << 8) ++#define SSI_SCR_SYS_CLK_EN (1 << 7) ++#define SSI_SCR_I2S_MODE_NORM (0 << 5) ++#define SSI_SCR_I2S_MODE_MSTR (1 << 5) ++#define SSI_SCR_I2S_MODE_SLAVE (2 << 5) ++#define SSI_I2S_MODE_MASK (3 << 5) ++#define SSI_SCR_SYN (1 << 4) ++#define SSI_SCR_NET (1 << 3) ++#define SSI_SCR_RE (1 << 2) ++#define SSI_SCR_TE (1 << 1) ++#define SSI_SCR_SSIEN (1 << 0) ++ ++#define SSI_SISR 0x14 ++#define SSI_SISR_MASK ((1 << 19) - 1) ++#define SSI_SISR_CMDAU (1 << 18) ++#define SSI_SISR_CMDDU (1 << 17) ++#define SSI_SISR_RXT (1 << 16) ++#define SSI_SISR_RDR1 (1 << 15) ++#define SSI_SISR_RDR0 (1 << 14) ++#define SSI_SISR_TDE1 (1 << 13) ++#define SSI_SISR_TDE0 (1 << 12) ++#define SSI_SISR_ROE1 (1 << 11) ++#define SSI_SISR_ROE0 (1 << 10) ++#define SSI_SISR_TUE1 (1 << 9) ++#define SSI_SISR_TUE0 (1 << 8) ++#define SSI_SISR_TFS (1 << 7) ++#define SSI_SISR_RFS (1 << 6) ++#define SSI_SISR_TLS (1 << 5) ++#define SSI_SISR_RLS (1 << 4) ++#define SSI_SISR_RFF1 (1 << 3) ++#define SSI_SISR_RFF0 (1 << 2) ++#define SSI_SISR_TFE1 (1 << 1) ++#define SSI_SISR_TFE0 (1 << 0) ++ ++#define SSI_SIER 0x18 ++#define SSI_SIER_RDMAE (1 << 22) ++#define SSI_SIER_RIE (1 << 21) ++#define SSI_SIER_TDMAE (1 << 20) ++#define SSI_SIER_TIE (1 << 19) ++#define SSI_SIER_CMDAU_EN (1 << 18) ++#define SSI_SIER_CMDDU_EN (1 << 17) ++#define SSI_SIER_RXT_EN (1 << 16) ++#define SSI_SIER_RDR1_EN (1 << 15) ++#define SSI_SIER_RDR0_EN (1 << 14) ++#define SSI_SIER_TDE1_EN (1 << 13) ++#define SSI_SIER_TDE0_EN (1 << 12) ++#define SSI_SIER_ROE1_EN (1 << 11) ++#define SSI_SIER_ROE0_EN (1 << 10) ++#define SSI_SIER_TUE1_EN (1 << 9) ++#define SSI_SIER_TUE0_EN (1 << 8) ++#define SSI_SIER_TFS_EN (1 << 7) ++#define SSI_SIER_RFS_EN (1 << 6) ++#define SSI_SIER_TLS_EN (1 << 5) ++#define SSI_SIER_RLS_EN (1 << 4) ++#define SSI_SIER_RFF1_EN (1 << 3) ++#define SSI_SIER_RFF0_EN (1 << 2) ++#define SSI_SIER_TFE1_EN (1 << 1) ++#define SSI_SIER_TFE0_EN (1 << 0) ++ ++#define SSI_STCR 0x1c ++#define SSI_STCR_TXBIT0 (1 << 9) ++#define SSI_STCR_TFEN1 (1 << 8) ++#define SSI_STCR_TFEN0 (1 << 7) ++#define SSI_FIFO_ENABLE_0_SHIFT 7 ++#define SSI_STCR_TFDIR (1 << 6) ++#define SSI_STCR_TXDIR (1 << 5) ++#define SSI_STCR_TSHFD (1 << 4) ++#define SSI_STCR_TSCKP (1 << 3) ++#define SSI_STCR_TFSI (1 << 2) ++#define SSI_STCR_TFSL (1 << 1) ++#define SSI_STCR_TEFS (1 << 0) ++ ++#define SSI_SRCR 0x20 ++#define SSI_SRCR_RXBIT0 (1 << 9) ++#define SSI_SRCR_RFEN1 (1 << 8) ++#define SSI_SRCR_RFEN0 (1 << 7) ++#define SSI_FIFO_ENABLE_0_SHIFT 7 ++#define SSI_SRCR_RFDIR (1 << 6) ++#define SSI_SRCR_RXDIR (1 << 5) ++#define SSI_SRCR_RSHFD (1 << 4) ++#define SSI_SRCR_RSCKP (1 << 3) ++#define SSI_SRCR_RFSI (1 << 2) ++#define SSI_SRCR_RFSL (1 << 1) ++#define SSI_SRCR_REFS (1 << 0) ++ ++#define SSI_SRCCR 0x28 ++#define SSI_SRCCR_DIV2 (1 << 18) ++#define SSI_SRCCR_PSR (1 << 17) ++#define SSI_SRCCR_WL(x) ((((x) - 2) >> 1) << 13) ++#define SSI_SRCCR_DC(x) (((x) & 0x1f) << 8) ++#define SSI_SRCCR_PM(x) (((x) & 0xff) << 0) ++#define SSI_SRCCR_WL_MASK (0xf << 13) ++#define SSI_SRCCR_DC_MASK (0x1f << 8) ++#define SSI_SRCCR_PM_MASK (0xff << 0) ++ ++#define SSI_STCCR 0x24 ++#define SSI_STCCR_DIV2 (1 << 18) ++#define SSI_STCCR_PSR (1 << 17) ++#define SSI_STCCR_WL(x) ((((x) - 2) >> 1) << 13) ++#define SSI_STCCR_DC(x) (((x) & 0x1f) << 8) ++#define SSI_STCCR_PM(x) (((x) & 0xff) << 0) ++#define SSI_STCCR_WL_MASK (0xf << 13) ++#define SSI_STCCR_DC_MASK (0x1f << 8) ++#define SSI_STCCR_PM_MASK (0xff << 0) ++ ++#define SSI_SFCSR 0x2c ++#define SSI_SFCSR_RFCNT1(x) (((x) & 0xf) << 28) ++#define SSI_RX_FIFO_1_COUNT_SHIFT 28 ++#define SSI_SFCSR_TFCNT1(x) (((x) & 0xf) << 24) ++#define SSI_TX_FIFO_1_COUNT_SHIFT 24 ++#define SSI_SFCSR_RFWM1(x) (((x) & 0xf) << 20) ++#define SSI_SFCSR_TFWM1(x) (((x) & 0xf) << 16) ++#define SSI_SFCSR_RFCNT0(x) (((x) & 0xf) << 12) ++#define SSI_RX_FIFO_0_COUNT_SHIFT 12 ++#define SSI_SFCSR_TFCNT0(x) (((x) & 0xf) << 8) ++#define SSI_TX_FIFO_0_COUNT_SHIFT 8 ++#define SSI_SFCSR_RFWM0(x) (((x) & 0xf) << 4) ++#define SSI_SFCSR_TFWM0(x) (((x) & 0xf) << 0) ++#define SSI_SFCSR_RFWM0_MASK (0xf << 4) ++#define SSI_SFCSR_TFWM0_MASK (0xf << 0) ++ ++#define SSI_STR 0x30 ++#define SSI_STR_TEST (1 << 15) ++#define SSI_STR_RCK2TCK (1 << 14) ++#define SSI_STR_RFS2TFS (1 << 13) ++#define SSI_STR_RXSTATE(x) (((x) & 0xf) << 8) ++#define SSI_STR_TXD2RXD (1 << 7) ++#define SSI_STR_TCK2RCK (1 << 6) ++#define SSI_STR_TFS2RFS (1 << 5) ++#define SSI_STR_TXSTATE(x) (((x) & 0xf) << 0) ++ ++#define SSI_SOR 0x34 ++#define SSI_SOR_CLKOFF (1 << 6) ++#define SSI_SOR_RX_CLR (1 << 5) ++#define SSI_SOR_TX_CLR (1 << 4) ++#define SSI_SOR_INIT (1 << 3) ++#define SSI_SOR_WAIT(x) (((x) & 0x3) << 1) ++#define SSI_SOR_WAIT_MASK (0x3 << 1) ++#define SSI_SOR_SYNRST (1 << 0) ++ ++#define SSI_SACNT 0x38 ++#define SSI_SACNT_FRDIV(x) (((x) & 0x3f) << 5) ++#define SSI_SACNT_WR (1 << 4) ++#define SSI_SACNT_RD (1 << 3) ++#define SSI_SACNT_TIF (1 << 2) ++#define SSI_SACNT_FV (1 << 1) ++#define SSI_SACNT_AC97EN (1 << 0) ++ ++#define SSI_SACADD 0x3c ++#define SSI_SACDAT 0x40 ++#define SSI_SATAG 0x44 ++#define SSI_STMSK 0x48 ++#define SSI_SRMSK 0x4c ++#define SSI_SACCST 0x50 ++#define SSI_SACCEN 0x54 ++#define SSI_SACCDIS 0x58 ++ ++/* SSI clock sources */ ++#define IMX_SSP_SYS_CLK 0 ++ ++/* SSI audio dividers */ ++#define IMX_SSI_TX_DIV_2 0 ++#define IMX_SSI_TX_DIV_PSR 1 ++#define IMX_SSI_TX_DIV_PM 2 ++#define IMX_SSI_RX_DIV_2 3 ++#define IMX_SSI_RX_DIV_PSR 4 ++#define IMX_SSI_RX_DIV_PM 5 ++ ++extern struct snd_soc_dai *imx_ssi_pcm_dai[2]; ++extern struct snd_soc_platform imx_soc_platform; ++ ++#define DRV_NAME "imx-ssi" ++ ++struct imx_pcm_dma_params { ++ int dma; ++ unsigned long dma_addr; ++ int burstsize; ++}; ++ ++struct imx_ssi { ++ struct snd_soc_dai dai; ++ struct platform_device *ac97_dev; ++ ++ struct snd_soc_device imx_ac97; ++ struct clk *clk; ++ void __iomem *base; ++ int irq; ++ int fiq_enable; ++ unsigned int offset; ++ ++ unsigned int flags; ++ ++ void (*ac97_reset) (struct snd_ac97 *ac97); ++ void (*ac97_warm_reset)(struct snd_ac97 *ac97); ++ ++ struct imx_pcm_dma_params dma_params_rx; ++ struct imx_pcm_dma_params dma_params_tx; ++ ++ int enabled; ++}; ++ ++struct snd_soc_platform *imx_ssi_fiq_init(struct platform_device *pdev, ++ struct imx_ssi *ssi); ++void imx_ssi_fiq_exit(struct platform_device *pdev, struct imx_ssi *ssi); ++struct snd_soc_platform *imx_ssi_dma_mx2_init(struct platform_device *pdev, ++ struct imx_ssi *ssi); ++ ++int snd_imx_pcm_mmap(struct snd_pcm_substream *substream, struct vm_area_struct *vma); ++int imx_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, ++ struct snd_pcm *pcm); ++void imx_pcm_free(struct snd_pcm *pcm); ++ ++/* ++ * Do not change this as the FIQ handler depends on this size ++ */ ++#define IMX_SSI_DMABUF_SIZE (64 * 1024) ++ ++#define DMA_RXFIFO_BURST 0x4 ++#define DMA_TXFIFO_BURST 0x2 ++ ++#endif /* _IMX_SSI_H */ +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0014-mxc_nand-Get-rid-of-pagesize_2k-flag.patch b/recipes/linux/linux-2.6.31/pcm043/0014-mxc_nand-Get-rid-of-pagesize_2k-flag.patch new file mode 100644 index 0000000000..e0c02260ca --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0014-mxc_nand-Get-rid-of-pagesize_2k-flag.patch @@ -0,0 +1,128 @@ +From 8b4c0d1da3ec208fa4c79f495f75fcf0a5b01de5 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Mon, 5 Oct 2009 11:24:02 +0200 +Subject: [PATCH] mxc_nand: Get rid of pagesize_2k flag + +Later versions of this controller also allow 4k pagesize, +so use mtd->writesize instead of a flag. + +Signed-off-by: Sascha Hauer +--- + drivers/mtd/nand/mxc_nand.c | 29 ++++++++++++++--------------- + 1 files changed, 14 insertions(+), 15 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c +index 450db4e..6525d0f 100644 +--- a/drivers/mtd/nand/mxc_nand.c ++++ b/drivers/mtd/nand/mxc_nand.c +@@ -101,7 +101,6 @@ struct mxc_nand_host { + void __iomem *base; + void __iomem *regs; + int status_request; +- int pagesize_2k; + struct clk *clk; + int clk_act; + int irq; +@@ -214,11 +213,13 @@ static void send_addr(struct mxc_nand_host *host, uint16_t addr, int islast) + wait_op_done(host, TROP_US_DELAY, islast); + } + +-static void send_page(struct mxc_nand_host *host, unsigned int ops) ++static void send_page(struct mtd_info *mtd, unsigned int ops) + { ++ struct nand_chip *nand_chip = mtd->priv; ++ struct mxc_nand_host *host = nand_chip->priv; + int bufs, i; + +- if (host->pagesize_2k) ++ if (mtd->writesize > 512) + bufs = 4; + else + bufs = 1; +@@ -490,7 +491,7 @@ static void mxc_do_addr_cycle(struct mtd_info *mtd, int column, int page_addr) + * the full page. + */ + send_addr(host, 0, page_addr == -1); +- if (host->pagesize_2k) ++ if (mtd->writesize > 512) + /* another col addr cycle for 2k page */ + send_addr(host, 0, false); + } +@@ -500,7 +501,7 @@ static void mxc_do_addr_cycle(struct mtd_info *mtd, int column, int page_addr) + /* paddr_0 - p_addr_7 */ + send_addr(host, (page_addr & 0xff), false); + +- if (host->pagesize_2k) { ++ if (mtd->writesize > 512) { + if (mtd->size >= 0x10000000) { + /* paddr_8 - paddr_15 */ + send_addr(host, (page_addr >> 8) & 0xff, false); +@@ -554,16 +555,16 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + else + host->buf_start = column + mtd->writesize; + +- if (host->pagesize_2k) ++ if (mtd->writesize > 512) + command = NAND_CMD_READ0; /* only READ0 is valid */ + + send_cmd(host, command, false); + mxc_do_addr_cycle(mtd, column, page_addr); + +- if (host->pagesize_2k) ++ if (mtd->writesize > 512) + send_cmd(host, NAND_CMD_READSTART, true); + +- send_page(host, NFC_OUTPUT); ++ send_page(mtd, NFC_OUTPUT); + + memcpy(host->data_buf, host->main_area0, mtd->writesize); + copy_spare(mtd, true); +@@ -578,7 +579,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + * pointer to spare area, we must write the whole page + * including OOB together. + */ +- if (host->pagesize_2k) ++ if (mtd->writesize > 512) + /* call ourself to read a page */ + mxc_nand_command(mtd, NAND_CMD_READ0, 0, + page_addr); +@@ -586,13 +587,13 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + host->buf_start = column; + + /* Set program pointer to spare region */ +- if (!host->pagesize_2k) ++ if (mtd->writesize == 512) + send_cmd(host, NAND_CMD_READOOB, false); + } else { + host->buf_start = column; + + /* Set program pointer to page start */ +- if (!host->pagesize_2k) ++ if (mtd->writesize == 512) + send_cmd(host, NAND_CMD_READ0, false); + } + +@@ -603,7 +604,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + case NAND_CMD_PAGEPROG: + memcpy(host->main_area0, host->data_buf, mtd->writesize); + copy_spare(mtd, false); +- send_page(host, NFC_INPUT); ++ send_page(mtd, NFC_INPUT); + send_cmd(host, command, true); + mxc_do_addr_cycle(mtd, column, page_addr); + break; +@@ -745,10 +746,8 @@ static int __init mxcnd_probe(struct platform_device *pdev) + goto escan; + } + +- if (mtd->writesize == 2048) { +- host->pagesize_2k = 1; ++ if (mtd->writesize == 2048) + this->ecc.layout = &nand_hw_eccoob_largepage; +- } + + /* second phase scan */ + if (nand_scan_tail(mtd)) { +-- +1.6.0.4 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0015-MXC-NFC-unlock_addr-is-only-used-while-__init-pha.patch b/recipes/linux/linux-2.6.31/pcm043/0015-MXC-NFC-unlock_addr-is-only-used-while-__init-pha.patch new file mode 100644 index 0000000000..6c1b6a00d4 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0015-MXC-NFC-unlock_addr-is-only-used-while-__init-pha.patch @@ -0,0 +1,28 @@ +From 7c796b820f5aee73485636f5aafc13fcbb1cfacd Mon Sep 17 00:00:00 2001 +From: Juergen Beisert +Date: Wed, 30 Sep 2009 17:21:28 +0200 +Subject: [PATCH 15/15] MXC NFC: unlock_addr() is only used while __init phase + +unlock_addr() is only used while __init phase, so mark is as __init. + +Signed-off-by: Juergen Beisert +--- + drivers/mtd/nand/mxc_nand_v2.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand_v2.c b/drivers/mtd/nand/mxc_nand_v2.c +index bab3712..9dd124c 100644 +--- a/drivers/mtd/nand/mxc_nand_v2.c ++++ b/drivers/mtd/nand/mxc_nand_v2.c +@@ -781,7 +781,7 @@ static struct nand_bbt_descr bbt_mirror_descr = { + .pattern = mirror_pattern + }; + +-static void unlock_addr(struct mxc_nand_host *host, unsigned int start_addr, unsigned int end_addr) ++static void __init unlock_addr(struct mxc_nand_host *host, unsigned int start_addr, unsigned int end_addr) + { + if (nfc_is_v21()) { + writew(start_addr, host->regs + NFC_V21_UNLOCKSTART_BLKADDR); +-- +1.6.1 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0015-add-phycore-ac97-sound-support.patch b/recipes/linux/linux-2.6.31/pcm043/0015-add-phycore-ac97-sound-support.patch new file mode 100644 index 0000000000..2a588aa7c1 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0015-add-phycore-ac97-sound-support.patch @@ -0,0 +1,140 @@ +From cab3d12f55b4e89e6504a4fd9b1e950a3f2beae2 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Wed, 25 Nov 2009 16:18:28 +0100 +Subject: [PATCH 15/28] add phycore-ac97 sound support + +Signed-off-by: Sascha Hauer +--- + sound/soc/imx/Kconfig | 9 ++++ + sound/soc/imx/Makefile | 2 + + sound/soc/imx/phycore-ac97.c | 91 ++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 102 insertions(+), 0 deletions(-) + create mode 100644 sound/soc/imx/phycore-ac97.c + +diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig +index 84a25e6..2a8c990 100644 +--- a/sound/soc/imx/Kconfig ++++ b/sound/soc/imx/Kconfig +@@ -11,3 +11,12 @@ config SND_IMX_SOC + config SND_MXC_SOC_SSI + tristate + ++config SND_SOC_PHYCORE_AC97 ++ tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards" ++ depends on MACH_PCM043 || MACH_PCA100 ++ select SND_MXC_SOC_SSI ++ select SND_SOC_WM9712 ++ help ++ Say Y if you want to add support for SoC audio on Phytec phyCORE ++ and phyCARD boards in AC97 mode ++ +diff --git a/sound/soc/imx/Makefile b/sound/soc/imx/Makefile +index d05cc95..9f8bb92 100644 +--- a/sound/soc/imx/Makefile ++++ b/sound/soc/imx/Makefile +@@ -8,3 +8,5 @@ endif + obj-$(CONFIG_SND_IMX_SOC) += snd-soc-imx.o + + # i.MX Machine Support ++snd-soc-phycore-ac97-objs := phycore-ac97.o ++obj-$(CONFIG_SND_SOC_PHYCORE_AC97) += snd-soc-phycore-ac97.o +diff --git a/sound/soc/imx/phycore-ac97.c b/sound/soc/imx/phycore-ac97.c +new file mode 100644 +index 0000000..8e3474b +--- /dev/null ++++ b/sound/soc/imx/phycore-ac97.c +@@ -0,0 +1,91 @@ ++/* ++ * phycore.c -- SoC audio for imx_phycore ++ * ++ * Copyright 2009 Sascha Hauer, Pengutronix ++ * ++ * 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. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "../codecs/mc13783.h" ++#include "../codecs/wm9712.h" ++#include "imx-ssi.h" ++ ++static struct snd_soc_card imx_phycore; ++ ++static struct snd_soc_ops imx_phycore_hifi_ops = { ++}; ++ ++static struct snd_soc_dai_link imx_phycore_dai_ac97[] = { ++ { ++ .name = "HiFi", ++ .stream_name = "HiFi", ++ .codec_dai = &wm9712_dai[WM9712_DAI_AC97_HIFI], ++ .ops = &imx_phycore_hifi_ops, ++ }, ++}; ++ ++static struct snd_soc_card imx_phycore = { ++ .name = "PhyCORE-audio", ++ .platform = &imx_soc_platform, ++ .dai_link = imx_phycore_dai_ac97, ++ .num_links = ARRAY_SIZE(imx_phycore_dai_ac97), ++}; ++ ++static struct snd_soc_device imx_phycore_snd_devdata = { ++ .card = &imx_phycore, ++ .codec_dev = &soc_codec_dev_wm9712, ++}; ++ ++static struct platform_device *imx_phycore_snd_device; ++ ++static int __init imx_phycore_init(void) ++{ ++ int ret; ++ ++ if (!machine_is_pcm043() && !machine_is_pca100()) ++ /* return happy. We might run on a totally different machine */ ++ return 0; ++ ++ imx_phycore_snd_device = platform_device_alloc("soc-audio", -1); ++ if (!imx_phycore_snd_device) ++ return -ENOMEM; ++ ++ imx_phycore_dai_ac97[0].cpu_dai = imx_ssi_pcm_dai[0]; ++ ++ platform_set_drvdata(imx_phycore_snd_device, &imx_phycore_snd_devdata); ++ imx_phycore_snd_devdata.dev = &imx_phycore_snd_device->dev; ++ ret = platform_device_add(imx_phycore_snd_device); ++ ++ if (ret) { ++ printk(KERN_ERR "ASoC: Platform device allocation failed\n"); ++ platform_device_put(imx_phycore_snd_device); ++ } ++ ++ return ret; ++} ++ ++static void __exit imx_phycore_exit(void) ++{ ++ platform_device_unregister(imx_phycore_snd_device); ++} ++ ++late_initcall(imx_phycore_init); ++module_exit(imx_phycore_exit); ++ ++MODULE_AUTHOR("Sascha Hauer "); ++MODULE_DESCRIPTION("PhyCORE ALSA SoC driver"); ++MODULE_LICENSE("GPL"); +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0015-mxc_nand-Add-NFC-V2-support.patch b/recipes/linux/linux-2.6.31/pcm043/0015-mxc_nand-Add-NFC-V2-support.patch new file mode 100644 index 0000000000..a600e7871c --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0015-mxc_nand-Add-NFC-V2-support.patch @@ -0,0 +1,191 @@ +From 7874c1c277ff88843747ccb2e1582c19cfb21986 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Mon, 5 Oct 2009 12:14:21 +0200 +Subject: [PATCH] mxc_nand: Add NFC V2 support + +The v2 version of this controller is used on i.MX35/25 SoCs. + +Signed-off-by: Sascha Hauer +--- + drivers/mtd/nand/mxc_nand.c | 81 ++++++++++++++++++++++++++++++++++++------- + 1 files changed, 68 insertions(+), 13 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c +index 6525d0f..f2297eb 100644 +--- a/drivers/mtd/nand/mxc_nand.c ++++ b/drivers/mtd/nand/mxc_nand.c +@@ -33,9 +33,13 @@ + + #include + #include ++#include + + #define DRIVER_NAME "mxc_nand" + ++#define nfc_is_v21() (cpu_is_mx25() || cpu_is_mx35()) ++#define nfc_is_v1() (cpu_is_mx31() || cpu_is_mx27()) ++ + /* Addresses for NFC registers */ + #define NFC_BUF_SIZE 0xE00 + #define NFC_BUF_ADDR 0xE04 +@@ -46,8 +50,10 @@ + #define NFC_RSLTMAIN_AREA 0xE0E + #define NFC_RSLTSPARE_AREA 0xE10 + #define NFC_WRPROT 0xE12 +-#define NFC_UNLOCKSTART_BLKADDR 0xE14 +-#define NFC_UNLOCKEND_BLKADDR 0xE16 ++#define NFC_V1_UNLOCKSTART_BLKADDR 0xe14 ++#define NFC_V1_UNLOCKEND_BLKADDR 0xe16 ++#define NFC_V21_UNLOCKSTART_BLKADDR 0xe20 ++#define NFC_V21_UNLOCKEND_BLKADDR 0xe22 + #define NFC_NF_WRPRST 0xE18 + #define NFC_CONFIG1 0xE1A + #define NFC_CONFIG2 0xE1C +@@ -116,19 +122,47 @@ struct mxc_nand_host { + #define TROP_US_DELAY 2000 + + /* OOB placement block for use with hardware ecc generation */ +-static struct nand_ecclayout nand_hw_eccoob_smallpage = { ++static struct nand_ecclayout nandv1_hw_eccoob_smallpage = { + .eccbytes = 5, + .eccpos = {6, 7, 8, 9, 10}, + .oobfree = {{0, 5}, {12, 4}, } + }; + +-static struct nand_ecclayout nand_hw_eccoob_largepage = { ++static struct nand_ecclayout nandv1_hw_eccoob_largepage = { + .eccbytes = 20, + .eccpos = {6, 7, 8, 9, 10, 22, 23, 24, 25, 26, + 38, 39, 40, 41, 42, 54, 55, 56, 57, 58}, + .oobfree = {{2, 4}, {11, 10}, {27, 10}, {43, 10}, {59, 5}, } + }; + ++/* OOB description for 512 byte pages with 16 byte OOB */ ++static struct nand_ecclayout nandv2_hw_eccoob_smallpage = { ++ .eccbytes = 1 * 9, ++ .eccpos = { ++ 7, 8, 9, 10, 11, 12, 13, 14, 15 ++ }, ++ .oobfree = { ++ {.offset = 0, .length = 5} ++ } ++}; ++ ++/* OOB description for 2048 byte pages with 64 byte OOB */ ++static struct nand_ecclayout nandv2_hw_eccoob_largepage = { ++ .eccbytes = 4 * 9, ++ .eccpos = { ++ 7, 8, 9, 10, 11, 12, 13, 14, 15, ++ 23, 24, 25, 26, 27, 28, 29, 30, 31, ++ 39, 40, 41, 42, 43, 44, 45, 46, 47, ++ 55, 56, 57, 58, 59, 60, 61, 62, 63 ++ }, ++ .oobfree = { ++ {.offset = 2, .length = 4}, ++ {.offset = 16, .length = 7}, ++ {.offset = 32, .length = 7}, ++ {.offset = 48, .length = 7} ++ } ++}; ++ + #ifdef CONFIG_MTD_PARTITIONS + static const char *part_probes[] = { "RedBoot", "cmdlinepart", NULL }; + #endif +@@ -219,7 +253,7 @@ static void send_page(struct mtd_info *mtd, unsigned int ops) + struct mxc_nand_host *host = nand_chip->priv; + int bufs, i; + +- if (mtd->writesize > 512) ++ if (nfc_is_v1() && mtd->writesize > 512) + bufs = 4; + else + bufs = 1; +@@ -613,6 +647,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + send_cmd(host, command, true); + mxc_do_addr_cycle(mtd, column, page_addr); + send_read_id(host); ++ host->buf_start = column; + break; + + case NAND_CMD_ERASE1: +@@ -633,6 +668,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) + struct resource *res; + uint16_t tmp; + int err = 0, nr_parts = 0; ++ struct nand_ecclayout *oob_smallpage, *oob_largepage; + + /* Allocate memory for MTD device structure and private data */ + host = kzalloc(sizeof(struct mxc_nand_host) + NAND_MAX_PAGESIZE + +@@ -641,7 +677,6 @@ static int __init mxcnd_probe(struct platform_device *pdev) + return -ENOMEM; + + host->data_buf = (uint8_t *)(host + 1); +- host->spare_len = 16; + + host->dev = &pdev->dev; + /* structures must be linked */ +@@ -686,10 +721,23 @@ static int __init mxcnd_probe(struct platform_device *pdev) + goto eres; + } + +- host->regs = host->base; + host->main_area0 = host->base; + host->main_area1 = host->base + 0x200; +- host->spare0 = host->base + 0x800; ++ ++ if (nfc_is_v21()) { ++ host->regs = host->base + 0x1000; ++ host->spare0 = host->base + 0x1000; ++ host->spare_len = 64; ++ oob_smallpage = &nandv2_hw_eccoob_smallpage; ++ oob_largepage = &nandv2_hw_eccoob_largepage; ++ } else if (nfc_is_v1()) { ++ host->regs = host->base; ++ host->spare0 = host->base + 0x800; ++ host->spare_len = 16; ++ oob_smallpage = &nandv1_hw_eccoob_smallpage; ++ oob_largepage = &nandv1_hw_eccoob_largepage; ++ } else ++ BUG(); + + tmp = readw(host->regs + NFC_CONFIG1); + tmp |= NFC_INT_MSK; +@@ -711,15 +759,22 @@ static int __init mxcnd_probe(struct platform_device *pdev) + writew(0x2, host->regs + NFC_CONFIG); + + /* Blocks to be unlocked */ +- writew(0x0, host->regs + NFC_UNLOCKSTART_BLKADDR); +- writew(0x4000, host->regs + NFC_UNLOCKEND_BLKADDR); ++ if (nfc_is_v21()) { ++ writew(0x0, host->regs + NFC_V21_UNLOCKSTART_BLKADDR); ++ writew(0xffff, host->regs + NFC_V21_UNLOCKEND_BLKADDR); ++ this->ecc.bytes = 9; ++ } else if (nfc_is_v1()) { ++ writew(0x0, host->regs + NFC_V1_UNLOCKSTART_BLKADDR); ++ writew(0x4000, host->regs + NFC_V1_UNLOCKEND_BLKADDR); ++ this->ecc.bytes = 3; ++ } else ++ BUG(); + + /* Unlock Block Command for given address range */ + writew(0x4, host->regs + NFC_WRPROT); + + this->ecc.size = 512; +- this->ecc.bytes = 3; +- this->ecc.layout = &nand_hw_eccoob_smallpage; ++ this->ecc.layout = oob_smallpage; + + if (pdata->hw_ecc) { + this->ecc.calculate = mxc_nand_calculate_ecc; +@@ -747,7 +802,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) + } + + if (mtd->writesize == 2048) +- this->ecc.layout = &nand_hw_eccoob_largepage; ++ this->ecc.layout = oob_largepage; + + /* second phase scan */ + if (nand_scan_tail(mtd)) { +-- +1.6.0.4 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0016-add-phycore-mc13783-sound-support.patch b/recipes/linux/linux-2.6.31/pcm043/0016-add-phycore-mc13783-sound-support.patch new file mode 100644 index 0000000000..629f551bfa --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0016-add-phycore-mc13783-sound-support.patch @@ -0,0 +1,211 @@ +From 62b2363d03aa1d58d2ff23eff6c535d1e3715277 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Wed, 25 Nov 2009 16:18:38 +0100 +Subject: [PATCH 16/28] add phycore-mc13783 sound support + +Signed-off-by: Sascha Hauer +--- + sound/soc/imx/Kconfig | 10 +++ + sound/soc/imx/Makefile | 3 + + sound/soc/imx/phycore-mc13783.c | 160 +++++++++++++++++++++++++++++++++++++++ + 3 files changed, 173 insertions(+), 0 deletions(-) + create mode 100644 sound/soc/imx/phycore-mc13783.c + +diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig +index 2a8c990..e145212 100644 +--- a/sound/soc/imx/Kconfig ++++ b/sound/soc/imx/Kconfig +@@ -20,3 +20,13 @@ config SND_SOC_PHYCORE_AC97 + Say Y if you want to add support for SoC audio on Phytec phyCORE + and phyCARD boards in AC97 mode + ++config SND_SOC_PHYCORE_MC13783 ++ tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards" ++ depends on MACH_PCM038 || MACH_PCM037 ++ select SND_MXC_SOC_SSI ++ select SND_SOC_MC13783 ++ select SND_SOC_WM9712 if MACH_PCM043 || MACH_PCA100 ++ help ++ Say Y if you want to add support for SoC audio on Phytec phyCORE ++ boards using a MC13783 Codec. ++ +diff --git a/sound/soc/imx/Makefile b/sound/soc/imx/Makefile +index 9f8bb92..425ffaf 100644 +--- a/sound/soc/imx/Makefile ++++ b/sound/soc/imx/Makefile +@@ -10,3 +10,6 @@ obj-$(CONFIG_SND_IMX_SOC) += snd-soc-imx.o + # i.MX Machine Support + snd-soc-phycore-ac97-objs := phycore-ac97.o + obj-$(CONFIG_SND_SOC_PHYCORE_AC97) += snd-soc-phycore-ac97.o ++ ++snd-soc-phycore-mc13783-objs := phycore-mc13783.o ++obj-$(CONFIG_SND_SOC_PHYCORE_MC13783) += snd-soc-phycore-mc13783.o +diff --git a/sound/soc/imx/phycore-mc13783.c b/sound/soc/imx/phycore-mc13783.c +new file mode 100644 +index 0000000..3743e0f +--- /dev/null ++++ b/sound/soc/imx/phycore-mc13783.c +@@ -0,0 +1,160 @@ ++/* ++ * phycore.c -- SoC audio for imx_phycore ++ * ++ * Copyright 2009 Sascha Hauer, Pengutronix ++ * ++ * 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. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "../codecs/mc13783.h" ++#include "../codecs/wm9712.h" ++#include "imx-ssi.h" ++ ++static struct snd_soc_card imx_phycore; ++ ++#define FMT_PLAYBACK (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | \ ++ SND_SOC_DAIFMT_CBM_CFM) ++#define FMT_CAPTURE (SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF | \ ++ SND_SOC_DAIFMT_CBM_CFM) ++ ++static int imx_phycore_hifi_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_dai *cpu_dai = rtd->dai->cpu_dai; ++ struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; ++ int ret; ++ ++ /* set cpu DAI configuration */ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { ++ ret = snd_soc_dai_set_fmt(codec_dai, FMT_PLAYBACK); ++ if (ret) ++ return ret; ++ ret = snd_soc_dai_set_fmt(cpu_dai, FMT_PLAYBACK); ++ if (ret) ++ return ret; ++ } else { ++ ret = snd_soc_dai_set_fmt(codec_dai, FMT_CAPTURE); ++ if (ret) ++ return ret; ++ ret = snd_soc_dai_set_fmt(cpu_dai, FMT_CAPTURE); ++ if (ret) ++ return ret; ++ ret = snd_soc_dai_set_tdm_slot(codec_dai, 0, 4); ++ if (ret) ++ return ret; ++ } ++ ++ ret = snd_soc_dai_set_sysclk(codec_dai, MC13783_CLK_CLIA, 26000000, 0); ++ if (ret) ++ return ret; ++ ++ ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0xfffffffc, 4); ++ if (ret) ++ return ret; ++ ++ return 0; ++} ++ ++static int imx_phycore_hifi_hw_free(struct snd_pcm_substream *substream) ++{ ++ return 0; ++} ++ ++static struct snd_soc_ops imx_phycore_hifi_ops = { ++ .hw_params = imx_phycore_hifi_hw_params, ++ .hw_free = imx_phycore_hifi_hw_free, ++}; ++ ++static int imx_phycore_probe(struct platform_device *pdev) ++{ ++ return 0; ++} ++ ++static int imx_phycore_remove(struct platform_device *pdev) ++{ ++ return 0; ++} ++ ++static struct snd_soc_dai_link imx_phycore_dai_mc13783[] = { ++ { ++ .name = "MC13783 Playback", ++ .stream_name = "Playback", ++ .codec_dai = &mc13783_dai[0], ++ .ops = &imx_phycore_hifi_ops, ++ }, { ++ .name = "MC13783 Capture", ++ .stream_name = "Capture", ++ .codec_dai = &mc13783_dai[1], ++ .ops = &imx_phycore_hifi_ops, ++ }, ++}; ++ ++static struct snd_soc_card imx_phycore = { ++ .name = "PhyCORE-audio", ++ .platform = &imx_soc_platform, ++ .probe = imx_phycore_probe, ++ .remove = imx_phycore_remove, ++ .dai_link = imx_phycore_dai_mc13783, ++ .num_links = ARRAY_SIZE(imx_phycore_dai_mc13783), ++}; ++ ++static struct snd_soc_device imx_phycore_snd_devdata = { ++ .card = &imx_phycore, ++ .codec_dev = &soc_codec_dev_mc13783, ++}; ++ ++static struct platform_device *imx_phycore_snd_device; ++ ++static int __init imx_phycore_init(void) ++{ ++ int ret; ++ ++ if (!machine_is_pcm038() && !machine_is_pcm037()) ++ /* return happy. We might run on a totally different machine */ ++ return 0; ++ ++ imx_phycore_snd_device = platform_device_alloc("soc-audio", -1); ++ if (!imx_phycore_snd_device) ++ return -ENOMEM; ++ ++ imx_phycore_dai_mc13783[0].cpu_dai = imx_ssi_pcm_dai[0]; ++ imx_phycore_dai_mc13783[1].cpu_dai = imx_ssi_pcm_dai[0]; ++ ++ platform_set_drvdata(imx_phycore_snd_device, &imx_phycore_snd_devdata); ++ imx_phycore_snd_devdata.dev = &imx_phycore_snd_device->dev; ++ ret = platform_device_add(imx_phycore_snd_device); ++ ++ if (ret) { ++ printk(KERN_ERR "ASoC: Platform device allocation failed\n"); ++ platform_device_put(imx_phycore_snd_device); ++ } ++ ++ return ret; ++} ++ ++static void __exit imx_phycore_exit(void) ++{ ++ platform_device_unregister(imx_phycore_snd_device); ++} ++ ++late_initcall(imx_phycore_init); ++module_exit(imx_phycore_exit); ++ ++MODULE_AUTHOR("Sascha Hauer "); ++MODULE_DESCRIPTION("PhyCORE ALSA SoC driver"); ++MODULE_LICENSE("GPL"); +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0016-mxc_nand-disable-sp_en-bit-only-once.patch b/recipes/linux/linux-2.6.31/pcm043/0016-mxc_nand-disable-sp_en-bit-only-once.patch new file mode 100644 index 0000000000..f926c8fd0c --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0016-mxc_nand-disable-sp_en-bit-only-once.patch @@ -0,0 +1,66 @@ +From b21f4e602fec63eb29aea9dc9bc59d31f6e027c5 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Mon, 5 Oct 2009 17:18:42 +0200 +Subject: [PATCH] mxc_nand: disable sp_en bit only once + +Signed-off-by: Sascha Hauer +--- + drivers/mtd/nand/mxc_nand.c | 15 +++------------ + 1 files changed, 3 insertions(+), 12 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c +index f2297eb..199a5f2 100644 +--- a/drivers/mtd/nand/mxc_nand.c ++++ b/drivers/mtd/nand/mxc_nand.c +@@ -274,16 +274,10 @@ static void send_page(struct mtd_info *mtd, unsigned int ops) + static void send_read_id(struct mxc_nand_host *host) + { + struct nand_chip *this = &host->nand; +- uint16_t tmp; + + /* NANDFC buffer 0 is used for device ID output */ + writew(0x0, host->regs + NFC_BUF_ADDR); + +- /* Read ID into main buffer */ +- tmp = readw(host->regs + NFC_CONFIG1); +- tmp &= ~NFC_SP_EN; +- writew(tmp, host->regs + NFC_CONFIG1); +- + writew(NFC_ID, host->regs + NFC_CONFIG2); + + /* Wait for operation to complete */ +@@ -307,7 +301,7 @@ static uint16_t get_dev_status(struct mxc_nand_host *host) + { + void __iomem *main_buf = host->main_area1; + uint32_t store; +- uint16_t ret, tmp; ++ uint16_t ret; + /* Issue status request to NAND device */ + + /* store the main area1 first word, later do recovery */ +@@ -316,11 +310,6 @@ static uint16_t get_dev_status(struct mxc_nand_host *host) + * corruption of read/write buffer on status requests. */ + writew(1, host->regs + NFC_BUF_ADDR); + +- /* Read status into main buffer */ +- tmp = readw(host->regs + NFC_CONFIG1); +- tmp &= ~NFC_SP_EN; +- writew(tmp, host->regs + NFC_CONFIG1); +- + writew(NFC_STATUS, host->regs + NFC_CONFIG2); + + /* Wait for operation to complete */ +@@ -739,8 +728,10 @@ static int __init mxcnd_probe(struct platform_device *pdev) + } else + BUG(); + ++ /* disable interrupt and spare enable */ + tmp = readw(host->regs + NFC_CONFIG1); + tmp |= NFC_INT_MSK; ++ tmp &= ~NFC_SP_EN; + writew(tmp, host->regs + NFC_CONFIG1); + + init_waitqueue_head(&host->irq_waitq); +-- +1.6.0.4 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0017-mxc_nand-Allow-flash-based-bbt.patch b/recipes/linux/linux-2.6.31/pcm043/0017-mxc_nand-Allow-flash-based-bbt.patch new file mode 100644 index 0000000000..1f3f9eede4 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0017-mxc_nand-Allow-flash-based-bbt.patch @@ -0,0 +1,79 @@ +From b865b0240161ad328bb2fe69eea58111c8df6a29 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Wed, 21 Oct 2009 14:25:27 +0200 +Subject: [PATCH] mxc_nand: Allow flash based bbt + +Signed-off-by: Sascha Hauer +--- + arch/arm/plat-mxc/include/mach/mxc_nand.h | 3 +- + drivers/mtd/nand/mxc_nand.c | 34 +++++++++++++++++++++++++++++ + 2 files changed, 36 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/plat-mxc/include/mach/mxc_nand.h b/arch/arm/plat-mxc/include/mach/mxc_nand.h +index 2b972df..5d2d21d 100644 +--- a/arch/arm/plat-mxc/include/mach/mxc_nand.h ++++ b/arch/arm/plat-mxc/include/mach/mxc_nand.h +@@ -22,6 +22,7 @@ + + struct mxc_nand_platform_data { + int width; /* data bus width in bytes */ +- int hw_ecc; /* 0 if supress hardware ECC */ ++ int hw_ecc:1; /* 0 if supress hardware ECC */ ++ int flash_bbt:1; /* set to 1 to use a flash based bbt */ + }; + #endif /* __ASM_ARCH_NAND_H */ +diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c +index 199a5f2..3fdc172 100644 +--- a/drivers/mtd/nand/mxc_nand.c ++++ b/drivers/mtd/nand/mxc_nand.c +@@ -648,6 +648,33 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, + } + } + ++/* ++ * The generic flash bbt decriptors overlap with our ecc ++ * hardware, so define some i.MX specific ones. ++ */ ++static uint8_t bbt_pattern[] = { 'B', 'b', 't', '0' }; ++static uint8_t mirror_pattern[] = { '1', 't', 'b', 'B' }; ++ ++static struct nand_bbt_descr bbt_main_descr = { ++ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE ++ | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP, ++ .offs = 0, ++ .len = 4, ++ .veroffs = 4, ++ .maxblocks = 4, ++ .pattern = bbt_pattern, ++}; ++ ++static struct nand_bbt_descr bbt_mirror_descr = { ++ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE ++ | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP, ++ .offs = 0, ++ .len = 4, ++ .veroffs = 4, ++ .maxblocks = 4, ++ .pattern = mirror_pattern, ++}; ++ + static int __init mxcnd_probe(struct platform_device *pdev) + { + struct nand_chip *this; +@@ -786,6 +813,13 @@ static int __init mxcnd_probe(struct platform_device *pdev) + if (pdata->width == 2) + this->options |= NAND_BUSWIDTH_16; + ++ if (pdata->flash_bbt) { ++ this->bbt_td = &bbt_main_descr; ++ this->bbt_md = &bbt_mirror_descr; ++ /* update flash based bbt */ ++ this->options |= NAND_USE_FLASH_BBT; ++ } ++ + /* first scan to find the device and get the page size */ + if (nand_scan_ident(mtd, 1)) { + err = -ENXIO; +-- +1.6.0.4 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0017-pcm043-add-sound-support.patch b/recipes/linux/linux-2.6.31/pcm043/0017-pcm043-add-sound-support.patch new file mode 100644 index 0000000000..d4c1527ac2 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0017-pcm043-add-sound-support.patch @@ -0,0 +1,161 @@ +From 9ce0a3fb1764c093452db1f34dfecbca1ea41833 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 29 Oct 2009 17:17:31 +0100 +Subject: [PATCH 17/28] pcm043: add sound support + +Signed-off-by: Sascha Hauer +--- + arch/arm/mach-mx3/pcm043.c | 104 +++++++++++++++++++++++++++++++++++++++++++- + 1 files changed, 103 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/mach-mx3/pcm043.c b/arch/arm/mach-mx3/pcm043.c +index 8d27c32..d1b6f53 100644 +--- a/arch/arm/mach-mx3/pcm043.c ++++ b/arch/arm/mach-mx3/pcm043.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -43,6 +44,8 @@ + #include + #include + #include ++#include ++#include + + #include "devices.h" + +@@ -203,7 +206,92 @@ static struct pad_desc pcm043_pads[] = { + MX35_PAD_D3_VSYNC__IPU_DISPB_D3_VSYNC, + MX35_PAD_D3_REV__IPU_DISPB_D3_REV, + MX35_PAD_D3_CLS__IPU_DISPB_D3_CLS, +- MX35_PAD_D3_SPL__IPU_DISPB_D3_SPL ++ MX35_PAD_D3_SPL__IPU_DISPB_D3_SPL, ++ /* SSI */ ++ MX35_PAD_STXFS4__AUDMUX_AUD4_TXFS, ++ MX35_PAD_STXD4__AUDMUX_AUD4_TXD, ++ MX35_PAD_SRXD4__AUDMUX_AUD4_RXD, ++ MX35_PAD_SCK4__AUDMUX_AUD4_TXC, ++}; ++ ++#define AC97_GPIO_TXFS (1 * 32 + 31) ++#define AC97_GPIO_TXD (1 * 32 + 28) ++#define AC97_GPIO_RESET (1 * 32 + 0) ++ ++static void pcm043_ac97_warm_reset(struct snd_ac97 *ac97) ++{ ++ struct pad_desc txfs_gpio = MX35_PAD_STXFS4__GPIO2_31; ++ struct pad_desc txfs = MX35_PAD_STXFS4__AUDMUX_AUD4_TXFS; ++ int ret; ++ ++ ret = gpio_request(AC97_GPIO_TXFS, "SSI"); ++ if (ret) { ++ printk("failed to get GPIO_TXFS: %d\n", ret); ++ return; ++ } ++ ++ mxc_iomux_v3_setup_pad(&txfs_gpio); ++ ++ /* warm reset */ ++ gpio_direction_output(AC97_GPIO_TXFS, 1); ++ udelay(2); ++ gpio_set_value(AC97_GPIO_TXFS, 0); ++ ++ gpio_free(AC97_GPIO_TXFS); ++ mxc_iomux_v3_setup_pad(&txfs); ++} ++ ++static void pcm043_ac97_cold_reset(struct snd_ac97 *ac97) ++{ ++ struct pad_desc txfs_gpio = MX35_PAD_STXFS4__GPIO2_31; ++ struct pad_desc txfs = MX35_PAD_STXFS4__AUDMUX_AUD4_TXFS; ++ struct pad_desc txd_gpio = MX35_PAD_STXD4__GPIO2_28; ++ struct pad_desc txd = MX35_PAD_STXD4__AUDMUX_AUD4_TXD; ++ struct pad_desc reset_gpio = MX35_PAD_SD2_CMD__GPIO2_0; ++ int ret; ++ ++ ret = gpio_request(AC97_GPIO_TXFS, "SSI"); ++ if (ret) ++ goto err1; ++ ++ ret = gpio_request(AC97_GPIO_TXD, "SSI"); ++ if (ret) ++ goto err2; ++ ++ ret = gpio_request(AC97_GPIO_RESET, "SSI"); ++ if (ret) ++ goto err3; ++ ++ mxc_iomux_v3_setup_pad(&txfs_gpio); ++ mxc_iomux_v3_setup_pad(&txd_gpio); ++ mxc_iomux_v3_setup_pad(&reset_gpio); ++ ++ gpio_direction_output(AC97_GPIO_TXFS, 0); ++ gpio_direction_output(AC97_GPIO_TXD, 0); ++ ++ /* cold reset */ ++ gpio_direction_output(AC97_GPIO_RESET, 0); ++ udelay(10); ++ gpio_direction_output(AC97_GPIO_RESET, 1); ++ ++ mxc_iomux_v3_setup_pad(&txd); ++ mxc_iomux_v3_setup_pad(&txfs); ++ ++ gpio_free(AC97_GPIO_RESET); ++err3: ++ gpio_free(AC97_GPIO_TXD); ++err2: ++ gpio_free(AC97_GPIO_TXFS); ++err1: ++ if (ret) ++ printk("%s failed with %d\n", __func__, ret); ++ mdelay(1); ++} ++ ++static struct imx_ssi_platform_data pcm043_ssi_pdata = { ++ .ac97_reset = pcm043_ac97_cold_reset, ++ .ac97_warm_reset = pcm043_ac97_warm_reset, ++ .flags = IMX_SSI_USE_AC97, + }; + + /* +@@ -213,11 +301,24 @@ static void __init mxc_board_init(void) + { + mxc_iomux_v3_setup_multiple_pads(pcm043_pads, ARRAY_SIZE(pcm043_pads)); + ++ mxc_audmux_v2_configure_port(3, ++ MXC_AUDMUX_V2_PTCR_SYN | /* 4wire mode */ ++ MXC_AUDMUX_V2_PTCR_TFSEL(0) | ++ MXC_AUDMUX_V2_PTCR_TFSDIR, ++ MXC_AUDMUX_V2_PDCR_RXDSEL(0)); ++ ++ mxc_audmux_v2_configure_port(0, ++ MXC_AUDMUX_V2_PTCR_SYN | /* 4wire mode */ ++ MXC_AUDMUX_V2_PTCR_TCSEL(3) | ++ MXC_AUDMUX_V2_PTCR_TCLKDIR, /* clock is output */ ++ MXC_AUDMUX_V2_PDCR_RXDSEL(3)); ++ + platform_add_devices(devices, ARRAY_SIZE(devices)); + + mxc_register_device(&mxc_uart_device0, &uart_pdata); + + mxc_register_device(&mxc_uart_device1, &uart_pdata); ++ mxc_register_device(&imx_ssi_device0, &pcm043_ssi_pdata); + + #if defined CONFIG_I2C_IMX || defined CONFIG_I2C_IMX_MODULE + i2c_register_board_info(0, pcm043_i2c_devices, +@@ -232,6 +333,7 @@ static void __init mxc_board_init(void) + + static void __init pcm043_timer_init(void) + { ++ printk("mx35_clocks_init()\n"); + mx35_clocks_init(); + } + +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0018-mxc_nand-remove-TROP_US_DELAY.patch b/recipes/linux/linux-2.6.31/pcm043/0018-mxc_nand-remove-TROP_US_DELAY.patch new file mode 100644 index 0000000000..9d8d26654b --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0018-mxc_nand-remove-TROP_US_DELAY.patch @@ -0,0 +1,88 @@ +From 55f91a40d858b579960bb9d3e29d8339b7210be2 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Wed, 21 Oct 2009 16:01:02 +0200 +Subject: [PATCH] mxc_nand: remove TROP_US_DELAY + +wait_op_done is only called with the same timeout, so +code the timeout into the function itself. + +Signed-off-by: Sascha Hauer +--- + drivers/mtd/nand/mxc_nand.c | 17 +++++++---------- + 1 files changed, 7 insertions(+), 10 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c +index 3fdc172..dd80e88 100644 +--- a/drivers/mtd/nand/mxc_nand.c ++++ b/drivers/mtd/nand/mxc_nand.c +@@ -118,9 +118,6 @@ struct mxc_nand_host { + int spare_len; + }; + +-/* Define delays in microsec for NAND device operations */ +-#define TROP_US_DELAY 2000 +- + /* OOB placement block for use with hardware ecc generation */ + static struct nand_ecclayout nandv1_hw_eccoob_smallpage = { + .eccbytes = 5, +@@ -185,10 +182,10 @@ static irqreturn_t mxc_nfc_irq(int irq, void *dev_id) + /* This function polls the NANDFC to wait for the basic operation to + * complete by checking the INT bit of config2 register. + */ +-static void wait_op_done(struct mxc_nand_host *host, int max_retries, +- int useirq) ++static void wait_op_done(struct mxc_nand_host *host, int useirq) + { + uint32_t tmp; ++ int max_retries = 2000; + + if (useirq) { + if ((readw(host->regs + NFC_CONFIG2) & NFC_INT) == 0) { +@@ -230,7 +227,7 @@ static void send_cmd(struct mxc_nand_host *host, uint16_t cmd, int useirq) + writew(NFC_CMD, host->regs + NFC_CONFIG2); + + /* Wait for operation to complete */ +- wait_op_done(host, TROP_US_DELAY, useirq); ++ wait_op_done(host, useirq); + } + + /* This function sends an address (or partial address) to the +@@ -244,7 +241,7 @@ static void send_addr(struct mxc_nand_host *host, uint16_t addr, int islast) + writew(NFC_ADDR, host->regs + NFC_CONFIG2); + + /* Wait for operation to complete */ +- wait_op_done(host, TROP_US_DELAY, islast); ++ wait_op_done(host, islast); + } + + static void send_page(struct mtd_info *mtd, unsigned int ops) +@@ -266,7 +263,7 @@ static void send_page(struct mtd_info *mtd, unsigned int ops) + writew(ops, host->regs + NFC_CONFIG2); + + /* Wait for operation to complete */ +- wait_op_done(host, TROP_US_DELAY, true); ++ wait_op_done(host, true); + } + } + +@@ -281,7 +278,7 @@ static void send_read_id(struct mxc_nand_host *host) + writew(NFC_ID, host->regs + NFC_CONFIG2); + + /* Wait for operation to complete */ +- wait_op_done(host, TROP_US_DELAY, true); ++ wait_op_done(host, true); + + if (this->options & NAND_BUSWIDTH_16) { + void __iomem *main_buf = host->main_area0; +@@ -313,7 +310,7 @@ static uint16_t get_dev_status(struct mxc_nand_host *host) + writew(NFC_STATUS, host->regs + NFC_CONFIG2); + + /* Wait for operation to complete */ +- wait_op_done(host, TROP_US_DELAY, true); ++ wait_op_done(host, true); + + /* Status is placed in first word of main buffer */ + /* get status, then recovery area 1 data */ +-- +1.6.0.4 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0018-pcm038-Add-SPI-MC13783-support.patch b/recipes/linux/linux-2.6.31/pcm043/0018-pcm038-Add-SPI-MC13783-support.patch new file mode 100644 index 0000000000..447936a87a --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0018-pcm038-Add-SPI-MC13783-support.patch @@ -0,0 +1,146 @@ +From d29530587128ca197998d1b02a3e9e3286cf98e1 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 24 Sep 2009 10:01:53 +0200 +Subject: [PATCH 18/28] pcm038: Add SPI/MC13783 support + +Signed-off-by: Sascha Hauer +--- + arch/arm/mach-mx2/pcm038.c | 94 +++++++++++++++++++++++++++++++++++++++++++- + 1 files changed, 92 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/mach-mx2/pcm038.c b/arch/arm/mach-mx2/pcm038.c +index a4628d0..b3a8ed8 100644 +--- a/arch/arm/mach-mx2/pcm038.c ++++ b/arch/arm/mach-mx2/pcm038.c +@@ -23,6 +23,10 @@ + #include + #include + #include ++#include ++#include ++#include ++#include + + #include + #include +@@ -35,6 +39,7 @@ + #include + #include + #include ++#include + + #include "devices.h" + +@@ -78,8 +83,6 @@ static int pcm038_pins[] = { + PC6_PF_I2C2_SCL, + /* SPI1 */ + PD25_PF_CSPI1_RDY, +- PD27_PF_CSPI1_SS1, +- PD28_PF_CSPI1_SS0, + PD29_PF_CSPI1_SCLK, + PD30_PF_CSPI1_MISO, + PD31_PF_CSPI1_MOSI, +@@ -200,6 +203,86 @@ static struct i2c_board_info pcm038_i2c_devices[] = { + } + }; + ++static int pcm038_spi_cs[] = {GPIO_PORTD + 28}; ++ ++static struct spi_imx_master pcm038_spi_0_data = { ++ .chipselect = pcm038_spi_cs, ++ .num_chipselect = ARRAY_SIZE(pcm038_spi_cs), ++}; ++ ++static struct regulator_consumer_supply sdhc1_consumers[] = { ++ { ++ .dev = &mxc_sdhc_device1.dev, ++ .supply = "sdhc_vcc", ++ }, ++}; ++ ++static struct regulator_init_data sdhc1_data = { ++ .constraints = { ++ .min_uV = 3000000, ++ .max_uV = 3400000, ++ .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | ++ REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, ++ .valid_modes_mask = REGULATOR_MODE_NORMAL | ++ REGULATOR_MODE_FAST, ++ .always_on = 0, ++ .boot_on = 0, ++ }, ++ .num_consumer_supplies = ARRAY_SIZE(sdhc1_consumers), ++ .consumer_supplies = sdhc1_consumers, ++}; ++ ++static struct regulator_consumer_supply cam_consumers[] = { ++ { ++ .dev = NULL, ++ .supply = "imx_cam_vcc", ++ }, ++}; ++ ++static struct regulator_init_data cam_data = { ++ .constraints = { ++ .min_uV = 3000000, ++ .max_uV = 3400000, ++ .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | ++ REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, ++ .valid_modes_mask = REGULATOR_MODE_NORMAL | ++ REGULATOR_MODE_FAST, ++ .always_on = 0, ++ .boot_on = 0, ++ }, ++ .num_consumer_supplies = ARRAY_SIZE(cam_consumers), ++ .consumer_supplies = cam_consumers, ++}; ++ ++struct mc13783_regulator_init_data pcm038_regulators[] = { ++ { ++ .id = MC13783_REGU_VCAM, ++ .init_data = &cam_data, ++ }, { ++ .id = MC13783_REGU_VMMC1, ++ .init_data = &sdhc1_data, ++ }, ++}; ++ ++static struct mc13783_platform_data pcm038_pmic = { ++ .regulators = pcm038_regulators, ++ .num_regulators = ARRAY_SIZE(pcm038_regulators), ++ .flags = MC13783_USE_ADC | MC13783_USE_REGULATOR | ++ MC13783_USE_TOUCHSCREEN, ++}; ++ ++static struct spi_board_info pcm038_spi_board_info[] __initdata = { ++ { ++ .modalias = "mc13783", ++ .irq = IRQ_GPIOB(23), ++ .max_speed_hz = 300000, ++ .bus_num = 0, ++ .chip_select = 0, ++ .platform_data = &pcm038_pmic, ++ .mode = SPI_CS_HIGH, ++ } ++}; ++ + static void __init pcm038_init(void) + { + mxc_gpio_setup_multiple_pins(pcm038_pins, ARRAY_SIZE(pcm038_pins), +@@ -220,6 +303,13 @@ static void __init pcm038_init(void) + + mxc_register_device(&mxc_i2c_device1, &pcm038_i2c_1_data); + ++ /* MC13783 IRQ */ ++ mxc_gpio_mode(GPIO_PORTB | 23 | GPIO_GPIO | GPIO_IN); ++ ++ mxc_register_device(&mxc_spi_device0, &pcm038_spi_0_data); ++ spi_register_board_info(pcm038_spi_board_info, ++ ARRAY_SIZE(pcm038_spi_board_info)); ++ + platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); + + #ifdef CONFIG_MACH_PCM970_BASEBOARD +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0019-mx27-add-support-for-phytec-pca100-phyCARD-s-board.patch b/recipes/linux/linux-2.6.31/pcm043/0019-mx27-add-support-for-phytec-pca100-phyCARD-s-board.patch new file mode 100644 index 0000000000..fbada0b075 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0019-mx27-add-support-for-phytec-pca100-phyCARD-s-board.patch @@ -0,0 +1,293 @@ +From 11082d5306315626cb67dc73b13c95baefd6bc9c Mon Sep 17 00:00:00 2001 +From: Luotao Fu +Date: Thu, 6 Aug 2009 11:19:39 +0200 +Subject: [PATCH 19/28] mx27: add support for phytec pca100 (phyCARD-s) board + +Signed-off-by: Luotao Fu +Signed-off-by: Sascha Hauer +--- + arch/arm/mach-mx2/Kconfig | 7 ++ + arch/arm/mach-mx2/Makefile | 2 +- + arch/arm/mach-mx2/pca100.c | 244 ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 252 insertions(+), 1 deletions(-) + create mode 100644 arch/arm/mach-mx2/pca100.c + +diff --git a/arch/arm/mach-mx2/Kconfig b/arch/arm/mach-mx2/Kconfig +index 0d08c34..69e2a9b 100644 +--- a/arch/arm/mach-mx2/Kconfig ++++ b/arch/arm/mach-mx2/Kconfig +@@ -69,4 +69,11 @@ config MACH_MX27LITE + Include support for MX27 LITEKIT platform. This includes specific + configurations for the board and its peripherals. + ++config MACH_PCA100 ++ bool "Phytec phyCARD-s (pca100)" ++ depends on MACH_MX27 ++ help ++ Include support for phyCARD-s (aka pca100) platform. This ++ includes specific configurations for the module and its peripherals. ++ + endif +diff --git a/arch/arm/mach-mx2/Makefile b/arch/arm/mach-mx2/Makefile +index b9b1cca..046c115 100644 +--- a/arch/arm/mach-mx2/Makefile ++++ b/arch/arm/mach-mx2/Makefile +@@ -17,4 +17,4 @@ obj-$(CONFIG_MACH_PCM038) += pcm038.o + obj-$(CONFIG_MACH_PCM970_BASEBOARD) += pcm970-baseboard.o + obj-$(CONFIG_MACH_MX27_3DS) += mx27pdk.o + obj-$(CONFIG_MACH_MX27LITE) += mx27lite.o +- ++obj-$(CONFIG_MACH_PCA100) += pca100.o +diff --git a/arch/arm/mach-mx2/pca100.c b/arch/arm/mach-mx2/pca100.c +new file mode 100644 +index 0000000..fe5b165 +--- /dev/null ++++ b/arch/arm/mach-mx2/pca100.c +@@ -0,0 +1,244 @@ ++/* ++ * Copyright 2007 Robert Schwebel , Pengutronix ++ * Copyright (C) 2009 Sascha Hauer (kernel@pengutronix.de) ++ * ++ * 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., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE) ++#include ++#endif ++#include ++#include ++#include ++#include ++ ++#include "devices.h" ++ ++static int pca100_pins[] = { ++ /* UART1 */ ++ PE12_PF_UART1_TXD, ++ PE13_PF_UART1_RXD, ++ PE14_PF_UART1_CTS, ++ PE15_PF_UART1_RTS, ++ /* SDHC */ ++ PB4_PF_SD2_D0, ++ PB5_PF_SD2_D1, ++ PB6_PF_SD2_D2, ++ PB7_PF_SD2_D3, ++ PB8_PF_SD2_CMD, ++ PB9_PF_SD2_CLK, ++ /* FEC */ ++ PD0_AIN_FEC_TXD0, ++ PD1_AIN_FEC_TXD1, ++ PD2_AIN_FEC_TXD2, ++ PD3_AIN_FEC_TXD3, ++ PD4_AOUT_FEC_RX_ER, ++ PD5_AOUT_FEC_RXD1, ++ PD6_AOUT_FEC_RXD2, ++ PD7_AOUT_FEC_RXD3, ++ PD8_AF_FEC_MDIO, ++ PD9_AIN_FEC_MDC, ++ PD10_AOUT_FEC_CRS, ++ PD11_AOUT_FEC_TX_CLK, ++ PD12_AOUT_FEC_RXD0, ++ PD13_AOUT_FEC_RX_DV, ++ PD14_AOUT_FEC_RX_CLK, ++ PD15_AOUT_FEC_COL, ++ PD16_AIN_FEC_TX_ER, ++ PF23_AIN_FEC_TX_EN, ++ /* SSI1 */ ++ PC20_PF_SSI1_FS, ++ PC21_PF_SSI1_RXD, ++ PC22_PF_SSI1_TXD, ++ PC23_PF_SSI1_CLK, ++ /* onboard I2C */ ++ PC5_PF_I2C2_SDA, ++ PC6_PF_I2C2_SCL, ++ /* external I2C */ ++ PD17_PF_I2C_DATA, ++ PD18_PF_I2C_CLK, ++ /* SPI1 */ ++ PD25_PF_CSPI1_RDY, ++ PD29_PF_CSPI1_SCLK, ++ PD30_PF_CSPI1_MISO, ++ PD31_PF_CSPI1_MOSI, ++}; ++ ++static struct imxuart_platform_data uart_pdata = { ++ .flags = IMXUART_HAVE_RTSCTS, ++}; ++ ++static struct mxc_nand_platform_data pca100_nand_board_info = { ++ .width = 1, ++ .hw_ecc = 1, ++}; ++ ++static struct platform_device *platform_devices[] __initdata = { ++ &mxc_w1_master_device, ++ &mxc_fec_device, ++}; ++ ++static struct imxi2c_platform_data pca100_i2c_1_data = { ++ .bitrate = 100000, ++}; ++ ++static struct at24_platform_data board_eeprom = { ++ .byte_len = 4096, ++ .page_size = 32, ++ .flags = AT24_FLAG_ADDR16, ++}; ++ ++static struct i2c_board_info pca100_i2c_devices[] = { ++ { ++ I2C_BOARD_INFO("at24", 0x52), /* E0=0, E1=1, E2=0 */ ++ .platform_data = &board_eeprom, ++ }, { ++ I2C_BOARD_INFO("rtc-pcf8563", 0x51), ++ .type = "pcf8563" ++ }, { ++ I2C_BOARD_INFO("lm75", 0x4a), ++ .type = "lm75" ++ } ++}; ++ ++#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE) ++static struct spi_eeprom at25320 = { ++ .name = "at25320an", ++ .byte_len = 4096, ++ .page_size = 32, ++ .flags = EE_ADDR2, ++}; ++ ++static struct spi_board_info pca100_spi_board_info[] __initdata = { ++ { ++ .modalias = "at25", ++ .max_speed_hz = 30000, ++ .bus_num = 0, ++ .chip_select = 1, ++ .platform_data = &at25320, ++ }, ++}; ++ ++static int pca100_spi_cs[] = {GPIO_PORTD + 28, GPIO_PORTD + 27}; ++ ++static struct spi_imx_master pca100_spi_0_data = { ++ .chipselect = pca100_spi_cs, ++ .num_chipselect = ARRAY_SIZE(pca100_spi_cs), ++}; ++#endif ++ ++static int pca100_sdhc2_init(struct device *dev, irq_handler_t detect_irq, ++ void *data) ++{ ++ int ret; ++ ++ ret = request_irq(IRQ_GPIOC(29), detect_irq, ++ IRQF_DISABLED | IRQF_TRIGGER_FALLING, ++ "imx-mmc-detect", data); ++ if (ret) ++ printk(KERN_ERR ++ "pca100: Failed to reuest irq for sd/mmc detection\n"); ++ ++ return ret; ++} ++ ++static void pca100_sdhc2_exit(struct device *dev, void *data) ++{ ++ free_irq(IRQ_GPIOC(29), data); ++} ++ ++static struct imxmmc_platform_data sdhc_pdata = { ++ .init = pca100_sdhc2_init, ++ .exit = pca100_sdhc2_exit, ++}; ++ ++static void __init pca100_init(void) ++{ ++ int ret; ++ ++ ret = mxc_gpio_setup_multiple_pins(pca100_pins, ++ ARRAY_SIZE(pca100_pins), "PCA100"); ++ if (ret) ++ printk(KERN_ERR "pca100: Failed to setup pins (%d)\n", ret); ++ ++ mxc_register_device(&mxc_uart_device0, &uart_pdata); ++ ++ mxc_gpio_mode(GPIO_PORTC | 29 | GPIO_GPIO | GPIO_IN); ++ mxc_register_device(&mxc_sdhc_device1, &sdhc_pdata); ++ ++ mxc_register_device(&mxc_nand_device, &pca100_nand_board_info); ++ ++ /* only the i2c master 1 is used on this CPU card */ ++ i2c_register_board_info(1, pca100_i2c_devices, ++ ARRAY_SIZE(pca100_i2c_devices)); ++ ++ mxc_register_device(&mxc_i2c_device1, &pca100_i2c_1_data); ++ ++ mxc_gpio_mode(GPIO_PORTD | 28 | GPIO_GPIO | GPIO_OUT); ++ mxc_gpio_mode(GPIO_PORTD | 27 | GPIO_GPIO | GPIO_OUT); ++ ++ /* GPIO0_IRQ */ ++ mxc_gpio_mode(GPIO_PORTC | 31 | GPIO_GPIO | GPIO_IN); ++ /* GPIO1_IRQ */ ++ mxc_gpio_mode(GPIO_PORTC | 25 | GPIO_GPIO | GPIO_IN); ++ /* GPIO2_IRQ */ ++ mxc_gpio_mode(GPIO_PORTE | 5 | GPIO_GPIO | GPIO_IN); ++ ++#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE) ++ spi_register_board_info(pca100_spi_board_info, ++ ARRAY_SIZE(pca100_spi_board_info)); ++ mxc_register_device(&mxc_spi_device0, &pca100_spi_0_data); ++#endif ++ ++ platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); ++} ++ ++static void __init pca100_timer_init(void) ++{ ++ mx27_clocks_init(26000000); ++} ++ ++static struct sys_timer pca100_timer = { ++ .init = pca100_timer_init, ++}; ++ ++MACHINE_START(PCA100, "phyCARD-i.MX27") ++ .phys_io = AIPI_BASE_ADDR, ++ .io_pg_offst = ((AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc, ++ .boot_params = PHYS_OFFSET + 0x100, ++ .map_io = mx27_map_io, ++ .init_irq = mxc_init_irq, ++ .init_machine = pca100_init, ++ .timer = &pca100_timer, ++MACHINE_END ++ +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0019-mxc_nand-use-DRIVER_NAME-where-appropriate.patch b/recipes/linux/linux-2.6.31/pcm043/0019-mxc_nand-use-DRIVER_NAME-where-appropriate.patch new file mode 100644 index 0000000000..919ea3c7c8 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0019-mxc_nand-use-DRIVER_NAME-where-appropriate.patch @@ -0,0 +1,35 @@ +From b3fc73608b3fee8aa3dbccf4826fe21ffa69850b Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Wed, 21 Oct 2009 16:06:27 +0200 +Subject: [PATCH] mxc_nand: use DRIVER_NAME where appropriate + +Signed-off-by: Sascha Hauer +--- + drivers/mtd/nand/mxc_nand.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c +index dd80e88..d5445cd 100644 +--- a/drivers/mtd/nand/mxc_nand.c ++++ b/drivers/mtd/nand/mxc_nand.c +@@ -698,7 +698,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) + mtd->priv = this; + mtd->owner = THIS_MODULE; + mtd->dev.parent = &pdev->dev; +- mtd->name = "mxc_nand"; ++ mtd->name = DRIVER_NAME; + + /* 50 us command delay time */ + this->chip_delay = 5; +@@ -762,7 +762,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) + + host->irq = platform_get_irq(pdev, 0); + +- err = request_irq(host->irq, mxc_nfc_irq, 0, "mxc_nd", host); ++ err = request_irq(host->irq, mxc_nfc_irq, 0, DRIVER_NAME, host); + if (err) + goto eirq; + +-- +1.6.0.4 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0020-MX2-Add-SPI-devices-resources.patch b/recipes/linux/linux-2.6.31/pcm043/0020-MX2-Add-SPI-devices-resources.patch new file mode 100644 index 0000000000..45142f7131 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0020-MX2-Add-SPI-devices-resources.patch @@ -0,0 +1,92 @@ +From 0e60c1eae435eee1188d751f29802ce1cce61021 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Fri, 19 Dec 2008 14:32:14 +0100 +Subject: [PATCH 20/28] MX2: Add SPI devices/resources + +Signed-off-by: Sascha Hauer +--- + arch/arm/mach-mx2/devices.c | 68 +++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 68 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-mx2/devices.c b/arch/arm/mach-mx2/devices.c +index f877baa..39cd74f 100644 +--- a/arch/arm/mach-mx2/devices.c ++++ b/arch/arm/mach-mx2/devices.c +@@ -64,6 +64,74 @@ struct platform_device mxc_irda_device = { + }; + + /* ++ * SPI master controller ++ * ++ * - i.MX1: 2 channel (slighly different register setting) ++ * - i.MX21: 2 channel ++ * - i.MX27: 3 channel ++ */ ++static struct resource mxc_spi_resources0[] = { ++ { ++ .start = CSPI1_BASE_ADDR, ++ .end = CSPI1_BASE_ADDR + SZ_4K - 1, ++ .flags = IORESOURCE_MEM, ++ }, { ++ .start = MXC_INT_CSPI1, ++ .end = MXC_INT_CSPI1, ++ .flags = IORESOURCE_IRQ, ++ }, ++}; ++ ++static struct resource mxc_spi_resources1[] = { ++ { ++ .start = CSPI2_BASE_ADDR, ++ .end = CSPI2_BASE_ADDR + SZ_4K - 1, ++ .flags = IORESOURCE_MEM, ++ }, { ++ .start = MXC_INT_CSPI2, ++ .end = MXC_INT_CSPI2, ++ .flags = IORESOURCE_IRQ, ++ }, ++}; ++ ++#ifdef CONFIG_MACH_MX27 ++static struct resource mxc_spi_resources2[] = { ++ { ++ .start = CSPI3_BASE_ADDR, ++ .end = CSPI3_BASE_ADDR + SZ_4K - 1, ++ .flags = IORESOURCE_MEM, ++ }, { ++ .start = MXC_INT_CSPI3, ++ .end = MXC_INT_CSPI3, ++ .flags = IORESOURCE_IRQ, ++ }, ++}; ++#endif ++ ++struct platform_device mxc_spi_device0 = { ++ .name = "spi_imx", ++ .id = 0, ++ .num_resources = ARRAY_SIZE(mxc_spi_resources0), ++ .resource = mxc_spi_resources0, ++}; ++ ++struct platform_device mxc_spi_device1 = { ++ .name = "spi_imx", ++ .id = 1, ++ .num_resources = ARRAY_SIZE(mxc_spi_resources1), ++ .resource = mxc_spi_resources1, ++}; ++ ++#ifdef CONFIG_MACH_MX27 ++struct platform_device mxc_spi_device2 = { ++ .name = "spi_imx", ++ .id = 2, ++ .num_resources = ARRAY_SIZE(mxc_spi_resources2), ++ .resource = mxc_spi_resources2, ++}; ++#endif ++ ++/* + * General Purpose Timer + * - i.MX1: 2 timer (slighly different register handling) + * - i.MX21: 3 timer +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0021-Early-printk.patch b/recipes/linux/linux-2.6.31/pcm043/0021-Early-printk.patch new file mode 100644 index 0000000000..24f2264588 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0021-Early-printk.patch @@ -0,0 +1,106 @@ +From 286132d92272ffb0ae06ec3ecbe0cb3cfbd611c3 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 29 Jan 2009 16:39:15 +0100 +Subject: [PATCH 021/101] Early printk + +Hi, + +Below is a patch which I have in my repository for some time now. It +adds an early console using the printch function. Unlike the printk +patch this one does not require patching the kernel and you do not get +duplicated kernel output lines. I don't know if this solution starts to +work at a later point than the printk patch, but it has proven useful in +several situations now. What do you think? + +Sascha + +commit 57242f4143c9ce48e3c49ddf3b206f780184991c +Author: Sascha Hauer +Date: Thu Jan 29 16:32:30 2009 +0100 + + [ARM] Add an early debug console + + Signed-off-by: Sascha Hauer + +rebased to 2.6.31.6 +Signed-off-by: Jan Weitzel +--- + arch/arm/Kconfig.debug | 8 ++++++++ + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/early_printk.c | 38 ++++++++++++++++++++++++++++++++++++++ + 3 files changed, 47 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/kernel/early_printk.c + +Index: linux-2.6.31.6/arch/arm/Kconfig.debug +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/Kconfig.debug 2009-12-07 15:58:21.683889680 +0100 ++++ linux-2.6.31.6/arch/arm/Kconfig.debug 2009-12-07 16:00:33.757198435 +0100 +@@ -70,6 +70,14 @@ + in the kernel. This is helpful if you are debugging code that + executes before the console is initialized. + ++config DEBUG_LL_CONSOLE ++ bool "Kernel early console" ++ depends on DEBUG_LL ++ help ++ Say Y here if you want to have an early console using the Kernel ++ low-level debugging functions. Add earlyprintk to your kernel ++ parameters to enable this console. ++ + config DEBUG_ICEDCC + bool "Kernel low-level debugging via EmbeddedICE DCC channel" + depends on DEBUG_LL +Index: linux-2.6.31.6/arch/arm/kernel/Makefile +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/kernel/Makefile 2009-12-07 15:58:21.673849262 +0100 ++++ linux-2.6.31.6/arch/arm/kernel/Makefile 2009-12-07 16:00:33.757198435 +0100 +@@ -49,5 +49,6 @@ + + head-y := head$(MMUEXT).o + obj-$(CONFIG_DEBUG_LL) += debug.o ++obj-$(CONFIG_DEBUG_LL_CONSOLE) += early_printk.o + + extra-y := $(head-y) init_task.o vmlinux.lds +Index: linux-2.6.31.6/arch/arm/kernel/early_printk.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.31.6/arch/arm/kernel/early_printk.c 2009-12-07 16:00:33.757198435 +0100 +@@ -0,0 +1,38 @@ ++/* ++ * linux/arch/arm/kernel/early_printk.c ++ * ++ * Copyright (C) 2009 Sascha Hauer ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++#include ++#include ++ ++extern void printch(int); ++ ++static void early_serial_write(struct console *con, const char *s, unsigned n) ++{ ++ while (*s && n-- > 0) { ++ if (*s == '\n') ++ printch('\r'); ++ printch(*s); ++ s++; ++ } ++} ++ ++static struct console early_serial_console = { ++ .name = "earlyser", ++ .write = early_serial_write, ++ .flags = CON_PRINTBUFFER | CON_BOOT, ++ .index = -1, ++}; ++ ++static int __init setup_early_printk(char *buf) ++{ ++ register_console(&early_serial_console); ++ return 0; ++} ++ ++early_param("earlyprintk", setup_early_printk); diff --git a/recipes/linux/linux-2.6.31/pcm043/0021-mxc-mx1-mx2-DMA-add-a-possibility-to-create-an-endle.patch b/recipes/linux/linux-2.6.31/pcm043/0021-mxc-mx1-mx2-DMA-add-a-possibility-to-create-an-endle.patch new file mode 100644 index 0000000000..026d9d59bc --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0021-mxc-mx1-mx2-DMA-add-a-possibility-to-create-an-endle.patch @@ -0,0 +1,50 @@ +From 5e93e22102052940681b45b6e3ec5d037983e256 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Wed, 18 Nov 2009 15:21:44 +0100 +Subject: [PATCH 21/28] mxc: mx1/mx2 DMA: add a possibility to create an endless DMA transfer + +This is useful for audio where we do not want to setup a new scatterlist +after playing 4GB of audio data. This would cause skips in the playback. + +Signed-off-by: Sascha Hauer +--- + arch/arm/plat-mxc/dma-mx1-mx2.c | 3 ++- + arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h | 8 ++++++++ + 2 files changed, 10 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/plat-mxc/dma-mx1-mx2.c b/arch/arm/plat-mxc/dma-mx1-mx2.c +index 7764643..9c1b3f9 100644 +--- a/arch/arm/plat-mxc/dma-mx1-mx2.c ++++ b/arch/arm/plat-mxc/dma-mx1-mx2.c +@@ -156,7 +156,8 @@ static inline int imx_dma_sg_next(int channel, struct scatterlist *sg) + } + + now = min(imxdma->resbytes, sg->length); +- imxdma->resbytes -= now; ++ if (imxdma->resbytes != IMX_DMA_LENGTH_LOOP) ++ imxdma->resbytes -= now; + + if ((imxdma->dma_mode & DMA_MODE_MASK) == DMA_MODE_READ) + __raw_writel(sg->dma_address, DMA_BASE + DMA_DAR(channel)); +diff --git a/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h b/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h +index b3876cc..07be8ad 100644 +--- a/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h ++++ b/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h +@@ -58,6 +58,14 @@ imx_dma_setup_single(int channel, dma_addr_t dma_address, + unsigned int dma_length, unsigned int dev_addr, + unsigned int dmamode); + ++ ++/* ++ * Use this flag as the dma_length argument to imx_dma_setup_sg() ++ * to create an endless running dma loop. The end of the scatterlist ++ * must be linked to the beginning for this to work. ++ */ ++#define IMX_DMA_LENGTH_LOOP ((unsigned int)-1) ++ + int + imx_dma_setup_sg(int channel, struct scatterlist *sg, + unsigned int sgcount, unsigned int dma_length, +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0022-ASoC-Allow-32-bit-registers-for-DAPM.patch b/recipes/linux/linux-2.6.31/pcm043/0022-ASoC-Allow-32-bit-registers-for-DAPM.patch new file mode 100644 index 0000000000..af342096e1 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0022-ASoC-Allow-32-bit-registers-for-DAPM.patch @@ -0,0 +1,203 @@ +From f3f4462475d2c86023f7d48c40359d925730ee1b Mon Sep 17 00:00:00 2001 +From: Daniel Ribeiro +Date: Sun, 7 Jun 2009 02:49:11 -0300 +Subject: [PATCH 22/28] ASoC: Allow 32 bit registers for DAPM + +Replace the remaining unsigned shorts with unsigned ints. +Tested with pcap2 codec (25 bits registers). + +Signed-off-by: Daniel Ribeiro +Signed-off-by: Mark Brown +--- + include/sound/soc.h | 4 ++-- + sound/soc/soc-core.c | 28 ++++++++++++++-------------- + sound/soc/soc-dapm.c | 16 ++++++++-------- + 3 files changed, 24 insertions(+), 24 deletions(-) + +diff --git a/include/sound/soc.h b/include/sound/soc.h +index cf6111d..a167b49 100644 +--- a/include/sound/soc.h ++++ b/include/sound/soc.h +@@ -216,9 +216,9 @@ void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count, + + /* codec register bit access */ + int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg, +- unsigned short mask, unsigned short value); ++ unsigned int mask, unsigned int value); + int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg, +- unsigned short mask, unsigned short value); ++ unsigned int mask, unsigned int value); + + int snd_soc_new_ac97_codec(struct snd_soc_codec *codec, + struct snd_ac97_bus_ops *ops, int num); +diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c +index 1d70829..9b88c74 100644 +--- a/sound/soc/soc-core.c ++++ b/sound/soc/soc-core.c +@@ -1264,10 +1264,10 @@ EXPORT_SYMBOL_GPL(snd_soc_free_ac97_codec); + * Returns 1 for change else 0. + */ + int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg, +- unsigned short mask, unsigned short value) ++ unsigned int mask, unsigned int value) + { + int change; +- unsigned short old, new; ++ unsigned int old, new; + + mutex_lock(&io_mutex); + old = snd_soc_read(codec, reg); +@@ -1294,10 +1294,10 @@ EXPORT_SYMBOL_GPL(snd_soc_update_bits); + * Returns 1 for change else 0. + */ + int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg, +- unsigned short mask, unsigned short value) ++ unsigned int mask, unsigned int value) + { + int change; +- unsigned short old, new; ++ unsigned int old, new; + + mutex_lock(&io_mutex); + old = snd_soc_read(codec, reg); +@@ -1586,7 +1586,7 @@ int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol, + { + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; +- unsigned short val, bitmask; ++ unsigned int val, bitmask; + + for (bitmask = 1; bitmask < e->max; bitmask <<= 1) + ; +@@ -1615,8 +1615,8 @@ int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol, + { + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; +- unsigned short val; +- unsigned short mask, bitmask; ++ unsigned int val; ++ unsigned int mask, bitmask; + + for (bitmask = 1; bitmask < e->max; bitmask <<= 1) + ; +@@ -1652,7 +1652,7 @@ int snd_soc_get_value_enum_double(struct snd_kcontrol *kcontrol, + { + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; +- unsigned short reg_val, val, mux; ++ unsigned int reg_val, val, mux; + + reg_val = snd_soc_read(codec, e->reg); + val = (reg_val >> e->shift_l) & e->mask; +@@ -1691,8 +1691,8 @@ int snd_soc_put_value_enum_double(struct snd_kcontrol *kcontrol, + { + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; +- unsigned short val; +- unsigned short mask; ++ unsigned int val; ++ unsigned int mask; + + if (ucontrol->value.enumerated.item[0] > e->max - 1) + return -EINVAL; +@@ -1852,7 +1852,7 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, + int max = mc->max; + unsigned int mask = (1 << fls(max)) - 1; + unsigned int invert = mc->invert; +- unsigned short val, val2, val_mask; ++ unsigned int val, val2, val_mask; + + val = (ucontrol->value.integer.value[0] & mask); + if (invert) +@@ -1918,7 +1918,7 @@ int snd_soc_get_volsw_2r(struct snd_kcontrol *kcontrol, + unsigned int reg2 = mc->rreg; + unsigned int shift = mc->shift; + int max = mc->max; +- unsigned int mask = (1<invert; + + ucontrol->value.integer.value[0] = +@@ -1958,7 +1958,7 @@ int snd_soc_put_volsw_2r(struct snd_kcontrol *kcontrol, + unsigned int mask = (1 << fls(max)) - 1; + unsigned int invert = mc->invert; + int err; +- unsigned short val, val2, val_mask; ++ unsigned int val, val2, val_mask; + + val_mask = mask << shift; + val = (ucontrol->value.integer.value[0] & mask); +@@ -2050,7 +2050,7 @@ int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol, + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + unsigned int reg = mc->reg; + int min = mc->min; +- unsigned short val; ++ unsigned int val; + + val = (ucontrol->value.integer.value[0]+min) & 0xff; + val |= ((ucontrol->value.integer.value[1]+min) & 0xff) << 8; +diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c +index 21c6907..7ad8afa 100644 +--- a/sound/soc/soc-dapm.c ++++ b/sound/soc/soc-dapm.c +@@ -268,7 +268,7 @@ static int dapm_connect_mixer(struct snd_soc_codec *codec, + static int dapm_update_bits(struct snd_soc_dapm_widget *widget) + { + int change, power; +- unsigned short old, new; ++ unsigned int old, new; + struct snd_soc_codec *codec = widget->codec; + + /* check for valid widgets */ +@@ -1372,7 +1372,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, + int max = mc->max; + unsigned int mask = (1 << fls(max)) - 1; + unsigned int invert = mc->invert; +- unsigned short val, val2, val_mask; ++ unsigned int val, val2, val_mask; + int ret; + + val = (ucontrol->value.integer.value[0] & mask); +@@ -1436,7 +1436,7 @@ int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol, + { + struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol); + struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; +- unsigned short val, bitmask; ++ unsigned int val, bitmask; + + for (bitmask = 1; bitmask < e->max; bitmask <<= 1) + ; +@@ -1464,8 +1464,8 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol, + { + struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol); + struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; +- unsigned short val, mux; +- unsigned short mask, bitmask; ++ unsigned int val, mux; ++ unsigned int mask, bitmask; + int ret = 0; + + for (bitmask = 1; bitmask < e->max; bitmask <<= 1) +@@ -1523,7 +1523,7 @@ int snd_soc_dapm_get_value_enum_double(struct snd_kcontrol *kcontrol, + { + struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol); + struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; +- unsigned short reg_val, val, mux; ++ unsigned int reg_val, val, mux; + + reg_val = snd_soc_read(widget->codec, e->reg); + val = (reg_val >> e->shift_l) & e->mask; +@@ -1563,8 +1563,8 @@ int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol, + { + struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol); + struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; +- unsigned short val, mux; +- unsigned short mask; ++ unsigned int val, mux; ++ unsigned int mask; + int ret = 0; + + if (ucontrol->value.enumerated.item[0] > e->max - 1) +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0023-pca100-add-sound-support.patch b/recipes/linux/linux-2.6.31/pcm043/0023-pca100-add-sound-support.patch new file mode 100644 index 0000000000..623d80ab31 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0023-pca100-add-sound-support.patch @@ -0,0 +1,99 @@ +From f58f54a10075e0ff2d952b9264ce880c1ecbf439 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Fri, 6 Nov 2009 15:29:58 +0100 +Subject: [PATCH 23/28] pca100: add sound support + +Signed-off-by: Sascha Hauer +--- + arch/arm/mach-mx2/pca100.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 52 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-mx2/pca100.c b/arch/arm/mach-mx2/pca100.c +index fe5b165..e0a464d 100644 +--- a/arch/arm/mach-mx2/pca100.c ++++ b/arch/arm/mach-mx2/pca100.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -41,6 +42,8 @@ + #include + #include + #include ++#include ++#include + + #include "devices.h" + +@@ -182,15 +185,64 @@ static struct imxmmc_platform_data sdhc_pdata = { + .exit = pca100_sdhc2_exit, + }; + ++static void pca100_ac97_warm_reset(struct snd_ac97 *ac97) ++{ ++ printk("%s\n", __func__); ++ ++ mxc_gpio_mode(GPIO_PORTC | 20 | GPIO_GPIO | GPIO_OUT); ++ gpio_set_value(GPIO_PORTC + 20, 1); ++ udelay(2); ++ gpio_set_value(GPIO_PORTC + 20, 0); ++ mxc_gpio_mode(PC20_PF_SSI1_FS); ++ msleep(2); ++} ++ ++static void pca100_ac97_cold_reset(struct snd_ac97 *ac97) ++{ ++ printk("%s\n", __func__); ++ ++ mxc_gpio_mode(GPIO_PORTC | 20 | GPIO_GPIO | GPIO_OUT); /* FS */ ++ gpio_set_value(GPIO_PORTC + 20, 0); ++ mxc_gpio_mode(GPIO_PORTC | 22 | GPIO_GPIO | GPIO_OUT); /* TX */ ++ gpio_set_value(GPIO_PORTC + 22, 0); ++ mxc_gpio_mode(GPIO_PORTC | 28 | GPIO_GPIO | GPIO_OUT); /* reset */ ++ gpio_set_value(GPIO_PORTC + 28, 0); ++ udelay(10); ++ gpio_set_value(GPIO_PORTC + 28, 1); ++ mxc_gpio_mode(PC20_PF_SSI1_FS); ++ mxc_gpio_mode(PC22_PF_SSI1_TXD); ++ msleep(2); ++} ++ ++static struct imx_ssi_platform_data pca100_ssi_pdata = { ++ .ac97_reset = pca100_ac97_cold_reset, ++ .ac97_warm_reset = pca100_ac97_warm_reset, ++ .flags = IMX_SSI_USE_AC97, ++}; ++ + static void __init pca100_init(void) + { + int ret; + ++ /* SSI unit */ ++ mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0, ++ MXC_AUDMUX_V1_PCR_SYN | /* 4wire mode */ ++ MXC_AUDMUX_V1_PCR_TFCSEL(3) | ++ MXC_AUDMUX_V1_PCR_TCLKDIR | /* clock is output */ ++ MXC_AUDMUX_V1_PCR_RXDSEL(3)); ++ mxc_audmux_v1_configure_port(4, ++ MXC_AUDMUX_V1_PCR_SYN | /* 4wire mode */ ++ MXC_AUDMUX_V1_PCR_TFCSEL(0) | ++ MXC_AUDMUX_V1_PCR_TFSDIR | ++ MXC_AUDMUX_V1_PCR_RXDSEL(0)); ++ + ret = mxc_gpio_setup_multiple_pins(pca100_pins, + ARRAY_SIZE(pca100_pins), "PCA100"); + if (ret) + printk(KERN_ERR "pca100: Failed to setup pins (%d)\n", ret); + ++ mxc_register_device(&imx_ssi_device0, &pca100_ssi_pdata); ++ + mxc_register_device(&mxc_uart_device0, &uart_pdata); + + mxc_gpio_mode(GPIO_PORTC | 29 | GPIO_GPIO | GPIO_IN); +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0024-MX31-Clock-updates.patch b/recipes/linux/linux-2.6.31/pcm043/0024-MX31-Clock-updates.patch new file mode 100644 index 0000000000..9bb85dd53b --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0024-MX31-Clock-updates.patch @@ -0,0 +1,40 @@ +From f9a58060254e1c7d6d2bedf6044577aa61885ca3 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Fri, 20 Mar 2009 19:25:01 +0100 +Subject: [PATCH 024/101] MX31 Clock updates + +- register correct ehci clocks +- update spi clock names + +Signed-off-by: Sascha Hauer + +rebased to 2.6.31.6 +Signed-off-by: Jan Weitzel +--- + arch/arm/mach-mx3/clock.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +Index: arch/arm/mach-mx3/clock.c +=================================================================== +--- arch/arm/mach-mx3/clock.c.orig 2009-12-07 15:20:31.943942228 +0100 ++++ arch/arm/mach-mx3/clock.c 2009-12-07 16:10:37.774566402 +0100 +@@ -523,7 +523,7 @@ + _REGISTER_CLOCK("spi_imx.2", NULL, cspi3_clk) + _REGISTER_CLOCK(NULL, "gpt", gpt_clk) + _REGISTER_CLOCK(NULL, "pwm", pwm_clk) +- _REGISTER_CLOCK(NULL, "wdog", wdog_clk) ++ _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk) + _REGISTER_CLOCK(NULL, "rtc", rtc_clk) + _REGISTER_CLOCK(NULL, "epit", epit1_clk) + _REGISTER_CLOCK(NULL, "epit", epit2_clk) +@@ -531,6 +531,10 @@ + _REGISTER_CLOCK("ipu-core", NULL, ipu_clk) + _REGISTER_CLOCK("mx3_sdc_fb", NULL, ipu_clk) + _REGISTER_CLOCK(NULL, "kpp", kpp_clk) ++ /* FIXME: mxc-ehci now misses the secondary clock */ ++ _REGISTER_CLOCK("mxc-ehci.0", NULL, usb_clk1) ++ _REGISTER_CLOCK("mxc-ehci.1", NULL, usb_clk1) ++ _REGISTER_CLOCK("mxc-ehci.2", NULL, usb_clk1) + _REGISTER_CLOCK("fsl-usb2-udc", "usb", usb_clk1) + _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", usb_clk2) + _REGISTER_CLOCK("mx3-camera.0", NULL, csi_clk) diff --git a/recipes/linux/linux-2.6.31/pcm043/0024-pcm038-add-sound-support.patch b/recipes/linux/linux-2.6.31/pcm043/0024-pcm038-add-sound-support.patch new file mode 100644 index 0000000000..bebcb3af40 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0024-pcm038-add-sound-support.patch @@ -0,0 +1,72 @@ +From 76c72535c2ae04d10a52c1958add9a08b97a11be Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Fri, 6 Nov 2009 09:45:42 +0100 +Subject: [PATCH 24/28] pcm038: add sound support + +Signed-off-by: Sascha Hauer +--- + arch/arm/mach-mx2/pcm038.c | 23 ++++++++++++++++++++++- + 1 files changed, 22 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/mach-mx2/pcm038.c b/arch/arm/mach-mx2/pcm038.c +index b3a8ed8..b0c38b9 100644 +--- a/arch/arm/mach-mx2/pcm038.c ++++ b/arch/arm/mach-mx2/pcm038.c +@@ -39,7 +39,9 @@ + #include + #include + #include ++#include + #include ++#include + + #include "devices.h" + +@@ -268,7 +270,7 @@ static struct mc13783_platform_data pcm038_pmic = { + .regulators = pcm038_regulators, + .num_regulators = ARRAY_SIZE(pcm038_regulators), + .flags = MC13783_USE_ADC | MC13783_USE_REGULATOR | +- MC13783_USE_TOUCHSCREEN, ++ MC13783_USE_TOUCHSCREEN | MC13783_USE_CODEC, + }; + + static struct spi_board_info pcm038_spi_board_info[] __initdata = { +@@ -283,16 +285,35 @@ static struct spi_board_info pcm038_spi_board_info[] __initdata = { + } + }; + ++struct imx_ssi_platform_data pcm038_ssi_pdata = { ++ .flags = IMX_SSI_DMA, ++}; ++ + static void __init pcm038_init(void) + { + mxc_gpio_setup_multiple_pins(pcm038_pins, ARRAY_SIZE(pcm038_pins), + "PCM038"); + ++ mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0, ++ MXC_AUDMUX_V1_PCR_TFSDIR | ++ MXC_AUDMUX_V1_PCR_TCLKDIR | ++ MXC_AUDMUX_V1_PCR_TFCSEL(MX27_AUDMUX_PPCR1_SSI_PINS_1) | ++ MXC_AUDMUX_V1_PCR_RFSDIR | ++ MXC_AUDMUX_V1_PCR_RCLKDIR | ++ MXC_AUDMUX_V1_PCR_RFCSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4) | ++ MXC_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4)); ++ mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR3_SSI_PINS_4, ++ MXC_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR1_SSI0)); ++ mxc_audmux_v1_configure_port(MX27_AUDMUX_PPCR1_SSI_PINS_1, ++ MXC_AUDMUX_V1_PCR_TFCSEL(MX27_AUDMUX_HPCR1_SSI0) | ++ MXC_AUDMUX_V1_PCR_RFCSEL(MX27_AUDMUX_HPCR1_SSI0)); ++ + pcm038_init_sram(); + + mxc_register_device(&mxc_uart_device0, &uart_pdata[0]); + mxc_register_device(&mxc_uart_device1, &uart_pdata[1]); + mxc_register_device(&mxc_uart_device2, &uart_pdata[2]); ++ mxc_register_device(&imx_ssi_device0, &pcm038_ssi_pdata); + + mxc_gpio_mode(PE16_AF_OWIRE); + mxc_register_device(&mxc_nand_device, &pcm038_nand_board_info); +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0025-pcm037-Add-sound-support.patch b/recipes/linux/linux-2.6.31/pcm043/0025-pcm037-Add-sound-support.patch new file mode 100644 index 0000000000..cba390ce85 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0025-pcm037-Add-sound-support.patch @@ -0,0 +1,144 @@ +From 8b4873639bb66d8269f0767ddfbb4c8a7f8082f7 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 12 Nov 2009 14:02:13 +0100 +Subject: [PATCH 25/28] pcm037: Add sound support + +Signed-off-by: Sascha Hauer +--- + arch/arm/mach-mx3/pcm037.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 71 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-mx3/pcm037.c b/arch/arm/mach-mx3/pcm037.c +index 840cfda..8ef6c79 100644 +--- a/arch/arm/mach-mx3/pcm037.c ++++ b/arch/arm/mach-mx3/pcm037.c +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #include + +@@ -50,6 +51,9 @@ + #include + #include + #include ++#include ++#include ++#include + + #include "devices.h" + #include "pcm037.h" +@@ -123,6 +127,8 @@ static unsigned int pcm037_pins[] = { + MX31_PIN_CSPI3_SPI_RDY__CTS3, + /* LAN9217 irq pin */ + IOMUX_MODE(MX31_PIN_GPIO3_1, IOMUX_CONFIG_GPIO), ++ /* MC13783 IRQ pim */ ++ IOMUX_MODE(MX31_PIN_GPIO3_0, IOMUX_CONFIG_GPIO), + /* Onewire */ + MX31_PIN_BATT_LINE__OWIRE, + /* Framebuffer */ +@@ -169,6 +175,15 @@ static unsigned int pcm037_pins[] = { + MX31_PIN_CSI_MCLK__CSI_MCLK, + MX31_PIN_CSI_PIXCLK__CSI_PIXCLK, + MX31_PIN_CSI_VSYNC__CSI_VSYNC, ++ /* SSI */ ++ MX31_PIN_STXD4__STXD4, ++ MX31_PIN_SRXD4__SRXD4, ++ MX31_PIN_SCK4__SCK4, ++ MX31_PIN_SFS4__SFS4, ++ MX31_PIN_STXD5__STXD5, ++ MX31_PIN_SRXD5__SRXD5, ++ MX31_PIN_SCK5__SCK5, ++ MX31_PIN_SFS5__SFS5, + }; + + static struct physmap_flash_data pcm037_flash_data = { +@@ -406,6 +421,31 @@ static void pcm970_sdhc1_exit(struct device *dev, void *data) + gpio_free(SDHC1_GPIO_WP); + } + ++#ifdef CONFIG_SPI ++static struct mc13783_platform_data pcm037_pmic = { ++ .flags = MC13783_USE_ADC | MC13783_USE_TOUCHSCREEN | ++ MC13783_USE_CODEC, ++}; ++ ++static unsigned int pcm037_spi_cs[] = {MXC_SPI_CS(0), }; ++ ++static struct spi_imx_master pcm037_spi_0_data = { ++ .chipselect = pcm037_spi_cs, ++ .num_chipselect = ARRAY_SIZE(pcm037_spi_cs), ++}; ++ ++static struct spi_board_info pcm037_spi_board_info[] __initdata = { ++ { ++ .modalias = "mc13783", ++ .irq = IOMUX_TO_IRQ(MX31_PIN_GPIO3_0), ++ .max_speed_hz = 3000000, ++ .bus_num = 0, ++ .platform_data = &pcm037_pmic, ++ .chip_select = 0, ++ } ++}; ++#endif /* CONFIG_SPI */ ++ + static struct imxmmc_platform_data sdhc_pdata = { + #ifdef PCM970_SDHC_RW_SWITCH + .get_ro = pcm970_sdhc1_get_ro, +@@ -515,6 +555,9 @@ static struct mx3fb_platform_data mx3fb_pdata = { + .num_modes = ARRAY_SIZE(fb_modedb), + }; + ++struct imx_ssi_platform_data pcm037_ssi_pdata = { ++}; ++ + /* + * Board specific initialization. + */ +@@ -522,6 +565,26 @@ static void __init mxc_board_init(void) + { + int ret; + ++ mxc_audmux_v2_configure_port(MX31_AUDMUX_PORT1_SSI0, ++ MXC_AUDMUX_V2_PTCR_TFSDIR | ++ MXC_AUDMUX_V2_PTCR_TCLKDIR | ++ MXC_AUDMUX_V2_PTCR_TFSEL(MX31_AUDMUX_PORT4_SSI_PINS_4) | ++ MXC_AUDMUX_V2_PTCR_TCSEL(MX31_AUDMUX_PORT4_SSI_PINS_4) | ++ MXC_AUDMUX_V2_PTCR_RFSDIR | ++ MXC_AUDMUX_V2_PTCR_RCLKDIR | ++ MXC_AUDMUX_V2_PTCR_RFSEL(MX31_AUDMUX_PORT5_SSI_PINS_5) | ++ MXC_AUDMUX_V2_PTCR_RCSEL(MX31_AUDMUX_PORT5_SSI_PINS_5), ++ MXC_AUDMUX_V2_PDCR_RXDSEL(MX31_AUDMUX_PORT5_SSI_PINS_5)); ++ mxc_audmux_v2_configure_port(MX31_AUDMUX_PORT5_SSI_PINS_5, ++ 0, ++ MXC_AUDMUX_V2_PDCR_RXDSEL(MX31_AUDMUX_PORT1_SSI0)); ++ mxc_audmux_v2_configure_port(MX31_AUDMUX_PORT4_SSI_PINS_4, ++ MXC_AUDMUX_V2_PTCR_TFSEL(MX31_AUDMUX_PORT1_SSI0) | ++ MXC_AUDMUX_V2_PTCR_TCSEL(MX31_AUDMUX_PORT1_SSI0) | ++ MXC_AUDMUX_V2_PTCR_RFSEL(MX31_AUDMUX_PORT1_SSI0) | ++ MXC_AUDMUX_V2_PTCR_RCSEL(MX31_AUDMUX_PORT1_SSI0), ++ 0); ++ + mxc_iomux_setup_multiple_pins(pcm037_pins, ARRAY_SIZE(pcm037_pins), + "pcm037"); + +@@ -575,6 +638,14 @@ static void __init mxc_board_init(void) + + if (!pcm037_camera_alloc_dma(4 * 1024 * 1024)) + mxc_register_device(&mx3_camera, &camera_pdata); ++ ++#ifdef CONFIG_SPI ++ mxc_register_device(&imx_spi_device0, &pcm037_spi_0_data); ++ ++ spi_register_board_info(pcm037_spi_board_info, ++ ARRAY_SIZE(pcm037_spi_board_info)); ++#endif ++ mxc_register_device(&imx_ssi_device0, &pcm037_ssi_pdata); + } + + static void __init pcm037_timer_init(void) +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0026-imx-ssi-Fix-AC97-rates.patch b/recipes/linux/linux-2.6.31/pcm043/0026-imx-ssi-Fix-AC97-rates.patch new file mode 100644 index 0000000000..53b1a60131 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0026-imx-ssi-Fix-AC97-rates.patch @@ -0,0 +1,37 @@ +From da230ac4c6dce39cc85b95a08bceec2976288419 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Fri, 27 Nov 2009 16:28:59 +0100 +Subject: [PATCH 26/28] imx-ssi: Fix AC97 rates + +Signed-off-by: Sascha Hauer +--- + sound/soc/imx/imx-ssi.c | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c +index 9823425..6219df9 100644 +--- a/sound/soc/imx/imx-ssi.c ++++ b/sound/soc/imx/imx-ssi.c +@@ -453,6 +453,10 @@ struct snd_soc_platform imx_soc_platform = { + }; + EXPORT_SYMBOL_GPL(imx_soc_platform); + ++#define IMX_AC97_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\ ++ SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | \ ++ SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000) ++ + static struct snd_soc_dai imx_ac97_dai = { + .name = "AC97", + .ac97_control = 1, +@@ -460,7 +464,7 @@ static struct snd_soc_dai imx_ac97_dai = { + .stream_name = "AC97 Playback", + .channels_min = 2, + .channels_max = 2, +- .rates = SND_SOC_STD_AC97_FMTS, ++ .rates = IMX_AC97_RATES, + .formats = SNDRV_PCM_FMTBIT_S16_LE, + }, + .capture = { +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0027-Add-EHCI-support-for-MX27-and-MX31-based-boards.patch b/recipes/linux/linux-2.6.31/pcm043/0027-Add-EHCI-support-for-MX27-and-MX31-based-boards.patch new file mode 100644 index 0000000000..1c60690b89 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0027-Add-EHCI-support-for-MX27-and-MX31-based-boards.patch @@ -0,0 +1,347 @@ +From ce297d614ab56284823043e1743200388d9f466f Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Mon, 9 Mar 2009 12:29:23 +0100 +Subject: [PATCH 027/101] Add EHCI support for MX27 and MX31 based boards + +The Freescale MX27 and MX31 SoCs have a EHCI controller onboard. +The controller is capable of USB on the go. This patch adds +support for the host controller only. + +The USB OTG core used here is the ARC core, so the driver should +be renamed. + +Signed-off-by: Sascha Hauer + +rebased to 2.6.31.6 +Signed-off-by: Jan Weitzel +--- + arch/arm/plat-mxc/include/mach/mxc_ehci.h | 9 + + drivers/usb/Kconfig | 1 + + drivers/usb/host/Kconfig | 7 + + drivers/usb/host/ehci-hcd.c | 5 + + drivers/usb/host/ehci-mxc.c | 256 +++++++++++++++++++++++++++++ + 5 files changed, 278 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/plat-mxc/include/mach/mxc_ehci.h + create mode 100644 drivers/usb/host/ehci-mxc.c + +Index: linux-2.6.31.6/arch/arm/plat-mxc/include/mach/mxc_ehci.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.31.6/arch/arm/plat-mxc/include/mach/mxc_ehci.h 2009-12-10 11:40:43.315272374 +0100 +@@ -0,0 +1,9 @@ ++#ifndef __INCLUDE_ASM_ARCH_MXC_EHCI_H ++#define __INCLUDE_ASM_ARCH_MXC_EHCI_H ++ ++struct mxc_usbh_platform_data { ++ int (*init)(struct platform_device *pdev); ++ int (*exit)(struct platform_device *pdev); ++}; ++#endif /* __INCLUDE_ASM_ARCH_MXC_EHCI_H */ ++ +Index: linux-2.6.31.6/drivers/usb/Kconfig +=================================================================== +--- linux-2.6.31.6.orig/drivers/usb/Kconfig 2009-11-10 01:32:31.000000000 +0100 ++++ linux-2.6.31.6/drivers/usb/Kconfig 2009-12-10 11:40:43.315272374 +0100 +@@ -58,6 +58,7 @@ + default y if PPC_83xx + default y if SOC_AU1200 + default y if ARCH_IXP4XX ++ default y if ARCH_MXC + default PCI + + # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface. +Index: linux-2.6.31.6/drivers/usb/host/Kconfig +=================================================================== +--- linux-2.6.31.6.orig/drivers/usb/host/Kconfig 2009-11-10 01:32:31.000000000 +0100 ++++ linux-2.6.31.6/drivers/usb/host/Kconfig 2009-12-10 11:40:43.315272374 +0100 +@@ -105,6 +105,13 @@ + ---help--- + Variation of ARC USB block used in some Freescale chips. + ++config USB_EHCI_MXC ++ bool "Support for Freescale on-chip EHCI USB controller" ++ depends on USB_EHCI_HCD && ARCH_MXC ++ select USB_EHCI_ROOT_HUB_TT ++ ---help--- ++ Variation of ARC USB block used in some Freescale chips. ++ + config USB_EHCI_HCD_PPC_OF + bool "EHCI support for PPC USB controller on OF platform bus" + depends on USB_EHCI_HCD && PPC_OF +Index: linux-2.6.31.6/drivers/usb/host/ehci-hcd.c +=================================================================== +--- linux-2.6.31.6.orig/drivers/usb/host/ehci-hcd.c 2009-11-10 01:32:31.000000000 +0100 ++++ linux-2.6.31.6/drivers/usb/host/ehci-hcd.c 2009-12-10 11:40:43.315272374 +0100 +@@ -1092,6 +1092,11 @@ + #define PLATFORM_DRIVER ehci_fsl_driver + #endif + ++#ifdef CONFIG_USB_EHCI_MXC ++#include "ehci-mxc.c" ++#define PLATFORM_DRIVER ehci_mxc_driver ++#endif ++ + #ifdef CONFIG_SOC_AU1200 + #include "ehci-au1xxx.c" + #define PLATFORM_DRIVER ehci_hcd_au1xxx_driver +Index: linux-2.6.31.6/drivers/usb/host/ehci-mxc.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.31.6/drivers/usb/host/ehci-mxc.c 2009-12-10 11:40:43.315272374 +0100 +@@ -0,0 +1,256 @@ ++/* ++ * Copyright (c) 2008 Sascha Hauer , Pengutronix ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ++ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software Foundation, ++ * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ */ ++ ++#include ++#include ++#include ++ ++struct ehci_mxc_priv { ++ struct clk *usbclk, *ahbclk; ++ struct usb_hcd *hcd; ++}; ++ ++/* called during probe() after chip reset completes */ ++static int ehci_mxc_setup(struct usb_hcd *hcd) ++{ ++ struct ehci_hcd *ehci = hcd_to_ehci(hcd); ++ int retval; ++ ++ /* EHCI registers start at offset 0x100 */ ++ ehci->caps = hcd->regs + 0x100; ++ ehci->regs = hcd->regs + 0x100 + ++ HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase)); ++ dbg_hcs_params(ehci, "reset"); ++ dbg_hcc_params(ehci, "reset"); ++ ++ /* cache this readonly data; minimize chip reads */ ++ ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); ++ ++ retval = ehci_halt(ehci); ++ if (retval) ++ return retval; ++ ++ /* data structure init */ ++ retval = ehci_init(hcd); ++ if (retval) ++ return retval; ++ ++ hcd->has_tt = 1; ++ ++ ehci->sbrn = 0x20; ++ ++ ehci_reset(ehci); ++ ++ ehci_port_power(ehci, 0); ++ return 0; ++} ++ ++static const struct hc_driver ehci_mxc_hc_driver = { ++ .description = hcd_name, ++ .product_desc = "Freescale On-Chip EHCI Host Controller", ++ .hcd_priv_size = sizeof(struct ehci_hcd), ++ ++ /* ++ * generic hardware linkage ++ */ ++ .irq = ehci_irq, ++ .flags = HCD_USB2 | HCD_MEMORY, ++ ++ /* ++ * basic lifecycle operations ++ */ ++ .reset = ehci_mxc_setup, ++ .start = ehci_run, ++ .stop = ehci_stop, ++ .shutdown = ehci_shutdown, ++ ++ /* ++ * managing i/o requests and associated device resources ++ */ ++ .urb_enqueue = ehci_urb_enqueue, ++ .urb_dequeue = ehci_urb_dequeue, ++ .endpoint_disable = ehci_endpoint_disable, ++ ++ /* ++ * scheduling support ++ */ ++ .get_frame_number = ehci_get_frame, ++ ++ /* ++ * root hub support ++ */ ++ .hub_status_data = ehci_hub_status_data, ++ .hub_control = ehci_hub_control, ++ .bus_suspend = ehci_bus_suspend, ++ .bus_resume = ehci_bus_resume, ++ .relinquish_port = ehci_relinquish_port, ++ .port_handed_over = ehci_port_handed_over, ++}; ++ ++static int ehci_mxc_drv_probe(struct platform_device *pdev) ++{ ++ struct mxc_usbh_platform_data *pdata; ++ struct usb_hcd *hcd; ++ struct resource *res; ++ int irq, ret, temp; ++ struct ehci_mxc_priv *priv; ++ ++ dev_info(&pdev->dev, "initializing i.MX USB Controller\n"); ++ ++ pdata = (struct mxc_usbh_platform_data *)pdev->dev.platform_data; ++ ++ irq = platform_get_irq(pdev, 0); ++ ++ hcd = usb_create_hcd(&ehci_mxc_hc_driver, &pdev->dev, dev_name(&pdev->dev)); ++ if (!hcd) ++ return -ENOMEM; ++ ++ priv = kzalloc(sizeof (*priv), GFP_KERNEL); ++ if (!priv) { ++ ret = -ENOMEM; ++ goto err_alloc; ++ } ++ ++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ if (!res) { ++ dev_err(&pdev->dev, ++ "Found HC with no register addr. Check setup!\n"); ++ ret = -ENODEV; ++ goto err_get_resource; ++ } ++ ++ hcd->rsrc_start = res->start; ++ hcd->rsrc_len = resource_size(res); ++ ++ if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { ++ dev_dbg(&pdev->dev, "controller already in use\n"); ++ ret = -EBUSY; ++ goto err_request_mem; ++ } ++ ++ hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len); ++ if (!hcd->regs) { ++ dev_err(&pdev->dev, "error mapping memory\n"); ++ ret = -EFAULT; ++ goto err_ioremap; ++ } ++ ++ priv->usbclk = clk_get(&pdev->dev, "usb"); ++ if (IS_ERR(priv->usbclk)) { ++ ret = PTR_ERR(priv->usbclk); ++ goto err_clk; ++ } ++ clk_enable(priv->usbclk); ++ ++ if (!cpu_is_mx35()) { ++ priv->ahbclk = clk_get(&pdev->dev, "usb_ahb"); ++ if (IS_ERR(priv->ahbclk)) { ++ ret = PTR_ERR(priv->ahbclk); ++ goto err_clk_ahb; ++ } ++ clk_enable(priv->ahbclk); ++ } ++ ++ if (pdata && pdata->init) { ++ ret = pdata->init(pdev); ++ if (ret) { ++ dev_err(&pdev->dev, "platform init failed\n"); ++ goto err_init; ++ } ++ } ++ ++ /* Set to Host mode */ ++ temp = readl(hcd->regs + 0x1a8); ++ writel(temp | 0x3, hcd->regs + 0x1a8); ++ ++ priv->hcd = hcd; ++ platform_set_drvdata(pdev, priv); ++ ++ ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); ++ if (ret) ++ goto err_add; ++ ++ return 0; ++ ++err_add: ++ if (pdata && pdata->exit) ++ pdata->exit(pdev); ++err_init: ++ if (priv->ahbclk) { ++ clk_disable(priv->ahbclk); ++ clk_put(priv->ahbclk); ++ } ++err_clk_ahb: ++ clk_disable(priv->usbclk); ++ clk_put(priv->usbclk); ++err_clk: ++ iounmap(hcd->regs); ++err_ioremap: ++ release_mem_region(hcd->rsrc_start, hcd->rsrc_len); ++err_request_mem: ++err_get_resource: ++ kfree(priv); ++err_alloc: ++ usb_put_hcd(hcd); ++ return ret; ++} ++ ++static int __exit ehci_mxc_drv_remove(struct platform_device *pdev) ++{ ++ struct ehci_mxc_priv *priv = platform_get_drvdata(pdev); ++ struct usb_hcd *hcd = priv->hcd; ++ ++ usb_remove_hcd(hcd); ++ iounmap(hcd->regs); ++ release_mem_region(hcd->rsrc_start, hcd->rsrc_len); ++ usb_put_hcd(hcd); ++ platform_set_drvdata(pdev, NULL); ++ ++ clk_disable(priv->usbclk); ++ clk_put(priv->usbclk); ++ if (priv->ahbclk) { ++ clk_disable(priv->ahbclk); ++ clk_put(priv->ahbclk); ++ } ++ ++ kfree(priv); ++ ++ return 0; ++} ++ ++static void ++ehci_mxc_shutdown(struct platform_device *pdev) ++{ ++ struct ehci_mxc_priv *priv = platform_get_drvdata(pdev); ++ struct usb_hcd *hcd = priv->hcd; ++ ++ if (hcd->driver->shutdown) ++ hcd->driver->shutdown(hcd); ++} ++ ++MODULE_ALIAS("platform:mxc-ehci"); ++ ++static struct platform_driver ehci_mxc_driver = { ++ .probe = ehci_mxc_drv_probe, ++ .remove = __exit_p(ehci_mxc_drv_remove), ++ .shutdown = ehci_mxc_shutdown, ++ .driver = { ++ .name = "mxc-ehci", ++ }, ++}; diff --git a/recipes/linux/linux-2.6.31/pcm043/0027-imx-ssi-flush-fifos.patch b/recipes/linux/linux-2.6.31/pcm043/0027-imx-ssi-flush-fifos.patch new file mode 100644 index 0000000000..56fcd9e6f1 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0027-imx-ssi-flush-fifos.patch @@ -0,0 +1,29 @@ +From 447b943dc48d3775e59be1800a3198f65265536d Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Wed, 2 Dec 2009 11:59:05 +0100 +Subject: [PATCH 27/28] imx-ssi: flush fifos + +Signed-off-by: Sascha Hauer +--- + sound/soc/imx/imx-ssi.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c +index 6219df9..d25ee2b 100644 +--- a/sound/soc/imx/imx-ssi.c ++++ b/sound/soc/imx/imx-ssi.c +@@ -333,6 +333,11 @@ static int imx_ssi_trigger(struct snd_pcm_substream *substream, int cmd, + /* rx/tx are always enabled to access ac97 registers */ + writel(scr, ssi->base + SSI_SCR); + ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ writel(SSI_SOR_TX_CLR, ssi->base + SSI_SOR); ++ else ++ writel(SSI_SOR_RX_CLR, ssi->base + SSI_SOR); ++ + writel(sier, ssi->base + SSI_SIER); + + return 0; +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0028-imx-ssi-Fix-occasional-AC97-reset-failure.patch b/recipes/linux/linux-2.6.31/pcm043/0028-imx-ssi-Fix-occasional-AC97-reset-failure.patch new file mode 100644 index 0000000000..fcb26ac189 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0028-imx-ssi-Fix-occasional-AC97-reset-failure.patch @@ -0,0 +1,37 @@ +From fb79a42a2badc12714a50ad5cc360927a138e8a6 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Thu, 17 Dec 2009 11:19:38 +0100 +Subject: [PATCH 28/28] imx-ssi: Fix occasional AC97 reset failure + +Signed-off-by: Sascha Hauer +--- + sound/soc/imx/imx-ssi.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c +index d25ee2b..94ef361 100644 +--- a/sound/soc/imx/imx-ssi.c ++++ b/sound/soc/imx/imx-ssi.c +@@ -565,6 +565,9 @@ static void imx_ssi_ac97_reset(struct snd_ac97 *ac97) + + if (imx_ssi->ac97_reset) + imx_ssi->ac97_reset(ac97); ++ ++ /* First read sometimes fails, do a dummy read */ ++ imx_ssi_ac97_read(ac97, 0); + } + + static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97) +@@ -573,6 +576,9 @@ static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97) + + if (imx_ssi->ac97_warm_reset) + imx_ssi->ac97_warm_reset(ac97); ++ ++ /* First read sometimes fails, do a dummy read */ ++ imx_ssi_ac97_read(ac97, 0); + } + + struct snd_ac97_bus_ops soc_ac97_ops = { +-- +1.6.5.2 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0029-MX31-Add-USB-platform-devices-and-resources.patch b/recipes/linux/linux-2.6.31/pcm043/0029-MX31-Add-USB-platform-devices-and-resources.patch new file mode 100644 index 0000000000..63eef36c25 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0029-MX31-Add-USB-platform-devices-and-resources.patch @@ -0,0 +1,100 @@ +From f9a5d99348fb2c9cacdbbc0334f372ec6e5962de Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Fri, 19 Dec 2008 14:32:11 +0100 +Subject: [PATCH 029/101] MX31: Add USB platform devices and resources + +Signed-off-by: Sascha Hauer + +rebased to 2.6.31.6 +Signed-off-by: Jan Weitzel +--- + arch/arm/mach-mx3/devices.c | 75 +++++++++++++++++++++++++++++++++++++++++++ + arch/arm/mach-mx3/devices.h | 3 ++ + 2 files changed, 78 insertions(+), 0 deletions(-) + +Index: linux-2.6.31.6/arch/arm/mach-mx3/devices.c +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/mach-mx3/devices.c 2009-12-08 11:08:01.138690103 +0100 ++++ linux-2.6.31.6/arch/arm/mach-mx3/devices.c 2009-12-08 11:17:36.012748409 +0100 +@@ -395,6 +395,67 @@ + .num_resources = ARRAY_SIZE(otg_resources), + }; + ++struct platform_device mxc_otg = { ++ .name = "mxc-ehci", ++ .id = 0, ++ .dev = { ++ .coherent_dma_mask = 0xffffffff, ++ .dma_mask = &otg_dmamask, ++ }, ++ .resource = otg_resources, ++ .num_resources = ARRAY_SIZE(otg_resources), ++}; ++ ++static u64 usbh1_dmamask = ~(u32)0; ++ ++static struct resource mxc_usbh1_resources[] = { ++ { ++ .start = OTG_BASE_ADDR + 0x200, ++ .end = OTG_BASE_ADDR + 0x3ff, ++ .flags = IORESOURCE_MEM, ++ }, { ++ .start = MXC_INT_USB1, ++ .end = MXC_INT_USB1, ++ .flags = IORESOURCE_IRQ, ++ }, ++}; ++ ++struct platform_device mxc_usbh1 = { ++ .name = "mxc-ehci", ++ .id = 1, ++ .dev = { ++ .coherent_dma_mask = 0xffffffff, ++ .dma_mask = &usbh1_dmamask, ++ }, ++ .resource = mxc_usbh1_resources, ++ .num_resources = ARRAY_SIZE(mxc_usbh1_resources), ++}; ++ ++static u64 usbh2_dmamask = ~(u32)0; ++ ++static struct resource mxc_usbh2_resources[] = { ++ { ++ .start = OTG_BASE_ADDR + 0x400, ++ .end = OTG_BASE_ADDR + 0x5ff, ++ .flags = IORESOURCE_MEM, ++ }, { ++ .start = MXC_INT_USB2, ++ .end = MXC_INT_USB2, ++ .flags = IORESOURCE_IRQ, ++ }, ++}; ++ ++struct platform_device mxc_usbh2 = { ++ .name = "mxc-ehci", ++ .id = 2, ++ .dev = { ++ .coherent_dma_mask = 0xffffffff, ++ .dma_mask = &usbh2_dmamask, ++ }, ++ .resource = mxc_usbh2_resources, ++ .num_resources = ARRAY_SIZE(mxc_usbh2_resources), ++}; ++ + #ifdef CONFIG_ARCH_MX35 + static struct resource mxc_fec_resources[] = { + { +Index: linux-2.6.31.6/arch/arm/mach-mx3/devices.h +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/mach-mx3/devices.h 2009-12-08 11:08:01.138690103 +0100 ++++ linux-2.6.31.6/arch/arm/mach-mx3/devices.h 2009-12-08 11:16:59.408625374 +0100 +@@ -16,6 +16,9 @@ + extern struct platform_device mxcsdhc_device0; + extern struct platform_device mxcsdhc_device1; + extern struct platform_device mxc_otg_udc_device; ++extern struct platform_device mxc_otg; ++extern struct platform_device mxc_usbh1; ++extern struct platform_device mxc_usbh2; + extern struct platform_device mxc_rnga_device; + extern struct platform_device imx_ssi_device0; + extern struct platform_device imx_ssi_device1; diff --git a/recipes/linux/linux-2.6.31/pcm043/0053-Watchdog-driver-for-IMX-MXC.patch b/recipes/linux/linux-2.6.31/pcm043/0053-Watchdog-driver-for-IMX-MXC.patch new file mode 100644 index 0000000000..2f19c1c6b7 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0053-Watchdog-driver-for-IMX-MXC.patch @@ -0,0 +1,490 @@ +From 384c73ff72ecf48d438ef54cb297b035c4060347 Mon Sep 17 00:00:00 2001 +From: Darius Augulis +Date: Mon, 9 Mar 2009 17:10:25 +0200 +Subject: [PATCH 053/101] Watchdog driver for IMX/MXC + +Driver for watchdog timer on Freesale IMX processors. + +Signed-off-by: Darius Augulis + +rebased to 2.6.31.6 +Signed-off-by: Jan Weitzel +--- + drivers/watchdog/Kconfig | 12 ++ + drivers/watchdog/Makefile | 1 + + drivers/watchdog/imx-wdt.c | 432 ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 445 insertions(+), 0 deletions(-) + create mode 100644 drivers/watchdog/imx-wdt.c + +Index: linux-2.6.31.6/drivers/watchdog/Kconfig +=================================================================== +--- linux-2.6.31.6.orig/drivers/watchdog/Kconfig 2009-11-10 01:32:31.000000000 +0100 ++++ linux-2.6.31.6/drivers/watchdog/Kconfig 2009-12-08 08:59:05.611195459 +0100 +@@ -66,6 +66,18 @@ + + # ARM Architecture + ++config IMX_WDT ++ tristate "IMX Watchdog" ++ depends on ARCH_MXC ++ help ++ This is the driver for the hardware watchdog ++ on the Freescale IMX processors. ++ If you have one of these processors and wish to have ++ watchdog support enabled, say Y, otherwise say N. ++ ++ To compile this driver as a module, choose M here: the ++ module will be called imx_wdt. ++ + config AT91RM9200_WATCHDOG + tristate "AT91RM9200 watchdog" + depends on ARCH_AT91RM9200 +Index: linux-2.6.31.6/drivers/watchdog/Makefile +=================================================================== +--- linux-2.6.31.6.orig/drivers/watchdog/Makefile 2009-11-10 01:32:31.000000000 +0100 ++++ linux-2.6.31.6/drivers/watchdog/Makefile 2009-12-08 09:00:06.603252242 +0100 +@@ -44,6 +44,7 @@ + obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o + obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o + obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o ++obj-$(CONFIG_IMX_WDT) += imx-wdt.o + + # AVR32 Architecture + obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o +Index: linux-2.6.31.6/drivers/watchdog/imx-wdt.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.31.6/drivers/watchdog/imx-wdt.c 2009-12-08 08:59:05.611195459 +0100 +@@ -0,0 +1,432 @@ ++/* ++ * Watchdog driver for IMX processors ++ * ++ * Copyright (C) 2008 Darius Augulis ++ * ++ * 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. ++ * ++ */ ++ ++/* ++ * NOTE: MX1 arch has a bit different Watchdog than MX2 and MX3. ++ * It's not possible to turn off watchdog on MX2 or MX3 since it's enabled. ++ * Timeout changing with IOCTL command is possible only on MX1. ++ * WD timer halting during suspend is implemented in all archs but in ++ * different way. ++ * MX2 and MX3 has 16 bit watchdog registers compared to 32 bit on MX1. ++ * ++ */ ++ ++/*#define DEBUG*/ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#ifdef CONFIG_ARCH_MX1 ++# define WDT_MAX_TIME 63 /* seconds */ ++ ++# define IMX_WDT_WCR 0x00 /* Control reg */ ++# define IMX_WDT_WSR 0x04 /* Service reg */ ++# define IMX_WDT_WSTR 0x08 /* Status reg */ ++ ++# define WCR_WT (0x7F<<8) ++# define WCR_WDEC (1<<1) ++# define WCR_WDE (1<<0) ++# define WCR_WHALT (1<<15) ++#else ++# define WDT_MAX_TIME 127 /* seconds */ ++ ++# define IMX_WDT_WCR 0x00 /* Control reg */ ++# define IMX_WDT_WSR 0x02 /* Service reg */ ++# define IMX_WDT_WSTR 0x04 /* Status reg */ ++ ++# define WCR_WT (0xFF<<8) ++# define WCR_WDE (1<<2) ++# define WCR_WDZST (1<<0) ++#endif ++ ++#define WDT_DEFAULT_TIME 10 /* seconds */ ++#define WDT_SEQ1 0x5555 ++#define WDT_SEQ2 0xAAAA ++ ++static struct platform_device *imx_wdt_dev; ++ ++struct imx_wdt_struct { ++ struct resource *res; ++ struct device *dev; ++ struct clk *clk; ++ void __iomem *base; ++ int wdt_time; ++ int nowayout; ++ unsigned long status; ++}; ++ ++static unsigned int timeout = WDT_DEFAULT_TIME; ++ ++static struct watchdog_info imx_wdt_info = { ++ .identity = "imx watchdog", ++ .options = WDIOF_KEEPALIVEPING ++#ifdef CONFIG_ARCH_MX1 ++ | WDIOF_SETTIMEOUT ++#endif ++}; ++ ++/* Disable the watchdog. */ ++static inline void imx_wdt_stop(struct imx_wdt_struct *imx_wdt) ++{ ++ dev_dbg(imx_wdt->dev, "<%s>\n", __func__); ++ ++#ifdef CONFIG_ARCH_MX1 ++ __raw_writew(0, imx_wdt->base + IMX_WDT_WCR); ++#else ++ dev_info(imx_wdt->dev, "watchdog is unstoppable on i.MX2/3 !\n"); ++#endif ++} ++ ++/* Enable and reset the watchdog. */ ++static inline void imx_wdt_start(struct imx_wdt_struct *imx_wdt) ++{ ++ u16 temp; ++ ++ dev_dbg(imx_wdt->dev, "<%s>\n", __func__); ++ ++ temp = __raw_readw(imx_wdt->base + IMX_WDT_WCR); ++ temp |= imx_wdt->wdt_time << 8; ++ __raw_writew(temp, imx_wdt->base + IMX_WDT_WCR); ++ ++#ifdef CONFIG_ARCH_MX1 ++# ifndef CONFIG_WATCHDOG_NOWAYOUT ++ temp |= WCR_WDEC; ++ __raw_writew(temp, imx_wdt->base + IMX_WDT_WCR); ++# endif ++ temp |= WCR_WDE; ++ __raw_writew(temp, imx_wdt->base + IMX_WDT_WCR); ++#else ++ temp |= WCR_WDE | WCR_WDZST; ++ __raw_writew(temp, imx_wdt->base + IMX_WDT_WCR); ++#endif ++ ++#ifdef CONFIG_ARCH_MX1 ++ __raw_writew(WDT_SEQ1, imx_wdt->base + IMX_WDT_WSR); ++ __raw_writew(WDT_SEQ2, imx_wdt->base + IMX_WDT_WSR); ++#endif ++} ++ ++/* Service the watchdog */ ++static inline void imx_wdt_service(struct imx_wdt_struct *imx_wdt) ++{ ++ dev_dbg(imx_wdt->dev, "<%s>\n", __func__); ++ ++ __raw_writew(WDT_SEQ1, imx_wdt->base + IMX_WDT_WSR); ++ __raw_writew(WDT_SEQ2, imx_wdt->base + IMX_WDT_WSR); ++} ++ ++/* Watchdog device is opened, and watchdog starts running. */ ++static int imx_wdt_open(struct inode *inode, struct file *file) ++{ ++ struct imx_wdt_struct *imx_wdt = platform_get_drvdata(imx_wdt_dev); ++ ++ dev_dbg(imx_wdt->dev, "<%s>\n", __func__); ++ ++ if (test_and_set_bit(0, &imx_wdt->status)) ++ return -EBUSY; ++ ++ file->private_data = imx_wdt; ++ ++ imx_wdt_start(imx_wdt); ++ return nonseekable_open(inode, file); ++} ++ ++/* Close the watchdog device. */ ++static int imx_wdt_close(struct inode *inode, struct file *file) ++{ ++ struct imx_wdt_struct *imx_wdt = file->private_data; ++ ++ dev_dbg(imx_wdt->dev, "<%s>\n", __func__); ++ ++ /* Disable the watchdog if possible */ ++ if (!imx_wdt->nowayout) ++ imx_wdt_stop(imx_wdt); ++ ++ clear_bit(0, &imx_wdt->status); ++ return 0; ++} ++ ++#ifdef CONFIG_ARCH_MX1 ++/* Change the watchdog time interval. */ ++static int imx_wdt_settimeout(struct imx_wdt_struct *imx_wdt, int new_time) ++{ ++ dev_dbg(imx_wdt->dev, "<%s>\n", __func__); ++ ++ if ((new_time * 2 < 1) || (new_time * 2 > WDT_MAX_TIME)) ++ return -EINVAL; ++ ++ imx_wdt->wdt_time = new_time * 2; ++ return 0; ++} ++#endif ++ ++/* Handle commands from user-space. */ ++static int imx_wdt_ioctl(struct inode *inode, struct file *file, ++ unsigned int cmd, unsigned long arg) ++{ ++ struct imx_wdt_struct *imx_wdt = file->private_data; ++ ++ void __user *argp = (void __user *)arg; ++ int __user *p = argp; ++#ifdef CONFIG_ARCH_MX1 ++ int new_value; ++#endif ++ ++ dev_dbg(imx_wdt->dev, "<%s>\n", __func__); ++ ++ switch (cmd) { ++ case WDIOC_KEEPALIVE: ++ imx_wdt_service(imx_wdt); ++ return 0; ++ ++ case WDIOC_GETSUPPORT: ++ return copy_to_user(argp, &imx_wdt_info, ++ sizeof(imx_wdt_info)) ? -EFAULT : 0; ++#ifdef CONFIG_ARCH_MX1 ++ case WDIOC_SETTIMEOUT: ++ if (get_user(new_value, p)) ++ return -EFAULT; ++ ++ if (imx_wdt_settimeout(imx_wdt, new_value)) ++ return -EINVAL; ++ ++ /* Enable new time value */ ++ imx_wdt_start(imx_wdt); ++ ++ /* Return current value */ ++ return put_user(imx_wdt->wdt_time / 2, p); ++#endif ++ case WDIOC_GETTIMEOUT: ++ return put_user(imx_wdt->wdt_time / 2, p); ++ ++ default: ++ return -ENOTTY; ++ } ++} ++ ++/* Refresh the watchdog whenever device is written to. */ ++static ssize_t imx_wdt_write(struct file *file, const char *data, ++ size_t len, loff_t *ppos) ++{ ++ struct imx_wdt_struct *imx_wdt = file->private_data; ++ ++ dev_dbg(imx_wdt->dev, "<%s>\n", __func__); ++ ++ imx_wdt_service(imx_wdt); ++ return len; ++} ++ ++static const struct file_operations imx_wdt_fops = { ++ .owner = THIS_MODULE, ++ .llseek = no_llseek, ++ .ioctl = imx_wdt_ioctl, ++ .open = imx_wdt_open, ++ .release = imx_wdt_close, ++ .write = imx_wdt_write, ++}; ++ ++static struct miscdevice imx_wdt_miscdev = { ++ .minor = WATCHDOG_MINOR, ++ .name = "watchdog", ++ .fops = &imx_wdt_fops, ++}; ++ ++static void imx_wdt_shutdown(struct platform_device *pdev) ++{ ++ struct imx_wdt_struct *imx_wdt = platform_get_drvdata(pdev); ++ ++ dev_dbg(imx_wdt->dev, "<%s>\n", __func__); ++ ++ imx_wdt_stop(imx_wdt); ++} ++ ++static int __init imx_wdt_probe(struct platform_device *pdev) ++{ ++ int ret; ++ int res_size; ++ struct resource *res; ++ void __iomem *base; ++ struct imx_wdt_struct *imx_wdt; ++ ++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ if (!res) { ++ dev_err(&pdev->dev, "can't get device resources\n"); ++ return -ENODEV; ++ } ++ ++ res_size = res->end - res->start + 1; ++ if (!request_mem_region(res->start, res_size, res->name)) { ++ dev_err(&pdev->dev, "can't allocate %d bytes at %d address\n", ++ res_size, res->start); ++ return -ENOMEM; ++ } ++ ++ base = ioremap(res->start, res_size); ++ if (!base) { ++ dev_err(&pdev->dev, "ioremap failed\n"); ++ ret = -EIO; ++ goto fail0; ++ } ++ ++ imx_wdt = kzalloc(sizeof(struct imx_wdt_struct), GFP_KERNEL); ++ if (!imx_wdt) { ++ dev_err(&pdev->dev, "can't allocate interface\n"); ++ ret = -ENOMEM; ++ goto fail1; ++ } ++ ++ imx_wdt->clk = clk_get(&pdev->dev, NULL); ++ if (IS_ERR(imx_wdt->clk)) { ++ dev_err(&pdev->dev, "can't get Watchdog clock\n"); ++ ret = PTR_ERR(imx_wdt->clk); ++ goto fail2; ++ } ++ clk_enable(imx_wdt->clk); ++ ++ /* Setup imx_wdt driver structure */ ++ imx_wdt->dev = &pdev->dev; ++ imx_wdt->base = base; ++ imx_wdt->res = res; ++ imx_wdt->wdt_time = timeout * 2; ++#ifdef CONFIG_WATCHDOG_NOWAYOUT ++ imx_wdt->nowayout = 1; ++#else ++ imx_wdt->nowayout = 0; ++#endif ++ ++ /* Set up platform driver data */ ++ platform_set_drvdata(pdev, imx_wdt); ++ imx_wdt_dev = pdev; ++ ++ if (imx_wdt_miscdev.parent) { ++ ret = -EBUSY; ++ goto fail3; ++ } ++ imx_wdt_miscdev.parent = &pdev->dev; ++ ++ ret = misc_register(&imx_wdt_miscdev); ++ if (ret) ++ goto fail3; ++ ++ dev_dbg(&pdev->dev, "IMX Watchdog Timer enabled\n"); ++ return 0; ++ ++fail3: ++ clk_disable(imx_wdt->clk); ++ clk_put(imx_wdt->clk); ++fail2: ++ platform_set_drvdata(pdev, NULL); ++ kfree(imx_wdt); ++fail1: ++ iounmap(base); ++fail0: ++ release_mem_region(res->start, res_size); ++ ++ return ret; /* Return error number */ ++} ++ ++static int __exit imx_wdt_remove(struct platform_device *pdev) ++{ ++ struct imx_wdt_struct *imx_wdt = platform_get_drvdata(pdev); ++ ++ dev_dbg(&pdev->dev, "IMX Watchdog Timer disabled\n"); ++ ++ platform_set_drvdata(pdev, NULL); ++ misc_deregister(&imx_wdt_miscdev); ++ imx_wdt_dev = NULL; ++ iounmap(imx_wdt->base); ++ release_mem_region(imx_wdt->res->start, ++ imx_wdt->res->end - imx_wdt->res->start + 1); ++ ++ clk_disable(imx_wdt->clk); ++ clk_put(imx_wdt->clk); ++ ++ kfree(imx_wdt); ++ return 0; ++} ++ ++#ifdef CONFIG_PM ++ ++static int imx_wdt_suspend(struct platform_device *pdev, pm_message_t message) ++{ ++#ifdef CONFIG_ARCH_MX1 ++ struct imx_wdt_struct *imx_wdt = platform_get_drvdata(pdev); ++ ++ u32 temp = __raw_readw(imx_wdt->base + IMX_WDT_WCR); ++ __raw_writew(temp | WCR_WHALT, imx_wdt->base + IMX_WDT_WCR); ++#endif ++ return 0; ++} ++ ++static int imx_wdt_resume(struct platform_device *pdev) ++{ ++#ifdef CONFIG_ARCH_MX1 ++ struct imx_wdt_struct *imx_wdt = platform_get_drvdata(pdev); ++ u32 temp; ++ ++ if (imx_wdt->status) { ++ temp = __raw_readw(imx_wdt->base + IMX_WDT_WCR) & ~WCR_WHALT; ++ __raw_writew(temp, imx_wdt->base + IMX_WDT_WCR); ++ } ++#endif ++ return 0; ++} ++ ++#else ++#define imx_wdt_suspend NULL ++#define imx_wdt_resume NULL ++#endif ++ ++static struct platform_driver imx_wdt_driver = { ++ .probe = imx_wdt_probe, ++ .remove = __exit_p(imx_wdt_remove), ++ .shutdown = imx_wdt_shutdown, ++ .suspend = imx_wdt_suspend, ++ .resume = imx_wdt_resume, ++ .driver = { ++ .name = "imx-wdt", ++ .owner = THIS_MODULE, ++ }, ++}; ++ ++static int __init imx_wdt_init(void) ++{ ++ return platform_driver_probe(&imx_wdt_driver, imx_wdt_probe); ++} ++ ++static void __exit imx_wdt_exit(void) ++{ ++ platform_driver_unregister(&imx_wdt_driver); ++} ++module_init(imx_wdt_init); ++module_exit(imx_wdt_exit); ++ ++module_param(timeout, uint, 0); ++MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds"); ++ ++MODULE_AUTHOR("Darius Augulis"); ++MODULE_DESCRIPTION("Watchdog driver for IMX"); ++MODULE_LICENSE("GPL"); ++MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); ++MODULE_ALIAS("platform:imx-wdt"); diff --git a/recipes/linux/linux-2.6.31/pcm043/0066-HACK-increase-default-tx_queue_len-to-10000.patch b/recipes/linux/linux-2.6.31/pcm043/0066-HACK-increase-default-tx_queue_len-to-10000.patch new file mode 100644 index 0000000000..d0b9123576 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0066-HACK-increase-default-tx_queue_len-to-10000.patch @@ -0,0 +1,36 @@ +From c15a83d5d49ca36d827fd35faee8d9c0048e8053 Mon Sep 17 00:00:00 2001 +From: Marc Kleine-Budde +Date: Fri, 19 Dec 2008 14:32:42 +0100 +Subject: [PATCH 066/101] HACK: increase default tx_queue_len to 10000 + +HACK HACK HACK + +Without this patch sending CAN packages faster then they could be +send out on the wire results in -ENOBUF. This patch increases the +default tx_queue_len to 10000 so that in this case the sender blocks. +Thus the CAN socket just behaves like congested a TCP/IP socket. + +HACK HACK HACK + +Signed-off-by: Marc Kleine-Budde + +rebased to 2.6.31.6 +Signed-off-by: Jan Weitzel +--- + + drivers/net/can/dev.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +Index: linux-2.6.31.6/drivers/net/can/dev.c +=================================================================== +--- linux-2.6.31.6.orig/drivers/net/can/dev.c 2009-11-10 01:32:31.000000000 +0100 ++++ linux-2.6.31.6/drivers/net/can/dev.c 2009-12-08 09:12:45.558976163 +0100 +@@ -420,7 +420,7 @@ + dev->mtu = sizeof(struct can_frame); + dev->hard_header_len = 0; + dev->addr_len = 0; +- dev->tx_queue_len = 10; ++ dev->tx_queue_len = 10000; + + /* New-style flags. */ + dev->flags = IFF_NOARP; diff --git a/recipes/linux/linux-2.6.31/pcm043/0084-i.MX35-clock-support-Add-USB-clocks.patch b/recipes/linux/linux-2.6.31/pcm043/0084-i.MX35-clock-support-Add-USB-clocks.patch new file mode 100644 index 0000000000..da33524b96 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0084-i.MX35-clock-support-Add-USB-clocks.patch @@ -0,0 +1,30 @@ +From f46cfd74faf9b1644e9eefc1e7fa5541f17d1d32 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Tue, 17 Mar 2009 15:43:54 +0100 +Subject: [PATCH 084/101] i.MX35 clock support: Add USB clocks + +Signed-off-by: Sascha Hauer + +rebased to 2.6.31.6 +Signed-off-by: Jan Weitzel +--- + arch/arm/mach-mx3/clock-imx35.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +Index: linux-2.6.31.6/arch/arm/mach-mx3/clock-imx35.c +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/mach-mx3/clock-imx35.c 2009-12-07 15:20:31.963944848 +0100 ++++ linux-2.6.31.6/arch/arm/mach-mx3/clock-imx35.c 2009-12-08 09:39:04.798706951 +0100 +@@ -425,8 +425,10 @@ + _REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk) + _REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk) + _REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk) +- _REGISTER_CLOCK(NULL, "usbotg", usbotg_clk) +- _REGISTER_CLOCK("mxc_wdt.0", NULL, wdog_clk) ++ _REGISTER_CLOCK("mxc-ehci.0", NULL, usbotg_clk) ++ _REGISTER_CLOCK("mxc-ehci.1", NULL, usbotg_clk) ++ _REGISTER_CLOCK("mxc-ehci.2", NULL, usbotg_clk) ++ _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk) + _REGISTER_CLOCK(NULL, "max", max_clk) + _REGISTER_CLOCK(NULL, "audmux", audmux_clk) + _REGISTER_CLOCK(NULL, "csi", csi_clk) diff --git a/recipes/linux/linux-2.6.31/pcm043/0088-ehci-mxc-Fix-clocks.patch b/recipes/linux/linux-2.6.31/pcm043/0088-ehci-mxc-Fix-clocks.patch new file mode 100644 index 0000000000..25143cb0e9 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0088-ehci-mxc-Fix-clocks.patch @@ -0,0 +1,33 @@ +From f5d7944a7257ffcf2aa7ee0736962e9b564837fd Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Wed, 8 Apr 2009 16:39:47 +0200 +Subject: [PATCH 088/101] ehci mxc: Fix clocks + +Signed-off-by: Sascha Hauer +--- + arch/arm/mach-mx3/clock.c | 9 ++++++--- + 1 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mach-mx3/clock.c b/arch/arm/mach-mx3/clock.c +index aee34ed..a08f2be 100644 +--- a/arch/arm/mach-mx3/clock.c ++++ b/arch/arm/mach-mx3/clock.c +@@ -532,9 +532,12 @@ static struct clk_lookup lookups[] __initdata = { + _REGISTER_CLOCK("mx3_sdc_fb", NULL, ipu_clk) + _REGISTER_CLOCK(NULL, "kpp", kpp_clk) + /* FIXME: mxc-ehci now misses the secondary clock */ +- _REGISTER_CLOCK("mxc-ehci.0", NULL, usb_clk1) +- _REGISTER_CLOCK("mxc-ehci.1", NULL, usb_clk1) +- _REGISTER_CLOCK("mxc-ehci.2", NULL, usb_clk1) ++ _REGISTER_CLOCK("mxc-ehci.0", "usb", usb_clk1) ++ _REGISTER_CLOCK("mxc-ehci.0", "usb_ahb", usb_clk2) ++ _REGISTER_CLOCK("mxc-ehci.1", "usb", usb_clk1) ++ _REGISTER_CLOCK("mxc-ehci.1", "usb_ahb", usb_clk2) ++ _REGISTER_CLOCK("mxc-ehci.2", "usb", usb_clk1) ++ _REGISTER_CLOCK("mxc-ehci.2", "usb_ahb", usb_clk2) + _REGISTER_CLOCK("fsl-usb2-udc", "usb", usb_clk1) + _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", usb_clk2) + _REGISTER_CLOCK("mx3-camera.0", NULL, csi_clk) +-- +1.6.2.1 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0090-mx3x-Fixup-USB-base-addresses.patch b/recipes/linux/linux-2.6.31/pcm043/0090-mx3x-Fixup-USB-base-addresses.patch new file mode 100644 index 0000000000..61fe36c6ea --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0090-mx3x-Fixup-USB-base-addresses.patch @@ -0,0 +1,93 @@ +From c5ff90856d241112b588e091167e6fc69020d535 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Fri, 17 Apr 2009 16:52:25 +0200 +Subject: [PATCH 090/101] mx3x: Fixup USB base addresses + +Signed-off-by: Sascha Hauer + +rebased to 2.6.31.6, but without pcm037.c changes +Signed-off-by: Jan Weitzel +--- + arch/arm/mach-mx3/devices.c | 20 ++++++++++++++------ + arch/arm/mach-mx3/pcm037.c | 20 ++++++++++---------- + arch/arm/plat-mxc/include/mach/mx31.h | 2 +- + arch/arm/plat-mxc/include/mach/mx35.h | 1 + + 4 files changed, 26 insertions(+), 17 deletions(-) + +Index: linux-2.6.31.6/arch/arm/mach-mx3/devices.c +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/mach-mx3/devices.c 2009-12-10 11:33:07.024614628 +0100 ++++ linux-2.6.31.6/arch/arm/mach-mx3/devices.c 2009-12-10 11:33:10.356276214 +0100 +@@ -371,8 +371,8 @@ + + static struct resource otg_resources[] = { + { +- .start = OTG_BASE_ADDR, +- .end = OTG_BASE_ADDR + 0x1ff, ++ .start = MX31_OTG_BASE_ADDR, ++ .end = MX31_OTG_BASE_ADDR + 0x1ff, + .flags = IORESOURCE_MEM, + }, { + .start = MXC_INT_USB3, +@@ -410,8 +410,8 @@ + + static struct resource mxc_usbh1_resources[] = { + { +- .start = OTG_BASE_ADDR + 0x200, +- .end = OTG_BASE_ADDR + 0x3ff, ++ .start = MX31_OTG_BASE_ADDR + 0x200, ++ .end = MX31_OTG_BASE_ADDR + 0x3ff, + .flags = IORESOURCE_MEM, + }, { + .start = MXC_INT_USB1, +@@ -435,8 +435,8 @@ + + static struct resource mxc_usbh2_resources[] = { + { +- .start = OTG_BASE_ADDR + 0x400, +- .end = OTG_BASE_ADDR + 0x5ff, ++ .start = MX31_OTG_BASE_ADDR + 0x400, ++ .end = MX31_OTG_BASE_ADDR + 0x5ff, + .flags = IORESOURCE_MEM, + }, { + .start = MXC_INT_USB2, +@@ -586,6 +586,14 @@ + if (cpu_is_mx35()) { + mxc_nand_resources[0].start = MX35_NFC_BASE_ADDR; + mxc_nand_resources[0].end = MX35_NFC_BASE_ADDR + 0xfff; ++ otg_resources[0].start = MX35_OTG_BASE_ADDR; ++ otg_resources[0].end = MX35_OTG_BASE_ADDR + 0x1ff; ++ otg_resources[1].start = MXC_INT_USBOTG; ++ otg_resources[1].end = MXC_INT_USBOTG; ++ mxc_usbh1_resources[0].start = MX35_OTG_BASE_ADDR + 0x400; ++ mxc_usbh1_resources[0].end = MX35_OTG_BASE_ADDR + 0x5ff; ++ mxc_usbh1_resources[1].start = MXC_INT_USBHS; ++ mxc_usbh1_resources[1].end = MXC_INT_USBHS; + imx_ssi_resources0[1].start = MX35_INT_SSI1; + imx_ssi_resources0[1].end = MX35_INT_SSI1; + imx_ssi_resources1[1].start = MX35_INT_SSI2; +Index: linux-2.6.31.6/arch/arm/plat-mxc/include/mach/mx31.h +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/plat-mxc/include/mach/mx31.h 2009-12-10 11:33:07.004682613 +0100 ++++ linux-2.6.31.6/arch/arm/plat-mxc/include/mach/mx31.h 2009-12-10 11:33:10.356276214 +0100 +@@ -4,7 +4,7 @@ + #define MX31_IRAM_BASE_ADDR 0x1FFC0000 /* internal ram */ + #define MX31_IRAM_SIZE SZ_16K + +-#define OTG_BASE_ADDR (AIPS1_BASE_ADDR + 0x00088000) ++#define MX31_OTG_BASE_ADDR (AIPS1_BASE_ADDR + 0x00088000) + #define ATA_BASE_ADDR (AIPS1_BASE_ADDR + 0x0008C000) + #define UART4_BASE_ADDR (AIPS1_BASE_ADDR + 0x000B0000) + #define UART5_BASE_ADDR (AIPS1_BASE_ADDR + 0x000B4000) +Index: linux-2.6.31.6/arch/arm/plat-mxc/include/mach/mx35.h +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/plat-mxc/include/mach/mx35.h 2009-12-10 11:33:07.014617995 +0100 ++++ linux-2.6.31.6/arch/arm/plat-mxc/include/mach/mx35.h 2009-12-10 11:33:10.356276214 +0100 +@@ -5,6 +5,7 @@ + #define MX35_IRAM_SIZE SZ_128K + + #define MXC_FEC_BASE_ADDR 0x50038000 ++#define MX35_OTG_BASE_ADDR 0x53ff4000 + #define MX35_NFC_BASE_ADDR 0xBB000000 + + /* diff --git a/recipes/linux/linux-2.6.31/pcm043/0091-mx31-clock-remove-obsolete-FIXME-comment.patch b/recipes/linux/linux-2.6.31/pcm043/0091-mx31-clock-remove-obsolete-FIXME-comment.patch new file mode 100644 index 0000000000..40c9c632d4 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0091-mx31-clock-remove-obsolete-FIXME-comment.patch @@ -0,0 +1,25 @@ +From 4ed32022da7583d8cf260809f41fb1bfcfb033a8 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Fri, 17 Apr 2009 16:52:55 +0200 +Subject: [PATCH 091/101] mx31 clock: remove obsolete FIXME comment + +Signed-off-by: Sascha Hauer +--- + arch/arm/mach-mx3/clock.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/mach-mx3/clock.c b/arch/arm/mach-mx3/clock.c +index a08f2be..8ec45f6 100644 +--- a/arch/arm/mach-mx3/clock.c ++++ b/arch/arm/mach-mx3/clock.c +@@ -531,7 +531,6 @@ static struct clk_lookup lookups[] __initdata = { + _REGISTER_CLOCK("ipu-core", NULL, ipu_clk) + _REGISTER_CLOCK("mx3_sdc_fb", NULL, ipu_clk) + _REGISTER_CLOCK(NULL, "kpp", kpp_clk) +- /* FIXME: mxc-ehci now misses the secondary clock */ + _REGISTER_CLOCK("mxc-ehci.0", "usb", usb_clk1) + _REGISTER_CLOCK("mxc-ehci.0", "usb_ahb", usb_clk2) + _REGISTER_CLOCK("mxc-ehci.1", "usb", usb_clk1) +-- +1.6.2.1 + diff --git a/recipes/linux/linux-2.6.31/pcm043/0092-mx35-clock-give-ehci-clocks-names.patch b/recipes/linux/linux-2.6.31/pcm043/0092-mx35-clock-give-ehci-clocks-names.patch new file mode 100644 index 0000000000..91b27f9890 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0092-mx35-clock-give-ehci-clocks-names.patch @@ -0,0 +1,30 @@ +From 655b9879b22d1e2776c8df0a4fa77801a1b7fd97 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Fri, 17 Apr 2009 16:53:27 +0200 +Subject: [PATCH 092/101] mx35 clock: give ehci clocks names + +Signed-off-by: Sascha Hauer + +rebased to 2.6.31.6 +Signed-off-by: Jan Weitzel +--- + arch/arm/mach-mx3/clock-imx35.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +Index: linux-2.6.31.6/arch/arm/mach-mx3/clock-imx35.c +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/mach-mx3/clock-imx35.c 2009-12-08 09:39:04.798706951 +0100 ++++ linux-2.6.31.6/arch/arm/mach-mx3/clock-imx35.c 2009-12-08 09:49:47.949859691 +0100 +@@ -425,9 +425,9 @@ + _REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk) + _REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk) + _REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk) +- _REGISTER_CLOCK("mxc-ehci.0", NULL, usbotg_clk) +- _REGISTER_CLOCK("mxc-ehci.1", NULL, usbotg_clk) +- _REGISTER_CLOCK("mxc-ehci.2", NULL, usbotg_clk) ++ _REGISTER_CLOCK("mxc-ehci.0", "usb", usbotg_clk) ++ _REGISTER_CLOCK("mxc-ehci.1", "usb", usbotg_clk) ++ _REGISTER_CLOCK("mxc-ehci.2", "usb", usbotg_clk) + _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk) + _REGISTER_CLOCK(NULL, "max", max_clk) + _REGISTER_CLOCK(NULL, "audmux", audmux_clk) diff --git a/recipes/linux/linux-2.6.31/pcm043/0096-i.MX35-implement-get_rate-for-usb-otg-clock.patch b/recipes/linux/linux-2.6.31/pcm043/0096-i.MX35-implement-get_rate-for-usb-otg-clock.patch new file mode 100644 index 0000000000..0190641ce2 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0096-i.MX35-implement-get_rate-for-usb-otg-clock.patch @@ -0,0 +1,54 @@ +From d7463937b967203cee097b96593ef46cb9ea23a7 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Tue, 21 Apr 2009 14:50:53 +0200 +Subject: [PATCH 096/101] i.MX35: implement get_rate for usb otg clock + +Signed-off-by: Sascha Hauer + +rebased to 2.6.31.6 +Signed-off-by: Jan Weitzel +--- + arch/arm/mach-mx3/clock-imx35.c | 16 +++++++++++++++- + 1 files changed, 15 insertions(+), 1 deletions(-) + +Index: linux-2.6.31.6/arch/arm/mach-mx3/clock-imx35.c +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/mach-mx3/clock-imx35.c 2009-12-08 09:49:47.949859691 +0100 ++++ linux-2.6.31.6/arch/arm/mach-mx3/clock-imx35.c 2009-12-08 09:56:24.498623255 +0100 +@@ -273,6 +273,19 @@ + return rate / get_3_3_div((pdr2 >> 16) & 0x3f); + } + ++static unsigned long get_rate_otg(struct clk *clk) ++{ ++ unsigned long pdr4 = __raw_readl(CCM_BASE + CCM_PDR4); ++ unsigned long rate; ++ ++ if (pdr4 & (1 << 9)) ++ rate = get_rate_arm(); ++ else ++ rate = get_rate_ppll(); ++ ++ return rate / get_3_3_div((pdr4 >> 22) & 0x3f); ++} ++ + static unsigned long get_rate_ipg_per(struct clk *clk) + { + unsigned long pdr0 = __raw_readl(CCM_BASE + CCM_PDR0); +@@ -365,7 +378,7 @@ + DEFINE_CLOCK(uart1_clk, 0, CCM_CGR2, 16, get_rate_uart, NULL); + DEFINE_CLOCK(uart2_clk, 1, CCM_CGR2, 18, get_rate_uart, NULL); + DEFINE_CLOCK(uart3_clk, 2, CCM_CGR2, 20, get_rate_uart, NULL); +-DEFINE_CLOCK(usbotg_clk, 0, CCM_CGR2, 22, NULL, NULL); ++DEFINE_CLOCK(usbotg_clk, 0, CCM_CGR2, 22, get_rate_otg, NULL); + DEFINE_CLOCK(wdog_clk, 0, CCM_CGR2, 24, NULL, NULL); + DEFINE_CLOCK(max_clk, 0, CCM_CGR2, 26, NULL, NULL); + DEFINE_CLOCK(audmux_clk, 0, CCM_CGR2, 30, NULL, NULL); +@@ -428,6 +441,7 @@ + _REGISTER_CLOCK("mxc-ehci.0", "usb", usbotg_clk) + _REGISTER_CLOCK("mxc-ehci.1", "usb", usbotg_clk) + _REGISTER_CLOCK("mxc-ehci.2", "usb", usbotg_clk) ++ _REGISTER_CLOCK("fsl-usb2-udc", "usb", usbotg_clk) + _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk) + _REGISTER_CLOCK(NULL, "max", max_clk) + _REGISTER_CLOCK(NULL, "audmux", audmux_clk) diff --git a/recipes/linux/linux-2.6.31/pcm043/0097-fsl-udc-driver-add-mx35-support.patch b/recipes/linux/linux-2.6.31/pcm043/0097-fsl-udc-driver-add-mx35-support.patch new file mode 100644 index 0000000000..3467895ba8 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/0097-fsl-udc-driver-add-mx35-support.patch @@ -0,0 +1,83 @@ +From 56e08cdd4fde350a1e43c69b084fa618df1e2af7 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Tue, 21 Apr 2009 14:52:45 +0200 +Subject: [PATCH 097/101] fsl udc driver: add mx35 support + +Signed-off-by: Sascha Hauer +--- + drivers/usb/gadget/fsl_mx3_udc.c | 31 ++++++++++++++++++++----------- + 1 files changed, 20 insertions(+), 11 deletions(-) + +diff --git a/drivers/usb/gadget/fsl_mx3_udc.c b/drivers/usb/gadget/fsl_mx3_udc.c +index 4bc2bf3..20a802e 100644 +--- a/drivers/usb/gadget/fsl_mx3_udc.c ++++ b/drivers/usb/gadget/fsl_mx3_udc.c +@@ -17,6 +17,8 @@ + #include + #include + ++#include ++ + static struct clk *mxc_ahb_clk; + static struct clk *mxc_usb_clk; + +@@ -28,14 +30,16 @@ int fsl_udc_clk_init(struct platform_device *pdev) + + pdata = pdev->dev.platform_data; + +- mxc_ahb_clk = clk_get(&pdev->dev, "usb_ahb"); +- if (IS_ERR(mxc_ahb_clk)) +- return PTR_ERR(mxc_ahb_clk); ++ if (!cpu_is_mx35()) { ++ mxc_ahb_clk = clk_get(&pdev->dev, "usb_ahb"); ++ if (IS_ERR(mxc_ahb_clk)) ++ return PTR_ERR(mxc_ahb_clk); + +- ret = clk_enable(mxc_ahb_clk); +- if (ret < 0) { +- dev_err(&pdev->dev, "clk_enable(\"usb_ahb\") failed\n"); +- goto eenahb; ++ ret = clk_enable(mxc_ahb_clk); ++ if (ret < 0) { ++ dev_err(&pdev->dev, "clk_enable(\"usb_ahb\") failed\n"); ++ goto eenahb; ++ } + } + + /* make sure USB_CLK is running at 60 MHz +/- 1000 Hz */ +@@ -50,6 +54,7 @@ int fsl_udc_clk_init(struct platform_device *pdev) + if (pdata->phy_mode != FSL_USB2_PHY_ULPI && + (freq < 59999000 || freq > 60001000)) { + dev_err(&pdev->dev, "USB_CLK=%lu, should be 60MHz\n", freq); ++ ret = -EINVAL; + goto eclkrate; + } + +@@ -66,9 +71,11 @@ eclkrate: + clk_put(mxc_usb_clk); + mxc_usb_clk = NULL; + egusb: +- clk_disable(mxc_ahb_clk); ++ if (!cpu_is_mx35()) ++ clk_disable(mxc_ahb_clk); + eenahb: +- clk_put(mxc_ahb_clk); ++ if (!cpu_is_mx35()) ++ clk_put(mxc_ahb_clk); + return ret; + } + +@@ -90,6 +97,8 @@ void fsl_udc_clk_release(void) + clk_disable(mxc_usb_clk); + clk_put(mxc_usb_clk); + } +- clk_disable(mxc_ahb_clk); +- clk_put(mxc_ahb_clk); ++ if (!cpu_is_mx35()) { ++ clk_disable(mxc_ahb_clk); ++ clk_put(mxc_ahb_clk); ++ } + } +-- +1.6.2.1 + diff --git a/recipes/linux/linux-2.6.31/pcm043/Update-PCM043-board-support.patch b/recipes/linux/linux-2.6.31/pcm043/Update-PCM043-board-support.patch new file mode 100644 index 0000000000..117611e920 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/Update-PCM043-board-support.patch @@ -0,0 +1,134 @@ +Based on +From 0d4941a59648e16d99624cf16812d5ae83986187 Mon Sep 17 00:00:00 2001 +From: Sascha Hauer +Date: Fri, 6 Feb 2009 15:42:26 +0100 +Subject: [PATCH 026/101] [ARM] MX35: Add PCM043 board support + +add USB support + +Signed-off-by: Jan Weitzel +--- +Index: linux-2.6.31.6/arch/arm/mach-mx3/pcm043.c +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/mach-mx3/pcm043.c 2009-12-10 11:59:35.364772725 +0100 ++++ linux-2.6.31.6/arch/arm/mach-mx3/pcm043.c 2009-12-10 13:45:21.484650731 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + + #include +@@ -44,6 +45,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -207,6 +209,9 @@ + MX35_PAD_D3_REV__IPU_DISPB_D3_REV, + MX35_PAD_D3_CLS__IPU_DISPB_D3_CLS, + MX35_PAD_D3_SPL__IPU_DISPB_D3_SPL, ++ /* USB host */ ++ MX35_PAD_I2C2_CLK__USB_TOP_USBH2_PWR, ++ MX35_PAD_I2C2_DAT__USB_TOP_USBH2_OC, + /* SSI */ + MX35_PAD_STXFS4__AUDMUX_AUD4_TXFS, + MX35_PAD_STXD4__AUDMUX_AUD4_TXD, +@@ -214,6 +219,66 @@ + MX35_PAD_SCK4__AUDMUX_AUD4_TXC, + }; + ++static int pcm043_usbh1_init(struct platform_device *pdev) ++{ ++ unsigned int tmp; ++ ++ tmp = readl(IO_ADDRESS(MX35_OTG_BASE_ADDR) + 0x600); ++ tmp &= ~((3 << 21) | (1 << 2) | (1 << 16)); ++ tmp |= (1 << 4) | (2 << 21) | (1 << 19) | (1 << 12) | (1 << 6) | (1 << 5); ++ writel(tmp, IO_ADDRESS(MX35_OTG_BASE_ADDR) + 0x600); ++ ++ tmp = readl(IO_ADDRESS(MX35_OTG_BASE_ADDR) + 0x584); ++ tmp |= (3 << 30); ++ writel(tmp, IO_ADDRESS(MX35_OTG_BASE_ADDR) + 0x584); ++ ++ return 0; ++} ++ ++static struct mxc_usbh_platform_data usbh1_pdata = { ++ .init = pcm043_usbh1_init, ++}; ++ ++static int pcm043_otg_init(struct platform_device *pdev) ++{ ++ unsigned int tmp; ++ ++ tmp = readl(IO_ADDRESS(MX35_OTG_BASE_ADDR) + 0x600); ++ tmp &= ~(3 << 29); ++ tmp |= (2 << 29); ++ writel(tmp, IO_ADDRESS(MX35_OTG_BASE_ADDR) + 0x600); ++ ++ tmp = readl(IO_ADDRESS(MX35_OTG_BASE_ADDR) + 0x184); ++ tmp &= ~(3 << 30); ++ writel(tmp, IO_ADDRESS(MX35_OTG_BASE_ADDR) + 0x184); ++ ++ return 0; ++} ++ ++static struct mxc_usbh_platform_data otg_pdata = { ++ .init = pcm043_otg_init, ++}; ++ ++static struct fsl_usb2_platform_data usb_data = { ++ .operating_mode = FSL_USB2_DR_DEVICE, ++ .phy_mode = FSL_USB2_PHY_UTMI, ++}; ++ ++static int otg_mode_host; ++ ++static int __init pcm043_otg_mode(char *options) ++{ ++ if (!strcmp(options, "host")) ++ otg_mode_host = 1; ++ else if (!strcmp(options, "device")) ++ otg_mode_host = 0; ++ else ++ pr_info("pcm043_otg_mode neither \"host\" nor \"device\". " ++ "Defaulting to device\n"); ++ return 0; ++} ++__setup("pcm043_otg_mode=", pcm043_otg_mode); ++ + #define AC97_GPIO_TXFS (1 * 32 + 31) + #define AC97_GPIO_TXD (1 * 32 + 28) + #define AC97_GPIO_RESET (1 * 32 + 0) +@@ -299,6 +364,8 @@ + */ + static void __init mxc_board_init(void) + { ++ unsigned int tmp; ++ + mxc_iomux_v3_setup_multiple_pads(pcm043_pads, ARRAY_SIZE(pcm043_pads)); + + mxc_audmux_v2_configure_port(3, +@@ -329,6 +396,17 @@ + + mxc_register_device(&mx3_ipu, &mx3_ipu_data); + mxc_register_device(&mx3_fb, &mx3fb_pdata); ++ ++ tmp = readl(IO_ADDRESS(MX35_OTG_BASE_ADDR) + 0x600); ++ tmp &= ~(3 << 29); ++ tmp |= (2 << 29); ++ writel(tmp, IO_ADDRESS(MX35_OTG_BASE_ADDR) + 0x600); ++ ++ mxc_register_device(&mxc_usbh1, &usbh1_pdata); ++ if (otg_mode_host) ++ mxc_register_device(&mxc_otg, &otg_pdata); ++ else ++ mxc_register_device(&mxc_otg_udc_device, &usb_data); + } + + static void __init pcm043_timer_init(void) diff --git a/recipes/linux/linux-2.6.31/pcm043/add-led-gpio.patch b/recipes/linux/linux-2.6.31/pcm043/add-led-gpio.patch new file mode 100644 index 0000000000..cbd096b2e3 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/add-led-gpio.patch @@ -0,0 +1,17 @@ +Add support for the LED on baseboard + +Signed-off-by: Jan Weitzel +--- +Index: linux-2.6.31.6/arch/arm/mach-mx3/pcm043.c +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/mach-mx3/pcm043.c 2009-12-11 13:56:03.526475695 +0100 ++++ linux-2.6.31.6/arch/arm/mach-mx3/pcm043.c 2009-12-11 13:58:49.894701069 +0100 +@@ -250,6 +250,8 @@ + MX35_PAD_SCK4__AUDMUX_AUD4_TXC, + /* 1-Wire*/ + MX35_PAD_GPIO1_0__OWIRE_LINE, ++ /* GPIO */ ++ MX35_PAD_ATA_CS0__GPIO2_6, + /* CAN */ + MX35_PAD_SD2_DATA2__CAN1_RXCAN, + MX35_PAD_SD2_DATA3__CAN1_TXCAN, diff --git a/recipes/linux/linux-2.6.31/pcm043/add_mmc.diff b/recipes/linux/linux-2.6.31/pcm043/add_mmc.diff new file mode 100644 index 0000000000..fb3a3c77f5 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/add_mmc.diff @@ -0,0 +1,1396 @@ +From: Wolfram Sang +Subject: add preliminary MMC support to MX35 + +WIP! + +This is the backported SDHCI-driver from top of tree with the modifications needed +to make the esdhc-version from FSL work with it. There are still some issues left, +especially stylewise, this is more a proof-of-concept for the approach. + +WIP! + +Not suitable for upstream (yet). + +Signed-off-by: Wolfram Sang +--- + arch/arm/mach-mx3/pcm043.c | 30 ++++ + drivers/mmc/host/Kconfig | 137 +++++++++++++++++++-- + drivers/mmc/host/Makefile | 14 +- + drivers/mmc/host/sdhci-esdhc.c | 215 +++++++++++++++++++++++++++++++++ + drivers/mmc/host/sdhci-of-core.c | 231 ++++++++++++++++++++++++++++++++++++ + drivers/mmc/host/sdhci-of-hlwd.c | 65 ++++++++++ + drivers/mmc/host/sdhci-of.h | 37 +++++ + drivers/mmc/host/sdhci-pltfm-core.c | 187 +++++++++++++++++++++++++++++ + drivers/mmc/host/sdhci.c | 56 ++++---- + drivers/mmc/host/sdhci.h | 51 ++++--- + 10 files changed, 964 insertions(+), 59 deletions(-) + +Index: drivers/mmc/host/Kconfig +=================================================================== +--- drivers/mmc/host/Kconfig.orig ++++ drivers/mmc/host/Kconfig +@@ -44,6 +44,19 @@ config MMC_SDHCI_IO_ACCESSORS + This is silent Kconfig symbol that is selected by the drivers that + need to overwrite SDHCI IO memory accessors. + ++config MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER ++ bool ++ select MMC_SDHCI_IO_ACCESSORS ++ help ++ This option is selected by drivers running on big endian hosts ++ and performing I/O to a SDHCI controller through a bus that ++ implements a hardware byte swapper using a 32-bit datum. ++ This endian mapping mode is called "data invariance" and ++ has the effect of scrambling the addresses and formats of data ++ accessed in sizes other than the datum size. ++ ++ This is the case for the Freescale eSDHC and Nintendo Wii SDHCI. ++ + config MMC_SDHCI_PCI + tristate "SDHCI support on PCI bus" + depends on MMC_SDHCI && PCI +@@ -72,14 +85,33 @@ config MMC_RICOH_MMC + + If unsure, say Y. + ++config MMC_SDHCI_ESDHC ++ bool "SDHCI support for the Freescale eSDHC controller" ++ depends on MMC_SDHCI_OF || MMC_SDHCI_PLTFM ++ select MMC_SDHCI_IO_ACCESSORS ++ select MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER if MMC_SDHCI_OF ++ help ++ This selects the Freescale eSDHC controller support. ++ ++ If unsure, say N. ++ + config MMC_SDHCI_OF + tristate "SDHCI support on OpenFirmware platforms" + depends on MMC_SDHCI && PPC_OF +- select MMC_SDHCI_IO_ACCESSORS + help + This selects the OF support for Secure Digital Host Controller +- Interfaces. So far, only the Freescale eSDHC controller is known +- to exist on OF platforms. ++ Interfaces. ++ ++ If unsure, say N. ++ ++config MMC_SDHCI_OF_HLWD ++ bool "SDHCI OF support for the Nintendo Wii SDHCI controllers" ++ depends on MMC_SDHCI_OF ++ select MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER ++ help ++ This selects the Secure Digital Host Controller Interface (SDHCI) ++ found in the "Hollywood" chipset of the Nintendo Wii video game ++ console. + + If unsure, say N. + +@@ -132,11 +164,11 @@ config MMC_OMAP + + config MMC_OMAP_HS + tristate "TI OMAP High Speed Multimedia Card Interface support" +- depends on ARCH_OMAP2430 || ARCH_OMAP3 ++ depends on ARCH_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4 + help + This selects the TI OMAP High Speed Multimedia card Interface. +- If you have an OMAP2430 or OMAP3 board with a Multimedia Card slot, +- say Y or M here. ++ If you have an OMAP2430 or OMAP3 board or OMAP4 board with a ++ Multimedia Card slot, say Y or M here. + + If unsure, say N. + +@@ -160,6 +192,12 @@ config MMC_AU1X + + If unsure, say N. + ++choice ++ prompt "Atmel SD/MMC Driver" ++ default MMC_ATMELMCI if AVR32 ++ help ++ Choose which driver to use for the Atmel MCI Silicon ++ + config MMC_AT91 + tristate "AT91 SD/MMC Card Interface support" + depends on ARCH_AT91 +@@ -170,17 +208,19 @@ config MMC_AT91 + + config MMC_ATMELMCI + tristate "Atmel Multimedia Card Interface support" +- depends on AVR32 ++ depends on AVR32 || ARCH_AT91 + help + This selects the Atmel Multimedia Card Interface driver. If +- you have an AT32 (AVR32) platform with a Multimedia Card +- slot, say Y or M here. ++ you have an AT32 (AVR32) or AT91 platform with a Multimedia ++ Card slot, say Y or M here. + + If unsure, say N. + ++endchoice ++ + config MMC_ATMELMCI_DMA + bool "Atmel MCI DMA support (EXPERIMENTAL)" +- depends on MMC_ATMELMCI && DMA_ENGINE && EXPERIMENTAL ++ depends on MMC_ATMELMCI && AVR32 && DMA_ENGINE && EXPERIMENTAL + help + Say Y here to have the Atmel MCI driver use a DMA engine to + do data transfers and thus increase the throughput and +@@ -199,6 +239,13 @@ config MMC_IMX + + If unsure, say N. + ++config MMC_MSM7X00A ++ tristate "Qualcomm MSM 7X00A SDCC Controller Support" ++ depends on MMC && ARCH_MSM ++ help ++ This provides support for the SD/MMC cell found in the ++ MSM 7X00A controllers from Qualcomm. ++ + config MMC_MXC + tristate "Freescale i.MX2/3 Multimedia Card Interface support" + depends on ARCH_MXC +@@ -236,6 +283,14 @@ config MMC_MVSDIO + To compile this driver as a module, choose M here: the + module will be called mvsdio. + ++config MMC_DAVINCI ++ tristate "TI DAVINCI Multimedia Card Interface support" ++ depends on ARCH_DAVINCI ++ help ++ This selects the TI DAVINCI Multimedia card Interface. ++ If you have an DAVINCI board with a Multimedia Card slot, ++ say Y or M here. If unsure, say N. ++ + config MMC_SPI + tristate "MMC/SD/SDIO over SPI" + depends on SPI_MASTER && !HIGHMEM && HAS_DMA +@@ -261,6 +316,47 @@ config MMC_S3C + + If unsure, say N. + ++config MMC_S3C_HW_SDIO_IRQ ++ bool "Hardware support for SDIO IRQ" ++ depends on MMC_S3C ++ help ++ Enable the hardware support for SDIO interrupts instead of using ++ the generic polling code. ++ ++choice ++ prompt "Samsung S3C SD/MMC transfer code" ++ depends on MMC_S3C ++ ++config MMC_S3C_PIO ++ bool "Use PIO transfers only" ++ help ++ Use PIO to transfer data between memory and the hardware. ++ ++ PIO is slower than DMA as it requires CPU instructions to ++ move the data. This has been the traditional default for ++ the S3C MCI driver. ++ ++config MMC_S3C_DMA ++ bool "Use DMA transfers only (EXPERIMENTAL)" ++ depends on EXPERIMENTAL ++ help ++ Use DMA to transfer data between memory and the hardare. ++ ++ Currently, the DMA support in this driver seems to not be ++ working properly and needs to be debugged before this ++ option is useful. ++ ++config MMC_S3C_PIODMA ++ bool "Support for both PIO and DMA (EXPERIMENTAL)" ++ help ++ Compile both the PIO and DMA transfer routines into the ++ driver and let the platform select at run-time which one ++ is best. ++ ++ See notes for the DMA option. ++ ++endchoice ++ + config MMC_SDRICOH_CS + tristate "MMC/SD driver for Ricoh Bay1Controllers (EXPERIMENTAL)" + depends on EXPERIMENTAL && PCI && PCMCIA +@@ -273,7 +369,7 @@ config MMC_SDRICOH_CS + + config MMC_TMIO + tristate "Toshiba Mobile IO Controller (TMIO) MMC/SD function support" +- depends on MFD_TMIO || MFD_ASIC3 ++ depends on MFD_TMIO || MFD_ASIC3 || SUPERH + help + This provides support for the SD/MMC cell found in TC6393XB, + T7L66XB and also HTC ASIC3 +@@ -301,3 +397,22 @@ config MMC_VIA_SDMMC + If you have a controller with this interface, say Y or M here. + + If unsure, say N. ++ ++config SDH_BFIN ++ tristate "Blackfin Secure Digital Host support" ++ depends on MMC && ((BF54x && !BF544) || (BF51x && !BF512)) ++ help ++ If you say yes here you will get support for the Blackfin on-chip ++ Secure Digital Host interface. This includes support for MMC and ++ SD cards. ++ ++ To compile this driver as a module, choose M here: the ++ module will be called bfin_sdh. ++ ++ If unsure, say N. ++ ++config SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND ++ bool "Blackfin EZkit Missing SDH_CMD Pull Up Resistor Workaround" ++ depends on SDH_BFIN ++ help ++ If you say yes here SD-Cards may work on the EZkit. +Index: drivers/mmc/host/Makefile +=================================================================== +--- drivers/mmc/host/Makefile.orig ++++ drivers/mmc/host/Makefile +@@ -13,8 +13,6 @@ obj-$(CONFIG_MMC_MXC) += mxcmmc.o + obj-$(CONFIG_MMC_SDHCI) += sdhci.o + obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o + obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o +-obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o +-obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o + obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o + obj-$(CONFIG_MMC_WBSD) += wbsd.o + obj-$(CONFIG_MMC_AU1X) += au1xmmc.o +@@ -23,7 +21,9 @@ obj-$(CONFIG_MMC_OMAP_HS) += omap_hsmmc. + obj-$(CONFIG_MMC_AT91) += at91_mci.o + obj-$(CONFIG_MMC_ATMELMCI) += atmel-mci.o + obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o ++obj-$(CONFIG_MMC_MSM7X00A) += msm_sdcc.o + obj-$(CONFIG_MMC_MVSDIO) += mvsdio.o ++obj-$(CONFIG_MMC_DAVINCI) += davinci_mmc.o + obj-$(CONFIG_MMC_SPI) += mmc_spi.o + ifeq ($(CONFIG_OF),y) + obj-$(CONFIG_MMC_SPI) += of_mmc_spi.o +@@ -33,6 +33,16 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_ + obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o + obj-$(CONFIG_MMC_CB710) += cb710-mmc.o + obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o ++obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o ++ ++obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o ++sdhci-of-y := sdhci-of-core.o ++sdhci-of-$(CONFIG_MMC_SDHCI_ESDHC) += sdhci-esdhc.o ++sdhci-of-$(CONFIG_MMC_SDHCI_OF_HLWD) += sdhci-of-hlwd.o ++ ++obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o ++sdhci-pltfm-y := sdhci-pltfm-core.o ++sdhci-pltfm-$(CONFIG_MMC_SDHCI_ESDHC) += sdhci-esdhc.o + + ifeq ($(CONFIG_CB710_DEBUG),y) + CFLAGS-cb710-mmc += -DDEBUG +Index: drivers/mmc/host/sdhci-esdhc.c +=================================================================== +--- /dev/null ++++ drivers/mmc/host/sdhci-esdhc.c +@@ -0,0 +1,215 @@ ++/* ++ * Freescale eSDHC controller driver. ++ * ++ * Copyright (c) 2007 Freescale Semiconductor, Inc. ++ * Copyright (c) 2009 MontaVista Software, Inc. ++ * ++ * Authors: Xiaobo Xie ++ * Anton Vorontsov ++ * ++ * 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. ++ */ ++ ++#include ++#include ++#include ++#include "sdhci-of.h" ++#include "sdhci.h" ++ ++/* ++ * Ops and quirks for the Freescale eSDHC controller. ++ */ ++ ++#define ESDHC_DMA_SYSCTL 0x40c ++#define ESDHC_DMA_SNOOP 0x00000040 ++ ++#define ESDHC_SYSTEM_CONTROL 0x2c ++#define ESDHC_CLOCK_MASK 0x0000fff0 ++#define ESDHC_PREDIV_SHIFT 8 ++#define ESDHC_DIVIDER_SHIFT 4 ++#define ESDHC_CLOCK_PEREN 0x00000004 ++#define ESDHC_CLOCK_HCKEN 0x00000002 ++#define ESDHC_CLOCK_IPGEN 0x00000001 ++ ++#define ESDHC_HOST_CONTROL_RES 0x05 ++ ++#ifdef CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER ++ ++static u16 esdhc_readw_be(struct sdhci_host *host, int reg) ++{ ++ u16 ret; ++ ++ if (unlikely(reg == SDHCI_HOST_VERSION)) ++ ret = in_be16(host->ioaddr + reg); ++ else ++ ret = sdhci_be32bs_readw(host, reg); ++ return ret; ++} ++ ++static void esdhc_writew_be(struct sdhci_host *host, u16 val, int reg) ++{ ++ if (reg == SDHCI_BLOCK_SIZE) { ++ /* ++ * Two last DMA bits are reserved, and first one is used for ++ * non-standard blksz of 4096 bytes that we don't support ++ * yet. So clear the DMA boundary bits. ++ */ ++ val &= ~SDHCI_MAKE_BLKSZ(0x7, 0); ++ } ++ sdhci_be32bs_writew(host, val, reg); ++} ++ ++static void esdhc_writeb_be(struct sdhci_host *host, u8 val, int reg) ++{ ++ /* Prevent SDHCI core from writing reserved bits (e.g. HISPD). */ ++ if (reg == SDHCI_HOST_CONTROL) ++ val &= ~ESDHC_HOST_CONTROL_RES; ++ sdhci_be32bs_writeb(host, val, reg); ++} ++ ++static int esdhc_enable_dma(struct sdhci_host *host) ++{ ++ u32 temp = sdhci_readl(host, ESDHC_DMA_SYSCTL); ++ ++ temp |= ESDHC_DMA_SNOOP; ++ sdhci_writel(host, temp, ESDHC_DMA_SYSCTL); ++ return 0; ++} ++ ++#else ++ ++static inline void esdhc_clrset_le(struct sdhci_host *host, u32 mask, u32 val, int reg) ++{ ++ void __iomem *base = host->ioaddr + (reg & ~0x3); ++ u32 shift = (reg & 0x3) * 8; ++ ++ writel(((readl(base) & ~(mask << shift)) | (val << shift)), base); ++} ++ ++static u16 esdhc_readw_le(struct sdhci_host *host, int reg) ++{ ++ if (unlikely(reg == SDHCI_HOST_VERSION)) ++ reg ^= 2; ++ ++ return readw(host->ioaddr + reg); ++} ++ ++static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg) ++{ ++ static u16 ugh; ++ ++ switch (reg) { ++ case SDHCI_TRANSFER_MODE: ++ /* ++ * Postpone this write, we must do it together with a ++ * command write that is down below. ++ */ ++ //of_host->xfer_mode_shadow = val; ++ ugh = val; ++ return; ++ case SDHCI_COMMAND: ++ writel(val << 16 | ugh, host->ioaddr + SDHCI_TRANSFER_MODE); ++ return; ++ case SDHCI_BLOCK_SIZE: ++ val &= ~SDHCI_MAKE_BLKSZ(0x7, 0); ++ break; ++ } ++ esdhc_clrset_le(host, 0xffff, val, reg); ++} ++ ++static void esdhc_writeb_le(struct sdhci_host *host, u8 val, int reg) ++{ ++ switch (reg) { ++ case SDHCI_POWER_CONTROL: ++ /* FSL put the DMA bits there, so skip :( */ ++ return; ++ case SDHCI_HOST_CONTROL: ++ val &= 0x07; ++ val |= 0x20; ++ break; ++ } ++ esdhc_clrset_le(host, 0xff, val, reg); ++} ++ ++#endif /* CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER */ ++ ++static void esdhc_set_clock(struct sdhci_host *host, unsigned int clock) ++{ ++ int pre_div = 2; ++ int div = 1; ++ u32 temp; ++ ++ temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL); ++ temp &= ~(ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN | ESDHC_CLOCK_PEREN | ESDHC_CLOCK_MASK); ++ sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL); ++ ++ if (clock == 0) ++ goto out; ++ ++ while (host->max_clk / pre_div / 16 > clock && pre_div < 256) ++ pre_div *= 2; ++ ++ while (host->max_clk / pre_div / div > clock && div < 16) ++ div++; ++ ++ dev_dbg(mmc_dev(host->mmc), "desired SD clock: %d, actual: %d (%02x %02x)\n", ++ clock, host->max_clk / pre_div / div, pre_div, div); ++ ++ pre_div >>= 1; ++ div--; ++ ++ temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL); ++ temp |= (ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN | ESDHC_CLOCK_PEREN | ++ div << ESDHC_DIVIDER_SHIFT | pre_div << ESDHC_PREDIV_SHIFT); ++ sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL); ++ mdelay(100); ++out: ++ host->clock = clock; ++} ++ ++static unsigned int esdhc_get_max_clock(struct sdhci_host *host) ++{ ++ struct sdhci_of_host *of_host = sdhci_priv(host); ++ ++ return of_host->clock; ++} ++ ++static unsigned int esdhc_get_min_clock(struct sdhci_host *host) ++{ ++ struct sdhci_of_host *of_host = sdhci_priv(host); ++ ++ return of_host->clock / 256 / 16; ++} ++ ++struct sdhci_quirk_data sdhci_esdhc = { ++ .quirks = SDHCI_QUIRK_FORCE_BLK_SZ_2048 | ++ SDHCI_QUIRK_BROKEN_CARD_DETECTION | ++ SDHCI_QUIRK_NO_BUSY_IRQ | ++ SDHCI_QUIRK_NONSTANDARD_CLOCK | ++ SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | ++ SDHCI_QUIRK_PIO_NEEDS_DELAY | ++ SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET | ++ SDHCI_QUIRK_BROKEN_TIMEOUT_VAL | ++ SDHCI_QUIRK_NO_CARD_NO_RESET, ++ .ops = { ++#ifdef CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER ++ .custom_readl = sdhci_be32bs_readl, ++ .custom_readw = esdhc_readw_be, ++ .custom_readb = sdhci_be32bs_readb, ++ .custom_writel = sdhci_be32bs_writel, ++ .custom_writew = esdhc_writew_be, ++ .custom_writeb = esdhc_writeb_be, ++ .enable_dma = esdhc_enable_dma, ++#else ++ .custom_readw = esdhc_readw_le, ++ .custom_writew = esdhc_writew_le, ++ .custom_writeb = esdhc_writeb_le, ++#endif ++ .set_clock = esdhc_set_clock, ++ .get_max_clock = esdhc_get_max_clock, ++ .get_min_clock = esdhc_get_min_clock, ++ }, ++}; +Index: drivers/mmc/host/sdhci-of-core.c +=================================================================== +--- /dev/null ++++ drivers/mmc/host/sdhci-of-core.c +@@ -0,0 +1,231 @@ ++/* ++ * OpenFirmware bindings for Secure Digital Host Controller Interface. ++ * ++ * Copyright (c) 2007 Freescale Semiconductor, Inc. ++ * Copyright (c) 2009 MontaVista Software, Inc. ++ * ++ * Authors: Xiaobo Xie ++ * Anton Vorontsov ++ * ++ * 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. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "sdhci-of.h" ++#include "sdhci.h" ++ ++#ifdef CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER ++ ++/* ++ * These accessors are designed for big endian hosts doing I/O to ++ * little endian controllers incorporating a 32-bit hardware byte swapper. ++ */ ++ ++u32 sdhci_be32bs_readl(struct sdhci_host *host, int reg) ++{ ++ return in_be32(host->ioaddr + reg); ++} ++ ++u16 sdhci_be32bs_readw(struct sdhci_host *host, int reg) ++{ ++ return in_be16(host->ioaddr + (reg ^ 0x2)); ++} ++ ++u8 sdhci_be32bs_readb(struct sdhci_host *host, int reg) ++{ ++ return in_8(host->ioaddr + (reg ^ 0x3)); ++} ++ ++void sdhci_be32bs_writel(struct sdhci_host *host, u32 val, int reg) ++{ ++ out_be32(host->ioaddr + reg, val); ++} ++ ++void sdhci_be32bs_writew(struct sdhci_host *host, u16 val, int reg) ++{ ++ struct sdhci_of_host *of_host = sdhci_priv(host); ++ int base = reg & ~0x3; ++ int shift = (reg & 0x2) * 8; ++ ++ switch (reg) { ++ case SDHCI_TRANSFER_MODE: ++ /* ++ * Postpone this write, we must do it together with a ++ * command write that is down below. ++ */ ++ of_host->xfer_mode_shadow = val; ++ return; ++ case SDHCI_COMMAND: ++ sdhci_be32bs_writel(host, val << 16 | of_host->xfer_mode_shadow, ++ SDHCI_TRANSFER_MODE); ++ return; ++ } ++ clrsetbits_be32(host->ioaddr + base, 0xffff << shift, val << shift); ++} ++ ++void sdhci_be32bs_writeb(struct sdhci_host *host, u8 val, int reg) ++{ ++ int base = reg & ~0x3; ++ int shift = (reg & 0x3) * 8; ++ ++ clrsetbits_be32(host->ioaddr + base , 0xff << shift, val << shift); ++} ++#endif /* CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER */ ++ ++#ifdef CONFIG_PM ++ ++static int sdhci_of_suspend(struct of_device *ofdev, pm_message_t state) ++{ ++ struct sdhci_host *host = dev_get_drvdata(&ofdev->dev); ++ ++ return mmc_suspend_host(host->mmc, state); ++} ++ ++static int sdhci_of_resume(struct of_device *ofdev) ++{ ++ struct sdhci_host *host = dev_get_drvdata(&ofdev->dev); ++ ++ return mmc_resume_host(host->mmc); ++} ++ ++#else ++ ++#define sdhci_of_suspend NULL ++#define sdhci_of_resume NULL ++ ++#endif ++ ++static bool __devinit sdhci_of_wp_inverted(struct device_node *np) ++{ ++ if (of_get_property(np, "sdhci,wp-inverted", NULL)) ++ return true; ++ ++ /* Old device trees don't have the wp-inverted property. */ ++ return machine_is(mpc837x_rdb) || machine_is(mpc837x_mds); ++} ++ ++static int __devinit sdhci_of_probe(struct of_device *ofdev, ++ const struct of_device_id *match) ++{ ++ struct device_node *np = ofdev->node; ++ struct sdhci_quirk_data *sdhci_of_data = match->data; ++ struct sdhci_host *host; ++ struct sdhci_of_host *of_host; ++ const u32 *clk; ++ int size; ++ int ret; ++ ++ if (!of_device_is_available(np)) ++ return -ENODEV; ++ ++ host = sdhci_alloc_host(&ofdev->dev, sizeof(*of_host)); ++ if (IS_ERR(host)) ++ return -ENOMEM; ++ ++ of_host = sdhci_priv(host); ++ dev_set_drvdata(&ofdev->dev, host); ++ ++ host->ioaddr = of_iomap(np, 0); ++ if (!host->ioaddr) { ++ ret = -ENOMEM; ++ goto err_addr_map; ++ } ++ ++ host->irq = irq_of_parse_and_map(np, 0); ++ if (!host->irq) { ++ ret = -EINVAL; ++ goto err_no_irq; ++ } ++ ++ host->hw_name = dev_name(&ofdev->dev); ++ if (sdhci_of_data) { ++ host->quirks = sdhci_of_data->quirks; ++ host->ops = &sdhci_of_data->ops; ++ } ++ ++ if (of_get_property(np, "sdhci,1-bit-only", NULL)) ++ host->quirks |= SDHCI_QUIRK_FORCE_1_BIT_DATA; ++ ++ if (sdhci_of_wp_inverted(np)) ++ host->quirks |= SDHCI_QUIRK_INVERTED_WRITE_PROTECT; ++ ++ clk = of_get_property(np, "clock-frequency", &size); ++ if (clk && size == sizeof(*clk) && *clk) ++ of_host->clock = *clk; ++ ++ ret = sdhci_add_host(host); ++ if (ret) ++ goto err_add_host; ++ ++ return 0; ++ ++err_add_host: ++ irq_dispose_mapping(host->irq); ++err_no_irq: ++ iounmap(host->ioaddr); ++err_addr_map: ++ sdhci_free_host(host); ++ return ret; ++} ++ ++static int __devexit sdhci_of_remove(struct of_device *ofdev) ++{ ++ struct sdhci_host *host = dev_get_drvdata(&ofdev->dev); ++ ++ sdhci_remove_host(host, 0); ++ sdhci_free_host(host); ++ irq_dispose_mapping(host->irq); ++ iounmap(host->ioaddr); ++ return 0; ++} ++ ++static const struct of_device_id sdhci_of_match[] = { ++#ifdef CONFIG_MMC_SDHCI_OF_ESDHC ++ { .compatible = "fsl,mpc8379-esdhc", .data = &sdhci_esdhc, }, ++ { .compatible = "fsl,mpc8536-esdhc", .data = &sdhci_esdhc, }, ++ { .compatible = "fsl,esdhc", .data = &sdhci_esdhc, }, ++#endif ++#ifdef CONFIG_MMC_SDHCI_OF_HLWD ++ { .compatible = "nintendo,hollywood-sdhci", .data = &sdhci_hlwd, }, ++#endif ++ { .compatible = "generic-sdhci", }, ++ {}, ++}; ++MODULE_DEVICE_TABLE(of, sdhci_of_match); ++ ++static struct of_platform_driver sdhci_of_driver = { ++ .driver.name = "sdhci-of", ++ .match_table = sdhci_of_match, ++ .probe = sdhci_of_probe, ++ .remove = __devexit_p(sdhci_of_remove), ++ .suspend = sdhci_of_suspend, ++ .resume = sdhci_of_resume, ++}; ++ ++static int __init sdhci_of_init(void) ++{ ++ return of_register_platform_driver(&sdhci_of_driver); ++} ++module_init(sdhci_of_init); ++ ++static void __exit sdhci_of_exit(void) ++{ ++ of_unregister_platform_driver(&sdhci_of_driver); ++} ++module_exit(sdhci_of_exit); ++ ++MODULE_DESCRIPTION("Secure Digital Host Controller Interface OF driver"); ++MODULE_AUTHOR("Xiaobo Xie , " ++ "Anton Vorontsov "); ++MODULE_LICENSE("GPL"); +Index: drivers/mmc/host/sdhci-of-hlwd.c +=================================================================== +--- /dev/null ++++ drivers/mmc/host/sdhci-of-hlwd.c +@@ -0,0 +1,65 @@ ++/* ++ * drivers/mmc/host/sdhci-of-hlwd.c ++ * ++ * Nintendo Wii Secure Digital Host Controller Interface. ++ * Copyright (C) 2009 The GameCube Linux Team ++ * Copyright (C) 2009 Albert Herranz ++ * ++ * Based on sdhci-of-esdhc.c ++ * ++ * Copyright (c) 2007 Freescale Semiconductor, Inc. ++ * Copyright (c) 2009 MontaVista Software, Inc. ++ * ++ * Authors: Xiaobo Xie ++ * Anton Vorontsov ++ * ++ * 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. ++ */ ++ ++#include ++#include ++#include "sdhci-of.h" ++#include "sdhci.h" ++ ++/* ++ * Ops and quirks for the Nintendo Wii SDHCI controllers. ++ */ ++ ++/* ++ * We need a small delay after each write, or things go horribly wrong. ++ */ ++#define SDHCI_HLWD_WRITE_DELAY 5 /* usecs */ ++ ++static void sdhci_hlwd_writel(struct sdhci_host *host, u32 val, int reg) ++{ ++ sdhci_be32bs_writel(host, val, reg); ++ udelay(SDHCI_HLWD_WRITE_DELAY); ++} ++ ++static void sdhci_hlwd_writew(struct sdhci_host *host, u16 val, int reg) ++{ ++ sdhci_be32bs_writew(host, val, reg); ++ udelay(SDHCI_HLWD_WRITE_DELAY); ++} ++ ++static void sdhci_hlwd_writeb(struct sdhci_host *host, u8 val, int reg) ++{ ++ sdhci_be32bs_writeb(host, val, reg); ++ udelay(SDHCI_HLWD_WRITE_DELAY); ++} ++ ++struct sdhci_quirk_data sdhci_hlwd = { ++ .quirks = SDHCI_QUIRK_32BIT_DMA_ADDR | ++ SDHCI_QUIRK_32BIT_DMA_SIZE, ++ .ops = { ++ .readl = sdhci_be32bs_readl, ++ .readw = sdhci_be32bs_readw, ++ .readb = sdhci_be32bs_readb, ++ .writel = sdhci_hlwd_writel, ++ .writew = sdhci_hlwd_writew, ++ .writeb = sdhci_hlwd_writeb, ++ }, ++}; +Index: drivers/mmc/host/sdhci-of.h +=================================================================== +--- /dev/null ++++ drivers/mmc/host/sdhci-of.h +@@ -0,0 +1,37 @@ ++/* ++ * OpenFirmware bindings for Secure Digital Host Controller Interface. ++ * ++ * Copyright (c) 2007 Freescale Semiconductor, Inc. ++ * Copyright (c) 2009 MontaVista Software, Inc. ++ * ++ * Authors: Xiaobo Xie ++ * Anton Vorontsov ++ * ++ * 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. ++ */ ++ ++#ifndef __SDHCI_OF_H ++#define __SDHCI_OF_H ++ ++#include ++#include "sdhci.h" ++ ++struct sdhci_of_host { ++ unsigned int clock; ++ u16 xfer_mode_shadow; ++}; ++ ++extern u32 sdhci_be32bs_readl(struct sdhci_host *host, int reg); ++extern u16 sdhci_be32bs_readw(struct sdhci_host *host, int reg); ++extern u8 sdhci_be32bs_readb(struct sdhci_host *host, int reg); ++extern void sdhci_be32bs_writel(struct sdhci_host *host, u32 val, int reg); ++extern void sdhci_be32bs_writew(struct sdhci_host *host, u16 val, int reg); ++extern void sdhci_be32bs_writeb(struct sdhci_host *host, u8 val, int reg); ++ ++extern struct sdhci_quirk_data sdhci_esdhc; ++extern struct sdhci_quirk_data sdhci_hlwd; ++ ++#endif /* __SDHCI_OF_H */ +Index: drivers/mmc/host/sdhci-pltfm-core.c +=================================================================== +--- /dev/null ++++ drivers/mmc/host/sdhci-pltfm-core.c +@@ -0,0 +1,187 @@ ++/* ++ * sdhci-pltfm.c Support for SDHCI platform devices ++ * Copyright (c) 2009 Intel Corporation ++ * ++ * 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., 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++/* Supports: ++ * SDHCI platform devices ++ * ++ * Inspired by sdhci-pci.c, by Pierre Ossman ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "sdhci.h" ++#include "sdhci-of.h" ++ ++/*****************************************************************************\ ++ * * ++ * Device probing/removal * ++ * * ++\*****************************************************************************/ ++ ++static int __devinit sdhci_pltfm_probe(struct platform_device *pdev) ++{ ++ struct sdhci_host *host; ++ struct resource *iomem; ++ struct sdhci_of_host *of_host; ++ struct clk *clk; ++ int ret; ++ struct sdhci_quirk_data *quirk = (struct sdhci_quirk_data *) ++ platform_get_device_id(pdev)->driver_data; ++ ++ BUG_ON(pdev == NULL); ++ ++ iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ if (!iomem) { ++ ret = -ENOMEM; ++ goto err; ++ } ++ ++ if (resource_size(iomem) != 0x100) ++ dev_err(&pdev->dev, "Invalid iomem size. You may " ++ "experience problems.\n"); ++ ++ if (pdev->dev.parent) ++ host = sdhci_alloc_host(pdev->dev.parent, sizeof(struct sdhci_of_host)); ++ else ++ host = sdhci_alloc_host(&pdev->dev, sizeof(struct sdhci_of_host)); ++ ++ if (IS_ERR(host)) { ++ ret = PTR_ERR(host); ++ goto err; ++ } ++ ++ of_host = sdhci_priv(host); ++ dev_set_drvdata(&pdev->dev, host); ++ ++ host->hw_name = "platform"; ++ host->irq = platform_get_irq(pdev, 0); ++ ++ if (!request_mem_region(iomem->start, resource_size(iomem), ++ mmc_hostname(host->mmc))) { ++ dev_err(&pdev->dev, "cannot request region\n"); ++ ret = -EBUSY; ++ goto err_request; ++ } ++ ++ host->ioaddr = ioremap(iomem->start, resource_size(iomem)); ++ if (!host->ioaddr) { ++ dev_err(&pdev->dev, "failed to remap registers\n"); ++ ret = -ENOMEM; ++ goto err_remap; ++ } ++ ++ if (quirk) { ++ host->quirks = quirk->quirks; ++ host->ops = &quirk->ops; ++ } ++ ++ clk = clk_get(NULL, "sdhc"); ++ if (IS_ERR(clk)) { ++ dev_err(&pdev->dev, "clk err\n"); ++ return -ENODEV; ++ } ++ clk_enable(clk); ++ of_host->clock = clk_get_rate(clk); ++ ++ ret = sdhci_add_host(host); ++ if (ret) ++ goto err_add_host; ++ ++ platform_set_drvdata(pdev, host); ++ dev_info(&pdev->dev, "registered as %s\n", platform_get_device_id(pdev)->name); ++ ++ return 0; ++ ++err_add_host: ++ iounmap(host->ioaddr); ++err_remap: ++ release_mem_region(iomem->start, resource_size(iomem)); ++err_request: ++ sdhci_free_host(host); ++err: ++ printk(KERN_ERR"Probing of sdhci-pltfm failed: %d\n", ret); ++ return ret; ++} ++ ++static int __devexit sdhci_pltfm_remove(struct platform_device *pdev) ++{ ++ struct sdhci_host *host = platform_get_drvdata(pdev); ++ struct resource *iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0); ++ int dead; ++ u32 scratch; ++ ++ dead = 0; ++ scratch = readl(host->ioaddr + SDHCI_INT_STATUS); ++ if (scratch == (u32)-1) ++ dead = 1; ++ ++ sdhci_remove_host(host, dead); ++ iounmap(host->ioaddr); ++ release_mem_region(iomem->start, resource_size(iomem)); ++ sdhci_free_host(host); ++ platform_set_drvdata(pdev, NULL); ++ ++ return 0; ++} ++ ++static struct platform_device_id sdhci_id_table[] = { ++ { "sdhci", 0, }, ++#ifdef CONFIG_MMC_SDHCI_ESDHC ++ { "sdhci-esdhc", (kernel_ulong_t)&sdhci_esdhc, }, ++#endif ++ { }, ++}; ++MODULE_DEVICE_TABLE(platform, sdhci_id_table); ++ ++static struct platform_driver sdhci_pltfm_driver = { ++ .driver = { ++ .name = "sdhci", ++ .owner = THIS_MODULE, ++ }, ++ .probe = sdhci_pltfm_probe, ++ .remove = __devexit_p(sdhci_pltfm_remove), ++ .id_table = sdhci_id_table, ++}; ++ ++/*****************************************************************************\ ++ * * ++ * Driver init/exit * ++ * * ++\*****************************************************************************/ ++ ++static int __init sdhci_drv_init(void) ++{ ++ return platform_driver_register(&sdhci_pltfm_driver); ++} ++ ++static void __exit sdhci_drv_exit(void) ++{ ++ platform_driver_unregister(&sdhci_pltfm_driver); ++} ++ ++module_init(sdhci_drv_init); ++module_exit(sdhci_drv_exit); ++ ++MODULE_DESCRIPTION("Secure Digital Host Controller Interface platform driver"); ++MODULE_AUTHOR("Mocean Laboratories "); ++MODULE_LICENSE("GPL v2"); +Index: drivers/mmc/host/sdhci.c +=================================================================== +--- drivers/mmc/host/sdhci.c.orig ++++ drivers/mmc/host/sdhci.c +@@ -58,7 +58,7 @@ static void sdhci_dumpregs(struct sdhci_ + sdhci_readw(host, SDHCI_TRANSFER_MODE)); + printk(KERN_DEBUG DRIVER_NAME ": Present: 0x%08x | Host ctl: 0x%08x\n", + sdhci_readl(host, SDHCI_PRESENT_STATE), +- sdhci_readb(host, SDHCI_HOST_CONTROL)); ++ sdhci_readl(host, SDHCI_HOST_CONTROL)); + printk(KERN_DEBUG DRIVER_NAME ": Power: 0x%08x | Blk gap: 0x%08x\n", + sdhci_readb(host, SDHCI_POWER_CONTROL), + sdhci_readb(host, SDHCI_BLOCK_GAP_CONTROL)); +@@ -591,6 +591,9 @@ static u8 sdhci_calc_timeout(struct sdhc + target_timeout = data->timeout_ns / 1000 + + data->timeout_clks / host->clock; + ++ if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK) ++ host->timeout_clk = host->clock / 1000; ++ + /* + * Figure out needed cycles. + * We do this in steps in order to fit inside a 32 bit int. +@@ -652,7 +655,7 @@ static void sdhci_prepare_data(struct sd + count = sdhci_calc_timeout(host, data); + sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL); + +- if (host->flags & SDHCI_USE_DMA) ++ if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) + host->flags |= SDHCI_REQ_USE_DMA; + + /* +@@ -991,8 +994,8 @@ static void sdhci_set_clock(struct sdhci + clk |= SDHCI_CLOCK_INT_EN; + sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); + +- /* Wait max 10 ms */ +- timeout = 10; ++ /* Wait max 20 ms */ ++ timeout = 20; + while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL)) + & SDHCI_CLOCK_INT_STABLE)) { + if (timeout == 0) { +@@ -1597,7 +1600,7 @@ int sdhci_resume_host(struct sdhci_host + { + int ret; + +- if (host->flags & SDHCI_USE_DMA) { ++ if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) { + if (host->ops->enable_dma) + host->ops->enable_dma(host); + } +@@ -1678,23 +1681,20 @@ int sdhci_add_host(struct sdhci_host *ho + caps = sdhci_readl(host, SDHCI_CAPABILITIES); + + if (host->quirks & SDHCI_QUIRK_FORCE_DMA) +- host->flags |= SDHCI_USE_DMA; +- else if (!(caps & SDHCI_CAN_DO_DMA)) +- DBG("Controller doesn't have DMA capability\n"); ++ host->flags |= SDHCI_USE_SDMA; ++ else if (!(caps & SDHCI_CAN_DO_SDMA)) ++ DBG("Controller doesn't have SDMA capability\n"); + else +- host->flags |= SDHCI_USE_DMA; ++ host->flags |= SDHCI_USE_SDMA; + + if ((host->quirks & SDHCI_QUIRK_BROKEN_DMA) && +- (host->flags & SDHCI_USE_DMA)) { ++ (host->flags & SDHCI_USE_SDMA)) { + DBG("Disabling DMA as it is marked broken\n"); +- host->flags &= ~SDHCI_USE_DMA; ++ host->flags &= ~SDHCI_USE_SDMA; + } + +- if (host->flags & SDHCI_USE_DMA) { +- if ((host->version >= SDHCI_SPEC_200) && +- (caps & SDHCI_CAN_DO_ADMA2)) +- host->flags |= SDHCI_USE_ADMA; +- } ++ if ((host->version >= SDHCI_SPEC_200) && (caps & SDHCI_CAN_DO_ADMA2)) ++ host->flags |= SDHCI_USE_ADMA; + + if ((host->quirks & SDHCI_QUIRK_BROKEN_ADMA) && + (host->flags & SDHCI_USE_ADMA)) { +@@ -1702,13 +1702,14 @@ int sdhci_add_host(struct sdhci_host *ho + host->flags &= ~SDHCI_USE_ADMA; + } + +- if (host->flags & SDHCI_USE_DMA) { ++ if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) { + if (host->ops->enable_dma) { + if (host->ops->enable_dma(host)) { + printk(KERN_WARNING "%s: No suitable DMA " + "available. Falling back to PIO.\n", + mmc_hostname(mmc)); +- host->flags &= ~(SDHCI_USE_DMA | SDHCI_USE_ADMA); ++ host->flags &= ++ ~(SDHCI_USE_SDMA | SDHCI_USE_ADMA); + } + } + } +@@ -1736,7 +1737,7 @@ int sdhci_add_host(struct sdhci_host *ho + * mask, but PIO does not need the hw shim so we set a new + * mask here in that case. + */ +- if (!(host->flags & SDHCI_USE_DMA)) { ++ if (!(host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA))) { + host->dma_mask = DMA_BIT_MASK(64); + mmc_dev(host->mmc)->dma_mask = &host->dma_mask; + } +@@ -1757,13 +1758,15 @@ int sdhci_add_host(struct sdhci_host *ho + host->timeout_clk = + (caps & SDHCI_TIMEOUT_CLK_MASK) >> SDHCI_TIMEOUT_CLK_SHIFT; + if (host->timeout_clk == 0) { +- if (!host->ops->get_timeout_clock) { ++ if (host->ops->get_timeout_clock) { ++ host->timeout_clk = host->ops->get_timeout_clock(host); ++ } else if (!(host->quirks & ++ SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)) { + printk(KERN_ERR + "%s: Hardware doesn't specify timeout clock " + "frequency.\n", mmc_hostname(mmc)); + return -ENODEV; + } +- host->timeout_clk = host->ops->get_timeout_clock(host); + } + if (caps & SDHCI_TIMEOUT_CLK_UNIT) + host->timeout_clk *= 1000; +@@ -1772,7 +1775,8 @@ int sdhci_add_host(struct sdhci_host *ho + * Set host parameters. + */ + mmc->ops = &sdhci_ops; +- if (host->ops->get_min_clock) ++ if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK && ++ host->ops->set_clock && host->ops->get_min_clock) + mmc->f_min = host->ops->get_min_clock(host); + else + mmc->f_min = host->max_clk / 256; +@@ -1810,7 +1814,7 @@ int sdhci_add_host(struct sdhci_host *ho + */ + if (host->flags & SDHCI_USE_ADMA) + mmc->max_hw_segs = 128; +- else if (host->flags & SDHCI_USE_DMA) ++ else if (host->flags & SDHCI_USE_SDMA) + mmc->max_hw_segs = 1; + else /* PIO */ + mmc->max_hw_segs = 128; +@@ -1893,10 +1897,10 @@ int sdhci_add_host(struct sdhci_host *ho + + mmc_add_host(mmc); + +- printk(KERN_INFO "%s: SDHCI controller on %s [%s] using %s%s\n", ++ printk(KERN_INFO "%s: SDHCI controller on %s [%s] using %s\n", + mmc_hostname(mmc), host->hw_name, dev_name(mmc_dev(mmc)), +- (host->flags & SDHCI_USE_ADMA)?"A":"", +- (host->flags & SDHCI_USE_DMA)?"DMA":"PIO"); ++ (host->flags & SDHCI_USE_ADMA) ? "ADMA" : ++ (host->flags & SDHCI_USE_SDMA) ? "DMA" : "PIO"); + + sdhci_enable_card_detection(host); + +Index: drivers/mmc/host/sdhci.h +=================================================================== +--- drivers/mmc/host/sdhci.h.orig ++++ drivers/mmc/host/sdhci.h +@@ -8,6 +8,8 @@ + * the Free Software Foundation; either version 2 of the License, or (at + * your option) any later version. + */ ++#ifndef __SDHCI_H ++#define __SDHCI_H + + #include + #include +@@ -143,7 +145,7 @@ + #define SDHCI_CAN_DO_ADMA2 0x00080000 + #define SDHCI_CAN_DO_ADMA1 0x00100000 + #define SDHCI_CAN_DO_HISPD 0x00200000 +-#define SDHCI_CAN_DO_DMA 0x00400000 ++#define SDHCI_CAN_DO_SDMA 0x00400000 + #define SDHCI_CAN_VDD_330 0x01000000 + #define SDHCI_CAN_VDD_300 0x02000000 + #define SDHCI_CAN_VDD_180 0x04000000 +@@ -232,6 +234,8 @@ struct sdhci_host { + #define SDHCI_QUIRK_FORCE_1_BIT_DATA (1<<22) + /* Controller needs 10ms delay between applying power and clock */ + #define SDHCI_QUIRK_DELAY_AFTER_POWER (1<<23) ++/* Controller uses SDCLK instead of TMCLK for data timeouts */ ++#define SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK (1<<24) + + int irq; /* Device IRQ */ + void __iomem * ioaddr; /* Mapped address */ +@@ -250,7 +254,7 @@ struct sdhci_host { + spinlock_t lock; /* Mutex */ + + int flags; /* Host attributes */ +-#define SDHCI_USE_DMA (1<<0) /* Host is DMA capable */ ++#define SDHCI_USE_SDMA (1<<0) /* Host is SDMA capable */ + #define SDHCI_USE_ADMA (1<<1) /* Host is ADMA capable */ + #define SDHCI_REQ_USE_DMA (1<<2) /* Use DMA for this req. */ + #define SDHCI_DEVICE_DEAD (1<<3) /* Device unresponsive */ +@@ -290,12 +294,12 @@ struct sdhci_host { + + struct sdhci_ops { + #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS +- u32 (*readl)(struct sdhci_host *host, int reg); +- u16 (*readw)(struct sdhci_host *host, int reg); +- u8 (*readb)(struct sdhci_host *host, int reg); +- void (*writel)(struct sdhci_host *host, u32 val, int reg); +- void (*writew)(struct sdhci_host *host, u16 val, int reg); +- void (*writeb)(struct sdhci_host *host, u8 val, int reg); ++ u32 (*custom_readl)(struct sdhci_host *host, int reg); ++ u16 (*custom_readw)(struct sdhci_host *host, int reg); ++ u8 (*custom_readb)(struct sdhci_host *host, int reg); ++ void (*custom_writel)(struct sdhci_host *host, u32 val, int reg); ++ void (*custom_writew)(struct sdhci_host *host, u16 val, int reg); ++ void (*custom_writeb)(struct sdhci_host *host, u8 val, int reg); + #endif + + void (*set_clock)(struct sdhci_host *host, unsigned int clock); +@@ -310,48 +314,48 @@ struct sdhci_ops { + + static inline void sdhci_writel(struct sdhci_host *host, u32 val, int reg) + { +- if (unlikely(host->ops->writel)) +- host->ops->writel(host, val, reg); ++ if (unlikely(host->ops->custom_writel)) ++ host->ops->custom_writel(host, val, reg); + else + writel(val, host->ioaddr + reg); + } + + static inline void sdhci_writew(struct sdhci_host *host, u16 val, int reg) + { +- if (unlikely(host->ops->writew)) +- host->ops->writew(host, val, reg); ++ if (unlikely(host->ops->custom_writew)) ++ host->ops->custom_writew(host, val, reg); + else + writew(val, host->ioaddr + reg); + } + + static inline void sdhci_writeb(struct sdhci_host *host, u8 val, int reg) + { +- if (unlikely(host->ops->writeb)) +- host->ops->writeb(host, val, reg); ++ if (unlikely(host->ops->custom_writeb)) ++ host->ops->custom_writeb(host, val, reg); + else + writeb(val, host->ioaddr + reg); + } + + static inline u32 sdhci_readl(struct sdhci_host *host, int reg) + { +- if (unlikely(host->ops->readl)) +- return host->ops->readl(host, reg); ++ if (unlikely(host->ops->custom_readl)) ++ return host->ops->custom_readl(host, reg); + else + return readl(host->ioaddr + reg); + } + + static inline u16 sdhci_readw(struct sdhci_host *host, int reg) + { +- if (unlikely(host->ops->readw)) +- return host->ops->readw(host, reg); ++ if (unlikely(host->ops->custom_readw)) ++ return host->ops->custom_readw(host, reg); + else + return readw(host->ioaddr + reg); + } + + static inline u8 sdhci_readb(struct sdhci_host *host, int reg) + { +- if (unlikely(host->ops->readb)) +- return host->ops->readb(host, reg); ++ if (unlikely(host->ops->custom_readb)) ++ return host->ops->custom_readb(host, reg); + else + return readb(host->ioaddr + reg); + } +@@ -390,6 +394,11 @@ static inline u8 sdhci_readb(struct sdhc + + #endif /* CONFIG_MMC_SDHCI_IO_ACCESSORS */ + ++struct sdhci_quirk_data { ++ unsigned int quirks; ++ struct sdhci_ops ops; ++}; ++ + extern struct sdhci_host *sdhci_alloc_host(struct device *dev, + size_t priv_size); + extern void sdhci_free_host(struct sdhci_host *host); +@@ -406,3 +415,5 @@ extern void sdhci_remove_host(struct sdh + extern int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state); + extern int sdhci_resume_host(struct sdhci_host *host); + #endif ++ ++#endif /* __SDHCI_H */ +Index: arch/arm/mach-mx3/pcm043.c +=================================================================== +--- arch/arm/mach-mx3/pcm043.c.orig ++++ arch/arm/mach-mx3/pcm043.c +@@ -279,6 +279,34 @@ static struct pad_desc pcm043_pads[] = { + MX35_PAD_SD2_DATA1__GPIO2_3, + MX35_PAD_TX5_RX0__CAN2_TXCAN, + MX35_PAD_TX4_RX1__CAN2_RXCAN, ++ /* esdhc */ ++ MX35_PAD_SD1_CMD__ESDHC1_CMD, ++ MX35_PAD_SD1_CLK__ESDHC1_CLK, ++ MX35_PAD_SD1_DATA0__ESDHC1_DAT0, ++ MX35_PAD_SD1_DATA1__ESDHC1_DAT1, ++ MX35_PAD_SD1_DATA2__ESDHC1_DAT2, ++ MX35_PAD_SD1_DATA3__ESDHC1_DAT3, ++}; ++ ++#include ++ ++static struct resource sdhci_resources[] = { ++ { ++ .start = 0x53fb4000, ++ .end = 0x53fb4000 + 0xff, ++ .flags = IORESOURCE_MEM, ++ }, { ++ .start = MX35_INT_MMC_SDHC1, ++ .end = MX35_INT_MMC_SDHC1, ++ .flags = IORESOURCE_IRQ, ++ }, ++}; ++ ++static struct platform_device sdhci_device = { ++ .name = "sdhci-esdhc", ++ .id = 0, ++ .num_resources = ARRAY_SIZE(sdhci_resources), ++ .resource = sdhci_resources, + }; + + static int pcm043_usbh1_init(struct platform_device *pdev) +@@ -516,6 +544,8 @@ static void __init mxc_board_init(void) + gpio_request (32 + 3, "can"); + gpio_direction_output (32 + 3, 1); + gpio_set_value (32 + 3, 1); ++ ++ platform_device_register(&sdhci_device); + } + + static void __init pcm043_timer_init(void) diff --git a/recipes/linux/linux-2.6.31/pcm043/fix_can.patch b/recipes/linux/linux-2.6.31/pcm043/fix_can.patch new file mode 100644 index 0000000000..c8ca166f99 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/fix_can.patch @@ -0,0 +1,16 @@ +Fix problem with send and recive of can packets. + +Signed-off-by: Teresa Gámez +--- +Index: linux-2.6.31.6/drivers/net/can/flexcan/drv.c +=================================================================== +--- linux-2.6.31.6.orig/drivers/net/can/flexcan/drv.c 2010-09-16 14:35:16.596367462 +0200 ++++ linux-2.6.31.6/drivers/net/can/flexcan/drv.c 2010-09-16 14:36:07.946447792 +0200 +@@ -136,7 +136,6 @@ + reg &= ~__MCR_AEN; + + reg |= (flexcan->maxmb << __MCR_MAX_MB_OFFSET); +- reg |= __MCR_DOZE | __MCR_MAX_IDAM_C; + __raw_writel(reg, flexcan->io_base + CAN_HW_REG_MCR); + } + diff --git a/recipes/linux/linux-2.6.31/pcm043/fix_clock_calc.patch b/recipes/linux/linux-2.6.31/pcm043/fix_clock_calc.patch new file mode 100644 index 0000000000..244ab06565 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/fix_clock_calc.patch @@ -0,0 +1,27 @@ +Fix claculation, if "ARM sel" is set a 532Mhz PLL result to a 399MHz ARM clock +Also th AHB clock is based on this ARM clock + +Signed-off-by: Jan Weitzel +--- +Index: linux-2.6.31.6/arch/arm/mach-mx3/clock-imx35.c +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/mach-mx3/clock-imx35.c 2009-12-15 13:15:35.335242329 +0100 ++++ linux-2.6.31.6/arch/arm/mach-mx3/clock-imx35.c 2009-12-15 13:17:59.496030198 +0100 +@@ -155,7 +155,7 @@ + + aad = &clk_consumer[(pdr0 >> 16) & 0xf]; + if (aad->sel) +- fref = fref * 2 / 3; ++ fref = fref * 3 / 4; + + return fref / aad->arm; + } +@@ -164,7 +164,7 @@ + { + unsigned long pdr0 = __raw_readl(CCM_BASE + CCM_PDR0); + struct arm_ahb_div *aad; +- unsigned long fref = get_rate_mpll(); ++ unsigned long fref = get_rate_arm(); + + aad = &clk_consumer[(pdr0 >> 16) & 0xf]; + diff --git a/recipes/linux/linux-2.6.31/pcm043/fix_max7301.patch b/recipes/linux/linux-2.6.31/pcm043/fix_max7301.patch new file mode 100644 index 0000000000..a6854e1feb --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/fix_max7301.patch @@ -0,0 +1,28 @@ +Fix wrong setting of portconfig register. +mask size is 2bits, so shift must be twice offset +direction input value is 2 + +Signed-off-by: Jan Weitzel +--- +Index: linux-2.6.28/drivers/gpio/max7301.c +=================================================================== +--- linux-2.6.28.orig/drivers/gpio/max7301.c ++++ linux-2.6.28/drivers/gpio/max7301.c +@@ -123,7 +123,7 @@ static int max7301_direction_input(struc + + /* Standard GPIO API doesn't support pull-ups, has to be extended. + * Hard-coding no pollup for now. */ +- *config = (*config & ~(3 << (offset & 3))) | (1 << (offset & 3)); ++ *config = (*config & ~(3 << (2*(offset & 3)))) | (2 << (2*(offset & 3))); + + ret = max7301_write(ts->spi, 0x08 + (offset >> 2), *config); + +@@ -157,7 +157,7 @@ static int max7301_direction_output(stru + + mutex_lock(&ts->lock); + +- *config = (*config & ~(3 << (offset & 3))) | (1 << (offset & 3)); ++ *config = (*config & ~(3 << (2*(offset & 3)))) | (1 << (2*(offset & 3))); + + ret = __max7301_set(ts, offset, value); + diff --git a/recipes/linux/linux-2.6.31/pcm043/fix_mmc_for_highspeed.diff b/recipes/linux/linux-2.6.31/pcm043/fix_mmc_for_highspeed.diff new file mode 100644 index 0000000000..2f1834b038 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/fix_mmc_for_highspeed.diff @@ -0,0 +1,63 @@ +From: Wolfram Sang +Subject: fix esdhc-WIP for highspeed-cards + +Freescale has really messed up the control register, so we have to take care +the SDHCI-core does not accidently set standard bits which have a different +meaning here :( Previously highspeed (not necessarily HC) cards caused +a wrong bus-width setting. + +Also, mark the ADMA-engine as broken because FSL themselves don't know yet if +it is really working. Shouldn't harm much as MX35 has just ADMA1 anyway. + +Furthermore, disable multi-block accesses. This might affect the throughput, +but this part seems to be broken, too, according to the errata. We better play +safe here, it really helps with some cards. + +Signed-off-by: Wolfram Sang +--- + drivers/mmc/host/sdhci-esdhc.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +Index: linux-2.6.31.6/drivers/mmc/host/sdhci-esdhc.c +=================================================================== +--- linux-2.6.31.6.orig/drivers/mmc/host/sdhci-esdhc.c 2010-09-13 11:13:43.476519017 +0200 ++++ linux-2.6.31.6/drivers/mmc/host/sdhci-esdhc.c 2010-09-13 11:13:43.496492387 +0200 +@@ -34,6 +34,7 @@ + #define ESDHC_CLOCK_HCKEN 0x00000002 + #define ESDHC_CLOCK_IPGEN 0x00000001 + ++#define ESDHC_HOST_CONTROL_LE 0x20 + #define ESDHC_HOST_CONTROL_RES 0x05 + + #ifdef CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER +@@ -127,8 +128,10 @@ + /* FSL put the DMA bits there, so skip :( */ + return; + case SDHCI_HOST_CONTROL: +- val &= 0x07; +- val |= 0x20; ++ /* FSL really messed up here, so we can just keep those */ ++ val &= SDHCI_CTRL_LED | SDHCI_CTRL_4BITBUS; ++ /* and ensure the endianess */ ++ val |= ESDHC_HOST_CONTROL_LE; + break; + } + esdhc_clrset_le(host, 0xff, val, reg); +@@ -163,7 +166,7 @@ + + temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL); + temp |= (ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN | ESDHC_CLOCK_PEREN | +- div << ESDHC_DIVIDER_SHIFT | pre_div << ESDHC_PREDIV_SHIFT); ++ (div << ESDHC_DIVIDER_SHIFT) | (pre_div << ESDHC_PREDIV_SHIFT)); + sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL); + mdelay(100); + out: +@@ -193,6 +196,8 @@ + SDHCI_QUIRK_PIO_NEEDS_DELAY | + SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET | + SDHCI_QUIRK_BROKEN_TIMEOUT_VAL | ++ SDHCI_QUIRK_NO_MULTIBLOCK | ++ SDHCI_QUIRK_BROKEN_ADMA | + SDHCI_QUIRK_NO_CARD_NO_RESET, + .ops = { + #ifdef CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER diff --git a/recipes/linux/linux-2.6.31/pcm043/fix_oob_layout.diff b/recipes/linux/linux-2.6.31/pcm043/fix_oob_layout.diff new file mode 100644 index 0000000000..d8e1b1d22f --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/fix_oob_layout.diff @@ -0,0 +1,67 @@ +--- + drivers/mtd/nand/mxc_nand_v2.c | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +Index: drivers/mtd/nand/mxc_nand_v2.c +=================================================================== +--- drivers/mtd/nand/mxc_nand_v2.c.orig ++++ drivers/mtd/nand/mxc_nand_v2.c +@@ -1,6 +1,7 @@ + /* + * Copyright 2004-2008 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2009 Sascha Hauer, kernel@pengutronix.de ++ * Copyright 2009 Juergen Beisert, kernel@pengutronix.de + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License +@@ -130,6 +131,19 @@ struct mxc_nand_host { + * User ECC + * + * For pages larger than 512 bytes, n structures of this type will be used. ++ * ++ * Bad block detection: ++ * As long we do not overwrite the badblock_pattern structure member, the ++ * framework will use the description 'smallpage_flashbased' in file ++ * nand_bbt.c for page sizes with 512 bytes and description ++ * 'largepage_flashbased' in the same file for page sizes larger than ++ * 512 bytes. ++ * ++ * 'smallpage_flashbased' describes the bad block marker in the byte at offset ++ * five, 'largepage_flashbased' describes theses markers at offset 0 and 1 ++ * in the OOB. ++ * ++ * So, we must keep these bytes free for bad block marker usage. + */ + + /* OOB description for 512 byte pages with 16 byte OOB */ +@@ -139,7 +153,9 @@ static struct nand_ecclayout nand_hw_ecc + 7, 8, 9, 10, 11, 12, 13, 14, 15 + }, + .oobfree = { +- {.offset = 0, .length = 7} ++ {.offset = 0, .length = 5}, ++ /* keep offset 5 free for bad block marker usage */ ++ {.offset = 6, .length = 1} + } + }; + +@@ -153,7 +169,8 @@ static struct nand_ecclayout nand_hw_ecc + 55, 56, 57, 58, 59, 60, 61, 62, 63 + }, + .oobfree = { +- {.offset = 0, .length = 7}, ++ /* keep offset 0,1 free for bad block marker usage */ ++ {.offset = 2, .length = 5}, + {.offset = 16, .length = 7}, + {.offset = 32, .length = 7}, + {.offset = 48, .length = 7} +@@ -175,7 +192,8 @@ static struct nand_ecclayout nand_hw_ecc + /* 119, 120, 121, 122, 123, 124, 125, 126, 127 */ + }, + .oobfree = { +- {.offset = 0, .length = 7}, ++ /* keep offset 0,1 free for bad block marker usage */ ++ {.offset = 2, .length = 5}, + {.offset = 16, .length = 7}, + {.offset = 32, .length = 7}, + {.offset = 48, .length = 7}, diff --git a/recipes/linux/linux-2.6.31/pcm043/fix_owire_clk.patch b/recipes/linux/linux-2.6.31/pcm043/fix_owire_clk.patch new file mode 100644 index 0000000000..4d50ab4739 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/fix_owire_clk.patch @@ -0,0 +1,17 @@ +Fix the owire_clk dev_id + +Signed-off-by: Jan Weitzel +--- +Index: linux-2.6.31.6/arch/arm/mach-mx3/clock-imx35.c +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/mach-mx3/clock-imx35.c 2009-12-14 16:50:18.915973719 +0100 ++++ linux-2.6.31.6/arch/arm/mach-mx3/clock-imx35.c 2009-12-14 16:51:06.835549332 +0100 +@@ -453,7 +453,7 @@ + _REGISTER_CLOCK(NULL, "kpp", kpp_clk) + _REGISTER_CLOCK(NULL, "mlb", mlb_clk) + _REGISTER_CLOCK(NULL, "mshc", mshc_clk) +- _REGISTER_CLOCK("mxc_w1", NULL, owire_clk) ++ _REGISTER_CLOCK("mxc_w1.0", NULL, owire_clk) + _REGISTER_CLOCK(NULL, "pwm", pwm_clk) + _REGISTER_CLOCK(NULL, "rngc", rngc_clk) + _REGISTER_CLOCK(NULL, "rtc", rtc_clk) diff --git a/recipes/linux/linux-2.6.31/pcm043/linux-2.6.31.6-flexcan.patch b/recipes/linux/linux-2.6.31/pcm043/linux-2.6.31.6-flexcan.patch new file mode 100644 index 0000000000..a3c37cb8e2 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/linux-2.6.31.6-flexcan.patch @@ -0,0 +1,2168 @@ +Add support for i.MX35 on-board CAN +Signed-off-by: Sven Dyroff +--- +Index: linux-2.6.31.6/drivers/net/can/flexcan/Makefile +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.31.6/drivers/net/can/flexcan/Makefile 2009-12-16 17:34:40.585687608 +0100 +@@ -0,0 +1,3 @@ ++obj-$(CONFIG_CAN_FLEXCAN) += flexcan.o ++ ++flexcan-y := dev.o drv.o mbm.o +Index: linux-2.6.31.6/drivers/net/can/flexcan/dev.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.31.6/drivers/net/can/flexcan/dev.c 2009-12-16 17:34:40.585687608 +0100 +@@ -0,0 +1,675 @@ ++/* ++ * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved. ++ */ ++ ++/* ++ * The code contained herein is licensed under the GNU General Public ++ * License. You may obtain a copy of the GNU General Public License ++ * Version 2 or later at the following locations: ++ * ++ * http://www.opensource.org/licenses/gpl-license.html ++ * http://www.gnu.org/copyleft/gpl.html ++ */ ++ ++/*! ++ * @file dev.c ++ * ++ * @brief Driver for Freescale CAN Controller FlexCAN. ++ * ++ * @ingroup can ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include "flexcan.h" ++ ++enum { ++// FLEXCAN_ATTR_STATE = 0, ++// FLEXCAN_ATTR_BITRATE, ++// FLEXCAN_ATTR_BR_PRESDIV, ++// FLEXCAN_ATTR_BR_RJW, ++// FLEXCAN_ATTR_BR_PROPSEG, ~~~~~sven~~~~~ ++// FLEXCAN_ATTR_BR_PSEG1, ++// FLEXCAN_ATTR_BR_PSEG2, ++ FLEXCAN_ATTR_BR_CLKSRC = 0, ++ FLEXCAN_ATTR_MAXMB, ++ FLEXCAN_ATTR_XMIT_MAXMB, ++ FLEXCAN_ATTR_FIFO, ++ FLEXCAN_ATTR_WAKEUP, ++ FLEXCAN_ATTR_SRX_DIS, ++ FLEXCAN_ATTR_WAK_SRC, ++ FLEXCAN_ATTR_BCC, ++ FLEXCAN_ATTR_LOCAL_PRIORITY, ++ FLEXCAN_ATTR_ABORT, ++ FLEXCAN_ATTR_LOOPBACK, ++ FLEXCAN_ATTR_SMP, ++ FLEXCAN_ATTR_BOFF_REC, ++ FLEXCAN_ATTR_TSYN, ++ FLEXCAN_ATTR_LISTEN, ++ FLEXCAN_ATTR_EXTEND_MSG, ++ FLEXCAN_ATTR_STANDARD_MSG, ++#ifdef CONFIG_CAN_DEBUG_DEVICES ++ FLEXCAN_ATTR_DUMP_REG, ++ FLEXCAN_ATTR_DUMP_XMIT_MB, ++ FLEXCAN_ATTR_DUMP_RX_MB, ++#endif ++ FLEXCAN_ATTR_MAX ++}; ++ ++static ssize_t flexcan_show_attr(struct device *dev, ++ struct device_attribute *attr, char *buf); ++static ssize_t flexcan_set_attr(struct device *dev, ++ struct device_attribute *attr, const char *buf, ++ size_t count); ++ ++static struct device_attribute flexcan_dev_attr[FLEXCAN_ATTR_MAX] = { ++/* ~~~~~sven~~~~~ ++ [FLEXCAN_ATTR_STATE] = __ATTR(state, 0444, flexcan_show_attr, NULL), ++ [FLEXCAN_ATTR_BITRATE] = ++ __ATTR(bitrate, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_BR_PRESDIV] = ++ __ATTR(br_presdiv, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_BR_RJW] = ++ __ATTR(br_rjw, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_BR_PROPSEG] = ++ __ATTR(br_propseg, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_BR_PSEG1] = ++ __ATTR(br_pseg1, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_BR_PSEG2] = ++ __ATTR(br_pseg2, 0644, flexcan_show_attr, flexcan_set_attr), ++*/ ++ [FLEXCAN_ATTR_BR_CLKSRC] = ++ __ATTR(br_clksrc, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_MAXMB] = ++ __ATTR(maxmb, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_XMIT_MAXMB] = ++ __ATTR(xmit_maxmb, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_FIFO] = ++ __ATTR(fifo, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_WAKEUP] = ++ __ATTR(wakeup, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_SRX_DIS] = ++ __ATTR(srx_dis, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_WAK_SRC] = ++ __ATTR(wak_src, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_BCC] = ++ __ATTR(bcc, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_LOCAL_PRIORITY] = ++ __ATTR(local_priority, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_ABORT] = ++ __ATTR(abort, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_LOOPBACK] = ++ __ATTR(loopback, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_SMP] = ++ __ATTR(smp, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_BOFF_REC] = ++ __ATTR(boff_rec, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_TSYN] = ++ __ATTR(tsyn, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_LISTEN] = ++ __ATTR(listen, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_EXTEND_MSG] = ++ __ATTR(ext_msg, 0644, flexcan_show_attr, flexcan_set_attr), ++ [FLEXCAN_ATTR_STANDARD_MSG] = ++ __ATTR(std_msg, 0644, flexcan_show_attr, flexcan_set_attr), ++#ifdef CONFIG_CAN_DEBUG_DEVICES ++ [FLEXCAN_ATTR_DUMP_REG] = ++ __ATTR(dump_reg, 0444, flexcan_show_attr, NULL), ++ [FLEXCAN_ATTR_DUMP_XMIT_MB] = ++ __ATTR(dump_xmit_mb, 0444, flexcan_show_attr, NULL), ++ [FLEXCAN_ATTR_DUMP_RX_MB] = ++ __ATTR(dump_rx_mb, 0444, flexcan_show_attr, NULL), ++#endif ++}; ++ ++//~~~~~~~~~~~~~~sven~~~~~~~~~~~~~~~~ ++// static void flexcan_set_bitrate (struct flexcan_device *flexcan, int bitrate) { ++ /* TODO:: implement in future ++ * based on the bitrate to get the timing of ++ * presdiv, pseg1, pseg2, propseg ++ */ ++//} ++/* ++static void flexcan_update_bitrate (struct flexcan_device *flexcan) { ++ struct can_priv *priv = (can_priv *) flexcan; ++ struct can_bittiming *bt = &priv -> bittiming; ++ ++ int rate, div; ++ ++ if (flexcan -> br_clksrc) ++ rate = clk_get_rate (flexcan -> clk); ++ else { ++ struct clk *clk; ++ clk = clk_get (NULL, "ckih"); ++ if (!clk) ++ return; ++ rate = clk_get_rate (clk); ++ clk_put (clk); ++ } ++ if (!rate) ++ return; ++ ++ div = (bt -> tq + 1); ++ div *= (bt -> prop_seg + bt -> phase_seg1 + bt -> phase_seg2 + 4); ++ bt -> bitrate = (rate + div - 1) / div; ++} ++*/ ++//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++ ++#ifdef CONFIG_CAN_DEBUG_DEVICES ++static int flexcan_dump_reg(struct flexcan_device *flexcan, char *buf) ++{ ++ int ret = 0; ++ unsigned int reg; ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_MCR); ++ ret += sprintf(buf + ret, "MCR::0x%x\n", reg); ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_CTRL); ++ ret += sprintf(buf + ret, "CTRL::0x%x\n", reg); ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_RXGMASK); ++ ret += sprintf(buf + ret, "RXGMASK::0x%x\n", reg); ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_RX14MASK); ++ ret += sprintf(buf + ret, "RX14MASK::0x%x\n", reg); ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_RX15MASK); ++ ret += sprintf(buf + ret, "RX15MASK::0x%x\n", reg); ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_ECR); ++ ret += sprintf(buf + ret, "ECR::0x%x\n", reg); ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_ESR); ++ ret += sprintf(buf + ret, "ESR::0x%x\n", reg); ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_IMASK2); ++ ret += sprintf(buf + ret, "IMASK2::0x%x\n", reg); ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_IMASK1); ++ ret += sprintf(buf + ret, "IMASK1::0x%x\n", reg); ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_IFLAG2); ++ ret += sprintf(buf + ret, "IFLAG2::0x%x\n", reg); ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_IFLAG1); ++ ret += sprintf(buf + ret, "IFLAG1::0x%x\n", reg); ++ return ret; ++} ++ ++static int flexcan_dump_xmit_mb(struct flexcan_device *flexcan, char *buf) ++{ ++ int ret = 0, i; ++ i = flexcan->xmit_maxmb + 1; ++ for (; i <= flexcan->maxmb; i++) ++ ret += ++ sprintf(buf + ret, ++ "mb[%d]::CS:0x%x ID:0x%x DATA[1~2]:0x%02x,0x%02x\n", ++ i, flexcan->hwmb[i].mb_cs.data, ++ flexcan->hwmb[i].mb_id, flexcan->hwmb[i].mb_data[1], ++ flexcan->hwmb[i].mb_data[2]); ++ return ret; ++} ++ ++static int flexcan_dump_rx_mb(struct flexcan_device *flexcan, char *buf) ++{ ++ int ret = 0, i; ++ for (i = 0; i <= flexcan->xmit_maxmb; i++) ++ ret += ++ sprintf(buf + ret, ++ "mb[%d]::CS:0x%x ID:0x%x DATA[1~2]:0x%02x,0x%02x\n", ++ i, flexcan->hwmb[i].mb_cs.data, ++ flexcan->hwmb[i].mb_id, flexcan->hwmb[i].mb_data[1], ++ flexcan->hwmb[i].mb_data[2]); ++ return ret; ++} ++#endif ++ ++//~~~~~~~~~~sven~~~~~~~~~ ++static int flexcan_get_state (struct net_device *net, enum can_state *state) { ++ struct flexcan_device *flexcan = netdev_priv (net); ++ int esr; ++ ++ *state = (netif_running (net) ? CAN_STATE_ERROR_ACTIVE : CAN_STATE_STOPPED); ++ if (netif_carrier_ok (net)) { ++ esr = __raw_readl (flexcan -> io_base + CAN_HW_REG_ESR); ++ switch ((esr & __ESR_FLT_CONF_MASK) >> __ESR_FLT_CONF_OFF) { ++ case 0: break; ++ case 1: *state = CAN_STATE_ERROR_PASSIVE; break; ++ default: *state = CAN_STATE_BUS_OFF; ++ } ++ } else ++ *state = CAN_STATE_BUS_OFF; ++ ++ return 0; ++} ++//~~~~~~~~~~~~~~~~~~~~~~~ ++ ++static ssize_t flexcan_show_attr(struct device *dev, ++ struct device_attribute *attr, char *buf) ++{ ++ int attr_id; ++ struct net_device *net; ++ struct flexcan_device *flexcan; ++ ++ net = dev_get_drvdata(dev); ++ BUG_ON(!net); ++ flexcan = netdev_priv(net); ++ BUG_ON(!flexcan); ++ ++ attr_id = attr - flexcan_dev_attr; ++ switch (attr_id) { ++/* ~~~~~sven~~~~~ ++ case FLEXCAN_ATTR_STATE: ++ return flexcan_show_state(net, buf); ++ case FLEXCAN_ATTR_BITRATE: ++ return sprintf(buf, "%d\n", flexcan->bitrate); ++ case FLEXCAN_ATTR_BR_PRESDIV: ++ return sprintf(buf, "%d\n", flexcan->br_presdiv + 1); ++ case FLEXCAN_ATTR_BR_RJW: ++ return sprintf(buf, "%d\n", flexcan->br_rjw); ++ case FLEXCAN_ATTR_BR_PROPSEG: ++ return sprintf(buf, "%d\n", flexcan->br_propseg + 1); ++ case FLEXCAN_ATTR_BR_PSEG1: ++ return sprintf(buf, "%d\n", flexcan->br_pseg1 + 1); ++ case FLEXCAN_ATTR_BR_PSEG2: ++ return sprintf(buf, "%d\n", flexcan->br_pseg2 + 1); ++*/ ++ case FLEXCAN_ATTR_BR_CLKSRC: ++ return sprintf(buf, "%s\n", flexcan->br_clksrc ? "bus" : "osc"); ++ case FLEXCAN_ATTR_MAXMB: ++ return sprintf(buf, "%d\n", flexcan->maxmb + 1); ++ case FLEXCAN_ATTR_XMIT_MAXMB: ++ return sprintf(buf, "%d\n", flexcan->xmit_maxmb + 1); ++ case FLEXCAN_ATTR_FIFO: ++ return sprintf(buf, "%d\n", flexcan->fifo); ++ case FLEXCAN_ATTR_WAKEUP: ++ return sprintf(buf, "%d\n", flexcan->wakeup); ++ case FLEXCAN_ATTR_SRX_DIS: ++ return sprintf(buf, "%d\n", flexcan->srx_dis); ++ case FLEXCAN_ATTR_WAK_SRC: ++ return sprintf(buf, "%d\n", flexcan->wak_src); ++ case FLEXCAN_ATTR_BCC: ++ return sprintf(buf, "%d\n", flexcan->bcc); ++ case FLEXCAN_ATTR_LOCAL_PRIORITY: ++ return sprintf(buf, "%d\n", flexcan->lprio); ++ case FLEXCAN_ATTR_ABORT: ++ return sprintf(buf, "%d\n", flexcan->abort); ++ case FLEXCAN_ATTR_LOOPBACK: ++ return sprintf(buf, "%d\n", flexcan->loopback); ++ case FLEXCAN_ATTR_SMP: ++ return sprintf(buf, "%d\n", flexcan->smp); ++ case FLEXCAN_ATTR_BOFF_REC: ++ return sprintf(buf, "%d\n", flexcan->boff_rec); ++ case FLEXCAN_ATTR_TSYN: ++ return sprintf(buf, "%d\n", flexcan->tsyn); ++ case FLEXCAN_ATTR_LISTEN: ++ return sprintf(buf, "%d\n", flexcan->listen); ++ case FLEXCAN_ATTR_EXTEND_MSG: ++ return sprintf(buf, "%d\n", flexcan->ext_msg); ++ case FLEXCAN_ATTR_STANDARD_MSG: ++ return sprintf(buf, "%d\n", flexcan->std_msg); ++#ifdef CONFIG_CAN_DEBUG_DEVICES ++ case FLEXCAN_ATTR_DUMP_REG: ++ return flexcan_dump_reg(flexcan, buf); ++ case FLEXCAN_ATTR_DUMP_XMIT_MB: ++ return flexcan_dump_xmit_mb(flexcan, buf); ++ case FLEXCAN_ATTR_DUMP_RX_MB: ++ return flexcan_dump_rx_mb(flexcan, buf); ++#endif ++ default: ++ return sprintf(buf, "%s:%p->%p\n", __func__, flexcan_dev_attr, ++ attr); ++ } ++} ++ ++static ssize_t flexcan_set_attr(struct device *dev, ++ struct device_attribute *attr, const char *buf, ++ size_t count) ++{ ++ int attr_id, tmp; ++ struct net_device *net; ++ struct flexcan_device *flexcan; ++ ++ net = dev_get_drvdata(dev); ++ BUG_ON(!net); ++ flexcan = netdev_priv(net); ++ BUG_ON(!flexcan); ++ ++ attr_id = attr - flexcan_dev_attr; ++ ++ if (mutex_lock_interruptible(&flexcan->mutex)) ++ return count; ++ ++ if (netif_running(net)) ++ goto set_finish; ++ ++ if (attr_id == FLEXCAN_ATTR_BR_CLKSRC) { ++ if (!strcasecmp(buf, "bus")) ++ flexcan->br_clksrc = 1; ++ else if (!strcasecmp(buf, "osc")) ++ flexcan->br_clksrc = 0; ++ goto set_finish; ++ } ++ ++ tmp = simple_strtoul(buf, NULL, 0); ++ switch (attr_id) { ++/* ~~~~~sven~~~~~ ++ case FLEXCAN_ATTR_BITRATE: ++ flexcan_set_bitrate(flexcan, tmp); ++ break; ++ case FLEXCAN_ATTR_BR_PRESDIV: ++ if ((tmp > 0) && (tmp <= FLEXCAN_MAX_PRESDIV)) { ++ flexcan->br_presdiv = tmp - 1; ++ flexcan_update_bitrate(flexcan); ++ } ++ break; ++ case FLEXCAN_ATTR_BR_RJW: ++ if ((tmp > 0) && (tmp <= FLEXCAN_MAX_RJW)) ++ flexcan->br_rjw = tmp - 1; ++ break; ++ case FLEXCAN_ATTR_BR_PROPSEG: ++ if ((tmp > 0) && (tmp <= FLEXCAN_MAX_PROPSEG)) { ++ flexcan->br_propseg = tmp - 1; ++ flexcan_update_bitrate(flexcan); ++ } ++ break; ++ case FLEXCAN_ATTR_BR_PSEG1: ++ if ((tmp > 0) && (tmp <= FLEXCAN_MAX_PSEG1)) { ++ flexcan->br_pseg1 = tmp - 1; ++ flexcan_update_bitrate(flexcan); ++ } ++ break; ++ case FLEXCAN_ATTR_BR_PSEG2: ++ if ((tmp > 0) && (tmp <= FLEXCAN_MAX_PSEG2)) { ++ flexcan->br_pseg2 = tmp - 1; ++ flexcan_update_bitrate(flexcan); ++ } ++ break; ++*/ ++ case FLEXCAN_ATTR_MAXMB: ++ if ((tmp > 0) && (tmp <= FLEXCAN_MAX_MB)) { ++ if (flexcan->maxmb != (tmp - 1)) { ++ flexcan->maxmb = tmp - 1; ++ if (flexcan->xmit_maxmb < flexcan->maxmb) ++ flexcan->xmit_maxmb = flexcan->maxmb; ++ } ++ } ++ break; ++ case FLEXCAN_ATTR_XMIT_MAXMB: ++ if ((tmp > 0) && (tmp <= (flexcan->maxmb + 1))) { ++ if (flexcan->xmit_maxmb != (tmp - 1)) ++ flexcan->xmit_maxmb = tmp - 1; ++ } ++ break; ++ case FLEXCAN_ATTR_FIFO: ++ flexcan->fifo = tmp ? 1 : 0; ++ break; ++ case FLEXCAN_ATTR_WAKEUP: ++ flexcan->wakeup = tmp ? 1 : 0; ++ break; ++ case FLEXCAN_ATTR_SRX_DIS: ++ flexcan->srx_dis = tmp ? 1 : 0; ++ break; ++ case FLEXCAN_ATTR_WAK_SRC: ++ flexcan->wak_src = tmp ? 1 : 0; ++ break; ++ case FLEXCAN_ATTR_BCC: ++ flexcan->bcc = tmp ? 1 : 0; ++ break; ++ case FLEXCAN_ATTR_LOCAL_PRIORITY: ++ flexcan->lprio = tmp ? 1 : 0; ++ break; ++ case FLEXCAN_ATTR_ABORT: ++ flexcan->abort = tmp ? 1 : 0; ++ break; ++ case FLEXCAN_ATTR_LOOPBACK: ++ flexcan->loopback = tmp ? 1 : 0; ++ break; ++ case FLEXCAN_ATTR_SMP: ++ flexcan->smp = tmp ? 1 : 0; ++ break; ++ case FLEXCAN_ATTR_BOFF_REC: ++ flexcan->boff_rec = tmp ? 1 : 0; ++ break; ++ case FLEXCAN_ATTR_TSYN: ++ flexcan->tsyn = tmp ? 1 : 0; ++ break; ++ case FLEXCAN_ATTR_LISTEN: ++ flexcan->listen = tmp ? 1 : 0; ++ break; ++ case FLEXCAN_ATTR_EXTEND_MSG: ++ flexcan->ext_msg = tmp ? 1 : 0; ++ break; ++ case FLEXCAN_ATTR_STANDARD_MSG: ++ flexcan->std_msg = tmp ? 1 : 0; ++ break; ++ } ++ set_finish: ++ mutex_unlock(&flexcan->mutex); ++ return count; ++} ++ ++static void flexcan_device_default(struct flexcan_device *dev) ++{ ++ dev->br_clksrc = 1; ++// dev->br_rjw = 2; ~~~~~sven~~~~~ ++// dev->br_presdiv = 6; ~~~~~sven~~~~~ ++// dev->br_propseg = 4; ~~~~~sven~~~~~ ++// dev->br_pseg1 = 4; ~~~~~sven~~~~~ ++// dev->br_pseg2 = 7; ~~~~~sven~~~~~ ++ ++ dev->bcc = 1; ++ dev->srx_dis = 1; ++ dev->smp = 1; ++ dev->boff_rec = 1; ++ ++ dev->maxmb = FLEXCAN_MAX_MB - 1; ++ dev->xmit_maxmb = (FLEXCAN_MAX_MB >> 1) - 1; ++ dev->xmit_mb = dev->maxmb - dev->xmit_maxmb; ++ ++ dev->ext_msg = 1; ++ dev->std_msg = 1; ++} ++ ++static int flexcan_device_attach(struct flexcan_device *flexcan) ++{ ++ int ret; ++ struct resource *res; ++#ifdef REGULATOR ++ struct platform_device *pdev = flexcan->dev; ++ struct flexcan_platform_data *plat_data = (pdev->dev).platform_data; ++#endif ++ ++ res = platform_get_resource(flexcan->dev, IORESOURCE_MEM, 0); ++ if (!res) ++ return -ENODEV; ++ ++ flexcan->io_base = ioremap(res->start, res->end - res->start + 1); ++ if (!flexcan->io_base) ++ return -ENOMEM; ++ ++ flexcan->irq = platform_get_irq(flexcan->dev, 0); ++ if (!flexcan->irq) { ++ ret = -ENODEV; ++ goto no_irq_err; ++ } ++ ++ ret = -EINVAL; ++#ifdef REGULATOR ++ if (plat_data) { ++ if (plat_data->core_reg) { ++ flexcan->core_reg = regulator_get(&pdev->dev, ++ plat_data->core_reg); ++ if (!flexcan->core_reg) ++ goto plat_err; ++ } ++ ++ if (plat_data->io_reg) { ++ flexcan->io_reg = regulator_get(&pdev->dev, ++ plat_data->io_reg); ++ if (!flexcan->io_reg) ++ goto plat_err; ++ } ++ } ++#endif ++ flexcan->clk = clk_get(&(flexcan->dev)->dev, "can_clk"); ++ flexcan->hwmb = (struct can_hw_mb *)(flexcan->io_base + CAN_MB_BASE); ++ flexcan->rx_mask = (unsigned int *)(flexcan->io_base + CAN_RXMASK_BASE); ++ return 0; ++ ++#ifdef REGULATOR ++ plat_err: ++ if (flexcan->core_reg) { ++ regulator_put(flexcan->core_reg, &pdev->dev); ++ flexcan->core_reg = NULL; ++ } ++#endif ++ ++ no_irq_err: ++ if (flexcan->io_base) ++ iounmap(flexcan->io_base); ++ return ret; ++} ++ ++static void flexcan_device_detach(struct flexcan_device *flexcan) ++{ ++#ifdef REGULATOR ++ struct platform_device *pdev = flexcan->dev; ++#endif ++ if (flexcan->clk) { ++ clk_put(flexcan->clk); ++ flexcan->clk = NULL; ++ } ++#ifdef REGULATOR ++ if (flexcan->io_reg) { ++ regulator_put(flexcan->io_reg, &pdev->dev); ++ flexcan->io_reg = NULL; ++ } ++ ++ if (flexcan->core_reg) { ++ regulator_put(flexcan->core_reg, &pdev->dev); ++ flexcan->core_reg = NULL; ++ } ++#endif ++ ++ if (flexcan->io_base) ++ iounmap(flexcan->io_base); ++} ++ ++ ++//~~~~~~~~~~~~~~sven~~~~~~~~~~~~~~~~ ++static struct can_bittiming_const flexcan_bittiming_const = { ++ .tseg1_min = 4, ++ .tseg1_max = 16, ++ .tseg2_min = 2, ++ .tseg2_max = 8, ++ .sjw_max = 4, ++ .brp_min = 1, ++ .brp_max = 256, ++ .brp_inc = 1, ++}; ++//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++ ++ ++/*! ++ * @brief The function allocates can device. ++ * ++ * @param pdev the pointer of platform device. ++ * @param setup the initial function pointer of network device. ++ * ++ * @return none ++ */ ++struct net_device *flexcan_device_alloc(struct platform_device *pdev, ++ void (*setup) (struct net_device *dev)) ++{ ++ struct flexcan_device *flexcan; ++ struct net_device *net; ++ int i, num; ++ ++ net = alloc_netdev(sizeof(*flexcan), "can%d", setup); ++ if (net == NULL) { ++ printk(KERN_ERR "Allocate netdevice for FlexCAN fail!\n"); ++ return NULL; ++ } ++ flexcan = netdev_priv(net); ++ memset(flexcan, 0, sizeof(*flexcan)); ++ ++ mutex_init(&flexcan->mutex); ++ init_timer(&flexcan->timer); ++ ++ flexcan->dev = pdev; ++ if (flexcan_device_attach(flexcan)) { ++ printk(KERN_ERR "Attach FlexCAN fail!\n"); ++ free_netdev(net); ++ return NULL; ++ } ++ flexcan_device_default(flexcan); ++// flexcan_update_bitrate(flexcan); ~~~~~sven~~~~~ ++ ++ num = ARRAY_SIZE(flexcan_dev_attr); ++ ++ for (i = 0; i < num; i++) { ++ if (device_create_file(&pdev->dev, flexcan_dev_attr + i)) { ++ printk(KERN_ERR "Create attribute file fail!\n"); ++ break; ++ } ++ } ++ ++ if (i != num) { ++ for (; i >= 0; i--) ++ device_remove_file(&pdev->dev, flexcan_dev_attr + i); ++ free_netdev(net); ++ return NULL; ++ } ++ dev_set_drvdata(&pdev->dev, net); ++ ++//~~~~~~~~~~~~~~sven~~~~~~~~~~~~~~~~ ++ ++ SET_NETDEV_DEV (net, &pdev -> dev); ++ ++ flexcan -> can.bittiming_const = &flexcan_bittiming_const; ++ flexcan -> can.do_set_bittiming = flexcan_set_bittiming; ++ flexcan -> can.do_get_state = (void *) flexcan_get_state; ++ ++ if (flexcan -> br_clksrc) ++ flexcan -> can.clock.freq = clk_get_rate (flexcan -> clk); ++ else { ++ struct clk *clk; ++ clk = clk_get (NULL, "ckih"); ++ if (clk) { ++ flexcan -> can.clock.freq = clk_get_rate (clk); ++ clk_put (clk); ++ } ++ } ++ ++ flexcan -> can.state = CAN_STATE_STOPPED; // !!! Nur provisorisch !!! ++ ++//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++ ++ return net; ++} ++ ++/*! ++ * @brief The function frees can device. ++ * ++ * @param pdev the pointer of platform device. ++ * ++ * @return none ++ */ ++void flexcan_device_free(struct platform_device *pdev) ++{ ++ struct net_device *net; ++ struct flexcan_device *flexcan; ++ int i, num; ++ net = (struct net_device *)dev_get_drvdata(&pdev->dev); ++ ++ unregister_candev(net); // ~~~~~sven~~~~~ ++ flexcan = netdev_priv(net); ++ del_timer(&flexcan->timer); ++ ++ num = ARRAY_SIZE(flexcan_dev_attr); ++ ++ for (i = 0; i < num; i++) ++ device_remove_file(&pdev->dev, flexcan_dev_attr + i); ++ ++ flexcan_device_detach(netdev_priv(net)); ++ free_netdev(net); ++} +Index: linux-2.6.31.6/drivers/net/can/flexcan/drv.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.31.6/drivers/net/can/flexcan/drv.c 2009-12-16 17:34:40.585687608 +0100 +@@ -0,0 +1,657 @@ ++/* ++ * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved. ++ */ ++ ++/* ++ * The code contained herein is licensed under the GNU General Public ++ * License. You may obtain a copy of the GNU General Public License ++ * Version 2 or later at the following locations: ++ * ++ * http://www.opensource.org/licenses/gpl-license.html ++ * http://www.gnu.org/copyleft/gpl.html ++ */ ++ ++/*! ++ * @file drv.c ++ * ++ * @brief Driver for Freescale CAN Controller FlexCAN. ++ * ++ * @ingroup can ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#ifdef REGULATOR ++ #include ++#endif ++#include ++ ++#include ++#include ++//#include //TBD asm/hardware.h ++#include ++#include "flexcan.h" ++ ++static void flexcan_hw_start(struct flexcan_device *flexcan) ++{ ++ unsigned int reg; ++ if ((flexcan->maxmb + 1) > 32) { ++ __raw_writel(0xFFFFFFFF, flexcan->io_base + CAN_HW_REG_IMASK1); ++ reg = (1 << (flexcan->maxmb - 31)) - 1; ++ __raw_writel(reg, flexcan->io_base + CAN_HW_REG_IMASK2); ++ } else { ++ reg = (1 << (flexcan->maxmb + 1)) - 1; ++ __raw_writel(reg, flexcan->io_base + CAN_HW_REG_IMASK1); ++ __raw_writel(0, flexcan->io_base + CAN_HW_REG_IMASK2); ++ } ++ ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_MCR) & (~__MCR_HALT); ++ __raw_writel(reg, flexcan->io_base + CAN_HW_REG_MCR); ++} ++ ++static void flexcan_hw_stop(struct flexcan_device *flexcan) ++{ ++ unsigned int reg; ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_MCR); ++ __raw_writel(reg | __MCR_HALT, flexcan->io_base + CAN_HW_REG_MCR); ++} ++ ++static int flexcan_hw_reset(struct flexcan_device *flexcan) ++{ ++ unsigned int reg; ++ int timeout = 100000; ++ ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_MCR); ++ __raw_writel(reg | __MCR_MDIS, flexcan->io_base + CAN_HW_REG_MCR); ++ ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_CTRL); ++ if (flexcan->br_clksrc) ++ reg |= __CTRL_CLK_SRC; ++ else ++ reg &= ~__CTRL_CLK_SRC; ++ __raw_writel(reg, flexcan->io_base + CAN_HW_REG_CTRL); ++ ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_MCR) & (~__MCR_MDIS); ++ __raw_writel(reg, flexcan->io_base + CAN_HW_REG_MCR); ++ reg |= __MCR_SOFT_RST; ++ __raw_writel(reg, flexcan->io_base + CAN_HW_REG_MCR); ++ ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_MCR); ++ while (reg & __MCR_SOFT_RST) { ++ if (--timeout <= 0) { ++ printk(KERN_ERR "Flexcan software Reset Timeouted\n"); ++ return -1; ++ } ++ udelay(10); ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_MCR); ++ } ++ return 0; ++} ++ ++static inline void flexcan_mcr_setup(struct flexcan_device *flexcan) ++{ ++ unsigned int reg; ++ ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_MCR); ++ reg &= ~(__MCR_MAX_MB_MASK | __MCR_WAK_MSK | __MCR_MAX_IDAM_MASK); ++ ++ if (flexcan->fifo) ++ reg |= __MCR_FEN; ++ else ++ reg &= ~__MCR_FEN; ++ ++ if (flexcan->wakeup) ++ reg |= __MCR_SLF_WAK | __MCR_WAK_MSK; ++ else ++ reg &= ~(__MCR_SLF_WAK | __MCR_WAK_MSK); ++ ++ if (flexcan->wak_src) ++ reg |= __MCR_WAK_SRC; ++ else ++ reg &= ~__MCR_WAK_SRC; ++ ++ if (flexcan->srx_dis) ++ reg |= __MCR_SRX_DIS; ++ else ++ reg &= ~__MCR_SRX_DIS; ++ ++ if (flexcan->bcc) ++ reg |= __MCR_BCC; ++ else ++ reg &= ~__MCR_BCC; ++ ++ if (flexcan->lprio) ++ reg |= __MCR_LPRIO_EN; ++ else ++ reg &= ~__MCR_LPRIO_EN; ++ ++ if (flexcan->abort) ++ reg |= __MCR_AEN; ++ else ++ reg &= ~__MCR_AEN; ++ ++ reg |= (flexcan->maxmb << __MCR_MAX_MB_OFFSET); ++ reg |= __MCR_DOZE | __MCR_MAX_IDAM_C; ++ __raw_writel(reg, flexcan->io_base + CAN_HW_REG_MCR); ++} ++ ++//~~~~~~~~~~~~~~sven~~~~~~~~~~~~~~~~ ++static inline void flexcan_ctrl_setup (struct flexcan_device *flexcan) { ++ struct can_priv *priv = (struct can_priv *) flexcan; ++ struct can_bittiming *bt = &priv -> bittiming; ++ ++ unsigned int reg; ++ ++ reg = __raw_readl (flexcan -> io_base + CAN_HW_REG_CTRL); ++ reg &= ~(__CTRL_PRESDIV_MASK | __CTRL_RJW_MASK | __CTRL_PSEG1_MASK | ++ __CTRL_PSEG2_MASK | __CTRL_PROPSEG_MASK); ++ ++ if (flexcan -> loopback) ++ reg |= __CTRL_LPB; ++ else ++ reg &= ~__CTRL_LPB; ++ ++ if (flexcan -> smp) ++ reg |= __CTRL_SMP; ++ else ++ reg &= ~__CTRL_SMP; ++ ++ if (flexcan -> boff_rec) ++ reg |= __CTRL_BOFF_REC; ++ else ++ reg &= ~__CTRL_BOFF_REC; ++ ++ if (flexcan -> tsyn) ++ reg |= __CTRL_TSYN; ++ else ++ reg &= ~__CTRL_TSYN; ++ ++ if (flexcan -> listen) ++ reg |= __CTRL_LOM; ++ else ++ reg &= ~__CTRL_LOM; ++ ++ reg |= ((bt -> brp - 1) << __CTRL_PRESDIV_OFFSET) | ++ ((bt -> sjw - 1) << __CTRL_RJW_OFFSET) | ++ ((bt -> phase_seg1 - 1) << __CTRL_PSEG1_OFFSET) | ++ ((bt -> phase_seg2 - 1) << __CTRL_PSEG2_OFFSET) | ++ ((bt -> prop_seg - 1) << __CTRL_PROPSEG_OFFSET); ++ ++ reg &= ~__CTRL_LBUF; ++ ++ reg |= __CTRL_TWRN_MSK | __CTRL_RWRN_MSK | __CTRL_BOFF_MSK | ++ __CTRL_ERR_MSK; ++ ++ __raw_writel (reg, flexcan -> io_base + CAN_HW_REG_CTRL); ++} ++ ++int flexcan_set_bittiming (struct net_device *dev) { ++ flexcan_ctrl_setup (netdev_priv (dev)); ++ return 0; ++} ++ ++EXPORT_SYMBOL (flexcan_set_bittiming); ++//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++ ++static int flexcan_hw_restart(struct net_device *dev) ++{ ++ unsigned int reg; ++ struct flexcan_device *flexcan = netdev_priv(dev); ++ ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_MCR); ++ if (reg & __MCR_SOFT_RST) ++ return 1; ++ ++ flexcan_mcr_setup(flexcan); ++ ++ __raw_writel(0, flexcan->io_base + CAN_HW_REG_IMASK2); ++ __raw_writel(0, flexcan->io_base + CAN_HW_REG_IMASK1); ++ ++ __raw_writel(0xFFFFFFFF, flexcan->io_base + CAN_HW_REG_IFLAG2); ++ __raw_writel(0xFFFFFFFF, flexcan->io_base + CAN_HW_REG_IFLAG1); ++ ++ __raw_writel(0, flexcan->io_base + CAN_HW_REG_ECR); ++ ++ flexcan_mbm_init(flexcan); ++ netif_carrier_on(dev); ++ flexcan_hw_start(flexcan); ++ ++ if (netif_queue_stopped(dev)) ++ netif_start_queue(dev); ++ ++ return 0; ++} ++ ++static void flexcan_hw_watch(unsigned long data) ++{ ++ unsigned int reg, ecr; ++ struct net_device *dev = (struct net_device *)data; ++ struct flexcan_device *flexcan = dev ? netdev_priv(dev) : NULL; ++ ++ BUG_ON(!flexcan); ++ ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_MCR); ++ if (reg & __MCR_MDIS) { ++ if (flexcan_hw_restart(dev)) ++ mod_timer(&flexcan->timer, HZ / 20); ++ return; ++ } ++ ecr = __raw_readl(flexcan->io_base + CAN_HW_REG_ECR); ++ if (flexcan->boff_rec) { ++ if (((reg & __ESR_FLT_CONF_MASK) >> __ESR_FLT_CONF_OFF) > 1) { ++ reg |= __MCR_SOFT_RST; ++ __raw_writel(reg, flexcan->io_base + CAN_HW_REG_MCR); ++ mod_timer(&flexcan->timer, HZ / 20); ++ return; ++ } ++ netif_carrier_on(dev); ++ } ++} ++ ++static void flexcan_hw_busoff(struct net_device *dev) ++{ ++ struct flexcan_device *flexcan = netdev_priv(dev); ++ unsigned int reg; ++ ++ netif_carrier_off(dev); ++ ++ flexcan->timer.function = flexcan_hw_watch; ++ flexcan->timer.data = (unsigned long)dev; ++ ++ if (flexcan->boff_rec) { ++ mod_timer(&flexcan->timer, HZ / 10); ++ return; ++ } ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_MCR); ++ __raw_writel(reg | __MCR_SOFT_RST, flexcan->io_base + CAN_HW_REG_MCR); ++ mod_timer(&flexcan->timer, HZ / 20); ++} ++ ++static int flexcan_hw_open (struct net_device *dev) { // ~~~~~sven~~~~~ ++ struct flexcan_device *flexcan = netdev_priv (dev); // ~~~~~sven~~~~~ ++ int err; // ~~~~~sven~~~~~ ++ ++ if (flexcan_hw_reset(flexcan)) ++ return -EFAULT; ++ ++ flexcan_mcr_setup(flexcan); ++ ++//~~~~~~~~~~~~~~sven~~~~~~~~~~~~~~~~ ++ ++ err = open_candev (dev); ++ if (err) ++ return err; ++ ++ flexcan_ctrl_setup (netdev_priv (dev)); // determine and set bittime ++ ++//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++ ++ __raw_writel(0, flexcan->io_base + CAN_HW_REG_IMASK2); ++ __raw_writel(0, flexcan->io_base + CAN_HW_REG_IMASK1); ++ ++ __raw_writel(0xFFFFFFFF, flexcan->io_base + CAN_HW_REG_IFLAG2); ++ __raw_writel(0xFFFFFFFF, flexcan->io_base + CAN_HW_REG_IFLAG1); ++ ++ __raw_writel(0, flexcan->io_base + CAN_HW_REG_ECR); ++ return 0; ++} ++ ++static void flexcan_err_handler(struct net_device *dev) ++{ ++ struct flexcan_device *flexcan = netdev_priv(dev); ++ struct sk_buff *skb; ++ struct can_frame *frame; ++ unsigned int esr, ecr; ++ ++ esr = __raw_readl(flexcan->io_base + CAN_HW_REG_ESR); ++ __raw_writel(esr & __ESR_INTERRUPTS, flexcan->io_base + CAN_HW_REG_ESR); ++ ++ if (esr & __ESR_WAK_INT) ++ return; ++ ++ skb = dev_alloc_skb(sizeof(struct can_frame)); ++ if (!skb) { ++ printk(KERN_ERR "%s: allocates skb fail in\n", __func__); ++ return; ++ } ++ frame = (struct can_frame *)skb_put(skb, sizeof(*frame)); ++ memset(frame, 0, sizeof(*frame)); ++ frame->can_id = CAN_ERR_FLAG | CAN_ERR_CRTL; ++ frame->can_dlc = CAN_ERR_DLC; ++ ++ if (esr & __ESR_TWRN_INT) ++ frame->data[1] |= CAN_ERR_CRTL_TX_WARNING; ++ ++ if (esr & __ESR_RWRN_INT) ++ frame->data[1] |= CAN_ERR_CRTL_RX_WARNING; ++ ++ if (esr & __ESR_BOFF_INT) ++ frame->can_id |= CAN_ERR_BUSOFF; ++ ++ if (esr & __ESR_ERR_INT) { ++ if (esr & __ESR_BIT1_ERR) ++ frame->data[2] |= CAN_ERR_PROT_BIT1; ++ ++ if (esr & __ESR_BIT0_ERR) ++ frame->data[2] |= CAN_ERR_PROT_BIT0; ++ ++ if (esr & __ESR_ACK_ERR) ++ frame->can_id |= CAN_ERR_ACK; ++ ++ /*TODO:// if (esr & __ESR_CRC_ERR) */ ++ ++ if (esr & __ESR_FRM_ERR) ++ frame->data[2] |= CAN_ERR_PROT_FORM; ++ ++ if (esr & __ESR_STF_ERR) ++ frame->data[2] |= CAN_ERR_PROT_STUFF; ++ ++ ecr = __raw_readl(flexcan->io_base + CAN_HW_REG_ECR); ++ switch ((esr & __ESR_FLT_CONF_MASK) >> __ESR_FLT_CONF_OFF) { ++ case 0: ++ if (__ECR_TX_ERR_COUNTER(ecr) >= __ECR_ACTIVE_THRESHOLD) ++ frame->data[1] |= CAN_ERR_CRTL_TX_WARNING; ++ if (__ECR_RX_ERR_COUNTER(ecr) >= __ECR_ACTIVE_THRESHOLD) ++ frame->data[1] |= CAN_ERR_CRTL_RX_WARNING; ++ break; ++ case 1: ++ if (__ECR_TX_ERR_COUNTER(ecr) >= ++ __ECR_PASSIVE_THRESHOLD) ++ frame->data[1] |= CAN_ERR_CRTL_TX_PASSIVE; ++ ++ if (__ECR_RX_ERR_COUNTER(ecr) >= ++ __ECR_PASSIVE_THRESHOLD) ++ frame->data[1] |= CAN_ERR_CRTL_RX_PASSIVE; ++ break; ++ default: ++ frame->can_id |= CAN_ERR_BUSOFF; ++ } ++ } ++ ++ if (frame->can_id & CAN_ERR_BUSOFF) ++ flexcan_hw_busoff(dev); ++ ++ skb->dev = dev; ++ skb->ip_summed = CHECKSUM_UNNECESSARY; ++ netif_receive_skb(skb); ++} ++ ++static irqreturn_t flexcan_irq_handler(int irq, void *data) ++{ ++ struct net_device *dev = (struct net_device *)data; ++ struct flexcan_device *flexcan = dev ? netdev_priv(dev) : NULL; ++ unsigned int reg; ++ ++ BUG_ON(!flexcan); ++ ++ reg = __raw_readl(flexcan->io_base + CAN_HW_REG_ESR); ++ if (reg & __ESR_INTERRUPTS) { ++ flexcan_err_handler(dev); ++ return IRQ_HANDLED; ++ } ++ ++ flexcan_mbm_isr(dev); ++ return IRQ_HANDLED; ++} ++ ++static int flexcan_start_xmit(struct sk_buff *skb, struct net_device *dev) ++{ ++ struct can_frame *frame = (struct can_frame *) (skb -> data); ++ struct flexcan_device *flexcan = netdev_priv(dev); ++ struct net_device_stats *stats = (struct net_device_stats *) dev_get_stats (dev); // ~~~~~~~sven~~~~~~~~ ++ ++ BUG_ON(!flexcan); ++ ++ if (frame->can_dlc > 8) ++ return -EINVAL; ++ ++ if (!flexcan_mbm_xmit(flexcan, frame)) { ++ dev_kfree_skb(skb); ++ stats->tx_bytes += frame->can_dlc; ++ stats->tx_packets++; ++ dev->trans_start = jiffies; ++ return NETDEV_TX_OK; ++ } ++ netif_stop_queue(dev); ++ return NETDEV_TX_BUSY; ++} ++ ++static int flexcan_open(struct net_device *dev) ++{ ++ struct flexcan_device *flexcan; ++ struct platform_device *pdev; ++ struct flexcan_platform_data *plat_data; ++ ++ flexcan = netdev_priv(dev); ++ BUG_ON(!flexcan); ++ ++ pdev = flexcan->dev; ++ plat_data = (pdev->dev).platform_data; ++ if (plat_data && plat_data->active) ++ plat_data->active(pdev->id); ++ ++ if (flexcan->clk) ++ if (clk_enable(flexcan->clk)) ++ goto clk_err; ++#ifdef REGULATOR ++ if (flexcan->core_reg) ++ if (regulator_enable(flexcan->core_reg)) ++ goto core_reg_err; ++ ++ if (flexcan->io_reg) ++ if (regulator_enable(flexcan->io_reg)) ++ goto io_reg_err; ++#endif ++ if (plat_data && plat_data->xcvr_enable) ++ plat_data->xcvr_enable(pdev->id, 1); ++ ++ if (request_irq(flexcan->irq, flexcan_irq_handler, IRQF_SAMPLE_RANDOM, ++ dev->name, dev)) ++ goto irq_err; ++ ++ if (flexcan_hw_open (dev)) // ~~~~~sven~~~~~ ++ goto open_err; ++ ++ flexcan_mbm_init(flexcan); ++ netif_carrier_on(dev); ++ flexcan_hw_start(flexcan); ++ return 0; ++ open_err: ++ free_irq(flexcan->irq, dev); ++ irq_err: ++ if (plat_data && plat_data->xcvr_enable) ++ plat_data->xcvr_enable(pdev->id, 0); ++#ifdef REGULATOR ++ if (flexcan->io_reg) ++ regulator_disable(flexcan->io_reg); ++ io_reg_err: ++ if (flexcan->core_reg) ++ regulator_disable(flexcan->core_reg); ++ core_reg_err: ++#endif ++ if (flexcan->clk) ++ clk_disable(flexcan->clk); ++ clk_err: ++ if (plat_data && plat_data->inactive) ++ plat_data->inactive(pdev->id); ++ return -ENODEV; ++} ++ ++static int flexcan_stop(struct net_device *dev) ++{ ++ struct flexcan_device *flexcan; ++ struct platform_device *pdev; ++ struct flexcan_platform_data *plat_data; ++ ++ flexcan = netdev_priv(dev); ++ ++ BUG_ON(!flexcan); ++ ++ pdev = flexcan->dev; ++ plat_data = (pdev->dev).platform_data; ++ ++ flexcan_hw_stop(flexcan); ++ ++ free_irq(flexcan->irq, dev); ++ ++ if (plat_data && plat_data->xcvr_enable) ++ plat_data->xcvr_enable(pdev->id, 0); ++ ++#ifdef REGULATOR ++ if (flexcan->io_reg) ++ regulator_disable(flexcan->io_reg); ++ if (flexcan->core_reg) ++ regulator_disable(flexcan->core_reg); ++#endif ++ if (flexcan->clk) ++ clk_disable(flexcan->clk); ++ if (plat_data && plat_data->inactive) ++ plat_data->inactive(pdev->id); ++ return 0; ++} ++ ++static const struct net_device_ops flexcan_netdev_ops = { ++ .ndo_open = flexcan_open, ++ .ndo_stop = flexcan_stop, ++ .ndo_start_xmit = flexcan_start_xmit, ++}; ++ ++static void flexcan_setup(struct net_device *dev) ++{ ++ dev->type = ARPHRD_CAN; ++ dev->mtu = sizeof(struct can_frame); ++ dev->hard_header_len = 0; ++ dev->addr_len = 0; ++ dev->tx_queue_len = FLEXCAN_MAX_MB; ++ dev->flags = IFF_NOARP; ++ dev->features = NETIF_F_NO_CSUM; ++ ++ dev->netdev_ops = &flexcan_netdev_ops; ++} ++ ++static int flexcan_probe(struct platform_device *pdev) ++{ ++ struct net_device *net; ++ net = flexcan_device_alloc(pdev, flexcan_setup); ++ if (!net) ++ return -ENOMEM; ++ ++ if (register_candev(net)) { // ~~~~~sven~~~~~ ++ flexcan_device_free(pdev); ++ return -ENODEV; ++ } ++ return 0; ++} ++ ++static int flexcan_remove(struct platform_device *pdev) ++{ ++ flexcan_device_free(pdev); ++ return 0; ++} ++ ++static int flexcan_suspend(struct platform_device *pdev, pm_message_t state) ++{ ++ struct net_device *net; ++ struct flexcan_device *flexcan; ++ struct flexcan_platform_data *plat_data; ++ net = (struct net_device *)dev_get_drvdata(&pdev->dev); ++ flexcan = netdev_priv(net); ++ ++ BUG_ON(!flexcan); ++ ++ if (!(net->flags & IFF_UP)) ++ return 0; ++ if (flexcan->wakeup) ++ set_irq_wake(flexcan->irq, 1); ++ else { ++ plat_data = (pdev->dev).platform_data; ++ ++ if (plat_data && plat_data->xcvr_enable) ++ plat_data->xcvr_enable(pdev->id, 0); ++#ifdef REGULATOR ++ if (flexcan->io_reg) ++ regulator_disable(flexcan->io_reg); ++ if (flexcan->core_reg) ++ regulator_disable(flexcan->core_reg); ++#endif ++ if (flexcan->clk) ++ clk_disable(flexcan->clk); ++ if (plat_data && plat_data->inactive) ++ plat_data->inactive(pdev->id); ++ } ++ return 0; ++} ++ ++static int flexcan_resume(struct platform_device *pdev) ++{ ++ struct net_device *net; ++ struct flexcan_device *flexcan; ++ struct flexcan_platform_data *plat_data; ++ net = (struct net_device *)dev_get_drvdata(&pdev->dev); ++ flexcan = netdev_priv(net); ++ ++ BUG_ON(!flexcan); ++ ++ if (!(net->flags & IFF_UP)) ++ return 0; ++ ++ if (flexcan->wakeup) ++ set_irq_wake(flexcan->irq, 0); ++ else { ++ plat_data = (pdev->dev).platform_data; ++ if (plat_data && plat_data->active) ++ plat_data->active(pdev->id); ++ ++ if (flexcan->clk) { ++ if (clk_enable(flexcan->clk)) ++ printk(KERN_ERR "%s:enable clock fail\n", ++ __func__); ++ } ++#ifdef REGULATOR ++ if (flexcan->core_reg) { ++ if (regulator_enable(flexcan->core_reg)) ++ printk(KERN_ERR "%s:enable core voltage\n", ++ __func__); ++ } ++ if (flexcan->io_reg) { ++ if (regulator_enable(flexcan->io_reg)) ++ printk(KERN_ERR "%s:enable io voltage\n", ++ __func__); ++ } ++#endif ++ if (plat_data && plat_data->xcvr_enable) ++ plat_data->xcvr_enable(pdev->id, 1); ++ } ++ return 0; ++} ++ ++static struct platform_driver flexcan_driver = { ++ .driver = { ++ .name = FLEXCAN_DEVICE_NAME, ++ }, ++ .probe = flexcan_probe, ++ .remove = flexcan_remove, ++ .suspend = flexcan_suspend, ++ .resume = flexcan_resume, ++}; ++ ++static __init int flexcan_init(void) ++{ ++ pr_info("Freescale FlexCAN Driver \n"); ++ return platform_driver_register(&flexcan_driver); ++} ++ ++static __exit void flexcan_exit(void) ++{ ++ return platform_driver_unregister(&flexcan_driver); ++} ++ ++module_init(flexcan_init); ++module_exit(flexcan_exit); ++ ++MODULE_LICENSE("GPL"); +Index: linux-2.6.31.6/drivers/net/can/flexcan/flexcan.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.31.6/drivers/net/can/flexcan/flexcan.h 2009-12-16 17:34:40.585687608 +0100 +@@ -0,0 +1,230 @@ ++/* ++ * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved. ++ */ ++ ++/* ++ * The code contained herein is licensed under the GNU General Public ++ * License. You may obtain a copy of the GNU General Public License ++ * Version 2 or later at the following locations: ++ * ++ * http://www.opensource.org/licenses/gpl-license.html ++ * http://www.gnu.org/copyleft/gpl.html ++ */ ++ ++/*! ++ * @file flexcan.h ++ * ++ * @brief FlexCan definitions. ++ * ++ * @ingroup can ++ */ ++ ++#ifndef __CAN_FLEXCAN_H__ ++#define __CAN_FLEXCAN_H__ ++ ++#include ++#include ++#ifdef REGULATOR ++ #include ++#endif ++#include ++#include ++#include ++#include ++#include ++ ++#define FLEXCAN_DEVICE_NAME "FlexCAN" ++ ++struct can_mb_cs { ++ unsigned int time_stamp:16; ++ unsigned int length:4; ++ unsigned int rtr:1; ++ unsigned int ide:1; ++ unsigned int srr:1; ++ unsigned int nouse1:1; ++ unsigned int code:4; ++ unsigned int nouse2:4; ++}; ++ ++#define CAN_MB_RX_INACTIVE 0x0 ++#define CAN_MB_RX_EMPTY 0x4 ++#define CAN_MB_RX_FULL 0x2 ++#define CAN_MB_RX_OVERRUN 0x6 ++#define CAN_MB_RX_BUSY 0x1 ++ ++#define CAN_MB_TX_INACTIVE 0x8 ++#define CAN_MB_TX_ABORT 0x9 ++#define CAN_MB_TX_ONCE 0xC ++#define CAN_MB_TX_REMOTE 0xA ++ ++struct can_hw_mb { ++ union { ++ struct can_mb_cs cs; ++ unsigned int data; ++ } mb_cs; ++ unsigned int mb_id; ++ unsigned char mb_data[8]; ++}; ++ ++#define CAN_HW_REG_MCR 0x00 ++#define CAN_HW_REG_CTRL 0x04 ++#define CAN_HW_REG_TIMER 0x08 ++#define CAN_HW_REG_RXGMASK 0x10 ++#define CAN_HW_REG_RX14MASK 0x14 ++#define CAN_HW_REG_RX15MASK 0x18 ++#define CAN_HW_REG_ECR 0x1C ++#define CAN_HW_REG_ESR 0x20 ++#define CAN_HW_REG_IMASK2 0x24 ++#define CAN_HW_REG_IMASK1 0x28 ++#define CAN_HW_REG_IFLAG2 0x2C ++#define CAN_HW_REG_IFLAG1 0x30 ++ ++#define CAN_MB_BASE 0x0080 ++#define CAN_RXMASK_BASE 0x0880 ++#define CAN_FIFO_BASE 0xE0 ++ ++#define __MCR_MDIS (1 << 31) ++#define __MCR_FRZ (1 << 30) ++#define __MCR_FEN (1 << 29) ++#define __MCR_HALT (1 << 28) ++#define __MCR_NOTRDY (1 << 27) ++#define __MCR_WAK_MSK (1 << 26) ++#define __MCR_SOFT_RST (1 << 25) ++#define __MCR_FRZ_ACK (1 << 24) ++#define __MCR_SLF_WAK (1 << 22) ++#define __MCR_WRN_EN (1 << 21) ++#define __MCR_LPM_ACK (1 << 20) ++#define __MCR_WAK_SRC (1 << 19) ++#define __MCR_DOZE (1 << 18) ++#define __MCR_SRX_DIS (1 << 17) ++#define __MCR_BCC (1 << 16) ++#define __MCR_LPRIO_EN (1 << 13) ++#define __MCR_AEN (1 << 12) ++#define __MCR_MAX_IDAM_OFFSET 8 ++#define __MCR_MAX_IDAM_MASK (0x3 << __MCR_MAX_IDAM_OFFSET) ++#define __MCR_MAX_IDAM_A (0x0 << __MCR_MAX_IDAM_OFFSET) ++#define __MCR_MAX_IDAM_B (0x1 << __MCR_MAX_IDAM_OFFSET) ++#define __MCR_MAX_IDAM_C (0x2 << __MCR_MAX_IDAM_OFFSET) ++#define __MCR_MAX_IDAM_D (0x3 << __MCR_MAX_IDAM_OFFSET) ++#define __MCR_MAX_MB_OFFSET 0 ++#define __MCR_MAX_MB_MASK (0x3F) ++ ++#define __CTRL_PRESDIV_OFFSET 24 ++#define __CTRL_PRESDIV_MASK (0xFF << __CTRL_PRESDIV_OFFSET) ++#define __CTRL_RJW_OFFSET 22 ++#define __CTRL_RJW_MASK (0x3 << __CTRL_RJW_OFFSET) ++#define __CTRL_PSEG1_OFFSET 19 ++#define __CTRL_PSEG1_MASK (0x7 << __CTRL_PSEG1_OFFSET) ++#define __CTRL_PSEG2_OFFSET 16 ++#define __CTRL_PSEG2_MASK (0x7 << __CTRL_PSEG2_OFFSET) ++#define __CTRL_BOFF_MSK (0x1 << 15) ++#define __CTRL_ERR_MSK (0x1 << 14) ++#define __CTRL_CLK_SRC (0x1 << 13) ++#define __CTRL_LPB (0x1 << 12) ++#define __CTRL_TWRN_MSK (0x1 << 11) ++#define __CTRL_RWRN_MSK (0x1 << 10) ++#define __CTRL_SMP (0x1 << 7) ++#define __CTRL_BOFF_REC (0x1 << 6) ++#define __CTRL_TSYN (0x1 << 5) ++#define __CTRL_LBUF (0x1 << 4) ++#define __CTRL_LOM (0x1 << 3) ++#define __CTRL_PROPSEG_OFFSET 0 ++#define __CTRL_PROPSEG_MASK (0x7) ++ ++#define __ECR_TX_ERR_COUNTER(x) ((x) & 0xFF) ++#define __ECR_RX_ERR_COUNTER(x) (((x) >> 8) & 0xFF) ++#define __ECR_PASSIVE_THRESHOLD 128 ++#define __ECR_ACTIVE_THRESHOLD 96 ++ ++#define __ESR_TWRN_INT (0x1 << 17) ++#define __ESR_RWRN_INT (0x1 << 16) ++#define __ESR_BIT1_ERR (0x1 << 15) ++#define __ESR_BIT0_ERR (0x1 << 14) ++#define __ESR_ACK_ERR (0x1 << 13) ++#define __ESR_CRC_ERR (0x1 << 12) ++#define __ESR_FRM_ERR (0x1 << 11) ++#define __ESR_STF_ERR (0x1 << 10) ++#define __ESR_TX_WRN (0x1 << 9) ++#define __ESR_RX_WRN (0x1 << 8) ++#define __ESR_IDLE (0x1 << 7) ++#define __ESR_TXRX (0x1 << 6) ++#define __ESR_FLT_CONF_OFF 4 ++#define __ESR_FLT_CONF_MASK (0x3 << __ESR_FLT_CONF_OFF) ++#define __ESR_BOFF_INT (0x1 << 2) ++#define __ESR_ERR_INT (0x1 << 1) ++#define __ESR_WAK_INT (0x1) ++ ++#define __ESR_INTERRUPTS (__ESR_WAK_INT | __ESR_ERR_INT | \ ++ __ESR_BOFF_INT | __ESR_TWRN_INT | \ ++ __ESR_RWRN_INT) ++ ++#define __FIFO_OV_INT 0x0080 ++#define __FIFO_WARN_INT 0x0040 ++#define __FIFO_RDY_INT 0x0020 ++ ++struct flexcan_device { ++ struct can_priv can; /* FIXME:new must be the first member! */ ++ struct mutex mutex; ++ void *io_base; ++ struct can_hw_mb *hwmb; ++ unsigned int *rx_mask; ++ unsigned int xmit_mb; ++// unsigned int bitrate; ~~~~~sven~~~~~ ++ /* word 1 */ ++// unsigned int br_presdiv:8; ~~~~~sven~~~~~ ++// unsigned int br_rjw:2; ~~~~~sven~~~~~ ++// unsigned int br_propseg:3; ~~~~~sven~~~~~ ++// unsigned int br_pseg1:3; ~~~~~sven~~~~~ ++// unsigned int br_pseg2:3; ~~~~~sven~~~~~ ++ unsigned int maxmb:6; ++ unsigned int xmit_maxmb:6; ++ unsigned int wd1_resv:1; ++ ++ /* word 2 */ ++ unsigned int fifo:1; ++ unsigned int wakeup:1; ++ unsigned int srx_dis:1; ++ unsigned int wak_src:1; ++ unsigned int bcc:1; ++ unsigned int lprio:1; ++ unsigned int abort:1; ++ unsigned int br_clksrc:1; ++ unsigned int loopback:1; ++ unsigned int smp:1; ++ unsigned int boff_rec:1; ++ unsigned int tsyn:1; ++ unsigned int listen:1; ++ ++ unsigned int ext_msg:1; ++ unsigned int std_msg:1; ++ ++ struct timer_list timer; ++ struct platform_device *dev; ++ struct regulator *core_reg; ++ struct regulator *io_reg; ++ struct clk *clk; ++ int irq; ++}; ++ ++#define FLEXCAN_MAX_FIFO_MB 8 ++#define FLEXCAN_MAX_MB 64 ++#define FLEXCAN_MAX_PRESDIV 256 ++#define FLEXCAN_MAX_RJW 4 ++#define FLEXCAN_MAX_PSEG1 8 ++#define FLEXCAN_MAX_PSEG2 8 ++#define FLEXCAN_MAX_PROPSEG 8 ++#define FLEXCAN_MAX_BITRATE 1000000 ++ ++extern struct net_device *flexcan_device_alloc(struct platform_device *pdev, ++ void (*setup) (struct net_device ++ *dev)); ++extern void flexcan_device_free(struct platform_device *pdev); ++ ++extern void flexcan_mbm_init(struct flexcan_device *flexcan); ++extern void flexcan_mbm_isr(struct net_device *dev); ++extern int flexcan_mbm_xmit(struct flexcan_device *flexcan, ++ struct can_frame *frame); ++ ++extern int flexcan_set_bittiming (struct net_device *dev); // ~~~~~sven~~~~~ ++ ++#endif /* __CAN_FLEXCAN_H__ */ +Index: linux-2.6.31.6/drivers/net/can/flexcan/mbm.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.31.6/drivers/net/can/flexcan/mbm.c 2009-12-16 17:34:40.585687608 +0100 +@@ -0,0 +1,350 @@ ++/* ++ * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved. ++ */ ++ ++/* ++ * The code contained herein is licensed under the GNU General Public ++ * License. You may obtain a copy of the GNU General Public License ++ * Version 2 or later at the following locations: ++ * ++ * http://www.opensource.org/licenses/gpl-license.html ++ * http://www.gnu.org/copyleft/gpl.html ++ */ ++ ++/*! ++ * @file mbm.c ++ * ++ * @brief Driver for Freescale CAN Controller FlexCAN. ++ * ++ * @ingroup can ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include "flexcan.h" ++ ++#define flexcan_swab32(x) \ ++ (((x) << 24) | ((x) >> 24) |\ ++ (((x) & (__u32)0x0000ff00UL) << 8) |\ ++ (((x) & (__u32)0x00ff0000UL) >> 8)) ++ ++static inline void flexcan_memcpy(void *dst, void *src, int len) ++{ ++ int i; ++ unsigned int *d = (unsigned int *)dst, *s = (unsigned int *)src; ++ len = (len + 3) >> 2; ++ for (i = 0; i < len; i++, s++, d++) ++ *d = flexcan_swab32(*s); ++} ++ ++static void flexcan_mb_bottom(struct net_device *dev, int index) ++{ ++ struct flexcan_device *flexcan = netdev_priv(dev); ++ struct net_device_stats *stats = (struct net_device_stats *) dev_get_stats (dev); // ~~~~~sven~~~~~ ++ struct can_hw_mb *hwmb; ++ struct can_frame *frame; ++ struct sk_buff *skb; ++ unsigned int tmp; ++ ++ hwmb = flexcan->hwmb + index; ++ if (flexcan->fifo || (index >= (flexcan->maxmb - flexcan->xmit_maxmb))) { ++ if (hwmb->mb_cs.cs.code == CAN_MB_TX_ABORT) ++ hwmb->mb_cs.cs.code = CAN_MB_TX_INACTIVE; ++ ++ if (hwmb->mb_cs.cs.code & CAN_MB_TX_INACTIVE) { ++ if (netif_queue_stopped(dev)) ++ netif_start_queue(dev); ++ return; ++ } ++ } ++ skb = dev_alloc_skb(sizeof(struct can_frame)); ++ if (skb) { ++ frame = (struct can_frame *)skb_put(skb, sizeof(*frame)); ++ memset(frame, 0, sizeof(*frame)); ++ if (hwmb->mb_cs.cs.ide) ++ frame->can_id = ++ (hwmb->mb_id & CAN_EFF_MASK) | CAN_EFF_FLAG; ++ else ++ frame->can_id = (hwmb->mb_id >> 18) & CAN_SFF_MASK; ++ ++ if (hwmb->mb_cs.cs.rtr) ++ frame->can_id |= CAN_RTR_FLAG; ++ ++ frame->can_dlc = hwmb->mb_cs.cs.length; ++ ++ if (frame->can_dlc && frame->can_dlc) ++ flexcan_memcpy(frame->data, hwmb->mb_data, ++ frame->can_dlc); ++ ++ if (flexcan->fifo ++ || (index >= (flexcan->maxmb - flexcan->xmit_maxmb))) { ++ hwmb->mb_cs.cs.code = CAN_MB_TX_INACTIVE; ++ if (netif_queue_stopped(dev)) ++ netif_start_queue(dev); ++ } ++ ++ tmp = __raw_readl(flexcan->io_base + CAN_HW_REG_TIMER); ++ ++ dev->last_rx = jiffies; ++ stats->rx_packets++; ++ stats->rx_bytes += frame->can_dlc; ++ ++ skb->dev = dev; ++ skb->protocol = __constant_htons(ETH_P_CAN); ++ skb->ip_summed = CHECKSUM_UNNECESSARY; ++ // netif_receive_skb (skb); ~~~~~sven~~~~~ ++ netif_rx (skb); //~~~~~sven~~~~~ ++ } else { ++ tmp = hwmb->mb_cs.data; ++ tmp = hwmb->mb_id; ++ tmp = hwmb->mb_data[0]; ++ if (flexcan->fifo ++ || (index >= (flexcan->maxmb - flexcan->xmit_maxmb))) { ++ ++ hwmb->mb_cs.cs.code = CAN_MB_TX_INACTIVE; ++ if (netif_queue_stopped(dev)) ++ netif_start_queue(dev); ++ } ++ tmp = __raw_readl(flexcan->io_base + CAN_HW_REG_TIMER); ++ stats->rx_dropped++; ++ } ++} ++ ++static void flexcan_fifo_isr(struct net_device *dev, unsigned int iflag1) ++{ ++ struct flexcan_device *flexcan = dev ? netdev_priv(dev) : NULL; ++ struct net_device_stats *stats = (struct net_device_stats *) dev_get_stats (dev); // ~~~~~sven~~~~~ ++ struct sk_buff *skb; ++ struct can_hw_mb *hwmb = flexcan->hwmb; ++ struct can_frame *frame; ++ unsigned int tmp; ++ ++ if (iflag1 & __FIFO_RDY_INT) { ++ skb = dev_alloc_skb(sizeof(struct can_frame)); ++ if (skb) { ++ frame = ++ (struct can_frame *)skb_put(skb, sizeof(*frame)); ++ memset(frame, 0, sizeof(*frame)); ++ if (hwmb->mb_cs.cs.ide) ++ frame->can_id = ++ (hwmb->mb_id & CAN_EFF_MASK) | CAN_EFF_FLAG; ++ else ++ frame->can_id = ++ (hwmb->mb_id >> 18) & CAN_SFF_MASK; ++ ++ if (hwmb->mb_cs.cs.rtr) ++ frame->can_id |= CAN_RTR_FLAG; ++ ++ frame->can_dlc = hwmb->mb_cs.cs.length; ++ ++ if (frame->can_dlc && (frame->can_dlc <= 8)) ++ flexcan_memcpy(frame->data, hwmb->mb_data, ++ frame->can_dlc); ++ tmp = __raw_readl(flexcan->io_base + CAN_HW_REG_TIMER); ++ ++ dev->last_rx = jiffies; ++ ++ stats->rx_packets++; ++ stats->rx_bytes += frame->can_dlc; ++ ++ skb->dev = dev; ++ skb->protocol = __constant_htons(ETH_P_CAN); ++ skb->ip_summed = CHECKSUM_UNNECESSARY; ++ //netif_receive_skb (skb); ~~~~~sven~~~~~ ++ netif_rx (skb); //~~~~~sven~~~~~ ++ } else { ++ tmp = hwmb->mb_cs.data; ++ tmp = hwmb->mb_id; ++ tmp = hwmb->mb_data[0]; ++ tmp = __raw_readl(flexcan->io_base + CAN_HW_REG_TIMER); ++ } ++ } ++ ++ if (iflag1 & (__FIFO_OV_INT | __FIFO_WARN_INT)) { ++ skb = dev_alloc_skb(sizeof(struct can_frame)); ++ if (skb) { ++ frame = ++ (struct can_frame *)skb_put(skb, sizeof(*frame)); ++ memset(frame, 0, sizeof(*frame)); ++ frame->can_id = CAN_ERR_FLAG | CAN_ERR_CRTL; ++ frame->can_dlc = CAN_ERR_DLC; ++ if (iflag1 & __FIFO_WARN_INT) ++ frame->data[1] |= ++ CAN_ERR_CRTL_TX_WARNING | ++ CAN_ERR_CRTL_RX_WARNING; ++ if (iflag1 & __FIFO_OV_INT) ++ frame->data[1] |= CAN_ERR_CRTL_RX_OVERFLOW; ++ ++ skb->dev = dev; ++ skb->protocol = __constant_htons(ETH_P_CAN); ++ skb->ip_summed = CHECKSUM_UNNECESSARY; ++ //netif_receive_skb (skb); ~~~~~sven~~~~~ ++ netif_rx (skb); //~~~~~sven~~~~~ ++ } ++ } ++} ++ ++/*! ++ * @brief The function call by CAN ISR to handle mb events. ++ * ++ * @param dev the pointer of network device. ++ * ++ * @return none ++ */ ++void flexcan_mbm_isr(struct net_device *dev) ++{ ++ int i, iflag1, iflag2, maxmb; ++ struct flexcan_device *flexcan = dev ? netdev_priv(dev) : NULL; ++ ++ if (flexcan->maxmb > 31) { ++ maxmb = flexcan->maxmb + 1 - 32; ++ iflag1 = __raw_readl(flexcan->io_base + CAN_HW_REG_IFLAG1) & ++ __raw_readl(flexcan->io_base + CAN_HW_REG_IMASK1); ++ iflag2 = __raw_readl(flexcan->io_base + CAN_HW_REG_IFLAG2) & ++ __raw_readl(flexcan->io_base + CAN_HW_REG_IMASK2); ++ iflag2 &= (1 << maxmb) - 1; ++ maxmb = 32; ++ } else { ++ maxmb = flexcan->maxmb + 1; ++ iflag1 = __raw_readl(flexcan->io_base + CAN_HW_REG_IFLAG1) & ++ __raw_readl(flexcan->io_base + CAN_HW_REG_IMASK1); ++ iflag1 &= (1 << maxmb) - 1; ++ iflag2 = 0; ++ } ++ ++ __raw_writel(iflag1, flexcan->io_base + CAN_HW_REG_IFLAG1); ++ __raw_writel(iflag2, flexcan->io_base + CAN_HW_REG_IFLAG2); ++ ++ if (flexcan->fifo) { ++ flexcan_fifo_isr(dev, iflag1); ++ iflag1 &= 0xFFFFFF00; ++ } ++ for (i = 0; iflag1 && (i < maxmb); i++) { ++ if (iflag1 & (1 << i)) { ++ iflag1 &= ~(1 << i); ++ flexcan_mb_bottom(dev, i); ++ } ++ } ++ ++ for (i = maxmb; iflag2 && (i <= flexcan->maxmb); i++) { ++ if (iflag2 & (1 << (i - 32))) { ++ iflag2 &= ~(1 << (i - 32)); ++ flexcan_mb_bottom(dev, i); ++ } ++ } ++} ++ ++/*! ++ * @brief function to xmit message buffer ++ * ++ * @param flexcan the pointer of can hardware device. ++ * @param frame the pointer of can message frame. ++ * ++ * @return Returns 0 if xmit is success. otherwise returns non-zero. ++ */ ++int flexcan_mbm_xmit(struct flexcan_device *flexcan, struct can_frame *frame) ++{ ++ int i = flexcan->xmit_mb; ++ struct can_hw_mb *hwmb = flexcan->hwmb; ++ ++ do { ++ if (hwmb[i].mb_cs.cs.code == CAN_MB_TX_INACTIVE) ++ break; ++ if ((++i) > flexcan->maxmb) { ++ if (flexcan->fifo) ++ i = FLEXCAN_MAX_FIFO_MB; ++ else ++ i = flexcan->xmit_maxmb + 1; ++ } ++ if (i == flexcan->xmit_mb) ++ return -1; ++ } while (1); ++ ++ flexcan->xmit_mb = i + 1; ++ if (flexcan->xmit_mb > flexcan->maxmb) { ++ if (flexcan->fifo) ++ flexcan->xmit_mb = FLEXCAN_MAX_FIFO_MB; ++ else ++ flexcan->xmit_mb = flexcan->xmit_maxmb + 1; ++ } ++ ++ if (frame->can_id & CAN_RTR_FLAG) ++ hwmb[i].mb_cs.cs.rtr = 1; ++ else ++ hwmb[i].mb_cs.cs.rtr = 0; ++ ++ if (frame->can_id & CAN_EFF_FLAG) { ++ hwmb[i].mb_cs.cs.ide = 1; ++ hwmb[i].mb_cs.cs.srr = 1; ++ hwmb[i].mb_id = frame->can_id & CAN_EFF_MASK; ++ } else { ++ hwmb[i].mb_cs.cs.ide = 0; ++ hwmb[i].mb_id = (frame->can_id & CAN_SFF_MASK) << 18; ++ } ++ ++ hwmb[i].mb_cs.cs.length = frame->can_dlc; ++ flexcan_memcpy(hwmb[i].mb_data, frame->data, frame->can_dlc); ++ hwmb[i].mb_cs.cs.code = CAN_MB_TX_ONCE; ++ return 0; ++} ++ ++/*! ++ * @brief function to initial message buffer ++ * ++ * @param flexcan the pointer of can hardware device. ++ * ++ * @return none ++ */ ++void flexcan_mbm_init(struct flexcan_device *flexcan) ++{ ++ struct can_hw_mb *hwmb; ++ int rx_mb, i; ++ ++ /* Set global mask to receive all messages */ ++ __raw_writel(0, flexcan->io_base + CAN_HW_REG_RXGMASK); ++ __raw_writel(0, flexcan->io_base + CAN_HW_REG_RX14MASK); ++ __raw_writel(0, flexcan->io_base + CAN_HW_REG_RX15MASK); ++ ++ memset(flexcan->hwmb, 0, sizeof(*hwmb) * FLEXCAN_MAX_MB); ++ /* Set individual mask to receive all messages */ ++ memset(flexcan->rx_mask, 0, sizeof(unsigned int) * FLEXCAN_MAX_MB); ++ ++ if (flexcan->fifo) ++ rx_mb = FLEXCAN_MAX_FIFO_MB; ++ else ++ rx_mb = flexcan->maxmb - flexcan->xmit_maxmb; ++ ++ hwmb = flexcan->hwmb; ++ if (flexcan->fifo) { ++ unsigned long *id_table = flexcan->io_base + CAN_FIFO_BASE; ++ for (i = 0; i < rx_mb; i++) ++ id_table[i] = 0; ++ } else { ++ for (i = 0; i < rx_mb; i++) { ++ hwmb[i].mb_cs.cs.code = CAN_MB_RX_EMPTY; ++ /* ++ * IDE bit can not control by mask registers ++ * So set message buffer to receive extend ++ * or standard message. ++ */ ++ if (flexcan->ext_msg && flexcan->std_msg) ++ hwmb[i].mb_cs.cs.ide = i & 1; ++ else { ++ if (flexcan->ext_msg) ++ hwmb[i].mb_cs.cs.ide = 1; ++ } ++ } ++ } ++ ++ for (; i <= flexcan->maxmb; i++) ++ hwmb[i].mb_cs.cs.code = CAN_MB_TX_INACTIVE; ++ ++ flexcan->xmit_mb = rx_mb; ++} +Index: linux-2.6.31.6/drivers/net/can/Kconfig +=================================================================== +--- linux-2.6.31.6.orig/drivers/net/can/Kconfig 2009-11-10 01:32:31.000000000 +0100 ++++ linux-2.6.31.6/drivers/net/can/Kconfig 2009-12-16 17:34:40.585687608 +0100 +@@ -84,4 +84,13 @@ + a problem with CAN support and want to see more of what is going + on. + ++config CAN_FLEXCAN ++ tristate "Freescale FlexCAN" ++ depends on CAN && ARCH_MX35 ++ default m ++ ---help--- ++ This select the support of Freescale CAN(FlexCAN). ++ This driver can also be built as a module. ++ If unsure, say N. ++ + endmenu +Index: linux-2.6.31.6/drivers/net/can/Makefile +=================================================================== +--- linux-2.6.31.6.orig/drivers/net/can/Makefile 2009-11-10 01:32:31.000000000 +0100 ++++ linux-2.6.31.6/drivers/net/can/Makefile 2009-12-16 17:34:40.585687608 +0100 +@@ -9,4 +9,6 @@ + + obj-$(CONFIG_CAN_SJA1000) += sja1000/ + ++obj-$(CONFIG_CAN_FLEXCAN) += flexcan/ ++ + ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG +Index: linux-2.6.31.6/arch/arm/plat-mxc/include/mach/mxc_flexcan.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.31.6/arch/arm/plat-mxc/include/mach/mxc_flexcan.h 2009-12-16 17:34:40.585687608 +0100 +@@ -0,0 +1,29 @@ ++/* ++ * Copyright (C) 2009 Jan Weitzel ++ * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#ifndef __ASM_ARCH_MXC_FLEXCAN ++#define __ASM_ARCH_MXC_FLEXCAN ++ ++struct flexcan_platform_data { ++#ifdef REGULATOR ++ char *core_reg; ++ char *io_reg; ++#endif ++ void (*xcvr_enable) (int id, int en); ++ void (*active) (int id); ++ void (*inactive) (int id); ++}; ++ ++#endif /* __ASM_ARCH_MXC_FLEXCAN */ +Index: linux-2.6.31.6/arch/arm/mach-mx3/pcm043.c +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/mach-mx3/pcm043.c 2009-12-16 17:34:40.295686175 +0100 ++++ linux-2.6.31.6/arch/arm/mach-mx3/pcm043.c 2009-12-17 12:45:43.254686159 +0100 +@@ -49,6 +49,7 @@ + #include + #include + #include ++#include + + #include "devices.h" + +@@ -150,6 +151,34 @@ + &mxc_fec_device, + }; + ++static void flexcan_xcvr_enable(int id, int en) ++{ ++ static int pwdn; ++ ++ if (id < 0 || id > 1) ++ return; ++ ++ if (en) { ++ if (!(pwdn++)) ++ ;//pmic_gpio_set_bit_val(MCU_GPIO_REG_GPIO_CONTROL_2, 1, 0); ++ } else { ++ if (!(--pwdn)) ++ ;//pmic_gpio_set_bit_val(MCU_GPIO_REG_GPIO_CONTROL_2, 1, 1); ++ } ++} ++ ++struct flexcan_platform_data flexcan_data0 = { ++ .xcvr_enable = flexcan_xcvr_enable, ++// .active = gpio_can_active, ++// .inactive = gpio_can_inactive, ++}; ++ ++struct flexcan_platform_data flexcan_data1 = { ++ .xcvr_enable = flexcan_xcvr_enable, ++// .active = gpio_can_active, ++// .inactive = gpio_can_inactive, ++}; ++ + static struct pad_desc pcm043_pads[] = { + /* UART1 */ + MX35_PAD_CTS1__UART1_CTS, +@@ -218,6 +247,12 @@ + MX35_PAD_STXD4__AUDMUX_AUD4_TXD, + MX35_PAD_SRXD4__AUDMUX_AUD4_RXD, + MX35_PAD_SCK4__AUDMUX_AUD4_TXC, ++ /* CAN */ ++ MX35_PAD_SD2_DATA2__CAN1_RXCAN, ++ MX35_PAD_SD2_DATA3__CAN1_TXCAN, ++ MX35_PAD_SD2_DATA1__GPIO2_3, ++ MX35_PAD_TX5_RX0__CAN2_TXCAN, ++ MX35_PAD_TX4_RX1__CAN2_RXCAN, + }; + + static int pcm043_usbh1_init(struct platform_device *pdev) +@@ -414,6 +449,14 @@ + mxc_register_device(&mxc_otg, &otg_pdata); + else + mxc_register_device(&mxc_otg_udc_device, &usb_data); ++ ++ mxc_register_device (&flexcan_device0, &flexcan_data0); ++ mxc_register_device (&flexcan_device1, &flexcan_data1); ++ ++ // Activate CAN-port on mapper ++ gpio_request (32 + 3, "can"); ++ gpio_direction_output (32 + 3, 1); ++ gpio_set_value (32 + 3, 1); + } + + static void __init pcm043_timer_init(void) +Index: linux-2.6.31.6/arch/arm/mach-mx3/devices.c +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/mach-mx3/devices.c 2009-12-16 17:34:40.234637457 +0100 ++++ linux-2.6.31.6/arch/arm/mach-mx3/devices.c 2009-12-16 17:34:40.595627212 +0100 +@@ -475,6 +475,46 @@ + .num_resources = ARRAY_SIZE(mxc_fec_resources), + .resource = mxc_fec_resources, + }; ++ ++static struct resource flexcan0_resources[] = { ++ { ++ .start = MX35_CAN1_BASE_ADDR, ++ .end = MX35_CAN1_BASE_ADDR + 0x97F, ++ .flags = IORESOURCE_MEM ++ }, { ++ .start = MXC_INT_CAN1, ++ .end = MXC_INT_CAN1, ++ .flags = IORESOURCE_IRQ ++ } ++}; ++ ++static struct resource flexcan1_resources[] = { ++ { ++ .start = MX35_CAN2_BASE_ADDR, ++ .end = MX35_CAN2_BASE_ADDR + 0x97F, ++ .flags = IORESOURCE_MEM ++ }, { ++ .start = MXC_INT_CAN2, ++ .end = MXC_INT_CAN2, ++ .flags = IORESOURCE_IRQ ++ } ++}; ++ ++struct platform_device flexcan_device0 = { ++ .name = "FlexCAN", ++ .id = 0, ++ .num_resources = ARRAY_SIZE(flexcan0_resources), ++ .resource = flexcan0_resources, ++ //FIXME.dev = { .release = mxc_nop_release ++}; ++ ++struct platform_device flexcan_device1 = { ++ .name = "FlexCAN", ++ .id = 1, ++ .num_resources = ARRAY_SIZE(flexcan1_resources), ++ .resource = flexcan1_resources, ++}; ++ + #endif + + static struct resource imx_ssi_resources0[] = { +Index: linux-2.6.31.6/arch/arm/mach-mx3/devices.h +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/mach-mx3/devices.h 2009-12-16 17:34:39.985630161 +0100 ++++ linux-2.6.31.6/arch/arm/mach-mx3/devices.h 2009-12-16 17:34:40.595627212 +0100 +@@ -25,3 +25,5 @@ + extern struct platform_device imx_spi_device0; + extern struct platform_device imx_spi_device1; + extern struct platform_device imx_spi_device2; ++extern struct platform_device flexcan_device0; ++extern struct platform_device flexcan_device1; +Index: linux-2.6.31.6/arch/arm/plat-mxc/include/mach/mx35.h +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/plat-mxc/include/mach/mx35.h 2009-12-16 17:34:40.055669053 +0100 ++++ linux-2.6.31.6/arch/arm/plat-mxc/include/mach/mx35.h 2009-12-16 17:34:40.595627212 +0100 +@@ -7,6 +7,8 @@ + #define MXC_FEC_BASE_ADDR 0x50038000 + #define MX35_OTG_BASE_ADDR 0x53ff4000 + #define MX35_NFC_BASE_ADDR 0xBB000000 ++#define MX35_CAN1_BASE_ADDR 0x53FE4000 ++#define MX35_CAN2_BASE_ADDR 0x53FE8000 + + /* + * Interrupt numbers +Index: linux-2.6.31.6/arch/arm/mach-mx3/clock-imx35.c +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/mach-mx3/clock-imx35.c 2009-12-16 17:34:40.245728272 +0100 ++++ linux-2.6.31.6/arch/arm/mach-mx3/clock-imx35.c 2009-12-17 12:46:53.565502506 +0100 +@@ -478,6 +478,8 @@ + _REGISTER_CLOCK(NULL, "iim", iim_clk) + _REGISTER_CLOCK(NULL, "gpu2d", gpu2d_clk) + _REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk) ++ _REGISTER_CLOCK("FlexCAN.0", "can_clk", can1_clk) ++ _REGISTER_CLOCK("FlexCAN.1", "can_clk", can2_clk) + }; + + int __init mx35_clocks_init() diff --git a/recipes/linux/linux-2.6.31/pcm043/linux-2.6.31.6-spi.patch b/recipes/linux/linux-2.6.31/pcm043/linux-2.6.31.6-spi.patch new file mode 100644 index 0000000000..a49f05b2ec --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/linux-2.6.31.6-spi.patch @@ -0,0 +1,116 @@ +Add support for SPI and MAX7301 +Signed-off-by: Sven Dyroff + +rebased to 2.6.31.6 +Signed-off-by: Andreas Adam +--- +Index: linux-2.6.31.6/arch/arm/mach-mx3/pcm043.c +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/mach-mx3/pcm043.c 2009-12-11 13:58:49.894701069 +0100 ++++ linux-2.6.31.6/arch/arm/mach-mx3/pcm043.c 2009-12-11 14:01:08.704700136 +0100 +@@ -30,6 +30,12 @@ + #include + #include + #include ++#ifdef CONFIG_SPI ++#include ++#endif ++#ifdef CONFIG_GPIO_MAX7301 ++#include ++#endif + + #include + #include +@@ -42,6 +48,9 @@ + #if defined CONFIG_I2C_IMX || defined CONFIG_I2C_IMX_MODULE + #include + #endif ++#ifdef CONFIG_SPI ++#include ++#endif + #include + #include + #include +@@ -243,6 +252,18 @@ + /* USB host */ + MX35_PAD_I2C2_CLK__USB_TOP_USBH2_PWR, + MX35_PAD_I2C2_DAT__USB_TOP_USBH2_OC, ++ /* SPI */ ++ MX35_PAD_CSPI1_SS0__CSPI1_SS0, ++ MX35_PAD_CSPI1_SS1__CSPI1_SS1, ++ MX35_PAD_CSPI1_MISO__CSPI1_MISO, ++ MX35_PAD_CSPI1_MOSI__CSPI1_MOSI, ++ MX35_PAD_CSPI1_SCLK__CSPI1_SCLK, ++ MX35_PAD_CSPI1_SPI_RDY__CSPI1_RDY, ++ MX35_PAD_STXD5__CSPI2_MOSI, ++ MX35_PAD_SRXD5__CSPI2_MISO, ++ MX35_PAD_SCK5__CSPI2_SCLK, ++ MX35_PAD_STXFS5__CSPI2_RDY, ++ MX35_PAD_HCKR__CSPI2_SS0, + /* SSI */ + MX35_PAD_STXFS4__AUDMUX_AUD4_TXFS, + MX35_PAD_STXD4__AUDMUX_AUD4_TXD, +@@ -305,6 +326,33 @@ + .phy_mode = FSL_USB2_PHY_UTMI, + }; + ++#ifdef CONFIG_SPI ++static unsigned int pcm043_spi_cs [] = {MXC_SPI_CS(0), }; ++ ++static struct spi_imx_master pcm043_spi_1_data = { ++ .chipselect = pcm043_spi_cs, ++ .num_chipselect = ARRAY_SIZE (pcm043_spi_cs), ++}; ++#endif /* CONFIG_SPI */ ++ ++#ifdef CONFIG_GPIO_MAX7301 ++static struct max7301_platform_data max7301_info = { ++ .base = -1, ++}; ++ ++// bus_num must match id in imx_spi_device struct ++static struct spi_board_info spi_board_info [] __initdata = { ++ { ++ .modalias = "max7301", ++ .platform_data = &max7301_info, ++ .max_speed_hz = 13000000, ++ .bus_num = 1, ++ .chip_select = 0, ++ .mode = SPI_MODE_0, ++ }, ++}; ++#endif /* CONFIG_GPIO_MAX7301 */ ++ + static int otg_mode_host; + + static int __init pcm043_otg_mode(char *options) +@@ -454,7 +502,13 @@ + mxc_register_device(&mxc_otg, &otg_pdata); + else + mxc_register_device(&mxc_otg_udc_device, &usb_data); +- ++#ifdef CONFIG_SPI ++ mxc_register_device (&imx_spi_device1, &pcm043_spi_1_data); ++#endif ++#ifdef CONFIG_GPIO_MAX7301 ++ spi_register_board_info (spi_board_info, ++ ARRAY_SIZE (spi_board_info)); ++#endif + mxc_register_device (&flexcan_device0, &flexcan_data0); + mxc_register_device (&flexcan_device1, &flexcan_data1); + +Index: linux-2.6.31.6/arch/arm/plat-mxc/include/mach/mx3x.h +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/plat-mxc/include/mach/mx3x.h 2009-11-10 01:32:31.000000000 +0100 ++++ linux-2.6.31.6/arch/arm/plat-mxc/include/mach/mx3x.h 2009-12-11 13:59:13.976022108 +0100 +@@ -279,8 +279,8 @@ + + /* Mandatory defines used globally */ + +-/* this CPU supports up to 96 GPIOs */ +-#define ARCH_NR_GPIOS 96 ++/* this CPU supports up to 96 GPIOs (don't forget the gpio expander!) */ ++#define ARCH_NR_GPIOS (96 + 28) + + #if !defined(__ASSEMBLY__) && !defined(__MXC_BOOT_UNCOMPRESS) + diff --git a/recipes/linux/linux-2.6.31/pcm043/w1_master.patch b/recipes/linux/linux-2.6.31/pcm043/w1_master.patch new file mode 100644 index 0000000000..d16cc9c806 --- /dev/null +++ b/recipes/linux/linux-2.6.31/pcm043/w1_master.patch @@ -0,0 +1,26 @@ +Add 1-wire +Signed-off-by: Jan Weitzel +--- +Index: linux-2.6.31.6/arch/arm/mach-mx3/pcm043.c +=================================================================== +--- linux-2.6.31.6.orig/arch/arm/mach-mx3/pcm043.c 2009-12-11 13:52:55.964646780 +0100 ++++ linux-2.6.31.6/arch/arm/mach-mx3/pcm043.c 2009-12-11 13:55:28.858433047 +0100 +@@ -149,6 +149,7 @@ + static struct platform_device *devices[] __initdata = { + &pcm043_flash, + &mxc_fec_device, ++ &mxc_w1_master_device, + }; + + static void flexcan_xcvr_enable(int id, int en) +@@ -247,7 +248,9 @@ + MX35_PAD_STXD4__AUDMUX_AUD4_TXD, + MX35_PAD_SRXD4__AUDMUX_AUD4_RXD, + MX35_PAD_SCK4__AUDMUX_AUD4_TXC, +- /* CAN */ ++ /* 1-Wire*/ ++ MX35_PAD_GPIO1_0__OWIRE_LINE, ++ /* CAN */ + MX35_PAD_SD2_DATA2__CAN1_RXCAN, + MX35_PAD_SD2_DATA3__CAN1_TXCAN, + MX35_PAD_SD2_DATA1__GPIO2_3, diff --git a/recipes/linux/linux/pcm043/defconfig b/recipes/linux/linux/pcm043/defconfig new file mode 100644 index 0000000000..72334d3897 --- /dev/null +++ b/recipes/linux/linux/pcm043/defconfig @@ -0,0 +1,1659 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.31.6 +# +CONFIG_ARM=y +CONFIG_HAVE_PWM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_FIQ=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set + +# +# RCU Subsystem +# +# CONFIG_CLASSIC_RCU is not set +CONFIG_TREE_RCU=y +# CONFIG_PREEMPT_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_PREEMPT_RCU_TRACE is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_GROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set +# CONFIG_CGROUPS is not set +CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +# CONFIG_BLK_DEV_INITRD is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y + +# +# Performance Counters +# +CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_STRIP_ASM_SYMS is not set +CONFIG_COMPAT_BRK=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +# CONFIG_MARKERS is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_CLK=y + +# +# GCOV-based kernel profiling +# +# CONFIG_SLOW_WORK is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_BLOCK=y +# CONFIG_LBDAF is not set +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +# CONFIG_IOSCHED_AS is not set +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +CONFIG_DEFAULT_NOOP=y +CONFIG_DEFAULT_IOSCHED="noop" +# CONFIG_FREEZER is not set + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_GEMINI is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +CONFIG_ARCH_MXC=y +# CONFIG_ARCH_STMP3XXX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_MMP is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_W90X900 is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_MSM is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_U300 is not set +# CONFIG_ARCH_DAVINCI is not set +# CONFIG_ARCH_OMAP is not set + +# +# Freescale MXC Implementations +# +# CONFIG_ARCH_MX1 is not set +# CONFIG_ARCH_MX2 is not set +CONFIG_ARCH_MX3=y +CONFIG_ARCH_MX35=y + +# +# MX3 platforms: +# +# CONFIG_MACH_MX31ADS is not set +# CONFIG_MACH_PCM037 is not set +# CONFIG_MACH_MX31LITE is not set +# CONFIG_MACH_MX31_3DS is not set +# CONFIG_MACH_MX31MOBOARD is not set +# CONFIG_MACH_MX31LILLY is not set +# CONFIG_MACH_QONG is not set +CONFIG_MACH_PCM043=y +# CONFIG_MACH_ARMADILLO5X0 is not set +# CONFIG_MACH_MX35_3DS is not set +# CONFIG_MXC_IRQ_PRIOR is not set +CONFIG_MXC_PWM=y +CONFIG_ARCH_MXC_IOMUX_V3=y +CONFIG_ARCH_MXC_AUDMUX_V2=y + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_V6=y +# CONFIG_CPU_32v6K is not set +CONFIG_CPU_32v6=y +CONFIG_CPU_ABRT_EV6=y +CONFIG_CPU_PABRT_NOIFAR=y +CONFIG_CPU_CACHE_V6=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y +CONFIG_CPU_TLB_V6=y +CONFIG_CPU_HAS_ASID=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_OUTER_CACHE=y +CONFIG_CACHE_L2X0=y +# CONFIG_ARM_ERRATA_411920 is not set +CONFIG_COMMON_CLKDEV=y + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PREEMPT=y +CONFIG_HZ=100 +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_HIGHMEM is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_VIRT_TO_BUS=y +CONFIG_HAVE_MLOCK=y +CONFIG_HAVE_MLOCKED_PAGE_BIT=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_ALIGNMENT_TRAP=y +# CONFIG_UACCESS_WITH_MEMCPY is not set + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mtdblock2 rw ip=off" +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set + +# +# CPU Power Management +# +# CONFIG_CPU_IDLE is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_VFP=y + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +# CONFIG_PM is not set +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_CAN=y +CONFIG_CAN_RAW=y +# CONFIG_CAN_BCM is not set + +# +# CAN Device Drivers +# +# CONFIG_CAN_VCAN is not set +CONFIG_CAN_DEV=y +CONFIG_CAN_CALC_BITTIMING=y +CONFIG_CAN_SJA1000=y +CONFIG_CAN_SJA1000_PLATFORM=y +# CONFIG_CAN_DEBUG_DEVICES is not set +CONFIG_CAN_FLEXCAN=y +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +# CONFIG_WIRELESS is not set +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=m +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_TESTS is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_AMDSTD=y +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +CONFIG_MTD_RAM=y +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_XIP is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +CONFIG_MTD_PHYSMAP=y +# CONFIG_MTD_PHYSMAP_COMPAT is not set +# CONFIG_MTD_ARM_INTEGRATOR is not set +CONFIG_MTD_PLATRAM=y + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_GPIO is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ALAUDA is not set +CONFIG_MTD_NAND_MXC_V2=y +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +# CONFIG_PARPORT is not set +# CONFIG_BLK_DEV is not set +CONFIG_MISC_DEVICES=y +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_ISL29003 is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=y +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_EEPROM_93CX6 is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +# CONFIG_SCSI_PROC_FS is not set + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +# CONFIG_CHR_DEV_SG is not set +# CONFIG_CHR_DEV_SCH is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +# CONFIG_SCSI_LOWLEVEL is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +# CONFIG_ATA is not set +# CONFIG_MD is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_AX88796 is not set +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_ENC28J60 is not set +# CONFIG_ETHOC is not set +# CONFIG_SMC911X is not set +# CONFIG_SMSC911X is not set +# CONFIG_DNET is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_B44 is not set +# CONFIG_KS8842 is not set +# CONFIG_KS8851 is not set +CONFIG_FEC=y +# CONFIG_FEC2 is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +CONFIG_USB_USBNET=y +CONFIG_USB_NET_AX8817X=y +CONFIG_USB_NET_CDCETHER=y +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_DM9601 is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +CONFIG_USB_NET_NET1080=y +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +CONFIG_USB_NET_CDC_SUBSET=y +# CONFIG_USB_ALI_M5632 is not set +# CONFIG_USB_AN2720 is not set +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_KC2190 is not set +CONFIG_USB_NET_ZAURUS=y +# CONFIG_USB_NET_INT51X1 is not set +# CONFIG_WAN is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_KEYBOARD_MATRIX is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_ELANTECH is not set +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_BCM5974 is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_GPIO is not set +# CONFIG_MOUSE_SYNAPTICS_I2C is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set +# CONFIG_TOUCHSCREEN_AD7879_I2C is not set +# CONFIG_TOUCHSCREEN_AD7879_SPI is not set +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_EETI is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +CONFIG_TOUCHSCREEN_WM97XX=y +# CONFIG_TOUCHSCREEN_WM9705 is not set +CONFIG_TOUCHSCREEN_WM9712=y +# CONFIG_TOUCHSCREEN_WM9713 is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_TOUCHSCREEN_W90X900 is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_MAX3100 is not set +CONFIG_SERIAL_IMX=y +CONFIG_SERIAL_IMX_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +# CONFIG_LEGACY_PTYS is not set +# CONFIG_IPMI_HANDLER is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE is not set +# CONFIG_I2C_GPIO is not set +CONFIG_I2C_IMX=y +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_SIMTEC is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_DS1682 is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_PCF8575 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=y +# CONFIG_SPI_GPIO is not set +CONFIG_SPI_IMX=y + +# +# SPI Protocol Masters +# +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y + +# +# Memory mapped GPIO expanders: +# + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +CONFIG_W1=y + +# +# 1-wire Bus Masters +# +# CONFIG_W1_MASTER_DS2490 is not set +# CONFIG_W1_MASTER_DS2482 is not set +CONFIG_W1_MASTER_MXC=y +# CONFIG_W1_MASTER_DS1WM is not set +# CONFIG_W1_MASTER_GPIO is not set + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=y +# CONFIG_W1_SLAVE_SMEM is not set +# CONFIG_W1_SLAVE_DS2431 is not set +CONFIG_W1_SLAVE_DS2433=y +# CONFIG_W1_SLAVE_DS2433_CRC is not set +# CONFIG_W1_SLAVE_DS2760 is not set +# CONFIG_W1_SLAVE_BQ27000 is not set +# CONFIG_POWER_SUPPLY is not set +# CONFIG_HWMON is not set +# CONFIG_THERMAL is not set +# CONFIG_THERMAL_HWMON is not set +# CONFIG_WATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=y +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_UCB1400_CORE is not set +# CONFIG_TPS65010 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_PCF50633 is not set +CONFIG_MFD_MC13783=y +# CONFIG_AB3100_CORE is not set +# CONFIG_EZX_PCAP is not set +# CONFIG_MEDIA_SUPPORT is not set + +# +# Graphics support +# +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_TMIO is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +CONFIG_FB_MX3=y +# CONFIG_FB_BROADSHEET is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE is not set +# CONFIG_LOGO is not set +CONFIG_SOUND=y +# CONFIG_SOUND_OSS_CORE is not set +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_JACK=y +# CONFIG_SND_SEQUENCER is not set +# CONFIG_SND_MIXER_OSS is not set +# CONFIG_SND_PCM_OSS is not set +# CONFIG_SND_HRTIMER is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +# CONFIG_SND_RAWMIDI_SEQ is not set +# CONFIG_SND_OPL3_LIB_SEQ is not set +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +# CONFIG_SND_EMU10K1_SEQ is not set +# CONFIG_SND_DRIVERS is not set +# CONFIG_SND_ARM is not set +# CONFIG_SND_SPI is not set +CONFIG_SND_USB=y +# CONFIG_SND_USB_AUDIO is not set +# CONFIG_SND_USB_CAIAQ is not set +CONFIG_SND_SOC=y +CONFIG_SND_SOC_AC97_BUS=y +CONFIG_SND_IMX_SOC=y +CONFIG_SND_MXC_SOC_SSI=y +CONFIG_SND_SOC_PHYCORE_AC97=y +CONFIG_SND_SOC_I2C_AND_SPI=y +# CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_WM9712=y +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=y +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +CONFIG_HID_DEBUG=y +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set + +# +# Special HID drivers +# +# CONFIG_HID_A4TECH is not set +# CONFIG_HID_APPLE is not set +# CONFIG_HID_BELKIN is not set +# CONFIG_HID_CHERRY is not set +# CONFIG_HID_CHICONY is not set +# CONFIG_HID_CYPRESS is not set +# CONFIG_HID_DRAGONRISE is not set +# CONFIG_HID_EZKEY is not set +# CONFIG_HID_KYE is not set +# CONFIG_HID_GYRATION is not set +# CONFIG_HID_KENSINGTON is not set +# CONFIG_HID_LOGITECH is not set +# CONFIG_HID_MICROSOFT is not set +# CONFIG_HID_MONTEREY is not set +# CONFIG_HID_NTRIG is not set +# CONFIG_HID_PANTHERLORD is not set +# CONFIG_HID_PETALYNX is not set +# CONFIG_HID_SAMSUNG is not set +# CONFIG_HID_SONY is not set +# CONFIG_HID_SUNPLUS is not set +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TOPSEED is not set +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_ZEROPLUS is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_USB_ARCH_HAS_OHCI is not set +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_MON=y +# CONFIG_USB_WUSB is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +CONFIG_USB_EHCI_MXC=y +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_HWA_HCD is not set +# CONFIG_USB_MUSB_HDRC is not set +# CONFIG_USB_GADGET_MUSB_HDRC is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set +# CONFIG_USB_WDM is not set +# CONFIG_USB_TMC is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_SISUSBVGA is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_VST is not set +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_ATMEL_USBA is not set +CONFIG_USB_GADGET_FSL_USB2=y +CONFIG_USB_FSL_USB2=y +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_PXA25X is not set +# CONFIG_USB_GADGET_PXA27X is not set +# CONFIG_USB_GADGET_S3C_HSOTG is not set +# CONFIG_USB_GADGET_IMX is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_FSL_QE is not set +# CONFIG_USB_GADGET_CI13XXX is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LANGWELL is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +# CONFIG_USB_ZERO is not set +# CONFIG_USB_AUDIO is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_GADGETFS is not set +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +# CONFIG_USB_CDC_COMPOSITE is not set + +# +# OTG and related infrastructure +# +# CONFIG_USB_GPIO_VBUS is not set +# CONFIG_NOP_USB_XCEIV is not set +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_BOUNCE=y +# CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_IO_ACCESSORS=y +CONFIG_MMC_SDHCI_ESDHC=y +CONFIG_MMC_SDHCI_PLTFM=y +# CONFIG_MMC_AT91 is not set +# CONFIG_MMC_ATMELMCI is not set +# CONFIG_MMC_MXC is not set +# CONFIG_MMC_SPI is not set +# CONFIG_MEMSTICK is not set +# CONFIG_ACCESSIBILITY is not set +# CONFIG_NEW_LEDS is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_X1205 is not set +CONFIG_RTC_DRV_PCF8563=y +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +CONFIG_DMADEVICES=y + +# +# DMA Devices +# +CONFIG_MX3_IPU=y +CONFIG_MX3_IPU_IRQS=4 +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +# CONFIG_NET_DMA is not set +# CONFIG_ASYNC_TX_DMA is not set +# CONFIG_DMATEST is not set +# CONFIG_AUXDISPLAY is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_BQ24022 is not set +# CONFIG_REGULATOR_MAX1586 is not set +# CONFIG_REGULATOR_LP3971 is not set +# CONFIG_UIO is not set +# CONFIG_STAGING is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4_FS is not set +CONFIG_JBD=y +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +CONFIG_FS_POSIX_ACL=y +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +# CONFIG_DNOTIFY is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_CRAMFS is not set +# CONFIG_SQUASHFS is not set +# CONFIG_VXFS_FS is not set +CONFIG_MINIX_FS=y +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +# CONFIG_NILFS2_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set +CONFIG_ROOT_NFS=y +# CONFIG_NFSD is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +CONFIG_NLS_CODEPAGE_850=y +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +CONFIG_NLS_ISO8859_15=y +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set +# CONFIG_DLM is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_ENABLE_WARN_DEPRECATED is not set +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=1024 +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_DETECT_HUNG_TASK is not set +# CONFIG_SCHED_DEBUG is not set +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_SYSCTL_SYSCALL_CHECK is not set +# CONFIG_PAGE_POISONING is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_TRACING_SUPPORT=y +# CONFIG_FTRACE is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_ARM_UNWIND=y +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_ERRORS is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_LL is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +# CONFIG_CRYPTO_FIPS is not set +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +CONFIG_CRYPTO_WORKQUEUE=y +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +# CONFIG_CRYPTO_ECB is not set +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set + +# +# Digest +# +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_ZLIB is not set +# CONFIG_CRYPTO_LZO is not set + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +# CONFIG_CRYPTO_HW is not set +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_RATIONAL=y +CONFIG_GENERIC_FIND_LAST_BIT=y +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +# CONFIG_CRC_T10DIF is not set +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y From 62599fad991443ec7d4d441fcea5e53d270ef14e Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 1 Mar 2011 19:37:51 +0100 Subject: [PATCH 165/509] curl: fix native build when ldap-headers are installed on the host * there were serval build error reported for curl-native, when ldap-dev stuff was installed on the build-host, so we explicit disable the build of ldap and ldaps protocls for native, nativesdk and sdk * put the BBCLASSEXTEND line into common.inc rather than into the versions packages it self * bump INC_PR --- recipes/curl/curl-common.inc | 8 +++++++- recipes/curl/curl_7.21.1.bb | 1 - recipes/curl/curl_7.21.2.bb | 1 - 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/recipes/curl/curl-common.inc b/recipes/curl/curl-common.inc index ddaebb8672..f18f23162c 100644 --- a/recipes/curl/curl-common.inc +++ b/recipes/curl/curl-common.inc @@ -6,7 +6,9 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2;name=tarball \ file://pkgconfig_fix.patch" S = "${WORKDIR}/curl-${PV}" -INC_PR = "r4" +INC_PR = "r5" + +BBCLASSEXTEND = "native nativesdk sdk" CURL_FEATURES = ${@['zlib,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp','zlib,gnutls,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp']["${BPN}" == "${PN}"]} # other allowed features: ipv6, ares, openssl @@ -19,6 +21,10 @@ EXTRA_OECONF = " \ --without-libidn \ " +EXTRA_OECONF_append_virtclass-native = " --disable-ldap --disable-ldaps" +EXTRA_OECONF_append_virtclass-nativesdk = " --disable-ldap --disable-ldaps" +EXTRA_OECONF_append_virtclass-sdk = " --disable-ldap --disable-ldaps" + python __anonymous() { f = bb.data.getVar("CURL_FEATURES", d, True).split(",") oeconf = bb.data.getVar("EXTRA_OECONF", d, False) diff --git a/recipes/curl/curl_7.21.1.bb b/recipes/curl/curl_7.21.1.bb index 5df4d6b9ac..0fac7723cf 100644 --- a/recipes/curl/curl_7.21.1.bb +++ b/recipes/curl/curl_7.21.1.bb @@ -6,6 +6,5 @@ PR = "${INC_PR}.1" SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://off_t_abi_fix.patch;striplevel=0" -BBCLASSEXTEND = "native nativesdk sdk" SRC_URI[md5sum] = "eafde5b933bce1c1dca82d1054c8d967" SRC_URI[sha256sum] = "653b3214005c778a8c642af4e5dea46c74f7bf51017a568bb8725ea9eda73643" diff --git a/recipes/curl/curl_7.21.2.bb b/recipes/curl/curl_7.21.2.bb index 8402e31fe5..d7d865dc80 100644 --- a/recipes/curl/curl_7.21.2.bb +++ b/recipes/curl/curl_7.21.2.bb @@ -6,6 +6,5 @@ PR = "${INC_PR}.0" SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://off_t_abi_fix.patch;striplevel=0" -BBCLASSEXTEND = "native nativesdk sdk" SRC_URI[md5sum] = "ca96df88e044c7c25d19692ec8b250b2" SRC_URI[sha256sum] = "f4a632e704f28767e6bbffcc6112db0590b1c9d50d8226d706ad39632355bf21" From 5fdb54582e36518f0f74a362d35b21ba29116eef Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Tue, 1 Mar 2011 18:36:40 +0100 Subject: [PATCH 166/509] elfe: bump SRCREV Signed-off-by: Simon Busch --- recipes/e17/elfe_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/e17/elfe_svn.bb b/recipes/e17/elfe_svn.bb index 8588ec34b6..af0ed7c6d9 100644 --- a/recipes/e17/elfe_svn.bb +++ b/recipes/e17/elfe_svn.bb @@ -8,5 +8,5 @@ DEPENDS += "elementary" # Elfe is part of the enlightenment svn repository since this SRC_REV. As EFL_SRCREV is # currently much older we need to sync it when EFL_SRCREV will change. -SRCREV = "57260" +SRCREV = "57458" From 1052454bfd04cfab78efaafceb4d32d378de15d2 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Tue, 1 Mar 2011 18:38:28 +0100 Subject: [PATCH 167/509] freesmartphone: bump SRCREV of several recipes Signed-off-by: Simon Busch --- recipes/freesmartphone/cornucopia.inc | 2 +- recipes/freesmartphone/frameworkd_git.bb | 2 +- recipes/freesmartphone/libgisi_git.bb | 2 +- recipes/freesmartphone/msmcomm.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/freesmartphone/cornucopia.inc b/recipes/freesmartphone/cornucopia.inc index 2b6ba392ae..968ad85ab6 100644 --- a/recipes/freesmartphone/cornucopia.inc +++ b/recipes/freesmartphone/cornucopia.inc @@ -7,7 +7,7 @@ DEPENDS = "vala-native glib-2.0 libfso-glib libgee" DEPENDS += "${@['libfsoframework', ''][(bb.data.getVar('PN', d, 1) in 'libfsoframework libfsobasics'.split())]}" PV = "invalid, please override" -FSO_CORNUCOPIA_SRCREV ?= "8e66f7e5cecfb4bd6b655645770a2b87e12cd607" +FSO_CORNUCOPIA_SRCREV ?= "7f4aa75e6bc3ed8d39b69e9d529d0dce8280cd27" INC_PR = "r5" SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master" diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb index f1543194d9..16d839c537 100644 --- a/recipes/freesmartphone/frameworkd_git.bb +++ b/recipes/freesmartphone/frameworkd_git.bb @@ -4,7 +4,7 @@ AUTHOR = "FreeSmartphone.Org Development Team" SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" -SRCREV = "3d691db83a1f235679acbcf7837ba0af3d0164cb" +SRCREV = "f86660d2304a7215dfc6d6a516530267657a02b1" PV = "0.9.5.9+gitr${SRCPV}" PR = "r12" PE = "1" diff --git a/recipes/freesmartphone/libgisi_git.bb b/recipes/freesmartphone/libgisi_git.bb index 50abd4c37a..e0a4ea728a 100644 --- a/recipes/freesmartphone/libgisi_git.bb +++ b/recipes/freesmartphone/libgisi_git.bb @@ -6,7 +6,7 @@ DEPENDS = "glib-2.0" SRC_URI = "${FREESMARTPHONE_GIT}/libgisi.git;protocol=git;branch=master" S = "${WORKDIR}/git" -SRCREV = "06777c0db4abecb22a4fd5e515079675e6e1f2dd" +SRCREV = "aa9942e136976bfcf32f6f15ebcc28d24163fee6" PV = "0.0.0+gitr${SRCPV}" inherit vala autotools diff --git a/recipes/freesmartphone/msmcomm.inc b/recipes/freesmartphone/msmcomm.inc index 5b97375aeb..91c903aadc 100644 --- a/recipes/freesmartphone/msmcomm.inc +++ b/recipes/freesmartphone/msmcomm.inc @@ -6,6 +6,6 @@ LICENSE = "GPL" INC_PR = "r4" PV = "Please override!" -SRCREV = "cbc37c735f015e562bd8b36650fc19260e729fb4" +SRCREV = "aa49ff741f30df8e0360acef6798aa95856b20bc" SRC_URI = "${FREESMARTPHONE_GIT}/msmcomm.git;protocol=git;branch=master" From 367a97c7cfe4357bc0756a7397c0f12fea061082 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Tue, 1 Mar 2011 19:50:33 +0100 Subject: [PATCH 168/509] tsmd: install script to /usr/bin and not to /bin and bmp PR Signed-off-by: Simon Busch --- recipes/palmpre/tsmd_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/palmpre/tsmd_git.bb b/recipes/palmpre/tsmd_git.bb index 0cef19edc1..b0bb7f16d4 100644 --- a/recipes/palmpre/tsmd_git.bb +++ b/recipes/palmpre/tsmd_git.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" DEPENDS = "tslib" -PR = "r3" +PR = "r4" PV = "1.0.0+gitr${SRCPV}" SRCREV = "9262a2e4f8f6e6c7bcacf1eeae0ad348cbfcce06" @@ -29,5 +29,5 @@ do_install_append() { install -d 0644 ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/ install -d 0644 ${D}${base_bindir}/ - install -m 0755 ${WORKDIR}/tsmd_control ${D}${base_bindir}/tsmd_control + install -m 0755 ${WORKDIR}/tsmd_control ${D}${exec_prefix}/bin/tsmd_control } From e20d0fdb5e38d4f65abbc1e7c4f6c9eca50e228e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 1 Mar 2011 16:37:52 +0000 Subject: [PATCH 169/509] libvpx: force arm mode to be able to link with ffmpeg where arm mode already is forced * v2: updated INC_PR after 0478950960e5c600efc77c25559fc7eee311f686 Signed-off-by: Tom Rini --- recipes/webm/libvpx.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes/webm/libvpx.inc b/recipes/webm/libvpx.inc index a1e02b112f..fd82d77a6a 100644 --- a/recipes/webm/libvpx.inc +++ b/recipes/webm/libvpx.inc @@ -1,11 +1,15 @@ DESCRIPTION = "vpx Multi-Format Codec SDK" LICENSE = "BSD" -INC_PR = "r6" +INC_PR = "r7" SRC_URI = "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2" S = "${WORKDIR}/libvpx-v${PV}" +# ffmpeg links with this and fails +# sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4): unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4' +ARM_INSTRUCTION_SET = "arm" + CFLAGS += "-fPIC" export CC From 073e2130c56cc03cc86dd06e8b05e2dec2549f8f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 4 Mar 2011 14:47:46 +0100 Subject: [PATCH 170/509] angstrom feed scripts: Upload to the EU mirror by default based on 2ac51f0adb64e5001d8e3f1d31d399b3dbaef3b5 from org.openembedded.dev Signed-off-by: Koen Kooi --- contrib/angstrom/upload-packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh index 2b3871a129..f1779d682f 100644 --- a/contrib/angstrom/upload-packages.sh +++ b/contrib/angstrom/upload-packages.sh @@ -5,7 +5,7 @@ # Run this from inside ${DEPLOY_DIR} e.g. tmp/deploy/glibc/ # Angstrom webserver -REMOTEM=angstrom@feeds.angstrom-distribution.org +REMOTEM=angstrom@eu.feeds.angstrom-distribution.org # Feed dir we want to upload to REMOTED=website/feeds/unstable/ipk/$(basename $PWD) From 7124b9355bbbaabd764a5b6d30ce64dc117218cf Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 8 Mar 2011 08:52:26 +0100 Subject: [PATCH 171/509] x-load: fall back to xM when detecting beagleboard revisions Signed-off-by: Koen Kooi --- recipes/x-load/x-load-git/xmc.patch | 52 +++++++++++++++++++++++++++++ recipes/x-load/x-load_git.bb | 3 +- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 recipes/x-load/x-load-git/xmc.patch diff --git a/recipes/x-load/x-load-git/xmc.patch b/recipes/x-load/x-load-git/xmc.patch new file mode 100644 index 0000000000..bddcb8fc7f --- /dev/null +++ b/recipes/x-load/x-load-git/xmc.patch @@ -0,0 +1,52 @@ +From b35937bf29c828e311f1d9bb1385bd32d34ec060 Mon Sep 17 00:00:00 2001 +From: Jason Kridner +Date: Mon, 7 Mar 2011 19:31:15 -0600 +Subject: [PATCH] Forced newer revisions to default to xM. + +--- + board/omap3530beagle/omap3530beagle.c | 15 ++++++++++++++- + 1 files changed, 14 insertions(+), 1 deletions(-) + +diff --git a/board/omap3530beagle/omap3530beagle.c b/board/omap3530beagle/omap3530beagle.c +index 1b3d8c7..d55d32e 100644 +--- a/board/omap3530beagle/omap3530beagle.c ++++ b/board/omap3530beagle/omap3530beagle.c +@@ -212,6 +212,7 @@ u32 cpu_is_3410(void) + * GPIO173, GPIO172, GPIO171: 1 1 0 => C1/2/3 + * GPIO173, GPIO172, GPIO171: 1 0 1 => C4 + * GPIO173, GPIO172, GPIO171: 0 0 0 => XM ++ * default => XM + ******************************************/ + int beagle_revision(void) + { +@@ -227,6 +228,18 @@ int beagle_revision(void) + rev = omap_get_gpio_datain(173) << 2 | + omap_get_gpio_datain(172) << 1 | + omap_get_gpio_datain(171); ++ ++ /* Default newer board revisions to XM */ ++ switch(rev) { ++ case REVISION_AXBX: ++ case REVISION_CX: ++ case REVISION_C4: ++ break; ++ case REVISION_XM: ++ default: ++ rev = REVISION_XM; ++ } ++ + omap_free_gpio(171); + omap_free_gpio(172); + omap_free_gpio(173); +@@ -662,7 +675,7 @@ int misc_init_r(void) + printf("Beagle Rev C4\n"); + break; + case REVISION_XM: +- printf("Beagle xM Rev A\n"); ++ printf("Beagle xM\n"); + break; + default: + printf("Beagle unknown 0x%02x\n", rev); +-- +1.6.1 + diff --git a/recipes/x-load/x-load_git.bb b/recipes/x-load/x-load_git.bb index 523251e5c5..a181b3c755 100644 --- a/recipes/x-load/x-load_git.bb +++ b/recipes/x-load/x-load_git.bb @@ -5,7 +5,7 @@ DEFAULT_PREFERENCE_omap3-pandora = "-1" FILESPATHPKG_prepend = "x-load-git:x-load-git/${MACHINE}" PV = "1.44+${PR}+gitr${SRCREV}" -PR ="r20" +PR ="r21" PE = "1" SRCREV = "24b8b7f41a83540433024854736518876257672c" @@ -15,6 +15,7 @@ SRC_URI = "git://gitorious.org/x-loader/x-loader.git;branch=master;protocol=git file://0003-MUX-Configure-SYS_NIRQ2-pin-in-safe-mode.patch \ file://0004-OMAP4-clocks-Disable-slimbus-and-pad_clks.patch \ file://0005-omap4-Make-1GHz-as-default-MPU-clock.patch \ + file://xmc.patch \ " XLOAD_MACHINE_beagleboard = "omap3530beagle_config" From 54c4daec664f3c731a6810cf87154dbb334bcc97 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 9 Mar 2011 14:52:58 +0100 Subject: [PATCH 172/509] xmms: bandaid some more host path leakage Signed-off-by: Koen Kooi --- recipes/xmms/xmms_1.2.10.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipes/xmms/xmms_1.2.10.bb b/recipes/xmms/xmms_1.2.10.bb index 34b1e07a8e..aed1833bbc 100644 --- a/recipes/xmms/xmms_1.2.10.bb +++ b/recipes/xmms/xmms_1.2.10.bb @@ -10,7 +10,7 @@ SRC_URI = "http://www.xmms.org/files/1.2.x/xmms-${PV}.tar.bz2 \ file://xmms-config-dequote.patch \ file://acinclude.m4 \ file://xmms.sh" -PR = "r6" +PR = "r7" RRECOMMENDS_${PN} = "xmms-plugin-output-oss xmms-plugin-output-alsa \ xmms-mad xmms-tremor" @@ -33,6 +33,13 @@ do_configure_prepend() { done } +do_configure_append() { + for i in $(find . -name "Makefile"); do + sed -i -e 's:L/usr/lib:L${STAGING_LIBDIR}:g' \ + $i + done +} + do_install_append() { install -m 0755 ${WORKDIR}/xmms.sh ${D}${bindir} install -d ${D}${datadir}/applications From 6fba0a3a7d7efd19f7cb6203279250568d0c3d3d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 12 Mar 2011 08:50:37 +0100 Subject: [PATCH 173/509] angstrom: name release after branch Signed-off-by: Koen Kooi Acked-by: Graeme Gregory Acked-by: Philip Balister --- conf/distro/angstrom-2008.1.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index ec032760f7..0d7c45ddb0 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -13,9 +13,8 @@ # For more contact info please visit # http://www.angstrom-distribution.org/contact -#DISTRO_VERSION = "2009.X" -DISTRO_VERSION = "2010.7-test-${DATE}" -DISTRO_REVISION = "3" +DISTRO_VERSION = "2011.03" +DISTRO_REVISION = "4" DISTRO_PR = ".6" OLDEST_KERNEL ?= "2.6.16" From adca501391d50edf6716eacd4339dd429357a23a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 13 Mar 2011 22:09:41 +0100 Subject: [PATCH 174/509] angstrom contrib: use proper release version on webserver Signed-off-by: Koen Kooi Acked-by: Graeme Gregory Acked-by: Philip Balister --- contrib/angstrom/personal-feed.sh | 2 +- contrib/angstrom/rss.php | 2 +- contrib/angstrom/source-mirror.txt | 2 +- contrib/angstrom/upload-packages.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/angstrom/personal-feed.sh b/contrib/angstrom/personal-feed.sh index 2896ec6479..787dbf84f4 100644 --- a/contrib/angstrom/personal-feed.sh +++ b/contrib/angstrom/personal-feed.sh @@ -8,7 +8,7 @@ REMOTEM=http://www.angstrom-distribution.org # Feed dir we want to upload to -REMOTED=feeds/unstable/ipk/$(basename $PWD) +REMOTED=feeds/2011.03/ipk/$(basename $PWD) # create upload dir mkdir -p upload-queue || true diff --git a/contrib/angstrom/rss.php b/contrib/angstrom/rss.php index 2e1f49c4cc..4dab45d57f 100644 --- a/contrib/angstrom/rss.php +++ b/contrib/angstrom/rss.php @@ -15,7 +15,7 @@ * */ -$build_link_base = 'http://www.angstrom-distribution.org/unstable/autobuild/'; +$build_link_base = 'http://www.angstrom-distribution.org/2011.03/autobuild/'; $builder_log_date = file('autobuilder.log'); diff --git a/contrib/angstrom/source-mirror.txt b/contrib/angstrom/source-mirror.txt index 0b4f67886c..b2ca895b72 100644 --- a/contrib/angstrom/source-mirror.txt +++ b/contrib/angstrom/source-mirror.txt @@ -1,6 +1,6 @@ #To populate the source mirror the autobuilder uses the following command: -rsync ~/OE/downloads/ angstrom@linuxtogo.org:~/website/unstable/sources/ -aPvz \ +rsync ~/OE/downloads/ angstrom@linuxtogo.org:~/website/2011.03/sources/ -aPvz \ --exclude "*.md5" \ --exclude "*.done" \ --exclude "svn" \ diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh index f1779d682f..aa7e82738c 100644 --- a/contrib/angstrom/upload-packages.sh +++ b/contrib/angstrom/upload-packages.sh @@ -8,7 +8,7 @@ REMOTEM=angstrom@eu.feeds.angstrom-distribution.org # Feed dir we want to upload to -REMOTED=website/feeds/unstable/ipk/$(basename $PWD) +REMOTED=website/feeds/2011.03/ipk/$(basename $PWD) # create upload dir mkdir -p upload-queue || true From 504aabb863b24cfc0a42367c4fb77a3d3b675daf Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 13 Mar 2011 22:18:08 +0100 Subject: [PATCH 175/509] angstrom-version: catch up with release changes in parent commits Signed-off-by: Koen Kooi Acked-by: Graeme Gregory Acked-by: Philip Balister --- recipes/angstrom/angstrom-version.bb | 2 +- recipes/angstrom/angstrom-version/lsb_release | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/angstrom/angstrom-version.bb b/recipes/angstrom/angstrom-version.bb index 0173f166f2..c4b3623bbb 100644 --- a/recipes/angstrom/angstrom-version.bb +++ b/recipes/angstrom/angstrom-version.bb @@ -1,7 +1,7 @@ LICENSE = "MIT" PV = "${DISTRO_VERSION}" -PR = "r6" +PR = "r7" PE = "1" SRC_URI = "file://lsb_release" diff --git a/recipes/angstrom/angstrom-version/lsb_release b/recipes/angstrom/angstrom-version/lsb_release index f6e7f16628..7746dd0e35 100755 --- a/recipes/angstrom/angstrom-version/lsb_release +++ b/recipes/angstrom/angstrom-version/lsb_release @@ -1,6 +1,6 @@ #!/bin/sh VERSION="$(cat /etc/angstrom-version | head -n1 | awk '{print $2}')" -CODENAME="foo" +CODENAME="Dureza" case $1 in "-v") From 1926c592b1f264e5dea7d951246dbd8b70c3bf2d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 16 Mar 2011 10:12:12 +0100 Subject: [PATCH 176/509] angstrom 2011.03 blacklist bash-noemu It doesn't build and has the dreaded replaces/conflicts combo Based on http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=8a9ce9d369a0a6ec9d4de2e5dc747de7e9583b14 Signed-off-by: Koen Kooi --- conf/distro/angstrom-2008.1.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 0d7c45ddb0..ae1ed4cc0d 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -132,6 +132,9 @@ ANGSTROM_BLACKLIST_pn-fso-apm = "regular apmd is good enough" ANGSTROM_BLACKLIST_pn-ipkg = "ipkg has been superseded by opkg" +ANGSTROM_BLACKLIST_pn-bash-noemu = "doesn't work on the target" +PREFERRED_PROVIDER_bash = "bash" + ANGSTROMLIBC ?= "glibc" require conf/distro/include/angstrom.inc From 739d1e1d2e8b32be7eda509c8f559486ee6e36ff Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 8 Mar 2011 16:15:09 +0100 Subject: [PATCH 177/509] task-omap-drivers: task for commonly needed drivers on omap chips Signed-off-by: Koen Kooi --- recipes/tasks/task-omap-drivers.bb | 35 ++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 recipes/tasks/task-omap-drivers.bb diff --git a/recipes/tasks/task-omap-drivers.bb b/recipes/tasks/task-omap-drivers.bb new file mode 100644 index 0000000000..fe29344269 --- /dev/null +++ b/recipes/tasks/task-omap-drivers.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Task for extra drivers for Texas Instruments OMAP chips" + +PR = "r2" + +inherit task + +RDEPENDS_${PN} = "\ + rt73-firmware \ + zd1211-firmware \ + linux-firmware-wl12xx \ + rfkill \ + cpufrequtils \ + " + +RRECOMMENDS_${PN} = "\ + \ + kernel-module-bluetooth \ + kernel-module-hci-usb \ + kernel-module-hci-uart \ + \ + kernel-module-wl12xx \ + kernel-module-wl12xx-sdio \ + kernel-module-wl12xx-spi \ + \ + kernel-module-wl1271 \ + kernel-module-wl1271-sdio \ + kernel-module-wl1271-spi \ + kernel-module-btwilink \ + \ + kernel-module-rt73usb \ + kernel-module-rt2x00usb \ + kernel-module-zd1211rw \ + \ + omap3-sgx-modules \ + " From d52683876559f4a425fe2467e3d4b0bd4c0218bd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 8 Mar 2011 16:17:09 +0100 Subject: [PATCH 178/509] *beagleboard-validation: collection of tasks iand images to serve as basis for beagleboard.org validation effort Signed-off-by: Koen Kooi --- .../beagleboard-validation-base-image.bb | 23 ++++++++ .../beagleboard-validation-e17-image.bb | 24 ++++++++ .../beagleboard-validation-gnome-image.bb | 33 +++++++++++ recipes/tasks/task-beagleboard-validation.bb | 57 +++++++++++++++++++ 4 files changed, 137 insertions(+) create mode 100644 recipes/images/beagleboard-validation-base-image.bb create mode 100644 recipes/images/beagleboard-validation-e17-image.bb create mode 100644 recipes/images/beagleboard-validation-gnome-image.bb create mode 100644 recipes/tasks/task-beagleboard-validation.bb diff --git a/recipes/images/beagleboard-validation-base-image.bb b/recipes/images/beagleboard-validation-base-image.bb new file mode 100644 index 0000000000..d8eca157e7 --- /dev/null +++ b/recipes/images/beagleboard-validation-base-image.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Validation image" + +inherit image + +export IMAGE_BASENAME = "validation-base-image" + +IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" +ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; ' +IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" + +IMAGE_LOGIN_MANAGER = "shadow" +IMAGE_SPLASH = "psplash-angstrom" + +ANGSTROM_EXTRA_INSTALL ?= "" + +IMAGE_INSTALL += " \ + task-omap-drivers \ + task-base-extended \ + task-beagleboard-validation-base \ + ${ANGSTROM_EXTRA_INSTALL} \ + ${IMAGE_SPLASH} \ +" + diff --git a/recipes/images/beagleboard-validation-e17-image.bb b/recipes/images/beagleboard-validation-e17-image.bb new file mode 100644 index 0000000000..40db0ee939 --- /dev/null +++ b/recipes/images/beagleboard-validation-e17-image.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Validation image with e17 desktop" + +inherit image + +export IMAGE_BASENAME = "validation-e17-image" + +IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" +ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; ' +IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" + +IMAGE_LOGIN_MANAGER = "shadow" +IMAGE_SPLASH = "psplash-angstrom" + +ANGSTROM_EXTRA_INSTALL ?= "" + +IMAGE_INSTALL += " \ + task-omap-drivers \ + task-base-extended \ + task-beagleboard-validation-base \ + task-beagleboard-validation-gui \ + ${ANGSTROM_EXTRA_INSTALL} \ + ${IMAGE_SPLASH} \ +" + diff --git a/recipes/images/beagleboard-validation-gnome-image.bb b/recipes/images/beagleboard-validation-gnome-image.bb new file mode 100644 index 0000000000..f82c6ca346 --- /dev/null +++ b/recipes/images/beagleboard-validation-gnome-image.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Validation image based on the GNOME desktop" + +inherit image + +XSERVER ?= "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-video-fbdev \ + xf86-video-sisusb \ + xf86-input-keyboard \ +" + +export IMAGE_BASENAME = "validation-GNOME-image" + +IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" +ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; ' +IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" + +IMAGE_LOGIN_MANAGER = "shadow" +IMAGE_SPLASH = "psplash-angstrom" + +ANGSTROM_EXTRA_INSTALL ?= "" + +IMAGE_INSTALL += " \ + task-omap-drivers \ + task-base-extended \ + ${ANGSTROM_EXTRA_INSTALL} \ + ${IMAGE_SPLASH} \ + angstrom-task-gnome \ + angstrom-gdm-autologin-hack \ + bash-sh \ +" + diff --git a/recipes/tasks/task-beagleboard-validation.bb b/recipes/tasks/task-beagleboard-validation.bb new file mode 100644 index 0000000000..936d953731 --- /dev/null +++ b/recipes/tasks/task-beagleboard-validation.bb @@ -0,0 +1,57 @@ +inherit task + +PR = "r2" + +ECONFIG ?= "places e-wm-config-angstrom" +EMENU ?= "e-wm-menu" + +PACKAGES =+ "task-beagleboard-validation-base task-beagleboard-validation-gui task-beagleboard-validation-gui-extras" + +RDEPENDS_task-beagleboard-validation-base = "\ + task-base-extended \ + task-omap-drivers \ + bc \ + e2fsprogs-mke2fs \ + util-linux-ng-fdisk util-linux-ng-sfdisk \ + dosfstools \ + beagleboard-test-scripts \ + sox \ + alsa-utils-aplay \ + ti-dsplink-examples \ + i2c-tools \ + memtester \ + cpuburn-neon \ + evtest \ + devmem2 \ + mtd-utils \ + mplayer \ + nmap iperf \ + powertop oprofile \ + angstrom-led-config \ + cron ntpdate \ + picodlp-control \ + openssh-scp openssh-ssh \ + nodejs \ +" + + +RDEPENDS_task-beagleboard-validation-gui = " \ + angstrom-x11-base-depends \ + angstrom-gpe-task-base \ + angstrom-gpe-task-settings \ + angstrom-zeroconf-audio \ + gpe-scap \ + mime-support e-wm ${ECONFIG} ${EMENU} \ + xterm \ + hicolor-icon-theme gnome-icon-theme \ + synergy \ + angstrom-gnome-icon-theme-enable \ + network-manager-applet \ + gnome-bluetooth \ + x11vnc angstrom-x11vnc-xinit \ +" + +RDEPENDS_task-beagleboard-validation-gui-extras = "\ + matrix-gui \ + midori \ +" From a5cd2bcdfc2c445bf1dac24d4cc9cc9881cdd3a7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 16 Mar 2011 10:10:05 +0100 Subject: [PATCH 179/509] task-beagleboard*: add changes from latest round of feedback Signed-off-by: Koen Kooi --- recipes/tasks/task-beagleboard-nand.bb | 8 +++++++- recipes/tasks/task-beagleboard-validation.bb | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/recipes/tasks/task-beagleboard-nand.bb b/recipes/tasks/task-beagleboard-nand.bb index 1c12f2c1c2..edf62b5aa9 100644 --- a/recipes/tasks/task-beagleboard-nand.bb +++ b/recipes/tasks/task-beagleboard-nand.bb @@ -1,5 +1,7 @@ DESCRIPTION = "Task for putting an X11 desktop in NAND" +PR = "r1" + inherit task ECONFIG ?= "places e-wm-config-angstrom e-wm-config-angstrom-widescreen e-wm-config-default" @@ -29,7 +31,11 @@ RDEPENDS_${PN} = "\ picodlp-control \ network-manager-applet \ gnome-bluetooth \ -" +bc e2fsprogs-mke2fs util-linux-ng-fdisk \ +util-linux-ng-sfdisk dosfstools beagleboard-test-scripts sox \ +alsa-utils-aplay ti-dsplink-examples i2c-tools memtester cpuburn-neon \ +evtest devmem2 matrix-gui mtd-utils mplayer x11vnc \ +angstrom-x11vnc-xinit" # Install all kernel modules RRECOMMENDS_${PN} += " \ diff --git a/recipes/tasks/task-beagleboard-validation.bb b/recipes/tasks/task-beagleboard-validation.bb index 936d953731..9edb26bd27 100644 --- a/recipes/tasks/task-beagleboard-validation.bb +++ b/recipes/tasks/task-beagleboard-validation.bb @@ -1,6 +1,10 @@ inherit task -PR = "r2" +PV = "1.1" +PR = "r4" + +PACKAGE_ARCH = "all" +ALLOW_EMPTY = "1" ECONFIG ?= "places e-wm-config-angstrom" EMENU ?= "e-wm-menu" @@ -55,3 +59,4 @@ RDEPENDS_task-beagleboard-validation-gui-extras = "\ matrix-gui \ midori \ " + From c639a8fab3635218c442bf396c0dc69e9ba95ca3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 16 Mar 2011 20:57:29 +0100 Subject: [PATCH 180/509] linux-omap-psp 2.6.32: add support for xM revision C Signed-off-by: Koen Kooi --- .../0001-omap-Beagle-revision-detection.patch | 135 ++++++++++++++++ ...-Cx-boards-use-pin-23-for-write-prot.patch | 35 ++++ ...agle-no-gpio_wp-pin-connection-on-xM.patch | 33 ++++ ...-beaglexm-fix-EHCI-power-up-GPIO-dir.patch | 42 +++++ ...05-omap3-beaglexm-fix-DVI-reset-GPIO.patch | 48 ++++++ ...6-omap3-beaglexm-fix-power-on-of-DVI.patch | 92 +++++++++++ ...eboard-hack-in-support-from-xM-rev-C.patch | 61 +++++++ ...cleaned-up-board-revision-conditions.patch | 153 ++++++++++++++++++ recipes/linux/linux-omap-psp_2.6.32.bb | 8 + 9 files changed, 607 insertions(+) create mode 100644 recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0001-omap-Beagle-revision-detection.patch create mode 100644 recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0002-omap-Beagle-only-Cx-boards-use-pin-23-for-write-prot.patch create mode 100644 recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0003-omap-Beagle-no-gpio_wp-pin-connection-on-xM.patch create mode 100644 recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0004-omap3-beaglexm-fix-EHCI-power-up-GPIO-dir.patch create mode 100644 recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0005-omap3-beaglexm-fix-DVI-reset-GPIO.patch create mode 100644 recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0006-omap3-beaglexm-fix-power-on-of-DVI.patch create mode 100644 recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0007-beagleboard-hack-in-support-from-xM-rev-C.patch create mode 100644 recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0008-omap3-beagle-cleaned-up-board-revision-conditions.patch diff --git a/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0001-omap-Beagle-revision-detection.patch b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0001-omap-Beagle-revision-detection.patch new file mode 100644 index 0000000000..f29c9a6d1c --- /dev/null +++ b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0001-omap-Beagle-revision-detection.patch @@ -0,0 +1,135 @@ +From 325afc09116e11e28265b648ef33d8c0306c61f1 Mon Sep 17 00:00:00 2001 +From: Robert Nelson +Date: Thu, 23 Sep 2010 18:22:47 -0700 +Subject: [PATCH 01/10] omap: Beagle: revision detection + +Due to the omap3530 ES3.0 Silicon being used on both the +B5/B6 and C1/2/3 Beagle we can't use the cpu_is_omap34xx() +routines to differentiate the Beagle Boards. + +However gpio pins 171,172,173 where setup for this prupose, so +lets use them. + +Changes: +for older U-Boot's, use omap_mux_init_gpio() +keep Beagle Rev in board-omap3beagle.c +gpio_free on gpio request failure + +Tested on Beagle Revisions: B5, C2, C4, and xMA + +Signed-off-by: Robert Nelson +Acked-by: Jarkko Nikula +Signed-off-by: Tony Lindgren +--- + arch/arm/mach-omap2/board-omap3beagle.c | 88 +++++++++++++++++++++++++++++++ + 1 files changed, 88 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 2677b41..7ca2b3b 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -175,6 +175,93 @@ static void __init omap3beagle_ks8851_init(void) + static inline void __init omap3beagle_ks8851_init(void) { return; } + #endif + ++/* ++ * OMAP3 Beagle revision ++ * Run time detection of Beagle revision is done by reading GPIO. ++ * GPIO ID - ++ * AXBX = GPIO173, GPIO172, GPIO171: 1 1 1 ++ * C1_3 = GPIO173, GPIO172, GPIO171: 1 1 0 ++ * C4 = GPIO173, GPIO172, GPIO171: 1 0 1 ++ * XM = GPIO173, GPIO172, GPIO171: 0 0 0 ++ */ ++enum { ++ OMAP3BEAGLE_BOARD_UNKN = 0, ++ OMAP3BEAGLE_BOARD_AXBX, ++ OMAP3BEAGLE_BOARD_C1_3, ++ OMAP3BEAGLE_BOARD_C4, ++ OMAP3BEAGLE_BOARD_XM, ++}; ++ ++static u8 omap3_beagle_version; ++ ++static u8 omap3_beagle_get_rev(void) ++{ ++ return omap3_beagle_version; ++} ++ ++static void __init omap3_beagle_init_rev(void) ++{ ++ int ret; ++ u16 beagle_rev = 0; ++ ++ omap_mux_init_gpio(171, OMAP_PIN_INPUT_PULLUP); ++ omap_mux_init_gpio(172, OMAP_PIN_INPUT_PULLUP); ++ omap_mux_init_gpio(173, OMAP_PIN_INPUT_PULLUP); ++ ++ ret = gpio_request(171, "rev_id_0"); ++ if (ret < 0) ++ goto fail0; ++ ++ ret = gpio_request(172, "rev_id_1"); ++ if (ret < 0) ++ goto fail1; ++ ++ ret = gpio_request(173, "rev_id_2"); ++ if (ret < 0) ++ goto fail2; ++ ++ gpio_direction_input(171); ++ gpio_direction_input(172); ++ gpio_direction_input(173); ++ ++ beagle_rev = gpio_get_value(171) | (gpio_get_value(172) << 1) ++ | (gpio_get_value(173) << 2); ++ ++ switch (beagle_rev) { ++ case 7: ++ printk(KERN_INFO "OMAP3 Beagle Rev: Ax/Bx\n"); ++ omap3_beagle_version = OMAP3BEAGLE_BOARD_AXBX; ++ break; ++ case 6: ++ printk(KERN_INFO "OMAP3 Beagle Rev: C1/C2/C3\n"); ++ omap3_beagle_version = OMAP3BEAGLE_BOARD_C1_3; ++ break; ++ case 5: ++ printk(KERN_INFO "OMAP3 Beagle Rev: C4\n"); ++ omap3_beagle_version = OMAP3BEAGLE_BOARD_C4; ++ break; ++ case 0: ++ printk(KERN_INFO "OMAP3 Beagle Rev: xM\n"); ++ omap3_beagle_version = OMAP3BEAGLE_BOARD_XM; ++ break; ++ default: ++ printk(KERN_INFO "OMAP3 Beagle Rev: unknown %hd\n", beagle_rev); ++ omap3_beagle_version = OMAP3BEAGLE_BOARD_UNKN; ++ } ++ ++ return; ++ ++fail2: ++ gpio_free(172); ++fail1: ++ gpio_free(171); ++fail0: ++ printk(KERN_ERR "Unable to get revision detection GPIO pins\n"); ++ omap3_beagle_version = OMAP3BEAGLE_BOARD_UNKN; ++ ++ return; ++} ++ + static struct mtd_partition omap3beagle_nand_partitions[] = { + /* All the partition sizes are listed in terms of NAND block size */ + { +@@ -853,6 +940,7 @@ static int __init cameraboard_setup(char *str) + static void __init omap3_beagle_init(void) + { + omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); ++ omap3_beagle_init_rev(); + omap3_beagle_i2c_init(); + + if (cpu_is_omap3630()) { +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0002-omap-Beagle-only-Cx-boards-use-pin-23-for-write-prot.patch b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0002-omap-Beagle-only-Cx-boards-use-pin-23-for-write-prot.patch new file mode 100644 index 0000000000..f8512867ee --- /dev/null +++ b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0002-omap-Beagle-only-Cx-boards-use-pin-23-for-write-prot.patch @@ -0,0 +1,35 @@ +From 34d88746a9aa4aedb67e32579e559cbeb91de20f Mon Sep 17 00:00:00 2001 +From: Robert Nelson +Date: Thu, 23 Sep 2010 18:22:48 -0700 +Subject: [PATCH 02/10] omap: Beagle: only Cx boards use pin 23 for write protect + +system_rev comes from u-boot and is a constant 0x20, so +Bx boards also fall in this 'if' and will get setup with the +wrong gpio_wp pin. Switch to using the Beagle revision routine +to correcly set pin 23 only for C1/2/3 and C4 Boards. Bx boards +will then use the correct default pin setting. + +Signed-off-by: Robert Nelson +Acked-by: Jarkko Nikula +Signed-off-by: Tony Lindgren +--- + arch/arm/mach-omap2/board-omap3beagle.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 7ca2b3b..beb877c 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -444,7 +444,8 @@ static struct gpio_led gpio_leds[]; + static int beagle_twl_gpio_setup(struct device *dev, + unsigned gpio, unsigned ngpio) + { +- if (system_rev >= 0x20 && system_rev <= 0x34301000) { ++ if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C1_3) || ++ (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C4)) { + omap_mux_init_gpio(23, OMAP_PIN_INPUT); + mmc[0].gpio_wp = 23; + } else { +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0003-omap-Beagle-no-gpio_wp-pin-connection-on-xM.patch b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0003-omap-Beagle-no-gpio_wp-pin-connection-on-xM.patch new file mode 100644 index 0000000000..d7d3fefed4 --- /dev/null +++ b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0003-omap-Beagle-no-gpio_wp-pin-connection-on-xM.patch @@ -0,0 +1,33 @@ +From 037ef3add42d61dcd86438dc4b9378f154caa426 Mon Sep 17 00:00:00 2001 +From: Robert Nelson +Date: Thu, 23 Sep 2010 18:22:48 -0700 +Subject: [PATCH 03/10] omap: Beagle: no gpio_wp pin connection on xM + +The omap3630 based BeagleBoard xM uses a MicroSD card slot with +no write protection. + +Signed-off-by: Robert Nelson +Acked-by: Jarkko Nikula +Signed-off-by: Tony Lindgren +--- + arch/arm/mach-omap2/board-omap3beagle.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index beb877c..247a426 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -444,7 +444,9 @@ static struct gpio_led gpio_leds[]; + static int beagle_twl_gpio_setup(struct device *dev, + unsigned gpio, unsigned ngpio) + { +- if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C1_3) || ++ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { ++ mmc[0].gpio_wp = -EINVAL; ++ } else if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C1_3) || + (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C4)) { + omap_mux_init_gpio(23, OMAP_PIN_INPUT); + mmc[0].gpio_wp = 23; +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0004-omap3-beaglexm-fix-EHCI-power-up-GPIO-dir.patch b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0004-omap3-beaglexm-fix-EHCI-power-up-GPIO-dir.patch new file mode 100644 index 0000000000..e646d3ebae --- /dev/null +++ b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0004-omap3-beaglexm-fix-EHCI-power-up-GPIO-dir.patch @@ -0,0 +1,42 @@ +From 62db06de896c221cfa2231a53a933d6b3e81d66d Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Tue, 11 Jan 2011 17:13:35 +0000 +Subject: [PATCH 04/10] omap3: beaglexm: fix EHCI power up GPIO dir + +EHCI enable power pin is inverted (active high) in comparison +to vanilla beagle which is active low. Handle this case conditionally. + +Without this fix, Beagle XM 4 port EHCI will not function and no +networking will be available + +[nm@ti.com: split up, added descriptive changelogs] +Signed-off-by: Nishanth Menon +Signed-off-by: Koen Kooi +Signed-off-by: Tony Lindgren +--- + arch/arm/mach-omap2/board-omap3beagle.c | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 247a426..7cfa2c8 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -487,6 +487,15 @@ static int beagle_twl_gpio_setup(struct device *dev, + gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0); + } + ++ /* ++ * TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, XM active ++ * high / others active low) ++ */ ++ gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR"); ++ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) ++ gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1); ++ else ++ gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0); + + /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ + gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0005-omap3-beaglexm-fix-DVI-reset-GPIO.patch b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0005-omap3-beaglexm-fix-DVI-reset-GPIO.patch new file mode 100644 index 0000000000..6e6ab41b36 --- /dev/null +++ b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0005-omap3-beaglexm-fix-DVI-reset-GPIO.patch @@ -0,0 +1,48 @@ +From 3d93d0b8974c867db70cb4a8681615113ac6113d Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Tue, 11 Jan 2011 17:13:36 +0000 +Subject: [PATCH 05/10] omap3: beaglexm: fix DVI reset GPIO + +GPIO reset line for Beagle XM is different from vanilla beagle +so we populate it as part of gpio update routine. + +This in part fixes the issue of display not functioning on beagle XM +platform. + +[nm@ti.com: split up, added descriptive changelogs] +Signed-off-by: Nishanth Menon +Signed-off-by: Koen Kooi +Signed-off-by: Tony Lindgren +--- + arch/arm/mach-omap2/board-omap3beagle.c | 8 +++++++- + 1 files changed, 7 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 7cfa2c8..939de5a 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -336,7 +336,7 @@ static struct omap_dss_device beagle_dvi_device = { + .name = "dvi", + .driver_name = "generic_panel", + .phy.dpi.data_lines = 24, +- .reset_gpio = 170, ++ .reset_gpio = -EINVAL, + .platform_enable = beagle_enable_dvi, + .platform_disable = beagle_disable_dvi, + }; +@@ -497,6 +497,12 @@ static int beagle_twl_gpio_setup(struct device *dev, + else + gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0); + ++ /* DVI reset GPIO is different between beagle revisions */ ++ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) ++ beagle_dvi_device.reset_gpio = 129; ++ else ++ beagle_dvi_device.reset_gpio = 170; ++ + /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ + gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; + +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0006-omap3-beaglexm-fix-power-on-of-DVI.patch b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0006-omap3-beaglexm-fix-power-on-of-DVI.patch new file mode 100644 index 0000000000..ba74284b90 --- /dev/null +++ b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0006-omap3-beaglexm-fix-power-on-of-DVI.patch @@ -0,0 +1,92 @@ +From 7ad849e3d54d897614a74ad225392bd243e07d2e Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Wed, 12 Jan 2011 00:23:29 +0000 +Subject: [PATCH 06/10] omap3: beaglexm: fix power on of DVI + +TFP410 DVI chip is used to provide display out. +This chip is controlled by 2 lines: +LDO which supplies the power is controlled over gpio + 2 +and the enable of the chip itself is done over gpio + 1 +NOTE: the LDO is necessary for LED, serial blocks as well. + +gpio + 1 was used to sense USB overcurrent in vanilla beagle. + +Without this fix, the display would not function as the LDO +remains shut down. + +[nm@ti.com: split up, added descriptive changelogs] +Signed-off-by: Nishanth Menon +Signed-off-by: Koen Kooi +Signed-off-by: Tony Lindgren +--- + arch/arm/mach-omap2/board-omap3beagle.c | 40 +++++++++++++++++++++++++++++++ + 1 files changed, 40 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 939de5a..9880c5c 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -444,6 +444,8 @@ static struct gpio_led gpio_leds[]; + static int beagle_twl_gpio_setup(struct device *dev, + unsigned gpio, unsigned ngpio) + { ++ int r; ++ + if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { + mmc[0].gpio_wp = -EINVAL; + } else if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C1_3) || +@@ -465,6 +467,17 @@ static int beagle_twl_gpio_setup(struct device *dev, + * power switch and overcurrent detect + */ + ++ if (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XM) { ++ r = gpio_request(gpio + 1, "EHCI_nOC"); ++ if (!r) { ++ r = gpio_direction_input(gpio + 1); ++ if (r) ++ gpio_free(gpio + 1); ++ } ++ if (r) ++ pr_err("%s: unable to configure EHCI_nOC\n", __func__); ++ } ++ + if (cpu_is_omap3630()) { + /* Power on DVI, Serial and PWR led */ + gpio_request(gpio + 1, "nDVI_PWR_EN"); +@@ -506,6 +519,33 @@ static int beagle_twl_gpio_setup(struct device *dev, + /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ + gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; + ++ /* ++ * gpio + 1 on Xm controls the TFP410's enable line (active low) ++ * gpio + 2 control varies depending on the board rev as follows: ++ * P7/P8 revisions(prototype): Camera EN ++ * A2+ revisions (production): LDO (supplies DVI, serial, led blocks) ++ */ ++ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { ++ r = gpio_request(gpio + 1, "nDVI_PWR_EN"); ++ if (!r) { ++ r = gpio_direction_output(gpio + 1, 0); ++ if (r) ++ gpio_free(gpio + 1); ++ } ++ if (r) ++ pr_err("%s: unable to configure nDVI_PWR_EN\n", ++ __func__); ++ r = gpio_request(gpio + 2, "DVI_LDO_EN"); ++ if (!r) { ++ r = gpio_direction_output(gpio + 2, 1); ++ if (r) ++ gpio_free(gpio + 2); ++ } ++ if (r) ++ pr_err("%s: unable to configure DVI_LDO_EN\n", ++ __func__); ++ } ++ + return 0; + } + +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0007-beagleboard-hack-in-support-from-xM-rev-C.patch b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0007-beagleboard-hack-in-support-from-xM-rev-C.patch new file mode 100644 index 0000000000..0181f15208 --- /dev/null +++ b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0007-beagleboard-hack-in-support-from-xM-rev-C.patch @@ -0,0 +1,61 @@ +From b241e679f550f38062923eb7800a5c57a41fe95d Mon Sep 17 00:00:00 2001 +From: Jason Kridner +Date: Thu, 10 Mar 2011 13:15:38 +0100 +Subject: [PATCH 07/10] beagleboard: hack in support from xM rev C + +Based on patch by Koen Kooi +--- + arch/arm/mach-omap2/board-omap3beagle.c | 20 ++++++++++++++++---- + 1 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 9880c5c..4bde54b 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -182,7 +182,9 @@ static inline void __init omap3beagle_ks8851_init(void) { return; } + * AXBX = GPIO173, GPIO172, GPIO171: 1 1 1 + * C1_3 = GPIO173, GPIO172, GPIO171: 1 1 0 + * C4 = GPIO173, GPIO172, GPIO171: 1 0 1 +- * XM = GPIO173, GPIO172, GPIO171: 0 0 0 ++ * XMA = GPIO173, GPIO172, GPIO171: 0 0 0 ++ * XMB = GPIO173, GPIO172, GPIO171: 0 0 1 ++ * XMC = GPIO173, GPIO172, GPIO171: 0 1 0 + */ + enum { + OMAP3BEAGLE_BOARD_UNKN = 0, +@@ -190,6 +192,7 @@ enum { + OMAP3BEAGLE_BOARD_C1_3, + OMAP3BEAGLE_BOARD_C4, + OMAP3BEAGLE_BOARD_XM, ++ OMAP3BEAGLE_BOARD_XMC, + }; + + static u8 omap3_beagle_version; +@@ -241,12 +244,21 @@ static void __init omap3_beagle_init_rev(void) + omap3_beagle_version = OMAP3BEAGLE_BOARD_C4; + break; + case 0: +- printk(KERN_INFO "OMAP3 Beagle Rev: xM\n"); ++ printk(KERN_INFO "OMAP3 Beagle Rev: xM A\n"); + omap3_beagle_version = OMAP3BEAGLE_BOARD_XM; + break; ++ case 1: ++ printk(KERN_INFO "OMAP3 Beagle Rev: xM B\n"); ++ omap3_beagle_version = OMAP3BEAGLE_BOARD_XM; ++ break; ++ case 2: ++ printk(KERN_INFO "OMAP3 Beagle Rev: xM C\n"); ++ omap3_beagle_version = OMAP3BEAGLE_BOARD_XMC; ++ break; + default: +- printk(KERN_INFO "OMAP3 Beagle Rev: unknown %hd\n", beagle_rev); +- omap3_beagle_version = OMAP3BEAGLE_BOARD_UNKN; ++ printk(KERN_INFO "OMAP3 Beagle Rev: unknown %hd, " ++ "assuming xM C or newer\n", beagle_rev); ++ omap3_beagle_version = OMAP3BEAGLE_BOARD_XMC; + } + + return; +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0008-omap3-beagle-cleaned-up-board-revision-conditions.patch b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0008-omap3-beagle-cleaned-up-board-revision-conditions.patch new file mode 100644 index 0000000000..513a1019c2 --- /dev/null +++ b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0008-omap3-beagle-cleaned-up-board-revision-conditions.patch @@ -0,0 +1,153 @@ +From 8bd3ffb5755c49aaffecb20b9bd43f955ac26251 Mon Sep 17 00:00:00 2001 +From: Jason Kridner +Date: Wed, 16 Mar 2011 09:21:06 -0500 +Subject: [PATCH 08/10] omap3: beagle: cleaned up board revision conditions + +--- + arch/arm/mach-omap2/board-omap3beagle.c | 70 ++++++++++++++----------------- + 1 files changed, 32 insertions(+), 38 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 4bde54b..664a9c6 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -191,7 +191,7 @@ enum { + OMAP3BEAGLE_BOARD_AXBX, + OMAP3BEAGLE_BOARD_C1_3, + OMAP3BEAGLE_BOARD_C4, +- OMAP3BEAGLE_BOARD_XM, ++ OMAP3BEAGLE_BOARD_XMAB, + OMAP3BEAGLE_BOARD_XMC, + }; + +@@ -245,11 +245,11 @@ static void __init omap3_beagle_init_rev(void) + break; + case 0: + printk(KERN_INFO "OMAP3 Beagle Rev: xM A\n"); +- omap3_beagle_version = OMAP3BEAGLE_BOARD_XM; ++ omap3_beagle_version = OMAP3BEAGLE_BOARD_XMAB; + break; + case 1: + printk(KERN_INFO "OMAP3 Beagle Rev: xM B\n"); +- omap3_beagle_version = OMAP3BEAGLE_BOARD_XM; ++ omap3_beagle_version = OMAP3BEAGLE_BOARD_XMAB; + break; + case 2: + printk(KERN_INFO "OMAP3 Beagle Rev: xM C\n"); +@@ -458,13 +458,18 @@ static int beagle_twl_gpio_setup(struct device *dev, + { + int r; + +- if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { ++ switch(omap3_beagle_get_rev()) ++ { ++ case OMAP3BEAGLE_BOARD_XMAB: ++ case OMAP3BEAGLE_BOARD_XMC: + mmc[0].gpio_wp = -EINVAL; +- } else if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C1_3) || +- (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C4)) { ++ break; ++ case OMAP3BEAGLE_BOARD_C1_3: ++ case OMAP3BEAGLE_BOARD_C4: + omap_mux_init_gpio(23, OMAP_PIN_INPUT); + mmc[0].gpio_wp = 23; +- } else { ++ break; ++ default: + omap_mux_init_gpio(29, OMAP_PIN_INPUT); + } + /* gpio + 0 is "mmc0_cd" (input/IRQ) */ +@@ -479,7 +484,8 @@ static int beagle_twl_gpio_setup(struct device *dev, + * power switch and overcurrent detect + */ + +- if (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XM) { ++ if ((omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XMAB) && ++ (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XMC)) { + r = gpio_request(gpio + 1, "EHCI_nOC"); + if (!r) { + r = gpio_direction_input(gpio + 1); +@@ -490,54 +496,41 @@ static int beagle_twl_gpio_setup(struct device *dev, + pr_err("%s: unable to configure EHCI_nOC\n", __func__); + } + +- if (cpu_is_omap3630()) { +- /* Power on DVI, Serial and PWR led */ +- gpio_request(gpio + 1, "nDVI_PWR_EN"); +- gpio_direction_output(gpio + 1, 0); +- +- /* Power on camera interface */ +- gpio_request(gpio + 2, "CAM_EN"); +- gpio_direction_output(gpio + 2, 1); +- +- /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */ +- gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR"); +- gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1); +- } +- else { +- gpio_request(gpio + 1, "EHCI_nOC"); +- gpio_direction_input(gpio + 1); +- +- /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */ +- gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR"); +- gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0); +- } +- + /* +- * TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, XM active ++ * TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, xM Ax/Bx active + * high / others active low) + */ + gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR"); +- if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) ++ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMAB) + gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1); + else + gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0); + + /* DVI reset GPIO is different between beagle revisions */ +- if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) +- beagle_dvi_device.reset_gpio = 129; +- else ++ switch(omap3_beagle_get_rev()) ++ { ++ case OMAP3BEAGLE_BOARD_AXBX: ++ case OMAP3BEAGLE_BOARD_C1_3: ++ case OMAP3BEAGLE_BOARD_C4: + beagle_dvi_device.reset_gpio = 170; ++ break; ++ case OMAP3BEAGLE_BOARD_XMAB: ++ case OMAP3BEAGLE_BOARD_XMC: ++ default: ++ beagle_dvi_device.reset_gpio = 129; ++ } + + /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ + gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; + + /* +- * gpio + 1 on Xm controls the TFP410's enable line (active low) ++ * gpio + 1 on xM controls the TFP410's enable line (active low) + * gpio + 2 control varies depending on the board rev as follows: + * P7/P8 revisions(prototype): Camera EN + * A2+ revisions (production): LDO (supplies DVI, serial, led blocks) + */ +- if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { ++ if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMAB) || ++ (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC)) { + r = gpio_request(gpio + 1, "nDVI_PWR_EN"); + if (!r) { + r = gpio_direction_output(gpio + 1, 0); +@@ -1013,7 +1006,8 @@ static void __init omap3_beagle_init(void) + omap3_beagle_init_rev(); + omap3_beagle_i2c_init(); + +- if (cpu_is_omap3630()) { ++ if ((omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XMAB) && ++ (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XMC)) { + gpio_buttons[0].gpio = 4; + } + +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-psp_2.6.32.bb b/recipes/linux/linux-omap-psp_2.6.32.bb index 78fb7c423b..79adafa465 100644 --- a/recipes/linux/linux-omap-psp_2.6.32.bb +++ b/recipes/linux/linux-omap-psp_2.6.32.bb @@ -141,6 +141,14 @@ SRC_URI = "git://arago-project.org/git/projects/linux-omap3.git;protocol=http;br file://defconfig" SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ + file://beagleboard-xmc/0001-omap-Beagle-revision-detection.patch \ + file://beagleboard-xmc/0002-omap-Beagle-only-Cx-boards-use-pin-23-for-write-prot.patch \ + file://beagleboard-xmc/0003-omap-Beagle-no-gpio_wp-pin-connection-on-xM.patch \ + file://beagleboard-xmc/0004-omap3-beaglexm-fix-EHCI-power-up-GPIO-dir.patch \ + file://beagleboard-xmc/0005-omap3-beaglexm-fix-DVI-reset-GPIO.patch \ + file://beagleboard-xmc/0006-omap3-beaglexm-fix-power-on-of-DVI.patch \ + file://beagleboard-xmc/0007-beagleboard-hack-in-support-from-xM-rev-C.patch \ + file://beagleboard-xmc/0008-omap3-beagle-cleaned-up-board-revision-conditions.patch \ " SRC_URI_append_omap3-touchbook = " \ From 63d87c2bd7d860d700cc29af66c798110ac49cf5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 17 Mar 2011 08:33:37 +0100 Subject: [PATCH 181/509] linux-omap-psp 2.6.32: bump PR Signed-off-by: Koen Kooi --- recipes/linux/linux-omap-psp_2.6.32.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/linux/linux-omap-psp_2.6.32.bb b/recipes/linux/linux-omap-psp_2.6.32.bb index 79adafa465..b392fc072f 100644 --- a/recipes/linux/linux-omap-psp_2.6.32.bb +++ b/recipes/linux/linux-omap-psp_2.6.32.bb @@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "am3517-crane|beagleboard|omap3evm|am3517-evm|dm37x-evm|am3 SRCREV = "5fc29e7b2a76a64a739f857858ef0b98294aa155" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -MACHINE_KERNEL_PR_append = "+gitr${SRCREV}" +MACHINE_KERNEL_PR_append = "a+gitr${SRCREV}" SRC_URI = "git://arago-project.org/git/projects/linux-omap3.git;protocol=http;branch=master \ file://0001-Added-Crane-Board-support.patch \ From 8a590e534f4229656d9252095c9984d52648a6a9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 9 Mar 2011 14:14:19 +0100 Subject: [PATCH 182/509] u-boot git: update beagleboard u-boot to 2011.03-RC [Koen 20110317] Removed 0015-omap3_beagle-Switch-default-console-from-ttyS2-to-tt.patch since 2011.03-maintenance is still using the old 2.6.32 kernel for beagleboard Signed-off-by: Koen Kooi --- .../0001-Enable-I2C-bus-switching.patch | 49 -- ...le-Pin-Mux-initialization-glitch-fix.patch | 46 + ...b.debug-y-from-Beagle-and-Overo-env.patch} | 21 +- ...d-board-revision-detection-for-Overo.patch | 187 ---- ...gle-revision-detection-to-recognize-.patch | 165 ---- ...ble-the-use-of-a-plain-text-file-nam.patch | 89 ++ ...3-BeagleBoard-Enable-pullups-on-i2c2.patch | 69 ++ ...to-1.8V-for-EHCI-PHY-on-Beagle-Rev-C.patch | 143 --- ...BeagleBoard-add-xM-rev-B-to-ID-table.patch | 111 +++ ...for-rev-3.1.2-check-and-display-max-.patch | 105 --- ...gleBoard-add-more-expansionboard-IDs.patch | 95 ++ ...purate-boot-arg-for-overo-and-beagle.patch | 70 -- ...0007-OMAP3-Add-DSS-driver-for-OMAP3.patch} | 396 +++++---- ...ansion-board-type-version-using-eepr.patch | 129 --- ...eagleBoard-Added-userbutton-command.patch} | 31 +- ...le-config-eeprom-to-set-u-boot-env-v.patch | 81 -- ...le-input-on-MMC1_CLK-and-MMC3_CLK-pi.patch | 34 - ...pass-expansionboard-name-in-bootargs.patch | 57 ++ ...> 0010-Enable-DSS-driver-for-Beagle.patch} | 81 +- ...o-set-CONFIG_SYS_I2C_SPEED-to-400Khz.patch | 25 - .../beagleboard/0011-Add-led-command.patch | 213 +++++ ...xcessively-long-delays-in-i2c-driver.patch | 52 -- ...> 0012-BeagleBoard-Added-LED-driver.patch} | 36 +- ...w-expansion-boards-with-any-vendor-I.patch | 47 - ...eBoard-updated-default-configuration.patch | 184 ++++ ...ge-address-of-expansion-eeprom-to-0x.patch | 25 - ...me-match-finding-avoiding-extraneous.patch | 42 + ...n-t-attempt-to-set-up-second-RAM-ban.patch | 49 -- ...015-OMAP3-mem.c-enhance-the-RAM-test.patch | 52 -- ...tch-default-console-from-ttyS2-to-tt.patch | 29 + ...ard-Load-kernel-via-MMC-ext2-not-fat.patch | 26 + ...ail-gracefully-if-no-nand-is-present.patch | 27 - ...tions-to-support-sysinfo-cpu-and-cpu.patch | 68 -- ...o-update-cpu-detection-for-36XX-37XX.patch | 196 ----- ...cks-update-clock-setup-for-36XX-37XX.patch | 826 ------------------ ...AP3-beagle-add-support-for-Beagle-xM.patch | 137 --- ...lement-expansionboard-detection-base.patch | 157 ---- ...lay-message-about-I2C-errors-being-e.patch | 26 - ...agleboard-fix-TCT-expansionboard-IDs.patch | 27 - ...-don-t-set-mpurate-on-xM-in-bootargs.patch | 24 - ...ean-up-L2-cache-enable-disable-funct.patch | 112 --- ...MAP3-convert-setup_auxcr-to-pure-asm.patch | 99 --- ...ex-A8-errata-workarounds-only-on-aff.patch | 46 - ...-more-expansionboards-based-on-http-.patch | 61 -- ...-mpurate-to-600-for-revB-and-revC1-3.patch | 29 - ...rettify-expansionboard-message-a-bit.patch | 25 - ...-pinmux-for-Tincantools-Trainer-expa.patch | 53 -- ...P3-Beagle-set-mpurate-to-1000-for-xM.patch | 24 - ...rease-bootdelay-to-3-use-VGA-for-def.patch | 34 - ...pass-expansionboard-name-in-bootargs.patch | 87 -- ...ed-configurations-for-xM-Rev-A-board.patch | 29 - ...env-beaglerev-for-AxBx-Cx-xMA-for-be.patch | 42 - ...port-for-second-and-third-mmc-channe.patch | 126 --- ...ble-support-for-second-and-third-mmc.patch | 55 -- .../beagleboard/0043-Add-led-command.patch | 256 ------ .../0044-BeagleBoard-Enabled-LEDs.patch | 47 - ...Board-Add-CONFIG_SYS_MEMTEST_SCRATCH.patch | 35 - ...d-Adjust-boot-command-on-USER-button.patch | 115 --- ...8-BeagleBoard-Enable-pullups-on-i2c2.patch | 46 - ...Board-Add-camera-to-default-bootargs.patch | 49 -- ...-BeagleBoard-move-ramdisk-parameters.patch | 38 - ...-for-beagleboardtoys-expansionboards.patch | 74 -- recipes/u-boot/u-boot_git.bb | 72 +- 63 files changed, 1278 insertions(+), 4503 deletions(-) delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0001-Enable-I2C-bus-switching.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0001-OMAP3-Beagle-Pin-Mux-initialization-glitch-fix.patch rename recipes/u-boot/u-boot-git/beagleboard/{0021-OMAP3-Beagle-Overo-remove-omapfb.debug-y-from-defaul.patch => 0002-OMAP-Remove-omapfb.debug-y-from-Beagle-and-Overo-env.patch} (74%) delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0002-OMAP3-add-board-revision-detection-for-Overo.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0003-OMAP3-update-Beagle-revision-detection-to-recognize-.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0003-omap3_beagle-enable-the-use-of-a-plain-text-file-nam.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0004-OMAP3-BeagleBoard-Enable-pullups-on-i2c2.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0004-OMAP3-Set-VAUX2-to-1.8V-for-EHCI-PHY-on-Beagle-Rev-C.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0005-ARMV7-OMAP3-BeagleBoard-add-xM-rev-B-to-ID-table.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0005-OMAP3-add-entry-for-rev-3.1.2-check-and-display-max-.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-BeagleBoard-add-more-expansionboard-IDs.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-add-mpurate-boot-arg-for-overo-and-beagle.patch rename recipes/u-boot/u-boot-git/beagleboard/{0025-Add-DSS-driver-for-OMAP3.patch => 0007-OMAP3-Add-DSS-driver-for-OMAP3.patch} (76%) delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0007-OMAP3-detect-expansion-board-type-version-using-eepr.patch rename recipes/u-boot/u-boot-git/beagleboard/{0045-BeagleBoard-Added-userbutton-command.patch => 0008-BeagleBoard-Added-userbutton-command.patch} (77%) delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0008-OMAP3-Overo-enable-config-eeprom-to-set-u-boot-env-v.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-Overo-enable-input-on-MMC1_CLK-and-MMC3_CLK-pi.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch rename recipes/u-boot/u-boot-git/beagleboard/{0026-Enable-DSS-driver-for-Beagle.patch => 0010-Enable-DSS-driver-for-Beagle.patch} (52%) delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0010-OMAP3-Overo-set-CONFIG_SYS_I2C_SPEED-to-400Khz.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0011-Add-led-command.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0011-OMAP3-trim-excessively-long-delays-in-i2c-driver.patch rename recipes/u-boot/u-boot-git/beagleboard/{0042-BeagleBoard-Added-LED-driver.patch => 0012-BeagleBoard-Added-LED-driver.patch} (83%) delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0012-OMAP3-Overo-allow-expansion-boards-with-any-vendor-I.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-BeagleBoard-updated-default-configuration.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-Overo-change-address-of-expansion-eeprom-to-0x.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0014-Corrected-LED-name-match-finding-avoiding-extraneous.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0014-OMAP3-board.c-don-t-attempt-to-set-up-second-RAM-ban.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0015-OMAP3-mem.c-enhance-the-RAM-test.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0015-omap3_beagle-Switch-default-console-from-ttyS2-to-tt.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0016-BeagleBoard-Load-kernel-via-MMC-ext2-not-fat.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0016-env_nand.c-fail-gracefully-if-no-nand-is-present.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0017-OMAP3-add-definitions-to-support-sysinfo-cpu-and-cpu.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0018-OMAP3-sys_info-update-cpu-detection-for-36XX-37XX.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0020-OMAP3-beagle-add-support-for-Beagle-xM.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0022-OMAP3-beagle-implement-expansionboard-detection-base.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0023-beagleboard-display-message-about-I2C-errors-being-e.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0024-beagleboard-fix-TCT-expansionboard-IDs.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0027-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0028-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0029-OMAP3-convert-setup_auxcr-to-pure-asm.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0030-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0031-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0032-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0033-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0034-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0035-OMAP3-Beagle-set-mpurate-to-1000-for-xM.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0036-OMAP3-Beagle-decrease-bootdelay-to-3-use-VGA-for-def.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0037-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0038-Added-configurations-for-xM-Rev-A-board.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0039-OMAP3-beagle-setenv-beaglerev-for-AxBx-Cx-xMA-for-be.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0040-OMAP-mmc-add-support-for-second-and-third-mmc-channe.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0041-OMAP3-Beagle-enable-support-for-second-and-third-mmc.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0043-Add-led-command.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0044-BeagleBoard-Enabled-LEDs.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0046-BeagleBoard-Add-CONFIG_SYS_MEMTEST_SCRATCH.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0047-BeagleBoard-Adjust-boot-command-on-USER-button.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0048-BeagleBoard-Enable-pullups-on-i2c2.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0049-BeagleBoard-Add-camera-to-default-bootargs.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0050-BeagleBoard-move-ramdisk-parameters.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0051-add-support-for-beagleboardtoys-expansionboards.patch diff --git a/recipes/u-boot/u-boot-git/beagleboard/0001-Enable-I2C-bus-switching.patch b/recipes/u-boot/u-boot-git/beagleboard/0001-Enable-I2C-bus-switching.patch deleted file mode 100644 index 551e44a67a..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0001-Enable-I2C-bus-switching.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5b5eb18bfb80fa9595eb258a911a94f2807e7497 Mon Sep 17 00:00:00 2001 -From: Syed Mohammed Khasim -Date: Mon, 18 Jan 2010 18:11:14 +0530 -Subject: [PATCH 01/50] Enable I2C bus switching - -OMAP3 supports Multiple I2C channels, this patch allows -us to use i2c dev command to switch between busses. - -Signed-off-by: Syed Mohammed Khasim -Acked-by: Heiko Schocher -(cherry picked from commit 9bb1c3501c8f098dac6e224c99e409ebf92b0ab9) ---- - drivers/i2c/omap24xx_i2c.c | 5 +++++ - include/configs/omap3_beagle.h | 6 ++++++ - 2 files changed, 11 insertions(+), 0 deletions(-) - -diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c -index ff18991..e8c8184 100644 ---- a/drivers/i2c/omap24xx_i2c.c -+++ b/drivers/i2c/omap24xx_i2c.c -@@ -435,3 +435,8 @@ int i2c_set_bus_num(unsigned int bus) - - return 0; - } -+ -+int i2c_get_bus_num(void) -+{ -+ return (int) current_bus; -+} -diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h -index 08d79ac..d522c77 100644 ---- a/include/configs/omap3_beagle.h -+++ b/include/configs/omap3_beagle.h -@@ -100,6 +100,12 @@ - /* DDR - I use Micron DDR */ - #define CONFIG_OMAP3_MICRON_DDR 1 - -+/* Enable Multi Bus support for I2C */ -+#define CONFIG_I2C_MULTI_BUS 1 -+ -+/* Probe all devices */ -+#define CONFIG_SYS_I2C_NOPROBES {0x0, 0x0} -+ - /* USB */ - #define CONFIG_MUSB_UDC 1 - #define CONFIG_USB_OMAP3 1 --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0001-OMAP3-Beagle-Pin-Mux-initialization-glitch-fix.patch b/recipes/u-boot/u-boot-git/beagleboard/0001-OMAP3-Beagle-Pin-Mux-initialization-glitch-fix.patch new file mode 100644 index 0000000000..7e88d7045a --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0001-OMAP3-Beagle-Pin-Mux-initialization-glitch-fix.patch @@ -0,0 +1,46 @@ +From 7b250f8be3b8c496796dcdc954c9e5959cefea2c Mon Sep 17 00:00:00 2001 +From: Bob Feretich +Date: Thu, 24 Feb 2011 13:16:44 +0000 +Subject: [PATCH 01/16] OMAP3 Beagle Pin Mux initialization glitch fix + +The below patch reverses the order of two segments in the board file. +Output pins need to have their values initialized, before they are +exposed to the logic outside the chip. + +Signed-off-by: Bob Feretich +Cc: Wolfgang Denk +--- + board/ti/beagle/beagle.c | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c +index c066d6e..929461c 100644 +--- a/board/ti/beagle/beagle.c ++++ b/board/ti/beagle/beagle.c +@@ -239,17 +239,17 @@ int misc_init_r(void) + twl4030_power_init(); + twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON); + +- /* Configure GPIOs to output */ +- writel(~(GPIO23 | GPIO10 | GPIO8 | GPIO2 | GPIO1), &gpio6_base->oe); +- writel(~(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 | +- GPIO15 | GPIO14 | GPIO13 | GPIO12), &gpio5_base->oe); +- +- /* Set GPIOs */ ++ /* Set GPIO states before they are made outputs */ + writel(GPIO23 | GPIO10 | GPIO8 | GPIO2 | GPIO1, + &gpio6_base->setdataout); + writel(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 | + GPIO15 | GPIO14 | GPIO13 | GPIO12, &gpio5_base->setdataout); + ++ /* Configure GPIOs to output */ ++ writel(~(GPIO23 | GPIO10 | GPIO8 | GPIO2 | GPIO1), &gpio6_base->oe); ++ writel(~(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 | ++ GPIO15 | GPIO14 | GPIO13 | GPIO12), &gpio5_base->oe); ++ + dieid_num_r(); + + return 0; +-- +1.6.6.1 + diff --git a/recipes/u-boot/u-boot-git/beagleboard/0021-OMAP3-Beagle-Overo-remove-omapfb.debug-y-from-defaul.patch b/recipes/u-boot/u-boot-git/beagleboard/0002-OMAP-Remove-omapfb.debug-y-from-Beagle-and-Overo-env.patch similarity index 74% rename from recipes/u-boot/u-boot-git/beagleboard/0021-OMAP3-Beagle-Overo-remove-omapfb.debug-y-from-defaul.patch rename to recipes/u-boot/u-boot-git/beagleboard/0002-OMAP-Remove-omapfb.debug-y-from-Beagle-and-Overo-env.patch index f3cd169b90..707cc79005 100644 --- a/recipes/u-boot/u-boot-git/beagleboard/0021-OMAP3-Beagle-Overo-remove-omapfb.debug-y-from-defaul.patch +++ b/recipes/u-boot/u-boot-git/beagleboard/0002-OMAP-Remove-omapfb.debug-y-from-Beagle-and-Overo-env.patch @@ -1,18 +1,21 @@ -From 0fd26c84173c9a589c6cd9c0db6d2200e769134b Mon Sep 17 00:00:00 2001 +From 0588da9057fddb5f6a6a04aedd7e0a79eb39e9e5 Mon Sep 17 00:00:00 2001 From: Steve Sakoman -Date: Thu, 25 Mar 2010 06:54:47 -0700 -Subject: [PATCH 21/50] OMAP3: Beagle, Overo: remove omapfb.debug=y from default env +Date: Thu, 30 Dec 2010 07:19:44 +0000 +Subject: [PATCH 02/16] OMAP: Remove omapfb.debug=y from Beagle and Overo env settings +The kernel DSS2 code is mature now, and keeping this setting hurts performance + +Signed-off-by: Steve Sakoman --- include/configs/omap3_beagle.h | 2 -- include/configs/omap3_overo.h | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h -index 1370a29..8bedf7d 100644 +index 5cfa4cb..8b580ef 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h -@@ -200,7 +200,6 @@ +@@ -203,7 +203,6 @@ "mpurate=${mpurate} " \ "vram=${vram} " \ "omapfb.mode=dvi:${dvimode} " \ @@ -20,7 +23,7 @@ index 1370a29..8bedf7d 100644 "omapdss.def_disp=${defaultdisplay} " \ "root=${mmcroot} " \ "rootfstype=${mmcrootfstype}\0" \ -@@ -208,7 +207,6 @@ +@@ -211,7 +210,6 @@ "mpurate=${mpurate} " \ "vram=${vram} " \ "omapfb.mode=dvi:${dvimode} " \ @@ -29,10 +32,10 @@ index 1370a29..8bedf7d 100644 "root=${nandroot} " \ "rootfstype=${nandrootfstype}\0" \ diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h -index 27b5476..118e886 100644 +index 1b3d439..06a28f6 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h -@@ -163,7 +163,6 @@ +@@ -169,7 +169,6 @@ "mpurate=${mpurate} " \ "vram=${vram} " \ "omapfb.mode=dvi:${dvimode} " \ @@ -40,7 +43,7 @@ index 27b5476..118e886 100644 "omapdss.def_disp=${defaultdisplay} " \ "root=${mmcroot} " \ "rootfstype=${mmcrootfstype}\0" \ -@@ -171,7 +170,6 @@ +@@ -177,7 +176,6 @@ "mpurate=${mpurate} " \ "vram=${vram} " \ "omapfb.mode=dvi:${dvimode} " \ diff --git a/recipes/u-boot/u-boot-git/beagleboard/0002-OMAP3-add-board-revision-detection-for-Overo.patch b/recipes/u-boot/u-boot-git/beagleboard/0002-OMAP3-add-board-revision-detection-for-Overo.patch deleted file mode 100644 index e7c3cec18e..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0002-OMAP3-add-board-revision-detection-for-Overo.patch +++ /dev/null @@ -1,187 +0,0 @@ -From 8cea9443be01ccc2525ff1de17b0dddd7c27984e Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Wed, 10 Feb 2010 14:40:56 -0800 -Subject: [PATCH 02/50] OMAP3: add board revision detection for Overo - ---- - board/overo/overo.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++ - board/overo/overo.h | 43 +++++++++++++++++++++--- - 2 files changed, 127 insertions(+), 6 deletions(-) - -diff --git a/board/overo/overo.c b/board/overo/overo.c -index e85be7d..3df1a12 100644 ---- a/board/overo/overo.c -+++ b/board/overo/overo.c -@@ -61,11 +61,101 @@ int board_init(void) - } - - /* -+ * Routine: get_sdio2_config -+ * Description: Return information about the wifi module connection -+ * Returns 0 if the module connects though a level translator -+ * Returns 1 if the module connects directly -+ */ -+int get_sdio2_config(void) { -+ int sdio_direct; -+ -+ if (!omap_request_gpio(130) && !omap_request_gpio(139)){ -+ -+ omap_set_gpio_direction(130, 0); -+ omap_set_gpio_direction(139, 1); -+ -+ sdio_direct = 1; -+ omap_set_gpio_dataout(130, 0); -+ if (omap_get_gpio_datain(139) == 0) { -+ omap_set_gpio_dataout(130, 1); -+ if (omap_get_gpio_datain(139) == 1) -+ sdio_direct = 0; -+ } -+ -+ omap_free_gpio(130); -+ omap_free_gpio(139); -+ } else { -+ printf("Error: unable to acquire sdio2 clk GPIOs\n"); -+ sdio_direct=-1; -+ } -+ -+ return sdio_direct; -+} -+ -+/* -+ * Routine: get_board_revision -+ * Description: Returns the board revision -+ */ -+int get_board_revision(void) { -+ int revision; -+ -+ if (!omap_request_gpio(126) && !omap_request_gpio(127) && -+ !omap_request_gpio(128) && !omap_request_gpio(129)){ -+ -+ omap_set_gpio_direction(126, 1); -+ omap_set_gpio_direction(127, 1); -+ omap_set_gpio_direction(128, 1); -+ omap_set_gpio_direction(129, 1); -+ -+ revision = 0; -+ if (omap_get_gpio_datain(126) == 0) -+ revision += 1; -+ if (omap_get_gpio_datain(127) == 0) -+ revision += 2; -+ if (omap_get_gpio_datain(128) == 0) -+ revision += 4; -+ if (omap_get_gpio_datain(129) == 0) -+ revision += 8; -+ -+ omap_free_gpio(126); -+ omap_free_gpio(127); -+ omap_free_gpio(128); -+ omap_free_gpio(129); -+ } else { -+ printf("Error: unable to acquire board revision GPIOs\n"); -+ revision=-1; -+ } -+ -+ return revision; -+} -+ -+/* - * Routine: misc_init_r - * Description: Configure board specific parts - */ - int misc_init_r(void) - { -+ printf("Board revision: "); -+ switch (get_board_revision()) { -+ case 0: -+ case 1: -+ switch (get_sdio2_config()) { -+ case 0: -+ printf(" 0\n"); -+ MUX_OVERO_SDIO2_TRANSCEIVER(); -+ break; -+ case 1: -+ printf(" 1\n"); -+ MUX_OVERO_SDIO2_DIRECT(); -+ break; -+ default: -+ printf(" unknown\n"); -+ } -+ break; -+ default: -+ printf(" unsupported\n"); -+ } -+ - twl4030_power_init(); - twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON); - -diff --git a/board/overo/overo.h b/board/overo/overo.h -index 1873523..e120e09 100644 ---- a/board/overo/overo.h -+++ b/board/overo/overo.h -@@ -206,12 +206,12 @@ const omap3_sysinfo sysinfo = { - 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*/\ -+ MUX_VAL(CP(MMC1_DAT4), (IEN | PTU | EN | M4)) /*GPIO_126*/\ -+ MUX_VAL(CP(MMC1_DAT5), (IEN | PTU | EN | M4)) /*GPIO_127*/\ -+ MUX_VAL(CP(MMC1_DAT6), (IEN | PTU | EN | M4)) /*GPIO_128*/\ -+ MUX_VAL(CP(MMC1_DAT7), (IEN | PTU | EN | M4)) /*GPIO_129*/\ - /*Wireless LAN */\ -- MUX_VAL(CP(MMC2_CLK), (IEN | PTU | EN | M0)) /*MMC2_CLK*/\ -+ MUX_VAL(CP(MMC2_CLK), (IEN | PTU | EN | M4)) /*GPIO_130*/\ - MUX_VAL(CP(MMC2_CMD), (IEN | PTU | EN | M0)) /*MMC2_CMD*/\ - MUX_VAL(CP(MMC2_DAT0), (IEN | PTU | EN | M0)) /*MMC2_DAT0*/\ - MUX_VAL(CP(MMC2_DAT1), (IEN | PTU | EN | M0)) /*MMC2_DAT1*/\ -@@ -220,7 +220,7 @@ const omap3_sysinfo sysinfo = { - MUX_VAL(CP(MMC2_DAT4), (IEN | PTU | EN | M1)) /*MMC2_DIR_DAT0*/\ - MUX_VAL(CP(MMC2_DAT5), (IEN | PTU | EN | M1)) /*MMC2_DIR_DAT1*/\ - MUX_VAL(CP(MMC2_DAT6), (IEN | PTU | EN | M1)) /*MMC2_DIR_CMD*/\ -- MUX_VAL(CP(MMC2_DAT7), (IEN | PTU | EN | M1)) /*MMC2_CLKIN*/\ -+ MUX_VAL(CP(MMC2_DAT7), (IEN | PTU | EN | M4)) /*GPIO_139*/\ - /*Bluetooth*/\ - MUX_VAL(CP(MCBSP3_DX), (IEN | PTD | DIS | M1)) /*UART2_CTS*/\ - MUX_VAL(CP(MCBSP3_DR), (IDIS | PTD | DIS | M1)) /*UART2_RTS*/\ -@@ -387,5 +387,36 @@ const omap3_sysinfo sysinfo = { - MUX_VAL(CP(SDRC_CKE0), (IDIS | PTU | EN | M0)) /*sdrc_cke0*/\ - MUX_VAL(CP(SDRC_CKE1), (IDIS | PTU | EN | M0)) /*sdrc_cke1*/ - -+#define MUX_OVERO_SDIO2_DIRECT() \ -+ MUX_VAL(CP(MMC2_CLK), (IEN | PTU | EN | M0)) /*MMC2_CLK*/\ -+ MUX_VAL(CP(MMC2_CMD), (IEN | PTU | EN | M0)) /*MMC2_CMD*/\ -+ MUX_VAL(CP(MMC2_DAT0), (IEN | PTU | EN | M0)) /*MMC2_DAT0*/\ -+ MUX_VAL(CP(MMC2_DAT1), (IEN | PTU | EN | M0)) /*MMC2_DAT1*/\ -+ MUX_VAL(CP(MMC2_DAT2), (IEN | PTU | EN | M0)) /*MMC2_DAT2*/\ -+ MUX_VAL(CP(MMC2_DAT3), (IEN | PTU | EN | M0)) /*MMC2_DAT3*/\ -+ MUX_VAL(CP(MMC2_DAT4), (IEN | PTU | EN | M0)) /*MMC2_DAT4*/\ -+ MUX_VAL(CP(MMC2_DAT5), (IEN | PTU | EN | M0)) /*MMC2_DAT5*/\ -+ MUX_VAL(CP(MMC2_DAT6), (IEN | PTU | EN | M0)) /*MMC2_DAT6*/\ -+ MUX_VAL(CP(MMC2_DAT7), (IEN | PTU | EN | M0)) /*MMC2_DAT7*/\ -+ MUX_VAL(CP(MMC1_DAT4), (IEN | PTD | EN | M4)) /*GPIO_126*/\ -+ MUX_VAL(CP(MMC1_DAT5), (IEN | PTU | EN | M4)) /*GPIO_127*/\ -+ MUX_VAL(CP(MMC1_DAT6), (IEN | PTU | EN | M4)) /*GPIO_128*/\ -+ MUX_VAL(CP(MMC1_DAT7), (IEN | PTU | EN | M4)) /*GPIO_129*/ -+ -+#define MUX_OVERO_SDIO2_TRANSCEIVER() \ -+ MUX_VAL(CP(MMC2_CLK), (IEN | PTU | EN | M0)) /*MMC2_CLK*/\ -+ MUX_VAL(CP(MMC2_CMD), (IEN | PTU | EN | M0)) /*MMC2_CMD*/\ -+ MUX_VAL(CP(MMC2_DAT0), (IEN | PTU | EN | M0)) /*MMC2_DAT0*/\ -+ MUX_VAL(CP(MMC2_DAT1), (IEN | PTU | EN | M0)) /*MMC2_DAT1*/\ -+ MUX_VAL(CP(MMC2_DAT2), (IEN | PTU | EN | M0)) /*MMC2_DAT2*/\ -+ MUX_VAL(CP(MMC2_DAT3), (IEN | PTU | EN | M0)) /*MMC2_DAT3*/\ -+ MUX_VAL(CP(MMC2_DAT4), (IEN | PTU | EN | M1)) /*MMC2_DIR_DAT0*/\ -+ MUX_VAL(CP(MMC2_DAT5), (IEN | PTU | EN | M1)) /*MMC2_DIR_DAT1*/\ -+ MUX_VAL(CP(MMC2_DAT6), (IEN | PTU | EN | M1)) /*MMC2_DIR_CMD*/\ -+ MUX_VAL(CP(MMC2_DAT7), (IEN | PTU | EN | M1)) /*MMC2_CLKIN*/\ -+ MUX_VAL(CP(MMC1_DAT4), (IEN | PTU | EN | M4)) /*GPIO_126*/\ -+ MUX_VAL(CP(MMC1_DAT5), (IEN | PTU | EN | M4)) /*GPIO_127*/\ -+ MUX_VAL(CP(MMC1_DAT6), (IEN | PTU | EN | M4)) /*GPIO_128*/\ -+ MUX_VAL(CP(MMC1_DAT7), (IEN | PTU | EN | M4)) /*GPIO_129*/ - - #endif --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0003-OMAP3-update-Beagle-revision-detection-to-recognize-.patch b/recipes/u-boot/u-boot-git/beagleboard/0003-OMAP3-update-Beagle-revision-detection-to-recognize-.patch deleted file mode 100644 index 1d943cb08f..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0003-OMAP3-update-Beagle-revision-detection-to-recognize-.patch +++ /dev/null @@ -1,165 +0,0 @@ -From fae6228e203436ce0d82ce32da769bd91206865f Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Wed, 10 Feb 2010 14:51:48 -0800 -Subject: [PATCH 03/50] OMAP3: update Beagle revision detection to recognize C4 boards - ---- - board/ti/beagle/beagle.c | 77 +++++++++++++++++++++++++++------------------- - board/ti/beagle/beagle.h | 7 +++- - 2 files changed, 51 insertions(+), 33 deletions(-) - -diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index 3b4c9e7..ba16dd7 100644 ---- a/board/ti/beagle/beagle.c -+++ b/board/ti/beagle/beagle.c -@@ -38,7 +38,7 @@ - #include - #include "beagle.h" - --static int beagle_revision_c; -+static int beagle_revision; - - /* - * Routine: board_init -@@ -60,41 +60,38 @@ int board_init(void) - /* - * Routine: beagle_get_revision - * Description: Return the revision of the BeagleBoard this code is running on. -- * If it is a revision Ax/Bx board, this function returns 0, -- * on a revision C board you will get a 1. - */ - int beagle_get_revision(void) - { -- return beagle_revision_c; -+ return beagle_revision; - } - - /* - * Routine: beagle_identify -- * Description: Detect if we are running on a Beagle revision Ax/Bx or -- * Cx. This can be done by GPIO_171. If this is low, we are -- * running on a revision C board. -+ * Description: Detect if we are running on a Beagle revision Ax/Bx, -+ * C1/2/3, C4 or D. This can be done by reading -+ * the level of GPIO173, GPIO172 and GPIO171. This should -+ * result in -+ * GPIO173, GPIO172, GPIO171: 1 1 1 => Ax/Bx -+ * GPIO173, GPIO172, GPIO171: 1 1 0 => C1/2/3 -+ * GPIO173, GPIO172, GPIO171: 1 0 1 => C4 -+ * GPIO173, GPIO172, GPIO171: 0 0 0 => D - */ - void beagle_identify(void) - { -- beagle_revision_c = 0; -- if (!omap_request_gpio(171)) { -- unsigned int val; -- -- omap_set_gpio_direction(171, 1); -- val = omap_get_gpio_datain(171); -- omap_free_gpio(171); -- -- if (val) -- beagle_revision_c = 0; -- else -- beagle_revision_c = 1; -- } -- -- printf("Board revision "); -- if (beagle_revision_c) -- printf("C\n"); -- else -- printf("Ax/Bx\n"); -+ omap_request_gpio(171); -+ omap_request_gpio(172); -+ omap_request_gpio(173); -+ omap_set_gpio_direction(171, 1); -+ omap_set_gpio_direction(172, 1); -+ omap_set_gpio_direction(173, 1); -+ -+ beagle_revision = omap_get_gpio_datain(173) << 2 | -+ omap_get_gpio_datain(172) << 1 | -+ omap_get_gpio_datain(171); -+ omap_free_gpio(171); -+ omap_free_gpio(172); -+ omap_free_gpio(173); - } - - /* -@@ -106,9 +103,31 @@ int misc_init_r(void) - struct gpio *gpio5_base = (struct gpio *)OMAP34XX_GPIO5_BASE; - struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE; - -+ beagle_identify(); -+ - twl4030_power_init(); - twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON); - -+ printf("Board revision "); -+ switch (beagle_revision) { -+ case REVISION_AXBX: -+ printf("Ax/Bx\n"); -+ break; -+ case REVISION_CX: -+ printf("C1/C2/C3\n"); -+ MUX_BEAGLE_C(); -+ break; -+ case REVISION_C4: -+ printf("C4\n"); -+ MUX_BEAGLE_C(); -+ break; -+ case REVISION_D: -+ printf("D\n"); -+ break; -+ default: -+ printf("unknown 0x%02x\n", beagle_revision); -+ } -+ - /* Configure GPIOs to output */ - writel(~(GPIO23 | GPIO10 | GPIO8 | GPIO2 | GPIO1), &gpio6_base->oe); - writel(~(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 | -@@ -120,8 +139,6 @@ int misc_init_r(void) - writel(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 | - GPIO15 | GPIO14 | GPIO13 | GPIO12, &gpio5_base->setdataout); - -- beagle_identify(); -- - dieid_num_r(); - - return 0; -@@ -136,8 +153,4 @@ int misc_init_r(void) - void set_muxconf_regs(void) - { - MUX_BEAGLE(); -- -- if (beagle_revision_c) { -- MUX_BEAGLE_C(); -- } - } -diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h -index 7fe6275..d95fd78 100644 ---- a/board/ti/beagle/beagle.h -+++ b/board/ti/beagle/beagle.h -@@ -34,6 +34,11 @@ const omap3_sysinfo sysinfo = { - }; - - #define BOARD_REVISION_MASK (0x1 << 11) -+/* BeagleBoard revisions */ -+#define REVISION_AXBX 0x7 -+#define REVISION_CX 0x6 -+#define REVISION_C4 0x5 -+#define REVISION_D 0x0 - - /* - * IEN - Input Enable -@@ -264,7 +269,7 @@ const omap3_sysinfo sysinfo = { - MUX_VAL(CP(HDQ_SIO), (IDIS | PTU | EN | M4)) /*GPIO_170*/\ - MUX_VAL(CP(MCSPI1_CLK), (IEN | PTU | EN | M4)) /*GPIO_171*/\ - MUX_VAL(CP(MCSPI1_SIMO), (IEN | PTU | EN | M4)) /*GPIO_172*/\ -- MUX_VAL(CP(MCSPI1_SOMI), (IEN | PTD | DIS | M0)) /*McSPI1_SOMI*/\ -+ MUX_VAL(CP(MCSPI1_SOMI), (IEN | PTU | EN | M4)) /*GPIO_173*/\ - 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*/\ --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0003-omap3_beagle-enable-the-use-of-a-plain-text-file-nam.patch b/recipes/u-boot/u-boot-git/beagleboard/0003-omap3_beagle-enable-the-use-of-a-plain-text-file-nam.patch new file mode 100644 index 0000000000..a68859e81a --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0003-omap3_beagle-enable-the-use-of-a-plain-text-file-nam.patch @@ -0,0 +1,89 @@ +From 58ca6009d4101e5fd45ef9df22aa360d1662e9e9 Mon Sep 17 00:00:00 2001 +From: Alexander Holler +Date: Mon, 24 Jan 2011 13:08:49 +0000 +Subject: [PATCH 03/16] omap3_beagle: enable the use of a plain text file named uEnv.txt instead of boot.scr + +Using the new env import command it is possible to use plain text files instead +of script-images. Plain text files are much easier to handle. + +E.g. If your boot.scr contains the following: +----------------------------------- +setenv dvimode 1024x768-16@60 +run loaduimage +run mmcboot +----------------------------------- +you could create a file named uEnv.txt and use that instead of boot.scr: +----------------------------------- +dvimode=1024x768-16@60 +uenvcmd=run loaduimage; run mmcboot +----------------------------------- +The variable uenvcmd (if existent) will be executed (using run) after uEnv.txt +was loaded. If uenvcmd doesn't exist the default boot sequence will be started, +therefore you could just use +----------------------------------- +dvimode=1024x768-16@60 +----------------------------------- +as uEnv.txt because loaduimage and mmcboot is part of the default boot sequence. +--- +Changes for v2: + - Eliminated else redundant clause that would be ignored if boot + succeeds. + +Changes for v3: + - Removed boot.scr + +Changes for v4: + - Removed comment about boot.scr being supported. +--- + include/configs/omap3_beagle.h | 28 ++++++++++++++++------------ + 1 files changed, 16 insertions(+), 12 deletions(-) + +diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h +index 8b580ef..c85537c 100644 +--- a/include/configs/omap3_beagle.h ++++ b/include/configs/omap3_beagle.h +@@ -213,9 +213,9 @@ + "omapdss.def_disp=${defaultdisplay} " \ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ +- "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ +- "bootscript=echo Running bootscript from mmc ...; " \ +- "source ${loadaddr}\0" \ ++ "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ ++ "importbootenv=echo Importing environment from mmc ...; " \ ++ "env import -t $loadaddr $filesize\0" \ + "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ +@@ -227,15 +227,19 @@ + + #define CONFIG_BOOTCOMMAND \ + "if mmc rescan ${mmcdev}; then " \ +- "if run loadbootscript; then " \ +- "run bootscript; " \ +- "else " \ +- "if run loaduimage; then " \ +- "run mmcboot; " \ +- "else run nandboot; " \ +- "fi; " \ +- "fi; " \ +- "else run nandboot; fi" ++ "echo SD/MMC found on device ${mmcdev};" \ ++ "if run loadbootenv; then " \ ++ "run importbootenv;" \ ++ "fi;" \ ++ "if test -n $uenvcmd; then " \ ++ "echo Running uenvcmd ...;" \ ++ "run uenvcmd;" \ ++ "fi;" \ ++ "if run loaduimage; then " \ ++ "run mmcboot;" \ ++ "fi;" \ ++ "fi;" \ ++ "run nandboot;" \ + + #define CONFIG_AUTO_COMPLETE 1 + /* +-- +1.6.6.1 + diff --git a/recipes/u-boot/u-boot-git/beagleboard/0004-OMAP3-BeagleBoard-Enable-pullups-on-i2c2.patch b/recipes/u-boot/u-boot-git/beagleboard/0004-OMAP3-BeagleBoard-Enable-pullups-on-i2c2.patch new file mode 100644 index 0000000000..4840d8697d --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0004-OMAP3-BeagleBoard-Enable-pullups-on-i2c2.patch @@ -0,0 +1,69 @@ +From 6859e4b88c405ed40c898d259227f158da5f867a Mon Sep 17 00:00:00 2001 +From: Steve Kipisz +Date: Thu, 5 Aug 2010 10:36:07 -0500 +Subject: [PATCH 04/16] OMAP3: BeagleBoard: Enable pullups on i2c2. + +This allows the reading of EEPROMS on the expansion bus without adding +external pull-ups. +--- +v2 updates + * Updated per http://patchwork.ozlabs.org/patch/71997/ + * Added description + * Used OMAP34XX_CTRL_BASE + * Used structure and writel to perform write + +v3 updates + * Included v3 in the subject line + * Fixed structure name typo that got messed up in generating patch + * Removed some extraneous blank lines + +v4 updates + * Fixed typo in typecast +--- + arch/arm/include/asm/arch-omap3/omap3.h | 14 ++++++++++++++ + board/ti/beagle/beagle.c | 4 ++++ + 2 files changed, 18 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/include/asm/arch-omap3/omap3.h b/arch/arm/include/asm/arch-omap3/omap3.h +index 3957c79..cc2b541 100644 +--- a/arch/arm/include/asm/arch-omap3/omap3.h ++++ b/arch/arm/include/asm/arch-omap3/omap3.h +@@ -50,6 +50,20 @@ + /* CONTROL */ + #define OMAP34XX_CTRL_BASE (OMAP34XX_L4_IO_BASE + 0x2000) + ++#ifndef __ASSEMBLY__ ++/* Signal Integrity Parameter Control Registers */ ++struct control_prog_io { ++ unsigned char res[0x408]; ++ unsigned int io2; /* 0x408 */ ++ unsigned char res2[0x38]; ++ unsigned int io0; /* 0x444 */ ++ unsigned int io1; /* 0x448 */ ++}; ++#endif /* __ASSEMBLY__ */ ++ ++/* Bit definition for CONTROL_PROG_IO1 */ ++#define PRG_I2C2_PULLUPRESX 0x00000001 ++ + /* UART */ + #define OMAP34XX_UART1 (OMAP34XX_L4_IO_BASE + 0x6a000) + #define OMAP34XX_UART2 (OMAP34XX_L4_IO_BASE + 0x6c000) +diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c +index 929461c..9d03b24 100644 +--- a/board/ti/beagle/beagle.c ++++ b/board/ti/beagle/beagle.c +@@ -148,6 +148,10 @@ int misc_init_r(void) + { + struct gpio *gpio5_base = (struct gpio *)OMAP34XX_GPIO5_BASE; + struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE; ++ struct control_prog_io *prog_io_base = (struct control_prog_io *)OMAP34XX_CTRL_BASE; ++ ++ /* Enable i2c2 pullup resisters */ ++ writel(~(PRG_I2C2_PULLUPRESX), &prog_io_base->io1); + + switch (get_board_revision()) { + case REVISION_AXBX: +-- +1.6.6.1 + diff --git a/recipes/u-boot/u-boot-git/beagleboard/0004-OMAP3-Set-VAUX2-to-1.8V-for-EHCI-PHY-on-Beagle-Rev-C.patch b/recipes/u-boot/u-boot-git/beagleboard/0004-OMAP3-Set-VAUX2-to-1.8V-for-EHCI-PHY-on-Beagle-Rev-C.patch deleted file mode 100644 index a344f481de..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0004-OMAP3-Set-VAUX2-to-1.8V-for-EHCI-PHY-on-Beagle-Rev-C.patch +++ /dev/null @@ -1,143 +0,0 @@ -From a1a4ba7a5fce36522a994cb06d6d76931964578c Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Wed, 10 Feb 2010 15:23:19 -0800 -Subject: [PATCH 04/50] OMAP3: Set VAUX2 to 1.8V for EHCI PHY on Beagle Rev C4 boards - ---- - board/ti/beagle/beagle.c | 5 +++++ - drivers/power/twl4030.c | 45 +++++++++++++++++++++++++-------------------- - include/twl4030.h | 15 +++++++++++++++ - 3 files changed, 45 insertions(+), 20 deletions(-) - -diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index ba16dd7..b4ea7e6 100644 ---- a/board/ti/beagle/beagle.c -+++ b/board/ti/beagle/beagle.c -@@ -120,6 +120,11 @@ int misc_init_r(void) - case REVISION_C4: - printf("C4\n"); - MUX_BEAGLE_C(); -+ /* Set VAUX2 to 1.8V for EHCI PHY */ -+ twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED, -+ TWL4030_PM_RECEIVER_VAUX2_VSEL_18, -+ TWL4030_PM_RECEIVER_VAUX2_DEV_GRP, -+ TWL4030_PM_RECEIVER_DEV_GRP_P1); - break; - case REVISION_D: - printf("D\n"); -diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c -index eb066cb..f354834 100644 ---- a/drivers/power/twl4030.c -+++ b/drivers/power/twl4030.c -@@ -59,57 +59,62 @@ void twl4030_power_reset_init(void) - } - } - -- --/* -- * Power Init -- */ --#define DEV_GRP_P1 0x20 --#define VAUX3_VSEL_28 0x03 --#define DEV_GRP_ALL 0xE0 --#define VPLL2_VSEL_18 0x05 --#define VDAC_VSEL_18 0x03 -- - void twl4030_power_init(void) - { - unsigned char byte; - - /* set VAUX3 to 2.8V */ -- byte = DEV_GRP_P1; -+ byte = TWL4030_PM_RECEIVER_DEV_GRP_P1; - twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, byte, - TWL4030_PM_RECEIVER_VAUX3_DEV_GRP); -- byte = VAUX3_VSEL_28; -+ byte = TWL4030_PM_RECEIVER_VAUX3_VSEL_28; - twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, byte, - TWL4030_PM_RECEIVER_VAUX3_DEDICATED); - - /* set VPLL2 to 1.8V */ -- byte = DEV_GRP_ALL; -+ byte = TWL4030_PM_RECEIVER_DEV_GRP_ALL; - twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, byte, - TWL4030_PM_RECEIVER_VPLL2_DEV_GRP); -- byte = VPLL2_VSEL_18; -+ byte = TWL4030_PM_RECEIVER_VPLL2_VSEL_18; - twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, byte, - TWL4030_PM_RECEIVER_VPLL2_DEDICATED); - - /* set VDAC to 1.8V */ -- byte = DEV_GRP_P1; -+ byte = TWL4030_PM_RECEIVER_DEV_GRP_P1; - twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, byte, - TWL4030_PM_RECEIVER_VDAC_DEV_GRP); -- byte = VDAC_VSEL_18; -+ byte = TWL4030_PM_RECEIVER_VDAC_VSEL_18; - twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, byte, - TWL4030_PM_RECEIVER_VDAC_DEDICATED); - } - --#define VMMC1_VSEL_30 0x02 -- - void twl4030_power_mmc_init(void) - { - unsigned char byte; - -- byte = DEV_GRP_P1; -+ byte = TWL4030_PM_RECEIVER_DEV_GRP_P1; - twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, byte, - TWL4030_PM_RECEIVER_VMMC1_DEV_GRP); - - /* 3 Volts */ -- byte = VMMC1_VSEL_30; -+ byte = TWL4030_PM_RECEIVER_VMMC1_VSEL_30; - twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, byte, - TWL4030_PM_RECEIVER_VMMC1_DEDICATED); - } -+ -+/* -+ * Generic function to select Device Group and Voltage -+ */ -+void twl4030_pmrecv_vsel_cfg(u8 vsel_reg, u8 vsel_val, -+ u8 dev_grp, u8 dev_grp_sel) -+{ -+ /* Select the Device Group */ -+ twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, dev_grp_sel, -+ dev_grp); -+ -+ /* Select the Voltage */ -+ twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, vsel_val, -+ vsel_reg); -+} -+ -+ -diff --git a/include/twl4030.h b/include/twl4030.h -index 2b2f5ae..cc99403 100644 ---- a/include/twl4030.h -+++ b/include/twl4030.h -@@ -471,6 +471,21 @@ - #define TWL4030_USB_PHY_CLK_CTRL_STS 0xFF - - /* -+ * Voltage Selection in PM Receiver Module -+ */ -+#define TWL4030_PM_RECEIVER_VAUX2_VSEL_18 0x05 -+#define TWL4030_PM_RECEIVER_VAUX3_VSEL_28 0x03 -+#define TWL4030_PM_RECEIVER_VPLL2_VSEL_18 0x05 -+#define TWL4030_PM_RECEIVER_VDAC_VSEL_18 0x03 -+#define TWL4030_PM_RECEIVER_VMMC1_VSEL_30 0x02 -+ -+/* -+ * Device Selection in PM Receiver Module -+ */ -+#define TWL4030_PM_RECEIVER_DEV_GRP_P1 0x20 -+#define TWL4030_PM_RECEIVER_DEV_GRP_ALL 0xE0 -+ -+/* - * Convience functions to read and write from TWL4030 - * - * chip_no is the i2c address, it must be one of the chip addresses --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0005-ARMV7-OMAP3-BeagleBoard-add-xM-rev-B-to-ID-table.patch b/recipes/u-boot/u-boot-git/beagleboard/0005-ARMV7-OMAP3-BeagleBoard-add-xM-rev-B-to-ID-table.patch new file mode 100644 index 0000000000..0e8dd84030 --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0005-ARMV7-OMAP3-BeagleBoard-add-xM-rev-B-to-ID-table.patch @@ -0,0 +1,111 @@ +From d2d1669e4e2d4eeb996305278c6e4df0b1e04a8d Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Wed, 3 Nov 2010 14:48:31 +0100 +Subject: [PATCH 05/16] ARMV7: OMAP3: BeagleBoard: add xM rev B to ID table + +Patch was updated by Jason Kridner : +* Use tabs to match style of other board revisions +* Only include board revisions that exist +* Default to the same configuration as the latest revision, but + without setting 'beaglerev' +--- +v2 Changes + * Updated with feedback from http://patchwork.ozlabs.org/patch/71995/ + * Removed setting of mpurate based on board revision + * Set mpurate to auto in default environment variables + +Cc: Koen Kooi +--- + board/ti/beagle/beagle.c | 22 +++++++++++++++++----- + board/ti/beagle/beagle.h | 3 ++- + include/configs/omap3_beagle.h | 2 +- + 3 files changed, 20 insertions(+), 7 deletions(-) + +diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c +index 9d03b24..87a952e 100644 +--- a/board/ti/beagle/beagle.c ++++ b/board/ti/beagle/beagle.c +@@ -157,18 +157,15 @@ int misc_init_r(void) + case REVISION_AXBX: + printf("Beagle Rev Ax/Bx\n"); + setenv("beaglerev", "AxBx"); +- setenv("mpurate", "600"); + break; + case REVISION_CX: + printf("Beagle Rev C1/C2/C3\n"); + setenv("beaglerev", "Cx"); +- setenv("mpurate", "600"); + MUX_BEAGLE_C(); + break; + case REVISION_C4: + printf("Beagle Rev C4\n"); + setenv("beaglerev", "C4"); +- setenv("mpurate", "720"); + MUX_BEAGLE_C(); + /* Set VAUX2 to 1.8V for EHCI PHY */ + twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED, +@@ -176,10 +173,19 @@ int misc_init_r(void) + TWL4030_PM_RECEIVER_VAUX2_DEV_GRP, + TWL4030_PM_RECEIVER_DEV_GRP_P1); + break; +- case REVISION_XM: ++ case REVISION_XM_A: + printf("Beagle xM Rev A\n"); + setenv("beaglerev", "xMA"); +- setenv("mpurate", "1000"); ++ MUX_BEAGLE_XM(); ++ /* Set VAUX2 to 1.8V for EHCI PHY */ ++ twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED, ++ TWL4030_PM_RECEIVER_VAUX2_VSEL_18, ++ TWL4030_PM_RECEIVER_VAUX2_DEV_GRP, ++ TWL4030_PM_RECEIVER_DEV_GRP_P1); ++ break; ++ case REVISION_XM_B: ++ printf("Beagle xM Rev B\n"); ++ setenv("beaglerev", "xMB"); + MUX_BEAGLE_XM(); + /* Set VAUX2 to 1.8V for EHCI PHY */ + twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED, +@@ -189,6 +195,12 @@ int misc_init_r(void) + break; + default: + printf("Beagle unknown 0x%02x\n", get_board_revision()); ++ MUX_BEAGLE_XM(); ++ /* Set VAUX2 to 1.8V for EHCI PHY */ ++ twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED, ++ TWL4030_PM_RECEIVER_VAUX2_VSEL_18, ++ TWL4030_PM_RECEIVER_VAUX2_DEV_GRP, ++ TWL4030_PM_RECEIVER_DEV_GRP_P1); + } + + switch (get_expansion_id()) { +diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h +index b22b653..b0e26e5 100644 +--- a/board/ti/beagle/beagle.h ++++ b/board/ti/beagle/beagle.h +@@ -37,7 +37,8 @@ const omap3_sysinfo sysinfo = { + #define REVISION_AXBX 0x7 + #define REVISION_CX 0x6 + #define REVISION_C4 0x5 +-#define REVISION_XM 0x0 ++#define REVISION_XM_A 0x0 ++#define REVISION_XM_B 0x1 + + /* + * IEN - Input Enable +diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h +index c85537c..51e14d0 100644 +--- a/include/configs/omap3_beagle.h ++++ b/include/configs/omap3_beagle.h +@@ -190,7 +190,7 @@ + "loadaddr=0x82000000\0" \ + "usbtty=cdc_acm\0" \ + "console=ttyS2,115200n8\0" \ +- "mpurate=500\0" \ ++ "mpurate=auto\0" \ + "vram=12M\0" \ + "dvimode=1024x768MR-16@60\0" \ + "defaultdisplay=dvi\0" \ +-- +1.6.6.1 + diff --git a/recipes/u-boot/u-boot-git/beagleboard/0005-OMAP3-add-entry-for-rev-3.1.2-check-and-display-max-.patch b/recipes/u-boot/u-boot-git/beagleboard/0005-OMAP3-add-entry-for-rev-3.1.2-check-and-display-max-.patch deleted file mode 100644 index f00f3fe763..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0005-OMAP3-add-entry-for-rev-3.1.2-check-and-display-max-.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 13ed8be9848adff30bcfdcbe16bce3d2c6bb02f1 Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Wed, 3 Feb 2010 12:26:30 -0800 -Subject: [PATCH 05/50] OMAP3: add entry for rev 3.1.2, check and display max cpu clock for rev > 3.0 - ---- - cpu/arm_cortexa8/omap3/sys_info.c | 24 ++++++++++++++++++++++-- - include/asm-arm/arch-omap3/cpu.h | 8 +++++++- - include/asm-arm/arch-omap3/omap3.h | 3 ++- - 3 files changed, 31 insertions(+), 4 deletions(-) - -diff --git a/cpu/arm_cortexa8/omap3/sys_info.c b/cpu/arm_cortexa8/omap3/sys_info.c -index 08fb32e..e227f67 100644 ---- a/cpu/arm_cortexa8/omap3/sys_info.c -+++ b/cpu/arm_cortexa8/omap3/sys_info.c -@@ -39,7 +39,10 @@ static char *rev_s[CPU_3XX_MAX_REV] = { - "2.0", - "2.1", - "3.0", -- "3.1"}; -+ "3.1", -+ "UNKNOWN", -+ "UNKNOWN", -+ "3.1.2"}; - - /***************************************************************** - * dieid_num_r(void) - read and set die ID -@@ -104,6 +107,16 @@ u32 get_cpu_rev(void) - } - } - -+/***************************************************************** -+ * get_sku_id(void) - read sku_id to get info on max clock rate -+ *****************************************************************/ -+u32 get_sku_id(void) -+{ -+ struct ctrl_id *id_base = (struct ctrl_id *)OMAP34XX_ID_L4_IO_BASE; -+ return (readl(&id_base->sku_id) & SKUID_CLK_MASK); -+} -+ -+ - /**************************************************** - * is_mem_sdr() - return 1 if mem type in use is SDR - ****************************************************/ -@@ -291,9 +304,16 @@ int print_cpuinfo (void) - sec_s = "?"; - } - -- printf("OMAP%s-%s ES%s, CPU-OPP2 L3-165MHz\n", -+ printf("OMAP%s-%s ES%s, CPU-OPP2, L3-165MHz, ", - cpu_s, sec_s, rev_s[get_cpu_rev()]); - -+ printf("Max clock-"); -+ if ((get_cpu_rev() >= CPU_3XX_ES31) && (get_sku_id() == SKUID_CLK_720MHZ)) -+ printf("720Mhz\n"); -+ else printf("600Mhz\n"); -+ -+ -+ - return 0; - } - #endif /* CONFIG_DISPLAY_CPUINFO */ -diff --git a/include/asm-arm/arch-omap3/cpu.h b/include/asm-arm/arch-omap3/cpu.h -index aa8de32..f769571 100644 ---- a/include/asm-arm/arch-omap3/cpu.h -+++ b/include/asm-arm/arch-omap3/cpu.h -@@ -72,7 +72,8 @@ struct ctrl_id { - u8 res1[0x4]; - u32 idcode; /* 0x04 */ - u32 prod_id; /* 0x08 */ -- u8 res2[0x0C]; -+ u32 sku_id; /* 0x0c */ -+ u8 res2[0x08]; - u32 die_id_0; /* 0x18 */ - u32 die_id_1; /* 0x1C */ - u32 die_id_2; /* 0x20 */ -@@ -89,6 +90,11 @@ struct ctrl_id { - #define HS_DEVICE 0x2 - #define GP_DEVICE 0x3 - -+/* device speed */ -+#define SKUID_CLK_MASK 0xf -+#define SKUID_CLK_600MHZ 0x0 -+#define SKUID_CLK_720MHZ 0x8 -+ - #define GPMC_BASE (OMAP34XX_GPMC_BASE) - #define GPMC_CONFIG_CS0 0x60 - #define GPMC_CONFIG_CS0_BASE (GPMC_BASE + GPMC_CONFIG_CS0) -diff --git a/include/asm-arm/arch-omap3/omap3.h b/include/asm-arm/arch-omap3/omap3.h -index 12815f6..1349b8b 100644 ---- a/include/asm-arm/arch-omap3/omap3.h -+++ b/include/asm-arm/arch-omap3/omap3.h -@@ -176,7 +176,8 @@ struct gpio { - #define CPU_3XX_ES21 2 - #define CPU_3XX_ES30 3 - #define CPU_3XX_ES31 4 --#define CPU_3XX_MAX_REV (CPU_3XX_ES31 + 1) -+#define CPU_3XX_ES312 7 -+#define CPU_3XX_MAX_REV 8 - - #define CPU_3XX_ID_SHIFT 28 - --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-BeagleBoard-add-more-expansionboard-IDs.patch b/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-BeagleBoard-add-more-expansionboard-IDs.patch new file mode 100644 index 0000000000..1d16cf7a95 --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-BeagleBoard-add-more-expansionboard-IDs.patch @@ -0,0 +1,95 @@ +From 40cdd86d6040714f79e81bb813596748490aa948 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Wed, 3 Nov 2010 14:39:15 +0100 +Subject: [PATCH 06/16] OMAP3: BeagleBoard: add more expansionboard IDs + +Information on configurations pulled from +http://www.elinux.org/BeagleBoardPinMux#Vendor_and_Device_IDs + +Boards added: +* Added BeagleBoardToys WiFi, VGA and LCD boards +* Added KBADC Beagle FPGA board +* Added Brainmux LCDog and LCDog Touch +* Added Liquidware BeagleTouch +--- +v2 updates + * Removed unused definitions + * Added BeagleBoardToys board configurations + * Made definition names consistent as VENDOR_BOARD +--- + board/ti/beagle/beagle.c | 30 +++++++++++++++++++++++++++++- + board/ti/beagle/beagle.h | 12 ++++++++++++ + 2 files changed, 41 insertions(+), 1 deletions(-) + +diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c +index 87a952e..97e9e12 100644 +--- a/board/ti/beagle/beagle.c ++++ b/board/ti/beagle/beagle.c +@@ -48,7 +48,12 @@ + #define TINCANTOOLS_TRAINER 0x04000100 + #define TINCANTOOLS_SHOWDOG 0x03000100 + #define KBADC_BEAGLEFPGA 0x01000600 +- ++#define LW_BEAGLETOUCH 0x01000700 ++#define BRAINMUX_LCDOG 0x01000800 ++#define BRAINMUX_LCDOGTOUCH 0x02000800 ++#define BBTOYS_WIFI 0x01000B00 ++#define BBTOYS_VGA 0x02000B00 ++#define BBTOYS_LCD 0x03000B00 + #define BEAGLE_NO_EEPROM 0xffffffff + + DECLARE_GLOBAL_DATA_PTR; +@@ -239,6 +244,29 @@ int misc_init_r(void) + MUX_KBADC_BEAGLEFPGA(); + setenv("buddy", "beaglefpga"); + break; ++ case LW_BEAGLETOUCH: ++ printf("Recognized Liquidware BeagleTouch board\n"); ++ setenv("buddy", "beagletouch"); ++ break; ++ case BRAINMUX_LCDOG: ++ printf("Recognized Brainmux LCDog board\n"); ++ setenv("buddy", "lcdog"); ++ break; ++ case BRAINMUX_LCDOGTOUCH: ++ printf("Recognized Brainmux LCDog Touch board\n"); ++ setenv("buddy", "lcdogtouch"); ++ break; ++ case BBTOYS_WIFI: ++ printf("Recognized BeagleBoardToys WiFi board\n"); ++ MUX_BBTOYS_WIFI() ++ setenv("buddy", "bbtoys-wifi"); ++ break;; ++ case BBTOYS_VGA: ++ printf("Recognized BeagleBoardToys VGA board\n"); ++ break;; ++ case BBTOYS_LCD: ++ printf("Recognized BeagleBoardToys LCD board\n"); ++ break;; + case BEAGLE_NO_EEPROM: + printf("No EEPROM on expansion board\n"); + setenv("buddy", "none"); +diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h +index b0e26e5..0f21790 100644 +--- a/board/ti/beagle/beagle.h ++++ b/board/ti/beagle/beagle.h +@@ -458,4 +458,16 @@ const omap3_sysinfo sysinfo = { + MUX_VAL(CP(MCBSP1_DR), (IEN | PTU | EN | M1)) /*MCSPI4_SOMI*/\ + MUX_VAL(CP(MCBSP1_FSX), (IDIS | PTU | DIS | M1)) /*MCSPI4_CS0*/ + ++#define MUX_BBTOYS_WIFI() \ ++ MUX_VAL(CP(MMC2_CLK), (IEN | PTU | EN | M0)) /*MMC2_CLK*/\ ++ MUX_VAL(CP(MMC2_CMD), (IEN | PTU | EN | M0)) /*MMC2_CMD*/\ ++ MUX_VAL(CP(MMC2_DAT0), (IEN | PTU | EN | M0)) /*MMC2_DAT0*/\ ++ MUX_VAL(CP(MMC2_DAT1), (IEN | PTU | EN | M0)) /*MMC2_DAT1*/\ ++ MUX_VAL(CP(MMC2_DAT2), (IEN | PTU | EN | M0)) /*MMC2_DAT2*/\ ++ MUX_VAL(CP(MMC2_DAT3), (IEN | PTU | EN | M0)) /*MMC2_DAT3*/\ ++ MUX_VAL(CP(MMC2_DAT4), (IDIS | PTU | EN | M4)) /*GPIO_136 FM_EN/BT_WU*/\ ++ MUX_VAL(CP(MMC2_DAT5), (IEN | PTU | EN | M4)) /*GPIO_137 WLAN_IRQ*/\ ++ MUX_VAL(CP(MMC2_DAT6), (IDIS | PTU | EN | M4)) /*GPIO_138 BT_EN*/\ ++ MUX_VAL(CP(MMC2_DAT7), (IDIS | PTU | EN | M4)) /*GPIO_139 WLAN_EN*/ ++ + #endif +-- +1.6.6.1 + diff --git a/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-add-mpurate-boot-arg-for-overo-and-beagle.patch b/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-add-mpurate-boot-arg-for-overo-and-beagle.patch deleted file mode 100644 index 5fbc0754b7..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-add-mpurate-boot-arg-for-overo-and-beagle.patch +++ /dev/null @@ -1,70 +0,0 @@ -From b03bad6826a2f3a0a03f6cdd5682e0a628fff851 Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Wed, 3 Feb 2010 14:39:14 -0800 -Subject: [PATCH 06/50] OMAP3: add mpurate boot arg for overo and beagle - -allows one to set the omap clock rate via "setenv mpurate 720" for example ---- - include/configs/omap3_beagle.h | 3 +++ - include/configs/omap3_overo.h | 3 +++ - 2 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h -index d522c77..35ae8af 100644 ---- a/include/configs/omap3_beagle.h -+++ b/include/configs/omap3_beagle.h -@@ -187,6 +187,7 @@ - "loadaddr=0x82000000\0" \ - "usbtty=cdc_acm\0" \ - "console=ttyS2,115200n8\0" \ -+ "mpurate=500\0" \ - "vram=12M\0" \ - "dvimode=1024x768MR-16@60\0" \ - "defaultdisplay=dvi\0" \ -@@ -195,6 +196,7 @@ - "nandroot=/dev/mtdblock4 rw\0" \ - "nandrootfstype=jffs2\0" \ - "mmcargs=setenv bootargs console=${console} " \ -+ "mpurate=${mpurate} " \ - "vram=${vram} " \ - "omapfb.mode=dvi:${dvimode} " \ - "omapfb.debug=y " \ -@@ -202,6 +204,7 @@ - "root=${mmcroot} " \ - "rootfstype=${mmcrootfstype}\0" \ - "nandargs=setenv bootargs console=${console} " \ -+ "mpurate=${mpurate} " \ - "vram=${vram} " \ - "omapfb.mode=dvi:${dvimode} " \ - "omapfb.debug=y " \ -diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h -index a43500b..113c6df 100644 ---- a/include/configs/omap3_overo.h -+++ b/include/configs/omap3_overo.h -@@ -151,6 +151,7 @@ - #define CONFIG_EXTRA_ENV_SETTINGS \ - "loadaddr=0x82000000\0" \ - "console=ttyS2,115200n8\0" \ -+ "mpurate=500\0" \ - "vram=12M\0" \ - "dvimode=1024x768MR-16@60\0" \ - "defaultdisplay=dvi\0" \ -@@ -159,6 +160,7 @@ - "nandroot=/dev/mtdblock4 rw\0" \ - "nandrootfstype=jffs2\0" \ - "mmcargs=setenv bootargs console=${console} " \ -+ "mpurate=${mpurate} " \ - "vram=${vram} " \ - "omapfb.mode=dvi:${dvimode} " \ - "omapfb.debug=y " \ -@@ -166,6 +168,7 @@ - "root=${mmcroot} " \ - "rootfstype=${mmcrootfstype}\0" \ - "nandargs=setenv bootargs console=${console} " \ -+ "mpurate=${mpurate} " \ - "vram=${vram} " \ - "omapfb.mode=dvi:${dvimode} " \ - "omapfb.debug=y " \ --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0025-Add-DSS-driver-for-OMAP3.patch b/recipes/u-boot/u-boot-git/beagleboard/0007-OMAP3-Add-DSS-driver-for-OMAP3.patch similarity index 76% rename from recipes/u-boot/u-boot-git/beagleboard/0025-Add-DSS-driver-for-OMAP3.patch rename to recipes/u-boot/u-boot-git/beagleboard/0007-OMAP3-Add-DSS-driver-for-OMAP3.patch index 7a33bed6c3..a1b3b0e28f 100644 --- a/recipes/u-boot/u-boot-git/beagleboard/0025-Add-DSS-driver-for-OMAP3.patch +++ b/recipes/u-boot/u-boot-git/beagleboard/0007-OMAP3-Add-DSS-driver-for-OMAP3.patch @@ -1,7 +1,7 @@ -From afa9025604773b90831cb93a5c80db8d2b8eed4b Mon Sep 17 00:00:00 2001 +From 8a249fc1c57ab01a78996e33e74a71757a9448b1 Mon Sep 17 00:00:00 2001 From: Syed Mohammed Khasim Date: Tue, 12 Jan 2010 23:57:28 +0530 -Subject: [PATCH 25/50] Add DSS driver for OMAP3 +Subject: [PATCH 07/16] OMAP3: Add DSS driver for OMAP3 Supports dynamic panel configuration Supports dynamic tv standard selection @@ -11,169 +11,27 @@ Incorporated DSS register access using structures. Previous discussions are here http://www.mail-archive.com/u-boot@lists.denx.de/msg27150.html +--- +v2 updates: + * Enable panel output for BeagleBoard + * BeagleBoard: Update DVI-D orange screen frequencies for xM Signed-off-by: Syed Mohammed Khasim --- - drivers/video/Makefile | 1 + - drivers/video/omap3_dss.c | 130 ++++++++++++++++++++++++++++ - include/asm-arm/arch-omap3/dss.h | 173 ++++++++++++++++++++++++++++++++++++++ - 3 files changed, 304 insertions(+), 0 deletions(-) + arch/arm/include/asm/arch-omap3/dss.h | 173 +++++++++++++++++++++++++++++++++ + board/ti/beagle/beagle.c | 22 ++++ + board/ti/beagle/beagle.h | 26 +++++ + drivers/video/Makefile | 2 + + drivers/video/omap3_dss.c | 130 +++++++++++++++++++++++++ + 5 files changed, 353 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/include/asm/arch-omap3/dss.h create mode 100644 drivers/video/omap3_dss.c - create mode 100644 include/asm-arm/arch-omap3/dss.h -diff --git a/drivers/video/Makefile b/drivers/video/Makefile -index a5e339a..44d7ae8 100644 ---- a/drivers/video/Makefile -+++ b/drivers/video/Makefile -@@ -38,6 +38,7 @@ COBJS-$(CONFIG_SED156X) += sed156x.o - COBJS-$(CONFIG_VIDEO_SM501) += sm501.o - COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o - COBJS-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o -+COBJS-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o - COBJS-y += videomodes.o - - COBJS := $(COBJS-y) -diff --git a/drivers/video/omap3_dss.c b/drivers/video/omap3_dss.c -new file mode 100644 -index 0000000..69c705a ---- /dev/null -+++ b/drivers/video/omap3_dss.c -@@ -0,0 +1,130 @@ -+/* -+ * (C) Copyright 2010 -+ * Texas Instruments, -+ * Syed Mohammed Khasim -+ * -+ * Referred to Linux DSS driver files for OMAP3 -+ * -+ * 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 -+#include -+#include -+ -+/* -+ * Configure VENC for a given Mode (NTSC / PAL) -+ */ -+void omap3_dss_venc_config(const struct venc_regs *venc_cfg, -+ u32 height, u32 width) -+{ -+ struct venc_regs *venc = (struct venc_regs *) OMAP3_VENC_BASE; -+ struct dss_regs *dss = (struct dss_regs *) OMAP3_DSS_BASE; -+ struct dispc_regs *dispc = (struct dispc_regs *) OMAP3_DISPC_BASE; -+ -+ writel(venc_cfg->status, &venc->status); -+ writel(venc_cfg->f_control, &venc->f_control); -+ writel(venc_cfg->vidout_ctrl, &venc->vidout_ctrl); -+ writel(venc_cfg->sync_ctrl, &venc->sync_ctrl); -+ writel(venc_cfg->llen, &venc->llen); -+ writel(venc_cfg->flens, &venc->flens); -+ writel(venc_cfg->hfltr_ctrl, &venc->hfltr_ctrl); -+ writel(venc_cfg->cc_carr_wss_carr, &venc->cc_carr_wss_carr); -+ writel(venc_cfg->c_phase, &venc->c_phase); -+ writel(venc_cfg->gain_u, &venc->gain_u); -+ writel(venc_cfg->gain_v, &venc->gain_v); -+ writel(venc_cfg->gain_y, &venc->gain_y); -+ writel(venc_cfg->black_level, &venc->black_level); -+ writel(venc_cfg->blank_level, &venc->blank_level); -+ writel(venc_cfg->x_color, &venc->x_color); -+ writel(venc_cfg->m_control, &venc->m_control); -+ writel(venc_cfg->bstamp_wss_data, &venc->bstamp_wss_data); -+ writel(venc_cfg->s_carr, &venc->s_carr); -+ writel(venc_cfg->line21, &venc->line21); -+ writel(venc_cfg->ln_sel, &venc->ln_sel); -+ writel(venc_cfg->l21__wc_ctl, &venc->l21__wc_ctl); -+ writel(venc_cfg->htrigger_vtrigger, &venc->htrigger_vtrigger); -+ writel(venc_cfg->savid__eavid, &venc->savid__eavid); -+ writel(venc_cfg->flen__fal, &venc->flen__fal); -+ writel(venc_cfg->lal__phase_reset, &venc->lal__phase_reset); -+ writel(venc_cfg->hs_int_start_stop_x, -+ &venc->hs_int_start_stop_x); -+ writel(venc_cfg->hs_ext_start_stop_x, -+ &venc->hs_ext_start_stop_x); -+ writel(venc_cfg->vs_int_start_x, &venc->vs_int_start_x); -+ writel(venc_cfg->vs_int_stop_x__vs_int_start_y, -+ &venc->vs_int_stop_x__vs_int_start_y); -+ writel(venc_cfg->vs_int_stop_y__vs_ext_start_x, -+ &venc->vs_int_stop_y__vs_ext_start_x); -+ writel(venc_cfg->vs_ext_stop_x__vs_ext_start_y, -+ &venc->vs_ext_stop_x__vs_ext_start_y); -+ writel(venc_cfg->vs_ext_stop_y, &venc->vs_ext_stop_y); -+ writel(venc_cfg->avid_start_stop_x, &venc->avid_start_stop_x); -+ writel(venc_cfg->avid_start_stop_y, &venc->avid_start_stop_y); -+ writel(venc_cfg->fid_int_start_x__fid_int_start_y, -+ &venc->fid_int_start_x__fid_int_start_y); -+ writel(venc_cfg->fid_int_offset_y__fid_ext_start_x, -+ &venc->fid_int_offset_y__fid_ext_start_x); -+ writel(venc_cfg->fid_ext_start_y__fid_ext_offset_y, -+ &venc->fid_ext_start_y__fid_ext_offset_y); -+ writel(venc_cfg->tvdetgp_int_start_stop_x, -+ &venc->tvdetgp_int_start_stop_x); -+ writel(venc_cfg->tvdetgp_int_start_stop_y, -+ &venc->tvdetgp_int_start_stop_y); -+ writel(venc_cfg->gen_ctrl, &venc->gen_ctrl); -+ writel(venc_cfg->output_control, &venc->output_control); -+ writel(venc_cfg->dac_b__dac_c, &venc->dac_b__dac_c); -+ -+ /* Configure DSS for VENC Settings */ -+ writel(VENC_DSS_CONFIG, &dss->control); -+ -+ /* Configure height and width for Digital out */ -+ writel(((height << DIG_LPP_SHIFT) | width), &dispc->size_dig); -+} -+ -+/* -+ * Configure Panel Specific Parameters -+ */ -+void omap3_dss_panel_config(const struct panel_config *panel_cfg) -+{ -+ struct dispc_regs *dispc = (struct dispc_regs *) OMAP3_DISPC_BASE; -+ -+ writel(panel_cfg->timing_h, &dispc->timing_h); -+ writel(panel_cfg->timing_v, &dispc->timing_v); -+ writel(panel_cfg->pol_freq, &dispc->pol_freq); -+ writel(panel_cfg->divisor, &dispc->divisor); -+ writel(panel_cfg->lcd_size, &dispc->size_lcd); -+ writel((panel_cfg->load_mode << FRAME_MODE_SHIFT), &dispc->config); -+ writel(((panel_cfg->panel_type << TFTSTN_SHIFT) | -+ (panel_cfg->data_lines << DATALINES_SHIFT)), &dispc->control); -+ writel(panel_cfg->panel_color, &dispc->default_color0); -+} -+ -+/* -+ * Enable LCD and DIGITAL OUT in DSS -+ */ -+void omap3_dss_enable(void) -+{ -+ struct dispc_regs *dispc = (struct dispc_regs *) OMAP3_DISPC_BASE; -+ u32 l = 0; -+ -+ l = readl(&dispc->control); -+ l |= DISPC_ENABLE; -+ writel(l, &dispc->control); -+} -diff --git a/include/asm-arm/arch-omap3/dss.h b/include/asm-arm/arch-omap3/dss.h +diff --git a/arch/arm/include/asm/arch-omap3/dss.h b/arch/arm/include/asm/arch-omap3/dss.h new file mode 100644 index 0000000..e5e3b0d --- /dev/null -+++ b/include/asm-arm/arch-omap3/dss.h ++++ b/arch/arm/include/asm/arch-omap3/dss.h @@ -0,0 +1,173 @@ +/* + * (C) Copyright 2010 @@ -348,6 +206,230 @@ index 0000000..e5e3b0d +void omap3_dss_enable(void); + +#endif /* DSS_H */ +diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c +index 97e9e12..56e7afc 100644 +--- a/board/ti/beagle/beagle.c ++++ b/board/ti/beagle/beagle.c +@@ -146,6 +146,27 @@ unsigned int get_expansion_id(void) + } + + /* ++ * Configure DSS to display background color on DVID ++ * Configure VENC to display color bar on S-Video ++ */ ++void display_init(void) ++{ ++ omap3_dss_venc_config(&venc_config_std_tv, VENC_HEIGHT, VENC_WIDTH); ++ switch (get_board_revision()) { ++ case REVISION_AXBX: ++ case REVISION_CX: ++ case REVISION_C4: ++ omap3_dss_panel_config(&dvid_cfg); ++ break; ++ case REVISION_XM_A: ++ case REVISION_XM_B: ++ default: ++ omap3_dss_panel_config(&dvid_cfg_xm); ++ break; ++ } ++} ++ ++/* + * Routine: misc_init_r + * Description: Configure board specific parts + */ +@@ -282,6 +303,7 @@ int misc_init_r(void) + + twl4030_power_init(); + twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON); ++ display_init(); + + /* Set GPIO states before they are made outputs */ + writel(GPIO23 | GPIO10 | GPIO8 | GPIO2 | GPIO1, +diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h +index 0f21790..48228dc 100644 +--- a/board/ti/beagle/beagle.h ++++ b/board/ti/beagle/beagle.h +@@ -470,4 +470,30 @@ const omap3_sysinfo sysinfo = { + MUX_VAL(CP(MMC2_DAT6), (IDIS | PTU | EN | M4)) /*GPIO_138 BT_EN*/\ + MUX_VAL(CP(MMC2_DAT7), (IDIS | PTU | EN | M4)) /*GPIO_139 WLAN_EN*/ + ++/* ++ * Configure Timings for DVI D ++ */ ++static const struct panel_config dvid_cfg = { ++ .timing_h = 0x0ff03f31, /* Horizantal timing */ ++ .timing_v = 0x01400504, /* Vertical timing */ ++ .pol_freq = 0x00007028, /* Pol Freq */ ++ .divisor = 0x00010006, /* 72Mhz Pixel Clock */ ++ .lcd_size = 0x02ff03ff, /* 1024x768 */ ++ .panel_type = 0x01, /* TFT */ ++ .data_lines = 0x03, /* 24 Bit RGB */ ++ .load_mode = 0x02, /* Frame Mode */ ++ .panel_color = DVI_BEAGLE_ORANGE_COL /* ORANGE */ ++}; ++ ++static const struct panel_config dvid_cfg_xm = { ++ .timing_h = 0x1a4024c9, /* Horizantal timing */ ++ .timing_v = 0x02c00509, /* Vertical timing */ ++ .pol_freq = 0x00007028, /* Pol Freq */ ++ .divisor = 0x00010001, /* 96MHz Pixel Clock */ ++ .lcd_size = 0x02ff03ff, /* 1024x768 */ ++ .panel_type = 0x01, /* TFT */ ++ .data_lines = 0x03, /* 24 Bit RGB */ ++ .load_mode = 0x02, /* Frame Mode */ ++ .panel_color = DVI_BEAGLE_ORANGE_COL /* ORANGE */ ++}; + #endif +diff --git a/drivers/video/Makefile b/drivers/video/Makefile +index 2c53a6f..6baa7ca 100644 +--- a/drivers/video/Makefile ++++ b/drivers/video/Makefile +@@ -41,6 +41,8 @@ COBJS-$(CONFIG_SED156X) += sed156x.o + COBJS-$(CONFIG_VIDEO_SM501) += sm501.o + COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o videomodes.o + COBJS-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o ++COBJS-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o ++COBJS-y += videomodes.o + + COBJS := $(COBJS-y) + SRCS := $(COBJS:.o=.c) +diff --git a/drivers/video/omap3_dss.c b/drivers/video/omap3_dss.c +new file mode 100644 +index 0000000..69c705a +--- /dev/null ++++ b/drivers/video/omap3_dss.c +@@ -0,0 +1,130 @@ ++/* ++ * (C) Copyright 2010 ++ * Texas Instruments, ++ * Syed Mohammed Khasim ++ * ++ * Referred to Linux DSS driver files for OMAP3 ++ * ++ * 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 ++#include ++#include ++ ++/* ++ * Configure VENC for a given Mode (NTSC / PAL) ++ */ ++void omap3_dss_venc_config(const struct venc_regs *venc_cfg, ++ u32 height, u32 width) ++{ ++ struct venc_regs *venc = (struct venc_regs *) OMAP3_VENC_BASE; ++ struct dss_regs *dss = (struct dss_regs *) OMAP3_DSS_BASE; ++ struct dispc_regs *dispc = (struct dispc_regs *) OMAP3_DISPC_BASE; ++ ++ writel(venc_cfg->status, &venc->status); ++ writel(venc_cfg->f_control, &venc->f_control); ++ writel(venc_cfg->vidout_ctrl, &venc->vidout_ctrl); ++ writel(venc_cfg->sync_ctrl, &venc->sync_ctrl); ++ writel(venc_cfg->llen, &venc->llen); ++ writel(venc_cfg->flens, &venc->flens); ++ writel(venc_cfg->hfltr_ctrl, &venc->hfltr_ctrl); ++ writel(venc_cfg->cc_carr_wss_carr, &venc->cc_carr_wss_carr); ++ writel(venc_cfg->c_phase, &venc->c_phase); ++ writel(venc_cfg->gain_u, &venc->gain_u); ++ writel(venc_cfg->gain_v, &venc->gain_v); ++ writel(venc_cfg->gain_y, &venc->gain_y); ++ writel(venc_cfg->black_level, &venc->black_level); ++ writel(venc_cfg->blank_level, &venc->blank_level); ++ writel(venc_cfg->x_color, &venc->x_color); ++ writel(venc_cfg->m_control, &venc->m_control); ++ writel(venc_cfg->bstamp_wss_data, &venc->bstamp_wss_data); ++ writel(venc_cfg->s_carr, &venc->s_carr); ++ writel(venc_cfg->line21, &venc->line21); ++ writel(venc_cfg->ln_sel, &venc->ln_sel); ++ writel(venc_cfg->l21__wc_ctl, &venc->l21__wc_ctl); ++ writel(venc_cfg->htrigger_vtrigger, &venc->htrigger_vtrigger); ++ writel(venc_cfg->savid__eavid, &venc->savid__eavid); ++ writel(venc_cfg->flen__fal, &venc->flen__fal); ++ writel(venc_cfg->lal__phase_reset, &venc->lal__phase_reset); ++ writel(venc_cfg->hs_int_start_stop_x, ++ &venc->hs_int_start_stop_x); ++ writel(venc_cfg->hs_ext_start_stop_x, ++ &venc->hs_ext_start_stop_x); ++ writel(venc_cfg->vs_int_start_x, &venc->vs_int_start_x); ++ writel(venc_cfg->vs_int_stop_x__vs_int_start_y, ++ &venc->vs_int_stop_x__vs_int_start_y); ++ writel(venc_cfg->vs_int_stop_y__vs_ext_start_x, ++ &venc->vs_int_stop_y__vs_ext_start_x); ++ writel(venc_cfg->vs_ext_stop_x__vs_ext_start_y, ++ &venc->vs_ext_stop_x__vs_ext_start_y); ++ writel(venc_cfg->vs_ext_stop_y, &venc->vs_ext_stop_y); ++ writel(venc_cfg->avid_start_stop_x, &venc->avid_start_stop_x); ++ writel(venc_cfg->avid_start_stop_y, &venc->avid_start_stop_y); ++ writel(venc_cfg->fid_int_start_x__fid_int_start_y, ++ &venc->fid_int_start_x__fid_int_start_y); ++ writel(venc_cfg->fid_int_offset_y__fid_ext_start_x, ++ &venc->fid_int_offset_y__fid_ext_start_x); ++ writel(venc_cfg->fid_ext_start_y__fid_ext_offset_y, ++ &venc->fid_ext_start_y__fid_ext_offset_y); ++ writel(venc_cfg->tvdetgp_int_start_stop_x, ++ &venc->tvdetgp_int_start_stop_x); ++ writel(venc_cfg->tvdetgp_int_start_stop_y, ++ &venc->tvdetgp_int_start_stop_y); ++ writel(venc_cfg->gen_ctrl, &venc->gen_ctrl); ++ writel(venc_cfg->output_control, &venc->output_control); ++ writel(venc_cfg->dac_b__dac_c, &venc->dac_b__dac_c); ++ ++ /* Configure DSS for VENC Settings */ ++ writel(VENC_DSS_CONFIG, &dss->control); ++ ++ /* Configure height and width for Digital out */ ++ writel(((height << DIG_LPP_SHIFT) | width), &dispc->size_dig); ++} ++ ++/* ++ * Configure Panel Specific Parameters ++ */ ++void omap3_dss_panel_config(const struct panel_config *panel_cfg) ++{ ++ struct dispc_regs *dispc = (struct dispc_regs *) OMAP3_DISPC_BASE; ++ ++ writel(panel_cfg->timing_h, &dispc->timing_h); ++ writel(panel_cfg->timing_v, &dispc->timing_v); ++ writel(panel_cfg->pol_freq, &dispc->pol_freq); ++ writel(panel_cfg->divisor, &dispc->divisor); ++ writel(panel_cfg->lcd_size, &dispc->size_lcd); ++ writel((panel_cfg->load_mode << FRAME_MODE_SHIFT), &dispc->config); ++ writel(((panel_cfg->panel_type << TFTSTN_SHIFT) | ++ (panel_cfg->data_lines << DATALINES_SHIFT)), &dispc->control); ++ writel(panel_cfg->panel_color, &dispc->default_color0); ++} ++ ++/* ++ * Enable LCD and DIGITAL OUT in DSS ++ */ ++void omap3_dss_enable(void) ++{ ++ struct dispc_regs *dispc = (struct dispc_regs *) OMAP3_DISPC_BASE; ++ u32 l = 0; ++ ++ l = readl(&dispc->control); ++ l |= DISPC_ENABLE; ++ writel(l, &dispc->control); ++} -- 1.6.6.1 diff --git a/recipes/u-boot/u-boot-git/beagleboard/0007-OMAP3-detect-expansion-board-type-version-using-eepr.patch b/recipes/u-boot/u-boot-git/beagleboard/0007-OMAP3-detect-expansion-board-type-version-using-eepr.patch deleted file mode 100644 index 8ff0e93c3e..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0007-OMAP3-detect-expansion-board-type-version-using-eepr.patch +++ /dev/null @@ -1,129 +0,0 @@ -From f1ad90ae5fd07257ea42aa771e16a7798cd440bb Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Fri, 12 Feb 2010 12:17:48 -0800 -Subject: [PATCH 07/50] OMAP3: detect expansion board type/version using eeprom contents - ---- - board/overo/overo.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 92 insertions(+), 0 deletions(-) - -diff --git a/board/overo/overo.c b/board/overo/overo.c -index 3df1a12..2838a1f 100644 ---- a/board/overo/overo.c -+++ b/board/overo/overo.c -@@ -39,6 +39,31 @@ - #include - #include "overo.h" - -+static struct { -+ unsigned int device_vendor; -+ unsigned char revision; -+ unsigned char content; -+ unsigned char data[6]; -+} expansion_config; -+ -+#define TWL4030_I2C_BUS 0 -+ -+#define EXPANSION_EEPROM_I2C_BUS 2 -+#define EXPANSION_EEPROM_I2C_ADDRESS 0x50 -+ -+#define GUMSTIX_VENDORID 0x0200 -+ -+#define GUMSTIX_SUMMIT 0x01000200 -+#define GUMSTIX_TOBI 0x02000200 -+#define GUMSTIX_TOBI_DUO 0x03000200 -+#define GUMSTIX_PALO35 0x04000200 -+#define GUMSTIX_PALO43 0x05000200 -+#define GUMSTIX_CHESTNUT43 0x06000200 -+#define GUMSTIX_PINTO 0x07000200 -+ -+#define GUMSTIX_NO_EEPROM 0xfffffffe -+#define GUMSTIX_UNKNOWN 0xffffffff -+ - #if defined(CONFIG_CMD_NET) - static void setup_net_chip(void); - #endif -@@ -130,6 +155,31 @@ int get_board_revision(void) { - } - - /* -+ * Routine: get_expansion_id -+ * Description: This function checks for expansion board by checking I2C -+ * bus 2 for the availability of an AT24C01B serial EEPROM. -+ * returns the device_vendor field from the EEPROM -+ */ -+unsigned int get_expansion_id(void) -+{ -+ i2c_set_bus_num(EXPANSION_EEPROM_I2C_BUS); -+ -+ /* return GUMSTIX_NO_EEPROM if eeprom doesn't respond */ -+ if (i2c_probe(EXPANSION_EEPROM_I2C_ADDRESS) == 1) -+ return GUMSTIX_NO_EEPROM; -+ -+ /* read configuration data */ -+ i2c_read(EXPANSION_EEPROM_I2C_ADDRESS, 0, 1, (u8 *)&expansion_config, -+ sizeof(expansion_config)); -+ -+ if ( (expansion_config.device_vendor & 0xffff) != GUMSTIX_VENDORID ) -+ return GUMSTIX_UNKNOWN; -+ else -+ return expansion_config.device_vendor; -+} -+ -+ -+/* - * Routine: misc_init_r - * Description: Configure board specific parts - */ -@@ -156,6 +206,48 @@ int misc_init_r(void) - printf(" unsupported\n"); - } - -+ switch (get_expansion_id()) { -+ case GUMSTIX_SUMMIT: -+ printf("Recognized Summit expansion board (rev %d %s)\n", -+ expansion_config.revision, expansion_config.data); -+ setenv("defaultdisplay", "dvi"); -+ break; -+ case GUMSTIX_TOBI: -+ printf("Recognized Tobi expansion board (rev %d %s)\n", -+ expansion_config.revision, expansion_config.data); -+ setenv("defaultdisplay", "dvi"); -+ break; -+ case GUMSTIX_TOBI_DUO: -+ printf("Recognized Tobi Duo expansion board (rev %d %s)\n", -+ expansion_config.revision, expansion_config.data); -+ break; -+ case GUMSTIX_PALO35: -+ printf("Recognized Palo 35 expansion board (rev %d %s)\n", -+ expansion_config.revision, expansion_config.data); -+ setenv("defaultdisplay", "lcd35"); -+ break; -+ case GUMSTIX_PALO43: -+ printf("Recognized Palo 43 expansion board (rev %d %s)\n", -+ expansion_config.revision, expansion_config.data); -+ setenv("defaultdisplay", "lcd43"); -+ break; -+ case GUMSTIX_CHESTNUT43: -+ printf("Recognized Chestnut 43 expansion board (rev %d %s)\n", -+ expansion_config.revision, expansion_config.data); -+ setenv("defaultdisplay", "lcd43"); -+ break; -+ case GUMSTIX_PINTO: -+ printf("Recognized Pinto expansion board (rev %d %s)\n", -+ expansion_config.revision, expansion_config.data); -+ break; -+ case GUMSTIX_NO_EEPROM: -+ printf("No EEPROM on expansion board\n"); -+ break; -+ case GUMSTIX_UNKNOWN: -+ printf("Unrecognized expansion board\n"); -+ } -+ -+ i2c_set_bus_num(TWL4030_I2C_BUS); - twl4030_power_init(); - twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON); - --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0045-BeagleBoard-Added-userbutton-command.patch b/recipes/u-boot/u-boot-git/beagleboard/0008-BeagleBoard-Added-userbutton-command.patch similarity index 77% rename from recipes/u-boot/u-boot-git/beagleboard/0045-BeagleBoard-Added-userbutton-command.patch rename to recipes/u-boot/u-boot-git/beagleboard/0008-BeagleBoard-Added-userbutton-command.patch index d454d73c16..411bb7b7f7 100644 --- a/recipes/u-boot/u-boot-git/beagleboard/0045-BeagleBoard-Added-userbutton-command.patch +++ b/recipes/u-boot/u-boot-git/beagleboard/0008-BeagleBoard-Added-userbutton-command.patch @@ -1,7 +1,7 @@ -From f5146ac9d3af9c9cd4f4bc940c343d3ef75ac6f0 Mon Sep 17 00:00:00 2001 +From 31110e039b1982590df08c66e53924f454e3e3f1 Mon Sep 17 00:00:00 2001 From: Jason Kridner Date: Wed, 21 Jul 2010 07:41:25 -0500 -Subject: [PATCH 45/50] BeagleBoard: Added userbutton command +Subject: [PATCH 08/16] BeagleBoard: Added userbutton command Based on commit f1099c7c43caf5bac3bf6a65aa266fade4747072 Author: Greg Turner @@ -19,26 +19,29 @@ Based on commit f1099c7c43caf5bac3bf6a65aa266fade4747072 * Flipped polarity of the return value to avoid confusion. Success (0) is when the button is pressed. Failure (1) is when the button is NOT pressed. +* Used latest revision getting function. +* Used latest macros for board revision. --- - board/ti/beagle/beagle.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 54 insertions(+), 0 deletions(-) + board/ti/beagle/beagle.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index a6a4961..66df719 100644 +index 56e7afc..04e4259 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c -@@ -40,6 +40,7 @@ +@@ -38,6 +38,7 @@ #include #include #include "beagle.h" +#include - static struct { - unsigned int device_vendor; -@@ -290,3 +291,56 @@ void set_muxconf_regs(void) - MUX_BEAGLE(); + #define TWL4030_I2C_BUS 0 + #define EXPANSION_EEPROM_I2C_BUS 1 +@@ -339,3 +340,57 @@ int board_mmc_init(bd_t *bis) + return 0; } - + #endif ++ +/* + * This command returns the status of the user button on beagle xM + * Input - none @@ -54,13 +57,14 @@ index a6a4961..66df719 100644 + * pass address parameter as argv[0] (aka command name), + * and all remaining args + */ -+ switch (beagle_revision) { ++ switch (get_board_revision()) { + case REVISION_AXBX: + case REVISION_CX: + case REVISION_C4: + gpio = 7; + break; -+ case REVISION_XM: ++ case REVISION_XM_A: ++ case REVISION_XM_B: + default: + gpio = 4; + break; @@ -91,7 +95,6 @@ index a6a4961..66df719 100644 + "Return the status of the BeagleBoard USER button", + "" +); -+ -- 1.6.6.1 diff --git a/recipes/u-boot/u-boot-git/beagleboard/0008-OMAP3-Overo-enable-config-eeprom-to-set-u-boot-env-v.patch b/recipes/u-boot/u-boot-git/beagleboard/0008-OMAP3-Overo-enable-config-eeprom-to-set-u-boot-env-v.patch deleted file mode 100644 index 0f847256f0..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0008-OMAP3-Overo-enable-config-eeprom-to-set-u-boot-env-v.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 831504a9514c2cb4b1dc8c9a261fd4d1a037235f Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Tue, 16 Feb 2010 09:58:01 -0800 -Subject: [PATCH 08/50] OMAP3: Overo: enable config eeprom to set u-boot env variable - ---- - board/overo/overo.c | 21 +++++++++++++-------- - 1 files changed, 13 insertions(+), 8 deletions(-) - -diff --git a/board/overo/overo.c b/board/overo/overo.c -index 2838a1f..f6093d2 100644 ---- a/board/overo/overo.c -+++ b/board/overo/overo.c -@@ -43,7 +43,9 @@ static struct { - unsigned int device_vendor; - unsigned char revision; - unsigned char content; -- unsigned char data[6]; -+ unsigned char fab_revision[8]; -+ unsigned char env_var[16]; -+ unsigned char env_setting[64]; - } expansion_config; - - #define TWL4030_I2C_BUS 0 -@@ -209,36 +211,36 @@ int misc_init_r(void) - switch (get_expansion_id()) { - case GUMSTIX_SUMMIT: - printf("Recognized Summit expansion board (rev %d %s)\n", -- expansion_config.revision, expansion_config.data); -+ expansion_config.revision, expansion_config.fab_revision); - setenv("defaultdisplay", "dvi"); - break; - case GUMSTIX_TOBI: - printf("Recognized Tobi expansion board (rev %d %s)\n", -- expansion_config.revision, expansion_config.data); -+ expansion_config.revision, expansion_config.fab_revision); - setenv("defaultdisplay", "dvi"); - break; - case GUMSTIX_TOBI_DUO: - printf("Recognized Tobi Duo expansion board (rev %d %s)\n", -- expansion_config.revision, expansion_config.data); -+ expansion_config.revision, expansion_config.fab_revision); - break; - case GUMSTIX_PALO35: - printf("Recognized Palo 35 expansion board (rev %d %s)\n", -- expansion_config.revision, expansion_config.data); -+ expansion_config.revision, expansion_config.fab_revision); - setenv("defaultdisplay", "lcd35"); - break; - case GUMSTIX_PALO43: - printf("Recognized Palo 43 expansion board (rev %d %s)\n", -- expansion_config.revision, expansion_config.data); -+ expansion_config.revision, expansion_config.fab_revision); - setenv("defaultdisplay", "lcd43"); - break; - case GUMSTIX_CHESTNUT43: - printf("Recognized Chestnut 43 expansion board (rev %d %s)\n", -- expansion_config.revision, expansion_config.data); -+ expansion_config.revision, expansion_config.fab_revision); - setenv("defaultdisplay", "lcd43"); - break; - case GUMSTIX_PINTO: - printf("Recognized Pinto expansion board (rev %d %s)\n", -- expansion_config.revision, expansion_config.data); -+ expansion_config.revision, expansion_config.fab_revision); - break; - case GUMSTIX_NO_EEPROM: - printf("No EEPROM on expansion board\n"); -@@ -247,6 +249,9 @@ int misc_init_r(void) - printf("Unrecognized expansion board\n"); - } - -+ if (expansion_config.content == 1) -+ setenv(expansion_config.env_var, expansion_config.env_setting); -+ - i2c_set_bus_num(TWL4030_I2C_BUS); - twl4030_power_init(); - twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON); --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-Overo-enable-input-on-MMC1_CLK-and-MMC3_CLK-pi.patch b/recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-Overo-enable-input-on-MMC1_CLK-and-MMC3_CLK-pi.patch deleted file mode 100644 index 1cadd80363..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-Overo-enable-input-on-MMC1_CLK-and-MMC3_CLK-pi.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 500787d2999e23cf185808f611af61745c2746a3 Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Tue, 16 Feb 2010 10:00:45 -0800 -Subject: [PATCH 09/50] OMAP3: Overo: enable input on MMC1_CLK and MMC3_CLK pinmux - ---- - board/overo/overo.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/board/overo/overo.h b/board/overo/overo.h -index e120e09..ff936dd 100644 ---- a/board/overo/overo.h -+++ b/board/overo/overo.h -@@ -200,7 +200,7 @@ const omap3_sysinfo sysinfo = { - 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_CLK), (IEN | 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*/\ -@@ -301,7 +301,7 @@ const omap3_sysinfo sysinfo = { - 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 | M2)) /*MMC3_CLK*/\ -+ MUX_VAL(CP(ETK_CLK_ES2), (IEN | PTU | EN | M2)) /*MMC3_CLK*/\ - MUX_VAL(CP(ETK_CTL_ES2), (IEN | PTU | EN | M2)) /*MMC3_CMD*/\ - MUX_VAL(CP(ETK_D0_ES2), (IEN | PTU | EN | M4)) /*GPIO_14*/\ - MUX_VAL(CP(ETK_D1_ES2), (IEN | PTD | EN | M4)) /*GPIO_15 - X_GATE*/\ --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch b/recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch new file mode 100644 index 0000000000..7da18afa76 --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch @@ -0,0 +1,57 @@ +From ca7179112840cdca717ac0c958a9ab226d1bdf25 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Mon, 22 Nov 2010 11:51:32 +0100 +Subject: [PATCH 09/16] OMAP3: beagle: pass expansionboard name in bootargs + +--- + include/configs/omap3_beagle.h | 13 +++++++++++++ + 1 files changed, 13 insertions(+), 0 deletions(-) + +diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h +index 51e14d0..9d569a5 100644 +--- a/include/configs/omap3_beagle.h ++++ b/include/configs/omap3_beagle.h +@@ -191,6 +191,7 @@ + "usbtty=cdc_acm\0" \ + "console=ttyS2,115200n8\0" \ + "mpurate=auto\0" \ ++ "buddy=none "\ + "vram=12M\0" \ + "dvimode=1024x768MR-16@60\0" \ + "defaultdisplay=dvi\0" \ +@@ -201,6 +202,7 @@ + "nandrootfstype=jffs2\0" \ + "mmcargs=setenv bootargs console=${console} " \ + "mpurate=${mpurate} " \ ++ "buddy=${buddy} "\ + "vram=${vram} " \ + "omapfb.mode=dvi:${dvimode} " \ + "omapdss.def_disp=${defaultdisplay} " \ +@@ -208,6 +210,7 @@ + "rootfstype=${mmcrootfstype}\0" \ + "nandargs=setenv bootargs console=${console} " \ + "mpurate=${mpurate} " \ ++ "buddy=${buddy} "\ + "vram=${vram} " \ + "omapfb.mode=dvi:${dvimode} " \ + "omapdss.def_disp=${defaultdisplay} " \ +@@ -216,6 +219,16 @@ + "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ + "importbootenv=echo Importing environment from mmc ...; " \ + "env import -t $loadaddr $filesize\0" \ ++ "ramargs=setenv bootargs console=${console} " \ ++ "${optargs} " \ ++ "mpurate=${mpurate} " \ ++ "buddy=${buddy} "\ ++ "vram=${vram} " \ ++ "omapfb.mode=dvi:${dvimode} " \ ++ "omapdss.def_disp=${defaultdisplay} " \ ++ "root=${ramroot} " \ ++ "rootfstype=${ramrootfstype}\0" \ ++ "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ + "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ +-- +1.6.6.1 + diff --git a/recipes/u-boot/u-boot-git/beagleboard/0026-Enable-DSS-driver-for-Beagle.patch b/recipes/u-boot/u-boot-git/beagleboard/0010-Enable-DSS-driver-for-Beagle.patch similarity index 52% rename from recipes/u-boot/u-boot-git/beagleboard/0026-Enable-DSS-driver-for-Beagle.patch rename to recipes/u-boot/u-boot-git/beagleboard/0010-Enable-DSS-driver-for-Beagle.patch index de25493829..8766d89b0a 100644 --- a/recipes/u-boot/u-boot-git/beagleboard/0026-Enable-DSS-driver-for-Beagle.patch +++ b/recipes/u-boot/u-boot-git/beagleboard/0010-Enable-DSS-driver-for-Beagle.patch @@ -1,49 +1,23 @@ -From 89a879905e59c837626b6a9425bcc27b097e02ad Mon Sep 17 00:00:00 2001 +From 2226921518eebb215ddadce09efb35b99a9db8ac Mon Sep 17 00:00:00 2001 From: Syed Mohammed Khasim Date: Sun, 11 Apr 2010 17:44:39 +0200 -Subject: [PATCH 26/50] Enable DSS driver for Beagle +Subject: [PATCH 10/16] Enable DSS driver for Beagle Configures DSS to display color bar on Svideo Configures DSS to display background color on DVID Signed-off-by: Syed Mohammed Khasim --- - board/ti/beagle/beagle.c | 12 ++++++ - board/ti/beagle/beagle.h | 75 ++++++++++++++++++++++++++++++++++++++++ - include/configs/omap3_beagle.h | 1 + - 3 files changed, 88 insertions(+), 0 deletions(-) + board/ti/beagle/beagle.c | 1 + + board/ti/beagle/beagle.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index 7cb6d1f..eb57b5a 100644 +index 04e4259..7c80a97 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c -@@ -141,6 +141,16 @@ unsigned int get_expansion_id(void) - } - - /* -+ * Configure DSS to display background color on DVID -+ * Configure VENC to display color bar on S-Video -+ */ -+void display_init(void) -+{ -+ omap3_dss_venc_config(&venc_config_std_tv, VENC_HEIGHT, VENC_WIDTH); -+ omap3_dss_panel_config(&dvid_cfg); -+} -+ -+/* - * Routine: misc_init_r - * Description: Configure board specific parts - */ -@@ -188,6 +198,7 @@ int misc_init_r(void) - - twl4030_power_init(); - twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON); -+ display_init(); - - switch (beagle_revision) { - case REVISION_AXBX: -@@ -233,6 +244,7 @@ int misc_init_r(void) - GPIO15 | GPIO14 | GPIO13 | GPIO12, &gpio5_base->setdataout); +@@ -318,6 +318,7 @@ int misc_init_r(void) + GPIO15 | GPIO14 | GPIO13 | GPIO12), &gpio5_base->oe); dieid_num_r(); + omap3_dss_enable(); @@ -51,7 +25,7 @@ index 7cb6d1f..eb57b5a 100644 return 0; } diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h -index ec4f831..69f9398 100644 +index 48228dc..bdf2a6f 100644 --- a/board/ti/beagle/beagle.h +++ b/board/ti/beagle/beagle.h @@ -23,6 +23,8 @@ @@ -63,11 +37,10 @@ index ec4f831..69f9398 100644 const omap3_sysinfo sysinfo = { DDR_STACKED, "OMAP3 Beagle board", -@@ -433,4 +435,77 @@ const omap3_sysinfo sysinfo = { - MUX_VAL(CP(MCBSP3_DR), (IEN | PTD | DIS | M4)) /*GPIO_142*/\ - MUX_VAL(CP(MCBSP3_CLKX), (IEN | PTD | DIS | M4)) /*GPIO_141*/\ +@@ -471,6 +473,64 @@ const omap3_sysinfo sysinfo = { + MUX_VAL(CP(MMC2_DAT7), (IDIS | PTU | EN | M4)) /*GPIO_139 WLAN_EN*/ -+/* + /* + * Display Configuration + */ + @@ -126,33 +99,9 @@ index ec4f831..69f9398 100644 +}; + +/* -+ * Configure Timings for DVI D -+ */ -+static const struct panel_config dvid_cfg = { -+ .timing_h = 0x0ff03f31, /* Horizantal timing */ -+ .timing_v = 0x01400504, /* Vertical timing */ -+ .pol_freq = 0x00007028, /* Pol Freq */ -+ .divisor = 0x00010006, /* 72Mhz Pixel Clock */ -+ .lcd_size = 0x02ff03ff, /* 1024x768 */ -+ .panel_type = 0x01, /* TFT */ -+ .data_lines = 0x03, /* 24 Bit RGB */ -+ .load_mode = 0x02, /* Frame Mode */ -+ .panel_color = DVI_BEAGLE_ORANGE_COL /* ORANGE */ -+}; -+ - #endif -diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h -index 8bedf7d..52d727a 100644 ---- a/include/configs/omap3_beagle.h -+++ b/include/configs/omap3_beagle.h -@@ -137,6 +137,7 @@ - #define CONFIG_CMD_I2C /* I2C serial bus support */ - #define CONFIG_CMD_MMC /* MMC support */ - #define CONFIG_CMD_NAND /* NAND support */ -+#define CONFIG_VIDEO_OMAP3 /* DSS Support */ - - #undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ - #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ + * Configure Timings for DVI D + */ + static const struct panel_config dvid_cfg = { -- 1.6.6.1 diff --git a/recipes/u-boot/u-boot-git/beagleboard/0010-OMAP3-Overo-set-CONFIG_SYS_I2C_SPEED-to-400Khz.patch b/recipes/u-boot/u-boot-git/beagleboard/0010-OMAP3-Overo-set-CONFIG_SYS_I2C_SPEED-to-400Khz.patch deleted file mode 100644 index b6a32bba85..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0010-OMAP3-Overo-set-CONFIG_SYS_I2C_SPEED-to-400Khz.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6ced8e0d859ea9cddbc2ec4a94a4c7394f1ee4c5 Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Tue, 16 Feb 2010 10:03:14 -0800 -Subject: [PATCH 10/50] OMAP3: Overo: set CONFIG_SYS_I2C_SPEED to 400Khz - ---- - include/configs/omap3_overo.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h -index 113c6df..27b5476 100644 ---- a/include/configs/omap3_overo.h -+++ b/include/configs/omap3_overo.h -@@ -112,7 +112,7 @@ - - #define CONFIG_SYS_NO_FLASH - #define CONFIG_HARD_I2C 1 --#define CONFIG_SYS_I2C_SPEED 100000 -+#define CONFIG_SYS_I2C_SPEED 400000 - #define CONFIG_SYS_I2C_SLAVE 1 - #define CONFIG_SYS_I2C_BUS 0 - #define CONFIG_SYS_I2C_BUS_SELECT 1 --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0011-Add-led-command.patch b/recipes/u-boot/u-boot-git/beagleboard/0011-Add-led-command.patch new file mode 100644 index 0000000000..e51ee5e2f4 --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0011-Add-led-command.patch @@ -0,0 +1,213 @@ +From e3e94bd49df4b4588cc5c95392b872eadb531fc4 Mon Sep 17 00:00:00 2001 +From: Jason Kridner +Date: Thu, 20 May 2010 05:41:26 -0500 +Subject: [PATCH 11/16] Add 'led' command + +This patch allows any board implementing the coloured LED API +to control the LEDs from the console. + +led [green | yellow | red | all ] [ on | off ] + +or + +led [ 1 | 2 | 3 | all ] [ on | off ] + +Adds configuration item CONFIG_CMD_LED enabling the command. + +Partially based on patch from Ulf Samuelsson: +http://www.mail-archive.com/u-boot@lists.denx.de/msg09593.html. + +Updated based on feedback: +http://www.mail-archive.com/u-boot@lists.denx.de/msg41847.html +https://groups.google.com/d/topic/beagleboard/8Wf1HiK_QBo/discussion +* Fixed a handful of style issues. +* Significantly reduced the number of #ifdefs and redundant code +* Converted redundant code into loops test against a structure +* Made use of cmd_usage() +* Introduced a str_onoff() function, but haven't yet put it in common +* Eliminated trailing newline + +v2 updates + * Test every LED in case "all" is used. Previously, the code broke from + the loop after setting the state of only one LED. + * Corrected swapped on/off in structure definition + * Removed trailing white space +--- + common/Makefile | 1 + + common/cmd_led.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 153 insertions(+), 0 deletions(-) + create mode 100644 common/cmd_led.c + +diff --git a/common/Makefile b/common/Makefile +index 048df0c..29a0ead 100644 +--- a/common/Makefile ++++ b/common/Makefile +@@ -105,6 +105,7 @@ COBJS-$(CONFIG_CMD_IRQ) += cmd_irq.o + COBJS-$(CONFIG_CMD_ITEST) += cmd_itest.o + COBJS-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o + COBJS-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o ++COBJS-$(CONFIG_CMD_LED) += cmd_led.o + COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o + COBJS-y += cmd_load.o + COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o +diff --git a/common/cmd_led.c b/common/cmd_led.c +new file mode 100644 +index 0000000..7f02fe6 +--- /dev/null ++++ b/common/cmd_led.c +@@ -0,0 +1,152 @@ ++/* ++ * (C) Copyright 2010 ++ * Jason Kridner ++ * ++ * Based on cmd_led.c patch from: ++ * http://www.mail-archive.com/u-boot@lists.denx.de/msg06873.html ++ * (C) Copyright 2008 ++ * Ulf Samuelsson ++ * ++ * 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 ++#include ++#include ++#include ++ ++struct led_tbl_s { ++ char *string; /* String for use in the command */ ++ led_id_t mask; /* Mask used for calling __led_set() */ ++ void (*off)(void); /* Optional fucntion for turning LED off */ ++ void (*on)(void); /* Optional fucntion for turning LED on */ ++}; ++ ++typedef struct led_tbl_s led_tbl_t; ++ ++static const led_tbl_t led_commands[] = { ++#ifdef CONFIG_BOARD_SPECIFIC_LED ++#ifdef STATUS_LED_BIT ++ { "0", STATUS_LED_BIT, NULL, NULL }, ++#endif ++#ifdef STATUS_LED_BIT1 ++ { "1", STATUS_LED_BIT1, NULL, NULL }, ++#endif ++#ifdef STATUS_LED_BIT2 ++ { "2", STATUS_LED_BIT2, NULL, NULL }, ++#endif ++#ifdef STATUS_LED_BIT3 ++ { "3", STATUS_LED_BIT3, NULL, NULL }, ++#endif ++#endif ++#ifdef STATUS_LED_GREEN ++ { "green", STATUS_LED_GREEN, green_LED_off, green_LED_on }, ++#endif ++#ifdef STATUS_LED_YELLOW ++ { "yellow", STATUS_LED_YELLOW, yellow_LED_off, yellow_LED_on }, ++#endif ++#ifdef STATUS_LED_RED ++ { "red", STATUS_LED_RED, red_LED_off, red_LED_on }, ++#endif ++#ifdef STATUS_LED_BLUE ++ { "blue", STATUS_LED_BLUE, blue_LED_off, blue_LED_on }, ++#endif ++ { NULL, 0, NULL, NULL } ++}; ++ ++int str_onoff (char *var) ++{ ++ if (strcmp(var, "off") == 0) { ++ return 0; ++ } ++ if (strcmp(var, "on") == 0) { ++ return 1; ++ } ++ return -1; ++} ++ ++int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ++{ ++ int state, i; ++ ++ /* Validate arguments */ ++ if ((argc != 3)) { ++ return cmd_usage(cmdtp); ++ } ++ ++ state = str_onoff(argv[2]); ++ if (state < 0) { ++ return cmd_usage(cmdtp); ++ } ++ ++ for (i = 0; led_commands[i].string; i++) { ++ if ((strcmp("all", argv[1]) == 0) || ++ (strcmp(led_commands[i].string, argv[1]) == 0)) { ++ if (led_commands[i].on) { ++ if (state) { ++ led_commands[i].on(); ++ } else { ++ led_commands[i].off(); ++ } ++ } else { ++ __led_set(led_commands[i].mask, state); ++ } ++ } ++ } ++ ++ /* If we ran out of matches, print Usage */ ++ if (!led_commands[i].string && !(strcmp("all", argv[1]) == 0)) { ++ return cmd_usage(cmdtp); ++ } ++ ++ return 0; ++} ++ ++U_BOOT_CMD( ++ led, 3, 1, do_led, ++ "led\t- [" ++#ifdef CONFIG_BOARD_SPECIFIC_LED ++#ifdef STATUS_LED_BIT ++ "0|" ++#endif ++#ifdef STATUS_LED_BIT1 ++ "1|" ++#endif ++#ifdef STATUS_LED_BIT2 ++ "2|" ++#endif ++#ifdef STATUS_LED_BIT3 ++ "3|" ++#endif ++#endif ++#ifdef STATUS_LED_GREEN ++ "green|" ++#endif ++#ifdef STATUS_LED_YELLOW ++ "yellow|" ++#endif ++#ifdef STATUS_LED_RED ++ "red|" ++#endif ++#ifdef STATUS_LED_BLUE ++ "blue|" ++#endif ++ "all] [on|off]\n", ++ "led [led_name] [on|off] sets or clears led(s)\n" ++); +-- +1.6.6.1 + diff --git a/recipes/u-boot/u-boot-git/beagleboard/0011-OMAP3-trim-excessively-long-delays-in-i2c-driver.patch b/recipes/u-boot/u-boot-git/beagleboard/0011-OMAP3-trim-excessively-long-delays-in-i2c-driver.patch deleted file mode 100644 index 63a7295423..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0011-OMAP3-trim-excessively-long-delays-in-i2c-driver.patch +++ /dev/null @@ -1,52 +0,0 @@ -From f054db5f2a8eedbeaf8c6045d0bbafde5aca3efc Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Tue, 16 Feb 2010 10:04:30 -0800 -Subject: [PATCH 11/50] OMAP3: trim excessively long delays in i2c driver - ---- - drivers/i2c/omap24xx_i2c.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c -index e8c8184..0af230d 100644 ---- a/drivers/i2c/omap24xx_i2c.c -+++ b/drivers/i2c/omap24xx_i2c.c -@@ -148,7 +148,7 @@ static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 * value) - if (status & I2C_STAT_XRDY) { - /* Important: have to use byte access */ - writeb (regoffset, &i2c_base->data); -- udelay (20000); -+ udelay (2000); - if (readw (&i2c_base->stat) & I2C_STAT_NACK) { - i2c_error = 1; - } -@@ -160,7 +160,7 @@ static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 * value) - /* free bus, otherwise we can't use a combined transction */ - writew (0, &i2c_base->con); - while (readw (&i2c_base->stat) || (readw (&i2c_base->con) & I2C_CON_MST)) { -- udelay (10000); -+ udelay (1000); - /* Have to clear pending interrupt to clear I2C_STAT */ - writew (0xFFFF, &i2c_base->stat); - } -@@ -181,7 +181,7 @@ static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 * value) - #else - *value = readw (&i2c_base->data); - #endif -- udelay (20000); -+ udelay (2000); - } else { - i2c_error = 1; - } -@@ -190,7 +190,7 @@ static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 * value) - writew (I2C_CON_EN, &i2c_base->con); - while (readw (&i2c_base->stat) - || (readw (&i2c_base->con) & I2C_CON_MST)) { -- udelay (10000); -+ udelay (1000); - writew (0xFFFF, &i2c_base->stat); - } - } --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0042-BeagleBoard-Added-LED-driver.patch b/recipes/u-boot/u-boot-git/beagleboard/0012-BeagleBoard-Added-LED-driver.patch similarity index 83% rename from recipes/u-boot/u-boot-git/beagleboard/0042-BeagleBoard-Added-LED-driver.patch rename to recipes/u-boot/u-boot-git/beagleboard/0012-BeagleBoard-Added-LED-driver.patch index c1a0a563ed..01897aff26 100644 --- a/recipes/u-boot/u-boot-git/beagleboard/0042-BeagleBoard-Added-LED-driver.patch +++ b/recipes/u-boot/u-boot-git/beagleboard/0012-BeagleBoard-Added-LED-driver.patch @@ -1,28 +1,29 @@ -From bb88a9c0ffa5b6006d689635028177be4ce83104 Mon Sep 17 00:00:00 2001 +From 35271d72072841c16687ffd51f08ec65cdac3b3e Mon Sep 17 00:00:00 2001 From: Jason Kridner Date: Thu, 20 May 2010 06:14:01 -0500 -Subject: [PATCH 42/50] BeagleBoard: Added LED driver +Subject: [PATCH 12/16] BeagleBoard: Added LED driver Added LED driver using status_led. USR0 is set to monitor the boot status. USR1 is set to be the green LED. -(cherry picked from commit 048b526fd7cc0c642f27c674b3e235321c880b66) -(cherry picked from commit 21c574d9e20f86ab757f5efdd9146e6607f2faba) -Signed-off-by: Jason Kridner +Included adding configuration and command to the default configuration. + +v2 updates + * Fixed USR0/USR1 to be LED 0/1 respectively --- board/ti/beagle/Makefile | 4 ++- - board/ti/beagle/beagle.c | 8 ++++ + board/ti/beagle/beagle.c | 7 ++++ board/ti/beagle/led.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 102 insertions(+), 1 deletions(-) + 3 files changed, 101 insertions(+), 1 deletions(-) create mode 100644 board/ti/beagle/led.c diff --git a/board/ti/beagle/Makefile b/board/ti/beagle/Makefile -index f797112..4cc675c 100644 +index 3b4aaac..d9f445f 100644 --- a/board/ti/beagle/Makefile +++ b/board/ti/beagle/Makefile @@ -25,8 +25,10 @@ include $(TOPDIR)/config.mk - LIB = $(obj)lib$(BOARD).a + LIB = $(obj)lib$(BOARD).o -COBJS := beagle.o +COBJS-y := $(BOARD).o @@ -33,7 +34,7 @@ index f797112..4cc675c 100644 OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index cdba3dd..a6a4961 100644 +index 7c80a97..905b151 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -30,6 +30,9 @@ @@ -45,8 +46,8 @@ index cdba3dd..a6a4961 100644 +#endif #include #include - #include -@@ -83,6 +86,10 @@ int board_init(void) + #include +@@ -80,6 +83,10 @@ int board_init(void) /* boot param addr */ gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100); @@ -57,14 +58,9 @@ index cdba3dd..a6a4961 100644 return 0; } -@@ -282,3 +289,4 @@ void set_muxconf_regs(void) - { - MUX_BEAGLE(); - } -+ diff --git a/board/ti/beagle/led.c b/board/ti/beagle/led.c new file mode 100644 -index 0000000..df26552 +index 0000000..fe80e19 --- /dev/null +++ b/board/ti/beagle/led.c @@ -0,0 +1,91 @@ @@ -97,8 +93,8 @@ index 0000000..df26552 +static unsigned int saved_state[2] = {STATUS_LED_OFF, STATUS_LED_OFF}; + +/* GPIO pins for the LEDs */ -+#define BEAGLE_LED_USR0 149 -+#define BEAGLE_LED_USR1 150 ++#define BEAGLE_LED_USR0 150 ++#define BEAGLE_LED_USR1 149 + +#ifdef STATUS_LED_GREEN +void green_LED_off (void) diff --git a/recipes/u-boot/u-boot-git/beagleboard/0012-OMAP3-Overo-allow-expansion-boards-with-any-vendor-I.patch b/recipes/u-boot/u-boot-git/beagleboard/0012-OMAP3-Overo-allow-expansion-boards-with-any-vendor-I.patch deleted file mode 100644 index cd25031c9e..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0012-OMAP3-Overo-allow-expansion-boards-with-any-vendor-I.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2c02d9b024b58bbea920d3d6c40d62b30e448f60 Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Fri, 26 Feb 2010 12:40:26 -0800 -Subject: [PATCH 12/50] OMAP3: Overo: allow expansion boards with any vendor ID - ---- - board/overo/overo.c | 10 +++------- - 1 files changed, 3 insertions(+), 7 deletions(-) - -diff --git a/board/overo/overo.c b/board/overo/overo.c -index f6093d2..ec186ec 100644 ---- a/board/overo/overo.c -+++ b/board/overo/overo.c -@@ -63,8 +63,7 @@ static struct { - #define GUMSTIX_CHESTNUT43 0x06000200 - #define GUMSTIX_PINTO 0x07000200 - --#define GUMSTIX_NO_EEPROM 0xfffffffe --#define GUMSTIX_UNKNOWN 0xffffffff -+#define GUMSTIX_NO_EEPROM 0xffffffff - - #if defined(CONFIG_CMD_NET) - static void setup_net_chip(void); -@@ -174,10 +173,7 @@ unsigned int get_expansion_id(void) - i2c_read(EXPANSION_EEPROM_I2C_ADDRESS, 0, 1, (u8 *)&expansion_config, - sizeof(expansion_config)); - -- if ( (expansion_config.device_vendor & 0xffff) != GUMSTIX_VENDORID ) -- return GUMSTIX_UNKNOWN; -- else -- return expansion_config.device_vendor; -+ return expansion_config.device_vendor; - } - - -@@ -245,7 +241,7 @@ int misc_init_r(void) - case GUMSTIX_NO_EEPROM: - printf("No EEPROM on expansion board\n"); - break; -- case GUMSTIX_UNKNOWN: -+ default: - printf("Unrecognized expansion board\n"); - } - --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-BeagleBoard-updated-default-configuration.patch b/recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-BeagleBoard-updated-default-configuration.patch new file mode 100644 index 0000000000..9c9a3fd4b7 --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-BeagleBoard-updated-default-configuration.patch @@ -0,0 +1,184 @@ +From da8fa305fd10331958cd18c9c27c9e062b886fc4 Mon Sep 17 00:00:00 2001 +From: Jason Kridner +Date: Wed, 21 Jul 2010 07:41:25 -0500 +Subject: [PATCH 13/16] OMAP3: BeagleBoard: updated default configuration + +* Decrease bootdelay to 3, use VGA for default resolution +* Add CONFIG_SYS_MEMTEST_SCRATCH to point to a scratch memory area. +* Add camera to default bootargs +* Move ramdisk parameters. This will make it easier to reprogram the ramdisk size. +* Improved boot env var setting + * Enabled evaluation of expressions with 'setexpr' + * Made room for a 64MB ramdisk by moving from 0x81600000 to 0x81000000 + * Removed expression from 'ramroot' that wouldn't be evaluated + * Doubled console I/O buffer size from 256 to 512 + * Doubled maximum command arguments size from 16 to 32 +* Enable multibus support for I2C +* Added USER button switch from uEnv.txt to user.txt +* Enable LEDs + Added LED driver using status_led. USR0 is set to monitor + the boot status. USR1 is set to be the GREEN LED. +--- + include/configs/omap3_beagle.h | 62 ++++++++++++++++++++++++++++++++------- + 1 files changed, 51 insertions(+), 11 deletions(-) + +diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h +index 9d569a5..73d4d4e 100644 +--- a/include/configs/omap3_beagle.h ++++ b/include/configs/omap3_beagle.h +@@ -108,9 +108,27 @@ + #define CONFIG_OMAP_HSMMC 1 + #define CONFIG_DOS_PARTITION 1 + ++/* Status LED */ ++#define CONFIG_STATUS_LED 1 ++#define CONFIG_BOARD_SPECIFIC_LED 1 ++#define STATUS_LED_BIT 0x01 ++#define STATUS_LED_STATE STATUS_LED_ON ++#define STATUS_LED_PERIOD (CONFIG_SYS_HZ / 2) ++#define STATUS_LED_BIT1 0x02 ++#define STATUS_LED_STATE1 STATUS_LED_ON ++#define STATUS_LED_PERIOD1 (CONFIG_SYS_HZ / 2) ++#define STATUS_LED_BOOT STATUS_LED_BIT ++#define STATUS_LED_GREEN STATUS_LED_BIT1 ++ + /* DDR - I use Micron DDR */ + #define CONFIG_OMAP3_MICRON_DDR 1 + ++/* Enable Multi Bus support for I2C */ ++#define CONFIG_I2C_MULTI_BUS 1 ++ ++/* Probe all devices */ ++#define CONFIG_SYS_I2C_NOPROBES {0x0, 0x0} ++ + /* USB */ + #define CONFIG_MUSB_UDC 1 + #define CONFIG_USB_OMAP3 1 +@@ -138,6 +156,9 @@ + #define CONFIG_CMD_I2C /* I2C serial bus support */ + #define CONFIG_CMD_MMC /* MMC support */ + #define CONFIG_CMD_NAND /* NAND support */ ++#define CONFIG_CMD_LED /* LED support */ ++#define CONFIG_VIDEO_OMAP3 /* DSS Support */ ++#define CONFIG_CMD_SETEXPR /* Evaluate expressions */ + + #undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ + #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ +@@ -184,45 +205,56 @@ + /* partition */ + + /* Environment information */ +-#define CONFIG_BOOTDELAY 10 ++#define CONFIG_BOOTDELAY 3 + + #define CONFIG_EXTRA_ENV_SETTINGS \ +- "loadaddr=0x82000000\0" \ ++ "loadaddr=0x80200000\0" \ ++ "rdaddr=0x81000000\0" \ + "usbtty=cdc_acm\0" \ + "console=ttyS2,115200n8\0" \ + "mpurate=auto\0" \ + "buddy=none "\ ++ "optargs=\0" \ ++ "camera=lbcm3m1\0" \ + "vram=12M\0" \ +- "dvimode=1024x768MR-16@60\0" \ ++ "dvimode=640x480MR-16@60\0" \ + "defaultdisplay=dvi\0" \ + "mmcdev=0\0" \ + "mmcroot=/dev/mmcblk0p2 rw\0" \ + "mmcrootfstype=ext3 rootwait\0" \ + "nandroot=/dev/mtdblock4 rw\0" \ + "nandrootfstype=jffs2\0" \ ++ "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=0x81000000,64M\0" \ ++ "ramrootfstype=ext2\0" \ + "mmcargs=setenv bootargs console=${console} " \ ++ "${optargs} " \ + "mpurate=${mpurate} " \ + "buddy=${buddy} "\ ++ "camera=${camera} "\ + "vram=${vram} " \ + "omapfb.mode=dvi:${dvimode} " \ + "omapdss.def_disp=${defaultdisplay} " \ + "root=${mmcroot} " \ + "rootfstype=${mmcrootfstype}\0" \ + "nandargs=setenv bootargs console=${console} " \ ++ "${optargs} " \ + "mpurate=${mpurate} " \ + "buddy=${buddy} "\ ++ "camera=${camera} "\ + "vram=${vram} " \ + "omapfb.mode=dvi:${dvimode} " \ + "omapdss.def_disp=${defaultdisplay} " \ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ +- "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ ++ "bootenv=uEnv.txt\0" \ ++ "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ + "importbootenv=echo Importing environment from mmc ...; " \ + "env import -t $loadaddr $filesize\0" \ + "ramargs=setenv bootargs console=${console} " \ + "${optargs} " \ + "mpurate=${mpurate} " \ + "buddy=${buddy} "\ ++ "camera=${camera} "\ + "vram=${vram} " \ + "omapfb.mode=dvi:${dvimode} " \ + "omapdss.def_disp=${defaultdisplay} " \ +@@ -237,11 +269,18 @@ + "run nandargs; " \ + "nand read ${loadaddr} 280000 400000; " \ + "bootm ${loadaddr}\0" \ ++ "ramboot=echo Booting from ramdisk ...; " \ ++ "run ramargs; " \ ++ "bootm ${loadaddr}\0" \ + + #define CONFIG_BOOTCOMMAND \ + "if mmc rescan ${mmcdev}; then " \ ++ "if userbutton; then " \ ++ "setenv bootenv user.txt;" \ ++ "fi;" \ + "echo SD/MMC found on device ${mmcdev};" \ + "if run loadbootenv; then " \ ++ "echo Loaded environment from ${bootenv};" \ + "run importbootenv;" \ + "fi;" \ + "if test -n $uenvcmd; then " \ +@@ -252,7 +291,7 @@ + "run mmcboot;" \ + "fi;" \ + "fi;" \ +- "run nandboot;" \ ++ "run nandboot;" + + #define CONFIG_AUTO_COMPLETE 1 + /* +@@ -262,18 +301,19 @@ + #define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ + #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " + #define CONFIG_SYS_PROMPT "OMAP3 beagleboard.org # " +-#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ ++#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ + /* Print Buffer Size */ + #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ + sizeof(CONFIG_SYS_PROMPT) + 16) +-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ ++#define CONFIG_SYS_MAXARGS 32 /* max number of command args */ + /* Boot Argument Buffer Size */ + #define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE) + +-#define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0) /* memtest */ +- /* works on */ +-#define CONFIG_SYS_MEMTEST_END (OMAP34XX_SDRC_CS0 + \ +- 0x01F00000) /* 31MB */ ++#define CONFIG_SYS_ALT_MEMTEST 1 ++#define CONFIG_SYS_MEMTEST_START (0x82000000) /* memtest */ ++ /* defaults */ ++#define CONFIG_SYS_MEMTEST_END (0x87FFFFFF) /* 128MB */ ++#define CONFIG_SYS_MEMTEST_SCRATCH (0x81000000) /* dummy address */ + + #define CONFIG_SYS_LOAD_ADDR (OMAP34XX_SDRC_CS0) /* default */ + /* load address */ +-- +1.6.6.1 + diff --git a/recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-Overo-change-address-of-expansion-eeprom-to-0x.patch b/recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-Overo-change-address-of-expansion-eeprom-to-0x.patch deleted file mode 100644 index cfff25879b..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-Overo-change-address-of-expansion-eeprom-to-0x.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 90119d705d2c56254d4b27efb8e8c61e62f014c1 Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Fri, 26 Feb 2010 12:42:30 -0800 -Subject: [PATCH 13/50] OMAP3: Overo: change address of expansion eeprom to 0x51 so as to not conflict with EDID address - ---- - board/overo/overo.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/board/overo/overo.c b/board/overo/overo.c -index ec186ec..f96e7ff 100644 ---- a/board/overo/overo.c -+++ b/board/overo/overo.c -@@ -51,7 +51,7 @@ static struct { - #define TWL4030_I2C_BUS 0 - - #define EXPANSION_EEPROM_I2C_BUS 2 --#define EXPANSION_EEPROM_I2C_ADDRESS 0x50 -+#define EXPANSION_EEPROM_I2C_ADDRESS 0x51 - - #define GUMSTIX_VENDORID 0x0200 - --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0014-Corrected-LED-name-match-finding-avoiding-extraneous.patch b/recipes/u-boot/u-boot-git/beagleboard/0014-Corrected-LED-name-match-finding-avoiding-extraneous.patch new file mode 100644 index 0000000000..e01092afe1 --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0014-Corrected-LED-name-match-finding-avoiding-extraneous.patch @@ -0,0 +1,42 @@ +From abc09e8f0b8e02dbfec8bb3c2e024ef9f1bdf4f0 Mon Sep 17 00:00:00 2001 +From: Jason Kridner +Date: Tue, 8 Mar 2011 20:42:01 -0600 +Subject: [PATCH 14/16] Corrected LED name match finding avoiding extraneous Usage printouts + +--- + common/cmd_led.c | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/common/cmd_led.c b/common/cmd_led.c +index 7f02fe6..ca2227f 100644 +--- a/common/cmd_led.c ++++ b/common/cmd_led.c +@@ -83,7 +83,7 @@ int str_onoff (char *var) + + int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) + { +- int state, i; ++ int state, i, match = 0; + + /* Validate arguments */ + if ((argc != 3)) { +@@ -98,6 +98,7 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) + for (i = 0; led_commands[i].string; i++) { + if ((strcmp("all", argv[1]) == 0) || + (strcmp(led_commands[i].string, argv[1]) == 0)) { ++ match = 1; + if (led_commands[i].on) { + if (state) { + led_commands[i].on(); +@@ -111,7 +112,7 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) + } + + /* If we ran out of matches, print Usage */ +- if (!led_commands[i].string && !(strcmp("all", argv[1]) == 0)) { ++ if (!match) { + return cmd_usage(cmdtp); + } + +-- +1.6.6.1 + diff --git a/recipes/u-boot/u-boot-git/beagleboard/0014-OMAP3-board.c-don-t-attempt-to-set-up-second-RAM-ban.patch b/recipes/u-boot/u-boot-git/beagleboard/0014-OMAP3-board.c-don-t-attempt-to-set-up-second-RAM-ban.patch deleted file mode 100644 index a092ca25ec..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0014-OMAP3-board.c-don-t-attempt-to-set-up-second-RAM-ban.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7f50d09f9a00b7f2a392a5b0b9f2f19a96a90c16 Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Tue, 23 Mar 2010 09:04:50 -0700 -Subject: [PATCH 14/50] OMAP3: board.c: don't attempt to set up second RAM bank, assume x-load has already done this - ---- - cpu/arm_cortexa8/omap3/board.c | 19 +++++++++---------- - 1 files changed, 9 insertions(+), 10 deletions(-) - -diff --git a/cpu/arm_cortexa8/omap3/board.c b/cpu/arm_cortexa8/omap3/board.c -index 7b78fa4..0126152 100644 ---- a/cpu/arm_cortexa8/omap3/board.c -+++ b/cpu/arm_cortexa8/omap3/board.c -@@ -232,6 +232,7 @@ void s_init(void) - - per_clocks_enable(); - -+ /* FIXME: u-boot's sdrc setup is broken */ - if (!in_sdram) - sdrc_init(); - } -@@ -281,16 +282,14 @@ int dram_init(void) - { - DECLARE_GLOBAL_DATA_PTR; - unsigned int size0 = 0, size1 = 0; -- -- /* -- * 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 ((sysinfo.mtype == DDR_COMBO) || (sysinfo.mtype == DDR_STACKED)) { -- do_sdrc_init(CS1, NOT_EARLY); -- make_cs1_contiguous(); -- } -+ struct sdrc *sdrc_base = (struct sdrc *)OMAP34XX_SDRC_BASE; -+ struct sdrc_actim *sdrc_actim_base = (struct sdrc_actim *)SDRC_ACTIM_CTRL1_BASE; -+ -+ /* x-load sets up the second bank but */ -+ /* doesn't test to see if it is there */ -+ /* do so now, disable if not present */ -+ if (!mem_ok(CS1)) -+ writel(0, &sdrc_base->cs[1].mcfg); - - size0 = get_sdr_cs_size(CS0); - size1 = get_sdr_cs_size(CS1); --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0015-OMAP3-mem.c-enhance-the-RAM-test.patch b/recipes/u-boot/u-boot-git/beagleboard/0015-OMAP3-mem.c-enhance-the-RAM-test.patch deleted file mode 100644 index 92e2331cb4..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0015-OMAP3-mem.c-enhance-the-RAM-test.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 379ff04432ffdef234c2f85b1801cf7df2d3d5ee Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Tue, 23 Mar 2010 09:06:49 -0700 -Subject: [PATCH 15/50] OMAP3: mem.c: enhance the RAM test - ---- - cpu/arm_cortexa8/omap3/mem.c | 28 +++++++++++++++------------- - 1 files changed, 15 insertions(+), 13 deletions(-) - -diff --git a/cpu/arm_cortexa8/omap3/mem.c b/cpu/arm_cortexa8/omap3/mem.c -index dfb7e4c..b828097 100644 ---- a/cpu/arm_cortexa8/omap3/mem.c -+++ b/cpu/arm_cortexa8/omap3/mem.c -@@ -106,21 +106,23 @@ void make_cs1_contiguous(void) - *******************************************************/ - u32 mem_ok(u32 cs) - { -- u32 val1, val2, addr; -+ u32 i, val1, val2, addr, size; - u32 pattern = 0x12345678; - -- addr = OMAP34XX_SDRC_CS0 + get_sdr_cs_offset(cs); -- -- writel(0x0, addr + 0x400); /* clear pos A */ -- writel(pattern, addr); /* pattern to pos B */ -- writel(0x0, addr + 4); /* remove pattern off the bus */ -- val1 = readl(addr + 0x400); /* get pos A value */ -- val2 = readl(addr); /* get val2 */ -+ size = get_sdr_cs_offset(cs); -+ addr = OMAP34XX_SDRC_CS0 + size; -+ -+ for (i = 0; i < size; i+=1024) { -+ writel(pattern - i, addr + i); -+ } - -- if ((val1 != 0) || (val2 != pattern)) /* see if pos A val changed */ -- return 0; -- else -- return 1; -+ for (i = 0; i < size; i+=1024) { -+ val1 = readl(addr + i); -+ if (val1 != (pattern - i)) { -+ return 0; -+ } -+ } -+ return 1; - } - - /******************************************************** --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0015-omap3_beagle-Switch-default-console-from-ttyS2-to-tt.patch b/recipes/u-boot/u-boot-git/beagleboard/0015-omap3_beagle-Switch-default-console-from-ttyS2-to-tt.patch new file mode 100644 index 0000000000..2db0810b08 --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0015-omap3_beagle-Switch-default-console-from-ttyS2-to-tt.patch @@ -0,0 +1,29 @@ +From 1a88890580917571811950eabd877cccdb643cb1 Mon Sep 17 00:00:00 2001 +From: Alexander Holler +Date: Thu, 17 Feb 2011 22:37:57 +0000 +Subject: [PATCH 15/16] omap3_beagle: Switch default console from ttyS2 to ttyO2 + +Linux kernels >= 2.6.36 are using ttyOn instead ttySn for the +serials on OMAPs. + +Signed-off-by: Alexander Holler +--- + include/configs/omap3_beagle.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h +index 73d4d4e..de572e8 100644 +--- a/include/configs/omap3_beagle.h ++++ b/include/configs/omap3_beagle.h +@@ -211,7 +211,7 @@ + "loadaddr=0x80200000\0" \ + "rdaddr=0x81000000\0" \ + "usbtty=cdc_acm\0" \ +- "console=ttyS2,115200n8\0" \ ++ "console=ttyO2,115200n8\0" \ + "mpurate=auto\0" \ + "buddy=none "\ + "optargs=\0" \ +-- +1.6.6.1 + diff --git a/recipes/u-boot/u-boot-git/beagleboard/0016-BeagleBoard-Load-kernel-via-MMC-ext2-not-fat.patch b/recipes/u-boot/u-boot-git/beagleboard/0016-BeagleBoard-Load-kernel-via-MMC-ext2-not-fat.patch new file mode 100644 index 0000000000..bdcdeb40b8 --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0016-BeagleBoard-Load-kernel-via-MMC-ext2-not-fat.patch @@ -0,0 +1,26 @@ +From 03757f19b4affb531d1606e468e0411acd8d57cb Mon Sep 17 00:00:00 2001 +From: Jason Kridner +Date: Wed, 9 Mar 2011 18:48:19 -0600 +Subject: [PATCH 16/16] BeagleBoard: Load kernel via MMC ext2, not fat + +--- + include/configs/omap3_beagle.h | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h +index de572e8..3a102e5 100644 +--- a/include/configs/omap3_beagle.h ++++ b/include/configs/omap3_beagle.h +@@ -261,7 +261,8 @@ + "root=${ramroot} " \ + "rootfstype=${ramrootfstype}\0" \ + "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ +- "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ ++ "loaduimagefat=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ ++ "loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} /boot/uImage\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "bootm ${loadaddr}\0" \ +-- +1.6.6.1 + diff --git a/recipes/u-boot/u-boot-git/beagleboard/0016-env_nand.c-fail-gracefully-if-no-nand-is-present.patch b/recipes/u-boot/u-boot-git/beagleboard/0016-env_nand.c-fail-gracefully-if-no-nand-is-present.patch deleted file mode 100644 index d0209ae0d0..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0016-env_nand.c-fail-gracefully-if-no-nand-is-present.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a9b4ba0446bd55d98243de2f3e3a747f8842811f Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Tue, 23 Mar 2010 09:12:16 -0700 -Subject: [PATCH 16/50] env_nand.c: fail gracefully if no nand is present - ---- - common/env_nand.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/common/env_nand.c b/common/env_nand.c -index a15a950..325f112 100644 ---- a/common/env_nand.c -+++ b/common/env_nand.c -@@ -268,6 +268,10 @@ int readenv (size_t offset, u_char * buf) - - u_char *char_ptr; - -+ /* fail if no nand detected */ -+ if (nand_info[0].type == 0) -+ return 1; -+ - blocksize = nand_info[0].erasesize; - len = min(blocksize, CONFIG_ENV_SIZE); - --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0017-OMAP3-add-definitions-to-support-sysinfo-cpu-and-cpu.patch b/recipes/u-boot/u-boot-git/beagleboard/0017-OMAP3-add-definitions-to-support-sysinfo-cpu-and-cpu.patch deleted file mode 100644 index 917eca3faf..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0017-OMAP3-add-definitions-to-support-sysinfo-cpu-and-cpu.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 4c1682016b61262456acb9386ef69d0da4243db9 Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Tue, 23 Mar 2010 09:15:29 -0700 -Subject: [PATCH 17/50] OMAP3: add definitions to support sysinfo cpu and cpu family detection - ---- - include/asm-arm/arch-omap3/cpu.h | 6 ------ - include/asm-arm/arch-omap3/omap3.h | 29 +++++++++++++++++++++++++++++ - 2 files changed, 29 insertions(+), 6 deletions(-) - -diff --git a/include/asm-arm/arch-omap3/cpu.h b/include/asm-arm/arch-omap3/cpu.h -index f769571..d9eec7e 100644 ---- a/include/asm-arm/arch-omap3/cpu.h -+++ b/include/asm-arm/arch-omap3/cpu.h -@@ -60,12 +60,6 @@ struct ctrl { - #endif /* __ASSEMBLY__ */ - #endif /* __KERNEL_STRICT_NAMES */ - --/* cpu type */ --#define OMAP3503 0x5c00 --#define OMAP3515 0x1c00 --#define OMAP3525 0x4c00 --#define OMAP3530 0x0c00 -- - #ifndef __KERNEL_STRICT_NAMES - #ifndef __ASSEMBLY__ - struct ctrl_id { -diff --git a/include/asm-arm/arch-omap3/omap3.h b/include/asm-arm/arch-omap3/omap3.h -index 1349b8b..3957c79 100644 ---- a/include/asm-arm/arch-omap3/omap3.h -+++ b/include/asm-arm/arch-omap3/omap3.h -@@ -184,4 +184,33 @@ struct gpio { - #define WIDTH_8BIT 0x0000 - #define WIDTH_16BIT 0x1000 /* bit pos for 16 bit in gpmc */ - -+/* -+ * Hawkeye values -+ */ -+#define HAWKEYE_OMAP34XX 0xb7ae -+#define HAWKEYE_AM35XX 0xb868 -+#define HAWKEYE_OMAP36XX 0xb891 -+ -+#define HAWKEYE_SHIFT 12 -+ -+/* -+ * Define CPU families -+ */ -+#define CPU_OMAP34XX 0x3400 /* OMAP34xx/OMAP35 devices */ -+#define CPU_AM35XX 0x3500 /* AM35xx devices */ -+#define CPU_OMAP36XX 0x3600 /* OMAP36xx devices */ -+ -+/* -+ * Control status register values corresponding to cpu variants -+ */ -+#define OMAP3503 0x5c00 -+#define OMAP3515 0x1c00 -+#define OMAP3525 0x4c00 -+#define OMAP3530 0x0c00 -+ -+#define AM3505 0x5c00 -+#define AM3517 0x1c00 -+ -+#define OMAP3730 0x0c00 -+ - #endif --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0018-OMAP3-sys_info-update-cpu-detection-for-36XX-37XX.patch b/recipes/u-boot/u-boot-git/beagleboard/0018-OMAP3-sys_info-update-cpu-detection-for-36XX-37XX.patch deleted file mode 100644 index a3bfb8fd25..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0018-OMAP3-sys_info-update-cpu-detection-for-36XX-37XX.patch +++ /dev/null @@ -1,196 +0,0 @@ -From f8a42576fac8349ae8ff9d6673b229f6b3103798 Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Tue, 23 Mar 2010 09:17:59 -0700 -Subject: [PATCH 18/50] OMAP3 sys_info: update cpu detection for 36XX/37XX - ---- - cpu/arm_cortexa8/omap3/sys_info.c | 137 ++++++++++++++++++++++++++++--------- - 1 files changed, 105 insertions(+), 32 deletions(-) - -diff --git a/cpu/arm_cortexa8/omap3/sys_info.c b/cpu/arm_cortexa8/omap3/sys_info.c -index e227f67..e32a846 100644 ---- a/cpu/arm_cortexa8/omap3/sys_info.c -+++ b/cpu/arm_cortexa8/omap3/sys_info.c -@@ -79,32 +79,72 @@ u32 get_cpu_type(void) - } - - /****************************************** -- * get_cpu_rev(void) - extract version info -+ * get_cpu_id(void) - extract cpu id -+ * returns 0 for ES1.0, cpuid otherwise - ******************************************/ --u32 get_cpu_rev(void) -+u32 get_cpu_id(void) - { -- u32 cpuid = 0; - struct ctrl_id *id_base; -+ u32 cpuid = 0; - - /* - * On ES1.0 the IDCODE register is not exposed on L4 - * so using CPU ID to differentiate between ES1.0 and > ES1.0. - */ - __asm__ __volatile__("mrc p15, 0, %0, c0, c0, 0":"=r"(cpuid)); -- if ((cpuid & 0xf) == 0x0) -- return CPU_3XX_ES10; -- else { -+ if ((cpuid & 0xf) == 0x0) { -+ return 0; -+ } else { - /* Decode the IDs on > ES1.0 */ - id_base = (struct ctrl_id *) OMAP34XX_ID_L4_IO_BASE; - -- cpuid = (readl(&id_base->idcode) >> CPU_3XX_ID_SHIFT) & 0xf; -+ cpuid = readl(&id_base->idcode); -+ } - -- /* Some early ES2.0 seem to report ID 0, fix this */ -- if(cpuid == 0) -- cpuid = CPU_3XX_ES20; -+ return cpuid; -+} - -- return cpuid; -+/****************************************** -+ * get_cpu_family(void) - extract cpu info -+ ******************************************/ -+u32 get_cpu_family(void) -+{ -+ u16 hawkeye; -+ u32 cpu_family; -+ u32 cpuid = get_cpu_id(); -+ -+ if (cpuid == 0) -+ return CPU_OMAP34XX; -+ -+ hawkeye = (cpuid >> HAWKEYE_SHIFT) & 0xffff; -+ switch(hawkeye) { -+ case HAWKEYE_OMAP34XX: -+ cpu_family = CPU_OMAP34XX; -+ break; -+ case HAWKEYE_AM35XX: -+ cpu_family = CPU_AM35XX; -+ break; -+ case HAWKEYE_OMAP36XX: -+ cpu_family = CPU_OMAP36XX; -+ break; -+ default: -+ cpu_family = CPU_OMAP34XX; - } -+ -+ return cpu_family; -+} -+ -+/****************************************** -+ * get_cpu_rev(void) - extract version info -+ ******************************************/ -+u32 get_cpu_rev(void) -+{ -+ u32 cpuid = get_cpu_id(); -+ -+ if (cpuid == 0) -+ return CPU_3XX_ES10; -+ else -+ return (cpuid >> CPU_3XX_ID_SHIFT) & 0xf; - } - - /***************************************************************** -@@ -267,24 +307,57 @@ u32 get_device_type(void) - */ - int print_cpuinfo (void) - { -- char *cpu_s, *sec_s; -- -- switch (get_cpu_type()) { -- case OMAP3503: -- cpu_s = "3503"; -- break; -- case OMAP3515: -- cpu_s = "3515"; -+ char *cpu_family_s, *cpu_s, *sec_s; -+ -+ switch(get_cpu_family()) { -+ case CPU_OMAP34XX: -+ cpu_family_s = "OMAP"; -+ switch (get_cpu_type()) { -+ case OMAP3503: -+ cpu_s = "3503"; -+ break; -+ case OMAP3515: -+ cpu_s = "3515"; -+ break; -+ case OMAP3525: -+ cpu_s = "3525"; -+ break; -+ case OMAP3530: -+ cpu_s = "3530"; -+ break; -+ default: -+ cpu_s = "35XX"; -+ break; -+ } - break; -- case OMAP3525: -- cpu_s = "3525"; -+ case CPU_AM35XX: -+ cpu_family_s = "AM"; -+ switch (get_cpu_type()) { -+ case AM3505: -+ cpu_s = "3505"; -+ break; -+ case AM3517: -+ cpu_s = "3517"; -+ break; -+ default: -+ cpu_s = "35XX"; -+ break; -+ } - break; -- case OMAP3530: -- cpu_s = "3530"; -+ case CPU_OMAP36XX: -+ cpu_family_s = "OMAP"; -+ switch (get_cpu_type()) { -+ case OMAP3730: -+ cpu_s = "3630/3730"; -+ break; -+ default: -+ cpu_s = "36XX/37XX"; -+ break; -+ } - break; - default: -+ cpu_family_s = "OMAP"; - cpu_s = "35XX"; -- break; - } - - switch (get_device_type()) { -@@ -304,16 +377,16 @@ int print_cpuinfo (void) - sec_s = "?"; - } - -- printf("OMAP%s-%s ES%s, CPU-OPP2, L3-165MHz, ", -- cpu_s, sec_s, rev_s[get_cpu_rev()]); -+ printf("%s%s-%s ES%s, CPU-OPP2, L3-165MHz, ", -+ cpu_family_s, cpu_s, sec_s, rev_s[get_cpu_rev()]); - -- printf("Max clock-"); -- if ((get_cpu_rev() >= CPU_3XX_ES31) && (get_sku_id() == SKUID_CLK_720MHZ)) -- printf("720Mhz\n"); -- else printf("600Mhz\n"); -+ if (get_cpu_family() == CPU_OMAP34XX) -+ if ((get_cpu_rev() >= CPU_3XX_ES31) && -+ (get_sku_id() == SKUID_CLK_720MHZ)) -+ printf("Max clock-720Mhz\n"); -+ else printf("Max clock-600Mhz\n"); -+ else printf("\n"); - -- -- - return 0; - } - #endif /* CONFIG_DISPLAY_CPUINFO */ --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch b/recipes/u-boot/u-boot-git/beagleboard/0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch deleted file mode 100644 index 03d0674b54..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch +++ /dev/null @@ -1,826 +0,0 @@ -From 276236da04d67dfad61ccab5d4700613ae8527f9 Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Tue, 23 Mar 2010 09:20:56 -0700 -Subject: [PATCH 19/50] OMAP3: clocks: update clock setup for 36XX/37XX - ---- - cpu/arm_cortexa8/omap3/clock.c | 559 +++++++++++++++++++++-------- - cpu/arm_cortexa8/omap3/lowlevel_init.S | 69 ++++ - include/asm-arm/arch-omap3/clocks.h | 17 + - include/asm-arm/arch-omap3/clocks_omap3.h | 27 ++ - 4 files changed, 525 insertions(+), 147 deletions(-) - -diff --git a/cpu/arm_cortexa8/omap3/clock.c b/cpu/arm_cortexa8/omap3/clock.c -index 6330c9e..538a183 100644 ---- a/cpu/arm_cortexa8/omap3/clock.c -+++ b/cpu/arm_cortexa8/omap3/clock.c -@@ -47,17 +47,12 @@ u32 get_osc_clk_speed(void) - struct s32ktimer *s32k_base = (struct s32ktimer *)SYNC_32KTIMER_BASE; - - val = readl(&prm_base->clksrc_ctrl); -- - if (val & SYSCLKDIV_2) - cdiv = 2; -- else if (val & SYSCLKDIV_1) -- cdiv = 1; - else -- /* -- * Should never reach here! (Assume divider as 1) -- */ - cdiv = 1; - -+ - /* enable timer2 */ - val = readl(&prcm_base->clksel_wkup) | CLKSEL_GPT1; - -@@ -67,7 +62,6 @@ u32 get_osc_clk_speed(void) - /* Enable I and F Clocks for GPT1 */ - val = readl(&prcm_base->iclken_wkup) | EN_GPT1 | EN_32KSYNC; - writel(val, &prcm_base->iclken_wkup); -- - val = readl(&prcm_base->fclken_wkup) | EN_GPT1; - writel(val, &prcm_base->fclken_wkup); - -@@ -87,13 +81,10 @@ u32 get_osc_clk_speed(void) - - /* wait for 40 cycles */ - while (readl(&s32k_base->s32k_cr) < (start + 20)) ; -+ - cend = readl(&gpt1_base->tcrr); /* get end sys_clk count */ - cdiff = cend - cstart; /* get elapsed ticks */ -- -- if (cdiv == 2) -- { -- cdiff *= 2; -- } -+ cdiff *= cdiv; - - /* based on number of ticks assign speed */ - if (cdiff > 19000) -@@ -135,65 +126,25 @@ void get_sys_clkin_sel(u32 osc_clk, u32 *sys_clkin_sel) - } - } - -+/* -+ * OMAP3530 specific functions -+ */ -+ - /****************************************************************************** -- * prcm_init() - inits clocks for PRCM as defined in clocks.h -- * called from SRAM, or Flash (using temp SRAM stack). -+ * Initialize CORE DPLL for OMAP34x/35x - *****************************************************************************/ --void prcm_init(void) -+static void dpll3_init_34xx(u32 sil_index, u32 clk_index) - { -+ struct prcm *prcm_base = (struct prcm *)PRCM_BASE; -+ dpll_param *ptr = (dpll_param *) get_core_dpll_param(); - 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 = 0; -- struct prm *prm_base = (struct prm *)PRM_BASE; -- struct prcm *prcm_base = (struct prcm *)PRCM_BASE; -- dpll_param *dpll_param_p; -- -- f_lock_pll = (void *) ((u32) &_end_vect - (u32) &_start + -- SRAM_VECT_CODE); - - xip_safe = is_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); -+ /* Moving to the right sysclk and ES rev base */ -+ ptr = ptr + (3 * clk_index) + sil_index; - -- /* set input crystal speed */ -- sr32(&prm_base->clksel, 0, 3, sys_clkin_sel); -- -- /* If the input clock is greater than 19.2M always divide/2 */ -- if (sys_clkin_sel > 2) { -- /* input clock divider */ -- sr32(&prm_base->clksrc_ctrl, 6, 2, 2); -- clk_index = sys_clkin_sel / 2; -- } else { -- /* input clock divider */ -- sr32(&prm_base->clksrc_ctrl, 6, 2, 1); -- 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. -- */ -- if (get_cpu_rev()) -- sil_index = 1; -- -- /* Unlock MPU DPLL (slows things down, and needed later) */ -- sr32(&prcm_base->clken_pll_mpu, 0, 3, PLL_LOW_POWER_BYPASS); -- wait_on_value(ST_MPU_CLK, 0, &prcm_base->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 -@@ -208,34 +159,38 @@ void prcm_init(void) - * work. write another value and then default value. - */ - -- /* m3x2 */ -- sr32(&prcm_base->clksel1_emu, 16, 5, CORE_M3X2 + 1); -- /* m3x2 */ -+ /* CM_CLKSEL1_EMU[DIV_DPLL3] */ -+ sr32(&prcm_base->clksel1_emu, 16, 5, (CORE_M3X2 + 1)) ; - sr32(&prcm_base->clksel1_emu, 16, 5, CORE_M3X2); -- /* Set M2 */ -- sr32(&prcm_base->clksel1_pll, 27, 2, dpll_param_p->m2); -- /* Set M */ -- sr32(&prcm_base->clksel1_pll, 16, 11, dpll_param_p->m); -- /* Set N */ -- sr32(&prcm_base->clksel1_pll, 8, 7, dpll_param_p->n); -- /* 96M Src */ -+ -+ /* M2 (CORE_DPLL_CLKOUT_DIV): CM_CLKSEL1_PLL[27:31] */ -+ sr32(&prcm_base->clksel1_pll, 27, 5, ptr->m2); -+ -+ /* M (CORE_DPLL_MULT): CM_CLKSEL1_PLL[16:26] */ -+ sr32(&prcm_base->clksel1_pll, 16, 11, ptr->m); -+ -+ /* N (CORE_DPLL_DIV): CM_CLKSEL1_PLL[8:14] */ -+ sr32(&prcm_base->clksel1_pll, 8, 7, ptr->n); -+ -+ /* Source is the CM_96M_FCLK: CM_CLKSEL1_PLL[6] */ - sr32(&prcm_base->clksel1_pll, 6, 1, 0); -- /* ssi */ -+ -+ /* SSI */ - sr32(&prcm_base->clksel_core, 8, 4, CORE_SSI_DIV); -- /* fsusb */ -+ /* FSUSB */ - sr32(&prcm_base->clksel_core, 4, 2, CORE_FUSB_DIV); -- /* l4 */ -+ /* L4 */ - sr32(&prcm_base->clksel_core, 2, 2, CORE_L4_DIV); -- /* l3 */ -+ /* L3 */ - sr32(&prcm_base->clksel_core, 0, 2, CORE_L3_DIV); -- /* gfx */ -- sr32(&prcm_base->clksel_gfx, 0, 3, GFX_DIV); -- /* reset mgr */ -+ /* GFX */ -+ sr32(&prcm_base->clksel_gfx, 0, 3, GFX_DIV); -+ /* RESET MGR */ - sr32(&prcm_base->clksel_wkup, 1, 2, WKUP_RSM); -- /* FREQSEL */ -- sr32(&prcm_base->clken_pll, 4, 4, dpll_param_p->fsel); -- /* lock mode */ -- sr32(&prcm_base->clken_pll, 0, 3, PLL_LOCK); -+ /* FREQSEL (CORE_DPLL_FREQSEL): CM_CLKEN_PLL[4:7] */ -+ sr32(&prcm_base->clken_pll, 4, 4, ptr->fsel); -+ /* LOCK MODE */ -+ sr32(&prcm_base->clken_pll, 0, 3, PLL_LOCK); - - wait_on_value(ST_CORE_CLK, 1, &prcm_base->idlest_ckgen, - LDELAY); -@@ -244,102 +199,411 @@ void prcm_init(void) - * if running from flash, jump to small relocated code - * area in SRAM. - */ -+ f_lock_pll = (void *) ((u32) &_end_vect - (u32) &_start + -+ SRAM_VECT_CODE); -+ - p0 = readl(&prcm_base->clken_pll); - sr32(&p0, 0, 3, PLL_FAST_RELOCK_BYPASS); -- sr32(&p0, 4, 4, dpll_param_p->fsel); /* FREQSEL */ -+ /* FREQSEL (CORE_DPLL_FREQSEL): CM_CLKEN_PLL[4:7] */ -+ sr32(&p0, 4, 4, ptr->fsel); - - p1 = readl(&prcm_base->clksel1_pll); -- sr32(&p1, 27, 2, dpll_param_p->m2); /* Set M2 */ -- sr32(&p1, 16, 11, dpll_param_p->m); /* Set M */ -- sr32(&p1, 8, 7, dpll_param_p->n); /* Set N */ -- sr32(&p1, 6, 1, 0); /* set source for 96M */ -+ /* M2 (CORE_DPLL_CLKOUT_DIV): CM_CLKSEL1_PLL[27:31] */ -+ sr32(&p1, 27, 5, ptr->m2); -+ /* M (CORE_DPLL_MULT): CM_CLKSEL1_PLL[16:26] */ -+ sr32(&p1, 16, 11, ptr->m); -+ /* N (CORE_DPLL_DIV): CM_CLKSEL1_PLL[8:14] */ -+ sr32(&p1, 8, 7, ptr->n); -+ /* Source is the CM_96M_FCLK: CM_CLKSEL1_PLL[6] */ -+ sr32(&p1, 6, 1, 0); - - p2 = readl(&prcm_base->clksel_core); -- sr32(&p2, 8, 4, CORE_SSI_DIV); /* ssi */ -- sr32(&p2, 4, 2, CORE_FUSB_DIV); /* fsusb */ -- sr32(&p2, 2, 2, CORE_L4_DIV); /* l4 */ -- sr32(&p2, 0, 2, CORE_L3_DIV); /* l3 */ -+ /* SSI */ -+ sr32(&p2, 8, 4, CORE_SSI_DIV); -+ /* FSUSB */ -+ sr32(&p2, 4, 2, CORE_FUSB_DIV); -+ /* L4 */ -+ sr32(&p2, 2, 2, CORE_L4_DIV); -+ /* L3 */ -+ sr32(&p2, 0, 2, CORE_L3_DIV); - - p3 = (u32)&prcm_base->idlest_ckgen; - - (*f_lock_pll) (p0, p1, p2, p3); - } -+} - -- /* PER DPLL */ -- sr32(&prcm_base->clken_pll, 16, 3, PLL_STOP); -- wait_on_value(ST_PERIPH_CLK, 0, &prcm_base->idlest_ckgen, LDELAY); -- -- /* Getting the base address to PER DPLL param table */ -- -- /* Set N */ -- dpll_param_p = (dpll_param *) get_per_dpll_param(); -+/****************************************************************************** -+ * Initialize PER DPLL for OMAP34x/35x -+ *****************************************************************************/ -+static void dpll4_init_34xx(u32 sil_index, u32 clk_index) -+{ -+ struct prcm *prcm_base = (struct prcm *)PRCM_BASE; -+ dpll_param *ptr = (dpll_param *) get_per_dpll_param(); - - /* Moving it to the right sysclk base */ -- dpll_param_p = dpll_param_p + clk_index; -+ ptr = ptr + clk_index; -+ -+ /* EN_PERIPH_DPLL: CM_CLKEN_PLL[16:18] */ -+ sr32(&prcm_base->clken_pll, 16, 3, PLL_STOP); -+ wait_on_value(ST_PERIPH_CLK, 0, &prcm_base->idlest_ckgen, LDELAY); - - /* - * Errata 1.50 Workaround for OMAP3 ES1.0 only - * If using default divisors, write default divisor + 1 - * and then the actual divisor value - */ -- sr32(&prcm_base->clksel1_emu, 24, 5, PER_M6X2 + 1); /* set M6 */ -- sr32(&prcm_base->clksel1_emu, 24, 5, PER_M6X2); /* set M6 */ -- sr32(&prcm_base->clksel_cam, 0, 5, PER_M5X2 + 1); /* set M5 */ -- sr32(&prcm_base->clksel_cam, 0, 5, PER_M5X2); /* set M5 */ -- sr32(&prcm_base->clksel_dss, 0, 5, PER_M4X2 + 1); /* set M4 */ -- sr32(&prcm_base->clksel_dss, 0, 5, PER_M4X2); /* set M4 */ -- sr32(&prcm_base->clksel_dss, 8, 5, PER_M3X2 + 1); /* set M3 */ -- sr32(&prcm_base->clksel_dss, 8, 5, PER_M3X2); /* set M3 */ -- sr32(&prcm_base->clksel3_pll, 0, 5, dpll_param_p->m2 + 1); /* set M2 */ -- sr32(&prcm_base->clksel3_pll, 0, 5, dpll_param_p->m2); /* set M2 */ -+ /* M6 */ -+ sr32(&prcm_base->clksel1_emu, 24, 5, (PER_M6X2 + 1)); -+ sr32(&prcm_base->clksel1_emu, 24, 5, PER_M6X2); -+ /* M5 */ -+ sr32(&prcm_base->clksel_cam, 0, 5, (PER_M5X2 + 1)); -+ sr32(&prcm_base->clksel_cam, 0, 5, PER_M5X2); -+ /* M4 */ -+ sr32(&prcm_base->clksel_dss, 0, 5, (PER_M4X2 + 1)); -+ sr32(&prcm_base->clksel_dss, 0, 5, PER_M4X2); -+ /* M3 */ -+ sr32(&prcm_base->clksel_dss, 8, 5, (PER_M3X2 + 1)); -+ sr32(&prcm_base->clksel_dss, 8, 5, PER_M3X2); -+ /* M2 (DIV_96M): CM_CLKSEL3_PLL[0:4] */ -+ sr32(&prcm_base->clksel3_pll, 0, 5, (ptr->m2 + 1)); -+ sr32(&prcm_base->clksel3_pll, 0, 5, ptr->m2); - /* Workaround end */ - -- sr32(&prcm_base->clksel2_pll, 8, 11, dpll_param_p->m); /* set m */ -- sr32(&prcm_base->clksel2_pll, 0, 7, dpll_param_p->n); /* set n */ -- sr32(&prcm_base->clken_pll, 20, 4, dpll_param_p->fsel); /* FREQSEL */ -- sr32(&prcm_base->clken_pll, 16, 3, PLL_LOCK); /* lock mode */ -+ /* M (PERIPH_DPLL_MULT): CM_CLKSEL2_PLL[8:18] */ -+ sr32(&prcm_base->clksel2_pll, 8, 11, ptr->m); -+ -+ /* N (PERIPH_DPLL_DIV): CM_CLKSEL2_PLL[0:6] */ -+ sr32(&prcm_base->clksel2_pll, 0, 7, ptr->n); -+ -+ /* FREQSEL (PERIPH_DPLL_FREQSEL): CM_CLKEN_PLL[20:23] */ -+ sr32(&prcm_base->clken_pll, 20, 4, ptr->fsel); -+ -+ /* LOCK MODE (EN_PERIPH_DPLL): CM_CLKEN_PLL[16:18] */ -+ sr32(&prcm_base->clken_pll, 16, 3, PLL_LOCK); - wait_on_value(ST_PERIPH_CLK, 2, &prcm_base->idlest_ckgen, LDELAY); -+} - -- /* Getting the base address to MPU DPLL param table */ -- dpll_param_p = (dpll_param *) get_mpu_dpll_param(); -+static void mpu_init_34xx(u32 sil_index, u32 clk_index) -+{ -+ struct prcm *prcm_base = (struct prcm *)PRCM_BASE; -+ dpll_param *ptr = (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; -+ /* Moving to the right sysclk and ES rev base */ -+ ptr = ptr + (3 * clk_index) + sil_index; - - /* MPU DPLL (unlocked already) */ - -- /* Set M2 */ -- sr32(&prcm_base->clksel2_pll_mpu, 0, 5, dpll_param_p->m2); -- /* Set M */ -- sr32(&prcm_base->clksel1_pll_mpu, 8, 11, dpll_param_p->m); -- /* Set N */ -- sr32(&prcm_base->clksel1_pll_mpu, 0, 7, dpll_param_p->n); -- /* FREQSEL */ -- sr32(&prcm_base->clken_pll_mpu, 4, 4, dpll_param_p->fsel); -- /* lock mode */ -- sr32(&prcm_base->clken_pll_mpu, 0, 3, PLL_LOCK); -- wait_on_value(ST_MPU_CLK, 1, &prcm_base->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) */ -+ /* M2 (MPU_DPLL_CLKOUT_DIV) : CM_CLKSEL2_PLL_MPU[0:4] */ -+ sr32(&prcm_base->clksel2_pll_mpu, 0, 5, ptr->m2); -+ -+ /* M (MPU_DPLL_MULT) : CM_CLKSEL2_PLL_MPU[8:18] */ -+ sr32(&prcm_base->clksel1_pll_mpu, 8, 11, ptr->m); -+ -+ /* N (MPU_DPLL_DIV) : CM_CLKSEL2_PLL_MPU[0:6] */ -+ sr32(&prcm_base->clksel1_pll_mpu, 0, 7, ptr->n); -+ -+ /* FREQSEL (MPU_DPLL_FREQSEL) : CM_CLKEN_PLL_MPU[4:7] */ -+ sr32(&prcm_base->clken_pll_mpu, 4, 4, ptr->fsel); -+} -+ -+static void iva_init_34xx(u32 sil_index, u32 clk_index) -+{ -+ struct prcm *prcm_base = (struct prcm *)PRCM_BASE; -+ dpll_param *ptr = (dpll_param *) get_iva_dpll_param(); -+ -+ /* Moving to the right sysclk and ES rev base */ -+ ptr = ptr + (3 * clk_index) + sil_index; -+ -+ /* IVA DPLL */ -+ /* EN_IVA2_DPLL : CM_CLKEN_PLL_IVA2[0:2] */ - sr32(&prcm_base->clken_pll_iva2, 0, 3, PLL_STOP); - wait_on_value(ST_IVA2_CLK, 0, &prcm_base->idlest_pll_iva2, LDELAY); -- /* set M2 */ -- sr32(&prcm_base->clksel2_pll_iva2, 0, 5, dpll_param_p->m2); -- /* set M */ -- sr32(&prcm_base->clksel1_pll_iva2, 8, 11, dpll_param_p->m); -- /* set N */ -- sr32(&prcm_base->clksel1_pll_iva2, 0, 7, dpll_param_p->n); -- /* FREQSEL */ -- sr32(&prcm_base->clken_pll_iva2, 4, 4, dpll_param_p->fsel); -- /* lock mode */ -+ -+ /* M2 (IVA2_DPLL_CLKOUT_DIV) : CM_CLKSEL2_PLL_IVA2[0:4] */ -+ sr32(&prcm_base->clksel2_pll_iva2, 0, 5, ptr->m2); -+ -+ /* M (IVA2_DPLL_MULT) : CM_CLKSEL1_PLL_IVA2[8:18] */ -+ sr32(&prcm_base->clksel1_pll_iva2, 8, 11, ptr->m); -+ -+ /* N (IVA2_DPLL_DIV) : CM_CLKSEL1_PLL_IVA2[0:6] */ -+ sr32(&prcm_base->clksel1_pll_iva2, 0, 7, ptr->n); -+ -+ /* FREQSEL (IVA2_DPLL_FREQSEL) : CM_CLKEN_PLL_IVA2[4:7] */ -+ sr32(&prcm_base->clken_pll_iva2, 4, 4, ptr->fsel); -+ -+ /* LOCK MODE (EN_IVA2_DPLL) : CM_CLKEN_PLL_IVA2[0:2] */ - sr32(&prcm_base->clken_pll_iva2, 0, 3, PLL_LOCK); -+ - wait_on_value(ST_IVA2_CLK, 1, &prcm_base->idlest_pll_iva2, LDELAY); -+} -+ -+/* -+ * OMAP3630 specific functions -+ */ -+ -+/****************************************************************************** -+ * Initialize PER DPLL for OMAP36x/37x -+ *****************************************************************************/ -+static void dpll3_init_36xx(u32 sil_index, u32 clk_index) -+{ -+ struct prcm *prcm_base = (struct prcm *)PRCM_BASE; -+ dpll_param *ptr = (dpll_param *) get_36x_core_dpll_param(); -+ void (*f_lock_pll) (u32, u32, u32, u32); -+ int xip_safe, p0, p1, p2, p3; -+ -+ xip_safe = is_running_in_sram(); -+ -+ /* Moving it to the right sysclk base */ -+ ptr += clk_index; -+ -+ if (xip_safe) { -+ /* CORE DPLL */ -+ -+ /* Select relock bypass: CM_CLKEN_PLL[0:2] */ -+ sr32(&prcm_base->clken_pll, 0, 3, PLL_FAST_RELOCK_BYPASS); -+ wait_on_value(ST_CORE_CLK, 0, &prcm_base->idlest_ckgen, -+ LDELAY); -+ -+ /* CM_CLKSEL1_EMU[DIV_DPLL3] */ -+ sr32(&prcm_base->clksel1_emu, 16, 5, CORE_M3X2); -+ -+ /* M2 (CORE_DPLL_CLKOUT_DIV): CM_CLKSEL1_PLL[27:31] */ -+ sr32(&prcm_base->clksel1_pll, 27, 5, ptr->m2); -+ -+ /* M (CORE_DPLL_MULT): CM_CLKSEL1_PLL[16:26] */ -+ sr32(&prcm_base->clksel1_pll, 16, 11, ptr->m); -+ -+ /* N (CORE_DPLL_DIV): CM_CLKSEL1_PLL[8:14] */ -+ sr32(&prcm_base->clksel1_pll, 8, 7, ptr->n); -+ -+ /* Source is the CM_96M_FCLK: CM_CLKSEL1_PLL[6] */ -+ sr32(&prcm_base->clksel1_pll, 6, 1, 0); -+ -+ /* SSI */ -+ sr32(&prcm_base->clksel_core, 8, 4, CORE_SSI_DIV); -+ /* FSUSB */ -+ sr32(&prcm_base->clksel_core, 4, 2, CORE_FUSB_DIV); -+ /* L4 */ -+ sr32(&prcm_base->clksel_core, 2, 2, CORE_L4_DIV); -+ /* L3 */ -+ sr32(&prcm_base->clksel_core, 0, 2, CORE_L3_DIV); -+ /* GFX */ -+ sr32(&prcm_base->clksel_gfx, 0, 3, GFX_DIV); -+ /* RESET MGR */ -+ sr32(&prcm_base->clksel_wkup, 1, 2, WKUP_RSM); -+ /* FREQSEL (CORE_DPLL_FREQSEL): CM_CLKEN_PLL[4:7] */ -+ sr32(&prcm_base->clken_pll, 4, 4, ptr->fsel); -+ /* LOCK MODE */ -+ sr32(&prcm_base->clken_pll, 0, 3, PLL_LOCK); -+ -+ wait_on_value(ST_CORE_CLK, 1, &prcm_base->idlest_ckgen, -+ LDELAY); -+ } else if (is_running_in_flash()) { -+ /* -+ * if running from flash, jump to small relocated code -+ * area in SRAM. -+ */ -+ f_lock_pll = (void *) ((u32) &_end_vect - (u32) &_start + -+ SRAM_VECT_CODE); -+ -+ p0 = readl(&prcm_base->clken_pll); -+ sr32(&p0, 0, 3, PLL_FAST_RELOCK_BYPASS); -+ /* FREQSEL (CORE_DPLL_FREQSEL): CM_CLKEN_PLL[4:7] */ -+ sr32(&p0, 4, 4, ptr->fsel); -+ -+ p1 = readl(&prcm_base->clksel1_pll); -+ /* M2 (CORE_DPLL_CLKOUT_DIV): CM_CLKSEL1_PLL[27:31] */ -+ sr32(&p1, 27, 5, ptr->m2); -+ /* M (CORE_DPLL_MULT): CM_CLKSEL1_PLL[16:26] */ -+ sr32(&p1, 16, 11, ptr->m); -+ /* N (CORE_DPLL_DIV): CM_CLKSEL1_PLL[8:14] */ -+ sr32(&p1, 8, 7, ptr->n); -+ /* Source is the CM_96M_FCLK: CM_CLKSEL1_PLL[6] */ -+ sr32(&p1, 6, 1, 0); -+ -+ p2 = readl(&prcm_base->clksel_core); -+ /* SSI */ -+ sr32(&p2, 8, 4, CORE_SSI_DIV); -+ /* FSUSB */ -+ sr32(&p2, 4, 2, CORE_FUSB_DIV); -+ /* L4 */ -+ sr32(&p2, 2, 2, CORE_L4_DIV); -+ /* L3 */ -+ sr32(&p2, 0, 2, CORE_L3_DIV); -+ -+ p3 = (u32)&prcm_base->idlest_ckgen; -+ -+ (*f_lock_pll) (p0, p1, p2, p3); -+ } -+} -+ -+static void dpll4_init_36xx(u32 sil_index, u32 clk_index) -+{ -+ struct prcm *prcm_base = (struct prcm *)PRCM_BASE; -+ struct dpll_per_36x_param *ptr; -+ -+ ptr = (struct dpll_per_36x_param *)get_36x_per_dpll_param(); -+ -+ /* Moving it to the right sysclk base */ -+ ptr += clk_index; -+ -+ /* EN_PERIPH_DPLL: CM_CLKEN_PLL[16:18] */ -+ sr32(&prcm_base->clken_pll, 16, 3, PLL_STOP); -+ wait_on_value(ST_PERIPH_CLK, 0, &prcm_base->idlest_ckgen, LDELAY); -+ -+ /* M6 (DIV_DPLL4): CM_CLKSEL1_EMU[24:29] */ -+ sr32(&prcm_base->clksel1_emu, 24, 6, ptr->m6); -+ -+ /* M5 (CLKSEL_CAM): CM_CLKSEL1_EMU[0:5] */ -+ sr32(&prcm_base->clksel_cam, 0, 6, ptr->m5); -+ -+ /* M4 (CLKSEL_DSS1): CM_CLKSEL_DSS[0:5] */ -+ sr32(&prcm_base->clksel_dss, 0, 6, ptr->m4); -+ -+ /* M3 (CLKSEL_DSS1): CM_CLKSEL_DSS[8:13] */ -+ sr32(&prcm_base->clksel_dss, 8, 6, ptr->m3); -+ -+ /* M2 (DIV_96M): CM_CLKSEL3_PLL[0:4] */ -+ sr32(&prcm_base->clksel3_pll, 0, 5, ptr->m2); -+ -+ /* M (PERIPH_DPLL_MULT): CM_CLKSEL2_PLL[8:19] */ -+ sr32(&prcm_base->clksel2_pll, 8, 12, ptr->m); -+ -+ /* N (PERIPH_DPLL_DIV): CM_CLKSEL2_PLL[0:6] */ -+ sr32(&prcm_base->clksel2_pll, 0, 7, ptr->n); -+ -+ /* M2DIV (CLKSEL_96M): CM_CLKSEL_CORE[12:13] */ -+ sr32(&prcm_base->clksel_core, 12, 2, ptr->m2div); -+ -+ /* LOCK MODE (EN_PERIPH_DPLL): CM_CLKEN_PLL[16:18] */ -+ sr32(&prcm_base->clken_pll, 16, 3, PLL_LOCK); -+ wait_on_value(ST_PERIPH_CLK, 2, &prcm_base->idlest_ckgen, LDELAY); -+} -+ -+static void mpu_init_36xx(u32 sil_index, u32 clk_index) -+{ -+ struct prcm *prcm_base = (struct prcm *)PRCM_BASE; -+ dpll_param *ptr = (dpll_param *) get_36x_mpu_dpll_param(); -+ -+ /* Moving to the right sysclk */ -+ ptr += clk_index; -+ -+ /* MPU DPLL (unlocked already */ -+ -+ /* M2 (MPU_DPLL_CLKOUT_DIV) : CM_CLKSEL2_PLL_MPU[0:4] */ -+ sr32(&prcm_base->clksel2_pll_mpu, 0, 5, ptr->m2); -+ -+ /* M (MPU_DPLL_MULT) : CM_CLKSEL2_PLL_MPU[8:18] */ -+ sr32(&prcm_base->clksel1_pll_mpu, 8, 11, ptr->m); -+ -+ /* N (MPU_DPLL_DIV) : CM_CLKSEL2_PLL_MPU[0:6] */ -+ sr32(&prcm_base->clksel1_pll_mpu, 0, 7, ptr->n); -+} -+ -+static void iva_init_36xx(u32 sil_index, u32 clk_index) -+{ -+ struct prcm *prcm_base = (struct prcm *)PRCM_BASE; -+ dpll_param *ptr = (dpll_param *)get_36x_iva_dpll_param(); -+ -+ /* Moving to the right sysclk */ -+ ptr += clk_index; -+ -+ /* IVA DPLL */ -+ /* EN_IVA2_DPLL : CM_CLKEN_PLL_IVA2[0:2] */ -+ sr32(&prcm_base->clken_pll_iva2, 0, 3, PLL_STOP); -+ wait_on_value(ST_IVA2_CLK, 0, &prcm_base->idlest_pll_iva2, LDELAY); -+ -+ /* M2 (IVA2_DPLL_CLKOUT_DIV) : CM_CLKSEL2_PLL_IVA2[0:4] */ -+ sr32(&prcm_base->clksel2_pll_iva2, 0, 5, ptr->m2); -+ -+ /* M (IVA2_DPLL_MULT) : CM_CLKSEL1_PLL_IVA2[8:18] */ -+ sr32(&prcm_base->clksel1_pll_iva2, 8, 11, ptr->m); -+ -+ /* N (IVA2_DPLL_DIV) : CM_CLKSEL1_PLL_IVA2[0:6] */ -+ sr32(&prcm_base->clksel1_pll_iva2, 0, 7, ptr->n); -+ -+ /* LOCK (MODE (EN_IVA2_DPLL) : CM_CLKEN_PLL_IVA2[0:2] */ -+ sr32(&prcm_base->clken_pll_iva2, 0, 3, PLL_LOCK); -+ -+ wait_on_value(ST_IVA2_CLK, 1, &prcm_base->idlest_pll_iva2, LDELAY); -+} -+ -+/****************************************************************************** -+ * prcm_init() - inits clocks for PRCM as defined in clocks.h -+ * called from SRAM, or Flash (using temp SRAM stack). -+ *****************************************************************************/ -+void prcm_init(void) -+{ -+ u32 osc_clk = 0, sys_clkin_sel; -+ u32 clk_index, sil_index = 0; -+ struct prm *prm_base = (struct prm *)PRM_BASE; -+ struct prcm *prcm_base = (struct prcm *)PRCM_BASE; -+ -+ /* -+ * 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); -+ -+ /* set input crystal speed */ -+ sr32(&prm_base->clksel, 0, 3, sys_clkin_sel); -+ -+ /* If the input clock is greater than 19.2M always divide/2 */ -+ if (sys_clkin_sel > 2) { -+ /* input clock divider */ -+ sr32(&prm_base->clksrc_ctrl, 6, 2, 2); -+ clk_index = sys_clkin_sel / 2; -+ } else { -+ /* input clock divider */ -+ sr32(&prm_base->clksrc_ctrl, 6, 2, 1); -+ clk_index = sys_clkin_sel; -+ } -+ -+ if (get_cpu_family() == CPU_OMAP36XX) { -+ /* Unlock MPU DPLL (slows things down, and needed later) */ -+ sr32(&prcm_base->clken_pll_mpu, 0, 3, PLL_LOW_POWER_BYPASS); -+ wait_on_value(ST_MPU_CLK, 0, &prcm_base->idlest_pll_mpu, -+ LDELAY); -+ -+ dpll3_init_36xx(0, clk_index); -+ dpll4_init_36xx(0, clk_index); -+ iva_init_36xx(0, clk_index); -+ mpu_init_36xx(0, clk_index); -+ -+ /* Lock MPU DPLL to set frequency */ -+ sr32(&prcm_base->clken_pll_mpu, 0, 3, PLL_LOCK); -+ wait_on_value(ST_MPU_CLK, 1, &prcm_base->idlest_pll_mpu, -+ LDELAY); -+ } else { -+ /* -+ * 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. -+ */ -+ if (((get_cpu_family() == CPU_OMAP34XX) -+ && (get_cpu_rev() >= CPU_3XX_ES20)) || -+ (get_cpu_family() == CPU_AM35XX)) -+ sil_index = 1; -+ -+ /* Unlock MPU DPLL (slows things down, and needed later) */ -+ sr32(&prcm_base->clken_pll_mpu, 0, 3, PLL_LOW_POWER_BYPASS); -+ wait_on_value(ST_MPU_CLK, 0, &prcm_base->idlest_pll_mpu, -+ LDELAY); -+ -+ dpll3_init_34xx(sil_index, clk_index); -+ dpll4_init_34xx(sil_index, clk_index); -+ iva_init_34xx(sil_index, clk_index); -+ mpu_init_34xx(sil_index, clk_index); -+ -+ /* Lock MPU DPLL to set frequency */ -+ sr32(&prcm_base->clken_pll_mpu, 0, 3, PLL_LOCK); -+ wait_on_value(ST_MPU_CLK, 1, &prcm_base->idlest_pll_mpu, -+ LDELAY); -+ } - - /* Set up GPTimers to sys_clk source only */ - sr32(&prcm_base->clksel_per, 0, 8, 0xff); -@@ -414,3 +678,4 @@ void per_clocks_enable(void) - - sdelay(1000); - } -+ -diff --git a/cpu/arm_cortexa8/omap3/lowlevel_init.S b/cpu/arm_cortexa8/omap3/lowlevel_init.S -index 73063ec..061d75f 100644 ---- a/cpu/arm_cortexa8/omap3/lowlevel_init.S -+++ b/cpu/arm_cortexa8/omap3/lowlevel_init.S -@@ -359,3 +359,72 @@ per_dpll_param: - get_per_dpll_param: - adr r0, per_dpll_param - mov pc, lr -+ -+/* -+ * Tables for 36x/37x devices -+ * -+ */ -+mpu_36x_dpll_param: -+/* 12MHz */ -+.word 50, 0, 0, 1 -+/* 13MHz */ -+.word 600, 12, 0, 1 -+/* 19.2MHz */ -+.word 125, 3, 0, 1 -+/* 26MHz */ -+.word 300, 12, 0, 1 -+/* 38.4MHz */ -+.word 125, 7, 0, 1 -+ -+iva_36x_dpll_param: -+/* 12MHz */ -+.word 130, 2, 0, 1 -+/* 13MHz */ -+.word 40, 0, 0, 1 -+/* 19.2MHz */ -+.word 325, 11, 0, 1 -+/* 26MHz */ -+.word 20, 0, 0, 1 -+/* 38.4MHz */ -+.word 325, 23, 0, 1 -+ -+core_36x_dpll_param: -+/* 12MHz */ -+.word 100, 2, 0, 1 -+/* 13MHz */ -+.word 400, 12, 0, 1 -+/* 19.2MHz */ -+.word 375, 17, 0, 1 -+/* 26MHz */ -+.word 200, 12, 0, 1 -+/* 38.4MHz */ -+.word 375, 35, 0, 1 -+ -+per_36x_dpll_param: -+/* SYSCLK M N M2 M3 M4 M5 M6 m2DIV */ -+.word 12000, 360, 4, 9, 16, 5, 4, 3, 1 -+.word 13000, 864, 12, 9, 16, 9, 4, 3, 1 -+.word 19200, 360, 7, 9, 16, 5, 4, 3, 1 -+.word 26000, 432, 12, 9, 16, 9, 4, 3, 1 -+.word 38400, 360, 15, 9, 16, 5, 4, 3, 1 -+ -+.globl get_36x_mpu_dpll_param -+get_36x_mpu_dpll_param: -+ adr r0, mpu_36x_dpll_param -+ mov pc, lr -+ -+.globl get_36x_iva_dpll_param -+get_36x_iva_dpll_param: -+ adr r0, iva_36x_dpll_param -+ mov pc, lr -+ -+.globl get_36x_core_dpll_param -+get_36x_core_dpll_param: -+ adr r0, core_36x_dpll_param -+ mov pc, lr -+ -+.globl get_36x_per_dpll_param -+get_36x_per_dpll_param: -+ adr r0, per_36x_dpll_param -+ mov pc, lr -+ -diff --git a/include/asm-arm/arch-omap3/clocks.h b/include/asm-arm/arch-omap3/clocks.h -index 71a0cb6..a5f2d08 100644 ---- a/include/asm-arm/arch-omap3/clocks.h -+++ b/include/asm-arm/arch-omap3/clocks.h -@@ -51,12 +51,29 @@ typedef struct { - unsigned int m2; - } dpll_param; - -+struct dpll_per_36x_param { -+ unsigned int sys_clk; -+ unsigned int m; -+ unsigned int n; -+ unsigned int m2; -+ unsigned int m3; -+ unsigned int m4; -+ unsigned int m5; -+ unsigned int m6; -+ unsigned int m2div; -+}; -+ - /* 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 dpll_param *get_36x_mpu_dpll_param(void); -+extern dpll_param *get_36x_iva_dpll_param(void); -+extern dpll_param *get_36x_core_dpll_param(void); -+extern dpll_param *get_36x_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 -index 661407b..30ef690 100644 ---- a/include/asm-arm/arch-omap3/clocks_omap3.h -+++ b/include/asm-arm/arch-omap3/clocks_omap3.h -@@ -282,4 +282,31 @@ - #define PER_FSEL_38P4 0x07 - #define PER_M2_38P4 0x09 - -+/* 36XX PER DPLL */ -+ -+#define PER_36XX_M_12 0x1B0 -+#define PER_36XX_N_12 0x05 -+#define PER_36XX_FSEL_12 0x07 -+#define PER_36XX_M2_12 0x09 -+ -+#define PER_36XX_M_13 0x360 -+#define PER_36XX_N_13 0x0C -+#define PER_36XX_FSEL_13 0x03 -+#define PER_36XX_M2_13 0x09 -+ -+#define PER_36XX_M_19P2 0x1C2 -+#define PER_36XX_N_19P2 0x09 -+#define PER_36XX_FSEL_19P2 0x07 -+#define PER_36XX_M2_19P2 0x09 -+ -+#define PER_36XX_M_26 0x1B0 -+#define PER_36XX_N_26 0x0C -+#define PER_36XX_FSEL_26 0x07 -+#define PER_36XX_M2_26 0x09 -+ -+#define PER_36XX_M_38P4 0x1C2 -+#define PER_36XX_N_38P4 0x13 -+#define PER_36XX_FSEL_38P4 0x07 -+#define PER_36XX_M2_38P4 0x09 -+ - #endif /* endif _CLOCKS_OMAP3_H_ */ --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0020-OMAP3-beagle-add-support-for-Beagle-xM.patch b/recipes/u-boot/u-boot-git/beagleboard/0020-OMAP3-beagle-add-support-for-Beagle-xM.patch deleted file mode 100644 index 0e21282268..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0020-OMAP3-beagle-add-support-for-Beagle-xM.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 8a8738a7d042a80ddef68a9683d7dda77bed8765 Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Tue, 23 Mar 2010 09:21:49 -0700 -Subject: [PATCH 20/50] OMAP3: beagle: add support for Beagle xM - ---- - board/ti/beagle/beagle.c | 23 +++++++++++++++-------- - board/ti/beagle/beagle.h | 34 ++++++++++++++++++++++++++++++---- - include/configs/omap3_beagle.h | 1 + - 3 files changed, 46 insertions(+), 12 deletions(-) - -diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index b4ea7e6..d357588 100644 ---- a/board/ti/beagle/beagle.c -+++ b/board/ti/beagle/beagle.c -@@ -75,7 +75,7 @@ int beagle_get_revision(void) - * GPIO173, GPIO172, GPIO171: 1 1 1 => Ax/Bx - * GPIO173, GPIO172, GPIO171: 1 1 0 => C1/2/3 - * GPIO173, GPIO172, GPIO171: 1 0 1 => C4 -- * GPIO173, GPIO172, GPIO171: 0 0 0 => D -+ * GPIO173, GPIO172, GPIO171: 0 0 0 => XM - */ - void beagle_identify(void) - { -@@ -108,29 +108,36 @@ int misc_init_r(void) - twl4030_power_init(); - twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON); - -- printf("Board revision "); - switch (beagle_revision) { - case REVISION_AXBX: -- printf("Ax/Bx\n"); -+ printf("Beagle Rev Ax/Bx\n"); - break; - case REVISION_CX: -- printf("C1/C2/C3\n"); -+ printf("Beagle Rev C1/C2/C3\n"); - MUX_BEAGLE_C(); - break; - case REVISION_C4: -- printf("C4\n"); -+ printf("Beagle Rev C4\n"); - MUX_BEAGLE_C(); - /* Set VAUX2 to 1.8V for EHCI PHY */ - twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED, - TWL4030_PM_RECEIVER_VAUX2_VSEL_18, - TWL4030_PM_RECEIVER_VAUX2_DEV_GRP, - TWL4030_PM_RECEIVER_DEV_GRP_P1); -+ setenv("mpurate", "720"); - break; -- case REVISION_D: -- printf("D\n"); -+ case REVISION_XM: -+ printf("Beagle xM Rev A\n"); -+ MUX_BEAGLE_XM(); -+ /* Set VAUX2 to 1.8V for EHCI PHY */ -+ twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED, -+ TWL4030_PM_RECEIVER_VAUX2_VSEL_18, -+ TWL4030_PM_RECEIVER_VAUX2_DEV_GRP, -+ TWL4030_PM_RECEIVER_DEV_GRP_P1); -+ setenv("mpurate", "720"); - break; - default: -- printf("unknown 0x%02x\n", beagle_revision); -+ printf("Beagle unknown 0x%02x\n", beagle_revision); - } - - /* Configure GPIOs to output */ -diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h -index d95fd78..fd06d46 100644 ---- a/board/ti/beagle/beagle.h -+++ b/board/ti/beagle/beagle.h -@@ -38,7 +38,7 @@ const omap3_sysinfo sysinfo = { - #define REVISION_AXBX 0x7 - #define REVISION_CX 0x6 - #define REVISION_C4 0x5 --#define REVISION_D 0x0 -+#define REVISION_XM 0x0 - - /* - * IEN - Input Enable -@@ -379,11 +379,37 @@ const omap3_sysinfo sysinfo = { - MUX_VAL(CP(SDRC_CKE1), (IDIS | PTU | EN | M0)) /*sdrc_cke1*/ - - #define MUX_BEAGLE_C() \ -- MUX_VAL(CP(MCBSP3_DX), (IEN | PTD | DIS | M4)) /*GPIO_140*/\ -- MUX_VAL(CP(MCBSP3_DR), (IEN | PTD | DIS | M4)) /*GPIO_142*/\ -- MUX_VAL(CP(MCBSP3_CLKX), (IEN | PTD | DIS | M4)) /*GPIO_141*/\ -+ MUX_VAL(CP(MCBSP3_DX), (IEN | PTD | DIS | M4)) /*GPIO_140*/\ -+ MUX_VAL(CP(MCBSP3_DR), (IEN | PTD | DIS | M4)) /*GPIO_142*/\ -+ MUX_VAL(CP(MCBSP3_CLKX), (IEN | PTD | DIS | M4)) /*GPIO_141*/\ - 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*/ - -+#define MUX_BEAGLE_XM() \ -+ MUX_VAL(CP(MCBSP3_DX), (IEN | PTD | DIS | M4)) /*GPIO_140*/\ -+ MUX_VAL(CP(MCBSP3_DR), (IEN | PTD | DIS | M4)) /*GPIO_142*/\ -+ MUX_VAL(CP(MCBSP3_CLKX), (IEN | PTD | DIS | M4)) /*GPIO_141*/\ -+ 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(DSS_DATA0), (IDIS | PTD | DIS | M7)) /*safe_mode*/\ -+ MUX_VAL(CP(DSS_DATA1), (IDIS | PTD | DIS | M7)) /*safe_mode*/\ -+ MUX_VAL(CP(DSS_DATA2), (IDIS | PTD | DIS | M7)) /*safe_mode*/\ -+ MUX_VAL(CP(DSS_DATA3), (IDIS | PTD | DIS | M7)) /*safe_mode*/\ -+ MUX_VAL(CP(DSS_DATA4), (IDIS | PTD | DIS | M7)) /*safe_mode*/\ -+ MUX_VAL(CP(DSS_DATA5), (IDIS | PTD | DIS | M7)) /*safe_mode*/\ -+ MUX_VAL(CP(DSS_DATA18), (IDIS | PTD | DIS | M3)) /*DSS_DATA0*/\ -+ MUX_VAL(CP(DSS_DATA19), (IDIS | PTD | DIS | M3)) /*DSS_DATA1*/\ -+ MUX_VAL(CP(DSS_DATA20), (IDIS | PTD | DIS | M3)) /*DSS_DATA2*/\ -+ MUX_VAL(CP(DSS_DATA21), (IDIS | PTD | DIS | M3)) /*DSS_DATA3*/\ -+ MUX_VAL(CP(DSS_DATA22), (IDIS | PTD | DIS | M3)) /*DSS_DATA4*/\ -+ MUX_VAL(CP(DSS_DATA23), (IDIS | PTD | DIS | M3)) /*DSS_DATA5*/\ -+ MUX_VAL(CP(SYS_BOOT0), (IDIS | PTD | DIS | M3)) /*DSS_DATA18*/\ -+ MUX_VAL(CP(SYS_BOOT1), (IDIS | PTD | DIS | M3)) /*DSS_DATA19*/\ -+ MUX_VAL(CP(SYS_BOOT3), (IDIS | PTD | DIS | M3)) /*DSS_DATA20*/\ -+ MUX_VAL(CP(SYS_BOOT4), (IDIS | PTD | DIS | M3)) /*DSS_DATA21*/\ -+ MUX_VAL(CP(SYS_BOOT5), (IDIS | PTD | DIS | M3)) /*DSS_DATA22*/\ -+ MUX_VAL(CP(SYS_BOOT6), (IDIS | PTD | DIS | M3)) /*DSS_DATA23*/ -+ - #endif -diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h -index 35ae8af..1370a29 100644 ---- a/include/configs/omap3_beagle.h -+++ b/include/configs/omap3_beagle.h -@@ -162,6 +162,7 @@ - /* - * Board NAND Info. - */ -+#define CONFIG_SYS_NAND_QUIET_TEST 1 - #define CONFIG_NAND_OMAP_GPMC - #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ - /* to access nand */ --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0022-OMAP3-beagle-implement-expansionboard-detection-base.patch b/recipes/u-boot/u-boot-git/beagleboard/0022-OMAP3-beagle-implement-expansionboard-detection-base.patch deleted file mode 100644 index abd25a3e2e..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0022-OMAP3-beagle-implement-expansionboard-detection-base.patch +++ /dev/null @@ -1,157 +0,0 @@ -From b48754f4c77924a9351867e17e2f09fbe5a83b82 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Thu, 25 Mar 2010 16:07:23 +0100 -Subject: [PATCH 22/50] OMAP3: beagle: implement expansionboard detection based on board/overo.c code - ---- - board/ti/beagle/beagle.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ - board/ti/beagle/beagle.h | 25 +++++++++++++- - 2 files changed, 101 insertions(+), 2 deletions(-) - -diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index d357588..8c5b88c 100644 ---- a/board/ti/beagle/beagle.c -+++ b/board/ti/beagle/beagle.c -@@ -38,6 +38,31 @@ - #include - #include "beagle.h" - -+static struct { -+ unsigned int device_vendor; -+ unsigned char revision; -+ unsigned char content; -+ unsigned char fab_revision[8]; -+ unsigned char env_var[16]; -+ unsigned char env_setting[64]; -+} expansion_config; -+ -+#define TWL4030_I2C_BUS 0 -+ -+#define EXPANSION_EEPROM_I2C_BUS 1 -+#define EXPANSION_EEPROM_I2C_ADDRESS 0x50 -+ -+#define TINCANTOOLS_VENDORID 0x0100 -+#define GUMSTIX_VENDORID 0x0200 -+#define SPECIALCOMP_VENDORID 0x0300 -+ -+#define TINCANTOOLS_ZIPPY 0x01000100 -+#define TINCANTOOLS_ZIPPY2 0x02000100 -+#define TINCANTOOLS_TRAINER 0x03000100 -+#define TINCANTOOLS_SHOWDOG 0x04000100 -+ -+#define BEAGLE_NO_EEPROM 0xffffffff -+ - static int beagle_revision; - - /* -@@ -95,6 +120,27 @@ void beagle_identify(void) - } - - /* -+ * Routine: get_expansion_id -+ * Description: This function checks for expansion board by checking I2C -+ * bus 2 for the availability of an AT24C01B serial EEPROM. -+ * returns the device_vendor field from the EEPROM -+ */ -+unsigned int get_expansion_id(void) -+{ -+ i2c_set_bus_num(EXPANSION_EEPROM_I2C_BUS); -+ -+ /* return BEAGLE_NO_EEPROM if eeprom doesn't respond */ -+ if (i2c_probe(EXPANSION_EEPROM_I2C_ADDRESS) == 1) -+ return BEAGLE_NO_EEPROM; -+ -+ /* read configuration data */ -+ i2c_read(EXPANSION_EEPROM_I2C_ADDRESS, 0, 1, (u8 *)&expansion_config, -+ sizeof(expansion_config)); -+ -+ return expansion_config.device_vendor; -+} -+ -+/* - * Routine: misc_init_r - * Description: Configure board specific parts - */ -@@ -104,6 +150,38 @@ int misc_init_r(void) - struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE; - - beagle_identify(); -+ switch (get_expansion_id()) { -+ case TINCANTOOLS_ZIPPY: -+ printf("Recognized Tincantools Zippy expansion board (rev %d %s)\n", -+ expansion_config.revision, expansion_config.fab_revision); -+ MUX_TINCANTOOLS_ZIPPY(); -+ break; -+ case TINCANTOOLS_ZIPPY2: -+ printf("Recognized Tincantools Zippy2 expansion board (rev %d %s)\n", -+ expansion_config.revision, expansion_config.fab_revision); -+ MUX_TINCANTOOLS_ZIPPY(); -+ break; -+ case TINCANTOOLS_TRAINER: -+ printf("Recognized Tincantools Trainer expansion board (rev %d %s)\n", -+ expansion_config.revision, expansion_config.fab_revision); -+ break; -+ case TINCANTOOLS_SHOWDOG: -+ printf("Recognized Tincantools Showdow expansion board (rev %d %s)\n", -+ expansion_config.revision, expansion_config.fab_revision); -+ /* Place holder for DSS2 definition for showdog lcd */ -+ setenv("defaultdisplay", "showdoglcd"); -+ break; -+ case BEAGLE_NO_EEPROM: -+ printf("No EEPROM on expansion board\n"); -+ break; -+ default: -+ printf("Unrecognized expansion board: %x\n", expansion_config.device_vendor); -+ } -+ -+ if (expansion_config.content == 1) -+ setenv(expansion_config.env_var, expansion_config.env_setting); -+ -+ i2c_set_bus_num(TWL4030_I2C_BUS); - - twl4030_power_init(); - twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON); -diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h -index fd06d46..ec4f831 100644 ---- a/board/ti/beagle/beagle.h -+++ b/board/ti/beagle/beagle.h -@@ -260,8 +260,8 @@ const omap3_sysinfo sysinfo = { - 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 | M4)) /*GPIO_168*/\ -- MUX_VAL(CP(I2C2_SDA), (IEN | PTU | EN | M4)) /*GPIO_183*/\ -+ 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*/\ -@@ -412,4 +412,25 @@ const omap3_sysinfo sysinfo = { - MUX_VAL(CP(SYS_BOOT5), (IDIS | PTD | DIS | M3)) /*DSS_DATA22*/\ - MUX_VAL(CP(SYS_BOOT6), (IDIS | PTD | DIS | M3)) /*DSS_DATA23*/ - -+#define MUX_TINCANTOOLS_ZIPPY() \ -+ MUX_VAL(CP(MMC2_CLK), (IEN | PTU | EN | M0)) /*MMC2_CLK*/\ -+ MUX_VAL(CP(MMC2_CMD), (IEN | PTU | EN | M0)) /*MMC2_CMD*/\ -+ MUX_VAL(CP(MMC2_DAT0), (IEN | PTU | EN | M0)) /*MMC2_DAT0*/\ -+ MUX_VAL(CP(MMC2_DAT1), (IEN | PTU | EN | M0)) /*MMC2_DAT1*/\ -+ MUX_VAL(CP(MMC2_DAT2), (IEN | PTU | EN | M0)) /*MMC2_DAT2*/\ -+ MUX_VAL(CP(MMC2_DAT3), (IEN | PTU | EN | M0)) /*MMC2_DAT3*/\ -+ MUX_VAL(CP(MMC2_DAT4), (IEN | PTU | EN | M1)) /*MMC2_DIR_DAT0*/\ -+ MUX_VAL(CP(MMC2_DAT5), (IEN | PTU | EN | M1)) /*MMC2_DIR_DAT1*/\ -+ MUX_VAL(CP(MMC2_DAT6), (IEN | PTU | EN | M1)) /*MMC2_DIR_CMD*/\ -+ MUX_VAL(CP(MMC2_DAT7), (IEN | PTU | EN | M1)) /*MMC2_CLKIN*/\ -+ MUX_VAL(CP(MCBSP1_CLKR), (IEN | PTU | EN | M1)) /*MCSPI4_CLK*/\ -+ MUX_VAL(CP(MCBSP1_FSR), (IEN | PTU | EN | M4)) /*GPIO_157*/\ -+ MUX_VAL(CP(MCBSP1_DX), (IEN | PTD | EN | M1)) /*MCSPI4_SIMO*/\ -+ MUX_VAL(CP(MCBSP1_DR), (IEN | PTD | DIS | M1)) /*MCSPI4_SOMI*/\ -+ MUX_VAL(CP(MCBSP1_FSX), (IEN | PTD | EN | M1)) /*MCSPI4_CS0*/\ -+ MUX_VAL(CP(MCBSP1_CLKX), (IEN | PTD | DIS | M4)) /*GPIO_162*/\ -+ MUX_VAL(CP(MCBSP3_DX), (IEN | PTD | DIS | M4)) /*GPIO_140*/\ -+ MUX_VAL(CP(MCBSP3_DR), (IEN | PTD | DIS | M4)) /*GPIO_142*/\ -+ MUX_VAL(CP(MCBSP3_CLKX), (IEN | PTD | DIS | M4)) /*GPIO_141*/\ -+ - #endif --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0023-beagleboard-display-message-about-I2C-errors-being-e.patch b/recipes/u-boot/u-boot-git/beagleboard/0023-beagleboard-display-message-about-I2C-errors-being-e.patch deleted file mode 100644 index 704467e93e..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0023-beagleboard-display-message-about-I2C-errors-being-e.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 653c13d956b189c05e6c02077dbd85cba8ff490b Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Wed, 31 Mar 2010 14:24:25 +0200 -Subject: [PATCH 23/50] beagleboard: display message about I2C errors being expected when no expansion boards are present - ---- - board/ti/beagle/beagle.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index 8c5b88c..c9c9a58 100644 ---- a/board/ti/beagle/beagle.c -+++ b/board/ti/beagle/beagle.c -@@ -150,6 +150,9 @@ int misc_init_r(void) - struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE; - - beagle_identify(); -+ -+ printf("\nProbing for expansion boards, if none are connected you'll see a harmless I2C error.\n"); -+ - switch (get_expansion_id()) { - case TINCANTOOLS_ZIPPY: - printf("Recognized Tincantools Zippy expansion board (rev %d %s)\n", --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0024-beagleboard-fix-TCT-expansionboard-IDs.patch b/recipes/u-boot/u-boot-git/beagleboard/0024-beagleboard-fix-TCT-expansionboard-IDs.patch deleted file mode 100644 index 418c152df4..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0024-beagleboard-fix-TCT-expansionboard-IDs.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a0f21f7418dfa81a40bf99b7e926153a310ba457 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Sun, 11 Apr 2010 12:14:43 +0200 -Subject: [PATCH 24/50] beagleboard: fix TCT expansionboard IDs - ---- - board/ti/beagle/beagle.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index c9c9a58..7cb6d1f 100644 ---- a/board/ti/beagle/beagle.c -+++ b/board/ti/beagle/beagle.c -@@ -58,8 +58,8 @@ static struct { - - #define TINCANTOOLS_ZIPPY 0x01000100 - #define TINCANTOOLS_ZIPPY2 0x02000100 --#define TINCANTOOLS_TRAINER 0x03000100 --#define TINCANTOOLS_SHOWDOG 0x04000100 -+#define TINCANTOOLS_TRAINER 0x04000100 -+#define TINCANTOOLS_SHOWDOG 0x03000100 - - #define BEAGLE_NO_EEPROM 0xffffffff - --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0027-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch b/recipes/u-boot/u-boot-git/beagleboard/0027-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch deleted file mode 100644 index 1a9197e1f9..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0027-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 4aca3c70a18da58e263b08e37b288a06b2b6655c Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Tue, 13 Apr 2010 22:04:07 +0200 -Subject: [PATCH 27/50] beagleboardXM: don't set mpurate on xM in bootargs - ---- - board/ti/beagle/beagle.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index eb57b5a..974a72c 100644 ---- a/board/ti/beagle/beagle.c -+++ b/board/ti/beagle/beagle.c -@@ -226,7 +226,6 @@ int misc_init_r(void) - TWL4030_PM_RECEIVER_VAUX2_VSEL_18, - TWL4030_PM_RECEIVER_VAUX2_DEV_GRP, - TWL4030_PM_RECEIVER_DEV_GRP_P1); -- setenv("mpurate", "720"); - break; - default: - printf("Beagle unknown 0x%02x\n", beagle_revision); --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0028-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch b/recipes/u-boot/u-boot-git/beagleboard/0028-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch deleted file mode 100644 index f4975cdc88..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0028-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 72e1ab470e483c91ab3aa38bec31faf3dad52735 Mon Sep 17 00:00:00 2001 -From: Mans Rullgard -Date: Wed, 14 Apr 2010 12:08:00 +0100 -Subject: [PATCH 28/50] OMAP3: fix and clean up L2 cache enable/disable functions - -On OMAP34xx ES1.0, the L2 enable bit can only be set in secure mode, -so an SMC call to the ROM monitor is required. On later versions, -and on newer devices, this bit is banked and we can set it directly. - -The code checked only the ES revision of the chip, and hence incorrectly -used the ROM call on ES1.0 versions of other devices. - -This patch adds a check for chip family as well as revision, and also -removes some code duplication between the enable and disable functions. - -Signed-off-by: Mans Rullgard ---- - cpu/arm_cortexa8/omap3/cache.S | 74 +++++++++++----------------------------- - 1 files changed, 20 insertions(+), 54 deletions(-) - -diff --git a/cpu/arm_cortexa8/omap3/cache.S b/cpu/arm_cortexa8/omap3/cache.S -index 0f63815..16afb5d 100644 ---- a/cpu/arm_cortexa8/omap3/cache.S -+++ b/cpu/arm_cortexa8/omap3/cache.S -@@ -128,64 +128,30 @@ finished_inval: - - ldmfd r13!, {r0 - r5, r7, r9 - r12, pc} - -- --l2_cache_enable: -- push {r0, r1, r2, lr} -- @ ES2 onwards we can disable/enable L2 ourselves -+l2_cache_set: -+ push {r4-r6, lr} -+ mov r5, r0 - bl get_cpu_rev -- cmp r0, #CPU_3XX_ES20 -- blt l2_cache_disable_EARLIER_THAN_ES2 -- mrc 15, 0, r3, cr1, cr0, 1 -- orr r3, r3, #2 -- mcr 15, 0, r3, cr1, cr0, 1 -- b l2_cache_enable_END --l2_cache_enable_EARLIER_THAN_ES2: -- @ Save r0, r12 and restore them after usage -- mov r3, ip -- str r3, [sp, #4] -- mov r3, r0 -- @ -+ mov r4, r0 -+ bl get_cpu_family -+ @ ES2 onwards we can disable/enable L2 ourselves -+ cmp r0, #CPU_OMAP34XX -+ cmpeq r4, #CPU_3XX_ES10 -+ mrc 15, 0, r0, cr1, cr0, 1 -+ bic r0, r0, #2 -+ orr r0, r0, r5, lsl #1 -+ mcreq 15, 0, r0, cr1, cr0, 1 - @ GP Device ROM code API usage here - @ r12 = AUXCR Write function and r0 value -- @ - mov ip, #3 -- mrc 15, 0, r0, cr1, cr0, 1 -- orr r0, r0, #2 -- @ SMI instruction to call ROM Code API -- .word 0xe1600070 -- mov r0, r3 -- mov ip, r3 -- str r3, [sp, #4] --l2_cache_enable_END: -- pop {r1, r2, r3, pc} -+ @ SMCNE instruction to call ROM Code API -+ .word 0x11600070 -+ pop {r4-r6, pc} - -+l2_cache_enable: -+ mov r0, #1 -+ b l2_cache_set - - l2_cache_disable: -- push {r0, r1, r2, lr} -- @ ES2 onwards we can disable/enable L2 ourselves -- bl get_cpu_rev -- cmp r0, #CPU_3XX_ES20 -- blt l2_cache_disable_EARLIER_THAN_ES2 -- mrc 15, 0, r3, cr1, cr0, 1 -- bic r3, r3, #2 -- mcr 15, 0, r3, cr1, cr0, 1 -- b l2_cache_disable_END --l2_cache_disable_EARLIER_THAN_ES2: -- @ Save r0, r12 and restore them after usage -- mov r3, ip -- str r3, [sp, #4] -- mov r3, r0 -- @ -- @ GP Device ROM code API usage here -- @ r12 = AUXCR Write function and r0 value -- @ -- mov ip, #3 -- mrc 15, 0, r0, cr1, cr0, 1 -- bic r0, r0, #2 -- @ SMI instruction to call ROM Code API -- .word 0xe1600070 -- mov r0, r3 -- mov ip, r3 -- str r3, [sp, #4] --l2_cache_disable_END: -- pop {r1, r2, r3, pc} -+ mov r0, #0 -+ b l2_cache_set --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0029-OMAP3-convert-setup_auxcr-to-pure-asm.patch b/recipes/u-boot/u-boot-git/beagleboard/0029-OMAP3-convert-setup_auxcr-to-pure-asm.patch deleted file mode 100644 index 7e9fe8bdc1..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0029-OMAP3-convert-setup_auxcr-to-pure-asm.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 1e795a2c3e44002c3512222dd3da07ac3ea42d7d Mon Sep 17 00:00:00 2001 -From: Mans Rullgard -Date: Wed, 14 Apr 2010 16:49:57 +0100 -Subject: [PATCH 29/50] OMAP3: convert setup_auxcr() to pure asm - -This function consists entirely of inline asm statements, so writing -it directly in a .S file is simpler. Additionally, the inline asm is -not safe as is, since registers are not guaranteed to be preserved -between asm() statements. - -Signed-off-by: Mans Rullgard ---- - cpu/arm_cortexa8/omap3/board.c | 35 ----------------------------------- - cpu/arm_cortexa8/omap3/cache.S | 19 +++++++++++++++++++ - 2 files changed, 19 insertions(+), 35 deletions(-) - -diff --git a/cpu/arm_cortexa8/omap3/board.c b/cpu/arm_cortexa8/omap3/board.c -index 0126152..7f49199 100644 ---- a/cpu/arm_cortexa8/omap3/board.c -+++ b/cpu/arm_cortexa8/omap3/board.c -@@ -122,41 +122,6 @@ void secureworld_exit() - } - - /****************************************************************************** -- * 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"); -- /* Enable L1NEON */ -- __asm__ __volatile__("orr r0, r0, #1 << 5"); -- /* SMI instruction to call ROM Code API */ -- __asm__ __volatile__(".word 0xE1600070"); -- /* Set PLD_FWD bit in L2AUXCR (Cortex-A8 erratum 725233 workaround) */ -- __asm__ __volatile__("mov r12, #0x2"); -- __asm__ __volatile__("mrc p15, 1, r0, c9, c0, 2"); -- __asm__ __volatile__("orr r0, r0, #1 << 27"); -- /* 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. -diff --git a/cpu/arm_cortexa8/omap3/cache.S b/cpu/arm_cortexa8/omap3/cache.S -index 16afb5d..61e6946 100644 ---- a/cpu/arm_cortexa8/omap3/cache.S -+++ b/cpu/arm_cortexa8/omap3/cache.S -@@ -43,6 +43,7 @@ - .global invalidate_dcache - .global l2_cache_enable - .global l2_cache_disable -+.global setup_auxcr - - /* - * invalidate_dcache() -@@ -155,3 +156,21 @@ l2_cache_enable: - l2_cache_disable: - mov r0, #0 - b l2_cache_set -+ -+/****************************************************************************** -+ * Routine: setup_auxcr() -+ * Description: Write to AuxCR desired value using SMI. -+ * general use. -+ *****************************************************************************/ -+setup_auxcr: -+ mov r12, #0x3 -+ mrc p15, 0, r0, c1, c0, 1 -+ orr r0, r0, #0x10 @ Enable ASA -+ orr r0, r0, #1 << 5 @ Enable L1NEON -+ .word 0xE1600070 @ SMC -+ mov r12, #0x2 -+ mrc p15, 1, r0, c9, c0, 2 -+ @ Set PLD_FWD bit in L2AUXCR (Cortex-A8 erratum 725233 workaround) -+ orr r0, r0, #1 << 27 -+ .word 0xE1600070 @ SMC -+ bx lr --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0030-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch b/recipes/u-boot/u-boot-git/beagleboard/0030-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch deleted file mode 100644 index 11f40377e7..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0030-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch +++ /dev/null @@ -1,46 +0,0 @@ -From fd092c7f2286fab34cf42c6c56360ae7794dbc7f Mon Sep 17 00:00:00 2001 -From: Mans Rullgard -Date: Wed, 14 Apr 2010 17:10:28 +0100 -Subject: [PATCH 30/50] OMAP3: apply Cortex-A8 errata workarounds only on affected revisions - -The workarounds for errata 621766 and 725233 should only be applied -on affected Cortex-A8 revisions. Recent chips use r3px cores where -these have been fixed. - -Signed-off-by: Mans Rullgard ---- - cpu/arm_cortexa8/omap3/cache.S | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/cpu/arm_cortexa8/omap3/cache.S b/cpu/arm_cortexa8/omap3/cache.S -index 61e6946..932e4eb 100644 ---- a/cpu/arm_cortexa8/omap3/cache.S -+++ b/cpu/arm_cortexa8/omap3/cache.S -@@ -163,14 +163,21 @@ l2_cache_disable: - * general use. - *****************************************************************************/ - setup_auxcr: -+ mrc p15, 0, r0, c0, c0, 0 @ read main ID register -+ and r2, r0, #0x00f00000 @ variant -+ and r3, r0, #0x0000000f @ revision -+ orr r1, r3, r2, lsr #20-4 @ combine variant and revision - mov r12, #0x3 - mrc p15, 0, r0, c1, c0, 1 - orr r0, r0, #0x10 @ Enable ASA -- orr r0, r0, #1 << 5 @ Enable L1NEON -+ @ Enable L1NEON on pre-r2p1 (erratum 621766 workaround) -+ cmp r1, #0x21 -+ orrlt r0, r0, #1 << 5 - .word 0xE1600070 @ SMC - mov r12, #0x2 - mrc p15, 1, r0, c9, c0, 2 -- @ Set PLD_FWD bit in L2AUXCR (Cortex-A8 erratum 725233 workaround) -- orr r0, r0, #1 << 27 -+ @ Set PLD_FWD bit in L2AUXCR on pre-r2p1 (erratum 725233 workaround) -+ cmp r1, #0x21 -+ orrlt r0, r0, #1 << 27 - .word 0xE1600070 @ SMC - bx lr --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0031-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch b/recipes/u-boot/u-boot-git/beagleboard/0031-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch deleted file mode 100644 index 2f5c60593d..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0031-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch +++ /dev/null @@ -1,61 +0,0 @@ -From ccbe10687806b6504c87bd3ad80bd406bc6263f4 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Fri, 23 Apr 2010 10:50:43 +0200 -Subject: [PATCH 31/50] OMAP3: beagle: add more expansionboards, based on http://www.elinux.org/BeagleBoardPinMux#Vendor_and_Device_IDs - ---- - board/ti/beagle/beagle.c | 8 ++++++++ - board/ti/beagle/beagle.h | 6 ++++++ - 2 files changed, 14 insertions(+), 0 deletions(-) - -diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index 974a72c..0544178 100644 ---- a/board/ti/beagle/beagle.c -+++ b/board/ti/beagle/beagle.c -@@ -55,11 +55,15 @@ static struct { - #define TINCANTOOLS_VENDORID 0x0100 - #define GUMSTIX_VENDORID 0x0200 - #define SPECIALCOMP_VENDORID 0x0300 -+#define HYR_VENDORID 0x0400 -+#define MENTOREL_VENDORID 0x0500 -+#define KBADC_VENDORID 0x0600 - - #define TINCANTOOLS_ZIPPY 0x01000100 - #define TINCANTOOLS_ZIPPY2 0x02000100 - #define TINCANTOOLS_TRAINER 0x04000100 - #define TINCANTOOLS_SHOWDOG 0x03000100 -+#define KBADC_BEAGLEFPGA 0x01000600 - - #define BEAGLE_NO_EEPROM 0xffffffff - -@@ -184,6 +188,10 @@ int misc_init_r(void) - /* Place holder for DSS2 definition for showdog lcd */ - setenv("defaultdisplay", "showdoglcd"); - break; -+ case KBADC_BEAGLEFPGA: -+ printf("Recognized KBADC Beagle FPGA board\n"); -+ MUX_KBADC_BEAGLEFPGA(); -+ break; - case BEAGLE_NO_EEPROM: - printf("No EEPROM on expansion board\n"); - break; -diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h -index 69f9398..90a0ebf 100644 ---- a/board/ti/beagle/beagle.h -+++ b/board/ti/beagle/beagle.h -@@ -435,6 +435,12 @@ const omap3_sysinfo sysinfo = { - MUX_VAL(CP(MCBSP3_DR), (IEN | PTD | DIS | M4)) /*GPIO_142*/\ - MUX_VAL(CP(MCBSP3_CLKX), (IEN | PTD | DIS | M4)) /*GPIO_141*/\ - -+#define MUX_KBADC_BEAGLEFPGA() \ -+ MUX_VAL(CP(MCBSP1_CLKR), (IEN | PTU | DIS | M1)) /*MCSPI4_CLK*/\ -+ MUX_VAL(CP(MCBSP1_DX), (IDIS | PTU | DIS | M1)) /*MCSPI4_SIMO*/\ -+ MUX_VAL(CP(MCBSP1_DR), (IEN | PTU | EN | M1)) /*MCSPI4_SOMI*/\ -+ MUX_VAL(CP(MCBSP1_FSX), (IDIS | PTU | DIS | M1)) /*MCSPI4_CS0*/\ -+ - /* - * Display Configuration - */ --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0032-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch b/recipes/u-boot/u-boot-git/beagleboard/0032-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch deleted file mode 100644 index 839dfbc9b7..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0032-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0d2821af767b7cfe1a5d868a14f8a18e01070e37 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Tue, 27 Apr 2010 13:44:16 +0200 -Subject: [PATCH 32/50] OMAP3: beagle: set mpurate to 600 for revB and revC1-3 - ---- - board/ti/beagle/beagle.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index 0544178..6778499 100644 ---- a/board/ti/beagle/beagle.c -+++ b/board/ti/beagle/beagle.c -@@ -211,10 +211,12 @@ int misc_init_r(void) - switch (beagle_revision) { - case REVISION_AXBX: - printf("Beagle Rev Ax/Bx\n"); -+ setenv("mpurate", "600"); - break; - case REVISION_CX: - printf("Beagle Rev C1/C2/C3\n"); - MUX_BEAGLE_C(); -+ setenv("mpurate", "600"); - break; - case REVISION_C4: - printf("Beagle Rev C4\n"); --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0033-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch b/recipes/u-boot/u-boot-git/beagleboard/0033-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch deleted file mode 100644 index 8d0f3eace5..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0033-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f4f92e1f72e2bcab85f205c66f0725a677e192e2 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Tue, 27 Apr 2010 13:45:28 +0200 -Subject: [PATCH 33/50] OMAP3: beagle: prettify expansionboard message a bit - ---- - board/ti/beagle/beagle.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index 6778499..58fb7c3 100644 ---- a/board/ti/beagle/beagle.c -+++ b/board/ti/beagle/beagle.c -@@ -165,7 +165,7 @@ int misc_init_r(void) - - beagle_identify(); - -- printf("\nProbing for expansion boards, if none are connected you'll see a harmless I2C error.\n"); -+ printf("\nProbing for expansion boards, if none are connected you'll see a harmless I2C error.\n\n"); - - switch (get_expansion_id()) { - case TINCANTOOLS_ZIPPY: --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0034-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch b/recipes/u-boot/u-boot-git/beagleboard/0034-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch deleted file mode 100644 index b396c749ee..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0034-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d6d6f29e339b5d014f91870b35985a372dd330f2 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Tue, 27 Apr 2010 18:25:57 +0200 -Subject: [PATCH 34/50] OMAP3: beagle: add pinmux for Tincantools Trainer expansionboard - ---- - board/ti/beagle/beagle.c | 2 ++ - board/ti/beagle/beagle.h | 16 +++++++++++++++- - 2 files changed, 17 insertions(+), 1 deletions(-) - -diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index 58fb7c3..39c53f2 100644 ---- a/board/ti/beagle/beagle.c -+++ b/board/ti/beagle/beagle.c -@@ -181,6 +181,8 @@ int misc_init_r(void) - case TINCANTOOLS_TRAINER: - printf("Recognized Tincantools Trainer expansion board (rev %d %s)\n", - expansion_config.revision, expansion_config.fab_revision); -+ MUX_TINCANTOOLS_ZIPPY(); -+ MUX_TINCANTOOLS_TRAINER(); - break; - case TINCANTOOLS_SHOWDOG: - printf("Recognized Tincantools Showdow expansion board (rev %d %s)\n", -diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h -index 90a0ebf..7774855 100644 ---- a/board/ti/beagle/beagle.h -+++ b/board/ti/beagle/beagle.h -@@ -433,7 +433,21 @@ const omap3_sysinfo sysinfo = { - MUX_VAL(CP(MCBSP1_CLKX), (IEN | PTD | DIS | M4)) /*GPIO_162*/\ - MUX_VAL(CP(MCBSP3_DX), (IEN | PTD | DIS | M4)) /*GPIO_140*/\ - MUX_VAL(CP(MCBSP3_DR), (IEN | PTD | DIS | M4)) /*GPIO_142*/\ -- MUX_VAL(CP(MCBSP3_CLKX), (IEN | PTD | DIS | M4)) /*GPIO_141*/\ -+ MUX_VAL(CP(MCBSP3_CLKX), (IEN | PTD | DIS | M4)) /*GPIO_141*/ -+ -+#define MUX_TINCANTOOLS_TRAINER() \ -+ 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*/\ -+ MUX_VAL(CP(MCBSP3_DX), (IEN | PTU | EN | M4)) /*GPIO_140*/\ -+ MUX_VAL(CP(MCBSP3_CLKX), (IEN | PTU | EN | M4)) /*GPIO_141*/ - - #define MUX_KBADC_BEAGLEFPGA() \ - MUX_VAL(CP(MCBSP1_CLKR), (IEN | PTU | DIS | M1)) /*MCSPI4_CLK*/\ --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0035-OMAP3-Beagle-set-mpurate-to-1000-for-xM.patch b/recipes/u-boot/u-boot-git/beagleboard/0035-OMAP3-Beagle-set-mpurate-to-1000-for-xM.patch deleted file mode 100644 index b4e040499c..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0035-OMAP3-Beagle-set-mpurate-to-1000-for-xM.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 442e5d80723e2772f38fe473d32287200d802907 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Fri, 30 Apr 2010 13:25:41 +0200 -Subject: [PATCH 35/50] OMAP3: Beagle: set mpurate to 1000 for xM - ---- - board/ti/beagle/beagle.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index 39c53f2..9300984 100644 ---- a/board/ti/beagle/beagle.c -+++ b/board/ti/beagle/beagle.c -@@ -238,6 +238,7 @@ int misc_init_r(void) - TWL4030_PM_RECEIVER_VAUX2_VSEL_18, - TWL4030_PM_RECEIVER_VAUX2_DEV_GRP, - TWL4030_PM_RECEIVER_DEV_GRP_P1); -+ setenv("mpurate", "1000"); - break; - default: - printf("Beagle unknown 0x%02x\n", beagle_revision); --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0036-OMAP3-Beagle-decrease-bootdelay-to-3-use-VGA-for-def.patch b/recipes/u-boot/u-boot-git/beagleboard/0036-OMAP3-Beagle-decrease-bootdelay-to-3-use-VGA-for-def.patch deleted file mode 100644 index 4e4f036a7b..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0036-OMAP3-Beagle-decrease-bootdelay-to-3-use-VGA-for-def.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 13b74d6ec2b88620515d0060f6276f744f058e44 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Fri, 30 Apr 2010 13:26:01 +0200 -Subject: [PATCH 36/50] OMAP3: Beagle: decrease bootdelay to 3, use VGA for default resolution - ---- - include/configs/omap3_beagle.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h -index 52d727a..47bc971 100644 ---- a/include/configs/omap3_beagle.h -+++ b/include/configs/omap3_beagle.h -@@ -183,7 +183,7 @@ - /* partition */ - - /* Environment information */ --#define CONFIG_BOOTDELAY 10 -+#define CONFIG_BOOTDELAY 3 - - #define CONFIG_EXTRA_ENV_SETTINGS \ - "loadaddr=0x82000000\0" \ -@@ -191,7 +191,7 @@ - "console=ttyS2,115200n8\0" \ - "mpurate=500\0" \ - "vram=12M\0" \ -- "dvimode=1024x768MR-16@60\0" \ -+ "dvimode=640x480MR-16@60\0" \ - "defaultdisplay=dvi\0" \ - "mmcroot=/dev/mmcblk0p2 rw\0" \ - "mmcrootfstype=ext3 rootwait\0" \ --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0037-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch b/recipes/u-boot/u-boot-git/beagleboard/0037-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch deleted file mode 100644 index 584a57281e..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0037-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 02dba49bdab65e1a96fd4593f5847b38252b66e0 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Mon, 3 May 2010 10:17:41 +0200 -Subject: [PATCH 37/50] OMAP3: beagle: pass expansionboard name in bootargs - -This makes it possible to do in-kernel fixups for expansionboards like reclaiming GPIOs ---- - board/ti/beagle/beagle.c | 7 +++++++ - include/configs/omap3_beagle.h | 3 +++ - 2 files changed, 10 insertions(+), 0 deletions(-) - -diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index 9300984..556e995 100644 ---- a/board/ti/beagle/beagle.c -+++ b/board/ti/beagle/beagle.c -@@ -172,33 +172,40 @@ int misc_init_r(void) - printf("Recognized Tincantools Zippy expansion board (rev %d %s)\n", - expansion_config.revision, expansion_config.fab_revision); - MUX_TINCANTOOLS_ZIPPY(); -+ setenv("buddy", "zippy"); - break; - case TINCANTOOLS_ZIPPY2: - printf("Recognized Tincantools Zippy2 expansion board (rev %d %s)\n", - expansion_config.revision, expansion_config.fab_revision); - MUX_TINCANTOOLS_ZIPPY(); -+ setenv("buddy", "zippy2"); - break; - case TINCANTOOLS_TRAINER: - printf("Recognized Tincantools Trainer expansion board (rev %d %s)\n", - expansion_config.revision, expansion_config.fab_revision); - MUX_TINCANTOOLS_ZIPPY(); - MUX_TINCANTOOLS_TRAINER(); -+ setenv("buddy", "trainer"); - break; - case TINCANTOOLS_SHOWDOG: - printf("Recognized Tincantools Showdow expansion board (rev %d %s)\n", - expansion_config.revision, expansion_config.fab_revision); - /* Place holder for DSS2 definition for showdog lcd */ - setenv("defaultdisplay", "showdoglcd"); -+ setenv("buddy", "showdog"); - break; - case KBADC_BEAGLEFPGA: - printf("Recognized KBADC Beagle FPGA board\n"); - MUX_KBADC_BEAGLEFPGA(); -+ setenv("buddy", "beaglefpga"); - break; - case BEAGLE_NO_EEPROM: - printf("No EEPROM on expansion board\n"); -+ setenv("buddy", "none"); - break; - default: - printf("Unrecognized expansion board: %x\n", expansion_config.device_vendor); -+ setenv("buddy", "unknown"); - } - - if (expansion_config.content == 1) -diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h -index 47bc971..8ad52aa 100644 ---- a/include/configs/omap3_beagle.h -+++ b/include/configs/omap3_beagle.h -@@ -190,6 +190,7 @@ - "usbtty=cdc_acm\0" \ - "console=ttyS2,115200n8\0" \ - "mpurate=500\0" \ -+ "buddy=none\0" \ - "vram=12M\0" \ - "dvimode=640x480MR-16@60\0" \ - "defaultdisplay=dvi\0" \ -@@ -199,6 +200,7 @@ - "nandrootfstype=jffs2\0" \ - "mmcargs=setenv bootargs console=${console} " \ - "mpurate=${mpurate} " \ -+ "buddy=${buddy} "\ - "vram=${vram} " \ - "omapfb.mode=dvi:${dvimode} " \ - "omapdss.def_disp=${defaultdisplay} " \ -@@ -206,6 +208,7 @@ - "rootfstype=${mmcrootfstype}\0" \ - "nandargs=setenv bootargs console=${console} " \ - "mpurate=${mpurate} " \ -+ "buddy=${buddy} "\ - "vram=${vram} " \ - "omapfb.mode=dvi:${dvimode} " \ - "omapdss.def_disp=${defaultdisplay} " \ --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0038-Added-configurations-for-xM-Rev-A-board.patch b/recipes/u-boot/u-boot-git/beagleboard/0038-Added-configurations-for-xM-Rev-A-board.patch deleted file mode 100644 index 914cae2a2b..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0038-Added-configurations-for-xM-Rev-A-board.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 94462a5c200adbad2c4fc47d7fc0ca24aeb14a2a Mon Sep 17 00:00:00 2001 -From: Jason Kridner -Date: Wed, 5 May 2010 14:53:49 -0500 -Subject: [PATCH 38/50] Added configurations for xM Rev A board - -This defaults to "on" condition for USB and DVI. May want to revise for -power savings. ---- - board/ti/beagle/beagle.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h -index 7774855..cb7fd1c 100644 ---- a/board/ti/beagle/beagle.h -+++ b/board/ti/beagle/beagle.h -@@ -389,6 +389,10 @@ const omap3_sysinfo sysinfo = { - MUX_VAL(CP(UART2_TX), (IDIS | PTD | DIS | M0)) /*UART2_TX*/ - - #define MUX_BEAGLE_XM() \ -+ MUX_VAL(CP(GPMC_NCS5), (IDIS | PTD | EN | M4)) /*GPIO_56 - USB HUB reset*/\ -+ MUX_VAL(CP(GPMC_WAIT0), (IDIS | PTU | EN | M4)) /*GPIO_63 - P8 USB HUB nreset*/\ -+ MUX_VAL(CP(MMC1_DAT7), (IDIS | PTU | EN | M4)) /*GPIO_129 - DVI enable*/\ -+ MUX_VAL(CP(HDQ_SIO), (IDIS | PTU | EN | M4)) /*GPIO_170 - P8 DVI enable*/\ - MUX_VAL(CP(MCBSP3_DX), (IEN | PTD | DIS | M4)) /*GPIO_140*/\ - MUX_VAL(CP(MCBSP3_DR), (IEN | PTD | DIS | M4)) /*GPIO_142*/\ - MUX_VAL(CP(MCBSP3_CLKX), (IEN | PTD | DIS | M4)) /*GPIO_141*/\ --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0039-OMAP3-beagle-setenv-beaglerev-for-AxBx-Cx-xMA-for-be.patch b/recipes/u-boot/u-boot-git/beagleboard/0039-OMAP3-beagle-setenv-beaglerev-for-AxBx-Cx-xMA-for-be.patch deleted file mode 100644 index c1b2e35690..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0039-OMAP3-beagle-setenv-beaglerev-for-AxBx-Cx-xMA-for-be.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4b5bb4a7656dc1c4a1b985b6f5454c58ad060112 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Thu, 3 Jun 2010 19:50:57 +0200 -Subject: [PATCH 39/50] OMAP3: beagle: setenv beaglerev for AxBx/Cx/xMA for better bootscripts - ---- - board/ti/beagle/beagle.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index 556e995..cdba3dd 100644 ---- a/board/ti/beagle/beagle.c -+++ b/board/ti/beagle/beagle.c -@@ -221,14 +221,17 @@ int misc_init_r(void) - case REVISION_AXBX: - printf("Beagle Rev Ax/Bx\n"); - setenv("mpurate", "600"); -+ setenv("beaglerev", "AxBx"); - break; - case REVISION_CX: - printf("Beagle Rev C1/C2/C3\n"); - MUX_BEAGLE_C(); - setenv("mpurate", "600"); -+ setenv("beaglerev", "Cx"); - break; - case REVISION_C4: - printf("Beagle Rev C4\n"); -+ setenv("beaglerev", "Cx"); - MUX_BEAGLE_C(); - /* Set VAUX2 to 1.8V for EHCI PHY */ - twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED, -@@ -239,6 +242,7 @@ int misc_init_r(void) - break; - case REVISION_XM: - printf("Beagle xM Rev A\n"); -+ setenv("beaglerev", "xMA"); - MUX_BEAGLE_XM(); - /* Set VAUX2 to 1.8V for EHCI PHY */ - twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED, --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0040-OMAP-mmc-add-support-for-second-and-third-mmc-channe.patch b/recipes/u-boot/u-boot-git/beagleboard/0040-OMAP-mmc-add-support-for-second-and-third-mmc-channe.patch deleted file mode 100644 index 9f09e0fa22..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0040-OMAP-mmc-add-support-for-second-and-third-mmc-channe.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 0dd14c6a6f40cb47fd8517e9e9d48f0a119e9aa9 Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Thu, 29 Apr 2010 10:28:14 -0700 -Subject: [PATCH 40/50] OMAP: mmc: add support for second and third mmc channels - -Boards wishing to use this feature should define CONFIG_SYS_MMC_SET_DEV - -Signed-off-by: Jason Kridner ---- - drivers/mmc/omap3_mmc.c | 39 +++++++++++++++++++++++++++- - include/asm-arm/arch-omap3/mmc_host_def.h | 15 +++++++++-- - 2 files changed, 49 insertions(+), 5 deletions(-) - -diff --git a/drivers/mmc/omap3_mmc.c b/drivers/mmc/omap3_mmc.c -index 96c0e65..bf650ba 100644 ---- a/drivers/mmc/omap3_mmc.c -+++ b/drivers/mmc/omap3_mmc.c -@@ -52,7 +52,27 @@ const unsigned short mmc_transspeed_val[15][4] = { - - mmc_card_data cur_card_data; - static block_dev_desc_t mmc_blk_dev; --static hsmmc_t *mmc_base = (hsmmc_t *)OMAP_HSMMC_BASE; -+static hsmmc_t *mmc_base = (hsmmc_t *)OMAP_HSMMC1_BASE; -+ -+unsigned char mmc_set_dev(int dev) -+{ -+ switch (dev) { -+ case 1: -+ mmc_base = (hsmmc_t *)OMAP_HSMMC1_BASE; -+ break; -+ case 2: -+ mmc_base = (hsmmc_t *)OMAP_HSMMC2_BASE; -+ break; -+ case 3: -+ mmc_base = (hsmmc_t *)OMAP_HSMMC3_BASE; -+ break; -+ default: -+ mmc_base = (hsmmc_t *)OMAP_HSMMC1_BASE; -+ return 1; -+ } -+ -+ return 0; -+} - - block_dev_desc_t *mmc_get_dev(int dev) - { -@@ -62,6 +82,7 @@ block_dev_desc_t *mmc_get_dev(int dev) - unsigned char mmc_board_init(void) - { - t2_t *t2_base = (t2_t *)T2_BASE; -+ struct prcm *prcm_base = (struct prcm *)PRCM_BASE; - - #if defined(CONFIG_TWL4030_POWER) - twl4030_power_mmc_init(); -@@ -74,6 +95,17 @@ unsigned char mmc_board_init(void) - writel(readl(&t2_base->devconf0) | MMCSDIO1ADPCLKISEL, - &t2_base->devconf0); - -+ writel(readl(&t2_base->devconf1) | MMCSDIO2ADPCLKISEL, -+ &t2_base->devconf1); -+ -+ writel(readl(&prcm_base->fclken1_core) | -+ EN_MMC1 | EN_MMC2 | EN_MMC3, -+ &prcm_base->fclken1_core); -+ -+ writel(readl(&prcm_base->iclken1_core) | -+ EN_MMC1 | EN_MMC2 | EN_MMC3, -+ &prcm_base->iclken1_core); -+ - return 1; - } - -@@ -512,8 +544,11 @@ unsigned long mmc_bread(int dev_num, unsigned long blknr, lbaint_t blkcnt, - return 1; - } - --int mmc_legacy_init(int verbose) -+int mmc_legacy_init(int dev) - { -+ if (mmc_set_dev(dev) != 0) -+ return 1; -+ - if (configure_mmc(&cur_card_data) != 1) - return 1; - -diff --git a/include/asm-arm/arch-omap3/mmc_host_def.h b/include/asm-arm/arch-omap3/mmc_host_def.h -index aa751c9..43dd705 100644 ---- a/include/asm-arm/arch-omap3/mmc_host_def.h -+++ b/include/asm-arm/arch-omap3/mmc_host_def.h -@@ -29,13 +29,20 @@ - #define T2_BASE 0x48002000 - - typedef struct t2 { -- unsigned char res1[0x274]; -+ unsigned char res1[0x274]; /* 0x000 */ - unsigned int devconf0; /* 0x274 */ -- unsigned char res2[0x2A8]; -+ unsigned char res2[0x060]; /* 0x278 */ -+ unsigned int devconf1; /* 0x2D8 */ -+ unsigned char res3[0x244]; /* 0x2DC */ - unsigned int pbias_lite; /* 0x520 */ - } t2_t; - - #define MMCSDIO1ADPCLKISEL (1 << 24) -+#define MMCSDIO2ADPCLKISEL (1 << 6) -+ -+#define EN_MMC1 (1 << 24) -+#define EN_MMC2 (1 << 25) -+#define EN_MMC3 (1 << 30) - - #define PBIASLITEPWRDNZ0 (1 << 1) - #define PBIASSPEEDCTRL0 (1 << 2) -@@ -44,7 +51,9 @@ typedef struct t2 { - /* - * OMAP HSMMC register definitions - */ --#define OMAP_HSMMC_BASE 0x4809C000 -+#define OMAP_HSMMC1_BASE 0x4809C000 -+#define OMAP_HSMMC2_BASE 0x480B4000 -+#define OMAP_HSMMC3_BASE 0x480AD000 - - typedef struct hsmmc { - unsigned char res1[0x10]; --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0041-OMAP3-Beagle-enable-support-for-second-and-third-mmc.patch b/recipes/u-boot/u-boot-git/beagleboard/0041-OMAP3-Beagle-enable-support-for-second-and-third-mmc.patch deleted file mode 100644 index 2449ab20a5..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0041-OMAP3-Beagle-enable-support-for-second-and-third-mmc.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 8da9e2bac6daf2d61d7ca9d689790fc9ce5de9cb Mon Sep 17 00:00:00 2001 -From: Steve Sakoman -Date: Fri, 7 May 2010 07:40:26 -0700 -Subject: [PATCH 41/50] OMAP3: Beagle: enable support for second and third mmc channels - -Based on 629a01965677e680ffa1fe76579ace7f69dd45b9, but removed BOOTDELAY change. ---- - include/configs/omap3_beagle.h | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h -index 8ad52aa..e4c88f2 100644 ---- a/include/configs/omap3_beagle.h -+++ b/include/configs/omap3_beagle.h -@@ -95,6 +95,7 @@ - 115200} - #define CONFIG_MMC 1 - #define CONFIG_OMAP3_MMC 1 -+#define CONFIG_SYS_MMC_SET_DEV 1 - #define CONFIG_DOS_PARTITION 1 - - /* DDR - I use Micron DDR */ -@@ -194,6 +195,7 @@ - "vram=12M\0" \ - "dvimode=640x480MR-16@60\0" \ - "defaultdisplay=dvi\0" \ -+ "mmcdev=1\0" \ - "mmcroot=/dev/mmcblk0p2 rw\0" \ - "mmcrootfstype=ext3 rootwait\0" \ - "nandroot=/dev/mtdblock4 rw\0" \ -@@ -214,10 +216,10 @@ - "omapdss.def_disp=${defaultdisplay} " \ - "root=${nandroot} " \ - "rootfstype=${nandrootfstype}\0" \ -- "loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \ -+ "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ - "bootscript=echo Running bootscript from mmc ...; " \ - "source ${loadaddr}\0" \ -- "loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \ -+ "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "bootm ${loadaddr}\0" \ -@@ -227,7 +229,7 @@ - "bootm ${loadaddr}\0" \ - - #define CONFIG_BOOTCOMMAND \ -- "if mmc init; then " \ -+ "if mmc init ${mmcdev}; then " \ - "if run loadbootscript; then " \ - "run bootscript; " \ - "else " \ --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0043-Add-led-command.patch b/recipes/u-boot/u-boot-git/beagleboard/0043-Add-led-command.patch deleted file mode 100644 index 8d19d1ed2a..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0043-Add-led-command.patch +++ /dev/null @@ -1,256 +0,0 @@ -From 1fc5c28bc260c72b4f9cefdf55bfd10504916457 Mon Sep 17 00:00:00 2001 -From: Jason Kridner -Date: Thu, 20 May 2010 05:41:26 -0500 -Subject: [PATCH 43/50] Add 'led' command - -This patch allows any board implementing the coloured LED API -to control the LEDs from the console. - -led [green | yellow | red | all ] [ on | off ] - -or - -led [ 1 | 2 | 3 | all ] [ on | off ] - -Adds configuration item CONFIG_CMD_LED enabling the command. - -Partially based on patch from Ulf Samuelsson: -http://www.mail-archive.com/u-boot@lists.denx.de/msg09593.html. -(cherry picked from commit aaf47f8d6af81393b7d3275d69b5dbdf07a3d6fb) -(cherry picked from commit 3d314bf59a48c2ee93d06d50b81f109af6a6c1ec) - -Signed-off-by: Jason Kridner ---- - common/Makefile | 1 + - common/cmd_led.c | 207 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 208 insertions(+), 0 deletions(-) - create mode 100644 common/cmd_led.c - -diff --git a/common/Makefile b/common/Makefile -index dbf7a05..1d717ca 100644 ---- a/common/Makefile -+++ b/common/Makefile -@@ -106,6 +106,7 @@ COBJS-$(CONFIG_CMD_IRQ) += cmd_irq.o - COBJS-$(CONFIG_CMD_ITEST) += cmd_itest.o - COBJS-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o - COBJS-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o -+COBJS-$(CONFIG_CMD_LED) += cmd_led.o - COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o - COBJS-y += cmd_load.o - COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o -diff --git a/common/cmd_led.c b/common/cmd_led.c -new file mode 100644 -index 0000000..3b7b534 ---- /dev/null -+++ b/common/cmd_led.c -@@ -0,0 +1,207 @@ -+/* -+ * (C) Copyright 2010 -+ * Jason Kridner -+ * -+ * Based on cmd_led.c patch from: -+ * http://www.mail-archive.com/u-boot@lists.denx.de/msg06873.html -+ * (C) Copyright 2008 -+ * Ulf Samuelsson -+ * -+ * 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 -+ */ -+ -+/* -+ * This file provides a shell like 'test' function to return -+ * true/false from an integer or string compare of two memory -+ * locations or a location and a scalar/literal. -+ * A few parts were lifted from bash 'test' command -+ */ -+ -+#include -+#include -+#include -+#include -+ -+int do_led ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] ) -+{ -+#ifdef CONFIG_BOARD_SPECIFIC_LED -+ led_id_t mask; -+#endif -+ int state; -+ -+ /* Validate arguments */ -+ if ((argc != 3)){ -+ printf("Usage:\n%s\n", cmdtp->usage); -+ return 1; -+ } -+ -+ if (strcmp(argv[2], "off") == 0) { -+ state = 0; -+ } else if (strcmp(argv[2], "on") == 0) { -+ state = 1; -+ } else { -+ printf ("Usage:\n%s\n", cmdtp->usage); -+ return 1; -+ } -+ -+#if defined(STATUS_LED_BIT) && defined(CONFIG_BOARD_SPECIFIC_LED) -+ if (strcmp(argv[1], "0") == 0) { -+ mask = STATUS_LED_BIT; -+ __led_set(mask, state); -+ } -+ else -+#endif -+#if defined(STATUS_LED_BIT1) && defined(CONFIG_BOARD_SPECIFIC_LED) -+ if (strcmp(argv[1], "1") == 0) { -+ mask = STATUS_LED_BIT1; -+ __led_set(mask, state); -+ } -+ else -+#endif -+#if defined(STATUS_LED_BIT2) && defined(CONFIG_BOARD_SPECIFIC_LED) -+ if (strcmp(argv[1], "2") == 0) { -+ mask = STATUS_LED_BIT2; -+ __led_set(mask, state); -+ } -+ else -+#endif -+#if defined(STATUS_LED_BIT3) && defined(CONFIG_BOARD_SPECIFIC_LED) -+ if (strcmp(argv[1], "3") == 0) { -+ mask = STATUS_LED_BIT3; -+ __led_set(mask, state); -+ } -+ else -+#endif -+#ifdef STATUS_LED_RED -+ if (strcmp(argv[1], "red") == 0) { -+ if (state == 0) -+ red_LED_off(); -+ else -+ red_LED_on(); -+ } -+ else -+#endif -+#ifdef STATUS_LED_GREEN -+ if (strcmp(argv[1], "green") == 0) { -+ if (state == 0) -+ green_LED_off(); -+ else -+ green_LED_on(); -+ } -+ else -+#endif -+#ifdef STATUS_LED_YELLOW -+ if (strcmp(argv[1], "yellow") == 0) { -+ if (state == 0) -+ yellow_LED_off(); -+ else -+ yellow_LED_on(); -+ } -+ else -+#endif -+#ifdef STATUS_LED_BLUE -+ if (strcmp(argv[1], "blue") == 0) { -+ if (state == 0) -+ blue_LED_off(); -+ else -+ blue_LED_on(); -+ } -+ else -+#endif -+ if (strcmp(argv[1], "all") == 0) { -+ mask = 0 -+#if defined(STATUS_LED_BIT) && defined(CONFIG_BOARD_SPECIFIC_LED) -+ | STATUS_LED_BIT -+#endif -+#if defined(STATUS_LED_BIT1) && defined(CONFIG_BOARD_SPECIFIC_LED) -+ | STATUS_LED_BIT1 -+#endif -+#if defined(STATUS_LED_BIT2) && defined(CONFIG_BOARD_SPECIFIC_LED) -+ | STATUS_LED_BIT2 -+#endif -+#if defined(STATUS_LED_BIT3) && defined(CONFIG_BOARD_SPECIFIC_LED) -+ | STATUS_LED_BIT3 -+#endif -+ ; -+#ifdef CONFIG_BOARD_SPECIFIC_LED -+ __led_set(mask, state); -+#endif -+#ifdef STATUS_LED_RED -+ if (state == 0) -+ red_LED_off(); -+ else -+ red_LED_on(); -+#endif -+#ifdef STATUS_LED_GREEN -+ if (state == 0) -+ green_LED_off(); -+ else -+ green_LED_on(); -+#endif -+#ifdef STATUS_LED_YELLOW -+ if (state == 0) -+ yellow_LED_off(); -+ else -+ yellow_LED_on(); -+#endif -+#ifdef STATUS_LED_BLUE -+ if (state == 0) -+ blue_LED_off(); -+ else -+ blue_LED_on(); -+#endif -+ } else { -+ printf ("Usage:\n%s\n", cmdtp->usage); -+ return 1; -+ } -+ -+ return 0; -+} -+ -+U_BOOT_CMD( -+ led, 3, 1, do_led, -+ "led\t- [" -+#if defined(STATUS_LED_BIT) && defined(CONFIG_BOARD_SPECIFIC_LED) -+ "0|" -+#endif -+#if defined(STATUS_LED_BIT1) && defined(CONFIG_BOARD_SPECIFIC_LED) -+ "1|" -+#endif -+#if defined(STATUS_LED_BIT2) && defined(CONFIG_BOARD_SPECIFIC_LED) -+ "2|" -+#endif -+#if defined(STATUS_LED_BIT3) && defined(CONFIG_BOARD_SPECIFIC_LED) -+ "3|" -+#endif -+#ifdef STATUS_LED_GREEN -+ "green|" -+#endif -+#ifdef STATUS_LED_YELLOW -+ "yellow|" -+#endif -+#ifdef STATUS_LED_RED -+ "red|" -+#endif -+#ifdef STATUS_LED_BLUE -+ "blue|" -+#endif -+ "all] [on|off]\n", -+ "led [led_name] [on|off] sets or clears led(s)\n" -+); -+ --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0044-BeagleBoard-Enabled-LEDs.patch b/recipes/u-boot/u-boot-git/beagleboard/0044-BeagleBoard-Enabled-LEDs.patch deleted file mode 100644 index b94f58c7cb..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0044-BeagleBoard-Enabled-LEDs.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 40049e97a5a97d597f8754ff1b39d931053eb465 Mon Sep 17 00:00:00 2001 -From: Jason Kridner -Date: Wed, 19 May 2010 05:14:43 -0500 -Subject: [PATCH 44/50] BeagleBoard: Enabled LEDs - -Added LED driver using status_led. USR0 is set to monitor the boot -status. USR1 is set to be the GREEN LED. - -Signed-off-by: Jason Kridner ---- - include/configs/omap3_beagle.h | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h -index e4c88f2..053f5df 100644 ---- a/include/configs/omap3_beagle.h -+++ b/include/configs/omap3_beagle.h -@@ -98,6 +98,18 @@ - #define CONFIG_SYS_MMC_SET_DEV 1 - #define CONFIG_DOS_PARTITION 1 - -+/* Status LED */ -+#define CONFIG_STATUS_LED 1 -+#define CONFIG_BOARD_SPECIFIC_LED 1 -+#define STATUS_LED_BIT 0x01 -+#define STATUS_LED_STATE STATUS_LED_ON -+#define STATUS_LED_PERIOD (CONFIG_SYS_HZ / 2) -+#define STATUS_LED_BIT1 0x02 -+#define STATUS_LED_STATE1 STATUS_LED_ON -+#define STATUS_LED_PERIOD1 (CONFIG_SYS_HZ / 2) -+#define STATUS_LED_BOOT STATUS_LED_BIT -+#define STATUS_LED_GREEN STATUS_LED_BIT1 -+ - /* DDR - I use Micron DDR */ - #define CONFIG_OMAP3_MICRON_DDR 1 - -@@ -138,6 +150,7 @@ - #define CONFIG_CMD_I2C /* I2C serial bus support */ - #define CONFIG_CMD_MMC /* MMC support */ - #define CONFIG_CMD_NAND /* NAND support */ -+#define CONFIG_CMD_LED /* LED support */ - #define CONFIG_VIDEO_OMAP3 /* DSS Support */ - - #undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0046-BeagleBoard-Add-CONFIG_SYS_MEMTEST_SCRATCH.patch b/recipes/u-boot/u-boot-git/beagleboard/0046-BeagleBoard-Add-CONFIG_SYS_MEMTEST_SCRATCH.patch deleted file mode 100644 index 79723e4d27..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0046-BeagleBoard-Add-CONFIG_SYS_MEMTEST_SCRATCH.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 631cd4e4a02faa5726c058626390bee97188f456 Mon Sep 17 00:00:00 2001 -From: Steven Kipisz -Date: Fri, 4 Jun 2010 10:31:04 -0500 -Subject: [PATCH 46/50] BeagleBoard: Add CONFIG_SYS_MEMTEST_SCRATCH - -Add CONFIG_SYS_MEMTEST_SCRATCH to point to a scratch memory area. - -Signed-off-by: Jason Kridner ---- - include/configs/omap3_beagle.h | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h -index 053f5df..b265b0c 100644 ---- a/include/configs/omap3_beagle.h -+++ b/include/configs/omap3_beagle.h -@@ -269,10 +269,11 @@ - /* Boot Argument Buffer Size */ - #define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE) - --#define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0) /* memtest */ -- /* works on */ --#define CONFIG_SYS_MEMTEST_END (OMAP34XX_SDRC_CS0 + \ -- 0x01F00000) /* 31MB */ -+#define CONFIG_SYS_ALT_MEMTEST 1 -+#define CONFIG_SYS_MEMTEST_START (0x82000000) /* memtest */ -+ /* defaults */ -+#define CONFIG_SYS_MEMTEST_END (0x87FFFFFF) /* 128MB */ -+#define CONFIG_SYS_MEMTEST_SCRATCH (0x81000000) /* dummy address */ - - #define CONFIG_SYS_LOAD_ADDR (OMAP34XX_SDRC_CS0) /* default */ - /* load address */ --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0047-BeagleBoard-Adjust-boot-command-on-USER-button.patch b/recipes/u-boot/u-boot-git/beagleboard/0047-BeagleBoard-Adjust-boot-command-on-USER-button.patch deleted file mode 100644 index 2036e1beb2..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0047-BeagleBoard-Adjust-boot-command-on-USER-button.patch +++ /dev/null @@ -1,115 +0,0 @@ -From d3f9ba7264111551ea11f33aadbecc15c87a4332 Mon Sep 17 00:00:00 2001 -From: Jason Kridner -Date: Wed, 21 Jul 2010 08:47:59 -0500 -Subject: [PATCH 47/50] BeagleBoard: Adjust boot command on USER button - -When the USER button is pressed, the default boot command will attempt -to load user.scr. If that fails, it will try to load a ramdisk image. - -This version also sets the rootfstype and assumes that the userbutton -command returns success (0) when the button is pressed. It also really -attempts to load the user.scr file. ---- - include/configs/omap3_beagle.h | 51 ++++++++++++++++++++++++++++++++++----- - 1 files changed, 44 insertions(+), 7 deletions(-) - -diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h -index b265b0c..1a76004 100644 ---- a/include/configs/omap3_beagle.h -+++ b/include/configs/omap3_beagle.h -@@ -200,9 +200,12 @@ - #define CONFIG_BOOTDELAY 3 - - #define CONFIG_EXTRA_ENV_SETTINGS \ -- "loadaddr=0x82000000\0" \ -+ "loadaddr=0x80200000\0" \ -+ "rdaddr=0x81600000\0" \ - "usbtty=cdc_acm\0" \ - "console=ttyS2,115200n8\0" \ -+ "optargs=\0" \ -+ "bootscr=boot.scr\0" \ - "mpurate=500\0" \ - "buddy=none\0" \ - "vram=12M\0" \ -@@ -213,7 +216,10 @@ - "mmcrootfstype=ext3 rootwait\0" \ - "nandroot=/dev/mtdblock4 rw\0" \ - "nandrootfstype=jffs2\0" \ -+ "ramroot=/dev/ram0 rw\0" \ -+ "ramrootfstype=ext2\0" \ - "mmcargs=setenv bootargs console=${console} " \ -+ "${optargs} " \ - "mpurate=${mpurate} " \ - "buddy=${buddy} "\ - "vram=${vram} " \ -@@ -222,6 +228,7 @@ - "root=${mmcroot} " \ - "rootfstype=${mmcrootfstype}\0" \ - "nandargs=setenv bootargs console=${console} " \ -+ "${optargs} " \ - "mpurate=${mpurate} " \ - "buddy=${buddy} "\ - "vram=${vram} " \ -@@ -229,7 +236,18 @@ - "omapdss.def_disp=${defaultdisplay} " \ - "root=${nandroot} " \ - "rootfstype=${nandrootfstype}\0" \ -- "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ -+ "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} ${bootscr}\0" \ -+ "ramargs=setenv bootargs console=${console} " \ -+ "${optargs} " \ -+ "mpurate=${mpurate} " \ -+ "buddy=${buddy} "\ -+ "vram=${vram} " \ -+ "omapfb.mode=dvi:${dvimode} " \ -+ "omapdss.def_disp=${defaultdisplay} " \ -+ "root=${ramroot} rw ramdisk_size=65536 " \ -+ "initrd=${rdaddr},64M " \ -+ "rootfstype=${ramrootfstype}\0" \ -+ "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ - "bootscript=echo Running bootscript from mmc ...; " \ - "source ${loadaddr}\0" \ - "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ -@@ -240,15 +258,34 @@ - "run nandargs; " \ - "nand read ${loadaddr} 280000 400000; " \ - "bootm ${loadaddr}\0" \ -+ "ramboot=echo Booting from ramdisk ...; " \ -+ "run ramargs; " \ -+ "bootm ${loadaddr}\0" \ - - #define CONFIG_BOOTCOMMAND \ - "if mmc init ${mmcdev}; then " \ -- "if run loadbootscript; then " \ -- "run bootscript; " \ -+ "if userbutton; then " \ -+ "setenv bootscr user.scr;" \ -+ "if run loadbootscript; then " \ -+ "run bootscript; " \ -+ "else " \ -+ "if run loaduimage; then " \ -+ "if run loadramdisk; then " \ -+ "run ramboot; " \ -+ "else " \ -+ "run mmcboot; " \ -+ "fi; " \ -+ "fi; " \ -+ "fi; " \ - "else " \ -- "if run loaduimage; then " \ -- "run mmcboot; " \ -- "else run nandboot; " \ -+ "setenv bootscr boot.scr; " \ -+ "if run loadbootscript; then " \ -+ "run bootscript; " \ -+ "else " \ -+ "if run loaduimage; then " \ -+ "run mmcboot; " \ -+ "else run nandboot; " \ -+ "fi; " \ - "fi; " \ - "fi; " \ - "else run nandboot; fi" --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0048-BeagleBoard-Enable-pullups-on-i2c2.patch b/recipes/u-boot/u-boot-git/beagleboard/0048-BeagleBoard-Enable-pullups-on-i2c2.patch deleted file mode 100644 index 25cf7b1448..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0048-BeagleBoard-Enable-pullups-on-i2c2.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 35e971eea9c9d9cb690da0509e0f8a48a2cb1269 Mon Sep 17 00:00:00 2001 -From: Steve Kipisz -Date: Thu, 5 Aug 2010 10:36:07 -0500 -Subject: [PATCH 48/50] BeagleBoard: Enable pullups on i2c2. - ---- - board/ti/beagle/beagle.c | 2 ++ - include/asm-arm/arch-omap3/omap3.h | 9 +++++++++ - 2 files changed, 11 insertions(+), 0 deletions(-) - -diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index 66df719..ee6bad2 100644 ---- a/board/ti/beagle/beagle.c -+++ b/board/ti/beagle/beagle.c -@@ -171,6 +171,8 @@ int misc_init_r(void) - struct gpio *gpio5_base = (struct gpio *)OMAP34XX_GPIO5_BASE; - struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE; - -+ /* Enable i22 pullup resisters */ -+ *(ulong *)(CONTROL_PROG_IO1) &= ~(PRG_I2C2_PULLUPRESX); - beagle_identify(); - - printf("\nProbing for expansion boards, if none are connected you'll see a harmless I2C error.\n\n"); -diff --git a/include/asm-arm/arch-omap3/omap3.h b/include/asm-arm/arch-omap3/omap3.h -index 3957c79..1860dff 100644 ---- a/include/asm-arm/arch-omap3/omap3.h -+++ b/include/asm-arm/arch-omap3/omap3.h -@@ -50,6 +50,15 @@ - /* CONTROL */ - #define OMAP34XX_CTRL_BASE (OMAP34XX_L4_IO_BASE + 0x2000) - -+/* Signal Integrity Parameter Control Registers */ -+#define CONTROL_PROG_IO0 0x48002444 -+#define CONTROL_PROG_IO1 0x48002448 -+#define CONTROL_PROG_IO2 0x48002408 -+#define CONTROL_PROG_IO_WKUP1 0x48002A80 -+ -+/* Bit definition for CONTROL_PROG_IO1 */ -+#define PRG_I2C2_PULLUPRESX 0x00000001 -+ - /* UART */ - #define OMAP34XX_UART1 (OMAP34XX_L4_IO_BASE + 0x6a000) - #define OMAP34XX_UART2 (OMAP34XX_L4_IO_BASE + 0x6c000) --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0049-BeagleBoard-Add-camera-to-default-bootargs.patch b/recipes/u-boot/u-boot-git/beagleboard/0049-BeagleBoard-Add-camera-to-default-bootargs.patch deleted file mode 100644 index 3c43a7d5b0..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0049-BeagleBoard-Add-camera-to-default-bootargs.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 0a49d60caf30738f13b60a71e740e28f4e7af902 Mon Sep 17 00:00:00 2001 -From: Jason Kridner -Date: Thu, 5 Aug 2010 13:54:12 -0500 -Subject: [PATCH 49/50] BeagleBoard: Add camera to default bootargs - -Signed-off-by: Jason Kridner ---- - include/configs/omap3_beagle.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h -index 1a76004..48ad805 100644 ---- a/include/configs/omap3_beagle.h -+++ b/include/configs/omap3_beagle.h -@@ -208,6 +208,7 @@ - "bootscr=boot.scr\0" \ - "mpurate=500\0" \ - "buddy=none\0" \ -+ "camera=lbcm3m1\0" \ - "vram=12M\0" \ - "dvimode=640x480MR-16@60\0" \ - "defaultdisplay=dvi\0" \ -@@ -222,6 +223,7 @@ - "${optargs} " \ - "mpurate=${mpurate} " \ - "buddy=${buddy} "\ -+ "camera=${camera} "\ - "vram=${vram} " \ - "omapfb.mode=dvi:${dvimode} " \ - "omapdss.def_disp=${defaultdisplay} " \ -@@ -231,6 +233,7 @@ - "${optargs} " \ - "mpurate=${mpurate} " \ - "buddy=${buddy} "\ -+ "camera=${camera} "\ - "vram=${vram} " \ - "omapfb.mode=dvi:${dvimode} " \ - "omapdss.def_disp=${defaultdisplay} " \ -@@ -241,6 +244,7 @@ - "${optargs} " \ - "mpurate=${mpurate} " \ - "buddy=${buddy} "\ -+ "camera=${camera} "\ - "vram=${vram} " \ - "omapfb.mode=dvi:${dvimode} " \ - "omapdss.def_disp=${defaultdisplay} " \ --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0050-BeagleBoard-move-ramdisk-parameters.patch b/recipes/u-boot/u-boot-git/beagleboard/0050-BeagleBoard-move-ramdisk-parameters.patch deleted file mode 100644 index 3e79a08228..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0050-BeagleBoard-move-ramdisk-parameters.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 21738fa5ae05dd5060cf755ac0460f5d1f27e910 Mon Sep 17 00:00:00 2001 -From: Jason Kridner -Date: Wed, 11 Aug 2010 14:50:38 -0500 -Subject: [PATCH 50/50] BeagleBoard: move ramdisk parameters - -This will make it easier to reprogram the ramdisk size. - -Signed-off-by: Jason Kridner ---- - include/configs/omap3_beagle.h | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h -index 48ad805..4f5c1d4 100644 ---- a/include/configs/omap3_beagle.h -+++ b/include/configs/omap3_beagle.h -@@ -217,7 +217,7 @@ - "mmcrootfstype=ext3 rootwait\0" \ - "nandroot=/dev/mtdblock4 rw\0" \ - "nandrootfstype=jffs2\0" \ -- "ramroot=/dev/ram0 rw\0" \ -+ "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \ - "ramrootfstype=ext2\0" \ - "mmcargs=setenv bootargs console=${console} " \ - "${optargs} " \ -@@ -248,8 +248,7 @@ - "vram=${vram} " \ - "omapfb.mode=dvi:${dvimode} " \ - "omapdss.def_disp=${defaultdisplay} " \ -- "root=${ramroot} rw ramdisk_size=65536 " \ -- "initrd=${rdaddr},64M " \ -+ "root=${ramroot} " \ - "rootfstype=${ramrootfstype}\0" \ - "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ - "bootscript=echo Running bootscript from mmc ...; " \ --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0051-add-support-for-beagleboardtoys-expansionboards.patch b/recipes/u-boot/u-boot-git/beagleboard/0051-add-support-for-beagleboardtoys-expansionboards.patch deleted file mode 100644 index 3f75a60ba3..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0051-add-support-for-beagleboardtoys-expansionboards.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 05c4ef3b0963cef095075486820b030226ced7c3 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Tue, 8 Feb 2011 12:02:46 +0100 -Subject: [PATCH 51/51] add support for beagleboardtoys expansionboards - -Signed-off-by: Koen Kooi ---- - board/ti/beagle/beagle.c | 15 +++++++++++++++ - board/ti/beagle/beagle.h | 10 ++++++++++ - 2 files changed, 25 insertions(+), 0 deletions(-) - -diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index ee6bad2..fdd9c09 100644 ---- a/board/ti/beagle/beagle.c -+++ b/board/ti/beagle/beagle.c -@@ -62,12 +62,16 @@ static struct { - #define HYR_VENDORID 0x0400 - #define MENTOREL_VENDORID 0x0500 - #define KBADC_VENDORID 0x0600 -+#define BBTOYS_VENDORID 0x0B00 - - #define TINCANTOOLS_ZIPPY 0x01000100 - #define TINCANTOOLS_ZIPPY2 0x02000100 - #define TINCANTOOLS_TRAINER 0x04000100 - #define TINCANTOOLS_SHOWDOG 0x03000100 - #define KBADC_BEAGLEFPGA 0x01000600 -+#define BBTOYS_WIFI 0x01000B00 -+#define BBTOYS_VGA 0x02000B00 -+#define BBTOYS_LCD 0x03000B00 - - #define BEAGLE_NO_EEPROM 0xffffffff - -@@ -209,6 +213,17 @@ int misc_init_r(void) - MUX_KBADC_BEAGLEFPGA(); - setenv("buddy", "beaglefpga"); - break; -+ case BBTOYS_WIFI: -+ printf("Recognized Beagleboardtoys wifi board\n"); -+ MUX_BBTOYS_WIFI() -+ setenv("buddy", "bbtoys-wifi"); -+ break;; -+ case BBTOYS_VGA: -+ printf("Recognized Beagleboardtoys VGA board\n"); -+ break;; -+ case BBTOYS_LCD: -+ printf("Recognized Beagleboardtoys LCD board\n"); -+ break;; - case BEAGLE_NO_EEPROM: - printf("No EEPROM on expansion board\n"); - setenv("buddy", "none"); -diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h -index cb7fd1c..2dc6ee6 100644 ---- a/board/ti/beagle/beagle.h -+++ b/board/ti/beagle/beagle.h -@@ -459,6 +459,16 @@ const omap3_sysinfo sysinfo = { - MUX_VAL(CP(MCBSP1_DR), (IEN | PTU | EN | M1)) /*MCSPI4_SOMI*/\ - MUX_VAL(CP(MCBSP1_FSX), (IDIS | PTU | DIS | M1)) /*MCSPI4_CS0*/\ - -+#define MUX_BBTOYS_WIFI() \ -+ MUX_VAL(CP(MMC2_CLK), (IEN | PTU | EN | M0)) /*MMC2_CLK*/\ -+ MUX_VAL(CP(MMC2_CMD), (IEN | PTU | EN | M0)) /*MMC2_CMD*/\ -+ MUX_VAL(CP(MMC2_DAT0), (IEN | PTU | EN | M0)) /*MMC2_DAT0*/\ -+ MUX_VAL(CP(MMC2_DAT1), (IEN | PTU | EN | M0)) /*MMC2_DAT1*/\ -+ MUX_VAL(CP(MMC2_DAT2), (IEN | PTU | EN | M0)) /*MMC2_DAT2*/\ -+ MUX_VAL(CP(MMC2_DAT3), (IEN | PTU | EN | M0)) /*MMC2_DAT3*/\ -+ MUX_VAL(CP(MMC2_DAT5), (IEN | PTU | EN | M4)) /*GPIO_137*/\ -+ MUX_VAL(CP(MMC2_DAT7), (IDIS | PTD | DIS | M4)) /*GPIO_139*/\ -+ - /* - * Display Configuration - */ --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 410e0b1ca3..69f0fe9c49 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -1,5 +1,5 @@ require u-boot.inc -PR = "r72" +PR = "r73" FILESPATHPKG =. "u-boot-git:" @@ -26,61 +26,25 @@ SRC_URI_append_bug20 = "file://bug-uboot.patch" SRC_URI_append_bug20 += "file://bug-video-setting.patch" SRC_URI_beagleboard = "git://www.denx.de/git/u-boot.git;protocol=git \ - file://0001-Enable-I2C-bus-switching.patch \ - file://0002-OMAP3-add-board-revision-detection-for-Overo.patch \ - file://0003-OMAP3-update-Beagle-revision-detection-to-recognize-.patch \ - file://0004-OMAP3-Set-VAUX2-to-1.8V-for-EHCI-PHY-on-Beagle-Rev-C.patch \ - file://0005-OMAP3-add-entry-for-rev-3.1.2-check-and-display-max-.patch \ - file://0006-OMAP3-add-mpurate-boot-arg-for-overo-and-beagle.patch \ - file://0007-OMAP3-detect-expansion-board-type-version-using-eepr.patch \ - file://0008-OMAP3-Overo-enable-config-eeprom-to-set-u-boot-env-v.patch \ - file://0009-OMAP3-Overo-enable-input-on-MMC1_CLK-and-MMC3_CLK-pi.patch \ - file://0010-OMAP3-Overo-set-CONFIG_SYS_I2C_SPEED-to-400Khz.patch \ - file://0011-OMAP3-trim-excessively-long-delays-in-i2c-driver.patch \ - file://0012-OMAP3-Overo-allow-expansion-boards-with-any-vendor-I.patch \ - file://0013-OMAP3-Overo-change-address-of-expansion-eeprom-to-0x.patch \ - file://0014-OMAP3-board.c-don-t-attempt-to-set-up-second-RAM-ban.patch \ - file://0015-OMAP3-mem.c-enhance-the-RAM-test.patch \ - file://0016-env_nand.c-fail-gracefully-if-no-nand-is-present.patch \ - file://0017-OMAP3-add-definitions-to-support-sysinfo-cpu-and-cpu.patch \ - file://0018-OMAP3-sys_info-update-cpu-detection-for-36XX-37XX.patch \ - file://0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch \ - file://0020-OMAP3-beagle-add-support-for-Beagle-xM.patch \ - file://0021-OMAP3-Beagle-Overo-remove-omapfb.debug-y-from-defaul.patch \ - file://0022-OMAP3-beagle-implement-expansionboard-detection-base.patch \ - file://0023-beagleboard-display-message-about-I2C-errors-being-e.patch \ - file://0024-beagleboard-fix-TCT-expansionboard-IDs.patch \ - file://0025-Add-DSS-driver-for-OMAP3.patch \ - file://0026-Enable-DSS-driver-for-Beagle.patch \ - file://0027-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch \ - file://0028-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch \ - file://0029-OMAP3-convert-setup_auxcr-to-pure-asm.patch \ - file://0030-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch \ - file://0031-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch \ - file://0032-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch \ - file://0033-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch \ - file://0034-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch \ - file://0035-OMAP3-Beagle-set-mpurate-to-1000-for-xM.patch \ - file://0036-OMAP3-Beagle-decrease-bootdelay-to-3-use-VGA-for-def.patch \ - file://0037-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch \ - file://0038-Added-configurations-for-xM-Rev-A-board.patch \ - file://0039-OMAP3-beagle-setenv-beaglerev-for-AxBx-Cx-xMA-for-be.patch \ - file://0040-OMAP-mmc-add-support-for-second-and-third-mmc-channe.patch \ - file://0041-OMAP3-Beagle-enable-support-for-second-and-third-mmc.patch \ - file://0042-BeagleBoard-Added-LED-driver.patch \ - file://0043-Add-led-command.patch \ - file://0044-BeagleBoard-Enabled-LEDs.patch \ - file://0045-BeagleBoard-Added-userbutton-command.patch \ - file://0046-BeagleBoard-Add-CONFIG_SYS_MEMTEST_SCRATCH.patch \ - file://0047-BeagleBoard-Adjust-boot-command-on-USER-button.patch \ - file://0048-BeagleBoard-Enable-pullups-on-i2c2.patch \ - file://0049-BeagleBoard-Add-camera-to-default-bootargs.patch \ - file://0050-BeagleBoard-move-ramdisk-parameters.patch \ - file://0051-add-support-for-beagleboardtoys-expansionboards.patch \ + file://0001-OMAP3-Beagle-Pin-Mux-initialization-glitch-fix.patch \ + file://0002-OMAP-Remove-omapfb.debug-y-from-Beagle-and-Overo-env.patch \ + file://0003-omap3_beagle-enable-the-use-of-a-plain-text-file-nam.patch \ + file://0004-OMAP3-BeagleBoard-Enable-pullups-on-i2c2.patch \ + file://0005-ARMV7-OMAP3-BeagleBoard-add-xM-rev-B-to-ID-table.patch \ + file://0006-OMAP3-BeagleBoard-add-more-expansionboard-IDs.patch \ + file://0007-OMAP3-Add-DSS-driver-for-OMAP3.patch \ + file://0008-BeagleBoard-Added-userbutton-command.patch \ + file://0009-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch \ + file://0010-Enable-DSS-driver-for-Beagle.patch \ + file://0011-Add-led-command.patch \ + file://0012-BeagleBoard-Added-LED-driver.patch \ + file://0013-OMAP3-BeagleBoard-updated-default-configuration.patch \ + file://0014-Corrected-LED-name-match-finding-avoiding-extraneous.patch \ + file://0016-BeagleBoard-Load-kernel-via-MMC-ext2-not-fat.patch \ file://fw_env.config \ " -SRCREV_beagleboard = "ca6e1c136ddb720c3bb2cc043b99f7f06bc46c55" -PV_beagleboard = "2010.03+${PR}+gitr${SRCREV}" +SRCREV_beagleboard = "c7977858dcf1f656cbe91ea0dc3cb9139c6a8cc8" +PV_beagleboard = "2011.02+${PR}+gitr${SRCREV}" SRCREV_calamari = "b80d30546e88c70985094d81297d449b2bc59033" From 3d2748fdeb0cd8c9b4bf80a35168c2962db041bd Mon Sep 17 00:00:00 2001 From: chase maupin Date: Thu, 17 Mar 2011 03:02:03 +0000 Subject: [PATCH 183/509] u-boot.inc: allow variable make targets * Later versions of u-boot sometimes have top level make targets such as u-boot.imx, u-boot.kwb, and for upcoming TI devices u-boot.ti. * These targets define different calls to the mkimage tool to change the images created, such as changing the load address. * This change allows recipes to change the default make target of "all" to something like u-boot.ti or u-boot.imx by setting the UBOOT_MAKE_TARGET variable. Signed-off-by: Chase Maupin Signed-off-by: Koen Kooi --- recipes/u-boot/u-boot.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/u-boot/u-boot.inc b/recipes/u-boot/u-boot.inc index 88c6a4d18f..ffd1e1eb74 100644 --- a/recipes/u-boot/u-boot.inc +++ b/recipes/u-boot/u-boot.inc @@ -16,6 +16,7 @@ UBOOT_MACHINE ?= "${MACHINE}_config" UBOOT_BINARY ?= "u-boot.bin" UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.bin" UBOOT_SYMLINK ?= "u-boot-${MACHINE}.bin" +UBOOT_MAKE_TARGET ?= "all" do_configure () { oe_runmake ${UBOOT_MACHINE} @@ -25,7 +26,7 @@ do_compile () { unset LDFLAGS unset CFLAGS unset CPPFLAGS - oe_runmake all + oe_runmake ${UBOOT_MAKE_TARGET} oe_runmake tools env HOSTCC="${CC}" } From 79c93770ece6c42883dc5b7a919317615aa6ac3c Mon Sep 17 00:00:00 2001 From: chase maupin Date: Thu, 17 Mar 2011 03:02:04 +0000 Subject: [PATCH 184/509] dm368-evm: Add configuration for DM368 machine * Added the configuration for the dm368-evm machine type. * Updated the sort.sh script * Updated the Linux kernel and u-boot recipes to support this new device. Signed-off-by: Chase Maupin Signed-off-by: Koen Kooi --- conf/machine/dm368-evm.conf | 8 ++++++++ contrib/angstrom/sort.sh | 18 +++++++++--------- recipes/linux/linux-davinci.inc | 2 +- .../{dm365-evm => dm365}/defconfig | 0 recipes/linux/linux-davinci_git.bb | 2 +- recipes/u-boot/u-boot_git.bb | 10 ++++++---- 6 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 conf/machine/dm368-evm.conf rename recipes/linux/linux-davinci/{dm365-evm => dm365}/defconfig (100%) diff --git a/conf/machine/dm368-evm.conf b/conf/machine/dm368-evm.conf new file mode 100644 index 0000000000..f916b36e8a --- /dev/null +++ b/conf/machine/dm368-evm.conf @@ -0,0 +1,8 @@ +#@TYPE: Machine +#@NAME: DM368 CPUs on a Davinci DM368 EVM board +#@DESCRIPTION: Machine configuration for the TI Davinci DM368 EVM board + +require conf/machine/include/davinci.inc +require conf/machine/include/dm365.inc + +UBOOT_MACHINE = "davinci_dm365_evm_config" diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh index 225ca08b81..b8d702be48 100755 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@ -59,15 +59,15 @@ case "$arch" in at91sam9263ek at91sam9g10ek at91sam9g20ek at91sam9g45ek at91sam9g45ekes at91sam9rlek aximx50 aximx50v bd-neon c7x0 chumby chumby-falconwing cm-x270 cm-x300 da830-omapl137-evm da850-omapl138-evm davinci-dvevm davinci-sffsdr - devkitidp-pxa255 dm355-evm dm355-leopard dm357-evm dm365-evm dm6446-evm - dm6467-evm dm6467t-evm dns323 dockstar e680 ea3250 em-x270 er0100 eseries - ghi270 gumstix gumstix-connex gumstix-custom-connex gumstix-custom-verdex - gumstix-verdex h1910 h2200 h3900 h4000 h5000 hawkboard hipox htcalpine - htcapache htcblueangel htchimalaya htcsable htctornado htcuniversal hx2000 - hx4700 imote2 ixp4xxle kixrp435 kuropro logicpd-pxa270 looxc550 lspro - magician mainstone mh355 mp900c mtx-3 mtx-3a mv2120 mx21ads mx27ads n2100 - navman-icn330 netbook-pro neuros-osd neuros-osd2 nhk15 nokia770 nslu2le - omap1510inn omap1610h2 omap1710h3 omap5912osk openrd-base openrd-client + devkitidp-pxa255 dm355-evm dm355-leopard dm357-evm dm365-evm dm368-evm + dm6446-evm dm6467-evm dm6467t-evm dns323 dockstar e680 ea3250 em-x270 er0100 + eseries ghi270 gumstix gumstix-connex gumstix-custom-connex + gumstix-custom-verdex gumstix-verdex h1910 h2200 h3900 h4000 h5000 hawkboard + hipox htcalpine htcapache htcblueangel htchimalaya htcsable htctornado + htcuniversal hx2000 hx4700 imote2 ixp4xxle kixrp435 kuropro logicpd-pxa270 + looxc550 lspro magician mainstone mh355 mp900c mtx-3 mtx-3a mv2120 mx21ads + mx27ads n2100 navman-icn330 netbook-pro neuros-osd neuros-osd2 nhk15 nokia770 + nslu2le omap1510inn omap1610h2 omap1710h3 omap5912osk openrd-base openrd-client palmld palmt650 palmt680 palmtc palmtt palmtt3 palmtt5 palmtx palmz31 palmz71 palmz72 poodle qemuarm rokre2 rokr-e2 rokre6 ronetix-pm9261 ronetix-pm9263 sgh-i900 sheevaplug spitz stamp9g20evb topas910 tosa diff --git a/recipes/linux/linux-davinci.inc b/recipes/linux/linux-davinci.inc index a1233d4fc0..6ee5752796 100644 --- a/recipes/linux/linux-davinci.inc +++ b/recipes/linux/linux-davinci.inc @@ -8,7 +8,7 @@ require multi-kernel.inc SRC_URI = "git://arago-project.org/git/projects/linux-davinci.git;protocol=git \ file://defconfig" -COMPATIBLE_MACHINE = "(dm6446-evm|dm6467-evm|dm6467t-evm|dm355-evm|dm365-evm)" +COMPATIBLE_MACHINE = "(dm6446-evm|dm6467-evm|dm6467t-evm|dm355-evm|dm365-evm|dm386-evm)" S = "${WORKDIR}/git" diff --git a/recipes/linux/linux-davinci/dm365-evm/defconfig b/recipes/linux/linux-davinci/dm365/defconfig similarity index 100% rename from recipes/linux/linux-davinci/dm365-evm/defconfig rename to recipes/linux/linux-davinci/dm365/defconfig diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb index e25a15ab16..13e2f61b84 100644 --- a/recipes/linux/linux-davinci_git.bb +++ b/recipes/linux/linux-davinci_git.bb @@ -3,7 +3,7 @@ require multi-kernel.inc DESCRIPTION = "Linux kernel for DaVinci processors" KERNEL_IMAGETYPE = "uImage" -COMPATIBLE_MACHINE = "(dm355-evm|dm365-evm|dm6446-evm|dm6467-evm|dm6467t-evm|omapl137|omapl138|dm355-leopard|davinci-sffsdr|hawkboard)" +COMPATIBLE_MACHINE = "(dm355-evm|dm365-evm|dm6446-evm|dm6467-evm|dm6467t-evm|omapl137|omapl138|dm355-leopard|davinci-sffsdr|hawkboard|dm368-evm)" DEFAULT_PREFERENCE = "1" DEFAULT_PREFERENCE_dm365 = "-1" diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 69f0fe9c49..1f009ed717 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -207,10 +207,12 @@ SRCREV_dm355-evm = "ea7387c9511ac92a46d3d147adffe36f868820e4" PV_dm355-evm = "2009.05+2009.06-rc0+${PR}+gitr${SRCREV}" PE_dm355-evm = "1" -SRC_URI_dm365-evm = "git://arago-project.org/git/projects/u-boot-davinci.git;protocol=git;branch=u-boot-davinci-2009.06" -SRCREV_dm365-evm = "ea7387c9511ac92a46d3d147adffe36f868820e4" -PV_dm365-evm = "2009.05+2009.06-rc0+${PR}+gitr${SRCREV}" -PE_dm365-evm = "1" +# Use this for both dm365-evm and dm368-evm devices by using the dm365 +# SOC_FAMILY +SRC_URI_dm365 = "git://arago-project.org/git/projects/u-boot-davinci.git;protocol=git;branch=u-boot-davinci-2009.06" +SRCREV_dm365 = "ea7387c9511ac92a46d3d147adffe36f868820e4" +PV_dm365 = "2009.05+2009.06-rc0+${PR}+gitr${SRCREV}" +PE_dm365 = "1" SRC_URI_dm6446-evm = "git://arago-project.org/git/projects/u-boot-davinci.git;protocol=git;branch=u-boot-davinci-2009.06" SRCREV_dm6446-evm = "ea7387c9511ac92a46d3d147adffe36f868820e4" From 65baadb48baec2bb23fb61616859e4b8b163f586 Mon Sep 17 00:00:00 2001 From: chase maupin Date: Thu, 17 Mar 2011 03:02:05 +0000 Subject: [PATCH 185/509] matrix-gui: add support for dm386-evm machine * Add support for the dm368-evm machine type * Bump the PRs Signed-off-by: Chase Maupin Signed-off-by: Koen Kooi --- recipes/ti/matrix-gui-common.inc | 5 +++-- recipes/ti/matrix-gui-e.inc | 5 +++-- recipes/ti/matrix-gui.inc | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/recipes/ti/matrix-gui-common.inc b/recipes/ti/matrix-gui-common.inc index c0edbfd485..486cb8df13 100644 --- a/recipes/ti/matrix-gui-common.inc +++ b/recipes/ti/matrix-gui-common.inc @@ -4,11 +4,12 @@ LICENSE = "BSD" SECTION = "multimedia" PRIORITY = "optional" -INC_PR = "r7" +INC_PR = "r8" COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x)" -PLATFORM_dm365 = "dm365" +PLATFORM_dm365-evm = "dm365" +PLATFORM_dm368-evm = "dm368" PLATFORM_omapl138 = "omapl138" PLATFORM_omap3evm = "omap3530" PLATFORM_dm37x-evm = "dm3730" diff --git a/recipes/ti/matrix-gui-e.inc b/recipes/ti/matrix-gui-e.inc index ba8012c466..e19b5b975f 100644 --- a/recipes/ti/matrix-gui-e.inc +++ b/recipes/ti/matrix-gui-e.inc @@ -4,11 +4,12 @@ LICENSE = "BSD" SECTION = "multimedia" PRIORITY = "optional" -INC_PR = "r21" +INC_PR = "r22" COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x)" -PLATFORM_dm365 = "dm365" +PLATFORM_dm365-evm = "dm365" +PLATFORM_dm368-evm = "dm368" PLATFORM_omapl138 = "omapl138" PLATFORM_omap3evm = "omap3530" PLATFORM_dm37x-evm = "dm3730" diff --git a/recipes/ti/matrix-gui.inc b/recipes/ti/matrix-gui.inc index 82ec6ab1e3..240e695c95 100644 --- a/recipes/ti/matrix-gui.inc +++ b/recipes/ti/matrix-gui.inc @@ -4,11 +4,12 @@ LICENSE = "BSD" SECTION = "multimedia" PRIORITY = "optional" -INC_PR = "r19" +INC_PR = "r20" COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x)" -PLATFORM_dm365 = "dm365" +PLATFORM_dm365-evm = "dm365" +PLATFORM_dm368-evm = "dm368" PLATFORM_omapl138 = "omapl138" PLATFORM_omap3evm = "omap3530" PLATFORM_dm37x-evm = "dm3730" From 88b0aafa2aa6750fcd14d3c7f2cc075bbbaca722 Mon Sep 17 00:00:00 2001 From: chase maupin Date: Thu, 17 Mar 2011 03:02:06 +0000 Subject: [PATCH 186/509] ti-pru-sw-example: fix building with new toolchain sysroot * Patch taken from Arago overlay where it was added by Denys Dmytriyenko * PR incremented by two to align recipe PR values between Arago and OE. Signed-off-by: Chase Maupin Signed-off-by: Koen Kooi --- recipes/ti/ti-pru-sw-examples_1.00.00.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/ti/ti-pru-sw-examples_1.00.00.bb b/recipes/ti/ti-pru-sw-examples_1.00.00.bb index f5fa8d5233..45a01eb7b2 100644 --- a/recipes/ti/ti-pru-sw-examples_1.00.00.bb +++ b/recipes/ti/ti-pru-sw-examples_1.00.00.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://gforge.ti.com/gf/project/pru_sw/" LICENSE = "BSD" DEPENDS += "ti-pru-sw-app-loader ti-pru-sw-edma-library" RDEPENDS += "ti-pru-sw-edma-driver kernel-module-uio-pru" -PR = "r2+svnr${SRCPV}" +PR = "r4+svnr${SRCPV}" COMPATIBLE_MACHINE = "omapl138" @@ -14,7 +14,7 @@ S = "${WORKDIR}/trunk" do_compile () { make -C ${S}/example_apps \ - CC=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}gcc \ + CC="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" \ BINDIR_APPLICATIONS="${S}/example_apps/bin" \ BINDIR_FW="${S}/example_apps/bin" \ UTILS_DIR="${S}/utils" From 28c04a910da6c07081fd62378e23e203cc4824d5 Mon Sep 17 00:00:00 2001 From: Ben Gardiner Date: Thu, 17 Mar 2011 00:50:34 +0000 Subject: [PATCH 187/509] image.bbclass: add link to .rootfs. or ..img The current image link-creation code will unconditionaly create a link from . pointing to the .rootfs. output. This is not compatible with the UBIFS images produced which have ..img extension since they are not considered to be valid rootfs images when they are not included in a UBI container. Check for existence of the link target .rootfs. before creating the link and fallback to a check for the ..img target after that. Signed-off-by: Ben Gardiner Acked-by: Denys Dmytriyenko Signed-off-by: Tom Rini (cherry picked from commit cfde49e8d0f1cf09d589910f1a342849db148519) Signed-off-by: Ben Gardiner Acked-by: Denys Dmytriyenko Signed-off-by: Tom Rini --- classes/image.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/image.bbclass b/classes/image.bbclass index 962161410f..d7fe9b015e 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -140,7 +140,11 @@ def get_imagecmds(d): cmd = "\t#Code for image type " + type + "\n" cmd += "\t${IMAGE_CMD_" + type + "}\n" cmd += "\tcd ${DEPLOY_DIR_IMAGE}/\n" - cmd += "\tln -fs ${IMAGE_NAME}.rootfs." + type + " ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n\n" + cmd += "\tif [ -f ${IMAGE_NAME}.rootfs." + type + " ]; then\n" + cmd += "\tln -fs ${IMAGE_NAME}.rootfs." + type + " ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n" + cmd += "\telif [ -f ${IMAGE_NAME}." + type + ".img ]; then\n" + cmd += "\tln -fs ${IMAGE_NAME}." + type + ".img ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n" + cmd += "\tfi\n\n" cmds += bb.data.expand(cmd, localdata) return cmds From c33dd1b7f5b9d0bfddaf31d2396b0237a029919f Mon Sep 17 00:00:00 2001 From: Ben Gardiner Date: Thu, 17 Mar 2011 00:50:35 +0000 Subject: [PATCH 188/509] bitbake.conf: use .ubifs.img extension in IMAGE_CMD_ubi The current IMAGE_CMD_ubi creates an interim image with a .rootfs.ubifs extension. The ubifs image created is not considered a valid rootfs without a UBI container. Change the filename of the iterim ubifs image used by IMAGE_CMD_ubi to .ubifs.img to match the IMAGE_CMD_ubifs command. Signed-off-by: Ben Gardiner Acked-by: Denys Dmytriyenko Signed-off-by: Tom Rini (backported from commit 7308e68fc26cdbffa08d311a2319c8d1c3b2805f -- some changes were needed since commit 312b42bcf2cc9b11266ba497ade68e8ddabb3007 bitbake.conf: add XZ_INTEGRITY_CHECK and LZMA_COMPRESSION_LEVEL variables has not been applied to 2011.03-maintenance) Signed-off-by: Ben Gardiner Acked-by: Denys Dmytriyenko Signed-off-by: Tom Rini --- conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 1002c01a06..01b9321c23 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -399,7 +399,7 @@ IMAGE_CMD_cpio.gz = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio IMAGE_CMD_cpio.xz = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | xz -c ${XZ_COMPRESSION_LEVEL} > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.xz) ${EXTRA_IMAGECMD}" IMAGE_CMD_cpio.gz.u-boot = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz) ${EXTRA_IMAGECMD}; mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C gzip -n ${IMAGE_NAME} -d ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz.u-boot" IMAGE_CMD_cpio.lzma = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | lzma -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.lzma) ${EXTRA_IMAGECMD}" -IMAGE_CMD_ubi = "echo \[ubifs\] > ubinize.cfg ; echo mode=ubi >> ubinize.cfg ; echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs >> ubinize.cfg ; echo vol_id=0 >> ubinize.cfg ; echo vol_type=dynamic >> ubinize.cfg ; echo vol_name=${UBI_VOLNAME} >> ubinize.cfg ; echo vol_flags=autoresize >> ubinize.cfg;mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg" +IMAGE_CMD_ubi = "echo \[ubifs\] > ubinize.cfg ; echo mode=ubi >> ubinize.cfg ; echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img >> ubinize.cfg ; echo vol_id=0 >> ubinize.cfg ; echo vol_type=dynamic >> ubinize.cfg ; echo vol_name=${UBI_VOLNAME} >> ubinize.cfg ; echo vol_flags=autoresize >> ubinize.cfg;mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg" IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS}" EXTRA_IMAGECMD = "" From 800f3c39e5187b0c47666126af2b34ecf7f933b3 Mon Sep 17 00:00:00 2001 From: Ben Gardiner Date: Thu, 17 Mar 2011 00:50:36 +0000 Subject: [PATCH 189/509] external-toolchain: allow override of linux-libc-headers provider only set PREFERRED_PROVIDER_linux-libc-headers if it is not already assigned a value. Signed-off-by: Ben Gardiner Tested-by: Andrea Galbusera Signed-off-by: Tom Rini (cherry picked from commit 829ea5110bc82f71a225f168bcb6a9a327b1b5c8) Signed-off-by: Ben Gardiner Acked-by: Denys Dmytriyenko Signed-off-by: Tom Rini --- conf/distro/include/toolchain-external.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/toolchain-external.inc b/conf/distro/include/toolchain-external.inc index ab503081d4..12dc4548ec 100644 --- a/conf/distro/include/toolchain-external.inc +++ b/conf/distro/include/toolchain-external.inc @@ -4,7 +4,7 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "external-toolchain-${T PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "external-toolchain-${TOOLCHAIN_BRAND}" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "external-toolchain-${TOOLCHAIN_BRAND}" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-toolchain-${TOOLCHAIN_BRAND}" -PREFERRED_PROVIDER_linux-libc-headers = "external-toolchain-${TOOLCHAIN_BRAND}" +PREFERRED_PROVIDER_linux-libc-headers ?= "external-toolchain-${TOOLCHAIN_BRAND}" TOOLCHAIN_VENDOR ?= "${TARGET_VENDOR}" TARGET_VENDOR := "${TOOLCHAIN_VENDOR}" From bce075ce13c0891bd5537b5b9d52de9fc881507c Mon Sep 17 00:00:00 2001 From: Ben Gardiner Date: Thu, 17 Mar 2011 00:50:37 +0000 Subject: [PATCH 190/509] external-toolchain-csl: allow linux-libc-headers If PREFERRED_PROVIDER_linux-libc-headers is defined as anything other than external-toolchain-csl then don't PROVIDE, install or stage the linux headers packaged with the CSL toolchain. (Updated by Tom Rini to not modify local.conf.sample yet and to use cp + rm -rf rather than rsync) Signed-off-by: Ben Gardiner Tested-by: Andrea Galbusera Signed-off-by: Tom Rini (cherry picked from commit 3116ad58e507c6e5dc7b7249f521c395db586b9f) Signed-off-by: Ben Gardiner Acked-by: Denys Dmytriyenko Signed-off-by: Tom Rini --- recipes/meta/external-toolchain-csl.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/recipes/meta/external-toolchain-csl.bb b/recipes/meta/external-toolchain-csl.bb index 2e109c8caa..0761cf2022 100644 --- a/recipes/meta/external-toolchain-csl.bb +++ b/recipes/meta/external-toolchain-csl.bb @@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" INHIBIT_DEFAULT_DEPS = "1" @@ -21,9 +21,10 @@ PROVIDES = "\ virtual/libintl \ virtual/libiconv \ glibc-thread-db \ - linux-libc-headers \ + ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', 'linux-libc-headers', '', d)} \ " +DEPENDS = "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'linux-libc-headers', d)}" RPROVIDES_glibc-dev += "libc-dev libc6-dev virtual-libc-dev" PACKAGES_DYNAMIC += "glibc-gconv-*" PACKAGES_DYNAMIC += "glibc-locale-*" @@ -35,7 +36,7 @@ PACKAGES = "\ libgcc-dev \ libstdc++ \ libstdc++-dev \ - linux-libc-headers \ + ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', 'linux-libc-headers', '', d)} \ glibc-dbg \ glibc \ catchsegv \ @@ -214,6 +215,7 @@ do_install() { cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/sbin/* ${D}${base_sbindir} \ || true cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/usr/* ${D}/usr + ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'rm -rf ${D}/usr/include/linux', d)} cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/include/* ${D}/usr/include rm -rf ${D}${bindir}/gdbserver @@ -227,6 +229,7 @@ do_stage() { install -d ${STAGING_DIR_TARGET}${base_libdir} cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/usr/include/* ${STAGING_INCDIR} + ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'rm -rf ${D}/usr/include/linux', d)} cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/include/* ${STAGING_INCDIR} cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/usr/lib/* ${STAGING_LIBDIR} cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir} From c787247b6508c2276ef76614410227f42fe6ccdc Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 17 Mar 2011 00:50:38 +0000 Subject: [PATCH 191/509] external-toolchain-csl: Drop do_stage, add gdbserver Based on work from Noor Ahsan, we merge the important part of do_stage into do_install and then set NATIVE_INSTALL_WORKS. We also add a function for getting the gdb version for packaging up gdbserver and ship that. Signed-off-by: Tom Rini (cherry picked from commit 207971b244ee6958dab1fb41d6f3cd94ac416b73) Signed-off-by: Ben Gardiner Acked-by: Denys Dmytriyenko Signed-off-by: Tom Rini --- recipes/meta/external-toolchain-csl.bb | 39 ++++++++++++++------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/recipes/meta/external-toolchain-csl.bb b/recipes/meta/external-toolchain-csl.bb index 0761cf2022..e56b74f808 100644 --- a/recipes/meta/external-toolchain-csl.bb +++ b/recipes/meta/external-toolchain-csl.bb @@ -1,4 +1,4 @@ -PR = "r8" +PR = "r9" INHIBIT_DEFAULT_DEPS = "1" @@ -6,6 +6,7 @@ INSANE_SKIP_libgcc = "True" INSANE_SKIP_libstdc++ = "True" INSANE_SKIP_nscd = "True" INSANE_SKIP_glibc-utils = "True" +INSANE_SKIP_gdbserver = "True" SRC_URI = "file://SUPPORTED" @@ -22,6 +23,7 @@ PROVIDES = "\ virtual/libiconv \ glibc-thread-db \ ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', 'linux-libc-headers', '', d)} \ + gdbserver \ " DEPENDS = "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'linux-libc-headers', d)}" @@ -44,6 +46,7 @@ PACKAGES = "\ nscd \ ldd \ localedef \ + gdbserver \ glibc-utils \ glibc-dev \ glibc-locale \ @@ -120,6 +123,7 @@ FILES_ldd = "${bindir}/ldd" FILES_nscd = "${sbindir}/nscd*" FILES_sln = "${base_sbindir}/sln" FILES_localedef = "${bindir}/localedef" +FILES_gdbserver = "${bindir}/gdbserver" DESCRIPTION_glibc-utils = "glibc: misc utilities like iconf, local, gencat, tzselect, rpcinfo, ..." DESCRIPTION_glibc-extra-nss = "glibc: nis, nisplus and hesiod search services" @@ -127,6 +131,7 @@ DESCRIPTION_ldd = "glibc: print shared library dependencies" DESCRIPTION_nscd = "glibc: name service cache daemon for passwd, group, and hosts" DESCRIPTION_sln = "glibc: create symbolic links between files" DESCRIPTION_localedef = "glibc: compile locale definition files" +DESCRIPTION_gdbserver = "gdb - GNU debugger" def csl_get_main_version(d): import subprocess,os,bb @@ -162,12 +167,19 @@ def csl_get_kernel_version(d): return str(maj)+'.'+str(min)+'.'+str(ver) return None +def csl_get_gdb_version(d): + import subprocess,os,bb + if os.path.exists(bb.data.getVar('TOOLCHAIN_PATH', d, 1)+'/bin/'+bb.data.getVar('TARGET_PREFIX', d, 1)+'gdb'): + return subprocess.Popen([bb.data.getVar('TOOLCHAIN_PATH', d, 1)+'/bin/'+bb.data.getVar('TARGET_PREFIX', d, 1)+'gdb', '-v'],stdout=subprocess.PIPE).communicate()[0].splitlines()[0].split()[-1] + CSL_VER_MAIN := "${@csl_get_main_version(d)}" CSL_VER_GCC := "${@csl_get_gcc_version(d)}" CSL_VER_LIBC := "${@csl_get_libc_version(d)}" CSL_VER_KERNEL := "${@csl_get_kernel_version(d)}" CSL_LIC_LIBC := "LGPLv2.1+" CSL_LIC_RLE := "${@["GPLv3 with GCC RLE", "GPLv2 with GCC RLE"][csl_get_main_version(d) <= "2007q3-51"]}" +CSL_VER_GDBSERVER := "${@csl_get_gdb_version(d)}" +CSL_LIC_GDBSERVER := "${@["GNU GPL version 2", "GNU GPL version 3 or later"][csl_get_gdb_version(d) >= "6.7.1"]}" PKGV = "${CSL_VER_MAIN}" PKGV_libgcc = "${CSL_VER_GCC}" @@ -190,6 +202,7 @@ PKGV_ldd = "${CSL_VER_LIBC}" PKGV_localedef = "${CSL_VER_LIBC}" PKGV_libsegfault = "${CSL_VER_LIBC}" PKGV_linux-libc-headers = "${CSL_VER_KERNEL}" +PKGV_gdbserver = "${CSL_VER_GDBSERVER}" LICENSE = "${CSL_LIC_LIBC}" LICENSE_ldd = "${CSL_LIC_LIBC}" @@ -199,6 +212,7 @@ LICENSE_libgcc = "${CSL_LIC_RLE}" LICENSE_libgcc-dev = "${CSL_LIC_RLE}" LICENSE_libstdc++ = "${CSL_LIC_RLE}" LICENSE_libstdc++-dev = "${CSL_LIC_RLE}" +LICENSE_gdbserver = "${CSL_LIC_GDBSERVER}" do_install() { install -d ${D}${sysconfdir} @@ -218,27 +232,14 @@ do_install() { ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'rm -rf ${D}/usr/include/linux', d)} cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/include/* ${D}/usr/include - rm -rf ${D}${bindir}/gdbserver rm -rf ${D}${sysconfdir}/rpc rm -rf ${D}${datadir}/zoneinfo -} -do_stage() { - install -d ${STAGING_INCDIR} - install -d ${STAGING_LIBDIR} - install -d ${STAGING_DIR_TARGET}${base_libdir} + sed -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc.so > ${D}${libdir}/temp + mv ${D}${libdir}/temp ${D}${libdir}/libc.so - cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/usr/include/* ${STAGING_INCDIR} - ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'rm -rf ${D}/usr/include/linux', d)} - cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/include/* ${STAGING_INCDIR} - cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/usr/lib/* ${STAGING_LIBDIR} - cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir} - - sed -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${STAGING_LIBDIR}/libc.so > ${STAGING_LIBDIR}/temp - mv ${STAGING_LIBDIR}/temp ${STAGING_LIBDIR}/libc.so - - sed -e "s# /lib# ../../lib#" -e "s# /usr/lib# .#g" ${STAGING_LIBDIR}/libpthread.so > ${STAGING_LIBDIR}/temp - mv ${STAGING_LIBDIR}/temp ${STAGING_LIBDIR}/libpthread.so + sed -e "s# /lib# ../../lib#" -e "s# /usr/lib# .#g" ${D}${libdir}/libpthread.so > ${D}${libdir}/temp + mv ${D}${libdir}/temp ${D}${libdir}/libpthread.so } TMP_LOCALE="/tmp/locale${libdir}/locale" @@ -457,3 +458,5 @@ python populate_packages_prepend () { bb.data.setVar('PKG_libgcc-dev', 'libgcc1-dev', d) bb.build.exec_func('package_do_split_gconvs', d) } + +NATIVE_INSTALL_WORKS = "1" From 2400d4805ff2e6bd4c9c57bbaaf4f911a6519892 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 17 Mar 2011 00:50:39 +0000 Subject: [PATCH 192/509] external-toolchain-csl: handle packaging of gdbserver based on PREFERRED_PROVIDER Allow packaging independent copy of specific version of gdbserver with external-toolchain-csl by setting PREFERRED_PROVIDER. E.g. for GPLv2 gdbserver, add these lines to your distro/local.conf: PREFERRED_PROVIDER_gdbserver = "gdbserver" PREFERRED_VERSION_gdbserver = "6.6" Thanks to Ben Gardiner for providing valuable feedback. Signed-off-by: Denys Dmytriyenko (cherry picked from commit a47c14c83cf97a2c90ee50ec7212ec33bdafb58b) Signed-off-by: Ben Gardiner Acked-by: Denys Dmytriyenko Signed-off-by: Tom Rini --- recipes/meta/external-toolchain-csl.bb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/recipes/meta/external-toolchain-csl.bb b/recipes/meta/external-toolchain-csl.bb index e56b74f808..619658ef7a 100644 --- a/recipes/meta/external-toolchain-csl.bb +++ b/recipes/meta/external-toolchain-csl.bb @@ -1,4 +1,4 @@ -PR = "r9" +PR = "r10" INHIBIT_DEFAULT_DEPS = "1" @@ -23,7 +23,7 @@ PROVIDES = "\ virtual/libiconv \ glibc-thread-db \ ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', 'linux-libc-headers', '', d)} \ - gdbserver \ + ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'external-toolchain-csl', 'gdbserver', '', d)} \ " DEPENDS = "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'linux-libc-headers', d)}" @@ -39,6 +39,7 @@ PACKAGES = "\ libstdc++ \ libstdc++-dev \ ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', 'linux-libc-headers', '', d)} \ + ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'external-toolchain-csl', 'gdbserver', '', d)} \ glibc-dbg \ glibc \ catchsegv \ @@ -46,7 +47,6 @@ PACKAGES = "\ nscd \ ldd \ localedef \ - gdbserver \ glibc-utils \ glibc-dev \ glibc-locale \ @@ -176,10 +176,10 @@ CSL_VER_MAIN := "${@csl_get_main_version(d)}" CSL_VER_GCC := "${@csl_get_gcc_version(d)}" CSL_VER_LIBC := "${@csl_get_libc_version(d)}" CSL_VER_KERNEL := "${@csl_get_kernel_version(d)}" +CSL_VER_GDBSERVER := "${@csl_get_gdb_version(d)}" CSL_LIC_LIBC := "LGPLv2.1+" CSL_LIC_RLE := "${@["GPLv3 with GCC RLE", "GPLv2 with GCC RLE"][csl_get_main_version(d) <= "2007q3-51"]}" -CSL_VER_GDBSERVER := "${@csl_get_gdb_version(d)}" -CSL_LIC_GDBSERVER := "${@["GNU GPL version 2", "GNU GPL version 3 or later"][csl_get_gdb_version(d) >= "6.7.1"]}" +CSL_LIC_GDBSERVER := "${@["GPLv2+", "GPLv3+"][csl_get_gdb_version(d) >= "6.7.1"]}" PKGV = "${CSL_VER_MAIN}" PKGV_libgcc = "${CSL_VER_GCC}" @@ -231,6 +231,7 @@ do_install() { cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/usr/* ${D}/usr ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'rm -rf ${D}/usr/include/linux', d)} cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/include/* ${D}/usr/include + ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'external-toolchain-csl', '', 'rm -rf ${D}/usr/bin/gdbserver', d)} rm -rf ${D}${sysconfdir}/rpc rm -rf ${D}${datadir}/zoneinfo From fc2e8c97258ae99e903b7861d7903f54d09414ac Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 17 Mar 2011 00:50:40 +0000 Subject: [PATCH 193/509] toolchain-external.conf: set the default provider for gdbserver Signed-off-by: Denys Dmytriyenko (cherry picked from commit df59f77a2eb37d9807c6d9167488110e92601d7b) Signed-off-by: Ben Gardiner Acked-by: Denys Dmytriyenko Signed-off-by: Tom Rini --- conf/distro/include/toolchain-external.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/include/toolchain-external.inc b/conf/distro/include/toolchain-external.inc index 12dc4548ec..6ea2a3793f 100644 --- a/conf/distro/include/toolchain-external.inc +++ b/conf/distro/include/toolchain-external.inc @@ -5,6 +5,7 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "external-toolchai PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "external-toolchain-${TOOLCHAIN_BRAND}" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-toolchain-${TOOLCHAIN_BRAND}" PREFERRED_PROVIDER_linux-libc-headers ?= "external-toolchain-${TOOLCHAIN_BRAND}" +PREFERRED_PROVIDER_gdbserver ?= "external-toolchain-${TOOLCHAIN_BRAND}" TOOLCHAIN_VENDOR ?= "${TARGET_VENDOR}" TARGET_VENDOR := "${TOOLCHAIN_VENDOR}" From bcb9cf8ed24f0e66e0c2ecc674c2cdb258628c96 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 11 Mar 2011 20:34:42 +0000 Subject: [PATCH 194/509] libarchive: add This library provides C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats. Signed-off-by: Otavio Salvador Signed-off-by: Koen Kooi --- ...01-Patch-from-upstream-revision-1990.patch | 45 +++++++++++++ ...02-Patch-from-upstream-revision-1991.patch | 34 ++++++++++ .../0003-Patch-from-upstream-rev-2516.patch | 65 +++++++++++++++++++ .../0004-Patch-from-upstream-rev-2514.patch | 35 ++++++++++ .../0005-Patch-from-upstream-rev-2520.patch | 33 ++++++++++ .../0006-Patch-from-upstream-rev-2521.patch | 30 +++++++++ ...ror-when-setting-up-xattrs.-Closes-5.patch | 33 ++++++++++ recipes/libarchive/libarchive_2.8.4.bb | 20 ++++++ 8 files changed, 295 insertions(+) create mode 100644 recipes/libarchive/libarchive/0001-Patch-from-upstream-revision-1990.patch create mode 100644 recipes/libarchive/libarchive/0002-Patch-from-upstream-revision-1991.patch create mode 100644 recipes/libarchive/libarchive/0003-Patch-from-upstream-rev-2516.patch create mode 100644 recipes/libarchive/libarchive/0004-Patch-from-upstream-rev-2514.patch create mode 100644 recipes/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.patch create mode 100644 recipes/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch create mode 100644 recipes/libarchive/libarchive/0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch create mode 100644 recipes/libarchive/libarchive_2.8.4.bb diff --git a/recipes/libarchive/libarchive/0001-Patch-from-upstream-revision-1990.patch b/recipes/libarchive/libarchive/0001-Patch-from-upstream-revision-1990.patch new file mode 100644 index 0000000000..3b8607dfc5 --- /dev/null +++ b/recipes/libarchive/libarchive/0001-Patch-from-upstream-revision-1990.patch @@ -0,0 +1,45 @@ +From 76210f42f52bb3e08fcbc9d78a7f92217762839c Mon Sep 17 00:00:00 2001 +From: Andreas Henriksson +Date: Thu, 25 Feb 2010 22:29:49 +0100 +Subject: [PATCH 1/7] Patch from upstream (revision 1990) + +--- + libarchive/archive_read_disk_entry_from_file.c | 15 +++++++++++++-- + 1 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c +index 7473c50..27671df 100644 +--- a/libarchive/archive_read_disk_entry_from_file.c ++++ b/libarchive/archive_read_disk_entry_from_file.c +@@ -163,15 +163,26 @@ archive_read_disk_entry_from_file(struct archive *_a, + + #ifdef HAVE_READLINK + if (S_ISLNK(st->st_mode)) { +- char linkbuffer[PATH_MAX + 1]; +- int lnklen = readlink(path, linkbuffer, PATH_MAX); ++ size_t linkbuffer_len = st->st_size + 1; ++ char *linkbuffer; ++ int lnklen; ++ ++ linkbuffer = malloc(linkbuffer_len); ++ if (linkbuffer == NULL) { ++ archive_set_error(&a->archive, ENOMEM, ++ "Couldn't read link data"); ++ return (ARCHIVE_FAILED); ++ } ++ lnklen = readlink(path, linkbuffer, linkbuffer_len); + if (lnklen < 0) { + archive_set_error(&a->archive, errno, + "Couldn't read link data"); ++ free(linkbuffer); + return (ARCHIVE_FAILED); + } + linkbuffer[lnklen] = 0; + archive_entry_set_symlink(entry, linkbuffer); ++ free(linkbuffer); + } + #endif + +-- +1.7.1 + diff --git a/recipes/libarchive/libarchive/0002-Patch-from-upstream-revision-1991.patch b/recipes/libarchive/libarchive/0002-Patch-from-upstream-revision-1991.patch new file mode 100644 index 0000000000..f3e4758378 --- /dev/null +++ b/recipes/libarchive/libarchive/0002-Patch-from-upstream-revision-1991.patch @@ -0,0 +1,34 @@ +From 2ec43cc0e6f7d39a1570a7daf02a23aec8015626 Mon Sep 17 00:00:00 2001 +From: Andreas Henriksson +Date: Thu, 25 Feb 2010 22:30:06 +0100 +Subject: [PATCH 2/7] Patch from upstream (revision 1991) + +--- + libarchive/archive_write_disk.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libarchive/archive_write_disk.c b/libarchive/archive_write_disk.c +index caf958e..60699e0 100644 +--- a/libarchive/archive_write_disk.c ++++ b/libarchive/archive_write_disk.c +@@ -434,7 +434,7 @@ _archive_write_header(struct archive *_a, struct archive_entry *entry) + if (ret != ARCHIVE_OK) + goto done; + } +-#ifdef HAVE_FCHDIR ++#if defined(HAVE_FCHDIR) && defined(PATH_MAX) + /* If path exceeds PATH_MAX, shorten the path. */ + edit_deep_directories(a); + #endif +@@ -866,7 +866,7 @@ archive_write_disk_new(void) + * object creation is likely to fail, but any error will get handled + * at that time. + */ +-#ifdef HAVE_FCHDIR ++#if defined(HAVE_FCHDIR) && defined(PATH_MAX) + static void + edit_deep_directories(struct archive_write_disk *a) + { +-- +1.7.1 + diff --git a/recipes/libarchive/libarchive/0003-Patch-from-upstream-rev-2516.patch b/recipes/libarchive/libarchive/0003-Patch-from-upstream-rev-2516.patch new file mode 100644 index 0000000000..efb6f06c6e --- /dev/null +++ b/recipes/libarchive/libarchive/0003-Patch-from-upstream-rev-2516.patch @@ -0,0 +1,65 @@ +From 07cefd4d6db82e53b7bcf096be1e5e29c09de3c6 Mon Sep 17 00:00:00 2001 +From: Andreas Henriksson +Date: Thu, 1 Jul 2010 15:28:25 +0200 +Subject: [PATCH 3/7] Patch from upstream (rev 2516) + +Fix Issue 100: Allow a zero for the Type M Path Table Location, since +WinISO (and probably other programs) set it this way. + +http://code.google.com/p/libarchive/source/detail?r=2516 +--- + libarchive/archive_read_support_format_iso9660.c | 20 +++++++++++++------- + 1 files changed, 13 insertions(+), 7 deletions(-) + +diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c +index 0c640c8..fdef3fb 100644 +--- a/libarchive/archive_read_support_format_iso9660.c ++++ b/libarchive/archive_read_support_format_iso9660.c +@@ -714,11 +714,13 @@ isSVD(struct iso9660 *iso9660, const unsigned char *h) + if (location <= SYSTEM_AREA_BLOCK+2 || location >= volume_block) + return (0); + +- /* Location of Occurrence of Type M Path Table must be +- * available location, ++ /* The Type M Path Table must be at a valid location (WinISO ++ * and probably other programs omit this, so we allow zero) ++ * + * > SYSTEM_AREA_BLOCK(16) + 2 and < Volume Space Size. */ + location = archive_be32dec(h+SVD_type_M_path_table_offset); +- if (location <= SYSTEM_AREA_BLOCK+2 || location >= volume_block) ++ if ((location > 0 && location <= SYSTEM_AREA_BLOCK+2) ++ || location >= volume_block) + return (0); + + /* Read Root Directory Record in Volume Descriptor. */ +@@ -790,7 +792,8 @@ isEVD(struct iso9660 *iso9660, const unsigned char *h) + * available location, + * > SYSTEM_AREA_BLOCK(16) + 2 and < Volume Space Size. */ + location = archive_be32dec(h+PVD_type_m_path_table_offset); +- if (location <= SYSTEM_AREA_BLOCK+2 || location >= volume_block) ++ if ((location > 0 && location <= SYSTEM_AREA_BLOCK+2) ++ || location >= volume_block) + return (0); + + /* Reserved field must be 0. */ +@@ -865,11 +868,14 @@ isPVD(struct iso9660 *iso9660, const unsigned char *h) + if (location <= SYSTEM_AREA_BLOCK+2 || location >= volume_block) + return (0); + +- /* Location of Occurrence of Type M Path Table must be +- * available location, ++ /* The Type M Path Table must also be at a valid location ++ * (although ECMA 119 requires a Type M Path Table, WinISO and ++ * probably other programs omit it, so we permit a zero here) ++ * + * > SYSTEM_AREA_BLOCK(16) + 2 and < Volume Space Size. */ + location = archive_be32dec(h+PVD_type_m_path_table_offset); +- if (location <= SYSTEM_AREA_BLOCK+2 || location >= volume_block) ++ if ((location > 0 && location <= SYSTEM_AREA_BLOCK+2) ++ || location >= volume_block) + return (0); + + /* Reserved field must be 0. */ +-- +1.7.1 + diff --git a/recipes/libarchive/libarchive/0004-Patch-from-upstream-rev-2514.patch b/recipes/libarchive/libarchive/0004-Patch-from-upstream-rev-2514.patch new file mode 100644 index 0000000000..b93396607f --- /dev/null +++ b/recipes/libarchive/libarchive/0004-Patch-from-upstream-rev-2514.patch @@ -0,0 +1,35 @@ +From 178c9df2941d0c01afc44ca1e6ae795716e3b9fd Mon Sep 17 00:00:00 2001 +From: Andreas Henriksson +Date: Thu, 1 Jul 2010 18:12:22 +0200 +Subject: [PATCH 4/7] Patch from upstream (rev 2514) + +Enable version stripping code in joliet extension support for iso9660. + +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=587316 +--- + libarchive/archive_read_support_format_iso9660.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c +index fdef3fb..8dcfeb4 100644 +--- a/libarchive/archive_read_support_format_iso9660.c ++++ b/libarchive/archive_read_support_format_iso9660.c +@@ -1755,7 +1755,6 @@ parse_file_info(struct archive_read *a, struct file_info *parent, + } + *wp = L'\0'; + +-#if 0 /* untested code, is it at all useful on Joliet? */ + /* trim trailing first version and dot from filename. + * + * Remember we where in UTF-16BE land! +@@ -1775,7 +1774,6 @@ parse_file_info(struct archive_read *a, struct file_info *parent, + /* Chop off trailing '.' from filenames. */ + if (*(wp-1) == '.') + *(--wp) = L'\0'; +-#endif + + /* store the result in the file name field. */ + archive_strappend_w_utf8(&file->name, wbuff); +-- +1.7.1 + diff --git a/recipes/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.patch b/recipes/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.patch new file mode 100644 index 0000000000..e9bd861a3d --- /dev/null +++ b/recipes/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.patch @@ -0,0 +1,33 @@ +From bf4a8ba5a2f7a72d73765b95540acf56b0180990 Mon Sep 17 00:00:00 2001 +From: Andreas Henriksson +Date: Thu, 1 Jul 2010 18:13:46 +0200 +Subject: [PATCH 5/7] Patch from upstream (rev 2520) + +Fix version/dot stripping code in joliet extension of iso9660. +--- + libarchive/archive_read_support_format_iso9660.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c +index 8dcfeb4..2d3a855 100644 +--- a/libarchive/archive_read_support_format_iso9660.c ++++ b/libarchive/archive_read_support_format_iso9660.c +@@ -1766,13 +1766,13 @@ parse_file_info(struct archive_read *a, struct file_info *parent, + * *, /, :, ;, ? and \. + */ + /* Chop off trailing ';1' from files. */ +- if (*(wp-2) == ';' && *(wp-1) == '1') { ++ if (*(wp-2) == L';' && *(wp-1) == L'1') { + wp-=2; + *wp = L'\0'; + } + + /* Chop off trailing '.' from filenames. */ +- if (*(wp-1) == '.') ++ if (*(wp-1) == L'.') + *(--wp) = L'\0'; + + /* store the result in the file name field. */ +-- +1.7.1 + diff --git a/recipes/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch b/recipes/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch new file mode 100644 index 0000000000..412ee7973f --- /dev/null +++ b/recipes/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch @@ -0,0 +1,30 @@ +From 911c241d6d0d569074ecf05136dfd5cb9694876e Mon Sep 17 00:00:00 2001 +From: Andreas Henriksson +Date: Fri, 2 Jul 2010 09:41:10 +0200 +Subject: [PATCH 6/7] Patch from upstream (rev 2521). + +Disable dot stripping code since it's still broken +and noone has been able to figure it out (yet). +--- + libarchive/archive_read_support_format_iso9660.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c +index 2d3a855..8661532 100644 +--- a/libarchive/archive_read_support_format_iso9660.c ++++ b/libarchive/archive_read_support_format_iso9660.c +@@ -1771,9 +1771,11 @@ parse_file_info(struct archive_read *a, struct file_info *parent, + *wp = L'\0'; + } + ++#if 0 /* XXX: this somehow manages to strip of single-character file extensions, like '.c'. */ + /* Chop off trailing '.' from filenames. */ + if (*(wp-1) == L'.') + *(--wp) = L'\0'; ++#endif + + /* store the result in the file name field. */ + archive_strappend_w_utf8(&file->name, wbuff); +-- +1.7.1 + diff --git a/recipes/libarchive/libarchive/0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch b/recipes/libarchive/libarchive/0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch new file mode 100644 index 0000000000..4a272fdb61 --- /dev/null +++ b/recipes/libarchive/libarchive/0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch @@ -0,0 +1,33 @@ +From 8ad947aea083aad383eed753390bd6bff71f0cb6 Mon Sep 17 00:00:00 2001 +From: Andreas Henriksson +Date: Thu, 15 Jul 2010 13:32:56 +0200 +Subject: [PATCH 7/7] Ignore ENOSYS error when setting up xattrs. (Closes: #588925) + +Modestas Vainius found out that HPPA returns errno ENOSYS +on listxattrs. Currently, ENOTSUP is ignored so we'll do the +same for ENOSYS as well. + +For full debug info about this see Modestas Vainius awesome +report at: + +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=588925#10 +--- + libarchive/archive_read_disk_entry_from_file.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c +index 27671df..c49e755 100644 +--- a/libarchive/archive_read_disk_entry_from_file.c ++++ b/libarchive/archive_read_disk_entry_from_file.c +@@ -398,7 +398,7 @@ setup_xattrs(struct archive_read_disk *a, + list_size = listxattr(path, NULL, 0); + + if (list_size == -1) { +- if (errno == ENOTSUP) ++ if (errno == ENOTSUP || errno == ENOSYS) + return (ARCHIVE_OK); + archive_set_error(&a->archive, errno, + "Couldn't list extended attributes"); +-- +1.7.1 + diff --git a/recipes/libarchive/libarchive_2.8.4.bb b/recipes/libarchive/libarchive_2.8.4.bb new file mode 100644 index 0000000000..551746bb0b --- /dev/null +++ b/recipes/libarchive/libarchive_2.8.4.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats" +HOMEPAGE = "http://code.google.com/p/libarchive/" +SECTION = "devel" +LICENSE = "BSD" +PR = "r0" + +SRC_URI = "http://libarchive.googlecode.com/files/${PN}-${PV}.tar.gz \ + file://0001-Patch-from-upstream-revision-1990.patch \ + file://0002-Patch-from-upstream-revision-1991.patch \ + file://0003-Patch-from-upstream-rev-2516.patch \ + file://0004-Patch-from-upstream-rev-2514.patch \ + file://0005-Patch-from-upstream-rev-2520.patch \ + file://0006-Patch-from-upstream-rev-2521.patch \ + file://0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch \ + " + +inherit autotools lib_package + +SRC_URI[md5sum] = "83b237a542f27969a8d68ac217dc3796" +SRC_URI[sha256sum] = "86cffa3eaa28d3116f5d0b20284026c3762cf4a2b52b9844df2b494d4a89f688" From a438aad089d81ce24eddb24e57281f28753896e3 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 11 Mar 2011 20:37:38 +0000 Subject: [PATCH 195/509] cmake: depends on libarchive Signed-off-by: Otavio Salvador Signed-off-by: Koen Kooi --- recipes/cmake/cmake_2.8.3.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/cmake/cmake_2.8.3.bb b/recipes/cmake/cmake_2.8.3.bb index cb5f7f71c9..0c8cb6de30 100644 --- a/recipes/cmake/cmake_2.8.3.bb +++ b/recipes/cmake/cmake_2.8.3.bb @@ -1,10 +1,10 @@ require cmake.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" inherit cmake -DEPENDS += "curl expat zlib" +DEPENDS += "curl expat zlib libarchive" SRC_URI[md5sum] = "a76a44b93acf5e3badda9de111385921" SRC_URI[sha256sum] = "689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288" From 818e1a2821173d311ab65c50b647aa541182df1e Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Mon, 14 Mar 2011 17:12:45 +0100 Subject: [PATCH 196/509] openjdk: use qemu now for the awt sizer binary too * bump INC_PR Signed-off-by: Henning Heinold Signed-off-by: Stefan Schmidt --- .../icedtea-crosscompile-fix.patch | 24 ++++++++++--------- recipes/openjdk/openjdk-6-common.inc | 8 +------ 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/recipes/openjdk/openjdk-6-6b18-1.8/icedtea-crosscompile-fix.patch b/recipes/openjdk/openjdk-6-6b18-1.8/icedtea-crosscompile-fix.patch index ec0f259e8c..652f7ac180 100644 --- a/recipes/openjdk/openjdk-6-6b18-1.8/icedtea-crosscompile-fix.patch +++ b/recipes/openjdk/openjdk-6-6b18-1.8/icedtea-crosscompile-fix.patch @@ -73,17 +73,6 @@ Index: openjdk/jdk/make/sun/xawt/Makefile endif ifeq ($(PLATFORM), solaris) -@@ -237,7 +238,9 @@ - $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ - $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) - --$(SIZES): $(SIZERS) -+#$(SIZES): $(SIZERS) -+# Prevent binaries being created. Instead take what is available. -+$(SIZES): - @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ - $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ - $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ Index: openjdk/hotspot/make/linux/makefiles/vm.make =================================================================== --- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2009-01-24 17:54:57.000000000 +0100 @@ -212,3 +201,16 @@ Index: openjdk/hotspot/make/linux/makefiles/launcher.make LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++ endif +Index: icedtea6-1.8.5/build/openjdk/jdk/make/sun/xawt/Makefile +=================================================================== +--- openjdk/jdk/make/sun/xawt/Makefile 2011-03-14 14:17:03.926207269 +0100 ++++ openjdk/jdk/make/sun/xawt/Makefile 2011-03-14 14:30:11.956186631 +0100 +@@ -245,7 +245,7 @@ + $(CHMOD) +w $@;\ + else \ + $(ECHO) GENERATING $@; \ +- $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ ++ $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ + fi + @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ + $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ diff --git a/recipes/openjdk/openjdk-6-common.inc b/recipes/openjdk/openjdk-6-common.inc index f04800b0b4..54c45f84de 100644 --- a/recipes/openjdk/openjdk-6-common.inc +++ b/recipes/openjdk/openjdk-6-common.inc @@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET" S = "${WORKDIR}/${ICEDTEA}" B = "${S}/build" -INC_PR = "r10" +INC_PR = "r11" SRC_URI = "\ ${ICEDTEA_URI} \ @@ -288,12 +288,6 @@ addtask compilestepone after do_configure before do_compilesteptwo do_compilesteptwo() { echo "2/3 Building bootstrap JDK" - # Take pre-generated binaries from -native build - install -d generated/sun/awt/X11/generator - ln -sf ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/generated/sizer.32 generated/sun/awt/X11/generator/sizer.32 - install -d openjdk/${BUILD_DIR}/gensrc/sun/awt/X11/generator - ln -sf ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/generated/sizer.32 openjdk/${BUILD_DIR}/gensrc/sun/awt/X11/generator/sizer.32 - # Now cross-compile bootstrap JDK rm stamps/icedtea-against-ecj.stamp stamps/icedtea-ecj.stamp || true oe_runmake icedtea-against-ecj From 18d836e8f4c6affc845b85a44527167041cddb1f Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Mon, 14 Mar 2011 17:15:38 +0100 Subject: [PATCH 197/509] cacao-hg: update to latest revision Signed-off-by: Henning Heinold Signed-off-by: Stefan Schmidt --- recipes/cacao/cacao-native_hg.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/cacao/cacao-native_hg.bb b/recipes/cacao/cacao-native_hg.bb index 0f0df641ae..6ece8ddda7 100644 --- a/recipes/cacao/cacao-native_hg.bb +++ b/recipes/cacao/cacao-native_hg.bb @@ -3,7 +3,7 @@ require cacao-native.inc PV = "1.1.0+hgr${SRCPV}" PR = "r2" -SRCREV = "1ac977fe271c" +SRCREV = "c7bf150bfa46" SRC_URI = "hg://mips.complang.tuwien.ac.at/hg/;module=cacao;rev=${SRCREV}" S = "${WORKDIR}/cacao" From 20226024fbe6e58f6b5bf20b842ec11472230a43 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Mon, 14 Mar 2011 12:36:46 +0100 Subject: [PATCH 198/509] icedtea6-native: update to 1.7.10 version * remove sizer.patch we will use qemu on openjdk * delete 1.7.6 recipe for security reasons * update angstroem-jalimo to prefer 1.7.10 Signed-off-by: Henning Heinold Acked-by: Koen Kooi Signed-off-by: Stefan Schmidt --- conf/distro/include/angstrom-jalimo.conf | 2 +- .../build-hacks-native.patch | 0 .../disable-library-checks.patch | 0 .../icedtea-ecj-disable-compilation.patch | 0 .../icedtea-ecj-fix-freetype.patch | 0 .../icedtea-ecj-fix-zlib.patch | 0 .../icedtea-fix-jar-path.patch | 0 ...edtea-hotspot-make-arch-sane-for-x86.patch | 0 .../icedtea-javac-in.patch | 0 .../icedtea-jdk-sane-x86-arch.patch | 0 .../icedtea-sane-x86-arch-name.patch | 0 .../icedtea-unbreak-float.patch | 0 .../icedtea-jdk-build-sizer-32-on-amd64.patch | 36 ------------------- ...ive_1.7.6.bb => icedtea6-native_1.7.10.bb} | 5 ++- 14 files changed, 3 insertions(+), 40 deletions(-) rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/build-hacks-native.patch (100%) rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/disable-library-checks.patch (100%) rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/icedtea-ecj-disable-compilation.patch (100%) rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/icedtea-ecj-fix-freetype.patch (100%) rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/icedtea-ecj-fix-zlib.patch (100%) rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/icedtea-fix-jar-path.patch (100%) rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/icedtea-hotspot-make-arch-sane-for-x86.patch (100%) rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/icedtea-javac-in.patch (100%) rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/icedtea-jdk-sane-x86-arch.patch (100%) rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/icedtea-sane-x86-arch-name.patch (100%) rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/icedtea-unbreak-float.patch (100%) delete mode 100644 recipes/icedtea/icedtea6-native-1.7.6/icedtea-jdk-build-sizer-32-on-amd64.patch rename recipes/icedtea/{icedtea6-native_1.7.6.bb => icedtea6-native_1.7.10.bb} (86%) diff --git a/conf/distro/include/angstrom-jalimo.conf b/conf/distro/include/angstrom-jalimo.conf index 9ba4c70999..e116053a0d 100644 --- a/conf/distro/include/angstrom-jalimo.conf +++ b/conf/distro/include/angstrom-jalimo.conf @@ -23,7 +23,7 @@ PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk" PREFERRED_PROVIDER_classpath = "classpath" PREFERRED_VERSION_openjdk-6-jre = "6b18-1.8.5" -PREFERRED_VERSION_icedtea6-native = "1.7.6" +PREFERRED_VERSION_icedtea6-native = "1.7.10" # Stage JAR files not into ARCH related dirs STAGING_DIR_JAVA = "${STAGING_DIR}/java" diff --git a/recipes/icedtea/icedtea6-native-1.7.6/build-hacks-native.patch b/recipes/icedtea/icedtea6-native-1.7.10/build-hacks-native.patch similarity index 100% rename from recipes/icedtea/icedtea6-native-1.7.6/build-hacks-native.patch rename to recipes/icedtea/icedtea6-native-1.7.10/build-hacks-native.patch diff --git a/recipes/icedtea/icedtea6-native-1.7.6/disable-library-checks.patch b/recipes/icedtea/icedtea6-native-1.7.10/disable-library-checks.patch similarity index 100% rename from recipes/icedtea/icedtea6-native-1.7.6/disable-library-checks.patch rename to recipes/icedtea/icedtea6-native-1.7.10/disable-library-checks.patch diff --git a/recipes/icedtea/icedtea6-native-1.7.6/icedtea-ecj-disable-compilation.patch b/recipes/icedtea/icedtea6-native-1.7.10/icedtea-ecj-disable-compilation.patch similarity index 100% rename from recipes/icedtea/icedtea6-native-1.7.6/icedtea-ecj-disable-compilation.patch rename to recipes/icedtea/icedtea6-native-1.7.10/icedtea-ecj-disable-compilation.patch diff --git a/recipes/icedtea/icedtea6-native-1.7.6/icedtea-ecj-fix-freetype.patch b/recipes/icedtea/icedtea6-native-1.7.10/icedtea-ecj-fix-freetype.patch similarity index 100% rename from recipes/icedtea/icedtea6-native-1.7.6/icedtea-ecj-fix-freetype.patch rename to recipes/icedtea/icedtea6-native-1.7.10/icedtea-ecj-fix-freetype.patch diff --git a/recipes/icedtea/icedtea6-native-1.7.6/icedtea-ecj-fix-zlib.patch b/recipes/icedtea/icedtea6-native-1.7.10/icedtea-ecj-fix-zlib.patch similarity index 100% rename from recipes/icedtea/icedtea6-native-1.7.6/icedtea-ecj-fix-zlib.patch rename to recipes/icedtea/icedtea6-native-1.7.10/icedtea-ecj-fix-zlib.patch diff --git a/recipes/icedtea/icedtea6-native-1.7.6/icedtea-fix-jar-path.patch b/recipes/icedtea/icedtea6-native-1.7.10/icedtea-fix-jar-path.patch similarity index 100% rename from recipes/icedtea/icedtea6-native-1.7.6/icedtea-fix-jar-path.patch rename to recipes/icedtea/icedtea6-native-1.7.10/icedtea-fix-jar-path.patch diff --git a/recipes/icedtea/icedtea6-native-1.7.6/icedtea-hotspot-make-arch-sane-for-x86.patch b/recipes/icedtea/icedtea6-native-1.7.10/icedtea-hotspot-make-arch-sane-for-x86.patch similarity index 100% rename from recipes/icedtea/icedtea6-native-1.7.6/icedtea-hotspot-make-arch-sane-for-x86.patch rename to recipes/icedtea/icedtea6-native-1.7.10/icedtea-hotspot-make-arch-sane-for-x86.patch diff --git a/recipes/icedtea/icedtea6-native-1.7.6/icedtea-javac-in.patch b/recipes/icedtea/icedtea6-native-1.7.10/icedtea-javac-in.patch similarity index 100% rename from recipes/icedtea/icedtea6-native-1.7.6/icedtea-javac-in.patch rename to recipes/icedtea/icedtea6-native-1.7.10/icedtea-javac-in.patch diff --git a/recipes/icedtea/icedtea6-native-1.7.6/icedtea-jdk-sane-x86-arch.patch b/recipes/icedtea/icedtea6-native-1.7.10/icedtea-jdk-sane-x86-arch.patch similarity index 100% rename from recipes/icedtea/icedtea6-native-1.7.6/icedtea-jdk-sane-x86-arch.patch rename to recipes/icedtea/icedtea6-native-1.7.10/icedtea-jdk-sane-x86-arch.patch diff --git a/recipes/icedtea/icedtea6-native-1.7.6/icedtea-sane-x86-arch-name.patch b/recipes/icedtea/icedtea6-native-1.7.10/icedtea-sane-x86-arch-name.patch similarity index 100% rename from recipes/icedtea/icedtea6-native-1.7.6/icedtea-sane-x86-arch-name.patch rename to recipes/icedtea/icedtea6-native-1.7.10/icedtea-sane-x86-arch-name.patch diff --git a/recipes/icedtea/icedtea6-native-1.7.6/icedtea-unbreak-float.patch b/recipes/icedtea/icedtea6-native-1.7.10/icedtea-unbreak-float.patch similarity index 100% rename from recipes/icedtea/icedtea6-native-1.7.6/icedtea-unbreak-float.patch rename to recipes/icedtea/icedtea6-native-1.7.10/icedtea-unbreak-float.patch diff --git a/recipes/icedtea/icedtea6-native-1.7.6/icedtea-jdk-build-sizer-32-on-amd64.patch b/recipes/icedtea/icedtea6-native-1.7.6/icedtea-jdk-build-sizer-32-on-amd64.patch deleted file mode 100644 index 3baeb5d738..0000000000 --- a/recipes/icedtea/icedtea6-native-1.7.6/icedtea-jdk-build-sizer-32-on-amd64.patch +++ /dev/null @@ -1,36 +0,0 @@ -Build the xawt sizer.32 binary on Linux/x86_64 so we can use it when -compiling openjdk for 32-bit platforms. - ---- openjdk/jdk/make/sun/xawt/Makefile.orig 2011-01-08 01:53:22.000000000 -0500 -+++ openjdk/jdk/make/sun/xawt/Makefile 2011-01-11 15:12:17.000000000 -0500 -@@ -184,6 +184,22 @@ - - else # !solaris - -+ifeq ($(PLATFORM), linux) -+ -+ifeq ($(ARCH), amd64) -+# On amd64 we generate both 32 and 64-bit sizers in spite of ARCH_DATA_MODEL. -+SIZERS = $(SIZER).32 $(SIZER).64 -+SIZERS_C = $(SIZER_32_C) $(SIZER_64_C) -+SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 $(WRAPPER_GENERATOR_DIR)/sizes.64 -+CFLAGS_32 = $(CFLAGS) -m32 -+else # !amd64 -+SIZERS = $(SIZER).32 -+SIZERS_C = $(SIZER_32_C) -+SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 -+endif # amd64 -+ -+else # !linux -+ - ifeq ($(ARCH_DATA_MODEL), 32) - SIZERS = $(SIZER).32 - SIZERS_C = $(SIZER_32_C) -@@ -194,6 +210,7 @@ - SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64 - endif # 32 - -+endif # linux - endif # solaris - - # XXX Hack for 6185483 - use hard-coded sizes. diff --git a/recipes/icedtea/icedtea6-native_1.7.6.bb b/recipes/icedtea/icedtea6-native_1.7.10.bb similarity index 86% rename from recipes/icedtea/icedtea6-native_1.7.6.bb rename to recipes/icedtea/icedtea6-native_1.7.10.bb index 126f2f45a8..c55e197d4b 100644 --- a/recipes/icedtea/icedtea6-native_1.7.6.bb +++ b/recipes/icedtea/icedtea6-native_1.7.10.bb @@ -14,8 +14,8 @@ SRC_URI = "\ " SRC_URI[ojdk.md5sum] = "078fe0ab744c98694decc77f2456c560" SRC_URI[ojdk.sha256sum] = "2019a4c3d2d14620caa78d7df49fd987a041066b4631bde4fd8424033f3c1785" -SRC_URI[iced.md5sum] = "0a865e883987665ffcb34db9dd9b35c2" -SRC_URI[iced.sha256sum] = "b28c8bd39d9bd8a28efaaa38280288a3faa6bec0d756323c0555ad3d8c5d77f5" +SRC_URI[iced.md5sum] = "0d61041e46253d089f1b30114716012d" +SRC_URI[iced.sha256sum] = "dbca9d7598352d178651c8cc28ff887c59a27f0125785a58e9f9723611137f78" ICEDTEA_PATCHES = "\ file://icedtea-ecj-disable-compilation.patch;apply=no \ @@ -24,7 +24,6 @@ ICEDTEA_PATCHES = "\ file://icedtea-hotspot-make-arch-sane-for-x86.patch;apply=no \ file://icedtea-jdk-sane-x86-arch.patch;apply=no \ file://icedtea-unbreak-float.patch;apply=no \ - file://icedtea-jdk-build-sizer-32-on-amd64.patch;apply=no \ " export DISTRIBUTION_PATCHES = "\ From 301b55569e9a944a7396991e888eadc7134ed92d Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Wed, 16 Mar 2011 21:47:26 +0100 Subject: [PATCH 199/509] cacao-native: bumpg PR as sugessted by khem Signed-off-by: Henning Heinold Signed-off-by: Stefan Schmidt --- recipes/cacao/cacao-native_hg.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/cacao/cacao-native_hg.bb b/recipes/cacao/cacao-native_hg.bb index 6ece8ddda7..82f56ebad4 100644 --- a/recipes/cacao/cacao-native_hg.bb +++ b/recipes/cacao/cacao-native_hg.bb @@ -1,7 +1,7 @@ require cacao-native.inc PV = "1.1.0+hgr${SRCPV}" -PR = "r2" +PR = "r3" SRCREV = "c7bf150bfa46" SRC_URI = "hg://mips.complang.tuwien.ac.at/hg/;module=cacao;rev=${SRCREV}" From 5d589b268f28e36d637d06814cb8b51906cd9816 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Wed, 16 Mar 2011 11:23:36 +0100 Subject: [PATCH 200/509] angstrom-jalimo: use cacao-native hg version for javac-native * build java packages is more stable than with jamvm Signed-off-by: Henning Heinold Acked-by: Koen Kooi Signed-off-by: Stefan Schmidt --- conf/distro/include/angstrom-jalimo.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/conf/distro/include/angstrom-jalimo.conf b/conf/distro/include/angstrom-jalimo.conf index e116053a0d..48727c40be 100644 --- a/conf/distro/include/angstrom-jalimo.conf +++ b/conf/distro/include/angstrom-jalimo.conf @@ -5,9 +5,8 @@ PREFERRED_VERSION_jamvm-initial = "1.4.5" PREFERRED_VERSION_classpath-initial = "0.93" # Native VM -PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" -PREFERRED_VERSION_jamvm-native = "1.5.3" -#PREFERRED_VERSION_cacao-native = "0.99.3" +PREFERRED_PROVIDER_virtual/java-native ?= "cacao-native" +SRCREV_pn-cacao-native ?= "c7bf150bfa46" PREFERRED_VERSION_classpath-native = "0.98" # Native compiler settings From acd84f136874b411e49fc8baaa10791091db7805 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Wed, 16 Mar 2011 14:33:58 +0100 Subject: [PATCH 201/509] sane-toolchain-java: switch to cacao-native here too Signed-off-by: Henning Heinold Signed-off-by: Stefan Schmidt --- conf/distro/include/sane-toolchain-java.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/sane-toolchain-java.inc b/conf/distro/include/sane-toolchain-java.inc index a0f579252c..365a3d654c 100644 --- a/conf/distro/include/sane-toolchain-java.inc +++ b/conf/distro/include/sane-toolchain-java.inc @@ -1,6 +1,6 @@ # Set PREFFERED and VERSION stuff for working java-toolchain -PREFERRED_PROVIDER_virtual/java-initial = "jamvm-initial" -PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" +PREFERRED_PROVIDER_virtual/java-initial ?= "jamvm-initial" +PREFERRED_PROVIDER_virtual/java-native ?= "cacao-native" PREFERRED_VERSION_classpath-native = "0.98" PREFERRED_VERSION_classpath = "0.98" From 959fe8a4a82af51d521b170a4ddce1e7791c5012 Mon Sep 17 00:00:00 2001 From: Denis Carikli Date: Wed, 23 Mar 2011 02:44:36 +0000 Subject: [PATCH 202/509] bug20: add wifi and bluetooth to MACHINE_FEATURES Signed-off-by: Denis 'GNUtoo' Carikli Acked-by: Stefan Schmidt Signed-off-by: Stefan Schmidt --- conf/machine/bug20.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/bug20.conf b/conf/machine/bug20.conf index a9441bd0a7..95ce49c7f5 100644 --- a/conf/machine/bug20.conf +++ b/conf/machine/bug20.conf @@ -47,7 +47,7 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" PREFERRED_VERSION_u-boot = "git" # and sdio -MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" +MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa wifi bluetooth" # We don't provide a bug20 x-load config yet XLOAD_MACHINE = "omap3530beagle_config" From cd023c3a92455b48935757188142e190763cbbce Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 2 Mar 2011 09:58:45 -0700 Subject: [PATCH 203/509] local.conf.sample: Add an example for using CodeSourcery tools linux-libc-headers portion from Ben Gardiner. Signed-off-by: Tom Rini Signed-off-by: Denys Dmytriyenko --- conf/local.conf.sample | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/conf/local.conf.sample b/conf/local.conf.sample index ff3da96613..5e73baf0d2 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -90,6 +90,20 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # Stay away from unversioned distros unless you really know what you are doing # DISTRO = "angstrom-2008.1" +# Uncomment and modify the following lines if you wish to use an external +# binary toolchain, in this case one built by CodeSourcery. The following +# example is for ARM and we set TOOLCHAIN_VENDOR to "-none" as the CodeSourcery +# ARM tools are arm-none-linux-gnueabi-$tool. Other arches need different +# values here. This assumes that the tools are already in the users PATH. +# TOOLCHAIN_VENDOR = "-none" +# TOOLCHAIN_TYPE = "external" +# TOOLCHAIN_BRAND = "csl" +# TOOLCHAIN_PATH = "/path/to/installed/copy/of/CodeSourcery/Sourcery_G++_Lite" + +# Uncomment this if you want to use linux-headers from the linux-lib-headers +# recipe as opposed to those bundled with the CSL toolchain +# PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" + # So far, angstrom.conf sets ENABLE_BINARY_LOCALE_GENERATION # to generate binary locale packages at build time using qemu-native and # thereby guarantee i18n support on all devices. If your build breaks on From d2413b95fd8e6a8e4b8548b5149bc2d9236b3d77 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 2 Mar 2011 10:17:04 -0700 Subject: [PATCH 204/509] local.conf.sample: Typo fix Spotted by Denys Dmytriyenko. Signed-off-by: Tom Rini Signed-off-by: Denys Dmytriyenko --- conf/local.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 5e73baf0d2..3eb1e9190d 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -100,7 +100,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # TOOLCHAIN_BRAND = "csl" # TOOLCHAIN_PATH = "/path/to/installed/copy/of/CodeSourcery/Sourcery_G++_Lite" -# Uncomment this if you want to use linux-headers from the linux-lib-headers +# Uncomment this if you want to use linux-headers from the linux-libc-headers # recipe as opposed to those bundled with the CSL toolchain # PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" From 7b945cdf7eb752cfc8073ae26c8c2886f360e247 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Sun, 20 Mar 2011 23:59:59 -0400 Subject: [PATCH 205/509] external-toolchain-angstrom: use pre-built Angstrom toolchain * Use pre-built Angstrom toolchain available from [1] as external one [1] http://www.angstrom-distribution.org/toolchains/ Signed-off-by: Denys Dmytriyenko --- recipes/meta/external-toolchain-angstrom.bb | 474 ++++++++++++++++++ .../external-toolchain-angstrom/SUPPORTED | 4 + 2 files changed, 478 insertions(+) create mode 100644 recipes/meta/external-toolchain-angstrom.bb create mode 100644 recipes/meta/external-toolchain-angstrom/SUPPORTED diff --git a/recipes/meta/external-toolchain-angstrom.bb b/recipes/meta/external-toolchain-angstrom.bb new file mode 100644 index 0000000000..e730455f07 --- /dev/null +++ b/recipes/meta/external-toolchain-angstrom.bb @@ -0,0 +1,474 @@ +PR = "r1" + +INHIBIT_DEFAULT_DEPS = "1" + +PACKAGE_NO_GCONV = "1" +PACKAGE_NO_LOCALE = "1" + +INSANE_SKIP_libgcc = "True" +INSANE_SKIP_libstdc++ = "True" +INSANE_SKIP_glibc-utils = "True" +INSANE_SKIP_glibc-dev = "True" +#INSANE_SKIP_gdbserver = "True" + +SRC_URI = "file://SUPPORTED" + +PROVIDES = "\ + virtual/${TARGET_PREFIX}gcc \ + virtual/${TARGET_PREFIX}g++ \ + virtual/${TARGET_PREFIX}gcc-initial \ + virtual/${TARGET_PREFIX}gcc-intermediate \ + virtual/${TARGET_PREFIX}binutils \ + virtual/${TARGET_PREFIX}libc-for-gcc \ + virtual/${TARGET_PREFIX}libc-initial \ + virtual/libc \ + virtual/libintl \ + virtual/libiconv \ + glibc-thread-db \ + ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-angstrom', 'linux-libc-headers', '', d)} \ + ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'external-toolchain-angstrom', 'gdbserver', '', d)} \ +" + +DEPENDS = "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-angstrom', '', 'linux-libc-headers', d)}" +RPROVIDES_glibc-dev += "libc-dev libc6-dev virtual-libc-dev" +PACKAGES_DYNAMIC += "glibc-gconv-*" +PACKAGES_DYNAMIC += "glibc-locale-*" + +LEAD_SONAME = "libc.so.6" + +PACKAGES = "\ + libgcc \ + libgcc-dev \ + libstdc++ \ + libstdc++-dev \ + ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-angstrom', 'linux-libc-headers', '', d)} \ + ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'external-toolchain-angstrom', 'gdbserver', '', d)} \ + glibc-dbg \ + glibc \ + catchsegv \ + sln \ + nscd \ + ldd \ + localedef \ + glibc-utils \ + glibc-dev \ + glibc-locale \ + libsegfault \ + glibc-extra-nss \ + glibc-thread-db \ + glibc-pcprofile \ +" + +FILES_glibc = "\ + ${sysconfdir} \ + ${libexecdir}/* \ + ${datadir}/zoneinfo \ + /lib/libc* \ + /lib/libm* \ + /lib/ld* \ + /lib/libpthread* \ + /lib/libresolv* \ + /lib/librt* \ + /lib/libutil* \ + /lib/libnsl* \ + /lib/libnss_files* \ + /lib/libnss_compat* \ + /lib/libnss_dns* \ + /lib/libdl* \ + /lib/libanl* \ + /lib/libBrokenLocale* \ + /sbin/ldconfig \ +" + +FILES_glibc-dev = "\ + ${includedir} \ + ${libdir}/*.o \ + ${bindir}/rpcgen \ + ${libdir}/*.so \ + ${libdir}/*.a \ +" + +FILES_glibc-dbg += " ${libdir}/gconv/.debug ${libexecdir}/*/.debug ${base_libdir}/.debug ${libdir}/.debug" +FILES_glibc-utils = "${bindir}/* ${sbindir}/*" +FILES_glibc-extra-nss = "/lib/libnss*" +FILES_glibc-gconv = "${libdir}/gconv/*" +FILES_glibc-pcprofile = "/lib/libpcprofile.so" +FILES_glibc-thread-db = "/lib/libthread_db*" + +FILES_libgcc = "${base_libdir}/libgcc_s.so.1" +FILES_libgcc-dev = "${base_libdir}/libgcc_s.so" + +FILES_libstdc++ = "${libdir}/libstdc++.so.*" +FILES_libstdc++-dev = "\ + ${includedir}/c++/* \ + ${libdir}/libstdc++.so \ + ${libdir}/libstdc++.la \ + ${libdir}/libstdc++.a \ + ${libdir}/libsupc++.la \ + ${libdir}/libsupc++.a \ +" + +FILES_linux-libc-headers = "\ + ${includedir}/asm* \ + ${includedir}/linux \ + ${includedir}/mtd \ + ${includedir}/rdma \ + ${includedir}/scsi \ + ${includedir}/sound \ + ${includedir}/video \ +" + +FILES_libsegfault = "/lib/libSegFault*" +FILES_catchsegv = "${bindir}/catchsegv" +RDEPENDS_catchsegv = "libsegfault" + +FILES_ldd = "${bindir}/ldd" +FILES_nscd = "${sbindir}/nscd*" +FILES_sln = "${base_sbindir}/sln" +FILES_localedef = "${bindir}/localedef" +FILES_gdbserver = "${bindir}/gdbserver" + +DESCRIPTION_glibc-utils = "glibc: misc utilities like iconf, local, gencat, tzselect, rpcinfo, ..." +DESCRIPTION_glibc-extra-nss = "glibc: nis, nisplus and hesiod search services" +DESCRIPTION_ldd = "glibc: print shared library dependencies" +DESCRIPTION_nscd = "glibc: name service cache daemon for passwd, group, and hosts" +DESCRIPTION_sln = "glibc: create symbolic links between files" +DESCRIPTION_localedef = "glibc: compile locale definition files" +DESCRIPTION_gdbserver = "gdb - GNU debugger" + +def ang_get_main_version(d): + import os,bb + if os.path.exists(bb.data.getVar('TOOLCHAIN_PATH', d, 1)+'/version'): + f = open(bb.data.getVar('TOOLCHAIN_PATH', d, 1)+'/version', 'r') + l = f.readlines(); + f.close(); + for s in l: + if s.find('Version') > 0: + ver = s.split()[2] + return ver + return None + +def ang_get_gcc_version(d): + import subprocess,os,bb + if os.path.exists(bb.data.getVar('TOOLCHAIN_PATH', d, 1)+'/bin/'+bb.data.getVar('TARGET_PREFIX', d, 1)+'gcc'): + return subprocess.Popen([bb.data.getVar('TOOLCHAIN_PATH', d, 1)+'/bin/'+bb.data.getVar('TARGET_PREFIX', d, 1)+'gcc', '-v'], stderr=subprocess.PIPE).communicate()[1].splitlines()[-1].split()[2] + +def ang_get_libc_version(d): + import os,bb + if os.path.exists(bb.data.getVar('TOOLCHAIN_SYSPATH', d, 1)+'/lib/'): + for file in os.listdir(bb.data.getVar('TOOLCHAIN_SYSPATH', d, 1)+'/lib/'): + if file.find('libc-') == 0: + return file[5:-3] + return None + +def ang_get_kernel_version(d): + import os,bb + if os.path.exists(bb.data.getVar('TOOLCHAIN_SYSPATH', d, 1)+'/usr/include/linux/'): + f = open(bb.data.getVar('TOOLCHAIN_SYSPATH', d, 1)+'/usr/include/linux/version.h', 'r') + l = f.readlines(); + f.close(); + for s in l: + if s.find('LINUX_VERSION_CODE') > 0: + ver = int(s.split()[2]) + maj = ver / 65536 + ver = ver % 65536 + min = ver / 256 + ver = ver % 256 + return str(maj)+'.'+str(min)+'.'+str(ver) + return None + +def ang_get_gdb_version(d): + import subprocess,os,bb + if os.path.exists(bb.data.getVar('TOOLCHAIN_PATH', d, 1)+'/bin/'+bb.data.getVar('TARGET_PREFIX', d, 1)+'gdb'): + return subprocess.Popen([bb.data.getVar('TOOLCHAIN_PATH', d, 1)+'/bin/'+bb.data.getVar('TARGET_PREFIX', d, 1)+'gdb', '-v'],stdout=subprocess.PIPE).communicate()[0].splitlines()[0].split()[-1] + +ANG_VER_MAIN := "${@ang_get_main_version(d)}" +ANG_VER_GCC := "${@ang_get_gcc_version(d)}" +ANG_VER_LIBC := "${@ang_get_libc_version(d)}" +ANG_VER_KERNEL := "${@ang_get_kernel_version(d)}" +ANG_VER_GDBSERVER := "${@ang_get_gdb_version(d)}" +ANG_LIC_LIBC := "LGPLv2.1+" +ANG_LIC_RLE := "${@["GPLv3+ with GCC RLE", "GPLv2+ with GCC RLE"][ang_get_gcc_version(d) <= "4.2.1"]}" +ANG_LIC_GDBSERVER := "${@["GPLv3+", "GPLv2+"][ang_get_gdb_version(d) <= "6.6"]}" + +PKGV = "${ANG_VER_MAIN}" +PKGV_libgcc = "${ANG_VER_GCC}" +PKGV_libgcc-dev = "${ANG_VER_GCC}" +PKGV_libstdc++ = "${ANG_VER_GCC}" +PKGV_libstdc++-dev = "${ANG_VER_GCC}" +PKGV_libc = "${ANG_VER_LIBC}" +PKGV_glibc = "${ANG_VER_LIBC}" +PKGV_glibc-dev = "${ANG_VER_LIBC}" +PKGV_glibc-dbg = "${ANG_VER_LIBC}" +PKGV_glibc-utils = "${ANG_VER_LIBC}" +PKGV_glibc-gconv = "${ANG_VER_LIBC}" +PKGV_glibc-extra-nss = "${ANG_VER_LIBC}" +PKGV_glibc-thread-db = "${ANG_VER_LIBC}" +PKGV_glibc-pcprofile = "${ANG_VER_LIBC}" +PKGV_catchsegv = "${ANG_VER_LIBC}" +PKGV_sln = "${ANG_VER_LIBC}" +PKGV_nscd = "${ANG_VER_LIBC}" +PKGV_ldd = "${ANG_VER_LIBC}" +PKGV_localedef = "${ANG_VER_LIBC}" +PKGV_libsegfault = "${ANG_VER_LIBC}" +PKGV_linux-libc-headers = "${ANG_VER_KERNEL}" +PKGV_gdbserver = "${ANG_VER_GDBSERVER}" + +LICENSE = "${ANG_LIC_LIBC}" +LICENSE_ldd = "${ANG_LIC_LIBC}" +LICENSE_glibc = "${ANG_LIC_LIBC}" +LICENSE_glibc-thread-db = "${ANG_LIC_LIBC}" +LICENSE_libgcc = "${ANG_LIC_RLE}" +LICENSE_libgcc-dev = "${ANG_LIC_RLE}" +LICENSE_libstdc++ = "${ANG_LIC_RLE}" +LICENSE_libstdc++-dev = "${ANG_LIC_RLE}" +LICENSE_gdbserver = "${ANG_LIC_GDBSERVER}" + +do_install() { + install -d ${D}${sysconfdir} + install -d ${D}${bindir} + install -d ${D}${sbindir} + install -d ${D}${base_bindir} + install -d ${D}${libdir} + install -d ${D}${base_libdir} + install -d ${D}${base_sbindir} + install -d ${D}${datadir} + install -d ${D}${includedir} + + cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${base_libdir}/{lib*,ld*} ${D}${base_libdir} + cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${base_sbindir}/ldconfig ${D}${base_sbindir} + cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${bindir}/{gencat,getconf,getent,iconv,locale,mtrace,pcprofiledump,rpcgen,sprof,tzselect,xtrace} ${D}${bindir} + cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${sbindir}/{iconvconfig,rpcinfo,zdump,zic} ${D}${sbindir} + cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${includedir}/{arpa,asm*,bits,drm,gnu,linux,mtd,net*,nfs,protocols,rdma,rpc*,scsi,sound,sys*,video,*.h} ${D}${includedir} + cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${libdir}/{?crt1.o,crt?.o,libBrokenLocale*,libanl*,libc.*,libc_*,libcrypt.*,libcidn.*,libdl.*,libg.*,libieee.*,libm.*,libmcheck.*,libnsl*,libnss*,libpthread*,libresolv*,librt*,libstdc*,libthread*,libutil*} ${D}${libdir} + + ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-angstrom', '', 'rm -rf ${D}/usr/include/linux', d)} + + cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/include/* ${D}${includedir} + ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'external-toolchain-angstrom', '', 'rm -rf ${D}/usr/bin/gdbserver', d)} + + sed -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc.so > ${D}${libdir}/temp + mv ${D}${libdir}/temp ${D}${libdir}/libc.so + + sed -e "s# /lib# ../../lib#" -e "s# /usr/lib# .#g" ${D}${libdir}/libpthread.so > ${D}${libdir}/temp + mv ${D}${libdir}/temp ${D}${libdir}/libpthread.so +} + +TMP_LOCALE="/tmp/locale${libdir}/locale" + +locale_base_postinst() { +#!/bin/sh + +if [ "x$D" != "x" ]; then + exit 1 +fi + +rm -rf ${TMP_LOCALE} +mkdir -p ${TMP_LOCALE} +if [ -f ${libdir}/locale/locale-archive ]; then + cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/ +fi +localedef --inputfile=${datadir}/i18n/locales/%s --charmap=%s --prefix=/tmp/locale %s +mkdir -p ${libdir}/locale/ +mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/ +rm -rf ${TMP_LOCALE} +} + +locale_base_postrm() { +#!/bin/sh + +rm -rf ${TMP_LOCALE} +mkdir -p ${TMP_LOCALE} +if [ -f ${libdir}/locale/locale-archive ]; then + cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/ +fi +localedef --delete-from-archive --inputfile=${datadir}/locales/%s --charmap=%s --prefix=/tmp/locale %s +mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/ +rm -rf ${TMP_LOCALE} +} + +python package_do_split_gconvs () { + import os, re + if (bb.data.getVar('PACKAGE_NO_GCONV', d, 1) == '1'): + bb.note("package requested not splitting gconvs") + return + + if not bb.data.getVar('PACKAGES', d, 1): + return + + libdir = bb.data.getVar('libdir', d, 1) + if not libdir: + bb.error("libdir not defined") + return + datadir = bb.data.getVar('datadir', d, 1) + if not datadir: + bb.error("datadir not defined") + return + + libcver = bb.data.getVar('ANG_VER_LIBC', d, 1) + if not libcver: + bb.error("ANG_VER_LIBC not defined") + return + + gconv_libdir = os.path.join(libdir, "gconv") + charmap_dir = os.path.join(datadir, "i18n", "charmaps") + locales_dir = os.path.join(datadir, "i18n", "locales") + binary_locales_dir = os.path.join(libdir, "locale") + + def set_pkg_ver(fn, pkg, file_regex, output_pattern, group): + bb.data.setVar('PKGV_' + pkg, libcver, d) + + do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='glibc-gconv-%s', description='gconv module for character set %s', hook=set_pkg_ver, extra_depends='glibc-gconv') + + do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='glibc-charmap-%s', description='character map for %s encoding', hook=set_pkg_ver, extra_depends='') + + def calc_locale_deps(fn, pkg, file_regex, output_pattern, group): + deps = [] + f = open(fn, "r") + c_re = re.compile('^copy "(.*)"') + i_re = re.compile('^include "(\w+)".*') + for l in f.readlines(): + m = c_re.match(l) or i_re.match(l) + if m: + dp = legitimize_package_name('glibc-localedata-%s' % m.group(1)) + if not dp in deps: + deps.append(dp) + f.close() + if deps != []: + bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) + bb.data.setVar('PKGV_' + pkg, libcver, d) + + do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') + bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' glibc-gconv', d) + + f = open(os.path.join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r") + supported = f.readlines() + f.close() + + dot_re = re.compile("(.*)\.(.*)") + + # Collate the locales by base and encoding + encodings = {} + for l in supported: + l = l[:-1] + (locale, charset) = l.split(" ") + m = dot_re.match(locale) + if m: + locale = m.group(1) + if not encodings.has_key(locale): + encodings[locale] = [] + encodings[locale].append(charset) + + def output_locale_source(name, locale, encoding): + pkgname = 'locale-base-' + legitimize_package_name(name) + + bb.data.setVar('RDEPENDS_%s' % pkgname, 'localedef glibc-localedata-%s glibc-charmap-%s' % (legitimize_package_name(locale), legitimize_package_name(encoding)), d) + rprovides = 'virtual-locale-%s' % legitimize_package_name(name) + m = re.match("(.*)_(.*)", name) + if m: + rprovides += ' virtual-locale-%s' % m.group(1) + bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d) + bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d) + bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d) + bb.data.setVar('pkg_postinst_%s' % pkgname, bb.data.getVar('locale_base_postinst', d, 1) % (locale, encoding, locale), d) + bb.data.setVar('pkg_postrm_%s' % pkgname, bb.data.getVar('locale_base_postrm', d, 1) % (locale, encoding, locale), d) + bb.data.setVar('PKGV_' + pkgname, libcver, d) + + def output_locale_binary(name, locale, encoding): + target_arch = bb.data.getVar("TARGET_ARCH", d, 1) + qemu = "qemu-%s" % target_arch + pkgname = 'locale-base-' + legitimize_package_name(name) + m = re.match("(.*)\.(.*)", name) + if m: + glibc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-","")) + else: + glibc_name = name + bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('glibc-binary-localedata-%s' % glibc_name), d) + rprovides = 'virtual-locale-%s' % legitimize_package_name(name) + m = re.match("(.*)_(.*)", name) + if m: + rprovides += ' virtual-locale-%s' % m.group(1) + bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d) + bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d) + bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d) + bb.data.setVar('PKGV_' + pkgname, libcver, d) + + treedir = os.path.join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") + path = bb.data.getVar("PATH", d, 1) + i18npath = os.path.join(treedir, datadir, "i18n") + + localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name) + cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts) + bb.note("generating locale %s (%s)" % (locale, encoding)) + if os.system(cmd): + raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd) + + def output_locale(name, locale, encoding): + output_locale_source(name, locale, encoding) + + # Reshuffle names so that UTF-8 is preferred over other encodings + non_utf8 = [] + for l in encodings.keys(): + if len(encodings[l]) == 1: + output_locale(l, l, encodings[l][0]) + if encodings[l][0] != "UTF-8": + non_utf8.append(l) + else: + if "UTF-8" in encodings[l]: + output_locale(l, l, "UTF-8") + encodings[l].remove("UTF-8") + else: + non_utf8.append(l) + for e in encodings[l]: + output_locale('%s.%s' % (l, e), l, e) + + if non_utf8 != []: + bb.note("the following locales are supported only in legacy encodings:") + bb.note(" " + " ".join(non_utf8)) +} + +python package_do_split_locales() { + if (bb.data.getVar('PACKAGE_NO_LOCALE', d, True) == '1'): + bb.debug(1, "package requested not splitting locales") + return + + packages = (bb.data.getVar('PACKAGES', d, True) or "").split() + + datadir = bb.data.getVar('datadir', d, True) + if not datadir: + bb.note("datadir not defined") + return + + if 'glibc-locale' in packages: + packages.remove('glibc-locale') + + localedir = os.path.join(datadir, 'locale') + + if not os.path.isdir(localedir): + bb.debug(1, "No locale files in this package") + return + + locales = os.listdir(localedir) + for l in locales: + ln = legitimize_package_name(l) + pkg = 'glibc-locale-' + ln + packages.append(pkg) + bb.data.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l), d) + bb.data.setVar('RDEPENDS_' + pkg, 'glibc virtual-locale-%s' % ln, d) + bb.data.setVar('RPROVIDES_' + pkg, 'glibc-locale %s-translation' % ln, d) + bb.data.setVar('DESCRIPTION_' + pkg, '%s translation for glibc' % l, d) + bb.data.setVar('PKGV_' + pkg, bb.data.getVar('ANG_VER_LIBC', d, 1), d) + + bb.data.setVar('PACKAGES', ' '.join(packages), d) +} + +python populate_packages_prepend () { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_glibc', 'libc6', d) + bb.data.setVar('PKG_glibc-dev', 'libc6-dev', d) + bb.data.setVar('PKG_libgcc', 'libgcc1', d) + bb.data.setVar('PKG_libgcc-dev', 'libgcc1-dev', d) + bb.build.exec_func('package_do_split_gconvs', d) +} + +NATIVE_INSTALL_WORKS = "1" diff --git a/recipes/meta/external-toolchain-angstrom/SUPPORTED b/recipes/meta/external-toolchain-angstrom/SUPPORTED new file mode 100644 index 0000000000..fe9406acd1 --- /dev/null +++ b/recipes/meta/external-toolchain-angstrom/SUPPORTED @@ -0,0 +1,4 @@ +en_GB.UTF-8 UTF-8 +en_GB ISO-8859-1 +en_US.UTF-8 UTF-8 +en_US ISO-8859-1 From 57a2d75b5b1a8fe56141bcc8362b7529021de891 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 21 Mar 2011 00:07:12 -0400 Subject: [PATCH 206/509] local.conf: add example to use external angstrom toolchain Signed-off-by: Denys Dmytriyenko --- conf/local.conf.sample | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 3eb1e9190d..4a27130d3a 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -100,8 +100,16 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # TOOLCHAIN_BRAND = "csl" # TOOLCHAIN_PATH = "/path/to/installed/copy/of/CodeSourcery/Sourcery_G++_Lite" +# This example is for the Angstrom ARM toolchain, that uses cross prefix of +# arm-angstrom-linux-gnueabi-$tool. This assumes that the tools are already +# in the users PATH. +# TOOLCHAIN_VENDOR = "-angstrom" +# TOOLCHAIN_TYPE = "external" +# TOOLCHAIN_BRAND = "angstrom" +# TOOLCHAIN_PATH = "/usr/local/angstrom/arm" + # Uncomment this if you want to use linux-headers from the linux-libc-headers -# recipe as opposed to those bundled with the CSL toolchain +# recipe as opposed to those bundled with the external (csl/angstrom) toolchain # PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" # So far, angstrom.conf sets ENABLE_BINARY_LOCALE_GENERATION From a9a75ef786f0aef9ec41897378f104aa37ce97f7 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 25 Mar 2011 17:53:22 -0400 Subject: [PATCH 207/509] external-toolchain-csl: update licensing info, document exceptions * Split GCC and RLE licenses and base them off different gcc versions * Document all the details about the licenses and exceptions, so they won't get changed by accident again Signed-off-by: Denys Dmytriyenko --- recipes/meta/external-toolchain-csl.bb | 39 +++++++++++++++++--------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/recipes/meta/external-toolchain-csl.bb b/recipes/meta/external-toolchain-csl.bb index 619658ef7a..f7bcbf22bd 100644 --- a/recipes/meta/external-toolchain-csl.bb +++ b/recipes/meta/external-toolchain-csl.bb @@ -1,4 +1,4 @@ -PR = "r10" +PR = "r11" INHIBIT_DEFAULT_DEPS = "1" @@ -177,9 +177,32 @@ CSL_VER_GCC := "${@csl_get_gcc_version(d)}" CSL_VER_LIBC := "${@csl_get_libc_version(d)}" CSL_VER_KERNEL := "${@csl_get_kernel_version(d)}" CSL_VER_GDBSERVER := "${@csl_get_gdb_version(d)}" + +# Licenses set for main components of the toolchain: +# (g)libc is always LGPL version 2 (or later) +# gcc has switched from GPL version 2 (or later) to version 3 (or later) after 4.2.1, +# see this announcement - http://gcc.gnu.org/ml/gcc-announce/2007/msg00003.html +# libgcc and libstdc++ always had exceptions to GPL called Runtime Library Exception, but +# it was based on GPL version 2 (or later), until new GPL version 3 (or later) exception +# was introduced on 27 Jan 2009 - http://gcc.gnu.org/ml/gcc-announce/2009/msg00000.html +# and http://www.gnu.org/licenses/gcc-exception.html, which was several days after +# gcc 4.3.3 was released - http://gcc.gnu.org/releases.html +# gdb/gdbserver version 6.6 was the last one under GPL version 2 (or later), according +# to the release schedule - http://www.gnu.org/software/gdb/schedule/ CSL_LIC_LIBC := "LGPLv2.1+" -CSL_LIC_RLE := "${@["GPLv3 with GCC RLE", "GPLv2 with GCC RLE"][csl_get_main_version(d) <= "2007q3-51"]}" -CSL_LIC_GDBSERVER := "${@["GPLv2+", "GPLv3+"][csl_get_gdb_version(d) >= "6.7.1"]}" +CSL_LIC_GCC := "${@["GPLv3+", "GPLv2+"][csl_get_gcc_version(d) <= "4.2.1"]}" +CSL_LIC_RLE := "${@["GPLv3+ with GCC RLE", "GPLv2+ with GCC RLE"][csl_get_gcc_version(d) <= "4.3.3"]}" +CSL_LIC_GDB := "${@["GPLv3+", "GPLv2+"][csl_get_gdb_version(d) <= "6.6"]}" + +LICENSE = "${CSL_LIC_LIBC}" +LICENSE_ldd = "${CSL_LIC_LIBC}" +LICENSE_glibc = "${CSL_LIC_LIBC}" +LICENSE_glibc-thread-db = "${CSL_LIC_LIBC}" +LICENSE_libgcc = "${CSL_LIC_RLE}" +LICENSE_libgcc-dev = "${CSL_LIC_RLE}" +LICENSE_libstdc++ = "${CSL_LIC_RLE}" +LICENSE_libstdc++-dev = "${CSL_LIC_RLE}" +LICENSE_gdbserver = "${CSL_LIC_GDB}" PKGV = "${CSL_VER_MAIN}" PKGV_libgcc = "${CSL_VER_GCC}" @@ -204,16 +227,6 @@ PKGV_libsegfault = "${CSL_VER_LIBC}" PKGV_linux-libc-headers = "${CSL_VER_KERNEL}" PKGV_gdbserver = "${CSL_VER_GDBSERVER}" -LICENSE = "${CSL_LIC_LIBC}" -LICENSE_ldd = "${CSL_LIC_LIBC}" -LICENSE_glibc = "${CSL_LIC_LIBC}" -LICENSE_glibc-thread-db = "${CSL_LIC_LIBC}" -LICENSE_libgcc = "${CSL_LIC_RLE}" -LICENSE_libgcc-dev = "${CSL_LIC_RLE}" -LICENSE_libstdc++ = "${CSL_LIC_RLE}" -LICENSE_libstdc++-dev = "${CSL_LIC_RLE}" -LICENSE_gdbserver = "${CSL_LIC_GDBSERVER}" - do_install() { install -d ${D}${sysconfdir} install -d ${D}${bindir} From 2592c3a4d583c41e18f57450731cae660ae77f8b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 25 Mar 2011 17:58:06 -0400 Subject: [PATCH 208/509] external-toolchain-angstrom: update licensing info, document exceptions * Split GCC and RLE licenses and base them off different gcc versions * Document all the details about the licenses and exceptions, so they won't get changed by accident again Signed-off-by: Denys Dmytriyenko --- recipes/meta/external-toolchain-angstrom.bb | 39 ++++++++++++++------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/recipes/meta/external-toolchain-angstrom.bb b/recipes/meta/external-toolchain-angstrom.bb index e730455f07..08ce042be4 100644 --- a/recipes/meta/external-toolchain-angstrom.bb +++ b/recipes/meta/external-toolchain-angstrom.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" INHIBIT_DEFAULT_DEPS = "1" @@ -187,9 +187,32 @@ ANG_VER_GCC := "${@ang_get_gcc_version(d)}" ANG_VER_LIBC := "${@ang_get_libc_version(d)}" ANG_VER_KERNEL := "${@ang_get_kernel_version(d)}" ANG_VER_GDBSERVER := "${@ang_get_gdb_version(d)}" + +# Licenses set for main components of the toolchain: +# (g)libc is always LGPL version 2 (or later) +# gcc has switched from GPL version 2 (or later) to version 3 (or later) after 4.2.1, +# see this announcement - http://gcc.gnu.org/ml/gcc-announce/2007/msg00003.html +# libgcc and libstdc++ always had exceptions to GPL called Runtime Library Exception, but +# it was based on GPL version 2 (or later), until new GPL version 3 (or later) exception +# was introduced on 27 Jan 2009 - http://gcc.gnu.org/ml/gcc-announce/2009/msg00000.html +# and http://www.gnu.org/licenses/gcc-exception.html, which was several days after +# gcc 4.3.3 was released - http://gcc.gnu.org/releases.html +# gdb/gdbserver version 6.6 was the last one under GPL version 2 (or later), according +# to the release schedule - http://www.gnu.org/software/gdb/schedule/ ANG_LIC_LIBC := "LGPLv2.1+" -ANG_LIC_RLE := "${@["GPLv3+ with GCC RLE", "GPLv2+ with GCC RLE"][ang_get_gcc_version(d) <= "4.2.1"]}" -ANG_LIC_GDBSERVER := "${@["GPLv3+", "GPLv2+"][ang_get_gdb_version(d) <= "6.6"]}" +ANG_LIC_GCC := "${@["GPLv3+", "GPLv2+"][ang_get_gcc_version(d) <= "4.2.1"]}" +ANG_LIC_RLE := "${@["GPLv3+ with GCC RLE", "GPLv2+ with GCC RLE"][ang_get_gcc_version(d) <= "4.3.3"]}" +ANG_LIC_GDB := "${@["GPLv3+", "GPLv2+"][ang_get_gdb_version(d) <= "6.6"]}" + +LICENSE = "${ANG_LIC_LIBC}" +LICENSE_ldd = "${ANG_LIC_LIBC}" +LICENSE_glibc = "${ANG_LIC_LIBC}" +LICENSE_glibc-thread-db = "${ANG_LIC_LIBC}" +LICENSE_libgcc = "${ANG_LIC_RLE}" +LICENSE_libgcc-dev = "${ANG_LIC_RLE}" +LICENSE_libstdc++ = "${ANG_LIC_RLE}" +LICENSE_libstdc++-dev = "${ANG_LIC_RLE}" +LICENSE_gdbserver = "${ANG_LIC_GDBSERVER}" PKGV = "${ANG_VER_MAIN}" PKGV_libgcc = "${ANG_VER_GCC}" @@ -214,16 +237,6 @@ PKGV_libsegfault = "${ANG_VER_LIBC}" PKGV_linux-libc-headers = "${ANG_VER_KERNEL}" PKGV_gdbserver = "${ANG_VER_GDBSERVER}" -LICENSE = "${ANG_LIC_LIBC}" -LICENSE_ldd = "${ANG_LIC_LIBC}" -LICENSE_glibc = "${ANG_LIC_LIBC}" -LICENSE_glibc-thread-db = "${ANG_LIC_LIBC}" -LICENSE_libgcc = "${ANG_LIC_RLE}" -LICENSE_libgcc-dev = "${ANG_LIC_RLE}" -LICENSE_libstdc++ = "${ANG_LIC_RLE}" -LICENSE_libstdc++-dev = "${ANG_LIC_RLE}" -LICENSE_gdbserver = "${ANG_LIC_GDBSERVER}" - do_install() { install -d ${D}${sysconfdir} install -d ${D}${bindir} From d05ee0754743eb625068c482fa194e3517b0eb27 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 25 Mar 2011 18:03:49 -0400 Subject: [PATCH 209/509] external-toolchain-angstrom: variable name for gdb license got changed Signed-off-by: Denys Dmytriyenko --- recipes/meta/external-toolchain-angstrom.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/meta/external-toolchain-angstrom.bb b/recipes/meta/external-toolchain-angstrom.bb index 08ce042be4..2bab6db39a 100644 --- a/recipes/meta/external-toolchain-angstrom.bb +++ b/recipes/meta/external-toolchain-angstrom.bb @@ -212,7 +212,7 @@ LICENSE_libgcc = "${ANG_LIC_RLE}" LICENSE_libgcc-dev = "${ANG_LIC_RLE}" LICENSE_libstdc++ = "${ANG_LIC_RLE}" LICENSE_libstdc++-dev = "${ANG_LIC_RLE}" -LICENSE_gdbserver = "${ANG_LIC_GDBSERVER}" +LICENSE_gdbserver = "${ANG_LIC_GDB}" PKGV = "${ANG_VER_MAIN}" PKGV_libgcc = "${ANG_VER_GCC}" From d822df9b37cf65352dd6c77bb6ec8525d0225a59 Mon Sep 17 00:00:00 2001 From: Jeff Lance Date: Sun, 27 Mar 2011 04:38:48 +0000 Subject: [PATCH 210/509] matrix-gui: Bump up SRCREV * Bump up SRCREV to bring in mods on am180x and other platforms * am180x: Automated Wifi * am181x, am180x, omap-l138, dm368: Removing TI SVG icons as they were found to slow down update performance * am180x: Fixing PRU EDMA example * pulling in addtional mods from other platforms * omap-l138 * dm368 * dm3730 * ti814x * ti816x Signed-off-by: Jeff Lance Signed-off-by: Denys Dmytriyenko --- recipes/ti/matrix-gui-common_1.4.bb | 4 ++-- recipes/ti/matrix-gui-e_1.3.bb | 4 ++-- recipes/ti/matrix-gui_1.3.bb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/ti/matrix-gui-common_1.4.bb b/recipes/ti/matrix-gui-common_1.4.bb index 609a16ae38..29d6b3e0cb 100644 --- a/recipes/ti/matrix-gui-common_1.4.bb +++ b/recipes/ti/matrix-gui-common_1.4.bb @@ -4,5 +4,5 @@ require matrix-gui-common.inc # prebuilt version in the repository. RRECOMMENDS_${PN} = "am-sysinfo" -SRCREV = "222" -PR = "${INC_PR}.6" +SRCREV = "242" +PR = "${INC_PR}.7" diff --git a/recipes/ti/matrix-gui-e_1.3.bb b/recipes/ti/matrix-gui-e_1.3.bb index c75470b50d..00aeb42e4f 100644 --- a/recipes/ti/matrix-gui-e_1.3.bb +++ b/recipes/ti/matrix-gui-e_1.3.bb @@ -1,5 +1,5 @@ require matrix-gui-e.inc -SRCREV = "222" -PR = "${INC_PR}.5" +SRCREV = "242" +PR = "${INC_PR}.6" diff --git a/recipes/ti/matrix-gui_1.3.bb b/recipes/ti/matrix-gui_1.3.bb index 98a03b418a..ddcb15a9be 100644 --- a/recipes/ti/matrix-gui_1.3.bb +++ b/recipes/ti/matrix-gui_1.3.bb @@ -1,4 +1,4 @@ require matrix-gui.inc -SRCREV = "222" -PR = "${INC_PR}.1" +SRCREV = "242" +PR = "${INC_PR}.2" From 0f590a23368828c713c6d122b33db14fea9cc306 Mon Sep 17 00:00:00 2001 From: Kartik Mohta Date: Wed, 23 Mar 2011 03:59:49 +0000 Subject: [PATCH 211/509] libarchive: Requires libxml2 Signed-off-by: Kartik Mohta Signed-off-by: Khem Raj Signed-off-by: Koen Kooi --- recipes/libarchive/libarchive_2.8.4.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/libarchive/libarchive_2.8.4.bb b/recipes/libarchive/libarchive_2.8.4.bb index 551746bb0b..1139416c85 100644 --- a/recipes/libarchive/libarchive_2.8.4.bb +++ b/recipes/libarchive/libarchive_2.8.4.bb @@ -4,6 +4,8 @@ SECTION = "devel" LICENSE = "BSD" PR = "r0" +DEPENDS = "libxml2" + SRC_URI = "http://libarchive.googlecode.com/files/${PN}-${PV}.tar.gz \ file://0001-Patch-from-upstream-revision-1990.patch \ file://0002-Patch-from-upstream-revision-1991.patch \ From cec7504d7153d2a45c9f25ba80a7d11b22a5cfae Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 25 Mar 2011 10:11:31 +0100 Subject: [PATCH 212/509] mc: add RRECOMMENDed mc-skins package and more files to FILES_PN * fixes SHR bug http://trac.shr-project.org/trac/ticket/1348 * and not packaged files Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- recipes/mc/mc.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes/mc/mc.inc b/recipes/mc/mc.inc index ef0ae94cda..8bad192c9a 100644 --- a/recipes/mc/mc.inc +++ b/recipes/mc/mc.inc @@ -6,7 +6,7 @@ SECTION = "console/utils" PRIORITY = "optional" DEPENDS = "ncurses glib-2.0 glib-2.0-native" RDEPENDS_${PN} = "ncurses-terminfo" -INC_PR = "r6" +INC_PR = "r7" SRC_URI = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-${PV}.tar.gz" @@ -20,12 +20,13 @@ ac_cv_path_UNZIP=${bindir}/unzip \ " EXTRA_OEMAKE = 'GLIB_CFLAGS_FOR_BUILD="$GLIB_CFLAGS_FOR_BUILD" GLIB_LIBS_FOR_BUILD="$GLIB_LIBS_FOR_BUILD" CC_FOR_BUILD="$CC_FOR_BUILD"' -PACKAGES += "${PN}-extfs ${PN}-hilite" -FILES_${PN} = "${bindir}/ ${libexecdir}/mc ${datadir}/mc/*.charsets ${datadir}/mc/*.ext ${datadir}/mc/*.hint ${datadir}/mc/*.hlp ${datadir}/mc/*.lib ${datadir}/mc/*.menu ${datadir}/mc/*.rc ${datadir}/mc/bin /etc/profile.d" +PACKAGES += "${PN}-extfs ${PN}-hilite ${PN}-skins" +FILES_${PN} = "${bindir}/ ${libexecdir}/mc ${datadir}/mc/*.charsets ${datadir}/mc/*.ext ${datadir}/mc/hints/ ${datadir}/mc/*.hint ${datadir}/mc/help/ ${datadir}/mc/*.hlp ${datadir}/mc/*.lib ${datadir}/mc/*.menu ${datadir}/mc/*.rc ${datadir}/mc/bin /etc/profile.d ${sysconfdir}/mc/" FILES_${PN}-extfs = "${datadir}/mc/extfs/" FILES_${PN}-hilite = "${datadir}/mc/syntax/" +FILES_${PN}-skins = "${datadir}/mc/skins/" FILES_${PN}-dbg += "${libexecdir}/mc/.debug" -RRECOMMENDS_${PN} += "${PN}-extfs ${PN}-hilite" +RRECOMMENDS_${PN} += "${PN}-extfs ${PN}-hilite ${PN}-skins" RDEPENDS_${PN}-extfs = "${PN}" RDEPENDS_${PN}-hilite = "${PN}" PACKAGE_ARCH_${PN}-extfs = "all" From 1db2f5b2b0d54e4acd5eeb6ec46079b7dad28a5e Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Thu, 24 Mar 2011 21:01:14 +0000 Subject: [PATCH 213/509] TI IPC: Fix License field. * The correct license for TI IPC is BSD and not TI. Signed-off-by: Siddharth Heroor Signed-off-by: Koen Kooi --- recipes/ti/ti-ipc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/ti/ti-ipc.inc b/recipes/ti/ti-ipc.inc index cd6ad6e3d5..fc9b90804b 100644 --- a/recipes/ti/ti-ipc.inc +++ b/recipes/ti/ti-ipc.inc @@ -1,7 +1,7 @@ DESCRIPTION = "TI Inter Process Ccommunication (IPC) Mechanisms (for Uni- and Multi- Processor Configurations)" HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ipc/index.html" SECTION = "devel" -LICENSE = "TI" +LICENSE = "BSD" require ti-paths.inc require ti-staging.inc From cded48066cfe305508112d8adb5fbe3a51f4f94b Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Thu, 24 Mar 2011 21:01:15 +0000 Subject: [PATCH 214/509] TI IPC: Add missing dependencies * The IPC software is for Sys/Bios and is dependent on Sys/Bios. * To Build IPC and stage it we need XDCTools and C6000 Codegen. Signed-off-by: Siddharth Heroor Signed-off-by: Koen Kooi --- recipes/ti/ti-ipc.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/ti/ti-ipc.inc b/recipes/ti/ti-ipc.inc index fc9b90804b..2a23a9b977 100644 --- a/recipes/ti/ti-ipc.inc +++ b/recipes/ti/ti-ipc.inc @@ -13,6 +13,7 @@ S = "${WORKDIR}/ipc_${PV}" SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ipc/${PV}/exports/ipc_setuplinux_${PV}.bin;name=ipcbin" +DEPENDS = "ti-sysbios ti-cgt6x ti-xdctools" BINFILE="ipc_setuplinux_${PV}.bin" TI_BIN_UNPK_CMDS="Y: qY:workdir:Y" From e10d77c83ffd0f399d3e9b4d3ef932b2b731df89 Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Thu, 24 Mar 2011 21:01:16 +0000 Subject: [PATCH 215/509] TI IPC: Add version 1.22.04.25 * This version is one the first versions of TI IPC available. * Fix the installer installer command in the include file. Since this is the first version available on OE, changing this does not affect any other versions. Signed-off-by: Siddharth Heroor Signed-off-by: Koen Kooi --- recipes/ti/ti-ipc.inc | 2 +- recipes/ti/ti-ipc_1.22.04.25.bb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 recipes/ti/ti-ipc_1.22.04.25.bb diff --git a/recipes/ti/ti-ipc.inc b/recipes/ti/ti-ipc.inc index 2a23a9b977..0bc6218039 100644 --- a/recipes/ti/ti-ipc.inc +++ b/recipes/ti/ti-ipc.inc @@ -15,7 +15,7 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ip DEPENDS = "ti-sysbios ti-cgt6x ti-xdctools" BINFILE="ipc_setuplinux_${PV}.bin" -TI_BIN_UNPK_CMDS="Y: qY:workdir:Y" +TI_BIN_UNPK_CMDS="Y: q:workdir:Y" do_install() { install -d ${D}${IPC_INSTALL_DIR_RECIPE} diff --git a/recipes/ti/ti-ipc_1.22.04.25.bb b/recipes/ti/ti-ipc_1.22.04.25.bb new file mode 100644 index 0000000000..1573dce548 --- /dev/null +++ b/recipes/ti/ti-ipc_1.22.04.25.bb @@ -0,0 +1,6 @@ +require ti-ipc.inc + +PV = "1_22_04_25" + +SRC_URI[ipcbin.md5sum] = "aaa7f3776794a92b4226cd923c7cd956" +SRC_URI[ipcbin.sha256sum] = "b33e25e0330719c2857a5ca3abccd03fe1b55a9300b2f825707f2bc64b84c883" From 81a1b8d4e672936f401f9e1fe9dea0b702147eda Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Fri, 25 Mar 2011 13:02:31 +0000 Subject: [PATCH 216/509] TI XDCTools: Add version 3.20.08.88 Signed-off-by: Siddharth Heroor Signed-off-by: Koen Kooi --- recipes/ti/ti-xdctools_3.20.08.88.bb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 recipes/ti/ti-xdctools_3.20.08.88.bb diff --git a/recipes/ti/ti-xdctools_3.20.08.88.bb b/recipes/ti/ti-xdctools_3.20.08.88.bb new file mode 100644 index 0000000000..bf0cdcdd10 --- /dev/null +++ b/recipes/ti/ti-xdctools_3.20.08.88.bb @@ -0,0 +1,6 @@ +require ti-xdctools.inc + +PV = "3_20_08_88" + +SRC_URI[xdcbin.md5sum] = "068447e935adb54f0cacf0e294a281f9" +SRC_URI[xdcbin.sha256sum] = "a4616fae3cc2a9f46b5b4377bb57af7f7932297cda210a6cbcc5f942256db196" From 1973ed07859668f2455fed5f368023cabdecd4ef Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 25 Mar 2011 09:18:35 +0100 Subject: [PATCH 217/509] x-load git: update to 1.5.0 Tested on beagle-xm/angstrom and pandaboard/angstrom Signed-off-by: Koen Kooi --- recipes/x-load/x-load_git.bb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/recipes/x-load/x-load_git.bb b/recipes/x-load/x-load_git.bb index a181b3c755..17a33b86b9 100644 --- a/recipes/x-load/x-load_git.bb +++ b/recipes/x-load/x-load_git.bb @@ -4,18 +4,12 @@ DEFAULT_PREFERENCE_omap3-pandora = "-1" FILESPATHPKG_prepend = "x-load-git:x-load-git/${MACHINE}" -PV = "1.44+${PR}+gitr${SRCREV}" -PR ="r21" +PV = "1.5.0+${PR}+gitr${SRCREV}" +PR ="r22" PE = "1" -SRCREV = "24b8b7f41a83540433024854736518876257672c" +SRCREV = "b6bbfe7848de547b64edf1c363c86cec4921b517" SRC_URI = "git://gitorious.org/x-loader/x-loader.git;branch=master;protocol=git \ - file://0001-OMAP4-clocks-Enable-only-required-clks.patch \ - file://0002-OMAP4-Select-DPLL-PER-Clock-as-source-for-SGX-FCLK.patch \ - file://0003-MUX-Configure-SYS_NIRQ2-pin-in-safe-mode.patch \ - file://0004-OMAP4-clocks-Disable-slimbus-and-pad_clks.patch \ - file://0005-omap4-Make-1GHz-as-default-MPU-clock.patch \ - file://xmc.patch \ " XLOAD_MACHINE_beagleboard = "omap3530beagle_config" From 4d9a60279b2128cbd0723bf610c401fdd2aa915f Mon Sep 17 00:00:00 2001 From: Roger Monk Date: Fri, 25 Mar 2011 10:47:44 +0100 Subject: [PATCH 218/509] u-boot-git: Add omap4430-panda to u-boot git recipe * Enable u-boot git to build for pandaboard Signed-off-by: Roger Monk Signed-off-by: Koen Kooi --- .../fix-break-caused-by-new-binutils.patch | 31 +++++++++++++++++++ recipes/u-boot/u-boot_git.bb | 10 +++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 recipes/u-boot/u-boot-git/fix-break-caused-by-new-binutils.patch diff --git a/recipes/u-boot/u-boot-git/fix-break-caused-by-new-binutils.patch b/recipes/u-boot/u-boot-git/fix-break-caused-by-new-binutils.patch new file mode 100644 index 0000000000..16bc9803bd --- /dev/null +++ b/recipes/u-boot/u-boot-git/fix-break-caused-by-new-binutils.patch @@ -0,0 +1,31 @@ +Index: git/arch/arm/cpu/armv7/omap4/Makefile +=================================================================== +--- git.orig/arch/arm/cpu/armv7/omap4/Makefile ++++ git/arch/arm/cpu/armv7/omap4/Makefile +@@ -26,6 +26,8 @@ include $(TOPDIR)/config.mk + LIB = $(obj)lib$(SOC).o + + SOBJS += lowlevel_init.o ++plus_sec := $(call as-instr,.arch_extension sec,+sec) ++lowlevel_init.o: AFLAGS += -Wa,-march=armv7-a$(plus_sec) + + COBJS += board.o + COBJS += mem.o +Index: git/config.mk +=================================================================== +--- git.orig/config.mk ++++ git/config.mk +@@ -266,3 +266,13 @@ cmd_link_o_target = $(if $(strip $1),\ + rm -f $@; $(AR) rcs $@ ) + + ######################################################################### ++ ++# Tries to compile an assembly instruction ++as-instr = $(shell if echo -e "$(1)" | \ ++ $(CC) $(AFLAGS) -c -xassembler - \ ++ -o $(TMPOUT)astest$$$$.out > /dev/null 2>&1; \ ++ then rm $(TMPOUT)astest$$$$.out; echo "$(2)"; \ ++ else echo "$(3)"; fi) ++ ++######################################################################### ++ diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 1f009ed717..832655f722 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -1,5 +1,5 @@ require u-boot.inc -PR = "r73" +PR = "r74" FILESPATHPKG =. "u-boot-git:" @@ -200,6 +200,14 @@ SRC_URI_overo = "git://www.sakoman.com/git/u-boot.git;branch=omap4-exp;protocol= SRCREV_overo = "261733408a27d14590cf3ec6b596461808050e32" PV_overo = "2010.12+${PR}+gitr${SRCREV}" +FILESDIR_omap4430-panda = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-sakoman/" +SRC_URI_omap4430-panda = "git://www.sakoman.com/git/u-boot.git;branch=omap4-exp;protocol=git \ + file://fix-break-caused-by-new-binutils.patch \ + " +SRCREV_omap4430-panda = "261733408a27d14590cf3ec6b596461808050e32" +PV_omap4430-panda = "2010.12+${PR}+git${SRCREV}" +PE_omap4430-panda = "1" + # DaVinci dm355-evm/dm365-evm/dm6446-evm/dm6467-evm/dm6467t-evm - PSP 3.1.0/3.2.0 (build 35) SRC_URI_dm355-evm = "git://arago-project.org/git/projects/u-boot-davinci.git;protocol=git;branch=u-boot-davinci-2009.06" From a4f7849e15f0ce80de8738cb552b9aaf52dd9320 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 25 Mar 2011 11:16:58 +0100 Subject: [PATCH 219/509] u-boot git: remove duplicate filesdir line Signed-off-by: Koen Kooi --- recipes/u-boot/u-boot_git.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 832655f722..ad6f73e50f 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -200,7 +200,6 @@ SRC_URI_overo = "git://www.sakoman.com/git/u-boot.git;branch=omap4-exp;protocol= SRCREV_overo = "261733408a27d14590cf3ec6b596461808050e32" PV_overo = "2010.12+${PR}+gitr${SRCREV}" -FILESDIR_omap4430-panda = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-sakoman/" SRC_URI_omap4430-panda = "git://www.sakoman.com/git/u-boot.git;branch=omap4-exp;protocol=git \ file://fix-break-caused-by-new-binutils.patch \ " From 8f2149d51940d00be7980bd98d5bd65e91cfb6a1 Mon Sep 17 00:00:00 2001 From: Roger Monk Date: Fri, 25 Mar 2011 09:23:05 +0000 Subject: [PATCH 220/509] omap4430-panda: Prefer u-boot-git and remove extra custom x-load * Switch to using u-boot-git (instead of u-boot-sakoman) * Remove reference to custom x-load * Remove extra image depends (which will come from common include) Signed-off-by: Roger Monk Signed-off-by: Koen Kooi --- conf/machine/omap4430-panda.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conf/machine/omap4430-panda.conf b/conf/machine/omap4430-panda.conf index df2658e949..d7956906ea 100644 --- a/conf/machine/omap4430-panda.conf +++ b/conf/machine/omap4430-panda.conf @@ -4,12 +4,10 @@ require conf/machine/include/omap3.inc -EXTRA_IMAGEDEPENDS = "x-load-rsalveti u-boot-sakoman " - XLOAD_MACHINE = "omap4430panda_config" XLOAD_LOAD_ADDRESS = 0x40304350 -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-sakoman" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" UBOOT_MACHINE = "omap4_panda_config" PREFERRED_PROVIDER_virtual/kernel = "linux-omap4" From 93f747a681ab684899ac567943b2839a3993f3fd Mon Sep 17 00:00:00 2001 From: Roger Monk Date: Fri, 25 Mar 2011 09:52:37 +0000 Subject: [PATCH 221/509] gst-plugins-good: update to 0.10.28 Signed-off-by: Roger Monk Signed-off-by: Koen Kooi --- recipes/gstreamer/gst-plugins-good_0.10.28.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 recipes/gstreamer/gst-plugins-good_0.10.28.bb diff --git a/recipes/gstreamer/gst-plugins-good_0.10.28.bb b/recipes/gstreamer/gst-plugins-good_0.10.28.bb new file mode 100644 index 0000000000..19a50fdd4a --- /dev/null +++ b/recipes/gstreamer/gst-plugins-good_0.10.28.bb @@ -0,0 +1,15 @@ +require gst-plugins.inc + +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "6ef1588921f59d85c44ee2e49a3c97a0" +SRC_URI[archive.sha256sum] = "adfbce68b9fbadb7a7aeda2227af6afe1928ef025af4158726617b9d6834b028" + +inherit gconf + +DEPENDS += "hal pulseaudio speex libsoup-2.4 flac gst-plugins-base openssl popt esound libv4l" + +PACKAGES =+ "gst-plugin-gconfelements" +FILES_gst-plugin-gconfelements += "${sysconfdir}/gconf" + +EXTRA_OECONF += " --with-libv4l2 " From 62a5c15bc5dbbcd286eca5591605605c1be3af76 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 22 Mar 2011 12:23:40 -0700 Subject: [PATCH 222/509] cairo_1.10.0.bb: Fennec will now need tee support in cairo so enable it Signed-off-by: Khem Raj Signed-off-by: Koen Kooi --- recipes/cairo/cairo.inc | 2 +- recipes/cairo/cairo_1.10.0.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/cairo/cairo.inc b/recipes/cairo/cairo.inc index c60d7d9c73..dbd970deda 100644 --- a/recipes/cairo/cairo.inc +++ b/recipes/cairo/cairo.inc @@ -6,7 +6,7 @@ LICENSE = "MPL LGPL" #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points require cairo-fpu.inc -EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)}" +EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} --enable-tee" inherit autotools pkgconfig diff --git a/recipes/cairo/cairo_1.10.0.bb b/recipes/cairo/cairo_1.10.0.bb index 58e248190c..e6836a1b2a 100644 --- a/recipes/cairo/cairo_1.10.0.bb +++ b/recipes/cairo/cairo_1.10.0.bb @@ -1,6 +1,6 @@ require cairo.inc -PR = "r1" +PR = "r2" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz;name=cairo \ " From 2c6b85db9496a66fa9f6a8fb3a73030acdac1424 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 22 Mar 2011 15:23:21 -0700 Subject: [PATCH 223/509] fennec: Make it build on ARM eglibc/uclibc This patchset enables fennec to build again Upgrades to latest release tag Bunch of patches to fix uclibc build Disable few options notably --disable-elf-hack Add -L/usr/lib to LDFLAGS otherwise make tried to find the libs in /usr/lib Signed-off-by: Khem Raj Signed-off-by: Koen Kooi --- classes/mozilla.bbclass | 16 +- recipes/mozilla/fennec/arm/mozconfig | 6 + recipes/mozilla/fennec/cross-config.patch | 29 ++ recipes/mozilla/fennec/fennec-uclibc.patch | 84 +++++ .../fennec/jsautocfg-dontoverwrite.patch | 16 +- .../mozilla/fennec/libffi-arm-softfloat.patch | 290 ++++++++++++++++++ recipes/mozilla/fennec/mozconfig | 6 + recipes/mozilla/fennec/prune-lintl.patch | 33 ++ recipes/mozilla/fennec/uclibc-isfinite.patch | 70 +++++ recipes/mozilla/fennec_hg.bb | 34 +- 10 files changed, 558 insertions(+), 26 deletions(-) create mode 100644 recipes/mozilla/fennec/cross-config.patch create mode 100644 recipes/mozilla/fennec/fennec-uclibc.patch create mode 100644 recipes/mozilla/fennec/libffi-arm-softfloat.patch create mode 100644 recipes/mozilla/fennec/prune-lintl.patch create mode 100644 recipes/mozilla/fennec/uclibc-isfinite.patch diff --git a/classes/mozilla.bbclass b/classes/mozilla.bbclass index 2b2f770d58..6d9492cfd6 100644 --- a/classes/mozilla.bbclass +++ b/classes/mozilla.bbclass @@ -26,6 +26,14 @@ export HOST_CXXFLAGS = "${BUILD_CXXFLAGS}" export HOST_LDFLAGS = "${BUILD_LDFLAGS}" export HOST_RANLIB = "${BUILD_RANLIB}" export HOST_AR = "${BUILD_AR}" +# Set the host libIDL stuff correctly. +export HOST_LIBIDL_CONFIG="PKG_CONFIG_PATH=${STAGING_LIBDIR_NATIVE}/pkgconfig pkg-config libIDL-2.0" +# Due to sysroot we need to sed out references to the target staging +# when building the native version of xpidl Symptons of the failure +# include "gthread.h:344: error: size of array 'type name' is negative" +export HOST_LIBIDL_CFLAGS="`${HOST_LIBIDL_CONFIG} --cflags | sed -e s:${STAGING_DIR_TARGET}::g`" +export HOST_LIBIDL_LIBS="`${HOST_LIBIDL_CONFIG} --libs`" + mozilla_do_configure() { ( @@ -44,14 +52,6 @@ mozilla_do_configure() { >> ${MOZCONFIG} fi - # Set the host libIDL stuff correctly. - export HOST_LIBIDL_CONFIG="PKG_CONFIG_PATH=${STAGING_LIBDIR_NATIVE}/pkgconfig pkg-config libIDL-2.0" - # Due to sysroot we need to sed out references to the target staging - # when building the native version of xpidl Symptons of the failure - # include "gthread.h:344: error: size of array 'type name' is negative" - export HOST_LIBIDL_CFLAGS="`${HOST_LIBIDL_CONFIG} --cflags | sed -e s:${STAGING_DIR_TARGET}:${STAGING_DIR_NATIVE}:g`" - export HOST_LIBIDL_LIBS="`${HOST_LIBIDL_CONFIG} --libs`" - if [ -e ${MOZ_OBJDIR}/Makefile ] ; then oe_runmake -f client.mk ${MOZ_OBJDIR}/Makefile \ ${MOZ_OBJDIR}/config.status diff --git a/recipes/mozilla/fennec/arm/mozconfig b/recipes/mozilla/fennec/arm/mozconfig index 926fa86041..a204891d4f 100644 --- a/recipes/mozilla/fennec/arm/mozconfig +++ b/recipes/mozilla/fennec/arm/mozconfig @@ -7,6 +7,12 @@ ac_add_options --disable-javaxpcom ac_add_options --enable-system-cairo ac_add_options --with-system-zlib ac_add_options --with-system-jpeg +ac_add_options --disable-necko-wifi +ac_add_options --disable-maintainer-mode +ac_add_options --disable-dependency-tracking +ac_add_options --disable-silent-rules +ac_add_options --disable-elf-dynstr-gc +ac_add_options --disable-elf-hack ac_add_app_options xulrunner --with-arm-kuser ac_add_app_options xulrunner --enable-application=xulrunner diff --git a/recipes/mozilla/fennec/cross-config.patch b/recipes/mozilla/fennec/cross-config.patch new file mode 100644 index 0000000000..7eaba89c45 --- /dev/null +++ b/recipes/mozilla/fennec/cross-config.patch @@ -0,0 +1,29 @@ +We need to override setting variables so we check if the vars are already +set then we do not reset them here + +-Khem + +Index: mozilla-central/build/autoconf/pkg.m4 +=================================================================== +--- mozilla-central.orig/build/autoconf/pkg.m4 ++++ mozilla-central/build/autoconf/pkg.m4 +@@ -23,12 +23,16 @@ AC_DEFUN([PKG_CHECK_MODULES], + succeeded=yes + + AC_MSG_CHECKING($1_CFLAGS) +- $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` ++ if test -z "$$1_CFLAGS"; then ++ $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` ++ fi + AC_MSG_RESULT($$1_CFLAGS) + + AC_MSG_CHECKING($1_LIBS) +- ## Remove evil flags like -Wl,--export-dynamic +- $1_LIBS="`$PKG_CONFIG --libs \"$2\" |sed s/-Wl,--export-dynamic//g`" ++ if test -z "$$1_LIBS"; then ++ ## Remove evil flags like -Wl,--export-dynamic ++ $1_LIBS="`$PKG_CONFIG --libs \"$2\" |sed s/-Wl,--export-dynamic//g`" ++ fi + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" diff --git a/recipes/mozilla/fennec/fennec-uclibc.patch b/recipes/mozilla/fennec/fennec-uclibc.patch new file mode 100644 index 0000000000..344aad3197 --- /dev/null +++ b/recipes/mozilla/fennec/fennec-uclibc.patch @@ -0,0 +1,84 @@ +uClibc does not have backtrace support and RTLD_NOLOAD support +So we disable them for uClibc + +-Khem + +Index: mozilla-central/memory/mozalloc/mozalloc.cpp +=================================================================== +--- mozilla-central.orig/memory/mozalloc/mozalloc.cpp ++++ mozilla-central/memory/mozalloc/mozalloc.cpp +@@ -236,7 +236,7 @@ moz_malloc_usable_size(void *ptr) + if (!ptr) + return 0; + +-#if defined(MOZ_MEMORY) ++#if defined(MOZ_MEMORY) && !defined(__UCLIBC__) + return malloc_usable_size(ptr); + #elif defined(XP_MACOSX) + return malloc_size(ptr); +Index: mozilla-central/xpcom/threads/nsThread.cpp +=================================================================== +--- mozilla-central.orig/xpcom/threads/nsThread.cpp ++++ mozilla-central/xpcom/threads/nsThread.cpp +@@ -52,9 +52,11 @@ + + #if defined(XP_UNIX) && !defined(ANDROID) && !defined(DEBUG) && HAVE_UALARM \ + && defined(_GNU_SOURCE) +-# define MOZ_CANARY + # include ++#if !defined(__UCLIBC__) ++# define MOZ_CANARY + # include ++#endif + # include + # include + # include "nsXULAppAPI.h" +Index: mozilla-central/ipc/chromium/src/base/debug_util_posix.cc +=================================================================== +--- mozilla-central.orig/ipc/chromium/src/base/debug_util_posix.cc ++++ mozilla-central/ipc/chromium/src/base/debug_util_posix.cc +@@ -11,7 +11,7 @@ + #include + #include + #include +-#ifndef ANDROID ++#if !defined ANDROID && !defined __UCLIBC__ + #include + #include + #endif +@@ -119,7 +119,7 @@ StackTrace::StackTrace() { + const int kMaxCallers = 256; + + void* callers[kMaxCallers]; +-#ifndef ANDROID ++#if !defined ANDROID && !defined __UCLIBC__ + int count = backtrace(callers, kMaxCallers); + #else + int count = 0; +@@ -138,7 +138,7 @@ StackTrace::StackTrace() { + + void StackTrace::PrintBacktrace() { + fflush(stderr); +-#ifndef ANDROID ++#if !defined ANDROID && !defined __UCLIBC__ + backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO); + #endif + } +Index: mozilla-central/security/nss/lib/freebl/stubs.c +=================================================================== +--- mozilla-central.orig/security/nss/lib/freebl/stubs.c ++++ mozilla-central/security/nss/lib/freebl/stubs.c +@@ -538,8 +538,13 @@ freebl_InitNSSUtil(void *lib) + /* + * fetch the library if it's loaded. For NSS it should already be loaded + */ ++#ifdef __UCLIBC__ ++#define freebl_getLibrary(libName) \ ++ dlopen (libName, RTLD_LAZY) ++#else + #define freebl_getLibrary(libName) \ + dlopen (libName, RTLD_LAZY|RTLD_NOLOAD) ++#endif + + #define freebl_releaseLibrary(lib) \ + if (lib) dlclose(lib) diff --git a/recipes/mozilla/fennec/jsautocfg-dontoverwrite.patch b/recipes/mozilla/fennec/jsautocfg-dontoverwrite.patch index b3188de32f..c2bc964dd1 100644 --- a/recipes/mozilla/fennec/jsautocfg-dontoverwrite.patch +++ b/recipes/mozilla/fennec/jsautocfg-dontoverwrite.patch @@ -1,17 +1,19 @@ ---- /tmp/Makefile.in 2009-03-20 10:34:54.000000000 +0100 -+++ mozilla-central/js/src/Makefile.in 2009-03-20 10:35:18.000000000 +0100 -@@ -507,20 +507,8 @@ +Index: mozilla-central/js/src/Makefile.in +=================================================================== +--- mozilla-central.orig/js/src/Makefile.in ++++ mozilla-central/js/src/Makefile.in +@@ -739,20 +739,8 @@ endif export:: jsautocfg.h -ifeq (,$(CROSS_COMPILE)$(GNU_CC)$(filter-out WINNT,$(OS_ARCH))) --jsautocfg.h: -- touch $@ --else --ifeq ($(OS_ARCH),WINCE) jsautocfg.h: touch $@ -else +-ifeq ($(OS_ARCH),WINCE) +-jsautocfg.h: +- touch $@ +-else -jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) - @rm -f $@ jsautocfg.tmp - ./jscpucfg > jsautocfg.tmp diff --git a/recipes/mozilla/fennec/libffi-arm-softfloat.patch b/recipes/mozilla/fennec/libffi-arm-softfloat.patch new file mode 100644 index 0000000000..b9f70cd3bf --- /dev/null +++ b/recipes/mozilla/fennec/libffi-arm-softfloat.patch @@ -0,0 +1,290 @@ +This is a backport from upstream libffi so get it working on +ARM with and without VFP + +-Khem + +Index: mozilla-central/js/src/ctypes/libffi/src/arm/sysv.S +=================================================================== +--- mozilla-central.orig/js/src/ctypes/libffi/src/arm/sysv.S ++++ mozilla-central/js/src/ctypes/libffi/src/arm/sysv.S +@@ -1,5 +1,6 @@ + /* ----------------------------------------------------------------------- +- sysv.S - Copyright (c) 1998, 2008 Red Hat, Inc. ++ sysv.S - Copyright (c) 1998, 2008, 2011 Red Hat, Inc. ++ Copyright (c) 2011 Plausible Labs Cooperative, Inc. + + ARM Foreign Function Interface + +@@ -39,7 +40,11 @@ + #else + #define CNAME(x) x + #endif ++#ifdef __APPLE__ ++#define ENTRY(x) .globl CNAME(x); CNAME(x): ++#else + #define ENTRY(x) .globl CNAME(x); .type CNAME(x),%function; CNAME(x): ++#endif /* __APPLE__ */ + #endif + + #ifdef __ELF__ +@@ -48,6 +53,12 @@ + #define LSYM(x) x + #endif + ++/* Use the SOFTFP return value ABI on Mac OS X, as per the iOS ABI ++ Function Call Guide */ ++#ifdef __APPLE__ ++#define __SOFTFP__ ++#endif ++ + /* We need a better way of testing for this, but for now, this is all + we can do. */ + @ This selects the minimum architecture level required. +@@ -105,21 +116,33 @@ + .align 0 + .thumb + .thumb_func ++#ifdef __APPLE__ ++ ENTRY($0) ++#else + ENTRY(\name) ++#endif + bx pc + nop + .arm + UNWIND .fnstart + /* A hook to tell gdb that we've switched to ARM mode. Also used to call + directly from other local arm routines. */ +-_L__\name: ++#ifdef __APPLE__ ++_L__$0: ++#else ++_L__\name: ++#endif + .endm + #else + .macro ARM_FUNC_START name + .text + .align 0 + .arm ++#ifdef __APPLE__ ++ ENTRY($0) ++#else + ENTRY(\name) ++#endif + UNWIND .fnstart + .endm + #endif +@@ -141,8 +164,7 @@ _L__\name: + #endif + .endm + +- +- @ r0: fn ++ @ r0: ffi_prep_args + @ r1: &ecif + @ r2: cif->bytes + @ r3: fig->flags +@@ -222,12 +244,98 @@ ARM_FUNC_START ffi_call_SYSV + #endif + + LSYM(Lepilogue): +- RETLDM "r0-r3,fp" ++#if defined (__INTERWORKING__) ++ ldmia sp!, {r0-r3,fp, lr} ++ bx lr ++#else ++ ldmia sp!, {r0-r3,fp, pc} ++#endif + + .ffi_call_SYSV_end: + UNWIND .fnend ++#ifdef __ELF__ + .size CNAME(ffi_call_SYSV),.ffi_call_SYSV_end-CNAME(ffi_call_SYSV) ++#endif ++ ++ ++/* ++ unsigned int FFI_HIDDEN ++ ffi_closure_SYSV_inner (closure, respp, args) ++ ffi_closure *closure; ++ void **respp; ++ void *args; ++*/ ++ ++ARM_FUNC_START ffi_closure_SYSV ++ UNWIND .pad #16 ++ add ip, sp, #16 ++ stmfd sp!, {ip, lr} ++ UNWIND .save {r0, lr} ++ add r2, sp, #8 ++ UNWIND .pad #16 ++ sub sp, sp, #16 ++ str sp, [sp, #8] ++ add r1, sp, #8 ++ bl CNAME(ffi_closure_SYSV_inner) ++ cmp r0, #FFI_TYPE_INT ++ beq .Lretint ++ ++ cmp r0, #FFI_TYPE_FLOAT ++#if defined(__SOFTFP__) || defined(__ARM_EABI__) ++ beq .Lretint ++#else ++ beq .Lretfloat ++#endif ++ ++ cmp r0, #FFI_TYPE_DOUBLE ++#if defined(__SOFTFP__) || defined(__ARM_EABI__) ++ beq .Lretlonglong ++#else ++ beq .Lretdouble ++#endif ++ ++ cmp r0, #FFI_TYPE_LONGDOUBLE ++#if defined(__SOFTFP__) || defined(__ARM_EABI__) ++ beq .Lretlonglong ++#else ++ beq .Lretlongdouble ++#endif ++ ++ cmp r0, #FFI_TYPE_SINT64 ++ beq .Lretlonglong ++.Lclosure_epilogue: ++ add sp, sp, #16 ++ ldmfd sp, {sp, pc} ++.Lretint: ++ ldr r0, [sp] ++ b .Lclosure_epilogue ++.Lretlonglong: ++ ldr r0, [sp] ++ ldr r1, [sp, #4] ++ b .Lclosure_epilogue + ++#if !defined(__SOFTFP__) && !defined(__ARM_EABI__) ++.Lretfloat: ++ ldfs f0, [sp] ++ b .Lclosure_epilogue ++.Lretdouble: ++ ldfd f0, [sp] ++ b .Lclosure_epilogue ++.Lretlongdouble: ++ ldfd f0, [sp] ++ b .Lclosure_epilogue ++#endif ++ ++.ffi_closure_SYSV_end: ++ UNWIND .fnend ++#ifdef __ELF__ ++ .size CNAME(ffi_closure_SYSV),.ffi_closure_SYSV_end-CNAME(ffi_closure_SYSV) ++#endif ++ ++ ++/* Below are VFP hard-float ABI call and closure implementations. ++ Add VFP FPU directive here. */ ++ .fpu vfp + + @ r0: fn + @ r1: &ecif +@@ -294,7 +402,7 @@ LSYM(Lbase_args): + @ assume no return value. + cmp r2, #0 + beq LSYM(Lepilogue_vfp) +- ++ + cmp r3, #FFI_TYPE_INT + streq r0, [r2] + beq LSYM(Lepilogue_vfp) +@@ -321,79 +429,6 @@ LSYM(Lepilogue_vfp): + .ffi_call_VFP_end: + UNWIND .fnend + .size CNAME(ffi_call_VFP),.ffi_call_VFP_end-CNAME(ffi_call_VFP) +- +- +-/* +- unsigned int FFI_HIDDEN +- ffi_closure_SYSV_inner (closure, respp, args) +- ffi_closure *closure; +- void **respp; +- void *args; +-*/ +- +-ARM_FUNC_START ffi_closure_SYSV +- UNWIND .pad #16 +- add ip, sp, #16 +- stmfd sp!, {ip, lr} +- UNWIND .save {r0, lr} +- add r2, sp, #8 +- .pad #16 +- sub sp, sp, #16 +- str sp, [sp, #8] +- add r1, sp, #8 +- bl ffi_closure_SYSV_inner +- cmp r0, #FFI_TYPE_INT +- beq .Lretint +- +- cmp r0, #FFI_TYPE_FLOAT +-#if defined(__SOFTFP__) || defined(__ARM_EABI__) +- beq .Lretint +-#else +- beq .Lretfloat +-#endif +- +- cmp r0, #FFI_TYPE_DOUBLE +-#if defined(__SOFTFP__) || defined(__ARM_EABI__) +- beq .Lretlonglong +-#else +- beq .Lretdouble +-#endif +- +- cmp r0, #FFI_TYPE_LONGDOUBLE +-#if defined(__SOFTFP__) || defined(__ARM_EABI__) +- beq .Lretlonglong +-#else +- beq .Lretlongdouble +-#endif +- +- cmp r0, #FFI_TYPE_SINT64 +- beq .Lretlonglong +-.Lclosure_epilogue: +- add sp, sp, #16 +- ldmfd sp, {sp, pc} +-.Lretint: +- ldr r0, [sp] +- b .Lclosure_epilogue +-.Lretlonglong: +- ldr r0, [sp] +- ldr r1, [sp, #4] +- b .Lclosure_epilogue +- +-#if !defined(__SOFTFP__) && !defined(__ARM_EABI__) +-.Lretfloat: +- ldfs f0, [sp] +- b .Lclosure_epilogue +-.Lretdouble: +- ldfd f0, [sp] +- b .Lclosure_epilogue +-.Lretlongdouble: +- ldfd f0, [sp] +- b .Lclosure_epilogue +-#endif +- +-.ffi_closure_SYSV_end: +- UNWIND .fnend +- .size CNAME(ffi_closure_SYSV),.ffi_closure_SYSV_end-CNAME(ffi_closure_SYSV) + + + ARM_FUNC_START ffi_closure_VFP +@@ -405,7 +440,7 @@ ARM_FUNC_START ffi_closure_VFP + UNWIND .save {r0, lr} + add r2, sp, #72 + add r3, sp, #8 +- .pad #72 ++ UNWIND .pad #72 + sub sp, sp, #72 + str sp, [sp, #64] + add r1, sp, #64 +@@ -460,3 +495,4 @@ ARM_FUNC_START ffi_closure_VFP + #if defined __ELF__ && defined __linux__ + .section .note.GNU-stack,"",%progbits + #endif ++ diff --git a/recipes/mozilla/fennec/mozconfig b/recipes/mozilla/fennec/mozconfig index 7696f78a9c..356cd35cec 100644 --- a/recipes/mozilla/fennec/mozconfig +++ b/recipes/mozilla/fennec/mozconfig @@ -8,6 +8,12 @@ ac_add_options --enable-system-cairo ac_add_options --with-system-zlib ac_add_options --with-system-bz2 ac_add_options --with-system-jpeg +ac_add_options --disable-necko-wifi +ac_add_options --disable-maintainer-mode +ac_add_options --disable-dependency-tracking +ac_add_options --disable-silent-rules +ac_add_options --disable-elf-dynstr-gc +ac_add_options --disable-elf-hack ac_add_app_options xulrunner --enable-application=xulrunner diff --git a/recipes/mozilla/fennec/prune-lintl.patch b/recipes/mozilla/fennec/prune-lintl.patch new file mode 100644 index 0000000000..37ebb6cf51 --- /dev/null +++ b/recipes/mozilla/fennec/prune-lintl.patch @@ -0,0 +1,33 @@ +on uclibc we add -lintl and it will get into host libs too +and on host machines based on glibc it will complain on linking +host libraried. So we prune out -lintl + +-Khem + +Index: mozilla-central/build/autoconf/glib.m4 +=================================================================== +--- mozilla-central.orig/build/autoconf/glib.m4 ++++ mozilla-central/build/autoconf/glib.m4 +@@ -53,7 +53,8 @@ AC_ARG_ENABLE(glibtest, [ --disable-gli + no_glib=yes + else + GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` +- GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` ++ GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs | \ ++ sed 's/\-lintl//g'` + glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ +Index: mozilla-central/configure.in +=================================================================== +--- mozilla-central.orig/configure.in ++++ mozilla-central/configure.in +@@ -8495,7 +8495,7 @@ then + else + AC_MSG_ERROR([Cannot find $_LIBIDL_PREFIX_DIR/lib/libidl-0.6.lib or $_LIBIDL_PREFIX_DIR/lib/libidl-0.6_s.lib]) + fi +- HOST_LIBIDL_LIBS="${HOST_LIBIDL_LIBS} ${GLIB_LIBS}" ++ HOST_LIBIDL_LIBS="`echo ${HOST_LIBIDL_LIBS} | sed -e s/\-lintl//g` ${GLIB_LIBS}" + _LIBIDL_FOUND=1 + ;; + esac diff --git a/recipes/mozilla/fennec/uclibc-isfinite.patch b/recipes/mozilla/fennec/uclibc-isfinite.patch new file mode 100644 index 0000000000..c0f6696b33 --- /dev/null +++ b/recipes/mozilla/fennec/uclibc-isfinite.patch @@ -0,0 +1,70 @@ +finite() is obsolete and we should use isfinite() anyway +may be submit it upstream + +-Khem + +Index: mozilla-central/js/src/jsnum.h +=================================================================== +--- mozilla-central.orig/js/src/jsnum.h ++++ mozilla-central/js/src/jsnum.h +@@ -101,7 +101,7 @@ JSDOUBLE_IS_FINITE(jsdouble d) + #ifdef WIN32 + return _finite(d); + #else +- return finite(d); ++ return isfinite(d); + #endif + } + +Index: mozilla-central/content/base/public/nsContentUtils.h +=================================================================== +--- mozilla-central.orig/content/base/public/nsContentUtils.h ++++ mozilla-central/content/base/public/nsContentUtils.h +@@ -1928,7 +1928,7 @@ inline NS_HIDDEN_(PRBool) NS_FloatIsFini + #ifdef WIN32 + return _finite(f); + #else +- return finite(f); ++ return isfinite(f); + #endif + } + +Index: mozilla-central/content/canvas/src/nsCanvasRenderingContext2D.cpp +=================================================================== +--- mozilla-central.orig/content/canvas/src/nsCanvasRenderingContext2D.cpp ++++ mozilla-central/content/canvas/src/nsCanvasRenderingContext2D.cpp +@@ -159,7 +159,7 @@ DoubleIsFinite(double d) + // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800. + return !!_finite(d); + #else +- return finite(d); ++ return isfinite(d); + #endif + } + +Index: mozilla-central/ipc/chromium/src/base/float_util.h +=================================================================== +--- mozilla-central.orig/ipc/chromium/src/base/float_util.h ++++ mozilla-central/ipc/chromium/src/base/float_util.h +@@ -14,7 +14,7 @@ namespace base { + + inline bool IsFinite(const double& number) { + #if defined(OS_POSIX) +- return finite(number) != 0; ++ return isfinite(number) != 0; + #elif defined(OS_WIN) + return _finite(number) != 0; + #endif +Index: mozilla-central/js/src/ctypes/CTypes.cpp +=================================================================== +--- mozilla-central.orig/js/src/ctypes/CTypes.cpp ++++ mozilla-central/js/src/ctypes/CTypes.cpp +@@ -464,7 +464,7 @@ static inline bool FloatIsFinite(jsdoubl + #ifdef WIN32 + return _finite(f) != 0; + #else +- return finite(f); ++ return isfinite(f); + #endif + } + diff --git a/recipes/mozilla/fennec_hg.bb b/recipes/mozilla/fennec_hg.bb index 5bfd0d31f7..7075fd9396 100644 --- a/recipes/mozilla/fennec_hg.bb +++ b/recipes/mozilla/fennec_hg.bb @@ -1,12 +1,16 @@ DESCRIPTION = "Mozilla Mobile browser" PV = "2.0+${MOZPV}" -MOZPV = "4.0b3pre" +MOZPV = "4.0b5" PR = "r0" PE = "1" - -SRC_URI = "hg://hg.mozilla.org;module=mozilla-central;rev=e2bc7992d304 \ - hg://hg.mozilla.org;module=mobile-browser;rev=051c9709248b \ +SRCREV = "FENNEC_4_0b5_RELEASE" +SRC_URI = "hg://hg.mozilla.org;module=mozilla-central;rev=${SRCREV} \ + hg://hg.mozilla.org;module=mobile-browser;rev=${SRCREV} \ + file://fennec-uclibc.patch \ + file://libffi-arm-softfloat.patch \ + file://uclibc-isfinite.patch \ + file://cross-config.patch \ file://jsautocfg.h \ file://jsautocfg-dontoverwrite.patch \ " @@ -16,13 +20,27 @@ S = "${WORKDIR}/mozilla-central" inherit mozilla require firefox.inc -DEPENDS += "libnotify autoconf213-native cairo alsa-lib sqlite3" +DEPENDS += "yasm-native libnotify autoconf213-native cairo alsa-lib sqlite3 mesa gconf" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" export LIBXUL_DIST="${S}/objdir/xulrunner/dist/" + CFLAGS_append = " -DMOZ_GFX_OPTIMIZE_MOBILE " +# We need to append -L/usr/lib to LDFLAGS otherwise +# it starts picking dependencies from /usr/lib if +# EXTRA_DSO_LDOPTS contains libraries like -lgconf-2 +# then the make looks it up in VPATH and sysroot +# does not appear in VPATH and it wont find it if +# build host does not have a library in its /usr/lib +# + +LDFLAGS += "-L${STAGING_LIBDIR}" +#EXTRA_OEMAKE += "EXTRA_DSO_LDOPTS=-L${STAGING_LIBDIR}" + +EXTRA_OECONF_append_arm = " --with-cpu-arch=${BASE_PACKAGE_ARCH} " + do_configure_prepend() { if [ -e ${WORKDIR}/mobile-browser ] ; then mv ${WORKDIR}/mobile-browser ${S}/mobile @@ -66,10 +84,4 @@ do_install() { install -m 0644 ${WORKDIR}/mozilla-${PN}.png ${D}${datadir}/pixmaps/ } -do_stage() { - : -} - - FILES_${PN} += "${libdir}/fennec" - From c2250029f2b0e8f80088b3afd0ad3bbca7765ebb Mon Sep 17 00:00:00 2001 From: Roger Monk Date: Fri, 25 Mar 2011 14:50:16 +0000 Subject: [PATCH 224/509] ti-gst-ducati: Update to latest SRCREV, package libs * Update to latest commit * Switch to use latest gstreamer included depends * Fix lib packaging * Bump PR Signed-off-by: Roger Monk Signed-off-by: Koen Kooi --- recipes/ti/gst-ducati_git.bb | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/recipes/ti/gst-ducati_git.bb b/recipes/ti/gst-ducati_git.bb index dec9dcc581..49ac24457f 100644 --- a/recipes/ti/gst-ducati_git.bb +++ b/recipes/ti/gst-ducati_git.bb @@ -5,25 +5,26 @@ LICENSE = "LGPLv2.1" inherit autotools PV = "0.10.0" -PR = "r2" +PR = "r3" PR_append = "+gitr${SRCREV}" -SRCREV = "bd235864a96fe9fc06df69bc9fc457d0408d9756" +SRCREV = "2c30e033e5014903a61ad9b483627ff2e320b35a" SRC_URI = "git://github.com/robclark/gst-ducati.git;protocol=git \ - http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.31.tar.bz2;name=archive \ + http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.32.tar.bz2;name=archive \ " -SRC_URI[archive.md5sum] = "a21fb08bdb578d972c7c14e77da8fbb6" -SRC_URI[archive.sha256sum] = "7f737e6d047c1ebeb4e1e0725fc377c5d9f12ee89186de7960be3cbba709ab84" +SRC_URI[archive.md5sum] = "442bc3d37b8511a73379143e7531d726" +SRC_URI[archive.sha256sum] = "3bf4e46a186ee9a1f5e212aaf651d67cffb4f5f05345a7c99ae71d5d992be133" S = "${WORKDIR}/git" acpaths = "-I m4 -I common/m4" do_configure_prepend () { - rm -rf ${S}/common ${S}/po - cp -Rf ${WORKDIR}/gstreamer-0.10.31/common ${S}/ - cp -Rf ${WORKDIR}/gstreamer-0.10.31/po ${S}/ + + rm -rf ${S}/common ${S}/po + cp -Rf ${WORKDIR}/gstreamer-0.10.32/common ${S}/ + cp -Rf ${WORKDIR}/gstreamer-0.10.32/po ${S}/ if test -f po/Makefile.in.in; then @@ -33,3 +34,7 @@ do_configure_prepend () { patch -p0 < common/gettext.patch } +FILES_${PN} += "${libdir}/gstreamer-0.10/*.so ${sysconfdir} ${installdir}" +FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.a ${libdir}/gstreamer-0.10/*.la" +FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" + From c79173549c9bd686dd6c477b6c702a48c570d3d7 Mon Sep 17 00:00:00 2001 From: Roger Monk Date: Fri, 25 Mar 2011 14:54:54 +0000 Subject: [PATCH 225/509] ti-libdce: Update to latest SRCREV * Update to latest version * Bump PR Signed-off-by: Roger Monk Signed-off-by: Koen Kooi --- recipes/ti/libdce_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/ti/libdce_git.bb b/recipes/ti/libdce_git.bb index 72ed8f6f01..3812e55934 100644 --- a/recipes/ti/libdce_git.bb +++ b/recipes/ti/libdce_git.bb @@ -5,10 +5,10 @@ LICENSE = "TI" inherit autotools lib_package PV = "1.0.0" -PR = "r3" +PR = "r4" PR_append = "+gitr${SRCREV}" -SRCREV = "086d0bed544ecb92afde57db32c16b5e97c6f2d2" +SRCREV = "2115a0b6b6fccc27d6ecc274e37e57f2275f99c6" SRC_URI = "git://github.com/robclark/libdce.git;protocol=git" S = "${WORKDIR}/git" From 74fba69388be10e50ca8fbd3119f4aac88c23c03 Mon Sep 17 00:00:00 2001 From: Roger Monk Date: Fri, 25 Mar 2011 15:52:52 +0000 Subject: [PATCH 226/509] omapfbplay: Add patch for dce codec error handling * Add patch to handle return codes from dce codec library * Check for non-fatal errors * Update to latest SRCREV * Bump PR Signed-off-by: Roger Monk Signed-off-by: Koen Kooi --- .../files/omapfbplay-errorhandling.patch | 34 +++++++++++++++++++ recipes/ffmpeg/omapfbplay.inc | 7 ++-- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 recipes/ffmpeg/files/omapfbplay-errorhandling.patch diff --git a/recipes/ffmpeg/files/omapfbplay-errorhandling.patch b/recipes/ffmpeg/files/omapfbplay-errorhandling.patch new file mode 100644 index 0000000000..46f2f90812 --- /dev/null +++ b/recipes/ffmpeg/files/omapfbplay-errorhandling.patch @@ -0,0 +1,34 @@ +From e321ae7df57ada9ecc8c155fa4e5511c96ef5db3 Mon Sep 17 00:00:00 2001 +From: Rob Clark +Date: Fri, 18 Mar 2011 12:40:51 -0500 +Subject: [PATCH] dce: differntiate between fatal and non-fatal errors + +For streams with errors, the codec will throw back an error.. but not +all errors are fatal. +--- + dce.c | 10 ++++++++-- + 1 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/dce.c b/dce.c +index ab7ad0a..88f175e 100644 +--- a/dce.c ++++ b/dce.c +@@ -270,8 +270,14 @@ static int dce_decode(AVPacket *p) + + err = VIDDEC3_process(codec, inbufs, outbufs, in_args, out_args); + if (err) { +- fprintf(stderr, "VIDDEC3_process() error %d\n", err); +- return -1; ++ fprintf(stderr, "VIDDEC3_process() error %d %08x\n", err, ++ out_args->extendedError); ++ /* for non-fatal errors, keep going.. a non-fatal error could ++ * just indicate an error in the input stream which the codec ++ * was able to conceal ++ */ ++ if (XDM_ISFATALERROR(out_args->extendedError)) ++ return -1; + } + + for (i = 0; i < out_args->outputID[i]; i++) { +-- +1.7.1 diff --git a/recipes/ffmpeg/omapfbplay.inc b/recipes/ffmpeg/omapfbplay.inc index 082f28e26a..de5b2a893e 100644 --- a/recipes/ffmpeg/omapfbplay.inc +++ b/recipes/ffmpeg/omapfbplay.inc @@ -2,13 +2,14 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays" DEPENDS = "bzip2 lame ffmpeg virtual/kernel" LICENSE = "MIT" -PR = "r29" +PR = "r30" PV = "0.0+${PR}+gitr${SRCREV}" -SRCREV = "9ce728cf67dd1c0a7dbf4e54e899f28bd0c5fbe1" +SRCREV = "34293052c5a2ae328eac6903512e6b4ce19b5639" SRC_URI = "git://git.mansr.com/omapfbplay;protocol=git \ -" + file://omapfbplay-errorhandling.patch \ + " S = "${WORKDIR}/git" From eaa420e9b93464a0d0b587e56ef8ac8d9df92d90 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 18 Mar 2011 14:12:14 +0100 Subject: [PATCH 227/509] libnl: rename libnl2 to libnl as used in openembedded-core * libnl1/libnl2 still conflicts even when using separate includedir so it will be easier for distro maintainers to use only libnl1 or libnl2 by PREFERRED_VERSION Acked-by: Koen Kooi Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- recipes/libnl/files/fix-pc-file.patch | 11 ----------- .../dont-link-libnl-from-sysroot.patch | 0 recipes/libnl/{files => libnl-1.1}/fix-includes.patch | 0 .../libnl/{files => libnl-1.1}/local-includes.patch | 0 .../{files => libnl-1.1}/netlink-local-fix.patch | 0 .../libnl/{files => libnl-1.1}/respect-ldflags.patch | 0 recipes/libnl/{libnl2 => libnl}/fix-pc-file.patch | 0 .../libnl/{libnl2 => libnl}/fix-pktloc-dep-race.patch | 0 recipes/libnl/{libnl2_2.0.bb => libnl_2.0.bb} | 0 recipes/libnl/{libnl2_git.bb => libnl_git.bb} | 0 10 files changed, 11 deletions(-) delete mode 100644 recipes/libnl/files/fix-pc-file.patch rename recipes/libnl/{files => libnl-1.1}/dont-link-libnl-from-sysroot.patch (100%) rename recipes/libnl/{files => libnl-1.1}/fix-includes.patch (100%) rename recipes/libnl/{files => libnl-1.1}/local-includes.patch (100%) rename recipes/libnl/{files => libnl-1.1}/netlink-local-fix.patch (100%) rename recipes/libnl/{files => libnl-1.1}/respect-ldflags.patch (100%) rename recipes/libnl/{libnl2 => libnl}/fix-pc-file.patch (100%) rename recipes/libnl/{libnl2 => libnl}/fix-pktloc-dep-race.patch (100%) rename recipes/libnl/{libnl2_2.0.bb => libnl_2.0.bb} (100%) rename recipes/libnl/{libnl2_git.bb => libnl_git.bb} (100%) diff --git a/recipes/libnl/files/fix-pc-file.patch b/recipes/libnl/files/fix-pc-file.patch deleted file mode 100644 index 77f3e88562..0000000000 --- a/recipes/libnl/files/fix-pc-file.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: git/libnl-2.0.pc.in -=================================================================== ---- git.orig/libnl-2.0.pc.in -+++ git/libnl-2.0.pc.in -@@ -6,5 +6,5 @@ - Name: libnl - Description: Convenience library for netlink sockets - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lnl -+Libs: -L${libdir} -lnl -lnl-genl -lnl-nf -lnl-route - Cflags: -I${includedir} diff --git a/recipes/libnl/files/dont-link-libnl-from-sysroot.patch b/recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch similarity index 100% rename from recipes/libnl/files/dont-link-libnl-from-sysroot.patch rename to recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch diff --git a/recipes/libnl/files/fix-includes.patch b/recipes/libnl/libnl-1.1/fix-includes.patch similarity index 100% rename from recipes/libnl/files/fix-includes.patch rename to recipes/libnl/libnl-1.1/fix-includes.patch diff --git a/recipes/libnl/files/local-includes.patch b/recipes/libnl/libnl-1.1/local-includes.patch similarity index 100% rename from recipes/libnl/files/local-includes.patch rename to recipes/libnl/libnl-1.1/local-includes.patch diff --git a/recipes/libnl/files/netlink-local-fix.patch b/recipes/libnl/libnl-1.1/netlink-local-fix.patch similarity index 100% rename from recipes/libnl/files/netlink-local-fix.patch rename to recipes/libnl/libnl-1.1/netlink-local-fix.patch diff --git a/recipes/libnl/files/respect-ldflags.patch b/recipes/libnl/libnl-1.1/respect-ldflags.patch similarity index 100% rename from recipes/libnl/files/respect-ldflags.patch rename to recipes/libnl/libnl-1.1/respect-ldflags.patch diff --git a/recipes/libnl/libnl2/fix-pc-file.patch b/recipes/libnl/libnl/fix-pc-file.patch similarity index 100% rename from recipes/libnl/libnl2/fix-pc-file.patch rename to recipes/libnl/libnl/fix-pc-file.patch diff --git a/recipes/libnl/libnl2/fix-pktloc-dep-race.patch b/recipes/libnl/libnl/fix-pktloc-dep-race.patch similarity index 100% rename from recipes/libnl/libnl2/fix-pktloc-dep-race.patch rename to recipes/libnl/libnl/fix-pktloc-dep-race.patch diff --git a/recipes/libnl/libnl2_2.0.bb b/recipes/libnl/libnl_2.0.bb similarity index 100% rename from recipes/libnl/libnl2_2.0.bb rename to recipes/libnl/libnl_2.0.bb diff --git a/recipes/libnl/libnl2_git.bb b/recipes/libnl/libnl_git.bb similarity index 100% rename from recipes/libnl/libnl2_git.bb rename to recipes/libnl/libnl_git.bb From c2722b2673455323d750153fb5ec31f725a9f9c1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 18 Mar 2011 14:16:57 +0100 Subject: [PATCH 228/509] libnl: don't use /usr/include/libnl2 anymore Acked-by: Koen Kooi Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- recipes/libnl/libnl_2.0.bb | 4 +--- recipes/libnl/libnl_git.bb | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/recipes/libnl/libnl_2.0.bb b/recipes/libnl/libnl_2.0.bb index 7e9336e68a..8b77d0798b 100644 --- a/recipes/libnl/libnl_2.0.bb +++ b/recipes/libnl/libnl_2.0.bb @@ -9,14 +9,12 @@ DEPENDS = "flex-native bison-native" inherit autotools pkgconfig -includedir = ${prefix}/include/libnl2 - -S = "${WORKDIR}/libnl-${PV}" SRC_URI = "\ http://www.infradead.org/~tgr/libnl/files/libnl-${PV}.tar.gz \ file://fix-pc-file.patch \ file://fix-pktloc-dep-race.patch \ " + SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7" SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c" diff --git a/recipes/libnl/libnl_git.bb b/recipes/libnl/libnl_git.bb index b667815924..b3bb7492ff 100644 --- a/recipes/libnl/libnl_git.bb +++ b/recipes/libnl/libnl_git.bb @@ -11,8 +11,6 @@ DEPENDS = "flex-native bison-native" inherit autotools -includedir = ${prefix}/include/libnl2 - SRC_URI = "\ git://git.kernel.org/pub/scm/libs/netlink/libnl.git;protocol=git \ file://fix-pc-file.patch \ From 09bbb885ff6045a032ac81c7c8920b99a633f28f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 18 Mar 2011 14:20:22 +0100 Subject: [PATCH 229/509] libnl: add libnl.inc and use INC_PR Acked-by: Koen Kooi Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- recipes/libnl/libnl.inc | 9 +++++++++ recipes/libnl/libnl_1.1.bb | 10 ++-------- recipes/libnl/libnl_2.0.bb | 9 ++------- recipes/libnl/libnl_git.bb | 16 ++++++---------- 4 files changed, 19 insertions(+), 25 deletions(-) create mode 100644 recipes/libnl/libnl.inc diff --git a/recipes/libnl/libnl.inc b/recipes/libnl/libnl.inc new file mode 100644 index 0000000000..6f502b1019 --- /dev/null +++ b/recipes/libnl/libnl.inc @@ -0,0 +1,9 @@ +DESCRIPTION = "libnl is a library for applications dealing with netlink sockets" +SECTION = "libs/network" +LICENSE = "LGPL" +HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" + +INC_PR = "r5" + +inherit autotools pkgconfig + diff --git a/recipes/libnl/libnl_1.1.bb b/recipes/libnl/libnl_1.1.bb index f1b2a9d485..d9f250e629 100644 --- a/recipes/libnl/libnl_1.1.bb +++ b/recipes/libnl/libnl_1.1.bb @@ -1,11 +1,6 @@ -DESCRIPTION = "libnl is a library for applications dealing with netlink sockets" -SECTION = "libs/network" -LICENSE = "LGPL" -HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" +require libnl.inc -PR = "r4" - -inherit autotools pkgconfig +PR = "${INC_PR}.0" CFLAGS += '-DVLAN_FLAG_REORDER_HDR=1' @@ -18,6 +13,5 @@ SRC_URI = "\ file://dont-link-libnl-from-sysroot.patch \ " - SRC_URI[md5sum] = "ae970ccd9144e132b68664f98e7ceeb1" SRC_URI[sha256sum] = "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3" diff --git a/recipes/libnl/libnl_2.0.bb b/recipes/libnl/libnl_2.0.bb index 8b77d0798b..d1cbc0beeb 100644 --- a/recipes/libnl/libnl_2.0.bb +++ b/recipes/libnl/libnl_2.0.bb @@ -1,14 +1,9 @@ -DESCRIPTION = "libnl2 is a library for applications dealing with netlink sockets" -SECTION = "libs/network" -LICENSE = "LGPL" -HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" +require libnl.inc PE = "1" -PR = "r2" +PR = "${INC_PR}.0" DEPENDS = "flex-native bison-native" -inherit autotools pkgconfig - SRC_URI = "\ http://www.infradead.org/~tgr/libnl/files/libnl-${PV}.tar.gz \ file://fix-pc-file.patch \ diff --git a/recipes/libnl/libnl_git.bb b/recipes/libnl/libnl_git.bb index b3bb7492ff..9ffb34b686 100644 --- a/recipes/libnl/libnl_git.bb +++ b/recipes/libnl/libnl_git.bb @@ -1,22 +1,18 @@ -DESCRIPTION = "libnl2 is a library for applications dealing with netlink sockets" -SECTION = "libs/network" -LICENSE = "LGPL" -HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" -SRCREV = "d378220c96c3c8b6f27dca33e7d8ba03318f9c2d" -PV = "1.9+gitr${SRCPV}" +require libnl.inc + PE = "1" -PR = "r3" +PV = "1.9+gitr${SRCPV}" +PR = "${INC_PR}.0" DEPENDS = "flex-native bison-native" -inherit autotools - +S = "${WORKDIR}/git" +SRCREV = "d378220c96c3c8b6f27dca33e7d8ba03318f9c2d" SRC_URI = "\ git://git.kernel.org/pub/scm/libs/netlink/libnl.git;protocol=git \ file://fix-pc-file.patch \ file://fix-pktloc-dep-race.patch \ " -S = "${WORKDIR}/git" PACKAGES =+ "${PN}-route ${PN}-nf ${PN}-genl ${PN}-cli" FILES_${PN}-route = "${libdir}/libnl-route.so.*" From 69280457179542f215df50339676d449163467db Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 6 Jan 2011 14:21:38 +0100 Subject: [PATCH 230/509] SHR: drop blacklist entries for libnl, now when libnl2 is used by default Acked-by: Koen Kooi Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- conf/distro/shr.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index 59ad0be135..415e44961c 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -53,7 +53,6 @@ INHERIT += "recipe_sanity" ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4" ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4" ANGSTROM_BLACKLIST_pn-atd = "atd has been replaced by atd-over-fso" -ANGSTROM_BLACKLIST_pn-libnl = "libnld has been replaced by libnl2" ANGSTROM_BLACKLIST_pn-update-alternatives-cworth-native = "update-alternatives-cworth-native has been replaced by opkg implementation of u-a script" ANGSTROM_BLACKLIST_pn-update-alternatives-cworth = "update-alternatives-cworth has been replaced by opkg implementation of u-a script" ANGSTROM_BLACKLIST_pn-qt4-x11-free-gles = "qt4-x11-free is fine even without gles" @@ -79,7 +78,6 @@ ANGSTROM_BLACKLIST_pn-linux-jlime-current = "strange kernel, spank maintainer" ANGSTROM_BLACKLIST_pn-linux-ml403-mvista-2.6.x = "strange kernel, spank maintainer" ANGSTROM_BLACKLIST_pn-linux-davinci = "strange kernel, spank maintainer" - CVS_TARBALL_STASH += "http://build.shr-project.org/sources/" #The shr-mirrors.bbclass repleaces this From 6544aa3fc18bbc2afdb6860d54318464bb5001e3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 18 Mar 2011 14:29:55 +0100 Subject: [PATCH 231/509] libfsobasics: depend only on libnl(-2.0) not libnl2(-2.0) Acked-by: Koen Kooi Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- recipes/freesmartphone/libfsobasics_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/freesmartphone/libfsobasics_git.bb b/recipes/freesmartphone/libfsobasics_git.bb index c99bd8e20d..1d751ca1c3 100644 --- a/recipes/freesmartphone/libfsobasics_git.bb +++ b/recipes/freesmartphone/libfsobasics_git.bb @@ -1,8 +1,8 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org support library" -DEPENDS += "libnl2" +DEPENDS += "libnl" SRCREV = "${FSO_CORNUCOPIA_SRCREV}" PV = "0.9.10+gitr${SRCPV}" PE = "1" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" From 8bab4f54d45dded6cc87d57558b02eb2854fcbaf Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 18 Mar 2011 14:30:09 +0100 Subject: [PATCH 232/509] hostap-daemon: depend only on libnl(-2.0) not libnl2(-2.0) Acked-by: Koen Kooi Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- recipes/hostap/hostap-daemon_0.7.3.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes/hostap/hostap-daemon_0.7.3.bb b/recipes/hostap/hostap-daemon_0.7.3.bb index 2dfec3537e..10b1389590 100644 --- a/recipes/hostap/hostap-daemon_0.7.3.bb +++ b/recipes/hostap/hostap-daemon_0.7.3.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://hostap.epitest.fi" SECTION = "kernel/userland" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "libnl2 openssl" -PR = "r1" +DEPENDS = "libnl openssl" +PR = "r2" DEFAULT_PREFERENCE = "-1" @@ -21,7 +21,6 @@ INITSCRIPT_NAME=hostapd do_configure() { install -m 0644 ${WORKDIR}/defconfig ${S}/.config - echo 'CFLAGS += "-I${STAGING_INCDIR}/libnl2"' >> ${S}/.config } do_compile() { From db2c306a7a48b786d7a5e67aa947cff29b97aaab Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 18 Mar 2011 14:30:22 +0100 Subject: [PATCH 233/509] iw: depend only on libnl(-2.0) not libnl2(-2.0) Acked-by: Koen Kooi Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- recipes/iw/iw_0.9.20.bb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/recipes/iw/iw_0.9.20.bb b/recipes/iw/iw_0.9.20.bb index 0b6a768667..7048091c8f 100644 --- a/recipes/iw/iw_0.9.20.bb +++ b/recipes/iw/iw_0.9.20.bb @@ -3,18 +3,15 @@ HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/iw" SECTION = "base" PRIORITY = "optional" LICENSE = "BSD" -PR = "r2" +PR = "r3" -DEPENDS = "libnl2 pkgconfig" +DEPENDS = "libnl pkgconfig" SRC_URI = " \ http://wireless.kernel.org/download/iw/${P}.tar.bz2 \ file://kill-git-version-check.patch \ " -# We stage libnl2 header files not directly as they clash with libnl files. Once -# we only use libnl2 and stage the headers at the normal place we can remove -# this. -CFLAGS += "-I${STAGING_INCDIR}/libnl2/ -DCONFIG_LIBNL20" +CFLAGS += "-DCONFIG_LIBNL20" do_compile() { oe_runmake From c132ef51fd61a0355286aec4fbc4fcadf6e45078 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 18 Mar 2011 14:30:33 +0100 Subject: [PATCH 234/509] ti-wifi-utils: depend only on libnl(-2.0) not libnl2(-2.0) Acked-by: Koen Kooi Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- recipes/ti/ti-wifi-utils_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/ti/ti-wifi-utils_git.bb b/recipes/ti/ti-wifi-utils_git.bb index 5877cafdfc..7757f97f57 100644 --- a/recipes/ti/ti-wifi-utils_git.bb +++ b/recipes/ti/ti-wifi-utils_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The calibrator and other useful utilities for TI wireless solution based on wl12xx driver" LICENCE = "TI-BSD" -DEPENDS = "libnl2" +DEPENDS = "libnl" PV ="0.0" PR_append = "+gitr${SRCPV}" @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/gxk/ti-utils.git;protocol=git" S = "${WORKDIR}/git" export CROSS_COMPILE = "${TARGET_PREFIX}" -CFLAGS += "-I${STAGING_INCDIR}/libnl2/ -DCONFIG_LIBNL20" +CFLAGS += " -DCONFIG_LIBNL20" do_install() { install -d ${D}${bindir} From 88b2c1b65fefd1f9cee649d896efc15401d360ed Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 18 Mar 2011 14:30:52 +0100 Subject: [PATCH 235/509] wpa-supplicant-0.7: depend only on libnl(-2.0) not libnl2(-2.0) Acked-by: Koen Kooi Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- recipes/wpa-supplicant/wpa-supplicant-0.7.inc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc index 764903894d..0cf3b700fe 100644 --- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc +++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc @@ -6,9 +6,9 @@ LICENSE = "GPLv2 | BSD" LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ file://../README;md5=54cfc88015d3ce83f7156e63c6bb1738 \ file://wpa_supplicant.c;beginline=1;endline=17;md5=acdc5a4b0d6345f21f136eace747260e" -DEPENDS = "gnutls dbus libnl2 openssl ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}" +DEPENDS = "gnutls dbus libnl openssl ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}" RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" -INC_PR = "r6" +INC_PR = "r7" SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://defconfig \ @@ -20,11 +20,6 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant" -# We stage libnl2 header files not directly as they clash with libnl files. Once -# we only use libnl2 and stage the headers at the normal place we can remove -# this. -CFLAGS += "-I${STAGING_INCDIR}/libnl2/" - PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase" FILES_wpa-supplicant-cli = "/usr/sbin/wpa_cli" From ff641e8ab0e00180069c7a23bc8445363ad37d2e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 18 Mar 2011 14:29:32 +0100 Subject: [PATCH 236/509] connman: depend only on libnl(-2.0) not libnl2(-2.0) Acked-by: Koen Kooi Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- recipes/connman/connman.inc | 2 +- recipes/connman/connman_0.46.bb | 2 +- recipes/connman/connman_0.51.bb | 2 +- recipes/connman/connman_0.65.bb | 2 +- recipes/connman/connman_0.68.bb | 2 +- recipes/connman/connman_git.bb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/connman/connman.inc b/recipes/connman/connman.inc index e25d64a98d..7306b1b805 100644 --- a/recipes/connman/connman.inc +++ b/recipes/connman/connman.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php" SECTION = "libs/network" LICENSE = "GPL" # we need to define the depends here, the dynamic stuff is too late -DEPENDS = "libnl2 wpa-supplicant dbus glib-2.0 ppp busybox dhclient resolvconf bluez4" +DEPENDS = "libnl wpa-supplicant dbus glib-2.0 ppp busybox dhclient resolvconf bluez4" EXTRA_OECONF += "\ ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \ diff --git a/recipes/connman/connman_0.46.bb b/recipes/connman/connman_0.46.bb index a7bf286720..1f1df9cba2 100644 --- a/recipes/connman/connman_0.46.bb +++ b/recipes/connman/connman_0.46.bb @@ -1,5 +1,5 @@ require connman.inc -PR = "r5" +PR = "r6" EXTRA_OECONF += "\ --disable-gtk-doc \ diff --git a/recipes/connman/connman_0.51.bb b/recipes/connman/connman_0.51.bb index f1c50038b8..036a710939 100644 --- a/recipes/connman/connman_0.51.bb +++ b/recipes/connman/connman_0.51.bb @@ -1,5 +1,5 @@ require connman.inc -PR = "r1" +PR = "r2" EXTRA_OECONF += "\ --disable-gtk-doc \ diff --git a/recipes/connman/connman_0.65.bb b/recipes/connman/connman_0.65.bb index 78e42875d8..880d775f3e 100644 --- a/recipes/connman/connman_0.65.bb +++ b/recipes/connman/connman_0.65.bb @@ -1,7 +1,7 @@ require connman.inc # connman requires libXtables now DEPENDS += "iptables" -PR = "r0" +PR = "r1" EXTRA_OECONF += "\ --disable-gtk-doc \ diff --git a/recipes/connman/connman_0.68.bb b/recipes/connman/connman_0.68.bb index ead215d315..093a5a5f5b 100644 --- a/recipes/connman/connman_0.68.bb +++ b/recipes/connman/connman_0.68.bb @@ -1,7 +1,7 @@ require connman.inc # connman requires libXtables now DEPENDS += "iptables" -PR = "r1" +PR = "r2" EXTRA_OECONF += "\ --disable-gtk-doc \ diff --git a/recipes/connman/connman_git.bb b/recipes/connman/connman_git.bb index 39ffac652b..283eb6befd 100644 --- a/recipes/connman/connman_git.bb +++ b/recipes/connman/connman_git.bb @@ -27,7 +27,7 @@ require connman.inc SRCREV = "1a94db417ecaba20a609ff4b4431a3f67c5dcbc6" PV = "0.42+git" -PR = "r2" +PR = "r3" PR_append = ".gitr${SRCREV}" DEFAULT_PREFERENCE = "-1" From 2e8fab2e5680d3fae79c90490a9fc17313f252ae Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 18 Mar 2011 14:48:12 +0100 Subject: [PATCH 237/509] libnl_git: remove fix-pktloc-dep-race.patch from this version * it does not apply because there isn't pktloc in this SRCREV yet, commented out in upstream src/lib/Makefile.am Acked-by: Koen Kooi Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- recipes/libnl/libnl_git.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/libnl/libnl_git.bb b/recipes/libnl/libnl_git.bb index 9ffb34b686..a4a37a8b12 100644 --- a/recipes/libnl/libnl_git.bb +++ b/recipes/libnl/libnl_git.bb @@ -11,7 +11,6 @@ SRCREV = "d378220c96c3c8b6f27dca33e7d8ba03318f9c2d" SRC_URI = "\ git://git.kernel.org/pub/scm/libs/netlink/libnl.git;protocol=git \ file://fix-pc-file.patch \ - file://fix-pktloc-dep-race.patch \ " PACKAGES =+ "${PN}-route ${PN}-nf ${PN}-genl ${PN}-cli" From cb4444363cfaf0957c3bfbbd77406438c08f16d1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 23 Mar 2011 16:55:00 +0100 Subject: [PATCH 238/509] libnl-1.1: rename to libnl1 and build only static lib * static lib is enough to build nm and shouldn't conflict with libnl2 * this makes special case from libnl1 instead libnl2 Acked-by: Koen Kooi Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- .../libnl1-1.1/build.only.static.lib.patch | 79 +++++++++++++++++++ .../dont-link-libnl-from-sysroot.patch | 0 .../fix-includes.patch | 0 .../local-includes.patch | 0 .../netlink-local-fix.patch | 0 .../respect-ldflags.patch | 0 recipes/libnl/{libnl_1.1.bb => libnl1_1.1.bb} | 5 ++ 7 files changed, 84 insertions(+) create mode 100644 recipes/libnl/libnl1-1.1/build.only.static.lib.patch rename recipes/libnl/{libnl-1.1 => libnl1-1.1}/dont-link-libnl-from-sysroot.patch (100%) rename recipes/libnl/{libnl-1.1 => libnl1-1.1}/fix-includes.patch (100%) rename recipes/libnl/{libnl-1.1 => libnl1-1.1}/local-includes.patch (100%) rename recipes/libnl/{libnl-1.1 => libnl1-1.1}/netlink-local-fix.patch (100%) rename recipes/libnl/{libnl-1.1 => libnl1-1.1}/respect-ldflags.patch (100%) rename recipes/libnl/{libnl_1.1.bb => libnl1_1.1.bb} (77%) diff --git a/recipes/libnl/libnl1-1.1/build.only.static.lib.patch b/recipes/libnl/libnl1-1.1/build.only.static.lib.patch new file mode 100644 index 0000000000..770a3924f7 --- /dev/null +++ b/recipes/libnl/libnl1-1.1/build.only.static.lib.patch @@ -0,0 +1,79 @@ +diff -uNr libnl-1.1.orig//lib/Makefile libnl-1.1/lib/Makefile +--- libnl-1.1.orig//lib/Makefile 2011-03-23 15:50:32.310534329 +0100 ++++ libnl-1.1/lib/Makefile 2011-03-23 15:50:43.926534326 +0100 +@@ -33,18 +33,24 @@ + DEPS := $(CIN:%.c=%.d) + OBJ := $(CIN:%.c=%.o) + CFLAGS += -fPIC ++OUT_LIB := $(PACKAGE_NAME)1.a + OUT_SLIB := $(PACKAGE_NAME).so.$(PACKAGE_VERSION) + LN_SLIB := $(PACKAGE_NAME).so + LN1_SLIB := $(LN_SLIB).1 + + export + +-.PHONY: all clean install librtn.a $(OUT_SLIB) ++.PHONY: all clean install librtn.a $(OUT_SLIB) $(OUT_LIB) + + + all: +- @echo " MAKE $(OUT_SLIB)"; \ +- $(MAKE) $(OUT_SLIB) ++ @echo " MAKE $(OUT_LIB)"; \ ++ $(MAKE) $(OUT_LIB) ++ ++$(OUT_LIB): ../Makefile.opts $(OBJ) ++ @echo " LD $(OUT_LIB)"; \ ++ echo $(AR) rs $(OUT_LIB) $(OBJ) ++ $(AR) rs $(OUT_LIB) $(OBJ) + + $(OUT_SLIB): ../Makefile.opts $(OBJ) + @echo " LD $(OUT_SLIB)"; \ +@@ -56,8 +62,8 @@ + + clean: + @echo " CLEAN lib"; \ +- $(RM) -f $(OBJ) $(OUT_SLIB) $(LN_SLIB) $(LN1_SLIB); \ +- $(RM) -f $(DEPS) $(OUT_SLIB) $(LN_SLIB) $(LN1_SLIB) ++ $(RM) -f $(OBJ) $(OUT_SLIB) $(OUT_LIB) $(LN_SLIB) $(LN1_SLIB); \ ++ $(RM) -f $(DEPS) $(OUT_SLIB) $(OUT_LIB) $(LN_SLIB) $(LN1_SLIB) + + distclean: + @echo " DISTCLEAN lib"; \ +@@ -65,11 +71,7 @@ + + install: +- mkdir -p $(DESTDIR)$(libdir)/ +- install -m 0644 $(OUT_SLIB) $(DESTDIR)$(libdir) +- rm -f $(DESTDIR)$(libdir)/$(LN1_SLIB) +- $(LN) -s $(OUT_SLIB) $(DESTDIR)$(libdir)/$(LN1_SLIB) +- rm -f $(DESTDIR)$(libdir)/$(LN_SLIB) +- $(LN) -s $(LN1_SLIB) $(DESTDIR)$(libdir)/$(LN_SLIB) ++ mkdir -p $(DESTDIR)$(libdir)/libnl1 ++ install -m 0644 $(OUT_LIB) $(DESTDIR)$(libdir)/libnl1 + + $(DEPS): ../Makefile.opts + +diff -uNr libnl-1.1.orig//Makefile libnl-1.1/Makefile +--- libnl-1.1.orig//Makefile 2008-01-14 16:48:45.000000000 +0100 ++++ libnl-1.1/Makefile 2011-03-23 16:53:12.438533242 +0100 +@@ -13,7 +13,7 @@ + include Makefile.opts + endif + +-SUBDIRS := lib include doc src tests ++SUBDIRS := lib include doc + .PHONY: all clean distclean install gendoc $(SUBDIRS) + + all: Makefile.opts +diff -uNr libnl-1.1.orig//libnl-1.pc.in libnl-1.1/libnl-1.pc.in +--- libnl-1.1.orig//libnl-1.pc.in 2008-01-14 16:48:45.000000000 +0100 ++++ libnl-1.1/libnl-1.pc.in 2011-03-23 16:57:18.084533174 +0100 +@@ -6,5 +6,5 @@ + Name: libnl + Description: Convenience library for netlink sockets + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lnl +-Cflags: ++Libs: -L${libdir}/libnl1 -lnl1 -lm ++Cflags: -I${includedir}/libnl1 diff --git a/recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch b/recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch similarity index 100% rename from recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch rename to recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch diff --git a/recipes/libnl/libnl-1.1/fix-includes.patch b/recipes/libnl/libnl1-1.1/fix-includes.patch similarity index 100% rename from recipes/libnl/libnl-1.1/fix-includes.patch rename to recipes/libnl/libnl1-1.1/fix-includes.patch diff --git a/recipes/libnl/libnl-1.1/local-includes.patch b/recipes/libnl/libnl1-1.1/local-includes.patch similarity index 100% rename from recipes/libnl/libnl-1.1/local-includes.patch rename to recipes/libnl/libnl1-1.1/local-includes.patch diff --git a/recipes/libnl/libnl-1.1/netlink-local-fix.patch b/recipes/libnl/libnl1-1.1/netlink-local-fix.patch similarity index 100% rename from recipes/libnl/libnl-1.1/netlink-local-fix.patch rename to recipes/libnl/libnl1-1.1/netlink-local-fix.patch diff --git a/recipes/libnl/libnl-1.1/respect-ldflags.patch b/recipes/libnl/libnl1-1.1/respect-ldflags.patch similarity index 100% rename from recipes/libnl/libnl-1.1/respect-ldflags.patch rename to recipes/libnl/libnl1-1.1/respect-ldflags.patch diff --git a/recipes/libnl/libnl_1.1.bb b/recipes/libnl/libnl1_1.1.bb similarity index 77% rename from recipes/libnl/libnl_1.1.bb rename to recipes/libnl/libnl1_1.1.bb index d9f250e629..3569867cc0 100644 --- a/recipes/libnl/libnl_1.1.bb +++ b/recipes/libnl/libnl1_1.1.bb @@ -2,6 +2,9 @@ require libnl.inc PR = "${INC_PR}.0" +# move it to extra subdirectory +includedir = "${prefix}/include/libnl1" + CFLAGS += '-DVLAN_FLAG_REORDER_HDR=1' SRC_URI = "\ @@ -11,7 +14,9 @@ SRC_URI = "\ file://respect-ldflags.patch \ file://netlink-local-fix.patch \ file://dont-link-libnl-from-sysroot.patch \ + file://build.only.static.lib.patch \ " +S = "${WORKDIR}/libnl-${PV}" SRC_URI[md5sum] = "ae970ccd9144e132b68664f98e7ceeb1" SRC_URI[sha256sum] = "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3" From 283e8ef23ef007e7c4307e25aff7668f641a3a76 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 23 Mar 2011 17:32:51 +0100 Subject: [PATCH 239/509] networkmanager_git: fix build with static libnl1 * backend/ip6-manager didn't respect LIBNL_CFLAGS so using /usr/include/netlink headers from libnl-2 * older versions of networkmanager should be fixed or removed * only build tested, please test runtime.. Acked-by: Koen Kooi Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- recipes/networkmanager/networkmanager-0.7.inc | 2 +- ...l-flags-also-in-backends-ip6-manager.patch | 51 +++++++++++++++++++ recipes/networkmanager/networkmanager_git.bb | 2 + 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch diff --git a/recipes/networkmanager/networkmanager-0.7.inc b/recipes/networkmanager/networkmanager-0.7.inc index 6c0ccbeae4..18af1bc805 100644 --- a/recipes/networkmanager/networkmanager-0.7.inc +++ b/recipes/networkmanager/networkmanager-0.7.inc @@ -2,7 +2,7 @@ DESCRIPTION = "NetworkManager" SECTION = "net/misc" LICENSE = "GPL" PRIORITY = "optional" -DEPENDS = "libnl dbus dbus-glib hal wireless-tools policykit gnutls util-linux-ng ppp" +DEPENDS = "libnl1 dbus dbus-glib hal wireless-tools policykit gnutls util-linux-ng ppp" RDEPENDS_${PN} = "wpa-supplicant dhcp-client \ ${@base_contains('COMBINED_FEATURES', '3gmodem', 'ppp', '', d)} \ " diff --git a/recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch b/recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch new file mode 100644 index 0000000000..a923da58cd --- /dev/null +++ b/recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch @@ -0,0 +1,51 @@ +From 9d6414375e2371086dcfadc1d117fbcfe43fb3fc Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 23 Mar 2011 17:27:54 +0100 +Subject: [PATCH] respect libnl flags also in backends/ip6-manager + +Signed-off-by: Martin Jansa +--- + src/backends/Makefile.am | 2 ++ + src/ip6-manager/Makefile.am | 2 ++ + 2 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/src/backends/Makefile.am b/src/backends/Makefile.am +index fbec9aa..c0780d0 100644 +--- a/src/backends/Makefile.am ++++ b/src/backends/Makefile.am +@@ -63,10 +63,12 @@ endif + + libnmbackend_la_LIBADD += \ + $(top_builddir)/src/logging/libnm-logging.la \ ++ $(LIBNL_LIBS) \ + $(DBUS_LIBS) \ + $(GLIB_LIBS) + + libnmbackend_la_CPPFLAGS = \ ++ $(LIBNL_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) \ + -DG_DISABLE_DEPRECATED \ +diff --git a/src/ip6-manager/Makefile.am b/src/ip6-manager/Makefile.am +index b56b197..b98d6de 100644 +--- a/src/ip6-manager/Makefile.am ++++ b/src/ip6-manager/Makefile.am +@@ -13,6 +13,7 @@ libip6_manager_la_SOURCES = \ + nm-ip6-manager.h + + libip6_manager_la_CPPFLAGS = \ ++ $(LIBNL_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) \ + -DG_DISABLE_DEPRECATED +@@ -20,6 +21,7 @@ libip6_manager_la_CPPFLAGS = \ + libip6_manager_la_LIBADD = \ + $(top_builddir)/marshallers/libmarshallers.la \ + $(top_builddir)/src/logging/libnm-logging.la \ ++ $(LIBNL_LIBS) \ + $(DBUS_LIBS) \ + $(GLIB_LIBS) + +-- +1.7.4.1 + diff --git a/recipes/networkmanager/networkmanager_git.bb b/recipes/networkmanager/networkmanager_git.bb index bb746a1166..c6bfab2913 100644 --- a/recipes/networkmanager/networkmanager_git.bb +++ b/recipes/networkmanager/networkmanager_git.bb @@ -2,6 +2,7 @@ require networkmanager-0.7.inc DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" +DEFAULT_PREFERENCE_shr = "1" SRCREV = "9b61ec7c58e8106c28d01b33ad0b263aefb1f347" PV = "0.8.2+git" @@ -18,6 +19,7 @@ SRC_URI += " \ file://nm-system-settings.conf \ file://NetworkManager \ file://gtk-doc.make \ + file://0001-respect-libnl-flags-also-in-backends-ip6-manager.patch \ " EXTRA_OECONF += " --with-dhclient=${base_sbindir}/dhclient \ From 567264153d10d9cdb8fa0fca46b3503e10007b20 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 24 Mar 2011 10:44:24 +0100 Subject: [PATCH 240/509] networkmanager 0.8.1: fix build against libl using the patch from the git version Signed-off-by: Koen Kooi --- recipes/networkmanager/networkmanager_0.8.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/networkmanager/networkmanager_0.8.1.bb b/recipes/networkmanager/networkmanager_0.8.1.bb index 90b8946624..ca6572fcd1 100644 --- a/recipes/networkmanager/networkmanager_0.8.1.bb +++ b/recipes/networkmanager/networkmanager_0.8.1.bb @@ -1,6 +1,6 @@ require networkmanager-0.7.inc -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-1" @@ -10,6 +10,7 @@ SRC_URI += " \ file://nm-system-settings.conf \ file://NetworkManager \ file://gtk-doc.make \ + file://0001-respect-libnl-flags-also-in-backends-ip6-manager.patch \ " SRC_URI[md5sum] = "96e551149dda8f6e0a5621f77468ba79" From 3879334800eecc8b346c9ea286ba7b66b029dc31 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 26 Mar 2011 14:50:45 +0100 Subject: [PATCH 241/509] bluez 4.84: raise default preference after libnl changes Signed-off-by: Koen Kooi --- recipes/bluez/bluez4_4.75.bb | 1 - recipes/bluez/bluez4_4.84.bb | 3 --- 2 files changed, 4 deletions(-) diff --git a/recipes/bluez/bluez4_4.75.bb b/recipes/bluez/bluez4_4.75.bb index 20b5a6ac81..269f7d75a0 100644 --- a/recipes/bluez/bluez4_4.75.bb +++ b/recipes/bluez/bluez4_4.75.bb @@ -4,7 +4,6 @@ SRC_URI[md5sum] = "ee95086aef5955b25f1226b9e45bd6be" SRC_URI[sha256sum] = "fd861de5c966dc563e6a1c34400bb0c0fe1277e37655ab3ce3f48356035f61b8" DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_angstrom = "1" DEPENDS += "libnl libsndfile1" diff --git a/recipes/bluez/bluez4_4.84.bb b/recipes/bluez/bluez4_4.84.bb index b964f2724e..729f38ce11 100644 --- a/recipes/bluez/bluez4_4.84.bb +++ b/recipes/bluez/bluez4_4.84.bb @@ -3,9 +3,6 @@ require bluez4.inc SRC_URI[md5sum] = "95e66f26f69aa425d27718f487b6bc74" SRC_URI[sha256sum] = "2913b0b09738295547c1bfdcca9e1da456c9ad6950cc499b1ee83b330bf8a5b6" -DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_shr = "1" - DEPENDS += "libsndfile1" PR = "${INC_PR}.0" From b3aaa1f5b57332b9ec25602be82f3bc68a227ae3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 24 Mar 2011 10:21:23 +0100 Subject: [PATCH 242/509] orc: add version 0.4.10 Signed-off-by: Paul Menzel Acked-by: Koen Kooi Signed-off-by: Koen Kooi --- recipes/orc/orc_0.4.10.bb | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 recipes/orc/orc_0.4.10.bb diff --git a/recipes/orc/orc_0.4.10.bb b/recipes/orc/orc_0.4.10.bb new file mode 100644 index 0000000000..e072fab04a --- /dev/null +++ b/recipes/orc/orc_0.4.10.bb @@ -0,0 +1,4 @@ +require orc.inc + +SRC_URI[orc.md5sum] = "dd4e7a1820c9db5853aa7fe31ddb5a03" +SRC_URI[orc.sha256sum] = "5001a0034edc06800b546246fbe0407ba6e9759c9583d5d93adba3557b6a777e" From e197450f835375830d9a0227d0073d52752168b9 Mon Sep 17 00:00:00 2001 From: Jeff Lance Date: Wed, 30 Mar 2011 23:20:20 +0000 Subject: [PATCH 243/509] matrix-gui: update SRCREV * am1808 - pull in better description for WiFi. Signed-off-by: Jeff Lance Acked-by: Chase Maupin Signed-off-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- recipes/ti/matrix-gui-common_1.4.bb | 4 ++-- recipes/ti/matrix-gui-e_1.3.bb | 4 ++-- recipes/ti/matrix-gui_1.3.bb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/ti/matrix-gui-common_1.4.bb b/recipes/ti/matrix-gui-common_1.4.bb index 29d6b3e0cb..04cdb2f5a9 100644 --- a/recipes/ti/matrix-gui-common_1.4.bb +++ b/recipes/ti/matrix-gui-common_1.4.bb @@ -4,5 +4,5 @@ require matrix-gui-common.inc # prebuilt version in the repository. RRECOMMENDS_${PN} = "am-sysinfo" -SRCREV = "242" -PR = "${INC_PR}.7" +SRCREV = "243" +PR = "${INC_PR}.8" diff --git a/recipes/ti/matrix-gui-e_1.3.bb b/recipes/ti/matrix-gui-e_1.3.bb index 00aeb42e4f..45194379f0 100644 --- a/recipes/ti/matrix-gui-e_1.3.bb +++ b/recipes/ti/matrix-gui-e_1.3.bb @@ -1,5 +1,5 @@ require matrix-gui-e.inc -SRCREV = "242" -PR = "${INC_PR}.6" +SRCREV = "243" +PR = "${INC_PR}.7" diff --git a/recipes/ti/matrix-gui_1.3.bb b/recipes/ti/matrix-gui_1.3.bb index ddcb15a9be..727aca114f 100644 --- a/recipes/ti/matrix-gui_1.3.bb +++ b/recipes/ti/matrix-gui_1.3.bb @@ -1,4 +1,4 @@ require matrix-gui.inc -SRCREV = "242" -PR = "${INC_PR}.2" +SRCREV = "243" +PR = "${INC_PR}.3" From 7de3d7bb9b6f88db7f72860666e641a1cbd37b4c Mon Sep 17 00:00:00 2001 From: Roger Monk Date: Fri, 25 Mar 2011 15:21:43 +0000 Subject: [PATCH 244/509] omap4430-panda: Switch panda to use new omap4 include + add new SOC_FAMILY * Add new omap4.inc * Switch machine config to use new omap4 include Signed-off-by: Roger Monk Signed-off-by: Koen Kooi --- conf/machine/include/omap4.inc | 15 +++++++++++++++ conf/machine/omap4430-panda.conf | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 conf/machine/include/omap4.inc diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc new file mode 100644 index 0000000000..a5a920cd24 --- /dev/null +++ b/conf/machine/include/omap4.inc @@ -0,0 +1,15 @@ +SOC_FAMILY = "omap4" +TARGET_ARCH = "arm" + +require conf/machine/include/tune-cortexa8.inc +PREFERRED_PROVIDER_virtual/kernel = "linux-omap" +# Increase this everytime you change something in the kernel +MACHINE_KERNEL_PR = "r101" + +KERNEL_IMAGETYPE = "uImage" + +UBOOT_ENTRYPOINT = "0x80008000" +UBOOT_LOADADDRESS = "0x80008000" + +EXTRA_IMAGEDEPENDS += "u-boot x-load" + diff --git a/conf/machine/omap4430-panda.conf b/conf/machine/omap4430-panda.conf index d7956906ea..f5f8757533 100644 --- a/conf/machine/omap4430-panda.conf +++ b/conf/machine/omap4430-panda.conf @@ -2,7 +2,7 @@ #@NAME: OMAP4430 Panda #@DESCRIPTION: Machine configuration for the OMAP4430 Panda -require conf/machine/include/omap3.inc +require conf/machine/include/omap4.inc XLOAD_MACHINE = "omap4430panda_config" XLOAD_LOAD_ADDRESS = 0x40304350 From e95f9b38cc2235fcf9e7bec27079d455aa9f5c57 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Wed, 30 Mar 2011 18:05:30 -0400 Subject: [PATCH 245/509] autoconf: Fix paths for scripts installed on the target. Signed-off-by: Koen Kooi --- recipes/autoconf/autoconf.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes/autoconf/autoconf.inc b/recipes/autoconf/autoconf.inc index 7f22c2b0ec..31e51dffd8 100644 --- a/recipes/autoconf/autoconf.inc +++ b/recipes/autoconf/autoconf.inc @@ -8,7 +8,7 @@ RDEPENDS_${PN} = "m4 perl gnu-config" DEPENDS_virtclass-native = "m4-native gnu-config-native perl-native" RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native perl-native" -INC_PR = "r13" +INC_PR = "r14" SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2;name=autoconf \ file://program_prefix.patch" @@ -34,5 +34,9 @@ do_configure_append() { sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${S}/bin/*.in } +do_install_append_pn-autoconf(){ + sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g ${D}${bindir}/* +} + PARALLEL_MAKE = "" BBCLASSEXTEND = "native" From 88a7cdcdc56a806eaca5b559133558f8cd530c94 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Wed, 30 Mar 2011 18:06:11 -0400 Subject: [PATCH 246/509] automake: Fix paths in scripts installed on target. Signed-off-by: Koen Kooi --- recipes/automake/automake.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes/automake/automake.inc b/recipes/automake/automake.inc index de4df34d38..af0ba6ab55 100644 --- a/recipes/automake/automake.inc +++ b/recipes/automake/automake.inc @@ -29,7 +29,7 @@ RDEPENDS_automake += "\ perl-module-text-parsewords \ perl-module-vars " SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2;name=automake" -INC_PR = "r4" +INC_PR = "r5" AUTOMAKE_API = "${@".".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" inherit autotools @@ -48,4 +48,8 @@ do_install_append () { install -d ${D}${datadir}/aclocal } +do_install_append_pn-automake(){ + sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g ${D}${bindir}/* +} + BBCLASSEXTEND = "native" From 53be981a4993667c53b285d884c694f9b4f0382a Mon Sep 17 00:00:00 2001 From: Chase Maupin Date: Wed, 30 Mar 2011 13:08:07 -0500 Subject: [PATCH 247/509] linux-omap3: add PSP recipe for am387x-evm * Add the TI PSP kernel recipe for the am387x-evm machine type. * Added the defconfig for ti814x devices * Based on kernel recipe from Arago contributed by Nageswari Srinivasan Signed-off-by: Chase Maupin Signed-off-by: Denys Dmytriyenko --- .../ti814x/defconfig | 1927 +++++++++++++++++ .../linux-omap3_2.6.37-psp04.01.00.03.bb | 10 + 2 files changed, 1937 insertions(+) create mode 100644 recipes/linux/linux-omap3-2.6.37-psp04.01.00.03/ti814x/defconfig create mode 100644 recipes/linux/linux-omap3_2.6.37-psp04.01.00.03.bb diff --git a/recipes/linux/linux-omap3-2.6.37-psp04.01.00.03/ti814x/defconfig b/recipes/linux/linux-omap3-2.6.37-psp04.01.00.03/ti814x/defconfig new file mode 100644 index 0000000000..445ea14f4a --- /dev/null +++ b/recipes/linux/linux-omap3-2.6.37-psp04.01.00.03/ti814x/defconfig @@ -0,0 +1,1927 @@ +# +# Automatically generated make config: don't edit +# Linux/arm 2.6.37 Kernel Configuration +# Sat Feb 12 22:31:08 2011 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +# CONFIG_ARCH_USES_GETTIMEOFFSET is not set +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_ARCH_HAS_CPUFREQ=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_ARM_L1_CACHE_SHIFT_6=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y +CONFIG_HAVE_IRQ_WORK=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_LZO is not set +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set +# CONFIG_HAVE_GENERIC_HARDIRQS is not set +# CONFIG_SPARSE_IRQ is not set + +# +# RCU Subsystem +# +CONFIG_TINY_RCU=y +# CONFIG_PREEMPT_RCU is not set +# CONFIG_TREE_RCU_TRACE is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=17 +# CONFIG_CGROUPS is not set +CONFIG_NAMESPACES=y +# CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set +# CONFIG_NET_NS is not set +# CONFIG_SYSFS_DEPRECATED is not set +# CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_LZO=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_EXTRA_PASS=y +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_PERF_USE_VMALLOC=y + +# +# Kernel Performance Events And Counters +# +# CONFIG_PERF_EVENTS is not set +# CONFIG_PERF_COUNTERS is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLUB_DEBUG=y +CONFIG_COMPAT_BRK=y +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +CONFIG_KPROBES=y +CONFIG_KRETPROBES=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_CLK=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_BLOCK=y +# CONFIG_LBDAF is not set +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_INLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +CONFIG_INLINE_READ_UNLOCK=y +# CONFIG_INLINE_READ_UNLOCK_BH is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +CONFIG_INLINE_WRITE_UNLOCK=y +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set +# CONFIG_FREEZER is not set + +# +# System Type +# +CONFIG_MMU=y +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_VEXPRESS is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_BCMRING is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CNS3XXX is not set +# CONFIG_ARCH_GEMINI is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_STMP3XXX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_DOVE is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_LPC32XX is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_MMP is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_W90X900 is not set +# CONFIG_ARCH_NUC93X is not set +# CONFIG_ARCH_TEGRA is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_MSM is not set +# CONFIG_ARCH_SHMOBILE is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_S5P64X0 is not set +# CONFIG_ARCH_S5P6442 is not set +# CONFIG_ARCH_S5PC100 is not set +# CONFIG_ARCH_S5PV210 is not set +# CONFIG_ARCH_S5PV310 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_TCC_926 is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_U300 is not set +# CONFIG_ARCH_U8500 is not set +# CONFIG_ARCH_NOMADIK is not set +# CONFIG_ARCH_DAVINCI is not set +CONFIG_ARCH_OMAP=y +# CONFIG_PLAT_SPEAR is not set + +# +# TI OMAP Common Features +# +# CONFIG_ARCH_OMAP1 is not set +CONFIG_ARCH_OMAP2PLUS=y + +# +# OMAP Feature Selections +# +# CONFIG_OMAP_RESET_CLOCKS is not set +CONFIG_OMAP_MUX=y +# CONFIG_OMAP_MUX_DEBUG is not set +CONFIG_OMAP_MUX_WARNINGS=y +# CONFIG_OMAP_MCBSP is not set +# CONFIG_OMAP_MBOX_FWK is not set +CONFIG_OMAP_IOMMU=y +# CONFIG_OMAP_IOMMU_DEBUG is not set +CONFIG_OMAP_MPU_TIMER=y +# CONFIG_OMAP_32K_TIMER is not set +CONFIG_OMAP_DM_TIMER=y +# CONFIG_OMAP_PM_NONE is not set +CONFIG_OMAP_PM_NOOP=y + +# +# TI OMAP2/3/4 Specific Features +# +CONFIG_ARCH_OMAP2PLUS_TYPICAL=y +# CONFIG_ARCH_OMAP2 is not set +# CONFIG_ARCH_OMAP3 is not set +# CONFIG_ARCH_OMAP4 is not set +CONFIG_ARCH_TI81XX=y +# CONFIG_ARCH_TI816X is not set +CONFIG_ARCH_TI814X=y + +# +# OMAP Board Type +# + +# +# TI81XX Board Type +# +CONFIG_MACH_TI8148EVM=y + +# +# Processor Type +# +CONFIG_CPU_32v6K=y +CONFIG_CPU_V7=y +CONFIG_CPU_32v7=y +CONFIG_CPU_ABRT_EV7=y +CONFIG_CPU_PABRT_V7=y +CONFIG_CPU_CACHE_V7=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y +CONFIG_CPU_TLB_V7=y +CONFIG_CPU_HAS_ASID=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_ARM_THUMBEE is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_ARM_L1_CACHE_SHIFT=6 +CONFIG_ARM_DMA_MEM_BUFFERABLE=y +CONFIG_CPU_HAS_PMU=y +# CONFIG_ARM_ERRATA_430973 is not set +# CONFIG_ARM_ERRATA_458693 is not set +# CONFIG_ARM_ERRATA_460075 is not set +# CONFIG_ARM_ERRATA_743622 is not set +CONFIG_COMMON_CLKDEV=y + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +CONFIG_ARCH_SUPPORTS_MSI=y +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +CONFIG_HZ=100 +# CONFIG_THUMB2_KERNEL is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_HIGHMEM is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_VIRT_TO_BUS=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_NEED_PER_CPU_KM=y +CONFIG_FORCE_MAX_ZONEORDER=11 +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y +# CONFIG_UACCESS_WITH_MEMCPY is not set +# CONFIG_SECCOMP is not set +# CONFIG_CC_STACKPROTECTOR is not set +# CONFIG_DEPRECATED_PARAM_STRUCT is not set + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0 +CONFIG_ZBOOT_ROM_BSS=0 +CONFIG_CMDLINE="" +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set +# CONFIG_AUTO_ZRELADDR is not set + +# +# CPU Power Management +# +# CONFIG_CPU_FREQ is not set +# CONFIG_CPU_IDLE is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set +CONFIG_VFP=y +CONFIG_VFPv3=y +CONFIG_NEON=y + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_MISC=y + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_DEBUG=y +# CONFIG_PM_ADVANCED_DEBUG is not set +CONFIG_PM_VERBOSE=y +# CONFIG_SUSPEND is not set +# CONFIG_APM_EMULATION is not set +CONFIG_PM_RUNTIME=y +CONFIG_PM_OPS=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE_DEMUX is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6_MIP6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=m +# CONFIG_IPV6_SIT_6RD is not set +CONFIG_IPV6_NDISC_NODETYPE=y +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_IPV6_MROUTE is not set +# CONFIG_NETLABEL is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_L2TP is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set +CONFIG_DNS_RESOLVER=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_NET_TCPPROBE is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +CONFIG_WIRELESS=y +# CONFIG_CFG80211 is not set +# CONFIG_LIB80211 is not set + +# +# CFG80211 needs to be enabled for MAC80211 +# + +# +# Some wireless drivers require a rate control algorithm +# +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set +# CONFIG_CAIF is not set +# CONFIG_CEPH_LIB is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_TESTS is not set +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_SM_FTL is not set +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +CONFIG_MTD_M25P80=y +CONFIG_M25PXX_USE_FAST_READ=y +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND_ECC=y +# CONFIG_MTD_NAND_ECC_SMC is not set +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_SM_COMMON is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_GPIO is not set +CONFIG_MTD_NAND_OMAP2=y +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ALAUDA is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set +# CONFIG_MTD_UBI is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set + +# +# DRBD disabled because PROC_FS, INET or CONNECTOR not selected +# +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=32768 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_MG_DISK is not set +# CONFIG_BLK_DEV_RBD is not set +CONFIG_MISC_DEVICES=y +# CONFIG_AD525X_DPOT is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_APDS9802ALS is not set +# CONFIG_ISL29003 is not set +# CONFIG_ISL29020 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_SENSORS_BH1780 is not set +# CONFIG_SENSORS_BH1770 is not set +# CONFIG_SENSORS_APDS990X is not set +# CONFIG_HMC6352 is not set +# CONFIG_DS1682 is not set +# CONFIG_TI_DAC7512 is not set +# CONFIG_BMP085 is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=y +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_IWMC3200TOP is not set + +# +# Texas Instruments shared transport line discipline +# +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=y +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=y +# CONFIG_CHR_DEV_SCH is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +# CONFIG_SCSI_LOWLEVEL is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI_PLATFORM=y +# CONFIG_ATA_SFF is not set +# CONFIG_MD is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +CONFIG_MII=y +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_BCM63XX_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_MICREL_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set +# CONFIG_NET_ETHERNET is not set +CONFIG_NETDEV_1000=y +CONFIG_TI_DAVINCI_MDIO=y +CONFIG_TI_DAVINCI_CPDMA=y +CONFIG_TI_CPSW=y +# CONFIG_STMMAC_ETH is not set +# CONFIG_NETDEV_10000 is not set +# CONFIG_WLAN is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +CONFIG_USB_USBNET=y +# CONFIG_USB_NET_AX8817X is not set +CONFIG_USB_NET_CDCETHER=y +# CONFIG_USB_NET_CDC_EEM is not set +CONFIG_USB_NET_DM9601=y +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set +# CONFIG_USB_NET_INT51X1 is not set +# CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set +# CONFIG_WAN is not set + +# +# CAIF transport drivers +# +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_ISDN is not set +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set +# CONFIG_INPUT_SPARSEKMAP is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_RAW is not set +# CONFIG_SERIO_ALTERA_PS2 is not set +# CONFIG_SERIO_PS2MULT is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y +CONFIG_SERIAL_NONSTANDARD=y +# CONFIG_N_HDLC is not set +# CONFIG_N_GSM is not set +# CONFIG_RISCOM8 is not set +# CONFIG_SPECIALIX is not set +# CONFIG_STALDRV is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=64 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +# CONFIG_SERIAL_8250_MANY_PORTS is not set +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX3107 is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_OMAP=y +CONFIG_SERIAL_OMAP_CONSOLE=y +# CONFIG_SERIAL_TIMBERDALE is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +# CONFIG_LEGACY_PTYS is not set +# CONFIG_IPMI_HANDLER is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +# CONFIG_TI81XX_HDMI is not set +# CONFIG_RAMOOPS is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=y +# CONFIG_I2C_MUX is not set +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE is not set +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_OMAP=y +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_GPIO is not set +CONFIG_SPI_OMAP24XX=y +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set + +# +# PPS support +# +# CONFIG_PPS is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +# CONFIG_GPIO_SYSFS is not set + +# +# Memory mapped GPIO expanders: +# +# CONFIG_GPIO_BASIC_MMIO is not set +# CONFIG_GPIO_IT8761E is not set +# CONFIG_GPIO_VX855 is not set + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_SX150X is not set +# CONFIG_GPIO_ADP5588 is not set + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_74X164 is not set + +# +# AC97 GPIO expanders: +# + +# +# MODULbus GPIO expanders: +# +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +# CONFIG_HWMON is not set +# CONFIG_THERMAL is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_OMAP_WATCHDOG=y +# CONFIG_MAX63XX_WATCHDOG is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=m +CONFIG_SSB_SDIOHOST_POSSIBLE=y +# CONFIG_SSB_SDIOHOST is not set +# CONFIG_SSB_DEBUG is not set +CONFIG_MFD_SUPPORT=y +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_HTC_I2CPLD is not set +# CONFIG_TPS65010 is not set +# CONFIG_TPS6507X is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_TC35892 is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_MAX8998 is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X_I2C is not set +# CONFIG_MFD_WM831X_SPI is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_MFD_MC13XXX is not set +# CONFIG_ABX500_CORE is not set +# CONFIG_EZX_PCAP is not set +# CONFIG_MFD_TPS6586X is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +CONFIG_REGULATOR_DUMMY=y +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_BQ24022 is not set +# CONFIG_REGULATOR_MAX1586 is not set +# CONFIG_REGULATOR_MAX8649 is not set +# CONFIG_REGULATOR_MAX8660 is not set +# CONFIG_REGULATOR_MAX8952 is not set +# CONFIG_REGULATOR_LP3971 is not set +# CONFIG_REGULATOR_LP3972 is not set +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set +# CONFIG_REGULATOR_ISL6271A is not set +# CONFIG_REGULATOR_AD5398 is not set +CONFIG_MEDIA_SUPPORT=y + +# +# Multimedia core support +# +# CONFIG_MEDIA_CONTROLLER is not set +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_COMMON=y +CONFIG_VIDEO_ALLOW_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +# CONFIG_DVB_CORE is not set +CONFIG_VIDEO_MEDIA=y + +# +# Multimedia drivers +# +# CONFIG_IR_CORE is not set +# CONFIG_MEDIA_ATTACH is not set +CONFIG_MEDIA_TUNER=y +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_MEDIA_TUNER_SIMPLE=y +CONFIG_MEDIA_TUNER_TDA8290=y +CONFIG_MEDIA_TUNER_TDA827X=y +CONFIG_MEDIA_TUNER_TDA18271=y +CONFIG_MEDIA_TUNER_TDA9887=y +CONFIG_MEDIA_TUNER_TEA5761=y +CONFIG_MEDIA_TUNER_TEA5767=y +CONFIG_MEDIA_TUNER_MT20XX=y +CONFIG_MEDIA_TUNER_XC2028=y +CONFIG_MEDIA_TUNER_XC5000=y +CONFIG_MEDIA_TUNER_MC44S803=y +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set + +# +# Encoders/decoders and other helper chips +# + +# +# Audio decoders +# +# CONFIG_VIDEO_TVAUDIO is not set +# CONFIG_VIDEO_TDA7432 is not set +# CONFIG_VIDEO_TDA9840 is not set +# CONFIG_VIDEO_TDA9875 is not set +# CONFIG_VIDEO_TEA6415C is not set +# CONFIG_VIDEO_TEA6420 is not set +# CONFIG_VIDEO_MSP3400 is not set +# CONFIG_VIDEO_CS5345 is not set +# CONFIG_VIDEO_CS53L32A is not set +# CONFIG_VIDEO_M52790 is not set +# CONFIG_VIDEO_TLV320AIC23B is not set +# CONFIG_VIDEO_WM8775 is not set +# CONFIG_VIDEO_WM8739 is not set +# CONFIG_VIDEO_VP27SMPX is not set + +# +# RDS decoders +# +# CONFIG_VIDEO_SAA6588 is not set + +# +# Video decoders +# +# CONFIG_VIDEO_ADV7180 is not set +# CONFIG_VIDEO_BT819 is not set +# CONFIG_VIDEO_BT856 is not set +# CONFIG_VIDEO_BT866 is not set +# CONFIG_VIDEO_KS0127 is not set +# CONFIG_VIDEO_OV7670 is not set +# CONFIG_VIDEO_MT9T001 is not set +# CONFIG_VIDEO_MT9V011 is not set +# CONFIG_VIDEO_MT9V113 is not set +# CONFIG_VIDEO_TCM825X is not set +# CONFIG_VIDEO_SAA7110 is not set +# CONFIG_VIDEO_SAA711X is not set +# CONFIG_VIDEO_SAA717X is not set +# CONFIG_VIDEO_SAA7191 is not set +# CONFIG_VIDEO_TVP514X is not set +# CONFIG_VIDEO_TVP5150 is not set +# CONFIG_VIDEO_TVP7002 is not set +# CONFIG_VIDEO_VPX3220 is not set + +# +# Video and audio decoders +# +# CONFIG_VIDEO_CX25840 is not set + +# +# MPEG video encoders +# +# CONFIG_VIDEO_CX2341X is not set + +# +# Video encoders +# +# CONFIG_VIDEO_SAA7127 is not set +# CONFIG_VIDEO_SAA7185 is not set +# CONFIG_VIDEO_ADV7170 is not set +# CONFIG_VIDEO_ADV7175 is not set +# CONFIG_VIDEO_THS7303 is not set +# CONFIG_VIDEO_ADV7343 is not set +# CONFIG_VIDEO_AK881X is not set + +# +# Video improvement chips +# +# CONFIG_VIDEO_UPD64031A is not set +# CONFIG_VIDEO_UPD64083 is not set +# CONFIG_VIDEO_CPIA2 is not set +# CONFIG_VIDEO_SR030PC30 is not set +# CONFIG_SOC_CAMERA is not set +CONFIG_V4L_USB_DRIVERS=y +CONFIG_USB_VIDEO_CLASS=y +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +# CONFIG_USB_GSPCA is not set +# CONFIG_VIDEO_PVRUSB2 is not set +# CONFIG_VIDEO_HDPVR is not set +# CONFIG_VIDEO_USBVISION is not set +# CONFIG_USB_VICAM is not set +# CONFIG_USB_IBMCAM is not set +# CONFIG_USB_KONICAWC is not set +# CONFIG_USB_ET61X251 is not set +# CONFIG_USB_SE401 is not set +# CONFIG_USB_SN9C102 is not set +# CONFIG_USB_PWC is not set +# CONFIG_USB_ZR364XX is not set +# CONFIG_USB_STKWEBCAM is not set +# CONFIG_USB_S2255 is not set +# CONFIG_V4L_MEM2MEM_DRIVERS is not set +# CONFIG_RADIO_ADAPTERS is not set +# CONFIG_DAB is not set +CONFIG_HAVE_TI_TILER=y +# CONFIG_TI_TILER is not set + +# +# Graphics support +# +# CONFIG_DRM is not set +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_TI81XX_VPSS is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE is not set +# CONFIG_LOGO is not set +CONFIG_SOUND=y +# CONFIG_SOUND_OSS_CORE is not set +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=y +CONFIG_SND_RAWMIDI=y +CONFIG_SND_JACK=y +# CONFIG_SND_SEQUENCER is not set +# CONFIG_SND_MIXER_OSS is not set +# CONFIG_SND_PCM_OSS is not set +# CONFIG_SND_HRTIMER is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +# CONFIG_SND_RAWMIDI_SEQ is not set +# CONFIG_SND_OPL3_LIB_SEQ is not set +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +# CONFIG_SND_EMU10K1_SEQ is not set +# CONFIG_SND_DRIVERS is not set +# CONFIG_SND_ARM is not set +# CONFIG_SND_SPI is not set +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=y +# CONFIG_SND_USB_UA101 is not set +# CONFIG_SND_USB_CAIAQ is not set +CONFIG_SND_SOC=y +CONFIG_SND_TI81XX_SOC=y +CONFIG_SND_DAVINCI_SOC_MCASP=y +CONFIG_SND_TI81XX_SOC_EVM=y +# CONFIG_SND_OMAP_SOC is not set +CONFIG_SND_SOC_I2C_AND_SPI=y +# CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_TLV320AIC3X=y +# CONFIG_SOUND_PRIME is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set + +# +# Special HID drivers +# +# CONFIG_HID_3M_PCT is not set +CONFIG_HID_A4TECH=y +# CONFIG_HID_ACRUX_FF is not set +CONFIG_HID_APPLE=y +CONFIG_HID_BELKIN=y +# CONFIG_HID_CANDO is not set +CONFIG_HID_CHERRY=y +CONFIG_HID_CHICONY=y +# CONFIG_HID_PRODIKEYS is not set +CONFIG_HID_CYPRESS=y +# CONFIG_HID_DRAGONRISE is not set +# CONFIG_HID_EGALAX is not set +CONFIG_HID_EZKEY=y +CONFIG_HID_KYE=y +# CONFIG_HID_UCLOGIC is not set +# CONFIG_HID_WALTOP is not set +# CONFIG_HID_GYRATION is not set +# CONFIG_HID_TWINHAN is not set +CONFIG_HID_KENSINGTON=y +CONFIG_HID_LOGITECH=y +# CONFIG_LOGITECH_FF is not set +# CONFIG_LOGIRUMBLEPAD2_FF is not set +# CONFIG_LOGIG940_FF is not set +# CONFIG_LOGIWII_FF is not set +CONFIG_HID_MICROSOFT=y +# CONFIG_HID_MOSART is not set +CONFIG_HID_MONTEREY=y +# CONFIG_HID_NTRIG is not set +# CONFIG_HID_ORTEK is not set +# CONFIG_HID_PANTHERLORD is not set +# CONFIG_HID_PETALYNX is not set +# CONFIG_HID_PICOLCD is not set +# CONFIG_HID_QUANTA is not set +# CONFIG_HID_ROCCAT is not set +# CONFIG_HID_ROCCAT_KONE is not set +# CONFIG_HID_ROCCAT_PYRA is not set +# CONFIG_HID_SAMSUNG is not set +# CONFIG_HID_SONY is not set +# CONFIG_HID_STANTUM is not set +# CONFIG_HID_SUNPLUS is not set +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TOPSEED is not set +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_ZEROPLUS is not set +# CONFIG_HID_ZYDACRON is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +CONFIG_USB_SUSPEND=y +# CONFIG_USB_OTG is not set +# CONFIG_USB_MON is not set +# CONFIG_USB_WUSB is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_ISP1362_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_HWA_HCD is not set +CONFIG_USB_MUSB_HDRC=y + +# +# Platform Glue Layer +# +# CONFIG_USB_MUSB_TUSB6010_GLUE is not set +# CONFIG_USB_MUSB_OMAP2PLUS_GLUE is not set +# CONFIG_USB_MUSB_AM35X_GLUE is not set +CONFIG_USB_MUSB_TI81XX_GLUE=y +# CONFIG_USB_MUSB_DAVINCI is not set +# CONFIG_USB_MUSB_DA8XX is not set +# CONFIG_USB_MUSB_TUSB6010 is not set +# CONFIG_USB_MUSB_OMAP2PLUS is not set +# CONFIG_USB_MUSB_AM35X is not set +CONFIG_USB_MUSB_TI81XX=y +# CONFIG_USB_MUSB_BLACKFIN is not set +# CONFIG_USB_MUSB_UX500 is not set +CONFIG_USB_MUSB_HOST=y +CONFIG_USB_MUSB_HDRC_HCD=y +# CONFIG_MUSB_PIO_ONLY is not set +# CONFIG_USB_INVENTRA_DMA_HW is not set +# CONFIG_USB_TI_CPPI_DMA_HW is not set +CONFIG_USB_TI_CPPI41_DMA_HW=y +# CONFIG_USB_INVENTRA_DMA is not set +# CONFIG_USB_TI_CPPI_DMA is not set +CONFIG_USB_TI_CPPI41_DMA=y +# CONFIG_USB_TUSB_OMAP_DMA is not set +CONFIG_USB_MUSB_DEBUG=y + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set +# CONFIG_USB_WDM is not set +# CONFIG_USB_TMC is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set +# CONFIG_USB_UAS is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_SISUSBVGA is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_YUREX is not set +# CONFIG_USB_GADGET is not set + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +# CONFIG_USB_GPIO_VBUS is not set +# CONFIG_USB_ULPI is not set +CONFIG_NOP_USB_XCEIV=y +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +# CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +# CONFIG_MMC_OMAP is not set +CONFIG_MMC_OMAP_HS=y +# CONFIG_MMC_SPI is not set +# CONFIG_MMC_USHC is not set +# CONFIG_MEMSTICK is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_ACCESSIBILITY is not set +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set +# CONFIG_DMADEVICES is not set +# CONFIG_AUXDISPLAY is not set +# CONFIG_UIO is not set +# CONFIG_STAGING is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT4_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +CONFIG_FS_POSIX_ACL=y +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +CONFIG_FILE_LOCKING=y +# CONFIG_FSNOTIFY is not set +# CONFIG_DNOTIFY is not set +# CONFIG_INOTIFY_USER is not set +# CONFIG_FANOTIFY is not set +# CONFIG_QUOTA is not set +# CONFIG_QUOTACTL is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=y +# CONFIG_JOLIET is not set +# CONFIG_ZISOFS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_ECRYPT_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_FS_WBUF_VERIFY=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_LOGFS is not set +# CONFIG_CRAMFS is not set +# CONFIG_SQUASHFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set +CONFIG_ROOT_NFS=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +# CONFIG_NFS_USE_NEW_IDMAPPER is not set +# CONFIG_NFSD is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_CEPH_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y +# CONFIG_DLM is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_LOCKUP_DETECTOR is not set +# CONFIG_HARDLOCKUP_DETECTOR is not set +# CONFIG_DETECT_HUNG_TASK is not set +# CONFIG_SCHED_DEBUG is not set +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +CONFIG_BKL=y +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_KPROBES_SANITY_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_LKDTM is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_SYSCTL_SYSCALL_CHECK is not set +# CONFIG_PAGE_POISONING is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_TRACING_SUPPORT=y +# CONFIG_FTRACE is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_ATOMIC64_SELFTEST is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +# CONFIG_STRICT_DEVMEM is not set +# CONFIG_ARM_UNWIND is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_ERRORS is not set +# CONFIG_DEBUG_STACK_USAGE is not set +CONFIG_DEBUG_LL=y +CONFIG_EARLY_PRINTK=y +# CONFIG_DEBUG_ICEDCC is not set +# CONFIG_OC_ETM is not set + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_KEYS_DEBUG_PROC_KEYS=y +# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY=y +# CONFIG_SECURITYFS is not set +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +# CONFIG_SECURITY_PATH is not set +# CONFIG_SECURITY_TOMOYO is not set +# CONFIG_SECURITY_APPARMOR is not set +# CONFIG_IMA is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +CONFIG_CRYPTO_WORKQUEUE=y +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +# CONFIG_CRYPTO_ECB is not set +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_GHASH is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +CONFIG_CRYPTO_AES=m +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_ZLIB is not set +# CONFIG_CRYPTO_LZO is not set + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +# CONFIG_CRYPTO_HW is not set +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +# CONFIG_CRC_T10DIF is not set +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y diff --git a/recipes/linux/linux-omap3_2.6.37-psp04.01.00.03.bb b/recipes/linux/linux-omap3_2.6.37-psp04.01.00.03.bb new file mode 100644 index 0000000000..418c7d508a --- /dev/null +++ b/recipes/linux/linux-omap3_2.6.37-psp04.01.00.03.bb @@ -0,0 +1,10 @@ +require linux-omap3.inc + +COMPATIBLE_MACHINE = "ti814x" + +KVER = "2.6.37" +PSPREL = "04.01.00.03" + +BRANCH = "ti81xx-master" +# Use literal tags in SRCREV, when available, instead of commit IDs +SRCREV = "v2.6.37_TI814XPSP_04.01.00.03" From e7736fb8cda9f8f5a40fe26a105ee28c78c03024 Mon Sep 17 00:00:00 2001 From: Chase Maupin Date: Wed, 30 Mar 2011 13:08:08 -0500 Subject: [PATCH 248/509] u-boot: Add PSP version for am387x-evm * Add the TI PSP u-boot version for the am387x-evm machine type * Make this version the default preference for ti814x SOC_FAMILY devices. * Based on u-boot recipe from Arago contributed by Nageswari Srinivasan Signed-off-by: Chase Maupin Signed-off-by: Denys Dmytriyenko --- recipes/u-boot/u-boot_2010.06-psp04.01.00.03.bb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 recipes/u-boot/u-boot_2010.06-psp04.01.00.03.bb diff --git a/recipes/u-boot/u-boot_2010.06-psp04.01.00.03.bb b/recipes/u-boot/u-boot_2010.06-psp04.01.00.03.bb new file mode 100644 index 0000000000..d4a2afc26b --- /dev/null +++ b/recipes/u-boot/u-boot_2010.06-psp04.01.00.03.bb @@ -0,0 +1,14 @@ +require u-boot-omap3.inc + +COMPATIBLE_MACHINE = "ti814x" + +DEFAULT_PREFERENCE_ti814x = "1" +BRANCH = "master" + +# Use literal tags in SRCREV, when available, instead of commit IDs +SRCREV = "v2010.06_TI814XPSP_04.01.00.03" + +UVER = "2010.06" +PSPREL = "04.01.00.03" + +PR = "r1" From d996079733a1a93ecb79a0b1baabb52b1e202676 Mon Sep 17 00:00:00 2001 From: Chase Maupin Date: Wed, 30 Mar 2011 13:08:09 -0500 Subject: [PATCH 249/509] sort: Add ti814x machine types * Add support for am387x-evm, dm814x-evm, and c6a814x-evm machine types. Signed-off-by: Chase Maupin Signed-off-by: Denys Dmytriyenko --- contrib/angstrom/sort.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh index b8d702be48..b38be99483 100755 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@ -79,7 +79,7 @@ case "$arch" in "armv6-novfp") machines="htcblackstone htcdiamond htcdream htckaiser htcnike htcpolaris htcraphael htctitan htcvogue" ;; "armv7a") - machines="am3517-evm am3517-crane archos5 archos5it beagleboard bug20 cm-t35 dm37x-evm am37x-evm am389x-evm babbage c6a816x-evm efikamx htcleo igep0020 nokia900 omap3517-evm omap3evm omap3-pandora omap3-touchbook omap4430-sdp omapzoom omapzoom2 omapzoom36x overo palmpre omap4430-panda usrp-embedded usrp-e1xx" ;; + machines="am3517-evm am3517-crane archos5 archos5it beagleboard bug20 cm-t35 dm37x-evm am37x-evm am387x-evm am389x-evm babbage c6a814x-evm c6a816x-evm dm814x-evm efikamx htcleo igep0020 nokia900 omap3517-evm omap3evm omap3-pandora omap3-touchbook omap4430-sdp omapzoom omapzoom2 omapzoom36x overo palmpre omap4430-panda usrp-embedded usrp-e1xx" ;; "armv7a-vfp") machines="ac100" ;; "avr32") From 6e29d1e69902a21484f82f62f415ba37a844cf77 Mon Sep 17 00:00:00 2001 From: Chase Maupin Date: Wed, 30 Mar 2011 13:08:06 -0500 Subject: [PATCH 250/509] ti814x: Add new machine definitions * Add new am387x-evm machine definition * Add new dm814xx-evm machine definition * Add new c6a814x-evm machine definition * New SOC_FAMILY ti814x available * Based on machine configuration files from Arago contributed by Siddharth Heroor Signed-off-by: Chase Maupin Signed-off-by: Denys Dmytriyenko --- conf/machine/am387x-evm.conf | 5 +++++ conf/machine/c6a814x-evm.conf | 5 +++++ conf/machine/dm814x-evm.conf | 5 +++++ conf/machine/include/ti814x.inc | 26 ++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) create mode 100644 conf/machine/am387x-evm.conf create mode 100644 conf/machine/c6a814x-evm.conf create mode 100644 conf/machine/dm814x-evm.conf create mode 100644 conf/machine/include/ti814x.inc diff --git a/conf/machine/am387x-evm.conf b/conf/machine/am387x-evm.conf new file mode 100644 index 0000000000..ebf98890bd --- /dev/null +++ b/conf/machine/am387x-evm.conf @@ -0,0 +1,5 @@ +#@TYPE: Machine +#@NAME: AM389x evm +#@DESCRIPTION: Machine configuration for the AM389x evm + +require conf/machine/include/ti814x.inc diff --git a/conf/machine/c6a814x-evm.conf b/conf/machine/c6a814x-evm.conf new file mode 100644 index 0000000000..b85c4894cd --- /dev/null +++ b/conf/machine/c6a814x-evm.conf @@ -0,0 +1,5 @@ +#@TYPE: Machine +#@NAME: c6a814x evm +#@DESCRIPTION: Machine configuration for the c6a814x evm + +require conf/machine/include/ti814x.inc diff --git a/conf/machine/dm814x-evm.conf b/conf/machine/dm814x-evm.conf new file mode 100644 index 0000000000..140dcc10eb --- /dev/null +++ b/conf/machine/dm814x-evm.conf @@ -0,0 +1,5 @@ +#@TYPE: Machine +#@NAME: DM814x evm +#@DESCRIPTION: Machine configuration for the DM814x evm + +require conf/machine/include/ti814x.inc diff --git a/conf/machine/include/ti814x.inc b/conf/machine/include/ti814x.inc new file mode 100644 index 0000000000..8fa7ee9a49 --- /dev/null +++ b/conf/machine/include/ti814x.inc @@ -0,0 +1,26 @@ +TARGET_ARCH = "arm" +SOC_FAMILY = "ti814x" + +require conf/machine/include/tune-cortexa8.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-omap3" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" + +# Increase this everytime you change something in the kernel +MACHINE_KERNEL_PR = "r1" + +KERNEL_IMAGETYPE = "uImage" + +UBOOT_ARCH = "arm" +UBOOT_MACHINE = "ti8148_evm_config_nand" +UBOOT_ENTRYPOINT = "0x80008000" +UBOOT_LOADADDRESS = "0x80008000" + +# Only build u-boot +EXTRA_IMAGEDEPENDS += "u-boot" + +# Ship all kernel modules +IMAGE_FSTYPES ?= "jffs2 tar.bz2" +EXTRA_IMAGECMD_jffs2 = "-lqn -e 128" +SERIAL_CONSOLE = "115200 ttyO0" +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 ethernet" From 9120563e0a577a9100dbedf9b0427269e08cbc22 Mon Sep 17 00:00:00 2001 From: Chase Maupin Date: Wed, 30 Mar 2011 13:08:10 -0500 Subject: [PATCH 251/509] am-benchmarks: Add support for am387x-evm machine * Add support in this recipe for the am387x-evm machine type. * Bump the PR. Signed-off-by: Chase Maupin Signed-off-by: Denys Dmytriyenko --- recipes/ti/am-benchmarks_1.2.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/ti/am-benchmarks_1.2.bb b/recipes/ti/am-benchmarks_1.2.bb index 5ae0585a9e..38c7056ae5 100644 --- a/recipes/ti/am-benchmarks_1.2.bb +++ b/recipes/ti/am-benchmarks_1.2.bb @@ -8,15 +8,16 @@ LICENSE = "BSD" SECTION = "system" PRIORITY = "optional" -SRCREV = "59" +SRCREV = "60" PR = "r2+svnr${SRCPV}" -COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x)" +COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x|ti814x)" ARCHITECTURE_dm365 = "arm9" ARCHITECTURE_omapl138 = "arm9" ARCHITECTURE_omap3 = "cortex-a8" ARCHITECTURE_ti816x = "cortex-a8" +ARCHITECTURE_ti814x = "cortex-a8" INSANE_SKIP_${PN} = "True" From aa91215b74e316e3be38587e7f5cdb1c3e05c8cd Mon Sep 17 00:00:00 2001 From: Chase Maupin Date: Wed, 30 Mar 2011 13:08:11 -0500 Subject: [PATCH 252/509] matrix-gui: Add support for am387x-evm machine * Add support for the am387x-evm machine type which uses SOC_FAMILY ti814x. * Bump the recipe PRs Signed-off-by: Chase Maupin Signed-off-by: Denys Dmytriyenko --- recipes/ti/matrix-gui-common.inc | 5 +++-- recipes/ti/matrix-gui-e.inc | 5 +++-- recipes/ti/matrix-gui.inc | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/recipes/ti/matrix-gui-common.inc b/recipes/ti/matrix-gui-common.inc index 486cb8df13..0ed72b53fa 100644 --- a/recipes/ti/matrix-gui-common.inc +++ b/recipes/ti/matrix-gui-common.inc @@ -4,9 +4,9 @@ LICENSE = "BSD" SECTION = "multimedia" PRIORITY = "optional" -INC_PR = "r8" +INC_PR = "r9" -COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x)" +COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x|ti814x)" PLATFORM_dm365-evm = "dm365" PLATFORM_dm368-evm = "dm368" @@ -16,6 +16,7 @@ PLATFORM_dm37x-evm = "dm3730" PLATFORM_am37x-evm = "am3715" PLATFORM_beagleboard = "am3715" PLATFORM_ti816x = "ti816x" +PLATFORM_ti814x = "ti814x" PLATFORM_am180x-evm = "am180x" PLATFORM_am181x-evm = "am181x" PLATFORM_am3517-evm = "am3517" diff --git a/recipes/ti/matrix-gui-e.inc b/recipes/ti/matrix-gui-e.inc index e19b5b975f..7158d90315 100644 --- a/recipes/ti/matrix-gui-e.inc +++ b/recipes/ti/matrix-gui-e.inc @@ -4,9 +4,9 @@ LICENSE = "BSD" SECTION = "multimedia" PRIORITY = "optional" -INC_PR = "r22" +INC_PR = "r23" -COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x)" +COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x|ti814x)" PLATFORM_dm365-evm = "dm365" PLATFORM_dm368-evm = "dm368" @@ -16,6 +16,7 @@ PLATFORM_dm37x-evm = "dm3730" PLATFORM_am37x-evm = "am3715" PLATFORM_beagleboard = "am3715" PLATFORM_ti816x = "ti816x" +PLATFORM_ti814x = "ti814x" PLATFORM_am180x-evm = "am180x" PLATFORM_am181x-evm = "am181x" PLATFORM_am3517-evm = "am3517" diff --git a/recipes/ti/matrix-gui.inc b/recipes/ti/matrix-gui.inc index 240e695c95..3dd0e1042f 100644 --- a/recipes/ti/matrix-gui.inc +++ b/recipes/ti/matrix-gui.inc @@ -4,9 +4,9 @@ LICENSE = "BSD" SECTION = "multimedia" PRIORITY = "optional" -INC_PR = "r20" +INC_PR = "r21" -COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x)" +COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x|ti814x)" PLATFORM_dm365-evm = "dm365" PLATFORM_dm368-evm = "dm368" @@ -16,6 +16,7 @@ PLATFORM_dm37x-evm = "dm3730" PLATFORM_am37x-evm = "am3715" PLATFORM_beagleboard = "am3715" PLATFORM_ti816x = "ti816x" +PLATFORM_ti814x = "ti814x" PLATFORM_am180x-evm = "am180x" PLATFORM_am181x-evm = "am181x" PLATFORM_am3517-evm = "am3517" From 1d72a603bbbebf1843d76880896aee189a7b45f1 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 31 Mar 2011 02:32:53 -0400 Subject: [PATCH 253/509] external-toolchain-angstrom: don't stage .la files Libtool .la files bundled with the toolchain contain references to external sysroot and are not really needed for the normal operation. Signed-off-by: Denys Dmytriyenko --- recipes/meta/external-toolchain-angstrom.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/meta/external-toolchain-angstrom.bb b/recipes/meta/external-toolchain-angstrom.bb index 2bab6db39a..720d1f4748 100644 --- a/recipes/meta/external-toolchain-angstrom.bb +++ b/recipes/meta/external-toolchain-angstrom.bb @@ -1,4 +1,4 @@ -PR = "r2" +PR = "r3" INHIBIT_DEFAULT_DEPS = "1" @@ -254,6 +254,8 @@ do_install() { cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${sbindir}/{iconvconfig,rpcinfo,zdump,zic} ${D}${sbindir} cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${includedir}/{arpa,asm*,bits,drm,gnu,linux,mtd,net*,nfs,protocols,rdma,rpc*,scsi,sound,sys*,video,*.h} ${D}${includedir} cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}${libdir}/{?crt1.o,crt?.o,libBrokenLocale*,libanl*,libc.*,libc_*,libcrypt.*,libcidn.*,libdl.*,libg.*,libieee.*,libm.*,libmcheck.*,libnsl*,libnss*,libpthread*,libresolv*,librt*,libstdc*,libthread*,libutil*} ${D}${libdir} + rm -rf ${D}${base_libdir}/*.la + rm -rf ${D}${libdir}/*.la ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-angstrom', '', 'rm -rf ${D}/usr/include/linux', d)} From 38d768d9d350f5f92b6bcceb570a6fa98f1ef991 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Wed, 30 Mar 2011 17:19:55 -0400 Subject: [PATCH 254/509] qt4: security advisory - blacklist fraudulent comodo certificates Security advisory: Blacklist fraudulent certificates. More info is in the patch and at the following links: http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html http://qt.nokia.com/files/qt-patches/blacklist-fraudulent-comodo-certificates-patch.diff/view Signed-off-by: Denys Dmytriyenko Acked-by : Eric Benard Signed-off-by: Denys Dmytriyenko --- ...-fraudulent-comodo-certificates-patch.diff | 134 ++++++++++++++++++ recipes/qt4/qt-4.6.3.inc | 8 +- recipes/qt4/qt-4.7.1.inc | 3 +- recipes/qt4/qt4-embedded_4.6.3.bb | 2 +- recipes/qt4/qt4-embedded_4.7.1.bb | 2 +- 5 files changed, 141 insertions(+), 8 deletions(-) create mode 100644 recipes/qt4/files/blacklist-fraudulent-comodo-certificates-patch.diff diff --git a/recipes/qt4/files/blacklist-fraudulent-comodo-certificates-patch.diff b/recipes/qt4/files/blacklist-fraudulent-comodo-certificates-patch.diff new file mode 100644 index 0000000000..00faf75932 --- /dev/null +++ b/recipes/qt4/files/blacklist-fraudulent-comodo-certificates-patch.diff @@ -0,0 +1,134 @@ +Security advisory: Fraudulent certificates + +Background: + +Recently a group of people managed to get fraudulent SSL certificates signed +by a Certificate Authority (CA). + +These certificates potentially enable their owners to pretend to be other +entities on the Web; the attackers can present valid certificates for e.g. +mail.google.com, login.yahoo.com and login.live.com, among others. + +The patch below solves this problem by blacklisting those fake certificates +and aborting an SSL handshake with entities that present these certificates. +The patch applies to all 4.6 and 4.7 versions, and should be applied to all Qt +4.6.x and 4.7.x versions; upcoming Qt releases will contain a fix for this +problem. + +More technical background: + +In order to trick a user into establishing an SSL connection to a site using +one of those fake certificates, in addition to controlling the certificate, an +attacker would need to either control the DNS server used by the victim, or +have control over a proxy that the victim uses. That way, the attacker could +trick the victim to connect to the attacker?s site and then present the user +with a valid certificate. + +One obvious question now is: Should those certificates not just be revoked, +which would solve the problem? + +First, they have been revoked by the affected Certificate Authority (see above +link). + +However, the problem in this case, and probably part of the reason why most +browser vendors release new versions blacklisting those certificates, is that +by default browsers do not treat invalid responses from an OCSP server (a +server used for checking the revocation status of a certificate) as fatal, and +will allow the SSL connection to proceed anyway. Qt itself does not support +OCSP yet, which makes blacklisting the certificates the only valid option (now +would be a good moment to vote on the task for implementing OCSP in Qt); since +Qt is relying on the system root certificates since version 4.7, it cannot +control the root certificates that Qt trusts automatically anymore. + +http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html +http://qt.nokia.com/files/qt-patches/blacklist-fraudulent-comodo-certificates-patch.diff/view + +diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp +index 618ac79..a5cdf01 100644 +--- a/src/network/ssl/qsslcertificate.cpp ++++ b/src/network/ssl/qsslcertificate.cpp +@@ -219,17 +219,19 @@ bool QSslCertificate::isNull() const + Returns true if this certificate is valid; otherwise returns + false. + +- Note: Currently, this function only checks that the current ++ Note: Currently, this function checks that the current + data-time is within the date-time range during which the +- certificate is considered valid. No other checks are +- currently performed. ++ certificate is considered valid, and checks that the ++ certificate is not in a blacklist of fraudulent certificates. + + \sa isNull() + */ + bool QSslCertificate::isValid() const + { + const QDateTime currentTime = QDateTime::currentDateTime(); +- return currentTime >= d->notValidBefore && currentTime <= d->notValidAfter; ++ return currentTime >= d->notValidBefore && ++ currentTime <= d->notValidAfter && ++ ! QSslCertificatePrivate::isBlacklisted(*this); + } + + /*! +@@ -798,6 +800,30 @@ QList QSslCertificatePrivate::certificatesFromDer(const QByteAr + return certificates; + } + ++// These certificates are known to be fraudulent and were created during the comodo ++// compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html ++static const char *certificate_blacklist[] = { ++ "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", ++ "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06", ++ "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", ++ "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29", ++ "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", ++ "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47", ++ "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", ++ "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0", ++ "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", ++ 0 ++}; ++ ++bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate) ++{ ++ for (int a = 0; certificate_blacklist[a] != 0; a++) { ++ if (certificate.serialNumber() == certificate_blacklist[a]) ++ return true; ++ } ++ return false; ++} ++ + #ifndef QT_NO_DEBUG_STREAM + QDebug operator<<(QDebug debug, const QSslCertificate &certificate) + { +diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h +index cdceb0f..1ce33d3 100644 +--- a/src/network/ssl/qsslcertificate_p.h ++++ b/src/network/ssl/qsslcertificate_p.h +@@ -96,6 +96,7 @@ public: + static QSslCertificate QSslCertificate_from_X509(X509 *x509); + static QList certificatesFromPem(const QByteArray &pem, int count = -1); + static QList certificatesFromDer(const QByteArray &der, int count = -1); ++ static bool isBlacklisted(const QSslCertificate &certificate); + + friend class QSslSocketBackendPrivate; + +diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp +index 0866534..2427193 100644 +--- a/src/network/ssl/qsslsocket_openssl.cpp ++++ b/src/network/ssl/qsslsocket_openssl.cpp +@@ -1193,6 +1193,13 @@ bool QSslSocketBackendPrivate::startHandshake() + X509 *x509 = q_SSL_get_peer_certificate(ssl); + configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509); + q_X509_free(x509); ++ if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) { ++ q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted")); ++ q->setSocketError(QAbstractSocket::SslHandshakeFailedError); ++ emit q->error(QAbstractSocket::SslHandshakeFailedError); ++ plainSocket->disconnectFromHost(); ++ return false; ++ } + + // Start translating errors. + QList errors; diff --git a/recipes/qt4/qt-4.6.3.inc b/recipes/qt4/qt-4.6.3.inc index 5b91116a77..77c5cf69d4 100644 --- a/recipes/qt4/qt-4.6.3.inc +++ b/recipes/qt4/qt-4.6.3.inc @@ -1,11 +1,14 @@ DEFAULT_PREFERENCE = "-1" +LICENSE = "LGPLv2.1 GPLv3" FILESPATHPKG .= ":qt-${PV}" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ + file://blacklist-fraudulent-comodo-certificates-patch.diff \ file://0001-cross-compile.patch \ file://0002-fix-resinit-declaration.patch \ file://0004-no-qmake.patch \ + file://hack-out-pg_config.patch \ file://0006-freetype-host-includes.patch \ file://0008-qt-lib-infix.patch \ file://0009-support-2bpp.patch \ @@ -64,10 +67,5 @@ do_install_append() { fi } -LICENSE = "LGPLv2.1 GPLv3" -SRC_URI += " \ - file://hack-out-pg_config.patch" - SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072" SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768" - diff --git a/recipes/qt4/qt-4.7.1.inc b/recipes/qt4/qt-4.7.1.inc index be7275dbd8..bf3f39edff 100644 --- a/recipes/qt4/qt-4.7.1.inc +++ b/recipes/qt4/qt-4.7.1.inc @@ -5,8 +5,9 @@ FILESPATHPKG =. "qt-${PV}:" SRC_URI = "\ ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ + file://blacklist-fraudulent-comodo-certificates-patch.diff \ file://0004-no-qmake.patch \ - file://hack-out-pg2-4.7.0.patch \ + file://hack-out-pg2-4.7.0.patch \ file://0006-freetype-host-includes.patch \ file://0001-Added-Openembedded-crossarch-option.patch \ file://0010-phonon-gstreamer-rgb-endianess.patch \ diff --git a/recipes/qt4/qt4-embedded_4.6.3.bb b/recipes/qt4/qt4-embedded_4.6.3.bb index 13f3f00edf..fe49fdba8f 100644 --- a/recipes/qt4/qt4-embedded_4.6.3.bb +++ b/recipes/qt4/qt4-embedded_4.6.3.bb @@ -1,6 +1,6 @@ require qt4-embedded.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" QT_CONFIG_FLAGS_append_armv6 = " -no-neon " diff --git a/recipes/qt4/qt4-embedded_4.7.1.bb b/recipes/qt4/qt4-embedded_4.7.1.bb index 1cd43a664b..7e3d4b8325 100644 --- a/recipes/qt4/qt4-embedded_4.7.1.bb +++ b/recipes/qt4/qt4-embedded_4.7.1.bb @@ -2,7 +2,7 @@ DEFAULT_PREFERENCE = "-1" require qt4-embedded.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" QT_CONFIG_FLAGS_append_armv6 = " -no-neon " From 84b1b29998d411f7d10f354cf77ce56602306326 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Wed, 30 Mar 2011 18:07:11 -0400 Subject: [PATCH 255/509] qmake2: Define env var for strip. Convert to use INC_PR. Signed-off-by: Koen Kooi --- recipes/qmake/qmake2.inc | 2 +- recipes/qmake/qmake2_2.10a.bb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/qmake/qmake2.inc b/recipes/qmake/qmake2.inc index f2631b5f7e..97918426c7 100644 --- a/recipes/qmake/qmake2.inc +++ b/recipes/qmake/qmake2.inc @@ -3,7 +3,7 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" LICENSE = "GPL" -PR = "r12" +INC_PR = "r12" # We call 'moc' during the build DEPENDS = "qt4-tools-native" diff --git a/recipes/qmake/qmake2_2.10a.bb b/recipes/qmake/qmake2_2.10a.bb index 77d909f8eb..d8bb528fa4 100644 --- a/recipes/qmake/qmake2_2.10a.bb +++ b/recipes/qmake/qmake2_2.10a.bb @@ -1,5 +1,6 @@ QTVERSION="4.4.3" FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2" +PR = "${INC_PR}.1" BBCLASSEXTEND = "native sdk" @@ -22,6 +23,7 @@ do_install() { echo 'export OE_QMAKE_CC=gcc' >> $script echo 'export OE_QMAKE_CXX=g++' >> $script echo 'export OE_QMAKE_LINK=g++' >> $script + echo 'export OE_QMAKE_STRIP=strip' >> $script echo 'export OE_QMAKE_LIBDIR_QT=${libdir}' >> $script echo 'export OE_QMAKE_INCDIR_QT=${includedir}/qtopia' >> $script echo 'export OE_QMAKE_MOC=${bindir}/moc' >> $script @@ -39,6 +41,7 @@ do_install() { echo 'export OE_QMAKE_CC=gcc' >> $script echo 'export OE_QMAKE_CXX=g++' >> $script echo 'export OE_QMAKE_LINK=g++' >> $script + echo 'export OE_QMAKE_STRIP=strip' >> $script echo 'export OE_QMAKE_LIBDIR_QT=${libdir}' >> $script echo 'export OE_QMAKE_INCDIR_QT=${includedir}/qt4' >> $script echo 'export OE_QMAKE_MOC=${bindir}/moc' >> $script From ac8f1419135a1e84675c14dfac1cd753b21c2555 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 16 Mar 2011 08:43:42 -0700 Subject: [PATCH 256/509] tcl: Rework mips-tclstrtod.patch We can't portably use .. in paths in patches so we stop applying this in do_patch and instead apply it at the start of do_configure. Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/tcltk/tcl-8.5.8/mips-tclstrtod.patch | 4 ++-- recipes/tcltk/tcl_8.5.8.bb | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes/tcltk/tcl-8.5.8/mips-tclstrtod.patch b/recipes/tcltk/tcl-8.5.8/mips-tclstrtod.patch index b846d0fa82..c7ac8cb0b1 100644 --- a/recipes/tcltk/tcl-8.5.8/mips-tclstrtod.patch +++ b/recipes/tcltk/tcl-8.5.8/mips-tclstrtod.patch @@ -1,7 +1,7 @@ http://sourceforge.net/tracker/index.php?func=detail&aid=2902010&group_id=10894&atid=110894 ---- ../generic/tclStrToD.c.orig -+++ ../generic/tclStrToD.c +--- generic/tclStrToD.c.orig ++++ generic/tclStrToD.c @@ -71,9 +71,10 @@ /* diff --git a/recipes/tcltk/tcl_8.5.8.bb b/recipes/tcltk/tcl_8.5.8.bb index e98b98d29d..e088b915a5 100644 --- a/recipes/tcltk/tcl_8.5.8.bb +++ b/recipes/tcltk/tcl_8.5.8.bb @@ -13,7 +13,7 @@ SRC_URI = "\ file://tcllibrary.diff;striplevel=2 \ file://tclpackagepath.diff;striplevel=2 \ file://tclprivate.diff;striplevel=2 \ - file://mips-tclstrtod.patch;striplevel=0 \ + file://mips-tclstrtod.patch;apply=false \ " SRC_URI[md5sum] = "7f123e53b3daaaba2478d3af5a0752e3" SRC_URI[sha256sum] = "6b090c1024038d0381e1ccfbd6d5c0f0e6ef205269ceb9d28bd7bd7ac5bbf4a7" @@ -27,6 +27,7 @@ EXTRA_OECONF = "--enable-threads" do_configure_append() { echo > ../compat/fixstrtod.c + (cd .. ; patch -p0 -i ${WORKDIR}/mips-tclstrtod.patch) } do_compile_prepend_pn-tcl () { From c0305bf4d2c127a182d2dfeac99049f9f0e88df1 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 31 Mar 2011 10:10:05 -0700 Subject: [PATCH 257/509] tcl: Switch to patchdir rather than applying in do_configure Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/tcltk/tcl_8.5.8.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/tcltk/tcl_8.5.8.bb b/recipes/tcltk/tcl_8.5.8.bb index e088b915a5..9bb6859434 100644 --- a/recipes/tcltk/tcl_8.5.8.bb +++ b/recipes/tcltk/tcl_8.5.8.bb @@ -13,7 +13,7 @@ SRC_URI = "\ file://tcllibrary.diff;striplevel=2 \ file://tclpackagepath.diff;striplevel=2 \ file://tclprivate.diff;striplevel=2 \ - file://mips-tclstrtod.patch;apply=false \ + file://mips-tclstrtod.patch;patchdir=..;striplevel=0 \ " SRC_URI[md5sum] = "7f123e53b3daaaba2478d3af5a0752e3" SRC_URI[sha256sum] = "6b090c1024038d0381e1ccfbd6d5c0f0e6ef205269ceb9d28bd7bd7ac5bbf4a7" @@ -27,7 +27,6 @@ EXTRA_OECONF = "--enable-threads" do_configure_append() { echo > ../compat/fixstrtod.c - (cd .. ; patch -p0 -i ${WORKDIR}/mips-tclstrtod.patch) } do_compile_prepend_pn-tcl () { From b31d8ad78bfa3b9ae3c110e6df8c02fe6d8c4f24 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 16 Mar 2011 11:48:17 -0700 Subject: [PATCH 258/509] tk 8.4.19: Rework disable-xim.patch Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/tcltk/files/disable-xim.patch | 4 ++-- recipes/tcltk/tk_8.4.19.bb | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes/tcltk/files/disable-xim.patch b/recipes/tcltk/files/disable-xim.patch index bc11d3bbe9..d88aa7c3b9 100644 --- a/recipes/tcltk/files/disable-xim.patch +++ b/recipes/tcltk/files/disable-xim.patch @@ -3,8 +3,8 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- ../generic/tk.h~disable-xim -+++ ../generic/tk.h +--- generic/tk.h~disable-xim ++++ generic/tk.h @@ -109,9 +109,9 @@ * Decide whether or not to use input methods. */ diff --git a/recipes/tcltk/tk_8.4.19.bb b/recipes/tcltk/tk_8.4.19.bb index 68a89254b1..8d9293ae30 100644 --- a/recipes/tcltk/tk_8.4.19.bb +++ b/recipes/tcltk/tk_8.4.19.bb @@ -3,11 +3,11 @@ LICENSE = "tcl" SECTION = "devel/tcltk" HOMEPAGE = "http://tcl.sourceforge.net" DEPENDS = "tcl virtual/libx11 libxt" -PR = "r0" +PR = "r1" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \ - file://disable-xim.patch;striplevel=0 \ + file://disable-xim.patch;apply=false \ file://tk-add-soname.patch;striplevel=2 \ # file://fix-configure.patch;striplevel=2 \ " @@ -23,6 +23,7 @@ EXTRA_OECONF = "\ " do_configure() { + (cd .. ; patch -p0 -i ${WORKDIR}/disable-xim.patch) gnu-configize oe_runconf } From 590a4429c2e55953ed5a776e41048deca8fde847 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 31 Mar 2011 10:10:12 -0700 Subject: [PATCH 259/509] tk 8.4.19: Switch to patchdir rather than applying in do_configure Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/tcltk/tk_8.4.19.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/tcltk/tk_8.4.19.bb b/recipes/tcltk/tk_8.4.19.bb index 8d9293ae30..3dd492016a 100644 --- a/recipes/tcltk/tk_8.4.19.bb +++ b/recipes/tcltk/tk_8.4.19.bb @@ -7,7 +7,7 @@ PR = "r1" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \ - file://disable-xim.patch;apply=false \ + file://disable-xim.patch;patchdir=..;striplevel=0 \ file://tk-add-soname.patch;striplevel=2 \ # file://fix-configure.patch;striplevel=2 \ " @@ -23,7 +23,6 @@ EXTRA_OECONF = "\ " do_configure() { - (cd .. ; patch -p0 -i ${WORKDIR}/disable-xim.patch) gnu-configize oe_runconf } From ee4df3b8075ea65bd8cc0f9879934ac55daebc9b Mon Sep 17 00:00:00 2001 From: Jason Kridner Date: Fri, 1 Apr 2011 09:46:53 -0500 Subject: [PATCH 260/509] u-boot: BeagleBoard: add rev xM-C detection Signed-off-by: Jason Kridner Signed-off-by: Koen Kooi Signed-off-by: Denys Dmytriyenko --- ...BeagleBoard-add-xM-rev-C-to-ID-table.patch | 68 +++++++++++++++++++ recipes/u-boot/u-boot_git.bb | 3 +- 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0017-BeagleBoard-add-xM-rev-C-to-ID-table.patch diff --git a/recipes/u-boot/u-boot-git/beagleboard/0017-BeagleBoard-add-xM-rev-C-to-ID-table.patch b/recipes/u-boot/u-boot-git/beagleboard/0017-BeagleBoard-add-xM-rev-C-to-ID-table.patch new file mode 100644 index 0000000000..1125c88193 --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0017-BeagleBoard-add-xM-rev-C-to-ID-table.patch @@ -0,0 +1,68 @@ +From fd6e8e5ca04fea310ff4f03faa7747d061217cba Mon Sep 17 00:00:00 2001 +From: Jason Kridner +Date: Wed, 30 Mar 2011 10:44:17 -0500 +Subject: [PATCH] BeagleBoard: add xM rev C to ID table +Cc: Sandeep Paulraj + +A simple addition to the revision IDs. + +This patch depends upon http://patchwork.ozlabs.org/patch/85303/. + +Signed-off-by: Jason Kridner +--- + board/ti/beagle/beagle.c | 12 ++++++++++++ + board/ti/beagle/beagle.h | 1 + + 2 files changed, 13 insertions(+), 0 deletions(-) + +diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c +index 905b151..0596443 100644 +--- a/board/ti/beagle/beagle.c ++++ b/board/ti/beagle/beagle.c +@@ -168,6 +168,7 @@ void display_init(void) + break; + case REVISION_XM_A: + case REVISION_XM_B: ++ case REVISION_XM_C: + default: + omap3_dss_panel_config(&dvid_cfg_xm); + break; +@@ -227,6 +228,16 @@ int misc_init_r(void) + TWL4030_PM_RECEIVER_VAUX2_DEV_GRP, + TWL4030_PM_RECEIVER_DEV_GRP_P1); + break; ++ case REVISION_XM_C: ++ printf("Beagle xM Rev C\n"); ++ setenv("beaglerev", "xMC"); ++ MUX_BEAGLE_XM(); ++ /* Set VAUX2 to 1.8V for EHCI PHY */ ++ twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED, ++ TWL4030_PM_RECEIVER_VAUX2_VSEL_18, ++ TWL4030_PM_RECEIVER_VAUX2_DEV_GRP, ++ TWL4030_PM_RECEIVER_DEV_GRP_P1); ++ break; + default: + printf("Beagle unknown 0x%02x\n", get_board_revision()); + MUX_BEAGLE_XM(); +@@ -372,6 +383,7 @@ int do_userbutton (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) + break; + case REVISION_XM_A: + case REVISION_XM_B: ++ case REVISION_XM_C: + default: + gpio = 4; + break; +diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h +index bdf2a6f..f31ce31 100644 +--- a/board/ti/beagle/beagle.h ++++ b/board/ti/beagle/beagle.h +@@ -41,6 +41,7 @@ const omap3_sysinfo sysinfo = { + #define REVISION_C4 0x5 + #define REVISION_XM_A 0x0 + #define REVISION_XM_B 0x1 ++#define REVISION_XM_C 0x2 + + /* + * IEN - Input Enable +-- +1.5.6.4 + diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index ad6f73e50f..61a75eab06 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -1,5 +1,5 @@ require u-boot.inc -PR = "r74" +PR = "r75" FILESPATHPKG =. "u-boot-git:" @@ -41,6 +41,7 @@ SRC_URI_beagleboard = "git://www.denx.de/git/u-boot.git;protocol=git \ file://0013-OMAP3-BeagleBoard-updated-default-configuration.patch \ file://0014-Corrected-LED-name-match-finding-avoiding-extraneous.patch \ file://0016-BeagleBoard-Load-kernel-via-MMC-ext2-not-fat.patch \ + file://0017-BeagleBoard-add-xM-rev-C-to-ID-table.patch \ file://fw_env.config \ " SRCREV_beagleboard = "c7977858dcf1f656cbe91ea0dc3cb9139c6a8cc8" From 2e04457d2c9b76150f6f0ca0318fc644927cbe5a Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Wed, 30 Mar 2011 13:12:39 +0530 Subject: [PATCH 261/509] TI EDMA3LLD Sysbios: Move installer unpack to recipe version * The EDMA3LLD for Sysbios, does not ship as an installer but as a tarball. The older release 02.10.03.04 used an installer and this patch is in preparation of upcoming patches for new releases of EDMA3LLD. Signed-off-by: Siddharth Heroor Signed-off-by: Denys Dmytriyenko --- recipes/ti/ti-edma3lld-sysbios.inc | 6 ------ recipes/ti/ti-edma3lld-sysbios_02.10.03.04.bb | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/recipes/ti/ti-edma3lld-sysbios.inc b/recipes/ti/ti-edma3lld-sysbios.inc index fb17978b1a..c91f4c21c3 100644 --- a/recipes/ti/ti-edma3lld-sysbios.inc +++ b/recipes/ti/ti-edma3lld-sysbios.inc @@ -5,17 +5,11 @@ LICENSE = "TI" require ti-paths.inc require ti-staging.inc -require ti-eula-unpack.inc PR = "r1" S = "${WORKDIR}/edma3_lld_${PV}" -SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_tii/psp/edma3_lld/edma3-lld-bios6/${PV}/exports/EDMA3_LLD_setuplinux_${PV}.bin;name=edma3lldsysbiosbin" - -BINFILE="EDMA3_LLD_setuplinux_${PV}.bin" -TI_BIN_UNPK_CMDS="Y:workdir" - do_install() { install -d ${D}${EDMA3_LLD_SYSBIOS_INSTALL_DIR_RECIPE} cp -pPrf ${S}/* ${D}${EDMA3_LLD_SYSBIOS_INSTALL_DIR_RECIPE} diff --git a/recipes/ti/ti-edma3lld-sysbios_02.10.03.04.bb b/recipes/ti/ti-edma3lld-sysbios_02.10.03.04.bb index 0bfacf67db..51cd6fe908 100644 --- a/recipes/ti/ti-edma3lld-sysbios_02.10.03.04.bb +++ b/recipes/ti/ti-edma3lld-sysbios_02.10.03.04.bb @@ -1,7 +1,12 @@ require ti-edma3lld-sysbios.inc +require ti-eula-unpack.inc PV = "02_10_03_04" +SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_tii/psp/edma3_lld/edma3-lld-bios6/${PV}/exports/EDMA3_LLD_setuplinux_${PV}.bin;name=edma3lldsysbiosbin" + SRC_URI[edma3lldsysbiosbin.md5sum] = "9c1d9b8ee600f234ad635d3866b9f850" SRC_URI[edma3lldsysbiosbin.sha256sum] = "7becc0bf7f2c8126f4bc1fcde8daf50db22a55f7d13abc733db96380f10e910f" +BINFILE="EDMA3_LLD_setuplinux_${PV}.bin" +TI_BIN_UNPK_CMDS="Y:workdir" From 45a6a0961b9f6a3e5ba2e1f41bb6670813b7bfcd Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Wed, 30 Mar 2011 13:12:40 +0530 Subject: [PATCH 262/509] TI EDMA3LLD Sysbios: Update recipe for SRC_URI * Add SRC_URI for tar.gz releases. * Bump PR. Signed-off-by: Siddharth Heroor Signed-off-by: Denys Dmytriyenko --- recipes/ti/ti-edma3lld-sysbios.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/ti/ti-edma3lld-sysbios.inc b/recipes/ti/ti-edma3lld-sysbios.inc index c91f4c21c3..3e51c5cb35 100644 --- a/recipes/ti/ti-edma3lld-sysbios.inc +++ b/recipes/ti/ti-edma3lld-sysbios.inc @@ -6,10 +6,12 @@ LICENSE = "TI" require ti-paths.inc require ti-staging.inc -PR = "r1" +PR = "r2" S = "${WORKDIR}/edma3_lld_${PV}" +SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_tii/psp/edma3_lld/edma3-lld-bios6/${PV}/exports/edma3_lld_${PV}.tar.gz" + do_install() { install -d ${D}${EDMA3_LLD_SYSBIOS_INSTALL_DIR_RECIPE} cp -pPrf ${S}/* ${D}${EDMA3_LLD_SYSBIOS_INSTALL_DIR_RECIPE} From c9cdd119f7e8364c55e1b3217896d82c98c71616 Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Wed, 30 Mar 2011 13:12:41 +0530 Subject: [PATCH 263/509] TI EDMA3LLD Sysbios: Add version 02.11.01.02 Signed-off-by: Siddharth Heroor Signed-off-by: Denys Dmytriyenko --- recipes/ti/ti-edma3lld-sysbios_02.11.01.02.bb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 recipes/ti/ti-edma3lld-sysbios_02.11.01.02.bb diff --git a/recipes/ti/ti-edma3lld-sysbios_02.11.01.02.bb b/recipes/ti/ti-edma3lld-sysbios_02.11.01.02.bb new file mode 100644 index 0000000000..264dfb388d --- /dev/null +++ b/recipes/ti/ti-edma3lld-sysbios_02.11.01.02.bb @@ -0,0 +1,6 @@ +require ti-edma3lld-sysbios.inc + +PV = "02_11_01_02" + +SRC_URI[md5sum] = "270c15dc5f0a5761adb1ff45ab1adb99" +SRC_URI[sha256sum] = "bd76114114a099eba15bdce8e3815a8cd2c01d819ebfc630f6abdd39da36b525" From 665407ecf2621053ab8e380531c6819e05627577 Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Fri, 1 Apr 2011 11:16:15 +0530 Subject: [PATCH 264/509] ti-cgt6x: Add release 7.2.2 Signed-off-by: Siddharth Heroor Signed-off-by: Denys Dmytriyenko --- recipes/ti/ti-cgt6x_7.2.2.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 recipes/ti/ti-cgt6x_7.2.2.bb diff --git a/recipes/ti/ti-cgt6x_7.2.2.bb b/recipes/ti/ti-cgt6x_7.2.2.bb new file mode 100644 index 0000000000..e4c0e8e61a --- /dev/null +++ b/recipes/ti/ti-cgt6x_7.2.2.bb @@ -0,0 +1,8 @@ +require ti-cgt6x.inc + +PE = "1" +PV = "7_2_2" +PVwithdots = "7.2.2" + +SRC_URI[cgt6xbin.md5sum] = "8cbe25f3edbc897ba4a535a416df19bc" +SRC_URI[cgt6xbin.sha256sum] = "7a938083850d05430a9bab4a18c14a7a0ac2ea08e94c652cf1644bb9560ca22e" From 6f18edbfa0925aac24ad4486d649d81a9724a0be Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 5 Apr 2011 10:32:06 +0200 Subject: [PATCH 265/509] networkmanager git: bump to 0.8.3.999 Signed-off-by: Koen Kooi --- recipes/networkmanager/networkmanager_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/networkmanager/networkmanager_git.bb b/recipes/networkmanager/networkmanager_git.bb index c6bfab2913..81a2ad585b 100644 --- a/recipes/networkmanager/networkmanager_git.bb +++ b/recipes/networkmanager/networkmanager_git.bb @@ -4,9 +4,9 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" DEFAULT_PREFERENCE_shr = "1" -SRCREV = "9b61ec7c58e8106c28d01b33ad0b263aefb1f347" -PV = "0.8.2+git" -PR_append = ".gitr${SRCREV}" +SRCREV = "0.8.3.999" +PV = "0.8.3.999" +#PR_append = ".gitr${SRCREV}" inherit gnome From 606b32a7111492c0398ea40e6aadb78902210f24 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 5 Apr 2011 11:15:00 +0200 Subject: [PATCH 266/509] network-manager-applet git: move to 0.8.3.999 Signed-off-by: Koen Kooi --- .../network-manager-applet_git.bb | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/recipes/networkmanager/network-manager-applet_git.bb b/recipes/networkmanager/network-manager-applet_git.bb index f0bf13687a..8493f6d66c 100644 --- a/recipes/networkmanager/network-manager-applet_git.bb +++ b/recipes/networkmanager/network-manager-applet_git.bb @@ -2,27 +2,39 @@ DESCRIPTION = "GTK+ applet for NetworkManager" LICENSE = "GPL" DEPENDS = "libnotify networkmanager dbus-glib libglade gconf gnome-keyring" RDEPENDS_${PN} = "networkmanager" -PR = "r1" DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_angstrom = "1" -SRCREV = "447befc06fcfcb13322deb66bcdc9067bda0915b" -PV = "0.7.999+git" -PR_append = ".gitr${SRCREV}" +SRCREV = "0.8.3.999" +PV = "0.8.3.999" +#PR_append = ".gitr${SRCREV}" inherit gnome -SRC_URI = "git://git.gnome.org/network-manager-applet;protocol=git;branch=NETWORKMANAGER_APPLET_0_7 \ -file://nm-applet.conf" +SRC_URI = "git://git.gnome.org/network-manager-applet;protocol=git;branch=NMA_0_8 \ + file://nm-applet.conf" S = "${WORKDIR}/git" +do_configure_append() { + rm config.log + # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror + for i in $(find ${S} -name "Makefile") ; do + sed -i -e s:-Werror::g $i + done +} + # Hack around dbus a_console problems do_install_append() { - install -m 0644 ${WORKDIR}/nm-applet.conf ${D}${sysconfdir}/dbus-1/system.d/ + install -m 0644 ${WORKDIR}/nm-applet.conf ${D}${sysconfdir}/dbus-1/system.d/ } FILES_${PN} += "${datadir}/nm-applet/ \ ${datadir}/gnome-vpn-properties/ \ ${datadir}/gnome/autostart/ \ " + +FILES_${PN} += "${libdir}/gnome-bluetooth/plugins/*.so" +FILES_${PN}-dbg += "${libdir}/gnome-bluetooth/plugins/.debug/" + From 214360c5c422bea042d3d038cf97467d11a12b57 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 5 Apr 2011 10:59:37 +0200 Subject: [PATCH 267/509] angstrom: remove networkmanager pinnings Signed-off-by: Koen Kooi --- conf/distro/include/angstrom-2010-preferred-versions.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf/distro/include/angstrom-2010-preferred-versions.inc b/conf/distro/include/angstrom-2010-preferred-versions.inc index 7a19f2d35b..beb62dc849 100644 --- a/conf/distro/include/angstrom-2010-preferred-versions.inc +++ b/conf/distro/include/angstrom-2010-preferred-versions.inc @@ -42,9 +42,6 @@ PREFERRED_VERSION_mythplugins = "0.23" PREFERRED_VERSION_myththemes = "0.23" PREFERRED_VERSION_mythtv = "0.23" PREFERRED_VERSION_mplayer = "0.0+1.0rc3+svnr%" -PREFERRED_VERSION_network-manager-applet = "0.8.1" -PREFERRED_VERSION_networkmanager = "0.8.1" -PREFERRED_VERSION_networkmanager-openvpn = "0.8.1" PREFERRED_VERSION_openssl = "1.0.0d" PREFERRED_VERSION_openssl-native = "1.0.0d" PREFERRED_VERSION_pango = "1.28.3" From e66c23dbe4f995237e68720de77ba0bf957e29ab Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 5 Apr 2011 11:20:16 +0200 Subject: [PATCH 268/509] angstrom 2011.03: remove networkmanager pinnings Signed-off-by: Koen Kooi --- conf/distro/include/angstrom-2008-preferred-versions.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index feaa2a7518..b5b524a812 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -37,8 +37,6 @@ PREFERRED_VERSION_mythplugins = "0.23" PREFERRED_VERSION_myththemes = "0.23" PREFERRED_VERSION_mythtv = "0.23" PREFERRED_VERSION_mplayer = "0.0+1.0rc3+svnr%" -PREFERRED_VERSION_network-manager-applet = "0.8.1" -PREFERRED_VERSION_networkmanager = "0.8.1" PREFERRED_VERSION_openssl = "1.0.0d" PREFERRED_VERSION_openssl-native = "1.0.0d" PREFERRED_VERSION_pango = "1.24.4" From 70cd24091def5015e139911ee866fd7bde7ea1a5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 5 Apr 2011 13:00:12 +0200 Subject: [PATCH 269/509] pixman: add 0.21.6 + fixes Signed-off-by: Koen Kooi Acked-by: Martin Jansa --- .../0002-Fix-compilation-on-Win32.patch | 42 ++ ...Fix-tests-for-compilation-on-Windows.patch | 232 +++++++++ .../0004-test-Add-Makefile-for-Win32.patch | 92 ++++ .../0005-Do-not-include-unused-headers.patch | 40 ++ .../0006-test-Silence-MSVC-warnings.patch | 63 +++ ...te-for-fast-single-pass-bilinear-sca.patch | 466 ++++++++++++++++++ ...ctness-of-bilinear_pad_repeat_get_sc.patch | 136 +++++ ...on-for-bilinear-scaled-src_8888_8888.patch | 156 ++++++ ...ation-for-bilinear-scaled-src_8888_8.patch | 288 +++++++++++ ...dian_swap-use-pixman_image_get_forma.patch | 156 ++++++ ...wapping-of-the-source-and-destinatio.patch | 36 ++ ...etch-in-nearest-scaled-src_0565_0565.patch | 77 +++ ...macro-for-nearest-scaling-fast-paths.patch | 131 +++++ ...timized-nearest-scaled-src_8888_8888.patch | 60 +++ ...-fast-path-template-macro-in-pixman-.patch | 130 +++++ ...macro-template-for-bilinear-scanline.patch | 271 ++++++++++ ...acro-template-for-bilinear-scaled-sr.patch | 226 +++++++++ ...ation-for-bilinear-scaled-src_8888_0.patch | 51 ++ ...ation-for-bilinear-scaled-src_0565_x.patch | 50 ++ ...ation-for-bilinear-scaled-src_0565_0.patch | 49 ++ ...-NEON-bilinear-scaling-for-r5g6b5-so.patch | 166 +++++++ ...-dest-_iter_init-call-delegate-direc.patch | 54 ++ ...f-iters-in-_pixman_implementation_-s.patch | 111 +++++ ...-prototype-for-iterator-initializers.patch | 442 +++++++++++++++++ ...ome-tests-if-PIXMAN_RANDOMIZE_TESTS-.patch | 187 +++++++ ...rt-for-the-r8g8b8a8-and-r8g8b8x8-for.patch | 206 ++++++++ ...the-r8g8b8a8-and-r8g8b8x8-formats-to.patch | 110 +++++ ...-test-Fix-infinite-loop-in-composite.patch | 37 ++ ...zontal-weights-update-in-NEON-biline.patch | 82 +++ ...memory-writes-in-NEON-bilinear-scali.patch | 124 +++++ ...software-pipelining-in-bilinear-macr.patch | 70 +++ ...-instructions-in-NEON-bilinear-scali.patch | 168 +++++++ ...erent-levels-of-loop-unrolling-in-bi.patch | 156 ++++++ ...ON-implementation-of-bilinear-scaled.patch | 166 +++++++ ...ON-implementation-of-bilinear-scaled.patch | 283 +++++++++++ ...entation-of-pixman_blt-with-overlapp.patch | 114 +++++ ...erlapping-src-dst-for-pixman_blt_mmx.patch | 91 ++++ ...rlapping-src-dst-for-pixman_blt_sse2.patch | 91 ++++ ...rlapping-src-dst-for-pixman_blt_neon.patch | 94 ++++ recipes/xorg-lib/pixman_0.21.6.bb | 53 ++ 40 files changed, 5557 insertions(+) create mode 100644 recipes/xorg-lib/pixman-0.21.6/0002-Fix-compilation-on-Win32.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0003-test-Fix-tests-for-compilation-on-Windows.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0004-test-Add-Makefile-for-Win32.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0005-Do-not-include-unused-headers.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0006-test-Silence-MSVC-warnings.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0007-Main-loop-template-for-fast-single-pass-bilinear-sca.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0008-test-check-correctness-of-bilinear_pad_repeat_get_sc.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0009-SSE2-optimization-for-bilinear-scaled-src_8888_8888.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0010-ARM-NEON-optimization-for-bilinear-scaled-src_8888_8.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0011-test-In-image_endian_swap-use-pixman_image_get_forma.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0012-test-Do-endian-swapping-of-the-source-and-destinatio.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0013-ARM-use-prefetch-in-nearest-scaled-src_0565_0565.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0014-ARM-common-macro-for-nearest-scaling-fast-paths.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0015-ARM-assembly-optimized-nearest-scaled-src_8888_8888.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0016-ARM-new-bilinear-fast-path-template-macro-in-pixman-.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0017-ARM-NEON-common-macro-template-for-bilinear-scanline.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0018-ARM-use-common-macro-template-for-bilinear-scaled-sr.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0019-ARM-NEON-optimization-for-bilinear-scaled-src_8888_0.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0020-ARM-NEON-optimization-for-bilinear-scaled-src_0565_x.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0021-ARM-NEON-optimization-for-bilinear-scaled-src_0565_0.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0022-ARM-a-bit-faster-NEON-bilinear-scaling-for-r5g6b5-so.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0023-In-delegate_-src-dest-_iter_init-call-delegate-direc.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0024-Fill-out-parts-of-iters-in-_pixman_implementation_-s.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0025-Simplify-the-prototype-for-iterator-initializers.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0026-test-Randomize-some-tests-if-PIXMAN_RANDOMIZE_TESTS-.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0027-Add-simple-support-for-the-r8g8b8a8-and-r8g8b8x8-for.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0028-Add-support-for-the-r8g8b8a8-and-r8g8b8x8-formats-to.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0029-test-Fix-infinite-loop-in-composite.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0030-ARM-tweaked-horizontal-weights-update-in-NEON-biline.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0031-ARM-use-aligned-memory-writes-in-NEON-bilinear-scali.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0032-ARM-support-for-software-pipelining-in-bilinear-macr.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0033-ARM-use-less-ARM-instructions-in-NEON-bilinear-scali.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0034-ARM-support-different-levels-of-loop-unrolling-in-bi.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0035-ARM-pipelined-NEON-implementation-of-bilinear-scaled.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0036-ARM-pipelined-NEON-implementation-of-bilinear-scaled.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0037-Generic-C-implementation-of-pixman_blt-with-overlapp.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0038-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0039-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch create mode 100644 recipes/xorg-lib/pixman-0.21.6/0040-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch create mode 100644 recipes/xorg-lib/pixman_0.21.6.bb diff --git a/recipes/xorg-lib/pixman-0.21.6/0002-Fix-compilation-on-Win32.patch b/recipes/xorg-lib/pixman-0.21.6/0002-Fix-compilation-on-Win32.patch new file mode 100644 index 0000000000..16b6ff13f9 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0002-Fix-compilation-on-Win32.patch @@ -0,0 +1,42 @@ +From 20ed723a5a42fb8636bc9a5f32974dec1b66a785 Mon Sep 17 00:00:00 2001 +From: Andrea Canciani +Date: Thu, 24 Feb 2011 10:44:04 +0100 +Subject: [PATCH 02/40] Fix compilation on Win32 + +Makefile.win32 contained a typo and was missing the dependency from +the built sources. +--- + pixman/Makefile.win32 | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/pixman/Makefile.win32 b/pixman/Makefile.win32 +index 775fb5e..b5f9397 100644 +--- a/pixman/Makefile.win32 ++++ b/pixman/Makefile.win32 +@@ -56,6 +56,8 @@ SOURCES = \ + pixman-general.c \ + $(NULL) + ++BUILT_SOURCES = pixman-combine32.h pixman-combine32.c pixman-combine64.h pixman-combine64.c ++ + # MMX compilation flags + ifeq ($(MMX_VAR),on) + CFLAGS += $(MMX_CFLAGS) +@@ -122,7 +124,7 @@ endif + endif + + # pixman compilation and linking +-$(CFG_VAR)/%.obj: %.c ++$(CFG_VAR)/%.obj: %.c $(BUILT_SOURCES) + @mkdir -p $(CFG_VAR) + @$(CC) -c $(CFLAGS) -Fo"$@" $< + +@@ -141,4 +143,4 @@ pixman-combine64.h: pixman-combine.h.template make-combine.pl + + clean_r: + @rm -f $(CFG_VAR)/*.obj $(CFG_VAR)/*.lib $(CFG_VAR)/*.pdb $(CFG)/*.ilk || exit 0 +- @rm -f $(CFG)/*.obj $(CFG)/*.lib $(CFG)/*.pdb $(CFG)/*.ilk pixman-combine32.c pixman-combine64.c pixman-combine64.c pixman-combine64.h || exit 0 ++ @rm -f $(CFG)/*.obj $(CFG)/*.lib $(CFG)/*.pdb $(CFG)/*.ilk $(BUILT_SOURCES) || exit 0 +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0003-test-Fix-tests-for-compilation-on-Windows.patch b/recipes/xorg-lib/pixman-0.21.6/0003-test-Fix-tests-for-compilation-on-Windows.patch new file mode 100644 index 0000000000..33351a991c --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0003-test-Fix-tests-for-compilation-on-Windows.patch @@ -0,0 +1,232 @@ +From 11305b4ecdd36a17592c5c75de9157874853ab20 Mon Sep 17 00:00:00 2001 +From: Andrea Canciani +Date: Tue, 22 Feb 2011 21:46:37 +0100 +Subject: [PATCH 03/40] test: Fix tests for compilation on Windows + +The Microsoft C compiler cannot handle subobject initialization and +Win32 does not provide snprintf. + +Work around these limitations by using normal struct initialization +and using sprintf (a manual check shows that the buffer size is +sufficient). +--- + test/composite.c | 29 +++++++++++++-------------- + test/fetch-test.c | 52 ++++++++++++++++++++++---------------------------- + test/trap-crasher.c | 20 +++++++++--------- + 3 files changed, 47 insertions(+), 54 deletions(-) + +diff --git a/test/composite.c b/test/composite.c +index e14f954..08c6689 100644 +--- a/test/composite.c ++++ b/test/composite.c +@@ -617,18 +617,18 @@ eval_diff (color_t *expected, color_t *test, pixman_format_code_t format) + } + + static char * +-describe_image (image_t *info, char *buf, int buflen) ++describe_image (image_t *info, char *buf) + { + if (info->size) + { +- snprintf (buf, buflen, "%s %dx%d%s", +- info->format->name, +- info->size, info->size, +- info->repeat ? "R" :""); ++ sprintf (buf, "%s %dx%d%s", ++ info->format->name, ++ info->size, info->size, ++ info->repeat ? "R" :""); + } + else + { +- snprintf (buf, buflen, "solid"); ++ sprintf (buf, "solid"); + } + + return buf; +@@ -710,10 +710,9 @@ composite_test (image_t *dst, + { + char buf[40]; + +- snprintf (buf, sizeof (buf), +- "%s %scomposite", +- op->name, +- component_alpha ? "CA " : ""); ++ sprintf (buf, "%s %scomposite", ++ op->name, ++ component_alpha ? "CA " : ""); + + printf ("%s test error of %.4f --\n" + " R G B A\n" +@@ -735,9 +734,9 @@ composite_test (image_t *dst, + mask->color->b, mask->color->a, + dst->color->r, dst->color->g, + dst->color->b, dst->color->a); +- printf ("src: %s, ", describe_image (src, buf, sizeof (buf))); +- printf ("mask: %s, ", describe_image (mask, buf, sizeof (buf))); +- printf ("dst: %s\n\n", describe_image (dst, buf, sizeof (buf))); ++ printf ("src: %s, ", describe_image (src, buf)); ++ printf ("mask: %s, ", describe_image (mask, buf)); ++ printf ("dst: %s\n\n", describe_image (dst, buf)); + } + else + { +@@ -747,8 +746,8 @@ composite_test (image_t *dst, + src->color->b, src->color->a, + dst->color->r, dst->color->g, + dst->color->b, dst->color->a); +- printf ("src: %s, ", describe_image (src, buf, sizeof (buf))); +- printf ("dst: %s\n\n", describe_image (dst, buf, sizeof (buf))); ++ printf ("src: %s, ", describe_image (src, buf)); ++ printf ("dst: %s\n\n", describe_image (dst, buf)); + } + + success = FALSE; +diff --git a/test/fetch-test.c b/test/fetch-test.c +index 2ca16dd..314a072 100644 +--- a/test/fetch-test.c ++++ b/test/fetch-test.c +@@ -8,7 +8,7 @@ + + static pixman_indexed_t mono_palette = + { +- .rgba = { 0x00000000, 0x00ffffff }, ++ 0, { 0x00000000, 0x00ffffff }, + }; + + +@@ -24,57 +24,53 @@ typedef struct { + static testcase_t testcases[] = + { + { +- .format = PIXMAN_a8r8g8b8, +- .width = 2, .height = 2, +- .stride = 8, +- .src = { 0x00112233, 0x44556677, +- 0x8899aabb, 0xccddeeff }, +- .dst = { 0x00112233, 0x44556677, +- 0x8899aabb, 0xccddeeff }, +- .indexed = NULL, ++ PIXMAN_a8r8g8b8, ++ 2, 2, ++ 8, ++ { 0x00112233, 0x44556677, ++ 0x8899aabb, 0xccddeeff }, ++ { 0x00112233, 0x44556677, ++ 0x8899aabb, 0xccddeeff }, ++ NULL, + }, + { +- .format = PIXMAN_g1, +- .width = 8, .height = 2, +- .stride = 4, ++ PIXMAN_g1, ++ 8, 2, ++ 4, + #ifdef WORDS_BIGENDIAN +- .src = + { + 0xaa000000, + 0x55000000 + }, + #else +- .src = + { + 0x00000055, + 0x000000aa + }, + #endif +- .dst = + { + 0x00ffffff, 0x00000000, 0x00ffffff, 0x00000000, 0x00ffffff, 0x00000000, 0x00ffffff, 0x00000000, + 0x00000000, 0x00ffffff, 0x00000000, 0x00ffffff, 0x00000000, 0x00ffffff, 0x00000000, 0x00ffffff + }, +- .indexed = &mono_palette, ++ &mono_palette, + }, + #if 0 + { +- .format = PIXMAN_g8, +- .width = 4, .height = 2, +- .stride = 4, +- .src = { 0x01234567, +- 0x89abcdef }, +- .dst = { 0x00010101, 0x00232323, 0x00454545, 0x00676767, +- 0x00898989, 0x00ababab, 0x00cdcdcd, 0x00efefef, }, ++ PIXMAN_g8, ++ 4, 2, ++ 4, ++ { 0x01234567, ++ 0x89abcdef }, ++ { 0x00010101, 0x00232323, 0x00454545, 0x00676767, ++ 0x00898989, 0x00ababab, 0x00cdcdcd, 0x00efefef, }, + }, + #endif + /* FIXME: make this work on big endian */ + { +- .format = PIXMAN_yv12, +- .width = 8, .height = 2, +- .stride = 8, ++ PIXMAN_yv12, ++ 8, 2, ++ 8, + #ifdef WORDS_BIGENDIAN +- .src = + { + 0x00ff00ff, 0x00ff00ff, + 0xff00ff00, 0xff00ff00, +@@ -82,7 +78,6 @@ static testcase_t testcases[] = + 0x800080ff + }, + #else +- .src = + { + 0xff00ff00, 0xff00ff00, + 0x00ff00ff, 0x00ff00ff, +@@ -90,7 +85,6 @@ static testcase_t testcases[] = + 0xff800080 + }, + #endif +- .dst = + { + 0xff000000, 0xffffffff, 0xffb80000, 0xffffe113, + 0xff000000, 0xffffffff, 0xff0023ee, 0xff4affff, +diff --git a/test/trap-crasher.c b/test/trap-crasher.c +index 42b82f6..7485e62 100644 +--- a/test/trap-crasher.c ++++ b/test/trap-crasher.c +@@ -7,21 +7,21 @@ main() + pixman_image_t *dst; + pixman_trapezoid_t traps[1] = { + { +- .top = 2147483646, +- .bottom = 2147483647, +- .left = { +- .p1 = { .x = 0, .y = 0 }, +- .p2 = { .x = 0, .y = 2147483647 } ++ 2147483646, ++ 2147483647, ++ { ++ { 0, 0 }, ++ { 0, 2147483647 } + }, +- .right = { +- .p1 = { .x = 65536, .y = 0 }, +- .p2 = { .x = 0, .y = 2147483647 } ++ { ++ { 65536, 0 }, ++ { 0, 2147483647 } + } + }, + }; +- ++ + dst = pixman_image_create_bits (PIXMAN_a8, 1, 1, NULL, -1); +- ++ + pixman_add_trapezoids (dst, 0, 0, sizeof (traps)/sizeof (traps[0]), traps); + return (0); + } +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0004-test-Add-Makefile-for-Win32.patch b/recipes/xorg-lib/pixman-0.21.6/0004-test-Add-Makefile-for-Win32.patch new file mode 100644 index 0000000000..94ed0b4308 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0004-test-Add-Makefile-for-Win32.patch @@ -0,0 +1,92 @@ +From 72f5e5f608506c18c484bc5bc3e58bd83aeb7691 Mon Sep 17 00:00:00 2001 +From: Andrea Canciani +Date: Tue, 22 Feb 2011 22:04:49 +0100 +Subject: [PATCH 04/40] test: Add Makefile for Win32 + +--- + test/Makefile.win32 | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 73 insertions(+), 0 deletions(-) + create mode 100644 test/Makefile.win32 + +diff --git a/test/Makefile.win32 b/test/Makefile.win32 +new file mode 100644 +index 0000000..c71afe1 +--- /dev/null ++++ b/test/Makefile.win32 +@@ -0,0 +1,73 @@ ++CC = cl ++LINK = link ++ ++CFG_VAR = $(CFG) ++ifeq ($(CFG_VAR),) ++CFG_VAR=release ++endif ++ ++CFLAGS = -MD -nologo -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_BIND_TO_CURRENT_VCLIBS_VERSION -D_MT -I../pixman -I. -I../ ++TEST_LDADD = ../pixman/$(CFG_VAR)/pixman-1.lib ++INCLUDES = -I../pixman -I$(top_builddir)/pixman ++ ++# optimization flags ++ifeq ($(CFG_VAR),debug) ++CFLAGS += -Od -Zi ++else ++CFLAGS += -O2 ++endif ++ ++SOURCES = \ ++ a1-trap-test.c \ ++ pdf-op-test.c \ ++ region-test.c \ ++ region-translate-test.c \ ++ fetch-test.c \ ++ oob-test.c \ ++ trap-crasher.c \ ++ alpha-loop.c \ ++ scaling-crash-test.c \ ++ gradient-crash-test.c \ ++ alphamap.c \ ++ stress-test.c \ ++ composite-traps-test.c \ ++ blitters-test.c \ ++ scaling-test.c \ ++ affine-test.c \ ++ composite.c \ ++ utils.c ++ ++TESTS = \ ++ $(CFG_VAR)/a1-trap-test.exe \ ++ $(CFG_VAR)/pdf-op-test.exe \ ++ $(CFG_VAR)/region-test.exe \ ++ $(CFG_VAR)/region-translate-test.exe \ ++ $(CFG_VAR)/fetch-test.exe \ ++ $(CFG_VAR)/oob-test.exe \ ++ $(CFG_VAR)/trap-crasher.exe \ ++ $(CFG_VAR)/alpha-loop.exe \ ++ $(CFG_VAR)/scaling-crash-test.exe \ ++ $(CFG_VAR)/gradient-crash-test.exe \ ++ $(CFG_VAR)/alphamap.exe \ ++ $(CFG_VAR)/stress-test.exe \ ++ $(CFG_VAR)/composite-traps-test.exe \ ++ $(CFG_VAR)/blitters-test.exe \ ++ $(CFG_VAR)/scaling-test.exe \ ++ $(CFG_VAR)/affine-test.exe \ ++ $(CFG_VAR)/composite.exe ++ ++ ++OBJECTS = $(patsubst %.c, $(CFG_VAR)/%.obj, $(SOURCES)) ++ ++$(CFG_VAR)/%.obj: %.c ++ @mkdir -p $(CFG_VAR) ++ @$(CC) -c $(CFLAGS) -Fo"$@" $< ++ ++$(CFG_VAR)/%.exe: $(CFG_VAR)/%.obj ++ $(LINK) /NOLOGO /OUT:$@ $< $(CFG_VAR)/utils.obj $(TEST_LDADD) ++ ++all: $(OBJECTS) $(TESTS) ++ @exit 0 ++ ++clean: ++ @rm -f $(CFG_VAR)/*.obj $(CFG_VAR)/*.pdb || exit 0 +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0005-Do-not-include-unused-headers.patch b/recipes/xorg-lib/pixman-0.21.6/0005-Do-not-include-unused-headers.patch new file mode 100644 index 0000000000..60f9528aa4 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0005-Do-not-include-unused-headers.patch @@ -0,0 +1,40 @@ +From 8868778ea1fdc8e70da76b3b00ea78106c5840d8 Mon Sep 17 00:00:00 2001 +From: Andrea Canciani +Date: Tue, 22 Feb 2011 22:43:48 +0100 +Subject: [PATCH 05/40] Do not include unused headers + +pixman-combine32.h is included without being used both in +pixman-image.c and in pixman-general.c. +--- + pixman/pixman-general.c | 2 -- + pixman/pixman-image.c | 1 - + 2 files changed, 0 insertions(+), 3 deletions(-) + +diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c +index 16ea3a4..872fb7e 100644 +--- a/pixman/pixman-general.c ++++ b/pixman/pixman-general.c +@@ -36,8 +36,6 @@ + #include + #include + #include "pixman-private.h" +-#include "pixman-combine32.h" +-#include "pixman-private.h" + + static void + general_src_iter_init (pixman_implementation_t *imp, +diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c +index 9103ca6..84bacf8 100644 +--- a/pixman/pixman-image.c ++++ b/pixman/pixman-image.c +@@ -30,7 +30,6 @@ + #include + + #include "pixman-private.h" +-#include "pixman-combine32.h" + + pixman_bool_t + _pixman_init_gradient (gradient_t * gradient, +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0006-test-Silence-MSVC-warnings.patch b/recipes/xorg-lib/pixman-0.21.6/0006-test-Silence-MSVC-warnings.patch new file mode 100644 index 0000000000..80d7943977 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0006-test-Silence-MSVC-warnings.patch @@ -0,0 +1,63 @@ +From 9ebde285fa990bfa1524f166fbfb1368c346b14a Mon Sep 17 00:00:00 2001 +From: Andrea Canciani +Date: Thu, 24 Feb 2011 12:53:39 +0100 +Subject: [PATCH 06/40] test: Silence MSVC warnings + +MSVC does not notice non-returning functions (abort() / assert(0)) +and warns about paths which end with them in non-void functions: + +c:\cygwin\home\ranma42\code\fdo\pixman\test\fetch-test.c(114) : +warning C4715: 'reader' : not all control paths return a value +c:\cygwin\home\ranma42\code\fdo\pixman\test\stress-test.c(133) : +warning C4715: 'real_reader' : not all control paths return a value +c:\cygwin\home\ranma42\code\fdo\pixman\test\composite.c(431) : +warning C4715: 'calc_op' : not all control paths return a value + +These warnings can be silenced by adding a return after the +termination call. +--- + test/composite.c | 1 + + test/fetch-test.c | 1 + + test/stress-test.c | 2 +- + 3 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/test/composite.c b/test/composite.c +index 08c6689..a86e5ed 100644 +--- a/test/composite.c ++++ b/test/composite.c +@@ -426,6 +426,7 @@ calc_op (pixman_op_t op, double src, double dst, double srca, double dsta) + case PIXMAN_OP_HSL_LUMINOSITY: + default: + abort(); ++ return 0; /* silence MSVC */ + } + #undef mult_chan + } +diff --git a/test/fetch-test.c b/test/fetch-test.c +index 314a072..60bc765 100644 +--- a/test/fetch-test.c ++++ b/test/fetch-test.c +@@ -110,6 +110,7 @@ reader (const void *src, int size) + return *(uint32_t *)src; + default: + assert(0); ++ return 0; /* silence MSVC */ + } + } + +diff --git a/test/stress-test.c b/test/stress-test.c +index bcbc1f8..166dc6d 100644 +--- a/test/stress-test.c ++++ b/test/stress-test.c +@@ -128,7 +128,7 @@ real_reader (const void *src, int size) + return *(uint32_t *)src; + default: + assert (0); +- break; ++ return 0; /* silence MSVC */ + } + } + +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0007-Main-loop-template-for-fast-single-pass-bilinear-sca.patch b/recipes/xorg-lib/pixman-0.21.6/0007-Main-loop-template-for-fast-single-pass-bilinear-sca.patch new file mode 100644 index 0000000000..c5dab5c31f --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0007-Main-loop-template-for-fast-single-pass-bilinear-sca.patch @@ -0,0 +1,466 @@ +From d506bf68fd0e9a1c5dd484daee70631699918387 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Mon, 21 Feb 2011 01:29:02 +0200 +Subject: [PATCH 07/40] Main loop template for fast single pass bilinear scaling + +Can be used for implementing SIMD optimized fast path +functions which work with bilinear scaled source images. + +Similar to the template for nearest scaling main loop, the +following types of mask are supported: +1. no mask +2. non-scaled a8 mask with SAMPLES_COVER_CLIP flag +3. solid mask + +PAD repeat is fully supported. NONE repeat is partially +supported (right now only works if source image has alpha +channel or when alpha channel of the source image does not +have any effect on the compositing operation). +--- + pixman/pixman-fast-path.h | 432 +++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 432 insertions(+), 0 deletions(-) + +diff --git a/pixman/pixman-fast-path.h b/pixman/pixman-fast-path.h +index d081222..1885d47 100644 +--- a/pixman/pixman-fast-path.h ++++ b/pixman/pixman-fast-path.h +@@ -587,4 +587,436 @@ fast_composite_scaled_nearest ## scale_func_name (pixman_implementation_t *imp, + SIMPLE_NEAREST_SOLID_MASK_FAST_PATH_NONE (op,s,d,func), \ + SIMPLE_NEAREST_SOLID_MASK_FAST_PATH_PAD (op,s,d,func) + ++/*****************************************************************************/ ++ ++/* ++ * Identify 5 zones in each scanline for bilinear scaling. Depending on ++ * whether 2 pixels to be interpolated are fetched from the image itself, ++ * from the padding area around it or from both image and padding area. ++ */ ++static force_inline void ++bilinear_pad_repeat_get_scanline_bounds (int32_t source_image_width, ++ pixman_fixed_t vx, ++ pixman_fixed_t unit_x, ++ int32_t * left_pad, ++ int32_t * left_tz, ++ int32_t * width, ++ int32_t * right_tz, ++ int32_t * right_pad) ++{ ++ int width1 = *width, left_pad1, right_pad1; ++ int width2 = *width, left_pad2, right_pad2; ++ ++ pad_repeat_get_scanline_bounds (source_image_width, vx, unit_x, ++ &width1, &left_pad1, &right_pad1); ++ pad_repeat_get_scanline_bounds (source_image_width, vx + pixman_fixed_1, ++ unit_x, &width2, &left_pad2, &right_pad2); ++ ++ *left_pad = left_pad2; ++ *left_tz = left_pad1 - left_pad2; ++ *right_tz = right_pad2 - right_pad1; ++ *right_pad = right_pad1; ++ *width -= *left_pad + *left_tz + *right_tz + *right_pad; ++} ++ ++/* ++ * Main loop template for single pass bilinear scaling. It needs to be ++ * provided with 'scanline_func' which should do the compositing operation. ++ * The needed function has the following prototype: ++ * ++ * scanline_func (dst_type_t * dst, ++ * const mask_type_ * mask, ++ * const src_type_t * src_top, ++ * const src_type_t * src_bottom, ++ * int32_t width, ++ * int weight_top, ++ * int weight_bottom, ++ * pixman_fixed_t vx, ++ * pixman_fixed_t unit_x, ++ * pixman_fixed_t max_vx, ++ * pixman_bool_t zero_src) ++ * ++ * Where: ++ * dst - destination scanline buffer for storing results ++ * mask - mask buffer (or single value for solid mask) ++ * src_top, src_bottom - two source scanlines ++ * width - number of pixels to process ++ * weight_top - weight of the top row for interpolation ++ * weight_bottom - weight of the bottom row for interpolation ++ * vx - initial position for fetching the first pair of ++ * pixels from the source buffer ++ * unit_x - position increment needed to move to the next pair ++ * of pixels ++ * max_vx - image size as a fixed point value, can be used for ++ * implementing NORMAL repeat (when it is supported) ++ * zero_src - boolean hint variable, which is set to TRUE when ++ * all source pixels are fetched from zero padding ++ * zone for NONE repeat ++ * ++ * Note: normally the sum of 'weight_top' and 'weight_bottom' is equal to 256, ++ * but sometimes it may be less than that for NONE repeat when handling ++ * fuzzy antialiased top or bottom image edges. Also both top and ++ * bottom weight variables are guaranteed to have value in 0-255 ++ * range and can fit into unsigned byte or be used with 8-bit SIMD ++ * multiplication instructions. ++ */ ++#define FAST_BILINEAR_MAINLOOP_INT(scale_func_name, scanline_func, src_type_t, mask_type_t, \ ++ dst_type_t, repeat_mode, have_mask, mask_is_solid) \ ++static void \ ++fast_composite_scaled_bilinear ## scale_func_name (pixman_implementation_t *imp, \ ++ pixman_op_t op, \ ++ pixman_image_t * src_image, \ ++ pixman_image_t * mask_image, \ ++ pixman_image_t * dst_image, \ ++ int32_t src_x, \ ++ int32_t src_y, \ ++ int32_t mask_x, \ ++ int32_t mask_y, \ ++ int32_t dst_x, \ ++ int32_t dst_y, \ ++ int32_t width, \ ++ int32_t height) \ ++{ \ ++ dst_type_t *dst_line; \ ++ mask_type_t *mask_line; \ ++ src_type_t *src_first_line; \ ++ int y1, y2; \ ++ pixman_fixed_t max_vx = INT32_MAX; /* suppress uninitialized variable warning */ \ ++ pixman_vector_t v; \ ++ pixman_fixed_t vx, vy; \ ++ pixman_fixed_t unit_x, unit_y; \ ++ int32_t left_pad, left_tz, right_tz, right_pad; \ ++ \ ++ dst_type_t *dst; \ ++ mask_type_t solid_mask; \ ++ const mask_type_t *mask = &solid_mask; \ ++ int src_stride, mask_stride, dst_stride; \ ++ \ ++ PIXMAN_IMAGE_GET_LINE (dst_image, dst_x, dst_y, dst_type_t, dst_stride, dst_line, 1); \ ++ if (have_mask) \ ++ { \ ++ if (mask_is_solid) \ ++ { \ ++ solid_mask = _pixman_image_get_solid (imp, mask_image, dst_image->bits.format); \ ++ mask_stride = 0; \ ++ } \ ++ else \ ++ { \ ++ PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, mask_type_t, \ ++ mask_stride, mask_line, 1); \ ++ } \ ++ } \ ++ /* pass in 0 instead of src_x and src_y because src_x and src_y need to be \ ++ * transformed from destination space to source space */ \ ++ PIXMAN_IMAGE_GET_LINE (src_image, 0, 0, src_type_t, src_stride, src_first_line, 1); \ ++ \ ++ /* reference point is the center of the pixel */ \ ++ v.vector[0] = pixman_int_to_fixed (src_x) + pixman_fixed_1 / 2; \ ++ v.vector[1] = pixman_int_to_fixed (src_y) + pixman_fixed_1 / 2; \ ++ v.vector[2] = pixman_fixed_1; \ ++ \ ++ if (!pixman_transform_point_3d (src_image->common.transform, &v)) \ ++ return; \ ++ \ ++ unit_x = src_image->common.transform->matrix[0][0]; \ ++ unit_y = src_image->common.transform->matrix[1][1]; \ ++ \ ++ v.vector[0] -= pixman_fixed_1 / 2; \ ++ v.vector[1] -= pixman_fixed_1 / 2; \ ++ \ ++ vy = v.vector[1]; \ ++ \ ++ if (PIXMAN_REPEAT_ ## repeat_mode == PIXMAN_REPEAT_PAD || \ ++ PIXMAN_REPEAT_ ## repeat_mode == PIXMAN_REPEAT_NONE) \ ++ { \ ++ bilinear_pad_repeat_get_scanline_bounds (src_image->bits.width, v.vector[0], unit_x, \ ++ &left_pad, &left_tz, &width, &right_tz, &right_pad); \ ++ if (PIXMAN_REPEAT_ ## repeat_mode == PIXMAN_REPEAT_PAD) \ ++ { \ ++ /* PAD repeat does not need special handling for 'transition zones' and */ \ ++ /* they can be combined with 'padding zones' safely */ \ ++ left_pad += left_tz; \ ++ right_pad += right_tz; \ ++ left_tz = right_tz = 0; \ ++ } \ ++ v.vector[0] += left_pad * unit_x; \ ++ } \ ++ \ ++ while (--height >= 0) \ ++ { \ ++ int weight1, weight2; \ ++ dst = dst_line; \ ++ dst_line += dst_stride; \ ++ vx = v.vector[0]; \ ++ if (have_mask && !mask_is_solid) \ ++ { \ ++ mask = mask_line; \ ++ mask_line += mask_stride; \ ++ } \ ++ \ ++ y1 = pixman_fixed_to_int (vy); \ ++ weight2 = (vy >> 8) & 0xff; \ ++ if (weight2) \ ++ { \ ++ /* normal case, both row weights are in 0-255 range and fit unsigned byte */ \ ++ y2 = y1 + 1; \ ++ weight1 = 256 - weight2; \ ++ } \ ++ else \ ++ { \ ++ /* set both top and bottom row to the same scanline, and weights to 128+128 */ \ ++ y2 = y1; \ ++ weight1 = weight2 = 128; \ ++ } \ ++ vy += unit_y; \ ++ if (PIXMAN_REPEAT_ ## repeat_mode == PIXMAN_REPEAT_PAD) \ ++ { \ ++ src_type_t *src1, *src2; \ ++ src_type_t buf1[2]; \ ++ src_type_t buf2[2]; \ ++ repeat (PIXMAN_REPEAT_PAD, &y1, src_image->bits.height); \ ++ repeat (PIXMAN_REPEAT_PAD, &y2, src_image->bits.height); \ ++ src1 = src_first_line + src_stride * y1; \ ++ src2 = src_first_line + src_stride * y2; \ ++ \ ++ if (left_pad > 0) \ ++ { \ ++ buf1[0] = buf1[1] = src1[0]; \ ++ buf2[0] = buf2[1] = src2[0]; \ ++ scanline_func (dst, mask, \ ++ buf1, buf2, left_pad, weight1, weight2, 0, 0, 0, FALSE); \ ++ dst += left_pad; \ ++ if (have_mask && !mask_is_solid) \ ++ mask += left_pad; \ ++ } \ ++ if (width > 0) \ ++ { \ ++ scanline_func (dst, mask, \ ++ src1, src2, width, weight1, weight2, vx, unit_x, 0, FALSE); \ ++ dst += width; \ ++ if (have_mask && !mask_is_solid) \ ++ mask += width; \ ++ } \ ++ if (right_pad > 0) \ ++ { \ ++ buf1[0] = buf1[1] = src1[src_image->bits.width - 1]; \ ++ buf2[0] = buf2[1] = src2[src_image->bits.width - 1]; \ ++ scanline_func (dst, mask, \ ++ buf1, buf2, right_pad, weight1, weight2, 0, 0, 0, FALSE); \ ++ } \ ++ } \ ++ else if (PIXMAN_REPEAT_ ## repeat_mode == PIXMAN_REPEAT_NONE) \ ++ { \ ++ src_type_t *src1, *src2; \ ++ src_type_t buf1[2]; \ ++ src_type_t buf2[2]; \ ++ /* handle top/bottom zero padding by just setting weights to 0 if needed */ \ ++ if (y1 < 0) \ ++ { \ ++ weight1 = 0; \ ++ y1 = 0; \ ++ } \ ++ if (y1 >= src_image->bits.height) \ ++ { \ ++ weight1 = 0; \ ++ y1 = src_image->bits.height - 1; \ ++ } \ ++ if (y2 < 0) \ ++ { \ ++ weight2 = 0; \ ++ y2 = 0; \ ++ } \ ++ if (y2 >= src_image->bits.height) \ ++ { \ ++ weight2 = 0; \ ++ y2 = src_image->bits.height - 1; \ ++ } \ ++ src1 = src_first_line + src_stride * y1; \ ++ src2 = src_first_line + src_stride * y2; \ ++ \ ++ if (left_pad > 0) \ ++ { \ ++ buf1[0] = buf1[1] = 0; \ ++ buf2[0] = buf2[1] = 0; \ ++ scanline_func (dst, mask, \ ++ buf1, buf2, left_pad, weight1, weight2, 0, 0, 0, TRUE); \ ++ dst += left_pad; \ ++ if (have_mask && !mask_is_solid) \ ++ mask += left_pad; \ ++ } \ ++ if (left_tz > 0) \ ++ { \ ++ buf1[0] = 0; \ ++ buf1[1] = src1[0]; \ ++ buf2[0] = 0; \ ++ buf2[1] = src2[0]; \ ++ scanline_func (dst, mask, \ ++ buf1, buf2, left_tz, weight1, weight2, \ ++ pixman_fixed_frac (vx), unit_x, 0, FALSE); \ ++ dst += left_tz; \ ++ if (have_mask && !mask_is_solid) \ ++ mask += left_tz; \ ++ vx += left_tz * unit_x; \ ++ } \ ++ if (width > 0) \ ++ { \ ++ scanline_func (dst, mask, \ ++ src1, src2, width, weight1, weight2, vx, unit_x, 0, FALSE); \ ++ dst += width; \ ++ if (have_mask && !mask_is_solid) \ ++ mask += width; \ ++ vx += width * unit_x; \ ++ } \ ++ if (right_tz > 0) \ ++ { \ ++ buf1[0] = src1[src_image->bits.width - 1]; \ ++ buf1[1] = 0; \ ++ buf2[0] = src2[src_image->bits.width - 1]; \ ++ buf2[1] = 0; \ ++ scanline_func (dst, mask, \ ++ buf1, buf2, right_tz, weight1, weight2, \ ++ pixman_fixed_frac (vx), unit_x, 0, FALSE); \ ++ dst += right_tz; \ ++ if (have_mask && !mask_is_solid) \ ++ mask += right_tz; \ ++ } \ ++ if (right_pad > 0) \ ++ { \ ++ buf1[0] = buf1[1] = 0; \ ++ buf2[0] = buf2[1] = 0; \ ++ scanline_func (dst, mask, \ ++ buf1, buf2, right_pad, weight1, weight2, 0, 0, 0, TRUE); \ ++ } \ ++ } \ ++ else \ ++ { \ ++ scanline_func (dst, mask, src_first_line + src_stride * y1, \ ++ src_first_line + src_stride * y2, width, \ ++ weight1, weight2, vx, unit_x, max_vx, FALSE); \ ++ } \ ++ } \ ++} ++ ++/* A workaround for old sun studio, see: https://bugs.freedesktop.org/show_bug.cgi?id=32764 */ ++#define FAST_BILINEAR_MAINLOOP_COMMON(scale_func_name, scanline_func, src_type_t, mask_type_t, \ ++ dst_type_t, repeat_mode, have_mask, mask_is_solid) \ ++ FAST_BILINEAR_MAINLOOP_INT(_ ## scale_func_name, scanline_func, src_type_t, mask_type_t,\ ++ dst_type_t, repeat_mode, have_mask, mask_is_solid) ++ ++#define SCALED_BILINEAR_FLAGS \ ++ (FAST_PATH_SCALE_TRANSFORM | \ ++ FAST_PATH_NO_ALPHA_MAP | \ ++ FAST_PATH_BILINEAR_FILTER | \ ++ FAST_PATH_NO_ACCESSORS | \ ++ FAST_PATH_NARROW_FORMAT) ++ ++#define SIMPLE_BILINEAR_FAST_PATH_PAD(op,s,d,func) \ ++ { PIXMAN_OP_ ## op, \ ++ PIXMAN_ ## s, \ ++ (SCALED_BILINEAR_FLAGS | \ ++ FAST_PATH_PAD_REPEAT | \ ++ FAST_PATH_X_UNIT_POSITIVE), \ ++ PIXMAN_null, 0, \ ++ PIXMAN_ ## d, FAST_PATH_STD_DEST_FLAGS, \ ++ fast_composite_scaled_bilinear_ ## func ## _pad ## _ ## op, \ ++ } ++ ++#define SIMPLE_BILINEAR_FAST_PATH_NONE(op,s,d,func) \ ++ { PIXMAN_OP_ ## op, \ ++ PIXMAN_ ## s, \ ++ (SCALED_BILINEAR_FLAGS | \ ++ FAST_PATH_NONE_REPEAT | \ ++ FAST_PATH_X_UNIT_POSITIVE), \ ++ PIXMAN_null, 0, \ ++ PIXMAN_ ## d, FAST_PATH_STD_DEST_FLAGS, \ ++ fast_composite_scaled_bilinear_ ## func ## _none ## _ ## op, \ ++ } ++ ++#define SIMPLE_BILINEAR_FAST_PATH_COVER(op,s,d,func) \ ++ { PIXMAN_OP_ ## op, \ ++ PIXMAN_ ## s, \ ++ SCALED_BILINEAR_FLAGS | FAST_PATH_SAMPLES_COVER_CLIP, \ ++ PIXMAN_null, 0, \ ++ PIXMAN_ ## d, FAST_PATH_STD_DEST_FLAGS, \ ++ fast_composite_scaled_bilinear_ ## func ## _cover ## _ ## op, \ ++ } ++ ++#define SIMPLE_BILINEAR_A8_MASK_FAST_PATH_PAD(op,s,d,func) \ ++ { PIXMAN_OP_ ## op, \ ++ PIXMAN_ ## s, \ ++ (SCALED_BILINEAR_FLAGS | \ ++ FAST_PATH_PAD_REPEAT | \ ++ FAST_PATH_X_UNIT_POSITIVE), \ ++ PIXMAN_a8, MASK_FLAGS (a8, FAST_PATH_UNIFIED_ALPHA), \ ++ PIXMAN_ ## d, FAST_PATH_STD_DEST_FLAGS, \ ++ fast_composite_scaled_bilinear_ ## func ## _pad ## _ ## op, \ ++ } ++ ++#define SIMPLE_BILINEAR_A8_MASK_FAST_PATH_NONE(op,s,d,func) \ ++ { PIXMAN_OP_ ## op, \ ++ PIXMAN_ ## s, \ ++ (SCALED_BILINEAR_FLAGS | \ ++ FAST_PATH_NONE_REPEAT | \ ++ FAST_PATH_X_UNIT_POSITIVE), \ ++ PIXMAN_a8, MASK_FLAGS (a8, FAST_PATH_UNIFIED_ALPHA), \ ++ PIXMAN_ ## d, FAST_PATH_STD_DEST_FLAGS, \ ++ fast_composite_scaled_bilinear_ ## func ## _none ## _ ## op, \ ++ } ++ ++#define SIMPLE_BILINEAR_A8_MASK_FAST_PATH_COVER(op,s,d,func) \ ++ { PIXMAN_OP_ ## op, \ ++ PIXMAN_ ## s, \ ++ SCALED_BILINEAR_FLAGS | FAST_PATH_SAMPLES_COVER_CLIP, \ ++ PIXMAN_a8, MASK_FLAGS (a8, FAST_PATH_UNIFIED_ALPHA), \ ++ PIXMAN_ ## d, FAST_PATH_STD_DEST_FLAGS, \ ++ fast_composite_scaled_bilinear_ ## func ## _cover ## _ ## op, \ ++ } ++ ++#define SIMPLE_BILINEAR_SOLID_MASK_FAST_PATH_PAD(op,s,d,func) \ ++ { PIXMAN_OP_ ## op, \ ++ PIXMAN_ ## s, \ ++ (SCALED_BILINEAR_FLAGS | \ ++ FAST_PATH_PAD_REPEAT | \ ++ FAST_PATH_X_UNIT_POSITIVE), \ ++ PIXMAN_solid, MASK_FLAGS (solid, FAST_PATH_UNIFIED_ALPHA), \ ++ PIXMAN_ ## d, FAST_PATH_STD_DEST_FLAGS, \ ++ fast_composite_scaled_bilinear_ ## func ## _pad ## _ ## op, \ ++ } ++ ++#define SIMPLE_BILINEAR_SOLID_MASK_FAST_PATH_NONE(op,s,d,func) \ ++ { PIXMAN_OP_ ## op, \ ++ PIXMAN_ ## s, \ ++ (SCALED_BILINEAR_FLAGS | \ ++ FAST_PATH_NONE_REPEAT | \ ++ FAST_PATH_X_UNIT_POSITIVE), \ ++ PIXMAN_solid, MASK_FLAGS (solid, FAST_PATH_UNIFIED_ALPHA), \ ++ PIXMAN_ ## d, FAST_PATH_STD_DEST_FLAGS, \ ++ fast_composite_scaled_bilinear_ ## func ## _none ## _ ## op, \ ++ } ++ ++#define SIMPLE_BILINEAR_SOLID_MASK_FAST_PATH_COVER(op,s,d,func) \ ++ { PIXMAN_OP_ ## op, \ ++ PIXMAN_ ## s, \ ++ SCALED_BILINEAR_FLAGS | FAST_PATH_SAMPLES_COVER_CLIP, \ ++ PIXMAN_solid, MASK_FLAGS (solid, FAST_PATH_UNIFIED_ALPHA), \ ++ PIXMAN_ ## d, FAST_PATH_STD_DEST_FLAGS, \ ++ fast_composite_scaled_bilinear_ ## func ## _cover ## _ ## op, \ ++ } ++ ++/* Prefer the use of 'cover' variant, because it is faster */ ++#define SIMPLE_BILINEAR_FAST_PATH(op,s,d,func) \ ++ SIMPLE_BILINEAR_FAST_PATH_COVER (op,s,d,func), \ ++ SIMPLE_BILINEAR_FAST_PATH_NONE (op,s,d,func), \ ++ SIMPLE_BILINEAR_FAST_PATH_PAD (op,s,d,func) ++ ++#define SIMPLE_BILINEAR_A8_MASK_FAST_PATH(op,s,d,func) \ ++ SIMPLE_BILINEAR_A8_MASK_FAST_PATH_COVER (op,s,d,func), \ ++ SIMPLE_BILINEAR_A8_MASK_FAST_PATH_NONE (op,s,d,func), \ ++ SIMPLE_BILINEAR_A8_MASK_FAST_PATH_PAD (op,s,d,func) ++ ++#define SIMPLE_BILINEAR_SOLID_MASK_FAST_PATH(op,s,d,func) \ ++ SIMPLE_BILINEAR_SOLID_MASK_FAST_PATH_COVER (op,s,d,func), \ ++ SIMPLE_BILINEAR_SOLID_MASK_FAST_PATH_NONE (op,s,d,func), \ ++ SIMPLE_BILINEAR_SOLID_MASK_FAST_PATH_PAD (op,s,d,func) ++ + #endif +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0008-test-check-correctness-of-bilinear_pad_repeat_get_sc.patch b/recipes/xorg-lib/pixman-0.21.6/0008-test-check-correctness-of-bilinear_pad_repeat_get_sc.patch new file mode 100644 index 0000000000..18dfcaa10f --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0008-test-check-correctness-of-bilinear_pad_repeat_get_sc.patch @@ -0,0 +1,136 @@ +From 0df43b8ae5031dd83775d00b57b6bed809db0e89 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Mon, 21 Feb 2011 02:07:09 +0200 +Subject: [PATCH 08/40] test: check correctness of 'bilinear_pad_repeat_get_scanline_bounds' + +Individual correctness check for the new bilinear scaling related +supplementary function. This test program uses a bit wider range +of input arguments, not covered by other tests. +--- + test/Makefile.am | 2 + + test/scaling-helpers-test.c | 93 +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 95 insertions(+), 0 deletions(-) + create mode 100644 test/scaling-helpers-test.c + +diff --git a/test/Makefile.am b/test/Makefile.am +index 057e9ce..9dc7219 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -13,6 +13,7 @@ TESTPROGRAMS = \ + trap-crasher \ + alpha-loop \ + scaling-crash-test \ ++ scaling-helpers-test \ + gradient-crash-test \ + alphamap \ + stress-test \ +@@ -33,6 +34,7 @@ alpha_loop_SOURCES = alpha-loop.c utils.c utils.h + composite_SOURCES = composite.c utils.c utils.h + gradient_crash_test_SOURCES = gradient-crash-test.c utils.c utils.h + stress_test_SOURCES = stress-test.c utils.c utils.h ++scaling_helpers_test_SOURCES = scaling-helpers-test.c utils.c utils.h + + # Benchmarks + +diff --git a/test/scaling-helpers-test.c b/test/scaling-helpers-test.c +new file mode 100644 +index 0000000..c186138 +--- /dev/null ++++ b/test/scaling-helpers-test.c +@@ -0,0 +1,93 @@ ++#include ++#include ++#include ++#include ++#include ++#include "utils.h" ++#include "pixman-fast-path.h" ++ ++/* A trivial reference implementation for ++ * 'bilinear_pad_repeat_get_scanline_bounds' ++ */ ++static void ++bilinear_pad_repeat_get_scanline_bounds_ref (int32_t source_image_width, ++ pixman_fixed_t vx_, ++ pixman_fixed_t unit_x, ++ int32_t * left_pad, ++ int32_t * left_tz, ++ int32_t * width, ++ int32_t * right_tz, ++ int32_t * right_pad) ++{ ++ int w = *width; ++ *left_pad = 0; ++ *left_tz = 0; ++ *width = 0; ++ *right_tz = 0; ++ *right_pad = 0; ++ int64_t vx = vx_; ++ while (--w >= 0) ++ { ++ if (vx < 0) ++ { ++ if (vx + pixman_fixed_1 < 0) ++ *left_pad += 1; ++ else ++ *left_tz += 1; ++ } ++ else if (vx + pixman_fixed_1 >= pixman_int_to_fixed (source_image_width)) ++ { ++ if (vx >= pixman_int_to_fixed (source_image_width)) ++ *right_pad += 1; ++ else ++ *right_tz += 1; ++ } ++ else ++ { ++ *width += 1; ++ } ++ vx += unit_x; ++ } ++} ++ ++int ++main (void) ++{ ++ int i; ++ for (i = 0; i < 10000; i++) ++ { ++ int32_t left_pad1, left_tz1, width1, right_tz1, right_pad1; ++ int32_t left_pad2, left_tz2, width2, right_tz2, right_pad2; ++ pixman_fixed_t vx = lcg_rand_N(10000 << 16) - (3000 << 16); ++ int32_t width = lcg_rand_N(10000); ++ int32_t source_image_width = lcg_rand_N(10000) + 1; ++ pixman_fixed_t unit_x = lcg_rand_N(10 << 16) + 1; ++ width1 = width2 = width; ++ ++ bilinear_pad_repeat_get_scanline_bounds_ref (source_image_width, ++ vx, ++ unit_x, ++ &left_pad1, ++ &left_tz1, ++ &width1, ++ &right_tz1, ++ &right_pad1); ++ ++ bilinear_pad_repeat_get_scanline_bounds (source_image_width, ++ vx, ++ unit_x, ++ &left_pad2, ++ &left_tz2, ++ &width2, ++ &right_tz2, ++ &right_pad2); ++ ++ assert (left_pad1 == left_pad2); ++ assert (left_tz1 == left_tz2); ++ assert (width1 == width2); ++ assert (right_tz1 == right_tz2); ++ assert (right_pad1 == right_pad2); ++ } ++ ++ return 0; ++} +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0009-SSE2-optimization-for-bilinear-scaled-src_8888_8888.patch b/recipes/xorg-lib/pixman-0.21.6/0009-SSE2-optimization-for-bilinear-scaled-src_8888_8888.patch new file mode 100644 index 0000000000..b85f78169c --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0009-SSE2-optimization-for-bilinear-scaled-src_8888_8888.patch @@ -0,0 +1,156 @@ +From 350029396d911941591149cc82b5e68a78ad6747 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Mon, 21 Feb 2011 20:18:02 +0200 +Subject: [PATCH 09/40] SSE2 optimization for bilinear scaled 'src_8888_8888' + +A primitive naive implementation of bilinear scaling using SSE2 intrinsics, +which only handles one pixel at a time. It is approximately 2x faster than +pixman general compositing path. Single pass processing without intermediate +temporary buffer contributes to ~15% and loop unrolling contributes to ~20% +of this speedup. + +Benchmark on Intel Core i7 (x86-64): + Using cairo-perf-trace: + before: image firefox-planet-gnome 12.566 12.610 0.23% 6/6 + after: image firefox-planet-gnome 10.961 11.013 0.19% 5/6 + + Microbenchmark (scaling 2000x2000 image with scale factor close to 1x): + before: op=1, src=20028888, dst=20028888, speed=70.48 MPix/s + after: op=1, src=20028888, dst=20028888, speed=165.38 MPix/s +--- + pixman/pixman-sse2.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 112 insertions(+), 0 deletions(-) + +diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c +index 88287b4..696005f 100644 +--- a/pixman/pixman-sse2.c ++++ b/pixman/pixman-sse2.c +@@ -5567,6 +5567,114 @@ FAST_NEAREST_MAINLOOP_COMMON (sse2_8888_n_8888_none_OVER, + scaled_nearest_scanline_sse2_8888_n_8888_OVER, + uint32_t, uint32_t, uint32_t, NONE, TRUE, TRUE) + ++static void ++bilinear_interpolate_line_sse2 (uint32_t * out, ++ const uint32_t * top, ++ const uint32_t * bottom, ++ int wt, ++ int wb, ++ pixman_fixed_t x, ++ pixman_fixed_t ux, ++ int width) ++{ ++ const __m128i xmm_wt = _mm_set_epi16 (wt, wt, wt, wt, wt, wt, wt, wt); ++ const __m128i xmm_wb = _mm_set_epi16 (wb, wb, wb, wb, wb, wb, wb, wb); ++ const __m128i xmm_xorc = _mm_set_epi16 (0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff); ++ const __m128i xmm_addc = _mm_set_epi16 (0, 0, 0, 0, 1, 1, 1, 1); ++ const __m128i xmm_ux = _mm_set_epi16 (ux, ux, ux, ux, ux, ux, ux, ux); ++ const __m128i xmm_zero = _mm_setzero_si128 (); ++ __m128i xmm_x = _mm_set_epi16 (x, x, x, x, x, x, x, x); ++ uint32_t pix1, pix2, pix3, pix4; ++ ++ #define INTERPOLATE_ONE_PIXEL(pix) \ ++ do { \ ++ __m128i xmm_wh, xmm_lo, xmm_hi, a; \ ++ /* fetch 2x2 pixel block into sse2 register */ \ ++ uint32_t tl = top [pixman_fixed_to_int (x)]; \ ++ uint32_t tr = top [pixman_fixed_to_int (x) + 1]; \ ++ uint32_t bl = bottom [pixman_fixed_to_int (x)]; \ ++ uint32_t br = bottom [pixman_fixed_to_int (x) + 1]; \ ++ a = _mm_set_epi32 (tr, tl, br, bl); \ ++ x += ux; \ ++ /* vertical interpolation */ \ ++ a = _mm_add_epi16 (_mm_mullo_epi16 (_mm_unpackhi_epi8 (a, xmm_zero), \ ++ xmm_wt), \ ++ _mm_mullo_epi16 (_mm_unpacklo_epi8 (a, xmm_zero), \ ++ xmm_wb)); \ ++ /* calculate horizontal weights */ \ ++ xmm_wh = _mm_add_epi16 (xmm_addc, \ ++ _mm_xor_si128 (xmm_xorc, \ ++ _mm_srli_epi16 (xmm_x, 8))); \ ++ xmm_x = _mm_add_epi16 (xmm_x, xmm_ux); \ ++ /* horizontal interpolation */ \ ++ xmm_lo = _mm_mullo_epi16 (a, xmm_wh); \ ++ xmm_hi = _mm_mulhi_epu16 (a, xmm_wh); \ ++ a = _mm_add_epi32 (_mm_unpacklo_epi16 (xmm_lo, xmm_hi), \ ++ _mm_unpackhi_epi16 (xmm_lo, xmm_hi)); \ ++ /* shift and pack the result */ \ ++ a = _mm_srli_epi32 (a, 16); \ ++ a = _mm_packs_epi32 (a, a); \ ++ a = _mm_packus_epi16 (a, a); \ ++ pix = _mm_cvtsi128_si32 (a); \ ++ } while (0) ++ ++ while ((width -= 4) >= 0) ++ { ++ INTERPOLATE_ONE_PIXEL (pix1); ++ INTERPOLATE_ONE_PIXEL (pix2); ++ INTERPOLATE_ONE_PIXEL (pix3); ++ INTERPOLATE_ONE_PIXEL (pix4); ++ *out++ = pix1; ++ *out++ = pix2; ++ *out++ = pix3; ++ *out++ = pix4; ++ } ++ if (width & 2) ++ { ++ INTERPOLATE_ONE_PIXEL (pix1); ++ INTERPOLATE_ONE_PIXEL (pix2); ++ *out++ = pix1; ++ *out++ = pix2; ++ } ++ if (width & 1) ++ { ++ INTERPOLATE_ONE_PIXEL (pix1); ++ *out = pix1; ++ } ++ ++ #undef INTERPOLATE_ONE_PIXEL ++} ++ ++static force_inline void ++scaled_bilinear_scanline_sse2_8888_8888_SRC (uint32_t * dst, ++ const uint32_t * mask, ++ const uint32_t * src_top, ++ const uint32_t * src_bottom, ++ int32_t w, ++ int wt, ++ int wb, ++ pixman_fixed_t vx, ++ pixman_fixed_t unit_x, ++ pixman_fixed_t max_vx, ++ pixman_bool_t zero_src) ++{ ++ bilinear_interpolate_line_sse2 (dst, src_top, src_bottom, ++ wt, wb, vx, unit_x, w); ++} ++ ++FAST_BILINEAR_MAINLOOP_COMMON (sse2_8888_8888_cover_SRC, ++ scaled_bilinear_scanline_sse2_8888_8888_SRC, ++ uint32_t, uint32_t, uint32_t, ++ COVER, FALSE, FALSE) ++FAST_BILINEAR_MAINLOOP_COMMON (sse2_8888_8888_pad_SRC, ++ scaled_bilinear_scanline_sse2_8888_8888_SRC, ++ uint32_t, uint32_t, uint32_t, ++ PAD, FALSE, FALSE) ++FAST_BILINEAR_MAINLOOP_COMMON (sse2_8888_8888_none_SRC, ++ scaled_bilinear_scanline_sse2_8888_8888_SRC, ++ uint32_t, uint32_t, uint32_t, ++ NONE, FALSE, FALSE) ++ + static const pixman_fast_path_t sse2_fast_paths[] = + { + /* PIXMAN_OP_OVER */ +@@ -5668,6 +5776,10 @@ static const pixman_fast_path_t sse2_fast_paths[] = + SIMPLE_NEAREST_SOLID_MASK_FAST_PATH (OVER, a8r8g8b8, x8r8g8b8, sse2_8888_n_8888), + SIMPLE_NEAREST_SOLID_MASK_FAST_PATH (OVER, a8b8g8r8, x8b8g8r8, sse2_8888_n_8888), + ++ SIMPLE_BILINEAR_FAST_PATH (SRC, a8r8g8b8, a8r8g8b8, sse2_8888_8888), ++ SIMPLE_BILINEAR_FAST_PATH (SRC, a8r8g8b8, x8r8g8b8, sse2_8888_8888), ++ SIMPLE_BILINEAR_FAST_PATH (SRC, x8r8g8b8, x8r8g8b8, sse2_8888_8888), ++ + { PIXMAN_OP_NONE }, + }; + +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0010-ARM-NEON-optimization-for-bilinear-scaled-src_8888_8.patch b/recipes/xorg-lib/pixman-0.21.6/0010-ARM-NEON-optimization-for-bilinear-scaled-src_8888_8.patch new file mode 100644 index 0000000000..4d411625ae --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0010-ARM-NEON-optimization-for-bilinear-scaled-src_8888_8.patch @@ -0,0 +1,288 @@ +From 17feaa9c50bb8521b0366345efe181bd99754957 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Tue, 22 Feb 2011 18:45:03 +0200 +Subject: [PATCH 10/40] ARM: NEON optimization for bilinear scaled 'src_8888_8888' + +Initial NEON optimization for bilinear scaling. Can be probably +improved more. + +Benchmark on ARM Cortex-A8: + Microbenchmark (scaling 2000x2000 image with scale factor close to 1x): + before: op=1, src=20028888, dst=20028888, speed=6.70 MPix/s + after: op=1, src=20028888, dst=20028888, speed=44.27 MPix/s +--- + pixman/pixman-arm-neon-asm.S | 197 ++++++++++++++++++++++++++++++++++++++++++ + pixman/pixman-arm-neon.c | 45 ++++++++++ + 2 files changed, 242 insertions(+), 0 deletions(-) + +diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S +index 47daf45..c168e10 100644 +--- a/pixman/pixman-arm-neon-asm.S ++++ b/pixman/pixman-arm-neon-asm.S +@@ -2391,3 +2391,200 @@ generate_composite_function_nearest_scanline \ + 10, /* dst_r_basereg */ \ + 8, /* src_basereg */ \ + 15 /* mask_basereg */ ++ ++/******************************************************************************/ ++ ++/* Supplementary macro for setting function attributes */ ++.macro pixman_asm_function fname ++ .func fname ++ .global fname ++#ifdef __ELF__ ++ .hidden fname ++ .type fname, %function ++#endif ++fname: ++.endm ++ ++.macro bilinear_interpolate_last_pixel ++ mov TMP1, X, asr #16 ++ mov TMP2, X, asr #16 ++ add TMP1, TOP, TMP1, asl #2 ++ add TMP2, BOTTOM, TMP2, asl #2 ++ vld1.32 {d0}, [TMP1] ++ vshr.u16 d30, d24, #8 ++ vld1.32 {d1}, [TMP2] ++ vmull.u8 q1, d0, d28 ++ vmlal.u8 q1, d1, d29 ++ /* 5 cycles bubble */ ++ vshll.u16 q0, d2, #8 ++ vmlsl.u16 q0, d2, d30 ++ vmlal.u16 q0, d3, d30 ++ /* 5 cycles bubble */ ++ vshrn.u32 d0, q0, #16 ++ /* 3 cycles bubble */ ++ vmovn.u16 d0, q0 ++ /* 1 cycle bubble */ ++ vst1.32 {d0[0]}, [OUT, :32]! ++.endm ++ ++.macro bilinear_interpolate_two_pixels ++ mov TMP1, X, asr #16 ++ mov TMP2, X, asr #16 ++ add X, X, UX ++ add TMP1, TOP, TMP1, asl #2 ++ add TMP2, BOTTOM, TMP2, asl #2 ++ vld1.32 {d0}, [TMP1] ++ vld1.32 {d1}, [TMP2] ++ vmull.u8 q1, d0, d28 ++ vmlal.u8 q1, d1, d29 ++ mov TMP1, X, asr #16 ++ mov TMP2, X, asr #16 ++ add X, X, UX ++ add TMP1, TOP, TMP1, asl #2 ++ add TMP2, BOTTOM, TMP2, asl #2 ++ vld1.32 {d20}, [TMP1] ++ vld1.32 {d21}, [TMP2] ++ vmull.u8 q11, d20, d28 ++ vmlal.u8 q11, d21, d29 ++ vshr.u16 q15, q12, #8 ++ vadd.u16 q12, q12, q13 ++ vshll.u16 q0, d2, #8 ++ vmlsl.u16 q0, d2, d30 ++ vmlal.u16 q0, d3, d30 ++ vshll.u16 q10, d22, #8 ++ vmlsl.u16 q10, d22, d31 ++ vmlal.u16 q10, d23, d31 ++ vshrn.u32 d30, q0, #16 ++ vshrn.u32 d31, q10, #16 ++ vmovn.u16 d0, q15 ++ vst1.32 {d0}, [OUT]! ++.endm ++ ++.macro bilinear_interpolate_four_pixels ++ mov TMP1, X, asr #16 ++ mov TMP2, X, asr #16 ++ add X, X, UX ++ add TMP1, TOP, TMP1, asl #2 ++ add TMP2, BOTTOM, TMP2, asl #2 ++ vld1.32 {d0}, [TMP1] ++ vld1.32 {d1}, [TMP2] ++ vmull.u8 q1, d0, d28 ++ vmlal.u8 q1, d1, d29 ++ mov TMP1, X, asr #16 ++ mov TMP2, X, asr #16 ++ add X, X, UX ++ add TMP1, TOP, TMP1, asl #2 ++ add TMP2, BOTTOM, TMP2, asl #2 ++ vld1.32 {d20}, [TMP1] ++ vld1.32 {d21}, [TMP2] ++ vmull.u8 q11, d20, d28 ++ vmlal.u8 q11, d21, d29 ++ vshr.u16 q15, q12, #8 ++ vadd.u16 q12, q12, q13 ++ vshll.u16 q0, d2, #8 ++ vmlsl.u16 q0, d2, d30 ++ vmlal.u16 q0, d3, d30 ++ vshll.u16 q10, d22, #8 ++ vmlsl.u16 q10, d22, d31 ++ vmlal.u16 q10, d23, d31 ++ mov TMP1, X, asr #16 ++ mov TMP2, X, asr #16 ++ add X, X, UX ++ add TMP1, TOP, TMP1, asl #2 ++ add TMP2, BOTTOM, TMP2, asl #2 ++ vld1.32 {d4}, [TMP1] ++ vld1.32 {d5}, [TMP2] ++ vmull.u8 q3, d4, d28 ++ vmlal.u8 q3, d5, d29 ++ mov TMP1, X, asr #16 ++ mov TMP2, X, asr #16 ++ add X, X, UX ++ add TMP1, TOP, TMP1, asl #2 ++ add TMP2, BOTTOM, TMP2, asl #2 ++ vld1.32 {d16}, [TMP1] ++ vld1.32 {d17}, [TMP2] ++ vmull.u8 q9, d16, d28 ++ vmlal.u8 q9, d17, d29 ++ vshr.u16 q15, q12, #8 ++ vadd.u16 q12, q12, q13 ++ vshll.u16 q2, d6, #8 ++ vmlsl.u16 q2, d6, d30 ++ vmlal.u16 q2, d7, d30 ++ vshll.u16 q8, d18, #8 ++ vmlsl.u16 q8, d18, d31 ++ vmlal.u16 q8, d19, d31 ++ vshrn.u32 d0, q0, #16 ++ vshrn.u32 d1, q10, #16 ++ vshrn.u32 d4, q2, #16 ++ vshrn.u32 d5, q8, #16 ++ vmovn.u16 d0, q0 ++ vmovn.u16 d1, q2 ++ vst1.32 {d0, d1}, [OUT]! ++.endm ++ ++ ++/* ++ * pixman_scaled_bilinear_scanline_8888_8888_SRC (uint32_t * out, ++ * const uint32_t * top, ++ * const uint32_t * bottom, ++ * int wt, ++ * int wb, ++ * pixman_fixed_t x, ++ * pixman_fixed_t ux, ++ * int width) ++ */ ++ ++pixman_asm_function pixman_scaled_bilinear_scanline_8888_8888_SRC_asm_neon ++ OUT .req r0 ++ TOP .req r1 ++ BOTTOM .req r2 ++ WT .req r3 ++ WB .req r4 ++ X .req r5 ++ UX .req r6 ++ WIDTH .req ip ++ TMP1 .req r3 ++ TMP2 .req r4 ++ ++ mov ip, sp ++ push {r4, r5, r6, r7} ++ ldmia ip, {WB, X, UX, WIDTH} ++ ++ cmp WIDTH, #0 ++ ble 3f ++ vdup.u16 q12, X ++ vdup.u16 q13, UX ++ vdup.u8 d28, WT ++ vdup.u8 d29, WB ++ vadd.u16 d25, d25, d26 ++ vadd.u16 q13, q13, q13 ++ ++ subs WIDTH, WIDTH, #4 ++ blt 1f ++0: ++ bilinear_interpolate_four_pixels ++ subs WIDTH, WIDTH, #4 ++ bge 0b ++1: ++ tst WIDTH, #2 ++ beq 2f ++ bilinear_interpolate_two_pixels ++2: ++ tst WIDTH, #1 ++ beq 3f ++ bilinear_interpolate_last_pixel ++3: ++ pop {r4, r5, r6, r7} ++ bx lr ++ ++ .unreq OUT ++ .unreq TOP ++ .unreq BOTTOM ++ .unreq WT ++ .unreq WB ++ .unreq X ++ .unreq UX ++ .unreq WIDTH ++ .unreq TMP1 ++ .unreq TMP2 ++.endfunc +diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c +index 3e0c0d1..c7c0254 100644 +--- a/pixman/pixman-arm-neon.c ++++ b/pixman/pixman-arm-neon.c +@@ -232,6 +232,47 @@ pixman_blt_neon (uint32_t *src_bits, + } + } + ++void ++pixman_scaled_bilinear_scanline_8888_8888_SRC_asm_neon (uint32_t * out, ++ const uint32_t * top, ++ const uint32_t * bottom, ++ int wt, ++ int wb, ++ pixman_fixed_t x, ++ pixman_fixed_t ux, ++ int width); ++ ++static force_inline void ++scaled_bilinear_scanline_neon_8888_8888_SRC (uint32_t * dst, ++ const uint32_t * mask, ++ const uint32_t * src_top, ++ const uint32_t * src_bottom, ++ int32_t w, ++ int wt, ++ int wb, ++ pixman_fixed_t vx, ++ pixman_fixed_t unit_x, ++ pixman_fixed_t max_vx, ++ pixman_bool_t zero_src) ++{ ++ pixman_scaled_bilinear_scanline_8888_8888_SRC_asm_neon (dst, src_top, ++ src_bottom, wt, wb, ++ vx, unit_x, w); ++} ++ ++FAST_BILINEAR_MAINLOOP_COMMON (neon_8888_8888_cover_SRC, ++ scaled_bilinear_scanline_neon_8888_8888_SRC, ++ uint32_t, uint32_t, uint32_t, ++ COVER, FALSE, FALSE) ++FAST_BILINEAR_MAINLOOP_COMMON (neon_8888_8888_pad_SRC, ++ scaled_bilinear_scanline_neon_8888_8888_SRC, ++ uint32_t, uint32_t, uint32_t, ++ PAD, FALSE, FALSE) ++FAST_BILINEAR_MAINLOOP_COMMON (neon_8888_8888_none_SRC, ++ scaled_bilinear_scanline_neon_8888_8888_SRC, ++ uint32_t, uint32_t, uint32_t, ++ NONE, FALSE, FALSE) ++ + static const pixman_fast_path_t arm_neon_fast_paths[] = + { + PIXMAN_STD_FAST_PATH (SRC, r5g6b5, null, r5g6b5, neon_composite_src_0565_0565), +@@ -343,6 +384,10 @@ static const pixman_fast_path_t arm_neon_fast_paths[] = + PIXMAN_ARM_SIMPLE_NEAREST_A8_MASK_FAST_PATH (OVER, r5g6b5, r5g6b5, neon_0565_8_0565), + PIXMAN_ARM_SIMPLE_NEAREST_A8_MASK_FAST_PATH (OVER, b5g6r5, b5g6r5, neon_0565_8_0565), + ++ SIMPLE_BILINEAR_FAST_PATH (SRC, a8r8g8b8, a8r8g8b8, neon_8888_8888), ++ SIMPLE_BILINEAR_FAST_PATH (SRC, a8r8g8b8, x8r8g8b8, neon_8888_8888), ++ SIMPLE_BILINEAR_FAST_PATH (SRC, x8r8g8b8, x8r8g8b8, neon_8888_8888), ++ + { PIXMAN_OP_NONE }, + }; + +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0011-test-In-image_endian_swap-use-pixman_image_get_forma.patch b/recipes/xorg-lib/pixman-0.21.6/0011-test-In-image_endian_swap-use-pixman_image_get_forma.patch new file mode 100644 index 0000000000..97618606b1 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0011-test-In-image_endian_swap-use-pixman_image_get_forma.patch @@ -0,0 +1,156 @@ +From 84f3c5a71a2de1a96dcf0c7f9ab0a8ee1b1b158f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= +Date: Mon, 7 Mar 2011 13:45:54 -0500 +Subject: [PATCH 11/40] test: In image_endian_swap() use pixman_image_get_format() to get the bpp. + +There is no reason to pass in the bpp as an argument; it can be gotten +directly from the image. +--- + test/affine-test.c | 6 +++--- + test/blitters-test.c | 4 ++-- + test/composite-traps-test.c | 2 +- + test/scaling-test.c | 6 +++--- + test/utils.c | 9 +++++++-- + test/utils.h | 2 +- + 6 files changed, 17 insertions(+), 12 deletions(-) + +diff --git a/test/affine-test.c b/test/affine-test.c +index b7a1fa6..ed8000c 100644 +--- a/test/affine-test.c ++++ b/test/affine-test.c +@@ -95,8 +95,8 @@ test_composite (int testnum, + dst_img = pixman_image_create_bits ( + dst_fmt, dst_width, dst_height, dstbuf, dst_stride); + +- image_endian_swap (src_img, src_bpp * 8); +- image_endian_swap (dst_img, dst_bpp * 8); ++ image_endian_swap (src_img); ++ image_endian_swap (dst_img); + + pixman_transform_init_identity (&transform); + +@@ -251,7 +251,7 @@ test_composite (int testnum, + dstbuf[i] &= 0xFFFFFF; + } + +- image_endian_swap (dst_img, dst_bpp * 8); ++ image_endian_swap (dst_img); + + if (verbose) + { +diff --git a/test/blitters-test.c b/test/blitters-test.c +index 42181ef..63e7cb3 100644 +--- a/test/blitters-test.c ++++ b/test/blitters-test.c +@@ -61,7 +61,7 @@ create_random_image (pixman_format_code_t *allowed_formats, + pixman_image_set_indexed (img, &(y_palette[PIXMAN_FORMAT_BPP (fmt)])); + } + +- image_endian_swap (img, PIXMAN_FORMAT_BPP (fmt)); ++ image_endian_swap (img); + + if (used_fmt) *used_fmt = fmt; + return img; +@@ -101,7 +101,7 @@ free_random_image (uint32_t initcrc, + /* swap endiannes in order to provide identical results on both big + * and litte endian systems + */ +- image_endian_swap (img, PIXMAN_FORMAT_BPP (fmt)); ++ image_endian_swap (img); + crc32 = compute_crc32 (initcrc, data, stride * height); + } + +diff --git a/test/composite-traps-test.c b/test/composite-traps-test.c +index 8f32778..298537d 100644 +--- a/test/composite-traps-test.c ++++ b/test/composite-traps-test.c +@@ -218,7 +218,7 @@ test_composite (int testnum, + dst_bits[i] &= 0xFFFFFF; + } + +- image_endian_swap (dst_img, dst_bpp * 8); ++ image_endian_swap (dst_img); + + if (verbose) + { +diff --git a/test/scaling-test.c b/test/scaling-test.c +index dbb9d39..82370f7 100644 +--- a/test/scaling-test.c ++++ b/test/scaling-test.c +@@ -140,8 +140,8 @@ test_composite (int testnum, + dst_img = pixman_image_create_bits ( + dst_fmt, dst_width, dst_height, dstbuf, dst_stride); + +- image_endian_swap (src_img, src_bpp * 8); +- image_endian_swap (dst_img, dst_bpp * 8); ++ image_endian_swap (src_img); ++ image_endian_swap (dst_img); + + if (lcg_rand_n (4) > 0) + { +@@ -330,7 +330,7 @@ test_composite (int testnum, + dstbuf[i] &= 0xFFFFFF; + } + +- image_endian_swap (dst_img, dst_bpp * 8); ++ image_endian_swap (dst_img); + + if (verbose) + { +diff --git a/test/utils.c b/test/utils.c +index 2f21398..4bf02e1 100644 +--- a/test/utils.c ++++ b/test/utils.c +@@ -133,11 +133,12 @@ compute_crc32 (uint32_t in_crc32, + /* perform endian conversion of pixel data + */ + void +-image_endian_swap (pixman_image_t *img, int bpp) ++image_endian_swap (pixman_image_t *img) + { + int stride = pixman_image_get_stride (img); + uint32_t *data = pixman_image_get_data (img); + int height = pixman_image_get_height (img); ++ int bpp = PIXMAN_FORMAT_BPP (pixman_image_get_format (img)); + int i, j; + + /* swap bytes only on big endian systems */ +@@ -145,10 +146,13 @@ image_endian_swap (pixman_image_t *img, int bpp) + if (*(volatile uint8_t *)&endian_check_var != 0x12) + return; + ++ if (bpp == 8) ++ return; ++ + for (i = 0; i < height; i++) + { + uint8_t *line_data = (uint8_t *)data + stride * i; +- /* swap bytes only for 16, 24 and 32 bpp for now */ ++ + switch (bpp) + { + case 1: +@@ -208,6 +212,7 @@ image_endian_swap (pixman_image_t *img, int bpp) + } + break; + default: ++ assert (FALSE); + break; + } + } +diff --git a/test/utils.h b/test/utils.h +index 9c7bdb1..a5183f7 100644 +--- a/test/utils.h ++++ b/test/utils.h +@@ -60,7 +60,7 @@ compute_crc32 (uint32_t in_crc32, + /* perform endian conversion of pixel data + */ + void +-image_endian_swap (pixman_image_t *img, int bpp); ++image_endian_swap (pixman_image_t *img); + + /* Allocate memory that is bounded by protected pages, + * so that out-of-bounds access will cause segfaults +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0012-test-Do-endian-swapping-of-the-source-and-destinatio.patch b/recipes/xorg-lib/pixman-0.21.6/0012-test-Do-endian-swapping-of-the-source-and-destinatio.patch new file mode 100644 index 0000000000..9fc4cdde07 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0012-test-Do-endian-swapping-of-the-source-and-destinatio.patch @@ -0,0 +1,36 @@ +From 84e361c8e357e26f299213fbeefe64c73447b116 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= +Date: Fri, 4 Mar 2011 15:51:18 -0500 +Subject: [PATCH 12/40] test: Do endian swapping of the source and destination images. + +Otherwise the test fails on big endian. Fix for bug 34767, reported by +Siarhei Siamashka. +--- + test/composite-traps-test.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/test/composite-traps-test.c b/test/composite-traps-test.c +index 298537d..cf30281 100644 +--- a/test/composite-traps-test.c ++++ b/test/composite-traps-test.c +@@ -139,6 +139,8 @@ test_composite (int testnum, + pixman_image_set_source_clipping (src_img, 1); + pixman_region_fini (&clip); + } ++ ++ image_endian_swap (src_img); + } + + /* Create destination image */ +@@ -157,6 +159,8 @@ test_composite (int testnum, + + dst_img = pixman_image_create_bits ( + dst_format, dst_width, dst_height, dst_bits, dst_stride); ++ ++ image_endian_swap (dst_img); + } + + /* Create traps */ +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0013-ARM-use-prefetch-in-nearest-scaled-src_0565_0565.patch b/recipes/xorg-lib/pixman-0.21.6/0013-ARM-use-prefetch-in-nearest-scaled-src_0565_0565.patch new file mode 100644 index 0000000000..9d43404898 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0013-ARM-use-prefetch-in-nearest-scaled-src_0565_0565.patch @@ -0,0 +1,77 @@ +From bb3d1b67fd0f42ae00af811c624ea1c44541034d Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Sun, 6 Mar 2011 16:17:12 +0200 +Subject: [PATCH 13/40] ARM: use prefetch in nearest scaled 'src_0565_0565' + +Benchmark on ARM Cortex-A8 r1p3 @500MHz, 32-bit LPDDR @166MHz: + Microbenchmark (scaling 2000x2000 image with scale factor close to 1x): + before: op=1, src=10020565, dst=10020565, speed=75.02 MPix/s + after: op=1, src=10020565, dst=10020565, speed=73.63 MPix/s + +Benchmark on ARM Cortex-A8 r2p2 @1GHz, 32-bit LPDDR @200MHz: + Microbenchmark (scaling 2000x2000 image with scale factor close to 1x): + before: op=1, src=10020565, dst=10020565, speed=176.12 MPix/s + after: op=1, src=10020565, dst=10020565, speed=267.50 MPix/s +--- + pixman/pixman-arm-simd-asm.S | 27 +++++++++++++++++++++++++-- + 1 files changed, 25 insertions(+), 2 deletions(-) + +diff --git a/pixman/pixman-arm-simd-asm.S b/pixman/pixman-arm-simd-asm.S +index 7567700..dd1366d 100644 +--- a/pixman/pixman-arm-simd-asm.S ++++ b/pixman/pixman-arm-simd-asm.S +@@ -348,6 +348,7 @@ pixman_asm_function pixman_scaled_nearest_scanline_0565_0565_SRC_asm_armv6 + TMP1 .req r4 + TMP2 .req r5 + VXMASK .req r6 ++ PF_OFFS .req r7 + + ldr UNIT_X, [sp] + push {r4, r5, r6, r7} +@@ -366,12 +367,33 @@ pixman_asm_function pixman_scaled_nearest_scanline_0565_0565_SRC_asm_armv6 + strh TMP2, [DST], #2 + .endm + ++ /* ++ * stop prefetch before reaching the end of scanline (a good behaving ++ * value selected based on some benchmarks with short scanlines) ++ */ ++ #define PREFETCH_BRAKING_DISTANCE 32 ++ + /* now do the scaling */ + and TMP1, VXMASK, VX, lsr #15 + add VX, VX, UNIT_X +- subs W, #4 ++ subs W, #(8 + PREFETCH_BRAKING_DISTANCE) ++ blt 2f ++ /* set prefetch distance to 80 pixels ahead */ ++ add PF_OFFS, VX, UNIT_X, lsl #6 ++ add PF_OFFS, PF_OFFS, UNIT_X, lsl #4 ++1: /* main loop, process 8 pixels per iteration with prefetch */ ++ subs W, W, #8 ++ add PF_OFFS, UNIT_X, lsl #3 ++ scale_2_pixels ++ scale_2_pixels ++ scale_2_pixels ++ scale_2_pixels ++ pld [SRC, PF_OFFS, lsr #15] ++ bge 1b ++2: ++ subs W, #(4 - 8 - PREFETCH_BRAKING_DISTANCE) + blt 2f +-1: /* main loop, process 4 pixels per iteration */ ++1: /* process the remaining pixels */ + scale_2_pixels + scale_2_pixels + subs W, W, #4 +@@ -394,6 +416,7 @@ pixman_asm_function pixman_scaled_nearest_scanline_0565_0565_SRC_asm_armv6 + .unreq TMP1 + .unreq TMP2 + .unreq VXMASK ++ .unreq PF_OFFS + /* return */ + pop {r4, r5, r6, r7} + bx lr +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0014-ARM-common-macro-for-nearest-scaling-fast-paths.patch b/recipes/xorg-lib/pixman-0.21.6/0014-ARM-common-macro-for-nearest-scaling-fast-paths.patch new file mode 100644 index 0000000000..115d5170c6 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0014-ARM-common-macro-for-nearest-scaling-fast-paths.patch @@ -0,0 +1,131 @@ +From f3e17872f5522e25da8e32de83e62bee8cc198d7 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Mon, 7 Mar 2011 03:10:43 +0200 +Subject: [PATCH 14/40] ARM: common macro for nearest scaling fast paths + +The code of nearest scaled 'src_0565_0565' function was generalized +and moved to a common macro, so that it can be reused for other +fast paths. +--- + pixman/pixman-arm-simd-asm.S | 60 +++++++++++++++++++++++++---------------- + 1 files changed, 36 insertions(+), 24 deletions(-) + +diff --git a/pixman/pixman-arm-simd-asm.S b/pixman/pixman-arm-simd-asm.S +index dd1366d..a9775e2 100644 +--- a/pixman/pixman-arm-simd-asm.S ++++ b/pixman/pixman-arm-simd-asm.S +@@ -331,15 +331,29 @@ pixman_asm_function pixman_composite_over_n_8_8888_asm_armv6 + .endfunc + + /* +- * Note: This function is only using armv4t instructions (not even armv6), ++ * Note: This code is only using armv5te instructions (not even armv6), + * but is scheduled for ARM Cortex-A8 pipeline. So it might need to + * be split into a few variants, tuned for each microarchitecture. + * + * TODO: In order to get good performance on ARM9/ARM11 cores (which don't + * have efficient write combining), it needs to be changed to use 16-byte + * aligned writes using STM instruction. ++ * ++ * Nearest scanline scaler macro template uses the following arguments: ++ * fname - name of the function to generate ++ * bpp_shift - (1 << bpp_shift) is the size of pixel in bytes ++ * t - type suffix for LDR/STR instructions ++ * prefetch_distance - prefetch in the source image by that many ++ * pixels ahead ++ * prefetch_braking_distance - stop prefetching when that many pixels are ++ * remaining before the end of scanline + */ +-pixman_asm_function pixman_scaled_nearest_scanline_0565_0565_SRC_asm_armv6 ++ ++.macro generate_nearest_scanline_func fname, bpp_shift, t, \ ++ prefetch_distance, \ ++ prefetch_braking_distance ++ ++pixman_asm_function fname + W .req r0 + DST .req r1 + SRC .req r2 +@@ -352,35 +366,29 @@ pixman_asm_function pixman_scaled_nearest_scanline_0565_0565_SRC_asm_armv6 + + ldr UNIT_X, [sp] + push {r4, r5, r6, r7} +- mvn VXMASK, #1 ++ mvn VXMASK, #((1 << bpp_shift) - 1) + + /* define helper macro */ + .macro scale_2_pixels +- ldrh TMP1, [SRC, TMP1] +- and TMP2, VXMASK, VX, lsr #15 ++ ldr&t TMP1, [SRC, TMP1] ++ and TMP2, VXMASK, VX, lsr #(16 - bpp_shift) + add VX, VX, UNIT_X +- strh TMP1, [DST], #2 ++ str&t TMP1, [DST], #(1 << bpp_shift) + +- ldrh TMP2, [SRC, TMP2] +- and TMP1, VXMASK, VX, lsr #15 ++ ldr&t TMP2, [SRC, TMP2] ++ and TMP1, VXMASK, VX, lsr #(16 - bpp_shift) + add VX, VX, UNIT_X +- strh TMP2, [DST], #2 ++ str&t TMP2, [DST], #(1 << bpp_shift) + .endm + +- /* +- * stop prefetch before reaching the end of scanline (a good behaving +- * value selected based on some benchmarks with short scanlines) +- */ +- #define PREFETCH_BRAKING_DISTANCE 32 +- + /* now do the scaling */ +- and TMP1, VXMASK, VX, lsr #15 ++ and TMP1, VXMASK, VX, lsr #(16 - bpp_shift) + add VX, VX, UNIT_X +- subs W, #(8 + PREFETCH_BRAKING_DISTANCE) ++ subs W, W, #(8 + prefetch_braking_distance) + blt 2f +- /* set prefetch distance to 80 pixels ahead */ +- add PF_OFFS, VX, UNIT_X, lsl #6 +- add PF_OFFS, PF_OFFS, UNIT_X, lsl #4 ++ /* calculate prefetch offset */ ++ mov PF_OFFS, #prefetch_distance ++ mla PF_OFFS, UNIT_X, PF_OFFS, VX + 1: /* main loop, process 8 pixels per iteration with prefetch */ + subs W, W, #8 + add PF_OFFS, UNIT_X, lsl #3 +@@ -388,10 +396,10 @@ pixman_asm_function pixman_scaled_nearest_scanline_0565_0565_SRC_asm_armv6 + scale_2_pixels + scale_2_pixels + scale_2_pixels +- pld [SRC, PF_OFFS, lsr #15] ++ pld [SRC, PF_OFFS, lsr #(16 - bpp_shift)] + bge 1b + 2: +- subs W, #(4 - 8 - PREFETCH_BRAKING_DISTANCE) ++ subs W, W, #(4 - 8 - prefetch_braking_distance) + blt 2f + 1: /* process the remaining pixels */ + scale_2_pixels +@@ -404,8 +412,8 @@ pixman_asm_function pixman_scaled_nearest_scanline_0565_0565_SRC_asm_armv6 + scale_2_pixels + 2: + tst W, #1 +- ldrneh TMP1, [SRC, TMP1] +- strneh TMP1, [DST], #2 ++ ldrne&t TMP1, [SRC, TMP1] ++ strne&t TMP1, [DST] + /* cleanup helper macro */ + .purgem scale_2_pixels + .unreq DST +@@ -421,3 +429,7 @@ pixman_asm_function pixman_scaled_nearest_scanline_0565_0565_SRC_asm_armv6 + pop {r4, r5, r6, r7} + bx lr + .endfunc ++.endm ++ ++generate_nearest_scanline_func \ ++ pixman_scaled_nearest_scanline_0565_0565_SRC_asm_armv6, 1, h, 80, 32 +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0015-ARM-assembly-optimized-nearest-scaled-src_8888_8888.patch b/recipes/xorg-lib/pixman-0.21.6/0015-ARM-assembly-optimized-nearest-scaled-src_8888_8888.patch new file mode 100644 index 0000000000..cc3a68f06c --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0015-ARM-assembly-optimized-nearest-scaled-src_8888_8888.patch @@ -0,0 +1,60 @@ +From 5921c17639fe5fdc595c850e3347281c1c8746ba Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Sun, 6 Mar 2011 22:16:32 +0200 +Subject: [PATCH 15/40] ARM: assembly optimized nearest scaled 'src_8888_8888' + +Benchmark on ARM Cortex-A8 r1p3 @500MHz, 32-bit LPDDR @166MHz: + Microbenchmark (scaling 2000x2000 image with scale factor close to 1x): + before: op=1, src=20028888, dst=20028888, speed=44.36 MPix/s + after: op=1, src=20028888, dst=20028888, speed=39.79 MPix/s + +Benchmark on ARM Cortex-A8 r2p2 @1GHz, 32-bit LPDDR @200MHz: + Microbenchmark (scaling 2000x2000 image with scale factor close to 1x): + before: op=1, src=20028888, dst=20028888, speed=102.36 MPix/s + after: op=1, src=20028888, dst=20028888, speed=163.12 MPix/s +--- + pixman/pixman-arm-simd-asm.S | 3 +++ + pixman/pixman-arm-simd.c | 9 +++++++++ + 2 files changed, 12 insertions(+), 0 deletions(-) + +diff --git a/pixman/pixman-arm-simd-asm.S b/pixman/pixman-arm-simd-asm.S +index a9775e2..858c690 100644 +--- a/pixman/pixman-arm-simd-asm.S ++++ b/pixman/pixman-arm-simd-asm.S +@@ -433,3 +433,6 @@ pixman_asm_function fname + + generate_nearest_scanline_func \ + pixman_scaled_nearest_scanline_0565_0565_SRC_asm_armv6, 1, h, 80, 32 ++ ++generate_nearest_scanline_func \ ++ pixman_scaled_nearest_scanline_8888_8888_SRC_asm_armv6, 2, , 48, 32 +diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c +index 6bbc109..a66f8df 100644 +--- a/pixman/pixman-arm-simd.c ++++ b/pixman/pixman-arm-simd.c +@@ -389,6 +389,8 @@ PIXMAN_ARM_BIND_FAST_PATH_N_MASK_DST (SKIP_ZERO_SRC, armv6, over_n_8_8888, + + PIXMAN_ARM_BIND_SCALED_NEAREST_SRC_DST (armv6, 0565_0565, SRC, + uint16_t, uint16_t) ++PIXMAN_ARM_BIND_SCALED_NEAREST_SRC_DST (armv6, 8888_8888, SRC, ++ uint32_t, uint32_t) + + static const pixman_fast_path_t arm_simd_fast_paths[] = + { +@@ -411,6 +413,13 @@ static const pixman_fast_path_t arm_simd_fast_paths[] = + PIXMAN_ARM_SIMPLE_NEAREST_FAST_PATH (SRC, r5g6b5, r5g6b5, armv6_0565_0565), + PIXMAN_ARM_SIMPLE_NEAREST_FAST_PATH (SRC, b5g6r5, b5g6r5, armv6_0565_0565), + ++ PIXMAN_ARM_SIMPLE_NEAREST_FAST_PATH (SRC, a8r8g8b8, a8r8g8b8, armv6_8888_8888), ++ PIXMAN_ARM_SIMPLE_NEAREST_FAST_PATH (SRC, a8r8g8b8, x8r8g8b8, armv6_8888_8888), ++ PIXMAN_ARM_SIMPLE_NEAREST_FAST_PATH (SRC, x8r8g8b8, x8r8g8b8, armv6_8888_8888), ++ PIXMAN_ARM_SIMPLE_NEAREST_FAST_PATH (SRC, a8b8g8r8, a8b8g8r8, armv6_8888_8888), ++ PIXMAN_ARM_SIMPLE_NEAREST_FAST_PATH (SRC, a8b8g8r8, x8b8g8r8, armv6_8888_8888), ++ PIXMAN_ARM_SIMPLE_NEAREST_FAST_PATH (SRC, x8b8g8r8, x8b8g8r8, armv6_8888_8888), ++ + { PIXMAN_OP_NONE }, + }; + +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0016-ARM-new-bilinear-fast-path-template-macro-in-pixman-.patch b/recipes/xorg-lib/pixman-0.21.6/0016-ARM-new-bilinear-fast-path-template-macro-in-pixman-.patch new file mode 100644 index 0000000000..d8559b0c61 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0016-ARM-new-bilinear-fast-path-template-macro-in-pixman-.patch @@ -0,0 +1,130 @@ +From 66f4ee1b3bccf4516433d61dbf2035551a712fa2 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Wed, 9 Mar 2011 10:59:46 +0200 +Subject: [PATCH 16/40] ARM: new bilinear fast path template macro in 'pixman-arm-common.h' + +It can be reused in different ARM NEON bilinear scaling fast path functions. +--- + pixman/pixman-arm-common.h | 45 ++++++++++++++++++++++++++++++++++++++++++++ + pixman/pixman-arm-neon.c | 44 ++---------------------------------------- + 2 files changed, 48 insertions(+), 41 deletions(-) + +diff --git a/pixman/pixman-arm-common.h b/pixman/pixman-arm-common.h +index 9b1322b..c3bf986 100644 +--- a/pixman/pixman-arm-common.h ++++ b/pixman/pixman-arm-common.h +@@ -361,4 +361,49 @@ FAST_NEAREST_MAINLOOP_COMMON (cputype##_##name##_pad_##op, \ + SIMPLE_NEAREST_A8_MASK_FAST_PATH_NONE (op,s,d,func), \ + SIMPLE_NEAREST_A8_MASK_FAST_PATH_PAD (op,s,d,func) + ++/*****************************************************************************/ ++ ++#define PIXMAN_ARM_BIND_SCALED_BILINEAR_SRC_DST(flags, cputype, name, op, \ ++ src_type, dst_type) \ ++void \ ++pixman_scaled_bilinear_scanline_##name##_##op##_asm_##cputype ( \ ++ dst_type * dst, \ ++ const src_type * top, \ ++ const src_type * bottom, \ ++ int wt, \ ++ int wb, \ ++ pixman_fixed_t x, \ ++ pixman_fixed_t ux, \ ++ int width); \ ++ \ ++static force_inline void \ ++scaled_bilinear_scanline_##cputype##_##name##_##op ( \ ++ dst_type * dst, \ ++ const uint32_t * mask, \ ++ const src_type * src_top, \ ++ const src_type * src_bottom, \ ++ int32_t w, \ ++ int wt, \ ++ int wb, \ ++ pixman_fixed_t vx, \ ++ pixman_fixed_t unit_x, \ ++ pixman_fixed_t max_vx, \ ++ pixman_bool_t zero_src) \ ++{ \ ++ if ((flags & SKIP_ZERO_SRC) && zero_src) \ ++ return; \ ++ pixman_scaled_bilinear_scanline_##name##_##op##_asm_##cputype ( \ ++ dst, src_top, src_bottom, wt, wb, vx, unit_x, w); \ ++} \ ++ \ ++FAST_BILINEAR_MAINLOOP_COMMON (cputype##_##name##_cover_##op, \ ++ scaled_bilinear_scanline_##cputype##_##name##_##op, \ ++ src_type, uint32_t, dst_type, COVER, FALSE, FALSE) \ ++FAST_BILINEAR_MAINLOOP_COMMON (cputype##_##name##_none_##op, \ ++ scaled_bilinear_scanline_##cputype##_##name##_##op, \ ++ src_type, uint32_t, dst_type, NONE, FALSE, FALSE) \ ++FAST_BILINEAR_MAINLOOP_COMMON (cputype##_##name##_pad_##op, \ ++ scaled_bilinear_scanline_##cputype##_##name##_##op, \ ++ src_type, uint32_t, dst_type, PAD, FALSE, FALSE) ++ + #endif +diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c +index c7c0254..98ad5f2 100644 +--- a/pixman/pixman-arm-neon.c ++++ b/pixman/pixman-arm-neon.c +@@ -127,6 +127,9 @@ PIXMAN_ARM_BIND_SCALED_NEAREST_SRC_A8_DST (SKIP_ZERO_SRC, neon, 8888_8_0565, + PIXMAN_ARM_BIND_SCALED_NEAREST_SRC_A8_DST (SKIP_ZERO_SRC, neon, 0565_8_0565, + OVER, uint16_t, uint16_t) + ++PIXMAN_ARM_BIND_SCALED_BILINEAR_SRC_DST (0, neon, 8888_8888, SRC, ++ uint32_t, uint32_t) ++ + void + pixman_composite_src_n_8_asm_neon (int32_t w, + int32_t h, +@@ -232,47 +235,6 @@ pixman_blt_neon (uint32_t *src_bits, + } + } + +-void +-pixman_scaled_bilinear_scanline_8888_8888_SRC_asm_neon (uint32_t * out, +- const uint32_t * top, +- const uint32_t * bottom, +- int wt, +- int wb, +- pixman_fixed_t x, +- pixman_fixed_t ux, +- int width); +- +-static force_inline void +-scaled_bilinear_scanline_neon_8888_8888_SRC (uint32_t * dst, +- const uint32_t * mask, +- const uint32_t * src_top, +- const uint32_t * src_bottom, +- int32_t w, +- int wt, +- int wb, +- pixman_fixed_t vx, +- pixman_fixed_t unit_x, +- pixman_fixed_t max_vx, +- pixman_bool_t zero_src) +-{ +- pixman_scaled_bilinear_scanline_8888_8888_SRC_asm_neon (dst, src_top, +- src_bottom, wt, wb, +- vx, unit_x, w); +-} +- +-FAST_BILINEAR_MAINLOOP_COMMON (neon_8888_8888_cover_SRC, +- scaled_bilinear_scanline_neon_8888_8888_SRC, +- uint32_t, uint32_t, uint32_t, +- COVER, FALSE, FALSE) +-FAST_BILINEAR_MAINLOOP_COMMON (neon_8888_8888_pad_SRC, +- scaled_bilinear_scanline_neon_8888_8888_SRC, +- uint32_t, uint32_t, uint32_t, +- PAD, FALSE, FALSE) +-FAST_BILINEAR_MAINLOOP_COMMON (neon_8888_8888_none_SRC, +- scaled_bilinear_scanline_neon_8888_8888_SRC, +- uint32_t, uint32_t, uint32_t, +- NONE, FALSE, FALSE) +- + static const pixman_fast_path_t arm_neon_fast_paths[] = + { + PIXMAN_STD_FAST_PATH (SRC, r5g6b5, null, r5g6b5, neon_composite_src_0565_0565), +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0017-ARM-NEON-common-macro-template-for-bilinear-scanline.patch b/recipes/xorg-lib/pixman-0.21.6/0017-ARM-NEON-common-macro-template-for-bilinear-scanline.patch new file mode 100644 index 0000000000..6efc40f6cb --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0017-ARM-NEON-common-macro-template-for-bilinear-scanline.patch @@ -0,0 +1,271 @@ +From 34098dba6763afd3636a14f9c2a079ab08f23b2d Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Wed, 9 Mar 2011 11:34:15 +0200 +Subject: [PATCH 17/40] ARM: NEON: common macro template for bilinear scanline scalers + +This allows to generate bilinear scanline scaling functions targeting +various source and destination color formats. Right now a8r8g8b8/x8r8g8b8 +and r5g6b5 color formats are supported. More formats can be added if needed. +--- + pixman/pixman-arm-neon-asm.S | 222 ++++++++++++++++++++++++++++++++++++++++++ + pixman/pixman-arm-neon-asm.h | 17 +++ + 2 files changed, 239 insertions(+), 0 deletions(-) + +diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S +index c168e10..f3784f5 100644 +--- a/pixman/pixman-arm-neon-asm.S ++++ b/pixman/pixman-arm-neon-asm.S +@@ -2588,3 +2588,225 @@ pixman_asm_function pixman_scaled_bilinear_scanline_8888_8888_SRC_asm_neon + .unreq TMP1 + .unreq TMP2 + .endfunc ++ ++.purgem bilinear_interpolate_last_pixel ++.purgem bilinear_interpolate_two_pixels ++.purgem bilinear_interpolate_four_pixels ++ ++/* ++ * Bilinear scaling support code which tries to provide pixel fetching, color ++ * format conversion, and interpolation as separate macros which can be used ++ * as the basic building blocks for constructing bilinear scanline functions. ++ */ ++ ++.macro bilinear_load_8888 reg1, reg2, tmp ++ mov TMP2, X, asr #16 ++ add X, X, UX ++ add TMP1, TOP, TMP2, asl #2 ++ add TMP2, BOTTOM, TMP2, asl #2 ++ vld1.32 {reg1}, [TMP1] ++ vld1.32 {reg2}, [TMP2] ++.endm ++ ++.macro bilinear_load_0565 reg1, reg2, tmp ++ mov TMP2, X, asr #16 ++ add X, X, UX ++ add TMP1, TOP, TMP2, asl #1 ++ add TMP2, BOTTOM, TMP2, asl #1 ++ vld1.32 {reg2[0]}, [TMP1] ++ vld1.32 {reg2[1]}, [TMP2] ++ convert_four_0565_to_x888_packed reg2, reg1, reg2, tmp ++.endm ++ ++.macro bilinear_store_8888 numpix, tmp1, tmp2 ++.if numpix == 4 ++ vst1.32 {d0, d1}, [OUT]! ++.elseif numpix == 2 ++ vst1.32 {d0}, [OUT]! ++.elseif numpix == 1 ++ vst1.32 {d0[0]}, [OUT, :32]! ++.else ++ .error bilinear_store_8888 numpix is unsupported ++.endif ++.endm ++ ++.macro bilinear_store_0565 numpix, tmp1, tmp2 ++ vuzp.u8 d0, d1 ++ vuzp.u8 d2, d3 ++ vuzp.u8 d1, d3 ++ vuzp.u8 d0, d2 ++ convert_8888_to_0565 d2, d1, d0, q1, tmp1, tmp2 ++.if numpix == 4 ++ vst1.16 {d2}, [OUT]! ++.elseif numpix == 2 ++ vst1.32 {d2[0]}, [OUT]! ++.elseif numpix == 1 ++ vst1.16 {d2[0]}, [OUT]! ++.else ++ .error bilinear_store_0565 numpix is unsupported ++.endif ++.endm ++ ++.macro bilinear_interpolate_last_pixel src_fmt, dst_fmt ++ bilinear_load_&src_fmt d0, d1, d2 ++ vmull.u8 q1, d0, d28 ++ vmlal.u8 q1, d1, d29 ++ vshr.u16 d30, d24, #8 ++ /* 4 cycles bubble */ ++ vshll.u16 q0, d2, #8 ++ vmlsl.u16 q0, d2, d30 ++ vmlal.u16 q0, d3, d30 ++ /* 5 cycles bubble */ ++ vshrn.u32 d0, q0, #16 ++ /* 3 cycles bubble */ ++ vmovn.u16 d0, q0 ++ /* 1 cycle bubble */ ++ bilinear_store_&dst_fmt 1, q2, q3 ++.endm ++ ++.macro bilinear_interpolate_two_pixels src_fmt, dst_fmt ++ bilinear_load_&src_fmt d0, d1, d2 ++ vmull.u8 q1, d0, d28 ++ vmlal.u8 q1, d1, d29 ++ bilinear_load_&src_fmt d20, d21, d22 ++ vmull.u8 q11, d20, d28 ++ vmlal.u8 q11, d21, d29 ++ vshr.u16 q15, q12, #8 ++ vadd.u16 q12, q12, q13 ++ vshll.u16 q0, d2, #8 ++ vmlsl.u16 q0, d2, d30 ++ vmlal.u16 q0, d3, d30 ++ vshll.u16 q10, d22, #8 ++ vmlsl.u16 q10, d22, d31 ++ vmlal.u16 q10, d23, d31 ++ vshrn.u32 d30, q0, #16 ++ vshrn.u32 d31, q10, #16 ++ vmovn.u16 d0, q15 ++ bilinear_store_&dst_fmt 2, q2, q3 ++.endm ++ ++.macro bilinear_interpolate_four_pixels src_fmt, dst_fmt ++ bilinear_load_&src_fmt d0, d1, d2 ++ vmull.u8 q1, d0, d28 ++ vmlal.u8 q1, d1, d29 ++ bilinear_load_&src_fmt d20, d21, d22 ++ vmull.u8 q11, d20, d28 ++ vmlal.u8 q11, d21, d29 ++ bilinear_load_&src_fmt d4, d5, d6 ++ vmull.u8 q3, d4, d28 ++ vmlal.u8 q3, d5, d29 ++ bilinear_load_&src_fmt d16, d17, d18 ++ vmull.u8 q9, d16, d28 ++ vmlal.u8 q9, d17, d29 ++ pld [TMP1, PF_OFFS] ++ vshr.u16 q15, q12, #8 ++ vadd.u16 q12, q12, q13 ++ vshll.u16 q0, d2, #8 ++ vmlsl.u16 q0, d2, d30 ++ vmlal.u16 q0, d3, d30 ++ vshll.u16 q10, d22, #8 ++ vmlsl.u16 q10, d22, d31 ++ vmlal.u16 q10, d23, d31 ++ vshr.u16 q15, q12, #8 ++ vshll.u16 q2, d6, #8 ++ vmlsl.u16 q2, d6, d30 ++ vmlal.u16 q2, d7, d30 ++ vshll.u16 q8, d18, #8 ++ pld [TMP2, PF_OFFS] ++ vmlsl.u16 q8, d18, d31 ++ vmlal.u16 q8, d19, d31 ++ vadd.u16 q12, q12, q13 ++ vshrn.u32 d0, q0, #16 ++ vshrn.u32 d1, q10, #16 ++ vshrn.u32 d4, q2, #16 ++ vshrn.u32 d5, q8, #16 ++ vmovn.u16 d0, q0 ++ vmovn.u16 d1, q2 ++ bilinear_store_&dst_fmt 4, q2, q3 ++.endm ++ ++/* ++ * Main template macro for generating NEON optimized bilinear scanline ++ * functions. ++ * ++ * TODO: use software pipelining and aligned writes to the destination buffer ++ * in order to improve performance ++ * ++ * Bilinear scanline scaler macro template uses the following arguments: ++ * fname - name of the function to generate ++ * src_fmt - source color format (8888 or 0565) ++ * dst_fmt - destination color format (8888 or 0565) ++ * bpp_shift - (1 << bpp_shift) is the size of source pixel in bytes ++ * prefetch_distance - prefetch in the source image by that many ++ * pixels ahead ++ */ ++ ++.macro generate_bilinear_scanline_func fname, src_fmt, dst_fmt, \ ++ bpp_shift, prefetch_distance ++ ++pixman_asm_function fname ++ OUT .req r0 ++ TOP .req r1 ++ BOTTOM .req r2 ++ WT .req r3 ++ WB .req r4 ++ X .req r5 ++ UX .req r6 ++ WIDTH .req ip ++ TMP1 .req r3 ++ TMP2 .req r4 ++ PF_OFFS .req r7 ++ TMP3 .req r8 ++ TMP4 .req r9 ++ ++ mov ip, sp ++ push {r4, r5, r6, r7, r8, r9} ++ mov PF_OFFS, #prefetch_distance ++ ldmia ip, {WB, X, UX, WIDTH} ++ mul PF_OFFS, PF_OFFS, UX ++ ++ cmp WIDTH, #0 ++ ble 3f ++ ++ vdup.u16 q12, X ++ vdup.u16 q13, UX ++ vdup.u8 d28, WT ++ vdup.u8 d29, WB ++ vadd.u16 d25, d25, d26 ++ vadd.u16 q13, q13, q13 ++ ++ subs WIDTH, WIDTH, #4 ++ blt 1f ++ mov PF_OFFS, PF_OFFS, asr #(16 - bpp_shift) ++0: ++ bilinear_interpolate_four_pixels src_fmt, dst_fmt ++ subs WIDTH, WIDTH, #4 ++ bge 0b ++1: ++ tst WIDTH, #2 ++ beq 2f ++ bilinear_interpolate_two_pixels src_fmt, dst_fmt ++2: ++ tst WIDTH, #1 ++ beq 3f ++ bilinear_interpolate_last_pixel src_fmt, dst_fmt ++3: ++ pop {r4, r5, r6, r7, r8, r9} ++ bx lr ++ ++ .unreq OUT ++ .unreq TOP ++ .unreq BOTTOM ++ .unreq WT ++ .unreq WB ++ .unreq X ++ .unreq UX ++ .unreq WIDTH ++ .unreq TMP1 ++ .unreq TMP2 ++ .unreq PF_OFFS ++ .unreq TMP3 ++ .unreq TMP4 ++.endfunc ++ ++.endm +diff --git a/pixman/pixman-arm-neon-asm.h b/pixman/pixman-arm-neon-asm.h +index 24fa361..97adc6a 100644 +--- a/pixman/pixman-arm-neon-asm.h ++++ b/pixman/pixman-arm-neon-asm.h +@@ -1158,3 +1158,20 @@ fname: + vsri.u16 out, tmp1, #5 + vsri.u16 out, tmp2, #11 + .endm ++ ++/* ++ * Conversion of four r5g6b5 pixels (in) to four x8r8g8b8 pixels ++ * returned in (out0, out1) registers pair. Requires one temporary ++ * 64-bit register (tmp). 'out1' and 'in' may overlap, the original ++ * value from 'in' is lost ++ */ ++.macro convert_four_0565_to_x888_packed in, out0, out1, tmp ++ vshl.u16 out0, in, #5 /* G top 6 bits */ ++ vshl.u16 tmp, in, #11 /* B top 5 bits */ ++ vsri.u16 in, in, #5 /* R is ready in top bits */ ++ vsri.u16 out0, out0, #6 /* G is ready in top bits */ ++ vsri.u16 tmp, tmp, #5 /* B is ready in top bits */ ++ vshr.u16 out1, in, #8 /* R is in place */ ++ vsri.u16 out0, tmp, #8 /* G & B is in place */ ++ vzip.u16 out0, out1 /* everything is in place */ ++.endm +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0018-ARM-use-common-macro-template-for-bilinear-scaled-sr.patch b/recipes/xorg-lib/pixman-0.21.6/0018-ARM-use-common-macro-template-for-bilinear-scaled-sr.patch new file mode 100644 index 0000000000..245e536716 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0018-ARM-use-common-macro-template-for-bilinear-scaled-sr.patch @@ -0,0 +1,226 @@ +From 11a0c5badbc59ce967707ef836313cc98f8aec4e Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Wed, 9 Mar 2011 11:46:48 +0200 +Subject: [PATCH 18/40] ARM: use common macro template for bilinear scaled 'src_8888_8888' + +This is a cleanup for old and now duplicated code. The performance improvement +is mostly coming from the enabled use of software prefetch, but instructions +scheduling is also slightly better. + +Benchmark on ARM Cortex-A8 r2p2 @1GHz, 32-bit LPDDR @200MHz: + Microbenchmark (scaling 2000x2000 image with scale factor close to 1x): + before: op=1, src=20028888, dst=20028888, speed=53.24 MPix/s + after: op=1, src=20028888, dst=20028888, speed=74.36 MPix/s +--- + pixman/pixman-arm-neon-asm.S | 191 +----------------------------------------- + 1 files changed, 3 insertions(+), 188 deletions(-) + +diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S +index f3784f5..52dc444 100644 +--- a/pixman/pixman-arm-neon-asm.S ++++ b/pixman/pixman-arm-neon-asm.S +@@ -2405,194 +2405,6 @@ generate_composite_function_nearest_scanline \ + fname: + .endm + +-.macro bilinear_interpolate_last_pixel +- mov TMP1, X, asr #16 +- mov TMP2, X, asr #16 +- add TMP1, TOP, TMP1, asl #2 +- add TMP2, BOTTOM, TMP2, asl #2 +- vld1.32 {d0}, [TMP1] +- vshr.u16 d30, d24, #8 +- vld1.32 {d1}, [TMP2] +- vmull.u8 q1, d0, d28 +- vmlal.u8 q1, d1, d29 +- /* 5 cycles bubble */ +- vshll.u16 q0, d2, #8 +- vmlsl.u16 q0, d2, d30 +- vmlal.u16 q0, d3, d30 +- /* 5 cycles bubble */ +- vshrn.u32 d0, q0, #16 +- /* 3 cycles bubble */ +- vmovn.u16 d0, q0 +- /* 1 cycle bubble */ +- vst1.32 {d0[0]}, [OUT, :32]! +-.endm +- +-.macro bilinear_interpolate_two_pixels +- mov TMP1, X, asr #16 +- mov TMP2, X, asr #16 +- add X, X, UX +- add TMP1, TOP, TMP1, asl #2 +- add TMP2, BOTTOM, TMP2, asl #2 +- vld1.32 {d0}, [TMP1] +- vld1.32 {d1}, [TMP2] +- vmull.u8 q1, d0, d28 +- vmlal.u8 q1, d1, d29 +- mov TMP1, X, asr #16 +- mov TMP2, X, asr #16 +- add X, X, UX +- add TMP1, TOP, TMP1, asl #2 +- add TMP2, BOTTOM, TMP2, asl #2 +- vld1.32 {d20}, [TMP1] +- vld1.32 {d21}, [TMP2] +- vmull.u8 q11, d20, d28 +- vmlal.u8 q11, d21, d29 +- vshr.u16 q15, q12, #8 +- vadd.u16 q12, q12, q13 +- vshll.u16 q0, d2, #8 +- vmlsl.u16 q0, d2, d30 +- vmlal.u16 q0, d3, d30 +- vshll.u16 q10, d22, #8 +- vmlsl.u16 q10, d22, d31 +- vmlal.u16 q10, d23, d31 +- vshrn.u32 d30, q0, #16 +- vshrn.u32 d31, q10, #16 +- vmovn.u16 d0, q15 +- vst1.32 {d0}, [OUT]! +-.endm +- +-.macro bilinear_interpolate_four_pixels +- mov TMP1, X, asr #16 +- mov TMP2, X, asr #16 +- add X, X, UX +- add TMP1, TOP, TMP1, asl #2 +- add TMP2, BOTTOM, TMP2, asl #2 +- vld1.32 {d0}, [TMP1] +- vld1.32 {d1}, [TMP2] +- vmull.u8 q1, d0, d28 +- vmlal.u8 q1, d1, d29 +- mov TMP1, X, asr #16 +- mov TMP2, X, asr #16 +- add X, X, UX +- add TMP1, TOP, TMP1, asl #2 +- add TMP2, BOTTOM, TMP2, asl #2 +- vld1.32 {d20}, [TMP1] +- vld1.32 {d21}, [TMP2] +- vmull.u8 q11, d20, d28 +- vmlal.u8 q11, d21, d29 +- vshr.u16 q15, q12, #8 +- vadd.u16 q12, q12, q13 +- vshll.u16 q0, d2, #8 +- vmlsl.u16 q0, d2, d30 +- vmlal.u16 q0, d3, d30 +- vshll.u16 q10, d22, #8 +- vmlsl.u16 q10, d22, d31 +- vmlal.u16 q10, d23, d31 +- mov TMP1, X, asr #16 +- mov TMP2, X, asr #16 +- add X, X, UX +- add TMP1, TOP, TMP1, asl #2 +- add TMP2, BOTTOM, TMP2, asl #2 +- vld1.32 {d4}, [TMP1] +- vld1.32 {d5}, [TMP2] +- vmull.u8 q3, d4, d28 +- vmlal.u8 q3, d5, d29 +- mov TMP1, X, asr #16 +- mov TMP2, X, asr #16 +- add X, X, UX +- add TMP1, TOP, TMP1, asl #2 +- add TMP2, BOTTOM, TMP2, asl #2 +- vld1.32 {d16}, [TMP1] +- vld1.32 {d17}, [TMP2] +- vmull.u8 q9, d16, d28 +- vmlal.u8 q9, d17, d29 +- vshr.u16 q15, q12, #8 +- vadd.u16 q12, q12, q13 +- vshll.u16 q2, d6, #8 +- vmlsl.u16 q2, d6, d30 +- vmlal.u16 q2, d7, d30 +- vshll.u16 q8, d18, #8 +- vmlsl.u16 q8, d18, d31 +- vmlal.u16 q8, d19, d31 +- vshrn.u32 d0, q0, #16 +- vshrn.u32 d1, q10, #16 +- vshrn.u32 d4, q2, #16 +- vshrn.u32 d5, q8, #16 +- vmovn.u16 d0, q0 +- vmovn.u16 d1, q2 +- vst1.32 {d0, d1}, [OUT]! +-.endm +- +- +-/* +- * pixman_scaled_bilinear_scanline_8888_8888_SRC (uint32_t * out, +- * const uint32_t * top, +- * const uint32_t * bottom, +- * int wt, +- * int wb, +- * pixman_fixed_t x, +- * pixman_fixed_t ux, +- * int width) +- */ +- +-pixman_asm_function pixman_scaled_bilinear_scanline_8888_8888_SRC_asm_neon +- OUT .req r0 +- TOP .req r1 +- BOTTOM .req r2 +- WT .req r3 +- WB .req r4 +- X .req r5 +- UX .req r6 +- WIDTH .req ip +- TMP1 .req r3 +- TMP2 .req r4 +- +- mov ip, sp +- push {r4, r5, r6, r7} +- ldmia ip, {WB, X, UX, WIDTH} +- +- cmp WIDTH, #0 +- ble 3f +- vdup.u16 q12, X +- vdup.u16 q13, UX +- vdup.u8 d28, WT +- vdup.u8 d29, WB +- vadd.u16 d25, d25, d26 +- vadd.u16 q13, q13, q13 +- +- subs WIDTH, WIDTH, #4 +- blt 1f +-0: +- bilinear_interpolate_four_pixels +- subs WIDTH, WIDTH, #4 +- bge 0b +-1: +- tst WIDTH, #2 +- beq 2f +- bilinear_interpolate_two_pixels +-2: +- tst WIDTH, #1 +- beq 3f +- bilinear_interpolate_last_pixel +-3: +- pop {r4, r5, r6, r7} +- bx lr +- +- .unreq OUT +- .unreq TOP +- .unreq BOTTOM +- .unreq WT +- .unreq WB +- .unreq X +- .unreq UX +- .unreq WIDTH +- .unreq TMP1 +- .unreq TMP2 +-.endfunc +- +-.purgem bilinear_interpolate_last_pixel +-.purgem bilinear_interpolate_two_pixels +-.purgem bilinear_interpolate_four_pixels +- + /* + * Bilinear scaling support code which tries to provide pixel fetching, color + * format conversion, and interpolation as separate macros which can be used +@@ -2810,3 +2622,6 @@ pixman_asm_function fname + .endfunc + + .endm ++ ++generate_bilinear_scanline_func \ ++ pixman_scaled_bilinear_scanline_8888_8888_SRC_asm_neon, 8888, 8888, 2, 28 +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0019-ARM-NEON-optimization-for-bilinear-scaled-src_8888_0.patch b/recipes/xorg-lib/pixman-0.21.6/0019-ARM-NEON-optimization-for-bilinear-scaled-src_8888_0.patch new file mode 100644 index 0000000000..cc1769404f --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0019-ARM-NEON-optimization-for-bilinear-scaled-src_8888_0.patch @@ -0,0 +1,51 @@ +From 2ee27e7d79637da9173ee1bf3423e5a81534ccb4 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Wed, 9 Mar 2011 11:53:04 +0200 +Subject: [PATCH 19/40] ARM: NEON optimization for bilinear scaled 'src_8888_0565' + +Benchmark on ARM Cortex-A8 r2p2 @1GHz, 32-bit LPDDR @200MHz: + Microbenchmark (scaling 2000x2000 image with scale factor close to 1x): + before: op=1, src=20028888, dst=10020565, speed=6.56 MPix/s + after: op=1, src=20028888, dst=10020565, speed=61.65 MPix/s +--- + pixman/pixman-arm-neon-asm.S | 3 +++ + pixman/pixman-arm-neon.c | 5 +++++ + 2 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S +index 52dc444..f0b42ca 100644 +--- a/pixman/pixman-arm-neon-asm.S ++++ b/pixman/pixman-arm-neon-asm.S +@@ -2625,3 +2625,6 @@ pixman_asm_function fname + + generate_bilinear_scanline_func \ + pixman_scaled_bilinear_scanline_8888_8888_SRC_asm_neon, 8888, 8888, 2, 28 ++ ++generate_bilinear_scanline_func \ ++ pixman_scaled_bilinear_scanline_8888_0565_SRC_asm_neon, 8888, 0565, 2, 28 +diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c +index 98ad5f2..ba6de66 100644 +--- a/pixman/pixman-arm-neon.c ++++ b/pixman/pixman-arm-neon.c +@@ -129,6 +129,8 @@ PIXMAN_ARM_BIND_SCALED_NEAREST_SRC_A8_DST (SKIP_ZERO_SRC, neon, 0565_8_0565, + + PIXMAN_ARM_BIND_SCALED_BILINEAR_SRC_DST (0, neon, 8888_8888, SRC, + uint32_t, uint32_t) ++PIXMAN_ARM_BIND_SCALED_BILINEAR_SRC_DST (0, neon, 8888_0565, SRC, ++ uint32_t, uint16_t) + + void + pixman_composite_src_n_8_asm_neon (int32_t w, +@@ -350,6 +352,9 @@ static const pixman_fast_path_t arm_neon_fast_paths[] = + SIMPLE_BILINEAR_FAST_PATH (SRC, a8r8g8b8, x8r8g8b8, neon_8888_8888), + SIMPLE_BILINEAR_FAST_PATH (SRC, x8r8g8b8, x8r8g8b8, neon_8888_8888), + ++ SIMPLE_BILINEAR_FAST_PATH (SRC, a8r8g8b8, r5g6b5, neon_8888_0565), ++ SIMPLE_BILINEAR_FAST_PATH (SRC, x8r8g8b8, r5g6b5, neon_8888_0565), ++ + { PIXMAN_OP_NONE }, + }; + +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0020-ARM-NEON-optimization-for-bilinear-scaled-src_0565_x.patch b/recipes/xorg-lib/pixman-0.21.6/0020-ARM-NEON-optimization-for-bilinear-scaled-src_0565_x.patch new file mode 100644 index 0000000000..1924b3ae02 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0020-ARM-NEON-optimization-for-bilinear-scaled-src_0565_x.patch @@ -0,0 +1,50 @@ +From 29003c3befe2159396d181ef9ac1caaadcabf382 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Wed, 9 Mar 2011 13:21:53 +0200 +Subject: [PATCH 20/40] ARM: NEON optimization for bilinear scaled 'src_0565_x888' + +Benchmark on ARM Cortex-A8 r2p2 @1GHz, 32-bit LPDDR @200MHz: + Microbenchmark (scaling 2000x2000 image with scale factor close to 1x): + before: op=1, src=10020565, dst=20020888, speed=3.39 MPix/s + after: op=1, src=10020565, dst=20020888, speed=36.82 MPix/s +--- + pixman/pixman-arm-neon-asm.S | 3 +++ + pixman/pixman-arm-neon.c | 4 ++++ + 2 files changed, 7 insertions(+), 0 deletions(-) + +diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S +index f0b42ca..9245db9 100644 +--- a/pixman/pixman-arm-neon-asm.S ++++ b/pixman/pixman-arm-neon-asm.S +@@ -2628,3 +2628,6 @@ generate_bilinear_scanline_func \ + + generate_bilinear_scanline_func \ + pixman_scaled_bilinear_scanline_8888_0565_SRC_asm_neon, 8888, 0565, 2, 28 ++ ++generate_bilinear_scanline_func \ ++ pixman_scaled_bilinear_scanline_0565_x888_SRC_asm_neon, 0565, 8888, 1, 28 +diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c +index ba6de66..18e26eb 100644 +--- a/pixman/pixman-arm-neon.c ++++ b/pixman/pixman-arm-neon.c +@@ -131,6 +131,8 @@ PIXMAN_ARM_BIND_SCALED_BILINEAR_SRC_DST (0, neon, 8888_8888, SRC, + uint32_t, uint32_t) + PIXMAN_ARM_BIND_SCALED_BILINEAR_SRC_DST (0, neon, 8888_0565, SRC, + uint32_t, uint16_t) ++PIXMAN_ARM_BIND_SCALED_BILINEAR_SRC_DST (0, neon, 0565_x888, SRC, ++ uint16_t, uint32_t) + + void + pixman_composite_src_n_8_asm_neon (int32_t w, +@@ -355,6 +357,8 @@ static const pixman_fast_path_t arm_neon_fast_paths[] = + SIMPLE_BILINEAR_FAST_PATH (SRC, a8r8g8b8, r5g6b5, neon_8888_0565), + SIMPLE_BILINEAR_FAST_PATH (SRC, x8r8g8b8, r5g6b5, neon_8888_0565), + ++ SIMPLE_BILINEAR_FAST_PATH (SRC, r5g6b5, x8r8g8b8, neon_0565_x888), ++ + { PIXMAN_OP_NONE }, + }; + +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0021-ARM-NEON-optimization-for-bilinear-scaled-src_0565_0.patch b/recipes/xorg-lib/pixman-0.21.6/0021-ARM-NEON-optimization-for-bilinear-scaled-src_0565_0.patch new file mode 100644 index 0000000000..a0193d1fd6 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0021-ARM-NEON-optimization-for-bilinear-scaled-src_0565_0.patch @@ -0,0 +1,49 @@ +From fe99673719091d4a880d031add1369332a75731b Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Wed, 9 Mar 2011 13:27:41 +0200 +Subject: [PATCH 21/40] ARM: NEON optimization for bilinear scaled 'src_0565_0565' + +Benchmark on ARM Cortex-A8 r2p2 @1GHz, 32-bit LPDDR @200MHz: + Microbenchmark (scaling 2000x2000 image with scale factor close to 1x): + before: op=1, src=10020565, dst=10020565, speed=3.30 MPix/s + after: op=1, src=10020565, dst=10020565, speed=32.29 MPix/s +--- + pixman/pixman-arm-neon-asm.S | 3 +++ + pixman/pixman-arm-neon.c | 3 +++ + 2 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S +index 9245db9..2b6875b 100644 +--- a/pixman/pixman-arm-neon-asm.S ++++ b/pixman/pixman-arm-neon-asm.S +@@ -2631,3 +2631,6 @@ generate_bilinear_scanline_func \ + + generate_bilinear_scanline_func \ + pixman_scaled_bilinear_scanline_0565_x888_SRC_asm_neon, 0565, 8888, 1, 28 ++ ++generate_bilinear_scanline_func \ ++ pixman_scaled_bilinear_scanline_0565_0565_SRC_asm_neon, 0565, 0565, 1, 28 +diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c +index 18e26eb..0a10ca1 100644 +--- a/pixman/pixman-arm-neon.c ++++ b/pixman/pixman-arm-neon.c +@@ -133,6 +133,8 @@ PIXMAN_ARM_BIND_SCALED_BILINEAR_SRC_DST (0, neon, 8888_0565, SRC, + uint32_t, uint16_t) + PIXMAN_ARM_BIND_SCALED_BILINEAR_SRC_DST (0, neon, 0565_x888, SRC, + uint16_t, uint32_t) ++PIXMAN_ARM_BIND_SCALED_BILINEAR_SRC_DST (0, neon, 0565_0565, SRC, ++ uint16_t, uint16_t) + + void + pixman_composite_src_n_8_asm_neon (int32_t w, +@@ -358,6 +360,7 @@ static const pixman_fast_path_t arm_neon_fast_paths[] = + SIMPLE_BILINEAR_FAST_PATH (SRC, x8r8g8b8, r5g6b5, neon_8888_0565), + + SIMPLE_BILINEAR_FAST_PATH (SRC, r5g6b5, x8r8g8b8, neon_0565_x888), ++ SIMPLE_BILINEAR_FAST_PATH (SRC, r5g6b5, r5g6b5, neon_0565_0565), + + { PIXMAN_OP_NONE }, + }; +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0022-ARM-a-bit-faster-NEON-bilinear-scaling-for-r5g6b5-so.patch b/recipes/xorg-lib/pixman-0.21.6/0022-ARM-a-bit-faster-NEON-bilinear-scaling-for-r5g6b5-so.patch new file mode 100644 index 0000000000..20019f45f1 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0022-ARM-a-bit-faster-NEON-bilinear-scaling-for-r5g6b5-so.patch @@ -0,0 +1,166 @@ +From 70a923882ca24664344ba91a649e7aa12c3063f7 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Wed, 9 Mar 2011 13:55:48 +0200 +Subject: [PATCH 22/40] ARM: a bit faster NEON bilinear scaling for r5g6b5 source images + +Instructions scheduling improved in the code responsible for fetching r5g6b5 +pixels and converting them to the intermediate x8r8g8b8 color format used in +the interpolation part of code. Still a lot of NEON stalls are remaining, +which can be resolved later by the use of pipelining. + +Benchmark on ARM Cortex-A8 r2p2 @1GHz, 32-bit LPDDR @200MHz: + Microbenchmark (scaling 2000x2000 image with scale factor close to 1x): + before: op=1, src=10020565, dst=10020565, speed=32.29 MPix/s + op=1, src=10020565, dst=20020888, speed=36.82 MPix/s + after: op=1, src=10020565, dst=10020565, speed=41.35 MPix/s + op=1, src=10020565, dst=20020888, speed=49.16 MPix/s +--- + pixman/pixman-arm-neon-asm.S | 118 +++++++++++++++++++++++++++++++++++------ + 1 files changed, 100 insertions(+), 18 deletions(-) + +diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S +index 2b6875b..71b30ac 100644 +--- a/pixman/pixman-arm-neon-asm.S ++++ b/pixman/pixman-arm-neon-asm.S +@@ -2430,6 +2430,101 @@ fname: + convert_four_0565_to_x888_packed reg2, reg1, reg2, tmp + .endm + ++.macro bilinear_load_and_vertical_interpolate_two_8888 \ ++ acc1, acc2, reg1, reg2, reg3, reg4, tmp1, tmp2 ++ ++ bilinear_load_8888 reg1, reg2, tmp1 ++ vmull.u8 acc1, reg1, d28 ++ vmlal.u8 acc1, reg2, d29 ++ bilinear_load_8888 reg3, reg4, tmp2 ++ vmull.u8 acc2, reg3, d28 ++ vmlal.u8 acc2, reg4, d29 ++.endm ++ ++.macro bilinear_load_and_vertical_interpolate_four_8888 \ ++ xacc1, xacc2, xreg1, xreg2, xreg3, xreg4, xacc2lo, xacc2hi \ ++ yacc1, yacc2, yreg1, yreg2, yreg3, yreg4, yacc2lo, yacc2hi ++ ++ bilinear_load_and_vertical_interpolate_two_8888 \ ++ xacc1, xacc2, xreg1, xreg2, xreg3, xreg4, xacc2lo, xacc2hi ++ bilinear_load_and_vertical_interpolate_two_8888 \ ++ yacc1, yacc2, yreg1, yreg2, yreg3, yreg4, yacc2lo, yacc2hi ++.endm ++ ++.macro bilinear_load_and_vertical_interpolate_two_0565 \ ++ acc1, acc2, reg1, reg2, reg3, reg4, acc2lo, acc2hi ++ ++ mov TMP2, X, asr #16 ++ add X, X, UX ++ mov TMP4, X, asr #16 ++ add X, X, UX ++ add TMP1, TOP, TMP2, asl #1 ++ add TMP2, BOTTOM, TMP2, asl #1 ++ add TMP3, TOP, TMP4, asl #1 ++ add TMP4, BOTTOM, TMP4, asl #1 ++ vld1.32 {acc2lo[0]}, [TMP1] ++ vld1.32 {acc2hi[0]}, [TMP3] ++ vld1.32 {acc2lo[1]}, [TMP2] ++ vld1.32 {acc2hi[1]}, [TMP4] ++ convert_0565_to_x888 acc2, reg3, reg2, reg1 ++ vzip.u8 reg1, reg3 ++ vzip.u8 reg2, reg4 ++ vzip.u8 reg3, reg4 ++ vzip.u8 reg1, reg2 ++ vmull.u8 acc1, reg1, d28 ++ vmlal.u8 acc1, reg2, d29 ++ vmull.u8 acc2, reg3, d28 ++ vmlal.u8 acc2, reg4, d29 ++.endm ++ ++.macro bilinear_load_and_vertical_interpolate_four_0565 \ ++ xacc1, xacc2, xreg1, xreg2, xreg3, xreg4, xacc2lo, xacc2hi \ ++ yacc1, yacc2, yreg1, yreg2, yreg3, yreg4, yacc2lo, yacc2hi ++ ++ mov TMP2, X, asr #16 ++ add X, X, UX ++ mov TMP4, X, asr #16 ++ add X, X, UX ++ add TMP1, TOP, TMP2, asl #1 ++ add TMP2, BOTTOM, TMP2, asl #1 ++ add TMP3, TOP, TMP4, asl #1 ++ add TMP4, BOTTOM, TMP4, asl #1 ++ vld1.32 {xacc2lo[0]}, [TMP1] ++ vld1.32 {xacc2hi[0]}, [TMP3] ++ vld1.32 {xacc2lo[1]}, [TMP2] ++ vld1.32 {xacc2hi[1]}, [TMP4] ++ convert_0565_to_x888 xacc2, xreg3, xreg2, xreg1 ++ mov TMP2, X, asr #16 ++ add X, X, UX ++ mov TMP4, X, asr #16 ++ add X, X, UX ++ add TMP1, TOP, TMP2, asl #1 ++ add TMP2, BOTTOM, TMP2, asl #1 ++ add TMP3, TOP, TMP4, asl #1 ++ add TMP4, BOTTOM, TMP4, asl #1 ++ vld1.32 {yacc2lo[0]}, [TMP1] ++ vzip.u8 xreg1, xreg3 ++ vld1.32 {yacc2hi[0]}, [TMP3] ++ vzip.u8 xreg2, xreg4 ++ vld1.32 {yacc2lo[1]}, [TMP2] ++ vzip.u8 xreg3, xreg4 ++ vld1.32 {yacc2hi[1]}, [TMP4] ++ vzip.u8 xreg1, xreg2 ++ convert_0565_to_x888 yacc2, yreg3, yreg2, yreg1 ++ vmull.u8 xacc1, xreg1, d28 ++ vzip.u8 yreg1, yreg3 ++ vmlal.u8 xacc1, xreg2, d29 ++ vzip.u8 yreg2, yreg4 ++ vmull.u8 xacc2, xreg3, d28 ++ vzip.u8 yreg3, yreg4 ++ vmlal.u8 xacc2, xreg4, d29 ++ vzip.u8 yreg1, yreg2 ++ vmull.u8 yacc1, yreg1, d28 ++ vmlal.u8 yacc1, yreg2, d29 ++ vmull.u8 yacc2, yreg3, d28 ++ vmlal.u8 yacc2, yreg4, d29 ++.endm ++ + .macro bilinear_store_8888 numpix, tmp1, tmp2 + .if numpix == 4 + vst1.32 {d0, d1}, [OUT]! +@@ -2477,12 +2572,8 @@ fname: + .endm + + .macro bilinear_interpolate_two_pixels src_fmt, dst_fmt +- bilinear_load_&src_fmt d0, d1, d2 +- vmull.u8 q1, d0, d28 +- vmlal.u8 q1, d1, d29 +- bilinear_load_&src_fmt d20, d21, d22 +- vmull.u8 q11, d20, d28 +- vmlal.u8 q11, d21, d29 ++ bilinear_load_and_vertical_interpolate_two_&src_fmt \ ++ q1, q11, d0, d1, d20, d21, d22, d23 + vshr.u16 q15, q12, #8 + vadd.u16 q12, q12, q13 + vshll.u16 q0, d2, #8 +@@ -2498,18 +2589,9 @@ fname: + .endm + + .macro bilinear_interpolate_four_pixels src_fmt, dst_fmt +- bilinear_load_&src_fmt d0, d1, d2 +- vmull.u8 q1, d0, d28 +- vmlal.u8 q1, d1, d29 +- bilinear_load_&src_fmt d20, d21, d22 +- vmull.u8 q11, d20, d28 +- vmlal.u8 q11, d21, d29 +- bilinear_load_&src_fmt d4, d5, d6 +- vmull.u8 q3, d4, d28 +- vmlal.u8 q3, d5, d29 +- bilinear_load_&src_fmt d16, d17, d18 +- vmull.u8 q9, d16, d28 +- vmlal.u8 q9, d17, d29 ++ bilinear_load_and_vertical_interpolate_four_&src_fmt \ ++ q1, q11, d0, d1, d20, d21, d22, d23 \ ++ q3, q9, d4, d5, d16, d17, d18, d19 + pld [TMP1, PF_OFFS] + vshr.u16 q15, q12, #8 + vadd.u16 q12, q12, q13 +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0023-In-delegate_-src-dest-_iter_init-call-delegate-direc.patch b/recipes/xorg-lib/pixman-0.21.6/0023-In-delegate_-src-dest-_iter_init-call-delegate-direc.patch new file mode 100644 index 0000000000..96343f185b --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0023-In-delegate_-src-dest-_iter_init-call-delegate-direc.patch @@ -0,0 +1,54 @@ +From be4eaa0e4f79af38b7b89c5b09ca88d3a88d9396 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= +Date: Sat, 12 Mar 2011 19:06:02 -0500 +Subject: [PATCH 23/40] In delegate_{src,dest}_iter_init() call delegate directly. + +There is no reason to go through +_pixman_implementation_{src,dest}_iter_init(), especially since +_pixman_implementation_src_iter_init() is doing various other checks +that only need to be done once. + +Also call delegate->src_iter_init() directly in pixman-sse2.c +--- + pixman/pixman-implementation.c | 4 ++-- + pixman/pixman-sse2.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pixman/pixman-implementation.c b/pixman/pixman-implementation.c +index adaf9c6..892767e 100644 +--- a/pixman/pixman-implementation.c ++++ b/pixman/pixman-implementation.c +@@ -122,7 +122,7 @@ delegate_src_iter_init (pixman_implementation_t *imp, + uint8_t * buffer, + iter_flags_t flags) + { +- _pixman_implementation_src_iter_init ( ++ imp->delegate->src_iter_init ( + imp->delegate, iter, image, x, y, width, height, buffer, flags); + } + +@@ -137,7 +137,7 @@ delegate_dest_iter_init (pixman_implementation_t *imp, + uint8_t * buffer, + iter_flags_t flags) + { +- _pixman_implementation_dest_iter_init ( ++ imp->delegate->dest_iter_init ( + imp->delegate, iter, image, x, y, width, height, buffer, flags); + } + +diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c +index 696005f..d4a34e9 100644 +--- a/pixman/pixman-sse2.c ++++ b/pixman/pixman-sse2.c +@@ -6013,7 +6013,7 @@ sse2_src_iter_init (pixman_implementation_t *imp, + } + } + +- _pixman_implementation_src_iter_init ( ++ imp->delegate->src_iter_init ( + imp->delegate, iter, image, x, y, width, height, buffer, flags); + } + +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0024-Fill-out-parts-of-iters-in-_pixman_implementation_-s.patch b/recipes/xorg-lib/pixman-0.21.6/0024-Fill-out-parts-of-iters-in-_pixman_implementation_-s.patch new file mode 100644 index 0000000000..44fd38a8da --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0024-Fill-out-parts-of-iters-in-_pixman_implementation_-s.patch @@ -0,0 +1,111 @@ +From 74d0f44b6d6d613d24541b849835da0464cc6fd0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= +Date: Sat, 12 Mar 2011 19:12:35 -0500 +Subject: [PATCH 24/40] Fill out parts of iters in _pixman_implementation_{src,dest}_iter_init() + +This makes _pixman_implementation_{src,dest}_iter_init() responsible +for filling parts of the information in the iterators. Specifically, +the information passed as arguments is stored in the iterator. + +Also add a height field to pixman_iter_t(). +--- + pixman/pixman-general.c | 6 ------ + pixman/pixman-implementation.c | 16 ++++++++++++++++ + pixman/pixman-private.h | 11 ++++++++--- + pixman/pixman-sse2.c | 2 -- + 4 files changed, 24 insertions(+), 11 deletions(-) + +diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c +index 872fb7e..1a0fa7c 100644 +--- a/pixman/pixman-general.c ++++ b/pixman/pixman-general.c +@@ -44,12 +44,6 @@ general_src_iter_init (pixman_implementation_t *imp, + int x, int y, int width, int height, + uint8_t *buffer, iter_flags_t flags) + { +- iter->image = image; +- iter->x = x; +- iter->y = y; +- iter->width = width; +- iter->buffer = (uint32_t *)buffer; +- + if (image->type == SOLID) + { + _pixman_solid_fill_iter_init ( +diff --git a/pixman/pixman-implementation.c b/pixman/pixman-implementation.c +index 892767e..bdd4543 100644 +--- a/pixman/pixman-implementation.c ++++ b/pixman/pixman-implementation.c +@@ -274,6 +274,14 @@ _pixman_implementation_src_iter_init (pixman_implementation_t *imp, + uint8_t *buffer, + iter_flags_t flags) + { ++ iter->image = image; ++ iter->buffer = (uint32_t *)buffer; ++ iter->x = x; ++ iter->y = y; ++ iter->width = width; ++ iter->height = height; ++ iter->flags = flags; ++ + if (!image) + { + iter->get_scanline = get_scanline_null; +@@ -301,6 +309,14 @@ _pixman_implementation_dest_iter_init (pixman_implementation_t *imp, + uint8_t *buffer, + iter_flags_t flags) + { ++ iter->image = image; ++ iter->buffer = (uint32_t *)buffer; ++ iter->x = x; ++ iter->y = y; ++ iter->width = width; ++ iter->height = height; ++ iter->flags = flags; ++ + (*imp->dest_iter_init) ( + imp, iter, image, x, y, width, height, buffer, flags); + } +diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h +index 1473dc4..ea9545f 100644 +--- a/pixman/pixman-private.h ++++ b/pixman/pixman-private.h +@@ -212,14 +212,19 @@ typedef enum + + struct pixman_iter_t + { +- pixman_iter_get_scanline_t get_scanline; +- pixman_iter_write_back_t write_back; +- ++ /* These are initialized by _pixman_implementation_{src,dest}_init */ + pixman_image_t * image; + uint32_t * buffer; + int x, y; + int width; ++ int height; ++ iter_flags_t flags; ++ ++ /* These function pointers are initialized by the implementation */ ++ pixman_iter_get_scanline_t get_scanline; ++ pixman_iter_write_back_t write_back; + ++ /* These fields are scratch data that implementations can use */ + uint8_t * bits; + int stride; + }; +diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c +index d4a34e9..43a6bf2 100644 +--- a/pixman/pixman-sse2.c ++++ b/pixman/pixman-sse2.c +@@ -6004,8 +6004,6 @@ sse2_src_iter_init (pixman_implementation_t *imp, + + iter->bits = b + s * y + x * PIXMAN_FORMAT_BPP (f->format) / 8; + iter->stride = s; +- iter->width = width; +- iter->buffer = (uint32_t *)buffer; + + iter->get_scanline = f->get_scanline; + return; +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0025-Simplify-the-prototype-for-iterator-initializers.patch b/recipes/xorg-lib/pixman-0.21.6/0025-Simplify-the-prototype-for-iterator-initializers.patch new file mode 100644 index 0000000000..1bfd6b4e92 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0025-Simplify-the-prototype-for-iterator-initializers.patch @@ -0,0 +1,442 @@ +From 6b27768d81c254a4f1d05473157328d5a5d99b9c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= +Date: Sat, 12 Mar 2011 19:42:58 -0500 +Subject: [PATCH 25/40] Simplify the prototype for iterator initializers. + +All of the information previously passed to the iterator initializers +is now available in the iterator itself, so there is no need to pass +it as arguments anymore. +--- + pixman/pixman-bits-image.c | 20 +++++--------- + pixman/pixman-conical-gradient.c | 7 +--- + pixman/pixman-general.c | 52 ++++++++------------------------------ + pixman/pixman-implementation.c | 30 ++++----------------- + pixman/pixman-linear-gradient.c | 16 +++-------- + pixman/pixman-private.h | 40 ++++++----------------------- + pixman/pixman-radial-gradient.c | 7 +--- + pixman/pixman-solid-fill.c | 17 +++++------- + pixman/pixman-sse2.c | 25 +++++++++-------- + 9 files changed, 61 insertions(+), 153 deletions(-) + +diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c +index a865d71..835ecfb 100644 +--- a/pixman/pixman-bits-image.c ++++ b/pixman/pixman-bits-image.c +@@ -1362,12 +1362,9 @@ src_get_scanline_wide (pixman_iter_t *iter, const uint32_t *mask) + } + + void +-_pixman_bits_image_src_iter_init (pixman_image_t *image, +- pixman_iter_t *iter, +- int x, int y, int width, int height, +- uint8_t *buffer, iter_flags_t flags) ++_pixman_bits_image_src_iter_init (pixman_image_t *image, pixman_iter_t *iter) + { +- if (flags & ITER_NARROW) ++ if (iter->flags & ITER_NARROW) + iter->get_scanline = src_get_scanline_narrow; + else + iter->get_scanline = src_get_scanline_wide; +@@ -1472,28 +1469,25 @@ dest_write_back_direct (pixman_iter_t *iter) + } + + void +-_pixman_bits_image_dest_iter_init (pixman_image_t *image, +- pixman_iter_t *iter, +- int x, int y, int width, int height, +- uint8_t *buffer, iter_flags_t flags) ++_pixman_bits_image_dest_iter_init (pixman_image_t *image, pixman_iter_t *iter) + { +- if (flags & ITER_NARROW) ++ if (iter->flags & ITER_NARROW) + { + if (((image->common.flags & + (FAST_PATH_NO_ALPHA_MAP | FAST_PATH_NO_ACCESSORS)) == + (FAST_PATH_NO_ALPHA_MAP | FAST_PATH_NO_ACCESSORS)) && + (image->bits.format == PIXMAN_a8r8g8b8 || + (image->bits.format == PIXMAN_x8r8g8b8 && +- (flags & ITER_LOCALIZED_ALPHA)))) ++ (iter->flags & ITER_LOCALIZED_ALPHA)))) + { +- iter->buffer = image->bits.bits + y * image->bits.rowstride + x; ++ iter->buffer = image->bits.bits + iter->y * image->bits.rowstride + iter->x; + + iter->get_scanline = _pixman_iter_get_scanline_noop; + iter->write_back = dest_write_back_direct; + } + else + { +- if ((flags & (ITER_IGNORE_RGB | ITER_IGNORE_ALPHA)) == ++ if ((iter->flags & (ITER_IGNORE_RGB | ITER_IGNORE_ALPHA)) == + (ITER_IGNORE_RGB | ITER_IGNORE_ALPHA)) + { + iter->get_scanline = _pixman_iter_get_scanline_noop; +diff --git a/pixman/pixman-conical-gradient.c b/pixman/pixman-conical-gradient.c +index 9d7d2e8..791d4f3 100644 +--- a/pixman/pixman-conical-gradient.c ++++ b/pixman/pixman-conical-gradient.c +@@ -171,12 +171,9 @@ conical_get_scanline_wide (pixman_iter_t *iter, const uint32_t *mask) + } + + void +-_pixman_conical_gradient_iter_init (pixman_image_t *image, +- pixman_iter_t *iter, +- int x, int y, int width, int height, +- uint8_t *buffer, iter_flags_t flags) ++_pixman_conical_gradient_iter_init (pixman_image_t *image, pixman_iter_t *iter) + { +- if (flags & ITER_NARROW) ++ if (iter->flags & ITER_NARROW) + iter->get_scanline = conical_get_scanline_narrow; + else + iter->get_scanline = conical_get_scanline_wide; +diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c +index 1a0fa7c..727affc 100644 +--- a/pixman/pixman-general.c ++++ b/pixman/pixman-general.c +@@ -38,60 +38,30 @@ + #include "pixman-private.h" + + static void +-general_src_iter_init (pixman_implementation_t *imp, +- pixman_iter_t *iter, +- pixman_image_t *image, +- int x, int y, int width, int height, +- uint8_t *buffer, iter_flags_t flags) ++general_src_iter_init (pixman_implementation_t *imp, pixman_iter_t *iter) + { ++ pixman_image_t *image = iter->image; ++ + if (image->type == SOLID) +- { +- _pixman_solid_fill_iter_init ( +- image, iter, x, y, width, height, buffer, flags); +- } ++ _pixman_solid_fill_iter_init (image, iter); + else if (image->type == LINEAR) +- { +- _pixman_linear_gradient_iter_init ( +- image, iter, x, y, width, height, buffer, flags); +- } ++ _pixman_linear_gradient_iter_init (image, iter); + else if (image->type == RADIAL) +- { +- _pixman_radial_gradient_iter_init ( +- image, iter, x, y, width, height, buffer, flags); +- } ++ _pixman_radial_gradient_iter_init (image, iter); + else if (image->type == CONICAL) +- { +- _pixman_conical_gradient_iter_init ( +- image, iter, x, y, width, height, buffer, flags); +- } ++ _pixman_conical_gradient_iter_init (image, iter); + else if (image->type == BITS) +- { +- _pixman_bits_image_src_iter_init ( +- image, iter, x, y, width, height, buffer, flags); +- } ++ _pixman_bits_image_src_iter_init (image, iter); + else +- { + _pixman_log_error (FUNC, "Pixman bug: unknown image type\n"); +- } + } + + static void +-general_dest_iter_init (pixman_implementation_t *imp, +- pixman_iter_t *iter, +- pixman_image_t *image, +- int x, int y, int width, int height, +- uint8_t *buffer, iter_flags_t flags) ++general_dest_iter_init (pixman_implementation_t *imp, pixman_iter_t *iter) + { +- iter->image = image; +- iter->x = x; +- iter->y = y; +- iter->width = width; +- iter->buffer = (uint32_t *)buffer; +- +- if (image->type == BITS) ++ if (iter->image->type == BITS) + { +- _pixman_bits_image_dest_iter_init ( +- image, iter, x, y, width, height, buffer, flags); ++ _pixman_bits_image_dest_iter_init (iter->image, iter); + } + else + { +diff --git a/pixman/pixman-implementation.c b/pixman/pixman-implementation.c +index bdd4543..f1d3f99 100644 +--- a/pixman/pixman-implementation.c ++++ b/pixman/pixman-implementation.c +@@ -113,32 +113,16 @@ delegate_fill (pixman_implementation_t *imp, + + static void + delegate_src_iter_init (pixman_implementation_t *imp, +- pixman_iter_t * iter, +- pixman_image_t * image, +- int x, +- int y, +- int width, +- int height, +- uint8_t * buffer, +- iter_flags_t flags) ++ pixman_iter_t * iter) + { +- imp->delegate->src_iter_init ( +- imp->delegate, iter, image, x, y, width, height, buffer, flags); ++ imp->delegate->src_iter_init (imp->delegate, iter); + } + + static void + delegate_dest_iter_init (pixman_implementation_t *imp, +- pixman_iter_t * iter, +- pixman_image_t * image, +- int x, +- int y, +- int width, +- int height, +- uint8_t * buffer, +- iter_flags_t flags) ++ pixman_iter_t * iter) + { +- imp->delegate->dest_iter_init ( +- imp->delegate, iter, image, x, y, width, height, buffer, flags); ++ imp->delegate->dest_iter_init (imp->delegate, iter); + } + + pixman_implementation_t * +@@ -293,8 +277,7 @@ _pixman_implementation_src_iter_init (pixman_implementation_t *imp, + } + else + { +- (*imp->src_iter_init) ( +- imp, iter, image, x, y, width, height, buffer, flags); ++ (*imp->src_iter_init) (imp, iter); + } + } + +@@ -317,6 +300,5 @@ _pixman_implementation_dest_iter_init (pixman_implementation_t *imp, + iter->height = height; + iter->flags = flags; + +- (*imp->dest_iter_init) ( +- imp, iter, image, x, y, width, height, buffer, flags); ++ (*imp->dest_iter_init) (imp, iter); + } +diff --git a/pixman/pixman-linear-gradient.c b/pixman/pixman-linear-gradient.c +index 07303fc..6e1ea24 100644 +--- a/pixman/pixman-linear-gradient.c ++++ b/pixman/pixman-linear-gradient.c +@@ -233,18 +233,12 @@ linear_get_scanline_wide (pixman_iter_t *iter, const uint32_t *mask) + } + + void +-_pixman_linear_gradient_iter_init (pixman_image_t *image, +- pixman_iter_t *iter, +- int x, +- int y, +- int width, +- int height, +- uint8_t *buffer, +- iter_flags_t flags) ++_pixman_linear_gradient_iter_init (pixman_image_t *image, pixman_iter_t *iter) + { +- if (linear_gradient_is_horizontal (image, x, y, width, height)) ++ if (linear_gradient_is_horizontal ( ++ iter->image, iter->x, iter->y, iter->width, iter->height)) + { +- if (flags & ITER_NARROW) ++ if (iter->flags & ITER_NARROW) + linear_get_scanline_narrow (iter, NULL); + else + linear_get_scanline_wide (iter, NULL); +@@ -253,7 +247,7 @@ _pixman_linear_gradient_iter_init (pixman_image_t *image, + } + else + { +- if (flags & ITER_NARROW) ++ if (iter->flags & ITER_NARROW) + iter->get_scanline = linear_get_scanline_narrow; + else + iter->get_scanline = linear_get_scanline_wide; +diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h +index ea9545f..60060a9 100644 +--- a/pixman/pixman-private.h ++++ b/pixman/pixman-private.h +@@ -233,39 +233,22 @@ void + _pixman_bits_image_setup_accessors (bits_image_t *image); + + void +-_pixman_bits_image_src_iter_init (pixman_image_t *image, +- pixman_iter_t *iter, +- int x, int y, int width, int height, +- uint8_t *buffer, iter_flags_t flags); ++_pixman_bits_image_src_iter_init (pixman_image_t *image, pixman_iter_t *iter); ++ + void +-_pixman_bits_image_dest_iter_init (pixman_image_t *image, +- pixman_iter_t *iter, +- int x, int y, int width, int height, +- uint8_t *buffer, iter_flags_t flags); ++_pixman_bits_image_dest_iter_init (pixman_image_t *image, pixman_iter_t *iter); + + void +-_pixman_solid_fill_iter_init (pixman_image_t *image, +- pixman_iter_t *iter, +- int x, int y, int width, int height, +- uint8_t *buffer, iter_flags_t flags); ++_pixman_solid_fill_iter_init (pixman_image_t *image, pixman_iter_t *iter); + + void +-_pixman_linear_gradient_iter_init (pixman_image_t *image, +- pixman_iter_t *iter, +- int x, int y, int width, int height, +- uint8_t *buffer, iter_flags_t flags); ++_pixman_linear_gradient_iter_init (pixman_image_t *image, pixman_iter_t *iter); + + void +-_pixman_radial_gradient_iter_init (pixman_image_t *image, +- pixman_iter_t *iter, +- int x, int y, int width, int height, +- uint8_t *buffer, iter_flags_t flags); ++_pixman_radial_gradient_iter_init (pixman_image_t *image, pixman_iter_t *iter); + + void +-_pixman_conical_gradient_iter_init (pixman_image_t *image, +- pixman_iter_t *iter, +- int x, int y, int width, int height, +- uint8_t *buffer, iter_flags_t flags); ++_pixman_conical_gradient_iter_init (pixman_image_t *image, pixman_iter_t *iter); + + pixman_image_t * + _pixman_image_allocate (void); +@@ -413,14 +396,7 @@ typedef pixman_bool_t (*pixman_fill_func_t) (pixman_implementation_t *imp, + int height, + uint32_t xor); + typedef void (*pixman_iter_init_func_t) (pixman_implementation_t *imp, +- pixman_iter_t *iter, +- pixman_image_t *image, +- int x, +- int y, +- int width, +- int height, +- uint8_t *buffer, +- iter_flags_t flags); ++ pixman_iter_t *iter); + + void _pixman_setup_combiner_functions_32 (pixman_implementation_t *imp); + void _pixman_setup_combiner_functions_64 (pixman_implementation_t *imp); +diff --git a/pixman/pixman-radial-gradient.c b/pixman/pixman-radial-gradient.c +index 6523b82..5e9fd73 100644 +--- a/pixman/pixman-radial-gradient.c ++++ b/pixman/pixman-radial-gradient.c +@@ -400,12 +400,9 @@ radial_get_scanline_wide (pixman_iter_t *iter, const uint32_t *mask) + } + + void +-_pixman_radial_gradient_iter_init (pixman_image_t *image, +- pixman_iter_t *iter, +- int x, int y, int width, int height, +- uint8_t *buffer, iter_flags_t flags) ++_pixman_radial_gradient_iter_init (pixman_image_t *image, pixman_iter_t *iter) + { +- if (flags & ITER_NARROW) ++ if (iter->flags & ITER_NARROW) + iter->get_scanline = radial_get_scanline_narrow; + else + iter->get_scanline = radial_get_scanline_wide; +diff --git a/pixman/pixman-solid-fill.c b/pixman/pixman-solid-fill.c +index 67681f2..852e135 100644 +--- a/pixman/pixman-solid-fill.c ++++ b/pixman/pixman-solid-fill.c +@@ -27,24 +27,21 @@ + #include "pixman-private.h" + + void +-_pixman_solid_fill_iter_init (pixman_image_t *image, +- pixman_iter_t *iter, +- int x, int y, int width, int height, +- uint8_t *buffer, iter_flags_t flags) ++_pixman_solid_fill_iter_init (pixman_image_t *image, pixman_iter_t *iter) + { +- if (flags & ITER_NARROW) ++ if (iter->flags & ITER_NARROW) + { +- uint32_t *b = (uint32_t *)buffer; +- uint32_t *e = b + width; +- uint32_t color = image->solid.color_32; ++ uint32_t *b = (uint32_t *)iter->buffer; ++ uint32_t *e = b + iter->width; ++ uint32_t color = iter->image->solid.color_32; + + while (b < e) + *(b++) = color; + } + else + { +- uint64_t *b = (uint64_t *)buffer; +- uint64_t *e = b + width; ++ uint64_t *b = (uint64_t *)iter->buffer; ++ uint64_t *e = b + iter->width; + uint64_t color = image->solid.color_64; + + while (b < e) +diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c +index 43a6bf2..533b858 100644 +--- a/pixman/pixman-sse2.c ++++ b/pixman/pixman-sse2.c +@@ -5978,19 +5978,21 @@ static const fetcher_info_t fetchers[] = + }; + + static void +-sse2_src_iter_init (pixman_implementation_t *imp, +- pixman_iter_t *iter, +- pixman_image_t *image, +- int x, int y, int width, int height, +- uint8_t *buffer, iter_flags_t flags) ++sse2_src_iter_init (pixman_implementation_t *imp, pixman_iter_t *iter) + { ++ pixman_image_t *image = iter->image; ++ int x = iter->x; ++ int y = iter->y; ++ int width = iter->width; ++ int height = iter->height; ++ + #define FLAGS \ + (FAST_PATH_STANDARD_FLAGS | FAST_PATH_ID_TRANSFORM) + +- if ((flags & ITER_NARROW) && +- (image->common.flags & FLAGS) == FLAGS && +- x >= 0 && y >= 0 && +- x + width <= image->bits.width && ++ if ((iter->flags & ITER_NARROW) && ++ (image->common.flags & FLAGS) == FLAGS && ++ x >= 0 && y >= 0 && ++ x + width <= image->bits.width && + y + height <= image->bits.height) + { + const fetcher_info_t *f; +@@ -6002,7 +6004,7 @@ sse2_src_iter_init (pixman_implementation_t *imp, + uint8_t *b = (uint8_t *)image->bits.bits; + int s = image->bits.rowstride * 4; + +- iter->bits = b + s * y + x * PIXMAN_FORMAT_BPP (f->format) / 8; ++ iter->bits = b + s * iter->y + x * PIXMAN_FORMAT_BPP (f->format) / 8; + iter->stride = s; + + iter->get_scanline = f->get_scanline; +@@ -6011,8 +6013,7 @@ sse2_src_iter_init (pixman_implementation_t *imp, + } + } + +- imp->delegate->src_iter_init ( +- imp->delegate, iter, image, x, y, width, height, buffer, flags); ++ imp->delegate->src_iter_init (imp->delegate, iter); + } + + #if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__) +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0026-test-Randomize-some-tests-if-PIXMAN_RANDOMIZE_TESTS-.patch b/recipes/xorg-lib/pixman-0.21.6/0026-test-Randomize-some-tests-if-PIXMAN_RANDOMIZE_TESTS-.patch new file mode 100644 index 0000000000..8fc5b7706f --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0026-test-Randomize-some-tests-if-PIXMAN_RANDOMIZE_TESTS-.patch @@ -0,0 +1,187 @@ +From 7eb0abb5e819046537b9f809c7ec332c6679c557 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= +Date: Mon, 14 Mar 2011 14:56:22 -0400 +Subject: [PATCH 26/40] test: Randomize some tests if PIXMAN_RANDOMIZE_TESTS is set + +This patch makes so that composite and stress-test will start from a +random seed if the PIXMAN_RANDOMIZE_TESTS environment variable is +set. Running the test suite in this mode is useful to get more test +coverage. + +Also, in stress-test.c make it so that setting the initial seed causes +threads to be turned off. This makes it much easier to see when +something fails. +--- + test/composite.c | 17 ++++++++++++----- + test/stress-test.c | 37 ++++++++++++++++++++++++++----------- + test/utils.c | 10 ++++++++++ + test/utils.h | 3 +++ + 4 files changed, 51 insertions(+), 16 deletions(-) + +diff --git a/test/composite.c b/test/composite.c +index a86e5ed..e6d52b9 100644 +--- a/test/composite.c ++++ b/test/composite.c +@@ -868,7 +868,7 @@ main (int argc, char **argv) + { + #define N_TESTS (8 * 1024 * 1024) + int result = 0; +- int i; ++ uint32_t i; + + if (argc > 1) + { +@@ -890,15 +890,22 @@ main (int argc, char **argv) + } + } + ++ uint32_t seed; ++ ++ if (getenv ("PIXMAN_RANDOMIZE_TESTS")) ++ seed = get_random_seed(); ++ else ++ seed = 1; ++ + #ifdef USE_OPENMP +-# pragma omp parallel for default(none) shared(result) shared(argv) ++# pragma omp parallel for default(none) shared(result, argv, seed) + #endif +- for (i = 1; i <= N_TESTS; ++i) ++ for (i = seed; i <= N_TESTS; ++i) + { + if (!result && !run_test (i)) + { +- printf ("Test %d failed.\n", i); +- ++ printf ("Test 0x%08X failed.\n", i); ++ + result = i; + } + } +diff --git a/test/stress-test.c b/test/stress-test.c +index 166dc6d..d496f93 100644 +--- a/test/stress-test.c ++++ b/test/stress-test.c +@@ -1,4 +1,6 @@ ++#include + #include "utils.h" ++#include + + #if 0 + #define fence_malloc malloc +@@ -730,11 +732,17 @@ static const pixman_op_t op_list[] = + }; + + static void +-run_test (uint32_t seed) ++run_test (uint32_t seed, pixman_bool_t verbose, uint32_t mod) + { + pixman_image_t *source, *mask, *dest; + pixman_op_t op; + ++ if (verbose) ++ { ++ if (mod == 0 || (seed % mod) == 0) ++ printf ("Seed 0x%08x\n", seed); ++ } ++ + lcg_srand (seed); + + source = create_random_image (); +@@ -787,6 +795,7 @@ main (int argc, char **argv) + uint32_t seed = 1; + uint32_t n_tests = 0xffffffff; + uint32_t mod = 0; ++ pixman_bool_t use_threads = TRUE; + uint32_t i; + + pixman_disable_out_of_bounds_workaround (); +@@ -811,6 +820,7 @@ main (int argc, char **argv) + else if (strcmp (argv[i], "-s") == 0 && i + 1 < argc) + { + get_int (argv[i + 1], &seed); ++ use_threads = FALSE; + i++; + } + else if (strcmp (argv[i], "-n") == 0 && i + 1 < argc) +@@ -825,7 +835,7 @@ main (int argc, char **argv) + + printf ("Options:\n\n" + "-n Number of tests to run\n" +- "-s Seed of first test\n" ++ "-s Seed of first test (ignored if PIXMAN_RANDOMIZE_TESTS is set)\n" + "-v Print out seeds\n" + "-v Print out every n'th seed\n\n"); + +@@ -836,19 +846,24 @@ main (int argc, char **argv) + if (n_tests == 0xffffffff) + n_tests = 8000; + +- /* FIXME: seed 2005763 fails in set_lum() with divide by zero */ ++ if (getenv ("PIXMAN_RANDOMIZE_TESTS")) ++ { ++ seed = get_random_seed(); ++ printf ("First seed: 0x%08x\n", seed); ++ } ++ ++ if (use_threads) ++ { + #ifdef USE_OPENMP + # pragma omp parallel for default(none) shared(verbose, n_tests, mod, seed) + #endif +- for (i = seed; i < seed + n_tests; ++i) ++ for (i = seed; i < seed + n_tests; ++i) ++ run_test (i, verbose, mod); ++ } ++ else + { +- if (verbose) +- { +- if (mod == 0 || (i % mod) == 0) +- printf ("Seed %d\n", i); +- } +- +- run_test (i); ++ for (i = seed; i < seed + n_tests; ++i) ++ run_test (i, verbose, mod); + } + + return 0; +diff --git a/test/utils.c b/test/utils.c +index 4bf02e1..56701c4 100644 +--- a/test/utils.c ++++ b/test/utils.c +@@ -455,6 +455,16 @@ gettime (void) + #endif + } + ++uint32_t ++get_random_seed (void) ++{ ++ double d = gettime(); ++ ++ lcg_srand (*(uint32_t *)&d); ++ ++ return lcg_rand_u32 (); ++} ++ + static const char *global_msg; + + static void +diff --git a/test/utils.h b/test/utils.h +index a5183f7..615ad78 100644 +--- a/test/utils.h ++++ b/test/utils.h +@@ -79,6 +79,9 @@ make_random_bytes (int n_bytes); + double + gettime (void); + ++uint32_t ++get_random_seed (void); ++ + /* main body of the fuzzer test */ + int + fuzzer_test_main (const char *test_name, +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0027-Add-simple-support-for-the-r8g8b8a8-and-r8g8b8x8-for.patch b/recipes/xorg-lib/pixman-0.21.6/0027-Add-simple-support-for-the-r8g8b8a8-and-r8g8b8x8-for.patch new file mode 100644 index 0000000000..1dbac60586 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0027-Add-simple-support-for-the-r8g8b8a8-and-r8g8b8x8-for.patch @@ -0,0 +1,206 @@ +From f05a90e5f8d1d0af60e2c684cbe9f1327c33135a Mon Sep 17 00:00:00 2001 +From: Alexandros Frantzis +Date: Fri, 18 Mar 2011 14:36:15 +0200 +Subject: [PATCH 27/40] Add simple support for the r8g8b8a8 and r8g8b8x8 formats. + +This format is particularly useful on big-endian architectures, where RGBA in +memory/file order corresponds to r8g8b8a8 as an uint32_t. This is important +because RGBA is in some cases the only available choice (for example as a pixel +format in OpenGL ES 2.0). +--- + pixman/pixman-access.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ + pixman/pixman.c | 6 +++ + pixman/pixman.h | 6 ++- + 3 files changed, 108 insertions(+), 1 deletions(-) + +diff --git a/pixman/pixman-access.c b/pixman/pixman-access.c +index f1ce0ba..32c4d8b 100644 +--- a/pixman/pixman-access.c ++++ b/pixman/pixman-access.c +@@ -211,6 +211,46 @@ fetch_scanline_b8g8r8x8 (pixman_image_t *image, + } + + static void ++fetch_scanline_r8g8b8a8 (pixman_image_t *image, ++ int x, ++ int y, ++ int width, ++ uint32_t * buffer, ++ const uint32_t *mask) ++{ ++ const uint32_t *bits = image->bits.bits + y * image->bits.rowstride; ++ const uint32_t *pixel = (uint32_t *)bits + x; ++ const uint32_t *end = pixel + width; ++ ++ while (pixel < end) ++ { ++ uint32_t p = READ (image, pixel++); ++ ++ *buffer++ = (((p & 0x000000ff) << 24) | (p >> 8)); ++ } ++} ++ ++static void ++fetch_scanline_r8g8b8x8 (pixman_image_t *image, ++ int x, ++ int y, ++ int width, ++ uint32_t * buffer, ++ const uint32_t *mask) ++{ ++ const uint32_t *bits = image->bits.bits + y * image->bits.rowstride; ++ const uint32_t *pixel = (uint32_t *)bits + x; ++ const uint32_t *end = pixel + width; ++ ++ while (pixel < end) ++ { ++ uint32_t p = READ (image, pixel++); ++ ++ *buffer++ = (0xff000000 | (p >> 8)); ++ } ++} ++ ++static void + fetch_scanline_x14r6g6b6 (pixman_image_t *image, + int x, + int y, +@@ -1292,6 +1332,28 @@ fetch_pixel_b8g8r8x8 (bits_image_t *image, + } + + static uint32_t ++fetch_pixel_r8g8b8a8 (bits_image_t *image, ++ int offset, ++ int line) ++{ ++ uint32_t *bits = image->bits + line * image->rowstride; ++ uint32_t pixel = READ (image, (uint32_t *)bits + offset); ++ ++ return (((pixel & 0x000000ff) << 24) | (pixel >> 8)); ++} ++ ++static uint32_t ++fetch_pixel_r8g8b8x8 (bits_image_t *image, ++ int offset, ++ int line) ++{ ++ uint32_t *bits = image->bits + line * image->rowstride; ++ uint32_t pixel = READ (image, (uint32_t *)bits + offset); ++ ++ return (0xff000000 | (pixel >> 8)); ++} ++ ++static uint32_t + fetch_pixel_x14r6g6b6 (bits_image_t *image, + int offset, + int line) +@@ -2028,6 +2090,39 @@ store_scanline_b8g8r8x8 (bits_image_t * image, + } + + static void ++store_scanline_r8g8b8a8 (bits_image_t * image, ++ int x, ++ int y, ++ int width, ++ const uint32_t *values) ++{ ++ uint32_t *bits = image->bits + image->rowstride * y; ++ uint32_t *pixel = (uint32_t *)bits + x; ++ int i; ++ ++ for (i = 0; i < width; ++i) ++ { ++ WRITE (image, pixel++, ++ ((values[i] >> 24) & 0x000000ff) | (values[i] << 8)); ++ } ++} ++ ++static void ++store_scanline_r8g8b8x8 (bits_image_t * image, ++ int x, ++ int y, ++ int width, ++ const uint32_t *values) ++{ ++ uint32_t *bits = image->bits + image->rowstride * y; ++ uint32_t *pixel = (uint32_t *)bits + x; ++ int i; ++ ++ for (i = 0; i < width; ++i) ++ WRITE (image, pixel++, (values[i] << 8)); ++} ++ ++static void + store_scanline_x14r6g6b6 (bits_image_t * image, + int x, + int y, +@@ -2845,6 +2940,8 @@ static const format_info_t accessors[] = + FORMAT_INFO (x8b8g8r8), + FORMAT_INFO (b8g8r8a8), + FORMAT_INFO (b8g8r8x8), ++ FORMAT_INFO (r8g8b8a8), ++ FORMAT_INFO (r8g8b8x8), + FORMAT_INFO (x14r6g6b6), + + /* 24bpp formats */ +diff --git a/pixman/pixman.c b/pixman/pixman.c +index ec565f9..f21af2f 100644 +--- a/pixman/pixman.c ++++ b/pixman/pixman.c +@@ -873,6 +873,8 @@ color_to_pixel (pixman_color_t * color, + format == PIXMAN_x8b8g8r8 || + format == PIXMAN_b8g8r8a8 || + format == PIXMAN_b8g8r8x8 || ++ format == PIXMAN_r8g8b8a8 || ++ format == PIXMAN_r8g8b8x8 || + format == PIXMAN_r5g6b5 || + format == PIXMAN_b5g6r5 || + format == PIXMAN_a8 || +@@ -895,6 +897,8 @@ color_to_pixel (pixman_color_t * color, + ((c & 0x0000ff00) << 8) | + ((c & 0x000000ff) << 24); + } ++ if (PIXMAN_FORMAT_TYPE (format) == PIXMAN_TYPE_RGBA) ++ c = ((c & 0xff000000) >> 24) | (c << 8); + + if (format == PIXMAN_a1) + c = c >> 31; +@@ -1105,6 +1109,8 @@ pixman_format_supported_source (pixman_format_code_t format) + case PIXMAN_x8b8g8r8: + case PIXMAN_b8g8r8a8: + case PIXMAN_b8g8r8x8: ++ case PIXMAN_r8g8b8a8: ++ case PIXMAN_r8g8b8x8: + case PIXMAN_r8g8b8: + case PIXMAN_b8g8r8: + case PIXMAN_r5g6b5: +diff --git a/pixman/pixman.h b/pixman/pixman.h +index 1305bc1..59d0760 100644 +--- a/pixman/pixman.h ++++ b/pixman/pixman.h +@@ -650,11 +650,13 @@ struct pixman_indexed + #define PIXMAN_TYPE_YUY2 6 + #define PIXMAN_TYPE_YV12 7 + #define PIXMAN_TYPE_BGRA 8 ++#define PIXMAN_TYPE_RGBA 9 + + #define PIXMAN_FORMAT_COLOR(f) \ + (PIXMAN_FORMAT_TYPE(f) == PIXMAN_TYPE_ARGB || \ + PIXMAN_FORMAT_TYPE(f) == PIXMAN_TYPE_ABGR || \ +- PIXMAN_FORMAT_TYPE(f) == PIXMAN_TYPE_BGRA) ++ PIXMAN_FORMAT_TYPE(f) == PIXMAN_TYPE_BGRA || \ ++ PIXMAN_FORMAT_TYPE(f) == PIXMAN_TYPE_RGBA) + + /* 32bpp formats */ + typedef enum { +@@ -664,6 +666,8 @@ typedef enum { + PIXMAN_x8b8g8r8 = PIXMAN_FORMAT(32,PIXMAN_TYPE_ABGR,0,8,8,8), + PIXMAN_b8g8r8a8 = PIXMAN_FORMAT(32,PIXMAN_TYPE_BGRA,8,8,8,8), + PIXMAN_b8g8r8x8 = PIXMAN_FORMAT(32,PIXMAN_TYPE_BGRA,0,8,8,8), ++ PIXMAN_r8g8b8a8 = PIXMAN_FORMAT(32,PIXMAN_TYPE_RGBA,8,8,8,8), ++ PIXMAN_r8g8b8x8 = PIXMAN_FORMAT(32,PIXMAN_TYPE_RGBA,0,8,8,8), + PIXMAN_x14r6g6b6 = PIXMAN_FORMAT(32,PIXMAN_TYPE_ARGB,0,6,6,6), + PIXMAN_x2r10g10b10 = PIXMAN_FORMAT(32,PIXMAN_TYPE_ARGB,0,10,10,10), + PIXMAN_a2r10g10b10 = PIXMAN_FORMAT(32,PIXMAN_TYPE_ARGB,2,10,10,10), +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0028-Add-support-for-the-r8g8b8a8-and-r8g8b8x8-formats-to.patch b/recipes/xorg-lib/pixman-0.21.6/0028-Add-support-for-the-r8g8b8a8-and-r8g8b8x8-formats-to.patch new file mode 100644 index 0000000000..7809e2ae4a --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0028-Add-support-for-the-r8g8b8a8-and-r8g8b8x8-formats-to.patch @@ -0,0 +1,110 @@ +From b514e63cfc58af21f7097db5a1b04292a758782a Mon Sep 17 00:00:00 2001 +From: Alexandros Frantzis +Date: Fri, 18 Mar 2011 14:37:27 +0200 +Subject: [PATCH 28/40] Add support for the r8g8b8a8 and r8g8b8x8 formats to the tests. + +--- + test/blitters-test.c | 9 +++++++-- + test/composite.c | 9 +++++++++ + test/fetch-test.c | 10 ++++++++++ + test/stress-test.c | 2 ++ + 4 files changed, 28 insertions(+), 2 deletions(-) + +diff --git a/test/blitters-test.c b/test/blitters-test.c +index 63e7cb3..3ecfb09 100644 +--- a/test/blitters-test.c ++++ b/test/blitters-test.c +@@ -88,8 +88,11 @@ free_random_image (uint32_t initcrc, + uint32_t *data = pixman_image_get_data (img); + uint32_t mask = (1 << PIXMAN_FORMAT_DEPTH (fmt)) - 1; + +- if (PIXMAN_FORMAT_TYPE (fmt) == PIXMAN_TYPE_BGRA) ++ if (PIXMAN_FORMAT_TYPE (fmt) == PIXMAN_TYPE_BGRA || ++ PIXMAN_FORMAT_TYPE (fmt) == PIXMAN_TYPE_RGBA) ++ { + mask <<= (PIXMAN_FORMAT_BPP (fmt) - PIXMAN_FORMAT_DEPTH (fmt)); ++ } + + for (i = 0; i < 32; i++) + mask |= mask << (i * PIXMAN_FORMAT_BPP (fmt)); +@@ -182,6 +185,8 @@ static pixman_format_code_t img_fmt_list[] = { + PIXMAN_x8b8g8r8, + PIXMAN_b8g8r8a8, + PIXMAN_b8g8r8x8, ++ PIXMAN_r8g8b8a8, ++ PIXMAN_r8g8b8x8, + PIXMAN_x14r6g6b6, + PIXMAN_r8g8b8, + PIXMAN_b8g8r8, +@@ -412,6 +417,6 @@ main (int argc, const char *argv[]) + } + + return fuzzer_test_main("blitters", 2000000, +- 0x1DB8BDF8, ++ 0x265CDFEB, + test_composite, argc, argv); + } +diff --git a/test/composite.c b/test/composite.c +index e6d52b9..b0e0ba4 100644 +--- a/test/composite.c ++++ b/test/composite.c +@@ -102,6 +102,8 @@ static const format_t formats[] = + P(x8b8g8r8), + P(b8g8r8a8), + P(b8g8r8x8), ++ P(r8g8b8a8), ++ P(r8g8b8x8), + P(x2r10g10b10), + P(x2b10g10r10), + P(a2r10g10b10), +@@ -556,6 +558,13 @@ get_pixel (pixman_image_t *image, + bs = g + gs; + break; + ++ case PIXMAN_TYPE_RGBA: ++ as = 0; ++ bs = PIXMAN_FORMAT_BPP (format) - (b + g + r); ++ gs = b + bs; ++ rs = g + gs; ++ break; ++ + case PIXMAN_TYPE_A: + as = 0; + rs = 0; +diff --git a/test/fetch-test.c b/test/fetch-test.c +index 60bc765..feb98d9 100644 +--- a/test/fetch-test.c ++++ b/test/fetch-test.c +@@ -34,6 +34,16 @@ static testcase_t testcases[] = + NULL, + }, + { ++ PIXMAN_r8g8b8a8, ++ 2, 2, ++ 8, ++ { 0x11223300, 0x55667744, ++ 0x99aabb88, 0xddeeffcc }, ++ { 0x00112233, 0x44556677, ++ 0x8899aabb, 0xccddeeff }, ++ NULL, ++ }, ++ { + PIXMAN_g1, + 8, 2, + 4, +diff --git a/test/stress-test.c b/test/stress-test.c +index d496f93..571420a 100644 +--- a/test/stress-test.c ++++ b/test/stress-test.c +@@ -19,6 +19,8 @@ static const pixman_format_code_t image_formats[] = + PIXMAN_x8b8g8r8, + PIXMAN_b8g8r8a8, + PIXMAN_b8g8r8x8, ++ PIXMAN_r8g8b8a8, ++ PIXMAN_r8g8b8x8, + PIXMAN_x14r6g6b6, + PIXMAN_r8g8b8, + PIXMAN_b8g8r8, +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0029-test-Fix-infinite-loop-in-composite.patch b/recipes/xorg-lib/pixman-0.21.6/0029-test-Fix-infinite-loop-in-composite.patch new file mode 100644 index 0000000000..d9e4a380ee --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0029-test-Fix-infinite-loop-in-composite.patch @@ -0,0 +1,37 @@ +From ad3cbfb073fc325e1b3152898ca71b8255675957 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= +Date: Tue, 22 Mar 2011 13:42:05 -0400 +Subject: [PATCH 29/40] test: Fix infinite loop in composite + +When run in PIXMAN_RANDOMIZE_TESTS mode, this test would go into an +infinite loop because the loop started at 'seed' but the stop +condition was still N_TESTS. +--- + test/composite.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/test/composite.c b/test/composite.c +index b0e0ba4..9a001e5 100644 +--- a/test/composite.c ++++ b/test/composite.c +@@ -909,13 +909,13 @@ main (int argc, char **argv) + #ifdef USE_OPENMP + # pragma omp parallel for default(none) shared(result, argv, seed) + #endif +- for (i = seed; i <= N_TESTS; ++i) ++ for (i = 0; i <= N_TESTS; ++i) + { +- if (!result && !run_test (i)) ++ if (!result && !run_test (i + seed)) + { +- printf ("Test 0x%08X failed.\n", i); ++ printf ("Test 0x%08X failed.\n", seed + i); + +- result = i; ++ result = seed + i; + } + } + +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0030-ARM-tweaked-horizontal-weights-update-in-NEON-biline.patch b/recipes/xorg-lib/pixman-0.21.6/0030-ARM-tweaked-horizontal-weights-update-in-NEON-biline.patch new file mode 100644 index 0000000000..831065cb3e --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0030-ARM-tweaked-horizontal-weights-update-in-NEON-biline.patch @@ -0,0 +1,82 @@ +From 4a0ade2a1e96fe3f1bca8953be221af0b2908925 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Thu, 10 Mar 2011 15:34:10 +0200 +Subject: [PATCH 30/40] ARM: tweaked horizontal weights update in NEON bilinear scaling code + +Moving horizontal interpolation weights update instructions from the +beginning of loop to its end allows to hide some pipeline stalls and +improve performance. +--- + pixman/pixman-arm-neon-asm.S | 20 +++++++++++--------- + 1 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S +index 71b30ac..8788e95 100644 +--- a/pixman/pixman-arm-neon-asm.S ++++ b/pixman/pixman-arm-neon-asm.S +@@ -2558,8 +2558,7 @@ fname: + bilinear_load_&src_fmt d0, d1, d2 + vmull.u8 q1, d0, d28 + vmlal.u8 q1, d1, d29 +- vshr.u16 d30, d24, #8 +- /* 4 cycles bubble */ ++ /* 5 cycles bubble */ + vshll.u16 q0, d2, #8 + vmlsl.u16 q0, d2, d30 + vmlal.u16 q0, d3, d30 +@@ -2574,17 +2573,17 @@ fname: + .macro bilinear_interpolate_two_pixels src_fmt, dst_fmt + bilinear_load_and_vertical_interpolate_two_&src_fmt \ + q1, q11, d0, d1, d20, d21, d22, d23 +- vshr.u16 q15, q12, #8 +- vadd.u16 q12, q12, q13 + vshll.u16 q0, d2, #8 + vmlsl.u16 q0, d2, d30 + vmlal.u16 q0, d3, d30 + vshll.u16 q10, d22, #8 + vmlsl.u16 q10, d22, d31 + vmlal.u16 q10, d23, d31 +- vshrn.u32 d30, q0, #16 +- vshrn.u32 d31, q10, #16 +- vmovn.u16 d0, q15 ++ vshrn.u32 d0, q0, #16 ++ vshrn.u32 d1, q10, #16 ++ vshr.u16 q15, q12, #8 ++ vadd.u16 q12, q12, q13 ++ vmovn.u16 d0, q0 + bilinear_store_&dst_fmt 2, q2, q3 + .endm + +@@ -2593,8 +2592,6 @@ fname: + q1, q11, d0, d1, d20, d21, d22, d23 \ + q3, q9, d4, d5, d16, d17, d18, d19 + pld [TMP1, PF_OFFS] +- vshr.u16 q15, q12, #8 +- vadd.u16 q12, q12, q13 + vshll.u16 q0, d2, #8 + vmlsl.u16 q0, d2, d30 + vmlal.u16 q0, d3, d30 +@@ -2614,8 +2611,10 @@ fname: + vshrn.u32 d1, q10, #16 + vshrn.u32 d4, q2, #16 + vshrn.u32 d5, q8, #16 ++ vshr.u16 q15, q12, #8 + vmovn.u16 d0, q0 + vmovn.u16 d1, q2 ++ vadd.u16 q12, q12, q13 + bilinear_store_&dst_fmt 4, q2, q3 + .endm + +@@ -2669,6 +2668,9 @@ pixman_asm_function fname + vadd.u16 d25, d25, d26 + vadd.u16 q13, q13, q13 + ++ vshr.u16 q15, q12, #8 ++ vadd.u16 q12, q12, q13 ++ + subs WIDTH, WIDTH, #4 + blt 1f + mov PF_OFFS, PF_OFFS, asr #(16 - bpp_shift) +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0031-ARM-use-aligned-memory-writes-in-NEON-bilinear-scali.patch b/recipes/xorg-lib/pixman-0.21.6/0031-ARM-use-aligned-memory-writes-in-NEON-bilinear-scali.patch new file mode 100644 index 0000000000..3c8394b983 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0031-ARM-use-aligned-memory-writes-in-NEON-bilinear-scali.patch @@ -0,0 +1,124 @@ +From f36c189475951276766b2653ae9628c4d02dc0c9 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Thu, 10 Mar 2011 16:12:23 +0200 +Subject: [PATCH 31/40] ARM: use aligned memory writes in NEON bilinear scaling code + +--- + pixman/pixman-arm-neon-asm.S | 49 ++++++++++++++++++++++++++++++------------ + 1 files changed, 35 insertions(+), 14 deletions(-) + +diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S +index 8788e95..a4d6a9a 100644 +--- a/pixman/pixman-arm-neon-asm.S ++++ b/pixman/pixman-arm-neon-asm.S +@@ -2527,9 +2527,9 @@ fname: + + .macro bilinear_store_8888 numpix, tmp1, tmp2 + .if numpix == 4 +- vst1.32 {d0, d1}, [OUT]! ++ vst1.32 {d0, d1}, [OUT, :128]! + .elseif numpix == 2 +- vst1.32 {d0}, [OUT]! ++ vst1.32 {d0}, [OUT, :64]! + .elseif numpix == 1 + vst1.32 {d0[0]}, [OUT, :32]! + .else +@@ -2544,11 +2544,11 @@ fname: + vuzp.u8 d0, d2 + convert_8888_to_0565 d2, d1, d0, q1, tmp1, tmp2 + .if numpix == 4 +- vst1.16 {d2}, [OUT]! ++ vst1.16 {d2}, [OUT, :64]! + .elseif numpix == 2 +- vst1.32 {d2[0]}, [OUT]! ++ vst1.32 {d2[0]}, [OUT, :32]! + .elseif numpix == 1 +- vst1.16 {d2[0]}, [OUT]! ++ vst1.16 {d2[0]}, [OUT, :16]! + .else + .error bilinear_store_0565 numpix is unsupported + .endif +@@ -2622,8 +2622,7 @@ fname: + * Main template macro for generating NEON optimized bilinear scanline + * functions. + * +- * TODO: use software pipelining and aligned writes to the destination buffer +- * in order to improve performance ++ * TODO: use software pipelining in order to improve performance + * + * Bilinear scanline scaler macro template uses the following arguments: + * fname - name of the function to generate +@@ -2635,7 +2634,8 @@ fname: + */ + + .macro generate_bilinear_scanline_func fname, src_fmt, dst_fmt, \ +- bpp_shift, prefetch_distance ++ src_bpp_shift, dst_bpp_shift, \ ++ prefetch_distance + + pixman_asm_function fname + OUT .req r0 +@@ -2666,19 +2666,40 @@ pixman_asm_function fname + vdup.u8 d28, WT + vdup.u8 d29, WB + vadd.u16 d25, d25, d26 +- vadd.u16 q13, q13, q13 + ++ /* ensure good destination alignment */ ++ cmp WIDTH, #1 ++ blt 0f ++ tst OUT, #(1 << dst_bpp_shift) ++ beq 0f ++ vshr.u16 q15, q12, #8 ++ vadd.u16 q12, q12, q13 ++ bilinear_interpolate_last_pixel src_fmt, dst_fmt ++ sub WIDTH, WIDTH, #1 ++0: ++ vadd.u16 q13, q13, q13 + vshr.u16 q15, q12, #8 + vadd.u16 q12, q12, q13 + ++ cmp WIDTH, #2 ++ blt 0f ++ tst OUT, #(1 << (dst_bpp_shift + 1)) ++ beq 0f ++ bilinear_interpolate_two_pixels src_fmt, dst_fmt ++ sub WIDTH, WIDTH, #2 ++0: ++ ++ /* start the main loop */ + subs WIDTH, WIDTH, #4 + blt 1f +- mov PF_OFFS, PF_OFFS, asr #(16 - bpp_shift) ++ mov PF_OFFS, PF_OFFS, asr #(16 - src_bpp_shift) + 0: + bilinear_interpolate_four_pixels src_fmt, dst_fmt + subs WIDTH, WIDTH, #4 + bge 0b + 1: ++ ++ /* handle the remaining trailing pixels */ + tst WIDTH, #2 + beq 2f + bilinear_interpolate_two_pixels src_fmt, dst_fmt +@@ -2708,13 +2729,13 @@ pixman_asm_function fname + .endm + + generate_bilinear_scanline_func \ +- pixman_scaled_bilinear_scanline_8888_8888_SRC_asm_neon, 8888, 8888, 2, 28 ++ pixman_scaled_bilinear_scanline_8888_8888_SRC_asm_neon, 8888, 8888, 2, 2, 28 + + generate_bilinear_scanline_func \ +- pixman_scaled_bilinear_scanline_8888_0565_SRC_asm_neon, 8888, 0565, 2, 28 ++ pixman_scaled_bilinear_scanline_8888_0565_SRC_asm_neon, 8888, 0565, 2, 1, 28 + + generate_bilinear_scanline_func \ +- pixman_scaled_bilinear_scanline_0565_x888_SRC_asm_neon, 0565, 8888, 1, 28 ++ pixman_scaled_bilinear_scanline_0565_x888_SRC_asm_neon, 0565, 8888, 1, 2, 28 + + generate_bilinear_scanline_func \ +- pixman_scaled_bilinear_scanline_0565_0565_SRC_asm_neon, 0565, 0565, 1, 28 ++ pixman_scaled_bilinear_scanline_0565_0565_SRC_asm_neon, 0565, 0565, 1, 1, 28 +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0032-ARM-support-for-software-pipelining-in-bilinear-macr.patch b/recipes/xorg-lib/pixman-0.21.6/0032-ARM-support-for-software-pipelining-in-bilinear-macr.patch new file mode 100644 index 0000000000..c67f9c638f --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0032-ARM-support-for-software-pipelining-in-bilinear-macr.patch @@ -0,0 +1,70 @@ +From 6d296598575b8307262fac2cf438d7cc832d09d3 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Wed, 16 Mar 2011 16:33:41 +0200 +Subject: [PATCH 32/40] ARM: support for software pipelining in bilinear macros + +Now it's possible to override the main loop of bilinear scaling code +with optimized pipelined implementation. +--- + pixman/pixman-arm-neon-asm.S | 31 ++++++++++++++++++++++++++++--- + 1 files changed, 28 insertions(+), 3 deletions(-) + +diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S +index a4d6a9a..d84f2cc 100644 +--- a/pixman/pixman-arm-neon-asm.S ++++ b/pixman/pixman-arm-neon-asm.S +@@ -2618,12 +2618,32 @@ fname: + bilinear_store_&dst_fmt 4, q2, q3 + .endm + ++.macro bilinear_interpolate_four_pixels_head src_fmt, dst_fmt ++.ifdef have_bilinear_interpolate_four_pixels_&src_fmt&_&dst_fmt ++ bilinear_interpolate_four_pixels_&src_fmt&_&dst_fmt&_head ++.else ++ bilinear_interpolate_four_pixels src_fmt, dst_fmt ++.endif ++.endm ++ ++.macro bilinear_interpolate_four_pixels_tail src_fmt, dst_fmt ++.ifdef have_bilinear_interpolate_four_pixels_&src_fmt&_&dst_fmt ++ bilinear_interpolate_four_pixels_&src_fmt&_&dst_fmt&_tail ++.endif ++.endm ++ ++.macro bilinear_interpolate_four_pixels_tail_head src_fmt, dst_fmt ++.ifdef have_bilinear_interpolate_four_pixels_&src_fmt&_&dst_fmt ++ bilinear_interpolate_four_pixels_&src_fmt&_&dst_fmt&_tail_head ++.else ++ bilinear_interpolate_four_pixels src_fmt, dst_fmt ++.endif ++.endm ++ + /* + * Main template macro for generating NEON optimized bilinear scanline + * functions. + * +- * TODO: use software pipelining in order to improve performance +- * + * Bilinear scanline scaler macro template uses the following arguments: + * fname - name of the function to generate + * src_fmt - source color format (8888 or 0565) +@@ -2693,10 +2713,15 @@ pixman_asm_function fname + subs WIDTH, WIDTH, #4 + blt 1f + mov PF_OFFS, PF_OFFS, asr #(16 - src_bpp_shift) ++ bilinear_interpolate_four_pixels_head src_fmt, dst_fmt ++ subs WIDTH, WIDTH, #4 ++ blt 5f + 0: +- bilinear_interpolate_four_pixels src_fmt, dst_fmt ++ bilinear_interpolate_four_pixels_tail_head src_fmt, dst_fmt + subs WIDTH, WIDTH, #4 + bge 0b ++5: ++ bilinear_interpolate_four_pixels_tail src_fmt, dst_fmt + 1: + + /* handle the remaining trailing pixels */ +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0033-ARM-use-less-ARM-instructions-in-NEON-bilinear-scali.patch b/recipes/xorg-lib/pixman-0.21.6/0033-ARM-use-less-ARM-instructions-in-NEON-bilinear-scali.patch new file mode 100644 index 0000000000..1d66979f99 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0033-ARM-use-less-ARM-instructions-in-NEON-bilinear-scali.patch @@ -0,0 +1,168 @@ +From ec2da8e651767421a8403bf0810445fdec1315ba Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Mon, 21 Mar 2011 18:41:53 +0200 +Subject: [PATCH 33/40] ARM: use less ARM instructions in NEON bilinear scaling code + +This reduces code size and also puts less pressure on the +instruction decoder. +--- + pixman/pixman-arm-neon-asm.S | 79 ++++++++++++++++++++---------------------- + 1 files changed, 38 insertions(+), 41 deletions(-) + +diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S +index d84f2cc..9878bf7 100644 +--- a/pixman/pixman-arm-neon-asm.S ++++ b/pixman/pixman-arm-neon-asm.S +@@ -2412,21 +2412,19 @@ fname: + */ + + .macro bilinear_load_8888 reg1, reg2, tmp +- mov TMP2, X, asr #16 ++ mov TMP1, X, asr #16 + add X, X, UX +- add TMP1, TOP, TMP2, asl #2 +- add TMP2, BOTTOM, TMP2, asl #2 +- vld1.32 {reg1}, [TMP1] +- vld1.32 {reg2}, [TMP2] ++ add TMP1, TOP, TMP1, asl #2 ++ vld1.32 {reg1}, [TMP1], STRIDE ++ vld1.32 {reg2}, [TMP1] + .endm + + .macro bilinear_load_0565 reg1, reg2, tmp +- mov TMP2, X, asr #16 ++ mov TMP1, X, asr #16 + add X, X, UX +- add TMP1, TOP, TMP2, asl #1 +- add TMP2, BOTTOM, TMP2, asl #1 +- vld1.32 {reg2[0]}, [TMP1] +- vld1.32 {reg2[1]}, [TMP2] ++ add TMP1, TOP, TMP1, asl #1 ++ vld1.32 {reg2[0]}, [TMP1], STRIDE ++ vld1.32 {reg2[1]}, [TMP1] + convert_four_0565_to_x888_packed reg2, reg1, reg2, tmp + .endm + +@@ -2454,18 +2452,16 @@ fname: + .macro bilinear_load_and_vertical_interpolate_two_0565 \ + acc1, acc2, reg1, reg2, reg3, reg4, acc2lo, acc2hi + +- mov TMP2, X, asr #16 ++ mov TMP1, X, asr #16 + add X, X, UX +- mov TMP4, X, asr #16 ++ add TMP1, TOP, TMP1, asl #1 ++ mov TMP2, X, asr #16 + add X, X, UX +- add TMP1, TOP, TMP2, asl #1 +- add TMP2, BOTTOM, TMP2, asl #1 +- add TMP3, TOP, TMP4, asl #1 +- add TMP4, BOTTOM, TMP4, asl #1 +- vld1.32 {acc2lo[0]}, [TMP1] +- vld1.32 {acc2hi[0]}, [TMP3] +- vld1.32 {acc2lo[1]}, [TMP2] +- vld1.32 {acc2hi[1]}, [TMP4] ++ add TMP2, TOP, TMP2, asl #1 ++ vld1.32 {acc2lo[0]}, [TMP1], STRIDE ++ vld1.32 {acc2hi[0]}, [TMP2], STRIDE ++ vld1.32 {acc2lo[1]}, [TMP1] ++ vld1.32 {acc2hi[1]}, [TMP2] + convert_0565_to_x888 acc2, reg3, reg2, reg1 + vzip.u8 reg1, reg3 + vzip.u8 reg2, reg4 +@@ -2481,34 +2477,30 @@ fname: + xacc1, xacc2, xreg1, xreg2, xreg3, xreg4, xacc2lo, xacc2hi \ + yacc1, yacc2, yreg1, yreg2, yreg3, yreg4, yacc2lo, yacc2hi + +- mov TMP2, X, asr #16 ++ mov TMP1, X, asr #16 + add X, X, UX +- mov TMP4, X, asr #16 ++ add TMP1, TOP, TMP1, asl #1 ++ mov TMP2, X, asr #16 + add X, X, UX +- add TMP1, TOP, TMP2, asl #1 +- add TMP2, BOTTOM, TMP2, asl #1 +- add TMP3, TOP, TMP4, asl #1 +- add TMP4, BOTTOM, TMP4, asl #1 +- vld1.32 {xacc2lo[0]}, [TMP1] +- vld1.32 {xacc2hi[0]}, [TMP3] +- vld1.32 {xacc2lo[1]}, [TMP2] +- vld1.32 {xacc2hi[1]}, [TMP4] ++ add TMP2, TOP, TMP2, asl #1 ++ vld1.32 {xacc2lo[0]}, [TMP1], STRIDE ++ vld1.32 {xacc2hi[0]}, [TMP2], STRIDE ++ vld1.32 {xacc2lo[1]}, [TMP1] ++ vld1.32 {xacc2hi[1]}, [TMP2] + convert_0565_to_x888 xacc2, xreg3, xreg2, xreg1 +- mov TMP2, X, asr #16 ++ mov TMP1, X, asr #16 + add X, X, UX +- mov TMP4, X, asr #16 ++ add TMP1, TOP, TMP1, asl #1 ++ mov TMP2, X, asr #16 + add X, X, UX +- add TMP1, TOP, TMP2, asl #1 +- add TMP2, BOTTOM, TMP2, asl #1 +- add TMP3, TOP, TMP4, asl #1 +- add TMP4, BOTTOM, TMP4, asl #1 +- vld1.32 {yacc2lo[0]}, [TMP1] ++ add TMP2, TOP, TMP2, asl #1 ++ vld1.32 {yacc2lo[0]}, [TMP1], STRIDE + vzip.u8 xreg1, xreg3 +- vld1.32 {yacc2hi[0]}, [TMP3] ++ vld1.32 {yacc2hi[0]}, [TMP2], STRIDE + vzip.u8 xreg2, xreg4 +- vld1.32 {yacc2lo[1]}, [TMP2] ++ vld1.32 {yacc2lo[1]}, [TMP1] + vzip.u8 xreg3, xreg4 +- vld1.32 {yacc2hi[1]}, [TMP4] ++ vld1.32 {yacc2hi[1]}, [TMP2] + vzip.u8 xreg1, xreg2 + convert_0565_to_x888 yacc2, yreg3, yreg2, yreg1 + vmull.u8 xacc1, xreg1, d28 +@@ -2592,6 +2584,7 @@ fname: + q1, q11, d0, d1, d20, d21, d22, d23 \ + q3, q9, d4, d5, d16, d17, d18, d19 + pld [TMP1, PF_OFFS] ++ sub TMP1, TMP1, STRIDE + vshll.u16 q0, d2, #8 + vmlsl.u16 q0, d2, d30 + vmlal.u16 q0, d3, d30 +@@ -2671,6 +2664,7 @@ pixman_asm_function fname + PF_OFFS .req r7 + TMP3 .req r8 + TMP4 .req r9 ++ STRIDE .req r2 + + mov ip, sp + push {r4, r5, r6, r7, r8, r9} +@@ -2678,6 +2672,9 @@ pixman_asm_function fname + ldmia ip, {WB, X, UX, WIDTH} + mul PF_OFFS, PF_OFFS, UX + ++ sub STRIDE, BOTTOM, TOP ++ .unreq BOTTOM ++ + cmp WIDTH, #0 + ble 3f + +@@ -2738,7 +2735,6 @@ pixman_asm_function fname + + .unreq OUT + .unreq TOP +- .unreq BOTTOM + .unreq WT + .unreq WB + .unreq X +@@ -2749,6 +2745,7 @@ pixman_asm_function fname + .unreq PF_OFFS + .unreq TMP3 + .unreq TMP4 ++ .unreq STRIDE + .endfunc + + .endm +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0034-ARM-support-different-levels-of-loop-unrolling-in-bi.patch b/recipes/xorg-lib/pixman-0.21.6/0034-ARM-support-different-levels-of-loop-unrolling-in-bi.patch new file mode 100644 index 0000000000..82661f0869 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0034-ARM-support-different-levels-of-loop-unrolling-in-bi.patch @@ -0,0 +1,156 @@ +From cd20ceb7602348ecbfa0db1756dc548a0bad3c9d Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Thu, 17 Mar 2011 19:42:01 +0200 +Subject: [PATCH 34/40] ARM: support different levels of loop unrolling in bilinear scaler + +Now an extra 'flag' parameter is supported in bilinear scaline scaling +function generation macro. It can be used to enable 4 or 8 pixels per +loop iteration unrolling and provide save/restore code for d8-d15 +registers. +--- + pixman/pixman-arm-neon-asm.S | 84 ++++++++++++++++++++++++++++++++++++++---- + 1 files changed, 76 insertions(+), 8 deletions(-) + +diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S +index 9878bf7..6141770 100644 +--- a/pixman/pixman-arm-neon-asm.S ++++ b/pixman/pixman-arm-neon-asm.S +@@ -2633,6 +2633,36 @@ fname: + .endif + .endm + ++.macro bilinear_interpolate_eight_pixels_head src_fmt, dst_fmt ++.ifdef have_bilinear_interpolate_eight_pixels_&src_fmt&_&dst_fmt ++ bilinear_interpolate_eight_pixels_&src_fmt&_&dst_fmt&_head ++.else ++ bilinear_interpolate_four_pixels_head src_fmt, dst_fmt ++ bilinear_interpolate_four_pixels_tail_head src_fmt, dst_fmt ++.endif ++.endm ++ ++.macro bilinear_interpolate_eight_pixels_tail src_fmt, dst_fmt ++.ifdef have_bilinear_interpolate_eight_pixels_&src_fmt&_&dst_fmt ++ bilinear_interpolate_eight_pixels_&src_fmt&_&dst_fmt&_tail ++.else ++ bilinear_interpolate_four_pixels_tail src_fmt, dst_fmt ++.endif ++.endm ++ ++.macro bilinear_interpolate_eight_pixels_tail_head src_fmt, dst_fmt ++.ifdef have_bilinear_interpolate_eight_pixels_&src_fmt&_&dst_fmt ++ bilinear_interpolate_eight_pixels_&src_fmt&_&dst_fmt&_tail_head ++.else ++ bilinear_interpolate_four_pixels_tail_head src_fmt, dst_fmt ++ bilinear_interpolate_four_pixels_tail_head src_fmt, dst_fmt ++.endif ++.endm ++ ++.set BILINEAR_FLAG_UNROLL_4, 0 ++.set BILINEAR_FLAG_UNROLL_8, 1 ++.set BILINEAR_FLAG_USE_ALL_NEON_REGS, 2 ++ + /* + * Main template macro for generating NEON optimized bilinear scanline + * functions. +@@ -2648,7 +2678,7 @@ fname: + + .macro generate_bilinear_scanline_func fname, src_fmt, dst_fmt, \ + src_bpp_shift, dst_bpp_shift, \ +- prefetch_distance ++ prefetch_distance, flags + + pixman_asm_function fname + OUT .req r0 +@@ -2672,6 +2702,10 @@ pixman_asm_function fname + ldmia ip, {WB, X, UX, WIDTH} + mul PF_OFFS, PF_OFFS, UX + ++.if ((flags) & BILINEAR_FLAG_USE_ALL_NEON_REGS) != 0 ++ vpush {d8-d15} ++.endif ++ + sub STRIDE, BOTTOM, TOP + .unreq BOTTOM + +@@ -2705,8 +2739,34 @@ pixman_asm_function fname + bilinear_interpolate_two_pixels src_fmt, dst_fmt + sub WIDTH, WIDTH, #2 + 0: +- +- /* start the main loop */ ++.if ((flags) & BILINEAR_FLAG_UNROLL_8) != 0 ++/*********** 8 pixels per iteration *****************/ ++ cmp WIDTH, #4 ++ blt 0f ++ tst OUT, #(1 << (dst_bpp_shift + 2)) ++ beq 0f ++ bilinear_interpolate_four_pixels src_fmt, dst_fmt ++ sub WIDTH, WIDTH, #4 ++0: ++ subs WIDTH, WIDTH, #8 ++ blt 1f ++ mov PF_OFFS, PF_OFFS, asr #(16 - src_bpp_shift) ++ bilinear_interpolate_eight_pixels_head src_fmt, dst_fmt ++ subs WIDTH, WIDTH, #8 ++ blt 5f ++0: ++ bilinear_interpolate_eight_pixels_tail_head src_fmt, dst_fmt ++ subs WIDTH, WIDTH, #8 ++ bge 0b ++5: ++ bilinear_interpolate_eight_pixels_tail src_fmt, dst_fmt ++1: ++ tst WIDTH, #4 ++ beq 2f ++ bilinear_interpolate_four_pixels src_fmt, dst_fmt ++2: ++.else ++/*********** 4 pixels per iteration *****************/ + subs WIDTH, WIDTH, #4 + blt 1f + mov PF_OFFS, PF_OFFS, asr #(16 - src_bpp_shift) +@@ -2720,7 +2780,8 @@ pixman_asm_function fname + 5: + bilinear_interpolate_four_pixels_tail src_fmt, dst_fmt + 1: +- ++/****************************************************/ ++.endif + /* handle the remaining trailing pixels */ + tst WIDTH, #2 + beq 2f +@@ -2730,6 +2791,9 @@ pixman_asm_function fname + beq 3f + bilinear_interpolate_last_pixel src_fmt, dst_fmt + 3: ++.if ((flags) & BILINEAR_FLAG_USE_ALL_NEON_REGS) != 0 ++ vpop {d8-d15} ++.endif + pop {r4, r5, r6, r7, r8, r9} + bx lr + +@@ -2751,13 +2815,17 @@ pixman_asm_function fname + .endm + + generate_bilinear_scanline_func \ +- pixman_scaled_bilinear_scanline_8888_8888_SRC_asm_neon, 8888, 8888, 2, 2, 28 ++ pixman_scaled_bilinear_scanline_8888_8888_SRC_asm_neon, 8888, 8888, \ ++ 2, 2, 28, BILINEAR_FLAG_UNROLL_4 + + generate_bilinear_scanline_func \ +- pixman_scaled_bilinear_scanline_8888_0565_SRC_asm_neon, 8888, 0565, 2, 1, 28 ++ pixman_scaled_bilinear_scanline_8888_0565_SRC_asm_neon, 8888, 0565, \ ++ 2, 1, 28, BILINEAR_FLAG_UNROLL_4 + + generate_bilinear_scanline_func \ +- pixman_scaled_bilinear_scanline_0565_x888_SRC_asm_neon, 0565, 8888, 1, 2, 28 ++ pixman_scaled_bilinear_scanline_0565_x888_SRC_asm_neon, 0565, 8888, \ ++ 1, 2, 28, BILINEAR_FLAG_UNROLL_4 + + generate_bilinear_scanline_func \ +- pixman_scaled_bilinear_scanline_0565_0565_SRC_asm_neon, 0565, 0565, 1, 1, 28 ++ pixman_scaled_bilinear_scanline_0565_0565_SRC_asm_neon, 0565, 0565, \ ++ 1, 1, 28, BILINEAR_FLAG_UNROLL_4 +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0035-ARM-pipelined-NEON-implementation-of-bilinear-scaled.patch b/recipes/xorg-lib/pixman-0.21.6/0035-ARM-pipelined-NEON-implementation-of-bilinear-scaled.patch new file mode 100644 index 0000000000..c0d485cae4 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0035-ARM-pipelined-NEON-implementation-of-bilinear-scaled.patch @@ -0,0 +1,166 @@ +From d3b1ca20fe8af20ca097dcc8799ef25cee03dd6b Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Wed, 16 Mar 2011 17:24:49 +0200 +Subject: [PATCH 35/40] ARM: pipelined NEON implementation of bilinear scaled 'src_8888_8888' + +Performance of the inner loop when working with the data in L1 cache: + ARM Cortex-A8: 41 cycles per 4 pixels (no stalls and partial dual issue) + ARM Cortex-A9: 48 cycles per 4 pixels (no stalls) + +It might be still possible to improve performance even more on ARM Cortex-A8 +with a better use of dual issue. + +Benchmark on ARM Cortex-A8 r1p3 @600MHz, 32-bit LPDDR @166MHz: + Microbenchmark (scaling 2000x2000 image with scale factor close to 1x): + before: op=1, src=20028888, dst=20028888, speed=40.38 MPix/s + after: op=1, src=20028888, dst=20028888, speed=48.47 MPix/s + +Benchmark on ARM Cortex-A8 r2p2 @1GHz, 32-bit LPDDR @200MHz: + Microbenchmark (scaling 2000x2000 image with scale factor close to 1x): + before: op=1, src=20028888, dst=20028888, speed=79.68 MPix/s + after: op=1, src=20028888, dst=20028888, speed=93.11 MPix/s +--- + pixman/pixman-arm-neon-asm.S | 127 ++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 127 insertions(+), 0 deletions(-) + +diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S +index 6141770..326e085 100644 +--- a/pixman/pixman-arm-neon-asm.S ++++ b/pixman/pixman-arm-neon-asm.S +@@ -2814,6 +2814,133 @@ pixman_asm_function fname + + .endm + ++/*****************************************************************************/ ++ ++.set have_bilinear_interpolate_four_pixels_8888_8888, 1 ++ ++.macro bilinear_interpolate_four_pixels_8888_8888_head ++ mov TMP1, X, asr #16 ++ add X, X, UX ++ add TMP1, TOP, TMP1, asl #2 ++ mov TMP2, X, asr #16 ++ add X, X, UX ++ add TMP2, TOP, TMP2, asl #2 ++ ++ vld1.32 {d22}, [TMP1], STRIDE ++ vld1.32 {d23}, [TMP1] ++ mov TMP3, X, asr #16 ++ add X, X, UX ++ add TMP3, TOP, TMP3, asl #2 ++ vmull.u8 q8, d22, d28 ++ vmlal.u8 q8, d23, d29 ++ ++ vld1.32 {d22}, [TMP2], STRIDE ++ vld1.32 {d23}, [TMP2] ++ mov TMP4, X, asr #16 ++ add X, X, UX ++ add TMP4, TOP, TMP4, asl #2 ++ vmull.u8 q9, d22, d28 ++ vmlal.u8 q9, d23, d29 ++ ++ vld1.32 {d22}, [TMP3], STRIDE ++ vld1.32 {d23}, [TMP3] ++ vmull.u8 q10, d22, d28 ++ vmlal.u8 q10, d23, d29 ++ ++ vshll.u16 q0, d16, #8 ++ vmlsl.u16 q0, d16, d30 ++ vmlal.u16 q0, d17, d30 ++ ++ pld [TMP4, PF_OFFS] ++ vld1.32 {d16}, [TMP4], STRIDE ++ vld1.32 {d17}, [TMP4] ++ pld [TMP4, PF_OFFS] ++ vmull.u8 q11, d16, d28 ++ vmlal.u8 q11, d17, d29 ++ ++ vshll.u16 q1, d18, #8 ++ vmlsl.u16 q1, d18, d31 ++.endm ++ ++.macro bilinear_interpolate_four_pixels_8888_8888_tail ++ vmlal.u16 q1, d19, d31 ++ vshr.u16 q15, q12, #8 ++ vshll.u16 q2, d20, #8 ++ vmlsl.u16 q2, d20, d30 ++ vmlal.u16 q2, d21, d30 ++ vshll.u16 q3, d22, #8 ++ vmlsl.u16 q3, d22, d31 ++ vmlal.u16 q3, d23, d31 ++ vadd.u16 q12, q12, q13 ++ vshrn.u32 d0, q0, #16 ++ vshrn.u32 d1, q1, #16 ++ vshrn.u32 d4, q2, #16 ++ vshr.u16 q15, q12, #8 ++ vshrn.u32 d5, q3, #16 ++ vmovn.u16 d6, q0 ++ vmovn.u16 d7, q2 ++ vadd.u16 q12, q12, q13 ++ vst1.32 {d6, d7}, [OUT, :128]! ++.endm ++ ++.macro bilinear_interpolate_four_pixels_8888_8888_tail_head ++ mov TMP1, X, asr #16 ++ add X, X, UX ++ add TMP1, TOP, TMP1, asl #2 ++ mov TMP2, X, asr #16 ++ add X, X, UX ++ add TMP2, TOP, TMP2, asl #2 ++ vmlal.u16 q1, d19, d31 ++ vshr.u16 q15, q12, #8 ++ vshll.u16 q2, d20, #8 ++ vmlsl.u16 q2, d20, d30 ++ vmlal.u16 q2, d21, d30 ++ vshll.u16 q3, d22, #8 ++ vld1.32 {d20}, [TMP1], STRIDE ++ vmlsl.u16 q3, d22, d31 ++ vmlal.u16 q3, d23, d31 ++ vld1.32 {d21}, [TMP1] ++ vmull.u8 q8, d20, d28 ++ vmlal.u8 q8, d21, d29 ++ vshrn.u32 d0, q0, #16 ++ vshrn.u32 d1, q1, #16 ++ vshrn.u32 d4, q2, #16 ++ vld1.32 {d22}, [TMP2], STRIDE ++ vshrn.u32 d5, q3, #16 ++ vadd.u16 q12, q12, q13 ++ vld1.32 {d23}, [TMP2] ++ vmull.u8 q9, d22, d28 ++ mov TMP3, X, asr #16 ++ add X, X, UX ++ add TMP3, TOP, TMP3, asl #2 ++ mov TMP4, X, asr #16 ++ add X, X, UX ++ add TMP4, TOP, TMP4, asl #2 ++ vmlal.u8 q9, d23, d29 ++ vld1.32 {d22}, [TMP3], STRIDE ++ vshr.u16 q15, q12, #8 ++ vld1.32 {d23}, [TMP3] ++ vmull.u8 q10, d22, d28 ++ vmlal.u8 q10, d23, d29 ++ vmovn.u16 d6, q0 ++ vshll.u16 q0, d16, #8 ++ vmovn.u16 d7, q2 ++ vmlsl.u16 q0, d16, d30 ++ vmlal.u16 q0, d17, d30 ++ pld [TMP4, PF_OFFS] ++ vld1.32 {d16}, [TMP4], STRIDE ++ vadd.u16 q12, q12, q13 ++ vld1.32 {d17}, [TMP4] ++ pld [TMP4, PF_OFFS] ++ vmull.u8 q11, d16, d28 ++ vmlal.u8 q11, d17, d29 ++ vst1.32 {d6, d7}, [OUT, :128]! ++ vshll.u16 q1, d18, #8 ++ vmlsl.u16 q1, d18, d31 ++.endm ++ ++/*****************************************************************************/ ++ + generate_bilinear_scanline_func \ + pixman_scaled_bilinear_scanline_8888_8888_SRC_asm_neon, 8888, 8888, \ + 2, 2, 28, BILINEAR_FLAG_UNROLL_4 +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0036-ARM-pipelined-NEON-implementation-of-bilinear-scaled.patch b/recipes/xorg-lib/pixman-0.21.6/0036-ARM-pipelined-NEON-implementation-of-bilinear-scaled.patch new file mode 100644 index 0000000000..4fca16fb9e --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0036-ARM-pipelined-NEON-implementation-of-bilinear-scaled.patch @@ -0,0 +1,283 @@ +From dfccf9b97acbff6e847e4e52c5dec0a4297d30a0 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Mon, 21 Mar 2011 20:25:27 +0200 +Subject: [PATCH 36/40] ARM: pipelined NEON implementation of bilinear scaled 'src_8888_0565' + +Benchmark on ARM Cortex-A8 r1p3 @600MHz, 32-bit LPDDR @166MHz: + Microbenchmark (scaling 2000x2000 image with scale factor close to 1x): + before: op=1, src=20028888, dst=10020565, speed=33.59 MPix/s + after: op=1, src=20028888, dst=10020565, speed=46.25 MPix/s + +Benchmark on ARM Cortex-A8 r2p2 @1GHz, 32-bit LPDDR @200MHz: + Microbenchmark (scaling 2000x2000 image with scale factor close to 1x): + before: op=1, src=20028888, dst=10020565, speed=63.86 MPix/s + after: op=1, src=20028888, dst=10020565, speed=84.22 MPix/s +--- + pixman/pixman-arm-neon-asm.S | 245 +++++++++++++++++++++++++++++++++++++++++- + 1 files changed, 244 insertions(+), 1 deletions(-) + +diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S +index 326e085..e560bdf 100644 +--- a/pixman/pixman-arm-neon-asm.S ++++ b/pixman/pixman-arm-neon-asm.S +@@ -2941,13 +2941,256 @@ pixman_asm_function fname + + /*****************************************************************************/ + ++.set have_bilinear_interpolate_eight_pixels_8888_0565, 1 ++ ++.macro bilinear_interpolate_eight_pixels_8888_0565_head ++ mov TMP1, X, asr #16 ++ add X, X, UX ++ add TMP1, TOP, TMP1, asl #2 ++ mov TMP2, X, asr #16 ++ add X, X, UX ++ add TMP2, TOP, TMP2, asl #2 ++ vld1.32 {d20}, [TMP1], STRIDE ++ vld1.32 {d21}, [TMP1] ++ vmull.u8 q8, d20, d28 ++ vmlal.u8 q8, d21, d29 ++ vld1.32 {d22}, [TMP2], STRIDE ++ vld1.32 {d23}, [TMP2] ++ vmull.u8 q9, d22, d28 ++ mov TMP3, X, asr #16 ++ add X, X, UX ++ add TMP3, TOP, TMP3, asl #2 ++ mov TMP4, X, asr #16 ++ add X, X, UX ++ add TMP4, TOP, TMP4, asl #2 ++ vmlal.u8 q9, d23, d29 ++ vld1.32 {d22}, [TMP3], STRIDE ++ vld1.32 {d23}, [TMP3] ++ vmull.u8 q10, d22, d28 ++ vmlal.u8 q10, d23, d29 ++ vshll.u16 q0, d16, #8 ++ vmlsl.u16 q0, d16, d30 ++ vmlal.u16 q0, d17, d30 ++ pld [TMP4, PF_OFFS] ++ vld1.32 {d16}, [TMP4], STRIDE ++ vld1.32 {d17}, [TMP4] ++ pld [TMP4, PF_OFFS] ++ vmull.u8 q11, d16, d28 ++ vmlal.u8 q11, d17, d29 ++ vshll.u16 q1, d18, #8 ++ vmlsl.u16 q1, d18, d31 ++ ++ mov TMP1, X, asr #16 ++ add X, X, UX ++ add TMP1, TOP, TMP1, asl #2 ++ mov TMP2, X, asr #16 ++ add X, X, UX ++ add TMP2, TOP, TMP2, asl #2 ++ vmlal.u16 q1, d19, d31 ++ vshr.u16 q15, q12, #8 ++ vshll.u16 q2, d20, #8 ++ vmlsl.u16 q2, d20, d30 ++ vmlal.u16 q2, d21, d30 ++ vshll.u16 q3, d22, #8 ++ vld1.32 {d20}, [TMP1], STRIDE ++ vmlsl.u16 q3, d22, d31 ++ vmlal.u16 q3, d23, d31 ++ vld1.32 {d21}, [TMP1] ++ vmull.u8 q8, d20, d28 ++ vmlal.u8 q8, d21, d29 ++ vshrn.u32 d0, q0, #16 ++ vshrn.u32 d1, q1, #16 ++ vshrn.u32 d4, q2, #16 ++ vld1.32 {d22}, [TMP2], STRIDE ++ vshrn.u32 d5, q3, #16 ++ vadd.u16 q12, q12, q13 ++ vld1.32 {d23}, [TMP2] ++ vmull.u8 q9, d22, d28 ++ mov TMP3, X, asr #16 ++ add X, X, UX ++ add TMP3, TOP, TMP3, asl #2 ++ mov TMP4, X, asr #16 ++ add X, X, UX ++ add TMP4, TOP, TMP4, asl #2 ++ vmlal.u8 q9, d23, d29 ++ vld1.32 {d22}, [TMP3], STRIDE ++ vshr.u16 q15, q12, #8 ++ vld1.32 {d23}, [TMP3] ++ vmull.u8 q10, d22, d28 ++ vmlal.u8 q10, d23, d29 ++ vmovn.u16 d8, q0 ++ vshll.u16 q0, d16, #8 ++ vmovn.u16 d9, q2 ++ vmlsl.u16 q0, d16, d30 ++ vmlal.u16 q0, d17, d30 ++ pld [TMP4, PF_OFFS] ++ vld1.32 {d16}, [TMP4], STRIDE ++ vadd.u16 q12, q12, q13 ++ vld1.32 {d17}, [TMP4] ++ pld [TMP4, PF_OFFS] ++ vmull.u8 q11, d16, d28 ++ vmlal.u8 q11, d17, d29 ++ vshll.u16 q1, d18, #8 ++ vmlsl.u16 q1, d18, d31 ++.endm ++ ++.macro bilinear_interpolate_eight_pixels_8888_0565_tail ++ vmlal.u16 q1, d19, d31 ++ vshr.u16 q15, q12, #8 ++ vshll.u16 q2, d20, #8 ++ vmlsl.u16 q2, d20, d30 ++ vmlal.u16 q2, d21, d30 ++ vshll.u16 q3, d22, #8 ++ vmlsl.u16 q3, d22, d31 ++ vmlal.u16 q3, d23, d31 ++ vadd.u16 q12, q12, q13 ++ vshrn.u32 d0, q0, #16 ++ vshrn.u32 d1, q1, #16 ++ vshrn.u32 d4, q2, #16 ++ vshr.u16 q15, q12, #8 ++ vshrn.u32 d5, q3, #16 ++ vmovn.u16 d10, q0 ++ vmovn.u16 d11, q2 ++ vadd.u16 q12, q12, q13 ++ ++ vuzp.u8 d8, d9 ++ vuzp.u8 d10, d11 ++ vuzp.u8 d9, d11 ++ vuzp.u8 d8, d10 ++ vshll.u8 q6, d9, #8 ++ vshll.u8 q5, d10, #8 ++ vshll.u8 q7, d8, #8 ++ vsri.u16 q5, q6, #5 ++ vsri.u16 q5, q7, #11 ++ vst1.32 {d10, d11}, [OUT, :128]! ++.endm ++ ++.macro bilinear_interpolate_eight_pixels_8888_0565_tail_head ++ mov TMP1, X, asr #16 ++ add X, X, UX ++ add TMP1, TOP, TMP1, asl #2 ++ mov TMP2, X, asr #16 ++ add X, X, UX ++ add TMP2, TOP, TMP2, asl #2 ++ vmlal.u16 q1, d19, d31 ++ vshr.u16 q15, q12, #8 ++ vuzp.u8 d8, d9 ++ vshll.u16 q2, d20, #8 ++ vmlsl.u16 q2, d20, d30 ++ vmlal.u16 q2, d21, d30 ++ vshll.u16 q3, d22, #8 ++ vld1.32 {d20}, [TMP1], STRIDE ++ vmlsl.u16 q3, d22, d31 ++ vmlal.u16 q3, d23, d31 ++ vld1.32 {d21}, [TMP1] ++ vmull.u8 q8, d20, d28 ++ vmlal.u8 q8, d21, d29 ++ vshrn.u32 d0, q0, #16 ++ vshrn.u32 d1, q1, #16 ++ vshrn.u32 d4, q2, #16 ++ vld1.32 {d22}, [TMP2], STRIDE ++ vshrn.u32 d5, q3, #16 ++ vadd.u16 q12, q12, q13 ++ vld1.32 {d23}, [TMP2] ++ vmull.u8 q9, d22, d28 ++ mov TMP3, X, asr #16 ++ add X, X, UX ++ add TMP3, TOP, TMP3, asl #2 ++ mov TMP4, X, asr #16 ++ add X, X, UX ++ add TMP4, TOP, TMP4, asl #2 ++ vmlal.u8 q9, d23, d29 ++ vld1.32 {d22}, [TMP3], STRIDE ++ vshr.u16 q15, q12, #8 ++ vld1.32 {d23}, [TMP3] ++ vmull.u8 q10, d22, d28 ++ vmlal.u8 q10, d23, d29 ++ vmovn.u16 d10, q0 ++ vshll.u16 q0, d16, #8 ++ vmovn.u16 d11, q2 ++ vmlsl.u16 q0, d16, d30 ++ vmlal.u16 q0, d17, d30 ++ pld [TMP4, PF_OFFS] ++ vld1.32 {d16}, [TMP4], STRIDE ++ vadd.u16 q12, q12, q13 ++ vld1.32 {d17}, [TMP4] ++ pld [TMP4, PF_OFFS] ++ vmull.u8 q11, d16, d28 ++ vmlal.u8 q11, d17, d29 ++ vuzp.u8 d10, d11 ++ vshll.u16 q1, d18, #8 ++ vmlsl.u16 q1, d18, d31 ++ ++ mov TMP1, X, asr #16 ++ add X, X, UX ++ add TMP1, TOP, TMP1, asl #2 ++ mov TMP2, X, asr #16 ++ add X, X, UX ++ add TMP2, TOP, TMP2, asl #2 ++ vmlal.u16 q1, d19, d31 ++ vuzp.u8 d9, d11 ++ vshr.u16 q15, q12, #8 ++ vshll.u16 q2, d20, #8 ++ vuzp.u8 d8, d10 ++ vmlsl.u16 q2, d20, d30 ++ vmlal.u16 q2, d21, d30 ++ vshll.u16 q3, d22, #8 ++ vld1.32 {d20}, [TMP1], STRIDE ++ vmlsl.u16 q3, d22, d31 ++ vmlal.u16 q3, d23, d31 ++ vld1.32 {d21}, [TMP1] ++ vmull.u8 q8, d20, d28 ++ vmlal.u8 q8, d21, d29 ++ vshll.u8 q6, d9, #8 ++ vshll.u8 q5, d10, #8 ++ vshll.u8 q7, d8, #8 ++ vshrn.u32 d0, q0, #16 ++ vsri.u16 q5, q6, #5 ++ vshrn.u32 d1, q1, #16 ++ vsri.u16 q5, q7, #11 ++ vshrn.u32 d4, q2, #16 ++ vld1.32 {d22}, [TMP2], STRIDE ++ vshrn.u32 d5, q3, #16 ++ vadd.u16 q12, q12, q13 ++ vld1.32 {d23}, [TMP2] ++ vmull.u8 q9, d22, d28 ++ mov TMP3, X, asr #16 ++ add X, X, UX ++ add TMP3, TOP, TMP3, asl #2 ++ mov TMP4, X, asr #16 ++ add X, X, UX ++ add TMP4, TOP, TMP4, asl #2 ++ vmlal.u8 q9, d23, d29 ++ vld1.32 {d22}, [TMP3], STRIDE ++ vshr.u16 q15, q12, #8 ++ vld1.32 {d23}, [TMP3] ++ vmull.u8 q10, d22, d28 ++ vmlal.u8 q10, d23, d29 ++ vmovn.u16 d8, q0 ++ vshll.u16 q0, d16, #8 ++ vmovn.u16 d9, q2 ++ vmlsl.u16 q0, d16, d30 ++ vmlal.u16 q0, d17, d30 ++ pld [TMP4, PF_OFFS] ++ vld1.32 {d16}, [TMP4], STRIDE ++ vadd.u16 q12, q12, q13 ++ vld1.32 {d17}, [TMP4] ++ pld [TMP4, PF_OFFS] ++ vmull.u8 q11, d16, d28 ++ vmlal.u8 q11, d17, d29 ++ vshll.u16 q1, d18, #8 ++ vst1.32 {d10, d11}, [OUT, :128]! ++ vmlsl.u16 q1, d18, d31 ++.endm ++/*****************************************************************************/ ++ + generate_bilinear_scanline_func \ + pixman_scaled_bilinear_scanline_8888_8888_SRC_asm_neon, 8888, 8888, \ + 2, 2, 28, BILINEAR_FLAG_UNROLL_4 + + generate_bilinear_scanline_func \ + pixman_scaled_bilinear_scanline_8888_0565_SRC_asm_neon, 8888, 0565, \ +- 2, 1, 28, BILINEAR_FLAG_UNROLL_4 ++ 2, 1, 28, BILINEAR_FLAG_UNROLL_8 | BILINEAR_FLAG_USE_ALL_NEON_REGS + + generate_bilinear_scanline_func \ + pixman_scaled_bilinear_scanline_0565_x888_SRC_asm_neon, 0565, 8888, \ +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0037-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/recipes/xorg-lib/pixman-0.21.6/0037-Generic-C-implementation-of-pixman_blt-with-overlapp.patch new file mode 100644 index 0000000000..e03823b185 --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0037-Generic-C-implementation-of-pixman_blt-with-overlapp.patch @@ -0,0 +1,114 @@ +From ab52f97fa306f73b51f797a33614280d31ccb978 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Tue, 16 Mar 2010 16:55:28 +0100 +Subject: [PATCH 37/40] Generic C implementation of pixman_blt with overlapping support + +Uses memcpy/memmove functions to copy pixels, can handle the +case when both source and destination areas are in the same +image (this is useful for scrolling). + +It is assumed that copying direction is only important when +using the same image for both source and destination (and +src_stride == dst_stride). Copying direction is undefined +for the images with different source and destination stride +which happen to be in the overlapped areas (but this is an +unrealistic case anyway). +--- + pixman/pixman-general.c | 21 ++++++++++++++++++--- + pixman/pixman-private.h | 43 +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 61 insertions(+), 3 deletions(-) + +diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c +index 727affc..fa448f7 100644 +--- a/pixman/pixman-general.c ++++ b/pixman/pixman-general.c +@@ -238,9 +238,24 @@ general_blt (pixman_implementation_t *imp, + int width, + int height) + { +- /* We can't blit unless we have sse2 or mmx */ +- +- return FALSE; ++ uint8_t *dst_bytes = (uint8_t *)dst_bits; ++ uint8_t *src_bytes = (uint8_t *)src_bits; ++ int bpp; ++ ++ if (src_bpp != dst_bpp || src_bpp & 7) ++ return FALSE; ++ ++ bpp = src_bpp >> 3; ++ width *= bpp; ++ src_stride *= 4; ++ dst_stride *= 4; ++ pixman_blt_helper (src_bytes + src_y * src_stride + src_x * bpp, ++ dst_bytes + dst_y * dst_stride + dst_x * bpp, ++ src_stride, ++ dst_stride, ++ width, ++ height); ++ return TRUE; + } + + static pixman_bool_t +diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h +index 60060a9..5369ad9 100644 +--- a/pixman/pixman-private.h ++++ b/pixman/pixman-private.h +@@ -10,6 +10,7 @@ + + #include "pixman.h" + #include ++#include + #include + #include + #include +@@ -899,4 +900,46 @@ void pixman_timer_register (pixman_timer_t *timer); + + #endif /* PIXMAN_TIMERS */ + ++/* a helper function, can blit 8-bit images with src/dst overlapping support */ ++static inline void ++pixman_blt_helper (uint8_t *src_bytes, ++ uint8_t *dst_bytes, ++ int src_stride, ++ int dst_stride, ++ int width, ++ int height) ++{ ++ /* ++ * The second part of this check is not strictly needed, but it prevents ++ * unnecessary upside-down processing of areas which belong to different ++ * images. Upside-down processing can be slower with fixed-distance-ahead ++ * prefetch and perceived as having more tearing. ++ */ ++ if (src_bytes < dst_bytes + width && ++ src_bytes + src_stride * height > dst_bytes) ++ { ++ src_bytes += src_stride * height - src_stride; ++ dst_bytes += dst_stride * height - dst_stride; ++ dst_stride = -dst_stride; ++ src_stride = -src_stride; ++ /* Horizontal scrolling to the left needs memmove */ ++ if (src_bytes + width > dst_bytes) ++ { ++ while (--height >= 0) ++ { ++ memmove (dst_bytes, src_bytes, width); ++ dst_bytes += dst_stride; ++ src_bytes += src_stride; ++ } ++ return; ++ } ++ } ++ while (--height >= 0) ++ { ++ memcpy (dst_bytes, src_bytes, width); ++ dst_bytes += dst_stride; ++ src_bytes += src_stride; ++ } ++} ++ + #endif /* PIXMAN_PRIVATE_H */ +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0038-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/recipes/xorg-lib/pixman-0.21.6/0038-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch new file mode 100644 index 0000000000..7c0f7ad5bd --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0038-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch @@ -0,0 +1,91 @@ +From 2cde9110695c2b595eaf885eee40b118286652f9 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Thu, 22 Oct 2009 05:45:47 +0300 +Subject: [PATCH 38/40] Support of overlapping src/dst for pixman_blt_mmx + +--- + pixman/pixman-mmx.c | 55 +++++++++++++++++++++++++++++--------------------- + 1 files changed, 32 insertions(+), 23 deletions(-) + +diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c +index 0272347..5bcbd0e 100644 +--- a/pixman/pixman-mmx.c ++++ b/pixman/pixman-mmx.c +@@ -2996,34 +2996,43 @@ pixman_blt_mmx (uint32_t *src_bits, + { + uint8_t * src_bytes; + uint8_t * dst_bytes; +- int byte_width; ++ int bpp; + +- if (src_bpp != dst_bpp) ++ if (src_bpp != dst_bpp || src_bpp & 7) + return FALSE; + +- if (src_bpp == 16) +- { +- src_stride = src_stride * (int) sizeof (uint32_t) / 2; +- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2; +- src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x)); +- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); +- byte_width = 2 * width; +- src_stride *= 2; +- dst_stride *= 2; +- } +- else if (src_bpp == 32) ++ bpp = src_bpp >> 3; ++ width *= bpp; ++ src_stride *= 4; ++ dst_stride *= 4; ++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp; ++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp; ++ ++ if (src_bpp != 16 && src_bpp != 32) + { +- src_stride = src_stride * (int) sizeof (uint32_t) / 4; +- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4; +- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x)); +- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); +- byte_width = 4 * width; +- src_stride *= 4; +- dst_stride *= 4; ++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride, ++ width, height); ++ return TRUE; + } +- else ++ ++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes) + { +- return FALSE; ++ src_bytes += src_stride * height - src_stride; ++ dst_bytes += dst_stride * height - dst_stride; ++ dst_stride = -dst_stride; ++ src_stride = -src_stride; ++ ++ if (src_bytes + width > dst_bytes) ++ { ++ /* TODO: reverse scanline copy using MMX */ ++ while (--height >= 0) ++ { ++ memmove (dst_bytes, src_bytes, width); ++ dst_bytes += dst_stride; ++ src_bytes += src_stride; ++ } ++ return TRUE; ++ } + } + + while (height--) +@@ -3033,7 +3042,7 @@ pixman_blt_mmx (uint32_t *src_bits, + uint8_t *d = dst_bytes; + src_bytes += src_stride; + dst_bytes += dst_stride; +- w = byte_width; ++ w = width; + + while (w >= 2 && ((unsigned long)d & 3)) + { +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0039-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/recipes/xorg-lib/pixman-0.21.6/0039-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch new file mode 100644 index 0000000000..8e89ffeabb --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0039-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch @@ -0,0 +1,91 @@ +From b4064e256d293d32035494a6afff1bc9456b84e1 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Thu, 22 Oct 2009 05:45:54 +0300 +Subject: [PATCH 39/40] Support of overlapping src/dst for pixman_blt_sse2 + +--- + pixman/pixman-sse2.c | 55 +++++++++++++++++++++++++++++-------------------- + 1 files changed, 32 insertions(+), 23 deletions(-) + +diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c +index 533b858..9fa7191 100644 +--- a/pixman/pixman-sse2.c ++++ b/pixman/pixman-sse2.c +@@ -4691,34 +4691,43 @@ pixman_blt_sse2 (uint32_t *src_bits, + { + uint8_t * src_bytes; + uint8_t * dst_bytes; +- int byte_width; ++ int bpp; + +- if (src_bpp != dst_bpp) ++ if (src_bpp != dst_bpp || src_bpp & 7) + return FALSE; + +- if (src_bpp == 16) +- { +- src_stride = src_stride * (int) sizeof (uint32_t) / 2; +- dst_stride = dst_stride * (int) sizeof (uint32_t) / 2; +- src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x)); +- dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); +- byte_width = 2 * width; +- src_stride *= 2; +- dst_stride *= 2; +- } +- else if (src_bpp == 32) ++ bpp = src_bpp >> 3; ++ width *= bpp; ++ src_stride *= 4; ++ dst_stride *= 4; ++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp; ++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp; ++ ++ if (src_bpp != 16 && src_bpp != 32) + { +- src_stride = src_stride * (int) sizeof (uint32_t) / 4; +- dst_stride = dst_stride * (int) sizeof (uint32_t) / 4; +- src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x)); +- dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x)); +- byte_width = 4 * width; +- src_stride *= 4; +- dst_stride *= 4; ++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride, ++ width, height); ++ return TRUE; + } +- else ++ ++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes) + { +- return FALSE; ++ src_bytes += src_stride * height - src_stride; ++ dst_bytes += dst_stride * height - dst_stride; ++ dst_stride = -dst_stride; ++ src_stride = -src_stride; ++ ++ if (src_bytes + width > dst_bytes) ++ { ++ /* TODO: reverse scanline copy using SSE2 */ ++ while (--height >= 0) ++ { ++ memmove (dst_bytes, src_bytes, width); ++ dst_bytes += dst_stride; ++ src_bytes += src_stride; ++ } ++ return TRUE; ++ } + } + + while (height--) +@@ -4728,7 +4737,7 @@ pixman_blt_sse2 (uint32_t *src_bits, + uint8_t *d = dst_bytes; + src_bytes += src_stride; + dst_bytes += dst_stride; +- w = byte_width; ++ w = width; + + while (w >= 2 && ((unsigned long)d & 3)) + { +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman-0.21.6/0040-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/recipes/xorg-lib/pixman-0.21.6/0040-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch new file mode 100644 index 0000000000..38aeadb2dc --- /dev/null +++ b/recipes/xorg-lib/pixman-0.21.6/0040-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch @@ -0,0 +1,94 @@ +From ed32d593a0e8aa56f8a27f976f188d14a79343a0 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka +Date: Wed, 18 Nov 2009 06:08:48 +0200 +Subject: [PATCH 40/40] Support of overlapping src/dst for pixman_blt_neon + +--- + pixman/pixman-arm-neon.c | 62 +++++++++++++++++++++++++++++++++++++-------- + 1 files changed, 51 insertions(+), 11 deletions(-) + +diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c +index 0a10ca1..f015eee 100644 +--- a/pixman/pixman-arm-neon.c ++++ b/pixman/pixman-arm-neon.c +@@ -215,26 +215,66 @@ pixman_blt_neon (uint32_t *src_bits, + int width, + int height) + { +- if (src_bpp != dst_bpp) ++ uint8_t * src_bytes; ++ uint8_t * dst_bytes; ++ int bpp; ++ ++ if (src_bpp != dst_bpp || src_bpp & 7) + return FALSE; + ++ bpp = src_bpp >> 3; ++ width *= bpp; ++ src_stride *= 4; ++ dst_stride *= 4; ++ src_bytes = (uint8_t *)src_bits + src_y * src_stride + src_x * bpp; ++ dst_bytes = (uint8_t *)dst_bits + dst_y * dst_stride + dst_x * bpp; ++ ++ if (src_bpp != 16 && src_bpp != 32) ++ { ++ pixman_blt_helper (src_bytes, dst_bytes, src_stride, dst_stride, ++ width, height); ++ return TRUE; ++ } ++ ++ if (src_bytes < dst_bytes && src_bytes + src_stride * height > dst_bytes) ++ { ++ src_bytes += src_stride * height - src_stride; ++ dst_bytes += dst_stride * height - dst_stride; ++ dst_stride = -dst_stride; ++ src_stride = -src_stride; ++ ++ if (src_bytes + width > dst_bytes) ++ { ++ /* TODO: reverse scanline copy using NEON */ ++ while (--height >= 0) ++ { ++ memmove (dst_bytes, src_bytes, width); ++ dst_bytes += dst_stride; ++ src_bytes += src_stride; ++ } ++ return TRUE; ++ } ++ } ++ + switch (src_bpp) + { + case 16: + pixman_composite_src_0565_0565_asm_neon ( +- width, height, +- (uint16_t *)(((char *) dst_bits) + +- dst_y * dst_stride * 4 + dst_x * 2), dst_stride * 2, +- (uint16_t *)(((char *) src_bits) + +- src_y * src_stride * 4 + src_x * 2), src_stride * 2); ++ width >> 1, ++ height, ++ (uint16_t *) dst_bytes, ++ dst_stride >> 1, ++ (uint16_t *) src_bytes, ++ src_stride >> 1); + return TRUE; + case 32: + pixman_composite_src_8888_8888_asm_neon ( +- width, height, +- (uint32_t *)(((char *) dst_bits) + +- dst_y * dst_stride * 4 + dst_x * 4), dst_stride, +- (uint32_t *)(((char *) src_bits) + +- src_y * src_stride * 4 + src_x * 4), src_stride); ++ width >> 2, ++ height, ++ (uint32_t *) dst_bytes, ++ dst_stride >> 2, ++ (uint32_t *) src_bytes, ++ src_stride >> 2); + return TRUE; + default: + return FALSE; +-- +1.6.6.1 + diff --git a/recipes/xorg-lib/pixman_0.21.6.bb b/recipes/xorg-lib/pixman_0.21.6.bb new file mode 100644 index 0000000000..d5cc2c5381 --- /dev/null +++ b/recipes/xorg-lib/pixman_0.21.6.bb @@ -0,0 +1,53 @@ +require pixman.inc + +PR = "${INC_PR}.0" + +SRC_URI = "http://xorg.freedesktop.org/archive/individual/lib/${BPN}-${PV}.tar.gz \ +file://0002-Fix-compilation-on-Win32.patch \ +file://0003-test-Fix-tests-for-compilation-on-Windows.patch \ +file://0004-test-Add-Makefile-for-Win32.patch \ +file://0005-Do-not-include-unused-headers.patch \ +file://0006-test-Silence-MSVC-warnings.patch \ +file://0007-Main-loop-template-for-fast-single-pass-bilinear-sca.patch \ +file://0008-test-check-correctness-of-bilinear_pad_repeat_get_sc.patch \ +file://0009-SSE2-optimization-for-bilinear-scaled-src_8888_8888.patch \ +file://0010-ARM-NEON-optimization-for-bilinear-scaled-src_8888_8.patch \ +file://0011-test-In-image_endian_swap-use-pixman_image_get_forma.patch \ +file://0012-test-Do-endian-swapping-of-the-source-and-destinatio.patch \ +file://0013-ARM-use-prefetch-in-nearest-scaled-src_0565_0565.patch \ +file://0014-ARM-common-macro-for-nearest-scaling-fast-paths.patch \ +file://0015-ARM-assembly-optimized-nearest-scaled-src_8888_8888.patch \ +file://0016-ARM-new-bilinear-fast-path-template-macro-in-pixman-.patch \ +file://0017-ARM-NEON-common-macro-template-for-bilinear-scanline.patch \ +file://0018-ARM-use-common-macro-template-for-bilinear-scaled-sr.patch \ +file://0019-ARM-NEON-optimization-for-bilinear-scaled-src_8888_0.patch \ +file://0020-ARM-NEON-optimization-for-bilinear-scaled-src_0565_x.patch \ +file://0021-ARM-NEON-optimization-for-bilinear-scaled-src_0565_0.patch \ +file://0022-ARM-a-bit-faster-NEON-bilinear-scaling-for-r5g6b5-so.patch \ +file://0023-In-delegate_-src-dest-_iter_init-call-delegate-direc.patch \ +file://0024-Fill-out-parts-of-iters-in-_pixman_implementation_-s.patch \ +file://0025-Simplify-the-prototype-for-iterator-initializers.patch \ +file://0026-test-Randomize-some-tests-if-PIXMAN_RANDOMIZE_TESTS-.patch \ +file://0027-Add-simple-support-for-the-r8g8b8a8-and-r8g8b8x8-for.patch \ +file://0028-Add-support-for-the-r8g8b8a8-and-r8g8b8x8-formats-to.patch \ +file://0029-test-Fix-infinite-loop-in-composite.patch \ +file://0030-ARM-tweaked-horizontal-weights-update-in-NEON-biline.patch \ +file://0031-ARM-use-aligned-memory-writes-in-NEON-bilinear-scali.patch \ +file://0032-ARM-support-for-software-pipelining-in-bilinear-macr.patch \ +file://0033-ARM-use-less-ARM-instructions-in-NEON-bilinear-scali.patch \ +file://0034-ARM-support-different-levels-of-loop-unrolling-in-bi.patch \ +file://0035-ARM-pipelined-NEON-implementation-of-bilinear-scaled.patch \ +file://0036-ARM-pipelined-NEON-implementation-of-bilinear-scaled.patch \ +file://0037-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \ +file://0038-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch \ +file://0039-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch \ +file://0040-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch \ +" + +SRC_URI[md5sum] = "b083fce3bd41ffd083e50dfe6612612d" +SRC_URI[sha256sum] = "ee22c24acc0c1b55a59aeeebfb3552038495d301e334608ac8e6af98172c748c" + +NEON = " --disable-arm-neon " +NEON_armv7a = " " + +EXTRA_OECONF = "${NEON} --disable-gtk" From f6e54381ecc0b6e27605b67df222a50bc17f1840 Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Tue, 5 Apr 2011 20:10:01 +0000 Subject: [PATCH 270/509] ti-sysbios: Add missing License field. * Sys/Bios is released under a BSD license. Signed-off-by: Siddharth Heroor Acked-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- recipes/ti/ti-sysbios.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/ti/ti-sysbios.inc b/recipes/ti/ti-sysbios.inc index cf45c379db..84a76a4160 100644 --- a/recipes/ti/ti-sysbios.inc +++ b/recipes/ti/ti-sysbios.inc @@ -1,6 +1,7 @@ DESCRIPTION = "TI SYS/BIOS v6 Kernel" HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/sysbios" SECTION = "devel" +LICENSE = "BSD" require ti-paths.inc require ti-staging.inc From f6902b7b428de025123efcd59e011affc88bbd60 Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Tue, 5 Apr 2011 20:10:02 +0000 Subject: [PATCH 271/509] ti-sysbios: Copy installer unpack to recipe versions. * Newer versions of Sys/Bios have a different unpack sequence. This patch is in preparation for a new versions that use the new unpack sequence. Signed-off-by: Siddharth Heroor Acked-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- recipes/ti/ti-sysbios_6.21.01.16.bb | 1 + recipes/ti/ti-sysbios_6.31.00.18.bb | 1 + 2 files changed, 2 insertions(+) diff --git a/recipes/ti/ti-sysbios_6.21.01.16.bb b/recipes/ti/ti-sysbios_6.21.01.16.bb index f26858a231..848ae36008 100644 --- a/recipes/ti/ti-sysbios_6.21.01.16.bb +++ b/recipes/ti/ti-sysbios_6.21.01.16.bb @@ -5,3 +5,4 @@ PV = "6_21_01_16" SRC_URI[sysbiosbin.md5sum] = "411cd0fac224126ed2a81e67fc79c81a" SRC_URI[sysbiosbin.sha256sum] = "63d2704ff294fe0834411d010d19c0a0bfd0249520f5ee5ddc2c115df2be8ddd" +TI_BIN_UNPK_CMDS="Y: qY:workdir:Y" diff --git a/recipes/ti/ti-sysbios_6.31.00.18.bb b/recipes/ti/ti-sysbios_6.31.00.18.bb index 8bed7f4c9f..a25c9242e0 100644 --- a/recipes/ti/ti-sysbios_6.31.00.18.bb +++ b/recipes/ti/ti-sysbios_6.31.00.18.bb @@ -5,3 +5,4 @@ PV = "6_31_00_18" SRC_URI[sysbiosbin.md5sum] = "a37fe51f208d7cb63a6fae09d3285c69" SRC_URI[sysbiosbin.sha256sum] = "2d5cedffdc554e545ee9e233ba760e95b97904f6ea0ca3dbdd56a422b05e2b62" +TI_BIN_UNPK_CMDS="Y: qY:workdir:Y" From cf6bf273312abb009a81442a47cf82e521c3d8a7 Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Tue, 5 Apr 2011 20:10:03 +0000 Subject: [PATCH 272/509] ti-sysbios: Update Installer unpack commands. * New versions of TI Sys/Bios use a different installer unpack command. * Bump PR. Signed-off-by: Siddharth Heroor Acked-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- recipes/ti/ti-sysbios.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/ti/ti-sysbios.inc b/recipes/ti/ti-sysbios.inc index 84a76a4160..046b6fe8eb 100644 --- a/recipes/ti/ti-sysbios.inc +++ b/recipes/ti/ti-sysbios.inc @@ -7,14 +7,14 @@ require ti-paths.inc require ti-staging.inc require ti-eula-unpack.inc -PR = "r1" +PR = "r2" S = "${WORKDIR}/bios_${PV}" SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/sysbios/${PV}/exports/bios_setuplinux_${PV}.bin;name=sysbiosbin" BINFILE="bios_setuplinux_${PV}.bin" -TI_BIN_UNPK_CMDS="Y: qY:workdir:Y" +TI_BIN_UNPK_CMDS="Y: q:workdir:Y" do_install() { install -d ${D}${SYSBIOS_INSTALL_DIR_RECIPE} From 0329a2f7e6f8022e1ffd4cb7b2091dc93f8d4e34 Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Tue, 5 Apr 2011 20:10:04 +0000 Subject: [PATCH 273/509] ti-sysbios: Add version 6.31.04.27. Signed-off-by: Siddharth Heroor Signed-off-by: Koen Kooi --- recipes/ti/ti-sysbios_6.31.04.27.bb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 recipes/ti/ti-sysbios_6.31.04.27.bb diff --git a/recipes/ti/ti-sysbios_6.31.04.27.bb b/recipes/ti/ti-sysbios_6.31.04.27.bb new file mode 100644 index 0000000000..619d6ffded --- /dev/null +++ b/recipes/ti/ti-sysbios_6.31.04.27.bb @@ -0,0 +1,6 @@ +require ti-sysbios.inc + +PV = "6_31_04_27" + +SRC_URI[sysbiosbin.md5sum] = "c82e1d3afc9e2d3e88b0e4137f152ed6" +SRC_URI[sysbiosbin.sha256sum] = "92337cf3197d2b7ffe2316f311cd163be7b470acbb032273894d7d39182f4227" From dc52988f2fffee8fbd9e900a91d3eae79d60feba Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Wed, 6 Apr 2011 17:36:06 +0000 Subject: [PATCH 274/509] linux-omap3: Add PSP recipe for ti816x devices. * Add TI PSP kernel recipe for dm816x/c6a816x/am389x devices. * Add the defconfig for ti816x devices. * Based on PSP release 4.00.00.10. Signed-off-by: Siddharth Heroor Signed-off-by: Koen Kooi --- .../ti816x/defconfig | 2142 +++++++++++++++++ .../linux-omap3_2.6.37-psp04.00.00.10.bb | 10 + 2 files changed, 2152 insertions(+) create mode 100644 recipes/linux/linux-omap3-2.6.37-psp04.00.00.10/ti816x/defconfig create mode 100644 recipes/linux/linux-omap3_2.6.37-psp04.00.00.10.bb diff --git a/recipes/linux/linux-omap3-2.6.37-psp04.00.00.10/ti816x/defconfig b/recipes/linux/linux-omap3-2.6.37-psp04.00.00.10/ti816x/defconfig new file mode 100644 index 0000000000..b3b1a09d93 --- /dev/null +++ b/recipes/linux/linux-omap3-2.6.37-psp04.00.00.10/ti816x/defconfig @@ -0,0 +1,2142 @@ +# +# Automatically generated make config: don't edit +# Linux/arm 2.6.37 Kernel Configuration +# Mon Feb 14 12:41:09 2011 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +# CONFIG_ARCH_USES_GETTIMEOFFSET is not set +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_ARCH_HAS_CPUFREQ=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_ARM_L1_CACHE_SHIFT_6=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y +CONFIG_HAVE_IRQ_WORK=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_LZO is not set +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set +# CONFIG_HAVE_GENERIC_HARDIRQS is not set +# CONFIG_SPARSE_IRQ is not set + +# +# RCU Subsystem +# +CONFIG_TINY_RCU=y +# CONFIG_PREEMPT_RCU is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=17 +# CONFIG_CGROUPS is not set +CONFIG_NAMESPACES=y +# CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set +# CONFIG_NET_NS is not set +# CONFIG_SYSFS_DEPRECATED is not set +# CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_LZO=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_EXTRA_PASS=y +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_PERF_USE_VMALLOC=y + +# +# Kernel Performance Events And Counters +# +# CONFIG_PERF_EVENTS is not set +# CONFIG_PERF_COUNTERS is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +CONFIG_SLUB_DEBUG=y +CONFIG_COMPAT_BRK=y +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +CONFIG_KPROBES=y +CONFIG_KRETPROBES=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_CLK=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_BLOCK=y +# CONFIG_LBDAF is not set +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_INLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +CONFIG_INLINE_READ_UNLOCK=y +# CONFIG_INLINE_READ_UNLOCK_BH is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +CONFIG_INLINE_WRITE_UNLOCK=y +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set +# CONFIG_FREEZER is not set + +# +# System Type +# +CONFIG_MMU=y +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_VEXPRESS is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_BCMRING is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CNS3XXX is not set +# CONFIG_ARCH_GEMINI is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_STMP3XXX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_DOVE is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_LPC32XX is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_MMP is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_W90X900 is not set +# CONFIG_ARCH_NUC93X is not set +# CONFIG_ARCH_TEGRA is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_MSM is not set +# CONFIG_ARCH_SHMOBILE is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_S5P64X0 is not set +# CONFIG_ARCH_S5P6442 is not set +# CONFIG_ARCH_S5PC100 is not set +# CONFIG_ARCH_S5PV210 is not set +# CONFIG_ARCH_S5PV310 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_TCC_926 is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_U300 is not set +# CONFIG_ARCH_U8500 is not set +# CONFIG_ARCH_NOMADIK is not set +# CONFIG_ARCH_DAVINCI is not set +CONFIG_ARCH_OMAP=y +# CONFIG_PLAT_SPEAR is not set + +# +# TI OMAP Common Features +# +# CONFIG_ARCH_OMAP1 is not set +CONFIG_ARCH_OMAP2PLUS=y + +# +# OMAP Feature Selections +# +# CONFIG_OMAP_RESET_CLOCKS is not set +CONFIG_TI816X_SMARTREFLEX=y +CONFIG_SMARTREFLEX_CLASS2=y +# CONFIG_DEBUG_SR_CLASS2 is not set +CONFIG_OMAP_MUX=y +# CONFIG_OMAP_MUX_DEBUG is not set +CONFIG_OMAP_MUX_WARNINGS=y +# CONFIG_OMAP_MCBSP is not set +# CONFIG_OMAP_MBOX_FWK is not set +CONFIG_OMAP_IOMMU=y +# CONFIG_OMAP_IOMMU_DEBUG is not set +CONFIG_OMAP_MPU_TIMER=y +# CONFIG_OMAP_32K_TIMER is not set +CONFIG_OMAP_DM_TIMER=y +# CONFIG_OMAP_PM_NONE is not set +CONFIG_OMAP_PM_NOOP=y + +# +# TI OMAP2/3/4 Specific Features +# +CONFIG_ARCH_OMAP2PLUS_TYPICAL=y +# CONFIG_ARCH_OMAP2 is not set +# CONFIG_ARCH_OMAP3 is not set +# CONFIG_ARCH_OMAP4 is not set +CONFIG_ARCH_TI81XX=y +CONFIG_ARCH_TI816X=y +# CONFIG_ARCH_TI814X is not set + +# +# OMAP Board Type +# + +# +# TI81XX Board Type +# +CONFIG_MACH_TI8168EVM=y + +# +# Processor Type +# +CONFIG_CPU_32v6K=y +CONFIG_CPU_V7=y +CONFIG_CPU_32v7=y +CONFIG_CPU_ABRT_EV7=y +CONFIG_CPU_PABRT_V7=y +CONFIG_CPU_CACHE_V7=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y +CONFIG_CPU_TLB_V7=y +CONFIG_CPU_HAS_ASID=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_ARM_THUMBEE is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_ARM_L1_CACHE_SHIFT=6 +CONFIG_ARM_DMA_MEM_BUFFERABLE=y +CONFIG_CPU_HAS_PMU=y +# CONFIG_ARM_ERRATA_430973 is not set +# CONFIG_ARM_ERRATA_458693 is not set +# CONFIG_ARM_ERRATA_460075 is not set +# CONFIG_ARM_ERRATA_743622 is not set +CONFIG_COMMON_CLKDEV=y + +# +# Bus support +# +CONFIG_PCI=y +CONFIG_PCI_SYSCALL=y +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_PCI_MSI=y +# CONFIG_PCI_DEBUG is not set +# CONFIG_PCI_STUB is not set +# CONFIG_PCI_IOV is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +CONFIG_HZ=100 +# CONFIG_THUMB2_KERNEL is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_HIGHMEM is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_VIRT_TO_BUS=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_NEED_PER_CPU_KM=y +CONFIG_FORCE_MAX_ZONEORDER=11 +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y +# CONFIG_UACCESS_WITH_MEMCPY is not set +# CONFIG_SECCOMP is not set +# CONFIG_CC_STACKPROTECTOR is not set +# CONFIG_DEPRECATED_PARAM_STRUCT is not set + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0 +CONFIG_ZBOOT_ROM_BSS=0 +CONFIG_CMDLINE="" +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set +# CONFIG_AUTO_ZRELADDR is not set + +# +# CPU Power Management +# +# CONFIG_CPU_FREQ is not set +# CONFIG_CPU_IDLE is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set +CONFIG_VFP=y +CONFIG_VFPv3=y +CONFIG_NEON=y + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_MISC=y + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_DEBUG=y +# CONFIG_PM_ADVANCED_DEBUG is not set +CONFIG_PM_VERBOSE=y +# CONFIG_SUSPEND is not set +# CONFIG_APM_EMULATION is not set +CONFIG_PM_RUNTIME=y +CONFIG_PM_OPS=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE_DEMUX is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6_MIP6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=m +# CONFIG_IPV6_SIT_6RD is not set +CONFIG_IPV6_NDISC_NODETYPE=y +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_IPV6_MROUTE is not set +# CONFIG_NETLABEL is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_L2TP is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set +# CONFIG_DNS_RESOLVER is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_NET_TCPPROBE is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +CONFIG_WIRELESS=y +# CONFIG_CFG80211 is not set +# CONFIG_LIB80211 is not set + +# +# CFG80211 needs to be enabled for MAC80211 +# + +# +# Some wireless drivers require a rate control algorithm +# +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set +# CONFIG_CAIF is not set +# CONFIG_CEPH_LIB is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_TESTS is not set +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_SM_FTL is not set +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_INTEL_VR_NOR is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_DATAFLASH is not set +CONFIG_MTD_M25P80=y +CONFIG_M25PXX_USE_FAST_READ=y +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND_ECC=y +# CONFIG_MTD_NAND_ECC_SMC is not set +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_SM_COMMON is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_DENALI is not set +# CONFIG_MTD_NAND_GPIO is not set +CONFIG_MTD_NAND_OMAP2=y +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_RICOH is not set +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_CAFE is not set +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ALAUDA is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set +# CONFIG_MTD_UBI is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set + +# +# DRBD disabled because PROC_FS, INET or CONNECTOR not selected +# +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_SX8 is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=32768 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_MG_DISK is not set +# CONFIG_BLK_DEV_RBD is not set +CONFIG_MISC_DEVICES=y +# CONFIG_AD525X_DPOT is not set +# CONFIG_PHANTOM is not set +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_HP_ILO is not set +# CONFIG_APDS9802ALS is not set +# CONFIG_ISL29003 is not set +# CONFIG_ISL29020 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_SENSORS_BH1780 is not set +# CONFIG_SENSORS_BH1770 is not set +# CONFIG_SENSORS_APDS990X is not set +# CONFIG_HMC6352 is not set +# CONFIG_DS1682 is not set +# CONFIG_TI_DAC7512 is not set +# CONFIG_BMP085 is not set +# CONFIG_PCH_PHUB is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=y +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_CB710_CORE is not set +# CONFIG_IWMC3200TOP is not set + +# +# Texas Instruments shared transport line discipline +# +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=y +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=y +# CONFIG_CHR_DEV_SCH is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +# CONFIG_SCSI_LOWLEVEL is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=y +CONFIG_SATA_AHCI_PLATFORM=y +# CONFIG_SATA_INIC162X is not set +# CONFIG_SATA_SIL24 is not set +# CONFIG_ATA_SFF is not set +# CONFIG_MD is not set +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# +# CONFIG_FIREWIRE is not set +# CONFIG_FIREWIRE_NOSY is not set +# CONFIG_I2O is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +# CONFIG_ARCNET is not set +CONFIG_MII=y +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_BCM63XX_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_MICREL_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set +# CONFIG_NET_ETHERNET is not set +CONFIG_NETDEV_1000=y +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +CONFIG_TI_DAVINCI_EMAC=y +CONFIG_TI_DAVINCI_MDIO=y +CONFIG_TI_DAVINCI_CPDMA=y +# CONFIG_E1000 is not set +# CONFIG_E1000E is not set +# CONFIG_IP1000 is not set +# CONFIG_IGB is not set +# CONFIG_IGBVF is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_R8169 is not set +# CONFIG_SIS190 is not set +# CONFIG_SKGE is not set +# CONFIG_SKY2 is not set +# CONFIG_VIA_VELOCITY is not set +# CONFIG_TIGON3 is not set +# CONFIG_BNX2 is not set +# CONFIG_CNIC is not set +# CONFIG_QLA3XXX is not set +# CONFIG_ATL1 is not set +# CONFIG_ATL1E is not set +# CONFIG_ATL1C is not set +# CONFIG_JME is not set +# CONFIG_STMMAC_ETH is not set +# CONFIG_PCH_GBE is not set +# CONFIG_NETDEV_10000 is not set +# CONFIG_TR is not set +# CONFIG_WLAN is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +CONFIG_USB_USBNET=y +# CONFIG_USB_NET_AX8817X is not set +CONFIG_USB_NET_CDCETHER=y +# CONFIG_USB_NET_CDC_EEM is not set +CONFIG_USB_NET_DM9601=y +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set +# CONFIG_USB_NET_INT51X1 is not set +# CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set +# CONFIG_WAN is not set + +# +# CAIF transport drivers +# +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_NET_FC is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_VMXNET3 is not set +# CONFIG_ISDN is not set +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set +# CONFIG_INPUT_SPARSEKMAP is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_PCIPS2 is not set +# CONFIG_SERIO_RAW is not set +# CONFIG_SERIO_ALTERA_PS2 is not set +# CONFIG_SERIO_PS2MULT is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y +CONFIG_SERIAL_NONSTANDARD=y +# CONFIG_COMPUTONE is not set +# CONFIG_ROCKETPORT is not set +# CONFIG_CYCLADES is not set +# CONFIG_DIGIEPCA is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +# CONFIG_ISI is not set +# CONFIG_SYNCLINKMP is not set +# CONFIG_SYNCLINK_GT is not set +# CONFIG_N_HDLC is not set +# CONFIG_N_GSM is not set +# CONFIG_RISCOM8 is not set +# CONFIG_SPECIALIX is not set +# CONFIG_STALDRV is not set +# CONFIG_NOZOMI is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_NR_UARTS=64 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +# CONFIG_SERIAL_8250_MANY_PORTS is not set +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX3107 is not set +# CONFIG_SERIAL_MFD_HSU is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +CONFIG_SERIAL_OMAP=y +CONFIG_SERIAL_OMAP_CONSOLE=y +# CONFIG_SERIAL_TIMBERDALE is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +# CONFIG_LEGACY_PTYS is not set +# CONFIG_IPMI_HANDLER is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_DEVPORT=y +# CONFIG_TI816X_PCIE_BOOTDRV is not set +# CONFIG_TI81XX_HDMI is not set +# CONFIG_RAMOOPS is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=y +# CONFIG_I2C_MUX is not set +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_I801 is not set +# CONFIG_I2C_ISCH is not set +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE is not set +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_INTEL_MID is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_OMAP=y +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_GPIO is not set +CONFIG_SPI_OMAP24XX=y +# CONFIG_SPI_TOPCLIFF_PCH is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set + +# +# PPS support +# +# CONFIG_PPS is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +# CONFIG_GPIO_SYSFS is not set + +# +# Memory mapped GPIO expanders: +# +# CONFIG_GPIO_BASIC_MMIO is not set +# CONFIG_GPIO_IT8761E is not set +# CONFIG_GPIO_SCH is not set +# CONFIG_GPIO_VX855 is not set + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_SX150X is not set +# CONFIG_GPIO_ADP5588 is not set + +# +# PCI GPIO expanders: +# +# CONFIG_GPIO_CS5535 is not set +# CONFIG_GPIO_BT8XX is not set +# CONFIG_GPIO_LANGWELL is not set +# CONFIG_GPIO_PCH is not set +# CONFIG_GPIO_RDC321X is not set + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_74X164 is not set + +# +# AC97 GPIO expanders: +# + +# +# MODULbus GPIO expanders: +# +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +# CONFIG_HWMON is not set +# CONFIG_THERMAL is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_OMAP_WATCHDOG=y +# CONFIG_MAX63XX_WATCHDOG is not set +# CONFIG_ALIM7101_WDT is not set + +# +# PCI-based Watchdog Cards +# +# CONFIG_PCIPCWATCHDOG is not set +# CONFIG_WDTPCI is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +# CONFIG_SSB_B43_PCI_BRIDGE is not set +CONFIG_SSB_SDIOHOST_POSSIBLE=y +# CONFIG_SSB_SDIOHOST is not set +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +# CONFIG_SSB_DRIVER_PCICORE is not set +CONFIG_MFD_SUPPORT=y +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_HTC_I2CPLD is not set +# CONFIG_TPS65010 is not set +# CONFIG_TPS6507X is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_TC35892 is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_MAX8998 is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X_I2C is not set +# CONFIG_MFD_WM831X_SPI is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_MFD_MC13XXX is not set +# CONFIG_ABX500_CORE is not set +# CONFIG_EZX_PCAP is not set +# CONFIG_MFD_TIMBERDALE is not set +# CONFIG_LPC_SCH is not set +# CONFIG_MFD_RDC321X is not set +# CONFIG_MFD_JANZ_CMODIO is not set +# CONFIG_MFD_TPS6586X is not set +# CONFIG_MFD_VX855 is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +CONFIG_REGULATOR_DUMMY=y +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_BQ24022 is not set +# CONFIG_REGULATOR_MAX1586 is not set +# CONFIG_REGULATOR_MAX8649 is not set +# CONFIG_REGULATOR_MAX8660 is not set +# CONFIG_REGULATOR_MAX8952 is not set +# CONFIG_REGULATOR_LP3971 is not set +# CONFIG_REGULATOR_LP3972 is not set +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set +# CONFIG_REGULATOR_ISL6271A is not set +# CONFIG_REGULATOR_AD5398 is not set +CONFIG_MEDIA_SUPPORT=y + +# +# Multimedia core support +# +# CONFIG_MEDIA_CONTROLLER is not set +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_COMMON=y +CONFIG_VIDEO_ALLOW_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +# CONFIG_DVB_CORE is not set +CONFIG_VIDEO_MEDIA=y + +# +# Multimedia drivers +# +# CONFIG_IR_CORE is not set +# CONFIG_MEDIA_ATTACH is not set +CONFIG_MEDIA_TUNER=y +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_MEDIA_TUNER_SIMPLE=y +CONFIG_MEDIA_TUNER_TDA8290=y +CONFIG_MEDIA_TUNER_TDA827X=y +CONFIG_MEDIA_TUNER_TDA18271=y +CONFIG_MEDIA_TUNER_TDA9887=y +CONFIG_MEDIA_TUNER_TEA5761=y +CONFIG_MEDIA_TUNER_TEA5767=y +CONFIG_MEDIA_TUNER_MT20XX=y +CONFIG_MEDIA_TUNER_XC2028=y +CONFIG_MEDIA_TUNER_XC5000=y +CONFIG_MEDIA_TUNER_MC44S803=y +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set + +# +# Encoders/decoders and other helper chips +# + +# +# Audio decoders +# +# CONFIG_VIDEO_TVAUDIO is not set +# CONFIG_VIDEO_TDA7432 is not set +# CONFIG_VIDEO_TDA9840 is not set +# CONFIG_VIDEO_TDA9875 is not set +# CONFIG_VIDEO_TEA6415C is not set +# CONFIG_VIDEO_TEA6420 is not set +# CONFIG_VIDEO_MSP3400 is not set +# CONFIG_VIDEO_CS5345 is not set +# CONFIG_VIDEO_CS53L32A is not set +# CONFIG_VIDEO_M52790 is not set +# CONFIG_VIDEO_TLV320AIC23B is not set +# CONFIG_VIDEO_WM8775 is not set +# CONFIG_VIDEO_WM8739 is not set +# CONFIG_VIDEO_VP27SMPX is not set + +# +# RDS decoders +# +# CONFIG_VIDEO_SAA6588 is not set + +# +# Video decoders +# +# CONFIG_VIDEO_ADV7180 is not set +# CONFIG_VIDEO_BT819 is not set +# CONFIG_VIDEO_BT856 is not set +# CONFIG_VIDEO_BT866 is not set +# CONFIG_VIDEO_KS0127 is not set +# CONFIG_VIDEO_OV7670 is not set +# CONFIG_VIDEO_MT9T001 is not set +# CONFIG_VIDEO_MT9V011 is not set +# CONFIG_VIDEO_MT9V113 is not set +# CONFIG_VIDEO_TCM825X is not set +# CONFIG_VIDEO_SAA7110 is not set +# CONFIG_VIDEO_SAA711X is not set +# CONFIG_VIDEO_SAA717X is not set +# CONFIG_VIDEO_SAA7191 is not set +# CONFIG_VIDEO_TVP514X is not set +# CONFIG_VIDEO_TVP5150 is not set +# CONFIG_VIDEO_TVP7002 is not set +# CONFIG_VIDEO_VPX3220 is not set + +# +# Video and audio decoders +# +# CONFIG_VIDEO_CX25840 is not set + +# +# MPEG video encoders +# +# CONFIG_VIDEO_CX2341X is not set + +# +# Video encoders +# +# CONFIG_VIDEO_SAA7127 is not set +# CONFIG_VIDEO_SAA7185 is not set +# CONFIG_VIDEO_ADV7170 is not set +# CONFIG_VIDEO_ADV7175 is not set +# CONFIG_VIDEO_THS7303 is not set +# CONFIG_VIDEO_ADV7343 is not set +# CONFIG_VIDEO_AK881X is not set + +# +# Video improvement chips +# +# CONFIG_VIDEO_UPD64031A is not set +# CONFIG_VIDEO_UPD64083 is not set +# CONFIG_VIDEO_CPIA2 is not set +# CONFIG_VIDEO_SAA7134 is not set +# CONFIG_VIDEO_MXB is not set +# CONFIG_VIDEO_HEXIUM_ORION is not set +# CONFIG_VIDEO_HEXIUM_GEMINI is not set +# CONFIG_VIDEO_CAFE_CCIC is not set +# CONFIG_VIDEO_SR030PC30 is not set +# CONFIG_SOC_CAMERA is not set +CONFIG_V4L_USB_DRIVERS=y +CONFIG_USB_VIDEO_CLASS=y +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +# CONFIG_USB_GSPCA is not set +# CONFIG_VIDEO_PVRUSB2 is not set +# CONFIG_VIDEO_HDPVR is not set +# CONFIG_VIDEO_USBVISION is not set +# CONFIG_USB_VICAM is not set +# CONFIG_USB_IBMCAM is not set +# CONFIG_USB_KONICAWC is not set +# CONFIG_USB_ET61X251 is not set +# CONFIG_USB_SE401 is not set +# CONFIG_USB_SN9C102 is not set +# CONFIG_USB_PWC is not set +# CONFIG_USB_ZR364XX is not set +# CONFIG_USB_STKWEBCAM is not set +# CONFIG_USB_S2255 is not set +# CONFIG_V4L_MEM2MEM_DRIVERS is not set +# CONFIG_RADIO_ADAPTERS is not set +# CONFIG_DAB is not set +CONFIG_HAVE_TI_TILER=y +# CONFIG_TI_TILER is not set + +# +# Graphics support +# +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +# CONFIG_DRM is not set +# CONFIG_STUB_POULSBO is not set +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_TI81XX_VPSS is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE is not set +# CONFIG_LOGO is not set +CONFIG_SOUND=y +# CONFIG_SOUND_OSS_CORE is not set +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=y +CONFIG_SND_RAWMIDI=y +CONFIG_SND_JACK=y +# CONFIG_SND_SEQUENCER is not set +# CONFIG_SND_MIXER_OSS is not set +# CONFIG_SND_PCM_OSS is not set +# CONFIG_SND_HRTIMER is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +# CONFIG_SND_RAWMIDI_SEQ is not set +# CONFIG_SND_OPL3_LIB_SEQ is not set +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +# CONFIG_SND_EMU10K1_SEQ is not set +# CONFIG_SND_DRIVERS is not set +CONFIG_SND_PCI=y +# CONFIG_SND_AD1889 is not set +# CONFIG_SND_ALS300 is not set +# CONFIG_SND_ALI5451 is not set +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set +# CONFIG_SND_AU8820 is not set +# CONFIG_SND_AU8830 is not set +# CONFIG_SND_AW2 is not set +# CONFIG_SND_AZT3328 is not set +# CONFIG_SND_BT87X is not set +# CONFIG_SND_CA0106 is not set +# CONFIG_SND_CMIPCI is not set +# CONFIG_SND_OXYGEN is not set +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_CS46XX is not set +# CONFIG_SND_CS5535AUDIO is not set +# CONFIG_SND_CTXFI is not set +# CONFIG_SND_DARLA20 is not set +# CONFIG_SND_GINA20 is not set +# CONFIG_SND_LAYLA20 is not set +# CONFIG_SND_DARLA24 is not set +# CONFIG_SND_GINA24 is not set +# CONFIG_SND_LAYLA24 is not set +# CONFIG_SND_MONA is not set +# CONFIG_SND_MIA is not set +# CONFIG_SND_ECHO3G is not set +# CONFIG_SND_INDIGO is not set +# CONFIG_SND_INDIGOIO is not set +# CONFIG_SND_INDIGODJ is not set +# CONFIG_SND_INDIGOIOX is not set +# CONFIG_SND_INDIGODJX is not set +# CONFIG_SND_EMU10K1 is not set +# CONFIG_SND_EMU10K1X is not set +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set +# CONFIG_SND_ES1938 is not set +# CONFIG_SND_ES1968 is not set +# CONFIG_SND_FM801 is not set +# CONFIG_SND_HDA_INTEL is not set +# CONFIG_SND_HDSP is not set +# CONFIG_SND_HDSPM is not set +# CONFIG_SND_HIFIER is not set +# CONFIG_SND_ICE1712 is not set +# CONFIG_SND_ICE1724 is not set +# CONFIG_SND_INTEL8X0 is not set +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_KORG1212 is not set +# CONFIG_SND_LX6464ES is not set +# CONFIG_SND_MAESTRO3 is not set +# CONFIG_SND_MIXART is not set +# CONFIG_SND_NM256 is not set +# CONFIG_SND_PCXHR is not set +# CONFIG_SND_RIPTIDE is not set +# CONFIG_SND_RME32 is not set +# CONFIG_SND_RME96 is not set +# CONFIG_SND_RME9652 is not set +# CONFIG_SND_SONICVIBES is not set +# CONFIG_SND_TRIDENT is not set +# CONFIG_SND_VIA82XX is not set +# CONFIG_SND_VIA82XX_MODEM is not set +# CONFIG_SND_VIRTUOSO is not set +# CONFIG_SND_VX222 is not set +# CONFIG_SND_YMFPCI is not set +# CONFIG_SND_ARM is not set +# CONFIG_SND_SPI is not set +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=y +# CONFIG_SND_USB_UA101 is not set +# CONFIG_SND_USB_CAIAQ is not set +CONFIG_SND_SOC=y +CONFIG_SND_TI81XX_SOC=y +CONFIG_SND_DAVINCI_SOC_MCASP=y +CONFIG_SND_TI81XX_SOC_EVM=y +# CONFIG_SND_OMAP_SOC is not set +CONFIG_SND_SOC_I2C_AND_SPI=y +# CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_TLV320AIC3X=y +# CONFIG_SOUND_PRIME is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set + +# +# Special HID drivers +# +# CONFIG_HID_3M_PCT is not set +CONFIG_HID_A4TECH=y +# CONFIG_HID_ACRUX_FF is not set +CONFIG_HID_APPLE=y +CONFIG_HID_BELKIN=y +# CONFIG_HID_CANDO is not set +CONFIG_HID_CHERRY=y +CONFIG_HID_CHICONY=y +# CONFIG_HID_PRODIKEYS is not set +CONFIG_HID_CYPRESS=y +# CONFIG_HID_DRAGONRISE is not set +# CONFIG_HID_EGALAX is not set +CONFIG_HID_EZKEY=y +CONFIG_HID_KYE=y +# CONFIG_HID_UCLOGIC is not set +# CONFIG_HID_WALTOP is not set +# CONFIG_HID_GYRATION is not set +# CONFIG_HID_TWINHAN is not set +CONFIG_HID_KENSINGTON=y +CONFIG_HID_LOGITECH=y +# CONFIG_LOGITECH_FF is not set +# CONFIG_LOGIRUMBLEPAD2_FF is not set +# CONFIG_LOGIG940_FF is not set +# CONFIG_LOGIWII_FF is not set +CONFIG_HID_MICROSOFT=y +# CONFIG_HID_MOSART is not set +CONFIG_HID_MONTEREY=y +# CONFIG_HID_NTRIG is not set +# CONFIG_HID_ORTEK is not set +# CONFIG_HID_PANTHERLORD is not set +# CONFIG_HID_PETALYNX is not set +# CONFIG_HID_PICOLCD is not set +# CONFIG_HID_QUANTA is not set +# CONFIG_HID_ROCCAT is not set +# CONFIG_HID_ROCCAT_KONE is not set +# CONFIG_HID_ROCCAT_PYRA is not set +# CONFIG_HID_SAMSUNG is not set +# CONFIG_HID_SONY is not set +# CONFIG_HID_STANTUM is not set +# CONFIG_HID_SUNPLUS is not set +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TOPSEED is not set +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_ZEROPLUS is not set +# CONFIG_HID_ZYDACRON is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +CONFIG_USB_SUSPEND=y +# CONFIG_USB_OTG is not set +# CONFIG_USB_MON is not set +# CONFIG_USB_WUSB is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_XHCI_HCD is not set +# CONFIG_USB_EHCI_HCD is not set +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_ISP1362_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +# CONFIG_USB_UHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_WHCI_HCD is not set +# CONFIG_USB_HWA_HCD is not set +CONFIG_USB_MUSB_HDRC=y + +# +# Platform Glue Layer +# +# CONFIG_USB_MUSB_TUSB6010_GLUE is not set +# CONFIG_USB_MUSB_OMAP2PLUS_GLUE is not set +# CONFIG_USB_MUSB_AM35X_GLUE is not set +CONFIG_USB_MUSB_TI81XX_GLUE=y +# CONFIG_USB_MUSB_DAVINCI is not set +# CONFIG_USB_MUSB_DA8XX is not set +# CONFIG_USB_MUSB_TUSB6010 is not set +# CONFIG_USB_MUSB_OMAP2PLUS is not set +# CONFIG_USB_MUSB_AM35X is not set +CONFIG_USB_MUSB_TI81XX=y +# CONFIG_USB_MUSB_BLACKFIN is not set +# CONFIG_USB_MUSB_UX500 is not set +CONFIG_USB_MUSB_HOST=y +CONFIG_USB_MUSB_HDRC_HCD=y +# CONFIG_MUSB_PIO_ONLY is not set +# CONFIG_USB_INVENTRA_DMA_HW is not set +# CONFIG_USB_TI_CPPI_DMA_HW is not set +CONFIG_USB_TI_CPPI41_DMA_HW=y +# CONFIG_USB_INVENTRA_DMA is not set +# CONFIG_USB_TI_CPPI_DMA is not set +CONFIG_USB_TI_CPPI41_DMA=y +# CONFIG_USB_TUSB_OMAP_DMA is not set +CONFIG_USB_MUSB_DEBUG=y + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set +# CONFIG_USB_WDM is not set +# CONFIG_USB_TMC is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set +# CONFIG_USB_UAS is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_SISUSBVGA is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_YUREX is not set +# CONFIG_USB_GADGET is not set + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +# CONFIG_USB_GPIO_VBUS is not set +# CONFIG_USB_ULPI is not set +CONFIG_NOP_USB_XCEIV=y +# CONFIG_UWB is not set +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +# CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +# CONFIG_MMC_OMAP is not set +CONFIG_MMC_OMAP_HS=y +# CONFIG_MMC_TIFM_SD is not set +# CONFIG_MMC_SPI is not set +# CONFIG_MMC_CB710 is not set +# CONFIG_MMC_VIA_SDMMC is not set +# CONFIG_MMC_USHC is not set +# CONFIG_MEMSTICK is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_ACCESSIBILITY is not set +# CONFIG_INFINIBAND is not set +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set +# CONFIG_DMADEVICES is not set +# CONFIG_AUXDISPLAY is not set +# CONFIG_UIO is not set +# CONFIG_STAGING is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT4_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +CONFIG_FS_POSIX_ACL=y +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +CONFIG_FILE_LOCKING=y +# CONFIG_FSNOTIFY is not set +# CONFIG_DNOTIFY is not set +# CONFIG_INOTIFY_USER is not set +# CONFIG_FANOTIFY is not set +# CONFIG_QUOTA is not set +# CONFIG_QUOTACTL is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=y +# CONFIG_JOLIET is not set +# CONFIG_ZISOFS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_ECRYPT_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_FS_WBUF_VERIFY=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_LOGFS is not set +# CONFIG_CRAMFS is not set +# CONFIG_SQUASHFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +CONFIG_ROOT_NFS=y +# CONFIG_NFSD is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_CEPH_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y +# CONFIG_DLM is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_LOCKUP_DETECTOR is not set +# CONFIG_HARDLOCKUP_DETECTOR is not set +# CONFIG_DETECT_HUNG_TASK is not set +# CONFIG_SCHED_DEBUG is not set +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +CONFIG_BKL=y +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_KPROBES_SANITY_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_LKDTM is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_SYSCTL_SYSCALL_CHECK is not set +# CONFIG_PAGE_POISONING is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_TRACING_SUPPORT=y +# CONFIG_FTRACE is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_ATOMIC64_SELFTEST is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +# CONFIG_STRICT_DEVMEM is not set +# CONFIG_ARM_UNWIND is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_ERRORS is not set +# CONFIG_DEBUG_STACK_USAGE is not set +CONFIG_DEBUG_LL=y +CONFIG_EARLY_PRINTK=y +# CONFIG_DEBUG_ICEDCC is not set +# CONFIG_OC_ETM is not set + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_KEYS_DEBUG_PROC_KEYS=y +# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY=y +# CONFIG_SECURITYFS is not set +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +# CONFIG_SECURITY_PATH is not set +# CONFIG_SECURITY_TOMOYO is not set +# CONFIG_SECURITY_APPARMOR is not set +# CONFIG_IMA is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +# CONFIG_CRYPTO_MANAGER is not set +# CONFIG_CRYPTO_MANAGER2 is not set +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +# CONFIG_CRYPTO_CBC is not set +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +# CONFIG_CRYPTO_ECB is not set +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_GHASH is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_ZLIB is not set +# CONFIG_CRYPTO_LZO is not set + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +# CONFIG_CRYPTO_HW is not set +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +# CONFIG_CRC_T10DIF is not set +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y diff --git a/recipes/linux/linux-omap3_2.6.37-psp04.00.00.10.bb b/recipes/linux/linux-omap3_2.6.37-psp04.00.00.10.bb new file mode 100644 index 0000000000..fdf67eba74 --- /dev/null +++ b/recipes/linux/linux-omap3_2.6.37-psp04.00.00.10.bb @@ -0,0 +1,10 @@ +require linux-omap3.inc + +COMPATIBLE_MACHINE = "ti816x" + +KVER = "2.6.37" +PSPREL = "04.00.00.10" + +BRANCH = "ti81xx-master" +# Use literal tags in SRCREV, when available, instead of commit IDs +SRCREV = "v2.6.37_TI816XPSP_04.00.00.10" From 64c6947f3cc7aa1ed1b994ec2f46d667ffb20480 Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Wed, 6 Apr 2011 17:36:07 +0000 Subject: [PATCH 275/509] u-boot: Add PSP version for ti816x devices. * Add TI PSP u-boot version for dm816x/c6a816x/am389x devices. * Based on PSP release 4.00.00.10. Signed-off-by: Siddharth Heroor Signed-off-by: Koen Kooi --- recipes/u-boot/u-boot_2010.06-psp04.00.00.10.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 recipes/u-boot/u-boot_2010.06-psp04.00.00.10.bb diff --git a/recipes/u-boot/u-boot_2010.06-psp04.00.00.10.bb b/recipes/u-boot/u-boot_2010.06-psp04.00.00.10.bb new file mode 100644 index 0000000000..2c4d12033a --- /dev/null +++ b/recipes/u-boot/u-boot_2010.06-psp04.00.00.10.bb @@ -0,0 +1,13 @@ +require u-boot-omap3.inc + +COMPATIBLE_MACHINE = "ti816x" + +BRANCH = "master" + +# Use literal tags in SRCREV, when available, instead of commit IDs +SRCREV = "v2010.06_TI816XPSP_04.00.00.10" + +UVER = "2010.06" +PSPREL = "04.00.00.10" + +PR = "r1" From 76a6a1c9deb7b4fceff2bd330c8c8e95b94f4b36 Mon Sep 17 00:00:00 2001 From: chase maupin Date: Tue, 5 Apr 2011 23:41:47 +0000 Subject: [PATCH 276/509] linux-omap4: Add support for am45x-evm machine * Add the am45x-evm machine type to the COMPATIBLE_MACHINEs for this kernel version. * Add the defconfig file for am45x-evm machine type Signed-off-by: Chase Maupin Acked-by: Denys Dmytriyenko Acked-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- recipes/linux/linux-omap4/am45x-evm/defconfig | 2950 +++++++++++++++++ recipes/linux/linux-omap4_2.6.35.3.bb | 2 +- 2 files changed, 2951 insertions(+), 1 deletion(-) create mode 100644 recipes/linux/linux-omap4/am45x-evm/defconfig diff --git a/recipes/linux/linux-omap4/am45x-evm/defconfig b/recipes/linux/linux-omap4/am45x-evm/defconfig new file mode 100644 index 0000000000..ed706a6ce6 --- /dev/null +++ b/recipes/linux/linux-omap4/am45x-evm/defconfig @@ -0,0 +1,2950 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.35.3 +# Mon Jan 24 17:29:10 2011 +# +CONFIG_ARM=y +CONFIG_HAVE_PWM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +# CONFIG_ARCH_USES_GETTIMEOFFSET is not set +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_LOCKBREAK=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_ARCH_HAS_CPUFREQ=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +# CONFIG_INIT_PASS_ALL_PARAMS is not set +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_LZO is not set +CONFIG_VERSION_SIGNATURE="" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_TINY_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_RCU_FAST_NO_HZ is not set +# CONFIG_TREE_RCU_TRACE is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_CGROUPS is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_RD_LZO is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +# CONFIG_ELF_CORE is not set +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_PERF_USE_VMALLOC=y + +# +# Kernel Performance Events And Counters +# +# CONFIG_PERF_EVENTS is not set +# CONFIG_PERF_COUNTERS is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLUB_DEBUG=y +CONFIG_COMPAT_BRK=y +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_HAVE_CLK=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_SLOW_WORK=y +# CONFIG_SLOW_WORK_DEBUG is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_INTEGRITY=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +# CONFIG_INLINE_SPIN_UNLOCK is not set +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +# CONFIG_INLINE_READ_UNLOCK is not set +# CONFIG_INLINE_READ_UNLOCK_BH is not set +# CONFIG_INLINE_READ_UNLOCK_IRQ is not set +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +# CONFIG_INLINE_WRITE_UNLOCK is not set +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_FREEZER=y + +# +# System Type +# +CONFIG_MMU=y +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_VEXPRESS is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_BCMRING is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CNS3XXX is not set +# CONFIG_ARCH_GEMINI is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_STMP3XXX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_DOVE is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_MMP is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_W90X900 is not set +# CONFIG_ARCH_NUC93X is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_MSM is not set +# CONFIG_ARCH_SHMOBILE is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_S5P6440 is not set +# CONFIG_ARCH_S5P6442 is not set +# CONFIG_ARCH_S5PC100 is not set +# CONFIG_ARCH_S5PV210 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_U300 is not set +# CONFIG_ARCH_U8500 is not set +# CONFIG_ARCH_NOMADIK is not set +# CONFIG_ARCH_DAVINCI is not set +CONFIG_ARCH_OMAP=y +# CONFIG_PLAT_SPEAR is not set + +# +# TI OMAP Implementations +# +# CONFIG_ARCH_OMAP1 is not set +CONFIG_ARCH_OMAP2PLUS=y +# CONFIG_ARCH_OMAP2 is not set +# CONFIG_ARCH_OMAP3 is not set +CONFIG_ARCH_OMAP4=y + +# +# OMAP Feature Selections +# +CONFIG_OMAP_SMARTREFLEX=y +# CONFIG_OMAP_SMARTREFLEX_TESTING is not set +CONFIG_OMAP_SMARTREFLEX_CLASS3=y +CONFIG_OMAP_RESET_CLOCKS=y +# CONFIG_OMAP_MUX is not set +CONFIG_OMAP_MCBSP=y +CONFIG_OMAP_MBOX_FWK=y +CONFIG_OMAP_REMOTE_PROC=y +CONFIG_OMAP_IOMMU=y +CONFIG_OMAP_USER_DMM=y +# CONFIG_OMAP_IOMMU_DEBUG is not set +# CONFIG_OMAP_MPU_TIMER is not set +CONFIG_OMAP_32K_TIMER=y +CONFIG_OMAP_32K_TIMER_HZ=128 +CONFIG_OMAP_DM_TIMER=y +# CONFIG_OMAP_PM_NONE is not set +# CONFIG_OMAP_PM_NOOP is not set +CONFIG_OMAP_PM=y + +# +# OMAP Board Type +# +CONFIG_WIFI_CONTROL_FUNC=y +CONFIG_TIWLAN_SDIO=y +CONFIG_TIWLAN_MMC_CONTROLLER=5 +# CONFIG_OMAP4_ES1 is not set +CONFIG_MACH_OMAP_4430SDP=y +CONFIG_MACH_OMAP4_PANDA=y +# CONFIG_ERRATA_OMAP4_AXI2OCP is not set +# CONFIG_ENABLE_L3_ERRORS is not set + +# +# Processor Type +# +CONFIG_CPU_32v6K=y +CONFIG_CPU_V7=y +CONFIG_CPU_32v7=y +CONFIG_CPU_ABRT_EV7=y +CONFIG_CPU_PABRT_V7=y +CONFIG_CPU_CACHE_V7=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y +CONFIG_CPU_TLB_V7=y +CONFIG_CPU_HAS_ASID=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +CONFIG_ARM_THUMBEE=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_HAS_TLS_REG=y +CONFIG_OUTER_CACHE=y +CONFIG_OUTER_CACHE_SYNC=y +CONFIG_CACHE_L2X0=y +CONFIG_CACHE_PL310=y +CONFIG_ARM_L1_CACHE_SHIFT=5 +CONFIG_ARM_DMA_MEM_BUFFERABLE=y +# CONFIG_USER_L2_PLE is not set +CONFIG_USER_PMON=y +CONFIG_CPU_HAS_PMU=y +# CONFIG_ARM_ERRATA_430973 is not set +# CONFIG_ARM_ERRATA_458693 is not set +# CONFIG_ARM_ERRATA_460075 is not set +# CONFIG_PL310_ERRATA_588369 is not set +CONFIG_ARM_ERRATA_720789=y +CONFIG_ARM_GIC=y +CONFIG_COMMON_CLKDEV=y + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_SMP=y +CONFIG_HAVE_ARM_SCU=y +CONFIG_HAVE_ARM_TWD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_NR_CPUS=2 +CONFIG_HOTPLUG_CPU=y +CONFIG_LOCAL_TIMERS=y +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_HZ=128 +# CONFIG_THUMB2_KERNEL is not set +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +CONFIG_HIGHMEM=y +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y +# CONFIG_UACCESS_WITH_MEMCPY is not set +# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_CPU_V7_SYSFS=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE=" debug " +# CONFIG_CMDLINE_FORCE is not set +# CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y + +# +# CPU Power Management +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_VFP=y +CONFIG_VFPv3=y +CONFIG_NEON=y + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +CONFIG_HAVE_AOUT=y +CONFIG_BINFMT_AOUT=y +CONFIG_BINFMT_MISC=y + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_DEBUG=y +# CONFIG_PM_ADVANCED_DEBUG is not set +# CONFIG_PM_VERBOSE is not set +CONFIG_CAN_PM_TRACE=y +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND_NVS=y +CONFIG_SUSPEND=y +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_SUSPEND_FREEZER=y +# CONFIG_APM_EMULATION is not set +CONFIG_PM_RUNTIME=y +CONFIG_PM_OPS=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +# CONFIG_NET_IPGRE_BROADCAST is not set +CONFIG_IP_MROUTE=y +# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set +# CONFIG_IP_PIMSM_V1 is not set +# CONFIG_IP_PIMSM_V2 is not set +CONFIG_ARPD=y +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +# CONFIG_DEFAULT_BIC is not set +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_HYBLA is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_VENO is not set +# CONFIG_DEFAULT_WESTWOOD is not set +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=m +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_MROUTE=y +CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y +CONFIG_IPV6_PIMSM_V2=y +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +# CONFIG_NETFILTER_TPROXY is not set +CONFIG_NETFILTER_XTABLES=m + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m + +# +# Xtables targets +# +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +# CONFIG_NETFILTER_XT_TARGET_CT is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_VS=m +CONFIG_IP_VS_IPV6=y +CONFIG_IP_VS_DEBUG=y +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +CONFIG_IP_VS_PROTO_SCTP=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +# CONFIG_BRIDGE_NF_EBTABLES is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_L2TP is not set +CONFIG_STP=m +CONFIG_GARP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +# CONFIG_NET_DSA is not set +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y +# CONFIG_DECNET is not set +CONFIG_LLC=m +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_PHONET is not set +CONFIG_IEEE802154=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +# CONFIG_NET_SCH_PRIO is not set +# CONFIG_NET_SCH_MULTIQ is not set +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +# CONFIG_NET_SCH_NETEM is not set +# CONFIG_NET_SCH_DRR is not set + +# +# Classification +# +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +CONFIG_NET_CLS_ROUTE=y +# CONFIG_NET_CLS_FW is not set +# CONFIG_NET_CLS_U32 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set +CONFIG_RPS=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +# CONFIG_IRNET is not set +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +# CONFIG_DONGLE is not set +# CONFIG_KINGSUN_DONGLE is not set +# CONFIG_KSDAZZLE_DONGLE is not set +# CONFIG_KS959_DONGLE is not set + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +# CONFIG_SIGMATEL_FIR is not set +# CONFIG_MCS_FIR is not set +CONFIG_BT=y +CONFIG_BT_L2CAP=y +CONFIG_BT_L2CAP_EXT_FEATURES=y +CONFIG_BT_SCO=y +CONFIG_BT_RFCOMM=y +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +# CONFIG_BT_HCIVHCI is not set +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +# CONFIG_AF_RXRPC is not set +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_REG_DEBUG is not set +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_WEXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_PID=y +CONFIG_MAC80211_RC_MINSTREL=y +# CONFIG_MAC80211_RC_DEFAULT_PID is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=y +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +# CONFIG_NET_9P is not set +# CONFIG_CAIF is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +CONFIG_SR_REPORT_TIME_LIMIT=100 +CONFIG_CONNECTOR=m +# CONFIG_MTD is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_CRYPTOLOOP=y +# CONFIG_BLK_DEV_DRBD is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_UB=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_XIP is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +CONFIG_CDROM_PKTCDVD_WCACHE=y +CONFIG_ATA_OVER_ETH=m +# CONFIG_MG_DISK is not set +CONFIG_MISC_DEVICES=y +# CONFIG_AD525X_DPOT is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_ISL29003 is not set +# CONFIG_SENSORS_TSL2550 is not set +CONFIG_SENSORS_BH1780=y +# CONFIG_DS1682 is not set +# CONFIG_TI_DAC7512 is not set +CONFIG_BMP085=y +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT24 is not set +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +CONFIG_EEPROM_93CX6=m +CONFIG_IWMC3200TOP=m +# CONFIG_IWMC3200TOP_DEBUG is not set +# CONFIG_IWMC3200TOP_DEBUGFS is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=y +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_ST=m +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=m +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +CONFIG_ATA=m +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +# CONFIG_SATA_AHCI_PLATFORM is not set +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +# CONFIG_SATA_MV is not set + +# +# PATA SFF controllers with BMDMA +# + +# +# PIO-only SFF controllers +# +# CONFIG_PATA_PLATFORM is not set + +# +# Generic fallback / legacy drivers +# +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +# CONFIG_MD_RAID456 is not set +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_QL=m +CONFIG_DM_MULTIPATH_ST=m +CONFIG_DM_DELAY=m +CONFIG_DM_UEVENT=y +CONFIG_NETDEVICES=y +CONFIG_DUMMY=m +CONFIG_BONDING=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_EQUALIZER=m +CONFIG_TUN=m +CONFIG_VETH=m +# CONFIG_PHYLIB is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_AX88796 is not set +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_ENC28J60 is not set +# CONFIG_ETHOC is not set +# CONFIG_SMC911X is not set +# CONFIG_SMSC911X is not set +# CONFIG_DNET is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_B44 is not set +# CONFIG_KS8842 is not set +CONFIG_KS8851=y +# CONFIG_KS8851_MLL is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set +CONFIG_WLAN=y +CONFIG_LIBERTAS_THINFIRM=m +# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM_USB=m +CONFIG_AT76C50X_USB=m +CONFIG_USB_ZD1201=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +# CONFIG_MAC80211_HWSIM is not set +CONFIG_ATH_COMMON=m +# CONFIG_ATH_DEBUG is not set +# CONFIG_ATH9K_HTC is not set +CONFIG_AR9170_USB=m +CONFIG_AR9170_LEDS=y +CONFIG_B43=m +# CONFIG_B43_SDIO is not set +CONFIG_B43_PIO=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +# CONFIG_B43LEGACY is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +# CONFIG_IWM is not set +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_SPI is not set +# CONFIG_LIBERTAS_DEBUG is not set +# CONFIG_LIBERTAS_MESH is not set +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +# CONFIG_P54_SPI is not set +CONFIG_P54_LEDS=y +CONFIG_RT2X00=m +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT30XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RT2800_LIB=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_HT=y +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_WL12XX=m +CONFIG_WL1251=m +CONFIG_WL1251_SPI=m +CONFIG_WL1251_SDIO=m +CONFIG_WL1271=m +CONFIG_WL1271_SPI=m +CONFIG_WL1271_SDIO=m +CONFIG_WL12XX_PLATFORM_DATA=y +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_SDIO=m +CONFIG_WIMAX_IWMC3200_SDIO=y +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=y +CONFIG_USB_NET_AX8817X=y +CONFIG_USB_NET_CDCETHER=y +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=y +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=y +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=y +# CONFIG_USB_ALI_M5632 is not set +# CONFIG_USB_AN2720 is not set +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_KC2190 is not set +CONFIG_USB_NET_ZAURUS=y +CONFIG_USB_HSO=m +# CONFIG_USB_NET_INT51X1 is not set +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_WAN=y +# CONFIG_HDLC is not set +# CONFIG_DLCI is not set +CONFIG_IEEE802154_DRIVERS=m +# CONFIG_IEEE802154_FAKEHARD is not set +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +# CONFIG_SLIP is not set +CONFIG_SLHC=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y +# CONFIG_ISDN is not set +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=m +# CONFIG_INPUT_POLLDEV is not set +CONFIG_INPUT_SPARSEKMAP=m + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_QT2160 is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_KEYBOARD_TCA6416 is not set +# CONFIG_KEYBOARD_MATRIX is not set +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_MAX7359 is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +CONFIG_KEYBOARD_OMAP4=y +# CONFIG_KEYBOARD_TWL4030 is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_INPUT_MOUSE is not set +CONFIG_INPUT_JOYSTICK=y +# CONFIG_JOYSTICK_ANALOG is not set +# CONFIG_JOYSTICK_A3D is not set +# CONFIG_JOYSTICK_ADI is not set +# CONFIG_JOYSTICK_COBRA is not set +# CONFIG_JOYSTICK_GF2K is not set +# CONFIG_JOYSTICK_GRIP is not set +# CONFIG_JOYSTICK_GRIP_MP is not set +# CONFIG_JOYSTICK_GUILLEMOT is not set +# CONFIG_JOYSTICK_INTERACT is not set +# CONFIG_JOYSTICK_SIDEWINDER is not set +# CONFIG_JOYSTICK_TMDC is not set +# CONFIG_JOYSTICK_IFORCE is not set +# CONFIG_JOYSTICK_WARRIOR is not set +# CONFIG_JOYSTICK_MAGELLAN is not set +# CONFIG_JOYSTICK_SPACEORB is not set +# CONFIG_JOYSTICK_SPACEBALL is not set +# CONFIG_JOYSTICK_STINGER is not set +# CONFIG_JOYSTICK_TWIDJOY is not set +# CONFIG_JOYSTICK_ZHENHUA is not set +# CONFIG_JOYSTICK_JOYDUMP is not set +# CONFIG_JOYSTICK_XPAD is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set +# CONFIG_TOUCHSCREEN_AD7879_I2C is not set +# CONFIG_TOUCHSCREEN_AD7879_SPI is not set +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_DYNAPRO is not set +# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set +# CONFIG_TOUCHSCREEN_EETI is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_MCS5000 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_TOUCHSCREEN_W90X900 is not set +CONFIG_TOUCHSCREEN_SYNTM12XX=y +# CONFIG_TOUCHSCREEN_TPS6507X is not set +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_AD714X is not set +CONFIG_INPUT_ATI_REMOTE=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_TWL4030_PWRBUTTON=m +CONFIG_INPUT_TWL4030_VIBRA=m +CONFIG_INPUT_TWL6040_VIBRA=m +CONFIG_INPUT_UINPUT=y +CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +CONFIG_INPUT_SFH7741=y +CONFIG_INPUT_CMA3000_I2C=y + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_SERIO_ALTERA_PS2 is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y +# CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_N_GSM is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_MAX3100 is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_OMAP=y +CONFIG_SERIAL_OMAP_CONSOLE=y +# CONFIG_SERIAL_TIMBERDALE is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +# CONFIG_LEGACY_PTYS is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=y +# CONFIG_HW_RANDOM_TIMERIOMEM is not set +# CONFIG_R3964 is not set +CONFIG_RAW_DRIVER=m +CONFIG_MAX_RAW_DEVS=256 +# CONFIG_TCG_TPM is not set +# CONFIG_RAMOOPS is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_ALGOBIT=m + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE is not set +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_OMAP=y +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_GPIO is not set +CONFIG_SPI_OMAP24XX=y +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +CONFIG_SPI_SPIDEV=m +# CONFIG_SPI_TLE62X0 is not set + +# +# PPS support +# +# CONFIG_PPS is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +# CONFIG_GPIO_SYSFS is not set + +# +# Memory mapped GPIO expanders: +# +# CONFIG_GPIO_IT8761E is not set + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_TWL4030 is not set +# CONFIG_GPIO_ADP5588 is not set + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set + +# +# AC97 GPIO expanders: +# + +# +# MODULbus GPIO expanders: +# +# CONFIG_W1 is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +# CONFIG_TEST_POWER is not set +# CONFIG_BATTERY_DS2760 is not set +# CONFIG_BATTERY_DS2782 is not set +CONFIG_TWL6030_BCI_BATTERY=y +CONFIG_CHARGER_BQ2415x=y +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +# CONFIG_SENSORS_AD7414 is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADCXX is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ADT7411 is not set +# CONFIG_SENSORS_ADT7462 is not set +# CONFIG_SENSORS_ADT7470 is not set +# CONFIG_SENSORS_ADT7475 is not set +# CONFIG_SENSORS_ASC7621 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_G760A is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM70 is not set +# CONFIG_SENSORS_LM73 is not set +CONFIG_SENSORS_LM75=y +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_LM93 is not set +# CONFIG_SENSORS_LTC4215 is not set +# CONFIG_SENSORS_LTC4245 is not set +# CONFIG_SENSORS_LM95241 is not set +# CONFIG_SENSORS_MAX1111 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX6650 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_SHT15 is not set +# CONFIG_SENSORS_DME1737 is not set +# CONFIG_SENSORS_EMC1403 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_ADS7828 is not set +# CONFIG_SENSORS_ADS7871 is not set +# CONFIG_SENSORS_AMC6821 is not set +# CONFIG_SENSORS_THMC50 is not set +# CONFIG_SENSORS_TMP102 is not set +# CONFIG_SENSORS_TMP401 is not set +# CONFIG_SENSORS_TMP421 is not set +# CONFIG_SENSORS_TWL6030_HOTDIE is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83L786NG is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_SENSORS_LIS3_SPI is not set +# CONFIG_SENSORS_LIS3_I2C is not set +# CONFIG_THERMAL is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +# CONFIG_MPCORE_WATCHDOG is not set +CONFIG_OMAP_WATCHDOG=y +# CONFIG_TWL4030_WATCHDOG is not set +# CONFIG_MAX63XX_WATCHDOG is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=m +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +# CONFIG_SSB_SDIOHOST is not set +# CONFIG_SSB_SILENT is not set +# CONFIG_SSB_DEBUG is not set +CONFIG_MFD_SUPPORT=y +CONFIG_MFD_CORE=y +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_HTC_I2CPLD is not set +# CONFIG_TPS65010 is not set +# CONFIG_TPS6507X is not set +CONFIG_TWL4030_CORE=y +# CONFIG_TWL4030_POWER is not set +CONFIG_TWL4030_CODEC=y +# CONFIG_MFD_TC35892 is not set +CONFIG_TWL6030_PWM=y +CONFIG_TWL6030_GPADC=y +CONFIG_TWL6040_CODEC=y +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_MFD_MC13783 is not set +# CONFIG_ABX500_CORE is not set +# CONFIG_EZX_PCAP is not set +# CONFIG_AB8500_CORE is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +# CONFIG_REGULATOR_DUMMY is not set +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_BQ24022 is not set +# CONFIG_REGULATOR_MAX1586 is not set +# CONFIG_REGULATOR_MAX8649 is not set +# CONFIG_REGULATOR_MAX8660 is not set +CONFIG_REGULATOR_TWL4030=y +# CONFIG_REGULATOR_LP3971 is not set +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set +CONFIG_MEDIA_SUPPORT=y + +# +# Multimedia core support +# +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_COMMON=y +CONFIG_VIDEO_ALLOW_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_DVB_CORE=m +CONFIG_VIDEO_MEDIA=m + +# +# Multimedia drivers +# +CONFIG_IR_CORE=y +CONFIG_VIDEO_IR=y +CONFIG_LIRC=y +CONFIG_RC_MAP=y +CONFIG_IR_NEC_DECODER=y +CONFIG_IR_RC5_DECODER=y +CONFIG_IR_RC6_DECODER=y +CONFIG_IR_JVC_DECODER=y +CONFIG_IR_SONY_DECODER=y +CONFIG_IR_RC5_SZ_DECODER=m +CONFIG_IR_LIRC_CODEC=m +# CONFIG_IR_IMON is not set +CONFIG_IR_MCEUSB=m +CONFIG_IR_STREAMZAP=m +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEOBUF_GEN=y +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DMA_CONTIG=y +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_TUNER=m +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +CONFIG_VIDEO_IR_I2C=y +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_MT9V011=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_CX25840=m +CONFIG_VIDEO_CX2341X=m +# CONFIG_VIDEO_VIVI is not set +CONFIG_VIDEO_OMAP2_VOUT=y +# CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_CPIA2 is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_VIDEO_AU0828 is not set +# CONFIG_SOC_CAMERA is not set +CONFIG_V4L_USB_DRIVERS=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +# CONFIG_USB_M5602 is not set +# CONFIG_USB_STV06XX is not set +# CONFIG_USB_GL860 is not set +# CONFIG_USB_GSPCA_BENQ is not set +# CONFIG_USB_GSPCA_CONEX is not set +# CONFIG_USB_GSPCA_CPIA1 is not set +# CONFIG_USB_GSPCA_ETOMS is not set +# CONFIG_USB_GSPCA_FINEPIX is not set +# CONFIG_USB_GSPCA_JEILINJ is not set +# CONFIG_USB_GSPCA_MARS is not set +# CONFIG_USB_GSPCA_MR97310A is not set +# CONFIG_USB_GSPCA_OV519 is not set +# CONFIG_USB_GSPCA_OV534 is not set +# CONFIG_USB_GSPCA_OV534_9 is not set +# CONFIG_USB_GSPCA_PAC207 is not set +# CONFIG_USB_GSPCA_PAC7302 is not set +# CONFIG_USB_GSPCA_PAC7311 is not set +# CONFIG_USB_GSPCA_SN9C2028 is not set +# CONFIG_USB_GSPCA_SN9C20X is not set +# CONFIG_USB_GSPCA_SONIXB is not set +# CONFIG_USB_GSPCA_SONIXJ is not set +# CONFIG_USB_GSPCA_SPCA500 is not set +# CONFIG_USB_GSPCA_SPCA501 is not set +# CONFIG_USB_GSPCA_SPCA505 is not set +# CONFIG_USB_GSPCA_SPCA506 is not set +# CONFIG_USB_GSPCA_SPCA508 is not set +# CONFIG_USB_GSPCA_SPCA561 is not set +# CONFIG_USB_GSPCA_SQ905 is not set +# CONFIG_USB_GSPCA_SQ905C is not set +# CONFIG_USB_GSPCA_STK014 is not set +# CONFIG_USB_GSPCA_STV0680 is not set +# CONFIG_USB_GSPCA_SUNPLUS is not set +# CONFIG_USB_GSPCA_T613 is not set +# CONFIG_USB_GSPCA_TV8532 is not set +# CONFIG_USB_GSPCA_VC032X is not set +# CONFIG_USB_GSPCA_ZC3XX is not set +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_QUICKCAM_MESSENGER=m +CONFIG_USB_ET61X251=m +CONFIG_VIDEO_OVCAMCHIP=m +CONFIG_USB_W9968CF=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +CONFIG_USB_ZC0301=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +# CONFIG_V4L_MEM2MEM_DRIVERS is not set +CONFIG_RADIO_ADAPTERS=y +# CONFIG_I2C_SI4713 is not set +# CONFIG_RADIO_SI4713 is not set +# CONFIG_USB_DSBR is not set +# CONFIG_RADIO_SI470X is not set +# CONFIG_USB_MR800 is not set +# CONFIG_RADIO_TEA5764 is not set +# CONFIG_RADIO_SAA7706H is not set +# CONFIG_RADIO_TEF6862 is not set +CONFIG_DVB_MAX_ADAPTERS=8 +CONFIG_DVB_DYNAMIC_MINORS=y +CONFIG_DVB_CAPTURE_DRIVERS=y +# CONFIG_TTPCI_EEPROM is not set + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_SMS_SIANO_MDTV=m + +# +# Siano module components +# +# CONFIG_SMS_USB_DRV is not set +# CONFIG_SMS_SDIO_DRV is not set + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_EC100=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m +CONFIG_DVB_NXT200X=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_S5H1411=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m +CONFIG_DVB_LNBP21=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +# CONFIG_DAB is not set +CONFIG_DMM_OMAP=y +CONFIG_TILER_OMAP=y + +# +# Graphics support +# +CONFIG_DRM=m +# CONFIG_DRM_MGA is not set +# CONFIG_DRM_VIA is not set +# CONFIG_DRM_SAVAGE is not set +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=m +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_UVESA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_TMIO is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set +CONFIG_OMAP2_VRAM=y +CONFIG_OMAP2_DSS=y +CONFIG_OMAP2_VRAM_SIZE=32 +CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y +# CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set +CONFIG_OMAP2_DSS_DPI=y +# CONFIG_OMAP2_DSS_RFBI is not set +# CONFIG_OMAP2_DSS_VENC is not set +CONFIG_OMAP2_DSS_HDMI=y +CONFIG_OMAP2_DSS_DSI=y +# CONFIG_OMAP2_DSS_USE_DSI_PLL is not set +CONFIG_OMAP2_DSS_FAKE_VSYNC=y +CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 +CONFIG_FB_OMAP2=y +CONFIG_FB_OMAP2_DEBUG_SUPPORT=y +CONFIG_FB_OMAP2_NUM_FBS=2 + +# +# OMAP2/3 Display Device Drivers +# +CONFIG_PANEL_GENERIC=y +CONFIG_PANEL_SHARP_LS037V7DW01=y +# CONFIG_PANEL_SHARP_LQ043T1DG01 is not set +CONFIG_PANEL_PICO_DLP=y +CONFIG_PANEL_TAAL=y +CONFIG_PANEL_NEC_NL8048HL11_01B=y +# CONFIG_PANEL_TOPPOLY_TDO35S is not set +# CONFIG_PANEL_TPO_TD043MTEA1 is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=y +# CONFIG_LCD_L4F00242T03 is not set +# CONFIG_LCD_LMS283GF05 is not set +# CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_TDO24M is not set +# CONFIG_LCD_VGG2432A4 is not set +# CONFIG_LCD_PLATFORM is not set +# CONFIG_LCD_S6E63M0 is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_GENERIC=y +# CONFIG_BACKLIGHT_PWM is not set +# CONFIG_BACKLIGHT_ADP8860 is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +# CONFIG_LOGO is not set +CONFIG_SOUND=y +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_RAWMIDI_SEQ=m +# CONFIG_SND_OPL3_LIB_SEQ is not set +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +# CONFIG_SND_EMU10K1_SEQ is not set +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +CONFIG_SND_ARM=y +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_SOC=y +CONFIG_SND_OMAP_SOC=y +CONFIG_SND_OMAP_SOC_ABE_DSP=y +CONFIG_SND_OMAP_SOC_MCBSP=y +CONFIG_SND_OMAP_SOC_MCPDM=y +CONFIG_SND_OMAP_SOC_ABE=y +CONFIG_SND_OMAP_SOC_DMIC=y +CONFIG_SND_OMAP_SOC_SDP4430=y +CONFIG_SND_OMAP_SOC_HDMI=y +CONFIG_SND_SOC_I2C_AND_SPI=y +# CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_DMIC=y +CONFIG_SND_SOC_TWL6040=y +# CONFIG_SOUND_PRIME is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set + +# +# Special HID drivers +# +# CONFIG_HID_3M_PCT is not set +# CONFIG_HID_A4TECH is not set +# CONFIG_HID_APPLE is not set +# CONFIG_HID_BELKIN is not set +# CONFIG_HID_CANDO is not set +# CONFIG_HID_CHERRY is not set +# CONFIG_HID_CHICONY is not set +# CONFIG_HID_PRODIKEYS is not set +# CONFIG_HID_CYPRESS is not set +# CONFIG_HID_DRAGONRISE is not set +# CONFIG_HID_EGALAX is not set +# CONFIG_HID_EZKEY is not set +# CONFIG_HID_KYE is not set +# CONFIG_HID_GYRATION is not set +# CONFIG_HID_TWINHAN is not set +# CONFIG_HID_KENSINGTON is not set +# CONFIG_HID_LOGITECH is not set +# CONFIG_HID_MAGICMOUSE is not set +# CONFIG_HID_MICROSOFT is not set +# CONFIG_HID_MOSART is not set +# CONFIG_HID_MONTEREY is not set +# CONFIG_HID_NTRIG is not set +# CONFIG_HID_ORTEK is not set +# CONFIG_HID_PANTHERLORD is not set +# CONFIG_HID_PETALYNX is not set +# CONFIG_HID_PICOLCD is not set +# CONFIG_HID_QUANTA is not set +# CONFIG_HID_ROCCAT is not set +# CONFIG_HID_ROCCAT_KONE is not set +# CONFIG_HID_SAMSUNG is not set +# CONFIG_HID_SONY is not set +# CONFIG_HID_STANTUM is not set +# CONFIG_HID_SUNPLUS is not set +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TOPSEED is not set +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_WACOM is not set +# CONFIG_HID_ZEROPLUS is not set +# CONFIG_HID_ZYDACRON is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +CONFIG_USB_DEBUG=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_DYNAMIC_MINORS=y +CONFIG_USB_SUSPEND=y +# CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_MON=m +CONFIG_USB_WUSB=m +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +CONFIG_USB_EHCI_HCD=y +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_EHCI_HCD_OMAP3=y +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_ISP1362_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_HWA_HCD is not set +CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_MUSB_SOC=y + +# +# OMAP 44xx high speed USB support +# +# CONFIG_USB_MUSB_HOST is not set +CONFIG_USB_MUSB_PERIPHERAL=y +# CONFIG_USB_MUSB_OTG is not set +CONFIG_USB_GADGET_MUSB_HDRC=y +# CONFIG_MUSB_PIO_ONLY is not set +CONFIG_USB_INVENTRA_DMA=y +# CONFIG_USB_TI_CPPI_DMA is not set +CONFIG_USB_MUSB_DEBUG=y + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_SISUSBVGA is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +CONFIG_USB_TEST=m +# CONFIG_USB_ISIGHTFW is not set +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_ATMEL_USBA is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_PXA25X is not set +# CONFIG_USB_GADGET_R8A66597 is not set +# CONFIG_USB_GADGET_PXA27X is not set +# CONFIG_USB_GADGET_S3C_HSOTG is not set +# CONFIG_USB_GADGET_IMX is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_FSL_QE is not set +# CONFIG_USB_GADGET_CI13XXX is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LANGWELL is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +CONFIG_USB_ZERO=m +# CONFIG_USB_AUDIO is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_ETH_EEM is not set +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FUNCTIONFS is not set +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +# CONFIG_USB_MASS_STORAGE is not set +CONFIG_USB_G_SERIAL=m +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +CONFIG_USB_CDC_COMPOSITE=m +# CONFIG_USB_G_NOKIA is not set +CONFIG_USB_G_MULTI=m +CONFIG_USB_G_MULTI_RNDIS=y +CONFIG_USB_G_MULTI_CDC=y +# CONFIG_USB_G_HID is not set +# CONFIG_USB_G_DBGP is not set +# CONFIG_USB_G_WEBCAM is not set + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +# CONFIG_USB_GPIO_VBUS is not set +# CONFIG_USB_ULPI is not set +# CONFIG_TWL4030_USB is not set +CONFIG_TWL6030_USB=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WLP=m +CONFIG_UWB_I1480U=m +CONFIG_UWB_I1480U_WLP=m +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_UNSAFE_RESUME=y + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +# CONFIG_MMC_OMAP is not set +CONFIG_MMC_OMAP_HS=y +# CONFIG_MEMSTICK is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +# CONFIG_LEDS_PCA9532 is not set +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_GPIO_PLATFORM=y +# CONFIG_LEDS_LP3944 is not set +# CONFIG_LEDS_PCA955X is not set +# CONFIG_LEDS_DAC124S085 is not set +CONFIG_LEDS_PWM=y +# CONFIG_LEDS_REGULATOR is not set +# CONFIG_LEDS_BD2802 is not set +# CONFIG_LEDS_LT3593 is not set +CONFIG_LEDS_TRIGGERS=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set +CONFIG_LEDS_TRIGGER_GPIO=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y + +# +# iptables trigger is under Netfilter config (LED target) +# +# CONFIG_ACCESSIBILITY is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_BQ32K is not set +CONFIG_RTC_DRV_TWL4030=y +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set +# CONFIG_RTC_DRV_PCF2123 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_MSM6242 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_RP5C01 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +# CONFIG_DMADEVICES is not set +# CONFIG_AUXDISPLAY is not set +CONFIG_UIO=m +CONFIG_UIO_PDRV=m +CONFIG_UIO_PDRV_GENIRQ=m +CONFIG_STAGING=y +# CONFIG_STAGING_EXCLUDE_BUILD is not set +# CONFIG_VIDEO_TM6000 is not set +# CONFIG_USB_IP_COMMON is not set +# CONFIG_W35UND is not set +CONFIG_PRISM2_USB=m +# CONFIG_ECHO is not set +# CONFIG_OTUS is not set +# CONFIG_RT2870 is not set +# CONFIG_COMEDI is not set +# CONFIG_ASUS_OLED is not set +# CONFIG_TRANZPORT is not set +# CONFIG_POHMELFS is not set +# CONFIG_LINE6_USB is not set +# CONFIG_DRM_NOUVEAU is not set +# CONFIG_VT6656 is not set +CONFIG_FB_UDL=m + +# +# RAR Register Driver +# +CONFIG_IIO=y +# CONFIG_IIO_RING_BUFFER is not set +# CONFIG_IIO_TRIGGER is not set + +# +# Accelerometers +# +# CONFIG_ADIS16209 is not set +# CONFIG_ADIS16220 is not set +# CONFIG_ADIS16240 is not set +# CONFIG_KXSD9 is not set +# CONFIG_LIS3L02DQ is not set + +# +# Analog to digital convertors +# +# CONFIG_MAX1363 is not set + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16260 is not set + +# +# Inertial measurement units +# +# CONFIG_ADIS16300 is not set +# CONFIG_ADIS16350 is not set +# CONFIG_ADIS16400 is not set + +# +# Light sensors +# +# CONFIG_SENSORS_TSL2563 is not set + +# +# Magnetometer sensors +# +CONFIG_SENSORS_HMC5843=y + +# +# Triggers - standalone +# +CONFIG_RAMZSWAP=m +CONFIG_RAMZSWAP_STATS=y +# CONFIG_BATMAN_ADV is not set +# CONFIG_FB_SM7XX is not set + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +CONFIG_ST_BT=m +CONFIG_ST_FM=m +# CONFIG_ADIS16255 is not set +CONFIG_LIRC_STAGING=y +CONFIG_LIRC_I2C=m +CONFIG_LIRC_IGORPLUGUSB=m +CONFIG_LIRC_IMON=m +CONFIG_LIRC_SASEM=m +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y +CONFIG_LIRC_SIR=m +CONFIG_LIRC_TTUSBIR=m +CONFIG_LIRC_ZILOG=m +CONFIG_Sys_Link=y +CONFIG_SYSLINK_PROC=y +CONFIG_SYSLINK_PROC4430=y +CONFIG_DUCATI_BASEIMAGE_PHYS_ADDR=0x9CF00000 +# CONFIG_SYSLINK_DUCATI_PM is not set +CONFIG_OMAP_DEVICE_HANDLER=y +CONFIG_MPU_SYSLINK_PLATFORM=y +CONFIG_MPU_SYSLINK_IPC=y +CONFIG_SYSLINK_USE_SYSMGR=y +CONFIG_SYSLINK_IOMMU_ENABLE=y +CONFIG_SYSLINK_RECOVERY=y +# CONFIG_DMM_DMA_API is not set +# CONFIG_TILER_PID_KILL_NOTIFICATIONS is not set + +# +# Ubuntu Supplied Third-Party Device Drivers +# +CONFIG_AUFS_FS=m +CONFIG_AUFS_BRANCH_MAX_127=y +# CONFIG_AUFS_BRANCH_MAX_511 is not set +# CONFIG_AUFS_BRANCH_MAX_1023 is not set +# CONFIG_AUFS_BRANCH_MAX_32767 is not set +CONFIG_AUFS_HNOTIFY=y +CONFIG_AUFS_HFSNOTIFY=y +# CONFIG_AUFS_HINOTIFY is not set +# CONFIG_AUFS_RDU is not set +CONFIG_AUFS_SP_IATTR=y +# CONFIG_AUFS_SHWH is not set +# CONFIG_AUFS_BR_RAMFS is not set +CONFIG_AUFS_BDEV_LOOP=y +# CONFIG_AUFS_DEBUG is not set + +# +# Compcache options +# +CONFIG_BLK_DEV_COMPCACHE=m +# CONFIG_BLK_DEV_COMPCACHE_DEBUG is not set +CONFIG_BLK_DEV_COMPCACHE_STATS=y +CONFIG_SCSI_ISCSITARGET=m + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +# CONFIG_EXT3_FS_XATTR is not set +# CONFIG_EXT4_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +CONFIG_FS_POSIX_ACL=y +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_QUOTA=y +# CONFIG_QUOTA_NETLINK_INTERFACE is not set +CONFIG_PRINT_QUOTA_WARNING=y +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=y +# CONFIG_QFMT_V1 is not set +CONFIG_QFMT_V2=y +CONFIG_QUOTACTL=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set +CONFIG_GENERIC_ACL=y + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_CONFIGFS_FS=m +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_LOGFS is not set +# CONFIG_CRAMFS is not set +# CONFIG_SQUASHFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set +CONFIG_ROOT_NFS=y +# CONFIG_NFSD is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CEPH_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set +# CONFIG_DLM is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_ENABLE_WARN_DEPRECATED is not set +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=1024 +CONFIG_MAGIC_SYSRQ=y +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_DETECT_SOFTLOCKUP is not set +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +# CONFIG_SCHED_DEBUG is not set +CONFIG_SCHEDSTATS=y +CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_HIGHMEM is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_LKDTM is not set +# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_SYSCTL_SYSCALL_CHECK is not set +# CONFIG_PAGE_POISONING is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_TRACING_SUPPORT=y +# CONFIG_FTRACE is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_ATOMIC64_SELFTEST is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +# CONFIG_ARM_UNWIND is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_ERRORS is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_LL is not set +# CONFIG_OC_ETM is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_SMACK is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +# CONFIG_DEFAULT_SECURITY_YAMA is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_MANAGER_TESTS=y +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_PCRYPT is not set +CONFIG_CRYPTO_WORKQUEUE=y +# CONFIG_CRYPTO_CRYPTD is not set +CONFIG_CRYPTO_AUTHENC=m +# CONFIG_CRYPTO_TEST is not set + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +CONFIG_CRYPTO_ECB=m +# CONFIG_CRYPTO_LRW is not set +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=m +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=y +# CONFIG_CRYPTO_GHASH is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=m +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +CONFIG_CRYPTO_SHA1=m +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +CONFIG_CRYPTO_AES=m +# CONFIG_CRYPTO_ANUBIS is not set +CONFIG_CRYPTO_ARC4=m +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +# CONFIG_CRYPTO_ZLIB is not set +# CONFIG_CRYPTO_LZO is not set + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_HW=y +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +CONFIG_CRC_CCITT=y +CONFIG_CRC16=y +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +CONFIG_CRC7=m +CONFIG_LIBCRC32C=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=m +CONFIG_LZO_DECOMPRESS=m +CONFIG_DECOMPRESS_GZIP=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y diff --git a/recipes/linux/linux-omap4_2.6.35.3.bb b/recipes/linux/linux-omap4_2.6.35.3.bb index 050255443e..8c414411de 100644 --- a/recipes/linux/linux-omap4_2.6.35.3.bb +++ b/recipes/linux/linux-omap4_2.6.35.3.bb @@ -1,4 +1,4 @@ -COMPATIBLE_MACHINE = "omap4430-panda" +COMPATIBLE_MACHINE = "omap4430-panda|am45x-evm" require multi-kernel.inc From 9ca2e0952e82372da3de5f39abb6e1a50afff05d Mon Sep 17 00:00:00 2001 From: chase maupin Date: Tue, 5 Apr 2011 23:41:48 +0000 Subject: [PATCH 277/509] u-boot: Add support for am45x-evm machine * Added support for the am45x-evm machine type Signed-off-by: Chase Maupin Acked-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- recipes/u-boot/u-boot_git.bb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 61a75eab06..767a368b37 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -208,6 +208,13 @@ SRCREV_omap4430-panda = "261733408a27d14590cf3ec6b596461808050e32" PV_omap4430-panda = "2010.12+${PR}+git${SRCREV}" PE_omap4430-panda = "1" +SRC_URI_am45x-evm = "git://www.sakoman.com/git/u-boot.git;branch=omap4-exp;protocol=git \ + file://fix-break-caused-by-new-binutils.patch \ + " +SRCREV_am45x-evm = "261733408a27d14590cf3ec6b596461808050e32" +PV_am45x-evm = "2010.12+${PR}+git${SRCREV}" +PE_am45x-evm = "1" + # DaVinci dm355-evm/dm365-evm/dm6446-evm/dm6467-evm/dm6467t-evm - PSP 3.1.0/3.2.0 (build 35) SRC_URI_dm355-evm = "git://arago-project.org/git/projects/u-boot-davinci.git;protocol=git;branch=u-boot-davinci-2009.06" From 1a8d8050fcf1e2a3b9f1356982227203cf678a50 Mon Sep 17 00:00:00 2001 From: chase maupin Date: Tue, 5 Apr 2011 23:41:49 +0000 Subject: [PATCH 278/509] sort: Add support for am45x-evm machine type Signed-off-by: Chase Maupin Acked-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- contrib/angstrom/sort.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh index b38be99483..ca13ce282e 100755 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@ -79,7 +79,7 @@ case "$arch" in "armv6-novfp") machines="htcblackstone htcdiamond htcdream htckaiser htcnike htcpolaris htcraphael htctitan htcvogue" ;; "armv7a") - machines="am3517-evm am3517-crane archos5 archos5it beagleboard bug20 cm-t35 dm37x-evm am37x-evm am387x-evm am389x-evm babbage c6a814x-evm c6a816x-evm dm814x-evm efikamx htcleo igep0020 nokia900 omap3517-evm omap3evm omap3-pandora omap3-touchbook omap4430-sdp omapzoom omapzoom2 omapzoom36x overo palmpre omap4430-panda usrp-embedded usrp-e1xx" ;; + machines="am3517-evm am3517-crane am45x-evm archos5 archos5it beagleboard bug20 cm-t35 dm37x-evm am37x-evm am387x-evm am389x-evm babbage c6a814x-evm c6a816x-evm dm814x-evm efikamx htcleo igep0020 nokia900 omap3517-evm omap3evm omap3-pandora omap3-touchbook omap4430-sdp omapzoom omapzoom2 omapzoom36x overo palmpre omap4430-panda usrp-embedded usrp-e1xx" ;; "armv7a-vfp") machines="ac100" ;; "avr32") From d1d03c0ecee586e638b7bad2f6e3d6e794f50ff3 Mon Sep 17 00:00:00 2001 From: Chase Maupin Date: Tue, 5 Apr 2011 08:52:49 -0500 Subject: [PATCH 279/509] alsa-state: Add support for am45x-evm machine type * Added asound.conf file for am45x-evm machine type based on the omap4430-panda asound.conf file. Signed-off-by: Chase Maupin Signed-off-by: Koen Kooi --- recipes/alsa/alsa-state/am45x-evm/asound.conf | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 recipes/alsa/alsa-state/am45x-evm/asound.conf diff --git a/recipes/alsa/alsa-state/am45x-evm/asound.conf b/recipes/alsa/alsa-state/am45x-evm/asound.conf new file mode 100644 index 0000000000..f241f8690e --- /dev/null +++ b/recipes/alsa/alsa-state/am45x-evm/asound.conf @@ -0,0 +1,8 @@ + +# HDMI +pcm.!default { + type hw + card 0 + device 7 +} + From 7d830802ea5c09405720d0b43b837b3caa841732 Mon Sep 17 00:00:00 2001 From: chase maupin Date: Tue, 5 Apr 2011 23:41:51 +0000 Subject: [PATCH 280/509] am45x-evm: Add am45x-evm machine configuration * Added a new machine configuration for the am45x-evm device. * This machine currently mimics the omap4430-panda configuration during the prototyping phase but is expected to change as the hardware and software evolves. * The am45x-evm machine type is used to allow differentiating software components to be build and packaged (i.e. task lists) as well as to account for differences with the omap4430-panda device in the future. Signed-off-by: Chase Maupin Acked-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- conf/machine/am45x-evm.conf | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 conf/machine/am45x-evm.conf diff --git a/conf/machine/am45x-evm.conf b/conf/machine/am45x-evm.conf new file mode 100644 index 0000000000..3597d37109 --- /dev/null +++ b/conf/machine/am45x-evm.conf @@ -0,0 +1,10 @@ +#@TYPE: Machine +#@NAME: AM45X EVM +#@DESCRIPTION: Machine configuration for the AM45x EVM + +# Currently the am45x-evm machine type mimics the panda +# machine for its configuration. This is expected to change +# as the hardware and software evolves. Currently the unique +# machine type is used to differentiate software stack being +# built for the two devices. +require conf/machine/omap4430-panda.conf From 2b55626c78d4151c2214357215917f369212eb42 Mon Sep 17 00:00:00 2001 From: Carlos Hernandez Date: Sun, 3 Apr 2011 00:13:16 +0000 Subject: [PATCH 281/509] lmbench: rename 'line' binary as 'lm_line' Both lmbench and util-linux-ng packages provide own /usr/bin/line binaries. Even though the binaries name is the same, their functionality is different. This patch renames lmbench's line binary as lm_line to avoid conflicts with util-linux-ng. script/config-run is also modified (patch) to call lm_line instead of line. Signed-off-By: Carlos Hernandez Acked-by: Denys Dmytriyenko Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/lmbench/lmbench/rename-line-binary.patch | 11 +++++++++++ recipes/lmbench/lmbench_3.0-a9.bb | 6 ++++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 recipes/lmbench/lmbench/rename-line-binary.patch diff --git a/recipes/lmbench/lmbench/rename-line-binary.patch b/recipes/lmbench/lmbench/rename-line-binary.patch new file mode 100644 index 0000000000..997143b3b0 --- /dev/null +++ b/recipes/lmbench/lmbench/rename-line-binary.patch @@ -0,0 +1,11 @@ +--- patches/scripts/config-run 2006-11-26 15:11:04.000000000 -0500 ++++ patches/scripts/config-run 2011-04-01 09:35:50.000000000 -0400 +@@ -224,7 +224,7 @@ fi + + echo "Hang on, we are calculating your cache line size." + ../bin/$OS/msleep 250 +-LINE_SIZE=`../bin/$OS/line -M ${MB}M` ++LINE_SIZE=`../bin/$OS/lm_line -M ${MB}M` + export LINE_SIZE + echo "OK, it looks like your cache line is $LINE_SIZE bytes." + echo "" diff --git a/recipes/lmbench/lmbench_3.0-a9.bb b/recipes/lmbench/lmbench_3.0-a9.bb index 1e2598ac65..d1e9162bbe 100644 --- a/recipes/lmbench/lmbench_3.0-a9.bb +++ b/recipes/lmbench/lmbench_3.0-a9.bb @@ -3,12 +3,13 @@ DESCRIPTION = "Tools for performance analysis." LICENSE = "GPL" RDEPENDS_${PN} = "debianutils" -PR = "r2" +PR = "r3" inherit autotools SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ - file://lmbench-run" + file://lmbench-run \ + file://rename-line-binary.patch" SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf" SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551" @@ -56,6 +57,7 @@ do_install () { install -m 0755 ${S}/scripts/lmbench ${D}${bindir} install -d ${D}${datadir}/lmbench/scripts install -m 0755 ${S}/scripts/* ${D}${datadir}/lmbench/scripts + mv ${D}${bindir}/line ${D}${bindir}/lm_line } FILES_${PN} += "${datadir}/lmbench" From 63041bbf4e8e186aad8c9871d15af042aebf26b6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 13 Apr 2011 18:36:10 +0200 Subject: [PATCH 282/509] ncurses 5.7: put patch in OE The patch disappeared and apache on the sourcemirrors doesn't allow downloading of '.sh' files. This is *exactly* why we keep patches in OE instead downloading them from unreliable websites Signed-off-by: Koen Kooi --- .../ncurses/ncurses-5.7-20110108-patch.sh.bz2 | Bin 0 -> 827022 bytes recipes/ncurses/ncurses_5.7.bb | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 recipes/ncurses/ncurses/ncurses-5.7-20110108-patch.sh.bz2 diff --git a/recipes/ncurses/ncurses/ncurses-5.7-20110108-patch.sh.bz2 b/recipes/ncurses/ncurses/ncurses-5.7-20110108-patch.sh.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..75d2507784ea15d0b998328bbb1a38e323e12add GIT binary patch literal 827022 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%0AWAoWEq(hVnzHKbMl}5V@LnG( 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
    +5Bi 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ఋteWsd2^ilbDte`){f0} zZXqH){|Ii;bUNNaQ&IPpLNOWblB)LKMiuOH#%TYGbw3H&`{O;oF%W#mj(4q{L$(_9a8p#N9-3Vt3#IOH>ao={ zcpiUw_UrX;ub&j6epqoclJYI;F*W+6*Zm5i^# zL8DQEn^DQKwOwnOdh>~{wJo+)h_Xq#7}84!QWU^@RG4hyjuLfEmzI>1)PZ7JF4I6} z=b<(jq4`h+WW1Vkr!yi1tmU0j`S%~4G;FfOg#%OM_@NX`kHD1LsSA?_e-mnEtW^pZ z?TjGup!aDWs!Z)~lAA|n=$7$~181MfbZmpD@!cb2-gKiwL`b}KEpl?`afuNs8noid z!bXr{bJ#s-sT(J#o+3?7Q|DF*T$#mEnO2KlpOMa9{B-5OyGZxBY>%ZxNAjdQglPmI z8yndJ8s~IdHymU^k0|QcWxgPo^C!)DZI8E+=JWhR(ki~fZ-5y-@vAJ=?e$*(FadxK zc;o;C0000400000000001O)^S?C0TYTk+SFH=EenbNjZ}}l{R0H9kN&63Z1=hUkJjQ2G>D3mM)*3u^x5(QWncKwCW^9|m zyW90HJAawCq><6*#q(V**MyU8cv%#D* zSx>cVl}0}aB&B*%y(Fx+wF;i0Ei6*0>Jr7}cBt*#`yKo{knVKv*E8r|zE1zlR=D4^ zO7fEOsN34|x>P&Tr6xL4yB-qdV&P&-YL}I@!Kc#FOO)&6xm_f<>P>Sfp)Qxg?Cte* ztEK9@uKO-$Eag^Nbk-m6-}}DDVESNo`A>i@lg;xvw8N@tWWcgbu46K0${y6j3Z09! zYXT}rlC{AZeKAhMv~P7Jx%BBEUIPHYaJTrXk*7OhxqHJNk8G9&y5v_>l0!NqE-jzi zGV_z*Kyhlxe5Udz#xQ1cjtH1|@#47%>=0l_ceB_4;y{3ZU_z+=ZeOt7C+q)Kx*w}> z(kP$&RwR#!OI#Kw*r*;}KYIG)q4Nq4QLOM>!zt-ub%EY6@a%BqEdv1Z5mIkp+rC|u zrgLQK@fhr}KHMw3)ahF~70c#m?TVVn!u$)Q1z>1jY5Pb9&Pz+Y0X1@kWnHuB08QDwq2`Z zXaK-i3blX_J37}sGB;V6x^VT2NNgr!+F$>G%6NT{86yprT3~a#2 z4Oef-n8#s>)=%TbVS(b5x^_f^5-Jd7ubBZdV* z#wb9;QIaBP8Zr)XnVLv<+~wD~>nGKHPnyrd@CoXa?d@0?ctXNOMl>j=GYn2)3t4ee zV;;AtVsdZv`rAD2dVQ6C_A;$nwR0I(ty;Be=ic)9-+%d^$+Ps2&r#lfSLmKkGu)mj zr1qw!rlzK*rlzN)Fy{5JpGth`iTTkjE0tK83r48`B1qV+Oq}(x1nzVVCT>Wjh=Qs? zD+SyVIC%N(Nmcm`em{Wx`W9->1J2>N@YLsuWR#&Sz27G}r;;Skh+~nDQsfV1+CM{t zm+C)%-%Y0FdSuIxU4rTtV7uLX^AyF13?~q6w^uRDd|wvbku4t^i+!Ble)lgaSb^n7 z$xgH4EiO4SRBDt1)TfOum%92aFNW_+vv~V@ss1ah{@-VT>9|GAC2?+N#q)W?F%RJ@ zEV9V_jizAikm!Rp)8Gxqs(gd$VEH(ESnAo<=eg@BQN20gJ{k$)K&|nDFpbU!(dg?dK3r(8=%Sx9L1+48OkO!}Ck5UVc|6@4iLf{T) zjNxj4I&o|dpc>7NAtk6Rpvt<9V~lD9;KrekKgCTGaQTTmW7cGtN-JAoYn++_g-?!k zDJ4IKH&5Q4I>W=Xgun&>#h)&)S{$;BxD2$v@?=Ok^vGPx+NGc`xDHq z*QmrW%KM2@%)$?$?5Jm^1=?qdEH>w)<=#W3lY=`)CQt=TZFhevRTOdHkjg26BFvqeC4x zM)94qvInGpu}~0ktx_d(SLX8^G5p#Ob6n6o zR$y|UXP3s0+#7Z6DPeh#xzat^n^{NQK^m({lU)QMc_2MQhe>CbU{}U?0db)uU~D_v`_F zj-dTs7j<3&NWTOHo%8AM@@HUSWcr(NzQk{Zlp6MX-E$_F`&vUlo7%X&Z zdB^3PXiebm(l+gQG>@iKwN;Cs9)1{@*7l?@9>o8L;BEVCyTpw+W5pg)KFIR$vNo=P zzJHIC=NtVc{p$pefF>j|KBI*3(=B6ipA2n{bO7Gdq`2Q$5K!c#yKA=I_~wI%$FLGV z)qpXGoAl|x&L%=IAOHV$)f?G2!rzy#0E0O5-O^bYDKanVNuchllu~GQeW{z zgYri*93~P?>Pmn7gE#$B-jslZLGVke^j@p8iyy6HWsR2w!)TZPRn3=6UgT|u<0D>2|S^Wt8o z1Pdkca;G6etlXiP6ybaiJ&u*>c%>h8CiDiAQz%_y3Xq54{s!=Rj{ty12Cq+Q&!`Mi5kZlm)g5&jK{N%q@ z<^jb*ruNW}1d6=Kq&J=gE`Q$%j2}OoO z3?BvM{t20x2jH02c>TZWq{!BH->~hHl-p^xG}_B{n{77QZM54OZDq8mB4n8+WSJ%i zf+Uh;nUZJu>PeC+Nt2v7bB8gpxyiQEZKl}MZKgKUZKm5zwwrA>+GAO6@iTVdcAKH# z>BERX`+LDqA%sC8=eI=?U1StJMCs)2IXo6TvH|5h@};e*XxaGfSVsn*RlE)e?SuPs ziFB2`865whGu{lVz1vN}%H^QLV8|>H^A1pAMX&D`tMvart9cO-5fKmo01*)p5fK#- zP||gSr4@X7%lkclx5Er^?$hPZoD1<;)BR3U@MHC)Lr{u4sG99Z^FtEeJF+(nj9*H3 z)EiUky)_gNT;<vwiDiMJtckMlae)wiOMjdL0QsfR?*@o?)b^O$Y`b^r zLl63F+8kzM(24IhdM|R?p$)$dLT6MT0l!5(5X3i57BsPpb|*>F$v zbdpKDIPC%$mU4;jBf9RK;!Q*mpC2LX!Q;LiVDK?9ib%gAuId0 z9~AN`rpQC_2|RN0o#03iH{3YRCP6-8_?iiyMNuPZfi;3{jKz$}DH@YE*-p2suUw#G zMif|40nVA$31VIt|!NfMYafl}npn@z_Q4s}c#CyYLHq3O~{ylQV@(InEs7sMrbfbyNji_a-jDpB52r;kd)m+PCc=p ze6yi127FpHRxah+G6jKc^X9ZX`ps5!>kxI#~VI75~9h?dH)4C2Q z7Pt-^LPRg!KN)lFNah+}m9YZ1Ck^%XwAdyYLGzh0=anM2l{E*!ha692q&YWjQ zjq6W7JKN8Oq^Zo8yBm1Hx2cJYC4iLWp9q1-oGkFnVWJ~-mHMv&?pcov`+^`%+d78H zAxZKnN0B9o!%rMJ#z)x3$N}bf@zb5=Hr7jQz?~jJJQ({!cXn8M2Kp7yLmaqt=#IuR z5*`DM3g}Cw9K1yS*RWTFVoADk&a+blHj|UN^rpg7XkeSoIky)%^2Y)kIYpG(u_Y8* zD5B98dy;f_HXqQ9=YK96n{BquhdIpv!zB0U6q4FUN(jY90|_VtA%+G!LyR-v&oE#e zG6kWB5%4~;NQihJ>9mr{rWss+GGg4IYY<)JG(W|a2qPKyr=3s7 zy~E#*&tPz+De$yI?h;Uo&u#RZt2((jYuW3`)0cG26q>>0l>Sig4%bl@V^-aqdmBxEj+7RdYDkhgLrbZJTHa?{eI!fwXgjWwe&Uj?;L79$iy z{E5yN?DL5Td;^^44YoGep2^O08*72v8*L$sV@ASr-!_Fb)qkzm7EL}C*|Et|JCxGRBK#PWcGGDXT{3jrYIqx)>}$bVAewPE znhq4j=TifMzLX7y(TT%>{(|Dxh=9Q8`I0ya(A3rOh%VCYe2+bEY!MVuMX+Ko2D=Cv zNcY5}*&(Tf$wLP$NSyU&CUhrdNs4KX6}c|avn_b?Mpg)=DbgH;AFu8EeX?=9il-GnBif%bFIf6{dGCqb=KHoi1z#DC*;YC&;4_Zb z5&ysdX%$G8SO!TziAa@Dv=M0}Q4sugNS~T11o;Mmf=sHg7zPMGZNAy?!(V{`L3ZdM z;Cq22!V{B7TjkEvX_TW_72 zZk@@RT4rWu$wUeYhuB#iKi8Sv6V!Q5OHCz_DpUwENC~ojMAsj`!^V1#Zof#r(RKaU zzxcdG2t)n7U$Zl=*ZFo0!;#syt{pyeM=ifEAK}*+X8eCfLNYj&H!skBBN^+CeM`^P zA{~xl{og_lb;3MD0`jvmVaF`ku4LT*n*QQJ5mY)u;`D!GOVU*4$NdX)q<5~0Ocy!u zV$$Q~4*e^z!uS z1+|~ZKhquiXbs076#D>yX$U?TVkPbNX%}y2v(w31lZ8(2wgcH0i<29biWH0p5^`~N zlaJN%^7t3^#=j;P=%HhKjq2D zdU>JkuKcXc7m~~X_A;lSNdaVle9q$iXM6Lej8#KT2!6jJPW^i&_{0<`@F)rn$xyZQsUxsWAE|9 zp+1)kq?G*(_-M$LYe}{q$XE6^lLE~{@YUsg-2ArJ#P$833p%OV)Zk9DU-~%;hecmo z7>(4?W~CUr^TjKdvXH0v>s9rZK)$9sIbtH{gMk+TLm$JlXWp=%8hvk`;d2=FA4ZmT zhr`|F{e5HXDE@!^EYT#ud_otU#6P!PtbIFRLQh%OyA6}`pYs#eCCI@3^S{USJ1_HF zJxVB|iH3LnZ(Hvn`geCfDDV{2Pckzc9JQDNCqR%U$szB{A&79SB`7q)Mv<0BK{ zr$2(Az(_*m8Q1|s=5H5t6M239Y06ggaIA+V(S6gy-}GzkU1RXO(&GL`C3XCd;spB_ zKF&{xetFX_L^IdmaW_iZ#|8nHOS$CNf%QpA+qD_Ng|^hPB6 zZpyDe{p<6b3G>gYFn+O7dJxTmG^RBUL{hG|51vDi5rkIYwb^AxQ{t*=S+#E zNdJYFhIb}KN`jQ7l1QaVBi`xMhOI~+&vlZYL$?4s(w4Rzd7D(ucewLs`hD&zm3WO(Zw*2gGZUrc)7O2AN6xfApX`b zVF*b4$&5F%hc?K3|AppzB^;|2Dy^_g@#dC#f87umluDK# zz}sHu4Qr2)oFU#lxnQ6y=ezm%#E)OQ=^Y0_#9@gb2nm?|76@N&)21B1D|*C*%@SWb z+~4q+d0{vJq>Oz>(8egep)CZ+I}@4gpRQ0t5^5Au^r9qv$*r<6^sBwc&S3WHm&LkX zV~%*jgP-Mv^}HvNXoxZX)&1P?Wc~2*<=!^(>LDkU0SYE1;p%ytTsy=(a&$yO*gBEW zmPII;5n;PyTtsP?>DvZJO|Umi^zDj-y>K?Q{WnwZIZmoA3?aAK0)uWFZWHN0tfBUrOswlO z^lZA!xqEC@#M$II^?z^dx7XEJrqd5R0sNFY2x0xF zf#s1!M3h*=%YmqYaoz06CCb{@;H!d;O2HafO!x97P)n>eq|nVGJWCxvtUg!zoWk+rh1ojQlQq ztE!(&omtI&Jlt-2-QS`y>%YG@HxcgZe|%-9PsQ_7DYu))zUo0_$dez*m%rih`>fXs zb!8uec#WP;?B9-;&*IXzw*`CGi}>G~A2SPN-71#2WXQu;2OZedJPxwM<|d;Uu4NQC z1|mXil>zA>rmGfQ`>&WwCM3)DWA}0Rr^9nYjy9eJD$_Ze9iuEItmW8ClU$Wx=aeC~ z8`yh^%EHOmC`u%238_IX6w~*q41JmB%<@Asxk4OsKhGqzf)Z4WEgJdWh($%&ov8KG zlw@-I`gs>_glai4=!uj?;PQ0FypY?Ik-c|9X$Ig zG0D0YY3aQ6Ip<@-7~@2+%Ow!lHhcUM)`2d|dy$o&lwuH)I^%Pi^8YG_#JS4^K( zmp~~_Uv*>gH-9VS#w?uK2tyCf=S&=o-%rija%T2?rN0L`} zVo$uZ2wzAq4@Gox_;lgJg{yxgpxI@XpC-CZrNREcFLfjJUghgUmqFWB$Z|(?4&M;! zJ8*<19)tn(vJkH5^>t`S4t8OaFw2g29TVviNGQo&4tQ*1t&MHbH(HysUE$^?!2$&? zX>^YUOgL@LOo8S+X9L-vhloPP>rm;81~s1Wb)G;vb_D>`IF25EUpr`Q+if3+dRTp~ zPR$>sQz}0mYeFH|*uj_s+7Yy=@%w%s??gUR)II-hx8x7=>e9^>r6D7}9v&n=1+N<2 z=0KW<1X$;Bz=)k3vp7$RJbee0=EqEXUIygAftZtUHhfE%P&4PR!E5cRtlvxdKQ{q) z2S1;B?_RC|!?-!l00D3S4gdwf03)2>0000S=QuZU{Vwku`uFCh{965e6sc!EOa1(EEPt6_K3r%)F;n?EMo?iywzf(!Yvb z^v=v>X3=tw?gs0`ujutwaq{=V-M$YMzh3*^YH^OW7Q;Ij6a1GzQ>^HScz1L_ohVr5 z_=qAR2#A6rAc%6xOr6x7{^k8>{n^jz{yYKAfDy38X`^mggw56xM<-Y=Ojjs+Ybi=nGR$oO=Hsd9NbiwC#QWz_gs9m(_1I;->Z$2aSo;Y`5>~B zrVx6~=(Ufmshl2j@yhhACAN{dWi7DLt|Ojm>V$|*`6IecV$R07cXRnm4nXNJ(pTH* zHXMe#GQ2ft`zdOE_+31oY1y_kO5<@SLjEA=d;1=-*VE(NgfxOMMBP4%2>c_2mseXh zm27CKCn3vfl(a;$`l$?knezMRk{O-KLyl*(lF|rCWXA%oSa@!boz_0HkH74MFFy_m zlO`B(VB5VrHhzUA_ohZphAhr2Rq`Yb7!HC4{%vrYW(e1IjdL$0lL|}<*p8^Suy(G1_#?aM)KRrI?KR(QM>DPvQ z$I=>QBl8wNosbC9#A4C%-qbEWfhw{5Pxk%rm~CXg`HTO0r5e}o)oX+!yq z^GVO@hmZYoL6GJ~Mn#4L7>r(Ms_!)JY{R{$d%irKc#pql-M{JcF`VlMq2R>*;j<_7zv6xqakt{1W*JGy zgPPawUVI%NSLq!QVmfmhMvg<1k`Ndu$pq6I^W~MN25If0PH)hk=`oF8ui;-`d{Y7c zRaMcu%>IX?lh*YZ^Q->_Z0>e`=O^{4*x`qJ4n=c+E2Cv>tmOWP{So@(X!IPNG3mG3 z^}fzG_p9})Gu(IlU&MTKhe%hHWH9Z2BS1d<5Y8HR7IMXyW5!V61BA02*pD$vkJsAY z{PobaTWyGawhgR@=%@ZRACkfKkVL9#PaPc0D1u-lX#9>A9#h6)>5fh!lwXI&)SUQl zTthbG+D`JG4~;%!gxN``p!g;TJiyr7O9T(~Huf)TAKEH!;fwqkZ&X;d(OxQ9;8rj5 zM8k~JGp1pYdyhoQ(UL~v^qt3n*hKda{KwKiIQgT`9;E2{l8(>L`s(b*_M5yPt>x%{ zGD##snUDzyf`qAl zFee!$r#m+8-({^~qL=bnJ8oI-T%W@fSby&S%_j}_Pn27=$VqK?nsV8gjf#U0G9UHFwn?>ekEh02m+|6vsjkmh-_qby8aVKVr zIZG;I&CPei%db$>|2$9eAyZEGHvV2QO_DxC#^vv9R zF1l%POfAWCd$e1Drh6;crsEA8UJCY`MD@w_{iQM_*>di;b2n4&@uuAedGiMAr{#^+ zio*YupDHxBl-T=u=5W7u>+U0tAMCJ57aKIbHe0VBZ7jgH%Q5u%%@`6>cWwnCQ^_J2 z+$FO|S({3gJ_Mn$ufFA{wt1bI^XIk%^yhemo?8ybxbQV;*K=r@h-*J(s5#>7!|0t1 z+EcH7AK^{&>9n&k-b^=6WdAj5m26j?dI=9CFT2^R4!bY=JzWzm#+toeZvgh+&C%$x z?-O<8db|1?jQiD{7@X`7q~5P-e!&Z}C9O8Gw%uvEPpWoD`AnL&KS?=TJN%`>RTAyJ ze!iU+=SP?(e+TpT;@j$ap;x5~B_lkHA>|E+h=q9>?Djz<3;sKijP$8R&JlTQhB4Kg zU|x1cyz?hbSLf`mu3ZEMOMSQd@aSUtJTftjWp5;PORf)Ha4S14q*YZFsPd@%sUwRs zGb8I@6S7GhjFE#1_Eob#JJPCT!ID(QR!0B-zu5s99?S^-2jiHXApVvD|BZfLtj)c8 z56c98`3{qZB-qin&E#O=J3#u`@BV2rk6dDM!dAdsp>v69W@Y3LN|KOX-iUA+BTDyx z9(*C2Py8tzh-NT)WI_ z$y$q2^D>%fwHld+iFj*IcS?5BWswl@pn833YgMXD<-q}Wd(A*x%)Er-UR^0AZm7^Y zWSy@{hjHRQMGdRFu|&@cY&?vRJ4@|-?Bui=iMz}VAQ?3>m2I#^6OSQuUFe*(_B;=R zIdtmO9nzIFC`rv3cu%7c3~D~D{}?S>50fwgh15c#}(7NSgtyv?;V zV`(VOivuBs0(S_rSvjHJH2R9VjpG+@ccX1Kr#HOOr_H{ql58t$2&{~GbtvBQ-(_5F zL=bK(Xo=JpkE`D1Vn@2816iq^l#qNP|2;W_mMFX6%(v>(?Xl6#+-Y}PjOL}x1utyPXo;=9$#z? zx1kKTV5l-SQDF}{*5;z3bVN4qSw!9Lst31P-mhEU5jsxv>Ruw#v}$!Q^N}laGdW2o zxl*53cRRR*OPKk+Q^6AGccV(h8aJxU))4AQ9-^LFY?L!Vfi*iac%33AceJ;m^}K!J z$eX#TPjzpT1I$9FwR*_CRl+irMyka5jlD%J+{4PlBBmbqr43oWnEhvd->>Y~)PBe} z)#>p0-?QH^mOe}68C_Q=7M&iSr`1SV3uEQC82tFoOwHMRVgANW*|D2HnTw(1wpeJ) zjO4@Vv%1^oDL%ODzRy$s-_vXx;90WozuP!dW~iGZdnL{>28iz(KQZP!9HJ0|r|jn6 z0b>R|2g7;UFf|%xj4#G<;O!VDZR}Uv{+@cn+SOvlRg?sw4^{04opxqexLn zK*dN>qVwq*&^V+Bq22Lc7TbN>_U*8M&@e!$LqR9nYyABcAFJ8i^C~4%xavwjoc*8w zC;dhz4o4mCR%{G8AP8MbLTw@={(t--AK?9uA)SVS5WAO=!WDpf49%PCCCP>Bg75T!FDwdGdZd1}&Hw4$$^t8N)8iOM%FJ^p_RP5mciBBRoFz9NhKl>l9?ULM{|p!gc6R|gG^ey!R9kmRZxOb zLC-KMuoW(rh@v$>k6A_XR8X|4oY*ELkw7;g5?Mn+K|k%0BfItC@L30aT63uS<1J6e z2yF?p8%dB>L6&A@r*s4S1PF42r9;q=T@onlNa_lZHn10;+|W<{s^qdxmDZU{Q!dlH zX)Vi@qgOS`qUG-|0R|JYK!1*CqCcOEJdN(Qpudmt`cRpd^8E2*szW#aTf~!h>-s}t zVqI}>@VbzGJ0p{KLMCYjG!(e6OzaR%0CXT+l*vy~{1yM7?AZzc+|TU&+aJ{fl3ohu za3k8mKuk1DGyyXBq6wwJfHfo6yIj1ZaAAEUeyV;06CmX=k?=4KEW>AU;B+PUePhLFTAxE4q_Z?MlJOl6 z{opqr`ajK+M^M~jx%`jAss06#{J-yG>>P$dmP)EsDpg8YozC4ytJySUi5rYx>;G0c z(C`(WW1!ZQoT)KcIi!eV@+E4<(a6S2c^KM%ri^UN*+Y7t+xHw~emu{R7X{395yB`# z{sU_us0a23X{6qCcxRomY$`UDYSo5erJvqI2<8EM&sq!hItSGi#7N&(Bi1VA2V~5d zld^Ul48(c6!zK^LhL$|MLS;aP3Bo3 zqcdOP2KVSIp4Xn)73^t()e9 zX}`w~p0_z_rFj|-&tfhgaoEpor15+2B_4(abCvWtNca3JB1AWkvAb@MCWwQ^)3UpC z$lBZ5bH)R>*H2^Edj5&ekAt%Fros9n^iDG~Gcz+g9JQ4_{pcoqYq!s}w_;b3$bKR~ z54aMc8_C}BYow5Qn>z+@Bov2fzSt=LLE>&tkFp^MHCF1A}Ns(Oo)nPL{lOnnKoi6luV?E znMn~cl8Ka;%j*yEFqoPUr=h~1x$yY81{7)f&ku~>`1C&gngfpgKsGLnDl;5|4|osW z$zICx;0|IUbx0lHC@T>6m^zZ6>GgMBwC?qtFV;!z`7-*5LJ!`#UEOuQgUk0<{k~uM zL>EVc*)KZ04@2KzY350o|{5DwXiuYWmq0rsNEX6uEFDSS6bxcew~cUgNx?V2CJ~B02njPgR@e zvT3Ad67uaZ;A~*tgSwUtvYK@1cY2V79p9X2L7Cm%)4`$qJHw$WBP^&?n~NswaueG= zxpSsdl|a=X)fgwE;9>(MG%2(uJtmljCc!q;Wwr6(k5Yrp4FArTJuARsjI)ktLaW#hj(Zg z8=Q9?5!$B(X+XtEj_U%y7{GCW=&h%e(lCh-Nm|U==JAgHo72wWNO?tJ?7e107Wu6i z5LeZG|4sB?o8tJsA}Ns(N<>96A}Ns(Oo)nPL{lOnl%gq@eQ#Ua>%Rr@&TWI5s+O-$ ze}T>u)7#(Wrfk~Bwdx-chi&YT?eaTGH{Zw3^&8XGWcFplSuu5^k_ss4BEPD^SWt-s zSje!2P=PZDMjMUH{CfazQUzLrXcT`HxRR&zo`9-I|7Y1<{r_{np91J#*A@IsizW7q zT2)u>^XR5BHDnpQ^4ANg9-f&`qGkJ~QwkQHL!{|62c5&kOuAIeEUL z9oZlSPp&pgcDj;bR&E$I zjDk(t+8F%Jn+1$7%}2ezx(=2vNNkJ6@opEqBO!|(HGXWXrlGb~fYp;iv45GC%M+32 z?{gdxw?&oaWMNaUmNn~huSG3p_hQkR%^oBdPBcjw*sYr`rpnjgP53i>h35;_ep_5@ z291!&J^hhTpCsWO&ERPVXUTRUvs1L>tw zL=Eob?~!)xfP=#gOjdSprH-H>U0OzOCYv`iylmqc*~iX8mygSJhT2M>`kPWhSc3u? zm<9wdm=r{~hPoV#2c--dA!Zs-rEuo5dZJyf%`wza?runzjdV*bErZ7BABU5Y3mX2r ztdrd4wwzYXx+|()ipNlM?T0?$zw_<1wL833`=aahQEFG?`?uP!JMqu1GM&%eVXbIj*?GYR9C?Ki%|806fV_yXn*X#yLsOs)3IhCmyka>!c4Vx2^q{^S@AElw}I`O;tvU&G9JlGn9#v9(hcou(-Yvlc8 z2#h6RXXi(^?yY>+A58{I?Eu%1``pr4Tv}w0&*FZJ&^yXdyiLb-2?`Qhs1S9`#xWZx~tqc>@?Z!XflMZrIHUr zL8;_>8f-NrersNR)2b##-s_=3nStLkF(F|$PeVR~-}Hy2^R|4>EBG0oFkFK~MW5`xik%g?_a>Y^tp3#L z_zlneRzr9LLCno3HW*=uXgYae)i=j@YQ>8dA}m=ett*xL{dV3}*I2P)#91tOqkB!` z)$6U|#TG1Bvocu6mz{40pvY(`p@JIzQ~Ca1;6H}LZMG-$n_uTIf&@S7zC8Hk<*2ab zR@$o6TJ`X&f5x#S#*s<1vqBtZN~W^%zve2|Wu-3WW}q~P-j%!Nu?7trwi(b4nW%)4 zq0l-c&k$mVG2!4`*Ap%#@_#WopFvB;SlskFyKb>(Q?(PY?Zp{|IuJ1`VIX6r(fqtG z>Q28Xg%F`UVdO#+VX#NHpGUzxccm!6Ab@6Cpr}Bo!Z7jaAJ3dVhSdl3H5wksZT0T{ zY-3btte;vIF1`O{6?WaPySz8 zj-nrYPWRnX@;&cwem~=?w|^HHquX&e+2s%44*2ht7`>|RpCpL_Q5bpM6T3NxA5$2z zA8urK#Bn}&&l;h(g%JD?aPqmnrx$p}uZTz&3b@+vyU1Mg)NMZ(1uRFjZnRdWG`HhX zj=6ttPmV5fmX~0}jEdPeo%%KEHaNqEz)V70#(b`K2(}3N*5mDf8qr^vfdqNI$n5!nsn|Rk5x)IA!P5Sy1F$CZn?4RP?VG#$=_8WR zBi*|`_CI4Z{P|uwCbdziyXozJXXjkQc&?W+g_(v+(*=yldJbE}RR-?tevMrLqP zkA-ucKNeeJ;AFSYR*o}Ws)t+R`MB#M#D&Ye^|S|it~iX>8gN05=G7_Zmn#m_!tCiq z_gwU|yq@*M;Ef^3}jcMKCn;thY6}>*+TdGZqvMW`@ z#9ps=8@%8RbBRwnjyR4r#|+zC!3OrYj>E0;v#n28#Q79;zI*ZaK>2of1@mWhGh(}1 z;YJ`5hrU$!lR@ef#Glh3uUl&JKR0q1`FL$6F^=hf?Z{$eR)QP>@I;kG^M1Tbe4 zfLVU*b)|vM7tVYA<`I4DSI*J>_OjsZ5W(3B9%&NN8i==2eyX7@a_lN6iUr5I5;443 zIed)oW$W*#M?6%Q9qkuWd7c3}xi*j9%2leo+MfjL#vkt2A2JnCiZ@A;(U*GSgyg)Y z2!sgvJr8o&!16?lp9N1^uNEuxs~HWdK~<&(3fGq!o`0pKm@m)U!D-3YT}JIrc;`M8 zd|C^H1Clm9JF5au%OJ~554Ro%X=~EDngKy71#U1A3o=oml8_J#PPMN^H5A4}jN*|z z%2)Jh;2I=+uHEa~mmg7qlF*5%nW<5;8~zbVfDu{on6j_~Q$D27<`=0i%uG>Qri{&F zk~Xq7U{H+}gZynN{y7c*@fC=#-KaeWkm8aoOCkxM`b)BHr9YAskzX%7j*vt`9F>Un z%R}=)`jmcA-8Bk7PhPRPN6pY58=Q4T?j7$;6SU&=MEIvNwy=KVNxHZ=tNI)8`1tX{ zQZ5NvFCvr#2?>s`#+4uZVRP8k&6Gczzk3*>Pz?#O6gDnQZ;JD7J{7s|Y{?5KZlF|p zs*HVy2KH@dzA+{@Pkr3({g-Sck+H(2QSV+=Z5{Sk{;5eqkT4L_o_C1G9yR9+v^N`# zY;Dr83oth=;lX*3AJuCMWu>Vd_DljSYM?PMTDn2cuGTmr%gyJ0_X-i7S-Tks=LSfHG*R>zII^@Z>f>(Nvi$Ij17?TxSUlVi% zvvkpg>mKu}`WO+jZ6r|j4SaXJQSK1zvMNA+S7-!teieb8MW@{`b^sU0JiU7&nBLdg z*6CsNjN1F+xB4_H+$Y4e`e{*3C&qXa-1y!73fC<-3R`7qypYTgdC`l1#C^(xfLec^ z7isymk-Piifg2x8PAZ#P6<<7Bme6<=Xk4O_VKUSsXFq-{py`HzpB~|f!F(bu`796? zA?8i<7)eY0E_(Noqp&6aZUQ0&o(lk^AOFxOtI-a68Fao(to1;D3L2u&jp@Zxw9HbJ z$iGQb5H;dt{35O&r?0~z9sHa#`?B`L2uy8LBqf$tw3`dqUqQw-nW2o$utrhKv0TjvHOwVwEjYq)dg^;H; zpHR`l9PtaVQ34*DU!Rl0Q%RrL5U0W0oxw#LBo+L+_4KRhxO?p<%ij20I0VFhmQPAb zmi_4#{~5gJ+xX|7vGt$izkzz}{qAsN_fFK)({tBze0OqfFk~?H6bb)kmEiiC|8}qs z8mrzuiS$V7dS7pH&|thmclpp*(AIFlvwP?n=^`{i`bv2Yk~5xI`*!0?b*H-V{Y|fn zIfkS7ug&)^M2cu@*Tcy7(Yi#Mz%k>yIG|7&ds9O|jb zE$sLX{iQx3BVB4x9fNG>w_fO^bE#(x`rku{81P8S(uA^tX&#k4E$G3<`wNstxO+4x z&o3839MwY^^~e|s<=3#JS!~S#yOgDIhx)}Mm1|4$nPe)Z9O+*OqzWdmTipf?0!fQVC{%k>qUyF#An8wwjG&iQkn3U4hgtmx4LxxBv zJ3(1`VM^O&>6X^F$05l7DZ)FN(LVNQwR*XLJm_m>j?Xs6@Ptz^fPGu7T+gd z`4;a%a#yr>9s?#3|H5dZxzqm9X303QJ9AR)3Q1o>@Z*;hwt<|P;DTyU0 ziGRx9vEkl-67PLe3QDFn{Ua?J6w|eNp{Ay$&hfbs)Kr%y{Dh>X-bJww(-}W507~8t5^Vkl41&YY6@%q-)$(IcQYHyZy=sAsk?6YpxAjEdKEfm`yP5t zABVjX=42ae8us|!D&gqCrY<~fc8KSeHRcpnFY59i5l__)ObNoxjfy{`vDO)={*nVQ z!R}~VfD056o0HSIbj-(^{)??{)>)-l*_4!&@^$#U1<}D&-IcfOR-c1A1Zk6oQN{rH zUx6}%DexYhl8d&B3C)Hlnl|QUtuvdx&)dYA&>T^zOB}}bCj;?em`h*#C}xBIOc%F5 z+%~vA){z9tIDk0K_2Lpp6*3V|c@fBqS$}?Ij&GX@LU`jXa>i~BoVAW8kg-Z+lp_F4 z;0mUYmX^~-=9iY!=a+>t4`3TbGY?~%AhCpE4F6O>pSz zr3jJ#5pb-M3sGTF0pejRgW@B0`}g0&Fp_PNBkD{4v?1nrRO(HellL?T2%^Yyh_4-4 zy9uKHlBaL}7FXj<)(aIH?(VKEN*qCQLkk-fpLPHp9UWz55jAU5L@kLTf&*uqY36`4 zYUen>VJ51^*sDzSj!-cv=5qr~l%T7h(C~Yz3sr%4lS%^WYirMZ62E;jV*E2&Ix*W& zWhN15-`TyG%?fm@>_9M?gY2I&$+gGtm3}}(t|-QD&8AkwC*nScNswHnfj(?$*AYFd zfy9tbp zt6AK(e~i*VyVVC>HNx6hiDt=A2~CNQ%`QrVGx|4|4hreebXA#PRyHl=EbB;L$Z&Lm zIS~c?_qpxJ*xxPIk1WBg^ZP|%Ra$0^YNc!ryK-rX>XGca35zxSrpYFV07OT*pG@I6 zfS4W+9JvtcH3c0Sq7o?$-n;QiPc-vP6)pzIlVB)`I0m3b`1mhhRD8kA%EkZ!ZOA>p zA`m~&z7xZE213UX=Sz9?4efzalbbVa)uf7x#~Rg&JLw_wwG;~_{`|#5hs{GL3DyG% zz$`k?iW(lzRDY=ZH$>S-LcI~l~VIJ}1U5REUWoR2z0 zm=cXgBLE^Sp5K-Bvu`y54XV^Iv${Q~N8wBgF|hZdc{N4`I~b~NXyAhd>Xss6Q!-gg zlDjc}g<7(|%gdnwarwaF?ob%+V7P7PG&v4Z>KMuOI-MTz*?$xqtQdN#ry6@x5+OiO*2X(`MSwwZ}sD9^= zKoO1?90w%Wd~2~#e7L{gaMh$HxS zlA;t;S7Vn|6DWk9`pr&1u(r-Sc=EbNjJj`^U0Lm%kSSFJeoY(oXpi{{0Q>+{My1EJ zXJ2qsE?V!LJCTP^hhsn}BGygBPjAihCo;g6!WltvvubmaZbt#g$=leptGY1uzz?-o z2~XOS;|)DgaeGH*525G&s;gE;lz&6WgnJtimav)rE^mxDwNt3P5v-kHQ2()5-evGu zPb)2Z2wq>e_?j)T--!lBB!@^5`fU&Cw4Dyg*&B~Yz@+h(?C*gxxdKk-!({GCluUd_ z`LZQyYzGBQEOr`Vr6c#7~wV ziGJJMx!wIfOwah z8vO)UqJg<7V=-Pyxz?&+W|jpEW89$c^kUly!DbrS)=sd6os$aRO!-XC=AndrFxk(O zS&%Ih^td~-rFZ7myw8h`zy?TQIzoWcok%`DHn!^Y`Q*7S5Gv`f_tBH$GbOU40kr6* z>74ctMy^xPNM7iXH*?>3vnwv?*YQ&eQ1}!TX-Hb~MIOZBPnUQy3~e&3CctKRIU9#0 zPpG=Ns<^o9QWJASM`P7y8M|2X!OBh;MC=Nc%C0Gh6ov^j0>Zye*LdU%}Quu{` ze6*8dmK~cr=o_G02A)eJgm?1_EQR?#3^}hUj;vz|b-yzdQNdk9zMJfRV>13pD>_mH z_Qyz^@r!vWI=!f2!BRpGp*fg$ih@_P97+E*s7G2xokeKIaN7k+j+?!2)5S+moL~mV zTbL03zJ$WA+K3m1k3&C}PJfde_4T?-^H@owiHMG7q5gSczPZ*o#7E2hiE2+aj+!4a1 zH#RRA?N}TCvc}6qASy3YBfuMJC-)ivNP4rPPw9te1hhd;^GD?slbBx|T6S#Q_|>~q zzug`a%}sR+O!bM768H0^3A|3B1E23eAzHkbKo@rF>n|*lx%YS*&07xKztr|TcZ|(8 zX~f8rV&mBM1unS2fJsMJDB&2AVu6}Dww%peln0CK(q%S$ zuhpv^(lB=pF#ol=%+?%0P2-mcIMSk z4R^BrwX3yj2kAVJTy6M#2v7!O<>HMBVz~>~SvzNAb1Ww`ZtCg6tRq8f#cy$zwn(66 zFUCl@C%ACnp=72s=)A#wmI|2pgXtp36vHZ!fNGWXP9IsuIh=4PQW$_z#-6N9Od_W( zdme~ySef&*KhQd>J1QGOJVI+(9DId4%GQC5i=a|H8jM3rpLGIz>pZ1y)ck7g)QuH$ z=p@~59_98a?&(}0;+Yo!II*7pzzM10Y0Y+U^>O0x+LGs-9_pyagJt6<^@6u)vBsaq zL6hh6=v0G|NHVS@!{HNCL|=~X5NhQr12kMC&)_ToK%-Mok(x=abq24EEDoHQRE;QH zD$vbiROT?Jy)`o%EWXB_=P#X!%gS26u%=mPLV5{7o(BYD(*_h zOvX3Zt3v~~bCX?^B0C$!l&qo>W)6`8??rw`!%kMUC1Rx%GK|Q6>ZMFAN-FP1MmQ_w zT<`e_GWd80A1fu7z8z?jdr9N){wqVK3@v75<{-CZr_4xH%C{y{G!G#+AXO-{8^mZK z7{nBz>=$F7MHgdWVCtx9fwG4~_!+Y^tKEzhYxXB2!f7fU;kx$i#USva#6R8S`+g)F zmuCwd>)Xk%2SGvu?Zq=Mt>PDE6G`@*)c|7~rQ{ZISoU&`bkr*5QJ^L5gog~A*}-7l z*quGrOV*Vpi*NB__0yP>cZSf#|h6Z6SRI=wk)sn4sV=TilEsgv3QnD2Z9k? z+D<@g3>zl8X4Kh(+vN=U7hK$AH?#fFUDJU?Ch`_qhpA%dl11X~*suE|Cz;*le`lFZ zxEVJp^qD42&2DuabgSEm3PR0r7Y{j$*oy^}uNiC@-f-~}zVbh1oLQIAC6KLvde2ji z$>MFZwz~j*XkPnY3ag9it365qE(`zxAz z|B9c=d4J2?g7-H6b!^l9GS&TZ=1bAUprj)P@%{6kOHD}~@BZ$LuhXW@yWM#S|B`3D z+4$d$kDeD}N}SSZ`+3_yK2}MOaaYh%?Pi)Z)e@2gA#}2cA84&VEcS{aro&4ihgTrd zy_I*?Prx5aV2bMka))RS89c4JQi6P=s-=KG8HST6Ii_DHaL;yF35aO1!&DFnT;8@Bf2O~OyKKlm_%z(T?>ML3CQK$)g_bZDJrOI<*>|*0@r*@%F zuv}4SKN3Ua?vJIybU2)Z@iI0BK!+KzT}(*(2q*smSJLungQ=Bt#|FRtd3T)T{2G$I zN03F0jP%IL%JiNB3P5Q?rTTS4-fA4=MGg+@059Uz+BJAqS$BRAx4+LSy>7z?HRLwT zqa38)Y9}=sx6>`NZ6KP6m*AO6Z~co!%dT;u>}!|n z!UA?=`h_lTUuLJprP0=si3>X)%Ftfyx-R;dYg*F0@TPx*D~KtouU*&i75B!M4T)%c zW*d15p2~GqK^HT8?ZI;bdcQ`xdsLVWKu1N!O+h?0=Tw(#y}`ty|}r0~@Z0ue(>iAUqr zADzPdM+09&LtHThdkDlqsISA4pWD|Hd$#DZdwVNoCz3RNW)Vd3FDDufuxJ;5z7Q1b z*xUVVX7ktP@P0BEYN|t=Hi#X5Oq8;IcxYRdGV|l!vV#J?aJefoL%8GRqe#@jPIFfNKBA~^AX6MrFwKmW?eqD zf}n5eyK^h#Kx;(bW7DqgJC2gkwIP}mngOk}LdK)fiH#Br``bM1VS2aO=b|yRUjr)d zOFXc~ys1WvGx0Blm_c-35|y9&n2q(M>pH#t^J$sjsSr_J#Ebe7Sm%{wjhB0Of z?33w_J#e=M@z{Ajf;8RGiw`KnU!Sc6(>oj6Xo-NzH%H9#gcqcQ{h}1>T9+MT9@%zX(+}@p_(F6ew=Y zt1x$d1?hV=Cxj%t7dh18rb!Vg_kgte+%ZY@b;s1$cJf5=5SsKA^rKC^*ExWmLJp+| zHWPJqnOA`=-v||{9UlNCoh$HFF(=aHB!ViVuxf(_J3O`oYM4PBcpC#iJ#Ms8puTfUg=gDBcRgu{_WFewnTluod}@_y zrp^jLi?b?yAlodWNEC?@Q=KPM@bkRq&O2h_%4d*^8YZ3)$caFI&r&2QAj*AyK~8~% zQ2#U6V~jThZF$va%{IKCg^;J~;A(N-Hb!??Xqc$E$R;g0>fU|mT410ld>bo~E`)Fa zOIlOA??MA*o`SWZRP9z_$1u$fOBp6)3+xoJn$z!Hiii=5lvl3-n=n$kOk z9woiKXXszmW7Or%B%0%95zy8@GGzSQaxq(RG?2=juess(m5vcn%>zIy1U+E#IXFsN_=M=%h~A|!;;{Fo>fp~*K_jO zk;^j}mEf05SLfXU>G>P>OUK>O>*Vva&Ft0ZA!0%DX0F^0(Wl^S5D09#KQz+s$nRA3 zIFWVc%1*JV?wGV|{WK%#Hm1ZwpSNlQx$$MfhVveWxn%Fn>mYX9U6I zY&|LX;iDpS$eB)Mj1mUO8UKM#Yt+6ydLiMe&stIC!J-nzdZ_~vsKS{l+TnK{KbJ^$X|n};HdX#cL+)0>vJB`t1P27#PC*iR*F>c%E!ysA|o()f;yB% zER>mTEpc%|IopaU=a(m5noGL9GiP5mt47a7xJ7|$HD&_F8{fS|(yV(SQJv~axCS(r z%gWTf_GVWJaT5>DWZ{+R-4K*q)o9bsSV{>ML-tg;k8%=|ia=v5qQ^HuDwW4`;Vnpf zPt7yr9c+O{bG)R{i34W`{QLMoDrO40|+X1W&aajB8rh&FJ}3%E4q-cr)D`yjFMKK;|CsqWPw@_hB9 zFC3Ig?2C;d&$DFV3pz2I^M?;aj%p1>cng;m$q>pjJ~ zgHVV6?PR}9HcARtXHb%&c%H4YT2(?oaEzc%^CJLdwfd zl;Srr-B*|3-A8z+;&4NplaH~Q)D$n|FLM~!X_{Q-zVl{9Rt8@vbhdWce9z1_(-Sw@ z3QKW@8AR->q7ce58PEh}Xdy%8)Wq+aqw zXru+GCHG?Cu^J@aKaaat0A#y+f;mE_hDLIj2VEJDw4CWN4D5cx#B5UI^L!K3P;7+s z)$w`##BDVLBxckw{{0*-ML9Hwu*8UwF6#;w99K-Qc`N={S>-_Piw*uk(ooG|=e?!O zNYj{g>Ba;_;K+BL(z|cJZbsrz{o(O#%DB&=V`P_^SDUOFoAMT|4{cbP-1&J`f(bn_DXFvKUETl%hdbv!A{H$Q?+?PaEJ&leL7y ziGQu3=i=0j3TF$_bKPtiabnXI-+X8aIa@8RkT|+_UAy7ih`k55yUt`Tg2=QNxfD?kPn~xV6*lq{J)lOpv?s$8EeE6K_YWSUMUKQSI2Fo?a*3`Yf zEx)l^pf9qgbe25J*`r#qI~H!zk%!%0DR?-heBD)4`al8(5{wPiJh7!`KlqPD%f3qb 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

    Ej69}vei=64+rY(qz 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

    -$Py+@ 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

    2Njv{aj3FrQTF^-aC0lJ3wpC>*|7_ zhi?1Cn`0$rV#v#EF@r7c(oxLGDn*52P_iQhB`T@9FK;lxbV6?+#$27-M!7NKju<`2S9)pyP>SRK)m|dANa99$s z5a8L@K{`%ON23EYl5oW8w>eXBwqjU{jg!~lWwK1e%c}KsEZ~kXp#JM}2+UqCC;go9 zK7{&H6GO!@{}S3;Ex0$@hDWeR#xv8qj_%rMXLj`xEtfV;-5GiFd*rQ|{fb1IR;5su zNns@@f13fNl0{IJWJ<9>w*EZ|b&#hIR0m7VbN2O)kI5)q0!wZ)pZoUy@d9UcoTLvP+y(66b+1go1`C@SxPcOCK(KO_x56~!G7GalB_PDG&&CCshayqjg@be}Q zM`#L6Fp{h3Q6VHfYf1fHwBsQ@EYVWRHr9EXm&N^OKLOG<+fd+W#rOw1>)j#5eTxGX z<(R3M=@bO|9~}X+%0D>i6W0N^HT89q1e7+x>pIKPh8Y|a-)t7{I80T(Wf3Dn>#khT zMs%=0)I8r!WSxa2TA!1w3_XX&^JZsK8;K$w?!ySse`}kpH&MN%cwMq;*}47L+2H$+ z{PyNc?CC-6@$7g*V~C1)*ucR2iWs`qnU+)4|di&4HE1SU=tG77;-xFwC(KJ z(dcVm9t={-`0~;av`Elu>V3pL4__b6Z7o_-)up!EZMOd*@Bljl=O^llFpx7LD+Fwe zkyjxFVgV$XfF@#6Is(0~T$j;Pj1b0QiCAP=I4(kIohaQayNKP~i>}6Wh`;y8@ZIo# z2d5ML@)@~`2JnA`ApKGa)#USLm)W9%MjRozNq|u61Mqy9c*Z|Ko{hO1#1g?g;H1nj z?)GifH=cER)D`;nO)iPqbl4*)SB4`6vR}i5=0}Fl;=Pr+-Pz946Y!sd_+j}C?>Wh> zLM74GBXBVx!lpDZZh3iW2gs)*a*Ven-YFTGDl)U zWQQDNb}7!E^0BH&@LWqrYZyklXWi;h`Vbw0M`iMD;z0PTMB+#ENXet;Kk`{F2_!xK zfBbFcj|X7;??Q$lqga~G_MIXUOOl?me=qC<_>Ur??fgmxKD(XW#*x6{ISy5_PByWV z6GyFl5lTEIN$KFUU>}2pAfS7F>q*&i(rB0vz3F2!laVXY=ehkI?n%-39?7S1_q=Af3DAt z&8~S-2tDFNP30m?H}*7G&bYRt>&K6>C#A)G)jxixWPeIMUwo8*C4o7|(L>aWD5>`g z*YCvlk?97A;JZNQ?o{N>C~0Ce36f+4j;;Jp6R5_r%2uA5z|sX4W@DKXd+BDHfMzy^ zObJpUVMJuM$!vu#Y}Bn~Evi;9nLLBu)CWnyK6afPe|}Hs?#=o0N#=7Sw^6)(^I>=p z^NJD)&Qv|bbCpi-oLX=F160AR=_k`=|#1l6{}Adn-n;Z~X$wL~xw$|7Vi+KLjFBt{vr7@#o7bYfRpkhT>AjS*hydh5>) zBgCg-L!jp-iOL?sg^*%BHVYQjEMd^LN-Dab+h|Q}2NbHKB{pIv*e$B zt&-aLw(*%IM%EO%2ES|JOFz|F7_3Xec=> z8754f4CM_%9Ia6*zsNozCXK(cgM2T#H$_!PxbMQGI%UVLGSFiJS!$CdSDU zGi4~*Op&M&L74tF9Yq?99zE57DgPiS^=9+I6hzWY6DSxZ)F6RmhnWnCHcvmQ3;R72 zJiN80q|eRQqWhVc&bpb~f?}qIFsh+y7AnQ1QCeFoOxBr-QkyF7t#%}+JHB(qZL`d= zK7vh;jHNe2oC&tdeejB69(_5UQl$XfT<|}Q*ip9L+OkzDhD$1z#cN231R)V7Qj}s= z2msU9+lTQ($z8-$;ziIeP(Qx|^!_6Qr&gTj7YW zH|3Ax1A627__u)25m}X%t~8-X666#^4$smYblqx?fJmGAAIPrX zErP)R9I12tLVE=Nwim)xGKd0^$tghocyn?;9g!{c_*~LW-s4^Iq;#R}sLKS=t5!5o zMU6#8M#@#O5fdoXQX3HnV^M6Grc!{4*{NAgqfu)mi$>9tB5k6ql$t9A7~ize72#?~yFX$F$fiyI}A84?Plnp!q2Xe8LuYZ}qEijt_d zj3O-vQV}!-ArL1c^gS%W{3YM$X8kzC)-PIUVLdYak=jpzZA)Yw^-C?VqNMTvFUQr- zGsPzl_tZxEMCLF&p#@kzL-OMS!wncTEfl!6V?^rTF;{s-+D)P`4=JW~r&k(-k=IY7 zgpxv^zQP^)MX>M+tRXQ3hi^2)l)F(7aD(@UtAzyLIDC<4^y8{3e%C{sgTBUei!TbR zuI-xF!>Zq0F=87mrUHVICN_eYP%8(-{%iJ;>SnI@bJ<} z;_Q=%XnwcuzjU9!6C_cVNx{UQxipY%)j^B9B)I~hGcI_Gq;n$PlJ zz$AJVmuUYJIr!cOxbh(MBE4iF*O2&p{Cbd+Wd!*Y^`VHy5NQ`!r~W^3B;3`KNgOg` zL`f0ZWQK$OdCc=Ev6!hXDMbDUr+E>@NL57PQdDL{`&xjfiSwF6^5b2-5R`x+M2bW2 zChi;c;aebR#Kkfe*o;5vRb62U&oHh^-UE&kQRa#1 zSt(9VQ8E*oE9Kc;+CzA6oyTR1R*4@V^UD-{S1V%^OyTk#Kk)M%X!Sz%e%ufKf(hF0 zJ}Py1FF!MWY)MRc{`@3I?*9(@K?bEeHTas*&oVZ{*`)iV0*B)n6=9GFB?ZPsDNw*9 z^hW^%2d!Kf0MDnQ z5;jg8=MjlS7Sh{mZ8#VmhZds~7h;jLqPr#vh7@ACDlB1as+nyRQdMZ8TP&vj-W)Mi zqs_6ll(AT}Q(HBwLhG9B!9@iEr5#%!I+(4hVZR9^@LTO0Bu3j+?YAqGn^}c1)Aeq_ zEX6vv55z+;-dxxlPVWhxi3x0u6*jWxR%vJOXI;J_*aP-LPH7&5dmeUHp@g*-_tTO6 zVCD~D9lKwoXO5Y3=toYnbu$*QsG)?f`^;ExPIqQ+ z1I1gk;K?8kq!q!OVi)W@;CiH>DQM9dBzw05U@?B{xs;u$# z=jLk@v5&8;&v)R$KGoZ1G9T~OqkH?4as3eVd*8H`951&f2Bec9Omsme2x0sah~_@? zFkM72KpVo$A+&~#O5rA!4XQf!VLR$46getuGAij=P~m1s9?~8q-VP*MQ)o&Z;XJaL zAZ;s?yl-L43}2X)9qd9#kSH=SCWR&tc9;7hdcs#kpk+$TD#b7_wg5ou=YsQqJ3*-k zZ_8~GPjAYd&+O?pWipklHB(*L4t7p?n7u5@wk?@{0n{wFMOuyTq;3pFDY}GWu0j!4`xNB0{tfp{-<1 z11r09rWKiMW+uC?v0v@ZA_A3D?!usAfdG=8SR^F-6;(;B-0Rxh=PoY zB6F!qGCop?v2;Bu*`J4h;bbo4K()iyfFCj7r5mVSz_Zm3P)9MZ@ zW9+Kz5k0veo^fAl*NwPqJ9%#uE_)WcH9sQk?oElA^6z_g2=!)JG@BEd49r9|c!{}& zIAPyO@RSkff;Feo(J$twR{z1R(7LChU)cIrX$OPP9Z^B;$FV!-4y5q?9i6=N(@!Hx zcXc3`FjQg@C}J}lg&?T6&iM@z@?itId7jR4t>qAh*wP^a5)mgJijbs-5F7F=8x*G4 zj!3D=wP6;QcTC%XdiBELD&ZzEgir>x)}DUsJ^utkddbqH^FHQ6TRdqWj58)W$Jcm; zC|lZNdIZc64#4d?IyuP%g2FPOcX06uh5uW=4h|b3^II$=HZuc`;P!WVO+zT`@^7-7 zl0sMaa_hE_)r+}15x1FMTIx=%YmrV_4}06^SMpETdkKX5#QY$1O0iMhDts$T9Z!7a z$IlM$x9L3DlUaq=cXUpWA67V$cn?reQ%-pD9&ZiJVas@PVCCVbyfOED#{tB?&yVy`K=dwM1Ey>^Ds1w3!A6Bm85rgms#sGp zQWUJqryOPpfF=={CP|WHCK-Un3~d0R2_udJGEA6*1f)QQIGCX%362g4LKxyqlO)M9 zW;g~0IFl^Ph&bX*m@ET~B*`-31UShs1j5XijySj_AbH48)1eG;!N3VjVGzL+98599 zm}W_mVZ>OKF~z`_7-n2C#F-{Zl4O}COcNXf62?iAVJ6y=)@G)4OS4SVES{CxNs~Zh zi84%+B*`$~k&HM58er2T$udlu1`K4y?b<43OtUrAl}*Z-u7Xr@RKx|q-QB>M(}6bO zD=3~OJMH|P60q{Yy=laF26B6v?%uSf$gZVOFoo106s1IFjkehmg&4Amh{3o1R$)h7 zvAzaLNK|Z6dp9=>-wsG!vImqy^KtSJR}4O?(QDk-JQpO@2gku*6o^^?x{H~QzNIl&*|@D35i^!P_8nG zHuSd#M)ClU7p^aR6zf(D_dp8Y{^6r03QliaW;YE|aPso%=zZN#{n)pz62owO#v8rZ zDi2r8x{vw()IVSY7T>uAW~{9SX&ZHzZS%D`A&^K8vruIM#O(ob<)EerYs$1dB=p#4xysQXdneDfVGK1TIMA9qE-Z zq{edY`rx!uH6r(?;g?^QiKFWnI!Iag;*Xn%^VF!7zcVTOl@E;a3F!v8xkojjC025$ zu0)Y_B^*&&g@67)m?VBQMza-Zq*H2@Xq41+x;kk{aHb|lMFW{_OH9kzlH@HbLEcu+ zM|u*JHS9JBv7@z{=v%J;^vWxOqAXf-%PSsEg=0ehb@+7?+Q!m@3x;2&Rn`C67$xV* zc3Wkc*-9;oueKaKI@tf=%Mq-{%v;;P4ak{wSzl?|;K(B1kI!D&=4<(Fix!R!^nP(T zL7YCj6}vuONe<-;MmxfQ!t7QGUAMuptE-=z6laTmvpNU6faqE)K<@0Yi9EQqczPV_`mUyy5z(=4T<^oL2@0VS#!bUrl{vYkW~q&@c`YxaFWJB}P`w9S;XUv? z9n%;3BgvXOSDyuKifVd~F#BWeg&FcrEuAz1XqFO#7JM1ic}=}AQcq&0VnV1zSTsQu z(q_^~?zFHBhi*hSRT7&57;zxBI4?%?RkpTjeJ)b_?ihwhQ?HOt#L zenczT$!~ml+)S5~mAmZ0KmJu{?NK32FZa4G#p>T>-451V)$QQo`n8}2wqS(}Nl5Pj zR4x;|@fLyRusd%L+I7w{fg0bsXK!qrzrz5`u^b&a=FF4*EVK<+eUSMl+}L}hDF}Q) zOd{K43Ogm|nOvtTu25PBg#2SYBqnaO?q;Af&9sRph+Re!aYebYgwAp21my~5O{$0qUn1pVL}Z|Gaj ze&UFul1UTClm|t>BHIcEGv16sRvxLiXevX=?{+Z`q880PdA$$7Tba)90PncEP2!^T zIiv0ENfJ&}6Pe7f5gYTpLxa{{EN<1A6W4p%pQy*GzfNV7UG$u=H^hJi_N8XuM84cU zC_VGD{7%a#$N=S)9HN@qIt{umdA4T=P+(qc4L$aM4{QxtlBE=(vX%k?9A=c!l)lhC##~DV0RU9dHHUo7 zpx!gxpBJviqP9uw6(&L2ka{dynJ)~c#-QBoal zKj#)628TUrDVnq(_%ks2pCm&PF7&KQ=C~-WuG|^}aBu{TvJmZG8hwrZ%nG}oiEUOS z=^Simui6%$f>%TZ*hNmw97}Ljit%7xs^Pem$Kee24S)Rh`rO@NO&*K<8NPK1PGN^K z_p0_1n}Y0us&?V6-a2e2BQC*$$2#gO-=@A#XM9$#?>L9t&69Q9H}qe0hGK9Q#Q@mg zH%3BwBHAP^YTUFsJSbFNSxG!K-4-8O)LSs2Hd+*|+&Hipy1Fz7Z^2w>ktE3!&*b$M zq!<9%&rG=eiHH&{dwc1V^K7$HNl*AmEomZ3D%bxPMFFQ#OZXjEHhARGXM6B|9_kr7HoOKDc2O!ATqW1g7B zJR{}7b@z)^dQKalEgQq28A$$vBK@Ir1*bQErjgmwHdRX`8wd_#CwXxrY=8>82h!~a6p6By1#u$Bpakk6HskC2kG?b>!eCwWGUW7RLP;gf& ziY#7gY_hSec<*pXRlV^?`2*ik168}_zN%11`U^J2Pj=qB&4XKYS7JrwG>Rqm&m`SA z+fA&J({dJ(;=^4Qas6QVN#yAIwT(%pG0eb)N)K^t)}9DlX@^>gBC%wqQ#XlURVI2e zY&T9FZv+{h`D-XNSN&p<6ntdVgYvZ5>imGkm5NF;JgLa2&(sv0g@~ylpvBcev*vPI za%_3g^t1$QUSpA8uQd;*nkg7B>2I;%F>5D{e0YkMOW<2Dcrkl%Oex~%hb>2MKreeZF48ff@F(iC}tSUJV5fi?eqBk2uf&uzhv!cKM1|rt4BdPPqqO*!(XqK zqDPPEcFpbXY{{5wv#nov#<>n%Y;@L0ME1Gt_?8Q=Cg1*T8TZTcM=PpFVTLZ7pkRM< z{VK(n!uGomuqIaugMDm-DuHz;gg(}dzQDE}j?8Vy4eQ04q(}z~frFPMWG_r0wf`=x zZ+>@7J#$(aa0>mAd+|W=M7?}S(dm3oy)*9YV~t~3cCQ|Ldw0v?yyR}d2#@O6hsmbY zC!8*S$>EJgo|sq{O#AM>E@O{SQYavlc=Ot+nje*0_ePornwgSMF5IK2$~L{C4NwC_?nEGBTC0%(wHDI>%lZa5Ngj*}}h z5|cU@tF}qI8{fA6Fou`Ei^ERDM)RSYGVLP$63Hke`0^2Vj?zo2$}M>9P2dm4DNg`D zX&Z+b7EuTRr)r@>RJk&Gp$L@iLvOYjGNnpXK{1LeHQqSc957QY>j3tFk%-rDgO2S! z8kgv-WHEGxCMKb%ldP82vh#ISCDkbOUbp$uk0laaJZ5atTXnD8_ePs zOk|r~tZ1+QnLm4C;<&aXYtwVT{}UsoF>gM%QBWfVZdbgmLh7$ETKaZ8wC@NijS>0n0D~?~Or$`3Y;>R&)VJ znY~Lo&%g*7Gr|Y9p9~c^tn&xxPUPlA7b5!EtWOl{dq|__W(mi=Osg7*Qj7I7tdl$- zUX<%&3tHtE^jnpeYN?4~h2s)-;MZW`2BKJ7cKMF`P7s|L1>HxxH-U1!q(W#Y)6b)m zy(KTHLg#vU%7loQ#Ax+M#7SZBsgQE9J!dU{PFR-#XCauA#WT0+>aju`^*F)_+SSckFS(VTWiM6a?7a1bW}a90 zxZ$2jFRu?ao@<{iwrzo2;#u#AvWOImrKkMykNz#y-?N$9RamPP4jPDw($b6a|E`Cn zVVUI}%~Sr!N8(#dUPj0?=v$Jv4JLVymTgi0E3xnn0%aQ$*_1?LVQfRVi~#P8ZA_c_ z^^Ogd^j~7M;3;Dp{|SWm4BRpAm*39_mvzKQtZf_rlQY`F^8NVVCH_a$*0w1O+}i|s zFQ(lmi`*$J-GXBJS#d9Y=|KD8+p3S&u)F?dt`k~uQ z@)qFVc<}eCPd_Ieo>y*&VCHyf!&>{4^`wDUQ2JgmSRf)5kN-S3zz-2qu-kplGYzxW z^)b4`lf^FznX;kt$_fnJ`x+}~=2%GMY2vRt&GG8HjFS-Wd*?go^Ci|Q5;uF5p7Vpp z*YDNo=3+`!m@^F{(91Wt*<>$r!)nxpc#@>?vOiU2D0PZ8ba8#DAM*^>ui`Kf3A2G~a90MyzIW#{5M@k=Lt!}Uk7y0FM<}-%A+4w6 z*UPFkQoWtCjL3g0rHIVV@NqVM2Z_dheXRi4^@&iF_C(wz1Rp-rTkn;uw#SwV#6wwMsz)Ugh?y^G7&$T;27BnDG-+m7u|v27C#JL^yKs7bxUyn0 zshqWr1<-0*%nvxhDJXftxcn1*bljG%->{i;{pJ%TP!asc@oF%T4hl!nVt{`FgCXEg zpns&_b~Io4FB{mGAwwIc0xb=0YdNE!y1b>UE~l)(NH83B&TSSn9{RrW$VYJ2S>RG7 zJLH~tLp-?)iH$rDUVCbl=f}dPU{1hjyY_oy1X&1 zFCU{(+>`a96|q9mD*8B`3=xA}>gp}zVD;=@c&8r0VTD58twPt7BOxGGoQbvoa~ncS zHtDRkBl}xrtB2lW{s=It8H#HWfkP={`dn0>)Bh7$n+i;;kRARgG)Vv`5i(Ep3%||@ zi<_yqtaO}c2A4n2$^22Z*FS#E9&q0pAY=hy|K@ih7^Uwql*L;)(24V(K2-6g&)+_s z{?kWY6AQQ$ryaIQYf;U#x1PkdFF6%lG5zDK0LjvNGUnwm?3oh9tf>T{D)CDeyI({y zsmPbVJDrI-(g0quz=MO~GYwjZX-tse*hapMX5*KuEpHx`a7!b11)nO4MaS6y4a~aZ zqOLE9wgM+C8DeL=f8VrO_R$Ev|LRxHzVLDl`Y5i+-d&UTnIYl>R~U;w>)H(`fu)zs z{u$HGM0{b75j2ID2B%ITatg|fAI%H+R}5lQ@H$zpuY|JD3j4P^$JGE#Ob*$NzmR4C zFuu+h)d1gqb?XuB`)DO~%RanzfzEU#-Kx;`md7dL3HnEc&|J0)$OI&g95th(ZR-nC z>ohec0wEp77GEMsKjjM7M4q6pgqe?e*Jjk&O+V%?ZfBf;yjvXiEwBaC>zJwefa&0R zLZdI22}SO3GB7tV*(N%7FfnWt6E&Jz==(&#*+&MD54@tkY-T3+3!N0m}z0t7l zsz|Q!38=Pjk1Yt6z0GpK4z$&2MqxoS$;qV!4nb5COcCjbO=JV7)DC{BwpFYZ&4xp{ z*n@^&&*~KdWr}sTWj4p33LpHrve`+w`M8Yg^~0W)lfFE+K;j7^2%7KBJUf-h&94>UTJ?> z>|KYwtF`>tchwXIp6FX5T=#%_m>{K+e~2LGH{fR|i(IeG+5z&Q<0fTobKCw`ZYKF* zY*p0R_tMU9jlBp>US<@IQxNOmyy1=n%Xq$s1XRY=E^auJi zm%-jt*tvDMXe#J)JD)Mx&GeB6+dH|Qc@eD|OsLHks^x4hYp)poax_shzRE@hw|Z~_ z+~fY9Hijj9uZ8&Og-PHli(p}4VTxm6Vbd3Cl8~Et-@L}YQze5Gg--cmWkmfs{>(;n zUT@tDwa8+>P?5#RyOYydb{IXpF^RRZipNu-=!#nC3MdP~aWsACpKRao@j&wxGF%yE zHGjrQi9o~xDUE_v5m7M~PeLU7&TH=7My$IY^xb2!wtXKVRe_7y_)$J=7)Q+5p6gGO zG4an}_sQm!OeZ%eL}K+uRC&)DwH0!ItHC=e<5_})^454B92p(v=nOcj)X%Q@DfQjQ|r zkhBPDN;z@NwIqod0o z#Ym5(FMb2yu9&Mevq>^Ulf|M@4!@68W{vi(WFlnJBcCY}Szi^pu6x!8)MPEvEs#7` zl#QN9HQRh~bBJK&J3k^W{Q^NB&TDhC>dnzk(Ok;BI4CYITJ9=bEP$)~0Uw{f&1>qB7VjAaaoQks zZ8iXFQS3%<-Kr{Wh}{$Q{noj!H)Jf0@b0F3T1JRvIQZ6C@5GB-F6aSEiR(Vx`f6q) zJ&7ky!r?T6W-)!>g7R60r9X$9pfkO?-&AkKWH9XAC(eqbD3f)jPj?#&$CHy$z5NKH zAJl1IS;bL0Ox;f_U>aj+OsLt150dODG*Z2Oe9VqKq+XdKf`Tv*QcNpKUxbcw8jRC< zdR5xXZi*&+uNIH?Z~k#rvTZHo9lA?>5bB)NM zXU)Zv!Smn|5XCx+2Y*Me3C+%= z*7rQUrt&CVwqKV>xwk{VR4s|0C(S0@h$UT=dfQQ8O&Nxv=a#@NdvTEy{{93907R`d zj-b-l?PKFA(+%Vn1So96F5*E#>3`R+dePxoSy7{-#sB@)`C!6?Nm+k7Tw6OXO6_p6 zn2>Jm365RK?s1PexF+jwe#SIBcO{;UGnww4a*R=mcz3NgPh;%L{9s5E#ld7Gc}KGF zPxjvg$pVRDoFOqDFm@>?9iJjDzcH#A%DQBOD4At3D17f7zOOiGKeyFzoijgWX=umd zg5GDCAfb>Z`|a{KD!e#T-Irgvx=qSmS!1?n1Gg!CG7E`ux@}YVzia+Iex3T^F{`ewQgL3VP2oR(Hzph|GNJOZ za?+~e!+(cYuK&aWx@*;!^p4r?yu9f5^xBCj5MfR) zyV%?Hlpr^P2HPP^%9_IQ#FBzCdY6CkA3hntE2Ssufnxc zjnZ7uOHfj%Rz8lndyi$D|Qk zxU{Cn(R5b0)ASGlr_2UTHtJGo;*Dw2+~}tfgL)FJXheVG$?no>2i}b<{k5!9c;MFi ze7R-7oS6Ii{WrShyyvJ=hiIIy%((2Kfl6OG*3(wJc=IQRtcp<~p=8r2yk3)^!WnRF+lXbT=(`ph571!?QDJ@MdA|lL zSlS(hZRnJuiG{3lWVMF7=X0r6cFm3R&Fq=0uV*i1k@4ia!?B4o=1PUb9JwfX-Hd`c z_`}hvn9tPBnnWuliw)|RSRryfwt%u2oEF}gk;YJM*4R4hiLh6JF=++LA?2n}NtS30 zR1+gw`BUkXc(*pl=ZuX|;}Bn-U+4+D1)dFsx3Cni0cI{X7V=3{)Ov(0E_=n$oE&X>pUF04oAjz?Jxdah>X_B&DP9fYc4&#Ps!09wt#TUTSVnlM|h*~ zMJzm(+VwdKmvWnw+Bz-fP+7_mHg|-Syi)~7vBI*&Y07#PN<$Re=bwm2hmMJcA=!WP zIx?nn+P$+c3sV<9anxKJ6c}pU&4}d2FMh)AFBzFwLb|h=9{IO)TaAgf5pSHC@V}MOpf_l?Ym8ieW{EalGTYe z09gkw4fe%^8H%%Zneo)iDhHZ;;d+R_BRon*`D;qIbx(jnp62#4mgUMvGuA@2d9bHp|*-1>@h4 zEEMmrO+$>yKU_>%QwEJmo1%V@WlQ0zEHk)x=f1BKTjVfe4)88J1_%)Red35CvFVC3uH2xn z=Z^TDK^6y%&|=e*8j*yOF#inhyW>6O&EpzQ%2Q?XjiqkUlETDXQ3M~*si^2U)YT-E zy1+;oDq0&-hRI*4SBpjg@OEpX@Hg+EH{{^J~(Qo=+C%!LE zl#&0RI0Jpo*Uh;#imH7%oL*@|+Q*fFG4B)_Pm6?S5Mi!R-ml3=K~tQ9I2VUN$3%`t zCGI8B1jFLEkhFprL1?CyN#o!kDiApx*~B*gLzba(B5V;ilC3lzv^FfuuxnEm`cZh3 zR3_T+3k+r!Nt!ea~Hjg=iNIRwf8BwwDE2f+2CZ)Y?Z zqg&>U2U6wf4=|m7Uf-4!)nc@m=**jpq=kw{^J#0jR<6~{$THAQYt&bhQ7t&*xS2Lt z!m)7{PqEa#qfnzo8iu;RDoBmi<$l@3K+Mw) z_n>ma#JtHL1*+CMlC$X*zzMZPormu>Cd0Pv5ElkRD6jC)DZgO9m2*4aZL1wI!7vL{5uqfc_O5T^jc#^JDCKXu+hm(`VPDroI%04zu zT!mCq$UZa#X}erL5qD%Pqz{3QWW^BN@mnMiE;tn3jN8B=&B1<=m}b@_Hnr>4_401M z_6D@aDt^bhNh>1?!eT9>fuR?rN+`l*rxvb55uwB_iv@5fF~0Y(1Ep~@HHNe}W>WCz z87j&vZ~@Bn5C()tc~S{!4%*}(F*bD{B{()meDG_>;=jf6+T~4$W4BlQH;iz?x|kjr z!d~q^e?pu_bd&S)z&zpVO#^0!j7wdB%gMDFTNQO?0Ox4-5!v16A)^Ki1Advc0BWq$ zMfk>wC?+HoBH-Cavos$J(Au@bNVgO_#(1GUM9+9=>tJM!=g}b(camy?;*z)9VSChY z?fjM;?e18Y8wy#rvnhJ8iK*wG`H6F+e3@gMUmq4nhQ_|Sw+_ERw5ZLM#^>rMaVrrX zODdt*^y{XdYU>xzsaaLLbZOm!&1AUAy>)bx;p|}J?6!e{NJE@qW8$ds!RjH&GrxTJjFhQnM4UA*}=rC1!?xI;I@ zkwupC15Yp>|@qJyzRZF9w3EbI*L+C^qHO!=4CHWE6&wwfL8yKdGfZ^-c22FB) zgpIm}DUERI)2tr0-`{;4ib^8Qa$v5eUTT6&K;rc-i5i9}AG$tAu}GIBNgf(f zwwzHJHhZ@83Q30chKK(F?K20(Gl#(cP=WH_ds$>!Q29_P?YHzYhOCM*h8*ZSXQ_&ZxOh+zGh0hMJ-#V*D9i3y($RBg_`dEq5cNS9G3bm`kALY!9Mj?_ijFhU#vby<6 zl!>Ur+D7u6QBdp5ii_Fl^g6y@47N1jx?~poBQ$2=f{y@79U60G>PBE(Fn3m3a3U;Nmvvut>cIy0v4E70za`>Lta)z1sbWM#q;fxEU}u@X6c5Xi{SpiG<-4% zr4yEFDjK)(lr~SGEU-mdzUT|~A)JLUIN)ne!pgqQ=iS6)TVo(Za~6^*o?6R5HcV5? zM=IPUQW28kR#BhQZrGikUF2`KatlN2e zos%Rt)FkhbI<~obA{mV>o|+ZJDos)Pa0CYBHiz-0nQ|Dh^E`g`aa z@put;MIS5`-#b^XOYZl|8ibwh1dG$#;C-LASCao2A$~4fH|c!GD6KJXhQ)a**M_0K zaC+1a{C!C3l4@6`C(+4H8Hx66h^lr4Gg=fvvewOz(ZWVeCC;EAXVKDRg4 z1zwtv?AB)^`l6(P?;8T{dBFAT{4_I)Pc4RBkk#BZ-ZoSfGK`3%PiTMN!8!egRLh1y zvg{T|pEHim!MxRr=*E!NLyzuXlE;Lrd<1+3PN#h_+|)U%Wcqy~sma_vmP-zbDC{VL zF9#okx+xvQu8R)R6V()i3s>2T?&zZ5m7)@S_A{|Ojp!T|jwr`RVs$-|BHq+`GMfkk zQ?_l%olG}UQtrNyNpvHj7Cpn%rWGfLM9+U2 z@BAHwh5O-%A;dTGaLSv9G;!TogC}R5Ms?%|%1`m=Djy`mYi`M0p04e5tW002n=l9W zuN3(^5)a%@NoeA4+=T2QZB|g#CKEpRP0M^Xd^0qT&vENBhM&cV6E@yz>J?~vp8uAE zbGJ)>gbjxKGW(s#;9hsSdA*)_cf^)r@o^3$>;}e2C4=P(}eWjge7tY6iPWleCVQ1yiP}hDv+I;kJhQ_dD;Z^DUtJ-~6wQ zk*bCL?ES28Rj2Nf-@Pstmy{ycw6cJNC@8)29ee(IHF?0%HO!ytiIdEnEmWbAd-@MW zMF^lq0dE`-_4h{O6)*m{eDe(r;%i z{TZi=5OsO^5fzPZx+_{XUDy!D6)WQEf~xe2{9W20(@l#IbqK$>I+`<8&dF74tJyh+ z4Je!6)~2$&k|8lS@qv(J2E%!!fLX9x5gc#{zoZdSK;Oy976&IUtrgv%9BtM|1%ro! z15Ux7O5zmIJ(_J@gFPN0+7}Qc0iEt`X!He(oOZXd(RudcGVM{(P5WJd?*1-h{ME}; z7Jm-V5$akQI0=Wln@Ld@yAj%$?Ty+o7X;XhI*{b^PJk#Ag@WslU>(NRgQgw-)wNN+^6z0$^qO#{H@ zSQr!r;c!6MM@FXJL4Nw)Cw3?Y3d*uy79!{z5cZuk1F@)x&6HM=39yZVh(9#JA%6$T zI0??bdKDb}mY_Z29-8#tt{}|K*#dtd#<-W3OvJH+<<9>1ao3j=689D9kF#Hqus=>(GJ$mc1Si7o+58+I7?6KB6J~f)JIIczmXAtt0)Qn?0~RC`Mv2XuWvsO`M`(LjUtPP#8P32ilrgaQ5im} zxrgenico$DjM{{efP;0x`Zc^w6HobmR-+sZM|;{GK0+yPWQv4*h96=c20db>FdOw&_>Q1?%M97I|tZ&j9gO@ZE_!VdiXEB;v)mAwmI>JJ_Qr@hHu5aGX8FyhKcMaE^G4Qa zS}ArY!mlQ@2j?1YX(dl9OhqX;i=6as<`2aUn)=A_k>laR={e@%#Iqp;U<)JdZ3Xv_ z9=%Wn*Cg+D$jzXPykSoB3%o2R4Tq8(GRYSj$;qk;yroR*Mf1~^vDwxPvJwlWLV!Gr`2g>_}d-FGk9^~qt;`Zxxza+h-ov<#G zZ8(wH0rXHTb#B}t+*jz(ZO;4qwAH7F&dE($6=swY_5OcJN?xWm8?u?cBR+ZpzS7m* zwrUNSxIxo^4nUT#KMwYj?kMvp=Q(2$=uO}Y`S)}{mKeT?$wI?E5H*RS9hs551LJnk>6(%KP3o<|$!o+VhR7?a02|Nm zBzJBbQ8eCuXEI|gR1QICXf4DWKU*wwng2Xl{h2s6Pt|-rOP5~zvN1$V#l6cuC2dBw zB?|QAio~*8Xblww{ZKoFy0V7(t1rxHP=9?N&5WcJt^Mg9l((@YD|q2$nBeJBJf0Kd zj8uKy=vnj8-Mb(U;{z@icJl&qQL4-f-i{Tban?u5?^vF|x~!jGcHT-$FqqOl9H$|e zS$;-_PjbCeQtl9MW&{|Mkv3lNf3j6p&VesvAPiUSX#> zfDaROhU;6h(EPQ5VMNIiYZLZ8==_8%)%S-$czW8TgP5qd`~7gyuyEFS>yKl7>>_e< zLkUItLPP`j^mOEmL^3{%;i=@xM(=B$d|bZe2=`hyuL$XU)@F59emb5k=BB7qH+`S8 zJ3A_;v%5En?z2h{r8vy~q=-#vY&Rn}Ved%YNX%VaF+d#sPwHqK>OYdwv75pB<#Z~E zKM{GkQbw)kfjOYUAt!<7u}Ly+8~N1)hhkzZP^7$XM_g}QBW^OW^kA}7nY_G4q`&bl z#*DLgHrQ#`0~{*iwwDbyVpE;=DMGd?425LgdF!fL7zD0325^X0i^>6h*9J53Ul|y8 z$@hs@em-+qfLML)nKfW>>$A^fGLt6z__S_ee{WWK!esC~sm7O{gdxaC4jx^pLhStT zb)|g?(O9;!$l194ig$F<_cHJwLzaW*jSpW^^A@l6KjXU;EugZ5N%(S7tL@`1JOiGlQe4*R`-sRSj!rGExd9Gh}xfqR40m7sl>9aXwli z{yy)DdnzwQ6=fAV6k_SPyXZaNx#iD(4X3;z-NM|Ctt*x>qg6yt5>quz+yU0E@4B$A zEYvgAYcJU{FW6;*v+}c`UR$RUpmG3*&?IcT$&o;5-GdmM5PmFkI|T{Z=hK+Ao^O;( z=7>V{6K|z`LiL`HBV2<(DLM&<87ElzU^TJU^@qsfPd!ssI|L_SGp!T(ZLx^YP@)$} z@iFGo<+8M<9}=&*IO0(v!T1PO02w}ZdcQt+Y>XN&J&W;a!w-232yhFd7)2Xj3_BGQ&AAtNTrP*xu4!CAJO)9((W1+_v$!8QR*fiUeU)BJlC_GJ`+3Wc_^MZVMhuW@h|)(%y&D;+ynrEeg_D z_*2Ynl-1%*z62kw3^*6$^gM@4;NMtuQC=_L;PcC3_kj7p>t7|WfB2`*Jc18GWKbp= z=_YQ$L3r(ily<6U;1C=Q7JuaS1#f%I$OGz;Vhc6)4>X?{toeqrt?9{B^>g0LqWYfJUg`M4-$jBV8Js-}t1#41w z8XCgMj|Dz1M4qdAPY+VtD4WQum}aNZHK+|n zmFlatzWtooscKU36B^U=MHUL&5t@pmKHd#aMWy6p>%0nb3h}T=ZL`fXFiYDc_KlYR zfCizOcmualBZxX=H$A=$KQ}#d4%~E4n8sKx^~!0eFKq-=ThzXa*IQ3h&yyLjJ1qwO z%`g~{X&XY2EKI8^ngqjfQkR%`;31XMz%Zb&GBuhVYi(V4=rxCKbM+_jajO*^{z}DRirD#ZLNon zy;SB8n|V)0X3toiA>kO+5P}!PI;O&)&`i)U{7)j&Dm2%-m|tcwnwC6ZoJsP*i>0Q0U0ZtGl~&fusQ;vC-G9t4J|_3CV+7$X@A-fk?1x zv@0r>)b!F74gEk)SwC9*G1`TP5_p!u4r6}8N9;#m%rQY;{v7H=9i}>bG9myLc)(a3 zP?BMo_*@$hVOx+SxFzW_-18kBh=}0cZj|RB4RRA*%7E+!{ z5S8$BuA%?7ulTbN+Xt%*SY$QC)A8<|1HHK8n>U^X^M@Q`^Mi&j$lqh{_pqsFRw=rl zefj*$g>n^udl+KnuOAl|?|Lp`X1nFYL?_C(pA2(>HoH7rE)=?rzK92%hC8jUxJE_^-{i z{S8#c`{i2i0~dMt6(DSUeoZQ*f80${S|%NOX;^~Rc4Rm(16ik^7?owq60fg4NRRTs zDD|F)fxngbgu{60Rg%Lw^2m(m$9=JminHV9cCU-BMtk`9PABKHfS$8W*MPCq7=w=r zUaDb9*$|dO%ynJHAd)jkE zY{dU+oL4G=+(}iSt)`rRaZ}0y@~RJmP$jI-!AlS?$iiDH@;O^n$ql-GWu?}n#=@{} zkSkY9ljW={98v#)WyB;b!#EsM2=o*!<-fc_h$bQ-R-*5VJDC-5I*N(uE2cLD*fj2< z&~Eo(Cs(C5d05IA_1%P_>ox?x#$q6yoG4rm2mC2wqT{)Np1trGe zF4J8Gbc>+wOha>QB>+RBQ5763(~>M3-gK4jXQSp}Uioky6ZzyqBS}P19YnUQgVaOh zQWY2{R*BUFm3sGskbg6OG4?`O%j1bhPuM=G6_**uMXtA|4M-SJk{?4I3WsOFru&w) zz20vQst_O`?pE8=A%n-=7e5N8<4N2rLG9M9w*Y2+bFEZ4h$3@AD}_t*A~qDkPA&)n zv!QCLIpJba7VR21JQP*oc8qD+NHV0&;daSf@+h(>f0@u$#43^5@Zy%&b0H{R*9@am zRmjr{rJ!_9V*lkD$G<1J0h*JRfwKGH)X4GOE0r(h;RA!Z51K&wc6vB{*Beu0Mxm|C zXhCcy=cls3>z*4Po4p8jT|izCo*F{tu2ze&T4XblShPat8faSl?8j*FNgIT1FWjC) z{DjDm_CVHTQ8aX?xc-|Zummky@@w{Vbd{B!*2u>lEkm{4aYYgG1k**ipM^KCT5lOB zU&y9gI>YFY4wiam7KJb6Y*anS=+fUkm6N8RmYkU(qPX&EbtJ60q8i`qoFIfoRMCED z?6?bkaDL8(;Znkn9m6aiwqJbFPHd?O7AOn_)kq91984w=!v+e(2iz&`I@vS3Z7)<`P1GPhOg@N8mU>GZR+$C| zSWY^>s*IEw(ZfVHKsRZVLz=0+nS&GZA2#k%=Sim)c+n zCh{OKJb{TRL7u#b%Z)mSv`GXvS#@<}sx_CbHsi*Q2oWHbIF%SCBYtPJeZBKH3FmK~ zPzlsYJaN=tQ%=aX`_@|PsDua|o(%1u4Jh|5R7v{bR(?30~fnWKso1}Jw z*to&T{WuM*frlQ}+h_#B3(xa&qh!kc$UXi>Hl$sioIeJRhL?$q@64@@4=9LMnF*Q{ z?yNtn+uB-W6T8;@Ey6e&?Uz1Jo?;aQGUQO+182)c z=@N~a!{AGm!*x0mq(Ex*sx8g0?M-;mTh)#UA>pjkwM(>pptag=UK3y_Oq5iGMkQ*p z(V>=WW-@CxC(UkO)-Fs|aSbaYBo={;m75Ofij>=7eT*M#)@)s=O*Nlq<_I?f4peTe zLs-2>Ak$|?IBbYK!V43K+@y)W{r7wKXQ?veoin)$X;xUAwbnI%9HijWvHr!&C&g|O zHj#G=0?8}&e4GSxL6tx}R0cThdbCe1V3b?FZ~wkf;NE&U`jSC0|B<7a#z+60jl;dw z8(!_&boc5&G0}HNKElA0MZaFK>#>mjRnTFL0$}XWCQ<4u;xSat&N>2cVsST|xTW9~ z%l_Va=^qtQn!}kFqLu~_zMSCGp(j>`kns-?sG9uHV6(+~H2b5$XjP$1Fg}g$ll*EM zXCr}44_D+Q;FZE{;xN9}p0#4DAnoZ$|1sJYyVP9BBYSx{8687ldiTcJ z>M(LXM_d(bC~;Cn(vtlsG#`tu_t`Y^F{A8rlOR*<{K`!iI@v31`xX&v{X9#Y(IEe(KZ8_GZq&F;z17myrj@Xr z`+oppK%Ku=&D7@}GR`OV>$S1UmZaj0udci5ZJ7j<>*R<}u&7EDLuHlm&K|x&-xzg` zG@inCFI7)n7$TX~-?_Q(*7b(<1NS9!VRK}N+T{733eCQe} zi2{*7JdWZLe2|9$pd|OyWDwCvJc^aXfN~gz&+PjzG3+q^!~YB)>OZLYI+aec3MlNH zilJ#&C4v;C05T8?M2JMlP$?QkFaUt|%IaS7cF~AHuqv!6BB>Iw86EMxf2(N*O)bd+ zZ4wWWwA!0ZkR-JX)EgQEM-4&t8WCOj92=ZVNfcFDo5X4JXl-JtTyBTGOBTdPk(30L z5{Q)ug=tPjlq``Tlvog{l^sx`zYLMI(Ki*m(yGZ8A5gJ0_WP?8v*yfv2*vrkBtFE7 ziKHW_W8o}EXCzU;e#Jjbh!g-o$D59)pqw1%$yu7RV&-wg){*&_SgZGi` z0v!GB6px~5lPg@6@Ilx+r{BMC&v@qRZzATfvS0Cpmft?z9 zd_GwCe>Y?Q53oF(l{=4qKLPT5SJ)TOdKE@d^ogY~@j%uJCWJjGo9swZf%#TM#bi!@ z^gpCSN#pV)_XLU*N-Ml&riUWJ%wve)l|I9*(ig6*SEf^v@s*K5VwRRL)GJa-VwE&u zScQTli6v)4%Veoof(%H4L~9K$rw%~KBLiD2F#PVB8*9c;U#IEejzLsLC*!cMbZbhi zWe)sEDwxM2g0_uWV65|!h&BlfuL&ZKX+e0k-wde}4Amx3q-cqjL<3EsvNfi3 zG@^AX^~+lHty?Xl)A^kH8}4~xk<}sAp*qR2KSW93ayUUdRU}&vJ&0hbIICnBsVuQk zM9PL!3Y9Wpg2Z7rPNjEtq_It1HFs*=wyb3VNo^$}l>uwO6oD!KZw^gcjE2oaN`DGY zBki7^Q-vzW3Ydx5CT1b1I}j1?2k)|0L;7RLzOnk-No|xl$quikm>r8Pksdikwu=ms z#h1_hIiK9qujhZW<4$$`PBcd{u3tmsL43%N^t1sX?<0|FyiYicD0CQ9j2=QK=ZYFZ!ZW+BzEkzqK5uwb^ds~E9N%p&Bpw%W|BvnWB( zYZC;NKNK8G{;@a^&<&CE%(jHQknc|H;kh$vJX!gAcJaL{Cv7$*7{%O3uu`g$acq|z z4p57EEVxesB#NwqVUu7cd!p6VR4Ad^Zq~?3wu2_6osfP1zUsQx6lB-N>#Q|S{q{!X z$yvQew9S!+y_?aAsmj|_-TXlv6LS~PanT?yx`=l zcY95&_II&WT2y4mH#r=Nc}F)zeqV5=DYR4_J8bzsX^3d2oQGcmik{Cw@^)dFiAeQu z|1*<(d=G7anV>h>eKTDx`F=cUr*qrAmUoSD-I*{Q%Lhk`I51WxOeeUAw)YLvtIk_( zw%e84hXbEq4LS1bzPgofnwocdw0xJ)EO3lRR!jG%g86*gjre<$@)V`>_`dc(mf{G1 zS}ml9r!{9Csbr%twzEQgiJMv3LTP#mB(9X>P)7sZfMfye4LOONifo z@M~CVTy%tZjsp7#Mn0Plgl)7Y2gr0#y7&Rbb$1Y;_@-$is3DhRLJnGFP_TCFm0L)4 z-$6&hD$jgvL(|3lESa%b0o3f-j zXG_~!Lg#`kVVRCJ{k%9FS{`|l%IxPnOKEYBT6aRJeai}rf&|xaM6TmDq`WnC@z)sE z`po%TLgg4Ch!Z=wlOmm;j2;72nsS2t8a#msn9Q?&UAROvouk@Yj_>bJhknrlVs*#D zIHzs~9HakVxx|_9^Ml{#FQN0W!_tccMV>7co8zXF3$hXr?hUFN{%%=9DF7k%6Nm$c7|i`FlP4E{8`v;{-*U!H3CfVhh{yM zCOFqH!b~D?f)qy@buO9Q+#E+s=6r{0I5gqCA{rZL<1K+S^)uCmX3ZZ0h8dWZYv!2R zV7+Q|O*Vwv5bMB)Lum?}gx^HXuz|$sx4X#*k^Vwrk>NMJZV;N?`=i^(ej2#4l%$&k z+UiI*!Eh-arO4{E#N$Oyrz+UEiE`*?mgw3Co>q+AG^?Tr9Cu8Ppddm^LS?@^;j`Gy zS8Y7&)Z5CLsrKloBwUHR>U+%zxIjDX;jf#?_`qB|*^C}3gRx~-1XJfPt8(33*T#Jv zpT%b6K(q_aaf*GF+0pPmPvB+qtygXFlGydt`O5Tc*Ad5=^Q+FBd6v3*s;Pk@9SI51)hb`iW_-1%(77N}BpgQ75rA$N8TnT90o-Q69RWw>)< z;in$Bv5#cQEBDjL?moXkTlH1%bG{USuRt> z&*55txOu3CCgIAEBb4Q$i-@^&j`ZORZx-(F{|}KCe10#_#fS&go2O_<5*1I_zo3~Q z?SBok*NhB|hAI)lslqGja(PV7$&()dy=o#Oa^cndg#Z`vUVkTnz!XZsk8I))r`mT_NO-vtgaeqgp=W~979D%!w5Mb0;(9t2})U1~TIjZA!sS@RRLCC?< z#mJ6+QF7(|PLxkE6r~RCcHG52=i^0@Rh0sHa^2&_>bz?{i0i)@DMBA^;vrIZcIMvt z+3LGnvFLtPrb6`oBeH=MgbC9-xR-Aoh&y;~!z7TBTIhB@DT(mo7ajLIUDKikB*`QafbJY4y7+c)A|{hX zkjnbz7M_27)R#aVDdW=#-AqkUk|AfyJ3A`FqfPaFDjEa=K!ho8Fz4{U+@uf6e4%e> zdXv&1MZ$D55}TJ1V3w%sBpArmj+)9uR$p^dC~Il8`LEzlpRb34kE1&r?K@pL6EP@g zNgcU}E5vruCZ1s(rRxQE+1b@~)56R2%>>H&%+xU9^!9o&S!td#hS2o9+Z8bOs>11Q zNrgN~9fNTTWo`YsIvrfP(?!#$6XthPiXsJ{Ab*NuBpPrDI*+sF@`8U&_Wt`ppOG)e z;rrg5aej~*PP@k2Xd7(kJP{GdFeYrw-{GL{J-^%jUO(Fy#xab1l)N2P=&<4?Y*e22 z;K?$w&r8LgSL<@wt+kQp`LmLaVi6d?p*J>{Nr54(pzI)57cXWtwC7iB<8wx7GTqlqcGA+jkBgM(>@&p`q^U>qOinNRVS}*mK@xm?uC%{9i|m2;wl)bRVkwEPWK@6|9X5|k2R594kS)$^JLFU zV^OodPRS<)9ogxkZg1lHZ|_ijZjjgMTxZRDCMAIX;mUG7Ix?FPN z#XV0?tF-iRaC14GB*P5M%*>kvhRttg>?{xD#%BIS(Ev~{WmI+>WTQ+&yTy0EQ$^00D zb&FM%E_m^Hn_?b>A@sjsdzHfvYx7ke)9xOH4N4mlG!%I04q8+-B7E>{mvxR>HDFFA zo0#FlfS>z>Qh>abf0I#&;7lWrLBxlAx*ei1PC4-);M*GOg1PUS3*RKZ1ijAh76gNk zPiqPtBP7x-5!VBK95Q2<*EJM2km4jnp1zm|l8fFGD zmEuu=UNmV(l!io81%^W~RR(vQPzg4Owsnlw6ot(TP&(#~o;2W;*xmC(b!%B@So+zJ zi$(x*ghYCh<8un!#Z~GFIl`RwWJQXEH%Vk8yvEWLPaoMGgVWkz2Y1)e^L(&VpW5c{G23MI=Hm0_qJmOouIdgR(QmKu^dKX;;Sg-N24lzvy`;PM=y zLYLv_T_>ccM-D|f@*&TW8Huq*mI&1LW~Y;V49)` zGnBMJu-a`3OG3)5v0Pi~cs?6|jQrEWPd*P%;Fj5Y3$aB+R46uNZTSTlXlCRwlrdl5 z{f0Gp+$@LsVLV>bi80pz`F==xk8zdnizvrR9Xbff0>Ol@vkycsR?KE$#9G;n3#Ilz7jo+dncc<=C;0l55+WVWy8%8kG8^Oke_l+BuDa z74zf_fsdxc&_fIrV2kzR8X+0<*cnVcXP-4R5gua?l}!VaNlFz-R1Co~cM$(tFM-KJ z>DprZ#u*cmVTKEY5Ea>h_%uGXgwt+<8jq+@AFC*fBzgPXna0i9v^ZYcPN3YRql6~CoEjuWv5ven{c7zUSOz5T0|#BV3H05({)Ke|PICuAxM)Xje3`sEAA^*5%|j0!71AY;$ddbKUY_Rv zukf9Fhjgw|)YLys{KoR+7Jed-4OOW5UoNfrOKx=Y`VSE@q*sTED+CLn@pewM`kNmZB5YGHD>4Tg~Uh7$Ii@L$0QxL-`wt*IgY>Or3O_ohBs6 z9levSD0EO5$q?(j5I9ugbF+d(<`3mLc&9D9T}78-bYmC0wj!>eMoxQ<+anr7Ggt=D zAdhJYIJWZVN#49V?B{)T$a3jBHzeURJC~ik!?i+gt_DI0(cecQc}Qd`NELxPdYu=~ zGbc$wC;AHt9G#tW4x|(yL$dUn5yU=s#E;sToC=20f=-fxL0h{OfdtGs3gtyHNGxIu z)_i+@Xg@NlWyhjxZ@s1^B8sYwCj;0%d?#@1s<(JEb*j4!n+bP!PO_@WY&-^M0JSq7 zqtLq`@I%2&Q#`B*t!TFIHsrlhq$bXgLiMN+g-?!e(=Q$?qx+iWZ%n;BS4XC~ThlL3718OgR`ko$#dLa4!ox6=8%Nq`<_l$U3JCJv zHR|Uhd)`ISBs!;EUDOH#2B%Rfr>A}Hb{3~;RyW@@xHzRZ!Ni^HGA^O~gsHrTdD$3X z34X3U!d6X4azB^KsjKB7k{%Iw%U7T*tTb-wzgcbYMBP-no`a;U59sc<5{gBPH4q^ z$4P!<_yTeG_)ZAXh8&MT;n`1*udYJ};&{MfoMtWxa-Qi=;RwkNg}7VbdJPHJ2YWx2 zmM_86rfNJ93CX)oYc@wQNkpMhlB{@CdMJ2UIIh(SO7x{u#Uy@)D*^#iF&!^7cBfNFZK^IhB3P-epgeF0D6`Gg`xF^HMi3ezz@zCn+GPp7GAPiBd6cD^KuPH6uxRR%Xnk}WaP zXF5uUsQ~Mf{l!!>OHDH~468UIUIP-dkzG@5IfFdk!>qJLDoM zVbc$aWO^C6I_&c#c4io6G){*wgT>+DFFF(B&pptVFtT41(UNF^ATWtAs7#0yC{hCw z3qXQUh!Y}GjUbeW6o3jyu#sdKqDIRQN?A0x4R0>Hh~LAiv!$`p!!s!Z8G0b#${OWx z1UN~d#t1VEIXNA|DUuM!w~@l0Fp=QuLa8EAQvcevp)?=3)X%5x#kBD@=To{tA|N;p zM-=w&F(K;pQxxBWCgx~^lvtB4Rlqw6s*HRl~h>uH&q#1W3nSHa~*+#7{3<*I;k zkQ}3;ur|6W$ungew^Oa(6m3Fb0ODY`cxZHJDN9jM;FyFu6Y%oOYriud0f8LDFyD8a z>}XDr)sTlyY;0-1%eK;(*5E+R01e3_gjvZ{I!lt9Q6C~W-tS7D5WU^y*48KekJWO( zZfM~Sw0cGybsVCrV zW)O~Br$acIse$nl2R-LlSq89TyGoAUgdsgqaLnD~4yL#~YHK1HIUS5>iljq@R3s#i z5mvUtz9xy7JGkJJ8{-@LIeK|-1CYiEis*6B@Zgy^yFWB)YsYM=BZFsd>tk>U#cGkD zK}OPCjSos%CDGIk467B#AtReh02X+k%(3vudI1W_9)OS!zNSZEDAtXHM&Qwb>zH)h^Yj2udlJm*uvuj23kB0{F zj#w0o8e?s}ZG%|G`p7Aq?B?_{Rcar?Y3L=vAa4&a%eaSQGMG4NU=j+~Xl@e?-3e?~ zjg%0x zB;@ZcMAC8{LLago9p%R{R1_jHxPD0-)6k2N#O_R8y;k0!6}(e|YE)ZOu&TR85S_|? z&#lSI;6RzPlHWWO)+ZLH*_Jb@qnyE(uXe8Jpxc0xcq;q|`2!N`Al$pUv{%RD*f2DP_aJ&v8+8Plg7J*>#j0ffDSu?w1Z6g#3=wjROC zDdZ_Di9z6g$$9))>v~;JW${>PZTb-hU zc|Dn*V1r7>5Nu^pjERR~EbF6-L!i=}sF^vQG!IW&8sI%#x#k`RN3ofQoOJ5zKIX`; z1zlw3?6&Gh(6f=BigIFL4tir9FIdvi`@OgA>&B;_zu~?dEa@TYlwl4e6q4%Mc!2FG zO6ZHM%X}W_7kD&u<+qUy_cy_%yen>PIxM@l5$KAFE8Q&Y?c2*xI$TQrdaz zbGN6ywP#lHbgi@~v=f2U@uz3P)0&Q4({nc_TE~Hps6$E4JK*UhlI``omfZG)nb2Bh zZVt|ISUhpD!@4$^Q7m^P;UK3NRr4otz8kA#Pl6ARG0NLJzc<2R(|vc*);6a#qp7yx zhJ0e&F@;Uxj`I@c0VTU|Y@XKx;|Wk;na+5iVgzs( zaU8m-ZjVhJf(-eSo*?V4YnNTLfBBHl7$q4oP_Zlnl_<(LUg@_?^*8to4)M0*t)@T!{3(hhWa&VF0Y?&m6V&XR}In959w zmh+*mw{ixa6P2zYoJKx{^TY{S{yj|^uhakChG-%K)u`B59 zU*G3kNa@UvqH@UR4PhP-8mRL5@s;LC<%7}P1I6H3?S)42Z3I*}kt~zfI|-(VybBS? z((@`*4+I(3hbD{3z%(+5$gMEWfIP2ND(&Tsh^A1&CY2ySUC|)JTSFy13PPp>31DIj zW@hYlOAVxSOA>OG%3>IafsV7Jo7mkOo3YXgl48jQ(%I{6s_dDECRECeMrt^66R>N} zR5Y87=Pi`7ODv3Oh;B+@G-1ra!J<-_VH9Dpsgl^H3SqHLhTAaXEX0kKVkMKNnq?a( z1{pAxAc%Bk=8@UlVw01pEt+beP`p<*u~@9XYW;y^3lZ`5ADFjzN14>{iPB#+)l~sQ zw;P*e9OTghx`FaZnBZ**mlND><3SRE_I#L#bC1w607mazoTU4b$7V76tIJ*^X4Xs9 zxmonvsL4l!^K|pOlF!y+2bA`5SCTw+cyG0AKX~i7%-F%Ou#Kg74>g1V^N6VlXGBsKgJJ&5j!A{NCA16VRVBb6+MW_-5agBY63R^F-%@ydCHKY ztQF5yIm=aiHiGhj8qG~AQn-8&jL;Qs&b^u*MSJ;--wLM|HgR;euRpcv;4aOIp8dt|5aa>Qg2 zJMo5K43e>Ah|8>;kvw++vz!8wYkXmNg@oNn!+EIhh6u#_L34w%z{=ZNs1uM7=);$Hnq!XrCLjruDan^ z2P6ggq(S*!e$S^K(A_zc2Ruq;!NDjODyEl69#SGlM`y7+I_bj{-D4=s$^URuj~PWWECbFDi(jSV>;K217$V5mv*hJZ7aFq`GaN0L#*`)N>H%u_*NnO$x3sPD_^dq1d`Mw&=$o;x;>KWPXeQ$=q zaR(b&Ik-hm#~6O0*}W9RE~`l~j_X{?qNv!(Bd02<{Gxn+1lp8 zlM*E<5n@X8rFz{II^|E|#yEA<9ZTBuVRSkea~rN0S8Q{ES@bLQGmb;hKEHBV1cMrU zT3Vd-XAfK6WKQTC@uBL;F%MqH(`5!7G&+8i?jM$RF)v50Y4#@BW=zb)tZdyPTEC$a z%hGxLd3DpN*>w`@54H9I6u^1Z^I2cX7= z#*Iy-y}gU$W5D_F!-FTL?OoJ4SqiBmG#KG-TPJ&`N+%cIz7Qf(>QBudK(Yq-L&W+y z%|S^C@MS&)E6-YDd(T}gNsv*Kp7c#J#A_}c)Dr>myO?r`Sm4FK_lTy4;14<&FlaFu zMnMK7xBO^JrwqW7q&7tMdwx^p`Mz&%zJ03s&w%d`2%km)lHdlwLZ1iW4GlC@L_nba zt8ht!_WvPg#E+{q(BY*}c+%!h%d9g~k+Yj8Pa)ue@_e}YiTP%-4b5Zn`g7>+>;Uii z6QEJRNs>-$9dko6T%s`7;3Y)h@my7pTp)A~i`ciz(>09BQk11BN>ZK0DW+xpe^mbp zA7W$DUN{{}P*2w5lJSJ3nx3?!5~EdKV{RMpkh5~y$a_cB)se{-Ii z#={I?B@&_Gi&cyt1nv~jUfbEN(%1{FQ1p;1>dZt=L<;(q1cFe6c7*_4T4Wa#zyT4y|S7n+0{ML+Cf{jjj+Y!95MB>s*!-q7Z zH;4zpnshKKV+1;&4^KU`rzH4kU34+PQ>1}PD*5>bE(GLy&=-IYk~;1XPI)Jqfjiw| z6q;}~z9H0j;qFD(K1W4^y$uKjdv{lMJGq~8&#*4grqPjsDn(vwJavwklmqYrb_wqU zh1>4*pAC!LgkgXsI^^kSG#93WyCRO3aD1DHb= zBgDgtN(oe9%w#l(BqWBklG>`p71S#d(kWSBJ?b+xRyLQ2Uau4xgrx-AB0AAdMoWPb z$f8$GD1(DW!89vv=IzQ75*md$0@#XEs%7UWwZonyfrJxBV%ueir0UUft8IYV24-Yf zE5Wk0A22bAFsap-Dixcp1CD5%Ox9Zq+Io*%b>^KUX}sEW9VLrzTE*&}Bp{a{dj`rL z?U(MRyuuSUIEZ8!Jf!2KW?M7F+6(85l1!%gaE}Q5zS*7_zqOAhtgQO;GYZBh=<_=! zqp0}I)*g7tJHhzQ6;FY|$vk1C$O9xPiBgcpu4>z2x@}^%iqU3iVn90JQ&0||36&{m zA}I=`VgUE=h#HYSmg&G}TY_h01a~J&xpe8$yRHrIUj4r|^&|4wFQd}Co=eK`eM!3c zIJV}|b})L6dGS-&Y;VG3K@4~^(LlYc0wPMDD0artsWy|<9GS}J*=wesJ0xJ*6v0Su5IG=uI3&)cE#Vk&c@x%)-J;uawYro|mYHAQ)ZuAuEnau8 z4r^}4*4>S*-12@nS>-;+cs&t9`jCn8Jd^e60nkTk4x62f!+q^zj9}pS!QEpu8=5fh zM>odxwKTHIm8H3rltBtmB_$;RlxY%_RyDG;VM&*6yBuY@%B|A5ZtCg~2!b*k0K@!9 zwAm2S+5;6RqOLU9TUG)@K*g-GfkIoetjOP17ZtuI)6<%etsA zu;X3ZDqzz)P&i`(K(b*=KFS(EFxpC$D<~c@W{_Ho3Vq*<&vAvr?+u4Yd zjyG{z4s#r5eX7y`C`ft(nI@$X27C!w68mwCt<*7nzA+-?p1COYklFYo;4q$um0+Pu zWQ!!}-`~4I1qdElD+l97t!<-=M4p}Zj{SUJJ-;HXn`~87l-4P#5Tp}DFhIeF-VX!h z73?JwbxFj?J(4@nV|W-eq_*2>Rbi*e6*2=$5n)CN6Q<|lrIWOU$xRX=gsSC`)1nZB z>29}MDHCb{q=MM7NlA!8Xu}uWcpg_>x?PWVOakKrX1kEgbY7{!@T(J6pmRu)g;vqj z5#UXvRG@Lh?u=$(Kqd8TpsPh33r_kb2S3R#%#ignrhy#}al^Hg4%}>?*uifM?I!&B zYn+`$Qp!1F9Ll*G<)da}AQA*PH-sNwyXQZK`At4k^y?T%Ou7V0BQ@V6UC7-NVmB#d znuQ-1_jqPu?3JjS&$Z;*Jf96(wX9}O>{;@APGLOHQ{(WPF0mxU!hYza|d) z;z?Jmc{o+%BG*@3)*`E}A#6=}apGSCWwV-g69`!dHB_xeJmCrS5-x)=1 zwn=Ij4@BGN6N7#_A9BsUVVRLPspkAYlO8Wk{OCyzM0BO9t5c#V>DU92@^tU+LZuq{ z>%|OHLa%5ATs5su2#e`*BcywNd|Qo|D`8 z^AGUgcvSvj|1Ew$^Uvb?-}3NZAZ{L65fkS3evg1s8%N7VDqw9U(J&DX%+yf_`t~+8 znfW&r`)NNWK@WMNe7hz>$f*HnyI;)3ZpfO3YDcS8T| zAbt=KJc^3~N|HV=?8PD=kREWyrkENBJxK@n)2`S(k{*no_2jOai%7LQWSdHTpOIE{MZYcVUNbfXoQQgEAovBSJ(> zNDT!+C_svJeaH{oOR=!Nz7f%MFoQ7N{PToXg`hBic2*>i3DwU}8Pfh(>H%7hwl1*!SjSp1( z2xNr(-+TGz>gSj-kJqWFwO_x5uE^i~68*(&S1DKJNfY!H0Y8*{dt`+m2h(e(V!mtM|uvaj`H!uG_K`QHeu zjvKOO_*auVrp;<)3qil^`<;1dN-~_5f)o=y|Ix@3?HPb2TAGB<5P{Biv$qE89yB|4 zq(T2VyBVcRPqtHjUaH;KcoNM+wb>nG=*bVCTUShtfY5%3c^#S2gLCZ05c?!bN|`|5 z7s`^Pavsp-G*m33`%oA_PlLgkfI+Z}`M);9hUfe_!UBT9@tOhvf7*g( zLIU!u@v(r?!2sErn;$@n7)Qkh&@&i=X)46%~7$rfSP)d#8+v|1KX6)Z*baUN%hh`$ML4@=M0pz|Z{eWH8*@ZiKT zNu#e&J&W=BUp~bI{W?=JwH_t~lN7XQm*WGzuB%7wnL z8%W#d>U*BsY|GMMsUU1)fx_#^j!@aprO&VTpiCzH;j!Mek9xDOWI3~d3rL{?lEU&k?$JS*R}n%+%y)HfLYySZr?Q}5F}bn?C`{7tLw zY~>N@vU7%xCYzZhxTU5s!F+CV7S)Ru=6_^qpd*q&(i?L$XiQZ7SbY6^@7IaX=Gg;& zF++J~h7!Dj`F_KJ`Tant$@)Xp&M2_T$%H`>B}%}g1WRw&%QgVF$q3G%$PvjbX&PgV{9&Z`jdM>bysMe28ZFWQZtodQh zCrwM=;YjZE2adS()N+o-J(D=CG^(VfC7T8e9-tk1_0X~@dGc^}3DRL_Qf=1=u{p?i zgLrl3*D;cI{uUx&*)qo!C&}5kFNCi`IZxa)7#YcRliFHC&=WvUPx5rnZD#73l+IHrcIezoBc>GXG#~BCEdH@atoPsCUQCb?9h_@}6NKJvUznX!%C13`HO5+a0jcQSIBTd#}4It2)W(#)q>qP@I8xxe&OEAJ_X13(8>ka3a#4!;_)Kcy^le!(%O$6>rmTBr3 z3e21l7#soP541T7CE!wACPK{6N+*-;v(V))@RZI;`xqJyL}VC=HaK|pJLh&z3<_Y= zfyjKs_v#+)adpFP)lYcVZMiwYLP;J^X440oKpxHx#~HzEybTc$9ge?(JGLLe_UMWK zFY}Z0cRX9U=+TIGDOGD^vU#!?id9CcCAhHoCSjm52j|=Lkn8DxBU|{(wJUM?G0FIQ ziL>8j+LgH3b}rYvS6{$*oMk)zeHa79&j^AAA$Q;)ZuF>?l4Kssv#KnIs{0hQ zrR=tWZ6(;J8pHnN{D3VO$b-4uK!Qj}PbsMi-7 zQ8-FOIn-UanU-~dx6a`38bPk(&z9Zhxgs5Do@8;{aolm-cw~27&-I7%BQVo-Kj%4h zcGD^&xkyvBG03g0-PzinkodSa7lq}l5P|hZhz5}9)hABqQn?9tXPS1rlu);e#zQ@6C#Rh;90)T-U<-94Y8ok9pI?u z-#8PV-difF%BiU0d+r-TW==gwY!FVk3Va_I9IO5w>D6nN(bjLV!MU)@SsfNH#N7c7 z8#6X$ShTfk*Q$D_PNJh-VGP6bgSi9BB`$(iOl+x|LWrk*swsoN&5jw5fd5Z_oR2pPxyDA* zoQs>Y#eRdxiSQ^{KQEurP1v?QW14X%Kw**}5a1jc!NaRtPMtfx3Om4vpS-CkWYr3& z{Jc$5;6ou6J`aMqSjvw3CdevSn99McHI!5I{{kYyERuQS>F8{^t+lnaw5`UprPa9E z)V85LUFg0;tn=G^e)&WKK4D>1=>i?fK&Q>zf_HpF(Qh&ZzHgd#kxxhhPBnh4BYs@dE2_ zK7~I8D5a$ow4#=jR?)O#3R_EPh>4Rs_Y`{F*P4kvC&=9}+x=?4!T#Us{z#ypK4`$8g%=(1;n&MT zw4Hr>9hs>j)+>iB!0E9m4Qna247$1jyAEJ}$KYF{?DQ{xut-Wz;vu#SiV;n>-jnh> zVLPwA%8JDO6Cz=RBxjSN!W7{Y<8s|nG^<2p)IjQFcSjz@Geds7vrRBlr#eNiM}rYG zLFw`5>BGsnv2kfOXfy_%`EX3+Fg1Qy%P!r+;yzUsB1~K9-jhrT1n`Ocl?N;He-Lef zpcyywYDR#=YP5X%Rq+J6Sx?RCCvoggZ%4lwt1T|BPFJL3+}8?j=?F*}`J|Ia9ftna8X*M6gHX}cAL?q%GXM%qUWVQ{Q>Of*Y_9Af~F;(2Ez zm9iLgjY;)&#U0D#9V9R=INwOp-ZdPGhjZ$O@K#qh2-|IgTT+~J6exE*9o(56(lcAH zEZvUghZEE@H%W*PKjd=l(CT8X+9ZOigzggr!=X5t)=B(m@o2Qf6dHY?Vv0=k&?it5 zE&hL3Y``HfmRqAY6As6dow)Sse-1E;EIg`C%VnozB!foOy-5ukcxfrx7=}!kq3lxX zs&ym0dL`0@Hksz@Al0zz^{g=%mnai3%*KrPp|YEVsK^**VvL#V@Z*iN}?($uv=)1_|nVHPE&>hz?*^>wKSY*q99}l zQo#F%_m(%ECXa?dk`hZC+k9gAs1zxon?5??8}^^d_+C|*m~UPf9lw;hM`l^4Qu(-G&A`Z?p=@|M1L!Pn5nS0WNlGghTMO@oOqHzyn zm5)waV{MFF%(ocDLHL|Va~=|$z56(>&tp@)2>L-J%X}-eNTuGN>K|w{o4Yq=|9b@j z5*E|(&7*0l8e?f4+&*v4H`&jmd{)ucCaY(piKK_Iyf>Q5i7?#}r12|K$>bZ&G-y+C zg-TWo8x9M!bmI~@5$8H$2RZlSbmu1N`TF#3vFiCx=?PO~sTAu(J;}16@lR3m&XRlN zaS+^XH?v)t5`I6ABs%sR*8)@v{qn0U2s9~5DM*P(AbGxr9mnlrD6XA~Hr$sG>-!pbY%fa(+PjPcR?P{JVp? zH`*cLVn?B3GJ+qy*CbBIqOE+oLUOS7|2Zf6bba>7>c?as=Lfj1GU$@5g8DuUYD#tHH>1!E|~2YAM3F zKc=>+c1mLXhtUcDht)-K*IXxDT=4kQeV)gr7k`PB`h5?S=#hhL#*bOWgY2ewW`bD7 zHFToR`00+xK1aT%e}12Rb*d;Hm5 zB^^qWX4%i_O_^t@7Zx3CGkU(48NB0ZcE;4IjAOMSh62JY6eZbqmo2);w3Us{rPph} zwSOvy-cb8^IEaG`ab!R5#4%_RVgizZmox^a=;q}}E};+Mlz4&%(}w5ew#r_6$eDIn z^17(iIqEEg#3!L;#o(Iiw8GY&Im3}SQC)Md`PyF};o;O6b|T1v_CgSzF3W#!&p?vQ zhQ&-a+f|JLBP4Ob4w5ZDi|<~zaA!t=-y6;x&3e^dvJA}$5YIgGebxO7`2)t!&;Or2 zf42vzVM{~RttOEDM#-i~km2-=;nwv%|5b|)9$ySrd8DW*5f2OmR0D|?G+C~jQm5Bz z@T9Ng{Q!GFgunXdKZJh%PXRq!nZHtP5SdmHti+dcJ9^6?YnhKRaq)B zVvM<;J~laRRPS?bc7zD02u0lS8Nc1~yQ)eISjV*NKR(f!At51(sUN%M*Wkx=2}V*R zngonrmDpQ(=HLL<01JF;UjK*J$9#MF4oBZP8yw6uXyjqcb3XCGjzVBk1Y|QvAqn+Z|NsC0|NsC0{>H@ocojuGZ@zu-`uD!^_Xoc80+hb=?tlip z2S5M-1t?RXtJ!aN&^~|?000003ItzqY-hQuai>NXJ@;`vw?nyr>8{UNYm|NSA3YCs z9Do3EE%f^L$KBrNy}9eVHofct_CB9pJ9>AItmDYJuK8~ffQMcTCZk;<`=XNu0x*VGp1CoY$fTp_i00XJ-q4wt=S7-wf zRZ#$>i3&E@$@YDe?AoY%t+UO2bPqr;y(ry2Ee&_en9F z8$c(P9qxA6>WU9+X`lju(TJ~oWjFvf^&ow+yX!dK=e9X|Xg2J9YsDV#9n;o(C;)Ng zcQC!?a-zFw4{Uqctc`j}?T=jmZ!_Jx0q=KV8`yWjY8-)fec4zbXaM%Ny|g}@nisz8 z_9-Kv13(8}y$DuA6$R{tJdet-GKBQfB+N$qgf5nhk1ZBdwIb?03RR#0019- zfB*mh1poj(*um?!vjNdZXOCsUw}IWaaK66b=5Jv@0DS<#00Mvmp^@|eIzEp8K7arN z1IN7>2cI)$xC7Fly04KKHfj zc`n~Q6@7QBtM2!&JL|qLyRlu}+uS-3`px%Z-viS-YmI&0T=6c!*IytXdtYa~kG}Ov z5t-QMM_t+JucoLUee0bbMHN5+vqDKg18(CYfKWGH&U!ik9o@QJ4uCtXXov@09RLSi zxb?NX8Wz5L&ozVS00wmW06GJ^YMrnE08jxX+~$se71z1vuUtO5Oy3O(0-5gRIxl$5 zS`UyqXg+t=A7B@my!7TSE38jo?%#KEzOwp8ecxT}yFu%pN4uQq+~-DfeQ$lwcA%$o z+uprs?;c-U;q^8gj<0vzdVR7R4ey0n*IY+CYe#m9l9Xwkx3{}mNYZx1^Xwfd#P?fM zh}C@CIdo~()0%Q>UbS5el}c^BvW~Po?M}=MQBig%TKFw z&xhZ4-S=lEnVmQ|r1sLK>%E@trfJ^VyLHoC`kM{o?Yq6`@;m@JXaF6w74%*8>(kwi z+btTK55CjayRWg(-p>gZ&F_zU*So&()!n%%aeZ$4ZZf`ey7v0Ls>5vC(?<^Px3!jR zKF@EiKJ(qz()QlB+j`cv?ZaDoXTE*Tuc~E7ZR|UDUA;OlYU8WI>to5t?$5i&GkWJG zCr;sJR?o4SeYxH~j=sI$cTx6z_BivLJK22qQS~0~w{`8#GL#B<3EOV_$Gz-dQ{5HQ zDc0+wJ&sSkrW4yc?6j0vb+nT>DW5)fd+XlUq}67&_dByjhsXhUaQBBE*`h-4OO|`t z+uohp?Axe|?mhv1=eg&5-d}p}XBKx`i3Pgg038Yd2SZOF2S5ivdwbwFg7dqrwe{o0 zq1-EXHrw4O1RnQ;seLydT@d>%-*=x8whZlD zo)PTgP&=%(MVa-u7-Je&fv)!-cAsXo^(Cs^b={nlQm|I-#oaf0Z)JL2+my}4uU)F$Oc2Eb?U9dCQ$vZuIQrnKVXLYyO?$M1X zy4~4;^gYX)vvlV!w{&Y46ei=dVY$9T?_9_M+uUyL&DpMjZr<)*9TZ4D`@`P*d)u(# zwwd+2YJg0rZS_uft<7r9z0Uc(T?13Qbv>;mxxQn)=;uofHpa>H-g?f?wP5YH4%h(@ z0jp(lIx-G|i|;wsH=gG0?(WuamvU@}*I#?@dF$7CcVeGMSQD>fPj6j1`ugthH)h-J z`t@%<_s3K2UfPPwJZe7gxlPtrdoNqJoey5O-XC7q(_L2`bCJ_srJ2m_4bn6nHnMeR zyXnp9-H&_UcduLTx4km$?V1kt?0O7_Z)l>l`GyqKjPYF-Tc?}3LPgB%A4NM89 zO$maUpQ?L7s(L{ZA_xcp69SDjJZU{7*+;6A{F5}wq3=~cQ}R^yrqw*BspC{+01r?B zAdLb6Z52_Ch_x5vh!q5gKq3+TxTw@o9Kb@N5()+`ix7e&BBH_}^;J3; zhhA+>vSiw{k{dy`|2nm9&9=tY8#T35nptZms>LSTSMpM|tD9{`qO2uaHkzfXYHecL zi)vPFWYuV@S!){=CaNk~wyPypwk=hbYSl{9SR_HJ8c?-HdeXI}HB3`m0l<<- z0s8~^-OuHzB3ml5T2w%&+a9=&?&By<~J8vKMW4rsC z|FqAa9>T*JQS1KbcYi%>!;YR-J3G1musY>Z(7WfOWX#DWSJv?D`mc^G)}x0ghU@Uc zCPk&txs!kE|D5o!vlV12N;$ZpWi**EKfd$V>h|`&*X=(4ww3${AO%Q786&EVqQgd} z7=E2XA_&RD-_fGU1VM66B*itJET<;~ST>5=Y$%OjmQI(;o82|5!@?fB#G$(GT{|`RE3!Fp!@GQc)_U zCvKb;=MHygW!2fb>CqQ#%VTLaW}|mkZOenBq}!&l&AUO+=5Fq~w?{7BGDEw&w#>BE znY|iCnrVn3gMB3zjW)&uCnv6Q>oQiOrst;;LP^sf{-L1|Gp1lb;NfBa$oiZ6Wa2** z9hUXkCQ`_MK0fK0nK-j=_rCUXy!UbV>;Cf;n0Cj#@X053G*KnL=i&IAhLn>DNaL6? zA^fR5XKOrGq(~%CLf_7*OZbnUJ~xyZ#~x-;<7X4P8)=5n2yOd&;(Y(@GYsu{z6TrM zeti6s$H;+2RRI}K*hwTK_Cl-{0+`~>WTplR8Y8Z@C3}}jc;T0i8=z@Jcs$L`80m^! z3c8_mb+wsAvYLhj!~xoA6&abSTu{{+g8{ZQ*qULoQ!b`NEz3gJTeZSf%-V~l!kW@i zV=5^XRA|bKw&{wa6B)B5iCW~WSQ;*6Ef;FmiUuqUV6LSSxoj{vltrNgm~$qnW}&gI zDXvD!voshs%Q6<*bdobh+tS-jMx@MHRs5uASVlY zY^E*DNpWV3-bRG;xxW`}iY;QK(N%on4MZ&o0m4c%b>sXLf7UKSBZ zOFWV^2x&nm`-D{W0T<5Iw2FyEFdhL73n)GJK{eY_=zwlwjR?cl>ObhpKj?i8KT8Ma z(EpUP&SU>(tmqC02dcSM6>JI=rMA(*Ll)wTvSVptgJDfNl6BqJNo2Hg=SZNjEQtnc z6KJ%RD^bj3QPkOnr4p1eG-cVO!f8ZCQ6{wq8$oHUMAsKdWVjm1hBjapMg|#3q==R! z3J4U2%(TR$U~OevoC!^#Es0!(*9i)Q5J+SiiDto|<5hOFyIpLhn3M-PV(mguiWy03 z3jrk@FkzvY{^x+qi&pYeA1+jN;Dsx08iE+5xW-!vHVu)MmX^veNSk8iy3tJ9$qFFG zmWl|8K@q8vh{m=IV6c-kcCMRf#}$TSZXmE|B1B-a-F9+82~vp0O50{jc5y^XR~5HR z;_BtmHmnkvTN4vYW-X}GGf9ZCAQk|K!P;AjQo#(4&ASvt1rnoZh~_M_Sz$@8EJ9e* zGT8=OW-GOT*o`S@*rlzjD9SXWsd5-Cc8O_!Qehpg3x-i- zWhD?=RK`-7scjbmrnhaYwJyX>ppe)_QkclWra{Qcs;;C)nr%iln_EjtG{VzsORiXG zZFML!7i$sBHoG?(t3uFog4jw&Qo|ubO|h-3b*hD;*`bFvzWra05qa zoGeyXFqlQjRgzSxAfgPqQdST!mdZ0f_TYh7nWY&x!(x<1MKI9*)Sy32~OM4@1skkKJnI>EPWV47J$ z{o}hhfUIAeJpI?9fz(ea;1EG&smnw{l*NXU$n4`nkYbQYFqVDb)JBCea|JO@6i|=I zf8fqO5M^m0My`f|hb9xHv-W+R5HkbF2#AP?izKH`$R}8a3<+peJ=A*r zox+xcnrP?flEo?UoNHvnVgG4wC&)xw+8|!&jtL;~Q(&TX$=`B)ok>`6CuX!ML&XYy z@tpLP8N@R?5X^`s5{!bTr|-%F3g6X7{gbuK(ZRS4u#r7cI3{=z`7MEmkWZEi>hsma z@FDAq{4fOWva>$uQ3cmy>AlEi2oeU7H`(66cTzk&dhObUK?(5*MoD1_Km_>^z^Eer z+#_@w_11gp` zju63QSt)F`fLY6+Cl+0!j%c8(2}77^$3>Qko1lp+-imX>4fGYakZb6aC@*ggQDq??g-v zZ)Ft@Occ4(GOW%mCS6-kX$*DA#Oj9)0|HW(SwPFz zJufyYmR9w4x}s?e<{a|g2-du+;VOf?E6#ya0j(`pQQG3xnq=C7izLKG4BE;GS4%3P zwiLFQb%4x7vXT_EXD=R0YI54wYFbfM4H(ra5Tz<6wOzIXDHO#QX>B#6brT&7yf|d^ z`uPguqphK}l=i+3UJaC%Q>BPp*q(LJykU%FV~HV>5pt@a*20L(EvU*;O%lLmg+vBg zNX}{_4N4HO5-|_uI=neivuYl^(S~3pXcSq?M4J?11$M@PgvK20qirQh+87)f>#MSe zQ(6f{Ol>X=;Enu94uWTD`pQ5|?ABbX_KVo?~D(b|r!xv5n%bzK}& zU3IO-ro)wL8)n%|i-ak55TzPfVu~@P3PVInRTB$G7^Rofmr}eNM%uSF=B|!&n>I9x zMsd<<#*D7iw6NH_Sd7_-(Gn_*ZK^RC>}54BDB;v&QCBK!R;DpUP;M$gyE95y#MZ#n zy4N{A>Wpw(%QSc^L~OO< z8N)R!a8Z=IP(b-VpY&3q!#7f*z#-0_$0Qbt4i6rkPKDvrqggmoxGm$QnmXNavxUi= zVu&RwWTrMv=of}t$UPJd&h3fUA#jgiaO0cUhg_w+w(oW;1q3Jc`%-kV@1<6k&BCz= zkrNzYHZHzRClO9sj}glfiUwtkmRN-mu(1_PsD!k%7TVoIU};R2BCcq_MKdZ=xGaf_ zq8PQZVSxHxLUIon^m6sl)Ippcgz6_5!Rv(sF)w;#=qfehDi38thYc0rnXp-Lh?xe| zpq8l)%wi4_((`F9M(viEl#H;(BD~Xdi$)_x;mGEz6j0LJOPZ>aNo%fv08~W6$D>O) z0`<|J9J^O5t%<3AAaZcwz(U)J-zPMMIVm8kYO>3nNkB`TX^}H&ktsuKOIK2Yji{0R zgoPv;iFj~lgYdcHH zfKHnxQc_FIh^5n;r*$_}6wNT?SXrzzpC9}CukZPu<4Byk= z>8*+S6N_k7nu-a#>|-GHN-`d+)Y_C{t&-|28on!p-5vXZaE@#9`6g=9kNjFMUfJJ3Xn`|pA+$h zh)&k-gpirpE+O4S)`yY%K7ZM+Lp!|yFjT{}A;O9V5$P?2bTN96m-P6j<@`DLPQ8Sw zd@qaUBJtOlc|A&E3JhgyBkgQgs>UaFm&4bCuGO84r*?GkJ(UUsgrt;RIw{6-l&gGd zkm|LZrTY^;B3}nvo@~6dMu>4>UnH7Wmw5KqFN8d&_<`9R4p!uKZ7Gu>;aRVXJdaIN ztGUez$ex|uDjC`pN`a8eXjKxmRVHf*=HJiHX1^;(=n`#IM3Y^q+YKj;ZEGZd!eW+O zNsg4e{&684=*Ug$cS9faP1$A|1)bg4np36)$H1txR=E>!8(X2nq1}?{cGsRfo1}8e zujcZKN=j0fLruu1Om_M;6<=E z9uh{vF@q&*>6>VhshdKn6%l@m4SWoXEppP`g{xKtAYWZ2Nlhf3?b5Lc2uS=hh!-3z zH1)DB+nhBU-+tp9AtvCQxiHy@SP{^qj#%;uc4^#_H|1!x?({o<@M8FmkjW=PK&jJ= zKJQLN{Q2xEw5;=FB!vPAgpKNWjx1T($B|!D`A(Cxt_cAF;_mGT^%aNH;)3%C>C-s! z=H3*2@e2%i#SrYA$YuD8h^DO(6Q}*>+mUNAGm_`?LvSdYcmC?4F^68SKX)IFZ6>D^ zv#!>lbbY5KgdVCQAapqC(B;gtsOjP@7D#l(LrL;l(t<*95djBwxuSG5#;U6! zNu!;w6R{G3VrGG|Z_jx)PY8l2r{wbvZp}It$|#CQ?-1Vu>c0brzxW%^$&+NTtJUDn zC2i?4hGkY9TVf_HQDAFGZNp05Si%ueLTJTfRC%TuqP{44Tzaj$DBV8!i8q(s7+9KV z)RXy@&^l9{`kkd*zcTB#QzEBG5K&u5MG-|s*eP;tls~m@0tyV8At9JdGRlHlxksc9 z9DIosHwi;tS)epI=aQ+`^ZZ3Yd((Pt#tpLTOArIQxar=s?uQ6KhoTf)35#Ee{JT4E z@4sBv2aVWGGs=%oM2++?kexhVnsLYzS7Tt^ zmuh_^vYMmP5JWC}Rb+IDRaw@>{`(%%Bw9(QOzs;`DL8Q z%Ll{kk$#tHma6hbAu}0 zll4C;&UMzZ+1tvvWlb&0UOQ#SN3>eDMt^;EP<`6ksResz;xhHmMd-&YWOf`l{D${NpQ? zkmY@}y0p`Kt3UZmjo0wEY^wX`D(|KH=ZR%9#|opzOHcdP3@@_iWhb)TU!D~y;yb;l z#X2E`p4g7bgfC+2T@oHjPo-{=C`M7-w$0jSeNdzAv)+B{*%>yl)NQ!3nYhk`t^9km zfBVnfKE0Rh=BKJuaU4MFG^>v^);}yY)=?nF^vz_=4qkp&;M(o+7(~*RDXziAQ$azJ zaOji4DNAf#GK=LPaS|7r8CweD_C1iHW8>v!jK#^5)%5b*OK7EGe<$1WUUTvI7b)OE z)NJyH9o^kQEpV{-yAf3*@ye(bRhNx&nq>1L>j_~u!%H{ zCb`kRKHs;`Q2L+tpC2z}$&Y(B^mOFB*}Cmdd(KW6t#`L6xpqK1%g3^5sd7Iv%4SUOp=o~p68Ot_8X}dF3I8Vc5R5N=|^ww>o0BZr#)+4 z_rSjU;H4b8X>|!yt8(a@EV|~^p;KI~QTW{Wo2}x*8j}e#a|aN<|6fzWvy5Ixy}Nu& z8~7e4u%f{ih#P=Hk9=whB#@pvRltOdP)K-B&&z+Sm+$U?dNTC@BunxjH zN%oYD3DXCvcVkYRdH?wQWAbWEzKzf3SNT*m$|a<(jfiaadp@)D&zbghTlrsw6Z0lC zOV4?(ohhVet4iIyyOlpJpZSn{kkg%|Z|GZQc)*f95iPE{G}2^~yMF`W!sJirReP)V zFh$2KN8F@bClNOL?i#2=Y^OKFj#|I2=n{{|?-i-yGMO$PW{HS!a*dH((8+K1&uJgP+!f29wAyaY`CTaIV!&qPfF_;+nyEDZz zv!(3cH6kd{536)fl7jU7CGSz5A6vo+ufo#dJE!@WJG>%#Kf5-JMSLoTUWM31b8&`q+udGwGzv5(jt+r3i2aYv8oUw_{l z=x|Nhjgp(mBDZzjCnXnZ(KrLj|5UiYj#NJ~W*vLc_1PPk`#rthet`RzHP!aN@1OSL z69zv7d6Cme!czT`e|aS2Hy@l*Rveni@!2T9zq5p(wbeUgB`2gQLa07cB{cu7{@Q(8 z&G7mHpCJE2HRu@S2$Mgys5w7nG7Hhd=dQWG23BYCv#92?GfsA3fjg z2?p=;|3CJdulj$qf7p1vkd0sN@{Cje(vJ^ib#yBhAMtfvGJAhx^?q)%!vC+nGWJe1 zf7pGA=`TR#l=JlazJGS={;P1O)j+k~eb`3p>-i()#$MT}CWpn?fUHBKzxN~hW4d!1 z)YO6beQ|0jnf@C0&SyWgxW2f+Dt4tcz72hJQE$>V(Ey9;Ar462vu#?f0|kT~zYI91 zlv-UhAzIl3$`4z}SV1*vHlVQQDp)$It#``xZdF>(u@2WL{4uCGT1RPv!I`wg{FN@KAbP?CBN-MRWuJ&7Os_xYxNVEp*h6r+iT zQtL`ROm=5b&-aP)-ZebCbYXB)Qg)Yh^hcU(--HH|VOGaY zvr;!#gnOQU$X*B>#w}WmKu{s>slp)rhSw1}bw)9D3?2I;QYey)VM;ss_Eg|~&c5H^ zi4q-YQfp9!Bq7_Mf|_DrYq-aU-}rlVpCk7x1r(^#)QcfeWDZ>}6>||_+Qfxhcjn$D zLnObcrKN;rlmGK9L#i>)yIZxUu%Av_idyriPdSfDZxu zXblDn<*+)Rc;XD>#Bhd~DNd!`4V+0Lb)U-VAps!*5aSwz+S}B{9Gylu-wv0!LjV4c z3GluWLqZOOZH)hhuA)+8U{ei6K z;dkqyEa%M^c%Nsc)N}?2+pHPJP2m8gIGks}Zfk8SK~~KtDNPe-9ZW#weCT`Kb7yfN zd|DdEsB$zre0z5JE6qbf!P}w)wETSe>I>hO(EA)rroj zjSap@!dyU@y}-24kw^%xzjt!Wr!vX+vWr4M*|D3=%2p$g^89tH!-}9@>~L>qyg9Bu)X`-pz)1YVn8KU9-TMs??b( z&Or^~l20s>5&p`o^F?YtvLo@lHoAsmX0{oj@tDN(Q&c;x*C?*}iqAX0ra!lZVY0MS z;h21K>*T)mQ%pNHJ49*!&eJYO7C{1E0l`-C({`%$3&ZrgdEb0QItL+y|9XejlV2}s zY@??8R+M)Tgw?i{d{H7ibEJ_d4(O>c=wsTYy7Op?J5VOds}zrEJ?;gPRtMw#Jm<@$ z{|@||y>%5uSw^AK6CsK=97E2w(yJCIw1ejDDoDrRKtFEYExlf%cJFSFKg%}EFsFr4 zt3-K4k#iU1ystrx2v}7=Ce~=?r&+ZM?jPG^^EtLh_v$j&rMP0vj%~a&ik!))S4vc` zpWgeVnO@ENJo=tQm_Gl!c8c!q_B8fz%MP}EW=z8vA&{61zYjw-y@ChsHyQzu$YP=f3N5HPX~S>=-Matxl`*_df@4(&Vx7sETq_At_EID-|>hoW*kTsB!EcqImpcS-oH&gxY14Js@<&G6=w& zmnz}X%p)OL)%G9HzCp>1j^i$>3zpU9ury&pU90!#*KWV$09o>0ecmaC?lYZ=v5(K)PYB9kGmcNswrD%C_2_Ii1cHh?%@&CPl%K80$lkL{}+Y>b;Y+}S}{4Qc9YJNu=H5PlTsv(7= z_o#lrxXZ!4Q?&=P!B-4cq!m%+wgWmD41plv&i;P}?N)ZqVqpcDq{Yqc{g8qr)p#+F zZIRHFgVbzt3#)taKq+jpD{5-(j{um4e>!Q13--PFcAy;$&9riaj(h{~kav*59-MT{ zNh+=*v_Ur_zM4=o^U+mEZ>1bFM!R*qYA>3o+;?kp8ZK>nFBQJee%Fm9K~a%~dR)|B zhvmYP#yEJ9nhZ-ek8u`i?RJIVRIekhTP3s4Z6SdbFzq0s!9}h@K&YPayB|kEKNnqm0 z`f|=Zc`@$l^PFwFUa^poC(kuBL4-mO2tRX~aP|CNeDrE+vKhj8En1_7&t-cl8N;T$ zrDPkh$L_<0^ju2s?zUvtI6#x*ar)xKj3o^2zPv8)u!xo}`jb^(4eo=CUAght=X~CS z8XU8%7sE7M9=f6Lh&WM9lv4ncB*QB4&da64FYShMw}-1%u1c6yhxhsa+ppYk`+0Ke zT)vlU(g7Iey;hfsug^j8(8BNYH@{pXM=Kn5=A8_Xer;KF?3VtK>KW5HV1$Mp5S1Xy zK|8%CAFJiN`gCm+__@jcDJpFby*z&c`_TJYJ7kl{{1U3>si;)e6;W18`XNkxh#zh$ z#v-X6tSceZEQVnPb@!)+9Aqa2wDR73H%t^c%alaISa!;a>lti{DJ(HY_HBEsy*po# z?7kOG3)_u4bc7@`-al0<&MI!&QMO120;kSZ6C64k1PYpZZF}w{BqWmw4uC>TCG9VanLJqgA1r$~CUub*whZw*Xt(6Eg_ zs2H3eT#Q0TglaTOETuA|Pdlo z#cm(8bIAl z5Fe+LUc38$H{CDwGl*d!(WD$O@{&(ysxjuFytnmL!Wqxgb#(o&BL)PRY$d)rmPp@968uu05>09b&;+7u1MV99)s%yVmqkKQkmI)%0qKN!4e&NIaM+sD@vxzgd!p?0;frwQ(Dls_~0B49PM7-*Ro04DHa6Yu0b%+1{-*x zx*&RRHEO%W4qe5jq3F$V5a(8JC)v;F3aP&v9^NGi#~Yv?Sz4gD}7XPjgpEWF@&y^Mk&3_>~W3$zg{M?UtQ`E{7Au%^*_?LUw;?9 zpTo?;+IxKrP_l4fHj{dxj2sdfyH}Nu%l&teKbs0m@Rxtr>ao8L@x9w|;j^|7|39NT zd-5q3ex=d-e9`$ov;7&qy)2@6`CP7+e`oH6s)g^82q^qEz`~QVKDfv2SwTLobl{13 zcX#iqZL>c9+I+Y`f|RyWHdWoT+UGm{yF4(sm7BRsgdJ43a_<#k{&*@+Rn8_1E$lTkxywlw3h_- z%5n5!Oa!Fw<@K~xJ+jSL=XfRJ?sn3UbegeS66rk>stK4vKZ@DBp4TS`sa`QMB7{vVR@u&Xj(B(072yqYU|F1Hgd@ z3kY&$an6)^ui3ObL*HqinfuU3>i)Y7l1^dW3+?M|$K^ki3{40t&W_)A*WPIHn{m;% z(obPa$V>hStnb_HJoeN*3O`jci@tRKt9SXpxJ7xt)5Z<`|H{JJ(~dUB2ZBkHCmYHG z>y^H(TPY^!oMDm*{a%WT=O(r<81IKKj?qDVqAB1s}h zFrOoq-1FyOjnGS~%|3aA$?y-x^gf?y6!quRD-f z$C@9;qCaNl8}z=~`n4M>>g~V!Q{Ac>o23uuesGtW%zmj-8l~QdRQ;}4Yjz!8%rW=p zpsEvcob2qR2%jpT(6!BN2#^Vs`D~GZ(FU6kqAC#zUQ283^sh)9h_4SEyk+fHdX1(i ziP>A%(Sfw;o%Eo&M6x7z%f>Y#g&6DS8&^?R4~{)Cgi)!hgm zoTUEvLrjuTmk0y&b{pf{HQhDhDk$RCxySs#= zT}s&>1yyg!g}yYBlvQ#d*J%Pj|h%(<%N-%hwSZe^h9Fi_rg9 z?ZB{zw#{N!?iIhJOd$=jE;JeRF@XYPz1I5h*t0`<5(@&zB@_^7NO0Zqh#WW*_`Lqa z=_gK-^l-jPu7A&@vc8`jPVOU!h)E>399Eo34t@80lKT|hCwKI~qWl(gz+Wq1d#JjwCJxvDg$UhBwX*~Oldyp+gG%#u0U_%lT7=+X!? z6qQvx*~{Qe*TL|+wX&q{IGt~)Q~Gc&8KK%=-yK2r>#Br%yS2=j`>pi;nQJpV=niYi zY-Q<_vPmdQlwT&g%Nq?-G&NgjSsHq6cnL)hHT^KCMj^|)b|!QDy;X_uPd$r>tD+c^ zfYy8chqf1OhgrQfa^}S@*94xqJz-Dd4s+Br)DP7_0ho`Fr?KYPx8?kZf ztot~3b?&3D7N~w&H$*uj7(0ga#1M59q@+%ApH5KETSA&Qng;6FGEJ(-9NUI^s*E@9nFS~g-oYH_@{@%0ebE=Scp zF|s{GTnIq#?cM=B$gOjMe&V{O?bvYWg)zC^1u*o$2SdeC~ihEGv zg65!+R3RsfYD;H9=)kF0v1(5ca0aKAnNV~Q8>E25PruZK}2OlIihru5m5yB z*SZ~YiD=0nHLAa3YqYZ!w7WO6XiGmox51vs>AnwH=y{t%B&;wNW~q_AwO)+Y8g z?pY?uS)l?15@|5wf3MPil`)DPWGP#ce;8H&yrV8H9*KB)9ojVV5+|2L{W2m_}5&kAJoos3>Dq_Tx z&*YuB*4}1r`HkJB1+v0WSk<@2t&B%w_PZHbH&t$E|NnoY05hFt+p5U%!mA zu1eDTG?rAlGL&Rjueq$XJ#H3Yl`X!i(3=(LV&haTFhAZ9z)>Ou?EP?h_`>eqJU_fR z=>BEIyP9TnY0^Hzl{bR;ciPwXc`j7%`Swsl$j?Poi_%`{w_2x4KHm$ze~|0qMJZ1n zgkU0oig>|&3>ERpZ;fznq9(nTFsW;4(nz6{#^Mr%_PF)?lc>gn_sfJn)P5Q|2Nz6h zsC2?)gwO2}4YjxSC$NqJ5*OvCft@O&u%5>*4V$O21oYYqR9e1rGiXXx4nWvNje84V z*qzpq->my#5{IP4$l`4>iDl*YuCMT!shZk^l5z~yoy^wbZBH_Pw|X_o z(ZGSzP@Yn5^qG=N2lwYT;Y(Trt4_!|xw>IA1-Fs7owOXF#+BI2!*#536Gkb<@n~H9 z{K?2Fdyn9E@$iAhNfU~4rQ*acn5R2JFaVKC6*=PmI)0x_b4E>VLor*%%b`=*Z{~fQ z95&VjHQ>pUyDw$(Tj=U`S;XINYH09I<$5eH2HGY-kR-_@kdY%Kh)EbRl1U&C4R^Ew(nwt+#rQKY&ozdml=OSNGarH6?1G57T)b&nHoulKQ(fWSIHO{%|vqbaysrOmf z&?MYbf4Ix3L$X7_`#azKq~wxMJYZycpR9AKM^sKr?CRQ^GzH;?%IN68;= z@>9+t>2!d3I{6#q!c*LxbzcTK50L0|eU`cLnfAt^q9&4xXre5ll8>n9n3546UL7Z3 z?JxS|Jv^3jS<+?~AB|0NDBur{U({XTZ(>GXg#GQ$pwukz}As{h+V|8Fo6IJZ(7 zQs!L;f`6YHh740A12&-hyZxRWb#1EcZMy!BO(6A8hX7+hoWI`3I{TPN1euF{jp29K z@D0pw)mKXNeLz~(U$f`eR;DHtyAgW+_h@p|J9)^}*X_#r2uUjOa|Ah_Ogd#_$Jk%L ztn%|h_)=-q5Ub&2S8-EU+i!a@s$BKQvR86!>e`(d`e9Gd!!iF~>v(w2S%0Uf)9-j- z{JsaxR7Mg>2u2#u%|0JBIgEkhJHcH)NJ=bY(+F;?fdr75B<}nCUl^EGm6w5PdOJ4Q zShZ_&{&0J$t_2?x$Z_JqO}AXGgVk02Oc&#W(Ph7Ma(eacy1yJ&zAK&BlSLG3gz{G! zp{=xe{O~XKEF>IIsvejb7+r|w=x8WY&V#pZ*up<=l{R!Wmf;De^`4`eC}n2^~I z4J|!fXy?aP4U^H^dJw(d_m!8i53kbO69C=1cWypR)*yX70=2{_C@6k7%Q09Y6godQ zZ{a!ozK=SdN8?%GpV>G;32{=ddO`?6b-AjqVF*peX``~tF+Q;pDpOs)`CuLiAQ``3 zIApABBiyZpxVvOp`5xj-oRSiFnh#u!Ry8Vt$F@nHNev`8G7mM%VX3r#Ikoj9zTT*9 z*BD6{KBWO9K}kEkoT8%t^LAoL=OTA+kv1}8uX1M_Tmd(L%njN0PMhg$dp?N!)xU23 zIYzjeQ80@YQtkUPi5y>&g-cBIg;K`~6nQ1>q*Y~jE_r%9-MU}y zRMOaFKSp&aY}V_yo>leN&&BVCFxsJPp>!)&^4}b0S;|^zmG#OGzX|Hy8Ed~gYJ<~D z{d3_?+c7R|Y0$I6x#g=nlxDpZ`A#O3Yan;o2rM2=`em*+lw|i%Po`GMfWoaQsz7Xo zxGEO_xp!Un9T{1*1T1TSC+U}))WHgnkx=)XqQ@!T+WU+3) zMYgrt+wWXV*6WIqDP7`yeUV@EmDH&s;vBMG`kxHw-kgLX*YV8iQE%r2SMtTr?2lTky&q(bnWR+kqTmuH9g=B9 zJ=Cjr&zx$1O-$t5p*=IxDgoz$*Y?mJm=0nji+qK&3 zHH}*BHO}f*V=7XlrzmadT}G8Mq@1im& z+mtaK1;_<0v{sO|DA>`dXwj4w0tkqfh>2rpPnYbo`akLYM(!R3pXoKyTUMnTXya!3 zI#CI^d%JeJTAke~O@R=A&bp+ECC$6MUTS$ICfk&5yKQO9T~3-7?2}TIq@p&cwIBYF zlGi~`ogq;MYYQ~Z7qZc7&p4xI+}&@nYUu_c8To~$HI*oOvw2jqGpqB(M^3H2~QyX$nkptm`{=Oz7H|P0*1eQL89ewn$YIf>vv78z?MK zEXFBWN~5q!!4wv1+7+ml%WSrb0*$i5l%Z{dM4@$d-6oPLQk=UPuNB$6mrX>j?b3>B z>tdrtMC!()SjN(q4a8)ZOPtqNcT;Y*>6+YXb8CWXES%=XZFMWQmvwVfmvZTfMcvHO z95*Ywwq}V$FkRitb}%l;cVD~bLPU)lc{t|DZOf&1U2c&j8d}Cuidc(mZKE4PpeY*` zQ$UvN#V)&awoV>zE#7vwDmhb&vP+P0@d_iE@iz_?6Ns=`0an@-C9919x`Azi_UJkd zv`DC^mWOGs?Y82UnOAprajsV5uGPwycCNWyf=1lM2He>--FB-w>rAj}G#J|`0>{CC z*<}zcEtL^uQ6;dgP;DDw#^k9`t!%UwSc~0v66WrFc~_cD&5VhO;a$|2u3T(1&|Sw> z-MQV;v!N+X$F!|`OU1oscHEhDO77=4>5H`8{a0MGN^cbw)u4!#ZDqDaN4pA&Zw0zYohym7OM3PA72)7G&lM3;dKX^FO;~4}>*uh{djlO-Np# zcR}UV1B}tezl93uxQHX*#B9B!mhD?CbF3Lg@Vu}X| zC?|iT^lkR` z=84#dFjNKm_dFtf3EJiIMuNMQP!B>IV9Oy2F~jHm?wUwP#EDTM7(y{V&53;dVo+5`~`BGk0Hhrwk&3{109mMBzFykL-5D(TcvTt?N7kmOC>f->J z_qpDG55QZjPTdecau4w+cE;;EnIIxlmXR94iPfdwp0eSr#Q|G0e8Gl0po#m3_&!tS zKARuH{71{r@>#^otPiQ}HHm`=h@6NP3}i8Q#Zjuy{lDw-PvtrRF_>j^UWf{c;c{>& zha%{lamwLZA^~;dO&Em%LeG-kQD$oe$OitrDTqhRR>sXIOiiK~&0~u7fIGfZ zLdXvd=T;W6{kBrWXymXgz3Q}3fphv!hwzE<#nd;dxwt#KE4#1($XW-}?U*eagSbwPG_MpTs2zLVaRP zCaA>k3h_|2j0%TQA=5-^X(^W&FQ-4KBO*9H9_U$#O)Au}gs7sRsRtssV|q6+@sqRQq{c6>%ZMjko-%F{K$KjEX3kW~nIwKobKpK=8>4knyRwt$G3D zkM-%3mItMf>$Fi-RaH~~dfR!ey|35TO}Cuyt$Y79`#*Q`gZe+ryMLShOYYl;yX+5d ziL44RjY6@IM%!aX18HC|qa?5`k_7jpre~O7w8fBSSPKM(h{P;`P-06F10f+uCWgkM zv1JvhL~T$@NrtKlsD+Z-2G?ratw#-%Q2sat15FDfLEwf%MhZniDhN=E5f~~$5X?go z-UFCRlv34d{YCGR7I6k7WQ8o2H-r98?;k&1yE)R~UYqaA>#ZMY=V&JBz?$&8(MggZ6dj~Zp96uAZVUOrwqL4;Opn~7 z{JPyme*)*KC{5#k)shRG|0La*Lb&;;J%mT+?856mHB=>g!W&CRpk1z?t{~MTZr5hM zn&MwAe|xcdvEG*!-3w)n!%%@CQaNA6Sb_55J>=cP1P6~3-n_W(d-k?8qqyRESKlli z5jq4PVgG%SEXiBR{{9acSil>G^JA=l@wHW;-zzMrRq7Ol(y6Tc2{;`mZbcGW&F_itUro17lG@?l(z$L-%Al~8ZCWmV zWZ0NMNu!!B8UaWE1?0)p9RbM&+>3-_0bu}yN-C7xL`-0$g0Y+gCs81DD0=j1BWNAO zSo8>kNv5BMr9l${N@kZwHi#)K8z2EklktDF&|lL>?)z{Kz$WxKj6w`!7}IcHfmh@H zut$<9W~BT3PdE9$Pc_}$`aKTM$a(ROkGo9x<_(=Lhf_#kAZj>VpY(-w9&hD*)^Fwu zU`EXX!rC<=8-;%1J>Ax38v}H9btMMY6gZ-d10<~Tl9+0h?7;jYcbImE#H>~g23p|F zYCY^OSFv@S;b?{gSkx^RIT*j{_@er{QrQq0U=VBxkb(pu01#0Gge57SCBp*~?e+Tm zf1|vI;rn0C^i+iW^Asrc#o<-ChRbp1T6|Seo23hRyVR%FUYuLhr86^ny=LxpcQH#f zxyjOMOn7V*Ial1U^;cPl8iRE&*kiAqr&?xC5+R7eU&GDU+E|BwE7w$cB<PuQ$d%vgQ*cHDL>M5|7*!TM~ENN9BlOAwlHoX z$404V{J+))o}2yXd%$AASnA%k*4}(yJzr(|jK!(*gf`eKMaav`~8bnW;rmkx2pXor3BSs$KmC#)!Pyf3?P7SW~AP4})|J zH$H|2XJ!cStB?SHTAtq%@%jQ;z%=_~_s6tVT^%)5RX-!YvU0d@BR61tE=CK?5Fo%# ztZQySV$}yZCz({sgcuMv(4%9D%Kv`$`Kk|%Di4m*JMGht9$Y{eS;Ir1A?`SJMsMfR6EU)SK^ zOL!l}^}G6fE}6>A}aJ+s;Ww>Sc)Xg!Hfu(m(Vai zH33ci2|y9&t;JI?T#;y1Lzy1YQHHy~{vW@W&!pX=(-H=w_ZL8O?>tI~haH)hD#*pU zWXJ2*>45meoojJW=Nqe<9WXf#M{qj<2w^ct+;VMpY+x|)p*jQ?+YXBC#G!u%oj<_g zi3`>SY*`2bY%(y1H&bD*kMrT*zD)4pSpIqJlfE=acUSugE#a8Ru0jWzBSY#!(u8qB zpktT(I}`W~z^TmGAL zt7&bP*=?WOh#?^%Az_GN{G0g}v=JLj1UP!z{aR23J*R{3+l@4xLh_08+&!whU+;Iu z4haV2)0?#G6QK<&H$tIYS)?kwce2o@aFCVR4n>f!wJoJ&sNVx)wZ+peYhO7*q4a~a z8i>r1jrsKwBuYJ}2+YOWyBnZDSF4;12*xo0kb$i!u!pTPF=uO72txI54YNs^CLB!9 zJuypM=9DPmamAuwYP-0*!s;51`7!-B1k2fmDFI^RHbf(!RV}yjMU6gly;=9!Segf- zLzy$`*=`jZhXv`7fHN+ke zfEbB*-JnWvQjCXLwlPF2_ao{w|Lo5r75C=7Lpr~Q@Gn{19TnB#t^XeulYs-OQb=x~ zHh{({BP3u&iVPSEL^wi#->qrZIR|bS2p`MkJW?oBL>efieDPeJ!f=2{2>^rwOfgVu z3xf(89ZLwyqgbO=#q3xk~jL^59Ygjl4P^R4)9VQcyo9Zl{O*wOFK$9 z5$uX{MK=;vCy~S$f57H6ocPe53|M>wy8m{T97KwkAQw1@n@;vvFL)NRJ94AN%MxJ|DKc?^r1i9 z4lqo|orEVCW8)}rf-X)QV#=&O&aFB1_jlFM9kS5`Bu>T$5)aaUG1Oth zKYbdJcu_!{WkV_~KGBmNv^XXi0;H%_go%PR1GA^=vd9MA)msVj9coe3DU+v_d?F3~ zNsXf6Wo%sMSkg0EoNzBg4>X;bQs~$zH|m5tHCHjNI$f-Q=9^QHL{nB{=^zg(;2pcu zygNMUIL7fP?cb1J4i(H*Ow)oP?9TQchMXig)+UwGCd)Pa;yk$x*S6FCSYc@ zOK5|niKg(h91u=%Y6eeNg?YBi^ifD{)ko0}4Z18=O(TE<4~v}3c$*sI}SG_ z4*lrjjd~N8aK0VI8ujrr1EgLG&S<=qfBBLh9=~u0l+PR$C4fpL$75~H=B0| z(hwo8lxW8R8-dSCc8^KITyL?*+GlRrcsV2}KxaQl%miQ5MJ zIN8P{ph>K(W{4&=%XU;Jf-tBnRwl}hsnGC@frz`L0N+j|K(at6_g(MHdqd09hVz!_ zxXoIq=tF@Aq@qON<8!*ma#oeQ2?a>Z7#cV4*C~{|gJCCYQv}-EAdyg*Bs<%IKaT$i%6DFHG2oW&{LUWre&YA_UPdr5rWatkVV|kF>`s zO8LtX%5c*BlIo@zs1VK=?0dvSOx@)h+w$h%?RMX2?WKRH+YroWJ-^?$?(0g{m9*}SI@!|#W+;dxk`jb` z-n`^!s&RgU^i+AwENWLT2um~^2yr+R6hPg>5SfWYGKnHZffciA!c5JA0%}MAhDbTI zVG^>-wcq7PRxcPr@sJ^8D$uXuOQN6S2n8fKgjgW-my}hOjK1UF>w~5p2@CTBTz{wF zQ%-*t!l4WhgAoX|?Jz?nLK~a8C7@|XrPdzL^YwtGADdbb@pOrMI zy2pz&3w8{RRC2F89z=G>?!k1~7Xf`VSuV2u+Ulv}Edc1LFjPS+)!k%hQfO@GNuGOFK4hoelX_&=XFvlCxR z3_%!Ut7QOQ**+Lf{<`JO-oUIk5pu#H;l!E1^N|P|8CKO5kp~(G5MEpz(QR<*gP1D! z61>q;*I79g8wZgnlIwodr%~8ej0DITmzYFzz7?#+!L@Be$ZRjVT{Rb4-;gUY>@ z$6?5odU#h!dR>kxr5$eA5FwpS&3dsNznKz;mlCiebp1jaSBt8Ed7#`7Y(`37UiytY zsCR9!S@!XBtG;oeevyFnI6}8ChNTYGSdQMC3lT{6K;_%NS1P1Z>Y~_E?b(~?tvyxx zW1?!hX#tXEElul9Zymm<;hDwmBAd_b_DfGmykLwX*x?1yYV)%uZ;*U_^Z5azw$?iv z?SNJ6ATGZv_-OxccREkzr9 zFwppdptO;!i$v)|f@(@9WY!lv*gyyDh(2%wNsPm-6ek|EpY@P;>%IBINbK@_ew=a) z8S}?rq%jO+jok1(EjbzT21LC!A;SD*i0CGv4yX+7IfQZ}`~9xIV`zGQi6=btkM@2r zzl`{zp4+{|pUChsa+OYwc^=`}_v|EZE7eM@Kcdp2tf5(Zm5`NNNY7LHb6zl~zBdcT zek}IqIMd_DXSnC_hX8>NRqkAffq{Ch_&|7N2o*ICs6>A^&=xRlJl0AhR!zaFuck2- zjtw8ACs9rCFap7!q$T1=LP;UEb`Cv#dsPd>%=ep4Y}svX5(8CP*Gh*WqUe=-kB5@s9Rm}f`+LAz0lXw@=Jv|^&x zvj1aW@m3g2?0>cSi1_&;q8HEjBPU7Kule_yy#|rA4{t=pPKBr1n%dmFWUGjQ<9gNHM)#R$ z1jh4MGeA4WMz^hLR$M_&;?vyi<1xjKWk!i3PRZs=oHcibuHuxsiPRNN^G@=dSq7q6 zuCG$nFKQ;HaW+D7P|_%?fVBve6Hq6B$bn48_qWwaj#JuMDJ7_PL@IQR%adAy7C8|W zxXWuT-84(yEzF8$5~_FG=ATKbZcS8P5o>NeTa|92UJ;4GJi!HRM$=KOysK4?IyYmw z!C4s75|WG&Ck00;RCNxMp0&BiKaS@j?(yQ?DZ2Vp;zhiifKA7we~9naMEpfXDQn%# z`J6AnE+^P~N4Dd;RO{5^`HM&pZ&|to8CE87BoKEsQZ`{PY9Sbs5n&(6^R+@eKkd=f zxDu06bRTbg%{%&19X?^Lw5z9q%XiR3Gl#MP$Uo)yYB@K;(z2uB62jet%ki04aWa8; zY$aWH*OnQbcGdy}2AF%#-ocCuiUu8G&7qhX6=xp8Lr(;@D(?+sD%)vFx9!_Px;)L( ze63o&&G`-MJ6JK;VcV?B!5Re1&DN!Ta}Yp zD<-7V*ITBkH%)G^xFHCo%7RsYwCG^mvs=lNsY66XA8JtqK@d^ArVz}ZM{op0BmJs! z?+?^NkMI;9x(p9i3pG(qU;;F&^fAzhXp11KhVez{bo45<`o2FLtJK|l=Ik0F2yWoC zaC7^FJ0UU5LBsl#1^(ORHXrX`KB57jerJu1oI{=qdV&ei`HVRBAB8@TxSVX=WBdH+ZwDtyzxWAg za@#Suk~o6{P4&nI1mp>z_aN^Tg9W7C4>vLs6|e(bK3(BP4YnRZ{C`FrEJ-F#hJtVA zI+sp}LJ<<4j=r&M$#!tGW({Y#zn$#y8*~fyu5k=#;j@41?;;<1T?3Wx$(e$o#E_kX z`;2f;uvS~ip{XhUevF4N2qeV`y5L{qSRmOdNILEw-{C`rBuuk$2q?D%9lx8ydn^Bo zF?XsT|Nf9;Q4USdxd=%lAqYt-yWPpoA}Xgt4!!^9x8NK*7>dgeyxCte)J0U_N>LS6 zd;QO!<2yf{Bjx_S(#7$EndUyNa$wG-AVL=ftE!A5EQv;2d>`8qc64z>G1t5Ja!HYU zN#2d9PT3(-2vG=(Do)s2WgMF4R1`)?u&e^Gs8$OUl2npt*EMri<#NHcxqzb!X(GnZ zsYGAqcMA?>DQ%cRA~JkwMUjcq3*97wr3$u`1&mzN8s!)OrD5vK0sn;qs+w-&V; za~t)|-ng`%x~qAr54-fAun-}`_6XcJA4&R33=$BFgnoFj`!mhBYWCx$yB~gm?>Dcq z1Kj}Yid+H-DnbH*P%#-BWHSYjZCM;J0);LC2r3?f1Q`fL^~V5=d45tt1R)_I00|_L zNI(Dp2?+=RB!~VE=?MZr|7_v`B!nb{fD#fwkOBb$1SBCK5FiA}Bmj?BbbthsNJtVw z00HNoc_0BK2tr8!Bp?9*gaD9|5Fh~nI&c605)w#2AP}9qySu!LI`D!7gpvAuy0NLZ ztokq9{U7Z9i~j9?&+A=#-iCF`XkX`0Ju6W}|E*F^M+pPCi#db)b{`P-|z$r^e z+gLStGHQqx*V>BWOqp2hGg&@c@;BHPRAPY$LpX*kWDbCVGEIP7WK$aQtlbKT0g-8G z+KQ-FP`pAfBq$KRa3E$>d6Rgb4xkK8s7}Eskg2KrsK|gAyDWLbcN3Awc@VR#C@|x1 zmsCz1>*60zu@B09^hFeCw6?2cpwt@Cb69IuQ5cWZ1efqcY5Bc?0cs%SG$2MmfJm}> z&*&Gt3=hZ4&%>fT=S)LA*UO=Gb=yH@045;)%V^Hp3sbXv}(gN{4kB+a;R zcZF+?FO;$DSH9)x^Eax=&BQ0YK0I4|b<=Bk#E~<}r0%Zqmgaam>W&{|an7uHdf~X> z+*ayc=5*lJg7;7b@QxOqMhs0l4Lpj?RSu8ssq zIJYBEgm#QMEE%|=z}c{pfnZU=_?cOck-! zefo8sdN3V+9VilN$)MOL83A~A{E_QDX0W*h$(=QVVD=%h`&+9^)VxOaX!VEm}~1ycNCxzYf5dY zwyS@5KE>m3e7IgR;=^Boc^>`>UZSRL?NonHb-yjsRdzc#lQ*!RN6=cqB4mL1pjmky zn29__c0xf1`ec{bNx7lDMs<2)ujD~pKGrxMNd972NQ&g~-C6t8&oL^;97VybgZ}sR z5@~9UXNES8ew-Q5%bXo&%iMa6x1gUI_;~Mkr4MoBF$*Y^xF_r;|Boe;L7}11FSwcz zbBe90ZUu!B2>Hon{~vyyhU!bzeC$_wIfUF9h`83KW#!M9&pvyBpegS;e<9_g=!kl5 zjlt)dRYdz4aJQwb?rIwqTsIq=n2Vv9UtL|X?cZ(nLPY>bq*@=6_`(Vg*$H1j_97&{ zM!)Hx%w9?2t8)6JrLji;`=nABSawZNLBA(xIuKtHxx5 zgu(N^zJ!n21kQ7l2f^fizNR>L8eY-L2UpeG#PC%O=O3r_)UP4Q__!4vca0D~JQU?^ z%MThAaSKB+YN$qq8;1RQ3ZBV1U5*K8^J;krBBEpjLqk#Ij%6Ccqkr(Tb6J=(V3-EH zLCFR+2^6S%Vv0(k6LcN%d}{gK3CE*__8V08D{u`2x*cIrldPcVE%|+adZ6A1k*hg| zu>siPh0@G;7?=7-$%fi@8UzU%`N25#Mi3KVyKF~PqjEc;DI5$=6@C_xwz8a<>(Z^0 zsMlt~OY*mA;Gb2c-jgzJIQVsfKU;3st!b+I9~t#Ph<}?Pb6wk=t~n2AeGg)r`s@;7 zN4iY}iE%~83a%kL6Cr)y-2)soK$JK=DP^7h4U`GVArbG{$v)X?2KJbVm~+AM&LGP8 z9Q+zi43?|aUd!($w%0S*KkFg5|L+5t#=QqZP={0tlWbeY%21UmhP6_ngy6@V8q?HO zysEm*cGN$!!ual5^vc{RVo~Dc6;F&kfp1s;1Se?B_kq2oVK=hc_qwIriB7w($M>pMH}*(K$+-J&ICtMH}|P8vbC zVTMuvpC{z`Epgel)`)3|02#XhjCLHT18ga8VG`YiZ_g=i5qVxgyv|t`RJk4!dhVe4 z8lX&haIV^xDi4UEIr6(RvVY;u>d~&O&{i@=z0hR5MBpgPI;gQdw$!a7+L}1ALS@<( zM^@0_5E+9UrgafGk#vM29;do&R+iJ>MGY}cgGrSU9mh&w`w0g7Ne{m|gUPjizX{cq zzY%<3irfh{y-vy`Y;sa88`D``h3xzABEfxldOPcjR-mk-_f*dpprMLISCN%Ba;U&+ zgJEMuneKR=VE0rB14BU-6L=7E85%X*YQ~~4hnBj)XwMcw0eVYv2esUIqfM}k`q(LN z4yVeW52*V5LMI%!TE_q(&SWAEtS#tQ*Cr?hb=J^`KNR*AUg*tQz$-Z%wKto0K-4X3 zkYSorLq^Ht+@~BK7pL~)>m{x8jE-Vo^Qua_f|aQ=jO*{bJ%>0d0x0t#t?MMsDZ&Q@ zln*h^+XYe8(~0`K`?T`$J^x9wAo*|0O~$S!(1y;9=4A^2n+;_fd3yBqZ^NXjro2U* zMXLd#%{jJn4@Xf#gC25F$X!tE*KRZ2i}iXHnul#zn^{kt)vU*LyUpf#y|5a#BU$`#T#-P?w-;xHqE){3?r6CPwvH zqjHkXYM(jaK;C4rcx`J4G^H(o(c>|-1dhm4zLIdt5UE2$L9KB`qmf}baXgIjw9Z9{ zmc9J<@yOkdIY$jsh8P=2?%iLavPF6!{RKDW7lfl1WQPv(Y4sxSGbX1ijZrVn1RI_h zXjEmEZB>+}@%G%#l1NAxtD13|7g+|NNRi_^$_cC--!bANqWEfQDia?D(MXw`?3T(k z8LyMG9cjQ^RpoF}XdsKzjjycxJHO1%zMM8-+Sp;6&Wo@O(yyndWGv|0WtGn`ezgqi zmWG?ANZ9T!FKh(XXEbL~nkS>_0qPbIEVrVf1TfXABI+e?TQibR&dIWHzKzdeTyTdb zw)>c%=t+_Zps6I;Qv%7>ZKm}d=J9T&Tc={h(VM%LESeF3N~*(vN`-8WLMFwKb7|HT zH`*Bs7Oe?jqp^)caBZ~}NS###30`9-SW#2!Uc($#LxD( zJdrphRTGZQ;Rk9sgV!*&1nn*~u#AJWrKhAT21*toa#jHE)q`1zBy72ZNR(laydiD|pHz@yMzI*7j@BJ}$YV zGpD3OjyvaGJ^y)303;X($i{iux^3o+lpNJU?0Djo%8G)7%S(H>rUoW|Q@B8rw1G`< zR2x(qBHRjh0;ut=J^HR+AHE(MJ#ktlz;*Mp?740* z&ETV9q>fPW?VU$G&T$S2xwdkIXs|72FNs?p9HF?Q!a;{WeyI6Rsom^+v4kNF*R&HN zbv8&OF#R6W#rAKNL*MTy5#R(zNum0;@8h|~tL>~!n+I>h#CDCtu{xfDg;axnU_;b( z!^*Ma>6#R`%LISTbbKGVw~?7!NalhhAD^VE)W4yR=`9O}`H8&t|9eOF*YUyo)T8&` z;)hJFZWb9EB0??4&@EJD3oO(Xl5JZi$8z5ymBXlsl(hA0GTLIIQ7PY13Kq9ohbW4w zcamZ);~vGEjc$aVUTbp`i94uzvJ^w*$#bFzR-W8WR6?y*m8woeFrD59DHg2+C2rQF zQ&&=*?GT6=^%k3VvF1dyUZPc_aU{$w%uI{kPSFf@oij#ct?PI zFWbmtA&JCp;Ty-X5Y{p282R69kAgpV#d0-Wql{$e>?N`X^Hn8RY8r|9@?%KKN`V7Y zSW;L_QsUdRs24`=*JHdUC;Jb}S1~eqYq(H?jn9}HiJ6ow`aenNk?}Az|1WF^LJ%Q~ z4nTHx*>hi;ux640w+Gw)d$`St?8}IWVEBmpfxHjQG1pvHqHN_C;zM4J<#gyj#A2W) zS^Q^t_!^k$U~fc=-sHP3<5lP!qE4Up2iH+HFm5KL1EA)GhHg-hZT~VUC_>KbBoaf9 znA-W$dDN-VP==BM1sll1hQb5U4B{ zKJ={XQuek z;@d_F%YT)I8e%P*v(6;^g!8FZ0$OJcipIW0oDr$$iji|MG=FnlCl+&v+6#9cV9brBNmN%NeQS>m&_fG zOJ~eu#9|mFU(8~_iEmPrD=%SMLLo9~2{!$ZQGZ`fY%mQ^w}0N7-tV+giyYN-%0ybf z%l>V>zs+s{)Su>@;RB4rZFx$a5!~V5L0|cL=$eapf>z>WI|o|U!@HmzIsyN@gg&p) ztw-wYm+<85znTB*R1y2z)pY&!dTG^Ps-;pt8tlL^3J|E5yT!b4)OoD{3a06 zOy}#1h^+^qBql@-ggA%k^;esMZdm({`rn=YCfvULn>Lh9&jQIC1B(Wa1`vlyL}-Fo zM4fM9pV%j_Z!RgR+5=5FscQVA3u){=EPc6cs5I4~qPhf2ZUgUT1T*FQg1U+J3A|4I z;F@>rR|yZZH;m|N@a0YhzgR> z`rb`BxWBR55b=XT4kRv(ite+x-_|kKF{aJ-H|74$Yh?j3dpCf_Lw0rcV#451Tj<2P z`cgN@u>~i)p@8k}wo@lu{vQTi>{z%Q7#gzk2m8ao9us+9_h+FGI%C_TF+-A$`_1q! zQuKGZ5W-e!*3u(j);u@~icG8XeRS!YJUuGO_SaYU zdqdhqM1)aAp#YO<`di|qJE($ zPC{k!pU!=JviO4*3}DPboHn~8KJmv|kEG}$$fG|uahnkHZDe@}JUT=K#JY0uY2D2SCQww~rh039hHc<-TkK$}%d1hl+*xl9rUtOi!Ceszh@{Sl39*Mu1AjHKf^P(ejVw4)Ca0%>^MUlWZI;HwNHM|ph?d#T*@jR zuRaW%NhiP_7)2kb8ldqvxh#fG+Zc2|GEk3kn>M7=Gh|F3K&CuH_HuHJkBpE4fl7iOKWT%J=mug&1VeX?AbU?~pkQB& z3aTy_`cnP2_j)yzE%(!Sv}X{huUUD=hHE(N;!r^9OaSsbr~E?M5DtrbNO9`8wk%d_ z%SIDu`ml+vrm3N?e-Vw=F~WihnF$Vok}DMZ z-s#Zp!-+eInUEv*?T))`MTJgv{oSPrT683ef! zcNh@J5Lq(QwYW;U+FJtoXPiqs`tR`|KTB*(4HgeIZDSvzvktG0g=c_zykW*^B$mSO z-|HhKB$Ne8HnpxMtFEW*+jFCbrH@IE-?ZL9pTBrF zMzz+C^c|@pDWwM;e~*=j8|CC;lQU-sN&*+1l70GRQ!{#4Z{1fpKN7d$@xzCyxK59t zykVIqWfswxoImX+DYVsD>Wk}Rj|*(ZaJ;Z*HkiuBJ4p2#NNTjOYl`g^qg=!zXtDnk z4VUyd64xCn8K8hT{lCki3)*x0Pw+V&!I&7EdfadTN`v4%?~oz?4<8eTJ-V9?{?qYF z;A(4S^nGf0L{s|U>9MKMQDh2hyy!qOd}fR32~qhbOAc`5g|a4vY5w}hMJ6~jmj~g^ ze>wC1mG=i=Q!(ZY8xIox{TTNc(g;Oc9NRhcWFI8&vs_lfJi{|xj?C%R>t7$jf0v)3 zqlC`;hU$v-d^FIZ2>Mys9$b>SLD=C*yoDSBHG>M7;RU1bhXYKT*~f1BDg&*vqR$J5 zmrWp~QA9;z_u24gCnq=&wBma1m-lhg3{JlrA#dE*J6Ht~b0AJ$WMi+7O2(?1uq!PP zh(<%!er^&`bzC9P3=MGt%foWNw2WHBUM)!QA<{{zl%h3u(BJAu5dIMD_HR3FjL^NG z1o$~Tb2hw;m5apx1s4hOZJZuR}u++yX-(l1Ur!;nrw$itriv*6$eefv;w=dUA6_f66wwv7Ce;gMv8y3U{{@|uPV&j+3?7zT<$}V||CZI*^@&dZgulb3KOrWTQ}uU#vdKPEc~{nL|wgJt`={WJU%-Sz%nufh<* zSo?AAmqY=9r>If&H02yLe+k5gLv+V~DbHh+AahbL`>zPnxERh=uA3@~##4rs-9Ei% z|1X7d{D@e5$lVcvTFfDY$JN`;ZW^Pb2^f!Gu>BFAq7dQmfGnp(>IOi-)P3|ON-*&K z4qP7L%uq$`ZfgBG<#BQ&-XSTJSEQ78ZGCg$ih-pDZ^7E_>Dfu7nEyv?MAAQFI}z*a z%oYjjb6mXJ33J&fk&ozFDqtRy7&nh?uUmRXN+kLiTm)CDrJd^dv282nJil?VjIuZE z^;$a*x@($$SB+}={i9BF(0l?lbL&f;6bub6pUeL4D`(rK(Ny(K?<<&t-A&~_5;N&2 z7lh5GaZzmGWDsLR!|B(ZR^TRui*BLTZsq0kB2aLNQG{eB4hhR{w=xicjb2 zFhT0gB4T$$*O+{5=687(S;3?7`qA*o(aOW=nzn<2W{s>{b<2q65@_4ojY1~z*!9mq9m7R2 z=Ee*k-prY(t|s{e;I4R_ePxi2qy^hzS{M17GY^kt-*y~#mT{Y(4nS^kiKIxx?dALI zH|+&m!p$3XTgJYZ;u;InVLUhg`%#)IoDG0^lp-4e?`BZYu zynd3gC0A(y@khA{9cxndAJkGEi--D8(KA2@EcrMAPc})U34<0)3<=W~@&yTyyroq_ zdXi9)TqsMOQ-K1FUiz0yKB+GKAsWhk1IC2Ch_`#6%a)f&lT~KxX*u63epyzkO*d48 zUJ&R{3-gWA^I-l8t5g_ZYeSSfSwhueUUoTRH|gIFvtexW=J_a%RzFVOfHRnfDI{ z$r~EMHmEusng}W9V6olHW=!iu`--WG7^rj)l{XUniIRCX(f6c zCQZF>QI;zi>bF%>-<_6Q)Xe6TEE3JL62_6?UF4&>YHx42)cK-3d(N8pD<~R}VY0k+ zeSx=z!`yi4mEWk(0@E5ma%lXAf^;Tsh5C`KJ0I*e)m>t<_}0%mPmloI*2`y zH!5=9Y^NdqF35Go5yk6F^E<0$|z zA~u$pfEP-EA{r?6!-21i`t$=3DgnkQ1?mkl4+yfncAF70f#~ZgrfnkKaW~CF91YgT z@`>iSX^rt@;;Nw^Cr-rrEwhwT4 z9j9d}*up)Ajnz&k&+iAM^|O^3tE=jgcv;*+pJ9VUDhX(+9P77LkQm}HhG_s3+CSUb z(rTvhPbR0qaE~B)akG5FeYMXT6W6I`tnYuitn1Y8Wb9TeEPE`jyC1`NZ*@7X+aSg9 z)c_!ZEC@mn-hmZBZ?K`7)8W>-SaH+(3!A~Koy2u?UNXx_Xk%ZBOx^wZ>?YfVTF8N{ zi8AtgYStZ1tGcX@n1D&pSAqk{HHoMr=(E13ca1Bxx+K}e`tu9e;>C!Zj@SfJB*)ap zNjT8&YaOc%#i5q$sa(dZz2F$6S=FvS)aaTu9*(lev_p`G!JQn?J+vUugM*;>hOyYS z9NCb0^gfbTC6kVI^Wo}xxLU^#+hpvogTSv)K#>OHA&Uqz5f|LFoWF?uwsEH8=1KT! z(O;^=l8<=kqEYT>`u@T&Mj}B}%~kmQK)`+{KQF_x6z4Xcr?tn8aV`3?o>fnzldh?6MYE*(KCd)5UAhCd(jU`V$debO*Hr;^xh*S}FsTv$ zC%R5{9|7B)jca?7qtN|;OR$ScBT#qV5Nk{wmMUQEVnVWl5hA1)t{89)) zFs%T7+N!qOZMNC~0045g0PDNX-~a#s06gyVxbwTuJoC=r1J2+(xBvhE01oauxC##L z008dbI?<~wZSred(yMx`yrDn=$MV8F@O}aBJ)}O1Xj$`kV}Q|SLS&GVLTEM|b*<{~ zFOdf2+GukR*Oh4pyZkdSO$HQ|7(|rCp)!#qk!GkcFd;Jx&AVQi^;~7Kb!?8Q7=C(g zz>9BWBy?4e<;BPfr6_yO6&8)7(5RQ(NZ!pf1dWzBs(`JC&u7wk>0Y>F8?4{(jTPJj zx(l-&LtJJ?Ri2JuR^N<$`M*n6{=})K=I%EEgo9qEZq{+AHn-{^O5hFzT#!1;AiaCR z6SHozL-un+vNAxDMnliPJ+l_;9`#$#E(I>lW zSAO++ipHgsP0v_EDxu0Q?`aUuakfz!?vsLR@bMUCva8_L*~t_vg3+Qv%g9WK<0JxD z>5&4qAIPpXS&0UUf*{l~#lN2_kj1;X=W(Ul%ZQu7V&WwSfG|{3gJDsCV%83pTMC>s zEdQ(Lr`Nvab2xP~_UbjP_x7syKw0jIOp-BznKd&071oh7k`u|g7m;npsxQg)G7CI`<`WPu}L=hTfyBPW=-I-j=uDo(t$2Y*u%Lwm^f6)5PImy_5=Nvyj^69np zpf+#K%0SHooWrIq>4n>w38;^=ijqVJ%u(>>5Pe`eK6>Ud9)W$nVEb>1${7AKxpClT zm)>Kw>Z_*Kni#`sjgv2TyH&=pIa=3qV63*(XT+&PqBW>w0@TSNTIaXENqk&hIQrIzB#Lcp)*UYPt$B=92ax$Rqu7`-atMBnSK#(TrQ5b4g z4)Ygyn~`_2In<|)go{+6PSTje1Z!;Zx zmX$*brRE0IQPXN1V6j7lEP+i~6EBoBA7|lYB6M1)WS?8kc10?(h&mxeJuA8Yj-!ZDj6gunGMeYn#2!O=Ls@=51#&`&fU1@ zlAouy(#E}7yAHp3@(4p)H@w!{fU|i4pgAHx12}&!k7Zy=x0$XGt~N=OOJA~CyqI8b z4TllwRvi~LdavMRVUZqTKgVt$08{#*fIlI4_Z1q=MM%moc z?TK3u4upB{01bjX!GX;8St0uT^D#eQkv%EK8Z`~Cg;U5extgMz$)%JVllaDvfb6qS z+?*O;fXc#%P!SwC851ZV!i7nu!3|rKyfp)AI7_FA6J$xbqmG#Xm`TOE2X^L5Z=ZI# z%FRn;(n$$XWC%ZYzfXoU3OPSyFK*!5L$Bb4rrDDnBKUds_tnAY(y~*s^*nV55<*NM zK5ot-Fq;ghr78)u+8gqGzK@^Neb2M%=$3>LtG>f@LE4!-21NI4@q26e(5PUgV}WIb z%_~U&Xl7hq(L4r^Ehv7h`gY1hr6$j2tkx$vMjK_}*|nB&fb|j{gi4*rdWLbh=O+GC z|CCD=6l*C>-+iUH{-WB@-`-eINg%yS=C|;0X?T8CMxod%XY#bwf$Iv=!l94S~NzBqX#<^pk(3CC7)4UN8 z16r(iLl8sM$nhdIKJ3&dk^zZkB_t*=(HWEGj>@F0c>0nPAtX$4e1iX^w=F8xZ5Z^+ zA&XGYG$ACN$I>juRN=cy7v3>umOk%OLfzeU7RteOnB>Ovime>BRKIF-R)Qs57pcNR z)zDW4D^=X#sjgv*rZ^ZtzJaISXhW>LnP zrze8eIn@gqJu(Z3i7SVCq3r%S|A*vr8rl^8<6ywhudK(SLZ&@_YCnu=4^e3lbmGCE zk#xU27S$Jk)?+LYXS&R${Z;Jhx)9e3aO|EEBl^ql3b<8-79MnZ3u}Ium#1cV zJXl)Yve)O#I9|*GHD6+*#CzMr`!7N%emv0vGBIwM*B^f|z=|JRXx%p`iQ)^BolDO# z{MY9O4TG8~#}fb~k{j#+zUuoAF(QQ>l^6#mSo@$#3_45ja?FGI8RMp_tbLO#Wp-GD z-dKI|lPfK*gdIFmNhFf;EYAZEwXb5!HXk6?W^`>{&BJ6uHU|cZ`E%b*keYMre)E7| zx4>594XR01p@Ty8x$JuLB`IXf zgSPm^++(J`CaH&uU3e#jWg-y!2c?l9-Os5O#q8B<+7Zru*1p#yjPooM2N1r7Uo;_* zAtsCQ(yY&C?aTLjdVMB06V>m(cBIK{^CeqI@Ds6{I}SdLzJUQ(Nt^wB6D#WxDznWH zE7GLAf=9T;iNg@EVVi=H_df`* zM(93SVf`dXV&Pp??+^8sQa4|vy_ul*=Ux7i>ycaK*KLc0tk8F;>4-&d6^yo^2yFD?!vw(@VvDou* zzR2GV4TBppsJ5nKR;+sVh8I}nQ-Q3FeBXxa7daHL66$L7U3X`N! z7!^(xUduMka@-JxzLU6sTJvBh5t_lZk#Y%*gZmWI9p*(|?jc{%c+FU@8ryiFiwTZ0 zeW&NMZf3F_-F}nDXu`q3z*Fd)Vlh~d$tw(%g4R!hOv8`ME-XAMqB0U0jZGt1qcC$2 z!;h1zt9Lw+w=Jj7ZT_r4un>kqK#;|WoR$v^R3B200XqLBo$!T3yJ8}qbg0`2xwAFO9neU*pf)fP-@JMo|!f8(KLZ5 zvMZ%V{|x5iHNH?ZE=gS*YFdDGy(cwPYaE&19Qd=KCT75sK>6PG^sShf!GiD6j9A7ziFpKCdN+4T(%HE{6Z$S6NUZUPcV&`u;$e(z9ML-E|k66TI54nj$w z?mBiDdWJ0+ag9aLjGwnY4IL3i*(WPJi~}Qg0cGeiu{R}asCqiwGpgN7QMiS+c%}#@ zD`GnQF^^dYN;AFY5NpGh5LU$Dak6p-2J7ZXs`|>ug@$7W*!mP#056Sm!`ZmFcWr_h zqIjZd@A^37^WIum;K0j(H=c5TCWeHKWgSpf$x{+39>*JriB@s7x?6m2<^U2d`=kWFF!9-I~u4($=PKA3Pe_vUh#$y-aHo-n!GE zMo+d-m*%!1M@5OY-x5|=Tf=5wf8n|UH(>|jY8>3~DK-4Dp#=mo) ze6Ll`T>9+xRVjlpR9wr;cS%0bjh0j~q|5r7JMfJoG8$uH-pD|K zj4P(p+jFiGcPw&MYnDwmSSzo7n+D1m`_C^Ej+WLs=;wQHF$LS-Lv{2odhSAu#i0aCxLhg|s zwTmXhs6$2uxt5yCBqauxNG-NU)d`GXXi#GSU~EPwtF~4`b1ox&@OHB6v7tj9#eqo} zp8>$XT+BvDVzKNm$0I8`tRYl~Bw6XLB)q^9wH<{P-0--vlEt+9BdikS;RySP9`SRuhJcq z;=o!piI`!w9P78TsA_GUK;w*XuRh}{)7dJv3Gx}DFkC^4 zTYa~YX1ufL=e6C)CgPGw6T$-(S%*eBwk3+9=xy4tt9&z|VQ1 z+%_91AqYeh4Ce=Np>a_L|MB~9HcDZY@EMJX0V8@TLeS0^W1CwTferP0OxVJ6A#@~jOeQrpCMB6!RoCry zxV3fwXqcGLNKI0OR#Rp6-(-tw#uB~2)tHq_DOypoGmN?Vby1{WdT(q?>t?xv5Lsrd zGMJGE6kf6CufD0(dg?so+lk^4;&)Pp!6cAm4YUp(v=ql@ShOt@0kf(VEN`J|DlI!T z@NoU&7-1I)49q9@zW1Pd1u}+el57Se<`T@_)hDv&-KT$X^cW5Da+*FSiBC_Wgzxm< zqC{#Ur>|`Z=gV!q3U8yEvMq#BLvY*0Y72a;WP#hOoFGcKDHt9WIl63dF?45=449`0 z5Hk-sc#IqGs{fGpm!a6GGfl=(9zh+}7$Q7zAXTVibD*uwXd76X3T8-qPJ+YF(S=rD zXJ+Gn6B?#hqFG>2MtYNcH`DM0*J)G}UFdK&saU9@euLjd8$A|JsY$DSMNpkp{%Mpm zLEua`*8QiR_94yGE{Y@$jNXS%_FP1I-b1$w1 zvwdYbHKFV@)?jqeqLekFqb$K?phtm|&CyTSA18T=x#T%tQ;DTu9fx4xz8k|@vzT%c&h0AmM?LON>LXbCzmcZbK47^yQJjSH z$^C|YuV!JJem@No%)n+VDm2W62XPp`fy{u5KG3=+rl&oCj27frkc~yITuJw3Kjh}Y z3_xQGQ;HkTlCz9F>ed$eYFv3%W+4lR4tNm|Iy%#cYU<)U)oG$_k<8HYEoSlbIXy;1 zqQn@awzAjQWjS&t@f=}16d_mFp}8m)uAZ~ZJzJIgPSOp3SU6f6=KB@3!DSYnqWSH+ zDSy%B#_Ub@@^iO5?JZoxwe=D{8FRF|D+ofM^dTscW+x7+L)zU0x)72=n~4{Ln^6i0 z&_qrmM&jZz2`B1IdDkO>vg3}{8ADdRz~;Ooff>1Eoq+zd-fGH2aYZ~85113!u#`yD<54&HdquJZArZa%+sle0)%7tCzXGn zlFWt1!goAwmy~{|q&eN6oi?G_&tFb_`T6#~J-yC88&QFyEu}hmt>ia%>J5gB1|p`` zalK1IT9p^N;@*AS^2HN%s|!Sniu2fEkb(_wq5eB1xREFVK$^wOotV45+v;INAw$)^ zjhM`5nZg4Dp@x61Jyqp^?A5mn4Mdpfi_(JIL4!K)(Q1YLH*~f47qiz90nsV z7jH>FQJvH<>1*EB!aWsSl1q+F?}SxFmB;NBF>s{^ZHsJM%pYXsky^NQ1A1V}%so7U zxwk^}R#_v46I%kxTMIw<@1ET>#g^WbPq(Y)30Eq~= zrod=a6>PAG+%vBNrm~JozZeYL0x5yf=d*f$uxn&Zt90~5=Oo#6;ouQ>S|QBZRYg>yapSS)iSNE%bjdl5aFXQJT}zapZEYo|8n7 z^-U;GR+~VKR-se7Y9kIyQixto1|8=4=l{nS8EK7E-kXN8QN<1 zkaKD%zk_Ug=3DA>erNXQK}{69fB>vo_^TUk{~-rBQ@?CU%9h}W2uU>oKJ*mnOrIZzx={w@YRw#Y6o%!9FQjrKvWk%hcr5xcMQibE6 zZ!87#*-YaWOh366ylwNxJ;f)!<+rVE;Ni z%nzdG&2yw<}bIZ5r0A^-ASpk_HAz zg9YKn1P&nDC+P|!u)dWGNz0#lj?Tr zv`)712f(&b?cTi4K>AG4y7F-F%y-EvIT-3r{=>T&fv|oZ+eKuekR;znKAtMKd@WCe zsK~D9_#3EeMV|2)3Bzt1)J#7dZo z;-d-hIirq-Kc~!LH@)iFh}v<7C7LHI@nqYrHo1XSRf**Bg8?6qO1OQNOdI+;tSN>U z_}hWoOa)wJbf^B^|3B<7VvH?*EeEvU9x4Ortpu8CJW|^qhtiwMSNfly z7sUAf{WPt#)5P*dtD+;~hCgqUYU%a*9qT`jC)X4knjs+8W~bf9D{+Zd;~sk73ktR# z8$(zT6(=Z1(*h2lg?GHW&R%R6q%1$T`1U{CL;cSm>xcA3e%a1{rm8!-i2{WydWXcd z3S)YCy=vkgX=&NnBxyMqo^Nlwth#lr6?-I=x?7CZMBV1n*5wLjcX@iujm^26NhPXS zWA5@VH2T$VRWS7WdfZmYM9vULD54V?maDOK6(e_`G+w8sYTlK?8J3OY7Z642_oP;CxT#Jx zRT@TB6jVxXr0?Ub-^XJdILE)H2b!R*x_5GiHm65iyd;_WNunk&^JHFo+ILlSnVL30 zifB0UfT7h%vC1^eNP~~lT=iDCPW(8KGo6C*`;d`Zn4|Gv!<6F#X|t}yWeX|!%>zxJLs|R zG1#Sun7i}T#)NVy6c)T_;$0s&%+5}xnj-sOY2qIw67BNKyvudlLZe?d%Q>?;>~7Dt z|Ly8?ule3zndLv#_kHpyY+w{ndXoN%MhpAZ>d4e-6~FY5XBKAmCOI) z=C0m2n};#q8-GC<|AkVrSI){s;j3A&>|B`hynK4Pl8oET9-f8iJu1kY%MkSwFhp1> z<*XI{BYr=)K0*Ej;BGw@PJsD9Ul|AouVzG@LK@hA2kyGM5T!AXk-4IrgYWk4+nz0H zz6T7WWaJ)ZsU;& z2_%xaxwL;k|G|x4hH=@*jEzV`eZ>s!37hYqY_sNSVqY463^yT_^7H*Vip(7{6Mjb= zX45|$+q&k)bjSDN&3vnN=?oxur$h+XQk+so$Y$9xNtU-~qK$pHMl1A3j*^w?tRXNz zLjdZ1Iq*>3={VCYWn++tQjhHX(rFX-t@|nG59XReL;4%OdhZG@Jp|}*w31J8vFx~S zn+B$s=hW5X+gr<&2k+H>9#vQK!dxxTAX%+WIyRAvV+KMJNhC;*Z>o#)r?ROZJKt3d zly-z2gS)KV)uzE`tCZqaR0@N&f;4<$<*ZYj2o~!j20DSxWh(1SuCT?E0eX`!!XGJB#*4OMhG(Q+ntSIcpr^HFouwH#vQt~_ zO?KlgeKL%Vtx+5K8(wmU4#JV~!G?2+K@#H^i7D*?~KS+b2Ws`}? z2?j`QOth(OcQ38!<7xP>OaN#g004?0AOHXYB$7!a?23$_L$pvIDjEi?G%Ad<{>2I< zUG6}j>@>*XF&NIkw9uc#`_8A){l9nD@Q;N$SL5`sO5nuOmmd-h|vwas_l`ikC3BKX$}6{_Tu8YfjN6-S}ccY5`g5GxRbL0poG z`qk>O-?iFH~Tr5(l>JkS_`Br7WWzu0FPVl`cI47GPlJK!XFiNS*9k>_hU_dYuxWw_ zp2B-ggV-mkF2ni%Y2ulfqq9Uh+2+uZlemWtYn!;B>m_4ed5_Gd4CRE_Zz=`sjAAza zxgTcE1hNN~X8=|#Y7Dp6Mm6MwVibFiHNSebSBLnJ^Y~MgT5Hq5e4>vN(a?QJ+xL}~ zxz6?=$4@s+{KuGiE?FH%@7T2~He+Ga%fn~x0z}a{OVkIGOzf2>YBn~vfsIo&Fwq9D zyk~I{zf-7xKG^?G<2%y*Nd4Z})Q?B)b^>OH^yQiA>@XBqKJUGlW3dbeAdO0GG^KCm zy1T~hZ!OY*K!T8kL_R1O53AjIQxIungBK>Gsx6JOn@YtR_vzaX0|FP2j)A{d^nXqk z|3m*rRMzK|q%DW4opsVLHN_;Abr5ybe%Jp_b>GbK!QAhEu@iEVg+Izhv9)CUpH@ zTqvbSo;2&mFAATz*E6`@xY=FX?)%|R`Qp6Qc;k!7yz)&y9$ z`F`@AdFC&DZ+UBv9NB$@-xtPGjWC}xX{cZr*lMwScl@^Rgsw0{!&=Yd^7s0m*?%4V zfLo(x`enI|ozoi`QIe4eK-(&ExHeb#uk5?w`G05hrs`#er2Ea9IN83Y?BT485R}F~ z$-t>>on%5pwzHqF7xvt{;80bn&(7&xvy)pB<>M@3c+Y3+%Vm|Kpwr2~>33~Onb!We zn8$b379K5JH57Anx)F_yyqHHm5V06|vwr9>c%hoM0l{)B{gh|8=@HAjQ?yeRubK|- z7i!_KxXm*vrtbl7_T9CN*{v!OS}RPw2{_uf1pZ?+RI>K69Irou=9LV+9$ldS4IhzD zX$Zk;G8pC>W6+upgT?c8@^HuVUR`lZQnaToy5gT**I&qsEwCLbs=$=IKMXsf*U;Ah zE5&0EJ5sFd?nO9JS9=^Nr!QxsT{MMR5z7^4!_E%85tK(GVMm+UZ zhu@3c@&)z>^at7wOX>b`o9g7d_GjHF5FkK=Aqs{Khh(H1^Fy;zOIoNRJcYk$e{&5Zp`?H6hIq1$g|$ky73{cZaF zwq2`%`yQi5Y~97ed?5%z5QI9OMG1~K4P=H4?0t!ikBiL4OxBnVJ21x7;q&r`?udF? z!-I#bxV!uHc=~+hZGZJ!?fWs8bP=2evN7|@KRGiKLHv-;gPGu%xm*3bjjd7%^)3QS zsYNQp+m%U+6>aNwu{54gX)2;3KNqEP@Q%7j>b8u82X|eO^VvJb5*R`OncW7Y_S92Z zlaO$Zzq8fCno+767rY+OC1LjsDDuxk3;0R0Hw^GgP}91Z4=z=<3ETL-EadbEN+2i1 zoj2b|4(uO!)NKBZNuGoT2krWI?*qX!TIw1qDLTTRph4o|0KJe5J?MGf+WJn$4@yY7 z+vtd40ugVreX2VJb~R)g4@wnkw#kz^^@CRgZpN;7=MKA+V*%E(F(2zyw?zE@e;#c< zI^(W5ZH)EjhL-F3T-u=JY~xjCe4P7ij;b+HSW!l+Zh?*U+D^LG4^=U8`=}$!Sb4b{ z{CwWnp4v6v)5P29A0xA-QFv&iIX;*iJEc@dcB`Xl;L;>_KddljY^X;&NQ~H!uGI{Z z@vo&kFynZYwfDi_k?MxhQ}8JZ z7Z;fc^j*&;-?P*`bcl9ea6}3SU*=!gh|QR1_)@$(uq`D ztd`PAV_Qukl$*Nk>8S#kNQ#jnF@fKSNVgi<3i**4j32( ztX^b3)1dPZVE}=HDX|0x`&9$e-6QH)edN?s+iE^JBawh7;6+IR^=V0|gXy#ig6JX{j89)B z=zU-Ad$1N->n-p(!>@Py@sy9kt`Ob-95FI7ZKktB;xBP)N;gxw$u8wOc`ol*D?FthPqW z_AQFti)E_Csq>R{cD;LWaQQVF4QVn9ta!SIm88iihv;`(lHUVuc2s{)naHlUlpcg) z?HGDTj8 z+yyKkZ2iA}?(ZL6zcc0hzb}`?{3)?;UA|afga3E-(sWPk4=~Z=*|6{XKR=`RyF7fW z)!cP@XnjOxpjOEJZ<)0Y*r0?1_-td}vdI!ek_0=;KEL<~Sas2q{tz~HxW5PW|1`>GCJIg{EEUo0 z?7M+G3Zam7Xre@rVxgF#mn{g0h=MCiI`-hzYf3*bb#q79F9DCvpN9nStRjpr1+*p$E^LW&p+k)t#UIG>-zZOfa4I z%y!=mBC))(WP4-)vMCf;o$+vXoYIYFb;#Ss)!Qj;uVqW+wxF<&hxO6;dvfyzKY9PS z{&BN_{}18+of9@{5`{?r&QPgRSMJqSMR30)CqQnxv)PFHx()1hTHXRpz^5l^&!Qc5 z6?m*wRz*qG#{XYd;&Ytw!0GG%mtCfKRl99M{lDyZdb6)ajP17ABnGObsp-_dQ01^a zd*-h?3#Ts}CT$uuD6mEGcqY)aR8CRq%{-J#DcRCv&kO#v=|4Fe>u*3>BN&K`T8*}h zER88oMywQ5Dnk0XntEpxLNL34oa1AWylyyYRCh1Kf*Oqtg`_1TV(mZ*e~-DKTrahw z$ojryUOCc(n%wDgk#tR}F1YTvJFf1!fvUh5;2UlRZF2P$+{I8Mgl_y#S=^>CX*y)K(j(Lme#pz zl$&m1yQEeyq?;kN){6+LOG%3w@psR>_3L!Jks_Se&0bGk(vhN5Wr=FhW_NRFMJ$#z zE<1Ni57VqBDl{!^j3pFQ5rQ%Zi6Da1r7F-nr2tfMNYl1q99mjYKr1YxBxPcY1t645 zXayFDWoQ%sNGmh~iU=2N3Oc1J1%L=!2}TN(Z@hL@3Y{TN78kCi1i?$)G9oIxs^xCx zq|#-M*aAr)qZp7V2nd3LOf5w+`s(^uuJzu!?CynRtt6F6XP=L&8p)+CQgBFmgY~1! z>id6CC+iMM4#;#7N3wR+5;jO9BnJnnENo!U{{Q?b3lWFDc$9Nh@);Qde1aYTM^qF1 z3_9_wNJdEl^|2d2<>mX7WWniQ&H;M|U&!^->RMp-UK*W1(J`1qScOFP8q|NmD{pLA zsc^r~-L`OhUTN}p)Xg~QIC482hys0pJdSxsEQFx)7}_FrRt}r08ubmhjl49gAmWUX z;74fgl?G{{fHjN2;PoK7JZA@iL5xJArz0(7$me@@;l?P?1bh_+gZD-u7{_K6DJSoz zBe+%=L%c|dLP5w%MkZJ(NNP{s5L@1gG8%za6Iw7AG_~5_64tt9O$@~{S--4gln(+> zd$N*3L~T19b}%Uc1}n$YSjoylQ0hr!>vo3BAxKCdfCw@`;bDGsgqKY`=>hqkNP_iltvNdu(*Drpi)7Ya=dFDz$;{hZ|5K>fuyqioZy;R;H31$c# z#6v9M&qdGp!yyVSt<=;BSOMe)FsMaBLMjh!R$*K4MH{GeGJ}v^QvqD`TP-5xmO$Kr zYT}YSXw8hWmZeppmt8cHD+TQoGHn78^#%+P zhUW_s$Pmd@9n*Yt(F$~jgj*h6B96)ZM5^$ZCNG$wCZkeh3uu7;$A&=iD15Ez6) z5m1k!6dRTuha>4r)S61Bhm9>g4i@eVi0m~;$Vh^*BN-A95XmYBxCRzUXUkYxduz2U z++eM-L$38~+iY>0-*z7iXAK&0BH94)+ERAEh#z1isfS215zQd|HpaF0rR2YqPJs7eY@H7!DsJ^|+g(pq5aRg6V}T)`H<-+`p? zzyr){^%C9=4JomYzZ4k!?X)Qv+wb$qKQG!nY2X?)df1r{e)*6*B6ASvoU8+jA2$!; zClndCvk<+{iNx6`PV@8^^^n#y!{7IN?DPMRpz|rXgY*_BSFSLS=pJL1zeibv z9aKC>ztay?UqKW!KIXj9l1UScq7A{x=hln39l6NH+pJ}-Lp!tExbeKrW-6*j_{%gw z5a4kHR6jwEkNAEHNiR7TV68A0OmQ)j`}($!Ym3?6U}Ip>67{{Up)8tG(9Xt^HrK*4MN*yK~}ogHS``A)0%?k;Bmp?|K}VyVz7?WMexZLPA0r$fPhNg3R!M zjJg8JOTBr+Rf^gzii)FHq^mZmthTc^`|Z^wr8K3Ps%5lB+7??zWM-)|TFI?dB$|yC zs?B|ETCdeM{z-_0KdmZZg4n>Vgk`0M7-aD4tatc0yl*n)(qVL{CmJy(O{^fGaRRBE z10*xCEo7v*CQ%#Cx<*$ymo-(%UAnDYjiqkcmtxyh)RJV{nIVBCVPX}HuoY3H*ybyg zrmF2-w(D04=^H&sI*nEN73p5`+wSg?vk)5F@jlp!3YbA72j<|=ErA&U8zz_2x-p3_ zj@?Rfxj@1)(kVd5w*sRE3`ic&yQF$P4paC|+qg}<;PCX%_%HUa`C0qgqPF=Rd++x` z7>qI7q2G3le@MsvKllCn{bm>&^+eR#jcwbWEsK9rZ%69Y?f;qA$#ybHo0ebh$N36B z0PGpH367=^c=&jmxteiZFu2>>3)pHNbUPCIcmG$5dCm3^wTApY{~yJseggkwbly2d zXPiE(%N34)S@$?bDt4caWjl_Faldd*bI&lAB>{E3J~$K zpf&|0pMW$r4TDiOEFwx)NLSv6?n|US2j)dQICZc3Bi!|LM$~cY_Cl!D-4?l0o`0OA zc8m3Foc{)=;w}-}Cx^PwV}A>nrgs82i!_e$(vm=k{_Y#Lw0I82(|I$go)_80%T*j$eoD zPxR&CyMKrCboluG9$(Mp`TZUrqmNeZ*UgQr&FVvQ5Xm3AuXZ-*o|(8JSQkpv57`g( zKu=(t$Yls4=D*MolCo%vQLpBFylk-_{kpeDbii+%?i8l=*k$K_*yF_CbVnr7ON!pAGt`293N4pyDlx@e$WKzMk8JB9E# z#DI?CO|{*L+>SAE-2sK3gG_p06G&-LPD90}os0uSL?Ho|Qkpt5}H{14KHogFbs z|DM0t+MC1kpW5g4a(2&J=?H2Qob=XVE=bZ*DZnO8y=>>QJTc$02&xI9eL($5j>YOO zc3pH*a63+=E{u{erl!QOF3F-(ZFFQ~5Gsyw|t>UOr+h^@9;6a2wxcR$% zX?>vsfJHihhOkcQk|*;^kcqk|8HhB(6X}CGsOA3u^I!g8I+0o9S%r}12q&T{QR<`Q zgS>`@++~`&b^BcHqJ_auoBbI(WQLK@>PPp4{q92J*u-wGRdTP*(=T!NlBDq2Q6mYJ z#84O42~YvF+ep-!we3d8drtE5F}WG}7);v4n`pfioo@C_+Pp!4Ylg%=cNrS^>=Tm{P}+W>Bm0=<)1{TFkm8*9cqq;GqZ-uGL_8 z7B-?`O!Uq;le)^RV6f6F+z3L0;Gf;#W9Xg)up^;VBLdcI4wp7bx(u}tV+f7~Ntvz?kR*GR6EM!b@i&ObK^y+; zhJji==t;2ETo%_qnKqNi!YAhQM61ioa|{${g41aEvM`boMiL~4hBP^R=TR8L8lBzy z8?5lka5#FbxIZ9xYtJyAwf3EXM1|2)B0b?Js6G6}A1uj#4f2+oJ5k&_q?f{i#?uoJiFo^|u{F4~i0M z#lS$;B=ChpwmmUQPlAO?S=aO1$Fi!;v{$>fmJk)s7}HJkWHL-dMoC?RLnY~do`og2dLY)K$YB!hquYO;ntj3zO0w03Nh zG1&Gv9q1+~+}4UOqthvS+QJKJKh7^?1M2Kui(GJ^%=S;5_8&Hh6TpkkC++q%+3&UR z!8v&`+ZYi5)6-I{_Gr<0HUj8`@9vyjUBA02<(hu44QC?MS%Y;GTrs?*DdolM7gMM5 zr(CB*qQ0phAZ(vzl&D{RQVr6rki%RtWTe77Qtq6d8oJyVhxtD*+9SZs4$Wg=?AAC%sn z!h*p;{$k_5wf)>De>qP5rve4epNaEVv%f}duDz@ zg7oAF{scsk8%EC^qrC)>ebzbPTo8d*hCQbdx{#>i)oZQ_sR07yh301uEFd^+_F z_T@>`kpfLsC1UY*k8KS z&w<~&%=hOU<7T#aMAL=VtgE0#D6SA8Z^}>c2k8Ei{{$(&twB~l)|ItnDc8&mc%4;$ zbG@-eGN_{wc-Im^g=MV%LO$~k0@Ju?e}1D<9SHW#u!f9Q!*w;9ej9LFC0!`#0?z-c zLRf)hd-k<|&|IZ@+jt<`6 zz1!vVeKuQRWfLz`0eBPABc|luM>LZbM9@XBauV1;ZMCY!L^O)@3K6YvG= z4c^0tP&MUYj^a*h8xy6Ro6g8F?gj5y9&y4)qx6aZdO_qvr>OC|I5dWl-exdJKqP?~ zKDfvrMa&GdB0>=P#IlzP1zL^+kb@(>L$c_6#2E>IWQIs+`m#WvbsGI43QZ@}Jy2~m z-G2f=cGy1+AVIy3<-0q*er$F~ehw~7NiQaJq*nzqoux;;*}4%E;N3KE@+~AOMNG`Z zS0RWnd=UOe`7JG_w6>Pg+FMI$d3^|eQ}d3xbR~DKPX!j%t1&yFSdF8F#K_(wHqdLy zj$VR6XBQb%If8ATE9)(~6$Ii&nU2iuaVD^a2xthPAq?{ngx=2AWQ#<>5nE*SY$SHt z&e7qwMUX-c*G&BcI3NARzGY@yA{y~HkSt^-OtRZlnn4|&_ycyhg?6X{`Z!!Eg+=be zk7#>_Ms_WgZ8Kv_4==+Mn-yFfOe5c_Sr7Drg8IRJ9@Kv-QsBRJj>r|=7L?4$N>i3S z-IkYc9vPPllzHCXj4)<93D6V@k;0-Rh_sEHX9FF@fu(0yeq#@@6!&(Li$4k|H-X3` zWcX9Ztv#Wj(wa?Iz@@-If8*G08sbQIMBqWu1eVRZ_b%@=ZeZm?l--2ogi zt|(^Alno7X#^8K~DSDvX(-n!T5aC&rEfNzk@jz`-}I z9<(GRSeSD$_2%tTHZYHyAgK%{tg*`4C(?`2UbhK}nA{BFsFP~!b$lE6NO<1P z^I&;$9$N=?0GFvWTM$g~kmpwC(K-pBm&H6`(D3|an`jP+cDrq-iRLwt2oN%=B&BeD zKF=x;VD76`4i~2kJ!TEDM6n=UC!gxrp2e)?0tgw*Y$ecjgFIys^Hr<2Q(Jhjd-tvsK z9VA}Tq`ZQl@nkeo7`4l6%bcqA-yn2^{=$e=#@xN?KETHRWoC7o8*nmV9c3^oE|ZWb zWYrq+sH1#Q(eYW%ZqH)pozOuMq7-M!R_a9Ir*rQBq^UzyXw3B)< zZP~Nir^Uu02_Sp>U$f?I*(N)3*4Zh~l;YcCoyrSG+9mavwQ-7Om_%?OzMtv(5f+?9 z**`QL(*jIjgOWRXU4XVu-vNW+q4C4V4!)>Zz{l?va|+oZ+m%E2_P@y!R8`q1Apy!? z(VzMKT8zG_&)4Qw?fQ@E#yffr{4Ki4!1@uk*vaF=qdgSt?&{fFMn0}(^4yIV)Op-S ztL^lb_BNycHPXTMY<-B7UC<-+J79WJeX!#SQO85)Trifp*IcD$fw;7%KA3&Vi0HJk zC4YHrJ0FRE3||$TBw^5$w(vFm+ia+v3pb%6K8GD%^+DGda{ZU{blQ8*3hg`T;Q_cN z;sSms@rZBT`6}S|=N|&c4g}n%A~z61JsErIJ9T=LamUlxVV197W$!&V9VLYI{x12j=<=^nzS<2RO-v)kLT;C2IzE{Bg`n$Dhi+A;! zz8B-p|B|v#WE_UlDK(7Xhl!KBGM6aFRoVPJrHzHk6MK*(gf<25G|g-Ag?sDY^{*wc zUT%j)8)nA0|Y|k3N;wbIi_gubI8v;CZYIjeFyG-x}9^ zRDTw~GSs=E$nIs0cxj&Pet(T5wzNO+c!CI^+s4bT8@B*=CY}l2<>% zrr4WQe!pKj`J?D*pC^IZVMeqm_D9%9QVx2!K`E67drN#9wtgG&`uXzpT@dRjUuCvB z$IsuCo&LiS&qTUSQ9jQtBafS0W2T?N4&F#_2w}i$g2Mr}LPYm@x=M4?Bc`s|p6nvC zy4%WexT+o9c<%U31m9vj%e50q!Pzc>dLhxnM*CDr>qkd^tGv0>b6%TIw|9td;_P)M z_~XXG_CCVzqucdMbz6J)$8OpdqYYE^b<=Eh=Y5rPJ5m1MUNGBfyTpBcFDoO~bROcO z6qE1qd$`JEZGP_DYM^rSK-#M;9RHL$a5vC%>|3xb`qpaV)rf&a*&jrXzWVF<|5oyS z-Ie_E@19&m)Q^|bs-5JjqEF~M{XIt*F8`MHsIqU)zqbn0H_fPedQEE`Ub3%egLgZ$ zWTBJ&J2zzxRa{gzjVUEv?V4Z%Z`9Lb+g8NTO-CJ)@=i$!8oKk0WF#Q5*&~(_NU|jJ zisvSje!BN6w|z_2je+*3H~P2s9z9r@H-{%6nF!&xbV!0iN5)&D#@xHps;k>hxU=$` zImOF(^WhVMy%l9^oz+N!*!I!c-RLfh25RLyYDJ^S`d#M)GyP9^g8GI%96N5G(I^m{6XqO}5d=wNZf-(4$~k=4pZB(Ky-$1x-2OCx4q8qp-5Xf>y8fxg*1C%{H2!NCuvj8E>2N7GXxrbo!2gXJkLMeaXUrh-X__ z1A^<0_+8TR^?!srr+Y(7g(IlZHTK zL=FEv%kT)#e^STU)t%K}UdfvkIdF(IJhL*B>nfextG%kWx6j(8vO(3`+W@H+rW(dB zb_&+n`Y^A;-J+`OU9H{Qo+sri^}FVXLy3q$Ol)FDujT4G;Um#dps5*E(bFegr9d+c z;?3Zgx)OswxyMZ;GpoC<*^P7X_TerEnyPx&M9F4Hjq{h~w;b=TzE;PcId@fOC0&uM z`0DccYKI-0|L3YZ@w|t(ZY>e{+I)lO3DdAP4$#FQkmhKMNN>ku+R1dAwMDW_%^~^S z3MJjOTakVT?qOH*|A*x?DypfWRaH$2Qk0`AbSsA(X5aJy$95)9Ht=3t7n|kDpLJ&T ziyY_8DDWA9fY8MDj4$1i!0QRDSU_zco$KN7^Lz#31U~`#v!*lx{u^I%0PFS!?0p94 z?{gF_iUo6$&~hfjm|5-)N6v)1_VoM@KyRHwHv30BOm=m5cTZU!UTqIP^M0M@is#9$HshnJc?X!6bGmw9;$=$OAw}nN6JoJ4 zW#faqyyDqx$?l=khJjLp3D1STGtkuA@E13Oy zosPj62#|oG;Ni&4$xgU1@CPEkAR5Ql9kkYw?fe9fP5cd3eI{lMckaa6u^Kawdxi7C z?S)+j5(RmHK=}Xy3O;=MVq@Mci;M000L71NAoZGZ0`&nTLt>bxK72 zS)QFx^y=AldWQlnPYib>-RY*xd7VRCT`x`#(--S#qvX4{3heT)!chB(RNjT;D~~U# z&qO744W@oj3YpVm<%Rw+ko>NUT?vdjX$Bq%>GSmT`71j()I*D<;PHHjp-4x&sCG=4 zNUcX;#da&Z%!1wZa5i%8yk|sirQB?iOQMM(78jB?GcY%XTWsOedN~&pM!<|nZ2NW^ z^?aau$@+J9gsxqp$h^9b>6A0H*rQl^PedEjxSU9V=fVPPSJpr(?{mjDn-Vlg%b2To#4-2wG8i_?}SNmr83UM6-OE_K$F96*I702?WdCbt{H6YYKBv9d+`ozuR z$3tRoqP7t7;yO5wS8yL7Ac?s4(cS5X5eafx3_=~S?Km++pB$MKBd?I=$#!Bxr^Vp> z7sQL|t>8H4xlh=5kUo3rYYu-@_MsVx<%v;`To0~xswW-YELe23^zZkKq8W+4?ekWGG9jb0Cp;+kX8dd_%Z#2IFn(&kuV+kYCj=_1 zE7=eru!B2l%26Wg6H*}ECg~3+XzITzS?Rv&;;ZpY!Yt$G$rKl@88o|dG)GS!qS@z>c&XHgizAC{@wb<|B#Mf-z~ z$ZL#p%MTdJ6~afxGu2e+>yEr4W0~gU)p2$U2pd)#T_Ol*TGzKYUwX$|_gq*sJ+OLc zYTZv(r_FBTWuoYA#s;3cKSJuKvNg-TmMBq_vv>zj6XbXvO_h6Uv{oKsuOF196LIS> z^zEy&qhGJ^go~{DU%R&ry*}fiz57yX{J3k{fV|#s;_s}3(w{(|C_}T;(Gsw~uD~tD z5sXI^MpjA!!lGCuC|W|WvdU7$fZ}c<4Ppc)q}*#f>@of99}zHH@Xr$s&gG8Yp8aD5 z{kI$xc4&FzfeTYhd3{ zxKQXU>%JyAm2NdXqh6rS zD``Rp*NI6Yo?fdvV`801PHB$SCyD2SeRArCOTiXwx?W3fJ!4f?9cAWH>9bAd%pTk7 z?7{r56;Zb{qT6oH=w*v(;Y#bS>_2o2kk-VnrFHEn`q;X@8NU5+Gk{;0b($+r7dkC{ zQ02Fr`SQ;W)nOgCX(uNBPXObtaO|tW_U_#}U%CfYr^CZGfWcppUwEaC-1SLQo^{x# z127RuDnYBZP~KbJ+|2ny6p=4>dHj4^viy@=j!9Aytlz^ z+2U8R9AIfztd{R1JzSXH1sGq+HgVmP8#9=*JQvBuv+< zgsQeU(0QF$qi#H*a@_SOYm3>G@yN0wX`VeLwfI?g7w6FoBYy~T!&TTe5XzrTl8-y= zmxrnNcD|>_NpI_=oMh^yw)h%G+jyeP=?kq&eJ=&wBC@$@GS8{Goyz7&sQ61UmlE{(d5-M& zfW2EXr1q&sRn}Eep0hI-c0}(RKFBSoIb5 zX_?Q2HQ2{OI$Ns^idwc%tSo}KN;^p9U!}6t-xH&6&3IGKpV8AtDf)KP#=Y^SEMr5f zLN}dz#C8wBh}Jvsoh#euLMwBLM(F3?>6h2_Io%r#dAnNfV7F}W-Z>GXeWxnz+VdM- zj=%%)G2qNL{sxtZgXJTBxO)T_!y6t1w<}@Q> zfIEh+ME6ACiG|FSQ5hS>EZN}!n}xS*)m~ZEH*+)c<$e-tlMPqR!HVw=m(^d(W$hve z2n~sal`{e!;x!H*oIYnG%4Bv3K`P-jTlZx2KJg8oj5T;1E^WLYtJgYon&%il+^D85 zhlDs8y=*pUN80}}Fgl8BV(B3!7v3<<_1&SLR(rj;k^1nLIdu~`3I5GKzO&!qKC2fz zB4}!jCzqZaFr9M2=Tx9=Pv<8ZN9tks~>bV=NJ}kbzb}DEBJgYyi(V; zB&7}c?dY!oceQ_94n6K&vrLv-l&5J3`qAKy%`CpBRIdpU zg^(=jlnR}!TGUSj^`3tl_V)EtXI-)T@ts-r(%bN%vb>_v;z7+j%;z#WV^0e!?T)-?xjY7n!A@QKH%d#?xoYa=cHOrh zkz9>+zdc=gr%O(G!6q@2?u&-RS;z2(i+Z(0gdoq)Zi@L21X##VUijrBa)t#&VfJk& zWZmVghh$#5?|Mp_74~>ar4~I;nl6Zx(-4 zys^xx|29~2%2T83P_LWnj!vr~nj^E0zHyQgWXEQ8MwL#e++4DdT!SX^qzjKfRm*M= z?0fd%V`q*Pvufp5H5MF7OQKrQ!%p4@M7MWJ?%eMumK3y>8oGB#!e@FAt=+xh1cZQ`>V}uj0;FXs-{qFnK z%@@L&>0I;|n6>TM*UIS^wXHNWUF8`Q-#z%oMg|RJ#k%|GXO;{>8&p{9t7GfoQCbo> zXN(#Ui3{bc&6jSXTOTW~YFmF@Qo=O9)z=c}^DAGaH*vZj{l-s8nNMjU75d6 zR{vCX@56T;{oJFEI&_-4`!Cf~)55)bd}*p0LjH>)&T0)wx{!NVOzLgH9CmlRM8mhE zmrGWdG4nv*uM_CqEoM-DC}WbQEEe;xUoEiZO>irbg||eq`P09Y7;c()>Y>XGa1{mS z^!8nLtSjT4ke-{odC1!nr&V;G7xITf>RdL`yvD-shRXH#eD`nKS-P;pD>h}rzmsHg zYntq3#By$N^hFzZco>2?b5!2sq%Wf zt%PsYk0`=hY>WrK7)m(HG6m9&2-BmSa71pZfozK5le`A^z7XqBMXP6QU?Hrs$li$y znj(wPK}2|IjHey6lqC&VdA;?Y3Nfw~mQ*C0OnCU0(+M^y2_`B))YY>*T~xR%6B~Oy z7vtT=NgAp*fl(nO)C1WTMaL2#>5jo90X*}C(bH5|HCZC~%L3+-N`(isuL#=?&mtOi z*SQhwSu=Fx?W|hqWIFsDrcXN22Z07!+|;46fjF4k8lLTut|Yj|y64#UOEVM}Zg=FN zDfS%g%2u+Zc;M~c*i{c@WbTOrz61tx-$$pfZ1m%epGq#+li$+T2GZeJwH zcZev}h)8KWji;IHvvexGwGpV@*Y&`zTJZHomvCGao2%jJ&(dFocIto6N78TS>V7+& z^>cx^O&c2;Hz+VZNUGVu?DXft{ERhlho(|2o6ZNC4=%%(D9Igj;eN@!$1I+g)3IiX z+a)p`988lbzlyDACuwbXStxiR)GqCU>C(u8gV$!*X0+*oJP!+Z$Hpz5|GsnUluC0d5q~O;mM3=esRf;QE zcx20FG1!k@S79({Ta$8yT4_1fH(nC7mgsWQsmx|~_Y0ydABGz{r_tBt$AfS1t^CFE zhWlBw;57Ci3PDjMJG%)mgp^@Oj*4Xd&Hl@8pgQGF>bm6H77CA()i`ux=&NAr^#QhW ztE-~u5UR+2xiK@cJ+|Vy^;O<>baZdsUD4~|ADSeH>wc*0a=T}oCqGXOtEP~JQ^opL zNVg59?qiXRtm=DP*;b6q{g(EG4`fplLa5~%Hm84ygds5XR)@=xLX4DBfc}j%ocBN1 z^&GtU`5sPe^sbBQ3mYfftqv2!G2Uj?R23s25RBj9Q>J&2FnaZ~w@HBkO>g}>U`Zi2 z+{v^QDlvujKc)7$5VX+yS(A3y2PWzz~8!gd`+K{i@_* ze>4=o{ulq0ARqc){(t!pKl~!8{(X(1|NSfWs3kQ5C?!gm*L6gZ|HHmN9oNnCPyRUW z>Ub4=Yfhst_Czp1w15{RB?)0{1CLT20LcPF{k*^aiP^;e^pz@5nu*wS-hcWNiN;Nk z48=%9$wdQ88%GfNkm|@O@F0{(f6zmODT)%rqJ)Neig$g@~G4DjP0zVvV6uAs~>cVJlS|ZfH%Z zfk#jZG1R5Qi7tYl_yjb$IF8EYth$m@T0|q2F0@%$NQ%K$9}w?IWfeYBnwgqiEMpP& zQk4Q15>k~a*Ou!jMha$7)uAY?NPx*L31rNuEP~ThORyOj_^_%9afOM@&=kyRRihxPk+LgyknA7%yLQjf zg*u@212zA@^`U_HlV{}#VY`OoP?Z_WLumjj|7-T4BuJ=?coEqGBy zK&lZ>1!MugGmGQIjcykV@OA>EaK_n)Im*P2XPgA&y9Q127tl@5)fc;r9I?K zbGYx4NAC{di^~HEp7>Wh7)#l7QPr$ye(|x4UazEe5r6 zEF%bw5)j0#uk$sp($>EP+LHrdAsSBpCm_Lq$`eq{oAJ_hs;NtHdQIfY)0aw1}$QRT7-ZRL4pX03XmK& zA2-xU2RQU-Eo-NZbtu^?yv=2rx|L$^7gm_Es(tVHADsOM$iwp=`VYW<@%|@)`Hjc* zpE!MK&VA@80v)jd3W$oVfGVQISb(TR5NHA_5P%5~MhZwG_4?$p(8tlWDyRpHJpfXA zMKw$WQIHg19CYtbjD-=u=`=wY`rb##|B?6~@cZrI@2-FEJvTIWHZpIso$Grt%wY3~ z|F8Ahr!NLjnZ^F8xq5%;O=$vjmooC1BNesntw>NZQ6a#bIp#<~Yqyk{=*>y;W$GPZ9`Sm~FeF>k#s% zf3-=jj=`J?F2V@=&NL`LoQQ?Nkx&T*Kn!G7K^hTh6bd3J3}P)r8bE*yA^?Pnt=YOs zw$@o%s-(5F+HGxVSyEMLtv1xzwH2y@NC4ygC;XP?gOE^UegEbEB>#FNNBj>OxOH%& ze^)PzyJqVy+hR%SKA9a*y01Me)$N7{_~oqs6gz73WoZu;e5DAlM~64gigMW4@}Mc^ zkHruKqATdCR6stZ41|469gs+mC+i^n#gajW6k#A(kB(i3#AY~FFV5ePfUHc-tYB_G zONzI;r#%qO~4mSNV>K7@9>(9! z@Ym+^c3SkIaLvkH8O3Ks4vlI4bL+U(U4->&ufL+|tG31ZG9I>p!Ey$!iZ?{UXit<-D4jSj&VM42VTz8e3Iy6v5lEHJjGD%dsqiTxcc)?7vafdG>T zNiq!Wj2LU$@GT93UgEBkPSaX5A)f2G%-$s)qsNDTRyyjWICMea3B+Qv4NsSkxJPfFOL1X5& z<~bZ|*-2AM;QOp+Jh;m{RhCC@UN>(qzC^WgDO&(wj&mH&u?_%?M`j+~h>)3+8;CBv zdb!jQ>~y}GV-L#4|Ezk=ZScz3cYm!b5opmvaM!HPM$fnE?}lsT=FYFC{-)QP;W*he zn+F2I>gL)ZCQ3}9bWIMXjCyeQ`av2c5_~D#*{xiJZkmScm9qaVc%Ty*KexGc+BSV{deZK>mK~>In(QU+|~H? zy61i$#jasnci%oH9=hK>`Q|gvK6_nvJY4wSmEv{f4!eBjUbk7T&pUnMZQQ^>9QYp?CFZ_)72DY(P{q43cXdSs ztQ{NwAEWW?=sh#`hSK5R^=If9nH0PJs2NAUO}-eMUQv`_@QjH(qbSv8@ZK@l9(Dj4 z-SK{+OM=}4C4SB)e)|WUWV}*`N{%In)ZI*HsOoKn$Ve>b$JWkQzc(mHIT*vVAQLWP z;6n-KG4nDFr9<~6*`aD#nOepO5ye()t3{#=jAWz+z^u&3*iR2E%zGOVJA)?CKzB zT|A+4z{G2|N-6PyRby!9Sy=H&b4fGMh}W39J09xGDmKTfv$M6ov@{gtX1;Kkxd6p3o*j%Sa@LOIoNUx~-u*&=DUn9~kMb#$PX ztq#^Uh%;a{7slct5kfH`9>PswR=E2h2=LVyQ+eEd(k(}~)>?#Az}tr1wDg|Nneg*; zG;roluPeX$TeldOyjsHE#*}Aw?^l=9K_N0}6`s>m8#>R4*Bxdd*Jb9+%&I+_&YQRr zC#I&|k5i#C=;<-5vd5IN@U~X5F2Rj*H03(VkY%^+Fe^Zj%f+;~B~^?f9_weMO?4-# zMEpwR%v)2Lu3?rdn6x-+k$h|7qDuHcgdqq)$AnrCaqck=FwXT+1Jzzv-EjemP7v`c za)sh)SKL`NN6l;ojs14uG)qLD&w&cxtMfLR_HL>c*e?NQm~cm&6wX@P9N}|o+qS)D z9Jf-KD~gJx*k)wsU*%}duh-}&hUj;;4F*Xj5)g!thBywUx-Y;Y(hixYV`w1NSt79tqYDYUl22+`@pgP# zZ#B#A;O7{*Z7Jf#%*H(@#YYKJoE2I+va$tfq3F#tD~UlDo+d~{3p!_h)Xj|Wk&xE$ z8w4_-PL687+GILDS4+%5M;gI#$=g~2zhhy_-c^Kljw?>|cguTU#jncG4vmF_D`eR= zRj_Z1OU=>xczdMgEyD3^BqBq&V}wR78?}k;$r^Ns_y~P73XRgQwCJxLeOw-PX}ax? zwnGA$9Xp6YkM^95keqF?)#oweqMge65)gcHs>%+?h{MAaU zZ8nk|iO>}Zn3)&`9!egTN0|?KdSZxH6x-eXO-NhG&am6@v#C7Ie*MwL#?a`hN4mR4 zF*MVLzjW)c->`-flzikG2RRRLvnbL>M12%7DlHXr?XJ;JHf`pZLZaxw;GkRmv%RFT zI|9PAb)BX?aJckEo;I8#uD8C~trN!oY;dNXn6)K=!3n7WfV5BTW@|$x;B$JHKp44ykpmuR;jDhp(z65HL4^pv0_f zhY!2vm6e+tS%VE&AU5y@!KmI-;~EqYg!UAlvPHYYu*}ViH+k*etgm~~fRC0Bbn<(= zOw5|c6LhFQ1FxB#&GWay7@1D!=PQg#qa6dwZ=2J$jZ78(){eLkvB>m#Yx72H?o`K# zZUK2n`wD*yBUFRP$Ai&}6TOwR0+cCOM>ztp^o%PzX8lBJik zO*?_VfPdRB+syfNSHNq8lY3UDj5Z{bryV4JLL`zxiV{gAAp}Qj&)oiuIYM({QH@b~ zE`qm)=?wx5D$IQb=sXNBp*FiV2L9B0zFMXE|0pWoPt@-p=)bO{yv}Ln^-8NWwKSq- zqOW&PCiYWC)4_Y2g=!x#($O=!sf!?6si&>FcdAAR$&KuHn#+i^`Ear?bDQ3`r^RVb zw=_`~RY=vw?p~cJ5o@U3pj{mh-96T8QaZf1StK}!*5PBs zbNeki#55;Y87u|yW8%sZy-1d zHMxOYE34CK^LA$4Q_7c093>nqo$XqPiQ@QMIC#}fsw(x9yqU{ST6Wgl-c`+Rbt^ZS zgU<4|sMHfW*?WrJ>1dZU`rg#)%G*ZYaTSiLRkbO|!fRKnF|4_RYcj2wwD6;telmxOkPQ~E-ggiYgGAJcJlRv=HWsw zaaWp!b1L<@T3J)4*!sQI>F#fPy3E__HJGPP$+*+EUJ?cP; zHH7ba+TOPs-Q?sOq3!23`9s2;VNmavJGB#YrX4DKdy0inWa?Ga_F}2J?5QxbcCQ z%c4bYAj+i=s;Q7)Btl&Sm=Yio3nJ!sfbjW@8QdPEPv=2UAVgsS0Rk*B2i*%gK3QQz zn&!JXvQ^5`%WvQ6?90i*6_FWbq!fttf)Z^O$xs5LWkSlmwOg%Ks~cIpYjta7+f8jz zTJEdYhRmXq>s}zDOqSXUYFlk0+w*l2BP4(sJhI{{q%8`3y?Hqz9T~zLdXV#4uZkFjXRd91m_;B>g{J9TXFQ zIzd$3wV)^Yi)aBdh?)6)d!6sqSbF#$9%~Z$jxMm0loS6aNBg-7pYHrr0DE<%M-oB7 z6c6oyBkYJb82}U1MRNsE><`lreLiW?=wG=Zsy|ETjAyEa`_yNBdXK|Fe>rdHfpIjg zY#f2fR^fp0{{g0vpt>NZsGD}Ok|3?i?aLw=hz1}`!Vuwz6wHEIz#2=_(vLX5-wKid z4+DMooUeeIDCu}QX59(O2B?!IlckphgaWXmzPRXNLO>m2r8@~q?tnUO)>?)DVjCvn zP$~M)oXBp$xn0*uh)DtzMx={3(A41rH5DfvRAaX=;faFKF#2a{xSlI(5MVRdqcGMmI@!t zdgwsx1|ZInBt7CDxDf%EL&MVl3{YRQcv}8Rr2<#@owH=v#M!r<6}rep=H0y6SNm7` zxi0Pmk8S*So(Uue_BkMt&ddOL-SK=(Kzn-iARi8Z38mfFcS#@v#{--Wa5=!|4sZjU z0(Wo#X%bRIAcQmk&;mg5y6){wLJ$R-%7?z**S}rEwoT2~cJ8#ct12Ag_SIIkRbJy; zZ7oEXJFiV|Jb(cR9Oid$01mG#-gq9I4sbceUIznfrO_31me|@Io$fD2;Gh5i?KpPs z6DMn|hVzQOy>yRMg2_s@g)JzZ&UZk^M@%`vI#s)Ev8}q^m0G+K_Nz{uybD)LRaTbV z4$8E(C@c=Vchd573ijs(3qpeNt|?19tCg*KpUW7D75dJJ*m6rOpXCG$k1Ynm_tW1yykmARq{f5fl-DOmdZQ z9sxND9)YwUz4T0Z>;@lEG~jd$zdBMhl%=JYy?bSUdsoWoNhwN_#F8NhBnZM5d71)*Ls7lMbczr+Ak3O9Q({zi z8x1!I!#ZkS7f`A`U8uc9Rs{WvJI^RrSE|1`1CYep3}}6N5VxRmXdnnI55l|&e;_Eu zV8OwIW=_ETJP#oWtq0!Hk4zHTVlTP|H!+V^OreC4=skhy<`eqUU{DH>kqCZKU?Ss= z&H9o|6(kJn73Z)*%S6iq{1Nnol5p#U8rVz_L2I$UD3!0eU*>uOIec^;f4t`amILO* z#F7z_fJ!?}&zn2G!@L8_0lOXkgUpUL8p@h$Hf+;+{>$=Ks{3|=`c!JGYLV?#o~Mxw zn#2R2N+^VcgoVM#wfBj^=G>^<13JY9wE4Y5iM~fFTnbF%Y~GwkwG`YMAN#C5`Pr>Z*c9<9wktvb=A}7 zdn%hNOQOHuxA#9-+4&4P5YWD?)q{v<^W)_M>5KH)v`sxbgS5$KwCVo>d%kyV!cNf- z+J2+d7>Wvt#ZZe6tLg;qpQify`rB=`($%)w-`;+chWGSyCkxIP#UFoyP@O9Xt01SZ zo*RXIwbaIpZV*c|0X?uw1a>wB2@N7`9yroHBmmU+8=;DvUN%%UspI-1!75N?K zsEqMn9~|AM*Ni(Tp0@=>)-Y1i*PUC~X`(w}Rq0N4(Gd7&tt3jTmD#DoPv7i;(Kn^# z`{lFCjZmZGH@)Je2a4FK@~fQX2TQ~5jky0P8$K^wx-23^4|}>UOg<=#9$b(=No^sA zrR%KefjZoRagMbj9i^LCI%H;v zD@0Q@g|fyu)e;M5M$3lbI+J9rC3f}4EUAR%KI>sW0@EfLhA1$QJz{ZJ^a5aK_$=&N{1db=^34ZFmw?L3~W@mc6Ijs=MfBVi`+u zY!niu^M?FpStwsNls~Fl>0OHVjh4=q)qNrSmLI_NmLFl%49w6IF{1qyWqf4Y;Nbzk z9S)Mi{k_Mt^{_WU0foAU#amJJke?O?_#BNa>!H&CSkhO$BVG(&_TF5TUKaD>8db4mO(=X8HNw3kO!B=Iw54a|L*@_3?Jr7l*ehfWM>N^kiC#-wB>8NbG2b>TC z!6JcGLNmL9K>;&#qjDSl4LdlUh_vfOK2V9VN=JE<%C8bMmV~}}4Axvz)T|NWp>3o4 ztnk<{&A4-pWJr+~xi?*j!~r=BHNaea?0mzdnmt{h){)%9K4kKPVo~)Ft9`$o#?#qf z$a@6l_38a%5@;Jw7Z2}2W=!P7A(#>I^`EHtL)ag*PC!0oNBN>+@|>!n>KFIx`mP-% z83T{0oh{^+^}S}dx_5V?1--=PK5no0HPVI<5__AFLJ&l=_)S!-mva5Ia=NNis>h8~vMlcZyvH@f@vN@3xLeiA;e6jNvf)$|x>Y*y zsl6RM!5q2VaZ$P9(z-eCo7pWqcV`=H!avXLN9K>;`}>Q1ZQeQ6`HmXf zFJ0U{9y{mFym8cWlGGlzXBu~{WyYZ@?;dJ$xXfAFb(3}8^k1!TU-_#hXfD; zIR`dDWE^qA+(GJVh7s1`p)y40xtLIuh4#0g0PW0 zw6QY|@qq@gZGI_hr|8zh$v)?25?m0+9&Z#?5|!+n-HFk@VZjB0Nh1@zRzc~Z_@Gvk zy1~&{x{zEDN`hGuMMMPowRf)r6v$JsdP&z&QzmCmy>mj{Mv?@UO z<2p9Z&OnkPS>QvCJe0GHt53`7OwVZmYI;()=mpWX0EbPp*84I2zyH%&?)jUpwL;* zNJ!3U8*&*BapWIn53BR}>d43v0U?Ck-I13189HO=gkZDdS{zNEZ&Xgw5)l*E7g@nJV_2)j0DLy8pj2dq&XdcdpYy26zX~%{1>1R=RxEc2wAi6Bs`s% z$ivoUvu~97zH^A<#Oo|Zzu}nrI25dU<^h2g zL6JlBe4nE^_;k$DX*8NkqU^HD9-<}cCad+ZG(25ZDpaXeRaCmHW69C<=dkdWWPXZwXNQp@cJlaF6DgXSI3f7u#2}z}2{}*Z!O(~@mT|g$0o>5d*IJ^rE zm5_HjLy~3_oa=NCA}W9Me$CP1o%>UP{6{Kah1lN8@Iqwn0X+2zSRR6gJd_Yi%PywL|Dw-c}DZ&wGjgn+-NSP@rJpa52TioN!!}*5QVnZA-Ezdmvk*a?Uet#{zEK zcb7qvPjX7o!@;@D5b7vlA(?+T;i4MVK{>U+Y+%8-PKIb5?A94cFhEkE9!4uBB;AI# z?>J};qeP{pwPwg}1ML_+j{`TKh3Dz~HlN~Q_Wq{&C2OZ0+=<=&jPPnHe}VGxNeVUS zmpHdA%51wSvZ4Pu=lu!kC-7nk`ls5D#C_UeKWE^wMg)=)O@AB_|5+4%W!UKcV^eYN?kVTDyQQ&m+~44a%CgNdGHKTD;6rrnM61vhBMNI&6(CHif!S{WsB$7w~ z5CA{`0000100004l1LO7eSgdXn)H3=Pl9QH!AwB)~5+sly z!XIzj_g{D101@){)vN5Avlgr4SLX4v4HVCUfPBnTka>B-Xj!w=`4`tf{lO3J7;yft z)DsE)ds@Hew+HPLq&p7mm=k0BjSOH6#QCkcF^5%xVF)g;3P>m!Gz8(y+TMiU)8)5X zNEw+O+S}e8=HgeMxb}W!0UJP`&(jazfgdlXn?Bj6$h;}B583%qfTz;o{wHU#{V})n zRg@!jx1cqNhRjS2>WMnvqD*=SZN{=inw@D+u})?Kq&ZIrJmDiVcGRo3P^)Q^^?u)< z)37=OwovdlF*YqVYKt;c5-U+QK}c}#o0zr6boL*jM; z3^V4O^JO9?@AJApj;4 zK*6b+NE^tf)Pqz6hS2XJv;aKMZ9V45ZEnyF2tSHJ+coDHMxYA*XaZCf3_8+O`J#uE zftoSD1($tz0}%->JYkqaztc!`O>ekmQ!wx(J5ElL#RY(MtcFjEM1fef5sIYjL$(tj zZf@gZboP!`0}*tRk{)TlaDYE@3t1Z8?IrONxhh!KrFd7JxzOn8>P7gax21LA-M_A> zRSKnAuBxDQ+4}A6m9%AZnIH8tZwPu}sdeP&Ia-@{&|r#Rv@lrj;qOw@MMr0!bH}4^ zKRBNY#68tzb$XQyoO(l*r1-TA27Ik0SSo8@hGtd0-P;KDTpY z^v=Tr4CWuiJ*2qcQ}&1>I9KP&cq#+aQvYb`WF|Fis)w1K-<5>IM>KIP+(oIy{^tl1Y;!jE;ft<69KZ&-3Xr9Q4l+ z91KK;;l%571cExCrmzJbnkeTXNF&ui09l|w`_JH`9TZXuCNoSy0yC_7-(FQ}oRye{ zLKz4Ufx4cAhHo^+%Inv%Vnpdcd9d;C&vwDQPTF81Cx~to@Q@^d1=^;E8g{*oVS^YJ zZ#Taz?qRbljeu5wgg;3+S%v6ANhFd<03LTB0ruY8+wT0IA5XvT^W>EKzRpVTlGsNr z(?bk^yF5t^34M$kh!Uqg6T~#C=gY??gv?t=feT;jX}-Hj2`Lc8aJ>zwc&84NA3UG#RDKOkFkLX7-Fs(gxzq&xa1zo zxL6HpE;Sdnf@4A3KTHXR)HI0*oP^u}MMb7~I~Sq|#RKNx;$~2GQ5~V1j%4qhRI3@5 zxwhzLsJ6j{(T%h^t^g98rKRUmXbJG*%}d*Dng;}Q8F z7ZkW_0E7Y%GD2-jr{GZgymZ_wM*>hb@$x$F*Hl=db8?u z9p5JTeq(CCw* zJa1CvJsZ@=edDadoVTgTw)@wcJru<2I}c&bWC9W>M3d7>G@ns%@$iSE@sG?ny6k^V zRV31^1CcPp0SD>d7ipz2D6xuIs!&_b|4*mKRKZp9EDHl||8?g}0DLv1nxG>V7}Z-a zC#=U9zR8G>A8p<{FLI+c@}q`SdBGV4V7`gJA{YVb1Q`V+L?D5$Vu<;Fq_DCzAMl#g z#Kk8Z#mG_0*cfZL>IvydbBufShKZzZw25~e3F4rqca~14-zquEU_n8P0DTv5w9Cb3HuL6^xsnARK|CihZ?&=tZP6+L7ncYz#E$Nm1@e1PYNv zJcSF=P1RCZont#hMyymtcp@#`(7aEmC@as$zt3y9emoG_k1m8B zr+k?js|C<`x^_zInJ00}WnG7LLv4EJXlWT#TX(O?2N|*C}YtN=*1Qh2j zoHH?pFd>o?fC0iIoCC#Uf*=@9q^c|}c5?F*-cr*$dbt16iY>9=eq z^~Zdt1>lznYmJS4H(tK~ThJZ^BxC4({vFSUw3Fa_2(gN*iE64)%-$#({B76EoJjV6 zK67Bm)pF;#DlW-Y?Mf4_6F~(cxq7E%&r>Qwr}^a7e9xGKB4P#2&hbCbk5n22Fv4UU z`dq3X|3-XzEFrGpsX&#~)^$Y`tD@d%_y7^Ln~lRh02%=~1SA#%b<8zr!YjksP2w1A-uQ zK%wBFB^+Z3iV46%l=U%$vX`B7y{6Oc`y#zA&HrL+p)%&=%-U*a?Mh1MWP)l@MhJ@} z|A_WU%>qr)iv##7Lxg}s(CGdn*r74<_E}Q_Xwua{p})wyIn=%tPm)w) zTDL;rWhr2q!J)DYjFHErG9SPnY3=$Xg`YuWPuK`}Mo@$x?woiVjvFs5Ghq7Od2!dt zoJk6`XZXPbMbb!nOt2d;V<0B4@#<&lF8;}*{g(c}u&C%MO6!H)%2*#(eF6lBEt0J| zXIY8R5G0v9i8g%j|0hKzAbb#f9vqGLkIT!^LmX>?H1n8HEHduFYFTO^?$UFtOj5SU zFmYb&LJp9V-sVvqMcI-h>PiQE*X{UBSA&E8QwbIVqp*F-2H!6s1P=s(~$`Aq+N zTH5h-2gI1Ab<(r`6|B`J5Qh)ka6Ivn{0|?wAnykMKe%va+uM7x`L9WDaoIn2cvYlA zRg#1mGOX`%Id#q?qkLc{h_@EFRTQjctTB^To9pA#-}(-v3i?#_zCxE=s;1w4mELWf z&cY+6+6X()dNy)4M{(8(nYZoqcYiP1n17$resh)cPZXa$^}Rg8oVthr(UGN zG6h?chuz-`Bz@UQabwbXdmW8Ynt}5cVpXcieM7BHyT1zJwY|?R>(KASZ!}~fB9K@S z5-FVgCrEqr4aAdt*^`$FF|N8%v8g~&?R7E|1R%j+uo!=dWHmE+{s|Y8%N!3rWh%fjsfW$*oZO%>I66VPB2L+vL_NlhXa#IK8G&_9u~=h6a@na zSdD>demntz4f#yOfQ7>eQ6de2{6BRlnLxzIgF-Fk2(O~@g2|O>6JvpmH_yHRCXP*1 z5|sepNdOSWFfiR%k@$LXDW`5xF5^$Uz(nG7I?tE9Sdoup8176D3O7?)`Td_irsHfj zgusL())5eofgFb737wV|SxE4@ala>mt&WcTxJd3H73v-fmkm7=XA$j1U`B@}DS3jT zSyzt>+s6lCp)&|T0nxD`z76Zp-rdtc8*TO8zJzz)kzz?{raK`C3)6*qJ^DtYNb5T{ zdG}f0IfXhoPp4GrJ9eRVLWfBgGX$d#R`2X)!vp|^W_tqtb)ENXAJp z(NPl#fiNVJNkNGd<4D#F(fuybf-%2dkjTpVJ-j%b)jzPSE_ciR65G*G(G9S8*8KcU zXFAz3^$HEWO}o`@wQ<#+L?A*LGG-11lkxRi@A||aM*si-2bTHA&bSfnr{k{ULBAd< zx=5XVtu!RAB8lPR`se0#&83UoOwR`!E?0cB6LaUm3^mcoQ7&>Gn}n}-NhBdCGf16A zUo#fhjH-=!C%Er#!tbXpxD+<_;r*pI+YIaOCqiDgsfcY? z3~=r1pE^b*@|r2~J%^G~%3AdioZgYG;aack2cbhk+jBI&_sUfb4B3qawIm@Vou$3@+g}&g z72+?dc3Sx1x#QS_ndh&3E^wci1G}P^sP}EDXxB>h_@`*@?^9Aty6>*m+gNw{FQfpfC#hr8A@DJTBXECDo z^-(!oVKG-Ku4-vo^_$Jsv`whim0bI1ffzdtp)+8bQ37G%!HkmwMqN%3Fq{xM8QO6= z5jYfC7+kVvIT?bB-#Jx4`5=ABKSKm|`@`i5kjkn&4hG>GK$1!i)??SRB6k%)K#G%W zQt9|7?c~8Xg1IkZ(^RJhv^5}ejg_x`>@BuNKg$Y6IRD1@Oz6s4XAZ(Mx6Z^TZ!5|)E95FwC+BS&k}3S$#4 zIPolPF)Fz z*ze2fc%FZ%_>9a(F&K=`qLL>!8&4>2E#4x++55vquW;n6%bSo*7X-SU$lG2IN4w? zYHX2KV-wKSncEF8R3V0VJW8K9P8+E#%Uj)QBzihhiH*DqHO~v>%N>B4yJ63l?7yS> z>$JDeUB91RA8B;BBZ530k1qt;h^laU+KM-sK9+Bop0>x#_s&>!*r|`%u19}fy?WoN zP)~}6x2C#!Tru}Yvfh=!XG#$+;HF;hLM&qkU4rZ5gJimQW6~XzCwk*AzB59-KUC-; zbe=jZaA_8V-u!U9%Q4zLy7;#|%cl&#eR=g7k3KxZwkq@C`ko`I6RmHf?FV*M)O&F> zI!a8JJ(16YGgYXV-PZh54eQ7uF!FwGIPPCv_0C3d=Bq;Yj;~zY`C593nslG<|1wk= znR5E)sOLSW25;;rf7{34^ca=;#GoC-s)*##IzLksSEk@ zoWA+SWBHry**s@|E%DT5d*xn}_qtEK#@6EAG*KFTZQQ+H4_O9Qe?^WG8*^yAlr#jA znus7nj^l=+V~NUc3y|rAOmOHZdww7voAQ2N64cOy5_c?%EJyPw%Ex^Rz_o)!434vT zot=hl^aF|=3B2Av>{97g+Avo8tyhCm7ijTrui^^@C}&IyFag zH}AVvHz>w*j3|VME~-T0VKW8o;&B0jy*usd9&R_iEV1=ZX5xstoQ+IA^;M0Tb0h}! zWuq=4uOgu$cdaWoqH?5amr?F58LJGjIF(s3-tq}4HiE4-K_D8S-{v^8R_tH7d1k!% zJvH4pwtDuwt7+d$V(RuJ?tL(ibuAmY%6RT4a}>0-n;e0IgYzb?Wbya?|6B9y{`^eH z{CoIEs`l`4>)(p5B0c6M#RHh0joia$U3J-EMrP2KEI5F!IlhzLM!0CSw<6Th$%k%h z%y!&AwaZVaje2G>F&t{+A5$=@I=iMA_B%P#w1=OKYvJFf_2hjAn{OReUR&MPOZmN2 z~?GSq*aCBNrP8&oiCbmxyiNhmEu&s(WEBu zy{{IIzI5=fy~g~g`wuNf`RW}zqBem`xi1JTCUvtg42swpus0p(TJGy*Zdb*xGoNMx zkD?>x!s9E8-0yq`@-e-O+uKU>iOC}QAEs$J;&Mk_alxgx?${^ayXFx_ucZ4o&g0*? zzV(vytAm+;8H7eVOU+D3@ibOV1WZwMbHYnR8tshCN&*L-yf zc#eAT`<~(hsUB5iOu(CsanDoB+YE?sa(Xu`(n0sjanE-r8fJp#A#mn)^HkvRagz6W z5tUcsNrJ%38RcA7G#i#xgV|x!8pq9mo%51+}Z`-RHS3y!y(w~3+G)vLf{YCY2o(&OF3~Z)e82&a z0H;BibfO@m4{bxq-2A>q5dA~A)cU~bBEa^P!^b90WkN&*+p3hN0w7;^Pd#*?$FwuI zZoVD4&vtPx&qa(RC%FYsS>>)s3olGIE$e!wytWwahy=Dc(nN1Y<&CIe1UC z@Tid`GN>$l+lmDKGq}xaZmY4K*q!%hNap(z^SS1}zaCGK`aP?UaOiDI`ywO zMMIIcZ#R?;$eVp7tESsWLqe{Q#azZMPKC1p_HZPSmw9-8^@?}f-`DchsP{|d+zcjj?PMldqnTPBRDaij*ZcHx8*@BR~g?NaUE>F zxy#Vvf^Jki@XUEl!tLg}+<5cmw-P*4_2Z8oAy%`lVdk`@nB7H0JwCKy#}_?cC1q-7 zHt@BYcX-;mjV&kCtv%6qn{@CxZv zgt$bEQwi&Xrft?C4bk7=L9og3sap$2z3;lFvz~i3i_*JmeKB1h9x(<*9UucD$EHfi zOoG7L$e|3vu}a88)O#94IDs6s%c?{n>L#i|!Py_Q_uAV)=>mEy0;E02PgVtFlQ78& zt-SNkdI5x-<>?EoDgn|-GASXa!5p&^)MQ2}BOX<3Yy7)&kH&A({HkN;&swi<&whCp z>LN2#Be%EZnVz>*=U#bI_`|wX(;Zb?IF%b>^mi*GjYUIlleT>I8LJ&yIKr8jGD~=> ztB82K-lquEM)PrX7md>NAtaA+)9TM@yA7{sk)9j_;ePvpas@WT2>&t6kgAC8>JX zHK#R=Z>`?qcPn{yPo=e$n|jnnn#P`Z%u@xO#S^0!gtXxBMwSPpfa4iEK^*~5`Z`WG+^TmBLvd^S(G?ZKl z7L97Rtx)X2m905<#-CS_y^DHxr-+@%LXF7oO+H5Ex2R8ZD{Ay(qgPn=pn1%EQG>bN z3=BxaGbEBgn0+Bitxk~jP;m+xn1eF_-IKyWDoDm-!uEtMc=0LR zqq6E-lT~6^_O`=T>!4FSuDW`$%60V^`bzAC)C5A2*rRR5gt5HCl}f7m>J9W)QK~N@ zQM1$4>ucAKmKUB5`|qhUC#`fj#km{2si-A%@3W`s53B6d^Vc$I4$0BP;O1rN;i+G! z?|erbMR8rhXVO~w@!qq7CaS#Y{OImDt`&FLtDfd24Ki^Jrva>h39U^$PfBd@1UvRbf-4o3bGV zz*Ufv9ATV795@?ut#Nl=lW37JwHwqrK?&c7sTxvEiml03odFjW69N=IZ8I_s3N~IA z`gGJfc3VQ9L?B9k4OZ`5eSXN!=;I~R3ah-qUD`Z^U8fG64Ku|)4`fo?YnV7xd?nwL z*hJ5259&?1|s-O(it!?*)Q@G?!?xi$o z^BK2zRqCduw~>_$YkSK#W$Xy4hpp}9jbz={O;ZJ?8Q4eG+OKTtC_}rv;cOJZ8|S<^ zOI<6UeLpVtN7?r3yqo|?9miG6zE3%D zaxlx;>%w!jemY((=4-=urfa^ln0(5syVc6?cB8)GqrF6P$3(CgbC<`5$&Ie~nK2x5 z-A^>FC_5!5cG`8=98f~A|(*ubWlWUh|xq`NEoEpz2F>x)rY%l z?+>r;^5>m1KVMN+U-kYhzHR^g-$U}R{SF{{G_=&iiEZJp=#HPlfI@TIwo*mj(>O#- z9pB%MAEEzm?LLdGX8coK!S9sG|7@WVE4FOgw``>-_EuFCWsvycJ!%<<=piuSPsjVN z{(h>46`d2NAN5g9-kvM_B#-e#>6`mgn+oJ2g)~(aE~vPQB0w61&Fk#@LImB1w4>DH z)_@XM-f9{2=W3h8Gzg_Y<}rewGCB}KA}kRuB1SJgdS8=?{E+fzrW`tQ74JD9DVj4$l;$x0BJQ7LE!lNqx~)!K2Q!0zd%hJ=#%|+hl zG^(aGF;_byX+Hya4=4)p4#FZ3ijblC1QyY3?z4|xmDeQ1IR~nm@#V-~mzdsXs4YIO zG2L%eqc20&YBuj0f%9*Atwy5uqbpn0-qg^tYi5!kZ+8x+wR^4Za%OTTcKX($jdl#( zp5r?@_4aw-@@&@?fuI;9VA$*tBOI-vyIdxe-XoZLO=l@lb1^D7l`%Gig2;4^vO~X* zYHn0Xm|?k?4f6&qN8Y%Lq?&oGD0#;X{~h2ohIz~ z9%JQeCQ(qc>N2vL>@iFDX7g51ZEZiinG}Z;vOZ4$NCyYaUTd z=4=xIgX$}@Ebn*E7m*0(o6ck&g_#%_u$T}DG7vz1IzwL+oG-sCc3(2!Ohd8-9onDl z=VRYMjEawJJI%hc>^i>xz2t%CZJ+{ckI+~nNDX=H4ZN1&Jj93S;kDDaha{waAw=Ns z6kGinP^5G2vE9TPB81wjfjm&`&%0NH!iwtLYLLRQBqxwC^c zCY~rrl4kKRYmO@xxD(?IBn4C(;U_JQ5OPqCO&lS$w-#wIgf-|~-zhygEe0+HT1JdT z-#SeZ7B(XcEgYgjkvs;(EjCy*Ng`(66arm<>nqC>5D;U2Q0#O z-HL$2M$Sgt$0e|GjT9jiS0^-ZQ54iB#wu*)3pfo9mJDpe9gb-sCC#;z$SC7{b0#*E zJq@E7Hv-j$B(`ke*{))B3g&T`wGB_M!P6pX$ z6Tq*LYXb@+o*LPX0is=}nB|%xBE}KC3)cCixFO((W;D#uP$E`aiiS608g7l~hl3cx zph6cFWi5sWDTp{D256y#h8tn}OoKq@FD*kK*vFWb{{rLsx|L1GZQCECEIRdY+ddas zeRMc=>c1|;RE_8lG7hDl5AWGj9vXN_Z0DZ@WzSXA;Oyv3uc^S?q?n2ZGg+pG7eDbj zLHeqLH4~{V!Yj4-BhO0wt&}QwBShV6r*oPnEI`#FC^r}m*T``!a=Ve*Nw;*s7=t9t zdAzj{0n$uCFTL^0j67$0b3kFTAu0#;BQ(Ds>!BtU*bWW7b zf^8K%Y|lu^sF=|)Qufj4kF3&g)mx=K&l^;S>@~Y_ZWQZHw$b^fZk4P|Lnq~gpgvC| z-Wy>O?=d@8N&zh4qO~>1m)`qUX||?x%*SI4wVg$f17MrI0Nv|a>Ofnm*_iT{s13h! z{83JId}Csg#aijgkzX8pJSFxfsjE4!jnXSX#Lz!h5Ij=}dl{tnquup(4PN;lK5rGV z98j&o4!Ugdggs&K%irnIBsY5vQ^O0ikauo&JM})Lz=O>09gV5E>tyO~&_jF^Flzec~J);_Bz`fuCS9&00kBI@>_m>PYr%BRKMz8by|GF8pxcU!~IjFJ;2!Rn=u zjA`zmN)9?|FNAzykjunPXJeM2=q1%|k}pS^w=%`(jvm&;IP3R6 z+^OR-u}wA^K7MUeu0lk_RVctPgSW%gXTQcxrLMKRd+c_a=Qp`uTeXS1DD7of!YJdp z&pmk2F%$mL^9V`1J>uYmGxmN`T%zC5rc zBn;GKdMK)qDdy$-|gC z#0N~Hqqo+8>{8V7_&D9j*TM5ZTq88cLK~7j=(nN6PgAkzZMHyyVDoA*-HeuRY&oA` zq`7MMRi3`Osnx&R==l10<$hb%hRd}))L{uSlcVU$HPQ3&)SmB#>S2TT?X8!AZNbP? zarId31Tst}LET=x_((EY+uZ|NZ-x4x+tJM=+!JDga&Y#e-*;pPre@(Evuu5j6NA61 zL*ei8iKbfUwn*zjm&OO`FX-v=wlh!J#w=h}BTZVT`J-$iOyyink-;vt7B3SRjyc5% zc&H{VUqULMRxu?fG~q2x?NFD3EY1(4d($MRyQT)kPMUS2CGSNoJ)K@@F=}S5KON9^ zRWcgYJ9CxW<3=OHY8T_FRSF>ql|2=&mb;>-&w}@A23L1!-&X7OAe5WuXI7ebNBch4 z!l|OP8k0#K8{Ld{yIi#5~_Pu&+kd{nFA=3KAMxS69$2T{^t(WGnbc;Ul^ zX_D{rxCEeJcrXNdGLvE7=A3QlaMill8r6Km!^B|IR*vi2*`dRFty z;Me@Hf4}5NX5fs|WJi_L^lnj%NlS1DP5&DDA#>^0gf(FMX3j1)(k@&kXHDqc?1sf+ zwJ;TTx$Z&ZDpEb1zM=pYLHukSDcN7nlIt?P#AbW`r`?vmMcn&no}KNX^48NaD^DpccgRVMdvdMgxh zjZwif?DyMry&tK`-I11_Gy1&wSDcF>y9n1e%AK$dly|66+vQW4QdMt}=f*tLK6?zk zKmjiSaEo$35bePBCWYt2FL|$)9Bjo%_duI2>ukO}U=Z#uB;DbgGfoVdjtd?x-y(-G z1ymR0^v$?$L&1hH~mBUc=yS_+LQ-)6P!9W zWx!tkIJb)fW&mw(*XS6fzR&wZyv3_-ZP1ut{?P+?pxzS6a!D+zIce|2^xX~d*l=RL z0yOTDM+6C5$CL&{Nvc;A3J0A$laeng^N!NEDcj57O3yowJ4S7Zo8*LwE6u}7{l4vD zUP^m$)W=6gtu%iI7Lk_U34H(zh<%A=N+l=rBQW$ds^v*V<_(S}EEynlqd!{;|1XWs zNY{i>iop68hc&B$83+d==o*4z34$q@-(J2450nej$<4pvh7I4@;b>wpG$XoK*9Vla zkck9@>zSNn)&)IaR-$u6gjo=T5^GdoCh5+*A;b-~*bl!u5)uT7yA`MsFv`c{!uB{W zmOduaPifFygT=brvK4Iqm&;I~T1fgl?VYcVHJp9zF!RlM3^je!Fl z+O;FR!3UzI=2mJ+jEb4qsQKh8+4W}v1Vaqd&+v!Je6gJ%)oMe8LeWY}8wDv+A&bYi z&oH5oj3$EssHCMG0DjmNVkH*9&?YB6A0Fa_7 zCgRQ`y*pvJkFGKw-0%5e*M>JPClmVpzrBlC86`8xGRXgd05U)(K!ixC7z!c%-pM@y zi~=Ze3Pl=vT0|NZAKf2@4_HM&AVCA=HUCF(^ZQbBbI|{f?f3cXKjOdcLq%VA^HTXS z^#Sz5<@e@iDOYQQMZZDgJ3e>bVpm(IK8QUgu zll3I2A0?+;%ONWRArwFE7!{yf350>@z&o*#g&_}ClEf?n&oJ5r87PD2C}2$3R@w?k zun`xAqNfII?u9Z;m#(>UJFuQz)TKmgEj7`rLb1tF6KjNuW(6%2ENxp$Rz*a>=$RWz zQovBGEi6%CQDqXQ)QaS=7UF`2K*=&05Mq)d3qloFt5I!QYu8q`<+*cFc<^h>eQi}$ zSBFdl>d5mapIm4m74c3+0>&gfUl*<%>X(%0<&u6U^7_CG#gKh_p-VtL!QfLccyby< zA~`GvCLD!A`ncyHks(Boo`p&r`X6sW+D?vvECVrOA}CNK5Mc>e87l%=OhqOp5Xu=S zPm$+LdWi}$N!Mv90nlTHOSZSpQfl42*sXP{jp<7_zi$>m?U2V;h(n1EBEkb0a-}7S zB%P`vNsu!Ik~WZ*ffS&r23Z!!C_(^`f>vkWF$Ki3iW9P6Ao@gbS#gUNyW;I#E#j+}B8aU)fmj&qN`%TPQxtq^q{-nqeej2VTfhqW$p58|XV&z|83@B}l%B0R+q| z30OfH1pv&iJ#RP`5Ec>(QIQ1zIuNpy0OUpB^pa60LL}(BE+r5EsDMa_NRm`n;1TZj zAL;$vVsi7l9>ZzWZvDQo5lwBj)mpaLG3m0;FFSefDT)uG|M4PPC-jj;-Gc~+$RJcs zkV&;4tMU-jj=4If0Lt)q#N+pzkDo1$zpI^V+e=N+A$ceGapl|CRRCx}m%q}p)kf~2 zQ^ph5e`X21`kuaHwn;nlw%+rji(K~lc3cHAa0llltDU(A6XD% z{5cNHe$*IqC~OQeFKTQN%ps6WMy9-jMrVy3eX}_}zbFS2hzRg`iKRW{poDfJv?gbn z#+)a>3Nt)^glubL7B$)=vf0j{#^Pv$WE_);4WU!QscGp%g|!`3)&Of^{xc>oy_y1M z>a1`_(YYsQ5wdoTs<;mLZXSeWKD2f$rc5i)aj?|q^@unvN8I1X$+nWzcl1J@*SnBh zx9;qK+K4gwnBoO{;(n6M;M8uj`#-xH*u95j9qn`r4u6#>H4MHC5Y_3ZD*=wPk?lWj zE9lu|dfjx){--Qy!P2QE}bf@m3=UUea)*9>}@Tq?}Q*EYl)dU?|i>H z%qQ07O+-v}IabfybWF?^OwRu1-Hk7O6Q+AQZ@eE4koU*mx7f^+2QNwEmT@cj z0L;Pmp_pUtWCLNJX#Q{d1!vC`FOZK>>V77@21rO?Nw=HvKdLh}`&=p!Qga9upsYl_ zpGcl71ILQ%{$NM|pF1i)UvC4yp_l&bH`$TvGB#|v);q~G4rFaY*vx!kDnJ)81V@lS z^|v9fZe}KC#^wq>jR+qWaQ=&G&BOQMKTnBd_;!g1Y zg3`mAY0ymsn1hguiHjSJuASNAg|wlIQ36S}y`3B?lfGErA-IU6iW2 z>I%9vzg8VR6$;YmGjYDyHeEZD@2r$Htu!b}s7Ck!(ABiyHAZ~HZL-RvgerUD$1t$i z!y46VdYkt$$*6a7tH!x}=GQfdnwG`)Hu8CAw64n<(s z0-?ftU=SjH5IoTEi_;Twpu?I9?F8z8GkWy^ey-E~|DROo(Np6;I79kGP~{O)5k&J( z*N@}8|Hg!Ifj|zr5|{eTiZ4UyQ2#7G41aALaxQVu!?HkMcGt;!pfj_@9=qDI}6Z zY{-7p7;bQ2XAPT^#WOdDK_0%3`F8W`?E4vfen0cKSOR8a_ZD4c)<@xGsqsJ54G)+1 z0h)DD2ta0`{w^MXLM8sQok5do6r;1V>K+C}{;*DT_7Q{=0%1qKn88XAKgiq%@GJDi zBvlXb0T=)Wpr(}s{UMcorknrU0Q_JVWF-WN_@|)+hx!Mz_ti)CTNNTdz?pR){C~G@ zRd;7UwDH?H%|@{^LA0t^!Bl}tC?GPOT=TE|TiW$|7sHP|u9_9`OQJl+HCk{__q^W$ z>3lp2%sEm$Q(S-JXqwgFGwrIQ&* z5-1w8dlPQs5U}s+N)Jmj`WEKPo z&PqQlJ9}GNPF;zfkJeOa1=y&2IwatASRpl;0Hl8 zN5Hgjy^IPD&Wb(aarG#H;!f1(q5*w~76H`4b5MGxHiXP5iwIN@g^D>=Is{XxZk@ZE z4iEy-iGdN0Y!l`e3=41)dA&$E|Nn)VkLit z4Vn=ML?&%~tx{Qn5hVek5@M4zKvG;!MKV1G={a?qNS+ln1_@QV41mKbV zYztR>P;U3WzomapO78!@Gj5m}gZ$6J6yo+Ukff4nyM|VCI+*40C%SX$KX?9w|9A-j z5JUz8+7JdnV6+Fj{uwFIl0%I7&&{_i{~q3Tob=!<54?Gu@SR#6I2H-~O2&lwSD@MZ z)$1PqJGp)JSm!*TKu%}Z1M`6Zz@1Cb8Vk+{c7dV_U^qVkKYsu+Cf)u1hc})-JyF}W z7Xqi=sn91O=TbO6?j~{}AcSF}$x>R@D#@~jl+@G(U!?ZBKOIxJgabuZb|I*h1vdM? zA&Nd0Se?e_aYiyDpWJ9@T?x96brKeLr>uw2|oANlg&EOOcvISKoz5bUVSV@CbKjRP0 z1iAZv5h?YUBLAw^uaN}b_i~Wu`#qS!K97^`_HK(5P9!1dRiY@wh^>W|z}1Pq&t^s@ zU#JtX%XK(KojAy%ARoii{78{5erc8m`l4c)B+X{qw^_O=B|oYgcs}{Z@TKAy6C`^+ zdCDVNKfn{^&vwl+sfte)!I>jDruT8n2BM3RFauN!Zw@v?7R? zf&n3CY4kvov>c)D{B$7*WK9NTJd12&FkfC_h5$$aW84!4e_9O}_KX6kDhP9aIzteU zOe6@&6VxDuj1?c-5TY?+L>y1~4JXsSasi#?IB}KBOjb8kq0O3X-$vH8g?`G zkV@1Y6Mgb{WkW0nIlC2PML}@gT{&&+>Ul~m99z!8g=w5T^I%B~AqYVv1|#Q%L_QcI z(5p6Sge46I40~`ML;*57^&k`?J$=!RMBw2_2oRt!kU8x3rYI=n9DcU7LCf#~|mMSY3x4)E9muB$2pr`{ALqK7e6j~f%Q?C>CeAw{cgVf63MiSDeZ z3|6u}@yLQ-uYLcE-o2?MGuds;q^(BOxo(p-YG`SRB^uIdJr`3S8#7EZFm8`n6u=}T zJBkvBLwAOwQ7~boBIf73_}(##vdS7Y(QI`BQN)OGH1EK+w++hVWoQ;edfYc2E9TtO8wgfC0!+UL5Er7C+?>Lf4AVNTamr%f|l~%xl zH5%(T0Ja;Rey-!!kM`z_k@Q8Mc(n8;S_l*AC+H8rfr8}LR2eM<{-`n_|E&Hlls`Jq zV`-a8^zQXzZ`9YSdT&xWX4psfhWm6`TK9*`ET3%?9Wf4cAR+4Ue#V&tF5}NVR_8i6+c{+y+3mj zV4BS#QaaXjF&=NS7pzi^%O>g zp)gE@ilQI`@MI1m>;Cc#GEjfyNBVk6CH>yl6L_ngpU3>avrqI^{rmrKS^$=!Cpbj@ zN$VJn3U);{gBZ51o^Tax8VdXz<;pM_=AC29|@XehvbSHKJ z2cw}pd6Q7xMb@~9=l<>z`|infmXMEfnOG!w=ay=PEL7@3fLzyhgE;Gx`w5O7Cvf-bNq;iN1<#6;6ZiI_-D!40idYR{@z z&XP$$;X)PIFDkG_ZSg(NOnRl(Q3XaXttziCIm2;V%L*-ZU8;|v_jvTaoqKx~iPH(_ z!Zw7W3F|4R1fbedmJLdjScoV@By98HcE?+NvG(pTW-UR6E)Yoqyb$_IB~vwwWig7o zKnb+QCKPSfX>{(o2>LVO@1j6`AYe(PpMiJCNh%It<_Ok2*n zpLccVN+_y7Q`OjFG;AB+w_&6Zd|#MW^BX>6Rz?#wJx4Kc)xlK~CiquIIdwG*)UEu0jJ4=$z&dI!(g z`KhP?8GuC~9I1OXJQDm+$rb^A1y=(JfvoS^Fs)|&N6Dq^KVUi9lDtR9Q*k_?_q|eu zMnxeZ3xGl>$chwLVKhCkk(A*ur5XVP%r8j{hO3n)4%_&8puOr494}y$ry)2iK;+d1 z0jRhdRAvWp23BxFI7^Y#2_=lXy;2tJ3ai_z1m`H#>Ay{G|_p8m>LcXgT+Dd)Nh z^MyV^U5y9BQ^GvkVRnu(nmRd8>o-_qMWM|RQ?yKhk!crm9A*LFAOYC&^YtO;g7-tR z0fs>d0z|fj5(sUyQc1Y5iUGAe1jTghX@#iufu+Bj?*xD(BmzTM;l4iX9c8q?t4tjO zDsoN``p8~h9h&Y@mjsf+mu>+TQ3MV8ncC>AP3zJ0U~eV`3B*sKEDHpubb6vdEEAX+ zG#W$&;y@Kwj`UOjC%xnM4~tXe(T|&|YJs#+JcOjXq^Fvs8(9e?dhB$G&J-tM8$WzX zM`3zJO+b1Kp1ykL=@Ow0&+H2R@URtVN%8yTd7?b*!3aaJG69}%4cCpSNM(1>N>Te! zd(PAP4_F<$NjD2QPm8>#@~OK8A%XbLjTWe3FvWuf16K!?$OJ55Xhy(*?$&{~0D?oG zBNKtxZ>bYRG^H)-2}xT5aoY$s9LFxM(M;-?yX6+5NJf%VAaLG`2%0On#o^d6lmJ@o zxydjFH-YUO3hE2XLz@EY%*+EAjPO&*JbblqKaf9AB_h}EL-Q39pVfeDXNjx)Ft7lB z&;$o!AZ{L{`244{^&$_9WPAuJA)MYT3bwtFDfE36{an}P`==>({nUiN7n{P8fAF=` zWEQY6RSCz`6zdGqJixm`})c*h>Q_jsNum9mB}fAW^x&AMVrFT=QFcgBquZGjoh=0}IpK zA{&1R@2;HJSvt_2moat|3HP&d0k{(aQ1W7mu@XT9Ws+HCJM==Fwjas-%>HX%)VhKB zrzpRj=bbA`mDcTc(`=^NxpryVy4P%qBTFvo>mkY}RPND9lCGWI%@)LqtE%fHS+`er zcUo1pg<1u+#Y4#O;b9I*0BJi~YE{{GW@_y^!(z#y8QVdI53)p<#VJZ9FXs1=jA51K z@n}=w4oS&&1)aA*oR$Zm8RyVba6v3hCsdM6z#e}M#f3yrgUZ|ku-L7E*fBxqBD(9< zRd!+|U;=UoyNHUD&mYdu>;?o<1R%a&$@E$Lsr_IB2qqo>4&VBHf4j=_&-LEC>ht=2 zGQ%(1i{G+T5eA^Dp0nK7>W6QW$Kb!z$=sKg1ZA+0+M0mD;6#u_AK0C$868%Pt zsU%no>UB+^ZV}5gp#rJIEuJCy_(L)S1}6buPv#JT{Y2r>1oW^Dh@^tQR(s4m)koWE_xs94F}qo8u5CE?dp|l+o9M@F0E5*sUSZ zp!$QSQrB@fiToQK5H<8!pG{BNm^@^krBiycd7t+!=Rnsr3j)I_@=hxqL^&DhBqpRXG=g$LV9?Sd zsoH9}UZogP)1hAz6@GG%w&+?Sk%-7FiwKkJ+@|4og0S2Zzd;&HQB0_NG(|lipAj+% z!~EgtC#6^Y_2a}hC^wNbYXEMRC$&rvN2z2r6GaUWMKCfNDq$=HhREe%kR7=I*17;{ ztXTkvDXUCoJ!n61Q`CL~L2mwxUqb8ofl{X+OkO<(e9x$`=00PXi6cRmj;Dk?I)B%T z3lk6LC}^9{WoxpJt54SR2Q!d0BSGuVhH|-|ASbXQses5*il^vMfCsPITp}>^s|cl# zqFbLbAI?H~l~X}A*Y-PsTY?GvN8qFrpl-w_KyrMPCjX}!#L&P;q5xOYq5OmFuyCwb z;|1GrPX;K+u}W42{EZzj38F?4BlUJKK@XqmAC8JaVi7_oh$J7UDs?Opb)ak{4skh% z0(u^vdl1!yfUg&|euD|)xRvGPdI^teO8Gw`x1}!Z^GETvQ%>;>Cfj2D8QhcLM6%L=lV+x@vZPaAKWg7iOxWB6B1lNZA7ZoxZpMN4i&PO@m=h34 zmK~?dim4%h#|Ma(8V2Endwp{+83+QVZaIO@=4$k8&8miMK!hNj>Y?6WSjrwkS7@PQ z?GxS|17&eQl+}Gt>X7?qr4D4$LVHcwpX?-G0mg+F+CgUnb$eId)|zZ>JSmi!qyPw4Sa z)(@zAusW8?m59&zARN*E_`kvRS?eEj^RL#nU>D&%M@>yU@Dx8DVIWgqIfplL=0PPqQDyZf(eDPiRPm)8P4`-bh*%1J)kF z5EF4P`UEmWSPVWu-0_j=@#`Q%)IteD@WrUjj4V=ij6Gfu;Hm1+ zi4ck6z6hdy&O!C@pg182q4=6>Y34HN$WI|juvj3JhXOoxNC~gWBo*npUOjTR1Ov$; z%)|;7LP3iOGi8x5WtN1gnG&>O2!XYfXXxH`{~X(XTD-qkPJRbJhv72TIbVIgemf@; zYODu*Z}bkNn3m=xOdIZtG{&V~bCsophRFd`l2m4&u2R z$dFTBn1GOQcs8LMDksQGQOxw5PB@fZ%fEk3%Snxe;~)1%dPij%+A5BKIKx{vTSuXa)BXWPe#O zLqf{^h8azJjlL7mXViLG0z?>fg_j?X$G{oldPMP#AqcqhRA1kT5HCtqOqx<)ObXyg zBnA*!RFw+%<0=@Qf{tv2U1N}eX+fz26A?^8q7j1xVRpELSpZ5-2wo>QB|ABIF4~%p zJe?RSO}I!7oikVrQyRIw_XP(r(duHKx%jQ+-QP`f}Pt3X|Ga@X}9a`(lnKbw5(#a zHr351F+)jIwRY}7B`Hg3(h%oX$O$4(V$3k;Mwn#gBVZ^tf@u^_(=;UAm}#uUxfarc z*IeMdwd7k_t!~xYALGzF+fX_pTSO|QI!M!0ty@Zt?76^eOfB3mIc>PxCe_Kt^P4JR z&UM$FK*~`~Dh~69l*go?Qm0u;cdwuR7+M5ECJlUxKraeqZW z5Y*IiC*Z$$;bi6_yWR$ZMhD*FfWh%=81uR8?StwBsAnpT; z6*v+?Kz?9>%MrXlB=*&!+FT)#qK&r%4S=Qo;NFQx0N?;oOkKBx3QKUrkRQD$P%Y2o z=yM|3(4i8g86b%W)LY`v#b>DgY7&V0wRwqzH*V=iyAIU!(30W00K0 z2uJRc294Q^R{|`AhM;(#9~2L*x(^fND2zETA%`gg5VP?gY30s_g}9-|niZ`8d_iSM zWQmf~`n*1U$KSpUxCDn4dIj?i)F@K|p~}XG2gI&shWZf`)~W+SNGmr%cZI*mHD2{y z_z{5sWI^B`*}(X2wfE2utdL107z*}}Y+`eWRS`O3P@Tef=tK4SEU6z5d%sGdZE|U=pbNXKsf?9VkCfevB;K`q!0{%CtwW; zLRi5P0Tfa$7?2+J!niD81W6Dm*bl%2HD3_zBENJNv=fRH2?5{lhFSgblna=kB@ft8q!geZK)D|Kf?H)tW zvuC)WB7Nt8z&91{3kwE-6-U-Yn0Wfh0oMKXhbIv3LxI2k~gjHsVIUXRE zb8^~cF=GU@rnw#`3jhMcVjDuhpa`U-p%tX2?a2^R@6bKJ5Wj>LApXHi7SM!)6(EE` z>`WisSTG^z0r}08q8s)a4<}&=(dkH^5$pH!;-LJ19DwNySI^}=50BSV&rBsA6_5x8 zrPrMMcF_$7sD4)l0>J*)lLQaioeVtsZ2>@Cq8hhHxXdcam@1*MpN2D;9aV>c)F5`H zo$seg2jl`gi6I?=j{{=JC&&~lE|Pw!NJ`k%HMh08=E`{5wtsmimQes6(FDMhpC{+O zFb94SC`vmnw@l@qH5$Rcs(J~moc-#Cjy~a2sSeTaHZqbj2g(8%5HuDlDs@)guQ3C- zvLs#JXA5WJ%O`SjHxpAc?wUZ^(Nmm2S>HmQkuv2y(4|*o54t3X$SrgaV1a6ilu!*1 zV)q7h-zU_$T);$!gTZ2f(?JjzB&4J%4`Z*?dEpT36S*`CTCriQ0ILI_ZYRf*_=IR70zxG*BT9G}^%QfdDulF&#p^!MyxI3U0e-Ta9;+1g&f$iUteMrjg+fx=G>e`H{b&0EBnZI_CZnkoky?RK83bx6PNt>` z*b!ZThfxJJ1ob1Fenmgbx8dWiz$WEQzCM8wEKRy^K{nT%(1?VL{=yAt6bTALp;{BK z0#oM=XUctU;-04=xSWG{5GwZ%XOR(E3<(eofiwaUh!LDrO+zScw@?c2qmc-q1`5DU z2mulc(6KIuMO03O4a&NeUtpU*i=RZ%0sBOT@p`-j^mzIL8BpwXJDo)C`bvAV*%DG&_!=+p)kEM3Q@B)R`Tj<7p_W2 zOay>Q7M1`uP<*}-M@1iaPbmsWe*!TMe})AgBw~tv!yy88YJ_<9n4HXxClg{|+)QzZ zOH*q;i!nWQzwGtyY5{Qdmg~8K%iM1Lw2rhckEaejr+GX9fF~`)>tvWJVK;-d$y^qK zR;Gv6X;%&q_lZ;qWD{~ER0)9q8*Ulqfln6>M;jc=g=8K6ZxG#xVu1`GK*OTM+2Is$ zAg0w($8=~+)Hg^;gN{AgQ3nEP)JzHP6JSo!ILkuO(IhYl8ccdkeHi`^Z5B;9=a_eR z1vc1zRO6>T-iGU@(nN!8Sq3qVgi)AD&WRwIl_>z3zOLhCCNz~Aifu*_h)5)0v7*U3 z4FuvE0lQJ5=<#GWv{Xd+d!e9k;+?FdlH(fhZ_1SNY}}NTw3Jp21mqzhL#Tnb)73ca zoj-Ya%pHYD*5deaxaWr;KB6JE!;TV;uX1}g$0B10jR6Q1H=)QQ4Lb>jzwQkhG!jBE zTRSk`41uPjLG9(e8 zi$NADG!mo+m7!=USrv$Bp~DbRQ?l571TsU|KA+F=wQaOL;Ci+S`xEl6b`vZLC>r4S zVGme4&^{k!L~MmB)godjY?TyAW(!mcDM(2KlmwtFuwB@vsq%ONg*80Hp*svXFsX#X z%OnIV6hLG_fd%Y^pdkz}I5A)>m5`zZd{Yi1*b#{oBvh3sSf&%AhUm0wr>{}j5LGoN zjMUyqOJu|$2^PWTe;$s)a8B}+7puq^8wSAyj#OTH&0s=cOpXPo@{Om{^w%Rg0oqV; zovL9^`(KC$_ptjw^*kSY5g$qw6xg;5X@NX|JW*XhgOEH1*a#lO(DoVj!rrEekO>`3 zl}TexN+>O=LN5T|Mb`8*LY3I1>Vd)S_lE!K>}gk4w-FP|yO0Ht(m?b9?*u+v4j`dD zF|IH!k{W9)ElM`gg0T@&W-M60gHcD{YaTSMI;2q?B$P^0jKppgx0tXW?|OS`BkAB_ z-r-tQ=B>Mr9xXU4nqeuLJ7i4Z)u)Z$DbAwern#a8Oe95PHudB^=RxrLG6)FgU`Wm2 zKnfrrNFWh2{Y|=!O=_gct0ipBS&>1g%4|=gchO#UmzSNotx7i0*Vt6U88RrNtyL8q z+TIpLW+^wi@dQp3=9W@78M!wuYEOI4?NR9S4;zJPQ<~gntuUFmX_`A^O}33nDN{wo zO>!7=25`umVM2O(pKwFqBB=-mq*S2~3JKUz3$$Dzg|V>ENGQO41n0t8z%CR{b&qY$-ng~&FXpvmQr-Z}2@I0&3aRUZE!v%$-xG(mb6h9`Mf_MgoP-y9w ztVci~mM7|T1192wBu!rJpn6||SI3DyTsZaOPPn>41Vl;VQi4FqcKpl)K&h-n;bb(i ze3o?e8UdB=T0=HmPALQHj#EZ}q6Y&?P(*0o8*sxI6l7a$$pY>200eZ*a41M1b)7&> zYkvOy&3!+-{;OZt{x87uzn{HtTwEOD06>(6f!@2x0TV_NNhHGTKgb&U2&O(FhtCbY zue6aani?sg_1RX4LZ9pS4OcpK{sCsVR2OgviOfWPXuTlLTuSI8r2G>=B0!NPIQD`5 zXh?mMM-~RD4~U6ofds(^{qvJPm;ciu3}sVuJd<^K&d-Cf4yOo1xkfAFA|z0dqU2i@ znVCB(jB09CN$1bn>+)ul#9V9?7ZHdr6V*b-EG)9(qw5&FNaqPvA5IQlyoFo9_N0iCgdr9u$CI~7_0h#YDH@~*E zVRcPV!^%k{I#e=D-p3HVY$cj(w8(iy(0smGTnXK+L=K_N8l9!l#0^Q3We0p~o`xLg z&}i*2AJ~rw-t-xv6rD4=aCN>;b}o+w_I!vTp-k$Vxf*Hos{Jfbu{In8B$7aol6CW& zi1ZO3V%VKX>yyzUFn9vD5se!bN`)KJ@r#3KHkQ)bTSn0+v@QPP%P^EY zfW|W}9Yib|JgV z?cJ452ecBNN(Z@2dyl8Jn$mao#61(v5Qn^qRKZvg3ki_hG$bFwB@2oT0i?B9MIKKi z)^8UanUj!)(KU6;`e{wAQ zS?HCO1r%&4f4braU(kW$3(O4UMa$R4xe2LN2 z@>>~1L|H0=qBRthQ4-LjZKxs%YN~wuN$~L@fPHgvfN@BaQUnM>D#45-17=%jr?Wvg zo;U+81o!|=!g5f}C_a0g-p@SzNavLe5pr!TML#fC* z-As2o5`k}lK<%R%;sF&F$({M&!iERA%9tI^%fO}{iK-k2u>PaK?tSC?i2$z11d(FG z%0GmNnSaR=`KP1w-a4q>?1LLF#=1#mFJU zVZWE-OOR?Uh4$#ohwM!C_Q3nqUF0Q)?NZ=4DdkNVl z8n!9#E`X>==~O62UQg1WC^$Ava7dO2_q&oxjgip1gKiUUyat)j7KiXdbz0Uc!9WYoz`R~QWBJ-af$JZ< z+EN&XfGyjLjax*t)(`B1hvLX4pcotWu#Ykpjx^#Niz5$(gg%!m zVIX#u>X$ozn(yh_?r?*+-tKd4M$UPR7LZf#s6Nt{(4)#n z{LiTWM^#--XyER0smdjX%lW{_h!^;3-@{*)Tj_oW_;vPu!t#gDH>V&Y*U(zH4sbm5 zY>ukYKne4_4N*Wb1L-0u^B|N#Eq}$JO=OCPk_sP3A|2n5{1=na%&%ijf-$nzTXtN5 zNy-+60rHh}?1OyiK+7Gd@B^$GO^eJ*eb zXc#@7nn%cCJV?nRC9jiO`8PK`>-EY?N=p3|`_z(zAqY@+7&J${4HneY71L2Sm>@)b z?}vxEdMTht$PrdYVk91o@){2praBn3=#lq>h(qGWP|=R@X_9TKQ0 zxUv<#l_W}I7Mf!oaaS~$yURKgSN%0#U36%&WMmj^VR4HHv0J5S0t{dwFp%tC6a++} z20B;&qBDW}&u?d~zQRw~MEO>JbV&0Jl}FL5_b<2lF1Pt85Le^=Z4(GerEl6zB*asv zYiNh#{wart{k`q;xJae7J2dlE({{hj|Bi1M)o6_(Ew}EfW-(K9Q96mrbCDnHpMXd7 zb@p^I%tt7Ar6LV|K7RSdPy#?`REik@e_oFwM;m4~*t?>`z`ft-)=Pbq zZl&H|rXe9M3=@lw?>C(QJ)r>Lmum;na9B{$6WbN6|0L(6Il* zFV&8Jg_?%f>-{|DjG+b+oMArUb;M2DwA$+_UWMis7GR@qvnKE@nht|y<`o+-QuLBZBbgWkC;rD#G&R%b zv8&gsK5#qi;5%)*M6jn~>U5%{h+-D|@-{iK8P9h2DSJK!b3OPt{$7wxWUvlcpD=gt_BwHr5 zv`#BWWZKg=il`zWK|CM8j39qgC;q8F^s`%V0a5`1Vq6f>l~^6lSaxq@|=+ZAy7k%Q0RlwKZ;l6!heDb{HMY{ zwol+CcmN;ue4u~bS?5tbKW`xJJp}@Z)&}4Mm_B@0?VUq{>AGr;ojm>|2kw1YJ5EvOlf*;#QrD}g~G}Rw*{OJFVd`^?3JWL^R zB%Mda(sgabXm-<)>3;nJ&y1&o>3Z)c>WC3BTU+_WLIv0q{mP#s_D|N}@b4;&e{)ox zFZ=IzHj&zNr6vL(h6~_IK92Frthws1<1+RUMjN#JlS5X?4R~z0gP)v<^+AmrCT*>w zdQZ|8T4C1zzv(7_De|v>`E={I`M+#oQ`c8~f{J$+mqC9k?Y^q-k3?%wzXA((gW`?+7~%!%}WQH`yh%wKUA>YO=-*@hnqL$q4MNi723% zzRUMjBZ!HL;u+s#B?2-6LF zYxNiO@xJAS|N8J3oGd&In+stlihZ#mUu_M4s+iI-zijI+tXURD7r>J0sQ>Bb$#!ke z24s5ot?`RII{;I=Zp{sw2^nv82Bk>p%fC&Vo9K*1df17XZAdjbSXO$#RpE$xK9sk$)eScCd z_$Q_xpu-QiyTM5D&ph<iim?_R`Le#-}aKuAB7k z`crWaq(@K5x_+iNjZ|n%L?IxGrP6Ps(MMFg{`7jo+4r9O!xWd*@IdU)KADk(; z#_r#%<@WZ!`+b(4mnx44Na#whatZg-&ExrsdMRw*UmD9NgoeT!jT^^N9~6>FcOADt zmbS2XbL4Nk>5u-L=||FP*OPRf^xvfU8~%Pl^q!VQAG*QsC0IytD`v1B#+&`ZLrvWSi>-+<|^AzwiACbe13a7Ylo!(8~V~ z&z{<;u&wGp>kGSo3@h&7|8`gQw?}qb@r87Lh>?r-SsInvipNLlt9H7nnHXKyx~NmS z7vM>?G;6VLQ`qI3>nyHb!>Iqyi&j!C({bDOH^4Lw1A~MM58l|<^ap_dDsA?je>o@p zC^>s+GA(Et|Cn7rr{jps2tQ*ChhdD5nf$KMf{;JVfY2c*(9+2pAf8M^NN6*yKBZrz z`~Md#C;30tPoRu`q6}aVfS5g}wE943j@*9G{-(@777AX!3r4WGF#1LkcbhvQ%BeQ+ zON`MSe=H z+9{R)rJR4#LI4s3=s)Ug8l+6B0C4B${xyG7+zziG=jT6^76mEu0sgV>dLBkc?+#_X z5ks>M1nWQTu0xnAB^$uK;~Af!+;=SxSl_88N800|9@fZVm-(J58zKq7dqbD6v!8u6 zMMkdD#Do_5E3-;t4dZ-%LYvy`?3^|~>(vKw@`mG>JD5>ASi9lS;XDl_Fr-kua@nr+vcLu5 z^{(8cJkK4|+M~x5zxEH9Hcjt)y*N9!=p2FWcoZ6)q>@P_l1co(AD}pXWG4bwcsJBV zUPS@a3IhJ9Dc)__)lUwu1gm?8#yB(#d5IeVN>#Be$$c)oUF~~QS3Lt+fi3Ol1#$Qu zT=KuKjwBUz7?9MMvBwfj%1I_Jrlppi*y8A+a^tS%$=Mbi9TQ>%?kKXWv?pbS9hKEi zAqe)n|492q*P5W4^`g0x^NRYOOQDYd?D9g5;kl81gKqsSERq*@B~^8G>_P9Z14Fdp z8#Zjrj{exgCZK`Iw0s!U*o&|r!EUA;bjHjU;43mh5#K&9FQc{{oSWiE$g(zP7+D>| zuH+uWEAcg^L$J|t6*B2CXb_5N;uxQ7no2KKVHaT7cGXS%ZsJFQ(yP!NLy_dZp9sq8 z6uW|6i963RV0(;e>^=k?N6*;%Skfju&WA>+xY9uj*q{{8p@(iPTJ51}F{}v*19V86 zqUfFl?cxbdBL`Qi`v5fW?l(&c z?+rSm#Dr>!X!w)gBM+9Sk}<=f!>`JBlY}Gh;KJ`+moha1&hYdKjF~zPam_e82dIxW z4-7dXd<~OS>XHE?IGt%Dw6Gy4EIXdy??O5iPuv%G4y2-?2lR#@G*9`pmtY3V zhzx#|y??j#5QHhUf`Hq!@n#Emv)SoLVYcY|`}TqGA4d0mLyQ6ThmaMMP2O4CB6xS# z5!gfABe(}4e7h&a_O9n}|0pz2>(ow%^H=k95+@DpN<%@XnlWr6PLiNewr zrRcB2hUZk38la#;9fx-lAr5dO!Ttisps}2>6e}dRzH6A|i|82SM@=!1Uk~?esplCu0xU`xYXqCp%yq zLLY-93R)5r7e!oQ0)qM;DY`*Er24itf~0uHe0!m7hvO50842=d#r-|f*4t<;wdl|L z*#?YYAe|~JCGDce)^ZaeEUp=eZkSY~)_w#C! zg~)6darPOJw+5vd2dq3TOrHk#krF(2rsRG@{E5I0It4r5gow}@ojQbzMGv@^{NemX z9SURglu<-JfZHRP+ueZ=LMAn^O!>BdVeZelJM4Hu9;n(H=0_4BL5}gAn9}ad<0sX` zInvgEj0gq6KOpV-JdOnLVuqRgcOd?g^NHoNLD2JlU-ZTPMjwa|6Yf8#KTKK^=>`12 z`hP%Q^Zs)2yq}CZI*GAy$wUZGwD|>9)$%7u10o5Z=FpM+vaUduY!|hyudx6WkOV~- zBBBVvejeUp2dyOHqM%d#gp&p&NhItSM^rR=BJzy^4`{lGf2{z@K{~)T+k|34k!w~) z1y;JCok|prW3dV#5IU@Q3VL@Yd6G%gdOfbE4><{Ek>(hHP@9ixY9~S94gvlKf>Dqj zercxXew#+P@fvimux%hfT;*Uu4q@a8=xRySs7`_-fe0sHj@(Hkl1Vkd^c=Vv6dS}k z#n3vHH-Q6Zr6#X`A>fJB5E@9M0x<|73J5O&3j`no!0zrK7C@#Gcfj*16;gP*9sY#y zojGJY0XD0eN@_}|(NiM8fLgrCxP=SFO@!)&flr>45&_yqrRpZwd=5_gF;M6kX0rq} zNVN?D1R(`MK`ng3bpr*3roeC+A=$(0A?H>$b#~2@IkUAWA~VAwtXWKyRaBf&1Bn24 zK#0E%1Ocpm`XxzHS7Lyh2ziAs0E&kKF9(Dg0JNYj**c3PCs9`RJG>p<2|^qiBn|r# zkyr9b!a*@^OL;P)qePT+XxYevfe;i>-2*u#9F7<|Lnb>MNhF*c6e_2M5jJnV(psLM zwbxJ2d+%>sTU*=jd))Lc6OPWtZ;fHOnyM>f92}nFhZDyRYin-=y5ZYRwGV&g2#}Qk zNOwD-7_1mRD$M5HVL-A7o5?hfIE3QtZ8LChLNFaRCHLENZD#6!t5 z+~&bB2tW-WT5G>@*>&fN`k^LQr_X zSrATj|8W30#0Zt9)|Ht}wAD7#X>DYwiUdfgj8KA*1!4;IN&}!Axjqecf!scW-aLbG zPN#PWU@QjqHd1J*hX9i$jUfev?J6zqw}8si~4qo^U33J#(hECj+?;1-?mdQrfz z2x(K@q4f-FM_SgU3Q(YXg(5ad@A^q3k^~Y?bZhF`uX%%1(+Q|Z5Fi9d2FlaZ0~7(U z+5s3WAVG;3qeN5$>J*STH`Wp!ut1A!0oZvaDNx+3^A-k-kckp7Apnsc*HUbTLniei z8_uOuB6d0vA;6-FIVPw;go6@DyhFPZNjcGcFU!C{Jd?m;bPhTxxZ}G@s<)_)r%J64 zTRNG8p$v5<#i({Bh%8M~SnOa?qok;X1RjNi4bJQ4#){4NFYAPL1V<+ zJ56Xjj`JWy3D}wDodBGKF2pq38bJI&$3RGU0>e|z$sPF_;D-^^JPmTV698(Ijh0Sg zc@JkT%BmfRlt9A?Jz>iW3rR{8BhF&p1f~aJau=5X*kl|Pl0azCkdTK!rI&_mrov<) z0~i7yRxz;78p=R;2?;0|r=bpbvw$1CHGk>fpXtt*k~W9bO~_+_nR&uOMoDLQL9|DS zknjnhVG-3l_y*29-vm7`ZF!uCLIGR1bAM0)+81hfXa{~094&m#$6z%n*KpQU6IYOx z2Ov^rN|&63;(AFtNkO{>IeFL~85O>}dckntDPj3~|T2}MmKMmXo zB$hysNhEPdxlH9yP_7nbJAMtu0})qH)9B=X9Lk=Fo5V&5QzzpdHPEs4&=zB7^prfN7v=< z7JC+i8us6V3UCjo#*Qej($Wyx&Xt&XkhG*Z90PiGd7<$4l~hyqkcPNsKiQ2IFWNyr z`53FqYeYs)(EqZ0G1!D0h31S#t1YyyON0qltTCL2?VyQppf&%w^`%ggG-gXmR3d~B z$;U!~hkB@KtGB74T7=HQ1ZvvWA16oOgH8`ldA&z|O;|WUxI-UMPm}6a#`FsXTMXeFarDShtZ_#vL$c zImp#fgE@cn+Hf#pk>p0Bl2J*R$)_St5*zB!WgL!VsE!VZu-pn*1$T z5u)XrjTeIZS{iMj9^#9MkKYf(o|DL);VI+RY(s>{9Am6F3WrDr;Q-VKBa!MzP#IF8 z@6bC&8BR|@DpzgYw34Kz;M`P@67D+Pm`9`op-c*O^63U_R3wBXB7`&h!QO@9@gc$uDVe^cCT8z@$dPo^Cs`0&huqAI1fT22=35X);3pQ)j_Md zDvOsWjf?>4d#ORxI41*g8XJP3-ukugR@>LighCLWTX0#+sfgK*fFS^cTvsSq-hwY$ z2O#L2QwhlvPMXNWSE?-V4VPfB*$Wdq{7NX$GIIvC}OE?xijoNoU zO#yzobv1skxi~C?(1nDyipKMG z3QmKFqwhY7_BZ2u;l!P^Aap3A3QW>8j0iv(Wo;xZvNOg68G6POphWT%M4$XA>7ACjqqXY&dO6USUhrDb#Gz1_BF&If5D%f#mL$t4r1TW|^~lL=xeY zg`H3rvZS5VVHmHUakpv3X;DL?^dUlcGR?9d_FTRJ25GRC5jm+>I zJm-<;5NsNZ8$dw-VF2f#-_&JNbp29UaU@Md?hcUIQi2Vqkkus4>Ewl=c=il|!zPtb zOG^-H{zAHmHrT0kHrll@vW5CSkxK(0Ko@ToMn*%S8ji`j0}uib)aX7v#|Xaq!aMcp z5^qIKL&$5>LJ*Q!kf#RR_A%B$77;sBuOq?imBTz@^PHzGaaq`H(o&H}=^+nvkoSeB zc=HIZ8-P8Dw>`itiv zSKs|Q9&E`aFiDC}&GsCB4+5K)ZWP86%0^0yslHO@fx+KRO$$Xme9qXOkj3QWLN6AE zkYo^q85HV8Hz(m#u<$7VffP^DVFmu%O^880;shlN4h$)U5UI$mFRTZI6;5WfITOzu zAV`ta$PT8(#qD<{DkR@Rh(&95J@V=bRDFRJH;9)EN(_Xit)=I5B|#SvMT7}dR1*YW zef)D?MQx`KSK+&3VAT*ozg2xOx?{VEPGOWvX1_%q6eL#~jbds`r;+k9s4VkS@KFd& z@@WS~5e?xoNi~-=_T0$-29p?c_uK2&>AtG&lNAQfw@p3F3pE^KFb5d#Rcdykf2i(q2Lh5`zxfg*q# z#Ov3j08^m0qZ$*r!rzsTJhfsT2h4}@u@i3%5&J-k7)U#w!_R0QY3V^x1Kxhla{d&1f@7t$YM0afOQDjli5agPG@2wup*FRq7aIaf(XIs1KeTL0no+o zNr&;gT>j8;DzMb_!*K6y*u%;Fn<& zj_*!N9e_hN;p$v;)u%dVWD!qC#_zd1Vj>Lb3mGaNtTakPw18NRG7L@-5^XX;NvcaK zs1H5fyq&jHw?4cfqvCc_Gq6-Z0~WG6#av=gKJ*?Mn}$JaE|4k1jjcCAbF1j2 z42PaPe1;$8&|b%9DWw~A^U%K4il)y#Tc5T7{G+sc;0+)B@+x0vvjf-kuw~{R1)*| zYK-aUN`thANfE8UHrON9w;J@;eG|6I%xY*=)yG+OYa!FQ9>aK;JZAF*DK>@$=I94h zX%k=yg!hr5USK=qijpdl040xSWo}G#s2m_D+!PJbLzn^rX|ys2jI?P=*ZA|1ZAFtL z(L}#eW!UCUxi6KRdQOE4qkK0fE5Bk0we@61$b5E zXrT;&pnRSDjW=E1sgAOZOPGMCbQKzi=@qy(gk9u7%nu7ikzm;mTd3Ihh< zG*T3_aDe<>Sd2i}GKuQxeRb>Nw!eaEsWqlkHJE||p%@~j9gu&sERL-x(jy`98=j*> zbA%9R1Fj4bBga(}!<;ryElkK}8`f##)WAi9GMb1lI54jl74~^b@c!@RiB!nWu$mploQVs?g0*J9m6S5RGY>kT0>X<4yG}xb9Kjp7l67w1K zRGRFL{<2XZYAA8_>E78G`3i?=fMk<+B|%jW2(3UO#w0-FU4 z8$>BkinnF0urRLEQ)Nn8=`0i)1%w0m*jr&T5==5gdg};W0sy8El8Qj5fkHH})~Hk< zm=b{(VFS>@L~LP^Acj}f6bL{@K@{i*n0;~T5-B3r314x75FWw|&9Sgy*9fjAVT8%4 zBsi2(fH7bo!GsWkRSFy67KtDQArUYzl?e77Xk~&fM@9ZqQqj~Nn63GToYIZ6xRnhCr5_|aq zS?octZkjug9>@xw3IU8K^q8Wdi1vt26lcnDm$)ZVNFr{MtgpwvK}zW?(|1=kDuO`2 zFtfQwcnl(ZKSd#LaY$(eaTE>#*CK1bJ0-0yBT!hxOU2-@rw9elA`NJ)SjbVV;47dB z^TjM2HJCP##Bjv8*NK1$nlhp>8~9Yu+6Tr!e}~&agdvFtjD(8K#fbZ=Ont%-P+|m8 zLC#98!);k2IWUF}bLxA=7Ki{&f~W0Qo^L4Zp3Vmz{M&bDv8k$fd_Il|o z1paV44h5(Z08&N%n8_qcA$9tprB!&^8G zqrg9>a5PbQAF!bfozr+B4uuKaR!F1q4|@5yME!2)mYIp0@zwqGA%q0npxkSGR@yPY~bicC-XO_ir%OSz^^grgb; zU}!1C&Z?i$m??d+4`J2L*h6NjgzbV_lT}~McBcrU6LP;#ZLA&>Fz2wO4vkYUb4ag?}5l@X@4@bBaX;9vY&msL1 zl-wyiVtaT%BuNx_Kz|4{KrR7P6v~p!+SZm*5qY1qp+TT>L?K763U|X3Mij`FtcU49H-8(4 zlE@uF;Gfdm@ma0pF2#D>uyD&0D>BkR-lv$Kn^h|ilb;j zAq4>ZUA_bersa0g3GKJ^!NEHSDH2f$8AB`e9Sy;3<*{9x?O9A*qUrzA5#Y$pXwbi( z0O)Rp3Qn;YKnW3$K{S@rZQqDvZLC+0?zXSmSI77Fp8+QPlRW`v2#zNakGQBv(sDtb z!zCFcPo<)OrjmrLuMt2nynuX_p{#q;yZ4+LEd?e?Kj%M|GK5%?HFPWpWQu=Ud(4@; z1LUHJ2>JB?A>pD5q=TBcn8`bTO&GzrL%$MYV1W<*H;#sILIjY1clD?Fm&H#opYNnq z(D^*`yi2B83X`ko4x9m9&2yaXVEgwCsc>X+Fo6gWQ}jTo6)QB5w8|Ck*Cg9tn*8s= ztERU?xw2O2xvLjfS8PcZNhr45rfT79QB?H@zzQxBBDfa4d`w_SaqZk!v)B+Q-$D{8 z?o=fw-P1Aw#pa|*&Wf>pkTQPb>nT3SX3sA!&N^BQ$mRG8JbHolF ze!d(Au-4l{+{o|%drKWjBN%{2B6h@fBL4|MNLRFlF9U&hhym_rQiyWp&#qJ6cJb{x zqo#~JA!@38&qa&E3B7?pNRW{wQ1>Jfh!V0Tus$Lygwhcp!J7unwm_^@+8~XfNB5tr z#)q^gYqv-Ml7tHOc ztq8^Tw0~3_3Fr0^=qzv@LTpr+U~DE#cF@btEV|zlxq?5qLP6qj8KA`qSmL)I1Zk}} zfIh-VL1HXJC9)Up2_{@AOKmebK{D_55=w?8+T=s?DQfsFTWZsiAEk;Y9QNmiz6m&! z-RXN@Hci{*Kyl}@gbWncgnXJbZ7(RcTTdL(#65~r3DHSnTjJ@Psf-Cy%Ri)rTr(3o z=47ZC6Omvw5%eLeX5l1MoguH!%MKw7G)AlRoIS=9Kdwh=Dii$XlGjIIa3{!k+C1pDSJ9mU7Z2Z5E(Np6qIM!BQ$)Q{d(Ot|u?C)xhuvU>bF&7zAkSz>xW32}JnFo2h1a6#`iJrShe?U2iLm7*4~e-+taOA|7@V z=Dy}DzimHDivooBpeyIP4u= zL&?qjs;D*BRUoh+uofZ^5Qr-`2z(0x6R{)+pu{<=jl`G`4l5A~QUantHb9_2Aks7_ zM2du1iWv$i0TK~VfQAr?Jz)jNFbpV32XyvEShoO?f)HZ1CB>CsBp4!*iv|e=pz=_q zh>Xx^8h{Ix&}a)FfIA_mWkdxHKl8|P+3NcO#itKL?IhP-b@+_VNTsW8XJoTAi$1RDmh_) ziIhF(iYh1WBle0f)qaiKoT6~7L_~BXrw%lw3uM6mbv6@`>xJhIaxhXLg9R!a;9ev4 zl(wqY+QqiE4Q)3;^G^R-L1FG9w%8yckNF|v{wSQ2o=bgmG!@pUh}BS2|7rgg;=EYi z(u%q>v_@ScX$G@7j+vfE>2flF$QXw_9vkkr2qK{Ic zX`A>Q$_TCmvdI(-ekro($qg00;~cBF<|x!4kd>UUJDHrKDAaNB&fWK|=urR|bZysr3*; zD?>2jlp?8HQgJ3G%!LRCxS?eYHcknfdm+<`okZ`wC(I5C#5FX;HSP}M6c-r-66)=; z+pwA^Nd)dtz31uO^M@XCl&k8sJ1X*7W)Q{$Kpc3#&#s4 z#-Nv-(yb;N7FFVPr=dIz0CxAfaSkEPVGS|6hmb?5*Ep-Z(xHtpu8wa)s)`OcXm(<> zE`tH1VjB*fQbg!57@rXMg#!>mCq*cLQ4WfBOmIRenw2?eP7=u^m)N1{wvqs#Cv@*p z6C5WAfC@}n7J^vQz!=8xF&iLJ6oC!mW-Lg^PX{}CWgl_!;9^{0><<&OLabQRbZ=!C zK)i2^iI~%Lj7eewQan7hNAM@YKux+YKux+YKux+Z-cQBkq87> z21p~r1(rmMf-UmFWC#lrRi|zA)l;b$A;693T zsGi~*)BcOx*)k6lK}?y{%%9TvVlIMjiE-X_ReQerIpj!^WX5{SdCNYu21BXQ+|vd1{?$aCUmF+{zT%7YafsLECgSHnAZ zewaz;+9!gra(~AxIEzdiwT=!X!f*rGSo5pofEJF$a#)%)S-6kjH3mz>-WPhI)B zp#)Sd_dERyRd5Lir{Oq>|jScpiZSy(P~cL8z# zBXN4SOwGf(#i(0h?Lz05T?3fx1tHNA*2C+HZ(?+=+)<4Z3QZgRD}EWyMm^^F5K7|i zehbiZ;zg1?udz)XX)_JMMHEqIas>Mdrd7;EoIAxz06l1)^tjW)h7zv;#KdZ!#*kh+OTmGR`2 zmT(8&C^L!er5>T+feAsnKBP6nh)7i!h_?iZO`#1YO^XOIG=e}uQfgMvDFz`MSgkNp z2?7E%M$`)ugYL09Dt%i5!!d%cv29Ol%^+yD&r$3 zk7L`K=an)IC!~l5gnVWh)SN|2K7#o#qhg-7M=^>TnmY(zdYaRbR8#7RsX30w#C(f_ z5)a0B~Qp1o#8Pl1~$!bJbKRprC?56|t~IkhX;w&NJ}f$^%#7edsS7pcU4-aOZHCycs_jmsuR2u zhrL<>Ql*~~fsjOk2haEzfrdmCER;C+0s92|N6(Ic>e`$Eg#<(jz~M?MgoPCtYhE@f zU8JW%l7=05JS-CdB8joNU4|M$%oK$bT3f`f0J2&G;b#(YBKbkY=aJA--o1F|KFA{I zNJ$9D#BhV{5O843JP$ITX6IWphu7nFjQZi0(|Cu(AUmGLr>r0_J#d~SA!roW^WCdg zR#|IaN=sd}HAp1TpeYCe%M|*5tV!eBrcFr*b5o52KnH*(&R25D!fjPukbO(ED;@kQr4L) zK`IgvkN^mb3IYKD02nYp02nZ#23Eioy+DK@!+}aBAR(j$5VZyfEB(n65G)7*0E#$e zBOO@As3aCFkc4m((kbrAU8H;A;KVctfy=2+tdJuli57r-<%U*3I4t{%K@O1Ws;aFq zsba>7^5MA76%iG0?h_Z1ha#^jQO$Aq(}@vTGE@}eNp^ z?jQAkGAgw7^y=ucL!ro2pSl7Q=pn%g1p;^1hSs&UwXNq1&`gd?B^exm7)THx;39$6 zM=^v*#K-{`K&l#$I{L7f5)R<*vE#%ueLqB(@#UP3#d#Duo{xi*o_5BUUmIy}=y2pr z5D1Ng21-Mr2zNV%g~d>nOB61-E`Ts8J|5A?B#?_6DYRpF@qp_}|G76Gq!(T9vkIEwuy)hJh5QgQfxYS@Tbjl!ykQ zU{(`m5(Io0Dh>u49%dZSttQeP$wh@u?S*7>jnWIKdDYJv$*m?bBJyd%Y?8BDiVY&Ko3M! z4ui9IBvHY!;jlhe;W-N}=rf=MQIj03;+fQ+^&IJ@f4ji}@MB!ya zGK!B4djJp11n(lYNdw$uq5svvyY>bkBn%WRc!trjUViPOhbK(9X#lAvSQNxz8j`=}rmU7o z)JW$b8(0iIaWDfUr2!ai3kfXbeGo^0!b1r}jVWmQNg+Ks2MAWnGzf_&lAqT$$L^uA zPZjK+pGXknzZD!rPW?1pv}r9C2Jvmi3MIBlQGJA{2%{T0W|glF1tktzOD!;k;QEE` z3U$%FyXeRDz?y2aX2DQ=$(p>);rrffMgY86%ag7Ff_p2Taed5!+Vh3Cx}rBkkZUB z5$yuur|d(F;&dlXExZaC;Ef4JD8@-ym`(x9OmHdBEb4U6IG3fRSO|QlQ;!P{5lY4w zVG3%}^OtN-)#nxmss|l$1e3UYD9fl zX*jL{+!eZC<@huMR@t?Yf(My>D;$7=$)ZVM^F^J#;eu**7#l#+Y>Q;bWKs&8eGQF; zgc2Y^2EG<(2E=wDCZS<=@XZI56P#SlI21Z+E?a~>cqmEfMgTBd;3NVMchx~5oi~b$ zKo9T|C_qInje}mG(7{x3OKI(xhB3+p3v?t)cnyy}Bmo;Fm^I>j{nvE#Pc!wFu#S-8 z2XKF9S_4(FE!aug#2l^Pb57*vQ^L`cDj zqQ^R-FA7~81~z(z1%ZN>CWu->!$kq3S`;iyhM}d#)a*3^%w#_b3<06g4HcnyiOe}W zhNGb!wW6*Pf#NtYCMXDnC4!_w0}hGA;Aiy4w`9ipE4J4rW;B&<;=*bEQeLmuh z{5mD-!0wJi@2Wo11qbayiRB+?L_{hguIPZ#(18d+B1!5DJ^X{~cQrT#7;beja;MJ# z8+-*%71z)M)Ptl`@L*C%5e2pCkI-lvfO^C6k&-Nc5C$j$=@WLU6bO6Ja*kDY+_PGnO|x3s zH3qhd)qIt<@e)mFTLh610?Q&;5(<(=O2DRw5J)|H2m{RcQRi(#1P^W0B7EuCRfqNA zqDDZ{O$zn!>^TY39sG3D5MhdUw_F0#oZ%2H;OQ`tl0)#Iz-^;TOxBXotW_4$fTl51 zH7&0u>28*@HoD(YTR8-ODqc?h+Gie$DkhmziJ7PtKhJd< z`qURBZ7CX*+FD9VRTP$#i&B&-Q%WS-EJP6y5s1P)`6Vk)A1FAMGv1tL`4oM!F#-fa z44kDm>DtlK2|y1}Adtw}v^-|^aj>(vr#&R!a^e(IO%hqe4kCniuYK^*#?*gSze&jG z4qll zAlOjENmRvp(?QsQAtOXSA}7#-m?%0JVUH}sGw9%600CD|*X{dapYD5`yNbtn*K-CC z`irPVP#;fE6AJMFJwkWfV~$W@A)f&~1WpXFzQ+vBLSn*<=DUJp4I~*E5vUGvHAK%( zPeeT(SjhcH0Ru_Oczfioa*u!mG7CJGotMI=L(0YMRw9yZ#oA5no0`{!8T)RMv& z^luB$h6WHBNofWn6ky3F5%#1-@qA51B%g#0B4Zd&S$Q=Sl6*!4y0q9?1{6U;5au=m z5(G3BVPvBOZLUo_jNMrBA;jom#3P`75gK-;M@L4GqXB`?Cz1mL>PjFgsg{0+8Utvt z6IT;)L(+tqx}x7_bAkAurOsda{Llb8&d35o#(WHDf?*Kz7=BV6st4u|P{DTDSI(y3 zq@yZZ)@pAGJX@ag7b<%29_y$??SS$*lVfoSrlcVQ@Cgw}KkdBI+E;maH=9XfhWh)0 zM5L-|W|~VG5}Q$FR$@*DBmy!35I_^0Smz)y20OUBx-@`A)t!}zW zFFNbG>PaMmA|fZ$PRwB#h=_^#{zv#evAW6!~Ion@DPPyJiyJCSyTj@Im$ zdH@n*=$aK|*uMbUm`Nc$d?Mfz7(@AZyy&SgeF(^=z&(hCeG*;)iXO9k8X)`J2S^w? z-OwMf=XspNx>w$04#i_Y8J6WGx*gns(Ob$gFXxMjIMNdG zK4W0HLQrV|^JE9;Ye%nT;2nF42cW?7&Mb?W6=M)q6Z$_!v=V7bXgEBhTH+VCd^z*4 zSBOGnvrfz~R~)C_JDsmvHB-z)EQ8t3SNJ%ZZn=G?B?KWZ^!q|QgGW9L5nd&^JU5@2 z$?^ANh`oHE%_w{t2uO(t3j>4c z*-t4rCd*a+I2{C`8>xtmRJyF5?4@qejpjxkcvADyw#cet_k+lty72bo$YEan#)1JX zMI!`0u=4D@2OFKm_%(gIK(uB8dl91kO?v|b5iAmoMcpmied$Y~52>^w1GC_viC z6_OlJ0#YH{c8JsOQ0c8EOUmWGgYgyw@m8j2JdJncr!=nm*5m&(<+J=+)?B0%(% zO*-k%l^QCAS405AHg>>+O+>S|x4Fc&b}CTm-`ss!KxW;TY6kM>Tp5J0uyz>NGX)5g z#^KKT8exQ!f@bAE55)%It2Iq+G(fQ6k1ZwyyK?YB!jQH#vF9nm6QMn!0uqwZLdn;; z+jGd`8QLO0<#2AQqP;h#XhB7FmVv^|6=B*#i5!za$Wyw2HqtLGpD8xy+d&&Y;RLcvuCPDHciVXfRQY@1??kHlks?&4@aX9H{^{p*gY#d8c)U2;{Kv zCJi{_2bA7z*cYM4H<=O4G3Uaq3$Yp9_S!V;1amtgsF-~>gK)g|17WEm9k>VNsrg}r z^UoTQ0}_q%0`bT&Hr#?op^tiFjx!G)Ms7}ymbzubY^eIblI7YHrx4b9dSFqL ztMF5CzdpLJ6SzI9)LJRuMJMDjR2Ra+r`v(j%vzAzZ>jP_)U>fxzlwf<_yY!>k+z_17$ib9^@hd3jF!KP}|L z(dVvl_~XFwJ`v-?QFhJgFnZh1o7kj163~Dl0`UaLzkFCVj0|47JwB;zGnMK>gMkQS zbwK_Tc>Pa8I`Q74v!54VJl3kGJ{$zD-Zh4($Sc=bFN(Zq)$ONBbTRaQ5h4$Z_>Mfx zHebXZ5>VHmgIsjJ2x3n-x>ZP3#*ZdP%i4HDdQI$b{Cn9A=Yy!U!d)P=I%g4txvo>2 z4*cddHrd^4PGm**5lP?3bovs`gNSDFz2+gtg^lPV0q9gF!DXCq7+$^CM4c;*?!QR+<20ZTCf&Nz@(L&IW_TDjYAR0)!lV{y>7yDZ-G@Fb?C-1N7X}sN zV$N?SeD4!6Qv&V>16)SE6Ym~fZ^^ds!p2L(;yFtW+pMo-Y(fPJ%3TE%0)VB9cp%)k>R{k<^Z*UBjz=$#(4RvMiqTo$`jQyyZOhLH!f zxRFksqY8j@hSj}m(q%_eV`_|7S6MQPrjV-%@c|=@0uwTRdWJgDy|l*5IBBhbHFV0%)qdZe&9&m_`LTK(SX`&VK_Exs!0*<08= zv@n(4o+aF=(}VZX*e;Ex*mRb4jA@xoVC-lY%sm9tYE~( z#vJMn1=#Ie3AlZm*ibfurl(>t8czV^JEa{m=;4_l=I1o^I=4D@`u5X3cL90L4o_-( z@eCabEb+docofG}?9WLP4^LukQ0?-H^4p`Qey65|!I5LRiP8}Esay;VN+_k|mzUk( z?jBfq;s74qPPXis8VDO@!ITdP<{(bbLQNLP8SWc0nAPgp5h)mlr#~NT)ErAkU8#OI$}x$7&IHXt-w8rYnw;%H7c$VNl@WLo z6Wi%D@ba4Kc@Z|}I&3MCyEnq7p$v+8&bc9-Y|}HeA}^HOrf!ZN3^;vH2AqcCow{fu zS*DA8<|43XCi7BCma$rJ>8DF)D#;+R4mgK2P0;A!7_rwA+F9NycnL8|z*pOPgGA@iMrw z6c5k0GokX%BZ!mB*N#^&G2@#!aN02%@#l$Axw&r}PVV|otd{-*w#H4O zUzf9=J#t4}Ywfz7VLGDm=Jk@3tzK4TtxU~8;E53=7@}q@(B+ymYYlX|+ZT^W9grk9 zn(#w(;|n7#TpNrmP)@txEHY7CL@c9>wS8xyO<_HC+YjODEibY6Vrw1Q$vG!>2&}-# z#KI7g5@8vr%(4ks+S69vUl*4M8 zr4b1&Aw>%`L{JoBD55A3jS&&1kZera2*gEe8p|Ri2*|P!>?>g9(Ban(*HuQ9aE83O zsd{^35a1-qFjek%T@d<_(stV|dr5QL982?9(w+7~h-Ra;h?U=23$53syhHty5L;cg zi8(qi&5t~dyxnMaObtx(jf`By)fQue!x`b)zOHpkRSfNM_;|ylbXP8Yr^*gS;fit0 zY2-tC9gv*LyAKDe!L$yw&bV&(GzP-0Yq-1M(*s8g1_x*s8@Sb6F6LNl;T}6o!aGFf z4dyz!&+Z^;lqGZ>o7~{YZ-P=0AVMp~2}}my(+Z0$meOX)Q#RhZ&f2?B9!WySNnz8V zRqO~%$T(wXV*tmIClJ{}97WW5O(+n-GM2ma2}YR?sleJaFoDM!LxA8y5Sbwv&haFm z=39M|S@ZUQHrLgzq>vH0k&q`K?VaLCoIus+9K{XPbToztNWJeE^x+ccWBl-5eMyVh4VeoC8F zyiB%@wX5_l%y)FHKJ3k=rDc3=5ek-y^pOo23dU@ct( z%5`}IDs9YC5karg5%6-E^kzx>IJE zMMOaoA`YQ#3us$Hh$0K&K~uXF5k)4Via|V+QEde_76U*+s5KpOfSY6$tbR3}wNlX? zlmdjP1Qj(CF*n;BydnR)nZZu1T8j?hB>9@4$P%%Gx>-kJ#HrL2aTllG4b z`AlPN$*4o4ol7)~0yuzyreKCN16-tv9#sR;@8ok;vj^$)OA+aKfAu0J>LK1nKWV1! zMn$aZ8bwLU4%%%ry*8VgnfoL4ZK42kK#ad4b(%Q?loKcMW9^)Vit0IO#;rZXyve(V zH*ia^aLCpi-l~0T;S=JR$&k>rkD*W3xbCRw-MHlNdQ@%<%@<*tuy3^MK!f%fGi7bI z@g7A>c?7 z&L8&oSf6@*NLFS;2?YR`1x0B8r-R#L7#|rD@^`2Y9^eEnDm4*WAkwlzm@r@Eh(up|UtNA;eA3M?Fu*z^FWVTziIvRPn2r6mi*qL-C|;T8K2YJ+NZi_Uuo z1$-CK%0T^SKqHq(Jwgl=rZc zF*KGaN+qI9M@TGqoq0G+cJV4fD?mCxg;Z`_Sp~QuV-#A_k4mUb$L;k}aW|)N-zRhq z&E1t`9>x%edi_+kSkp|W&NTZNE5S}M1BiBU$uz*lH*9w}QManTOL7jOy#xn|3PV)L z@roQ31CK<4M2Xu~7z}(q3C+62w-ZAF19(kL%L@Kok}e_ohGD3GzVETAXvN;mA(#j)FaBF z0*Flxb3U9XCVY3M6lX?CRy>px02+4rmRb6X=aD+;wRI(tUZ2&c(MBF3K9Sf*D0fz4Y*NlI-P+KClM4oHSy5X*Dj zq0P%{=RzTQdZ0l8CSCM+?>mrk0G?mY#h zh{!M?0DHNC>pG4{;gP#er$B@!SW^@GhyolFun3|-iKfvOlf*Va?fg_-g3bZ?I)M@? z)0bwf1IyWz4#KyhM0rP|H8FsMNe?oF>}C$hA|4c`n(FAD8{`}9C^88UX%fI3}{KN1Hs3MqcRJw#4z>!3Cka+9|uU6ZPLP4m)Aov^NE{*ABhfjF8JP6-lMpudPd zpFQ)8Lco_2vTVawBo+iH*$5nR(E_|YN-<&N-UD?Vn>;o{OJ#>S%R4Yk1myIm-@NVS z&Lt{S(U-sxK&t4OAfTchh-Y7K>e5XlvMKsah>_gyV?;HvL)$YyaO98Btnn|Gc_l01@pKFf@CkkTFP&McV$(tdSmQf80BJLF zL3b!x$|gjP^k61JI%z+o23Q~iox*fGyf8b(N^F8q?1oh-2tk<;f>03Ltss<;BAjw> zOBrFqqp1%fSHnD=*Ob^Djp4_LgT~BqLf{{KPy?%o>zk-tAqeXZsD_>DDUs%1PJ(+B zb}}3TPG-%}`eP#uGA8H&#rNXfrtbo7x~5YLRBI2kUI_OB`XpFC(>rV zVA`sR7C%?WWBcfSW*@wUWs5jJYekG3nMiIYx&7xpuBdqGCpbcqW$M#XiPcc4Mf#>B zZv`r9YKQ?9M;lz)D#)S*5cvxKDCpv(1}X-^{HDq80MEDGLxg!Ol1Q8b@ukP+o7mJ1 zVr_sZgMw6I5sLsA#R#X-bQc|Vr>5%8xuiUF_G4HbVz3kjNf2Oil_3JMt|xhT!6PJ? zbiiQ)jSSN6g4pc-CTzT5Lm(*4YWtw5VS%qNY5EjYtQe!WYj%Pf0l+VHLg3zJP9&0u z@Ga9yB}xd0fXQ~G4GGgVIe6@i;%`(-O>6X-S~m-aeR!+g(hi**OZUbZ85ABeKa~M| z&n6Vwdvl%$Omm8g(^;ojnVPNROeu{J;|kXuu;O24`taE}FGw7Ph?k4G&J@E9XFkj@ z=-zVp7BLG1AWX*vLF&%P0KOfVIqIfHZinhD@u*;8HpSg;bR8Vo(=BjcmrhI~^7ukh zbmww$;lMT)Wtpedj2fZlVQZmBnYNQnzhXorgfeMyh3Pvpbq=6H+^%Sw<;hTq9LbUr zTolaKu$pev5opd#VG3@kvpA=Pj!VVekb7lgh`Vy}q@s2nZt10*9i6iTMr$IFP)#+F z;tvIw)@e7i%nCdiBXu2HOKM^#wGVLlcW-TdTTfF$_$qW3NJ4bR`RY0piSv!>{i6KV zy61r3H2doarAt_dLar|7uSai>kTr8!mQV@dVjwa}Cthe6Q?PGNGXUH+_u=!1--Q#d z?)ro!OG&5^%#`;i9+Zcc9UKBv$Byk=YN9G8Em0o*kU8L>l5l)O+>^>fpiKaYm~90` z$*^M43e()4bLN!KeH6gOWc*S?i7SJO8gm#Jk0uP5_j=4&WRk0bQR)si(t*%~ilh{w zdw^&Y=pq7Sz);)=;8=EtS-QjdP>fw&i19+9tWmxRe&~(EcJMfxtmwm>=Rm z$Z_$e-{e^$aAeOB$C8>sLPB|Bs0hJ{7DTlJ6s~C6QYaIo!z2R;0w|N-a0AG(Fjz{8 zMwk;OBWBv0Ox?BW*;c)_yNXR#Q)($KCMpRel0p#(NFtNLQ?uwl620$k+bOb>DEcSq z67WQlL0CLcX?f6HpKSyzM~ElTnWWTkq32W~1ciaE34tQ6#7+nq2zh$6UGqptUd@&e z#Q{(zwy!OIgq!jYE${8FYxiLQRbM@7x94kZiq^E53vT&rn#3&>Oew?i8lM}0=s`#$ z*X;Jtdx!&J1y~;-pq@7QCw7;n0M3Gg`GJ4|XGn}Z{4J60l;AVR-WFX4(&Hbk><@*& zjbJvl0)RG*2)syS;Dm@kS@WI5*BC@1s$pV_02m67dJsi?I+O>kP$CHGfJ4$MJjdMu z)5e3YE3p+8`{-VD`g*7i(b5i;JPbBigpjAzenMII{zpY^cz{4+3nECMN1)J!Ekk;s z?OTu6QXaw>IaZ3W2^N1D`fo?(5{Hu=<&5zxDk6xAQL8IhgB4((-hc1LV2tP&MMWwsiTj8jq91oVkb?{0e)|us(3AXw^&jV;Woj)gfWn~>jDsf0ZP1{9 z*@9RSPlcfg8odBcqR7FVPH;5m6(WR2G7O8zU^#kDAu*-tfe_-Nsn8Ao8PU*-kUl{J zpxke&;WBR_1|%8`OiUOHI4VI-J;S1aGnA-;Blp1j0Vszq&dgvT7;X{{pn=dU6X;K5 zQSVrcWq)$>URtE2*PV8|6H$P+WZGJ{{Tj1dZGXM|a64)wKp`qhPnX;2Jv>$f(V1)XifENGTK}6-NYj8)P(!6C?_{qgqKL0a($pg%X~goH#t`fn;U1Tp>x; zG&#UTE+l1D^qpgeKc`Okp-v2FC5)0nPST?xI}#K|NVm6kySi6*BoR9ya+Xq&upu}a zbE5rnfx72MH12U=EfI>w+D*)Em7{9g=k0s#+L->Y`0JfAK-C<2U56&|rZ9wH$O|B{ zAaUb8q2Wgf=@`lql$E0f$V5WTs8Wb7*)fv?o5nDdP*h#^V7Oo;q_zQO1F9HgNSL97 zIf_E@l?>P%&<;t8B)o&@$${+Q+el8k5wGs+y495(wLv+O$v4> z|MmY(IX;%s!iteC8(^o`OWG7bSd1&rkHi^+v*wSsBo5H+Jc52^0)u>lg+MJI(a9w} zSxAD~owiH8|7QN2T{g#%7#ty_2?WembWf;fBuGF>1yDLWw4^D49Rk#VKu`uG1lVGr z4n``pje$T2l#a9r0gO-rd4rDbdJjj}NTVtA*auMbcI1GM+ z*Y9T*Gnw`IJ9gR~wPL|zvym=`MoH)yK?1=9&CDfABx_DT`SohdmCATfh9 z26aEd2a>35ju0&eL3BwNpfQ45#9ogfDbS*%l20r+LzJUfp^|YYZxf+7p7?aosWT&3 zj({c%n*)&r(FyOwf7$B5DOqWj!onjkWM(PNCv?zclF9$WY!7tUlITSbrmvk>?fN-a zCKfioTDYd}>a7YMf7U+@#zALk0oJB*F*_7;ROcV`GE9Uzcz4xKlfUeqIgXDM=Ehe> zi2)g6D5N-(CXoy>mgs>rNiK#Mq-CR7#IY5Oq1;XHdc4`I(6>88GXrWN24t8THSB!5 zgU#vl-<#X#we$A&Gcxz0Jb+3Kbh{yg(@Ob80Ko)6a(|;~D6YB*q_;xJGJbVjm}x>V znq@yEE;2yGCX@zDW*}<-_ZeL^NUjTfNe_DWyM7k)dieZtLQ6FC5e7xHi0Vs79*6Z5 z8J(N=-PLJ0kO10)mYKj_P&dRsfA6CxknlMQBGeWDoFH(bhm;ZAP0ioXJ{b?4&uZpV8k0NDGOmDjD}`u z6tYn@HC=VCi_86R!Jvvn1dNap0swoc5*)#(w9MNkrv@`75ryZZOqJ|Ai6kLA1jPZC zI23asM68WE`+Yo*lb_0Pu(Sj7fquiU>EBgO^+O7$#_j=A(-g!+V4ETx#6{#0{5R^Zzb9T@+Tsy14!e%+)=D|bY^A!Kv0|BuCKAfbqHJ5cnu@KK zA~uv6f(rt1g#0{(i6RXzHC;-gey1_kJunJHld^X|PYibTc7(?S+$n>UCu1Qywn!bY z0q@=_HD1cDXxgbJZE{}LjD=Isr7`3lja>kHZp*5|$afTnw67v*LxcU{r6bh|IfB5n z>(Yi`cmi1MMH*x-3cW{(PPi!^9BrpVWaEQUB6!1HOi^j%T_9*_OoO;X-rna6a}7vH zJ^|G}!->U#9raLTB|}z;pvI1%fTP`$Ng)Hi5~>g~GhXOxDC`!<5g>cX>p~OlrBN_i zJ{k%0L(f;Xjv&xEiKui01ri5fq3_0H;%T87CW@0yie#WPEBDK1|#mqyL08r4z?3>P= zFi4P*TtsmO$ROq{BAB{R#05>su0_4Sq`|f9Bo3*3d9j9(xQAmBcZ(dXK^Gw~1DLAS zAizrlUfUPl5i+~OaM3{?el*Rn5YsaRd)IS4j_fSRnPlM!p)7Y12U=)-R#%*|LwYc_ zlAbAN5$UZLW(d><$StL`XOFEpGwYYs4G)K{KJEd|VhC$w8xiRT#W5seA>GpMpzQ+O zuKiesOH*hj`ZPr%aDk{N3VH>hEft54Y99t^miLRfO*hK(-qt-YRDM80y*vZ%_YBf` zJi2!vx5f?~l5c~$+eHMR478&`&=#7Bgu*d0q(Qq33t>WWE`_3+)_chFtTF`;Omgw= zRSXz;08ryJ$S^<0*;5d@zyVT@sFW&4eo+XJ+Nh99C$h>(bhVjQQPzspn&n3}uA55< zL<`{Bj`Z+$L(v*`{4)xQSE`Fm#AI0{D}k>xy15QL31WG_sfP#J+8;8{& z0RGXdiWvF>ZV3x1I)lLu@b8o*QAh{T;!05Z4Prq3M^9P8BaWHCOad!Ng9t-BQs+QY z{_(dFqRzVr;G-f7e*nzb_@|sZ5GZ| z*t{5%#6GgL%cn4niiqw?6fh^0Oa@SfcL#~#85Tex5)1+mAaDizsOu4fb-4H2798N% z+lNIF<(HJDqFV|zu;FmZG|-rWOj5uW7!{T<2Vm0$1f#SufH7o&Wu;?DAX1DNh>-aL zR4Z64SA`CS6hJx(aG6FKWQ>)B)`q6E&;>%&YNAFXGYWn)8;1(Dg-kM1YE2VJ;>kqk zE|B3FD*;TgqZfsgZ8qVGNQjRL2Qem0R&yBS;h|GEfeBtPl05~5P%5Jmh*-xMV8a4l z54$Uv#gSM~;AOjvDvFnFN-6`S){db@kh!B6MI;bK85~i?nl`C0AYfxGO9~ZbWNAq+ zV|^^4GEO@LaE;k%yv9w9GR%`>%65)oySn0YMk^NEeDd7ZHH#UNRb=xqdX$9@2qWFF zQDk{Sq*IixYdW%q;-x;}hXC>3W2LdXIKMhFy02_S?K5YoUYDK6UWE3CCEh_2My?W?Nl z2^1ItaCu`L#0I)Dj>K7Ig|rrI`*#d z2~5c^Uav&`7QsC&FQaOFKlhZeD~^9tFn?8i^BkNYEC>)F5OZE|?^A?DBoMbkLIfm8 zbU;^veQ*JZE~c>+ZNU}i&HhN($rgXXsH`(B~L~| zG5GN|Kt|rmy+CwKksi{c@XRiAdQqEl9T3 z(YNb`DVnS~yilQ9?mZ^y&GA684e34ZWMiBu6_tgX##v;ii?$Svo z#nRbEOeWciYFue>_FD)OKs)j&PR2zTFv#p29DcsT#|pFlvA#EZVg_c|wJM~ZQ#9wl zmqkJd1Pqg{AwdWWCwcX1Ctw*42ND(qLEKh8!T>dK-;=BCD4?PerAT{q6(3q4yvPDP zfQTCa$P4T$h^C>SkEBGWbt*^Nb`cEk-pJVv5Zc(Q78tG;7yY)lyqoD=Ais-!yOHR+#={ntv_WtA#bc|Stil~T;Vtt>dS9RBG#!Z?PNfoX4&tt9N zi6F?X2#Mzc!Rt$hPa(X)4iS)0h(vajon0L<3*}Eub$`hKuHB8L%f9*N}MPu zq5@GKY8#!w_nloy2m~O5(Baxak$@Ui+AUx<0v$kiilz%{fd@+q5J&x^9VM+?w$|yA zlWNso{}{=nfDnm709-^#93p`dDS+W0J(LdkHfFyjX+j{uLu;iRvq$lgz#xc676*iq z2NHP%MBJUHXA@X0pheSA4W5{u+TJ^6lYKK~oVc(ev?Y1)Cydrq5_}Yo5ZFyz^+#|S zfCN*sM0!4xJOAZCI2@I;wM~x5lQB+05>8H75rQ-MN=ghxl@2+OV3VE*`$(w>g2E_^ zQ6GRLBkL;ILBpJ;(dp9za4>Z$Z@L#cGAFdIgyj+19tr7!kGS;UVO(7$2rU*+SOr~- zG+ee&l!YQV=M7!`(Ods?R=3t13OR|)%?Dp8vOJA>$pMfQgiwS-=TDIGaI!!TA>_I| zr*s6CS!#{ixgiyDSBQR88bhd%*hvL|aU#+}5=y3^G5~6s-~#bKt$+gb#08+JBz?jB zb>HyOg8naglQhDrNf^j~BsK_C5|0McXv8v%&WUU&+EFkGQEE#@%EH{)i>?$%HmO;f zBT7*b1}G$hwJVk)j~kMpq~j>NYmAap0YOy^BrdfXb^f6a2c?u}R*Yb;n_@vaJDWRM zr!7e4s;SZmO0p4>(WKgvi7R-HnneUbVk2n^Ug5ZLrBj!@6-9`6iG zg(q~^lt{MFsY|lpvV{%joHE)~v@60O%7U~@D{Z#LQDWw% zs#=Yp+C-|Q7&0?N*s8`MhRJP+3l&1J*Db`Uc3Z3#Rt8I>OR~$GXvJl{OS^PL?z_6@ zhg}dvc_zxG*H{@fvWs-F1c;cV&J+?0LepCXf)uieL@2oncc{Br~C9m8DV=W)#~KMbV|9th|t%q6b7X!!UGMJ+)oT zwl_{(9pvhAc5P`fLXuR9LUc=4D-|S?Pc5)=!&wLG)kCca914L!x(%>JCu>8N8s4;0 z1W-E7Xrv}+OyV6cm3IWqD7|jZU2e-V%)i6$*y8vnM%xh4b)`r!@mq0mgGndXHjPoE zNsXe=YACxc!6bxH!*IByA|YIu5jkV}XPjGA%m5@nWELU#hTnzX2DNUmaP9BE`Ttzs z6l~O+LJ83qZAzt1KIbk(T%YH5-sj_g-h#g(q=s`2u_-iXszZ@g=T%olAePep?CO;;=)!;k z3Aj{gh)7x?rUYUb02);T{CL_L7@(#oR8z!W-Z5kl;^meh5=Ej)qC|IDZSX#00}j5f z00q1N+9yM(g9Ir$kaZm(olDwMlsl;A>4^O7QXvJ=?=xbXhzDl>+F+m)bP&p>^wh?y z_!NyoG6Wq{fz+w^#}C~A2@zuoV`BgW?1_sh&_uq=5j1diIn6( z12GI$AY4+T7$AHW|lI-Mna&P$)dQ;Ian<-~vC0(AETmpM!{r?L`<1{Uoj1Rj(S0QdW~` zNQktNKtr1UoItE$(9ddFB|#KqpJ54sQiM{?Hk4RlOT=YQpWRo37Z|~Qj=7KJ9;Gkn z`QHjs#a>fzn#1y7+WX&7`UEJ5NQDq3dQUh=(K!fzSE)SyUwC@>L+;97QR2J~6s}vb zFf@=|&Zusn6Gc3vMF_+r7(>tDU%zeo`*mylbgOJ3yH?dHfG`pmEe}={6hLh}>Ij5X zejc}KR+)RqQ?A!q_gb#B)YPe|TIF1tn%PSt#gemWl}WX{m76x1Z9yJFKo*q;9*PG$ zQVl{tkjrIJU1fQusy4Dl*Rr{+TL-D>Icf&SqRJofA_gEir16EogwxW}eo$D58fa2G zBiL9`fb&%zQm8yi9TIK+%J}E{c;(?a$|th1h_P66p>Hcm74etEUVMhTjf|E($6yi7(0ynQa!5*PTSKT$~<(`IirU zaj`;}=qt;E6ATXGvS) z!{R>fQ~Baw+II$na#)+bbEgM~8Z^N8Su(`HwNB~wz$NH77fxEKio#Z95De8- z1we#^U`0+MdQk`00zli(P)|dWlVLn*>Gi-RD-L?nqz`g>IS!Oph^GY~UZs<}QR0&F2zs@tP_5+s z47}rN(^$Dnpm)Q+Km)oc4Umvsh@f{tL*HXSdrXza zVyLwGx2J-~Lw!n81+swFNTH$?Pve3}WmF8BL9q92T!KBl+lkC<{hC?;{6c~Chfom0 zCs2vVq((72LHP&S-iH{cL(5vPe!Rv?k(8K%H%GWCC zlA_FJ`So62ZksflG~I6MJ9R`!r0z|2s<$I+qMb5HRy0tnY?+wYHI-vYtZ1a#Ese3G zZHhLuR+6v5zrC8saG-lg1MCbDkUentB@ZBh*a%qygLk@W=LH#WfIzTAuYd152a(}jVej8iLVzSb=v5(rQOqQS!EPuY&&(xvMsmPuC%138%dg;XD!`wD9IQ> zSV)AJQrbGlF-s4)_6K9()}v}D+F$21uCV+8`-hrS@!_Cdz>|k$RO>i9IU&4Plr&6W z-zqc3(1`s{hymu$9}~dJn>SHOz&l8p2W$r(NbDQCFo#MI=ZC+@Y9hMzX+)o4y%<1G z*2tky0T~LC5kL;lL+AIMgA#mN1FPSlE%%Qfr*^m*D*e`iJH^IvlLRfqwN#gysZps= zDwebT#)zJtK|oi!o`@JwWItHS$;(aTg(7uN!68pqT)XgPXx?9zCEO&0A<_ht%{ro3 z<=jF^m_cG6NZKytj!<4P;77Kz#?EcP>Iabg`UEI1nIIrp1-4cQh>(m(ga@7v?a@yc z+<_D$pdQnRdP*dLK~ynbRFp7CP#U}8yP(`Y{dEoEH3b#+s}L80t>}b1cs&y&0#!&1 zfRHGRlA^|h_+=kK$UX-?`;;Tm3^Z>FM;wzyL7NMcav`{B+>VwDp_MPW3|%|Um|>31 z1R4@KdUt0*aS);FSpP_(U=w}-OyG-(uThxo8Xyi}LI@?rQ*-h@a=o8fB9jORltM}v zLXaU&iXqZ%O~^@5ng9)-cd&`S^o&LNxsCxL^_a585MhELXUzI&+JK}3?t)Y#Z*>Za zuqgCM5P-mtLMX44@k7jhlqQELj#5Lw_orM+Qf*67GXSqmC`h;6&E zW_vrtou>dnDlHR(*E-(rGORjAdQ zO>e7py>0TV^-==bN_PsSBpDP9GlEw2#4>}is1$0FDIf+hnlPHe9}5p`5vU%oF{6}2 z$w}E1e_z-i+dVG?L`g*a-NS|1 z@mK&>Mi5Swc!}=(LXifAdU&enYtnSB@5I&@uErWE6d@3h5s*NUxS$o@&<*0Bg9si0 z>jutF=>zmu)-843MbX$_gg45hNrY`6_bJ zU>xhMG+hjhp6mYSdw>OCJh`B)t#6_BAhz{Wdmyf-)HWYkPtgt{f6HN6NT zOJoobj|USK)NrM<1kZNxTd{kDK_YI$T1|u+s36q@)jhd5r;;G340=g25>n2?mM0Mp zY_1XIN|sc6;c?4ZydDiFM+zM=CSuviX&jM}Bslx_^+i`YfoMzah9Epj@5pSnJrt^3 zp(KVm;_e&fs#ZDON-CmJ3OZ;V*OavyLWHI&kN`BH#%NB%uJjT-#F7vxQcS~R{i2Yf zoruU>=C!3AH=zTG5{QccGVCTqwipm7Y)X~^L5E+Yu&~LZ!`SALF+l+kPC!C> zXmVm4E+H&numj?YMU*grMKCQQ+ZEn(=5EfBG+>zos1cB;K4Z!6I6)_erliEb+F!JV z9Fu)Cj^Z=YeIotL1&k6zkkqEwsfD6orKyl2k^&<2ujw)i{wWy3F%=H8$-_Z+JOL=* zffV(Y(Wz|$ z6iZUDP-K9~2!WcVBmks?TcsA5BfTCPxhD#KC&P2-(p{8w z*HlQT9%->DOr;@6ypc8)PUu{Ab~XuyQ4#G7`OVZ;`F3uYy}^>8U6M58j%m!0oi|eX z=3`OYpeQ+^^FWX*k|fwaHW%ubCLvPNvXLR`Ab3KE9q~H-bc2xf(I!Ap;s(Vo2IPeQ zSBxEUqBhWhEQ~}tWUCl7v@hwf%u!R2c6UxBDu*4CH|;$)ByM!qmrx|cO6qYEKq5gx zt;!KPxZoq{+IuTZs62rcArHUE8KinKER_K!ucIF&KO!c?4kz zB$7$dsPpguHvTEDXw5VbKV@C^*2ema+=4KIe7=8)#W)`XtVsaKSc3d1VhF}S{4ahM z&K&*0;@CEoK?=IdZj>nTtAIX5H|(1+PlSp7vLDV*+ItE#-w;pD1R5+UNON}kE$-k* zwIuSs->(O>>pF~mKCgg<7NU269Vo!*-3OHQH%R$;(Z@#YPAR0}NknZ=rVIDYNhFYt z^FpZu1C0n6F89O&=nE!CP9I>UkFgE`sX`qSh1j5ViXPPY5z_-Uwyw1jNsUPLc&Kht zjFSk66yS&aU4KET0f&6pf*o%0cth_Uo6z2#CGK-%$SVv&$j+0;3T{qfiNesWRddZ# zfK+c%OAPR)Hx4PHMJvga5cAYaj1MfAEfmnShODCo0~DfzEA@PUb;1B1D?4UV`2tOy9N=D($1WDjn z!8rj>yV96Zb9l`9D+vFTI1o2IUopda1+~8oX`kHGF4F2X-j|7I#HnDkp+SnhAaB_8qL3X1H}>w}TJc(}(%P)1t7=7m8zzuaz2PE=Jke0~ghc?N z0N?@uF@R91Ob(!?z_AHJztYlZOurBLTiR;dR%)-`wTXz>sw4n}1`Jg^BBvxoIg{lR z^ALngsw4*pa0%3V&JQwlKv5+2-+510uFpOWMq#h3gx8ecK@a3OEaz{v5x~J5VIX~et@09h}rdpaId6$A&81jtq3k{sB))iHuV`l+dyZn}h-@5zJhIx;Sp;R{Zi z(JY|M8MQpiT-!w(V;EI-%?uFMDAl~PSBbpsvX*O7FpwhAlpHM0dN!!KmON5KDM_qkZeMQh@G;B5yf!flS-z1~w zO!eB`$vXtNq`-2O?NO0Fg)G`dH{Y86U`v7I{iFcL83L%Aocto4N%ieji_p zGy^{8qH7;yq8%!LxxyhtgjpiM<0PEY;A9(09JEvx_`2kjK)0sucJ;fVF1p&hZ7FpV znzhk3<~TGY8i>e&a262|D~g4d24FZ276=3YLW3l!V+2V!2U3tOBp`{Q4+NN?!eXd# zqmQKF-QdVv3=f+oTy@liNxO1=CnUN;qdtyRF-0O#gfb5tbDth;oZU0N1xW%RKH{Ak z{$8#~NQfE+>_qM`ue-Px5e&h1i-s2$FaS=Z4+roWOBlpB5kg1=5`Uzj|9KH$Dhdcp zX1fK@m}1J@)J^+aYM3&5$TchEDRU6qog$nFDDH?QLvdw8iJ_zABVVwBa5bR!6jQj1 z*2cjW90W09f2{a8RuVz}2t^G8hyMpGhACI>wtLV=?Y zZ_l-o@94oPz2Nde^n(KZZQzRF4J%rVY?I_5ZXy`Rl1T~1s;JllZ|HtOJdN&;-%lPX z=!86L4-!MHsv@Eyx5{>hIpbY@Ps<@E&qK>HY)B-OaHj2mS!6R+V~?(m0hG?Y(GA&& z%dN-l2#zi6pFffKAS{1H=v`X2dT@W})ILXnaCS=b^GJXsQWLez{S=$K^i5D>$ zA=-97#3-^EkSN8GU;>aNQ@)vv&{M6o7Ioh-nVF6fhU{^I8@dJ(RwL2h z3kDI4vzD1fgVzZ}yAq}cFihiq zCvxy|#cR4z2vOutBXl7}d0A*1k!YkjUiT*hb3l`cB`o9#*^W+sEt>~@?ls_#%wgm} z?s+^Jks*$$+8t^dmssngwg!f21dS9YY@%px(aOyW5T)oVIt_Q9r#Tet5GVVLY2sQ^ zo(#Q4#012}4=Zx1#S=i%>SfeHspN)o^PpBR-X%47p{Dm^25@A>6!4;vGl~@1tj2%d zQb3;1g=a(8c5xBlB)R$m3%q-BRm3`0F> z0C@|;gq#z+PF-db{~Wg-(sOs9TGtvxq2#+`Z>_h zlQ@cWZ>Jt3r*OLqhIkc014ybWY&zW#Z&)$Mbuq&R^=FQaxzJWLdU?Ahnxs|^!>6ZW zgwl|SLU(owb0YQ4hD~O4abdz4Q1<)Xw#z-ErX|K!9qR9JAn|}wM&eW+8iSrPVbvr+ z25GG)*hIZXkl#m3S-DAY$%;bD4~#Ky4+OOGgr_;F2cgzV@hvpu&|V1)GjB94PbHyN z_8gwRJV9W1LU6K)7fc*1#1I$}2nc6X7$*1~G^Sx;Xbhq8(|K$}HLM0QFfO{gUm2HH zA}NO73jfJ0zhAArrlPd3v$wvHk!dX2_`P#snXpWV9N5Sf>Y=4Pj*(+;;y*m>=_S6elxz|M3=N$xs$O$%%_NLEs`t%9PlkQUa1$aqoU+; z9r}0@M&OE$!$V2+vR-o@L6fi#Z%{o?VhBUEf|>`oC2DF?9I8jm5@I`!e3X!?R|I50 zkY6bG>qDdzerDsUhNA~(Q3$OnrpQ^dW&phejuQY=0aq~`2;e9P0g8MA05)7Ih!g=5 zp8$r8Af4C)?SL;){7oo3ZuV8So`unvM6yvsVHqWbK)PFLN&;M}C@g@mqL89IlYXAA zx_`sGZ?Nbgj||P9XV~k1vOka-iCg>Vj88WcE-pui))?qb5w<_Y4I*jK_MnYv>a=&78v05w5c>PRKD|v6|A7ZzV)16>vyf6A-(Yfd z3aJTDg9GD022xm7_An73MF1eNL=C#AMFP-*sBSw60(a~CQy$p1n&MDlkhE+{O|7TZ>K$5=<&}Iud z5g4pkuXcdcrP#WO2NsMd0>}Z1Lo~_#@#d1084eanj0Fk=bc}!!$_ojy-M@iGR%Im` ziz>$3NC`+<)gg#Qph*fyEg~L-8#T9~Y3kLh8@_w0?*@}<2^k1LgmZ2YzzIVUFrcuo z3Zm*3jgj27OetzIAd(2e4MNdjnj>v&sao3_v2AZs+ zElO=^Ev*)!(e~ehU9DDM&944ZpCzuF!Zd3Us1S(3Vxx)*5rU*tU}6E2$I0X7#A4YT zLdc;Y$i4v93}Cp4hAxKX1l=T25#Wnptu;yoqsUT(TYyLik^)I0iSg_6Kavg&!&#Ca zY5EvIg%7qR!vlZ|AVIoNp<7xg{AaNFjS=V=eT1ci%nV&II_F`z6vgW#EfHht?KROb z6GEyv;D2R}9Sljhm_tD#A80`rg~_$o3|R$I2udoPi3ZUfsW$Dh8Q5U&V>%!#1rbgE z9g`v|PTAxWDEI4O?aD8o}Qi9JQq@%@kZs)bWaX*tA4z zozRw5Awr;~LL$C(kcbNuh>v-6Fo}|Y0UVZ821Qhm6&Mi#kq22#TSXO(w#7wah^^VCw7aeE!}l; zsIID;YF#N(hzlh|DL^2^NYRE0Z zV$78k#TnM{TN#EPD4BQ^Da>16LCFdSvwd|>U##UN(F1W6+)h((v8jZAYGJ-?8kpq@ zo06rM3WX@d!ZVotfJu{HP&!dW$t#qi6H04Z4=|e_2YyFKMPFprR#Zq9zLQ-x($g9? zDM+Z;OJc7r=Wp-(*Y9~)+7MT)(x)Pde5uV}jQgwmhJ0G{N@S5m^qzi&Cvnn1esE~$ zEK{@&@TBj`|H<(^tTxU8M4+G6luv5P&ark z`c#Z0lx38pffRvaIus>ngq8^FB(Vr%GHWbGEB)<6CQO)59M)#**73T+D#fBT(zV%H zHE6V&)TOn}%Svm`b-OZcsH;ntNgG=mNaTctVKuN2U|T9cWP&7wbt!06AfO`zq>2+_ zLktFKw6vCuwU>8NSqmv8uOgaBEZDUTnju*USQU{HP_&X1H9-kj86v_~Nk%}lERyh4 zstmkF!y#IYl&>aiBNkz>csfHs7|P{Bvz*}Lh1zmrjVKRH;zi7dAgqU472$TnCTk&4 z3uHN^nrWgEy%3r~Mf$-!J_Y(gAOs<)k^qdFobgBoz!V1gP-$oNlo^P!AaA5R$vnOG zm0(c`7(kg-17+MKWEWk>bJPq-2LKX>Vs$ykLQp6kv?Tz6;o(-3s@#HuAQ2DNMUpHC zMIlImsqR&Q5hE4#&{8KF4};DAr0k!wvq{@?73$--?xw^Ewyy#Uv;z^5tG~&H0T>bP zLHls?0l=v^4)fP;;F+R;(Psi?5(()2mt|F#cR{$Pcak0<;)oNuIx;Ri2oeh*13;b< z4}yiN+FU6%M5+%p8;*!H0@-Cz6Gz0K&~|vkpf|dVJ~*NU5(FL~9x8et4;P{8k`SMB z3Ye-7jXPLkDjV&!~*naBm;~_uNDY6hy9KAg$NZ6|C_v2o0}e>A<6(APlz7_C}TZ| z688utM3WO(t_cVrO3n0(F9o57@ub-a7;)NRg1p)@}ILdE;K z>b?t;{DaySm|!jg+@H+UKG_skKzJ4awW_F)WD)|crwV_j4GECShadymC^=MklO2eb zYHkbeTSXq@+!{$$^)~&*DQ!_&g-VrDYe}fK|5Dtemn{~IDvGQAO>)*Y-AT3PRoYFN z8)+(Qd8X4Dv9+UFB@`{QWm0MuRx1^mL1>Mn%qdrH?;BTApG$SCz2E^rQk%rFXyd^h z0s*{4+zOrY-?+Bg*WYcT(q{{QlLICB0hpDD=;sMd{3P@(Bf?4@r< z^#?;pJ0v6W?_`ttnOY4Vi(rJu4XZ8bPl-SnC@}?)NO%U!ibx3v1d6D2i%CLs0bX*^ z73}FH0wtvF6OxIs;=WKo6Z?>k^ABM3Npr1evAF zU}Ee*SbuRs&k_8Bc3a}W-$41Bz&b#I15{IBo8X2l>NE_fioQ_2lvWh5#gkcCt$WOZw<3>XwL4v_3 z&krHuep3N*3<)D3cGsNV;QS-;Lp{tcTU5!&x+DQO2a<%}*blseLsWko_&FVL!p`~N zBb_vuPF7`_y551#hu3gSmLD0AkUfe9oCZT^Pu+EO2y1Cjo}Cz@<|=z=N;McBWPKzM zA2~%SK?UHeg*`YQ*s9BB8zkDK+igj2oZC-z&_Yb>NLwOQ5~89TgwVpW39{DOS)SQq zKj0{YDzLp4(2Vv5Mgw4pQxD*_#2@s zIgAXppz36X42A?Qe;cgx7e-(IFwL4#08*< zsr4NI!Z3#y4s|J_Cv8!Ta}lzXr4oEbKFsfh=SDD5VxZZjDWL$t52sY71R@m~D8vaB zc$ETDqX`sLHxdTo(!5{~^RNXpAc2UQ zCgn8W1d9Sgr8-XFpW6ZqsQ~`uNJzZOw%~zqJ<1zFMnqHal}#x^#3=$KSrmuZ5`qo( zrdOZCam|!c5JgR5>YZ>OObzhvBbcTJ4g&@YNfAQgP^45f7z=?=<~N-NP7QbYL?3D5 z99;$u(d-5GJoBG4G;kBL&Y*7yH5weyjg}x9i3EWUA93+~U8Y?DsX!VTGE6uiOQA}H z2uQ47n4*BQ4=w0Fj*N$5d!Q&002roJ@H>;ZTJhJY?y~aKFfKw+my8CKS`Cm;E-|OP z=LrCrfzn5y9gaW|FyH1*k%vd=R*V=Rm9TV&QGH7;pi~rykvLoS6g?72ImS>aY2*FW z;vB7#0j&=lh19TuiveL{CG}Zv3}PLyhaz_SZw4s96gxtynpGNNL+UfFan4hOQ-K7% z>`q|cg5)954rp;uuzk-uAwsZ_uYh134y>SrPB5Y{y_{kfM56B=2lpKYAyvz&$!bkS-` zma^mSZp05A{N+lHn1_gmH5T}y0gQuLwY=*_+RDNoP(~ueVG0pD2rBUg9qOBwr3T>v z@TwJo0O8_suK<8VVHmLq_ArGHR#ON-qFb#&kP(5%4KZ+%8W~a4eZc|hi3r97kn)!A ztb%AWu7QPS_{BHEZUUM8d`*KD)YCLFBMDigyC}HtRWQ?o9fv*m=n2X&h>sn7rpMPG z6PAD`pv3qD?B!A(WQqkr6hFq-i&|m9pW{F}Wyha)@Y3e6HLMjxjAiiSMY>M1axFA~fLWF|~OJcdI-758VwTz9UZPZz@L01?E zl@y_X)p-uZar{Q$U~cI3HykEAd!N-uB!1iryo5p@p>y?^Dl36kfbsdyO7p-Nz#v5! z!6XBvC=~LqTmaC01X}> z91ecibcAV=9`A(_dwkp>fP@mEQdh%ZTn5z-NWl{a86iHu5_c5zRLdHwh)5iw#voYT@kVfS$ye2|18$oAQ&8Vz3v6e=~zrYkgGk8A+ZS`gZ9bFLAlJ`sa|cjq&&9JT$@jPtX}r^f1FuV*-c zSpCNlzz}#ul|o2A*1V&WO&v?F8GRz$ZwQ~!G;|ie}K^GV|F(whwJU_+cUE3{vJ6EdQ5~BxcWTR5%xP2 zdCYg+DH0x?NPHeB6|ct21kI48lnY3+%O*ZSXdLlw1a!?}p1JYMH5K4d%bJ6fIGQW;QMk;>G@?T=3*U0%R`8f5=5lU3`tfz$R3apfzPoY70x#C#&zp9!fPGz>DlF+ zPCbW)5DZ&GOhXWD-Jpv$mbF$}I$26JGn7kqBUDXhEcEQia5%I{sf08Pg*ysgE%iG{ zRa;k~RZ4aYgBO;jO9xgTcyUv>>*w;DqC)P=i3__fFyuRrP9+fJ6c7k<0xgF7?r#`w zDX9=TfE@rUU3E2#F6}JvPC$o$to-SSJa2n8nG-WCNkaj^b{+wP=))S;n9&goLF>)o z$Zfa1v9clvOd=u}gNd1A2BDCF(0hIINd^RDoXT|oen=q=j*~jr65_+9EJyU?7Scs`1Iqxlkf9Jma{na6)b*&E^kzLg7WZ8TdfJnH8b3 zSxIHW=wIFhvRH)$iv|p(vA}E&DLh*>mUzF~%*mP{!8W=0J!VVPgf%Rt z+bpEDBvA-K1A6g35m3S2LdbZe7lR}@bJsAQ0G@$wUivKd;gFHgB68k65{Np%lNEPR zmf6P$OpsYwQZGMN`n~dp(Dc5S;$WwI(Yc4$e8rm0VUn!^n*v6VBLRYFWfI&lvXT&_ ztp2m0n|_m{haZI>-3bN+BqR`mtQ8Y2>}+g85ZE!?L)M8RD+sDDy*rgVjk`{6-N}rq z9#sNuyq)u;i@|18$X)*6mqa9lh(QM1UL+wAGe{eq)k`!p0}UlYf~gs)28&(N#sc^G z3+pf{JZ*%4oQ2p`P64UrdOJ@y-@oZRhO{ION<4;$pdrXPMLPDGc*n%GJh7=pQk9dy z6LWa@@n{y)z9B~-AXIcZ5MQfI1C!bHX*@GK&b?6NY++v&CFQ|f-A(GWyIKK8BY zuZ44`*ZVHhkJfetf$?Fcza_Ln-pXC#>EIp^_x+HAG>5#i;x=8#;{l%pN}wZf*9lfk z0$?Q!1%YN85DIl0A^AZK_;j3PA?$iWAJTw(BKwj7QW!{7gea8;xt)W=ngj&_2?3~a z`5NsgP-6)Q!4;7BoYSP8hfLj|pd^$eRHP{w&63Km!i-qcS)j0BhO`xKdlDdm zG7N-90-zoLdF0)G^iBr@$8aby-4d|p zy8{}ngDWwpBp^8gn430f5llo3G+9YSj0o=?HWNFTF(I+8To^P8aGDM*LgFg=2rASP z#HIuRs+?s6?5C5#$qcDGk`RlRVEo)5XlVf?PUw`eRgix&P+vF`F~nU<7Rsv(;V$f} zENP(QPDE^BmE?mlC~)AhIVd8~J=i+*9OBC~Q4nd%q~m`R)h3{Wf#8A(V#TgAgofZ` zw9_f9S#?ng!PeW0BH~69i989f#~2V42^XdXXR~!GG?UvG6e$^PpsbJz&Kgm3RF<*g z97Klt0fR=klG}hxQ%YSF>RPi{rI8m*6&M&;g0QI&nJg3m5@^_jXi-HeX&#*BRO=`M z02AJpPJkFt>fWxdAytVCx>5o}!y-i|FEt)Ajkct+V%ZMu>Bg6rq`;uog2fgn+9jk8 zQi>d8DF)eOwh0o+1OodTbWo@<1bPzR(EI6Dvu?m8bVoJlgtn5n2im`$ql5TRL z?m~8XF^QksG8`}syV7<=E4G7-0-=IHifTYQ1ksR%gW5?YjYgfl94R|aCh)|?X~3uv zWHcz3Vo>UpQ}v{>W#(Kg)i2@V|{b>1P=i_nlL7&$;h(g#}P)TBr}>qKLr!J#J=jVe+!Ko)M5)}N-Nl+_aZud{2xgjbH)!VS zVg^za7%h7!)aRa#CJ^YUWEK~)oNl|Em=#X1H?h??9PGe6af>WCa|p#0Mn{b~cz45( zTXg^&98J(}EfLAEyp+-ibtG98N#qq;u&N$jUEStk(3LV&r7D`Ya*x^^xD#l>4kJbg zPsx>+YaZ~*k1s2f4 zD&SHQGnAMlSiwkwljOikrFPLUQ74;~Zr|_y{?s*Jf-X{r<~OIr*_TDd2y{Nb>^H+M7Nt=dBJFA2wCC;p5hFH0!pUFnpBf1rDZ_c zV-$rnfh;5s34{doNX-jj&<>CD0q8UnV=W*qv7iH7Yb=Ir;o*!JZ7+-5Tgl7YI_EB~ z(p=o`xExI9aoojXSLOvkU=|4ifPuynK!Z^;R31nyG@-qx3q;Z)`8G3j5QD*l$ktCt zZh97ajGYGrH8!#u9dZ=}vNE{f7>Jbcg@NV-`A8eZG(e05__Sy(Gzw{mL}121QA{LR znJpGe%dPcqeyi?*6an2Fgqy6!B;k(ZZHo!`n~{3D2PA{3k=4RF1H@st5b^J!IS6mO z8Ndz2u!T2tA(5iN!DvtgK@F4$hU1`QLKc;tvl}I9Ib8xk32w%KS-gXm3uI|20>o$r z(8B}_tEd!UPND!r(Q%CGR%EJ{K)oF0VUR}h&leruJqHM8FkpDL>q?YcDWuIzsYH<= z&=?d*8--=GWCJ2vLqY+rtJ@?54vyI^{$U3(i~%VKfDI5T6u?UmUZ#h3hk?Yx^oW=$ zZV>{F@{$mY1Ym>^k%B=sI56Z|?}{-6@zPE(o%6XtX_ma&YnhmxsV@MEV{H=O5K!6*e8xJ7g@L&s5AtOe#q!7H+)1WReVFN2t}XhHa0Oq7(mNZhAa1EqXN~=$ieP`;vQxQror}Nf!FB{e;zNE1e8Z}g%<>uk3hzd&onrqKU}d0o!=n; zVt_v-0*nX)aEWCE2!;FSaG+0H$si{G%Y@u=%7QAif*o`YDDl+P77vmu_{6m5RwhAZ)^6WY0i%O z1}_Kk6(R8=A?_dy{Emm}LpTVow`_;szUFy~6KRhL3si{;BwwHz^6r;JF+n!6qu~5w z&k5NnivW;Fksuw}G_8*OJV=~O7_n_IbQDotaOs3-Z&<~m6&+OA`^FrHB$Q;OcCvDX zURxtrpNe$Kqp$ zKyVNw9y5BfX|sBAC06BY+H#)TE`Z3V9Z#!sUOJSOk}*LDR~Bt#m__g)L;hXEl5v6w zC}8TA3%u(NUXVH_63CjuhK0)JF_^_#C5d9JLAW$$Uwda<=yq*wt8$uNrSMYjFMQ~W z!m5gJV#)}Yq-e^$;6QyIWCP5CZUi3y^q@ubh^K25YA{HMIVnc23JF9|dy$}{b_R$j zUQfvenzVW9f@oWUh>g^uj-}8YRoaS6sS$FWW!BwwO}F}QWu|Sm(1)9Sq_HXI5)eWO zp`nQVQB#4wk7Fm8Ukp8%PNk;b2xEznbHkJ&I3;TM+wNO!U`ZsBNgyf>Yq!;YkJIPk ztzRu`_pj%LjS)p%5g0DWiPyb-Z_^eb%pK=Cxl4p;-~k~4NI_zZTPvTm>y#X5b0C_< zi~#vyBk+!JuIQB^7g8iZs5GJX5qXcwN6G3QObAekWD-TB3cvvY37oM0o?KZ4QUn{^ z_a~uj4r&7f*2)qf(Vn!>jwxe0Tg4$6=A4_x*430Wg;VL55a-xr0+Hii}`_?(YEo!H_l(SVvd^N6M-Oq7?At4G~JNQ_NZ}$@gNdgKb|m zjZsyi*YbY{tN7*pr-zeOKSWzh_}VlR}CZz)A3q&~e{Ol72uGLm7_a!=IREhD%RF+IXme1FZ&v z+w33>JCHJtP)P(IjbQ*NBo0FOq9NG>?K&{vL_sL zOphfE!p%!i9u`A{W?H0a7(p4B(q=1|T?~Lk#AqoLVImg5mU4wdb;}NNBQ_1rVK{uW zHac)89*-s*qzM&9(5+ zw=*R&Yh1a@&bpDS$rfF@(zz*CNo1%=UDedPQ)bmgn(cPh+`B|b93lA00__<%=GIz4 z2%wx3fIcV3!E_XK2qc69P~9N3eWx%K?0tj^i2wA8`g&5oN4|s5e;!{TQ97V>*3EfM zSLC^Er`XhrX=GW4Sa9Gk1n0+f4xr0Q1%*x~NGf8AGLdLIV=$*1wzWp4g=1t2z-uKW zCF;#&se;hB1~8sm5MBWaoNX#bOvphQ0$9;jN&$d|flxaj&{_S^) zeY6rJ@2ZQwCBWUnswRcjm^ReHX$b zc+6hCc2Ry^S6;S;h+5Ga)xP_WW*CN>thkY(kmS=IWEkahY0E018roW`$~k85VJuzT z7!wf?z46)nzrfpkhLsDca=I6YyQKW3#sh$xK{rA)H5D*U=BjBdg|TGW*F6Gd{({z2V zd-%}>CQHCW^kL|ZxmT{w4+jTJG&rs99WqQpX2_^ zdhZP*(m6*;M3Lapv3Kk|G>+=|l0?$!X!dqK>3VhL9Js;Ht0w#>QOla1VhY9XXLIda z7h1AP_+Io$UOCuE+?>27>D>q2>;pi12L%v*Is@c!J#~<4G2J9}|V=%`Z(HrI$vka-#-Kt~3XmPBXzLNzr0Qikj9Z>! z2ljD>fjOxj9PBkWy@ZQCS0|4&&15W*yV6aj~50 zZOeN=Z!iecR8)%+5F}&}V1r^*LUqo$<=RUMXX%Ji3)ub{5TC$_+~E)lg@|6BGuuH2 zPQzb=HI>^)RgWYyj5^`EPCzD;$iWyStFy!~_K?^P6rn^k4Y!zXZsawM#-+hyrZ>c; z!lKEcgd};QXqE;V1gE&^Z7n`!=WZJD+}^x3z1|!wv^!(aitPqUAaF;93ufwO4`+XG zXJfBT)8-IS!iTsTX6QJt7G1cIu9^r?ZdzfbLS)D3LxV4lhxphV@2>87u&-*5f!y}w zAUNN*auK?Xco;(t>!$e8F#gd%8IClvUdMhiirD`*W|a=!pW0u?JCrE~^Z<~;quU{j zM=fg}4;p?J2&3i3nATZvWE>&ODTG6KfDblb$J|%Ryq@rF_#jYO(nsCeUSLt|IdwdZ zmsp0R5b}c~N124_-D8C!vE)$#RCh%&D4D{IK@OAe=;%x*+yo}o?=(34Ms85ebT#y} zER!+KfK;A%>BpqaNosZ+%0Skrb#+cRRNE{p2DqUd5OF?c*JcgOP5<~17od*sG(WKJ ztP{-!x~p3n2^QIzl;s*0 z0z_h=<`Jza?j{UY1ilWq!4)Hz%Tz5z1$4`Q>pf zP)P-bg2Z2NL)5oqiN7y7&iFKZBZO1Y_wn}3D6RF(#`*Al@Xd&q(dKN9BYgHutyKIX zbUpTtpM~60E)1o?(3|(V4T)8XCeqV-W243cddLLMI)<--?%S>>#K?p(N&@?x|Dkd7? zP1_*JV~e_}@F1;`y<3 zxKJg{UXIG&Q>0Hg|8R>2UK10KdN_oc<(}3HrNY}cVr-Af?ix%!JMV6zg`Y=KGnv~+QLJ)6*kpdk?!P{C zLTMlxoXuJd`}hH}7fNv;&>_(QG^!>s=jKsQvdnPpcac+J74SGdu&6BhJj=b)Wt03# zDNXPX+XGqaVFDj}A(=mKB^I%>vq|7eL)K9b?*iB)6cd5$x8WnPkSN@KO-$>iT@skX zsL5w943;ABCQQ=g{E|W+JK{?Yg1#>=jUPog(&qi43VOC22P7%1e$QE1uQI$B2a%eS zfdd}!qTVz~gVZQMf(?>zX@;**w}I{;8&94W9)GC@u+w?|HCUI}uo zH0I)ps;CmiW{5p{=S{cMpO>|}k2v^#uSgj9@z}}ig*kGJVE-pXkgq{j;%0Dx08YC6s45dys?9iz%g0LUq;i_7v~r0nVaOpAqjq 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 literal 0 HcmV?d00001 diff --git a/recipes/ncurses/ncurses_5.7.bb b/recipes/ncurses/ncurses_5.7.bb index f74b9ab5b6..2c3c23b7c2 100644 --- a/recipes/ncurses/ncurses_5.7.bb +++ b/recipes/ncurses/ncurses_5.7.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" SECTION = "libs" PATCHDATE = "20110115" PV = "5.7+${PATCHDATE}" -PR = "r16" +PR = "r17" DEPENDS = "ncurses-native unifdef-native" DEPENDS_virtclass-native = "unifdef-native" @@ -12,7 +12,7 @@ DEPENDS_virtclass-native = "unifdef-native" inherit autotools binconfig test SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-5.7.tar.gz;name=tarball \ - ftp://invisible-island.net/ncurses/5.7/ncurses-5.7-20110108-patch.sh.bz2;apply=yes;name=p20110108sh \ + file://ncurses-5.7-20110108-patch.sh.bz2;apply=yes;name=p20110108sh \ \ ftp://invisible-island.net/ncurses/5.7/ncurses-5.7-${PATCHDATE}.patch.gz;name=p${PATCHDATE} \ file://tic-hang.patch \ From 554a6b52666bead87003f1c3eb608d445052d6b8 Mon Sep 17 00:00:00 2001 From: Jeff Lance Date: Thu, 14 Apr 2011 19:57:42 +0000 Subject: [PATCH 283/509] matrix-gui: Bump up SRCREV * Bump up SRCREV * add am389x platform support * am1808 add correct instructions for running profibus demo Signed-off-by: Jeff Lance Signed-off-by: Denys Dmytriyenko --- recipes/ti/matrix-gui-common_1.4.bb | 4 ++-- recipes/ti/matrix-gui-e_1.3.bb | 4 ++-- recipes/ti/matrix-gui_1.3.bb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/ti/matrix-gui-common_1.4.bb b/recipes/ti/matrix-gui-common_1.4.bb index 04cdb2f5a9..d436044a1a 100644 --- a/recipes/ti/matrix-gui-common_1.4.bb +++ b/recipes/ti/matrix-gui-common_1.4.bb @@ -4,5 +4,5 @@ require matrix-gui-common.inc # prebuilt version in the repository. RRECOMMENDS_${PN} = "am-sysinfo" -SRCREV = "243" -PR = "${INC_PR}.8" +SRCREV = "245" +PR = "${INC_PR}.9" diff --git a/recipes/ti/matrix-gui-e_1.3.bb b/recipes/ti/matrix-gui-e_1.3.bb index 45194379f0..fb7e4b3d47 100644 --- a/recipes/ti/matrix-gui-e_1.3.bb +++ b/recipes/ti/matrix-gui-e_1.3.bb @@ -1,5 +1,5 @@ require matrix-gui-e.inc -SRCREV = "243" -PR = "${INC_PR}.7" +SRCREV = "245" +PR = "${INC_PR}.8" diff --git a/recipes/ti/matrix-gui_1.3.bb b/recipes/ti/matrix-gui_1.3.bb index 727aca114f..2c38fc39a5 100644 --- a/recipes/ti/matrix-gui_1.3.bb +++ b/recipes/ti/matrix-gui_1.3.bb @@ -1,4 +1,4 @@ require matrix-gui.inc -SRCREV = "243" -PR = "${INC_PR}.3" +SRCREV = "245" +PR = "${INC_PR}.4" From 997baf3e36a1a8e1771921fc0e0fe9b79df425b5 Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Tue, 12 Apr 2011 16:51:49 +0000 Subject: [PATCH 284/509] ti-ipc: Add version 1.22.05.27 Signed-off-by: Siddharth Heroor Acked-by: Chase Maupin Signed-off-by: Denys Dmytriyenko --- recipes/ti/ti-ipc_1.22.05.27.bb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 recipes/ti/ti-ipc_1.22.05.27.bb diff --git a/recipes/ti/ti-ipc_1.22.05.27.bb b/recipes/ti/ti-ipc_1.22.05.27.bb new file mode 100644 index 0000000000..c3d25a6c90 --- /dev/null +++ b/recipes/ti/ti-ipc_1.22.05.27.bb @@ -0,0 +1,6 @@ +require ti-ipc.inc + +PV = "1_22_05_27" + +SRC_URI[ipcbin.md5sum] = "bd35d75b754f0fc54d7ad74cfc971987" +SRC_URI[ipcbin.sha256sum] = "b61969dc8b5bf01ee6f68151d2c8e123b1b3b425990987fe64288085d8cc15b7" From 36f7881cc26cc8e45f0980f68d3fc71dab1ff915 Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Sat, 9 Apr 2011 13:56:19 +0000 Subject: [PATCH 285/509] omap3-sgx-modules: Update TI816x Module Location and Platform variables. * With Graphics SDK 4.03.00.02, TI816x module location and platform has been made more generic - ti81xx. This is to support TI814x which uses exactly the same SGX core as TI816x. Signed-off-by: Siddharth Heroor Signed-off-by: Denys Dmytriyenko --- recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb b/recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb index 5dd80fd7f8..9fe43bd6f2 100644 --- a/recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb +++ b/recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb @@ -31,10 +31,10 @@ PVRBUILD = "release" PACKAGE_STRIP = "no" TI_PLATFORM_omap3 = "omap3630" -TI_PLATFORM_ti816x = "ti8168" +TI_PLATFORM_ti816x = "ti81xx" MODULESLOCATION_omap3 = "dc_omap3430_linux" -MODULESLOCATION_ti816x = "dc_ti8168_linux" +MODULESLOCATION_ti816x = "dc_ti81xx_linux" MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM}" From dd6589287485d6c85cf87be71595739c199bc25c Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Sat, 9 Apr 2011 13:56:20 +0000 Subject: [PATCH 286/509] libgles-omap3: Correct libraries for TI816x. * Explicitly set ES6LOCATION. * Split OMAP3 and TI816x BINLOCATION. TI816x uses ES6.x libraries. Signed-off-by: Siddharth Heroor Signed-off-by: Denys Dmytriyenko --- recipes/powervr-drivers/libgles-omap3_4.03.00.01.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/powervr-drivers/libgles-omap3_4.03.00.01.bb b/recipes/powervr-drivers/libgles-omap3_4.03.00.01.bb index 4b3a3fcffe..bd5cdc8168 100644 --- a/recipes/powervr-drivers/libgles-omap3_4.03.00.01.bb +++ b/recipes/powervr-drivers/libgles-omap3_4.03.00.01.bb @@ -1,11 +1,13 @@ # untested and huge change from 1.4.x DEFAULT_PREFERENCE = "-1" -BINLOCATION = "${S}/gfx_rel_es3.x" +BINLOCATION_omap3 = "${S}/gfx_rel_es3.x" +BINLOCATION_ti816x = "${S}/gfx_rel_es6.x" ES2LOCATION = "${S}/gfx_rel_es2.x" ES3LOCATION = "${S}/gfx_rel_es3.x" ES5LOCATION = "${S}/gfx_rel_es5.x" +ES6LOCATION = "${S}/gfx_rel_es6.x" require libgles-omap3.inc From 5887d82308d2d89a2456f5bd8f8b741e9b664480 Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Sat, 9 Apr 2011 13:56:21 +0000 Subject: [PATCH 287/509] libgles-omap3: Remove SGX Fixup for TI816x. * Unlike OMAP3, the SGX core has not undergone revisions in TI816x. The libraries for TI816x are also fixed and do not need fixup based on revision of the SGX core. Signed-off-by: Siddharth Heroor Signed-off-by: Denys Dmytriyenko --- recipes/powervr-drivers/libgles-omap3/rc.pvr | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/recipes/powervr-drivers/libgles-omap3/rc.pvr b/recipes/powervr-drivers/libgles-omap3/rc.pvr index 395d085d12..1b141a03eb 100755 --- a/recipes/powervr-drivers/libgles-omap3/rc.pvr +++ b/recipes/powervr-drivers/libgles-omap3/rc.pvr @@ -90,15 +90,11 @@ case $CPUTYPE in devmem2 0x48180900 w 0x2 devmem2 0x48180920 w 0x2 + sleep 2 + ES_REVISION="$(devmem2 0x56000014 | sed -e s:0x00010205:5: -e s:0x00010201:3: -e s:0x00010003:2: | tail -n1 | awk -F': ' '{print $2}')" - if [ "${ES_REVISION}" != "${SAVED_ESREVISION}" ] ; then - echo -n "Starting SGX fixup for" - echo " ES${ES_REVISION}.x" - cp -a /usr/lib/ES${ES_REVISION}.0/* /usr/lib - cp -a /usr/bin/ES${ES_REVISION}.0/* /usr/bin - echo "${ES_REVISION}" > /etc/powervr-esrev - fi + echo "${ES_REVISION}" > /etc/powervr-esrev /usr/bin/pvrsrvinit ;; From 8a8395710ea85e42ab2e8c0834160fc60affa101 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 17 Apr 2011 13:04:11 -0700 Subject: [PATCH 288/509] Revert "libgles-omap3: Remove SGX Fixup for TI816x." Please see http://permalink.gmane.org/gmane.comp.handhelds.openembedded/44660 This reverts commit 93645d2c00fe05e66f185ffd29ce3e2362f3a153. Signed-off-by: Tom Rini --- recipes/powervr-drivers/libgles-omap3/rc.pvr | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/recipes/powervr-drivers/libgles-omap3/rc.pvr b/recipes/powervr-drivers/libgles-omap3/rc.pvr index 1b141a03eb..395d085d12 100755 --- a/recipes/powervr-drivers/libgles-omap3/rc.pvr +++ b/recipes/powervr-drivers/libgles-omap3/rc.pvr @@ -90,11 +90,15 @@ case $CPUTYPE in devmem2 0x48180900 w 0x2 devmem2 0x48180920 w 0x2 - sleep 2 - ES_REVISION="$(devmem2 0x56000014 | sed -e s:0x00010205:5: -e s:0x00010201:3: -e s:0x00010003:2: | tail -n1 | awk -F': ' '{print $2}')" - echo "${ES_REVISION}" > /etc/powervr-esrev + if [ "${ES_REVISION}" != "${SAVED_ESREVISION}" ] ; then + echo -n "Starting SGX fixup for" + echo " ES${ES_REVISION}.x" + cp -a /usr/lib/ES${ES_REVISION}.0/* /usr/lib + cp -a /usr/bin/ES${ES_REVISION}.0/* /usr/bin + echo "${ES_REVISION}" > /etc/powervr-esrev + fi /usr/bin/pvrsrvinit ;; From 98c103a3bcf70e3273d520404422a0f6df89e7a9 Mon Sep 17 00:00:00 2001 From: Neil MacMunn Date: Thu, 14 Apr 2011 03:22:29 +0000 Subject: [PATCH 289/509] networkmanager-openvpn: added version 0.8.3.995 * Makes networkmanager-openvpn compatible with networkmanager version 0.8.3.999 * This recipe adapted from version 0.8.1 Signed-off-by: Neil MacMunn Signed-off-by: Koen Kooi --- .../networkmanager-openvpn_0.8.3.995.bb | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 recipes/networkmanager/networkmanager-openvpn_0.8.3.995.bb diff --git a/recipes/networkmanager/networkmanager-openvpn_0.8.3.995.bb b/recipes/networkmanager/networkmanager-openvpn_0.8.3.995.bb new file mode 100644 index 0000000000..808970a590 --- /dev/null +++ b/recipes/networkmanager/networkmanager-openvpn_0.8.3.995.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "NetworkManager" +SECTION = "net/misc" +LICENSE = "GPL" +PRIORITY = "optional" +DEPENDS = "networkmanager libnl dbus dbus-glib hal wireless-tools policykit gnutls util-linux-ng ppp libglade gnome-keyring" +RDEPENDS_${PN} = "wpa-supplicant dhcp-client \ + ${@base_contains('COMBINED_FEATURES', '3gmodem', 'ppp', '', d)} \ + " + +EXTRA_OECONF = " \ + --with-distro=debian \ + --with-crypto=gnutls \ + --disable-more-warnings" + +inherit autotools pkgconfig + +PR = "r0" + +SRC_URI += "${GNOME_MIRROR}/NetworkManager-openvpn/0.8/NetworkManager-openvpn-${PV}.tar.bz2 \ +" + +SRC_URI[md5sum] = "5b996d3167bc0b75f5b4e65338100ff5" +SRC_URI[sha256sum] = "bf11a963f526239fe1654b4824321eafb5f527e10fcef6b7fa5fdceaa4d9ce5c" + + +S = "${WORKDIR}/NetworkManager-openvpn-${PV}" + +FILES_${PN} += " \ + ${libdir}/NetworkManager/*.so \ + ${datadir}/gnome-vpn-properties \ + ${datadir}/icons " + From 6dab0d6e6e9903e55978729d6d57fdd97b9f4553 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 18 Apr 2011 21:29:40 +0200 Subject: [PATCH 290/509] libgles-omap3: fix 81xx initscript ES detection Even is the 125 core is marked ES5 im OMAP3 the 81xx SoCs use a different memorymap and init, so we tag it as ES6 Signed-off-by: Koen Kooi --- recipes/powervr-drivers/libgles-omap3.inc | 2 +- recipes/powervr-drivers/libgles-omap3/rc.pvr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc index 4a53d44c88..61d7f3dfc8 100644 --- a/recipes/powervr-drivers/libgles-omap3.inc +++ b/recipes/powervr-drivers/libgles-omap3.inc @@ -1,7 +1,7 @@ DESCRIPTION = "libGLES for the omap3" LICENSE = "proprietary-binary" -PR = "r11" +PR = "r12" COMPATIBLE_MACHINE = "(omap3|ti816x)" diff --git a/recipes/powervr-drivers/libgles-omap3/rc.pvr b/recipes/powervr-drivers/libgles-omap3/rc.pvr index 395d085d12..b854852074 100755 --- a/recipes/powervr-drivers/libgles-omap3/rc.pvr +++ b/recipes/powervr-drivers/libgles-omap3/rc.pvr @@ -90,7 +90,7 @@ case $CPUTYPE in devmem2 0x48180900 w 0x2 devmem2 0x48180920 w 0x2 - ES_REVISION="$(devmem2 0x56000014 | sed -e s:0x00010205:5: -e s:0x00010201:3: -e s:0x00010003:2: | tail -n1 | awk -F': ' '{print $2}')" + ES_REVISION="$(devmem2 0x56000014 | sed -e s:0x00010205:6: -e s:0x00010201:3: -e s:0x00010003:2: | tail -n1 | awk -F': ' '{print $2}')" if [ "${ES_REVISION}" != "${SAVED_ESREVISION}" ] ; then echo -n "Starting SGX fixup for" From da0bc3ccaaea322ca2c5e2d87c0551fd52b3fd5d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Apr 2011 06:00:06 +0000 Subject: [PATCH 291/509] ffmpeg: switch to libav cherry-picked Koen's mainline libav patch to fix invalid git.ffmpeg.org repo Signed-off-by: Koen Kooi Signed-off-by: Matt Porter Signed-off-by: Tom Rini --- recipes/ffmpeg/ffmpeg_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb index d84653a2df..57b2c31fad 100644 --- a/recipes/ffmpeg/ffmpeg_git.bb +++ b/recipes/ffmpeg/ffmpeg_git.bb @@ -12,7 +12,7 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" DEFAULT_PREFERENCE_shr = "1" -SRC_URI = "git://git.ffmpeg.org/ffmpeg.git;protocol=git" +SRC_URI = "git://git.libav.org/libav.git;protocol=git" S = "${WORKDIR}/git" B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" From 7beb0b1593a6457e119ad05d4cf6453cefce2955 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 20 Apr 2011 13:52:53 +0200 Subject: [PATCH 292/509] libgles-omap3: abstract ES handling and share it across all targets Signed-off-by: Koen Kooi --- recipes/powervr-drivers/libgles-omap3.inc | 2 +- recipes/powervr-drivers/libgles-omap3/rc.pvr | 57 ++++++++------------ 2 files changed, 22 insertions(+), 37 deletions(-) diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc index 61d7f3dfc8..ac21631517 100644 --- a/recipes/powervr-drivers/libgles-omap3.inc +++ b/recipes/powervr-drivers/libgles-omap3.inc @@ -1,7 +1,7 @@ DESCRIPTION = "libGLES for the omap3" LICENSE = "proprietary-binary" -PR = "r12" +PR = "r13" COMPATIBLE_MACHINE = "(omap3|ti816x)" diff --git a/recipes/powervr-drivers/libgles-omap3/rc.pvr b/recipes/powervr-drivers/libgles-omap3/rc.pvr index b854852074..0a4f11b77f 100755 --- a/recipes/powervr-drivers/libgles-omap3/rc.pvr +++ b/recipes/powervr-drivers/libgles-omap3/rc.pvr @@ -30,8 +30,7 @@ fi # Try to enable triple buffering when there's enough VRAM fbset -vyres $(expr $YRES \* 3) -case $CPUTYPE in -"OMAP3530") +function sgxprepare { echo Starting PVR insmod $(busybox find /lib/modules/$(uname -r) -name "pvrsrvkm.ko") modprobe omaplfb @@ -50,13 +49,9 @@ case $CPUTYPE in touch /etc/powervr-esrev SAVED_ESREVISION="$(cat /etc/powervr-esrev)" +} - devmem2 0x48004B48 w 0x2 > /dev/null - devmem2 0x48004B10 w 0x1 > /dev/null - devmem2 0x48004B00 w 0x2 > /dev/null - - ES_REVISION="$(devmem2 0x50000014 | sed -e s:0x00010205:5: -e s:0x00010201:3: -e s:0x00010003:2: | tail -n1 | awk -F': ' '{print $2}')" - +function sgxfinish { if [ "${ES_REVISION}" != "${SAVED_ESREVISION}" ] ; then echo -n "Starting SGX fixup for" echo " ES${ES_REVISION}.x" @@ -65,44 +60,34 @@ case $CPUTYPE in echo "${ES_REVISION}" > /etc/powervr-esrev fi /usr/bin/pvrsrvinit - ;; -"TI816x") - echo Starting PVR - insmod $(busybox find /lib/modules/$(uname -r) -name "pvrsrvkm.ko") - modprobe omaplfb - modprobe bufferclass_ti - - pvr_maj=`grep "pvrsrvkm$" /proc/devices | cut -b1,2,3` - bc_maj=`grep "bc" /proc/devices | cut -b1,2,3` +} - if [ -e /dev/pvrsrvkm ] ; then - rm -f /dev/pvrsrvkm - fi +case $CPUTYPE in +"OMAP3530") + sgxprepare - mknod /dev/pvrsrvkm c $pvr_maj 0 - chmod 666 /dev/pvrsrvkm + devmem2 0x48004B48 w 0x2 > /dev/null + devmem2 0x48004B10 w 0x1 > /dev/null + devmem2 0x48004B00 w 0x2 > /dev/null - touch /etc/powervr-esrev + ES_REVISION="$(devmem2 0x50000014 | sed -e s:0x00010205:5: -e s:0x00010201:3: -e s:0x00010003:2: | tail -n1 | awk -F': ' '{print $2}')" - SAVED_ESREVISION="$(cat /etc/powervr-esrev)" + sgxfinish + ;; +"TI816x") + sgxprepare - devmem2 0x48180F04 w 0x0 - devmem2 0x48180900 w 0x2 - devmem2 0x48180920 w 0x2 + devmem2 0x48180F04 w 0x0 > /dev/null + devmem2 0x48180900 w 0x2 > /dev/null + devmem2 0x48180920 w 0x2 > /dev/null ES_REVISION="$(devmem2 0x56000014 | sed -e s:0x00010205:6: -e s:0x00010201:3: -e s:0x00010003:2: | tail -n1 | awk -F': ' '{print $2}')" - if [ "${ES_REVISION}" != "${SAVED_ESREVISION}" ] ; then - echo -n "Starting SGX fixup for" - echo " ES${ES_REVISION}.x" - cp -a /usr/lib/ES${ES_REVISION}.0/* /usr/lib - cp -a /usr/bin/ES${ES_REVISION}.0/* /usr/bin - echo "${ES_REVISION}" > /etc/powervr-esrev - fi - /usr/bin/pvrsrvinit - + sgxfinish ;; *) echo No SGX hardware, not starting PVR ;; esac + + From 97d57135506594d2266ebda00f30cf2bc63eefee Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 16 Mar 2011 10:54:50 -0700 Subject: [PATCH 293/509] db: Rework arm-thumb-mutex_db5.patch Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/db/db-5.1.19/arm-thumb-mutex_db5.patch | 4 ++-- recipes/db/db_5.1.19.bb | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/recipes/db/db-5.1.19/arm-thumb-mutex_db5.patch b/recipes/db/db-5.1.19/arm-thumb-mutex_db5.patch index 37d0d93abd..51d485499e 100644 --- a/recipes/db/db-5.1.19/arm-thumb-mutex_db5.patch +++ b/recipes/db/db-5.1.19/arm-thumb-mutex_db5.patch @@ -1,5 +1,5 @@ ---- db-5.1.19/../src/dbinc/mutex_int.h.orig 2011-01-05 19:21:42.181805366 -0600 -+++ db-5.1.19/../src/dbinc/mutex_int.h 2011-01-05 19:24:53.141853117 -0600 +--- db-5.1.19/src/dbinc/mutex_int.h.orig 2011-01-05 19:21:42.181805366 -0600 ++++ db-5.1.19/src/dbinc/mutex_int.h 2011-01-05 19:24:53.141853117 -0600 @@ -474,6 +474,25 @@ #ifdef LOAD_ACTUAL_MUTEX_CODE diff --git a/recipes/db/db_5.1.19.bb b/recipes/db/db_5.1.19.bb index c44b958f75..9c25876706 100644 --- a/recipes/db/db_5.1.19.bb +++ b/recipes/db/db_5.1.19.bb @@ -14,10 +14,10 @@ HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html" LICENSE = "BSD Sleepycat" VIRTUAL_NAME ?= "virtual/db" CONFLICTS = "db3" -PR = "r1" +PR = "r2" SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" -SRC_URI += "file://arm-thumb-mutex_db5.patch" +SRC_URI += "file://arm-thumb-mutex_db5.patch;apply=false" SRC_URI[md5sum] = "76fcbfeebfcd09ba0b4d96bfdf8d884d" SRC_URI[sha256sum] = "0194d4ca9266ba1a1c0bfbc233b18bfd05f63163453c81ebcdfdc7112d5ac850" @@ -74,6 +74,8 @@ EXTRA_OECONF += "${MUTEX}" # configure. CONFIG_SITE = "" do_configure() { + # Apply this patch in the correct spot + (cd .. ; patch -p1 -i ${WORKDIR}/arm-thumb-mutex_db5.patch) oe_runconf } From 713c07c5ee9d4ff233f86ae70d6e501c2f784dc0 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 31 Mar 2011 10:09:11 -0700 Subject: [PATCH 294/509] db: Switch to patchdir rather than applying in do_configure Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/db/db_5.1.19.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipes/db/db_5.1.19.bb b/recipes/db/db_5.1.19.bb index 9c25876706..740db92271 100644 --- a/recipes/db/db_5.1.19.bb +++ b/recipes/db/db_5.1.19.bb @@ -17,7 +17,7 @@ CONFLICTS = "db3" PR = "r2" SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" -SRC_URI += "file://arm-thumb-mutex_db5.patch;apply=false" +SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.." SRC_URI[md5sum] = "76fcbfeebfcd09ba0b4d96bfdf8d884d" SRC_URI[sha256sum] = "0194d4ca9266ba1a1c0bfbc233b18bfd05f63163453c81ebcdfdc7112d5ac850" @@ -74,8 +74,6 @@ EXTRA_OECONF += "${MUTEX}" # configure. CONFIG_SITE = "" do_configure() { - # Apply this patch in the correct spot - (cd .. ; patch -p1 -i ${WORKDIR}/arm-thumb-mutex_db5.patch) oe_runconf } From 0e4b9ea3bda7bc1348e52cb2ce5eaa78c34355dd Mon Sep 17 00:00:00 2001 From: Eyal Reizer Date: Thu, 14 Apr 2011 02:12:30 +0000 Subject: [PATCH 295/509] ti-wifi-utils: update to a newer git commit * Change to a newer calibrator version supporting new wl12xx chips. * Add a PR number Signed-off-by: Eyal Reizer Acked-by: Koen Kooi Signed-off-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- recipes/ti/ti-wifi-utils_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/ti/ti-wifi-utils_git.bb b/recipes/ti/ti-wifi-utils_git.bb index 7757f97f57..e920fe5544 100644 --- a/recipes/ti/ti-wifi-utils_git.bb +++ b/recipes/ti/ti-wifi-utils_git.bb @@ -3,10 +3,11 @@ LICENCE = "TI-BSD" DEPENDS = "libnl" +PR ="r1" PV ="0.0" PR_append = "+gitr${SRCPV}" -SRCREV = "6de17deb67a1313b5cc8" +SRCREV = "7f63af54eb66e5b2515f92c59fcc19a8065ce481" SRC_URI = "git://github.com/gxk/ti-utils.git;protocol=git" S = "${WORKDIR}/git" From 4f23247f7b805823fcc29497e5920a320279ea9e Mon Sep 17 00:00:00 2001 From: Eyal Reizer Date: Thu, 21 Apr 2011 16:53:31 +0000 Subject: [PATCH 296/509] hostap-daemon: build from git sources * Builds a new version 0.8.x which is not released yet as a zip file. This version has new features like WIFI-direct used in new mac80211 versions * As the recipe is very similar to the 0.7.3 version, I have created a common include file shared between the 0.7.3 version and the git version * Updated the 0.7.3 recipe to use this include file and bumped the PR * Add PV * Update defconfig Signed-off-by: Eyal Reizer Acked-by: Koen Kooi Signed-off-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- recipes/hostap/hostap-daemon-0.7.inc | 26 +++ recipes/hostap/hostap-daemon-git/defconfig | 187 +++++++++++++++++++++ recipes/hostap/hostap-daemon_0.7.3.bb | 29 +--- recipes/hostap/hostap-daemon_git.bb | 26 +++ 4 files changed, 243 insertions(+), 25 deletions(-) create mode 100644 recipes/hostap/hostap-daemon-0.7.inc create mode 100644 recipes/hostap/hostap-daemon-git/defconfig create mode 100644 recipes/hostap/hostap-daemon_git.bb diff --git a/recipes/hostap/hostap-daemon-0.7.inc b/recipes/hostap/hostap-daemon-0.7.inc new file mode 100644 index 0000000000..49f265082c --- /dev/null +++ b/recipes/hostap/hostap-daemon-0.7.inc @@ -0,0 +1,26 @@ +HOMEPAGE = "http://hostap.epitest.fi" +SECTION = "kernel/userland" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "libnl openssl" + +inherit update-rc.d +INITSCRIPT_NAME=hostapd + +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config +} + +do_compile() { + make +} + +do_install() { + install -d ${D}${sbindir} ${D}${sysconfdir}/init.d + install -m 0644 ${S}/hostapd.conf ${D}${sysconfdir} + install -m 0755 ${S}/hostapd ${D}${sbindir} + install -m 0755 ${S}/hostapd_cli ${D}${sbindir} + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd +} + +CONFFILES_${PN} += "${sysconfdir}/hostapd.conf" diff --git a/recipes/hostap/hostap-daemon-git/defconfig b/recipes/hostap/hostap-daemon-git/defconfig new file mode 100644 index 0000000000..4fd90616ca --- /dev/null +++ b/recipes/hostap/hostap-daemon-git/defconfig @@ -0,0 +1,187 @@ +# Example hostapd build time configuration +# +# This file lists the configuration options that are used when building the +# hostapd binary. All lines starting with # are ignored. Configuration option +# lines must be commented out complete, if they are not to be included, i.e., +# just setting VARIABLE=n is not disabling that variable. +# +# This file is included in Makefile, so variables like CFLAGS and LIBS can also +# be modified from here. In most cass, these lines should use += in order not +# to override previous values of the variables. + +#CC=$(CROSS_COMPILE)gcc +#CFLAGS += -I$(NFSROOT)/include -DCONFIG_LIBNL20 +#CPPFLAGS += -DCONFIG_LIBNL20 +#LIBS += -L$(NFSROOT)/lib -lnl-genl +#LIBS_p += -L$(NFSROOT)/lib +#LIBDIR = $(NFSROOT)/lib +#BINDIR = $(NFSROOT)/usr/sbin + +# Driver interface for Host AP driver +CONFIG_DRIVER_HOSTAP=y + +# Driver interface for wired authenticator +#CONFIG_DRIVER_WIRED=y + +# Driver interface for madwifi driver +#CONFIG_DRIVER_MADWIFI=y +#CFLAGS += -I../../madwifi # change to the madwifi source directory + +# Driver interface for drivers using the nl80211 kernel interface +CONFIG_DRIVER_NL80211=y +CONFIG_LIBNL20=y +# driver_nl80211.c requires a rather new libnl (version 1.1) which may not be +# shipped with your distribution yet. If that is the case, you need to build +# newer libnl version and point the hostapd build to use it. +#LIBNL=$(LIBNL_PATH) +#CFLAGS += -I$(LIBNL)/include +#LIBS += -L$(LIBNL)/lib + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) +#CONFIG_DRIVER_BSD=y +#CFLAGS += -I/usr/local/include +#LIBS += -L/usr/local/lib +#LIBS_p += -L/usr/local/lib +#LIBS_c += -L/usr/local/lib + +# Driver interface for no driver (e.g., RADIUS server only) +#CONFIG_DRIVER_NONE=y + +# IEEE 802.11F/IAPP +CONFIG_IAPP=y + +# WPA2/IEEE 802.11i RSN pre-authentication +CONFIG_RSN_PREAUTH=y + +# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) +CONFIG_PEERKEY=y + +# IEEE 802.11w (management frame protection) +# This version is an experimental implementation based on IEEE 802.11w/D1.0 +# draft and is subject to change since the standard has not yet been finalized. +# Driver support is also needed for IEEE 802.11w. +#CONFIG_IEEE80211W=y + +# Integrated EAP server +CONFIG_EAP=y + +# EAP-MD5 for the integrated EAP server +CONFIG_EAP_MD5=y + +# EAP-TLS for the integrated EAP server +CONFIG_EAP_TLS=y + +# EAP-MSCHAPv2 for the integrated EAP server +CONFIG_EAP_MSCHAPV2=y + +# EAP-PEAP for the integrated EAP server +CONFIG_EAP_PEAP=y + +# EAP-GTC for the integrated EAP server +CONFIG_EAP_GTC=y + +# EAP-TTLS for the integrated EAP server +CONFIG_EAP_TTLS=y + +# EAP-SIM for the integrated EAP server +#CONFIG_EAP_SIM=y + +# EAP-AKA for the integrated EAP server +#CONFIG_EAP_AKA=y + +# EAP-AKA' for the integrated EAP server +# This requires CONFIG_EAP_AKA to be enabled, too. +#CONFIG_EAP_AKA_PRIME=y + +# EAP-PAX for the integrated EAP server +#CONFIG_EAP_PAX=y + +# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK) +#CONFIG_EAP_PSK=y + +# EAP-SAKE for the integrated EAP server +#CONFIG_EAP_SAKE=y + +# EAP-GPSK for the integrated EAP server +#CONFIG_EAP_GPSK=y +# Include support for optional SHA256 cipher suite in EAP-GPSK +#CONFIG_EAP_GPSK_SHA256=y + +# EAP-FAST for the integrated EAP server +# Note: Default OpenSSL package does not include support for all the +# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, +# the OpenSSL library must be patched (openssl-0.9.9-session-ticket.patch) +# to add the needed functions. +#CONFIG_EAP_FAST=y + +# Wi-Fi Protected Setup (WPS) +CONFIG_WPS=y +# Enable UPnP support for external WPS Registrars +#CONFIG_WPS_UPNP=y + +# EAP-IKEv2 +#CONFIG_EAP_IKEV2=y + +# Trusted Network Connect (EAP-TNC) +#CONFIG_EAP_TNC=y + +# PKCS#12 (PFX) support (used to read private key and certificate file from +# a file that usually has extension .p12 or .pfx) +CONFIG_PKCS12=y + +# RADIUS authentication server. This provides access to the integrated EAP +# server from external hosts using RADIUS. +#CONFIG_RADIUS_SERVER=y + +# Build IPv6 support for RADIUS operations +CONFIG_IPV6=y + +# IEEE Std 802.11r-2008 (Fast BSS Transition) +#CONFIG_IEEE80211R=y + +# Use the hostapd's IEEE 802.11 authentication (ACL), but without +# the IEEE 802.11 Management capability (e.g., madwifi or FreeBSD/net80211) +#CONFIG_DRIVER_RADIUS_ACL=y + +# IEEE 802.11n (High Throughput) support +#CONFIG_IEEE80211N=y + +# Remove debugging code that is printing out debug messages to stdout. +# This can be used to reduce the size of the hostapd considerably if debugging +# code is not needed. +#CONFIG_NO_STDOUT_DEBUG=y + +# Remove support for RADIUS accounting +#CONFIG_NO_ACCOUNTING=y + +# Remove support for RADIUS +#CONFIG_NO_RADIUS=y + +# Remove support for VLANs +#CONFIG_NO_VLAN=y + +# Remove support for dumping state into a file on SIGUSR1 signal +# This can be used to reduce binary size at the cost of disabling a debugging +# option. +#CONFIG_NO_DUMP_STATE=y + +# Enable tracing code for developer debugging +# This tracks use of memory allocations and other registrations and reports +# incorrect use with a backtrace of call (or allocation) location. +#CONFIG_WPA_TRACE=y +# For BSD, comment out these. +#LIBS += -lexecinfo +#LIBS_p += -lexecinfo +#LIBS_c += -lexecinfo + +# Use libbfd to get more details for developer debugging +# This enables use of libbfd to get more detailed symbols for the backtraces +# generated by CONFIG_WPA_TRACE=y. +#CONFIG_WPA_TRACE_BFD=y +# For BSD, comment out these. +#LIBS += -lbfd -liberty -lz +#LIBS_p += -lbfd -liberty -lz +#LIBS_c += -lbfd -liberty -lz + + + diff --git a/recipes/hostap/hostap-daemon_0.7.3.bb b/recipes/hostap/hostap-daemon_0.7.3.bb index 10b1389590..5a8aee7045 100644 --- a/recipes/hostap/hostap-daemon_0.7.3.bb +++ b/recipes/hostap/hostap-daemon_0.7.3.bb @@ -1,10 +1,8 @@ DESCRIPTION = "User space daemon for extended IEEE 802.11 management" -HOMEPAGE = "http://hostap.epitest.fi" -SECTION = "kernel/userland" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "libnl openssl" -PR = "r2" + +require hostap-daemon-0.7.inc + +PR = "r3" DEFAULT_PREFERENCE = "-1" @@ -16,23 +14,4 @@ SRC_URI[sha256sum] = "31eb2781f37e1a4c27969d1594f8019c0ca87779349c099ab812833289 S = "${WORKDIR}/hostapd-${PV}/hostapd" -inherit update-rc.d -INITSCRIPT_NAME=hostapd - -do_configure() { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config -} - -do_compile() { - make -} - -do_install() { - install -d ${D}${sbindir} ${D}${sysconfdir}/init.d - install -m 0644 ${S}/hostapd.conf ${D}${sysconfdir} - install -m 0755 ${S}/hostapd ${D}${sbindir} - install -m 0755 ${S}/hostapd_cli ${D}${sbindir} - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd -} -CONFFILES_${PN} += "${sysconfdir}/hostapd.conf" diff --git a/recipes/hostap/hostap-daemon_git.bb b/recipes/hostap/hostap-daemon_git.bb new file mode 100644 index 0000000000..cf0e6e9483 --- /dev/null +++ b/recipes/hostap/hostap-daemon_git.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "User space daemon for extended IEEE 802.11 management" + +require hostap-daemon-0.7.inc + +PR = "r0" +SRCREV = "b8fb017272ed4794339978c9fbc0e74571a44728" +PV = "0.7.3+0.8.0-rc" +PR_append = "gitr${SRCPV}" +FILESPATHPKG =. "hostap-daemon-git:" + +DEFAULT_PREFERENCE = "-1" + +S = "${WORKDIR}/git/hostapd" + +SRC_URI = "git://w1.fi/srv/git/hostap.git;protocol=git \ + file://defconfig \ + file://init" + +S = "${WORKDIR}/git/hostapd" + +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config + echo "CFLAGS += -I${STAGING_INCDIR}" >> .config + echo "LIBS += -L${STAGING_LIBDIR}" >> .config +} + From 2c23d1285208ec06e04f7b08aab07ea0bcd4b4d0 Mon Sep 17 00:00:00 2001 From: Eyal Reizer Date: Thu, 21 Apr 2011 16:54:12 +0000 Subject: [PATCH 297/509] wpa-supplicant: Build from git sources * Builds a new version 0.8.x which is not released yet as a zip file. This version has new features like WIFI-direct used in new mac80211 versions * Add PV * Update defconfig Signed-off-by: Eyal Reizer Acked-by: Koen Kooi Signed-off-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- .../wpa-supplicant-git/99_wpa_supplicant | 1 + .../wpa-supplicant-git/defaults-sane | 8 + .../wpa-supplicant-git/defconfig | 422 +++++++++++ .../wpa-supplicant-git/wpa-supplicant.sh | 85 +++ .../wpa-supplicant-git/wpa_supplicant.conf | 690 ++++++++++++++++++ .../wpa_supplicant.conf-sane | 7 + recipes/wpa-supplicant/wpa-supplicant_git.bb | 32 + 7 files changed, 1245 insertions(+) create mode 100644 recipes/wpa-supplicant/wpa-supplicant-git/99_wpa_supplicant create mode 100644 recipes/wpa-supplicant/wpa-supplicant-git/defaults-sane create mode 100644 recipes/wpa-supplicant/wpa-supplicant-git/defconfig create mode 100644 recipes/wpa-supplicant/wpa-supplicant-git/wpa-supplicant.sh create mode 100644 recipes/wpa-supplicant/wpa-supplicant-git/wpa_supplicant.conf create mode 100644 recipes/wpa-supplicant/wpa-supplicant-git/wpa_supplicant.conf-sane create mode 100644 recipes/wpa-supplicant/wpa-supplicant_git.bb diff --git a/recipes/wpa-supplicant/wpa-supplicant-git/99_wpa_supplicant b/recipes/wpa-supplicant/wpa-supplicant-git/99_wpa_supplicant new file mode 100644 index 0000000000..6ff4dd8826 --- /dev/null +++ b/recipes/wpa-supplicant/wpa-supplicant-git/99_wpa_supplicant @@ -0,0 +1 @@ +d root root 0700 /var/run/wpa_supplicant none diff --git a/recipes/wpa-supplicant/wpa-supplicant-git/defaults-sane b/recipes/wpa-supplicant/wpa-supplicant-git/defaults-sane new file mode 100644 index 0000000000..67c4cbddf8 --- /dev/null +++ b/recipes/wpa-supplicant/wpa-supplicant-git/defaults-sane @@ -0,0 +1,8 @@ +# Useful flags: +# -i Interface (required, unless specified in config) +# -D Wireless Driver +# -d Debugging (-dd for more) +# -q Quiet (-qq for more) + +CONFIG="/etc/wpa_supplicant.conf" +OPTIONS="-i eth1 -D wext" diff --git a/recipes/wpa-supplicant/wpa-supplicant-git/defconfig b/recipes/wpa-supplicant/wpa-supplicant-git/defconfig new file mode 100644 index 0000000000..a72a7b3157 --- /dev/null +++ b/recipes/wpa-supplicant/wpa-supplicant-git/defconfig @@ -0,0 +1,422 @@ +# Example wpa_supplicant build time configuration +# +# This file lists the configuration options that are used when building the +# hostapd binary. All lines starting with # are ignored. Configuration option +# lines must be commented out complete, if they are not to be included, i.e., +# just setting VARIABLE=n is not disabling that variable. +# +# This file is included in Makefile, so variables like CFLAGS and LIBS can also +# be modified from here. In most cases, these lines should use += in order not +# to override previous values of the variables. + + +# Uncomment following two lines and fix the paths if you have installed OpenSSL +# or GnuTLS in non-default location +#CFLAGS += -I/usr/local/openssl/include +#LIBS += -L/usr/local/openssl/lib + +# Some Red Hat versions seem to include kerberos header files from OpenSSL, but +# the kerberos files are not in the default include path. Following line can be +# used to fix build issues on such systems (krb5.h not found). +#CFLAGS += -I/usr/include/kerberos + +# Example configuration for various cross-compilation platforms + +#### sveasoft (e.g., for Linksys WRT54G) ###################################### +#CC=mipsel-uclibc-gcc +#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc +#CFLAGS += -Os +#CPPFLAGS += -I../src/include -I../../src/router/openssl/include +#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl +############################################################################### + +#### openwrt (e.g., for Linksys WRT54G) ####################################### +#CC=mipsel-uclibc-gcc +#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc +#CFLAGS += -Os +#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \ +# -I../WRT54GS/release/src/include +#LIBS = -lssl +############################################################################### + +#CC=$(CROSS_COMPILE)gcc +#CFLAGS += -DCONFIG_LIBNL20 +#CPPFLAGS += -DCONFIG_LIBNL20 +#LIBS += -L$(NFSROOT)/lib -lnl +#LIBS_p += -L$(NFSROOT)/lib +#LIBDIR = $(NFSROOT)/lib +#BINDIR = $(NFSROOT)/usr/sbin + +CONFIG_WAPI=y +CONFIG_LIBNL20=y +NEED_BGSCAN=y +CONFIG_BGSCAN_LEARN=y + +# Driver interface for Host AP driver +#CONFIG_DRIVER_HOSTAP=y + +# Driver interface for Agere driver +#CONFIG_DRIVER_HERMES=y +# Change include directories to match with the local setup +#CFLAGS += -I../../hcf -I../../include -I../../include/hcf +#CFLAGS += -I../../include/wireless + +# Driver interface for madwifi driver +# Deprecated; use CONFIG_DRIVER_WEXT=y instead. +#CONFIG_DRIVER_MADWIFI=y +# Set include directory to the madwifi source tree +#CFLAGS += -I../../madwifi + +# Driver interface for ndiswrapper +# Deprecated; use CONFIG_DRIVER_WEXT=y instead. +#CONFIG_DRIVER_NDISWRAPPER=y + +# Driver interface for Atmel driver +#CONFIG_DRIVER_ATMEL=y + +# Driver interface for old Broadcom driver +# Please note that the newer Broadcom driver ("hybrid Linux driver") supports +# Linux wireless extensions and does not need (or even work) with the old +# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver. +#CONFIG_DRIVER_BROADCOM=y +# Example path for wlioctl.h; change to match your configuration +#CFLAGS += -I/opt/WRT54GS/release/src/include + +# Driver interface for Intel ipw2100/2200 driver +# Deprecated; use CONFIG_DRIVER_WEXT=y instead. +#CONFIG_DRIVER_IPW=y + +# Driver interface for Ralink driver +#CONFIG_DRIVER_RALINK=y + +# Driver interface for generic Linux wireless extensions +CONFIG_DRIVER_WEXT=y + +# Driver interface for Linux drivers using the nl80211 kernel interface +CONFIG_DRIVER_NL80211=y + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) +#CONFIG_DRIVER_BSD=y +#CFLAGS += -I/usr/local/include +#LIBS += -L/usr/local/lib +#LIBS_p += -L/usr/local/lib +#LIBS_c += -L/usr/local/lib + +# Driver interface for Windows NDIS +#CONFIG_DRIVER_NDIS=y +#CFLAGS += -I/usr/include/w32api/ddk +#LIBS += -L/usr/local/lib +# For native build using mingw +#CONFIG_NATIVE_WINDOWS=y +# Additional directories for cross-compilation on Linux host for mingw target +#CFLAGS += -I/opt/mingw/mingw32/include/ddk +#LIBS += -L/opt/mingw/mingw32/lib +#CC=mingw32-gcc +# By default, driver_ndis uses WinPcap for low-level operations. This can be +# replaced with the following option which replaces WinPcap calls with NDISUIO. +# However, this requires that WZC is disabled (net stop wzcsvc) before starting +# wpa_supplicant. +# CONFIG_USE_NDISUIO=y + +# Driver interface for development testing +#CONFIG_DRIVER_TEST=y + +# Include client MLME (management frame processing) for test driver +# This can be used to test MLME operations in hostapd with the test interface. +# space. +#CONFIG_CLIENT_MLME=y + +# Driver interface for wired Ethernet drivers +CONFIG_DRIVER_WIRED=y + +# Driver interface for the Broadcom RoboSwitch family +#CONFIG_DRIVER_ROBOSWITCH=y + +# Driver interface for no driver (e.g., WPS ER only) +#CONFIG_DRIVER_NONE=y + +# Solaris libraries +#LIBS += -lsocket -ldlpi -lnsl +#LIBS_c += -lsocket + +# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is +# included) +CONFIG_IEEE8021X_EAPOL=y + +# EAP-MD5 +CONFIG_EAP_MD5=y + +# EAP-MSCHAPv2 +CONFIG_EAP_MSCHAPV2=y + +# EAP-TLS +CONFIG_EAP_TLS=y + +# EAL-PEAP +CONFIG_EAP_PEAP=y + +# EAP-TTLS +CONFIG_EAP_TTLS=y + +# EAP-FAST +# Note: Default OpenSSL package does not include support for all the +# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, +# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch) +# to add the needed functions. +#CONFIG_EAP_FAST=y + +# EAP-GTC +CONFIG_EAP_GTC=y + +# EAP-OTP +CONFIG_EAP_OTP=y + +# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used) +#CONFIG_EAP_SIM=y + +# EAP-PSK (experimental; this is _not_ needed for WPA-PSK) +#CONFIG_EAP_PSK=y + +# EAP-PAX +#CONFIG_EAP_PAX=y + +# LEAP +CONFIG_EAP_LEAP=y + +# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used) +#CONFIG_EAP_AKA=y + +# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used). +# This requires CONFIG_EAP_AKA to be enabled, too. +#CONFIG_EAP_AKA_PRIME=y + +# Enable USIM simulator (Milenage) for EAP-AKA +#CONFIG_USIM_SIMULATOR=y + +# EAP-SAKE +#CONFIG_EAP_SAKE=y + +# EAP-GPSK +#CONFIG_EAP_GPSK=y +# Include support for optional SHA256 cipher suite in EAP-GPSK +#CONFIG_EAP_GPSK_SHA256=y + +# EAP-TNC and related Trusted Network Connect support (experimental) +#CONFIG_EAP_TNC=y + +# Wi-Fi Protected Setup (WPS) +CONFIG_WPS=y +# Enable WSC 2.0 support +CONFIG_WPS2=y + +# EAP-IKEv2 +#CONFIG_EAP_IKEV2=y + +# PKCS#12 (PFX) support (used to read private key and certificate file from +# a file that usually has extension .p12 or .pfx) +CONFIG_PKCS12=y + +# Smartcard support (i.e., private key on a smartcard), e.g., with openssl +# engine. +CONFIG_SMARTCARD=y + +# PC/SC interface for smartcards (USIM, GSM SIM) +# Enable this if EAP-SIM or EAP-AKA is included +#CONFIG_PCSC=y + +# Development testing +#CONFIG_EAPOL_TEST=y + +# Select control interface backend for external programs, e.g, wpa_cli: +# unix = UNIX domain sockets (default for Linux/*BSD) +# udp = UDP sockets using localhost (127.0.0.1) +# named_pipe = Windows Named Pipe (default for Windows) +# y = use default (backwards compatibility) +# If this option is commented out, control interface is not included in the +# build. +CONFIG_CTRL_IFACE=y + +# Include support for GNU Readline and History Libraries in wpa_cli. +# When building a wpa_cli binary for distribution, please note that these +# libraries are licensed under GPL and as such, BSD license may not apply for +# the resulting binary. +#CONFIG_READLINE=y + +# Remove debugging code that is printing out debug message to stdout. +# This can be used to reduce the size of the wpa_supplicant considerably +# if debugging code is not needed. The size reduction can be around 35% +# (e.g., 90 kB). +#CONFIG_NO_STDOUT_DEBUG=y + +# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save +# 35-50 kB in code size. +#CONFIG_NO_WPA=y + +# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to +# save about 1 kB in code size when building only WPA-Personal (no EAP support) +# or 6 kB if building for WPA-Enterprise. +#CONFIG_NO_WPA2=y + +# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support +# This option can be used to reduce code size by removing support for +# converting ASCII passphrases into PSK. If this functionality is removed, the +# PSK can only be configured as the 64-octet hexstring (e.g., from +# wpa_passphrase). This saves about 0.5 kB in code size. +#CONFIG_NO_WPA_PASSPHRASE=y + +# Disable scan result processing (ap_mode=1) to save code size by about 1 kB. +# This can be used if ap_scan=1 mode is never enabled. +#CONFIG_NO_SCAN_PROCESSING=y + +# Select configuration backend: +# file = text file (e.g., wpa_supplicant.conf; note: the configuration file +# path is given on command line, not here; this option is just used to +# select the backend that allows configuration files to be used) +# winreg = Windows registry (see win_example.reg for an example) +CONFIG_BACKEND=file + +# Remove configuration write functionality (i.e., to allow the configuration +# file to be updated based on runtime configuration changes). The runtime +# configuration can still be changed, the changes are just not going to be +# persistent over restarts. This option can be used to reduce code size by +# about 3.5 kB. +#CONFIG_NO_CONFIG_WRITE=y + +# Remove support for configuration blobs to reduce code size by about 1.5 kB. +#CONFIG_NO_CONFIG_BLOBS=y + +# Select program entry point implementation: +# main = UNIX/POSIX like main() function (default) +# main_winsvc = Windows service (read parameters from registry) +# main_none = Very basic example (development use only) +#CONFIG_MAIN=main + +# Select wrapper for operatins system and C library specific functions +# unix = UNIX/POSIX like systems (default) +# win32 = Windows systems +# none = Empty template +#CONFIG_OS=unix + +# Select event loop implementation +# eloop = select() loop (default) +# eloop_win = Windows events and WaitForMultipleObject() loop +# eloop_none = Empty template +#CONFIG_ELOOP=eloop + +# Select layer 2 packet implementation +# linux = Linux packet socket (default) +# pcap = libpcap/libdnet/WinPcap +# freebsd = FreeBSD libpcap +# winpcap = WinPcap with receive thread +# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y) +# none = Empty template +#CONFIG_L2_PACKET=linux + +# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) +CONFIG_PEERKEY=y + +# IEEE 802.11w (management frame protection) +# This version is an experimental implementation based on IEEE 802.11w/D1.0 +# draft and is subject to change since the standard has not yet been finalized. +# Driver support is also needed for IEEE 802.11w. +#CONFIG_IEEE80211W=y + +# Select TLS implementation +# openssl = OpenSSL (default) +# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA) +# internal = Internal TLSv1 implementation (experimental) +# none = Empty template +#CONFIG_TLS=openssl + +# Whether to enable TLS/IA support, which is required for EAP-TTLSv1. +# You need CONFIG_TLS=gnutls for this to have any effect. Please note that +# even though the core GnuTLS library is released under LGPL, this extra +# library uses GPL and as such, the terms of GPL apply to the combination +# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not +# apply for distribution of the resulting binary. +#CONFIG_GNUTLS_EXTRA=y + +# If CONFIG_TLS=internal is used, additional library and include paths are +# needed for LibTomMath. Alternatively, an integrated, minimal version of +# LibTomMath can be used. See beginning of libtommath.c for details on benefits +# and drawbacks of this option. +#CONFIG_INTERNAL_LIBTOMMATH=y +#ifndef CONFIG_INTERNAL_LIBTOMMATH +#LTM_PATH=/usr/src/libtommath-0.39 +#CFLAGS += -I$(LTM_PATH) +#LIBS += -L$(LTM_PATH) +#LIBS_p += -L$(LTM_PATH) +#endif +# At the cost of about 4 kB of additional binary size, the internal LibTomMath +# can be configured to include faster routines for exptmod, sqr, and div to +# speed up DH and RSA calculation considerably +#CONFIG_INTERNAL_LIBTOMMATH_FAST=y + +# Include NDIS event processing through WMI into wpa_supplicant/wpasvc. +# This is only for Windows builds and requires WMI-related header files and +# WbemUuid.Lib from Platform SDK even when building with MinGW. +#CONFIG_NDIS_EVENTS_INTEGRATED=y +#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib" + +# Add support for old DBus control interface +# (fi.epitest.hostap.WPASupplicant) +#CONFIG_CTRL_IFACE_DBUS=y + +# Add support for new DBus control interface +# (fi.w1.hostap.wpa_supplicant1) +#CONFIG_CTRL_IFACE_DBUS_NEW=y + +# Add introspection support for new DBus control interface +#CONFIG_CTRL_IFACE_DBUS_INTRO=y + +# Add support for loading EAP methods dynamically as shared libraries. +# When this option is enabled, each EAP method can be either included +# statically (CONFIG_EAP_=y) or dynamically (CONFIG_EAP_=dyn). +# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to +# be loaded in the beginning of the wpa_supplicant configuration file +# (see load_dynamic_eap parameter in the example file) before being used in +# the network blocks. +# +# Note that some shared parts of EAP methods are included in the main program +# and in order to be able to use dynamic EAP methods using these parts, the +# main program must have been build with the EAP method enabled (=y or =dyn). +# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries +# unless at least one of them was included in the main build to force inclusion +# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included +# in the main build to be able to load these methods dynamically. +# +# Please also note that using dynamic libraries will increase the total binary +# size. Thus, it may not be the best option for targets that have limited +# amount of memory/flash. +#CONFIG_DYNAMIC_EAP_METHODS=y + +# IEEE Std 802.11r-2008 (Fast BSS Transition) +#CONFIG_IEEE80211R=y + +# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) +CONFIG_DEBUG_FILE=y + +# Enable privilege separation (see README 'Privilege separation' for details) +#CONFIG_PRIVSEP=y + +# Enable mitigation against certain attacks against TKIP by delaying Michael +# MIC error reports by a random amount of time between 0 and 60 seconds +#CONFIG_DELAYED_MIC_ERROR_REPORT=y + +# Enable tracing code for developer debugging +# This tracks use of memory allocations and other registrations and reports +# incorrect use with a backtrace of call (or allocation) location. +#CONFIG_WPA_TRACE=y +# For BSD, comment out these. +#LIBS += -lexecinfo +#LIBS_p += -lexecinfo +#LIBS_c += -lexecinfo + +# Use libbfd to get more details for developer debugging +# This enables use of libbfd to get more detailed symbols for the backtraces +# generated by CONFIG_WPA_TRACE=y. +#CONFIG_WPA_TRACE_BFD=y +# For BSD, comment out these. +#LIBS += -lbfd -liberty -lz +#LIBS_p += -lbfd -liberty -lz +#LIBS_c += -lbfd -liberty -lz diff --git a/recipes/wpa-supplicant/wpa-supplicant-git/wpa-supplicant.sh b/recipes/wpa-supplicant/wpa-supplicant-git/wpa-supplicant.sh new file mode 100644 index 0000000000..5c9e5d33a7 --- /dev/null +++ b/recipes/wpa-supplicant/wpa-supplicant-git/wpa-supplicant.sh @@ -0,0 +1,85 @@ +#!/bin/sh + + +WPA_SUP_BIN="/usr/sbin/wpa_supplicant" +WPA_SUP_PNAME="wpa_supplicant" +WPA_SUP_PIDFILE="/var/run/wpa_supplicant.$IFACE.pid" +WPA_SUP_OPTIONS="-B -P $WPA_SUP_PIDFILE -i $IFACE" + +VERBOSITY=0 + + +if [ -s "$IF_WPA_CONF" ]; then + WPA_SUP_CONF="-c $IF_WPA_CONF" +else + exit 0 +fi + +if [ ! -x "$WPA_SUP_BIN" ]; then + + if [ "$VERBOSITY" = "1" ]; then + echo "$WPA_SUP_PNAME: binaries not executable or missing from $WPA_SUP_BIN" + fi + + exit 1 +fi + +if [ "$MODE" = "start" ] ; then + # driver type of interface, defaults to wext when undefined + if [ -s "/etc/wpa_supplicant/driver.$IFACE" ]; then + IF_WPA_DRIVER=$(cat "/etc/wpa_supplicant/driver.$IFACE") + elif [ -z "$IF_WPA_DRIVER" ]; then + + if [ "$VERBOSITY" = "1" ]; then + echo "$WPA_SUP_PNAME: wpa-driver not provided, using \"wext\"" + fi + + IF_WPA_DRIVER="wext" + fi + + # if we have passed the criteria, start wpa_supplicant + if [ -n "$WPA_SUP_CONF" ]; then + + if [ "$VERBOSITY" = "1" ]; then + echo "$WPA_SUP_PNAME: $WPA_SUP_BIN $WPA_SUP_OPTIONS $WPA_SUP_CONF -D $IF_WPA_DRIVER" + fi + + start-stop-daemon --start --quiet \ + --name $WPA_SUP_PNAME --startas $WPA_SUP_BIN --pidfile $WPA_SUP_PIDFILE \ + -- $WPA_SUP_OPTIONS $WPA_SUP_CONF -D $IF_WPA_DRIVER + fi + + # if the interface socket exists, then wpa_supplicant was invoked successfully + if [ -S "$WPA_COMMON_CTRL_IFACE/$IFACE" ]; then + + if [ "$VERBOSITY" = "1" ]; then + echo "$WPA_SUP_PNAME: ctrl_interface socket located at $WPA_COMMON_CTRL_IFACE/$IFACE" + fi + + exit 0 + + fi + +elif [ "$MODE" = "stop" ]; then + + if [ -f "$WPA_SUP_PIDFILE" ]; then + + if [ "$VERBOSITY" = "1" ]; then + echo "$WPA_SUP_PNAME: terminating $WPA_SUP_PNAME daemon" + fi + + start-stop-daemon --stop --quiet \ + --name $WPA_SUP_PNAME --pidfile $WPA_SUP_PIDFILE + + if [ -S "$WPA_COMMON_CTRL_IFACE/$IFACE" ]; then + rm -f $WPA_COMMON_CTRL_IFACE/$IFACE + fi + + if [ -f "$WPA_SUP_PIDFILE" ]; then + rm -f $WPA_SUP_PIDFILE + fi + fi + +fi + +exit 0 diff --git a/recipes/wpa-supplicant/wpa-supplicant-git/wpa_supplicant.conf b/recipes/wpa-supplicant/wpa-supplicant-git/wpa_supplicant.conf new file mode 100644 index 0000000000..f0c993d195 --- /dev/null +++ b/recipes/wpa-supplicant/wpa-supplicant-git/wpa_supplicant.conf @@ -0,0 +1,690 @@ +##### Example wpa_supplicant configuration file ############################### +# +# This file describes configuration file format and lists all available option. +# Please also take a look at simpler configuration examples in 'examples' +# subdirectory. +# +# Empty lines and lines starting with # are ignored + +# NOTE! This file may contain password information and should probably be made +# readable only by root user on multiuser systems. + +# Note: All file paths in this configuration file should use full (absolute, +# not relative to working directory) path in order to allow working directory +# to be changed. This can happen if wpa_supplicant is run in the background. + +# Whether to allow wpa_supplicant to update (overwrite) configuration +# +# This option can be used to allow wpa_supplicant to overwrite configuration +# file whenever configuration is changed (e.g., new network block is added with +# wpa_cli or wpa_gui, or a password is changed). This is required for +# wpa_cli/wpa_gui to be able to store the configuration changes permanently. +# Please note that overwriting configuration file will remove the comments from +# it. +#update_config=1 + +# global configuration (shared by all network blocks) +# +# Parameters for the control interface. If this is specified, wpa_supplicant +# will open a control interface that is available for external programs to +# manage wpa_supplicant. The meaning of this string depends on which control +# interface mechanism is used. For all cases, the existance of this parameter +# in configuration is used to determine whether the control interface is +# enabled. +# +# For UNIX domain sockets (default on Linux and BSD): This is a directory that +# will be created for UNIX domain sockets for listening to requests from +# external programs (CLI/GUI, etc.) for status information and configuration. +# The socket file will be named based on the interface name, so multiple +# wpa_supplicant processes can be run at the same time if more than one +# interface is used. +# /var/run/wpa_supplicant is the recommended directory for sockets and by +# default, wpa_cli will use it when trying to connect with wpa_supplicant. +# +# Access control for the control interface can be configured by setting the +# directory to allow only members of a group to use sockets. This way, it is +# possible to run wpa_supplicant as root (since it needs to change network +# configuration and open raw sockets) and still allow GUI/CLI components to be +# run as non-root users. However, since the control interface can be used to +# change the network configuration, this access needs to be protected in many +# cases. By default, wpa_supplicant is configured to use gid 0 (root). If you +# want to allow non-root users to use the control interface, add a new group +# and change this value to match with that group. Add users that should have +# control interface access to this group. If this variable is commented out or +# not included in the configuration file, group will not be changed from the +# value it got by default when the directory or socket was created. +# +# When configuring both the directory and group, use following format: +# DIR=/var/run/wpa_supplicant GROUP=wheel +# DIR=/var/run/wpa_supplicant GROUP=0 +# (group can be either group name or gid) +# +# For UDP connections (default on Windows): The value will be ignored. This +# variable is just used to select that the control interface is to be created. +# The value can be set to, e.g., udp (ctrl_interface=udp) +# +# For Windows Named Pipe: This value can be used to set the security descriptor +# for controlling access to the control interface. Security descriptor can be +# set using Security Descriptor String Format (see http://msdn.microsoft.com/ +# library/default.asp?url=/library/en-us/secauthz/security/ +# security_descriptor_string_format.asp). The descriptor string needs to be +# prefixed with SDDL=. For example, ctrl_interface=SDDL=D: would set an empty +# DACL (which will reject all connections). See README-Windows.txt for more +# information about SDDL string format. +# +ctrl_interface=/var/run/wpa_supplicant + +# IEEE 802.1X/EAPOL version +# wpa_supplicant is implemented based on IEEE Std 802.1X-2004 which defines +# EAPOL version 2. However, there are many APs that do not handle the new +# version number correctly (they seem to drop the frames completely). In order +# to make wpa_supplicant interoperate with these APs, the version number is set +# to 1 by default. This configuration value can be used to set it to the new +# version (2). +eapol_version=1 + +# AP scanning/selection +# By default, wpa_supplicant requests driver to perform AP scanning and then +# uses the scan results to select a suitable AP. Another alternative is to +# allow the driver to take care of AP scanning and selection and use +# wpa_supplicant just to process EAPOL frames based on IEEE 802.11 association +# information from the driver. +# 1: wpa_supplicant initiates scanning and AP selection +# 0: driver takes care of scanning, AP selection, and IEEE 802.11 association +# parameters (e.g., WPA IE generation); this mode can also be used with +# non-WPA drivers when using IEEE 802.1X mode; do not try to associate with +# APs (i.e., external program needs to control association). This mode must +# also be used when using wired Ethernet drivers. +# 2: like 0, but associate with APs using security policy and SSID (but not +# BSSID); this can be used, e.g., with ndiswrapper and NDIS drivers to +# enable operation with hidden SSIDs and optimized roaming; in this mode, +# the network blocks in the configuration file are tried one by one until +# the driver reports successful association; each network block should have +# explicit security policy (i.e., only one option in the lists) for +# key_mgmt, pairwise, group, proto variables +ap_scan=1 + +# EAP fast re-authentication +# By default, fast re-authentication is enabled for all EAP methods that +# support it. This variable can be used to disable fast re-authentication. +# Normally, there is no need to disable this. +fast_reauth=1 + +# OpenSSL Engine support +# These options can be used to load OpenSSL engines. +# The two engines that are supported currently are shown below: +# They are both from the opensc project (http://www.opensc.org/) +# By default no engines are loaded. +# make the opensc engine available +#opensc_engine_path=/usr/lib/opensc/engine_opensc.so +# make the pkcs11 engine available +#pkcs11_engine_path=/usr/lib/opensc/engine_pkcs11.so +# configure the path to the pkcs11 module required by the pkcs11 engine +#pkcs11_module_path=/usr/lib/pkcs11/opensc-pkcs11.so + +# Dynamic EAP methods +# If EAP methods were built dynamically as shared object files, they need to be +# loaded here before being used in the network blocks. By default, EAP methods +# are included statically in the build, so these lines are not needed +#load_dynamic_eap=/usr/lib/wpa_supplicant/eap_tls.so +#load_dynamic_eap=/usr/lib/wpa_supplicant/eap_md5.so + +# Driver interface parameters +# This field can be used to configure arbitrary driver interace parameters. The +# format is specific to the selected driver interface. This field is not used +# in most cases. +#driver_param="field=value" + +# Maximum lifetime for PMKSA in seconds; default 43200 +#dot11RSNAConfigPMKLifetime=43200 +# Threshold for reauthentication (percentage of PMK lifetime); default 70 +#dot11RSNAConfigPMKReauthThreshold=70 +# Timeout for security association negotiation in seconds; default 60 +#dot11RSNAConfigSATimeout=60 + +# network block +# +# Each network (usually AP's sharing the same SSID) is configured as a separate +# block in this configuration file. The network blocks are in preference order +# (the first match is used). +# +# network block fields: +# +# disabled: +# 0 = this network can be used (default) +# 1 = this network block is disabled (can be enabled through ctrl_iface, +# e.g., with wpa_cli or wpa_gui) +# +# id_str: Network identifier string for external scripts. This value is passed +# to external action script through wpa_cli as WPA_ID_STR environment +# variable to make it easier to do network specific configuration. +# +# ssid: SSID (mandatory); either as an ASCII string with double quotation or +# as hex string; network name +# +# scan_ssid: +# 0 = do not scan this SSID with specific Probe Request frames (default) +# 1 = scan with SSID-specific Probe Request frames (this can be used to +# find APs that do not accept broadcast SSID or use multiple SSIDs; +# this will add latency to scanning, so enable this only when needed) +# +# bssid: BSSID (optional); if set, this network block is used only when +# associating with the AP using the configured BSSID +# +# priority: priority group (integer) +# By default, all networks will get same priority group (0). If some of the +# networks are more desirable, this field can be used to change the order in +# which wpa_supplicant goes through the networks when selecting a BSS. The +# priority groups will be iterated in decreasing priority (i.e., the larger the +# priority value, the sooner the network is matched against the scan results). +# Within each priority group, networks will be selected based on security +# policy, signal strength, etc. +# Please note that AP scanning with scan_ssid=1 and ap_scan=2 mode are not +# using this priority to select the order for scanning. Instead, they try the +# networks in the order that used in the configuration file. +# +# mode: IEEE 802.11 operation mode +# 0 = infrastructure (Managed) mode, i.e., associate with an AP (default) +# 1 = IBSS (ad-hoc, peer-to-peer) +# Note: IBSS can only be used with key_mgmt NONE (plaintext and static WEP) +# and key_mgmt=WPA-NONE (fixed group key TKIP/CCMP). In addition, ap_scan has +# to be set to 2 for IBSS. WPA-None requires following network block options: +# proto=WPA, key_mgmt=WPA-NONE, pairwise=NONE, group=TKIP (or CCMP, but not +# both), and psk must also be set. +# +# proto: list of accepted protocols +# WPA = WPA/IEEE 802.11i/D3.0 +# RSN = WPA2/IEEE 802.11i (also WPA2 can be used as an alias for RSN) +# If not set, this defaults to: WPA RSN +# +# key_mgmt: list of accepted authenticated key management protocols +# WPA-PSK = WPA pre-shared key (this requires 'psk' field) +# WPA-EAP = WPA using EAP authentication (this can use an external +# program, e.g., Xsupplicant, for IEEE 802.1X EAP Authentication +# IEEE8021X = IEEE 802.1X using EAP authentication and (optionally) dynamically +# generated WEP keys +# NONE = WPA is not used; plaintext or static WEP could be used +# If not set, this defaults to: WPA-PSK WPA-EAP +# +# auth_alg: list of allowed IEEE 802.11 authentication algorithms +# OPEN = Open System authentication (required for WPA/WPA2) +# SHARED = Shared Key authentication (requires static WEP keys) +# LEAP = LEAP/Network EAP (only used with LEAP) +# If not set, automatic selection is used (Open System with LEAP enabled if +# LEAP is allowed as one of the EAP methods). +# +# pairwise: list of accepted pairwise (unicast) ciphers for WPA +# CCMP = AES in Counter mode with CBC-MAC [RFC 3610, IEEE 802.11i/D7.0] +# TKIP = Temporal Key Integrity Protocol [IEEE 802.11i/D7.0] +# NONE = Use only Group Keys (deprecated, should not be included if APs support +# pairwise keys) +# If not set, this defaults to: CCMP TKIP +# +# group: list of accepted group (broadcast/multicast) ciphers for WPA +# CCMP = AES in Counter mode with CBC-MAC [RFC 3610, IEEE 802.11i/D7.0] +# TKIP = Temporal Key Integrity Protocol [IEEE 802.11i/D7.0] +# WEP104 = WEP (Wired Equivalent Privacy) with 104-bit key +# WEP40 = WEP (Wired Equivalent Privacy) with 40-bit key [IEEE 802.11] +# If not set, this defaults to: CCMP TKIP WEP104 WEP40 +# +# psk: WPA preshared key; 256-bit pre-shared key +# The key used in WPA-PSK mode can be entered either as 64 hex-digits, i.e., +# 32 bytes or as an ASCII passphrase (in which case, the real PSK will be +# generated using the passphrase and SSID). ASCII passphrase must be between +# 8 and 63 characters (inclusive). +# This field is not needed, if WPA-EAP is used. +# Note: Separate tool, wpa_passphrase, can be used to generate 256-bit keys +# from ASCII passphrase. This process uses lot of CPU and wpa_supplicant +# startup and reconfiguration time can be optimized by generating the PSK only +# only when the passphrase or SSID has actually changed. +# +# eapol_flags: IEEE 802.1X/EAPOL options (bit field) +# Dynamic WEP key required for non-WPA mode +# bit0 (1): require dynamically generated unicast WEP key +# bit1 (2): require dynamically generated broadcast WEP key +# (3 = require both keys; default) +# Note: When using wired authentication, eapol_flags must be set to 0 for the +# authentication to be completed successfully. +# +# proactive_key_caching: +# Enable/disable opportunistic PMKSA caching for WPA2. +# 0 = disabled (default) +# 1 = enabled +# +# wep_key0..3: Static WEP key (ASCII in double quotation, e.g. "abcde" or +# hex without quotation, e.g., 0102030405) +# wep_tx_keyidx: Default WEP key index (TX) (0..3) +# +# peerkey: Whether PeerKey negotiation for direct links (IEEE 802.11e DLS) is +# allowed. This is only used with RSN/WPA2. +# 0 = disabled (default) +# 1 = enabled +#peerkey=1 +# +# Following fields are only used with internal EAP implementation. +# eap: space-separated list of accepted EAP methods +# MD5 = EAP-MD5 (unsecure and does not generate keying material -> +# cannot be used with WPA; to be used as a Phase 2 method +# with EAP-PEAP or EAP-TTLS) +# MSCHAPV2 = EAP-MSCHAPv2 (cannot be used separately with WPA; to be used +# as a Phase 2 method with EAP-PEAP or EAP-TTLS) +# OTP = EAP-OTP (cannot be used separately with WPA; to be used +# as a Phase 2 method with EAP-PEAP or EAP-TTLS) +# GTC = EAP-GTC (cannot be used separately with WPA; to be used +# as a Phase 2 method with EAP-PEAP or EAP-TTLS) +# TLS = EAP-TLS (client and server certificate) +# PEAP = EAP-PEAP (with tunnelled EAP authentication) +# TTLS = EAP-TTLS (with tunnelled EAP or PAP/CHAP/MSCHAP/MSCHAPV2 +# authentication) +# If not set, all compiled in methods are allowed. +# +# identity: Identity string for EAP +# anonymous_identity: Anonymous identity string for EAP (to be used as the +# unencrypted identity with EAP types that support different tunnelled +# identity, e.g., EAP-TTLS) +# password: Password string for EAP +# ca_cert: File path to CA certificate file (PEM/DER). This file can have one +# or more trusted CA certificates. If ca_cert and ca_path are not +# included, server certificate will not be verified. This is insecure and +# a trusted CA certificate should always be configured when using +# EAP-TLS/TTLS/PEAP. Full path should be used since working directory may +# change when wpa_supplicant is run in the background. +# On Windows, trusted CA certificates can be loaded from the system +# certificate store by setting this to cert_store://, e.g., +# ca_cert="cert_store://CA" or ca_cert="cert_store://ROOT". +# Note that when running wpa_supplicant as an application, the user +# certificate store (My user account) is used, whereas computer store +# (Computer account) is used when running wpasvc as a service. +# ca_path: Directory path for CA certificate files (PEM). This path may +# contain multiple CA certificates in OpenSSL format. Common use for this +# is to point to system trusted CA list which is often installed into +# directory like /etc/ssl/certs. If configured, these certificates are +# added to the list of trusted CAs. ca_cert may also be included in that +# case, but it is not required. +# client_cert: File path to client certificate file (PEM/DER) +# Full path should be used since working directory may change when +# wpa_supplicant is run in the background. +# Alternatively, a named configuration blob can be used by setting this +# to blob://. +# private_key: File path to client private key file (PEM/DER/PFX) +# When PKCS#12/PFX file (.p12/.pfx) is used, client_cert should be +# commented out. Both the private key and certificate will be read from +# the PKCS#12 file in this case. Full path should be used since working +# directory may change when wpa_supplicant is run in the background. +# Windows certificate store can be used by leaving client_cert out and +# configuring private_key in one of the following formats: +# cert://substring_to_match +# hash://certificate_thumbprint_in_hex +# for example: private_key="hash://63093aa9c47f56ae88334c7b65a4" +# Note that when running wpa_supplicant as an application, the user +# certificate store (My user account) is used, whereas computer store +# (Computer account) is used when running wpasvc as a service. +# Alternatively, a named configuration blob can be used by setting this +# to blob://. +# private_key_passwd: Password for private key file (if left out, this will be +# asked through control interface) +# dh_file: File path to DH/DSA parameters file (in PEM format) +# This is an optional configuration file for setting parameters for an +# ephemeral DH key exchange. In most cases, the default RSA +# authentication does not use this configuration. However, it is possible +# setup RSA to use ephemeral DH key exchange. In addition, ciphers with +# DSA keys always use ephemeral DH keys. This can be used to achieve +# forward secrecy. If the file is in DSA parameters format, it will be +# automatically converted into DH params. +# subject_match: Substring to be matched against the subject of the +# authentication server certificate. If this string is set, the server +# sertificate is only accepted if it contains this string in the subject. +# The subject string is in following format: +# /C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com +# altsubject_match: Semicolon separated string of entries to be matched against +# the alternative subject name of the authentication server certificate. +# If this string is set, the server sertificate is only accepted if it +# contains one of the entries in an alternative subject name extension. +# altSubjectName string is in following format: TYPE:VALUE +# Example: EMAIL:server@example.com +# Example: DNS:server.example.com;DNS:server2.example.com +# Following types are supported: EMAIL, DNS, URI +# phase1: Phase1 (outer authentication, i.e., TLS tunnel) parameters +# (string with field-value pairs, e.g., "peapver=0" or +# "peapver=1 peaplabel=1") +# 'peapver' can be used to force which PEAP version (0 or 1) is used. +# 'peaplabel=1' can be used to force new label, "client PEAP encryption", +# to be used during key derivation when PEAPv1 or newer. Most existing +# PEAPv1 implementation seem to be using the old label, "client EAP +# encryption", and wpa_supplicant is now using that as the default value. +# Some servers, e.g., Radiator, may require peaplabel=1 configuration to +# interoperate with PEAPv1; see eap_testing.txt for more details. +# 'peap_outer_success=0' can be used to terminate PEAP authentication on +# tunneled EAP-Success. This is required with some RADIUS servers that +# implement draft-josefsson-pppext-eap-tls-eap-05.txt (e.g., +# Lucent NavisRadius v4.4.0 with PEAP in "IETF Draft 5" mode) +# include_tls_length=1 can be used to force wpa_supplicant to include +# TLS Message Length field in all TLS messages even if they are not +# fragmented. +# sim_min_num_chal=3 can be used to configure EAP-SIM to require three +# challenges (by default, it accepts 2 or 3) +# phase2: Phase2 (inner authentication with TLS tunnel) parameters +# (string with field-value pairs, e.g., "auth=MSCHAPV2" for EAP-PEAP or +# "autheap=MSCHAPV2 autheap=MD5" for EAP-TTLS) +# Following certificate/private key fields are used in inner Phase2 +# authentication when using EAP-TTLS or EAP-PEAP. +# ca_cert2: File path to CA certificate file. This file can have one or more +# trusted CA certificates. If ca_cert2 and ca_path2 are not included, +# server certificate will not be verified. This is insecure and a trusted +# CA certificate should always be configured. +# ca_path2: Directory path for CA certificate files (PEM) +# client_cert2: File path to client certificate file +# private_key2: File path to client private key file +# private_key2_passwd: Password for private key file +# dh_file2: File path to DH/DSA parameters file (in PEM format) +# subject_match2: Substring to be matched against the subject of the +# authentication server certificate. +# altsubject_match2: Substring to be matched against the alternative subject +# name of the authentication server certificate. +# +# fragment_size: Maximum EAP fragment size in bytes (default 1398). +# This value limits the fragment size for EAP methods that support +# fragmentation (e.g., EAP-TLS and EAP-PEAP). This value should be set +# small enough to make the EAP messages fit in MTU of the network +# interface used for EAPOL. The default value is suitable for most +# cases. +# +# EAP-PSK variables: +# eappsk: 16-byte (128-bit, 32 hex digits) pre-shared key in hex format +# nai: user NAI +# +# EAP-PAX variables: +# eappsk: 16-byte (128-bit, 32 hex digits) pre-shared key in hex format +# +# EAP-SAKE variables: +# eappsk: 32-byte (256-bit, 64 hex digits) pre-shared key in hex format +# (this is concatenation of Root-Secret-A and Root-Secret-B) +# nai: user NAI (PEERID) +# +# EAP-GPSK variables: +# eappsk: Pre-shared key in hex format (at least 128 bits, i.e., 32 hex digits) +# nai: user NAI (ID_Client) +# +# EAP-FAST variables: +# pac_file: File path for the PAC entries. wpa_supplicant will need to be able +# to create this file and write updates to it when PAC is being +# provisioned or refreshed. Full path to the file should be used since +# working directory may change when wpa_supplicant is run in the +# background. Alternatively, a named configuration blob can be used by +# setting this to blob:// +# phase1: fast_provisioning=1 option enables in-line provisioning of EAP-FAST +# credentials (PAC) +# +# wpa_supplicant supports number of "EAP workarounds" to work around +# interoperability issues with incorrectly behaving authentication servers. +# These are enabled by default because some of the issues are present in large +# number of authentication servers. Strict EAP conformance mode can be +# configured by disabling workarounds with eap_workaround=0. + +# Example blocks: + +# Simple case: WPA-PSK, PSK as an ASCII passphrase, allow all valid ciphers +network={ + ssid="simple" + psk="very secret passphrase" + priority=5 +} + +# Same as previous, but request SSID-specific scanning (for APs that reject +# broadcast SSID) +network={ + ssid="second ssid" + scan_ssid=1 + psk="very secret passphrase" + priority=2 +} + +# Only WPA-PSK is used. Any valid cipher combination is accepted. +network={ + ssid="example" + proto=WPA + key_mgmt=WPA-PSK + pairwise=CCMP TKIP + group=CCMP TKIP WEP104 WEP40 + psk=06b4be19da289f475aa46a33cb793029d4ab3db7a23ee92382eb0106c72ac7bb + priority=2 +} + +# Only WPA-EAP is used. Both CCMP and TKIP is accepted. An AP that used WEP104 +# or WEP40 as the group cipher will not be accepted. +network={ + ssid="example" + proto=RSN + key_mgmt=WPA-EAP + pairwise=CCMP TKIP + group=CCMP TKIP + eap=TLS + identity="user@example.com" + ca_cert="/etc/cert/ca.pem" + client_cert="/etc/cert/user.pem" + private_key="/etc/cert/user.prv" + private_key_passwd="password" + priority=1 +} + +# EAP-PEAP/MSCHAPv2 configuration for RADIUS servers that use the new peaplabel +# (e.g., Radiator) +network={ + ssid="example" + key_mgmt=WPA-EAP + eap=PEAP + identity="user@example.com" + password="foobar" + ca_cert="/etc/cert/ca.pem" + phase1="peaplabel=1" + phase2="auth=MSCHAPV2" + priority=10 +} + +# EAP-TTLS/EAP-MD5-Challenge configuration with anonymous identity for the +# unencrypted use. Real identity is sent only within an encrypted TLS tunnel. +network={ + ssid="example" + key_mgmt=WPA-EAP + eap=TTLS + identity="user@example.com" + anonymous_identity="anonymous@example.com" + password="foobar" + ca_cert="/etc/cert/ca.pem" + priority=2 +} + +# EAP-TTLS/MSCHAPv2 configuration with anonymous identity for the unencrypted +# use. Real identity is sent only within an encrypted TLS tunnel. +network={ + ssid="example" + key_mgmt=WPA-EAP + eap=TTLS + identity="user@example.com" + anonymous_identity="anonymous@example.com" + password="foobar" + ca_cert="/etc/cert/ca.pem" + phase2="auth=MSCHAPV2" +} + +# WPA-EAP, EAP-TTLS with different CA certificate used for outer and inner +# authentication. +network={ + ssid="example" + key_mgmt=WPA-EAP + eap=TTLS + # Phase1 / outer authentication + anonymous_identity="anonymous@example.com" + ca_cert="/etc/cert/ca.pem" + # Phase 2 / inner authentication + phase2="autheap=TLS" + ca_cert2="/etc/cert/ca2.pem" + client_cert2="/etc/cer/user.pem" + private_key2="/etc/cer/user.prv" + private_key2_passwd="password" + priority=2 +} + +# Both WPA-PSK and WPA-EAP is accepted. Only CCMP is accepted as pairwise and +# group cipher. +network={ + ssid="example" + bssid=00:11:22:33:44:55 + proto=WPA RSN + key_mgmt=WPA-PSK WPA-EAP + pairwise=CCMP + group=CCMP + psk=06b4be19da289f475aa46a33cb793029d4ab3db7a23ee92382eb0106c72ac7bb +} + +# Special characters in SSID, so use hex string. Default to WPA-PSK, WPA-EAP +# and all valid ciphers. +network={ + ssid=00010203 + psk=000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f +} + + +# IEEE 802.1X/EAPOL with dynamically generated WEP keys (i.e., no WPA) using +# EAP-TLS for authentication and key generation; require both unicast and +# broadcast WEP keys. +network={ + ssid="1x-test" + key_mgmt=IEEE8021X + eap=TLS + identity="user@example.com" + ca_cert="/etc/cert/ca.pem" + client_cert="/etc/cert/user.pem" + private_key="/etc/cert/user.prv" + private_key_passwd="password" + eapol_flags=3 +} + + +# LEAP with dynamic WEP keys +network={ + ssid="leap-example" + key_mgmt=IEEE8021X + eap=LEAP + identity="user" + password="foobar" +} + +# Plaintext connection (no WPA, no IEEE 802.1X) +network={ + ssid="plaintext-test" + key_mgmt=NONE +} + + +# Shared WEP key connection (no WPA, no IEEE 802.1X) +network={ + ssid="static-wep-test" + key_mgmt=NONE + wep_key0="abcde" + wep_key1=0102030405 + wep_key2="1234567890123" + wep_tx_keyidx=0 + priority=5 +} + + +# Shared WEP key connection (no WPA, no IEEE 802.1X) using Shared Key +# IEEE 802.11 authentication +network={ + ssid="static-wep-test2" + key_mgmt=NONE + wep_key0="abcde" + wep_key1=0102030405 + wep_key2="1234567890123" + wep_tx_keyidx=0 + priority=5 + auth_alg=SHARED +} + + +# IBSS/ad-hoc network with WPA-None/TKIP. +network={ + ssid="test adhoc" + mode=1 + proto=WPA + key_mgmt=WPA-NONE + pairwise=NONE + group=TKIP + psk="secret passphrase" +} + + +# Catch all example that allows more or less all configuration modes +network={ + ssid="example" + scan_ssid=1 + key_mgmt=WPA-EAP WPA-PSK IEEE8021X NONE + pairwise=CCMP TKIP + group=CCMP TKIP WEP104 WEP40 + psk="very secret passphrase" + eap=TTLS PEAP TLS + identity="user@example.com" + password="foobar" + ca_cert="/etc/cert/ca.pem" + client_cert="/etc/cert/user.pem" + private_key="/etc/cert/user.prv" + private_key_passwd="password" + phase1="peaplabel=0" +} + +# Example of EAP-TLS with smartcard (openssl engine) +network={ + ssid="example" + key_mgmt=WPA-EAP + eap=TLS + proto=RSN + pairwise=CCMP TKIP + group=CCMP TKIP + identity="user@example.com" + ca_cert="/etc/cert/ca.pem" + client_cert="/etc/cert/user.pem" + + engine=1 + + # The engine configured here must be available. Look at + # OpenSSL engine support in the global section. + # The key available through the engine must be the private key + # matching the client certificate configured above. + + # use the opensc engine + #engine_id="opensc" + #key_id="45" + + # use the pkcs11 engine + engine_id="pkcs11" + key_id="id_45" + + # Optional PIN configuration; this can be left out and PIN will be + # asked through the control interface + pin="1234" +} + +# Example configuration showing how to use an inlined blob as a CA certificate +# data instead of using external file +network={ + ssid="example" + key_mgmt=WPA-EAP + eap=TTLS + identity="user@example.com" + anonymous_identity="anonymous@example.com" + password="foobar" + ca_cert="blob://exampleblob" + priority=20 +} + +blob-base64-exampleblob={ +SGVsbG8gV29ybGQhCg== +} + + +# Wildcard match for SSID (plaintext APs only). This example select any +# open AP regardless of its SSID. +network={ + key_mgmt=NONE +} diff --git a/recipes/wpa-supplicant/wpa-supplicant-git/wpa_supplicant.conf-sane b/recipes/wpa-supplicant/wpa-supplicant-git/wpa_supplicant.conf-sane new file mode 100644 index 0000000000..c91ffe0c84 --- /dev/null +++ b/recipes/wpa-supplicant/wpa-supplicant-git/wpa_supplicant.conf-sane @@ -0,0 +1,7 @@ +ctrl_interface=/var/run/wpa_supplicant +ctrl_interface_group=0 +update_config=1 + +network={ + key_mgmt=NONE +} diff --git a/recipes/wpa-supplicant/wpa-supplicant_git.bb b/recipes/wpa-supplicant/wpa-supplicant_git.bb new file mode 100644 index 0000000000..8f6971e0d6 --- /dev/null +++ b/recipes/wpa-supplicant/wpa-supplicant_git.bb @@ -0,0 +1,32 @@ +require wpa-supplicant-0.7.inc + +SRCREV = "b8fb017272ed4794339978c9fbc0e74571a44728" +PR = "r0" +PV = "0.7.3+0.8.0-rc" +PR_append = "+gitr${SRCPV}" +FILESPATHPKG =. "wpa-supplicant-git:" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "git://w1.fi/srv/git/hostap.git;protocol=git \ + file://defconfig \ + file://defaults-sane \ + file://wpa-supplicant.sh \ + file://wpa_supplicant.conf \ + file://wpa_supplicant.conf-sane \ + file://99_wpa_supplicant" + +S = "${WORKDIR}/git/wpa_supplicant" + +do_configure () { + install -m 0755 ${WORKDIR}/defconfig .config + echo "CFLAGS += -I${STAGING_INCDIR}" >> .config + echo "LIBS += -L${STAGING_LIBDIR}" >> .config + echo "LIBS_p += -L${STAGING_LIBDIR}" >> .config + if [ "${@base_contains('COMBINED_FEATURES', 'madwifi', 1, 0, d)}" = "1" ]; then + echo "CONFIG_DRIVER_MADWIFI=y" >> .config + echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config + fi +} + + From a0ceef2a5c29fab4039901fad689dc27c939ddb5 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 16 Mar 2011 11:28:17 -0700 Subject: [PATCH 298/509] ftpd-topfield: Rework usb-header-name-2-6-23.patch While in here, clean up the recipe a bit. It's not autotools based and if we move the library in with an unpack2 the patch can be applied with striplevel=0. There are other problems with this recipe at present (CFLAGS/LDFLAGS in our env override the Makefile). Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/ftpd-topfield/files/usb-header-name-2-6-23.patch | 4 ++-- recipes/ftpd-topfield/ftpd-topfield_0.7.5.bb | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/recipes/ftpd-topfield/files/usb-header-name-2-6-23.patch b/recipes/ftpd-topfield/files/usb-header-name-2-6-23.patch index 2ab6c4c094..fd695d8508 100644 --- a/recipes/ftpd-topfield/files/usb-header-name-2-6-23.patch +++ b/recipes/ftpd-topfield/files/usb-header-name-2-6-23.patch @@ -1,5 +1,5 @@ ---- ../../libtopfield/usb_io.h.orig 2008-12-26 23:11:08.000000000 -0600 -+++ ../../libtopfield/usb_io.h 2008-12-26 23:24:02.000000000 -0600 +--- libtopfield/usb_io.h.orig 2008-12-26 23:11:08.000000000 -0600 ++++ libtopfield/usb_io.h 2008-12-26 23:24:02.000000000 -0600 @@ -36,7 +36,12 @@ /* linux/usb_ch9.h wasn't separated out until 2.4.23 */ diff --git a/recipes/ftpd-topfield/ftpd-topfield_0.7.5.bb b/recipes/ftpd-topfield/ftpd-topfield_0.7.5.bb index 504f652393..b1dee21d5a 100755 --- a/recipes/ftpd-topfield/ftpd-topfield_0.7.5.bb +++ b/recipes/ftpd-topfield/ftpd-topfield_0.7.5.bb @@ -8,7 +8,7 @@ PR = "r3" SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_7_5 \ cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_5 \ file://syslog.patch \ - file://usb-header-name-2-6-23.patch \ + file://usb-header-name-2-6-23.patch;striplevel=0 \ file://init" # The source will end up in the subdirectory 'ftpd-topfield' - no release name @@ -19,9 +19,12 @@ inherit update-rc.d INITSCRIPT_NAME = "ftpd-topfield" INITSCRIPT_PARAMS = "defaults" -# Just the one package at present +do_unpack2() { + cd ${WORKDIR} + mv libtopfield ${S}/ +} -inherit autotools +addtask unpack2 after do_unpack before do_patch do_compile() { oe_runmake From 93f4d69bdb0a2f7a8688a4b14a604ffd4572816a Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 16 Mar 2011 11:29:41 -0700 Subject: [PATCH 299/509] opie-sh 1.2.4: Rework opie-sh-fsmounter-name.patch Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/opie-sh/files/opie-sh-fsmounter-name.patch | 4 ++-- recipes/opie-sh/opie-sh_1.2.4.bb | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/recipes/opie-sh/files/opie-sh-fsmounter-name.patch b/recipes/opie-sh/files/opie-sh-fsmounter-name.patch index ccdea20f23..c5f1e10c42 100644 --- a/recipes/opie-sh/files/opie-sh-fsmounter-name.patch +++ b/recipes/opie-sh/files/opie-sh-fsmounter-name.patch @@ -1,5 +1,5 @@ ---- ../../apps/Opie-SH/filesystem_mounter.desktop 7 Mar 2004 12:33:12 -0000 1.8 -+++ ../../apps/Opie-SH/filesystem_mounter.desktop 21 Sep 2008 13:14:03 -0000 +--- apps/Opie-SH/filesystem_mounter.desktop 7 Mar 2004 12:33:12 -0000 1.8 ++++ apps/Opie-SH/filesystem_mounter.desktop 21 Sep 2008 13:14:03 -0000 @@ -2,7 +2,7 @@ Exec=filesystem_mounter.sh Icon=opie-sh-scripts/fsmounter diff --git a/recipes/opie-sh/opie-sh_1.2.4.bb b/recipes/opie-sh/opie-sh_1.2.4.bb index a07919e209..c34fb48ed1 100644 --- a/recipes/opie-sh/opie-sh_1.2.4.bb +++ b/recipes/opie-sh/opie-sh_1.2.4.bb @@ -1,6 +1,6 @@ require ${PN}.inc -PR = "r1" +PR = "r2" SRC_URI = "http://sources.openembedded.org/opie-1.2.4-split_noncore_tools_opie-sh.tar.bz2;name=split_noncore_tools_opie-sh \ http://sources.openembedded.org/opie-1.2.4-split_pics.tar.bz2;name=split_pics \ @@ -9,7 +9,7 @@ SRC_URI = "http://sources.openembedded.org/opie-1.2.4-split_noncore_tools_opie-s http://sources.openembedded.org/opie-1.2.4-split_apps.tar.bz2;name=split_apps \ http://sources.openembedded.org/opie-1.2.4-split_bin.tar.bz2;name=split_bin \ file://opie-sh-path.patch \ - file://opie-sh-fsmounter-name.patch" + file://opie-sh-fsmounter-name.patch;apply=false" SRC_URI[split_noncore_tools_opie-sh.md5sum] = "bc57f7ab07181c122ebc382e302bb594" SRC_URI[split_noncore_tools_opie-sh.sha256sum] = "a1305994918160449177b24efe384a0de87dc9dfcecf476e33b87cf8999b5bb1" SRC_URI[split_pics.md5sum] = "5499dc84b65395ab99bda6ed9d01ff0f" @@ -22,3 +22,7 @@ SRC_URI[split_apps.md5sum] = "67a43e8e4bcd9e63b884ea25deea5b34" SRC_URI[split_apps.sha256sum] = "a33a55efb4ae4c15a8c2c5d6faba6d671a5652da8e216ce35088896fe597215b" SRC_URI[split_bin.md5sum] = "d63089ebb9a87636e30fecefcc5b2cb8" SRC_URI[split_bin.sha256sum] = "8caf1981a2463029c1a27d965af8573d46b8e2ab818fb61b8e73ff40e43aab0c" + +do_configure_prepend() { + (cd .. ; patch -p0 -i ${WORKDIR}/opie-sh-fsmounter-name.patch) +} From 4d3ba721c5e9ed99486ac2397599b4a80f79aafc Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 16 Mar 2011 11:30:12 -0700 Subject: [PATCH 300/509] qscintilla 1.65-gpl-1.6: Rework no-external-lexers.patch Also drop do_stage and update do_install while in here. Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/qscintilla/files/no-external-lexers.patch | 5 ++--- recipes/qscintilla/qscintilla_1.65-gpl-1.6.bb | 12 ++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/recipes/qscintilla/files/no-external-lexers.patch b/recipes/qscintilla/files/no-external-lexers.patch index 5953043190..0214a5365b 100644 --- a/recipes/qscintilla/files/no-external-lexers.patch +++ b/recipes/qscintilla/files/no-external-lexers.patch @@ -1,10 +1,9 @@ - # # Patch managed by http://www.holgerschurig.de/patcher.html # ---- ../src/ExternalLexer.cpp~no-external-lexers -+++ ../src/ExternalLexer.cpp +--- src/ExternalLexer.cpp~no-external-lexers ++++ src/ExternalLexer.cpp @@ -110,7 +110,7 @@ // Initialise some members... first = NULL; diff --git a/recipes/qscintilla/qscintilla_1.65-gpl-1.6.bb b/recipes/qscintilla/qscintilla_1.65-gpl-1.6.bb index cfed35c561..a88bf372b2 100644 --- a/recipes/qscintilla/qscintilla_1.65-gpl-1.6.bb +++ b/recipes/qscintilla/qscintilla_1.65-gpl-1.6.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Qt/Embedded bindings for the Scintilla source code editor component" SECTION = "opie/libs" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "http://www.mneuroth.de/privat/zaurus/qscintilla-${PV}_zaurus.tar.gz \ - file://no-external-lexers.patch;striplevel=0" + file://no-external-lexers.patch;apply=false" S = "${WORKDIR}/qscintilla-${PV}/qt" @@ -22,14 +22,14 @@ EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${S}/patches \ PARALLEL_MAKE = "" -do_stage() { - install -m 0644 qextscintilla*.h ${STAGING_INCDIR}/ - oe_libinstall -so libqscintilla ${STAGING_LIBDIR} +do_configure_prepend() { + (cd .. ; patch -p0 -i ${WORKDIR}/no-external-lexers.patch) } do_install() { - install -d ${D}${libdir} + install -d ${D}${libdir} ${D}${includedir} oe_libinstall -so libqscintilla ${D}${libdir} + install -m 0644 qextscintilla*.h ${D}${includedir}/ } FILES_${PN} = "${libdir}" From c937a5ceddf7a7bb1fb18299275b7760981be613 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 16 Mar 2011 11:32:41 -0700 Subject: [PATCH 301/509] poboxserver: Rework unicode.patch Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/poboxserver/poboxserver/unicode.patch | 6 +++--- recipes/poboxserver/poboxserver_1.2.5.bb | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/recipes/poboxserver/poboxserver/unicode.patch b/recipes/poboxserver/poboxserver/unicode.patch index 884070a3c8..df6b08f2eb 100644 --- a/recipes/poboxserver/poboxserver/unicode.patch +++ b/recipes/poboxserver/poboxserver/unicode.patch @@ -1,7 +1,7 @@ -diff --git a/../pbserver/Makefile b/../pbserver/Makefile +diff --git pbserver/Makefile pbserver/Makefile index 27847c1..d6ffff3 100755 ---- a/../pbserver/Makefile -+++ b/../pbserver/Makefile +--- pbserver/Makefile ++++ pbserver/Makefile @@ -15,7 +15,7 @@ configure: dic: staticdic learndic diff --git a/recipes/poboxserver/poboxserver_1.2.5.bb b/recipes/poboxserver/poboxserver_1.2.5.bb index ab732e4544..4ff581d95a 100644 --- a/recipes/poboxserver/poboxserver_1.2.5.bb +++ b/recipes/poboxserver/poboxserver_1.2.5.bb @@ -2,13 +2,13 @@ DESCRIPTION = "OpenPOBox is an open source implementation of a 'Predictive Opera SECTION = "inputmethods" LICENSE = "GPL" DEPENDS = "perl-native ruby-native nkf-native" -PR = "r7" +PR = "r8" SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/pobox-${PV}.tar.bz2;name=archive \ http://www.vanille.de/mirror/pbserver-${PV}.tar.gz;name=pbserver \ file://OpenPOBox-1.25.diff \ file://remove-local-includes.patch \ - file://unicode.patch \ + file://unicode.patch;apply=false \ file://pbserver.sh" S = "${WORKDIR}/OpenPOBox" @@ -21,6 +21,10 @@ INITSCRIPT_PARAMS = "start 99 5 . stop 01 0 ." EXTRA_OECONF = "--enable-lookup" PARALLEL_MAKE = "" +do_configure_prepend() { + (cd ${WORKDIR} ; patch -p0 -i unicode.patch) +} + do_compile() { oe_runmake cp ${S}/dict/data/fugodic ${WORKDIR}/pbserver/fugodic.txt From edf0aaf7f9c6c7edf01c7966f538637224997c9f Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 16 Mar 2011 11:53:21 -0700 Subject: [PATCH 302/509] xqt2: Rework the patches for xqt2 (vs the core part). The way this package builds, xqt2 isn't the main place for ${S}. So we add in another task to apply the patches in that directory (as there's 4 of them). Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/xqt2/files/KeyMap.patch | 4 ++-- recipes/xqt2/files/fix_qtscreen_HACK.patch | 6 ++--- .../xqt2/files/fix_seqfault_qtscreen.patch | 4 ++-- recipes/xqt2/files/moc_call.patch | 4 ++-- recipes/xqt2/xqt2_20060509.bb | 22 ++++++++++++++----- 5 files changed, 26 insertions(+), 14 deletions(-) diff --git a/recipes/xqt2/files/KeyMap.patch b/recipes/xqt2/files/KeyMap.patch index 62564cf248..2b00dcad18 100644 --- a/recipes/xqt2/files/KeyMap.patch +++ b/recipes/xqt2/files/KeyMap.patch @@ -1,5 +1,5 @@ ---- xc/../xqt2/xfree86/xqt-driver/KeyMap.h 2004-10-16 08:06:07.000000000 +0200 -+++ xc/../xqt2/xfree86/xqt-driver/KeyMap~.h 2006-05-10 19:41:16.000000000 +0200 +--- xqt2/xfree86/xqt-driver/KeyMap.h 2004-10-16 08:06:07.000000000 +0200 ++++ xqt2/xfree86/xqt-driver/KeyMap~.h 2006-05-10 19:41:16.000000000 +0200 @@ -75,6 +75,7 @@ /* [ */ K(BracketLeft, XK_bracketleft, XK_braceleft) // Fn+T /* { */ K(BraceLeft, XK_braceleft, NoSymbol) // ??? diff --git a/recipes/xqt2/files/fix_qtscreen_HACK.patch b/recipes/xqt2/files/fix_qtscreen_HACK.patch index 7e4b2c658a..be7a26ec67 100644 --- a/recipes/xqt2/files/fix_qtscreen_HACK.patch +++ b/recipes/xqt2/files/fix_qtscreen_HACK.patch @@ -1,6 +1,6 @@ -diff -Nur xc/../xqt2.vanilla/xfree86/xqt-driver/qtscreen.cc xc/../xqt2/xfree86/xqt-driver/qtscreen.cc ---- xc/../xqt2.vanilla/xfree86/xqt-driver/qtscreen.cc 2008-09-25 14:18:44.000000000 +0200 -+++ xc/../xqt2/xfree86/xqt-driver/qtscreen.cc 2008-09-25 14:28:30.000000000 +0200 +diff -Nur xqt2.vanilla/xfree86/xqt-driver/qtscreen.cc xqt2/xfree86/xqt-driver/qtscreen.cc +--- xqt2.vanilla/xfree86/xqt-driver/qtscreen.cc 2008-09-25 14:18:44.000000000 +0200 ++++ xqt2/xfree86/xqt-driver/qtscreen.cc 2008-09-25 14:28:30.000000000 +0200 @@ -109,6 +109,7 @@ desktopSize = newSize; fullScrSize = desktopSize; diff --git a/recipes/xqt2/files/fix_seqfault_qtscreen.patch b/recipes/xqt2/files/fix_seqfault_qtscreen.patch index 43b97f4bdb..72c1e6edf8 100644 --- a/recipes/xqt2/files/fix_seqfault_qtscreen.patch +++ b/recipes/xqt2/files/fix_seqfault_qtscreen.patch @@ -1,5 +1,5 @@ ---- xc/../xqt2.vanilla/xfree86/xqt-driver/qtscreen.cc 2009-02-08 15:47:33.000000000 +0100 -+++ xc/../xqt2/xfree86/xqt-driver/qtscreen.cc 2009-02-08 15:52:09.000000000 +0100 +--- xqt2.vanilla/xfree86/xqt-driver/qtscreen.cc 2009-02-08 15:47:33.000000000 +0100 ++++ xqt2/xfree86/xqt-driver/qtscreen.cc 2009-02-08 15:52:09.000000000 +0100 @@ -406,7 +406,9 @@ // void qtScreen::keyPressEvent(QKeyEvent *ev) diff --git a/recipes/xqt2/files/moc_call.patch b/recipes/xqt2/files/moc_call.patch index 6e150e201a..b86df1dcad 100644 --- a/recipes/xqt2/files/moc_call.patch +++ b/recipes/xqt2/files/moc_call.patch @@ -1,5 +1,5 @@ ---- xc/../xqt2/xfree86/xqt-driver/Imakefile 2006-05-09 11:59:07.000000000 +0200 -+++ xc/../xqt2/xfree86/xqt-driver/Imakefile 2004-09-16 12:40:30.000000000 +0200 +--- xqt2/xfree86/xqt-driver/Imakefile 2006-05-09 11:59:07.000000000 +0200 ++++ xqt2/xfree86/xqt-driver/Imakefile 2004-09-16 12:40:30.000000000 +0200 @@ -12,7 +12,7 @@ QTDIR = QtDir diff --git a/recipes/xqt2/xqt2_20060509.bb b/recipes/xqt2/xqt2_20060509.bb index 034d756d28..627c9179a8 100644 --- a/recipes/xqt2/xqt2_20060509.bb +++ b/recipes/xqt2/xqt2_20060509.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" SECTION = "opie/applications" APPTYPE = "binary" APPNAME = "Xqt" -PR = "r4" +PR = "r5" inherit palmtop @@ -15,21 +15,33 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/xqt;module=xqt2;method=pse ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-3.tgz;name=archive3 \ ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-4.tgz;name=archive4 \ ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-5.tgz;name=archive5 \ - file://KeyMap.patch \ - file://moc_call.patch \ file://imake-staging.patch \ file://cross.patch \ file://fephack.patch \ file://xchar2b.patch \ file://xqt-make.patch \ - file://fix_qtscreen_HACK.patch \ - file://fix_seqfault_qtscreen.patch " + file://KeyMap.patch;apply=false \ + file://moc_call.patch;apply=false \ + file://fix_qtscreen_HACK.patch;apply=false \ + file://fix_seqfault_qtscreen.patch;apply=false" S = "${WORKDIR}/xc" QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' QT_LIBRARY_append_c7x0 = " -laticore" +do_patch_xqt2() { + # Apply xqt2 patches. + cd ${WORKDIR}/xqt2 + patch -p1 -i ${WORKDIR}/KeyMap.patch + patch -p1 -i ${WORKDIR}/moc_call.patch + patch -p1 -i ${WORKDIR}/fix_qtscreen_HACK.patch + patch -p1 -i ${WORKDIR}/fix_seqfault_qtscreen.patch +} + +addtask patch_xqt2 after do_unpack before do_configure + do_configure() { + #general config echo "#define BuildServersOnly YES" > config/cf/host.def echo "#define ProjectRoot /usr" >> config/cf/host.def From 594c21b6a37fe3a5427ff2601373ec6078a4956a Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 16 Mar 2011 12:03:53 -0700 Subject: [PATCH 303/509] In a large number of patches, remove unneeded '..' in paths. In most cases we had both ../foopkg/foopkg as the first path and this simply became foopkg (the second path was already correct for the default strip level which is why the patch applies normally). In a few cases the second path was '.' which is valid but not as clear as 'b' (which is what git shows for example) so update that while we're at it. Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- .../correct-theme-name.patch | 4 +- .../extra-device-check.patch | 4 +- .../dillo/dillo2-0.6.6/fix_about_syntax.patch | 4 +- .../gcc-4.2.1/arm-crunch-eabi-ieee754.patch | 4 +- .../gcc-4.2.1/arm-crunch-predicates3.patch | 8 +- .../gcc-4.2.2/arm-crunch-eabi-ieee754.patch | 4 +- .../gcc-4.2.2/arm-crunch-predicates3.patch | 8 +- .../gcc-4.2.3/arm-crunch-eabi-ieee754.patch | 4 +- .../gcc-4.2.3/arm-crunch-predicates3.patch | 8 +- ...ieee754-endian-littleword-littlebyte.patch | 2 +- ...ieee754-endian-littleword-littlebyte.patch | 2 +- .../glibc/glibc-2.10.1/powerpc-sqrt-hack.diff | 8 +- .../glibc/glibc-2.5/powerpc-sqrt-hack.diff | 8 +- .../glibc/glibc-2.6.1/powerpc-sqrt-hack.diff | 8 +- .../glibc/glibc-2.9/powerpc-sqrt-hack.diff | 8 +- recipes/gpe-aerial/files/fix_makefile.patch | 4 +- recipes/gpe-appmgr/files/no-render-h.patch | 16 +- .../gpe-calculator-0.2/fix_makefile.patch | 4 +- .../gpe-clock-0.14/default-time-24hrs.patch | 4 +- .../gpe-clock-0.20/default-time-24hrs.patch | 4 +- recipes/gpe-go/gpe-go-0.05/fix-make.patch | 16 +- .../gpe-lights-0.12/fix-makefiles.patch | 12 +- .../gpe-lights-0.13/fix-makefiles.patch | 12 +- .../gpe-nmf/gpe-nmf-0.17/fix_makefiles.patch | 8 +- .../gpe-othello-0.2-1/fix-makefiles.patch | 12 +- .../gpe-tetris-0.6-2/fix-makefiles.patch | 12 +- .../gpe-todo-0.51/remove-render.patch | 2 +- .../gpe-watch-0.10/fix_makefile.patch | 4 +- .../gpe-watch-0.10/no-render-h.patch | 4 +- .../gsoko-0.4.2-gpe5/fix_makefiles.patch | 4 +- .../gsoko-0.4.2-gpe6/fix_makefiles.patch | 4 +- recipes/gtk+/gtk+-2.10.14/no-xwc.patch | 12 +- .../gtk+/gtk+-2.10.14/small-gtkfilesel.patch | 4 +- recipes/gtk+/gtk+-2.6.10/no-xwc.patch | 12 +- recipes/gtk+/gtk+-2.6.10/single-click.patch | 8 +- .../gtk+/gtk+-2.6.10/small-gtkfilesel.patch | 4 +- recipes/gweled/gweled-0.5/de-gnome.patch | 40 ++--- .../gxine/files/disable-browser-plugin.patch | 8 +- recipes/ipatience/files/fix-make.patch | 32 ++-- recipes/kf/files/fix-configure.patch | 4 +- .../poodle-bootparams.patch | 2 +- recipes/linux/linux-wrt-2.4.30/001-Makefile | 2 +- .../005-arch_mips_config-shared_in | 2 +- .../linux-wrt-2.4.30/022-drivers_net_Makefile | 2 +- .../023-drivers_parport_Makefile | 2 +- .../024-drivers_parport_Config_in | 2 +- .../linux-wrt-2.4.30/310-netfilter-maxconn | 2 +- .../sarge-at91/2.6.21-sarge-kernel.patch | 24 +-- .../linux/sarge-at91/2.6.21-sarge-mmc.patch | 18 +- .../linux/sarge-at91/2.6.21-sarge-phy.patch | 30 ++-- .../enable-file-manager.patch | 4 +- .../make-batteryapp-less-strict.patch | 4 +- .../make-batteryapp-less-strict.patch | 4 +- .../mbmerlin-0.8.1-2/fix_makefile.patch | 4 +- .../minipredict/minipredict/fix-include.patch | 2 +- .../minipredict/fix-makefile.patch | 8 +- .../files/nvidia-oe-conftest.patch | 4 +- recipes/rxvt-unicode/files/makefile.patch | 2 +- recipes/rxvt-unicode/files/signedchar.patch | 2 +- .../rxvt-unicode/rxvt-unicode-5.3/xwc.patch | 4 +- .../rxvt-unicode/rxvt-unicode-5.4/xwc.patch | 4 +- .../rxvt-unicode/rxvt-unicode-5.6/xwc.patch | 4 +- recipes/twin/twin-0.4.6/cross_compile.patch | 20 +-- recipes/u-boot/u-boot-1.1.6/sarge-uboot.patch | 162 +++++++++--------- recipes/udf/udftools/patch-04-wrudf-gcc4.diff | 7 +- 65 files changed, 325 insertions(+), 326 deletions(-) diff --git a/recipes/detect-stylus/detect-stylus-0.13/correct-theme-name.patch b/recipes/detect-stylus/detect-stylus-0.13/correct-theme-name.patch index 7c8213da1f..6d8a918e2c 100644 --- a/recipes/detect-stylus/detect-stylus-0.13/correct-theme-name.patch +++ b/recipes/detect-stylus/detect-stylus-0.13/correct-theme-name.patch @@ -1,5 +1,5 @@ -diff -urNd ../detect-stylus-0.13-r1/detect-stylus-0.13/detect-stylus.c detect-stylus-0.13/detect-stylus.c ---- ../detect-stylus-0.13-r1/detect-stylus-0.13/detect-stylus.c 2004-09-08 16:56:58.000000000 +0100 +diff -urNd detect-stylus-0.13/detect-stylus.c detect-stylus-0.13/detect-stylus.c +--- detect-stylus-0.13/detect-stylus.c 2004-09-08 16:56:58.000000000 +0100 +++ detect-stylus-0.13/detect-stylus.c 2004-09-13 21:36:03.000000000 +0100 @@ -132,9 +132,9 @@ diff --git a/recipes/detect-stylus/detect-stylus-0.13/extra-device-check.patch b/recipes/detect-stylus/detect-stylus-0.13/extra-device-check.patch index 94542b11aa..06c0a1a5ee 100644 --- a/recipes/detect-stylus/detect-stylus-0.13/extra-device-check.patch +++ b/recipes/detect-stylus/detect-stylus-0.13/extra-device-check.patch @@ -1,5 +1,5 @@ -diff -urNd ../detect-stylus-0.13-r1/detect-stylus-0.13/detect-stylus.c detect-stylus-0.13/detect-stylus.c ---- ../detect-stylus-0.13-r1/detect-stylus-0.13/detect-stylus.c 2004-09-08 16:56:58.000000000 +0100 +diff -urNd detect-stylus-0.13/detect-stylus.c detect-stylus-0.13/detect-stylus.c +--- detect-stylus-0.13/detect-stylus.c 2004-09-08 16:56:58.000000000 +0100 +++ detect-stylus-0.13/detect-stylus.c 2004-09-18 23:43:12.000000000 +0100 @@ -62,6 +62,9 @@ if (fd < 0) diff --git a/recipes/dillo/dillo2-0.6.6/fix_about_syntax.patch b/recipes/dillo/dillo2-0.6.6/fix_about_syntax.patch index 06b4d09614..adabc4afdf 100644 --- a/recipes/dillo/dillo2-0.6.6/fix_about_syntax.patch +++ b/recipes/dillo/dillo2-0.6.6/fix_about_syntax.patch @@ -1,5 +1,5 @@ -diff -urNd ../dillo2-0.6.6-r0/dillo2-0.6.6/src/IO/about.c dillo2-0.6.6/src/IO/about.c ---- ../dillo2-0.6.6-r0/dillo2-0.6.6/src/IO/about.c 2003-04-21 19:36:31.000000000 +0100 +diff -urNd dillo2-0.6.6/src/IO/about.c dillo2-0.6.6/src/IO/about.c +--- dillo2-0.6.6/src/IO/about.c 2003-04-21 19:36:31.000000000 +0100 +++ dillo2-0.6.6/src/IO/about.c 2004-09-11 10:58:48.000000000 +0100 @@ -28,88 +28,88 @@ * HTML text for startup screen diff --git a/recipes/gcc/gcc-4.2.1/arm-crunch-eabi-ieee754.patch b/recipes/gcc/gcc-4.2.1/arm-crunch-eabi-ieee754.patch index e4929fa20e..07469e4725 100644 --- a/recipes/gcc/gcc-4.2.1/arm-crunch-eabi-ieee754.patch +++ b/recipes/gcc/gcc-4.2.1/arm-crunch-eabi-ieee754.patch @@ -1,4 +1,4 @@ ---- ../gcc-cross-4.1.2-r4-unpatched/gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000 +--- gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000 +++ gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:15:49.000000000 +1000 @@ -42,8 +42,9 @@ @@ -54,7 +54,7 @@ RETLDM #endif ---- ../gcc-cross-4.1.2-r4-unpatched/gcc-4.1.2/gcc/config/arm/ieee754-sf.S 2007-06-07 13:06:52.000000000 +1000 +--- gcc-4.1.2/gcc/config/arm/ieee754-sf.S 2007-06-07 13:06:52.000000000 +1000 +++ gcc-4.1.2/gcc/config/arm/ieee754-sf.S 2007-06-07 13:21:43.000000000 +1000 @@ -302,8 +302,13 @@ diff --git a/recipes/gcc/gcc-4.2.1/arm-crunch-predicates3.patch b/recipes/gcc/gcc-4.2.1/arm-crunch-predicates3.patch index 99e1e6c88c..c01fbd577a 100644 --- a/recipes/gcc/gcc-4.2.1/arm-crunch-predicates3.patch +++ b/recipes/gcc/gcc-4.2.1/arm-crunch-predicates3.patch @@ -1,5 +1,5 @@ -diff -urN ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/arm.md gcc-4.1.2/gcc/config/arm/arm.md ---- ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/arm.md 2007-06-14 11:50:53.000000000 +1000 +diff -urN gcc-4.1.2/gcc/config/arm/arm.md gcc-4.1.2/gcc/config/arm/arm.md +--- gcc-4.1.2/gcc/config/arm/arm.md 2007-06-14 11:50:53.000000000 +1000 +++ gcc-4.1.2/gcc/config/arm/arm.md 2007-06-14 11:43:17.000000000 +1000 @@ -7488,6 +7488,22 @@ arm_compare_op1);" @@ -99,8 +99,8 @@ diff -urN ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/arm.md gcc-4.1.2/gcc/co "" ) -diff -urN ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/predicates.md gcc-4.1.2/gcc/config/arm/predicates.md ---- ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/predicates.md 2005-09-11 17:38:02.000000000 +1000 +diff -urN gcc-4.1.2/gcc/config/arm/predicates.md gcc-4.1.2/gcc/config/arm/predicates.md +--- gcc-4.1.2/gcc/config/arm/predicates.md 2005-09-11 17:38:02.000000000 +1000 +++ gcc-4.1.2/gcc/config/arm/predicates.md 2007-06-14 11:46:13.000000000 +1000 @@ -172,7 +172,11 @@ diff --git a/recipes/gcc/gcc-4.2.2/arm-crunch-eabi-ieee754.patch b/recipes/gcc/gcc-4.2.2/arm-crunch-eabi-ieee754.patch index e4929fa20e..07469e4725 100644 --- a/recipes/gcc/gcc-4.2.2/arm-crunch-eabi-ieee754.patch +++ b/recipes/gcc/gcc-4.2.2/arm-crunch-eabi-ieee754.patch @@ -1,4 +1,4 @@ ---- ../gcc-cross-4.1.2-r4-unpatched/gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000 +--- gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000 +++ gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:15:49.000000000 +1000 @@ -42,8 +42,9 @@ @@ -54,7 +54,7 @@ RETLDM #endif ---- ../gcc-cross-4.1.2-r4-unpatched/gcc-4.1.2/gcc/config/arm/ieee754-sf.S 2007-06-07 13:06:52.000000000 +1000 +--- gcc-4.1.2/gcc/config/arm/ieee754-sf.S 2007-06-07 13:06:52.000000000 +1000 +++ gcc-4.1.2/gcc/config/arm/ieee754-sf.S 2007-06-07 13:21:43.000000000 +1000 @@ -302,8 +302,13 @@ diff --git a/recipes/gcc/gcc-4.2.2/arm-crunch-predicates3.patch b/recipes/gcc/gcc-4.2.2/arm-crunch-predicates3.patch index 99e1e6c88c..c01fbd577a 100644 --- a/recipes/gcc/gcc-4.2.2/arm-crunch-predicates3.patch +++ b/recipes/gcc/gcc-4.2.2/arm-crunch-predicates3.patch @@ -1,5 +1,5 @@ -diff -urN ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/arm.md gcc-4.1.2/gcc/config/arm/arm.md ---- ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/arm.md 2007-06-14 11:50:53.000000000 +1000 +diff -urN gcc-4.1.2/gcc/config/arm/arm.md gcc-4.1.2/gcc/config/arm/arm.md +--- gcc-4.1.2/gcc/config/arm/arm.md 2007-06-14 11:50:53.000000000 +1000 +++ gcc-4.1.2/gcc/config/arm/arm.md 2007-06-14 11:43:17.000000000 +1000 @@ -7488,6 +7488,22 @@ arm_compare_op1);" @@ -99,8 +99,8 @@ diff -urN ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/arm.md gcc-4.1.2/gcc/co "" ) -diff -urN ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/predicates.md gcc-4.1.2/gcc/config/arm/predicates.md ---- ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/predicates.md 2005-09-11 17:38:02.000000000 +1000 +diff -urN gcc-4.1.2/gcc/config/arm/predicates.md gcc-4.1.2/gcc/config/arm/predicates.md +--- gcc-4.1.2/gcc/config/arm/predicates.md 2005-09-11 17:38:02.000000000 +1000 +++ gcc-4.1.2/gcc/config/arm/predicates.md 2007-06-14 11:46:13.000000000 +1000 @@ -172,7 +172,11 @@ diff --git a/recipes/gcc/gcc-4.2.3/arm-crunch-eabi-ieee754.patch b/recipes/gcc/gcc-4.2.3/arm-crunch-eabi-ieee754.patch index e4929fa20e..07469e4725 100644 --- a/recipes/gcc/gcc-4.2.3/arm-crunch-eabi-ieee754.patch +++ b/recipes/gcc/gcc-4.2.3/arm-crunch-eabi-ieee754.patch @@ -1,4 +1,4 @@ ---- ../gcc-cross-4.1.2-r4-unpatched/gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000 +--- gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000 +++ gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:15:49.000000000 +1000 @@ -42,8 +42,9 @@ @@ -54,7 +54,7 @@ RETLDM #endif ---- ../gcc-cross-4.1.2-r4-unpatched/gcc-4.1.2/gcc/config/arm/ieee754-sf.S 2007-06-07 13:06:52.000000000 +1000 +--- gcc-4.1.2/gcc/config/arm/ieee754-sf.S 2007-06-07 13:06:52.000000000 +1000 +++ gcc-4.1.2/gcc/config/arm/ieee754-sf.S 2007-06-07 13:21:43.000000000 +1000 @@ -302,8 +302,13 @@ diff --git a/recipes/gcc/gcc-4.2.3/arm-crunch-predicates3.patch b/recipes/gcc/gcc-4.2.3/arm-crunch-predicates3.patch index 99e1e6c88c..c01fbd577a 100644 --- a/recipes/gcc/gcc-4.2.3/arm-crunch-predicates3.patch +++ b/recipes/gcc/gcc-4.2.3/arm-crunch-predicates3.patch @@ -1,5 +1,5 @@ -diff -urN ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/arm.md gcc-4.1.2/gcc/config/arm/arm.md ---- ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/arm.md 2007-06-14 11:50:53.000000000 +1000 +diff -urN gcc-4.1.2/gcc/config/arm/arm.md gcc-4.1.2/gcc/config/arm/arm.md +--- gcc-4.1.2/gcc/config/arm/arm.md 2007-06-14 11:50:53.000000000 +1000 +++ gcc-4.1.2/gcc/config/arm/arm.md 2007-06-14 11:43:17.000000000 +1000 @@ -7488,6 +7488,22 @@ arm_compare_op1);" @@ -99,8 +99,8 @@ diff -urN ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/arm.md gcc-4.1.2/gcc/co "" ) -diff -urN ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/predicates.md gcc-4.1.2/gcc/config/arm/predicates.md ---- ../gcc-cross-4.1.2-r4/gcc-4.1.2/gcc/config/arm/predicates.md 2005-09-11 17:38:02.000000000 +1000 +diff -urN gcc-4.1.2/gcc/config/arm/predicates.md gcc-4.1.2/gcc/config/arm/predicates.md +--- gcc-4.1.2/gcc/config/arm/predicates.md 2005-09-11 17:38:02.000000000 +1000 +++ gcc-4.1.2/gcc/config/arm/predicates.md 2007-06-14 11:46:13.000000000 +1000 @@ -172,7 +172,11 @@ diff --git a/recipes/gcc/gcc-4.3.3/ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch b/recipes/gcc/gcc-4.3.3/ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch index f16336d05d..7dee2f4176 100644 --- a/recipes/gcc/gcc-4.3.3/ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch +++ b/recipes/gcc/gcc-4.3.3/ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch @@ -1,6 +1,6 @@ Define Maverick floating point word order in libgcc's assemble support routines ---- ../gcc-cross-4.1.2-r4-unpatched/gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000 +--- gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000 +++ gcc-4.1.2/gcc/config/arm/ieee754-df.S 2008-04-07 13:15:49.000000000 +1000 @@ -42,8 +42,9 @@ diff --git a/recipes/gcc/gcc-4.3.4/ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch b/recipes/gcc/gcc-4.3.4/ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch index f16336d05d..7dee2f4176 100644 --- a/recipes/gcc/gcc-4.3.4/ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch +++ b/recipes/gcc/gcc-4.3.4/ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch @@ -1,6 +1,6 @@ Define Maverick floating point word order in libgcc's assemble support routines ---- ../gcc-cross-4.1.2-r4-unpatched/gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000 +--- gcc-4.1.2/gcc/config/arm/ieee754-df.S 2007-06-07 13:06:52.000000000 +1000 +++ gcc-4.1.2/gcc/config/arm/ieee754-df.S 2008-04-07 13:15:49.000000000 +1000 @@ -42,8 +42,9 @@ diff --git a/recipes/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff b/recipes/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff index 1046efb2a1..b7e8948a62 100644 --- a/recipes/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff +++ b/recipes/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff @@ -1,5 +1,5 @@ -diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c ---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200 +diff -Nurd glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c +--- glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200 +++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-12-08 12:53:32.202227000 +0100 @@ -25,6 +25,9 @@ #include @@ -11,8 +11,8 @@ diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc- static const double almost_half = 0.5000000000000001; /* 0.5 + 2^-53 */ static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 }; static const ieee_float_shape_type a_inf = {.word = 0x7f800000 }; -diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c ---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200 +diff -Nurd glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c +--- glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200 +++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-12-08 12:53:36.992227000 +0100 @@ -25,6 +25,8 @@ #include diff --git a/recipes/glibc/glibc-2.5/powerpc-sqrt-hack.diff b/recipes/glibc/glibc-2.5/powerpc-sqrt-hack.diff index 1046efb2a1..b7e8948a62 100644 --- a/recipes/glibc/glibc-2.5/powerpc-sqrt-hack.diff +++ b/recipes/glibc/glibc-2.5/powerpc-sqrt-hack.diff @@ -1,5 +1,5 @@ -diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c ---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200 +diff -Nurd glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c +--- glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200 +++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-12-08 12:53:32.202227000 +0100 @@ -25,6 +25,9 @@ #include @@ -11,8 +11,8 @@ diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc- static const double almost_half = 0.5000000000000001; /* 0.5 + 2^-53 */ static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 }; static const ieee_float_shape_type a_inf = {.word = 0x7f800000 }; -diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c ---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200 +diff -Nurd glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c +--- glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200 +++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-12-08 12:53:36.992227000 +0100 @@ -25,6 +25,8 @@ #include diff --git a/recipes/glibc/glibc-2.6.1/powerpc-sqrt-hack.diff b/recipes/glibc/glibc-2.6.1/powerpc-sqrt-hack.diff index 1046efb2a1..b7e8948a62 100644 --- a/recipes/glibc/glibc-2.6.1/powerpc-sqrt-hack.diff +++ b/recipes/glibc/glibc-2.6.1/powerpc-sqrt-hack.diff @@ -1,5 +1,5 @@ -diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c ---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200 +diff -Nurd glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c +--- glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200 +++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-12-08 12:53:32.202227000 +0100 @@ -25,6 +25,9 @@ #include @@ -11,8 +11,8 @@ diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc- static const double almost_half = 0.5000000000000001; /* 0.5 + 2^-53 */ static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 }; static const ieee_float_shape_type a_inf = {.word = 0x7f800000 }; -diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c ---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200 +diff -Nurd glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c +--- glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200 +++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-12-08 12:53:36.992227000 +0100 @@ -25,6 +25,8 @@ #include diff --git a/recipes/glibc/glibc-2.9/powerpc-sqrt-hack.diff b/recipes/glibc/glibc-2.9/powerpc-sqrt-hack.diff index 1046efb2a1..b7e8948a62 100644 --- a/recipes/glibc/glibc-2.9/powerpc-sqrt-hack.diff +++ b/recipes/glibc/glibc-2.9/powerpc-sqrt-hack.diff @@ -1,5 +1,5 @@ -diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c ---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200 +diff -Nurd glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c +--- glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200 +++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-12-08 12:53:32.202227000 +0100 @@ -25,6 +25,9 @@ #include @@ -11,8 +11,8 @@ diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc- static const double almost_half = 0.5000000000000001; /* 0.5 + 2^-53 */ static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 }; static const ieee_float_shape_type a_inf = {.word = 0x7f800000 }; -diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c ---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200 +diff -Nurd glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c +--- glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200 +++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-12-08 12:53:36.992227000 +0100 @@ -25,6 +25,8 @@ #include diff --git a/recipes/gpe-aerial/files/fix_makefile.patch b/recipes/gpe-aerial/files/fix_makefile.patch index bbb08407e1..0224163257 100644 --- a/recipes/gpe-aerial/files/fix_makefile.patch +++ b/recipes/gpe-aerial/files/fix_makefile.patch @@ -1,5 +1,5 @@ -diff -urNd ../gpe-aerial-0.2.11-r0/gpe-aerial-0.2.11/Makefile gpe-aerial-0.2.11/Makefile ---- ../gpe-aerial-0.2.11-r0/gpe-aerial-0.2.11/Makefile 2004-08-03 15:36:47.000000000 +0100 +diff -urNd gpe-aerial-0.2.11/Makefile gpe-aerial-0.2.11/Makefile +--- gpe-aerial-0.2.11/Makefile 2004-08-03 15:36:47.000000000 +0100 +++ gpe-aerial-0.2.11/Makefile 2004-08-03 15:49:42.000000000 +0100 @@ -3,7 +3,6 @@ CVSBUILD = no diff --git a/recipes/gpe-appmgr/files/no-render-h.patch b/recipes/gpe-appmgr/files/no-render-h.patch index 7bd08bb8c0..169d057437 100644 --- a/recipes/gpe-appmgr/files/no-render-h.patch +++ b/recipes/gpe-appmgr/files/no-render-h.patch @@ -1,5 +1,5 @@ -diff -urNd ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/main.c gpe-appmgr-2.8/main.c ---- ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/main.c 2005-03-04 07:00:40 +00:00 +diff -urNd gpe-appmgr-2.8/main.c gpe-appmgr-2.8/main.c +--- gpe-appmgr-2.8/main.c 2005-03-04 07:00:40 +00:00 +++ gpe-appmgr-2.8/main.c 2005-04-28 12:21:53 +01:00 @@ -50,7 +50,6 @@ /* GPE */ @@ -9,8 +9,8 @@ diff -urNd ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/main.c gpe-appmgr-2.8/main.c #include #include #include -diff -urNd ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/row_view.c gpe-appmgr-2.8/row_view.c ---- ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/row_view.c 2005-01-05 21:14:47 +00:00 +diff -urNd gpe-appmgr-2.8/row_view.c gpe-appmgr-2.8/row_view.c +--- gpe-appmgr-2.8/row_view.c 2005-01-05 21:14:47 +00:00 +++ gpe-appmgr-2.8/row_view.c 2005-04-28 12:22:07 +01:00 @@ -43,7 +43,6 @@ /* GPE */ @@ -20,8 +20,8 @@ diff -urNd ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/row_view.c gpe-appmgr-2.8/row_vie #include #include #include -diff -urNd ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/single_view.c gpe-appmgr-2.8/single_view.c ---- ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/single_view.c 2004-11-19 00:22:09 +00:00 +diff -urNd gpe-appmgr-2.8/single_view.c gpe-appmgr-2.8/single_view.c +--- gpe-appmgr-2.8/single_view.c 2004-11-19 00:22:09 +00:00 +++ gpe-appmgr-2.8/single_view.c 2005-04-28 12:22:15 +01:00 @@ -39,7 +39,6 @@ /* GPE */ @@ -31,8 +31,8 @@ diff -urNd ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/single_view.c gpe-appmgr-2.8/sing #include #include #include -diff -urNd ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/tab_view.c gpe-appmgr-2.8/tab_view.c ---- ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/tab_view.c 2005-03-04 07:14:43 +00:00 +diff -urNd gpe-appmgr-2.8/tab_view.c gpe-appmgr-2.8/tab_view.c +--- gpe-appmgr-2.8/tab_view.c 2005-03-04 07:14:43 +00:00 +++ gpe-appmgr-2.8/tab_view.c 2005-04-28 12:22:22 +01:00 @@ -46,7 +46,6 @@ /* GPE */ diff --git a/recipes/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch b/recipes/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch index 8b4ebf7141..59a86365a6 100644 --- a/recipes/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch +++ b/recipes/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch @@ -1,5 +1,5 @@ -diff -urNd ../gpe-calculator-0.2-r0/gpe-calculator-0.2/Makefile gpe-calculator-0.2/Makefile ---- ../gpe-calculator-0.2-r0/gpe-calculator-0.2/Makefile 2004-08-03 04:24:09.000000000 +0100 +diff -urNd gpe-calculator-0.2/Makefile gpe-calculator-0.2/Makefile +--- gpe-calculator-0.2/Makefile 2004-08-03 04:24:09.000000000 +0100 +++ gpe-calculator-0.2/Makefile 2004-08-03 13:12:48.000000000 +0100 @@ -9,17 +9,17 @@ GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -DGTK_ENABLE_BROKEN diff --git a/recipes/gpe-clock/gpe-clock-0.14/default-time-24hrs.patch b/recipes/gpe-clock/gpe-clock-0.14/default-time-24hrs.patch index 4583df8add..acb039967b 100644 --- a/recipes/gpe-clock/gpe-clock-0.14/default-time-24hrs.patch +++ b/recipes/gpe-clock/gpe-clock-0.14/default-time-24hrs.patch @@ -1,5 +1,5 @@ -diff -urNd ../gpe-clock-0.14-r0/gpe-clock-0.14/clock.c gpe-clock-0.14/clock.c ---- ../gpe-clock-0.14-r0/gpe-clock-0.14/clock.c 2004-08-23 22:38:21.000000000 +0100 +diff -urNd gpe-clock-0.14/clock.c gpe-clock-0.14/clock.c +--- gpe-clock-0.14/clock.c 2004-08-23 22:38:21.000000000 +0100 +++ gpe-clock-0.14/clock.c 2004-09-16 11:32:43.000000000 +0100 @@ -42,7 +42,7 @@ #define FORMAT_ANALOGUE 2 diff --git a/recipes/gpe-clock/gpe-clock-0.20/default-time-24hrs.patch b/recipes/gpe-clock/gpe-clock-0.20/default-time-24hrs.patch index 4583df8add..acb039967b 100644 --- a/recipes/gpe-clock/gpe-clock-0.20/default-time-24hrs.patch +++ b/recipes/gpe-clock/gpe-clock-0.20/default-time-24hrs.patch @@ -1,5 +1,5 @@ -diff -urNd ../gpe-clock-0.14-r0/gpe-clock-0.14/clock.c gpe-clock-0.14/clock.c ---- ../gpe-clock-0.14-r0/gpe-clock-0.14/clock.c 2004-08-23 22:38:21.000000000 +0100 +diff -urNd gpe-clock-0.14/clock.c gpe-clock-0.14/clock.c +--- gpe-clock-0.14/clock.c 2004-08-23 22:38:21.000000000 +0100 +++ gpe-clock-0.14/clock.c 2004-09-16 11:32:43.000000000 +0100 @@ -42,7 +42,7 @@ #define FORMAT_ANALOGUE 2 diff --git a/recipes/gpe-go/gpe-go-0.05/fix-make.patch b/recipes/gpe-go/gpe-go-0.05/fix-make.patch index 996c51e001..c3c558826d 100644 --- a/recipes/gpe-go/gpe-go-0.05/fix-make.patch +++ b/recipes/gpe-go/gpe-go-0.05/fix-make.patch @@ -1,5 +1,5 @@ -diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/build/Makefile.dpkg_ipkg gpe-go-0.05/build/Makefile.dpkg_ipkg ---- ../gpe-go-0.05-r0/gpe-go-0.05/build/Makefile.dpkg_ipkg 2003-11-09 20:28:40.000000000 +0000 +diff -urNd gpe-go-0.05/build/Makefile.dpkg_ipkg gpe-go-0.05/build/Makefile.dpkg_ipkg +--- gpe-go-0.05/build/Makefile.dpkg_ipkg 2003-11-09 20:28:40.000000000 +0000 +++ gpe-go-0.05/build/Makefile.dpkg_ipkg 2004-09-18 17:09:01.000000000 +0100 @@ -18,8 +18,10 @@ LIBGPEWIDGET_PC = libgpewidget @@ -66,8 +66,8 @@ diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/build/Makefile.dpkg_ipkg gpe-go-0.05/bu + +.c.o:; + $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ -diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/build/Makefile.translation gpe-go-0.05/build/Makefile.translation ---- ../gpe-go-0.05-r0/gpe-go-0.05/build/Makefile.translation 2003-11-09 20:28:40.000000000 +0000 +diff -urNd gpe-go-0.05/build/Makefile.translation gpe-go-0.05/build/Makefile.translation +--- gpe-go-0.05/build/Makefile.translation 2003-11-09 20:28:40.000000000 +0000 +++ gpe-go-0.05/build/Makefile.translation 2004-09-18 17:09:01.000000000 +0100 @@ -5,7 +5,7 @@ # use ipkg-build or ipkg-deb-build @@ -116,8 +116,8 @@ diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/build/Makefile.translation gpe-go-0.05/ done translation-ipkg: -diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/gpe-go.c gpe-go-0.05/gpe-go.c ---- ../gpe-go-0.05-r0/gpe-go-0.05/gpe-go.c 2003-11-09 19:38:50.000000000 +0000 +diff -urNd gpe-go-0.05/gpe-go.c gpe-go-0.05/gpe-go.c +--- gpe-go-0.05/gpe-go.c 2003-11-09 19:38:50.000000000 +0000 +++ gpe-go-0.05/gpe-go.c 2004-09-18 17:04:24.000000000 +0100 @@ -16,12 +16,12 @@ #include "sgf.h" @@ -138,8 +138,8 @@ diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/gpe-go.c gpe-go-0.05/gpe-go.c //--i18n #include -diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/Makefile gpe-go-0.05/Makefile ---- ../gpe-go-0.05-r0/gpe-go-0.05/Makefile 2003-11-09 20:28:40.000000000 +0000 +diff -urNd gpe-go-0.05/Makefile gpe-go-0.05/Makefile +--- gpe-go-0.05/Makefile 2003-11-09 20:28:40.000000000 +0000 +++ gpe-go-0.05/Makefile 2004-09-18 17:11:06.000000000 +0100 @@ -1,19 +1,8 @@ VERSION = 0.05 diff --git a/recipes/gpe-lights/gpe-lights-0.12/fix-makefiles.patch b/recipes/gpe-lights/gpe-lights-0.12/fix-makefiles.patch index 4ec5b3a682..72e471366a 100644 --- a/recipes/gpe-lights/gpe-lights-0.12/fix-makefiles.patch +++ b/recipes/gpe-lights/gpe-lights-0.12/fix-makefiles.patch @@ -1,5 +1,5 @@ -diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.dpkg_ipkg gpe-lights-0.12/build/Makefile.dpkg_ipkg ---- ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.dpkg_ipkg 1970-01-01 01:00:00.000000000 +0100 +diff -urNd gpe-lights-0.12/build/Makefile.dpkg_ipkg gpe-lights-0.12/build/Makefile.dpkg_ipkg +--- gpe-lights-0.12/build/Makefile.dpkg_ipkg 1970-01-01 01:00:00.000000000 +0100 +++ gpe-lights-0.12/build/Makefile.dpkg_ipkg 2004-09-18 20:09:37.000000000 +0100 @@ -0,0 +1,114 @@ +## Please read the README in this directory to see how to use this @@ -116,8 +116,8 @@ diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.dpkg_ipkg gpe-li + +.c.o:; + $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ -diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.translation gpe-lights-0.12/build/Makefile.translation ---- ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.translation 1970-01-01 01:00:00.000000000 +0100 +diff -urNd gpe-lights-0.12/build/Makefile.translation gpe-lights-0.12/build/Makefile.translation +--- gpe-lights-0.12/build/Makefile.translation 1970-01-01 01:00:00.000000000 +0100 +++ gpe-lights-0.12/build/Makefile.translation 2004-09-18 20:09:37.000000000 +0100 @@ -0,0 +1,103 @@ +.SUFFIXES: .mo .po .pot .po8 @@ -223,8 +223,8 @@ diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.translation gpe- + +translation-ipkg: + make PREFIX=/usr real-translation-package -diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/Makefile gpe-lights-0.12/Makefile ---- ../gpe-lights-0.12-r0/gpe-lights-0.12/Makefile 2004-09-17 23:32:53.000000000 +0100 +diff -urNd gpe-lights-0.12/Makefile gpe-lights-0.12/Makefile +--- gpe-lights-0.12/Makefile 2004-09-17 23:32:53.000000000 +0100 +++ gpe-lights-0.12/Makefile 2004-09-18 20:10:46.000000000 +0100 @@ -1,41 +1,37 @@ PACKAGE = gpe-lights diff --git a/recipes/gpe-lights/gpe-lights-0.13/fix-makefiles.patch b/recipes/gpe-lights/gpe-lights-0.13/fix-makefiles.patch index 3c4581eded..5d99b91dab 100644 --- a/recipes/gpe-lights/gpe-lights-0.13/fix-makefiles.patch +++ b/recipes/gpe-lights/gpe-lights-0.13/fix-makefiles.patch @@ -1,5 +1,5 @@ -diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.dpkg_ipkg gpe-lights-0.12/build/Makefile.dpkg_ipkg ---- ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.dpkg_ipkg 1970-01-01 01:00:00.000000000 +0100 +diff -urNd gpe-lights-0.12/build/Makefile.dpkg_ipkg gpe-lights-0.12/build/Makefile.dpkg_ipkg +--- gpe-lights-0.12/build/Makefile.dpkg_ipkg 1970-01-01 01:00:00.000000000 +0100 +++ gpe-lights-0.12/build/Makefile.dpkg_ipkg 2004-09-18 20:09:37.000000000 +0100 @@ -0,0 +1,114 @@ +## Please read the README in this directory to see how to use this @@ -116,8 +116,8 @@ diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.dpkg_ipkg gpe-li + +.c.o:; + $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ -diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.translation gpe-lights-0.12/build/Makefile.translation ---- ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.translation 1970-01-01 01:00:00.000000000 +0100 +diff -urNd gpe-lights-0.12/build/Makefile.translation gpe-lights-0.12/build/Makefile.translation +--- gpe-lights-0.12/build/Makefile.translation 1970-01-01 01:00:00.000000000 +0100 +++ gpe-lights-0.12/build/Makefile.translation 2004-09-18 20:09:37.000000000 +0100 @@ -0,0 +1,103 @@ +.SUFFIXES: .mo .po .pot .po8 @@ -223,8 +223,8 @@ diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.translation gpe- + +translation-ipkg: + make PREFIX=/usr real-translation-package -diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/Makefile gpe-lights-0.12/Makefile ---- ../gpe-lights-0.12-r0/gpe-lights-0.12/Makefile 2004-09-17 23:32:53.000000000 +0100 +diff -urNd gpe-lights-0.12/Makefile gpe-lights-0.12/Makefile +--- gpe-lights-0.12/Makefile 2004-09-17 23:32:53.000000000 +0100 +++ gpe-lights-0.12/Makefile 2004-09-18 20:10:46.000000000 +0100 @@ -1,41 +1,37 @@ PACKAGE = gpe-lights diff --git a/recipes/gpe-nmf/gpe-nmf-0.17/fix_makefiles.patch b/recipes/gpe-nmf/gpe-nmf-0.17/fix_makefiles.patch index b6dc568151..5965f031d3 100644 --- a/recipes/gpe-nmf/gpe-nmf-0.17/fix_makefiles.patch +++ b/recipes/gpe-nmf/gpe-nmf-0.17/fix_makefiles.patch @@ -1,5 +1,5 @@ -diff -urNd ../gpe-nmf-0.17-r0/gpe-nmf-0.17/backend/Makefile gpe-nmf-0.17/backend/Makefile ---- ../gpe-nmf-0.17-r0/gpe-nmf-0.17/backend/Makefile 2004-07-06 22:02:57.000000000 +0100 +diff -urNd gpe-nmf-0.17/backend/Makefile gpe-nmf-0.17/backend/Makefile +--- gpe-nmf-0.17/backend/Makefile 2004-07-06 22:02:57.000000000 +0100 +++ gpe-nmf-0.17/backend/Makefile 2004-08-03 12:42:34.000000000 +0100 @@ -48,7 +48,7 @@ clean: @@ -10,8 +10,8 @@ diff -urNd ../gpe-nmf-0.17-r0/gpe-nmf-0.17/backend/Makefile gpe-nmf-0.17/backend mkdir -p $(DESTDIR)$(PREFIX)/lib install $(BACKEND) $(DESTDIR)$(PREFIX)/lib/$(BACKEND) for i in $(CODECS); do install $$i $(DESTDIR)$(PREFIX)/lib/gpe-nmf/decoders/$$i; done -diff -urNd ../gpe-nmf-0.17-r0/gpe-nmf-0.17/Makefile gpe-nmf-0.17/Makefile ---- ../gpe-nmf-0.17-r0/gpe-nmf-0.17/Makefile 2004-08-03 03:31:46.000000000 +0100 +diff -urNd gpe-nmf-0.17/Makefile gpe-nmf-0.17/Makefile +--- gpe-nmf-0.17/Makefile 2004-08-03 03:31:46.000000000 +0100 +++ gpe-nmf-0.17/Makefile 2004-08-03 12:37:33.000000000 +0100 @@ -43,7 +43,7 @@ make -C backend PREFIX=$(PREFIX) GST=$(GST) GST_VERSION=$(GST_VERSION) CVSBUILD=$(CVSBUILD) diff --git a/recipes/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch b/recipes/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch index def1915f2b..d17c826bb8 100644 --- a/recipes/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch +++ b/recipes/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch @@ -1,5 +1,5 @@ -diff -urNd ../gpe-othello-0.2-1-r0/gpe-othello-0.2-1/build/Makefile.dpkg_ipkg gpe-othello-0.2-1/build/Makefile.dpkg_ipkg ---- ../gpe-othello-0.2-1-r0/gpe-othello-0.2-1/build/Makefile.dpkg_ipkg 1970-01-01 01:00:00.000000000 +0100 +diff -urNd gpe-othello-0.2-1/build/Makefile.dpkg_ipkg gpe-othello-0.2-1/build/Makefile.dpkg_ipkg +--- gpe-othello-0.2-1/build/Makefile.dpkg_ipkg 1970-01-01 01:00:00.000000000 +0100 +++ gpe-othello-0.2-1/build/Makefile.dpkg_ipkg 2004-09-18 20:23:29.000000000 +0100 @@ -0,0 +1,114 @@ +## Please read the README in this directory to see how to use this @@ -116,8 +116,8 @@ diff -urNd ../gpe-othello-0.2-1-r0/gpe-othello-0.2-1/build/Makefile.dpkg_ipkg gp + +.c.o:; + $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ -diff -urNd ../gpe-othello-0.2-1-r0/gpe-othello-0.2-1/build/Makefile.translation gpe-othello-0.2-1/build/Makefile.translation ---- ../gpe-othello-0.2-1-r0/gpe-othello-0.2-1/build/Makefile.translation 1970-01-01 01:00:00.000000000 +0100 +diff -urNd gpe-othello-0.2-1/build/Makefile.translation gpe-othello-0.2-1/build/Makefile.translation +--- gpe-othello-0.2-1/build/Makefile.translation 1970-01-01 01:00:00.000000000 +0100 +++ gpe-othello-0.2-1/build/Makefile.translation 2004-09-18 20:23:29.000000000 +0100 @@ -0,0 +1,103 @@ +.SUFFIXES: .mo .po .pot .po8 @@ -223,8 +223,8 @@ diff -urNd ../gpe-othello-0.2-1-r0/gpe-othello-0.2-1/build/Makefile.translation + +translation-ipkg: + make PREFIX=/usr real-translation-package -diff -urNd ../gpe-othello-0.2-1-r0/gpe-othello-0.2-1/Makefile gpe-othello-0.2-1/Makefile ---- ../gpe-othello-0.2-1-r0/gpe-othello-0.2-1/Makefile 2004-09-18 00:16:02.000000000 +0100 +diff -urNd gpe-othello-0.2-1/Makefile gpe-othello-0.2-1/Makefile +--- gpe-othello-0.2-1/Makefile 2004-09-18 00:16:02.000000000 +0100 +++ gpe-othello-0.2-1/Makefile 2004-09-18 20:25:16.000000000 +0100 @@ -3,41 +3,37 @@ DEBUG = no diff --git a/recipes/gpe-tetris/gpe-tetris-0.6-2/fix-makefiles.patch b/recipes/gpe-tetris/gpe-tetris-0.6-2/fix-makefiles.patch index b1297732ff..d3a108dc2a 100644 --- a/recipes/gpe-tetris/gpe-tetris-0.6-2/fix-makefiles.patch +++ b/recipes/gpe-tetris/gpe-tetris-0.6-2/fix-makefiles.patch @@ -1,5 +1,5 @@ -diff -urNd ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg ---- ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg 1970-01-01 01:00:00.000000000 +0100 +diff -urNd gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg +--- gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg 1970-01-01 01:00:00.000000000 +0100 +++ gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg 2004-09-18 21:04:03.000000000 +0100 @@ -0,0 +1,114 @@ +## Please read the README in this directory to see how to use this @@ -116,8 +116,8 @@ diff -urNd ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg gpe- + +.c.o:; + $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ -diff -urNd ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/build/Makefile.translation gpe-tetris-0.6-2/build/Makefile.translation ---- ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/build/Makefile.translation 1970-01-01 01:00:00.000000000 +0100 +diff -urNd gpe-tetris-0.6-2/build/Makefile.translation gpe-tetris-0.6-2/build/Makefile.translation +--- gpe-tetris-0.6-2/build/Makefile.translation 1970-01-01 01:00:00.000000000 +0100 +++ gpe-tetris-0.6-2/build/Makefile.translation 2004-09-18 21:04:03.000000000 +0100 @@ -0,0 +1,103 @@ +.SUFFIXES: .mo .po .pot .po8 @@ -223,8 +223,8 @@ diff -urNd ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/build/Makefile.translation gp + +translation-ipkg: + make PREFIX=/usr real-translation-package -diff -urNd ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/Makefile gpe-tetris-0.6-2/Makefile ---- ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/Makefile 2004-09-17 23:48:05.000000000 +0100 +diff -urNd gpe-tetris-0.6-2/Makefile gpe-tetris-0.6-2/Makefile +--- gpe-tetris-0.6-2/Makefile 2004-09-17 23:48:05.000000000 +0100 +++ gpe-tetris-0.6-2/Makefile 2004-09-18 21:09:31.000000000 +0100 @@ -9,30 +9,29 @@ CVSBUILD = no diff --git a/recipes/gpe-todo/gpe-todo-0.51/remove-render.patch b/recipes/gpe-todo/gpe-todo-0.51/remove-render.patch index 9369ce9f31..55325ad075 100644 --- a/recipes/gpe-todo/gpe-todo-0.51/remove-render.patch +++ b/recipes/gpe-todo/gpe-todo-0.51/remove-render.patch @@ -1,4 +1,4 @@ ---- ../gpe-todo-0.51-r1/gpe-todo-0.51/list-ui.c 2005-01-01 03:40:30.000000000 +0100 +--- gpe-todo-0.51/list-ui.c 2005-01-01 03:40:30.000000000 +0100 +++ gpe-todo-0.51/list-ui.c 2005-04-20 21:13:40.191069800 +0200 @@ -17,7 +17,6 @@ diff --git a/recipes/gpe-watch/gpe-watch-0.10/fix_makefile.patch b/recipes/gpe-watch/gpe-watch-0.10/fix_makefile.patch index ebea8d66e9..c5cf83ca1e 100644 --- a/recipes/gpe-watch/gpe-watch-0.10/fix_makefile.patch +++ b/recipes/gpe-watch/gpe-watch-0.10/fix_makefile.patch @@ -1,5 +1,5 @@ -diff -urNd ../gpe-watch-0.10-r0/gpe-watch-0.10/Makefile gpe-watch-0.10/Makefile ---- ../gpe-watch-0.10-r0/gpe-watch-0.10/Makefile 2004-08-03 15:43:54.000000000 +0100 +diff -urNd gpe-watch-0.10/Makefile gpe-watch-0.10/Makefile +--- gpe-watch-0.10/Makefile 2004-08-03 15:43:54.000000000 +0100 +++ gpe-watch-0.10/Makefile 2004-08-03 16:08:52.000000000 +0100 @@ -8,26 +8,26 @@ MEMBERS = gpe-watch diff --git a/recipes/gpe-watch/gpe-watch-0.10/no-render-h.patch b/recipes/gpe-watch/gpe-watch-0.10/no-render-h.patch index b2fc236e7a..1b0b36a380 100644 --- a/recipes/gpe-watch/gpe-watch-0.10/no-render-h.patch +++ b/recipes/gpe-watch/gpe-watch-0.10/no-render-h.patch @@ -1,5 +1,5 @@ -diff -urNd ../gpe-watch-0.10-r0/gpe-watch-0.10/gpe-watch.c gpe-watch-0.10/gpe-watch.c ---- ../gpe-watch-0.10-r0/gpe-watch-0.10/gpe-watch.c 2004-06-30 12:12:20 +01:00 +diff -urNd gpe-watch-0.10/gpe-watch.c gpe-watch-0.10/gpe-watch.c +--- gpe-watch-0.10/gpe-watch.c 2004-06-30 12:12:20 +01:00 +++ gpe-watch-0.10/gpe-watch.c 2005-04-28 12:41:33 +01:00 @@ -24,7 +24,6 @@ #ifdef USE_GPE diff --git a/recipes/gsoko/gsoko-0.4.2-gpe5/fix_makefiles.patch b/recipes/gsoko/gsoko-0.4.2-gpe5/fix_makefiles.patch index 8c6ba2aad6..534103e232 100644 --- a/recipes/gsoko/gsoko-0.4.2-gpe5/fix_makefiles.patch +++ b/recipes/gsoko/gsoko-0.4.2-gpe5/fix_makefiles.patch @@ -1,5 +1,5 @@ -diff -urNd ../gsoko-0.4.2-gpe5-r0/gsoko-0.4.2-gpe5/Makefile gsoko-0.4.2-gpe5/Makefile ---- ../gsoko-0.4.2-gpe5-r0/gsoko-0.4.2-gpe5/Makefile 2004-09-18 00:03:00.000000000 +0100 +diff -urNd gsoko-0.4.2-gpe5/Makefile gsoko-0.4.2-gpe5/Makefile +--- gsoko-0.4.2-gpe5/Makefile 2004-09-18 00:03:00.000000000 +0100 +++ gsoko-0.4.2-gpe5/Makefile 2004-09-20 20:14:46.000000000 +0100 @@ -1,16 +1,21 @@ diff --git a/recipes/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch b/recipes/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch index f734be4961..28b65e0970 100644 --- a/recipes/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch +++ b/recipes/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch @@ -1,5 +1,5 @@ -diff -urNd ../gsoko-0.4.2-gpe5-r0/gsoko-0.4.2-gpe5/Makefile gsoko-0.4.2-gpe5/Makefile ---- ../gsoko-0.4.2-gpe5-r0/gsoko-0.4.2-gpe5/Makefile 2004-09-18 00:03:00.000000000 +0100 +diff -urNd gsoko-0.4.2-gpe5/Makefile gsoko-0.4.2-gpe5/Makefile +--- gsoko-0.4.2-gpe5/Makefile 2004-09-18 00:03:00.000000000 +0100 +++ gsoko-0.4.2-gpe5/Makefile 2004-09-20 20:14:46.000000000 +0100 @@ -1,16 +1,21 @@ diff --git a/recipes/gtk+/gtk+-2.10.14/no-xwc.patch b/recipes/gtk+/gtk+-2.10.14/no-xwc.patch index affb4a303e..8de54de9d8 100644 --- a/recipes/gtk+/gtk+-2.10.14/no-xwc.patch +++ b/recipes/gtk+/gtk+-2.10.14/no-xwc.patch @@ -1,5 +1,5 @@ -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00 +diff -urNd gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c +--- gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00 +++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00 @@ -576,12 +576,14 @@ GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2); @@ -32,8 +32,8 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/ else g_error("undefined font type\n"); } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00 +diff -urNd gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c +--- gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00 +++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00 @@ -525,10 +525,12 @@ width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2); @@ -96,8 +96,8 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/ } } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00 +diff -urNd gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c +--- gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00 +++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00 @@ -48,6 +48,7 @@ void diff --git a/recipes/gtk+/gtk+-2.10.14/small-gtkfilesel.patch b/recipes/gtk+/gtk+-2.10.14/small-gtkfilesel.patch index 20bf4cf366..d6efa1e612 100644 --- a/recipes/gtk+/gtk+-2.10.14/small-gtkfilesel.patch +++ b/recipes/gtk+/gtk+-2.10.14/small-gtkfilesel.patch @@ -1,5 +1,5 @@ -diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c ---- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100 +diff -urNd gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c +--- gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100 +++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100 @@ -68,6 +68,7 @@ #include "gtkprivate.h" diff --git a/recipes/gtk+/gtk+-2.6.10/no-xwc.patch b/recipes/gtk+/gtk+-2.6.10/no-xwc.patch index affb4a303e..8de54de9d8 100644 --- a/recipes/gtk+/gtk+-2.6.10/no-xwc.patch +++ b/recipes/gtk+/gtk+-2.6.10/no-xwc.patch @@ -1,5 +1,5 @@ -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00 +diff -urNd gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c +--- gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00 +++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00 @@ -576,12 +576,14 @@ GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2); @@ -32,8 +32,8 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/ else g_error("undefined font type\n"); } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00 +diff -urNd gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c +--- gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00 +++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00 @@ -525,10 +525,12 @@ width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2); @@ -96,8 +96,8 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/ } } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00 +diff -urNd gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c +--- gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00 +++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00 @@ -48,6 +48,7 @@ void diff --git a/recipes/gtk+/gtk+-2.6.10/single-click.patch b/recipes/gtk+/gtk+-2.6.10/single-click.patch index 3bb208d4d6..41e70c8487 100644 --- a/recipes/gtk+/gtk+-2.6.10/single-click.patch +++ b/recipes/gtk+/gtk+-2.6.10/single-click.patch @@ -1,5 +1,5 @@ -diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkcalendar.c ---- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 16:57:04 +01:00 +diff -urNd gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkcalendar.c +--- gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 16:57:04 +01:00 +++ gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 20:05:18 +01:00 @@ -1023,9 +1023,11 @@ } @@ -15,8 +15,8 @@ diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkc private_data->in_drag = 0; if (day_month == MONTH_CURRENT) g_signal_emit (calendar, -diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c gtk+-2.6.3/gtk/gtkfilesel.c ---- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-06 16:57:07 +01:00 +diff -urNd gtk+-2.6.3/gtk/gtkfilesel.c gtk+-2.6.3/gtk/gtkfilesel.c +--- gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-06 16:57:07 +01:00 +++ gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-07 13:40:32 +01:00 @@ -2468,6 +2468,33 @@ if (fs->last_selected != NULL) diff --git a/recipes/gtk+/gtk+-2.6.10/small-gtkfilesel.patch b/recipes/gtk+/gtk+-2.6.10/small-gtkfilesel.patch index 20bf4cf366..d6efa1e612 100644 --- a/recipes/gtk+/gtk+-2.6.10/small-gtkfilesel.patch +++ b/recipes/gtk+/gtk+-2.6.10/small-gtkfilesel.patch @@ -1,5 +1,5 @@ -diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c ---- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100 +diff -urNd gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c +--- gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100 +++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100 @@ -68,6 +68,7 @@ #include "gtkprivate.h" diff --git a/recipes/gweled/gweled-0.5/de-gnome.patch b/recipes/gweled/gweled-0.5/de-gnome.patch index 5117633031..a268e755c4 100644 --- a/recipes/gweled/gweled-0.5/de-gnome.patch +++ b/recipes/gweled/gweled-0.5/de-gnome.patch @@ -1,5 +1,5 @@ -diff -urNd ../gweled-0.5-r0/gweled-0.5/configure.in gweled-0.5/configure.in ---- ../gweled-0.5-r0/gweled-0.5/configure.in 2004-01-22 20:14:23.000000000 +0000 +diff -urNd gweled-0.5/configure.in gweled-0.5/configure.in +--- gweled-0.5/configure.in 2004-01-22 20:14:23.000000000 +0000 +++ gweled-0.5/configure.in 2004-09-28 12:32:39.000000000 +0100 @@ -10,7 +10,7 @@ AM_PROG_CC_STDC @@ -10,8 +10,8 @@ diff -urNd ../gweled-0.5-r0/gweled-0.5/configure.in gweled-0.5/configure.in PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) AC_SUBST(PACKAGE_CFLAGS) AC_SUBST(PACKAGE_LIBS) -diff -urNd ../gweled-0.5-r0/gweled-0.5/src/board_engine.c gweled-0.5/src/board_engine.c ---- ../gweled-0.5-r0/gweled-0.5/src/board_engine.c 2004-01-25 08:23:54.000000000 +0000 +diff -urNd gweled-0.5/src/board_engine.c gweled-0.5/src/board_engine.c +--- gweled-0.5/src/board_engine.c 2004-01-25 08:23:54.000000000 +0000 +++ gweled-0.5/src/board_engine.c 2004-09-28 15:56:32.000000000 +0100 @@ -1,4 +1,4 @@ -#include @@ -37,8 +37,8 @@ diff -urNd ../gweled-0.5-r0/gweled-0.5/src/board_engine.c gweled-0.5/src/board_e g_do_not_score = FALSE; gi_state = _IDLE; } -diff -urNd ../gweled-0.5-r0/gweled-0.5/src/callbacks.c gweled-0.5/src/callbacks.c ---- ../gweled-0.5-r0/gweled-0.5/src/callbacks.c 2004-01-21 17:25:34.000000000 +0000 +diff -urNd gweled-0.5/src/callbacks.c gweled-0.5/src/callbacks.c +--- gweled-0.5/src/callbacks.c 2004-01-21 17:25:34.000000000 +0000 +++ gweled-0.5/src/callbacks.c 2004-09-28 13:20:55.000000000 +0100 @@ -2,8 +2,7 @@ # include @@ -152,8 +152,8 @@ diff -urNd ../gweled-0.5-r0/gweled-0.5/src/callbacks.c gweled-0.5/src/callbacks. } } break; -diff -urNd ../gweled-0.5-r0/gweled-0.5/src/callbacks.h gweled-0.5/src/callbacks.h ---- ../gweled-0.5-r0/gweled-0.5/src/callbacks.h 2003-11-05 21:01:08.000000000 +0000 +diff -urNd gweled-0.5/src/callbacks.h gweled-0.5/src/callbacks.h +--- gweled-0.5/src/callbacks.h 2003-11-05 21:01:08.000000000 +0000 +++ gweled-0.5/src/callbacks.h 2004-09-28 11:26:44.000000000 +0100 @@ -1,8 +1,8 @@ -#include @@ -175,8 +175,8 @@ diff -urNd ../gweled-0.5-r0/gweled-0.5/src/callbacks.h gweled-0.5/src/callbacks. GdkEventButton *event, gpointer user_data); -diff -urNd ../gweled-0.5-r0/gweled-0.5/src/graphic_engine.c gweled-0.5/src/graphic_engine.c ---- ../gweled-0.5-r0/gweled-0.5/src/graphic_engine.c 2004-01-22 22:09:05.000000000 +0000 +diff -urNd gweled-0.5/src/graphic_engine.c gweled-0.5/src/graphic_engine.c +--- gweled-0.5/src/graphic_engine.c 2004-01-22 22:09:05.000000000 +0000 +++ gweled-0.5/src/graphic_engine.c 2004-09-28 15:56:00.000000000 +0100 @@ -1,9 +1,13 @@ -#include @@ -300,8 +300,8 @@ diff -urNd ../gweled-0.5-r0/gweled-0.5/src/graphic_engine.c gweled-0.5/src/graph } -diff -urNd ../gweled-0.5-r0/gweled-0.5/src/main.c gweled-0.5/src/main.c ---- ../gweled-0.5-r0/gweled-0.5/src/main.c 2004-01-22 20:16:10.000000000 +0000 +diff -urNd gweled-0.5/src/main.c gweled-0.5/src/main.c +--- gweled-0.5/src/main.c 2004-01-22 20:16:10.000000000 +0000 +++ gweled-0.5/src/main.c 2004-10-13 10:17:43.000000000 +0100 @@ -25,19 +25,22 @@ # include @@ -541,8 +541,8 @@ diff -urNd ../gweled-0.5-r0/gweled-0.5/src/main.c gweled-0.5/src/main.c return 0; } -diff -urNd ../gweled-0.5-r0/gweled-0.5/src/Makefile.am gweled-0.5/src/Makefile.am ---- ../gweled-0.5-r0/gweled-0.5/src/Makefile.am 2003-12-11 21:34:19.000000000 +0000 +diff -urNd gweled-0.5/src/Makefile.am gweled-0.5/src/Makefile.am +--- gweled-0.5/src/Makefile.am 2003-12-11 21:34:19.000000000 +0000 +++ gweled-0.5/src/Makefile.am 2004-09-28 12:30:51.000000000 +0100 @@ -3,6 +3,7 @@ INCLUDES = \ @@ -552,8 +552,8 @@ diff -urNd ../gweled-0.5-r0/gweled-0.5/src/Makefile.am gweled-0.5/src/Makefile.a @PACKAGE_CFLAGS@ bin_PROGRAMS = gweled -diff -urNd ../gweled-0.5-r0/gweled-0.5/src/sge_core.c gweled-0.5/src/sge_core.c ---- ../gweled-0.5-r0/gweled-0.5/src/sge_core.c 2004-01-22 22:10:40.000000000 +0000 +diff -urNd gweled-0.5/src/sge_core.c gweled-0.5/src/sge_core.c +--- gweled-0.5/src/sge_core.c 2004-01-22 22:10:40.000000000 +0000 +++ gweled-0.5/src/sge_core.c 2004-10-13 10:20:45.000000000 +0100 @@ -18,11 +18,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -587,8 +587,8 @@ diff -urNd ../gweled-0.5-r0/gweled-0.5/src/sge_core.c gweled-0.5/src/sge_core.c g_rand_free (g_rand_generator); for (i = 0; i < gi_nb_pixbufs; i++) gdk_pixbuf_unref (g_pixbufs[i]); -diff -urNd ../gweled-0.5-r0/gweled-0.5/src/sge_utils.c gweled-0.5/src/sge_utils.c ---- ../gweled-0.5-r0/gweled-0.5/src/sge_utils.c 2003-12-07 19:28:57.000000000 +0000 +diff -urNd gweled-0.5/src/sge_utils.c gweled-0.5/src/sge_utils.c +--- gweled-0.5/src/sge_utils.c 2003-12-07 19:28:57.000000000 +0000 +++ gweled-0.5/src/sge_utils.c 2004-09-28 11:20:54.000000000 +0100 @@ -1,47 +1,30 @@ -#include @@ -648,8 +648,8 @@ diff -urNd ../gweled-0.5-r0/gweled-0.5/src/sge_utils.c gweled-0.5/src/sge_utils. return pixbuf; } -diff -urNd ../gweled-0.5-r0/gweled-0.5/src/sge_utils.h gweled-0.5/src/sge_utils.h ---- ../gweled-0.5-r0/gweled-0.5/src/sge_utils.h 2003-11-05 20:31:27.000000000 +0000 +diff -urNd gweled-0.5/src/sge_utils.h gweled-0.5/src/sge_utils.h +--- gweled-0.5/src/sge_utils.h 2003-11-05 20:31:27.000000000 +0000 +++ gweled-0.5/src/sge_utils.h 2004-09-28 11:14:27.000000000 +0100 @@ -1,3 +1,3 @@ diff --git a/recipes/gxine/files/disable-browser-plugin.patch b/recipes/gxine/files/disable-browser-plugin.patch index 3be381fabf..41015096a7 100644 --- a/recipes/gxine/files/disable-browser-plugin.patch +++ b/recipes/gxine/files/disable-browser-plugin.patch @@ -1,5 +1,5 @@ -diff -urNd ../gxine-0.4.1-r0.old/gxine-0.4.1/Makefile.am gxine-0.4.1/Makefile.am ---- ../gxine-0.4.1-r0.old/gxine-0.4.1/Makefile.am 2004-12-14 21:48:24 +00:00 +diff -urNd gxine-0.4.1/Makefile.am gxine-0.4.1/Makefile.am +--- gxine-0.4.1/Makefile.am 2004-12-14 21:48:24 +00:00 +++ gxine-0.4.1/Makefile.am 2005-04-08 03:40:48 +01:00 @@ -1,4 +1,4 @@ -SUBDIRS = m4 pixmaps include src doc browser-plugin misc po @@ -7,8 +7,8 @@ diff -urNd ../gxine-0.4.1-r0.old/gxine-0.4.1/Makefile.am gxine-0.4.1/Makefile.am #DEB_FILES = debian/rules debian/changelog debian/control debian/copyright debian/README.Debian debian/menu EXTRA_DIST = config.rpath gxine.desktop autogen.sh @DEPCOMP@ -diff -urNd ../gxine-0.4.1-r0.old/gxine-0.4.1/configure.ac gxine-0.4.1/configure.ac ---- ../gxine-0.4.1-r0.old/gxine-0.4.1/configure.ac 2005-04-08 04:00:05 +01:00 +diff -urNd gxine-0.4.1/configure.ac gxine-0.4.1/configure.ac +--- gxine-0.4.1/configure.ac 2005-04-08 04:00:05 +01:00 +++ gxine-0.4.1/configure.ac 2005-04-08 03:47:22 +01:00 @@ -42,12 +42,6 @@ AC_PATH_XTRA diff --git a/recipes/ipatience/files/fix-make.patch b/recipes/ipatience/files/fix-make.patch index 3e3ad80eef..42b028b003 100644 --- a/recipes/ipatience/files/fix-make.patch +++ b/recipes/ipatience/files/fix-make.patch @@ -1,5 +1,5 @@ -diff -urNd ../ipatience-0.1-r2/ipatience/build/Makefile.dpkg_ipkg ipatience/build/Makefile.dpkg_ipkg ---- ../ipatience-0.1-r2/ipatience/build/Makefile.dpkg_ipkg 1970-01-01 00:00:00.000000000 +0000 +diff -urNd ipatience/build/Makefile.dpkg_ipkg ipatience/build/Makefile.dpkg_ipkg +--- ipatience/build/Makefile.dpkg_ipkg 1970-01-01 00:00:00.000000000 +0000 +++ ipatience/build/Makefile.dpkg_ipkg 2006-11-08 16:41:55.000000000 +0000 @@ -0,0 +1,114 @@ +## Please read the README in this directory to see how to use this @@ -116,8 +116,8 @@ diff -urNd ../ipatience-0.1-r2/ipatience/build/Makefile.dpkg_ipkg ipatience/buil + +.c.o:; + $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ -diff -urNd ../ipatience-0.1-r2/ipatience/build/Makefile.translation ipatience/build/Makefile.translation ---- ../ipatience-0.1-r2/ipatience/build/Makefile.translation 1970-01-01 00:00:00.000000000 +0000 +diff -urNd ipatience/build/Makefile.translation ipatience/build/Makefile.translation +--- ipatience/build/Makefile.translation 1970-01-01 00:00:00.000000000 +0000 +++ ipatience/build/Makefile.translation 2006-11-08 16:41:55.000000000 +0000 @@ -0,0 +1,107 @@ +.SUFFIXES: .mo .po .pot .po8 @@ -227,8 +227,8 @@ diff -urNd ../ipatience-0.1-r2/ipatience/build/Makefile.translation ipatience/bu + +translation-ipkg: + make PREFIX=/usr real-translation-package -diff -urNd ../ipatience-0.1-r2/ipatience/Imakefile ipatience/Imakefile ---- ../ipatience-0.1-r2/ipatience/Imakefile 2001-01-31 05:25:03.000000000 +0000 +diff -urNd ipatience/Imakefile ipatience/Imakefile +--- ipatience/Imakefile 2001-01-31 05:25:03.000000000 +0000 +++ ipatience/Imakefile 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -LOCAL_LIBRARIES=-lfltk $(XFTLIB) $(XLIB) -lm @@ -242,8 +242,8 @@ diff -urNd ../ipatience-0.1-r2/ipatience/Imakefile ipatience/Imakefile - tabby.o towers.o vegas.o wish.o yukon.o - -ComplexProgramTarget(ipatience) -diff -urNd ../ipatience-0.1-r2/ipatience/ipatience.desktop ipatience/ipatience.desktop ---- ../ipatience-0.1-r2/ipatience/ipatience.desktop 1970-01-01 00:00:00.000000000 +0000 +diff -urNd ipatience/ipatience.desktop ipatience/ipatience.desktop +--- ipatience/ipatience.desktop 1970-01-01 00:00:00.000000000 +0000 +++ ipatience/ipatience.desktop 2006-11-11 15:59:25.000000000 +0000 @@ -0,0 +1,9 @@ +[Desktop Entry] @@ -255,8 +255,8 @@ diff -urNd ../ipatience-0.1-r2/ipatience/ipatience.desktop ipatience/ipatience.d +Icon=ipatience.xpm +Categories=Games +StartupNotify=True -diff -urNd ../ipatience-0.1-r2/ipatience/ipatience.xpm ipatience/ipatience.xpm ---- ../ipatience-0.1-r2/ipatience/ipatience.xpm 1970-01-01 00:00:00.000000000 +0000 +diff -urNd ipatience/ipatience.xpm ipatience/ipatience.xpm +--- ipatience/ipatience.xpm 1970-01-01 00:00:00.000000000 +0000 +++ ipatience/ipatience.xpm 2006-11-11 15:58:52.000000000 +0000 @@ -0,0 +1,194 @@ +/* XPM */ @@ -453,8 +453,8 @@ diff -urNd ../ipatience-0.1-r2/ipatience/ipatience.xpm ipatience/ipatience.xpm +" . . . . . . . . . . . . . . . . . . . ", +" . . . . . . . . . . . . . . . . . . . ", +" "}; -diff -urNd ../ipatience-0.1-r2/ipatience/main.cc ipatience/main.cc ---- ../ipatience-0.1-r2/ipatience/main.cc 2001-02-09 08:15:27.000000000 +0000 +diff -urNd ipatience/main.cc ipatience/main.cc +--- ipatience/main.cc 2001-02-09 08:15:27.000000000 +0000 +++ ipatience/main.cc 2006-11-02 16:37:55.000000000 +0000 @@ -549,7 +549,7 @@ @@ -465,8 +465,8 @@ diff -urNd ../ipatience-0.1-r2/ipatience/main.cc ipatience/main.cc Fl::args(argc,argv,i,arg_cb); fl_open_display (); if (small == -1) -diff -urNd ../ipatience-0.1-r2/ipatience/Makefile ipatience/Makefile ---- ../ipatience-0.1-r2/ipatience/Makefile 1970-01-01 00:00:00.000000000 +0000 +diff -urNd ipatience/Makefile ipatience/Makefile +--- ipatience/Makefile 1970-01-01 00:00:00.000000000 +0000 +++ ipatience/Makefile 2006-11-10 18:03:49.000000000 +0000 @@ -0,0 +1,39 @@ +PREFIX = /usr @@ -508,8 +508,8 @@ diff -urNd ../ipatience-0.1-r2/ipatience/Makefile ipatience/Makefile + +include $(BUILD)/Makefile.dpkg_ipkg +-include $(DEPS) -diff -urNd ../ipatience-0.1-r2/ipatience/table.cc ipatience/table.cc ---- ../ipatience-0.1-r2/ipatience/table.cc 2001-06-22 00:32:12.000000000 +0000 +diff -urNd ipatience/table.cc ipatience/table.cc +--- ipatience/table.cc 2001-06-22 00:32:12.000000000 +0000 +++ ipatience/table.cc 2006-11-10 17:06:56.000000000 +0000 @@ -231,9 +231,9 @@ suit_bitmap = suit[Suit(card) >> 4]; diff --git a/recipes/kf/files/fix-configure.patch b/recipes/kf/files/fix-configure.patch index fc1ad9a418..dbd02925a5 100644 --- a/recipes/kf/files/fix-configure.patch +++ b/recipes/kf/files/fix-configure.patch @@ -1,5 +1,5 @@ -diff -urNd ../kf-0.5.4.1-r0/kf-0.5.4.1/configure.in kf-0.5.4.1/configure.in ---- ../kf-0.5.4.1-r0/kf-0.5.4.1/configure.in 2005-04-27 19:42:49.000000000 +0100 +diff -urNd kf-0.5.4.1/configure.in kf-0.5.4.1/configure.in +--- kf-0.5.4.1/configure.in 2005-04-27 19:42:49.000000000 +0100 +++ kf-0.5.4.1/configure.in 2005-09-29 14:12:32.000000000 +0100 @@ -27,7 +27,7 @@ dnl AC_ARG_ENABLE(debug,) diff --git a/recipes/linux/linux-kexecboot-2.6.24/poodle-bootparams.patch b/recipes/linux/linux-kexecboot-2.6.24/poodle-bootparams.patch index 4c22fb7960..c95b353e05 100644 --- a/recipes/linux/linux-kexecboot-2.6.24/poodle-bootparams.patch +++ b/recipes/linux/linux-kexecboot-2.6.24/poodle-bootparams.patch @@ -1,4 +1,4 @@ ---- ../ref/linux-2.6.21.6/arch/arm/mach-pxa/poodle.c 2007-07-06 23:47:55.000000000 -0500 +--- linux-2.6.21.6/arch/arm/mach-pxa/poodle.c 2007-07-06 23:47:55.000000000 -0500 +++ linux-2.6.21.6-armeb/arch/arm/mach-pxa/poodle.c 2007-08-06 23:02:50.000000000 -0500 @@ -409,6 +409,7 @@ diff --git a/recipes/linux/linux-wrt-2.4.30/001-Makefile b/recipes/linux/linux-wrt-2.4.30/001-Makefile index d01051f844..b117e7f8eb 100644 --- a/recipes/linux/linux-wrt-2.4.30/001-Makefile +++ b/recipes/linux/linux-wrt-2.4.30/001-Makefile @@ -1,4 +1,4 @@ ---- ../../../kernel/linux-mips-cvs/Makefile 2005-01-20 03:19:21.000000000 +0100 +--- linux-mips-cvs/Makefile 2005-01-20 03:19:21.000000000 +0100 +++ linux-2.4.29.new/Makefile 2005-03-15 01:15:27.441095231 +0100 @@ -17,9 +17,9 @@ FINDHPATH = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu diff --git a/recipes/linux/linux-wrt-2.4.30/005-arch_mips_config-shared_in b/recipes/linux/linux-wrt-2.4.30/005-arch_mips_config-shared_in index 16c6766eec..87c8d3abe8 100644 --- a/recipes/linux/linux-wrt-2.4.30/005-arch_mips_config-shared_in +++ b/recipes/linux/linux-wrt-2.4.30/005-arch_mips_config-shared_in @@ -1,4 +1,4 @@ ---- ../../../kernel/linux-mips-cvs/arch/mips/config-shared.in 2005-01-31 12:59:28.000000000 +0100 +--- linux-mips-cvs/arch/mips/config-shared.in 2005-01-31 12:59:28.000000000 +0100 +++ linux-2.4.29/arch/mips/config-shared.in 2005-03-12 19:51:22.474214917 +0100 @@ -208,6 +208,14 @@ fi diff --git a/recipes/linux/linux-wrt-2.4.30/022-drivers_net_Makefile b/recipes/linux/linux-wrt-2.4.30/022-drivers_net_Makefile index 8340c9565b..f2fba96bae 100644 --- a/recipes/linux/linux-wrt-2.4.30/022-drivers_net_Makefile +++ b/recipes/linux/linux-wrt-2.4.30/022-drivers_net_Makefile @@ -1,4 +1,4 @@ ---- ../../../kernel/linux-mips-cvs/drivers/net/Makefile 2004-08-14 20:38:51.000000000 +0200 +--- linux-mips-cvs/drivers/net/Makefile 2004-08-14 20:38:51.000000000 +0200 +++ linux/drivers/net/Makefile 2005-03-16 12:45:24.523263597 +0100 @@ -21,6 +21,16 @@ list-multi := rcpci.o diff --git a/recipes/linux/linux-wrt-2.4.30/023-drivers_parport_Makefile b/recipes/linux/linux-wrt-2.4.30/023-drivers_parport_Makefile index 996e30a9b1..d45b88951a 100644 --- a/recipes/linux/linux-wrt-2.4.30/023-drivers_parport_Makefile +++ b/recipes/linux/linux-wrt-2.4.30/023-drivers_parport_Makefile @@ -1,4 +1,4 @@ ---- ../../../kernel/linux-mips-cvs/drivers/parport/Makefile 2004-08-14 20:38:53.000000000 +0200 +--- linux-mips-cvs/drivers/parport/Makefile 2004-08-14 20:38:53.000000000 +0200 +++ linux-2.4.29/drivers/parport/Makefile 2005-03-21 13:57:53.338746517 +0100 @@ -22,6 +22,7 @@ diff --git a/recipes/linux/linux-wrt-2.4.30/024-drivers_parport_Config_in b/recipes/linux/linux-wrt-2.4.30/024-drivers_parport_Config_in index 1b43798558..a8602a242e 100644 --- a/recipes/linux/linux-wrt-2.4.30/024-drivers_parport_Config_in +++ b/recipes/linux/linux-wrt-2.4.30/024-drivers_parport_Config_in @@ -1,4 +1,4 @@ ---- ../../../kernel/linux-mips-cvs/drivers/parport/Config.in 2004-02-20 02:22:18.000000000 +0100 +--- linux-mips-cvs/drivers/parport/Config.in 2004-02-20 02:22:18.000000000 +0100 +++ linux-2.4.29/drivers/parport/Config.in 2005-03-21 13:59:33.958193664 +0100 @@ -11,6 +11,7 @@ tristate 'Parallel port support' CONFIG_PARPORT diff --git a/recipes/linux/linux-wrt-2.4.30/310-netfilter-maxconn b/recipes/linux/linux-wrt-2.4.30/310-netfilter-maxconn index 87be89d72f..4438974218 100644 --- a/recipes/linux/linux-wrt-2.4.30/310-netfilter-maxconn +++ b/recipes/linux/linux-wrt-2.4.30/310-netfilter-maxconn @@ -1,4 +1,4 @@ ---- ../../buildroot-unpacked/build_mipsel/linux/net/ipv4/netfilter/ip_conntrack_core.c 2004-11-28 22:59:36.000000000 -0500 +--- linux/net/ipv4/netfilter/ip_conntrack_core.c 2004-11-28 22:59:36.000000000 -0500 +++ linux/net/ipv4/netfilter/ip_conntrack_core.c 2004-11-30 05:05:32.000000000 -0500 @@ -1386,7 +1386,7 @@ nf_unregister_sockopt(&so_getorigdst); diff --git a/recipes/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch b/recipes/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch index 7b5f408c37..76eaf3fcba 100644 --- a/recipes/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch +++ b/recipes/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch @@ -1,6 +1,6 @@ -diff -Nurp ../linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S ./arch/arm/boot/compressed/head-at91rm9200.S ---- ../linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S 2007-06-12 22:29:12.000000000 +0200 -+++ ./arch/arm/boot/compressed/head-at91rm9200.S 2007-06-12 02:57:07.000000000 +0200 +diff -Nurp linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S b/arch/arm/boot/compressed/head-at91rm9200.S +--- linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S 2007-06-12 22:29:12.000000000 +0200 ++++ b/arch/arm/boot/compressed/head-at91rm9200.S 2007-06-12 02:57:07.000000000 +0200 @@ -73,6 +73,12 @@ cmp r7, r3 beq 99f @@ -14,9 +14,9 @@ diff -Nurp ../linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S ./arch/a @ Unknown board, use the AT91RM9200DK board @ mov r7, #MACH_TYPE_AT91RM9200 mov r7, #(MACH_TYPE_AT91RM9200DK & 0xff) -diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c ./arch/arm/mach-at91/board-sarge.c ---- ../linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./arch/arm/mach-at91/board-sarge.c 2007-06-12 02:57:07.000000000 +0200 +diff -Nurp linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c b/arch/arm/mach-at91/board-sarge.c +--- linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/arch/arm/mach-at91/board-sarge.c 2007-06-12 02:57:07.000000000 +0200 @@ -0,0 +1,190 @@ +/* + * linux/arch/arm/mach-at91/board-sarge.c @@ -208,9 +208,9 @@ diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c ./arch/arm/mach-at + .init_irq = sarge_init_irq, + .init_machine = sarge_board_init, +MACHINE_END -diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/Kconfig ./arch/arm/mach-at91/Kconfig ---- ../linux-2.6.21.4/arch/arm/mach-at91/Kconfig 2007-06-12 22:29:12.000000000 +0200 -+++ ./arch/arm/mach-at91/Kconfig 2007-06-12 03:00:28.000000000 +0200 +diff -Nurp linux-2.6.21.4/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig +--- linux-2.6.21.4/arch/arm/mach-at91/Kconfig 2007-06-12 22:29:12.000000000 +0200 ++++ b/arch/arm/mach-at91/Kconfig 2007-06-12 03:00:28.000000000 +0200 @@ -90,6 +90,13 @@ config MACH_KAFA help Select this if you are using Sperry-Sun's KAFA board. @@ -225,9 +225,9 @@ diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/Kconfig ./arch/arm/mach-at91/Kco config MACH_CHUB bool "Promwad Chub board" depends on ARCH_AT91RM9200 -diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/Makefile ./arch/arm/mach-at91/Makefile ---- ../linux-2.6.21.4/arch/arm/mach-at91/Makefile 2007-06-12 22:29:12.000000000 +0200 -+++ ./arch/arm/mach-at91/Makefile 2007-06-12 03:00:47.000000000 +0200 +diff -Nurp linux-2.6.21.4/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile +--- linux-2.6.21.4/arch/arm/mach-at91/Makefile 2007-06-12 22:29:12.000000000 +0200 ++++ b/arch/arm/mach-at91/Makefile 2007-06-12 03:00:47.000000000 +0200 @@ -29,6 +29,7 @@ obj-$(CONFIG_MACH_KB9200) += board-kb920 obj-$(CONFIG_MACH_ATEB9200) += board-eb9200.o obj-$(CONFIG_MACH_KAFA) += board-kafa.o diff --git a/recipes/linux/linux/sarge-at91/2.6.21-sarge-mmc.patch b/recipes/linux/linux/sarge-at91/2.6.21-sarge-mmc.patch index 01bbaeb73e..08c3e735ff 100644 --- a/recipes/linux/linux/sarge-at91/2.6.21-sarge-mmc.patch +++ b/recipes/linux/linux/sarge-at91/2.6.21-sarge-mmc.patch @@ -1,6 +1,6 @@ -diff -Nurp ../linux-2.6.21.4/drivers/mmc/at91_mci.c ./drivers/mmc/at91_mci.c ---- ../linux-2.6.21.4/drivers/mmc/at91_mci.c 2007-06-12 22:29:12.000000000 +0200 -+++ ./drivers/mmc/at91_mci.c 2007-06-12 03:52:55.000000000 +0200 +diff -Nurp linux-2.6.21.4/drivers/mmc/at91_mci.c b/drivers/mmc/at91_mci.c +--- linux-2.6.21.4/drivers/mmc/at91_mci.c 2007-06-12 22:29:12.000000000 +0200 ++++ b/drivers/mmc/at91_mci.c 2007-06-12 03:52:55.000000000 +0200 @@ -421,8 +421,11 @@ static unsigned int at91_mci_send_comman if (cmd->opcode == MMC_STOP_TRANSMISSION) cmdr |= AT91_MCI_TRCMD_STOP; @@ -29,9 +29,9 @@ diff -Nurp ../linux-2.6.21.4/drivers/mmc/at91_mci.c ./drivers/mmc/at91_mci.c return IRQ_HANDLED; } -diff -Nurp ../linux-2.6.21.4/drivers/mmc/mmc_block.c ./drivers/mmc/mmc_block.c ---- ../linux-2.6.21.4/drivers/mmc/mmc_block.c 2007-06-07 23:27:31.000000000 +0200 -+++ ./drivers/mmc/mmc_block.c 2007-06-12 04:19:36.000000000 +0200 +diff -Nurp linux-2.6.21.4/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c +--- linux-2.6.21.4/drivers/mmc/mmc_block.c 2007-06-07 23:27:31.000000000 +0200 ++++ b/drivers/mmc/mmc_block.c 2007-06-12 04:19:36.000000000 +0200 @@ -256,10 +256,24 @@ static int mmc_blk_issue_rq(struct mmc_q * this rule as they support querying the number of * successfully written sectors. @@ -58,9 +58,9 @@ diff -Nurp ../linux-2.6.21.4/drivers/mmc/mmc_block.c ./drivers/mmc/mmc_block.c if (brq.data.blocks > 1) { brq.data.flags |= MMC_DATA_MULTI; -diff -Nurp ../linux-2.6.21.4/drivers/mmc/mmc.c ./drivers/mmc/mmc.c ---- ../linux-2.6.21.4/drivers/mmc/mmc.c 2007-06-07 23:27:31.000000000 +0200 -+++ ./drivers/mmc/mmc.c 2007-06-12 04:10:05.000000000 +0200 +diff -Nurp linux-2.6.21.4/drivers/mmc/mmc.c b/drivers/mmc/mmc.c +--- linux-2.6.21.4/drivers/mmc/mmc.c 2007-06-07 23:27:31.000000000 +0200 ++++ b/drivers/mmc/mmc.c 2007-06-12 04:10:05.000000000 +0200 @@ -1500,12 +1500,22 @@ static void mmc_setup(struct mmc_host *h mmc_set_ios(host); diff --git a/recipes/linux/linux/sarge-at91/2.6.21-sarge-phy.patch b/recipes/linux/linux/sarge-at91/2.6.21-sarge-phy.patch index 25ce15eb94..5cdc73b4dd 100644 --- a/recipes/linux/linux/sarge-at91/2.6.21-sarge-phy.patch +++ b/recipes/linux/linux/sarge-at91/2.6.21-sarge-phy.patch @@ -1,6 +1,6 @@ -diff -Nurp ../linux-2.6.21.4/drivers/net/arm/at91_ether.c ./drivers/net/arm/at91_ether.c ---- ../linux-2.6.21.4/drivers/net/arm/at91_ether.c 2007-06-12 22:29:12.000000000 +0200 -+++ ./drivers/net/arm/at91_ether.c 2007-06-12 03:11:16.000000000 +0200 +diff -Nurp linux-2.6.21.4/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c +--- linux-2.6.21.4/drivers/net/arm/at91_ether.c 2007-06-12 22:29:12.000000000 +0200 ++++ b/drivers/net/arm/at91_ether.c 2007-06-12 03:11:16.000000000 +0200 @@ -235,6 +235,11 @@ static irqreturn_t at91ether_phy_interru if (!(phy & (1 << 7))) goto done; @@ -54,9 +54,9 @@ diff -Nurp ../linux-2.6.21.4/drivers/net/arm/at91_ether.c ./drivers/net/arm/at91 detected = at91ether_setup(phy_id, phy_address, pdev, ether_clk); break; } -diff -Nurp ../linux-2.6.21.4/drivers/net/arm/at91_ether.h ./drivers/net/arm/at91_ether.h ---- ../linux-2.6.21.4/drivers/net/arm/at91_ether.h 2007-06-12 22:29:12.000000000 +0200 -+++ ./drivers/net/arm/at91_ether.h 2007-06-12 03:07:54.000000000 +0200 +diff -Nurp linux-2.6.21.4/drivers/net/arm/at91_ether.h b/drivers/net/arm/at91_ether.h +--- linux-2.6.21.4/drivers/net/arm/at91_ether.h 2007-06-12 22:29:12.000000000 +0200 ++++ b/drivers/net/arm/at91_ether.h 2007-06-12 03:07:54.000000000 +0200 @@ -29,6 +29,15 @@ #define MII_ISINTS_REG 19 #define MII_LEDCTRL_REG 20 @@ -73,9 +73,9 @@ diff -Nurp ../linux-2.6.21.4/drivers/net/arm/at91_ether.h ./drivers/net/arm/at91 /* Realtek RTL8201 PHY */ #define MII_RTL8201_ID 0x00008200 -diff -Nurp ../linux-2.6.21.4/drivers/net/phy/Kconfig ./drivers/net/phy/Kconfig ---- ../linux-2.6.21.4/drivers/net/phy/Kconfig 2007-06-07 23:27:31.000000000 +0200 -+++ ./drivers/net/phy/Kconfig 2007-06-12 03:12:16.000000000 +0200 +diff -Nurp linux-2.6.21.4/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig +--- linux-2.6.21.4/drivers/net/phy/Kconfig 2007-06-07 23:27:31.000000000 +0200 ++++ b/drivers/net/phy/Kconfig 2007-06-12 03:12:16.000000000 +0200 @@ -62,6 +62,12 @@ config BROADCOM_PHY ---help--- Currently supports the BCM5411, BCM5421 and BCM5461 PHYs. @@ -89,17 +89,17 @@ diff -Nurp ../linux-2.6.21.4/drivers/net/phy/Kconfig ./drivers/net/phy/Kconfig config FIXED_PHY tristate "Drivers for PHY emulation on fixed speed/link" depends on PHYLIB -diff -Nurp ../linux-2.6.21.4/drivers/net/phy/Makefile ./drivers/net/phy/Makefile ---- ../linux-2.6.21.4/drivers/net/phy/Makefile 2007-06-07 23:27:31.000000000 +0200 -+++ ./drivers/net/phy/Makefile 2007-06-12 03:12:29.000000000 +0200 +diff -Nurp linux-2.6.21.4/drivers/net/phy/Makefile b/drivers/net/phy/Makefile +--- linux-2.6.21.4/drivers/net/phy/Makefile 2007-06-07 23:27:31.000000000 +0200 ++++ b/drivers/net/phy/Makefile 2007-06-12 03:12:29.000000000 +0200 @@ -12,3 +12,4 @@ obj-$(CONFIG_SMSC_PHY) += smsc.o obj-$(CONFIG_VITESSE_PHY) += vitesse.o obj-$(CONFIG_BROADCOM_PHY) += broadcom.o obj-$(CONFIG_FIXED_PHY) += fixed.o +obj-$(CONFIG_STE100P_PHY) += ste100p.o -diff -Nurp ../linux-2.6.21.4/drivers/net/phy/ste100p.c ./drivers/net/phy/ste100p.c ---- ../linux-2.6.21.4/drivers/net/phy/ste100p.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./drivers/net/phy/ste100p.c 2007-06-12 02:52:31.000000000 +0200 +diff -Nurp linux-2.6.21.4/drivers/net/phy/ste100p.c b/drivers/net/phy/ste100p.c +--- linux-2.6.21.4/drivers/net/phy/ste100p.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/drivers/net/phy/ste100p.c 2007-06-12 02:52:31.000000000 +0200 @@ -0,0 +1,297 @@ +/* + * drivers/net/phy/ste100p.c diff --git a/recipes/matchbox-desktop/matchbox-desktop-0.8.1/enable-file-manager.patch b/recipes/matchbox-desktop/matchbox-desktop-0.8.1/enable-file-manager.patch index 01c1a0e277..ba98e3afbe 100644 --- a/recipes/matchbox-desktop/matchbox-desktop-0.8.1/enable-file-manager.patch +++ b/recipes/matchbox-desktop/matchbox-desktop-0.8.1/enable-file-manager.patch @@ -1,5 +1,5 @@ -diff -urNd ../matchbox-desktop-0.8.1-r0/matchbox-desktop-0.8.1/data/mbdesktop_modules.in matchbox-desktop-0.8.1/data/mbdesktop_modules.in ---- ../matchbox-desktop-0.8.1-r0/matchbox-desktop-0.8.1/data/mbdesktop_modules.in 2004-07-22 12:51:25.000000000 +0100 +diff -urNd matchbox-desktop-0.8.1-r0/matchbox-desktop-0.8.1/data/mbdesktop_modules.in matchbox-desktop-0.8.1/data/mbdesktop_modules.in +--- matchbox-desktop-0.8.1-r0/matchbox-desktop-0.8.1/data/mbdesktop_modules.in 2004-07-22 12:51:25.000000000 +0100 +++ matchbox-desktop-0.8.1/data/mbdesktop_modules.in 2004-09-18 15:54:52.000000000 +0100 @@ -6,4 +6,4 @@ diff --git a/recipes/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch b/recipes/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch index 45bff32b9a..b60e263445 100644 --- a/recipes/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch +++ b/recipes/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch @@ -1,5 +1,5 @@ -diff -urNd ../matchbox-panel-0.8.1-r4/matchbox-panel-0.8.1/applets/mb-applet-battery.c matchbox-panel-0.8.1/applets/mb-applet-battery.c ---- ../matchbox-panel-0.8.1-r4/matchbox-panel-0.8.1/applets/mb-applet-battery.c 2004-02-25 22:58:09.000000000 +0000 +diff -urNd matchbox-panel-0.8.1/applets/mb-applet-battery.c matchbox-panel-0.8.1/applets/mb-applet-battery.c +--- matchbox-panel-0.8.1/applets/mb-applet-battery.c 2004-02-25 22:58:09.000000000 +0000 +++ matchbox-panel-0.8.1/applets/mb-applet-battery.c 2004-09-16 12:17:58.000000000 +0100 @@ -385,8 +385,7 @@ sprintf(tray_msg, _("AC Connected\nFully charged.\n")); diff --git a/recipes/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch b/recipes/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch index 45bff32b9a..b60e263445 100644 --- a/recipes/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch +++ b/recipes/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch @@ -1,5 +1,5 @@ -diff -urNd ../matchbox-panel-0.8.1-r4/matchbox-panel-0.8.1/applets/mb-applet-battery.c matchbox-panel-0.8.1/applets/mb-applet-battery.c ---- ../matchbox-panel-0.8.1-r4/matchbox-panel-0.8.1/applets/mb-applet-battery.c 2004-02-25 22:58:09.000000000 +0000 +diff -urNd matchbox-panel-0.8.1/applets/mb-applet-battery.c matchbox-panel-0.8.1/applets/mb-applet-battery.c +--- matchbox-panel-0.8.1/applets/mb-applet-battery.c 2004-02-25 22:58:09.000000000 +0000 +++ matchbox-panel-0.8.1/applets/mb-applet-battery.c 2004-09-16 12:17:58.000000000 +0100 @@ -385,8 +385,7 @@ sprintf(tray_msg, _("AC Connected\nFully charged.\n")); diff --git a/recipes/mbmerlin/mbmerlin-0.8.1-2/fix_makefile.patch b/recipes/mbmerlin/mbmerlin-0.8.1-2/fix_makefile.patch index 0f2dabd8a3..561b221441 100644 --- a/recipes/mbmerlin/mbmerlin-0.8.1-2/fix_makefile.patch +++ b/recipes/mbmerlin/mbmerlin-0.8.1-2/fix_makefile.patch @@ -1,5 +1,5 @@ -diff -urNd ../mbmerlin-0.8.1-2-r3/mbmerlin/Makefile mbmerlin/Makefile ---- ../mbmerlin-0.8.1-2-r3/mbmerlin/Makefile 2004-07-29 21:17:13.000000000 +0100 +diff -urNd mbmerlin/Makefile mbmerlin/Makefile +--- mbmerlin/Makefile 2004-07-29 21:17:13.000000000 +0100 +++ mbmerlin/Makefile 2004-08-01 11:32:09.000000000 +0100 @@ -106,6 +106,7 @@ install mbmerlin.desktop $(DESTDIR)/usr/share/applications/inputmethods diff --git a/recipes/minipredict/minipredict/fix-include.patch b/recipes/minipredict/minipredict/fix-include.patch index ac544704d4..97a4f046f7 100644 --- a/recipes/minipredict/minipredict/fix-include.patch +++ b/recipes/minipredict/minipredict/fix-include.patch @@ -1,4 +1,4 @@ ---- ../minipredict-1.0-r0/minipredict/minipredict.c 2003-02-16 00:18:02 +00:00 +--- minipredict/minipredict.c 2003-02-16 00:18:02 +00:00 +++ minipredict/minipredict.c 2005-03-04 04:54:13 +00:00 @@ -16,7 +16,7 @@ #include diff --git a/recipes/minipredict/minipredict/fix-makefile.patch b/recipes/minipredict/minipredict/fix-makefile.patch index b46d816f46..638a15cfa8 100644 --- a/recipes/minipredict/minipredict/fix-makefile.patch +++ b/recipes/minipredict/minipredict/fix-makefile.patch @@ -1,5 +1,5 @@ -diff -urNd ../minipredict-1.0-r0/minipredict/Makefile minipredict/Makefile ---- ../minipredict-1.0-r0/minipredict/Makefile 2003-02-15 23:14:40 +00:00 +diff -urNd minipredict/Makefile minipredict/Makefile +--- minipredict/Makefile 2003-02-15 23:14:40 +00:00 +++ minipredict/Makefile 2005-03-04 05:23:24 +00:00 @@ -1,18 +1,16 @@ @@ -30,8 +30,8 @@ diff -urNd ../minipredict-1.0-r0/minipredict/Makefile minipredict/Makefile + rm -f *.o minipredict + +include Makefile.dpkg_ipkg -diff -urNd ../minipredict-1.0-r0/minipredict/Makefile.dpkg_ipkg minipredict/Makefile.dpkg_ipkg ---- ../minipredict-1.0-r0/minipredict/Makefile.dpkg_ipkg 1970-01-01 01:00:00 +01:00 +diff -urNd minipredict/Makefile.dpkg_ipkg minipredict/Makefile.dpkg_ipkg +--- minipredict/Makefile.dpkg_ipkg 1970-01-01 01:00:00 +01:00 +++ minipredict/Makefile.dpkg_ipkg 2005-03-04 04:24:46 +00:00 @@ -0,0 +1,114 @@ +## Please read the README in this directory to see how to use this diff --git a/recipes/nvidia-drivers/files/nvidia-oe-conftest.patch b/recipes/nvidia-drivers/files/nvidia-oe-conftest.patch index 6eae764d1c..aac4344709 100644 --- a/recipes/nvidia-drivers/files/nvidia-oe-conftest.patch +++ b/recipes/nvidia-drivers/files/nvidia-oe-conftest.patch @@ -1,4 +1,4 @@ ---- ../../../temp/NVIDIA-Linux-x86-1.0-8756-pkg1/usr/src/nv/Makefile.kbuild 2006-03-29 16:02:20.000000000 -0700 +--- nv/Makefile.kbuild 2006-03-29 16:02:20.000000000 -0700 +++ nv/Makefile.kbuild 2006-04-26 13:50:47.249353208 -0600 @@ -28,7 +28,7 @@ # Christian Zander (zander@mail.minion.de) (enhancements) @@ -33,7 +33,7 @@ # # Build an object file suitable for further processing by the installer and ---- ../../../temp/NVIDIA-Linux-x86-1.0-8756-pkg1/usr/src/nv/Makefile.nvidia 2006-03-29 16:02:20.000000000 -0700 +--- nv/Makefile.nvidia 2006-03-29 16:02:20.000000000 -0700 +++ nv/Makefile.nvidia 2006-04-26 13:52:19.573317832 -0600 @@ -102,7 +102,7 @@ diff --git a/recipes/rxvt-unicode/files/makefile.patch b/recipes/rxvt-unicode/files/makefile.patch index 86f82eeb4c..787e563ce1 100644 --- a/recipes/rxvt-unicode/files/makefile.patch +++ b/recipes/rxvt-unicode/files/makefile.patch @@ -1,4 +1,4 @@ ---- ../rxvt-unicode-cvs-r0/rxvt-unicode/Makefile.in 2004-08-12 22:32:40 +01:00 +--- rxvt-unicode/Makefile.in 2004-08-12 22:32:40 +01:00 +++ rxvt-unicode/Makefile.in 2004-12-24 03:09:00 +00:00 @@ -9,7 +9,7 @@ first_rule: all diff --git a/recipes/rxvt-unicode/files/signedchar.patch b/recipes/rxvt-unicode/files/signedchar.patch index 6faa175143..3adcf728e9 100644 --- a/recipes/rxvt-unicode/files/signedchar.patch +++ b/recipes/rxvt-unicode/files/signedchar.patch @@ -1,4 +1,4 @@ ---- ../rxvt-unicode-cvs-r0/rxvt-unicode/src/command.C 2004-12-21 06:43:00 +00:00 +--- rxvt-unicode/src/command.C 2004-12-21 06:43:00 +00:00 +++ rxvt-unicode/src/command.C 2004-12-24 02:31:36 +00:00 @@ -1862,7 +1862,7 @@ #endif /* NO_SCROLLBAR_REPORT */ diff --git a/recipes/rxvt-unicode/rxvt-unicode-5.3/xwc.patch b/recipes/rxvt-unicode/rxvt-unicode-5.3/xwc.patch index eb87b84b25..b1182a14cc 100644 --- a/recipes/rxvt-unicode/rxvt-unicode-5.3/xwc.patch +++ b/recipes/rxvt-unicode/rxvt-unicode-5.3/xwc.patch @@ -1,5 +1,5 @@ -diff -urNd ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C rxvt-unicode-5.3/src/screen.C ---- ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C 2005-02-22 21:39:10 +00:00 +diff -urNd rxvt-unicode-5.3/src/screen.C rxvt-unicode-5.3/src/screen.C +--- rxvt-unicode-5.3/src/screen.C 2005-02-22 21:39:10 +00:00 +++ rxvt-unicode-5.3/src/screen.C 2005-04-05 22:12:45 +01:00 @@ -3064,7 +3064,7 @@ else diff --git a/recipes/rxvt-unicode/rxvt-unicode-5.4/xwc.patch b/recipes/rxvt-unicode/rxvt-unicode-5.4/xwc.patch index eb87b84b25..b1182a14cc 100644 --- a/recipes/rxvt-unicode/rxvt-unicode-5.4/xwc.patch +++ b/recipes/rxvt-unicode/rxvt-unicode-5.4/xwc.patch @@ -1,5 +1,5 @@ -diff -urNd ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C rxvt-unicode-5.3/src/screen.C ---- ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C 2005-02-22 21:39:10 +00:00 +diff -urNd rxvt-unicode-5.3/src/screen.C rxvt-unicode-5.3/src/screen.C +--- rxvt-unicode-5.3/src/screen.C 2005-02-22 21:39:10 +00:00 +++ rxvt-unicode-5.3/src/screen.C 2005-04-05 22:12:45 +01:00 @@ -3064,7 +3064,7 @@ else diff --git a/recipes/rxvt-unicode/rxvt-unicode-5.6/xwc.patch b/recipes/rxvt-unicode/rxvt-unicode-5.6/xwc.patch index eb87b84b25..b1182a14cc 100644 --- a/recipes/rxvt-unicode/rxvt-unicode-5.6/xwc.patch +++ b/recipes/rxvt-unicode/rxvt-unicode-5.6/xwc.patch @@ -1,5 +1,5 @@ -diff -urNd ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C rxvt-unicode-5.3/src/screen.C ---- ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C 2005-02-22 21:39:10 +00:00 +diff -urNd rxvt-unicode-5.3/src/screen.C rxvt-unicode-5.3/src/screen.C +--- rxvt-unicode-5.3/src/screen.C 2005-02-22 21:39:10 +00:00 +++ rxvt-unicode-5.3/src/screen.C 2005-04-05 22:12:45 +01:00 @@ -3064,7 +3064,7 @@ else diff --git a/recipes/twin/twin-0.4.6/cross_compile.patch b/recipes/twin/twin-0.4.6/cross_compile.patch index 7f8163a78a..83b3bf7e42 100644 --- a/recipes/twin/twin-0.4.6/cross_compile.patch +++ b/recipes/twin/twin-0.4.6/cross_compile.patch @@ -1,5 +1,5 @@ -diff -urNd ../twin-0.4.6-r0/twin-0.4.6/Makefile.in twin-0.4.6/Makefile.in ---- ../twin-0.4.6-r0/twin-0.4.6/Makefile.in 2003-03-27 08:29:47 +00:00 +diff -urNd twin-0.4.6/Makefile.in twin-0.4.6/Makefile.in +--- twin-0.4.6/Makefile.in 2003-03-27 08:29:47 +00:00 +++ twin-0.4.6/Makefile.in 2004-07-27 13:04:46 +01:00 @@ -71,33 +71,33 @@ # to correctly generate include/autoconf.h @@ -55,8 +55,8 @@ diff -urNd ../twin-0.4.6-r0/twin-0.4.6/Makefile.in twin-0.4.6/Makefile.in # # was: -diff -urNd ../twin-0.4.6-r0/twin-0.4.6/configure twin-0.4.6/configure ---- ../twin-0.4.6-r0/twin-0.4.6/configure 2003-03-27 08:29:47 +00:00 +diff -urNd twin-0.4.6/configure twin-0.4.6/configure +--- twin-0.4.6/configure 2003-03-27 08:29:47 +00:00 +++ twin-0.4.6/configure 2004-07-27 13:11:21 +01:00 @@ -1235,7 +1235,7 @@ @@ -85,8 +85,8 @@ diff -urNd ../twin-0.4.6-r0/twin-0.4.6/configure twin-0.4.6/configure cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; -diff -urNd ../twin-0.4.6-r0/twin-0.4.6/configure.in twin-0.4.6/configure.in ---- ../twin-0.4.6-r0/twin-0.4.6/configure.in 2003-03-27 08:29:47 +00:00 +diff -urNd twin-0.4.6/configure.in twin-0.4.6/configure.in +--- twin-0.4.6/configure.in 2003-03-27 08:29:47 +00:00 +++ twin-0.4.6/configure.in 2004-07-27 13:18:07 +01:00 @@ -188,7 +188,7 @@ @@ -115,8 +115,8 @@ diff -urNd ../twin-0.4.6-r0/twin-0.4.6/configure.in twin-0.4.6/configure.in AC_CHECK_FUNC(crypt,,AC_CHECK_LIB(crypt,crypt)) AC_CHECK_FUNC(dlopen,,AC_CHECK_LIB(dl,dlopen)) AC_CHECK_LIB(ltdl,lt_dlopen) -diff -urNd ../twin-0.4.6-r0/twin-0.4.6/makerules twin-0.4.6/makerules ---- ../twin-0.4.6-r0/twin-0.4.6/makerules 2003-03-27 08:29:48 +00:00 +diff -urNd twin-0.4.6/makerules twin-0.4.6/makerules +--- twin-0.4.6/makerules 2003-03-27 08:29:48 +00:00 +++ twin-0.4.6/makerules 2004-07-27 13:04:46 +01:00 @@ -794,7 +794,7 @@ endif @@ -140,8 +140,8 @@ diff -urNd ../twin-0.4.6-r0/twin-0.4.6/makerules twin-0.4.6/makerules # -diff -urNd ../twin-0.4.6-r0/twin-0.4.6/scripts/mkdep.c twin-0.4.6/scripts/mkdep.c ---- ../twin-0.4.6-r0/twin-0.4.6/scripts/mkdep.c 2003-03-27 08:29:48 +00:00 +diff -urNd twin-0.4.6/scripts/mkdep.c twin-0.4.6/scripts/mkdep.c +--- twin-0.4.6/scripts/mkdep.c 2003-03-27 08:29:48 +00:00 +++ twin-0.4.6/scripts/mkdep.c 2004-07-27 13:04:46 +01:00 @@ -172,8 +172,8 @@ putchar('\n'); diff --git a/recipes/u-boot/u-boot-1.1.6/sarge-uboot.patch b/recipes/u-boot/u-boot-1.1.6/sarge-uboot.patch index 0c0d56f4d1..fadf9e2423 100644 --- a/recipes/u-boot/u-boot-1.1.6/sarge-uboot.patch +++ b/recipes/u-boot/u-boot-1.1.6/sarge-uboot.patch @@ -1,6 +1,6 @@ -diff -Nurp ../u-boot-1.1.6/arm_config.mk ./arm_config.mk ---- ../u-boot-1.1.6/arm_config.mk 2006-11-02 15:15:01.000000000 +0100 -+++ ./arm_config.mk 2007-04-23 18:07:47.000000000 +0200 +diff -Nurp u-boot-1.1.6/arm_config.mk b/arm_config.mk +--- u-boot-1.1.6/arm_config.mk 2006-11-02 15:15:01.000000000 +0100 ++++ b/arm_config.mk 2007-04-23 18:07:47.000000000 +0200 @@ -21,4 +21,6 @@ # MA 02111-1307 USA # @@ -8,14 +8,14 @@ diff -Nurp ../u-boot-1.1.6/arm_config.mk ./arm_config.mk +#PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 -msoft-float +PLATFORM_CPPFLAGS += -march=armv4t -mtune=arm920t PLATFORM_CPPFLAGS += -DCONFIG_ARM -D__ARM__ -diff -Nurp ../u-boot-1.1.6/board/sarge/config.mk ./board/sarge/config.mk ---- ../u-boot-1.1.6/board/sarge/config.mk 1970-01-01 01:00:00.000000000 +0100 -+++ ./board/sarge/config.mk 2007-03-21 00:31:33.000000000 +0100 +diff -Nurp u-boot-1.1.6/board/sarge/config.mk b/board/sarge/config.mk +--- u-boot-1.1.6/board/sarge/config.mk 1970-01-01 01:00:00.000000000 +0100 ++++ b/board/sarge/config.mk 2007-03-21 00:31:33.000000000 +0100 @@ -0,0 +1 @@ +TEXT_BASE = 0x21F00000 -diff -Nurp ../u-boot-1.1.6/board/sarge/flash.c ./board/sarge/flash.c ---- ../u-boot-1.1.6/board/sarge/flash.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./board/sarge/flash.c 2007-03-09 01:25:41.000000000 +0100 +diff -Nurp u-boot-1.1.6/board/sarge/flash.c b/board/sarge/flash.c +--- u-boot-1.1.6/board/sarge/flash.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/board/sarge/flash.c 2007-03-09 01:25:41.000000000 +0100 @@ -0,0 +1,504 @@ +/* + * (C) Copyright 2002 @@ -521,9 +521,9 @@ diff -Nurp ../u-boot-1.1.6/board/sarge/flash.c ./board/sarge/flash.c + + return ERR_OK; +} -diff -Nurp ../u-boot-1.1.6/board/sarge/Makefile ./board/sarge/Makefile ---- ../u-boot-1.1.6/board/sarge/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ ./board/sarge/Makefile 2007-03-14 01:05:48.000000000 +0100 +diff -Nurp u-boot-1.1.6/board/sarge/Makefile b/board/sarge/Makefile +--- u-boot-1.1.6/board/sarge/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ b/board/sarge/Makefile 2007-03-14 01:05:48.000000000 +0100 @@ -0,0 +1,46 @@ +# +# (C) Copyright 2007 @@ -571,9 +571,9 @@ diff -Nurp ../u-boot-1.1.6/board/sarge/Makefile ./board/sarge/Makefile +-include .depend + +######################################################################### -diff -Nurp ../u-boot-1.1.6/board/sarge/sarge_board.c ./board/sarge/sarge_board.c ---- ../u-boot-1.1.6/board/sarge/sarge_board.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./board/sarge/sarge_board.c 2007-05-11 23:45:25.000000000 +0200 +diff -Nurp u-boot-1.1.6/board/sarge/sarge_board.c b/board/sarge/sarge_board.c +--- u-boot-1.1.6/board/sarge/sarge_board.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/board/sarge/sarge_board.c 2007-05-11 23:45:25.000000000 +0200 @@ -0,0 +1,363 @@ +/* + * (C) Copyright 2007 @@ -938,9 +938,9 @@ diff -Nurp ../u-boot-1.1.6/board/sarge/sarge_board.c ./board/sarge/sarge_board.c + printf ("%4lu MB\n", nand_probe(AT91_SMARTMEDIA_BASE) >> 20); +} +#endif -diff -Nurp ../u-boot-1.1.6/board/sarge/u-boot.lds ./board/sarge/u-boot.lds ---- ../u-boot-1.1.6/board/sarge/u-boot.lds 1970-01-01 01:00:00.000000000 +0100 -+++ ./board/sarge/u-boot.lds 2007-03-09 01:25:41.000000000 +0100 +diff -Nurp u-boot-1.1.6/board/sarge/u-boot.lds b/board/sarge/u-boot.lds +--- u-boot-1.1.6/board/sarge/u-boot.lds 1970-01-01 01:00:00.000000000 +0100 ++++ b/board/sarge/u-boot.lds 2007-03-09 01:25:41.000000000 +0100 @@ -0,0 +1,57 @@ +/* + * (C) Copyright 2002 @@ -999,9 +999,9 @@ diff -Nurp ../u-boot-1.1.6/board/sarge/u-boot.lds ./board/sarge/u-boot.lds + .bss : { *(.bss) } + _end = .; +} -diff -Nurp ../u-boot-1.1.6/common/cmd_bootm.c ./common/cmd_bootm.c ---- ../u-boot-1.1.6/common/cmd_bootm.c 2006-11-02 15:15:01.000000000 +0100 -+++ ./common/cmd_bootm.c 2007-03-27 02:55:11.000000000 +0200 +diff -Nurp u-boot-1.1.6/common/cmd_bootm.c b/common/cmd_bootm.c +--- u-boot-1.1.6/common/cmd_bootm.c 2006-11-02 15:15:01.000000000 +0100 ++++ b/common/cmd_bootm.c 2007-03-27 02:55:11.000000000 +0200 @@ -79,7 +79,10 @@ DECLARE_GLOBAL_DATA_PTR; # define CHUNKSZ (64 * 1024) #endif @@ -1149,9 +1149,9 @@ diff -Nurp ../u-boot-1.1.6/common/cmd_bootm.c ./common/cmd_bootm.c #ifdef CONFIG_BZIP2 void bz_internal_error(int errcode) -diff -Nurp ../u-boot-1.1.6/cpu/arm920t/at91rm9200/Makefile ./cpu/arm920t/at91rm9200/Makefile ---- ../u-boot-1.1.6/cpu/arm920t/at91rm9200/Makefile 2006-11-02 15:15:01.000000000 +0100 -+++ ./cpu/arm920t/at91rm9200/Makefile 2007-05-13 20:19:07.000000000 +0200 +diff -Nurp u-boot-1.1.6/cpu/arm920t/at91rm9200/Makefile b/cpu/arm920t/at91rm9200/Makefile +--- u-boot-1.1.6/cpu/arm920t/at91rm9200/Makefile 2006-11-02 15:15:01.000000000 +0100 ++++ b/cpu/arm920t/at91rm9200/Makefile 2007-05-13 20:19:07.000000000 +0200 @@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).a @@ -1161,9 +1161,9 @@ diff -Nurp ../u-boot-1.1.6/cpu/arm920t/at91rm9200/Makefile ./cpu/arm920t/at91rm9 SOBJS = lowlevel_init.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -diff -Nurp ../u-boot-1.1.6/cpu/arm920t/at91rm9200/ste100p.c ./cpu/arm920t/at91rm9200/ste100p.c ---- ../u-boot-1.1.6/cpu/arm920t/at91rm9200/ste100p.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./cpu/arm920t/at91rm9200/ste100p.c 2007-05-10 02:02:34.000000000 +0200 +diff -Nurp u-boot-1.1.6/cpu/arm920t/at91rm9200/ste100p.c b/cpu/arm920t/at91rm9200/ste100p.c +--- u-boot-1.1.6/cpu/arm920t/at91rm9200/ste100p.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/cpu/arm920t/at91rm9200/ste100p.c 2007-05-10 02:02:34.000000000 +0200 @@ -0,0 +1,517 @@ +/* + * (C) Copyright 2007 @@ -1682,9 +1682,9 @@ diff -Nurp ../u-boot-1.1.6/cpu/arm920t/at91rm9200/ste100p.c ./cpu/arm920t/at91rm +#endif /* CONFIG_COMMANDS & CFG_CMD_NET */ + +#endif /* CONFIG_DRIVER_ETHER */ -diff -Nurp ../u-boot-1.1.6/drivers/dataflash.c ./drivers/dataflash.c ---- ../u-boot-1.1.6/drivers/dataflash.c 2006-11-02 15:15:01.000000000 +0100 -+++ ./drivers/dataflash.c 2007-03-19 23:43:20.000000000 +0100 +diff -Nurp u-boot-1.1.6/drivers/dataflash.c b/drivers/dataflash.c +--- u-boot-1.1.6/drivers/dataflash.c 2006-11-02 15:15:01.000000000 +0100 ++++ b/drivers/dataflash.c 2007-03-19 23:43:20.000000000 +0100 @@ -46,8 +46,8 @@ extern int AT91F_DataFlashRead (AT91PS_D unsigned long size, char *buffer); extern int AT91F_DataFlashWrite( AT91PS_DataFlash pDataFlash, @@ -1750,9 +1750,9 @@ diff -Nurp ../u-boot-1.1.6/drivers/dataflash.c ./drivers/dataflash.c return 1; } -diff -Nurp ../u-boot-1.1.6/include/asm-arm/arch-at91rm9200/AT91RM9200.h ./include/asm-arm/arch-at91rm9200/AT91RM9200.h ---- ../u-boot-1.1.6/include/asm-arm/arch-at91rm9200/AT91RM9200.h 2006-11-02 15:15:01.000000000 +0100 -+++ ./include/asm-arm/arch-at91rm9200/AT91RM9200.h 2007-03-11 16:21:22.000000000 +0100 +diff -Nurp u-boot-1.1.6/include/asm-arm/arch-at91rm9200/AT91RM9200.h b/include/asm-arm/arch-at91rm9200/AT91RM9200.h +--- u-boot-1.1.6/include/asm-arm/arch-at91rm9200/AT91RM9200.h 2006-11-02 15:15:01.000000000 +0100 ++++ b/include/asm-arm/arch-at91rm9200/AT91RM9200.h 2007-03-11 16:21:22.000000000 +0100 @@ -625,14 +625,40 @@ typedef struct _AT91S_PDC #define AT91C_PA26_TWCK ((unsigned int) 1 << 26) #define AT91C_PA31_DTXD ((unsigned int) AT91C_PIO_PA31) /* DBGU Debug Transmit Data */ @@ -1811,9 +1811,9 @@ diff -Nurp ../u-boot-1.1.6/include/asm-arm/arch-at91rm9200/AT91RM9200.h ./includ #define AT91C_PIO_PB25 ((unsigned int) 1 << 25) /* Pin Controlled by PB25 */ #define AT91C_PB25_DSR1 ((unsigned int) AT91C_PIO_PB25) /* USART 1 Data Set ready */ #define AT91C_PB25_EF100 ((unsigned int) AT91C_PIO_PB25) /* Ethernet MAC Force 100 Mbits */ -diff -Nurp ../u-boot-1.1.6/include/asm-arm/arch-at91rm9200/mmc.h ./include/asm-arm/arch-at91rm9200/mmc.h ---- ../u-boot-1.1.6/include/asm-arm/arch-at91rm9200/mmc.h 1970-01-01 01:00:00.000000000 +0100 -+++ ./include/asm-arm/arch-at91rm9200/mmc.h 2006-10-13 20:55:04.000000000 +0200 +diff -Nurp u-boot-1.1.6/include/asm-arm/arch-at91rm9200/mmc.h b/include/asm-arm/arch-at91rm9200/mmc.h +--- u-boot-1.1.6/include/asm-arm/arch-at91rm9200/mmc.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/include/asm-arm/arch-at91rm9200/mmc.h 2006-10-13 20:55:04.000000000 +0200 @@ -0,0 +1,117 @@ +/* + * linux/include/linux/mmc/mmc.h @@ -1932,9 +1932,9 @@ diff -Nurp ../u-boot-1.1.6/include/asm-arm/arch-at91rm9200/mmc.h ./include/asm-a +extern void mmc_release_host(struct mmc_host *host); + +#endif -diff -Nurp ../u-boot-1.1.6/include/at91rm9200_net.h ./include/at91rm9200_net.h ---- ../u-boot-1.1.6/include/at91rm9200_net.h 2006-11-02 15:15:01.000000000 +0100 -+++ ./include/at91rm9200_net.h 2007-05-04 22:14:56.000000000 +0200 +diff -Nurp u-boot-1.1.6/include/at91rm9200_net.h b/include/at91rm9200_net.h +--- u-boot-1.1.6/include/at91rm9200_net.h 2006-11-02 15:15:01.000000000 +0100 ++++ b/include/at91rm9200_net.h 2007-05-04 22:14:56.000000000 +0200 @@ -38,6 +38,7 @@ typedef struct _AT91S_PhyOps unsigned int (*IsPhyConnected)(AT91S_EMAC *pmac); unsigned char (*GetLinkSpeed)(AT91S_EMAC *pmac); @@ -1943,9 +1943,9 @@ diff -Nurp ../u-boot-1.1.6/include/at91rm9200_net.h ./include/at91rm9200_net.h } AT91S_PhyOps,*AT91PS_PhyOps; -diff -Nurp ../u-boot-1.1.6/include/configs/sarge.h ./include/configs/sarge.h ---- ../u-boot-1.1.6/include/configs/sarge.h 1970-01-01 01:00:00.000000000 +0100 -+++ ./include/configs/sarge.h 2007-05-10 00:02:56.000000000 +0200 +diff -Nurp u-boot-1.1.6/include/configs/sarge.h b/include/configs/sarge.h +--- u-boot-1.1.6/include/configs/sarge.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/include/configs/sarge.h 2007-05-10 00:02:56.000000000 +0200 @@ -0,0 +1,281 @@ +/* + * Grzegorz Rajtar @@ -2228,9 +2228,9 @@ diff -Nurp ../u-boot-1.1.6/include/configs/sarge.h ./include/configs/sarge.h +#define CONFIG_LOADADDR 0x21000000 +#define CONFIG_NFSARGS "mem=32M console=ttyS0,115200n8 root=/dev/nfs nfsroot=192.168.0.200:/tftp/at91/rootfs,timeo=200,retrans=500 ip=:::::eth0:on" +#endif -diff -Nurp ../u-boot-1.1.6/include/dataflash.h ./include/dataflash.h ---- ../u-boot-1.1.6/include/dataflash.h 2006-11-02 15:15:01.000000000 +0100 -+++ ./include/dataflash.h 2007-03-19 23:29:49.000000000 +0100 +diff -Nurp u-boot-1.1.6/include/dataflash.h b/include/dataflash.h +--- u-boot-1.1.6/include/dataflash.h 2006-11-02 15:15:01.000000000 +0100 ++++ b/include/dataflash.h 2007-03-19 23:29:49.000000000 +0100 @@ -79,6 +79,7 @@ typedef struct _AT91S_Dataflash { int page_offset; /* page offset in command */ int byte_mask; /* byte mask in command */ @@ -2248,9 +2248,9 @@ diff -Nurp ../u-boot-1.1.6/include/dataflash.h ./include/dataflash.h /* DataFlash return value */ #define DATAFLASH_BUSY 0x00 -diff -Nurp ../u-boot-1.1.6/include/_exports.h ./include/_exports.h ---- ../u-boot-1.1.6/include/_exports.h 2006-11-02 15:15:01.000000000 +0100 -+++ ./include/_exports.h 2007-03-15 23:41:08.000000000 +0100 +diff -Nurp u-boot-1.1.6/include/_exports.h b/include/_exports.h +--- u-boot-1.1.6/include/_exports.h 2006-11-02 15:15:01.000000000 +0100 ++++ b/include/_exports.h 2007-03-15 23:41:08.000000000 +0100 @@ -18,4 +18,4 @@ EXPORT_FUNC(simple_strtoul) #if (CONFIG_COMMANDS & CFG_CMD_I2C) EXPORT_FUNC(i2c_write) @@ -2258,9 +2258,9 @@ diff -Nurp ../u-boot-1.1.6/include/_exports.h ./include/_exports.h -#endif /* CFG_CMD_I2C */ +#endif /* CFG_CMD_I2C */ \ Brak znaku nowej linii na końcu pliku -diff -Nurp ../u-boot-1.1.6/include/gunzip.h ./include/gunzip.h ---- ../u-boot-1.1.6/include/gunzip.h 1970-01-01 01:00:00.000000000 +0100 -+++ ./include/gunzip.h 2007-03-21 23:23:36.000000000 +0100 +diff -Nurp u-boot-1.1.6/include/gunzip.h b/include/gunzip.h +--- u-boot-1.1.6/include/gunzip.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/include/gunzip.h 2007-03-21 23:23:36.000000000 +0100 @@ -0,0 +1,73 @@ +#ifndef _GUNZIP_H +#define _GUNZIP_H @@ -2335,9 +2335,9 @@ diff -Nurp ../u-boot-1.1.6/include/gunzip.h ./include/gunzip.h + unsigned char *outbuf, unsigned long *outsize); + +#endif /* _GUNZIP_H */ -diff -Nurp ../u-boot-1.1.6/include/ste100p.h ./include/ste100p.h ---- ../u-boot-1.1.6/include/ste100p.h 1970-01-01 01:00:00.000000000 +0100 -+++ ./include/ste100p.h 2007-05-05 01:38:11.000000000 +0200 +diff -Nurp u-boot-1.1.6/include/ste100p.h b/include/ste100p.h +--- u-boot-1.1.6/include/ste100p.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/include/ste100p.h 2007-05-05 01:38:11.000000000 +0200 @@ -0,0 +1,163 @@ +#ifndef _ste100p_h_ +#define _ste100p_h_ @@ -2502,9 +2502,9 @@ diff -Nurp ../u-boot-1.1.6/include/ste100p.h ./include/ste100p.h +UCHAR ste100p_AutoNegotiate (AT91PS_EMAC p_mac, int *status); + +#endif // _ste100p_h_ -diff -Nurp ../u-boot-1.1.6/lib_arm/armlinux.c ./lib_arm/armlinux.c ---- ../u-boot-1.1.6/lib_arm/armlinux.c 2006-11-02 15:15:01.000000000 +0100 -+++ ./lib_arm/armlinux.c 2007-05-05 01:28:02.000000000 +0200 +diff -Nurp u-boot-1.1.6/lib_arm/armlinux.c b/lib_arm/armlinux.c +--- u-boot-1.1.6/lib_arm/armlinux.c 2006-11-02 15:15:01.000000000 +0100 ++++ b/lib_arm/armlinux.c 2007-05-05 01:28:02.000000000 +0200 @@ -62,6 +62,10 @@ static void setup_end_tag (bd_t *bd); static void setup_videolfb_tag (gd_t *gd); # endif @@ -2564,9 +2564,9 @@ diff -Nurp ../u-boot-1.1.6/lib_arm/armlinux.c ./lib_arm/armlinux.c params = tag_next (params); } #endif /* CONFIG_INITRD_TAG */ -diff -Nurp ../u-boot-1.1.6/lib_arm/board.c ./lib_arm/board.c ---- ../u-boot-1.1.6/lib_arm/board.c 2006-11-02 15:15:01.000000000 +0100 -+++ ./lib_arm/board.c 2007-05-04 23:21:40.000000000 +0200 +diff -Nurp u-boot-1.1.6/lib_arm/board.c b/lib_arm/board.c +--- u-boot-1.1.6/lib_arm/board.c 2006-11-02 15:15:01.000000000 +0100 ++++ b/lib_arm/board.c 2007-05-04 23:21:40.000000000 +0200 @@ -94,6 +94,8 @@ void mem_malloc_init (ulong dest_addr) mem_malloc_end = dest_addr + CFG_MALLOC_LEN; mem_malloc_brk = mem_malloc_start; @@ -2604,9 +2604,9 @@ diff -Nurp ../u-boot-1.1.6/lib_arm/board.c ./lib_arm/board.c /* main_loop() can return to retry autoboot, if so just run it again. */ for (;;) { main_loop (); -diff -Nurp ../u-boot-1.1.6/lib_generic/gunzip.c ./lib_generic/gunzip.c ---- ../u-boot-1.1.6/lib_generic/gunzip.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./lib_generic/gunzip.c 2007-03-22 00:44:21.000000000 +0100 +diff -Nurp u-boot-1.1.6/lib_generic/gunzip.c b/lib_generic/gunzip.c +--- u-boot-1.1.6/lib_generic/gunzip.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/lib_generic/gunzip.c 2007-03-22 00:44:21.000000000 +0100 @@ -0,0 +1,613 @@ +#include "gunzip.h" + @@ -3221,9 +3221,9 @@ diff -Nurp ../u-boot-1.1.6/lib_generic/gunzip.c ./lib_generic/gunzip.c + + return 0; +} -diff -Nurp ../u-boot-1.1.6/lib_generic/Makefile ./lib_generic/Makefile ---- ../u-boot-1.1.6/lib_generic/Makefile 2006-11-02 15:15:01.000000000 +0100 -+++ ./lib_generic/Makefile 2007-03-25 17:49:13.000000000 +0200 +diff -Nurp u-boot-1.1.6/lib_generic/Makefile b/lib_generic/Makefile +--- u-boot-1.1.6/lib_generic/Makefile 2006-11-02 15:15:01.000000000 +0100 ++++ b/lib_generic/Makefile 2007-03-25 17:49:13.000000000 +0200 @@ -28,7 +28,8 @@ LIB = $(obj)libgeneric.a COBJS = bzlib.o bzlib_crctable.o bzlib_decompress.o \ bzlib_randtable.o bzlib_huffman.o \ @@ -3235,9 +3235,9 @@ diff -Nurp ../u-boot-1.1.6/lib_generic/Makefile ./lib_generic/Makefile SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) Pliki ../u-boot-1.1.6/loader-sarge i ./loader-sarge różnią się -diff -Nurp ../u-boot-1.1.6/Makefile ./Makefile ---- ../u-boot-1.1.6/Makefile 2006-11-02 15:15:01.000000000 +0100 -+++ ./Makefile 2007-03-29 20:07:54.000000000 +0200 +diff -Nurp u-boot-1.1.6/Makefile b/Makefile +--- u-boot-1.1.6/Makefile 2006-11-02 15:15:01.000000000 +0100 ++++ b/Makefile 2007-03-29 20:07:54.000000000 +0200 @@ -1882,6 +1882,9 @@ smdk2410_config : unconfig SX1_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm925t sx1 @@ -3248,9 +3248,9 @@ diff -Nurp ../u-boot-1.1.6/Makefile ./Makefile # TRAB default configuration: 8 MB Flash, 32 MB RAM trab_config \ trab_bigram_config \ -diff -Nurp ../u-boot-1.1.6/net/bootp.c ./net/bootp.c ---- ../u-boot-1.1.6/net/bootp.c 2006-11-02 15:15:01.000000000 +0100 -+++ ./net/bootp.c 2007-05-09 23:46:31.000000000 +0200 +diff -Nurp u-boot-1.1.6/net/bootp.c b/net/bootp.c +--- u-boot-1.1.6/net/bootp.c 2006-11-02 15:15:01.000000000 +0100 ++++ b/net/bootp.c 2007-05-09 23:46:31.000000000 +0200 @@ -35,7 +35,7 @@ #define TIMEOUT 5 /* Seconds before trying BOOTP again */ @@ -3260,9 +3260,9 @@ diff -Nurp ../u-boot-1.1.6/net/bootp.c ./net/bootp.c #else # define TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT) #endif -diff -Nurp ../u-boot-1.1.6/net/eth.c ./net/eth.c ---- ../u-boot-1.1.6/net/eth.c 2006-11-02 15:15:01.000000000 +0100 -+++ ./net/eth.c 2007-05-09 23:47:19.000000000 +0200 +diff -Nurp u-boot-1.1.6/net/eth.c b/net/eth.c +--- u-boot-1.1.6/net/eth.c 2006-11-02 15:15:01.000000000 +0100 ++++ b/net/eth.c 2007-05-09 23:47:19.000000000 +0200 @@ -397,10 +397,10 @@ int eth_send(volatile void *packet, int } @@ -3276,9 +3276,9 @@ diff -Nurp ../u-boot-1.1.6/net/eth.c ./net/eth.c return eth_current->recv(eth_current); } -diff -Nurp ../u-boot-1.1.6/net/Makefile ./net/Makefile ---- ../u-boot-1.1.6/net/Makefile 2006-11-02 15:15:01.000000000 +0100 -+++ ./net/Makefile 2007-05-09 23:52:55.000000000 +0200 +diff -Nurp u-boot-1.1.6/net/Makefile b/net/Makefile +--- u-boot-1.1.6/net/Makefile 2006-11-02 15:15:01.000000000 +0100 ++++ b/net/Makefile 2007-05-09 23:52:55.000000000 +0200 @@ -23,7 +23,7 @@ include $(TOPDIR)/config.mk @@ -3288,9 +3288,9 @@ diff -Nurp ../u-boot-1.1.6/net/Makefile ./net/Makefile LIB = $(obj)libnet.a -diff -Nurp ../u-boot-1.1.6/net/net.c ./net/net.c ---- ../u-boot-1.1.6/net/net.c 2006-11-02 15:15:01.000000000 +0100 -+++ ./net/net.c 2007-05-09 23:47:40.000000000 +0200 +diff -Nurp u-boot-1.1.6/net/net.c b/net/net.c +--- u-boot-1.1.6/net/net.c 2006-11-02 15:15:01.000000000 +0100 ++++ b/net/net.c 2007-05-09 23:47:40.000000000 +0200 @@ -78,6 +78,7 @@ #include #include diff --git a/recipes/udf/udftools/patch-04-wrudf-gcc4.diff b/recipes/udf/udftools/patch-04-wrudf-gcc4.diff index 13690123a5..c1234afad7 100644 --- a/recipes/udf/udftools/patch-04-wrudf-gcc4.diff +++ b/recipes/udf/udftools/patch-04-wrudf-gcc4.diff @@ -38,9 +38,9 @@ to 'libreadline5-dev'. Regards Andreas Jochens -diff -urN ../tmp-orig/udftools-1.0.0b3/wrudf/wrudf.c ./wrudf/wrudf.c ---- ../tmp-orig/udftools-1.0.0b3/wrudf/wrudf.c 2002-11-26 08:18:51.000000000 +0100 -+++ ./wrudf/wrudf.c 2005-01-04 16:56:49.394078200 +0100 +diff -urN udftools-1.0.0b3/wrudf/wrudf.c b/wrudf/wrudf.c +--- udftools-1.0.0b3/wrudf/wrudf.c 2002-11-26 08:18:51.000000000 +0100 ++++ b/wrudf/wrudf.c 2005-01-04 16:56:49.394078200 +0100 @@ -245,7 +245,7 @@ } else if( strncmp( spm->partIdent.ident, UDF_ID_VIRTUAL, strlen(UDF_ID_VIRTUAL)) == 0 ) virtualPartitionNum = i; @@ -50,4 +50,3 @@ diff -urN ../tmp-orig/udftools-1.0.0b3/wrudf/wrudf.c ./wrudf/wrudf.c } if( medium == CDR ) { -diff -urN ../tmp-orig/udftools-1.0.0b3/debian/control ./debian/control From 982d2187f80ee164287c848955e15636c6180d0a Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 31 Mar 2011 10:09:27 -0700 Subject: [PATCH 304/509] opie-sh: Switch to patchdir rather than applying in do_configure Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/opie-sh/opie-sh_1.2.4.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/recipes/opie-sh/opie-sh_1.2.4.bb b/recipes/opie-sh/opie-sh_1.2.4.bb index c34fb48ed1..a656513d45 100644 --- a/recipes/opie-sh/opie-sh_1.2.4.bb +++ b/recipes/opie-sh/opie-sh_1.2.4.bb @@ -9,7 +9,7 @@ SRC_URI = "http://sources.openembedded.org/opie-1.2.4-split_noncore_tools_opie-s http://sources.openembedded.org/opie-1.2.4-split_apps.tar.bz2;name=split_apps \ http://sources.openembedded.org/opie-1.2.4-split_bin.tar.bz2;name=split_bin \ file://opie-sh-path.patch \ - file://opie-sh-fsmounter-name.patch;apply=false" + file://opie-sh-fsmounter-name.patch;patchdir=${WORKDIR}/apps" SRC_URI[split_noncore_tools_opie-sh.md5sum] = "bc57f7ab07181c122ebc382e302bb594" SRC_URI[split_noncore_tools_opie-sh.sha256sum] = "a1305994918160449177b24efe384a0de87dc9dfcecf476e33b87cf8999b5bb1" SRC_URI[split_pics.md5sum] = "5499dc84b65395ab99bda6ed9d01ff0f" @@ -22,7 +22,3 @@ SRC_URI[split_apps.md5sum] = "67a43e8e4bcd9e63b884ea25deea5b34" SRC_URI[split_apps.sha256sum] = "a33a55efb4ae4c15a8c2c5d6faba6d671a5652da8e216ce35088896fe597215b" SRC_URI[split_bin.md5sum] = "d63089ebb9a87636e30fecefcc5b2cb8" SRC_URI[split_bin.sha256sum] = "8caf1981a2463029c1a27d965af8573d46b8e2ab818fb61b8e73ff40e43aab0c" - -do_configure_prepend() { - (cd .. ; patch -p0 -i ${WORKDIR}/opie-sh-fsmounter-name.patch) -} From 6d3cbad2e6caa992d5673e303049a79b3056db60 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 31 Mar 2011 10:09:36 -0700 Subject: [PATCH 305/509] poboxserver: Switch to patchdir rather than applying in do_configure Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/poboxserver/poboxserver_1.2.5.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/recipes/poboxserver/poboxserver_1.2.5.bb b/recipes/poboxserver/poboxserver_1.2.5.bb index 4ff581d95a..2a6305ef84 100644 --- a/recipes/poboxserver/poboxserver_1.2.5.bb +++ b/recipes/poboxserver/poboxserver_1.2.5.bb @@ -8,7 +8,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/pobox-${PV}.tar.bz2;name=archive \ http://www.vanille.de/mirror/pbserver-${PV}.tar.gz;name=pbserver \ file://OpenPOBox-1.25.diff \ file://remove-local-includes.patch \ - file://unicode.patch;apply=false \ + file://unicode.patch;patchdir=${WORKDIR}/pbserver \ file://pbserver.sh" S = "${WORKDIR}/OpenPOBox" @@ -21,10 +21,6 @@ INITSCRIPT_PARAMS = "start 99 5 . stop 01 0 ." EXTRA_OECONF = "--enable-lookup" PARALLEL_MAKE = "" -do_configure_prepend() { - (cd ${WORKDIR} ; patch -p0 -i unicode.patch) -} - do_compile() { oe_runmake cp ${S}/dict/data/fugodic ${WORKDIR}/pbserver/fugodic.txt From e7f7a8c1a360c6f84e5d608102965abfe14ea33f Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 31 Mar 2011 10:09:52 -0700 Subject: [PATCH 306/509] qscintilla: Switch to patchdir rather than applying in do_configure Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/qscintilla/qscintilla_1.65-gpl-1.6.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/recipes/qscintilla/qscintilla_1.65-gpl-1.6.bb b/recipes/qscintilla/qscintilla_1.65-gpl-1.6.bb index a88bf372b2..1e1b3a4f44 100644 --- a/recipes/qscintilla/qscintilla_1.65-gpl-1.6.bb +++ b/recipes/qscintilla/qscintilla_1.65-gpl-1.6.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" PR = "r1" SRC_URI = "http://www.mneuroth.de/privat/zaurus/qscintilla-${PV}_zaurus.tar.gz \ - file://no-external-lexers.patch;apply=false" + file://no-external-lexers.patch;patchdir=..;striplevel=0" S = "${WORKDIR}/qscintilla-${PV}/qt" @@ -22,10 +22,6 @@ EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${S}/patches \ PARALLEL_MAKE = "" -do_configure_prepend() { - (cd .. ; patch -p0 -i ${WORKDIR}/no-external-lexers.patch) -} - do_install() { install -d ${D}${libdir} ${D}${includedir} oe_libinstall -so libqscintilla ${D}${libdir} From 550a2a1702e8cdba9f1d461a02b87ccad648d32d Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 31 Mar 2011 10:10:22 -0700 Subject: [PATCH 307/509] xqt2: Switch to patchdir rather than applying in do_configure Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/xqt2/xqt2_20060509.bb | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/recipes/xqt2/xqt2_20060509.bb b/recipes/xqt2/xqt2_20060509.bb index 627c9179a8..3435b6472b 100644 --- a/recipes/xqt2/xqt2_20060509.bb +++ b/recipes/xqt2/xqt2_20060509.bb @@ -20,26 +20,15 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/xqt;module=xqt2;method=pse file://fephack.patch \ file://xchar2b.patch \ file://xqt-make.patch \ - file://KeyMap.patch;apply=false \ - file://moc_call.patch;apply=false \ - file://fix_qtscreen_HACK.patch;apply=false \ - file://fix_seqfault_qtscreen.patch;apply=false" + file://KeyMap.patch;patchdir=../xqt2 \ + file://moc_call.patch;patchdir=../xqt2 \ + file://fix_qtscreen_HACK.patch;patchdir=../xqt2 \ + file://fix_seqfault_qtscreen.patch;patchdir=../xqt2" S = "${WORKDIR}/xc" QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' QT_LIBRARY_append_c7x0 = " -laticore" -do_patch_xqt2() { - # Apply xqt2 patches. - cd ${WORKDIR}/xqt2 - patch -p1 -i ${WORKDIR}/KeyMap.patch - patch -p1 -i ${WORKDIR}/moc_call.patch - patch -p1 -i ${WORKDIR}/fix_qtscreen_HACK.patch - patch -p1 -i ${WORKDIR}/fix_seqfault_qtscreen.patch -} - -addtask patch_xqt2 after do_unpack before do_configure - do_configure() { #general config From 8863dc08ed5e4547290ef7ac2026c879771df8f5 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 31 Mar 2011 10:20:42 -0700 Subject: [PATCH 308/509] samba: Switch to patchdir rather than applying in do_configure Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/samba/samba_3.5.6.bb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/recipes/samba/samba_3.5.6.bb b/recipes/samba/samba_3.5.6.bb index 72bada9286..7b82849147 100644 --- a/recipes/samba/samba_3.5.6.bb +++ b/recipes/samba/samba_3.5.6.bb @@ -10,7 +10,7 @@ S = "${WORKDIR}/samba-${PV}/source3" DEFAULT_PREFERENCE = "-1" SRC_URI += "file://config-h.patch \ - file://tdbheaderfix.patch;apply=no" + file://tdbheaderfix.patch;patchdir=.." PR = "r0" @@ -27,11 +27,6 @@ EXTRA_OECONF += "\ " do_configure() { - # Patches we must apply by hand due to layout. - cd .. - patch -p1 -i ${WORKDIR}/tdbheaderfix.patch - cd source3 - oe_runconf } From e513d9caa1e64d5ea87600d93757195a63405f51 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 31 Mar 2011 10:21:07 -0700 Subject: [PATCH 309/509] vim: Switch to patchdir rather than applying in do_configure Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/vim/vim_7.2.bb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/recipes/vim/vim_7.2.bb b/recipes/vim/vim_7.2.bb index 6e1499197a..1ff1434006 100644 --- a/recipes/vim/vim_7.2.bb +++ b/recipes/vim/vim_7.2.bb @@ -14,17 +14,10 @@ require vim.inc PR = "${INC_PR}.3" # 001-411.diff contains 411 patches fetched from upstream -SRC_URI += "file://001-411.diff;apply=no" -SRC_URI += "file://configure.in_remove_CC_quotes.patch;apply=no" +SRC_URI += "file://001-411.diff;patchdir=.." +SRC_URI += "file://configure.in_remove_CC_quotes.patch;patchdir=.." SRC_URI += "file://vimrc" -# we need to apply patches in other dir then ${S} -do_patch() { - cd ${WORKDIR}/vim${VIMVER} - patch -p1 <${WORKDIR}/001-411.diff - patch -p1 <${WORKDIR}/configure.in_remove_CC_quotes.patch -} - do_install_append() { install -m 0644 ${WORKDIR}/vimrc ${D}/${datadir}/vim } From 8164ef35e316340b2185377cb5e1aa86dfe36d3e Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Fri, 22 Apr 2011 14:22:55 +0200 Subject: [PATCH 310/509] qt4-embedded: enable support for the built-in LinuxInput keyboard driver Signed-off-by: Koen Kooi --- recipes/qt4/qt4-embedded.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc index 223c4f3ada..af9d545b1d 100644 --- a/recipes/qt4/qt4-embedded.inc +++ b/recipes/qt4/qt4-embedded.inc @@ -4,7 +4,7 @@ LICENSE = "GPL QPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS += "directfb tslib" -INC_PR = "r27" +INC_PR = "r28" QT_BASE_NAME ?= "qt4-embedded" QT_BASE_LIB ?= "libqt-embedded" @@ -34,7 +34,7 @@ QT_CONFIG_FLAGS += " \ -qtlibinfix ${QT_LIBINFIX} \ -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \ -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \ - -qt-kbd-tty \ + -qt-kbd-tty -qt-kbd-linuxinput \ -DQT_KEYPAD_NAVIGATION \ " From 41b9ff4188b70948712157bdc5a5c9b634377575 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Tue, 26 Apr 2011 09:08:37 -0400 Subject: [PATCH 311/509] uhd : Update to latest release. Both source and fpga images. Signed-off-by: Koen Kooi --- recipes/uhd/uhd-firmware.inc | 8 +++++--- recipes/uhd/uhd-firmware_0001.20101124013843.905f426.bb | 7 ------- recipes/uhd/uhd-firmware_003.000.001.bb | 7 +++++++ recipes/uhd/uhd_git.bb | 4 ++-- 4 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 recipes/uhd/uhd-firmware_0001.20101124013843.905f426.bb create mode 100644 recipes/uhd/uhd-firmware_003.000.001.bb diff --git a/recipes/uhd/uhd-firmware.inc b/recipes/uhd/uhd-firmware.inc index 763aa6ca56..b3c24ae7f6 100644 --- a/recipes/uhd/uhd-firmware.inc +++ b/recipes/uhd/uhd-firmware.inc @@ -2,13 +2,15 @@ DESCRIPTION = "Universal Hardware Driver Firmware" HOMEPAGE = "http://www.ettus.com" LICENSE = "GPLv3" -INC_PR = "r0" +INC_PR = "r1" PACKAGE_ARCH = "all" -SRC_URI = "http://www.ettus.com/downloads/uhd_images/UHD-images-${PV}/UHD-images-${PV}-Linux.tar.gz" +#PV_U = `echo ${PV} | sed 's/\./_/g'` -S = ${WORKDIR}/UHD-images-${PV}-Linux +SRC_URI = "http://www.ettus.com/downloads/uhd_releases/${@'${PV}'.replace('.', '_')}/images-only/UHD-images-${PV}.tar.gz" + +S = ${WORKDIR}/UHD-images-${PV} do_install() { install -d ${D}${datadir}/uhd/images diff --git a/recipes/uhd/uhd-firmware_0001.20101124013843.905f426.bb b/recipes/uhd/uhd-firmware_0001.20101124013843.905f426.bb deleted file mode 100644 index 74fa64e42b..0000000000 --- a/recipes/uhd/uhd-firmware_0001.20101124013843.905f426.bb +++ /dev/null @@ -1,7 +0,0 @@ -require recipes/uhd/uhd-firmware.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "6db20f93e3c4646395bd6e8260e2261f" -SRC_URI[sha256sum] = "4c73655519cd9f4e49e5727f094b463850b03db13d91a8b0429b789e74a9deea" - diff --git a/recipes/uhd/uhd-firmware_003.000.001.bb b/recipes/uhd/uhd-firmware_003.000.001.bb new file mode 100644 index 0000000000..59018f4fab --- /dev/null +++ b/recipes/uhd/uhd-firmware_003.000.001.bb @@ -0,0 +1,7 @@ +require recipes/uhd/uhd-firmware.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "00bf346a4e6b8fb1f0d1633e4464cd34" +SRC_URI[sha256sum] = "231e8e63b6a3348b36881540e3738912d082a74118fd439feeec32ed76b56ba3" + diff --git a/recipes/uhd/uhd_git.bb b/recipes/uhd/uhd_git.bb index cf6e7060b4..6c90ec3743 100644 --- a/recipes/uhd/uhd_git.bb +++ b/recipes/uhd/uhd_git.bb @@ -1,8 +1,8 @@ require recipes/uhd/uhd.inc -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" SRC_URI = "git://ettus.sourcerepo.com/ettus/uhd.git;protocol=git" S = "${WORKDIR}/git/host" -SRCREV = "cc639e876f326e958dace8438ae41b8cd9563780" +SRCREV = "81e891f3f38259e7450b454933c979f2d8c93d65" From 35b439f347e57256f66a07b7454bf3a26441ea6c Mon Sep 17 00:00:00 2001 From: Jeff Lance Date: Thu, 28 Apr 2011 03:07:38 +0000 Subject: [PATCH 312/509] am-benchmarks: add return values * add return values to dhrystone and linpack for automated test Signed-off-by: Jeff Lance Acked-by: Chase Maupin Signed-off-by: Koen Kooi Signed-off-by: Koen Kooi --- recipes/ti/am-benchmarks_1.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/ti/am-benchmarks_1.2.bb b/recipes/ti/am-benchmarks_1.2.bb index 38c7056ae5..21e62a75ec 100644 --- a/recipes/ti/am-benchmarks_1.2.bb +++ b/recipes/ti/am-benchmarks_1.2.bb @@ -8,7 +8,7 @@ LICENSE = "BSD" SECTION = "system" PRIORITY = "optional" -SRCREV = "60" +SRCREV = "61" PR = "r2+svnr${SRCPV}" COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x|ti814x)" From 1d15030bfb6c637b6b10638c82f23ecaedd92e81 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Apr 2011 17:09:58 +0200 Subject: [PATCH 313/509] opencv 2.2: fix opencv-dev dependency chain installing 'opencv-dev' will now drag in all the generated -dev packages Signed-off-by: Koen Kooi --- recipes/opencv/opencv_2.2.bb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/recipes/opencv/opencv_2.2.bb b/recipes/opencv/opencv_2.2.bb index 3df13df2ad..a6bc58a769 100644 --- a/recipes/opencv/opencv_2.2.bb +++ b/recipes/opencv/opencv_2.2.bb @@ -16,7 +16,7 @@ PARALLEL_MAKE = "" SRCREV = "4462" PV = "2.2.0+svnr${SRCPV}" -PR = "r1" +PR = "r2" S = "${WORKDIR}/opencv" @@ -38,6 +38,18 @@ python populate_packages_prepend () { do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) + + pn = bb.data.getVar('PN', d, 1) + metapkg = pn + '-dev' + bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d) + bb.data.setVar('FILES_' + metapkg, "", d) + blacklist = [ metapkg ] + metapkg_rdepends = [ ] + packages = bb.data.getVar('PACKAGES', d, 1).split() + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): + metapkg_rdepends.append(pkg) + bb.data.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends), d) } FILES_${PN} = "" From ed66bcc32ec9def9bbcde177dfe847c6375ff55c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 28 Apr 2011 16:21:00 +0200 Subject: [PATCH 314/509] opencv 2.2: include actual headers in the -dev package Signed-off-by: Koen Kooi --- recipes/opencv/opencv_2.2.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/opencv/opencv_2.2.bb b/recipes/opencv/opencv_2.2.bb index a6bc58a769..cc005308d1 100644 --- a/recipes/opencv/opencv_2.2.bb +++ b/recipes/opencv/opencv_2.2.bb @@ -16,7 +16,7 @@ PARALLEL_MAKE = "" SRCREV = "4462" PV = "2.2.0+svnr${SRCPV}" -PR = "r2" +PR = "r3" S = "${WORKDIR}/opencv" @@ -42,7 +42,6 @@ python populate_packages_prepend () { pn = bb.data.getVar('PN', d, 1) metapkg = pn + '-dev' bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d) - bb.data.setVar('FILES_' + metapkg, "", d) blacklist = [ metapkg ] metapkg_rdepends = [ ] packages = bb.data.getVar('PACKAGES', d, 1).split() From 55ae58de586f200ebb3a397ae95ace37e611c2ed Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 May 2011 19:47:45 +0200 Subject: [PATCH 315/509] linux-omap-psp 2.6.32: add support for 5MP camera board Also enable cpuidle for beagle Signed-off-by: Koen Kooi --- .../beagleboard/defconfig | 36 +- ...river-from-https-github.com-Aptina-B.patch | 1547 +++++++++++++++++ ...e-import-li5m03-driver-from-https-gi.patch | 294 ++++ recipes/linux/linux-omap-psp_2.6.32.bb | 4 +- 4 files changed, 1871 insertions(+), 10 deletions(-) create mode 100644 recipes/linux/linux-omap-psp-2.6.32/cam/5m03/0001-mt9p031-import-driver-from-https-github.com-Aptina-B.patch create mode 100644 recipes/linux/linux-omap-psp-2.6.32/cam/5m03/0002-board-omap3beagle-import-li5m03-driver-from-https-gi.patch diff --git a/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig b/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig index eff98b4ac3..2abbd1a7cb 100644 --- a/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig +++ b/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Wed Jul 21 12:01:38 2010 +# Sun May 1 17:33:44 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -85,7 +85,7 @@ CONFIG_KALLSYMS=y CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y -# CONFIG_ELF_CORE is not set +CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y @@ -269,6 +269,7 @@ CONFIG_MACH_OMAP3_BEAGLE=y # CONFIG_MACH_OVERO is not set # CONFIG_MACH_OMAP3EVM is not set # CONFIG_MACH_OMAP3517EVM is not set +# CONFIG_MACH_CRANEBOARD is not set # CONFIG_MACH_OMAP3_PANDORA is not set # CONFIG_MACH_OMAP3_TOUCHBOOK is not set # CONFIG_MACH_OMAP_3430SDP is not set @@ -380,9 +381,9 @@ CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_FREQ_DEBUG=y CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_STAT_DETAILS=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y @@ -390,7 +391,9 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -# CONFIG_CPU_IDLE is not set +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y # # Floating point emulation @@ -407,6 +410,7 @@ CONFIG_NEON=y # Userspace binary formats # CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_HAVE_AOUT=y CONFIG_BINFMT_AOUT=m CONFIG_BINFMT_MISC=y @@ -1617,6 +1621,7 @@ CONFIG_MFD_CORE=y # CONFIG_TPS65010 is not set CONFIG_TWL4030_CORE=y CONFIG_TWL4030_POWER=y +# CONFIG_TPS65910_CORE is not set CONFIG_TWL4030_CODEC=y # CONFIG_TWL4030_MADC is not set # CONFIG_MFD_TMIO is not set @@ -1791,7 +1796,18 @@ CONFIG_VIDEO_OMAP3=y CONFIG_VIDEO_OMAP3_ISP=y CONFIG_VIDEO_OMAP34XX_ISP_PREVIEWER=y CONFIG_VIDEO_OMAP34XX_ISP_RESIZER=y -# CONFIG_SOC_CAMERA is not set +CONFIG_SOC_CAMERA=y +# CONFIG_SOC_CAMERA_MT9M001 is not set +# CONFIG_SOC_CAMERA_MT9M111 is not set +CONFIG_SOC_CAMERA_MT9P031=m +# CONFIG_SOC_CAMERA_MT9T031 is not set +# CONFIG_SOC_CAMERA_MT9V022 is not set +# CONFIG_SOC_CAMERA_RJ54N1 is not set +# CONFIG_SOC_CAMERA_TW9910 is not set +# CONFIG_SOC_CAMERA_PLATFORM is not set +# CONFIG_SOC_CAMERA_OV772X is not set +# CONFIG_SOC_CAMERA_OV9640 is not set +# CONFIG_VIDEO_SH_MOBILE_CEU is not set CONFIG_V4L_USB_DRIVERS=y CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y @@ -3021,6 +3037,11 @@ CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_HW=y + +# +# OCF Configuration +# +# CONFIG_OCF_OCF is not set CONFIG_BINARY_PRINTF=y # @@ -3048,6 +3069,3 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_NLATTR=y -CONFIG_ELF_CORE=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set - diff --git a/recipes/linux/linux-omap-psp-2.6.32/cam/5m03/0001-mt9p031-import-driver-from-https-github.com-Aptina-B.patch b/recipes/linux/linux-omap-psp-2.6.32/cam/5m03/0001-mt9p031-import-driver-from-https-github.com-Aptina-B.patch new file mode 100644 index 0000000000..ee728b9d59 --- /dev/null +++ b/recipes/linux/linux-omap-psp-2.6.32/cam/5m03/0001-mt9p031-import-driver-from-https-github.com-Aptina-B.patch @@ -0,0 +1,1547 @@ +From eefcf5de4689fbd00119d7a7df75244ca6ca1187 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Sun, 1 May 2011 16:40:54 +0200 +Subject: [PATCH 1/2] mt9p031: import driver from https://github.com/Aptina/BeagleBoard-xM/tree/master/Angstrom/MT9P031 + +Signed-off-by: Koen Kooi +--- + drivers/media/video/Kconfig | 6 + + drivers/media/video/Makefile | 1 + + drivers/media/video/mt9p031.c | 1445 +++++++++++++++++++++++++++++++++++++++ + include/media/mt9p031.h | 30 + + include/media/v4l2-chip-ident.h | 1 + + 5 files changed, 1483 insertions(+), 0 deletions(-) + create mode 100644 drivers/media/video/mt9p031.c + create mode 100644 include/media/mt9p031.h + +diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig +index 4c1fb0f..59f1133 100644 +--- a/drivers/media/video/Kconfig ++++ b/drivers/media/video/Kconfig +@@ -832,6 +832,12 @@ config SOC_CAMERA_MT9M111 + help + This driver supports MT9M111 and MT9M112 cameras from Micron + ++config SOC_CAMERA_MT9P031 ++ tristate "mt9p031 support" ++ depends on SOC_CAMERA && I2C ++ help ++ This driver supports MT9P031 cameras from Micron. ++ + config SOC_CAMERA_MT9T031 + tristate "mt9t031 support" + depends on SOC_CAMERA && I2C +diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile +index fb7e46c..f3110e7 100644 +--- a/drivers/media/video/Makefile ++++ b/drivers/media/video/Makefile +@@ -79,6 +79,7 @@ obj-$(CONFIG_VIDEO_MT9V113) += mt9v113.o + + obj-$(CONFIG_SOC_CAMERA_MT9M001) += mt9m001.o + obj-$(CONFIG_SOC_CAMERA_MT9M111) += mt9m111.o ++obj-$(CONFIG_SOC_CAMERA_MT9P031) += mt9p031.o + obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o + obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o + obj-$(CONFIG_SOC_CAMERA_OV772X) += ov772x.o +diff --git a/drivers/media/video/mt9p031.c b/drivers/media/video/mt9p031.c +new file mode 100644 +index 0000000..3047e43 +--- /dev/null ++++ b/drivers/media/video/mt9p031.c +@@ -0,0 +1,1445 @@ ++/* ++ * drivers/media/video/mt9p031.c ++ * ++ * Aptina mt9p031 sensor driver ++ * ++ * ++ * Copyright (C) 2010 Aptina Imaging ++ * ++ * ++ * Leverage mt9p012.c ++ * ++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ */ ++ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#define MT9P031_DEBUG ++ ++#ifdef MT9P031_DEBUG ++#define DPRINTK_DRIVER(format, ...) \ ++ printk(KERN_INFO "_MT9P031_DRIVER: " format, ## __VA_ARGS__) ++#else ++#define DPRINTK_DRIVER(format, ...) ++#endif ++/************************************************************************ ++ macro ++************************************************************************/ ++// Macro to configure I2c level shifter. Use only for MT9P031 Headboards from Aptina; not required for Leopard Imaging or elsewise. ++#define MT9P031_HEADBOARD ++ ++#define MT9P031_CHIP_ID 0x1801 ++#define MT9P031_MAX_HEIGHT 1944 ++#define MT9P031_MAX_WIDTH 2592 ++#define MT9P031_MIN_HEIGHT 2 ++#define MT9P031_MIN_WIDTH 2 ++ ++#define VGA_HEIGHT 480 ++#define VGA_WIDTH 640 ++ ++#define MT9P031_NORMAL_OPERATION_MODE (0x1F82) //write ++#define MT9P031_OUTPUT_CTRL_CHIP_UNSELECT (0x1F80) ++#define MT9P031_OUTPUT_CTRL_HALT (0x1F83) ++ ++/* FPS Capabilities */ ++#define MT9P031_MIN_FPS 10 ++#define MT9P031_DEF_FPS 30 ++#define MT9P031_MAX_FPS 50 ++ ++#define MT9P031_XCLK_NOM_1 12000000 ++#define MT9P031_XCLK_NOM_2 24000000 ++ ++/* Analog gain values */ ++#define MT9P031_EV_MIN_GAIN 0 ++#define MT9P031_EV_MAX_GAIN 47 ++#define MT9P031_EV_DEF_GAIN 24 ++#define MT9P031_EV_GAIN_STEP 1 ++ ++/* Exposure time values */ ++#define MT9P031_MIN_EXPOSURE 15000 ++#define MT9P031_MAX_EXPOSURE 128000 ++#define MT9P031_DEF_EXPOSURE 33000 ++#define MT9P031_EXPOSURE_STEP 100 ++#define Q12 4096 ++/************************************************************************ ++ Register Address ++************************************************************************/ ++ ++#define REG_MT9P031_CHIP_VERSION 0x00 ++#define REG_MT9P031_ROWSTART 0x01 ++#define REG_MT9P031_COLSTART 0x02 ++#define REG_MT9P031_HEIGHT 0x03 ++#define REG_MT9P031_WIDTH 0x04 ++#define REG_MT9P031_HBLANK 0x05 ++#define REG_MT9P031_VBLANK 0x06 ++#define REG_MT9P031_OUT_CTRL 0x07 ++#define REG_MT9P031_SHUTTER_WIDTH_U 0x08 ++#define REG_MT9P031_SHUTTER_WIDTH_L 0x09 ++#define REG_MT9P031_PCLK_CTRL 0x0a ++#define REG_MT9P031_RESTART 0x0b ++#define REG_MT9P031_SHUTTER_DELAY 0x0c ++#define REG_MT9P031_RESET 0x0d ++ ++#define REG_MT9P031_PLL_CTRL 0x10 ++#define REG_MT9P031_PLL_CONF1 0x11 ++#define REG_MT9P031_PLL_CONF2 0x12 ++ ++#define REG_MT9P031_READ_MODE1 0x1e ++#define REG_MT9P031_READ_MODE2 0x20 ++#define REG_MT9P031_ROW_ADDR_MODE 0x22 ++#define REG_MT9P031_COL_ADDR_MODE 0x23 ++#define REG_MT9P031_GREEN_1_GAIN 0x2b ++#define REG_MT9P031_BLUE_GAIN 0x2c ++#define REG_MT9P031_RED_GAIN 0x2d ++#define REG_MT9P031_GREEN_2_GAIN 0x2e ++#define REG_MT9P031_GLOBAL_GAIN 0x35 ++#define REG_MT9P031_CHIP_VERSION_ALT 0x0FF ++ ++/************************************************************************ ++ struct ++************************************************************************/ ++struct mt9p031_frame_size { ++ u16 width; ++ u16 height; ++}; ++ ++struct mt9p031_priv { ++ struct mt9p031_platform_data *pdata; ++ struct v4l2_int_device *v4l2_int_device; ++ struct i2c_client *client; ++ struct v4l2_pix_format pix; ++ struct v4l2_fract timeperframe; ++ unsigned long xclk_current; ++ int fps; ++ int scaler; ++ int ver; ++ int model; ++ u32 flags; ++/* for flags */ ++#define INIT_DONE (1<<0) ++}; ++ ++struct mt9p031_priv sysPriv; ++ ++static const struct v4l2_fmtdesc mt9p031_formats[] = { ++ { ++ .description = "Bayer (sRGB) 10 bit", ++ .pixelformat = V4L2_PIX_FMT_SRGGB10, ++ }, ++}; ++ ++static const unsigned int mt9p031_num_formats = ARRAY_SIZE(mt9p031_formats); ++ ++/***********************Minimum Horizontal blanking*********************/ ++int hb_min[4][4] = { ++ { 450, 430, 0, 420 }, ++ { 796, 776, 0, 766 }, ++ { 0, 0, 0, 0 }, ++ { 1488, 1468, 0, 1458 }, ++}; ++ ++/**************************supported sizes******************************/ ++const static struct mt9p031_frame_size mt9p031_sizes[] = { ++ { 640, 480 }, ++ { 1280, 720 }, ++ { 1920, 1080 }, ++ { 2048, 1536 }, //3MP ++ { 2592, 1944 }, //5MP ++}; ++ ++ ++struct mt9p031_format_params { ++ int width; ++ int height; ++ int row_start; ++ int col_start; ++ int row_size; ++ int col_size; ++ int hblank; ++ int vblank; ++ int integ_time; ++ int row_addr_mode; ++ int col_addr_mode; ++ int read_mode_2_config; ++ int shutter_width_hi; ++ int shutter_delay; ++ int row_bin; ++ int col_bin; ++}; ++ ++enum mt9p031_image_size { ++ VGA_BIN_30FPS, ++ HDV_720P_30FPS, ++ //HDV_720P_60FPS, ++ //HDV_720P_60FPS_LVB, ++ HDV_1080P_30FPS, ++ MT9P031_THREE_MP, ++ MT9P031_FIVE_MP, ++}; ++ ++enum mt9p031_image_size mt9p031_current_format; ++ ++const struct mt9p031_format_params mt9p031_supported_formats[] = { ++ { 640, 480, 64, 24, 1919, 2559, 0, 0, 0x0296, 0x0033, 0x0033, 0x0060, 0, 0, 3, 3 }, // VGA_BIN_30FPS ++ { 1280, 720, 64, 24, 1439, 2559, 0, 0, 0x0296, 0x0011, 0x0011, 0x0060, 0, 0, 1, 1 }, // 720P_HD_30FPS ++ //{ 1280, 720, 0x0040, 0x0018, 0x059F, 0x09FF, 0, 0, 0x0296, 0x0011, 0x0011, 0x0060, 0, 0, 1, 1 }, // 720P_HD_60FPS ++ //{ 1280, 720, 0x0040, 0x0018, 0x059F, 0x09FF, 0, 0x02D0, 0x0296, 0x0011, 0x0011, 0x0060, 0, 0, 1, 1 }, // 720P_HD_60FPS_LVB ++ { 1920, 1080, 431, 335, 1079, 1919, 0, 0x0037, 0x01AC, 0, 0, 0x0040, 0, 0, 0, 0 }, // 1080P_30FPS ++ { 2048, 1536, 431, 335, 1535, 2047, 0, 0x0037, 0x01AC, 0, 0, 0x0040, 0, 0, 0, 0 }, // 3MP CAPTURE ++ { 2592, 1944, 431, 335, 1943, 2591, 0, 0x0037, 0x01AC, 0, 0, 0x0040, 0, 0, 0, 0 }, // 5MP CAPTURE ++}; ++ ++ ++const struct v4l2_fract mt9p031_frameintervals[] = { ++ { .numerator = 1, .denominator = 10 }, ++ { .numerator = 1, .denominator = 20 }, ++ { .numerator = 1, .denominator = 30 }, ++ { .numerator = 1, .denominator = 40 }, ++ { .numerator = 1, .denominator = 50 }, ++}; ++ ++ ++const u16 MT9P031_EV_GAIN_TBL[48] = { ++ /* Gain x1 */ ++ 8, 9, 10, 11, 12, 13, 14, 15, ++ /* Gain x2 */ ++ 16, 17, 18, 19, 20, 21, 22, 23, ++ /* Gain x3 */ ++ 24, 25, 26, 27, 28, 29, 30, 31, ++ /* Gain x4 */ ++ 32, 33, 34, 35, ++ /* Gain x5 */ ++ 81, 82, 83, ++ /* Gain x6 */ ++ 84, 85, 86, 87, 88, 89, 90, 91, ++ /* Gain x7 */ ++ 92, 93, 94, 95, 96, 97, 98, 99, ++ /* Gain x8 */ ++ 100, ++}; ++ ++#ifdef MT9P031_HEADBOARD ++/** ++ * mt9p031_config_PCA9543A - configure on-board I2c level-shifter PCA9543A of MT9P031 Headboards from Aptina ++ * @client: pointer to i2c client ++ * Configures the level shifter to enable channel 0 ++ */ ++static int mt9p031_config_PCA9543A(const struct i2c_client *client) ++{ ++ struct i2c_msg msg; ++ int ret; ++ u8 buf; ++ buf = 0x21; ++ ++ msg.addr = (0xE6 >> 1); //slave address of PCA9543A ++ msg.flags = 0; ++ msg.len = 1; ++ msg.buf = &buf; ++ ++ ret = i2c_transfer(client->adapter, &msg, 1); ++ ++ return 0; ++ ++} ++#endif //MT9P031_HEADBOARD ++ ++/** ++ * mt9p031_reg_read - read resgiter value ++ * @client: pointer to i2c client ++ * @command: register address ++ */ ++static int mt9p031_reg_read(const struct i2c_client *client, u16 command, u16 *val) ++{ ++ struct i2c_msg msg[2]; ++ u8 buf[2]; ++ int ret; ++ ++ // 8-bit/ byte addressable register ++ buf[0] = command & 0xff; ++ ++ msg[0].addr = client->addr; ++ msg[0].flags = 0; ++ msg[0].len = 1; ++ msg[0].buf = buf ; ++ ret = i2c_transfer(client->adapter, &msg[0], 1); ++ ++ if(ret >= 0) { ++ msg[1].addr = client->addr; ++ msg[1].flags = I2C_M_RD; //1 ++ msg[1].len = 2; ++ msg[1].buf = buf; ++ ret = i2c_transfer(client->adapter, &msg[1], 1); ++ } ++ /* ++ * if return value of this function is < 0, ++ * it mean error. ++ * else, under 16bit is valid data. ++ */ ++ if(ret >= 0) { ++ *val = 0; ++ *val = buf[1] + (buf[0] << 8); ++ return 0; ++ } ++ ++ v4l_err(client, "read from offset 0x%x error %d", command, ret); ++ return ret; ++} ++ ++/** ++ * mt9p031_reg_write - read resgiter value ++ * @client: pointer to i2c client ++ * @command: register address ++ * @data: value to be written ++ */ ++static int mt9p031_reg_write(const struct i2c_client *client, ++ u16 command, u16 data) ++{ ++ struct i2c_msg msg; ++ u8 buf[3]; ++ int ret; ++ ++ // 8-bit/ byte addressable register ++ ++ buf[0] = command & 0xff; ++ data = swab16(data); ++ memcpy(buf + 1, &data, 2); ++ ++ msg.addr = client->addr; ++ msg.flags = 0; ++ msg.len = 3; ++ msg.buf = buf; ++ ++ /* ++ * i2c_transfer return message length, ++ * but this function should return 0 if correct case ++ */ ++ ret = i2c_transfer(client->adapter, &msg, 1); ++ if (ret >= 0) ++ ret = 0; ++ ++ return ret; ++} ++ ++/** ++ * struct vcontrol - Video controls ++ * @v4l2_queryctrl: V4L2 VIDIOC_QUERYCTRL ioctl structure ++ * @current_value: current value of this control ++ */ ++static struct vcontrol { ++ struct v4l2_queryctrl qc; ++ int current_value; ++} mt9p031_video_control[] = { ++ { ++ { ++ .id = V4L2_CID_EXPOSURE, ++ .type = V4L2_CTRL_TYPE_INTEGER, ++ .name = "Exposure", ++ .minimum = MT9P031_MIN_EXPOSURE, ++ .maximum = MT9P031_MAX_EXPOSURE, ++ .step = MT9P031_EXPOSURE_STEP, ++ .default_value = MT9P031_DEF_EXPOSURE, ++ }, ++ .current_value = MT9P031_DEF_EXPOSURE, ++ }, ++ { ++ { ++ .id = V4L2_CID_GAIN, ++ .type = V4L2_CTRL_TYPE_INTEGER, ++ .name = "Analog Gain", ++ .minimum = MT9P031_EV_MIN_GAIN, ++ .maximum = MT9P031_EV_MAX_GAIN, ++ .step = MT9P031_EV_GAIN_STEP, ++ .default_value = MT9P031_EV_DEF_GAIN, ++ }, ++ .current_value = MT9P031_EV_DEF_GAIN, ++ }, ++}; ++ ++/** ++ * find_vctrl - Finds the requested ID in the video control structure array ++ * @id: ID of control to search the video control array for ++ * ++ * Returns the index of the requested ID from the control structure array ++ */ ++static int ++find_vctrl(int id) ++{ ++ int i; ++ ++ if (id < V4L2_CID_BASE) ++ return -EDOM; ++ ++ for (i = (ARRAY_SIZE(mt9p031_video_control) - 1); i >= 0; i--) ++ if (mt9p031_video_control[i].qc.id == id) ++ break; ++ if (i < 0) ++ i = -EINVAL; ++ return i; ++} ++ ++/** ++ * mt9p031_calc_size - Find the best match for a requested image capture size ++ * @width: requested image width in pixels ++ * @height: requested image height in pixels ++ * ++ * Find the best match for a requested image capture size. The best match ++ * is chosen as the nearest match that has the same number or fewer pixels ++ * as the requested size, or the smallest image size if the requested size ++ * has fewer pixels than the smallest image. ++ */ ++static enum mt9p031_image_size mt9p031_calc_size(unsigned int width, ++ unsigned int height) ++{ ++ enum mt9p031_image_size isize; ++ unsigned long pixels = width * height; ++ ++ for (isize = VGA_BIN_30FPS; isize <= MT9P031_FIVE_MP; isize++) { ++ if (mt9p031_sizes[isize].height * ++ mt9p031_sizes[isize].width >= pixels) { ++ ++ return isize; ++ } ++ } ++ ++ return MT9P031_FIVE_MP; ++} ++ ++/** ++ * mt9p031_find_isize - Find the best match for a requested image capture size ++ * @width: requested image width in pixels ++ * @height: requested image height in pixels ++ * ++ * Find the best match for a requested image capture size. The best match ++ * is chosen as the nearest match that has the same number or fewer pixels ++ * as the requested size, or the smallest image size if the requested size ++ * has fewer pixels than the smallest image. ++ */ ++static enum mt9p031_image_size mt9p031_find_isize(unsigned int width) ++{ ++ enum mt9p031_image_size isize; ++ ++ for (isize = VGA_BIN_30FPS; isize <= MT9P031_FIVE_MP; isize++) { ++ if (mt9p031_sizes[isize].width >= width) ++ break; ++ } ++ ++ return isize; ++} ++ ++/** ++ * mt9p031_calc_xclk - Calculate the required xclk frequency ++ * @c: i2c client driver structure ++ * ++ * Given the image capture format in pix, the nominal frame period in ++ * timeperframe, calculate and return the required xclk frequency ++ */ ++static unsigned long mt9p031_calc_xclk(struct i2c_client *c) ++{ ++ struct mt9p031_priv *priv = i2c_get_clientdata(c); ++ struct v4l2_fract *timeperframe = &priv->timeperframe; ++ ++ if (timeperframe->numerator == 0 || ++ timeperframe->denominator == 0) { ++ /* supply a default nominal_timeperframe */ ++ timeperframe->numerator = 1; ++ timeperframe->denominator = MT9P031_DEF_FPS; ++ } ++ ++ priv->fps = timeperframe->denominator / timeperframe->numerator; ++ if (priv->fps < MT9P031_MIN_FPS) ++ priv->fps = MT9P031_MIN_FPS; ++ else if (priv->fps > MT9P031_MAX_FPS) ++ priv->fps = MT9P031_MAX_FPS; ++ ++ timeperframe->numerator = 1; ++ timeperframe->denominator = priv->fps; ++ ++ return MT9P031_XCLK_NOM_1; ++} ++ ++/** ++ * mt9p031_set_params - sets register settings according to resolution ++ * @client: pointer to standard i2c client ++ * @width: width as queried by ioctl ++ * @height: height as queried by ioctl ++ */ ++static int mt9p031_set_params(struct i2c_client *client, u32 width, u32 height) ++{ ++ struct mt9p031_priv *priv = i2c_get_clientdata(client); ++ struct v4l2_pix_format *pix = &priv->pix; ++ int ret; ++ enum mt9p031_image_size i; ++ ++ i = mt9p031_find_isize(pix->width); ++ priv->pix.width = mt9p031_supported_formats[i].width; ++ priv->pix.height = mt9p031_supported_formats[i].height; ++ ++ ret = mt9p031_reg_write(client, REG_MT9P031_ROWSTART, mt9p031_supported_formats[i].row_start); //ROW_WINDOW_START_REG ++ ret |= mt9p031_reg_write(client, REG_MT9P031_COLSTART, mt9p031_supported_formats[i].col_start); //COL_WINDOW_START_REG ++ ret |= mt9p031_reg_write(client, REG_MT9P031_HEIGHT, mt9p031_supported_formats[i].row_size); //ROW_WINDOW_SIZE_REG=1439 ++ ret |= mt9p031_reg_write(client, REG_MT9P031_WIDTH, mt9p031_supported_formats[i].col_size); //COL_WINDOW_SIZE_REG=2559 ++ ret |= mt9p031_reg_write(client, REG_MT9P031_HBLANK, mt9p031_supported_formats[i].hblank); //HORZ_BLANK=0 ++ ret |= mt9p031_reg_write(client, REG_MT9P031_VBLANK, mt9p031_supported_formats[i].vblank); //VERT_BLANK_REG=720 ++ ret |= mt9p031_reg_write(client, REG_MT9P031_SHUTTER_WIDTH_L, 0x0400); //SHUTTER_WIDTH_LOW (INTEG_TIME_REG = 1024) ++ ret |= mt9p031_reg_write(client, REG_MT9P031_ROW_ADDR_MODE, mt9p031_supported_formats[i].row_addr_mode); //ROW_MODE, ROW_SKIP=1, ROW_BIN=1 ++ ret |= mt9p031_reg_write(client, REG_MT9P031_COL_ADDR_MODE, mt9p031_supported_formats[i].col_addr_mode); //COL_MODE, COL_SKIP=1, COL_BIN=1 ++ ret |= mt9p031_reg_write(client, REG_MT9P031_READ_MODE2, mt9p031_supported_formats[i].read_mode_2_config); //READ_MODE_2, COL_SUM ++ ret |= mt9p031_reg_write(client, REG_MT9P031_SHUTTER_WIDTH_U, mt9p031_supported_formats[i].shutter_width_hi); //SHUTTER_WIDTH_HI ++ ret |= mt9p031_reg_write(client, REG_MT9P031_SHUTTER_WIDTH_L, mt9p031_supported_formats[i].integ_time); //SHUTTER_WIDTH_LOW (INTEG_TIME_REG) ++ ret |= mt9p031_reg_write(client, REG_MT9P031_SHUTTER_DELAY, mt9p031_supported_formats[i].shutter_delay); //SHUTTER_DELAY_REG ++ ++ return ret; ++} ++ ++/** ++ * mt9p031_init_camera - initialize camera settings ++ * @client: pointer to i2c client ++ * Initialize camera settings ++ */ ++static int mt9p031_init_camera(const struct i2c_client *client) ++{ ++ int ret; ++ struct mt9p031_priv *priv = i2c_get_clientdata(client); ++ struct v4l2_pix_format *pix = &priv->pix; ++ ++ ret = mt9p031_reg_write(client, REG_MT9P031_PLL_CTRL, 0x0051); //PLL_CTRL; power up pll ++ ret |= mt9p031_reg_write(client, REG_MT9P031_PLL_CONF1, 0x1801); //PLL_CONFIG_1: m=24, n=1 ++ ret |= mt9p031_reg_write(client, REG_MT9P031_PLL_CONF2, 0x0002); //PLL_CONFIG_2: p1=2, p2=0 ++ mdelay(10); //wait 10 ms for VCO to lock ++ ret |= mt9p031_reg_write(client, REG_MT9P031_PLL_CTRL, 0x0053); //PLL_CONTROL; use PLL ++ mdelay(200); ++ ++ ret |= mt9p031_set_params(priv->client, pix->width, pix->height); ++ ++ ret |= mt9p031_reg_write(client, REG_MT9P031_RESET, 0x0001); //High ++ ret |= mt9p031_reg_write(client, REG_MT9P031_RESET, 0x0000); //Low ++ mdelay(100); ++ ++ ret |= mt9p031_reg_write(client, REG_MT9P031_GREEN_1_GAIN, 0x0051); //Green1_gain_reg ++ ret |= mt9p031_reg_write(client, REG_MT9P031_BLUE_GAIN, 0x0051); //Blue_gain_reg ++ ret |= mt9p031_reg_write(client, REG_MT9P031_RED_GAIN, 0x0051); //Red_gain_reg ++ ret |= mt9p031_reg_write(client, REG_MT9P031_GREEN_2_GAIN, 0x0051); //Green2_gain_reg ++ ret |= mt9p031_reg_write(client, REG_MT9P031_GLOBAL_GAIN, 0x0008); //Analog Gain ++ ret |= mt9p031_reg_write(client, REG_MT9P031_READ_MODE1, 0x0006); //Read_mode_1 //disable AB ++ ret |= mt9p031_reg_write(client, REG_MT9P031_OUT_CTRL, 0x1F8E); //Enable parll fifo data ++ ++ return ret>= 0 ? 0 : -EIO; ++} ++ ++/************************************************************************ ++ i2c driver ++************************************************************************/ ++/** ++ * mt9p031_detect - Detect if an mt9p031 is present, and if so which revision ++ * @client: pointer to the i2c client driver structure ++ * ++ * Returns a negative error number if no device is detected ++ */ ++static int mt9p031_detect(struct i2c_client *client) ++{ ++ struct mt9p031_priv *priv = i2c_get_clientdata(client); ++ const char *devname; ++ u16 chipid; ++ ++ if (!client) ++ return -ENODEV; ++ /* ++ * Set Normal Mode ++ */ ++ if(mt9p031_reg_write(client, REG_MT9P031_OUT_CTRL, MT9P031_NORMAL_OPERATION_MODE)) ++ return -ENODEV; ++ /* ++ * check and show chip ID ++ */ ++ if(mt9p031_reg_read(client, REG_MT9P031_CHIP_VERSION, &chipid)) ++ return -ENODEV; ++ ++ if(chipid == MT9P031_CHIP_ID) { ++ devname = "mt9p031"; ++ priv->model = V4L2_IDENT_MT9P031; ++ dev_info(&client->dev, "%s chip ID %04x\n", devname, chipid); ++ return 0; ++ } ++ ++ dev_err(&client->dev, "Product ID error %04x\n", chipid); ++ return -ENODEV; ++} ++ ++/** ++ * mt9p031_set_exposure_time - sets exposure time per input value ++ * @exp_time: exposure time to be set on device ++ * @client: pointer to standard i2c client ++ * @lvc: pointer to V4L2 exposure entry in video_controls array ++ * ++ * If the requested exposure time is within the allowed limits, the HW ++ * is configured to use the new exposure time, and the video_controls ++ * array is updated with the new current value. ++ * The function returns 0 upon success. Otherwise an error code is ++ * returned. ++ */ ++static int mt9p031_set_exposure_time(u32 exp_time, struct i2c_client *client, ++ struct vcontrol *lvc) ++{ ++ int ret = 0, i, shutter_width, so_p, t_pix_clk, sd_p, shutter_delay; ++ int sw_l ,sw_u ,W ,h_blanking, t_row; ++ ++ if(exp_time < MT9P031_MIN_EXPOSURE) ++ exp_time = MT9P031_MIN_EXPOSURE; ++ else if(exp_time > MT9P031_MAX_EXPOSURE) ++ exp_time = MT9P031_MAX_EXPOSURE; ++ ++ shutter_delay = mt9p031_supported_formats[mt9p031_current_format].shutter_delay; ++ sd_p = min(shutter_delay + 1, 1504); ++ so_p = 208 * (mt9p031_supported_formats[mt9p031_current_format].row_bin + 1) + 98 + sd_p - 94; ++ t_pix_clk = (Q12/96 ); ++ h_blanking = mt9p031_supported_formats[mt9p031_current_format].hblank + 1; ++ W = 2 * (int)((mt9p031_supported_formats[mt9p031_current_format].row_size + 1) / (2 * (mt9p031_supported_formats[mt9p031_current_format].row_bin + 1)) + 1); ++ t_row = 2 * t_pix_clk * max(W/2 + max(h_blanking, hb_min[mt9p031_supported_formats[mt9p031_current_format].row_bin][mt9p031_supported_formats[mt9p031_current_format].col_bin]), ++ (41 + 346 * (mt9p031_supported_formats[mt9p031_current_format].row_bin + 1) + 99))/Q12; ++ ++ shutter_width = (exp_time + 2*so_p*t_pix_clk) / t_row; ++ ++ if (shutter_width< 3) { ++ sd_p = 1232 > shutter_delay ? 1232 : shutter_delay; ++ so_p = 208 * (mt9p031_supported_formats[mt9p031_current_format].row_bin + 1) + 98 + sd_p - 94; ++ shutter_width = ((exp_time*Q12 + 2*so_p*t_pix_clk) / (t_row * Q12)); ++ } ++ ++ if (shutter_width < 1) ++ shutter_width = 1; ++ sw_l = shutter_width& 0xffff; ++ sw_u = (shutter_width)>> 16; ++ ret = mt9p031_reg_write(client, REG_MT9P031_SHUTTER_WIDTH_L,sw_l); ++ mdelay(1); ++ ret = mt9p031_reg_write(client, REG_MT9P031_SHUTTER_WIDTH_U,sw_u); ++ ++ if (ret) ++ dev_err(&client->dev, "Error setting exposure time %d\n", ++ ret); ++ else{ ++ i = find_vctrl(V4L2_CID_EXPOSURE); ++ if (i >= 0) { ++ lvc = &mt9p031_video_control[i]; ++ lvc->current_value = exp_time; ++ } ++ } ++ ++ return ret; ++} ++ ++/** ++ * mt9p031_set_gain - sets sensor analog gain per input value ++ * @lineargain: analog gain value index to be set on device ++ * @client: pointer to standard i2c client ++ * @lvc: pointer to V4L2 analog gain entry in video_controls array ++ * ++ * If the requested analog gain is within the allowed limits, the HW ++ * is configured to use the new gain value, and the video_controls ++ * array is updated with the new current value. ++ * The function returns 0 upon success. Otherwise an error code is ++ * returned. ++ */ ++int mt9p031_set_gain(u16 lineargain, struct i2c_client *client, ++ struct vcontrol *lvc) ++{ ++ int ret= 0, i; ++ u16 reg_gain = 0; ++ ++ if (lineargain < MT9P031_EV_MIN_GAIN) { ++ lineargain = MT9P031_EV_MIN_GAIN; ++ v4l_err(client, "Gain out of legal range."); ++ } ++ if (lineargain > MT9P031_EV_MAX_GAIN) { ++ lineargain = MT9P031_EV_MAX_GAIN; ++ v4l_err(client, "Gain out of legal range."); ++ } ++ ++ reg_gain = MT9P031_EV_GAIN_TBL[lineargain]; ++ ret = mt9p031_reg_write(client, REG_MT9P031_GLOBAL_GAIN, ++ reg_gain); ++ ++ if (ret) { ++ dev_err(&client->dev, "Error setting gain.%d", ret); ++ return ret; ++ } ++ else { ++ i = find_vctrl(V4L2_CID_GAIN); ++ if (i >= 0) { ++ lvc = &mt9p031_video_control[i]; ++ lvc->current_value = lineargain; ++ } ++ } ++ ++ return ret; ++} ++ ++/************************************************************************ ++ v4l2_ioctls ++************************************************************************/ ++ ++/** ++ * mt9p031_v4l2_int_s_power - V4L2 sensor interface handler for vidioc_int_s_power_num ++ * @s: pointer to standard V4L2 device structure ++ * @on: power state to which device is to be set ++ * ++ * Sets devices power state to requrested state, if possible. ++ */ ++static int mt9p031_v4l2_int_s_power(struct v4l2_int_device *s, ++ enum v4l2_power power) ++{ ++ struct mt9p031_priv *priv = s->priv; ++ struct i2c_client *client = priv->client; ++ ++ int ret; ++ ++ switch (power) { ++ case V4L2_POWER_STANDBY: ++ /* FALLTHROUGH */ ++ case V4L2_POWER_OFF: ++ ret = priv->pdata->power_set(s, power); ++ if (ret < 0) { ++ dev_err(&client->dev, "Unable to set target board power " ++ "state (OFF/STANDBY)\n"); ++ return ret; ++ } ++ break; ++ case V4L2_POWER_ON: ++ ret = priv->pdata->power_set(s, power); ++ ++ if (ret < 0) { ++ dev_err(&client->dev, "Unable to set target board power " ++ "state (ON)\n"); ++ return ret; ++ } ++ if (!(priv->flags & INIT_DONE)) { ++ ret = mt9p031_detect(client); ++ if (ret < 0) { ++ dev_err(&client->dev, "Unable to detect sensor\n"); ++ return ret; ++ } ++ priv->flags |= INIT_DONE; ++ } ++ ++ ret = mt9p031_init_camera(client); ++ if (ret < 0) { ++ dev_err(&client->dev, "Unable to initialize sensor\n"); ++ return ret; ++ } ++ } ++ ++ return 0; ++} ++ ++/** ++ * mt9p031_v4l2_s_ctrl - V4L2 sensor interface handler for VIDIOC_S_CTRL ioctl ++ * @s: pointer to standard V4L2 device structure ++ * @vc: standard V4L2 VIDIOC_S_CTRL ioctl structure ++ * ++ * If the requested control is supported, sets the control's current ++ * value in HW (and updates the video_control[] array). Otherwise, ++ * returns -EINVAL if the control is not supported. ++ */ ++static int mt9p031_v4l2_s_ctrl(struct v4l2_int_device *s, ++ struct v4l2_control *vc) ++{ ++ int retval = -EINVAL; ++ int i; ++ struct vcontrol *lvc; ++ struct mt9p031_priv *priv = s->priv; ++ struct i2c_client *client = priv->client; ++ ++ i = find_vctrl(vc->id); ++ if (i < 0) ++ return -EINVAL; ++ lvc = &mt9p031_video_control[i]; ++ ++ switch (vc->id) { ++ case V4L2_CID_EXPOSURE: ++ retval = mt9p031_set_exposure_time(vc->value, client, lvc); ++ break; ++ case V4L2_CID_GAIN: ++ retval = mt9p031_set_gain(vc->value, client, lvc); ++ break; ++ } ++ ++ return retval; ++} ++ ++/** ++ * mt9p031_v4l2_g_ctrl - V4L2 sensor interface handler for VIDIOC_G_CTRL ioctl ++ * @s: pointer to standard V4L2 device structure ++ * @vc: standard V4L2 VIDIOC_G_CTRL ioctl structure ++ * ++ * If the requested control is supported, returns the control's current ++ * value from the video_control[] array. Otherwise, returns -EINVAL ++ * if the control is not supported. ++ */ ++static int mt9p031_v4l2_g_ctrl(struct v4l2_int_device *s, ++ struct v4l2_control *vc) ++{ ++ struct vcontrol *lvc; ++ int i; ++ ++ i = find_vctrl(vc->id); ++ if (i < 0) ++ return -EINVAL; ++ lvc = &mt9p031_video_control[i]; ++ ++ switch (vc->id) { ++ case V4L2_CID_EXPOSURE: ++ vc->value = lvc->current_value; ++ break; ++ case V4L2_CID_GAIN: ++ vc->value = lvc->current_value; ++ break; ++ } ++ ++ return 0; ++} ++ ++/** ++ * mt9p031_v4l2_queryctrl - V4L2 sensor interface handler for VIDIOC_QUERYCTRL ioctl ++ * @s: pointer to standard V4L2 device structure ++ * @qc: standard V4L2 VIDIOC_QUERYCTRL ioctl structure ++ * ++ * If the requested control is supported, returns the control information ++ * from the video_control[] array. Otherwise, returns -EINVAL if the ++ * control is not supported. ++ */ ++static int mt9p031_v4l2_queryctrl(struct v4l2_int_device *s, struct v4l2_queryctrl *qc) ++{ ++ int i; ++ ++ i = find_vctrl(qc->id); ++ if (i == -EINVAL) ++ qc->flags = V4L2_CTRL_FLAG_DISABLED; ++ ++ if (i < 0) ++ return -EINVAL; ++ ++ *qc = mt9p031_video_control[i].qc; ++ return 0; ++} ++ ++ ++/** ++ * mt9p031_v4l2_int_enum_fmt_cap - Implement the CAPTURE buffer VIDIOC_ENUM_FMT ioctl ++ * @s: pointer to standard V4L2 device structure ++ * @fmt: standard V4L2 VIDIOC_ENUM_FMT ioctl structure ++ * ++ * Implement the VIDIOC_ENUM_FMT ioctl for the CAPTURE buffer type. ++ */ ++static int mt9p031_v4l2_int_enum_fmt_cap(struct v4l2_int_device *s, ++ struct v4l2_fmtdesc *fmt) ++{ ++ int index = fmt->index; ++ enum v4l2_buf_type type = fmt->type; ++ ++ memset(fmt, 0, sizeof(*fmt)); ++ fmt->index = index; ++ fmt->type = type; ++ ++ switch (fmt->type) { ++ case V4L2_BUF_TYPE_VIDEO_CAPTURE: ++ if (index >= ARRAY_SIZE(mt9p031_formats)) ++ return -EINVAL; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ strlcpy(fmt->description, mt9p031_formats[index].description, ++ sizeof(fmt->description)); ++ fmt->pixelformat = mt9p031_formats[index].pixelformat; ++ ++ return 0; ++} ++ ++/** ++ * mt9p031_v4l2_int_try_fmt_cap - Implement the CAPTURE buffer VIDIOC_TRY_FMT ioctl ++ * @s: pointer to standard V4L2 device structure ++ * @f: pointer to standard V4L2 VIDIOC_TRY_FMT ioctl structure ++ * ++ * Implement the VIDIOC_TRY_FMT ioctl for the CAPTURE buffer type. This ++ * ioctl is used to negotiate the image capture size and pixel format ++ * without actually making it take effect. ++ */ ++static int mt9p031_v4l2_int_try_fmt_cap(struct v4l2_int_device *s, ++ struct v4l2_format *f) ++{ ++ enum mt9p031_image_size isize; ++ int ifmt; ++ struct v4l2_pix_format *pix = &f->fmt.pix; ++ struct mt9p031_priv *priv = s->priv; ++ struct v4l2_pix_format *pix2 = &priv->pix; ++ ++ isize = mt9p031_calc_size(pix->width, pix->height); ++ mt9p031_current_format = isize; ++ ++ pix->width = mt9p031_sizes[isize].width; ++ pix->height = mt9p031_sizes[isize].height; ++ for (ifmt = 0; ifmt < mt9p031_num_formats; ifmt++) { ++ if (pix->pixelformat == mt9p031_formats[ifmt].pixelformat) ++ break; ++ } ++ if (ifmt == mt9p031_num_formats) ++ ifmt = 0; ++ pix->pixelformat = mt9p031_formats[ifmt].pixelformat; ++ pix->field = V4L2_FIELD_NONE; ++ pix->bytesperline = pix->width * 2; ++ pix->sizeimage = pix->bytesperline * pix->height; ++ pix->priv = 0; ++ pix->colorspace = V4L2_COLORSPACE_SRGB; ++ ++ *pix2 = *pix; ++ ++ return 0; ++} ++ ++/** ++ * mt9p031_v4l2_int_s_fmt_cap - V4L2 sensor interface handler for VIDIOC_S_FMT ioctl ++ * @s: pointer to standard V4L2 device structure ++ * @f: pointer to standard V4L2 VIDIOC_S_FMT ioctl structure ++ * ++ * If the requested format is supported, configures the HW to use that ++ * format, returns error code if format not supported or HW can't be ++ * correctly configured. ++ */ ++static int mt9p031_v4l2_int_s_fmt_cap(struct v4l2_int_device *s, ++ struct v4l2_format *f) ++{ ++ struct mt9p031_priv *priv = s->priv; ++ struct v4l2_pix_format *pix = &f->fmt.pix; ++ int rval; ++ ++ rval = mt9p031_v4l2_int_try_fmt_cap(s, f); ++ if (!rval) ++ priv->pix = *pix; ++ ++ return rval; ++} ++ ++/** ++ * mt9p031_v4l2_int_g_fmt_cap - V4L2 sensor interface handler for ioctl_g_fmt_cap ++ * @s: pointer to standard V4L2 device structure ++ * @f: pointer to standard V4L2 v4l2_format structure ++ * ++ * Returns the sensor's current pixel format in the v4l2_format ++ * parameter. ++ */ ++static int mt9p031_v4l2_int_g_fmt_cap(struct v4l2_int_device *s, ++ struct v4l2_format *f) ++{ ++ struct mt9p031_priv *priv = s->priv; ++ ++ f->fmt.pix.width = priv->pix.width; ++ f->fmt.pix.height = priv->pix.height; ++ f->fmt.pix.pixelformat = V4L2_COLORSPACE_SRGB; ++ f->fmt.pix.pixelformat = priv->pix.pixelformat; ++ f->fmt.pix.field = V4L2_FIELD_NONE; ++ ++ return 0; ++} ++ ++/** ++ * mt9p031_v4l2_int_s_parm - V4L2 sensor interface handler for VIDIOC_S_PARM ioctl ++ * @s: pointer to standard V4L2 device structure ++ * @a: pointer to standard V4L2 VIDIOC_S_PARM ioctl structure ++ * ++ * Configures the sensor to use the input parameters, if possible. If ++ * not possible, reverts to the old parameters and returns the ++ * appropriate error code. ++ */ ++ ++ ++static int mt9p031_v4l2_int_s_parm(struct v4l2_int_device *s, ++ struct v4l2_streamparm *a) ++{ ++ struct mt9p031_priv *priv = s->priv; ++ struct i2c_client *client = priv->client; ++ struct v4l2_fract *timeperframe = &a->parm.capture.timeperframe; ++ ++ priv->timeperframe = *timeperframe; ++ priv->xclk_current = mt9p031_calc_xclk(client); ++ *timeperframe = priv->timeperframe; ++ ++ return 0; ++} ++ ++/** ++ * mt9p031_v4l2_int_g_parm - V4L2 sensor interface handler for VIDIOC_G_PARM ioctl ++ * @s: pointer to standard V4L2 device structure ++ * @a: pointer to standard V4L2 VIDIOC_G_PARM ioctl structure ++ * ++ * Returns the sensor's video CAPTURE parameters. ++ */ ++static int mt9p031_v4l2_int_g_parm(struct v4l2_int_device *s, ++ struct v4l2_streamparm *a) ++{ ++ struct mt9p031_priv *priv = s->priv; ++ struct v4l2_captureparm *cparm = &a->parm.capture; ++ ++ if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) ++ return -EINVAL; ++ ++ memset(a, 0, sizeof(*a)); ++ a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; ++ ++ cparm->capability = V4L2_CAP_TIMEPERFRAME; ++ cparm->timeperframe.numerator = 1; ++ cparm->timeperframe = priv->timeperframe; ++ ++ return 0; ++} ++ ++/** ++ * mt9p031_v4l2_int_g_priv - V4L2 sensor interface handler for vidioc_int_g_priv_num ++ * @s: pointer to standard V4L2 device structure ++ * @p: void pointer to hold sensor's private data address ++ * ++ * Returns device's (sensor's) private data area address in p parameter ++ */ ++static int mt9p031_v4l2_int_g_priv(struct v4l2_int_device *s, void *p) ++{ ++ struct mt9p031_priv *priv = s->priv; ++ ++ return priv->pdata->priv_data_set(p); ++} ++ ++/** ++ * mt9p031_v4l2_int_g_ifparm - V4L2 sensor interface handler for vidioc_int_g_priv_num ++ * @s: pointer to standard V4L2 device structure ++ * @p: void pointer to hold sensor's ifparm ++ * ++ * Returns device's (sensor's) ifparm in p parameter ++ */ ++static int mt9p031_v4l2_int_g_ifparm(struct v4l2_int_device *s, ++ struct v4l2_ifparm *p) ++{ ++ struct mt9p031_priv *priv = s->priv; ++ int rval; ++ ++ if (p == NULL) ++ return -EINVAL; ++ ++ if (!priv->pdata->ifparm) ++ return -EINVAL; ++ ++ rval = priv->pdata->ifparm(p); ++ if (rval) { ++ v4l_err(priv->client, "g_ifparm.Err[%d]\n", rval); ++ return rval; ++ } ++ ++ return 0; ++} ++ ++/** ++ * mt9p031_v4l2_int_enum_framesizes - V4L2 sensor if handler for vidioc_int_enum_framesizes ++ * @s: pointer to standard V4L2 device structure ++ * @frms: pointer to standard V4L2 framesizes enumeration structure ++ * ++ * Returns possible framesizes depending on choosen pixel format ++ */ ++static int mt9p031_v4l2_int_enum_framesizes(struct v4l2_int_device *s, ++ struct v4l2_frmsizeenum *frms) ++{ ++ int ifmt; ++ ++ for (ifmt = 0; ifmt < ARRAY_SIZE(mt9p031_formats); ifmt++) ++ if (mt9p031_formats[ifmt].pixelformat == frms->pixel_format) ++ break; ++ ++ if (ifmt == ARRAY_SIZE(mt9p031_formats)) ++ return -EINVAL; ++ ++ /* Do we already reached all discrete framesizes? */ ++ if (frms->index >= ARRAY_SIZE(mt9p031_sizes)) ++ return -EINVAL; ++ ++ frms->type = V4L2_FRMSIZE_TYPE_DISCRETE; ++ frms->discrete.width = mt9p031_sizes[frms->index].width; ++ frms->discrete.height = mt9p031_sizes[frms->index].height; ++ ++ return 0; ++} ++ ++static int mt9p031_v4l2_int_enum_frameintervals(struct v4l2_int_device *s, ++ struct v4l2_frmivalenum *frmi) ++{ ++ int ifmt; ++ int max_size; ++ ++ for (ifmt = 0; ifmt < ARRAY_SIZE(mt9p031_formats); ifmt++) ++ if (mt9p031_formats[ifmt].pixelformat == frmi->pixel_format) ++ break; ++ ++ if (ifmt == ARRAY_SIZE(mt9p031_formats)) ++ return -EINVAL; ++ ++ max_size = ARRAY_SIZE(mt9p031_sizes); ++ ++ for(ifmt = 0; ifmt < max_size; ifmt++) { ++ if(frmi->width <= mt9p031_sizes[ifmt].width) { ++ frmi->type = V4L2_FRMSIZE_TYPE_DISCRETE; ++ frmi->discrete.numerator = ++ mt9p031_frameintervals[frmi->index].numerator; ++ frmi->discrete.denominator = ++ mt9p031_frameintervals[frmi->index].denominator; ++ ++ if(frmi->discrete.denominator <= mt9p031_frameintervals[max_size - ifmt - 1].denominator) ++ return 0; ++ else ++ return -EINVAL; ++ } ++ } ++ ++ return 0; ++} ++ ++static struct v4l2_int_ioctl_desc mt9p031_ioctl_desc[] = { ++ { .num = vidioc_int_enum_framesizes_num, ++ .func = (v4l2_int_ioctl_func *)mt9p031_v4l2_int_enum_framesizes }, ++ { .num = vidioc_int_enum_frameintervals_num, ++ .func = (v4l2_int_ioctl_func *)mt9p031_v4l2_int_enum_frameintervals }, ++ { .num = vidioc_int_s_power_num, ++ .func = (v4l2_int_ioctl_func *)mt9p031_v4l2_int_s_power }, ++ { .num = vidioc_int_g_priv_num, ++ .func = (v4l2_int_ioctl_func *)mt9p031_v4l2_int_g_priv }, ++ { .num = vidioc_int_g_ifparm_num, ++ .func = (v4l2_int_ioctl_func *)mt9p031_v4l2_int_g_ifparm }, ++ { .num = vidioc_int_enum_fmt_cap_num, ++ .func = (v4l2_int_ioctl_func *)mt9p031_v4l2_int_enum_fmt_cap }, ++ { .num = vidioc_int_try_fmt_cap_num, ++ .func = (v4l2_int_ioctl_func *)mt9p031_v4l2_int_try_fmt_cap }, ++ { .num = vidioc_int_g_fmt_cap_num, ++ .func = (v4l2_int_ioctl_func *)mt9p031_v4l2_int_g_fmt_cap }, ++ { .num = vidioc_int_s_fmt_cap_num, ++ .func = (v4l2_int_ioctl_func *)mt9p031_v4l2_int_s_fmt_cap }, ++ { .num = vidioc_int_g_parm_num, ++ .func = (v4l2_int_ioctl_func *)mt9p031_v4l2_int_g_parm }, ++ { .num = vidioc_int_s_parm_num, ++ .func = (v4l2_int_ioctl_func *)mt9p031_v4l2_int_s_parm }, ++ { .num = vidioc_int_g_ctrl_num, ++ .func = (v4l2_int_ioctl_func *)mt9p031_v4l2_g_ctrl }, ++ { .num = vidioc_int_s_ctrl_num, ++ .func = (v4l2_int_ioctl_func *)mt9p031_v4l2_s_ctrl }, ++ { .num = vidioc_int_queryctrl_num, ++ .func = (v4l2_int_ioctl_func *)mt9p031_v4l2_queryctrl }, ++}; ++ ++#ifdef MT9P031_DEBUG ++/** ++ * --------------------------------------------------------------------------------- ++ * Sysfs ++ * --------------------------------------------------------------------------------- ++ */ ++ ++/* Basic register read write support */ ++static u16 mt9p031_attr_basic_addr = 0x0000; ++ ++static ssize_t ++mt9p031_basic_reg_addr_show( struct device *dev, struct device_attribute *attr, char *buf) ++{ ++ return sprintf(buf, "0x%x\n", mt9p031_attr_basic_addr); ++} ++ ++static ssize_t ++mt9p031_basic_reg_addr_store( struct device *dev, struct device_attribute *attr, const char *buf, size_t n) ++{ ++ u16 val; ++ sscanf(buf, "%hx", &val); ++ mt9p031_attr_basic_addr = (u16) val; ++ return n; ++} ++ ++static DEVICE_ATTR( basic_reg_addr, S_IRUGO|S_IWUSR, mt9p031_basic_reg_addr_show, mt9p031_basic_reg_addr_store); ++ ++ ++static ssize_t ++mt9p031_basic_reg_val_show( struct device *dev, struct device_attribute *attr, char *buf) ++{ ++ u16 val; ++ int ret; ++ ret = mt9p031_reg_read(sysPriv.client, mt9p031_attr_basic_addr, &val); ++ if(ret < 0){ ++ printk(KERN_INFO "mt9p031: Basic register read failed"); ++ return 1; // nothing processed ++ } else { ++ return sprintf(buf, "0x%x\n", val); ++ } ++} ++ ++static ssize_t ++mt9p031_basic_reg_val_store( struct device *dev, struct device_attribute *attr, const char *buf, size_t n) ++{ ++ u32 val; ++ sscanf(buf, "%x", &val); ++ ++ if (mt9p031_reg_write(sysPriv.client, mt9p031_attr_basic_addr, (u16)val)) { ++ printk(KERN_INFO "mt9p031: Basic regiser write failed"); ++ return n; // nothing processed ++ } else { ++ return n; ++ } ++} ++static DEVICE_ATTR( basic_reg_val, S_IRUGO|S_IWUSR, mt9p031_basic_reg_val_show, mt9p031_basic_reg_val_store); ++ ++ ++/* Exposure time access support */ ++static ssize_t ++mt9p031_exposure_val_show( struct device *dev, struct device_attribute *attr, char *buf) ++{ ++ u32 val; ++ struct vcontrol *lvc; ++ int i = find_vctrl(V4L2_CID_EXPOSURE); ++ if (i < 0) ++ return -EINVAL; ++ lvc = &mt9p031_video_control[i]; ++ val = lvc->current_value; ++ ++ if(val < 0){ ++ printk(KERN_INFO "mt9p031: Exposure value read failed"); ++ return 1; // nothing processed ++ } else { ++ return sprintf(buf, "%d\n", val); ++ } ++} ++ ++ ++static ssize_t ++mt9p031_exposure_val_store( struct device *dev, struct device_attribute *attr, const char *buf, size_t n) ++{ ++ u32 val; ++ struct i2c_client *client; ++ struct vcontrol *lvc; ++ ++ sscanf(buf, "%d", &val); ++ client = sysPriv.client; ++ ++ lvc = &mt9p031_video_control[V4L2_CID_EXPOSURE]; ++ ++ if (mt9p031_set_exposure_time((u32)val, client, lvc)) { ++ printk(KERN_INFO "mt9p031: Exposure write failed"); ++ return n; // nothing processed ++ } else { ++ return n; ++ } ++} ++ ++static DEVICE_ATTR( exposure_val, S_IRUGO|S_IWUSR, mt9p031_exposure_val_show, mt9p031_exposure_val_store); ++ ++ ++/* Global Gain access support */ ++static ssize_t ++mt9p031_gain_val_show( struct device *dev, struct device_attribute *attr, char *buf) ++{ ++ u16 val; ++ struct vcontrol *lvc; ++ ++ int i = find_vctrl(V4L2_CID_GAIN); ++ if (i < 0) ++ return -EINVAL; ++ lvc = &mt9p031_video_control[i]; ++ val = lvc->current_value; ++ ++ if(val < 0){ ++ printk(KERN_INFO "mt9p031: Global Gain value read failed"); ++ return 1; // nothing processed ++ } else { ++ return sprintf(buf, "%d\n", val); ++ } ++} ++ ++static ssize_t ++mt9p031_gain_val_store( struct device *dev, struct device_attribute *attr, const char *buf, size_t n) ++{ ++ u16 val; ++ struct i2c_client *client; ++ struct vcontrol *lvc; ++ ++ sscanf(buf, "%hd", &val); ++ client = sysPriv.client; ++ ++ lvc = &mt9p031_video_control[V4L2_CID_GAIN]; ++ ++ if (mt9p031_set_gain(val, client, lvc)) { ++ printk(KERN_INFO "mt9p031: Global gain write failed"); ++ return n; // nothing processed ++ } else { ++ return n; ++ } ++} ++ ++static DEVICE_ATTR( gain_val, S_IRUGO|S_IWUSR, mt9p031_gain_val_show, mt9p031_gain_val_store); ++ ++ ++static struct attribute *mt9p031_sysfs_attr[] = { ++ &dev_attr_basic_reg_addr.attr, ++ &dev_attr_basic_reg_val.attr, ++ &dev_attr_exposure_val.attr, ++ &dev_attr_gain_val.attr, ++}; ++ ++static int mt9p031_sysfs_add(struct kobject *kobj) ++{ ++ int i = ARRAY_SIZE(mt9p031_sysfs_attr); ++ int rval = 0; ++ ++ do { ++ rval = sysfs_create_file(kobj, mt9p031_sysfs_attr[--i]); ++ } while((i > 0) && (rval == 0)); ++ return rval; ++} ++ ++static int mt9p031_sysfs_rm(struct kobject *kobj) ++{ ++ int i = ARRAY_SIZE(mt9p031_sysfs_attr); ++ int rval = 0; ++ ++ do { ++ sysfs_remove_file(kobj, mt9p031_sysfs_attr[--i]); ++ } while(i > 0); ++ return rval; ++} ++#endif //MT9P031_DEBUG ++ ++static struct v4l2_int_slave mt9p031_slave = { ++ .ioctls = mt9p031_ioctl_desc, ++ .num_ioctls = ARRAY_SIZE(mt9p031_ioctl_desc), ++}; ++ ++static int mt9p031_probe(struct i2c_client *client, ++ const struct i2c_device_id *did) ++{ ++ struct mt9p031_priv *priv; ++ struct v4l2_int_device *v4l2_int_device; ++ int ret; ++ if (!client->dev.platform_data) { ++ dev_err(&client->dev, "no platform data?\n"); ++ return -ENODEV; ++ } ++ ++ priv = kzalloc(sizeof(*priv), GFP_KERNEL); ++ if (!priv) ++ return -ENOMEM; ++ ++ v4l2_int_device = kzalloc(sizeof(*v4l2_int_device), GFP_KERNEL); ++ if (!v4l2_int_device) { ++ kfree(priv); ++ return -ENOMEM; ++ } ++ ++#ifdef MT9P031_HEADBOARD ++ mt9p031_config_PCA9543A(client); //configure i2c level shifter on mt9p031 head-board, no need for Leopard module ++ mdelay(10); ++#endif //MT9P031_HEADBOARD ++ ++ v4l2_int_device->module = THIS_MODULE; ++ strncpy(v4l2_int_device->name, "mt9p031", sizeof(v4l2_int_device->name)); ++ ++ v4l2_int_device->type = v4l2_int_type_slave; ++ v4l2_int_device->u.slave = &mt9p031_slave; ++ ++ v4l2_int_device->priv = priv; ++ ++ priv->v4l2_int_device = v4l2_int_device; ++ priv->client = client; ++ priv->pdata = client->dev.platform_data; ++ ++ priv->pdata->flags = MT9P031_FLAG_PCLK_RISING_EDGE; ++ ++ /* Setting Pixel Values */ ++ priv->pix.width = mt9p031_sizes[0].width; ++ priv->pix.height = mt9p031_sizes[0].height; ++ priv->pix.pixelformat = mt9p031_formats[0].pixelformat; ++ ++ i2c_set_clientdata(client, priv); ++ ++ sysPriv.client = priv->client; ++ ++ ret = v4l2_int_device_register(priv->v4l2_int_device); ++ if (ret) { ++ i2c_set_clientdata(client, NULL); ++ kfree(v4l2_int_device); ++ kfree(priv); ++ } ++ ++#ifdef MT9P031_DEBUG ++ mt9p031_sysfs_add(&client->dev.kobj); ++#endif //MT9P031_DEBUG ++ return ret; ++} ++ ++static int mt9p031_remove(struct i2c_client *client) ++{ ++ struct mt9p031_priv *priv = i2c_get_clientdata(client); ++ ++ v4l2_int_device_unregister(priv->v4l2_int_device); ++ i2c_set_clientdata(client, NULL); ++ mt9p031_sysfs_rm(&client->dev.kobj); ++ ++ kfree(priv->v4l2_int_device); ++ kfree(priv); ++ return 0; ++} ++ ++static const struct i2c_device_id mt9p031_id[] = { ++ { "mt9p031", 0 }, ++ { } ++}; ++MODULE_DEVICE_TABLE(i2c, mt9p031_id); ++ ++static struct i2c_driver mt9p031_i2c_driver = { ++ .driver = { ++ .name = "mt9p031", ++ }, ++ .probe = mt9p031_probe, ++ .remove = mt9p031_remove, ++ .id_table = mt9p031_id, ++}; ++ ++/************************************************************************ ++ module function ++************************************************************************/ ++static int __init mt9p031_module_init(void) ++{ ++ return i2c_add_driver(&mt9p031_i2c_driver); ++} ++ ++static void __exit mt9p031_module_exit(void) ++{ ++ i2c_del_driver(&mt9p031_i2c_driver); ++} ++ ++module_init(mt9p031_module_init); ++module_exit(mt9p031_module_exit); ++ ++MODULE_DESCRIPTION("mt9p031 sensor driver"); ++MODULE_AUTHOR("Aptina"); ++MODULE_LICENSE("GPL v2"); ++ +diff --git a/include/media/mt9p031.h b/include/media/mt9p031.h +new file mode 100644 +index 0000000..d119589 +--- /dev/null ++++ b/include/media/mt9p031.h +@@ -0,0 +1,30 @@ ++/* mt9p031 Camera ++ * ++ * 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 __MT9P031_H__ ++#define __MT9P031_H__ ++ ++#include ++ ++#define MT9P031_I2C_ADDR 0x48 //(0x90 >> 1) ++ ++#define MT9P031_CLK_MAX (27000000) /* 27MHz */ ++#define MT9P031_CLK_MIN (6000000) /* 6Mhz */ ++ ++#define MT9P031_FLAG_PCLK_RISING_EDGE (1 << 0) ++#define MT9P031_FLAG_DATAWIDTH_8 (1 << 1) /* default width is 10 */ ++ ++struct mt9p031_platform_data { ++ char *master; ++ int (*power_set) (struct v4l2_int_device *s, enum v4l2_power on); ++ int (*ifparm) (struct v4l2_ifparm *p); ++ int (*priv_data_set) (void *); ++ u32 (*set_xclk) (struct v4l2_int_device *s, u32 xclkfreq); ++ u32 flags; ++}; ++ ++#endif /* __MT9P031_H__ */ +diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h +index 6cc107d..7599bf1 100644 +--- a/include/media/v4l2-chip-ident.h ++++ b/include/media/v4l2-chip-ident.h +@@ -271,6 +271,7 @@ enum { + V4L2_IDENT_MT9T112 = 45022, + V4L2_IDENT_MT9V111 = 45031, + V4L2_IDENT_MT9V112 = 45032, ++ V4L2_IDENT_MT9P031 = 6145, + + /* HV7131R CMOS sensor: just ident 46000 */ + V4L2_IDENT_HV7131R = 46000, +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-psp-2.6.32/cam/5m03/0002-board-omap3beagle-import-li5m03-driver-from-https-gi.patch b/recipes/linux/linux-omap-psp-2.6.32/cam/5m03/0002-board-omap3beagle-import-li5m03-driver-from-https-gi.patch new file mode 100644 index 0000000000..2b45f1970b --- /dev/null +++ b/recipes/linux/linux-omap-psp-2.6.32/cam/5m03/0002-board-omap3beagle-import-li5m03-driver-from-https-gi.patch @@ -0,0 +1,294 @@ +From 675ad06f53fbb0c7f398aaff8c3508196dfeb9bc Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Sun, 1 May 2011 16:41:57 +0200 +Subject: [PATCH 2/2] board-omap3beagle: import li5m03 driver from https://github.com/Aptina/BeagleBoard-xM/tree/master/Angstrom/MT9P031 + +Properly hook it into the board file and some more updates + +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/board-omap3beagle-camera.c | 186 +++++++++++++++++++++++- + arch/arm/mach-omap2/board-omap3beagle.c | 20 +++ + 2 files changed, 198 insertions(+), 8 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c b/arch/arm/mach-omap2/board-omap3beagle-camera.c +index 110c2c9..97f0e7a 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle-camera.c ++++ b/arch/arm/mach-omap2/board-omap3beagle-camera.c +@@ -160,6 +160,8 @@ static int mt9v113_power_set(struct v4l2_int_device *s, enum v4l2_power power) + case V4L2_POWER_ON: + + isp_configure_interface(vdev->cam->isp, &mt9v113_if_config); ++ /* Set RESET_BAR to 0 */ ++ gpio_set_value(LEOPARD_RESET_GPIO, 0); + + /* turn on VDD */ + regulator_enable(cam_1v8_reg); +@@ -168,9 +170,6 @@ static int mt9v113_power_set(struct v4l2_int_device *s, enum v4l2_power power) + regulator_enable(cam_2v8_reg); + mdelay(50); + +- /* Set RESET_BAR to 0 */ +- gpio_set_value(LEOPARD_RESET_GPIO, 0); +- + /* Enable EXTCLK */ + isp_set_xclk(vdev->cam->isp, MT9V113_CLK_MIN*2, CAM_USE_XCLKA); + /* +@@ -294,7 +293,7 @@ static int mt9t112_set_prv_data(void *priv) + } + + /** +- * @brief mt9t112_power_set - Power-on or power-off TVP5146 device ++ * @brief mt9t112_power_set - Power-on or power-off MT9T112 device + * + * @param power - enum, Power on/off, resume/standby + * +@@ -320,6 +319,8 @@ static int mt9t112_power_set(struct v4l2_int_device *s, enum v4l2_power power) + isp_configure_interface(vdev->cam->isp, &mt9t112_if_config); + #endif + ++ /* Set RESET_BAR to 0 */ ++ gpio_set_value(LEOPARD_RESET_GPIO, 0); + + /* turn on VDD */ + regulator_enable(cam_1v8_reg); +@@ -331,11 +332,8 @@ static int mt9t112_power_set(struct v4l2_int_device *s, enum v4l2_power power) + + mdelay(50); + +- /* Set RESET_BAR to 0 */ +- gpio_set_value(LEOPARD_RESET_GPIO, 0); +- + /* Enable EXTCLK */ +- isp_set_xclk(vdev->cam->isp, 24000000, CAM_USE_XCLKA); ++ isp_set_xclk(vdev->cam->isp, 12000000, CAM_USE_XCLKA); + + /* + * Wait at least 70 CLK cycles (w/EXTCLK = 24MHz): +@@ -372,6 +370,178 @@ struct mt9t112_platform_data mt9t112_pdata = { + + #endif /* #ifdef CONFIG_VIDEO_MT9T112 */ + ++#if defined(CONFIG_SOC_CAMERA_MT9P031) || defined(CONFIG_SOC_CAMERA_MT9P031_MODULE) ++#include ++ ++#define ISP_MT9P031_MCLK 216000000 ++ ++/* Arbitrary memory handling limit */ ++#define MT9P031_BIGGEST_FRAME_BYTE_SIZE PAGE_ALIGN((2592 * 1944) * 2 * 4 ) ++ ++static struct isp_interface_config mt9p031_if_config = { ++ .ccdc_par_ser = ISP_PARLL, ++ .dataline_shift = 0x1, ++ .hsvs_syncdetect = ISPCTRL_SYNC_DETECT_VSRISE, ++ .strobe = 0x0, ++ .prestrobe = 0x0, ++ .shutter = 0x0, ++ .cam_mclk = ISP_MT9P031_MCLK, ++ .wenlog = ISPCCDC_CFG_WENLOG_AND, ++ .wait_hs_vs = 2, ++ .u.par.par_bridge = 0x0, ++ .u.par.par_clk_pol = 0x0, ++}; ++ ++static struct v4l2_ifparm mt9p031_ifparm_s = { ++ .if_type = V4L2_IF_TYPE_RAW, ++ .u = { ++ .raw = { ++ .frame_start_on_rising_vs = 1, ++ .bt_sync_correct = 0, ++ .swap = 0, ++ .latch_clk_inv = 0, ++ .nobt_hs_inv = 0, /* active high */ ++ .nobt_vs_inv = 0, /* active high */ ++ .clock_min = MT9P031_CLK_MIN, ++ .clock_max = MT9P031_CLK_MAX, ++ }, ++ }, ++}; ++ ++/** ++ * @brief mt9p031_ifparm - Returns the mt9p031 interface parameters ++ * ++ * @param p - pointer to v4l2_ifparm structure ++ * ++ * @return result of operation - 0 is success ++ */ ++static int mt9p031_ifparm(struct v4l2_ifparm *p) ++{ ++ if (p == NULL) ++ return -EINVAL; ++ ++ *p = mt9p031_ifparm_s; ++ return 0; ++} ++ ++#if defined(CONFIG_VIDEO_OMAP3) || defined(CONFIG_VIDEO_OMAP3_MODULE) ++static struct omap34xxcam_hw_config mt9p031_hwc = { ++ .dev_index = 1, ++ .dev_minor = -1, ++ .dev_type = OMAP34XXCAM_SLAVE_SENSOR, ++ .u.sensor.sensor_isp = 0, ++ .u.sensor.capture_mem = MT9P031_BIGGEST_FRAME_BYTE_SIZE, ++ .u.sensor.ival_default = { 1, 30 }, ++}; ++#endif ++ ++/** ++ * @brief mt9p031_set_prv_data - Returns mt9p031 omap34xx driver private data ++ * ++ * @param priv - pointer to omap34xxcam_hw_config structure ++ * ++ * @return result of operation - 0 is success ++ */ ++static int mt9p031_set_prv_data(void *priv) ++{ ++#if defined(CONFIG_VIDEO_OMAP3) || defined(CONFIG_VIDEO_OMAP3_MODULE) ++ struct omap34xxcam_hw_config *hwc = priv; ++ ++ if (priv == NULL) ++ return -EINVAL; ++ ++ *hwc = mt9p031_hwc; ++ return 0; ++#else ++ return -EINVAL; ++#endif ++} ++ ++/** ++ * @brief mt9p031_power_set - Power-on or power-off mt9p031 device ++ * ++ * @param power - enum, Power on/off, resume/standby ++ * ++ * @return result of operation - 0 is success ++ */ ++static int mt9p031_power_set(struct v4l2_int_device *s, enum v4l2_power power) ++{ ++ struct omap34xxcam_videodev *vdev = s->u.slave->master->priv; ++ switch (power) { ++ case V4L2_POWER_OFF: ++ case V4L2_POWER_STANDBY: ++ isp_set_xclk(vdev->cam->isp, 0, CAM_USE_XCLKA); ++ ++ if (regulator_is_enabled(cam_1v8_reg)) ++ regulator_disable(cam_1v8_reg); ++ if (regulator_is_enabled(cam_2v8_reg)) ++ regulator_disable(cam_2v8_reg); ++ break; ++ ++ case V4L2_POWER_ON: ++#if defined(CONFIG_VIDEO_OMAP3) || defined(CONFIG_VIDEO_OMAP3_MODULE) ++ isp_configure_interface(vdev->cam->isp, &mt9p031_if_config); ++#endif ++ ++ /* Set RESET_BAR to 0 */ ++ gpio_set_value(LEOPARD_RESET_GPIO, 0); ++ ++ /* turn on VDD */ ++ regulator_enable(cam_1v8_reg); ++ ++ mdelay(1); ++ ++ /* turn on VDD_IO */ ++ regulator_enable(cam_2v8_reg); ++ ++ mdelay(50); ++ ++ /* Enable EXTCLK */ ++ isp_set_xclk(vdev->cam->isp, 24000000, CAM_USE_XCLKA); //works for 36MHz too; try at lower freq ++ ++ /* ++ * Wait at least 70 CLK cycles (w/EXTCLK = 24MHz): ++ * ((1000000 * 70) / 24000000) = aprox 2.91 us. ++ */ ++ ++ udelay(3); ++ ++ /* Set RESET_BAR to 1 */ ++ gpio_set_value(LEOPARD_RESET_GPIO, 1); ++ ++ /* ++ * Wait at least 100 CLK cycles (w/EXTCLK = 24MHz): ++ * ((1000000 * 100) / 24000000) = aprox 4.16 us. ++ */ ++ ++ udelay(5); ++ ++ break; ++ ++ default: ++ return -ENODEV; ++ break; ++ } ++ return 0; ++} ++ ++static u32 mt9p031_set_xclk(struct v4l2_int_device *s, u32 xclkfreq) ++{ ++ struct omap34xxcam_videodev *vdev = s->u.slave->master->priv; ++ return isp_set_xclk(vdev->cam->isp, xclkfreq, 0); ++} ++ ++ ++struct mt9p031_platform_data mt9p031_pdata = { ++ .master = "omap34xxcam", ++ .power_set = mt9p031_power_set, ++ .set_xclk = mt9p031_set_xclk, ++ .priv_data_set = mt9p031_set_prv_data, ++ .ifparm = mt9p031_ifparm, ++}; ++ ++#endif /* #ifdef CONFIG_SOC_CAMERA_MT9P031 */ ++ + static int beagle_cam_probe(struct platform_device *pdev) + { + cam_1v8_reg = regulator_get(&pdev->dev, "cam_1v8"); +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 2677b41..e561431 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -83,6 +83,12 @@ extern struct mt9v113_platform_data mt9v113_pdata; + extern struct mt9t112_platform_data mt9t112_pdata; + #endif + ++#if defined(CONFIG_SOC_CAMERA_MT9P031) || defined(CONFIG_SOC_CAMERA_MT9P031_MODULE) ++#include ++#include ++extern struct mt9p031_platform_data mt9p031_pdata; ++#endif ++ + #define GPMC_CS0_BASE 0x60 + #define GPMC_CS_SIZE 0x30 + +@@ -614,6 +620,15 @@ static struct i2c_board_info __initdata beagle_lbcm3m1_i2c2_boardinfo[] = { + #endif + }; + ++static struct i2c_board_info __initdata beagle_lbcm5m03_i2c2_boardinfo[] = { ++#if defined(CONFIG_SOC_CAMERA_MT9P031) || defined(CONFIG_SOC_CAMERA_MT9P031_MODULE) ++ { ++ I2C_BOARD_INFO("mt9p031", MT9P031_I2C_ADDR), ++ .platform_data = &mt9p031_pdata, ++ }, ++#endif ++}; ++ + static int __init omap3_beagle_i2c_init(void) + { + omap_register_i2c_bus(1, 2600, beagle_i2c1_boardinfo, +@@ -636,6 +651,11 @@ static int __init omap3_beagle_i2c_init(void) + " registering i2c2 bus for lbcm3m1\n"); + omap_register_i2c_bus(2, 400, beagle_lbcm3m1_i2c2_boardinfo, + ARRAY_SIZE(beagle_lbcm3m1_i2c2_boardinfo)); ++ } else if (!strcmp(cameraboard_name, "lbcm5m03")) { ++ printk(KERN_INFO "Beagle cameraboard:" ++ " registering i2c2 bus for lbcm5m03\n"); ++ omap_register_i2c_bus(2, 400, beagle_lbcm5m03_i2c2_boardinfo, ++ ARRAY_SIZE(beagle_lbcm5m03_i2c2_boardinfo)); + } else { + omap_register_i2c_bus(2, 400, NULL, 0); + } +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-psp_2.6.32.bb b/recipes/linux/linux-omap-psp_2.6.32.bb index b392fc072f..c068b733fd 100644 --- a/recipes/linux/linux-omap-psp_2.6.32.bb +++ b/recipes/linux/linux-omap-psp_2.6.32.bb @@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "am3517-crane|beagleboard|omap3evm|am3517-evm|dm37x-evm|am3 SRCREV = "5fc29e7b2a76a64a739f857858ef0b98294aa155" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -MACHINE_KERNEL_PR_append = "a+gitr${SRCREV}" +MACHINE_KERNEL_PR_append = "b+gitr${SRCREV}" SRC_URI = "git://arago-project.org/git/projects/linux-omap3.git;protocol=http;branch=master \ file://0001-Added-Crane-Board-support.patch \ @@ -133,6 +133,7 @@ SRC_URI = "git://arago-project.org/git/projects/linux-omap3.git;protocol=http;br file://cam/0073-mt9v113-Fix-State-variable-handling.patch \ file://cam/0074-Move-sensor-rest-to-after-applying-power.patch \ file://cam/0075-omap3beagle-Add-camera-bootarg.patch \ + file://cam/5m03/0001-mt9p031-import-driver-from-https-github.com-Aptina-B.patch \ file://0001-BeagleBoard-Adjust-USER-button-pin-for-xM.patch \ file://0001-PSP-3.0.1.6-kernel-source-patched-with-OCF-Linux.patch \ file://porches.patch \ @@ -149,6 +150,7 @@ SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ file://beagleboard-xmc/0006-omap3-beaglexm-fix-power-on-of-DVI.patch \ file://beagleboard-xmc/0007-beagleboard-hack-in-support-from-xM-rev-C.patch \ file://beagleboard-xmc/0008-omap3-beagle-cleaned-up-board-revision-conditions.patch \ + file://cam/5m03/0002-board-omap3beagle-import-li5m03-driver-from-https-gi.patch \ " SRC_URI_append_omap3-touchbook = " \ From 6a51f3586480f5bd7cf584527589ccfbc580832c Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 5 Apr 2011 15:00:10 -0700 Subject: [PATCH 316/509] ncurses: Add version 5.9 This is relatively close to our 5.7 version in that we had been using 5.7 + a snapshot of trunk which became 5.8 and then 5.9. Signed-off-by: Tom Rini --- .../{ncurses-5.7 => ncurses}/config.cache | 0 .../{ncurses-5.7 => ncurses}/tic-hang.patch | 0 recipes/ncurses/ncurses_5.9.bb | 236 ++++++++++++++++++ 3 files changed, 236 insertions(+) rename recipes/ncurses/{ncurses-5.7 => ncurses}/config.cache (100%) rename recipes/ncurses/{ncurses-5.7 => ncurses}/tic-hang.patch (100%) create mode 100644 recipes/ncurses/ncurses_5.9.bb diff --git a/recipes/ncurses/ncurses-5.7/config.cache b/recipes/ncurses/ncurses/config.cache similarity index 100% rename from recipes/ncurses/ncurses-5.7/config.cache rename to recipes/ncurses/ncurses/config.cache diff --git a/recipes/ncurses/ncurses-5.7/tic-hang.patch b/recipes/ncurses/ncurses/tic-hang.patch similarity index 100% rename from recipes/ncurses/ncurses-5.7/tic-hang.patch rename to recipes/ncurses/ncurses/tic-hang.patch diff --git a/recipes/ncurses/ncurses_5.9.bb b/recipes/ncurses/ncurses_5.9.bb new file mode 100644 index 0000000000..fbfb4774af --- /dev/null +++ b/recipes/ncurses/ncurses_5.9.bb @@ -0,0 +1,236 @@ +DESCRIPTION = "Ncurses library" +HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" +LICENSE = "MIT" +SECTION = "libs" +PR = "r0" + +DEPENDS = "ncurses-native unifdef-native" +DEPENDS_virtclass-native = "unifdef-native" + +inherit autotools binconfig test + +SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \ + file://tic-hang.patch \ + file://config.cache \ +" + +SRC_URI[md5sum] = "8cb9c412e5f2d96bc6f459aa8c6282a1" +SRC_URI[sha256sum] = "9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b" + +PARALLEL_MAKE = "" +EXTRA_AUTORECONF = "-I m4" +CONFIG_SITE =+ "${WORKDIR}/config.cache" + +# Whether to enable separate widec libraries; must be 'true' or 'false' +# +# TODO: remove this variable when widec is supported in every setup? +ENABLE_WIDEC = "true" + +# _GNU_SOURCE is required for widec stuff and is detected automatically +# for target objects. But it must be set manually for native and sdk +# builds. +BUILD_CPPFLAGS += "-D_GNU_SOURCE" + +# Override the function from the autotools class; ncurses requires a +# patched autoconf213 to generate the configure script. This autoconf +# is not available so that the shipped script will be used. +do_configure() { + # check does not work with cross-compiling and is generally + # broken because it requires stdin to be pollable (which is + # not the case for /dev/null redirections) + export cf_cv_working_poll=yes + + for i in \ + 'narrowc' \ + 'widec --enable-widec --without-progs'; do + set -- $i + mkdir -p $1 + cd $1 + shift + + oe_runconf \ + --disable-static \ + --without-debug \ + --without-ada \ + --without-gpm \ + --enable-hard-tabs \ + --enable-xmc-glitch \ + --enable-colorfgbg \ + --with-termpath='${sysconfdir}/termcap:${datadir}/misc/termcap' \ + --with-terminfo-dirs='${sysconfdir}/terminfo:${datadir}/terminfo' \ + --with-shared \ + --disable-big-core \ + --program-prefix= \ + --with-ticlib \ + --with-termlib=tinfo \ + --enable-sigwinch \ + --enable-pc-files \ + --disable-rpath-hack \ + --with-build-cc="${BUILD_CC}" \ + --with-build-cpp="${BUILD_CPP}" \ + --with-build-ld="${BUILD_LD}" \ + --with-build-cflags="${BUILD_CFLAGS}" \ + --with-build-cppflags='${BUILD_CPPFLAGS}' \ + --with-build-ldflags='${BUILD_LDFLAGS}' \ + "$@" + cd .. + done +} + +do_compile() { + oe_runmake -C narrowc libs + oe_runmake -C narrowc/progs + + ! ${ENABLE_WIDEC} || \ + oe_runmake -C widec libs +} + +# set of expected differences between narrowc and widec header +# +# TODO: the NCURSES_CH_T difference can cause real problems :( +_unifdef_cleanup = " \ + -e '\!/\* \$Id: curses.wide,v!,\!/\* \$Id: curses.tail,v!d' \ + -e '/^#define NCURSES_CH_T /d' \ + -e '/^#include /d' \ + -e '\!^/\* .* \*/!d' \ +" + +do_test[dirs] = "${S}" +do_test() { + ${ENABLE_WIDEC} || return 0 + + # make sure that the narrow and widec header are compatible + # and differ only in minor details. + unifdef -k narrowc/include/curses.h | \ + sed ${_unifdef_cleanup} > curses-narrowc.h + unifdef -k widec/include/curses.h | \ + sed ${_unifdef_cleanup} > curses-widec.h + + diff curses-narrowc.h curses-widec.h +} + +_install_opts = "\ + DESTDIR='${D}' \ + PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \ + install.libs install.includes install.man \ +" + +do_install() { + # Order of installation is important; widec installs a 'curses.h' + # header with more definitions and must be installed last hence. + # Compatibility of these headers will be checked in 'do_test()'. + oe_runmake -C narrowc ${_install_opts} \ + install.data install.progs + + ! ${ENABLE_WIDEC} || \ + oe_runmake -C widec ${_install_opts} + + + cd narrowc + + # include some basic terminfo files + # stolen ;) from gentoo and modified a bit + for x in ansi console dumb linux rxvt screen sun vt{52,100,102,200,220} xterm-color xterm-xfree86 + do + local termfile="$(find "${D}${datadir}/terminfo/" -name "${x}" 2>/dev/null)" + local basedir="$(basename $(dirname "${termfile}"))" + + if [ -n "${termfile}" ] + then + install -d ${D}${sysconfdir}/terminfo/${basedir} + mv ${termfile} ${D}${sysconfdir}/terminfo/${basedir}/ + ln -s /etc/terminfo/${basedir}/${x} \ + ${D}${datadir}/terminfo/${basedir}/${x} + fi + done + # i think we can use xterm-color as default xterm + if [ -e ${D}${sysconfdir}/terminfo/x/xterm-color ] + then + ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm + fi + + if [ "${PN}" = "ncurses" ]; then + mv ${D}${bindir}/clear ${D}${bindir}/clear.${PN} + mv ${D}${bindir}/reset ${D}${bindir}/reset.${PN} + fi + + + # create linker scripts for libcurses.so and libncurses to + # link against -ltinfo when needed. Some builds might break + # else when '-Wl,--no-copy-dt-needed-entries' has been set in + # linker flags. + for i in libncurses libncursesw; do + f=${D}${libdir}/$i.so + test -h $f || continue + rm -f $f + echo '/* GNU ld script */' >$f + echo "INPUT($i.so.5 AS_NEEDED(-ltinfo))" >>$f + done + + # create libtermcap.so linker script for backward compatibility + f=${D}${libdir}/libtermcap.so + echo '/* GNU ld script */' >$f + echo 'INPUT(AS_NEEDED(-ltinfo))' >>$f +} + +python populate_packages_prepend () { + libdir = bb.data.expand("${libdir}", d) + pnbase = bb.data.expand("${PN}-lib%s", d) + do_split_packages(d, libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True) +} + + +pkg_postinst_ncurses-tools () { + if [ "${PN}" = "ncurses" ]; then + update-alternatives --install ${bindir}/clear clear clear.${PN} 100 + update-alternatives --install ${bindir}/reset reset reset.${PN} 100 + fi +} + +pkg_prerm_ncurses-tools () { + if [ "${PN}" = "ncurses" ]; then + update-alternatives --remove clear clear.${PN} + update-alternatives --remove reset reset.${PN} + fi +} + +BBCLASSEXTEND = "native sdk" + +PACKAGES += " \ + ${PN}-tools \ + ${PN}-terminfo \ + ${PN}-terminfo-base \ +" + +FILES_${PN} = "\ + ${bindir}/tput \ + ${bindir}/tset \ + ${datadir}/tabset \ +" + +# This keeps only tput/tset in ncurses +# clear/reset are in already busybox +FILES_${PN}-tools = "\ + ${bindir}/tic \ + ${bindir}/toe \ + ${bindir}/infotocap \ + ${bindir}/captoinfo \ + ${bindir}/infocmp \ + ${bindir}/clear.${PN} \ + ${bindir}/reset.${PN} \ + ${bindir}/tack \ + ${bindir}/tabs \ +" +# 'reset' is a symlink to 'tset' which is in the 'ncurses' package +RDEPENDS_${PN}-tools = "${PN}" + +FILES_${PN}-terminfo = "\ + ${datadir}/terminfo \ +" + +FILES_${PN}-terminfo-base = "\ + ${sysconfdir}/terminfo \ +" + +RSUGGESTS_${PN}-libtinfo = "${PN}-terminfo" +RRECOMMENDS_${PN}-libtinfo = "${PN}-terminfo-base" From b170ea939a7ad84b8e6ea4ff1ecb0a5d3da2c22b Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Sat, 30 Apr 2011 21:42:10 +0200 Subject: [PATCH 317/509] icedtea6-native_1.7.10: Remove reference to deleted patch. During my cherry-pick of Henning's patch from master I somehow b0rked the commit by loosing this hunk that also deletes the reference to the deleted patch file. Signed-off-by: Stefan Schmidt --- recipes/icedtea/icedtea6-native_1.7.10.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/icedtea/icedtea6-native_1.7.10.bb b/recipes/icedtea/icedtea6-native_1.7.10.bb index c55e197d4b..77c6232e04 100644 --- a/recipes/icedtea/icedtea6-native_1.7.10.bb +++ b/recipes/icedtea/icedtea6-native_1.7.10.bb @@ -33,5 +33,4 @@ export DISTRIBUTION_PATCHES = "\ patches/icedtea-hotspot-make-arch-sane-for-x86.patch \ patches/icedtea-jdk-sane-x86-arch.patch \ patches/icedtea-unbreak-float.patch \ - patches/icedtea-jdk-build-sizer-32-on-amd64.patch \ " From 63465aee1a86fcfc74b9561a66d092e51eb302ed Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Fri, 25 Mar 2011 20:39:21 +0100 Subject: [PATCH 318/509] llvm: merge native recipe into the normal recipe * use BBCLASSEXTENDED = "native" * remove do_stage * bump PR Signed-off-by: Stefan Schmidt --- recipes/llvm/llvm-native.inc | 33 -------------- recipes/llvm/llvm.inc | 70 +++++++++++++++++++++--------- recipes/llvm/llvm2.7-native_2.7.bb | 12 ----- recipes/llvm/llvm2.7_2.7.bb | 5 +-- 4 files changed, 51 insertions(+), 69 deletions(-) delete mode 100644 recipes/llvm/llvm-native.inc delete mode 100644 recipes/llvm/llvm2.7-native_2.7.bb diff --git a/recipes/llvm/llvm-native.inc b/recipes/llvm/llvm-native.inc deleted file mode 100644 index b3cb7a64ec..0000000000 --- a/recipes/llvm/llvm-native.inc +++ /dev/null @@ -1,33 +0,0 @@ -require llvm.inc - -DEPENDS = "llvm-common-native cmake-native binutils-cross perl-native" - -inherit native - -# the difference to the non-native build is that we do not need -# to declare the location of the tblgen executable. -EXTRA_OECMAKE = "\ - -DLLVM_TARGETS_TO_BUILD=${LLVM_ARCH} \ - -DCMAKE_LINKER:FILEPATH=${LD} \ - -DCMAKE_AR:FILEPATH=${AR} \ - -DCMAKE_OBJCOPY:FILEPATH=${OBJCOPY} \ - -DCMAKE_OBJDUMP:FILEPATH=${OBJDUMP} \ - -DCMAKE_RANLIB:FILEPATH=${RANLIB} \ - -DCMAKE_STRIP:FILEPATH=${STRIP} \ - -DNM_PATH:FILEPATH=${NM} \ -" - -PACKAGES = "" - -PACKAGES_DYNAMIC = "" - -do_stage() { - cd ${OECMAKE_BUILDPATH} - - llvm_stage - - install -d ${STAGING_BINDIR} - install -m 0755 bin/llvm-config${LLVM_RELEASE} ${STAGING_BINDIR} -} - - diff --git a/recipes/llvm/llvm.inc b/recipes/llvm/llvm.inc index b53af6e756..8f85857dcc 100644 --- a/recipes/llvm/llvm.inc +++ b/recipes/llvm/llvm.inc @@ -20,12 +20,16 @@ DESCRIPTION = "The Low Level Virtual Machine" HOMEPAGE = "http://llvm.org" +BBCLASSEXTEND = "native" + DEPENDS = "llvm-common llvm${LLVM_RELEASE}-native" +DEPENDS_virtclass-native = "llvm-common-native cmake-native perl-native" + # 3-clause BSD-like LICENSE = "University of Illinois/NCSA Open Source License" -SRC_URI = "http://llvm.org/releases/${PV}/llvm-${PV}.tar.gz" +SRC_URI = "http://llvm.org/releases/${PV}/llvm-${PV}.tgz" S = "${WORKDIR}/llvm-${PV}" @@ -63,12 +67,30 @@ EXTRA_OECMAKE = "\ # We need to reset this to avoid breakage as we build out of tree TOOLCHAIN_OPTIONS = "" -PACKAGES = "${PN} ${PN}-dev ${PN}-dbg ${PN}-doc" +PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-dev ${PN}" PACKAGES_DYNAMIC = "llvm-*" + +# the difference to the non-native build is that we do not need +# to declare the location of the tblgen executable. +EXTRA_OECMAKE_virtclass-native = "\ + -DLLVM_TARGETS_TO_BUILD=${LLVM_ARCH} \ + -DCMAKE_LINKER:FILEPATH=${LD} \ + -DCMAKE_AR:FILEPATH=${AR} \ + -DCMAKE_OBJCOPY:FILEPATH=${OBJCOPY} \ + -DCMAKE_OBJDUMP:FILEPATH=${OBJDUMP} \ + -DCMAKE_RANLIB:FILEPATH=${RANLIB} \ + -DCMAKE_STRIP:FILEPATH=${STRIP} \ + -DNM_PATH:FILEPATH=${NM} \ +" + +PACKAGES_virtclass-native = "" + +PACKAGES_DYNAMIC_virtclass-native = "" + python populate_packages_prepend () { - libllvm_libdir = bb.data.expand('${libdir}/', d) + libllvm_libdir = bb.data.expand('${libdir}/llvm${LLVM_RELEASE}', d) do_split_packages(d, libllvm_libdir, '^lib(.*)\.so$', 'libllvm-%s', 'Split package for %s', allow_dirs=True) } @@ -76,32 +98,37 @@ python populate_packages_prepend () { FILES_${PN} = "" ALLOW_EMPTY_${PN} = "1" -FILES_${PN}-dev = "${includedir} ${bindir}/* ${libdir}/LLVMHello.so" +FILES_${PN}-dbg += "${libdir}/llvm${LLVM_RELEASE}/.debug ${bindir}/llvm${LLVM_RELEASE}/.debug" + +FILES_${PN}-dev = "${includedir} ${bindir}/* ${libdir}/llvm${LLVM_RELEASE}/LLVMHello.so" -llvm_stage() { +do_install() { # Install into a private directory to be able to reorganize the files. - oe_runmake DESTDIR=${WORKDIR}/llvm-install install + + cd ${OECMAKE_BUILDPATH} + + oe_runmake DESTDIR=${WORKDIR}/llvm-install install # Create our custom target directories - install -d ${STAGING_BINDIR}/llvm${LLVM_RELEASE} - install -d ${STAGING_INCDIR}/llvm${LLVM_RELEASE} - install -d ${STAGING_LIBDIR}/llvm${LLVM_RELEASE} + install -d ${D}${bindir}/llvm${LLVM_RELEASE} + install -d ${D}${includedir}/llvm${LLVM_RELEASE} + install -d ${D}${libdir}/llvm${LLVM_RELEASE} # Move headers into their own directory cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm \ - ${STAGING_INCDIR}/llvm${LLVM_RELEASE}/ + ${D}${includedir}/llvm${LLVM_RELEASE}/ cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm-c \ - ${STAGING_INCDIR}/llvm${LLVM_RELEASE}/ + ${D}${includedir}/llvm${LLVM_RELEASE}/ find ${WORKDIR}/llvm-install/${prefix}/lib -name "*" -maxdepth 1 -exec \ - install {} ${STAGING_LIBDIR}/llvm${LLVM_RELEASE} \; + install {} ${D}${libdir}/llvm${LLVM_RELEASE} \; # I dont know another way out. Binaries are installed into a special subdir find ${WORKDIR}/llvm-install/${prefix}/bin -name "*" -maxdepth 1 -exec \ - install {} ${STAGING_BINDIR}/llvm${LLVM_RELEASE} \; + install {} ${D}${bindir}/llvm${LLVM_RELEASE} \; # LLVM does not install this by default. - install bin/tblgen ${STAGING_BINDIR}/llvm${LLVM_RELEASE} + install bin/tblgen ${D}${bindir}/llvm${LLVM_RELEASE} # Fix the paths in the config script to make it find the binaries and # library files. Doing so allows 3rd party configure scripts working @@ -112,14 +139,15 @@ llvm_stage() { -e's!my.*BINDIR.*!my $BINDIR = "${STAGING_BINDIR}/llvm${LLVM_RELEASE}";!' \ bin/llvm-config > bin/llvm-config${LLVM_RELEASE} } + +do_install_append_virtclass-native() { + install -d ${D}${bindir} + install -m 0755 bin/llvm-config${LLVM_RELEASE} ${D}${bindir} +} -do_stage() { - cd ${OECMAKE_BUILDPATH} - - llvm_stage - - install -d ${STAGING_BINDIR_CROSS} - install -m 0755 bin/llvm-config${LLVM_RELEASE} ${STAGING_BINDIR_CROSS} +do_install_append() { + install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/ + install -m 0755 bin/llvm-config${LLVM_RELEASE} ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS} } # Retrieve the target in a way that is compatible to the arch diff --git a/recipes/llvm/llvm2.7-native_2.7.bb b/recipes/llvm/llvm2.7-native_2.7.bb deleted file mode 100644 index e438702d9a..0000000000 --- a/recipes/llvm/llvm2.7-native_2.7.bb +++ /dev/null @@ -1,12 +0,0 @@ -require llvm-native.inc - -PR = "r0" - -SRC_URI = "\ - http://llvm.org/releases/${PV}/llvm-${PV}.tgz \ -" - -LLVM_RELEASE = "2.7" - -SRC_URI[md5sum] = "ac322661f20e7d6c810b1869f886ad9b" -SRC_URI[sha256sum] = "99664bdc8503a306038166af33f28eb426d99e297575a59d74a1a0dcbddbbca5" diff --git a/recipes/llvm/llvm2.7_2.7.bb b/recipes/llvm/llvm2.7_2.7.bb index ef2da43e07..4353622323 100644 --- a/recipes/llvm/llvm2.7_2.7.bb +++ b/recipes/llvm/llvm2.7_2.7.bb @@ -1,14 +1,13 @@ require llvm.inc -PR = "r8" +PR = "r9" DEPENDS = "llvm-common llvm2.7-native" # Force arm mode for armv4t until http://llvm.org/bugs/show_bug.cgi?id=6065 is resolved somehow ARM_INSTRUCTION_SET_armv4t = "ARM" -SRC_URI = "\ - http://llvm.org/releases/${PV}/llvm-${PV}.tgz \ +SRC_URI += "\ file://arm_ppc.patch \ file://r97745-llvmPR6480.patch \ file://r104558-VFPmisc.patch \ From 804dc24ef27475c84959437f09668d39829c21ad Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Fri, 25 Mar 2011 18:07:21 +0100 Subject: [PATCH 319/509] ecj: for ecj-initial 512 mb heapsize is okay for ecj-bootstrap we need 1024 Signed-off-by: Stefan Schmidt --- recipes/ecj/ecj-bootstrap-native.bb | 2 +- recipes/ecj/ecj-initial.bb | 6 +++--- recipes/ecj/files/ecj-initial.in | 1 + recipes/ecj/files/ecj.in | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) create mode 100755 recipes/ecj/files/ecj-initial.in diff --git a/recipes/ecj/ecj-bootstrap-native.bb b/recipes/ecj/ecj-bootstrap-native.bb index 594b08cb9c..bdb9797d92 100644 --- a/recipes/ecj/ecj-bootstrap-native.bb +++ b/recipes/ecj/ecj-bootstrap-native.bb @@ -17,7 +17,7 @@ SRC_URI = "file://ecj.in" S = "${WORKDIR}" -PR = "r2" +PR = "r3" JAR = "ecj-bootstrap.jar" diff --git a/recipes/ecj/ecj-initial.bb b/recipes/ecj/ecj-initial.bb index 8ddbc7ccf6..1809cd6904 100644 --- a/recipes/ecj/ecj-initial.bb +++ b/recipes/ecj/ecj-initial.bb @@ -9,9 +9,9 @@ LICENSE = "EPL" DEPENDS = "libecj-bootstrap" -PR = "r1" +PR = "r2" -SRC_URI = "file://ecj.in" +SRC_URI = "file://ecj-initial.in" NATIVE_INSTALL_WORKS = "1" @@ -26,7 +26,7 @@ do_compile() { echo "#!/bin/sh" > ecj-initial echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial echo "RUNTIME=java-initial" >> ecj-initial - cat ecj.in >> ecj-initial + cat ecj-initial.in >> ecj-initial } do_install() { diff --git a/recipes/ecj/files/ecj-initial.in b/recipes/ecj/files/ecj-initial.in new file mode 100755 index 0000000000..2099991cef --- /dev/null +++ b/recipes/ecj/files/ecj-initial.in @@ -0,0 +1 @@ +${RUNTIME} -Xmx512m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"} diff --git a/recipes/ecj/files/ecj.in b/recipes/ecj/files/ecj.in index 2099991cef..2cff2593d5 100755 --- a/recipes/ecj/files/ecj.in +++ b/recipes/ecj/files/ecj.in @@ -1 +1 @@ -${RUNTIME} -Xmx512m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"} +${RUNTIME} -Xmx1024m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"} From 8d03c3b80973ecfc3b2c88314e7597e1ff14d5da Mon Sep 17 00:00:00 2001 From: Henning Date: Sun, 27 Mar 2011 13:41:28 +0200 Subject: [PATCH 320/509] ecj-bootstrap: try 5 times to compile the classes * that is an easy fix to workaround the aborts and segfaults of cacao and jamvm * bump PR Signed-off-by: Stefan Schmidt --- recipes/ecj/ecj-bootstrap-native.bb | 2 +- recipes/ecj/files/ecj.in | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/recipes/ecj/ecj-bootstrap-native.bb b/recipes/ecj/ecj-bootstrap-native.bb index bdb9797d92..a11ba74baf 100644 --- a/recipes/ecj/ecj-bootstrap-native.bb +++ b/recipes/ecj/ecj-bootstrap-native.bb @@ -17,7 +17,7 @@ SRC_URI = "file://ecj.in" S = "${WORKDIR}" -PR = "r3" +PR = "r4" JAR = "ecj-bootstrap.jar" diff --git a/recipes/ecj/files/ecj.in b/recipes/ecj/files/ecj.in index 2cff2593d5..0fd4a65cdc 100755 --- a/recipes/ecj/files/ecj.in +++ b/recipes/ecj/files/ecj.in @@ -1 +1,13 @@ -${RUNTIME} -Xmx1024m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"} +ARGS=${1+"$@"} +COUNT=5 +END=0 + +while test "${COUNT}" -gt "${END}" +do + ${RUNTIME} -Xmx1024m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${ARGS} + if test "${?}" -eq "${END}" + then + break + fi + COUNT=$(($COUNT-1)) +done From 528af9e7e88a95fb5ad31e2a973acdecc400da2d Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Fri, 25 Mar 2011 20:39:19 +0100 Subject: [PATCH 321/509] inetlib: move to proper place Signed-off-by: Stefan Schmidt --- .../{classpath => classpathx}/inetlib-1.1.1/datadir_java.patch | 0 recipes/{classpath => classpathx}/inetlib_1.1.1.bb | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename recipes/{classpath => classpathx}/inetlib-1.1.1/datadir_java.patch (100%) rename recipes/{classpath => classpathx}/inetlib_1.1.1.bb (100%) diff --git a/recipes/classpath/inetlib-1.1.1/datadir_java.patch b/recipes/classpathx/inetlib-1.1.1/datadir_java.patch similarity index 100% rename from recipes/classpath/inetlib-1.1.1/datadir_java.patch rename to recipes/classpathx/inetlib-1.1.1/datadir_java.patch diff --git a/recipes/classpath/inetlib_1.1.1.bb b/recipes/classpathx/inetlib_1.1.1.bb similarity index 100% rename from recipes/classpath/inetlib_1.1.1.bb rename to recipes/classpathx/inetlib_1.1.1.bb From 6ee5da7c1bdc6ef9fdd4c39be1c581372982278b Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Mon, 18 Apr 2011 09:26:35 +0200 Subject: [PATCH 322/509] icedtea6-native: add libxext-native to the dependencies * bump PR Signed-off-by: Stefan Schmidt --- recipes/icedtea/icedtea6-native.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/icedtea/icedtea6-native.inc b/recipes/icedtea/icedtea6-native.inc index 39ecdad1bb..06da7c0d36 100644 --- a/recipes/icedtea/icedtea6-native.inc +++ b/recipes/icedtea/icedtea6-native.inc @@ -1,12 +1,13 @@ DESCRIPTION = "Harness to build the source code from OpenJDK using Free Software build tools" HOMEPAGE = "http://icedtea.classpath.org" LICENSE = "GPL with Classpath Exception" -INC_PR = "r3" +INC_PR = "r4" DEPENDS = "virtual/javac-native classpath-tools-native \ virtual/java-native classpath-native \ xalan-j-native xerces-j-native rhino-native \ - ant-native libx11-native xproto-native libxt-native \ + ant-native \ + libx11-native xproto-native libxt-native libxext-native \ freetype-native zlib-native giflib-native jpeg-native \ zip-native \ " From 9427954a1340bc70145b2575e82b52c15d9e9358 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Mon, 18 Apr 2011 09:44:54 +0200 Subject: [PATCH 323/509] cacao-native: add fix for vm-shutdown and multiple threads are involved * bump PR Signed-off-by: Stefan Schmidt --- recipes/cacao/cacao-native_hg.bb | 6 +- recipes/cacao/files/cacao-shutdownguard.patch | 180 ++++++++++++++++++ 2 files changed, 184 insertions(+), 2 deletions(-) create mode 100644 recipes/cacao/files/cacao-shutdownguard.patch diff --git a/recipes/cacao/cacao-native_hg.bb b/recipes/cacao/cacao-native_hg.bb index 82f56ebad4..dc35ce8dd3 100644 --- a/recipes/cacao/cacao-native_hg.bb +++ b/recipes/cacao/cacao-native_hg.bb @@ -1,9 +1,11 @@ require cacao-native.inc PV = "1.1.0+hgr${SRCPV}" -PR = "r3" +PR = "r4" SRCREV = "c7bf150bfa46" -SRC_URI = "hg://mips.complang.tuwien.ac.at/hg/;module=cacao;rev=${SRCREV}" +SRC_URI = "hg://mips.complang.tuwien.ac.at/hg/;module=cacao;rev=${SRCREV} \ + file://cacao-shutdownguard.patch \ + " S = "${WORKDIR}/cacao" diff --git a/recipes/cacao/files/cacao-shutdownguard.patch b/recipes/cacao/files/cacao-shutdownguard.patch new file mode 100644 index 0000000000..b89170c780 --- /dev/null +++ b/recipes/cacao/files/cacao-shutdownguard.patch @@ -0,0 +1,180 @@ +diff -r c7bf150bfa46 src/threads/posix/mutex-posix.hpp +--- a/src/threads/posix/mutex-posix.hpp Fri Mar 11 23:35:56 2011 +0100 ++++ b/src/threads/posix/mutex-posix.hpp Fri Apr 01 16:16:07 2011 +0200 +@@ -53,6 +53,9 @@ + + inline void lock(); + inline void unlock(); ++ ++private: ++ void abort(int, const char*); + }; + + #else +@@ -66,7 +69,6 @@ + // Includes. + #include "vm/os.hpp" + +- + #ifdef __cplusplus + + /** +@@ -77,19 +79,19 @@ + int result = pthread_mutexattr_init(&_attr); + + if (result != 0) { +- os::abort_errnum(result, "Mutex::Mutex(): pthread_mutexattr_init failed"); ++ abort(result, "Mutex::Mutex(): pthread_mutexattr_init failed"); + } + + result = pthread_mutexattr_settype(&_attr, PTHREAD_MUTEX_RECURSIVE); + + if (result != 0) { +- os::abort_errnum(result, "Mutex::Mutex(): pthread_mutexattr_settype failed"); ++ abort(result, "Mutex::Mutex(): pthread_mutexattr_settype failed"); + } + + result = pthread_mutex_init(&_mutex, &_attr); + + if (result != 0) { +- os::abort_errnum(result, "Mutex::Mutex(): pthread_mutex_init failed"); ++ abort(result, "Mutex::Mutex(): pthread_mutex_init failed"); + } + } + +@@ -102,13 +104,13 @@ + int result = pthread_mutexattr_destroy(&_attr); + + if (result != 0) { +- os::abort_errnum(result, "Mutex::~Mutex(): pthread_mutexattr_destroy failed"); ++ abort(result, "Mutex::~Mutex(): pthread_mutexattr_destroy failed"); + } + + result = pthread_mutex_destroy(&_mutex); + + if (result != 0) { +- os::abort_errnum(result, "Mutex::~Mutex(): pthread_mutex_destroy failed"); ++ abort(result, "Mutex::~Mutex(): pthread_mutex_destroy failed"); + } + } + +@@ -127,7 +129,7 @@ + int result = pthread_mutex_lock(&_mutex); + + if (result != 0) { +- os::abort_errnum(result, "Mutex::lock(): pthread_mutex_lock failed"); ++ abort(result, "Mutex::lock(): pthread_mutex_lock failed"); + } + } + +@@ -141,10 +143,11 @@ + int result = pthread_mutex_unlock(&_mutex); + + if (result != 0) { +- os::abort_errnum(result, "Mutex::unlock: pthread_mutex_unlock failed"); ++ abort(result, "Mutex::unlock: pthread_mutex_unlock failed"); + } + } + ++ + #else + + // This structure must have the same layout as the class above. +diff -r c7bf150bfa46 src/threads/posix/thread-posix.cpp +--- a/src/threads/posix/thread-posix.cpp Fri Mar 11 23:35:56 2011 +0100 ++++ b/src/threads/posix/thread-posix.cpp Fri Apr 01 16:16:07 2011 +0200 +@@ -74,6 +74,23 @@ + #include "vm/string.hpp" + #include "vm/vm.hpp" + ++/** ++ * Handle the case that a mutex related pthread function failed. ++ * ++ * During normal execution of the VM it will make it abort. However if the ++ * VM is in its last stages of shutting down (where nothing pthread related works ++ * anymore), it will silently end the calling thread. ++ */ ++void Mutex::abort(int errnum, const char* text) ++{ ++ if (VM::get_current()->is_shutdown()) ++ { ++ pthread_exit(NULL); ++ } ++ ++ os::abort_errnum(errnum, text); ++} ++ + #if defined(ENABLE_STATISTICS) + # include "vm/statistics.h" + #endif +diff -r c7bf150bfa46 src/vm/vm.cpp +--- a/src/vm/vm.cpp Fri Mar 11 23:35:56 2011 +0100 ++++ b/src/vm/vm.cpp Fri Apr 01 16:16:07 2011 +0200 +@@ -52,6 +52,7 @@ + + #include "native/vm/nativevm.hpp" + ++#include "threads/atomic.hpp" + #include "threads/lock.hpp" + #include "threads/thread.hpp" + +@@ -1585,6 +1586,22 @@ + return true; + } + ++/** ++ * Checks whether a shutdown process has to be guarded. ++ * ++ * Returning true means the caller must not continue ++ * doing any shutdown operations. ++ */ ++bool VM::shutdown_guard() ++{ ++ return Atomic::generic_compare_and_swap(&_shuttingdown, 0, 1) == 1; ++} ++ ++bool VM::is_shutdown() ++{ ++ Atomic::generic_memory_barrier(); ++ return _shuttingdown == 1; ++} + + /* vm_run ********************************************************************** + +@@ -1865,6 +1882,15 @@ + + void vm_shutdown(s4 status) + { ++ log_println("vm_shutdown"); ++ ++ if (VM::get_current()->shutdown_guard()) ++ { ++ /* Shutdown in progress by another thread already. ++ Silently not do it another time. */ ++ return; ++ } ++ + if (opt_verbose + #if defined(ENABLE_STATISTICS) + || opt_getcompilingtime || opt_stat +diff -r c7bf150bfa46 src/vm/vm.hpp +--- a/src/vm/vm.hpp Fri Mar 11 23:35:56 2011 +0100 ++++ b/src/vm/vm.hpp Fri Apr 01 16:16:07 2011 +0200 +@@ -64,6 +64,7 @@ + bool _initializing; + bool _created; + bool _exiting; ++ uint32_t _shuttingdown; + int64_t _starttime; + int64_t _inittime; + +@@ -104,6 +105,9 @@ + int64_t get_starttime() { return _starttime; } + int64_t get_inittime() { return _inittime; } + ++ bool shutdown_guard(); ++ bool is_shutdown(); ++ + Properties& get_properties () { return _properties; } + Recompiler& get_recompiler () { return _recompiler; } // REMOVEME + #if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK) From 6281ea36d34fd7cf77228dff5504d241362910ff Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 22 Mar 2011 23:11:20 +0000 Subject: [PATCH 324/509] wrapper/install: add -t support Signed-off-by: Otavio Salvador Signed-off-by: Khem Raj --- bin/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/install b/bin/install index ab316f61a4..5cb4071748 100755 --- a/bin/install +++ b/bin/install @@ -3,12 +3,12 @@ . $(dirname $0)/wrapper.sh saved="" -while getopts dbCcMpSsvB:f:g:m:o:D opt; do +while getopts dbCcMpSsvB:f:g:m:o:t:D opt; do case "$opt" in s) # Ignore strip argument ;; - B|f|g|m|o) + B|f|g|m|o|t) save "-$opt" save "$OPTARG" ;; From c80a15336faf0266f6c85a165e20c4ec4ccc82c6 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Fri, 6 May 2011 15:49:48 -0400 Subject: [PATCH 325/509] uhd : Enable usrp e100 utilities and package them seperately. Signed-off-by: Philip Balister Signed-off-by: Koen Kooi --- recipes/uhd/uhd.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipes/uhd/uhd.inc b/recipes/uhd/uhd.inc index d2ffb848fb..43bf038b58 100644 --- a/recipes/uhd/uhd.inc +++ b/recipes/uhd/uhd.inc @@ -5,23 +5,25 @@ LICENSE = "GPLV3+" DEPENDS = "git-native python-cheetah-native boost libusb1 uhd-firmware" RDEPENDS_${PN} += "uhd-firmware" -INC_PR = "r4" +INC_PR = "r5" inherit cmake -PACKAGES =+ "${PN}-tests ${PN}-examples" +PACKAGES =+ "${PN}-tests ${PN}-examples ${PN}-e1xx" FILES_${PN} += "${libdir}/libuhd.so" FILES_${PN} += "${datadir}/uhd/utils/*" FILES_${PN}-tests += "${datadir}/uhd/tests/*" +FILES_${PN}-e1xx += "${datadir}/uhd/usrp_e_utils/*" FILES_${PN}-dbg += "${datadir}/uhd/examples/.debug/*" FILES_${PN}-dbg += "${datadir}/uhd/utils/.debug/*" FILES_${PN}-dbg += "${datadir}/uhd/tests/.debug/*" +FILES_${PN}-dbg += "${datadir}/uhd/usrp_e_utils/.debug/*" FILES_${PN}-examples = "${datadir}/uhd/examples/*" OECMAKE_BUILDPATH = "${S}/build" OECMAKE_SOURCEPATH = "${S}" -EXTRA_OECMAKE = "-DENABLE_USRP_E100=TRUE" +EXTRA_OECMAKE = "-DENABLE_USRP_E100=TRUE -DENABLE_USRP_E_UTILS=TRUE" EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}" From 76f040375adc11cd5d09bc842edae528c5d69310 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Tue, 19 Apr 2011 08:40:52 -0700 Subject: [PATCH 326/509] wpa-supplicant: Enable CONFIG_CTRL_IFACE_DBUS and CONFIG_CTRL_IFACE_DBUS_NEW Signed-off-by: Steve Sakoman Signed-off-by: Koen Kooi --- .../wpa-supplicant-0.7.3/defconfig | 4 ++-- recipes/wpa-supplicant/wpa-supplicant-0.7.inc | 16 ++++++++-------- recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.3/defconfig b/recipes/wpa-supplicant/wpa-supplicant-0.7.3/defconfig index 33ee9ea8d8..41362253cd 100644 --- a/recipes/wpa-supplicant/wpa-supplicant-0.7.3/defconfig +++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.3/defconfig @@ -343,11 +343,11 @@ CONFIG_PEERKEY=y # Add support for old DBus control interface # (fi.epitest.hostap.WPASupplicant) -#CONFIG_CTRL_IFACE_DBUS=y +CONFIG_CTRL_IFACE_DBUS=y # Add support for new DBus control interface # (fi.w1.hostap.wpa_supplicant1) -#CONFIG_CTRL_IFACE_DBUS_NEW=y +CONFIG_CTRL_IFACE_DBUS_NEW=y # Add introspection support for new DBus control interface #CONFIG_CTRL_IFACE_DBUS_INTRO=y diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc index 0cf3b700fe..722f5fa689 100644 --- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc +++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc @@ -50,14 +50,6 @@ do_install () { install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf - install -d ${D}${sysconfdir}/network/if-pre-up.d/ - install -d ${D}${sysconfdir}/network/if-post-down.d/ - install -d ${D}${sysconfdir}/network/if-down.d/ - install -m 644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir} - install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant - cd ${D}${sysconfdir}/network/ && \ - ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant - if grep -q ^CONFIG_CTRL_IFACE_DBUS=y .config || grep -q ^CONFIG_CTRL_IFACE_DBUS_NEW=y .config; then install -d ${D}/${sysconfdir}/dbus-1/system.d install -m 644 ${S}/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d @@ -72,6 +64,14 @@ do_install () { fi fi + install -d ${D}${sysconfdir}/network/if-pre-up.d/ + install -d ${D}${sysconfdir}/network/if-post-down.d/ + install -d ${D}${sysconfdir}/network/if-down.d/ + install -m 644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir} + install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant + cd ${D}${sysconfdir}/network/ && \ + ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant + install -d ${D}/etc/default/volatiles install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles } diff --git a/recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb b/recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb index 60a4791915..05a94eb75a 100644 --- a/recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb +++ b/recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb @@ -1,6 +1,6 @@ require wpa-supplicant-0.7.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda" SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443" From 196c99f6d10b102499dc4c6a64c633ef25c815dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sun, 13 Mar 2011 22:32:19 +0100 Subject: [PATCH 327/509] zeromq: add new recipe for version 2.1.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tested-by: Craig Swank Signed-off-by: Petr Štetiar Signed-off-by: Koen Kooi --- recipes/zeromq/zeromq_2.1.6.bb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 recipes/zeromq/zeromq_2.1.6.bb diff --git a/recipes/zeromq/zeromq_2.1.6.bb b/recipes/zeromq/zeromq_2.1.6.bb new file mode 100644 index 0000000000..ec291f5966 --- /dev/null +++ b/recipes/zeromq/zeromq_2.1.6.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "ZeroMQ looks like an embeddable networking library but acts like a concurrency framework" +HOMEPAGE = "http://www.zeromq.org" +LICENSE = "LGPLv3+" +LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=66ea8704398d7996daeacd2fbd2b9dbd" + +PR = "r0" + +DEPENDS += "util-linux-ng" + +S = "${WORKDIR}/zeromq-${PV}" + +SRC_URI = "http://download.zeromq.org/zeromq-${PV}.tar.gz" + +inherit autotools + +do_configure_prepend() { + ./autogen.sh +} + +SRC_URI[md5sum] = "77b9ca20e8f2426874022080f41d7b0b" +SRC_URI[sha256sum] = "a1bbb352a9dbf34b18a3999b22a8db2d51e4a52508d098528d771811533f9fd0" From 89b0845a8c67eaa0ecd7b51f19c971795a28f8db Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 9 May 2011 10:41:49 +0200 Subject: [PATCH 328/509] libgles-omap3: prune source a bit better Signed-off-by: Koen Kooi --- recipes/powervr-drivers/libgles-omap3.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc index ac21631517..349043ac3c 100644 --- a/recipes/powervr-drivers/libgles-omap3.inc +++ b/recipes/powervr-drivers/libgles-omap3.inc @@ -85,7 +85,7 @@ do_compile() { for demo in ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ; do cd $demo/OGLES2/Build/LinuxGeneric oe_runmake Common=1 PLATFORM=$PLATFORM X11BUILD=$X11BUILD - rm $demo/OGLES2/Build/LinuxOMAP3/Release*/*.o + rm -f $demo/OGLES2/Build/LinuxOMAP3/Release*/*.o install -m 0755 $demo/OGLES2/Build/LinuxOMAP3/ReleaseX11/* ${S}/demos/x11 || true sed -e s:NAME:$(basename $demo): \ -e s:EXEC:${bindir}/SGX/demos/X11/$(basename $demo/OGLES2/Build/LinuxOMAP3/ReleaseX11/*): \ @@ -97,6 +97,8 @@ do_compile() { mkdir -p ${S}/trainingcourses/raw mkdir -p ${S}/trainingcourses/x11 + find ${S} -name "*_org" -delete + # Build OGLES2 Trainingcourses for both Raw and X11 for X11BUILD in 0 1 ; do for training in ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do @@ -109,7 +111,7 @@ do_compile() { fi oe_runmake Common=1 PLATFORM=$PLATFORM X11BUILD=$X11BUILD - rm $training/OGLES2/Build/LinuxOMAP3/Release*/*.o + rm -f $training/OGLES2/Build/LinuxOMAP3/Release*/*.o install -m 0755 $training/OGLES2/Build/LinuxOMAP3/ReleaseX11/* ${S}/trainingcourses/x11 || true install -m 0755 $training/OGLES2/Build/LinuxOMAP3/ReleaseRaw/* ${S}/trainingcourses/raw || true done From 78a7889a7f3ce959565bc94dbfbf2d5b35bac593 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 9 May 2011 11:19:37 +0200 Subject: [PATCH 329/509] libgles-omap3: make initscript work with both busybox and bash From the bash man page: "The reserved word function is optional. If the function reserved word is supplied, the parentheses are optional." Signed-off-by: Koen Kooi --- recipes/powervr-drivers/libgles-omap3.inc | 2 +- recipes/powervr-drivers/libgles-omap3/rc.pvr | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc index 349043ac3c..ab4b2482d3 100644 --- a/recipes/powervr-drivers/libgles-omap3.inc +++ b/recipes/powervr-drivers/libgles-omap3.inc @@ -1,7 +1,7 @@ DESCRIPTION = "libGLES for the omap3" LICENSE = "proprietary-binary" -PR = "r13" +PR = "r14" COMPATIBLE_MACHINE = "(omap3|ti816x)" diff --git a/recipes/powervr-drivers/libgles-omap3/rc.pvr b/recipes/powervr-drivers/libgles-omap3/rc.pvr index 0a4f11b77f..d32f9e4c9b 100755 --- a/recipes/powervr-drivers/libgles-omap3/rc.pvr +++ b/recipes/powervr-drivers/libgles-omap3/rc.pvr @@ -30,7 +30,7 @@ fi # Try to enable triple buffering when there's enough VRAM fbset -vyres $(expr $YRES \* 3) -function sgxprepare { +sgxprepare () { echo Starting PVR insmod $(busybox find /lib/modules/$(uname -r) -name "pvrsrvkm.ko") modprobe omaplfb @@ -51,7 +51,7 @@ function sgxprepare { SAVED_ESREVISION="$(cat /etc/powervr-esrev)" } -function sgxfinish { +sgxfinish () { if [ "${ES_REVISION}" != "${SAVED_ESREVISION}" ] ; then echo -n "Starting SGX fixup for" echo " ES${ES_REVISION}.x" From 2f1713361f241f05d21169163b6c48716c378123 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 10 Mar 2011 18:02:52 +0100 Subject: [PATCH 330/509] libgles-omap3: update 4.03 release to 02 Signed-off-by: Koen Kooi --- ...es-omap3_4.03.00.01.bb => libgles-omap3_4.03.00.02.bb} | 6 +++--- recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) rename recipes/powervr-drivers/{libgles-omap3_4.03.00.01.bb => libgles-omap3_4.03.00.02.bb} (85%) diff --git a/recipes/powervr-drivers/libgles-omap3_4.03.00.01.bb b/recipes/powervr-drivers/libgles-omap3_4.03.00.02.bb similarity index 85% rename from recipes/powervr-drivers/libgles-omap3_4.03.00.01.bb rename to recipes/powervr-drivers/libgles-omap3_4.03.00.02.bb index bd5cdc8168..1e9d82945f 100644 --- a/recipes/powervr-drivers/libgles-omap3_4.03.00.01.bb +++ b/recipes/powervr-drivers/libgles-omap3_4.03.00.02.bb @@ -15,7 +15,7 @@ require libgles-omap3.inc # http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/latest/index_FDS.html # see libgles-omap3.inc for detailed installation instructions -SGXPV = "4_03_00_01" +SGXPV = "4_03_00_02" IMGPV = "1.6.16.3977" BINFILE := "Graphics_SDK_setuplinux_${SGXPV}.bin" @@ -26,8 +26,8 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gf file://99-bufferclass.rules \ " -SRC_URI[md5sum] = "4163ee51bc05689b6f61e7eadf5ab9cf" -SRC_URI[sha256sum] = "1afe0dc4974c3c0a0ccf267a531d0964459d1cdf1929e732958230641973da94" +SRC_URI[md5sum] = "ff8c1f2b8e4cb42f4ced6a613b081ada" +SRC_URI[sha256sum] = "cdb0bd3964e107733d632aa8224e0537b05c1ffac34befc036423458c8d75255" S = "${WORKDIR}/Graphics_SDK_${SGXPV}" diff --git a/recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb b/recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb index 9fe43bd6f2..5a59883a01 100644 --- a/recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb +++ b/recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb @@ -11,18 +11,18 @@ LICENSE = "GPLv2" TI_BIN_UNPK_CMDS="Y: qY:workdir:Y" require ../ti/ti-eula-unpack.inc -SGXPV = "4_03_00_01" +SGXPV = "4_03_00_02" IMGPV = "1.6.16.3977" BINFILE := "Graphics_SDK_setuplinux_${SGXPV}.bin" inherit module -MACHINE_KERNEL_PR_append = "h" +MACHINE_KERNEL_PR_append = "i" SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/Graphics_SDK_setuplinux_${SGXPV}.bin \ " -SRC_URI[md5sum] = "4163ee51bc05689b6f61e7eadf5ab9cf" -SRC_URI[sha256sum] = "1afe0dc4974c3c0a0ccf267a531d0964459d1cdf1929e732958230641973da94" +SRC_URI[md5sum] = "ff8c1f2b8e4cb42f4ced6a613b081ada" +SRC_URI[sha256sum] = "cdb0bd3964e107733d632aa8224e0537b05c1ffac34befc036423458c8d75255" S = "${WORKDIR}/Graphics_SDK_${SGXPV}/GFX_Linux_KM" From e7fbc5f21f1b30e27ac4bde70efb0d41881d9072 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Fri, 18 Mar 2011 13:43:34 -0700 Subject: [PATCH 331/509] omap3-sgx-modules 4.03.00.02: fix build for latest kernels Signed-off-by: Steve Sakoman Signed-off-by: Koen Kooi --- .../Compile-fixes-for-38-kernel.patch | 346 ++++++++++++++++++ .../omap3-sgx-modules_1.6.16.3977.bb | 3 +- 2 files changed, 348 insertions(+), 1 deletion(-) create mode 100644 recipes/powervr-drivers/omap3-sgx-modules/Compile-fixes-for-38-kernel.patch diff --git a/recipes/powervr-drivers/omap3-sgx-modules/Compile-fixes-for-38-kernel.patch b/recipes/powervr-drivers/omap3-sgx-modules/Compile-fixes-for-38-kernel.patch new file mode 100644 index 0000000000..fc315bcec2 --- /dev/null +++ b/recipes/powervr-drivers/omap3-sgx-modules/Compile-fixes-for-38-kernel.patch @@ -0,0 +1,346 @@ +--- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_displayclass.c-orig 2011-03-08 04:27:35.000000000 -0800 ++++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_displayclass.c 2011-03-17 13:11:31.000000000 -0700 +@@ -235,9 +235,20 @@ static OMAP_ERROR UnblankDisplay(OMAPLFB + { + int res; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) ++ console_lock(); ++#else + acquire_console_sem(); ++#endif ++ + res = fb_blank(psDevInfo->psLINFBInfo, 0); ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) ++ console_unlock(); ++#else + release_console_sem(); ++#endif ++ + #if !defined (CONFIG_OMAP2_DSS) + if (res != 0 && res != -EINVAL) + { +@@ -1118,7 +1129,11 @@ static OMAP_ERROR InitDev(OMAPLFB_DEVINF + OMAP_ERROR eError = OMAP_ERROR_GENERIC; + unsigned long FBSize; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) ++ console_lock(); ++#else + acquire_console_sem(); ++#endif + + if (fb_idx < 0 || fb_idx >= num_registered_fb) + { +@@ -1254,7 +1269,11 @@ static OMAP_ERROR InitDev(OMAPLFB_DEVINF + errModPut: + module_put(psLINFBOwner); + errRelSem: ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) ++ console_unlock(); ++#else + release_console_sem(); ++#endif + return eError; + } + +@@ -1263,7 +1282,11 @@ static void DeInitDev(OMAPLFB_DEVINFO *p + struct fb_info *psLINFBInfo = psDevInfo->psLINFBInfo; + struct module *psLINFBOwner; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) ++ console_lock(); ++#else + acquire_console_sem(); ++#endif + + psLINFBOwner = psLINFBInfo->fbops->owner; + +@@ -1274,7 +1297,11 @@ static void DeInitDev(OMAPLFB_DEVINFO *p + + module_put(psLINFBOwner); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) ++ console_unlock(); ++#else + release_console_sem(); ++#endif + } + + OMAP_ERROR OMAPLFBInit(void) +--- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c-orig 2011-03-08 04:27:35.000000000 -0800 ++++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c 2011-03-17 13:40:15.000000000 -0700 +@@ -24,11 +24,14 @@ + * + ******************************************************************************/ + ++#include ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) + #ifndef AUTOCONF_INCLUDED + #include + #endif ++#endif + +-#include + #include + + #include +--- GFX_Linux_KM/services4/srvkm/common/resman.c-orig 2011-03-08 04:27:36.000000000 -0800 ++++ GFX_Linux_KM/services4/srvkm/common/resman.c 2011-03-17 14:20:07.000000000 -0700 +@@ -24,15 +24,17 @@ + * + ******************************************************************************/ + ++#include + #include "services_headers.h" + #include "resman.h" + + #ifdef __linux__ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) + #ifndef AUTOCONF_INCLUDED + #include + #endif ++#endif + +-#include + #include + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9) + #include +--- GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c-orig 2011-03-08 04:27:36.000000000 -0800 ++++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c 2011-03-17 14:33:09.000000000 -0700 +@@ -24,9 +24,13 @@ + * + ******************************************************************************/ + ++#include ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) + #ifndef AUTOCONF_INCLUDED + #include + #endif ++#endif + + #include + #include +--- GFX_Linux_KM/services4/srvkm/env/linux/pvr_uaccess.h-orig 2011-03-08 04:27:36.000000000 -0800 ++++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_uaccess.h 2011-03-17 14:39:14.000000000 -0700 +@@ -27,11 +27,14 @@ + #ifndef __PVR_UACCESS_H__ + #define __PVR_UACCESS_H__ + ++#include ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) + #ifndef AUTOCONF_INCLUDED + #include + #endif ++#endif + +-#include + #include + + static inline unsigned long pvr_copy_to_user(void __user *pvTo, const void *pvFrom, unsigned long ulBytes) +--- GFX_Linux_KM/services4/srvkm/env/linux/mm.c-orig 2011-03-08 04:27:36.000000000 -0800 ++++ GFX_Linux_KM/services4/srvkm/env/linux/mm.c 2011-03-17 14:46:23.000000000 -0700 +@@ -24,11 +24,14 @@ + * + ******************************************************************************/ + ++#include ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) + #ifndef AUTOCONF_INCLUDED + #include + #endif ++#endif + +-#include + #include + #include + #include +--- GFX_Linux_KM/services4/srvkm/env/linux/mutils.h-orig 2011-03-08 04:27:36.000000000 -0800 ++++ GFX_Linux_KM/services4/srvkm/env/linux/mutils.h 2011-03-17 14:54:37.000000000 -0700 +@@ -27,11 +27,13 @@ + #ifndef __IMG_LINUX_MUTILS_H__ + #define __IMG_LINUX_MUTILS_H__ + ++#include ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) + #ifndef AUTOCONF_INCLUDED + #include + #endif +- +-#include ++#endif + + #if !(defined(__i386__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26))) + #if defined(SUPPORT_LINUX_X86_PAT) +--- GFX_Linux_KM/services4/srvkm/env/linux/mm.h-orig 2011-03-08 04:27:36.000000000 -0800 ++++ GFX_Linux_KM/services4/srvkm/env/linux/mm.h 2011-03-17 15:33:56.000000000 -0700 +@@ -27,11 +27,14 @@ + #ifndef __IMG_LINUX_MM_H__ + #define __IMG_LINUX_MM_H__ + ++#include ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) + #ifndef AUTOCONF_INCLUDED + #include + #endif ++#endif + +-#include + #include + #include + #include +--- GFX_Linux_KM/services4/srvkm/env/linux/mmap.c-orig 2011-03-17 20:39:31.000000000 -0700 ++++ GFX_Linux_KM/services4/srvkm/env/linux/mmap.c 2011-03-17 20:40:00.000000000 -0700 +@@ -24,11 +24,14 @@ + * + ******************************************************************************/ + ++#include ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) + #ifndef AUTOCONF_INCLUDED + #include + #endif ++#endif + +-#include + #include + #include + #include +--- GFX_Linux_KM/services4/srvkm/env/linux/proc.c-orig 2011-03-08 04:27:36.000000000 -0800 ++++ GFX_Linux_KM/services4/srvkm/env/linux/proc.c 2011-03-17 21:01:35.000000000 -0700 +@@ -24,13 +24,16 @@ + * + ******************************************************************************/ + ++#include ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) + #ifndef AUTOCONF_INCLUDED + #include + #endif ++#endif + + #include + #include +-#include + #include + #include + #include +--- GFX_Linux_KM/services4/srvkm/env/linux/module.c-orig 2011-03-08 04:27:36.000000000 -0800 ++++ GFX_Linux_KM/services4/srvkm/env/linux/module.c 2011-03-17 21:32:19.000000000 -0700 +@@ -24,9 +24,13 @@ + * + ******************************************************************************/ + ++#include ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) + #ifndef AUTOCONF_INCLUDED + #include + #endif ++#endif + + #if !defined(SUPPORT_DRI_DRM) + +@@ -44,7 +48,6 @@ + #include + #include + #include +-#include + #include + #include + +--- GFX_Linux_KM/services4/srvkm/env/linux/event.c-orig 2011-03-08 04:27:36.000000000 -0800 ++++ GFX_Linux_KM/services4/srvkm/env/linux/event.c 2011-03-18 08:51:42.000000000 -0700 +@@ -24,11 +24,14 @@ + * + ******************************************************************************/ + ++#include ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) + #ifndef AUTOCONF_INCLUDED + #include + #endif ++#endif + +-#include + #include + #include + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)) +--- GFX_Linux_KM/services4/srvkm/env/linux/osfunc.c-orig 2011-03-08 04:27:36.000000000 -0800 ++++ GFX_Linux_KM/services4/srvkm/env/linux/osfunc.c 2011-03-18 08:58:16.000000000 -0700 +@@ -24,11 +24,14 @@ + * + ******************************************************************************/ + ++#include ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) + #ifndef AUTOCONF_INCLUDED + #include + #endif ++#endif + +-#include + #include + #include + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)) +--- GFX_Linux_KM/services4/srvkm/env/linux/pvr_drm.c-orig 2011-03-08 04:27:36.000000000 -0800 ++++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_drm.c 2011-03-18 09:01:06.000000000 -0700 +@@ -26,14 +26,17 @@ + + #if defined(SUPPORT_DRI_DRM) + ++#include ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) + #ifndef AUTOCONF_INCLUDED + #include + #endif ++#endif + + #include + #include + #include +-#include + #include + #include + #include +--- GFX_Linux_KM/services4/srvkm/env/linux/mutils.c-orig 2011-03-08 04:27:36.000000000 -0800 ++++ GFX_Linux_KM/services4/srvkm/env/linux/mutils.c 2011-03-18 09:08:12.000000000 -0700 +@@ -24,10 +24,13 @@ + * + ******************************************************************************/ + ++#include ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) + #ifndef AUTOCONF_INCLUDED + #include + #endif +-#include ++#endif + + #include + #include +--- GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c-orig 2011-03-31 13:46:48.000000000 -0700 ++++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c 2011-03-31 15:14:10.000000000 -0700 +@@ -76,7 +76,8 @@ static IMG_CHAR gszBufferIRQ[PVR_MAX_MSG + static PVRSRV_LINUX_MUTEX gsDebugMutexNonIRQ; + + +-static spinlock_t gsDebugLockIRQ = SPIN_LOCK_UNLOCKED; ++static DEFINE_SPINLOCK(gsDebugLockIRQ); ++ + + #if !defined (USE_SPIN_LOCK) + #define USE_SPIN_LOCK (in_interrupt() || !preemptible()) diff --git a/recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb b/recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb index 5a59883a01..88dcf047c8 100644 --- a/recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb +++ b/recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb @@ -20,7 +20,8 @@ inherit module MACHINE_KERNEL_PR_append = "i" SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/Graphics_SDK_setuplinux_${SGXPV}.bin \ -" + file://Compile-fixes-for-38-kernel.patch \ + " SRC_URI[md5sum] = "ff8c1f2b8e4cb42f4ced6a613b081ada" SRC_URI[sha256sum] = "cdb0bd3964e107733d632aa8224e0537b05c1ffac34befc036423458c8d75255" From 53c31596b0a7059b3e97c8d2cc4f2fe3eb26dcdd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 9 May 2011 11:34:50 +0200 Subject: [PATCH 332/509] libgles-omap3 4.03.00.02: make it the default Signed-off-by: Koen Kooi --- recipes/powervr-drivers/libgles-omap3_4.03.00.02.bb | 3 --- recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb | 3 --- 2 files changed, 6 deletions(-) diff --git a/recipes/powervr-drivers/libgles-omap3_4.03.00.02.bb b/recipes/powervr-drivers/libgles-omap3_4.03.00.02.bb index 1e9d82945f..f605ec0f37 100644 --- a/recipes/powervr-drivers/libgles-omap3_4.03.00.02.bb +++ b/recipes/powervr-drivers/libgles-omap3_4.03.00.02.bb @@ -1,6 +1,3 @@ -# untested and huge change from 1.4.x -DEFAULT_PREFERENCE = "-1" - BINLOCATION_omap3 = "${S}/gfx_rel_es3.x" BINLOCATION_ti816x = "${S}/gfx_rel_es6.x" diff --git a/recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb b/recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb index 88dcf047c8..216b3ae08d 100644 --- a/recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb +++ b/recipes/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb @@ -1,6 +1,3 @@ -# untested and huge change from 1.4.x -DEFAULT_PREFERENCE = "-1" - DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs" LICENSE = "GPLv2" From 19cc2f1a4dba48aab0d4dbc7148003acec20b597 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 9 May 2011 17:04:10 +0200 Subject: [PATCH 333/509] nmap 3.81: fix license Signed-off-by: Koen Kooi --- recipes/nmap/nmap_3.81.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/nmap/nmap_3.81.bb b/recipes/nmap/nmap_3.81.bb index 4350c22d98..64aaac39ca 100644 --- a/recipes/nmap/nmap_3.81.bb +++ b/recipes/nmap/nmap_3.81.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Nmap is a command line portscanner." HOMEPAGE = "http://www.insecure.org/nmap/" SECTION = "console/network" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "libpcap libpcre" -PR = "r2" +PR = "r3" inherit autotools From 5ef599b8a60ba9fa9fcf56708313da753edc874e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 10 May 2011 09:37:05 +0200 Subject: [PATCH 334/509] linux-omap-psp 2.6.32: support accept4 call Signed-off-by: Koen Kooi --- ...RM-6329-1-wire-up-sys_accept4-on-ARM.patch | 52 +++++++++++++++++++ recipes/linux/linux-omap-psp_2.6.32.bb | 3 +- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 recipes/linux/linux-omap-psp-2.6.32/0001-ARM-6329-1-wire-up-sys_accept4-on-ARM.patch diff --git a/recipes/linux/linux-omap-psp-2.6.32/0001-ARM-6329-1-wire-up-sys_accept4-on-ARM.patch b/recipes/linux/linux-omap-psp-2.6.32/0001-ARM-6329-1-wire-up-sys_accept4-on-ARM.patch new file mode 100644 index 0000000000..b3ecd26bbc --- /dev/null +++ b/recipes/linux/linux-omap-psp-2.6.32/0001-ARM-6329-1-wire-up-sys_accept4-on-ARM.patch @@ -0,0 +1,52 @@ +From 830a10cfbddd372569288ad8287a143f90243607 Mon Sep 17 00:00:00 2001 +From: Mikael Pettersson +Date: Sun, 15 Aug 2010 10:47:23 +0100 +Subject: [PATCH] ARM: 6329/1: wire up sys_accept4() on ARM + +sys_accept4() was added in kernel 2.6.28, but ARM was not updated +to include it. The number and types of parameters is such that +no ARM-specific processing is needed, so wiring up sys_accept4() +just requires defining __NR_accept4 and adding a direct call in +the syscall entry table. + +Tested with an EABI 2.6.35 kernel and Ulrich Drepper's original +accept4() test program, modified to define __NR_accept4 for ARM. + +Using the updated unistd.h also eliminates a warning then building +glibc (2.10.2 and newer) about accept4() being unimplemented. + +Signed-off-by: Mikael Pettersson +Signed-off-by: Russell King +--- + arch/arm/include/asm/unistd.h | 2 ++ + arch/arm/kernel/calls.S | 1 + + 2 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h +index 4e506d0..8f32b6b 100644 +--- a/arch/arm/include/asm/unistd.h ++++ b/arch/arm/include/asm/unistd.h +@@ -391,6 +391,8 @@ + #define __NR_pwritev (__NR_SYSCALL_BASE+362) + #define __NR_rt_tgsigqueueinfo (__NR_SYSCALL_BASE+363) + #define __NR_perf_event_open (__NR_SYSCALL_BASE+364) ++#define __NR_recvmmsg (__NR_SYSCALL_BASE+365) ++#define __NR_accept4 (__NR_SYSCALL_BASE+366) + + /* + * The following SWIs are ARM private. +diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S +index 9314a2d..1dff6a0 100644 +--- a/arch/arm/kernel/calls.S ++++ b/arch/arm/kernel/calls.S +@@ -375,6 +375,7 @@ + CALL(sys_rt_tgsigqueueinfo) + CALL(sys_perf_event_open) + /* 365 */ CALL(sys_recvmmsg) ++ CALL(sys_accept4) + #ifndef syscalls_counted + .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls + #define syscalls_counted +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-psp_2.6.32.bb b/recipes/linux/linux-omap-psp_2.6.32.bb index c068b733fd..9221813143 100644 --- a/recipes/linux/linux-omap-psp_2.6.32.bb +++ b/recipes/linux/linux-omap-psp_2.6.32.bb @@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "am3517-crane|beagleboard|omap3evm|am3517-evm|dm37x-evm|am3 SRCREV = "5fc29e7b2a76a64a739f857858ef0b98294aa155" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -MACHINE_KERNEL_PR_append = "b+gitr${SRCREV}" +MACHINE_KERNEL_PR_append = "c+gitr${SRCREV}" SRC_URI = "git://arago-project.org/git/projects/linux-omap3.git;protocol=http;branch=master \ file://0001-Added-Crane-Board-support.patch \ @@ -139,6 +139,7 @@ SRC_URI = "git://arago-project.org/git/projects/linux-omap3.git;protocol=http;br file://porches.patch \ file://0001-OMAP3-craneboard-print-expansionboard-name-detected-.patch \ file://0002-OMAP3-craneboard-add-support-for-TinCanTools-Trainer.patch \ + file://0001-ARM-6329-1-wire-up-sys_accept4-on-ARM.patch \ file://defconfig" SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ From bc99539781adeeb14af7912de5309bb9fe11c2ff Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Wed, 11 May 2011 02:54:32 -0400 Subject: [PATCH 335/509] libsndfile: add latest version 1.0.24, as older no longer available Signed-off-by: Denys Dmytriyenko --- recipes/libsndfile/libsndfile1_1.0.24.bb | 36 ++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 recipes/libsndfile/libsndfile1_1.0.24.bb diff --git a/recipes/libsndfile/libsndfile1_1.0.24.bb b/recipes/libsndfile/libsndfile1_1.0.24.bb new file mode 100644 index 0000000000..913c2837de --- /dev/null +++ b/recipes/libsndfile/libsndfile1_1.0.24.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "An audio format Conversion library" +HOMEPAGE = "http://www.mega-nerd.com/libsndfile" +AUTHOR = "Erik de Castro Lopo" +SECTION = "libs/multimedia" +LICENSE = "LGPL" +DEPENDS = "sqlite3" +PR = "r0" + +SRC_URI = "http://www.mega-nerd.com/libsndfile/files/libsndfile-${PV}.tar.gz" + +S = "${WORKDIR}/libsndfile-${PV}" + +inherit autotools lib_package pkgconfig + +do_configure_prepend_arm() { + ac_cv_sizeof_off_t=8 + # they are not in one of site/ files because they are common with + # glib-2.0 if they are moved to common site files then they break + # glib-2.0 build if largefile support is not available (.e.g. uclibc + # can be tuned to not have it. + export ac_cv_sys_largefile_source=1 + export ac_cv_sys_file_offset_bits=64 +} + +do_configure_prepend_chinook-compat () { + for i in lt~obsolete.m4 ltsugar.m4 libtool.m4 ltoptions.m4 ltversion.m4 + do + rm ${S}/M4/${i} + done +} + +PACKAGES =+ "${PN}-octave" +FILES_${PN}-octave += "/usr/share/octave/site/m" + +SRC_URI[md5sum] = "8f823c30c1d8d44830db6ab845d6679e" +SRC_URI[sha256sum] = "b6050e6fbfbb72c8bfbc895104697a4af1d49077a64e4846e0be7af87c9e56a4" From d52242b253937b2bd701ae67eac5b63ca8ea376f Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 11 May 2011 11:53:45 -0700 Subject: [PATCH 336/509] openssh.inc: Don't use ${libdir}exec Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/openssh/openssh.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/openssh/openssh.inc b/recipes/openssh/openssh.inc index 1764ddf302..4555d34c79 100644 --- a/recipes/openssh/openssh.inc +++ b/recipes/openssh/openssh.inc @@ -69,8 +69,8 @@ FILES_${PN}-ssh = "${bindir}/ssh.${PN} ${sysconfdir}/ssh/ssh_config" FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd" FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config" FILES_${PN}-sftp = "${bindir}/sftp" -FILES_${PN}-sftp-server = "${libdir}exec/sftp-server" -FILES_${PN}-misc = "${bindir}/ssh* ${libdir}exec/ssh*" +FILES_${PN}-sftp-server = "${libexecdir}/sftp-server" +FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*" FILES_${PN}-keygen = "${bindir}/ssh-keygen" RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" From ea924ad745e8f06cd43e3562c685eba344a04940 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 11 May 2011 15:12:19 -0700 Subject: [PATCH 337/509] lmbench: Rework for binaries in /usr/bin With the move to having lmbench binaries reside in /usr/bin both the lmbench-run script we provide as well as config-run and results from lmbench no longer work, so we need to fixup the paths in a few places. While in here, call install -d once to make all the directories we need and re-order stuff to flow better. Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- .../update-results-script.patch | 155 ++++++++++++++++++ recipes/lmbench/lmbench_3.0-a9.bb | 24 +-- 2 files changed, 167 insertions(+), 12 deletions(-) create mode 100644 recipes/lmbench/lmbench-3.0-a9/update-results-script.patch diff --git a/recipes/lmbench/lmbench-3.0-a9/update-results-script.patch b/recipes/lmbench/lmbench-3.0-a9/update-results-script.patch new file mode 100644 index 0000000000..3feb657d1b --- /dev/null +++ b/recipes/lmbench/lmbench-3.0-a9/update-results-script.patch @@ -0,0 +1,155 @@ +Now that we have our binaries in /usr/bin rather than the normal +lmbench hierarchy we need to update the scripts as well to bave well here. +Index: lmbench-3.0-a9/scripts/results +=================================================================== +--- lmbench-3.0-a9.orig/scripts/results ++++ lmbench-3.0-a9/scripts/results +@@ -8,11 +8,11 @@ RESULTS=results/$OS + BASE=../$RESULTS/`uname -n` + EXT=0 + +-if [ ! -f "../bin/$OS/$CONFIG" ] ++if [ ! -f "$CONFIG" ] + then echo "No config file?" + exit 1 + fi +-. ../bin/$OS/$CONFIG ++. $CONFIG + + if [ ! -d ../$RESULTS ] + then mkdir -p ../$RESULTS +@@ -23,11 +23,9 @@ do EXT=`expr $EXT + 1` + RESULTS=$BASE.$EXT + done + +-cd ../bin/$OS +-PATH=.:${PATH}; export PATH + export SYNC_MAX + export OUTPUT +-lmbench $CONFIG 2>../${RESULTS} ++lmbench $CONFIG 2>${RESULTS} + + if [ X$MAIL = Xyes ] + then echo Mailing results +Index: lmbench-3.0-a9/scripts/config-run +=================================================================== +--- lmbench-3.0-a9.orig/scripts/config-run ++++ lmbench-3.0-a9/scripts/config-run +@@ -132,20 +132,20 @@ export LMBENCH_SCHED + ############################################################################ + echo $L; echo ""; + echo "Hang on, we are calculating your timing granularity." +-../bin/$OS/msleep 250 +-ENOUGH=`../bin/$OS/enough` ++msleep 250 ++ENOUGH=`enough` + export ENOUGH + echo "OK, it looks like you can time stuff down to $ENOUGH usec resolution." + echo "" + echo "Hang on, we are calculating your timing overhead." +-../bin/$OS/msleep 250 +-TIMING_O=`../bin/$OS/timing_o` ++msleep 250 ++TIMING_O=`timing_o` + export TIMING_O + echo "OK, it looks like your gettimeofday() costs $TIMING_O usecs." + echo "" + echo "Hang on, we are calculating your loop overhead." +-../bin/$OS/msleep 250 +-LOOP_O=`../bin/$OS/loop_o` ++msleep 250 ++LOOP_O=`loop_o` + export LOOP_O + echo "OK, it looks like your benchmark loop costs $LOOP_O usecs." + echo "" +@@ -177,7 +177,7 @@ then + fi + if [ X$MB = X ] + then $ECHON "Probing system for available memory: $ECHOC" +- MB=`../bin/$OS/memsize 4096` ++ MB=`memsize 4096` + fi + TOTAL_MEM=$MB + MB=`echo \( $MB \* 7 \) / 10 | bc 2>/dev/null` +@@ -205,9 +205,9 @@ fi + # Certain machines tend to barf when you try and bcopy 8MB. + # Figure out how much we can use. + echo "Checking to see if you have $MB MB; please wait for a moment..." +-MB=`../bin/$OS/memsize $MB` +-MB=`../bin/$OS/memsize $MB` +-MB=`../bin/$OS/memsize $MB` ++MB=`memsize $MB` ++MB=`memsize $MB` ++MB=`memsize $MB` + if [ `expr $SYNC_MAX \* $MB` -gt `expr $TOTAL_MEM` ] + then + MB=`expr $TOTAL_MEM / $SYNC_MAX` +@@ -223,8 +223,8 @@ then echo Warning: you have only ${MB}MB + fi + + echo "Hang on, we are calculating your cache line size." +-../bin/$OS/msleep 250 +-LINE_SIZE=`../bin/$OS/lm_line -M ${MB}M` ++msleep 250 ++LINE_SIZE=`lm_line -M ${MB}M` + export LINE_SIZE + echo "OK, it looks like your cache line is $LINE_SIZE bytes." + echo "" +@@ -479,7 +479,7 @@ EOF + then + for i in $disks + do if [ -r $i ] +- then ../bin/$OS/flushdisk $i ++ then flushdisk $i + if [ $? -eq 1 ] + then echo "Must be root to run disk benchmarks." + echo "Root is needed to flush the buffer cache" +@@ -584,7 +584,7 @@ fi + echo $L + echo "" + echo "Calculating mhz, please wait for a moment..." +-MHZ=`../bin/$OS/mhz` ++MHZ=`mhz` + cat< $C + echo DISK_DESC=\"$DISK_DESC\" >> $C + echo OUTPUT=$OUTPUT >> $C diff --git a/recipes/lmbench/lmbench_3.0-a9.bb b/recipes/lmbench/lmbench_3.0-a9.bb index d1e9162bbe..ce6d1a80c0 100644 --- a/recipes/lmbench/lmbench_3.0-a9.bb +++ b/recipes/lmbench/lmbench_3.0-a9.bb @@ -3,13 +3,14 @@ DESCRIPTION = "Tools for performance analysis." LICENSE = "GPL" RDEPENDS_${PN} = "debianutils" -PR = "r3" +PR = "r4" inherit autotools SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ file://lmbench-run \ - file://rename-line-binary.patch" + file://rename-line-binary.patch \ + file://update-results-script.patch" SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf" SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551" @@ -40,24 +41,23 @@ do_compile () { fi install -d ${S}/bin/${TARGET_SYS} oe_runmake -C src - sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${PN},;' \ - -e 's,^BINDIR=.*$,BINDIR=${libdir}/${PN},;' ${WORKDIR}/lmbench-run } do_install () { - mkdir -p ${D}${libdir}/lmbench + install -d ${D}${localstatedir}/run/lmbench \ + ${D}${bindir} ${D}${mandir} ${D}${libdir}/lmbench \ + ${D}${datadir}/lmbench/scripts oe_runmake 'BASE=${D}${prefix}' \ -C src install - install -d ${D}${localstatedir}/lib/lmbench/config \ - ${D}${localstatedir}/run/lmbench \ - ${D}${bindir} - install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/ - mkdir -p ${D}${mandir} + mv ${D}${bindir}/line ${D}${bindir}/lm_line mv ${D}${prefix}/man/* ${D}${mandir}/ + install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/ + sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${PN},;' \ + -e 's,^BINDIR=.*$,BINDIR=${libdir}/${PN},;' \ + -e 's,^CONFIG=.*$,CONFIG=$SHAREDIR/`$SCRIPTSDIR/config`,;' \ + ${D}${bindir}/lmbench-run install -m 0755 ${S}/scripts/lmbench ${D}${bindir} - install -d ${D}${datadir}/lmbench/scripts install -m 0755 ${S}/scripts/* ${D}${datadir}/lmbench/scripts - mv ${D}${bindir}/line ${D}${bindir}/lm_line } FILES_${PN} += "${datadir}/lmbench" From b6bd94b72fd91e270928c7eca0c7f907f94ca87f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 18 May 2011 12:09:13 +0200 Subject: [PATCH 338/509] dttsp: fix DEPENDS Signed-off-by: Koen Kooi --- recipes/sdr/dttsp_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/sdr/dttsp_svn.bb b/recipes/sdr/dttsp_svn.bb index 216a0a7ba1..2d5f7abe1f 100644 --- a/recipes/sdr/dttsp_svn.bb +++ b/recipes/sdr/dttsp_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Software Radio Core" LICENSE = "GPLv3" -DEPENDS = "fftwf jack" +DEPENDS = "gsl fftwf jack" PV = "${SRCREV}" SRCREV = "241" From 3ccb57f9114ae08bf26690f14b3389955c652ba7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 18 May 2011 12:10:46 +0200 Subject: [PATCH 339/509] sdrshell-qt4: fix DEPENDS and update SRCREV Signed-off-by: Koen Kooi --- recipes/sdr/sdrshell-qt4_svn.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes/sdr/sdrshell-qt4_svn.bb b/recipes/sdr/sdrshell-qt4_svn.bb index ec81f96f60..036e583595 100644 --- a/recipes/sdr/sdrshell-qt4_svn.bb +++ b/recipes/sdr/sdrshell-qt4_svn.bb @@ -1,11 +1,11 @@ DESCRIPTION = "SDR-Shell is Qt GUI for the sdr-core (DttSP) Software Defined Radio" LICENSE = "GPLv2" -DEPENDS = "dttsp" +DEPENDS = "hamlib dttsp libusb1 ncurses" inherit qt4x11 -SRCREV = "129" +SRCREV = "154" PV = "${SRCREV}" SRC_URI = "svn://sdr-shell.googlecode.com/svn/branches;module=sdr-shell-v4;proto=http \ @@ -27,4 +27,3 @@ do_install() { install -m 0755 ${S}/sdr-shell ${D}${bindir} } - From 44bd0cde0551dee0d0da165fa84868042ca27456 Mon Sep 17 00:00:00 2001 From: Eyal Reizer Date: Tue, 17 May 2011 14:45:22 +0000 Subject: [PATCH 340/509] ti-wifi-utils: update to use the latest release * Change to a newer calibrator version supporting latest mac80211 release. * Bump PR number Signed-off-by: Eyal Reizer Signed-off-by: Koen Kooi --- recipes/ti/ti-wifi-utils_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/ti/ti-wifi-utils_git.bb b/recipes/ti/ti-wifi-utils_git.bb index e920fe5544..567fe29c06 100644 --- a/recipes/ti/ti-wifi-utils_git.bb +++ b/recipes/ti/ti-wifi-utils_git.bb @@ -3,11 +3,11 @@ LICENCE = "TI-BSD" DEPENDS = "libnl" -PR ="r1" +PR ="r2" PV ="0.0" PR_append = "+gitr${SRCPV}" -SRCREV = "7f63af54eb66e5b2515f92c59fcc19a8065ce481" +SRCREV = "268dbf03091b632c2697eb8028e90fe40513a9d8" SRC_URI = "git://github.com/gxk/ti-utils.git;protocol=git" S = "${WORKDIR}/git" From 9f978f4ed459575df25d8669736cd8ffcf75ffb9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 19 May 2011 09:28:46 +0200 Subject: [PATCH 341/509] bigbuckbunny: fix SRC_URI Signed-off-by: Koen Kooi --- recipes/angstrom/bigbuckbunny-720p.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/angstrom/bigbuckbunny-720p.bb b/recipes/angstrom/bigbuckbunny-720p.bb index 69839d1bef..ed46f8bf2f 100644 --- a/recipes/angstrom/bigbuckbunny-720p.bb +++ b/recipes/angstrom/bigbuckbunny-720p.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Big Buck Bunny movie" LICENSE = "CC-BY" -SRC_URI = "http://mirror.bigbuckbunny.de/peach/bigbuckbunny_movies/big_buck_bunny_720p_surround.avi" +SRC_URI = "http://mirrorblender.top-ix.org/peach/bigbuckbunny_movies/big_buck_bunny_720p_surround.avi" do_install() { install -d ${D}${datadir}/movies From 3e5b64bcf86436b311f0af1dc4ae713e3e86ac25 Mon Sep 17 00:00:00 2001 From: Christian Charreyre Date: Fri, 29 Apr 2011 17:43:58 +0200 Subject: [PATCH 342/509] python-numpy: add missing runtime dependencies Without these runtime dependencies there are errors on the target when executing `mypaint`, because `python-numpy` code calls `import` from the distinct packages. TODO: It is not clear where this error originates from and what the best fix is. There are the following alternatives. 1. Add the runtime dependencies to `mypaint`. 2. Add these packages to `RRECOMMENDS`. This patch is build tested using `angstrom-2010.x` for `MACHINE = "beagleboard"`. Signed-off-by: Christian Charreyre Signed-off-by: Paul Menzel Signed-off-by: Koen Kooi --- recipes/python/python-numpy_1.1.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/python/python-numpy_1.1.1.bb b/recipes/python/python-numpy_1.1.1.bb index f5c23e055f..8594ea00b5 100644 --- a/recipes/python/python-numpy_1.1.1.bb +++ b/recipes/python/python-numpy_1.1.1.bb @@ -4,6 +4,8 @@ PRIORITY = "optional" LICENSE = "PSF" PR = "ml0" +RDEPENDS_${PN} = "python-compiler python-mmap python-pkgutil python-pydoc python-unittest" + SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \ file://unbreak-assumptions.diff \ file://trycompile.diff \ From d5321b2791f1580b357090a50b89ab008c1b2ccd Mon Sep 17 00:00:00 2001 From: Jeff Lance Date: Thu, 19 May 2011 23:35:09 +0000 Subject: [PATCH 343/509] matrix_gui: Pull in lmbench,multimedia,EZSDK mods * Update SRCREV to pull in: * Multimedia apps * LMBench apps * EZSDK updates * remove Blitrix Signed-off-by: Jeff Lance Signed-off-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- recipes/ti/matrix-gui-common_1.4.bb | 4 ++-- recipes/ti/matrix-gui-e_1.3.bb | 4 ++-- recipes/ti/matrix-gui_1.3.bb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/ti/matrix-gui-common_1.4.bb b/recipes/ti/matrix-gui-common_1.4.bb index d436044a1a..6f7376deb8 100644 --- a/recipes/ti/matrix-gui-common_1.4.bb +++ b/recipes/ti/matrix-gui-common_1.4.bb @@ -4,5 +4,5 @@ require matrix-gui-common.inc # prebuilt version in the repository. RRECOMMENDS_${PN} = "am-sysinfo" -SRCREV = "245" -PR = "${INC_PR}.9" +SRCREV = "249" +PR = "${INC_PR}.10" diff --git a/recipes/ti/matrix-gui-e_1.3.bb b/recipes/ti/matrix-gui-e_1.3.bb index fb7e4b3d47..8f2df1cafc 100644 --- a/recipes/ti/matrix-gui-e_1.3.bb +++ b/recipes/ti/matrix-gui-e_1.3.bb @@ -1,5 +1,5 @@ require matrix-gui-e.inc -SRCREV = "245" -PR = "${INC_PR}.8" +SRCREV = "249" +PR = "${INC_PR}.9" diff --git a/recipes/ti/matrix-gui_1.3.bb b/recipes/ti/matrix-gui_1.3.bb index 2c38fc39a5..f7e56a3533 100644 --- a/recipes/ti/matrix-gui_1.3.bb +++ b/recipes/ti/matrix-gui_1.3.bb @@ -1,4 +1,4 @@ require matrix-gui.inc -SRCREV = "245" -PR = "${INC_PR}.4" +SRCREV = "249" +PR = "${INC_PR}.5" From 70cb8e006af9ddd762c54d6d37f59babb67195a8 Mon Sep 17 00:00:00 2001 From: Roderick Taylor Date: Fri, 4 Mar 2011 09:04:53 +0000 Subject: [PATCH 344/509] system-tools-backends: don't use build machine's automake-1.7 * package patch to pretend that automake is missing. Signed-off-by: Roderick Taylor Acked-by: Philip Balister Signed-off-by: Philip Balister --- .../dont-automake.patch | 21 +++++++++++++++++++ recipes/gnome/system-tools-backends_2.10.1.bb | 1 + 2 files changed, 22 insertions(+) create mode 100644 recipes/gnome/system-tools-backends-2.10.1/dont-automake.patch diff --git a/recipes/gnome/system-tools-backends-2.10.1/dont-automake.patch b/recipes/gnome/system-tools-backends-2.10.1/dont-automake.patch new file mode 100644 index 0000000000..a9cea79a25 --- /dev/null +++ b/recipes/gnome/system-tools-backends-2.10.1/dont-automake.patch @@ -0,0 +1,21 @@ +Index: system-tools-backends-2.10.1/missing +=================================================================== +--- system-tools-backends-2.10.1.orig/missing ++++ system-tools-backends-2.10.1/missing +@@ -140,16 +140,6 @@ WARNING: \`$1' is missing on your system + ;; + + automake*) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- +- echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if +- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. +- You might want to install the \`Automake' and \`Perl' packages. +- Grab them from any GNU archive site." + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done diff --git a/recipes/gnome/system-tools-backends_2.10.1.bb b/recipes/gnome/system-tools-backends_2.10.1.bb index 75dfda968e..bac0a9cb16 100644 --- a/recipes/gnome/system-tools-backends_2.10.1.bb +++ b/recipes/gnome/system-tools-backends_2.10.1.bb @@ -16,6 +16,7 @@ SRC_URI[archive.sha256sum] = "0c1cfdf5f0550c0ccacbbc4f00ed059ab9ea483d48138132db SRC_URI += " \ file://system-tools-backends \ + file://dont-automake.patch \ " SRC_URI_append_angstrom = " \ From 3c582726cfba715242e06236ccd143ad9836a717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Dahlstr=C3=B6m?= Date: Fri, 15 Apr 2011 18:42:40 +0200 Subject: [PATCH 345/509] firefox: add correct CFLAGS and LIBS of libIDL-2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * autoconf does not fill in any CFLAGS or LIBS for libIDL-2.0. This patch sets the appropriate flags in autoconf.mk.in for HOST_LIBIDL_CFLAGS and HOST_LIBIDL_LIBS. The error message is the following [1][2]. […] gcc -o host_xpidl.o -c -isystem/home/neil/overo-oe/tmp-unstable/sysroots/x86_64-linux/usr/include -O2 -g -DXP_UNIX -O3 -DMDCPUCFG=\"md/_linux.cfg\" -I. -I. -I../../../dist/include -I../../../dist/include/nsprpub -I/home/neil/overo-oe/tmp-unstable/work/armv7a-angstrom-linux-gnueabi/firefox-3.6.8-r3/mozilla-1.9.2/dist/include/nspr -I/home/neil/overo-oe/tmp-unstable/work/armv7a-angstrom-linux-gnueabi/firefox-3.6.8-r3/mozilla-1.9.2/dist/include/nss -I/home/neil/overo-oe/tmp-unstable/work/armv7a-angstrom-linux-gnueabi/firefox-3.6.8-r3/mozilla-1.9.2/dist/include/nspr xpidl.c […] In file included from xpidl.c:42: xpidl.h:49: fatal error: glib.h: No such file or directoryIn file included from xpidl_util.c:42: xpidl.h:49: fatal error: glib.h: No such file or directory […] Why this did not occur earlier is not known. The patch is tested using `angstrom-2010.x` and `minimal` for `MACHINE = "beagleboard"`. It still does not build using `minimal-uclibc`. [1] http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-April/031792.html [2] http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-April/031959.html Signed-off-by: Patrik Dahlström Signed-off-by: Paul Menzel --- recipes/mozilla/firefox_3.6.8.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes/mozilla/firefox_3.6.8.bb b/recipes/mozilla/firefox_3.6.8.bb index 04dde08989..348c8c0a4a 100644 --- a/recipes/mozilla/firefox_3.6.8.bb +++ b/recipes/mozilla/firefox_3.6.8.bb @@ -37,7 +37,9 @@ EXTRA_OECONF += " --enable-official-branding --disable-crashreporter" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" do_compile_prepend() { - cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ - sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk + cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ + sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk + sed -i "s|HOST_LIBIDL_CFLAGS = \@HOST_LIBIDL_CFLAGS\@|HOST_LIBIDL_CFLAGS = $(pkg-config --cflags libIDL-2.0)|" config/autoconf.mk.in + sed -i "s|HOST_LIBIDL_LIBS = @HOST_LIBIDL_LIBS@|HOST_LIBIDL_LIBS = $(pkg-config --libs libIDL-2.0)|" config/autoconf.mk.in } From aede926bf2342bd183cb0a7a57ca2c783acaf746 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Wed, 18 May 2011 14:23:34 -0400 Subject: [PATCH 346/509] libosip2 : Upgrade from version 3.1 to 3.5 Signed-off-by: Philip Balister --- recipes/libosip2/{libosip2_3.1.0.bb => libosip2_3.5.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename recipes/libosip2/{libosip2_3.1.0.bb => libosip2_3.5.0.bb} (60%) diff --git a/recipes/libosip2/libosip2_3.1.0.bb b/recipes/libosip2/libosip2_3.5.0.bb similarity index 60% rename from recipes/libosip2/libosip2_3.1.0.bb rename to recipes/libosip2/libosip2_3.5.0.bb index fa1321cf9f..0491c0e49e 100644 --- a/recipes/libosip2/libosip2_3.1.0.bb +++ b/recipes/libosip2/libosip2_3.5.0.bb @@ -7,5 +7,5 @@ SRC_URI = "${GNU_MIRROR}/osip/libosip2-${PV}.tar.gz" inherit autotools pkgconfig -SRC_URI[md5sum] = "7eb305608256ac2a7a27b66ce52627c8" -SRC_URI[sha256sum] = "245911a9a48bbe868c4518faf86191f6568fb99d9967d368164a17a83671e8fb" +SRC_URI[md5sum] = "7691546f6b3349d10007fc1aaff0f4e0" +SRC_URI[sha256sum] = "dd955daa24d9ce2de6709b8c13e7c04ebc3afa8ac094d6a15a02a075be719a91" From 0b4fe2635dbae7af74ffa889b3e2f02afcbc276d Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Wed, 18 May 2011 15:30:16 -0400 Subject: [PATCH 347/509] ortp : Upgrade from version 0.13.1 to 0.16.5. Signed-off-by: Philip Balister --- recipes/ortp/ortp_0.13.1.bb | 5 ----- recipes/ortp/ortp_0.16.5.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 recipes/ortp/ortp_0.13.1.bb create mode 100644 recipes/ortp/ortp_0.16.5.bb diff --git a/recipes/ortp/ortp_0.13.1.bb b/recipes/ortp/ortp_0.13.1.bb deleted file mode 100644 index 32e5290632..0000000000 --- a/recipes/ortp/ortp_0.13.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require ortp.inc -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "293f16da6dd434e68652f0f725b7f97c" -SRC_URI[sha256sum] = "2ba471a2a4f1d7f10fb70de5b68dbb7d32b43494efcecb88b3bd8445f630494c" diff --git a/recipes/ortp/ortp_0.16.5.bb b/recipes/ortp/ortp_0.16.5.bb new file mode 100644 index 0000000000..604b7bcc6c --- /dev/null +++ b/recipes/ortp/ortp_0.16.5.bb @@ -0,0 +1,5 @@ +require ortp.inc +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "94546901d14b85f97342f4ecf39489b1" +SRC_URI[sha256sum] = "3b655a79f9122afd298e9cd702e542908bbd6ea1337c02553110c57e0b3c5835" From dcfc91abdb772ec3b91654c40c76d2335b490615 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Thu, 19 May 2011 15:30:24 -0400 Subject: [PATCH 348/509] uhd : Upgrade from 003.000.001 to 003.001.000. Signed-off-by: Philip Balister --- recipes/uhd/uhd-firmware_003.000.001.bb | 7 ------- recipes/uhd/uhd-firmware_003.001.000.bb | 7 +++++++ recipes/uhd/uhd_git.bb | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 recipes/uhd/uhd-firmware_003.000.001.bb create mode 100644 recipes/uhd/uhd-firmware_003.001.000.bb diff --git a/recipes/uhd/uhd-firmware_003.000.001.bb b/recipes/uhd/uhd-firmware_003.000.001.bb deleted file mode 100644 index 59018f4fab..0000000000 --- a/recipes/uhd/uhd-firmware_003.000.001.bb +++ /dev/null @@ -1,7 +0,0 @@ -require recipes/uhd/uhd-firmware.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "00bf346a4e6b8fb1f0d1633e4464cd34" -SRC_URI[sha256sum] = "231e8e63b6a3348b36881540e3738912d082a74118fd439feeec32ed76b56ba3" - diff --git a/recipes/uhd/uhd-firmware_003.001.000.bb b/recipes/uhd/uhd-firmware_003.001.000.bb new file mode 100644 index 0000000000..5d30806798 --- /dev/null +++ b/recipes/uhd/uhd-firmware_003.001.000.bb @@ -0,0 +1,7 @@ +require recipes/uhd/uhd-firmware.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "0d6a6792c6b98e9163d67cb62bf29dce" +SRC_URI[sha256sum] = "3b25726946026c6d25061403e3343d72b34cc41e7e44026b272510379d01233a" + diff --git a/recipes/uhd/uhd_git.bb b/recipes/uhd/uhd_git.bb index 6c90ec3743..80f32b78f5 100644 --- a/recipes/uhd/uhd_git.bb +++ b/recipes/uhd/uhd_git.bb @@ -1,8 +1,8 @@ require recipes/uhd/uhd.inc -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" SRC_URI = "git://ettus.sourcerepo.com/ettus/uhd.git;protocol=git" S = "${WORKDIR}/git/host" -SRCREV = "81e891f3f38259e7450b454933c979f2d8c93d65" +SRCREV = "0aff497dacc9cc4eba5d800cc46343da083cfdf1" From cd2388cc68e5d55ef1e036e543f355b7300a3909 Mon Sep 17 00:00:00 2001 From: Anand Balagopalakrishnan Date: Thu, 26 May 2011 19:03:08 +0530 Subject: [PATCH 349/509] libgles-omap3: Add wsegl.h to the destination include directory * Copy wsegl.h to the destination include directory. * This file is required to compile Qt's PowerVR graphics driver plugin. Signed-off-by: Anand Balagopalakrishnan Signed-off-by: Koen Kooi --- recipes/powervr-drivers/libgles-omap3.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc index ab4b2482d3..db7681d26c 100644 --- a/recipes/powervr-drivers/libgles-omap3.inc +++ b/recipes/powervr-drivers/libgles-omap3.inc @@ -1,7 +1,7 @@ DESCRIPTION = "libGLES for the omap3" LICENSE = "proprietary-binary" -PR = "r14" +PR = "r15" COMPATIBLE_MACHINE = "(omap3|ti816x)" @@ -145,6 +145,7 @@ do_install () { cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/v* ${D}${includedir}/ || true cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/V* ${D}${includedir}/ || true cp -pPr ${S}/include/*.h ${D}${includedir} || true + cp -pPr ${S}/include/wsegl/*.h ${D}${includedir} || true install -d ${D}${sysconfdir}/init.d/ cp -pP ${WORKDIR}/rc.pvr ${D}${sysconfdir}/init.d/pvr-init From db90409a002a316d9174a7ee1d542f6741d5c6a3 Mon Sep 17 00:00:00 2001 From: Anand Balagopalakrishnan Date: Thu, 26 May 2011 19:07:30 +0530 Subject: [PATCH 350/509] qt4: Fix the include path for SGX PowerVR drivers * Qt's PowerVR graphics driver plugin requires the PowerVR header files pvr2d.h, wsegl.h to compile * The current recipes copy the wsegl.h from Qt's src/3rdparty/powervr to powervr graphics driver plugin directory - src/plugins/gfxdrivers/powervr. * If/when the header files change, the incorrect wsegl.h will get picked up. * This patch ensures that the header files are picked up from the SGX SDK Signed-off-by: Anand Balagopalakrishnan Signed-off-by: Koen Kooi --- recipes/qt4/qt-4.6.3.inc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/recipes/qt4/qt-4.6.3.inc b/recipes/qt4/qt-4.6.3.inc index 77c5cf69d4..a35d57aedd 100644 --- a/recipes/qt4/qt-4.6.3.inc +++ b/recipes/qt4/qt-4.6.3.inc @@ -46,11 +46,6 @@ QT_GLFLAGS ?= "" QT_CONFIG_FLAGS += " -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}" do_compile() { - # Fixup missing wsegl header in some SGX SDKs - if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then - cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/ - fi - unset CFLAGS CXXFLAGS oe_runmake ${EXTRA_ENV} } From 45ba647b944ba66e40da58b84a3d50cfcdad8c16 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 26 May 2011 13:12:05 +0200 Subject: [PATCH 351/509] qt4 4.6.3: bump PR for wsegl header change Signed-off-by: Koen Kooi --- recipes/qt4/qt4-embedded.inc | 2 +- recipes/qt4/qt4-x11-free.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc index af9d545b1d..79ce00599c 100644 --- a/recipes/qt4/qt4-embedded.inc +++ b/recipes/qt4/qt4-embedded.inc @@ -4,7 +4,7 @@ LICENSE = "GPL QPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS += "directfb tslib" -INC_PR = "r28" +INC_PR = "r29" QT_BASE_NAME ?= "qt4-embedded" QT_BASE_LIB ?= "libqt-embedded" diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc index c4074225fb..f63c9d22a0 100644 --- a/recipes/qt4/qt4-x11-free.inc +++ b/recipes/qt4/qt4-x11-free.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" -INC_PR = "r24" +INC_PR = "r25" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch \ From dab778213c20a0f277f641a1f6064398244415c0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 20 May 2011 15:15:41 +0200 Subject: [PATCH 352/509] linux-omap 2.6.39: initial add with beagleboard support Tested with beagleboard C3 + zippy1 with angstrom Signed-off-by: Koen Kooi --- ...-support-for-beagleboard-xM-revision.patch | 115 + ...agle-add-support-for-expansionboards.patch | 354 + .../linux-omap-2.6.39/beagleboard/defconfig | 3490 +++++ ...AP-DSS2-DSI-fix-use_sys_clk-highfreq.patch | 33 + ...02-OMAP-DSS2-DSI-fix-dsi_dump_clocks.patch | 49 + ...ix-Return-correct-lcd-clock-source-f.patch | 43 + ...4-OMAP-DSS-DSI-Fix-DSI-PLL-power-bug.patch | 64 + ...-DSS2-fix-panel-Kconfig-dependencies.patch | 61 + ...otarg-for-selecting-svideo-or-compos.patch | 75 + .../0007-video-add-timings-for-hd720.patch | 27 + ...911x-return-ENODEV-if-device-is-not-.patch | 29 + ...uchscreen-ads7846-return-ENODEV-if-d.patch | 47 + ...vert-omap2_mcspi-Flush-posted-writes.patch | 25 + ...mc-improve-interrupt-synchronisation.patch | 482 + ...cards-off-to-save-power.-Doing-so-wi.patch | 52 + ...able-the-use-of-SDIO-card-interrupts.patch | 288 + ...e-audio-capture-by-default-for-twl40.patch | 27 + ...-twl4030-Turn-on-mic-bias-by-default.patch | 25 + ...-support-for-backup-battery-recharge.patch | 55 + ...l4030-move-clock-input-selection-pri.patch | 39 + ...ff-support-for-the-TWL4030-companion.patch | 103 + ...AP-Add-twl4030-madc-support-to-Overo.patch | 33 + ...abling-Hwmon-driver-for-twl4030-madc.patch | 46 + .../0021-mfd-twl-core-enable-madc-clock.patch | 54 + ...ically-set-musb-mode-in-platform-dat.patch | 49 + ...just-dto-to-eliminate-timeout-errors.patch | 28 + ...-omap-Fix-mtd-subpage-read-alignment.patch | 95 + ...orce-all-buffer-reads-to-u32-alignme.patch | 35 + ...-fix-subpage-ecc-issue-with-prefetch.patch | 63 + ...27-OMAP-Overo-Add-support-for-spidev.patch | 46 + ...nionfs-Add-support-for-unionfs-2.5.9.patch | 11494 ++++++++++++++++ recipes/linux/linux-omap_2.6.39.bb | 57 + 32 files changed, 17483 insertions(+) create mode 100644 recipes/linux/linux-omap-2.6.39/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch create mode 100644 recipes/linux/linux-omap-2.6.39/beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch create mode 100644 recipes/linux/linux-omap-2.6.39/beagleboard/defconfig create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0001-OMAP-DSS2-DSI-fix-use_sys_clk-highfreq.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0002-OMAP-DSS2-DSI-fix-dsi_dump_clocks.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0003-OMAP2PLUS-DSS2-Fix-Return-correct-lcd-clock-source-f.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0004-OMAP-DSS-DSI-Fix-DSI-PLL-power-bug.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0005-OMAP-DSS2-fix-panel-Kconfig-dependencies.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0006-OMAP-DSS2-add-bootarg-for-selecting-svideo-or-compos.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0007-video-add-timings-for-hd720.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0008-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0009-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0010-Revert-omap2_mcspi-Flush-posted-writes.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0011-Revert-omap_hsmmc-improve-interrupt-synchronisation.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0012-Don-t-turn-SDIO-cards-off-to-save-power.-Doing-so-wi.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0013-Enable-the-use-of-SDIO-card-interrupts.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0014-soc-codecs-Enable-audio-capture-by-default-for-twl40.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0015-soc-codecs-twl4030-Turn-on-mic-bias-by-default.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0016-RTC-add-support-for-backup-battery-recharge.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0017-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0018-Add-power-off-support-for-the-TWL4030-companion.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0019-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0020-Enabling-Hwmon-driver-for-twl4030-madc.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0021-mfd-twl-core-enable-madc-clock.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0022-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0023-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0024-omap-Fix-mtd-subpage-read-alignment.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0025-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0026-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0027-OMAP-Overo-Add-support-for-spidev.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0028-unionfs-Add-support-for-unionfs-2.5.9.patch create mode 100644 recipes/linux/linux-omap_2.6.39.bb diff --git a/recipes/linux/linux-omap-2.6.39/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch b/recipes/linux/linux-omap-2.6.39/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch new file mode 100644 index 0000000000..c7b6230b56 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch @@ -0,0 +1,115 @@ +From 6597e99e0b74076530e34608e2d9a7b86a694b8e Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Fri, 20 May 2011 12:48:37 +0200 +Subject: [PATCH 1/2] OMAP3: beagle: add support for beagleboard xM revision C + +The USB enable GPIO has been inverted and the USER button moved. + +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/board-omap3beagle.c | 32 +++++++++++++++++++++++------- + 1 files changed, 24 insertions(+), 8 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 2de4b02..1eb1e8e 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -62,7 +62,9 @@ + * AXBX = GPIO173, GPIO172, GPIO171: 1 1 1 + * C1_3 = GPIO173, GPIO172, GPIO171: 1 1 0 + * C4 = GPIO173, GPIO172, GPIO171: 1 0 1 +- * XM = GPIO173, GPIO172, GPIO171: 0 0 0 ++ * XMA = GPIO173, GPIO172, GPIO171: 0 0 0 ++ * XMB = GPIO173, GPIO172, GPIO171: 0 0 1 ++ * XMC = GPIO173, GPIO172, GPIO171: 0 1 0 + */ + enum { + OMAP3BEAGLE_BOARD_UNKN = 0, +@@ -70,6 +72,7 @@ enum { + OMAP3BEAGLE_BOARD_C1_3, + OMAP3BEAGLE_BOARD_C4, + OMAP3BEAGLE_BOARD_XM, ++ OMAP3BEAGLE_BOARD_XMC, + }; + + static u8 omap3_beagle_version; +@@ -124,9 +127,17 @@ static void __init omap3_beagle_init_rev(void) + printk(KERN_INFO "OMAP3 Beagle Rev: xM\n"); + omap3_beagle_version = OMAP3BEAGLE_BOARD_XM; + break; ++ case 1: ++ printk(KERN_INFO "OMAP3 Beagle Rev: xM B\n"); ++ omap3_beagle_version = OMAP3BEAGLE_BOARD_XM; ++ break; ++ case 2: ++ printk(KERN_INFO "OMAP3 Beagle Rev: xM C\n"); ++ omap3_beagle_version = OMAP3BEAGLE_BOARD_XMC; ++ break; + default: +- printk(KERN_INFO "OMAP3 Beagle Rev: unknown %hd\n", beagle_rev); +- omap3_beagle_version = OMAP3BEAGLE_BOARD_UNKN; ++ printk(KERN_INFO "OMAP3 Beagle Rev: unknown %hd, assuming xM C or newer\n", beagle_rev); ++ omap3_beagle_version = OMAP3BEAGLE_BOARD_XMC; + } + + return; +@@ -278,7 +289,7 @@ static int beagle_twl_gpio_setup(struct device *dev, + { + int r; + +- if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { ++ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM || omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC) { + mmc[0].gpio_wp = -EINVAL; + } else if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C1_3) || + (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C4)) { +@@ -298,7 +309,7 @@ static int beagle_twl_gpio_setup(struct device *dev, + /* REVISIT: need ehci-omap hooks for external VBUS + * power switch and overcurrent detect + */ +- if (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XM) { ++ if (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XM && omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XMC) { + r = gpio_request(gpio + 1, "EHCI_nOC"); + if (!r) { + r = gpio_direction_input(gpio + 1); +@@ -320,7 +331,7 @@ static int beagle_twl_gpio_setup(struct device *dev, + gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0); + + /* DVI reset GPIO is different between beagle revisions */ +- if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) ++ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM || omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC) + beagle_dvi_device.reset_gpio = 129; + else + beagle_dvi_device.reset_gpio = 170; +@@ -334,7 +345,7 @@ static int beagle_twl_gpio_setup(struct device *dev, + * P7/P8 revisions(prototype): Camera EN + * A2+ revisions (production): LDO (supplies DVI, serial, led blocks) + */ +- if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { ++ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM || omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC) { + r = gpio_request(gpio + 1, "nDVI_PWR_EN"); + if (!r) { + r = gpio_direction_output(gpio + 1, 0); +@@ -625,7 +636,7 @@ static void __init beagle_opp_init(void) + } + + /* Custom OPP enabled for XM */ +- if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { ++ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM || omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC) { + struct omap_hwmod *mh = omap_hwmod_lookup("mpu"); + struct omap_hwmod *dh = omap_hwmod_lookup("iva"); + struct device *dev; +@@ -665,6 +676,11 @@ static void __init omap3_beagle_init(void) + omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); + omap3_beagle_init_rev(); + omap3_beagle_i2c_init(); ++ ++ if (cpu_is_omap3630()) { ++ gpio_buttons[0].gpio = 4; ++ } ++ + platform_add_devices(omap3_beagle_devices, + ARRAY_SIZE(omap3_beagle_devices)); + omap_display_init(&beagle_dss_data); +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch b/recipes/linux/linux-omap-2.6.39/beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch new file mode 100644 index 0000000000..68f318b8da --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch @@ -0,0 +1,354 @@ +From 70b4b60b198137ca8aebd577142ea3bb6c273a55 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Fri, 20 May 2011 13:06:24 +0200 +Subject: [PATCH 2/2] OMAP3: beagle: add support for expansionboards + +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/board-omap3beagle.c | 267 ++++++++++++++++++++++++++++++- + 1 files changed, 264 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 1eb1e8e..40e54f2 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -153,6 +154,162 @@ fail0: + return; + } + ++char expansionboard_name[16]; ++ ++#if defined(CONFIG_WL12XX) || defined(CONFIG_WL12XX_MODULE) ++#include ++#include ++ ++#define OMAP_BEAGLE_WLAN_EN_GPIO (139) ++#define OMAP_BEAGLE_BT_EN_GPIO (138) ++#define OMAP_BEAGLE_WLAN_IRQ_GPIO (137) ++#define OMAP_BEAGLE_FM_EN_BT_WU (136) ++ ++struct wl12xx_platform_data omap_beagle_wlan_data __initdata = { ++ .irq = OMAP_GPIO_IRQ(OMAP_BEAGLE_WLAN_IRQ_GPIO), ++ .board_ref_clock = 2, /* 38.4 MHz */ ++}; ++ ++static int gpios[] = {OMAP_BEAGLE_BT_EN_GPIO, OMAP_BEAGLE_FM_EN_BT_WU, -1}; ++static struct platform_device wl12xx_device = { ++ .name = "kim", ++ .id = -1, ++ .dev.platform_data = &gpios, ++}; ++ ++static struct omap2_hsmmc_info mmcbbt[] = { ++ { ++ .mmc = 1, ++ .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, ++ .gpio_wp = 29, ++ }, ++ { ++ .name = "wl1271", ++ .mmc = 2, ++ .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_POWER_OFF_CARD, ++ .gpio_wp = -EINVAL, ++ .gpio_cd = -EINVAL, ++ .nonremovable = true, ++ }, ++ {} /* Terminator */ ++ }; ++ ++static struct regulator_consumer_supply beagle_vmmc2_supply = { ++ .supply = "vmmc", ++ .dev_name = "mmci-omap-hs.1", ++}; ++ ++static struct regulator_init_data beagle_vmmc2 = { ++ .constraints = { ++ .valid_ops_mask = REGULATOR_CHANGE_STATUS, ++ }, ++ .num_consumer_supplies = 1, ++ .consumer_supplies = &beagle_vmmc2_supply, ++}; ++ ++static struct fixed_voltage_config beagle_vwlan = { ++ .supply_name = "vwl1271", ++ .microvolts = 1800000, /* 1.8V */ ++ .gpio = OMAP_BEAGLE_WLAN_EN_GPIO, ++ .startup_delay = 70000, /* 70ms */ ++ .enable_high = 1, ++ .enabled_at_boot = 0, ++ .init_data = &beagle_vmmc2, ++}; ++ ++static struct platform_device omap_vwlan_device = { ++ .name = "reg-fixed-voltage", ++ .id = 1, ++ .dev = { ++ .platform_data = &beagle_vwlan, ++ }, ++}; ++#endif ++ ++#if defined(CONFIG_ENC28J60) || defined(CONFIG_ENC28J60_MODULE) ++ ++#include ++#include ++ ++#define OMAP3BEAGLE_GPIO_ENC28J60_IRQ 157 ++ ++static struct omap2_mcspi_device_config enc28j60_spi_chip_info = { ++ .turbo_mode = 0, ++ .single_channel = 1, /* 0: slave, 1: master */ ++}; ++ ++static struct spi_board_info omap3beagle_zippy_spi_board_info[] __initdata = { ++ { ++ .modalias = "enc28j60", ++ .bus_num = 4, ++ .chip_select = 0, ++ .max_speed_hz = 20000000, ++ .controller_data = &enc28j60_spi_chip_info, ++ }, ++}; ++ ++static void __init omap3beagle_enc28j60_init(void) ++{ ++ if ((gpio_request(OMAP3BEAGLE_GPIO_ENC28J60_IRQ, "ENC28J60_IRQ") == 0) && ++ (gpio_direction_input(OMAP3BEAGLE_GPIO_ENC28J60_IRQ) == 0)) { ++ gpio_export(OMAP3BEAGLE_GPIO_ENC28J60_IRQ, 0); ++ omap3beagle_zippy_spi_board_info[0].irq = OMAP_GPIO_IRQ(OMAP3BEAGLE_GPIO_ENC28J60_IRQ); ++ irq_set_irq_type(omap3beagle_zippy_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING); ++ } else { ++ printk(KERN_ERR "could not obtain gpio for ENC28J60_IRQ\n"); ++ return; ++ } ++ ++ spi_register_board_info(omap3beagle_zippy_spi_board_info, ++ ARRAY_SIZE(omap3beagle_zippy_spi_board_info)); ++} ++ ++#else ++static inline void __init omap3beagle_enc28j60_init(void) { return; } ++#endif ++ ++#if defined(CONFIG_KS8851) || defined(CONFIG_KS8851_MODULE) ++ ++#include ++#include ++ ++#define OMAP3BEAGLE_GPIO_KS8851_IRQ 157 ++ ++static struct omap2_mcspi_device_config ks8851_spi_chip_info = { ++ .turbo_mode = 0, ++ .single_channel = 1, /* 0: slave, 1: master */ ++}; ++ ++static struct spi_board_info omap3beagle_zippy2_spi_board_info[] __initdata = { ++ { ++ .modalias = "ks8851", ++ .bus_num = 4, ++ .chip_select = 0, ++ .max_speed_hz = 36000000, ++ .controller_data = &ks8851_spi_chip_info, ++ }, ++}; ++ ++static void __init omap3beagle_ks8851_init(void) ++{ ++ if ((gpio_request(OMAP3BEAGLE_GPIO_KS8851_IRQ, "KS8851_IRQ") == 0) && ++ (gpio_direction_input(OMAP3BEAGLE_GPIO_KS8851_IRQ) == 0)) { ++ gpio_export(OMAP3BEAGLE_GPIO_KS8851_IRQ, 0); ++ omap3beagle_zippy2_spi_board_info[0].irq = OMAP_GPIO_IRQ(OMAP3BEAGLE_GPIO_KS8851_IRQ); ++ irq_set_irq_type(omap3beagle_zippy2_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING); ++ } else { ++ printk(KERN_ERR "could not obtain gpio for KS8851_IRQ\n"); ++ return; ++ } ++ ++ spi_register_board_info(omap3beagle_zippy2_spi_board_info, ++ ARRAY_SIZE(omap3beagle_zippy2_spi_board_info)); ++} ++ ++#else ++static inline void __init omap3beagle_ks8851_init(void) { return; } ++#endif ++ + static struct mtd_partition omap3beagle_nand_partitions[] = { + /* All the partition sizes are listed in terms of NAND block size */ + { +@@ -271,6 +428,12 @@ static struct omap2_hsmmc_info mmc[] = { + .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, + .gpio_wp = 29, + }, ++ { ++ .mmc = 2, ++ .caps = MMC_CAP_4_BIT_DATA, ++ .transceiver = true, ++ .ocr_mask = 0x00100000, /* 3.3V */ ++ }, + {} /* Terminator */ + }; + +@@ -300,11 +463,25 @@ static int beagle_twl_gpio_setup(struct device *dev, + } + /* gpio + 0 is "mmc0_cd" (input/IRQ) */ + mmc[0].gpio_cd = gpio + 0; ++#if defined(CONFIG_WL12XX) || defined(CONFIG_WL12XX_MODULE) ++ if(!strcmp(expansionboard_name, "bbtoys-wifi")) { ++ omap2_hsmmc_init(mmcbbt); ++ /* link regulators to MMC adapters */ ++ beagle_vmmc1_supply.dev = mmcbbt[0].dev; ++ beagle_vsim_supply.dev = mmcbbt[0].dev; ++ } else { ++ omap2_hsmmc_init(mmc); ++ /* link regulators to MMC adapters */ ++ beagle_vmmc1_supply.dev = mmc[0].dev; ++ beagle_vsim_supply.dev = mmc[0].dev; ++ } ++#else + omap2_hsmmc_init(mmc); + + /* link regulators to MMC adapters */ + beagle_vmmc1_supply.dev = mmc[0].dev; + beagle_vsim_supply.dev = mmc[0].dev; ++#endif + + /* REVISIT: need ehci-omap hooks for external VBUS + * power switch and overcurrent detect +@@ -464,7 +641,7 @@ static struct twl4030_platform_data beagle_twldata = { + .vpll2 = &beagle_vpll2, + }; + +-static struct i2c_board_info __initdata beagle_i2c_boardinfo[] = { ++static struct i2c_board_info __initdata beagle_i2c1_boardinfo[] = { + { + I2C_BOARD_INFO("twl4030", 0x48), + .flags = I2C_CLIENT_WAKE, +@@ -479,10 +656,24 @@ static struct i2c_board_info __initdata beagle_i2c_eeprom[] = { + }, + }; + ++#if defined(CONFIG_RTC_DRV_DS1307) || \ ++ defined(CONFIG_RTC_DRV_DS1307_MODULE) ++ ++static struct i2c_board_info __initdata beagle_i2c2_boardinfo[] = { ++ { ++ I2C_BOARD_INFO("ds1307", 0x68), ++ }, ++}; ++#else ++static struct i2c_board_info __initdata beagle_i2c2_boardinfo[] = {}; ++#endif ++ + static int __init omap3_beagle_i2c_init(void) + { +- omap_register_i2c_bus(1, 2600, beagle_i2c_boardinfo, +- ARRAY_SIZE(beagle_i2c_boardinfo)); ++ omap_register_i2c_bus(1, 2600, beagle_i2c1_boardinfo, ++ ARRAY_SIZE(beagle_i2c1_boardinfo)); ++ omap_register_i2c_bus(2, 400, beagle_i2c2_boardinfo, ++ ARRAY_SIZE(beagle_i2c2_boardinfo)); + /* Bus 3 is attached to the DVI port where devices like the pico DLP + * projector don't work reliably with 400kHz */ + omap_register_i2c_bus(3, 100, beagle_i2c_eeprom, ARRAY_SIZE(beagle_i2c_eeprom)); +@@ -625,6 +816,15 @@ static struct omap_musb_board_data musb_board_data = { + .power = 100, + }; + ++static int __init expansionboard_setup(char *str) ++{ ++ if (!str) ++ return -EINVAL; ++ strncpy(expansionboard_name, str, 16); ++ printk(KERN_INFO "Beagle expansionboard: %s\n", expansionboard_name); ++ return 0; ++} ++ + static void __init beagle_opp_init(void) + { + int r = 0; +@@ -691,6 +891,65 @@ static void __init omap3_beagle_init(void) + /* REVISIT leave DVI powered down until it's needed ... */ + gpio_direction_output(170, true); + ++ if(!strcmp(expansionboard_name, "zippy")) ++ { ++ printk(KERN_INFO "Beagle expansionboard: initializing enc28j60\n"); ++ omap3beagle_enc28j60_init(); ++ printk(KERN_INFO "Beagle expansionboard: assigning GPIO 141 and 162 to MMC1\n"); ++ mmc[1].gpio_wp = 141; ++ mmc[1].gpio_cd = 162; ++ } ++ ++ if(!strcmp(expansionboard_name, "zippy2")) ++ { ++ printk(KERN_INFO "Beagle expansionboard: initializing ks_8851\n"); ++ omap3beagle_ks8851_init(); ++ printk(KERN_INFO "Beagle expansionboard: assigning GPIO 141 and 162 to MMC1\n"); ++ mmc[1].gpio_wp = 141; ++ mmc[1].gpio_cd = 162; ++ } ++ ++ if(!strcmp(expansionboard_name, "trainer")) ++ { ++ printk(KERN_INFO "Beagle expansionboard: exporting GPIOs 130-141,162 to userspace\n"); ++ gpio_request(130, "sysfs"); ++ gpio_export(130, 1); ++ gpio_request(131, "sysfs"); ++ gpio_export(131, 1); ++ gpio_request(132, "sysfs"); ++ gpio_export(132, 1); ++ gpio_request(133, "sysfs"); ++ gpio_export(133, 1); ++ gpio_request(134, "sysfs"); ++ gpio_export(134, 1); ++ gpio_request(135, "sysfs"); ++ gpio_export(135, 1); ++ gpio_request(136, "sysfs"); ++ gpio_export(136, 1); ++ gpio_request(137, "sysfs"); ++ gpio_export(137, 1); ++ gpio_request(138, "sysfs"); ++ gpio_export(138, 1); ++ gpio_request(139, "sysfs"); ++ gpio_export(139, 1); ++ gpio_request(140, "sysfs"); ++ gpio_export(140, 1); ++ gpio_request(141, "sysfs"); ++ gpio_export(141, 1); ++ gpio_request(162, "sysfs"); ++ gpio_export(162, 1); ++ } ++ ++ if(!strcmp(expansionboard_name, "bbtoys-wifi")) ++ { ++ if (wl12xx_set_platform_data(&omap_beagle_wlan_data)) ++ pr_err("error setting wl12xx data\n"); ++ printk(KERN_INFO "Beagle expansionboard: registering wl12xx bt platform device\n"); ++ platform_device_register(&wl12xx_device); ++ printk(KERN_INFO "Beagle expansionboard: registering wl12xx wifi platform device\n"); ++ platform_device_register(&omap_vwlan_device); ++ } ++ + usb_musb_init(&musb_board_data); + usbhs_init(&usbhs_bdata); + omap3beagle_flash_init(); +@@ -703,6 +962,8 @@ static void __init omap3_beagle_init(void) + beagle_opp_init(); + } + ++early_param("buddy", expansionboard_setup); ++ + MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") + /* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */ + .boot_params = 0x80000100, +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.39/beagleboard/defconfig new file mode 100644 index 0000000000..9e81a05708 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/beagleboard/defconfig @@ -0,0 +1,3490 @@ +# +# Automatically generated make config: don't edit +# Linux/arm 2.6.39 Kernel Configuration +# Fri May 20 13:11:13 2011 +# +CONFIG_ARM=y +CONFIG_HAVE_PWM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_HAVE_SCHED_CLOCK=y +CONFIG_GENERIC_GPIO=y +# CONFIG_ARCH_USES_GETTIMEOFFSET is not set +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_KTIME_SCALAR=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_ARCH_HAS_CPUFREQ=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_VECTORS_BASE=0xffff0000 +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y +CONFIG_HAVE_IRQ_WORK=y +CONFIG_IRQ_WORK=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_LZO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_FHANDLE=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +# CONFIG_AUDIT is not set +CONFIG_HAVE_GENERIC_HARDIRQS=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_HARDIRQS=y +CONFIG_HAVE_SPARSE_IRQ=y +CONFIG_GENERIC_IRQ_SHOW=y +# CONFIG_SPARSE_IRQ is not set + +# +# RCU Subsystem +# +CONFIG_TREE_PREEMPT_RCU=y +# CONFIG_TINY_RCU is not set +# CONFIG_TINY_PREEMPT_RCU is not set +CONFIG_PREEMPT_RCU=y +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_TREE_RCU_TRACE is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=16 +CONFIG_CGROUPS=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_CGROUP_NS=y +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_RESOURCE_COUNTERS=y +CONFIG_CGROUP_MEM_RES_CTLR=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y +CONFIG_CGROUP_PERF=y +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_RT_GROUP_SCHED=y +# CONFIG_BLK_CGROUP is not set +# CONFIG_NAMESPACES is not set +CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y +# CONFIG_SYSFS_DEPRECATED is not set +# CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_EXPERT=y +CONFIG_UID16=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_EMBEDDED=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_PERF_USE_VMALLOC=y + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +# CONFIG_PERF_COUNTERS is not set +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_COMPAT_BRK is not set +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_PROFILING=y +CONFIG_OPROFILE=y +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_HW_BREAKPOINT=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +CONFIG_BLK_DEV_BSG=y +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +# CONFIG_INLINE_SPIN_UNLOCK is not set +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +# CONFIG_INLINE_READ_UNLOCK is not set +# CONFIG_INLINE_READ_UNLOCK_BH is not set +# CONFIG_INLINE_READ_UNLOCK_IRQ is not set +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +# CONFIG_INLINE_WRITE_UNLOCK is not set +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set +CONFIG_FREEZER=y + +# +# System Type +# +CONFIG_MMU=y +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_VEXPRESS is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_BCMRING is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CNS3XXX is not set +# CONFIG_ARCH_GEMINI is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_MXS is not set +# CONFIG_ARCH_STMP3XXX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_DOVE is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_LPC32XX is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_MMP is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_W90X900 is not set +# CONFIG_ARCH_NUC93X is not set +# CONFIG_ARCH_TEGRA is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_MSM is not set +# CONFIG_ARCH_SHMOBILE is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_S5P64X0 is not set +# CONFIG_ARCH_S5P6442 is not set +# CONFIG_ARCH_S5PC100 is not set +# CONFIG_ARCH_S5PV210 is not set +# CONFIG_ARCH_EXYNOS4 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_TCC_926 is not set +# CONFIG_ARCH_U300 is not set +# CONFIG_ARCH_U8500 is not set +# CONFIG_ARCH_NOMADIK is not set +# CONFIG_ARCH_DAVINCI is not set +CONFIG_ARCH_OMAP=y +# CONFIG_PLAT_SPEAR is not set +# CONFIG_ARCH_VT8500 is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_KEYBOARD_GPIO_POLLED is not set + +# +# TI OMAP Common Features +# +CONFIG_ARCH_OMAP_OTG=y +# CONFIG_ARCH_OMAP1 is not set +CONFIG_ARCH_OMAP2PLUS=y + +# +# OMAP Feature Selections +# +CONFIG_OMAP_SMARTREFLEX=y +CONFIG_OMAP_SMARTREFLEX_CLASS3=y +CONFIG_OMAP_RESET_CLOCKS=y +# CONFIG_OMAP_MUX is not set +CONFIG_OMAP_MCBSP=y +CONFIG_OMAP_MBOX_FWK=m +CONFIG_OMAP_MBOX_KFIFO_SIZE=256 +CONFIG_OMAP_IOMMU=y +CONFIG_OMAP_IOMMU_DEBUG=m +CONFIG_OMAP_32K_TIMER=y +# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set +CONFIG_OMAP_32K_TIMER_HZ=128 +CONFIG_OMAP_DM_TIMER=y +# CONFIG_OMAP_PM_NONE is not set +CONFIG_OMAP_PM_NOOP=y + +# +# TI OMAP2/3/4 Specific Features +# +CONFIG_ARCH_OMAP2PLUS_TYPICAL=y +# CONFIG_ARCH_OMAP2 is not set +CONFIG_ARCH_OMAP3=y +# CONFIG_ARCH_OMAP4 is not set +CONFIG_SOC_OMAP3430=y +# CONFIG_SOC_OMAPTI816X is not set +CONFIG_OMAP_PACKAGE_CBB=y + +# +# OMAP Board Type +# +CONFIG_MACH_OMAP3_BEAGLE=y +# CONFIG_MACH_DEVKIT8000 is not set +# CONFIG_MACH_OMAP_LDP is not set +# CONFIG_MACH_OMAP3530_LV_SOM is not set +# CONFIG_MACH_OMAP3_TORPEDO is not set +CONFIG_MACH_OVERO=y +CONFIG_MACH_OMAP3EVM=y +# CONFIG_MACH_OMAP3517EVM is not set +# CONFIG_MACH_CRANEBOARD is not set +# CONFIG_MACH_OMAP3_PANDORA is not set +CONFIG_MACH_OMAP3_TOUCHBOOK=y +# CONFIG_MACH_OMAP_3430SDP is not set +# CONFIG_MACH_NOKIA_RM680 is not set +# CONFIG_MACH_NOKIA_RX51 is not set +CONFIG_MACH_OMAP_ZOOM2=y +# CONFIG_MACH_OMAP_ZOOM3 is not set +# CONFIG_MACH_CM_T35 is not set +# CONFIG_MACH_CM_T3517 is not set +# CONFIG_MACH_IGEP0020 is not set +# CONFIG_MACH_IGEP0030 is not set +# CONFIG_MACH_SBC3530 is not set +# CONFIG_MACH_OMAP_3630SDP is not set +# CONFIG_OMAP3_EMU is not set +# CONFIG_OMAP3_SDRC_AC_TIMING is not set + +# +# System MMU +# + +# +# Processor Type +# +CONFIG_CPU_V7=y +CONFIG_CPU_32v6K=y +CONFIG_CPU_32v7=y +CONFIG_CPU_ABRT_EV7=y +CONFIG_CPU_PABRT_V7=y +CONFIG_CPU_CACHE_V7=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y +CONFIG_CPU_TLB_V7=y +CONFIG_CPU_HAS_ASID=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +CONFIG_ARM_THUMBEE=y +# CONFIG_SWP_EMULATE is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_ARM_L1_CACHE_SHIFT_6=y +CONFIG_ARM_L1_CACHE_SHIFT=6 +CONFIG_ARM_DMA_MEM_BUFFERABLE=y +CONFIG_ARM_ERRATA_430973=y +# CONFIG_ARM_ERRATA_458693 is not set +# CONFIG_ARM_ERRATA_460075 is not set +# CONFIG_ARM_ERRATA_743622 is not set +# CONFIG_ARM_ERRATA_754322 is not set + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_HZ=128 +# CONFIG_THUMB2_KERNEL is not set +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_HIGHMEM is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_VIRT_TO_BUS=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_NEED_PER_CPU_KM=y +CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_LEDS=y +CONFIG_ALIGNMENT_TRAP=y +# CONFIG_UACCESS_WITH_MEMCPY is not set +# CONFIG_SECCOMP is not set +# CONFIG_CC_STACKPROTECTOR is not set +# CONFIG_DEPRECATED_PARAM_STRUCT is not set + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE=" debug " +# CONFIG_CMDLINE_FORCE is not set +# CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y +# CONFIG_CRASH_DUMP is not set +# CONFIG_AUTO_ZRELADDR is not set + +# +# CPU Power Management +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_VFP=y +CONFIG_VFPv3=y +CONFIG_NEON=y + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=y + +# +# Power management options +# +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_PM_SLEEP=y +CONFIG_PM_RUNTIME=y +CONFIG_PM=y +CONFIG_PM_DEBUG=y +# CONFIG_PM_VERBOSE is not set +# CONFIG_PM_ADVANCED_DEBUG is not set +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_CAN_PM_TRACE=y +# CONFIG_APM_EMULATION is not set +CONFIG_ARCH_HAS_OPP=y +CONFIG_PM_OPP=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=y +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_ROUTE_CLASSID=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IPGRE=m +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m +# CONFIG_IPV6_SIT_6RD is not set +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_MROUTE=y +CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y +# CONFIG_IPV6_PIMSM_V2 is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETWORK_PHY_TIMESTAMPING=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_ZONES=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +# CONFIG_NETFILTER_TPROXY is not set +CONFIG_NETFILTER_XTABLES=m + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m + +# +# Xtables targets +# +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +# CONFIG_NETFILTER_XT_TARGET_LED is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +# CONFIG_NETFILTER_XT_MATCH_OSF is not set +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +# CONFIG_IP_SET_BITMAP_IP is not set +# CONFIG_IP_SET_BITMAP_IPMAC is not set +# CONFIG_IP_SET_BITMAP_PORT is not set +# CONFIG_IP_SET_HASH_IP is not set +# CONFIG_IP_SET_HASH_IPPORT is not set +# CONFIG_IP_SET_HASH_IPPORTIP is not set +# CONFIG_IP_SET_HASH_IPPORTNET is not set +# CONFIG_IP_SET_HASH_NET is not set +# CONFIG_IP_SET_HASH_NETPORT is not set +# CONFIG_IP_SET_LIST_SET is not set +CONFIG_IP_VS=m +CONFIG_IP_VS_IPV6=y +CONFIG_IP_VS_DEBUG=y +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +# CONFIG_IP_VS_PROTO_SCTP is not set + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PE_SIP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +# CONFIG_BRIDGE_NF_EBTABLES is not set +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_TFRC_LIB=y + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +# CONFIG_SCTP_HMAC_SHA1 is not set +CONFIG_SCTP_HMAC_MD5=y +# CONFIG_RDS is not set +CONFIG_TIPC=m +# CONFIG_TIPC_ADVANCED is not set +# CONFIG_TIPC_DEBUG is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_L2TP=m +CONFIG_L2TP_DEBUGFS=m +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +CONFIG_L2TP_ETH=m +CONFIG_STP=m +CONFIG_GARP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +# CONFIG_NET_DSA is not set +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y +# CONFIG_DECNET is not set +CONFIG_LLC=m +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +CONFIG_WAN_ROUTER=m +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +# CONFIG_NET_SCH_SFB is not set +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_CHOKE=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_CLS_CGROUP=m +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set +CONFIG_DNS_RESOLVER=y +# CONFIG_BATMAN_ADV is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m + +# +# CAN Device Drivers +# +CONFIG_CAN_VCAN=m +CONFIG_CAN_SLCAN=m +# CONFIG_CAN_DEV is not set +# CONFIG_CAN_DEBUG_DEVICES is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +# CONFIG_ACT200L_DONGLE is not set +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_L2CAP=y +CONFIG_BT_SCO=y +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +# CONFIG_BT_HCIVHCI is not set +# CONFIG_BT_MRVL is not set +CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +# CONFIG_RXKAD is not set +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +CONFIG_NL80211_TESTMODE=y +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_REG_DEBUG is not set +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_WEXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_LIB80211=y +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_PID=y +# CONFIG_MAC80211_RC_MINSTREL is not set +CONFIG_MAC80211_RC_DEFAULT_PID=y +CONFIG_MAC80211_RC_DEFAULT="pid" +# CONFIG_MAC80211_MESH is not set +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +CONFIG_NET_9P=m +# CONFIG_NET_9P_DEBUG is not set +# CONFIG_CAIF is not set +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_TESTS is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +CONFIG_SM_FTL=m +# CONFIG_MTD_OOPS is not set +CONFIG_MTD_SWAP=m + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND_ECC=y +# CONFIG_MTD_NAND_ECC_SMC is not set +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_BCH is not set +# CONFIG_MTD_SM_COMMON is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_GPIO is not set +CONFIG_MTD_NAND_OMAP2=y +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_NANDSIM is not set +CONFIG_MTD_NAND_PLATFORM=y +# CONFIG_MTD_ALAUDA is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set +# CONFIG_MTD_UBI_DEBUG is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_CRYPTOLOOP=m + +# +# DRBD disabled because PROC_FS, INET or CONNECTOR not selected +# +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_XIP is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_MG_DISK is not set +# CONFIG_BLK_DEV_RBD is not set +# CONFIG_SENSORS_LIS3LV02D is not set +CONFIG_MISC_DEVICES=y +# CONFIG_AD525X_DPOT is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_APDS9802ALS is not set +# CONFIG_ISL29003 is not set +# CONFIG_ISL29020 is not set +# CONFIG_SENSORS_TSL2550 is not set +CONFIG_SENSORS_BH1780=m +# CONFIG_SENSORS_BH1770 is not set +# CONFIG_SENSORS_APDS990X is not set +CONFIG_HMC6352=m +# CONFIG_DS1682 is not set +# CONFIG_TI_DAC7512 is not set +CONFIG_BMP085=m +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +CONFIG_EEPROM_93CX6=y +CONFIG_IWMC3200TOP=m +# CONFIG_IWMC3200TOP_DEBUG is not set +# CONFIG_IWMC3200TOP_DEBUGFS is not set + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +# CONFIG_SENSORS_LIS3_SPI is not set +# CONFIG_SENSORS_LIS3_I2C is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=y +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=y +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +# CONFIG_ATA is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +CONFIG_DM_RAID=m +# CONFIG_DM_LOG_USERSPACE is not set +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +# CONFIG_DM_MULTIPATH_QL is not set +# CONFIG_DM_MULTIPATH_ST is not set +CONFIG_DM_DELAY=m +# CONFIG_DM_UEVENT is not set +CONFIG_DM_FLAKEY=m +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_LOOPBACK_TARGET=m +# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set +CONFIG_NETDEVICES=y +CONFIG_DUMMY=m +CONFIG_BONDING=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_EQUALIZER=m +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_MII=y +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +CONFIG_BCM63XX_PHY=m +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +CONFIG_MICREL_PHY=m +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set +CONFIG_NET_ETHERNET=y +# CONFIG_AX88796 is not set +CONFIG_SMC91X=y +# CONFIG_TI_DAVINCI_EMAC is not set +CONFIG_TI_DAVINCI_MDIO=m +CONFIG_TI_DAVINCI_CPDMA=m +# CONFIG_DM9000 is not set +CONFIG_ENC28J60=y +# CONFIG_ENC28J60_WRITEVERIFY is not set +# CONFIG_ETHOC is not set +CONFIG_SMC911X=y +CONFIG_SMSC911X=y +# CONFIG_SMSC911X_ARCH_HOOKS is not set +# CONFIG_DNET is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_B44 is not set +CONFIG_KS8842=m +CONFIG_KS8851=y +# CONFIG_KS8851_MLL is not set +# CONFIG_FTMAC100 is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set +CONFIG_WLAN=y +# CONFIG_LIBERTAS_THINFIRM is not set +CONFIG_AT76C50X_USB=m +CONFIG_USB_ZD1201=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +# CONFIG_MAC80211_HWSIM is not set +# CONFIG_ATH_COMMON is not set +CONFIG_B43=m +# CONFIG_B43_SDIO is not set +CONFIG_B43_PIO=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +# CONFIG_B43LEGACY is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y +# CONFIG_IWM is not set +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +# CONFIG_LIBERTAS_SDIO is not set +# CONFIG_LIBERTAS_SPI is not set +# CONFIG_LIBERTAS_DEBUG is not set +# CONFIG_LIBERTAS_MESH is not set +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +# CONFIG_P54_SPI is not set +CONFIG_P54_LEDS=y +CONFIG_RT2X00=m +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +# CONFIG_RT2800USB is not set +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +CONFIG_RTL8192C_COMMON=m +CONFIG_WL1251=m +CONFIG_WL1251_SPI=m +CONFIG_WL1251_SDIO=m +CONFIG_WL12XX_MENU=m +CONFIG_WL12XX=m +CONFIG_WL12XX_HT=y +CONFIG_WL12XX_SPI=m +CONFIG_WL12XX_SDIO=m +# CONFIG_WL12XX_SDIO_TEST is not set +CONFIG_WL12XX_PLATFORM_DATA=y +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_SDIO=m +CONFIG_WIMAX_IWMC3200_SDIO=y +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 + +# +# USB Network Adapters +# +CONFIG_USB_CATC=y +CONFIG_USB_KAWETH=y +CONFIG_USB_PEGASUS=y +CONFIG_USB_RTL8150=y +CONFIG_USB_USBNET=y +CONFIG_USB_NET_AX8817X=y +CONFIG_USB_NET_CDCETHER=y +# CONFIG_USB_NET_CDC_EEM is not set +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_DM9601=y +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=y +CONFIG_USB_NET_GL620A=y +CONFIG_USB_NET_NET1080=y +CONFIG_USB_NET_PLUSB=y +CONFIG_USB_NET_MCS7830=y +CONFIG_USB_NET_RNDIS_HOST=y +CONFIG_USB_NET_CDC_SUBSET=y +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=y +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m +# CONFIG_WAN is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +# CONFIG_ATM_TCP is not set + +# +# CAIF transport drivers +# +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +# CONFIG_PPPOATM is not set +CONFIG_PPPOL2TP=m +# CONFIG_SLIP is not set +CONFIG_SLHC=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y +# CONFIG_ISDN is not set +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=y +CONFIG_INPUT_POLLDEV=y +# CONFIG_INPUT_SPARSEKMAP is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set +# CONFIG_KEYBOARD_ATKBD is not set +CONFIG_KEYBOARD_QT1070=m +CONFIG_KEYBOARD_QT2160=m +# CONFIG_KEYBOARD_LKKBD is not set +CONFIG_KEYBOARD_GPIO=y +# CONFIG_KEYBOARD_TCA6416 is not set +# CONFIG_KEYBOARD_MATRIX is not set +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_MAX7359 is not set +CONFIG_KEYBOARD_MCS=m +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_TWL4030 is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_ELANTECH is not set +# CONFIG_MOUSE_PS2_SENTELIC is not set +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_BCM5974 is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_GPIO is not set +# CONFIG_MOUSE_SYNAPTICS_I2C is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ATI_REMOTE is not set +# CONFIG_INPUT_ATI_REMOTE2 is not set +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_POWERMATE is not set +# CONFIG_INPUT_YEALINK is not set +# CONFIG_INPUT_CM109 is not set +CONFIG_INPUT_TWL4030_PWRBUTTON=y +CONFIG_INPUT_TWL4030_VIBRA=m +CONFIG_INPUT_UINPUT=y +CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_PWM_BEEPER=m +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +CONFIG_INPUT_ADXL34X=m +CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_ADXL34X_SPI=m +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_SERIO_ALTERA_PS2 is not set +# CONFIG_SERIO_PS2MULT is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +# CONFIG_LEGACY_PTYS is not set +# CONFIG_SERIAL_NONSTANDARD is not set +CONFIG_N_GSM=m +CONFIG_DEVKMEM=y + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX3107 is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_OMAP=y +CONFIG_SERIAL_OMAP_CONSOLE=y +# CONFIG_SERIAL_TIMBERDALE is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set +CONFIG_SERIAL_IFX6X60=m +CONFIG_TTY_PRINTK=y +# CONFIG_HVC_DCC is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=y +# CONFIG_HW_RANDOM_TIMERIOMEM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +# CONFIG_RAMOOPS is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +CONFIG_I2C_MUX_GPIO=m +# CONFIG_I2C_MUX_PCA9541 is not set +# CONFIG_I2C_MUX_PCA954x is not set +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_ALGOBIT=m + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE is not set +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_OMAP=y +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_PXA_PCI is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_DIOLAN_U2C=m +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_ALTERA is not set +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_GPIO is not set +# CONFIG_SPI_OC_TINY is not set +CONFIG_SPI_OMAP24XX=y +# CONFIG_SPI_PXA2XX_PCI is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +CONFIG_SPI_SPIDEV=y +# CONFIG_SPI_TLE62X0 is not set + +# +# PPS support +# +# CONFIG_PPS is not set + +# +# PPS generators support +# +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_MAX730X=m + +# +# Memory mapped GPIO expanders: +# +# CONFIG_GPIO_BASIC_MMIO is not set +# CONFIG_GPIO_IT8761E is not set + +# +# I2C GPIO expanders: +# +CONFIG_GPIO_MAX7300=m +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_SX150X is not set +CONFIG_GPIO_TWL4030=y +CONFIG_GPIO_ADP5588=m + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_74X164 is not set + +# +# AC97 GPIO expanders: +# + +# +# MODULbus GPIO expanders: +# +# CONFIG_W1 is not set +CONFIG_POWER_SUPPLY=m +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +CONFIG_TEST_POWER=m +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_BQ20Z75 is not set +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set +CONFIG_BATTERY_MAX17042=m +CONFIG_CHARGER_ISP1704=m +CONFIG_CHARGER_TWL4030=m +CONFIG_CHARGER_GPIO=m +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +# CONFIG_SENSORS_AD7414 is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADCXX is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +CONFIG_SENSORS_ADT7411=m +# CONFIG_SENSORS_ADT7462 is not set +# CONFIG_SENSORS_ADT7470 is not set +# CONFIG_SENSORS_ADT7475 is not set +CONFIG_SENSORS_ASC7621=m +# CONFIG_SENSORS_ATXP1 is not set +CONFIG_SENSORS_DS620=m +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_G760A is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +CONFIG_SENSORS_GPIO_FAN=m +# CONFIG_SENSORS_IT87 is not set +CONFIG_SENSORS_JC42=m +# CONFIG_SENSORS_LINEAGE is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM70 is not set +# CONFIG_SENSORS_LM73 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_LM93 is not set +# CONFIG_SENSORS_LTC4151 is not set +# CONFIG_SENSORS_LTC4215 is not set +# CONFIG_SENSORS_LTC4245 is not set +# CONFIG_SENSORS_LTC4261 is not set +# CONFIG_SENSORS_LM95241 is not set +# CONFIG_SENSORS_MAX1111 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX6639 is not set +# CONFIG_SENSORS_MAX6650 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_PMBUS is not set +# CONFIG_SENSORS_SHT15 is not set +# CONFIG_SENSORS_SHT21 is not set +CONFIG_SENSORS_SMM665=m +# CONFIG_SENSORS_DME1737 is not set +CONFIG_SENSORS_EMC1403=m +CONFIG_SENSORS_EMC2103=m +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_SCH5627 is not set +# CONFIG_SENSORS_ADS1015 is not set +# CONFIG_SENSORS_ADS7828 is not set +CONFIG_SENSORS_ADS7871=m +CONFIG_SENSORS_AMC6821=m +# CONFIG_SENSORS_THMC50 is not set +CONFIG_SENSORS_TMP102=m +# CONFIG_SENSORS_TMP401 is not set +# CONFIG_SENSORS_TMP421 is not set +CONFIG_SENSORS_TWL4030_MADC=m +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83795 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83L786NG is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_OMAP_WATCHDOG=y +# CONFIG_TWL4030_WATCHDOG is not set +# CONFIG_MAX63XX_WATCHDOG is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +# CONFIG_SSB_SDIOHOST is not set +# CONFIG_SSB_SILENT is not set +# CONFIG_SSB_DEBUG is not set +CONFIG_MFD_SUPPORT=y +CONFIG_MFD_CORE=y +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_HTC_I2CPLD is not set +CONFIG_TPS6105X=m +# CONFIG_TPS65010 is not set +CONFIG_TPS6507X=m +CONFIG_TWL4030_CORE=y +CONFIG_TWL4030_MADC=m +CONFIG_TWL4030_POWER=y +CONFIG_TWL4030_CODEC=y +CONFIG_TWL4030_POWEROFF=y +CONFIG_TWL6030_PWM=m +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_TC3589X is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_MAX8997 is not set +# CONFIG_MFD_MAX8998 is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X_I2C is not set +# CONFIG_MFD_WM831X_SPI is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_MFD_MC13XXX is not set +# CONFIG_ABX500_CORE is not set +# CONFIG_EZX_PCAP is not set +CONFIG_MFD_TPS6586X=y +CONFIG_MFD_WL1273_CORE=m +CONFIG_MFD_OMAP_USB_HOST=y +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +CONFIG_REGULATOR_DUMMY=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_BQ24022 is not set +# CONFIG_REGULATOR_MAX1586 is not set +# CONFIG_REGULATOR_MAX8649 is not set +# CONFIG_REGULATOR_MAX8660 is not set +# CONFIG_REGULATOR_MAX8952 is not set +CONFIG_REGULATOR_TWL4030=y +# CONFIG_REGULATOR_LP3971 is not set +# CONFIG_REGULATOR_LP3972 is not set +CONFIG_REGULATOR_TPS6105X=m +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set +# CONFIG_REGULATOR_ISL6271A is not set +# CONFIG_REGULATOR_AD5398 is not set +CONFIG_REGULATOR_TPS6586X=m +CONFIG_REGULATOR_TPS6524X=m +CONFIG_MEDIA_SUPPORT=y + +# +# Multimedia core support +# +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_COMMON=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_DVB_CORE=m +CONFIG_VIDEO_MEDIA=m + +# +# Multimedia drivers +# +CONFIG_RC_CORE=m +CONFIG_LIRC=m +CONFIG_RC_MAP=m +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_RC5_SZ_DECODER=m +CONFIG_IR_LIRC_CODEC=m +# CONFIG_IR_IMON is not set +# CONFIG_IR_MCEUSB is not set +# CONFIG_IR_STREAMZAP is not set +CONFIG_RC_LOOPBACK=m +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_CUSTOMISE=y + +# +# Customize TV tuners +# +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEOBUF_GEN=y +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DMA_CONTIG=y +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set +CONFIG_VIDEO_IR_I2C=m + +# +# Encoders/decoders and other helper chips +# + +# +# Audio decoders +# +# CONFIG_VIDEO_TVAUDIO is not set +# CONFIG_VIDEO_TDA7432 is not set +# CONFIG_VIDEO_TDA9840 is not set +# CONFIG_VIDEO_TEA6415C is not set +# CONFIG_VIDEO_TEA6420 is not set +CONFIG_VIDEO_MSP3400=m +# CONFIG_VIDEO_CS5345 is not set +CONFIG_VIDEO_CS53L32A=m +# CONFIG_VIDEO_M52790 is not set +# CONFIG_VIDEO_TLV320AIC23B is not set +CONFIG_VIDEO_WM8775=m +# CONFIG_VIDEO_WM8739 is not set +# CONFIG_VIDEO_VP27SMPX is not set + +# +# RDS decoders +# +# CONFIG_VIDEO_SAA6588 is not set + +# +# Video decoders +# +CONFIG_VIDEO_ADV7180=m +# CONFIG_VIDEO_BT819 is not set +# CONFIG_VIDEO_BT856 is not set +# CONFIG_VIDEO_BT866 is not set +# CONFIG_VIDEO_KS0127 is not set +# CONFIG_VIDEO_OV7670 is not set +CONFIG_VIDEO_MT9V011=m +# CONFIG_VIDEO_TCM825X is not set +# CONFIG_VIDEO_SAA7110 is not set +CONFIG_VIDEO_SAA711X=m +# CONFIG_VIDEO_SAA717X is not set +# CONFIG_VIDEO_SAA7191 is not set +# CONFIG_VIDEO_TVP514X is not set +# CONFIG_VIDEO_TVP5150 is not set +# CONFIG_VIDEO_TVP7002 is not set +# CONFIG_VIDEO_VPX3220 is not set + +# +# Video and audio decoders +# +CONFIG_VIDEO_CX25840=m + +# +# MPEG video encoders +# +CONFIG_VIDEO_CX2341X=m + +# +# Video encoders +# +# CONFIG_VIDEO_SAA7127 is not set +# CONFIG_VIDEO_SAA7185 is not set +# CONFIG_VIDEO_ADV7170 is not set +# CONFIG_VIDEO_ADV7175 is not set +# CONFIG_VIDEO_THS7303 is not set +# CONFIG_VIDEO_ADV7343 is not set +# CONFIG_VIDEO_AK881X is not set + +# +# Video improvement chips +# +# CONFIG_VIDEO_UPD64031A is not set +# CONFIG_VIDEO_UPD64083 is not set +CONFIG_VIDEO_VIVI=m +CONFIG_VIDEO_VPFE_CAPTURE=y +# CONFIG_VIDEO_DM6446_CCDC is not set +CONFIG_VIDEO_OMAP2_VOUT=y +# CONFIG_VIDEO_CPIA2 is not set +CONFIG_VIDEO_TIMBERDALE=m +# CONFIG_VIDEO_AU0828 is not set +CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_NOON010PC30=m +CONFIG_VIDEO_OMAP3=y +# CONFIG_VIDEO_OMAP3_DEBUG is not set +# CONFIG_SOC_CAMERA is not set +CONFIG_V4L_USB_DRIVERS=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +# CONFIG_USB_GL860 is not set +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +# CONFIG_USB_GSPCA_JEILINJ is not set +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +# CONFIG_USB_GSPCA_MR97310A is not set +CONFIG_USB_GSPCA_NW80X=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +# CONFIG_USB_GSPCA_PAC7302 is not set +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SN9C2028=m +# CONFIG_USB_GSPCA_SN9C20X is not set +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m +# CONFIG_USB_GSPCA_SQ905 is not set +# CONFIG_USB_GSPCA_SQ905C is not set +CONFIG_USB_GSPCA_SQ930X=m +CONFIG_USB_GSPCA_STK014=m +# CONFIG_USB_GSPCA_STV0680 is not set +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +# CONFIG_VIDEO_CX231XX_ALSA is not set +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_USBVISION=m +CONFIG_USB_ET61X251=m +CONFIG_USB_SN9C102=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_TESTDEV=m +CONFIG_RADIO_ADAPTERS=y +# CONFIG_I2C_SI4713 is not set +# CONFIG_RADIO_SI4713 is not set +# CONFIG_USB_DSBR is not set +# CONFIG_RADIO_SI470X is not set +# CONFIG_USB_MR800 is not set +# CONFIG_RADIO_TEA5764 is not set +CONFIG_RADIO_SAA7706H=m +# CONFIG_RADIO_TEF6862 is not set +CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m +CONFIG_DVB_MAX_ADAPTERS=8 +CONFIG_DVB_DYNAMIC_MINORS=y +CONFIG_DVB_CAPTURE_DRIVERS=y +# CONFIG_TTPCI_EEPROM is not set + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AF9015=m +# CONFIG_DVB_USB_CE6230 is not set +# CONFIG_DVB_USB_FRIIO is not set +# CONFIG_DVB_USB_EC168 is not set +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +# CONFIG_SMS_SIANO_MDTV is not set + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_DS3000=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_CX22702=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_LNBP21=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_IX2505V=m + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set + +# +# Graphics support +# +CONFIG_DRM=m +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=m +# CONFIG_FB_WMT_GE_ROPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_TMIO is not set +CONFIG_FB_UDL=m +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set +CONFIG_OMAP2_VRAM=y +CONFIG_OMAP2_VRFB=y +CONFIG_OMAP2_DSS=y +CONFIG_OMAP2_VRAM_SIZE=14 +CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y +# CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set +CONFIG_OMAP2_DSS_DPI=y +# CONFIG_OMAP2_DSS_RFBI is not set +CONFIG_OMAP2_DSS_VENC=y +# CONFIG_OMAP2_DSS_SDI is not set +CONFIG_OMAP2_DSS_DSI=y +CONFIG_OMAP2_DSS_USE_DSI_PLL=y +# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set +CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 +CONFIG_FB_OMAP2=y +CONFIG_FB_OMAP2_DEBUG_SUPPORT=y +CONFIG_FB_OMAP2_NUM_FBS=2 + +# +# OMAP2/3 Display Device Drivers +# +CONFIG_PANEL_GENERIC_DPI=y +# CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set +CONFIG_PANEL_SHARP_LS037V7DW01=y +CONFIG_PANEL_NEC_NL8048HL11_01B=y +# CONFIG_PANEL_TAAL is not set +CONFIG_PANEL_TPO_TD043MTEA1=m +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y + +# +# Display device support +# +CONFIG_DISPLAY_SUPPORT=y + +# +# Display hardware drivers +# + +# +# Console display driver support +# +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y +CONFIG_SOUND=y +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=y +CONFIG_SND_RAWMIDI=y +CONFIG_SND_JACK=y +CONFIG_SND_SEQUENCER=m +# CONFIG_SND_SEQ_DUMMY 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_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_RAWMIDI_SEQ=m +# CONFIG_SND_OPL3_LIB_SEQ is not set +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +# CONFIG_SND_EMU10K1_SEQ is not set +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +CONFIG_SND_ALOOP=m +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +# CONFIG_SND_ARM is not set +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=y +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_SOC=y +CONFIG_SND_SOC_CACHE_LZO=y +CONFIG_SND_OMAP_SOC=y +CONFIG_SND_OMAP_SOC_MCBSP=y +CONFIG_SND_OMAP_SOC_OVERO=y +CONFIG_SND_OMAP_SOC_OMAP3EVM=y +CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y +CONFIG_SND_OMAP_SOC_ZOOM2=y +CONFIG_SND_SOC_I2C_AND_SPI=y +# CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_TWL4030=y +# CONFIG_SOUND_PRIME is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set + +# +# Special HID drivers +# +# CONFIG_HID_3M_PCT is not set +CONFIG_HID_A4TECH=y +CONFIG_HID_ACRUX=m +# CONFIG_HID_ACRUX_FF is not set +CONFIG_HID_APPLE=y +CONFIG_HID_BELKIN=y +# CONFIG_HID_CANDO is not set +CONFIG_HID_CHERRY=y +CONFIG_HID_CHICONY=y +# CONFIG_HID_PRODIKEYS is not set +CONFIG_HID_CYPRESS=y +# CONFIG_HID_DRAGONRISE is not set +CONFIG_HID_EMS_FF=m +# CONFIG_HID_ELECOM is not set +CONFIG_HID_EZKEY=y +CONFIG_HID_KEYTOUCH=m +# CONFIG_HID_KYE is not set +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=y +# CONFIG_HID_TWINHAN is not set +# CONFIG_HID_KENSINGTON is not set +CONFIG_HID_LCPOWER=m +CONFIG_HID_LOGITECH=y +# CONFIG_LOGITECH_FF is not set +# CONFIG_LOGIRUMBLEPAD2_FF is not set +# CONFIG_LOGIG940_FF is not set +# CONFIG_LOGIWII_FF is not set +CONFIG_HID_MAGICMOUSE=m +CONFIG_HID_MICROSOFT=y +# CONFIG_HID_MOSART is not set +CONFIG_HID_MONTEREY=y +CONFIG_HID_MULTITOUCH=m +CONFIG_HID_NTRIG=y +# CONFIG_HID_ORTEK is not set +CONFIG_HID_PANTHERLORD=y +# CONFIG_PANTHERLORD_FF is not set +CONFIG_HID_PETALYNX=y +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_QUANTA=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_ROCCAT_COMMON=m +CONFIG_HID_ROCCAT_ARVO=m +CONFIG_HID_ROCCAT_KONE=m +CONFIG_HID_ROCCAT_KONEPLUS=m +CONFIG_HID_ROCCAT_KOVAPLUS=m +# CONFIG_HID_ROCCAT_PYRA is not set +CONFIG_HID_SAMSUNG=y +CONFIG_HID_SONY=y +CONFIG_HID_STANTUM=m +CONFIG_HID_SUNPLUS=y +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +CONFIG_HID_TOPSEED=y +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_WACOM is not set +# CONFIG_HID_ZEROPLUS is not set +# CONFIG_HID_ZYDACRON is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +CONFIG_USB_SUSPEND=y +CONFIG_USB_OTG=y +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_MON=y +# CONFIG_USB_WUSB is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +CONFIG_USB_EHCI_HCD=y +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_EHCI_HCD_OMAP=y +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_ISP1362_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +# CONFIG_USB_U132_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_HWA_HCD is not set +CONFIG_USB_MUSB_HDRC=y +# CONFIG_USB_MUSB_TUSB6010 is not set +CONFIG_USB_MUSB_OMAP2PLUS=y +# CONFIG_USB_MUSB_AM35X is not set +# CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MUSB_PERIPHERAL is not set +CONFIG_USB_MUSB_OTG=y +CONFIG_USB_GADGET_MUSB_HDRC=y +CONFIG_USB_MUSB_HDRC_HCD=y +# CONFIG_MUSB_PIO_ONLY is not set +CONFIG_USB_INVENTRA_DMA=y +# CONFIG_USB_TI_CPPI_DMA is not set +# CONFIG_USB_MUSB_DEBUG is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set +CONFIG_USB_STORAGE_ENE_UB6250=m +CONFIG_USB_UAS=m +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +CONFIG_USB_SERIAL=m +CONFIG_USB_EZUSB=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +# CONFIG_USB_SERIAL_CP210X is not set +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +# CONFIG_USB_SERIAL_QUALCOMM is not set +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SAMBA=m +CONFIG_USB_SERIAL_SIEMENS_MPI=m +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +# CONFIG_USB_SERIAL_SYMBOL is not set +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +# CONFIG_USB_SERIAL_OPTION is not set +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_DEBUG=m + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +# CONFIG_USB_APPLEDISPLAY is not set +CONFIG_USB_SISUSBVGA=m +CONFIG_USB_SISUSBVGA_CON=y +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +# CONFIG_USB_IOWARRIOR is not set +CONFIG_USB_TEST=m +# CONFIG_USB_ISIGHTFW is not set +CONFIG_USB_YUREX=m +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_DEBUG_FS=y +CONFIG_USB_GADGET_VBUS_DRAW=480 +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_FUSB300 is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_R8A66597 is not set +# CONFIG_USB_GADGET_PXA_U2O is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +# CONFIG_USB_ZERO is not set +# CONFIG_USB_AUDIO is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_ETH_EEM is not set +CONFIG_USB_G_NCM=m +# CONFIG_USB_GADGETFS is not set +CONFIG_USB_FUNCTIONFS=m +# CONFIG_USB_FUNCTIONFS_ETH is not set +CONFIG_USB_FUNCTIONFS_RNDIS=y +# CONFIG_USB_FUNCTIONFS_GENERIC is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_MASS_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +# CONFIG_USB_CDC_COMPOSITE is not set +# CONFIG_USB_G_MULTI is not set +CONFIG_USB_G_HID=m +CONFIG_USB_G_DBGP=m +# CONFIG_USB_G_DBGP_PRINTK is not set +CONFIG_USB_G_DBGP_SERIAL=y +CONFIG_USB_G_WEBCAM=m + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +CONFIG_USB_GPIO_VBUS=y +# CONFIG_ISP1301_OMAP is not set +# CONFIG_USB_ULPI is not set +CONFIG_TWL4030_USB=y +CONFIG_TWL6030_USB=m +CONFIG_NOP_USB_XCEIV=y +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_UNSAFE_RESUME=y +# CONFIG_MMC_CLKGATE is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=y +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +# CONFIG_MMC_OMAP is not set +CONFIG_MMC_OMAP_HS=y +CONFIG_MMC_SPI=m +# CONFIG_MMC_DW is not set +CONFIG_MMC_USHC=m +# CONFIG_MEMSTICK is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +# CONFIG_LEDS_LM3530 is not set +# CONFIG_LEDS_PCA9532 is not set +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_GPIO_PLATFORM=y +# CONFIG_LEDS_LP3944 is not set +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m +# CONFIG_LEDS_PCA955X is not set +# CONFIG_LEDS_DAC124S085 is not set +CONFIG_LEDS_PWM=m +CONFIG_LEDS_REGULATOR=m +# CONFIG_LEDS_BD2802 is not set +# CONFIG_LEDS_LT3593 is not set +CONFIG_LEDS_TRIGGERS=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_NFC_DEVICES=y +CONFIG_PN544_NFC=m +# CONFIG_ACCESSIBILITY is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_DS1307=y +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_DS3232 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_ISL12022 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_TWL4030=m +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set +# CONFIG_RTC_DRV_PCF2123 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_MSM6242 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_RP5C01 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +# CONFIG_DMADEVICES is not set +CONFIG_TIMB_DMA=m +CONFIG_DMA_ENGINE=y +# CONFIG_AUXDISPLAY is not set +CONFIG_UIO=m +CONFIG_UIO_PDRV=m +CONFIG_UIO_PDRV_GENIRQ=m +CONFIG_STAGING=y +# CONFIG_STAGING_EXCLUDE_BUILD is not set +# CONFIG_VIDEO_TM6000 is not set +# CONFIG_USB_IP_COMMON is not set +CONFIG_W35UND=m +CONFIG_PRISM2_USB=m +CONFIG_ECHO=m +CONFIG_BRCM80211=m +CONFIG_BRCMFMAC=y +# CONFIG_BRCMDBG is not set +CONFIG_RT2870=m +# CONFIG_COMEDI is not set +# CONFIG_ASUS_OLED is not set +CONFIG_R8712U=m +CONFIG_R8712_AP=y +# CONFIG_TRANZPORT is not set +# CONFIG_POHMELFS is not set +# CONFIG_LINE6_USB is not set +# CONFIG_USB_SERIAL_QUATECH2 is not set +# CONFIG_USB_SERIAL_QUATECH_USB2 is not set +# CONFIG_VT6656 is not set +# CONFIG_IIO is not set +CONFIG_XVMALLOC=y +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +# CONFIG_FB_SM7XX is not set +# CONFIG_LIRC_STAGING is not set +# CONFIG_EASYCAP is not set +# CONFIG_TIDSPBRIDGE is not set +# CONFIG_MACH_OMAP3_WESTBRIDGE_AST_PNAND_HAL is not set +CONFIG_MACH_NO_WESTBRIDGE=y +# CONFIG_ATH6K_LEGACY is not set +CONFIG_USB_ENESTORAGE=m +CONFIG_BCM_WIMAX=m +CONFIG_FT1000=m +CONFIG_FT1000_USB=m + +# +# Speakup console speech +# +# CONFIG_SPEAKUP is not set +CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m +CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m + +# +# Altera FPGA firmware download module +# +# CONFIG_ALTERA_STAPL is not set +CONFIG_CLKDEV_LOOKUP=y + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_XATTR=y +# CONFIG_EXT4_FS_POSIX_ACL is not set +# CONFIG_EXT4_FS_SECURITY is not set +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +# CONFIG_REISERFS_FS_POSIX_ACL is not set +# CONFIG_REISERFS_FS_SECURITY is not set +CONFIG_JFS_FS=m +# CONFIG_JFS_POSIX_ACL is not set +# CONFIG_JFS_SECURITY is not set +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set +CONFIG_XFS_FS=m +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +# CONFIG_GFS2_FS_LOCKING_DLM is not set +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +CONFIG_OCFS2_DEBUG_MASKLOG=y +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +# CONFIG_BTRFS_FS_POSIX_ACL is not set +# CONFIG_NILFS2_FS is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +CONFIG_QUOTA=y +# CONFIG_QUOTA_NETLINK_INTERFACE is not set +CONFIG_PRINT_QUOTA_WARNING=y +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=y +# CONFIG_QFMT_V1 is not set +CONFIG_QFMT_V2=y +CONFIG_QUOTACTL=y +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m +# CONFIG_CUSE is not set +CONFIG_GENERIC_ACL=y + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_CONFIGFS_FS=m +CONFIG_MISC_FILESYSTEMS=y +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +CONFIG_AFFS_FS=m +# CONFIG_ECRYPT_FS is not set +CONFIG_UNION_FS=m +CONFIG_UNION_FS_XATTR=y +# CONFIG_UNION_FS_DEBUG is not set +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_FS_XATTR=y +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +# CONFIG_JFFS2_CMODE_PRIORITY is not set +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_JFFS2_CMODE_FAVOURLZO=y +CONFIG_UBIFS_FS=y +CONFIG_UBIFS_FS_XATTR=y +CONFIG_UBIFS_FS_ADVANCED_COMPR=y +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set +CONFIG_LOGFS=m +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=y +# CONFIG_SQUASHFS_XATTR is not set +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +CONFIG_VXFS_FS=m +CONFIG_MINIX_FS=m +CONFIG_OMFS_FS=m +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +CONFIG_ROMFS_FS=m +CONFIG_ROMFS_BACKED_BY_BLOCK=y +# CONFIG_ROMFS_BACKED_BY_MTD is not set +# CONFIG_ROMFS_BACKED_BY_BOTH is not set +CONFIG_ROMFS_ON_BLOCK=y +CONFIG_PSTORE=y +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set +CONFIG_ROOT_NFS=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +# CONFIG_NFS_USE_NEW_IDMAPPER is not set +CONFIG_NFSD=m +CONFIG_NFSD_DEPRECATED=y +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_CEPH_FS=m +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +CONFIG_CIFS_STATS2=y +# CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_UPCALL is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_DFS_UPCALL is not set +CONFIG_CIFS_EXPERIMENTAL=y +CONFIG_NCP_FS=m +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +# CONFIG_NCPFS_NFS_NS is not set +# CONFIG_NCPFS_OS2_NS is not set +# CONFIG_NCPFS_SMALLDOS is not set +# CONFIG_NCPFS_NLS is not set +# CONFIG_NCPFS_EXTRAS is not set +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_9P_FS=m +# CONFIG_9P_FS_POSIX_ACL is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_UNIXWARE_DISKLABEL is not set +CONFIG_LDM_PARTITION=y +CONFIG_LDM_DEBUG=y +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=y +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set + +# +# Kernel hacking +# +CONFIG_PRINTK_TIME=y +CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +CONFIG_MAGIC_SYSRQ=y +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_LOCKUP_DETECTOR is not set +# CONFIG_HARDLOCKUP_DETECTOR is not set +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y +CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_KMEMLEAK is not set +CONFIG_DEBUG_PREEMPT=y +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_LKDTM is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_SYSCTL_SYSCALL_CHECK is not set +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_RING_BUFFER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +# CONFIG_FUNCTION_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_PREEMPT_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_ENABLE_DEFAULT_TRACERS is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +# CONFIG_STACK_TRACER is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_RING_BUFFER_BENCHMARK is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_ATOMIC64_SELFTEST is not set +# CONFIG_ASYNC_RAID6_TEST is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +# CONFIG_TEST_KSTRTOX is not set +# CONFIG_STRICT_DEVMEM is not set +CONFIG_ARM_UNWIND=y +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_LL is not set +# CONFIG_OC_ETM is not set + +# +# Security options +# +CONFIG_KEYS=y +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set +# CONFIG_SECURITY_DMESG_RESTRICT is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=y +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=y +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=y +# CONFIG_CRYPTO_ZLIB is not set +CONFIG_CRYPTO_LZO=y + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_OMAP_SHAM=m +CONFIG_CRYPTO_DEV_OMAP_AES=m +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +CONFIG_CRC_CCITT=y +CONFIG_CRC16=y +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=y +CONFIG_CRC32=y +CONFIG_CRC7=y +CONFIG_LIBCRC32C=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_XZ_DEC_BCJ=y +CONFIG_XZ_DEC_TEST=m +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y +CONFIG_AVERAGE=y diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0001-OMAP-DSS2-DSI-fix-use_sys_clk-highfreq.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0001-OMAP-DSS2-DSI-fix-use_sys_clk-highfreq.patch new file mode 100644 index 0000000000..248d3312f9 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0001-OMAP-DSS2-DSI-fix-use_sys_clk-highfreq.patch @@ -0,0 +1,33 @@ +From 49958f1925489048aa5a6834f61d61c8551f8ec3 Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen +Date: Thu, 7 Apr 2011 15:28:47 +0300 +Subject: [PATCH 01/28] OMAP: DSS2: DSI: fix use_sys_clk & highfreq + +use_sys_clk and highfreq fields in dsi.current_cinfo were never set. +Luckily they weren't used anywhere so it didn't cause any problems. + +This patch fixes those fields and they are now set at the same time as +the rest of the fields. + +Signed-off-by: Tomi Valkeinen +--- + drivers/video/omap2/dss/dsi.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c +index 0a7f1a4..8604153 100644 +--- a/drivers/video/omap2/dss/dsi.c ++++ b/drivers/video/omap2/dss/dsi.c +@@ -1276,6 +1276,9 @@ int dsi_pll_set_clock_div(struct dsi_clock_info *cinfo) + + DSSDBGF(); + ++ dsi.current_cinfo.use_sys_clk = cinfo->use_sys_clk; ++ dsi.current_cinfo.highfreq = cinfo->highfreq; ++ + dsi.current_cinfo.fint = cinfo->fint; + dsi.current_cinfo.clkin4ddr = cinfo->clkin4ddr; + dsi.current_cinfo.dsi_pll_hsdiv_dispc_clk = +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0002-OMAP-DSS2-DSI-fix-dsi_dump_clocks.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0002-OMAP-DSS2-DSI-fix-dsi_dump_clocks.patch new file mode 100644 index 0000000000..01fdd7276a --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0002-OMAP-DSS2-DSI-fix-dsi_dump_clocks.patch @@ -0,0 +1,49 @@ +From ccf7f535d7e809e563812f1c4897bdb9a1ff9233 Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen +Date: Mon, 4 Apr 2011 10:02:53 +0300 +Subject: [PATCH 02/28] OMAP: DSS2: DSI: fix dsi_dump_clocks() + +On OMAP4, reading DSI_PLL_CONFIGURATION2 register requires the L3 clock +(CIO_CLK_ICG) to PLL. Currently dsi_dump_clocks() tries to read that +register without enabling the L3 clock, leading to crash if DSI is not +in use. + +The status of the bit being read from DSI_PLL_CONFIGURATION2 is +available from dsi_clock_info->use_sys_clk, so we can avoid the whole +problem by just using that. + +Signed-off-by: Tomi Valkeinen +--- + drivers/video/omap2/dss/dsi.c | 6 +----- + 1 files changed, 1 insertions(+), 5 deletions(-) + +diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c +index 8604153..1464ac4 100644 +--- a/drivers/video/omap2/dss/dsi.c ++++ b/drivers/video/omap2/dss/dsi.c +@@ -1491,7 +1491,6 @@ void dsi_pll_uninit(void) + + void dsi_dump_clocks(struct seq_file *s) + { +- int clksel; + struct dsi_clock_info *cinfo = &dsi.current_cinfo; + enum dss_clk_source dispc_clk_src, dsi_clk_src; + +@@ -1500,13 +1499,10 @@ void dsi_dump_clocks(struct seq_file *s) + + enable_clocks(1); + +- clksel = REG_GET(DSI_PLL_CONFIGURATION2, 11, 11); +- + seq_printf(s, "- DSI PLL -\n"); + + seq_printf(s, "dsi pll source = %s\n", +- clksel == 0 ? +- "dss_sys_clk" : "pclkfree"); ++ cinfo->use_sys_clk ? "dss_sys_clk" : "pclkfree"); + + seq_printf(s, "Fint\t\t%-16luregn %u\n", cinfo->fint, cinfo->regn); + +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0003-OMAP2PLUS-DSS2-Fix-Return-correct-lcd-clock-source-f.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0003-OMAP2PLUS-DSS2-Fix-Return-correct-lcd-clock-source-f.patch new file mode 100644 index 0000000000..fb49a3efe6 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0003-OMAP2PLUS-DSS2-Fix-Return-correct-lcd-clock-source-f.patch @@ -0,0 +1,43 @@ +From 2ffa7a6c3cafb4f2a48ae274b2952ad48ae78eeb Mon Sep 17 00:00:00 2001 +From: Archit Taneja +Date: Thu, 31 Mar 2011 13:23:35 +0530 +Subject: [PATCH 03/28] OMAP2PLUS: DSS2: Fix: Return correct lcd clock source for OMAP2/3 + +dss.lcd_clk_source is set to the default value DSS_CLK_SRC_FCK at dss_init. +For OMAP2 and OMAP3, the dss.lcd_clk_source should always be the same as +dss.dispc_clk_source. The function dss_get_lcd_clk_source() always returns the +default value DSS_CLK_SRC_FCK for OMAP2/3. This leads to wrong clock dumps when +dispc_clk_source is not DSS_CLK_SRC_FCK. + +Correct this function to always return dss.dispc_clk_source for OMAP2/3. + +Signed-off-by: Archit Taneja +Signed-off-by: Tomi Valkeinen +--- + drivers/video/omap2/dss/dss.c | 10 ++++++++-- + 1 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c +index 3f1fee6..c3b48a0 100644 +--- a/drivers/video/omap2/dss/dss.c ++++ b/drivers/video/omap2/dss/dss.c +@@ -385,8 +385,14 @@ enum dss_clk_source dss_get_dsi_clk_source(void) + + enum dss_clk_source dss_get_lcd_clk_source(enum omap_channel channel) + { +- int ix = channel == OMAP_DSS_CHANNEL_LCD ? 0 : 1; +- return dss.lcd_clk_source[ix]; ++ if (dss_has_feature(FEAT_LCD_CLK_SRC)) { ++ int ix = channel == OMAP_DSS_CHANNEL_LCD ? 0 : 1; ++ return dss.lcd_clk_source[ix]; ++ } else { ++ /* LCD_CLK source is the same as DISPC_FCLK source for ++ * OMAP2 and OMAP3 */ ++ return dss.dispc_clk_source; ++ } + } + + /* calculate clock rates using dividers in cinfo */ +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0004-OMAP-DSS-DSI-Fix-DSI-PLL-power-bug.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0004-OMAP-DSS-DSI-Fix-DSI-PLL-power-bug.patch new file mode 100644 index 0000000000..81f82e7caa --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0004-OMAP-DSS-DSI-Fix-DSI-PLL-power-bug.patch @@ -0,0 +1,64 @@ +From ee251e5c35b1325d696df35d297f34a9ccd6f5af Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen +Date: Fri, 15 Apr 2011 10:42:59 +0300 +Subject: [PATCH 04/28] OMAP: DSS: DSI: Fix DSI PLL power bug + +OMAP3630 has a HW bug causing DSI PLL power command POWER_ON_DIV (0x3) +to not work properly. The bug prevents us from enabling DSI PLL power +only to HS divider block. + +This patch adds a dss feature for the bug and converts POWER_ON_DIV +requests to POWER_ON_ALL (0x2). + +Signed-off-by: Tomi Valkeinen +--- + drivers/video/omap2/dss/dsi.c | 5 +++++ + drivers/video/omap2/dss/dss_features.c | 2 +- + drivers/video/omap2/dss/dss_features.h | 2 ++ + 3 files changed, 8 insertions(+), 1 deletions(-) + +diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c +index 1464ac4..cbd9ca4 100644 +--- a/drivers/video/omap2/dss/dsi.c ++++ b/drivers/video/omap2/dss/dsi.c +@@ -1059,6 +1059,11 @@ static int dsi_pll_power(enum dsi_pll_power_state state) + { + int t = 0; + ++ /* DSI-PLL power command 0x3 is not working */ ++ if (dss_has_feature(FEAT_DSI_PLL_PWR_BUG) && ++ state == DSI_PLL_POWER_ON_DIV) ++ state = DSI_PLL_POWER_ON_ALL; ++ + REG_FLD_MOD(DSI_CLK_CTRL, state, 31, 30); /* PLL_PWR_CMD */ + + /* PLL_PWR_STATUS */ +diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c +index aa16222..8c50e18 100644 +--- a/drivers/video/omap2/dss/dss_features.c ++++ b/drivers/video/omap2/dss/dss_features.c +@@ -271,7 +271,7 @@ static struct omap_dss_features omap3630_dss_features = { + FEAT_LCDENABLESIGNAL | FEAT_PCKFREEENABLE | + FEAT_PRE_MULT_ALPHA | FEAT_FUNCGATED | + FEAT_ROWREPEATENABLE | FEAT_LINEBUFFERSPLIT | +- FEAT_RESIZECONF, ++ FEAT_RESIZECONF | FEAT_DSI_PLL_PWR_BUG, + + .num_mgrs = 2, + .num_ovls = 3, +diff --git a/drivers/video/omap2/dss/dss_features.h b/drivers/video/omap2/dss/dss_features.h +index 12e9c4e..37922ce 100644 +--- a/drivers/video/omap2/dss/dss_features.h ++++ b/drivers/video/omap2/dss/dss_features.h +@@ -40,6 +40,8 @@ enum dss_feat_id { + /* Independent core clk divider */ + FEAT_CORE_CLK_DIV = 1 << 11, + FEAT_LCD_CLK_SRC = 1 << 12, ++ /* DSI-PLL power command 0x3 is not working */ ++ FEAT_DSI_PLL_PWR_BUG = 1 << 13, + }; + + /* DSS register field id */ +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0005-OMAP-DSS2-fix-panel-Kconfig-dependencies.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0005-OMAP-DSS2-fix-panel-Kconfig-dependencies.patch new file mode 100644 index 0000000000..b1845e928f --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0005-OMAP-DSS2-fix-panel-Kconfig-dependencies.patch @@ -0,0 +1,61 @@ +From c479d815f14b4b5ed7871660027d043a432968a8 Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen +Date: Fri, 8 Apr 2011 09:30:27 +0300 +Subject: [PATCH 05/28] OMAP: DSS2: fix panel Kconfig dependencies + +All DPI panels were missing dependency to OMAP2_DSS_DPI. Add the +dependency. + +Signed-off-by: Tomi Valkeinen +--- + drivers/video/omap2/displays/Kconfig | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig +index d18ad6b..609a280 100644 +--- a/drivers/video/omap2/displays/Kconfig ++++ b/drivers/video/omap2/displays/Kconfig +@@ -3,6 +3,7 @@ menu "OMAP2/3 Display Device Drivers" + + config PANEL_GENERIC_DPI + tristate "Generic DPI Panel" ++ depends on OMAP2_DSS_DPI + help + Generic DPI panel driver. + Supports DVI output for Beagle and OMAP3 SDP. +@@ -11,20 +12,20 @@ config PANEL_GENERIC_DPI + + config PANEL_LGPHILIPS_LB035Q02 + tristate "LG.Philips LB035Q02 LCD Panel" +- depends on OMAP2_DSS && SPI ++ depends on OMAP2_DSS_DPI && SPI + help + LCD Panel used on the Gumstix Overo Palo35 + + config PANEL_SHARP_LS037V7DW01 + tristate "Sharp LS037V7DW01 LCD Panel" +- depends on OMAP2_DSS ++ depends on OMAP2_DSS_DPI + select BACKLIGHT_CLASS_DEVICE + help + LCD Panel used in TI's SDP3430 and EVM boards + + config PANEL_NEC_NL8048HL11_01B + tristate "NEC NL8048HL11-01B Panel" +- depends on OMAP2_DSS ++ depends on OMAP2_DSS_DPI + help + This NEC NL8048HL11-01B panel is TFT LCD + used in the Zoom2/3/3630 sdp boards. +@@ -37,7 +38,7 @@ config PANEL_TAAL + + config PANEL_TPO_TD043MTEA1 + tristate "TPO TD043MTEA1 LCD Panel" +- depends on OMAP2_DSS && SPI ++ depends on OMAP2_DSS_DPI && SPI + help + LCD Panel used in OMAP3 Pandora + +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0006-OMAP-DSS2-add-bootarg-for-selecting-svideo-or-compos.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0006-OMAP-DSS2-add-bootarg-for-selecting-svideo-or-compos.patch new file mode 100644 index 0000000000..4b89760749 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0006-OMAP-DSS2-add-bootarg-for-selecting-svideo-or-compos.patch @@ -0,0 +1,75 @@ +From 661c19e763f0bda0a07bc64159c6b0c5f2f52b60 Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Tue, 19 Jan 2010 21:19:15 -0800 +Subject: [PATCH 06/28] OMAP: DSS2: add bootarg for selecting svideo or composite for tv output + +also add pal-16 and ntsc-16 omapfb.mode settings for 16bpp +--- + drivers/video/omap2/dss/venc.c | 22 ++++++++++++++++++++++ + drivers/video/omap2/omapfb/omapfb-main.c | 10 +++++++++- + 2 files changed, 31 insertions(+), 1 deletions(-) + +diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c +index 8e35a5b..827723f 100644 +--- a/drivers/video/omap2/dss/venc.c ++++ b/drivers/video/omap2/dss/venc.c +@@ -85,6 +85,11 @@ + #define VENC_OUTPUT_TEST 0xC8 + #define VENC_DAC_B__DAC_C 0xC8 + ++static char *tv_connection; ++ ++module_param_named(tvcable, tv_connection, charp, 0); ++MODULE_PARM_DESC(tvcable, "TV connection type (svideo, composite)"); ++ + struct venc_config { + u32 f_control; + u32 vidout_ctrl; +@@ -458,6 +463,23 @@ static int venc_panel_probe(struct omap_dss_device *dssdev) + { + dssdev->panel.timings = omap_dss_pal_timings; + ++ /* Allow the TV output to be overriden */ ++ if (tv_connection) { ++ if (strcmp(tv_connection, "svideo") == 0) { ++ printk(KERN_INFO ++ "omapdss: tv output is svideo.\n"); ++ dssdev->phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO; ++ } else if (strcmp(tv_connection, "composite") == 0) { ++ printk(KERN_INFO ++ "omapdss: tv output is composite.\n"); ++ dssdev->phy.venc.type = OMAP_DSS_VENC_TYPE_COMPOSITE; ++ } else { ++ printk(KERN_INFO ++ "omapdss: unsupported output type'%s'.\n", ++ tv_connection); ++ } ++ } ++ + return 0; + } + +diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c +index 505ec66..eaeded5 100644 +--- a/drivers/video/omap2/omapfb/omapfb-main.c ++++ b/drivers/video/omap2/omapfb/omapfb-main.c +@@ -2036,7 +2036,15 @@ static int omapfb_mode_to_timings(const char *mode_str, + int r; + + #ifdef CONFIG_OMAP2_DSS_VENC +- if (strcmp(mode_str, "pal") == 0) { ++ if (strcmp(mode_str, "pal-16") == 0) { ++ *timings = omap_dss_pal_timings; ++ *bpp = 16; ++ return 0; ++ } else if (strcmp(mode_str, "ntsc-16") == 0) { ++ *timings = omap_dss_ntsc_timings; ++ *bpp = 16; ++ return 0; ++ } else if (strcmp(mode_str, "pal") == 0) { + *timings = omap_dss_pal_timings; + *bpp = 24; + return 0; +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0007-video-add-timings-for-hd720.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0007-video-add-timings-for-hd720.patch new file mode 100644 index 0000000000..f624d58a12 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0007-video-add-timings-for-hd720.patch @@ -0,0 +1,27 @@ +From 14ea4d9f0f90726b653b42697043e73ef699b4ba Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Sat, 19 Dec 2009 06:52:43 -0800 +Subject: [PATCH 07/28] video: add timings for hd720 + +--- + drivers/video/modedb.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c +index 48c3ea8..b320a30 100644 +--- a/drivers/video/modedb.c ++++ b/drivers/video/modedb.c +@@ -103,6 +103,10 @@ static const struct fb_videomode modedb[] = { + { NULL, 70, 1024, 768, 13333, 144, 24, 29, 3, 136, 6, 0, + FB_VMODE_NONINTERLACED }, + ++ /* 1280x720 @ 60 Hz, 45 kHz hsync, CEA 681-E Format 4 */ ++ { "hd720", 60, 1280, 720, 13468, 220, 110, 20, 5, 40, 5, 0, ++ FB_VMODE_NONINTERLACED }, ++ + /* 1280x1024 @ 87 Hz interlaced, 51 kHz hsync */ + { NULL, 87, 1280, 1024, 12500, 56, 16, 128, 1, 216, 12, 0, + FB_VMODE_INTERLACED }, +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0008-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0008-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch new file mode 100644 index 0000000000..af14160d7e --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0008-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch @@ -0,0 +1,29 @@ +From b62ecb49cfe8978390b7c8848e13555c4c699b0f Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Tue, 15 Dec 2009 15:17:44 -0800 +Subject: [PATCH 08/28] drivers: net: smsc911x: return ENODEV if device is not found + +Signed-off-by: Steve Sakoman +--- + drivers/net/smsc911x.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c +index 4b42ecc..5c1202b 100644 +--- a/drivers/net/smsc911x.c ++++ b/drivers/net/smsc911x.c +@@ -2028,8 +2028,10 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) + } + + retval = smsc911x_init(dev); +- if (retval < 0) ++ if (retval < 0) { ++ retval = -ENODEV; + goto out_unmap_io_3; ++ } + + /* configure irq polarity and type before connecting isr */ + if (pdata->config.irq_polarity == SMSC911X_IRQ_POLARITY_ACTIVE_HIGH) +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0009-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0009-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch new file mode 100644 index 0000000000..042ab44ad0 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0009-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch @@ -0,0 +1,47 @@ +From b1515f616ee48452a7cb2c5d0f31b1f8f4463f94 Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Tue, 15 Dec 2009 15:24:10 -0800 +Subject: [PATCH 09/28] drivers: input: touchscreen: ads7846: return ENODEV if device is not found + +Signed-off-by: Steve Sakoman +--- + drivers/input/touchscreen/ads7846.c | 13 ++++++++++--- + 1 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c +index 1de1c19..097db10 100644 +--- a/drivers/input/touchscreen/ads7846.c ++++ b/drivers/input/touchscreen/ads7846.c +@@ -1338,11 +1338,18 @@ static int __devinit ads7846_probe(struct spi_device *spi) + * the touchscreen, in case it's not connected. + */ + if (ts->model == 7845) +- ads7845_read12_ser(&spi->dev, PWRDOWN); ++ err = ads7845_read12_ser(&spi->dev, PWRDOWN); + else +- (void) ads7846_read12_ser(&spi->dev, ++ err = ads7846_read12_ser(&spi->dev, + READ_12BIT_SER(vaux) | ADS_PD10_ALL_ON); + ++ /* if sample is all 0's or all 1's then there is no device on spi */ ++ if ( (err == 0x000) || (err == 0xfff)) { ++ dev_info(&spi->dev, "no device detected, test read result was 0x%08X\n", err); ++ err = -ENODEV; ++ goto err_free_irq; ++ } ++ + err = sysfs_create_group(&spi->dev.kobj, &ads784x_attr_group); + if (err) + goto err_remove_hwmon; +@@ -1366,7 +1373,7 @@ static int __devinit ads7846_probe(struct spi_device *spi) + err_put_regulator: + regulator_put(ts->reg); + err_free_gpio: +- if (!ts->get_pendown_state) ++ if (!ts->get_pendown_state && ts->gpio_pendown != -1) + gpio_free(ts->gpio_pendown); + err_cleanup_filter: + if (ts->filter_cleanup) +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0010-Revert-omap2_mcspi-Flush-posted-writes.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0010-Revert-omap2_mcspi-Flush-posted-writes.patch new file mode 100644 index 0000000000..f5265a342d --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0010-Revert-omap2_mcspi-Flush-posted-writes.patch @@ -0,0 +1,25 @@ +From c2b7ff69cae57875b711eeb9cb6c97e7ba090c08 Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Thu, 3 Mar 2011 13:29:30 -0800 +Subject: [PATCH 10/28] Revert "omap2_mcspi: Flush posted writes" + +This reverts commit a330ce2001b290c59fe98c37e981683ef0a75fdf. +--- + drivers/spi/omap2_mcspi.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c +index 6f86ba0..6094be7 100644 +--- a/drivers/spi/omap2_mcspi.c ++++ b/drivers/spi/omap2_mcspi.c +@@ -195,7 +195,6 @@ static inline void mcspi_write_chconf0(const struct spi_device *spi, u32 val) + + cs->chconf0 = val; + mcspi_write_cs_reg(spi, OMAP2_MCSPI_CHCONF0, val); +- mcspi_read_cs_reg(spi, OMAP2_MCSPI_CHCONF0); + } + + static void omap2_mcspi_set_dma_req(const struct spi_device *spi, +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0011-Revert-omap_hsmmc-improve-interrupt-synchronisation.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0011-Revert-omap_hsmmc-improve-interrupt-synchronisation.patch new file mode 100644 index 0000000000..7592bab28f --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0011-Revert-omap_hsmmc-improve-interrupt-synchronisation.patch @@ -0,0 +1,482 @@ +From ed9bca69fdaa7edac3573e5ef3f011c7f7dc4898 Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Fri, 19 Nov 2010 15:11:19 -0800 +Subject: [PATCH 11/28] Revert "omap_hsmmc: improve interrupt synchronisation" + +This reverts commit b417577d3b9bbb06a4ddc9aa955af9bd503f7242. + +Conflicts: + + drivers/mmc/host/omap_hsmmc.c +--- + drivers/mmc/host/omap_hsmmc.c | 267 ++++++++++++++++++++--------------------- + 1 files changed, 128 insertions(+), 139 deletions(-) + +diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c +index 259ece0..15a023b 100644 +--- a/drivers/mmc/host/omap_hsmmc.c ++++ b/drivers/mmc/host/omap_hsmmc.c +@@ -159,10 +159,12 @@ struct omap_hsmmc_host { + */ + struct regulator *vcc; + struct regulator *vcc_aux; ++ struct semaphore sem; + struct work_struct mmc_carddetect_work; + void __iomem *base; + resource_size_t mapbase; + spinlock_t irq_lock; /* Prevent races with irq handler */ ++ unsigned long flags; + unsigned int id; + unsigned int dma_len; + unsigned int dma_sg_idx; +@@ -183,7 +185,6 @@ struct omap_hsmmc_host { + int protect_card; + int reqs_blocked; + int use_reg; +- int req_in_progress; + + struct omap_mmc_platform_data *pdata; + }; +@@ -556,32 +557,6 @@ static void omap_hsmmc_stop_clock(struct omap_hsmmc_host *host) + dev_dbg(mmc_dev(host->mmc), "MMC Clock is not stoped\n"); + } + +-static void omap_hsmmc_enable_irq(struct omap_hsmmc_host *host, +- struct mmc_command *cmd) +-{ +- unsigned int irq_mask; +- +- if (host->use_dma) +- irq_mask = INT_EN_MASK & ~(BRR_ENABLE | BWR_ENABLE); +- else +- irq_mask = INT_EN_MASK; +- +- /* Disable timeout for erases */ +- if (cmd->opcode == MMC_ERASE) +- irq_mask &= ~DTO_ENABLE; +- +- OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR); +- OMAP_HSMMC_WRITE(host->base, ISE, irq_mask); +- OMAP_HSMMC_WRITE(host->base, IE, irq_mask); +-} +- +-static void omap_hsmmc_disable_irq(struct omap_hsmmc_host *host) +-{ +- OMAP_HSMMC_WRITE(host->base, ISE, 0); +- OMAP_HSMMC_WRITE(host->base, IE, 0); +- OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR); +-} +- + #ifdef CONFIG_PM + + /* +@@ -650,7 +625,9 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host) + && time_before(jiffies, timeout)) + ; + +- omap_hsmmc_disable_irq(host); ++ OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR); ++ OMAP_HSMMC_WRITE(host->base, ISE, INT_EN_MASK); ++ OMAP_HSMMC_WRITE(host->base, IE, INT_EN_MASK); + + /* Do not initialize card-specific things if the power is off */ + if (host->power_mode == MMC_POWER_OFF) +@@ -753,8 +730,6 @@ static void send_init_stream(struct omap_hsmmc_host *host) + return; + + disable_irq(host->irq); +- +- OMAP_HSMMC_WRITE(host->base, IE, INT_EN_MASK); + OMAP_HSMMC_WRITE(host->base, CON, + OMAP_HSMMC_READ(host->base, CON) | INIT_STREAM); + OMAP_HSMMC_WRITE(host->base, CMD, INIT_STREAM_CMD); +@@ -820,7 +795,17 @@ omap_hsmmc_start_command(struct omap_hsmmc_host *host, struct mmc_command *cmd, + mmc_hostname(host->mmc), cmd->opcode, cmd->arg); + host->cmd = cmd; + +- omap_hsmmc_enable_irq(host, cmd); ++ /* ++ * Clear status bits and enable interrupts ++ */ ++ OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR); ++ OMAP_HSMMC_WRITE(host->base, ISE, INT_EN_MASK); ++ ++ if (host->use_dma) ++ OMAP_HSMMC_WRITE(host->base, IE, ++ INT_EN_MASK & ~(BRR_ENABLE | BWR_ENABLE)); ++ else ++ OMAP_HSMMC_WRITE(host->base, IE, INT_EN_MASK); + + host->response_busy = 0; + if (cmd->flags & MMC_RSP_PRESENT) { +@@ -854,7 +839,13 @@ omap_hsmmc_start_command(struct omap_hsmmc_host *host, struct mmc_command *cmd, + if (host->use_dma) + cmdreg |= DMA_EN; + +- host->req_in_progress = 1; ++ /* ++ * In an interrupt context (i.e. STOP command), the spinlock is unlocked ++ * by the interrupt handler, otherwise (i.e. for a new request) it is ++ * unlocked here. ++ */ ++ if (!in_interrupt()) ++ spin_unlock_irqrestore(&host->irq_lock, host->flags); + + OMAP_HSMMC_WRITE(host->base, ARG, cmd->arg); + OMAP_HSMMC_WRITE(host->base, CMD, cmdreg); +@@ -869,23 +860,6 @@ omap_hsmmc_get_dma_dir(struct omap_hsmmc_host *host, struct mmc_data *data) + return DMA_FROM_DEVICE; + } + +-static void omap_hsmmc_request_done(struct omap_hsmmc_host *host, struct mmc_request *mrq) +-{ +- int dma_ch; +- +- spin_lock(&host->irq_lock); +- host->req_in_progress = 0; +- dma_ch = host->dma_ch; +- spin_unlock(&host->irq_lock); +- +- omap_hsmmc_disable_irq(host); +- /* Do not complete the request if DMA is still in progress */ +- if (mrq->data && host->use_dma && dma_ch != -1) +- return; +- host->mrq = NULL; +- mmc_request_done(host->mmc, mrq); +-} +- + /* + * Notify the transfer complete to MMC core + */ +@@ -902,19 +876,25 @@ omap_hsmmc_xfer_done(struct omap_hsmmc_host *host, struct mmc_data *data) + return; + } + +- omap_hsmmc_request_done(host, mrq); ++ host->mrq = NULL; ++ mmc_request_done(host->mmc, mrq); + return; + } + + host->data = NULL; + ++ if (host->use_dma && host->dma_ch != -1) ++ dma_unmap_sg(mmc_dev(host->mmc), data->sg, host->dma_len, ++ omap_hsmmc_get_dma_dir(host, data)); ++ + if (!data->error) + data->bytes_xfered += data->blocks * (data->blksz); + else + data->bytes_xfered = 0; + + if (!data->stop) { +- omap_hsmmc_request_done(host, data->mrq); ++ host->mrq = NULL; ++ mmc_request_done(host->mmc, data->mrq); + return; + } + omap_hsmmc_start_command(host, data->stop, NULL); +@@ -940,8 +920,10 @@ omap_hsmmc_cmd_done(struct omap_hsmmc_host *host, struct mmc_command *cmd) + cmd->resp[0] = OMAP_HSMMC_READ(host->base, RSP10); + } + } +- if ((host->data == NULL && !host->response_busy) || cmd->error) +- omap_hsmmc_request_done(host, cmd->mrq); ++ if ((host->data == NULL && !host->response_busy) || cmd->error) { ++ host->mrq = NULL; ++ mmc_request_done(host->mmc, cmd->mrq); ++ } + } + + /* +@@ -949,19 +931,14 @@ omap_hsmmc_cmd_done(struct omap_hsmmc_host *host, struct mmc_command *cmd) + */ + static void omap_hsmmc_dma_cleanup(struct omap_hsmmc_host *host, int errno) + { +- int dma_ch; +- + host->data->error = errno; + +- spin_lock(&host->irq_lock); +- dma_ch = host->dma_ch; +- host->dma_ch = -1; +- spin_unlock(&host->irq_lock); +- +- if (host->use_dma && dma_ch != -1) { ++ if (host->use_dma && host->dma_ch != -1) { + dma_unmap_sg(mmc_dev(host->mmc), host->data->sg, host->dma_len, + omap_hsmmc_get_dma_dir(host, host->data)); +- omap_free_dma(dma_ch); ++ omap_free_dma(host->dma_ch); ++ host->dma_ch = -1; ++ up(&host->sem); + } + host->data = NULL; + } +@@ -1034,21 +1011,28 @@ static inline void omap_hsmmc_reset_controller_fsm(struct omap_hsmmc_host *host, + __func__); + } + +-static void omap_hsmmc_do_irq(struct omap_hsmmc_host *host, int status) ++/* ++ * MMC controller IRQ handler ++ */ ++static irqreturn_t omap_hsmmc_irq(int irq, void *dev_id) + { ++ struct omap_hsmmc_host *host = dev_id; + struct mmc_data *data; +- int end_cmd = 0, end_trans = 0; +- +- if (!host->req_in_progress) { +- do { +- OMAP_HSMMC_WRITE(host->base, STAT, status); +- /* Flush posted write */ +- status = OMAP_HSMMC_READ(host->base, STAT); +- } while (status & INT_EN_MASK); +- return; ++ int end_cmd = 0, end_trans = 0, status; ++ ++ spin_lock(&host->irq_lock); ++ ++ if (host->mrq == NULL) { ++ OMAP_HSMMC_WRITE(host->base, STAT, ++ OMAP_HSMMC_READ(host->base, STAT)); ++ /* Flush posted write */ ++ OMAP_HSMMC_READ(host->base, STAT); ++ spin_unlock(&host->irq_lock); ++ return IRQ_HANDLED; + } + + data = host->data; ++ status = OMAP_HSMMC_READ(host->base, STAT); + dev_dbg(mmc_dev(host->mmc), "IRQ Status is %x\n", status); + + if (status & ERR) { +@@ -1101,27 +1085,15 @@ static void omap_hsmmc_do_irq(struct omap_hsmmc_host *host, int status) + } + + OMAP_HSMMC_WRITE(host->base, STAT, status); ++ /* Flush posted write */ ++ OMAP_HSMMC_READ(host->base, STAT); + + if (end_cmd || ((status & CC) && host->cmd)) + omap_hsmmc_cmd_done(host, host->cmd); + if ((end_trans || (status & TC)) && host->mrq) + omap_hsmmc_xfer_done(host, data); +-} +- +-/* +- * MMC controller IRQ handler +- */ +-static irqreturn_t omap_hsmmc_irq(int irq, void *dev_id) +-{ +- struct omap_hsmmc_host *host = dev_id; +- int status; + +- status = OMAP_HSMMC_READ(host->base, STAT); +- do { +- omap_hsmmc_do_irq(host, status); +- /* Flush posted write */ +- status = OMAP_HSMMC_READ(host->base, STAT); +- } while (status & INT_EN_MASK); ++ spin_unlock(&host->irq_lock); + + return IRQ_HANDLED; + } +@@ -1316,11 +1288,9 @@ static void omap_hsmmc_config_dma_params(struct omap_hsmmc_host *host, + /* + * DMA call back function + */ +-static void omap_hsmmc_dma_cb(int lch, u16 ch_status, void *cb_data) ++static void omap_hsmmc_dma_cb(int lch, u16 ch_status, void *data) + { +- struct omap_hsmmc_host *host = cb_data; +- struct mmc_data *data = host->mrq->data; +- int dma_ch, req_in_progress; ++ struct omap_hsmmc_host *host = data; + + if (!(ch_status & OMAP_DMA_BLOCK_IRQ)) { + dev_warn(mmc_dev(host->mmc), "unexpected dma status %x\n", +@@ -1328,38 +1298,24 @@ static void omap_hsmmc_dma_cb(int lch, u16 ch_status, void *cb_data) + return; + } + +- spin_lock(&host->irq_lock); +- if (host->dma_ch < 0) { +- spin_unlock(&host->irq_lock); ++ if (host->dma_ch < 0) + return; +- } + + host->dma_sg_idx++; + if (host->dma_sg_idx < host->dma_len) { + /* Fire up the next transfer. */ +- omap_hsmmc_config_dma_params(host, data, +- data->sg + host->dma_sg_idx); +- spin_unlock(&host->irq_lock); ++ omap_hsmmc_config_dma_params(host, host->data, ++ host->data->sg + host->dma_sg_idx); + return; + } + +- dma_unmap_sg(mmc_dev(host->mmc), data->sg, host->dma_len, +- omap_hsmmc_get_dma_dir(host, data)); +- +- req_in_progress = host->req_in_progress; +- dma_ch = host->dma_ch; ++ omap_free_dma(host->dma_ch); + host->dma_ch = -1; +- spin_unlock(&host->irq_lock); +- +- omap_free_dma(dma_ch); +- +- /* If DMA has finished after TC, complete the request */ +- if (!req_in_progress) { +- struct mmc_request *mrq = host->mrq; +- +- host->mrq = NULL; +- mmc_request_done(host->mmc, mrq); +- } ++ /* ++ * DMA Callback: run in interrupt context. ++ * mutex_unlock will throw a kernel warning if used. ++ */ ++ up(&host->sem); + } + + /* +@@ -1368,7 +1324,7 @@ static void omap_hsmmc_dma_cb(int lch, u16 ch_status, void *cb_data) + static int omap_hsmmc_start_dma_transfer(struct omap_hsmmc_host *host, + struct mmc_request *req) + { +- int dma_ch = 0, ret = 0, i; ++ int dma_ch = 0, ret = 0, err = 1, i; + struct mmc_data *data = req->data; + + /* Sanity check: all the SG entries must be aligned by block size. */ +@@ -1385,7 +1341,23 @@ static int omap_hsmmc_start_dma_transfer(struct omap_hsmmc_host *host, + */ + return -EINVAL; + +- BUG_ON(host->dma_ch != -1); ++ /* ++ * If for some reason the DMA transfer is still active, ++ * we wait for timeout period and free the dma ++ */ ++ if (host->dma_ch != -1) { ++ set_current_state(TASK_UNINTERRUPTIBLE); ++ schedule_timeout(100); ++ if (down_trylock(&host->sem)) { ++ omap_free_dma(host->dma_ch); ++ host->dma_ch = -1; ++ up(&host->sem); ++ return err; ++ } ++ } else { ++ if (down_trylock(&host->sem)) ++ return err; ++ } + + ret = omap_request_dma(omap_hsmmc_get_dma_sync_dev(host, data), + "MMC/SD", omap_hsmmc_dma_cb, host, &dma_ch); +@@ -1485,27 +1457,37 @@ static void omap_hsmmc_request(struct mmc_host *mmc, struct mmc_request *req) + struct omap_hsmmc_host *host = mmc_priv(mmc); + int err; + +- BUG_ON(host->req_in_progress); +- BUG_ON(host->dma_ch != -1); +- if (host->protect_card) { +- if (host->reqs_blocked < 3) { +- /* +- * Ensure the controller is left in a consistent +- * state by resetting the command and data state +- * machines. +- */ +- omap_hsmmc_reset_controller_fsm(host, SRD); +- omap_hsmmc_reset_controller_fsm(host, SRC); +- host->reqs_blocked += 1; +- } +- req->cmd->error = -EBADF; +- if (req->data) +- req->data->error = -EBADF; +- req->cmd->retries = 0; +- mmc_request_done(mmc, req); +- return; +- } else if (host->reqs_blocked) +- host->reqs_blocked = 0; ++ /* ++ * Prevent races with the interrupt handler because of unexpected ++ * interrupts, but not if we are already in interrupt context i.e. ++ * retries. ++ */ ++ if (!in_interrupt()) { ++ spin_lock_irqsave(&host->irq_lock, host->flags); ++ /* ++ * Protect the card from I/O if there is a possibility ++ * it can be removed. ++ */ ++ if (host->protect_card) { ++ if (host->reqs_blocked < 3) { ++ /* ++ * Ensure the controller is left in a consistent ++ * state by resetting the command and data state ++ * machines. ++ */ ++ omap_hsmmc_reset_controller_fsm(host, SRD); ++ omap_hsmmc_reset_controller_fsm(host, SRC); ++ host->reqs_blocked += 1; ++ } ++ req->cmd->error = -EBADF; ++ if (req->data) ++ req->data->error = -EBADF; ++ spin_unlock_irqrestore(&host->irq_lock, host->flags); ++ mmc_request_done(mmc, req); ++ return; ++ } else if (host->reqs_blocked) ++ host->reqs_blocked = 0; ++ } + WARN_ON(host->mrq != NULL); + host->mrq = req; + err = omap_hsmmc_prepare_data(host, req); +@@ -1514,6 +1496,8 @@ static void omap_hsmmc_request(struct mmc_host *mmc, struct mmc_request *req) + if (req->data) + req->data->error = err; + host->mrq = NULL; ++ if (!in_interrupt()) ++ spin_unlock_irqrestore(&host->irq_lock, host->flags); + mmc_request_done(mmc, req); + return; + } +@@ -2093,6 +2077,7 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) + mmc->f_min = 400000; + mmc->f_max = 52000000; + ++ sema_init(&host->sem, 1); + spin_lock_init(&host->irq_lock); + + host->iclk = clk_get(&pdev->dev, "ick"); +@@ -2235,7 +2220,8 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) + pdata->resume = omap_hsmmc_resume_cdirq; + } + +- omap_hsmmc_disable_irq(host); ++ OMAP_HSMMC_WRITE(host->base, ISE, INT_EN_MASK); ++ OMAP_HSMMC_WRITE(host->base, IE, INT_EN_MASK); + + mmc_host_lazy_disable(host->mmc); + +@@ -2356,7 +2342,10 @@ static int omap_hsmmc_suspend(struct device *dev) + ret = mmc_suspend_host(host->mmc); + mmc_host_enable(host->mmc); + if (ret == 0) { +- omap_hsmmc_disable_irq(host); ++ OMAP_HSMMC_WRITE(host->base, ISE, 0); ++ OMAP_HSMMC_WRITE(host->base, IE, 0); ++ ++ + OMAP_HSMMC_WRITE(host->base, HCTL, + OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP); + mmc_host_disable(host->mmc); +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0012-Don-t-turn-SDIO-cards-off-to-save-power.-Doing-so-wi.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0012-Don-t-turn-SDIO-cards-off-to-save-power.-Doing-so-wi.patch new file mode 100644 index 0000000000..f0a3aa45f0 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0012-Don-t-turn-SDIO-cards-off-to-save-power.-Doing-so-wi.patch @@ -0,0 +1,52 @@ +From 1d73698debdf57f9da6c3312239459c43278e064 Mon Sep 17 00:00:00 2001 +From: David Vrabel +Date: Fri, 2 Apr 2010 08:41:47 -0700 +Subject: [PATCH 12/28] Don't turn SDIO cards off to save power. Doing so will lose all + internal state in the card. + +Signed-off-by: David Vrabel +--- + drivers/mmc/host/omap_hsmmc.c | 12 ++++++++---- + 1 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c +index 15a023b..83f93ab 100644 +--- a/drivers/mmc/host/omap_hsmmc.c ++++ b/drivers/mmc/host/omap_hsmmc.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -1760,8 +1761,12 @@ static int omap_hsmmc_sleep_to_off(struct omap_hsmmc_host *host) + mmc_slot(host).card_detect || + (mmc_slot(host).get_cover_state && + mmc_slot(host).get_cover_state(host->dev, host->slot_id)))) { +- mmc_release_host(host->mmc); +- return 0; ++ goto out; ++ } ++ ++ /* Don't turn SDIO cards off. */ ++ if (host->mmc->card && mmc_card_sdio(host->mmc->card)) { ++ goto out; + } + + mmc_slot(host).set_power(host->dev, host->slot_id, 0, 0); +@@ -1772,9 +1777,8 @@ static int omap_hsmmc_sleep_to_off(struct omap_hsmmc_host *host) + host->dpm_state == CARDSLEEP ? "CARDSLEEP" : "REGSLEEP"); + + host->dpm_state = OFF; +- ++out: + mmc_release_host(host->mmc); +- + return 0; + } + +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0013-Enable-the-use-of-SDIO-card-interrupts.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0013-Enable-the-use-of-SDIO-card-interrupts.patch new file mode 100644 index 0000000000..f272276638 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0013-Enable-the-use-of-SDIO-card-interrupts.patch @@ -0,0 +1,288 @@ +From bb4c074079c12d808367c8666cedcbba1dc456cc Mon Sep 17 00:00:00 2001 +From: David Vrabel +Date: Fri, 2 Apr 2010 08:42:22 -0700 +Subject: [PATCH 13/28] Enable the use of SDIO card interrupts. + +FCLK must be enabled while SDIO interrupts are enabled or the MMC +module won't wake-up (even though ENAWAKEUP in SYSCONFIG and IWE in +HTCL have been set). Enabling the MMC module to wake-up would require +configuring the MMC module (and the mmci_dat[1] GPIO when the CORE +power domain is OFF) as wake-up sources in the PRCM. + +The writes to STAT and ISE when starting a command are unnecessary and +have been removed. + +Signed-off-by: David Vrabel +--- + drivers/mmc/host/omap_hsmmc.c | 118 +++++++++++++++++++++++++++++------------ + 1 files changed, 83 insertions(+), 35 deletions(-) + +diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c +index 83f93ab..d57686c 100644 +--- a/drivers/mmc/host/omap_hsmmc.c ++++ b/drivers/mmc/host/omap_hsmmc.c +@@ -67,6 +67,7 @@ + #define SDVS_MASK 0x00000E00 + #define SDVSCLR 0xFFFFF1FF + #define SDVSDET 0x00000400 ++#define ENAWAKEUP (1 << 2) + #define AUTOIDLE 0x1 + #define SDBP (1 << 8) + #define DTO 0xe +@@ -77,10 +78,13 @@ + #define CLKD_SHIFT 6 + #define DTO_MASK 0x000F0000 + #define DTO_SHIFT 16 ++#define CIRQ_ENABLE (1 << 8) + #define INT_EN_MASK 0x307F0033 + #define BWR_ENABLE (1 << 4) + #define BRR_ENABLE (1 << 5) + #define DTO_ENABLE (1 << 20) ++#define CTPL (1 << 11) ++#define CLKEXTFREE (1 << 16) + #define INIT_STREAM (1 << 1) + #define DP_SELECT (1 << 21) + #define DDIR (1 << 4) +@@ -88,10 +92,12 @@ + #define MSBS (1 << 5) + #define BCE (1 << 1) + #define FOUR_BIT (1 << 1) ++#define IWE (1 << 24) + #define DW8 (1 << 5) + #define CC 0x1 + #define TC 0x02 + #define OD 0x1 ++#define CIRQ (1 << 8) + #define ERR (1 << 15) + #define CMD_TIMEOUT (1 << 16) + #define DATA_TIMEOUT (1 << 20) +@@ -186,6 +192,7 @@ struct omap_hsmmc_host { + int protect_card; + int reqs_blocked; + int use_reg; ++ int sdio_int; + + struct omap_mmc_platform_data *pdata; + }; +@@ -598,7 +605,7 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host) + ; + + OMAP_HSMMC_WRITE(host->base, SYSCONFIG, +- OMAP_HSMMC_READ(host->base, SYSCONFIG) | AUTOIDLE); ++ OMAP_HSMMC_READ(host->base, SYSCONFIG) | AUTOIDLE | ENAWAKEUP); + + if (host->id == OMAP_MMC1_DEVID) { + if (host->power_mode != MMC_POWER_OFF && +@@ -613,7 +620,7 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host) + } + + OMAP_HSMMC_WRITE(host->base, HCTL, +- OMAP_HSMMC_READ(host->base, HCTL) | hctl); ++ OMAP_HSMMC_READ(host->base, HCTL) | hctl | IWE); + + OMAP_HSMMC_WRITE(host->base, CAPA, + OMAP_HSMMC_READ(host->base, CAPA) | capa); +@@ -627,7 +634,7 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host) + ; + + OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR); +- OMAP_HSMMC_WRITE(host->base, ISE, INT_EN_MASK); ++ OMAP_HSMMC_WRITE(host->base, ISE, INT_EN_MASK | CIRQ); + OMAP_HSMMC_WRITE(host->base, IE, INT_EN_MASK); + + /* Do not initialize card-specific things if the power is off */ +@@ -791,22 +798,19 @@ omap_hsmmc_start_command(struct omap_hsmmc_host *host, struct mmc_command *cmd, + struct mmc_data *data) + { + int cmdreg = 0, resptype = 0, cmdtype = 0; ++ int int_en_mask = INT_EN_MASK; + + dev_dbg(mmc_dev(host->mmc), "%s: CMD%d, argument 0x%08x\n", + mmc_hostname(host->mmc), cmd->opcode, cmd->arg); + host->cmd = cmd; + +- /* +- * Clear status bits and enable interrupts +- */ +- OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR); +- OMAP_HSMMC_WRITE(host->base, ISE, INT_EN_MASK); +- + if (host->use_dma) +- OMAP_HSMMC_WRITE(host->base, IE, +- INT_EN_MASK & ~(BRR_ENABLE | BWR_ENABLE)); +- else +- OMAP_HSMMC_WRITE(host->base, IE, INT_EN_MASK); ++ int_en_mask &= ~(BRR_ENABLE | BWR_ENABLE); ++ ++ if (host->sdio_int) ++ int_en_mask |= CIRQ; ++ ++ OMAP_HSMMC_WRITE(host->base, IE, int_en_mask); + + host->response_busy = 0; + if (cmd->flags & MMC_RSP_PRESENT) { +@@ -1019,23 +1023,26 @@ static irqreturn_t omap_hsmmc_irq(int irq, void *dev_id) + { + struct omap_hsmmc_host *host = dev_id; + struct mmc_data *data; +- int end_cmd = 0, end_trans = 0, status; ++ u32 status; ++ int end_cmd = 0, end_trans = 0; ++ bool card_irq = false; + + spin_lock(&host->irq_lock); + +- if (host->mrq == NULL) { +- OMAP_HSMMC_WRITE(host->base, STAT, +- OMAP_HSMMC_READ(host->base, STAT)); +- /* Flush posted write */ +- OMAP_HSMMC_READ(host->base, STAT); +- spin_unlock(&host->irq_lock); +- return IRQ_HANDLED; +- } +- +- data = host->data; + status = OMAP_HSMMC_READ(host->base, STAT); ++ OMAP_HSMMC_WRITE(host->base, STAT, status); ++ OMAP_HSMMC_READ(host->base, STAT); /* Flush posted write. */ ++ + dev_dbg(mmc_dev(host->mmc), "IRQ Status is %x\n", status); + ++ if (status & CIRQ) ++ card_irq = true; ++ ++ if (host->mrq == NULL) ++ goto out; ++ ++ data = host->data; ++ + if (status & ERR) { + #ifdef CONFIG_MMC_DEBUG + omap_hsmmc_report_irq(host, status); +@@ -1085,17 +1092,16 @@ static irqreturn_t omap_hsmmc_irq(int irq, void *dev_id) + } + } + +- OMAP_HSMMC_WRITE(host->base, STAT, status); +- /* Flush posted write */ +- OMAP_HSMMC_READ(host->base, STAT); +- + if (end_cmd || ((status & CC) && host->cmd)) + omap_hsmmc_cmd_done(host, host->cmd); + if ((end_trans || (status & TC)) && host->mrq) + omap_hsmmc_xfer_done(host, data); +- ++out: + spin_unlock(&host->irq_lock); + ++ if (card_irq) ++ mmc_signal_sdio_irq(host->mmc); ++ + return IRQ_HANDLED; + } + +@@ -1643,6 +1649,47 @@ static void omap_hsmmc_init_card(struct mmc_host *mmc, struct mmc_card *card) + mmc_slot(host).init_card(card); + } + ++static void omap_hsmmc_enable_sdio_irq(struct mmc_host *mmc, int enable) ++{ ++ struct omap_hsmmc_host *host = mmc_priv(mmc); ++ u32 ie, con; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&host->irq_lock, flags); ++ ++ /* ++ * When interrupts are enabled, CTPL must be set to enable ++ * DAT1 input buffer (or the card interrupt is always ++ * asserted) and FCLK must be enabled as wake-up does not ++ * work. Take care to disable FCLK after all the register ++ * accesses as they might not complete if FCLK is off. ++ * ++ * FIXME: if the MMC module (and the mmci_dat[1] GPIO when the ++ * CORE power domain is OFF) are configured as a wake-up ++ * sources in the PRCM, then FCLK could be switched off. This ++ * might add too much latency. ++ */ ++ con = OMAP_HSMMC_READ(host->base, CON); ++ ie = OMAP_HSMMC_READ(host->base, IE); ++ if (enable) { ++ clk_enable(host->fclk); ++ ie |= CIRQ_ENABLE; ++ con |= CTPL | CLKEXTFREE; ++ host->sdio_int = 1; ++ } else { ++ ie &= ~CIRQ_ENABLE; ++ con &= ~(CTPL | CLKEXTFREE); ++ host->sdio_int = 0; ++ } ++ OMAP_HSMMC_WRITE(host->base, CON, con); ++ OMAP_HSMMC_WRITE(host->base, IE, ie); ++ OMAP_HSMMC_READ(host->base, IE); /* flush posted write */ ++ if (!enable) ++ clk_disable(host->fclk); ++ ++ spin_unlock_irqrestore(&host->irq_lock, flags); ++} ++ + static void omap_hsmmc_conf_bus_power(struct omap_hsmmc_host *host) + { + u32 hctl, capa, value; +@@ -1657,14 +1704,14 @@ static void omap_hsmmc_conf_bus_power(struct omap_hsmmc_host *host) + } + + value = OMAP_HSMMC_READ(host->base, HCTL) & ~SDVS_MASK; +- OMAP_HSMMC_WRITE(host->base, HCTL, value | hctl); ++ OMAP_HSMMC_WRITE(host->base, HCTL, value | hctl | IWE); + + value = OMAP_HSMMC_READ(host->base, CAPA); + OMAP_HSMMC_WRITE(host->base, CAPA, value | capa); + + /* Set the controller to AUTO IDLE mode */ + value = OMAP_HSMMC_READ(host->base, SYSCONFIG); +- OMAP_HSMMC_WRITE(host->base, SYSCONFIG, value | AUTOIDLE); ++ OMAP_HSMMC_WRITE(host->base, SYSCONFIG, value | AUTOIDLE | ENAWAKEUP); + + /* Set SD bus power bit */ + set_sd_bus_power(host); +@@ -1918,7 +1965,7 @@ static const struct mmc_host_ops omap_hsmmc_ops = { + .get_cd = omap_hsmmc_get_cd, + .get_ro = omap_hsmmc_get_ro, + .init_card = omap_hsmmc_init_card, +- /* NYET -- enable_sdio_irq */ ++ .enable_sdio_irq = omap_hsmmc_enable_sdio_irq, + }; + + static const struct mmc_host_ops omap_hsmmc_ps_ops = { +@@ -1929,7 +1976,7 @@ static const struct mmc_host_ops omap_hsmmc_ps_ops = { + .get_cd = omap_hsmmc_get_cd, + .get_ro = omap_hsmmc_get_ro, + .init_card = omap_hsmmc_init_card, +- /* NYET -- enable_sdio_irq */ ++ .enable_sdio_irq = omap_hsmmc_enable_sdio_irq, + }; + + #ifdef CONFIG_DEBUG_FS +@@ -2145,7 +2192,8 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) + mmc->max_seg_size = mmc->max_req_size; + + mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED | +- MMC_CAP_WAIT_WHILE_BUSY | MMC_CAP_ERASE; ++ MMC_CAP_WAIT_WHILE_BUSY | MMC_CAP_ERASE | ++ MMC_CAP_SDIO_IRQ; + + mmc->caps |= mmc_slot(host).caps; + if (mmc->caps & MMC_CAP_8_BIT_DATA) +@@ -2224,7 +2272,7 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) + pdata->resume = omap_hsmmc_resume_cdirq; + } + +- OMAP_HSMMC_WRITE(host->base, ISE, INT_EN_MASK); ++ OMAP_HSMMC_WRITE(host->base, ISE, INT_EN_MASK | CIRQ); + OMAP_HSMMC_WRITE(host->base, IE, INT_EN_MASK); + + mmc_host_lazy_disable(host->mmc); +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0014-soc-codecs-Enable-audio-capture-by-default-for-twl40.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0014-soc-codecs-Enable-audio-capture-by-default-for-twl40.patch new file mode 100644 index 0000000000..12243d60c0 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0014-soc-codecs-Enable-audio-capture-by-default-for-twl40.patch @@ -0,0 +1,27 @@ +From cee637c9d2b877dd40c5fc8c42dc70a21adb454b Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Thu, 17 Dec 2009 12:45:20 -0800 +Subject: [PATCH 14/28] soc: codecs: Enable audio capture by default for twl4030 + +--- + sound/soc/codecs/twl4030.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c +index 575238d..bd51f72 100644 +--- a/sound/soc/codecs/twl4030.c ++++ b/sound/soc/codecs/twl4030.c +@@ -56,8 +56,8 @@ static const u8 twl4030_reg[TWL4030_CACHEREGNUM] = { + 0x00, /* REG_OPTION (0x2) */ + 0x00, /* REG_UNKNOWN (0x3) */ + 0x00, /* REG_MICBIAS_CTL (0x4) */ +- 0x00, /* REG_ANAMICL (0x5) */ +- 0x00, /* REG_ANAMICR (0x6) */ ++ 0x34, /* REG_ANAMICL (0x5) */ ++ 0x14, /* REG_ANAMICR (0x6) */ + 0x00, /* REG_AVADC_CTL (0x7) */ + 0x00, /* REG_ADCMICSEL (0x8) */ + 0x00, /* REG_DIGMIXING (0x9) */ +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0015-soc-codecs-twl4030-Turn-on-mic-bias-by-default.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0015-soc-codecs-twl4030-Turn-on-mic-bias-by-default.patch new file mode 100644 index 0000000000..b3fa02ca21 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0015-soc-codecs-twl4030-Turn-on-mic-bias-by-default.patch @@ -0,0 +1,25 @@ +From 19fbeb71b9576ecdefa7809980aa3f0eecda408c Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Wed, 29 Dec 2010 11:39:16 -0800 +Subject: [PATCH 15/28] soc: codecs: twl4030: Turn on mic bias by default + +--- + sound/soc/codecs/twl4030.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c +index bd51f72..8949773 100644 +--- a/sound/soc/codecs/twl4030.c ++++ b/sound/soc/codecs/twl4030.c +@@ -55,7 +55,7 @@ static const u8 twl4030_reg[TWL4030_CACHEREGNUM] = { + 0x00, /* REG_CODEC_MODE (0x1) */ + 0x00, /* REG_OPTION (0x2) */ + 0x00, /* REG_UNKNOWN (0x3) */ +- 0x00, /* REG_MICBIAS_CTL (0x4) */ ++ 0x03, /* REG_MICBIAS_CTL (0x4) */ + 0x34, /* REG_ANAMICL (0x5) */ + 0x14, /* REG_ANAMICR (0x6) */ + 0x00, /* REG_AVADC_CTL (0x7) */ +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0016-RTC-add-support-for-backup-battery-recharge.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0016-RTC-add-support-for-backup-battery-recharge.patch new file mode 100644 index 0000000000..55673b37ab --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0016-RTC-add-support-for-backup-battery-recharge.patch @@ -0,0 +1,55 @@ +From 1c679da3fc28bd358c79b6fae05de81c9b84a681 Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Thu, 4 Feb 2010 12:26:22 -0800 +Subject: [PATCH 16/28] RTC: add support for backup battery recharge + +--- + drivers/rtc/rtc-twl.c | 25 +++++++++++++++++++++++++ + 1 files changed, 25 insertions(+), 0 deletions(-) + +diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c +index f9a2799..713b8ea 100644 +--- a/drivers/rtc/rtc-twl.c ++++ b/drivers/rtc/rtc-twl.c +@@ -30,6 +30,23 @@ + + #include + ++/* ++ * PM_RECEIVER block register offsets (use TWL4030_MODULE_PM_RECEIVER) ++ */ ++#define REG_BB_CFG 0x12 ++ ++/* PM_RECEIVER BB_CFG bitfields */ ++#define BIT_PM_RECEIVER_BB_CFG_BBCHEN 0x10 ++#define BIT_PM_RECEIVER_BB_CFG_BBSEL 0x0C ++#define BIT_PM_RECEIVER_BB_CFG_BBSEL_2V5 0x00 ++#define BIT_PM_RECEIVER_BB_CFG_BBSEL_3V0 0x04 ++#define BIT_PM_RECEIVER_BB_CFG_BBSEL_3V1 0x08 ++#define BIT_PM_RECEIVER_BB_CFG_BBSEL_3v2 0x0c ++#define BIT_PM_RECEIVER_BB_CFG_BBISEL 0x03 ++#define BIT_PM_RECEIVER_BB_CFG_BBISEL_25UA 0x00 ++#define BIT_PM_RECEIVER_BB_CFG_BBISEL_150UA 0x01 ++#define BIT_PM_RECEIVER_BB_CFG_BBISEL_500UA 0x02 ++#define BIT_PM_RECEIVER_BB_CFG_BBISEL_1MA 0x03 + + /* + * RTC block register offsets (use TWL_MODULE_RTC) +@@ -495,6 +512,14 @@ static int __devinit twl_rtc_probe(struct platform_device *pdev) + if (ret < 0) + goto out2; + ++ /* enable backup battery charging */ ++ /* use a conservative 25uA @ 3.1V */ ++ ret = twl_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, ++ BIT_PM_RECEIVER_BB_CFG_BBCHEN | ++ BIT_PM_RECEIVER_BB_CFG_BBSEL_3V1 | ++ BIT_PM_RECEIVER_BB_CFG_BBISEL_25UA, ++ REG_BB_CFG); ++ + return ret; + + out2: +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0017-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0017-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch new file mode 100644 index 0000000000..6aacbf7af8 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0017-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch @@ -0,0 +1,39 @@ +From 83b4a493176cbd50c8d2503440fecfa6e499f30e Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Sun, 24 Jan 2010 09:33:56 -0800 +Subject: [PATCH 17/28] ARM: OMAP2: mmc-twl4030: move clock input selection prior to vcc test + +otherwise it is not executed on systems that use non-twl regulators +--- + arch/arm/mach-omap2/hsmmc.c | 14 ++++++-------- + 1 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c +index b2f30be..84d5ef6 100644 +--- a/arch/arm/mach-omap2/hsmmc.c ++++ b/arch/arm/mach-omap2/hsmmc.c +@@ -185,15 +185,13 @@ static void hsmmc23_before_set_reg(struct device *dev, int slot, + if (mmc->slots[0].remux) + mmc->slots[0].remux(dev, slot, power_on); + +- if (power_on) { +- /* Only MMC2 supports a CLKIN */ +- if (mmc->slots[0].internal_clock) { +- u32 reg; ++ /* Only MMC2 supports a CLKIN */ ++ if (mmc->slots[0].internal_clock) { ++ u32 reg; + +- reg = omap_ctrl_readl(control_devconf1_offset); +- reg |= OMAP2_MMCSDIO2ADPCLKISEL; +- omap_ctrl_writel(reg, control_devconf1_offset); +- } ++ reg = omap_ctrl_readl(control_devconf1_offset); ++ reg |= OMAP2_MMCSDIO2ADPCLKISEL; ++ omap_ctrl_writel(reg, control_devconf1_offset); + } + } + +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0018-Add-power-off-support-for-the-TWL4030-companion.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0018-Add-power-off-support-for-the-TWL4030-companion.patch new file mode 100644 index 0000000000..c5359c1b01 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0018-Add-power-off-support-for-the-TWL4030-companion.patch @@ -0,0 +1,103 @@ +From 890a8385d7f9bee69bf22616d16b225790b1d18c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bernhard=20W=C3=B6rndl-Aichriedler?= +Date: Sat, 15 May 2010 16:34:05 +0200 +Subject: [PATCH 18/28] Add power-off support for the TWL4030 companion + +This patch adds support for the power-off on shutdown feature of the TWL4030 +--- + drivers/mfd/Kconfig | 6 ++++++ + drivers/mfd/twl-core.c | 40 ++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 46 insertions(+), 0 deletions(-) + +diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig +index 3ed3ff0..fe2370a 100644 +--- a/drivers/mfd/Kconfig ++++ b/drivers/mfd/Kconfig +@@ -210,6 +210,12 @@ config TWL4030_CODEC + select MFD_CORE + default n + ++config TWL4030_POWEROFF ++ bool "TWL4030 Allow power-off on shutdown" ++ depends on TWL4030_CORE ++ help ++ Enables the CPU to power-off the system on shutdown ++ + config TWL6030_PWM + tristate "TWL6030 PWM (Pulse Width Modulator) Support" + depends on TWL4030_CORE +diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c +index 960b5be..8804550 100644 +--- a/drivers/mfd/twl-core.c ++++ b/drivers/mfd/twl-core.c +@@ -122,6 +122,12 @@ + #define twl_has_bci() false + #endif + ++#if defined (CONFIG_TWL4030_POWEROFF) ++#define twl_has_poweroff() true ++#else ++#define twl_has_poweroff() false ++#endif ++ + /* Triton Core internal information (BEGIN) */ + + /* Last - for index max*/ +@@ -224,6 +230,10 @@ + #define TWL5031 BIT(2) /* twl5031 has different registers */ + #define TWL6030_CLASS BIT(3) /* TWL6030 class */ + ++/* for pm_power_off */ ++#define PWR_P1_SW_EVENTS 0x10 ++#define PWR_DEVOFF (1 << 0) ++ + /*----------------------------------------------------------------------*/ + + /* is driver active, bound to a chip? */ +@@ -1006,6 +1016,30 @@ static int twl_remove(struct i2c_client *client) + return 0; + } + ++static void twl_poweroff(void) ++{ ++ int err; ++ u8 val; ++ ++ err = twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &val, ++ PWR_P1_SW_EVENTS); ++ if (err) { ++ pr_err("%s: i2c error %d while reading TWL4030" ++ "PM_MASTER P1_SW_EVENTS\n", ++ DRIVER_NAME, err); ++ return; ++ } ++ ++ val |= PWR_DEVOFF; ++ ++ err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, val, ++ PWR_P1_SW_EVENTS); ++ if (err) ++ pr_err("%s: i2c error %d while writing TWL4030" ++ "PM_MASTER P1_SW_EVENTS\n", ++ DRIVER_NAME, err); ++} ++ + /* NOTE: this driver only handles a single twl4030/tps659x0 chip */ + static int __devinit + twl_probe(struct i2c_client *client, const struct i2c_device_id *id) +@@ -1093,6 +1127,12 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id) + twl_i2c_write_u8(TWL4030_MODULE_INTBR, temp, REG_GPPUPDCTR1); + } + ++ if(twl_has_poweroff()) ++ { ++ /* initialize pm_power_off routine */ ++ pm_power_off = twl_poweroff; ++ } ++ + status = add_children(pdata, id->driver_data); + fail: + if (status < 0) +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0019-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0019-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch new file mode 100644 index 0000000000..045089e0ac --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0019-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch @@ -0,0 +1,33 @@ +From 5b1ae684aa507a50630555d48c834a6f1fd2d1cf Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Thu, 17 Dec 2009 14:27:15 -0800 +Subject: [PATCH 19/28] ARM: OMAP: Add twl4030 madc support to Overo + +Signed-off-by: Steve Sakoman +--- + arch/arm/mach-omap2/board-overo.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c +index 59ca333..86f76e9 100644 +--- a/arch/arm/mach-omap2/board-overo.c ++++ b/arch/arm/mach-omap2/board-overo.c +@@ -637,10 +637,15 @@ static struct twl4030_codec_data overo_codec_data = { + .audio = &overo_audio_data, + }; + ++static struct twl4030_madc_platform_data overo_madc_data = { ++ .irq_line = 1, ++}; ++ + static struct twl4030_platform_data overo_twldata = { + .irq_base = TWL4030_IRQ_BASE, + .irq_end = TWL4030_IRQ_END, + .gpio = &overo_gpio_data, ++ .madc = &overo_madc_data, + .usb = &overo_usb_data, + .codec = &overo_codec_data, + .vmmc1 = &overo_vmmc1, +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0020-Enabling-Hwmon-driver-for-twl4030-madc.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0020-Enabling-Hwmon-driver-for-twl4030-madc.patch new file mode 100644 index 0000000000..771c2846e2 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0020-Enabling-Hwmon-driver-for-twl4030-madc.patch @@ -0,0 +1,46 @@ +From 79dc823c9ce624a2164a01b35a89452b22a7d174 Mon Sep 17 00:00:00 2001 +From: Keerthy +Date: Wed, 4 May 2011 01:14:50 +0530 +Subject: [PATCH 20/28] Enabling Hwmon driver for twl4030-madc + +Signed-off-by: Keerthy +--- + drivers/mfd/twl-core.c | 15 +++++++++++++++ + 1 files changed, 15 insertions(+), 0 deletions(-) + +diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c +index 8804550..d9435e4 100644 +--- a/drivers/mfd/twl-core.c ++++ b/drivers/mfd/twl-core.c +@@ -83,6 +83,13 @@ + #define twl_has_madc() false + #endif + ++#if defined(CONFIG_SENSORS_TWL4030_MADC) ||\ ++ defined(CONFIG_SENSORS_TWL4030_MADC_MODULE) ++#define twl_has_madc_hwmon() true ++#else ++#define twl_has_madc_hwmon() false ++#endif ++ + #ifdef CONFIG_TWL4030_POWER + #define twl_has_power() true + #else +@@ -619,6 +626,14 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) + return PTR_ERR(child); + } + ++if (twl_has_madc_hwmon()) { ++ child = add_child(2, "twl4030_madc_hwmon", ++ NULL, 0, ++ true, pdata->irq_base + MADC_INTR_OFFSET, 0); ++ if (IS_ERR(child)) ++ return PTR_ERR(child); ++ } ++ + if (twl_has_rtc()) { + /* + * REVISIT platform_data here currently might expose the +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0021-mfd-twl-core-enable-madc-clock.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0021-mfd-twl-core-enable-madc-clock.patch new file mode 100644 index 0000000000..05cd10d1fa --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0021-mfd-twl-core-enable-madc-clock.patch @@ -0,0 +1,54 @@ +From 243d5534666eb795815f12d382cfcb77d5a43a8d Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Sat, 23 Jan 2010 06:26:54 -0800 +Subject: [PATCH 21/28] mfd: twl-core: enable madc clock + +Now that the madc driver has been merged it is also necessary to enable the clock to the madc block + +Signed-off-by: Steve Sakoman +--- + drivers/mfd/twl-core.c | 8 ++++++++ + include/linux/i2c/twl.h | 1 + + 2 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c +index d9435e4..9096d7d 100644 +--- a/drivers/mfd/twl-core.c ++++ b/drivers/mfd/twl-core.c +@@ -222,6 +222,11 @@ + + /* Few power values */ + #define R_CFG_BOOT 0x05 ++#define R_GPBR1 0x0C ++ ++/* MADC clock values for R_GPBR1 */ ++#define MADC_HFCLK_EN 0x80 ++#define DEFAULT_MADC_CLK_EN 0x10 + + /* some fields in R_CFG_BOOT */ + #define HFCLK_FREQ_19p2_MHZ (1 << 0) +@@ -992,6 +997,9 @@ static void clocks_init(struct device *dev, + + e |= unprotect_pm_master(); + /* effect->MADC+USB ck en */ ++ if (twl_has_madc()) ++ e |= twl_i2c_write_u8(TWL_MODULE_INTBR, ++ MADC_HFCLK_EN | DEFAULT_MADC_CLK_EN, R_GPBR1); + e |= twl_i2c_write_u8(TWL_MODULE_PM_MASTER, ctrl, R_CFG_BOOT); + e |= protect_pm_master(); + +diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h +index 0c0d1ae..cbbf3b3 100644 +--- a/include/linux/i2c/twl.h ++++ b/include/linux/i2c/twl.h +@@ -74,6 +74,7 @@ + + #define TWL_MODULE_USB TWL4030_MODULE_USB + #define TWL_MODULE_AUDIO_VOICE TWL4030_MODULE_AUDIO_VOICE ++#define TWL_MODULE_INTBR TWL4030_MODULE_INTBR + #define TWL_MODULE_PIH TWL4030_MODULE_PIH + #define TWL_MODULE_MADC TWL4030_MODULE_MADC + #define TWL_MODULE_MAIN_CHARGE TWL4030_MODULE_MAIN_CHARGE +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0022-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0022-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch new file mode 100644 index 0000000000..6d2a38a785 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0022-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch @@ -0,0 +1,49 @@ +From df17c7eeca25cd9923828a4732a995e2c37d070b Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Wed, 24 Feb 2010 10:37:22 -0800 +Subject: [PATCH 22/28] ARM: OMAP: automatically set musb mode in platform data based on CONFIG options + +--- + arch/arm/mach-omap2/board-omap3beagle.c | 6 ++++++ + arch/arm/mach-omap2/board-overo.c | 6 ++++++ + 2 files changed, 12 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 33007fd..2de4b02 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -604,7 +604,13 @@ static struct omap_board_mux board_mux[] __initdata = { + + static struct omap_musb_board_data musb_board_data = { + .interface_type = MUSB_INTERFACE_ULPI, ++#if defined(CONFIG_USB_MUSB_OTG) + .mode = MUSB_OTG, ++#elif defined(CONFIG_USB_GADGET_MUSB_HDRC) ++ .mode = MUSB_PERIPHERAL, ++#else ++ .mode = MUSB_HOST, ++#endif + .power = 100, + }; + +diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c +index 86f76e9..61c59fc 100644 +--- a/arch/arm/mach-omap2/board-overo.c ++++ b/arch/arm/mach-omap2/board-overo.c +@@ -729,7 +729,13 @@ static struct omap_board_mux board_mux[] __initdata = { + + static struct omap_musb_board_data musb_board_data = { + .interface_type = MUSB_INTERFACE_ULPI, ++#if defined(CONFIG_USB_MUSB_OTG) + .mode = MUSB_OTG, ++#elif defined(CONFIG_USB_GADGET_MUSB_HDRC) ++ .mode = MUSB_PERIPHERAL, ++#else ++ .mode = MUSB_HOST, ++#endif + .power = 100, + }; + +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0023-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0023-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch new file mode 100644 index 0000000000..212c5f0264 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0023-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch @@ -0,0 +1,28 @@ +From c60f16ec7e69f59b3bef9f9b7041a973d144dc87 Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Wed, 12 Jan 2011 05:54:55 -0800 +Subject: [PATCH 23/28] omap: mmc: Adjust dto to eliminate timeout errors + +A number of SD card types were experiencing timeout errors. This +could also lead to data corruption in some cases. + +This fix proposed by Sukumar Ghoral of TI. +--- + drivers/mmc/host/omap_hsmmc.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c +index d57686c..7fb03e8 100644 +--- a/drivers/mmc/host/omap_hsmmc.c ++++ b/drivers/mmc/host/omap_hsmmc.c +@@ -1400,6 +1400,7 @@ static void set_data_timeout(struct omap_hsmmc_host *host, + cycle_ns = 1000000000 / (clk_get_rate(host->fclk) / clkd); + timeout = timeout_ns / cycle_ns; + timeout += timeout_clks; ++ timeout *= 2; + if (timeout) { + while ((timeout & 0x80000000) == 0) { + dto += 1; +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0024-omap-Fix-mtd-subpage-read-alignment.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0024-omap-Fix-mtd-subpage-read-alignment.patch new file mode 100644 index 0000000000..13b7631a16 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0024-omap-Fix-mtd-subpage-read-alignment.patch @@ -0,0 +1,95 @@ +From 592fdd511dacc42bf97f249ca596ba28d0c25281 Mon Sep 17 00:00:00 2001 +From: Charles Manning +Date: Tue, 18 Jan 2011 11:25:25 +1300 +Subject: [PATCH 24/28] omap: Fix mtd subpage read alignment + +This allows the omap2 prefetch engine to work properly for subpage +reads. Without this ECC errors will stop UBIFS from working. + +Signed-off-by: Charles Manning +--- + drivers/mtd/nand/nand_base.c | 19 +++++++++++++++++++ + drivers/mtd/nand/omap2.c | 1 + + include/linux/mtd/nand.h | 3 +++ + 3 files changed, 23 insertions(+), 0 deletions(-) + +diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c +index c54a4cb..6ca7098 100644 +--- a/drivers/mtd/nand/nand_base.c ++++ b/drivers/mtd/nand/nand_base.c +@@ -1157,6 +1157,22 @@ static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip, + } + + /** ++ * nand_align_subpage32 - function to align subpage read to 32-bits ++ * @mtd: mtd info structure ++ * @buf: pointer to offset that needs to be aligned ++ * @len: pointer to length that needs to be aligned. ++ */ ++ ++void nand_align_subpage32(int *offs, int *len) ++{ ++ int diff = *offs & 3; ++ ++ *offs = *offs - diff; ++ *len = (*len + diff + 3) & ~3; ++} ++EXPORT_SYMBOL(nand_align_subpage32); ++ ++/** + * nand_read_subpage - [REPLACABLE] software ecc based sub-page read function + * @mtd: mtd info structure + * @chip: nand chip info structure +@@ -1221,6 +1237,9 @@ static int nand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, + if (eccpos[index + (num_steps * chip->ecc.bytes)] & (busw - 1)) + aligned_len++; + ++ if(chip->align_subpage) ++ chip->align_subpage(&aligned_pos, &aligned_len); ++ + chip->cmdfunc(mtd, NAND_CMD_RNDOUT, + mtd->writesize + aligned_pos, -1); + chip->read_buf(mtd, &chip->oob_poi[aligned_pos], aligned_len); +diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c +index da9a351..bb89c65 100644 +--- a/drivers/mtd/nand/omap2.c ++++ b/drivers/mtd/nand/omap2.c +@@ -1069,6 +1069,7 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) + info->nand.ecc.correct = omap_correct_data; + info->nand.ecc.mode = NAND_ECC_HW; + } ++ info->nand.align_subpage = nand_align_subpage32; + + /* DIP switches on some boards change between 8 and 16 bit + * bus widths for flash. Try the other width if the first try fails. +diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h +index d441927..311f211 100644 +--- a/include/linux/mtd/nand.h ++++ b/include/linux/mtd/nand.h +@@ -479,6 +479,7 @@ struct nand_buffers { + * additional error status checks (determine if errors are + * correctable). + * @write_page: [REPLACEABLE] High-level page write function ++ * @align_subpage: [OPTIONAL] Aligns subpage read buffer. + */ + + struct nand_chip { +@@ -507,6 +508,7 @@ struct nand_chip { + int (*write_page)(struct mtd_info *mtd, struct nand_chip *chip, + const uint8_t *buf, int page, int cached, int raw); + ++ void (*align_subpage)(int *offs, int *len); + int chip_delay; + unsigned int options; + +@@ -602,6 +604,7 @@ extern int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, + int allowbbt); + extern int nand_do_read(struct mtd_info *mtd, loff_t from, size_t len, + size_t *retlen, uint8_t *buf); ++extern void nand_align_subpage32(int *offs, int *len); + + /** + * struct platform_nand_chip - chip level device structure +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0025-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0025-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch new file mode 100644 index 0000000000..dadaa1c445 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0025-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch @@ -0,0 +1,35 @@ +From 2611e93b57147877fabb181bd86c78fd425a5467 Mon Sep 17 00:00:00 2001 +From: Charles Manning +Date: Thu, 16 Dec 2010 20:35:56 -0800 +Subject: [PATCH 25/28] mtd: nand: omap2: Force all buffer reads to u32 alignment + +--- + drivers/mtd/nand/omap2.c | 12 ++++++++++++ + 1 files changed, 12 insertions(+), 0 deletions(-) + +diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c +index bb89c65..832f111 100644 +--- a/drivers/mtd/nand/omap2.c ++++ b/drivers/mtd/nand/omap2.c +@@ -247,6 +247,18 @@ static void omap_read_buf_pref(struct mtd_info *mtd, u_char *buf, int len) + int ret = 0; + u32 *p = (u32 *)buf; + ++ /* u32 align the buffer and read */ ++ /* NB: This assumes the buf ptr can be aligned *down* which is a valid. ++ * Assumption when dealing with ecc buffers etc. ++ */ ++ u32 addr = (u32)p; ++ ++ int diff = addr & 3; ++ addr -= diff; ++ len += diff; ++ len = (len + 3) & ~3; ++ p = (u32 *)addr; ++ + /* take care of subpage reads */ + if (len % 4) { + if (info->nand.options & NAND_BUSWIDTH_16) +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0026-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0026-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch new file mode 100644 index 0000000000..c8dacdc985 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0026-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch @@ -0,0 +1,63 @@ +From 1f0278a4f5475cc9ad67e007763368dfdd7dee29 Mon Sep 17 00:00:00 2001 +From: kishore kadiyala +Date: Mon, 2 May 2011 11:10:38 +0000 +Subject: [PATCH 26/28] omap : nand : fix subpage ecc issue with prefetch + +For prefetch engine, read and write got broken in commit '2c01946c'. +We never hit a scenario of not getting 'gpmc_prefetch_enable' +call success. +When reading/writing a subpage with a non divisible by 4 ecc number +of bytes, the mis-aligned bytes gets handled first before enabling +the Prefetch engine, then it reads/writes rest of the bytes. + +Signed-off-by: Kishore Kadiyala +Signed-off-by: Vimal Singh +Reported-by: Bryan DE FARIA +--- + drivers/mtd/nand/omap2.c | 12 +++++------- + 1 files changed, 5 insertions(+), 7 deletions(-) + +diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c +index 832f111..471a39b 100644 +--- a/drivers/mtd/nand/omap2.c ++++ b/drivers/mtd/nand/omap2.c +@@ -275,11 +275,10 @@ static void omap_read_buf_pref(struct mtd_info *mtd, u_char *buf, int len) + if (ret) { + /* PFPW engine is busy, use cpu copy method */ + if (info->nand.options & NAND_BUSWIDTH_16) +- omap_read_buf16(mtd, buf, len); ++ omap_read_buf16(mtd, (u_char *)p, len); + else +- omap_read_buf8(mtd, buf, len); ++ omap_read_buf8(mtd, (u_char *)p, len); + } else { +- p = (u32 *) buf; + do { + r_count = gpmc_read_status(GPMC_PREFETCH_FIFO_CNT); + r_count = r_count >> 2; +@@ -305,7 +304,7 @@ static void omap_write_buf_pref(struct mtd_info *mtd, + struct omap_nand_info, mtd); + uint32_t w_count = 0; + int i = 0, ret = 0; +- u16 *p; ++ u16 *p = (u16 *)buf; + unsigned long tim, limit; + + /* take care of subpage writes */ +@@ -321,11 +320,10 @@ static void omap_write_buf_pref(struct mtd_info *mtd, + if (ret) { + /* PFPW engine is busy, use cpu copy method */ + if (info->nand.options & NAND_BUSWIDTH_16) +- omap_write_buf16(mtd, buf, len); ++ omap_write_buf16(mtd, (u_char *)p, len); + else +- omap_write_buf8(mtd, buf, len); ++ omap_write_buf8(mtd, (u_char *)p, len); + } else { +- p = (u16 *) buf; + while (len) { + w_count = gpmc_read_status(GPMC_PREFETCH_FIFO_CNT); + w_count = w_count >> 1; +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0027-OMAP-Overo-Add-support-for-spidev.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0027-OMAP-Overo-Add-support-for-spidev.patch new file mode 100644 index 0000000000..d126ca7385 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0027-OMAP-Overo-Add-support-for-spidev.patch @@ -0,0 +1,46 @@ +From 61e1cb7dbff3b611644d6ba811f8b83db148c1e1 Mon Sep 17 00:00:00 2001 +From: Scott Ellis +Date: Sun, 23 Jan 2011 20:39:35 -0800 +Subject: [PATCH 27/28] OMAP: Overo: Add support for spidev + +--- + arch/arm/mach-omap2/board-overo.c | 16 ++++++++++++++++ + 1 files changed, 16 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c +index 61c59fc..05dd3eb 100644 +--- a/arch/arm/mach-omap2/board-overo.c ++++ b/arch/arm/mach-omap2/board-overo.c +@@ -683,6 +683,14 @@ static struct spi_board_info overo_spi_board_info[] __initdata = { + .irq = OMAP_GPIO_IRQ(OVERO_GPIO_PENDOWN), + .platform_data = &ads7846_config, + }, ++#elif defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) ++ { ++ .modalias = "spidev", ++ .bus_num = 1, ++ .chip_select = 0, ++ .max_speed_hz = 48000000, ++ .mode = SPI_MODE_0, ++ }, + #endif + #if defined(CONFIG_PANEL_LGPHILIPS_LB035Q02) || \ + defined(CONFIG_PANEL_LGPHILIPS_LB035Q02_MODULE) +@@ -693,6 +701,14 @@ static struct spi_board_info overo_spi_board_info[] __initdata = { + .max_speed_hz = 500000, + .mode = SPI_MODE_3, + }, ++#elif defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) ++ { ++ .modalias = "spidev", ++ .bus_num = 1, ++ .chip_select = 1, ++ .max_speed_hz = 48000000, ++ .mode = SPI_MODE_0, ++ }, + #endif + }; + +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0028-unionfs-Add-support-for-unionfs-2.5.9.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0028-unionfs-Add-support-for-unionfs-2.5.9.patch new file mode 100644 index 0000000000..24cc728707 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0028-unionfs-Add-support-for-unionfs-2.5.9.patch @@ -0,0 +1,11494 @@ +From d84fb8f137d9392574422213ec6c3dc53bb00abf Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Mon, 2 May 2011 16:14:34 -0700 +Subject: [PATCH 28/28] unionfs: Add support for unionfs 2.5.9 + +--- + Documentation/filesystems/00-INDEX | 2 + + Documentation/filesystems/unionfs/00-INDEX | 10 + + Documentation/filesystems/unionfs/concepts.txt | 287 ++++++ + Documentation/filesystems/unionfs/issues.txt | 28 + + Documentation/filesystems/unionfs/rename.txt | 31 + + Documentation/filesystems/unionfs/usage.txt | 134 +++ + MAINTAINERS | 8 + + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/namei.c | 38 + + fs/splice.c | 22 +- + fs/stack.c | 14 +- + fs/unionfs/Kconfig | 24 + + fs/unionfs/Makefile | 17 + + fs/unionfs/commonfops.c | 898 +++++++++++++++++++ + fs/unionfs/copyup.c | 896 +++++++++++++++++++ + fs/unionfs/debug.c | 548 ++++++++++++ + fs/unionfs/dentry.c | 406 +++++++++ + fs/unionfs/dirfops.c | 302 +++++++ + fs/unionfs/dirhelper.c | 158 ++++ + fs/unionfs/fanout.h | 407 +++++++++ + fs/unionfs/file.c | 382 ++++++++ + fs/unionfs/inode.c | 1099 ++++++++++++++++++++++++ + fs/unionfs/lookup.c | 569 ++++++++++++ + fs/unionfs/main.c | 763 ++++++++++++++++ + fs/unionfs/mmap.c | 89 ++ + fs/unionfs/rdstate.c | 285 ++++++ + fs/unionfs/rename.c | 522 +++++++++++ + fs/unionfs/sioq.c | 101 +++ + fs/unionfs/sioq.h | 91 ++ + fs/unionfs/subr.c | 95 ++ + fs/unionfs/super.c | 1030 ++++++++++++++++++++++ + fs/unionfs/union.h | 679 +++++++++++++++ + fs/unionfs/unlink.c | 278 ++++++ + fs/unionfs/whiteout.c | 601 +++++++++++++ + fs/unionfs/xattr.c | 173 ++++ + include/linux/fs_stack.h | 14 +- + include/linux/magic.h | 2 + + include/linux/namei.h | 3 + + include/linux/splice.h | 5 + + include/linux/union_fs.h | 22 + + security/security.c | 1 + + 42 files changed, 11024 insertions(+), 12 deletions(-) + create mode 100644 Documentation/filesystems/unionfs/00-INDEX + create mode 100644 Documentation/filesystems/unionfs/concepts.txt + create mode 100644 Documentation/filesystems/unionfs/issues.txt + create mode 100644 Documentation/filesystems/unionfs/rename.txt + create mode 100644 Documentation/filesystems/unionfs/usage.txt + create mode 100644 fs/unionfs/Kconfig + create mode 100644 fs/unionfs/Makefile + create mode 100644 fs/unionfs/commonfops.c + create mode 100644 fs/unionfs/copyup.c + create mode 100644 fs/unionfs/debug.c + create mode 100644 fs/unionfs/dentry.c + create mode 100644 fs/unionfs/dirfops.c + create mode 100644 fs/unionfs/dirhelper.c + create mode 100644 fs/unionfs/fanout.h + create mode 100644 fs/unionfs/file.c + create mode 100644 fs/unionfs/inode.c + create mode 100644 fs/unionfs/lookup.c + create mode 100644 fs/unionfs/main.c + create mode 100644 fs/unionfs/mmap.c + create mode 100644 fs/unionfs/rdstate.c + create mode 100644 fs/unionfs/rename.c + create mode 100644 fs/unionfs/sioq.c + create mode 100644 fs/unionfs/sioq.h + create mode 100644 fs/unionfs/subr.c + create mode 100644 fs/unionfs/super.c + create mode 100644 fs/unionfs/union.h + create mode 100644 fs/unionfs/unlink.c + create mode 100644 fs/unionfs/whiteout.c + create mode 100644 fs/unionfs/xattr.c + create mode 100644 include/linux/union_fs.h + +diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX +index 8c624a1..4aa288b 100644 +--- a/Documentation/filesystems/00-INDEX ++++ b/Documentation/filesystems/00-INDEX +@@ -110,6 +110,8 @@ udf.txt + - info and mount options for the UDF filesystem. + ufs.txt + - info on the ufs filesystem. ++unionfs/ ++ - info on the unionfs filesystem + vfat.txt + - info on using the VFAT filesystem used in Windows NT and Windows 95 + vfs.txt +diff --git a/Documentation/filesystems/unionfs/00-INDEX b/Documentation/filesystems/unionfs/00-INDEX +new file mode 100644 +index 0000000..96fdf67 +--- /dev/null ++++ b/Documentation/filesystems/unionfs/00-INDEX +@@ -0,0 +1,10 @@ ++00-INDEX ++ - this file. ++concepts.txt ++ - A brief introduction of concepts. ++issues.txt ++ - A summary of known issues with unionfs. ++rename.txt ++ - Information regarding rename operations. ++usage.txt ++ - Usage information and examples. +diff --git a/Documentation/filesystems/unionfs/concepts.txt b/Documentation/filesystems/unionfs/concepts.txt +new file mode 100644 +index 0000000..b853788 +--- /dev/null ++++ b/Documentation/filesystems/unionfs/concepts.txt +@@ -0,0 +1,287 @@ ++Unionfs 2.x CONCEPTS: ++===================== ++ ++This file describes the concepts needed by a namespace unification file ++system. ++ ++ ++Branch Priority: ++================ ++ ++Each branch is assigned a unique priority - starting from 0 (highest ++priority). No two branches can have the same priority. ++ ++ ++Branch Mode: ++============ ++ ++Each branch is assigned a mode - read-write or read-only. This allows ++directories on media mounted read-write to be used in a read-only manner. ++ ++ ++Whiteouts: ++========== ++ ++A whiteout removes a file name from the namespace. Whiteouts are needed when ++one attempts to remove a file on a read-only branch. ++ ++Suppose we have a two-branch union, where branch 0 is read-write and branch ++1 is read-only. And a file 'foo' on branch 1: ++ ++./b0/ ++./b1/ ++./b1/foo ++ ++The unified view would simply be: ++ ++./union/ ++./union/foo ++ ++Since 'foo' is stored on a read-only branch, it cannot be removed. A ++whiteout is used to remove the name 'foo' from the unified namespace. Again, ++since branch 1 is read-only, the whiteout cannot be created there. So, we ++try on a higher priority (lower numerically) branch and create the whiteout ++there. ++ ++./b0/ ++./b0/.wh.foo ++./b1/ ++./b1/foo ++ ++Later, when Unionfs traverses branches (due to lookup or readdir), it ++eliminate 'foo' from the namespace (as well as the whiteout itself.) ++ ++ ++Opaque Directories: ++=================== ++ ++Assume we have a unionfs mount comprising of two branches. Branch 0 is ++empty; branch 1 has the directory /a and file /a/f. Let's say we mount a ++union of branch 0 as read-write and branch 1 as read-only. Now, let's say ++we try to perform the following operation in the union: ++ ++ rm -fr a ++ ++Because branch 1 is not writable, we cannot physically remove the file /a/f ++or the directory /a. So instead, we will create a whiteout in branch 0 ++named /.wh.a, masking out the name "a" from branch 1. Next, let's say we ++try to create a directory named "a" as follows: ++ ++ mkdir a ++ ++Because we have a whiteout for "a" already, Unionfs behaves as if "a" ++doesn't exist, and thus will delete the whiteout and replace it with an ++actual directory named "a". ++ ++The problem now is that if you try to "ls" in the union, Unionfs will ++perform is normal directory name unification, for *all* directories named ++"a" in all branches. This will cause the file /a/f from branch 1 to ++re-appear in the union's namespace, which violates Unix semantics. ++ ++To avoid this problem, we have a different form of whiteouts for ++directories, called "opaque directories" (same as BSD Union Mount does). ++Whenever we replace a whiteout with a directory, that directory is marked as ++opaque. In Unionfs 2.x, it means that we create a file named ++/a/.wh.__dir_opaque in branch 0, after having created directory /a there. ++When unionfs notices that a directory is opaque, it stops all namespace ++operations (including merging readdir contents) at that opaque directory. ++This prevents re-exposing names from masked out directories. ++ ++ ++Duplicate Elimination: ++====================== ++ ++It is possible for files on different branches to have the same name. ++Unionfs then has to select which instance of the file to show to the user. ++Given the fact that each branch has a priority associated with it, the ++simplest solution is to take the instance from the highest priority ++(numerically lowest value) and "hide" the others. ++ ++ ++Unlinking: ++========= ++ ++Unlink operation on non-directory instances is optimized to remove the ++maximum possible objects in case multiple underlying branches have the same ++file name. The unlink operation will first try to delete file instances ++from highest priority branch and then move further to delete from remaining ++branches in order of their decreasing priority. Consider a case (F..D..F), ++where F is a file and D is a directory of the same name; here, some ++intermediate branch could have an empty directory instance with the same ++name, so this operation also tries to delete this directory instance and ++proceed further to delete from next possible lower priority branch. The ++unionfs unlink operation will smoothly delete the files with same name from ++all possible underlying branches. In case if some error occurs, it creates ++whiteout in highest priority branch that will hide file instance in rest of ++the branches. An error could occur either if an unlink operations in any of ++the underlying branch failed or if a branch has no write permission. ++ ++This unlinking policy is known as "delete all" and it has the benefit of ++overall reducing the number of inodes used by duplicate files, and further ++reducing the total number of inodes consumed by whiteouts. The cost is of ++extra processing, but testing shows this extra processing is well worth the ++savings. ++ ++ ++Copyup: ++======= ++ ++When a change is made to the contents of a file's data or meta-data, they ++have to be stored somewhere. The best way is to create a copy of the ++original file on a branch that is writable, and then redirect the write ++though to this copy. The copy must be made on a higher priority branch so ++that lookup and readdir return this newer "version" of the file rather than ++the original (see duplicate elimination). ++ ++An entire unionfs mount can be read-only or read-write. If it's read-only, ++then none of the branches will be written to, even if some of the branches ++are physically writeable. If the unionfs mount is read-write, then the ++leftmost (highest priority) branch must be writeable (for copyup to take ++place); the remaining branches can be any mix of read-write and read-only. ++ ++In a writeable mount, unionfs will create new files/dir in the leftmost ++branch. If one tries to modify a file in a read-only branch/media, unionfs ++will copyup the file to the leftmost branch and modify it there. If you try ++to modify a file from a writeable branch which is not the leftmost branch, ++then unionfs will modify it in that branch; this is useful if you, say, ++unify differnet packages (e.g., apache, sendmail, ftpd, etc.) and you want ++changes to specific package files to remain logically in the directory where ++they came from. ++ ++Cache Coherency: ++================ ++ ++Unionfs users often want to be able to modify files and directories directly ++on the lower branches, and have those changes be visible at the Unionfs ++level. This means that data (e.g., pages) and meta-data (dentries, inodes, ++open files, etc.) have to be synchronized between the upper and lower ++layers. In other words, the newest changes from a layer below have to be ++propagated to the Unionfs layer above. If the two layers are not in sync, a ++cache incoherency ensues, which could lead to application failures and even ++oopses. The Linux kernel, however, has a rather limited set of mechanisms ++to ensure this inter-layer cache coherency---so Unionfs has to do most of ++the hard work on its own. ++ ++Maintaining Invariants: ++ ++The way Unionfs ensures cache coherency is as follows. At each entry point ++to a Unionfs file system method, we call a utility function to validate the ++primary objects of this method. Generally, we call unionfs_file_revalidate ++on open files, and __unionfs_d_revalidate_chain on dentries (which also ++validates inodes). These utility functions check to see whether the upper ++Unionfs object is in sync with any of the lower objects that it represents. ++The checks we perform include whether the Unionfs superblock has a newer ++generation number, or if any of the lower objects mtime's or ctime's are ++newer. (Note: generation numbers change when branch-management commands are ++issued, so in a way, maintaining cache coherency is also very important for ++branch-management.) If indeed we determine that any Unionfs object is no ++longer in sync with its lower counterparts, then we rebuild that object ++similarly to how we do so for branch-management. ++ ++While rebuilding Unionfs's objects, we also purge any page mappings and ++truncate inode pages (see fs/unionfs/dentry.c:purge_inode_data). This is to ++ensure that Unionfs will re-get the newer data from the lower branches. We ++perform this purging only if the Unionfs operation in question is a reading ++operation; if Unionfs is performing a data writing operation (e.g., ->write, ++->commit_write, etc.) then we do NOT flush the lower mappings/pages: this is ++because (1) a self-deadlock could occur and (2) the upper Unionfs pages are ++considered more authoritative anyway, as they are newer and will overwrite ++any lower pages. ++ ++Unionfs maintains the following important invariant regarding mtime's, ++ctime's, and atime's: the upper inode object's times are the max() of all of ++the lower ones. For non-directory objects, there's only one object below, ++so the mapping is simple; for directory objects, there could me multiple ++lower objects and we have to sync up with the newest one of all the lower ++ones. This invariant is important to maintain, especially for directories ++(besides, we need this to be POSIX compliant). A union could comprise ++multiple writable branches, each of which could change. If we don't reflect ++the newest possible mtime/ctime, some applications could fail. For example, ++NFSv2/v3 exports check for newer directory mtimes on the server to determine ++if the client-side attribute cache should be purged. ++ ++To maintain these important invariants, of course, Unionfs carefully ++synchronizes upper and lower times in various places. For example, if we ++copy-up a file to a top-level branch, the parent directory where the file ++was copied up to will now have a new mtime: so after a successful copy-up, ++we sync up with the new top-level branch's parent directory mtime. ++ ++Implementation: ++ ++This cache-coherency implementation is efficient because it defers any ++synchronizing between the upper and lower layers until absolutely needed. ++Consider the example a common situation where users perform a lot of lower ++changes, such as untarring a whole package. While these take place, ++typically the user doesn't access the files via Unionfs; only after the ++lower changes are done, does the user try to access the lower files. With ++our cache-coherency implementation, the entirety of the changes to the lower ++branches will not result in a single CPU cycle spent at the Unionfs level ++until the user invokes a system call that goes through Unionfs. ++ ++We have considered two alternate cache-coherency designs. (1) Using the ++dentry/inode notify functionality to register interest in finding out about ++any lower changes. This is a somewhat limited and also a heavy-handed ++approach which could result in many notifications to the Unionfs layer upon ++each small change at the lower layer (imagine a file being modified multiple ++times in rapid succession). (2) Rewriting the VFS to support explicit ++callbacks from lower objects to upper objects. We began exploring such an ++implementation, but found it to be very complicated--it would have resulted ++in massive VFS/MM changes which are unlikely to be accepted by the LKML ++community. We therefore believe that our current cache-coherency design and ++implementation represent the best approach at this time. ++ ++Limitations: ++ ++Our implementation works in that as long as a user process will have caused ++Unionfs to be called, directly or indirectly, even to just do ++->d_revalidate; then we will have purged the current Unionfs data and the ++process will see the new data. For example, a process that continually ++re-reads the same file's data will see the NEW data as soon as the lower ++file had changed, upon the next read(2) syscall (even if the file is still ++open!) However, this doesn't work when the process re-reads the open file's ++data via mmap(2) (unless the user unmaps/closes the file and remaps/reopens ++it). Once we respond to ->readpage(s), then the kernel maps the page into ++the process's address space and there doesn't appear to be a way to force ++the kernel to invalidate those pages/mappings, and force the process to ++re-issue ->readpage. If there's a way to invalidate active mappings and ++force a ->readpage, let us know please (invalidate_inode_pages2 doesn't do ++the trick). ++ ++Our current Unionfs code has to perform many file-revalidation calls. It ++would be really nice if the VFS would export an optional file system hook ++->file_revalidate (similarly to dentry->d_revalidate) that will be called ++before each VFS op that has a "struct file" in it. ++ ++Certain file systems have micro-second granularity (or better) for inode ++times, and asynchronous actions could cause those times to change with some ++small delay. In such cases, Unionfs may see a changed inode time that only ++differs by a tiny fraction of a second: such a change may be a false ++positive indication that the lower object has changed, whereas if unionfs ++waits a little longer, that false indication will not be seen. (These false ++positives are harmless, because they would at most cause unionfs to ++re-validate an object that may need no revalidation, and print a debugging ++message that clutters the console/logs.) Therefore, to minimize the chances ++of these situations, we delay the detection of changed times by a small ++factor of a few seconds, called UNIONFS_MIN_CC_TIME (which defaults to 3 ++seconds, as does NFS). This means that we will detect the change, only a ++couple of seconds later, if indeed the time change persists in the lower ++file object. This delayed detection has an added performance benefit: we ++reduce the number of times that unionfs has to revalidate objects, in case ++there's a lot of concurrent activity on both the upper and lower objects, ++for the same file(s). Lastly, this delayed time attribute detection is ++similar to how NFS clients operate (e.g., acregmin). ++ ++Finally, there is no way currently in Linux to prevent lower directories ++from being moved around (i.e., topology changes); there's no way to prevent ++modifications to directory sub-trees of whole file systems which are mounted ++read-write. It is therefore possible for in-flight operations in unionfs to ++take place, while a lower directory is being moved around. Therefore, if ++you try to, say, create a new file in a directory through unionfs, while the ++directory is being moved around directly, then the new file may get created ++in the new location where that directory was moved to. This is a somewhat ++similar behaviour in NFS: an NFS client could be creating a new file while ++th NFS server is moving th directory around; the file will get successfully ++created in the new location. (The one exception in unionfs is that if the ++branch is marked read-only by unionfs, then a copyup will take place.) ++ ++For more information, see . +diff --git a/Documentation/filesystems/unionfs/issues.txt b/Documentation/filesystems/unionfs/issues.txt +new file mode 100644 +index 0000000..f4b7e7e +--- /dev/null ++++ b/Documentation/filesystems/unionfs/issues.txt +@@ -0,0 +1,28 @@ ++KNOWN Unionfs 2.x ISSUES: ++========================= ++ ++1. Unionfs should not use lookup_one_len() on the underlying f/s as it ++ confuses NFSv4. Currently, unionfs_lookup() passes lookup intents to the ++ lower file-system, this eliminates part of the problem. The remaining ++ calls to lookup_one_len may need to be changed to pass an intent. We are ++ currently introducing VFS changes to fs/namei.c's do_path_lookup() to ++ allow proper file lookup and opening in stackable file systems. ++ ++2. Lockdep (a debugging feature) isn't aware of stacking, and so it ++ incorrectly complains about locking problems. The problem boils down to ++ this: Lockdep considers all objects of a certain type to be in the same ++ class, for example, all inodes. Lockdep doesn't like to see a lock held ++ on two inodes within the same task, and warns that it could lead to a ++ deadlock. However, stackable file systems do precisely that: they lock ++ an upper object, and then a lower object, in a strict order to avoid ++ locking problems; in addition, Unionfs, as a fan-out file system, may ++ have to lock several lower inodes. We are currently looking into Lockdep ++ to see how to make it aware of stackable file systems. For now, we ++ temporarily disable lockdep when calling vfs methods on lower objects, ++ but only for those places where lockdep complained. While this solution ++ may seem unclean, it is not without precedent: other places in the kernel ++ also do similar temporary disabling, of course after carefully having ++ checked that it is the right thing to do. Anyway, you get any warnings ++ from Lockdep, please report them to the Unionfs maintainers. ++ ++For more information, see . +diff --git a/Documentation/filesystems/unionfs/rename.txt b/Documentation/filesystems/unionfs/rename.txt +new file mode 100644 +index 0000000..e20bb82 +--- /dev/null ++++ b/Documentation/filesystems/unionfs/rename.txt +@@ -0,0 +1,31 @@ ++Rename is a complex beast. The following table shows which rename(2) operations ++should succeed and which should fail. ++ ++o: success ++E: error (either unionfs or vfs) ++X: EXDEV ++ ++none = file does not exist ++file = file is a file ++dir = file is a empty directory ++child= file is a non-empty directory ++wh = file is a directory containing only whiteouts; this makes it logically ++ empty ++ ++ none file dir child wh ++file o o E E E ++dir o E o E o ++child X E X E X ++wh o E o E o ++ ++ ++Renaming directories: ++===================== ++ ++Whenever a empty (either physically or logically) directory is being renamed, ++the following sequence of events should take place: ++ ++1) Remove whiteouts from both source and destination directory ++2) Rename source to destination ++3) Make destination opaque to prevent anything under it from showing up ++ +diff --git a/Documentation/filesystems/unionfs/usage.txt b/Documentation/filesystems/unionfs/usage.txt +new file mode 100644 +index 0000000..1adde69 +--- /dev/null ++++ b/Documentation/filesystems/unionfs/usage.txt +@@ -0,0 +1,134 @@ ++Unionfs is a stackable unification file system, which can appear to merge ++the contents of several directories (branches), while keeping their physical ++content separate. Unionfs is useful for unified source tree management, ++merged contents of split CD-ROM, merged separate software package ++directories, data grids, and more. Unionfs allows any mix of read-only and ++read-write branches, as well as insertion and deletion of branches anywhere ++in the fan-out. To maintain Unix semantics, Unionfs handles elimination of ++duplicates, partial-error conditions, and more. ++ ++GENERAL SYNTAX ++============== ++ ++# mount -t unionfs -o , none MOUNTPOINT ++ ++OPTIONS can be any legal combination of: ++ ++- ro # mount file system read-only ++- rw # mount file system read-write ++- remount # remount the file system (see Branch Management below) ++- incgen # increment generation no. (see Cache Consistency below) ++ ++BRANCH-OPTIONS can be either (1) a list of branches given to the "dirs=" ++option, or (2) a list of individual branch manipulation commands, combined ++with the "remount" option, and is further described in the "Branch ++Management" section below. ++ ++The syntax for the "dirs=" mount option is: ++ ++ dirs=branch[=ro|=rw][:...] ++ ++The "dirs=" option takes a colon-delimited list of directories to compose ++the union, with an optional branch mode for each of those directories. ++Directories that come earlier (specified first, on the left) in the list ++have a higher precedence than those which come later. Additionally, ++read-only or read-write permissions of the branch can be specified by ++appending =ro or =rw (default) to each directory. See the Copyup section in ++concepts.txt, for a description of Unionfs's behavior when mixing read-only ++and read-write branches and mounts. ++ ++Syntax: ++ ++ dirs=/branch1[=ro|=rw]:/branch2[=ro|=rw]:...:/branchN[=ro|=rw] ++ ++Example: ++ ++ dirs=/writable_branch=rw:/read-only_branch=ro ++ ++ ++BRANCH MANAGEMENT ++================= ++ ++Once you mount your union for the first time, using the "dirs=" option, you ++can then change the union's overall mode or reconfigure the branches, using ++the remount option, as follows. ++ ++To downgrade a union from read-write to read-only: ++ ++# mount -t unionfs -o remount,ro none MOUNTPOINT ++ ++To upgrade a union from read-only to read-write: ++ ++# mount -t unionfs -o remount,rw none MOUNTPOINT ++ ++To delete a branch /foo, regardless where it is in the current union: ++ ++# mount -t unionfs -o remount,del=/foo none MOUNTPOINT ++ ++To insert (add) a branch /foo before /bar: ++ ++# mount -t unionfs -o remount,add=/bar:/foo none MOUNTPOINT ++ ++To insert (add) a branch /foo (with the "rw" mode flag) before /bar: ++ ++# mount -t unionfs -o remount,add=/bar:/foo=rw none MOUNTPOINT ++ ++To insert (add) a branch /foo (in "rw" mode) at the very beginning (i.e., a ++new highest-priority branch), you can use the above syntax, or use a short ++hand version as follows: ++ ++# mount -t unionfs -o remount,add=/foo none MOUNTPOINT ++ ++To append a branch to the very end (new lowest-priority branch): ++ ++# mount -t unionfs -o remount,add=:/foo none MOUNTPOINT ++ ++To append a branch to the very end (new lowest-priority branch), in ++read-only mode: ++ ++# mount -t unionfs -o remount,add=:/foo=ro none MOUNTPOINT ++ ++Finally, to change the mode of one existing branch, say /foo, from read-only ++to read-write, and change /bar from read-write to read-only: ++ ++# mount -t unionfs -o remount,mode=/foo=rw,mode=/bar=ro none MOUNTPOINT ++ ++Note: in Unionfs 2.x, you cannot set the leftmost branch to readonly because ++then Unionfs won't have any writable place for copyups to take place. ++Moreover, the VFS can get confused when it tries to modify something in a ++file system mounted read-write, but isn't permitted to write to it. ++Instead, you should set the whole union as readonly, as described above. ++If, however, you must set the leftmost branch as readonly, perhaps so you ++can get a snapshot of it at a point in time, then you should insert a new ++writable top-level branch, and mark the one you want as readonly. This can ++be accomplished as follows, assuming that /foo is your current leftmost ++branch: ++ ++# mount -t tmpfs -o size=NNN /new ++# mount -t unionfs -o remount,add=/new,mode=/foo=ro none MOUNTPOINT ++ ++# mount -t unionfs -o remount,del=/new,mode=/foo=rw none MOUNTPOINT ++ ++# umount /new ++ ++CACHE CONSISTENCY ++================= ++ ++If you modify any file on any of the lower branches directly, while there is ++a Unionfs 2.x mounted above any of those branches, you should tell Unionfs ++to purge its caches and re-get the objects. To do that, you have to ++increment the generation number of the superblock using the following ++command: ++ ++# mount -t unionfs -o remount,incgen none MOUNTPOINT ++ ++Note that the older way of incrementing the generation number using an ++ioctl, is no longer supported in Unionfs 2.0 and newer. Ioctls in general ++are not encouraged. Plus, an ioctl is per-file concept, whereas the ++generation number is a per-file-system concept. Worse, such an ioctl ++requires an open file, which then has to be invalidated by the very nature ++of the generation number increase (read: the old generation increase ioctl ++was pretty racy). ++ ++ ++For more information, see . +diff --git a/MAINTAINERS b/MAINTAINERS +index 69f19f1..fd88a30 100644 +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -6319,6 +6319,14 @@ F: Documentation/cdrom/ + F: drivers/cdrom/cdrom.c + F: include/linux/cdrom.h + ++UNIONFS ++P: Erez Zadok ++M: ezk@cs.sunysb.edu ++L: unionfs@filesystems.org ++W: http://unionfs.filesystems.org/ ++T: git git.kernel.org/pub/scm/linux/kernel/git/ezk/unionfs.git ++S: Maintained ++ + UNSORTED BLOCK IMAGES (UBI) + M: Artem Bityutskiy + W: http://www.linux-mtd.infradead.org/ +diff --git a/fs/Kconfig b/fs/Kconfig +index f3aa9b0..0e6182c 100644 +--- a/fs/Kconfig ++++ b/fs/Kconfig +@@ -170,6 +170,7 @@ if MISC_FILESYSTEMS + source "fs/adfs/Kconfig" + source "fs/affs/Kconfig" + source "fs/ecryptfs/Kconfig" ++source "fs/unionfs/Kconfig" + source "fs/hfs/Kconfig" + source "fs/hfsplus/Kconfig" + source "fs/befs/Kconfig" +diff --git a/fs/Makefile b/fs/Makefile +index fb68c2b..8ca9290 100644 +--- a/fs/Makefile ++++ b/fs/Makefile +@@ -83,6 +83,7 @@ obj-$(CONFIG_ISO9660_FS) += isofs/ + obj-$(CONFIG_HFSPLUS_FS) += hfsplus/ # Before hfs to find wrapped HFS+ + obj-$(CONFIG_HFS_FS) += hfs/ + obj-$(CONFIG_ECRYPT_FS) += ecryptfs/ ++obj-$(CONFIG_UNION_FS) += unionfs/ + obj-$(CONFIG_VXFS_FS) += freevxfs/ + obj-$(CONFIG_NFS_FS) += nfs/ + obj-$(CONFIG_EXPORTFS) += exportfs/ +diff --git a/fs/namei.c b/fs/namei.c +index e3c4f11..d9f99a4 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -578,6 +578,7 @@ void release_open_intent(struct nameidata *nd) + fput(file); + } + } ++EXPORT_SYMBOL_GPL(release_open_intent); + + static inline int d_revalidate(struct dentry *dentry, struct nameidata *nd) + { +@@ -1819,6 +1820,42 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len) + return __lookup_hash(&this, base, NULL); + } + ++/* pass nameidata from caller (useful for NFS) */ ++struct dentry *lookup_one_len_nd(const char *name, struct dentry *base, ++ int len, struct nameidata *nd) ++{ ++ struct qstr this; ++ unsigned long hash; ++ unsigned int c; ++ ++ WARN_ON_ONCE(!mutex_is_locked(&base->d_inode->i_mutex)); ++ ++ this.name = name; ++ this.len = len; ++ if (!len) ++ return ERR_PTR(-EACCES); ++ ++ hash = init_name_hash(); ++ while (len--) { ++ c = *(const unsigned char *)name++; ++ if (c == '/' || c == '\0') ++ return ERR_PTR(-EACCES); ++ hash = partial_name_hash(c, hash); ++ } ++ this.hash = end_name_hash(hash); ++ /* ++ * See if the low-level filesystem might want ++ * to use its own hash.. ++ */ ++ if (base->d_flags & DCACHE_OP_HASH) { ++ int err = base->d_op->d_hash(base, base->d_inode, &this); ++ if (err < 0) ++ return ERR_PTR(err); ++ } ++ ++ return __lookup_hash(&this, base, nd); ++} ++ + int user_path_at(int dfd, const char __user *name, unsigned flags, + struct path *path) + { +@@ -3422,6 +3459,7 @@ EXPORT_SYMBOL(get_write_access); /* binfmt_aout */ + EXPORT_SYMBOL(getname); + EXPORT_SYMBOL(lock_rename); + EXPORT_SYMBOL(lookup_one_len); ++EXPORT_SYMBOL(lookup_one_len_nd); + EXPORT_SYMBOL(page_follow_link_light); + EXPORT_SYMBOL(page_put_link); + EXPORT_SYMBOL(page_readlink); +diff --git a/fs/splice.c b/fs/splice.c +index 50a5d97..a3af841 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1081,8 +1081,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); + /* + * Attempt to initiate a splice from pipe to file. + */ +-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, +- loff_t *ppos, size_t len, unsigned int flags) ++long vfs_splice_from(struct pipe_inode_info *pipe, struct file *out, ++ loff_t *ppos, size_t len, unsigned int flags) + { + ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, + loff_t *, size_t, unsigned int); +@@ -1105,13 +1105,14 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, + + return splice_write(pipe, out, ppos, len, flags); + } ++EXPORT_SYMBOL_GPL(vfs_splice_from); + + /* + * Attempt to initiate a splice from a file to a pipe. + */ +-static long do_splice_to(struct file *in, loff_t *ppos, +- struct pipe_inode_info *pipe, size_t len, +- unsigned int flags) ++long vfs_splice_to(struct file *in, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags) + { + ssize_t (*splice_read)(struct file *, loff_t *, + struct pipe_inode_info *, size_t, unsigned int); +@@ -1131,6 +1132,7 @@ static long do_splice_to(struct file *in, loff_t *ppos, + + return splice_read(in, ppos, pipe, len, flags); + } ++EXPORT_SYMBOL_GPL(vfs_splice_to); + + /** + * splice_direct_to_actor - splices data directly between two non-pipes +@@ -1200,7 +1202,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd, + size_t read_len; + loff_t pos = sd->pos, prev_pos = pos; + +- ret = do_splice_to(in, &pos, pipe, len, flags); ++ ret = vfs_splice_to(in, &pos, pipe, len, flags); + if (unlikely(ret <= 0)) + goto out_release; + +@@ -1259,8 +1261,8 @@ static int direct_splice_actor(struct pipe_inode_info *pipe, + { + struct file *file = sd->u.file; + +- return do_splice_from(pipe, file, &file->f_pos, sd->total_len, +- sd->flags); ++ return vfs_splice_from(pipe, file, &file->f_pos, sd->total_len, ++ sd->flags); + } + + /** +@@ -1345,7 +1347,7 @@ static long do_splice(struct file *in, loff_t __user *off_in, + } else + off = &out->f_pos; + +- ret = do_splice_from(ipipe, out, off, len, flags); ++ ret = vfs_splice_from(ipipe, out, off, len, flags); + + if (off_out && copy_to_user(off_out, off, sizeof(loff_t))) + ret = -EFAULT; +@@ -1365,7 +1367,7 @@ static long do_splice(struct file *in, loff_t __user *off_in, + } else + off = &in->f_pos; + +- ret = do_splice_to(in, off, opipe, len, flags); ++ ret = vfs_splice_to(in, off, opipe, len, flags); + + if (off_in && copy_to_user(off_in, off, sizeof(loff_t))) + ret = -EFAULT; +diff --git a/fs/stack.c b/fs/stack.c +index 4a6f7f4..7eeef12 100644 +--- a/fs/stack.c ++++ b/fs/stack.c +@@ -1,8 +1,20 @@ ++/* ++ * Copyright (c) 2006-2009 Erez Zadok ++ * Copyright (c) 2006-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2006-2009 Stony Brook University ++ * Copyright (c) 2006-2009 The Research Foundation of SUNY ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ + #include + #include + #include + +-/* does _NOT_ require i_mutex to be held. ++/* ++ * does _NOT_ require i_mutex to be held. + * + * This function cannot be inlined since i_size_{read,write} is rather + * heavy-weight on 32-bit systems +diff --git a/fs/unionfs/Kconfig b/fs/unionfs/Kconfig +new file mode 100644 +index 0000000..f3c1ac4 +--- /dev/null ++++ b/fs/unionfs/Kconfig +@@ -0,0 +1,24 @@ ++config UNION_FS ++ tristate "Union file system (EXPERIMENTAL)" ++ depends on EXPERIMENTAL ++ help ++ Unionfs is a stackable unification file system, which appears to ++ merge the contents of several directories (branches), while keeping ++ their physical content separate. ++ ++ See for details ++ ++config UNION_FS_XATTR ++ bool "Unionfs extended attributes" ++ depends on UNION_FS ++ help ++ Extended attributes are name:value pairs associated with inodes by ++ the kernel or by users (see the attr(5) manual page). ++ ++ If unsure, say N. ++ ++config UNION_FS_DEBUG ++ bool "Debug Unionfs" ++ depends on UNION_FS ++ help ++ If you say Y here, you can turn on debugging output from Unionfs. +diff --git a/fs/unionfs/Makefile b/fs/unionfs/Makefile +new file mode 100644 +index 0000000..3e31847 +--- /dev/null ++++ b/fs/unionfs/Makefile +@@ -0,0 +1,17 @@ ++UNIONFS_VERSION="2.5.9 (for 2.6.39-rc5)" ++ ++EXTRA_CFLAGS += -DUNIONFS_VERSION=\"$(UNIONFS_VERSION)\" ++ ++obj-$(CONFIG_UNION_FS) += unionfs.o ++ ++unionfs-y := subr.o dentry.o file.o inode.o main.o super.o \ ++ rdstate.o copyup.o dirhelper.o rename.o unlink.o \ ++ lookup.o commonfops.o dirfops.o sioq.o mmap.o whiteout.o ++ ++unionfs-$(CONFIG_UNION_FS_XATTR) += xattr.o ++ ++unionfs-$(CONFIG_UNION_FS_DEBUG) += debug.o ++ ++ifeq ($(CONFIG_UNION_FS_DEBUG),y) ++EXTRA_CFLAGS += -DDEBUG ++endif +diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c +new file mode 100644 +index 0000000..9f63b1c +--- /dev/null ++++ b/fs/unionfs/commonfops.c +@@ -0,0 +1,898 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005-2006 Junjiro Okajima ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++ ++/* ++ * 1) Copyup the file ++ * 2) Rename the file to '.unionfs' - obviously ++ * stolen from NFS's silly rename ++ */ ++static int copyup_deleted_file(struct file *file, struct dentry *dentry, ++ struct dentry *parent, int bstart, int bindex) ++{ ++ static unsigned int counter; ++ const int i_inosize = sizeof(dentry->d_inode->i_ino) * 2; ++ const int countersize = sizeof(counter) * 2; ++ const int nlen = sizeof(".unionfs") + i_inosize + countersize - 1; ++ char name[nlen + 1]; ++ int err; ++ struct dentry *tmp_dentry = NULL; ++ struct dentry *lower_dentry; ++ struct dentry *lower_dir_dentry = NULL; ++ ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bstart); ++ ++ sprintf(name, ".unionfs%*.*lx", ++ i_inosize, i_inosize, lower_dentry->d_inode->i_ino); ++ ++ /* ++ * Loop, looking for an unused temp name to copyup to. ++ * ++ * It's somewhat silly that we look for a free temp tmp name in the ++ * source branch (bstart) instead of the dest branch (bindex), where ++ * the final name will be created. We _will_ catch it if somehow ++ * the name exists in the dest branch, but it'd be nice to catch it ++ * sooner than later. ++ */ ++retry: ++ tmp_dentry = NULL; ++ do { ++ char *suffix = name + nlen - countersize; ++ ++ dput(tmp_dentry); ++ counter++; ++ sprintf(suffix, "%*.*x", countersize, countersize, counter); ++ ++ pr_debug("unionfs: trying to rename %s to %s\n", ++ dentry->d_name.name, name); ++ ++ tmp_dentry = lookup_lck_len(name, lower_dentry->d_parent, ++ nlen); ++ if (IS_ERR(tmp_dentry)) { ++ err = PTR_ERR(tmp_dentry); ++ goto out; ++ } ++ } while (tmp_dentry->d_inode != NULL); /* need negative dentry */ ++ dput(tmp_dentry); ++ ++ err = copyup_named_file(parent->d_inode, file, name, bstart, bindex, ++ i_size_read(file->f_path.dentry->d_inode)); ++ if (err) { ++ if (unlikely(err == -EEXIST)) ++ goto retry; ++ goto out; ++ } ++ ++ /* bring it to the same state as an unlinked file */ ++ lower_dentry = unionfs_lower_dentry_idx(dentry, dbstart(dentry)); ++ if (!unionfs_lower_inode_idx(dentry->d_inode, bindex)) { ++ atomic_inc(&lower_dentry->d_inode->i_count); ++ unionfs_set_lower_inode_idx(dentry->d_inode, bindex, ++ lower_dentry->d_inode); ++ } ++ lower_dir_dentry = lock_parent(lower_dentry); ++ err = vfs_unlink(lower_dir_dentry->d_inode, lower_dentry); ++ unlock_dir(lower_dir_dentry); ++ ++out: ++ if (!err) ++ unionfs_check_dentry(dentry); ++ return err; ++} ++ ++/* ++ * put all references held by upper struct file and free lower file pointer ++ * array ++ */ ++static void cleanup_file(struct file *file) ++{ ++ int bindex, bstart, bend; ++ struct file **lower_files; ++ struct file *lower_file; ++ struct super_block *sb = file->f_path.dentry->d_sb; ++ ++ lower_files = UNIONFS_F(file)->lower_files; ++ bstart = fbstart(file); ++ bend = fbend(file); ++ ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ int i; /* holds (possibly) updated branch index */ ++ int old_bid; ++ ++ lower_file = unionfs_lower_file_idx(file, bindex); ++ if (!lower_file) ++ continue; ++ ++ /* ++ * Find new index of matching branch with an open ++ * file, since branches could have been added or ++ * deleted causing the one with open files to shift. ++ */ ++ old_bid = UNIONFS_F(file)->saved_branch_ids[bindex]; ++ i = branch_id_to_idx(sb, old_bid); ++ if (unlikely(i < 0)) { ++ printk(KERN_ERR "unionfs: no superblock for " ++ "file %p\n", file); ++ continue; ++ } ++ ++ /* decrement count of open files */ ++ branchput(sb, i); ++ /* ++ * fput will perform an mntput for us on the correct branch. ++ * Although we're using the file's old branch configuration, ++ * bindex, which is the old index, correctly points to the ++ * right branch in the file's branch list. In other words, ++ * we're going to mntput the correct branch even if branches ++ * have been added/removed. ++ */ ++ fput(lower_file); ++ UNIONFS_F(file)->lower_files[bindex] = NULL; ++ UNIONFS_F(file)->saved_branch_ids[bindex] = -1; ++ } ++ ++ UNIONFS_F(file)->lower_files = NULL; ++ kfree(lower_files); ++ kfree(UNIONFS_F(file)->saved_branch_ids); ++ /* set to NULL because caller needs to know if to kfree on error */ ++ UNIONFS_F(file)->saved_branch_ids = NULL; ++} ++ ++/* open all lower files for a given file */ ++static int open_all_files(struct file *file) ++{ ++ int bindex, bstart, bend, err = 0; ++ struct file *lower_file; ++ struct dentry *lower_dentry; ++ struct dentry *dentry = file->f_path.dentry; ++ struct super_block *sb = dentry->d_sb; ++ ++ bstart = dbstart(dentry); ++ bend = dbend(dentry); ++ ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ if (!lower_dentry) ++ continue; ++ ++ dget(lower_dentry); ++ unionfs_mntget(dentry, bindex); ++ branchget(sb, bindex); ++ ++ lower_file = ++ dentry_open(lower_dentry, ++ unionfs_lower_mnt_idx(dentry, bindex), ++ file->f_flags, current_cred()); ++ if (IS_ERR(lower_file)) { ++ branchput(sb, bindex); ++ err = PTR_ERR(lower_file); ++ goto out; ++ } else { ++ unionfs_set_lower_file_idx(file, bindex, lower_file); ++ } ++ } ++out: ++ return err; ++} ++ ++/* open the highest priority file for a given upper file */ ++static int open_highest_file(struct file *file, bool willwrite) ++{ ++ int bindex, bstart, bend, err = 0; ++ struct file *lower_file; ++ struct dentry *lower_dentry; ++ struct dentry *dentry = file->f_path.dentry; ++ struct dentry *parent = dget_parent(dentry); ++ struct inode *parent_inode = parent->d_inode; ++ struct super_block *sb = dentry->d_sb; ++ ++ bstart = dbstart(dentry); ++ bend = dbend(dentry); ++ ++ lower_dentry = unionfs_lower_dentry(dentry); ++ if (willwrite && IS_WRITE_FLAG(file->f_flags) && is_robranch(dentry)) { ++ for (bindex = bstart - 1; bindex >= 0; bindex--) { ++ err = copyup_file(parent_inode, file, bstart, bindex, ++ i_size_read(dentry->d_inode)); ++ if (!err) ++ break; ++ } ++ atomic_set(&UNIONFS_F(file)->generation, ++ atomic_read(&UNIONFS_I(dentry->d_inode)-> ++ generation)); ++ goto out; ++ } ++ ++ dget(lower_dentry); ++ unionfs_mntget(dentry, bstart); ++ lower_file = dentry_open(lower_dentry, ++ unionfs_lower_mnt_idx(dentry, bstart), ++ file->f_flags, current_cred()); ++ if (IS_ERR(lower_file)) { ++ err = PTR_ERR(lower_file); ++ goto out; ++ } ++ branchget(sb, bstart); ++ unionfs_set_lower_file(file, lower_file); ++ /* Fix up the position. */ ++ lower_file->f_pos = file->f_pos; ++ ++ memcpy(&lower_file->f_ra, &file->f_ra, sizeof(struct file_ra_state)); ++out: ++ dput(parent); ++ return err; ++} ++ ++/* perform a delayed copyup of a read-write file on a read-only branch */ ++static int do_delayed_copyup(struct file *file, struct dentry *parent) ++{ ++ int bindex, bstart, bend, err = 0; ++ struct dentry *dentry = file->f_path.dentry; ++ struct inode *parent_inode = parent->d_inode; ++ ++ bstart = fbstart(file); ++ bend = fbend(file); ++ ++ BUG_ON(!S_ISREG(dentry->d_inode->i_mode)); ++ ++ unionfs_check_file(file); ++ for (bindex = bstart - 1; bindex >= 0; bindex--) { ++ if (!d_deleted(dentry)) ++ err = copyup_file(parent_inode, file, bstart, ++ bindex, ++ i_size_read(dentry->d_inode)); ++ else ++ err = copyup_deleted_file(file, dentry, parent, ++ bstart, bindex); ++ /* if succeeded, set lower open-file flags and break */ ++ if (!err) { ++ struct file *lower_file; ++ lower_file = unionfs_lower_file_idx(file, bindex); ++ lower_file->f_flags = file->f_flags; ++ break; ++ } ++ } ++ if (err || (bstart <= fbstart(file))) ++ goto out; ++ bend = fbend(file); ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ if (unionfs_lower_file_idx(file, bindex)) { ++ branchput(dentry->d_sb, bindex); ++ fput(unionfs_lower_file_idx(file, bindex)); ++ unionfs_set_lower_file_idx(file, bindex, NULL); ++ } ++ } ++ path_put_lowers(dentry, bstart, bend, false); ++ iput_lowers(dentry->d_inode, bstart, bend, false); ++ /* for reg file, we only open it "once" */ ++ fbend(file) = fbstart(file); ++ dbend(dentry) = dbstart(dentry); ++ ibend(dentry->d_inode) = ibstart(dentry->d_inode); ++ ++out: ++ unionfs_check_file(file); ++ return err; ++} ++ ++/* ++ * Helper function for unionfs_file_revalidate/locked. ++ * Expects dentry/parent to be locked already, and revalidated. ++ */ ++static int __unionfs_file_revalidate(struct file *file, struct dentry *dentry, ++ struct dentry *parent, ++ struct super_block *sb, int sbgen, ++ int dgen, bool willwrite) ++{ ++ int fgen; ++ int bstart, bend, orig_brid; ++ int size; ++ int err = 0; ++ ++ fgen = atomic_read(&UNIONFS_F(file)->generation); ++ ++ /* ++ * There are two cases we are interested in. The first is if the ++ * generation is lower than the super-block. The second is if ++ * someone has copied up this file from underneath us, we also need ++ * to refresh things. ++ */ ++ if ((d_deleted(dentry) && dbstart(dentry) >= fbstart(file)) || ++ (sbgen <= fgen && ++ dbstart(dentry) == fbstart(file) && ++ unionfs_lower_file(file))) ++ goto out_may_copyup; ++ ++ /* save orig branch ID */ ++ orig_brid = UNIONFS_F(file)->saved_branch_ids[fbstart(file)]; ++ ++ /* First we throw out the existing files. */ ++ cleanup_file(file); ++ ++ /* Now we reopen the file(s) as in unionfs_open. */ ++ bstart = fbstart(file) = dbstart(dentry); ++ bend = fbend(file) = dbend(dentry); ++ ++ size = sizeof(struct file *) * sbmax(sb); ++ UNIONFS_F(file)->lower_files = kzalloc(size, GFP_KERNEL); ++ if (unlikely(!UNIONFS_F(file)->lower_files)) { ++ err = -ENOMEM; ++ goto out; ++ } ++ size = sizeof(int) * sbmax(sb); ++ UNIONFS_F(file)->saved_branch_ids = kzalloc(size, GFP_KERNEL); ++ if (unlikely(!UNIONFS_F(file)->saved_branch_ids)) { ++ err = -ENOMEM; ++ goto out; ++ } ++ ++ if (S_ISDIR(dentry->d_inode->i_mode)) { ++ /* We need to open all the files. */ ++ err = open_all_files(file); ++ if (err) ++ goto out; ++ } else { ++ int new_brid; ++ /* We only open the highest priority branch. */ ++ err = open_highest_file(file, willwrite); ++ if (err) ++ goto out; ++ new_brid = UNIONFS_F(file)->saved_branch_ids[fbstart(file)]; ++ if (unlikely(new_brid != orig_brid && sbgen > fgen)) { ++ /* ++ * If we re-opened the file on a different branch ++ * than the original one, and this was due to a new ++ * branch inserted, then update the mnt counts of ++ * the old and new branches accordingly. ++ */ ++ unionfs_mntget(dentry, bstart); ++ unionfs_mntput(sb->s_root, ++ branch_id_to_idx(sb, orig_brid)); ++ } ++ /* regular files have only one open lower file */ ++ fbend(file) = fbstart(file); ++ } ++ atomic_set(&UNIONFS_F(file)->generation, ++ atomic_read(&UNIONFS_I(dentry->d_inode)->generation)); ++ ++out_may_copyup: ++ /* Copyup on the first write to a file on a readonly branch. */ ++ if (willwrite && IS_WRITE_FLAG(file->f_flags) && ++ !IS_WRITE_FLAG(unionfs_lower_file(file)->f_flags) && ++ is_robranch(dentry)) { ++ pr_debug("unionfs: do delay copyup of \"%s\"\n", ++ dentry->d_name.name); ++ err = do_delayed_copyup(file, parent); ++ /* regular files have only one open lower file */ ++ if (!err && !S_ISDIR(dentry->d_inode->i_mode)) ++ fbend(file) = fbstart(file); ++ } ++ ++out: ++ if (err) { ++ kfree(UNIONFS_F(file)->lower_files); ++ kfree(UNIONFS_F(file)->saved_branch_ids); ++ } ++ return err; ++} ++ ++/* ++ * Revalidate the struct file ++ * @file: file to revalidate ++ * @parent: parent dentry (locked by caller) ++ * @willwrite: true if caller may cause changes to the file; false otherwise. ++ * Caller must lock/unlock dentry's branch configuration. ++ */ ++int unionfs_file_revalidate(struct file *file, struct dentry *parent, ++ bool willwrite) ++{ ++ struct super_block *sb; ++ struct dentry *dentry; ++ int sbgen, dgen; ++ int err = 0; ++ ++ dentry = file->f_path.dentry; ++ sb = dentry->d_sb; ++ verify_locked(dentry); ++ verify_locked(parent); ++ ++ /* ++ * First revalidate the dentry inside struct file, ++ * but not unhashed dentries. ++ */ ++ if (!d_deleted(dentry) && ++ !__unionfs_d_revalidate(dentry, parent, willwrite)) { ++ err = -ESTALE; ++ goto out; ++ } ++ ++ sbgen = atomic_read(&UNIONFS_SB(sb)->generation); ++ dgen = atomic_read(&UNIONFS_D(dentry)->generation); ++ ++ if (unlikely(sbgen > dgen)) { /* XXX: should never happen */ ++ pr_debug("unionfs: failed to revalidate dentry (%s)\n", ++ dentry->d_name.name); ++ err = -ESTALE; ++ goto out; ++ } ++ ++ err = __unionfs_file_revalidate(file, dentry, parent, sb, ++ sbgen, dgen, willwrite); ++out: ++ return err; ++} ++ ++/* unionfs_open helper function: open a directory */ ++static int __open_dir(struct inode *inode, struct file *file) ++{ ++ struct dentry *lower_dentry; ++ struct file *lower_file; ++ int bindex, bstart, bend; ++ struct vfsmount *mnt; ++ ++ bstart = fbstart(file) = dbstart(file->f_path.dentry); ++ bend = fbend(file) = dbend(file->f_path.dentry); ++ ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_dentry = ++ unionfs_lower_dentry_idx(file->f_path.dentry, bindex); ++ if (!lower_dentry) ++ continue; ++ ++ dget(lower_dentry); ++ unionfs_mntget(file->f_path.dentry, bindex); ++ mnt = unionfs_lower_mnt_idx(file->f_path.dentry, bindex); ++ lower_file = dentry_open(lower_dentry, mnt, file->f_flags, ++ current_cred()); ++ if (IS_ERR(lower_file)) ++ return PTR_ERR(lower_file); ++ ++ unionfs_set_lower_file_idx(file, bindex, lower_file); ++ ++ /* ++ * The branchget goes after the open, because otherwise ++ * we would miss the reference on release. ++ */ ++ branchget(inode->i_sb, bindex); ++ } ++ ++ return 0; ++} ++ ++/* unionfs_open helper function: open a file */ ++static int __open_file(struct inode *inode, struct file *file, ++ struct dentry *parent) ++{ ++ struct dentry *lower_dentry; ++ struct file *lower_file; ++ int lower_flags; ++ int bindex, bstart, bend; ++ ++ lower_dentry = unionfs_lower_dentry(file->f_path.dentry); ++ lower_flags = file->f_flags; ++ ++ bstart = fbstart(file) = dbstart(file->f_path.dentry); ++ bend = fbend(file) = dbend(file->f_path.dentry); ++ ++ /* ++ * check for the permission for lower file. If the error is ++ * COPYUP_ERR, copyup the file. ++ */ ++ if (lower_dentry->d_inode && is_robranch(file->f_path.dentry)) { ++ /* ++ * if the open will change the file, copy it up otherwise ++ * defer it. ++ */ ++ if (lower_flags & O_TRUNC) { ++ int size = 0; ++ int err = -EROFS; ++ ++ /* copyup the file */ ++ for (bindex = bstart - 1; bindex >= 0; bindex--) { ++ err = copyup_file(parent->d_inode, file, ++ bstart, bindex, size); ++ if (!err) { ++ /* only one regular file open */ ++ fbend(file) = fbstart(file); ++ break; ++ } ++ } ++ return err; ++ } else { ++ /* ++ * turn off writeable flags, to force delayed copyup ++ * by caller. ++ */ ++ lower_flags &= ~(OPEN_WRITE_FLAGS); ++ } ++ } ++ ++ dget(lower_dentry); ++ ++ /* ++ * dentry_open will decrement mnt refcnt if err. ++ * otherwise fput() will do an mntput() for us upon file close. ++ */ ++ unionfs_mntget(file->f_path.dentry, bstart); ++ lower_file = ++ dentry_open(lower_dentry, ++ unionfs_lower_mnt_idx(file->f_path.dentry, bstart), ++ lower_flags, current_cred()); ++ if (IS_ERR(lower_file)) ++ return PTR_ERR(lower_file); ++ ++ unionfs_set_lower_file(file, lower_file); ++ branchget(inode->i_sb, bstart); ++ ++ return 0; ++} ++ ++int unionfs_open(struct inode *inode, struct file *file) ++{ ++ int err = 0; ++ struct file *lower_file = NULL; ++ struct dentry *dentry = file->f_path.dentry; ++ struct dentry *parent; ++ int bindex = 0, bstart = 0, bend = 0; ++ int size; ++ int valid = 0; ++ ++ unionfs_read_lock(inode->i_sb, UNIONFS_SMUTEX_PARENT); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ /* don't open unhashed/deleted files */ ++ if (d_deleted(dentry)) { ++ err = -ENOENT; ++ goto out_nofree; ++ } ++ ++ /* XXX: should I change 'false' below to the 'willwrite' flag? */ ++ valid = __unionfs_d_revalidate(dentry, parent, false); ++ if (unlikely(!valid)) { ++ err = -ESTALE; ++ goto out_nofree; ++ } ++ ++ file->private_data = ++ kzalloc(sizeof(struct unionfs_file_info), GFP_KERNEL); ++ if (unlikely(!UNIONFS_F(file))) { ++ err = -ENOMEM; ++ goto out_nofree; ++ } ++ fbstart(file) = -1; ++ fbend(file) = -1; ++ atomic_set(&UNIONFS_F(file)->generation, ++ atomic_read(&UNIONFS_I(inode)->generation)); ++ ++ size = sizeof(struct file *) * sbmax(inode->i_sb); ++ UNIONFS_F(file)->lower_files = kzalloc(size, GFP_KERNEL); ++ if (unlikely(!UNIONFS_F(file)->lower_files)) { ++ err = -ENOMEM; ++ goto out; ++ } ++ size = sizeof(int) * sbmax(inode->i_sb); ++ UNIONFS_F(file)->saved_branch_ids = kzalloc(size, GFP_KERNEL); ++ if (unlikely(!UNIONFS_F(file)->saved_branch_ids)) { ++ err = -ENOMEM; ++ goto out; ++ } ++ ++ bstart = fbstart(file) = dbstart(dentry); ++ bend = fbend(file) = dbend(dentry); ++ ++ /* ++ * open all directories and make the unionfs file struct point to ++ * these lower file structs ++ */ ++ if (S_ISDIR(inode->i_mode)) ++ err = __open_dir(inode, file); /* open a dir */ ++ else ++ err = __open_file(inode, file, parent); /* open a file */ ++ ++ /* freeing the allocated resources, and fput the opened files */ ++ if (err) { ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_file = unionfs_lower_file_idx(file, bindex); ++ if (!lower_file) ++ continue; ++ ++ branchput(dentry->d_sb, bindex); ++ /* fput calls dput for lower_dentry */ ++ fput(lower_file); ++ } ++ } ++ ++out: ++ if (err) { ++ kfree(UNIONFS_F(file)->lower_files); ++ kfree(UNIONFS_F(file)->saved_branch_ids); ++ kfree(UNIONFS_F(file)); ++ } ++out_nofree: ++ if (!err) { ++ unionfs_postcopyup_setmnt(dentry); ++ unionfs_copy_attr_times(inode); ++ unionfs_check_file(file); ++ unionfs_check_inode(inode); ++ } ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(inode->i_sb); ++ return err; ++} ++ ++/* ++ * release all lower object references & free the file info structure ++ * ++ * No need to grab sb info's rwsem. ++ */ ++int unionfs_file_release(struct inode *inode, struct file *file) ++{ ++ struct file *lower_file = NULL; ++ struct unionfs_file_info *fileinfo; ++ struct unionfs_inode_info *inodeinfo; ++ struct super_block *sb = inode->i_sb; ++ struct dentry *dentry = file->f_path.dentry; ++ struct dentry *parent; ++ int bindex, bstart, bend; ++ int err = 0; ++ ++ /* ++ * Since mm/memory.c:might_fault() (under PROVE_LOCKING) was ++ * modified in 2.6.29-rc1 to call might_lock_read on mmap_sem, this ++ * has been causing false positives in file system stacking layers. ++ * In particular, our ->mmap is called after sys_mmap2 already holds ++ * mmap_sem, then we lock our own mutexes; but earlier, it's ++ * possible for lockdep to have locked our mutexes first, and then ++ * we call a lower ->readdir which could call might_fault. The ++ * different ordering of the locks is what lockdep complains about ++ * -- unnecessarily. Therefore, we have no choice but to tell ++ * lockdep to temporarily turn off lockdep here. Note: the comments ++ * inside might_sleep also suggest that it would have been ++ * nicer to only annotate paths that needs that might_lock_read. ++ */ ++ lockdep_off(); ++ unionfs_read_lock(sb, UNIONFS_SMUTEX_PARENT); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ /* ++ * We try to revalidate, but the VFS ignores return return values ++ * from file->release, so we must always try to succeed here, ++ * including to do the kfree and dput below. So if revalidation ++ * failed, all we can do is print some message and keep going. ++ */ ++ err = unionfs_file_revalidate(file, parent, ++ UNIONFS_F(file)->wrote_to_file); ++ if (!err) ++ unionfs_check_file(file); ++ fileinfo = UNIONFS_F(file); ++ BUG_ON(file->f_path.dentry->d_inode != inode); ++ inodeinfo = UNIONFS_I(inode); ++ ++ /* fput all the lower files */ ++ bstart = fbstart(file); ++ bend = fbend(file); ++ ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_file = unionfs_lower_file_idx(file, bindex); ++ ++ if (lower_file) { ++ unionfs_set_lower_file_idx(file, bindex, NULL); ++ fput(lower_file); ++ branchput(sb, bindex); ++ } ++ ++ /* if there are no more refs to the dentry, dput it */ ++ if (d_deleted(dentry)) { ++ dput(unionfs_lower_dentry_idx(dentry, bindex)); ++ unionfs_set_lower_dentry_idx(dentry, bindex, NULL); ++ } ++ } ++ ++ kfree(fileinfo->lower_files); ++ kfree(fileinfo->saved_branch_ids); ++ ++ if (fileinfo->rdstate) { ++ fileinfo->rdstate->access = jiffies; ++ spin_lock(&inodeinfo->rdlock); ++ inodeinfo->rdcount++; ++ list_add_tail(&fileinfo->rdstate->cache, ++ &inodeinfo->readdircache); ++ mark_inode_dirty(inode); ++ spin_unlock(&inodeinfo->rdlock); ++ fileinfo->rdstate = NULL; ++ } ++ kfree(fileinfo); ++ ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(sb); ++ lockdep_on(); ++ return err; ++} ++ ++/* pass the ioctl to the lower fs */ ++static long do_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ++{ ++ struct file *lower_file; ++ int err; ++ ++ lower_file = unionfs_lower_file(file); ++ ++ err = -ENOTTY; ++ if (!lower_file || !lower_file->f_op) ++ goto out; ++ if (lower_file->f_op->unlocked_ioctl) { ++ err = lower_file->f_op->unlocked_ioctl(lower_file, cmd, arg); ++#ifdef CONFIG_COMPAT ++ } else if (lower_file->f_op->ioctl) { ++ err = lower_file->f_op->compat_ioctl( ++ lower_file->f_path.dentry->d_inode, ++ lower_file, cmd, arg); ++#endif ++ } ++ ++out: ++ return err; ++} ++ ++/* ++ * return to user-space the branch indices containing the file in question ++ * ++ * We use fd_set and therefore we are limited to the number of the branches ++ * to FD_SETSIZE, which is currently 1024 - plenty for most people ++ */ ++static int unionfs_ioctl_queryfile(struct file *file, struct dentry *parent, ++ unsigned int cmd, unsigned long arg) ++{ ++ int err = 0; ++ fd_set branchlist; ++ int bstart = 0, bend = 0, bindex = 0; ++ int orig_bstart, orig_bend; ++ struct dentry *dentry, *lower_dentry; ++ struct vfsmount *mnt; ++ ++ dentry = file->f_path.dentry; ++ orig_bstart = dbstart(dentry); ++ orig_bend = dbend(dentry); ++ err = unionfs_partial_lookup(dentry, parent); ++ if (err) ++ goto out; ++ bstart = dbstart(dentry); ++ bend = dbend(dentry); ++ ++ FD_ZERO(&branchlist); ++ ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ if (!lower_dentry) ++ continue; ++ if (likely(lower_dentry->d_inode)) ++ FD_SET(bindex, &branchlist); ++ /* purge any lower objects after partial_lookup */ ++ if (bindex < orig_bstart || bindex > orig_bend) { ++ dput(lower_dentry); ++ unionfs_set_lower_dentry_idx(dentry, bindex, NULL); ++ iput(unionfs_lower_inode_idx(dentry->d_inode, bindex)); ++ unionfs_set_lower_inode_idx(dentry->d_inode, bindex, ++ NULL); ++ mnt = unionfs_lower_mnt_idx(dentry, bindex); ++ if (!mnt) ++ continue; ++ unionfs_mntput(dentry, bindex); ++ unionfs_set_lower_mnt_idx(dentry, bindex, NULL); ++ } ++ } ++ /* restore original dentry's offsets */ ++ dbstart(dentry) = orig_bstart; ++ dbend(dentry) = orig_bend; ++ ibstart(dentry->d_inode) = orig_bstart; ++ ibend(dentry->d_inode) = orig_bend; ++ ++ err = copy_to_user((void __user *)arg, &branchlist, sizeof(fd_set)); ++ if (unlikely(err)) ++ err = -EFAULT; ++ ++out: ++ return err < 0 ? err : bend; ++} ++ ++long unionfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ++{ ++ long err; ++ struct dentry *dentry = file->f_path.dentry; ++ struct dentry *parent; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_PARENT); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ err = unionfs_file_revalidate(file, parent, true); ++ if (unlikely(err)) ++ goto out; ++ ++ /* check if asked for local commands */ ++ switch (cmd) { ++ case UNIONFS_IOCTL_INCGEN: ++ /* Increment the superblock generation count */ ++ pr_info("unionfs: incgen ioctl deprecated; " ++ "use \"-o remount,incgen\"\n"); ++ err = -ENOSYS; ++ break; ++ ++ case UNIONFS_IOCTL_QUERYFILE: ++ /* Return list of branches containing the given file */ ++ err = unionfs_ioctl_queryfile(file, parent, cmd, arg); ++ break; ++ ++ default: ++ /* pass the ioctl down */ ++ err = do_ioctl(file, cmd, arg); ++ break; ++ } ++ ++out: ++ unionfs_check_file(file); ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} ++ ++int unionfs_flush(struct file *file, fl_owner_t id) ++{ ++ int err = 0; ++ struct file *lower_file = NULL; ++ struct dentry *dentry = file->f_path.dentry; ++ struct dentry *parent; ++ int bindex, bstart, bend; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_PARENT); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ err = unionfs_file_revalidate(file, parent, ++ UNIONFS_F(file)->wrote_to_file); ++ if (unlikely(err)) ++ goto out; ++ unionfs_check_file(file); ++ ++ bstart = fbstart(file); ++ bend = fbend(file); ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_file = unionfs_lower_file_idx(file, bindex); ++ ++ if (lower_file && lower_file->f_op && ++ lower_file->f_op->flush) { ++ err = lower_file->f_op->flush(lower_file, id); ++ if (err) ++ goto out; ++ } ++ ++ } ++ ++out: ++ if (!err) ++ unionfs_check_file(file); ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} +diff --git a/fs/unionfs/copyup.c b/fs/unionfs/copyup.c +new file mode 100644 +index 0000000..37c2654 +--- /dev/null ++++ b/fs/unionfs/copyup.c +@@ -0,0 +1,896 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005-2006 Junjiro Okajima ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++ ++/* ++ * For detailed explanation of copyup see: ++ * Documentation/filesystems/unionfs/concepts.txt ++ */ ++ ++#ifdef CONFIG_UNION_FS_XATTR ++/* copyup all extended attrs for a given dentry */ ++static int copyup_xattrs(struct dentry *old_lower_dentry, ++ struct dentry *new_lower_dentry) ++{ ++ int err = 0; ++ ssize_t list_size = -1; ++ char *name_list = NULL; ++ char *attr_value = NULL; ++ char *name_list_buf = NULL; ++ ++ /* query the actual size of the xattr list */ ++ list_size = vfs_listxattr(old_lower_dentry, NULL, 0); ++ if (list_size <= 0) { ++ err = list_size; ++ goto out; ++ } ++ ++ /* allocate space for the actual list */ ++ name_list = unionfs_xattr_alloc(list_size + 1, XATTR_LIST_MAX); ++ if (unlikely(!name_list || IS_ERR(name_list))) { ++ err = PTR_ERR(name_list); ++ goto out; ++ } ++ ++ name_list_buf = name_list; /* save for kfree at end */ ++ ++ /* now get the actual xattr list of the source file */ ++ list_size = vfs_listxattr(old_lower_dentry, name_list, list_size); ++ if (list_size <= 0) { ++ err = list_size; ++ goto out; ++ } ++ ++ /* allocate space to hold each xattr's value */ ++ attr_value = unionfs_xattr_alloc(XATTR_SIZE_MAX, XATTR_SIZE_MAX); ++ if (unlikely(!attr_value || IS_ERR(attr_value))) { ++ err = PTR_ERR(name_list); ++ goto out; ++ } ++ ++ /* in a loop, get and set each xattr from src to dst file */ ++ while (*name_list) { ++ ssize_t size; ++ ++ /* Lock here since vfs_getxattr doesn't lock for us */ ++ mutex_lock(&old_lower_dentry->d_inode->i_mutex); ++ size = vfs_getxattr(old_lower_dentry, name_list, ++ attr_value, XATTR_SIZE_MAX); ++ mutex_unlock(&old_lower_dentry->d_inode->i_mutex); ++ if (size < 0) { ++ err = size; ++ goto out; ++ } ++ if (size > XATTR_SIZE_MAX) { ++ err = -E2BIG; ++ goto out; ++ } ++ /* Don't lock here since vfs_setxattr does it for us. */ ++ err = vfs_setxattr(new_lower_dentry, name_list, attr_value, ++ size, 0); ++ /* ++ * Selinux depends on "security.*" xattrs, so to maintain ++ * the security of copied-up files, if Selinux is active, ++ * then we must copy these xattrs as well. So we need to ++ * temporarily get FOWNER privileges. ++ * XXX: move entire copyup code to SIOQ. ++ */ ++ if (err == -EPERM && !capable(CAP_FOWNER)) { ++ const struct cred *old_creds; ++ struct cred *new_creds; ++ ++ new_creds = prepare_creds(); ++ if (unlikely(!new_creds)) { ++ err = -ENOMEM; ++ goto out; ++ } ++ cap_raise(new_creds->cap_effective, CAP_FOWNER); ++ old_creds = override_creds(new_creds); ++ err = vfs_setxattr(new_lower_dentry, name_list, ++ attr_value, size, 0); ++ revert_creds(old_creds); ++ } ++ if (err < 0) ++ goto out; ++ name_list += strlen(name_list) + 1; ++ } ++out: ++ unionfs_xattr_kfree(name_list_buf); ++ unionfs_xattr_kfree(attr_value); ++ /* Ignore if xattr isn't supported */ ++ if (err == -ENOTSUPP || err == -EOPNOTSUPP) ++ err = 0; ++ return err; ++} ++#endif /* CONFIG_UNION_FS_XATTR */ ++ ++/* ++ * Determine the mode based on the copyup flags, and the existing dentry. ++ * ++ * Handle file systems which may not support certain options. For example ++ * jffs2 doesn't allow one to chmod a symlink. So we ignore such harmless ++ * errors, rather than propagating them up, which results in copyup errors ++ * and errors returned back to users. ++ */ ++static int copyup_permissions(struct super_block *sb, ++ struct dentry *old_lower_dentry, ++ struct dentry *new_lower_dentry) ++{ ++ struct inode *i = old_lower_dentry->d_inode; ++ struct iattr newattrs; ++ int err; ++ ++ newattrs.ia_atime = i->i_atime; ++ newattrs.ia_mtime = i->i_mtime; ++ newattrs.ia_ctime = i->i_ctime; ++ newattrs.ia_gid = i->i_gid; ++ newattrs.ia_uid = i->i_uid; ++ newattrs.ia_valid = ATTR_CTIME | ATTR_ATIME | ATTR_MTIME | ++ ATTR_ATIME_SET | ATTR_MTIME_SET | ATTR_FORCE | ++ ATTR_GID | ATTR_UID; ++ mutex_lock(&new_lower_dentry->d_inode->i_mutex); ++ err = notify_change(new_lower_dentry, &newattrs); ++ if (err) ++ goto out; ++ ++ /* now try to change the mode and ignore EOPNOTSUPP on symlinks */ ++ newattrs.ia_mode = i->i_mode; ++ newattrs.ia_valid = ATTR_MODE | ATTR_FORCE; ++ err = notify_change(new_lower_dentry, &newattrs); ++ if (err == -EOPNOTSUPP && ++ S_ISLNK(new_lower_dentry->d_inode->i_mode)) { ++ printk(KERN_WARNING ++ "unionfs: changing \"%s\" symlink mode unsupported\n", ++ new_lower_dentry->d_name.name); ++ err = 0; ++ } ++ ++out: ++ mutex_unlock(&new_lower_dentry->d_inode->i_mutex); ++ return err; ++} ++ ++/* ++ * create the new device/file/directory - use copyup_permission to copyup ++ * times, and mode ++ * ++ * if the object being copied up is a regular file, the file is only created, ++ * the contents have to be copied up separately ++ */ ++static int __copyup_ndentry(struct dentry *old_lower_dentry, ++ struct dentry *new_lower_dentry, ++ struct dentry *new_lower_parent_dentry, ++ char *symbuf) ++{ ++ int err = 0; ++ umode_t old_mode = old_lower_dentry->d_inode->i_mode; ++ struct sioq_args args; ++ ++ if (S_ISDIR(old_mode)) { ++ args.mkdir.parent = new_lower_parent_dentry->d_inode; ++ args.mkdir.dentry = new_lower_dentry; ++ args.mkdir.mode = old_mode; ++ ++ run_sioq(__unionfs_mkdir, &args); ++ err = args.err; ++ } else if (S_ISLNK(old_mode)) { ++ args.symlink.parent = new_lower_parent_dentry->d_inode; ++ args.symlink.dentry = new_lower_dentry; ++ args.symlink.symbuf = symbuf; ++ ++ run_sioq(__unionfs_symlink, &args); ++ err = args.err; ++ } else if (S_ISBLK(old_mode) || S_ISCHR(old_mode) || ++ S_ISFIFO(old_mode) || S_ISSOCK(old_mode)) { ++ args.mknod.parent = new_lower_parent_dentry->d_inode; ++ args.mknod.dentry = new_lower_dentry; ++ args.mknod.mode = old_mode; ++ args.mknod.dev = old_lower_dentry->d_inode->i_rdev; ++ ++ run_sioq(__unionfs_mknod, &args); ++ err = args.err; ++ } else if (S_ISREG(old_mode)) { ++ struct nameidata nd; ++ err = init_lower_nd(&nd, LOOKUP_CREATE); ++ if (unlikely(err < 0)) ++ goto out; ++ args.create.nd = &nd; ++ args.create.parent = new_lower_parent_dentry->d_inode; ++ args.create.dentry = new_lower_dentry; ++ args.create.mode = old_mode; ++ ++ run_sioq(__unionfs_create, &args); ++ err = args.err; ++ release_lower_nd(&nd, err); ++ } else { ++ printk(KERN_CRIT "unionfs: unknown inode type %d\n", ++ old_mode); ++ BUG(); ++ } ++ ++out: ++ return err; ++} ++ ++static int __copyup_reg_data(struct dentry *dentry, ++ struct dentry *new_lower_dentry, int new_bindex, ++ struct dentry *old_lower_dentry, int old_bindex, ++ struct file **copyup_file, loff_t len) ++{ ++ struct super_block *sb = dentry->d_sb; ++ struct file *input_file; ++ struct file *output_file; ++ struct vfsmount *output_mnt; ++ mm_segment_t old_fs; ++ char *buf = NULL; ++ ssize_t read_bytes, write_bytes; ++ loff_t size; ++ int err = 0; ++ ++ /* open old file */ ++ unionfs_mntget(dentry, old_bindex); ++ branchget(sb, old_bindex); ++ /* dentry_open calls dput and mntput if it returns an error */ ++ input_file = dentry_open(old_lower_dentry, ++ unionfs_lower_mnt_idx(dentry, old_bindex), ++ O_RDONLY | O_LARGEFILE, current_cred()); ++ if (IS_ERR(input_file)) { ++ dput(old_lower_dentry); ++ err = PTR_ERR(input_file); ++ goto out; ++ } ++ if (unlikely(!input_file->f_op || !input_file->f_op->read)) { ++ err = -EINVAL; ++ goto out_close_in; ++ } ++ ++ /* open new file */ ++ dget(new_lower_dentry); ++ output_mnt = unionfs_mntget(sb->s_root, new_bindex); ++ branchget(sb, new_bindex); ++ output_file = dentry_open(new_lower_dentry, output_mnt, ++ O_RDWR | O_LARGEFILE, current_cred()); ++ if (IS_ERR(output_file)) { ++ err = PTR_ERR(output_file); ++ goto out_close_in2; ++ } ++ if (unlikely(!output_file->f_op || !output_file->f_op->write)) { ++ err = -EINVAL; ++ goto out_close_out; ++ } ++ ++ /* allocating a buffer */ ++ buf = kmalloc(PAGE_SIZE, GFP_KERNEL); ++ if (unlikely(!buf)) { ++ err = -ENOMEM; ++ goto out_close_out; ++ } ++ ++ input_file->f_pos = 0; ++ output_file->f_pos = 0; ++ ++ old_fs = get_fs(); ++ set_fs(KERNEL_DS); ++ ++ size = len; ++ err = 0; ++ do { ++ if (len >= PAGE_SIZE) ++ size = PAGE_SIZE; ++ else if ((len < PAGE_SIZE) && (len > 0)) ++ size = len; ++ ++ len -= PAGE_SIZE; ++ ++ read_bytes = ++ input_file->f_op->read(input_file, ++ (char __user *)buf, size, ++ &input_file->f_pos); ++ if (read_bytes <= 0) { ++ err = read_bytes; ++ break; ++ } ++ ++ /* see Documentation/filesystems/unionfs/issues.txt */ ++ lockdep_off(); ++ write_bytes = ++ output_file->f_op->write(output_file, ++ (char __user *)buf, ++ read_bytes, ++ &output_file->f_pos); ++ lockdep_on(); ++ if ((write_bytes < 0) || (write_bytes < read_bytes)) { ++ err = write_bytes; ++ break; ++ } ++ } while ((read_bytes > 0) && (len > 0)); ++ ++ set_fs(old_fs); ++ ++ kfree(buf); ++ ++ if (!err) ++ err = output_file->f_op->fsync(output_file, 0); ++ ++ if (err) ++ goto out_close_out; ++ ++ if (copyup_file) { ++ *copyup_file = output_file; ++ goto out_close_in; ++ } ++ ++out_close_out: ++ fput(output_file); ++ ++out_close_in2: ++ branchput(sb, new_bindex); ++ ++out_close_in: ++ fput(input_file); ++ ++out: ++ branchput(sb, old_bindex); ++ ++ return err; ++} ++ ++/* ++ * dput the lower references for old and new dentry & clear a lower dentry ++ * pointer ++ */ ++static void __clear(struct dentry *dentry, struct dentry *old_lower_dentry, ++ int old_bstart, int old_bend, ++ struct dentry *new_lower_dentry, int new_bindex) ++{ ++ /* get rid of the lower dentry and all its traces */ ++ unionfs_set_lower_dentry_idx(dentry, new_bindex, NULL); ++ dbstart(dentry) = old_bstart; ++ dbend(dentry) = old_bend; ++ ++ dput(new_lower_dentry); ++ dput(old_lower_dentry); ++} ++ ++/* ++ * Copy up a dentry to a file of specified name. ++ * ++ * @dir: used to pull the ->i_sb to access other branches ++ * @dentry: the non-negative dentry whose lower_inode we should copy ++ * @bstart: the branch of the lower_inode to copy from ++ * @new_bindex: the branch to create the new file in ++ * @name: the name of the file to create ++ * @namelen: length of @name ++ * @copyup_file: the "struct file" to return (optional) ++ * @len: how many bytes to copy-up? ++ */ ++int copyup_dentry(struct inode *dir, struct dentry *dentry, int bstart, ++ int new_bindex, const char *name, int namelen, ++ struct file **copyup_file, loff_t len) ++{ ++ struct dentry *new_lower_dentry; ++ struct dentry *old_lower_dentry = NULL; ++ struct super_block *sb; ++ int err = 0; ++ int old_bindex; ++ int old_bstart; ++ int old_bend; ++ struct dentry *new_lower_parent_dentry = NULL; ++ mm_segment_t oldfs; ++ char *symbuf = NULL; ++ ++ verify_locked(dentry); ++ ++ old_bindex = bstart; ++ old_bstart = dbstart(dentry); ++ old_bend = dbend(dentry); ++ ++ BUG_ON(new_bindex < 0); ++ BUG_ON(new_bindex >= old_bindex); ++ ++ sb = dir->i_sb; ++ ++ err = is_robranch_super(sb, new_bindex); ++ if (err) ++ goto out; ++ ++ /* Create the directory structure above this dentry. */ ++ new_lower_dentry = create_parents(dir, dentry, name, new_bindex); ++ if (IS_ERR(new_lower_dentry)) { ++ err = PTR_ERR(new_lower_dentry); ++ goto out; ++ } ++ ++ old_lower_dentry = unionfs_lower_dentry_idx(dentry, old_bindex); ++ /* we conditionally dput this old_lower_dentry at end of function */ ++ dget(old_lower_dentry); ++ ++ /* For symlinks, we must read the link before we lock the directory. */ ++ if (S_ISLNK(old_lower_dentry->d_inode->i_mode)) { ++ ++ symbuf = kmalloc(PATH_MAX, GFP_KERNEL); ++ if (unlikely(!symbuf)) { ++ __clear(dentry, old_lower_dentry, ++ old_bstart, old_bend, ++ new_lower_dentry, new_bindex); ++ err = -ENOMEM; ++ goto out_free; ++ } ++ ++ oldfs = get_fs(); ++ set_fs(KERNEL_DS); ++ err = old_lower_dentry->d_inode->i_op->readlink( ++ old_lower_dentry, ++ (char __user *)symbuf, ++ PATH_MAX); ++ set_fs(oldfs); ++ if (err < 0) { ++ __clear(dentry, old_lower_dentry, ++ old_bstart, old_bend, ++ new_lower_dentry, new_bindex); ++ goto out_free; ++ } ++ symbuf[err] = '\0'; ++ } ++ ++ /* Now we lock the parent, and create the object in the new branch. */ ++ new_lower_parent_dentry = lock_parent(new_lower_dentry); ++ ++ /* create the new inode */ ++ err = __copyup_ndentry(old_lower_dentry, new_lower_dentry, ++ new_lower_parent_dentry, symbuf); ++ ++ if (err) { ++ __clear(dentry, old_lower_dentry, ++ old_bstart, old_bend, ++ new_lower_dentry, new_bindex); ++ goto out_unlock; ++ } ++ ++ /* We actually copyup the file here. */ ++ if (S_ISREG(old_lower_dentry->d_inode->i_mode)) ++ err = __copyup_reg_data(dentry, new_lower_dentry, new_bindex, ++ old_lower_dentry, old_bindex, ++ copyup_file, len); ++ if (err) ++ goto out_unlink; ++ ++ /* Set permissions. */ ++ err = copyup_permissions(sb, old_lower_dentry, new_lower_dentry); ++ if (err) ++ goto out_unlink; ++ ++#ifdef CONFIG_UNION_FS_XATTR ++ /* Selinux uses extended attributes for permissions. */ ++ err = copyup_xattrs(old_lower_dentry, new_lower_dentry); ++ if (err) ++ goto out_unlink; ++#endif /* CONFIG_UNION_FS_XATTR */ ++ ++ /* do not allow files getting deleted to be re-interposed */ ++ if (!d_deleted(dentry)) ++ unionfs_reinterpose(dentry); ++ ++ goto out_unlock; ++ ++out_unlink: ++ /* ++ * copyup failed, because we possibly ran out of space or ++ * quota, or something else happened so let's unlink; we don't ++ * really care about the return value of vfs_unlink ++ */ ++ vfs_unlink(new_lower_parent_dentry->d_inode, new_lower_dentry); ++ ++ if (copyup_file) { ++ /* need to close the file */ ++ ++ fput(*copyup_file); ++ branchput(sb, new_bindex); ++ } ++ ++ /* ++ * TODO: should we reset the error to something like -EIO? ++ * ++ * If we don't reset, the user may get some nonsensical errors, but ++ * on the other hand, if we reset to EIO, we guarantee that the user ++ * will get a "confusing" error message. ++ */ ++ ++out_unlock: ++ unlock_dir(new_lower_parent_dentry); ++ ++out_free: ++ /* ++ * If old_lower_dentry was not a file, then we need to dput it. If ++ * it was a file, then it was already dput indirectly by other ++ * functions we call above which operate on regular files. ++ */ ++ if (old_lower_dentry && old_lower_dentry->d_inode && ++ !S_ISREG(old_lower_dentry->d_inode->i_mode)) ++ dput(old_lower_dentry); ++ kfree(symbuf); ++ ++ if (err) { ++ /* ++ * if directory creation succeeded, but inode copyup failed, ++ * then purge new dentries. ++ */ ++ if (dbstart(dentry) < old_bstart && ++ ibstart(dentry->d_inode) > dbstart(dentry)) ++ __clear(dentry, NULL, old_bstart, old_bend, ++ unionfs_lower_dentry(dentry), dbstart(dentry)); ++ goto out; ++ } ++ if (!S_ISDIR(dentry->d_inode->i_mode)) { ++ unionfs_postcopyup_release(dentry); ++ if (!unionfs_lower_inode(dentry->d_inode)) { ++ /* ++ * If we got here, then we copied up to an ++ * unlinked-open file, whose name is .unionfsXXXXX. ++ */ ++ struct inode *inode = new_lower_dentry->d_inode; ++ atomic_inc(&inode->i_count); ++ unionfs_set_lower_inode_idx(dentry->d_inode, ++ ibstart(dentry->d_inode), ++ inode); ++ } ++ } ++ unionfs_postcopyup_setmnt(dentry); ++ /* sync inode times from copied-up inode to our inode */ ++ unionfs_copy_attr_times(dentry->d_inode); ++ unionfs_check_inode(dir); ++ unionfs_check_dentry(dentry); ++out: ++ return err; ++} ++ ++/* ++ * This function creates a copy of a file represented by 'file' which ++ * currently resides in branch 'bstart' to branch 'new_bindex.' The copy ++ * will be named "name". ++ */ ++int copyup_named_file(struct inode *dir, struct file *file, char *name, ++ int bstart, int new_bindex, loff_t len) ++{ ++ int err = 0; ++ struct file *output_file = NULL; ++ ++ err = copyup_dentry(dir, file->f_path.dentry, bstart, new_bindex, ++ name, strlen(name), &output_file, len); ++ if (!err) { ++ fbstart(file) = new_bindex; ++ unionfs_set_lower_file_idx(file, new_bindex, output_file); ++ } ++ ++ return err; ++} ++ ++/* ++ * This function creates a copy of a file represented by 'file' which ++ * currently resides in branch 'bstart' to branch 'new_bindex'. ++ */ ++int copyup_file(struct inode *dir, struct file *file, int bstart, ++ int new_bindex, loff_t len) ++{ ++ int err = 0; ++ struct file *output_file = NULL; ++ struct dentry *dentry = file->f_path.dentry; ++ ++ err = copyup_dentry(dir, dentry, bstart, new_bindex, ++ dentry->d_name.name, dentry->d_name.len, ++ &output_file, len); ++ if (!err) { ++ fbstart(file) = new_bindex; ++ unionfs_set_lower_file_idx(file, new_bindex, output_file); ++ } ++ ++ return err; ++} ++ ++/* purge a dentry's lower-branch states (dput/mntput, etc.) */ ++static void __cleanup_dentry(struct dentry *dentry, int bindex, ++ int old_bstart, int old_bend) ++{ ++ int loop_start; ++ int loop_end; ++ int new_bstart = -1; ++ int new_bend = -1; ++ int i; ++ ++ loop_start = min(old_bstart, bindex); ++ loop_end = max(old_bend, bindex); ++ ++ /* ++ * This loop sets the bstart and bend for the new dentry by ++ * traversing from left to right. It also dputs all negative ++ * dentries except bindex ++ */ ++ for (i = loop_start; i <= loop_end; i++) { ++ if (!unionfs_lower_dentry_idx(dentry, i)) ++ continue; ++ ++ if (i == bindex) { ++ new_bend = i; ++ if (new_bstart < 0) ++ new_bstart = i; ++ continue; ++ } ++ ++ if (!unionfs_lower_dentry_idx(dentry, i)->d_inode) { ++ dput(unionfs_lower_dentry_idx(dentry, i)); ++ unionfs_set_lower_dentry_idx(dentry, i, NULL); ++ ++ unionfs_mntput(dentry, i); ++ unionfs_set_lower_mnt_idx(dentry, i, NULL); ++ } else { ++ if (new_bstart < 0) ++ new_bstart = i; ++ new_bend = i; ++ } ++ } ++ ++ if (new_bstart < 0) ++ new_bstart = bindex; ++ if (new_bend < 0) ++ new_bend = bindex; ++ dbstart(dentry) = new_bstart; ++ dbend(dentry) = new_bend; ++ ++} ++ ++/* set lower inode ptr and update bstart & bend if necessary */ ++static void __set_inode(struct dentry *upper, struct dentry *lower, ++ int bindex) ++{ ++ unionfs_set_lower_inode_idx(upper->d_inode, bindex, ++ igrab(lower->d_inode)); ++ if (likely(ibstart(upper->d_inode) > bindex)) ++ ibstart(upper->d_inode) = bindex; ++ if (likely(ibend(upper->d_inode) < bindex)) ++ ibend(upper->d_inode) = bindex; ++ ++} ++ ++/* set lower dentry ptr and update bstart & bend if necessary */ ++static void __set_dentry(struct dentry *upper, struct dentry *lower, ++ int bindex) ++{ ++ unionfs_set_lower_dentry_idx(upper, bindex, lower); ++ if (likely(dbstart(upper) > bindex)) ++ dbstart(upper) = bindex; ++ if (likely(dbend(upper) < bindex)) ++ dbend(upper) = bindex; ++} ++ ++/* ++ * This function replicates the directory structure up-to given dentry ++ * in the bindex branch. ++ */ ++struct dentry *create_parents(struct inode *dir, struct dentry *dentry, ++ const char *name, int bindex) ++{ ++ int err; ++ struct dentry *child_dentry; ++ struct dentry *parent_dentry; ++ struct dentry *lower_parent_dentry = NULL; ++ struct dentry *lower_dentry = NULL; ++ const char *childname; ++ unsigned int childnamelen; ++ int nr_dentry; ++ int count = 0; ++ int old_bstart; ++ int old_bend; ++ struct dentry **path = NULL; ++ struct super_block *sb; ++ ++ verify_locked(dentry); ++ ++ err = is_robranch_super(dir->i_sb, bindex); ++ if (err) { ++ lower_dentry = ERR_PTR(err); ++ goto out; ++ } ++ ++ old_bstart = dbstart(dentry); ++ old_bend = dbend(dentry); ++ ++ lower_dentry = ERR_PTR(-ENOMEM); ++ ++ /* There is no sense allocating any less than the minimum. */ ++ nr_dentry = 1; ++ path = kmalloc(nr_dentry * sizeof(struct dentry *), GFP_KERNEL); ++ if (unlikely(!path)) ++ goto out; ++ ++ /* assume the negative dentry of unionfs as the parent dentry */ ++ parent_dentry = dentry; ++ ++ /* ++ * This loop finds the first parent that exists in the given branch. ++ * We start building the directory structure from there. At the end ++ * of the loop, the following should hold: ++ * - child_dentry is the first nonexistent child ++ * - parent_dentry is the first existent parent ++ * - path[0] is the = deepest child ++ * - path[count] is the first child to create ++ */ ++ do { ++ child_dentry = parent_dentry; ++ ++ /* find the parent directory dentry in unionfs */ ++ parent_dentry = dget_parent(child_dentry); ++ ++ /* find out the lower_parent_dentry in the given branch */ ++ lower_parent_dentry = ++ unionfs_lower_dentry_idx(parent_dentry, bindex); ++ ++ /* grow path table */ ++ if (count == nr_dentry) { ++ void *p; ++ ++ nr_dentry *= 2; ++ p = krealloc(path, nr_dentry * sizeof(struct dentry *), ++ GFP_KERNEL); ++ if (unlikely(!p)) { ++ lower_dentry = ERR_PTR(-ENOMEM); ++ goto out; ++ } ++ path = p; ++ } ++ ++ /* store the child dentry */ ++ path[count++] = child_dentry; ++ } while (!lower_parent_dentry); ++ count--; ++ ++ sb = dentry->d_sb; ++ ++ /* ++ * This code goes between the begin/end labels and basically ++ * emulates a while(child_dentry != dentry), only cleaner and ++ * shorter than what would be a much longer while loop. ++ */ ++begin: ++ /* get lower parent dir in the current branch */ ++ lower_parent_dentry = unionfs_lower_dentry_idx(parent_dentry, bindex); ++ dput(parent_dentry); ++ ++ /* init the values to lookup */ ++ childname = child_dentry->d_name.name; ++ childnamelen = child_dentry->d_name.len; ++ ++ if (child_dentry != dentry) { ++ /* lookup child in the underlying file system */ ++ lower_dentry = lookup_lck_len(childname, lower_parent_dentry, ++ childnamelen); ++ if (IS_ERR(lower_dentry)) ++ goto out; ++ } else { ++ /* ++ * Is the name a whiteout of the child name ? lookup the ++ * whiteout child in the underlying file system ++ */ ++ lower_dentry = lookup_lck_len(name, lower_parent_dentry, ++ strlen(name)); ++ if (IS_ERR(lower_dentry)) ++ goto out; ++ ++ /* Replace the current dentry (if any) with the new one */ ++ dput(unionfs_lower_dentry_idx(dentry, bindex)); ++ unionfs_set_lower_dentry_idx(dentry, bindex, ++ lower_dentry); ++ ++ __cleanup_dentry(dentry, bindex, old_bstart, old_bend); ++ goto out; ++ } ++ ++ if (lower_dentry->d_inode) { ++ /* ++ * since this already exists we dput to avoid ++ * multiple references on the same dentry ++ */ ++ dput(lower_dentry); ++ } else { ++ struct sioq_args args; ++ ++ /* it's a negative dentry, create a new dir */ ++ lower_parent_dentry = lock_parent(lower_dentry); ++ ++ args.mkdir.parent = lower_parent_dentry->d_inode; ++ args.mkdir.dentry = lower_dentry; ++ args.mkdir.mode = child_dentry->d_inode->i_mode; ++ ++ run_sioq(__unionfs_mkdir, &args); ++ err = args.err; ++ ++ if (!err) ++ err = copyup_permissions(dir->i_sb, child_dentry, ++ lower_dentry); ++ unlock_dir(lower_parent_dentry); ++ if (err) { ++ dput(lower_dentry); ++ lower_dentry = ERR_PTR(err); ++ goto out; ++ } ++ ++ } ++ ++ __set_inode(child_dentry, lower_dentry, bindex); ++ __set_dentry(child_dentry, lower_dentry, bindex); ++ /* ++ * update times of this dentry, but also the parent, because if ++ * we changed, the parent may have changed too. ++ */ ++ fsstack_copy_attr_times(parent_dentry->d_inode, ++ lower_parent_dentry->d_inode); ++ unionfs_copy_attr_times(child_dentry->d_inode); ++ ++ parent_dentry = child_dentry; ++ child_dentry = path[--count]; ++ goto begin; ++out: ++ /* cleanup any leftover locks from the do/while loop above */ ++ if (IS_ERR(lower_dentry)) ++ while (count) ++ dput(path[count--]); ++ kfree(path); ++ return lower_dentry; ++} ++ ++/* ++ * Post-copyup helper to ensure we have valid mnts: set lower mnt of ++ * dentry+parents to the first parent node that has an mnt. ++ */ ++void unionfs_postcopyup_setmnt(struct dentry *dentry) ++{ ++ struct dentry *parent, *hasone; ++ int bindex = dbstart(dentry); ++ ++ if (unionfs_lower_mnt_idx(dentry, bindex)) ++ return; ++ hasone = dentry->d_parent; ++ /* this loop should stop at root dentry */ ++ while (!unionfs_lower_mnt_idx(hasone, bindex)) ++ hasone = hasone->d_parent; ++ parent = dentry; ++ while (!unionfs_lower_mnt_idx(parent, bindex)) { ++ unionfs_set_lower_mnt_idx(parent, bindex, ++ unionfs_mntget(hasone, bindex)); ++ parent = parent->d_parent; ++ } ++} ++ ++/* ++ * Post-copyup helper to release all non-directory source objects of a ++ * copied-up file. Regular files should have only one lower object. ++ */ ++void unionfs_postcopyup_release(struct dentry *dentry) ++{ ++ int bstart, bend; ++ ++ BUG_ON(S_ISDIR(dentry->d_inode->i_mode)); ++ bstart = dbstart(dentry); ++ bend = dbend(dentry); ++ ++ path_put_lowers(dentry, bstart + 1, bend, false); ++ iput_lowers(dentry->d_inode, bstart + 1, bend, false); ++ ++ dbend(dentry) = bstart; ++ ibend(dentry->d_inode) = ibstart(dentry->d_inode) = bstart; ++} +diff --git a/fs/unionfs/debug.c b/fs/unionfs/debug.c +new file mode 100644 +index 0000000..6092e69 +--- /dev/null ++++ b/fs/unionfs/debug.c +@@ -0,0 +1,548 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++ ++/* ++ * Helper debugging functions for maintainers (and for users to report back ++ * useful information back to maintainers) ++ */ ++ ++/* it's always useful to know what part of the code called us */ ++#define PRINT_CALLER(fname, fxn, line) \ ++ do { \ ++ if (!printed_caller) { \ ++ pr_debug("PC:%s:%s:%d\n", (fname), (fxn), (line)); \ ++ printed_caller = 1; \ ++ } \ ++ } while (0) ++ ++/* ++ * __unionfs_check_{inode,dentry,file} perform exhaustive sanity checking on ++ * the fan-out of various Unionfs objects. We check that no lower objects ++ * exist outside the start/end branch range; that all objects within are ++ * non-NULL (with some allowed exceptions); that for every lower file ++ * there's a lower dentry+inode; that the start/end ranges match for all ++ * corresponding lower objects; that open files/symlinks have only one lower ++ * objects, but directories can have several; and more. ++ */ ++void __unionfs_check_inode(const struct inode *inode, ++ const char *fname, const char *fxn, int line) ++{ ++ int bindex; ++ int istart, iend; ++ struct inode *lower_inode; ++ struct super_block *sb; ++ int printed_caller = 0; ++ void *poison_ptr; ++ ++ /* for inodes now */ ++ BUG_ON(!inode); ++ sb = inode->i_sb; ++ istart = ibstart(inode); ++ iend = ibend(inode); ++ /* don't check inode if no lower branches */ ++ if (istart < 0 && iend < 0) ++ return; ++ if (unlikely(istart > iend)) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" Ci0: inode=%p istart/end=%d:%d\n", ++ inode, istart, iend); ++ } ++ if (unlikely((istart == -1 && iend != -1) || ++ (istart != -1 && iend == -1))) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" Ci1: inode=%p istart/end=%d:%d\n", ++ inode, istart, iend); ++ } ++ if (!S_ISDIR(inode->i_mode)) { ++ if (unlikely(iend != istart)) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" Ci2: inode=%p istart=%d iend=%d\n", ++ inode, istart, iend); ++ } ++ } ++ ++ for (bindex = sbstart(sb); bindex < sbmax(sb); bindex++) { ++ if (unlikely(!UNIONFS_I(inode))) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" Ci3: no inode_info %p\n", inode); ++ return; ++ } ++ if (unlikely(!UNIONFS_I(inode)->lower_inodes)) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" Ci4: no lower_inodes %p\n", inode); ++ return; ++ } ++ lower_inode = unionfs_lower_inode_idx(inode, bindex); ++ if (lower_inode) { ++ memset(&poison_ptr, POISON_INUSE, sizeof(void *)); ++ if (unlikely(bindex < istart || bindex > iend)) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" Ci5: inode/linode=%p:%p bindex=%d " ++ "istart/end=%d:%d\n", inode, ++ lower_inode, bindex, istart, iend); ++ } else if (unlikely(lower_inode == poison_ptr)) { ++ /* freed inode! */ ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" Ci6: inode/linode=%p:%p bindex=%d " ++ "istart/end=%d:%d\n", inode, ++ lower_inode, bindex, istart, iend); ++ } ++ continue; ++ } ++ /* if we get here, then lower_inode == NULL */ ++ if (bindex < istart || bindex > iend) ++ continue; ++ /* ++ * directories can have NULL lower inodes in b/t start/end, ++ * but NOT if at the start/end range. ++ */ ++ if (unlikely(S_ISDIR(inode->i_mode) && ++ bindex > istart && bindex < iend)) ++ continue; ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" Ci7: inode/linode=%p:%p " ++ "bindex=%d istart/end=%d:%d\n", ++ inode, lower_inode, bindex, istart, iend); ++ } ++} ++ ++void __unionfs_check_dentry(const struct dentry *dentry, ++ const char *fname, const char *fxn, int line) ++{ ++ int bindex; ++ int dstart, dend, istart, iend; ++ struct dentry *lower_dentry; ++ struct inode *inode, *lower_inode; ++ struct super_block *sb; ++ struct vfsmount *lower_mnt; ++ int printed_caller = 0; ++ void *poison_ptr; ++ ++ BUG_ON(!dentry); ++ sb = dentry->d_sb; ++ inode = dentry->d_inode; ++ dstart = dbstart(dentry); ++ dend = dbend(dentry); ++ /* don't check dentry/mnt if no lower branches */ ++ if (dstart < 0 && dend < 0) ++ goto check_inode; ++ BUG_ON(dstart > dend); ++ ++ if (unlikely((dstart == -1 && dend != -1) || ++ (dstart != -1 && dend == -1))) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CD0: dentry=%p dstart/end=%d:%d\n", ++ dentry, dstart, dend); ++ } ++ /* ++ * check for NULL dentries inside the start/end range, or ++ * non-NULL dentries outside the start/end range. ++ */ ++ for (bindex = sbstart(sb); bindex < sbmax(sb); bindex++) { ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ if (lower_dentry) { ++ if (unlikely(bindex < dstart || bindex > dend)) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CD1: dentry/lower=%p:%p(%p) " ++ "bindex=%d dstart/end=%d:%d\n", ++ dentry, lower_dentry, ++ (lower_dentry ? lower_dentry->d_inode : ++ (void *) -1L), ++ bindex, dstart, dend); ++ } ++ } else { /* lower_dentry == NULL */ ++ if (bindex < dstart || bindex > dend) ++ continue; ++ /* ++ * Directories can have NULL lower inodes in b/t ++ * start/end, but NOT if at the start/end range. ++ * Ignore this rule, however, if this is a NULL ++ * dentry or a deleted dentry. ++ */ ++ if (unlikely(!d_deleted((struct dentry *) dentry) && ++ inode && ++ !(inode && S_ISDIR(inode->i_mode) && ++ bindex > dstart && bindex < dend))) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CD2: dentry/lower=%p:%p(%p) " ++ "bindex=%d dstart/end=%d:%d\n", ++ dentry, lower_dentry, ++ (lower_dentry ? ++ lower_dentry->d_inode : ++ (void *) -1L), ++ bindex, dstart, dend); ++ } ++ } ++ } ++ ++ /* check for vfsmounts same as for dentries */ ++ for (bindex = sbstart(sb); bindex < sbmax(sb); bindex++) { ++ lower_mnt = unionfs_lower_mnt_idx(dentry, bindex); ++ if (lower_mnt) { ++ if (unlikely(bindex < dstart || bindex > dend)) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CM0: dentry/lmnt=%p:%p bindex=%d " ++ "dstart/end=%d:%d\n", dentry, ++ lower_mnt, bindex, dstart, dend); ++ } ++ } else { /* lower_mnt == NULL */ ++ if (bindex < dstart || bindex > dend) ++ continue; ++ /* ++ * Directories can have NULL lower inodes in b/t ++ * start/end, but NOT if at the start/end range. ++ * Ignore this rule, however, if this is a NULL ++ * dentry. ++ */ ++ if (unlikely(inode && ++ !(inode && S_ISDIR(inode->i_mode) && ++ bindex > dstart && bindex < dend))) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CM1: dentry/lmnt=%p:%p " ++ "bindex=%d dstart/end=%d:%d\n", ++ dentry, lower_mnt, bindex, ++ dstart, dend); ++ } ++ } ++ } ++ ++check_inode: ++ /* for inodes now */ ++ if (!inode) ++ return; ++ istart = ibstart(inode); ++ iend = ibend(inode); ++ /* don't check inode if no lower branches */ ++ if (istart < 0 && iend < 0) ++ return; ++ BUG_ON(istart > iend); ++ if (unlikely((istart == -1 && iend != -1) || ++ (istart != -1 && iend == -1))) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CI0: dentry/inode=%p:%p istart/end=%d:%d\n", ++ dentry, inode, istart, iend); ++ } ++ if (unlikely(istart != dstart)) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CI1: dentry/inode=%p:%p istart=%d dstart=%d\n", ++ dentry, inode, istart, dstart); ++ } ++ if (unlikely(iend != dend)) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CI2: dentry/inode=%p:%p iend=%d dend=%d\n", ++ dentry, inode, iend, dend); ++ } ++ ++ if (!S_ISDIR(inode->i_mode)) { ++ if (unlikely(dend != dstart)) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CI3: dentry/inode=%p:%p dstart=%d dend=%d\n", ++ dentry, inode, dstart, dend); ++ } ++ if (unlikely(iend != istart)) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CI4: dentry/inode=%p:%p istart=%d iend=%d\n", ++ dentry, inode, istart, iend); ++ } ++ } ++ ++ for (bindex = sbstart(sb); bindex < sbmax(sb); bindex++) { ++ lower_inode = unionfs_lower_inode_idx(inode, bindex); ++ if (lower_inode) { ++ memset(&poison_ptr, POISON_INUSE, sizeof(void *)); ++ if (unlikely(bindex < istart || bindex > iend)) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CI5: dentry/linode=%p:%p bindex=%d " ++ "istart/end=%d:%d\n", dentry, ++ lower_inode, bindex, istart, iend); ++ } else if (unlikely(lower_inode == poison_ptr)) { ++ /* freed inode! */ ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CI6: dentry/linode=%p:%p bindex=%d " ++ "istart/end=%d:%d\n", dentry, ++ lower_inode, bindex, istart, iend); ++ } ++ continue; ++ } ++ /* if we get here, then lower_inode == NULL */ ++ if (bindex < istart || bindex > iend) ++ continue; ++ /* ++ * directories can have NULL lower inodes in b/t start/end, ++ * but NOT if at the start/end range. ++ */ ++ if (unlikely(S_ISDIR(inode->i_mode) && ++ bindex > istart && bindex < iend)) ++ continue; ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CI7: dentry/linode=%p:%p " ++ "bindex=%d istart/end=%d:%d\n", ++ dentry, lower_inode, bindex, istart, iend); ++ } ++ ++ /* ++ * If it's a directory, then intermediate objects b/t start/end can ++ * be NULL. But, check that all three are NULL: lower dentry, mnt, ++ * and inode. ++ */ ++ if (dstart >= 0 && dend >= 0 && S_ISDIR(inode->i_mode)) ++ for (bindex = dstart+1; bindex < dend; bindex++) { ++ lower_inode = unionfs_lower_inode_idx(inode, bindex); ++ lower_dentry = unionfs_lower_dentry_idx(dentry, ++ bindex); ++ lower_mnt = unionfs_lower_mnt_idx(dentry, bindex); ++ if (unlikely(!((lower_inode && lower_dentry && ++ lower_mnt) || ++ (!lower_inode && ++ !lower_dentry && !lower_mnt)))) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" Cx: lmnt/ldentry/linode=%p:%p:%p " ++ "bindex=%d dstart/end=%d:%d\n", ++ lower_mnt, lower_dentry, lower_inode, ++ bindex, dstart, dend); ++ } ++ } ++ /* check if lower inode is newer than upper one (it shouldn't) */ ++ if (unlikely(is_newer_lower(dentry) && !is_negative_lower(dentry))) { ++ PRINT_CALLER(fname, fxn, line); ++ for (bindex = ibstart(inode); bindex <= ibend(inode); ++ bindex++) { ++ lower_inode = unionfs_lower_inode_idx(inode, bindex); ++ if (unlikely(!lower_inode)) ++ continue; ++ pr_debug(" CI8: bindex=%d mtime/lmtime=%lu.%lu/%lu.%lu " ++ "ctime/lctime=%lu.%lu/%lu.%lu\n", ++ bindex, ++ inode->i_mtime.tv_sec, ++ inode->i_mtime.tv_nsec, ++ lower_inode->i_mtime.tv_sec, ++ lower_inode->i_mtime.tv_nsec, ++ inode->i_ctime.tv_sec, ++ inode->i_ctime.tv_nsec, ++ lower_inode->i_ctime.tv_sec, ++ lower_inode->i_ctime.tv_nsec); ++ } ++ } ++} ++ ++void __unionfs_check_file(const struct file *file, ++ const char *fname, const char *fxn, int line) ++{ ++ int bindex; ++ int dstart, dend, fstart, fend; ++ struct dentry *dentry; ++ struct file *lower_file; ++ struct inode *inode; ++ struct super_block *sb; ++ int printed_caller = 0; ++ ++ BUG_ON(!file); ++ dentry = file->f_path.dentry; ++ sb = dentry->d_sb; ++ dstart = dbstart(dentry); ++ dend = dbend(dentry); ++ BUG_ON(dstart > dend); ++ fstart = fbstart(file); ++ fend = fbend(file); ++ BUG_ON(fstart > fend); ++ ++ if (unlikely((fstart == -1 && fend != -1) || ++ (fstart != -1 && fend == -1))) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CF0: file/dentry=%p:%p fstart/end=%d:%d\n", ++ file, dentry, fstart, fend); ++ } ++ if (unlikely(fstart != dstart)) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CF1: file/dentry=%p:%p fstart=%d dstart=%d\n", ++ file, dentry, fstart, dstart); ++ } ++ if (unlikely(fend != dend)) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CF2: file/dentry=%p:%p fend=%d dend=%d\n", ++ file, dentry, fend, dend); ++ } ++ inode = dentry->d_inode; ++ if (!S_ISDIR(inode->i_mode)) { ++ if (unlikely(fend != fstart)) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CF3: file/inode=%p:%p fstart=%d fend=%d\n", ++ file, inode, fstart, fend); ++ } ++ if (unlikely(dend != dstart)) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CF4: file/dentry=%p:%p dstart=%d dend=%d\n", ++ file, dentry, dstart, dend); ++ } ++ } ++ ++ /* ++ * check for NULL dentries inside the start/end range, or ++ * non-NULL dentries outside the start/end range. ++ */ ++ for (bindex = sbstart(sb); bindex < sbmax(sb); bindex++) { ++ lower_file = unionfs_lower_file_idx(file, bindex); ++ if (lower_file) { ++ if (unlikely(bindex < fstart || bindex > fend)) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CF5: file/lower=%p:%p bindex=%d " ++ "fstart/end=%d:%d\n", file, ++ lower_file, bindex, fstart, fend); ++ } ++ } else { /* lower_file == NULL */ ++ if (bindex >= fstart && bindex <= fend) { ++ /* ++ * directories can have NULL lower inodes in ++ * b/t start/end, but NOT if at the ++ * start/end range. ++ */ ++ if (unlikely(!(S_ISDIR(inode->i_mode) && ++ bindex > fstart && ++ bindex < fend))) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CF6: file/lower=%p:%p " ++ "bindex=%d fstart/end=%d:%d\n", ++ file, lower_file, bindex, ++ fstart, fend); ++ } ++ } ++ } ++ } ++ ++ __unionfs_check_dentry(dentry, fname, fxn, line); ++} ++ ++void __unionfs_check_nd(const struct nameidata *nd, ++ const char *fname, const char *fxn, int line) ++{ ++ struct file *file; ++ int printed_caller = 0; ++ ++ if (unlikely(!nd)) ++ return; ++ if (nd->flags & LOOKUP_OPEN) { ++ file = nd->intent.open.file; ++ if (unlikely(file->f_path.dentry && ++ strcmp(file->f_path.dentry->d_sb->s_type->name, ++ UNIONFS_NAME))) { ++ PRINT_CALLER(fname, fxn, line); ++ pr_debug(" CND1: lower_file of type %s\n", ++ file->f_path.dentry->d_sb->s_type->name); ++ } ++ } ++} ++ ++static unsigned int __mnt_get_count(struct vfsmount *mnt) ++{ ++#ifdef CONFIG_SMP ++ unsigned int count = 0; ++ int cpu; ++ ++ for_each_possible_cpu(cpu) { ++ count += per_cpu_ptr(mnt->mnt_pcp, cpu)->mnt_count; ++ } ++ ++ return count; ++#else ++ return mnt->mnt_count; ++#endif ++} ++ ++/* useful to track vfsmount leaks that could cause EBUSY on unmount */ ++void __show_branch_counts(const struct super_block *sb, ++ const char *file, const char *fxn, int line) ++{ ++ int i; ++ struct vfsmount *mnt; ++ ++ pr_debug("BC:"); ++ for (i = 0; i < sbmax(sb); i++) { ++ if (likely(sb->s_root)) ++ mnt = UNIONFS_D(sb->s_root)->lower_paths[i].mnt; ++ else ++ mnt = NULL; ++ printk(KERN_CONT "%d:", ++ (mnt ? __mnt_get_count(mnt) : -99)); ++ } ++ printk(KERN_CONT "%s:%s:%d\n", file, fxn, line); ++} ++ ++void __show_inode_times(const struct inode *inode, ++ const char *file, const char *fxn, int line) ++{ ++ struct inode *lower_inode; ++ int bindex; ++ ++ for (bindex = ibstart(inode); bindex <= ibend(inode); bindex++) { ++ lower_inode = unionfs_lower_inode_idx(inode, bindex); ++ if (unlikely(!lower_inode)) ++ continue; ++ pr_debug("IT(%lu:%d): %s:%s:%d " ++ "um=%lu/%lu lm=%lu/%lu uc=%lu/%lu lc=%lu/%lu\n", ++ inode->i_ino, bindex, ++ file, fxn, line, ++ inode->i_mtime.tv_sec, inode->i_mtime.tv_nsec, ++ lower_inode->i_mtime.tv_sec, ++ lower_inode->i_mtime.tv_nsec, ++ inode->i_ctime.tv_sec, inode->i_ctime.tv_nsec, ++ lower_inode->i_ctime.tv_sec, ++ lower_inode->i_ctime.tv_nsec); ++ } ++} ++ ++void __show_dinode_times(const struct dentry *dentry, ++ const char *file, const char *fxn, int line) ++{ ++ struct inode *inode = dentry->d_inode; ++ struct inode *lower_inode; ++ int bindex; ++ ++ for (bindex = ibstart(inode); bindex <= ibend(inode); bindex++) { ++ lower_inode = unionfs_lower_inode_idx(inode, bindex); ++ if (!lower_inode) ++ continue; ++ pr_debug("DT(%s:%lu:%d): %s:%s:%d " ++ "um=%lu/%lu lm=%lu/%lu uc=%lu/%lu lc=%lu/%lu\n", ++ dentry->d_name.name, inode->i_ino, bindex, ++ file, fxn, line, ++ inode->i_mtime.tv_sec, inode->i_mtime.tv_nsec, ++ lower_inode->i_mtime.tv_sec, ++ lower_inode->i_mtime.tv_nsec, ++ inode->i_ctime.tv_sec, inode->i_ctime.tv_nsec, ++ lower_inode->i_ctime.tv_sec, ++ lower_inode->i_ctime.tv_nsec); ++ } ++} ++ ++void __show_inode_counts(const struct inode *inode, ++ const char *file, const char *fxn, int line) ++{ ++ struct inode *lower_inode; ++ int bindex; ++ ++ if (unlikely(!inode)) { ++ pr_debug("SiC: Null inode\n"); ++ return; ++ } ++ for (bindex = sbstart(inode->i_sb); bindex <= sbend(inode->i_sb); ++ bindex++) { ++ lower_inode = unionfs_lower_inode_idx(inode, bindex); ++ if (unlikely(!lower_inode)) ++ continue; ++ pr_debug("SIC(%lu:%d:%d): lc=%d %s:%s:%d\n", ++ inode->i_ino, bindex, ++ atomic_read(&(inode)->i_count), ++ atomic_read(&(lower_inode)->i_count), ++ file, fxn, line); ++ } ++} +diff --git a/fs/unionfs/dentry.c b/fs/unionfs/dentry.c +new file mode 100644 +index 0000000..c0205a4 +--- /dev/null ++++ b/fs/unionfs/dentry.c +@@ -0,0 +1,406 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005-2006 Junjiro Okajima ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++ ++bool is_negative_lower(const struct dentry *dentry) ++{ ++ int bindex; ++ struct dentry *lower_dentry; ++ ++ BUG_ON(!dentry); ++ /* cache coherency: check if file was deleted on lower branch */ ++ if (dbstart(dentry) < 0) ++ return true; ++ for (bindex = dbstart(dentry); bindex <= dbend(dentry); bindex++) { ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ /* unhashed (i.e., unlinked) lower dentries don't count */ ++ if (lower_dentry && lower_dentry->d_inode && ++ !d_deleted(lower_dentry) && ++ !(lower_dentry->d_flags & DCACHE_NFSFS_RENAMED)) ++ return false; ++ } ++ return true; ++} ++ ++static inline void __dput_lowers(struct dentry *dentry, int start, int end) ++{ ++ struct dentry *lower_dentry; ++ int bindex; ++ ++ if (start < 0) ++ return; ++ for (bindex = start; bindex <= end; bindex++) { ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ if (!lower_dentry) ++ continue; ++ unionfs_set_lower_dentry_idx(dentry, bindex, NULL); ++ dput(lower_dentry); ++ } ++} ++ ++/* ++ * Purge and invalidate as many data pages of a unionfs inode. This is ++ * called when the lower inode has changed, and we want to force processes ++ * to re-get the new data. ++ */ ++static inline void purge_inode_data(struct inode *inode) ++{ ++ /* remove all non-private mappings */ ++ unmap_mapping_range(inode->i_mapping, 0, 0, 0); ++ /* invalidate as many pages as possible */ ++ invalidate_mapping_pages(inode->i_mapping, 0, -1); ++ /* ++ * Don't try to truncate_inode_pages here, because this could lead ++ * to a deadlock between some of address_space ops and dentry ++ * revalidation: the address space op is invoked with a lock on our ++ * own page, and truncate_inode_pages will block on locked pages. ++ */ ++} ++ ++/* ++ * Revalidate a single file/symlink/special dentry. Assume that info nodes ++ * of the @dentry and its @parent are locked. Assume parent is valid, ++ * otherwise return false (and let's hope the VFS will try to re-lookup this ++ * dentry). Returns true if valid, false otherwise. ++ */ ++bool __unionfs_d_revalidate(struct dentry *dentry, struct dentry *parent, ++ bool willwrite) ++{ ++ bool valid = true; /* default is valid */ ++ struct dentry *lower_dentry; ++ struct dentry *result; ++ int bindex, bstart, bend; ++ int sbgen, dgen, pdgen; ++ int positive = 0; ++ int interpose_flag; ++ ++ verify_locked(dentry); ++ verify_locked(parent); ++ ++ /* if the dentry is unhashed, do NOT revalidate */ ++ if (d_deleted(dentry)) ++ goto out; ++ ++ dgen = atomic_read(&UNIONFS_D(dentry)->generation); ++ ++ if (is_newer_lower(dentry)) { ++ /* root dentry is always valid */ ++ if (IS_ROOT(dentry)) { ++ unionfs_copy_attr_times(dentry->d_inode); ++ } else { ++ /* ++ * reset generation number to zero, guaranteed to be ++ * "old" ++ */ ++ dgen = 0; ++ atomic_set(&UNIONFS_D(dentry)->generation, dgen); ++ } ++ if (!willwrite) ++ purge_inode_data(dentry->d_inode); ++ } ++ ++ sbgen = atomic_read(&UNIONFS_SB(dentry->d_sb)->generation); ++ ++ BUG_ON(dbstart(dentry) == -1); ++ if (dentry->d_inode) ++ positive = 1; ++ ++ /* if our dentry is valid, then validate all lower ones */ ++ if (sbgen == dgen) ++ goto validate_lowers; ++ ++ /* The root entry should always be valid */ ++ BUG_ON(IS_ROOT(dentry)); ++ ++ /* We can't work correctly if our parent isn't valid. */ ++ pdgen = atomic_read(&UNIONFS_D(parent)->generation); ++ ++ /* Free the pointers for our inodes and this dentry. */ ++ path_put_lowers_all(dentry, false); ++ ++ interpose_flag = INTERPOSE_REVAL_NEG; ++ if (positive) { ++ interpose_flag = INTERPOSE_REVAL; ++ iput_lowers_all(dentry->d_inode, true); ++ } ++ ++ if (realloc_dentry_private_data(dentry) != 0) { ++ valid = false; ++ goto out; ++ } ++ ++ result = unionfs_lookup_full(dentry, parent, interpose_flag); ++ if (result) { ++ if (IS_ERR(result)) { ++ valid = false; ++ goto out; ++ } ++ /* ++ * current unionfs_lookup_backend() doesn't return ++ * a valid dentry ++ */ ++ dput(dentry); ++ dentry = result; ++ } ++ ++ if (unlikely(positive && is_negative_lower(dentry))) { ++ /* call make_bad_inode here ? */ ++ d_drop(dentry); ++ valid = false; ++ goto out; ++ } ++ ++ /* ++ * if we got here then we have revalidated our dentry and all lower ++ * ones, so we can return safely. ++ */ ++ if (!valid) /* lower dentry revalidation failed */ ++ goto out; ++ ++ /* ++ * If the parent's gen no. matches the superblock's gen no., then ++ * we can update our denty's gen no. If they didn't match, then it ++ * was OK to revalidate this dentry with a stale parent, but we'll ++ * purposely not update our dentry's gen no. (so it can be redone); ++ * and, we'll mark our parent dentry as invalid so it'll force it ++ * (and our dentry) to be revalidated. ++ */ ++ if (pdgen == sbgen) ++ atomic_set(&UNIONFS_D(dentry)->generation, sbgen); ++ goto out; ++ ++validate_lowers: ++ ++ /* The revalidation must occur across all branches */ ++ bstart = dbstart(dentry); ++ bend = dbend(dentry); ++ BUG_ON(bstart == -1); ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ int err; ++ struct nameidata lower_nd; ++ ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ if (!lower_dentry || !lower_dentry->d_op ++ || !lower_dentry->d_op->d_revalidate) ++ continue; ++ /* ++ * Don't pass nameidata to lower file system, because we ++ * don't want an arbitrary lower file being opened or ++ * returned to us: it may be useless to us because of the ++ * fanout nature of unionfs (cf. file/directory open-file ++ * invariants). We will open lower files as and when needed ++ * later on. ++ */ ++ err = init_lower_nd(&lower_nd, LOOKUP_OPEN); ++ if (unlikely(err < 0)) { ++ valid = false; ++ break; ++ } ++ if (!lower_dentry->d_op->d_revalidate(lower_dentry, &lower_nd)) ++ valid = false; ++ release_lower_nd(&lower_nd, err); ++ } ++ ++ if (!dentry->d_inode || ++ ibstart(dentry->d_inode) < 0 || ++ ibend(dentry->d_inode) < 0) { ++ valid = false; ++ goto out; ++ } ++ ++ if (valid) { ++ /* ++ * If we get here, and we copy the meta-data from the lower ++ * inode to our inode, then it is vital that we have already ++ * purged all unionfs-level file data. We do that in the ++ * caller (__unionfs_d_revalidate) by calling ++ * purge_inode_data. ++ */ ++ unionfs_copy_attr_all(dentry->d_inode, ++ unionfs_lower_inode(dentry->d_inode)); ++ fsstack_copy_inode_size(dentry->d_inode, ++ unionfs_lower_inode(dentry->d_inode)); ++ } ++ ++out: ++ return valid; ++} ++ ++/* ++ * Determine if the lower inode objects have changed from below the unionfs ++ * inode. Return true if changed, false otherwise. ++ * ++ * We check if the mtime or ctime have changed. However, the inode times ++ * can be changed by anyone without much protection, including ++ * asynchronously. This can sometimes cause unionfs to find that the lower ++ * file system doesn't change its inode times quick enough, resulting in a ++ * false positive indication (which is harmless, it just makes unionfs do ++ * extra work in re-validating the objects). To minimize the chances of ++ * these situations, we still consider such small time changes valid, but we ++ * don't print debugging messages unless the time changes are greater than ++ * UNIONFS_MIN_CC_TIME (which defaults to 3 seconds, as with NFS's acregmin) ++ * because significant changes are more likely due to users manually ++ * touching lower files. ++ */ ++bool is_newer_lower(const struct dentry *dentry) ++{ ++ int bindex; ++ struct inode *inode; ++ struct inode *lower_inode; ++ ++ /* ignore if we're called on semi-initialized dentries/inodes */ ++ if (!dentry || !UNIONFS_D(dentry)) ++ return false; ++ inode = dentry->d_inode; ++ if (!inode || !UNIONFS_I(inode)->lower_inodes || ++ ibstart(inode) < 0 || ibend(inode) < 0) ++ return false; ++ ++ for (bindex = ibstart(inode); bindex <= ibend(inode); bindex++) { ++ lower_inode = unionfs_lower_inode_idx(inode, bindex); ++ if (!lower_inode) ++ continue; ++ ++ /* check if mtime/ctime have changed */ ++ if (unlikely(timespec_compare(&inode->i_mtime, ++ &lower_inode->i_mtime) < 0)) { ++ if ((lower_inode->i_mtime.tv_sec - ++ inode->i_mtime.tv_sec) > UNIONFS_MIN_CC_TIME) { ++ pr_info("unionfs: new lower inode mtime " ++ "(bindex=%d, name=%s)\n", bindex, ++ dentry->d_name.name); ++ show_dinode_times(dentry); ++ } ++ return true; ++ } ++ if (unlikely(timespec_compare(&inode->i_ctime, ++ &lower_inode->i_ctime) < 0)) { ++ if ((lower_inode->i_ctime.tv_sec - ++ inode->i_ctime.tv_sec) > UNIONFS_MIN_CC_TIME) { ++ pr_info("unionfs: new lower inode ctime " ++ "(bindex=%d, name=%s)\n", bindex, ++ dentry->d_name.name); ++ show_dinode_times(dentry); ++ } ++ return true; ++ } ++ } ++ ++ /* ++ * Last check: if this is a positive dentry, but somehow all lower ++ * dentries are negative or unhashed, then this dentry needs to be ++ * revalidated, because someone probably deleted the objects from ++ * the lower branches directly. ++ */ ++ if (is_negative_lower(dentry)) ++ return true; ++ ++ return false; /* default: lower is not newer */ ++} ++ ++static int unionfs_d_revalidate(struct dentry *dentry, ++ struct nameidata *nd_unused) ++{ ++ bool valid = true; ++ int err = 1; /* 1 means valid for the VFS */ ++ struct dentry *parent; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ valid = __unionfs_d_revalidate(dentry, parent, false); ++ if (valid) { ++ unionfs_postcopyup_setmnt(dentry); ++ unionfs_check_dentry(dentry); ++ } else { ++ d_drop(dentry); ++ err = valid; ++ } ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ ++ return err; ++} ++ ++static void unionfs_d_release(struct dentry *dentry) ++{ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ if (unlikely(!UNIONFS_D(dentry))) ++ goto out; /* skip if no lower branches */ ++ /* must lock our branch configuration here */ ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ unionfs_check_dentry(dentry); ++ /* this could be a negative dentry, so check first */ ++ if (dbstart(dentry) < 0) { ++ unionfs_unlock_dentry(dentry); ++ goto out; /* due to a (normal) failed lookup */ ++ } ++ ++ /* Release all the lower dentries */ ++ path_put_lowers_all(dentry, true); ++ ++ unionfs_unlock_dentry(dentry); ++ ++out: ++ free_dentry_private_data(dentry); ++ unionfs_read_unlock(dentry->d_sb); ++ return; ++} ++ ++/* ++ * Called when we're removing the last reference to our dentry. So we ++ * should drop all lower references too. ++ */ ++static void unionfs_d_iput(struct dentry *dentry, struct inode *inode) ++{ ++ int rc; ++ ++ BUG_ON(!dentry); ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ if (!UNIONFS_D(dentry) || dbstart(dentry) < 0) ++ goto drop_lower_inodes; ++ path_put_lowers_all(dentry, false); ++ ++drop_lower_inodes: ++ rc = atomic_read(&inode->i_count); ++ if (rc == 1 && inode->i_nlink == 1 && ibstart(inode) >= 0) { ++ /* see Documentation/filesystems/unionfs/issues.txt */ ++ lockdep_off(); ++ iput(unionfs_lower_inode(inode)); ++ lockdep_on(); ++ unionfs_set_lower_inode(inode, NULL); ++ /* XXX: may need to set start/end to -1? */ ++ } ++ ++ iput(inode); ++ ++ unionfs_unlock_dentry(dentry); ++ unionfs_read_unlock(dentry->d_sb); ++} ++ ++struct dentry_operations unionfs_dops = { ++ .d_revalidate = unionfs_d_revalidate, ++ .d_release = unionfs_d_release, ++ .d_iput = unionfs_d_iput, ++}; +diff --git a/fs/unionfs/dirfops.c b/fs/unionfs/dirfops.c +new file mode 100644 +index 0000000..72a9c1a +--- /dev/null ++++ b/fs/unionfs/dirfops.c +@@ -0,0 +1,302 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005-2006 Junjiro Okajima ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++ ++/* Make sure our rdstate is playing by the rules. */ ++static void verify_rdstate_offset(struct unionfs_dir_state *rdstate) ++{ ++ BUG_ON(rdstate->offset >= DIREOF); ++ BUG_ON(rdstate->cookie >= MAXRDCOOKIE); ++} ++ ++struct unionfs_getdents_callback { ++ struct unionfs_dir_state *rdstate; ++ void *dirent; ++ int entries_written; ++ int filldir_called; ++ int filldir_error; ++ filldir_t filldir; ++ struct super_block *sb; ++}; ++ ++/* based on generic filldir in fs/readir.c */ ++static int unionfs_filldir(void *dirent, const char *oname, int namelen, ++ loff_t offset, u64 ino, unsigned int d_type) ++{ ++ struct unionfs_getdents_callback *buf = dirent; ++ struct filldir_node *found = NULL; ++ int err = 0; ++ int is_whiteout; ++ char *name = (char *) oname; ++ ++ buf->filldir_called++; ++ ++ is_whiteout = is_whiteout_name(&name, &namelen); ++ ++ found = find_filldir_node(buf->rdstate, name, namelen, is_whiteout); ++ ++ if (found) { ++ /* ++ * If we had non-whiteout entry in dir cache, then mark it ++ * as a whiteout and but leave it in the dir cache. ++ */ ++ if (is_whiteout && !found->whiteout) ++ found->whiteout = is_whiteout; ++ goto out; ++ } ++ ++ /* if 'name' isn't a whiteout, filldir it. */ ++ if (!is_whiteout) { ++ off_t pos = rdstate2offset(buf->rdstate); ++ u64 unionfs_ino = ino; ++ ++ err = buf->filldir(buf->dirent, name, namelen, pos, ++ unionfs_ino, d_type); ++ buf->rdstate->offset++; ++ verify_rdstate_offset(buf->rdstate); ++ } ++ /* ++ * If we did fill it, stuff it in our hash, otherwise return an ++ * error. ++ */ ++ if (err) { ++ buf->filldir_error = err; ++ goto out; ++ } ++ buf->entries_written++; ++ err = add_filldir_node(buf->rdstate, name, namelen, ++ buf->rdstate->bindex, is_whiteout); ++ if (err) ++ buf->filldir_error = err; ++ ++out: ++ return err; ++} ++ ++static int unionfs_readdir(struct file *file, void *dirent, filldir_t filldir) ++{ ++ int err = 0; ++ struct file *lower_file = NULL; ++ struct dentry *dentry = file->f_path.dentry; ++ struct dentry *parent; ++ struct inode *inode = NULL; ++ struct unionfs_getdents_callback buf; ++ struct unionfs_dir_state *uds; ++ int bend; ++ loff_t offset; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_PARENT); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ err = unionfs_file_revalidate(file, parent, false); ++ if (unlikely(err)) ++ goto out; ++ ++ inode = dentry->d_inode; ++ ++ uds = UNIONFS_F(file)->rdstate; ++ if (!uds) { ++ if (file->f_pos == DIREOF) { ++ goto out; ++ } else if (file->f_pos > 0) { ++ uds = find_rdstate(inode, file->f_pos); ++ if (unlikely(!uds)) { ++ err = -ESTALE; ++ goto out; ++ } ++ UNIONFS_F(file)->rdstate = uds; ++ } else { ++ init_rdstate(file); ++ uds = UNIONFS_F(file)->rdstate; ++ } ++ } ++ bend = fbend(file); ++ ++ while (uds->bindex <= bend) { ++ lower_file = unionfs_lower_file_idx(file, uds->bindex); ++ if (!lower_file) { ++ uds->bindex++; ++ uds->dirpos = 0; ++ continue; ++ } ++ ++ /* prepare callback buffer */ ++ buf.filldir_called = 0; ++ buf.filldir_error = 0; ++ buf.entries_written = 0; ++ buf.dirent = dirent; ++ buf.filldir = filldir; ++ buf.rdstate = uds; ++ buf.sb = inode->i_sb; ++ ++ /* Read starting from where we last left off. */ ++ offset = vfs_llseek(lower_file, uds->dirpos, SEEK_SET); ++ if (offset < 0) { ++ err = offset; ++ goto out; ++ } ++ err = vfs_readdir(lower_file, unionfs_filldir, &buf); ++ ++ /* Save the position for when we continue. */ ++ offset = vfs_llseek(lower_file, 0, SEEK_CUR); ++ if (offset < 0) { ++ err = offset; ++ goto out; ++ } ++ uds->dirpos = offset; ++ ++ /* Copy the atime. */ ++ fsstack_copy_attr_atime(inode, ++ lower_file->f_path.dentry->d_inode); ++ ++ if (err < 0) ++ goto out; ++ ++ if (buf.filldir_error) ++ break; ++ ++ if (!buf.entries_written) { ++ uds->bindex++; ++ uds->dirpos = 0; ++ } ++ } ++ ++ if (!buf.filldir_error && uds->bindex >= bend) { ++ /* Save the number of hash entries for next time. */ ++ UNIONFS_I(inode)->hashsize = uds->hashentries; ++ free_rdstate(uds); ++ UNIONFS_F(file)->rdstate = NULL; ++ file->f_pos = DIREOF; ++ } else { ++ file->f_pos = rdstate2offset(uds); ++ } ++ ++out: ++ if (!err) ++ unionfs_check_file(file); ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} ++ ++/* ++ * This is not meant to be a generic repositioning function. If you do ++ * things that aren't supported, then we return EINVAL. ++ * ++ * What is allowed: ++ * (1) seeking to the same position that you are currently at ++ * This really has no effect, but returns where you are. ++ * (2) seeking to the beginning of the file ++ * This throws out all state, and lets you begin again. ++ */ ++static loff_t unionfs_dir_llseek(struct file *file, loff_t offset, int origin) ++{ ++ struct unionfs_dir_state *rdstate; ++ struct dentry *dentry = file->f_path.dentry; ++ struct dentry *parent; ++ loff_t err; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_PARENT); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ err = unionfs_file_revalidate(file, parent, false); ++ if (unlikely(err)) ++ goto out; ++ ++ rdstate = UNIONFS_F(file)->rdstate; ++ ++ /* ++ * we let users seek to their current position, but not anywhere ++ * else. ++ */ ++ if (!offset) { ++ switch (origin) { ++ case SEEK_SET: ++ if (rdstate) { ++ free_rdstate(rdstate); ++ UNIONFS_F(file)->rdstate = NULL; ++ } ++ init_rdstate(file); ++ err = 0; ++ break; ++ case SEEK_CUR: ++ err = file->f_pos; ++ break; ++ case SEEK_END: ++ /* Unsupported, because we would break everything. */ ++ err = -EINVAL; ++ break; ++ } ++ } else { ++ switch (origin) { ++ case SEEK_SET: ++ if (rdstate) { ++ if (offset == rdstate2offset(rdstate)) ++ err = offset; ++ else if (file->f_pos == DIREOF) ++ err = DIREOF; ++ else ++ err = -EINVAL; ++ } else { ++ struct inode *inode; ++ inode = dentry->d_inode; ++ rdstate = find_rdstate(inode, offset); ++ if (rdstate) { ++ UNIONFS_F(file)->rdstate = rdstate; ++ err = rdstate->offset; ++ } else { ++ err = -EINVAL; ++ } ++ } ++ break; ++ case SEEK_CUR: ++ case SEEK_END: ++ /* Unsupported, because we would break everything. */ ++ err = -EINVAL; ++ break; ++ } ++ } ++ ++out: ++ if (!err) ++ unionfs_check_file(file); ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} ++ ++/* ++ * Trimmed directory options, we shouldn't pass everything down since ++ * we don't want to operate on partial directories. ++ */ ++struct file_operations unionfs_dir_fops = { ++ .llseek = unionfs_dir_llseek, ++ .read = generic_read_dir, ++ .readdir = unionfs_readdir, ++ .unlocked_ioctl = unionfs_ioctl, ++ .open = unionfs_open, ++ .release = unionfs_file_release, ++ .flush = unionfs_flush, ++ .fsync = unionfs_fsync, ++ .fasync = unionfs_fasync, ++}; +diff --git a/fs/unionfs/dirhelper.c b/fs/unionfs/dirhelper.c +new file mode 100644 +index 0000000..62ec9af +--- /dev/null ++++ b/fs/unionfs/dirhelper.c +@@ -0,0 +1,158 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005-2006 Junjiro Okajima ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++ ++#define RD_NONE 0 ++#define RD_CHECK_EMPTY 1 ++/* The callback structure for check_empty. */ ++struct unionfs_rdutil_callback { ++ int err; ++ int filldir_called; ++ struct unionfs_dir_state *rdstate; ++ int mode; ++}; ++ ++/* This filldir function makes sure only whiteouts exist within a directory. */ ++static int readdir_util_callback(void *dirent, const char *oname, int namelen, ++ loff_t offset, u64 ino, unsigned int d_type) ++{ ++ int err = 0; ++ struct unionfs_rdutil_callback *buf = dirent; ++ int is_whiteout; ++ struct filldir_node *found; ++ char *name = (char *) oname; ++ ++ buf->filldir_called = 1; ++ ++ if (name[0] == '.' && (namelen == 1 || ++ (name[1] == '.' && namelen == 2))) ++ goto out; ++ ++ is_whiteout = is_whiteout_name(&name, &namelen); ++ ++ found = find_filldir_node(buf->rdstate, name, namelen, is_whiteout); ++ /* If it was found in the table there was a previous whiteout. */ ++ if (found) ++ goto out; ++ ++ /* ++ * if it wasn't found and isn't a whiteout, the directory isn't ++ * empty. ++ */ ++ err = -ENOTEMPTY; ++ if ((buf->mode == RD_CHECK_EMPTY) && !is_whiteout) ++ goto out; ++ ++ err = add_filldir_node(buf->rdstate, name, namelen, ++ buf->rdstate->bindex, is_whiteout); ++ ++out: ++ buf->err = err; ++ return err; ++} ++ ++/* Is a directory logically empty? */ ++int check_empty(struct dentry *dentry, struct dentry *parent, ++ struct unionfs_dir_state **namelist) ++{ ++ int err = 0; ++ struct dentry *lower_dentry = NULL; ++ struct vfsmount *mnt; ++ struct super_block *sb; ++ struct file *lower_file; ++ struct unionfs_rdutil_callback *buf = NULL; ++ int bindex, bstart, bend, bopaque; ++ ++ sb = dentry->d_sb; ++ ++ ++ BUG_ON(!S_ISDIR(dentry->d_inode->i_mode)); ++ ++ err = unionfs_partial_lookup(dentry, parent); ++ if (err) ++ goto out; ++ ++ bstart = dbstart(dentry); ++ bend = dbend(dentry); ++ bopaque = dbopaque(dentry); ++ if (0 <= bopaque && bopaque < bend) ++ bend = bopaque; ++ ++ buf = kmalloc(sizeof(struct unionfs_rdutil_callback), GFP_KERNEL); ++ if (unlikely(!buf)) { ++ err = -ENOMEM; ++ goto out; ++ } ++ buf->err = 0; ++ buf->mode = RD_CHECK_EMPTY; ++ buf->rdstate = alloc_rdstate(dentry->d_inode, bstart); ++ if (unlikely(!buf->rdstate)) { ++ err = -ENOMEM; ++ goto out; ++ } ++ ++ /* Process the lower directories with rdutil_callback as a filldir. */ ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ if (!lower_dentry) ++ continue; ++ if (!lower_dentry->d_inode) ++ continue; ++ if (!S_ISDIR(lower_dentry->d_inode->i_mode)) ++ continue; ++ ++ dget(lower_dentry); ++ mnt = unionfs_mntget(dentry, bindex); ++ branchget(sb, bindex); ++ lower_file = dentry_open(lower_dentry, mnt, O_RDONLY, current_cred()); ++ if (IS_ERR(lower_file)) { ++ err = PTR_ERR(lower_file); ++ branchput(sb, bindex); ++ goto out; ++ } ++ ++ do { ++ buf->filldir_called = 0; ++ buf->rdstate->bindex = bindex; ++ err = vfs_readdir(lower_file, ++ readdir_util_callback, buf); ++ if (buf->err) ++ err = buf->err; ++ } while ((err >= 0) && buf->filldir_called); ++ ++ /* fput calls dput for lower_dentry */ ++ fput(lower_file); ++ branchput(sb, bindex); ++ ++ if (err < 0) ++ goto out; ++ } ++ ++out: ++ if (buf) { ++ if (namelist && !err) ++ *namelist = buf->rdstate; ++ else if (buf->rdstate) ++ free_rdstate(buf->rdstate); ++ kfree(buf); ++ } ++ ++ ++ return err; ++} +diff --git a/fs/unionfs/fanout.h b/fs/unionfs/fanout.h +new file mode 100644 +index 0000000..ae1b86a +--- /dev/null ++++ b/fs/unionfs/fanout.h +@@ -0,0 +1,407 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 _FANOUT_H_ ++#define _FANOUT_H_ ++ ++/* ++ * Inode to private data ++ * ++ * Since we use containers and the struct inode is _inside_ the ++ * unionfs_inode_info structure, UNIONFS_I will always (given a non-NULL ++ * inode pointer), return a valid non-NULL pointer. ++ */ ++static inline struct unionfs_inode_info *UNIONFS_I(const struct inode *inode) ++{ ++ return container_of(inode, struct unionfs_inode_info, vfs_inode); ++} ++ ++#define ibstart(ino) (UNIONFS_I(ino)->bstart) ++#define ibend(ino) (UNIONFS_I(ino)->bend) ++ ++/* Dentry to private data */ ++#define UNIONFS_D(dent) ((struct unionfs_dentry_info *)(dent)->d_fsdata) ++#define dbstart(dent) (UNIONFS_D(dent)->bstart) ++#define dbend(dent) (UNIONFS_D(dent)->bend) ++#define dbopaque(dent) (UNIONFS_D(dent)->bopaque) ++ ++/* Superblock to private data */ ++#define UNIONFS_SB(super) ((struct unionfs_sb_info *)(super)->s_fs_info) ++#define sbstart(sb) 0 ++#define sbend(sb) (UNIONFS_SB(sb)->bend) ++#define sbmax(sb) (UNIONFS_SB(sb)->bend + 1) ++#define sbhbid(sb) (UNIONFS_SB(sb)->high_branch_id) ++ ++/* File to private Data */ ++#define UNIONFS_F(file) ((struct unionfs_file_info *)((file)->private_data)) ++#define fbstart(file) (UNIONFS_F(file)->bstart) ++#define fbend(file) (UNIONFS_F(file)->bend) ++ ++/* macros to manipulate branch IDs in stored in our superblock */ ++static inline int branch_id(struct super_block *sb, int index) ++{ ++ BUG_ON(!sb || index < 0); ++ return UNIONFS_SB(sb)->data[index].branch_id; ++} ++ ++static inline void set_branch_id(struct super_block *sb, int index, int val) ++{ ++ BUG_ON(!sb || index < 0); ++ UNIONFS_SB(sb)->data[index].branch_id = val; ++} ++ ++static inline void new_branch_id(struct super_block *sb, int index) ++{ ++ BUG_ON(!sb || index < 0); ++ set_branch_id(sb, index, ++UNIONFS_SB(sb)->high_branch_id); ++} ++ ++/* ++ * Find new index of matching branch with an existing superblock of a known ++ * (possibly old) id. This is needed because branches could have been ++ * added/deleted causing the branches of any open files to shift. ++ * ++ * @sb: the new superblock which may have new/different branch IDs ++ * @id: the old/existing id we're looking for ++ * Returns index of newly found branch (0 or greater), -1 otherwise. ++ */ ++static inline int branch_id_to_idx(struct super_block *sb, int id) ++{ ++ int i; ++ for (i = 0; i < sbmax(sb); i++) { ++ if (branch_id(sb, i) == id) ++ return i; ++ } ++ /* in the non-ODF code, this should really never happen */ ++ printk(KERN_WARNING "unionfs: cannot find branch with id %d\n", id); ++ return -1; ++} ++ ++/* File to lower file. */ ++static inline struct file *unionfs_lower_file(const struct file *f) ++{ ++ BUG_ON(!f); ++ return UNIONFS_F(f)->lower_files[fbstart(f)]; ++} ++ ++static inline struct file *unionfs_lower_file_idx(const struct file *f, ++ int index) ++{ ++ BUG_ON(!f || index < 0); ++ return UNIONFS_F(f)->lower_files[index]; ++} ++ ++static inline void unionfs_set_lower_file_idx(struct file *f, int index, ++ struct file *val) ++{ ++ BUG_ON(!f || index < 0); ++ UNIONFS_F(f)->lower_files[index] = val; ++ /* save branch ID (may be redundant?) */ ++ UNIONFS_F(f)->saved_branch_ids[index] = ++ branch_id((f)->f_path.dentry->d_sb, index); ++} ++ ++static inline void unionfs_set_lower_file(struct file *f, struct file *val) ++{ ++ BUG_ON(!f); ++ unionfs_set_lower_file_idx((f), fbstart(f), (val)); ++} ++ ++/* Inode to lower inode. */ ++static inline struct inode *unionfs_lower_inode(const struct inode *i) ++{ ++ BUG_ON(!i); ++ return UNIONFS_I(i)->lower_inodes[ibstart(i)]; ++} ++ ++static inline struct inode *unionfs_lower_inode_idx(const struct inode *i, ++ int index) ++{ ++ BUG_ON(!i || index < 0); ++ return UNIONFS_I(i)->lower_inodes[index]; ++} ++ ++static inline void unionfs_set_lower_inode_idx(struct inode *i, int index, ++ struct inode *val) ++{ ++ BUG_ON(!i || index < 0); ++ UNIONFS_I(i)->lower_inodes[index] = val; ++} ++ ++static inline void unionfs_set_lower_inode(struct inode *i, struct inode *val) ++{ ++ BUG_ON(!i); ++ UNIONFS_I(i)->lower_inodes[ibstart(i)] = val; ++} ++ ++/* Superblock to lower superblock. */ ++static inline struct super_block *unionfs_lower_super( ++ const struct super_block *sb) ++{ ++ BUG_ON(!sb); ++ return UNIONFS_SB(sb)->data[sbstart(sb)].sb; ++} ++ ++static inline struct super_block *unionfs_lower_super_idx( ++ const struct super_block *sb, ++ int index) ++{ ++ BUG_ON(!sb || index < 0); ++ return UNIONFS_SB(sb)->data[index].sb; ++} ++ ++static inline void unionfs_set_lower_super_idx(struct super_block *sb, ++ int index, ++ struct super_block *val) ++{ ++ BUG_ON(!sb || index < 0); ++ UNIONFS_SB(sb)->data[index].sb = val; ++} ++ ++static inline void unionfs_set_lower_super(struct super_block *sb, ++ struct super_block *val) ++{ ++ BUG_ON(!sb); ++ UNIONFS_SB(sb)->data[sbstart(sb)].sb = val; ++} ++ ++/* Branch count macros. */ ++static inline int branch_count(const struct super_block *sb, int index) ++{ ++ BUG_ON(!sb || index < 0); ++ return atomic_read(&UNIONFS_SB(sb)->data[index].open_files); ++} ++ ++static inline void set_branch_count(struct super_block *sb, int index, int val) ++{ ++ BUG_ON(!sb || index < 0); ++ atomic_set(&UNIONFS_SB(sb)->data[index].open_files, val); ++} ++ ++static inline void branchget(struct super_block *sb, int index) ++{ ++ BUG_ON(!sb || index < 0); ++ atomic_inc(&UNIONFS_SB(sb)->data[index].open_files); ++} ++ ++static inline void branchput(struct super_block *sb, int index) ++{ ++ BUG_ON(!sb || index < 0); ++ atomic_dec(&UNIONFS_SB(sb)->data[index].open_files); ++} ++ ++/* Dentry macros */ ++static inline void unionfs_set_lower_dentry_idx(struct dentry *dent, int index, ++ struct dentry *val) ++{ ++ BUG_ON(!dent || index < 0); ++ UNIONFS_D(dent)->lower_paths[index].dentry = val; ++} ++ ++static inline struct dentry *unionfs_lower_dentry_idx( ++ const struct dentry *dent, ++ int index) ++{ ++ BUG_ON(!dent || index < 0); ++ return UNIONFS_D(dent)->lower_paths[index].dentry; ++} ++ ++static inline struct dentry *unionfs_lower_dentry(const struct dentry *dent) ++{ ++ BUG_ON(!dent); ++ return unionfs_lower_dentry_idx(dent, dbstart(dent)); ++} ++ ++static inline void unionfs_set_lower_mnt_idx(struct dentry *dent, int index, ++ struct vfsmount *mnt) ++{ ++ BUG_ON(!dent || index < 0); ++ UNIONFS_D(dent)->lower_paths[index].mnt = mnt; ++} ++ ++static inline struct vfsmount *unionfs_lower_mnt_idx( ++ const struct dentry *dent, ++ int index) ++{ ++ BUG_ON(!dent || index < 0); ++ return UNIONFS_D(dent)->lower_paths[index].mnt; ++} ++ ++static inline struct vfsmount *unionfs_lower_mnt(const struct dentry *dent) ++{ ++ BUG_ON(!dent); ++ return unionfs_lower_mnt_idx(dent, dbstart(dent)); ++} ++ ++/* Macros for locking a dentry. */ ++enum unionfs_dentry_lock_class { ++ UNIONFS_DMUTEX_NORMAL, ++ UNIONFS_DMUTEX_ROOT, ++ UNIONFS_DMUTEX_PARENT, ++ UNIONFS_DMUTEX_CHILD, ++ UNIONFS_DMUTEX_WHITEOUT, ++ UNIONFS_DMUTEX_REVAL_PARENT, /* for file/dentry revalidate */ ++ UNIONFS_DMUTEX_REVAL_CHILD, /* for file/dentry revalidate */ ++}; ++ ++static inline void unionfs_lock_dentry(struct dentry *d, ++ unsigned int subclass) ++{ ++ BUG_ON(!d); ++ mutex_lock_nested(&UNIONFS_D(d)->lock, subclass); ++} ++ ++static inline void unionfs_unlock_dentry(struct dentry *d) ++{ ++ BUG_ON(!d); ++ mutex_unlock(&UNIONFS_D(d)->lock); ++} ++ ++static inline struct dentry *unionfs_lock_parent(struct dentry *d, ++ unsigned int subclass) ++{ ++ struct dentry *p; ++ ++ BUG_ON(!d); ++ p = dget_parent(d); ++ if (p != d) ++ mutex_lock_nested(&UNIONFS_D(p)->lock, subclass); ++ return p; ++} ++ ++static inline void unionfs_unlock_parent(struct dentry *d, struct dentry *p) ++{ ++ BUG_ON(!d); ++ BUG_ON(!p); ++ if (p != d) { ++ BUG_ON(!mutex_is_locked(&UNIONFS_D(p)->lock)); ++ mutex_unlock(&UNIONFS_D(p)->lock); ++ } ++ dput(p); ++} ++ ++static inline void verify_locked(struct dentry *d) ++{ ++ BUG_ON(!d); ++ BUG_ON(!mutex_is_locked(&UNIONFS_D(d)->lock)); ++} ++ ++/* macros to put lower objects */ ++ ++/* ++ * iput lower inodes of an unionfs dentry, from bstart to bend. If ++ * @free_lower is true, then also kfree the memory used to hold the lower ++ * object pointers. ++ */ ++static inline void iput_lowers(struct inode *inode, ++ int bstart, int bend, bool free_lower) ++{ ++ struct inode *lower_inode; ++ int bindex; ++ ++ BUG_ON(!inode); ++ BUG_ON(!UNIONFS_I(inode)); ++ BUG_ON(bstart < 0); ++ ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_inode = unionfs_lower_inode_idx(inode, bindex); ++ if (lower_inode) { ++ unionfs_set_lower_inode_idx(inode, bindex, NULL); ++ /* see Documentation/filesystems/unionfs/issues.txt */ ++ lockdep_off(); ++ iput(lower_inode); ++ lockdep_on(); ++ } ++ } ++ ++ if (free_lower) { ++ kfree(UNIONFS_I(inode)->lower_inodes); ++ UNIONFS_I(inode)->lower_inodes = NULL; ++ } ++} ++ ++/* iput all lower inodes, and reset start/end branch indices to -1 */ ++static inline void iput_lowers_all(struct inode *inode, bool free_lower) ++{ ++ int bstart, bend; ++ ++ BUG_ON(!inode); ++ BUG_ON(!UNIONFS_I(inode)); ++ bstart = ibstart(inode); ++ bend = ibend(inode); ++ BUG_ON(bstart < 0); ++ ++ iput_lowers(inode, bstart, bend, free_lower); ++ ibstart(inode) = ibend(inode) = -1; ++} ++ ++/* ++ * dput/mntput all lower dentries and vfsmounts of an unionfs dentry, from ++ * bstart to bend. If @free_lower is true, then also kfree the memory used ++ * to hold the lower object pointers. ++ * ++ * XXX: implement using path_put VFS macros ++ */ ++static inline void path_put_lowers(struct dentry *dentry, ++ int bstart, int bend, bool free_lower) ++{ ++ struct dentry *lower_dentry; ++ struct vfsmount *lower_mnt; ++ int bindex; ++ ++ BUG_ON(!dentry); ++ BUG_ON(!UNIONFS_D(dentry)); ++ BUG_ON(bstart < 0); ++ ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ if (lower_dentry) { ++ unionfs_set_lower_dentry_idx(dentry, bindex, NULL); ++ dput(lower_dentry); ++ } ++ lower_mnt = unionfs_lower_mnt_idx(dentry, bindex); ++ if (lower_mnt) { ++ unionfs_set_lower_mnt_idx(dentry, bindex, NULL); ++ mntput(lower_mnt); ++ } ++ } ++ ++ if (free_lower) { ++ kfree(UNIONFS_D(dentry)->lower_paths); ++ UNIONFS_D(dentry)->lower_paths = NULL; ++ } ++} ++ ++/* ++ * dput/mntput all lower dentries and vfsmounts, and reset start/end branch ++ * indices to -1. ++ */ ++static inline void path_put_lowers_all(struct dentry *dentry, bool free_lower) ++{ ++ int bstart, bend; ++ ++ BUG_ON(!dentry); ++ BUG_ON(!UNIONFS_D(dentry)); ++ bstart = dbstart(dentry); ++ bend = dbend(dentry); ++ BUG_ON(bstart < 0); ++ ++ path_put_lowers(dentry, bstart, bend, free_lower); ++ dbstart(dentry) = dbend(dentry) = -1; ++} ++ ++#endif /* not _FANOUT_H */ +diff --git a/fs/unionfs/file.c b/fs/unionfs/file.c +new file mode 100644 +index 0000000..416c52f +--- /dev/null ++++ b/fs/unionfs/file.c +@@ -0,0 +1,382 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005-2006 Junjiro Okajima ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++ ++static ssize_t unionfs_read(struct file *file, char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ int err; ++ struct file *lower_file; ++ struct dentry *dentry = file->f_path.dentry; ++ struct dentry *parent; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_PARENT); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ err = unionfs_file_revalidate(file, parent, false); ++ if (unlikely(err)) ++ goto out; ++ ++ lower_file = unionfs_lower_file(file); ++ err = vfs_read(lower_file, buf, count, ppos); ++ /* update our inode atime upon a successful lower read */ ++ if (err >= 0) { ++ fsstack_copy_attr_atime(dentry->d_inode, ++ lower_file->f_path.dentry->d_inode); ++ unionfs_check_file(file); ++ } ++ ++out: ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} ++ ++static ssize_t unionfs_write(struct file *file, const char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ int err = 0; ++ struct file *lower_file; ++ struct dentry *dentry = file->f_path.dentry; ++ struct dentry *parent; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_PARENT); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ err = unionfs_file_revalidate(file, parent, true); ++ if (unlikely(err)) ++ goto out; ++ ++ lower_file = unionfs_lower_file(file); ++ err = vfs_write(lower_file, buf, count, ppos); ++ /* update our inode times+sizes upon a successful lower write */ ++ if (err >= 0) { ++ fsstack_copy_inode_size(dentry->d_inode, ++ lower_file->f_path.dentry->d_inode); ++ fsstack_copy_attr_times(dentry->d_inode, ++ lower_file->f_path.dentry->d_inode); ++ UNIONFS_F(file)->wrote_to_file = true; /* for delayed copyup */ ++ unionfs_check_file(file); ++ } ++ ++out: ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} ++ ++static int unionfs_file_readdir(struct file *file, void *dirent, ++ filldir_t filldir) ++{ ++ return -ENOTDIR; ++} ++ ++static int unionfs_mmap(struct file *file, struct vm_area_struct *vma) ++{ ++ int err = 0; ++ bool willwrite; ++ struct file *lower_file; ++ struct dentry *dentry = file->f_path.dentry; ++ struct dentry *parent; ++ const struct vm_operations_struct *saved_vm_ops = NULL; ++ ++ /* ++ * Since mm/memory.c:might_fault() (under PROVE_LOCKING) was ++ * modified in 2.6.29-rc1 to call might_lock_read on mmap_sem, this ++ * has been causing false positives in file system stacking layers. ++ * In particular, our ->mmap is called after sys_mmap2 already holds ++ * mmap_sem, then we lock our own mutexes; but earlier, it's ++ * possible for lockdep to have locked our mutexes first, and then ++ * we call a lower ->readdir which could call might_fault. The ++ * different ordering of the locks is what lockdep complains about ++ * -- unnecessarily. Therefore, we have no choice but to tell ++ * lockdep to temporarily turn off lockdep here. Note: the comments ++ * inside might_sleep also suggest that it would have been ++ * nicer to only annotate paths that needs that might_lock_read. ++ */ ++ lockdep_off(); ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_PARENT); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ /* This might be deferred to mmap's writepage */ ++ willwrite = ((vma->vm_flags | VM_SHARED | VM_WRITE) == vma->vm_flags); ++ err = unionfs_file_revalidate(file, parent, willwrite); ++ if (unlikely(err)) ++ goto out; ++ unionfs_check_file(file); ++ ++ /* ++ * File systems which do not implement ->writepage may use ++ * generic_file_readonly_mmap as their ->mmap op. If you call ++ * generic_file_readonly_mmap with VM_WRITE, you'd get an -EINVAL. ++ * But we cannot call the lower ->mmap op, so we can't tell that ++ * writeable mappings won't work. Therefore, our only choice is to ++ * check if the lower file system supports the ->writepage, and if ++ * not, return EINVAL (the same error that ++ * generic_file_readonly_mmap returns in that case). ++ */ ++ lower_file = unionfs_lower_file(file); ++ if (willwrite && !lower_file->f_mapping->a_ops->writepage) { ++ err = -EINVAL; ++ printk(KERN_ERR "unionfs: branch %d file system does not " ++ "support writeable mmap\n", fbstart(file)); ++ goto out; ++ } ++ ++ /* ++ * find and save lower vm_ops. ++ * ++ * XXX: the VFS should have a cleaner way of finding the lower vm_ops ++ */ ++ if (!UNIONFS_F(file)->lower_vm_ops) { ++ err = lower_file->f_op->mmap(lower_file, vma); ++ if (err) { ++ printk(KERN_ERR "unionfs: lower mmap failed %d\n", err); ++ goto out; ++ } ++ saved_vm_ops = vma->vm_ops; ++ err = do_munmap(current->mm, vma->vm_start, ++ vma->vm_end - vma->vm_start); ++ if (err) { ++ printk(KERN_ERR "unionfs: do_munmap failed %d\n", err); ++ goto out; ++ } ++ } ++ ++ file->f_mapping->a_ops = &unionfs_dummy_aops; ++ err = generic_file_mmap(file, vma); ++ file->f_mapping->a_ops = &unionfs_aops; ++ if (err) { ++ printk(KERN_ERR "unionfs: generic_file_mmap failed %d\n", err); ++ goto out; ++ } ++ vma->vm_ops = &unionfs_vm_ops; ++ if (!UNIONFS_F(file)->lower_vm_ops) ++ UNIONFS_F(file)->lower_vm_ops = saved_vm_ops; ++ ++out: ++ if (!err) { ++ /* copyup could cause parent dir times to change */ ++ unionfs_copy_attr_times(parent->d_inode); ++ unionfs_check_file(file); ++ } ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ lockdep_on(); ++ return err; ++} ++ ++int unionfs_fsync(struct file *file, int datasync) ++{ ++ int bindex, bstart, bend; ++ struct file *lower_file; ++ struct dentry *dentry = file->f_path.dentry; ++ struct dentry *lower_dentry; ++ struct dentry *parent; ++ struct inode *lower_inode, *inode; ++ int err = -EINVAL; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_PARENT); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ err = unionfs_file_revalidate(file, parent, true); ++ if (unlikely(err)) ++ goto out; ++ unionfs_check_file(file); ++ ++ bstart = fbstart(file); ++ bend = fbend(file); ++ if (bstart < 0 || bend < 0) ++ goto out; ++ ++ inode = dentry->d_inode; ++ if (unlikely(!inode)) { ++ printk(KERN_ERR ++ "unionfs: null lower inode in unionfs_fsync\n"); ++ goto out; ++ } ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_inode = unionfs_lower_inode_idx(inode, bindex); ++ if (!lower_inode || !lower_inode->i_fop->fsync) ++ continue; ++ lower_file = unionfs_lower_file_idx(file, bindex); ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ mutex_lock(&lower_inode->i_mutex); ++ err = lower_inode->i_fop->fsync(lower_file, datasync); ++ if (!err && bindex == bstart) ++ fsstack_copy_attr_times(inode, lower_inode); ++ mutex_unlock(&lower_inode->i_mutex); ++ if (err) ++ goto out; ++ } ++ ++out: ++ if (!err) ++ unionfs_check_file(file); ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} ++ ++int unionfs_fasync(int fd, struct file *file, int flag) ++{ ++ int bindex, bstart, bend; ++ struct file *lower_file; ++ struct dentry *dentry = file->f_path.dentry; ++ struct dentry *parent; ++ struct inode *lower_inode, *inode; ++ int err = 0; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_PARENT); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ err = unionfs_file_revalidate(file, parent, true); ++ if (unlikely(err)) ++ goto out; ++ unionfs_check_file(file); ++ ++ bstart = fbstart(file); ++ bend = fbend(file); ++ if (bstart < 0 || bend < 0) ++ goto out; ++ ++ inode = dentry->d_inode; ++ if (unlikely(!inode)) { ++ printk(KERN_ERR ++ "unionfs: null lower inode in unionfs_fasync\n"); ++ goto out; ++ } ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_inode = unionfs_lower_inode_idx(inode, bindex); ++ if (!lower_inode || !lower_inode->i_fop->fasync) ++ continue; ++ lower_file = unionfs_lower_file_idx(file, bindex); ++ mutex_lock(&lower_inode->i_mutex); ++ err = lower_inode->i_fop->fasync(fd, lower_file, flag); ++ if (!err && bindex == bstart) ++ fsstack_copy_attr_times(inode, lower_inode); ++ mutex_unlock(&lower_inode->i_mutex); ++ if (err) ++ goto out; ++ } ++ ++out: ++ if (!err) ++ unionfs_check_file(file); ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} ++ ++static ssize_t unionfs_splice_read(struct file *file, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags) ++{ ++ ssize_t err; ++ struct file *lower_file; ++ struct dentry *dentry = file->f_path.dentry; ++ struct dentry *parent; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_PARENT); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ err = unionfs_file_revalidate(file, parent, false); ++ if (unlikely(err)) ++ goto out; ++ ++ lower_file = unionfs_lower_file(file); ++ err = vfs_splice_to(lower_file, ppos, pipe, len, flags); ++ /* update our inode atime upon a successful lower splice-read */ ++ if (err >= 0) { ++ fsstack_copy_attr_atime(dentry->d_inode, ++ lower_file->f_path.dentry->d_inode); ++ unionfs_check_file(file); ++ } ++ ++out: ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} ++ ++static ssize_t unionfs_splice_write(struct pipe_inode_info *pipe, ++ struct file *file, loff_t *ppos, ++ size_t len, unsigned int flags) ++{ ++ ssize_t err = 0; ++ struct file *lower_file; ++ struct dentry *dentry = file->f_path.dentry; ++ struct dentry *parent; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_PARENT); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ err = unionfs_file_revalidate(file, parent, true); ++ if (unlikely(err)) ++ goto out; ++ ++ lower_file = unionfs_lower_file(file); ++ err = vfs_splice_from(pipe, lower_file, ppos, len, flags); ++ /* update our inode times+sizes upon a successful lower write */ ++ if (err >= 0) { ++ fsstack_copy_inode_size(dentry->d_inode, ++ lower_file->f_path.dentry->d_inode); ++ fsstack_copy_attr_times(dentry->d_inode, ++ lower_file->f_path.dentry->d_inode); ++ unionfs_check_file(file); ++ } ++ ++out: ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} ++ ++struct file_operations unionfs_main_fops = { ++ .llseek = generic_file_llseek, ++ .read = unionfs_read, ++ .write = unionfs_write, ++ .readdir = unionfs_file_readdir, ++ .unlocked_ioctl = unionfs_ioctl, ++#ifdef CONFIG_COMPAT ++ .compat_ioctl = unionfs_ioctl, ++#endif ++ .mmap = unionfs_mmap, ++ .open = unionfs_open, ++ .flush = unionfs_flush, ++ .release = unionfs_file_release, ++ .fsync = unionfs_fsync, ++ .fasync = unionfs_fasync, ++ .splice_read = unionfs_splice_read, ++ .splice_write = unionfs_splice_write, ++}; +diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c +new file mode 100644 +index 0000000..b207c13 +--- /dev/null ++++ b/fs/unionfs/inode.c +@@ -0,0 +1,1099 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005-2006 Junjiro Okajima ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++ ++/* ++ * Find a writeable branch to create new object in. Checks all writeble ++ * branches of the parent inode, from istart to iend order; if none are ++ * suitable, also tries branch 0 (which may require a copyup). ++ * ++ * Return a lower_dentry we can use to create object in, or ERR_PTR. ++ */ ++static struct dentry *find_writeable_branch(struct inode *parent, ++ struct dentry *dentry) ++{ ++ int err = -EINVAL; ++ int bindex, istart, iend; ++ struct dentry *lower_dentry = NULL; ++ ++ istart = ibstart(parent); ++ iend = ibend(parent); ++ if (istart < 0) ++ goto out; ++ ++begin: ++ for (bindex = istart; bindex <= iend; bindex++) { ++ /* skip non-writeable branches */ ++ err = is_robranch_super(dentry->d_sb, bindex); ++ if (err) { ++ err = -EROFS; ++ continue; ++ } ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ if (!lower_dentry) ++ continue; ++ /* ++ * check for whiteouts in writeable branch, and remove them ++ * if necessary. ++ */ ++ err = check_unlink_whiteout(dentry, lower_dentry, bindex); ++ if (err > 0) /* ignore if whiteout found and removed */ ++ err = 0; ++ if (err) ++ continue; ++ /* if get here, we can write to the branch */ ++ break; ++ } ++ /* ++ * If istart wasn't already branch 0, and we got any error, then try ++ * branch 0 (which may require copyup) ++ */ ++ if (err && istart > 0) { ++ istart = iend = 0; ++ goto begin; ++ } ++ ++ /* ++ * If we tried even branch 0, and still got an error, abort. But if ++ * the error was an EROFS, then we should try to copyup. ++ */ ++ if (err && err != -EROFS) ++ goto out; ++ ++ /* ++ * If we get here, then check if copyup needed. If lower_dentry is ++ * NULL, create the entire dentry directory structure in branch 0. ++ */ ++ if (!lower_dentry) { ++ bindex = 0; ++ lower_dentry = create_parents(parent, dentry, ++ dentry->d_name.name, bindex); ++ if (IS_ERR(lower_dentry)) { ++ err = PTR_ERR(lower_dentry); ++ goto out; ++ } ++ } ++ err = 0; /* all's well */ ++out: ++ if (err) ++ return ERR_PTR(err); ++ return lower_dentry; ++} ++ ++static int unionfs_create(struct inode *dir, struct dentry *dentry, ++ int mode, struct nameidata *nd_unused) ++{ ++ int err = 0; ++ struct dentry *lower_dentry = NULL; ++ struct dentry *lower_parent_dentry = NULL; ++ struct dentry *parent; ++ int valid = 0; ++ struct nameidata lower_nd; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ valid = __unionfs_d_revalidate(dentry, parent, false); ++ if (unlikely(!valid)) { ++ err = -ESTALE; /* same as what real_lookup does */ ++ goto out; ++ } ++ ++ lower_dentry = find_writeable_branch(dir, dentry); ++ if (IS_ERR(lower_dentry)) { ++ err = PTR_ERR(lower_dentry); ++ goto out; ++ } ++ ++ lower_parent_dentry = lock_parent(lower_dentry); ++ if (IS_ERR(lower_parent_dentry)) { ++ err = PTR_ERR(lower_parent_dentry); ++ goto out_unlock; ++ } ++ ++ err = init_lower_nd(&lower_nd, LOOKUP_CREATE); ++ if (unlikely(err < 0)) ++ goto out_unlock; ++ err = vfs_create(lower_parent_dentry->d_inode, lower_dentry, mode, ++ &lower_nd); ++ release_lower_nd(&lower_nd, err); ++ ++ if (!err) { ++ err = PTR_ERR(unionfs_interpose(dentry, dir->i_sb, 0)); ++ if (!err) { ++ unionfs_copy_attr_times(dir); ++ fsstack_copy_inode_size(dir, ++ lower_parent_dentry->d_inode); ++ /* update no. of links on parent directory */ ++ dir->i_nlink = unionfs_get_nlinks(dir); ++ } ++ } ++ ++out_unlock: ++ unlock_dir(lower_parent_dentry); ++out: ++ if (!err) { ++ unionfs_postcopyup_setmnt(dentry); ++ unionfs_check_inode(dir); ++ unionfs_check_dentry(dentry); ++ } ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} ++ ++/* ++ * unionfs_lookup is the only special function which takes a dentry, yet we ++ * do NOT want to call __unionfs_d_revalidate_chain because by definition, ++ * we don't have a valid dentry here yet. ++ */ ++static struct dentry *unionfs_lookup(struct inode *dir, ++ struct dentry *dentry, ++ struct nameidata *nd_unused) ++{ ++ struct dentry *ret, *parent; ++ int err = 0; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ ++ /* ++ * As long as we lock/dget the parent, then can skip validating the ++ * parent now; we may have to rebuild this dentry on the next ++ * ->d_revalidate, however. ++ */ ++ ++ /* allocate dentry private data. We free it in ->d_release */ ++ err = new_dentry_private_data(dentry, UNIONFS_DMUTEX_CHILD); ++ if (unlikely(err)) { ++ ret = ERR_PTR(err); ++ goto out; ++ } ++ ++ ret = unionfs_lookup_full(dentry, parent, INTERPOSE_LOOKUP); ++ ++ if (!IS_ERR(ret)) { ++ if (ret) ++ dentry = ret; ++ /* lookup_full can return multiple positive dentries */ ++ if (dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode)) { ++ BUG_ON(dbstart(dentry) < 0); ++ unionfs_postcopyup_release(dentry); ++ } ++ unionfs_copy_attr_times(dentry->d_inode); ++ } ++ ++ unionfs_check_inode(dir); ++ if (!IS_ERR(ret)) ++ unionfs_check_dentry(dentry); ++ unionfs_check_dentry(parent); ++ unionfs_unlock_dentry(dentry); /* locked in new_dentry_private data */ ++ ++out: ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ ++ return ret; ++} ++ ++static int unionfs_link(struct dentry *old_dentry, struct inode *dir, ++ struct dentry *new_dentry) ++{ ++ int err = 0; ++ struct dentry *lower_old_dentry = NULL; ++ struct dentry *lower_new_dentry = NULL; ++ struct dentry *lower_dir_dentry = NULL; ++ struct dentry *old_parent, *new_parent; ++ char *name = NULL; ++ bool valid; ++ ++ unionfs_read_lock(old_dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ old_parent = dget_parent(old_dentry); ++ new_parent = dget_parent(new_dentry); ++ unionfs_double_lock_parents(old_parent, new_parent); ++ unionfs_double_lock_dentry(old_dentry, new_dentry); ++ ++ valid = __unionfs_d_revalidate(old_dentry, old_parent, false); ++ if (unlikely(!valid)) { ++ err = -ESTALE; ++ goto out; ++ } ++ if (new_dentry->d_inode) { ++ valid = __unionfs_d_revalidate(new_dentry, new_parent, false); ++ if (unlikely(!valid)) { ++ err = -ESTALE; ++ goto out; ++ } ++ } ++ ++ lower_new_dentry = unionfs_lower_dentry(new_dentry); ++ ++ /* check for a whiteout in new dentry branch, and delete it */ ++ err = check_unlink_whiteout(new_dentry, lower_new_dentry, ++ dbstart(new_dentry)); ++ if (err > 0) { /* whiteout found and removed successfully */ ++ lower_dir_dentry = dget_parent(lower_new_dentry); ++ fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode); ++ dput(lower_dir_dentry); ++ dir->i_nlink = unionfs_get_nlinks(dir); ++ err = 0; ++ } ++ if (err) ++ goto out; ++ ++ /* check if parent hierachy is needed, then link in same branch */ ++ if (dbstart(old_dentry) != dbstart(new_dentry)) { ++ lower_new_dentry = create_parents(dir, new_dentry, ++ new_dentry->d_name.name, ++ dbstart(old_dentry)); ++ err = PTR_ERR(lower_new_dentry); ++ if (IS_COPYUP_ERR(err)) ++ goto docopyup; ++ if (!lower_new_dentry || IS_ERR(lower_new_dentry)) ++ goto out; ++ } ++ lower_new_dentry = unionfs_lower_dentry(new_dentry); ++ lower_old_dentry = unionfs_lower_dentry(old_dentry); ++ ++ BUG_ON(dbstart(old_dentry) != dbstart(new_dentry)); ++ lower_dir_dentry = lock_parent(lower_new_dentry); ++ err = is_robranch(old_dentry); ++ if (!err) { ++ /* see Documentation/filesystems/unionfs/issues.txt */ ++ lockdep_off(); ++ err = vfs_link(lower_old_dentry, lower_dir_dentry->d_inode, ++ lower_new_dentry); ++ lockdep_on(); ++ } ++ unlock_dir(lower_dir_dentry); ++ ++docopyup: ++ if (IS_COPYUP_ERR(err)) { ++ int old_bstart = dbstart(old_dentry); ++ int bindex; ++ ++ for (bindex = old_bstart - 1; bindex >= 0; bindex--) { ++ err = copyup_dentry(old_parent->d_inode, ++ old_dentry, old_bstart, ++ bindex, old_dentry->d_name.name, ++ old_dentry->d_name.len, NULL, ++ i_size_read(old_dentry->d_inode)); ++ if (err) ++ continue; ++ lower_new_dentry = ++ create_parents(dir, new_dentry, ++ new_dentry->d_name.name, ++ bindex); ++ lower_old_dentry = unionfs_lower_dentry(old_dentry); ++ lower_dir_dentry = lock_parent(lower_new_dentry); ++ /* see Documentation/filesystems/unionfs/issues.txt */ ++ lockdep_off(); ++ /* do vfs_link */ ++ err = vfs_link(lower_old_dentry, ++ lower_dir_dentry->d_inode, ++ lower_new_dentry); ++ lockdep_on(); ++ unlock_dir(lower_dir_dentry); ++ goto check_link; ++ } ++ goto out; ++ } ++ ++check_link: ++ if (err || !lower_new_dentry->d_inode) ++ goto out; ++ ++ /* Its a hard link, so use the same inode */ ++ new_dentry->d_inode = igrab(old_dentry->d_inode); ++ d_add(new_dentry, new_dentry->d_inode); ++ unionfs_copy_attr_all(dir, lower_new_dentry->d_parent->d_inode); ++ fsstack_copy_inode_size(dir, lower_new_dentry->d_parent->d_inode); ++ ++ /* propagate number of hard-links */ ++ old_dentry->d_inode->i_nlink = unionfs_get_nlinks(old_dentry->d_inode); ++ /* new dentry's ctime may have changed due to hard-link counts */ ++ unionfs_copy_attr_times(new_dentry->d_inode); ++ ++out: ++ if (!new_dentry->d_inode) ++ d_drop(new_dentry); ++ ++ kfree(name); ++ if (!err) ++ unionfs_postcopyup_setmnt(new_dentry); ++ ++ unionfs_check_inode(dir); ++ unionfs_check_dentry(new_dentry); ++ unionfs_check_dentry(old_dentry); ++ ++ unionfs_double_unlock_dentry(old_dentry, new_dentry); ++ unionfs_double_unlock_parents(old_parent, new_parent); ++ dput(new_parent); ++ dput(old_parent); ++ unionfs_read_unlock(old_dentry->d_sb); ++ ++ return err; ++} ++ ++static int unionfs_symlink(struct inode *dir, struct dentry *dentry, ++ const char *symname) ++{ ++ int err = 0; ++ struct dentry *lower_dentry = NULL; ++ struct dentry *wh_dentry = NULL; ++ struct dentry *lower_parent_dentry = NULL; ++ struct dentry *parent; ++ char *name = NULL; ++ int valid = 0; ++ umode_t mode; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ valid = __unionfs_d_revalidate(dentry, parent, false); ++ if (unlikely(!valid)) { ++ err = -ESTALE; ++ goto out; ++ } ++ ++ /* ++ * It's only a bug if this dentry was not negative and couldn't be ++ * revalidated (shouldn't happen). ++ */ ++ BUG_ON(!valid && dentry->d_inode); ++ ++ lower_dentry = find_writeable_branch(dir, dentry); ++ if (IS_ERR(lower_dentry)) { ++ err = PTR_ERR(lower_dentry); ++ goto out; ++ } ++ ++ lower_parent_dentry = lock_parent(lower_dentry); ++ if (IS_ERR(lower_parent_dentry)) { ++ err = PTR_ERR(lower_parent_dentry); ++ goto out_unlock; ++ } ++ ++ mode = S_IALLUGO; ++ err = vfs_symlink(lower_parent_dentry->d_inode, lower_dentry, symname); ++ if (!err) { ++ err = PTR_ERR(unionfs_interpose(dentry, dir->i_sb, 0)); ++ if (!err) { ++ unionfs_copy_attr_times(dir); ++ fsstack_copy_inode_size(dir, ++ lower_parent_dentry->d_inode); ++ /* update no. of links on parent directory */ ++ dir->i_nlink = unionfs_get_nlinks(dir); ++ } ++ } ++ ++out_unlock: ++ unlock_dir(lower_parent_dentry); ++out: ++ dput(wh_dentry); ++ kfree(name); ++ ++ if (!err) { ++ unionfs_postcopyup_setmnt(dentry); ++ unionfs_check_inode(dir); ++ unionfs_check_dentry(dentry); ++ } ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} ++ ++static int unionfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) ++{ ++ int err = 0; ++ struct dentry *lower_dentry = NULL; ++ struct dentry *lower_parent_dentry = NULL; ++ struct dentry *parent; ++ int bindex = 0, bstart; ++ char *name = NULL; ++ int valid; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ valid = __unionfs_d_revalidate(dentry, parent, false); ++ if (unlikely(!valid)) { ++ err = -ESTALE; /* same as what real_lookup does */ ++ goto out; ++ } ++ ++ bstart = dbstart(dentry); ++ ++ lower_dentry = unionfs_lower_dentry(dentry); ++ ++ /* check for a whiteout in new dentry branch, and delete it */ ++ err = check_unlink_whiteout(dentry, lower_dentry, bstart); ++ if (err > 0) /* whiteout found and removed successfully */ ++ err = 0; ++ if (err) { ++ /* exit if the error returned was NOT -EROFS */ ++ if (!IS_COPYUP_ERR(err)) ++ goto out; ++ bstart--; ++ } ++ ++ /* check if copyup's needed, and mkdir */ ++ for (bindex = bstart; bindex >= 0; bindex--) { ++ int i; ++ int bend = dbend(dentry); ++ ++ if (is_robranch_super(dentry->d_sb, bindex)) ++ continue; ++ ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ if (!lower_dentry) { ++ lower_dentry = create_parents(dir, dentry, ++ dentry->d_name.name, ++ bindex); ++ if (!lower_dentry || IS_ERR(lower_dentry)) { ++ printk(KERN_ERR "unionfs: lower dentry " ++ " NULL for bindex = %d\n", bindex); ++ continue; ++ } ++ } ++ ++ lower_parent_dentry = lock_parent(lower_dentry); ++ ++ if (IS_ERR(lower_parent_dentry)) { ++ err = PTR_ERR(lower_parent_dentry); ++ goto out; ++ } ++ ++ err = vfs_mkdir(lower_parent_dentry->d_inode, lower_dentry, ++ mode); ++ ++ unlock_dir(lower_parent_dentry); ++ ++ /* did the mkdir succeed? */ ++ if (err) ++ break; ++ ++ for (i = bindex + 1; i <= bend; i++) { ++ /* XXX: use path_put_lowers? */ ++ if (unionfs_lower_dentry_idx(dentry, i)) { ++ dput(unionfs_lower_dentry_idx(dentry, i)); ++ unionfs_set_lower_dentry_idx(dentry, i, NULL); ++ } ++ } ++ dbend(dentry) = bindex; ++ ++ /* ++ * Only INTERPOSE_LOOKUP can return a value other than 0 on ++ * err. ++ */ ++ err = PTR_ERR(unionfs_interpose(dentry, dir->i_sb, 0)); ++ if (!err) { ++ unionfs_copy_attr_times(dir); ++ fsstack_copy_inode_size(dir, ++ lower_parent_dentry->d_inode); ++ ++ /* update number of links on parent directory */ ++ dir->i_nlink = unionfs_get_nlinks(dir); ++ } ++ ++ err = make_dir_opaque(dentry, dbstart(dentry)); ++ if (err) { ++ printk(KERN_ERR "unionfs: mkdir: error creating " ++ ".wh.__dir_opaque: %d\n", err); ++ goto out; ++ } ++ ++ /* we are done! */ ++ break; ++ } ++ ++out: ++ if (!dentry->d_inode) ++ d_drop(dentry); ++ ++ kfree(name); ++ ++ if (!err) { ++ unionfs_copy_attr_times(dentry->d_inode); ++ unionfs_postcopyup_setmnt(dentry); ++ } ++ unionfs_check_inode(dir); ++ unionfs_check_dentry(dentry); ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ ++ return err; ++} ++ ++static int unionfs_mknod(struct inode *dir, struct dentry *dentry, int mode, ++ dev_t dev) ++{ ++ int err = 0; ++ struct dentry *lower_dentry = NULL; ++ struct dentry *wh_dentry = NULL; ++ struct dentry *lower_parent_dentry = NULL; ++ struct dentry *parent; ++ char *name = NULL; ++ int valid = 0; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ valid = __unionfs_d_revalidate(dentry, parent, false); ++ if (unlikely(!valid)) { ++ err = -ESTALE; ++ goto out; ++ } ++ ++ /* ++ * It's only a bug if this dentry was not negative and couldn't be ++ * revalidated (shouldn't happen). ++ */ ++ BUG_ON(!valid && dentry->d_inode); ++ ++ lower_dentry = find_writeable_branch(dir, dentry); ++ if (IS_ERR(lower_dentry)) { ++ err = PTR_ERR(lower_dentry); ++ goto out; ++ } ++ ++ lower_parent_dentry = lock_parent(lower_dentry); ++ if (IS_ERR(lower_parent_dentry)) { ++ err = PTR_ERR(lower_parent_dentry); ++ goto out_unlock; ++ } ++ ++ err = vfs_mknod(lower_parent_dentry->d_inode, lower_dentry, mode, dev); ++ if (!err) { ++ err = PTR_ERR(unionfs_interpose(dentry, dir->i_sb, 0)); ++ if (!err) { ++ unionfs_copy_attr_times(dir); ++ fsstack_copy_inode_size(dir, ++ lower_parent_dentry->d_inode); ++ /* update no. of links on parent directory */ ++ dir->i_nlink = unionfs_get_nlinks(dir); ++ } ++ } ++ ++out_unlock: ++ unlock_dir(lower_parent_dentry); ++out: ++ dput(wh_dentry); ++ kfree(name); ++ ++ if (!err) { ++ unionfs_postcopyup_setmnt(dentry); ++ unionfs_check_inode(dir); ++ unionfs_check_dentry(dentry); ++ } ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} ++ ++/* requires sb, dentry, and parent to already be locked */ ++static int __unionfs_readlink(struct dentry *dentry, char __user *buf, ++ int bufsiz) ++{ ++ int err; ++ struct dentry *lower_dentry; ++ ++ lower_dentry = unionfs_lower_dentry(dentry); ++ ++ if (!lower_dentry->d_inode->i_op || ++ !lower_dentry->d_inode->i_op->readlink) { ++ err = -EINVAL; ++ goto out; ++ } ++ ++ err = lower_dentry->d_inode->i_op->readlink(lower_dentry, ++ buf, bufsiz); ++ if (err >= 0) ++ fsstack_copy_attr_atime(dentry->d_inode, ++ lower_dentry->d_inode); ++ ++out: ++ return err; ++} ++ ++static int unionfs_readlink(struct dentry *dentry, char __user *buf, ++ int bufsiz) ++{ ++ int err; ++ struct dentry *parent; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ if (unlikely(!__unionfs_d_revalidate(dentry, parent, false))) { ++ err = -ESTALE; ++ goto out; ++ } ++ ++ err = __unionfs_readlink(dentry, buf, bufsiz); ++ ++out: ++ unionfs_check_dentry(dentry); ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ ++ return err; ++} ++ ++static void *unionfs_follow_link(struct dentry *dentry, struct nameidata *nd) ++{ ++ char *buf; ++ int len = PAGE_SIZE, err; ++ mm_segment_t old_fs; ++ struct dentry *parent; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ /* This is freed by the put_link method assuming a successful call. */ ++ buf = kmalloc(len, GFP_KERNEL); ++ if (unlikely(!buf)) { ++ err = -ENOMEM; ++ goto out; ++ } ++ ++ /* read the symlink, and then we will follow it */ ++ old_fs = get_fs(); ++ set_fs(KERNEL_DS); ++ err = __unionfs_readlink(dentry, buf, len); ++ set_fs(old_fs); ++ if (err < 0) { ++ kfree(buf); ++ buf = NULL; ++ goto out; ++ } ++ buf[err] = 0; ++ nd_set_link(nd, buf); ++ err = 0; ++ ++out: ++ if (err >= 0) { ++ unionfs_check_nd(nd); ++ unionfs_check_dentry(dentry); ++ } ++ ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ ++ return ERR_PTR(err); ++} ++ ++/* this @nd *IS* still used */ ++static void unionfs_put_link(struct dentry *dentry, struct nameidata *nd, ++ void *cookie) ++{ ++ struct dentry *parent; ++ char *buf; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ if (unlikely(!__unionfs_d_revalidate(dentry, parent, false))) ++ printk(KERN_ERR ++ "unionfs: put_link failed to revalidate dentry\n"); ++ ++ unionfs_check_dentry(dentry); ++#if 0 ++ /* XXX: can't run this check b/c this fxn can receive a poisoned 'nd' PTR */ ++ unionfs_check_nd(nd); ++#endif ++ buf = nd_get_link(nd); ++ if (!IS_ERR(buf)) ++ kfree(buf); ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++} ++ ++/* ++ * This is a variant of fs/namei.c:permission() or inode_permission() which ++ * skips over EROFS tests (because we perform copyup on EROFS). ++ */ ++static int __inode_permission(struct inode *inode, int mask, unsigned int flags) ++{ ++ int retval; ++ ++ /* nobody gets write access to an immutable file */ ++ if ((mask & MAY_WRITE) && IS_IMMUTABLE(inode)) ++ return -EACCES; ++ ++ /* Ordinary permission routines do not understand MAY_APPEND. */ ++ if (inode->i_op && inode->i_op->permission) { ++ retval = inode->i_op->permission(inode, mask, flags); ++ if (!retval) { ++ /* ++ * Exec permission on a regular file is denied if none ++ * of the execute bits are set. ++ * ++ * This check should be done by the ->permission() ++ * method. ++ */ ++ if ((mask & MAY_EXEC) && S_ISREG(inode->i_mode) && ++ !(inode->i_mode & S_IXUGO)) ++ return -EACCES; ++ } ++ } else { ++ retval = generic_permission(inode, mask, flags, NULL); ++ } ++ if (retval) ++ return retval; ++ ++ return security_inode_permission(inode, ++ mask & (MAY_READ|MAY_WRITE|MAY_EXEC|MAY_APPEND)); ++} ++ ++/* ++ * Don't grab the superblock read-lock in unionfs_permission, which prevents ++ * a deadlock with the branch-management "add branch" code (which grabbed ++ * the write lock). It is safe to not grab the read lock here, because even ++ * with branch management taking place, there is no chance that ++ * unionfs_permission, or anything it calls, will use stale branch ++ * information. ++ */ ++static int unionfs_permission(struct inode *inode, int mask, unsigned int flags) ++{ ++ struct inode *lower_inode = NULL; ++ int err = 0; ++ int bindex, bstart, bend; ++ int is_file; ++ const int write_mask = (mask & MAY_WRITE) && !(mask & MAY_READ); ++ struct inode *inode_grabbed; ++ struct dentry *dentry; ++ ++ if (flags & IPERM_FLAG_RCU) { ++ err = -ECHILD; ++ goto out_nograb; ++ } ++ ++ dentry = d_find_alias(inode); ++ if (dentry) ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ inode_grabbed = igrab(inode); ++ is_file = !S_ISDIR(inode->i_mode); ++ ++ if (!UNIONFS_I(inode)->lower_inodes) { ++ if (is_file) /* dirs can be unlinked but chdir'ed to */ ++ err = -ESTALE; /* force revalidate */ ++ goto out; ++ } ++ bstart = ibstart(inode); ++ bend = ibend(inode); ++ if (unlikely(bstart < 0 || bend < 0)) { ++ /* ++ * With branch-management, we can get a stale inode here. ++ * If so, we return ESTALE back to link_path_walk, which ++ * would discard the dcache entry and re-lookup the ++ * dentry+inode. This should be equivalent to issuing ++ * __unionfs_d_revalidate_chain on nd.dentry here. ++ */ ++ if (is_file) /* dirs can be unlinked but chdir'ed to */ ++ err = -ESTALE; /* force revalidate */ ++ goto out; ++ } ++ ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_inode = unionfs_lower_inode_idx(inode, bindex); ++ if (!lower_inode) ++ continue; ++ ++ /* ++ * check the condition for D-F-D underlying files/directories, ++ * we don't have to check for files, if we are checking for ++ * directories. ++ */ ++ if (!is_file && !S_ISDIR(lower_inode->i_mode)) ++ continue; ++ ++ /* ++ * We check basic permissions, but we ignore any conditions ++ * such as readonly file systems or branches marked as ++ * readonly, because those conditions should lead to a ++ * copyup taking place later on. However, if user never had ++ * access to the file, then no copyup could ever take place. ++ */ ++ err = __inode_permission(lower_inode, mask, flags); ++ if (err && err != -EACCES && err != EPERM && bindex > 0) { ++ umode_t mode = lower_inode->i_mode; ++ if ((is_robranch_super(inode->i_sb, bindex) || ++ __is_rdonly(lower_inode)) && ++ (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))) ++ err = 0; ++ if (IS_COPYUP_ERR(err)) ++ err = 0; ++ } ++ ++ /* ++ * NFS HACK: NFSv2/3 return EACCES on readonly-exported, ++ * locally readonly-mounted file systems, instead of EROFS ++ * like other file systems do. So we have no choice here ++ * but to intercept this and ignore it for NFS branches ++ * marked readonly. Specifically, we avoid using NFS's own ++ * "broken" ->permission method, and rely on ++ * generic_permission() to do basic checking for us. ++ */ ++ if (err && err == -EACCES && ++ is_robranch_super(inode->i_sb, bindex) && ++ lower_inode->i_sb->s_magic == NFS_SUPER_MAGIC) ++ err = generic_permission(lower_inode, mask, flags, NULL); ++ ++ /* ++ * The permissions are an intersection of the overall directory ++ * permissions, so we fail if one fails. ++ */ ++ if (err) ++ goto out; ++ ++ /* only the leftmost file matters. */ ++ if (is_file || write_mask) { ++ if (is_file && write_mask) { ++ err = get_write_access(lower_inode); ++ if (!err) ++ put_write_access(lower_inode); ++ } ++ break; ++ } ++ } ++ /* sync times which may have changed (asynchronously) below */ ++ unionfs_copy_attr_times(inode); ++ ++out: ++ unionfs_check_inode(inode); ++ if (dentry) { ++ unionfs_unlock_dentry(dentry); ++ dput(dentry); ++ } ++ iput(inode_grabbed); ++out_nograb: ++ return err; ++} ++ ++static int unionfs_setattr(struct dentry *dentry, struct iattr *ia) ++{ ++ int err = 0; ++ struct dentry *lower_dentry; ++ struct dentry *parent; ++ struct inode *inode; ++ struct inode *lower_inode; ++ int bstart, bend, bindex; ++ loff_t size; ++ struct iattr lower_ia; ++ ++ /* check if user has permission to change inode */ ++ err = inode_change_ok(dentry->d_inode, ia); ++ if (err) ++ goto out_err; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ if (unlikely(!__unionfs_d_revalidate(dentry, parent, false))) { ++ err = -ESTALE; ++ goto out; ++ } ++ ++ bstart = dbstart(dentry); ++ bend = dbend(dentry); ++ inode = dentry->d_inode; ++ ++ /* ++ * mode change is for clearing setuid/setgid. Allow lower filesystem ++ * to reinterpret it in its own way. ++ */ ++ if (ia->ia_valid & (ATTR_KILL_SUID | ATTR_KILL_SGID)) ++ ia->ia_valid &= ~ATTR_MODE; ++ ++ lower_dentry = unionfs_lower_dentry(dentry); ++ if (!lower_dentry) { /* should never happen after above revalidate */ ++ err = -EINVAL; ++ goto out; ++ } ++ ++ /* ++ * Get the lower inode directly from lower dentry, in case ibstart ++ * is -1 (which happens when the file is open but unlinked. ++ */ ++ lower_inode = lower_dentry->d_inode; ++ ++ /* check if user has permission to change lower inode */ ++ err = inode_change_ok(lower_inode, ia); ++ if (err) ++ goto out; ++ ++ /* copyup if the file is on a read only branch */ ++ if (is_robranch_super(dentry->d_sb, bstart) ++ || __is_rdonly(lower_inode)) { ++ /* check if we have a branch to copy up to */ ++ if (bstart <= 0) { ++ err = -EACCES; ++ goto out; ++ } ++ ++ if (ia->ia_valid & ATTR_SIZE) ++ size = ia->ia_size; ++ else ++ size = i_size_read(inode); ++ /* copyup to next available branch */ ++ for (bindex = bstart - 1; bindex >= 0; bindex--) { ++ err = copyup_dentry(parent->d_inode, ++ dentry, bstart, bindex, ++ dentry->d_name.name, ++ dentry->d_name.len, ++ NULL, size); ++ if (!err) ++ break; ++ } ++ if (err) ++ goto out; ++ /* get updated lower_dentry/inode after copyup */ ++ lower_dentry = unionfs_lower_dentry(dentry); ++ lower_inode = unionfs_lower_inode(inode); ++ /* ++ * check for whiteouts in writeable branch, and remove them ++ * if necessary. ++ */ ++ if (lower_dentry) { ++ err = check_unlink_whiteout(dentry, lower_dentry, ++ bindex); ++ if (err > 0) /* ignore if whiteout found and removed */ ++ err = 0; ++ } ++ } ++ ++ /* ++ * If shrinking, first truncate upper level to cancel writing dirty ++ * pages beyond the new eof; and also if its' maxbytes is more ++ * limiting (fail with -EFBIG before making any change to the lower ++ * level). There is no need to vmtruncate the upper level ++ * afterwards in the other cases: we fsstack_copy_inode_size from ++ * the lower level. ++ */ ++ if (ia->ia_valid & ATTR_SIZE) { ++ size = i_size_read(inode); ++ if (ia->ia_size < size || (ia->ia_size > size && ++ inode->i_sb->s_maxbytes < lower_inode->i_sb->s_maxbytes)) { ++ err = vmtruncate(inode, ia->ia_size); ++ if (err) ++ goto out; ++ } ++ } ++ ++ /* notify the (possibly copied-up) lower inode */ ++ /* ++ * Note: we use lower_dentry->d_inode, because lower_inode may be ++ * unlinked (no inode->i_sb and i_ino==0. This happens if someone ++ * tries to open(), unlink(), then ftruncate() a file. ++ */ ++ /* prepare our own lower struct iattr (with our own lower file) */ ++ memcpy(&lower_ia, ia, sizeof(lower_ia)); ++ if (ia->ia_valid & ATTR_FILE) { ++ lower_ia.ia_file = unionfs_lower_file(ia->ia_file); ++ BUG_ON(!lower_ia.ia_file); // XXX? ++ } ++ ++ mutex_lock(&lower_dentry->d_inode->i_mutex); ++ err = notify_change(lower_dentry, &lower_ia); ++ mutex_unlock(&lower_dentry->d_inode->i_mutex); ++ if (err) ++ goto out; ++ ++ /* get attributes from the first lower inode */ ++ if (ibstart(inode) >= 0) ++ unionfs_copy_attr_all(inode, lower_inode); ++ /* ++ * unionfs_copy_attr_all will copy the lower times to our inode if ++ * the lower ones are newer (useful for cache coherency). However, ++ * ->setattr is the only place in which we may have to copy the ++ * lower inode times absolutely, to support utimes(2). ++ */ ++ if (ia->ia_valid & ATTR_MTIME_SET) ++ inode->i_mtime = lower_inode->i_mtime; ++ if (ia->ia_valid & ATTR_CTIME) ++ inode->i_ctime = lower_inode->i_ctime; ++ if (ia->ia_valid & ATTR_ATIME_SET) ++ inode->i_atime = lower_inode->i_atime; ++ fsstack_copy_inode_size(inode, lower_inode); ++ ++out: ++ if (!err) ++ unionfs_check_dentry(dentry); ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++out_err: ++ return err; ++} ++ ++struct inode_operations unionfs_symlink_iops = { ++ .readlink = unionfs_readlink, ++ .permission = unionfs_permission, ++ .follow_link = unionfs_follow_link, ++ .setattr = unionfs_setattr, ++ .put_link = unionfs_put_link, ++}; ++ ++struct inode_operations unionfs_dir_iops = { ++ .create = unionfs_create, ++ .lookup = unionfs_lookup, ++ .link = unionfs_link, ++ .unlink = unionfs_unlink, ++ .symlink = unionfs_symlink, ++ .mkdir = unionfs_mkdir, ++ .rmdir = unionfs_rmdir, ++ .mknod = unionfs_mknod, ++ .rename = unionfs_rename, ++ .permission = unionfs_permission, ++ .setattr = unionfs_setattr, ++#ifdef CONFIG_UNION_FS_XATTR ++ .setxattr = unionfs_setxattr, ++ .getxattr = unionfs_getxattr, ++ .removexattr = unionfs_removexattr, ++ .listxattr = unionfs_listxattr, ++#endif /* CONFIG_UNION_FS_XATTR */ ++}; ++ ++struct inode_operations unionfs_main_iops = { ++ .permission = unionfs_permission, ++ .setattr = unionfs_setattr, ++#ifdef CONFIG_UNION_FS_XATTR ++ .setxattr = unionfs_setxattr, ++ .getxattr = unionfs_getxattr, ++ .removexattr = unionfs_removexattr, ++ .listxattr = unionfs_listxattr, ++#endif /* CONFIG_UNION_FS_XATTR */ ++}; +diff --git a/fs/unionfs/lookup.c b/fs/unionfs/lookup.c +new file mode 100644 +index 0000000..3cbde56 +--- /dev/null ++++ b/fs/unionfs/lookup.c +@@ -0,0 +1,569 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005-2006 Junjiro Okajima ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++ ++/* ++ * Lookup one path component @name relative to a path pair. ++ * Behaves nearly the same as lookup_one_len (i.e., return negative dentry ++ * on ENOENT), but uses the @mnt passed, so it can cross bind mounts and ++ * other lower mounts properly. If @new_mnt is non-null, will fill in the ++ * new mnt there. Caller is responsible to dput/mntput/path_put returned ++ * @dentry and @new_mnt. ++ */ ++struct dentry *__lookup_one(struct dentry *base, struct vfsmount *mnt, ++ const char *name, struct vfsmount **new_mnt) ++{ ++ struct dentry *dentry = NULL; ++ struct nameidata lower_nd; ++ int err; ++ ++ /* we use flags=0 to get basic lookup */ ++ err = vfs_path_lookup(base, mnt, name, 0, &lower_nd); ++ ++ switch (err) { ++ case 0: /* no error */ ++ dentry = lower_nd.path.dentry; ++ if (new_mnt) ++ *new_mnt = lower_nd.path.mnt; /* rc already inc'ed */ ++ break; ++ case -ENOENT: ++ /* ++ * We don't consider ENOENT an error, and we want to return ++ * a negative dentry (ala lookup_one_len). As we know ++ * there was no inode for this name before (-ENOENT), then ++ * it's safe to call lookup_one_len (which doesn't take a ++ * vfsmount). ++ */ ++ dentry = lookup_lck_len(name, base, strlen(name)); ++ if (new_mnt) ++ *new_mnt = mntget(lower_nd.path.mnt); ++ break; ++ default: /* all other real errors */ ++ dentry = ERR_PTR(err); ++ break; ++ } ++ ++ return dentry; ++} ++ ++/* ++ * This is a utility function that fills in a unionfs dentry. ++ * Caller must lock this dentry with unionfs_lock_dentry. ++ * ++ * Returns: 0 (ok), or -ERRNO if an error occurred. ++ * XXX: get rid of _partial_lookup and make callers call _lookup_full directly ++ */ ++int unionfs_partial_lookup(struct dentry *dentry, struct dentry *parent) ++{ ++ struct dentry *tmp; ++ int err = -ENOSYS; ++ ++ tmp = unionfs_lookup_full(dentry, parent, INTERPOSE_PARTIAL); ++ ++ if (!tmp) { ++ err = 0; ++ goto out; ++ } ++ if (IS_ERR(tmp)) { ++ err = PTR_ERR(tmp); ++ goto out; ++ } ++ /* XXX: need to change the interface */ ++ BUG_ON(tmp != dentry); ++out: ++ return err; ++} ++ ++/* The dentry cache is just so we have properly sized dentries. */ ++static struct kmem_cache *unionfs_dentry_cachep; ++int unionfs_init_dentry_cache(void) ++{ ++ unionfs_dentry_cachep = ++ kmem_cache_create("unionfs_dentry", ++ sizeof(struct unionfs_dentry_info), ++ 0, SLAB_RECLAIM_ACCOUNT, NULL); ++ ++ return (unionfs_dentry_cachep ? 0 : -ENOMEM); ++} ++ ++void unionfs_destroy_dentry_cache(void) ++{ ++ if (unionfs_dentry_cachep) ++ kmem_cache_destroy(unionfs_dentry_cachep); ++} ++ ++void free_dentry_private_data(struct dentry *dentry) ++{ ++ if (!dentry || !dentry->d_fsdata) ++ return; ++ kfree(UNIONFS_D(dentry)->lower_paths); ++ UNIONFS_D(dentry)->lower_paths = NULL; ++ kmem_cache_free(unionfs_dentry_cachep, dentry->d_fsdata); ++ dentry->d_fsdata = NULL; ++} ++ ++static inline int __realloc_dentry_private_data(struct dentry *dentry) ++{ ++ struct unionfs_dentry_info *info = UNIONFS_D(dentry); ++ void *p; ++ int size; ++ ++ BUG_ON(!info); ++ ++ size = sizeof(struct path) * sbmax(dentry->d_sb); ++ p = krealloc(info->lower_paths, size, GFP_ATOMIC); ++ if (unlikely(!p)) ++ return -ENOMEM; ++ ++ info->lower_paths = p; ++ ++ info->bstart = -1; ++ info->bend = -1; ++ info->bopaque = -1; ++ info->bcount = sbmax(dentry->d_sb); ++ atomic_set(&info->generation, ++ atomic_read(&UNIONFS_SB(dentry->d_sb)->generation)); ++ ++ memset(info->lower_paths, 0, size); ++ ++ return 0; ++} ++ ++/* UNIONFS_D(dentry)->lock must be locked */ ++int realloc_dentry_private_data(struct dentry *dentry) ++{ ++ if (!__realloc_dentry_private_data(dentry)) ++ return 0; ++ ++ kfree(UNIONFS_D(dentry)->lower_paths); ++ free_dentry_private_data(dentry); ++ return -ENOMEM; ++} ++ ++/* allocate new dentry private data */ ++int new_dentry_private_data(struct dentry *dentry, int subclass) ++{ ++ struct unionfs_dentry_info *info = UNIONFS_D(dentry); ++ ++ BUG_ON(info); ++ ++ info = kmem_cache_alloc(unionfs_dentry_cachep, GFP_ATOMIC); ++ if (unlikely(!info)) ++ return -ENOMEM; ++ ++ mutex_init(&info->lock); ++ mutex_lock_nested(&info->lock, subclass); ++ ++ info->lower_paths = NULL; ++ ++ dentry->d_fsdata = info; ++ ++ if (!__realloc_dentry_private_data(dentry)) ++ return 0; ++ ++ mutex_unlock(&info->lock); ++ free_dentry_private_data(dentry); ++ return -ENOMEM; ++} ++ ++/* ++ * scan through the lower dentry objects, and set bstart to reflect the ++ * starting branch ++ */ ++void update_bstart(struct dentry *dentry) ++{ ++ int bindex; ++ int bstart = dbstart(dentry); ++ int bend = dbend(dentry); ++ struct dentry *lower_dentry; ++ ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ if (!lower_dentry) ++ continue; ++ if (lower_dentry->d_inode) { ++ dbstart(dentry) = bindex; ++ break; ++ } ++ dput(lower_dentry); ++ unionfs_set_lower_dentry_idx(dentry, bindex, NULL); ++ } ++} ++ ++ ++/* ++ * Initialize a nameidata structure (the intent part) we can pass to a lower ++ * file system. Returns 0 on success or -error (only -ENOMEM possible). ++ * Inside that nd structure, this function may also return an allocated ++ * struct file (for open intents). The caller, when done with this nd, must ++ * kfree the intent file (using release_lower_nd). ++ * ++ * XXX: this code, and the callers of this code, should be redone using ++ * vfs_path_lookup() when (1) the nameidata structure is refactored into a ++ * separate intent-structure, and (2) open_namei() is broken into a VFS-only ++ * function and a method that other file systems can call. ++ */ ++int init_lower_nd(struct nameidata *nd, unsigned int flags) ++{ ++ int err = 0; ++#ifdef ALLOC_LOWER_ND_FILE ++ /* ++ * XXX: one day we may need to have the lower return an open file ++ * for us. It is not needed in 2.6.23-rc1 for nfs2/nfs3, but may ++ * very well be needed for nfs4. ++ */ ++ struct file *file; ++#endif /* ALLOC_LOWER_ND_FILE */ ++ ++ memset(nd, 0, sizeof(struct nameidata)); ++ if (!flags) ++ return err; ++ ++ switch (flags) { ++ case LOOKUP_CREATE: ++ nd->intent.open.flags |= O_CREAT; ++ /* fall through: shared code for create/open cases */ ++ case LOOKUP_OPEN: ++ nd->flags = flags; ++ nd->intent.open.flags |= (FMODE_READ | FMODE_WRITE); ++#ifdef ALLOC_LOWER_ND_FILE ++ file = kzalloc(sizeof(struct file), GFP_KERNEL); ++ if (unlikely(!file)) { ++ err = -ENOMEM; ++ break; /* exit switch statement and thus return */ ++ } ++ nd->intent.open.file = file; ++#endif /* ALLOC_LOWER_ND_FILE */ ++ break; ++ default: ++ /* ++ * We should never get here, for now. ++ * We can add new cases here later on. ++ */ ++ pr_debug("unionfs: unknown nameidata flag 0x%x\n", flags); ++ BUG(); ++ break; ++ } ++ ++ return err; ++} ++ ++void release_lower_nd(struct nameidata *nd, int err) ++{ ++ if (!nd->intent.open.file) ++ return; ++ else if (!err) ++ release_open_intent(nd); ++#ifdef ALLOC_LOWER_ND_FILE ++ kfree(nd->intent.open.file); ++#endif /* ALLOC_LOWER_ND_FILE */ ++} ++ ++/* ++ * Main (and complex) driver function for Unionfs's lookup ++ * ++ * Returns: NULL (ok), ERR_PTR if an error occurred, or a non-null non-error ++ * PTR if d_splice returned a different dentry. ++ * ++ * If lookupmode is INTERPOSE_PARTIAL/REVAL/REVAL_NEG, the passed dentry's ++ * inode info must be locked. If lookupmode is INTERPOSE_LOOKUP (i.e., a ++ * newly looked-up dentry), then unionfs_lookup_backend will return a locked ++ * dentry's info, which the caller must unlock. ++ */ ++struct dentry *unionfs_lookup_full(struct dentry *dentry, ++ struct dentry *parent, int lookupmode) ++{ ++ int err = 0; ++ struct dentry *lower_dentry = NULL; ++ struct vfsmount *lower_mnt; ++ struct vfsmount *lower_dir_mnt; ++ struct dentry *wh_lower_dentry = NULL; ++ struct dentry *lower_dir_dentry = NULL; ++ struct dentry *d_interposed = NULL; ++ int bindex, bstart, bend, bopaque; ++ int opaque, num_positive = 0; ++ const char *name; ++ int namelen; ++ int pos_start, pos_end; ++ ++ /* ++ * We should already have a lock on this dentry in the case of a ++ * partial lookup, or a revalidation. Otherwise it is returned from ++ * new_dentry_private_data already locked. ++ */ ++ verify_locked(dentry); ++ verify_locked(parent); ++ ++ /* must initialize dentry operations */ ++ dentry->d_op = &unionfs_dops; ++ ++ /* We never partial lookup the root directory. */ ++ if (IS_ROOT(dentry)) ++ goto out; ++ ++ name = dentry->d_name.name; ++ namelen = dentry->d_name.len; ++ ++ /* No dentries should get created for possible whiteout names. */ ++ if (!is_validname(name)) { ++ err = -EPERM; ++ goto out_free; ++ } ++ ++ /* Now start the actual lookup procedure. */ ++ bstart = dbstart(parent); ++ bend = dbend(parent); ++ bopaque = dbopaque(parent); ++ BUG_ON(bstart < 0); ++ ++ /* adjust bend to bopaque if needed */ ++ if ((bopaque >= 0) && (bopaque < bend)) ++ bend = bopaque; ++ ++ /* lookup all possible dentries */ ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ lower_mnt = unionfs_lower_mnt_idx(dentry, bindex); ++ ++ /* skip if we already have a positive lower dentry */ ++ if (lower_dentry) { ++ if (dbstart(dentry) < 0) ++ dbstart(dentry) = bindex; ++ if (bindex > dbend(dentry)) ++ dbend(dentry) = bindex; ++ if (lower_dentry->d_inode) ++ num_positive++; ++ continue; ++ } ++ ++ lower_dir_dentry = ++ unionfs_lower_dentry_idx(parent, bindex); ++ /* if the lower dentry's parent does not exist, skip this */ ++ if (!lower_dir_dentry || !lower_dir_dentry->d_inode) ++ continue; ++ ++ /* also skip it if the parent isn't a directory. */ ++ if (!S_ISDIR(lower_dir_dentry->d_inode->i_mode)) ++ continue; /* XXX: should be BUG_ON */ ++ ++ /* check for whiteouts: stop lookup if found */ ++ wh_lower_dentry = lookup_whiteout(name, lower_dir_dentry); ++ if (IS_ERR(wh_lower_dentry)) { ++ err = PTR_ERR(wh_lower_dentry); ++ goto out_free; ++ } ++ if (wh_lower_dentry->d_inode) { ++ dbend(dentry) = dbopaque(dentry) = bindex; ++ if (dbstart(dentry) < 0) ++ dbstart(dentry) = bindex; ++ dput(wh_lower_dentry); ++ break; ++ } ++ dput(wh_lower_dentry); ++ ++ /* Now do regular lookup; lookup @name */ ++ lower_dir_mnt = unionfs_lower_mnt_idx(parent, bindex); ++ lower_mnt = NULL; /* XXX: needed? */ ++ ++ lower_dentry = __lookup_one(lower_dir_dentry, lower_dir_mnt, ++ name, &lower_mnt); ++ ++ if (IS_ERR(lower_dentry)) { ++ err = PTR_ERR(lower_dentry); ++ goto out_free; ++ } ++ unionfs_set_lower_dentry_idx(dentry, bindex, lower_dentry); ++ if (!lower_mnt) ++ lower_mnt = unionfs_mntget(dentry->d_sb->s_root, ++ bindex); ++ unionfs_set_lower_mnt_idx(dentry, bindex, lower_mnt); ++ ++ /* adjust dbstart/end */ ++ if (dbstart(dentry) < 0) ++ dbstart(dentry) = bindex; ++ if (bindex > dbend(dentry)) ++ dbend(dentry) = bindex; ++ /* ++ * We always store the lower dentries above, and update ++ * dbstart/dbend, even if the whole unionfs dentry is ++ * negative (i.e., no lower inodes). ++ */ ++ if (!lower_dentry->d_inode) ++ continue; ++ num_positive++; ++ ++ /* ++ * check if we just found an opaque directory, if so, stop ++ * lookups here. ++ */ ++ if (!S_ISDIR(lower_dentry->d_inode->i_mode)) ++ continue; ++ opaque = is_opaque_dir(dentry, bindex); ++ if (opaque < 0) { ++ err = opaque; ++ goto out_free; ++ } else if (opaque) { ++ dbend(dentry) = dbopaque(dentry) = bindex; ++ break; ++ } ++ dbend(dentry) = bindex; ++ ++ /* update parent directory's atime with the bindex */ ++ fsstack_copy_attr_atime(parent->d_inode, ++ lower_dir_dentry->d_inode); ++ } ++ ++ /* sanity checks, then decide if to process a negative dentry */ ++ BUG_ON(dbstart(dentry) < 0 && dbend(dentry) >= 0); ++ BUG_ON(dbstart(dentry) >= 0 && dbend(dentry) < 0); ++ ++ if (num_positive > 0) ++ goto out_positive; ++ ++ /*** handle NEGATIVE dentries ***/ ++ ++ /* ++ * If negative, keep only first lower negative dentry, to save on ++ * memory. ++ */ ++ if (dbstart(dentry) < dbend(dentry)) { ++ path_put_lowers(dentry, dbstart(dentry) + 1, ++ dbend(dentry), false); ++ dbend(dentry) = dbstart(dentry); ++ } ++ if (lookupmode == INTERPOSE_PARTIAL) ++ goto out; ++ if (lookupmode == INTERPOSE_LOOKUP) { ++ /* ++ * If all we found was a whiteout in the first available ++ * branch, then create a negative dentry for a possibly new ++ * file to be created. ++ */ ++ if (dbopaque(dentry) < 0) ++ goto out; ++ /* XXX: need to get mnt here */ ++ bindex = dbstart(dentry); ++ if (unionfs_lower_dentry_idx(dentry, bindex)) ++ goto out; ++ lower_dir_dentry = ++ unionfs_lower_dentry_idx(parent, bindex); ++ if (!lower_dir_dentry || !lower_dir_dentry->d_inode) ++ goto out; ++ if (!S_ISDIR(lower_dir_dentry->d_inode->i_mode)) ++ goto out; /* XXX: should be BUG_ON */ ++ /* XXX: do we need to cross bind mounts here? */ ++ lower_dentry = lookup_lck_len(name, lower_dir_dentry, namelen); ++ if (IS_ERR(lower_dentry)) { ++ err = PTR_ERR(lower_dentry); ++ goto out; ++ } ++ /* XXX: need to mntget/mntput as needed too! */ ++ unionfs_set_lower_dentry_idx(dentry, bindex, lower_dentry); ++ /* XXX: wrong mnt for crossing bind mounts! */ ++ lower_mnt = unionfs_mntget(dentry->d_sb->s_root, bindex); ++ unionfs_set_lower_mnt_idx(dentry, bindex, lower_mnt); ++ ++ goto out; ++ } ++ ++ /* if we're revalidating a positive dentry, don't make it negative */ ++ if (lookupmode != INTERPOSE_REVAL) ++ d_add(dentry, NULL); ++ ++ goto out; ++ ++out_positive: ++ /*** handle POSITIVE dentries ***/ ++ ++ /* ++ * This unionfs dentry is positive (at least one lower inode ++ * exists), so scan entire dentry from beginning to end, and remove ++ * any negative lower dentries, if any. Then, update dbstart/dbend ++ * to reflect the start/end of positive dentries. ++ */ ++ pos_start = pos_end = -1; ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_dentry = unionfs_lower_dentry_idx(dentry, ++ bindex); ++ if (lower_dentry && lower_dentry->d_inode) { ++ if (pos_start < 0) ++ pos_start = bindex; ++ if (bindex > pos_end) ++ pos_end = bindex; ++ continue; ++ } ++ path_put_lowers(dentry, bindex, bindex, false); ++ } ++ if (pos_start >= 0) ++ dbstart(dentry) = pos_start; ++ if (pos_end >= 0) ++ dbend(dentry) = pos_end; ++ ++ /* Partial lookups need to re-interpose, or throw away older negs. */ ++ if (lookupmode == INTERPOSE_PARTIAL) { ++ if (dentry->d_inode) { ++ unionfs_reinterpose(dentry); ++ goto out; ++ } ++ ++ /* ++ * This dentry was positive, so it is as if we had a ++ * negative revalidation. ++ */ ++ lookupmode = INTERPOSE_REVAL_NEG; ++ update_bstart(dentry); ++ } ++ ++ /* ++ * Interpose can return a dentry if d_splice returned a different ++ * dentry. ++ */ ++ d_interposed = unionfs_interpose(dentry, dentry->d_sb, lookupmode); ++ if (IS_ERR(d_interposed)) ++ err = PTR_ERR(d_interposed); ++ else if (d_interposed) ++ dentry = d_interposed; ++ ++ if (!err) ++ goto out; ++ d_drop(dentry); ++ ++out_free: ++ /* should dput/mntput all the underlying dentries on error condition */ ++ if (dbstart(dentry) >= 0) ++ path_put_lowers_all(dentry, false); ++ /* free lower_paths unconditionally */ ++ kfree(UNIONFS_D(dentry)->lower_paths); ++ UNIONFS_D(dentry)->lower_paths = NULL; ++ ++out: ++ if (dentry && UNIONFS_D(dentry)) { ++ BUG_ON(dbstart(dentry) < 0 && dbend(dentry) >= 0); ++ BUG_ON(dbstart(dentry) >= 0 && dbend(dentry) < 0); ++ } ++ if (d_interposed && UNIONFS_D(d_interposed)) { ++ BUG_ON(dbstart(d_interposed) < 0 && dbend(d_interposed) >= 0); ++ BUG_ON(dbstart(d_interposed) >= 0 && dbend(d_interposed) < 0); ++ } ++ ++ if (!err && d_interposed) ++ return d_interposed; ++ return ERR_PTR(err); ++} +diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c +new file mode 100644 +index 0000000..fa52f61 +--- /dev/null ++++ b/fs/unionfs/main.c +@@ -0,0 +1,763 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005-2006 Junjiro Okajima ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++#include ++#include ++ ++static void unionfs_fill_inode(struct dentry *dentry, ++ struct inode *inode) ++{ ++ struct inode *lower_inode; ++ struct dentry *lower_dentry; ++ int bindex, bstart, bend; ++ ++ bstart = dbstart(dentry); ++ bend = dbend(dentry); ++ ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ if (!lower_dentry) { ++ unionfs_set_lower_inode_idx(inode, bindex, NULL); ++ continue; ++ } ++ ++ /* Initialize the lower inode to the new lower inode. */ ++ if (!lower_dentry->d_inode) ++ continue; ++ ++ unionfs_set_lower_inode_idx(inode, bindex, ++ igrab(lower_dentry->d_inode)); ++ } ++ ++ ibstart(inode) = dbstart(dentry); ++ ibend(inode) = dbend(dentry); ++ ++ /* Use attributes from the first branch. */ ++ lower_inode = unionfs_lower_inode(inode); ++ ++ /* Use different set of inode ops for symlinks & directories */ ++ if (S_ISLNK(lower_inode->i_mode)) ++ inode->i_op = &unionfs_symlink_iops; ++ else if (S_ISDIR(lower_inode->i_mode)) ++ inode->i_op = &unionfs_dir_iops; ++ ++ /* Use different set of file ops for directories */ ++ if (S_ISDIR(lower_inode->i_mode)) ++ inode->i_fop = &unionfs_dir_fops; ++ ++ /* properly initialize special inodes */ ++ if (S_ISBLK(lower_inode->i_mode) || S_ISCHR(lower_inode->i_mode) || ++ S_ISFIFO(lower_inode->i_mode) || S_ISSOCK(lower_inode->i_mode)) ++ init_special_inode(inode, lower_inode->i_mode, ++ lower_inode->i_rdev); ++ ++ /* all well, copy inode attributes */ ++ unionfs_copy_attr_all(inode, lower_inode); ++ fsstack_copy_inode_size(inode, lower_inode); ++} ++ ++/* ++ * Connect a unionfs inode dentry/inode with several lower ones. This is ++ * the classic stackable file system "vnode interposition" action. ++ * ++ * @sb: unionfs's super_block ++ */ ++struct dentry *unionfs_interpose(struct dentry *dentry, struct super_block *sb, ++ int flag) ++{ ++ int err = 0; ++ struct inode *inode; ++ int need_fill_inode = 1; ++ struct dentry *spliced = NULL; ++ ++ verify_locked(dentry); ++ ++ /* ++ * We allocate our new inode below by calling unionfs_iget, ++ * which will initialize some of the new inode's fields ++ */ ++ ++ /* ++ * On revalidate we've already got our own inode and just need ++ * to fix it up. ++ */ ++ if (flag == INTERPOSE_REVAL) { ++ inode = dentry->d_inode; ++ UNIONFS_I(inode)->bstart = -1; ++ UNIONFS_I(inode)->bend = -1; ++ atomic_set(&UNIONFS_I(inode)->generation, ++ atomic_read(&UNIONFS_SB(sb)->generation)); ++ ++ UNIONFS_I(inode)->lower_inodes = ++ kcalloc(sbmax(sb), sizeof(struct inode *), GFP_KERNEL); ++ if (unlikely(!UNIONFS_I(inode)->lower_inodes)) { ++ err = -ENOMEM; ++ goto out; ++ } ++ } else { ++ /* get unique inode number for unionfs */ ++ inode = unionfs_iget(sb, iunique(sb, UNIONFS_ROOT_INO)); ++ if (IS_ERR(inode)) { ++ err = PTR_ERR(inode); ++ goto out; ++ } ++ if (atomic_read(&inode->i_count) > 1) ++ goto skip; ++ } ++ ++ need_fill_inode = 0; ++ unionfs_fill_inode(dentry, inode); ++ ++skip: ++ /* only (our) lookup wants to do a d_add */ ++ switch (flag) { ++ case INTERPOSE_DEFAULT: ++ /* for operations which create new inodes */ ++ d_add(dentry, inode); ++ break; ++ case INTERPOSE_REVAL_NEG: ++ d_instantiate(dentry, inode); ++ break; ++ case INTERPOSE_LOOKUP: ++ spliced = d_splice_alias(inode, dentry); ++ if (spliced && spliced != dentry) { ++ /* ++ * d_splice can return a dentry if it was ++ * disconnected and had to be moved. We must ensure ++ * that the private data of the new dentry is ++ * correct and that the inode info was filled ++ * properly. Finally we must return this new ++ * dentry. ++ */ ++ spliced->d_op = &unionfs_dops; ++ spliced->d_fsdata = dentry->d_fsdata; ++ dentry->d_fsdata = NULL; ++ dentry = spliced; ++ if (need_fill_inode) { ++ need_fill_inode = 0; ++ unionfs_fill_inode(dentry, inode); ++ } ++ goto out_spliced; ++ } else if (!spliced) { ++ if (need_fill_inode) { ++ need_fill_inode = 0; ++ unionfs_fill_inode(dentry, inode); ++ goto out_spliced; ++ } ++ } ++ break; ++ case INTERPOSE_REVAL: ++ /* Do nothing. */ ++ break; ++ default: ++ printk(KERN_CRIT "unionfs: invalid interpose flag passed!\n"); ++ BUG(); ++ } ++ goto out; ++ ++out_spliced: ++ if (!err) ++ return spliced; ++out: ++ return ERR_PTR(err); ++} ++ ++/* like interpose above, but for an already existing dentry */ ++void unionfs_reinterpose(struct dentry *dentry) ++{ ++ struct dentry *lower_dentry; ++ struct inode *inode; ++ int bindex, bstart, bend; ++ ++ verify_locked(dentry); ++ ++ /* This is pre-allocated inode */ ++ inode = dentry->d_inode; ++ ++ bstart = dbstart(dentry); ++ bend = dbend(dentry); ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ if (!lower_dentry) ++ continue; ++ ++ if (!lower_dentry->d_inode) ++ continue; ++ if (unionfs_lower_inode_idx(inode, bindex)) ++ continue; ++ unionfs_set_lower_inode_idx(inode, bindex, ++ igrab(lower_dentry->d_inode)); ++ } ++ ibstart(inode) = dbstart(dentry); ++ ibend(inode) = dbend(dentry); ++} ++ ++/* ++ * make sure the branch we just looked up (nd) makes sense: ++ * ++ * 1) we're not trying to stack unionfs on top of unionfs ++ * 2) it exists ++ * 3) is a directory ++ */ ++int check_branch(const struct path *path) ++{ ++ /* XXX: remove in ODF code -- stacking unions allowed there */ ++ if (!strcmp(path->dentry->d_sb->s_type->name, UNIONFS_NAME)) ++ return -EINVAL; ++ if (!path->dentry->d_inode) ++ return -ENOENT; ++ if (!S_ISDIR(path->dentry->d_inode->i_mode)) ++ return -ENOTDIR; ++ return 0; ++} ++ ++/* checks if two lower_dentries have overlapping branches */ ++static int is_branch_overlap(struct dentry *dent1, struct dentry *dent2) ++{ ++ struct dentry *dent = NULL; ++ ++ dent = dent1; ++ while ((dent != dent2) && (dent->d_parent != dent)) ++ dent = dent->d_parent; ++ ++ if (dent == dent2) ++ return 1; ++ ++ dent = dent2; ++ while ((dent != dent1) && (dent->d_parent != dent)) ++ dent = dent->d_parent; ++ ++ return (dent == dent1); ++} ++ ++/* ++ * Parse "ro" or "rw" options, but default to "rw" if no mode options was ++ * specified. Fill the mode bits in @perms. If encounter an unknown ++ * string, return -EINVAL. Otherwise return 0. ++ */ ++int parse_branch_mode(const char *name, int *perms) ++{ ++ if (!name || !strcmp(name, "rw")) { ++ *perms = MAY_READ | MAY_WRITE; ++ return 0; ++ } ++ if (!strcmp(name, "ro")) { ++ *perms = MAY_READ; ++ return 0; ++ } ++ return -EINVAL; ++} ++ ++/* ++ * parse the dirs= mount argument ++ * ++ * We don't need to lock the superblock private data's rwsem, as we get ++ * called only by unionfs_read_super - it is still a long time before anyone ++ * can even get a reference to us. ++ */ ++static int parse_dirs_option(struct super_block *sb, struct unionfs_dentry_info ++ *lower_root_info, char *options) ++{ ++ struct path path; ++ char *name; ++ int err = 0; ++ int branches = 1; ++ int bindex = 0; ++ int i = 0; ++ int j = 0; ++ struct dentry *dent1; ++ struct dentry *dent2; ++ ++ if (options[0] == '\0') { ++ printk(KERN_ERR "unionfs: no branches specified\n"); ++ err = -EINVAL; ++ goto out_return; ++ } ++ ++ /* ++ * Each colon means we have a separator, this is really just a rough ++ * guess, since strsep will handle empty fields for us. ++ */ ++ for (i = 0; options[i]; i++) ++ if (options[i] == ':') ++ branches++; ++ ++ /* allocate space for underlying pointers to lower dentry */ ++ UNIONFS_SB(sb)->data = ++ kcalloc(branches, sizeof(struct unionfs_data), GFP_KERNEL); ++ if (unlikely(!UNIONFS_SB(sb)->data)) { ++ err = -ENOMEM; ++ goto out_return; ++ } ++ ++ lower_root_info->lower_paths = ++ kcalloc(branches, sizeof(struct path), GFP_KERNEL); ++ if (unlikely(!lower_root_info->lower_paths)) { ++ err = -ENOMEM; ++ /* free the underlying pointer array */ ++ kfree(UNIONFS_SB(sb)->data); ++ UNIONFS_SB(sb)->data = NULL; ++ goto out_return; ++ } ++ ++ /* now parsing a string such as "b1:b2=rw:b3=ro:b4" */ ++ branches = 0; ++ while ((name = strsep(&options, ":")) != NULL) { ++ int perms; ++ char *mode = strchr(name, '='); ++ ++ if (!name) ++ continue; ++ if (!*name) { /* bad use of ':' (extra colons) */ ++ err = -EINVAL; ++ goto out; ++ } ++ ++ branches++; ++ ++ /* strip off '=' if any */ ++ if (mode) ++ *mode++ = '\0'; ++ ++ err = parse_branch_mode(mode, &perms); ++ if (err) { ++ printk(KERN_ERR "unionfs: invalid mode \"%s\" for " ++ "branch %d\n", mode, bindex); ++ goto out; ++ } ++ /* ensure that leftmost branch is writeable */ ++ if (!bindex && !(perms & MAY_WRITE)) { ++ printk(KERN_ERR "unionfs: leftmost branch cannot be " ++ "read-only (use \"-o ro\" to create a " ++ "read-only union)\n"); ++ err = -EINVAL; ++ goto out; ++ } ++ ++ err = kern_path(name, LOOKUP_FOLLOW, &path); ++ if (err) { ++ printk(KERN_ERR "unionfs: error accessing " ++ "lower directory '%s' (error %d)\n", ++ name, err); ++ goto out; ++ } ++ ++ err = check_branch(&path); ++ if (err) { ++ printk(KERN_ERR "unionfs: lower directory " ++ "'%s' is not a valid branch\n", name); ++ path_put(&path); ++ goto out; ++ } ++ ++ lower_root_info->lower_paths[bindex].dentry = path.dentry; ++ lower_root_info->lower_paths[bindex].mnt = path.mnt; ++ ++ set_branchperms(sb, bindex, perms); ++ set_branch_count(sb, bindex, 0); ++ new_branch_id(sb, bindex); ++ ++ if (lower_root_info->bstart < 0) ++ lower_root_info->bstart = bindex; ++ lower_root_info->bend = bindex; ++ bindex++; ++ } ++ ++ if (branches == 0) { ++ printk(KERN_ERR "unionfs: no branches specified\n"); ++ err = -EINVAL; ++ goto out; ++ } ++ ++ BUG_ON(branches != (lower_root_info->bend + 1)); ++ ++ /* ++ * Ensure that no overlaps exist in the branches. ++ * ++ * This test is required because the Linux kernel has no support ++ * currently for ensuring coherency between stackable layers and ++ * branches. If we were to allow overlapping branches, it would be ++ * possible, for example, to delete a file via one branch, which ++ * would not be reflected in another branch. Such incoherency could ++ * lead to inconsistencies and even kernel oopses. Rather than ++ * implement hacks to work around some of these cache-coherency ++ * problems, we prevent branch overlapping, for now. A complete ++ * solution will involve proper kernel/VFS support for cache ++ * coherency, at which time we could safely remove this ++ * branch-overlapping test. ++ */ ++ for (i = 0; i < branches; i++) { ++ dent1 = lower_root_info->lower_paths[i].dentry; ++ for (j = i + 1; j < branches; j++) { ++ dent2 = lower_root_info->lower_paths[j].dentry; ++ if (is_branch_overlap(dent1, dent2)) { ++ printk(KERN_ERR "unionfs: branches %d and " ++ "%d overlap\n", i, j); ++ err = -EINVAL; ++ goto out; ++ } ++ } ++ } ++ ++out: ++ if (err) { ++ for (i = 0; i < branches; i++) ++ path_put(&lower_root_info->lower_paths[i]); ++ ++ kfree(lower_root_info->lower_paths); ++ kfree(UNIONFS_SB(sb)->data); ++ ++ /* ++ * MUST clear the pointers to prevent potential double free if ++ * the caller dies later on ++ */ ++ lower_root_info->lower_paths = NULL; ++ UNIONFS_SB(sb)->data = NULL; ++ } ++out_return: ++ return err; ++} ++ ++/* ++ * Parse mount options. See the manual page for usage instructions. ++ * ++ * Returns the dentry object of the lower-level (lower) directory; ++ * We want to mount our stackable file system on top of that lower directory. ++ */ ++static struct unionfs_dentry_info *unionfs_parse_options( ++ struct super_block *sb, ++ char *options) ++{ ++ struct unionfs_dentry_info *lower_root_info; ++ char *optname; ++ int err = 0; ++ int bindex; ++ int dirsfound = 0; ++ ++ /* allocate private data area */ ++ err = -ENOMEM; ++ lower_root_info = ++ kzalloc(sizeof(struct unionfs_dentry_info), GFP_KERNEL); ++ if (unlikely(!lower_root_info)) ++ goto out_error; ++ lower_root_info->bstart = -1; ++ lower_root_info->bend = -1; ++ lower_root_info->bopaque = -1; ++ ++ while ((optname = strsep(&options, ",")) != NULL) { ++ char *optarg; ++ ++ if (!optname || !*optname) ++ continue; ++ ++ optarg = strchr(optname, '='); ++ if (optarg) ++ *optarg++ = '\0'; ++ ++ /* ++ * All of our options take an argument now. Insert ones that ++ * don't, above this check. ++ */ ++ if (!optarg) { ++ printk(KERN_ERR "unionfs: %s requires an argument\n", ++ optname); ++ err = -EINVAL; ++ goto out_error; ++ } ++ ++ if (!strcmp("dirs", optname)) { ++ if (++dirsfound > 1) { ++ printk(KERN_ERR ++ "unionfs: multiple dirs specified\n"); ++ err = -EINVAL; ++ goto out_error; ++ } ++ err = parse_dirs_option(sb, lower_root_info, optarg); ++ if (err) ++ goto out_error; ++ continue; ++ } ++ ++ err = -EINVAL; ++ printk(KERN_ERR ++ "unionfs: unrecognized option '%s'\n", optname); ++ goto out_error; ++ } ++ if (dirsfound != 1) { ++ printk(KERN_ERR "unionfs: dirs option required\n"); ++ err = -EINVAL; ++ goto out_error; ++ } ++ goto out; ++ ++out_error: ++ if (lower_root_info && lower_root_info->lower_paths) { ++ for (bindex = lower_root_info->bstart; ++ bindex >= 0 && bindex <= lower_root_info->bend; ++ bindex++) ++ path_put(&lower_root_info->lower_paths[bindex]); ++ } ++ ++ kfree(lower_root_info->lower_paths); ++ kfree(lower_root_info); ++ ++ kfree(UNIONFS_SB(sb)->data); ++ UNIONFS_SB(sb)->data = NULL; ++ ++ lower_root_info = ERR_PTR(err); ++out: ++ return lower_root_info; ++} ++ ++/* ++ * our custom d_alloc_root work-alike ++ * ++ * we can't use d_alloc_root if we want to use our own interpose function ++ * unchanged, so we simply call our own "fake" d_alloc_root ++ */ ++static struct dentry *unionfs_d_alloc_root(struct super_block *sb) ++{ ++ struct dentry *ret = NULL; ++ ++ if (sb) { ++ static const struct qstr name = { ++ .name = "/", ++ .len = 1 ++ }; ++ ++ ret = d_alloc(NULL, &name); ++ if (likely(ret)) { ++ ret->d_op = &unionfs_dops; ++ ret->d_sb = sb; ++ ret->d_parent = ret; ++ } ++ } ++ return ret; ++} ++ ++/* ++ * There is no need to lock the unionfs_super_info's rwsem as there is no ++ * way anyone can have a reference to the superblock at this point in time. ++ */ ++static int unionfs_read_super(struct super_block *sb, void *raw_data, ++ int silent) ++{ ++ int err = 0; ++ struct unionfs_dentry_info *lower_root_info = NULL; ++ int bindex, bstart, bend; ++ ++ if (!raw_data) { ++ printk(KERN_ERR ++ "unionfs: read_super: missing data argument\n"); ++ err = -EINVAL; ++ goto out; ++ } ++ ++ /* Allocate superblock private data */ ++ sb->s_fs_info = kzalloc(sizeof(struct unionfs_sb_info), GFP_KERNEL); ++ if (unlikely(!UNIONFS_SB(sb))) { ++ printk(KERN_CRIT "unionfs: read_super: out of memory\n"); ++ err = -ENOMEM; ++ goto out; ++ } ++ ++ UNIONFS_SB(sb)->bend = -1; ++ atomic_set(&UNIONFS_SB(sb)->generation, 1); ++ init_rwsem(&UNIONFS_SB(sb)->rwsem); ++ UNIONFS_SB(sb)->high_branch_id = -1; /* -1 == invalid branch ID */ ++ ++ lower_root_info = unionfs_parse_options(sb, raw_data); ++ if (IS_ERR(lower_root_info)) { ++ printk(KERN_ERR ++ "unionfs: read_super: error while parsing options " ++ "(err = %ld)\n", PTR_ERR(lower_root_info)); ++ err = PTR_ERR(lower_root_info); ++ lower_root_info = NULL; ++ goto out_free; ++ } ++ if (lower_root_info->bstart == -1) { ++ err = -ENOENT; ++ goto out_free; ++ } ++ ++ /* set the lower superblock field of upper superblock */ ++ bstart = lower_root_info->bstart; ++ BUG_ON(bstart != 0); ++ sbend(sb) = bend = lower_root_info->bend; ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ struct dentry *d = lower_root_info->lower_paths[bindex].dentry; ++ atomic_inc(&d->d_sb->s_active); ++ unionfs_set_lower_super_idx(sb, bindex, d->d_sb); ++ } ++ ++ /* max Bytes is the maximum bytes from highest priority branch */ ++ sb->s_maxbytes = unionfs_lower_super_idx(sb, 0)->s_maxbytes; ++ ++ /* ++ * Our c/m/atime granularity is 1 ns because we may stack on file ++ * systems whose granularity is as good. This is important for our ++ * time-based cache coherency. ++ */ ++ sb->s_time_gran = 1; ++ ++ sb->s_op = &unionfs_sops; ++ ++ /* See comment next to the definition of unionfs_d_alloc_root */ ++ sb->s_root = unionfs_d_alloc_root(sb); ++ if (unlikely(!sb->s_root)) { ++ err = -ENOMEM; ++ goto out_dput; ++ } ++ ++ /* link the upper and lower dentries */ ++ sb->s_root->d_fsdata = NULL; ++ err = new_dentry_private_data(sb->s_root, UNIONFS_DMUTEX_ROOT); ++ if (unlikely(err)) ++ goto out_freedpd; ++ ++ /* Set the lower dentries for s_root */ ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ struct dentry *d; ++ struct vfsmount *m; ++ ++ d = lower_root_info->lower_paths[bindex].dentry; ++ m = lower_root_info->lower_paths[bindex].mnt; ++ ++ unionfs_set_lower_dentry_idx(sb->s_root, bindex, d); ++ unionfs_set_lower_mnt_idx(sb->s_root, bindex, m); ++ } ++ dbstart(sb->s_root) = bstart; ++ dbend(sb->s_root) = bend; ++ ++ /* Set the generation number to one, since this is for the mount. */ ++ atomic_set(&UNIONFS_D(sb->s_root)->generation, 1); ++ ++ /* ++ * Call interpose to create the upper level inode. Only ++ * INTERPOSE_LOOKUP can return a value other than 0 on err. ++ */ ++ err = PTR_ERR(unionfs_interpose(sb->s_root, sb, 0)); ++ unionfs_unlock_dentry(sb->s_root); ++ if (!err) ++ goto out; ++ /* else fall through */ ++ ++out_freedpd: ++ if (UNIONFS_D(sb->s_root)) { ++ kfree(UNIONFS_D(sb->s_root)->lower_paths); ++ free_dentry_private_data(sb->s_root); ++ } ++ dput(sb->s_root); ++ ++out_dput: ++ if (lower_root_info && !IS_ERR(lower_root_info)) { ++ for (bindex = lower_root_info->bstart; ++ bindex <= lower_root_info->bend; bindex++) { ++ struct dentry *d; ++ d = lower_root_info->lower_paths[bindex].dentry; ++ /* drop refs we took earlier */ ++ atomic_dec(&d->d_sb->s_active); ++ path_put(&lower_root_info->lower_paths[bindex]); ++ } ++ kfree(lower_root_info->lower_paths); ++ kfree(lower_root_info); ++ lower_root_info = NULL; ++ } ++ ++out_free: ++ kfree(UNIONFS_SB(sb)->data); ++ kfree(UNIONFS_SB(sb)); ++ sb->s_fs_info = NULL; ++ ++out: ++ if (lower_root_info && !IS_ERR(lower_root_info)) { ++ kfree(lower_root_info->lower_paths); ++ kfree(lower_root_info); ++ } ++ return err; ++} ++ ++static struct dentry *unionfs_mount(struct file_system_type *fs_type, ++ int flags, const char *dev_name, ++ void *raw_data) ++{ ++ struct dentry *dentry; ++ ++ dentry = mount_nodev(fs_type, flags, raw_data, unionfs_read_super); ++ if (!PTR_ERR(dentry)) ++ UNIONFS_SB(dentry->d_sb)->dev_name = ++ kstrdup(dev_name, GFP_KERNEL); ++ return dentry; ++} ++ ++static struct file_system_type unionfs_fs_type = { ++ .owner = THIS_MODULE, ++ .name = UNIONFS_NAME, ++ .mount = unionfs_mount, ++ .kill_sb = generic_shutdown_super, ++ .fs_flags = FS_REVAL_DOT, ++}; ++ ++static int __init init_unionfs_fs(void) ++{ ++ int err; ++ ++ pr_info("Registering unionfs " UNIONFS_VERSION "\n"); ++ ++ err = unionfs_init_filldir_cache(); ++ if (unlikely(err)) ++ goto out; ++ err = unionfs_init_inode_cache(); ++ if (unlikely(err)) ++ goto out; ++ err = unionfs_init_dentry_cache(); ++ if (unlikely(err)) ++ goto out; ++ err = init_sioq(); ++ if (unlikely(err)) ++ goto out; ++ err = register_filesystem(&unionfs_fs_type); ++out: ++ if (unlikely(err)) { ++ stop_sioq(); ++ unionfs_destroy_filldir_cache(); ++ unionfs_destroy_inode_cache(); ++ unionfs_destroy_dentry_cache(); ++ } ++ return err; ++} ++ ++static void __exit exit_unionfs_fs(void) ++{ ++ stop_sioq(); ++ unionfs_destroy_filldir_cache(); ++ unionfs_destroy_inode_cache(); ++ unionfs_destroy_dentry_cache(); ++ unregister_filesystem(&unionfs_fs_type); ++ pr_info("Completed unionfs module unload\n"); ++} ++ ++MODULE_AUTHOR("Erez Zadok, Filesystems and Storage Lab, Stony Brook University" ++ " (http://www.fsl.cs.sunysb.edu)"); ++MODULE_DESCRIPTION("Unionfs " UNIONFS_VERSION ++ " (http://unionfs.filesystems.org)"); ++MODULE_LICENSE("GPL"); ++ ++module_init(init_unionfs_fs); ++module_exit(exit_unionfs_fs); +diff --git a/fs/unionfs/mmap.c b/fs/unionfs/mmap.c +new file mode 100644 +index 0000000..bcc5652 +--- /dev/null ++++ b/fs/unionfs/mmap.c +@@ -0,0 +1,89 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005-2006 Junjiro Okajima ++ * Copyright (c) 2006 Shaya Potter ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++ ++ ++/* ++ * XXX: we need a dummy readpage handler because generic_file_mmap (which we ++ * use in unionfs_mmap) checks for the existence of ++ * mapping->a_ops->readpage, else it returns -ENOEXEC. The VFS will need to ++ * be fixed to allow a file system to define vm_ops->fault without any ++ * address_space_ops whatsoever. ++ * ++ * Otherwise, we don't want to use our readpage method at all. ++ */ ++static int unionfs_readpage(struct file *file, struct page *page) ++{ ++ BUG(); ++ return -EINVAL; ++} ++ ++static int unionfs_fault(struct vm_area_struct *vma, struct vm_fault *vmf) ++{ ++ int err; ++ struct file *file, *lower_file; ++ const struct vm_operations_struct *lower_vm_ops; ++ struct vm_area_struct lower_vma; ++ ++ BUG_ON(!vma); ++ memcpy(&lower_vma, vma, sizeof(struct vm_area_struct)); ++ file = lower_vma.vm_file; ++ lower_vm_ops = UNIONFS_F(file)->lower_vm_ops; ++ BUG_ON(!lower_vm_ops); ++ ++ lower_file = unionfs_lower_file(file); ++ BUG_ON(!lower_file); ++ /* ++ * XXX: vm_ops->fault may be called in parallel. Because we have to ++ * resort to temporarily changing the vma->vm_file to point to the ++ * lower file, a concurrent invocation of unionfs_fault could see a ++ * different value. In this workaround, we keep a different copy of ++ * the vma structure in our stack, so we never expose a different ++ * value of the vma->vm_file called to us, even temporarily. A ++ * better fix would be to change the calling semantics of ->fault to ++ * take an explicit file pointer. ++ */ ++ lower_vma.vm_file = lower_file; ++ err = lower_vm_ops->fault(&lower_vma, vmf); ++ return err; ++} ++ ++/* ++ * XXX: the default address_space_ops for unionfs is empty. We cannot set ++ * our inode->i_mapping->a_ops to NULL because too many code paths expect ++ * the a_ops vector to be non-NULL. ++ */ ++struct address_space_operations unionfs_aops = { ++ /* empty on purpose */ ++}; ++ ++/* ++ * XXX: we need a second, dummy address_space_ops vector, to be used ++ * temporarily during unionfs_mmap, because the latter calls ++ * generic_file_mmap, which checks if ->readpage exists, else returns ++ * -ENOEXEC. ++ */ ++struct address_space_operations unionfs_dummy_aops = { ++ .readpage = unionfs_readpage, ++}; ++ ++struct vm_operations_struct unionfs_vm_ops = { ++ .fault = unionfs_fault, ++}; +diff --git a/fs/unionfs/rdstate.c b/fs/unionfs/rdstate.c +new file mode 100644 +index 0000000..59b7333 +--- /dev/null ++++ b/fs/unionfs/rdstate.c +@@ -0,0 +1,285 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005-2006 Junjiro Okajima ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++ ++/* This file contains the routines for maintaining readdir state. */ ++ ++/* ++ * There are two structures here, rdstate which is a hash table ++ * of the second structure which is a filldir_node. ++ */ ++ ++/* ++ * This is a struct kmem_cache for filldir nodes, because we allocate a lot ++ * of them and they shouldn't waste memory. If the node has a small name ++ * (as defined by the dentry structure), then we use an inline name to ++ * preserve kmalloc space. ++ */ ++static struct kmem_cache *unionfs_filldir_cachep; ++ ++int unionfs_init_filldir_cache(void) ++{ ++ unionfs_filldir_cachep = ++ kmem_cache_create("unionfs_filldir", ++ sizeof(struct filldir_node), 0, ++ SLAB_RECLAIM_ACCOUNT, NULL); ++ ++ return (unionfs_filldir_cachep ? 0 : -ENOMEM); ++} ++ ++void unionfs_destroy_filldir_cache(void) ++{ ++ if (unionfs_filldir_cachep) ++ kmem_cache_destroy(unionfs_filldir_cachep); ++} ++ ++/* ++ * This is a tuning parameter that tells us roughly how big to make the ++ * hash table in directory entries per page. This isn't perfect, but ++ * at least we get a hash table size that shouldn't be too overloaded. ++ * The following averages are based on my home directory. ++ * 14.44693 Overall ++ * 12.29 Single Page Directories ++ * 117.93 Multi-page directories ++ */ ++#define DENTPAGE 4096 ++#define DENTPERONEPAGE 12 ++#define DENTPERPAGE 118 ++#define MINHASHSIZE 1 ++static int guesstimate_hash_size(struct inode *inode) ++{ ++ struct inode *lower_inode; ++ int bindex; ++ int hashsize = MINHASHSIZE; ++ ++ if (UNIONFS_I(inode)->hashsize > 0) ++ return UNIONFS_I(inode)->hashsize; ++ ++ for (bindex = ibstart(inode); bindex <= ibend(inode); bindex++) { ++ lower_inode = unionfs_lower_inode_idx(inode, bindex); ++ if (!lower_inode) ++ continue; ++ ++ if (i_size_read(lower_inode) == DENTPAGE) ++ hashsize += DENTPERONEPAGE; ++ else ++ hashsize += (i_size_read(lower_inode) / DENTPAGE) * ++ DENTPERPAGE; ++ } ++ ++ return hashsize; ++} ++ ++int init_rdstate(struct file *file) ++{ ++ BUG_ON(sizeof(loff_t) != ++ (sizeof(unsigned int) + sizeof(unsigned int))); ++ BUG_ON(UNIONFS_F(file)->rdstate != NULL); ++ ++ UNIONFS_F(file)->rdstate = alloc_rdstate(file->f_path.dentry->d_inode, ++ fbstart(file)); ++ ++ return (UNIONFS_F(file)->rdstate ? 0 : -ENOMEM); ++} ++ ++struct unionfs_dir_state *find_rdstate(struct inode *inode, loff_t fpos) ++{ ++ struct unionfs_dir_state *rdstate = NULL; ++ struct list_head *pos; ++ ++ spin_lock(&UNIONFS_I(inode)->rdlock); ++ list_for_each(pos, &UNIONFS_I(inode)->readdircache) { ++ struct unionfs_dir_state *r = ++ list_entry(pos, struct unionfs_dir_state, cache); ++ if (fpos == rdstate2offset(r)) { ++ UNIONFS_I(inode)->rdcount--; ++ list_del(&r->cache); ++ rdstate = r; ++ break; ++ } ++ } ++ spin_unlock(&UNIONFS_I(inode)->rdlock); ++ return rdstate; ++} ++ ++struct unionfs_dir_state *alloc_rdstate(struct inode *inode, int bindex) ++{ ++ int i = 0; ++ int hashsize; ++ unsigned long mallocsize = sizeof(struct unionfs_dir_state); ++ struct unionfs_dir_state *rdstate; ++ ++ hashsize = guesstimate_hash_size(inode); ++ mallocsize += hashsize * sizeof(struct list_head); ++ mallocsize = __roundup_pow_of_two(mallocsize); ++ ++ /* This should give us about 500 entries anyway. */ ++ if (mallocsize > PAGE_SIZE) ++ mallocsize = PAGE_SIZE; ++ ++ hashsize = (mallocsize - sizeof(struct unionfs_dir_state)) / ++ sizeof(struct list_head); ++ ++ rdstate = kmalloc(mallocsize, GFP_KERNEL); ++ if (unlikely(!rdstate)) ++ return NULL; ++ ++ spin_lock(&UNIONFS_I(inode)->rdlock); ++ if (UNIONFS_I(inode)->cookie >= (MAXRDCOOKIE - 1)) ++ UNIONFS_I(inode)->cookie = 1; ++ else ++ UNIONFS_I(inode)->cookie++; ++ ++ rdstate->cookie = UNIONFS_I(inode)->cookie; ++ spin_unlock(&UNIONFS_I(inode)->rdlock); ++ rdstate->offset = 1; ++ rdstate->access = jiffies; ++ rdstate->bindex = bindex; ++ rdstate->dirpos = 0; ++ rdstate->hashentries = 0; ++ rdstate->size = hashsize; ++ for (i = 0; i < rdstate->size; i++) ++ INIT_LIST_HEAD(&rdstate->list[i]); ++ ++ return rdstate; ++} ++ ++static void free_filldir_node(struct filldir_node *node) ++{ ++ if (node->namelen >= DNAME_INLINE_LEN) ++ kfree(node->name); ++ kmem_cache_free(unionfs_filldir_cachep, node); ++} ++ ++void free_rdstate(struct unionfs_dir_state *state) ++{ ++ struct filldir_node *tmp; ++ int i; ++ ++ for (i = 0; i < state->size; i++) { ++ struct list_head *head = &(state->list[i]); ++ struct list_head *pos, *n; ++ ++ /* traverse the list and deallocate space */ ++ list_for_each_safe(pos, n, head) { ++ tmp = list_entry(pos, struct filldir_node, file_list); ++ list_del(&tmp->file_list); ++ free_filldir_node(tmp); ++ } ++ } ++ ++ kfree(state); ++} ++ ++struct filldir_node *find_filldir_node(struct unionfs_dir_state *rdstate, ++ const char *name, int namelen, ++ int is_whiteout) ++{ ++ int index; ++ unsigned int hash; ++ struct list_head *head; ++ struct list_head *pos; ++ struct filldir_node *cursor = NULL; ++ int found = 0; ++ ++ BUG_ON(namelen <= 0); ++ ++ hash = full_name_hash(name, namelen); ++ index = hash % rdstate->size; ++ ++ head = &(rdstate->list[index]); ++ list_for_each(pos, head) { ++ cursor = list_entry(pos, struct filldir_node, file_list); ++ ++ if (cursor->namelen == namelen && cursor->hash == hash && ++ !strncmp(cursor->name, name, namelen)) { ++ /* ++ * a duplicate exists, and hence no need to create ++ * entry to the list ++ */ ++ found = 1; ++ ++ /* ++ * if a duplicate is found in this branch, and is ++ * not due to the caller looking for an entry to ++ * whiteout, then the file system may be corrupted. ++ */ ++ if (unlikely(!is_whiteout && ++ cursor->bindex == rdstate->bindex)) ++ printk(KERN_ERR "unionfs: filldir: possible " ++ "I/O error: a file is duplicated " ++ "in the same branch %d: %s\n", ++ rdstate->bindex, cursor->name); ++ break; ++ } ++ } ++ ++ if (!found) ++ cursor = NULL; ++ ++ return cursor; ++} ++ ++int add_filldir_node(struct unionfs_dir_state *rdstate, const char *name, ++ int namelen, int bindex, int whiteout) ++{ ++ struct filldir_node *new; ++ unsigned int hash; ++ int index; ++ int err = 0; ++ struct list_head *head; ++ ++ BUG_ON(namelen <= 0); ++ ++ hash = full_name_hash(name, namelen); ++ index = hash % rdstate->size; ++ head = &(rdstate->list[index]); ++ ++ new = kmem_cache_alloc(unionfs_filldir_cachep, GFP_KERNEL); ++ if (unlikely(!new)) { ++ err = -ENOMEM; ++ goto out; ++ } ++ ++ INIT_LIST_HEAD(&new->file_list); ++ new->namelen = namelen; ++ new->hash = hash; ++ new->bindex = bindex; ++ new->whiteout = whiteout; ++ ++ if (namelen < DNAME_INLINE_LEN) { ++ new->name = new->iname; ++ } else { ++ new->name = kmalloc(namelen + 1, GFP_KERNEL); ++ if (unlikely(!new->name)) { ++ kmem_cache_free(unionfs_filldir_cachep, new); ++ new = NULL; ++ goto out; ++ } ++ } ++ ++ memcpy(new->name, name, namelen); ++ new->name[namelen] = '\0'; ++ ++ rdstate->hashentries++; ++ ++ list_add(&(new->file_list), head); ++out: ++ return err; ++} +diff --git a/fs/unionfs/rename.c b/fs/unionfs/rename.c +new file mode 100644 +index 0000000..c8ab910 +--- /dev/null ++++ b/fs/unionfs/rename.c +@@ -0,0 +1,522 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005-2006 Junjiro Okajima ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++ ++/* ++ * This is a helper function for rename, used when rename ends up with hosed ++ * over dentries and we need to revert. ++ */ ++static int unionfs_refresh_lower_dentry(struct dentry *dentry, ++ struct dentry *parent, int bindex) ++{ ++ struct dentry *lower_dentry; ++ struct dentry *lower_parent; ++ int err = 0; ++ struct nameidata lower_nd; ++ ++ verify_locked(dentry); ++ ++ lower_parent = unionfs_lower_dentry_idx(parent, bindex); ++ ++ BUG_ON(!S_ISDIR(lower_parent->d_inode->i_mode)); ++ ++ err = init_lower_nd(&lower_nd, LOOKUP_OPEN); ++ if (unlikely(err < 0)) ++ goto out; ++ lower_dentry = lookup_one_len_nd(dentry->d_name.name, lower_parent, ++ dentry->d_name.len, &lower_nd); ++ release_lower_nd(&lower_nd, err); ++ if (IS_ERR(lower_dentry)) { ++ err = PTR_ERR(lower_dentry); ++ goto out; ++ } ++ ++ dput(unionfs_lower_dentry_idx(dentry, bindex)); ++ iput(unionfs_lower_inode_idx(dentry->d_inode, bindex)); ++ unionfs_set_lower_inode_idx(dentry->d_inode, bindex, NULL); ++ ++ if (!lower_dentry->d_inode) { ++ dput(lower_dentry); ++ unionfs_set_lower_dentry_idx(dentry, bindex, NULL); ++ } else { ++ unionfs_set_lower_dentry_idx(dentry, bindex, lower_dentry); ++ unionfs_set_lower_inode_idx(dentry->d_inode, bindex, ++ igrab(lower_dentry->d_inode)); ++ } ++ ++out: ++ return err; ++} ++ ++static int __unionfs_rename(struct inode *old_dir, struct dentry *old_dentry, ++ struct dentry *old_parent, ++ struct inode *new_dir, struct dentry *new_dentry, ++ struct dentry *new_parent, ++ int bindex) ++{ ++ int err = 0; ++ struct dentry *lower_old_dentry; ++ struct dentry *lower_new_dentry; ++ struct dentry *lower_old_dir_dentry; ++ struct dentry *lower_new_dir_dentry; ++ struct dentry *trap; ++ ++ lower_new_dentry = unionfs_lower_dentry_idx(new_dentry, bindex); ++ lower_old_dentry = unionfs_lower_dentry_idx(old_dentry, bindex); ++ ++ if (!lower_new_dentry) { ++ lower_new_dentry = ++ create_parents(new_parent->d_inode, ++ new_dentry, new_dentry->d_name.name, ++ bindex); ++ if (IS_ERR(lower_new_dentry)) { ++ err = PTR_ERR(lower_new_dentry); ++ if (IS_COPYUP_ERR(err)) ++ goto out; ++ printk(KERN_ERR "unionfs: error creating directory " ++ "tree for rename, bindex=%d err=%d\n", ++ bindex, err); ++ goto out; ++ } ++ } ++ ++ /* check for and remove whiteout, if any */ ++ err = check_unlink_whiteout(new_dentry, lower_new_dentry, bindex); ++ if (err > 0) /* ignore if whiteout found and successfully removed */ ++ err = 0; ++ if (err) ++ goto out; ++ ++ /* check of old_dentry branch is writable */ ++ err = is_robranch_super(old_dentry->d_sb, bindex); ++ if (err) ++ goto out; ++ ++ dget(lower_old_dentry); ++ dget(lower_new_dentry); ++ lower_old_dir_dentry = dget_parent(lower_old_dentry); ++ lower_new_dir_dentry = dget_parent(lower_new_dentry); ++ ++ trap = lock_rename(lower_old_dir_dentry, lower_new_dir_dentry); ++ /* source should not be ancenstor of target */ ++ if (trap == lower_old_dentry) { ++ err = -EINVAL; ++ goto out_err_unlock; ++ } ++ /* target should not be ancenstor of source */ ++ if (trap == lower_new_dentry) { ++ err = -ENOTEMPTY; ++ goto out_err_unlock; ++ } ++ err = vfs_rename(lower_old_dir_dentry->d_inode, lower_old_dentry, ++ lower_new_dir_dentry->d_inode, lower_new_dentry); ++out_err_unlock: ++ if (!err) { ++ /* update parent dir times */ ++ fsstack_copy_attr_times(old_dir, lower_old_dir_dentry->d_inode); ++ fsstack_copy_attr_times(new_dir, lower_new_dir_dentry->d_inode); ++ } ++ unlock_rename(lower_old_dir_dentry, lower_new_dir_dentry); ++ ++ dput(lower_old_dir_dentry); ++ dput(lower_new_dir_dentry); ++ dput(lower_old_dentry); ++ dput(lower_new_dentry); ++ ++out: ++ if (!err) { ++ /* Fixup the new_dentry. */ ++ if (bindex < dbstart(new_dentry)) ++ dbstart(new_dentry) = bindex; ++ else if (bindex > dbend(new_dentry)) ++ dbend(new_dentry) = bindex; ++ } ++ ++ return err; ++} ++ ++/* ++ * Main rename code. This is sufficiently complex, that it's documented in ++ * Documentation/filesystems/unionfs/rename.txt. This routine calls ++ * __unionfs_rename() above to perform some of the work. ++ */ ++static int do_unionfs_rename(struct inode *old_dir, ++ struct dentry *old_dentry, ++ struct dentry *old_parent, ++ struct inode *new_dir, ++ struct dentry *new_dentry, ++ struct dentry *new_parent) ++{ ++ int err = 0; ++ int bindex; ++ int old_bstart, old_bend; ++ int new_bstart, new_bend; ++ int do_copyup = -1; ++ int local_err = 0; ++ int eio = 0; ++ int revert = 0; ++ ++ old_bstart = dbstart(old_dentry); ++ old_bend = dbend(old_dentry); ++ ++ new_bstart = dbstart(new_dentry); ++ new_bend = dbend(new_dentry); ++ ++ /* Rename source to destination. */ ++ err = __unionfs_rename(old_dir, old_dentry, old_parent, ++ new_dir, new_dentry, new_parent, ++ old_bstart); ++ if (err) { ++ if (!IS_COPYUP_ERR(err)) ++ goto out; ++ do_copyup = old_bstart - 1; ++ } else { ++ revert = 1; ++ } ++ ++ /* ++ * Unlink all instances of destination that exist to the left of ++ * bstart of source. On error, revert back, goto out. ++ */ ++ for (bindex = old_bstart - 1; bindex >= new_bstart; bindex--) { ++ struct dentry *unlink_dentry; ++ struct dentry *unlink_dir_dentry; ++ ++ BUG_ON(bindex < 0); ++ unlink_dentry = unionfs_lower_dentry_idx(new_dentry, bindex); ++ if (!unlink_dentry) ++ continue; ++ ++ unlink_dir_dentry = lock_parent(unlink_dentry); ++ err = is_robranch_super(old_dir->i_sb, bindex); ++ if (!err) ++ err = vfs_unlink(unlink_dir_dentry->d_inode, ++ unlink_dentry); ++ ++ fsstack_copy_attr_times(new_parent->d_inode, ++ unlink_dir_dentry->d_inode); ++ /* propagate number of hard-links */ ++ new_parent->d_inode->i_nlink = ++ unionfs_get_nlinks(new_parent->d_inode); ++ ++ unlock_dir(unlink_dir_dentry); ++ if (!err) { ++ if (bindex != new_bstart) { ++ dput(unlink_dentry); ++ unionfs_set_lower_dentry_idx(new_dentry, ++ bindex, NULL); ++ } ++ } else if (IS_COPYUP_ERR(err)) { ++ do_copyup = bindex - 1; ++ } else if (revert) { ++ goto revert; ++ } ++ } ++ ++ if (do_copyup != -1) { ++ for (bindex = do_copyup; bindex >= 0; bindex--) { ++ /* ++ * copyup the file into some left directory, so that ++ * you can rename it ++ */ ++ err = copyup_dentry(old_parent->d_inode, ++ old_dentry, old_bstart, bindex, ++ old_dentry->d_name.name, ++ old_dentry->d_name.len, NULL, ++ i_size_read(old_dentry->d_inode)); ++ /* if copyup failed, try next branch to the left */ ++ if (err) ++ continue; ++ /* ++ * create whiteout before calling __unionfs_rename ++ * because the latter will change the old_dentry's ++ * lower name and parent dir, resulting in the ++ * whiteout getting created in the wrong dir. ++ */ ++ err = create_whiteout(old_dentry, bindex); ++ if (err) { ++ printk(KERN_ERR "unionfs: can't create a " ++ "whiteout for %s in rename (err=%d)\n", ++ old_dentry->d_name.name, err); ++ continue; ++ } ++ err = __unionfs_rename(old_dir, old_dentry, old_parent, ++ new_dir, new_dentry, new_parent, ++ bindex); ++ break; ++ } ++ } ++ ++ /* make it opaque */ ++ if (S_ISDIR(old_dentry->d_inode->i_mode)) { ++ err = make_dir_opaque(old_dentry, dbstart(old_dentry)); ++ if (err) ++ goto revert; ++ } ++ ++ /* ++ * Create whiteout for source, only if: ++ * (1) There is more than one underlying instance of source. ++ * (We did a copy_up is taken care of above). ++ */ ++ if ((old_bstart != old_bend) && (do_copyup == -1)) { ++ err = create_whiteout(old_dentry, old_bstart); ++ if (err) { ++ /* can't fix anything now, so we exit with -EIO */ ++ printk(KERN_ERR "unionfs: can't create a whiteout for " ++ "%s in rename!\n", old_dentry->d_name.name); ++ err = -EIO; ++ } ++ } ++ ++out: ++ return err; ++ ++revert: ++ /* Do revert here. */ ++ local_err = unionfs_refresh_lower_dentry(new_dentry, new_parent, ++ old_bstart); ++ if (local_err) { ++ printk(KERN_ERR "unionfs: revert failed in rename: " ++ "the new refresh failed\n"); ++ eio = -EIO; ++ } ++ ++ local_err = unionfs_refresh_lower_dentry(old_dentry, old_parent, ++ old_bstart); ++ if (local_err) { ++ printk(KERN_ERR "unionfs: revert failed in rename: " ++ "the old refresh failed\n"); ++ eio = -EIO; ++ goto revert_out; ++ } ++ ++ if (!unionfs_lower_dentry_idx(new_dentry, bindex) || ++ !unionfs_lower_dentry_idx(new_dentry, bindex)->d_inode) { ++ printk(KERN_ERR "unionfs: revert failed in rename: " ++ "the object disappeared from under us!\n"); ++ eio = -EIO; ++ goto revert_out; ++ } ++ ++ if (unionfs_lower_dentry_idx(old_dentry, bindex) && ++ unionfs_lower_dentry_idx(old_dentry, bindex)->d_inode) { ++ printk(KERN_ERR "unionfs: revert failed in rename: " ++ "the object was created underneath us!\n"); ++ eio = -EIO; ++ goto revert_out; ++ } ++ ++ local_err = __unionfs_rename(new_dir, new_dentry, new_parent, ++ old_dir, old_dentry, old_parent, ++ old_bstart); ++ ++ /* If we can't fix it, then we cop-out with -EIO. */ ++ if (local_err) { ++ printk(KERN_ERR "unionfs: revert failed in rename!\n"); ++ eio = -EIO; ++ } ++ ++ local_err = unionfs_refresh_lower_dentry(new_dentry, new_parent, ++ bindex); ++ if (local_err) ++ eio = -EIO; ++ local_err = unionfs_refresh_lower_dentry(old_dentry, old_parent, ++ bindex); ++ if (local_err) ++ eio = -EIO; ++ ++revert_out: ++ if (eio) ++ err = eio; ++ return err; ++} ++ ++/* ++ * We can't copyup a directory, because it may involve huge numbers of ++ * children, etc. Doing that in the kernel would be bad, so instead we ++ * return EXDEV to the user-space utility that caused this, and let the ++ * user-space recurse and ask us to copy up each file separately. ++ */ ++static int may_rename_dir(struct dentry *dentry, struct dentry *parent) ++{ ++ int err, bstart; ++ ++ err = check_empty(dentry, parent, NULL); ++ if (err == -ENOTEMPTY) { ++ if (is_robranch(dentry)) ++ return -EXDEV; ++ } else if (err) { ++ return err; ++ } ++ ++ bstart = dbstart(dentry); ++ if (dbend(dentry) == bstart || dbopaque(dentry) == bstart) ++ return 0; ++ ++ dbstart(dentry) = bstart + 1; ++ err = check_empty(dentry, parent, NULL); ++ dbstart(dentry) = bstart; ++ if (err == -ENOTEMPTY) ++ err = -EXDEV; ++ return err; ++} ++ ++/* ++ * The locking rules in unionfs_rename are complex. We could use a simpler ++ * superblock-level name-space lock for renames and copy-ups. ++ */ ++int unionfs_rename(struct inode *old_dir, struct dentry *old_dentry, ++ struct inode *new_dir, struct dentry *new_dentry) ++{ ++ int err = 0; ++ struct dentry *wh_dentry; ++ struct dentry *old_parent, *new_parent; ++ int valid = true; ++ ++ unionfs_read_lock(old_dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ old_parent = dget_parent(old_dentry); ++ new_parent = dget_parent(new_dentry); ++ /* un/lock parent dentries only if they differ from old/new_dentry */ ++ if (old_parent != old_dentry && ++ old_parent != new_dentry) ++ unionfs_lock_dentry(old_parent, UNIONFS_DMUTEX_REVAL_PARENT); ++ if (new_parent != old_dentry && ++ new_parent != new_dentry && ++ new_parent != old_parent) ++ unionfs_lock_dentry(new_parent, UNIONFS_DMUTEX_REVAL_CHILD); ++ unionfs_double_lock_dentry(old_dentry, new_dentry); ++ ++ valid = __unionfs_d_revalidate(old_dentry, old_parent, false); ++ if (!valid) { ++ err = -ESTALE; ++ goto out; ++ } ++ if (!d_deleted(new_dentry) && new_dentry->d_inode) { ++ valid = __unionfs_d_revalidate(new_dentry, new_parent, false); ++ if (!valid) { ++ err = -ESTALE; ++ goto out; ++ } ++ } ++ ++ if (!S_ISDIR(old_dentry->d_inode->i_mode)) ++ err = unionfs_partial_lookup(old_dentry, old_parent); ++ else ++ err = may_rename_dir(old_dentry, old_parent); ++ ++ if (err) ++ goto out; ++ ++ err = unionfs_partial_lookup(new_dentry, new_parent); ++ if (err) ++ goto out; ++ ++ /* ++ * if new_dentry is already lower because of whiteout, ++ * simply override it even if the whited-out dir is not empty. ++ */ ++ wh_dentry = find_first_whiteout(new_dentry); ++ if (!IS_ERR(wh_dentry)) { ++ dput(wh_dentry); ++ } else if (new_dentry->d_inode) { ++ if (S_ISDIR(old_dentry->d_inode->i_mode) != ++ S_ISDIR(new_dentry->d_inode->i_mode)) { ++ err = S_ISDIR(old_dentry->d_inode->i_mode) ? ++ -ENOTDIR : -EISDIR; ++ goto out; ++ } ++ ++ if (S_ISDIR(new_dentry->d_inode->i_mode)) { ++ struct unionfs_dir_state *namelist = NULL; ++ /* check if this unionfs directory is empty or not */ ++ err = check_empty(new_dentry, new_parent, &namelist); ++ if (err) ++ goto out; ++ ++ if (!is_robranch(new_dentry)) ++ err = delete_whiteouts(new_dentry, ++ dbstart(new_dentry), ++ namelist); ++ ++ free_rdstate(namelist); ++ ++ if (err) ++ goto out; ++ } ++ } ++ ++ err = do_unionfs_rename(old_dir, old_dentry, old_parent, ++ new_dir, new_dentry, new_parent); ++ if (err) ++ goto out; ++ ++ /* ++ * force re-lookup since the dir on ro branch is not renamed, and ++ * lower dentries still indicate the un-renamed ones. ++ */ ++ if (S_ISDIR(old_dentry->d_inode->i_mode)) ++ atomic_dec(&UNIONFS_D(old_dentry)->generation); ++ else ++ unionfs_postcopyup_release(old_dentry); ++ if (new_dentry->d_inode && !S_ISDIR(new_dentry->d_inode->i_mode)) { ++ unionfs_postcopyup_release(new_dentry); ++ unionfs_postcopyup_setmnt(new_dentry); ++ if (!unionfs_lower_inode(new_dentry->d_inode)) { ++ /* ++ * If we get here, it means that no copyup was ++ * needed, and that a file by the old name already ++ * existing on the destination branch; that file got ++ * renamed earlier in this function, so all we need ++ * to do here is set the lower inode. ++ */ ++ struct inode *inode; ++ inode = unionfs_lower_inode(old_dentry->d_inode); ++ igrab(inode); ++ unionfs_set_lower_inode_idx(new_dentry->d_inode, ++ dbstart(new_dentry), ++ inode); ++ } ++ } ++ /* if all of this renaming succeeded, update our times */ ++ unionfs_copy_attr_times(old_dentry->d_inode); ++ unionfs_copy_attr_times(new_dentry->d_inode); ++ unionfs_check_inode(old_dir); ++ unionfs_check_inode(new_dir); ++ unionfs_check_dentry(old_dentry); ++ unionfs_check_dentry(new_dentry); ++ ++out: ++ if (err) /* clear the new_dentry stuff created */ ++ d_drop(new_dentry); ++ ++ unionfs_double_unlock_dentry(old_dentry, new_dentry); ++ if (new_parent != old_dentry && ++ new_parent != new_dentry && ++ new_parent != old_parent) ++ unionfs_unlock_dentry(new_parent); ++ if (old_parent != old_dentry && ++ old_parent != new_dentry) ++ unionfs_unlock_dentry(old_parent); ++ dput(new_parent); ++ dput(old_parent); ++ unionfs_read_unlock(old_dentry->d_sb); ++ ++ return err; ++} +diff --git a/fs/unionfs/sioq.c b/fs/unionfs/sioq.c +new file mode 100644 +index 0000000..b923742 +--- /dev/null ++++ b/fs/unionfs/sioq.c +@@ -0,0 +1,101 @@ ++/* ++ * Copyright (c) 2006-2011 Erez Zadok ++ * Copyright (c) 2006 Charles P. Wright ++ * Copyright (c) 2006-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2006 Junjiro Okajima ++ * Copyright (c) 2006 David P. Quigley ++ * Copyright (c) 2006-2011 Stony Brook University ++ * Copyright (c) 2006-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++ ++/* ++ * Super-user IO work Queue - sometimes we need to perform actions which ++ * would fail due to the unix permissions on the parent directory (e.g., ++ * rmdir a directory which appears empty, but in reality contains ++ * whiteouts). ++ */ ++ ++static struct workqueue_struct *superio_workqueue; ++ ++int __init init_sioq(void) ++{ ++ int err; ++ ++ superio_workqueue = create_workqueue("unionfs_siod"); ++ if (!IS_ERR(superio_workqueue)) ++ return 0; ++ ++ err = PTR_ERR(superio_workqueue); ++ printk(KERN_ERR "unionfs: create_workqueue failed %d\n", err); ++ superio_workqueue = NULL; ++ return err; ++} ++ ++void stop_sioq(void) ++{ ++ if (superio_workqueue) ++ destroy_workqueue(superio_workqueue); ++} ++ ++void run_sioq(work_func_t func, struct sioq_args *args) ++{ ++ INIT_WORK(&args->work, func); ++ ++ init_completion(&args->comp); ++ while (!queue_work(superio_workqueue, &args->work)) { ++ /* TODO: do accounting if needed */ ++ schedule(); ++ } ++ wait_for_completion(&args->comp); ++} ++ ++void __unionfs_create(struct work_struct *work) ++{ ++ struct sioq_args *args = container_of(work, struct sioq_args, work); ++ struct create_args *c = &args->create; ++ ++ args->err = vfs_create(c->parent, c->dentry, c->mode, c->nd); ++ complete(&args->comp); ++} ++ ++void __unionfs_mkdir(struct work_struct *work) ++{ ++ struct sioq_args *args = container_of(work, struct sioq_args, work); ++ struct mkdir_args *m = &args->mkdir; ++ ++ args->err = vfs_mkdir(m->parent, m->dentry, m->mode); ++ complete(&args->comp); ++} ++ ++void __unionfs_mknod(struct work_struct *work) ++{ ++ struct sioq_args *args = container_of(work, struct sioq_args, work); ++ struct mknod_args *m = &args->mknod; ++ ++ args->err = vfs_mknod(m->parent, m->dentry, m->mode, m->dev); ++ complete(&args->comp); ++} ++ ++void __unionfs_symlink(struct work_struct *work) ++{ ++ struct sioq_args *args = container_of(work, struct sioq_args, work); ++ struct symlink_args *s = &args->symlink; ++ ++ args->err = vfs_symlink(s->parent, s->dentry, s->symbuf); ++ complete(&args->comp); ++} ++ ++void __unionfs_unlink(struct work_struct *work) ++{ ++ struct sioq_args *args = container_of(work, struct sioq_args, work); ++ struct unlink_args *u = &args->unlink; ++ ++ args->err = vfs_unlink(u->parent, u->dentry); ++ complete(&args->comp); ++} +diff --git a/fs/unionfs/sioq.h b/fs/unionfs/sioq.h +new file mode 100644 +index 0000000..c2dfb94 +--- /dev/null ++++ b/fs/unionfs/sioq.h +@@ -0,0 +1,91 @@ ++/* ++ * Copyright (c) 2006-2011 Erez Zadok ++ * Copyright (c) 2006 Charles P. Wright ++ * Copyright (c) 2006-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2006 Junjiro Okajima ++ * Copyright (c) 2006 David P. Quigley ++ * Copyright (c) 2006-2011 Stony Brook University ++ * Copyright (c) 2006-2011 The Research Foundation of SUNY ++ * ++ * 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 _SIOQ_H ++#define _SIOQ_H ++ ++struct deletewh_args { ++ struct unionfs_dir_state *namelist; ++ struct dentry *dentry; ++ int bindex; ++}; ++ ++struct is_opaque_args { ++ struct dentry *dentry; ++}; ++ ++struct create_args { ++ struct inode *parent; ++ struct dentry *dentry; ++ umode_t mode; ++ struct nameidata *nd; ++}; ++ ++struct mkdir_args { ++ struct inode *parent; ++ struct dentry *dentry; ++ umode_t mode; ++}; ++ ++struct mknod_args { ++ struct inode *parent; ++ struct dentry *dentry; ++ umode_t mode; ++ dev_t dev; ++}; ++ ++struct symlink_args { ++ struct inode *parent; ++ struct dentry *dentry; ++ char *symbuf; ++}; ++ ++struct unlink_args { ++ struct inode *parent; ++ struct dentry *dentry; ++}; ++ ++ ++struct sioq_args { ++ struct completion comp; ++ struct work_struct work; ++ int err; ++ void *ret; ++ ++ union { ++ struct deletewh_args deletewh; ++ struct is_opaque_args is_opaque; ++ struct create_args create; ++ struct mkdir_args mkdir; ++ struct mknod_args mknod; ++ struct symlink_args symlink; ++ struct unlink_args unlink; ++ }; ++}; ++ ++/* Extern definitions for SIOQ functions */ ++extern int __init init_sioq(void); ++extern void stop_sioq(void); ++extern void run_sioq(work_func_t func, struct sioq_args *args); ++ ++/* Extern definitions for our privilege escalation helpers */ ++extern void __unionfs_create(struct work_struct *work); ++extern void __unionfs_mkdir(struct work_struct *work); ++extern void __unionfs_mknod(struct work_struct *work); ++extern void __unionfs_symlink(struct work_struct *work); ++extern void __unionfs_unlink(struct work_struct *work); ++extern void __delete_whiteouts(struct work_struct *work); ++extern void __is_opaque_dir(struct work_struct *work); ++ ++#endif /* not _SIOQ_H */ +diff --git a/fs/unionfs/subr.c b/fs/unionfs/subr.c +new file mode 100644 +index 0000000..bdca2f7 +--- /dev/null ++++ b/fs/unionfs/subr.c +@@ -0,0 +1,95 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005-2006 Junjiro Okajima ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++ ++/* ++ * returns the right n_link value based on the inode type ++ */ ++int unionfs_get_nlinks(const struct inode *inode) ++{ ++ /* don't bother to do all the work since we're unlinked */ ++ if (inode->i_nlink == 0) ++ return 0; ++ ++ if (!S_ISDIR(inode->i_mode)) ++ return unionfs_lower_inode(inode)->i_nlink; ++ ++ /* ++ * For directories, we return 1. The only place that could cares ++ * about links is readdir, and there's d_type there so even that ++ * doesn't matter. ++ */ ++ return 1; ++} ++ ++/* copy a/m/ctime from the lower branch with the newest times */ ++void unionfs_copy_attr_times(struct inode *upper) ++{ ++ int bindex; ++ struct inode *lower; ++ ++ if (!upper) ++ return; ++ if (ibstart(upper) < 0) { ++#ifdef CONFIG_UNION_FS_DEBUG ++ WARN_ON(ibstart(upper) < 0); ++#endif /* CONFIG_UNION_FS_DEBUG */ ++ return; ++ } ++ for (bindex = ibstart(upper); bindex <= ibend(upper); bindex++) { ++ lower = unionfs_lower_inode_idx(upper, bindex); ++ if (!lower) ++ continue; /* not all lower dir objects may exist */ ++ if (unlikely(timespec_compare(&upper->i_mtime, ++ &lower->i_mtime) < 0)) ++ upper->i_mtime = lower->i_mtime; ++ if (unlikely(timespec_compare(&upper->i_ctime, ++ &lower->i_ctime) < 0)) ++ upper->i_ctime = lower->i_ctime; ++ if (unlikely(timespec_compare(&upper->i_atime, ++ &lower->i_atime) < 0)) ++ upper->i_atime = lower->i_atime; ++ } ++} ++ ++/* ++ * A unionfs/fanout version of fsstack_copy_attr_all. Uses a ++ * unionfs_get_nlinks to properly calcluate the number of links to a file. ++ * Also, copies the max() of all a/m/ctimes for all lower inodes (which is ++ * important if the lower inode is a directory type) ++ */ ++void unionfs_copy_attr_all(struct inode *dest, ++ const struct inode *src) ++{ ++ dest->i_mode = src->i_mode; ++ dest->i_uid = src->i_uid; ++ dest->i_gid = src->i_gid; ++ dest->i_rdev = src->i_rdev; ++ ++ unionfs_copy_attr_times(dest); ++ ++ dest->i_blkbits = src->i_blkbits; ++ dest->i_flags = src->i_flags; ++ ++ /* ++ * Update the nlinks AFTER updating the above fields, because the ++ * get_links callback may depend on them. ++ */ ++ dest->i_nlink = unionfs_get_nlinks(dest); ++} +diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c +new file mode 100644 +index 0000000..c3ac814 +--- /dev/null ++++ b/fs/unionfs/super.c +@@ -0,0 +1,1030 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005-2006 Junjiro Okajima ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++ ++/* ++ * The inode cache is used with alloc_inode for both our inode info and the ++ * vfs inode. ++ */ ++static struct kmem_cache *unionfs_inode_cachep; ++ ++struct inode *unionfs_iget(struct super_block *sb, unsigned long ino) ++{ ++ int size; ++ struct unionfs_inode_info *info; ++ struct inode *inode; ++ ++ inode = iget_locked(sb, ino); ++ if (!inode) ++ return ERR_PTR(-ENOMEM); ++ if (!(inode->i_state & I_NEW)) ++ return inode; ++ ++ info = UNIONFS_I(inode); ++ memset(info, 0, offsetof(struct unionfs_inode_info, vfs_inode)); ++ info->bstart = -1; ++ info->bend = -1; ++ atomic_set(&info->generation, ++ atomic_read(&UNIONFS_SB(inode->i_sb)->generation)); ++ spin_lock_init(&info->rdlock); ++ info->rdcount = 1; ++ info->hashsize = -1; ++ INIT_LIST_HEAD(&info->readdircache); ++ ++ size = sbmax(inode->i_sb) * sizeof(struct inode *); ++ info->lower_inodes = kzalloc(size, GFP_KERNEL); ++ if (unlikely(!info->lower_inodes)) { ++ printk(KERN_CRIT "unionfs: no kernel memory when allocating " ++ "lower-pointer array!\n"); ++ iget_failed(inode); ++ return ERR_PTR(-ENOMEM); ++ } ++ ++ inode->i_version++; ++ inode->i_op = &unionfs_main_iops; ++ inode->i_fop = &unionfs_main_fops; ++ ++ inode->i_mapping->a_ops = &unionfs_aops; ++ ++ /* ++ * reset times so unionfs_copy_attr_all can keep out time invariants ++ * right (upper inode time being the max of all lower ones). ++ */ ++ inode->i_atime.tv_sec = inode->i_atime.tv_nsec = 0; ++ inode->i_mtime.tv_sec = inode->i_mtime.tv_nsec = 0; ++ inode->i_ctime.tv_sec = inode->i_ctime.tv_nsec = 0; ++ unlock_new_inode(inode); ++ return inode; ++} ++ ++/* ++ * final actions when unmounting a file system ++ * ++ * No need to lock rwsem. ++ */ ++static void unionfs_put_super(struct super_block *sb) ++{ ++ int bindex, bstart, bend; ++ struct unionfs_sb_info *spd; ++ int leaks = 0; ++ ++ spd = UNIONFS_SB(sb); ++ if (!spd) ++ return; ++ ++ bstart = sbstart(sb); ++ bend = sbend(sb); ++ ++ /* Make sure we have no leaks of branchget/branchput. */ ++ for (bindex = bstart; bindex <= bend; bindex++) ++ if (unlikely(branch_count(sb, bindex) != 0)) { ++ printk(KERN_CRIT ++ "unionfs: branch %d has %d references left!\n", ++ bindex, branch_count(sb, bindex)); ++ leaks = 1; ++ } ++ WARN_ON(leaks != 0); ++ ++ /* decrement lower super references */ ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ struct super_block *s; ++ s = unionfs_lower_super_idx(sb, bindex); ++ unionfs_set_lower_super_idx(sb, bindex, NULL); ++ atomic_dec(&s->s_active); ++ } ++ ++ kfree(spd->dev_name); ++ kfree(spd->data); ++ kfree(spd); ++ sb->s_fs_info = NULL; ++} ++ ++/* ++ * Since people use this to answer the "How big of a file can I write?" ++ * question, we report the size of the highest priority branch as the size of ++ * the union. ++ */ ++static int unionfs_statfs(struct dentry *dentry, struct kstatfs *buf) ++{ ++ int err = 0; ++ struct super_block *sb; ++ struct dentry *lower_dentry; ++ struct dentry *parent; ++ struct path lower_path; ++ bool valid; ++ ++ sb = dentry->d_sb; ++ ++ unionfs_read_lock(sb, UNIONFS_SMUTEX_CHILD); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ valid = __unionfs_d_revalidate(dentry, parent, false); ++ if (unlikely(!valid)) { ++ err = -ESTALE; ++ goto out; ++ } ++ unionfs_check_dentry(dentry); ++ ++ lower_dentry = unionfs_lower_dentry(sb->s_root); ++ lower_path.dentry = lower_dentry; ++ lower_path.mnt = unionfs_mntget(sb->s_root, 0); ++ err = vfs_statfs(&lower_path, buf); ++ mntput(lower_path.mnt); ++ ++ /* set return buf to our f/s to avoid confusing user-level utils */ ++ buf->f_type = UNIONFS_SUPER_MAGIC; ++ /* ++ * Our maximum file name can is shorter by a few bytes because every ++ * file name could potentially be whited-out. ++ * ++ * XXX: this restriction goes away with ODF. ++ */ ++ unionfs_set_max_namelen(&buf->f_namelen); ++ ++ /* ++ * reset two fields to avoid confusing user-land. ++ * XXX: is this still necessary? ++ */ ++ memset(&buf->f_fsid, 0, sizeof(__kernel_fsid_t)); ++ memset(&buf->f_spare, 0, sizeof(buf->f_spare)); ++ ++out: ++ unionfs_check_dentry(dentry); ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(sb); ++ return err; ++} ++ ++/* handle mode changing during remount */ ++static noinline_for_stack int do_remount_mode_option( ++ char *optarg, ++ int cur_branches, ++ struct unionfs_data *new_data, ++ struct path *new_lower_paths) ++{ ++ int err = -EINVAL; ++ int perms, idx; ++ char *modename = strchr(optarg, '='); ++ struct path path; ++ ++ /* by now, optarg contains the branch name */ ++ if (!*optarg) { ++ printk(KERN_ERR ++ "unionfs: no branch specified for mode change\n"); ++ goto out; ++ } ++ if (!modename) { ++ printk(KERN_ERR "unionfs: branch \"%s\" requires a mode\n", ++ optarg); ++ goto out; ++ } ++ *modename++ = '\0'; ++ err = parse_branch_mode(modename, &perms); ++ if (err) { ++ printk(KERN_ERR "unionfs: invalid mode \"%s\" for \"%s\"\n", ++ modename, optarg); ++ goto out; ++ } ++ ++ /* ++ * Find matching branch index. For now, this assumes that nothing ++ * has been mounted on top of this Unionfs stack. Once we have /odf ++ * and cache-coherency resolved, we'll address the branch-path ++ * uniqueness. ++ */ ++ err = kern_path(optarg, LOOKUP_FOLLOW, &path); ++ if (err) { ++ printk(KERN_ERR "unionfs: error accessing " ++ "lower directory \"%s\" (error %d)\n", ++ optarg, err); ++ goto out; ++ } ++ for (idx = 0; idx < cur_branches; idx++) ++ if (path.mnt == new_lower_paths[idx].mnt && ++ path.dentry == new_lower_paths[idx].dentry) ++ break; ++ path_put(&path); /* no longer needed */ ++ if (idx == cur_branches) { ++ err = -ENOENT; /* err may have been reset above */ ++ printk(KERN_ERR "unionfs: branch \"%s\" " ++ "not found\n", optarg); ++ goto out; ++ } ++ /* check/change mode for existing branch */ ++ /* we don't warn if perms==branchperms */ ++ new_data[idx].branchperms = perms; ++ err = 0; ++out: ++ return err; ++} ++ ++/* handle branch deletion during remount */ ++static noinline_for_stack int do_remount_del_option( ++ char *optarg, int cur_branches, ++ struct unionfs_data *new_data, ++ struct path *new_lower_paths) ++{ ++ int err = -EINVAL; ++ int idx; ++ struct path path; ++ ++ /* optarg contains the branch name to delete */ ++ ++ /* ++ * Find matching branch index. For now, this assumes that nothing ++ * has been mounted on top of this Unionfs stack. Once we have /odf ++ * and cache-coherency resolved, we'll address the branch-path ++ * uniqueness. ++ */ ++ err = kern_path(optarg, LOOKUP_FOLLOW, &path); ++ if (err) { ++ printk(KERN_ERR "unionfs: error accessing " ++ "lower directory \"%s\" (error %d)\n", ++ optarg, err); ++ goto out; ++ } ++ for (idx = 0; idx < cur_branches; idx++) ++ if (path.mnt == new_lower_paths[idx].mnt && ++ path.dentry == new_lower_paths[idx].dentry) ++ break; ++ path_put(&path); /* no longer needed */ ++ if (idx == cur_branches) { ++ printk(KERN_ERR "unionfs: branch \"%s\" " ++ "not found\n", optarg); ++ err = -ENOENT; ++ goto out; ++ } ++ /* check if there are any open files on the branch to be deleted */ ++ if (atomic_read(&new_data[idx].open_files) > 0) { ++ err = -EBUSY; ++ goto out; ++ } ++ ++ /* ++ * Now we have to delete the branch. First, release any handles it ++ * has. Then, move the remaining array indexes past "idx" in ++ * new_data and new_lower_paths one to the left. Finally, adjust ++ * cur_branches. ++ */ ++ path_put(&new_lower_paths[idx]); ++ ++ if (idx < cur_branches - 1) { ++ /* if idx==cur_branches-1, we delete last branch: easy */ ++ memmove(&new_data[idx], &new_data[idx+1], ++ (cur_branches - 1 - idx) * ++ sizeof(struct unionfs_data)); ++ memmove(&new_lower_paths[idx], &new_lower_paths[idx+1], ++ (cur_branches - 1 - idx) * sizeof(struct path)); ++ } ++ ++ err = 0; ++out: ++ return err; ++} ++ ++/* handle branch insertion during remount */ ++static noinline_for_stack int do_remount_add_option( ++ char *optarg, int cur_branches, ++ struct unionfs_data *new_data, ++ struct path *new_lower_paths, ++ int *high_branch_id) ++{ ++ int err = -EINVAL; ++ int perms; ++ int idx = 0; /* default: insert at beginning */ ++ char *new_branch , *modename = NULL; ++ struct path path; ++ ++ /* ++ * optarg can be of several forms: ++ * ++ * /bar:/foo insert /foo before /bar ++ * /bar:/foo=ro insert /foo in ro mode before /bar ++ * /foo insert /foo in the beginning (prepend) ++ * :/foo insert /foo at the end (append) ++ */ ++ if (*optarg == ':') { /* append? */ ++ new_branch = optarg + 1; /* skip ':' */ ++ idx = cur_branches; ++ goto found_insertion_point; ++ } ++ new_branch = strchr(optarg, ':'); ++ if (!new_branch) { /* prepend? */ ++ new_branch = optarg; ++ goto found_insertion_point; ++ } ++ *new_branch++ = '\0'; /* holds path+mode of new branch */ ++ ++ /* ++ * Find matching branch index. For now, this assumes that nothing ++ * has been mounted on top of this Unionfs stack. Once we have /odf ++ * and cache-coherency resolved, we'll address the branch-path ++ * uniqueness. ++ */ ++ err = kern_path(optarg, LOOKUP_FOLLOW, &path); ++ if (err) { ++ printk(KERN_ERR "unionfs: error accessing " ++ "lower directory \"%s\" (error %d)\n", ++ optarg, err); ++ goto out; ++ } ++ for (idx = 0; idx < cur_branches; idx++) ++ if (path.mnt == new_lower_paths[idx].mnt && ++ path.dentry == new_lower_paths[idx].dentry) ++ break; ++ path_put(&path); /* no longer needed */ ++ if (idx == cur_branches) { ++ printk(KERN_ERR "unionfs: branch \"%s\" " ++ "not found\n", optarg); ++ err = -ENOENT; ++ goto out; ++ } ++ ++ /* ++ * At this point idx will hold the index where the new branch should ++ * be inserted before. ++ */ ++found_insertion_point: ++ /* find the mode for the new branch */ ++ if (new_branch) ++ modename = strchr(new_branch, '='); ++ if (modename) ++ *modename++ = '\0'; ++ if (!new_branch || !*new_branch) { ++ printk(KERN_ERR "unionfs: null new branch\n"); ++ err = -EINVAL; ++ goto out; ++ } ++ err = parse_branch_mode(modename, &perms); ++ if (err) { ++ printk(KERN_ERR "unionfs: invalid mode \"%s\" for " ++ "branch \"%s\"\n", modename, new_branch); ++ goto out; ++ } ++ err = kern_path(new_branch, LOOKUP_FOLLOW, &path); ++ if (err) { ++ printk(KERN_ERR "unionfs: error accessing " ++ "lower directory \"%s\" (error %d)\n", ++ new_branch, err); ++ goto out; ++ } ++ /* ++ * It's probably safe to check_mode the new branch to insert. Note: ++ * we don't allow inserting branches which are unionfs's by ++ * themselves (check_branch returns EINVAL in that case). This is ++ * because this code base doesn't support stacking unionfs: the ODF ++ * code base supports that correctly. ++ */ ++ err = check_branch(&path); ++ if (err) { ++ printk(KERN_ERR "unionfs: lower directory " ++ "\"%s\" is not a valid branch\n", optarg); ++ path_put(&path); ++ goto out; ++ } ++ ++ /* ++ * Now we have to insert the new branch. But first, move the bits ++ * to make space for the new branch, if needed. Finally, adjust ++ * cur_branches. ++ * We don't release nd here; it's kept until umount/remount. ++ */ ++ if (idx < cur_branches) { ++ /* if idx==cur_branches, we append: easy */ ++ memmove(&new_data[idx+1], &new_data[idx], ++ (cur_branches - idx) * sizeof(struct unionfs_data)); ++ memmove(&new_lower_paths[idx+1], &new_lower_paths[idx], ++ (cur_branches - idx) * sizeof(struct path)); ++ } ++ new_lower_paths[idx].dentry = path.dentry; ++ new_lower_paths[idx].mnt = path.mnt; ++ ++ new_data[idx].sb = path.dentry->d_sb; ++ atomic_set(&new_data[idx].open_files, 0); ++ new_data[idx].branchperms = perms; ++ new_data[idx].branch_id = ++*high_branch_id; /* assign new branch ID */ ++ ++ err = 0; ++out: ++ return err; ++} ++ ++ ++/* ++ * Support branch management options on remount. ++ * ++ * See Documentation/filesystems/unionfs/ for details. ++ * ++ * @flags: numeric mount options ++ * @options: mount options string ++ * ++ * This function can rearrange a mounted union dynamically, adding and ++ * removing branches, including changing branch modes. Clearly this has to ++ * be done safely and atomically. Luckily, the VFS already calls this ++ * function with lock_super(sb) and lock_kernel() held, preventing ++ * concurrent mixing of new mounts, remounts, and unmounts. Moreover, ++ * do_remount_sb(), our caller function, already called shrink_dcache_sb(sb) ++ * to purge dentries/inodes from our superblock, and also called ++ * fsync_super(sb) to purge any dirty pages. So we're good. ++ * ++ * XXX: however, our remount code may also need to invalidate mapped pages ++ * so as to force them to be re-gotten from the (newly reconfigured) lower ++ * branches. This has to wait for proper mmap and cache coherency support ++ * in the VFS. ++ * ++ */ ++static int unionfs_remount_fs(struct super_block *sb, int *flags, ++ char *options) ++{ ++ int err = 0; ++ int i; ++ char *optionstmp, *tmp_to_free; /* kstrdup'ed of "options" */ ++ char *optname; ++ int cur_branches = 0; /* no. of current branches */ ++ int new_branches = 0; /* no. of branches actually left in the end */ ++ int add_branches; /* est. no. of branches to add */ ++ int del_branches; /* est. no. of branches to del */ ++ int max_branches; /* max possible no. of branches */ ++ struct unionfs_data *new_data = NULL, *tmp_data = NULL; ++ struct path *new_lower_paths = NULL, *tmp_lower_paths = NULL; ++ struct inode **new_lower_inodes = NULL; ++ int new_high_branch_id; /* new high branch ID */ ++ int size; /* memory allocation size, temp var */ ++ int old_ibstart, old_ibend; ++ ++ unionfs_write_lock(sb); ++ ++ /* ++ * The VFS will take care of "ro" and "rw" flags, and we can safely ++ * ignore MS_SILENT, but anything else left over is an error. So we ++ * need to check if any other flags may have been passed (none are ++ * allowed/supported as of now). ++ */ ++ if ((*flags & ~(MS_RDONLY | MS_SILENT)) != 0) { ++ printk(KERN_ERR ++ "unionfs: remount flags 0x%x unsupported\n", *flags); ++ err = -EINVAL; ++ goto out_error; ++ } ++ ++ /* ++ * If 'options' is NULL, it's probably because the user just changed ++ * the union to a "ro" or "rw" and the VFS took care of it. So ++ * nothing to do and we're done. ++ */ ++ if (!options || options[0] == '\0') ++ goto out_error; ++ ++ /* ++ * Find out how many branches we will have in the end, counting ++ * "add" and "del" commands. Copy the "options" string because ++ * strsep modifies the string and we need it later. ++ */ ++ tmp_to_free = kstrdup(options, GFP_KERNEL); ++ optionstmp = tmp_to_free; ++ if (unlikely(!optionstmp)) { ++ err = -ENOMEM; ++ goto out_free; ++ } ++ cur_branches = sbmax(sb); /* current no. branches */ ++ new_branches = sbmax(sb); ++ del_branches = 0; ++ add_branches = 0; ++ new_high_branch_id = sbhbid(sb); /* save current high_branch_id */ ++ while ((optname = strsep(&optionstmp, ",")) != NULL) { ++ char *optarg; ++ ++ if (!optname || !*optname) ++ continue; ++ ++ optarg = strchr(optname, '='); ++ if (optarg) ++ *optarg++ = '\0'; ++ ++ if (!strcmp("add", optname)) ++ add_branches++; ++ else if (!strcmp("del", optname)) ++ del_branches++; ++ } ++ kfree(tmp_to_free); ++ /* after all changes, will we have at least one branch left? */ ++ if ((new_branches + add_branches - del_branches) < 1) { ++ printk(KERN_ERR ++ "unionfs: no branches left after remount\n"); ++ err = -EINVAL; ++ goto out_free; ++ } ++ ++ /* ++ * Since we haven't actually parsed all the add/del options, nor ++ * have we checked them for errors, we don't know for sure how many ++ * branches we will have after all changes have taken place. In ++ * fact, the total number of branches left could be less than what ++ * we have now. So we need to allocate space for a temporary ++ * placeholder that is at least as large as the maximum number of ++ * branches we *could* have, which is the current number plus all ++ * the additions. Once we're done with these temp placeholders, we ++ * may have to re-allocate the final size, copy over from the temp, ++ * and then free the temps (done near the end of this function). ++ */ ++ max_branches = cur_branches + add_branches; ++ /* allocate space for new pointers to lower dentry */ ++ tmp_data = kcalloc(max_branches, ++ sizeof(struct unionfs_data), GFP_KERNEL); ++ if (unlikely(!tmp_data)) { ++ err = -ENOMEM; ++ goto out_free; ++ } ++ /* allocate space for new pointers to lower paths */ ++ tmp_lower_paths = kcalloc(max_branches, ++ sizeof(struct path), GFP_KERNEL); ++ if (unlikely(!tmp_lower_paths)) { ++ err = -ENOMEM; ++ goto out_free; ++ } ++ /* copy current info into new placeholders, incrementing refcnts */ ++ memcpy(tmp_data, UNIONFS_SB(sb)->data, ++ cur_branches * sizeof(struct unionfs_data)); ++ memcpy(tmp_lower_paths, UNIONFS_D(sb->s_root)->lower_paths, ++ cur_branches * sizeof(struct path)); ++ for (i = 0; i < cur_branches; i++) ++ path_get(&tmp_lower_paths[i]); /* drop refs at end of fxn */ ++ ++ /******************************************************************* ++ * For each branch command, do kern_path on the requested branch, ++ * and apply the change to a temp branch list. To handle errors, we ++ * already dup'ed the old arrays (above), and increased the refcnts ++ * on various f/s objects. So now we can do all the kern_path'ss ++ * and branch-management commands on the new arrays. If it fail mid ++ * way, we free the tmp arrays and *put all objects. If we succeed, ++ * then we free old arrays and *put its objects, and then replace ++ * the arrays with the new tmp list (we may have to re-allocate the ++ * memory because the temp lists could have been larger than what we ++ * actually needed). ++ *******************************************************************/ ++ ++ while ((optname = strsep(&options, ",")) != NULL) { ++ char *optarg; ++ ++ if (!optname || !*optname) ++ continue; ++ /* ++ * At this stage optname holds a comma-delimited option, but ++ * without the commas. Next, we need to break the string on ++ * the '=' symbol to separate CMD=ARG, where ARG itself can ++ * be KEY=VAL. For example, in mode=/foo=rw, CMD is "mode", ++ * KEY is "/foo", and VAL is "rw". ++ */ ++ optarg = strchr(optname, '='); ++ if (optarg) ++ *optarg++ = '\0'; ++ /* incgen remount option (instead of old ioctl) */ ++ if (!strcmp("incgen", optname)) { ++ err = 0; ++ goto out_no_change; ++ } ++ ++ /* ++ * All of our options take an argument now. (Insert ones ++ * that don't above this check.) So at this stage optname ++ * contains the CMD part and optarg contains the ARG part. ++ */ ++ if (!optarg || !*optarg) { ++ printk(KERN_ERR "unionfs: all remount options require " ++ "an argument (%s)\n", optname); ++ err = -EINVAL; ++ goto out_release; ++ } ++ ++ if (!strcmp("add", optname)) { ++ err = do_remount_add_option(optarg, new_branches, ++ tmp_data, ++ tmp_lower_paths, ++ &new_high_branch_id); ++ if (err) ++ goto out_release; ++ new_branches++; ++ if (new_branches > UNIONFS_MAX_BRANCHES) { ++ printk(KERN_ERR "unionfs: command exceeds " ++ "%d branches\n", UNIONFS_MAX_BRANCHES); ++ err = -E2BIG; ++ goto out_release; ++ } ++ continue; ++ } ++ if (!strcmp("del", optname)) { ++ err = do_remount_del_option(optarg, new_branches, ++ tmp_data, ++ tmp_lower_paths); ++ if (err) ++ goto out_release; ++ new_branches--; ++ continue; ++ } ++ if (!strcmp("mode", optname)) { ++ err = do_remount_mode_option(optarg, new_branches, ++ tmp_data, ++ tmp_lower_paths); ++ if (err) ++ goto out_release; ++ continue; ++ } ++ ++ /* ++ * When you use "mount -o remount,ro", mount(8) will ++ * reportedly pass the original dirs= string from ++ * /proc/mounts. So for now, we have to ignore dirs= and ++ * not consider it an error, unless we want to allow users ++ * to pass dirs= in remount. Note that to allow the VFS to ++ * actually process the ro/rw remount options, we have to ++ * return 0 from this function. ++ */ ++ if (!strcmp("dirs", optname)) { ++ printk(KERN_WARNING ++ "unionfs: remount ignoring option \"%s\"\n", ++ optname); ++ continue; ++ } ++ ++ err = -EINVAL; ++ printk(KERN_ERR ++ "unionfs: unrecognized option \"%s\"\n", optname); ++ goto out_release; ++ } ++ ++out_no_change: ++ ++ /****************************************************************** ++ * WE'RE ALMOST DONE: check if leftmost branch might be read-only, ++ * see if we need to allocate a small-sized new vector, copy the ++ * vectors to their correct place, release the refcnt of the older ++ * ones, and return. Also handle invalidating any pages that will ++ * have to be re-read. ++ *******************************************************************/ ++ ++ if (!(tmp_data[0].branchperms & MAY_WRITE)) { ++ printk(KERN_ERR "unionfs: leftmost branch cannot be read-only " ++ "(use \"remount,ro\" to create a read-only union)\n"); ++ err = -EINVAL; ++ goto out_release; ++ } ++ ++ /* (re)allocate space for new pointers to lower dentry */ ++ size = new_branches * sizeof(struct unionfs_data); ++ new_data = krealloc(tmp_data, size, GFP_KERNEL); ++ if (unlikely(!new_data)) { ++ err = -ENOMEM; ++ goto out_release; ++ } ++ ++ /* allocate space for new pointers to lower paths */ ++ size = new_branches * sizeof(struct path); ++ new_lower_paths = krealloc(tmp_lower_paths, size, GFP_KERNEL); ++ if (unlikely(!new_lower_paths)) { ++ err = -ENOMEM; ++ goto out_release; ++ } ++ ++ /* allocate space for new pointers to lower inodes */ ++ new_lower_inodes = kcalloc(new_branches, ++ sizeof(struct inode *), GFP_KERNEL); ++ if (unlikely(!new_lower_inodes)) { ++ err = -ENOMEM; ++ goto out_release; ++ } ++ ++ /* ++ * OK, just before we actually put the new set of branches in place, ++ * we need to ensure that our own f/s has no dirty objects left. ++ * Luckily, do_remount_sb() already calls shrink_dcache_sb(sb) and ++ * fsync_super(sb), taking care of dentries, inodes, and dirty ++ * pages. So all that's left is for us to invalidate any leftover ++ * (non-dirty) pages to ensure that they will be re-read from the ++ * new lower branches (and to support mmap). ++ */ ++ ++ /* ++ * Once we finish the remounting successfully, our superblock ++ * generation number will have increased. This will be detected by ++ * our dentry-revalidation code upon subsequent f/s operations ++ * through unionfs. The revalidation code will rebuild the union of ++ * lower inodes for a given unionfs inode and invalidate any pages ++ * of such "stale" inodes (by calling our purge_inode_data ++ * function). This revalidation will happen lazily and ++ * incrementally, as users perform operations on cached inodes. We ++ * would like to encourage this revalidation to happen sooner if ++ * possible, so we like to try to invalidate as many other pages in ++ * our superblock as we can. We used to call drop_pagecache_sb() or ++ * a variant thereof, but either method was racy (drop_caches alone ++ * is known to be racy). So now we let the revalidation happen on a ++ * per file basis in ->d_revalidate. ++ */ ++ ++ /* grab new lower super references; release old ones */ ++ for (i = 0; i < new_branches; i++) ++ atomic_inc(&new_data[i].sb->s_active); ++ for (i = 0; i < sbmax(sb); i++) ++ atomic_dec(&UNIONFS_SB(sb)->data[i].sb->s_active); ++ ++ /* copy new vectors into their correct place */ ++ tmp_data = UNIONFS_SB(sb)->data; ++ UNIONFS_SB(sb)->data = new_data; ++ new_data = NULL; /* so don't free good pointers below */ ++ tmp_lower_paths = UNIONFS_D(sb->s_root)->lower_paths; ++ UNIONFS_D(sb->s_root)->lower_paths = new_lower_paths; ++ new_lower_paths = NULL; /* so don't free good pointers below */ ++ ++ /* update our unionfs_sb_info and root dentry index of last branch */ ++ i = sbmax(sb); /* save no. of branches to release at end */ ++ sbend(sb) = new_branches - 1; ++ dbend(sb->s_root) = new_branches - 1; ++ old_ibstart = ibstart(sb->s_root->d_inode); ++ old_ibend = ibend(sb->s_root->d_inode); ++ ibend(sb->s_root->d_inode) = new_branches - 1; ++ UNIONFS_D(sb->s_root)->bcount = new_branches; ++ new_branches = i; /* no. of branches to release below */ ++ ++ /* ++ * Update lower inodes: 3 steps ++ * 1. grab ref on all new lower inodes ++ */ ++ for (i = dbstart(sb->s_root); i <= dbend(sb->s_root); i++) { ++ struct dentry *lower_dentry = ++ unionfs_lower_dentry_idx(sb->s_root, i); ++ igrab(lower_dentry->d_inode); ++ new_lower_inodes[i] = lower_dentry->d_inode; ++ } ++ /* 2. release reference on all older lower inodes */ ++ iput_lowers(sb->s_root->d_inode, old_ibstart, old_ibend, true); ++ /* 3. update root dentry's inode to new lower_inodes array */ ++ UNIONFS_I(sb->s_root->d_inode)->lower_inodes = new_lower_inodes; ++ new_lower_inodes = NULL; ++ ++ /* maxbytes may have changed */ ++ sb->s_maxbytes = unionfs_lower_super_idx(sb, 0)->s_maxbytes; ++ /* update high branch ID */ ++ sbhbid(sb) = new_high_branch_id; ++ ++ /* update our sb->generation for revalidating objects */ ++ i = atomic_inc_return(&UNIONFS_SB(sb)->generation); ++ atomic_set(&UNIONFS_D(sb->s_root)->generation, i); ++ atomic_set(&UNIONFS_I(sb->s_root->d_inode)->generation, i); ++ if (!(*flags & MS_SILENT)) ++ pr_info("unionfs: %s: new generation number %d\n", ++ UNIONFS_SB(sb)->dev_name, i); ++ /* finally, update the root dentry's times */ ++ unionfs_copy_attr_times(sb->s_root->d_inode); ++ err = 0; /* reset to success */ ++ ++ /* ++ * The code above falls through to the next label, and releases the ++ * refcnts of the older ones (stored in tmp_*): if we fell through ++ * here, it means success. However, if we jump directly to this ++ * label from any error above, then an error occurred after we ++ * grabbed various refcnts, and so we have to release the ++ * temporarily constructed structures. ++ */ ++out_release: ++ /* no need to cleanup/release anything in tmp_data */ ++ if (tmp_lower_paths) ++ for (i = 0; i < new_branches; i++) ++ path_put(&tmp_lower_paths[i]); ++out_free: ++ kfree(tmp_lower_paths); ++ kfree(tmp_data); ++ kfree(new_lower_paths); ++ kfree(new_data); ++ kfree(new_lower_inodes); ++out_error: ++ unionfs_check_dentry(sb->s_root); ++ unionfs_write_unlock(sb); ++ return err; ++} ++ ++/* ++ * Called by iput() when the inode reference count reached zero ++ * and the inode is not hashed anywhere. Used to clear anything ++ * that needs to be, before the inode is completely destroyed and put ++ * on the inode free list. ++ * ++ * No need to lock sb info's rwsem. ++ */ ++static void unionfs_evict_inode(struct inode *inode) ++{ ++ int bindex, bstart, bend; ++ struct inode *lower_inode; ++ struct list_head *pos, *n; ++ struct unionfs_dir_state *rdstate; ++ ++ truncate_inode_pages(&inode->i_data, 0); ++ end_writeback(inode); ++ ++ list_for_each_safe(pos, n, &UNIONFS_I(inode)->readdircache) { ++ rdstate = list_entry(pos, struct unionfs_dir_state, cache); ++ list_del(&rdstate->cache); ++ free_rdstate(rdstate); ++ } ++ ++ /* ++ * Decrement a reference to a lower_inode, which was incremented ++ * by our read_inode when it was created initially. ++ */ ++ bstart = ibstart(inode); ++ bend = ibend(inode); ++ if (bstart >= 0) { ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_inode = unionfs_lower_inode_idx(inode, bindex); ++ if (!lower_inode) ++ continue; ++ unionfs_set_lower_inode_idx(inode, bindex, NULL); ++ /* see Documentation/filesystems/unionfs/issues.txt */ ++ lockdep_off(); ++ iput(lower_inode); ++ lockdep_on(); ++ } ++ } ++ ++ kfree(UNIONFS_I(inode)->lower_inodes); ++ UNIONFS_I(inode)->lower_inodes = NULL; ++} ++ ++static struct inode *unionfs_alloc_inode(struct super_block *sb) ++{ ++ struct unionfs_inode_info *i; ++ ++ i = kmem_cache_alloc(unionfs_inode_cachep, GFP_KERNEL); ++ if (unlikely(!i)) ++ return NULL; ++ ++ /* memset everything up to the inode to 0 */ ++ memset(i, 0, offsetof(struct unionfs_inode_info, vfs_inode)); ++ ++ i->vfs_inode.i_version = 1; ++ return &i->vfs_inode; ++} ++ ++static void unionfs_destroy_inode(struct inode *inode) ++{ ++ kmem_cache_free(unionfs_inode_cachep, UNIONFS_I(inode)); ++} ++ ++/* unionfs inode cache constructor */ ++static void init_once(void *obj) ++{ ++ struct unionfs_inode_info *i = obj; ++ ++ inode_init_once(&i->vfs_inode); ++} ++ ++int unionfs_init_inode_cache(void) ++{ ++ int err = 0; ++ ++ unionfs_inode_cachep = ++ kmem_cache_create("unionfs_inode_cache", ++ sizeof(struct unionfs_inode_info), 0, ++ SLAB_RECLAIM_ACCOUNT, init_once); ++ if (unlikely(!unionfs_inode_cachep)) ++ err = -ENOMEM; ++ return err; ++} ++ ++/* unionfs inode cache destructor */ ++void unionfs_destroy_inode_cache(void) ++{ ++ if (unionfs_inode_cachep) ++ kmem_cache_destroy(unionfs_inode_cachep); ++} ++ ++/* ++ * Called when we have a dirty inode, right here we only throw out ++ * parts of our readdir list that are too old. ++ * ++ * No need to grab sb info's rwsem. ++ */ ++static int unionfs_write_inode(struct inode *inode, ++ struct writeback_control *wbc) ++{ ++ struct list_head *pos, *n; ++ struct unionfs_dir_state *rdstate; ++ ++ spin_lock(&UNIONFS_I(inode)->rdlock); ++ list_for_each_safe(pos, n, &UNIONFS_I(inode)->readdircache) { ++ rdstate = list_entry(pos, struct unionfs_dir_state, cache); ++ /* We keep this list in LRU order. */ ++ if ((rdstate->access + RDCACHE_JIFFIES) > jiffies) ++ break; ++ UNIONFS_I(inode)->rdcount--; ++ list_del(&rdstate->cache); ++ free_rdstate(rdstate); ++ } ++ spin_unlock(&UNIONFS_I(inode)->rdlock); ++ ++ return 0; ++} ++ ++/* ++ * Used only in nfs, to kill any pending RPC tasks, so that subsequent ++ * code can actually succeed and won't leave tasks that need handling. ++ */ ++static void unionfs_umount_begin(struct super_block *sb) ++{ ++ struct super_block *lower_sb; ++ int bindex, bstart, bend; ++ ++ unionfs_read_lock(sb, UNIONFS_SMUTEX_CHILD); ++ ++ bstart = sbstart(sb); ++ bend = sbend(sb); ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_sb = unionfs_lower_super_idx(sb, bindex); ++ ++ if (lower_sb && lower_sb->s_op && ++ lower_sb->s_op->umount_begin) ++ lower_sb->s_op->umount_begin(lower_sb); ++ } ++ ++ unionfs_read_unlock(sb); ++} ++ ++static int unionfs_show_options(struct seq_file *m, struct vfsmount *mnt) ++{ ++ struct super_block *sb = mnt->mnt_sb; ++ int ret = 0; ++ char *tmp_page; ++ char *path; ++ int bindex, bstart, bend; ++ int perms; ++ ++ /* to prevent a silly lockdep warning with namespace_sem */ ++ lockdep_off(); ++ unionfs_read_lock(sb, UNIONFS_SMUTEX_CHILD); ++ unionfs_lock_dentry(sb->s_root, UNIONFS_DMUTEX_CHILD); ++ ++ tmp_page = (char *) __get_free_page(GFP_KERNEL); ++ if (unlikely(!tmp_page)) { ++ ret = -ENOMEM; ++ goto out; ++ } ++ ++ bstart = sbstart(sb); ++ bend = sbend(sb); ++ ++ seq_printf(m, ",dirs="); ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ struct path p; ++ p.dentry = unionfs_lower_dentry_idx(sb->s_root, bindex); ++ p.mnt = unionfs_lower_mnt_idx(sb->s_root, bindex); ++ path = d_path(&p, tmp_page, PAGE_SIZE); ++ if (IS_ERR(path)) { ++ ret = PTR_ERR(path); ++ goto out; ++ } ++ ++ perms = branchperms(sb, bindex); ++ ++ seq_printf(m, "%s=%s", path, ++ perms & MAY_WRITE ? "rw" : "ro"); ++ if (bindex != bend) ++ seq_printf(m, ":"); ++ } ++ ++out: ++ free_page((unsigned long) tmp_page); ++ ++ unionfs_unlock_dentry(sb->s_root); ++ unionfs_read_unlock(sb); ++ lockdep_on(); ++ ++ return ret; ++} ++ ++struct super_operations unionfs_sops = { ++ .put_super = unionfs_put_super, ++ .statfs = unionfs_statfs, ++ .remount_fs = unionfs_remount_fs, ++ .evict_inode = unionfs_evict_inode, ++ .umount_begin = unionfs_umount_begin, ++ .show_options = unionfs_show_options, ++ .write_inode = unionfs_write_inode, ++ .alloc_inode = unionfs_alloc_inode, ++ .destroy_inode = unionfs_destroy_inode, ++}; +diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h +new file mode 100644 +index 0000000..1821705 +--- /dev/null ++++ b/fs/unionfs/union.h +@@ -0,0 +1,679 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 _UNION_H_ ++#define _UNION_H_ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include ++ ++/* the file system name */ ++#define UNIONFS_NAME "unionfs" ++ ++/* unionfs root inode number */ ++#define UNIONFS_ROOT_INO 1 ++ ++/* number of times we try to get a unique temporary file name */ ++#define GET_TMPNAM_MAX_RETRY 5 ++ ++/* maximum number of branches we support, to avoid memory blowup */ ++#define UNIONFS_MAX_BRANCHES 128 ++ ++/* minimum time (seconds) required for time-based cache-coherency */ ++#define UNIONFS_MIN_CC_TIME 3 ++ ++/* Operations vectors defined in specific files. */ ++extern struct file_operations unionfs_main_fops; ++extern struct file_operations unionfs_dir_fops; ++extern struct inode_operations unionfs_main_iops; ++extern struct inode_operations unionfs_dir_iops; ++extern struct inode_operations unionfs_symlink_iops; ++extern struct super_operations unionfs_sops; ++extern struct dentry_operations unionfs_dops; ++extern struct address_space_operations unionfs_aops, unionfs_dummy_aops; ++extern struct vm_operations_struct unionfs_vm_ops; ++ ++/* How long should an entry be allowed to persist */ ++#define RDCACHE_JIFFIES (5*HZ) ++ ++/* compatibility with Real-Time patches */ ++#ifdef CONFIG_PREEMPT_RT ++# define unionfs_rw_semaphore compat_rw_semaphore ++#else /* not CONFIG_PREEMPT_RT */ ++# define unionfs_rw_semaphore rw_semaphore ++#endif /* not CONFIG_PREEMPT_RT */ ++ ++/* file private data. */ ++struct unionfs_file_info { ++ int bstart; ++ int bend; ++ atomic_t generation; ++ ++ struct unionfs_dir_state *rdstate; ++ struct file **lower_files; ++ int *saved_branch_ids; /* IDs of branches when file was opened */ ++ const struct vm_operations_struct *lower_vm_ops; ++ bool wrote_to_file; /* for delayed copyup */ ++}; ++ ++/* unionfs inode data in memory */ ++struct unionfs_inode_info { ++ int bstart; ++ int bend; ++ atomic_t generation; ++ /* Stuff for readdir over NFS. */ ++ spinlock_t rdlock; ++ struct list_head readdircache; ++ int rdcount; ++ int hashsize; ++ int cookie; ++ ++ /* The lower inodes */ ++ struct inode **lower_inodes; ++ ++ struct inode vfs_inode; ++}; ++ ++/* unionfs dentry data in memory */ ++struct unionfs_dentry_info { ++ /* ++ * The semaphore is used to lock the dentry as soon as we get into a ++ * unionfs function from the VFS. Our lock ordering is that children ++ * go before their parents. ++ */ ++ struct mutex lock; ++ int bstart; ++ int bend; ++ int bopaque; ++ int bcount; ++ atomic_t generation; ++ struct path *lower_paths; ++}; ++ ++/* These are the pointers to our various objects. */ ++struct unionfs_data { ++ struct super_block *sb; /* lower super_block */ ++ atomic_t open_files; /* number of open files on branch */ ++ int branchperms; ++ int branch_id; /* unique branch ID at re/mount time */ ++}; ++ ++/* unionfs super-block data in memory */ ++struct unionfs_sb_info { ++ int bend; ++ ++ atomic_t generation; ++ ++ /* ++ * This rwsem is used to make sure that a branch management ++ * operation... ++ * 1) will not begin before all currently in-flight operations ++ * complete. ++ * 2) any new operations do not execute until the currently ++ * running branch management operation completes. ++ * ++ * The write_lock_owner records the PID of the task which grabbed ++ * the rw_sem for writing. If the same task also tries to grab the ++ * read lock, we allow it. This prevents a self-deadlock when ++ * branch-management is used on a pivot_root'ed union, because we ++ * have to ->lookup paths which belong to the same union. ++ */ ++ struct unionfs_rw_semaphore rwsem; ++ pid_t write_lock_owner; /* PID of rw_sem owner (write lock) */ ++ int high_branch_id; /* last unique branch ID given */ ++ char *dev_name; /* to identify different unions in pr_debug */ ++ struct unionfs_data *data; ++}; ++ ++/* ++ * structure for making the linked list of entries by readdir on left branch ++ * to compare with entries on right branch ++ */ ++struct filldir_node { ++ struct list_head file_list; /* list for directory entries */ ++ char *name; /* name entry */ ++ int hash; /* name hash */ ++ int namelen; /* name len since name is not 0 terminated */ ++ ++ /* ++ * we can check for duplicate whiteouts and files in the same branch ++ * in order to return -EIO. ++ */ ++ int bindex; ++ ++ /* is this a whiteout entry? */ ++ int whiteout; ++ ++ /* Inline name, so we don't need to separately kmalloc small ones */ ++ char iname[DNAME_INLINE_LEN]; ++}; ++ ++/* Directory hash table. */ ++struct unionfs_dir_state { ++ unsigned int cookie; /* the cookie, based off of rdversion */ ++ unsigned int offset; /* The entry we have returned. */ ++ int bindex; ++ loff_t dirpos; /* offset within the lower level directory */ ++ int size; /* How big is the hash table? */ ++ int hashentries; /* How many entries have been inserted? */ ++ unsigned long access; ++ ++ /* This cache list is used when the inode keeps us around. */ ++ struct list_head cache; ++ struct list_head list[0]; ++}; ++ ++/* externs needed for fanout.h or sioq.h */ ++extern int unionfs_get_nlinks(const struct inode *inode); ++extern void unionfs_copy_attr_times(struct inode *upper); ++extern void unionfs_copy_attr_all(struct inode *dest, const struct inode *src); ++ ++/* include miscellaneous macros */ ++#include "fanout.h" ++#include "sioq.h" ++ ++/* externs for cache creation/deletion routines */ ++extern void unionfs_destroy_filldir_cache(void); ++extern int unionfs_init_filldir_cache(void); ++extern int unionfs_init_inode_cache(void); ++extern void unionfs_destroy_inode_cache(void); ++extern int unionfs_init_dentry_cache(void); ++extern void unionfs_destroy_dentry_cache(void); ++ ++/* Initialize and free readdir-specific state. */ ++extern int init_rdstate(struct file *file); ++extern struct unionfs_dir_state *alloc_rdstate(struct inode *inode, ++ int bindex); ++extern struct unionfs_dir_state *find_rdstate(struct inode *inode, ++ loff_t fpos); ++extern void free_rdstate(struct unionfs_dir_state *state); ++extern int add_filldir_node(struct unionfs_dir_state *rdstate, ++ const char *name, int namelen, int bindex, ++ int whiteout); ++extern struct filldir_node *find_filldir_node(struct unionfs_dir_state *rdstate, ++ const char *name, int namelen, ++ int is_whiteout); ++ ++extern struct dentry **alloc_new_dentries(int objs); ++extern struct unionfs_data *alloc_new_data(int objs); ++ ++/* We can only use 32-bits of offset for rdstate --- blech! */ ++#define DIREOF (0xfffff) ++#define RDOFFBITS 20 /* This is the number of bits in DIREOF. */ ++#define MAXRDCOOKIE (0xfff) ++/* Turn an rdstate into an offset. */ ++static inline off_t rdstate2offset(struct unionfs_dir_state *buf) ++{ ++ off_t tmp; ++ ++ tmp = ((buf->cookie & MAXRDCOOKIE) << RDOFFBITS) ++ | (buf->offset & DIREOF); ++ return tmp; ++} ++ ++/* Macros for locking a super_block. */ ++enum unionfs_super_lock_class { ++ UNIONFS_SMUTEX_NORMAL, ++ UNIONFS_SMUTEX_PARENT, /* when locking on behalf of file */ ++ UNIONFS_SMUTEX_CHILD, /* when locking on behalf of dentry */ ++}; ++static inline void unionfs_read_lock(struct super_block *sb, int subclass) ++{ ++ if (UNIONFS_SB(sb)->write_lock_owner && ++ UNIONFS_SB(sb)->write_lock_owner == current->pid) ++ return; ++ down_read_nested(&UNIONFS_SB(sb)->rwsem, subclass); ++} ++static inline void unionfs_read_unlock(struct super_block *sb) ++{ ++ if (UNIONFS_SB(sb)->write_lock_owner && ++ UNIONFS_SB(sb)->write_lock_owner == current->pid) ++ return; ++ up_read(&UNIONFS_SB(sb)->rwsem); ++} ++static inline void unionfs_write_lock(struct super_block *sb) ++{ ++ down_write(&UNIONFS_SB(sb)->rwsem); ++ UNIONFS_SB(sb)->write_lock_owner = current->pid; ++} ++static inline void unionfs_write_unlock(struct super_block *sb) ++{ ++ up_write(&UNIONFS_SB(sb)->rwsem); ++ UNIONFS_SB(sb)->write_lock_owner = 0; ++} ++ ++static inline void unionfs_double_lock_dentry(struct dentry *d1, ++ struct dentry *d2) ++{ ++ BUG_ON(d1 == d2); ++ if (d1 < d2) { ++ unionfs_lock_dentry(d1, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(d2, UNIONFS_DMUTEX_CHILD); ++ } else { ++ unionfs_lock_dentry(d2, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(d1, UNIONFS_DMUTEX_CHILD); ++ } ++} ++ ++static inline void unionfs_double_unlock_dentry(struct dentry *d1, ++ struct dentry *d2) ++{ ++ BUG_ON(d1 == d2); ++ if (d1 < d2) { /* unlock in reverse order than double_lock_dentry */ ++ unionfs_unlock_dentry(d1); ++ unionfs_unlock_dentry(d2); ++ } else { ++ unionfs_unlock_dentry(d2); ++ unionfs_unlock_dentry(d1); ++ } ++} ++ ++static inline void unionfs_double_lock_parents(struct dentry *p1, ++ struct dentry *p2) ++{ ++ if (p1 == p2) { ++ unionfs_lock_dentry(p1, UNIONFS_DMUTEX_REVAL_PARENT); ++ return; ++ } ++ if (p1 < p2) { ++ unionfs_lock_dentry(p1, UNIONFS_DMUTEX_REVAL_PARENT); ++ unionfs_lock_dentry(p2, UNIONFS_DMUTEX_REVAL_CHILD); ++ } else { ++ unionfs_lock_dentry(p2, UNIONFS_DMUTEX_REVAL_PARENT); ++ unionfs_lock_dentry(p1, UNIONFS_DMUTEX_REVAL_CHILD); ++ } ++} ++ ++static inline void unionfs_double_unlock_parents(struct dentry *p1, ++ struct dentry *p2) ++{ ++ if (p1 == p2) { ++ unionfs_unlock_dentry(p1); ++ return; ++ } ++ if (p1 < p2) { /* unlock in reverse order of double_lock_parents */ ++ unionfs_unlock_dentry(p1); ++ unionfs_unlock_dentry(p2); ++ } else { ++ unionfs_unlock_dentry(p2); ++ unionfs_unlock_dentry(p1); ++ } ++} ++ ++extern int new_dentry_private_data(struct dentry *dentry, int subclass); ++extern int realloc_dentry_private_data(struct dentry *dentry); ++extern void free_dentry_private_data(struct dentry *dentry); ++extern void update_bstart(struct dentry *dentry); ++extern int init_lower_nd(struct nameidata *nd, unsigned int flags); ++extern void release_lower_nd(struct nameidata *nd, int err); ++ ++/* ++ * EXTERNALS: ++ */ ++ ++/* replicates the directory structure up to given dentry in given branch */ ++extern struct dentry *create_parents(struct inode *dir, struct dentry *dentry, ++ const char *name, int bindex); ++ ++/* partial lookup */ ++extern int unionfs_partial_lookup(struct dentry *dentry, ++ struct dentry *parent); ++extern struct dentry *unionfs_lookup_full(struct dentry *dentry, ++ struct dentry *parent, ++ int lookupmode); ++ ++/* copies a file from dbstart to newbindex branch */ ++extern int copyup_file(struct inode *dir, struct file *file, int bstart, ++ int newbindex, loff_t size); ++extern int copyup_named_file(struct inode *dir, struct file *file, ++ char *name, int bstart, int new_bindex, ++ loff_t len); ++/* copies a dentry from dbstart to newbindex branch */ ++extern int copyup_dentry(struct inode *dir, struct dentry *dentry, ++ int bstart, int new_bindex, const char *name, ++ int namelen, struct file **copyup_file, loff_t len); ++/* helper functions for post-copyup actions */ ++extern void unionfs_postcopyup_setmnt(struct dentry *dentry); ++extern void unionfs_postcopyup_release(struct dentry *dentry); ++ ++/* Is this directory empty: 0 if it is empty, -ENOTEMPTY if not. */ ++extern int check_empty(struct dentry *dentry, struct dentry *parent, ++ struct unionfs_dir_state **namelist); ++/* whiteout and opaque directory helpers */ ++extern char *alloc_whname(const char *name, int len); ++extern bool is_whiteout_name(char **namep, int *namelenp); ++extern bool is_validname(const char *name); ++extern struct dentry *lookup_whiteout(const char *name, ++ struct dentry *lower_parent); ++extern struct dentry *find_first_whiteout(struct dentry *dentry); ++extern int unlink_whiteout(struct dentry *wh_dentry); ++extern int check_unlink_whiteout(struct dentry *dentry, ++ struct dentry *lower_dentry, int bindex); ++extern int create_whiteout(struct dentry *dentry, int start); ++extern int delete_whiteouts(struct dentry *dentry, int bindex, ++ struct unionfs_dir_state *namelist); ++extern int is_opaque_dir(struct dentry *dentry, int bindex); ++extern int make_dir_opaque(struct dentry *dir, int bindex); ++extern void unionfs_set_max_namelen(long *namelen); ++ ++extern void unionfs_reinterpose(struct dentry *this_dentry); ++extern struct super_block *unionfs_duplicate_super(struct super_block *sb); ++ ++/* Locking functions. */ ++extern int unionfs_setlk(struct file *file, int cmd, struct file_lock *fl); ++extern int unionfs_getlk(struct file *file, struct file_lock *fl); ++ ++/* Common file operations. */ ++extern int unionfs_file_revalidate(struct file *file, struct dentry *parent, ++ bool willwrite); ++extern int unionfs_open(struct inode *inode, struct file *file); ++extern int unionfs_file_release(struct inode *inode, struct file *file); ++extern int unionfs_flush(struct file *file, fl_owner_t id); ++extern long unionfs_ioctl(struct file *file, unsigned int cmd, ++ unsigned long arg); ++extern int unionfs_fsync(struct file *file, int datasync); ++extern int unionfs_fasync(int fd, struct file *file, int flag); ++ ++/* Inode operations */ ++extern struct inode *unionfs_iget(struct super_block *sb, unsigned long ino); ++extern int unionfs_rename(struct inode *old_dir, struct dentry *old_dentry, ++ struct inode *new_dir, struct dentry *new_dentry); ++extern int unionfs_unlink(struct inode *dir, struct dentry *dentry); ++extern int unionfs_rmdir(struct inode *dir, struct dentry *dentry); ++ ++extern bool __unionfs_d_revalidate(struct dentry *dentry, ++ struct dentry *parent, bool willwrite); ++extern bool is_negative_lower(const struct dentry *dentry); ++extern bool is_newer_lower(const struct dentry *dentry); ++extern void purge_sb_data(struct super_block *sb); ++ ++/* The values for unionfs_interpose's flag. */ ++#define INTERPOSE_DEFAULT 0 ++#define INTERPOSE_LOOKUP 1 ++#define INTERPOSE_REVAL 2 ++#define INTERPOSE_REVAL_NEG 3 ++#define INTERPOSE_PARTIAL 4 ++ ++extern struct dentry *unionfs_interpose(struct dentry *this_dentry, ++ struct super_block *sb, int flag); ++ ++#ifdef CONFIG_UNION_FS_XATTR ++/* Extended attribute functions. */ ++extern void *unionfs_xattr_alloc(size_t size, size_t limit); ++static inline void unionfs_xattr_kfree(const void *p) ++{ ++ kfree(p); ++} ++extern ssize_t unionfs_getxattr(struct dentry *dentry, const char *name, ++ void *value, size_t size); ++extern int unionfs_removexattr(struct dentry *dentry, const char *name); ++extern ssize_t unionfs_listxattr(struct dentry *dentry, char *list, ++ size_t size); ++extern int unionfs_setxattr(struct dentry *dentry, const char *name, ++ const void *value, size_t size, int flags); ++#endif /* CONFIG_UNION_FS_XATTR */ ++ ++/* The root directory is unhashed, but isn't deleted. */ ++static inline int d_deleted(struct dentry *d) ++{ ++ return d_unhashed(d) && (d != d->d_sb->s_root); ++} ++ ++/* unionfs_permission, check if we should bypass error to facilitate copyup */ ++#define IS_COPYUP_ERR(err) ((err) == -EROFS) ++ ++/* unionfs_open, check if we need to copyup the file */ ++#define OPEN_WRITE_FLAGS (O_WRONLY | O_RDWR | O_APPEND) ++#define IS_WRITE_FLAG(flag) ((flag) & OPEN_WRITE_FLAGS) ++ ++static inline int branchperms(const struct super_block *sb, int index) ++{ ++ BUG_ON(index < 0); ++ return UNIONFS_SB(sb)->data[index].branchperms; ++} ++ ++static inline int set_branchperms(struct super_block *sb, int index, int perms) ++{ ++ BUG_ON(index < 0); ++ UNIONFS_SB(sb)->data[index].branchperms = perms; ++ return perms; ++} ++ ++/* check if readonly lower inode, but possibly unlinked (no inode->i_sb) */ ++static inline int __is_rdonly(const struct inode *inode) ++{ ++ /* if unlinked, can't be readonly (?) */ ++ if (!inode->i_sb) ++ return 0; ++ return IS_RDONLY(inode); ++ ++} ++/* Is this file on a read-only branch? */ ++static inline int is_robranch_super(const struct super_block *sb, int index) ++{ ++ int ret; ++ ++ ret = (!(branchperms(sb, index) & MAY_WRITE)) ? -EROFS : 0; ++ return ret; ++} ++ ++/* Is this file on a read-only branch? */ ++static inline int is_robranch_idx(const struct dentry *dentry, int index) ++{ ++ struct super_block *lower_sb; ++ ++ BUG_ON(index < 0); ++ ++ if (!(branchperms(dentry->d_sb, index) & MAY_WRITE)) ++ return -EROFS; ++ ++ lower_sb = unionfs_lower_super_idx(dentry->d_sb, index); ++ BUG_ON(lower_sb == NULL); ++ /* ++ * test sb flags directly, not IS_RDONLY(lower_inode) because the ++ * lower_dentry could be a negative. ++ */ ++ if (lower_sb->s_flags & MS_RDONLY) ++ return -EROFS; ++ ++ return 0; ++} ++ ++static inline int is_robranch(const struct dentry *dentry) ++{ ++ int index; ++ ++ index = UNIONFS_D(dentry)->bstart; ++ BUG_ON(index < 0); ++ ++ return is_robranch_idx(dentry, index); ++} ++ ++/* ++ * EXTERNALS: ++ */ ++extern int check_branch(const struct path *path); ++extern int parse_branch_mode(const char *name, int *perms); ++ ++/* locking helpers */ ++static inline struct dentry *lock_parent(struct dentry *dentry) ++{ ++ struct dentry *dir = dget_parent(dentry); ++ mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT); ++ return dir; ++} ++static inline struct dentry *lock_parent_wh(struct dentry *dentry) ++{ ++ struct dentry *dir = dget_parent(dentry); ++ ++ mutex_lock_nested(&dir->d_inode->i_mutex, UNIONFS_DMUTEX_WHITEOUT); ++ return dir; ++} ++ ++static inline void unlock_dir(struct dentry *dir) ++{ ++ mutex_unlock(&dir->d_inode->i_mutex); ++ dput(dir); ++} ++ ++/* lock base inode mutex before calling lookup_one_len */ ++static inline struct dentry *lookup_lck_len(const char *name, ++ struct dentry *base, int len) ++{ ++ struct dentry *d; ++ struct nameidata lower_nd; ++ int err; ++ ++ err = init_lower_nd(&lower_nd, LOOKUP_OPEN); ++ if (unlikely(err < 0)) { ++ d = ERR_PTR(err); ++ goto out; ++ } ++ mutex_lock(&base->d_inode->i_mutex); ++ d = lookup_one_len_nd(name, base, len, &lower_nd); ++ release_lower_nd(&lower_nd, err); ++ mutex_unlock(&base->d_inode->i_mutex); ++out: ++ return d; ++} ++ ++static inline struct vfsmount *unionfs_mntget(struct dentry *dentry, ++ int bindex) ++{ ++ struct vfsmount *mnt; ++ ++ BUG_ON(!dentry || bindex < 0); ++ ++ mnt = mntget(unionfs_lower_mnt_idx(dentry, bindex)); ++#ifdef CONFIG_UNION_FS_DEBUG ++ if (!mnt) ++ pr_debug("unionfs: mntget: mnt=%p bindex=%d\n", ++ mnt, bindex); ++#endif /* CONFIG_UNION_FS_DEBUG */ ++ ++ return mnt; ++} ++ ++static inline void unionfs_mntput(struct dentry *dentry, int bindex) ++{ ++ struct vfsmount *mnt; ++ ++ if (!dentry && bindex < 0) ++ return; ++ BUG_ON(!dentry || bindex < 0); ++ ++ mnt = unionfs_lower_mnt_idx(dentry, bindex); ++#ifdef CONFIG_UNION_FS_DEBUG ++ /* ++ * Directories can have NULL lower objects in between start/end, but ++ * NOT if at the start/end range. We cannot verify that this dentry ++ * is a type=DIR, because it may already be a negative dentry. But ++ * if dbstart is greater than dbend, we know that this couldn't have ++ * been a regular file: it had to have been a directory. ++ */ ++ if (!mnt && !(bindex > dbstart(dentry) && bindex < dbend(dentry))) ++ pr_debug("unionfs: mntput: mnt=%p bindex=%d\n", mnt, bindex); ++#endif /* CONFIG_UNION_FS_DEBUG */ ++ mntput(mnt); ++} ++ ++#ifdef CONFIG_UNION_FS_DEBUG ++ ++/* useful for tracking code reachability */ ++#define UDBG pr_debug("DBG:%s:%s:%d\n", __FILE__, __func__, __LINE__) ++ ++#define unionfs_check_inode(i) __unionfs_check_inode((i), \ ++ __FILE__, __func__, __LINE__) ++#define unionfs_check_dentry(d) __unionfs_check_dentry((d), \ ++ __FILE__, __func__, __LINE__) ++#define unionfs_check_file(f) __unionfs_check_file((f), \ ++ __FILE__, __func__, __LINE__) ++#define unionfs_check_nd(n) __unionfs_check_nd((n), \ ++ __FILE__, __func__, __LINE__) ++#define show_branch_counts(sb) __show_branch_counts((sb), \ ++ __FILE__, __func__, __LINE__) ++#define show_inode_times(i) __show_inode_times((i), \ ++ __FILE__, __func__, __LINE__) ++#define show_dinode_times(d) __show_dinode_times((d), \ ++ __FILE__, __func__, __LINE__) ++#define show_inode_counts(i) __show_inode_counts((i), \ ++ __FILE__, __func__, __LINE__) ++ ++extern void __unionfs_check_inode(const struct inode *inode, const char *fname, ++ const char *fxn, int line); ++extern void __unionfs_check_dentry(const struct dentry *dentry, ++ const char *fname, const char *fxn, ++ int line); ++extern void __unionfs_check_file(const struct file *file, ++ const char *fname, const char *fxn, int line); ++extern void __unionfs_check_nd(const struct nameidata *nd, ++ const char *fname, const char *fxn, int line); ++extern void __show_branch_counts(const struct super_block *sb, ++ const char *file, const char *fxn, int line); ++extern void __show_inode_times(const struct inode *inode, ++ const char *file, const char *fxn, int line); ++extern void __show_dinode_times(const struct dentry *dentry, ++ const char *file, const char *fxn, int line); ++extern void __show_inode_counts(const struct inode *inode, ++ const char *file, const char *fxn, int line); ++ ++#else /* not CONFIG_UNION_FS_DEBUG */ ++ ++/* we leave useful hooks for these check functions throughout the code */ ++#define unionfs_check_inode(i) do { } while (0) ++#define unionfs_check_dentry(d) do { } while (0) ++#define unionfs_check_file(f) do { } while (0) ++#define unionfs_check_nd(n) do { } while (0) ++#define show_branch_counts(sb) do { } while (0) ++#define show_inode_times(i) do { } while (0) ++#define show_dinode_times(d) do { } while (0) ++#define show_inode_counts(i) do { } while (0) ++ ++#endif /* not CONFIG_UNION_FS_DEBUG */ ++ ++#endif /* not _UNION_H_ */ +diff --git a/fs/unionfs/unlink.c b/fs/unionfs/unlink.c +new file mode 100644 +index 0000000..bf447bb +--- /dev/null ++++ b/fs/unionfs/unlink.c +@@ -0,0 +1,278 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005-2006 Junjiro Okajima ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++ ++/* ++ * Helper function for Unionfs's unlink operation. ++ * ++ * The main goal of this function is to optimize the unlinking of non-dir ++ * objects in unionfs by deleting all possible lower inode objects from the ++ * underlying branches having same dentry name as the non-dir dentry on ++ * which this unlink operation is called. This way we delete as many lower ++ * inodes as possible, and save space. Whiteouts need to be created in ++ * branch0 only if unlinking fails on any of the lower branch other than ++ * branch0, or if a lower branch is marked read-only. ++ * ++ * Also, while unlinking a file, if we encounter any dir type entry in any ++ * intermediate branch, then we remove the directory by calling vfs_rmdir. ++ * The following special cases are also handled: ++ ++ * (1) If an error occurs in branch0 during vfs_unlink, then we return ++ * appropriate error. ++ * ++ * (2) If we get an error during unlink in any of other lower branch other ++ * than branch0, then we create a whiteout in branch0. ++ * ++ * (3) If a whiteout already exists in any intermediate branch, we delete ++ * all possible inodes only up to that branch (this is an "opaqueness" ++ * as as per Documentation/filesystems/unionfs/concepts.txt). ++ * ++ */ ++static int unionfs_unlink_whiteout(struct inode *dir, struct dentry *dentry, ++ struct dentry *parent) ++{ ++ struct dentry *lower_dentry; ++ struct dentry *lower_dir_dentry; ++ int bindex; ++ int err = 0; ++ ++ err = unionfs_partial_lookup(dentry, parent); ++ if (err) ++ goto out; ++ ++ /* trying to unlink all possible valid instances */ ++ for (bindex = dbstart(dentry); bindex <= dbend(dentry); bindex++) { ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ if (!lower_dentry || !lower_dentry->d_inode) ++ continue; ++ ++ lower_dir_dentry = lock_parent(lower_dentry); ++ ++ /* avoid destroying the lower inode if the object is in use */ ++ dget(lower_dentry); ++ err = is_robranch_super(dentry->d_sb, bindex); ++ if (!err) { ++ /* see Documentation/filesystems/unionfs/issues.txt */ ++ lockdep_off(); ++ if (!S_ISDIR(lower_dentry->d_inode->i_mode)) ++ err = vfs_unlink(lower_dir_dentry->d_inode, ++ lower_dentry); ++ else ++ err = vfs_rmdir(lower_dir_dentry->d_inode, ++ lower_dentry); ++ lockdep_on(); ++ } ++ ++ /* if lower object deletion succeeds, update inode's times */ ++ if (!err) ++ unionfs_copy_attr_times(dentry->d_inode); ++ dput(lower_dentry); ++ fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode); ++ unlock_dir(lower_dir_dentry); ++ ++ if (err) ++ break; ++ } ++ ++ /* ++ * Create the whiteout in branch 0 (highest priority) only if (a) ++ * there was an error in any intermediate branch other than branch 0 ++ * due to failure of vfs_unlink/vfs_rmdir or (b) a branch marked or ++ * mounted read-only. ++ */ ++ if (err) { ++ if ((bindex == 0) || ++ ((bindex == dbstart(dentry)) && ++ (!IS_COPYUP_ERR(err)))) ++ goto out; ++ else { ++ if (!IS_COPYUP_ERR(err)) ++ pr_debug("unionfs: lower object deletion " ++ "failed in branch:%d\n", bindex); ++ err = create_whiteout(dentry, sbstart(dentry->d_sb)); ++ } ++ } ++ ++out: ++ if (!err) ++ inode_dec_link_count(dentry->d_inode); ++ ++ /* We don't want to leave negative leftover dentries for revalidate. */ ++ if (!err && (dbopaque(dentry) != -1)) ++ update_bstart(dentry); ++ ++ return err; ++} ++ ++int unionfs_unlink(struct inode *dir, struct dentry *dentry) ++{ ++ int err = 0; ++ struct inode *inode = dentry->d_inode; ++ struct dentry *parent; ++ int valid; ++ ++ BUG_ON(S_ISDIR(inode->i_mode)); ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ valid = __unionfs_d_revalidate(dentry, parent, false); ++ if (unlikely(!valid)) { ++ err = -ESTALE; ++ goto out; ++ } ++ unionfs_check_dentry(dentry); ++ ++ err = unionfs_unlink_whiteout(dir, dentry, parent); ++ /* call d_drop so the system "forgets" about us */ ++ if (!err) { ++ unionfs_postcopyup_release(dentry); ++ unionfs_postcopyup_setmnt(parent); ++ if (inode->i_nlink == 0) /* drop lower inodes */ ++ iput_lowers_all(inode, false); ++ d_drop(dentry); ++ /* ++ * if unlink/whiteout succeeded, parent dir mtime has ++ * changed ++ */ ++ unionfs_copy_attr_times(dir); ++ } ++ ++out: ++ if (!err) { ++ unionfs_check_dentry(dentry); ++ unionfs_check_inode(dir); ++ } ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} ++ ++static int unionfs_rmdir_first(struct inode *dir, struct dentry *dentry, ++ struct unionfs_dir_state *namelist) ++{ ++ int err; ++ struct dentry *lower_dentry; ++ struct dentry *lower_dir_dentry = NULL; ++ ++ /* Here we need to remove whiteout entries. */ ++ err = delete_whiteouts(dentry, dbstart(dentry), namelist); ++ if (err) ++ goto out; ++ ++ lower_dentry = unionfs_lower_dentry(dentry); ++ ++ lower_dir_dentry = lock_parent(lower_dentry); ++ ++ /* avoid destroying the lower inode if the file is in use */ ++ dget(lower_dentry); ++ err = is_robranch(dentry); ++ if (!err) ++ err = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry); ++ dput(lower_dentry); ++ ++ fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode); ++ /* propagate number of hard-links */ ++ dentry->d_inode->i_nlink = unionfs_get_nlinks(dentry->d_inode); ++ ++out: ++ if (lower_dir_dentry) ++ unlock_dir(lower_dir_dentry); ++ return err; ++} ++ ++int unionfs_rmdir(struct inode *dir, struct dentry *dentry) ++{ ++ int err = 0; ++ struct unionfs_dir_state *namelist = NULL; ++ struct dentry *parent; ++ int dstart, dend; ++ bool valid; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ valid = __unionfs_d_revalidate(dentry, parent, false); ++ if (unlikely(!valid)) { ++ err = -ESTALE; ++ goto out; ++ } ++ unionfs_check_dentry(dentry); ++ ++ /* check if this unionfs directory is empty or not */ ++ err = check_empty(dentry, parent, &namelist); ++ if (err) ++ goto out; ++ ++ err = unionfs_rmdir_first(dir, dentry, namelist); ++ dstart = dbstart(dentry); ++ dend = dbend(dentry); ++ /* ++ * We create a whiteout for the directory if there was an error to ++ * rmdir the first directory entry in the union. Otherwise, we ++ * create a whiteout only if there is no chance that a lower ++ * priority branch might also have the same named directory. IOW, ++ * if there is not another same-named directory at a lower priority ++ * branch, then we don't need to create a whiteout for it. ++ */ ++ if (!err) { ++ if (dstart < dend) ++ err = create_whiteout(dentry, dstart); ++ } else { ++ int new_err; ++ ++ if (dstart == 0) ++ goto out; ++ ++ /* exit if the error returned was NOT -EROFS */ ++ if (!IS_COPYUP_ERR(err)) ++ goto out; ++ ++ new_err = create_whiteout(dentry, dstart - 1); ++ if (new_err != -EEXIST) ++ err = new_err; ++ } ++ ++out: ++ /* ++ * Drop references to lower dentry/inode so storage space for them ++ * can be reclaimed. Then, call d_drop so the system "forgets" ++ * about us. ++ */ ++ if (!err) { ++ iput_lowers_all(dentry->d_inode, false); ++ dput(unionfs_lower_dentry_idx(dentry, dstart)); ++ unionfs_set_lower_dentry_idx(dentry, dstart, NULL); ++ d_drop(dentry); ++ /* update our lower vfsmnts, in case a copyup took place */ ++ unionfs_postcopyup_setmnt(dentry); ++ unionfs_check_dentry(dentry); ++ unionfs_check_inode(dir); ++ } ++ ++ if (namelist) ++ free_rdstate(namelist); ++ ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} +diff --git a/fs/unionfs/whiteout.c b/fs/unionfs/whiteout.c +new file mode 100644 +index 0000000..582cef2 +--- /dev/null ++++ b/fs/unionfs/whiteout.c +@@ -0,0 +1,601 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005-2006 Junjiro Okajima ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++ ++/* ++ * whiteout and opaque directory helpers ++ */ ++ ++/* What do we use for whiteouts. */ ++#define UNIONFS_WHPFX ".wh." ++#define UNIONFS_WHLEN 4 ++/* ++ * If a directory contains this file, then it is opaque. We start with the ++ * .wh. flag so that it is blocked by lookup. ++ */ ++#define UNIONFS_DIR_OPAQUE_NAME "__dir_opaque" ++#define UNIONFS_DIR_OPAQUE UNIONFS_WHPFX UNIONFS_DIR_OPAQUE_NAME ++ ++/* construct whiteout filename */ ++char *alloc_whname(const char *name, int len) ++{ ++ char *buf; ++ ++ buf = kmalloc(len + UNIONFS_WHLEN + 1, GFP_KERNEL); ++ if (unlikely(!buf)) ++ return ERR_PTR(-ENOMEM); ++ ++ strcpy(buf, UNIONFS_WHPFX); ++ strlcat(buf, name, len + UNIONFS_WHLEN + 1); ++ ++ return buf; ++} ++ ++/* ++ * XXX: this can be inline or CPP macro, but is here to keep all whiteout ++ * code in one place. ++ */ ++void unionfs_set_max_namelen(long *namelen) ++{ ++ *namelen -= UNIONFS_WHLEN; ++} ++ ++/* check if @namep is a whiteout, update @namep and @namelenp accordingly */ ++bool is_whiteout_name(char **namep, int *namelenp) ++{ ++ if (*namelenp > UNIONFS_WHLEN && ++ !strncmp(*namep, UNIONFS_WHPFX, UNIONFS_WHLEN)) { ++ *namep += UNIONFS_WHLEN; ++ *namelenp -= UNIONFS_WHLEN; ++ return true; ++ } ++ return false; ++} ++ ++/* is the filename valid == !(whiteout for a file or opaque dir marker) */ ++bool is_validname(const char *name) ++{ ++ if (!strncmp(name, UNIONFS_WHPFX, UNIONFS_WHLEN)) ++ return false; ++ if (!strncmp(name, UNIONFS_DIR_OPAQUE_NAME, ++ sizeof(UNIONFS_DIR_OPAQUE_NAME) - 1)) ++ return false; ++ return true; ++} ++ ++/* ++ * Look for a whiteout @name in @lower_parent directory. If error, return ++ * ERR_PTR. Caller must dput() the returned dentry if not an error. ++ * ++ * XXX: some callers can reuse the whname allocated buffer to avoid repeated ++ * free then re-malloc calls. Need to provide a different API for those ++ * callers. ++ */ ++struct dentry *lookup_whiteout(const char *name, struct dentry *lower_parent) ++{ ++ char *whname = NULL; ++ int err = 0, namelen; ++ struct dentry *wh_dentry = NULL; ++ ++ namelen = strlen(name); ++ whname = alloc_whname(name, namelen); ++ if (unlikely(IS_ERR(whname))) { ++ err = PTR_ERR(whname); ++ goto out; ++ } ++ ++ /* check if whiteout exists in this branch: lookup .wh.foo */ ++ wh_dentry = lookup_lck_len(whname, lower_parent, strlen(whname)); ++ if (IS_ERR(wh_dentry)) { ++ err = PTR_ERR(wh_dentry); ++ goto out; ++ } ++ ++ /* check if negative dentry (ENOENT) */ ++ if (!wh_dentry->d_inode) ++ goto out; ++ ++ /* whiteout found: check if valid type */ ++ if (!S_ISREG(wh_dentry->d_inode->i_mode)) { ++ printk(KERN_ERR "unionfs: invalid whiteout %s entry type %d\n", ++ whname, wh_dentry->d_inode->i_mode); ++ dput(wh_dentry); ++ err = -EIO; ++ goto out; ++ } ++ ++out: ++ kfree(whname); ++ if (err) ++ wh_dentry = ERR_PTR(err); ++ return wh_dentry; ++} ++ ++/* find and return first whiteout in parent directory, else ENOENT */ ++struct dentry *find_first_whiteout(struct dentry *dentry) ++{ ++ int bindex, bstart, bend; ++ struct dentry *parent, *lower_parent, *wh_dentry; ++ ++ parent = dget_parent(dentry); ++ ++ bstart = dbstart(parent); ++ bend = dbend(parent); ++ wh_dentry = ERR_PTR(-ENOENT); ++ ++ for (bindex = bstart; bindex <= bend; bindex++) { ++ lower_parent = unionfs_lower_dentry_idx(parent, bindex); ++ if (!lower_parent) ++ continue; ++ wh_dentry = lookup_whiteout(dentry->d_name.name, lower_parent); ++ if (IS_ERR(wh_dentry)) ++ continue; ++ if (wh_dentry->d_inode) ++ break; ++ dput(wh_dentry); ++ wh_dentry = ERR_PTR(-ENOENT); ++ } ++ ++ dput(parent); ++ ++ return wh_dentry; ++} ++ ++/* ++ * Unlink a whiteout dentry. Returns 0 or -errno. Caller must hold and ++ * release dentry reference. ++ */ ++int unlink_whiteout(struct dentry *wh_dentry) ++{ ++ int err; ++ struct dentry *lower_dir_dentry; ++ ++ /* dget and lock parent dentry */ ++ lower_dir_dentry = lock_parent_wh(wh_dentry); ++ ++ /* see Documentation/filesystems/unionfs/issues.txt */ ++ lockdep_off(); ++ err = vfs_unlink(lower_dir_dentry->d_inode, wh_dentry); ++ lockdep_on(); ++ unlock_dir(lower_dir_dentry); ++ ++ /* ++ * Whiteouts are special files and should be deleted no matter what ++ * (as if they never existed), in order to allow this create ++ * operation to succeed. This is especially important in sticky ++ * directories: a whiteout may have been created by one user, but ++ * the newly created file may be created by another user. ++ * Therefore, in order to maintain Unix semantics, if the vfs_unlink ++ * above failed, then we have to try to directly unlink the ++ * whiteout. Note: in the ODF version of unionfs, whiteout are ++ * handled much more cleanly. ++ */ ++ if (err == -EPERM) { ++ struct inode *inode = lower_dir_dentry->d_inode; ++ err = inode->i_op->unlink(inode, wh_dentry); ++ } ++ if (err) ++ printk(KERN_ERR "unionfs: could not unlink whiteout %s, " ++ "err = %d\n", wh_dentry->d_name.name, err); ++ ++ return err; ++ ++} ++ ++/* ++ * Helper function when creating new objects (create, symlink, mknod, etc.). ++ * Checks to see if there's a whiteout in @lower_dentry's parent directory, ++ * whose name is taken from @dentry. Then tries to remove that whiteout, if ++ * found. If is a branch marked readonly, return -EROFS. ++ * If it finds both a regular file and a whiteout, delete whiteout (this ++ * should never happen). ++ * ++ * Return 0 if no whiteout was found. Return 1 if one was found and ++ * successfully removed. Therefore a value >= 0 tells the caller that ++ * @lower_dentry belongs to a good branch to create the new object in). ++ * Return -ERRNO if an error occurred during whiteout lookup or in trying to ++ * unlink the whiteout. ++ */ ++int check_unlink_whiteout(struct dentry *dentry, struct dentry *lower_dentry, ++ int bindex) ++{ ++ int err; ++ struct dentry *wh_dentry = NULL; ++ struct dentry *lower_dir_dentry = NULL; ++ ++ /* look for whiteout dentry first */ ++ lower_dir_dentry = dget_parent(lower_dentry); ++ wh_dentry = lookup_whiteout(dentry->d_name.name, lower_dir_dentry); ++ dput(lower_dir_dentry); ++ if (IS_ERR(wh_dentry)) { ++ err = PTR_ERR(wh_dentry); ++ goto out; ++ } ++ ++ if (!wh_dentry->d_inode) { /* no whiteout exists*/ ++ err = 0; ++ goto out_dput; ++ } ++ ++ /* check if regular file and whiteout were both found */ ++ if (unlikely(lower_dentry->d_inode)) ++ printk(KERN_WARNING "unionfs: removing whiteout; regular " ++ "file exists in directory %s (branch %d)\n", ++ lower_dir_dentry->d_name.name, bindex); ++ ++ /* check if branch is writeable */ ++ err = is_robranch_super(dentry->d_sb, bindex); ++ if (err) ++ goto out_dput; ++ ++ /* .wh.foo has been found, so let's unlink it */ ++ err = unlink_whiteout(wh_dentry); ++ if (!err) ++ err = 1; /* a whiteout was found and successfully removed */ ++out_dput: ++ dput(wh_dentry); ++out: ++ return err; ++} ++ ++/* ++ * Pass an unionfs dentry and an index. It will try to create a whiteout ++ * for the filename in dentry, and will try in branch 'index'. On error, ++ * it will proceed to a branch to the left. ++ */ ++int create_whiteout(struct dentry *dentry, int start) ++{ ++ int bstart, bend, bindex; ++ struct dentry *lower_dir_dentry; ++ struct dentry *lower_dentry; ++ struct dentry *lower_wh_dentry; ++ struct nameidata nd; ++ char *name = NULL; ++ int err = -EINVAL; ++ ++ verify_locked(dentry); ++ ++ bstart = dbstart(dentry); ++ bend = dbend(dentry); ++ ++ /* create dentry's whiteout equivalent */ ++ name = alloc_whname(dentry->d_name.name, dentry->d_name.len); ++ if (unlikely(IS_ERR(name))) { ++ err = PTR_ERR(name); ++ goto out; ++ } ++ ++ for (bindex = start; bindex >= 0; bindex--) { ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ ++ if (!lower_dentry) { ++ /* ++ * if lower dentry is not present, create the ++ * entire lower dentry directory structure and go ++ * ahead. Since we want to just create whiteout, we ++ * only want the parent dentry, and hence get rid of ++ * this dentry. ++ */ ++ lower_dentry = create_parents(dentry->d_inode, ++ dentry, ++ dentry->d_name.name, ++ bindex); ++ if (!lower_dentry || IS_ERR(lower_dentry)) { ++ int ret = PTR_ERR(lower_dentry); ++ if (!IS_COPYUP_ERR(ret)) ++ printk(KERN_ERR ++ "unionfs: create_parents for " ++ "whiteout failed: bindex=%d " ++ "err=%d\n", bindex, ret); ++ continue; ++ } ++ } ++ ++ lower_wh_dentry = ++ lookup_lck_len(name, lower_dentry->d_parent, ++ dentry->d_name.len + UNIONFS_WHLEN); ++ if (IS_ERR(lower_wh_dentry)) ++ continue; ++ ++ /* ++ * The whiteout already exists. This used to be impossible, ++ * but now is possible because of opaqueness. ++ */ ++ if (lower_wh_dentry->d_inode) { ++ dput(lower_wh_dentry); ++ err = 0; ++ goto out; ++ } ++ ++ err = init_lower_nd(&nd, LOOKUP_CREATE); ++ if (unlikely(err < 0)) ++ goto out; ++ lower_dir_dentry = lock_parent_wh(lower_wh_dentry); ++ err = is_robranch_super(dentry->d_sb, bindex); ++ if (!err) ++ err = vfs_create(lower_dir_dentry->d_inode, ++ lower_wh_dentry, ++ current_umask() & S_IRUGO, ++ &nd); ++ unlock_dir(lower_dir_dentry); ++ dput(lower_wh_dentry); ++ release_lower_nd(&nd, err); ++ ++ if (!err || !IS_COPYUP_ERR(err)) ++ break; ++ } ++ ++ /* set dbopaque so that lookup will not proceed after this branch */ ++ if (!err) ++ dbopaque(dentry) = bindex; ++ ++out: ++ kfree(name); ++ return err; ++} ++ ++/* ++ * Delete all of the whiteouts in a given directory for rmdir. ++ * ++ * lower directory inode should be locked ++ */ ++static int do_delete_whiteouts(struct dentry *dentry, int bindex, ++ struct unionfs_dir_state *namelist) ++{ ++ int err = 0; ++ struct dentry *lower_dir_dentry = NULL; ++ struct dentry *lower_dentry; ++ char *name = NULL, *p; ++ struct inode *lower_dir; ++ int i; ++ struct list_head *pos; ++ struct filldir_node *cursor; ++ ++ /* Find out lower parent dentry */ ++ lower_dir_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ BUG_ON(!S_ISDIR(lower_dir_dentry->d_inode->i_mode)); ++ lower_dir = lower_dir_dentry->d_inode; ++ BUG_ON(!S_ISDIR(lower_dir->i_mode)); ++ ++ err = -ENOMEM; ++ name = __getname(); ++ if (unlikely(!name)) ++ goto out; ++ strcpy(name, UNIONFS_WHPFX); ++ p = name + UNIONFS_WHLEN; ++ ++ err = 0; ++ for (i = 0; !err && i < namelist->size; i++) { ++ list_for_each(pos, &namelist->list[i]) { ++ cursor = ++ list_entry(pos, struct filldir_node, ++ file_list); ++ /* Only operate on whiteouts in this branch. */ ++ if (cursor->bindex != bindex) ++ continue; ++ if (!cursor->whiteout) ++ continue; ++ ++ strlcpy(p, cursor->name, PATH_MAX - UNIONFS_WHLEN); ++ lower_dentry = ++ lookup_lck_len(name, lower_dir_dentry, ++ cursor->namelen + ++ UNIONFS_WHLEN); ++ if (IS_ERR(lower_dentry)) { ++ err = PTR_ERR(lower_dentry); ++ break; ++ } ++ if (lower_dentry->d_inode) ++ err = vfs_unlink(lower_dir, lower_dentry); ++ dput(lower_dentry); ++ if (err) ++ break; ++ } ++ } ++ ++ __putname(name); ++ ++ /* After all of the removals, we should copy the attributes once. */ ++ fsstack_copy_attr_times(dentry->d_inode, lower_dir_dentry->d_inode); ++ ++out: ++ return err; ++} ++ ++ ++void __delete_whiteouts(struct work_struct *work) ++{ ++ struct sioq_args *args = container_of(work, struct sioq_args, work); ++ struct deletewh_args *d = &args->deletewh; ++ ++ args->err = do_delete_whiteouts(d->dentry, d->bindex, d->namelist); ++ complete(&args->comp); ++} ++ ++/* delete whiteouts in a dir (for rmdir operation) using sioq if necessary */ ++int delete_whiteouts(struct dentry *dentry, int bindex, ++ struct unionfs_dir_state *namelist) ++{ ++ int err; ++ struct super_block *sb; ++ struct dentry *lower_dir_dentry; ++ struct inode *lower_dir; ++ struct sioq_args args; ++ ++ sb = dentry->d_sb; ++ ++ BUG_ON(!S_ISDIR(dentry->d_inode->i_mode)); ++ BUG_ON(bindex < dbstart(dentry)); ++ BUG_ON(bindex > dbend(dentry)); ++ err = is_robranch_super(sb, bindex); ++ if (err) ++ goto out; ++ ++ lower_dir_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ BUG_ON(!S_ISDIR(lower_dir_dentry->d_inode->i_mode)); ++ lower_dir = lower_dir_dentry->d_inode; ++ BUG_ON(!S_ISDIR(lower_dir->i_mode)); ++ ++ if (!inode_permission(lower_dir, MAY_WRITE | MAY_EXEC)) { ++ err = do_delete_whiteouts(dentry, bindex, namelist); ++ } else { ++ args.deletewh.namelist = namelist; ++ args.deletewh.dentry = dentry; ++ args.deletewh.bindex = bindex; ++ run_sioq(__delete_whiteouts, &args); ++ err = args.err; ++ } ++ ++out: ++ return err; ++} ++ ++/**************************************************************************** ++ * Opaque directory helpers * ++ ****************************************************************************/ ++ ++/* ++ * is_opaque_dir: returns 0 if it is NOT an opaque dir, 1 if it is, and ++ * -errno if an error occurred trying to figure this out. ++ */ ++int is_opaque_dir(struct dentry *dentry, int bindex) ++{ ++ int err = 0; ++ struct dentry *lower_dentry; ++ struct dentry *wh_lower_dentry; ++ struct inode *lower_inode; ++ struct sioq_args args; ++ struct nameidata lower_nd; ++ ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ lower_inode = lower_dentry->d_inode; ++ ++ BUG_ON(!S_ISDIR(lower_inode->i_mode)); ++ ++ mutex_lock(&lower_inode->i_mutex); ++ ++ if (!inode_permission(lower_inode, MAY_EXEC)) { ++ err = init_lower_nd(&lower_nd, LOOKUP_OPEN); ++ if (unlikely(err < 0)) { ++ mutex_unlock(&lower_inode->i_mutex); ++ goto out; ++ } ++ wh_lower_dentry = ++ lookup_one_len_nd(UNIONFS_DIR_OPAQUE, lower_dentry, ++ sizeof(UNIONFS_DIR_OPAQUE) - 1, ++ &lower_nd); ++ release_lower_nd(&lower_nd, err); ++ } else { ++ args.is_opaque.dentry = lower_dentry; ++ run_sioq(__is_opaque_dir, &args); ++ wh_lower_dentry = args.ret; ++ } ++ ++ mutex_unlock(&lower_inode->i_mutex); ++ ++ if (IS_ERR(wh_lower_dentry)) { ++ err = PTR_ERR(wh_lower_dentry); ++ goto out; ++ } ++ ++ /* This is an opaque dir iff wh_lower_dentry is positive */ ++ err = !!wh_lower_dentry->d_inode; ++ ++ dput(wh_lower_dentry); ++out: ++ return err; ++} ++ ++void __is_opaque_dir(struct work_struct *work) ++{ ++ struct sioq_args *args = container_of(work, struct sioq_args, work); ++ struct nameidata lower_nd; ++ int err; ++ ++ err = init_lower_nd(&lower_nd, LOOKUP_OPEN); ++ if (unlikely(err < 0)) ++ return; ++ args->ret = lookup_one_len_nd(UNIONFS_DIR_OPAQUE, ++ args->is_opaque.dentry, ++ sizeof(UNIONFS_DIR_OPAQUE) - 1, ++ &lower_nd); ++ release_lower_nd(&lower_nd, err); ++ complete(&args->comp); ++} ++ ++int make_dir_opaque(struct dentry *dentry, int bindex) ++{ ++ int err = 0; ++ struct dentry *lower_dentry, *diropq; ++ struct inode *lower_dir; ++ struct nameidata nd; ++ const struct cred *old_creds; ++ struct cred *new_creds; ++ ++ /* ++ * Opaque directory whiteout markers are special files (like regular ++ * whiteouts), and should appear to the users as if they don't ++ * exist. They should be created/deleted regardless of directory ++ * search/create permissions, but only for the duration of this ++ * creation of the .wh.__dir_opaque: file. Note, this does not ++ * circumvent normal ->permission). ++ */ ++ new_creds = prepare_creds(); ++ if (unlikely(!new_creds)) { ++ err = -ENOMEM; ++ goto out_err; ++ } ++ cap_raise(new_creds->cap_effective, CAP_DAC_READ_SEARCH); ++ cap_raise(new_creds->cap_effective, CAP_DAC_OVERRIDE); ++ old_creds = override_creds(new_creds); ++ ++ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); ++ lower_dir = lower_dentry->d_inode; ++ BUG_ON(!S_ISDIR(dentry->d_inode->i_mode) || ++ !S_ISDIR(lower_dir->i_mode)); ++ ++ mutex_lock(&lower_dir->i_mutex); ++ err = init_lower_nd(&nd, LOOKUP_OPEN); ++ if (unlikely(err < 0)) ++ goto out; ++ diropq = lookup_one_len_nd(UNIONFS_DIR_OPAQUE, lower_dentry, ++ sizeof(UNIONFS_DIR_OPAQUE) - 1, &nd); ++ release_lower_nd(&nd, err); ++ if (IS_ERR(diropq)) { ++ err = PTR_ERR(diropq); ++ goto out; ++ } ++ ++ err = init_lower_nd(&nd, LOOKUP_CREATE); ++ if (unlikely(err < 0)) ++ goto out; ++ if (!diropq->d_inode) ++ err = vfs_create(lower_dir, diropq, S_IRUGO, &nd); ++ if (!err) ++ dbopaque(dentry) = bindex; ++ release_lower_nd(&nd, err); ++ ++ dput(diropq); ++ ++out: ++ mutex_unlock(&lower_dir->i_mutex); ++ revert_creds(old_creds); ++out_err: ++ return err; ++} +diff --git a/fs/unionfs/xattr.c b/fs/unionfs/xattr.c +new file mode 100644 +index 0000000..a93d803 +--- /dev/null ++++ b/fs/unionfs/xattr.c +@@ -0,0 +1,173 @@ ++/* ++ * Copyright (c) 2003-2011 Erez Zadok ++ * Copyright (c) 2003-2006 Charles P. Wright ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2005-2006 Junjiro Okajima ++ * Copyright (c) 2005 Arun M. Krishnakumar ++ * Copyright (c) 2004-2006 David P. Quigley ++ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair ++ * Copyright (c) 2003 Puja Gupta ++ * Copyright (c) 2003 Harikesavan Krishnan ++ * Copyright (c) 2003-2011 Stony Brook University ++ * Copyright (c) 2003-2011 The Research Foundation of SUNY ++ * ++ * 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 "union.h" ++ ++/* This is lifted from fs/xattr.c */ ++void *unionfs_xattr_alloc(size_t size, size_t limit) ++{ ++ void *ptr; ++ ++ if (size > limit) ++ return ERR_PTR(-E2BIG); ++ ++ if (!size) /* size request, no buffer is needed */ ++ return NULL; ++ ++ ptr = kmalloc(size, GFP_KERNEL); ++ if (unlikely(!ptr)) ++ return ERR_PTR(-ENOMEM); ++ return ptr; ++} ++ ++/* ++ * BKL held by caller. ++ * dentry->d_inode->i_mutex locked ++ */ ++ssize_t unionfs_getxattr(struct dentry *dentry, const char *name, void *value, ++ size_t size) ++{ ++ struct dentry *lower_dentry = NULL; ++ struct dentry *parent; ++ int err = -EOPNOTSUPP; ++ bool valid; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ valid = __unionfs_d_revalidate(dentry, parent, false); ++ if (unlikely(!valid)) { ++ err = -ESTALE; ++ goto out; ++ } ++ ++ lower_dentry = unionfs_lower_dentry(dentry); ++ ++ err = vfs_getxattr(lower_dentry, (char *) name, value, size); ++ ++out: ++ unionfs_check_dentry(dentry); ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} ++ ++/* ++ * BKL held by caller. ++ * dentry->d_inode->i_mutex locked ++ */ ++int unionfs_setxattr(struct dentry *dentry, const char *name, ++ const void *value, size_t size, int flags) ++{ ++ struct dentry *lower_dentry = NULL; ++ struct dentry *parent; ++ int err = -EOPNOTSUPP; ++ bool valid; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ valid = __unionfs_d_revalidate(dentry, parent, false); ++ if (unlikely(!valid)) { ++ err = -ESTALE; ++ goto out; ++ } ++ ++ lower_dentry = unionfs_lower_dentry(dentry); ++ ++ err = vfs_setxattr(lower_dentry, (char *) name, (void *) value, ++ size, flags); ++ ++out: ++ unionfs_check_dentry(dentry); ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} ++ ++/* ++ * BKL held by caller. ++ * dentry->d_inode->i_mutex locked ++ */ ++int unionfs_removexattr(struct dentry *dentry, const char *name) ++{ ++ struct dentry *lower_dentry = NULL; ++ struct dentry *parent; ++ int err = -EOPNOTSUPP; ++ bool valid; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ valid = __unionfs_d_revalidate(dentry, parent, false); ++ if (unlikely(!valid)) { ++ err = -ESTALE; ++ goto out; ++ } ++ ++ lower_dentry = unionfs_lower_dentry(dentry); ++ ++ err = vfs_removexattr(lower_dentry, (char *) name); ++ ++out: ++ unionfs_check_dentry(dentry); ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} ++ ++/* ++ * BKL held by caller. ++ * dentry->d_inode->i_mutex locked ++ */ ++ssize_t unionfs_listxattr(struct dentry *dentry, char *list, size_t size) ++{ ++ struct dentry *lower_dentry = NULL; ++ struct dentry *parent; ++ int err = -EOPNOTSUPP; ++ char *encoded_list = NULL; ++ bool valid; ++ ++ unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD); ++ parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT); ++ unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD); ++ ++ valid = __unionfs_d_revalidate(dentry, parent, false); ++ if (unlikely(!valid)) { ++ err = -ESTALE; ++ goto out; ++ } ++ ++ lower_dentry = unionfs_lower_dentry(dentry); ++ ++ encoded_list = list; ++ err = vfs_listxattr(lower_dentry, encoded_list, size); ++ ++out: ++ unionfs_check_dentry(dentry); ++ unionfs_unlock_dentry(dentry); ++ unionfs_unlock_parent(dentry, parent); ++ unionfs_read_unlock(dentry->d_sb); ++ return err; ++} +diff --git a/include/linux/fs_stack.h b/include/linux/fs_stack.h +index da317c7..64f1ced 100644 +--- a/include/linux/fs_stack.h ++++ b/include/linux/fs_stack.h +@@ -1,7 +1,19 @@ ++/* ++ * Copyright (c) 2006-2009 Erez Zadok ++ * Copyright (c) 2006-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2006-2009 Stony Brook University ++ * Copyright (c) 2006-2009 The Research Foundation of SUNY ++ * ++ * 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 _LINUX_FS_STACK_H + #define _LINUX_FS_STACK_H + +-/* This file defines generic functions used primarily by stackable ++/* ++ * This file defines generic functions used primarily by stackable + * filesystems; none of these functions require i_mutex to be held. + */ + +diff --git a/include/linux/magic.h b/include/linux/magic.h +index 1e5df2a..01ee54d 100644 +--- a/include/linux/magic.h ++++ b/include/linux/magic.h +@@ -50,6 +50,8 @@ + #define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs" + #define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs" + ++#define UNIONFS_SUPER_MAGIC 0xf15f083d ++ + #define SMB_SUPER_MAGIC 0x517B + #define USBDEVICE_SUPER_MAGIC 0x9fa2 + #define CGROUP_SUPER_MAGIC 0x27e0eb +diff --git a/include/linux/namei.h b/include/linux/namei.h +index eba45ea..8e19e9c 100644 +--- a/include/linux/namei.h ++++ b/include/linux/namei.h +@@ -81,8 +81,11 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, + + extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, + int (*open)(struct inode *, struct file *)); ++extern void release_open_intent(struct nameidata *); + + extern struct dentry *lookup_one_len(const char *, struct dentry *, int); ++extern struct dentry *lookup_one_len_nd(const char *, struct dentry *, int, ++ struct nameidata *nd); + + extern int follow_down_one(struct path *); + extern int follow_down(struct path *); +diff --git a/include/linux/splice.h b/include/linux/splice.h +index 997c3b4..54f5501 100644 +--- a/include/linux/splice.h ++++ b/include/linux/splice.h +@@ -81,6 +81,11 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *, + struct splice_pipe_desc *); + extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *, + splice_direct_actor *); ++extern long vfs_splice_from(struct pipe_inode_info *pipe, struct file *out, ++ loff_t *ppos, size_t len, unsigned int flags); ++extern long vfs_splice_to(struct file *in, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags); + + /* + * for dynamic pipe sizing +diff --git a/include/linux/union_fs.h b/include/linux/union_fs.h +new file mode 100644 +index 0000000..c84d97e +--- /dev/null ++++ b/include/linux/union_fs.h +@@ -0,0 +1,22 @@ ++/* ++ * Copyright (c) 2003-2009 Erez Zadok ++ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek ++ * Copyright (c) 2003-2009 Stony Brook University ++ * Copyright (c) 2003-2009 The Research Foundation of SUNY ++ * ++ * 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 _LINUX_UNION_FS_H ++#define _LINUX_UNION_FS_H ++ ++/* ++ * DEFINITIONS FOR USER AND KERNEL CODE: ++ */ ++# define UNIONFS_IOCTL_INCGEN _IOR(0x15, 11, int) ++# define UNIONFS_IOCTL_QUERYFILE _IOR(0x15, 15, int) ++ ++#endif /* _LINUX_UNIONFS_H */ ++ +diff --git a/security/security.c b/security/security.c +index 4ba6d4c..093d8b4 100644 +--- a/security/security.c ++++ b/security/security.c +@@ -520,6 +520,7 @@ int security_inode_permission(struct inode *inode, int mask) + return 0; + return security_ops->inode_permission(inode, mask, 0); + } ++EXPORT_SYMBOL(security_inode_permission); + + int security_inode_exec_permission(struct inode *inode, unsigned int flags) + { +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap_2.6.39.bb b/recipes/linux/linux-omap_2.6.39.bb new file mode 100644 index 0000000000..1ecb662b94 --- /dev/null +++ b/recipes/linux/linux-omap_2.6.39.bb @@ -0,0 +1,57 @@ +require multi-kernel.inc + +# development kernel +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "Linux kernel for OMAP processors" +KERNEL_IMAGETYPE = "uImage" + +COMPATIBLE_MACHINE = "(beagleboard)" + +# The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc +SRCREV = "v2.6.39" + +FILESPATHPKG_prepend = "linux-omap-2.6.39:" + +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ + file://defconfig" + +SRC_URI_append = " \ + file://sakoman/0001-OMAP-DSS2-DSI-fix-use_sys_clk-highfreq.patch \ + file://sakoman/0002-OMAP-DSS2-DSI-fix-dsi_dump_clocks.patch \ + file://sakoman/0003-OMAP2PLUS-DSS2-Fix-Return-correct-lcd-clock-source-f.patch \ + file://sakoman/0004-OMAP-DSS-DSI-Fix-DSI-PLL-power-bug.patch \ + file://sakoman/0005-OMAP-DSS2-fix-panel-Kconfig-dependencies.patch \ + file://sakoman/0006-OMAP-DSS2-add-bootarg-for-selecting-svideo-or-compos.patch \ + file://sakoman/0007-video-add-timings-for-hd720.patch \ + file://sakoman/0008-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch \ + file://sakoman/0009-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch \ + file://sakoman/0010-Revert-omap2_mcspi-Flush-posted-writes.patch \ + file://sakoman/0011-Revert-omap_hsmmc-improve-interrupt-synchronisation.patch \ + file://sakoman/0012-Don-t-turn-SDIO-cards-off-to-save-power.-Doing-so-wi.patch \ + file://sakoman/0013-Enable-the-use-of-SDIO-card-interrupts.patch \ + file://sakoman/0014-soc-codecs-Enable-audio-capture-by-default-for-twl40.patch \ + file://sakoman/0015-soc-codecs-twl4030-Turn-on-mic-bias-by-default.patch \ + file://sakoman/0016-RTC-add-support-for-backup-battery-recharge.patch \ + file://sakoman/0017-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch \ + file://sakoman/0018-Add-power-off-support-for-the-TWL4030-companion.patch \ + file://sakoman/0019-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch \ + file://sakoman/0020-Enabling-Hwmon-driver-for-twl4030-madc.patch \ + file://sakoman/0021-mfd-twl-core-enable-madc-clock.patch \ + file://sakoman/0022-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch \ + file://sakoman/0023-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch \ + file://sakoman/0024-omap-Fix-mtd-subpage-read-alignment.patch \ + file://sakoman/0025-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch \ + file://sakoman/0026-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch \ + file://sakoman/0027-OMAP-Overo-Add-support-for-spidev.patch \ + file://sakoman/0028-unionfs-Add-support-for-unionfs-2.5.9.patch \ + \ + file://beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch \ + file://beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch \ + " + +SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ +" + +S = "${WORKDIR}/git" + From 739deccd5960e802624c93ade3d3b852b5f106e6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 25 May 2011 10:29:28 +0200 Subject: [PATCH 353/509] linux-omap 2.6.39: sync with meta-texasinstruments Signed-off-by: Koen Kooi --- ...-support-for-beagleboard-xM-revision.patch | 38 +- ...agle-add-support-for-expansionboards.patch | 41 +- .../0003-OMAP3-beagle-add-MADC-support.patch | 36 + ...-add-regulators-for-camera-interface.patch | 71 + ...05-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch | 31 + .../beagleboard/configs/stock | 3490 +++++++++++++++++ .../linux-omap-2.6.39/beagleboard/defconfig | 151 +- .../0001-Add-mt9p031-sensor-support.patch | 917 +++++ ...-OMAP2-cpufreq-free-up-table-on-exit.patch | 38 + ...cpufreq-handle-invalid-cpufreq-table.patch | 44 + ...-OMAP2-cpufreq-minor-comment-cleanup.patch | 33 + ...e-clk_init_cpufreq_table-if-OPPs-not.patch | 48 + ...q-use-cpufreq_frequency_table_target.patch | 78 + ...06-OMAP2-cpufreq-fix-freq_table-leak.patch | 100 + ...pers-for-walking-the-frequency-table.patch | 134 + ...2-cpufreq-introduce-hotplug-governor.patch | 879 +++++ ...ure-driver-initializes-after-cpufreq.patch | 27 + ...q-ensure-policy-is-fully-initialized.patch | 31 + ...03-OMAP3-PM-CPUFreq-driver-for-OMAP3.patch | 263 ++ ...-CPUFREQ-Fix-conditional-compilation.patch | 32 + ...req-fixup-after-new-OPP-layer-merged.patch | 33 + ...it-OMAP1-and-OMAP2PLUS-CPUfreq-drive.patch | 669 ++++ ...eq-Add-SMP-support-to-cater-OMAP4430.patch | 170 + ...q-Fix-typo-when-attempting-to-set-mp.patch | 29 + ...kdomain-Add-an-api-to-read-idle-mode.patch | 77 + ...in-Add-SoC-support-for-clkdm_is_idle.patch | 86 + ...ise-sleep_switch-to-a-non-valid-valu.patch | 35 + ...-idle-clkdms-only-if-already-in-idle.patch | 50 + ...-Follow-the-recomended-PRCM-sequence.patch | 46 + ...P-Serial-Check-wk_st-only-if-present.patch | 33 + ...emove-spurious-pr_notice-for-debugfs.patch | 30 + ...-PM-remove-redundant-ifdef-CONFIG_PM.patch | 41 + ...x-fix-sr_late_init-error-path-in-pro.patch | 30 + ...martreflex-request-the-memory-region.patch | 36 + ...flex-fix-ioremap-leak-on-probe-error.patch | 66 + ...x-delete-instance-from-sr_list-on-pr.patch | 29 + ...x-delete-debugfs-entries-on-probe-er.patch | 48 + ...-remove-useless-SDP-specific-timings.patch | 57 + ...-SR-make-notify-independent-of-class.patch | 48 + ...MAP3-SR-disable-interrupt-by-default.patch | 37 + ...P3-SR-enable-disable-SR-only-on-need.patch | 41 + ...12-OMAP3-SR-fix-cosmetic-indentation.patch | 49 + ...AP-DSS2-DSI-fix-use_sys_clk-highfreq.patch | 4 +- ...02-OMAP-DSS2-DSI-fix-dsi_dump_clocks.patch | 4 +- ...ix-Return-correct-lcd-clock-source-f.patch | 4 +- ...4-OMAP-DSS-DSI-Fix-DSI-PLL-power-bug.patch | 4 +- ...-DSS2-fix-panel-Kconfig-dependencies.patch | 4 +- ...otarg-for-selecting-svideo-or-compos.patch | 4 +- .../0007-video-add-timings-for-hd720.patch | 4 +- ...911x-return-ENODEV-if-device-is-not-.patch | 4 +- ...uchscreen-ads7846-return-ENODEV-if-d.patch | 4 +- ...vert-omap2_mcspi-Flush-posted-writes.patch | 4 +- ...mc-improve-interrupt-synchronisation.patch | 4 +- ...cards-off-to-save-power.-Doing-so-wi.patch | 5 +- ...able-the-use-of-SDIO-card-interrupts.patch | 4 +- ...e-audio-capture-by-default-for-twl40.patch | 4 +- ...-twl4030-Turn-on-mic-bias-by-default.patch | 4 +- ...-support-for-backup-battery-recharge.patch | 4 +- ...l4030-move-clock-input-selection-pri.patch | 4 +- ...ff-support-for-the-TWL4030-companion.patch | 4 +- ...AP-Add-twl4030-madc-support-to-Overo.patch | 4 +- ...abling-Hwmon-driver-for-twl4030-madc.patch | 4 +- .../0021-mfd-twl-core-enable-madc-clock.patch | 4 +- ...rtc-twl-Switch-to-using-threaded-irq.patch | 25 + ...cally-set-musb-mode-in-platform-dat.patch} | 4 +- ...ust-dto-to-eliminate-timeout-errors.patch} | 4 +- ...omap-Fix-mtd-subpage-read-alignment.patch} | 4 +- ...rce-all-buffer-reads-to-u32-alignme.patch} | 4 +- ...fix-subpage-ecc-issue-with-prefetch.patch} | 4 +- ...8-OMAP-Overo-Add-support-for-spidev.patch} | 4 +- ...ionfs-Add-support-for-unionfs-2.5.9.patch} | 4 +- ..._device-activate-latency-messages-fr.patch | 34 + recipes/linux/linux-omap_2.6.39.bb | 70 +- 73 files changed, 8295 insertions(+), 169 deletions(-) create mode 100644 recipes/linux/linux-omap-2.6.39/beagle/0003-OMAP3-beagle-add-MADC-support.patch create mode 100644 recipes/linux/linux-omap-2.6.39/beagle/0004-OMAP3-beagle-add-regulators-for-camera-interface.patch create mode 100644 recipes/linux/linux-omap-2.6.39/beagle/0005-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch create mode 100644 recipes/linux/linux-omap-2.6.39/beagleboard/configs/stock create mode 100644 recipes/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-support.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0001-OMAP2-cpufreq-free-up-table-on-exit.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0002-OMAP2-cpufreq-handle-invalid-cpufreq-table.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0003-OMAP2-cpufreq-minor-comment-cleanup.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0004-OMAP2-cpufreq-use-clk_init_cpufreq_table-if-OPPs-not.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0005-OMAP2-cpufreq-use-cpufreq_frequency_table_target.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0006-OMAP2-cpufreq-fix-freq_table-leak.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-hotplug/0001-cpufreq-helpers-for-walking-the-frequency-table.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-hotplug/0002-cpufreq-introduce-hotplug-governor.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0001-OMAP-CPUfreq-ensure-driver-initializes-after-cpufreq.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0002-OMAP-CPUfreq-ensure-policy-is-fully-initialized.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0003-OMAP3-PM-CPUFreq-driver-for-OMAP3.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0004-OMAP-PM-CPUFREQ-Fix-conditional-compilation.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0005-cpufreq-fixup-after-new-OPP-layer-merged.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0006-OMAP-cpufreq-Split-OMAP1-and-OMAP2PLUS-CPUfreq-drive.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0007-OMAP2PLUS-cpufreq-Add-SMP-support-to-cater-OMAP4430.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0008-OMAP2PLUS-cpufreq-Fix-typo-when-attempting-to-set-mp.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0001-OMAP2-clockdomain-Add-an-api-to-read-idle-mode.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0002-OMAP2-clockdomain-Add-SoC-support-for-clkdm_is_idle.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0003-OMAP2-PM-Initialise-sleep_switch-to-a-non-valid-valu.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0004-OMAP2-PM-idle-clkdms-only-if-already-in-idle.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0005-OMAP2-hwmod-Follow-the-recomended-PRCM-sequence.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0006-OMAP-Serial-Check-wk_st-only-if-present.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0001-OMAP3-voltage-remove-spurious-pr_notice-for-debugfs.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0003-OMAP3-smartreflex-fix-sr_late_init-error-path-in-pro.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0004-OMAP3-smartreflex-request-the-memory-region.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0005-OMAP3-smartreflex-fix-ioremap-leak-on-probe-error.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0006-OMAP3-smartreflex-delete-instance-from-sr_list-on-pr.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0007-OMAP3-smartreflex-delete-debugfs-entries-on-probe-er.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0008-OMAP3-cpuidle-remove-useless-SDP-specific-timings.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0009-OMAP3-SR-make-notify-independent-of-class.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0010-OMAP3-SR-disable-interrupt-by-default.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0011-OMAP3-SR-enable-disable-SR-only-on-need.patch create mode 100644 recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0012-OMAP3-SR-fix-cosmetic-indentation.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0022-rtc-twl-Switch-to-using-threaded-irq.patch rename recipes/linux/linux-omap-2.6.39/sakoman/{0022-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch => 0023-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch} (91%) rename recipes/linux/linux-omap-2.6.39/sakoman/{0023-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch => 0024-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch} (86%) rename recipes/linux/linux-omap-2.6.39/sakoman/{0024-omap-Fix-mtd-subpage-read-alignment.patch => 0025-omap-Fix-mtd-subpage-read-alignment.patch} (96%) rename recipes/linux/linux-omap-2.6.39/sakoman/{0025-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch => 0026-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch} (87%) rename recipes/linux/linux-omap-2.6.39/sakoman/{0026-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch => 0027-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch} (94%) rename recipes/linux/linux-omap-2.6.39/sakoman/{0027-OMAP-Overo-Add-support-for-spidev.patch => 0028-OMAP-Overo-Add-support-for-spidev.patch} (91%) rename recipes/linux/linux-omap-2.6.39/sakoman/{0028-unionfs-Add-support-for-unionfs-2.5.9.patch => 0029-unionfs-Add-support-for-unionfs-2.5.9.patch} (99%) create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0030-omap-Change-omap_device-activate-latency-messages-fr.patch diff --git a/recipes/linux/linux-omap-2.6.39/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch b/recipes/linux/linux-omap-2.6.39/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch index c7b6230b56..30063f9de5 100644 --- a/recipes/linux/linux-omap-2.6.39/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch +++ b/recipes/linux/linux-omap-2.6.39/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch @@ -1,17 +1,17 @@ -From 6597e99e0b74076530e34608e2d9a7b86a694b8e Mon Sep 17 00:00:00 2001 +From 2dd4bf287ad066e3d9e82c239782fb649c6f7fe7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 20 May 2011 12:48:37 +0200 -Subject: [PATCH 1/2] OMAP3: beagle: add support for beagleboard xM revision C +Subject: [PATCH 1/5] OMAP3: beagle: add support for beagleboard xM revision C The USB enable GPIO has been inverted and the USER button moved. Signed-off-by: Koen Kooi --- - arch/arm/mach-omap2/board-omap3beagle.c | 32 +++++++++++++++++++++++------- - 1 files changed, 24 insertions(+), 8 deletions(-) + arch/arm/mach-omap2/board-omap3beagle.c | 34 +++++++++++++++++++++++------- + 1 files changed, 26 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 2de4b02..1eb1e8e 100644 +index 2de4b02..77bafa8 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -62,7 +62,9 @@ @@ -33,7 +33,7 @@ index 2de4b02..1eb1e8e 100644 }; static u8 omap3_beagle_version; -@@ -124,9 +127,17 @@ static void __init omap3_beagle_init_rev(void) +@@ -124,9 +127,18 @@ static void __init omap3_beagle_init_rev(void) printk(KERN_INFO "OMAP3 Beagle Rev: xM\n"); omap3_beagle_version = OMAP3BEAGLE_BOARD_XM; break; @@ -48,57 +48,59 @@ index 2de4b02..1eb1e8e 100644 default: - printk(KERN_INFO "OMAP3 Beagle Rev: unknown %hd\n", beagle_rev); - omap3_beagle_version = OMAP3BEAGLE_BOARD_UNKN; -+ printk(KERN_INFO "OMAP3 Beagle Rev: unknown %hd, assuming xM C or newer\n", beagle_rev); ++ printk(KERN_INFO ++ "OMAP3 Beagle Rev: unknown %hd, assuming xM C or newer\n", beagle_rev); + omap3_beagle_version = OMAP3BEAGLE_BOARD_XMC; } return; -@@ -278,7 +289,7 @@ static int beagle_twl_gpio_setup(struct device *dev, +@@ -278,7 +290,7 @@ static int beagle_twl_gpio_setup(struct device *dev, { int r; - if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { -+ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM || omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC) { ++ if (cpu_is_omap3630()) { mmc[0].gpio_wp = -EINVAL; } else if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C1_3) || (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C4)) { -@@ -298,7 +309,7 @@ static int beagle_twl_gpio_setup(struct device *dev, +@@ -298,7 +310,8 @@ static int beagle_twl_gpio_setup(struct device *dev, /* REVISIT: need ehci-omap hooks for external VBUS * power switch and overcurrent detect */ - if (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XM) { -+ if (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XM && omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XMC) { ++ if (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XM ++ && omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XMC) { r = gpio_request(gpio + 1, "EHCI_nOC"); if (!r) { r = gpio_direction_input(gpio + 1); -@@ -320,7 +331,7 @@ static int beagle_twl_gpio_setup(struct device *dev, +@@ -320,7 +333,7 @@ static int beagle_twl_gpio_setup(struct device *dev, gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0); /* DVI reset GPIO is different between beagle revisions */ - if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) -+ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM || omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC) ++ if (cpu_is_omap3630()) beagle_dvi_device.reset_gpio = 129; else beagle_dvi_device.reset_gpio = 170; -@@ -334,7 +345,7 @@ static int beagle_twl_gpio_setup(struct device *dev, +@@ -334,7 +347,7 @@ static int beagle_twl_gpio_setup(struct device *dev, * P7/P8 revisions(prototype): Camera EN * A2+ revisions (production): LDO (supplies DVI, serial, led blocks) */ - if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { -+ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM || omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC) { ++ if (cpu_is_omap3630()) { r = gpio_request(gpio + 1, "nDVI_PWR_EN"); if (!r) { r = gpio_direction_output(gpio + 1, 0); -@@ -625,7 +636,7 @@ static void __init beagle_opp_init(void) +@@ -625,7 +638,7 @@ static void __init beagle_opp_init(void) } /* Custom OPP enabled for XM */ - if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { -+ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM || omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC) { ++ if (cpu_is_omap3630()) { struct omap_hwmod *mh = omap_hwmod_lookup("mpu"); struct omap_hwmod *dh = omap_hwmod_lookup("iva"); struct device *dev; -@@ -665,6 +676,11 @@ static void __init omap3_beagle_init(void) +@@ -665,6 +678,11 @@ static void __init omap3_beagle_init(void) omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); omap3_beagle_init_rev(); omap3_beagle_i2c_init(); diff --git a/recipes/linux/linux-omap-2.6.39/beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch b/recipes/linux/linux-omap-2.6.39/beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch index 68f318b8da..f815a58ac4 100644 --- a/recipes/linux/linux-omap-2.6.39/beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch +++ b/recipes/linux/linux-omap-2.6.39/beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch @@ -1,15 +1,15 @@ -From 70b4b60b198137ca8aebd577142ea3bb6c273a55 Mon Sep 17 00:00:00 2001 +From 258a21a495a9ba2238081cd473b4796cd61a60e7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 20 May 2011 13:06:24 +0200 -Subject: [PATCH 2/2] OMAP3: beagle: add support for expansionboards +Subject: [PATCH 2/5] OMAP3: beagle: add support for expansionboards Signed-off-by: Koen Kooi --- - arch/arm/mach-omap2/board-omap3beagle.c | 267 ++++++++++++++++++++++++++++++- - 1 files changed, 264 insertions(+), 3 deletions(-) + arch/arm/mach-omap2/board-omap3beagle.c | 272 ++++++++++++++++++++++++++++++- + 1 files changed, 269 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 1eb1e8e..40e54f2 100644 +index 77bafa8..db285e1 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -21,6 +21,7 @@ @@ -20,7 +20,7 @@ index 1eb1e8e..40e54f2 100644 #include #include #include -@@ -153,6 +154,162 @@ fail0: +@@ -154,6 +155,167 @@ fail0: return; } @@ -59,19 +59,24 @@ index 1eb1e8e..40e54f2 100644 + .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_POWER_OFF_CARD, + .gpio_wp = -EINVAL, + .gpio_cd = -EINVAL, ++ .ocr_mask = MMC_VDD_165_195, + .nonremovable = true, + }, + {} /* Terminator */ + }; + -+static struct regulator_consumer_supply beagle_vmmc2_supply = { -+ .supply = "vmmc", -+ .dev_name = "mmci-omap-hs.1", -+}; ++static struct regulator_consumer_supply beagle_vmmc2_supply = ++ REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"); + +static struct regulator_init_data beagle_vmmc2 = { + .constraints = { -+ .valid_ops_mask = REGULATOR_CHANGE_STATUS, ++ .min_uV = 1850000, ++ .max_uV = 1850000, ++ .apply_uV = true, ++ .valid_modes_mask = REGULATOR_MODE_NORMAL ++ | REGULATOR_MODE_STANDBY, ++ .valid_ops_mask = REGULATOR_CHANGE_MODE ++ | REGULATOR_CHANGE_STATUS, + }, + .num_consumer_supplies = 1, + .consumer_supplies = &beagle_vmmc2_supply, @@ -183,7 +188,7 @@ index 1eb1e8e..40e54f2 100644 static struct mtd_partition omap3beagle_nand_partitions[] = { /* All the partition sizes are listed in terms of NAND block size */ { -@@ -271,6 +428,12 @@ static struct omap2_hsmmc_info mmc[] = { +@@ -272,6 +434,12 @@ static struct omap2_hsmmc_info mmc[] = { .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, .gpio_wp = 29, }, @@ -196,7 +201,7 @@ index 1eb1e8e..40e54f2 100644 {} /* Terminator */ }; -@@ -300,11 +463,25 @@ static int beagle_twl_gpio_setup(struct device *dev, +@@ -301,11 +469,25 @@ static int beagle_twl_gpio_setup(struct device *dev, } /* gpio + 0 is "mmc0_cd" (input/IRQ) */ mmc[0].gpio_cd = gpio + 0; @@ -222,7 +227,7 @@ index 1eb1e8e..40e54f2 100644 /* REVISIT: need ehci-omap hooks for external VBUS * power switch and overcurrent detect -@@ -464,7 +641,7 @@ static struct twl4030_platform_data beagle_twldata = { +@@ -466,7 +648,7 @@ static struct twl4030_platform_data beagle_twldata = { .vpll2 = &beagle_vpll2, }; @@ -231,7 +236,7 @@ index 1eb1e8e..40e54f2 100644 { I2C_BOARD_INFO("twl4030", 0x48), .flags = I2C_CLIENT_WAKE, -@@ -479,10 +656,24 @@ static struct i2c_board_info __initdata beagle_i2c_eeprom[] = { +@@ -481,10 +663,24 @@ static struct i2c_board_info __initdata beagle_i2c_eeprom[] = { }, }; @@ -258,7 +263,7 @@ index 1eb1e8e..40e54f2 100644 /* Bus 3 is attached to the DVI port where devices like the pico DLP * projector don't work reliably with 400kHz */ omap_register_i2c_bus(3, 100, beagle_i2c_eeprom, ARRAY_SIZE(beagle_i2c_eeprom)); -@@ -625,6 +816,15 @@ static struct omap_musb_board_data musb_board_data = { +@@ -627,6 +823,15 @@ static struct omap_musb_board_data musb_board_data = { .power = 100, }; @@ -274,7 +279,7 @@ index 1eb1e8e..40e54f2 100644 static void __init beagle_opp_init(void) { int r = 0; -@@ -691,6 +891,65 @@ static void __init omap3_beagle_init(void) +@@ -693,6 +898,65 @@ static void __init omap3_beagle_init(void) /* REVISIT leave DVI powered down until it's needed ... */ gpio_direction_output(170, true); @@ -340,7 +345,7 @@ index 1eb1e8e..40e54f2 100644 usb_musb_init(&musb_board_data); usbhs_init(&usbhs_bdata); omap3beagle_flash_init(); -@@ -703,6 +962,8 @@ static void __init omap3_beagle_init(void) +@@ -705,6 +969,8 @@ static void __init omap3_beagle_init(void) beagle_opp_init(); } diff --git a/recipes/linux/linux-omap-2.6.39/beagle/0003-OMAP3-beagle-add-MADC-support.patch b/recipes/linux/linux-omap-2.6.39/beagle/0003-OMAP3-beagle-add-MADC-support.patch new file mode 100644 index 0000000000..0f5c0bd56c --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/beagle/0003-OMAP3-beagle-add-MADC-support.patch @@ -0,0 +1,36 @@ +From b6deb9a9c3a0c8b9afc981cbca20ff73fa7a8d8c Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Sat, 21 May 2011 16:18:30 +0200 +Subject: [PATCH 3/5] OMAP3: beagle: add MADC support + +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/board-omap3beagle.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index db285e1..da4ba50 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -634,6 +634,10 @@ static struct twl4030_codec_data beagle_codec_data = { + .audio = &beagle_audio_data, + }; + ++static struct twl4030_madc_platform_data beagle_madc_data = { ++ .irq_line = 1, ++}; ++ + static struct twl4030_platform_data beagle_twldata = { + .irq_base = TWL4030_IRQ_BASE, + .irq_end = TWL4030_IRQ_END, +@@ -642,6 +646,7 @@ static struct twl4030_platform_data beagle_twldata = { + .usb = &beagle_usb_data, + .gpio = &beagle_gpio_data, + .codec = &beagle_codec_data, ++ .madc = &beagle_madc_data, + .vmmc1 = &beagle_vmmc1, + .vsim = &beagle_vsim, + .vdac = &beagle_vdac, +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/beagle/0004-OMAP3-beagle-add-regulators-for-camera-interface.patch b/recipes/linux/linux-omap-2.6.39/beagle/0004-OMAP3-beagle-add-regulators-for-camera-interface.patch new file mode 100644 index 0000000000..900502d2bb --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/beagle/0004-OMAP3-beagle-add-regulators-for-camera-interface.patch @@ -0,0 +1,71 @@ +From 0ba8b335b9dd023784ef493b524d6335bfcd453a Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Wed, 25 May 2011 08:56:06 +0200 +Subject: [PATCH 4/5] OMAP3: beagle: add regulators for camera interface + +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/board-omap3beagle.c | 40 +++++++++++++++++++++++++++++++ + 1 files changed, 40 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index da4ba50..52ea11a 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -453,6 +453,44 @@ static struct regulator_consumer_supply beagle_vsim_supply = { + + static struct gpio_led gpio_leds[]; + ++static struct regulator_consumer_supply beagle_vaux3_supply = { ++ .supply = "cam_1v8", ++}; ++ ++static struct regulator_consumer_supply beagle_vaux4_supply = { ++ .supply = "cam_2v8", ++}; ++ ++/* VAUX3 for CAM_1V8 */ ++static struct regulator_init_data beagle_vaux3 = { ++ .constraints = { ++ .min_uV = 1800000, ++ .max_uV = 1800000, ++ .apply_uV = true, ++ .valid_modes_mask = REGULATOR_MODE_NORMAL ++ | REGULATOR_MODE_STANDBY, ++ .valid_ops_mask = REGULATOR_CHANGE_MODE ++ | REGULATOR_CHANGE_STATUS, ++ }, ++ .num_consumer_supplies = 1, ++ .consumer_supplies = &beagle_vaux3_supply, ++}; ++ ++/* VAUX4 for CAM_2V8 */ ++static struct regulator_init_data beagle_vaux4 = { ++ .constraints = { ++ .min_uV = 1800000, ++ .max_uV = 1800000, ++ .apply_uV = true, ++ .valid_modes_mask = REGULATOR_MODE_NORMAL ++ | REGULATOR_MODE_STANDBY, ++ .valid_ops_mask = REGULATOR_CHANGE_MODE ++ | REGULATOR_CHANGE_STATUS, ++ }, ++ .num_consumer_supplies = 1, ++ .consumer_supplies = &beagle_vaux4_supply, ++}; ++ + static int beagle_twl_gpio_setup(struct device *dev, + unsigned gpio, unsigned ngpio) + { +@@ -651,6 +689,8 @@ static struct twl4030_platform_data beagle_twldata = { + .vsim = &beagle_vsim, + .vdac = &beagle_vdac, + .vpll2 = &beagle_vpll2, ++ .vaux3 = &beagle_vaux3, ++ .vaux4 = &beagle_vaux4, + }; + + static struct i2c_board_info __initdata beagle_i2c1_boardinfo[] = { +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/beagle/0005-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch b/recipes/linux/linux-omap-2.6.39/beagle/0005-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch new file mode 100644 index 0000000000..a555c9319b --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/beagle/0005-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch @@ -0,0 +1,31 @@ +From 5b0f364b7e017d422b01c0e3297d0b68119f95f0 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Wed, 25 May 2011 08:57:40 +0200 +Subject: [PATCH 5/5] OMAP3: beagle: HACK! add in 1GHz OPP + +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/board-omap3beagle.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 52ea11a..cf95173 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -901,11 +901,13 @@ static void __init beagle_opp_init(void) + /* Enable MPU 1GHz and lower opps */ + dev = &mh->od->pdev.dev; + r = opp_enable(dev, 800000000); ++ r |= opp_enable(dev, 1000000000); + /* TODO: MPU 1GHz needs SR and ABB */ + + /* Enable IVA 800MHz and lower opps */ + dev = &dh->od->pdev.dev; + r |= opp_enable(dev, 660000000); ++ r |= opp_enable(dev, 800000000); + /* TODO: DSP 800MHz needs SR and ABB */ + if (r) { + pr_err("%s: failed to enable higher opp %d\n", +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/beagleboard/configs/stock b/recipes/linux/linux-omap-2.6.39/beagleboard/configs/stock new file mode 100644 index 0000000000..dd288e24d7 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/beagleboard/configs/stock @@ -0,0 +1,3490 @@ +# +# Automatically generated make config: don't edit +# Linux/arm 2.6.39 Kernel Configuration +# Fri May 20 13:11:13 2011 +# +CONFIG_ARM=y +CONFIG_HAVE_PWM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_HAVE_SCHED_CLOCK=y +CONFIG_GENERIC_GPIO=y +# CONFIG_ARCH_USES_GETTIMEOFFSET is not set +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_KTIME_SCALAR=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_ARCH_HAS_CPUFREQ=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_VECTORS_BASE=0xffff0000 +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y +CONFIG_HAVE_IRQ_WORK=y +CONFIG_IRQ_WORK=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_LZO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_FHANDLE=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +# CONFIG_AUDIT is not set +CONFIG_HAVE_GENERIC_HARDIRQS=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_HARDIRQS=y +CONFIG_HAVE_SPARSE_IRQ=y +CONFIG_GENERIC_IRQ_SHOW=y +# CONFIG_SPARSE_IRQ is not set + +# +# RCU Subsystem +# +CONFIG_TREE_PREEMPT_RCU=y +# CONFIG_TINY_RCU is not set +# CONFIG_TINY_PREEMPT_RCU is not set +CONFIG_PREEMPT_RCU=y +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_TREE_RCU_TRACE is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=16 +CONFIG_CGROUPS=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_CGROUP_NS=y +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_RESOURCE_COUNTERS=y +CONFIG_CGROUP_MEM_RES_CTLR=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y +CONFIG_CGROUP_PERF=y +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_RT_GROUP_SCHED=y +# CONFIG_BLK_CGROUP is not set +# CONFIG_NAMESPACES is not set +CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y +# CONFIG_SYSFS_DEPRECATED is not set +# CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_EXPERT=y +CONFIG_UID16=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_EMBEDDED=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_PERF_USE_VMALLOC=y + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +# CONFIG_PERF_COUNTERS is not set +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_COMPAT_BRK is not set +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_PROFILING=y +CONFIG_OPROFILE=y +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_HW_BREAKPOINT=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +CONFIG_BLK_DEV_BSG=y +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +# CONFIG_INLINE_SPIN_UNLOCK is not set +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +# CONFIG_INLINE_READ_UNLOCK is not set +# CONFIG_INLINE_READ_UNLOCK_BH is not set +# CONFIG_INLINE_READ_UNLOCK_IRQ is not set +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +# CONFIG_INLINE_WRITE_UNLOCK is not set +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set +CONFIG_FREEZER=y + +# +# System Type +# +CONFIG_MMU=y +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_VEXPRESS is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_BCMRING is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CNS3XXX is not set +# CONFIG_ARCH_GEMINI is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_MXS is not set +# CONFIG_ARCH_STMP3XXX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_DOVE is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_LPC32XX is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_MMP is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_W90X900 is not set +# CONFIG_ARCH_NUC93X is not set +# CONFIG_ARCH_TEGRA is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_MSM is not set +# CONFIG_ARCH_SHMOBILE is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_S5P64X0 is not set +# CONFIG_ARCH_S5P6442 is not set +# CONFIG_ARCH_S5PC100 is not set +# CONFIG_ARCH_S5PV210 is not set +# CONFIG_ARCH_EXYNOS4 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_TCC_926 is not set +# CONFIG_ARCH_U300 is not set +# CONFIG_ARCH_U8500 is not set +# CONFIG_ARCH_NOMADIK is not set +# CONFIG_ARCH_DAVINCI is not set +CONFIG_ARCH_OMAP=y +# CONFIG_PLAT_SPEAR is not set +# CONFIG_ARCH_VT8500 is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_KEYBOARD_GPIO_POLLED is not set + +# +# TI OMAP Common Features +# +CONFIG_ARCH_OMAP_OTG=y +# CONFIG_ARCH_OMAP1 is not set +CONFIG_ARCH_OMAP2PLUS=y + +# +# OMAP Feature Selections +# +CONFIG_OMAP_SMARTREFLEX=y +CONFIG_OMAP_SMARTREFLEX_CLASS3=y +CONFIG_OMAP_RESET_CLOCKS=y +# CONFIG_OMAP_MUX is not set +CONFIG_OMAP_MCBSP=y +CONFIG_OMAP_MBOX_FWK=m +CONFIG_OMAP_MBOX_KFIFO_SIZE=256 +CONFIG_OMAP_IOMMU=y +CONFIG_OMAP_IOMMU_DEBUG=m +CONFIG_OMAP_32K_TIMER=y +# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set +CONFIG_OMAP_32K_TIMER_HZ=128 +CONFIG_OMAP_DM_TIMER=y +# CONFIG_OMAP_PM_NONE is not set +CONFIG_OMAP_PM_NOOP=y + +# +# TI OMAP2/3/4 Specific Features +# +CONFIG_ARCH_OMAP2PLUS_TYPICAL=y +# CONFIG_ARCH_OMAP2 is not set +CONFIG_ARCH_OMAP3=y +# CONFIG_ARCH_OMAP4 is not set +CONFIG_SOC_OMAP3430=y +# CONFIG_SOC_OMAPTI816X is not set +CONFIG_OMAP_PACKAGE_CBB=y + +# +# OMAP Board Type +# +CONFIG_MACH_OMAP3_BEAGLE=y +# CONFIG_MACH_DEVKIT8000 is not set +# CONFIG_MACH_OMAP_LDP is not set +# CONFIG_MACH_OMAP3530_LV_SOM is not set +# CONFIG_MACH_OMAP3_TORPEDO is not set +CONFIG_MACH_OVERO=y +CONFIG_MACH_OMAP3EVM=y +# CONFIG_MACH_OMAP3517EVM is not set +# CONFIG_MACH_CRANEBOARD is not set +# CONFIG_MACH_OMAP3_PANDORA is not set +CONFIG_MACH_OMAP3_TOUCHBOOK=y +# CONFIG_MACH_OMAP_3430SDP is not set +# CONFIG_MACH_NOKIA_RM680 is not set +# CONFIG_MACH_NOKIA_RX51 is not set +CONFIG_MACH_OMAP_ZOOM2=y +# CONFIG_MACH_OMAP_ZOOM3 is not set +# CONFIG_MACH_CM_T35 is not set +# CONFIG_MACH_CM_T3517 is not set +# CONFIG_MACH_IGEP0020 is not set +# CONFIG_MACH_IGEP0030 is not set +# CONFIG_MACH_SBC3530 is not set +# CONFIG_MACH_OMAP_3630SDP is not set +# CONFIG_OMAP3_EMU is not set +# CONFIG_OMAP3_SDRC_AC_TIMING is not set + +# +# System MMU +# + +# +# Processor Type +# +CONFIG_CPU_V7=y +CONFIG_CPU_32v6K=y +CONFIG_CPU_32v7=y +CONFIG_CPU_ABRT_EV7=y +CONFIG_CPU_PABRT_V7=y +CONFIG_CPU_CACHE_V7=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y +CONFIG_CPU_TLB_V7=y +CONFIG_CPU_HAS_ASID=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +CONFIG_ARM_THUMBEE=y +# CONFIG_SWP_EMULATE is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_ARM_L1_CACHE_SHIFT_6=y +CONFIG_ARM_L1_CACHE_SHIFT=6 +CONFIG_ARM_DMA_MEM_BUFFERABLE=y +CONFIG_ARM_ERRATA_430973=y +# CONFIG_ARM_ERRATA_458693 is not set +# CONFIG_ARM_ERRATA_460075 is not set +# CONFIG_ARM_ERRATA_743622 is not set +# CONFIG_ARM_ERRATA_754322 is not set + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_HZ=128 +# CONFIG_THUMB2_KERNEL is not set +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_HIGHMEM is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_VIRT_TO_BUS=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_NEED_PER_CPU_KM=y +CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_LEDS=y +CONFIG_ALIGNMENT_TRAP=y +# CONFIG_UACCESS_WITH_MEMCPY is not set +# CONFIG_SECCOMP is not set +# CONFIG_CC_STACKPROTECTOR is not set +# CONFIG_DEPRECATED_PARAM_STRUCT is not set + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE=" debug " +# CONFIG_CMDLINE_FORCE is not set +# CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y +# CONFIG_CRASH_DUMP is not set +# CONFIG_AUTO_ZRELADDR is not set + +# +# CPU Power Management +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_VFP=y +CONFIG_VFPv3=y +CONFIG_NEON=y + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=y + +# +# Power management options +# +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_PM_SLEEP=y +CONFIG_PM_RUNTIME=y +CONFIG_PM=y +CONFIG_PM_DEBUG=y +# CONFIG_PM_VERBOSE is not set +# CONFIG_PM_ADVANCED_DEBUG is not set +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_CAN_PM_TRACE=y +# CONFIG_APM_EMULATION is not set +CONFIG_ARCH_HAS_OPP=y +CONFIG_PM_OPP=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=y +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_ROUTE_CLASSID=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IPGRE=m +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m +# CONFIG_IPV6_SIT_6RD is not set +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_MROUTE=y +CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y +# CONFIG_IPV6_PIMSM_V2 is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETWORK_PHY_TIMESTAMPING=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_ZONES=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +# CONFIG_NETFILTER_TPROXY is not set +CONFIG_NETFILTER_XTABLES=m + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m + +# +# Xtables targets +# +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +# CONFIG_NETFILTER_XT_TARGET_LED is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +# CONFIG_NETFILTER_XT_MATCH_OSF is not set +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +# CONFIG_IP_SET_BITMAP_IP is not set +# CONFIG_IP_SET_BITMAP_IPMAC is not set +# CONFIG_IP_SET_BITMAP_PORT is not set +# CONFIG_IP_SET_HASH_IP is not set +# CONFIG_IP_SET_HASH_IPPORT is not set +# CONFIG_IP_SET_HASH_IPPORTIP is not set +# CONFIG_IP_SET_HASH_IPPORTNET is not set +# CONFIG_IP_SET_HASH_NET is not set +# CONFIG_IP_SET_HASH_NETPORT is not set +# CONFIG_IP_SET_LIST_SET is not set +CONFIG_IP_VS=m +CONFIG_IP_VS_IPV6=y +CONFIG_IP_VS_DEBUG=y +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +# CONFIG_IP_VS_PROTO_SCTP is not set + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PE_SIP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +# CONFIG_BRIDGE_NF_EBTABLES is not set +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_TFRC_LIB=y + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +# CONFIG_SCTP_HMAC_SHA1 is not set +CONFIG_SCTP_HMAC_MD5=y +# CONFIG_RDS is not set +CONFIG_TIPC=m +# CONFIG_TIPC_ADVANCED is not set +# CONFIG_TIPC_DEBUG is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_L2TP=m +CONFIG_L2TP_DEBUGFS=m +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +CONFIG_L2TP_ETH=m +CONFIG_STP=m +CONFIG_GARP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +# CONFIG_NET_DSA is not set +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y +# CONFIG_DECNET is not set +CONFIG_LLC=m +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +CONFIG_WAN_ROUTER=m +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +# CONFIG_NET_SCH_SFB is not set +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_CHOKE=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_CLS_CGROUP=m +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set +CONFIG_DNS_RESOLVER=y +# CONFIG_BATMAN_ADV is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m + +# +# CAN Device Drivers +# +CONFIG_CAN_VCAN=m +CONFIG_CAN_SLCAN=m +# CONFIG_CAN_DEV is not set +# CONFIG_CAN_DEBUG_DEVICES is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +# CONFIG_ACT200L_DONGLE is not set +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_L2CAP=y +CONFIG_BT_SCO=y +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +# CONFIG_BT_HCIVHCI is not set +# CONFIG_BT_MRVL is not set +CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +# CONFIG_RXKAD is not set +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +CONFIG_NL80211_TESTMODE=y +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_REG_DEBUG is not set +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_WEXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_LIB80211=y +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_PID=y +# CONFIG_MAC80211_RC_MINSTREL is not set +CONFIG_MAC80211_RC_DEFAULT_PID=y +CONFIG_MAC80211_RC_DEFAULT="pid" +# CONFIG_MAC80211_MESH is not set +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +CONFIG_NET_9P=m +# CONFIG_NET_9P_DEBUG is not set +# CONFIG_CAIF is not set +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_TESTS is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +CONFIG_SM_FTL=m +# CONFIG_MTD_OOPS is not set +CONFIG_MTD_SWAP=m + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND_ECC=y +# CONFIG_MTD_NAND_ECC_SMC is not set +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_BCH is not set +# CONFIG_MTD_SM_COMMON is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_GPIO is not set +CONFIG_MTD_NAND_OMAP2=y +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_NANDSIM is not set +CONFIG_MTD_NAND_PLATFORM=y +# CONFIG_MTD_ALAUDA is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set +# CONFIG_MTD_UBI_DEBUG is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_CRYPTOLOOP=m + +# +# DRBD disabled because PROC_FS, INET or CONNECTOR not selected +# +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_XIP is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_MG_DISK is not set +# CONFIG_BLK_DEV_RBD is not set +# CONFIG_SENSORS_LIS3LV02D is not set +CONFIG_MISC_DEVICES=y +# CONFIG_AD525X_DPOT is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_APDS9802ALS is not set +# CONFIG_ISL29003 is not set +# CONFIG_ISL29020 is not set +# CONFIG_SENSORS_TSL2550 is not set +CONFIG_SENSORS_BH1780=m +# CONFIG_SENSORS_BH1770 is not set +# CONFIG_SENSORS_APDS990X is not set +CONFIG_HMC6352=m +# CONFIG_DS1682 is not set +# CONFIG_TI_DAC7512 is not set +CONFIG_BMP085=m +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +CONFIG_EEPROM_93CX6=y +CONFIG_IWMC3200TOP=m +# CONFIG_IWMC3200TOP_DEBUG is not set +# CONFIG_IWMC3200TOP_DEBUGFS is not set + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +# CONFIG_SENSORS_LIS3_SPI is not set +# CONFIG_SENSORS_LIS3_I2C is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=y +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=y +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +# CONFIG_ATA is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +CONFIG_DM_RAID=m +# CONFIG_DM_LOG_USERSPACE is not set +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +# CONFIG_DM_MULTIPATH_QL is not set +# CONFIG_DM_MULTIPATH_ST is not set +CONFIG_DM_DELAY=m +# CONFIG_DM_UEVENT is not set +CONFIG_DM_FLAKEY=m +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_LOOPBACK_TARGET=m +# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set +CONFIG_NETDEVICES=y +CONFIG_DUMMY=m +CONFIG_BONDING=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_EQUALIZER=m +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_MII=y +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +CONFIG_BCM63XX_PHY=m +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +CONFIG_MICREL_PHY=m +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set +CONFIG_NET_ETHERNET=y +# CONFIG_AX88796 is not set +CONFIG_SMC91X=y +# CONFIG_TI_DAVINCI_EMAC is not set +CONFIG_TI_DAVINCI_MDIO=m +CONFIG_TI_DAVINCI_CPDMA=m +# CONFIG_DM9000 is not set +CONFIG_ENC28J60=y +# CONFIG_ENC28J60_WRITEVERIFY is not set +# CONFIG_ETHOC is not set +CONFIG_SMC911X=y +CONFIG_SMSC911X=y +# CONFIG_SMSC911X_ARCH_HOOKS is not set +# CONFIG_DNET is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_B44 is not set +CONFIG_KS8842=m +CONFIG_KS8851=y +# CONFIG_KS8851_MLL is not set +# CONFIG_FTMAC100 is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set +CONFIG_WLAN=y +# CONFIG_LIBERTAS_THINFIRM is not set +CONFIG_AT76C50X_USB=m +CONFIG_USB_ZD1201=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +# CONFIG_MAC80211_HWSIM is not set +# CONFIG_ATH_COMMON is not set +CONFIG_B43=m +# CONFIG_B43_SDIO is not set +CONFIG_B43_PIO=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +# CONFIG_B43LEGACY is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y +# CONFIG_IWM is not set +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +# CONFIG_LIBERTAS_SDIO is not set +# CONFIG_LIBERTAS_SPI is not set +# CONFIG_LIBERTAS_DEBUG is not set +# CONFIG_LIBERTAS_MESH is not set +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +# CONFIG_P54_SPI is not set +CONFIG_P54_LEDS=y +CONFIG_RT2X00=m +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +# CONFIG_RT2800USB is not set +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +CONFIG_RTL8192C_COMMON=m +CONFIG_WL1251=m +CONFIG_WL1251_SPI=m +CONFIG_WL1251_SDIO=m +CONFIG_WL12XX_MENU=m +CONFIG_WL12XX=m +CONFIG_WL12XX_HT=y +CONFIG_WL12XX_SPI=m +CONFIG_WL12XX_SDIO=m +# CONFIG_WL12XX_SDIO_TEST is not set +CONFIG_WL12XX_PLATFORM_DATA=y +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_SDIO=m +CONFIG_WIMAX_IWMC3200_SDIO=y +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 + +# +# USB Network Adapters +# +CONFIG_USB_CATC=y +CONFIG_USB_KAWETH=y +CONFIG_USB_PEGASUS=y +CONFIG_USB_RTL8150=y +CONFIG_USB_USBNET=y +CONFIG_USB_NET_AX8817X=y +CONFIG_USB_NET_CDCETHER=y +# CONFIG_USB_NET_CDC_EEM is not set +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_DM9601=y +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=y +CONFIG_USB_NET_GL620A=y +CONFIG_USB_NET_NET1080=y +CONFIG_USB_NET_PLUSB=y +CONFIG_USB_NET_MCS7830=y +CONFIG_USB_NET_RNDIS_HOST=y +CONFIG_USB_NET_CDC_SUBSET=y +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=y +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m +# CONFIG_WAN is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +# CONFIG_ATM_TCP is not set + +# +# CAIF transport drivers +# +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +# CONFIG_PPPOATM is not set +CONFIG_PPPOL2TP=m +# CONFIG_SLIP is not set +CONFIG_SLHC=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y +# CONFIG_ISDN is not set +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=y +CONFIG_INPUT_POLLDEV=y +# CONFIG_INPUT_SPARSEKMAP is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set +# CONFIG_KEYBOARD_ATKBD is not set +CONFIG_KEYBOARD_QT1070=m +CONFIG_KEYBOARD_QT2160=m +# CONFIG_KEYBOARD_LKKBD is not set +CONFIG_KEYBOARD_GPIO=y +# CONFIG_KEYBOARD_TCA6416 is not set +# CONFIG_KEYBOARD_MATRIX is not set +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_MAX7359 is not set +CONFIG_KEYBOARD_MCS=m +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_TWL4030 is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_ELANTECH is not set +# CONFIG_MOUSE_PS2_SENTELIC is not set +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_BCM5974 is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_GPIO is not set +# CONFIG_MOUSE_SYNAPTICS_I2C is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ATI_REMOTE is not set +# CONFIG_INPUT_ATI_REMOTE2 is not set +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_POWERMATE is not set +# CONFIG_INPUT_YEALINK is not set +# CONFIG_INPUT_CM109 is not set +CONFIG_INPUT_TWL4030_PWRBUTTON=y +CONFIG_INPUT_TWL4030_VIBRA=m +CONFIG_INPUT_UINPUT=y +CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_PWM_BEEPER=m +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +CONFIG_INPUT_ADXL34X=m +CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_ADXL34X_SPI=m +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_SERIO_ALTERA_PS2 is not set +# CONFIG_SERIO_PS2MULT is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +# CONFIG_LEGACY_PTYS is not set +# CONFIG_SERIAL_NONSTANDARD is not set +CONFIG_N_GSM=m +CONFIG_DEVKMEM=y + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX3107 is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_OMAP=y +CONFIG_SERIAL_OMAP_CONSOLE=y +# CONFIG_SERIAL_TIMBERDALE is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set +CONFIG_SERIAL_IFX6X60=m +CONFIG_TTY_PRINTK=y +# CONFIG_HVC_DCC is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=y +# CONFIG_HW_RANDOM_TIMERIOMEM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +# CONFIG_RAMOOPS is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +CONFIG_I2C_MUX_GPIO=m +# CONFIG_I2C_MUX_PCA9541 is not set +# CONFIG_I2C_MUX_PCA954x is not set +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_ALGOBIT=m + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE is not set +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_OMAP=y +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_PXA_PCI is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_DIOLAN_U2C=m +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_ALTERA is not set +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_GPIO is not set +# CONFIG_SPI_OC_TINY is not set +CONFIG_SPI_OMAP24XX=y +# CONFIG_SPI_PXA2XX_PCI is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +CONFIG_SPI_SPIDEV=y +# CONFIG_SPI_TLE62X0 is not set + +# +# PPS support +# +# CONFIG_PPS is not set + +# +# PPS generators support +# +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_MAX730X=m + +# +# Memory mapped GPIO expanders: +# +# CONFIG_GPIO_BASIC_MMIO is not set +# CONFIG_GPIO_IT8761E is not set + +# +# I2C GPIO expanders: +# +CONFIG_GPIO_MAX7300=m +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_SX150X is not set +CONFIG_GPIO_TWL4030=y +CONFIG_GPIO_ADP5588=m + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_74X164 is not set + +# +# AC97 GPIO expanders: +# + +# +# MODULbus GPIO expanders: +# +# CONFIG_W1 is not set +CONFIG_POWER_SUPPLY=m +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +CONFIG_TEST_POWER=m +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_BQ20Z75 is not set +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set +CONFIG_BATTERY_MAX17042=m +CONFIG_CHARGER_ISP1704=m +CONFIG_CHARGER_TWL4030=m +CONFIG_CHARGER_GPIO=m +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +# CONFIG_SENSORS_AD7414 is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADCXX is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +CONFIG_SENSORS_ADT7411=m +# CONFIG_SENSORS_ADT7462 is not set +# CONFIG_SENSORS_ADT7470 is not set +# CONFIG_SENSORS_ADT7475 is not set +CONFIG_SENSORS_ASC7621=m +# CONFIG_SENSORS_ATXP1 is not set +CONFIG_SENSORS_DS620=m +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_G760A is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +CONFIG_SENSORS_GPIO_FAN=m +# CONFIG_SENSORS_IT87 is not set +CONFIG_SENSORS_JC42=m +# CONFIG_SENSORS_LINEAGE is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM70 is not set +# CONFIG_SENSORS_LM73 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_LM93 is not set +# CONFIG_SENSORS_LTC4151 is not set +# CONFIG_SENSORS_LTC4215 is not set +# CONFIG_SENSORS_LTC4245 is not set +# CONFIG_SENSORS_LTC4261 is not set +# CONFIG_SENSORS_LM95241 is not set +# CONFIG_SENSORS_MAX1111 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX6639 is not set +# CONFIG_SENSORS_MAX6650 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_PMBUS is not set +# CONFIG_SENSORS_SHT15 is not set +# CONFIG_SENSORS_SHT21 is not set +CONFIG_SENSORS_SMM665=m +# CONFIG_SENSORS_DME1737 is not set +CONFIG_SENSORS_EMC1403=m +CONFIG_SENSORS_EMC2103=m +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_SCH5627 is not set +# CONFIG_SENSORS_ADS1015 is not set +# CONFIG_SENSORS_ADS7828 is not set +CONFIG_SENSORS_ADS7871=m +CONFIG_SENSORS_AMC6821=m +# CONFIG_SENSORS_THMC50 is not set +CONFIG_SENSORS_TMP102=m +# CONFIG_SENSORS_TMP401 is not set +# CONFIG_SENSORS_TMP421 is not set +CONFIG_SENSORS_TWL4030_MADC=m +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83795 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83L786NG is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_OMAP_WATCHDOG=y +# CONFIG_TWL4030_WATCHDOG is not set +# CONFIG_MAX63XX_WATCHDOG is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +# CONFIG_SSB_SDIOHOST is not set +# CONFIG_SSB_SILENT is not set +# CONFIG_SSB_DEBUG is not set +CONFIG_MFD_SUPPORT=y +CONFIG_MFD_CORE=y +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_HTC_I2CPLD is not set +CONFIG_TPS6105X=m +# CONFIG_TPS65010 is not set +CONFIG_TPS6507X=m +CONFIG_TWL4030_CORE=y +CONFIG_TWL4030_MADC=m +CONFIG_TWL4030_POWER=y +CONFIG_TWL4030_CODEC=y +CONFIG_TWL4030_POWEROFF=y +CONFIG_TWL6030_PWM=m +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_TC3589X is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_MAX8997 is not set +# CONFIG_MFD_MAX8998 is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X_I2C is not set +# CONFIG_MFD_WM831X_SPI is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_MFD_MC13XXX is not set +# CONFIG_ABX500_CORE is not set +# CONFIG_EZX_PCAP is not set +CONFIG_MFD_TPS6586X=y +CONFIG_MFD_WL1273_CORE=m +CONFIG_MFD_OMAP_USB_HOST=y +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +CONFIG_REGULATOR_DUMMY=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_BQ24022 is not set +# CONFIG_REGULATOR_MAX1586 is not set +# CONFIG_REGULATOR_MAX8649 is not set +# CONFIG_REGULATOR_MAX8660 is not set +# CONFIG_REGULATOR_MAX8952 is not set +CONFIG_REGULATOR_TWL4030=y +# CONFIG_REGULATOR_LP3971 is not set +# CONFIG_REGULATOR_LP3972 is not set +CONFIG_REGULATOR_TPS6105X=m +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set +# CONFIG_REGULATOR_ISL6271A is not set +# CONFIG_REGULATOR_AD5398 is not set +CONFIG_REGULATOR_TPS6586X=m +CONFIG_REGULATOR_TPS6524X=m +CONFIG_MEDIA_SUPPORT=y + +# +# Multimedia core support +# +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_COMMON=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_DVB_CORE=m +CONFIG_VIDEO_MEDIA=m + +# +# Multimedia drivers +# +CONFIG_RC_CORE=m +CONFIG_LIRC=m +CONFIG_RC_MAP=m +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_RC5_SZ_DECODER=m +CONFIG_IR_LIRC_CODEC=m +# CONFIG_IR_IMON is not set +# CONFIG_IR_MCEUSB is not set +# CONFIG_IR_STREAMZAP is not set +CONFIG_RC_LOOPBACK=m +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_CUSTOMISE=y + +# +# Customize TV tuners +# +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEOBUF_GEN=y +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DMA_CONTIG=y +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set +CONFIG_VIDEO_IR_I2C=m + +# +# Encoders/decoders and other helper chips +# + +# +# Audio decoders +# +# CONFIG_VIDEO_TVAUDIO is not set +# CONFIG_VIDEO_TDA7432 is not set +# CONFIG_VIDEO_TDA9840 is not set +# CONFIG_VIDEO_TEA6415C is not set +# CONFIG_VIDEO_TEA6420 is not set +CONFIG_VIDEO_MSP3400=m +# CONFIG_VIDEO_CS5345 is not set +CONFIG_VIDEO_CS53L32A=m +# CONFIG_VIDEO_M52790 is not set +# CONFIG_VIDEO_TLV320AIC23B is not set +CONFIG_VIDEO_WM8775=m +# CONFIG_VIDEO_WM8739 is not set +# CONFIG_VIDEO_VP27SMPX is not set + +# +# RDS decoders +# +# CONFIG_VIDEO_SAA6588 is not set + +# +# Video decoders +# +CONFIG_VIDEO_ADV7180=m +# CONFIG_VIDEO_BT819 is not set +# CONFIG_VIDEO_BT856 is not set +# CONFIG_VIDEO_BT866 is not set +# CONFIG_VIDEO_KS0127 is not set +# CONFIG_VIDEO_OV7670 is not set +CONFIG_VIDEO_MT9V011=m +# CONFIG_VIDEO_TCM825X is not set +# CONFIG_VIDEO_SAA7110 is not set +CONFIG_VIDEO_SAA711X=m +# CONFIG_VIDEO_SAA717X is not set +# CONFIG_VIDEO_SAA7191 is not set +# CONFIG_VIDEO_TVP514X is not set +# CONFIG_VIDEO_TVP5150 is not set +# CONFIG_VIDEO_TVP7002 is not set +# CONFIG_VIDEO_VPX3220 is not set + +# +# Video and audio decoders +# +CONFIG_VIDEO_CX25840=m + +# +# MPEG video encoders +# +CONFIG_VIDEO_CX2341X=m + +# +# Video encoders +# +# CONFIG_VIDEO_SAA7127 is not set +# CONFIG_VIDEO_SAA7185 is not set +# CONFIG_VIDEO_ADV7170 is not set +# CONFIG_VIDEO_ADV7175 is not set +# CONFIG_VIDEO_THS7303 is not set +# CONFIG_VIDEO_ADV7343 is not set +# CONFIG_VIDEO_AK881X is not set + +# +# Video improvement chips +# +# CONFIG_VIDEO_UPD64031A is not set +# CONFIG_VIDEO_UPD64083 is not set +CONFIG_VIDEO_VIVI=m +CONFIG_VIDEO_VPFE_CAPTURE=y +# CONFIG_VIDEO_DM6446_CCDC is not set +CONFIG_VIDEO_OMAP2_VOUT=y +# CONFIG_VIDEO_CPIA2 is not set +CONFIG_VIDEO_TIMBERDALE=m +# CONFIG_VIDEO_AU0828 is not set +CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_NOON010PC30=m +CONFIG_VIDEO_OMAP3=y +# CONFIG_VIDEO_OMAP3_DEBUG is not set +# CONFIG_SOC_CAMERA is not set +CONFIG_V4L_USB_DRIVERS=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +# CONFIG_USB_GL860 is not set +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +# CONFIG_USB_GSPCA_JEILINJ is not set +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +# CONFIG_USB_GSPCA_MR97310A is not set +CONFIG_USB_GSPCA_NW80X=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +# CONFIG_USB_GSPCA_PAC7302 is not set +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SN9C2028=m +# CONFIG_USB_GSPCA_SN9C20X is not set +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m +# CONFIG_USB_GSPCA_SQ905 is not set +# CONFIG_USB_GSPCA_SQ905C is not set +CONFIG_USB_GSPCA_SQ930X=m +CONFIG_USB_GSPCA_STK014=m +# CONFIG_USB_GSPCA_STV0680 is not set +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +# CONFIG_VIDEO_CX231XX_ALSA is not set +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_USBVISION=m +CONFIG_USB_ET61X251=m +CONFIG_USB_SN9C102=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_TESTDEV=m +CONFIG_RADIO_ADAPTERS=y +# CONFIG_I2C_SI4713 is not set +# CONFIG_RADIO_SI4713 is not set +# CONFIG_USB_DSBR is not set +# CONFIG_RADIO_SI470X is not set +# CONFIG_USB_MR800 is not set +# CONFIG_RADIO_TEA5764 is not set +CONFIG_RADIO_SAA7706H=m +# CONFIG_RADIO_TEF6862 is not set +CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m +CONFIG_DVB_MAX_ADAPTERS=8 +CONFIG_DVB_DYNAMIC_MINORS=y +CONFIG_DVB_CAPTURE_DRIVERS=y +# CONFIG_TTPCI_EEPROM is not set + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AF9015=m +# CONFIG_DVB_USB_CE6230 is not set +# CONFIG_DVB_USB_FRIIO is not set +# CONFIG_DVB_USB_EC168 is not set +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +# CONFIG_SMS_SIANO_MDTV is not set + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_DS3000=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_CX22702=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_LNBP21=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_IX2505V=m + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set + +# +# Graphics support +# +CONFIG_DRM=m +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=m +# CONFIG_FB_WMT_GE_ROPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_TMIO is not set +CONFIG_FB_UDL=m +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set +CONFIG_OMAP2_VRAM=y +CONFIG_OMAP2_VRFB=y +CONFIG_OMAP2_DSS=y +CONFIG_OMAP2_VRAM_SIZE=14 +CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y +# CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set +CONFIG_OMAP2_DSS_DPI=y +# CONFIG_OMAP2_DSS_RFBI is not set +CONFIG_OMAP2_DSS_VENC=y +# CONFIG_OMAP2_DSS_SDI is not set +CONFIG_OMAP2_DSS_DSI=y +CONFIG_OMAP2_DSS_USE_DSI_PLL=y +# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set +CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 +CONFIG_FB_OMAP2=y +CONFIG_FB_OMAP2_DEBUG_SUPPORT=y +CONFIG_FB_OMAP2_NUM_FBS=2 + +# +# OMAP2/3 Display Device Drivers +# +CONFIG_PANEL_GENERIC_DPI=y +# CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set +CONFIG_PANEL_SHARP_LS037V7DW01=y +CONFIG_PANEL_NEC_NL8048HL11_01B=y +# CONFIG_PANEL_TAAL is not set +CONFIG_PANEL_TPO_TD043MTEA1=m +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y + +# +# Display device support +# +CONFIG_DISPLAY_SUPPORT=y + +# +# Display hardware drivers +# + +# +# Console display driver support +# +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y +CONFIG_SOUND=y +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=y +CONFIG_SND_RAWMIDI=y +CONFIG_SND_JACK=y +CONFIG_SND_SEQUENCER=m +# CONFIG_SND_SEQ_DUMMY 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_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_RAWMIDI_SEQ=m +# CONFIG_SND_OPL3_LIB_SEQ is not set +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +# CONFIG_SND_EMU10K1_SEQ is not set +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +CONFIG_SND_ALOOP=m +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +# CONFIG_SND_ARM is not set +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=y +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_SOC=y +CONFIG_SND_SOC_CACHE_LZO=y +CONFIG_SND_OMAP_SOC=y +CONFIG_SND_OMAP_SOC_MCBSP=y +CONFIG_SND_OMAP_SOC_OVERO=y +CONFIG_SND_OMAP_SOC_OMAP3EVM=y +CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y +CONFIG_SND_OMAP_SOC_ZOOM2=y +CONFIG_SND_SOC_I2C_AND_SPI=y +# CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_TWL4030=y +# CONFIG_SOUND_PRIME is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set + +# +# Special HID drivers +# +# CONFIG_HID_3M_PCT is not set +CONFIG_HID_A4TECH=y +CONFIG_HID_ACRUX=m +# CONFIG_HID_ACRUX_FF is not set +CONFIG_HID_APPLE=y +CONFIG_HID_BELKIN=y +# CONFIG_HID_CANDO is not set +CONFIG_HID_CHERRY=y +CONFIG_HID_CHICONY=y +# CONFIG_HID_PRODIKEYS is not set +CONFIG_HID_CYPRESS=y +# CONFIG_HID_DRAGONRISE is not set +CONFIG_HID_EMS_FF=m +# CONFIG_HID_ELECOM is not set +CONFIG_HID_EZKEY=y +CONFIG_HID_KEYTOUCH=m +# CONFIG_HID_KYE is not set +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=y +# CONFIG_HID_TWINHAN is not set +# CONFIG_HID_KENSINGTON is not set +CONFIG_HID_LCPOWER=m +CONFIG_HID_LOGITECH=y +# CONFIG_LOGITECH_FF is not set +# CONFIG_LOGIRUMBLEPAD2_FF is not set +# CONFIG_LOGIG940_FF is not set +# CONFIG_LOGIWII_FF is not set +CONFIG_HID_MAGICMOUSE=m +CONFIG_HID_MICROSOFT=y +# CONFIG_HID_MOSART is not set +CONFIG_HID_MONTEREY=y +CONFIG_HID_MULTITOUCH=m +CONFIG_HID_NTRIG=y +# CONFIG_HID_ORTEK is not set +CONFIG_HID_PANTHERLORD=y +# CONFIG_PANTHERLORD_FF is not set +CONFIG_HID_PETALYNX=y +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_QUANTA=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_ROCCAT_COMMON=m +CONFIG_HID_ROCCAT_ARVO=m +CONFIG_HID_ROCCAT_KONE=m +CONFIG_HID_ROCCAT_KONEPLUS=m +CONFIG_HID_ROCCAT_KOVAPLUS=m +# CONFIG_HID_ROCCAT_PYRA is not set +CONFIG_HID_SAMSUNG=y +CONFIG_HID_SONY=y +CONFIG_HID_STANTUM=m +CONFIG_HID_SUNPLUS=y +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +CONFIG_HID_TOPSEED=y +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_WACOM is not set +# CONFIG_HID_ZEROPLUS is not set +# CONFIG_HID_ZYDACRON is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +CONFIG_USB_SUSPEND=y +CONFIG_USB_OTG=y +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_MON=y +# CONFIG_USB_WUSB is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +CONFIG_USB_EHCI_HCD=y +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_EHCI_HCD_OMAP=y +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_ISP1362_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +# CONFIG_USB_U132_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_HWA_HCD is not set +CONFIG_USB_MUSB_HDRC=y +# CONFIG_USB_MUSB_TUSB6010 is not set +CONFIG_USB_MUSB_OMAP2PLUS=y +# CONFIG_USB_MUSB_AM35X is not set +# CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MUSB_PERIPHERAL is not set +CONFIG_USB_MUSB_OTG=y +CONFIG_USB_GADGET_MUSB_HDRC=y +CONFIG_USB_MUSB_HDRC_HCD=y +# CONFIG_MUSB_PIO_ONLY is not set +CONFIG_USB_INVENTRA_DMA=y +# CONFIG_USB_TI_CPPI_DMA is not set +# CONFIG_USB_MUSB_DEBUG is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set +CONFIG_USB_STORAGE_ENE_UB6250=m +CONFIG_USB_UAS=m +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +CONFIG_USB_SERIAL=m +CONFIG_USB_EZUSB=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=n +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +# CONFIG_USB_SERIAL_CP210X is not set +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +# CONFIG_USB_SERIAL_QUALCOMM is not set +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SAMBA=m +CONFIG_USB_SERIAL_SIEMENS_MPI=m +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +# CONFIG_USB_SERIAL_SYMBOL is not set +CONFIG_USB_SERIAL_TI=n +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=n +# CONFIG_USB_SERIAL_OPTION is not set +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_DEBUG=m + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +# CONFIG_USB_APPLEDISPLAY is not set +CONFIG_USB_SISUSBVGA=m +CONFIG_USB_SISUSBVGA_CON=y +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +# CONFIG_USB_IOWARRIOR is not set +CONFIG_USB_TEST=m +# CONFIG_USB_ISIGHTFW is not set +CONFIG_USB_YUREX=m +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_DEBUG_FS=y +CONFIG_USB_GADGET_VBUS_DRAW=480 +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_FUSB300 is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_R8A66597 is not set +# CONFIG_USB_GADGET_PXA_U2O is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +# CONFIG_USB_ZERO is not set +# CONFIG_USB_AUDIO is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_ETH_EEM is not set +CONFIG_USB_G_NCM=m +# CONFIG_USB_GADGETFS is not set +CONFIG_USB_FUNCTIONFS=m +# CONFIG_USB_FUNCTIONFS_ETH is not set +CONFIG_USB_FUNCTIONFS_RNDIS=y +# CONFIG_USB_FUNCTIONFS_GENERIC is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_MASS_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +# CONFIG_USB_CDC_COMPOSITE is not set +# CONFIG_USB_G_MULTI is not set +CONFIG_USB_G_HID=m +CONFIG_USB_G_DBGP=m +# CONFIG_USB_G_DBGP_PRINTK is not set +CONFIG_USB_G_DBGP_SERIAL=y +CONFIG_USB_G_WEBCAM=m + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +CONFIG_USB_GPIO_VBUS=y +# CONFIG_ISP1301_OMAP is not set +# CONFIG_USB_ULPI is not set +CONFIG_TWL4030_USB=y +CONFIG_TWL6030_USB=m +CONFIG_NOP_USB_XCEIV=y +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_UNSAFE_RESUME=y +# CONFIG_MMC_CLKGATE is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=y +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +# CONFIG_MMC_OMAP is not set +CONFIG_MMC_OMAP_HS=y +CONFIG_MMC_SPI=m +# CONFIG_MMC_DW is not set +CONFIG_MMC_USHC=m +# CONFIG_MEMSTICK is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +# CONFIG_LEDS_LM3530 is not set +# CONFIG_LEDS_PCA9532 is not set +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_GPIO_PLATFORM=y +# CONFIG_LEDS_LP3944 is not set +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m +# CONFIG_LEDS_PCA955X is not set +# CONFIG_LEDS_DAC124S085 is not set +CONFIG_LEDS_PWM=m +CONFIG_LEDS_REGULATOR=m +# CONFIG_LEDS_BD2802 is not set +# CONFIG_LEDS_LT3593 is not set +CONFIG_LEDS_TRIGGERS=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_NFC_DEVICES=y +CONFIG_PN544_NFC=m +# CONFIG_ACCESSIBILITY is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_DS1307=y +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_DS3232 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_ISL12022 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_TWL4030=m +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set +# CONFIG_RTC_DRV_PCF2123 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_MSM6242 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_RP5C01 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +# CONFIG_DMADEVICES is not set +CONFIG_TIMB_DMA=m +CONFIG_DMA_ENGINE=y +# CONFIG_AUXDISPLAY is not set +CONFIG_UIO=m +CONFIG_UIO_PDRV=m +CONFIG_UIO_PDRV_GENIRQ=m +CONFIG_STAGING=y +# CONFIG_STAGING_EXCLUDE_BUILD is not set +# CONFIG_VIDEO_TM6000 is not set +# CONFIG_USB_IP_COMMON is not set +CONFIG_W35UND=m +CONFIG_PRISM2_USB=m +CONFIG_ECHO=m +CONFIG_BRCM80211=m +CONFIG_BRCMFMAC=y +# CONFIG_BRCMDBG is not set +CONFIG_RT2870=m +# CONFIG_COMEDI is not set +# CONFIG_ASUS_OLED is not set +CONFIG_R8712U=m +CONFIG_R8712_AP=y +# CONFIG_TRANZPORT is not set +# CONFIG_POHMELFS is not set +# CONFIG_LINE6_USB is not set +# CONFIG_USB_SERIAL_QUATECH2 is not set +# CONFIG_USB_SERIAL_QUATECH_USB2 is not set +# CONFIG_VT6656 is not set +# CONFIG_IIO is not set +CONFIG_XVMALLOC=y +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +# CONFIG_FB_SM7XX is not set +# CONFIG_LIRC_STAGING is not set +# CONFIG_EASYCAP is not set +# CONFIG_TIDSPBRIDGE is not set +# CONFIG_MACH_OMAP3_WESTBRIDGE_AST_PNAND_HAL is not set +CONFIG_MACH_NO_WESTBRIDGE=y +# CONFIG_ATH6K_LEGACY is not set +CONFIG_USB_ENESTORAGE=m +CONFIG_BCM_WIMAX=m +CONFIG_FT1000=m +CONFIG_FT1000_USB=m + +# +# Speakup console speech +# +# CONFIG_SPEAKUP is not set +CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m +CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m + +# +# Altera FPGA firmware download module +# +# CONFIG_ALTERA_STAPL is not set +CONFIG_CLKDEV_LOOKUP=y + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_XATTR=y +# CONFIG_EXT4_FS_POSIX_ACL is not set +# CONFIG_EXT4_FS_SECURITY is not set +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +# CONFIG_REISERFS_FS_POSIX_ACL is not set +# CONFIG_REISERFS_FS_SECURITY is not set +CONFIG_JFS_FS=m +# CONFIG_JFS_POSIX_ACL is not set +# CONFIG_JFS_SECURITY is not set +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set +CONFIG_XFS_FS=m +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +# CONFIG_GFS2_FS_LOCKING_DLM is not set +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +CONFIG_OCFS2_DEBUG_MASKLOG=y +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +# CONFIG_BTRFS_FS_POSIX_ACL is not set +# CONFIG_NILFS2_FS is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +CONFIG_QUOTA=y +# CONFIG_QUOTA_NETLINK_INTERFACE is not set +CONFIG_PRINT_QUOTA_WARNING=y +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=y +# CONFIG_QFMT_V1 is not set +CONFIG_QFMT_V2=y +CONFIG_QUOTACTL=y +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m +# CONFIG_CUSE is not set +CONFIG_GENERIC_ACL=y + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_CONFIGFS_FS=m +CONFIG_MISC_FILESYSTEMS=y +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +CONFIG_AFFS_FS=m +# CONFIG_ECRYPT_FS is not set +CONFIG_UNION_FS=m +CONFIG_UNION_FS_XATTR=y +# CONFIG_UNION_FS_DEBUG is not set +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_FS_XATTR=y +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +# CONFIG_JFFS2_CMODE_PRIORITY is not set +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_JFFS2_CMODE_FAVOURLZO=y +CONFIG_UBIFS_FS=y +CONFIG_UBIFS_FS_XATTR=y +CONFIG_UBIFS_FS_ADVANCED_COMPR=y +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set +CONFIG_LOGFS=m +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=y +# CONFIG_SQUASHFS_XATTR is not set +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +CONFIG_VXFS_FS=m +CONFIG_MINIX_FS=m +CONFIG_OMFS_FS=m +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +CONFIG_ROMFS_FS=m +CONFIG_ROMFS_BACKED_BY_BLOCK=y +# CONFIG_ROMFS_BACKED_BY_MTD is not set +# CONFIG_ROMFS_BACKED_BY_BOTH is not set +CONFIG_ROMFS_ON_BLOCK=y +CONFIG_PSTORE=y +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set +CONFIG_ROOT_NFS=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +# CONFIG_NFS_USE_NEW_IDMAPPER is not set +CONFIG_NFSD=m +CONFIG_NFSD_DEPRECATED=y +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_CEPH_FS=m +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +CONFIG_CIFS_STATS2=y +# CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_UPCALL is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_DFS_UPCALL is not set +CONFIG_CIFS_EXPERIMENTAL=y +CONFIG_NCP_FS=m +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +# CONFIG_NCPFS_NFS_NS is not set +# CONFIG_NCPFS_OS2_NS is not set +# CONFIG_NCPFS_SMALLDOS is not set +# CONFIG_NCPFS_NLS is not set +# CONFIG_NCPFS_EXTRAS is not set +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_9P_FS=m +# CONFIG_9P_FS_POSIX_ACL is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_UNIXWARE_DISKLABEL is not set +CONFIG_LDM_PARTITION=y +CONFIG_LDM_DEBUG=y +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=y +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set + +# +# Kernel hacking +# +CONFIG_PRINTK_TIME=y +CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +CONFIG_MAGIC_SYSRQ=y +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_LOCKUP_DETECTOR is not set +# CONFIG_HARDLOCKUP_DETECTOR is not set +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y +CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_KMEMLEAK is not set +CONFIG_DEBUG_PREEMPT=y +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_LKDTM is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_SYSCTL_SYSCALL_CHECK is not set +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_RING_BUFFER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +# CONFIG_FUNCTION_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_PREEMPT_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_ENABLE_DEFAULT_TRACERS is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +# CONFIG_STACK_TRACER is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_RING_BUFFER_BENCHMARK is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_ATOMIC64_SELFTEST is not set +# CONFIG_ASYNC_RAID6_TEST is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +# CONFIG_TEST_KSTRTOX is not set +# CONFIG_STRICT_DEVMEM is not set +CONFIG_ARM_UNWIND=y +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_LL is not set +# CONFIG_OC_ETM is not set + +# +# Security options +# +CONFIG_KEYS=y +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set +# CONFIG_SECURITY_DMESG_RESTRICT is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=y +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=y +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=y +# CONFIG_CRYPTO_ZLIB is not set +CONFIG_CRYPTO_LZO=y + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_OMAP_SHAM=m +CONFIG_CRYPTO_DEV_OMAP_AES=m +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +CONFIG_CRC_CCITT=y +CONFIG_CRC16=y +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=y +CONFIG_CRC32=y +CONFIG_CRC7=y +CONFIG_LIBCRC32C=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_XZ_DEC_BCJ=y +CONFIG_XZ_DEC_TEST=m +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y +CONFIG_AVERAGE=y diff --git a/recipes/linux/linux-omap-2.6.39/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.39/beagleboard/defconfig index 9e81a05708..e2502650e0 100644 --- a/recipes/linux/linux-omap-2.6.39/beagleboard/defconfig +++ b/recipes/linux/linux-omap-2.6.39/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/arm 2.6.39 Kernel Configuration -# Fri May 20 13:11:13 2011 +# Wed May 25 09:25:56 2011 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -49,7 +49,8 @@ CONFIG_KERNEL_GZIP=y CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y -# CONFIG_POSIX_MQUEUE is not set +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_FHANDLE=y @@ -71,13 +72,9 @@ CONFIG_GENERIC_IRQ_SHOW=y # # RCU Subsystem # -CONFIG_TREE_PREEMPT_RCU=y -# CONFIG_TINY_RCU is not set -# CONFIG_TINY_PREEMPT_RCU is not set -CONFIG_PREEMPT_RCU=y +CONFIG_TINY_RCU=y +# CONFIG_PREEMPT_RCU is not set # CONFIG_RCU_TRACE is not set -CONFIG_RCU_FANOUT=32 -# CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_TREE_RCU_TRACE is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y @@ -98,8 +95,14 @@ CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y -# CONFIG_BLK_CGROUP is not set -# CONFIG_NAMESPACES is not set +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_USER_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set @@ -107,8 +110,8 @@ CONFIG_MM_OWNER=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_RD_GZIP=y -# CONFIG_RD_BZIP2 is not set -# CONFIG_RD_LZMA is not set +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y CONFIG_RD_XZ=y CONFIG_RD_LZO=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -175,7 +178,8 @@ CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_BLOCK=y CONFIG_LBDAF=y CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_INTEGRITY=y +CONFIG_BLK_DEV_THROTTLING=y # # IO Schedulers @@ -183,6 +187,7 @@ CONFIG_BLK_DEV_BSG=y CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set @@ -193,27 +198,27 @@ CONFIG_DEFAULT_IOSCHED="cfq" # CONFIG_INLINE_SPIN_LOCK_BH is not set # CONFIG_INLINE_SPIN_LOCK_IRQ is not set # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -# CONFIG_INLINE_SPIN_UNLOCK is not set +CONFIG_INLINE_SPIN_UNLOCK=y # CONFIG_INLINE_SPIN_UNLOCK_BH is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set # CONFIG_INLINE_READ_TRYLOCK is not set # CONFIG_INLINE_READ_LOCK is not set # CONFIG_INLINE_READ_LOCK_BH is not set # CONFIG_INLINE_READ_LOCK_IRQ is not set # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -# CONFIG_INLINE_READ_UNLOCK is not set +CONFIG_INLINE_READ_UNLOCK=y # CONFIG_INLINE_READ_UNLOCK_BH is not set -# CONFIG_INLINE_READ_UNLOCK_IRQ is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set # CONFIG_INLINE_WRITE_TRYLOCK is not set # CONFIG_INLINE_WRITE_LOCK is not set # CONFIG_INLINE_WRITE_LOCK_BH is not set # CONFIG_INLINE_WRITE_LOCK_IRQ is not set # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -# CONFIG_INLINE_WRITE_UNLOCK is not set +CONFIG_INLINE_WRITE_UNLOCK=y # CONFIG_INLINE_WRITE_UNLOCK_BH is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set # CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_FREEZER=y @@ -404,8 +409,8 @@ CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 # CONFIG_PREEMPT_NONE is not set -# CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PREEMPT=y +CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT is not set CONFIG_HZ=128 # CONFIG_THUMB2_KERNEL is not set CONFIG_AEABI=y @@ -448,21 +453,22 @@ CONFIG_CMDLINE=" debug " CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y # CONFIG_CRASH_DUMP is not set -# CONFIG_AUTO_ZRELADDR is not set +CONFIG_AUTO_ZRELADDR=y # # CPU Power Management # CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y -CONFIG_CPU_FREQ_DEBUG=y +# CONFIG_CPU_FREQ_DEBUG is not set CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_STAT_DETAILS=y # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_HOTPLUG is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y @@ -972,7 +978,7 @@ CONFIG_KS959_DONGLE=m CONFIG_USB_IRDA=m CONFIG_SIGMATEL_FIR=m CONFIG_MCS_FIR=m -CONFIG_BT=m +CONFIG_BT=y CONFIG_BT_L2CAP=y CONFIG_BT_SCO=y CONFIG_BT_RFCOMM=m @@ -985,9 +991,9 @@ CONFIG_BT_HIDP=m # # Bluetooth device drivers # -CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTUSB=y CONFIG_BT_HCIBTSDIO=m -CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART=y CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y @@ -996,7 +1002,8 @@ CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBPA10X=m CONFIG_BT_HCIBFUSB=m # CONFIG_BT_HCIVHCI is not set -# CONFIG_BT_MRVL is not set +CONFIG_BT_MRVL=m +# CONFIG_BT_MRVL_SDIO is not set CONFIG_BT_ATH3K=m CONFIG_BT_WILINK=m CONFIG_AF_RXRPC=m @@ -1035,7 +1042,7 @@ CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_WIMAX=m CONFIG_WIMAX_DEBUG_LEVEL=8 -CONFIG_RFKILL=m +CONFIG_RFKILL=y CONFIG_RFKILL_LEDS=y CONFIG_RFKILL_INPUT=y CONFIG_NET_9P=m @@ -2033,16 +2040,17 @@ CONFIG_VIDEO_ADV7180=m # CONFIG_VIDEO_BT856 is not set # CONFIG_VIDEO_BT866 is not set # CONFIG_VIDEO_KS0127 is not set -# CONFIG_VIDEO_OV7670 is not set +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_MT9P031=m CONFIG_VIDEO_MT9V011=m # CONFIG_VIDEO_TCM825X is not set # CONFIG_VIDEO_SAA7110 is not set CONFIG_VIDEO_SAA711X=m # CONFIG_VIDEO_SAA717X is not set # CONFIG_VIDEO_SAA7191 is not set -# CONFIG_VIDEO_TVP514X is not set -# CONFIG_VIDEO_TVP5150 is not set -# CONFIG_VIDEO_TVP7002 is not set +CONFIG_VIDEO_TVP514X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TVP7002=m # CONFIG_VIDEO_VPX3220 is not set # @@ -2072,8 +2080,9 @@ CONFIG_VIDEO_CX2341X=m # CONFIG_VIDEO_UPD64031A is not set # CONFIG_VIDEO_UPD64083 is not set CONFIG_VIDEO_VIVI=m +CONFIG_VIDEO_VPSS_SYSTEM=m CONFIG_VIDEO_VPFE_CAPTURE=y -# CONFIG_VIDEO_DM6446_CCDC is not set +CONFIG_VIDEO_DM6446_CCDC=m CONFIG_VIDEO_OMAP2_VOUT=y # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_TIMBERDALE=m @@ -2633,7 +2642,7 @@ CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_ARK3116=m CONFIG_USB_SERIAL_BELKIN=m CONFIG_USB_SERIAL_CH341=m -CONFIG_USB_SERIAL_WHITEHEAT=m +# CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m # CONFIG_USB_SERIAL_CP210X is not set CONFIG_USB_SERIAL_CYPRESS_M8=m @@ -2681,9 +2690,9 @@ CONFIG_USB_SERIAL_SAMBA=m CONFIG_USB_SERIAL_SIEMENS_MPI=m CONFIG_USB_SERIAL_SIERRAWIRELESS=m # CONFIG_USB_SERIAL_SYMBOL is not set -CONFIG_USB_SERIAL_TI=m +# CONFIG_USB_SERIAL_TI is not set CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m +# CONFIG_USB_SERIAL_XIRCOM is not set # CONFIG_USB_SERIAL_OPTION is not set CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m @@ -2958,15 +2967,19 @@ CONFIG_CLKDEV_LOOKUP=y # File systems # CONFIG_EXT2_FS=y -# CONFIG_EXT2_FS_XATTR is not set +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y # CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -# CONFIG_EXT3_FS_XATTR is not set +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +# CONFIG_EXT3_FS_SECURITY is not set CONFIG_EXT4_FS=y CONFIG_EXT4_FS_XATTR=y -# CONFIG_EXT4_FS_POSIX_ACL is not set -# CONFIG_EXT4_FS_SECURITY is not set +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_DEBUG is not set CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set @@ -2980,17 +2993,17 @@ CONFIG_REISERFS_FS_XATTR=y # CONFIG_REISERFS_FS_POSIX_ACL is not set # CONFIG_REISERFS_FS_SECURITY is not set CONFIG_JFS_FS=m -# CONFIG_JFS_POSIX_ACL is not set +CONFIG_JFS_POSIX_ACL=y # CONFIG_JFS_SECURITY is not set # CONFIG_JFS_DEBUG is not set -# CONFIG_JFS_STATISTICS is not set +CONFIG_JFS_STATISTICS=y CONFIG_XFS_FS=m -# CONFIG_XFS_QUOTA is not set -# CONFIG_XFS_POSIX_ACL is not set -# CONFIG_XFS_RT is not set +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y # CONFIG_XFS_DEBUG is not set CONFIG_GFS2_FS=m -# CONFIG_GFS2_FS_LOCKING_DLM is not set +CONFIG_GFS2_FS_LOCKING_DLM=y CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS_O2CB=m CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m @@ -2998,8 +3011,8 @@ CONFIG_OCFS2_FS_STATS=y CONFIG_OCFS2_DEBUG_MASKLOG=y # CONFIG_OCFS2_DEBUG_FS is not set CONFIG_BTRFS_FS=m -# CONFIG_BTRFS_FS_POSIX_ACL is not set -# CONFIG_NILFS2_FS is not set +CONFIG_BTRFS_FS_POSIX_ACL=y +CONFIG_NILFS2_FS=m CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y @@ -3015,15 +3028,22 @@ CONFIG_QUOTA_TREE=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y CONFIG_QUOTACTL=y -CONFIG_AUTOFS4_FS=m +CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=m -# CONFIG_CUSE is not set +CONFIG_CUSE=m CONFIG_GENERIC_ACL=y # # Caches # -# CONFIG_FSCACHE is not set +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +CONFIG_FSCACHE_HISTOGRAM=y +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +CONFIG_CACHEFILES_HISTOGRAM=y # # CD-ROM/DVD Filesystems @@ -3044,7 +3064,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" CONFIG_NTFS_FS=m # CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y +# CONFIG_NTFS_RW is not set # # Pseudo filesystems @@ -3120,9 +3140,10 @@ CONFIG_UFS_FS=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y CONFIG_NFS_V3=y -# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y -# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_V4_1=y +CONFIG_PNFS_FILE_LAYOUT=y CONFIG_ROOT_NFS=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y @@ -3135,7 +3156,7 @@ CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y -CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_ACL_SUPPORT=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y @@ -3146,9 +3167,12 @@ CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_UPCALL is not set -# CONFIG_CIFS_XATTR is not set +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y # CONFIG_CIFS_DEBUG2 is not set -# CONFIG_CIFS_DFS_UPCALL is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_FSCACHE=y +CONFIG_CIFS_ACL=y CONFIG_CIFS_EXPERIMENTAL=y CONFIG_NCP_FS=m # CONFIG_NCPFS_PACKET_SIGNING is not set @@ -3162,8 +3186,10 @@ CONFIG_NCP_FS=m CONFIG_CODA_FS=m CONFIG_AFS_FS=m # CONFIG_AFS_DEBUG is not set +# CONFIG_AFS_FSCACHE is not set CONFIG_9P_FS=m -# CONFIG_9P_FS_POSIX_ACL is not set +CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y # # Partition Types @@ -3257,7 +3283,6 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_KMEMLEAK is not set -CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -3281,7 +3306,6 @@ CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_CREDENTIALS is not set # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set @@ -3301,7 +3325,6 @@ CONFIG_TRACING_SUPPORT=y CONFIG_FTRACE=y # CONFIG_FUNCTION_TRACER is not set # CONFIG_IRQSOFF_TRACER is not set -# CONFIG_PREEMPT_TRACER is not set # CONFIG_SCHED_TRACER is not set # CONFIG_ENABLE_DEFAULT_TRACERS is not set CONFIG_BRANCH_PROFILE_NONE=y @@ -3476,6 +3499,8 @@ CONFIG_XZ_DEC_SPARC=y CONFIG_XZ_DEC_BCJ=y CONFIG_XZ_DEC_TEST=m CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y CONFIG_DECOMPRESS_XZ=y CONFIG_DECOMPRESS_LZO=y CONFIG_TEXTSEARCH=y diff --git a/recipes/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-support.patch b/recipes/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-support.patch new file mode 100644 index 0000000000..2d7ee7ae89 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-support.patch @@ -0,0 +1,917 @@ +From 69f7b0ee14f046e469d616611ee87836e04219b4 Mon Sep 17 00:00:00 2001 +From: Javier Martin +Date: Tue, 24 May 2011 16:30:43 +0200 +Subject: [PATCH] Add mt9p031 sensor support. + +This RFC includes a power management implementation that causes +the sensor to show images with horizontal artifacts (usually +monochrome lines that appear on the image randomly). + +Signed-off-by: Javier Martin +Signed-off-by: Koen Kooi +--- + drivers/media/video/Kconfig | 7 + + drivers/media/video/Makefile | 1 + + drivers/media/video/mt9p031.c | 841 +++++++++++++++++++++++++++++++++++++++++ + include/media/mt9p031.h | 11 + + 4 files changed, 860 insertions(+), 0 deletions(-) + create mode 100644 drivers/media/video/mt9p031.c + create mode 100644 include/media/mt9p031.h + +diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig +index 00f51dd..8a596cc 100644 +--- a/drivers/media/video/Kconfig ++++ b/drivers/media/video/Kconfig +@@ -329,6 +329,13 @@ config VIDEO_OV7670 + OV7670 VGA camera. It currently only works with the M88ALP01 + controller. + ++config VIDEO_MT9P031 ++ tristate "Aptina MT9P031 support" ++ depends on I2C && VIDEO_V4L2 ++ ---help--- ++ This is a Video4Linux2 sensor-level driver for the Aptina ++ (Micron) mt9p031 5 Mpixel camera. ++ + config VIDEO_MT9V011 + tristate "Micron mt9v011 sensor support" + depends on I2C && VIDEO_V4L2 +diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile +index ace5d8b..912b29b 100644 +--- a/drivers/media/video/Makefile ++++ b/drivers/media/video/Makefile +@@ -65,6 +65,7 @@ obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o + obj-$(CONFIG_VIDEO_OV7670) += ov7670.o + obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o + obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o ++obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o + obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o + obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o + obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o +diff --git a/drivers/media/video/mt9p031.c b/drivers/media/video/mt9p031.c +new file mode 100644 +index 0000000..04d8812 +--- /dev/null ++++ b/drivers/media/video/mt9p031.c +@@ -0,0 +1,841 @@ ++/* ++ * Driver for MT9P031 CMOS Image Sensor from Aptina ++ * ++ * Copyright (C) 2011, Javier Martin ++ * ++ * Copyright (C) 2011, Guennadi Liakhovetski ++ * ++ * Based on the MT9V032 driver and Bastian Hecht's code. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++#define MT9P031_PIXCLK_FREQ 54000000 ++ ++/* mt9p031 selected register addresses */ ++#define MT9P031_CHIP_VERSION 0x00 ++#define MT9P031_CHIP_VERSION_VALUE 0x1801 ++#define MT9P031_ROW_START 0x01 ++#define MT9P031_ROW_START_DEF 54 ++#define MT9P031_COLUMN_START 0x02 ++#define MT9P031_COLUMN_START_DEF 16 ++#define MT9P031_WINDOW_HEIGHT 0x03 ++#define MT9P031_WINDOW_WIDTH 0x04 ++#define MT9P031_H_BLANKING 0x05 ++#define MT9P031_H_BLANKING_VALUE 0 ++#define MT9P031_V_BLANKING 0x06 ++#define MT9P031_V_BLANKING_VALUE 25 ++#define MT9P031_OUTPUT_CONTROL 0x07 ++#define MT9P031_OUTPUT_CONTROL_CEN 2 ++#define MT9P031_OUTPUT_CONTROL_SYN 1 ++#define MT9P031_SHUTTER_WIDTH_UPPER 0x08 ++#define MT9P031_SHUTTER_WIDTH 0x09 ++#define MT9P031_PIXEL_CLOCK_CONTROL 0x0a ++#define MT9P031_FRAME_RESTART 0x0b ++#define MT9P031_SHUTTER_DELAY 0x0c ++#define MT9P031_RST 0x0d ++#define MT9P031_RST_ENABLE 1 ++#define MT9P031_RST_DISABLE 0 ++#define MT9P031_READ_MODE_1 0x1e ++#define MT9P031_READ_MODE_2 0x20 ++#define MT9P031_READ_MODE_2_ROW_MIR 0x8000 ++#define MT9P031_READ_MODE_2_COL_MIR 0x4000 ++#define MT9P031_ROW_ADDRESS_MODE 0x22 ++#define MT9P031_COLUMN_ADDRESS_MODE 0x23 ++#define MT9P031_GLOBAL_GAIN 0x35 ++ ++#define MT9P031_WINDOW_HEIGHT_MAX 1944 ++#define MT9P031_WINDOW_WIDTH_MAX 2592 ++#define MT9P031_WINDOW_HEIGHT_MIN 2 ++#define MT9P031_WINDOW_WIDTH_MIN 18 ++ ++struct mt9p031 { ++ struct v4l2_subdev subdev; ++ struct media_pad pad; ++ struct v4l2_rect rect; /* Sensor window */ ++ struct v4l2_mbus_framefmt format; ++ struct mt9p031_platform_data *pdata; ++ struct mutex power_lock; /* lock to protect power_count */ ++ int power_count; ++ u16 xskip; ++ u16 yskip; ++ /* cache register values */ ++ u16 output_control; ++ u16 h_blanking; ++ u16 v_blanking; ++ u16 column_address_mode; ++ u16 row_address_mode; ++ u16 column_start; ++ u16 row_start; ++ u16 window_width; ++ u16 window_height; ++ struct regulator *reg_1v8; ++ struct regulator *reg_2v8; ++}; ++ ++static struct mt9p031 *to_mt9p031(const struct i2c_client *client) ++{ ++ return container_of(i2c_get_clientdata(client), struct mt9p031, subdev); ++} ++ ++static int reg_read(struct i2c_client *client, const u8 reg) ++{ ++ s32 data = i2c_smbus_read_word_data(client, reg); ++ return data < 0 ? data : swab16(data); ++} ++ ++static int reg_write(struct i2c_client *client, const u8 reg, ++ const u16 data) ++{ ++ return i2c_smbus_write_word_data(client, reg, swab16(data)); ++} ++ ++static int reg_write_cached(struct i2c_client *client, const u8 reg, ++ const u16 data, u16 *cache) ++{ ++ int ret; ++ ++ ret = reg_write(client, reg, data); ++ if (ret < 0) ++ return ret; ++ *cache = data; ++ return 0; ++} ++ ++static int mt9p031_set_output_control(struct mt9p031 *mt9p031, u16 clear, ++ u16 set) ++{ ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); ++ u16 value = (mt9p031->output_control & ~clear) | set; ++ ++ return reg_write_cached(client, MT9P031_OUTPUT_CONTROL, value, ++ &mt9p031->output_control); ++} ++ ++static int restore_registers(struct i2c_client *client) ++{ ++ int ret; ++ struct mt9p031 *mt9p031 = to_mt9p031(client); ++ ++ /* Disable register update, reconfigure atomically */ ++ ret = mt9p031_set_output_control(mt9p031, 0, ++ MT9P031_OUTPUT_CONTROL_SYN); ++ if (ret < 0) ++ return ret; ++ ++ /* Blanking and start values - default... */ ++ ret = reg_write(client, MT9P031_H_BLANKING, mt9p031->h_blanking); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write(client, MT9P031_V_BLANKING, mt9p031->v_blanking); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write(client, MT9P031_COLUMN_ADDRESS_MODE, ++ mt9p031->column_address_mode); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write(client, MT9P031_ROW_ADDRESS_MODE, ++ mt9p031->row_address_mode); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write(client, MT9P031_COLUMN_START, ++ mt9p031->column_start); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write(client, MT9P031_ROW_START, ++ mt9p031->row_start); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write(client, MT9P031_WINDOW_WIDTH, ++ mt9p031->window_width); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write(client, MT9P031_WINDOW_HEIGHT, ++ mt9p031->window_height); ++ if (ret < 0) ++ return ret; ++ ++ /* Re-enable register update, commit all changes */ ++ ret = mt9p031_set_output_control(mt9p031, ++ MT9P031_OUTPUT_CONTROL_SYN, 0); ++ if (ret < 0) ++ return ret; ++ return 0; ++} ++ ++static int mt9p031_reset(struct i2c_client *client) ++{ ++ struct mt9p031 *mt9p031 = to_mt9p031(client); ++ int ret; ++ ++ /* Disable chip output, synchronous option update */ ++ ret = reg_write(client, MT9P031_RST, MT9P031_RST_ENABLE); ++ if (ret < 0) ++ return ret; ++ ret = reg_write(client, MT9P031_RST, MT9P031_RST_DISABLE); ++ if (ret < 0) ++ return ret; ++ return mt9p031_set_output_control(mt9p031, ++ MT9P031_OUTPUT_CONTROL_CEN, 0); ++} ++ ++static int mt9p031_power_on(struct mt9p031 *mt9p031) ++{ ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); ++ int ret; ++ ++ /* Ensure RESET_BAR is low */ ++ if (mt9p031->pdata->reset) ++ mt9p031->pdata->reset(&mt9p031->subdev, 1); ++ /* turn on digital supply first */ ++ ret = regulator_enable(mt9p031->reg_1v8); ++ if (ret) { ++ dev_err(&client->dev, ++ "Failed to enable 1.8v regulator: %d\n", ret); ++ goto err_1v8; ++ } ++ /* now turn on analog supply */ ++ ret = regulator_enable(mt9p031->reg_2v8); ++ if (ret) { ++ dev_err(&client->dev, ++ "Failed to enable 2.8v regulator: %d\n", ret); ++ goto err_rst; ++ } ++ /* Now RESET_BAR must be high */ ++ if (mt9p031->pdata->reset) ++ mt9p031->pdata->reset(&mt9p031->subdev, 0); ++ ++ if (mt9p031->pdata->set_xclk) ++ mt9p031->pdata->set_xclk(&mt9p031->subdev, MT9P031_PIXCLK_FREQ); ++ ++ /* soft reset */ ++ ret = mt9p031_reset(client); ++ if (ret < 0) { ++ dev_err(&client->dev, "Failed to reset the camera\n"); ++ goto err_rst; ++ } ++ ++ ret = restore_registers(client); ++ if (ret < 0) { ++ dev_err(&client->dev, "Failed to restore registers\n"); ++ goto err_rst; ++ } ++ ++ return 0; ++err_rst: ++ regulator_disable(mt9p031->reg_1v8); ++err_1v8: ++ return ret; ++ ++} ++ ++static void mt9p031_power_off(struct mt9p031 *mt9p031) ++{ ++ if (mt9p031->pdata->set_xclk) ++ mt9p031->pdata->set_xclk(&mt9p031->subdev, 0); ++ if (mt9p031->pdata->reset) ++ mt9p031->pdata->reset(&mt9p031->subdev, 1); ++ regulator_disable(mt9p031->reg_1v8); ++ regulator_disable(mt9p031->reg_2v8); ++} ++ ++static int mt9p031_enum_mbus_code(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_mbus_code_enum *code) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ ++ if (code->pad || code->index) ++ return -EINVAL; ++ ++ code->code = mt9p031->format.code; ++ ++ return 0; ++} ++ ++static struct v4l2_mbus_framefmt *mt9p031_get_pad_format( ++ struct mt9p031 *mt9p031, ++ struct v4l2_subdev_fh *fh, ++ unsigned int pad, u32 which) ++{ ++ switch (which) { ++ case V4L2_SUBDEV_FORMAT_TRY: ++ return v4l2_subdev_get_try_format(fh, pad); ++ case V4L2_SUBDEV_FORMAT_ACTIVE: ++ return &mt9p031->format; ++ default: ++ return NULL; ++ } ++} ++ ++static struct v4l2_rect *mt9p031_get_pad_crop(struct mt9p031 *mt9p031, ++ struct v4l2_subdev_fh *fh, unsigned int pad, u32 which) ++{ ++ switch (which) { ++ case V4L2_SUBDEV_FORMAT_TRY: ++ return v4l2_subdev_get_try_crop(fh, pad); ++ case V4L2_SUBDEV_FORMAT_ACTIVE: ++ return &mt9p031->rect; ++ default: ++ return NULL; ++ } ++} ++ ++static int mt9p031_get_crop(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_crop *crop) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ struct v4l2_rect *rect = mt9p031_get_pad_crop(mt9p031, fh, crop->pad, ++ crop->which); ++ if (!rect) ++ return -EINVAL; ++ ++ crop->rect = *rect; ++ ++ return 0; ++} ++ ++static u16 mt9p031_skip_for_crop(s32 source, s32 *target, s32 max_skip) ++{ ++ unsigned int skip; ++ ++ if (source - source / 4 < *target) { ++ *target = source; ++ return 1; ++ } ++ ++ skip = DIV_ROUND_CLOSEST(source, *target); ++ if (skip > max_skip) ++ skip = max_skip; ++ *target = 2 * DIV_ROUND_UP(source, 2 * skip); ++ ++ return skip; ++} ++ ++static int mt9p031_set_params(struct i2c_client *client, ++ struct v4l2_rect *rect, u16 xskip, u16 yskip) ++{ ++ struct mt9p031 *mt9p031 = to_mt9p031(client); ++ int ret; ++ u16 xbin, ybin; ++ const u16 hblank = MT9P031_H_BLANKING_VALUE, ++ vblank = MT9P031_V_BLANKING_VALUE; ++ __s32 left, top, width, height; ++ ++ /* ++ * TODO: Attention! When implementing horizontal flipping, adjust ++ * alignment according to R2 "Column Start" description in the datasheet ++ */ ++ if (xskip & 1) { ++ xbin = 1; ++ left = rect->left & (~3); ++ } else if (xskip & 2) { ++ xbin = 2; ++ left = rect->left & (~7); ++ } else { ++ xbin = 4; ++ left = rect->left & (~15); ++ } ++ top = rect->top & (~1); ++ width = rect->width; ++ height = rect->height; ++ ++ ybin = min(yskip, (u16)4); ++ ++ /* Disable register update, reconfigure atomically */ ++ ret = mt9p031_set_output_control(mt9p031, 0, ++ MT9P031_OUTPUT_CONTROL_SYN); ++ if (ret < 0) ++ return ret; ++ ++ dev_dbg(&client->dev, "skip %u:%u, rect %ux%u@%u:%u\n", ++ xskip, yskip, rect->width, rect->height, rect->left, rect->top); ++ ++ /* Blanking and start values - default... */ ++ ret = reg_write_cached(client, MT9P031_H_BLANKING, hblank, ++ &mt9p031->h_blanking); ++ if (ret < 0) ++ return ret; ++ ret = reg_write_cached(client, MT9P031_V_BLANKING, vblank, ++ &mt9p031->v_blanking); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write_cached(client, MT9P031_COLUMN_ADDRESS_MODE, ++ ((xbin - 1) << 4) | (xskip - 1), ++ &mt9p031->column_address_mode); ++ if (ret < 0) ++ return ret; ++ ret = reg_write_cached(client, MT9P031_ROW_ADDRESS_MODE, ++ ((ybin - 1) << 4) | (yskip - 1), ++ &mt9p031->row_address_mode); ++ if (ret < 0) ++ return ret; ++ ++ dev_dbg(&client->dev, "new physical left %u, top %u\n", ++ rect->left, rect->top); ++ ++ ret = reg_write_cached(client, MT9P031_COLUMN_START, ++ rect->left + MT9P031_COLUMN_START_DEF, ++ &mt9p031->column_start); ++ if (ret < 0) ++ return ret; ++ ret = reg_write_cached(client, MT9P031_ROW_START, ++ rect->top + MT9P031_ROW_START_DEF, ++ &mt9p031->row_start); ++ if (ret < 0) ++ return ret; ++ ret = reg_write_cached(client, MT9P031_WINDOW_WIDTH, ++ rect->width - 1, ++ &mt9p031->window_width); ++ if (ret < 0) ++ return ret; ++ ret = reg_write_cached(client, MT9P031_WINDOW_HEIGHT, ++ rect->height - 1, ++ &mt9p031->window_height); ++ if (ret < 0) ++ return ret; ++ ++ /* Re-enable register update, commit all changes */ ++ ret = mt9p031_set_output_control(mt9p031, ++ MT9P031_OUTPUT_CONTROL_SYN, 0); ++ if (ret < 0) ++ return ret; ++ ++ mt9p031->xskip = xskip; ++ mt9p031->yskip = yskip; ++ return ret; ++} ++ ++static int mt9p031_set_crop(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_crop *crop) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ struct v4l2_mbus_framefmt *f; ++ struct v4l2_rect *c; ++ struct v4l2_rect rect; ++ u16 xskip, yskip; ++ s32 width, height; ++ ++ dev_dbg(mt9p031->subdev.v4l2_dev->dev, "%s(%ux%u@%u:%u : %u)\n", ++ __func__, crop->rect.width, crop->rect.height, ++ crop->rect.left, crop->rect.top, crop->which); ++ ++ /* ++ * Clamp the crop rectangle boundaries and align them to a multiple of 2 ++ * pixels. ++ */ ++ rect.width = ALIGN(clamp(crop->rect.width, ++ MT9P031_WINDOW_WIDTH_MIN, MT9P031_WINDOW_WIDTH_MAX), 2); ++ rect.height = ALIGN(clamp(crop->rect.height, ++ MT9P031_WINDOW_HEIGHT_MIN, MT9P031_WINDOW_HEIGHT_MAX), 2); ++ rect.left = ALIGN(clamp(crop->rect.left, ++ 0, MT9P031_WINDOW_WIDTH_MAX - rect.width), 2); ++ rect.top = ALIGN(clamp(crop->rect.top, ++ 0, MT9P031_WINDOW_HEIGHT_MAX - rect.height), 2); ++ ++ c = mt9p031_get_pad_crop(mt9p031, fh, crop->pad, crop->which); ++ ++ if (rect.width != c->width || rect.height != c->height) { ++ /* ++ * Reset the output image size if the crop rectangle size has ++ * been modified. ++ */ ++ f = mt9p031_get_pad_format(mt9p031, fh, crop->pad, ++ crop->which); ++ width = f->width; ++ height = f->height; ++ ++ xskip = mt9p031_skip_for_crop(rect.width, &width, 7); ++ yskip = mt9p031_skip_for_crop(rect.height, &height, 8); ++ } else { ++ xskip = mt9p031->xskip; ++ yskip = mt9p031->yskip; ++ f = NULL; ++ } ++ if (f) { ++ f->width = width; ++ f->height = height; ++ } ++ ++ *c = rect; ++ crop->rect = rect; ++ ++ mt9p031->xskip = xskip; ++ mt9p031->yskip = yskip; ++ mt9p031->rect = *c; ++ return 0; ++} ++ ++static int mt9p031_get_format(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_format *fmt) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ ++ fmt->format = ++ *mt9p031_get_pad_format(mt9p031, fh, fmt->pad, fmt->which); ++ return 0; ++} ++ ++static u16 mt9p031_skip_for_scale(s32 *source, s32 target, ++ s32 max_skip, s32 max) ++{ ++ unsigned int skip; ++ ++ if (*source - *source / 4 < target) { ++ *source = target; ++ return 1; ++ } ++ ++ skip = min(max, *source + target / 2) / target; ++ if (skip > max_skip) ++ skip = max_skip; ++ *source = target * skip; ++ ++ return skip; ++} ++ ++static int mt9p031_fmt_validate(struct v4l2_subdev *sd, ++ struct v4l2_subdev_format *fmt) ++{ ++ struct v4l2_mbus_framefmt *format = &fmt->format; ++ ++ /* Hardcode code and colorspace as sensor only supports one */ ++ format->code = V4L2_MBUS_FMT_SGRBG12_1X12; ++ format->colorspace = V4L2_COLORSPACE_SRGB; ++ ++ format->width = clamp_t(int, ALIGN(format->width, 2), 2, ++ MT9P031_WINDOW_WIDTH_MAX); ++ format->height = clamp_t(int, ALIGN(format->height, 2), 2, ++ MT9P031_WINDOW_HEIGHT_MAX); ++ format->field = V4L2_FIELD_NONE; ++ ++ return 0; ++} ++ ++static int mt9p031_set_format(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_format *format) ++{ ++ struct v4l2_subdev_format sdf = *format; ++ struct v4l2_mbus_framefmt *__format, *format_bak = &sdf.format; ++ struct v4l2_rect *__crop, rect; ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ u16 xskip, yskip; ++ int ret; ++ ++ __crop = mt9p031_get_pad_crop(mt9p031, fh, format->pad, format->which); ++ ++ ret = mt9p031_fmt_validate(sd, &sdf); ++ if (ret < 0) ++ return ret; ++ rect.width = __crop->width; ++ rect.height = __crop->height; ++ ++ xskip = mt9p031_skip_for_scale(&rect.width, format_bak->width, 7, ++ MT9P031_WINDOW_WIDTH_MAX); ++ if (rect.width + __crop->left > MT9P031_WINDOW_WIDTH_MAX) ++ rect.left = (MT9P031_WINDOW_WIDTH_MAX - rect.width) / 2; ++ else ++ rect.left = __crop->left; ++ yskip = mt9p031_skip_for_scale(&rect.height, format_bak->height, 8, ++ MT9P031_WINDOW_HEIGHT_MAX); ++ if (rect.height + __crop->top > MT9P031_WINDOW_HEIGHT_MAX) ++ rect.top = (MT9P031_WINDOW_HEIGHT_MAX - rect.height) / 2; ++ else ++ rect.top = __crop->top; ++ ++ dev_dbg(mt9p031->subdev.v4l2_dev->dev, "%s(%ux%u : %u)\n", __func__, ++ format_bak->width, format_bak->height, format->which); ++ if (__crop) ++ *__crop = rect; ++ ++ __format = mt9p031_get_pad_format(mt9p031, fh, format->pad, format->which); ++ *__format = *format_bak; ++ format->format = *format_bak; ++ ++ mt9p031->xskip = xskip; ++ mt9p031->yskip = yskip; ++ mt9p031->rect = *__crop; ++ return 0; ++} ++ ++static int mt9p031_s_stream(struct v4l2_subdev *sd, int enable) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); ++ struct v4l2_rect rect = mt9p031->rect; ++ u16 xskip = mt9p031->xskip; ++ u16 yskip = mt9p031->yskip; ++ int ret; ++ ++ if (enable) { ++ ret = mt9p031_set_params(client, &rect, xskip, yskip); ++ if (ret < 0) ++ return ret; ++ /* Switch to master "normal" mode */ ++ ret = mt9p031_set_output_control(mt9p031, 0, ++ MT9P031_OUTPUT_CONTROL_CEN); ++ } else { ++ /* Stop sensor readout */ ++ ret = mt9p031_set_output_control(mt9p031, ++ MT9P031_OUTPUT_CONTROL_CEN, 0); ++ } ++ return ret; ++} ++ ++static int mt9p031_video_probe(struct i2c_client *client) ++{ ++ s32 data; ++ ++ /* Read out the chip version register */ ++ data = reg_read(client, MT9P031_CHIP_VERSION); ++ if (data != MT9P031_CHIP_VERSION_VALUE) { ++ dev_err(&client->dev, ++ "No MT9P031 chip detected, register read %x\n", data); ++ return -ENODEV; ++ } ++ ++ dev_info(&client->dev, "Detected a MT9P031 chip ID %x\n", data); ++ ++ return 0; ++} ++ ++static int mt9p031_set_power(struct v4l2_subdev *sd, int on) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ int ret = 0; ++ ++ mutex_lock(&mt9p031->power_lock); ++ ++ /* ++ * If the power count is modified from 0 to != 0 or from != 0 to 0, ++ * update the power state. ++ */ ++ if (mt9p031->power_count == !on) { ++ if (on) { ++ ret = mt9p031_power_on(mt9p031); ++ if (ret) { ++ dev_err(mt9p031->subdev.v4l2_dev->dev, ++ "Failed to enable 2.8v regulator: %d\n", ret); ++ goto out; ++ } ++ } else { ++ mt9p031_power_off(mt9p031); ++ } ++ } ++ ++ /* Update the power count. */ ++ mt9p031->power_count += on ? 1 : -1; ++ WARN_ON(mt9p031->power_count < 0); ++ ++out: ++ mutex_unlock(&mt9p031->power_lock); ++ return ret; ++} ++ ++static int mt9p031_registered(struct v4l2_subdev *sd) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); ++ int ret; ++ ++ ret = mt9p031_set_power(&mt9p031->subdev, 1); ++ if (ret) { ++ dev_err(&client->dev, ++ "Failed to power on device: %d\n", ret); ++ goto err_pwron; ++ } ++ ++ ret = mt9p031_video_probe(client); ++ if (ret) ++ goto err_evprobe; ++ ++ mt9p031->pad.flags = MEDIA_PAD_FL_SOURCE; ++ ret = media_entity_init(&mt9p031->subdev.entity, 1, &mt9p031->pad, 0); ++ if (ret) ++ goto err_evprobe; ++ ++ mt9p031->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; ++ mt9p031_set_power(&mt9p031->subdev, 0); ++ ++ return 0; ++err_evprobe: ++ mt9p031_set_power(&mt9p031->subdev, 0); ++err_pwron: ++ return ret; ++} ++ ++static int mt9p031_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) ++{ ++ struct mt9p031 *mt9p031; ++ mt9p031 = container_of(sd, struct mt9p031, subdev); ++ ++ mt9p031->rect.width = MT9P031_WINDOW_WIDTH_MAX; ++ mt9p031->rect.height = MT9P031_WINDOW_HEIGHT_MAX; ++ mt9p031->rect.left = MT9P031_COLUMN_START_DEF; ++ mt9p031->rect.top = MT9P031_ROW_START_DEF; ++ ++ mt9p031->format.code = V4L2_MBUS_FMT_SGRBG12_1X12; ++ mt9p031->format.width = MT9P031_WINDOW_WIDTH_MAX; ++ mt9p031->format.height = MT9P031_WINDOW_HEIGHT_MAX; ++ mt9p031->format.field = V4L2_FIELD_NONE; ++ mt9p031->format.colorspace = V4L2_COLORSPACE_SRGB; ++ ++ mt9p031->xskip = 1; ++ mt9p031->yskip = 1; ++ return mt9p031_set_power(sd, 1); ++} ++ ++static int mt9p031_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) ++{ ++ return mt9p031_set_power(sd, 0); ++} ++ ++static struct v4l2_subdev_core_ops mt9p031_subdev_core_ops = { ++ .s_power = mt9p031_set_power, ++}; ++ ++static struct v4l2_subdev_video_ops mt9p031_subdev_video_ops = { ++ .s_stream = mt9p031_s_stream, ++}; ++ ++static struct v4l2_subdev_pad_ops mt9p031_subdev_pad_ops = { ++ .enum_mbus_code = mt9p031_enum_mbus_code, ++ .get_fmt = mt9p031_get_format, ++ .set_fmt = mt9p031_set_format, ++ .get_crop = mt9p031_get_crop, ++ .set_crop = mt9p031_set_crop, ++}; ++ ++static struct v4l2_subdev_ops mt9p031_subdev_ops = { ++ .core = &mt9p031_subdev_core_ops, ++ .video = &mt9p031_subdev_video_ops, ++ .pad = &mt9p031_subdev_pad_ops, ++}; ++ ++static const struct v4l2_subdev_internal_ops mt9p031_subdev_internal_ops = { ++ .registered = mt9p031_registered, ++ .open = mt9p031_open, ++ .close = mt9p031_close, ++}; ++ ++static int mt9p031_probe(struct i2c_client *client, ++ const struct i2c_device_id *did) ++{ ++ struct mt9p031 *mt9p031; ++ struct mt9p031_platform_data *pdata = client->dev.platform_data; ++ struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); ++ int ret; ++ ++ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA)) { ++ dev_warn(&adapter->dev, ++ "I2C-Adapter doesn't support I2C_FUNC_SMBUS_WORD\n"); ++ return -EIO; ++ } ++ ++ mt9p031 = kzalloc(sizeof(struct mt9p031), GFP_KERNEL); ++ if (!mt9p031) ++ return -ENOMEM; ++ ++ mutex_init(&mt9p031->power_lock); ++ v4l2_i2c_subdev_init(&mt9p031->subdev, client, &mt9p031_subdev_ops); ++ mt9p031->subdev.internal_ops = &mt9p031_subdev_internal_ops; ++ ++ mt9p031->pdata = pdata; ++ ++ mt9p031->reg_1v8 = regulator_get(NULL, "cam_1v8"); ++ if (IS_ERR(mt9p031->reg_1v8)) { ++ ret = PTR_ERR(mt9p031->reg_1v8); ++ dev_err(mt9p031->subdev.v4l2_dev->dev, ++ "Failed 1.8v regulator: %d\n", ret); ++ goto err_e1v8; ++ } ++ ++ mt9p031->reg_2v8 = regulator_get(NULL, "cam_2v8"); ++ if (IS_ERR(mt9p031->reg_2v8)) { ++ ret = PTR_ERR(mt9p031->reg_2v8); ++ dev_err(mt9p031->subdev.v4l2_dev->dev, ++ "Failed 2.8v regulator: %d\n", ret); ++ goto err_e2v8; ++ } ++ return 0; ++err_e2v8: ++ regulator_put(mt9p031->reg_1v8); ++err_e1v8: ++ kfree(mt9p031); ++ return ret; ++} ++ ++static int mt9p031_remove(struct i2c_client *client) ++{ ++ struct v4l2_subdev *sd = i2c_get_clientdata(client); ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ ++ v4l2_device_unregister_subdev(sd); ++ media_entity_cleanup(&sd->entity); ++ regulator_put(mt9p031->reg_2v8); ++ regulator_put(mt9p031->reg_1v8); ++ kfree(mt9p031); ++ ++ return 0; ++} ++ ++static const struct i2c_device_id mt9p031_id[] = { ++ { "mt9p031", 0 }, ++ { } ++}; ++MODULE_DEVICE_TABLE(i2c, mt9p031_id); ++ ++static struct i2c_driver mt9p031_i2c_driver = { ++ .driver = { ++ .name = "mt9p031", ++ }, ++ .probe = mt9p031_probe, ++ .remove = mt9p031_remove, ++ .id_table = mt9p031_id, ++}; ++ ++static int __init mt9p031_mod_init(void) ++{ ++ return i2c_add_driver(&mt9p031_i2c_driver); ++} ++ ++static void __exit mt9p031_mod_exit(void) ++{ ++ i2c_del_driver(&mt9p031_i2c_driver); ++} ++ ++module_init(mt9p031_mod_init); ++module_exit(mt9p031_mod_exit); ++ ++MODULE_DESCRIPTION("Aptina MT9P031 Camera driver"); ++MODULE_AUTHOR("Bastian Hecht "); ++MODULE_LICENSE("GPL v2"); +diff --git a/include/media/mt9p031.h b/include/media/mt9p031.h +new file mode 100644 +index 0000000..ad37eb3 +--- /dev/null ++++ b/include/media/mt9p031.h +@@ -0,0 +1,11 @@ ++#ifndef MT9P031_H ++#define MT9P031_H ++ ++struct v4l2_subdev; ++ ++struct mt9p031_platform_data { ++ int (*set_xclk)(struct v4l2_subdev *subdev, int hz); ++ int (*reset)(struct v4l2_subdev *subdev, int active); ++}; ++ ++#endif +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0001-OMAP2-cpufreq-free-up-table-on-exit.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0001-OMAP2-cpufreq-free-up-table-on-exit.patch new file mode 100644 index 0000000000..2de60ca2a9 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0001-OMAP2-cpufreq-free-up-table-on-exit.patch @@ -0,0 +1,38 @@ +From fc4833337f5386c40eaf41d533fb5fcbd38d6a1d Mon Sep 17 00:00:00 2001 +From: Nishanth Menon +Date: Thu, 12 May 2011 07:59:52 -0500 +Subject: [PATCH 1/6] OMAP2+: cpufreq: free up table on exit + +freq_table allocated by opp_init_cpufreq_table in omap_cpu_init +needs to be freed in omap_cpu_exit. + +Signed-off-by: Nishanth Menon +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/omap2plus-cpufreq.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/omap2plus-cpufreq.c b/arch/arm/mach-omap2/omap2plus-cpufreq.c +index d53ce23..e38ebb8 100644 +--- a/arch/arm/mach-omap2/omap2plus-cpufreq.c ++++ b/arch/arm/mach-omap2/omap2plus-cpufreq.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + + #include +@@ -216,6 +217,8 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) + static int omap_cpu_exit(struct cpufreq_policy *policy) + { + clk_exit_cpufreq_table(&freq_table); ++ kfree(freq_table); ++ freq_table = NULL; + clk_put(mpu_clk); + return 0; + } +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0002-OMAP2-cpufreq-handle-invalid-cpufreq-table.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0002-OMAP2-cpufreq-handle-invalid-cpufreq-table.patch new file mode 100644 index 0000000000..fb7ada2e18 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0002-OMAP2-cpufreq-handle-invalid-cpufreq-table.patch @@ -0,0 +1,44 @@ +From bbd8caaeda861dfa69882c34d8556b541f822ae2 Mon Sep 17 00:00:00 2001 +From: Nishanth Menon +Date: Thu, 12 May 2011 08:14:41 -0500 +Subject: [PATCH 2/6] OMAP2+: cpufreq: handle invalid cpufreq table + +Handle the case when cpufreq_frequency_table_cpuinfo fails. freq_table +that we passed failed the internal test of cpufreq generic driver, +so we should'nt be using the freq_table as such. Instead, warn and +fallback to clock functions for validation and operation. + +Signed-off-by: Nishanth Menon +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/omap2plus-cpufreq.c | 12 ++++++++++-- + 1 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/mach-omap2/omap2plus-cpufreq.c b/arch/arm/mach-omap2/omap2plus-cpufreq.c +index e38ebb8..6e3666a 100644 +--- a/arch/arm/mach-omap2/omap2plus-cpufreq.c ++++ b/arch/arm/mach-omap2/omap2plus-cpufreq.c +@@ -182,10 +182,18 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) + + if (freq_table) { + result = cpufreq_frequency_table_cpuinfo(policy, freq_table); +- if (!result) ++ if (!result) { + cpufreq_frequency_table_get_attr(freq_table, + policy->cpu); +- } else { ++ } else { ++ WARN(true, "%s: fallback to clk_round(freq_table=%d)\n", ++ __func__, result); ++ kfree(freq_table); ++ freq_table = NULL; ++ } ++ } ++ ++ if (!freq_table) { + policy->cpuinfo.min_freq = clk_round_rate(mpu_clk, 0) / 1000; + policy->cpuinfo.max_freq = clk_round_rate(mpu_clk, + VERY_HI_RATE) / 1000; +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0003-OMAP2-cpufreq-minor-comment-cleanup.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0003-OMAP2-cpufreq-minor-comment-cleanup.patch new file mode 100644 index 0000000000..1cf78ebba5 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0003-OMAP2-cpufreq-minor-comment-cleanup.patch @@ -0,0 +1,33 @@ +From 47eeee58d9321e827e68ea3b914988db6b1635da Mon Sep 17 00:00:00 2001 +From: Nishanth Menon +Date: Thu, 12 May 2011 16:27:45 -0700 +Subject: [PATCH 3/6] OMAP2+: cpufreq: minor comment cleanup + +this should probably get squashed in.. + +Signed-off-by: Nishanth Menon +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/omap2plus-cpufreq.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/mach-omap2/omap2plus-cpufreq.c b/arch/arm/mach-omap2/omap2plus-cpufreq.c +index 6e3666a..45f1e9e 100644 +--- a/arch/arm/mach-omap2/omap2plus-cpufreq.c ++++ b/arch/arm/mach-omap2/omap2plus-cpufreq.c +@@ -84,8 +84,10 @@ static int omap_target(struct cpufreq_policy *policy, + if (is_smp() && (num_online_cpus() < NR_CPUS)) + return ret; + +- /* Ensure desired rate is within allowed range. Some govenors +- * (ondemand) will just pass target_freq=0 to get the minimum. */ ++ /* ++ * Ensure desired rate is within allowed range. Some govenors ++ * (ondemand) will just pass target_freq=0 to get the minimum. ++ */ + if (target_freq < policy->min) + target_freq = policy->min; + if (target_freq > policy->max) +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0004-OMAP2-cpufreq-use-clk_init_cpufreq_table-if-OPPs-not.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0004-OMAP2-cpufreq-use-clk_init_cpufreq_table-if-OPPs-not.patch new file mode 100644 index 0000000000..a7f84df9e4 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0004-OMAP2-cpufreq-use-clk_init_cpufreq_table-if-OPPs-not.patch @@ -0,0 +1,48 @@ +From d972d3f4eb53c261f8496176b429287b97e297d0 Mon Sep 17 00:00:00 2001 +From: Nishanth Menon +Date: Fri, 13 May 2011 05:34:35 -0700 +Subject: [PATCH 4/6] OMAP2: cpufreq: use clk_init_cpufreq_table if OPPs not available + +OMAP2 does not use OPP tables at the moment for DVFS. Currently, +we depend on opp table initialization to give us the freq_table, +which makes sense for OMAP3+. for OMAP2, we should be using +clk_init_cpufreq_table - so if the opp based frequency table +initilization fails, fall back to clk_init_cpufreq_table to give +us the table. + +Signed-off-by: Nishanth Menon +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/omap2plus-cpufreq.c | 9 ++++++++- + 1 files changed, 8 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/mach-omap2/omap2plus-cpufreq.c b/arch/arm/mach-omap2/omap2plus-cpufreq.c +index 45f1e9e..854f4b3 100644 +--- a/arch/arm/mach-omap2/omap2plus-cpufreq.c ++++ b/arch/arm/mach-omap2/omap2plus-cpufreq.c +@@ -180,7 +180,13 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) + pr_warning("%s: unable to get the mpu device\n", __func__); + return -EINVAL; + } +- opp_init_cpufreq_table(mpu_dev, &freq_table); ++ ++ /* ++ * if we dont get cpufreq table using opp, use traditional omap2 lookup ++ * as a fallback ++ */ ++ if (opp_init_cpufreq_table(mpu_dev, &freq_table)) ++ clk_init_cpufreq_table(&freq_table); + + if (freq_table) { + result = cpufreq_frequency_table_cpuinfo(policy, freq_table); +@@ -188,6 +194,7 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) + cpufreq_frequency_table_get_attr(freq_table, + policy->cpu); + } else { ++ clk_exit_cpufreq_table(&freq_table); + WARN(true, "%s: fallback to clk_round(freq_table=%d)\n", + __func__, result); + kfree(freq_table); +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0005-OMAP2-cpufreq-use-cpufreq_frequency_table_target.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0005-OMAP2-cpufreq-use-cpufreq_frequency_table_target.patch new file mode 100644 index 0000000000..2bbab2f4f1 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0005-OMAP2-cpufreq-use-cpufreq_frequency_table_target.patch @@ -0,0 +1,78 @@ +From dec271e2e15103120df35be942884f577d6a768c Mon Sep 17 00:00:00 2001 +From: Nishanth Menon +Date: Fri, 13 May 2011 05:43:49 -0700 +Subject: [PATCH 5/6] OMAP2+: cpufreq: use cpufreq_frequency_table_target + +Use cpufreq_frequency_table_target for finding the proper target +instead of seeing if the frequency requested is divisible alone. +if we have a frequency table, we should restrict ourselves to +selecting the "approved" frequencies alone and only in the case +where the frequency table is not available should we attempt at +closest roundable clock frequency. + +Signed-off-by: Nishanth Menon +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/omap2plus-cpufreq.c | 38 ++++++++++++++++++++++-------- + 1 files changed, 28 insertions(+), 10 deletions(-) + +diff --git a/arch/arm/mach-omap2/omap2plus-cpufreq.c b/arch/arm/mach-omap2/omap2plus-cpufreq.c +index 854f4b3..d0b4f97 100644 +--- a/arch/arm/mach-omap2/omap2plus-cpufreq.c ++++ b/arch/arm/mach-omap2/omap2plus-cpufreq.c +@@ -77,24 +77,42 @@ static int omap_target(struct cpufreq_policy *policy, + unsigned int target_freq, + unsigned int relation) + { +- int i, ret = 0; ++ unsigned int i; ++ int ret = 0; + struct cpufreq_freqs freqs; + + /* Changes not allowed until all CPUs are online */ + if (is_smp() && (num_online_cpus() < NR_CPUS)) + return ret; + +- /* +- * Ensure desired rate is within allowed range. Some govenors +- * (ondemand) will just pass target_freq=0 to get the minimum. +- */ +- if (target_freq < policy->min) +- target_freq = policy->min; +- if (target_freq > policy->max) +- target_freq = policy->max; ++ if (freq_table) { ++ ret = cpufreq_frequency_table_target(policy, freq_table, ++ target_freq, relation, &i); ++ if (ret) { ++ pr_debug("%s: cpu%d: no freq match for %d(ret=%d)\n", ++ __func__, policy->cpu, target_freq, ret); ++ return ret; ++ } ++ freqs.new = freq_table[i].frequency; ++ } else { ++ /* ++ * Ensure desired rate is within allowed range. Some govenors ++ * (ondemand) will just pass target_freq=0 to get the minimum. ++ */ ++ if (target_freq < policy->min) ++ target_freq = policy->min; ++ if (target_freq > policy->max) ++ target_freq = policy->max; ++ ++ freqs.new = clk_round_rate(mpu_clk, target_freq * 1000) / 1000; ++ } ++ if (!freqs.new) { ++ pr_err("%s: cpu%d: no match for freq %d\n", __func__, ++ policy->cpu, target_freq); ++ return -EINVAL; ++ } + + freqs.old = omap_getspeed(policy->cpu); +- freqs.new = clk_round_rate(mpu_clk, target_freq * 1000) / 1000; + freqs.cpu = policy->cpu; + + if (freqs.old == freqs.new) +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0006-OMAP2-cpufreq-fix-freq_table-leak.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0006-OMAP2-cpufreq-fix-freq_table-leak.patch new file mode 100644 index 0000000000..2595023c68 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0006-OMAP2-cpufreq-fix-freq_table-leak.patch @@ -0,0 +1,100 @@ +From d7559c9bd5225ad2e57e8c798dc1301396e05ce1 Mon Sep 17 00:00:00 2001 +From: Nishanth Menon +Date: Wed, 18 May 2011 01:48:23 -0500 +Subject: [PATCH 6/6] OMAP2+: cpufreq: fix freq_table leak + +Since we have two cpus the cpuinit call for cpu1 causes +freq_table of cpu0 to be overwritten. instead, we maintain +a counter to keep track of cpus who use the cpufreq table +allocate it once(one freq table for all CPUs) and free them +once the last user is done with it. + +Signed-off-by: Nishanth Menon +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/omap2plus-cpufreq.c | 33 ++++++++++++++++++++++++------ + 1 files changed, 26 insertions(+), 7 deletions(-) + +diff --git a/arch/arm/mach-omap2/omap2plus-cpufreq.c b/arch/arm/mach-omap2/omap2plus-cpufreq.c +index d0b4f97..fc3d0fb 100644 +--- a/arch/arm/mach-omap2/omap2plus-cpufreq.c ++++ b/arch/arm/mach-omap2/omap2plus-cpufreq.c +@@ -42,6 +42,9 @@ + #define VERY_HI_RATE 900000000 + + static struct cpufreq_frequency_table *freq_table; ++static int freq_table_users; ++static DEFINE_MUTEX(freq_table_lock); ++ + static struct clk *mpu_clk; + + static int omap_verify_speed(struct cpufreq_policy *policy) +@@ -172,6 +175,18 @@ skip_lpj: + return ret; + } + ++static void freq_table_free(void) ++{ ++ if (!freq_table_users) ++ return; ++ freq_table_users--; ++ if (freq_table_users) ++ return; ++ clk_exit_cpufreq_table(&freq_table); ++ kfree(freq_table); ++ freq_table = NULL; ++} ++ + static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) + { + int result = 0; +@@ -199,14 +214,18 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) + return -EINVAL; + } + ++ mutex_lock(&freq_table_lock); + /* + * if we dont get cpufreq table using opp, use traditional omap2 lookup + * as a fallback + */ +- if (opp_init_cpufreq_table(mpu_dev, &freq_table)) +- clk_init_cpufreq_table(&freq_table); ++ if (!freq_table) { ++ if (opp_init_cpufreq_table(mpu_dev, &freq_table)) ++ clk_init_cpufreq_table(&freq_table); ++ } + + if (freq_table) { ++ freq_table_users++; + result = cpufreq_frequency_table_cpuinfo(policy, freq_table); + if (!result) { + cpufreq_frequency_table_get_attr(freq_table, +@@ -215,10 +234,10 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) + clk_exit_cpufreq_table(&freq_table); + WARN(true, "%s: fallback to clk_round(freq_table=%d)\n", + __func__, result); +- kfree(freq_table); +- freq_table = NULL; ++ freq_table_free(); + } + } ++ mutex_unlock(&freq_table_lock); + + if (!freq_table) { + policy->cpuinfo.min_freq = clk_round_rate(mpu_clk, 0) / 1000; +@@ -251,9 +270,9 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) + + static int omap_cpu_exit(struct cpufreq_policy *policy) + { +- clk_exit_cpufreq_table(&freq_table); +- kfree(freq_table); +- freq_table = NULL; ++ mutex_lock(&freq_table_lock); ++ freq_table_free(); ++ mutex_unlock(&freq_table_lock); + clk_put(mpu_clk); + return 0; + } +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-hotplug/0001-cpufreq-helpers-for-walking-the-frequency-table.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-hotplug/0001-cpufreq-helpers-for-walking-the-frequency-table.patch new file mode 100644 index 0000000000..e8a250b387 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-hotplug/0001-cpufreq-helpers-for-walking-the-frequency-table.patch @@ -0,0 +1,134 @@ +From b581872eacd6342a890b1c6d2596c16fac5875b5 Mon Sep 17 00:00:00 2001 +From: Mike Turquette +Date: Tue, 17 May 2011 09:35:54 -0500 +Subject: [PATCH 1/2] cpufreq: helpers for walking the frequency table + +Two new functions for getting the next higher and next lower frequencies +in the cpufreq table, based upon a frequency supplied in kHz. + +This is useful for cpufreq governors that do not target frequencies +based upon a percentage or a pre-determined value, but instead access +the cpufreq table directly. + +Signed-off-by: Mike Turquette +Signed-off-by: Santosh Shilimkar +Signed-off-by: Koen Kooi +--- + drivers/cpufreq/freq_table.c | 73 ++++++++++++++++++++++++++++++++++++++++++ + include/linux/cpufreq.h | 9 +++++ + 2 files changed, 82 insertions(+), 0 deletions(-) + +diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c +index 0543221..11a307b 100644 +--- a/drivers/cpufreq/freq_table.c ++++ b/drivers/cpufreq/freq_table.c +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #define dprintk(msg...) \ + cpufreq_debug_printk(CPUFREQ_DEBUG_CORE, "freq-table", msg) +@@ -174,6 +175,78 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy, + } + EXPORT_SYMBOL_GPL(cpufreq_frequency_table_target); + ++int cpufreq_frequency_table_next_lowest(struct cpufreq_policy *policy, ++ struct cpufreq_frequency_table *table, int *index) ++{ ++ unsigned int cur_freq; ++ unsigned int next_lowest_freq; ++ int optimal_index = -1; ++ int i = 0; ++ ++ if (!policy || IS_ERR(policy) || !table || IS_ERR(table) || ++ !index || IS_ERR(index)) ++ return -ENOMEM; ++ ++ cur_freq = policy->cur; ++ next_lowest_freq = policy->min; ++ ++ /* we're at the lowest frequency in the table already, bail out */ ++ if (cur_freq == policy->min) ++ return -EINVAL; ++ ++ /* walk the list, find closest freq to cur_freq that is below it */ ++ while(table[i].frequency != CPUFREQ_TABLE_END) { ++ if (table[i].frequency < cur_freq && ++ table[i].frequency >= next_lowest_freq) { ++ next_lowest_freq = table[i].frequency; ++ optimal_index = table[i].index; ++ } ++ ++ i++; ++ } ++ ++ *index = optimal_index; ++ ++ return 0; ++} ++EXPORT_SYMBOL_GPL(cpufreq_frequency_table_next_lowest); ++ ++int cpufreq_frequency_table_next_highest(struct cpufreq_policy *policy, ++ struct cpufreq_frequency_table *table, int *index) ++{ ++ unsigned int cur_freq; ++ unsigned int next_higher_freq; ++ int optimal_index = -1; ++ int i = 0; ++ ++ if (!policy || IS_ERR(policy) || !table || IS_ERR(table) || ++ !index || IS_ERR(index)) ++ return -ENOMEM; ++ ++ cur_freq = policy->cur; ++ next_higher_freq = policy->max; ++ ++ /* we're at the highest frequency in the table already, bail out */ ++ if (cur_freq == policy->max) ++ return -EINVAL; ++ ++ /* walk the list, find closest freq to cur_freq that is above it */ ++ while(table[i].frequency != CPUFREQ_TABLE_END) { ++ if (table[i].frequency > cur_freq && ++ table[i].frequency <= next_higher_freq) { ++ next_higher_freq = table[i].frequency; ++ optimal_index = table[i].index; ++ } ++ ++ i++; ++ } ++ ++ *index = optimal_index; ++ ++ return 0; ++} ++EXPORT_SYMBOL_GPL(cpufreq_frequency_table_next_highest); ++ + static DEFINE_PER_CPU(struct cpufreq_frequency_table *, cpufreq_show_table); + /** + * show_available_freqs - show available frequencies for the specified CPU +diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h +index 9343dd3..a38fca8 100644 +--- a/include/linux/cpufreq.h ++++ b/include/linux/cpufreq.h +@@ -396,6 +396,15 @@ void cpufreq_frequency_table_get_attr(struct cpufreq_frequency_table *table, + + void cpufreq_frequency_table_put_attr(unsigned int cpu); + ++/* the following are for use in governors, or anywhere else */ ++extern int cpufreq_frequency_table_next_lowest(struct cpufreq_policy *policy, ++ struct cpufreq_frequency_table *table, ++ int *index); ++ ++extern int cpufreq_frequency_table_next_highest(struct cpufreq_policy *policy, ++ struct cpufreq_frequency_table *table, ++ int *index); ++ + + /********************************************************************* + * UNIFIED DEBUG HELPERS * +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-hotplug/0002-cpufreq-introduce-hotplug-governor.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-hotplug/0002-cpufreq-introduce-hotplug-governor.patch new file mode 100644 index 0000000000..96154e9beb --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-hotplug/0002-cpufreq-introduce-hotplug-governor.patch @@ -0,0 +1,879 @@ +From 0faab5e374817718add80a132f6fc90943971a61 Mon Sep 17 00:00:00 2001 +From: Mike Turquette +Date: Tue, 17 May 2011 09:43:09 -0500 +Subject: [PATCH 2/2] cpufreq: introduce hotplug governor + +The "hotplug" governor scales CPU frequency based on load, similar to +"ondemand". It scales up to the highest frequency when "up_threshold" +is crossed and scales down one frequency at a time when "down_threshold" +is crossed. Unlike those governors, target frequencies are determined +by directly accessing the CPUfreq frequency table, instead of taking +some percentage of maximum available frequency. + +The key difference in the "hotplug" governor is that it will disable +auxillary CPUs when the system is very idle, and enable them again once +the system becomes busy. This is achieved by averaging load over +multiple sampling periods; if CPUs were online or offlined based on a +single sampling period then thrashing will occur. + +Sysfs entries exist for "hotplug_in_sampling_periods" and for +"hotplug_out_sampling_periods" which determine how many consecutive +periods get averaged to determine if auxillery CPUs should be onlined or +offlined. Defaults are 5 periods and 20 periods respectively. +Otherwise the standard sysfs entries you might find for "ondemand" and +"conservative" governors are there. + +To use this governor it is assumed that your CPUfreq driver has +populated the CPUfreq table, CONFIG_NO_HZ is enabled and +CONFIG_HOTPLUG_CPU is enabled. + +Changes in V2: + Corrected default sampling periods + Optimized load history array resizing + Maintain load history when resizing array + Add locking to dbs_check_cpu + Switch from enable_nonboot_cpus to cpu_up + Switch from disable_nonboot_cpus to down_cpu + Fix some printks + Coding style around for-loops + +Signed-off-by: Mike Turquette +Signed-off-by: Santosh Shilimkar +Signed-off-by: Koen Kooi +--- + Documentation/cpu-freq/governors.txt | 28 ++ + drivers/cpufreq/Kconfig | 33 ++ + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/cpufreq_hotplug.c | 705 ++++++++++++++++++++++++++++++++++ + include/linux/cpufreq.h | 3 + + 5 files changed, 770 insertions(+), 0 deletions(-) + create mode 100644 drivers/cpufreq/cpufreq_hotplug.c + +diff --git a/Documentation/cpu-freq/governors.txt b/Documentation/cpu-freq/governors.txt +index e74d0a2..c2e3d3d 100644 +--- a/Documentation/cpu-freq/governors.txt ++++ b/Documentation/cpu-freq/governors.txt +@@ -193,6 +193,34 @@ governor but for the opposite direction. For example when set to its + default value of '20' it means that if the CPU usage needs to be below + 20% between samples to have the frequency decreased. + ++ ++2.6 Hotplug ++----------- ++ ++The CPUfreq governor "hotplug" operates similary to "ondemand" and ++"conservative". It's decisions are based primarily on CPU load. Like ++"ondemand" the "hotplug" governor will ramp up to the highest frequency ++once the run-time tunable "up_threshold" parameter is crossed. Like ++"conservative", the "hotplug" governor exports a "down_threshold" ++parameter that is also tunable at run-time. When the "down_threshold" ++is crossed the CPU transitions to the next lowest frequency in the ++CPUfreq frequency table instead of decrementing the frequency based on a ++percentage of maximum load. ++ ++The main reason "hotplug" governor exists is for architectures requiring ++that only the master CPU be online in order to hit low-power states ++(C-states). OMAP4 is one such example of this. The "hotplug" governor ++is also helpful in reducing thermal output in devices with tight thermal ++constraints. ++ ++Auxillary CPUs are onlined/offline based on CPU load, but the decision ++to do so is made after averaging several sampling windows. This is to ++reduce CPU hotplug "thrashing", which can be caused by normal system ++entropy and leads to lots of spurious plug-in and plug-out transitions. ++The number of sampling periods averaged together is tunable via the ++"hotplug_in_sampling_periods" and "hotplug_out_sampling_periods" ++run-time tunable parameters. ++ + 3. The Governor Interface in the CPUfreq Core + ============================================= + +diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig +index ca8ee80..c716a0e 100644 +--- a/drivers/cpufreq/Kconfig ++++ b/drivers/cpufreq/Kconfig +@@ -110,6 +110,19 @@ config CPU_FREQ_DEFAULT_GOV_CONSERVATIVE + Be aware that not all cpufreq drivers support the conservative + governor. If unsure have a look at the help section of the + driver. Fallback governor will be the performance governor. ++ ++config CPU_FREQ_DEFAULT_GOV_HOTPLUG ++ bool "hotplug" ++ select CPU_FREQ_GOV_HOTPLUG ++ select CPU_FREQ_GOV_PERFORMANCE ++ help ++ Use the CPUFreq governor 'hotplug' as default. This allows you ++ to get a full dynamic frequency capable system with CPU ++ hotplug support by simply loading your cpufreq low-level ++ hardware driver. Be aware that not all cpufreq drivers ++ support the hotplug governor. If unsure have a look at ++ the help section of the driver. Fallback governor will be the ++ performance governor. + endchoice + + config CPU_FREQ_GOV_PERFORMANCE +@@ -190,4 +203,24 @@ config CPU_FREQ_GOV_CONSERVATIVE + + If in doubt, say N. + ++config CPU_FREQ_GOV_HOTPLUG ++ tristate "'hotplug' cpufreq governor" ++ depends on CPU_FREQ && NO_HZ && HOTPLUG_CPU ++ help ++ 'hotplug' - this driver mimics the frequency scaling behavior ++ in 'ondemand', but with several key differences. First is ++ that frequency transitions use the CPUFreq table directly, ++ instead of incrementing in a percentage of the maximum ++ available frequency. Second 'hotplug' will offline auxillary ++ CPUs when the system is idle, and online those CPUs once the ++ system becomes busy again. This last feature is needed for ++ architectures which transition to low power states when only ++ the "master" CPU is online, or for thermally constrained ++ devices. ++ ++ If you don't have one of these architectures or devices, use ++ 'ondemand' instead. ++ ++ If in doubt, say N. ++ + endif # CPU_FREQ +diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile +index 71fc3b4..05d564c 100644 +--- a/drivers/cpufreq/Makefile ++++ b/drivers/cpufreq/Makefile +@@ -9,6 +9,7 @@ obj-$(CONFIG_CPU_FREQ_GOV_POWERSAVE) += cpufreq_powersave.o + obj-$(CONFIG_CPU_FREQ_GOV_USERSPACE) += cpufreq_userspace.o + obj-$(CONFIG_CPU_FREQ_GOV_ONDEMAND) += cpufreq_ondemand.o + obj-$(CONFIG_CPU_FREQ_GOV_CONSERVATIVE) += cpufreq_conservative.o ++obj-$(CONFIG_CPU_FREQ_GOV_HOTPLUG) += cpufreq_hotplug.o + + # CPUfreq cross-arch helpers + obj-$(CONFIG_CPU_FREQ_TABLE) += freq_table.o +diff --git a/drivers/cpufreq/cpufreq_hotplug.c b/drivers/cpufreq/cpufreq_hotplug.c +new file mode 100644 +index 0000000..85aa6d2 +--- /dev/null ++++ b/drivers/cpufreq/cpufreq_hotplug.c +@@ -0,0 +1,705 @@ ++/* ++ * CPUFreq hotplug governor ++ * ++ * Copyright (C) 2010 Texas Instruments, Inc. ++ * Mike Turquette ++ * Santosh Shilimkar ++ * ++ * Based on ondemand governor ++ * Copyright (C) 2001 Russell King ++ * (C) 2003 Venkatesh Pallipadi , ++ * Jun Nakajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* greater than 80% avg load across online CPUs increases frequency */ ++#define DEFAULT_UP_FREQ_MIN_LOAD (80) ++ ++/* less than 20% avg load across online CPUs decreases frequency */ ++#define DEFAULT_DOWN_FREQ_MAX_LOAD (20) ++ ++/* default sampling period (uSec) is bogus; 10x ondemand's default for x86 */ ++#define DEFAULT_SAMPLING_PERIOD (100000) ++ ++/* default number of sampling periods to average before hotplug-in decision */ ++#define DEFAULT_HOTPLUG_IN_SAMPLING_PERIODS (5) ++ ++/* default number of sampling periods to average before hotplug-out decision */ ++#define DEFAULT_HOTPLUG_OUT_SAMPLING_PERIODS (20) ++ ++static void do_dbs_timer(struct work_struct *work); ++static int cpufreq_governor_dbs(struct cpufreq_policy *policy, ++ unsigned int event); ++ ++#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_HOTPLUG ++static ++#endif ++struct cpufreq_governor cpufreq_gov_hotplug = { ++ .name = "hotplug", ++ .governor = cpufreq_governor_dbs, ++ .owner = THIS_MODULE, ++}; ++ ++struct cpu_dbs_info_s { ++ cputime64_t prev_cpu_idle; ++ cputime64_t prev_cpu_wall; ++ cputime64_t prev_cpu_nice; ++ struct cpufreq_policy *cur_policy; ++ struct delayed_work work; ++ struct cpufreq_frequency_table *freq_table; ++ int cpu; ++ /* ++ * percpu mutex that serializes governor limit change with ++ * do_dbs_timer invocation. We do not want do_dbs_timer to run ++ * when user is changing the governor or limits. ++ */ ++ struct mutex timer_mutex; ++}; ++static DEFINE_PER_CPU(struct cpu_dbs_info_s, hp_cpu_dbs_info); ++ ++static unsigned int dbs_enable; /* number of CPUs using this policy */ ++ ++/* ++ * dbs_mutex protects data in dbs_tuners_ins from concurrent changes on ++ * different CPUs. It protects dbs_enable in governor start/stop. ++ */ ++static DEFINE_MUTEX(dbs_mutex); ++ ++static struct workqueue_struct *khotplug_wq; ++ ++static struct dbs_tuners { ++ unsigned int sampling_rate; ++ unsigned int up_threshold; ++ unsigned int down_threshold; ++ unsigned int hotplug_in_sampling_periods; ++ unsigned int hotplug_out_sampling_periods; ++ unsigned int hotplug_load_index; ++ unsigned int *hotplug_load_history; ++ unsigned int ignore_nice; ++ unsigned int io_is_busy; ++} dbs_tuners_ins = { ++ .sampling_rate = DEFAULT_SAMPLING_PERIOD, ++ .up_threshold = DEFAULT_UP_FREQ_MIN_LOAD, ++ .down_threshold = DEFAULT_DOWN_FREQ_MAX_LOAD, ++ .hotplug_in_sampling_periods = DEFAULT_HOTPLUG_IN_SAMPLING_PERIODS, ++ .hotplug_out_sampling_periods = DEFAULT_HOTPLUG_OUT_SAMPLING_PERIODS, ++ .hotplug_load_index = 0, ++ .ignore_nice = 0, ++ .io_is_busy = 0, ++}; ++ ++/* ++ * A corner case exists when switching io_is_busy at run-time: comparing idle ++ * times from a non-io_is_busy period to an io_is_busy period (or vice-versa) ++ * will misrepresent the actual change in system idleness. We ignore this ++ * corner case: enabling io_is_busy might cause freq increase and disabling ++ * might cause freq decrease, which probably matches the original intent. ++ */ ++static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall) ++{ ++ u64 idle_time; ++ u64 iowait_time; ++ ++ /* cpufreq-hotplug always assumes CONFIG_NO_HZ */ ++ idle_time = get_cpu_idle_time_us(cpu, wall); ++ ++ /* add time spent doing I/O to idle time */ ++ if (dbs_tuners_ins.io_is_busy) { ++ iowait_time = get_cpu_iowait_time_us(cpu, wall); ++ /* cpufreq-hotplug always assumes CONFIG_NO_HZ */ ++ if (iowait_time != -1ULL && idle_time >= iowait_time) ++ idle_time -= iowait_time; ++ } ++ ++ return idle_time; ++} ++ ++/************************** sysfs interface ************************/ ++ ++/* XXX look at global sysfs macros in cpufreq.h, can those be used here? */ ++ ++/* cpufreq_hotplug Governor Tunables */ ++#define show_one(file_name, object) \ ++static ssize_t show_##file_name \ ++(struct kobject *kobj, struct attribute *attr, char *buf) \ ++{ \ ++ return sprintf(buf, "%u\n", dbs_tuners_ins.object); \ ++} ++show_one(sampling_rate, sampling_rate); ++show_one(up_threshold, up_threshold); ++show_one(down_threshold, down_threshold); ++show_one(hotplug_in_sampling_periods, hotplug_in_sampling_periods); ++show_one(hotplug_out_sampling_periods, hotplug_out_sampling_periods); ++show_one(ignore_nice_load, ignore_nice); ++show_one(io_is_busy, io_is_busy); ++ ++static ssize_t store_sampling_rate(struct kobject *a, struct attribute *b, ++ const char *buf, size_t count) ++{ ++ unsigned int input; ++ int ret; ++ ret = sscanf(buf, "%u", &input); ++ if (ret != 1) ++ return -EINVAL; ++ ++ mutex_lock(&dbs_mutex); ++ dbs_tuners_ins.sampling_rate = input; ++ mutex_unlock(&dbs_mutex); ++ ++ return count; ++} ++ ++static ssize_t store_up_threshold(struct kobject *a, struct attribute *b, ++ const char *buf, size_t count) ++{ ++ unsigned int input; ++ int ret; ++ ret = sscanf(buf, "%u", &input); ++ ++ if (ret != 1 || input <= dbs_tuners_ins.down_threshold) { ++ return -EINVAL; ++ } ++ ++ mutex_lock(&dbs_mutex); ++ dbs_tuners_ins.up_threshold = input; ++ mutex_unlock(&dbs_mutex); ++ ++ return count; ++} ++ ++static ssize_t store_down_threshold(struct kobject *a, struct attribute *b, ++ const char *buf, size_t count) ++{ ++ unsigned int input; ++ int ret; ++ ret = sscanf(buf, "%u", &input); ++ ++ if (ret != 1 || input >= dbs_tuners_ins.up_threshold) { ++ return -EINVAL; ++ } ++ ++ mutex_lock(&dbs_mutex); ++ dbs_tuners_ins.down_threshold = input; ++ mutex_unlock(&dbs_mutex); ++ ++ return count; ++} ++ ++static ssize_t store_hotplug_in_sampling_periods(struct kobject *a, ++ struct attribute *b, const char *buf, size_t count) ++{ ++ unsigned int input; ++ unsigned int *temp; ++ unsigned int max_windows; ++ int ret; ++ ret = sscanf(buf, "%u", &input); ++ ++ if (ret != 1) ++ return -EINVAL; ++ ++ /* already using this value, bail out */ ++ if (input == dbs_tuners_ins.hotplug_in_sampling_periods) ++ return count; ++ ++ mutex_lock(&dbs_mutex); ++ ret = count; ++ max_windows = max(dbs_tuners_ins.hotplug_in_sampling_periods, ++ dbs_tuners_ins.hotplug_out_sampling_periods); ++ ++ /* no need to resize array */ ++ if (input <= max_windows) { ++ dbs_tuners_ins.hotplug_in_sampling_periods = input; ++ goto out; ++ } ++ ++ /* resize array */ ++ temp = kmalloc((sizeof(unsigned int) * input), GFP_KERNEL); ++ ++ if (!temp || IS_ERR(temp)) { ++ ret = -ENOMEM; ++ goto out; ++ } ++ ++ memcpy(temp, dbs_tuners_ins.hotplug_load_history, ++ (max_windows * sizeof(unsigned int))); ++ kfree(dbs_tuners_ins.hotplug_load_history); ++ ++ /* replace old buffer, old number of sampling periods & old index */ ++ dbs_tuners_ins.hotplug_load_history = temp; ++ dbs_tuners_ins.hotplug_in_sampling_periods = input; ++ dbs_tuners_ins.hotplug_load_index = max_windows; ++out: ++ mutex_unlock(&dbs_mutex); ++ ++ return ret; ++} ++ ++static ssize_t store_hotplug_out_sampling_periods(struct kobject *a, ++ struct attribute *b, const char *buf, size_t count) ++{ ++ unsigned int input; ++ unsigned int *temp; ++ unsigned int max_windows; ++ int ret; ++ ret = sscanf(buf, "%u", &input); ++ ++ if (ret != 1) ++ return -EINVAL; ++ ++ /* already using this value, bail out */ ++ if (input == dbs_tuners_ins.hotplug_out_sampling_periods) ++ return count; ++ ++ mutex_lock(&dbs_mutex); ++ ret = count; ++ max_windows = max(dbs_tuners_ins.hotplug_in_sampling_periods, ++ dbs_tuners_ins.hotplug_out_sampling_periods); ++ ++ /* no need to resize array */ ++ if (input <= max_windows) { ++ dbs_tuners_ins.hotplug_out_sampling_periods = input; ++ goto out; ++ } ++ ++ /* resize array */ ++ temp = kmalloc((sizeof(unsigned int) * input), GFP_KERNEL); ++ ++ if (!temp || IS_ERR(temp)) { ++ ret = -ENOMEM; ++ goto out; ++ } ++ ++ memcpy(temp, dbs_tuners_ins.hotplug_load_history, ++ (max_windows * sizeof(unsigned int))); ++ kfree(dbs_tuners_ins.hotplug_load_history); ++ ++ /* replace old buffer, old number of sampling periods & old index */ ++ dbs_tuners_ins.hotplug_load_history = temp; ++ dbs_tuners_ins.hotplug_out_sampling_periods = input; ++ dbs_tuners_ins.hotplug_load_index = max_windows; ++out: ++ mutex_unlock(&dbs_mutex); ++ ++ return ret; ++} ++ ++static ssize_t store_ignore_nice_load(struct kobject *a, struct attribute *b, ++ const char *buf, size_t count) ++{ ++ unsigned int input; ++ int ret; ++ ++ unsigned int j; ++ ++ ret = sscanf(buf, "%u", &input); ++ if (ret != 1) ++ return -EINVAL; ++ ++ if (input > 1) ++ input = 1; ++ ++ mutex_lock(&dbs_mutex); ++ if (input == dbs_tuners_ins.ignore_nice) { /* nothing to do */ ++ mutex_unlock(&dbs_mutex); ++ return count; ++ } ++ dbs_tuners_ins.ignore_nice = input; ++ ++ /* we need to re-evaluate prev_cpu_idle */ ++ for_each_online_cpu(j) { ++ struct cpu_dbs_info_s *dbs_info; ++ dbs_info = &per_cpu(hp_cpu_dbs_info, j); ++ dbs_info->prev_cpu_idle = get_cpu_idle_time(j, ++ &dbs_info->prev_cpu_wall); ++ if (dbs_tuners_ins.ignore_nice) ++ dbs_info->prev_cpu_nice = kstat_cpu(j).cpustat.nice; ++ ++ } ++ mutex_unlock(&dbs_mutex); ++ ++ return count; ++} ++ ++static ssize_t store_io_is_busy(struct kobject *a, struct attribute *b, ++ const char *buf, size_t count) ++{ ++ unsigned int input; ++ int ret; ++ ++ ret = sscanf(buf, "%u", &input); ++ if (ret != 1) ++ return -EINVAL; ++ ++ mutex_lock(&dbs_mutex); ++ dbs_tuners_ins.io_is_busy = !!input; ++ mutex_unlock(&dbs_mutex); ++ ++ return count; ++} ++ ++define_one_global_rw(sampling_rate); ++define_one_global_rw(up_threshold); ++define_one_global_rw(down_threshold); ++define_one_global_rw(hotplug_in_sampling_periods); ++define_one_global_rw(hotplug_out_sampling_periods); ++define_one_global_rw(ignore_nice_load); ++define_one_global_rw(io_is_busy); ++ ++static struct attribute *dbs_attributes[] = { ++ &sampling_rate.attr, ++ &up_threshold.attr, ++ &down_threshold.attr, ++ &hotplug_in_sampling_periods.attr, ++ &hotplug_out_sampling_periods.attr, ++ &ignore_nice_load.attr, ++ &io_is_busy.attr, ++ NULL ++}; ++ ++static struct attribute_group dbs_attr_group = { ++ .attrs = dbs_attributes, ++ .name = "hotplug", ++}; ++ ++/************************** sysfs end ************************/ ++ ++static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) ++{ ++ /* combined load of all enabled CPUs */ ++ unsigned int total_load = 0; ++ /* single largest CPU load */ ++ unsigned int max_load = 0; ++ /* average load across all enabled CPUs */ ++ unsigned int avg_load = 0; ++ /* average load across multiple sampling periods for hotplug events */ ++ unsigned int hotplug_in_avg_load = 0; ++ unsigned int hotplug_out_avg_load = 0; ++ /* number of sampling periods averaged for hotplug decisions */ ++ unsigned int periods; ++ ++ struct cpufreq_policy *policy; ++ unsigned int index = 0; ++ unsigned int i, j; ++ ++ policy = this_dbs_info->cur_policy; ++ ++ /* ++ * cpu load accounting ++ * get highest load, total load and average load across all CPUs ++ */ ++ for_each_cpu(j, policy->cpus) { ++ unsigned int load; ++ unsigned int idle_time, wall_time; ++ cputime64_t cur_wall_time, cur_idle_time; ++ struct cpu_dbs_info_s *j_dbs_info; ++ ++ j_dbs_info = &per_cpu(hp_cpu_dbs_info, j); ++ ++ /* update both cur_idle_time and cur_wall_time */ ++ cur_idle_time = get_cpu_idle_time(j, &cur_wall_time); ++ ++ /* how much wall time has passed since last iteration? */ ++ wall_time = (unsigned int) cputime64_sub(cur_wall_time, ++ j_dbs_info->prev_cpu_wall); ++ j_dbs_info->prev_cpu_wall = cur_wall_time; ++ ++ /* how much idle time has passed since last iteration? */ ++ idle_time = (unsigned int) cputime64_sub(cur_idle_time, ++ j_dbs_info->prev_cpu_idle); ++ j_dbs_info->prev_cpu_idle = cur_idle_time; ++ ++ if (unlikely(!wall_time || wall_time < idle_time)) ++ continue; ++ ++ /* load is the percentage of time not spent in idle */ ++ load = 100 * (wall_time - idle_time) / wall_time; ++ ++ /* keep track of combined load across all CPUs */ ++ total_load += load; ++ ++ /* keep track of highest single load across all CPUs */ ++ if (load > max_load) ++ max_load = load; ++ } ++ ++ /* calculate the average load across all related CPUs */ ++ avg_load = total_load / num_online_cpus(); ++ ++ ++ /* ++ * hotplug load accounting ++ * average load over multiple sampling periods ++ */ ++ ++ /* how many sampling periods do we use for hotplug decisions? */ ++ periods = max(dbs_tuners_ins.hotplug_in_sampling_periods, ++ dbs_tuners_ins.hotplug_out_sampling_periods); ++ ++ /* store avg_load in the circular buffer */ ++ dbs_tuners_ins.hotplug_load_history[dbs_tuners_ins.hotplug_load_index] ++ = avg_load; ++ ++ /* compute average load across in & out sampling periods */ ++ for (i = 0, j = dbs_tuners_ins.hotplug_load_index; ++ i < periods; i++, j--) { ++ if (i < dbs_tuners_ins.hotplug_in_sampling_periods) ++ hotplug_in_avg_load += ++ dbs_tuners_ins.hotplug_load_history[j]; ++ if (i < dbs_tuners_ins.hotplug_out_sampling_periods) ++ hotplug_out_avg_load += ++ dbs_tuners_ins.hotplug_load_history[j]; ++ ++ if (j == 0) ++ j = periods; ++ } ++ ++ hotplug_in_avg_load = hotplug_in_avg_load / ++ dbs_tuners_ins.hotplug_in_sampling_periods; ++ ++ hotplug_out_avg_load = hotplug_out_avg_load / ++ dbs_tuners_ins.hotplug_out_sampling_periods; ++ ++ /* return to first element if we're at the circular buffer's end */ ++ if (++dbs_tuners_ins.hotplug_load_index == periods) ++ dbs_tuners_ins.hotplug_load_index = 0; ++ ++ /* check for frequency increase */ ++ if (avg_load > dbs_tuners_ins.up_threshold) { ++ /* should we enable auxillary CPUs? */ ++ if (num_online_cpus() < 2 && hotplug_in_avg_load > ++ dbs_tuners_ins.up_threshold) { ++ /* hotplug with cpufreq is nasty ++ * a call to cpufreq_governor_dbs may cause a lockup. ++ * wq is not running here so its safe. ++ */ ++ mutex_unlock(&this_dbs_info->timer_mutex); ++ cpu_up(1); ++ mutex_lock(&this_dbs_info->timer_mutex); ++ goto out; ++ } ++ ++ /* increase to highest frequency supported */ ++ if (policy->cur < policy->max) ++ __cpufreq_driver_target(policy, policy->max, ++ CPUFREQ_RELATION_H); ++ ++ goto out; ++ } ++ ++ /* check for frequency decrease */ ++ if (avg_load < dbs_tuners_ins.down_threshold) { ++ /* are we at the minimum frequency already? */ ++ if (policy->cur == policy->min) { ++ /* should we disable auxillary CPUs? */ ++ if (num_online_cpus() > 1 && hotplug_out_avg_load < ++ dbs_tuners_ins.down_threshold) { ++ mutex_unlock(&this_dbs_info->timer_mutex); ++ cpu_down(1); ++ mutex_lock(&this_dbs_info->timer_mutex); ++ } ++ goto out; ++ } ++ ++ /* bump down to the next lowest frequency in the table */ ++ if (cpufreq_frequency_table_next_lowest(policy, ++ this_dbs_info->freq_table, &index)) { ++ pr_err("%s: failed to get next lowest frequency\n", ++ __func__); ++ goto out; ++ } ++ ++ __cpufreq_driver_target(policy, ++ this_dbs_info->freq_table[index].frequency, ++ CPUFREQ_RELATION_L); ++ } ++out: ++ return; ++} ++ ++static void do_dbs_timer(struct work_struct *work) ++{ ++ struct cpu_dbs_info_s *dbs_info = ++ container_of(work, struct cpu_dbs_info_s, work.work); ++ unsigned int cpu = dbs_info->cpu; ++ ++ /* We want all related CPUs to do sampling nearly on same jiffy */ ++ int delay = usecs_to_jiffies(dbs_tuners_ins.sampling_rate); ++ ++ mutex_lock(&dbs_info->timer_mutex); ++ dbs_check_cpu(dbs_info); ++ queue_delayed_work_on(cpu, khotplug_wq, &dbs_info->work, delay); ++ mutex_unlock(&dbs_info->timer_mutex); ++} ++ ++static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info) ++{ ++ /* We want all related CPUs to do sampling nearly on same jiffy */ ++ int delay = usecs_to_jiffies(dbs_tuners_ins.sampling_rate); ++ delay -= jiffies % delay; ++ ++ INIT_DELAYED_WORK_DEFERRABLE(&dbs_info->work, do_dbs_timer); ++ queue_delayed_work_on(dbs_info->cpu, khotplug_wq, &dbs_info->work, ++ delay); ++} ++ ++static inline void dbs_timer_exit(struct cpu_dbs_info_s *dbs_info) ++{ ++ cancel_delayed_work_sync(&dbs_info->work); ++} ++ ++static int cpufreq_governor_dbs(struct cpufreq_policy *policy, ++ unsigned int event) ++{ ++ unsigned int cpu = policy->cpu; ++ struct cpu_dbs_info_s *this_dbs_info; ++ unsigned int i, j, max_periods; ++ int rc; ++ ++ this_dbs_info = &per_cpu(hp_cpu_dbs_info, cpu); ++ ++ switch (event) { ++ case CPUFREQ_GOV_START: ++ if ((!cpu_online(cpu)) || (!policy->cur)) ++ return -EINVAL; ++ ++ mutex_lock(&dbs_mutex); ++ dbs_enable++; ++ for_each_cpu(j, policy->cpus) { ++ struct cpu_dbs_info_s *j_dbs_info; ++ j_dbs_info = &per_cpu(hp_cpu_dbs_info, j); ++ j_dbs_info->cur_policy = policy; ++ ++ j_dbs_info->prev_cpu_idle = get_cpu_idle_time(j, ++ &j_dbs_info->prev_cpu_wall); ++ if (dbs_tuners_ins.ignore_nice) { ++ j_dbs_info->prev_cpu_nice = ++ kstat_cpu(j).cpustat.nice; ++ } ++ ++ max_periods = max(DEFAULT_HOTPLUG_IN_SAMPLING_PERIODS, ++ DEFAULT_HOTPLUG_OUT_SAMPLING_PERIODS); ++ dbs_tuners_ins.hotplug_load_history = kmalloc( ++ (sizeof(unsigned int) * max_periods), ++ GFP_KERNEL); ++ if (!dbs_tuners_ins.hotplug_load_history) { ++ WARN_ON(1); ++ return -ENOMEM; ++ } ++ for (i = 0; i < max_periods; i++) ++ dbs_tuners_ins.hotplug_load_history[i] = 50; ++ } ++ this_dbs_info->cpu = cpu; ++ this_dbs_info->freq_table = cpufreq_frequency_get_table(cpu); ++ /* ++ * Start the timerschedule work, when this governor ++ * is used for first time ++ */ ++ if (dbs_enable == 1) { ++ rc = sysfs_create_group(cpufreq_global_kobject, ++ &dbs_attr_group); ++ if (rc) { ++ mutex_unlock(&dbs_mutex); ++ return rc; ++ } ++ } ++ mutex_unlock(&dbs_mutex); ++ ++ mutex_init(&this_dbs_info->timer_mutex); ++ dbs_timer_init(this_dbs_info); ++ break; ++ ++ case CPUFREQ_GOV_STOP: ++ dbs_timer_exit(this_dbs_info); ++ ++ mutex_lock(&dbs_mutex); ++ mutex_destroy(&this_dbs_info->timer_mutex); ++ dbs_enable--; ++ mutex_unlock(&dbs_mutex); ++ if (!dbs_enable) ++ sysfs_remove_group(cpufreq_global_kobject, ++ &dbs_attr_group); ++ kfree(dbs_tuners_ins.hotplug_load_history); ++ /* ++ * XXX BIG CAVEAT: Stopping the governor with CPU1 offline ++ * will result in it remaining offline until the user onlines ++ * it again. It is up to the user to do this (for now). ++ */ ++ break; ++ ++ case CPUFREQ_GOV_LIMITS: ++ mutex_lock(&this_dbs_info->timer_mutex); ++ if (policy->max < this_dbs_info->cur_policy->cur) ++ __cpufreq_driver_target(this_dbs_info->cur_policy, ++ policy->max, CPUFREQ_RELATION_H); ++ else if (policy->min > this_dbs_info->cur_policy->cur) ++ __cpufreq_driver_target(this_dbs_info->cur_policy, ++ policy->min, CPUFREQ_RELATION_L); ++ mutex_unlock(&this_dbs_info->timer_mutex); ++ break; ++ } ++ return 0; ++} ++ ++static int __init cpufreq_gov_dbs_init(void) ++{ ++ int err; ++ cputime64_t wall; ++ u64 idle_time; ++ int cpu = get_cpu(); ++ ++ idle_time = get_cpu_idle_time_us(cpu, &wall); ++ put_cpu(); ++ if (idle_time != -1ULL) { ++ dbs_tuners_ins.up_threshold = DEFAULT_UP_FREQ_MIN_LOAD; ++ } else { ++ pr_err("cpufreq-hotplug: %s: assumes CONFIG_NO_HZ\n", ++ __func__); ++ return -EINVAL; ++ } ++ ++ khotplug_wq = create_workqueue("khotplug"); ++ if (!khotplug_wq) { ++ pr_err("Creation of khotplug failed\n"); ++ return -EFAULT; ++ } ++ err = cpufreq_register_governor(&cpufreq_gov_hotplug); ++ if (err) ++ destroy_workqueue(khotplug_wq); ++ ++ return err; ++} ++ ++static void __exit cpufreq_gov_dbs_exit(void) ++{ ++ cpufreq_unregister_governor(&cpufreq_gov_hotplug); ++ destroy_workqueue(khotplug_wq); ++} ++ ++MODULE_AUTHOR("Mike Turquette "); ++MODULE_DESCRIPTION("'cpufreq_hotplug' - cpufreq governor for dynamic frequency scaling and CPU hotplugging"); ++MODULE_LICENSE("GPL"); ++ ++#ifdef CONFIG_CPU_FREQ_DEFAULT_GOV_HOTPLUG ++fs_initcall(cpufreq_gov_dbs_init); ++#else ++module_init(cpufreq_gov_dbs_init); ++#endif ++module_exit(cpufreq_gov_dbs_exit); +diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h +index a38fca8..6cbc3df 100644 +--- a/include/linux/cpufreq.h ++++ b/include/linux/cpufreq.h +@@ -355,6 +355,9 @@ extern struct cpufreq_governor cpufreq_gov_ondemand; + #elif defined(CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE) + extern struct cpufreq_governor cpufreq_gov_conservative; + #define CPUFREQ_DEFAULT_GOVERNOR (&cpufreq_gov_conservative) ++#elif defined(CONFIG_CPU_FREQ_DEFAULT_GOV_HOTPLUG) ++extern struct cpufreq_governor cpufreq_gov_hotplug; ++#define CPUFREQ_DEFAULT_GOVERNOR (&cpufreq_gov_hotplug) + #endif + + +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0001-OMAP-CPUfreq-ensure-driver-initializes-after-cpufreq.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0001-OMAP-CPUfreq-ensure-driver-initializes-after-cpufreq.patch new file mode 100644 index 0000000000..823eff30b3 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0001-OMAP-CPUfreq-ensure-driver-initializes-after-cpufreq.patch @@ -0,0 +1,27 @@ +From a2564b1a8a946ddaf64930b48ec279b87bc758ca Mon Sep 17 00:00:00 2001 +From: Peter 'p2' De Schrijver +Date: Wed, 11 Aug 2010 17:02:43 -0700 +Subject: [PATCH 1/8] OMAP: CPUfreq: ensure driver initializes after cpufreq framework and governors + +Signed-off-by: Peter 'p2' De Schrijver +Signed-off-by: Kevin Hilman +--- + arch/arm/plat-omap/cpu-omap.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/plat-omap/cpu-omap.c b/arch/arm/plat-omap/cpu-omap.c +index da4f68d..cd09d4b 100644 +--- a/arch/arm/plat-omap/cpu-omap.c ++++ b/arch/arm/plat-omap/cpu-omap.c +@@ -160,7 +160,7 @@ static int __init omap_cpufreq_init(void) + return cpufreq_register_driver(&omap_driver); + } + +-arch_initcall(omap_cpufreq_init); ++late_initcall(omap_cpufreq_init); + + /* + * if ever we want to remove this, upon cleanup call: +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0002-OMAP-CPUfreq-ensure-policy-is-fully-initialized.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0002-OMAP-CPUfreq-ensure-policy-is-fully-initialized.patch new file mode 100644 index 0000000000..d8a0de2e0c --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0002-OMAP-CPUfreq-ensure-policy-is-fully-initialized.patch @@ -0,0 +1,31 @@ +From cb564063772d73261a8dd24d9285a37e8db49cd4 Mon Sep 17 00:00:00 2001 +From: Kevin Hilman +Date: Wed, 11 Aug 2010 17:05:38 -0700 +Subject: [PATCH 2/8] OMAP: CPUfreq: ensure policy is fully initialized + +Ensure policy min/max/cur values are initialized when OMAP +CPUfreq driver starts. + +Signed-off-by: Kevin Hilman +--- + arch/arm/plat-omap/cpu-omap.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/plat-omap/cpu-omap.c b/arch/arm/plat-omap/cpu-omap.c +index cd09d4b..1b36664 100644 +--- a/arch/arm/plat-omap/cpu-omap.c ++++ b/arch/arm/plat-omap/cpu-omap.c +@@ -126,6 +126,10 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) + VERY_HI_RATE) / 1000; + } + ++ policy->min = policy->cpuinfo.min_freq; ++ policy->max = policy->cpuinfo.max_freq; ++ policy->cur = omap_getspeed(0); ++ + /* FIXME: what's the actual transition time? */ + policy->cpuinfo.transition_latency = 300 * 1000; + +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0003-OMAP3-PM-CPUFreq-driver-for-OMAP3.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0003-OMAP3-PM-CPUFreq-driver-for-OMAP3.patch new file mode 100644 index 0000000000..7861cebfff --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0003-OMAP3-PM-CPUFreq-driver-for-OMAP3.patch @@ -0,0 +1,263 @@ +From 6702f624ad5c5e1eba57f9efe889f64333f9e022 Mon Sep 17 00:00:00 2001 +From: Rajendra Nayak +Date: Mon, 10 Nov 2008 17:00:25 +0530 +Subject: [PATCH 3/8] OMAP3 PM: CPUFreq driver for OMAP3 + +CPUFreq driver for OMAP3 + +With additional fixes and cleanups from Tero Kristo: +- Fix rate calculation bug in omap3_select_table_rate +- Refreshed DVFS VDD1 control against latest clock fw + +Signed-off-by: Tero Kristo +Signed-off-by: Rajendra Nayak + +OMAP3: PM: CPUFreq: Fix omap_getspeed. + +Signed-off-by: Peter 'p2' De Schrijver + +Make sure omap cpufreq driver initializes after cpufreq framework and governors + +Signed-off-by: Peter 'p2' De Schrijver + +merge: CPUFreq: remove obsolete funcs + +OMAP3 clock: Update cpufreq driver + +This patch removes all refrences to virtual clock +nodes in CPUFreq driver. + +Signed-off-by: Rajendra Nayak +Signed-off-by: Tero Kristo +Signed-off-by: Jean Pihet + +PM: Prevent direct cpufreq scaling during initialization + +It is seen that the OMAP specific cpufreq initialization code tries to +scale the MPU frequency to the highest possible without taking care of +the voltage level. On power on reset the power IC does not provide the +necessary voltage for the highest available MPU frequency (that would +satisfy all Si families). This potentially is an window of opportunity +for things to go wrong. + +Signed-off-by: Romit Dasgupta +Signed-off-by: Kevin Hilman + +OMAP3: PM: enable 600MHz (overdrive) OPP + +Signed-off-by: Kevin Hilman + +omap3: introduce cpufreq + +OMAP OPP layer functions now have dependencies of CONFIG_CPU_FREQ only. + +With this patch, omap opp layer now has its compilation flags +bound to CONFIG_CPU_FREQ. Also its code has been removed from pm34xx.c. + +A new file has been created to contain cpu freq code related to +OMAP3: cpufreq34xx.c + +OMAP34xx and OMAP36xx family OPPs are made available + +Signed-off-by: Eduardo Valentin +Signed-off-by: Paul Walmsley +Signed-off-by: Nishanth Menon +Signed-off-by: Vishwanath BS +Signed-off-by: Kevin Hilman +Signed-off-by: Romit Dasgupta +Signed-off-by: Rajendra Nayak + +omap3: cpufreq: allow default opp table init + +For board files which choose to override the defaults, the existing +mechanism will work, for boards that would like to work with defaults, +allow init_common_hw to call init_opp_table to initialize if not +already initialized. this will allow all omap boards which have opp +tables predefined for a silicon to use the same. + +Originally reported for overo: +http://marc.info/?t=127265269400004&r=1&w=2 + +Signed-off-by: Nishanth Menon +Reported-by: Peter Tseng +Cc: Cliff Brake +Cc: Kevin Hilman + +OMAP2: update OPP data to be device based + +Cc: Nishanth Menon +Signed-off-by: Kevin Hilman + +OMAP3: CPUfreq: update to device-based OPP API + +Update usage of OPP API to use new device-based API. This requires +getting the 'struct device' for the MPU and using that with the OPP +API. + +Signed-off-by: Kevin Hilman + +omap3: opp: make independent of cpufreq + +Make opp3xx data which is registered with the opp layer +dependent purely on CONFIG_PM as opp layer and pm.c users +are CONFIG_PM dependent not cpufreq dependent. +so we rename the data definition to opp3xxx_data.c (inline with what +we have for omap2), also move the build definition to be under +the existing CONFIG_PM build instead of CPUFREQ. + +Cc: Eduardo Valentin +Cc: Kevin Hilman +Cc: Paul Walmsley +Cc: Rajendra Nayak +Cc: Sanjeev Premi +Cc: Thara Gopinath +Cc: Tony Lindgren + +Signed-off-by: Nishanth Menon +--- + arch/arm/mach-omap2/clock.h | 14 +++++++++++++- + arch/arm/mach-omap2/clock34xx.c | 2 ++ + arch/arm/plat-omap/cpu-omap.c | 34 +++++++++++++++++++++++++++++++--- + 3 files changed, 46 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h +index e10ff2b..0a07e50 100644 +--- a/arch/arm/mach-omap2/clock.h ++++ b/arch/arm/mach-omap2/clock.h +@@ -141,7 +141,9 @@ extern const struct clksel_rate gpt_sys_rates[]; + extern const struct clksel_rate gfx_l3_rates[]; + extern const struct clksel_rate dsp_ick_rates[]; + +-#if defined(CONFIG_ARCH_OMAP2) && defined(CONFIG_CPU_FREQ) ++#ifdef CONFIG_CPU_FREQ ++ ++#ifdef CONFIG_ARCH_OMAP2 + extern void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table); + extern void omap2_clk_exit_cpufreq_table(struct cpufreq_frequency_table **table); + #else +@@ -149,6 +151,16 @@ extern void omap2_clk_exit_cpufreq_table(struct cpufreq_frequency_table **table) + #define omap2_clk_exit_cpufreq_table 0 + #endif + ++#ifdef CONFIG_ARCH_OMAP3 ++extern void omap3_clk_init_cpufreq_table(struct cpufreq_frequency_table **table); ++extern void omap3_clk_exit_cpufreq_table(struct cpufreq_frequency_table **table); ++#else ++#define omap3_clk_init_cpufreq_table 0 ++#define omap3_clk_exit_cpufreq_table 0 ++#endif ++ ++#endif /* CONFIG_CPU_FREQ */ ++ + extern const struct clkops clkops_omap2_iclk_dflt_wait; + extern const struct clkops clkops_omap2_iclk_dflt; + extern const struct clkops clkops_omap2_iclk_idle_only; +diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c +index 1fc96b9..119e135 100644 +--- a/arch/arm/mach-omap2/clock34xx.c ++++ b/arch/arm/mach-omap2/clock34xx.c +@@ -20,6 +20,8 @@ + #include + #include + #include ++#include ++#include + + #include + +diff --git a/arch/arm/plat-omap/cpu-omap.c b/arch/arm/plat-omap/cpu-omap.c +index 1b36664..f0f9430 100644 +--- a/arch/arm/plat-omap/cpu-omap.c ++++ b/arch/arm/plat-omap/cpu-omap.c +@@ -8,6 +8,10 @@ + * + * Based on cpu-sa1110.c, Copyright (C) 2001 Russell King + * ++ * Copyright (C) 2007-2008 Texas Instruments, Inc. ++ * Updated to support OMAP3 ++ * Rajendra Nayak ++ * + * 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. +@@ -26,12 +30,19 @@ + #include + #include + ++#if defined(CONFIG_ARCH_OMAP3) && !defined(CONFIG_OMAP_PM_NONE) ++#include ++#include ++#endif ++ + #define VERY_HI_RATE 900000000 + + static struct cpufreq_frequency_table *freq_table; + + #ifdef CONFIG_ARCH_OMAP1 + #define MPU_CLK "mpu" ++#elif CONFIG_ARCH_OMAP3 ++#define MPU_CLK "arm_fck" + #else + #define MPU_CLK "virt_prcm_set" + #endif +@@ -73,7 +84,13 @@ static int omap_target(struct cpufreq_policy *policy, + unsigned int target_freq, + unsigned int relation) + { ++#ifdef CONFIG_ARCH_OMAP1 + struct cpufreq_freqs freqs; ++#endif ++#if defined(CONFIG_ARCH_OMAP3) && !defined(CONFIG_OMAP_PM_NONE) ++ unsigned long freq; ++ struct device *mpu_dev = omap2_get_mpuss_device(); ++#endif + int ret = 0; + + /* Ensure desired rate is within allowed range. Some govenors +@@ -83,13 +100,13 @@ static int omap_target(struct cpufreq_policy *policy, + if (target_freq > policy->max) + target_freq = policy->max; + ++#ifdef CONFIG_ARCH_OMAP1 + freqs.old = omap_getspeed(0); + freqs.new = clk_round_rate(mpu_clk, target_freq * 1000) / 1000; + freqs.cpu = 0; + + if (freqs.old == freqs.new) + return ret; +- + cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); + #ifdef CONFIG_CPU_FREQ_DEBUG + printk(KERN_DEBUG "cpufreq-omap: transition: %u --> %u\n", +@@ -97,7 +114,11 @@ static int omap_target(struct cpufreq_policy *policy, + #endif + ret = clk_set_rate(mpu_clk, freqs.new * 1000); + cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); +- ++#elif defined(CONFIG_ARCH_OMAP3) && !defined(CONFIG_OMAP_PM_NONE) ++ freq = target_freq * 1000; ++ if (opp_find_freq_ceil(mpu_dev, &freq)) ++ omap_pm_cpu_set_freq(freq); ++#endif + return ret; + } + +@@ -114,7 +135,14 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) + + policy->cur = policy->min = policy->max = omap_getspeed(0); + +- clk_init_cpufreq_table(&freq_table); ++ if (!cpu_is_omap34xx()) { ++ clk_init_cpufreq_table(&freq_table); ++ } else { ++ struct device *mpu_dev = omap2_get_mpuss_device(); ++ ++ opp_init_cpufreq_table(mpu_dev, &freq_table); ++ } ++ + if (freq_table) { + result = cpufreq_frequency_table_cpuinfo(policy, freq_table); + if (!result) +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0004-OMAP-PM-CPUFREQ-Fix-conditional-compilation.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0004-OMAP-PM-CPUFREQ-Fix-conditional-compilation.patch new file mode 100644 index 0000000000..062c537adb --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0004-OMAP-PM-CPUFREQ-Fix-conditional-compilation.patch @@ -0,0 +1,32 @@ +From 71849b3531c66af5f925deb1deb60a3722d62463 Mon Sep 17 00:00:00 2001 +From: Silesh C V +Date: Wed, 29 Sep 2010 14:52:54 +0530 +Subject: [PATCH 4/8] OMAP: PM: CPUFREQ: Fix conditional compilation + +Fix conditional compilation. A conditional expresiion +should follow "#elif", in this case #elif clause should +check whether CONFIG_ARCH_OMAP3 is defined or not +(ie. defined(CONFIG_ARCH_OMAP3)) rather than checking for +the value of the macro. + +Signed-off-by: Silesh C V +--- + arch/arm/plat-omap/cpu-omap.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/plat-omap/cpu-omap.c b/arch/arm/plat-omap/cpu-omap.c +index f0f9430..c3ac065 100644 +--- a/arch/arm/plat-omap/cpu-omap.c ++++ b/arch/arm/plat-omap/cpu-omap.c +@@ -41,7 +41,7 @@ static struct cpufreq_frequency_table *freq_table; + + #ifdef CONFIG_ARCH_OMAP1 + #define MPU_CLK "mpu" +-#elif CONFIG_ARCH_OMAP3 ++#elif defined(CONFIG_ARCH_OMAP3) + #define MPU_CLK "arm_fck" + #else + #define MPU_CLK "virt_prcm_set" +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0005-cpufreq-fixup-after-new-OPP-layer-merged.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0005-cpufreq-fixup-after-new-OPP-layer-merged.patch new file mode 100644 index 0000000000..19432f3a2e --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0005-cpufreq-fixup-after-new-OPP-layer-merged.patch @@ -0,0 +1,33 @@ +From 6d6506387d617a934bc4f8476e8f06a11e21b043 Mon Sep 17 00:00:00 2001 +From: Kevin Hilman +Date: Tue, 16 Nov 2010 11:48:41 -0800 +Subject: [PATCH 5/8] cpufreq: fixup after new OPP layer merged + +--- + arch/arm/plat-omap/cpu-omap.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/plat-omap/cpu-omap.c b/arch/arm/plat-omap/cpu-omap.c +index c3ac065..9cd2709 100644 +--- a/arch/arm/plat-omap/cpu-omap.c ++++ b/arch/arm/plat-omap/cpu-omap.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -32,7 +33,7 @@ + + #if defined(CONFIG_ARCH_OMAP3) && !defined(CONFIG_OMAP_PM_NONE) + #include +-#include ++#include + #endif + + #define VERY_HI_RATE 900000000 +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0006-OMAP-cpufreq-Split-OMAP1-and-OMAP2PLUS-CPUfreq-drive.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0006-OMAP-cpufreq-Split-OMAP1-and-OMAP2PLUS-CPUfreq-drive.patch new file mode 100644 index 0000000000..22e93c0a9d --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0006-OMAP-cpufreq-Split-OMAP1-and-OMAP2PLUS-CPUfreq-drive.patch @@ -0,0 +1,669 @@ +From d93e9bf14c8b5194c0db64ae7daae80c228bfc04 Mon Sep 17 00:00:00 2001 +From: Santosh Shilimkar +Date: Mon, 14 Mar 2011 17:08:48 +0530 +Subject: [PATCH 6/8] OMAP: cpufreq: Split OMAP1 and OMAP2PLUS CPUfreq drivers. + +This patch is an attempt to cleanup the #ifdeferry in the +omap CPUfreq drivers. + +The split betwenn OMAP1 and OMAP2PLUS is logical because + - OMAP1 doesn't support opp layer. + - OMAP1 build is seperate from omap2plus. + +Signed-off-by: Santosh Shilimkar +Cc: Kevin Hilman +Cc: Vishwanath BS +--- + arch/arm/mach-omap1/Makefile | 3 + + arch/arm/mach-omap1/omap1-cpufreq.c | 176 ++++++++++++++++++++++++++ + arch/arm/mach-omap2/Makefile | 3 + + arch/arm/mach-omap2/omap2plus-cpufreq.c | 201 ++++++++++++++++++++++++++++++ + arch/arm/plat-omap/Makefile | 1 - + arch/arm/plat-omap/cpu-omap.c | 204 ------------------------------- + 6 files changed, 383 insertions(+), 205 deletions(-) + create mode 100644 arch/arm/mach-omap1/omap1-cpufreq.c + create mode 100644 arch/arm/mach-omap2/omap2plus-cpufreq.c + delete mode 100644 arch/arm/plat-omap/cpu-omap.c + +diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile +index af98117..e5082b0 100644 +--- a/arch/arm/mach-omap1/Makefile ++++ b/arch/arm/mach-omap1/Makefile +@@ -10,6 +10,9 @@ obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o + + obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o + ++# CPUFREQ driver ++obj-$(CONFIG_CPU_FREQ) += omap1-cpufreq.o ++ + # Power Management + obj-$(CONFIG_PM) += pm.o sleep.o pm_bus.o + +diff --git a/arch/arm/mach-omap1/omap1-cpufreq.c b/arch/arm/mach-omap1/omap1-cpufreq.c +new file mode 100644 +index 0000000..682cdc8 +--- /dev/null ++++ b/arch/arm/mach-omap1/omap1-cpufreq.c +@@ -0,0 +1,176 @@ ++/* ++ * OMAP1 cpufreq driver ++ * ++ * CPU frequency scaling for OMAP ++ * ++ * Copyright (C) 2005 Nokia Corporation ++ * Written by Tony Lindgren ++ * ++ * Based on cpu-sa1110.c, Copyright (C) 2001 Russell King ++ * ++ * Copyright (C) 2007-2008 Texas Instruments, Inc. ++ * Updated to support OMAP3 ++ * Rajendra Nayak ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include ++#include ++ ++#include ++ ++#define VERY_HI_RATE 900000000 ++ ++static struct cpufreq_frequency_table *freq_table; ++static struct clk *mpu_clk; ++ ++static int omap_verify_speed(struct cpufreq_policy *policy) ++{ ++ if (freq_table) ++ return cpufreq_frequency_table_verify(policy, freq_table); ++ ++ if (policy->cpu) ++ return -EINVAL; ++ ++ cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, ++ policy->cpuinfo.max_freq); ++ ++ policy->min = clk_round_rate(mpu_clk, policy->min * 1000) / 1000; ++ policy->max = clk_round_rate(mpu_clk, policy->max * 1000) / 1000; ++ cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, ++ policy->cpuinfo.max_freq); ++ return 0; ++} ++ ++static unsigned int omap_getspeed(unsigned int cpu) ++{ ++ unsigned long rate; ++ ++ if (cpu) ++ return 0; ++ ++ rate = clk_get_rate(mpu_clk) / 1000; ++ return rate; ++} ++ ++static int omap_target(struct cpufreq_policy *policy, ++ unsigned int target_freq, ++ unsigned int relation) ++{ ++ struct cpufreq_freqs freqs; ++ int ret = 0; ++ ++ /* Ensure desired rate is within allowed range. Some govenors ++ * (ondemand) will just pass target_freq=0 to get the minimum. */ ++ if (target_freq < policy->min) ++ target_freq = policy->min; ++ if (target_freq > policy->max) ++ target_freq = policy->max; ++ ++ freqs.old = omap_getspeed(0); ++ freqs.new = clk_round_rate(mpu_clk, target_freq * 1000) / 1000; ++ freqs.cpu = 0; ++ ++ if (freqs.old == freqs.new) ++ return ret; ++ ++ cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); ++ ++#ifdef CONFIG_CPU_FREQ_DEBUG ++ pr_info("cpufreq-omap: transition: %u --> %u\n", freqs.old, freqs.new); ++#endif ++ ret = clk_set_rate(mpu_clk, freqs.new * 1000); ++ ++ cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); ++ ++ return ret; ++} ++ ++static int __init omap_cpu_init(struct cpufreq_policy *policy) ++{ ++ int result = 0; ++ ++ mpu_clk = clk_get(NULL, "mpu"); ++ if (IS_ERR(mpu_clk)) ++ return PTR_ERR(mpu_clk); ++ ++ if (policy->cpu != 0) ++ return -EINVAL; ++ ++ policy->cur = policy->min = policy->max = omap_getspeed(0); ++ ++ clk_init_cpufreq_table(&freq_table); ++ ++ if (freq_table) { ++ result = cpufreq_frequency_table_cpuinfo(policy, freq_table); ++ if (!result) ++ cpufreq_frequency_table_get_attr(freq_table, ++ policy->cpu); ++ } else { ++ policy->cpuinfo.min_freq = clk_round_rate(mpu_clk, 0) / 1000; ++ policy->cpuinfo.max_freq = clk_round_rate(mpu_clk, ++ VERY_HI_RATE) / 1000; ++ } ++ ++ policy->min = policy->cpuinfo.min_freq; ++ policy->max = policy->cpuinfo.max_freq; ++ policy->cur = omap_getspeed(0); ++ ++ /* FIXME: what's the actual transition time? */ ++ policy->cpuinfo.transition_latency = 300 * 1000; ++ ++ return 0; ++} ++ ++static int omap_cpu_exit(struct cpufreq_policy *policy) ++{ ++ clk_exit_cpufreq_table(&freq_table); ++ clk_put(mpu_clk); ++ return 0; ++} ++ ++static struct freq_attr *omap_cpufreq_attr[] = { ++ &cpufreq_freq_attr_scaling_available_freqs, ++ NULL, ++}; ++ ++static struct cpufreq_driver omap_driver = { ++ .flags = CPUFREQ_STICKY, ++ .verify = omap_verify_speed, ++ .target = omap_target, ++ .get = omap_getspeed, ++ .init = omap_cpu_init, ++ .exit = omap_cpu_exit, ++ .name = "omap1", ++ .attr = omap_cpufreq_attr, ++}; ++ ++static int __init omap_cpufreq_init(void) ++{ ++ return cpufreq_register_driver(&omap_driver); ++} ++ ++static void __exit omap_cpufreq_exit(void) ++{ ++ cpufreq_unregister_driver(&omap_driver); ++} ++ ++MODULE_DESCRIPTION("cpufreq driver for OMAP1 SOCs"); ++MODULE_LICENSE("GPL"); ++module_init(omap_cpufreq_init); ++module_exit(omap_cpufreq_exit); +diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile +index 512b152..42924f3 100644 +--- a/arch/arm/mach-omap2/Makefile ++++ b/arch/arm/mach-omap2/Makefile +@@ -56,6 +56,9 @@ obj-$(CONFIG_ARCH_OMAP3) += opp3xxx_data.o + obj-$(CONFIG_ARCH_OMAP4) += opp4xxx_data.o + endif + ++# CPUFREQ driver ++obj-$(CONFIG_CPU_FREQ) += omap2plus-cpufreq.o ++ + # Power Management + ifeq ($(CONFIG_PM),y) + obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o +diff --git a/arch/arm/mach-omap2/omap2plus-cpufreq.c b/arch/arm/mach-omap2/omap2plus-cpufreq.c +new file mode 100644 +index 0000000..14f84cc +--- /dev/null ++++ b/arch/arm/mach-omap2/omap2plus-cpufreq.c +@@ -0,0 +1,201 @@ ++/* ++ * OMAP2PLUS cpufreq driver ++ * ++ * CPU frequency scaling for OMAP ++ * ++ * Copyright (C) 2005 Nokia Corporation ++ * Written by Tony Lindgren ++ * ++ * Based on cpu-sa1110.c, Copyright (C) 2001 Russell King ++ * ++ * Copyright (C) 2007-2008 Texas Instruments, Inc. ++ * Updated to support OMAP3 ++ * Rajendra Nayak ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++#include ++#include ++#include ++ ++#include ++ ++#define VERY_HI_RATE 900000000 ++ ++static struct cpufreq_frequency_table *freq_table; ++static struct clk *mpu_clk; ++ ++static int omap_verify_speed(struct cpufreq_policy *policy) ++{ ++ if (freq_table) ++ return cpufreq_frequency_table_verify(policy, freq_table); ++ ++ if (policy->cpu) ++ return -EINVAL; ++ ++ cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, ++ policy->cpuinfo.max_freq); ++ ++ policy->min = clk_round_rate(mpu_clk, policy->min * 1000) / 1000; ++ policy->max = clk_round_rate(mpu_clk, policy->max * 1000) / 1000; ++ cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, ++ policy->cpuinfo.max_freq); ++ return 0; ++} ++ ++static unsigned int omap_getspeed(unsigned int cpu) ++{ ++ unsigned long rate; ++ ++ if (cpu) ++ return 0; ++ ++ rate = clk_get_rate(mpu_clk) / 1000; ++ return rate; ++} ++ ++static int omap_target(struct cpufreq_policy *policy, ++ unsigned int target_freq, ++ unsigned int relation) ++{ ++ int ret = 0; ++ struct cpufreq_freqs freqs; ++ ++ /* Ensure desired rate is within allowed range. Some govenors ++ * (ondemand) will just pass target_freq=0 to get the minimum. */ ++ if (target_freq < policy->min) ++ target_freq = policy->min; ++ if (target_freq > policy->max) ++ target_freq = policy->max; ++ ++ freqs.old = omap_getspeed(0); ++ freqs.new = clk_round_rate(mpu_clk, target_freq * 1000) / 1000; ++ freqs.cpu = 0; ++ ++ if (freqs.old == freqs.new) ++ return ret; ++ ++ cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); ++ ++#ifdef CONFIG_CPU_FREQ_DEBUG ++ pr_info("cpufreq-omap: transition: %u --> %u\n", freqs.old, freqs.new); ++#endif ++ ++ ret = clk_set_rate(mpu_clk, freqs.new * 1000); ++ ++ /* ++ * Generic CPUFREQ driver jiffy update is under !SMP. So jiffies ++ * won't get updated when UP machine cpufreq build with ++ * CONFIG_SMP enabled. Below code is added only to manage that ++ * scenario ++ */ ++ if (!is_smp()) ++ loops_per_jiffy = ++ cpufreq_scale(loops_per_jiffy, freqs.old, freqs.new); ++ ++ cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); ++ ++ return ret; ++} ++ ++static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) ++{ ++ int result = 0; ++ struct device *mpu_dev; ++ ++ if (cpu_is_omap24xx()) ++ mpu_clk = clk_get(NULL, "virt_prcm_set"); ++ else if (cpu_is_omap34xx()) ++ mpu_clk = clk_get(NULL, "dpll1_ck"); ++ else if (cpu_is_omap34xx()) ++ mpu_clk = clk_get(NULL, "dpll_mpu_ck"); ++ ++ if (IS_ERR(mpu_clk)) ++ return PTR_ERR(mpu_clk); ++ ++ if (policy->cpu != 0) ++ return -EINVAL; ++ ++ policy->cur = policy->min = policy->max = omap_getspeed(0); ++ ++ mpu_dev = omap2_get_mpuss_device(); ++ if (!mpu_dev) { ++ pr_warning("%s: unable to get the mpu device\n", __func__); ++ return -EINVAL; ++ } ++ opp_init_cpufreq_table(mpu_dev, &freq_table); ++ ++ if (freq_table) { ++ result = cpufreq_frequency_table_cpuinfo(policy, freq_table); ++ if (!result) ++ cpufreq_frequency_table_get_attr(freq_table, ++ policy->cpu); ++ } else { ++ policy->cpuinfo.min_freq = clk_round_rate(mpu_clk, 0) / 1000; ++ policy->cpuinfo.max_freq = clk_round_rate(mpu_clk, ++ VERY_HI_RATE) / 1000; ++ } ++ ++ policy->min = policy->cpuinfo.min_freq; ++ policy->max = policy->cpuinfo.max_freq; ++ policy->cur = omap_getspeed(0); ++ ++ /* FIXME: what's the actual transition time? */ ++ policy->cpuinfo.transition_latency = 300 * 1000; ++ ++ return 0; ++} ++ ++static int omap_cpu_exit(struct cpufreq_policy *policy) ++{ ++ clk_exit_cpufreq_table(&freq_table); ++ clk_put(mpu_clk); ++ return 0; ++} ++ ++static struct freq_attr *omap_cpufreq_attr[] = { ++ &cpufreq_freq_attr_scaling_available_freqs, ++ NULL, ++}; ++ ++static struct cpufreq_driver omap_driver = { ++ .flags = CPUFREQ_STICKY, ++ .verify = omap_verify_speed, ++ .target = omap_target, ++ .get = omap_getspeed, ++ .init = omap_cpu_init, ++ .exit = omap_cpu_exit, ++ .name = "omap2plus", ++ .attr = omap_cpufreq_attr, ++}; ++ ++static int __init omap_cpufreq_init(void) ++{ ++ return cpufreq_register_driver(&omap_driver); ++} ++ ++static void __exit omap_cpufreq_exit(void) ++{ ++ cpufreq_unregister_driver(&omap_driver); ++} ++ ++MODULE_DESCRIPTION("cpufreq driver for OMAP2PLUS SOCs"); ++MODULE_LICENSE("GPL"); ++module_init(omap_cpufreq_init); ++module_exit(omap_cpufreq_exit); +diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile +index a4a1285..ec7862e 100644 +--- a/arch/arm/plat-omap/Makefile ++++ b/arch/arm/plat-omap/Makefile +@@ -21,7 +21,6 @@ obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o + obj-$(CONFIG_OMAP_IOMMU) += iommu.o iovmm.o + obj-$(CONFIG_OMAP_IOMMU_DEBUG) += iommu-debug.o + +-obj-$(CONFIG_CPU_FREQ) += cpu-omap.o + obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o + obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o + obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o +diff --git a/arch/arm/plat-omap/cpu-omap.c b/arch/arm/plat-omap/cpu-omap.c +deleted file mode 100644 +index 9cd2709..0000000 +--- a/arch/arm/plat-omap/cpu-omap.c ++++ /dev/null +@@ -1,204 +0,0 @@ +-/* +- * linux/arch/arm/plat-omap/cpu-omap.c +- * +- * CPU frequency scaling for OMAP +- * +- * Copyright (C) 2005 Nokia Corporation +- * Written by Tony Lindgren +- * +- * Based on cpu-sa1110.c, Copyright (C) 2001 Russell King +- * +- * Copyright (C) 2007-2008 Texas Instruments, Inc. +- * Updated to support OMAP3 +- * Rajendra Nayak +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License version 2 as +- * published by the Free Software Foundation. +- */ +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +- +-#include +-#include +-#include +- +-#if defined(CONFIG_ARCH_OMAP3) && !defined(CONFIG_OMAP_PM_NONE) +-#include +-#include +-#endif +- +-#define VERY_HI_RATE 900000000 +- +-static struct cpufreq_frequency_table *freq_table; +- +-#ifdef CONFIG_ARCH_OMAP1 +-#define MPU_CLK "mpu" +-#elif defined(CONFIG_ARCH_OMAP3) +-#define MPU_CLK "arm_fck" +-#else +-#define MPU_CLK "virt_prcm_set" +-#endif +- +-static struct clk *mpu_clk; +- +-/* TODO: Add support for SDRAM timing changes */ +- +-static int omap_verify_speed(struct cpufreq_policy *policy) +-{ +- if (freq_table) +- return cpufreq_frequency_table_verify(policy, freq_table); +- +- if (policy->cpu) +- return -EINVAL; +- +- cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, +- policy->cpuinfo.max_freq); +- +- policy->min = clk_round_rate(mpu_clk, policy->min * 1000) / 1000; +- policy->max = clk_round_rate(mpu_clk, policy->max * 1000) / 1000; +- cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, +- policy->cpuinfo.max_freq); +- return 0; +-} +- +-static unsigned int omap_getspeed(unsigned int cpu) +-{ +- unsigned long rate; +- +- if (cpu) +- return 0; +- +- rate = clk_get_rate(mpu_clk) / 1000; +- return rate; +-} +- +-static int omap_target(struct cpufreq_policy *policy, +- unsigned int target_freq, +- unsigned int relation) +-{ +-#ifdef CONFIG_ARCH_OMAP1 +- struct cpufreq_freqs freqs; +-#endif +-#if defined(CONFIG_ARCH_OMAP3) && !defined(CONFIG_OMAP_PM_NONE) +- unsigned long freq; +- struct device *mpu_dev = omap2_get_mpuss_device(); +-#endif +- int ret = 0; +- +- /* Ensure desired rate is within allowed range. Some govenors +- * (ondemand) will just pass target_freq=0 to get the minimum. */ +- if (target_freq < policy->min) +- target_freq = policy->min; +- if (target_freq > policy->max) +- target_freq = policy->max; +- +-#ifdef CONFIG_ARCH_OMAP1 +- freqs.old = omap_getspeed(0); +- freqs.new = clk_round_rate(mpu_clk, target_freq * 1000) / 1000; +- freqs.cpu = 0; +- +- if (freqs.old == freqs.new) +- return ret; +- cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); +-#ifdef CONFIG_CPU_FREQ_DEBUG +- printk(KERN_DEBUG "cpufreq-omap: transition: %u --> %u\n", +- freqs.old, freqs.new); +-#endif +- ret = clk_set_rate(mpu_clk, freqs.new * 1000); +- cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); +-#elif defined(CONFIG_ARCH_OMAP3) && !defined(CONFIG_OMAP_PM_NONE) +- freq = target_freq * 1000; +- if (opp_find_freq_ceil(mpu_dev, &freq)) +- omap_pm_cpu_set_freq(freq); +-#endif +- return ret; +-} +- +-static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) +-{ +- int result = 0; +- +- mpu_clk = clk_get(NULL, MPU_CLK); +- if (IS_ERR(mpu_clk)) +- return PTR_ERR(mpu_clk); +- +- if (policy->cpu != 0) +- return -EINVAL; +- +- policy->cur = policy->min = policy->max = omap_getspeed(0); +- +- if (!cpu_is_omap34xx()) { +- clk_init_cpufreq_table(&freq_table); +- } else { +- struct device *mpu_dev = omap2_get_mpuss_device(); +- +- opp_init_cpufreq_table(mpu_dev, &freq_table); +- } +- +- if (freq_table) { +- result = cpufreq_frequency_table_cpuinfo(policy, freq_table); +- if (!result) +- cpufreq_frequency_table_get_attr(freq_table, +- policy->cpu); +- } else { +- policy->cpuinfo.min_freq = clk_round_rate(mpu_clk, 0) / 1000; +- policy->cpuinfo.max_freq = clk_round_rate(mpu_clk, +- VERY_HI_RATE) / 1000; +- } +- +- policy->min = policy->cpuinfo.min_freq; +- policy->max = policy->cpuinfo.max_freq; +- policy->cur = omap_getspeed(0); +- +- /* FIXME: what's the actual transition time? */ +- policy->cpuinfo.transition_latency = 300 * 1000; +- +- return 0; +-} +- +-static int omap_cpu_exit(struct cpufreq_policy *policy) +-{ +- clk_exit_cpufreq_table(&freq_table); +- clk_put(mpu_clk); +- return 0; +-} +- +-static struct freq_attr *omap_cpufreq_attr[] = { +- &cpufreq_freq_attr_scaling_available_freqs, +- NULL, +-}; +- +-static struct cpufreq_driver omap_driver = { +- .flags = CPUFREQ_STICKY, +- .verify = omap_verify_speed, +- .target = omap_target, +- .get = omap_getspeed, +- .init = omap_cpu_init, +- .exit = omap_cpu_exit, +- .name = "omap", +- .attr = omap_cpufreq_attr, +-}; +- +-static int __init omap_cpufreq_init(void) +-{ +- return cpufreq_register_driver(&omap_driver); +-} +- +-late_initcall(omap_cpufreq_init); +- +-/* +- * if ever we want to remove this, upon cleanup call: +- * +- * cpufreq_unregister_driver() +- * cpufreq_frequency_table_put_attr() +- */ +- +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0007-OMAP2PLUS-cpufreq-Add-SMP-support-to-cater-OMAP4430.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0007-OMAP2PLUS-cpufreq-Add-SMP-support-to-cater-OMAP4430.patch new file mode 100644 index 0000000000..810873a68a --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0007-OMAP2PLUS-cpufreq-Add-SMP-support-to-cater-OMAP4430.patch @@ -0,0 +1,170 @@ +From 1d829a2213997f903aacfffcf184e3705be38026 Mon Sep 17 00:00:00 2001 +From: Santosh Shilimkar +Date: Mon, 14 Mar 2011 17:08:49 +0530 +Subject: [PATCH 7/8] OMAP2PLUS: cpufreq: Add SMP support to cater OMAP4430 + +On OMAP SMP configuartion, both processors share the voltage +and clock. So both CPUs needs to be scaled together and hence +needs software co-ordination. + +Signed-off-by: Santosh Shilimkar +Cc: Kevin Hilman +cc: Vishwanath BS +--- + arch/arm/mach-omap2/omap2plus-cpufreq.c | 73 ++++++++++++++++++++++++++----- + 1 files changed, 62 insertions(+), 11 deletions(-) + +diff --git a/arch/arm/mach-omap2/omap2plus-cpufreq.c b/arch/arm/mach-omap2/omap2plus-cpufreq.c +index 14f84cc..8d472f6 100644 +--- a/arch/arm/mach-omap2/omap2plus-cpufreq.c ++++ b/arch/arm/mach-omap2/omap2plus-cpufreq.c +@@ -26,9 +26,11 @@ + #include + #include + #include ++#include + + #include + #include ++#include + + #include + #include +@@ -63,7 +65,7 @@ static unsigned int omap_getspeed(unsigned int cpu) + { + unsigned long rate; + +- if (cpu) ++ if (cpu >= NR_CPUS) + return 0; + + rate = clk_get_rate(mpu_clk) / 1000; +@@ -74,9 +76,13 @@ static int omap_target(struct cpufreq_policy *policy, + unsigned int target_freq, + unsigned int relation) + { +- int ret = 0; ++ int i, ret = 0; + struct cpufreq_freqs freqs; + ++ /* Changes not allowed until all CPUs are online */ ++ if (is_smp() && (num_online_cpus() < NR_CPUS)) ++ return ret; ++ + /* Ensure desired rate is within allowed range. Some govenors + * (ondemand) will just pass target_freq=0 to get the minimum. */ + if (target_freq < policy->min) +@@ -84,15 +90,25 @@ static int omap_target(struct cpufreq_policy *policy, + if (target_freq > policy->max) + target_freq = policy->max; + +- freqs.old = omap_getspeed(0); ++ freqs.old = omap_getspeed(policy->cpu); + freqs.new = clk_round_rate(mpu_clk, target_freq * 1000) / 1000; +- freqs.cpu = 0; ++ freqs.cpu = policy->cpu; + + if (freqs.old == freqs.new) + return ret; + +- cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); ++ if (!is_smp()) { ++ cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); ++ goto set_freq; ++ } ++ ++ /* notifiers */ ++ for_each_cpu(i, policy->cpus) { ++ freqs.cpu = i; ++ cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); ++ } + ++set_freq: + #ifdef CONFIG_CPU_FREQ_DEBUG + pr_info("cpufreq-omap: transition: %u --> %u\n", freqs.old, freqs.new); + #endif +@@ -105,12 +121,33 @@ static int omap_target(struct cpufreq_policy *policy, + * CONFIG_SMP enabled. Below code is added only to manage that + * scenario + */ +- if (!is_smp()) ++ freqs.new = omap_getspeed(policy->cpu); ++ if (!is_smp()) { + loops_per_jiffy = + cpufreq_scale(loops_per_jiffy, freqs.old, freqs.new); ++ cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); ++ goto skip_lpj; ++ } + +- cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); ++#ifdef CONFIG_SMP ++ /* ++ * Note that loops_per_jiffy is not updated on SMP systems in ++ * cpufreq driver. So, update the per-CPU loops_per_jiffy value ++ * on frequency transition. We need to update all dependent CPUs. ++ */ ++ for_each_cpu(i, policy->cpus) ++ per_cpu(cpu_data, i).loops_per_jiffy = ++ cpufreq_scale(per_cpu(cpu_data, i).loops_per_jiffy, ++ freqs.old, freqs.new); ++#endif + ++ /* notifiers */ ++ for_each_cpu(i, policy->cpus) { ++ freqs.cpu = i; ++ cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); ++ } ++ ++skip_lpj: + return ret; + } + +@@ -118,6 +155,7 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) + { + int result = 0; + struct device *mpu_dev; ++ static cpumask_var_t cpumask; + + if (cpu_is_omap24xx()) + mpu_clk = clk_get(NULL, "virt_prcm_set"); +@@ -129,12 +167,12 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) + if (IS_ERR(mpu_clk)) + return PTR_ERR(mpu_clk); + +- if (policy->cpu != 0) ++ if (policy->cpu >= NR_CPUS) + return -EINVAL; + +- policy->cur = policy->min = policy->max = omap_getspeed(0); +- ++ policy->cur = policy->min = policy->max = omap_getspeed(policy->cpu); + mpu_dev = omap2_get_mpuss_device(); ++ + if (!mpu_dev) { + pr_warning("%s: unable to get the mpu device\n", __func__); + return -EINVAL; +@@ -154,7 +192,20 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) + + policy->min = policy->cpuinfo.min_freq; + policy->max = policy->cpuinfo.max_freq; +- policy->cur = omap_getspeed(0); ++ policy->cur = omap_getspeed(policy->cpu); ++ ++ /* ++ * On OMAP SMP configuartion, both processors share the voltage ++ * and clock. So both CPUs needs to be scaled together and hence ++ * needs software co-ordination. Use cpufreq affected_cpus ++ * interface to handle this scenario. Additional is_smp() check ++ * is to keep SMP_ON_UP build working. ++ */ ++ if (is_smp()) { ++ policy->shared_type = CPUFREQ_SHARED_TYPE_ANY; ++ cpumask_or(cpumask, cpumask_of(policy->cpu), cpumask); ++ cpumask_copy(policy->cpus, cpumask); ++ } + + /* FIXME: what's the actual transition time? */ + policy->cpuinfo.transition_latency = 300 * 1000; +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0008-OMAP2PLUS-cpufreq-Fix-typo-when-attempting-to-set-mp.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0008-OMAP2PLUS-cpufreq-Fix-typo-when-attempting-to-set-mp.patch new file mode 100644 index 0000000000..fd0c11ce1d --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0008-OMAP2PLUS-cpufreq-Fix-typo-when-attempting-to-set-mp.patch @@ -0,0 +1,29 @@ +From a216121073a645a3b9965f06a0813d77b3f467ca Mon Sep 17 00:00:00 2001 +From: Jarkko Nikula +Date: Thu, 14 Apr 2011 16:21:58 +0300 +Subject: [PATCH 8/8] OMAP2PLUS: cpufreq: Fix typo when attempting to set mpu_clk for OMAP4 + +Fix this typo as there is no dpll_mpu_ck for OMAP3 and code flow is clearly +trying to set mpu_clk for OMAP4 for which this dpll_mpu_ck is available. + +Signed-off-by: Jarkko Nikula +--- + arch/arm/mach-omap2/omap2plus-cpufreq.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/mach-omap2/omap2plus-cpufreq.c b/arch/arm/mach-omap2/omap2plus-cpufreq.c +index 8d472f6..d53ce23 100644 +--- a/arch/arm/mach-omap2/omap2plus-cpufreq.c ++++ b/arch/arm/mach-omap2/omap2plus-cpufreq.c +@@ -161,7 +161,7 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) + mpu_clk = clk_get(NULL, "virt_prcm_set"); + else if (cpu_is_omap34xx()) + mpu_clk = clk_get(NULL, "dpll1_ck"); +- else if (cpu_is_omap34xx()) ++ else if (cpu_is_omap44xx()) + mpu_clk = clk_get(NULL, "dpll_mpu_ck"); + + if (IS_ERR(mpu_clk)) +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0001-OMAP2-clockdomain-Add-an-api-to-read-idle-mode.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0001-OMAP2-clockdomain-Add-an-api-to-read-idle-mode.patch new file mode 100644 index 0000000000..d030c51968 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0001-OMAP2-clockdomain-Add-an-api-to-read-idle-mode.patch @@ -0,0 +1,77 @@ +From d19005cc07645703a61d4645c343ed586919575d Mon Sep 17 00:00:00 2001 +From: Rajendra Nayak +Date: Tue, 5 Apr 2011 15:22:31 +0530 +Subject: [PATCH 1/6] OMAP2+: clockdomain: Add an api to read idle mode + +Add a clockdomain api to check if hardware supervised +idle transitions are enabled on a clockdomain. + +Signed-off-by: Rajendra Nayak +--- + arch/arm/mach-omap2/clockdomain.c | 21 +++++++++++++++++++++ + arch/arm/mach-omap2/clockdomain.h | 3 +++ + 2 files changed, 24 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/clockdomain.c b/arch/arm/mach-omap2/clockdomain.c +index 6cb6c03..2ab3686 100644 +--- a/arch/arm/mach-omap2/clockdomain.c ++++ b/arch/arm/mach-omap2/clockdomain.c +@@ -795,6 +795,27 @@ void clkdm_deny_idle(struct clockdomain *clkdm) + arch_clkdm->clkdm_deny_idle(clkdm); + } + ++/** ++ * clkdm_is_idle - Check if the clkdm hwsup/autoidle is enabled ++ * @clkdm: struct clockdomain * ++ * ++ * Returns true if the clockdomain is in hardware-supervised ++ * idle mode, or 0 otherwise. ++ * ++ */ ++int clkdm_is_idle(struct clockdomain *clkdm) ++{ ++ if (!clkdm) ++ return -EINVAL; ++ ++ if (!arch_clkdm || !arch_clkdm->clkdm_is_idle) ++ return -EINVAL; ++ ++ pr_debug("clockdomain: reading idle state for %s\n", clkdm->name); ++ ++ return arch_clkdm->clkdm_is_idle(clkdm); ++} ++ + + /* Clockdomain-to-clock framework interface code */ + +diff --git a/arch/arm/mach-omap2/clockdomain.h b/arch/arm/mach-omap2/clockdomain.h +index 5823584..085ed82 100644 +--- a/arch/arm/mach-omap2/clockdomain.h ++++ b/arch/arm/mach-omap2/clockdomain.h +@@ -138,6 +138,7 @@ struct clockdomain { + * @clkdm_wakeup: Force a clockdomain to wakeup + * @clkdm_allow_idle: Enable hw supervised idle transitions for clock domain + * @clkdm_deny_idle: Disable hw supervised idle transitions for clock domain ++ * @clkdm_is_idle: Check if hw supervised idle transitions are enabled + * @clkdm_clk_enable: Put the clkdm in right state for a clock enable + * @clkdm_clk_disable: Put the clkdm in right state for a clock disable + */ +@@ -154,6 +155,7 @@ struct clkdm_ops { + int (*clkdm_wakeup)(struct clockdomain *clkdm); + void (*clkdm_allow_idle)(struct clockdomain *clkdm); + void (*clkdm_deny_idle)(struct clockdomain *clkdm); ++ int (*clkdm_is_idle)(struct clockdomain *clkdm); + int (*clkdm_clk_enable)(struct clockdomain *clkdm); + int (*clkdm_clk_disable)(struct clockdomain *clkdm); + }; +@@ -177,6 +179,7 @@ int clkdm_clear_all_sleepdeps(struct clockdomain *clkdm); + + void clkdm_allow_idle(struct clockdomain *clkdm); + void clkdm_deny_idle(struct clockdomain *clkdm); ++int clkdm_is_idle(struct clockdomain *clkdm); + + int clkdm_wakeup(struct clockdomain *clkdm); + int clkdm_sleep(struct clockdomain *clkdm); +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0002-OMAP2-clockdomain-Add-SoC-support-for-clkdm_is_idle.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0002-OMAP2-clockdomain-Add-SoC-support-for-clkdm_is_idle.patch new file mode 100644 index 0000000000..fa79d07418 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0002-OMAP2-clockdomain-Add-SoC-support-for-clkdm_is_idle.patch @@ -0,0 +1,86 @@ +From 2863828e636c1766c6d2de85c900f6656f4b6675 Mon Sep 17 00:00:00 2001 +From: Rajendra Nayak +Date: Tue, 5 Apr 2011 15:22:36 +0530 +Subject: [PATCH 2/6] OMAP2+: clockdomain: Add SoC support for clkdm_is_idle + +Add the SoC specific implemenation for clkdm_is_idle +for OMAP2/3 and OMAP4. + +Signed-off-by: Rajendra Nayak +--- + arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 12 ++++++++++++ + arch/arm/mach-omap2/clockdomain44xx.c | 7 +++++++ + 2 files changed, 19 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/clockdomain2xxx_3xxx.c b/arch/arm/mach-omap2/clockdomain2xxx_3xxx.c +index 48d0db7..db49baa 100644 +--- a/arch/arm/mach-omap2/clockdomain2xxx_3xxx.c ++++ b/arch/arm/mach-omap2/clockdomain2xxx_3xxx.c +@@ -13,6 +13,7 @@ + */ + + #include ++#include + #include + #include "prm.h" + #include "prm2xxx_3xxx.h" +@@ -146,6 +147,15 @@ static void omap2_clkdm_deny_idle(struct clockdomain *clkdm) + _clkdm_del_autodeps(clkdm); + } + ++static int omap2_clkdm_is_idle(struct clockdomain *clkdm) ++{ ++ if (!clkdm->clktrctrl_mask) ++ return -1; ++ ++ return omap2_cm_is_clkdm_in_hwsup(clkdm->pwrdm.ptr->prcm_offs, ++ clkdm->clktrctrl_mask); ++} ++ + static void _enable_hwsup(struct clockdomain *clkdm) + { + if (cpu_is_omap24xx()) +@@ -252,6 +262,7 @@ struct clkdm_ops omap2_clkdm_operations = { + .clkdm_wakeup = omap2_clkdm_wakeup, + .clkdm_allow_idle = omap2_clkdm_allow_idle, + .clkdm_deny_idle = omap2_clkdm_deny_idle, ++ .clkdm_is_idle = omap2_clkdm_is_idle, + .clkdm_clk_enable = omap2_clkdm_clk_enable, + .clkdm_clk_disable = omap2_clkdm_clk_disable, + }; +@@ -269,6 +280,7 @@ struct clkdm_ops omap3_clkdm_operations = { + .clkdm_wakeup = omap3_clkdm_wakeup, + .clkdm_allow_idle = omap3_clkdm_allow_idle, + .clkdm_deny_idle = omap3_clkdm_deny_idle, ++ .clkdm_is_idle = omap2_clkdm_is_idle, + .clkdm_clk_enable = omap2_clkdm_clk_enable, + .clkdm_clk_disable = omap2_clkdm_clk_disable, + }; +diff --git a/arch/arm/mach-omap2/clockdomain44xx.c b/arch/arm/mach-omap2/clockdomain44xx.c +index a1a4ecd..4b10727 100644 +--- a/arch/arm/mach-omap2/clockdomain44xx.c ++++ b/arch/arm/mach-omap2/clockdomain44xx.c +@@ -93,6 +93,12 @@ static void omap4_clkdm_deny_idle(struct clockdomain *clkdm) + clkdm->cm_inst, clkdm->clkdm_offs); + } + ++static int omap4_clkdm_is_idle(struct clockdomain *clkdm) ++{ ++ return omap4_cminst_is_clkdm_in_hwsup(clkdm->prcm_partition, ++ clkdm->cm_inst, clkdm->clkdm_offs); ++} ++ + static int omap4_clkdm_clk_enable(struct clockdomain *clkdm) + { + bool hwsup = false; +@@ -132,6 +138,7 @@ struct clkdm_ops omap4_clkdm_operations = { + .clkdm_wakeup = omap4_clkdm_wakeup, + .clkdm_allow_idle = omap4_clkdm_allow_idle, + .clkdm_deny_idle = omap4_clkdm_deny_idle, ++ .clkdm_is_idle = omap4_clkdm_is_idle, + .clkdm_clk_enable = omap4_clkdm_clk_enable, + .clkdm_clk_disable = omap4_clkdm_clk_disable, + }; +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0003-OMAP2-PM-Initialise-sleep_switch-to-a-non-valid-valu.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0003-OMAP2-PM-Initialise-sleep_switch-to-a-non-valid-valu.patch new file mode 100644 index 0000000000..65a4fcbf6e --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0003-OMAP2-PM-Initialise-sleep_switch-to-a-non-valid-valu.patch @@ -0,0 +1,35 @@ +From dc352655af9c356f5c2db95c88718ed3a996569b Mon Sep 17 00:00:00 2001 +From: Rajendra Nayak +Date: Tue, 5 Apr 2011 15:22:41 +0530 +Subject: [PATCH 3/6] OMAP2+: PM: Initialise sleep_switch to a non-valid value + +sleep_switch which is initialised to 0 in omap_set_pwrdm_state +happens to be a valid sleep_switch type (FORCEWAKEUP_SWITCH) +which are defined as +#define FORCEWAKEUP_SWITCH 0 +#define LOWPOWERSTATE_SWITCH 1 + +This causes the function to wrongly program some clock domains +even when the Powerdomain is in ON state. + +Signed-off-by: Rajendra Nayak +--- + arch/arm/mach-omap2/pm.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c +index 49486f5..d48813f 100644 +--- a/arch/arm/mach-omap2/pm.c ++++ b/arch/arm/mach-omap2/pm.c +@@ -106,7 +106,7 @@ static void omap2_init_processor_devices(void) + int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) + { + u32 cur_state; +- int sleep_switch = 0; ++ int sleep_switch = -1; + int ret = 0; + + if (pwrdm == NULL || IS_ERR(pwrdm)) +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0004-OMAP2-PM-idle-clkdms-only-if-already-in-idle.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0004-OMAP2-PM-idle-clkdms-only-if-already-in-idle.patch new file mode 100644 index 0000000000..7a94488fde --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0004-OMAP2-PM-idle-clkdms-only-if-already-in-idle.patch @@ -0,0 +1,50 @@ +From 59bfd35cfef1c0b9c2c078082a47f957c27fa2fd Mon Sep 17 00:00:00 2001 +From: Rajendra Nayak +Date: Tue, 5 Apr 2011 15:22:48 +0530 +Subject: [PATCH 4/6] OMAP2+: PM: idle clkdms only if already in idle + +The omap_set_pwrdm_state function forces clockdomains +to idle, without checking the existing idle state +programmed, instead based solely on the HW capability +of the clockdomain to support idle. +This is wrong and the clockdomains should be idled +post a state_switch *only* if idle transitions on the +clockdomain were already enabled. + +Signed-off-by: Rajendra Nayak +--- + arch/arm/mach-omap2/pm.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c +index d48813f..840b0e1 100644 +--- a/arch/arm/mach-omap2/pm.c ++++ b/arch/arm/mach-omap2/pm.c +@@ -108,6 +108,7 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) + u32 cur_state; + int sleep_switch = -1; + int ret = 0; ++ int hwsup = 0; + + if (pwrdm == NULL || IS_ERR(pwrdm)) + return -EINVAL; +@@ -127,6 +128,7 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) + (pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE)) { + sleep_switch = LOWPOWERSTATE_SWITCH; + } else { ++ hwsup = clkdm_is_idle(pwrdm->pwrdm_clkdms[0]); + clkdm_wakeup(pwrdm->pwrdm_clkdms[0]); + pwrdm_wait_transition(pwrdm); + sleep_switch = FORCEWAKEUP_SWITCH; +@@ -142,7 +144,7 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) + + switch (sleep_switch) { + case FORCEWAKEUP_SWITCH: +- if (pwrdm->pwrdm_clkdms[0]->flags & CLKDM_CAN_ENABLE_AUTO) ++ if (hwsup) + clkdm_allow_idle(pwrdm->pwrdm_clkdms[0]); + else + clkdm_sleep(pwrdm->pwrdm_clkdms[0]); +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0005-OMAP2-hwmod-Follow-the-recomended-PRCM-sequence.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0005-OMAP2-hwmod-Follow-the-recomended-PRCM-sequence.patch new file mode 100644 index 0000000000..0e9a2ee0f0 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0005-OMAP2-hwmod-Follow-the-recomended-PRCM-sequence.patch @@ -0,0 +1,46 @@ +From 8bde567522cb85c91f49858a9026d3ec24283331 Mon Sep 17 00:00:00 2001 +From: Rajendra Nayak +Date: Tue, 29 Mar 2011 22:37:43 +0530 +Subject: [PATCH 5/6] OMAP2+: hwmod: Follow the recomended PRCM sequence + +Follow the recomended PRCM sequence. +This still does not take care of Optional clocks. + +Signed-off-by: Rajendra Nayak +--- + arch/arm/mach-omap2/omap_hwmod.c | 9 ++++++++- + 1 files changed, 8 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c +index e034294..fc0db0c 100644 +--- a/arch/arm/mach-omap2/omap_hwmod.c ++++ b/arch/arm/mach-omap2/omap_hwmod.c +@@ -1223,6 +1223,7 @@ static int _reset(struct omap_hwmod *oh) + static int _enable(struct omap_hwmod *oh) + { + int r; ++ int hwsup = 0; + + if (oh->_state != _HWMOD_STATE_INITIALIZED && + oh->_state != _HWMOD_STATE_IDLE && +@@ -1250,10 +1251,16 @@ static int _enable(struct omap_hwmod *oh) + omap_hwmod_mux(oh->mux, _HWMOD_STATE_ENABLED); + + _add_initiator_dep(oh, mpu_oh); ++ if (oh->_clk && oh->_clk->clkdm) { ++ hwsup = clkdm_is_idle(oh->_clk->clkdm); ++ clkdm_wakeup(oh->_clk->clkdm); ++ } + _enable_clocks(oh); +- + r = _wait_target_ready(oh); + if (!r) { ++ if (oh->_clk && oh->_clk->clkdm && hwsup) ++ clkdm_allow_idle(oh->_clk->clkdm); ++ + oh->_state = _HWMOD_STATE_ENABLED; + + /* Access the sysconfig only if the target is ready */ +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0006-OMAP-Serial-Check-wk_st-only-if-present.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0006-OMAP-Serial-Check-wk_st-only-if-present.patch new file mode 100644 index 0000000000..8c9025752a --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0006-OMAP-Serial-Check-wk_st-only-if-present.patch @@ -0,0 +1,33 @@ +From 06ef3c33307622a7c4ab0f7cbfaf0163a1be5a81 Mon Sep 17 00:00:00 2001 +From: Rajendra Nayak +Date: Tue, 2 Mar 2010 17:25:30 +0530 +Subject: [PATCH 6/6] OMAP: Serial: Check wk_st only if present + +Uart on the resume path tries to read wk_st registers, even +on architectures were its not present/populated. +This patch fixes the issue. + +Signed-off-by: Rajendra Nayak +--- + arch/arm/mach-omap2/serial.c | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c +index 1ac361b..a0046ce 100644 +--- a/arch/arm/mach-omap2/serial.c ++++ b/arch/arm/mach-omap2/serial.c +@@ -418,8 +418,9 @@ void omap_uart_resume_idle(int num) + } + + /* Check for normal UART wakeup */ +- if (__raw_readl(uart->wk_st) & uart->wk_mask) +- omap_uart_block_sleep(uart); ++ if (uart->wk_st && uart->wk_mask) ++ if (__raw_readl(uart->wk_st) & uart->wk_mask) ++ omap_uart_block_sleep(uart); + return; + } + } +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0001-OMAP3-voltage-remove-spurious-pr_notice-for-debugfs.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0001-OMAP3-voltage-remove-spurious-pr_notice-for-debugfs.patch new file mode 100644 index 0000000000..f1a5bbbc90 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0001-OMAP3-voltage-remove-spurious-pr_notice-for-debugfs.patch @@ -0,0 +1,30 @@ +From 26d1f5966161349845884ae3c8f558d2580f1eb9 Mon Sep 17 00:00:00 2001 +From: Nishanth Menon +Date: Sat, 12 Feb 2011 17:27:14 +0530 +Subject: [PATCH 01/12] OMAP3+: voltage: remove spurious pr_notice for debugfs + +cat of debugfs entry for vp_volt provides voltage. The additional pr_notice +is just spam on console and provides no additional information. + +Signed-off-by: Nishanth Menon +Signed-off-by: Kevin Hilman +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/voltage.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c +index 0c1552d..9ef3789 100644 +--- a/arch/arm/mach-omap2/voltage.c ++++ b/arch/arm/mach-omap2/voltage.c +@@ -148,7 +148,6 @@ static int vp_volt_debug_get(void *data, u64 *val) + } + + vsel = vdd->read_reg(prm_mod_offs, vdd->vp_data->voltage); +- pr_notice("curr_vsel = %x\n", vsel); + + if (!vdd->pmic_info->vsel_to_uv) { + pr_warning("PMIC function to convert vsel to voltage" +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch new file mode 100644 index 0000000000..186c6846aa --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch @@ -0,0 +1,41 @@ +From f9e0aa8fa5538ddd92e12c5a062e78b0ae5e47e9 Mon Sep 17 00:00:00 2001 +From: Nishanth Menon +Date: Sun, 13 Mar 2011 09:07:23 +0530 +Subject: [PATCH 02/12] OMAP4: PM: remove redundant #ifdef CONFIG_PM + +pm44xx.c is built only when CONFIG_PM is setup, +remove redundant CONFIG_PM check. + +This also fixes: +https://bugzilla.kernel.org/show_bug.cgi?id=25022 + +Reported-by: Martin Etti + +Signed-off-by: Nishanth Menon +Signed-off-by: Kevin Hilman +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/pm44xx.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c +index 76cfff2..59a870b 100644 +--- a/arch/arm/mach-omap2/pm44xx.c ++++ b/arch/arm/mach-omap2/pm44xx.c +@@ -105,13 +105,11 @@ static int __init omap4_pm_init(void) + + pr_err("Power Management for TI OMAP4.\n"); + +-#ifdef CONFIG_PM + ret = pwrdm_for_each(pwrdms_setup, NULL); + if (ret) { + pr_err("Failed to setup powerdomains\n"); + goto err2; + } +-#endif + + #ifdef CONFIG_SUSPEND + suspend_set_ops(&omap_pm_ops); +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0003-OMAP3-smartreflex-fix-sr_late_init-error-path-in-pro.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0003-OMAP3-smartreflex-fix-sr_late_init-error-path-in-pro.patch new file mode 100644 index 0000000000..8e6a11bb39 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0003-OMAP3-smartreflex-fix-sr_late_init-error-path-in-pro.patch @@ -0,0 +1,30 @@ +From c57f8521c772b2a934dc090d68d7ca3b33c99a46 Mon Sep 17 00:00:00 2001 +From: Aaro Koskinen +Date: Thu, 24 Mar 2011 18:35:31 +0200 +Subject: [PATCH 03/12] OMAP3+: smartreflex: fix sr_late_init() error path in probe + +sr_late_init() will take care of freeing the resources. + +Signed-off-by: Aaro Koskinen +Signed-off-by: Kevin Hilman +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/smartreflex.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c +index 13e24f9..dbc4b6f 100644 +--- a/arch/arm/mach-omap2/smartreflex.c ++++ b/arch/arm/mach-omap2/smartreflex.c +@@ -883,7 +883,7 @@ static int __init omap_sr_probe(struct platform_device *pdev) + ret = sr_late_init(sr_info); + if (ret) { + pr_warning("%s: Error in SR late init\n", __func__); +- goto err_release_region; ++ return ret; + } + } + +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0004-OMAP3-smartreflex-request-the-memory-region.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0004-OMAP3-smartreflex-request-the-memory-region.patch new file mode 100644 index 0000000000..335f092a62 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0004-OMAP3-smartreflex-request-the-memory-region.patch @@ -0,0 +1,36 @@ +From e09d0dd5be3f582aaf4626b3be0eeba42ca598bd Mon Sep 17 00:00:00 2001 +From: Aaro Koskinen +Date: Thu, 24 Mar 2011 18:35:32 +0200 +Subject: [PATCH 04/12] OMAP3+: smartreflex: request the memory region + +We are releasing the memory region, but never actually request it. + +Signed-off-by: Aaro Koskinen +Signed-off-by: Kevin Hilman +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/smartreflex.c | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c +index dbc4b6f..703143a 100644 +--- a/arch/arm/mach-omap2/smartreflex.c ++++ b/arch/arm/mach-omap2/smartreflex.c +@@ -847,6 +847,14 @@ static int __init omap_sr_probe(struct platform_device *pdev) + goto err_free_devinfo; + } + ++ mem = request_mem_region(mem->start, resource_size(mem), ++ dev_name(&pdev->dev)); ++ if (!mem) { ++ dev_err(&pdev->dev, "%s: no mem region\n", __func__); ++ ret = -EBUSY; ++ goto err_free_devinfo; ++ } ++ + irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); + + pm_runtime_enable(&pdev->dev); +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0005-OMAP3-smartreflex-fix-ioremap-leak-on-probe-error.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0005-OMAP3-smartreflex-fix-ioremap-leak-on-probe-error.patch new file mode 100644 index 0000000000..7783da7c81 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0005-OMAP3-smartreflex-fix-ioremap-leak-on-probe-error.patch @@ -0,0 +1,66 @@ +From ca7c837b7f6c37c86d0646774a60d82848557411 Mon Sep 17 00:00:00 2001 +From: Aaro Koskinen +Date: Thu, 24 Mar 2011 18:35:33 +0200 +Subject: [PATCH 05/12] OMAP3+: smartreflex: fix ioremap leak on probe error + +Add missing iounmap() to error paths. + +Signed-off-by: Aaro Koskinen +Signed-off-by: Kevin Hilman +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/smartreflex.c | 10 ++++++---- + 1 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c +index 703143a..156807e 100644 +--- a/arch/arm/mach-omap2/smartreflex.c ++++ b/arch/arm/mach-omap2/smartreflex.c +@@ -904,7 +904,7 @@ static int __init omap_sr_probe(struct platform_device *pdev) + vdd_dbg_dir = omap_voltage_get_dbgdir(sr_info->voltdm); + if (!vdd_dbg_dir) { + ret = -EINVAL; +- goto err_release_region; ++ goto err_iounmap; + } + + sr_info->dbg_dir = debugfs_create_dir("smartreflex", vdd_dbg_dir); +@@ -912,7 +912,7 @@ static int __init omap_sr_probe(struct platform_device *pdev) + dev_err(&pdev->dev, "%s: Unable to create debugfs directory\n", + __func__); + ret = PTR_ERR(sr_info->dbg_dir); +- goto err_release_region; ++ goto err_iounmap; + } + + (void) debugfs_create_file("autocomp", S_IRUGO | S_IWUSR, +@@ -929,7 +929,7 @@ static int __init omap_sr_probe(struct platform_device *pdev) + dev_err(&pdev->dev, "%s: Unable to create debugfs directory" + "for n-values\n", __func__); + ret = PTR_ERR(nvalue_dir); +- goto err_release_region; ++ goto err_iounmap; + } + + omap_voltage_get_volttable(sr_info->voltdm, &volt_data); +@@ -939,7 +939,7 @@ static int __init omap_sr_probe(struct platform_device *pdev) + "entries for n-values\n", + __func__, sr_info->voltdm->name); + ret = -ENODATA; +- goto err_release_region; ++ goto err_iounmap; + } + + for (i = 0; i < sr_info->nvalue_count; i++) { +@@ -953,6 +953,8 @@ static int __init omap_sr_probe(struct platform_device *pdev) + + return ret; + ++err_iounmap: ++ iounmap(sr_info->base); + err_release_region: + release_mem_region(mem->start, resource_size(mem)); + err_free_devinfo: +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0006-OMAP3-smartreflex-delete-instance-from-sr_list-on-pr.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0006-OMAP3-smartreflex-delete-instance-from-sr_list-on-pr.patch new file mode 100644 index 0000000000..8c5fe19d79 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0006-OMAP3-smartreflex-delete-instance-from-sr_list-on-pr.patch @@ -0,0 +1,29 @@ +From 11af4217e7e6c2c21d1fe9e5f317a5baabf9a361 Mon Sep 17 00:00:00 2001 +From: Aaro Koskinen +Date: Thu, 24 Mar 2011 18:35:34 +0200 +Subject: [PATCH 06/12] OMAP3+: smartreflex: delete instance from sr_list on probe error + +If the probe fails, the node should be deleted from sr_list. + +Signed-off-by: Aaro Koskinen +Signed-off-by: Kevin Hilman +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/smartreflex.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c +index 156807e..f0a488a 100644 +--- a/arch/arm/mach-omap2/smartreflex.c ++++ b/arch/arm/mach-omap2/smartreflex.c +@@ -954,6 +954,7 @@ static int __init omap_sr_probe(struct platform_device *pdev) + return ret; + + err_iounmap: ++ list_del(&sr_info->node); + iounmap(sr_info->base); + err_release_region: + release_mem_region(mem->start, resource_size(mem)); +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0007-OMAP3-smartreflex-delete-debugfs-entries-on-probe-er.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0007-OMAP3-smartreflex-delete-debugfs-entries-on-probe-er.patch new file mode 100644 index 0000000000..1f4d43c847 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0007-OMAP3-smartreflex-delete-debugfs-entries-on-probe-er.patch @@ -0,0 +1,48 @@ +From d4ead89805d1146f79a3204467eecb19dcdc442a Mon Sep 17 00:00:00 2001 +From: Aaro Koskinen +Date: Thu, 24 Mar 2011 18:35:35 +0200 +Subject: [PATCH 07/12] OMAP3+: smartreflex: delete debugfs entries on probe error + +Delete created debugfs entries if probe fails. + +Signed-off-by: Aaro Koskinen +Signed-off-by: Kevin Hilman +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/smartreflex.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c +index f0a488a..fb7dc52 100644 +--- a/arch/arm/mach-omap2/smartreflex.c ++++ b/arch/arm/mach-omap2/smartreflex.c +@@ -929,7 +929,7 @@ static int __init omap_sr_probe(struct platform_device *pdev) + dev_err(&pdev->dev, "%s: Unable to create debugfs directory" + "for n-values\n", __func__); + ret = PTR_ERR(nvalue_dir); +- goto err_iounmap; ++ goto err_debugfs; + } + + omap_voltage_get_volttable(sr_info->voltdm, &volt_data); +@@ -939,7 +939,7 @@ static int __init omap_sr_probe(struct platform_device *pdev) + "entries for n-values\n", + __func__, sr_info->voltdm->name); + ret = -ENODATA; +- goto err_iounmap; ++ goto err_debugfs; + } + + for (i = 0; i < sr_info->nvalue_count; i++) { +@@ -953,6 +953,8 @@ static int __init omap_sr_probe(struct platform_device *pdev) + + return ret; + ++err_debugfs: ++ debugfs_remove_recursive(sr_info->dbg_dir); + err_iounmap: + list_del(&sr_info->node); + iounmap(sr_info->base); +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0008-OMAP3-cpuidle-remove-useless-SDP-specific-timings.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0008-OMAP3-cpuidle-remove-useless-SDP-specific-timings.patch new file mode 100644 index 0000000000..185454e336 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0008-OMAP3-cpuidle-remove-useless-SDP-specific-timings.patch @@ -0,0 +1,57 @@ +From 9f4d8f56ce3268ee3e2efc9489d50d66d361f32d Mon Sep 17 00:00:00 2001 +From: Jean Pihet +Date: Fri, 29 Apr 2011 11:26:22 +0200 +Subject: [PATCH 08/12] OMAP3 cpuidle: remove useless SDP specific timings + +The cpuidle states settings can be overriden by some board- +specific settings, by calling omap3_pm_init_cpuidle. +Remove the 3430SDP specific states settings registration +since the figures are identical to the default ones (in cpuidle34xx.c). + +Signed-off-by: Jean Pihet +Signed-off-by: Kevin Hilman +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/board-3430sdp.c | 19 ------------------- + 1 files changed, 0 insertions(+), 19 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c +index 9afd087..7ffad7b 100644 +--- a/arch/arm/mach-omap2/board-3430sdp.c ++++ b/arch/arm/mach-omap2/board-3430sdp.c +@@ -59,24 +59,6 @@ + + #define TWL4030_MSECURE_GPIO 22 + +-/* FIXME: These values need to be updated based on more profiling on 3430sdp*/ +-static struct cpuidle_params omap3_cpuidle_params_table[] = { +- /* C1 */ +- {1, 2, 2, 5}, +- /* C2 */ +- {1, 10, 10, 30}, +- /* C3 */ +- {1, 50, 50, 300}, +- /* C4 */ +- {1, 1500, 1800, 4000}, +- /* C5 */ +- {1, 2500, 7500, 12000}, +- /* C6 */ +- {1, 3000, 8500, 15000}, +- /* C7 */ +- {1, 10000, 30000, 300000}, +-}; +- + static uint32_t board_keymap[] = { + KEY(0, 0, KEY_LEFT), + KEY(0, 1, KEY_RIGHT), +@@ -883,7 +865,6 @@ static void __init omap_3430sdp_init(void) + omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); + omap_board_config = sdp3430_config; + omap_board_config_size = ARRAY_SIZE(sdp3430_config); +- omap3_pm_init_cpuidle(omap3_cpuidle_params_table); + omap3430_i2c_init(); + omap_display_init(&sdp3430_dss_data); + if (omap_rev() > OMAP3430_REV_ES1_0) +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0009-OMAP3-SR-make-notify-independent-of-class.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0009-OMAP3-SR-make-notify-independent-of-class.patch new file mode 100644 index 0000000000..88a45ba32b --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0009-OMAP3-SR-make-notify-independent-of-class.patch @@ -0,0 +1,48 @@ +From 62629e3664ff1e3c9b34b94b81eafa153671e1ed Mon Sep 17 00:00:00 2001 +From: Nishanth Menon +Date: Mon, 14 Feb 2011 12:16:36 +0530 +Subject: [PATCH 09/12] OMAP3+: SR: make notify independent of class + +Interrupt notification mechanism of SmartReflex can be used by the +choice of implementation of the class driver. For example, Class 2 and +Class 1.5 of SmartReflex can both use the interrupt notification to +identify the transition of voltage or other events. + +Hence, the actual class does not matter for notifier. Let the class +driver's handling decide how it should be used. SmartReflex driver +should provide just the primitives. + +Signed-off-by: Nishanth Menon +Signed-off-by: Kevin Hilman +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/smartreflex.c | 6 ++---- + 1 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c +index fb7dc52..3ee7261 100644 +--- a/arch/arm/mach-omap2/smartreflex.c ++++ b/arch/arm/mach-omap2/smartreflex.c +@@ -143,7 +143,7 @@ static irqreturn_t sr_interrupt(int irq, void *data) + sr_write_reg(sr_info, IRQSTATUS, status); + } + +- if (sr_class->class_type == SR_CLASS2 && sr_class->notify) ++ if (sr_class->notify) + sr_class->notify(sr_info->voltdm, status); + + return IRQ_HANDLED; +@@ -258,9 +258,7 @@ static int sr_late_init(struct omap_sr *sr_info) + struct resource *mem; + int ret = 0; + +- if (sr_class->class_type == SR_CLASS2 && +- sr_class->notify_flags && sr_info->irq) { +- ++ if (sr_class->notify && sr_class->notify_flags && sr_info->irq) { + name = kasprintf(GFP_KERNEL, "sr_%s", sr_info->voltdm->name); + if (name == NULL) { + ret = -ENOMEM; +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0010-OMAP3-SR-disable-interrupt-by-default.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0010-OMAP3-SR-disable-interrupt-by-default.patch new file mode 100644 index 0000000000..da171b021a --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0010-OMAP3-SR-disable-interrupt-by-default.patch @@ -0,0 +1,37 @@ +From 4aa0f416a44a7053d223f80a8e4be9d0ebdd31ae Mon Sep 17 00:00:00 2001 +From: Nishanth Menon +Date: Mon, 14 Feb 2011 12:41:10 +0530 +Subject: [PATCH 10/12] OMAP3+: SR: disable interrupt by default + +We will enable and disable interrupt on a need basis in the class +driver. We need to keep the IRQ disabled by default else the +forceupdate or vcbypass events could trigger events that we don't +need/expect to handle. + +This is a preparation for SmartReflex AVS class drivers such as +class 2 and class 1.5 which would need to use interrupts. Existing +SmartReflex AVS class 3 driver does not require to use interrupts +and is not impacted by this change. + +Signed-off-by: Nishanth Menon +Signed-off-by: Kevin Hilman +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/smartreflex.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c +index 3ee7261..616ef62 100644 +--- a/arch/arm/mach-omap2/smartreflex.c ++++ b/arch/arm/mach-omap2/smartreflex.c +@@ -268,6 +268,7 @@ static int sr_late_init(struct omap_sr *sr_info) + 0, name, (void *)sr_info); + if (ret) + goto error; ++ disable_irq(sr_info->irq); + } + + if (pdata && pdata->enable_on_init) +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0011-OMAP3-SR-enable-disable-SR-only-on-need.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0011-OMAP3-SR-enable-disable-SR-only-on-need.patch new file mode 100644 index 0000000000..925beddcf5 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0011-OMAP3-SR-enable-disable-SR-only-on-need.patch @@ -0,0 +1,41 @@ +From aa44b466398b8b104c07ff1b7209509300fc4f47 Mon Sep 17 00:00:00 2001 +From: Nishanth Menon +Date: Mon, 14 Feb 2011 21:14:17 +0530 +Subject: [PATCH 11/12] OMAP3+: SR: enable/disable SR only on need + +Since we already know the state of the autocomp enablement, we can +see if the requested state is different from the current state and +enable/disable SR only on the need basis. + +Signed-off-by: Nishanth Menon +Signed-off-by: Kevin Hilman +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/smartreflex.c | 11 +++++++---- + 1 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c +index 616ef62..3bd9fac 100644 +--- a/arch/arm/mach-omap2/smartreflex.c ++++ b/arch/arm/mach-omap2/smartreflex.c +@@ -807,10 +807,13 @@ static int omap_sr_autocomp_store(void *data, u64 val) + return -EINVAL; + } + +- if (!val) +- sr_stop_vddautocomp(sr_info); +- else +- sr_start_vddautocomp(sr_info); ++ /* control enable/disable only if there is a delta in value */ ++ if (sr_info->autocomp_active != val) { ++ if (!val) ++ sr_stop_vddautocomp(sr_info); ++ else ++ sr_start_vddautocomp(sr_info); ++ } + + return 0; + } +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0012-OMAP3-SR-fix-cosmetic-indentation.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0012-OMAP3-SR-fix-cosmetic-indentation.patch new file mode 100644 index 0000000000..7241112e13 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0012-OMAP3-SR-fix-cosmetic-indentation.patch @@ -0,0 +1,49 @@ +From 0ea922a6c65ea07b685ec05085dd5d3ec4ac87e2 Mon Sep 17 00:00:00 2001 +From: Nishanth Menon +Date: Mon, 14 Feb 2011 12:33:13 +0530 +Subject: [PATCH 12/12] OMAP3+: SR: fix cosmetic indentation + +Error label case seems to have a 2 tab indentation when just 1 is +necessary. + +Signed-off-by: Nishanth Menon +Signed-off-by: Kevin Hilman +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/smartreflex.c | 20 ++++++++++---------- + 1 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c +index 3bd9fac..2ce2fb7 100644 +--- a/arch/arm/mach-omap2/smartreflex.c ++++ b/arch/arm/mach-omap2/smartreflex.c +@@ -277,16 +277,16 @@ static int sr_late_init(struct omap_sr *sr_info) + return ret; + + error: +- iounmap(sr_info->base); +- mem = platform_get_resource(sr_info->pdev, IORESOURCE_MEM, 0); +- release_mem_region(mem->start, resource_size(mem)); +- list_del(&sr_info->node); +- dev_err(&sr_info->pdev->dev, "%s: ERROR in registering" +- "interrupt handler. Smartreflex will" +- "not function as desired\n", __func__); +- kfree(name); +- kfree(sr_info); +- return ret; ++ iounmap(sr_info->base); ++ mem = platform_get_resource(sr_info->pdev, IORESOURCE_MEM, 0); ++ release_mem_region(mem->start, resource_size(mem)); ++ list_del(&sr_info->node); ++ dev_err(&sr_info->pdev->dev, "%s: ERROR in registering" ++ "interrupt handler. Smartreflex will" ++ "not function as desired\n", __func__); ++ kfree(name); ++ kfree(sr_info); ++ return ret; + } + + static void sr_v1_disable(struct omap_sr *sr) +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0001-OMAP-DSS2-DSI-fix-use_sys_clk-highfreq.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0001-OMAP-DSS2-DSI-fix-use_sys_clk-highfreq.patch index 248d3312f9..3d836a0f91 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0001-OMAP-DSS2-DSI-fix-use_sys_clk-highfreq.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0001-OMAP-DSS2-DSI-fix-use_sys_clk-highfreq.patch @@ -1,7 +1,7 @@ -From 49958f1925489048aa5a6834f61d61c8551f8ec3 Mon Sep 17 00:00:00 2001 +From 6c106e173b2b0be58ba68e800d0e1bdd731174c4 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 7 Apr 2011 15:28:47 +0300 -Subject: [PATCH 01/28] OMAP: DSS2: DSI: fix use_sys_clk & highfreq +Subject: [PATCH 01/30] OMAP: DSS2: DSI: fix use_sys_clk & highfreq use_sys_clk and highfreq fields in dsi.current_cinfo were never set. Luckily they weren't used anywhere so it didn't cause any problems. diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0002-OMAP-DSS2-DSI-fix-dsi_dump_clocks.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0002-OMAP-DSS2-DSI-fix-dsi_dump_clocks.patch index 01fdd7276a..e32b8e9bcd 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0002-OMAP-DSS2-DSI-fix-dsi_dump_clocks.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0002-OMAP-DSS2-DSI-fix-dsi_dump_clocks.patch @@ -1,7 +1,7 @@ -From ccf7f535d7e809e563812f1c4897bdb9a1ff9233 Mon Sep 17 00:00:00 2001 +From c440fa0e7472cbe20b783de7ed14ffa8a9f3290f Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Mon, 4 Apr 2011 10:02:53 +0300 -Subject: [PATCH 02/28] OMAP: DSS2: DSI: fix dsi_dump_clocks() +Subject: [PATCH 02/30] OMAP: DSS2: DSI: fix dsi_dump_clocks() On OMAP4, reading DSI_PLL_CONFIGURATION2 register requires the L3 clock (CIO_CLK_ICG) to PLL. Currently dsi_dump_clocks() tries to read that diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0003-OMAP2PLUS-DSS2-Fix-Return-correct-lcd-clock-source-f.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0003-OMAP2PLUS-DSS2-Fix-Return-correct-lcd-clock-source-f.patch index fb49a3efe6..93beabbd7c 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0003-OMAP2PLUS-DSS2-Fix-Return-correct-lcd-clock-source-f.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0003-OMAP2PLUS-DSS2-Fix-Return-correct-lcd-clock-source-f.patch @@ -1,7 +1,7 @@ -From 2ffa7a6c3cafb4f2a48ae274b2952ad48ae78eeb Mon Sep 17 00:00:00 2001 +From d6e2082fe2d1abd4bb8d1492d28f5f76f09e6121 Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Thu, 31 Mar 2011 13:23:35 +0530 -Subject: [PATCH 03/28] OMAP2PLUS: DSS2: Fix: Return correct lcd clock source for OMAP2/3 +Subject: [PATCH 03/30] OMAP2PLUS: DSS2: Fix: Return correct lcd clock source for OMAP2/3 dss.lcd_clk_source is set to the default value DSS_CLK_SRC_FCK at dss_init. For OMAP2 and OMAP3, the dss.lcd_clk_source should always be the same as diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0004-OMAP-DSS-DSI-Fix-DSI-PLL-power-bug.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0004-OMAP-DSS-DSI-Fix-DSI-PLL-power-bug.patch index 81f82e7caa..fcf8f8972a 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0004-OMAP-DSS-DSI-Fix-DSI-PLL-power-bug.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0004-OMAP-DSS-DSI-Fix-DSI-PLL-power-bug.patch @@ -1,7 +1,7 @@ -From ee251e5c35b1325d696df35d297f34a9ccd6f5af Mon Sep 17 00:00:00 2001 +From 513d8f83be6a3e9a4b7f1ef23656ac84b109d7a8 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Fri, 15 Apr 2011 10:42:59 +0300 -Subject: [PATCH 04/28] OMAP: DSS: DSI: Fix DSI PLL power bug +Subject: [PATCH 04/30] OMAP: DSS: DSI: Fix DSI PLL power bug OMAP3630 has a HW bug causing DSI PLL power command POWER_ON_DIV (0x3) to not work properly. The bug prevents us from enabling DSI PLL power diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0005-OMAP-DSS2-fix-panel-Kconfig-dependencies.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0005-OMAP-DSS2-fix-panel-Kconfig-dependencies.patch index b1845e928f..be520fd15c 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0005-OMAP-DSS2-fix-panel-Kconfig-dependencies.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0005-OMAP-DSS2-fix-panel-Kconfig-dependencies.patch @@ -1,7 +1,7 @@ -From c479d815f14b4b5ed7871660027d043a432968a8 Mon Sep 17 00:00:00 2001 +From e9b70efca1b15f5e743cccacb925156ca99878a7 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Fri, 8 Apr 2011 09:30:27 +0300 -Subject: [PATCH 05/28] OMAP: DSS2: fix panel Kconfig dependencies +Subject: [PATCH 05/30] OMAP: DSS2: fix panel Kconfig dependencies All DPI panels were missing dependency to OMAP2_DSS_DPI. Add the dependency. diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0006-OMAP-DSS2-add-bootarg-for-selecting-svideo-or-compos.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0006-OMAP-DSS2-add-bootarg-for-selecting-svideo-or-compos.patch index 4b89760749..eeb41a2561 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0006-OMAP-DSS2-add-bootarg-for-selecting-svideo-or-compos.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0006-OMAP-DSS2-add-bootarg-for-selecting-svideo-or-compos.patch @@ -1,7 +1,7 @@ -From 661c19e763f0bda0a07bc64159c6b0c5f2f52b60 Mon Sep 17 00:00:00 2001 +From bf7e98aa062cf6a78e7f68089609f5693d5ca72b Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Tue, 19 Jan 2010 21:19:15 -0800 -Subject: [PATCH 06/28] OMAP: DSS2: add bootarg for selecting svideo or composite for tv output +Subject: [PATCH 06/30] OMAP: DSS2: add bootarg for selecting svideo or composite for tv output also add pal-16 and ntsc-16 omapfb.mode settings for 16bpp --- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0007-video-add-timings-for-hd720.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0007-video-add-timings-for-hd720.patch index f624d58a12..c9ecaddf40 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0007-video-add-timings-for-hd720.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0007-video-add-timings-for-hd720.patch @@ -1,7 +1,7 @@ -From 14ea4d9f0f90726b653b42697043e73ef699b4ba Mon Sep 17 00:00:00 2001 +From bb5ff1aa2cf586b544d17b9afa00a347eeeb7012 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Sat, 19 Dec 2009 06:52:43 -0800 -Subject: [PATCH 07/28] video: add timings for hd720 +Subject: [PATCH 07/30] video: add timings for hd720 --- drivers/video/modedb.c | 4 ++++ diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0008-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0008-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch index af14160d7e..2baf826c74 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0008-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0008-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch @@ -1,7 +1,7 @@ -From b62ecb49cfe8978390b7c8848e13555c4c699b0f Mon Sep 17 00:00:00 2001 +From b01ef0758c3ab86173b13d2da2d6850f520dfe80 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Tue, 15 Dec 2009 15:17:44 -0800 -Subject: [PATCH 08/28] drivers: net: smsc911x: return ENODEV if device is not found +Subject: [PATCH 08/30] drivers: net: smsc911x: return ENODEV if device is not found Signed-off-by: Steve Sakoman --- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0009-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0009-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch index 042ab44ad0..fab3b1829c 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0009-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0009-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch @@ -1,7 +1,7 @@ -From b1515f616ee48452a7cb2c5d0f31b1f8f4463f94 Mon Sep 17 00:00:00 2001 +From 5a26a8992c0baa8ff0944f0e09b1aee4dd5e3450 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Tue, 15 Dec 2009 15:24:10 -0800 -Subject: [PATCH 09/28] drivers: input: touchscreen: ads7846: return ENODEV if device is not found +Subject: [PATCH 09/30] drivers: input: touchscreen: ads7846: return ENODEV if device is not found Signed-off-by: Steve Sakoman --- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0010-Revert-omap2_mcspi-Flush-posted-writes.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0010-Revert-omap2_mcspi-Flush-posted-writes.patch index f5265a342d..876b47aa25 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0010-Revert-omap2_mcspi-Flush-posted-writes.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0010-Revert-omap2_mcspi-Flush-posted-writes.patch @@ -1,7 +1,7 @@ -From c2b7ff69cae57875b711eeb9cb6c97e7ba090c08 Mon Sep 17 00:00:00 2001 +From 03ae041e2cee01b98b8c6d46a94a2b9025f74e14 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Thu, 3 Mar 2011 13:29:30 -0800 -Subject: [PATCH 10/28] Revert "omap2_mcspi: Flush posted writes" +Subject: [PATCH 10/30] Revert "omap2_mcspi: Flush posted writes" This reverts commit a330ce2001b290c59fe98c37e981683ef0a75fdf. --- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0011-Revert-omap_hsmmc-improve-interrupt-synchronisation.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0011-Revert-omap_hsmmc-improve-interrupt-synchronisation.patch index 7592bab28f..78f6911683 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0011-Revert-omap_hsmmc-improve-interrupt-synchronisation.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0011-Revert-omap_hsmmc-improve-interrupt-synchronisation.patch @@ -1,7 +1,7 @@ -From ed9bca69fdaa7edac3573e5ef3f011c7f7dc4898 Mon Sep 17 00:00:00 2001 +From 94b2b9670eb5e0af73bd98a991bee9856fe0e654 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Fri, 19 Nov 2010 15:11:19 -0800 -Subject: [PATCH 11/28] Revert "omap_hsmmc: improve interrupt synchronisation" +Subject: [PATCH 11/30] Revert "omap_hsmmc: improve interrupt synchronisation" This reverts commit b417577d3b9bbb06a4ddc9aa955af9bd503f7242. diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0012-Don-t-turn-SDIO-cards-off-to-save-power.-Doing-so-wi.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0012-Don-t-turn-SDIO-cards-off-to-save-power.-Doing-so-wi.patch index f0a3aa45f0..3d51fca757 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0012-Don-t-turn-SDIO-cards-off-to-save-power.-Doing-so-wi.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0012-Don-t-turn-SDIO-cards-off-to-save-power.-Doing-so-wi.patch @@ -1,8 +1,7 @@ -From 1d73698debdf57f9da6c3312239459c43278e064 Mon Sep 17 00:00:00 2001 +From 0efaa4ad5c5040db8cfa729145ed64c5ff878e9e Mon Sep 17 00:00:00 2001 From: David Vrabel Date: Fri, 2 Apr 2010 08:41:47 -0700 -Subject: [PATCH 12/28] Don't turn SDIO cards off to save power. Doing so will lose all - internal state in the card. +Subject: [PATCH 12/30] Don't turn SDIO cards off to save power. Doing so will lose all internal state in the card. Signed-off-by: David Vrabel --- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0013-Enable-the-use-of-SDIO-card-interrupts.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0013-Enable-the-use-of-SDIO-card-interrupts.patch index f272276638..6756886e9d 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0013-Enable-the-use-of-SDIO-card-interrupts.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0013-Enable-the-use-of-SDIO-card-interrupts.patch @@ -1,7 +1,7 @@ -From bb4c074079c12d808367c8666cedcbba1dc456cc Mon Sep 17 00:00:00 2001 +From 008e668e53c5d230910d1b97deaff99ec2259e71 Mon Sep 17 00:00:00 2001 From: David Vrabel Date: Fri, 2 Apr 2010 08:42:22 -0700 -Subject: [PATCH 13/28] Enable the use of SDIO card interrupts. +Subject: [PATCH 13/30] Enable the use of SDIO card interrupts. FCLK must be enabled while SDIO interrupts are enabled or the MMC module won't wake-up (even though ENAWAKEUP in SYSCONFIG and IWE in diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0014-soc-codecs-Enable-audio-capture-by-default-for-twl40.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0014-soc-codecs-Enable-audio-capture-by-default-for-twl40.patch index 12243d60c0..8d95f94d67 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0014-soc-codecs-Enable-audio-capture-by-default-for-twl40.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0014-soc-codecs-Enable-audio-capture-by-default-for-twl40.patch @@ -1,7 +1,7 @@ -From cee637c9d2b877dd40c5fc8c42dc70a21adb454b Mon Sep 17 00:00:00 2001 +From 39a7aa6274c0d63acadc95a242f1a2ad47c1c680 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Thu, 17 Dec 2009 12:45:20 -0800 -Subject: [PATCH 14/28] soc: codecs: Enable audio capture by default for twl4030 +Subject: [PATCH 14/30] soc: codecs: Enable audio capture by default for twl4030 --- sound/soc/codecs/twl4030.c | 4 ++-- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0015-soc-codecs-twl4030-Turn-on-mic-bias-by-default.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0015-soc-codecs-twl4030-Turn-on-mic-bias-by-default.patch index b3fa02ca21..5979d07480 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0015-soc-codecs-twl4030-Turn-on-mic-bias-by-default.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0015-soc-codecs-twl4030-Turn-on-mic-bias-by-default.patch @@ -1,7 +1,7 @@ -From 19fbeb71b9576ecdefa7809980aa3f0eecda408c Mon Sep 17 00:00:00 2001 +From add8f3f1d3592c2976124062f70b88dd3e3f7673 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Wed, 29 Dec 2010 11:39:16 -0800 -Subject: [PATCH 15/28] soc: codecs: twl4030: Turn on mic bias by default +Subject: [PATCH 15/30] soc: codecs: twl4030: Turn on mic bias by default --- sound/soc/codecs/twl4030.c | 2 +- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0016-RTC-add-support-for-backup-battery-recharge.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0016-RTC-add-support-for-backup-battery-recharge.patch index 55673b37ab..11f6d4c5ab 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0016-RTC-add-support-for-backup-battery-recharge.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0016-RTC-add-support-for-backup-battery-recharge.patch @@ -1,7 +1,7 @@ -From 1c679da3fc28bd358c79b6fae05de81c9b84a681 Mon Sep 17 00:00:00 2001 +From 859eda7a9b4ff6240006b65679a3e04ecd7c474a Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Thu, 4 Feb 2010 12:26:22 -0800 -Subject: [PATCH 16/28] RTC: add support for backup battery recharge +Subject: [PATCH 16/30] RTC: add support for backup battery recharge --- drivers/rtc/rtc-twl.c | 25 +++++++++++++++++++++++++ diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0017-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0017-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch index 6aacbf7af8..ead233db11 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0017-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0017-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch @@ -1,7 +1,7 @@ -From 83b4a493176cbd50c8d2503440fecfa6e499f30e Mon Sep 17 00:00:00 2001 +From 31482a8ae0ca57e0e530564e589b16bfb2bbb93c Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Sun, 24 Jan 2010 09:33:56 -0800 -Subject: [PATCH 17/28] ARM: OMAP2: mmc-twl4030: move clock input selection prior to vcc test +Subject: [PATCH 17/30] ARM: OMAP2: mmc-twl4030: move clock input selection prior to vcc test otherwise it is not executed on systems that use non-twl regulators --- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0018-Add-power-off-support-for-the-TWL4030-companion.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0018-Add-power-off-support-for-the-TWL4030-companion.patch index c5359c1b01..77cf64f049 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0018-Add-power-off-support-for-the-TWL4030-companion.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0018-Add-power-off-support-for-the-TWL4030-companion.patch @@ -1,7 +1,7 @@ -From 890a8385d7f9bee69bf22616d16b225790b1d18c Mon Sep 17 00:00:00 2001 +From 41b834aed6b2902683102eacff56428158792187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20W=C3=B6rndl-Aichriedler?= Date: Sat, 15 May 2010 16:34:05 +0200 -Subject: [PATCH 18/28] Add power-off support for the TWL4030 companion +Subject: [PATCH 18/30] Add power-off support for the TWL4030 companion This patch adds support for the power-off on shutdown feature of the TWL4030 --- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0019-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0019-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch index 045089e0ac..5c4c6570f8 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0019-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0019-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch @@ -1,7 +1,7 @@ -From 5b1ae684aa507a50630555d48c834a6f1fd2d1cf Mon Sep 17 00:00:00 2001 +From 98ee7c7f078aa79db223967040598a49c46931fe Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Thu, 17 Dec 2009 14:27:15 -0800 -Subject: [PATCH 19/28] ARM: OMAP: Add twl4030 madc support to Overo +Subject: [PATCH 19/30] ARM: OMAP: Add twl4030 madc support to Overo Signed-off-by: Steve Sakoman --- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0020-Enabling-Hwmon-driver-for-twl4030-madc.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0020-Enabling-Hwmon-driver-for-twl4030-madc.patch index 771c2846e2..afd2a999d4 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0020-Enabling-Hwmon-driver-for-twl4030-madc.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0020-Enabling-Hwmon-driver-for-twl4030-madc.patch @@ -1,7 +1,7 @@ -From 79dc823c9ce624a2164a01b35a89452b22a7d174 Mon Sep 17 00:00:00 2001 +From 2efc7dd29df90a4e248c080797b1511db0399d67 Mon Sep 17 00:00:00 2001 From: Keerthy Date: Wed, 4 May 2011 01:14:50 +0530 -Subject: [PATCH 20/28] Enabling Hwmon driver for twl4030-madc +Subject: [PATCH 20/30] Enabling Hwmon driver for twl4030-madc Signed-off-by: Keerthy --- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0021-mfd-twl-core-enable-madc-clock.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0021-mfd-twl-core-enable-madc-clock.patch index 05cd10d1fa..805a35ef9c 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0021-mfd-twl-core-enable-madc-clock.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0021-mfd-twl-core-enable-madc-clock.patch @@ -1,7 +1,7 @@ -From 243d5534666eb795815f12d382cfcb77d5a43a8d Mon Sep 17 00:00:00 2001 +From 31b6b44adffe954ece851daff092f628a951712e Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Sat, 23 Jan 2010 06:26:54 -0800 -Subject: [PATCH 21/28] mfd: twl-core: enable madc clock +Subject: [PATCH 21/30] mfd: twl-core: enable madc clock Now that the madc driver has been merged it is also necessary to enable the clock to the madc block diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0022-rtc-twl-Switch-to-using-threaded-irq.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0022-rtc-twl-Switch-to-using-threaded-irq.patch new file mode 100644 index 0000000000..809f3ed1e0 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0022-rtc-twl-Switch-to-using-threaded-irq.patch @@ -0,0 +1,25 @@ +From e0dc7f9a7d63c8cd5e4183cf5626ec11e272e3e0 Mon Sep 17 00:00:00 2001 +From: Ilkka Koskinen +Date: Wed, 16 Mar 2011 16:07:14 +0000 +Subject: [PATCH 22/30] rtc-twl: Switch to using threaded irq + +--- + drivers/rtc/rtc-twl.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c +index 713b8ea..1fe1bc9 100644 +--- a/drivers/rtc/rtc-twl.c ++++ b/drivers/rtc/rtc-twl.c +@@ -479,7 +479,7 @@ static int __devinit twl_rtc_probe(struct platform_device *pdev) + if (ret < 0) + goto out1; + +- ret = request_irq(irq, twl_rtc_interrupt, ++ ret = request_threaded_irq(irq, NULL, twl_rtc_interrupt, + IRQF_TRIGGER_RISING, + dev_name(&rtc->dev), rtc); + if (ret < 0) { +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0022-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0023-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch similarity index 91% rename from recipes/linux/linux-omap-2.6.39/sakoman/0022-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch rename to recipes/linux/linux-omap-2.6.39/sakoman/0023-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch index 6d2a38a785..4afc7e1744 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0022-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0023-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch @@ -1,7 +1,7 @@ -From df17c7eeca25cd9923828a4732a995e2c37d070b Mon Sep 17 00:00:00 2001 +From 80ac44d7f93ac3b8db9921feed4080c8dc572c0f Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Wed, 24 Feb 2010 10:37:22 -0800 -Subject: [PATCH 22/28] ARM: OMAP: automatically set musb mode in platform data based on CONFIG options +Subject: [PATCH 23/30] ARM: OMAP: automatically set musb mode in platform data based on CONFIG options --- arch/arm/mach-omap2/board-omap3beagle.c | 6 ++++++ diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0023-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0024-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch similarity index 86% rename from recipes/linux/linux-omap-2.6.39/sakoman/0023-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch rename to recipes/linux/linux-omap-2.6.39/sakoman/0024-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch index 212c5f0264..9aac69d070 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0023-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0024-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch @@ -1,7 +1,7 @@ -From c60f16ec7e69f59b3bef9f9b7041a973d144dc87 Mon Sep 17 00:00:00 2001 +From 3b7393eb41684f3f44e8c15bbba4ab0e830f8810 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Wed, 12 Jan 2011 05:54:55 -0800 -Subject: [PATCH 23/28] omap: mmc: Adjust dto to eliminate timeout errors +Subject: [PATCH 24/30] omap: mmc: Adjust dto to eliminate timeout errors A number of SD card types were experiencing timeout errors. This could also lead to data corruption in some cases. diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0024-omap-Fix-mtd-subpage-read-alignment.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0025-omap-Fix-mtd-subpage-read-alignment.patch similarity index 96% rename from recipes/linux/linux-omap-2.6.39/sakoman/0024-omap-Fix-mtd-subpage-read-alignment.patch rename to recipes/linux/linux-omap-2.6.39/sakoman/0025-omap-Fix-mtd-subpage-read-alignment.patch index 13b7631a16..b0828c2eb3 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0024-omap-Fix-mtd-subpage-read-alignment.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0025-omap-Fix-mtd-subpage-read-alignment.patch @@ -1,7 +1,7 @@ -From 592fdd511dacc42bf97f249ca596ba28d0c25281 Mon Sep 17 00:00:00 2001 +From 5c688ec6e6f046d2c8b3821964971149b0c30fc7 Mon Sep 17 00:00:00 2001 From: Charles Manning Date: Tue, 18 Jan 2011 11:25:25 +1300 -Subject: [PATCH 24/28] omap: Fix mtd subpage read alignment +Subject: [PATCH 25/30] omap: Fix mtd subpage read alignment This allows the omap2 prefetch engine to work properly for subpage reads. Without this ECC errors will stop UBIFS from working. diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0025-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0026-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch similarity index 87% rename from recipes/linux/linux-omap-2.6.39/sakoman/0025-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch rename to recipes/linux/linux-omap-2.6.39/sakoman/0026-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch index dadaa1c445..b9b235a00f 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0025-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0026-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch @@ -1,7 +1,7 @@ -From 2611e93b57147877fabb181bd86c78fd425a5467 Mon Sep 17 00:00:00 2001 +From 3592c2e24b0af79aa2fb181a9825d5b72e2f68dd Mon Sep 17 00:00:00 2001 From: Charles Manning Date: Thu, 16 Dec 2010 20:35:56 -0800 -Subject: [PATCH 25/28] mtd: nand: omap2: Force all buffer reads to u32 alignment +Subject: [PATCH 26/30] mtd: nand: omap2: Force all buffer reads to u32 alignment --- drivers/mtd/nand/omap2.c | 12 ++++++++++++ diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0026-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0027-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch similarity index 94% rename from recipes/linux/linux-omap-2.6.39/sakoman/0026-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch rename to recipes/linux/linux-omap-2.6.39/sakoman/0027-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch index c8dacdc985..bd283faf0f 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0026-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0027-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch @@ -1,7 +1,7 @@ -From 1f0278a4f5475cc9ad67e007763368dfdd7dee29 Mon Sep 17 00:00:00 2001 +From 22a6c2c3d2dafd4084945472fbeed2a94893ddb4 Mon Sep 17 00:00:00 2001 From: kishore kadiyala Date: Mon, 2 May 2011 11:10:38 +0000 -Subject: [PATCH 26/28] omap : nand : fix subpage ecc issue with prefetch +Subject: [PATCH 27/30] omap : nand : fix subpage ecc issue with prefetch For prefetch engine, read and write got broken in commit '2c01946c'. We never hit a scenario of not getting 'gpmc_prefetch_enable' diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0027-OMAP-Overo-Add-support-for-spidev.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0028-OMAP-Overo-Add-support-for-spidev.patch similarity index 91% rename from recipes/linux/linux-omap-2.6.39/sakoman/0027-OMAP-Overo-Add-support-for-spidev.patch rename to recipes/linux/linux-omap-2.6.39/sakoman/0028-OMAP-Overo-Add-support-for-spidev.patch index d126ca7385..80b44aeb1e 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0027-OMAP-Overo-Add-support-for-spidev.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0028-OMAP-Overo-Add-support-for-spidev.patch @@ -1,7 +1,7 @@ -From 61e1cb7dbff3b611644d6ba811f8b83db148c1e1 Mon Sep 17 00:00:00 2001 +From 7c2667ccc5741129830c0188b50c347e3cc4edd5 Mon Sep 17 00:00:00 2001 From: Scott Ellis Date: Sun, 23 Jan 2011 20:39:35 -0800 -Subject: [PATCH 27/28] OMAP: Overo: Add support for spidev +Subject: [PATCH 28/30] OMAP: Overo: Add support for spidev --- arch/arm/mach-omap2/board-overo.c | 16 ++++++++++++++++ diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0028-unionfs-Add-support-for-unionfs-2.5.9.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0029-unionfs-Add-support-for-unionfs-2.5.9.patch similarity index 99% rename from recipes/linux/linux-omap-2.6.39/sakoman/0028-unionfs-Add-support-for-unionfs-2.5.9.patch rename to recipes/linux/linux-omap-2.6.39/sakoman/0029-unionfs-Add-support-for-unionfs-2.5.9.patch index 24cc728707..30fba1bc1d 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0028-unionfs-Add-support-for-unionfs-2.5.9.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0029-unionfs-Add-support-for-unionfs-2.5.9.patch @@ -1,7 +1,7 @@ -From d84fb8f137d9392574422213ec6c3dc53bb00abf Mon Sep 17 00:00:00 2001 +From e6b1af4def888530e5dfeaaf4338f248e9d0f677 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Mon, 2 May 2011 16:14:34 -0700 -Subject: [PATCH 28/28] unionfs: Add support for unionfs 2.5.9 +Subject: [PATCH 29/30] unionfs: Add support for unionfs 2.5.9 --- Documentation/filesystems/00-INDEX | 2 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0030-omap-Change-omap_device-activate-latency-messages-fr.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0030-omap-Change-omap_device-activate-latency-messages-fr.patch new file mode 100644 index 0000000000..67112a31ab --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0030-omap-Change-omap_device-activate-latency-messages-fr.patch @@ -0,0 +1,34 @@ +From 9f9d70c4d1caf249ab36c656c5e89db91d7c981b Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Mon, 23 May 2011 12:16:50 -0700 +Subject: [PATCH 30/30] omap: Change omap_device activate latency messages from pr_warning to pr_debug + +Messages can be safely ignored, so reduce console noise + +Signed-off-by: Steve Sakoman +--- + arch/arm/plat-omap/omap_device.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c +index 9bbda9a..ca8a479 100644 +--- a/arch/arm/plat-omap/omap_device.c ++++ b/arch/arm/plat-omap/omap_device.c +@@ -145,12 +145,12 @@ static int _omap_device_activate(struct omap_device *od, u8 ignore_lat) + odpl->activate_lat_worst = act_lat; + if (odpl->flags & OMAP_DEVICE_LATENCY_AUTO_ADJUST) { + odpl->activate_lat = act_lat; +- pr_warning("omap_device: %s.%d: new worst case " ++ pr_debug("omap_device: %s.%d: new worst case " + "activate latency %d: %llu\n", + od->pdev.name, od->pdev.id, + od->pm_lat_level, act_lat); + } else +- pr_warning("omap_device: %s.%d: activate " ++ pr_debug("omap_device: %s.%d: activate " + "latency %d higher than exptected. " + "(%llu > %d)\n", + od->pdev.name, od->pdev.id, +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap_2.6.39.bb b/recipes/linux/linux-omap_2.6.39.bb index 1ecb662b94..db11bf9111 100644 --- a/recipes/linux/linux-omap_2.6.39.bb +++ b/recipes/linux/linux-omap_2.6.39.bb @@ -1,20 +1,18 @@ require multi-kernel.inc -# development kernel -DEFAULT_PREFERENCE = "-1" - DESCRIPTION = "Linux kernel for OMAP processors" KERNEL_IMAGETYPE = "uImage" COMPATIBLE_MACHINE = "(beagleboard)" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -SRCREV = "v2.6.39" +SRCREV_pn-${PN} = "v2.6.39" +MACHINE_KERNEL_PR_append = "d" FILESPATHPKG_prepend = "linux-omap-2.6.39:" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ - file://defconfig" +SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ + file://defconfig" SRC_URI_append = " \ file://sakoman/0001-OMAP-DSS2-DSI-fix-use_sys_clk-highfreq.patch \ @@ -38,16 +36,62 @@ SRC_URI_append = " \ file://sakoman/0019-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch \ file://sakoman/0020-Enabling-Hwmon-driver-for-twl4030-madc.patch \ file://sakoman/0021-mfd-twl-core-enable-madc-clock.patch \ - file://sakoman/0022-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch \ - file://sakoman/0023-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch \ - file://sakoman/0024-omap-Fix-mtd-subpage-read-alignment.patch \ - file://sakoman/0025-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch \ - file://sakoman/0026-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch \ - file://sakoman/0027-OMAP-Overo-Add-support-for-spidev.patch \ - file://sakoman/0028-unionfs-Add-support-for-unionfs-2.5.9.patch \ + file://sakoman/0022-rtc-twl-Switch-to-using-threaded-irq.patch \ + file://sakoman/0023-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch \ + file://sakoman/0024-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch \ + file://sakoman/0025-omap-Fix-mtd-subpage-read-alignment.patch \ + file://sakoman/0026-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch \ + file://sakoman/0027-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch \ + file://sakoman/0028-OMAP-Overo-Add-support-for-spidev.patch \ + file://sakoman/0029-unionfs-Add-support-for-unionfs-2.5.9.patch \ + file://sakoman/0030-omap-Change-omap_device-activate-latency-messages-fr.patch \ \ file://beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch \ file://beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch \ + file://beagle/0003-OMAP3-beagle-add-MADC-support.patch \ + file://beagle/0004-OMAP3-beagle-add-regulators-for-camera-interface.patch \ + file://beagle/0005-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch \ + \ + file://camera/0001-Add-mt9p031-sensor-support.patch \ + \ + file://pm/linux-omap-2.6.39-ti-pm/0001-OMAP3-voltage-remove-spurious-pr_notice-for-debugfs.patch \ + file://pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch \ + file://pm/linux-omap-2.6.39-ti-pm/0003-OMAP3-smartreflex-fix-sr_late_init-error-path-in-pro.patch \ + file://pm/linux-omap-2.6.39-ti-pm/0004-OMAP3-smartreflex-request-the-memory-region.patch \ + file://pm/linux-omap-2.6.39-ti-pm/0005-OMAP3-smartreflex-fix-ioremap-leak-on-probe-error.patch \ + file://pm/linux-omap-2.6.39-ti-pm/0006-OMAP3-smartreflex-delete-instance-from-sr_list-on-pr.patch \ + file://pm/linux-omap-2.6.39-ti-pm/0007-OMAP3-smartreflex-delete-debugfs-entries-on-probe-er.patch \ + file://pm/linux-omap-2.6.39-ti-pm/0008-OMAP3-cpuidle-remove-useless-SDP-specific-timings.patch \ + file://pm/linux-omap-2.6.39-ti-pm/0009-OMAP3-SR-make-notify-independent-of-class.patch \ + file://pm/linux-omap-2.6.39-ti-pm/0010-OMAP3-SR-disable-interrupt-by-default.patch \ + file://pm/linux-omap-2.6.39-ti-pm/0011-OMAP3-SR-enable-disable-SR-only-on-need.patch \ + file://pm/linux-omap-2.6.39-ti-pm/0012-OMAP3-SR-fix-cosmetic-indentation.patch \ + \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0001-OMAP-CPUfreq-ensure-driver-initializes-after-cpufreq.patch \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0002-OMAP-CPUfreq-ensure-policy-is-fully-initialized.patch \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0003-OMAP3-PM-CPUFreq-driver-for-OMAP3.patch \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0004-OMAP-PM-CPUFREQ-Fix-conditional-compilation.patch \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0005-cpufreq-fixup-after-new-OPP-layer-merged.patch \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0006-OMAP-cpufreq-Split-OMAP1-and-OMAP2PLUS-CPUfreq-drive.patch \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0007-OMAP2PLUS-cpufreq-Add-SMP-support-to-cater-OMAP4430.patch \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0008-OMAP2PLUS-cpufreq-Fix-typo-when-attempting-to-set-mp.patch \ + \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-hotplug/0001-cpufreq-helpers-for-walking-the-frequency-table.patch \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-hotplug/0002-cpufreq-introduce-hotplug-governor.patch \ + \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0001-OMAP2-cpufreq-free-up-table-on-exit.patch \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0002-OMAP2-cpufreq-handle-invalid-cpufreq-table.patch \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0003-OMAP2-cpufreq-minor-comment-cleanup.patch \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0004-OMAP2-cpufreq-use-clk_init_cpufreq_table-if-OPPs-not.patch \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0005-OMAP2-cpufreq-use-cpufreq_frequency_table_target.patch \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0006-OMAP2-cpufreq-fix-freq_table-leak.patch \ + \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0001-OMAP2-clockdomain-Add-an-api-to-read-idle-mode.patch \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0002-OMAP2-clockdomain-Add-SoC-support-for-clkdm_is_idle.patch \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0003-OMAP2-PM-Initialise-sleep_switch-to-a-non-valid-valu.patch \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0004-OMAP2-PM-idle-clkdms-only-if-already-in-idle.patch \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0005-OMAP2-hwmod-Follow-the-recomended-PRCM-sequence.patch \ + file://pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0006-OMAP-Serial-Check-wk_st-only-if-present.patch \ " SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ From 78db68f5686ee2913d18534b6efde8a8701aa175 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 26 May 2011 16:22:08 +0200 Subject: [PATCH 354/509] linux-omap 2.6.39: sync with meta-texasinstruments Signed-off-by: Koen Kooi --- ...-support-for-beagleboard-xM-revision.patch | 2 +- ...agle-add-support-for-expansionboards.patch | 2 +- .../0003-OMAP3-beagle-add-MADC-support.patch | 2 +- ...-add-regulators-for-camera-interface.patch | 27 +- ...05-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch | 6 +- .../linux-omap-2.6.39/beagleboard/defconfig | 7 +- .../0001-Add-mt9p031-sensor-driver.patch | 918 ++++++++++++++++++ .../0001-Add-mt9p031-sensor-support.patch | 917 ----------------- ...dd-support-for-mt9p031-sensor-driver.patch | 142 +++ ...MAP3-beagle-only-init-camera-on-3630.patch | 34 + .../0004-v4l-Add-mt9v032-sensor-driver.patch | 853 ++++++++++++++++ ...-OMAP2-cpufreq-free-up-table-on-exit.patch | 2 +- ...cpufreq-handle-invalid-cpufreq-table.patch | 2 +- ...-OMAP2-cpufreq-minor-comment-cleanup.patch | 2 +- ...e-clk_init_cpufreq_table-if-OPPs-not.patch | 2 +- ...q-use-cpufreq_frequency_table_target.patch | 2 +- ...06-OMAP2-cpufreq-fix-freq_table-leak.patch | 2 +- ...pers-for-walking-the-frequency-table.patch | 2 +- ...2-cpufreq-introduce-hotplug-governor.patch | 2 +- ...ure-driver-initializes-after-cpufreq.patch | 2 +- ...q-ensure-policy-is-fully-initialized.patch | 2 +- ...03-OMAP3-PM-CPUFreq-driver-for-OMAP3.patch | 2 +- ...-CPUFREQ-Fix-conditional-compilation.patch | 2 +- ...req-fixup-after-new-OPP-layer-merged.patch | 2 +- ...it-OMAP1-and-OMAP2PLUS-CPUfreq-drive.patch | 2 +- ...eq-Add-SMP-support-to-cater-OMAP4430.patch | 2 +- ...q-Fix-typo-when-attempting-to-set-mp.patch | 2 +- ...kdomain-Add-an-api-to-read-idle-mode.patch | 2 +- ...in-Add-SoC-support-for-clkdm_is_idle.patch | 2 +- ...ise-sleep_switch-to-a-non-valid-valu.patch | 2 +- ...-idle-clkdms-only-if-already-in-idle.patch | 2 +- ...-Follow-the-recomended-PRCM-sequence.patch | 2 +- ...P-Serial-Check-wk_st-only-if-present.patch | 2 +- ...emove-spurious-pr_notice-for-debugfs.patch | 2 +- ...-PM-remove-redundant-ifdef-CONFIG_PM.patch | 2 +- ...x-fix-sr_late_init-error-path-in-pro.patch | 2 +- ...martreflex-request-the-memory-region.patch | 2 +- ...flex-fix-ioremap-leak-on-probe-error.patch | 2 +- ...x-delete-instance-from-sr_list-on-pr.patch | 2 +- ...x-delete-debugfs-entries-on-probe-er.patch | 2 +- ...-remove-useless-SDP-specific-timings.patch | 2 +- ...-SR-make-notify-independent-of-class.patch | 2 +- ...MAP3-SR-disable-interrupt-by-default.patch | 2 +- ...P3-SR-enable-disable-SR-only-on-need.patch | 2 +- ...12-OMAP3-SR-fix-cosmetic-indentation.patch | 2 +- ...AP-DSS2-DSI-fix-use_sys_clk-highfreq.patch | 4 +- ...02-OMAP-DSS2-DSI-fix-dsi_dump_clocks.patch | 4 +- ...ix-Return-correct-lcd-clock-source-f.patch | 4 +- ...4-OMAP-DSS-DSI-Fix-DSI-PLL-power-bug.patch | 4 +- ...-DSS2-fix-panel-Kconfig-dependencies.patch | 4 +- ...otarg-for-selecting-svideo-or-compos.patch | 4 +- .../0007-video-add-timings-for-hd720.patch | 4 +- ...911x-return-ENODEV-if-device-is-not-.patch | 4 +- ...uchscreen-ads7846-return-ENODEV-if-d.patch | 4 +- ...vert-omap2_mcspi-Flush-posted-writes.patch | 4 +- ...mc-improve-interrupt-synchronisation.patch | 4 +- ...cards-off-to-save-power.-Doing-so-wi.patch | 4 +- ...able-the-use-of-SDIO-card-interrupts.patch | 4 +- ...e-audio-capture-by-default-for-twl40.patch | 4 +- ...-twl4030-Turn-on-mic-bias-by-default.patch | 4 +- ...-support-for-backup-battery-recharge.patch | 4 +- ...l4030-move-clock-input-selection-pri.patch | 4 +- ...ff-support-for-the-TWL4030-companion.patch | 4 +- ...AP-Add-twl4030-madc-support-to-Overo.patch | 4 +- ...abling-Hwmon-driver-for-twl4030-madc.patch | 4 +- .../0021-mfd-twl-core-enable-madc-clock.patch | 4 +- ...rtc-twl-Switch-to-using-threaded-irq.patch | 4 +- ...ically-set-musb-mode-in-platform-dat.patch | 4 +- ...just-dto-to-eliminate-timeout-errors.patch | 4 +- ...-omap-Fix-mtd-subpage-read-alignment.patch | 4 +- ...orce-all-buffer-reads-to-u32-alignme.patch | 4 +- ...-fix-subpage-ecc-issue-with-prefetch.patch | 4 +- ...28-OMAP-Overo-Add-support-for-spidev.patch | 4 +- ...nionfs-Add-support-for-unionfs-2.5.9.patch | 4 +- ..._device-activate-latency-messages-fr.patch | 4 +- .../0031-omap-overo-Add-opp-init.patch | 105 ++ recipes/linux/linux-omap_2.6.39.bb | 8 +- 77 files changed, 2184 insertions(+), 1027 deletions(-) create mode 100644 recipes/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-driver.patch delete mode 100644 recipes/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-support.patch create mode 100644 recipes/linux/linux-omap-2.6.39/camera/0002-OMAP3BEAGLE-Add-support-for-mt9p031-sensor-driver.patch create mode 100644 recipes/linux/linux-omap-2.6.39/camera/0003-OMAP3-beagle-only-init-camera-on-3630.patch create mode 100644 recipes/linux/linux-omap-2.6.39/camera/0004-v4l-Add-mt9v032-sensor-driver.patch create mode 100644 recipes/linux/linux-omap-2.6.39/sakoman/0031-omap-overo-Add-opp-init.patch diff --git a/recipes/linux/linux-omap-2.6.39/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch b/recipes/linux/linux-omap-2.6.39/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch index 30063f9de5..2bd76c3cec 100644 --- a/recipes/linux/linux-omap-2.6.39/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch +++ b/recipes/linux/linux-omap-2.6.39/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch @@ -1,4 +1,4 @@ -From 2dd4bf287ad066e3d9e82c239782fb649c6f7fe7 Mon Sep 17 00:00:00 2001 +From 812ef26f4be80d12facd62adce971ec9fe64a144 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 20 May 2011 12:48:37 +0200 Subject: [PATCH 1/5] OMAP3: beagle: add support for beagleboard xM revision C diff --git a/recipes/linux/linux-omap-2.6.39/beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch b/recipes/linux/linux-omap-2.6.39/beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch index f815a58ac4..ab63acf561 100644 --- a/recipes/linux/linux-omap-2.6.39/beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch +++ b/recipes/linux/linux-omap-2.6.39/beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch @@ -1,4 +1,4 @@ -From 258a21a495a9ba2238081cd473b4796cd61a60e7 Mon Sep 17 00:00:00 2001 +From e87dd8c997e212b8c14468c869c83d6953da3c34 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 20 May 2011 13:06:24 +0200 Subject: [PATCH 2/5] OMAP3: beagle: add support for expansionboards diff --git a/recipes/linux/linux-omap-2.6.39/beagle/0003-OMAP3-beagle-add-MADC-support.patch b/recipes/linux/linux-omap-2.6.39/beagle/0003-OMAP3-beagle-add-MADC-support.patch index 0f5c0bd56c..7984a30ece 100644 --- a/recipes/linux/linux-omap-2.6.39/beagle/0003-OMAP3-beagle-add-MADC-support.patch +++ b/recipes/linux/linux-omap-2.6.39/beagle/0003-OMAP3-beagle-add-MADC-support.patch @@ -1,4 +1,4 @@ -From b6deb9a9c3a0c8b9afc981cbca20ff73fa7a8d8c Mon Sep 17 00:00:00 2001 +From 140a5cddce807e20e32a5ddcf7c00a758ff5016d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 21 May 2011 16:18:30 +0200 Subject: [PATCH 3/5] OMAP3: beagle: add MADC support diff --git a/recipes/linux/linux-omap-2.6.39/beagle/0004-OMAP3-beagle-add-regulators-for-camera-interface.patch b/recipes/linux/linux-omap-2.6.39/beagle/0004-OMAP3-beagle-add-regulators-for-camera-interface.patch index 900502d2bb..29ebb401cf 100644 --- a/recipes/linux/linux-omap-2.6.39/beagle/0004-OMAP3-beagle-add-regulators-for-camera-interface.patch +++ b/recipes/linux/linux-omap-2.6.39/beagle/0004-OMAP3-beagle-add-regulators-for-camera-interface.patch @@ -1,15 +1,15 @@ -From 0ba8b335b9dd023784ef493b524d6335bfcd453a Mon Sep 17 00:00:00 2001 +From 482c65c01edad75e2b8a3fa07f0fc914e3c9b9d9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 25 May 2011 08:56:06 +0200 Subject: [PATCH 4/5] OMAP3: beagle: add regulators for camera interface Signed-off-by: Koen Kooi --- - arch/arm/mach-omap2/board-omap3beagle.c | 40 +++++++++++++++++++++++++++++++ - 1 files changed, 40 insertions(+), 0 deletions(-) + arch/arm/mach-omap2/board-omap3beagle.c | 50 +++++++++++++++++++++++++++++++ + 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index da4ba50..52ea11a 100644 +index da4ba50..211cbdf 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -453,6 +453,44 @@ static struct regulator_consumer_supply beagle_vsim_supply = { @@ -57,7 +57,24 @@ index da4ba50..52ea11a 100644 static int beagle_twl_gpio_setup(struct device *dev, unsigned gpio, unsigned ngpio) { -@@ -651,6 +689,8 @@ static struct twl4030_platform_data beagle_twldata = { +@@ -504,6 +542,16 @@ static int beagle_twl_gpio_setup(struct device *dev, + pr_err("%s: unable to configure EHCI_nOC\n", __func__); + } + ++ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { ++ /* ++ * Power on camera interface - only on pre-production, not ++ * needed on production boards ++ */ ++ gpio_request(gpio + 2, "CAM_EN"); ++ gpio_direction_output(gpio + 2, 1); ++ } ++ ++ + /* + * TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, XM active + * high / others active low) +@@ -651,6 +699,8 @@ static struct twl4030_platform_data beagle_twldata = { .vsim = &beagle_vsim, .vdac = &beagle_vdac, .vpll2 = &beagle_vpll2, diff --git a/recipes/linux/linux-omap-2.6.39/beagle/0005-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch b/recipes/linux/linux-omap-2.6.39/beagle/0005-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch index a555c9319b..c0e31042ae 100644 --- a/recipes/linux/linux-omap-2.6.39/beagle/0005-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch +++ b/recipes/linux/linux-omap-2.6.39/beagle/0005-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch @@ -1,4 +1,4 @@ -From 5b0f364b7e017d422b01c0e3297d0b68119f95f0 Mon Sep 17 00:00:00 2001 +From 6654672586808d22510d06d54464f4fe32ae6e80 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 25 May 2011 08:57:40 +0200 Subject: [PATCH 5/5] OMAP3: beagle: HACK! add in 1GHz OPP @@ -9,10 +9,10 @@ Signed-off-by: Koen Kooi 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 52ea11a..cf95173 100644 +index 211cbdf..221bfda 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -901,11 +901,13 @@ static void __init beagle_opp_init(void) +@@ -911,11 +911,13 @@ static void __init beagle_opp_init(void) /* Enable MPU 1GHz and lower opps */ dev = &mh->od->pdev.dev; r = opp_enable(dev, 800000000); diff --git a/recipes/linux/linux-omap-2.6.39/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.39/beagleboard/defconfig index e2502650e0..c2c9e55ae7 100644 --- a/recipes/linux/linux-omap-2.6.39/beagleboard/defconfig +++ b/recipes/linux/linux-omap-2.6.39/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/arm 2.6.39 Kernel Configuration -# Wed May 25 09:25:56 2011 +# Thu May 26 10:49:51 2011 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -2041,8 +2041,9 @@ CONFIG_VIDEO_ADV7180=m # CONFIG_VIDEO_BT866 is not set # CONFIG_VIDEO_KS0127 is not set CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_MT9P031=m +CONFIG_VIDEO_MT9P031=y CONFIG_VIDEO_MT9V011=m +CONFIG_VIDEO_MT9V032=y # CONFIG_VIDEO_TCM825X is not set # CONFIG_VIDEO_SAA7110 is not set CONFIG_VIDEO_SAA711X=m @@ -2090,7 +2091,7 @@ CONFIG_VIDEO_TIMBERDALE=m CONFIG_VIDEO_SR030PC30=m CONFIG_VIDEO_NOON010PC30=m CONFIG_VIDEO_OMAP3=y -# CONFIG_VIDEO_OMAP3_DEBUG is not set +CONFIG_VIDEO_OMAP3_DEBUG=y # CONFIG_SOC_CAMERA is not set CONFIG_V4L_USB_DRIVERS=y CONFIG_USB_VIDEO_CLASS=m diff --git a/recipes/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-driver.patch b/recipes/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-driver.patch new file mode 100644 index 0000000000..9746415fdc --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-driver.patch @@ -0,0 +1,918 @@ +From 327e65fc0d86911bda7c1f37fb5c3534d1b2c849 Mon Sep 17 00:00:00 2001 +From: Javier Martin +Date: Thu, 26 May 2011 07:20:53 +0000 +Subject: [PATCH 1/4] Add mt9p031 sensor driver. + +This patch applies on 2.6.39 (commit 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf). +It has some power management issue which causes horizontal random lines on +the image. If we do not disable 1v8 regulator, the problem disappears. +I would like to get some help on fixing whatever the problem with power +management is. + +Signed-off-by: Javier Martin +--- + drivers/media/video/Kconfig | 7 + + drivers/media/video/Makefile | 1 + + drivers/media/video/mt9p031.c | 841 +++++++++++++++++++++++++++++++++++++++++ + include/media/mt9p031.h | 11 + + 4 files changed, 860 insertions(+), 0 deletions(-) + create mode 100644 drivers/media/video/mt9p031.c + create mode 100644 include/media/mt9p031.h + +diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig +index 00f51dd..cb87e35 100644 +--- a/drivers/media/video/Kconfig ++++ b/drivers/media/video/Kconfig +@@ -329,6 +329,13 @@ config VIDEO_OV7670 + OV7670 VGA camera. It currently only works with the M88ALP01 + controller. + ++config VIDEO_MT9P031 ++ tristate "Aptina MT9P031 support" ++ depends on I2C && VIDEO_V4L2 ++ ---help--- ++ This is a Video4Linux2 sensor-level driver for the Aptina ++ (Micron) mt9p031 5 Mpixel camera. ++ + config VIDEO_MT9V011 + tristate "Micron mt9v011 sensor support" + depends on I2C && VIDEO_V4L2 +diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile +index ace5d8b..912b29b 100644 +--- a/drivers/media/video/Makefile ++++ b/drivers/media/video/Makefile +@@ -65,6 +65,7 @@ obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o + obj-$(CONFIG_VIDEO_OV7670) += ov7670.o + obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o + obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o ++obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o + obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o + obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o + obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o +diff --git a/drivers/media/video/mt9p031.c b/drivers/media/video/mt9p031.c +new file mode 100644 +index 0000000..242bea9 +--- /dev/null ++++ b/drivers/media/video/mt9p031.c +@@ -0,0 +1,841 @@ ++/* ++ * Driver for MT9P031 CMOS Image Sensor from Aptina ++ * ++ * Copyright (C) 2011, Javier Martin ++ * ++ * Copyright (C) 2011, Guennadi Liakhovetski ++ * ++ * Based on the MT9V032 driver and Bastian Hecht's code. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++#define MT9P031_PIXCLK_FREQ 54000000 ++ ++/* mt9p031 selected register addresses */ ++#define MT9P031_CHIP_VERSION 0x00 ++#define MT9P031_CHIP_VERSION_VALUE 0x1801 ++#define MT9P031_ROW_START 0x01 ++#define MT9P031_ROW_START_DEF 54 ++#define MT9P031_COLUMN_START 0x02 ++#define MT9P031_COLUMN_START_DEF 16 ++#define MT9P031_WINDOW_HEIGHT 0x03 ++#define MT9P031_WINDOW_WIDTH 0x04 ++#define MT9P031_H_BLANKING 0x05 ++#define MT9P031_H_BLANKING_VALUE 0 ++#define MT9P031_V_BLANKING 0x06 ++#define MT9P031_V_BLANKING_VALUE 25 ++#define MT9P031_OUTPUT_CONTROL 0x07 ++#define MT9P031_OUTPUT_CONTROL_CEN 2 ++#define MT9P031_OUTPUT_CONTROL_SYN 1 ++#define MT9P031_SHUTTER_WIDTH_UPPER 0x08 ++#define MT9P031_SHUTTER_WIDTH 0x09 ++#define MT9P031_PIXEL_CLOCK_CONTROL 0x0a ++#define MT9P031_FRAME_RESTART 0x0b ++#define MT9P031_SHUTTER_DELAY 0x0c ++#define MT9P031_RST 0x0d ++#define MT9P031_RST_ENABLE 1 ++#define MT9P031_RST_DISABLE 0 ++#define MT9P031_READ_MODE_1 0x1e ++#define MT9P031_READ_MODE_2 0x20 ++#define MT9P031_READ_MODE_2_ROW_MIR 0x8000 ++#define MT9P031_READ_MODE_2_COL_MIR 0x4000 ++#define MT9P031_ROW_ADDRESS_MODE 0x22 ++#define MT9P031_COLUMN_ADDRESS_MODE 0x23 ++#define MT9P031_GLOBAL_GAIN 0x35 ++ ++#define MT9P031_WINDOW_HEIGHT_MAX 1944 ++#define MT9P031_WINDOW_WIDTH_MAX 2592 ++#define MT9P031_WINDOW_HEIGHT_MIN 2 ++#define MT9P031_WINDOW_WIDTH_MIN 18 ++ ++struct mt9p031 { ++ struct v4l2_subdev subdev; ++ struct media_pad pad; ++ struct v4l2_rect rect; /* Sensor window */ ++ struct v4l2_mbus_framefmt format; ++ struct mt9p031_platform_data *pdata; ++ struct mutex power_lock; /* lock to protect power_count */ ++ int power_count; ++ u16 xskip; ++ u16 yskip; ++ /* cache register values */ ++ u16 output_control; ++ u16 h_blanking; ++ u16 v_blanking; ++ u16 column_address_mode; ++ u16 row_address_mode; ++ u16 column_start; ++ u16 row_start; ++ u16 window_width; ++ u16 window_height; ++ struct regulator *reg_1v8; ++ struct regulator *reg_2v8; ++}; ++ ++static struct mt9p031 *to_mt9p031(const struct i2c_client *client) ++{ ++ return container_of(i2c_get_clientdata(client), struct mt9p031, subdev); ++} ++ ++static int reg_read(struct i2c_client *client, const u8 reg) ++{ ++ s32 data = i2c_smbus_read_word_data(client, reg); ++ return data < 0 ? data : swab16(data); ++} ++ ++static int reg_write(struct i2c_client *client, const u8 reg, ++ const u16 data) ++{ ++ return i2c_smbus_write_word_data(client, reg, swab16(data)); ++} ++ ++static int reg_write_cached(struct i2c_client *client, const u8 reg, ++ const u16 data, u16 *cache) ++{ ++ int ret; ++ ++ ret = reg_write(client, reg, data); ++ if (ret < 0) ++ return ret; ++ *cache = data; ++ return 0; ++} ++ ++static int mt9p031_set_output_control(struct mt9p031 *mt9p031, u16 clear, ++ u16 set) ++{ ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); ++ u16 value = (mt9p031->output_control & ~clear) | set; ++ ++ return reg_write_cached(client, MT9P031_OUTPUT_CONTROL, value, ++ &mt9p031->output_control); ++} ++ ++static int restore_registers(struct i2c_client *client) ++{ ++ int ret; ++ struct mt9p031 *mt9p031 = to_mt9p031(client); ++ ++ /* Disable register update, reconfigure atomically */ ++ ret = mt9p031_set_output_control(mt9p031, 0, ++ MT9P031_OUTPUT_CONTROL_SYN); ++ if (ret < 0) ++ return ret; ++ ++ /* Blanking and start values - default... */ ++ ret = reg_write(client, MT9P031_H_BLANKING, mt9p031->h_blanking); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write(client, MT9P031_V_BLANKING, mt9p031->v_blanking); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write(client, MT9P031_COLUMN_ADDRESS_MODE, ++ mt9p031->column_address_mode); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write(client, MT9P031_ROW_ADDRESS_MODE, ++ mt9p031->row_address_mode); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write(client, MT9P031_COLUMN_START, ++ mt9p031->column_start); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write(client, MT9P031_ROW_START, ++ mt9p031->row_start); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write(client, MT9P031_WINDOW_WIDTH, ++ mt9p031->window_width); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write(client, MT9P031_WINDOW_HEIGHT, ++ mt9p031->window_height); ++ if (ret < 0) ++ return ret; ++ ++ /* Re-enable register update, commit all changes */ ++ ret = mt9p031_set_output_control(mt9p031, ++ MT9P031_OUTPUT_CONTROL_SYN, 0); ++ if (ret < 0) ++ return ret; ++ return 0; ++} ++ ++static int mt9p031_reset(struct i2c_client *client) ++{ ++ struct mt9p031 *mt9p031 = to_mt9p031(client); ++ int ret; ++ ++ /* Disable chip output, synchronous option update */ ++ ret = reg_write(client, MT9P031_RST, MT9P031_RST_ENABLE); ++ if (ret < 0) ++ return ret; ++ ret = reg_write(client, MT9P031_RST, MT9P031_RST_DISABLE); ++ if (ret < 0) ++ return ret; ++ return mt9p031_set_output_control(mt9p031, ++ MT9P031_OUTPUT_CONTROL_CEN, 0); ++} ++ ++static int mt9p031_power_on(struct mt9p031 *mt9p031) ++{ ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); ++ int ret; ++ ++ /* Ensure RESET_BAR is low */ ++ if (mt9p031->pdata->reset) ++ mt9p031->pdata->reset(&mt9p031->subdev, 1); ++ /* turn on digital supply first */ ++ ret = regulator_enable(mt9p031->reg_1v8); ++ if (ret) { ++ dev_err(&client->dev, ++ "Failed to enable 1.8v regulator: %d\n", ret); ++ goto err_1v8; ++ } ++ /* now turn on analog supply */ ++ ret = regulator_enable(mt9p031->reg_2v8); ++ if (ret) { ++ dev_err(&client->dev, ++ "Failed to enable 2.8v regulator: %d\n", ret); ++ goto err_rst; ++ } ++ /* Now RESET_BAR must be high */ ++ if (mt9p031->pdata->reset) ++ mt9p031->pdata->reset(&mt9p031->subdev, 0); ++ ++ if (mt9p031->pdata->set_xclk) ++ mt9p031->pdata->set_xclk(&mt9p031->subdev, MT9P031_PIXCLK_FREQ); ++ ++ /* soft reset */ ++ ret = mt9p031_reset(client); ++ if (ret < 0) { ++ dev_err(&client->dev, "Failed to reset the camera\n"); ++ goto err_rst; ++ } ++ ++ ret = restore_registers(client); ++ if (ret < 0) { ++ dev_err(&client->dev, "Failed to restore registers\n"); ++ goto err_rst; ++ } ++ ++ return 0; ++err_rst: ++ regulator_disable(mt9p031->reg_1v8); ++err_1v8: ++ return ret; ++ ++} ++ ++static void mt9p031_power_off(struct mt9p031 *mt9p031) ++{ ++ if (mt9p031->pdata->set_xclk) ++ mt9p031->pdata->set_xclk(&mt9p031->subdev, 0); ++ if (mt9p031->pdata->reset) ++ mt9p031->pdata->reset(&mt9p031->subdev, 1); ++ regulator_disable(mt9p031->reg_1v8); ++ regulator_disable(mt9p031->reg_2v8); ++} ++ ++static int mt9p031_enum_mbus_code(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_mbus_code_enum *code) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ ++ if (code->pad || code->index) ++ return -EINVAL; ++ ++ code->code = mt9p031->format.code; ++ ++ return 0; ++} ++ ++static struct v4l2_mbus_framefmt *mt9p031_get_pad_format( ++ struct mt9p031 *mt9p031, ++ struct v4l2_subdev_fh *fh, ++ unsigned int pad, u32 which) ++{ ++ switch (which) { ++ case V4L2_SUBDEV_FORMAT_TRY: ++ return v4l2_subdev_get_try_format(fh, pad); ++ case V4L2_SUBDEV_FORMAT_ACTIVE: ++ return &mt9p031->format; ++ default: ++ return NULL; ++ } ++} ++ ++static struct v4l2_rect *mt9p031_get_pad_crop(struct mt9p031 *mt9p031, ++ struct v4l2_subdev_fh *fh, unsigned int pad, u32 which) ++{ ++ switch (which) { ++ case V4L2_SUBDEV_FORMAT_TRY: ++ return v4l2_subdev_get_try_crop(fh, pad); ++ case V4L2_SUBDEV_FORMAT_ACTIVE: ++ return &mt9p031->rect; ++ default: ++ return NULL; ++ } ++} ++ ++static int mt9p031_get_crop(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_crop *crop) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ struct v4l2_rect *rect = mt9p031_get_pad_crop(mt9p031, fh, crop->pad, ++ crop->which); ++ if (!rect) ++ return -EINVAL; ++ ++ crop->rect = *rect; ++ ++ return 0; ++} ++ ++static u16 mt9p031_skip_for_crop(s32 source, s32 *target, s32 max_skip) ++{ ++ unsigned int skip; ++ ++ if (source - source / 4 < *target) { ++ *target = source; ++ return 1; ++ } ++ ++ skip = DIV_ROUND_CLOSEST(source, *target); ++ if (skip > max_skip) ++ skip = max_skip; ++ *target = 2 * DIV_ROUND_UP(source, 2 * skip); ++ ++ return skip; ++} ++ ++static int mt9p031_set_params(struct i2c_client *client, ++ struct v4l2_rect *rect, u16 xskip, u16 yskip) ++{ ++ struct mt9p031 *mt9p031 = to_mt9p031(client); ++ int ret; ++ u16 xbin, ybin; ++ const u16 hblank = MT9P031_H_BLANKING_VALUE, ++ vblank = MT9P031_V_BLANKING_VALUE; ++ __s32 left, top, width, height; ++ ++ /* ++ * TODO: Attention! When implementing horizontal flipping, adjust ++ * alignment according to R2 "Column Start" description in the datasheet ++ */ ++ if (xskip & 1) { ++ xbin = 1; ++ left = rect->left & (~3); ++ } else if (xskip & 2) { ++ xbin = 2; ++ left = rect->left & (~7); ++ } else { ++ xbin = 4; ++ left = rect->left & (~15); ++ } ++ top = rect->top & (~1); ++ width = rect->width; ++ height = rect->height; ++ ++ ybin = min(yskip, (u16)4); ++ ++ /* Disable register update, reconfigure atomically */ ++ ret = mt9p031_set_output_control(mt9p031, 0, ++ MT9P031_OUTPUT_CONTROL_SYN); ++ if (ret < 0) ++ return ret; ++ ++ dev_dbg(&client->dev, "skip %u:%u, rect %ux%u@%u:%u\n", ++ xskip, yskip, rect->width, rect->height, rect->left, rect->top); ++ ++ /* Blanking and start values - default... */ ++ ret = reg_write_cached(client, MT9P031_H_BLANKING, hblank, ++ &mt9p031->h_blanking); ++ if (ret < 0) ++ return ret; ++ ret = reg_write_cached(client, MT9P031_V_BLANKING, vblank, ++ &mt9p031->v_blanking); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write_cached(client, MT9P031_COLUMN_ADDRESS_MODE, ++ ((xbin - 1) << 4) | (xskip - 1), ++ &mt9p031->column_address_mode); ++ if (ret < 0) ++ return ret; ++ ret = reg_write_cached(client, MT9P031_ROW_ADDRESS_MODE, ++ ((ybin - 1) << 4) | (yskip - 1), ++ &mt9p031->row_address_mode); ++ if (ret < 0) ++ return ret; ++ ++ dev_dbg(&client->dev, "new physical left %u, top %u\n", ++ rect->left, rect->top); ++ ++ ret = reg_write_cached(client, MT9P031_COLUMN_START, ++ rect->left + MT9P031_COLUMN_START_DEF, ++ &mt9p031->column_start); ++ if (ret < 0) ++ return ret; ++ ret = reg_write_cached(client, MT9P031_ROW_START, ++ rect->top + MT9P031_ROW_START_DEF, ++ &mt9p031->row_start); ++ if (ret < 0) ++ return ret; ++ ret = reg_write_cached(client, MT9P031_WINDOW_WIDTH, ++ rect->width - 1, ++ &mt9p031->window_width); ++ if (ret < 0) ++ return ret; ++ ret = reg_write_cached(client, MT9P031_WINDOW_HEIGHT, ++ rect->height - 1, ++ &mt9p031->window_height); ++ if (ret < 0) ++ return ret; ++ ++ /* Re-enable register update, commit all changes */ ++ ret = mt9p031_set_output_control(mt9p031, ++ MT9P031_OUTPUT_CONTROL_SYN, 0); ++ if (ret < 0) ++ return ret; ++ ++ mt9p031->xskip = xskip; ++ mt9p031->yskip = yskip; ++ return ret; ++} ++ ++static int mt9p031_set_crop(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_crop *crop) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ struct v4l2_mbus_framefmt *f; ++ struct v4l2_rect *c; ++ struct v4l2_rect rect; ++ u16 xskip, yskip; ++ s32 width, height; ++ ++ dev_dbg(mt9p031->subdev.v4l2_dev->dev, "%s(%ux%u@%u:%u : %u)\n", ++ __func__, crop->rect.width, crop->rect.height, ++ crop->rect.left, crop->rect.top, crop->which); ++ ++ /* ++ * Clamp the crop rectangle boundaries and align them to a multiple of 2 ++ * pixels. ++ */ ++ rect.width = ALIGN(clamp(crop->rect.width, ++ MT9P031_WINDOW_WIDTH_MIN, MT9P031_WINDOW_WIDTH_MAX), 2); ++ rect.height = ALIGN(clamp(crop->rect.height, ++ MT9P031_WINDOW_HEIGHT_MIN, MT9P031_WINDOW_HEIGHT_MAX), 2); ++ rect.left = ALIGN(clamp(crop->rect.left, ++ 0, MT9P031_WINDOW_WIDTH_MAX - rect.width), 2); ++ rect.top = ALIGN(clamp(crop->rect.top, ++ 0, MT9P031_WINDOW_HEIGHT_MAX - rect.height), 2); ++ ++ c = mt9p031_get_pad_crop(mt9p031, fh, crop->pad, crop->which); ++ ++ if (rect.width != c->width || rect.height != c->height) { ++ /* ++ * Reset the output image size if the crop rectangle size has ++ * been modified. ++ */ ++ f = mt9p031_get_pad_format(mt9p031, fh, crop->pad, ++ crop->which); ++ width = f->width; ++ height = f->height; ++ ++ xskip = mt9p031_skip_for_crop(rect.width, &width, 7); ++ yskip = mt9p031_skip_for_crop(rect.height, &height, 8); ++ } else { ++ xskip = mt9p031->xskip; ++ yskip = mt9p031->yskip; ++ f = NULL; ++ } ++ if (f) { ++ f->width = width; ++ f->height = height; ++ } ++ ++ *c = rect; ++ crop->rect = rect; ++ ++ mt9p031->xskip = xskip; ++ mt9p031->yskip = yskip; ++ mt9p031->rect = *c; ++ return 0; ++} ++ ++static int mt9p031_get_format(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_format *fmt) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ ++ fmt->format = ++ *mt9p031_get_pad_format(mt9p031, fh, fmt->pad, fmt->which); ++ return 0; ++} ++ ++static u16 mt9p031_skip_for_scale(s32 *source, s32 target, ++ s32 max_skip, s32 max) ++{ ++ unsigned int skip; ++ ++ if (*source - *source / 4 < target) { ++ *source = target; ++ return 1; ++ } ++ ++ skip = min(max, *source + target / 2) / target; ++ if (skip > max_skip) ++ skip = max_skip; ++ *source = target * skip; ++ ++ return skip; ++} ++ ++static int mt9p031_fmt_validate(struct v4l2_subdev *sd, ++ struct v4l2_subdev_format *fmt) ++{ ++ struct v4l2_mbus_framefmt *format = &fmt->format; ++ ++ /* Hardcode code and colorspace as sensor only supports one */ ++ format->code = V4L2_MBUS_FMT_SGRBG12_1X12; ++ format->colorspace = V4L2_COLORSPACE_SRGB; ++ ++ format->width = clamp_t(int, ALIGN(format->width, 2), 2, ++ MT9P031_WINDOW_WIDTH_MAX); ++ format->height = clamp_t(int, ALIGN(format->height, 2), 2, ++ MT9P031_WINDOW_HEIGHT_MAX); ++ format->field = V4L2_FIELD_NONE; ++ ++ return 0; ++} ++ ++static int mt9p031_set_format(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_format *format) ++{ ++ struct v4l2_subdev_format sdf = *format; ++ struct v4l2_mbus_framefmt *__format, *format_bak = &sdf.format; ++ struct v4l2_rect *__crop, rect; ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ u16 xskip, yskip; ++ int ret; ++ ++ __crop = mt9p031_get_pad_crop(mt9p031, fh, format->pad, format->which); ++ ++ ret = mt9p031_fmt_validate(sd, &sdf); ++ if (ret < 0) ++ return ret; ++ rect.width = __crop->width; ++ rect.height = __crop->height; ++ ++ xskip = mt9p031_skip_for_scale(&rect.width, format_bak->width, 7, ++ MT9P031_WINDOW_WIDTH_MAX); ++ if (rect.width + __crop->left > MT9P031_WINDOW_WIDTH_MAX) ++ rect.left = (MT9P031_WINDOW_WIDTH_MAX - rect.width) / 2; ++ else ++ rect.left = __crop->left; ++ yskip = mt9p031_skip_for_scale(&rect.height, format_bak->height, 8, ++ MT9P031_WINDOW_HEIGHT_MAX); ++ if (rect.height + __crop->top > MT9P031_WINDOW_HEIGHT_MAX) ++ rect.top = (MT9P031_WINDOW_HEIGHT_MAX - rect.height) / 2; ++ else ++ rect.top = __crop->top; ++ ++ dev_dbg(mt9p031->subdev.v4l2_dev->dev, "%s(%ux%u : %u)\n", __func__, ++ format_bak->width, format_bak->height, format->which); ++ if (__crop) ++ *__crop = rect; ++ ++ __format = mt9p031_get_pad_format(mt9p031, fh, format->pad, format->which); ++ *__format = *format_bak; ++ format->format = *format_bak; ++ ++ mt9p031->xskip = xskip; ++ mt9p031->yskip = yskip; ++ mt9p031->rect = *__crop; ++ return 0; ++} ++ ++static int mt9p031_s_stream(struct v4l2_subdev *sd, int enable) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); ++ struct v4l2_rect rect = mt9p031->rect; ++ u16 xskip = mt9p031->xskip; ++ u16 yskip = mt9p031->yskip; ++ int ret; ++ ++ if (enable) { ++ ret = mt9p031_set_params(client, &rect, xskip, yskip); ++ if (ret < 0) ++ return ret; ++ /* Switch to master "normal" mode */ ++ ret = mt9p031_set_output_control(mt9p031, 0, ++ MT9P031_OUTPUT_CONTROL_CEN); ++ } else { ++ /* Stop sensor readout */ ++ ret = mt9p031_set_output_control(mt9p031, ++ MT9P031_OUTPUT_CONTROL_CEN, 0); ++ } ++ return ret; ++} ++ ++static int mt9p031_video_probe(struct i2c_client *client) ++{ ++ s32 data; ++ ++ /* Read out the chip version register */ ++ data = reg_read(client, MT9P031_CHIP_VERSION); ++ if (data != MT9P031_CHIP_VERSION_VALUE) { ++ dev_err(&client->dev, ++ "No MT9P031 chip detected, register read %x\n", data); ++ return -ENODEV; ++ } ++ ++ dev_info(&client->dev, "Detected a MT9P031 chip ID %x\n", data); ++ ++ return 0; ++} ++ ++static int mt9p031_set_power(struct v4l2_subdev *sd, int on) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ int ret = 0; ++ ++ mutex_lock(&mt9p031->power_lock); ++ ++ /* ++ * If the power count is modified from 0 to != 0 or from != 0 to 0, ++ * update the power state. ++ */ ++ if (mt9p031->power_count == !on) { ++ if (on) { ++ ret = mt9p031_power_on(mt9p031); ++ if (ret) { ++ dev_err(mt9p031->subdev.v4l2_dev->dev, ++ "Failed to enable 2.8v regulator: %d\n", ret); ++ goto out; ++ } ++ } else { ++ mt9p031_power_off(mt9p031); ++ } ++ } ++ ++ /* Update the power count. */ ++ mt9p031->power_count += on ? 1 : -1; ++ WARN_ON(mt9p031->power_count < 0); ++ ++out: ++ mutex_unlock(&mt9p031->power_lock); ++ return ret; ++} ++ ++static int mt9p031_registered(struct v4l2_subdev *sd) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); ++ int ret; ++ ++ ret = mt9p031_set_power(&mt9p031->subdev, 1); ++ if (ret) { ++ dev_err(&client->dev, ++ "Failed to power on device: %d\n", ret); ++ goto err_pwron; ++ } ++ ++ ret = mt9p031_video_probe(client); ++ if (ret) ++ goto err_evprobe; ++ ++ mt9p031->pad.flags = MEDIA_PAD_FL_SOURCE; ++ ret = media_entity_init(&mt9p031->subdev.entity, 1, &mt9p031->pad, 0); ++ if (ret) ++ goto err_evprobe; ++ ++ mt9p031->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; ++ mt9p031_set_power(&mt9p031->subdev, 0); ++ ++ return 0; ++err_evprobe: ++ mt9p031_set_power(&mt9p031->subdev, 0); ++err_pwron: ++ return ret; ++} ++ ++static int mt9p031_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) ++{ ++ struct mt9p031 *mt9p031; ++ mt9p031 = container_of(sd, struct mt9p031, subdev); ++ ++ mt9p031->rect.width = MT9P031_WINDOW_WIDTH_MAX; ++ mt9p031->rect.height = MT9P031_WINDOW_HEIGHT_MAX; ++ mt9p031->rect.left = MT9P031_COLUMN_START_DEF; ++ mt9p031->rect.top = MT9P031_ROW_START_DEF; ++ ++ mt9p031->format.code = V4L2_MBUS_FMT_SGRBG12_1X12; ++ mt9p031->format.width = MT9P031_WINDOW_WIDTH_MAX; ++ mt9p031->format.height = MT9P031_WINDOW_HEIGHT_MAX; ++ mt9p031->format.field = V4L2_FIELD_NONE; ++ mt9p031->format.colorspace = V4L2_COLORSPACE_SRGB; ++ ++ mt9p031->xskip = 1; ++ mt9p031->yskip = 1; ++ return mt9p031_set_power(sd, 1); ++} ++ ++static int mt9p031_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) ++{ ++ return mt9p031_set_power(sd, 0); ++} ++ ++static struct v4l2_subdev_core_ops mt9p031_subdev_core_ops = { ++ .s_power = mt9p031_set_power, ++}; ++ ++static struct v4l2_subdev_video_ops mt9p031_subdev_video_ops = { ++ .s_stream = mt9p031_s_stream, ++}; ++ ++static struct v4l2_subdev_pad_ops mt9p031_subdev_pad_ops = { ++ .enum_mbus_code = mt9p031_enum_mbus_code, ++ .get_fmt = mt9p031_get_format, ++ .set_fmt = mt9p031_set_format, ++ .get_crop = mt9p031_get_crop, ++ .set_crop = mt9p031_set_crop, ++}; ++ ++static struct v4l2_subdev_ops mt9p031_subdev_ops = { ++ .core = &mt9p031_subdev_core_ops, ++ .video = &mt9p031_subdev_video_ops, ++ .pad = &mt9p031_subdev_pad_ops, ++}; ++ ++static const struct v4l2_subdev_internal_ops mt9p031_subdev_internal_ops = { ++ .registered = mt9p031_registered, ++ .open = mt9p031_open, ++ .close = mt9p031_close, ++}; ++ ++static int mt9p031_probe(struct i2c_client *client, ++ const struct i2c_device_id *did) ++{ ++ struct mt9p031 *mt9p031; ++ struct mt9p031_platform_data *pdata = client->dev.platform_data; ++ struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); ++ int ret; ++ ++ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA)) { ++ dev_warn(&adapter->dev, ++ "I2C-Adapter doesn't support I2C_FUNC_SMBUS_WORD\n"); ++ return -EIO; ++ } ++ ++ mt9p031 = kzalloc(sizeof(struct mt9p031), GFP_KERNEL); ++ if (!mt9p031) ++ return -ENOMEM; ++ ++ mutex_init(&mt9p031->power_lock); ++ v4l2_i2c_subdev_init(&mt9p031->subdev, client, &mt9p031_subdev_ops); ++ mt9p031->subdev.internal_ops = &mt9p031_subdev_internal_ops; ++ ++ mt9p031->pdata = pdata; ++ ++ mt9p031->reg_1v8 = regulator_get(NULL, "cam_1v8"); ++ if (IS_ERR(mt9p031->reg_1v8)) { ++ ret = PTR_ERR(mt9p031->reg_1v8); ++ dev_err(mt9p031->subdev.v4l2_dev->dev, ++ "Failed 1.8v regulator: %d\n", ret); ++ goto err_e1v8; ++ } ++ ++ mt9p031->reg_2v8 = regulator_get(NULL, "cam_2v8"); ++ if (IS_ERR(mt9p031->reg_2v8)) { ++ ret = PTR_ERR(mt9p031->reg_2v8); ++ dev_err(mt9p031->subdev.v4l2_dev->dev, ++ "Failed 2.8v regulator: %d\n", ret); ++ goto err_e2v8; ++ } ++ return 0; ++err_e2v8: ++ regulator_put(mt9p031->reg_1v8); ++err_e1v8: ++ kfree(mt9p031); ++ return ret; ++} ++ ++static int mt9p031_remove(struct i2c_client *client) ++{ ++ struct v4l2_subdev *sd = i2c_get_clientdata(client); ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ ++ v4l2_device_unregister_subdev(sd); ++ media_entity_cleanup(&sd->entity); ++ regulator_put(mt9p031->reg_2v8); ++ regulator_put(mt9p031->reg_1v8); ++ kfree(mt9p031); ++ ++ return 0; ++} ++ ++static const struct i2c_device_id mt9p031_id[] = { ++ { "mt9p031", 0 }, ++ { } ++}; ++MODULE_DEVICE_TABLE(i2c, mt9p031_id); ++ ++static struct i2c_driver mt9p031_i2c_driver = { ++ .driver = { ++ .name = "mt9p031", ++ }, ++ .probe = mt9p031_probe, ++ .remove = mt9p031_remove, ++ .id_table = mt9p031_id, ++}; ++ ++static int __init mt9p031_mod_init(void) ++{ ++ return i2c_add_driver(&mt9p031_i2c_driver); ++} ++ ++static void __exit mt9p031_mod_exit(void) ++{ ++ i2c_del_driver(&mt9p031_i2c_driver); ++} ++ ++module_init(mt9p031_mod_init); ++module_exit(mt9p031_mod_exit); ++ ++MODULE_DESCRIPTION("Aptina MT9P031 Camera driver"); ++MODULE_AUTHOR("Bastian Hecht "); ++MODULE_LICENSE("GPL v2"); +diff --git a/include/media/mt9p031.h b/include/media/mt9p031.h +new file mode 100644 +index 0000000..7ee9733 +--- /dev/null ++++ b/include/media/mt9p031.h +@@ -0,0 +1,11 @@ ++#ifndef MT9P031_H ++#define MT9P031_H ++ ++struct v4l2_subdev; ++ ++struct mt9p031_platform_data { ++ int (*set_xclk)(struct v4l2_subdev *subdev, int hz); ++ int (*reset)(struct v4l2_subdev *subdev, int active); ++}; ++ ++#endif +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-support.patch b/recipes/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-support.patch deleted file mode 100644 index 2d7ee7ae89..0000000000 --- a/recipes/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-support.patch +++ /dev/null @@ -1,917 +0,0 @@ -From 69f7b0ee14f046e469d616611ee87836e04219b4 Mon Sep 17 00:00:00 2001 -From: Javier Martin -Date: Tue, 24 May 2011 16:30:43 +0200 -Subject: [PATCH] Add mt9p031 sensor support. - -This RFC includes a power management implementation that causes -the sensor to show images with horizontal artifacts (usually -monochrome lines that appear on the image randomly). - -Signed-off-by: Javier Martin -Signed-off-by: Koen Kooi ---- - drivers/media/video/Kconfig | 7 + - drivers/media/video/Makefile | 1 + - drivers/media/video/mt9p031.c | 841 +++++++++++++++++++++++++++++++++++++++++ - include/media/mt9p031.h | 11 + - 4 files changed, 860 insertions(+), 0 deletions(-) - create mode 100644 drivers/media/video/mt9p031.c - create mode 100644 include/media/mt9p031.h - -diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig -index 00f51dd..8a596cc 100644 ---- a/drivers/media/video/Kconfig -+++ b/drivers/media/video/Kconfig -@@ -329,6 +329,13 @@ config VIDEO_OV7670 - OV7670 VGA camera. It currently only works with the M88ALP01 - controller. - -+config VIDEO_MT9P031 -+ tristate "Aptina MT9P031 support" -+ depends on I2C && VIDEO_V4L2 -+ ---help--- -+ This is a Video4Linux2 sensor-level driver for the Aptina -+ (Micron) mt9p031 5 Mpixel camera. -+ - config VIDEO_MT9V011 - tristate "Micron mt9v011 sensor support" - depends on I2C && VIDEO_V4L2 -diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile -index ace5d8b..912b29b 100644 ---- a/drivers/media/video/Makefile -+++ b/drivers/media/video/Makefile -@@ -65,6 +65,7 @@ obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o - obj-$(CONFIG_VIDEO_OV7670) += ov7670.o - obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o - obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o -+obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o - obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o - obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o - obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o -diff --git a/drivers/media/video/mt9p031.c b/drivers/media/video/mt9p031.c -new file mode 100644 -index 0000000..04d8812 ---- /dev/null -+++ b/drivers/media/video/mt9p031.c -@@ -0,0 +1,841 @@ -+/* -+ * Driver for MT9P031 CMOS Image Sensor from Aptina -+ * -+ * Copyright (C) 2011, Javier Martin -+ * -+ * Copyright (C) 2011, Guennadi Liakhovetski -+ * -+ * Based on the MT9V032 driver and Bastian Hecht's code. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+ -+#define MT9P031_PIXCLK_FREQ 54000000 -+ -+/* mt9p031 selected register addresses */ -+#define MT9P031_CHIP_VERSION 0x00 -+#define MT9P031_CHIP_VERSION_VALUE 0x1801 -+#define MT9P031_ROW_START 0x01 -+#define MT9P031_ROW_START_DEF 54 -+#define MT9P031_COLUMN_START 0x02 -+#define MT9P031_COLUMN_START_DEF 16 -+#define MT9P031_WINDOW_HEIGHT 0x03 -+#define MT9P031_WINDOW_WIDTH 0x04 -+#define MT9P031_H_BLANKING 0x05 -+#define MT9P031_H_BLANKING_VALUE 0 -+#define MT9P031_V_BLANKING 0x06 -+#define MT9P031_V_BLANKING_VALUE 25 -+#define MT9P031_OUTPUT_CONTROL 0x07 -+#define MT9P031_OUTPUT_CONTROL_CEN 2 -+#define MT9P031_OUTPUT_CONTROL_SYN 1 -+#define MT9P031_SHUTTER_WIDTH_UPPER 0x08 -+#define MT9P031_SHUTTER_WIDTH 0x09 -+#define MT9P031_PIXEL_CLOCK_CONTROL 0x0a -+#define MT9P031_FRAME_RESTART 0x0b -+#define MT9P031_SHUTTER_DELAY 0x0c -+#define MT9P031_RST 0x0d -+#define MT9P031_RST_ENABLE 1 -+#define MT9P031_RST_DISABLE 0 -+#define MT9P031_READ_MODE_1 0x1e -+#define MT9P031_READ_MODE_2 0x20 -+#define MT9P031_READ_MODE_2_ROW_MIR 0x8000 -+#define MT9P031_READ_MODE_2_COL_MIR 0x4000 -+#define MT9P031_ROW_ADDRESS_MODE 0x22 -+#define MT9P031_COLUMN_ADDRESS_MODE 0x23 -+#define MT9P031_GLOBAL_GAIN 0x35 -+ -+#define MT9P031_WINDOW_HEIGHT_MAX 1944 -+#define MT9P031_WINDOW_WIDTH_MAX 2592 -+#define MT9P031_WINDOW_HEIGHT_MIN 2 -+#define MT9P031_WINDOW_WIDTH_MIN 18 -+ -+struct mt9p031 { -+ struct v4l2_subdev subdev; -+ struct media_pad pad; -+ struct v4l2_rect rect; /* Sensor window */ -+ struct v4l2_mbus_framefmt format; -+ struct mt9p031_platform_data *pdata; -+ struct mutex power_lock; /* lock to protect power_count */ -+ int power_count; -+ u16 xskip; -+ u16 yskip; -+ /* cache register values */ -+ u16 output_control; -+ u16 h_blanking; -+ u16 v_blanking; -+ u16 column_address_mode; -+ u16 row_address_mode; -+ u16 column_start; -+ u16 row_start; -+ u16 window_width; -+ u16 window_height; -+ struct regulator *reg_1v8; -+ struct regulator *reg_2v8; -+}; -+ -+static struct mt9p031 *to_mt9p031(const struct i2c_client *client) -+{ -+ return container_of(i2c_get_clientdata(client), struct mt9p031, subdev); -+} -+ -+static int reg_read(struct i2c_client *client, const u8 reg) -+{ -+ s32 data = i2c_smbus_read_word_data(client, reg); -+ return data < 0 ? data : swab16(data); -+} -+ -+static int reg_write(struct i2c_client *client, const u8 reg, -+ const u16 data) -+{ -+ return i2c_smbus_write_word_data(client, reg, swab16(data)); -+} -+ -+static int reg_write_cached(struct i2c_client *client, const u8 reg, -+ const u16 data, u16 *cache) -+{ -+ int ret; -+ -+ ret = reg_write(client, reg, data); -+ if (ret < 0) -+ return ret; -+ *cache = data; -+ return 0; -+} -+ -+static int mt9p031_set_output_control(struct mt9p031 *mt9p031, u16 clear, -+ u16 set) -+{ -+ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); -+ u16 value = (mt9p031->output_control & ~clear) | set; -+ -+ return reg_write_cached(client, MT9P031_OUTPUT_CONTROL, value, -+ &mt9p031->output_control); -+} -+ -+static int restore_registers(struct i2c_client *client) -+{ -+ int ret; -+ struct mt9p031 *mt9p031 = to_mt9p031(client); -+ -+ /* Disable register update, reconfigure atomically */ -+ ret = mt9p031_set_output_control(mt9p031, 0, -+ MT9P031_OUTPUT_CONTROL_SYN); -+ if (ret < 0) -+ return ret; -+ -+ /* Blanking and start values - default... */ -+ ret = reg_write(client, MT9P031_H_BLANKING, mt9p031->h_blanking); -+ if (ret < 0) -+ return ret; -+ -+ ret = reg_write(client, MT9P031_V_BLANKING, mt9p031->v_blanking); -+ if (ret < 0) -+ return ret; -+ -+ ret = reg_write(client, MT9P031_COLUMN_ADDRESS_MODE, -+ mt9p031->column_address_mode); -+ if (ret < 0) -+ return ret; -+ -+ ret = reg_write(client, MT9P031_ROW_ADDRESS_MODE, -+ mt9p031->row_address_mode); -+ if (ret < 0) -+ return ret; -+ -+ ret = reg_write(client, MT9P031_COLUMN_START, -+ mt9p031->column_start); -+ if (ret < 0) -+ return ret; -+ -+ ret = reg_write(client, MT9P031_ROW_START, -+ mt9p031->row_start); -+ if (ret < 0) -+ return ret; -+ -+ ret = reg_write(client, MT9P031_WINDOW_WIDTH, -+ mt9p031->window_width); -+ if (ret < 0) -+ return ret; -+ -+ ret = reg_write(client, MT9P031_WINDOW_HEIGHT, -+ mt9p031->window_height); -+ if (ret < 0) -+ return ret; -+ -+ /* Re-enable register update, commit all changes */ -+ ret = mt9p031_set_output_control(mt9p031, -+ MT9P031_OUTPUT_CONTROL_SYN, 0); -+ if (ret < 0) -+ return ret; -+ return 0; -+} -+ -+static int mt9p031_reset(struct i2c_client *client) -+{ -+ struct mt9p031 *mt9p031 = to_mt9p031(client); -+ int ret; -+ -+ /* Disable chip output, synchronous option update */ -+ ret = reg_write(client, MT9P031_RST, MT9P031_RST_ENABLE); -+ if (ret < 0) -+ return ret; -+ ret = reg_write(client, MT9P031_RST, MT9P031_RST_DISABLE); -+ if (ret < 0) -+ return ret; -+ return mt9p031_set_output_control(mt9p031, -+ MT9P031_OUTPUT_CONTROL_CEN, 0); -+} -+ -+static int mt9p031_power_on(struct mt9p031 *mt9p031) -+{ -+ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); -+ int ret; -+ -+ /* Ensure RESET_BAR is low */ -+ if (mt9p031->pdata->reset) -+ mt9p031->pdata->reset(&mt9p031->subdev, 1); -+ /* turn on digital supply first */ -+ ret = regulator_enable(mt9p031->reg_1v8); -+ if (ret) { -+ dev_err(&client->dev, -+ "Failed to enable 1.8v regulator: %d\n", ret); -+ goto err_1v8; -+ } -+ /* now turn on analog supply */ -+ ret = regulator_enable(mt9p031->reg_2v8); -+ if (ret) { -+ dev_err(&client->dev, -+ "Failed to enable 2.8v regulator: %d\n", ret); -+ goto err_rst; -+ } -+ /* Now RESET_BAR must be high */ -+ if (mt9p031->pdata->reset) -+ mt9p031->pdata->reset(&mt9p031->subdev, 0); -+ -+ if (mt9p031->pdata->set_xclk) -+ mt9p031->pdata->set_xclk(&mt9p031->subdev, MT9P031_PIXCLK_FREQ); -+ -+ /* soft reset */ -+ ret = mt9p031_reset(client); -+ if (ret < 0) { -+ dev_err(&client->dev, "Failed to reset the camera\n"); -+ goto err_rst; -+ } -+ -+ ret = restore_registers(client); -+ if (ret < 0) { -+ dev_err(&client->dev, "Failed to restore registers\n"); -+ goto err_rst; -+ } -+ -+ return 0; -+err_rst: -+ regulator_disable(mt9p031->reg_1v8); -+err_1v8: -+ return ret; -+ -+} -+ -+static void mt9p031_power_off(struct mt9p031 *mt9p031) -+{ -+ if (mt9p031->pdata->set_xclk) -+ mt9p031->pdata->set_xclk(&mt9p031->subdev, 0); -+ if (mt9p031->pdata->reset) -+ mt9p031->pdata->reset(&mt9p031->subdev, 1); -+ regulator_disable(mt9p031->reg_1v8); -+ regulator_disable(mt9p031->reg_2v8); -+} -+ -+static int mt9p031_enum_mbus_code(struct v4l2_subdev *sd, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_mbus_code_enum *code) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ -+ if (code->pad || code->index) -+ return -EINVAL; -+ -+ code->code = mt9p031->format.code; -+ -+ return 0; -+} -+ -+static struct v4l2_mbus_framefmt *mt9p031_get_pad_format( -+ struct mt9p031 *mt9p031, -+ struct v4l2_subdev_fh *fh, -+ unsigned int pad, u32 which) -+{ -+ switch (which) { -+ case V4L2_SUBDEV_FORMAT_TRY: -+ return v4l2_subdev_get_try_format(fh, pad); -+ case V4L2_SUBDEV_FORMAT_ACTIVE: -+ return &mt9p031->format; -+ default: -+ return NULL; -+ } -+} -+ -+static struct v4l2_rect *mt9p031_get_pad_crop(struct mt9p031 *mt9p031, -+ struct v4l2_subdev_fh *fh, unsigned int pad, u32 which) -+{ -+ switch (which) { -+ case V4L2_SUBDEV_FORMAT_TRY: -+ return v4l2_subdev_get_try_crop(fh, pad); -+ case V4L2_SUBDEV_FORMAT_ACTIVE: -+ return &mt9p031->rect; -+ default: -+ return NULL; -+ } -+} -+ -+static int mt9p031_get_crop(struct v4l2_subdev *sd, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_crop *crop) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ struct v4l2_rect *rect = mt9p031_get_pad_crop(mt9p031, fh, crop->pad, -+ crop->which); -+ if (!rect) -+ return -EINVAL; -+ -+ crop->rect = *rect; -+ -+ return 0; -+} -+ -+static u16 mt9p031_skip_for_crop(s32 source, s32 *target, s32 max_skip) -+{ -+ unsigned int skip; -+ -+ if (source - source / 4 < *target) { -+ *target = source; -+ return 1; -+ } -+ -+ skip = DIV_ROUND_CLOSEST(source, *target); -+ if (skip > max_skip) -+ skip = max_skip; -+ *target = 2 * DIV_ROUND_UP(source, 2 * skip); -+ -+ return skip; -+} -+ -+static int mt9p031_set_params(struct i2c_client *client, -+ struct v4l2_rect *rect, u16 xskip, u16 yskip) -+{ -+ struct mt9p031 *mt9p031 = to_mt9p031(client); -+ int ret; -+ u16 xbin, ybin; -+ const u16 hblank = MT9P031_H_BLANKING_VALUE, -+ vblank = MT9P031_V_BLANKING_VALUE; -+ __s32 left, top, width, height; -+ -+ /* -+ * TODO: Attention! When implementing horizontal flipping, adjust -+ * alignment according to R2 "Column Start" description in the datasheet -+ */ -+ if (xskip & 1) { -+ xbin = 1; -+ left = rect->left & (~3); -+ } else if (xskip & 2) { -+ xbin = 2; -+ left = rect->left & (~7); -+ } else { -+ xbin = 4; -+ left = rect->left & (~15); -+ } -+ top = rect->top & (~1); -+ width = rect->width; -+ height = rect->height; -+ -+ ybin = min(yskip, (u16)4); -+ -+ /* Disable register update, reconfigure atomically */ -+ ret = mt9p031_set_output_control(mt9p031, 0, -+ MT9P031_OUTPUT_CONTROL_SYN); -+ if (ret < 0) -+ return ret; -+ -+ dev_dbg(&client->dev, "skip %u:%u, rect %ux%u@%u:%u\n", -+ xskip, yskip, rect->width, rect->height, rect->left, rect->top); -+ -+ /* Blanking and start values - default... */ -+ ret = reg_write_cached(client, MT9P031_H_BLANKING, hblank, -+ &mt9p031->h_blanking); -+ if (ret < 0) -+ return ret; -+ ret = reg_write_cached(client, MT9P031_V_BLANKING, vblank, -+ &mt9p031->v_blanking); -+ if (ret < 0) -+ return ret; -+ -+ ret = reg_write_cached(client, MT9P031_COLUMN_ADDRESS_MODE, -+ ((xbin - 1) << 4) | (xskip - 1), -+ &mt9p031->column_address_mode); -+ if (ret < 0) -+ return ret; -+ ret = reg_write_cached(client, MT9P031_ROW_ADDRESS_MODE, -+ ((ybin - 1) << 4) | (yskip - 1), -+ &mt9p031->row_address_mode); -+ if (ret < 0) -+ return ret; -+ -+ dev_dbg(&client->dev, "new physical left %u, top %u\n", -+ rect->left, rect->top); -+ -+ ret = reg_write_cached(client, MT9P031_COLUMN_START, -+ rect->left + MT9P031_COLUMN_START_DEF, -+ &mt9p031->column_start); -+ if (ret < 0) -+ return ret; -+ ret = reg_write_cached(client, MT9P031_ROW_START, -+ rect->top + MT9P031_ROW_START_DEF, -+ &mt9p031->row_start); -+ if (ret < 0) -+ return ret; -+ ret = reg_write_cached(client, MT9P031_WINDOW_WIDTH, -+ rect->width - 1, -+ &mt9p031->window_width); -+ if (ret < 0) -+ return ret; -+ ret = reg_write_cached(client, MT9P031_WINDOW_HEIGHT, -+ rect->height - 1, -+ &mt9p031->window_height); -+ if (ret < 0) -+ return ret; -+ -+ /* Re-enable register update, commit all changes */ -+ ret = mt9p031_set_output_control(mt9p031, -+ MT9P031_OUTPUT_CONTROL_SYN, 0); -+ if (ret < 0) -+ return ret; -+ -+ mt9p031->xskip = xskip; -+ mt9p031->yskip = yskip; -+ return ret; -+} -+ -+static int mt9p031_set_crop(struct v4l2_subdev *sd, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_crop *crop) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ struct v4l2_mbus_framefmt *f; -+ struct v4l2_rect *c; -+ struct v4l2_rect rect; -+ u16 xskip, yskip; -+ s32 width, height; -+ -+ dev_dbg(mt9p031->subdev.v4l2_dev->dev, "%s(%ux%u@%u:%u : %u)\n", -+ __func__, crop->rect.width, crop->rect.height, -+ crop->rect.left, crop->rect.top, crop->which); -+ -+ /* -+ * Clamp the crop rectangle boundaries and align them to a multiple of 2 -+ * pixels. -+ */ -+ rect.width = ALIGN(clamp(crop->rect.width, -+ MT9P031_WINDOW_WIDTH_MIN, MT9P031_WINDOW_WIDTH_MAX), 2); -+ rect.height = ALIGN(clamp(crop->rect.height, -+ MT9P031_WINDOW_HEIGHT_MIN, MT9P031_WINDOW_HEIGHT_MAX), 2); -+ rect.left = ALIGN(clamp(crop->rect.left, -+ 0, MT9P031_WINDOW_WIDTH_MAX - rect.width), 2); -+ rect.top = ALIGN(clamp(crop->rect.top, -+ 0, MT9P031_WINDOW_HEIGHT_MAX - rect.height), 2); -+ -+ c = mt9p031_get_pad_crop(mt9p031, fh, crop->pad, crop->which); -+ -+ if (rect.width != c->width || rect.height != c->height) { -+ /* -+ * Reset the output image size if the crop rectangle size has -+ * been modified. -+ */ -+ f = mt9p031_get_pad_format(mt9p031, fh, crop->pad, -+ crop->which); -+ width = f->width; -+ height = f->height; -+ -+ xskip = mt9p031_skip_for_crop(rect.width, &width, 7); -+ yskip = mt9p031_skip_for_crop(rect.height, &height, 8); -+ } else { -+ xskip = mt9p031->xskip; -+ yskip = mt9p031->yskip; -+ f = NULL; -+ } -+ if (f) { -+ f->width = width; -+ f->height = height; -+ } -+ -+ *c = rect; -+ crop->rect = rect; -+ -+ mt9p031->xskip = xskip; -+ mt9p031->yskip = yskip; -+ mt9p031->rect = *c; -+ return 0; -+} -+ -+static int mt9p031_get_format(struct v4l2_subdev *sd, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_format *fmt) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ -+ fmt->format = -+ *mt9p031_get_pad_format(mt9p031, fh, fmt->pad, fmt->which); -+ return 0; -+} -+ -+static u16 mt9p031_skip_for_scale(s32 *source, s32 target, -+ s32 max_skip, s32 max) -+{ -+ unsigned int skip; -+ -+ if (*source - *source / 4 < target) { -+ *source = target; -+ return 1; -+ } -+ -+ skip = min(max, *source + target / 2) / target; -+ if (skip > max_skip) -+ skip = max_skip; -+ *source = target * skip; -+ -+ return skip; -+} -+ -+static int mt9p031_fmt_validate(struct v4l2_subdev *sd, -+ struct v4l2_subdev_format *fmt) -+{ -+ struct v4l2_mbus_framefmt *format = &fmt->format; -+ -+ /* Hardcode code and colorspace as sensor only supports one */ -+ format->code = V4L2_MBUS_FMT_SGRBG12_1X12; -+ format->colorspace = V4L2_COLORSPACE_SRGB; -+ -+ format->width = clamp_t(int, ALIGN(format->width, 2), 2, -+ MT9P031_WINDOW_WIDTH_MAX); -+ format->height = clamp_t(int, ALIGN(format->height, 2), 2, -+ MT9P031_WINDOW_HEIGHT_MAX); -+ format->field = V4L2_FIELD_NONE; -+ -+ return 0; -+} -+ -+static int mt9p031_set_format(struct v4l2_subdev *sd, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_format *format) -+{ -+ struct v4l2_subdev_format sdf = *format; -+ struct v4l2_mbus_framefmt *__format, *format_bak = &sdf.format; -+ struct v4l2_rect *__crop, rect; -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ u16 xskip, yskip; -+ int ret; -+ -+ __crop = mt9p031_get_pad_crop(mt9p031, fh, format->pad, format->which); -+ -+ ret = mt9p031_fmt_validate(sd, &sdf); -+ if (ret < 0) -+ return ret; -+ rect.width = __crop->width; -+ rect.height = __crop->height; -+ -+ xskip = mt9p031_skip_for_scale(&rect.width, format_bak->width, 7, -+ MT9P031_WINDOW_WIDTH_MAX); -+ if (rect.width + __crop->left > MT9P031_WINDOW_WIDTH_MAX) -+ rect.left = (MT9P031_WINDOW_WIDTH_MAX - rect.width) / 2; -+ else -+ rect.left = __crop->left; -+ yskip = mt9p031_skip_for_scale(&rect.height, format_bak->height, 8, -+ MT9P031_WINDOW_HEIGHT_MAX); -+ if (rect.height + __crop->top > MT9P031_WINDOW_HEIGHT_MAX) -+ rect.top = (MT9P031_WINDOW_HEIGHT_MAX - rect.height) / 2; -+ else -+ rect.top = __crop->top; -+ -+ dev_dbg(mt9p031->subdev.v4l2_dev->dev, "%s(%ux%u : %u)\n", __func__, -+ format_bak->width, format_bak->height, format->which); -+ if (__crop) -+ *__crop = rect; -+ -+ __format = mt9p031_get_pad_format(mt9p031, fh, format->pad, format->which); -+ *__format = *format_bak; -+ format->format = *format_bak; -+ -+ mt9p031->xskip = xskip; -+ mt9p031->yskip = yskip; -+ mt9p031->rect = *__crop; -+ return 0; -+} -+ -+static int mt9p031_s_stream(struct v4l2_subdev *sd, int enable) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); -+ struct v4l2_rect rect = mt9p031->rect; -+ u16 xskip = mt9p031->xskip; -+ u16 yskip = mt9p031->yskip; -+ int ret; -+ -+ if (enable) { -+ ret = mt9p031_set_params(client, &rect, xskip, yskip); -+ if (ret < 0) -+ return ret; -+ /* Switch to master "normal" mode */ -+ ret = mt9p031_set_output_control(mt9p031, 0, -+ MT9P031_OUTPUT_CONTROL_CEN); -+ } else { -+ /* Stop sensor readout */ -+ ret = mt9p031_set_output_control(mt9p031, -+ MT9P031_OUTPUT_CONTROL_CEN, 0); -+ } -+ return ret; -+} -+ -+static int mt9p031_video_probe(struct i2c_client *client) -+{ -+ s32 data; -+ -+ /* Read out the chip version register */ -+ data = reg_read(client, MT9P031_CHIP_VERSION); -+ if (data != MT9P031_CHIP_VERSION_VALUE) { -+ dev_err(&client->dev, -+ "No MT9P031 chip detected, register read %x\n", data); -+ return -ENODEV; -+ } -+ -+ dev_info(&client->dev, "Detected a MT9P031 chip ID %x\n", data); -+ -+ return 0; -+} -+ -+static int mt9p031_set_power(struct v4l2_subdev *sd, int on) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ int ret = 0; -+ -+ mutex_lock(&mt9p031->power_lock); -+ -+ /* -+ * If the power count is modified from 0 to != 0 or from != 0 to 0, -+ * update the power state. -+ */ -+ if (mt9p031->power_count == !on) { -+ if (on) { -+ ret = mt9p031_power_on(mt9p031); -+ if (ret) { -+ dev_err(mt9p031->subdev.v4l2_dev->dev, -+ "Failed to enable 2.8v regulator: %d\n", ret); -+ goto out; -+ } -+ } else { -+ mt9p031_power_off(mt9p031); -+ } -+ } -+ -+ /* Update the power count. */ -+ mt9p031->power_count += on ? 1 : -1; -+ WARN_ON(mt9p031->power_count < 0); -+ -+out: -+ mutex_unlock(&mt9p031->power_lock); -+ return ret; -+} -+ -+static int mt9p031_registered(struct v4l2_subdev *sd) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); -+ int ret; -+ -+ ret = mt9p031_set_power(&mt9p031->subdev, 1); -+ if (ret) { -+ dev_err(&client->dev, -+ "Failed to power on device: %d\n", ret); -+ goto err_pwron; -+ } -+ -+ ret = mt9p031_video_probe(client); -+ if (ret) -+ goto err_evprobe; -+ -+ mt9p031->pad.flags = MEDIA_PAD_FL_SOURCE; -+ ret = media_entity_init(&mt9p031->subdev.entity, 1, &mt9p031->pad, 0); -+ if (ret) -+ goto err_evprobe; -+ -+ mt9p031->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; -+ mt9p031_set_power(&mt9p031->subdev, 0); -+ -+ return 0; -+err_evprobe: -+ mt9p031_set_power(&mt9p031->subdev, 0); -+err_pwron: -+ return ret; -+} -+ -+static int mt9p031_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) -+{ -+ struct mt9p031 *mt9p031; -+ mt9p031 = container_of(sd, struct mt9p031, subdev); -+ -+ mt9p031->rect.width = MT9P031_WINDOW_WIDTH_MAX; -+ mt9p031->rect.height = MT9P031_WINDOW_HEIGHT_MAX; -+ mt9p031->rect.left = MT9P031_COLUMN_START_DEF; -+ mt9p031->rect.top = MT9P031_ROW_START_DEF; -+ -+ mt9p031->format.code = V4L2_MBUS_FMT_SGRBG12_1X12; -+ mt9p031->format.width = MT9P031_WINDOW_WIDTH_MAX; -+ mt9p031->format.height = MT9P031_WINDOW_HEIGHT_MAX; -+ mt9p031->format.field = V4L2_FIELD_NONE; -+ mt9p031->format.colorspace = V4L2_COLORSPACE_SRGB; -+ -+ mt9p031->xskip = 1; -+ mt9p031->yskip = 1; -+ return mt9p031_set_power(sd, 1); -+} -+ -+static int mt9p031_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) -+{ -+ return mt9p031_set_power(sd, 0); -+} -+ -+static struct v4l2_subdev_core_ops mt9p031_subdev_core_ops = { -+ .s_power = mt9p031_set_power, -+}; -+ -+static struct v4l2_subdev_video_ops mt9p031_subdev_video_ops = { -+ .s_stream = mt9p031_s_stream, -+}; -+ -+static struct v4l2_subdev_pad_ops mt9p031_subdev_pad_ops = { -+ .enum_mbus_code = mt9p031_enum_mbus_code, -+ .get_fmt = mt9p031_get_format, -+ .set_fmt = mt9p031_set_format, -+ .get_crop = mt9p031_get_crop, -+ .set_crop = mt9p031_set_crop, -+}; -+ -+static struct v4l2_subdev_ops mt9p031_subdev_ops = { -+ .core = &mt9p031_subdev_core_ops, -+ .video = &mt9p031_subdev_video_ops, -+ .pad = &mt9p031_subdev_pad_ops, -+}; -+ -+static const struct v4l2_subdev_internal_ops mt9p031_subdev_internal_ops = { -+ .registered = mt9p031_registered, -+ .open = mt9p031_open, -+ .close = mt9p031_close, -+}; -+ -+static int mt9p031_probe(struct i2c_client *client, -+ const struct i2c_device_id *did) -+{ -+ struct mt9p031 *mt9p031; -+ struct mt9p031_platform_data *pdata = client->dev.platform_data; -+ struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); -+ int ret; -+ -+ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA)) { -+ dev_warn(&adapter->dev, -+ "I2C-Adapter doesn't support I2C_FUNC_SMBUS_WORD\n"); -+ return -EIO; -+ } -+ -+ mt9p031 = kzalloc(sizeof(struct mt9p031), GFP_KERNEL); -+ if (!mt9p031) -+ return -ENOMEM; -+ -+ mutex_init(&mt9p031->power_lock); -+ v4l2_i2c_subdev_init(&mt9p031->subdev, client, &mt9p031_subdev_ops); -+ mt9p031->subdev.internal_ops = &mt9p031_subdev_internal_ops; -+ -+ mt9p031->pdata = pdata; -+ -+ mt9p031->reg_1v8 = regulator_get(NULL, "cam_1v8"); -+ if (IS_ERR(mt9p031->reg_1v8)) { -+ ret = PTR_ERR(mt9p031->reg_1v8); -+ dev_err(mt9p031->subdev.v4l2_dev->dev, -+ "Failed 1.8v regulator: %d\n", ret); -+ goto err_e1v8; -+ } -+ -+ mt9p031->reg_2v8 = regulator_get(NULL, "cam_2v8"); -+ if (IS_ERR(mt9p031->reg_2v8)) { -+ ret = PTR_ERR(mt9p031->reg_2v8); -+ dev_err(mt9p031->subdev.v4l2_dev->dev, -+ "Failed 2.8v regulator: %d\n", ret); -+ goto err_e2v8; -+ } -+ return 0; -+err_e2v8: -+ regulator_put(mt9p031->reg_1v8); -+err_e1v8: -+ kfree(mt9p031); -+ return ret; -+} -+ -+static int mt9p031_remove(struct i2c_client *client) -+{ -+ struct v4l2_subdev *sd = i2c_get_clientdata(client); -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ -+ v4l2_device_unregister_subdev(sd); -+ media_entity_cleanup(&sd->entity); -+ regulator_put(mt9p031->reg_2v8); -+ regulator_put(mt9p031->reg_1v8); -+ kfree(mt9p031); -+ -+ return 0; -+} -+ -+static const struct i2c_device_id mt9p031_id[] = { -+ { "mt9p031", 0 }, -+ { } -+}; -+MODULE_DEVICE_TABLE(i2c, mt9p031_id); -+ -+static struct i2c_driver mt9p031_i2c_driver = { -+ .driver = { -+ .name = "mt9p031", -+ }, -+ .probe = mt9p031_probe, -+ .remove = mt9p031_remove, -+ .id_table = mt9p031_id, -+}; -+ -+static int __init mt9p031_mod_init(void) -+{ -+ return i2c_add_driver(&mt9p031_i2c_driver); -+} -+ -+static void __exit mt9p031_mod_exit(void) -+{ -+ i2c_del_driver(&mt9p031_i2c_driver); -+} -+ -+module_init(mt9p031_mod_init); -+module_exit(mt9p031_mod_exit); -+ -+MODULE_DESCRIPTION("Aptina MT9P031 Camera driver"); -+MODULE_AUTHOR("Bastian Hecht "); -+MODULE_LICENSE("GPL v2"); -diff --git a/include/media/mt9p031.h b/include/media/mt9p031.h -new file mode 100644 -index 0000000..ad37eb3 ---- /dev/null -+++ b/include/media/mt9p031.h -@@ -0,0 +1,11 @@ -+#ifndef MT9P031_H -+#define MT9P031_H -+ -+struct v4l2_subdev; -+ -+struct mt9p031_platform_data { -+ int (*set_xclk)(struct v4l2_subdev *subdev, int hz); -+ int (*reset)(struct v4l2_subdev *subdev, int active); -+}; -+ -+#endif --- -1.6.6.1 - diff --git a/recipes/linux/linux-omap-2.6.39/camera/0002-OMAP3BEAGLE-Add-support-for-mt9p031-sensor-driver.patch b/recipes/linux/linux-omap-2.6.39/camera/0002-OMAP3BEAGLE-Add-support-for-mt9p031-sensor-driver.patch new file mode 100644 index 0000000000..68a762b25b --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/camera/0002-OMAP3BEAGLE-Add-support-for-mt9p031-sensor-driver.patch @@ -0,0 +1,142 @@ +From 186ab3a6cd3f1751b4e60044d8207eb95c4b224a Mon Sep 17 00:00:00 2001 +From: Javier Martin +Date: Wed, 25 May 2011 10:09:23 +0200 +Subject: [PATCH 2/4] OMAP3BEAGLE: Add support for mt9p031 sensor driver. + +isp.h file has to be included as a temporal measure +since clocks of the isp are not exposed yet. + +Signed-off-by: Javier Martin +--- + arch/arm/mach-omap2/board-omap3beagle.c | 73 ++++++++++++++++++++++++++++++- + 1 files changed, 72 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 221bfda..9af1cf8 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -25,15 +25,21 @@ + #include + #include + #include ++#include ++#include ++#include + + #include + #include + #include + #include + ++#include + #include + #include + ++#include ++ + #include + #include + #include +@@ -48,11 +54,17 @@ + #include + #include + #include ++#include + + #include "mux.h" + #include "hsmmc.h" + #include "timer-gp.h" + #include "pm.h" ++#include "devices.h" ++#include "../../../drivers/media/video/omap3isp/isp.h" ++ ++#define MT9P031_RESET_GPIO 98 ++#define MT9P031_XCLK ISP_XCLK_A + + #define NAND_BLOCK_SIZE SZ_128K + +@@ -734,7 +746,7 @@ static int __init omap3_beagle_i2c_init(void) + { + omap_register_i2c_bus(1, 2600, beagle_i2c1_boardinfo, + ARRAY_SIZE(beagle_i2c1_boardinfo)); +- omap_register_i2c_bus(2, 400, beagle_i2c2_boardinfo, ++ omap_register_i2c_bus(2, 100, beagle_i2c2_boardinfo, + ARRAY_SIZE(beagle_i2c2_boardinfo)); + /* Bus 3 is attached to the DVI port where devices like the pico DLP + * projector don't work reliably with 400kHz */ +@@ -935,6 +947,60 @@ static void __init beagle_opp_init(void) + return; + } + ++static int beagle_cam_set_xclk(struct v4l2_subdev *subdev, int hz) ++{ ++ struct isp_device *isp = v4l2_dev_to_isp_device(subdev->v4l2_dev); ++ int ret; ++ ++ ret = isp->platform_cb.set_xclk(isp, hz, MT9P031_XCLK); ++ return 0; ++} ++ ++static int beagle_cam_reset(struct v4l2_subdev *subdev, int active) ++{ ++ /* Set RESET_BAR to !active */ ++ gpio_set_value(MT9P031_RESET_GPIO, !active); ++ ++ return 0; ++} ++ ++static struct mt9p031_platform_data beagle_mt9p031_platform_data = { ++ .set_xclk = beagle_cam_set_xclk, ++ .reset = beagle_cam_reset, ++}; ++ ++static struct i2c_board_info mt9p031_camera_i2c_device = { ++ I2C_BOARD_INFO("mt9p031", 0x48), ++ .platform_data = &beagle_mt9p031_platform_data, ++}; ++ ++static struct isp_subdev_i2c_board_info mt9p031_camera_subdevs[] = { ++ { ++ .board_info = &mt9p031_camera_i2c_device, ++ .i2c_adapter_id = 2, ++ }, ++ { NULL, 0, }, ++}; ++ ++static struct isp_v4l2_subdevs_group beagle_camera_subdevs[] = { ++ { ++ .subdevs = mt9p031_camera_subdevs, ++ .interface = ISP_INTERFACE_PARALLEL, ++ .bus = { ++ .parallel = { ++ .data_lane_shift = 0, ++ .clk_pol = 1, ++ .bridge = ISPCTRL_PAR_BRIDGE_DISABLE, ++ } ++ }, ++ }, ++ { }, ++}; ++ ++static struct isp_platform_data beagle_isp_platform_data = { ++ .subdevs = beagle_camera_subdevs, ++}; ++ + static void __init omap3_beagle_init(void) + { + omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); +@@ -1024,6 +1090,11 @@ static void __init omap3_beagle_init(void) + + beagle_display_init(); + beagle_opp_init(); ++ ++ /* Enable camera */ ++ gpio_request(MT9P031_RESET_GPIO, "cam_rst"); ++ gpio_direction_output(MT9P031_RESET_GPIO, 0); ++ omap3_init_camera(&beagle_isp_platform_data); + } + + early_param("buddy", expansionboard_setup); +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/camera/0003-OMAP3-beagle-only-init-camera-on-3630.patch b/recipes/linux/linux-omap-2.6.39/camera/0003-OMAP3-beagle-only-init-camera-on-3630.patch new file mode 100644 index 0000000000..b7efa4e5db --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/camera/0003-OMAP3-beagle-only-init-camera-on-3630.patch @@ -0,0 +1,34 @@ +From 014b3e447a0a9bbed5e238873fefb1a6c660c6a0 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Wed, 25 May 2011 10:28:29 +0200 +Subject: [PATCH 3/4] OMAP3: beagle: only init camera on 3630 + +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/board-omap3beagle.c | 10 ++++++---- + 1 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 9af1cf8..80f8ece 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -1091,10 +1091,12 @@ static void __init omap3_beagle_init(void) + beagle_display_init(); + beagle_opp_init(); + +- /* Enable camera */ +- gpio_request(MT9P031_RESET_GPIO, "cam_rst"); +- gpio_direction_output(MT9P031_RESET_GPIO, 0); +- omap3_init_camera(&beagle_isp_platform_data); ++ if (cpu_is_omap3630()) { ++ /* Enable camera */ ++ gpio_request(MT9P031_RESET_GPIO, "cam_rst"); ++ gpio_direction_output(MT9P031_RESET_GPIO, 0); ++ omap3_init_camera(&beagle_isp_platform_data); ++ } + } + + early_param("buddy", expansionboard_setup); +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/camera/0004-v4l-Add-mt9v032-sensor-driver.patch b/recipes/linux/linux-omap-2.6.39/camera/0004-v4l-Add-mt9v032-sensor-driver.patch new file mode 100644 index 0000000000..48e41a5490 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/camera/0004-v4l-Add-mt9v032-sensor-driver.patch @@ -0,0 +1,853 @@ +From 9b0b5f99896549524c8f88a70f6cf0c0271d730e Mon Sep 17 00:00:00 2001 +From: Detlev Casanova +Date: Sun, 28 Nov 2010 19:07:20 +0100 +Subject: [PATCH 4/4] v4l: Add mt9v032 sensor driver + +The MT9V032 is a parallel wide VGA sensor from Aptina (formerly Micron) +controlled through I2C. + +The driver creates a V4L2 subdevice. It currently supports binning and +cropping, and the gain, auto gain, exposure, auto exposure and test +pattern controls. + +Signed-off-by: Detlev Casanova +Signed-off-by: Laurent Pinchart +--- + drivers/media/video/Kconfig | 7 + + drivers/media/video/Makefile | 1 + + drivers/media/video/mt9v032.c | 773 +++++++++++++++++++++++++++++++++++++++++ + include/media/mt9v032.h | 12 + + 4 files changed, 793 insertions(+), 0 deletions(-) + create mode 100644 drivers/media/video/mt9v032.c + create mode 100644 include/media/mt9v032.h + +diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig +index cb87e35..3a5bc57 100644 +--- a/drivers/media/video/Kconfig ++++ b/drivers/media/video/Kconfig +@@ -344,6 +344,13 @@ config VIDEO_MT9V011 + mt0v011 1.3 Mpixel camera. It currently only works with the + em28xx driver. + ++config VIDEO_MT9V032 ++ tristate "Micron MT9V032 sensor support" ++ depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API ++ ---help--- ++ This is a Video4Linux2 sensor-level driver for the Micron ++ MT9V032 752x480 CMOS sensor. ++ + config VIDEO_TCM825X + tristate "TCM825x camera sensor support" + depends on I2C && VIDEO_V4L2 +diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile +index 912b29b..6679c6a 100644 +--- a/drivers/media/video/Makefile ++++ b/drivers/media/video/Makefile +@@ -67,6 +67,7 @@ obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o + obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o + obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o + obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o ++obj-$(CONFIG_VIDEO_MT9V032) += mt9v032.o + obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o + obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o + +diff --git a/drivers/media/video/mt9v032.c b/drivers/media/video/mt9v032.c +new file mode 100644 +index 0000000..c64e1dc +--- /dev/null ++++ b/drivers/media/video/mt9v032.c +@@ -0,0 +1,773 @@ ++/* ++ * Driver for MT9V032 CMOS Image Sensor from Micron ++ * ++ * Copyright (C) 2010, Laurent Pinchart ++ * ++ * Based on the MT9M001 driver, ++ * ++ * Copyright (C) 2008, Guennadi Liakhovetski ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++#define MT9V032_PIXEL_ARRAY_HEIGHT 492 ++#define MT9V032_PIXEL_ARRAY_WIDTH 782 ++ ++#define MT9V032_CHIP_VERSION 0x00 ++#define MT9V032_CHIP_ID_REV1 0x1311 ++#define MT9V032_CHIP_ID_REV3 0x1313 ++#define MT9V032_COLUMN_START 0x01 ++#define MT9V032_COLUMN_START_MIN 1 ++#define MT9V032_COLUMN_START_DEF 1 ++#define MT9V032_COLUMN_START_MAX 752 ++#define MT9V032_ROW_START 0x02 ++#define MT9V032_ROW_START_MIN 4 ++#define MT9V032_ROW_START_DEF 5 ++#define MT9V032_ROW_START_MAX 482 ++#define MT9V032_WINDOW_HEIGHT 0x03 ++#define MT9V032_WINDOW_HEIGHT_MIN 1 ++#define MT9V032_WINDOW_HEIGHT_DEF 480 ++#define MT9V032_WINDOW_HEIGHT_MAX 480 ++#define MT9V032_WINDOW_WIDTH 0x04 ++#define MT9V032_WINDOW_WIDTH_MIN 1 ++#define MT9V032_WINDOW_WIDTH_DEF 752 ++#define MT9V032_WINDOW_WIDTH_MAX 752 ++#define MT9V032_HORIZONTAL_BLANKING 0x05 ++#define MT9V032_HORIZONTAL_BLANKING_MIN 43 ++#define MT9V032_HORIZONTAL_BLANKING_MAX 1023 ++#define MT9V032_VERTICAL_BLANKING 0x06 ++#define MT9V032_VERTICAL_BLANKING_MIN 4 ++#define MT9V032_VERTICAL_BLANKING_MAX 3000 ++#define MT9V032_CHIP_CONTROL 0x07 ++#define MT9V032_CHIP_CONTROL_MASTER_MODE (1 << 3) ++#define MT9V032_CHIP_CONTROL_DOUT_ENABLE (1 << 7) ++#define MT9V032_CHIP_CONTROL_SEQUENTIAL (1 << 8) ++#define MT9V032_SHUTTER_WIDTH1 0x08 ++#define MT9V032_SHUTTER_WIDTH2 0x09 ++#define MT9V032_SHUTTER_WIDTH_CONTROL 0x0a ++#define MT9V032_TOTAL_SHUTTER_WIDTH 0x0b ++#define MT9V032_TOTAL_SHUTTER_WIDTH_MIN 1 ++#define MT9V032_TOTAL_SHUTTER_WIDTH_DEF 480 ++#define MT9V032_TOTAL_SHUTTER_WIDTH_MAX 32767 ++#define MT9V032_RESET 0x0c ++#define MT9V032_READ_MODE 0x0d ++#define MT9V032_READ_MODE_ROW_BIN_MASK (3 << 0) ++#define MT9V032_READ_MODE_ROW_BIN_SHIFT 0 ++#define MT9V032_READ_MODE_COLUMN_BIN_MASK (3 << 2) ++#define MT9V032_READ_MODE_COLUMN_BIN_SHIFT 2 ++#define MT9V032_READ_MODE_ROW_FLIP (1 << 4) ++#define MT9V032_READ_MODE_COLUMN_FLIP (1 << 5) ++#define MT9V032_READ_MODE_DARK_COLUMNS (1 << 6) ++#define MT9V032_READ_MODE_DARK_ROWS (1 << 7) ++#define MT9V032_PIXEL_OPERATION_MODE 0x0f ++#define MT9V032_PIXEL_OPERATION_MODE_COLOR (1 << 2) ++#define MT9V032_PIXEL_OPERATION_MODE_HDR (1 << 6) ++#define MT9V032_ANALOG_GAIN 0x35 ++#define MT9V032_ANALOG_GAIN_MIN 16 ++#define MT9V032_ANALOG_GAIN_DEF 16 ++#define MT9V032_ANALOG_GAIN_MAX 64 ++#define MT9V032_MAX_ANALOG_GAIN 0x36 ++#define MT9V032_MAX_ANALOG_GAIN_MAX 127 ++#define MT9V032_FRAME_DARK_AVERAGE 0x42 ++#define MT9V032_DARK_AVG_THRESH 0x46 ++#define MT9V032_DARK_AVG_LOW_THRESH_MASK (255 << 0) ++#define MT9V032_DARK_AVG_LOW_THRESH_SHIFT 0 ++#define MT9V032_DARK_AVG_HIGH_THRESH_MASK (255 << 8) ++#define MT9V032_DARK_AVG_HIGH_THRESH_SHIFT 8 ++#define MT9V032_ROW_NOISE_CORR_CONTROL 0x70 ++#define MT9V032_ROW_NOISE_CORR_ENABLE (1 << 5) ++#define MT9V032_ROW_NOISE_CORR_USE_BLK_AVG (1 << 7) ++#define MT9V032_PIXEL_CLOCK 0x74 ++#define MT9V032_PIXEL_CLOCK_INV_LINE (1 << 0) ++#define MT9V032_PIXEL_CLOCK_INV_FRAME (1 << 1) ++#define MT9V032_PIXEL_CLOCK_XOR_LINE (1 << 2) ++#define MT9V032_PIXEL_CLOCK_CONT_LINE (1 << 3) ++#define MT9V032_PIXEL_CLOCK_INV_PXL_CLK (1 << 4) ++#define MT9V032_TEST_PATTERN 0x7f ++#define MT9V032_TEST_PATTERN_DATA_MASK (1023 << 0) ++#define MT9V032_TEST_PATTERN_DATA_SHIFT 0 ++#define MT9V032_TEST_PATTERN_USE_DATA (1 << 10) ++#define MT9V032_TEST_PATTERN_GRAY_MASK (3 << 11) ++#define MT9V032_TEST_PATTERN_GRAY_NONE (0 << 11) ++#define MT9V032_TEST_PATTERN_GRAY_VERTICAL (1 << 11) ++#define MT9V032_TEST_PATTERN_GRAY_HORIZONTAL (2 << 11) ++#define MT9V032_TEST_PATTERN_GRAY_DIAGONAL (3 << 11) ++#define MT9V032_TEST_PATTERN_ENABLE (1 << 13) ++#define MT9V032_TEST_PATTERN_FLIP (1 << 14) ++#define MT9V032_AEC_AGC_ENABLE 0xaf ++#define MT9V032_AEC_ENABLE (1 << 0) ++#define MT9V032_AGC_ENABLE (1 << 1) ++#define MT9V032_THERMAL_INFO 0xc1 ++ ++struct mt9v032 { ++ struct v4l2_subdev subdev; ++ struct media_pad pad; ++ ++ struct v4l2_mbus_framefmt format; ++ struct v4l2_rect crop; ++ ++ struct v4l2_ctrl_handler ctrls; ++ ++ struct mutex power_lock; ++ int power_count; ++ ++ struct mt9v032_platform_data *pdata; ++ u16 chip_control; ++ u16 aec_agc; ++}; ++ ++static struct mt9v032 *to_mt9v032(struct v4l2_subdev *sd) ++{ ++ return container_of(sd, struct mt9v032, subdev); ++} ++ ++static int mt9v032_read(struct i2c_client *client, const u8 reg) ++{ ++ s32 data = i2c_smbus_read_word_data(client, reg); ++ dev_dbg(&client->dev, "%s: read 0x%04x from 0x%02x\n", __func__, ++ swab16(data), reg); ++ return data < 0 ? data : swab16(data); ++} ++ ++static int mt9v032_write(struct i2c_client *client, const u8 reg, ++ const u16 data) ++{ ++ dev_dbg(&client->dev, "%s: writing 0x%04x to 0x%02x\n", __func__, ++ data, reg); ++ return i2c_smbus_write_word_data(client, reg, swab16(data)); ++} ++ ++static int mt9v032_set_chip_control(struct mt9v032 *mt9v032, u16 clear, u16 set) ++{ ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9v032->subdev); ++ u16 value = (mt9v032->chip_control & ~clear) | set; ++ int ret; ++ ++ ret = mt9v032_write(client, MT9V032_CHIP_CONTROL, value); ++ if (ret < 0) ++ return ret; ++ ++ mt9v032->chip_control = value; ++ return 0; ++} ++ ++static int ++mt9v032_update_aec_agc(struct mt9v032 *mt9v032, u16 which, int enable) ++{ ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9v032->subdev); ++ u16 value = mt9v032->aec_agc; ++ int ret; ++ ++ if (enable) ++ value |= which; ++ else ++ value &= ~which; ++ ++ ret = mt9v032_write(client, MT9V032_AEC_AGC_ENABLE, value); ++ if (ret < 0) ++ return ret; ++ ++ mt9v032->aec_agc = value; ++ return 0; ++} ++ ++static int mt9v032_power_on(struct mt9v032 *mt9v032) ++{ ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9v032->subdev); ++ int ret; ++ ++ if (mt9v032->pdata->set_clock) { ++ mt9v032->pdata->set_clock(&mt9v032->subdev, 25000000); ++ udelay(1); ++ } ++ ++ /* Reset the chip and stop data read out */ ++ ret = mt9v032_write(client, MT9V032_RESET, 1); ++ if (ret < 0) ++ return ret; ++ ++ ret = mt9v032_write(client, MT9V032_RESET, 0); ++ if (ret < 0) ++ return ret; ++ ++ return mt9v032_write(client, MT9V032_CHIP_CONTROL, 0); ++} ++ ++static void mt9v032_power_off(struct mt9v032 *mt9v032) ++{ ++ if (mt9v032->pdata->set_clock) ++ mt9v032->pdata->set_clock(&mt9v032->subdev, 0); ++} ++ ++static int __mt9v032_set_power(struct mt9v032 *mt9v032, bool on) ++{ ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9v032->subdev); ++ int ret; ++ ++ if (!on) { ++ mt9v032_power_off(mt9v032); ++ return 0; ++ } ++ ++ ret = mt9v032_power_on(mt9v032); ++ if (ret < 0) ++ return ret; ++ ++ /* Configure the pixel clock polarity */ ++ if (mt9v032->pdata && mt9v032->pdata->clk_pol) { ++ ret = mt9v032_write(client, MT9V032_PIXEL_CLOCK, ++ MT9V032_PIXEL_CLOCK_INV_PXL_CLK); ++ if (ret < 0) ++ return ret; ++ } ++ ++ /* Disable the noise correction algorithm and restore the controls. */ ++ ret = mt9v032_write(client, MT9V032_ROW_NOISE_CORR_CONTROL, 0); ++ if (ret < 0) ++ return ret; ++ ++ return v4l2_ctrl_handler_setup(&mt9v032->ctrls); ++} ++ ++/* ----------------------------------------------------------------------------- ++ * V4L2 subdev video operations ++ */ ++ ++static struct v4l2_mbus_framefmt * ++__mt9v032_get_pad_format(struct mt9v032 *mt9v032, struct v4l2_subdev_fh *fh, ++ unsigned int pad, enum v4l2_subdev_format_whence which) ++{ ++ switch (which) { ++ case V4L2_SUBDEV_FORMAT_TRY: ++ return v4l2_subdev_get_try_format(fh, pad); ++ case V4L2_SUBDEV_FORMAT_ACTIVE: ++ return &mt9v032->format; ++ default: ++ return NULL; ++ } ++} ++ ++static struct v4l2_rect * ++__mt9v032_get_pad_crop(struct mt9v032 *mt9v032, struct v4l2_subdev_fh *fh, ++ unsigned int pad, enum v4l2_subdev_format_whence which) ++{ ++ switch (which) { ++ case V4L2_SUBDEV_FORMAT_TRY: ++ return v4l2_subdev_get_try_crop(fh, pad); ++ case V4L2_SUBDEV_FORMAT_ACTIVE: ++ return &mt9v032->crop; ++ default: ++ return NULL; ++ } ++} ++ ++static int mt9v032_s_stream(struct v4l2_subdev *subdev, int enable) ++{ ++ const u16 mode = MT9V032_CHIP_CONTROL_MASTER_MODE ++ | MT9V032_CHIP_CONTROL_DOUT_ENABLE ++ | MT9V032_CHIP_CONTROL_SEQUENTIAL; ++ struct i2c_client *client = v4l2_get_subdevdata(subdev); ++ struct mt9v032 *mt9v032 = to_mt9v032(subdev); ++ struct v4l2_mbus_framefmt *format = &mt9v032->format; ++ struct v4l2_rect *crop = &mt9v032->crop; ++ unsigned int hratio; ++ unsigned int vratio; ++ int ret; ++ ++ if (!enable) ++ return mt9v032_set_chip_control(mt9v032, mode, 0); ++ ++ /* Configure the window size and row/column bin */ ++ hratio = DIV_ROUND_CLOSEST(crop->width, format->width); ++ vratio = DIV_ROUND_CLOSEST(crop->height, format->height); ++ ++ ret = mt9v032_write(client, MT9V032_READ_MODE, ++ (hratio - 1) << MT9V032_READ_MODE_ROW_BIN_SHIFT | ++ (vratio - 1) << MT9V032_READ_MODE_COLUMN_BIN_SHIFT); ++ if (ret < 0) ++ return ret; ++ ++ ret = mt9v032_write(client, MT9V032_COLUMN_START, crop->left); ++ if (ret < 0) ++ return ret; ++ ++ ret = mt9v032_write(client, MT9V032_ROW_START, crop->top); ++ if (ret < 0) ++ return ret; ++ ++ ret = mt9v032_write(client, MT9V032_WINDOW_WIDTH, crop->width); ++ if (ret < 0) ++ return ret; ++ ++ ret = mt9v032_write(client, MT9V032_WINDOW_HEIGHT, crop->height); ++ if (ret < 0) ++ return ret; ++ ++ ret = mt9v032_write(client, MT9V032_HORIZONTAL_BLANKING, ++ max(43, 660 - crop->width)); ++ if (ret < 0) ++ return ret; ++ ++ /* Switch to master "normal" mode */ ++ return mt9v032_set_chip_control(mt9v032, 0, mode); ++} ++ ++static int mt9v032_enum_mbus_code(struct v4l2_subdev *subdev, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_mbus_code_enum *code) ++{ ++ if (code->index > 0) ++ return -EINVAL; ++ ++ code->code = V4L2_MBUS_FMT_SGRBG10_1X10; ++ return 0; ++} ++ ++static int mt9v032_enum_frame_size(struct v4l2_subdev *subdev, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_frame_size_enum *fse) ++{ ++ if (fse->index >= 8 || fse->code != V4L2_MBUS_FMT_SGRBG10_1X10) ++ return -EINVAL; ++ ++ fse->min_width = MT9V032_WINDOW_WIDTH_DEF / fse->index; ++ fse->max_width = fse->min_width; ++ fse->min_height = MT9V032_WINDOW_HEIGHT_DEF / fse->index; ++ fse->max_height = fse->min_height; ++ ++ return 0; ++} ++ ++static int mt9v032_get_format(struct v4l2_subdev *subdev, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_format *format) ++{ ++ struct mt9v032 *mt9v032 = to_mt9v032(subdev); ++ ++ format->format = *__mt9v032_get_pad_format(mt9v032, fh, format->pad, ++ format->which); ++ return 0; ++} ++ ++static int mt9v032_set_format(struct v4l2_subdev *subdev, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_format *format) ++{ ++ struct mt9v032 *mt9v032 = to_mt9v032(subdev); ++ struct v4l2_mbus_framefmt *__format; ++ struct v4l2_rect *__crop; ++ unsigned int width; ++ unsigned int height; ++ unsigned int hratio; ++ unsigned int vratio; ++ ++ __crop = __mt9v032_get_pad_crop(mt9v032, fh, format->pad, ++ format->which); ++ ++ /* Clamp the width and height to avoid dividing by zero. */ ++ width = clamp_t(unsigned int, ALIGN(format->format.width, 2), ++ max(__crop->width / 8, MT9V032_WINDOW_WIDTH_MIN), ++ __crop->width); ++ height = clamp_t(unsigned int, ALIGN(format->format.height, 2), ++ max(__crop->height / 8, MT9V032_WINDOW_HEIGHT_MIN), ++ __crop->height); ++ ++ hratio = DIV_ROUND_CLOSEST(__crop->width, width); ++ vratio = DIV_ROUND_CLOSEST(__crop->height, height); ++ ++ __format = __mt9v032_get_pad_format(mt9v032, fh, format->pad, ++ format->which); ++ __format->width = __crop->width / hratio; ++ __format->height = __crop->height / vratio; ++ ++ format->format = *__format; ++ ++ return 0; ++} ++ ++static int mt9v032_get_crop(struct v4l2_subdev *subdev, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_crop *crop) ++{ ++ struct mt9v032 *mt9v032 = to_mt9v032(subdev); ++ ++ crop->rect = *__mt9v032_get_pad_crop(mt9v032, fh, crop->pad, ++ crop->which); ++ return 0; ++} ++ ++static int mt9v032_set_crop(struct v4l2_subdev *subdev, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_crop *crop) ++{ ++ struct mt9v032 *mt9v032 = to_mt9v032(subdev); ++ struct v4l2_mbus_framefmt *__format; ++ struct v4l2_rect *__crop; ++ struct v4l2_rect rect; ++ ++ /* Clamp the crop rectangle boundaries and align them to a non multiple ++ * of 2 pixels to ensure a GRBG Bayer pattern. ++ */ ++ rect.left = clamp(ALIGN(crop->rect.left + 1, 2) - 1, ++ MT9V032_COLUMN_START_MIN, ++ MT9V032_COLUMN_START_MAX); ++ rect.top = clamp(ALIGN(crop->rect.top + 1, 2) - 1, ++ MT9V032_ROW_START_MIN, ++ MT9V032_ROW_START_MAX); ++ rect.width = clamp(ALIGN(crop->rect.width, 2), ++ MT9V032_WINDOW_WIDTH_MIN, ++ MT9V032_WINDOW_WIDTH_MAX); ++ rect.height = clamp(ALIGN(crop->rect.height, 2), ++ MT9V032_WINDOW_HEIGHT_MIN, ++ MT9V032_WINDOW_HEIGHT_MAX); ++ ++ rect.width = min(rect.width, MT9V032_PIXEL_ARRAY_WIDTH - rect.left); ++ rect.height = min(rect.height, MT9V032_PIXEL_ARRAY_HEIGHT - rect.top); ++ ++ __crop = __mt9v032_get_pad_crop(mt9v032, fh, crop->pad, crop->which); ++ ++ if (rect.width != __crop->width || rect.height != __crop->height) { ++ /* Reset the output image size if the crop rectangle size has ++ * been modified. ++ */ ++ __format = __mt9v032_get_pad_format(mt9v032, fh, crop->pad, ++ crop->which); ++ __format->width = rect.width; ++ __format->height = rect.height; ++ } ++ ++ *__crop = rect; ++ crop->rect = rect; ++ ++ return 0; ++} ++ ++/* ----------------------------------------------------------------------------- ++ * V4L2 subdev control operations ++ */ ++ ++#define V4L2_CID_TEST_PATTERN (V4L2_CID_USER_BASE | 0x1001) ++ ++static int mt9v032_s_ctrl(struct v4l2_ctrl *ctrl) ++{ ++ struct mt9v032 *mt9v032 = ++ container_of(ctrl->handler, struct mt9v032, ctrls); ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9v032->subdev); ++ u16 data; ++ ++ switch (ctrl->id) { ++ case V4L2_CID_AUTOGAIN: ++ return mt9v032_update_aec_agc(mt9v032, MT9V032_AGC_ENABLE, ++ ctrl->val); ++ ++ case V4L2_CID_GAIN: ++ return mt9v032_write(client, MT9V032_ANALOG_GAIN, ctrl->val); ++ ++ case V4L2_CID_EXPOSURE_AUTO: ++ return mt9v032_update_aec_agc(mt9v032, MT9V032_AEC_ENABLE, ++ ctrl->val); ++ ++ case V4L2_CID_EXPOSURE: ++ return mt9v032_write(client, MT9V032_TOTAL_SHUTTER_WIDTH, ++ ctrl->val); ++ ++ case V4L2_CID_TEST_PATTERN: ++ switch (ctrl->val) { ++ case 0: ++ data = 0; ++ break; ++ case 1: ++ data = MT9V032_TEST_PATTERN_GRAY_VERTICAL ++ | MT9V032_TEST_PATTERN_ENABLE; ++ break; ++ case 2: ++ data = MT9V032_TEST_PATTERN_GRAY_HORIZONTAL ++ | MT9V032_TEST_PATTERN_ENABLE; ++ break; ++ case 3: ++ data = MT9V032_TEST_PATTERN_GRAY_DIAGONAL ++ | MT9V032_TEST_PATTERN_ENABLE; ++ break; ++ default: ++ data = (ctrl->val << MT9V032_TEST_PATTERN_DATA_SHIFT) ++ | MT9V032_TEST_PATTERN_USE_DATA ++ | MT9V032_TEST_PATTERN_ENABLE ++ | MT9V032_TEST_PATTERN_FLIP; ++ break; ++ } ++ ++ return mt9v032_write(client, MT9V032_TEST_PATTERN, data); ++ } ++ ++ return 0; ++} ++ ++static struct v4l2_ctrl_ops mt9v032_ctrl_ops = { ++ .s_ctrl = mt9v032_s_ctrl, ++}; ++ ++static const struct v4l2_ctrl_config mt9v032_ctrls[] = { ++ { ++ .ops = &mt9v032_ctrl_ops, ++ .id = V4L2_CID_TEST_PATTERN, ++ .type = V4L2_CTRL_TYPE_INTEGER, ++ .name = "Test pattern", ++ .min = 0, ++ .max = 1023, ++ .step = 1, ++ .def = 0, ++ .flags = 0, ++ } ++}; ++ ++/* ----------------------------------------------------------------------------- ++ * V4L2 subdev core operations ++ */ ++ ++static int mt9v032_set_power(struct v4l2_subdev *subdev, int on) ++{ ++ struct mt9v032 *mt9v032 = to_mt9v032(subdev); ++ int ret = 0; ++ ++ mutex_lock(&mt9v032->power_lock); ++ ++ /* If the power count is modified from 0 to != 0 or from != 0 to 0, ++ * update the power state. ++ */ ++ if (mt9v032->power_count == !on) { ++ ret = __mt9v032_set_power(mt9v032, !!on); ++ if (ret < 0) ++ goto done; ++ } ++ ++ /* Update the power count. */ ++ mt9v032->power_count += on ? 1 : -1; ++ WARN_ON(mt9v032->power_count < 0); ++ ++done: ++ mutex_unlock(&mt9v032->power_lock); ++ return ret; ++} ++ ++/* ----------------------------------------------------------------------------- ++ * V4L2 subdev internal operations ++ */ ++ ++static int mt9v032_registered(struct v4l2_subdev *subdev) ++{ ++ struct i2c_client *client = v4l2_get_subdevdata(subdev); ++ struct mt9v032 *mt9v032 = to_mt9v032(subdev); ++ s32 data; ++ int ret; ++ ++ dev_info(&client->dev, "Probing MT9V032 at address 0x%02x\n", ++ client->addr); ++ ++ ret = mt9v032_power_on(mt9v032); ++ if (ret < 0) { ++ dev_err(&client->dev, "MT9V032 power up failed\n"); ++ return ret; ++ } ++ ++ /* Read and check the sensor version */ ++ data = mt9v032_read(client, MT9V032_CHIP_VERSION); ++ if (data != MT9V032_CHIP_ID_REV1 && data != MT9V032_CHIP_ID_REV3) { ++ dev_err(&client->dev, "MT9V032 not detected, wrong version " ++ "0x%04x\n", data); ++ return -ENODEV; ++ } ++ ++ mt9v032_power_off(mt9v032); ++ ++ dev_info(&client->dev, "MT9V032 detected at address 0x%02x\n", ++ client->addr); ++ ++ return ret; ++} ++ ++static int mt9v032_open(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh) ++{ ++ struct v4l2_mbus_framefmt *format; ++ struct v4l2_rect *crop; ++ ++ crop = v4l2_subdev_get_try_crop(fh, 0); ++ crop->left = MT9V032_COLUMN_START_DEF; ++ crop->top = MT9V032_ROW_START_DEF; ++ crop->width = MT9V032_WINDOW_WIDTH_DEF; ++ crop->height = MT9V032_WINDOW_HEIGHT_DEF; ++ ++ format = v4l2_subdev_get_try_format(fh, 0); ++ format->code = V4L2_MBUS_FMT_SGRBG10_1X10; ++ format->width = MT9V032_WINDOW_WIDTH_DEF; ++ format->height = MT9V032_WINDOW_HEIGHT_DEF; ++ format->field = V4L2_FIELD_NONE; ++ format->colorspace = V4L2_COLORSPACE_SRGB; ++ ++ return mt9v032_set_power(subdev, 1); ++} ++ ++static int mt9v032_close(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh) ++{ ++ return mt9v032_set_power(subdev, 0); ++} ++ ++static struct v4l2_subdev_core_ops mt9v032_subdev_core_ops = { ++ .s_power = mt9v032_set_power, ++}; ++ ++static struct v4l2_subdev_video_ops mt9v032_subdev_video_ops = { ++ .s_stream = mt9v032_s_stream, ++}; ++ ++static struct v4l2_subdev_pad_ops mt9v032_subdev_pad_ops = { ++ .enum_mbus_code = mt9v032_enum_mbus_code, ++ .enum_frame_size = mt9v032_enum_frame_size, ++ .get_fmt = mt9v032_get_format, ++ .set_fmt = mt9v032_set_format, ++ .get_crop = mt9v032_get_crop, ++ .set_crop = mt9v032_set_crop, ++}; ++ ++static struct v4l2_subdev_ops mt9v032_subdev_ops = { ++ .core = &mt9v032_subdev_core_ops, ++ .video = &mt9v032_subdev_video_ops, ++ .pad = &mt9v032_subdev_pad_ops, ++}; ++ ++static const struct v4l2_subdev_internal_ops mt9v032_subdev_internal_ops = { ++ .registered = mt9v032_registered, ++ .open = mt9v032_open, ++ .close = mt9v032_close, ++}; ++ ++/* ----------------------------------------------------------------------------- ++ * Driver initialization and probing ++ */ ++ ++static int mt9v032_probe(struct i2c_client *client, ++ const struct i2c_device_id *did) ++{ ++ struct mt9v032 *mt9v032; ++ unsigned int i; ++ int ret; ++ ++ if (!i2c_check_functionality(client->adapter, ++ I2C_FUNC_SMBUS_WORD_DATA)) { ++ dev_warn(&client->adapter->dev, ++ "I2C-Adapter doesn't support I2C_FUNC_SMBUS_WORD\n"); ++ return -EIO; ++ } ++ ++ mt9v032 = kzalloc(sizeof(*mt9v032), GFP_KERNEL); ++ if (!mt9v032) ++ return -ENOMEM; ++ ++ mutex_init(&mt9v032->power_lock); ++ mt9v032->pdata = client->dev.platform_data; ++ ++ v4l2_ctrl_handler_init(&mt9v032->ctrls, ARRAY_SIZE(mt9v032_ctrls) + 4); ++ ++ v4l2_ctrl_new_std(&mt9v032->ctrls, &mt9v032_ctrl_ops, ++ V4L2_CID_AUTOGAIN, 0, 1, 1, 1); ++ v4l2_ctrl_new_std(&mt9v032->ctrls, &mt9v032_ctrl_ops, ++ V4L2_CID_GAIN, MT9V032_ANALOG_GAIN_MIN, ++ MT9V032_ANALOG_GAIN_MAX, 1, MT9V032_ANALOG_GAIN_DEF); ++ v4l2_ctrl_new_std_menu(&mt9v032->ctrls, &mt9v032_ctrl_ops, ++ V4L2_CID_EXPOSURE_AUTO, V4L2_EXPOSURE_MANUAL, 0, ++ V4L2_EXPOSURE_AUTO); ++ v4l2_ctrl_new_std(&mt9v032->ctrls, &mt9v032_ctrl_ops, ++ V4L2_CID_EXPOSURE, MT9V032_TOTAL_SHUTTER_WIDTH_MIN, ++ MT9V032_TOTAL_SHUTTER_WIDTH_MAX, 1, ++ MT9V032_TOTAL_SHUTTER_WIDTH_DEF); ++ ++ for (i = 0; i < ARRAY_SIZE(mt9v032_ctrls); ++i) ++ v4l2_ctrl_new_custom(&mt9v032->ctrls, &mt9v032_ctrls[i], NULL); ++ ++ mt9v032->subdev.ctrl_handler = &mt9v032->ctrls; ++ ++ if (mt9v032->ctrls.error) ++ printk(KERN_INFO "%s: control initialization error %d\n", ++ __func__, mt9v032->ctrls.error); ++ ++ mt9v032->crop.left = MT9V032_COLUMN_START_DEF; ++ mt9v032->crop.top = MT9V032_ROW_START_DEF; ++ mt9v032->crop.width = MT9V032_WINDOW_WIDTH_DEF; ++ mt9v032->crop.height = MT9V032_WINDOW_HEIGHT_DEF; ++ ++ mt9v032->format.code = V4L2_MBUS_FMT_SGRBG10_1X10; ++ mt9v032->format.width = MT9V032_WINDOW_WIDTH_DEF; ++ mt9v032->format.height = MT9V032_WINDOW_HEIGHT_DEF; ++ mt9v032->format.field = V4L2_FIELD_NONE; ++ mt9v032->format.colorspace = V4L2_COLORSPACE_SRGB; ++ ++ mt9v032->aec_agc = MT9V032_AEC_ENABLE | MT9V032_AGC_ENABLE; ++ ++ v4l2_i2c_subdev_init(&mt9v032->subdev, client, &mt9v032_subdev_ops); ++ mt9v032->subdev.internal_ops = &mt9v032_subdev_internal_ops; ++ mt9v032->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; ++ ++ mt9v032->pad.flags = MEDIA_PAD_FL_SOURCE; ++ ret = media_entity_init(&mt9v032->subdev.entity, 1, &mt9v032->pad, 0); ++ if (ret < 0) ++ kfree(mt9v032); ++ ++ return ret; ++} ++ ++static int mt9v032_remove(struct i2c_client *client) ++{ ++ struct v4l2_subdev *subdev = i2c_get_clientdata(client); ++ struct mt9v032 *mt9v032 = to_mt9v032(subdev); ++ ++ v4l2_device_unregister_subdev(subdev); ++ media_entity_cleanup(&subdev->entity); ++ kfree(mt9v032); ++ return 0; ++} ++ ++static const struct i2c_device_id mt9v032_id[] = { ++ { "mt9v032", 0 }, ++ { } ++}; ++MODULE_DEVICE_TABLE(i2c, mt9v032_id); ++ ++static struct i2c_driver mt9v032_driver = { ++ .driver = { ++ .name = "mt9v032", ++ }, ++ .probe = mt9v032_probe, ++ .remove = mt9v032_remove, ++ .id_table = mt9v032_id, ++}; ++ ++static int __init mt9v032_init(void) ++{ ++ return i2c_add_driver(&mt9v032_driver); ++} ++ ++static void __exit mt9v032_exit(void) ++{ ++ i2c_del_driver(&mt9v032_driver); ++} ++ ++module_init(mt9v032_init); ++module_exit(mt9v032_exit); ++ ++MODULE_DESCRIPTION("Aptina MT9V032 Camera driver"); ++MODULE_AUTHOR("Laurent Pinchart "); ++MODULE_LICENSE("GPL"); +diff --git a/include/media/mt9v032.h b/include/media/mt9v032.h +new file mode 100644 +index 0000000..5e27f9b +--- /dev/null ++++ b/include/media/mt9v032.h +@@ -0,0 +1,12 @@ ++#ifndef _MEDIA_MT9V032_H ++#define _MEDIA_MT9V032_H ++ ++struct v4l2_subdev; ++ ++struct mt9v032_platform_data { ++ unsigned int clk_pol:1; ++ ++ void (*set_clock)(struct v4l2_subdev *subdev, unsigned int rate); ++}; ++ ++#endif +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0001-OMAP2-cpufreq-free-up-table-on-exit.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0001-OMAP2-cpufreq-free-up-table-on-exit.patch index 2de60ca2a9..86eafe37e8 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0001-OMAP2-cpufreq-free-up-table-on-exit.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0001-OMAP2-cpufreq-free-up-table-on-exit.patch @@ -1,4 +1,4 @@ -From fc4833337f5386c40eaf41d533fb5fcbd38d6a1d Mon Sep 17 00:00:00 2001 +From 8812fba541092702d6a40ea23ff60bcb504365fd Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Thu, 12 May 2011 07:59:52 -0500 Subject: [PATCH 1/6] OMAP2+: cpufreq: free up table on exit diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0002-OMAP2-cpufreq-handle-invalid-cpufreq-table.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0002-OMAP2-cpufreq-handle-invalid-cpufreq-table.patch index fb7ada2e18..ee27578d04 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0002-OMAP2-cpufreq-handle-invalid-cpufreq-table.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0002-OMAP2-cpufreq-handle-invalid-cpufreq-table.patch @@ -1,4 +1,4 @@ -From bbd8caaeda861dfa69882c34d8556b541f822ae2 Mon Sep 17 00:00:00 2001 +From 1dce7658788943a8085323ef87111cdcdb335d1d Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Thu, 12 May 2011 08:14:41 -0500 Subject: [PATCH 2/6] OMAP2+: cpufreq: handle invalid cpufreq table diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0003-OMAP2-cpufreq-minor-comment-cleanup.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0003-OMAP2-cpufreq-minor-comment-cleanup.patch index 1cf78ebba5..3064d5044d 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0003-OMAP2-cpufreq-minor-comment-cleanup.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0003-OMAP2-cpufreq-minor-comment-cleanup.patch @@ -1,4 +1,4 @@ -From 47eeee58d9321e827e68ea3b914988db6b1635da Mon Sep 17 00:00:00 2001 +From 61c5ce4da03eda42e69cf225fddac9c910506db5 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Thu, 12 May 2011 16:27:45 -0700 Subject: [PATCH 3/6] OMAP2+: cpufreq: minor comment cleanup diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0004-OMAP2-cpufreq-use-clk_init_cpufreq_table-if-OPPs-not.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0004-OMAP2-cpufreq-use-clk_init_cpufreq_table-if-OPPs-not.patch index a7f84df9e4..24a721a011 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0004-OMAP2-cpufreq-use-clk_init_cpufreq_table-if-OPPs-not.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0004-OMAP2-cpufreq-use-clk_init_cpufreq_table-if-OPPs-not.patch @@ -1,4 +1,4 @@ -From d972d3f4eb53c261f8496176b429287b97e297d0 Mon Sep 17 00:00:00 2001 +From 4910bff43db304f58fef625d54e573d554066a78 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Fri, 13 May 2011 05:34:35 -0700 Subject: [PATCH 4/6] OMAP2: cpufreq: use clk_init_cpufreq_table if OPPs not available diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0005-OMAP2-cpufreq-use-cpufreq_frequency_table_target.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0005-OMAP2-cpufreq-use-cpufreq_frequency_table_target.patch index 2bbab2f4f1..f5493b3bf9 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0005-OMAP2-cpufreq-use-cpufreq_frequency_table_target.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0005-OMAP2-cpufreq-use-cpufreq_frequency_table_target.patch @@ -1,4 +1,4 @@ -From dec271e2e15103120df35be942884f577d6a768c Mon Sep 17 00:00:00 2001 +From e8d1f8ed3f2ed7c2e9ee51adfd322868d4195ecf Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Fri, 13 May 2011 05:43:49 -0700 Subject: [PATCH 5/6] OMAP2+: cpufreq: use cpufreq_frequency_table_target diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0006-OMAP2-cpufreq-fix-freq_table-leak.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0006-OMAP2-cpufreq-fix-freq_table-leak.patch index 2595023c68..0727ebcdee 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0006-OMAP2-cpufreq-fix-freq_table-leak.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-fixes/0006-OMAP2-cpufreq-fix-freq_table-leak.patch @@ -1,4 +1,4 @@ -From d7559c9bd5225ad2e57e8c798dc1301396e05ce1 Mon Sep 17 00:00:00 2001 +From 9303bae0e4acf8a8b3b0c682d6655a656fc776bf Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Wed, 18 May 2011 01:48:23 -0500 Subject: [PATCH 6/6] OMAP2+: cpufreq: fix freq_table leak diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-hotplug/0001-cpufreq-helpers-for-walking-the-frequency-table.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-hotplug/0001-cpufreq-helpers-for-walking-the-frequency-table.patch index e8a250b387..03385720a0 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-hotplug/0001-cpufreq-helpers-for-walking-the-frequency-table.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-hotplug/0001-cpufreq-helpers-for-walking-the-frequency-table.patch @@ -1,4 +1,4 @@ -From b581872eacd6342a890b1c6d2596c16fac5875b5 Mon Sep 17 00:00:00 2001 +From 078a7006a32248c98d40ef79bbeb85a0879de734 Mon Sep 17 00:00:00 2001 From: Mike Turquette Date: Tue, 17 May 2011 09:35:54 -0500 Subject: [PATCH 1/2] cpufreq: helpers for walking the frequency table diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-hotplug/0002-cpufreq-introduce-hotplug-governor.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-hotplug/0002-cpufreq-introduce-hotplug-governor.patch index 96154e9beb..70fa625e43 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-hotplug/0002-cpufreq-introduce-hotplug-governor.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq-hotplug/0002-cpufreq-introduce-hotplug-governor.patch @@ -1,4 +1,4 @@ -From 0faab5e374817718add80a132f6fc90943971a61 Mon Sep 17 00:00:00 2001 +From f31dabf5b6158584da56e7186ada6d2a80d5654e Mon Sep 17 00:00:00 2001 From: Mike Turquette Date: Tue, 17 May 2011 09:43:09 -0500 Subject: [PATCH 2/2] cpufreq: introduce hotplug governor diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0001-OMAP-CPUfreq-ensure-driver-initializes-after-cpufreq.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0001-OMAP-CPUfreq-ensure-driver-initializes-after-cpufreq.patch index 823eff30b3..5093df3d26 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0001-OMAP-CPUfreq-ensure-driver-initializes-after-cpufreq.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0001-OMAP-CPUfreq-ensure-driver-initializes-after-cpufreq.patch @@ -1,4 +1,4 @@ -From a2564b1a8a946ddaf64930b48ec279b87bc758ca Mon Sep 17 00:00:00 2001 +From 2a72620933492b6be114a287e7188c47ee1f6844 Mon Sep 17 00:00:00 2001 From: Peter 'p2' De Schrijver Date: Wed, 11 Aug 2010 17:02:43 -0700 Subject: [PATCH 1/8] OMAP: CPUfreq: ensure driver initializes after cpufreq framework and governors diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0002-OMAP-CPUfreq-ensure-policy-is-fully-initialized.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0002-OMAP-CPUfreq-ensure-policy-is-fully-initialized.patch index d8a0de2e0c..5ef85b55b1 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0002-OMAP-CPUfreq-ensure-policy-is-fully-initialized.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0002-OMAP-CPUfreq-ensure-policy-is-fully-initialized.patch @@ -1,4 +1,4 @@ -From cb564063772d73261a8dd24d9285a37e8db49cd4 Mon Sep 17 00:00:00 2001 +From ec7b7d1f27887ec5d76a2d4175e54cedcfa379da Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Wed, 11 Aug 2010 17:05:38 -0700 Subject: [PATCH 2/8] OMAP: CPUfreq: ensure policy is fully initialized diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0003-OMAP3-PM-CPUFreq-driver-for-OMAP3.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0003-OMAP3-PM-CPUFreq-driver-for-OMAP3.patch index 7861cebfff..8593ee4de1 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0003-OMAP3-PM-CPUFreq-driver-for-OMAP3.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0003-OMAP3-PM-CPUFreq-driver-for-OMAP3.patch @@ -1,4 +1,4 @@ -From 6702f624ad5c5e1eba57f9efe889f64333f9e022 Mon Sep 17 00:00:00 2001 +From 5f6e9a6011a5eedc51fc8157fffcae5b7fdf87e7 Mon Sep 17 00:00:00 2001 From: Rajendra Nayak Date: Mon, 10 Nov 2008 17:00:25 +0530 Subject: [PATCH 3/8] OMAP3 PM: CPUFreq driver for OMAP3 diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0004-OMAP-PM-CPUFREQ-Fix-conditional-compilation.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0004-OMAP-PM-CPUFREQ-Fix-conditional-compilation.patch index 062c537adb..aa9cd48515 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0004-OMAP-PM-CPUFREQ-Fix-conditional-compilation.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0004-OMAP-PM-CPUFREQ-Fix-conditional-compilation.patch @@ -1,4 +1,4 @@ -From 71849b3531c66af5f925deb1deb60a3722d62463 Mon Sep 17 00:00:00 2001 +From 1f013ab3b839edb583a276b5591a744dc4308bf8 Mon Sep 17 00:00:00 2001 From: Silesh C V Date: Wed, 29 Sep 2010 14:52:54 +0530 Subject: [PATCH 4/8] OMAP: PM: CPUFREQ: Fix conditional compilation diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0005-cpufreq-fixup-after-new-OPP-layer-merged.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0005-cpufreq-fixup-after-new-OPP-layer-merged.patch index 19432f3a2e..f3432a2c33 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0005-cpufreq-fixup-after-new-OPP-layer-merged.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0005-cpufreq-fixup-after-new-OPP-layer-merged.patch @@ -1,4 +1,4 @@ -From 6d6506387d617a934bc4f8476e8f06a11e21b043 Mon Sep 17 00:00:00 2001 +From 43e22afa61f3624628c8344bcae9e95f0cc8525a Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Tue, 16 Nov 2010 11:48:41 -0800 Subject: [PATCH 5/8] cpufreq: fixup after new OPP layer merged diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0006-OMAP-cpufreq-Split-OMAP1-and-OMAP2PLUS-CPUfreq-drive.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0006-OMAP-cpufreq-Split-OMAP1-and-OMAP2PLUS-CPUfreq-drive.patch index 22e93c0a9d..cf80cb7928 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0006-OMAP-cpufreq-Split-OMAP1-and-OMAP2PLUS-CPUfreq-drive.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0006-OMAP-cpufreq-Split-OMAP1-and-OMAP2PLUS-CPUfreq-drive.patch @@ -1,4 +1,4 @@ -From d93e9bf14c8b5194c0db64ae7daae80c228bfc04 Mon Sep 17 00:00:00 2001 +From 2a3ca1bc3f842bab22873e2d9d002e0a736d0f19 Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Mon, 14 Mar 2011 17:08:48 +0530 Subject: [PATCH 6/8] OMAP: cpufreq: Split OMAP1 and OMAP2PLUS CPUfreq drivers. diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0007-OMAP2PLUS-cpufreq-Add-SMP-support-to-cater-OMAP4430.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0007-OMAP2PLUS-cpufreq-Add-SMP-support-to-cater-OMAP4430.patch index 810873a68a..51c1b3ea20 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0007-OMAP2PLUS-cpufreq-Add-SMP-support-to-cater-OMAP4430.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0007-OMAP2PLUS-cpufreq-Add-SMP-support-to-cater-OMAP4430.patch @@ -1,4 +1,4 @@ -From 1d829a2213997f903aacfffcf184e3705be38026 Mon Sep 17 00:00:00 2001 +From 7e421930c287f42bed624ad65250c16deaeae50f Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Mon, 14 Mar 2011 17:08:49 +0530 Subject: [PATCH 7/8] OMAP2PLUS: cpufreq: Add SMP support to cater OMAP4430 diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0008-OMAP2PLUS-cpufreq-Fix-typo-when-attempting-to-set-mp.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0008-OMAP2PLUS-cpufreq-Fix-typo-when-attempting-to-set-mp.patch index fd0c11ce1d..a2480818b3 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0008-OMAP2PLUS-cpufreq-Fix-typo-when-attempting-to-set-mp.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpufreq/0008-OMAP2PLUS-cpufreq-Fix-typo-when-attempting-to-set-mp.patch @@ -1,4 +1,4 @@ -From a216121073a645a3b9965f06a0813d77b3f467ca Mon Sep 17 00:00:00 2001 +From 92c6a90a264c5803fc239a7304e073cd1517658b Mon Sep 17 00:00:00 2001 From: Jarkko Nikula Date: Thu, 14 Apr 2011 16:21:58 +0300 Subject: [PATCH 8/8] OMAP2PLUS: cpufreq: Fix typo when attempting to set mpu_clk for OMAP4 diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0001-OMAP2-clockdomain-Add-an-api-to-read-idle-mode.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0001-OMAP2-clockdomain-Add-an-api-to-read-idle-mode.patch index d030c51968..76ac4aba18 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0001-OMAP2-clockdomain-Add-an-api-to-read-idle-mode.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0001-OMAP2-clockdomain-Add-an-api-to-read-idle-mode.patch @@ -1,4 +1,4 @@ -From d19005cc07645703a61d4645c343ed586919575d Mon Sep 17 00:00:00 2001 +From ec3154869b4d2fb10e3d455ec8af1e248d9c972b Mon Sep 17 00:00:00 2001 From: Rajendra Nayak Date: Tue, 5 Apr 2011 15:22:31 +0530 Subject: [PATCH 1/6] OMAP2+: clockdomain: Add an api to read idle mode diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0002-OMAP2-clockdomain-Add-SoC-support-for-clkdm_is_idle.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0002-OMAP2-clockdomain-Add-SoC-support-for-clkdm_is_idle.patch index fa79d07418..a0471ef991 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0002-OMAP2-clockdomain-Add-SoC-support-for-clkdm_is_idle.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0002-OMAP2-clockdomain-Add-SoC-support-for-clkdm_is_idle.patch @@ -1,4 +1,4 @@ -From 2863828e636c1766c6d2de85c900f6656f4b6675 Mon Sep 17 00:00:00 2001 +From 85b9e8fe08a8c85096be91cb8eb60d5450dac71d Mon Sep 17 00:00:00 2001 From: Rajendra Nayak Date: Tue, 5 Apr 2011 15:22:36 +0530 Subject: [PATCH 2/6] OMAP2+: clockdomain: Add SoC support for clkdm_is_idle diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0003-OMAP2-PM-Initialise-sleep_switch-to-a-non-valid-valu.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0003-OMAP2-PM-Initialise-sleep_switch-to-a-non-valid-valu.patch index 65a4fcbf6e..99c0b746f4 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0003-OMAP2-PM-Initialise-sleep_switch-to-a-non-valid-valu.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0003-OMAP2-PM-Initialise-sleep_switch-to-a-non-valid-valu.patch @@ -1,4 +1,4 @@ -From dc352655af9c356f5c2db95c88718ed3a996569b Mon Sep 17 00:00:00 2001 +From 6dc3e54ade4c042c6e798fb6f17ff65b9357bc89 Mon Sep 17 00:00:00 2001 From: Rajendra Nayak Date: Tue, 5 Apr 2011 15:22:41 +0530 Subject: [PATCH 3/6] OMAP2+: PM: Initialise sleep_switch to a non-valid value diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0004-OMAP2-PM-idle-clkdms-only-if-already-in-idle.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0004-OMAP2-PM-idle-clkdms-only-if-already-in-idle.patch index 7a94488fde..fe8a4966ee 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0004-OMAP2-PM-idle-clkdms-only-if-already-in-idle.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0004-OMAP2-PM-idle-clkdms-only-if-already-in-idle.patch @@ -1,4 +1,4 @@ -From 59bfd35cfef1c0b9c2c078082a47f957c27fa2fd Mon Sep 17 00:00:00 2001 +From 828597d32fc3926e2c9e6c57adcc50c7eac824de Mon Sep 17 00:00:00 2001 From: Rajendra Nayak Date: Tue, 5 Apr 2011 15:22:48 +0530 Subject: [PATCH 4/6] OMAP2+: PM: idle clkdms only if already in idle diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0005-OMAP2-hwmod-Follow-the-recomended-PRCM-sequence.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0005-OMAP2-hwmod-Follow-the-recomended-PRCM-sequence.patch index 0e9a2ee0f0..aeeda5977f 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0005-OMAP2-hwmod-Follow-the-recomended-PRCM-sequence.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0005-OMAP2-hwmod-Follow-the-recomended-PRCM-sequence.patch @@ -1,4 +1,4 @@ -From 8bde567522cb85c91f49858a9026d3ec24283331 Mon Sep 17 00:00:00 2001 +From 6ecf0ebe9d520748b217a016ef8a0b239805a42c Mon Sep 17 00:00:00 2001 From: Rajendra Nayak Date: Tue, 29 Mar 2011 22:37:43 +0530 Subject: [PATCH 5/6] OMAP2+: hwmod: Follow the recomended PRCM sequence diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0006-OMAP-Serial-Check-wk_st-only-if-present.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0006-OMAP-Serial-Check-wk_st-only-if-present.patch index 8c9025752a..e95c9f8308 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0006-OMAP-Serial-Check-wk_st-only-if-present.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm-wip-cpuidle/0006-OMAP-Serial-Check-wk_st-only-if-present.patch @@ -1,4 +1,4 @@ -From 06ef3c33307622a7c4ab0f7cbfaf0163a1be5a81 Mon Sep 17 00:00:00 2001 +From 0af36cc0dcf5a6654e25eb33509fe0bc44a1dd81 Mon Sep 17 00:00:00 2001 From: Rajendra Nayak Date: Tue, 2 Mar 2010 17:25:30 +0530 Subject: [PATCH 6/6] OMAP: Serial: Check wk_st only if present diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0001-OMAP3-voltage-remove-spurious-pr_notice-for-debugfs.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0001-OMAP3-voltage-remove-spurious-pr_notice-for-debugfs.patch index f1a5bbbc90..f80c07ec39 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0001-OMAP3-voltage-remove-spurious-pr_notice-for-debugfs.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0001-OMAP3-voltage-remove-spurious-pr_notice-for-debugfs.patch @@ -1,4 +1,4 @@ -From 26d1f5966161349845884ae3c8f558d2580f1eb9 Mon Sep 17 00:00:00 2001 +From f505147f6352faaf3d70b00a757279d56e2ef78b Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Sat, 12 Feb 2011 17:27:14 +0530 Subject: [PATCH 01/12] OMAP3+: voltage: remove spurious pr_notice for debugfs diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch index 186c6846aa..dc800647e4 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch @@ -1,4 +1,4 @@ -From f9e0aa8fa5538ddd92e12c5a062e78b0ae5e47e9 Mon Sep 17 00:00:00 2001 +From 79f5f1bb1c1a0f004e41660742a0bf736744ad0e Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Sun, 13 Mar 2011 09:07:23 +0530 Subject: [PATCH 02/12] OMAP4: PM: remove redundant #ifdef CONFIG_PM diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0003-OMAP3-smartreflex-fix-sr_late_init-error-path-in-pro.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0003-OMAP3-smartreflex-fix-sr_late_init-error-path-in-pro.patch index 8e6a11bb39..a17d2bb5a4 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0003-OMAP3-smartreflex-fix-sr_late_init-error-path-in-pro.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0003-OMAP3-smartreflex-fix-sr_late_init-error-path-in-pro.patch @@ -1,4 +1,4 @@ -From c57f8521c772b2a934dc090d68d7ca3b33c99a46 Mon Sep 17 00:00:00 2001 +From b0ed051910c29c99e604ad4eb06d480199fcbd34 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Thu, 24 Mar 2011 18:35:31 +0200 Subject: [PATCH 03/12] OMAP3+: smartreflex: fix sr_late_init() error path in probe diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0004-OMAP3-smartreflex-request-the-memory-region.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0004-OMAP3-smartreflex-request-the-memory-region.patch index 335f092a62..5ca9678ff0 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0004-OMAP3-smartreflex-request-the-memory-region.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0004-OMAP3-smartreflex-request-the-memory-region.patch @@ -1,4 +1,4 @@ -From e09d0dd5be3f582aaf4626b3be0eeba42ca598bd Mon Sep 17 00:00:00 2001 +From d494d209b9b3c1cb13981a9756818f2822379a13 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Thu, 24 Mar 2011 18:35:32 +0200 Subject: [PATCH 04/12] OMAP3+: smartreflex: request the memory region diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0005-OMAP3-smartreflex-fix-ioremap-leak-on-probe-error.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0005-OMAP3-smartreflex-fix-ioremap-leak-on-probe-error.patch index 7783da7c81..a9da969957 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0005-OMAP3-smartreflex-fix-ioremap-leak-on-probe-error.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0005-OMAP3-smartreflex-fix-ioremap-leak-on-probe-error.patch @@ -1,4 +1,4 @@ -From ca7c837b7f6c37c86d0646774a60d82848557411 Mon Sep 17 00:00:00 2001 +From 7553d0119d9f62a809d21993deaac2a745251c3b Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Thu, 24 Mar 2011 18:35:33 +0200 Subject: [PATCH 05/12] OMAP3+: smartreflex: fix ioremap leak on probe error diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0006-OMAP3-smartreflex-delete-instance-from-sr_list-on-pr.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0006-OMAP3-smartreflex-delete-instance-from-sr_list-on-pr.patch index 8c5fe19d79..8f76fc376b 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0006-OMAP3-smartreflex-delete-instance-from-sr_list-on-pr.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0006-OMAP3-smartreflex-delete-instance-from-sr_list-on-pr.patch @@ -1,4 +1,4 @@ -From 11af4217e7e6c2c21d1fe9e5f317a5baabf9a361 Mon Sep 17 00:00:00 2001 +From cdb1237e4829a7912fe4e78e73f20bda9ea22d6d Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Thu, 24 Mar 2011 18:35:34 +0200 Subject: [PATCH 06/12] OMAP3+: smartreflex: delete instance from sr_list on probe error diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0007-OMAP3-smartreflex-delete-debugfs-entries-on-probe-er.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0007-OMAP3-smartreflex-delete-debugfs-entries-on-probe-er.patch index 1f4d43c847..897ddb0dac 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0007-OMAP3-smartreflex-delete-debugfs-entries-on-probe-er.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0007-OMAP3-smartreflex-delete-debugfs-entries-on-probe-er.patch @@ -1,4 +1,4 @@ -From d4ead89805d1146f79a3204467eecb19dcdc442a Mon Sep 17 00:00:00 2001 +From abfa4bd473f227d2d0b42367c5aeaf6e16214a95 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Thu, 24 Mar 2011 18:35:35 +0200 Subject: [PATCH 07/12] OMAP3+: smartreflex: delete debugfs entries on probe error diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0008-OMAP3-cpuidle-remove-useless-SDP-specific-timings.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0008-OMAP3-cpuidle-remove-useless-SDP-specific-timings.patch index 185454e336..72183c44f8 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0008-OMAP3-cpuidle-remove-useless-SDP-specific-timings.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0008-OMAP3-cpuidle-remove-useless-SDP-specific-timings.patch @@ -1,4 +1,4 @@ -From 9f4d8f56ce3268ee3e2efc9489d50d66d361f32d Mon Sep 17 00:00:00 2001 +From f8a6387ba73da6c8fe4281449b85f1825f2403bb Mon Sep 17 00:00:00 2001 From: Jean Pihet Date: Fri, 29 Apr 2011 11:26:22 +0200 Subject: [PATCH 08/12] OMAP3 cpuidle: remove useless SDP specific timings diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0009-OMAP3-SR-make-notify-independent-of-class.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0009-OMAP3-SR-make-notify-independent-of-class.patch index 88a45ba32b..2e5414c76a 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0009-OMAP3-SR-make-notify-independent-of-class.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0009-OMAP3-SR-make-notify-independent-of-class.patch @@ -1,4 +1,4 @@ -From 62629e3664ff1e3c9b34b94b81eafa153671e1ed Mon Sep 17 00:00:00 2001 +From d7992ea7da87a0802fa2b65819bf0e3adc5ba502 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Mon, 14 Feb 2011 12:16:36 +0530 Subject: [PATCH 09/12] OMAP3+: SR: make notify independent of class diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0010-OMAP3-SR-disable-interrupt-by-default.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0010-OMAP3-SR-disable-interrupt-by-default.patch index da171b021a..10ada9159a 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0010-OMAP3-SR-disable-interrupt-by-default.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0010-OMAP3-SR-disable-interrupt-by-default.patch @@ -1,4 +1,4 @@ -From 4aa0f416a44a7053d223f80a8e4be9d0ebdd31ae Mon Sep 17 00:00:00 2001 +From 1f8185e181d5b9c1f47ce5f858dad3bba2be240d Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Mon, 14 Feb 2011 12:41:10 +0530 Subject: [PATCH 10/12] OMAP3+: SR: disable interrupt by default diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0011-OMAP3-SR-enable-disable-SR-only-on-need.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0011-OMAP3-SR-enable-disable-SR-only-on-need.patch index 925beddcf5..99176652dd 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0011-OMAP3-SR-enable-disable-SR-only-on-need.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0011-OMAP3-SR-enable-disable-SR-only-on-need.patch @@ -1,4 +1,4 @@ -From aa44b466398b8b104c07ff1b7209509300fc4f47 Mon Sep 17 00:00:00 2001 +From 488e6ec1262fd56c62b09874fcf8557709f30ef2 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Mon, 14 Feb 2011 21:14:17 +0530 Subject: [PATCH 11/12] OMAP3+: SR: enable/disable SR only on need diff --git a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0012-OMAP3-SR-fix-cosmetic-indentation.patch b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0012-OMAP3-SR-fix-cosmetic-indentation.patch index 7241112e13..e8dddc1c60 100644 --- a/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0012-OMAP3-SR-fix-cosmetic-indentation.patch +++ b/recipes/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0012-OMAP3-SR-fix-cosmetic-indentation.patch @@ -1,4 +1,4 @@ -From 0ea922a6c65ea07b685ec05085dd5d3ec4ac87e2 Mon Sep 17 00:00:00 2001 +From 5e50b744aeca31be1c93790e048fc69c2f77c6c9 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Mon, 14 Feb 2011 12:33:13 +0530 Subject: [PATCH 12/12] OMAP3+: SR: fix cosmetic indentation diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0001-OMAP-DSS2-DSI-fix-use_sys_clk-highfreq.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0001-OMAP-DSS2-DSI-fix-use_sys_clk-highfreq.patch index 3d836a0f91..24700eede9 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0001-OMAP-DSS2-DSI-fix-use_sys_clk-highfreq.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0001-OMAP-DSS2-DSI-fix-use_sys_clk-highfreq.patch @@ -1,7 +1,7 @@ -From 6c106e173b2b0be58ba68e800d0e1bdd731174c4 Mon Sep 17 00:00:00 2001 +From 19d9727973e7b0c5f8983a1a5ae3b0a02e062bab Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 7 Apr 2011 15:28:47 +0300 -Subject: [PATCH 01/30] OMAP: DSS2: DSI: fix use_sys_clk & highfreq +Subject: [PATCH 01/31] OMAP: DSS2: DSI: fix use_sys_clk & highfreq use_sys_clk and highfreq fields in dsi.current_cinfo were never set. Luckily they weren't used anywhere so it didn't cause any problems. diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0002-OMAP-DSS2-DSI-fix-dsi_dump_clocks.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0002-OMAP-DSS2-DSI-fix-dsi_dump_clocks.patch index e32b8e9bcd..7ab7f4d778 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0002-OMAP-DSS2-DSI-fix-dsi_dump_clocks.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0002-OMAP-DSS2-DSI-fix-dsi_dump_clocks.patch @@ -1,7 +1,7 @@ -From c440fa0e7472cbe20b783de7ed14ffa8a9f3290f Mon Sep 17 00:00:00 2001 +From 2bc828d1b81d857238dc8b1f29e38e466469e352 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Mon, 4 Apr 2011 10:02:53 +0300 -Subject: [PATCH 02/30] OMAP: DSS2: DSI: fix dsi_dump_clocks() +Subject: [PATCH 02/31] OMAP: DSS2: DSI: fix dsi_dump_clocks() On OMAP4, reading DSI_PLL_CONFIGURATION2 register requires the L3 clock (CIO_CLK_ICG) to PLL. Currently dsi_dump_clocks() tries to read that diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0003-OMAP2PLUS-DSS2-Fix-Return-correct-lcd-clock-source-f.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0003-OMAP2PLUS-DSS2-Fix-Return-correct-lcd-clock-source-f.patch index 93beabbd7c..0bef2d2f66 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0003-OMAP2PLUS-DSS2-Fix-Return-correct-lcd-clock-source-f.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0003-OMAP2PLUS-DSS2-Fix-Return-correct-lcd-clock-source-f.patch @@ -1,7 +1,7 @@ -From d6e2082fe2d1abd4bb8d1492d28f5f76f09e6121 Mon Sep 17 00:00:00 2001 +From 29d6de29d3d0d2ac9fe0572cd4e0485757eca550 Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Thu, 31 Mar 2011 13:23:35 +0530 -Subject: [PATCH 03/30] OMAP2PLUS: DSS2: Fix: Return correct lcd clock source for OMAP2/3 +Subject: [PATCH 03/31] OMAP2PLUS: DSS2: Fix: Return correct lcd clock source for OMAP2/3 dss.lcd_clk_source is set to the default value DSS_CLK_SRC_FCK at dss_init. For OMAP2 and OMAP3, the dss.lcd_clk_source should always be the same as diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0004-OMAP-DSS-DSI-Fix-DSI-PLL-power-bug.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0004-OMAP-DSS-DSI-Fix-DSI-PLL-power-bug.patch index fcf8f8972a..f204b87e42 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0004-OMAP-DSS-DSI-Fix-DSI-PLL-power-bug.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0004-OMAP-DSS-DSI-Fix-DSI-PLL-power-bug.patch @@ -1,7 +1,7 @@ -From 513d8f83be6a3e9a4b7f1ef23656ac84b109d7a8 Mon Sep 17 00:00:00 2001 +From e7665ffb72cbc890b8494c687b335e3e242231d9 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Fri, 15 Apr 2011 10:42:59 +0300 -Subject: [PATCH 04/30] OMAP: DSS: DSI: Fix DSI PLL power bug +Subject: [PATCH 04/31] OMAP: DSS: DSI: Fix DSI PLL power bug OMAP3630 has a HW bug causing DSI PLL power command POWER_ON_DIV (0x3) to not work properly. The bug prevents us from enabling DSI PLL power diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0005-OMAP-DSS2-fix-panel-Kconfig-dependencies.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0005-OMAP-DSS2-fix-panel-Kconfig-dependencies.patch index be520fd15c..8d4b175bcc 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0005-OMAP-DSS2-fix-panel-Kconfig-dependencies.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0005-OMAP-DSS2-fix-panel-Kconfig-dependencies.patch @@ -1,7 +1,7 @@ -From e9b70efca1b15f5e743cccacb925156ca99878a7 Mon Sep 17 00:00:00 2001 +From c84fbf480062086f93f99c27817e4d2d91593511 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Fri, 8 Apr 2011 09:30:27 +0300 -Subject: [PATCH 05/30] OMAP: DSS2: fix panel Kconfig dependencies +Subject: [PATCH 05/31] OMAP: DSS2: fix panel Kconfig dependencies All DPI panels were missing dependency to OMAP2_DSS_DPI. Add the dependency. diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0006-OMAP-DSS2-add-bootarg-for-selecting-svideo-or-compos.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0006-OMAP-DSS2-add-bootarg-for-selecting-svideo-or-compos.patch index eeb41a2561..e7751c58dc 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0006-OMAP-DSS2-add-bootarg-for-selecting-svideo-or-compos.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0006-OMAP-DSS2-add-bootarg-for-selecting-svideo-or-compos.patch @@ -1,7 +1,7 @@ -From bf7e98aa062cf6a78e7f68089609f5693d5ca72b Mon Sep 17 00:00:00 2001 +From 756700075d8ebd5979f3ea2d20f44356c417dfe4 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Tue, 19 Jan 2010 21:19:15 -0800 -Subject: [PATCH 06/30] OMAP: DSS2: add bootarg for selecting svideo or composite for tv output +Subject: [PATCH 06/31] OMAP: DSS2: add bootarg for selecting svideo or composite for tv output also add pal-16 and ntsc-16 omapfb.mode settings for 16bpp --- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0007-video-add-timings-for-hd720.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0007-video-add-timings-for-hd720.patch index c9ecaddf40..3cd3ff98fc 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0007-video-add-timings-for-hd720.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0007-video-add-timings-for-hd720.patch @@ -1,7 +1,7 @@ -From bb5ff1aa2cf586b544d17b9afa00a347eeeb7012 Mon Sep 17 00:00:00 2001 +From bbfdb465c2970b1cd18fd0ae5adf99e61cfd530e Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Sat, 19 Dec 2009 06:52:43 -0800 -Subject: [PATCH 07/30] video: add timings for hd720 +Subject: [PATCH 07/31] video: add timings for hd720 --- drivers/video/modedb.c | 4 ++++ diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0008-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0008-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch index 2baf826c74..b798199c7d 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0008-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0008-drivers-net-smsc911x-return-ENODEV-if-device-is-not-.patch @@ -1,7 +1,7 @@ -From b01ef0758c3ab86173b13d2da2d6850f520dfe80 Mon Sep 17 00:00:00 2001 +From 45b1b2aefac18adf9246b56f82355597b26e997b Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Tue, 15 Dec 2009 15:17:44 -0800 -Subject: [PATCH 08/30] drivers: net: smsc911x: return ENODEV if device is not found +Subject: [PATCH 08/31] drivers: net: smsc911x: return ENODEV if device is not found Signed-off-by: Steve Sakoman --- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0009-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0009-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch index fab3b1829c..80b09dd535 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0009-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0009-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch @@ -1,7 +1,7 @@ -From 5a26a8992c0baa8ff0944f0e09b1aee4dd5e3450 Mon Sep 17 00:00:00 2001 +From fda068cf87fc12f12aeaea2e428d78afac43c19b Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Tue, 15 Dec 2009 15:24:10 -0800 -Subject: [PATCH 09/30] drivers: input: touchscreen: ads7846: return ENODEV if device is not found +Subject: [PATCH 09/31] drivers: input: touchscreen: ads7846: return ENODEV if device is not found Signed-off-by: Steve Sakoman --- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0010-Revert-omap2_mcspi-Flush-posted-writes.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0010-Revert-omap2_mcspi-Flush-posted-writes.patch index 876b47aa25..ef74568fa4 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0010-Revert-omap2_mcspi-Flush-posted-writes.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0010-Revert-omap2_mcspi-Flush-posted-writes.patch @@ -1,7 +1,7 @@ -From 03ae041e2cee01b98b8c6d46a94a2b9025f74e14 Mon Sep 17 00:00:00 2001 +From 44940d48b3d535072e6a4d225173c3115bacc75b Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Thu, 3 Mar 2011 13:29:30 -0800 -Subject: [PATCH 10/30] Revert "omap2_mcspi: Flush posted writes" +Subject: [PATCH 10/31] Revert "omap2_mcspi: Flush posted writes" This reverts commit a330ce2001b290c59fe98c37e981683ef0a75fdf. --- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0011-Revert-omap_hsmmc-improve-interrupt-synchronisation.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0011-Revert-omap_hsmmc-improve-interrupt-synchronisation.patch index 78f6911683..0f39a8a7e0 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0011-Revert-omap_hsmmc-improve-interrupt-synchronisation.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0011-Revert-omap_hsmmc-improve-interrupt-synchronisation.patch @@ -1,7 +1,7 @@ -From 94b2b9670eb5e0af73bd98a991bee9856fe0e654 Mon Sep 17 00:00:00 2001 +From b4a56c6ec6df1af55b75608ff7c7cbf91660eb91 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Fri, 19 Nov 2010 15:11:19 -0800 -Subject: [PATCH 11/30] Revert "omap_hsmmc: improve interrupt synchronisation" +Subject: [PATCH 11/31] Revert "omap_hsmmc: improve interrupt synchronisation" This reverts commit b417577d3b9bbb06a4ddc9aa955af9bd503f7242. diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0012-Don-t-turn-SDIO-cards-off-to-save-power.-Doing-so-wi.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0012-Don-t-turn-SDIO-cards-off-to-save-power.-Doing-so-wi.patch index 3d51fca757..4c06145525 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0012-Don-t-turn-SDIO-cards-off-to-save-power.-Doing-so-wi.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0012-Don-t-turn-SDIO-cards-off-to-save-power.-Doing-so-wi.patch @@ -1,7 +1,7 @@ -From 0efaa4ad5c5040db8cfa729145ed64c5ff878e9e Mon Sep 17 00:00:00 2001 +From 796b0fc090132a5ea3849bd3177cb88c64ad2160 Mon Sep 17 00:00:00 2001 From: David Vrabel Date: Fri, 2 Apr 2010 08:41:47 -0700 -Subject: [PATCH 12/30] Don't turn SDIO cards off to save power. Doing so will lose all internal state in the card. +Subject: [PATCH 12/31] Don't turn SDIO cards off to save power. Doing so will lose all internal state in the card. Signed-off-by: David Vrabel --- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0013-Enable-the-use-of-SDIO-card-interrupts.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0013-Enable-the-use-of-SDIO-card-interrupts.patch index 6756886e9d..29f5e17227 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0013-Enable-the-use-of-SDIO-card-interrupts.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0013-Enable-the-use-of-SDIO-card-interrupts.patch @@ -1,7 +1,7 @@ -From 008e668e53c5d230910d1b97deaff99ec2259e71 Mon Sep 17 00:00:00 2001 +From 9231d1d9fac779c95809dedf95fde64738b4186f Mon Sep 17 00:00:00 2001 From: David Vrabel Date: Fri, 2 Apr 2010 08:42:22 -0700 -Subject: [PATCH 13/30] Enable the use of SDIO card interrupts. +Subject: [PATCH 13/31] Enable the use of SDIO card interrupts. FCLK must be enabled while SDIO interrupts are enabled or the MMC module won't wake-up (even though ENAWAKEUP in SYSCONFIG and IWE in diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0014-soc-codecs-Enable-audio-capture-by-default-for-twl40.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0014-soc-codecs-Enable-audio-capture-by-default-for-twl40.patch index 8d95f94d67..962e664b80 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0014-soc-codecs-Enable-audio-capture-by-default-for-twl40.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0014-soc-codecs-Enable-audio-capture-by-default-for-twl40.patch @@ -1,7 +1,7 @@ -From 39a7aa6274c0d63acadc95a242f1a2ad47c1c680 Mon Sep 17 00:00:00 2001 +From e94f62ff96d19547c5a0d9e99691f19fe91c451a Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Thu, 17 Dec 2009 12:45:20 -0800 -Subject: [PATCH 14/30] soc: codecs: Enable audio capture by default for twl4030 +Subject: [PATCH 14/31] soc: codecs: Enable audio capture by default for twl4030 --- sound/soc/codecs/twl4030.c | 4 ++-- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0015-soc-codecs-twl4030-Turn-on-mic-bias-by-default.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0015-soc-codecs-twl4030-Turn-on-mic-bias-by-default.patch index 5979d07480..60bf6e2efa 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0015-soc-codecs-twl4030-Turn-on-mic-bias-by-default.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0015-soc-codecs-twl4030-Turn-on-mic-bias-by-default.patch @@ -1,7 +1,7 @@ -From add8f3f1d3592c2976124062f70b88dd3e3f7673 Mon Sep 17 00:00:00 2001 +From fadce249fe7562795ce9f8fc92f8aa7a586725dc Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Wed, 29 Dec 2010 11:39:16 -0800 -Subject: [PATCH 15/30] soc: codecs: twl4030: Turn on mic bias by default +Subject: [PATCH 15/31] soc: codecs: twl4030: Turn on mic bias by default --- sound/soc/codecs/twl4030.c | 2 +- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0016-RTC-add-support-for-backup-battery-recharge.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0016-RTC-add-support-for-backup-battery-recharge.patch index 11f6d4c5ab..23447476d2 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0016-RTC-add-support-for-backup-battery-recharge.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0016-RTC-add-support-for-backup-battery-recharge.patch @@ -1,7 +1,7 @@ -From 859eda7a9b4ff6240006b65679a3e04ecd7c474a Mon Sep 17 00:00:00 2001 +From a49740bb7066dbbf1b7f6bda73cdc45169202ebf Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Thu, 4 Feb 2010 12:26:22 -0800 -Subject: [PATCH 16/30] RTC: add support for backup battery recharge +Subject: [PATCH 16/31] RTC: add support for backup battery recharge --- drivers/rtc/rtc-twl.c | 25 +++++++++++++++++++++++++ diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0017-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0017-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch index ead233db11..a95b313259 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0017-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0017-ARM-OMAP2-mmc-twl4030-move-clock-input-selection-pri.patch @@ -1,7 +1,7 @@ -From 31482a8ae0ca57e0e530564e589b16bfb2bbb93c Mon Sep 17 00:00:00 2001 +From e4e17b2fa3aa84e14303d2270a49f1ac9bf25b5c Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Sun, 24 Jan 2010 09:33:56 -0800 -Subject: [PATCH 17/30] ARM: OMAP2: mmc-twl4030: move clock input selection prior to vcc test +Subject: [PATCH 17/31] ARM: OMAP2: mmc-twl4030: move clock input selection prior to vcc test otherwise it is not executed on systems that use non-twl regulators --- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0018-Add-power-off-support-for-the-TWL4030-companion.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0018-Add-power-off-support-for-the-TWL4030-companion.patch index 77cf64f049..0083bde1f2 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0018-Add-power-off-support-for-the-TWL4030-companion.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0018-Add-power-off-support-for-the-TWL4030-companion.patch @@ -1,7 +1,7 @@ -From 41b834aed6b2902683102eacff56428158792187 Mon Sep 17 00:00:00 2001 +From 80c2126f5bf63ea2d033310e030cac5229865a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20W=C3=B6rndl-Aichriedler?= Date: Sat, 15 May 2010 16:34:05 +0200 -Subject: [PATCH 18/30] Add power-off support for the TWL4030 companion +Subject: [PATCH 18/31] Add power-off support for the TWL4030 companion This patch adds support for the power-off on shutdown feature of the TWL4030 --- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0019-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0019-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch index 5c4c6570f8..6643475947 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0019-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0019-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch @@ -1,7 +1,7 @@ -From 98ee7c7f078aa79db223967040598a49c46931fe Mon Sep 17 00:00:00 2001 +From d4f736154c4a873a12408d0d094e2152a4c4dc96 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Thu, 17 Dec 2009 14:27:15 -0800 -Subject: [PATCH 19/30] ARM: OMAP: Add twl4030 madc support to Overo +Subject: [PATCH 19/31] ARM: OMAP: Add twl4030 madc support to Overo Signed-off-by: Steve Sakoman --- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0020-Enabling-Hwmon-driver-for-twl4030-madc.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0020-Enabling-Hwmon-driver-for-twl4030-madc.patch index afd2a999d4..7532150366 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0020-Enabling-Hwmon-driver-for-twl4030-madc.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0020-Enabling-Hwmon-driver-for-twl4030-madc.patch @@ -1,7 +1,7 @@ -From 2efc7dd29df90a4e248c080797b1511db0399d67 Mon Sep 17 00:00:00 2001 +From 4f5e04f8fcc6e6835aad7dde949c1cb82b5eaa45 Mon Sep 17 00:00:00 2001 From: Keerthy Date: Wed, 4 May 2011 01:14:50 +0530 -Subject: [PATCH 20/30] Enabling Hwmon driver for twl4030-madc +Subject: [PATCH 20/31] Enabling Hwmon driver for twl4030-madc Signed-off-by: Keerthy --- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0021-mfd-twl-core-enable-madc-clock.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0021-mfd-twl-core-enable-madc-clock.patch index 805a35ef9c..65c2630802 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0021-mfd-twl-core-enable-madc-clock.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0021-mfd-twl-core-enable-madc-clock.patch @@ -1,7 +1,7 @@ -From 31b6b44adffe954ece851daff092f628a951712e Mon Sep 17 00:00:00 2001 +From faa15ccdcc5690ba83d4d09049222df35f40719d Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Sat, 23 Jan 2010 06:26:54 -0800 -Subject: [PATCH 21/30] mfd: twl-core: enable madc clock +Subject: [PATCH 21/31] mfd: twl-core: enable madc clock Now that the madc driver has been merged it is also necessary to enable the clock to the madc block diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0022-rtc-twl-Switch-to-using-threaded-irq.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0022-rtc-twl-Switch-to-using-threaded-irq.patch index 809f3ed1e0..780012a13b 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0022-rtc-twl-Switch-to-using-threaded-irq.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0022-rtc-twl-Switch-to-using-threaded-irq.patch @@ -1,7 +1,7 @@ -From e0dc7f9a7d63c8cd5e4183cf5626ec11e272e3e0 Mon Sep 17 00:00:00 2001 +From b94621613e7ece11e6408efe33ceb724892645d1 Mon Sep 17 00:00:00 2001 From: Ilkka Koskinen Date: Wed, 16 Mar 2011 16:07:14 +0000 -Subject: [PATCH 22/30] rtc-twl: Switch to using threaded irq +Subject: [PATCH 22/31] rtc-twl: Switch to using threaded irq --- drivers/rtc/rtc-twl.c | 2 +- diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0023-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0023-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch index 4afc7e1744..bb9408a842 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0023-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0023-ARM-OMAP-automatically-set-musb-mode-in-platform-dat.patch @@ -1,7 +1,7 @@ -From 80ac44d7f93ac3b8db9921feed4080c8dc572c0f Mon Sep 17 00:00:00 2001 +From 9a400cd7d8af58a7ba9dadaf6208c3f6ec9bb8a5 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Wed, 24 Feb 2010 10:37:22 -0800 -Subject: [PATCH 23/30] ARM: OMAP: automatically set musb mode in platform data based on CONFIG options +Subject: [PATCH 23/31] ARM: OMAP: automatically set musb mode in platform data based on CONFIG options --- arch/arm/mach-omap2/board-omap3beagle.c | 6 ++++++ diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0024-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0024-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch index 9aac69d070..ce27c93840 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0024-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0024-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch @@ -1,7 +1,7 @@ -From 3b7393eb41684f3f44e8c15bbba4ab0e830f8810 Mon Sep 17 00:00:00 2001 +From 26a79f408bd41ad7b4a47f2683909d3fc1575eab Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Wed, 12 Jan 2011 05:54:55 -0800 -Subject: [PATCH 24/30] omap: mmc: Adjust dto to eliminate timeout errors +Subject: [PATCH 24/31] omap: mmc: Adjust dto to eliminate timeout errors A number of SD card types were experiencing timeout errors. This could also lead to data corruption in some cases. diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0025-omap-Fix-mtd-subpage-read-alignment.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0025-omap-Fix-mtd-subpage-read-alignment.patch index b0828c2eb3..f16ee2f152 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0025-omap-Fix-mtd-subpage-read-alignment.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0025-omap-Fix-mtd-subpage-read-alignment.patch @@ -1,7 +1,7 @@ -From 5c688ec6e6f046d2c8b3821964971149b0c30fc7 Mon Sep 17 00:00:00 2001 +From a13b58ba9d6e0aa0fe0d2dc5b51de545cea2ee9e Mon Sep 17 00:00:00 2001 From: Charles Manning Date: Tue, 18 Jan 2011 11:25:25 +1300 -Subject: [PATCH 25/30] omap: Fix mtd subpage read alignment +Subject: [PATCH 25/31] omap: Fix mtd subpage read alignment This allows the omap2 prefetch engine to work properly for subpage reads. Without this ECC errors will stop UBIFS from working. diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0026-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0026-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch index b9b235a00f..4a424c9b8a 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0026-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0026-mtd-nand-omap2-Force-all-buffer-reads-to-u32-alignme.patch @@ -1,7 +1,7 @@ -From 3592c2e24b0af79aa2fb181a9825d5b72e2f68dd Mon Sep 17 00:00:00 2001 +From e0756b50ed72ebe28c768c9e17ee7811cc3cc53c Mon Sep 17 00:00:00 2001 From: Charles Manning Date: Thu, 16 Dec 2010 20:35:56 -0800 -Subject: [PATCH 26/30] mtd: nand: omap2: Force all buffer reads to u32 alignment +Subject: [PATCH 26/31] mtd: nand: omap2: Force all buffer reads to u32 alignment --- drivers/mtd/nand/omap2.c | 12 ++++++++++++ diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0027-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0027-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch index bd283faf0f..2427df5f72 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0027-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0027-omap-nand-fix-subpage-ecc-issue-with-prefetch.patch @@ -1,7 +1,7 @@ -From 22a6c2c3d2dafd4084945472fbeed2a94893ddb4 Mon Sep 17 00:00:00 2001 +From 263890438c545107c50be16e628926531949c1fa Mon Sep 17 00:00:00 2001 From: kishore kadiyala Date: Mon, 2 May 2011 11:10:38 +0000 -Subject: [PATCH 27/30] omap : nand : fix subpage ecc issue with prefetch +Subject: [PATCH 27/31] omap : nand : fix subpage ecc issue with prefetch For prefetch engine, read and write got broken in commit '2c01946c'. We never hit a scenario of not getting 'gpmc_prefetch_enable' diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0028-OMAP-Overo-Add-support-for-spidev.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0028-OMAP-Overo-Add-support-for-spidev.patch index 80b44aeb1e..bdbe1feaaa 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0028-OMAP-Overo-Add-support-for-spidev.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0028-OMAP-Overo-Add-support-for-spidev.patch @@ -1,7 +1,7 @@ -From 7c2667ccc5741129830c0188b50c347e3cc4edd5 Mon Sep 17 00:00:00 2001 +From d83a600cbe0cfca8c8fd9f5566dd45166cc9e142 Mon Sep 17 00:00:00 2001 From: Scott Ellis Date: Sun, 23 Jan 2011 20:39:35 -0800 -Subject: [PATCH 28/30] OMAP: Overo: Add support for spidev +Subject: [PATCH 28/31] OMAP: Overo: Add support for spidev --- arch/arm/mach-omap2/board-overo.c | 16 ++++++++++++++++ diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0029-unionfs-Add-support-for-unionfs-2.5.9.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0029-unionfs-Add-support-for-unionfs-2.5.9.patch index 30fba1bc1d..236865dbec 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0029-unionfs-Add-support-for-unionfs-2.5.9.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0029-unionfs-Add-support-for-unionfs-2.5.9.patch @@ -1,7 +1,7 @@ -From e6b1af4def888530e5dfeaaf4338f248e9d0f677 Mon Sep 17 00:00:00 2001 +From 083250cd6541b75535707c1d416cfa3a45ad19a9 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Mon, 2 May 2011 16:14:34 -0700 -Subject: [PATCH 29/30] unionfs: Add support for unionfs 2.5.9 +Subject: [PATCH 29/31] unionfs: Add support for unionfs 2.5.9 --- Documentation/filesystems/00-INDEX | 2 + diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0030-omap-Change-omap_device-activate-latency-messages-fr.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0030-omap-Change-omap_device-activate-latency-messages-fr.patch index 67112a31ab..30010faa0c 100644 --- a/recipes/linux/linux-omap-2.6.39/sakoman/0030-omap-Change-omap_device-activate-latency-messages-fr.patch +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0030-omap-Change-omap_device-activate-latency-messages-fr.patch @@ -1,7 +1,7 @@ -From 9f9d70c4d1caf249ab36c656c5e89db91d7c981b Mon Sep 17 00:00:00 2001 +From ab3ce8260342b568029c051c5e526526696a27f6 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Mon, 23 May 2011 12:16:50 -0700 -Subject: [PATCH 30/30] omap: Change omap_device activate latency messages from pr_warning to pr_debug +Subject: [PATCH 30/31] omap: Change omap_device activate latency messages from pr_warning to pr_debug Messages can be safely ignored, so reduce console noise diff --git a/recipes/linux/linux-omap-2.6.39/sakoman/0031-omap-overo-Add-opp-init.patch b/recipes/linux/linux-omap-2.6.39/sakoman/0031-omap-overo-Add-opp-init.patch new file mode 100644 index 0000000000..c50db1b33f --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/sakoman/0031-omap-overo-Add-opp-init.patch @@ -0,0 +1,105 @@ +From c79191ab97d2b006c59c7dce4bfcdce48d66ec03 Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Tue, 24 May 2011 20:36:07 -0700 +Subject: [PATCH 31/31] omap: overo: Add opp init + +omap: overo: Add opp init + +Work in progress + +Signed-off-by: Steve Sakoman +--- + arch/arm/mach-omap2/board-overo.c | 49 +++++++++++++++++++++++++++++++++++++ + 1 files changed, 49 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c +index 05dd3eb..8c2d21f 100644 +--- a/arch/arm/mach-omap2/board-overo.c ++++ b/arch/arm/mach-omap2/board-overo.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -43,6 +44,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -54,6 +56,7 @@ + #include + + #include "mux.h" ++#include "pm.h" + #include "sdram-micron-mt46h32m32lf-6.h" + #include "hsmmc.h" + +@@ -755,6 +758,51 @@ static struct omap_musb_board_data musb_board_data = { + .power = 100, + }; + ++static void __init overo_opp_init(void) ++{ ++ int r = 0; ++ ++ /* Initialize the omap3 opp table */ ++ if (omap3_opp_init()) { ++ pr_err("%s: opp default init failed\n", __func__); ++ return; ++ } ++ ++ /* Custom OPP enabled for 36/3730 */ ++ if (cpu_is_omap3630()) { ++ struct omap_hwmod *mh = omap_hwmod_lookup("mpu"); ++ struct omap_hwmod *dh = omap_hwmod_lookup("iva"); ++ struct device *dev; ++ ++ if (!mh || !dh) { ++ pr_err("%s: Aiee.. no mpu/dsp devices? %p %p\n", ++ __func__, mh, dh); ++ return; ++ } ++ /* Enable MPU 1GHz and lower opps */ ++ dev = &mh->od->pdev.dev; ++ r = opp_enable(dev, 1000000000); ++ ++ /* Enable IVA 800MHz and lower opps */ ++ dev = &dh->od->pdev.dev; ++ r |= opp_enable(dev, 800000000); ++ ++ if (r) { ++ pr_err("%s: failed to enable higher opp %d\n", ++ __func__, r); ++ /* ++ * Cleanup - disable the higher freqs - we dont care ++ * about the results ++ */ ++ dev = &mh->od->pdev.dev; ++ opp_disable(dev, 1000000000); ++ dev = &dh->od->pdev.dev; ++ opp_disable(dev, 800000000); ++ } ++ } ++ return; ++} ++ + static void __init overo_init(void) + { + omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); +@@ -770,6 +818,7 @@ static void __init overo_init(void) + overo_display_init(); + overo_init_led(); + overo_init_keys(); ++ overo_opp_init(); + + /* Ensure SDRC pins are mux'd for self-refresh */ + omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT); +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap_2.6.39.bb b/recipes/linux/linux-omap_2.6.39.bb index db11bf9111..25ad5b23fc 100644 --- a/recipes/linux/linux-omap_2.6.39.bb +++ b/recipes/linux/linux-omap_2.6.39.bb @@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "(beagleboard)" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc SRCREV_pn-${PN} = "v2.6.39" -MACHINE_KERNEL_PR_append = "d" +MACHINE_KERNEL_PR_append = "e" FILESPATHPKG_prepend = "linux-omap-2.6.39:" @@ -45,6 +45,7 @@ SRC_URI_append = " \ file://sakoman/0028-OMAP-Overo-Add-support-for-spidev.patch \ file://sakoman/0029-unionfs-Add-support-for-unionfs-2.5.9.patch \ file://sakoman/0030-omap-Change-omap_device-activate-latency-messages-fr.patch \ + file://sakoman/0031-omap-overo-Add-opp-init.patch \ \ file://beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch \ file://beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch \ @@ -52,7 +53,10 @@ SRC_URI_append = " \ file://beagle/0004-OMAP3-beagle-add-regulators-for-camera-interface.patch \ file://beagle/0005-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch \ \ - file://camera/0001-Add-mt9p031-sensor-support.patch \ + file://camera/0001-Add-mt9p031-sensor-driver.patch \ + file://camera/0002-OMAP3BEAGLE-Add-support-for-mt9p031-sensor-driver.patch \ + file://camera/0003-OMAP3-beagle-only-init-camera-on-3630.patch \ + file://camera/0004-v4l-Add-mt9v032-sensor-driver.patch \ \ file://pm/linux-omap-2.6.39-ti-pm/0001-OMAP3-voltage-remove-spurious-pr_notice-for-debugfs.patch \ file://pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch \ From a1cc9f6a437494646f8af9e1de9fe885d0f73aac Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 31 May 2011 20:19:52 +0200 Subject: [PATCH 355/509] linux-omap 2.6.39: sync with meta-texasinstruments for bootup fixes Signed-off-by: Koen Kooi --- .../linux-omap-2.6.39/beagleboard/defconfig | 6 +- .../0001-Add-mt9p031-sensor-driver.patch | 918 ------------------ ...ort-for-mt9p031-Aptina-Micron-sensor.patch | 773 +++++++++++++++ ...dd-support-for-mt9p031-sensor-driver.patch | 142 --- ... 0002-v4l-Add-mt9v032-sensor-driver.patch} | 4 +- ...mt9p031-LI-5M03-module-in-Beagleboar.patch | 158 +++ ...MAP3-beagle-only-init-camera-on-3630.patch | 34 - recipes/linux/linux-omap_2.6.39.bb | 9 +- 8 files changed, 940 insertions(+), 1104 deletions(-) delete mode 100644 recipes/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-driver.patch create mode 100644 recipes/linux/linux-omap-2.6.39/camera/0001-Add-support-for-mt9p031-Aptina-Micron-sensor.patch delete mode 100644 recipes/linux/linux-omap-2.6.39/camera/0002-OMAP3BEAGLE-Add-support-for-mt9p031-sensor-driver.patch rename recipes/linux/linux-omap-2.6.39/camera/{0004-v4l-Add-mt9v032-sensor-driver.patch => 0002-v4l-Add-mt9v032-sensor-driver.patch} (99%) create mode 100644 recipes/linux/linux-omap-2.6.39/camera/0003-Add-support-for-mt9p031-LI-5M03-module-in-Beagleboar.patch delete mode 100644 recipes/linux/linux-omap-2.6.39/camera/0003-OMAP3-beagle-only-init-camera-on-3630.patch diff --git a/recipes/linux/linux-omap-2.6.39/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.39/beagleboard/defconfig index c2c9e55ae7..21d9f85587 100644 --- a/recipes/linux/linux-omap-2.6.39/beagleboard/defconfig +++ b/recipes/linux/linux-omap-2.6.39/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/arm 2.6.39 Kernel Configuration -# Thu May 26 10:49:51 2011 +# Mon May 30 11:05:51 2011 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -465,8 +465,8 @@ CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_STAT_DETAILS=y # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_HOTPLUG is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y diff --git a/recipes/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-driver.patch b/recipes/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-driver.patch deleted file mode 100644 index 9746415fdc..0000000000 --- a/recipes/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-driver.patch +++ /dev/null @@ -1,918 +0,0 @@ -From 327e65fc0d86911bda7c1f37fb5c3534d1b2c849 Mon Sep 17 00:00:00 2001 -From: Javier Martin -Date: Thu, 26 May 2011 07:20:53 +0000 -Subject: [PATCH 1/4] Add mt9p031 sensor driver. - -This patch applies on 2.6.39 (commit 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf). -It has some power management issue which causes horizontal random lines on -the image. If we do not disable 1v8 regulator, the problem disappears. -I would like to get some help on fixing whatever the problem with power -management is. - -Signed-off-by: Javier Martin ---- - drivers/media/video/Kconfig | 7 + - drivers/media/video/Makefile | 1 + - drivers/media/video/mt9p031.c | 841 +++++++++++++++++++++++++++++++++++++++++ - include/media/mt9p031.h | 11 + - 4 files changed, 860 insertions(+), 0 deletions(-) - create mode 100644 drivers/media/video/mt9p031.c - create mode 100644 include/media/mt9p031.h - -diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig -index 00f51dd..cb87e35 100644 ---- a/drivers/media/video/Kconfig -+++ b/drivers/media/video/Kconfig -@@ -329,6 +329,13 @@ config VIDEO_OV7670 - OV7670 VGA camera. It currently only works with the M88ALP01 - controller. - -+config VIDEO_MT9P031 -+ tristate "Aptina MT9P031 support" -+ depends on I2C && VIDEO_V4L2 -+ ---help--- -+ This is a Video4Linux2 sensor-level driver for the Aptina -+ (Micron) mt9p031 5 Mpixel camera. -+ - config VIDEO_MT9V011 - tristate "Micron mt9v011 sensor support" - depends on I2C && VIDEO_V4L2 -diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile -index ace5d8b..912b29b 100644 ---- a/drivers/media/video/Makefile -+++ b/drivers/media/video/Makefile -@@ -65,6 +65,7 @@ obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o - obj-$(CONFIG_VIDEO_OV7670) += ov7670.o - obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o - obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o -+obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o - obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o - obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o - obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o -diff --git a/drivers/media/video/mt9p031.c b/drivers/media/video/mt9p031.c -new file mode 100644 -index 0000000..242bea9 ---- /dev/null -+++ b/drivers/media/video/mt9p031.c -@@ -0,0 +1,841 @@ -+/* -+ * Driver for MT9P031 CMOS Image Sensor from Aptina -+ * -+ * Copyright (C) 2011, Javier Martin -+ * -+ * Copyright (C) 2011, Guennadi Liakhovetski -+ * -+ * Based on the MT9V032 driver and Bastian Hecht's code. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+ -+#define MT9P031_PIXCLK_FREQ 54000000 -+ -+/* mt9p031 selected register addresses */ -+#define MT9P031_CHIP_VERSION 0x00 -+#define MT9P031_CHIP_VERSION_VALUE 0x1801 -+#define MT9P031_ROW_START 0x01 -+#define MT9P031_ROW_START_DEF 54 -+#define MT9P031_COLUMN_START 0x02 -+#define MT9P031_COLUMN_START_DEF 16 -+#define MT9P031_WINDOW_HEIGHT 0x03 -+#define MT9P031_WINDOW_WIDTH 0x04 -+#define MT9P031_H_BLANKING 0x05 -+#define MT9P031_H_BLANKING_VALUE 0 -+#define MT9P031_V_BLANKING 0x06 -+#define MT9P031_V_BLANKING_VALUE 25 -+#define MT9P031_OUTPUT_CONTROL 0x07 -+#define MT9P031_OUTPUT_CONTROL_CEN 2 -+#define MT9P031_OUTPUT_CONTROL_SYN 1 -+#define MT9P031_SHUTTER_WIDTH_UPPER 0x08 -+#define MT9P031_SHUTTER_WIDTH 0x09 -+#define MT9P031_PIXEL_CLOCK_CONTROL 0x0a -+#define MT9P031_FRAME_RESTART 0x0b -+#define MT9P031_SHUTTER_DELAY 0x0c -+#define MT9P031_RST 0x0d -+#define MT9P031_RST_ENABLE 1 -+#define MT9P031_RST_DISABLE 0 -+#define MT9P031_READ_MODE_1 0x1e -+#define MT9P031_READ_MODE_2 0x20 -+#define MT9P031_READ_MODE_2_ROW_MIR 0x8000 -+#define MT9P031_READ_MODE_2_COL_MIR 0x4000 -+#define MT9P031_ROW_ADDRESS_MODE 0x22 -+#define MT9P031_COLUMN_ADDRESS_MODE 0x23 -+#define MT9P031_GLOBAL_GAIN 0x35 -+ -+#define MT9P031_WINDOW_HEIGHT_MAX 1944 -+#define MT9P031_WINDOW_WIDTH_MAX 2592 -+#define MT9P031_WINDOW_HEIGHT_MIN 2 -+#define MT9P031_WINDOW_WIDTH_MIN 18 -+ -+struct mt9p031 { -+ struct v4l2_subdev subdev; -+ struct media_pad pad; -+ struct v4l2_rect rect; /* Sensor window */ -+ struct v4l2_mbus_framefmt format; -+ struct mt9p031_platform_data *pdata; -+ struct mutex power_lock; /* lock to protect power_count */ -+ int power_count; -+ u16 xskip; -+ u16 yskip; -+ /* cache register values */ -+ u16 output_control; -+ u16 h_blanking; -+ u16 v_blanking; -+ u16 column_address_mode; -+ u16 row_address_mode; -+ u16 column_start; -+ u16 row_start; -+ u16 window_width; -+ u16 window_height; -+ struct regulator *reg_1v8; -+ struct regulator *reg_2v8; -+}; -+ -+static struct mt9p031 *to_mt9p031(const struct i2c_client *client) -+{ -+ return container_of(i2c_get_clientdata(client), struct mt9p031, subdev); -+} -+ -+static int reg_read(struct i2c_client *client, const u8 reg) -+{ -+ s32 data = i2c_smbus_read_word_data(client, reg); -+ return data < 0 ? data : swab16(data); -+} -+ -+static int reg_write(struct i2c_client *client, const u8 reg, -+ const u16 data) -+{ -+ return i2c_smbus_write_word_data(client, reg, swab16(data)); -+} -+ -+static int reg_write_cached(struct i2c_client *client, const u8 reg, -+ const u16 data, u16 *cache) -+{ -+ int ret; -+ -+ ret = reg_write(client, reg, data); -+ if (ret < 0) -+ return ret; -+ *cache = data; -+ return 0; -+} -+ -+static int mt9p031_set_output_control(struct mt9p031 *mt9p031, u16 clear, -+ u16 set) -+{ -+ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); -+ u16 value = (mt9p031->output_control & ~clear) | set; -+ -+ return reg_write_cached(client, MT9P031_OUTPUT_CONTROL, value, -+ &mt9p031->output_control); -+} -+ -+static int restore_registers(struct i2c_client *client) -+{ -+ int ret; -+ struct mt9p031 *mt9p031 = to_mt9p031(client); -+ -+ /* Disable register update, reconfigure atomically */ -+ ret = mt9p031_set_output_control(mt9p031, 0, -+ MT9P031_OUTPUT_CONTROL_SYN); -+ if (ret < 0) -+ return ret; -+ -+ /* Blanking and start values - default... */ -+ ret = reg_write(client, MT9P031_H_BLANKING, mt9p031->h_blanking); -+ if (ret < 0) -+ return ret; -+ -+ ret = reg_write(client, MT9P031_V_BLANKING, mt9p031->v_blanking); -+ if (ret < 0) -+ return ret; -+ -+ ret = reg_write(client, MT9P031_COLUMN_ADDRESS_MODE, -+ mt9p031->column_address_mode); -+ if (ret < 0) -+ return ret; -+ -+ ret = reg_write(client, MT9P031_ROW_ADDRESS_MODE, -+ mt9p031->row_address_mode); -+ if (ret < 0) -+ return ret; -+ -+ ret = reg_write(client, MT9P031_COLUMN_START, -+ mt9p031->column_start); -+ if (ret < 0) -+ return ret; -+ -+ ret = reg_write(client, MT9P031_ROW_START, -+ mt9p031->row_start); -+ if (ret < 0) -+ return ret; -+ -+ ret = reg_write(client, MT9P031_WINDOW_WIDTH, -+ mt9p031->window_width); -+ if (ret < 0) -+ return ret; -+ -+ ret = reg_write(client, MT9P031_WINDOW_HEIGHT, -+ mt9p031->window_height); -+ if (ret < 0) -+ return ret; -+ -+ /* Re-enable register update, commit all changes */ -+ ret = mt9p031_set_output_control(mt9p031, -+ MT9P031_OUTPUT_CONTROL_SYN, 0); -+ if (ret < 0) -+ return ret; -+ return 0; -+} -+ -+static int mt9p031_reset(struct i2c_client *client) -+{ -+ struct mt9p031 *mt9p031 = to_mt9p031(client); -+ int ret; -+ -+ /* Disable chip output, synchronous option update */ -+ ret = reg_write(client, MT9P031_RST, MT9P031_RST_ENABLE); -+ if (ret < 0) -+ return ret; -+ ret = reg_write(client, MT9P031_RST, MT9P031_RST_DISABLE); -+ if (ret < 0) -+ return ret; -+ return mt9p031_set_output_control(mt9p031, -+ MT9P031_OUTPUT_CONTROL_CEN, 0); -+} -+ -+static int mt9p031_power_on(struct mt9p031 *mt9p031) -+{ -+ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); -+ int ret; -+ -+ /* Ensure RESET_BAR is low */ -+ if (mt9p031->pdata->reset) -+ mt9p031->pdata->reset(&mt9p031->subdev, 1); -+ /* turn on digital supply first */ -+ ret = regulator_enable(mt9p031->reg_1v8); -+ if (ret) { -+ dev_err(&client->dev, -+ "Failed to enable 1.8v regulator: %d\n", ret); -+ goto err_1v8; -+ } -+ /* now turn on analog supply */ -+ ret = regulator_enable(mt9p031->reg_2v8); -+ if (ret) { -+ dev_err(&client->dev, -+ "Failed to enable 2.8v regulator: %d\n", ret); -+ goto err_rst; -+ } -+ /* Now RESET_BAR must be high */ -+ if (mt9p031->pdata->reset) -+ mt9p031->pdata->reset(&mt9p031->subdev, 0); -+ -+ if (mt9p031->pdata->set_xclk) -+ mt9p031->pdata->set_xclk(&mt9p031->subdev, MT9P031_PIXCLK_FREQ); -+ -+ /* soft reset */ -+ ret = mt9p031_reset(client); -+ if (ret < 0) { -+ dev_err(&client->dev, "Failed to reset the camera\n"); -+ goto err_rst; -+ } -+ -+ ret = restore_registers(client); -+ if (ret < 0) { -+ dev_err(&client->dev, "Failed to restore registers\n"); -+ goto err_rst; -+ } -+ -+ return 0; -+err_rst: -+ regulator_disable(mt9p031->reg_1v8); -+err_1v8: -+ return ret; -+ -+} -+ -+static void mt9p031_power_off(struct mt9p031 *mt9p031) -+{ -+ if (mt9p031->pdata->set_xclk) -+ mt9p031->pdata->set_xclk(&mt9p031->subdev, 0); -+ if (mt9p031->pdata->reset) -+ mt9p031->pdata->reset(&mt9p031->subdev, 1); -+ regulator_disable(mt9p031->reg_1v8); -+ regulator_disable(mt9p031->reg_2v8); -+} -+ -+static int mt9p031_enum_mbus_code(struct v4l2_subdev *sd, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_mbus_code_enum *code) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ -+ if (code->pad || code->index) -+ return -EINVAL; -+ -+ code->code = mt9p031->format.code; -+ -+ return 0; -+} -+ -+static struct v4l2_mbus_framefmt *mt9p031_get_pad_format( -+ struct mt9p031 *mt9p031, -+ struct v4l2_subdev_fh *fh, -+ unsigned int pad, u32 which) -+{ -+ switch (which) { -+ case V4L2_SUBDEV_FORMAT_TRY: -+ return v4l2_subdev_get_try_format(fh, pad); -+ case V4L2_SUBDEV_FORMAT_ACTIVE: -+ return &mt9p031->format; -+ default: -+ return NULL; -+ } -+} -+ -+static struct v4l2_rect *mt9p031_get_pad_crop(struct mt9p031 *mt9p031, -+ struct v4l2_subdev_fh *fh, unsigned int pad, u32 which) -+{ -+ switch (which) { -+ case V4L2_SUBDEV_FORMAT_TRY: -+ return v4l2_subdev_get_try_crop(fh, pad); -+ case V4L2_SUBDEV_FORMAT_ACTIVE: -+ return &mt9p031->rect; -+ default: -+ return NULL; -+ } -+} -+ -+static int mt9p031_get_crop(struct v4l2_subdev *sd, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_crop *crop) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ struct v4l2_rect *rect = mt9p031_get_pad_crop(mt9p031, fh, crop->pad, -+ crop->which); -+ if (!rect) -+ return -EINVAL; -+ -+ crop->rect = *rect; -+ -+ return 0; -+} -+ -+static u16 mt9p031_skip_for_crop(s32 source, s32 *target, s32 max_skip) -+{ -+ unsigned int skip; -+ -+ if (source - source / 4 < *target) { -+ *target = source; -+ return 1; -+ } -+ -+ skip = DIV_ROUND_CLOSEST(source, *target); -+ if (skip > max_skip) -+ skip = max_skip; -+ *target = 2 * DIV_ROUND_UP(source, 2 * skip); -+ -+ return skip; -+} -+ -+static int mt9p031_set_params(struct i2c_client *client, -+ struct v4l2_rect *rect, u16 xskip, u16 yskip) -+{ -+ struct mt9p031 *mt9p031 = to_mt9p031(client); -+ int ret; -+ u16 xbin, ybin; -+ const u16 hblank = MT9P031_H_BLANKING_VALUE, -+ vblank = MT9P031_V_BLANKING_VALUE; -+ __s32 left, top, width, height; -+ -+ /* -+ * TODO: Attention! When implementing horizontal flipping, adjust -+ * alignment according to R2 "Column Start" description in the datasheet -+ */ -+ if (xskip & 1) { -+ xbin = 1; -+ left = rect->left & (~3); -+ } else if (xskip & 2) { -+ xbin = 2; -+ left = rect->left & (~7); -+ } else { -+ xbin = 4; -+ left = rect->left & (~15); -+ } -+ top = rect->top & (~1); -+ width = rect->width; -+ height = rect->height; -+ -+ ybin = min(yskip, (u16)4); -+ -+ /* Disable register update, reconfigure atomically */ -+ ret = mt9p031_set_output_control(mt9p031, 0, -+ MT9P031_OUTPUT_CONTROL_SYN); -+ if (ret < 0) -+ return ret; -+ -+ dev_dbg(&client->dev, "skip %u:%u, rect %ux%u@%u:%u\n", -+ xskip, yskip, rect->width, rect->height, rect->left, rect->top); -+ -+ /* Blanking and start values - default... */ -+ ret = reg_write_cached(client, MT9P031_H_BLANKING, hblank, -+ &mt9p031->h_blanking); -+ if (ret < 0) -+ return ret; -+ ret = reg_write_cached(client, MT9P031_V_BLANKING, vblank, -+ &mt9p031->v_blanking); -+ if (ret < 0) -+ return ret; -+ -+ ret = reg_write_cached(client, MT9P031_COLUMN_ADDRESS_MODE, -+ ((xbin - 1) << 4) | (xskip - 1), -+ &mt9p031->column_address_mode); -+ if (ret < 0) -+ return ret; -+ ret = reg_write_cached(client, MT9P031_ROW_ADDRESS_MODE, -+ ((ybin - 1) << 4) | (yskip - 1), -+ &mt9p031->row_address_mode); -+ if (ret < 0) -+ return ret; -+ -+ dev_dbg(&client->dev, "new physical left %u, top %u\n", -+ rect->left, rect->top); -+ -+ ret = reg_write_cached(client, MT9P031_COLUMN_START, -+ rect->left + MT9P031_COLUMN_START_DEF, -+ &mt9p031->column_start); -+ if (ret < 0) -+ return ret; -+ ret = reg_write_cached(client, MT9P031_ROW_START, -+ rect->top + MT9P031_ROW_START_DEF, -+ &mt9p031->row_start); -+ if (ret < 0) -+ return ret; -+ ret = reg_write_cached(client, MT9P031_WINDOW_WIDTH, -+ rect->width - 1, -+ &mt9p031->window_width); -+ if (ret < 0) -+ return ret; -+ ret = reg_write_cached(client, MT9P031_WINDOW_HEIGHT, -+ rect->height - 1, -+ &mt9p031->window_height); -+ if (ret < 0) -+ return ret; -+ -+ /* Re-enable register update, commit all changes */ -+ ret = mt9p031_set_output_control(mt9p031, -+ MT9P031_OUTPUT_CONTROL_SYN, 0); -+ if (ret < 0) -+ return ret; -+ -+ mt9p031->xskip = xskip; -+ mt9p031->yskip = yskip; -+ return ret; -+} -+ -+static int mt9p031_set_crop(struct v4l2_subdev *sd, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_crop *crop) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ struct v4l2_mbus_framefmt *f; -+ struct v4l2_rect *c; -+ struct v4l2_rect rect; -+ u16 xskip, yskip; -+ s32 width, height; -+ -+ dev_dbg(mt9p031->subdev.v4l2_dev->dev, "%s(%ux%u@%u:%u : %u)\n", -+ __func__, crop->rect.width, crop->rect.height, -+ crop->rect.left, crop->rect.top, crop->which); -+ -+ /* -+ * Clamp the crop rectangle boundaries and align them to a multiple of 2 -+ * pixels. -+ */ -+ rect.width = ALIGN(clamp(crop->rect.width, -+ MT9P031_WINDOW_WIDTH_MIN, MT9P031_WINDOW_WIDTH_MAX), 2); -+ rect.height = ALIGN(clamp(crop->rect.height, -+ MT9P031_WINDOW_HEIGHT_MIN, MT9P031_WINDOW_HEIGHT_MAX), 2); -+ rect.left = ALIGN(clamp(crop->rect.left, -+ 0, MT9P031_WINDOW_WIDTH_MAX - rect.width), 2); -+ rect.top = ALIGN(clamp(crop->rect.top, -+ 0, MT9P031_WINDOW_HEIGHT_MAX - rect.height), 2); -+ -+ c = mt9p031_get_pad_crop(mt9p031, fh, crop->pad, crop->which); -+ -+ if (rect.width != c->width || rect.height != c->height) { -+ /* -+ * Reset the output image size if the crop rectangle size has -+ * been modified. -+ */ -+ f = mt9p031_get_pad_format(mt9p031, fh, crop->pad, -+ crop->which); -+ width = f->width; -+ height = f->height; -+ -+ xskip = mt9p031_skip_for_crop(rect.width, &width, 7); -+ yskip = mt9p031_skip_for_crop(rect.height, &height, 8); -+ } else { -+ xskip = mt9p031->xskip; -+ yskip = mt9p031->yskip; -+ f = NULL; -+ } -+ if (f) { -+ f->width = width; -+ f->height = height; -+ } -+ -+ *c = rect; -+ crop->rect = rect; -+ -+ mt9p031->xskip = xskip; -+ mt9p031->yskip = yskip; -+ mt9p031->rect = *c; -+ return 0; -+} -+ -+static int mt9p031_get_format(struct v4l2_subdev *sd, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_format *fmt) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ -+ fmt->format = -+ *mt9p031_get_pad_format(mt9p031, fh, fmt->pad, fmt->which); -+ return 0; -+} -+ -+static u16 mt9p031_skip_for_scale(s32 *source, s32 target, -+ s32 max_skip, s32 max) -+{ -+ unsigned int skip; -+ -+ if (*source - *source / 4 < target) { -+ *source = target; -+ return 1; -+ } -+ -+ skip = min(max, *source + target / 2) / target; -+ if (skip > max_skip) -+ skip = max_skip; -+ *source = target * skip; -+ -+ return skip; -+} -+ -+static int mt9p031_fmt_validate(struct v4l2_subdev *sd, -+ struct v4l2_subdev_format *fmt) -+{ -+ struct v4l2_mbus_framefmt *format = &fmt->format; -+ -+ /* Hardcode code and colorspace as sensor only supports one */ -+ format->code = V4L2_MBUS_FMT_SGRBG12_1X12; -+ format->colorspace = V4L2_COLORSPACE_SRGB; -+ -+ format->width = clamp_t(int, ALIGN(format->width, 2), 2, -+ MT9P031_WINDOW_WIDTH_MAX); -+ format->height = clamp_t(int, ALIGN(format->height, 2), 2, -+ MT9P031_WINDOW_HEIGHT_MAX); -+ format->field = V4L2_FIELD_NONE; -+ -+ return 0; -+} -+ -+static int mt9p031_set_format(struct v4l2_subdev *sd, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_format *format) -+{ -+ struct v4l2_subdev_format sdf = *format; -+ struct v4l2_mbus_framefmt *__format, *format_bak = &sdf.format; -+ struct v4l2_rect *__crop, rect; -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ u16 xskip, yskip; -+ int ret; -+ -+ __crop = mt9p031_get_pad_crop(mt9p031, fh, format->pad, format->which); -+ -+ ret = mt9p031_fmt_validate(sd, &sdf); -+ if (ret < 0) -+ return ret; -+ rect.width = __crop->width; -+ rect.height = __crop->height; -+ -+ xskip = mt9p031_skip_for_scale(&rect.width, format_bak->width, 7, -+ MT9P031_WINDOW_WIDTH_MAX); -+ if (rect.width + __crop->left > MT9P031_WINDOW_WIDTH_MAX) -+ rect.left = (MT9P031_WINDOW_WIDTH_MAX - rect.width) / 2; -+ else -+ rect.left = __crop->left; -+ yskip = mt9p031_skip_for_scale(&rect.height, format_bak->height, 8, -+ MT9P031_WINDOW_HEIGHT_MAX); -+ if (rect.height + __crop->top > MT9P031_WINDOW_HEIGHT_MAX) -+ rect.top = (MT9P031_WINDOW_HEIGHT_MAX - rect.height) / 2; -+ else -+ rect.top = __crop->top; -+ -+ dev_dbg(mt9p031->subdev.v4l2_dev->dev, "%s(%ux%u : %u)\n", __func__, -+ format_bak->width, format_bak->height, format->which); -+ if (__crop) -+ *__crop = rect; -+ -+ __format = mt9p031_get_pad_format(mt9p031, fh, format->pad, format->which); -+ *__format = *format_bak; -+ format->format = *format_bak; -+ -+ mt9p031->xskip = xskip; -+ mt9p031->yskip = yskip; -+ mt9p031->rect = *__crop; -+ return 0; -+} -+ -+static int mt9p031_s_stream(struct v4l2_subdev *sd, int enable) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); -+ struct v4l2_rect rect = mt9p031->rect; -+ u16 xskip = mt9p031->xskip; -+ u16 yskip = mt9p031->yskip; -+ int ret; -+ -+ if (enable) { -+ ret = mt9p031_set_params(client, &rect, xskip, yskip); -+ if (ret < 0) -+ return ret; -+ /* Switch to master "normal" mode */ -+ ret = mt9p031_set_output_control(mt9p031, 0, -+ MT9P031_OUTPUT_CONTROL_CEN); -+ } else { -+ /* Stop sensor readout */ -+ ret = mt9p031_set_output_control(mt9p031, -+ MT9P031_OUTPUT_CONTROL_CEN, 0); -+ } -+ return ret; -+} -+ -+static int mt9p031_video_probe(struct i2c_client *client) -+{ -+ s32 data; -+ -+ /* Read out the chip version register */ -+ data = reg_read(client, MT9P031_CHIP_VERSION); -+ if (data != MT9P031_CHIP_VERSION_VALUE) { -+ dev_err(&client->dev, -+ "No MT9P031 chip detected, register read %x\n", data); -+ return -ENODEV; -+ } -+ -+ dev_info(&client->dev, "Detected a MT9P031 chip ID %x\n", data); -+ -+ return 0; -+} -+ -+static int mt9p031_set_power(struct v4l2_subdev *sd, int on) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ int ret = 0; -+ -+ mutex_lock(&mt9p031->power_lock); -+ -+ /* -+ * If the power count is modified from 0 to != 0 or from != 0 to 0, -+ * update the power state. -+ */ -+ if (mt9p031->power_count == !on) { -+ if (on) { -+ ret = mt9p031_power_on(mt9p031); -+ if (ret) { -+ dev_err(mt9p031->subdev.v4l2_dev->dev, -+ "Failed to enable 2.8v regulator: %d\n", ret); -+ goto out; -+ } -+ } else { -+ mt9p031_power_off(mt9p031); -+ } -+ } -+ -+ /* Update the power count. */ -+ mt9p031->power_count += on ? 1 : -1; -+ WARN_ON(mt9p031->power_count < 0); -+ -+out: -+ mutex_unlock(&mt9p031->power_lock); -+ return ret; -+} -+ -+static int mt9p031_registered(struct v4l2_subdev *sd) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); -+ int ret; -+ -+ ret = mt9p031_set_power(&mt9p031->subdev, 1); -+ if (ret) { -+ dev_err(&client->dev, -+ "Failed to power on device: %d\n", ret); -+ goto err_pwron; -+ } -+ -+ ret = mt9p031_video_probe(client); -+ if (ret) -+ goto err_evprobe; -+ -+ mt9p031->pad.flags = MEDIA_PAD_FL_SOURCE; -+ ret = media_entity_init(&mt9p031->subdev.entity, 1, &mt9p031->pad, 0); -+ if (ret) -+ goto err_evprobe; -+ -+ mt9p031->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; -+ mt9p031_set_power(&mt9p031->subdev, 0); -+ -+ return 0; -+err_evprobe: -+ mt9p031_set_power(&mt9p031->subdev, 0); -+err_pwron: -+ return ret; -+} -+ -+static int mt9p031_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) -+{ -+ struct mt9p031 *mt9p031; -+ mt9p031 = container_of(sd, struct mt9p031, subdev); -+ -+ mt9p031->rect.width = MT9P031_WINDOW_WIDTH_MAX; -+ mt9p031->rect.height = MT9P031_WINDOW_HEIGHT_MAX; -+ mt9p031->rect.left = MT9P031_COLUMN_START_DEF; -+ mt9p031->rect.top = MT9P031_ROW_START_DEF; -+ -+ mt9p031->format.code = V4L2_MBUS_FMT_SGRBG12_1X12; -+ mt9p031->format.width = MT9P031_WINDOW_WIDTH_MAX; -+ mt9p031->format.height = MT9P031_WINDOW_HEIGHT_MAX; -+ mt9p031->format.field = V4L2_FIELD_NONE; -+ mt9p031->format.colorspace = V4L2_COLORSPACE_SRGB; -+ -+ mt9p031->xskip = 1; -+ mt9p031->yskip = 1; -+ return mt9p031_set_power(sd, 1); -+} -+ -+static int mt9p031_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) -+{ -+ return mt9p031_set_power(sd, 0); -+} -+ -+static struct v4l2_subdev_core_ops mt9p031_subdev_core_ops = { -+ .s_power = mt9p031_set_power, -+}; -+ -+static struct v4l2_subdev_video_ops mt9p031_subdev_video_ops = { -+ .s_stream = mt9p031_s_stream, -+}; -+ -+static struct v4l2_subdev_pad_ops mt9p031_subdev_pad_ops = { -+ .enum_mbus_code = mt9p031_enum_mbus_code, -+ .get_fmt = mt9p031_get_format, -+ .set_fmt = mt9p031_set_format, -+ .get_crop = mt9p031_get_crop, -+ .set_crop = mt9p031_set_crop, -+}; -+ -+static struct v4l2_subdev_ops mt9p031_subdev_ops = { -+ .core = &mt9p031_subdev_core_ops, -+ .video = &mt9p031_subdev_video_ops, -+ .pad = &mt9p031_subdev_pad_ops, -+}; -+ -+static const struct v4l2_subdev_internal_ops mt9p031_subdev_internal_ops = { -+ .registered = mt9p031_registered, -+ .open = mt9p031_open, -+ .close = mt9p031_close, -+}; -+ -+static int mt9p031_probe(struct i2c_client *client, -+ const struct i2c_device_id *did) -+{ -+ struct mt9p031 *mt9p031; -+ struct mt9p031_platform_data *pdata = client->dev.platform_data; -+ struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); -+ int ret; -+ -+ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA)) { -+ dev_warn(&adapter->dev, -+ "I2C-Adapter doesn't support I2C_FUNC_SMBUS_WORD\n"); -+ return -EIO; -+ } -+ -+ mt9p031 = kzalloc(sizeof(struct mt9p031), GFP_KERNEL); -+ if (!mt9p031) -+ return -ENOMEM; -+ -+ mutex_init(&mt9p031->power_lock); -+ v4l2_i2c_subdev_init(&mt9p031->subdev, client, &mt9p031_subdev_ops); -+ mt9p031->subdev.internal_ops = &mt9p031_subdev_internal_ops; -+ -+ mt9p031->pdata = pdata; -+ -+ mt9p031->reg_1v8 = regulator_get(NULL, "cam_1v8"); -+ if (IS_ERR(mt9p031->reg_1v8)) { -+ ret = PTR_ERR(mt9p031->reg_1v8); -+ dev_err(mt9p031->subdev.v4l2_dev->dev, -+ "Failed 1.8v regulator: %d\n", ret); -+ goto err_e1v8; -+ } -+ -+ mt9p031->reg_2v8 = regulator_get(NULL, "cam_2v8"); -+ if (IS_ERR(mt9p031->reg_2v8)) { -+ ret = PTR_ERR(mt9p031->reg_2v8); -+ dev_err(mt9p031->subdev.v4l2_dev->dev, -+ "Failed 2.8v regulator: %d\n", ret); -+ goto err_e2v8; -+ } -+ return 0; -+err_e2v8: -+ regulator_put(mt9p031->reg_1v8); -+err_e1v8: -+ kfree(mt9p031); -+ return ret; -+} -+ -+static int mt9p031_remove(struct i2c_client *client) -+{ -+ struct v4l2_subdev *sd = i2c_get_clientdata(client); -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ -+ v4l2_device_unregister_subdev(sd); -+ media_entity_cleanup(&sd->entity); -+ regulator_put(mt9p031->reg_2v8); -+ regulator_put(mt9p031->reg_1v8); -+ kfree(mt9p031); -+ -+ return 0; -+} -+ -+static const struct i2c_device_id mt9p031_id[] = { -+ { "mt9p031", 0 }, -+ { } -+}; -+MODULE_DEVICE_TABLE(i2c, mt9p031_id); -+ -+static struct i2c_driver mt9p031_i2c_driver = { -+ .driver = { -+ .name = "mt9p031", -+ }, -+ .probe = mt9p031_probe, -+ .remove = mt9p031_remove, -+ .id_table = mt9p031_id, -+}; -+ -+static int __init mt9p031_mod_init(void) -+{ -+ return i2c_add_driver(&mt9p031_i2c_driver); -+} -+ -+static void __exit mt9p031_mod_exit(void) -+{ -+ i2c_del_driver(&mt9p031_i2c_driver); -+} -+ -+module_init(mt9p031_mod_init); -+module_exit(mt9p031_mod_exit); -+ -+MODULE_DESCRIPTION("Aptina MT9P031 Camera driver"); -+MODULE_AUTHOR("Bastian Hecht "); -+MODULE_LICENSE("GPL v2"); -diff --git a/include/media/mt9p031.h b/include/media/mt9p031.h -new file mode 100644 -index 0000000..7ee9733 ---- /dev/null -+++ b/include/media/mt9p031.h -@@ -0,0 +1,11 @@ -+#ifndef MT9P031_H -+#define MT9P031_H -+ -+struct v4l2_subdev; -+ -+struct mt9p031_platform_data { -+ int (*set_xclk)(struct v4l2_subdev *subdev, int hz); -+ int (*reset)(struct v4l2_subdev *subdev, int active); -+}; -+ -+#endif --- -1.6.6.1 - diff --git a/recipes/linux/linux-omap-2.6.39/camera/0001-Add-support-for-mt9p031-Aptina-Micron-sensor.patch b/recipes/linux/linux-omap-2.6.39/camera/0001-Add-support-for-mt9p031-Aptina-Micron-sensor.patch new file mode 100644 index 0000000000..7f68de4048 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/camera/0001-Add-support-for-mt9p031-Aptina-Micron-sensor.patch @@ -0,0 +1,773 @@ +From 244f96b15afbd73942762e2c07523d6c5cf68a7e Mon Sep 17 00:00:00 2001 +From: Javier Martin +Date: Tue, 31 May 2011 11:46:49 +0200 +Subject: [PATCH 1/3] Add support for mt9p031 Aptina (Micron) sensor. + +This patch adds basic support (no controls) for +mt9p031 sensor. It applies on kernel 2.6.39. + +Signed-off-by: Javier Martin +--- + drivers/media/video/Kconfig | 7 + + drivers/media/video/Makefile | 1 + + drivers/media/video/mt9p031.c | 699 +++++++++++++++++++++++++++++++++++++++++ + include/media/mt9p031.h | 11 + + 4 files changed, 718 insertions(+), 0 deletions(-) + create mode 100644 drivers/media/video/mt9p031.c + create mode 100644 include/media/mt9p031.h + +diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig +index 00f51dd..cb87e35 100644 +--- a/drivers/media/video/Kconfig ++++ b/drivers/media/video/Kconfig +@@ -329,6 +329,13 @@ config VIDEO_OV7670 + OV7670 VGA camera. It currently only works with the M88ALP01 + controller. + ++config VIDEO_MT9P031 ++ tristate "Aptina MT9P031 support" ++ depends on I2C && VIDEO_V4L2 ++ ---help--- ++ This is a Video4Linux2 sensor-level driver for the Aptina ++ (Micron) mt9p031 5 Mpixel camera. ++ + config VIDEO_MT9V011 + tristate "Micron mt9v011 sensor support" + depends on I2C && VIDEO_V4L2 +diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile +index ace5d8b..912b29b 100644 +--- a/drivers/media/video/Makefile ++++ b/drivers/media/video/Makefile +@@ -65,6 +65,7 @@ obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o + obj-$(CONFIG_VIDEO_OV7670) += ov7670.o + obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o + obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o ++obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o + obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o + obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o + obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o +diff --git a/drivers/media/video/mt9p031.c b/drivers/media/video/mt9p031.c +new file mode 100644 +index 0000000..61b46a0 +--- /dev/null ++++ b/drivers/media/video/mt9p031.c +@@ -0,0 +1,699 @@ ++/* ++ * Driver for MT9P031 CMOS Image Sensor from Aptina ++ * ++ * Copyright (C) 2011, Javier Martin ++ * ++ * Copyright (C) 2011, Guennadi Liakhovetski ++ * ++ * Based on the MT9V032 driver and Bastian Hecht's code. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++#define MT9P031_PIXCLK_FREQ 54000000 ++ ++#define MT9P031_CHIP_VERSION 0x00 ++#define MT9P031_CHIP_VERSION_VALUE 0x1801 ++#define MT9P031_ROW_START 0x01 ++#define MT9P031_ROW_START_MIN 1 ++#define MT9P031_ROW_START_MAX 2004 ++#define MT9P031_ROW_START_DEF 54 ++#define MT9P031_COLUMN_START 0x02 ++#define MT9P031_COLUMN_START_MIN 1 ++#define MT9P031_COLUMN_START_MAX 2750 ++#define MT9P031_COLUMN_START_DEF 16 ++#define MT9P031_WINDOW_HEIGHT 0x03 ++#define MT9P031_WINDOW_HEIGHT_MIN 2 ++#define MT9P031_WINDOW_HEIGHT_MAX 2003 ++#define MT9P031_WINDOW_HEIGHT_DEF 2003 ++#define MT9P031_WINDOW_WIDTH 0x04 ++#define MT9P031_WINDOW_WIDTH_MIN 18 ++#define MT9P031_WINDOW_WIDTH_MAX 2751 ++#define MT9P031_WINDOW_WIDTH_DEF 2751 ++#define MT9P031_H_BLANKING 0x05 ++#define MT9P031_H_BLANKING_VALUE 0 ++#define MT9P031_V_BLANKING 0x06 ++#define MT9P031_V_BLANKING_VALUE 25 ++#define MT9P031_OUTPUT_CONTROL 0x07 ++#define MT9P031_OUTPUT_CONTROL_CEN 2 ++#define MT9P031_OUTPUT_CONTROL_SYN 1 ++#define MT9P031_SHUTTER_WIDTH_UPPER 0x08 ++#define MT9P031_SHUTTER_WIDTH 0x09 ++#define MT9P031_PIXEL_CLOCK_CONTROL 0x0a ++#define MT9P031_FRAME_RESTART 0x0b ++#define MT9P031_SHUTTER_DELAY 0x0c ++#define MT9P031_RST 0x0d ++#define MT9P031_RST_ENABLE 1 ++#define MT9P031_RST_DISABLE 0 ++#define MT9P031_READ_MODE_1 0x1e ++#define MT9P031_READ_MODE_2 0x20 ++#define MT9P031_READ_MODE_2_ROW_MIR 0x8000 ++#define MT9P031_READ_MODE_2_COL_MIR 0x4000 ++#define MT9P031_ROW_ADDRESS_MODE 0x22 ++#define MT9P031_COLUMN_ADDRESS_MODE 0x23 ++#define MT9P031_GLOBAL_GAIN 0x35 ++ ++ ++ ++ ++struct mt9p031 { ++ struct v4l2_subdev subdev; ++ struct media_pad pad; ++ struct v4l2_rect rect; /* Sensor window */ ++ struct v4l2_mbus_framefmt format; ++ struct mt9p031_platform_data *pdata; ++ struct mutex power_lock; /* lock to protect power_count */ ++ int power_count; ++ u16 xskip; ++ u16 yskip; ++ /* cache register values */ ++ u16 output_control; ++}; ++ ++static struct mt9p031 *to_mt9p031(const struct i2c_client *client) ++{ ++ return container_of(i2c_get_clientdata(client), struct mt9p031, subdev); ++} ++ ++static int reg_read(struct i2c_client *client, const u8 reg) ++{ ++ s32 data = i2c_smbus_read_word_data(client, reg); ++ return data < 0 ? data : swab16(data); ++} ++ ++static int reg_write(struct i2c_client *client, const u8 reg, ++ const u16 data) ++{ ++ return i2c_smbus_write_word_data(client, reg, swab16(data)); ++} ++ ++static int mt9p031_set_output_control(struct mt9p031 *mt9p031, u16 clear, ++ u16 set) ++{ ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); ++ u16 value = (mt9p031->output_control & ~clear) | set; ++ int ret; ++ ++ ret = reg_write(client, MT9P031_OUTPUT_CONTROL, value); ++ if (ret < 0) ++ return ret; ++ mt9p031->output_control = value; ++ return 0; ++} ++ ++static int mt9p031_reset(struct i2c_client *client) ++{ ++ struct mt9p031 *mt9p031 = to_mt9p031(client); ++ int ret; ++ ++ /* Disable chip output, synchronous option update */ ++ ret = reg_write(client, MT9P031_RST, MT9P031_RST_ENABLE); ++ if (ret < 0) ++ return ret; ++ ret = reg_write(client, MT9P031_RST, MT9P031_RST_DISABLE); ++ if (ret < 0) ++ return ret; ++ return mt9p031_set_output_control(mt9p031, ++ MT9P031_OUTPUT_CONTROL_CEN, 0); ++} ++ ++static int mt9p031_power_on(struct mt9p031 *mt9p031) ++{ ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); ++ int ret; ++ ++ /* Ensure RESET_BAR is low */ ++ if (mt9p031->pdata->reset) { ++ mt9p031->pdata->reset(&mt9p031->subdev, 1); ++ msleep(1); ++ } ++ /* Emable clock */ ++ if (mt9p031->pdata->set_xclk) ++ mt9p031->pdata->set_xclk(&mt9p031->subdev, MT9P031_PIXCLK_FREQ); ++ /* Now RESET_BAR must be high */ ++ if (mt9p031->pdata->reset) { ++ mt9p031->pdata->reset(&mt9p031->subdev, 0); ++ msleep(1); ++ } ++ /* soft reset */ ++ ret = mt9p031_reset(client); ++ if (ret < 0) { ++ dev_err(&client->dev, "Failed to reset the camera\n"); ++ return ret; ++ } ++ return 0; ++} ++ ++static void mt9p031_power_off(struct mt9p031 *mt9p031) ++{ ++ if (mt9p031->pdata->reset) { ++ mt9p031->pdata->reset(&mt9p031->subdev, 1); ++ msleep(1); ++ } ++ if (mt9p031->pdata->set_xclk) ++ mt9p031->pdata->set_xclk(&mt9p031->subdev, 0); ++} ++ ++static int mt9p031_enum_mbus_code(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_mbus_code_enum *code) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ ++ if (code->pad || code->index) ++ return -EINVAL; ++ ++ code->code = mt9p031->format.code; ++ return 0; ++} ++ ++static struct v4l2_mbus_framefmt *mt9p031_get_pad_format( ++ struct mt9p031 *mt9p031, ++ struct v4l2_subdev_fh *fh, ++ unsigned int pad, u32 which) ++{ ++ switch (which) { ++ case V4L2_SUBDEV_FORMAT_TRY: ++ return v4l2_subdev_get_try_format(fh, pad); ++ case V4L2_SUBDEV_FORMAT_ACTIVE: ++ return &mt9p031->format; ++ default: ++ return NULL; ++ } ++} ++ ++static struct v4l2_rect *mt9p031_get_pad_crop(struct mt9p031 *mt9p031, ++ struct v4l2_subdev_fh *fh, unsigned int pad, u32 which) ++{ ++ switch (which) { ++ case V4L2_SUBDEV_FORMAT_TRY: ++ return v4l2_subdev_get_try_crop(fh, pad); ++ case V4L2_SUBDEV_FORMAT_ACTIVE: ++ return &mt9p031->rect; ++ default: ++ return NULL; ++ } ++} ++ ++static int mt9p031_get_crop(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_crop *crop) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ struct v4l2_rect *rect = mt9p031_get_pad_crop(mt9p031, fh, crop->pad, ++ crop->which); ++ if (!rect) ++ return -EINVAL; ++ ++ crop->rect = *rect; ++ ++ return 0; ++} ++ ++static u16 mt9p031_skip_for_crop(s32 source, s32 *target, s32 max_skip) ++{ ++ unsigned int skip; ++ ++ if (source - source / 4 < *target) { ++ *target = source; ++ return 1; ++ } ++ ++ skip = DIV_ROUND_CLOSEST(source, *target); ++ if (skip > max_skip) ++ skip = max_skip; ++ *target = 2 * DIV_ROUND_UP(source, 2 * skip); ++ ++ return skip; ++} ++ ++static int mt9p031_set_params(struct i2c_client *client, ++ struct v4l2_rect *rect, u16 xskip, u16 yskip) ++{ ++ struct mt9p031 *mt9p031 = to_mt9p031(client); ++ int ret; ++ u16 xbin, ybin; ++ const u16 hblank = MT9P031_H_BLANKING_VALUE, ++ vblank = MT9P031_V_BLANKING_VALUE; ++ __s32 left; ++ ++ /* ++ * TODO: Attention! When implementing horizontal flipping, adjust ++ * alignment according to R2 "Column Start" description in the datasheet ++ */ ++ if (xskip & 1) { ++ xbin = 1; ++ left = rect->left & (~3); ++ } else if (xskip & 2) { ++ xbin = 2; ++ left = rect->left & (~7); ++ } else { ++ xbin = 4; ++ left = rect->left & (~15); ++ } ++ ybin = min(yskip, (u16)4); ++ ++ /* Disable register update, reconfigure atomically */ ++ ret = mt9p031_set_output_control(mt9p031, 0, ++ MT9P031_OUTPUT_CONTROL_SYN); ++ if (ret < 0) ++ return ret; ++ ++ dev_dbg(&client->dev, "skip %u:%u, rect %ux%u@%u:%u\n", ++ xskip, yskip, rect->width, rect->height, rect->left, rect->top); ++ ++ /* Blanking and start values - default... */ ++ ret = reg_write(client, MT9P031_H_BLANKING, hblank); ++ if (ret < 0) ++ return ret; ++ ret = reg_write(client, MT9P031_V_BLANKING, vblank); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write(client, MT9P031_COLUMN_ADDRESS_MODE, ++ ((xbin - 1) << 4) | (xskip - 1)); ++ if (ret < 0) ++ return ret; ++ ret = reg_write(client, MT9P031_ROW_ADDRESS_MODE, ++ ((ybin - 1) << 4) | (yskip - 1)); ++ if (ret < 0) ++ return ret; ++ ++ dev_dbg(&client->dev, "new physical left %u, top %u\n", ++ rect->left, rect->top); ++ ++ ret = reg_write(client, MT9P031_COLUMN_START, ++ rect->left); ++ if (ret < 0) ++ return ret; ++ ret = reg_write(client, MT9P031_ROW_START, ++ rect->top); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write(client, MT9P031_WINDOW_WIDTH, ++ rect->width - 1); ++ if (ret < 0) ++ return ret; ++ ret = reg_write(client, MT9P031_WINDOW_HEIGHT, ++ rect->height - 1); ++ if (ret < 0) ++ return ret; ++ ++ /* Re-enable register update, commit all changes */ ++ ret = mt9p031_set_output_control(mt9p031, ++ MT9P031_OUTPUT_CONTROL_SYN, 0); ++ if (ret < 0) ++ return ret; ++ ++ mt9p031->xskip = xskip; ++ mt9p031->yskip = yskip; ++ return ret; ++} ++ ++static int mt9p031_set_crop(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_crop *crop) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ struct v4l2_mbus_framefmt *f; ++ struct v4l2_rect *c; ++ struct v4l2_rect rect; ++ u16 xskip, yskip; ++ s32 width, height; ++ ++ dev_dbg(mt9p031->subdev.v4l2_dev->dev, "%s(%ux%u@%u:%u : %u)\n", ++ __func__, crop->rect.width, crop->rect.height, ++ crop->rect.left, crop->rect.top, crop->which); ++ ++ /* ++ * Clamp the crop rectangle boundaries and align them to a multiple of 2 ++ * pixels. ++ */ ++ rect.width = ALIGN(clamp(crop->rect.width, ++ MT9P031_WINDOW_WIDTH_MIN, ++ MT9P031_WINDOW_WIDTH_MAX), 2); ++ rect.height = ALIGN(clamp(crop->rect.height, ++ MT9P031_WINDOW_HEIGHT_MIN, ++ MT9P031_WINDOW_HEIGHT_MAX), 2); ++ rect.left = ALIGN(clamp(crop->rect.left, ++ MT9P031_COLUMN_START_MIN, ++ MT9P031_COLUMN_START_MAX), 2); ++ rect.top = ALIGN(clamp(crop->rect.top, ++ MT9P031_ROW_START_MIN, ++ MT9P031_ROW_START_MAX), 2); ++ ++ c = mt9p031_get_pad_crop(mt9p031, fh, crop->pad, crop->which); ++ ++ if (rect.width != c->width || rect.height != c->height) { ++ /* ++ * Reset the output image size if the crop rectangle size has ++ * been modified. ++ */ ++ f = mt9p031_get_pad_format(mt9p031, fh, crop->pad, ++ crop->which); ++ width = f->width; ++ height = f->height; ++ ++ xskip = mt9p031_skip_for_crop(rect.width, &width, 7); ++ yskip = mt9p031_skip_for_crop(rect.height, &height, 8); ++ } else { ++ xskip = mt9p031->xskip; ++ yskip = mt9p031->yskip; ++ f = NULL; ++ } ++ if (f) { ++ f->width = width; ++ f->height = height; ++ } ++ ++ *c = rect; ++ crop->rect = rect; ++ ++ mt9p031->xskip = xskip; ++ mt9p031->yskip = yskip; ++ mt9p031->rect = *c; ++ return 0; ++} ++ ++static int mt9p031_get_format(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_format *fmt) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ ++ fmt->format = ++ *mt9p031_get_pad_format(mt9p031, fh, fmt->pad, fmt->which); ++ return 0; ++} ++ ++static u16 mt9p031_skip_for_scale(s32 *source, s32 target, ++ s32 max_skip, s32 max) ++{ ++ unsigned int skip; ++ ++ if (*source - *source / 4 < target) { ++ *source = target; ++ return 1; ++ } ++ ++ skip = min(max, *source + target / 2) / target; ++ if (skip > max_skip) ++ skip = max_skip; ++ *source = target * skip; ++ ++ return skip; ++} ++ ++static int mt9p031_set_format(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_format *format) ++{ ++ struct v4l2_mbus_framefmt *__format; ++ struct v4l2_rect *__crop, rect; ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ unsigned int width; ++ unsigned int height; ++ u16 xskip, yskip; ++ ++ __crop = mt9p031_get_pad_crop(mt9p031, fh, format->pad, format->which); ++ ++ width = clamp_t(int, ALIGN(format->format.width, 2), 2, ++ MT9P031_WINDOW_WIDTH_MAX); ++ height = clamp_t(int, ALIGN(format->format.height, 2), 2, ++ MT9P031_WINDOW_HEIGHT_MAX); ++ ++ rect.width = __crop->width; ++ rect.height = __crop->height; ++ ++ xskip = mt9p031_skip_for_scale(&rect.width, width, 7, ++ MT9P031_WINDOW_WIDTH_MAX); ++ if (rect.width + __crop->left > MT9P031_WINDOW_WIDTH_MAX) ++ rect.left = (MT9P031_WINDOW_WIDTH_MAX - rect.width) / 2; ++ else ++ rect.left = __crop->left; ++ yskip = mt9p031_skip_for_scale(&rect.height, height, 8, ++ MT9P031_WINDOW_HEIGHT_MAX); ++ if (rect.height + __crop->top > MT9P031_WINDOW_HEIGHT_MAX) ++ rect.top = (MT9P031_WINDOW_HEIGHT_MAX - rect.height) / 2; ++ else ++ rect.top = __crop->top; ++ ++ dev_dbg(mt9p031->subdev.v4l2_dev->dev, "%s(%ux%u : %u)\n", __func__, ++ width, height, format->which); ++ if (__crop) ++ *__crop = rect; ++ ++ __format = mt9p031_get_pad_format(mt9p031, fh, format->pad, ++ format->which); ++ __format->width = width; ++ __format->height = height; ++ format->format = *__format; ++ ++ mt9p031->xskip = xskip; ++ mt9p031->yskip = yskip; ++ mt9p031->rect = *__crop; ++ return 0; ++} ++ ++static int mt9p031_s_stream(struct v4l2_subdev *sd, int enable) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); ++ struct v4l2_rect rect = mt9p031->rect; ++ u16 xskip = mt9p031->xskip; ++ u16 yskip = mt9p031->yskip; ++ int ret; ++ ++ if (enable) { ++ ret = mt9p031_set_params(client, &rect, xskip, yskip); ++ if (ret < 0) ++ return ret; ++ /* Switch to master "normal" mode */ ++ ret = mt9p031_set_output_control(mt9p031, 0, ++ MT9P031_OUTPUT_CONTROL_CEN); ++ } else { ++ /* Stop sensor readout */ ++ ret = mt9p031_set_output_control(mt9p031, ++ MT9P031_OUTPUT_CONTROL_CEN, 0); ++ } ++ return ret; ++} ++ ++static int mt9p031_video_probe(struct i2c_client *client) ++{ ++ s32 data; ++ ++ /* Read out the chip version register */ ++ data = reg_read(client, MT9P031_CHIP_VERSION); ++ if (data != MT9P031_CHIP_VERSION_VALUE) { ++ dev_err(&client->dev, ++ "No MT9P031 chip detected, register read %x\n", data); ++ return -ENODEV; ++ } ++ ++ dev_info(&client->dev, "Detected a MT9P031 chip ID %x\n", data); ++ ++ return 0; ++} ++ ++static int mt9p031_set_power(struct v4l2_subdev *sd, int on) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ int ret = 0; ++ ++ mutex_lock(&mt9p031->power_lock); ++ ++ /* ++ * If the power count is modified from 0 to != 0 or from != 0 to 0, ++ * update the power state. ++ */ ++ if (mt9p031->power_count == !on) { ++ if (on) { ++ ret = mt9p031_power_on(mt9p031); ++ if (ret) { ++ dev_err(mt9p031->subdev.v4l2_dev->dev, ++ "Failed to power on: %d\n", ret); ++ goto out; ++ } ++ } else { ++ mt9p031_power_off(mt9p031); ++ } ++ } ++ ++ /* Update the power count. */ ++ mt9p031->power_count += on ? 1 : -1; ++ WARN_ON(mt9p031->power_count < 0); ++ ++out: ++ mutex_unlock(&mt9p031->power_lock); ++ return ret; ++} ++ ++static int mt9p031_registered(struct v4l2_subdev *sd) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); ++ int ret; ++ ++ ret = mt9p031_set_power(&mt9p031->subdev, 1); ++ if (ret) { ++ dev_err(&client->dev, ++ "Failed to power on device: %d\n", ret); ++ return ret; ++ } ++ ++ ret = mt9p031_video_probe(client); ++ ++ mt9p031_set_power(&mt9p031->subdev, 0); ++ ++ return ret; ++} ++ ++static int mt9p031_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) ++{ ++ struct mt9p031 *mt9p031; ++ mt9p031 = container_of(sd, struct mt9p031, subdev); ++ ++ mt9p031->rect.width = MT9P031_WINDOW_WIDTH_DEF; ++ mt9p031->rect.height = MT9P031_WINDOW_HEIGHT_DEF; ++ mt9p031->rect.left = MT9P031_COLUMN_START_DEF; ++ mt9p031->rect.top = MT9P031_ROW_START_DEF; ++ ++ mt9p031->format.code = V4L2_MBUS_FMT_SGRBG12_1X12; ++ mt9p031->format.width = MT9P031_WINDOW_WIDTH_DEF; ++ mt9p031->format.height = MT9P031_WINDOW_HEIGHT_DEF; ++ mt9p031->format.field = V4L2_FIELD_NONE; ++ mt9p031->format.colorspace = V4L2_COLORSPACE_SRGB; ++ ++ mt9p031->xskip = 1; ++ mt9p031->yskip = 1; ++ return mt9p031_set_power(sd, 1); ++} ++ ++static int mt9p031_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) ++{ ++ return mt9p031_set_power(sd, 0); ++} ++ ++static struct v4l2_subdev_core_ops mt9p031_subdev_core_ops = { ++ .s_power = mt9p031_set_power, ++}; ++ ++static struct v4l2_subdev_video_ops mt9p031_subdev_video_ops = { ++ .s_stream = mt9p031_s_stream, ++}; ++ ++static struct v4l2_subdev_pad_ops mt9p031_subdev_pad_ops = { ++ .enum_mbus_code = mt9p031_enum_mbus_code, ++ .get_fmt = mt9p031_get_format, ++ .set_fmt = mt9p031_set_format, ++ .get_crop = mt9p031_get_crop, ++ .set_crop = mt9p031_set_crop, ++}; ++ ++static struct v4l2_subdev_ops mt9p031_subdev_ops = { ++ .core = &mt9p031_subdev_core_ops, ++ .video = &mt9p031_subdev_video_ops, ++ .pad = &mt9p031_subdev_pad_ops, ++}; ++ ++static const struct v4l2_subdev_internal_ops mt9p031_subdev_internal_ops = { ++ .registered = mt9p031_registered, ++ .open = mt9p031_open, ++ .close = mt9p031_close, ++}; ++ ++static int mt9p031_probe(struct i2c_client *client, ++ const struct i2c_device_id *did) ++{ ++ int ret; ++ struct mt9p031 *mt9p031; ++ struct mt9p031_platform_data *pdata = client->dev.platform_data; ++ struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); ++ ++ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA)) { ++ dev_warn(&adapter->dev, ++ "I2C-Adapter doesn't support I2C_FUNC_SMBUS_WORD\n"); ++ return -EIO; ++ } ++ ++ mt9p031 = kzalloc(sizeof(struct mt9p031), GFP_KERNEL); ++ if (!mt9p031) ++ return -ENOMEM; ++ ++ mutex_init(&mt9p031->power_lock); ++ v4l2_i2c_subdev_init(&mt9p031->subdev, client, &mt9p031_subdev_ops); ++ mt9p031->subdev.internal_ops = &mt9p031_subdev_internal_ops; ++ ++ mt9p031->pdata = pdata; ++ ++ mt9p031->pad.flags = MEDIA_PAD_FL_SOURCE; ++ ret = media_entity_init(&mt9p031->subdev.entity, 1, &mt9p031->pad, 0); ++ if (ret) ++ return ret; ++ ++ mt9p031->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; ++ ++ return 0; ++} ++ ++static int mt9p031_remove(struct i2c_client *client) ++{ ++ struct v4l2_subdev *sd = i2c_get_clientdata(client); ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ ++ v4l2_device_unregister_subdev(sd); ++ media_entity_cleanup(&sd->entity); ++ kfree(mt9p031); ++ ++ return 0; ++} ++ ++static const struct i2c_device_id mt9p031_id[] = { ++ { "mt9p031", 0 }, ++ { } ++}; ++MODULE_DEVICE_TABLE(i2c, mt9p031_id); ++ ++static struct i2c_driver mt9p031_i2c_driver = { ++ .driver = { ++ .name = "mt9p031", ++ }, ++ .probe = mt9p031_probe, ++ .remove = mt9p031_remove, ++ .id_table = mt9p031_id, ++}; ++ ++static int __init mt9p031_mod_init(void) ++{ ++ return i2c_add_driver(&mt9p031_i2c_driver); ++} ++ ++static void __exit mt9p031_mod_exit(void) ++{ ++ i2c_del_driver(&mt9p031_i2c_driver); ++} ++ ++module_init(mt9p031_mod_init); ++module_exit(mt9p031_mod_exit); ++ ++MODULE_DESCRIPTION("Aptina MT9P031 Camera driver"); ++MODULE_AUTHOR("Bastian Hecht "); ++MODULE_LICENSE("GPL v2"); +diff --git a/include/media/mt9p031.h b/include/media/mt9p031.h +new file mode 100644 +index 0000000..ad37eb3 +--- /dev/null ++++ b/include/media/mt9p031.h +@@ -0,0 +1,11 @@ ++#ifndef MT9P031_H ++#define MT9P031_H ++ ++struct v4l2_subdev; ++ ++struct mt9p031_platform_data { ++ int (*set_xclk)(struct v4l2_subdev *subdev, int hz); ++ int (*reset)(struct v4l2_subdev *subdev, int active); ++}; ++ ++#endif +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/camera/0002-OMAP3BEAGLE-Add-support-for-mt9p031-sensor-driver.patch b/recipes/linux/linux-omap-2.6.39/camera/0002-OMAP3BEAGLE-Add-support-for-mt9p031-sensor-driver.patch deleted file mode 100644 index 68a762b25b..0000000000 --- a/recipes/linux/linux-omap-2.6.39/camera/0002-OMAP3BEAGLE-Add-support-for-mt9p031-sensor-driver.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 186ab3a6cd3f1751b4e60044d8207eb95c4b224a Mon Sep 17 00:00:00 2001 -From: Javier Martin -Date: Wed, 25 May 2011 10:09:23 +0200 -Subject: [PATCH 2/4] OMAP3BEAGLE: Add support for mt9p031 sensor driver. - -isp.h file has to be included as a temporal measure -since clocks of the isp are not exposed yet. - -Signed-off-by: Javier Martin ---- - arch/arm/mach-omap2/board-omap3beagle.c | 73 ++++++++++++++++++++++++++++++- - 1 files changed, 72 insertions(+), 1 deletions(-) - -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 221bfda..9af1cf8 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -25,15 +25,21 @@ - #include - #include - #include -+#include -+#include -+#include - - #include - #include - #include - #include - -+#include - #include - #include - -+#include -+ - #include - #include - #include -@@ -48,11 +54,17 @@ - #include - #include - #include -+#include - - #include "mux.h" - #include "hsmmc.h" - #include "timer-gp.h" - #include "pm.h" -+#include "devices.h" -+#include "../../../drivers/media/video/omap3isp/isp.h" -+ -+#define MT9P031_RESET_GPIO 98 -+#define MT9P031_XCLK ISP_XCLK_A - - #define NAND_BLOCK_SIZE SZ_128K - -@@ -734,7 +746,7 @@ static int __init omap3_beagle_i2c_init(void) - { - omap_register_i2c_bus(1, 2600, beagle_i2c1_boardinfo, - ARRAY_SIZE(beagle_i2c1_boardinfo)); -- omap_register_i2c_bus(2, 400, beagle_i2c2_boardinfo, -+ omap_register_i2c_bus(2, 100, beagle_i2c2_boardinfo, - ARRAY_SIZE(beagle_i2c2_boardinfo)); - /* Bus 3 is attached to the DVI port where devices like the pico DLP - * projector don't work reliably with 400kHz */ -@@ -935,6 +947,60 @@ static void __init beagle_opp_init(void) - return; - } - -+static int beagle_cam_set_xclk(struct v4l2_subdev *subdev, int hz) -+{ -+ struct isp_device *isp = v4l2_dev_to_isp_device(subdev->v4l2_dev); -+ int ret; -+ -+ ret = isp->platform_cb.set_xclk(isp, hz, MT9P031_XCLK); -+ return 0; -+} -+ -+static int beagle_cam_reset(struct v4l2_subdev *subdev, int active) -+{ -+ /* Set RESET_BAR to !active */ -+ gpio_set_value(MT9P031_RESET_GPIO, !active); -+ -+ return 0; -+} -+ -+static struct mt9p031_platform_data beagle_mt9p031_platform_data = { -+ .set_xclk = beagle_cam_set_xclk, -+ .reset = beagle_cam_reset, -+}; -+ -+static struct i2c_board_info mt9p031_camera_i2c_device = { -+ I2C_BOARD_INFO("mt9p031", 0x48), -+ .platform_data = &beagle_mt9p031_platform_data, -+}; -+ -+static struct isp_subdev_i2c_board_info mt9p031_camera_subdevs[] = { -+ { -+ .board_info = &mt9p031_camera_i2c_device, -+ .i2c_adapter_id = 2, -+ }, -+ { NULL, 0, }, -+}; -+ -+static struct isp_v4l2_subdevs_group beagle_camera_subdevs[] = { -+ { -+ .subdevs = mt9p031_camera_subdevs, -+ .interface = ISP_INTERFACE_PARALLEL, -+ .bus = { -+ .parallel = { -+ .data_lane_shift = 0, -+ .clk_pol = 1, -+ .bridge = ISPCTRL_PAR_BRIDGE_DISABLE, -+ } -+ }, -+ }, -+ { }, -+}; -+ -+static struct isp_platform_data beagle_isp_platform_data = { -+ .subdevs = beagle_camera_subdevs, -+}; -+ - static void __init omap3_beagle_init(void) - { - omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); -@@ -1024,6 +1090,11 @@ static void __init omap3_beagle_init(void) - - beagle_display_init(); - beagle_opp_init(); -+ -+ /* Enable camera */ -+ gpio_request(MT9P031_RESET_GPIO, "cam_rst"); -+ gpio_direction_output(MT9P031_RESET_GPIO, 0); -+ omap3_init_camera(&beagle_isp_platform_data); - } - - early_param("buddy", expansionboard_setup); --- -1.6.6.1 - diff --git a/recipes/linux/linux-omap-2.6.39/camera/0004-v4l-Add-mt9v032-sensor-driver.patch b/recipes/linux/linux-omap-2.6.39/camera/0002-v4l-Add-mt9v032-sensor-driver.patch similarity index 99% rename from recipes/linux/linux-omap-2.6.39/camera/0004-v4l-Add-mt9v032-sensor-driver.patch rename to recipes/linux/linux-omap-2.6.39/camera/0002-v4l-Add-mt9v032-sensor-driver.patch index 48e41a5490..2b7e9557f2 100644 --- a/recipes/linux/linux-omap-2.6.39/camera/0004-v4l-Add-mt9v032-sensor-driver.patch +++ b/recipes/linux/linux-omap-2.6.39/camera/0002-v4l-Add-mt9v032-sensor-driver.patch @@ -1,7 +1,7 @@ -From 9b0b5f99896549524c8f88a70f6cf0c0271d730e Mon Sep 17 00:00:00 2001 +From 78fdfee2f749cdcdfa69a008b70c4e5629b9c9df Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Sun, 28 Nov 2010 19:07:20 +0100 -Subject: [PATCH 4/4] v4l: Add mt9v032 sensor driver +Subject: [PATCH 2/3] v4l: Add mt9v032 sensor driver The MT9V032 is a parallel wide VGA sensor from Aptina (formerly Micron) controlled through I2C. diff --git a/recipes/linux/linux-omap-2.6.39/camera/0003-Add-support-for-mt9p031-LI-5M03-module-in-Beagleboar.patch b/recipes/linux/linux-omap-2.6.39/camera/0003-Add-support-for-mt9p031-LI-5M03-module-in-Beagleboar.patch new file mode 100644 index 0000000000..9f7fb006e2 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.39/camera/0003-Add-support-for-mt9p031-LI-5M03-module-in-Beagleboar.patch @@ -0,0 +1,158 @@ +From 6cce194e3d1fbc5d746b192b4d1ff78aef6099cf Mon Sep 17 00:00:00 2001 +From: Javier Martin +Date: Mon, 30 May 2011 10:37:17 +0200 +Subject: [PATCH 3/3] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM. + +Since isp clocks have not been exposed yet, this patch +includes a temporal solution for testing mt9p031 driver +in Beagleboard xM. + +Signed-off-by: Javier Martin +--- + arch/arm/mach-omap2/Makefile | 1 + + arch/arm/mach-omap2/board-omap3beagle-camera.c | 91 ++++++++++++++++++++++++ + arch/arm/mach-omap2/board-omap3beagle.c | 5 ++ + 3 files changed, 97 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/mach-omap2/board-omap3beagle-camera.c + +diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile +index 512b152..05cd983 100644 +--- a/arch/arm/mach-omap2/Makefile ++++ b/arch/arm/mach-omap2/Makefile +@@ -179,6 +179,7 @@ obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o \ + hsmmc.o + obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o + obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \ ++ board-omap3beagle-camera.o \ + hsmmc.o + obj-$(CONFIG_MACH_DEVKIT8000) += board-devkit8000.o \ + hsmmc.o +diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c b/arch/arm/mach-omap2/board-omap3beagle-camera.c +new file mode 100644 +index 0000000..8387951 +--- /dev/null ++++ b/arch/arm/mach-omap2/board-omap3beagle-camera.c +@@ -0,0 +1,91 @@ ++#include ++#include ++ ++#include ++ ++#include ++ ++#include "devices.h" ++#include "../../../drivers/media/video/omap3isp/isp.h" ++ ++#define MT9P031_RESET_GPIO 98 ++#define MT9P031_XCLK ISP_XCLK_A ++ ++static struct regulator *reg_1v8, *reg_2v8; ++ ++static int beagle_cam_set_xclk(struct v4l2_subdev *subdev, int hz) ++{ ++ struct isp_device *isp = v4l2_dev_to_isp_device(subdev->v4l2_dev); ++ int ret; ++ ++ ret = isp->platform_cb.set_xclk(isp, hz, MT9P031_XCLK); ++ return 0; ++} ++ ++static int beagle_cam_reset(struct v4l2_subdev *subdev, int active) ++{ ++ /* Set RESET_BAR to !active */ ++ gpio_set_value(MT9P031_RESET_GPIO, !active); ++ ++ return 0; ++} ++ ++static struct mt9p031_platform_data beagle_mt9p031_platform_data = { ++ .set_xclk = beagle_cam_set_xclk, ++ .reset = beagle_cam_reset, ++}; ++ ++static struct i2c_board_info mt9p031_camera_i2c_device = { ++ I2C_BOARD_INFO("mt9p031", 0x48), ++ .platform_data = &beagle_mt9p031_platform_data, ++}; ++ ++static struct isp_subdev_i2c_board_info mt9p031_camera_subdevs[] = { ++ { ++ .board_info = &mt9p031_camera_i2c_device, ++ .i2c_adapter_id = 2, ++ }, ++ { NULL, 0, }, ++}; ++ ++static struct isp_v4l2_subdevs_group beagle_camera_subdevs[] = { ++ { ++ .subdevs = mt9p031_camera_subdevs, ++ .interface = ISP_INTERFACE_PARALLEL, ++ .bus = { ++ .parallel = { ++ .data_lane_shift = 0, ++ .clk_pol = 1, ++ .bridge = ISPCTRL_PAR_BRIDGE_DISABLE, ++ } ++ }, ++ }, ++ { }, ++}; ++ ++static struct isp_platform_data beagle_isp_platform_data = { ++ .subdevs = beagle_camera_subdevs, ++}; ++ ++static int __init beagle_camera_init(void) { ++ if(cpu_is_omap3630()){ ++ reg_1v8 = regulator_get(NULL, "cam_1v8"); ++ if (IS_ERR(reg_1v8)) ++ pr_err("%s: cannot get cam_1v8 regulator\n", __func__); ++ else ++ regulator_enable(reg_1v8); ++ ++ reg_2v8 = regulator_get(NULL, "cam_2v8"); ++ if (IS_ERR(reg_2v8)) ++ pr_err("%s: cannot get cam_2v8 regulator\n", __func__); ++ else ++ regulator_enable(reg_2v8); ++ ++ omap_register_i2c_bus(2, 100, NULL, 0); ++ gpio_request(MT9P031_RESET_GPIO, "cam_rst"); ++ gpio_direction_output(MT9P031_RESET_GPIO, 0); ++ omap3_init_camera(&beagle_isp_platform_data); ++ } ++ return 0; ++} ++late_initcall(beagle_camera_init); +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 221bfda..dd6e31f 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -25,12 +25,16 @@ + #include + #include + #include ++#include ++#include ++#include + + #include + #include + #include + #include + ++#include + #include + #include + +@@ -48,6 +52,7 @@ + #include + #include + #include ++#include + + #include "mux.h" + #include "hsmmc.h" +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.39/camera/0003-OMAP3-beagle-only-init-camera-on-3630.patch b/recipes/linux/linux-omap-2.6.39/camera/0003-OMAP3-beagle-only-init-camera-on-3630.patch deleted file mode 100644 index b7efa4e5db..0000000000 --- a/recipes/linux/linux-omap-2.6.39/camera/0003-OMAP3-beagle-only-init-camera-on-3630.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 014b3e447a0a9bbed5e238873fefb1a6c660c6a0 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Wed, 25 May 2011 10:28:29 +0200 -Subject: [PATCH 3/4] OMAP3: beagle: only init camera on 3630 - -Signed-off-by: Koen Kooi ---- - arch/arm/mach-omap2/board-omap3beagle.c | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 9af1cf8..80f8ece 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -1091,10 +1091,12 @@ static void __init omap3_beagle_init(void) - beagle_display_init(); - beagle_opp_init(); - -- /* Enable camera */ -- gpio_request(MT9P031_RESET_GPIO, "cam_rst"); -- gpio_direction_output(MT9P031_RESET_GPIO, 0); -- omap3_init_camera(&beagle_isp_platform_data); -+ if (cpu_is_omap3630()) { -+ /* Enable camera */ -+ gpio_request(MT9P031_RESET_GPIO, "cam_rst"); -+ gpio_direction_output(MT9P031_RESET_GPIO, 0); -+ omap3_init_camera(&beagle_isp_platform_data); -+ } - } - - early_param("buddy", expansionboard_setup); --- -1.6.6.1 - diff --git a/recipes/linux/linux-omap_2.6.39.bb b/recipes/linux/linux-omap_2.6.39.bb index 25ad5b23fc..8c9461ea17 100644 --- a/recipes/linux/linux-omap_2.6.39.bb +++ b/recipes/linux/linux-omap_2.6.39.bb @@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "(beagleboard)" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc SRCREV_pn-${PN} = "v2.6.39" -MACHINE_KERNEL_PR_append = "e" +MACHINE_KERNEL_PR_append = "g" FILESPATHPKG_prepend = "linux-omap-2.6.39:" @@ -53,10 +53,9 @@ SRC_URI_append = " \ file://beagle/0004-OMAP3-beagle-add-regulators-for-camera-interface.patch \ file://beagle/0005-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch \ \ - file://camera/0001-Add-mt9p031-sensor-driver.patch \ - file://camera/0002-OMAP3BEAGLE-Add-support-for-mt9p031-sensor-driver.patch \ - file://camera/0003-OMAP3-beagle-only-init-camera-on-3630.patch \ - file://camera/0004-v4l-Add-mt9v032-sensor-driver.patch \ + file://camera/0001-Add-support-for-mt9p031-Aptina-Micron-sensor.patch \ + file://camera/0002-v4l-Add-mt9v032-sensor-driver.patch \ + file://camera/0003-Add-support-for-mt9p031-LI-5M03-module-in-Beagleboar.patch \ \ file://pm/linux-omap-2.6.39-ti-pm/0001-OMAP3-voltage-remove-spurious-pr_notice-for-debugfs.patch \ file://pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch \ From 36365dd466291a8dac06b006f4dc708a0e36d404 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 3 Jun 2011 23:01:20 +0200 Subject: [PATCH 356/509] linux-omap 2.6.39: sync with meta-texasinstruments again Signed-off-by: Koen Kooi --- ...er-for-Aptina-Micron-mt9p031-sensor.patch} | 122 +++++++++++++++--- .../0002-v4l-Add-mt9v032-sensor-driver.patch | 2 +- ...mt9p031-LI-5M03-module-in-Beagleboar.patch | 56 ++++---- recipes/linux/linux-omap_2.6.39.bb | 4 +- 4 files changed, 137 insertions(+), 47 deletions(-) rename recipes/linux/linux-omap-2.6.39/camera/{0001-Add-support-for-mt9p031-Aptina-Micron-sensor.patch => 0001-Add-driver-for-Aptina-Micron-mt9p031-sensor.patch} (86%) diff --git a/recipes/linux/linux-omap-2.6.39/camera/0001-Add-support-for-mt9p031-Aptina-Micron-sensor.patch b/recipes/linux/linux-omap-2.6.39/camera/0001-Add-driver-for-Aptina-Micron-mt9p031-sensor.patch similarity index 86% rename from recipes/linux/linux-omap-2.6.39/camera/0001-Add-support-for-mt9p031-Aptina-Micron-sensor.patch rename to recipes/linux/linux-omap-2.6.39/camera/0001-Add-driver-for-Aptina-Micron-mt9p031-sensor.patch index 7f68de4048..b0d8736113 100644 --- a/recipes/linux/linux-omap-2.6.39/camera/0001-Add-support-for-mt9p031-Aptina-Micron-sensor.patch +++ b/recipes/linux/linux-omap-2.6.39/camera/0001-Add-driver-for-Aptina-Micron-mt9p031-sensor.patch @@ -1,18 +1,28 @@ -From 244f96b15afbd73942762e2c07523d6c5cf68a7e Mon Sep 17 00:00:00 2001 +From bb84d2eef0f0487c4bcdf06e45dd64821de27b44 Mon Sep 17 00:00:00 2001 From: Javier Martin -Date: Tue, 31 May 2011 11:46:49 +0200 -Subject: [PATCH 1/3] Add support for mt9p031 Aptina (Micron) sensor. +Date: Wed, 1 Jun 2011 17:36:48 +0200 +Subject: [PATCH 1/3] Add driver for Aptina (Micron) mt9p031 sensor. -This patch adds basic support (no controls) for -mt9p031 sensor. It applies on kernel 2.6.39. +Clock frequency of 57MHz used in previous version was wrong since +when VDD_IO is 1.8V it can only support 48MHz. + +Two new platform flags have been added: + +- vdd_io: indicates whether the chip is powered with 1.8 or 2.8 VDD_IO. +So that it can use the maximum allowed frequency. +- version: monochrome and color versions of the chip have exactly +the same ID, so the only way to select one of them is through +platform data. + +Internal PLL is now used to generate PIXCLK depending on VDD_IO. Signed-off-by: Javier Martin --- drivers/media/video/Kconfig | 7 + drivers/media/video/Makefile | 1 + - drivers/media/video/mt9p031.c | 699 +++++++++++++++++++++++++++++++++++++++++ - include/media/mt9p031.h | 11 + - 4 files changed, 718 insertions(+), 0 deletions(-) + drivers/media/video/mt9p031.c | 763 +++++++++++++++++++++++++++++++++++++++++ + include/media/mt9p031.h | 23 ++ + 4 files changed, 794 insertions(+), 0 deletions(-) create mode 100644 drivers/media/video/mt9p031.c create mode 100644 include/media/mt9p031.h @@ -48,10 +58,10 @@ index ace5d8b..912b29b 100644 obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o diff --git a/drivers/media/video/mt9p031.c b/drivers/media/video/mt9p031.c new file mode 100644 -index 0000000..61b46a0 +index 0000000..cd830b1 --- /dev/null +++ b/drivers/media/video/mt9p031.c -@@ -0,0 +1,699 @@ +@@ -0,0 +1,763 @@ +/* + * Driver for MT9P031 CMOS Image Sensor from Aptina + * @@ -80,7 +90,7 @@ index 0000000..61b46a0 +#include +#include + -+#define MT9P031_PIXCLK_FREQ 54000000 ++#define MT9P031_EXTCLK_FREQ 20000000 + +#define MT9P031_CHIP_VERSION 0x00 +#define MT9P031_CHIP_VERSION_VALUE 0x1801 @@ -109,6 +119,18 @@ index 0000000..61b46a0 +#define MT9P031_OUTPUT_CONTROL_SYN 1 +#define MT9P031_SHUTTER_WIDTH_UPPER 0x08 +#define MT9P031_SHUTTER_WIDTH 0x09 ++#define MT9P031_PLL_CONTROL 0x10 ++#define MT9P031_PLL_CONTROL_PWROFF 0x0050 ++#define MT9P031_PLL_CONTROL_PWRON 0x0051 ++#define MT9P031_PLL_CONTROL_USEPLL 0x0052 ++#define MT9P031_PLL_CONFIG_1 0x11 ++#define MT9P031_PLL_CONFIG_1_M_48MHZ 0x5000 ++#define MT9P031_PLL_CONFIG_1_N_48MHZ 0x05 ++#define MT9P031_PLL_CONFIG_1_M_96MHZ 0x3600 ++#define MT9P031_PLL_CONFIG_1_N_96MHZ 0x05 ++#define MT9P031_PLL_CONFIG_2 0x12 ++#define MT9P031_PLL_CONFIG_2_P1_48MHZ 5 ++#define MT9P031_PLL_CONFIG_2_P1_96MHZ 2 +#define MT9P031_PIXEL_CLOCK_CONTROL 0x0a +#define MT9P031_FRAME_RESTART 0x0b +#define MT9P031_SHUTTER_DELAY 0x0c @@ -123,9 +145,6 @@ index 0000000..61b46a0 +#define MT9P031_COLUMN_ADDRESS_MODE 0x23 +#define MT9P031_GLOBAL_GAIN 0x35 + -+ -+ -+ +struct mt9p031 { + struct v4l2_subdev subdev; + struct media_pad pad; @@ -199,7 +218,7 @@ index 0000000..61b46a0 + } + /* Emable clock */ + if (mt9p031->pdata->set_xclk) -+ mt9p031->pdata->set_xclk(&mt9p031->subdev, MT9P031_PIXCLK_FREQ); ++ mt9p031->pdata->set_xclk(&mt9p031->subdev, MT9P031_EXTCLK_FREQ); + /* Now RESET_BAR must be high */ + if (mt9p031->pdata->reset) { + mt9p031->pdata->reset(&mt9p031->subdev, 0); @@ -526,6 +545,51 @@ index 0000000..61b46a0 + return 0; +} + ++static int mt9p031_pll_enable(struct i2c_client *client) ++{ ++ struct mt9p031 *mt9p031 = to_mt9p031(client); ++ int ret; ++ ++ ret = reg_write(client, MT9P031_PLL_CONTROL, MT9P031_PLL_CONTROL_PWRON); ++ if (ret < 0) ++ return ret; ++ ++ /* Always set the maximum frequency allowed by VDD_IO */ ++ if (mt9p031->pdata->vdd_io == MT9P031_VDD_IO_2V8) { ++ ret = reg_write(client, MT9P031_PLL_CONFIG_1, ++ MT9P031_PLL_CONFIG_1_M_96MHZ | ++ MT9P031_PLL_CONFIG_1_N_96MHZ); ++ if (ret < 0) ++ return ret; ++ ret = reg_write(client, MT9P031_PLL_CONFIG_2, ++ MT9P031_PLL_CONFIG_2_P1_96MHZ); ++ if (ret < 0) ++ return ret; ++ } else { ++ ret = reg_write(client, MT9P031_PLL_CONFIG_1, ++ MT9P031_PLL_CONFIG_1_M_48MHZ | ++ MT9P031_PLL_CONFIG_1_N_48MHZ); ++ if (ret < 0) ++ return ret; ++ ret = reg_write(client, MT9P031_PLL_CONFIG_2, ++ MT9P031_PLL_CONFIG_2_P1_48MHZ); ++ if (ret < 0) ++ return ret; ++ } ++ mdelay(1); ++ ret = reg_write(client, MT9P031_PLL_CONTROL, ++ MT9P031_PLL_CONTROL_PWRON | ++ MT9P031_PLL_CONTROL_USEPLL); ++ mdelay(1); ++ return ret; ++} ++ ++static inline int mt9p031_pll_disable(struct i2c_client *client) ++{ ++ return reg_write(client, MT9P031_PLL_CONTROL, ++ MT9P031_PLL_CONTROL_PWROFF); ++} ++ +static int mt9p031_s_stream(struct v4l2_subdev *sd, int enable) +{ + struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); @@ -542,10 +606,16 @@ index 0000000..61b46a0 + /* Switch to master "normal" mode */ + ret = mt9p031_set_output_control(mt9p031, 0, + MT9P031_OUTPUT_CONTROL_CEN); ++ if (ret < 0) ++ return ret; ++ ret = mt9p031_pll_enable(client); + } else { + /* Stop sensor readout */ + ret = mt9p031_set_output_control(mt9p031, + MT9P031_OUTPUT_CONTROL_CEN, 0); ++ if (ret < 0) ++ return ret; ++ ret = mt9p031_pll_disable(client); + } + return ret; +} @@ -630,7 +700,11 @@ index 0000000..61b46a0 + mt9p031->rect.left = MT9P031_COLUMN_START_DEF; + mt9p031->rect.top = MT9P031_ROW_START_DEF; + -+ mt9p031->format.code = V4L2_MBUS_FMT_SGRBG12_1X12; ++ if (mt9p031->pdata->version == MT9P031_MONOCHROME_VERSION) ++ mt9p031->format.code = V4L2_MBUS_FMT_Y12_1X12; ++ else ++ mt9p031->format.code = V4L2_MBUS_FMT_SGRBG12_1X12; ++ + mt9p031->format.width = MT9P031_WINDOW_WIDTH_DEF; + mt9p031->format.height = MT9P031_WINDOW_HEIGHT_DEF; + mt9p031->format.field = V4L2_FIELD_NONE; @@ -753,18 +827,30 @@ index 0000000..61b46a0 +MODULE_LICENSE("GPL v2"); diff --git a/include/media/mt9p031.h b/include/media/mt9p031.h new file mode 100644 -index 0000000..ad37eb3 +index 0000000..27b4c75 --- /dev/null +++ b/include/media/mt9p031.h -@@ -0,0 +1,11 @@ +@@ -0,0 +1,23 @@ +#ifndef MT9P031_H +#define MT9P031_H + +struct v4l2_subdev; + ++enum { ++ MT9P031_COLOR_VERSION = 0, ++ MT9P031_MONOCHROME_VERSION = 1, ++}; ++ ++enum { ++ MT9P031_VDD_IO_1V8 = 0, ++ MT9P031_VDD_IO_2V8 = 1, ++}; ++ +struct mt9p031_platform_data { + int (*set_xclk)(struct v4l2_subdev *subdev, int hz); + int (*reset)(struct v4l2_subdev *subdev, int active); ++ int vdd_io; /* MT9P031_VDD_IO_1V8 or MT9P031_VDD_IO_2V8 */ ++ int version; /* MT9P031_COLOR_VERSION or MT9P031_MONOCHROME_VERSION */ +}; + +#endif diff --git a/recipes/linux/linux-omap-2.6.39/camera/0002-v4l-Add-mt9v032-sensor-driver.patch b/recipes/linux/linux-omap-2.6.39/camera/0002-v4l-Add-mt9v032-sensor-driver.patch index 2b7e9557f2..66353eaabf 100644 --- a/recipes/linux/linux-omap-2.6.39/camera/0002-v4l-Add-mt9v032-sensor-driver.patch +++ b/recipes/linux/linux-omap-2.6.39/camera/0002-v4l-Add-mt9v032-sensor-driver.patch @@ -1,4 +1,4 @@ -From 78fdfee2f749cdcdfa69a008b70c4e5629b9c9df Mon Sep 17 00:00:00 2001 +From 55d8ca4b03eb04432adefa6fbf6e5f0197c7fb32 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Sun, 28 Nov 2010 19:07:20 +0100 Subject: [PATCH 2/3] v4l: Add mt9v032 sensor driver diff --git a/recipes/linux/linux-omap-2.6.39/camera/0003-Add-support-for-mt9p031-LI-5M03-module-in-Beagleboar.patch b/recipes/linux/linux-omap-2.6.39/camera/0003-Add-support-for-mt9p031-LI-5M03-module-in-Beagleboar.patch index 9f7fb006e2..31c525e223 100644 --- a/recipes/linux/linux-omap-2.6.39/camera/0003-Add-support-for-mt9p031-LI-5M03-module-in-Beagleboar.patch +++ b/recipes/linux/linux-omap-2.6.39/camera/0003-Add-support-for-mt9p031-LI-5M03-module-in-Beagleboar.patch @@ -1,4 +1,4 @@ -From 6cce194e3d1fbc5d746b192b4d1ff78aef6099cf Mon Sep 17 00:00:00 2001 +From c53e55e3d361eb79bc8fc27971428fc37d804ea9 Mon Sep 17 00:00:00 2001 From: Javier Martin Date: Mon, 30 May 2011 10:37:17 +0200 Subject: [PATCH 3/3] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM. @@ -10,9 +10,9 @@ in Beagleboard xM. Signed-off-by: Javier Martin --- arch/arm/mach-omap2/Makefile | 1 + - arch/arm/mach-omap2/board-omap3beagle-camera.c | 91 ++++++++++++++++++++++++ - arch/arm/mach-omap2/board-omap3beagle.c | 5 ++ - 3 files changed, 97 insertions(+), 0 deletions(-) + arch/arm/mach-omap2/board-omap3beagle-camera.c | 95 ++++++++++++++++++++++++ + arch/arm/mach-omap2/board-omap3beagle.c | 5 + + 3 files changed, 101 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-omap2/board-omap3beagle-camera.c diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile @@ -29,17 +29,17 @@ index 512b152..05cd983 100644 hsmmc.o diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c b/arch/arm/mach-omap2/board-omap3beagle-camera.c new file mode 100644 -index 0000000..8387951 +index 0000000..2632557 --- /dev/null +++ b/arch/arm/mach-omap2/board-omap3beagle-camera.c -@@ -0,0 +1,91 @@ +@@ -0,0 +1,95 @@ +#include +#include + +#include + +#include -+ ++#include +#include "devices.h" +#include "../../../drivers/media/video/omap3isp/isp.h" + @@ -68,6 +68,8 @@ index 0000000..8387951 +static struct mt9p031_platform_data beagle_mt9p031_platform_data = { + .set_xclk = beagle_cam_set_xclk, + .reset = beagle_cam_reset, ++ .vdd_io = MT9P031_VDD_IO_1V8, ++ .version = MT9P031_COLOR_VERSION, +}; + +static struct i2c_board_info mt9p031_camera_i2c_device = { @@ -102,25 +104,27 @@ index 0000000..8387951 + .subdevs = beagle_camera_subdevs, +}; + -+static int __init beagle_camera_init(void) { -+ if(cpu_is_omap3630()){ -+ reg_1v8 = regulator_get(NULL, "cam_1v8"); -+ if (IS_ERR(reg_1v8)) -+ pr_err("%s: cannot get cam_1v8 regulator\n", __func__); -+ else -+ regulator_enable(reg_1v8); -+ -+ reg_2v8 = regulator_get(NULL, "cam_2v8"); -+ if (IS_ERR(reg_2v8)) -+ pr_err("%s: cannot get cam_2v8 regulator\n", __func__); -+ else -+ regulator_enable(reg_2v8); -+ -+ omap_register_i2c_bus(2, 100, NULL, 0); -+ gpio_request(MT9P031_RESET_GPIO, "cam_rst"); -+ gpio_direction_output(MT9P031_RESET_GPIO, 0); -+ omap3_init_camera(&beagle_isp_platform_data); -+ } ++static int __init beagle_camera_init(void) ++{ ++ if (!machine_is_omap3_beagle() || !cpu_is_omap3630()) ++ return 0; ++ ++ reg_1v8 = regulator_get(NULL, "cam_1v8"); ++ if (IS_ERR(reg_1v8)) ++ pr_err("%s: cannot get cam_1v8 regulator\n", __func__); ++ else ++ regulator_enable(reg_1v8); ++ ++ reg_2v8 = regulator_get(NULL, "cam_2v8"); ++ if (IS_ERR(reg_2v8)) ++ pr_err("%s: cannot get cam_2v8 regulator\n", __func__); ++ else ++ regulator_enable(reg_2v8); ++ ++ omap_register_i2c_bus(2, 100, NULL, 0); ++ gpio_request(MT9P031_RESET_GPIO, "cam_rst"); ++ gpio_direction_output(MT9P031_RESET_GPIO, 0); ++ omap3_init_camera(&beagle_isp_platform_data); + return 0; +} +late_initcall(beagle_camera_init); diff --git a/recipes/linux/linux-omap_2.6.39.bb b/recipes/linux/linux-omap_2.6.39.bb index 8c9461ea17..5b1c797532 100644 --- a/recipes/linux/linux-omap_2.6.39.bb +++ b/recipes/linux/linux-omap_2.6.39.bb @@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "(beagleboard)" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc SRCREV_pn-${PN} = "v2.6.39" -MACHINE_KERNEL_PR_append = "g" +MACHINE_KERNEL_PR_append = "h" FILESPATHPKG_prepend = "linux-omap-2.6.39:" @@ -53,7 +53,7 @@ SRC_URI_append = " \ file://beagle/0004-OMAP3-beagle-add-regulators-for-camera-interface.patch \ file://beagle/0005-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch \ \ - file://camera/0001-Add-support-for-mt9p031-Aptina-Micron-sensor.patch \ + file://camera/0001-Add-driver-for-Aptina-Micron-mt9p031-sensor.patch \ file://camera/0002-v4l-Add-mt9v032-sensor-driver.patch \ file://camera/0003-Add-support-for-mt9p031-LI-5M03-module-in-Beagleboar.patch \ \ From 232d17739bc6d3e5e2b55fdfeecc902c39366a8c Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 2 Jun 2011 12:16:11 -0700 Subject: [PATCH 357/509] sourceipk: allow override of the section Signed-off-by: Chris Larson Signed-off-by: Koen Kooi --- classes/sourceipk.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/classes/sourceipk.bbclass b/classes/sourceipk.bbclass index b37bbf9aa9..a92e462325 100644 --- a/classes/sourceipk.bbclass +++ b/classes/sourceipk.bbclass @@ -50,6 +50,9 @@ SRCIPK_INSTALL_DIR ?= "/usr/src/${PN}-src" # Default PACKAGE_ARCH for sources is "all" SRCIPK_PACKAGE_ARCH ?= "all" +# Default section matches the recipe section +SRCIPK_SECTION ?= "${SECTION}" + # Default SRCIPK_INCLUDE_EXTRAFILES is to include the extra files SRCIPK_INCLUDE_EXTRAFILES ?= "1" @@ -86,7 +89,7 @@ sourceipk_do_create_srcipk() { echo "Package: ${PN}-src" > $control_file echo "Version: ${PV}-${PR}" >> $control_file echo "Description: Patched sources for ${PN}" >> $control_file - echo "Section: ${SECTION}" >> $control_file + echo "Section: ${SRCIPK_SECTION}" >> $control_file echo "Priority: Optional" >> $control_file echo "Maintainer: ${MAINTAINER}" >> $control_file echo "License: ${LICENSE}" >> $control_file From 5bf18d55f10f5ce25d204c1a8d4079598f797c8a Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 2 Jun 2011 12:16:21 -0700 Subject: [PATCH 358/509] sourceipk: use tar to get the files copied, rather than cp Signed-off-by: Chris Larson Signed-off-by: Koen Kooi --- classes/sourceipk.bbclass | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/classes/sourceipk.bbclass b/classes/sourceipk.bbclass index a92e462325..8214f78ecf 100644 --- a/classes/sourceipk.bbclass +++ b/classes/sourceipk.bbclass @@ -108,17 +108,9 @@ sourceipk_do_create_srcipk() { # Copy sources for packaging mkdir -p $tmp_dir/${SRCIPK_INSTALL_DIR} - cp -RLf ${S}/* $tmp_dir/${SRCIPK_INSTALL_DIR}/ - # Copy any hidden files in the source directory such as - # eclipse project files. Use a regex to avoid trying to - # copy the . and .. directories. This is only required for - # the top-level directory as the hidden files will be copied - # for subdiretories. - hidden_files=`find ${S} -maxdepth 1 -name ".*"` - for f in $hidden_files - do - cp -rf $f $tmp_dir/${SRCIPK_INSTALL_DIR}/ - done + if [ -e ${S} ]; then + tar -C ${S} -cO . | tar -C $tmp_dir/${SRCIPK_INSTALL_DIR} -xpf - + fi if [ ${SRCIPK_INCLUDE_EXTRAFILES} != "0" ] then From 6f9ce805184640b0298ba299005898d3449ee847 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 2 Jun 2011 12:16:29 -0700 Subject: [PATCH 359/509] sourceipk: deal with compileconfigs only when it exists Signed-off-by: Chris Larson Signed-off-by: Koen Kooi --- classes/sourceipk.bbclass | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/classes/sourceipk.bbclass b/classes/sourceipk.bbclass index 8214f78ecf..eb313a1f3f 100644 --- a/classes/sourceipk.bbclass +++ b/classes/sourceipk.bbclass @@ -139,18 +139,14 @@ EXPORT_FUNCTIONS do_create_srcipk do_create_srcipk[deptask] = "do_patch" -# Add a blank compileconfigs task. This allows the sourceipk to schedule -# its copy of the sources for kernels using the multi-kernel functionality -# before the compileconfigs task. Failure to do this results in a race -# condition where in the best case the sources packaged may contain binary -# builds and in the worst case binary files being cleaned cause an error -# in the copy command for the sourceipk. -do_compileconfigs() { - : -} -addtask compileconfigs after do_patch before do_configure +addtask create_srcipk after do_patch before do_configure -addtask create_srcipk after do_patch before do_compileconfigs +python () { + if d.getVar('do_compileconfigs', False): + deps = d.getVarFlag('do_compileconfigs', 'deps') or [] + deps.append('do_create_srcipk') + d.setVarFlag('do_compileconfigs', 'deps', deps) +} #Add source packages to list of packages OE knows about PACKAGES_DYNAMIC += "${PN}-src" From cd3815b6e5906c5a485fc216faf6608c0a2f0162 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 2 Jun 2011 12:16:37 -0700 Subject: [PATCH 360/509] sourceipk: exclude temp dirs when S == WORKDIR Signed-off-by: Chris Larson Signed-off-by: Koen Kooi --- classes/sourceipk.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/classes/sourceipk.bbclass b/classes/sourceipk.bbclass index eb313a1f3f..1b63996997 100644 --- a/classes/sourceipk.bbclass +++ b/classes/sourceipk.bbclass @@ -109,7 +109,10 @@ sourceipk_do_create_srcipk() { # Copy sources for packaging mkdir -p $tmp_dir/${SRCIPK_INSTALL_DIR} if [ -e ${S} ]; then - tar -C ${S} -cO . | tar -C $tmp_dir/${SRCIPK_INSTALL_DIR} -xpf - + if [ "${S}" = "${WORKDIR}" ]; then + excludes='--exclude ./temp/\* --exclude ./sourceipk-tmp/\* --exclude ./sourceipk-data/\*' + fi + tar -C ${S} -cO $excludes . | tar -C $tmp_dir/${SRCIPK_INSTALL_DIR} -xpf - fi if [ ${SRCIPK_INCLUDE_EXTRAFILES} != "0" ] From 9af8f001e90c1d002828b626ef4f5540ecd34d08 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 3 Jun 2011 13:10:53 +0200 Subject: [PATCH 361/509] libxaw: fix depchains xserver-xorg-dev can't be installed without this Signed-off-by: Koen Kooi --- recipes/xorg-lib/libxaw_1.0.9.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/xorg-lib/libxaw_1.0.9.bb b/recipes/xorg-lib/libxaw_1.0.9.bb index a4d2cf4916..1d472c3566 100644 --- a/recipes/xorg-lib/libxaw_1.0.9.bb +++ b/recipes/xorg-lib/libxaw_1.0.9.bb @@ -2,7 +2,7 @@ require xorg-lib-common.inc DESCRIPTION = "X Athena Widget Set" DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" PE = "1" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI[archive.md5sum] = "ccc57478c41b7a75b9702241b889b1d4" SRC_URI[archive.sha256sum] = "a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037" @@ -22,4 +22,7 @@ FILES_libxaw6 = "${libdir}/libXaw*.so.6*" FILES_libxaw7 = "${libdir}/libXaw*.so.7*" FILES_libxaw8 = "${libdir}/libXaw8.so.8*" +# fix -dev depchains +ALLOW_EMPTY_${PN} = 1 + XORG_PN = "libXaw" From 5e4e2197e4696bcd04fd5ba163047035da785cd7 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Mon, 28 Mar 2011 12:59:17 +0200 Subject: [PATCH 362/509] tzcode-native: update to 2011d Signed-off-by: Antonio Ospite Acked-by: Mike Westerhof Signed-off-by: Denys Dmytriyenko --- .../{tzcode-native_2011b.bb => tzcode-native_2011d.bb} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename recipes/tzcode/{tzcode-native_2011b.bb => tzcode-native_2011d.bb} (51%) diff --git a/recipes/tzcode/tzcode-native_2011b.bb b/recipes/tzcode/tzcode-native_2011d.bb similarity index 51% rename from recipes/tzcode/tzcode-native_2011b.bb rename to recipes/tzcode/tzcode-native_2011d.bb index 30996d9d76..1cc77570f2 100644 --- a/recipes/tzcode/tzcode-native_2011b.bb +++ b/recipes/tzcode/tzcode-native_2011d.bb @@ -6,11 +6,11 @@ require tzcode-native.inc # Also, tzdata (and it is needed to build tzcode) version can differ from # tzcode version, thus this variable -TZDATA_PV = "2011b" +TZDATA_PV = "2011d" PR = "${INC_PR}.0" -SRC_URI[tzcode-2011b.md5sum] = "c63a1425f7252aef1fe54a258cdccff8" -SRC_URI[tzcode-2011b.sha256sum] = "8031d05102e5c5109521a282aaab0629680bec82db783c716905802313678d67" -SRC_URI[tzdata-2011b.md5sum] = "9eaf3ca354c42a32bd28e623539bf0e0" -SRC_URI[tzdata-2011b.sha256sum] = "ff45f5ddc2ec925249626d00d7bc2ffff587e0956a1d8245517a023bf27e4cc9" +SRC_URI[tzcode-2011d.md5sum] = "95095242ee368e6a7e107f154590ac11" +SRC_URI[tzcode-2011d.sha256sum] = "68f2c07471c5390199c09fe9fee6a22f8a4dac24713af88b92da17b33ad98cc7" +SRC_URI[tzdata-2011d.md5sum] = "03c5793502b7c41985edd73146bf7e36" +SRC_URI[tzdata-2011d.sha256sum] = "415a54774094e8dcdc9ba141fafbee4b3b2f2140a5b8cf012eea4b37fb9a23bd" From 21266a75ff15ea005e3d8de6757ff04876b3c7b6 Mon Sep 17 00:00:00 2001 From: Bob Foerster Date: Tue, 5 Apr 2011 07:28:25 -0400 Subject: [PATCH 363/509] tzcode-native: update to 2011e Signed-off-by: Bob Foerster Signed-off-by: Antonio Ospite Signed-off-by: Denys Dmytriyenko --- .../{tzcode-native_2011d.bb => tzcode-native_2011e.bb} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename recipes/tzcode/{tzcode-native_2011d.bb => tzcode-native_2011e.bb} (51%) diff --git a/recipes/tzcode/tzcode-native_2011d.bb b/recipes/tzcode/tzcode-native_2011e.bb similarity index 51% rename from recipes/tzcode/tzcode-native_2011d.bb rename to recipes/tzcode/tzcode-native_2011e.bb index 1cc77570f2..2bf4f4cee9 100644 --- a/recipes/tzcode/tzcode-native_2011d.bb +++ b/recipes/tzcode/tzcode-native_2011e.bb @@ -6,11 +6,11 @@ require tzcode-native.inc # Also, tzdata (and it is needed to build tzcode) version can differ from # tzcode version, thus this variable -TZDATA_PV = "2011d" +TZDATA_PV = "2011e" PR = "${INC_PR}.0" -SRC_URI[tzcode-2011d.md5sum] = "95095242ee368e6a7e107f154590ac11" -SRC_URI[tzcode-2011d.sha256sum] = "68f2c07471c5390199c09fe9fee6a22f8a4dac24713af88b92da17b33ad98cc7" -SRC_URI[tzdata-2011d.md5sum] = "03c5793502b7c41985edd73146bf7e36" -SRC_URI[tzdata-2011d.sha256sum] = "415a54774094e8dcdc9ba141fafbee4b3b2f2140a5b8cf012eea4b37fb9a23bd" +SRC_URI[tzcode-2011e.md5sum] = "fbfc05dbf9ebcfe7c4bba18549870173" +SRC_URI[tzcode-2011e.sha256sum] = "8fb00f8763aa51d83d6f3190d144124bb7176ca829fc08823d6205297bf0426b" +SRC_URI[tzdata-2011e.md5sum] = "044a07072300a0ee72b046e5a9a4ec90" +SRC_URI[tzdata-2011e.sha256sum] = "44fef01de4589a4979eb6b5fdbbfd21a3b135852af1ecbfb9e0368ae47392c79" From 397f8f354db0634f7bea807a614530892841cb85 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 23 May 2011 14:55:00 +0200 Subject: [PATCH 364/509] x-load git: bump SRCREV tested on beagleboard/angstrom Signed-off-by: Koen Kooi Signed-off-by: Denys Dmytriyenko --- recipes/x-load/x-load_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/x-load/x-load_git.bb b/recipes/x-load/x-load_git.bb index 17a33b86b9..85ee9697ac 100644 --- a/recipes/x-load/x-load_git.bb +++ b/recipes/x-load/x-load_git.bb @@ -5,10 +5,10 @@ DEFAULT_PREFERENCE_omap3-pandora = "-1" FILESPATHPKG_prepend = "x-load-git:x-load-git/${MACHINE}" PV = "1.5.0+${PR}+gitr${SRCREV}" -PR ="r22" +PR ="r23" PE = "1" -SRCREV = "b6bbfe7848de547b64edf1c363c86cec4921b517" +SRCREV = "04b1732220078d47c18a84cbafc52e45db71f13d" SRC_URI = "git://gitorious.org/x-loader/x-loader.git;branch=master;protocol=git \ " From 5a11de0164c9ad90e82adfa84320c7469b74bb1e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 7 Jun 2011 12:36:14 +0200 Subject: [PATCH 365/509] x-load: sync with meta-texasinstruments for beagle C5 support Signed-off-by: Koen Kooi Signed-off-by: Denys Dmytriyenko --- .../0001-Beagle-Rev-C5-support.patch | 60 +++++++++++++++++++ recipes/x-load/x-load_git.bb | 3 +- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 recipes/x-load/x-load-git/0001-Beagle-Rev-C5-support.patch diff --git a/recipes/x-load/x-load-git/0001-Beagle-Rev-C5-support.patch b/recipes/x-load/x-load-git/0001-Beagle-Rev-C5-support.patch new file mode 100644 index 0000000000..1c67bd359d --- /dev/null +++ b/recipes/x-load/x-load-git/0001-Beagle-Rev-C5-support.patch @@ -0,0 +1,60 @@ +From 992eb6ff881792f5c753ef6c85be0ceb2d162c78 Mon Sep 17 00:00:00 2001 +From: Joel Fernandes +Date: Tue, 7 Jun 2011 09:50:03 +0200 +Subject: [PATCH] Beagle Rev C5 support + +--- + board/omap3530beagle/omap3530beagle.c | 16 ++++++++++++++++ + 1 files changed, 16 insertions(+), 0 deletions(-) + +diff --git a/board/omap3530beagle/omap3530beagle.c b/board/omap3530beagle/omap3530beagle.c +index 15943f5..2b8c3c0 100644 +--- a/board/omap3530beagle/omap3530beagle.c ++++ b/board/omap3530beagle/omap3530beagle.c +@@ -281,6 +281,7 @@ u32 wait_on_value(u32 read_bit_mask, u32 match_value, u32 read_addr, u32 bound) + + #define MICRON_DDR 0 + #define NUMONYX_MCP 1 ++#define MICRON_MCP 2 + int identify_xm_ddr() + { + int mfr, id; +@@ -303,6 +304,8 @@ int identify_xm_ddr() + return MICRON_DDR; + if ((mfr == 0x20) && (id == 0xba)) + return NUMONYX_MCP; ++ if ((mfr == 0x2c) && (id == 0xbc)) ++ return MICRON_MCP; + } + /********************************************************************* + * config_3430sdram_ddr() - Init DDR on 3430SDP dev board. +@@ -329,6 +332,17 @@ void config_3430sdram_ddr(void) + __raw_writel(NUMONYX_V_ACTIMB_165, SDRC_ACTIM_CTRLB_1); + __raw_writel(SDP_3430_SDRC_RFR_CTRL_165MHz, SDRC_RFR_CTRL_0); + __raw_writel(SDP_3430_SDRC_RFR_CTRL_165MHz, SDRC_RFR_CTRL_1); ++ } else if (identify_xm_ddr() == MICRON_MCP) { ++ /* Beagleboard Rev C5 */ ++ __raw_writel(0x2, SDRC_CS_CFG); /* 256MB/bank */ ++ __raw_writel(SDP_SDRC_MDCFG_0_DDR_MICRON_XM, SDRC_MCFG_0); ++ __raw_writel(SDP_SDRC_MDCFG_0_DDR_MICRON_XM, SDRC_MCFG_1); ++ __raw_writel(MICRON_V_ACTIMA_200, SDRC_ACTIM_CTRLA_0); ++ __raw_writel(MICRON_V_ACTIMB_200, SDRC_ACTIM_CTRLB_0); ++ __raw_writel(MICRON_V_ACTIMA_200, SDRC_ACTIM_CTRLA_1); ++ __raw_writel(MICRON_V_ACTIMB_200, SDRC_ACTIM_CTRLB_1); ++ __raw_writel(SDP_3430_SDRC_RFR_CTRL_200MHz, SDRC_RFR_CTRL_0); ++ __raw_writel(SDP_3430_SDRC_RFR_CTRL_200MHz, SDRC_RFR_CTRL_1); + } else { + __raw_writel(0x1, SDRC_CS_CFG); /* 128MB/bank */ + __raw_writel(SDP_SDRC_MDCFG_0_DDR, SDRC_MCFG_0); +@@ -699,6 +713,8 @@ int misc_init_r(void) + case REVISION_C4: + if (identify_xm_ddr() == NUMONYX_MCP) + printf("Beagle Rev C4 from Special Computing\n"); ++ else if(identify_xm_ddr() == MICRON_MCP) ++ printf("Beagle Rev C5\n"); + else + printf("Beagle Rev C4\n"); + break; +-- +1.6.6.1 + diff --git a/recipes/x-load/x-load_git.bb b/recipes/x-load/x-load_git.bb index 85ee9697ac..17fe369299 100644 --- a/recipes/x-load/x-load_git.bb +++ b/recipes/x-load/x-load_git.bb @@ -5,11 +5,12 @@ DEFAULT_PREFERENCE_omap3-pandora = "-1" FILESPATHPKG_prepend = "x-load-git:x-load-git/${MACHINE}" PV = "1.5.0+${PR}+gitr${SRCREV}" -PR ="r23" +PR ="r24" PE = "1" SRCREV = "04b1732220078d47c18a84cbafc52e45db71f13d" SRC_URI = "git://gitorious.org/x-loader/x-loader.git;branch=master;protocol=git \ + file://0001-Beagle-Rev-C5-support.patch \ " XLOAD_MACHINE_beagleboard = "omap3530beagle_config" From 27ab7f4590d0e2cf3db8b4465c7647a05917b085 Mon Sep 17 00:00:00 2001 From: Jeff Lance Date: Tue, 7 Jun 2011 00:05:04 +0000 Subject: [PATCH 366/509] matrix_gui: Update SRCREV to revision 257 * Adding arm only multimedia apps to am37x * Wifi updates to am37x, am180x * Adding to am180x, am37x, am35x, beagle: * Oprofile example Signed-off-by: Jeff Lance Signed-off-by: Denys Dmytriyenko --- recipes/ti/matrix-gui-common_1.4.bb | 4 ++-- recipes/ti/matrix-gui-e_1.3.bb | 4 ++-- recipes/ti/matrix-gui_1.3.bb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/ti/matrix-gui-common_1.4.bb b/recipes/ti/matrix-gui-common_1.4.bb index 6f7376deb8..0b4b25b8d1 100644 --- a/recipes/ti/matrix-gui-common_1.4.bb +++ b/recipes/ti/matrix-gui-common_1.4.bb @@ -4,5 +4,5 @@ require matrix-gui-common.inc # prebuilt version in the repository. RRECOMMENDS_${PN} = "am-sysinfo" -SRCREV = "249" -PR = "${INC_PR}.10" +SRCREV = "257" +PR = "${INC_PR}.11" diff --git a/recipes/ti/matrix-gui-e_1.3.bb b/recipes/ti/matrix-gui-e_1.3.bb index 8f2df1cafc..a6eb17fe62 100644 --- a/recipes/ti/matrix-gui-e_1.3.bb +++ b/recipes/ti/matrix-gui-e_1.3.bb @@ -1,5 +1,5 @@ require matrix-gui-e.inc -SRCREV = "249" -PR = "${INC_PR}.9" +SRCREV = "257" +PR = "${INC_PR}.10" diff --git a/recipes/ti/matrix-gui_1.3.bb b/recipes/ti/matrix-gui_1.3.bb index f7e56a3533..51678df28b 100644 --- a/recipes/ti/matrix-gui_1.3.bb +++ b/recipes/ti/matrix-gui_1.3.bb @@ -1,4 +1,4 @@ require matrix-gui.inc -SRCREV = "249" -PR = "${INC_PR}.5" +SRCREV = "257" +PR = "${INC_PR}.6" From 99857dcd6c454705656bffcc54265a6e56b2a13b Mon Sep 17 00:00:00 2001 From: Eyal Reizer Date: Mon, 6 Jun 2011 13:57:05 +0000 Subject: [PATCH 367/509] ti-wifi-utils: install calibrator ini files to rootfs In order to perform wifi calibration the calibrator needs to be provided with a reference NVS file that matches the wifi chip and the radio module that is being used. This patch install these ini files to the root file system along with the calibrator itself. Signed-off-by: Eyal Reizer Signed-off-by: Denys Dmytriyenko --- recipes/ti/ti-wifi-utils_git.bb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/recipes/ti/ti-wifi-utils_git.bb b/recipes/ti/ti-wifi-utils_git.bb index 567fe29c06..96718debdf 100644 --- a/recipes/ti/ti-wifi-utils_git.bb +++ b/recipes/ti/ti-wifi-utils_git.bb @@ -3,7 +3,7 @@ LICENCE = "TI-BSD" DEPENDS = "libnl" -PR ="r2" +PR ="r3" PV ="0.0" PR_append = "+gitr${SRCPV}" @@ -17,5 +17,15 @@ CFLAGS += " -DCONFIG_LIBNL20" do_install() { install -d ${D}${bindir} + install -d ${D}${datadir}/ti/wifi-utils/ini_files/127x + install -d ${D}${datadir}/ti/wifi-utils/ini_files/128x + install -m 0755 calibrator ${D}${bindir}/ + install -m 0755 ${S}/ini_files/127x/* ${D}${datadir}/ti/wifi-utils/ini_files/127x + install -m 0755 ${S}/ini_files/128x/* ${D}${datadir}/ti/wifi-utils/ini_files/128x } + +FILES_${PN} += " \ + ${datadir}/ti/wifi-utils/ini_files/127x \ + ${datadir}/ti/wifi-utils/ini_files/128x \ +" From a39cdf00bb65e46b5dc5783a517a75d83685dc63 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Mon, 23 May 2011 21:00:40 +0000 Subject: [PATCH 368/509] crda: Fix build by disabling of make environment overrides. Signed-off-by: Stanislav Brabec Signed-off-by: Denys Dmytriyenko --- recipes/crda/crda_1.1.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/crda/crda_1.1.1.bb b/recipes/crda/crda_1.1.1.bb index cc19b908f8..ee4077bd4b 100644 --- a/recipes/crda/crda_1.1.1.bb +++ b/recipes/crda/crda_1.1.1.bb @@ -12,6 +12,7 @@ SRC_URI = "http://wireless.kernel.org/download/crda/${P}.tar.bz2;name=crda \ http://wireless.kernel.org/download/wireless-regdb/regulatory.bins/2009.11.25-regulatory.bin;name=reg \ " +EXTRA_OEMAKE = "MAKEFLAGS=" do_compile() { oe_runmake all_noverify } From e748dfb8c368b2a0acb1aaf7fb887fae73c8c3b7 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Mon, 23 May 2011 21:02:21 +0000 Subject: [PATCH 369/509] crda: Upgrade regulatory database to 2011.04.28. Signed-off-by: Stanislav Brabec Signed-off-by: Denys Dmytriyenko --- recipes/crda/crda_1.1.1.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/crda/crda_1.1.1.bb b/recipes/crda/crda_1.1.1.bb index ee4077bd4b..b45c7bcc36 100644 --- a/recipes/crda/crda_1.1.1.bb +++ b/recipes/crda/crda_1.1.1.bb @@ -3,13 +3,13 @@ HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA" SECTION = "base" PRIORITY = "optional" LICENSE = "ISC" -PR = "r1" +PR = "r2" DEPENDS = "libgcrypt libnl python-native python-m2crypto-native" RDEPENDS_${PN} = "udev" SRC_URI = "http://wireless.kernel.org/download/crda/${P}.tar.bz2;name=crda \ - http://wireless.kernel.org/download/wireless-regdb/regulatory.bins/2009.11.25-regulatory.bin;name=reg \ + http://wireless.kernel.org/download/wireless-regdb/regulatory.bins/2011.04.28-regulatory.bin;name=reg \ " EXTRA_OEMAKE = "MAKEFLAGS=" @@ -20,13 +20,13 @@ do_compile() { do_install() { oe_runmake DESTDIR=${D} install install -d ${D}/usr/lib/crda/ - install -m 0644 ${WORKDIR}/2009.11.25-regulatory.bin ${D}/usr/lib/crda/regulatory.bin + install -m 0644 ${WORKDIR}/2011.04.28-regulatory.bin ${D}/usr/lib/crda/regulatory.bin } SRC_URI[crda.md5sum] = "5fc77af68b3e21736b8ef2f8b061c810" SRC_URI[crda.sha256sum] = "59b4760da44a8f803caeaaa7fb97e0c6bd3f35f40445b28258e7f14c2fbe13b5" -SRC_URI[reg.md5sum] = "873b5c55a26c8ba7674e083f51cb10aa" -SRC_URI[reg.sha256sum] = "3ac77fa4d8034e4f5bc484adc4b073c3636dea26803e5e695cc54c15b629154a" +SRC_URI[reg.md5sum] = "1535e98bcaba732e2f8e8f62dac6f369" +SRC_URI[reg.sha256sum] = "bb6ba6f5dcdf7106a19c588b0e4d43ab7af26f6474fe01011a318b3dceaba33b" FILES_${PN} += "\ /lib/udev/rules.d/85-regulatory.rules \ From 81d9cf14d7329b446ad2388f226ce687c926dd96 Mon Sep 17 00:00:00 2001 From: Eyal Reizer Date: Mon, 6 Jun 2011 23:06:35 +0000 Subject: [PATCH 370/509] crda: fix regulatory domain agent for building with libnl2 This patch allows building the wireless regulatory domain agent with libnl version 2. Signed-off-by: Eyal Reizer Acked-by: Koen Kooi Signed-off-by: Denys Dmytriyenko --- recipes/crda/crda_1.1.1.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/crda/crda_1.1.1.bb b/recipes/crda/crda_1.1.1.bb index b45c7bcc36..9d33b5156b 100644 --- a/recipes/crda/crda_1.1.1.bb +++ b/recipes/crda/crda_1.1.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA" SECTION = "base" PRIORITY = "optional" LICENSE = "ISC" -PR = "r2" +PR = "r3" DEPENDS = "libgcrypt libnl python-native python-m2crypto-native" RDEPENDS_${PN} = "udev" @@ -12,6 +12,8 @@ SRC_URI = "http://wireless.kernel.org/download/crda/${P}.tar.bz2;name=crda \ http://wireless.kernel.org/download/wireless-regdb/regulatory.bins/2011.04.28-regulatory.bin;name=reg \ " +CFLAGS += " -DCONFIG_LIBNL20" + EXTRA_OEMAKE = "MAKEFLAGS=" do_compile() { oe_runmake all_noverify From ea86c4d7bde5c12afb41ef6c4cc2cb31d03a4613 Mon Sep 17 00:00:00 2001 From: Anand Balagopalakrishnan Date: Thu, 2 Jun 2011 21:02:58 +0000 Subject: [PATCH 371/509] libgles-omap3: Specify the Window System to be updated in powervr.ini * SGX driver looks at /etc/powervr.ini for the Window System to be used. This patch introduces a variable to specify which Window System should be specified in powervr.ini file. * By having this variable, it's easy to override the default Window System through a config file or amendment Signed-off-by: Anand Balagopalakrishnan Acked-by: Siddharth Heroor Signed-off-by: Denys Dmytriyenko --- recipes/powervr-drivers/libgles-omap3.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc index db7681d26c..36c311db8e 100644 --- a/recipes/powervr-drivers/libgles-omap3.inc +++ b/recipes/powervr-drivers/libgles-omap3.inc @@ -28,6 +28,8 @@ ES3LOCATION ?= "${S}/gfx_rel_es3.x" ES5LOCATION ?= "${S}/gfx_rel_es5.x" ES6LOCATION ?= "${S}/gfx_rel_es6.x" +LIBGLESWINDOWSYSTEM ?= "libpvrPVR2D_FRONTWSEGL.so.1" + do_configure() { # Attempt to fix up the worst offenders for file permissions for i in $(find ${S} -name "*.h") $(find ${S} -name "*.c") $(find ${S} -name "Make*") ; do @@ -152,7 +154,7 @@ do_install () { install -d ${D}${sysconfdir} echo "[default]" > ${D}${sysconfdir}/powervr.ini - echo "WindowSystem=libpvrPVR2D_FRONTWSEGL.so.1" >> ${D}${sysconfdir}/powervr.ini + echo "WindowSystem=${LIBGLESWINDOWSYSTEM}" >> ${D}${sysconfdir}/powervr.ini # The ES2.x, ES3.x, ES5.x and ES6.x CPUs have different SGX hardware, so we need to install multiple sets of userspace From 479700a3b68c7c01bdf85dd8ebe20651da7b829c Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 7 Jun 2011 21:54:58 -0400 Subject: [PATCH 372/509] qt-4.6.3: update qt's powervr graphics driver plugin to work with SGX DDK v1.6 Note: 2011.03-maintenance branch lacks qt-4.7.3, so instead of moving wsegl2 patch file, add it. Signed-off-by: Denys Dmytriyenko * The wsegl2 patch is required to build Qt with the latest SGX PowerVR drivers * Moved the wsegl2 patch from qt4/qt-4.7.3 to qt4/files * Added the wsegl2 patch to qt-4.6.3 Note: This is the "massaged in" version of the original patch from Anand Balagopalakrishnan as it was mangled and couldn't be applied. Signed-off-by: Denys Dmytriyenko --- recipes/qt4/files/0001-wsegl2-support.patch | 997 ++++++++++++++++++++ recipes/qt4/qt-4.6.3.inc | 1 + 2 files changed, 998 insertions(+) create mode 100644 recipes/qt4/files/0001-wsegl2-support.patch diff --git a/recipes/qt4/files/0001-wsegl2-support.patch b/recipes/qt4/files/0001-wsegl2-support.patch new file mode 100644 index 0000000000..ad61fe7afa --- /dev/null +++ b/recipes/qt4/files/0001-wsegl2-support.patch @@ -0,0 +1,997 @@ +diff -Nurp qt-everywhere-opensource-src-4.6.3-orig//src/3rdparty/powervr/wsegl2/pvr2d.h qt-everywhere-opensource-src-4.6.3/src/3rdparty/powervr/wsegl2/pvr2d.h +--- qt-everywhere-opensource-src-4.6.3-orig//src/3rdparty/powervr/wsegl2/pvr2d.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.6.3/src/3rdparty/powervr/wsegl2/pvr2d.h 2011-05-16 22:51:43.158564336 +0000 +@@ -0,0 +1,669 @@ ++/********************************************************************** ++* ++* Copyright(c) Imagination Technologies Ltd. ++* ++* The contents of this file are subject to the MIT license as set out below. ++* ++* Permission is hereby granted, free of charge, to any person obtaining a copy ++* of this software and associated documentation files (the "Software"), ++* to deal in the Software without restriction, including without limitation ++* the rights to use, copy, modify, merge, publish, distribute, sublicense, ++* and/or sell copies of the Software, and to permit persons to whom the ++* Software is furnished to do so, subject to the following conditions: ++* ++* The above copyright notice and this permission notice shall be included ++* in all copies or substantial portions of the Software. ++* ++* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ++* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, ++* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT ++* OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE ++* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++* ++* This License is also included in this distribution in the file called ++* "COPYING". ++* ++******************************************************************************/ ++ ++ ++ ++/****************************************************************************** ++Modifications :- ++$Log: pvr2d.h $ ++ ++ --- Revision Logs Removed --- ++******************************************************************************/ ++ ++#ifndef _PVR2D_H_ ++#define _PVR2D_H_ ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/* PVR2D Platform-specific definitions */ ++#if defined (__linux__) ++#define PVR2D_EXPORT __attribute__((visibility("default"))) ++#define PVR2D_IMPORT ++#else ++#define PVR2D_EXPORT ++#define PVR2D_IMPORT ++#endif ++ ++/* PVR2D header revision */ ++#define PVR2D_REV_MAJOR 3 ++#define PVR2D_REV_MINOR 5 ++ ++/* Basic types */ ++typedef enum ++{ ++ PVR2D_FALSE = 0, ++ PVR2D_TRUE ++} PVR2D_BOOL; ++ ++typedef void* PVR2D_HANDLE; ++ ++typedef char PVR2D_CHAR, *PVR2D_PCHAR; ++typedef unsigned char PVR2D_UCHAR, *PVR2D_PUCHAR; ++typedef int PVR2D_INT, *PVR2D_PINT; ++typedef unsigned int PVR2D_UINT, *PVR2D_PUINT; ++typedef long PVR2D_LONG, *PVR2D_PLONG; ++typedef unsigned long PVR2D_ULONG, *PVR2D_PULONG; ++ ++typedef void PVR2D_VOID, *PVR2D_PVOID; ++ ++ ++/* error codes */ ++typedef enum ++{ ++ PVR2D_OK = 0, ++ PVR2DERROR_INVALID_PARAMETER = -1, ++ PVR2DERROR_DEVICE_UNAVAILABLE = -2, ++ PVR2DERROR_INVALID_CONTEXT = -3, ++ PVR2DERROR_MEMORY_UNAVAILABLE = -4, ++ PVR2DERROR_DEVICE_NOT_PRESENT = -5, ++ PVR2DERROR_IOCTL_ERROR = -6, ++ PVR2DERROR_GENERIC_ERROR = -7, ++ PVR2DERROR_BLT_NOTCOMPLETE = -8, ++ PVR2DERROR_HW_FEATURE_NOT_SUPPORTED = -9, ++ PVR2DERROR_NOT_YET_IMPLEMENTED = -10, ++ PVR2DERROR_MAPPING_FAILED = -11 ++}PVR2DERROR; ++ ++/* 32 bit PVR2D pixel format specifier */ ++typedef unsigned long PVR2DFORMAT; ++ ++/* Standard PVR2D pixel formats */ ++#define PVR2D_1BPP 0x00UL // 1bpp mask surface or palletized 1 bit source with 2x32 bit CLUT ++#define PVR2D_RGB565 0x01UL // Common rgb 565 format ++#define PVR2D_ARGB4444 0x02UL // Common argb 4444 format ++#define PVR2D_RGB888 0x03UL // Common rgb 888 format (not supported) ++#define PVR2D_ARGB8888 0x04UL // Common argb 8888 format ++#define PVR2D_ARGB1555 0x05UL // Common argb 1555 format ++#define PVR2D_ALPHA8 0x06UL // Alpha-only 8 bit per pixel (used with a constant fill colour) ++#define PVR2D_ALPHA4 0x07UL // Alpha-only 4 bits per pixel (used with a constant fill colour) ++#define PVR2D_PAL2 0x08UL // Palletized 2 bit format (requires 4x32 bit CLUT) ++#define PVR2D_PAL4 0x09UL // Palletized 4 bit format (requires 16x32 bit CLUT) ++#define PVR2D_PAL8 0x0AUL // Palletized 8 bit format (requires 256x32 bit CLUT) ++#define PVR2D_U8 0x10UL // monochrome unsigned 8 bit ++#define PVR2D_U88 0x11UL // monochrome unsigned 16 bit ++#define PVR2D_S8 0x12UL // signed 8 bit ++#define PVR2D_YUV422_YUYV 0x13UL // YUV 422 low-high byte order Y0UY1V ++#define PVR2D_YUV422_UYVY 0x14UL // YUV 422 low-high byte order UY0VY1 ++#define PVR2D_YUV422_YVYU 0x15UL // YUV 422 low-high byte order Y0VY1U ++#define PVR2D_YUV422_VYUY 0x16UL // YUV 422 low-high byte order VY0UY1 ++#define PVR2D_YUV420_2PLANE 0x17UL // YUV420 2 Plane ++#define PVR2D_YUV420_3PLANE 0x18UL // YUV420 3 Plane ++#define PVR2D_2101010ARGB 0x19UL // 32 bit 2 10 10 10 ++#define PVR2D_888RSGSBS 0x1AUL ++#define PVR2D_16BPP_RAW 0x1BUL // 16 bit raw (no format conversion) ++#define PVR2D_32BPP_RAW 0x1CUL // 32 bit raw ++#define PVR2D_64BPP_RAW 0x1DUL // 64 bit raw ++#define PVR2D_128BPP_RAW 0x1EUL // 128 bit raw ++ ++#define PVR2D_NO_OF_FORMATS 0x1FUL ++ ++/* Format modifier bit field (DstFormat and SrcFormat bits 16..23) */ ++#define PVR2D_FORMAT_MASK 0x0000FFFFUL // PVR2D Format bits ++#define PVR2D_FORMAT_LAYOUT_MASK 0x000F0000UL // Format layout (strided / twiddled / tiled) ++#define PVR2D_FORMAT_FLAGS_MASK 0x0FF00000UL // Surface Flags mask ++ ++/* Layout */ ++#define PVR2D_FORMAT_LAYOUT_SHIFT 16 ++#define PVR2D_FORMAT_LAYOUT_STRIDED 0x00000000UL ++#define PVR2D_FORMAT_LAYOUT_TILED 0x00010000UL ++#define PVR2D_FORMAT_LAYOUT_TWIDDLED 0x00020000UL ++ ++/* ++ PVR2D_SURFACE_PDUMP ++ This flag requests a surface pdump, to capture the pixel state after host writes. ++ Not needed if the surface state has resulted from previous SGX 2D/3D core writes. ++*/ ++#define PVR2D_SURFACE_PDUMP 0x00100000UL // calls PVRSRVPDumpMem to capture the surface (pdump builds only) ++ ++/* ++ Low level 3D format extension - for blts via the 3D core only. ++ If the top bit of the format field is set then PVR2D reads it as a PVRSRV_PIXEL_FORMAT. ++ The outcome is hardware dependant. ++ There is no guarantee that any specific PVRSRV format will be supported. ++*/ ++#define PVR2D_FORMAT_PVRSRV 0x80000000 ++ ++/* wrap surface type */ ++typedef enum ++{ ++ PVR2D_WRAPFLAG_NONCONTIGUOUS = 0, ++ PVR2D_WRAPFLAG_CONTIGUOUS = 1, ++ ++}PVR2DWRAPFLAGS; ++ ++#define PVR2D_CONTEXT_FLAGS_PRIORITY_MASK 0x00000003 ++ ++#define PVR2D_CONTEXT_FLAGS_LOW_PRIORITY_CONTEXT 1 ++#define PVR2D_CONTEXT_FLAGS_NORMAL_PRIORITY_CONTEXT 0 ++#define PVR2D_CONTEXT_FLAGS_HIGH_PRIORITY_CONTEXT 2 ++ ++/* flags for control information of additional blits */ ++typedef enum ++{ ++ PVR2D_BLIT_DISABLE_ALL = 0x00000000, /* disable all additional controls */ ++ PVR2D_BLIT_CK_ENABLE = 0x00000001, /* enable colour key */ ++ PVR2D_BLIT_GLOBAL_ALPHA_ENABLE = 0x00000002, /* enable standard global alpha */ ++ PVR2D_BLIT_PERPIXEL_ALPHABLEND_ENABLE = 0x00000004, /* enable per-pixel alpha bleding */ ++ PVR2D_BLIT_PAT_SURFACE_ENABLE = 0x00000008, /* enable pattern surf (disable fill) */ ++ PVR2D_BLIT_FULLY_SPECIFIED_ALPHA_ENABLE = 0x00000010, /* enable fully specified alpha */ ++ PVR2D_BLIT_ROT_90 = 0x00000020, /* apply 90 degree rotation to the blt */ ++ PVR2D_BLIT_ROT_180 = 0x00000040, /* apply 180 degree rotation to the blt */ ++ PVR2D_BLIT_ROT_270 = 0x00000080, /* apply 270 degree rotation to the blt */ ++ PVR2D_BLIT_COPYORDER_TL2BR = 0x00000100, /* copy order overrides */ ++ PVR2D_BLIT_COPYORDER_BR2TL = 0x00000200, ++ PVR2D_BLIT_COPYORDER_TR2BL = 0x00000400, ++ PVR2D_BLIT_COPYORDER_BL2TR = 0x00000800, ++ PVR2D_BLIT_COLKEY_SOURCE = 0x00001000, /* Key colour is on the source surface */ ++ PVR2D_BLIT_COLKEY_DEST = 0x00002000, /* Key colour is on the destination surface */ ++ PVR2D_BLIT_COLKEY_MASKED = 0x00004000, /* Mask enabled for colour key */ ++ PVR2D_BLIT_COLKEY_OP_PASS = 0x00008000, /* Colour key op = pass */ ++ PVR2D_BLIT_COLKEY_OP_REJECT = 0x00010000, /* Colour key op = reject */ ++ PVR2D_BLIT_PATH_2DCORE = 0x00100000, /* Blt via dedicated 2D Core or PTLA */ ++ PVR2D_BLIT_PATH_3DCORE = 0x00200000, /* Blt via 3D Core */ ++ PVR2D_BLIT_PATH_SWBLT = 0x00400000, /* Blt via host software */ ++ PVR2D_BLIT_NO_SRC_SYNC_INFO = 0x00800000, /* Dont send a source sync info*/ ++ PVR2D_BLIT_ISSUE_STATUS_UPDATES = 0x01000000, /* Issue status updates */ ++ ++} PVR2DBLITFLAGS; ++ ++/* standard alpha-blending functions, AlphaBlendingFunc field of PVR2DBLTINFO */ ++typedef enum ++{ ++ PVR2D_ALPHA_OP_SRC_DSTINV = 1, /* source alpha : Cdst = Csrc*Asrc + Cdst*(1-Asrc) */ ++ PVR2D_ALPHA_OP_SRCP_DSTINV = 2 /* premultiplied source alpha : Cdst = Csrc + Cdst*(1-Asrc) */ ++} PVR2D_ALPHABLENDFUNC; ++ ++/* blend ops for fully specified alpha (SGX 2D Core only) */ ++typedef enum ++{ ++ PVR2D_BLEND_OP_ZERO = 0, ++ PVR2D_BLEND_OP_ONE = 1, ++ PVR2D_BLEND_OP_SRC = 2, ++ PVR2D_BLEND_OP_DST = 3, ++ PVR2D_BLEND_OP_GLOBAL = 4, ++ PVR2D_BLEND_OP_SRC_PLUS_GLOBAL = 5, ++ PVR2D_BLEND_OP_DST_PLUS_GLOBAL = 6 ++}PVR2D_BLEND_OP; ++ ++/* SGX 2D Core Fully specified alpha blend : pAlpha field of PVR2DBLTINFO structure */ ++/* a fully specified Alpha Blend operation is defined as */ ++/* DST (ALPHA) = (ALPHA_1 * SRC (ALPHA)) + (ALPHA_3 * DST (ALPHA)) */ ++/* DST (RGB) = (ALPHA_2 * SRC (RGB)) + (ALPHA_4 * DST (RGB)) */ ++/* if the pre-multiplication stage is enabled then the equations become the following: */ ++/* PRE_MUL = ((SRC(A)) * (Global Alpha Value)) */ ++/* DST (ALPHA) = (ALPHA_1 * SRC (ALPHA)) + (PRE_MUL * DST (ALPHA)) */ ++/* DST (RGB) = (ALPHA_2 * SRC (RGB)) + (PRE_MUL * DST (RGB)) */ ++/* if the transparent source alpha stage is enabled then a source alpha of zero forces the */ ++/* source to be transparent for that pixel regardless of the blend equation being used. */ ++typedef struct _PVR2D_ALPHABLT ++{ ++ PVR2D_BLEND_OP eAlpha1; ++ PVR2D_BOOL bAlpha1Invert; ++ PVR2D_BLEND_OP eAlpha2; ++ PVR2D_BOOL bAlpha2Invert; ++ PVR2D_BLEND_OP eAlpha3; ++ PVR2D_BOOL bAlpha3Invert; ++ PVR2D_BLEND_OP eAlpha4; ++ PVR2D_BOOL bAlpha4Invert; ++ PVR2D_BOOL bPremulAlpha; /* enable pre-multiplication stage */ ++ PVR2D_BOOL bTransAlpha; /* enable transparent source alpha stage */ ++ PVR2D_BOOL bUpdateAlphaLookup; /* enable and update the 1555-Lookup alpha table */ ++ PVR2D_UCHAR uAlphaLookup0; /* 8 bit alpha when A=0 in a 1555-Lookup surface */ ++ PVR2D_UCHAR uAlphaLookup1; /* 8 bit alpha when A=1 in a 1555-Lookup surface */ ++ PVR2D_UCHAR uGlobalRGB; /* Global Alpha Value for RGB, 0=transparent 255=opaque */ ++ PVR2D_UCHAR uGlobalA; /* Global Alpha Value for Alpha */ ++ ++} PVR2D_ALPHABLT, *PPVR2D_ALPHABLT; ++ ++ ++/* surface memory info structure */ ++typedef struct _PVR2DMEMINFO ++{ ++ PVR2D_VOID *pBase; ++ PVR2D_ULONG ui32MemSize; ++ PVR2D_ULONG ui32DevAddr; ++ PVR2D_ULONG ulFlags; ++ PVR2D_VOID *hPrivateData; ++ PVR2D_VOID *hPrivateMapData; ++ ++}PVR2DMEMINFO, *PPVR2DMEMINFO; ++ ++ ++#define PVR2D_MAX_DEVICE_NAME 20 ++ ++typedef struct _PVR2DDEVICEINFO ++{ ++ PVR2D_ULONG ulDevID; ++ PVR2D_CHAR szDeviceName[PVR2D_MAX_DEVICE_NAME]; ++}PVR2DDEVICEINFO; ++ ++ ++typedef struct _PVR2DISPLAYINFO ++{ ++ PVR2D_ULONG ulMaxFlipChains; ++ PVR2D_ULONG ulMaxBuffersInChain; ++ PVR2DFORMAT eFormat; ++ PVR2D_ULONG ulWidth; ++ PVR2D_ULONG ulHeight; ++ PVR2D_LONG lStride; ++ PVR2D_ULONG ulMinFlipInterval; ++ PVR2D_ULONG ulMaxFlipInterval; ++ ++}PVR2DDISPLAYINFO; ++ ++ ++typedef struct _PVR2MISCDISPLAYINFO ++{ ++ PVR2D_ULONG ulPhysicalWidthmm; ++ PVR2D_ULONG ulPhysicalHeightmm; ++ PVR2D_ULONG ulUnused[10]; ++ ++}PVR2DMISCDISPLAYINFO; ++ ++ ++typedef struct _PVR2DBLTINFO ++{ ++ PVR2D_ULONG CopyCode; /* rop code */ ++ PVR2D_ULONG Colour; /* fill colour */ ++ PVR2D_ULONG ColourKey; /* colour key argb8888 (see CKEY_ defs below) */ ++ PVR2D_UCHAR GlobalAlphaValue; /* global alpha blending */ ++ PVR2D_UCHAR AlphaBlendingFunc; /* per-pixel alpha-blending function */ ++ ++ PVR2DBLITFLAGS BlitFlags; /* additional blit control information */ ++ ++ PVR2DMEMINFO *pDstMemInfo; /* destination memory */ ++ PVR2D_ULONG DstOffset; /* byte offset from start of allocation to destination surface pixel 0,0 */ ++ PVR2D_LONG DstStride; /* signed stride, the number of bytes from pixel 0,0 to 0,1 */ ++ PVR2D_LONG DstX, DstY; /* pixel offset from start of dest surface to start of blt rectangle */ ++ PVR2D_LONG DSizeX,DSizeY; /* blt size */ ++ PVR2DFORMAT DstFormat; /* dest format */ ++ PVR2D_ULONG DstSurfWidth; /* size of dest surface in pixels */ ++ PVR2D_ULONG DstSurfHeight; /* size of dest surface in pixels */ ++ ++ PVR2DMEMINFO *pSrcMemInfo; /* source mem, (source fields are also used for patterns) */ ++ PVR2D_ULONG SrcOffset; /* byte offset from start of allocation to src/pat surface pixel 0,0 */ ++ PVR2D_LONG SrcStride; /* signed stride, the number of bytes from pixel 0,0 to 0,1 */ ++ PVR2D_LONG SrcX, SrcY; /* pixel offset from start of surface to start of source rectangle */ ++ /* for patterns this is the start offset within the pattern */ ++ PVR2D_LONG SizeX,SizeY; /* source rectangle size or pattern size in pixels */ ++ PVR2DFORMAT SrcFormat; /* source/pattern format */ ++ PVR2DMEMINFO *pPalMemInfo; /* source/pattern palette memory containing argb8888 colour table */ ++ PVR2D_ULONG PalOffset; /* byte offset from start of allocation to start of palette */ ++ PVR2D_ULONG SrcSurfWidth; /* size of source surface in pixels */ ++ PVR2D_ULONG SrcSurfHeight; /* size of source surface in pixels */ ++ ++ PVR2DMEMINFO *pMaskMemInfo; /* mask memory, 1bpp format implied */ ++ PVR2D_ULONG MaskOffset; /* byte offset from start of allocation to mask surface pixel 0,0 */ ++ PVR2D_LONG MaskStride; /* signed stride, the number of bytes from pixel 0,0 to 0,1 */ ++ PVR2D_LONG MaskX, MaskY; /* mask rect top left (mask size = blt size) */ ++ PVR2D_ULONG MaskSurfWidth; /* size of mask surface in pixels */ ++ PVR2D_ULONG MaskSurfHeight; /* size of mask surface in pixels */ ++ ++ PPVR2D_ALPHABLT pAlpha; /* fully specified alpha blend (2DCore only) */ ++ ++ PVR2D_ULONG uSrcChromaPlane1; /* mem offset from start of source alloc to chroma plane 1 */ ++ PVR2D_ULONG uSrcChromaPlane2; /* mem offset from start of source alloc to chroma plane 2 */ ++ PVR2D_ULONG uDstChromaPlane1; /* mem offset from start of dest alloc to chroma plane 1 */ ++ PVR2D_ULONG uDstChromaPlane2; /* mem offset from start of dest alloc to chroma plane 2 */ ++ ++ PVR2D_ULONG ColourKeyMask; /* 32 bit colour key mask, only valid when PVR2D_BLIT_COLKEY_MASKED is set */ ++ ++}PVR2DBLTINFO, *PPVR2DBLTINFO; ++ ++typedef struct _PVR2DRECT ++{ ++ PVR2D_LONG left, top; ++ PVR2D_LONG right, bottom; ++} PVR2DRECT; ++ ++typedef struct ++{ ++ PVR2DMEMINFO *pSurfMemInfo; /* surface memory */ ++ PVR2D_ULONG SurfOffset; /* byte offset from start of allocation to destination surface pixel 0,0 */ ++ PVR2D_LONG Stride; /* signed stride */ ++ PVR2DFORMAT Format; /* format */ ++ PVR2D_ULONG SurfWidth; /* surface width in pixels */ ++ PVR2D_ULONG SurfHeight; /* surface height in pixels */ ++ ++} PVR2D_SURFACE, *PPVR2D_SURFACE; ++ ++typedef struct ++{ ++ PVR2D_ULONG uChromaPlane1; /* YUV multiplane - byte offset from start of alloc to chroma plane 1 */ ++ PVR2D_ULONG uChromaPlane2; /* YUV multiplane - byte offset from start of alloc to chroma plane 2 */ ++ PVR2D_LONG Reserved[2]; /* Reserved, must be zero */ ++ ++} PVR2D_SURFACE_EXT, *PPVR2D_SURFACE_EXT; ++ ++typedef struct ++{ ++ PVR2D_ULONG *pUseCode; /* USSE code */ ++ PVR2D_ULONG UseCodeSize; /* usse code size in bytes */ ++ ++} PVR2D_USECODE, *PPVR2D_USECODE; ++ ++typedef struct ++{ ++ PVR2D_SURFACE sDst; /* destination surface */ ++ PVR2D_SURFACE sSrc; /* source surface */ ++ PVR2DRECT rcDest; /* destination rectangle */ ++ PVR2DRECT rcSource; /* source rectangle */ ++ PVR2D_HANDLE hUseCode; /* custom USE code (NULL implies source copy) */ ++ PVR2D_ULONG UseParams[2]; /* per-blt params for use code */ ++ ++} PVR2D_3DBLT, *PPVR2D_3DBLT; ++ ++typedef struct ++{ ++ PVR2D_SURFACE sDst; /* destination surface */ ++ PVR2DRECT rcDest; /* destination rectangle; scaling is supported */ ++ PVR2D_SURFACE sSrc; /* source surface */ ++ PVR2DRECT rcSource; /* source rectangle; scaling is supported */ ++ PPVR2D_SURFACE pSrc2; /* optional second source surface (NULL if not required) */ ++ PVR2DRECT* prcSource2; /* optional pSrc2 rectangle */ ++ PVR2D_HANDLE hUseCode; /* custom USSE shader code (NULL implies default source copy) */ ++ PVR2D_ULONG UseParams[2]; /* per-blt params for usse code */ ++ PVR2D_ULONG uiNumTemporaryRegisters; /* no. of temporary registers used in custom shader code */ ++ PVR2D_BOOL bDisableDestInput; /* set true if the destination is output only */ ++ PPVR2D_SURFACE_EXT pDstExt; /* Extended format params for dest */ ++ PPVR2D_SURFACE_EXT pSrcExt[2]; /* Extended format params for source 1 and 2 */ ++ PVR2D_LONG Reserved[4]; /* Reserved, must be zero */ ++ ++} PVR2D_3DBLT_EXT, *PPVR2D_3DBLT_EXT; ++ ++ ++#define MAKE_COPY_BLIT(src,soff,dest,doff,sx,sy,dx,dy,sz) ++ ++typedef void* PVR2DCONTEXTHANDLE; ++typedef void* PVR2DFLIPCHAINHANDLE; ++ ++ ++// CopyCode field of PVR2DBLTINFO structure: ++// the CopyCode field of the PVR2DBLTINFO structure should contain a rop3 or rop4 code. ++// a rop3 is an 8 bit code that describes a blt with three inputs : source dest and pattern ++// rop4 is a 16 bit code that describes a blt with four inputs : source dest pattern and mask ++// common rop3 codes are defined below ++// a colour fill blt is processed in the pattern channel as a constant colour with a rop code of 0xF0 ++// PVR2D_BLIT_PAT_SURFACE_ENABLE defines whether the pattern channel is a surface or a fill colour. ++// a rop4 is defined by two rop3 codes, and the 1 bit-per-pixel mask surface defines which is used. ++// a common rop4 is 0xAAF0 which is the mask copy blt used for text glyphs. ++// CopyCode is taken to be a rop4 when pMaskMemInfo is non zero, otherwise it is assumed to be a rop3 ++// use the PVR2DMASKROP4 macro below to construct a rop4 from two rop3's ++// rop3a is the rop used when mask pixel = 1, and rop3b when mask = 0 ++#define PVR2DROP4(rop3b, rop3a) ((rop3b<<8)|rop3a) ++ ++/* common rop codes */ ++#define PVR2DROPclear 0x00 /* 0 (whiteness) */ ++#define PVR2DROPset 0xFF /* 1 (blackness) */ ++#define PVR2DROPnoop 0xAA /* dst (used for masked blts) */ ++ ++/* source and dest rop codes */ ++#define PVR2DROPand 0x88 /* src AND dst */ ++#define PVR2DROPandReverse 0x44 /* src AND NOT dst */ ++#define PVR2DROPcopy 0xCC /* src (used for source copy and alpha blts) */ ++#define PVR2DROPandInverted 0x22 /* NOT src AND dst */ ++#define PVR2DROPxor 0x66 /* src XOR dst */ ++#define PVR2DROPor 0xEE /* src OR dst */ ++#define PVR2DROPnor 0x11 /* NOT src AND NOT dst */ ++#define PVR2DROPequiv 0x99 /* NOT src XOR dst */ ++#define PVR2DROPinvert 0x55 /* NOT dst */ ++#define PVR2DROPorReverse 0xDD /* src OR NOT dst */ ++#define PVR2DROPcopyInverted 0x33 /* NOT src */ ++#define PVR2DROPorInverted 0xBB /* NOT src OR dst */ ++#define PVR2DROPnand 0x77 /* NOT src OR NOT dst */ ++ ++/* pattern rop codes */ ++#define PVR2DPATROPand 0xA0 /* pat AND dst */ ++#define PVR2DPATROPandReverse 0x50 /* pat AND NOT dst */ ++#define PVR2DPATROPcopy 0xF0 /* pat (used for solid color fills and pattern blts) */ ++#define PVR2DPATROPandInverted 0x0A /* NOT pat AND dst */ ++#define PVR2DPATROPxor 0x5A /* pat XOR dst */ ++#define PVR2DPATROPor 0xFA /* pat OR dst */ ++#define PVR2DPATROPnor 0x05 /* NOT pat AND NOT dst */ ++#define PVR2DPATROPequiv 0xA5 /* NOT pat XOR dst */ ++#define PVR2DPATROPinvert 0x55 /* NOT dst */ ++#define PVR2DPATROPorReverse 0xF5 /* pat OR NOT dst */ ++#define PVR2DPATROPcopyInverted 0x0F /* NOT pat */ ++#define PVR2DPATROPorInverted 0xAF /* NOT pat OR dst */ ++#define PVR2DPATROPnand 0x5F /* NOT pat OR NOT dst */ ++ ++/* common rop4 codes */ ++#define PVR2DROP4MaskedCopy PVR2DROP4(PVR2DROPnoop,PVR2DROPcopy) /* masked source copy blt (used for rounded window corners etc) */ ++#define PVR2DROP4MaskedFill PVR2DROP4(PVR2DROPnoop,PVR2DPATROPcopy) /* masked colour fill blt (used for text) */ ++ ++/* Legacy support */ ++#define PVR2DROP3_PATMASK PVR2DPATROPcopy ++#define PVR2DROP3_SRCMASK PVR2DROPcopy ++ ++/* pixmap memory alignment */ ++#define PVR2D_ALIGNMENT_4 4 /* DWORD alignment */ ++#define PVR2D_ALIGNMENT_ANY 0 /* no alignment */ ++#define PVR2D_ALIGNMENT_PALETTE 16 /* 16 byte alignment is required for palettes */ ++ ++/* Heap number for PVR2DGetFrameBuffer */ ++#define PVR2D_FB_PRIMARY_SURFACE 0 ++ ++#define PVR2D_PRESENT_PROPERTY_SRCSTRIDE (1UL << 0) ++#define PVR2D_PRESENT_PROPERTY_DSTSIZE (1UL << 1) ++#define PVR2D_PRESENT_PROPERTY_DSTPOS (1UL << 2) ++#define PVR2D_PRESENT_PROPERTY_CLIPRECTS (1UL << 3) ++#define PVR2D_PRESENT_PROPERTY_INTERVAL (1UL << 4) ++ ++#define PVR2D_CREATE_FLIPCHAIN_SHARED (1UL << 0) ++#define PVR2D_CREATE_FLIPCHAIN_QUERY (1UL << 1) ++#define PVR2D_CREATE_FLIPCHAIN_OEMOVERLAY (1UL << 2) ++#define PVR2D_CREATE_FLIPCHAIN_AS_BLITCHAIN (1UL << 3) ++ ++/* Colour-key colour must be translated into argb8888 format */ ++#define CKEY_8888(P) (P) ++#define CKEY_4444(P) (((P&0xF000UL)<<16) | ((P&0x0F00UL)<<12) | ((P&0x00F0UL)<<8) | ((P&0x000FUL)<<4)) ++#define CKEY_1555(P) (((P&0x8000UL)<<16) | ((P&0x7C00UL)<<9) | ((P&0x3E0UL)<<6) | ((P&0x1FUL)<<3)) ++#define CKEY_565(P) (((P&0xF800UL)<<8) | ((P&0x7E0UL)<<5) | ((P&0x1FUL)<<3)) ++#define CKEY_MASK_8888 0x00FFFFFFUL ++#define CKEY_MASK_4444 0x00F0F0F0UL ++#define CKEY_MASK_1555 0x00F8F8F8UL /* Alpha is not normally included in the key test */ ++#define CKEY_MASK_565 0x00F8FCF8UL ++ ++/* Fill colours must be translated into argb8888 format */ ++#define CFILL_4444(P) (((P&0xF000UL)<<16) | ((P&0x0F00UL)<<12) | ((P&0x00F0UL)<<8) | ((P&0x000FUL)<<4)) ++#define CFILL_1555(P) (((P&0x8000UL)<<16) | ((P&0x7C00UL)<<9) | ((P&0x3E0UL)<<6) | ((P&0x1FUL)<<3)) ++#define CFILL_565(P) (((P&0xF800UL)<<8) | ((P&0x7E0UL)<<5) | ((P&0x1FUL)<<3)) ++ ++/* PVR2DCreateDeviceContext flags */ ++#define PVR2D_XSERVER_PROC 0x00000001UL /*!< Set for the Xserver connection */ ++ ++/* PVR2DMemAlloc flags */ ++#define PVR2D_MEM_UNCACHED 0x00000000UL /* Default */ ++#define PVR2D_MEM_CACHED 0x00000001UL /* Caller must flush and sync when necessary */ ++#define PVR2D_MEM_WRITECOMBINE 0x00000002UL ++ ++/* Functions that the library exports */ ++ ++PVR2D_IMPORT ++int PVR2DEnumerateDevices(PVR2DDEVICEINFO *pDevInfo); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DCreateDeviceContext(PVR2D_ULONG ulDevID, ++ PVR2DCONTEXTHANDLE* phContext, ++ PVR2D_ULONG ulFlags); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DDestroyDeviceContext(PVR2DCONTEXTHANDLE hContext); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DGetDeviceInfo(PVR2DCONTEXTHANDLE hContext, ++ PVR2DDISPLAYINFO *pDisplayInfo); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DGetMiscDisplayInfo(PVR2DCONTEXTHANDLE hContext, ++ PVR2DMISCDISPLAYINFO *pMiscDisplayInfo); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DGetScreenMode(PVR2DCONTEXTHANDLE hContext, ++ PVR2DFORMAT *pFormat, ++ PVR2D_LONG *plWidth, ++ PVR2D_LONG *plHeight, ++ PVR2D_LONG *plStride, ++ PVR2D_INT *piRefreshRate); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DGetFrameBuffer(PVR2DCONTEXTHANDLE hContext, ++ PVR2D_INT nHeap, ++ PVR2DMEMINFO **ppsMemInfo); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DMemAlloc(PVR2DCONTEXTHANDLE hContext, ++ PVR2D_ULONG ulBytes, ++ PVR2D_ULONG ulAlign, ++ PVR2D_ULONG ulFlags, ++ PVR2DMEMINFO **ppsMemInfo); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DMemExport(PVR2DCONTEXTHANDLE hContext, ++ PVR2D_ULONG ulFlags, ++ PVR2DMEMINFO *psMemInfo, ++ PVR2D_HANDLE *phMemHandle); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DMemWrap(PVR2DCONTEXTHANDLE hContext, ++ PVR2D_VOID *pMem, ++ PVR2D_ULONG ulFlags, ++ PVR2D_ULONG ulBytes, ++ PVR2D_ULONG alPageAddress[], ++ PVR2DMEMINFO **ppsMemInfo); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DMemMap(PVR2DCONTEXTHANDLE hContext, ++ PVR2D_ULONG ulFlags, ++ PVR2D_HANDLE hMemHandle, ++ PVR2DMEMINFO **ppsDstMem); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DMemFree(PVR2DCONTEXTHANDLE hContext, ++ PVR2DMEMINFO *psMemInfo); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DBlt(PVR2DCONTEXTHANDLE hContext, ++ PVR2DBLTINFO *pBltInfo); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DBltClipped(PVR2DCONTEXTHANDLE hContext, ++ PVR2DBLTINFO *pBltInfo, ++ PVR2D_ULONG ulNumClipRects, ++ PVR2DRECT *pClipRects); ++ ++PVR2D_EXPORT ++PVR2DERROR PVR2DSet1555Alpha (PVR2DCONTEXTHANDLE hContext, ++ PVR2D_UCHAR Alpha0, PVR2D_UCHAR Alpha1); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DQueryBlitsComplete(PVR2DCONTEXTHANDLE hContext, ++ const PVR2DMEMINFO *pMemInfo, ++ PVR2D_UINT uiWaitForComplete); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DSetPresentBltProperties(PVR2DCONTEXTHANDLE hContext, ++ PVR2D_ULONG ulPropertyMask, ++ PVR2D_LONG lSrcStride, ++ PVR2D_ULONG ulDstWidth, ++ PVR2D_ULONG ulDstHeight, ++ PVR2D_LONG lDstXPos, ++ PVR2D_LONG lDstYPos, ++ PVR2D_ULONG ulNumClipRects, ++ PVR2DRECT *pClipRects, ++ PVR2D_ULONG ulSwapInterval); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DPresentBlt(PVR2DCONTEXTHANDLE hContext, ++ PVR2DMEMINFO *pMemInfo, ++ PVR2D_LONG lRenderID); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DCreateFlipChain(PVR2DCONTEXTHANDLE hContext, ++ PVR2D_ULONG ulFlags, ++ PVR2D_ULONG ulNumBuffers, ++ PVR2D_ULONG ulWidth, ++ PVR2D_ULONG ulHeight, ++ PVR2DFORMAT eFormat, ++ PVR2D_LONG *plStride, ++ PVR2D_ULONG *pulFlipChainID, ++ PVR2DFLIPCHAINHANDLE *phFlipChain); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DDestroyFlipChain(PVR2DCONTEXTHANDLE hContext, ++ PVR2DFLIPCHAINHANDLE hFlipChain); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DGetFlipChainBuffers(PVR2DCONTEXTHANDLE hContext, ++ PVR2DFLIPCHAINHANDLE hFlipChain, ++ PVR2D_ULONG *pulNumBuffers, ++ PVR2DMEMINFO *psMemInfo[]); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DSetPresentFlipProperties(PVR2DCONTEXTHANDLE hContext, ++ PVR2DFLIPCHAINHANDLE hFlipChain, ++ PVR2D_ULONG ulPropertyMask, ++ PVR2D_LONG lDstXPos, ++ PVR2D_LONG lDstYPos, ++ PVR2D_ULONG ulNumClipRects, ++ PVR2DRECT *pClipRects, ++ PVR2D_ULONG ulSwapInterval); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DPresentFlip(PVR2DCONTEXTHANDLE hContext, ++ PVR2DFLIPCHAINHANDLE hFlipChain, ++ PVR2DMEMINFO *psMemInfo, ++ PVR2D_LONG lRenderID); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DGetAPIRev(PVR2D_LONG *lRevMajor, PVR2D_LONG *lRevMinor); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DLoadUseCode (const PVR2DCONTEXTHANDLE hContext, const PVR2D_UCHAR *pUseCode, ++ const PVR2D_ULONG UseCodeSize, PVR2D_HANDLE *pUseCodeHandle); ++PVR2D_IMPORT ++PVR2DERROR PVR2DFreeUseCode (const PVR2DCONTEXTHANDLE hContext, const PVR2D_HANDLE hUseCodeHandle); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DBlt3D (const PVR2DCONTEXTHANDLE hContext, const PPVR2D_3DBLT pBlt3D); ++ ++PVR2D_IMPORT ++PVR2DERROR PVR2DBlt3DExt (const PVR2DCONTEXTHANDLE hContext, const PPVR2D_3DBLT_EXT pBlt3D); ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* _PVR2D_H_ */ ++ ++/****************************************************************************** ++ End of file (pvr2d.h) ++******************************************************************************/ +diff -Nurp qt-everywhere-opensource-src-4.6.3-orig//src/3rdparty/powervr/wsegl2/wsegl.h qt-everywhere-opensource-src-4.6.3/src/3rdparty/powervr/wsegl2/wsegl.h +--- qt-everywhere-opensource-src-4.6.3-orig//src/3rdparty/powervr/wsegl2/wsegl.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.6.3/src/3rdparty/powervr/wsegl2/wsegl.h 2011-05-16 22:51:52.702601769 +0000 +@@ -0,0 +1,285 @@ ++/********************************************************************** ++* ++* Copyright(c) Imagination Technologies Ltd. ++* ++* The contents of this file are subject to the MIT license as set out below. ++* ++* Permission is hereby granted, free of charge, to any person obtaining a copy ++* of this software and associated documentation files (the "Software"), ++* to deal in the Software without restriction, including without limitation ++* the rights to use, copy, modify, merge, publish, distribute, sublicense, ++* and/or sell copies of the Software, and to permit persons to whom the ++* Software is furnished to do so, subject to the following conditions: ++* ++* The above copyright notice and this permission notice shall be included ++* in all copies or substantial portions of the Software. ++* ++* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ++* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, ++* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT ++* OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE ++* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++* ++* This License is also included in this distribution in the file called ++* "COPYING". ++* ++******************************************************************************/ ++ ++ ++ ++#if !defined(__WSEGL_H__) ++#define __WSEGL_H__ ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/* ++// WSEGL Platform-specific definitions ++*/ ++#if defined(__linux__) ++#define WSEGL_EXPORT __attribute__((visibility("default"))) ++#define WSEGL_IMPORT ++#else ++#define WSEGL_EXPORT ++#define WSEGL_IMPORT ++#endif ++ ++/* ++// WSEGL API Version Number ++*/ ++ ++#define WSEGL_VERSION 2 ++#define WSEGL_DEFAULT_DISPLAY 0 ++#define WSEGL_DEFAULT_NATIVE_ENGINE 0 ++ ++#define WSEGL_FALSE 0 ++#define WSEGL_TRUE 1 ++#define WSEGL_NULL 0 ++ ++#define WSEGL_UNREFERENCED_PARAMETER(param) (param) = (param) ++ ++/* ++// WSEGL handles ++*/ ++typedef void *WSEGLDisplayHandle; ++typedef void *WSEGLDrawableHandle; ++ ++/* ++// Display capability type ++*/ ++typedef enum WSEGLCapsType_TAG ++{ ++ WSEGL_NO_CAPS = 0, ++ WSEGL_CAP_MIN_SWAP_INTERVAL = 1, /* System default value = 1 */ ++ WSEGL_CAP_MAX_SWAP_INTERVAL = 2, /* System default value = 1 */ ++ WSEGL_CAP_WINDOWS_USE_HW_SYNC = 3, /* System default value = 0 (FALSE) */ ++ WSEGL_CAP_PIXMAPS_USE_HW_SYNC = 4, /* System default value = 0 (FALSE) */ ++ ++} WSEGLCapsType; ++ ++/* ++// Display capability ++*/ ++typedef struct WSEGLCaps_TAG ++{ ++ WSEGLCapsType eCapsType; ++ unsigned long ui32CapsValue; ++ ++} WSEGLCaps; ++ ++/* ++// Drawable type ++*/ ++#define WSEGL_NO_DRAWABLE 0x0 ++#define WSEGL_DRAWABLE_WINDOW 0x1 ++#define WSEGL_DRAWABLE_PIXMAP 0x2 ++ ++ ++/* ++// Pixel format of display/drawable ++*/ ++typedef enum WSEGLPixelFormat_TAG ++{ ++ /* These must not be re-ordered */ ++ WSEGL_PIXELFORMAT_RGB565 = 0, ++ WSEGL_PIXELFORMAT_ARGB4444 = 1, ++ WSEGL_PIXELFORMAT_ARGB8888 = 2, ++ WSEGL_PIXELFORMAT_ARGB1555 = 3, ++ WSEGL_PIXELFORMAT_ABGR8888 = 4, ++ WSEGL_PIXELFORMAT_XBGR8888 = 5, ++ ++ /* These are compatibility names only; new WSEGL ++ * modules should not use them. ++ */ ++ WSEGL_PIXELFORMAT_565 = WSEGL_PIXELFORMAT_RGB565, ++ WSEGL_PIXELFORMAT_4444 = WSEGL_PIXELFORMAT_ARGB4444, ++ WSEGL_PIXELFORMAT_8888 = WSEGL_PIXELFORMAT_ARGB8888, ++ WSEGL_PIXELFORMAT_1555 = WSEGL_PIXELFORMAT_ARGB1555, ++ ++} WSEGLPixelFormat; ++ ++/* ++// Transparent of display/drawable ++*/ ++typedef enum WSEGLTransparentType_TAG ++{ ++ WSEGL_OPAQUE = 0, ++ WSEGL_COLOR_KEY = 1, ++ ++} WSEGLTransparentType; ++ ++/* ++// Display/drawable configuration ++*/ ++typedef struct WSEGLConfig_TAG ++{ ++ /* ++ // Type of drawables this configuration applies to - ++ // OR'd values of drawable types. ++ */ ++ unsigned long ui32DrawableType; ++ ++ /* Pixel format */ ++ WSEGLPixelFormat ePixelFormat; ++ ++ /* Native Renderable - set to WSEGL_TRUE if native renderable */ ++ unsigned long ulNativeRenderable; ++ ++ /* FrameBuffer Level Parameter */ ++ unsigned long ulFrameBufferLevel; ++ ++ /* Native Visual ID */ ++ unsigned long ulNativeVisualID; ++ ++ /* Native Visual */ ++ void *hNativeVisual; ++ ++ /* Transparent Type */ ++ WSEGLTransparentType eTransparentType; ++ ++ /* Transparent Color - only used if transparent type is COLOR_KEY */ ++ unsigned long ulTransparentColor; /* packed as 0x00RRGGBB */ ++ ++ ++} WSEGLConfig; ++ ++/* ++// WSEGL errors ++*/ ++typedef enum WSEGLError_TAG ++{ ++ WSEGL_SUCCESS = 0, ++ WSEGL_CANNOT_INITIALISE = 1, ++ WSEGL_BAD_NATIVE_DISPLAY = 2, ++ WSEGL_BAD_NATIVE_WINDOW = 3, ++ WSEGL_BAD_NATIVE_PIXMAP = 4, ++ WSEGL_BAD_NATIVE_ENGINE = 5, ++ WSEGL_BAD_DRAWABLE = 6, ++ WSEGL_BAD_MATCH = 7, ++ WSEGL_OUT_OF_MEMORY = 8, ++ ++ /* These are compatibility names only; new WSEGL ++ * modules should not use them. ++ */ ++ WSEGL_BAD_CONFIG = WSEGL_BAD_MATCH, ++ ++} WSEGLError; ++ ++/* ++// Drawable orientation (in degrees anti-clockwise) ++*/ ++typedef enum WSEGLRotationAngle_TAG ++{ ++ WSEGL_ROTATE_0 = 0, ++ WSEGL_ROTATE_90 = 1, ++ WSEGL_ROTATE_180 = 2, ++ WSEGL_ROTATE_270 = 3 ++ ++} WSEGLRotationAngle; ++ ++/* ++// Drawable information required by OpenGL-ES driver ++*/ ++typedef struct WSEGLDrawableParams_TAG ++{ ++ /* Width in pixels of the drawable */ ++ unsigned long ui32Width; ++ ++ /* Height in pixels of the drawable */ ++ unsigned long ui32Height; ++ ++ /* Stride in pixels of the drawable */ ++ unsigned long ui32Stride; ++ ++ /* Pixel format of the drawable */ ++ WSEGLPixelFormat ePixelFormat; ++ ++ /* User space cpu virtual address of the drawable */ ++ void *pvLinearAddress; ++ ++ /* HW address of the drawable */ ++ unsigned long ui32HWAddress; ++ ++ /* Private data for the drawable */ ++ void *hPrivateData; ++ ++ ++} WSEGLDrawableParams; ++ ++ ++/* ++// Table of function pointers that is returned by WSEGL_GetFunctionTablePointer() ++// ++// The first entry in the table is the version number of the wsegl.h header file that ++// the module has been written against, and should therefore be set to WSEGL_VERSION ++*/ ++typedef struct WSEGL_FunctionTable_TAG ++{ ++ unsigned long ui32WSEGLVersion; ++ ++ WSEGLError (*pfnWSEGL_IsDisplayValid)(NativeDisplayType); ++ ++ WSEGLError (*pfnWSEGL_InitialiseDisplay)(NativeDisplayType, WSEGLDisplayHandle *, const WSEGLCaps **, WSEGLConfig **); ++ ++ WSEGLError (*pfnWSEGL_CloseDisplay)(WSEGLDisplayHandle); ++ ++ WSEGLError (*pfnWSEGL_CreateWindowDrawable)(WSEGLDisplayHandle, WSEGLConfig *, WSEGLDrawableHandle *, NativeWindowType, WSEGLRotationAngle *); ++ ++ WSEGLError (*pfnWSEGL_CreatePixmapDrawable)(WSEGLDisplayHandle, WSEGLConfig *, WSEGLDrawableHandle *, NativePixmapType, WSEGLRotationAngle *); ++ ++ WSEGLError (*pfnWSEGL_DeleteDrawable)(WSEGLDrawableHandle); ++ ++ WSEGLError (*pfnWSEGL_SwapDrawable)(WSEGLDrawableHandle, unsigned long); ++ ++ WSEGLError (*pfnWSEGL_SwapControlInterval)(WSEGLDrawableHandle, unsigned long); ++ ++ WSEGLError (*pfnWSEGL_WaitNative)(WSEGLDrawableHandle, unsigned long); ++ ++ WSEGLError (*pfnWSEGL_CopyFromDrawable)(WSEGLDrawableHandle, NativePixmapType); ++ ++ WSEGLError (*pfnWSEGL_CopyFromPBuffer)(void *, unsigned long, unsigned long, unsigned long, WSEGLPixelFormat, NativePixmapType); ++ ++ WSEGLError (*pfnWSEGL_GetDrawableParameters)(WSEGLDrawableHandle, WSEGLDrawableParams *, WSEGLDrawableParams *); ++ ++ WSEGLError (*pfnWSEGL_ConnectDrawable)(WSEGLDrawableHandle); ++ ++ WSEGLError (*pfnWSEGL_DisconnectDrawable)(WSEGLDrawableHandle); ++ ++ ++} WSEGL_FunctionTable; ++ ++ ++WSEGL_IMPORT const WSEGL_FunctionTable *WSEGL_GetFunctionTablePointer(void); ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* __WSEGL_H__ */ ++ ++/****************************************************************************** ++ End of file (wsegl.h) ++******************************************************************************/ +diff -Nurp qt-everywhere-opensource-src-4.6.3-orig//src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c qt-everywhere-opensource-src-4.6.3/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c +--- qt-everywhere-opensource-src-4.6.3-orig//src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c 2010-06-02 02:03:17.000000000 +0000 ++++ qt-everywhere-opensource-src-4.6.3/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c 2011-05-16 23:08:51.618597097 +0000 +@@ -378,6 +378,20 @@ static WSEGLError wseglGetDrawableParame + return WSEGL_SUCCESS; + } + ++/* Function stub for ConnectDrawable() */ ++static WSEGLError wseglConnectDrawable(WSEGLDrawableHandle hDrawable) ++{ ++ WSEGL_UNREFERENCED_PARAMETER(hDrawable); ++ return WSEGL_SUCCESS; ++} ++ ++/* Function stub for DisconnectDrawable() */ ++static WSEGLError wseglDisconnectDrawable(WSEGLDrawableHandle hDrawable) ++{ ++ WSEGL_UNREFERENCED_PARAMETER(hDrawable); ++ return WSEGL_SUCCESS; ++} ++ + static WSEGL_FunctionTable const wseglFunctions = { + WSEGL_VERSION, + wseglIsDisplayValid, +@@ -391,7 +405,9 @@ static WSEGL_FunctionTable const wseglFu + wseglWaitNative, + wseglCopyFromDrawable, + wseglCopyFromPBuffer, +- wseglGetDrawableParameters ++ wseglGetDrawableParameters, ++ wseglConnectDrawable, ++ wseglDisconnectDrawable + }; + + /* Return the table of WSEGL functions to the EGL implementation */ diff --git a/recipes/qt4/qt-4.6.3.inc b/recipes/qt4/qt-4.6.3.inc index a35d57aedd..f8705fa79a 100644 --- a/recipes/qt4/qt-4.6.3.inc +++ b/recipes/qt4/qt-4.6.3.inc @@ -15,6 +15,7 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}. file://0010-no-simpledecoration-example.patch \ file://fix-config-tests.patch \ file://qt-config.patch \ + file://0001-wsegl2-support.patch \ file://g++.conf \ file://linux.conf \ " From 370661f8422334bac921fb2955d23bedff75713e Mon Sep 17 00:00:00 2001 From: Eyal Reizer Date: Thu, 26 May 2011 15:43:17 +0000 Subject: [PATCH 373/509] wpa-gui-e: build the latest version from git sources Builds wpa-gui for qt4-embedded from the latest wpa-supplicant (0.8x) git sources Signed-off-by: Eyal Reizer Signed-off-by: Denys Dmytriyenko --- recipes/wpa-supplicant/wpa-gui-e_git.bb | 27 +++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 recipes/wpa-supplicant/wpa-gui-e_git.bb diff --git a/recipes/wpa-supplicant/wpa-gui-e_git.bb b/recipes/wpa-supplicant/wpa-gui-e_git.bb new file mode 100644 index 0000000000..d90ca901e0 --- /dev/null +++ b/recipes/wpa-supplicant/wpa-gui-e_git.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Qt embedded interface for choosing which configured network \ +to connect to. It also provides a method for browsing 802.11 SSID scan \ +results, an event history log of messages generated by wpa_supplicant, and \ +a method to add or edit wpa_supplicant networks." + +HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" +SECTION = "network" +LICENSE = "GPLv2 | BSD" +RDEPENDS_${PN} = "wpa-supplicant" + +SRCREV = "b8fb017272ed4794339978c9fbc0e74571a44728" + +PV = "0.7.3+0.8.0-rc" +PR = "r0" +PR_append = "+gitr${SRCPV}" + +SRC_URI = "git://w1.fi/srv/git/hostap.git;protocol=git" + +S = "${WORKDIR}/git/wpa_supplicant/wpa_gui-qt4" + +inherit qt4e +ARM_INSTRUCTION_SET = "arm" + +do_install () { + install -d ${D}${bindir} + install -m 755 wpa_gui ${D}/${bindir}/wpa_gui-e +} From 3b34faed781e777f3d206d08a959dca440fbdd86 Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Thu, 12 May 2011 12:14:50 +0000 Subject: [PATCH 374/509] ti816x machine: Fix JFFS Image command * Fixes a bug in the command passed for JFFS2 Image creation. Signed-off-by: Siddharth Heroor Signed-off-by: Denys Dmytriyenko --- conf/machine/include/ti816x.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/ti816x.inc b/conf/machine/include/ti816x.inc index ebf51661b6..9db1df8dee 100644 --- a/conf/machine/include/ti816x.inc +++ b/conf/machine/include/ti816x.inc @@ -21,6 +21,6 @@ EXTRA_IMAGEDEPENDS += "u-boot" # Ship all kernel modules IMAGE_FSTYPES += "jffs2 tar.bz2" -EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" +EXTRA_IMAGECMD_jffs2 = "-lqn -e 128" SERIAL_CONSOLE = "115200 ttyS2" MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 ethernet" From 642b369b3e6c486a034384f911697bf495bd9590 Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Thu, 12 May 2011 12:14:51 +0000 Subject: [PATCH 375/509] ti816x machine: Update for latest kernel version * In 2.6.37 the console is tied to ttyO2. Signed-off-by: Siddharth Heroor Signed-off-by: Denys Dmytriyenko --- conf/machine/include/ti816x.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/ti816x.inc b/conf/machine/include/ti816x.inc index 9db1df8dee..ef562647e9 100644 --- a/conf/machine/include/ti816x.inc +++ b/conf/machine/include/ti816x.inc @@ -22,5 +22,5 @@ EXTRA_IMAGEDEPENDS += "u-boot" # Ship all kernel modules IMAGE_FSTYPES += "jffs2 tar.bz2" EXTRA_IMAGECMD_jffs2 = "-lqn -e 128" -SERIAL_CONSOLE = "115200 ttyS2" +SERIAL_CONSOLE = "115200 ttyO2" MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 ethernet" From 55deef7d40d0c369f8f98d0dbdade66813b12549 Mon Sep 17 00:00:00 2001 From: Siddharth Heroor Date: Thu, 12 May 2011 12:14:52 +0000 Subject: [PATCH 376/509] sysvinit: bump PR for ti816x serial console change * A new inittab is needed, so bump PR to regenerate it. Signed-off-by: Siddharth Heroor Signed-off-by: Denys Dmytriyenko --- recipes/sysvinit/sysvinit_2.86.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/sysvinit/sysvinit_2.86.bb b/recipes/sysvinit/sysvinit_2.86.bb index 66c3952ae4..1cc5d18cb7 100644 --- a/recipes/sysvinit/sysvinit_2.86.bb +++ b/recipes/sysvinit/sysvinit_2.86.bb @@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init." SECTION = "base" LICENSE = "GPLv2+" HOMEPAGE = "http://freshmeat.net/projects/sysvinit/" -PR = "r63" +PR = "r66" # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. # Set PACKAGE_ARCH appropriately. From 1b74aeda28027274abc0b230d0617251e7f386d6 Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Thu, 10 Mar 2011 18:44:00 +0100 Subject: [PATCH 377/509] linux-2.6.24: add support for AMIC flashes (e.g. A29L160AT) Similar patch is on its way to the mainline kernel: http://thread.gmane.org/gmane.linux.kernel/1111144 Signed-off-by: Steffen Sledz --- recipes/linux/linux-2.6.24/cfi-amic.patch | 22 ++++++++++++++++++++++ recipes/linux/linux_2.6.24.bb | 3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 recipes/linux/linux-2.6.24/cfi-amic.patch diff --git a/recipes/linux/linux-2.6.24/cfi-amic.patch b/recipes/linux/linux-2.6.24/cfi-amic.patch new file mode 100644 index 0000000000..feb673f73f --- /dev/null +++ b/recipes/linux/linux-2.6.24/cfi-amic.patch @@ -0,0 +1,22 @@ +diff -Nurd linux-2.6.24.orig//drivers/mtd/chips/cfi_cmdset_0002.c linux-2.6.24/drivers/mtd/chips/cfi_cmdset_0002.c +--- linux-2.6.24.orig//drivers/mtd/chips/cfi_cmdset_0002.c 2011-03-10 17:05:22.868634509 +0100 ++++ linux-2.6.24/drivers/mtd/chips/cfi_cmdset_0002.c 2011-03-10 17:06:58.723636256 +0100 +@@ -219,6 +219,7 @@ + static struct cfi_fixup cfi_fixup_table[] = { + #ifdef AMD_BOOTLOC_BUG + { CFI_MFR_AMD, CFI_ID_ANY, fixup_amd_bootblock, NULL }, ++ { CFI_MFR_AMIC, CFI_ID_ANY, fixup_amd_bootblock, NULL }, + #endif + { CFI_MFR_AMD, 0x0050, fixup_use_secsi, NULL, }, + { CFI_MFR_AMD, 0x0053, fixup_use_secsi, NULL, }, +diff -Nurd linux-2.6.24.orig//include/linux/mtd/cfi.h linux-2.6.24/include/linux/mtd/cfi.h +--- linux-2.6.24.orig//include/linux/mtd/cfi.h 2011-03-10 17:05:19.584884614 +0100 ++++ linux-2.6.24/include/linux/mtd/cfi.h 2011-03-10 17:08:03.886636402 +0100 +@@ -485,6 +485,7 @@ + #define CFI_ID_ANY 0xffff + + #define CFI_MFR_AMD 0x0001 ++#define CFI_MFR_AMIC 0x0037 + #define CFI_MFR_ATMEL 0x001F + #define CFI_MFR_ST 0x0020 /* STMicroelectronics */ + diff --git a/recipes/linux/linux_2.6.24.bb b/recipes/linux/linux_2.6.24.bb index d03d2b7613..5c05593c39 100644 --- a/recipes/linux/linux_2.6.24.bb +++ b/recipes/linux/linux_2.6.24.bb @@ -11,13 +11,14 @@ DEFAULT_PREFERENCE_hipox = "1" DEFAULT_PREFERENCE_cs-e9302 = "1" DEFAULT_PREFERENCE_smartq5 = "1" -PR = "r35" +PR = "r36" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;apply=yes;name=stablepatch \ file://squashfs-lzma-2.6.24.patch \ file://ubifs-v2.6.24.patch \ file://ubifs-v2.6.24-silent-get-sb.patch \ + file://cfi-amic.patch \ file://defconfig" # Moved away temporarely until committed properly (work in progress). From 2ab5a55c7686970c90193a47a8352fd8ee8607fa Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Mon, 28 Mar 2011 15:43:31 +0200 Subject: [PATCH 378/509] linux-2.6.24: allow building kernel with newer GNU make GNU make >= 3.82 does not allow mixed implicit and normal rules Signed-off-by: Steffen Sledz Acked-by: Khem Raj --- .../linux-libc-headers-2.6.24/make-3.82.patch | 29 +++++++++++++++++++ .../linux-libc-headers_2.6.24.bb | 3 +- recipes/linux/linux-2.6.24/make-3.82.patch | 29 +++++++++++++++++++ recipes/linux/linux_2.6.24.bb | 3 +- 4 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 recipes/linux-libc-headers/linux-libc-headers-2.6.24/make-3.82.patch create mode 100644 recipes/linux/linux-2.6.24/make-3.82.patch diff --git a/recipes/linux-libc-headers/linux-libc-headers-2.6.24/make-3.82.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/make-3.82.patch new file mode 100644 index 0000000000..99896d9f4c --- /dev/null +++ b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/make-3.82.patch @@ -0,0 +1,29 @@ +diff -Nurd linux-2.6.24.orig//Makefile linux-2.6.24/Makefile +--- linux-2.6.24.orig//Makefile 2011-03-29 07:56:05.122449521 +0200 ++++ linux-2.6.24/Makefile 2011-03-29 07:57:48.726768621 +0200 +@@ -431,7 +431,11 @@ + include $(srctree)/arch/$(SRCARCH)/Makefile + export KBUILD_DEFCONFIG + +-config %config: scripts_basic outputmakefile FORCE ++config: scripts_basic outputmakefile FORCE ++ $(Q)mkdir -p include/linux include/config ++ $(Q)$(MAKE) $(build)=scripts/kconfig $@ ++ ++%config: scripts_basic outputmakefile FORCE + $(Q)mkdir -p include/linux include/config + $(Q)$(MAKE) $(build)=scripts/kconfig $@ + +@@ -1500,7 +1504,11 @@ + $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) + + # Modules +-/ %/: prepare scripts FORCE ++/: prepare scripts FORCE ++ $(cmd_crmodverdir) ++ $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ ++ $(build)=$(build-dir) ++%/: prepare scripts FORCE + $(cmd_crmodverdir) + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ + $(build)=$(build-dir) diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb index e95299bc66..9c683a7513 100644 --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb @@ -2,11 +2,12 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r6" +PR = "r7" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://procinfo.h \ file://export_falloc_h.patch \ + file://make-3.82.patch \ file://unifdef.patch" S = "${WORKDIR}/linux-${PV}" diff --git a/recipes/linux/linux-2.6.24/make-3.82.patch b/recipes/linux/linux-2.6.24/make-3.82.patch new file mode 100644 index 0000000000..99896d9f4c --- /dev/null +++ b/recipes/linux/linux-2.6.24/make-3.82.patch @@ -0,0 +1,29 @@ +diff -Nurd linux-2.6.24.orig//Makefile linux-2.6.24/Makefile +--- linux-2.6.24.orig//Makefile 2011-03-29 07:56:05.122449521 +0200 ++++ linux-2.6.24/Makefile 2011-03-29 07:57:48.726768621 +0200 +@@ -431,7 +431,11 @@ + include $(srctree)/arch/$(SRCARCH)/Makefile + export KBUILD_DEFCONFIG + +-config %config: scripts_basic outputmakefile FORCE ++config: scripts_basic outputmakefile FORCE ++ $(Q)mkdir -p include/linux include/config ++ $(Q)$(MAKE) $(build)=scripts/kconfig $@ ++ ++%config: scripts_basic outputmakefile FORCE + $(Q)mkdir -p include/linux include/config + $(Q)$(MAKE) $(build)=scripts/kconfig $@ + +@@ -1500,7 +1504,11 @@ + $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) + + # Modules +-/ %/: prepare scripts FORCE ++/: prepare scripts FORCE ++ $(cmd_crmodverdir) ++ $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ ++ $(build)=$(build-dir) ++%/: prepare scripts FORCE + $(cmd_crmodverdir) + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ + $(build)=$(build-dir) diff --git a/recipes/linux/linux_2.6.24.bb b/recipes/linux/linux_2.6.24.bb index 5c05593c39..5cc686a4c7 100644 --- a/recipes/linux/linux_2.6.24.bb +++ b/recipes/linux/linux_2.6.24.bb @@ -11,7 +11,7 @@ DEFAULT_PREFERENCE_hipox = "1" DEFAULT_PREFERENCE_cs-e9302 = "1" DEFAULT_PREFERENCE_smartq5 = "1" -PR = "r36" +PR = "r37" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;apply=yes;name=stablepatch \ @@ -19,6 +19,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=k file://ubifs-v2.6.24.patch \ file://ubifs-v2.6.24-silent-get-sb.patch \ file://cfi-amic.patch \ + file://make-3.82.patch \ file://defconfig" # Moved away temporarely until committed properly (work in progress). From f19ad3f92d1b503be9745c15b115883c70d51bb0 Mon Sep 17 00:00:00 2001 From: Mario Schuknecht Date: Thu, 14 Oct 2010 12:29:21 +0000 Subject: [PATCH 379/509] linux-libc-headers-2.6.24: add additional tcp ioctl (for hipox machine only) Signed-off-by: Mario Schuknecht Acked-by: Steffen Sledz --- .../hipox/siocoutqsnd.patch | 54 +++++++++++++++++++ .../linux-libc-headers_2.6.24.bb | 4 ++ 2 files changed, 58 insertions(+) create mode 100644 recipes/linux-libc-headers/linux-libc-headers-2.6.24/hipox/siocoutqsnd.patch diff --git a/recipes/linux-libc-headers/linux-libc-headers-2.6.24/hipox/siocoutqsnd.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/hipox/siocoutqsnd.patch new file mode 100644 index 0000000000..616a860d62 --- /dev/null +++ b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/hipox/siocoutqsnd.patch @@ -0,0 +1,54 @@ +tcp: ioctl type SIOCOUTQNSD returns amount of data not sent + +In contrast to SIOCOUTQ which returns the amount of data sent +but not yet acknowledged plus data not yet sent this patch only +returns the data not sent. + +For various methods of live streaming bitrate control it may +be helpful to know how much data are in the tcp outqueue are +not sent yet. + +Signed-off-by: Mario Schuknecht + +diff -Nurd linux-2.6.24.orig//include/asm-arm/ioctls.h linux-2.6.24/include/asm-arm/ioctls.h +--- linux-2.6.24.orig//include/asm-arm/ioctls.h 2010-10-08 09:03:02.000000000 +0200 ++++ linux-2.6.24/include/asm-arm/ioctls.h 2010-10-08 09:09:55.000000000 +0200 +@@ -53,6 +53,8 @@ + #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ + #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ + ++#define TIOCOUTQNSD 0x5437 ++ + #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ + #define FIOCLEX 0x5451 + #define FIOASYNC 0x5452 +diff -Nurd linux-2.6.24.orig//include/linux/sockios.h linux-2.6.24/include/linux/sockios.h +--- linux-2.6.24.orig//include/linux/sockios.h 2010-10-08 09:03:02.000000000 +0200 ++++ linux-2.6.24/include/linux/sockios.h 2010-10-08 09:10:43.000000000 +0200 +@@ -23,6 +23,7 @@ + /* Linux-specific socket ioctls */ + #define SIOCINQ FIONREAD + #define SIOCOUTQ TIOCOUTQ ++#define SIOCOUTQNSD TIOCOUTQNSD + + /* Routing table calls. */ + #define SIOCADDRT 0x890B /* add routing table entry */ +diff -Nurd linux-2.6.24.orig//net/ipv4/tcp.c linux-2.6.24/net/ipv4/tcp.c +--- linux-2.6.24.orig//net/ipv4/tcp.c 2010-10-08 09:02:59.000000000 +0200 ++++ linux-2.6.24/net/ipv4/tcp.c 2010-10-08 09:10:43.000000000 +0200 +@@ -444,6 +444,15 @@ + else + answ = tp->write_seq - tp->snd_una; + break; ++ case SIOCOUTQNSD: ++ if (sk->sk_state == TCP_LISTEN) ++ return -EINVAL; ++ ++ if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV)) ++ answ = 0; ++ else ++ answ = tp->write_seq - tp->snd_nxt; ++ break; + default: + return -ENOIOCTLCMD; + } diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb index 9c683a7513..148d03fae3 100644 --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb @@ -10,6 +10,10 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://make-3.82.patch \ file://unifdef.patch" +SRC_URI_append_hipox = " \ + file://siocoutqsnd.patch \ + " + S = "${WORKDIR}/linux-${PV}" do_configure() { From b4052f5c3636fdb13671e1b79f3c84fd9d13b1ea Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Thu, 31 Mar 2011 15:18:00 +0000 Subject: [PATCH 380/509] linux-2.6.24: fix 1/2-byte read access to PCI config space (hipox machine only) Signed-off-by: Thilo Fromm Acked-by: Steffen Sledz --- .../hipox/ox810-pci-read-config-fix.patch | 17 +++++++++++++++++ recipes/linux/linux_2.6.24.bb | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 recipes/linux/linux-2.6.24/hipox/ox810-pci-read-config-fix.patch diff --git a/recipes/linux/linux-2.6.24/hipox/ox810-pci-read-config-fix.patch b/recipes/linux/linux-2.6.24/hipox/ox810-pci-read-config-fix.patch new file mode 100644 index 0000000000..5df26762db --- /dev/null +++ b/recipes/linux/linux-2.6.24/hipox/ox810-pci-read-config-fix.patch @@ -0,0 +1,17 @@ +--- /linux-2.6.24-orig/arch/arm/mach-hipox/pci.c 2011-03-31 16:56:17.968638003 +0200 ++++ /linux-2.6.24/arch/arm/mach-hipox/pci.c 2011-03-31 17:06:21.198638000 +0200 +@@ -311,12 +311,12 @@ + switch (size) { + case 1: + // printk(KERN_DEBUG "PCI: readb( 0x%lx )\n", PCI_CONFIG_IO_READ_DATA ); +- *value>>=(where&3); ++ *value >>= ( (where & 3) * 8); + *value&=0x000000ff; + break; + case 2: + // printk(KERN_DEBUG "PCI: readw( 0x%lx )\n", PCI_CONFIG_IO_READ_DATA ); +- *value>>=(where&2); ++ *value >>= ( (where & 2) * 8); + *value&=0x0000ffff; + break; + case 4: diff --git a/recipes/linux/linux_2.6.24.bb b/recipes/linux/linux_2.6.24.bb index 5cc686a4c7..2552ae0277 100644 --- a/recipes/linux/linux_2.6.24.bb +++ b/recipes/linux/linux_2.6.24.bb @@ -11,7 +11,7 @@ DEFAULT_PREFERENCE_hipox = "1" DEFAULT_PREFERENCE_cs-e9302 = "1" DEFAULT_PREFERENCE_smartq5 = "1" -PR = "r37" +PR = "r38" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;apply=yes;name=stablepatch \ @@ -106,6 +106,7 @@ SRC_URI_append_hipox = " \ file://hipox-poe-enable.patch \ file://siocoutqsnd.patch \ file://hipox-phy.patch \ + file://ox810-pci-read-config-fix.patch \ " EXTRA_OEMAKE_smartq5 = " OBJCOPY=${OBJCOPY}" From c37b961ca2decf42bd381232b0d440952855cb16 Mon Sep 17 00:00:00 2001 From: Mario Schuknecht Date: Thu, 5 May 2011 09:39:43 +0000 Subject: [PATCH 381/509] linux-2.6.24: optimize flash timings (hipox machine only) Signed-off-by: Mario Schuknecht Acked-by: Steffen Sledz --- .../hipox/hipox-nand-timing.patch | 63 +++++++++++++ .../hipox/hipox-nand-vs-nor.patch | 88 ++++++++++--------- recipes/linux/linux_2.6.24.bb | 1 + 3 files changed, 109 insertions(+), 43 deletions(-) create mode 100644 recipes/linux/linux-2.6.24/hipox/hipox-nand-timing.patch diff --git a/recipes/linux/linux-2.6.24/hipox/hipox-nand-timing.patch b/recipes/linux/linux-2.6.24/hipox/hipox-nand-timing.patch new file mode 100644 index 0000000000..be3f861fef --- /dev/null +++ b/recipes/linux/linux-2.6.24/hipox/hipox-nand-timing.patch @@ -0,0 +1,63 @@ +diff -Nurd linux-2.6.24.orig/drivers/mtd/maps/physmap.c linux-2.6.24/drivers/mtd/maps/physmap.c +--- linux-2.6.24.orig/drivers/mtd/maps/physmap.c 2011-05-03 15:40:51.000000000 +0200 ++++ linux-2.6.24/drivers/mtd/maps/physmap.c 2011-05-05 10:08:00.000000000 +0200 +@@ -156,7 +156,9 @@ + + #if defined (CONFIG_ARCH_HIPOX) + /* init timing for static memory controller */ ++ mutex_lock(&hipox_flash_mutex); + writel(STATIC_BUS_FLASH_CONFIG, STATIC_CONTROL_BANK0); ++ mutex_unlock(&hipox_flash_mutex); + #endif /* CONFIG_ARCH_HIPOX */ + + printk(KERN_NOTICE "physmap platform flash device: %.8llx at %.8llx\n", +diff -Nurd linux-2.6.24.orig/drivers/mtd/nand/hipox_nand.c linux-2.6.24/drivers/mtd/nand/hipox_nand.c +--- linux-2.6.24.orig/drivers/mtd/nand/hipox_nand.c 2011-05-03 15:40:51.000000000 +0200 ++++ linux-2.6.24/drivers/mtd/nand/hipox_nand.c 2011-05-05 10:07:52.000000000 +0200 +@@ -30,9 +30,10 @@ + + // the testboards ran down to a value of 4 + //#define STATIC_BUS_FLASH_CONFIG 0x4f1f3f3f /* slow settings, 345 ns */ +-//#define STATIC_BUS_FLASH_CONFIG 0x4f1f3f0d /* fast settings, 70 ns */ ++#define STATIC_BUS_FLASH_CONFIG 0x4f1f3f0d /* fast settings, 70 ns; use this as default, because it works for hipox board NOR flash also */ + //#define STATIC_BUS_FLASH_CONFIG 0x4f1f3f09 /* ultra fast settings, 50 ns */ +-#define STATIC_BUS_FLASH_CONFIG 0x4f1f3f04 /* warp settings, 27 ns */ ++//#define STATIC_BUS_FLASH_CONFIG 0x4f1f3f04 /* warp settings, 27 ns */ ++#define STATIC_BUS_FLASH_CONFIG_RW 0x41030304 /* read and write warp settings */ + + /* + * MTD structure for HydraIP board +@@ -65,6 +66,7 @@ + */ + static void hipox_nand_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl) + { ++ static unsigned int bank0 = STATIC_BUS_FLASH_CONFIG; + struct nand_chip *this = mtd->priv; + + if (ctrl & NAND_CTRL_CHANGE) { +@@ -77,12 +79,15 @@ + // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); + mutex_lock(&hipox_flash_mutex); + writel(0x20000000, GPIO_A_OUTPUT_CLEAR); /* assert CS-NAND */ ++ bank0 = readl(STATIC_CONTROL_BANK0); ++ writel(STATIC_BUS_FLASH_CONFIG_RW, STATIC_CONTROL_BANK0); + } + } + else + { + if (!(0x20000000 & readl(GPIO_A_OUTPUT_VALUE))) + { ++ writel(bank0, STATIC_CONTROL_BANK0); + writel(0x20000000, GPIO_A_OUTPUT_SET); /* deassert CS-NAND */ + mutex_unlock(&hipox_flash_mutex); + // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); +@@ -234,7 +239,9 @@ + return -ENOMEM; + } + ++ mutex_lock(&hipox_flash_mutex); + writel(STATIC_BUS_FLASH_CONFIG, STATIC_CONTROL_BANK0); ++ mutex_unlock(&hipox_flash_mutex); + + /* Initialize structures */ + memset(hipox_nand_mtd, 0, sizeof(struct mtd_info)); diff --git a/recipes/linux/linux-2.6.24/hipox/hipox-nand-vs-nor.patch b/recipes/linux/linux-2.6.24/hipox/hipox-nand-vs-nor.patch index 22dcc1bd16..8b7bc36d1e 100644 --- a/recipes/linux/linux-2.6.24/hipox/hipox-nand-vs-nor.patch +++ b/recipes/linux/linux-2.6.24/hipox/hipox-nand-vs-nor.patch @@ -1,18 +1,6 @@ -diff -Nurd linux-2.6.24.orig//arch/arm/mach-hipox/Makefile linux-2.6.24/arch/arm/mach-hipox/Makefile ---- linux-2.6.24.orig//arch/arm/mach-hipox/Makefile 2010-01-29 11:50:34.000000000 +0100 -+++ linux-2.6.24/arch/arm/mach-hipox/Makefile 2010-01-29 11:54:02.000000000 +0100 -@@ -4,7 +4,7 @@ - - # Object file lists. - --obj-y := hipox.o irq.o time.o dma.o pci.o ahb_mon.o leon.o samba_reserve.o -+obj-y := hipox.o irq.o time.o dma.o pci.o ahb_mon.o leon.o samba_reserve.o smc.o - - obj-$(CONFIG_SYNOPSYS_GMAC) += gmac.o - -diff -Nurd linux-2.6.24.orig//arch/arm/mach-hipox/hipox.c linux-2.6.24/arch/arm/mach-hipox/hipox.c ---- linux-2.6.24.orig//arch/arm/mach-hipox/hipox.c 2010-01-29 11:50:34.000000000 +0100 -+++ linux-2.6.24/arch/arm/mach-hipox/hipox.c 2010-01-29 11:51:26.000000000 +0100 +diff -Nurd linux-2.6.24.orig/arch/arm/mach-hipox/hipox.c linux-2.6.24/arch/arm/mach-hipox/hipox.c +--- linux-2.6.24.orig/arch/arm/mach-hipox/hipox.c 2011-05-03 17:05:00.000000000 +0200 ++++ linux-2.6.24/arch/arm/mach-hipox/hipox.c 2011-05-03 17:05:40.000000000 +0200 @@ -25,6 +25,7 @@ #include #include @@ -32,10 +20,22 @@ diff -Nurd linux-2.6.24.orig//arch/arm/mach-hipox/hipox.c linux-2.6.24/arch/arm/ // To hold LED inversion state int hipox_global_invert_leds = 0; #include -diff -Nurd linux-2.6.24.orig//arch/arm/mach-hipox/smc.c linux-2.6.24/arch/arm/mach-hipox/smc.c ---- linux-2.6.24.orig//arch/arm/mach-hipox/smc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.24/arch/arm/mach-hipox/smc.c 2010-01-29 11:51:26.000000000 +0100 -@@ -0,0 +1,73 @@ +diff -Nurd linux-2.6.24.orig/arch/arm/mach-hipox/Makefile linux-2.6.24/arch/arm/mach-hipox/Makefile +--- linux-2.6.24.orig/arch/arm/mach-hipox/Makefile 2011-05-03 17:05:00.000000000 +0200 ++++ linux-2.6.24/arch/arm/mach-hipox/Makefile 2011-05-03 17:05:40.000000000 +0200 +@@ -4,7 +4,7 @@ + + # Object file lists. + +-obj-y := hipox.o irq.o time.o dma.o pci.o ahb_mon.o leon.o samba_reserve.o ++obj-y := hipox.o irq.o time.o dma.o pci.o ahb_mon.o leon.o samba_reserve.o smc.o + + obj-$(CONFIG_SYNOPSYS_GMAC) += gmac.o + +diff -Nurd linux-2.6.24.orig/arch/arm/mach-hipox/smc.c linux-2.6.24/arch/arm/mach-hipox/smc.c +--- linux-2.6.24.orig/arch/arm/mach-hipox/smc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.24/arch/arm/mach-hipox/smc.c 2011-05-04 09:28:41.000000000 +0200 +@@ -0,0 +1,74 @@ +/* + * linux/arch/arm/mach-hipox/smc.c + * @@ -62,8 +62,9 @@ diff -Nurd linux-2.6.24.orig//arch/arm/mach-hipox/smc.c linux-2.6.24/arch/arm/ma +#include +#include +#include ++#include + -+static unsigned int request_pci_timestamp = 0; ++static ktime_t request_pci_timestamp = {0}; +/* + * Request PCI_ARB to grant access to the STATIC core. + */ @@ -87,7 +88,7 @@ diff -Nurd linux-2.6.24.orig//arch/arm/mach-hipox/smc.c linux-2.6.24/arch/arm/ma + if (!(readl(SYS_CTRL_PCI_STAT) & (1UL << SYSCTL_PCI_STAT_SYSPCI_STATIC_GNT))) + printk(KERN_WARNING "%s: timeout requesting access to PCI bus for static memory interface\n", __func__); + -+ request_pci_timestamp = jiffies_to_msecs(get_jiffies_64()); ++ request_pci_timestamp = ktime_get(); +} + +/* @@ -95,23 +96,23 @@ diff -Nurd linux-2.6.24.orig//arch/arm/mach-hipox/smc.c linux-2.6.24/arch/arm/ma + */ +void hipox_smc_release_pci_ad_31_0(void) +{ -+ const unsigned int timeout = 100; /* ms */ -+ unsigned int delta = jiffies_to_msecs(get_jiffies_64()) - request_pci_timestamp; ++ const s64 timeout = 400; /* us */ ++ s64 delta = ktime_us_delta(ktime_get(), request_pci_timestamp); + + /* set PCI_ARB request bit in Sysctrl_PCI_Ctrl1 */ + writel(readl(SYS_CTRL_PCI_CTRL1) & ~(1UL << SYSCTL_PCI_CTRL1_SYSPCI_STATIC_REQ), SYS_CTRL_PCI_CTRL1); + + if (delta > timeout) + { -+ printk(KERN_WARNING "%s: static memory interface blocked PCI bus for %u ms\n", __func__, delta); ++ printk(KERN_WARNING "%s: static memory interface blocked PCI bus for %llu us\n", __func__, delta); + } +} + +EXPORT_SYMBOL(hipox_smc_request_pci_ad_31_0); +EXPORT_SYMBOL(hipox_smc_release_pci_ad_31_0); -diff -Nurd linux-2.6.24.orig//drivers/mtd/chips/cfi_cmdset_0002.c linux-2.6.24/drivers/mtd/chips/cfi_cmdset_0002.c ---- linux-2.6.24.orig//drivers/mtd/chips/cfi_cmdset_0002.c 2010-01-29 11:50:32.000000000 +0100 -+++ linux-2.6.24/drivers/mtd/chips/cfi_cmdset_0002.c 2010-01-29 11:51:26.000000000 +0100 +diff -Nurd linux-2.6.24.orig/drivers/mtd/chips/cfi_cmdset_0002.c linux-2.6.24/drivers/mtd/chips/cfi_cmdset_0002.c +--- linux-2.6.24.orig/drivers/mtd/chips/cfi_cmdset_0002.c 2011-05-03 17:04:58.000000000 +0200 ++++ linux-2.6.24/drivers/mtd/chips/cfi_cmdset_0002.c 2011-05-03 17:05:40.000000000 +0200 @@ -46,11 +46,14 @@ #define MANUFACTURER_AMD 0x0001 @@ -152,9 +153,9 @@ diff -Nurd linux-2.6.24.orig//drivers/mtd/chips/cfi_cmdset_0002.c linux-2.6.24/d #if !FORCE_WORD_WRITE { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers, NULL, }, #endif -diff -Nurd linux-2.6.24.orig//drivers/mtd/maps/physmap.c linux-2.6.24/drivers/mtd/maps/physmap.c ---- linux-2.6.24.orig//drivers/mtd/maps/physmap.c 2010-01-29 11:50:32.000000000 +0100 -+++ linux-2.6.24/drivers/mtd/maps/physmap.c 2010-01-29 11:51:26.000000000 +0100 +diff -Nurd linux-2.6.24.orig/drivers/mtd/maps/physmap.c linux-2.6.24/drivers/mtd/maps/physmap.c +--- linux-2.6.24.orig/drivers/mtd/maps/physmap.c 2011-05-03 17:04:58.000000000 +0200 ++++ linux-2.6.24/drivers/mtd/maps/physmap.c 2011-05-03 17:05:40.000000000 +0200 @@ -18,11 +18,13 @@ #include #include @@ -258,9 +259,9 @@ diff -Nurd linux-2.6.24.orig//drivers/mtd/maps/physmap.c linux-2.6.24/drivers/mt probe_type = rom_probe_types; for (; info->mtd == NULL && *probe_type != NULL; probe_type++) -diff -Nurd linux-2.6.24.orig//drivers/mtd/nand/hipox_nand.c linux-2.6.24/drivers/mtd/nand/hipox_nand.c ---- linux-2.6.24.orig//drivers/mtd/nand/hipox_nand.c 2010-01-29 11:50:32.000000000 +0100 -+++ linux-2.6.24/drivers/mtd/nand/hipox_nand.c 2010-01-29 11:51:26.000000000 +0100 +diff -Nurd linux-2.6.24.orig/drivers/mtd/nand/hipox_nand.c linux-2.6.24/drivers/mtd/nand/hipox_nand.c +--- linux-2.6.24.orig/drivers/mtd/nand/hipox_nand.c 2011-05-03 17:04:58.000000000 +0200 ++++ linux-2.6.24/drivers/mtd/nand/hipox_nand.c 2011-05-03 17:05:40.000000000 +0200 @@ -21,9 +21,10 @@ #include #include @@ -455,9 +456,9 @@ diff -Nurd linux-2.6.24.orig//drivers/mtd/nand/hipox_nand.c linux-2.6.24/drivers writel(0x20000000, GPIO_A_OUTPUT_CLEAR); // reset NAND unit -diff -Nurd linux-2.6.24.orig//include/asm-arm/arch-hipox/smc.h linux-2.6.24/include/asm-arm/arch-hipox/smc.h ---- linux-2.6.24.orig//include/asm-arm/arch-hipox/smc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.24/include/asm-arm/arch-hipox/smc.h 2010-01-29 11:51:26.000000000 +0100 +diff -Nurd linux-2.6.24.orig/include/asm-arm/arch-hipox/smc.h linux-2.6.24/include/asm-arm/arch-hipox/smc.h +--- linux-2.6.24.orig/include/asm-arm/arch-hipox/smc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.24/include/asm-arm/arch-hipox/smc.h 2011-05-03 17:05:40.000000000 +0200 @@ -0,0 +1,28 @@ +/* linux/include/asm-arm/arch-hipox/smc.h + * @@ -487,19 +488,20 @@ diff -Nurd linux-2.6.24.orig//include/asm-arm/arch-hipox/smc.h linux-2.6.24/incl +void hipox_smc_release_pci_ad_31_0(void); + +#endif // __ASM_ARCH_SMC_H -diff -Nurd linux-2.6.24.orig//include/asm-arm/arch-hipox/system.h linux-2.6.24/include/asm-arm/arch-hipox/system.h ---- linux-2.6.24.orig//include/asm-arm/arch-hipox/system.h 2010-01-29 11:50:34.000000000 +0100 -+++ linux-2.6.24/include/asm-arm/arch-hipox/system.h 2010-01-29 11:51:26.000000000 +0100 -@@ -8,5 +8,6 @@ +diff -Nurd linux-2.6.24.orig/include/asm-arm/arch-hipox/system.h linux-2.6.24/include/asm-arm/arch-hipox/system.h +--- linux-2.6.24.orig/include/asm-arm/arch-hipox/system.h 2011-05-03 17:05:01.000000000 +0200 ++++ linux-2.6.24/include/asm-arm/arch-hipox/system.h 2011-05-03 17:05:40.000000000 +0200 +@@ -8,6 +8,7 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H +#include #include #include -diff -Nurd linux-2.6.24.orig//include/linux/mtd/cfi.h linux-2.6.24/include/linux/mtd/cfi.h ---- linux-2.6.24.orig//include/linux/mtd/cfi.h 2010-01-29 12:11:03.000000000 +0100 -+++ linux-2.6.24/include/linux/mtd/cfi.h 2010-01-29 12:11:24.000000000 +0100 + +diff -Nurd linux-2.6.24.orig/include/linux/mtd/cfi.h linux-2.6.24/include/linux/mtd/cfi.h +--- linux-2.6.24.orig/include/linux/mtd/cfi.h 2011-05-03 17:05:01.000000000 +0200 ++++ linux-2.6.24/include/linux/mtd/cfi.h 2011-05-03 17:05:40.000000000 +0200 @@ -486,6 +486,7 @@ #define CFI_MFR_AMD 0x0001 diff --git a/recipes/linux/linux_2.6.24.bb b/recipes/linux/linux_2.6.24.bb index 2552ae0277..97eef1b16e 100644 --- a/recipes/linux/linux_2.6.24.bb +++ b/recipes/linux/linux_2.6.24.bb @@ -107,6 +107,7 @@ SRC_URI_append_hipox = " \ file://siocoutqsnd.patch \ file://hipox-phy.patch \ file://ox810-pci-read-config-fix.patch \ + file://hipox-nand-timing.patch \ " EXTRA_OEMAKE_smartq5 = " OBJCOPY=${OBJCOPY}" From 1db31e1ffb4c731f80060f4201e9cca8a7ab6991 Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Fri, 20 May 2011 10:36:37 +0000 Subject: [PATCH 382/509] linux-2.6.24: add PCI abort handler (hipox machine only) Signed-off-by: Thilo Fromm --- .../hipox/ox810-pci-abort-handler.patch | 1009 +++++++++++++++++ recipes/linux/linux_2.6.24.bb | 3 +- 2 files changed, 1011 insertions(+), 1 deletion(-) create mode 100644 recipes/linux/linux-2.6.24/hipox/ox810-pci-abort-handler.patch diff --git a/recipes/linux/linux-2.6.24/hipox/ox810-pci-abort-handler.patch b/recipes/linux/linux-2.6.24/hipox/ox810-pci-abort-handler.patch new file mode 100644 index 0000000000..f85954be8b --- /dev/null +++ b/recipes/linux/linux-2.6.24/hipox/ox810-pci-abort-handler.patch @@ -0,0 +1,1009 @@ +--- old/arch/arm/mach-hipox/pci.c 2011-05-16 11:00:10.665564998 +0200 ++++ new/arch/arm/mach-hipox/pci.c 2011-05-17 17:13:33.845565008 +0200 +@@ -667,6 +667,44 @@ + .postinit = hipox_pci_postinit, + }; + ++static int abort_handler(unsigned long addr, unsigned int fsr, struct pt_regs *regs) ++{ ++ unsigned long pc = instruction_pointer(regs); ++ unsigned long instr = *(unsigned long *)pc; ++ ++ static unsigned int mod = 1; ++ ++ CheckAndClearBusError(); ++ ++ if ( 0 == (++mod % 100000) ) ++ printk(KERN_ERR "PCI: Bus error happened %u times; last is at address 0x%lX.\n", mod, addr); ++ ++ /* set return value to -1 if this was a read */ ++ if ((instr & 0x0c100000) == 0x04100000) { ++ int reg = (instr >> 12) & 15; ++ unsigned long val; ++ ++ if (instr & 0x00400000) ++ val = 255; /* byte read */ ++ else ++ val = -1; ++ ++ regs->uregs[reg] = val; ++ regs->ARM_pc += 4; ++ return 0; ++ } ++ ++ if ((instr & 0x0e100090) == 0x00100090) { ++ int reg = (instr >> 12) & 15; ++ ++ regs->uregs[reg] = -1; ++ regs->ARM_pc += 4; ++ return 0; ++ } ++ ++ return 0; ++} ++ + static int __init hipox_pci_init(void) + { + #ifdef CONFIG_HIPOX_PCI_RESET +@@ -679,6 +717,7 @@ + printk(KERN_DEBUG "PCI: hipox_pci_init now it's %lu, will wait till %lu to become ready for config\n", pci_trhfa_startwait, pci_trhfa_timeout); + #endif // CONFIG_HIPOX_PCI_RESET + ++ hook_fault_code(8, abort_handler, SIGBUS, "PCI external abort on non-linefetch"); + pci_common_init(&hipox_pci); + return 0; + } +--- old/arch/arm/mach-hipox/smc.c 2011-05-16 11:00:09.165565000 +0200 ++++ new/arch/arm/mach-hipox/smc.c 2011-05-19 16:17:55.335565001 +0200 +@@ -20,17 +20,17 @@ + + #include + #include ++#include + #include + #include + #include + #include +-#include + +-static ktime_t request_pci_timestamp = {0}; ++static unsigned int request_pci_timestamp = 0; + /* + * Request PCI_ARB to grant access to the STATIC core. + */ +-void hipox_smc_request_pci_ad_31_0(void) ++static int _hipox_smc_request_pci_ad_31_0(void) + { + unsigned maxtries = 10; /* wait for maxtries jiffies at maximum */ + +@@ -50,25 +50,185 @@ + if (!(readl(SYS_CTRL_PCI_STAT) & (1UL << SYSCTL_PCI_STAT_SYSPCI_STATIC_GNT))) + printk(KERN_WARNING "%s: timeout requesting access to PCI bus for static memory interface\n", __func__); + +- request_pci_timestamp = ktime_get(); ++ request_pci_timestamp = jiffies_to_msecs(get_jiffies_64()); ++ ++ return ( 0 != ( readl(SYS_CTRL_PCI_STAT) & (1UL << SYSCTL_PCI_STAT_SYSPCI_STATIC_GNT) ) ? 0 : 1 ); + } + + /* + * Release access to PCI bus. + */ +-void hipox_smc_release_pci_ad_31_0(void) ++static void _hipox_smc_release_pci_ad_31_0(void) + { +- const s64 timeout = 400; /* us */ +- s64 delta = ktime_us_delta(ktime_get(), request_pci_timestamp); ++ const unsigned int timeout = 100; /* ms */ ++ unsigned int delta = jiffies_to_msecs(get_jiffies_64()) - request_pci_timestamp; + + /* set PCI_ARB request bit in Sysctrl_PCI_Ctrl1 */ + writel(readl(SYS_CTRL_PCI_CTRL1) & ~(1UL << SYSCTL_PCI_CTRL1_SYSPCI_STATIC_REQ), SYS_CTRL_PCI_CTRL1); + + if (delta > timeout) + { +- printk(KERN_WARNING "%s: static memory interface blocked PCI bus for %llu us\n", __func__, delta); ++ printk(KERN_WARNING "%s: static memory interface blocked PCI bus for %u ms\n", __func__, delta); + } + } + +-EXPORT_SYMBOL(hipox_smc_request_pci_ad_31_0); +-EXPORT_SYMBOL(hipox_smc_release_pci_ad_31_0); ++/* ++ * PCI / PNX / Flash interlock handling ++ * ++ */ ++ ++enum pci_semaphore_id { ++ no_one = 0, ++ ox810_pci = 1, ++ ox810_flash = 2, ++ remote_pci = 3 ++}; ++ ++DECLARE_MUTEX(_pci_bus_linux_semaphore); // don't be fooled; this actually declares a _semaphore_ (see asm-arm/semaphore.h) ++struct pci_semaphore { ++ struct semaphore *linux_sem; /**< lock the bus for flash or pci accesses */ ++ enum pci_semaphore_id current_owner; ++ uint32_t current_count; ++}; ++ ++static struct pci_semaphore _pnx_pci_semaphore = { ++ &_pci_bus_linux_semaphore, ++ no_one, ++ 0 ++}; ++/* ---- */ ++ ++static int default_sem_acquire( void *ignored, uint32_t ignored2) ++{ ++ return 0; ++} ++/* ---- */ ++ ++static int default_sem_release ( void *ignored ) ++{ ++ return 0; ++} ++/* ---- */ ++ ++static int (*pci_sem_acquire)( void * ctx, uint32_t value ) = default_sem_acquire; ++static int (*pci_sem_release)( void * ctx ) = default_sem_release; ++static void * pci_sem_context = NULL; ++ ++void ox810_pci_register_semaphore_callbacks( int (*acquire)(void*, uint32_t), int (*release)(void*), void * ctx ) ++{ ++ pci_sem_acquire = acquire; ++ pci_sem_release = release; ++ pci_sem_context = ctx; ++} ++/* ---- */ ++ ++void ox810_pci_reset_semaphore_callbacks( void ) ++{ ++ pci_sem_acquire = default_sem_acquire; ++ pci_sem_release = default_sem_release; ++} ++/* ---- */ ++ ++static int sem_acquire( enum pci_semaphore_id caller_id ) ++{ ++ if ( 0 != down_trylock( _pnx_pci_semaphore.linux_sem ) ) { ++ if ( _pnx_pci_semaphore.current_owner == caller_id ) { ++ _pnx_pci_semaphore.current_count++; ++ return 0; ++ } ++ ++ down( _pnx_pci_semaphore.linux_sem ); ++ } ++ ++ if ( 0 == pci_sem_acquire( pci_sem_context, caller_id) ) { ++ ++ if ( ( caller_id == ox810_flash ) ++ && ( 0 != _hipox_smc_request_pci_ad_31_0() ) ) { ++ up( _pnx_pci_semaphore.linux_sem ); ++ return 1; ++ } ++ ++ _pnx_pci_semaphore.current_owner = caller_id; ++ _pnx_pci_semaphore.current_count = 1; ++ ++ return 0; ++ } ++ ++ up( _pnx_pci_semaphore.linux_sem ); ++ ++ return 1; ++} ++/* ---- */ ++ ++static int sem_release( enum pci_semaphore_id caller_id ) ++{ ++ if ( _pnx_pci_semaphore.current_owner != caller_id ) ++ return 1; ++ ++ _pnx_pci_semaphore.current_count--; ++ if ( 0 != _pnx_pci_semaphore.current_count ) ++ return 0; ++ ++ if ( caller_id == ox810_flash ) ++ _hipox_smc_release_pci_ad_31_0(); ++ ++ if ( 0 != pci_sem_release( pci_sem_context )) ++ return 1; ++ ++ _pnx_pci_semaphore.current_owner = no_one; ++ up( _pnx_pci_semaphore.linux_sem ); ++ ++ return 0; ++} ++/* ---- */ ++ ++int ox810_pci_acquire_bus( void ) ++{ ++ return sem_acquire ( ox810_pci ); ++} ++/* ---- */ ++ ++int ox810_pci_release_bus( void ) ++{ ++ return sem_release ( ox810_pci ); ++} ++/* ---- */ ++ ++int ox810_flash_acquire_bus( void ) ++{ ++ return sem_acquire( ox810_flash ); ++} ++/* ---- */ ++ ++int ox810_flash_release_bus( void ) ++{ ++ return sem_release( ox810_flash ); ++} ++/* ---- */ ++ ++void hipox_smc_request_pci_ad_31_0( void ) ++{ ++ static uint32_t warned = 0; ++ if ( 0 == (warned++ % 10000) ) ++ printk( KERN_ERR "ERROR in arch/arm/mach-hipox/smc.c: deprecated hipox_smc_request_pci_ad_31_0() called instead of ox810_flash_acquire_bus(). This interface will die soon. PLEASE UPDATE YOUR DRIVER.\n"); ++ ox810_flash_acquire_bus(); ++} ++void hipox_smc_release_pci_ad_31_0( void ) ++{ ++ static uint32_t warned = 0; ++ if ( 0 == (warned++ % 10000) ) ++ printk( KERN_ERR "ERROR in arch/arm/mach-hipox/smc.c: deprecated hipox_smc_release_pci_ad_31_0() called instead of ox810_flash_release_bus(). This interface will die soon. PLEASE UPDATE YOUR DRIVER.\n"); ++ ox810_flash_release_bus(); ++} ++/* ---- */ ++ ++EXPORT_SYMBOL( hipox_smc_request_pci_ad_31_0 ); ++EXPORT_SYMBOL( hipox_smc_release_pci_ad_31_0 ); ++ ++EXPORT_SYMBOL(ox810_pci_acquire_bus); ++EXPORT_SYMBOL(ox810_pci_release_bus); ++EXPORT_SYMBOL(ox810_flash_acquire_bus); ++EXPORT_SYMBOL(ox810_flash_release_bus); ++ ++EXPORT_SYMBOL(ox810_pci_register_semaphore_callbacks); ++EXPORT_SYMBOL(ox810_pci_reset_semaphore_callbacks); +--- old/include/asm-arm/arch-hipox/smc.h 2011-05-16 11:00:09.165565000 +0200 ++++ new/include/asm-arm/arch-hipox/smc.h 2011-05-19 14:28:04.805564999 +0200 +@@ -15,14 +15,43 @@ + */ + extern struct mutex hipox_flash_mutex; + ++ ++/* Low level PCI BUS semaphore acquisition ++ * ++ * This handler will claim the linux semaphore and the PCI bus semaphore ++ * for the caller's ID. ++ * ++ * Returns 0 if the claim was successful and both semaphores are held; !=0 otherwise. ++ * */ ++int ox810_pci_acquire_bus( void ); ++int ox810_flash_acquire_bus( void ); ++ ++/* Low level PCI BUS semaphore release ++ * ++ * Returns 0 if release was successful, !=0 otherwise. ++ */ ++int ox810_pci_release_bus( void ); ++int ox810_flash_release_bus( void ); ++ + /* +- * Request PCI_ARB to grant access to the STATIC core. ++ * PCI Driver bus semaphore registration / deregistration. ++ * This is used by the PCI driver which implements the low level bus semaphore logic: ++ * - int acquire (void * context, uint32_t owner): ++ * acquire the semaphore for an owner ID. Returns 0 if successful, ++ * !=0 otherwise. ++ * - int release (void * context): ++ * release the bus semaphore. There will be no owner check of the ++ * semaphore. Returns 0 if successful, !=0 otherwise. ++ * ++ * Deregistration must be done by the PCI driver upon unloading. + */ +-void hipox_smc_request_pci_ad_31_0(void); ++void ox810_pci_register_semaphore_callbacks( int (*acquire)(void*, uint32_t), int (*release)(void*), void * ctx ); ++void ox810_pci_reset_semaphore_callbacks( void ); + + /* +- * Release access to PCI bus. ++ * LEGACY interface. Will print ugly error messages if used. Do not use. Use ox810_flash_[release|request]_bus() instead. + */ +-void hipox_smc_release_pci_ad_31_0(void); ++void hipox_smc_release_pci_ad_31_0( void ); ++void hipox_smc_request_pci_ad_31_0( void ); + + #endif // __ASM_ARCH_SMC_H +--- old/drivers/mtd/nand/hipox_nand.c 2011-05-16 11:00:10.895565009 +0200 ++++ new/drivers/mtd/nand/hipox_nand.c 2011-05-19 15:44:46.705564993 +0200 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -30,10 +31,9 @@ + + // the testboards ran down to a value of 4 + //#define STATIC_BUS_FLASH_CONFIG 0x4f1f3f3f /* slow settings, 345 ns */ +-#define STATIC_BUS_FLASH_CONFIG 0x4f1f3f0d /* fast settings, 70 ns; use this as default, because it works for hipox board NOR flash also */ ++//#define STATIC_BUS_FLASH_CONFIG 0x4f1f3f0d /* fast settings, 70 ns */ + //#define STATIC_BUS_FLASH_CONFIG 0x4f1f3f09 /* ultra fast settings, 50 ns */ +-//#define STATIC_BUS_FLASH_CONFIG 0x4f1f3f04 /* warp settings, 27 ns */ +-#define STATIC_BUS_FLASH_CONFIG_RW 0x41030303 /* read and write warp settings */ ++#define STATIC_BUS_FLASH_CONFIG 0x4f1f3f04 /* warp settings, 27 ns */ + + /* + * MTD structure for HydraIP board +@@ -66,7 +66,6 @@ + */ + static void hipox_nand_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl) + { +- static unsigned int bank0 = STATIC_BUS_FLASH_CONFIG; + struct nand_chip *this = mtd->priv; + + if (ctrl & NAND_CTRL_CHANGE) { +@@ -79,15 +78,12 @@ + // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); + mutex_lock(&hipox_flash_mutex); + writel(0x20000000, GPIO_A_OUTPUT_CLEAR); /* assert CS-NAND */ +- bank0 = readl(STATIC_CONTROL_BANK0); +- writel(STATIC_BUS_FLASH_CONFIG_RW, STATIC_CONTROL_BANK0); + } + } + else + { + if (!(0x20000000 & readl(GPIO_A_OUTPUT_VALUE))) + { +- writel(bank0, STATIC_CONTROL_BANK0); + writel(0x20000000, GPIO_A_OUTPUT_SET); /* deassert CS-NAND */ + mutex_unlock(&hipox_flash_mutex); + // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); +@@ -104,9 +100,10 @@ + + if (cmd != NAND_CMD_NONE) + { +- hipox_smc_request_pci_ad_31_0(); ++ if ( ox810_flash_acquire_bus() ) ++ BUG(); + writeb(cmd, this->IO_ADDR_W); +- hipox_smc_release_pci_ad_31_0(); ++ ox810_flash_release_bus(); + } + } + +@@ -120,9 +117,13 @@ + { + struct nand_chip *chip = mtd->priv; + uint8_t res; +- hipox_smc_request_pci_ad_31_0(); ++ ++ if ( ox810_flash_acquire_bus() ) ++ BUG(); ++ + res = readb(chip->IO_ADDR_R); +- hipox_smc_release_pci_ad_31_0(); ++ ++ ox810_flash_release_bus(); + return res; + } + +@@ -137,9 +138,13 @@ + { + struct nand_chip *chip = mtd->priv; + u16 res; +- hipox_smc_request_pci_ad_31_0(); ++ ++ if ( ox810_flash_acquire_bus() ) ++ BUG(); ++ + res = readw(chip->IO_ADDR_R); +- hipox_smc_release_pci_ad_31_0(); ++ ++ ox810_flash_release_bus(); + return res; + } + +@@ -156,10 +161,13 @@ + int i; + struct nand_chip *chip = mtd->priv; + +- hipox_smc_request_pci_ad_31_0(); ++ if ( ox810_flash_acquire_bus() ) ++ BUG(); ++ + for (i = 0; i < len; i++) + buf[i] = readb(chip->IO_ADDR_R); +- hipox_smc_release_pci_ad_31_0(); ++ ++ ox810_flash_release_bus(); + } + + /** +@@ -175,10 +183,13 @@ + int i; + struct nand_chip *chip = mtd->priv; + +- hipox_smc_request_pci_ad_31_0(); ++ if ( ox810_flash_acquire_bus() ) ++ BUG(); ++ + for (i = 0; i < len; i++) + writeb(buf[i], chip->IO_ADDR_W); +- hipox_smc_release_pci_ad_31_0(); ++ ++ ox810_flash_release_bus(); + } + + /** +@@ -195,7 +206,9 @@ + int ret = 0; + struct nand_chip *chip = mtd->priv; + +- hipox_smc_request_pci_ad_31_0(); ++ if ( ox810_flash_acquire_bus() ) ++ BUG(); ++ + for (i = 0; i < len; i++) + { + if (buf[i] != readb(chip->IO_ADDR_R)) +@@ -204,7 +217,8 @@ + break; + } + } +- hipox_smc_release_pci_ad_31_0(); ++ ++ ox810_flash_release_bus(); + + return ret; + } +@@ -239,9 +253,7 @@ + return -ENOMEM; + } + +- mutex_lock(&hipox_flash_mutex); + writel(STATIC_BUS_FLASH_CONFIG, STATIC_CONTROL_BANK0); +- mutex_unlock(&hipox_flash_mutex); + + /* Initialize structures */ + memset(hipox_nand_mtd, 0, sizeof(struct mtd_info)); +@@ -252,12 +264,12 @@ + writel(0x20000000, GPIO_A_OUTPUT_ENABLE_SET); + + // deselect alternate function +- writel(readl(SYS_CTRL_GPIO_PRIMSEL_CTRL_0) & ~0x20000000, +- SYS_CTRL_GPIO_PRIMSEL_CTRL_0); +- writel(readl(SYS_CTRL_GPIO_SECSEL_CTRL_0) & ~0x20000000, +- SYS_CTRL_GPIO_SECSEL_CTRL_0); +- writel(readl(SYS_CTRL_GPIO_TERTSEL_CTRL_0) & ~0x20000000, +- SYS_CTRL_GPIO_TERTSEL_CTRL_0); ++ writel(readl(SYS_CTRL_GPIO_PRIMSEL_CTRL_0) & ~0x20000000, ++ SYS_CTRL_GPIO_PRIMSEL_CTRL_0); ++ writel(readl(SYS_CTRL_GPIO_SECSEL_CTRL_0) & ~0x20000000, ++ SYS_CTRL_GPIO_SECSEL_CTRL_0); ++ writel(readl(SYS_CTRL_GPIO_TERTSEL_CTRL_0) & ~0x20000000, ++ SYS_CTRL_GPIO_TERTSEL_CTRL_0); + + // assert CS-NAND + writel(0x20000000, GPIO_A_OUTPUT_CLEAR); +--- old/drivers/mtd/maps/physmap.c 2011-05-16 11:00:10.895565009 +0200 ++++ new/drivers/mtd/maps/physmap.c 2011-05-19 15:45:07.765565002 +0200 +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #if defined (CONFIG_ARCH_HIPOX) + #include +@@ -31,110 +32,115 @@ + #endif /* CONFIG_ARCH_HIPOX */ + + struct physmap_flash_info { +- struct mtd_info *mtd; +- struct map_info map; +- struct resource *res; ++ struct mtd_info *mtd; ++ struct map_info map; ++ struct resource *res; + #ifdef CONFIG_MTD_PARTITIONS +- int nr_parts; +- struct mtd_partition *parts; ++ int nr_parts; ++ struct mtd_partition *parts; + #endif + }; + + + static int physmap_flash_remove(struct platform_device *dev) + { +- struct physmap_flash_info *info; +- struct physmap_flash_data *physmap_data; ++ struct physmap_flash_info *info; ++ struct physmap_flash_data *physmap_data; + +- info = platform_get_drvdata(dev); +- if (info == NULL) +- return 0; +- platform_set_drvdata(dev, NULL); ++ info = platform_get_drvdata(dev); ++ if (info == NULL) ++ return 0; ++ platform_set_drvdata(dev, NULL); + +- physmap_data = dev->dev.platform_data; ++ physmap_data = dev->dev.platform_data; + +- if (info->mtd != NULL) { ++ if (info->mtd != NULL) { + #ifdef CONFIG_MTD_PARTITIONS +- if (info->nr_parts) { +- del_mtd_partitions(info->mtd); +- kfree(info->parts); +- } else if (physmap_data->nr_parts) { +- del_mtd_partitions(info->mtd); +- } else { +- del_mtd_device(info->mtd); +- } ++ if (info->nr_parts) { ++ del_mtd_partitions(info->mtd); ++ kfree(info->parts); ++ } else if (physmap_data->nr_parts) { ++ del_mtd_partitions(info->mtd); ++ } else { ++ del_mtd_device(info->mtd); ++ } + #else +- del_mtd_device(info->mtd); ++ del_mtd_device(info->mtd); + #endif +- map_destroy(info->mtd); +- } ++ map_destroy(info->mtd); ++ } + +- if (info->map.virt != NULL) +- iounmap(info->map.virt); ++ if (info->map.virt != NULL) ++ iounmap(info->map.virt); + +- if (info->res != NULL) { +- release_resource(info->res); +- kfree(info->res); +- } ++ if (info->res != NULL) { ++ release_resource(info->res); ++ kfree(info->res); ++ } + +- return 0; ++ return 0; + } + + #if defined (CONFIG_ARCH_HIPOX) + static map_word __xipram physmap_hipox_read(struct map_info *map, unsigned long ofs) + { +- map_word ret; ++ map_word ret; + +- // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); +- mutex_lock(&hipox_flash_mutex); +- hipox_smc_request_pci_ad_31_0(); ++ // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); ++ mutex_lock(&hipox_flash_mutex); + +- ret = inline_map_read(map, ofs); ++ if ( 0 != ox810_flash_acquire_bus() ) ++ BUG(); + +- hipox_smc_release_pci_ad_31_0(); +- mutex_unlock(&hipox_flash_mutex); +- // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); ++ ret = inline_map_read(map, ofs); + +- return ret; ++ ox810_flash_release_bus(); ++ mutex_unlock(&hipox_flash_mutex); ++ // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); ++ ++ return ret; + } + + static void __xipram physmap_hipox_write(struct map_info *map, const map_word datum, unsigned long ofs) + { +- // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); +- mutex_lock(&hipox_flash_mutex); +- hipox_smc_request_pci_ad_31_0(); +- +- inline_map_write(map, datum, ofs); +- +- hipox_smc_release_pci_ad_31_0(); +- mutex_unlock(&hipox_flash_mutex); +- // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); ++ // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); ++ mutex_lock(&hipox_flash_mutex); ++ if ( 0 != ox810_flash_acquire_bus() ) ++ BUG(); ++ ++ inline_map_write(map, datum, ofs); ++ ++ ox810_flash_release_bus(); ++ mutex_unlock(&hipox_flash_mutex); ++ // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); + } + + static void __xipram physmap_hipox_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len) + { +- // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); +- mutex_lock(&hipox_flash_mutex); +- hipox_smc_request_pci_ad_31_0(); +- +- inline_map_copy_from(map, to, from, len); +- +- hipox_smc_release_pci_ad_31_0(); +- mutex_unlock(&hipox_flash_mutex); +- // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); ++ // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); ++ mutex_lock(&hipox_flash_mutex); ++ if ( 0 != ox810_flash_acquire_bus() ) ++ BUG(); ++ ++ inline_map_copy_from(map, to, from, len); ++ ++ ox810_flash_release_bus(); ++ mutex_unlock(&hipox_flash_mutex); ++ // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); + } + + static void __xipram physmap_hipox_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len) + { +- // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); +- mutex_lock(&hipox_flash_mutex); +- hipox_smc_request_pci_ad_31_0(); +- +- inline_map_copy_to(map, to, from, len); +- +- hipox_smc_release_pci_ad_31_0(); +- mutex_unlock(&hipox_flash_mutex); +- // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); ++ // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); ++ mutex_lock(&hipox_flash_mutex); ++ if ( 0 != ox810_flash_acquire_bus() ) ++ BUG(); ++ ++ inline_map_copy_to(map, to, from, len); ++ ++ ox810_flash_release_bus(); ++ mutex_unlock(&hipox_flash_mutex); ++ // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); + } + #endif /* CONFIG_ARCH_HIPOX */ + +@@ -145,136 +151,134 @@ + + static int physmap_flash_probe(struct platform_device *dev) + { +- struct physmap_flash_data *physmap_data; +- struct physmap_flash_info *info; +- const char **probe_type; +- int err; +- +- physmap_data = dev->dev.platform_data; +- if (physmap_data == NULL) +- return -ENODEV; ++ struct physmap_flash_data *physmap_data; ++ struct physmap_flash_info *info; ++ const char **probe_type; ++ int err; ++ ++ physmap_data = dev->dev.platform_data; ++ if (physmap_data == NULL) ++ return -ENODEV; + + #if defined (CONFIG_ARCH_HIPOX) +- /* init timing for static memory controller */ +- mutex_lock(&hipox_flash_mutex); +- writel(STATIC_BUS_FLASH_CONFIG, STATIC_CONTROL_BANK0); +- mutex_unlock(&hipox_flash_mutex); ++ /* init timing for static memory controller */ ++ writel(STATIC_BUS_FLASH_CONFIG, STATIC_CONTROL_BANK0); + #endif /* CONFIG_ARCH_HIPOX */ + +- printk(KERN_NOTICE "physmap platform flash device: %.8llx at %.8llx\n", +- (unsigned long long)(dev->resource->end - dev->resource->start + 1), +- (unsigned long long)dev->resource->start); +- +- info = kzalloc(sizeof(struct physmap_flash_info), GFP_KERNEL); +- if (info == NULL) { +- err = -ENOMEM; +- goto err_out; +- } +- +- platform_set_drvdata(dev, info); +- +- info->res = request_mem_region(dev->resource->start, +- dev->resource->end - dev->resource->start + 1, +- dev->dev.bus_id); +- if (info->res == NULL) { +- dev_err(&dev->dev, "Could not reserve memory region\n"); +- err = -ENOMEM; +- goto err_out; +- } +- +- info->map.name = dev->dev.bus_id; +- info->map.phys = dev->resource->start; +- info->map.size = dev->resource->end - dev->resource->start + 1; +- info->map.bankwidth = physmap_data->width; +- info->map.set_vpp = physmap_data->set_vpp; +- +- info->map.virt = ioremap(info->map.phys, info->map.size); +- if (info->map.virt == NULL) { +- dev_err(&dev->dev, "Failed to ioremap flash region\n"); +- err = EIO; +- goto err_out; +- } ++ printk(KERN_NOTICE "physmap platform flash device: %.8llx at %.8llx\n", ++ (unsigned long long)(dev->resource->end - dev->resource->start + 1), ++ (unsigned long long)dev->resource->start); ++ ++ info = kzalloc(sizeof(struct physmap_flash_info), GFP_KERNEL); ++ if (info == NULL) { ++ err = -ENOMEM; ++ goto err_out; ++ } ++ ++ platform_set_drvdata(dev, info); ++ ++ info->res = request_mem_region(dev->resource->start, ++ dev->resource->end - dev->resource->start + 1, ++ dev->dev.bus_id); ++ if (info->res == NULL) { ++ dev_err(&dev->dev, "Could not reserve memory region\n"); ++ err = -ENOMEM; ++ goto err_out; ++ } ++ ++ info->map.name = dev->dev.bus_id; ++ info->map.phys = dev->resource->start; ++ info->map.size = dev->resource->end - dev->resource->start + 1; ++ info->map.bankwidth = physmap_data->width; ++ info->map.set_vpp = physmap_data->set_vpp; ++ ++ info->map.virt = ioremap(info->map.phys, info->map.size); ++ if (info->map.virt == NULL) { ++ dev_err(&dev->dev, "Failed to ioremap flash region\n"); ++ err = EIO; ++ goto err_out; ++ } + +- simple_map_init(&info->map); ++ simple_map_init(&info->map); + #if defined (CONFIG_ARCH_HIPOX) +- info->map.read = physmap_hipox_read; +- info->map.write = physmap_hipox_write; +- info->map.copy_from = physmap_hipox_copy_from; +- info->map.copy_to = physmap_hipox_copy_to; ++ info->map.read = physmap_hipox_read; ++ info->map.write = physmap_hipox_write; ++ info->map.copy_from = physmap_hipox_copy_from; ++ info->map.copy_to = physmap_hipox_copy_to; + #endif /* CONFIG_ARCH_HIPOX */ + +- probe_type = rom_probe_types; +- for (; info->mtd == NULL && *probe_type != NULL; probe_type++) +- info->mtd = do_map_probe(*probe_type, &info->map); +- if (info->mtd == NULL) { +- dev_err(&dev->dev, "map_probe failed\n"); +- err = -ENXIO; +- goto err_out; +- } +- info->mtd->owner = THIS_MODULE; ++ probe_type = rom_probe_types; ++ for (; info->mtd == NULL && *probe_type != NULL; probe_type++) ++ info->mtd = do_map_probe(*probe_type, &info->map); ++ if (info->mtd == NULL) { ++ dev_err(&dev->dev, "map_probe failed\n"); ++ err = -ENXIO; ++ goto err_out; ++ } ++ info->mtd->owner = THIS_MODULE; + + #ifdef CONFIG_MTD_PARTITIONS +- err = parse_mtd_partitions(info->mtd, part_probe_types, &info->parts, 0); +- if (err > 0) { +- add_mtd_partitions(info->mtd, info->parts, err); +- return 0; +- } +- +- if (physmap_data->nr_parts) { +- printk(KERN_NOTICE "Using physmap partition information\n"); +- add_mtd_partitions(info->mtd, physmap_data->parts, +- physmap_data->nr_parts); +- return 0; +- } ++ err = parse_mtd_partitions(info->mtd, part_probe_types, &info->parts, 0); ++ if (err > 0) { ++ add_mtd_partitions(info->mtd, info->parts, err); ++ return 0; ++ } ++ ++ if (physmap_data->nr_parts) { ++ printk(KERN_NOTICE "Using physmap partition information\n"); ++ add_mtd_partitions(info->mtd, physmap_data->parts, ++ physmap_data->nr_parts); ++ return 0; ++ } + #endif + +- add_mtd_device(info->mtd); +- return 0; ++ add_mtd_device(info->mtd); ++ return 0; + + err_out: +- physmap_flash_remove(dev); +- return err; ++ physmap_flash_remove(dev); ++ return err; + } + + #ifdef CONFIG_PM + static int physmap_flash_suspend(struct platform_device *dev, pm_message_t state) + { +- struct physmap_flash_info *info = platform_get_drvdata(dev); +- int ret = 0; ++ struct physmap_flash_info *info = platform_get_drvdata(dev); ++ int ret = 0; + +- if (info) +- ret = info->mtd->suspend(info->mtd); ++ if (info) ++ ret = info->mtd->suspend(info->mtd); + +- return ret; ++ return ret; + } + + static int physmap_flash_resume(struct platform_device *dev) + { +- struct physmap_flash_info *info = platform_get_drvdata(dev); +- if (info) +- info->mtd->resume(info->mtd); +- return 0; ++ struct physmap_flash_info *info = platform_get_drvdata(dev); ++ if (info) ++ info->mtd->resume(info->mtd); ++ return 0; + } + + static void physmap_flash_shutdown(struct platform_device *dev) + { +- struct physmap_flash_info *info = platform_get_drvdata(dev); +- if (info && info->mtd->suspend(info->mtd) == 0) +- info->mtd->resume(info->mtd); ++ struct physmap_flash_info *info = platform_get_drvdata(dev); ++ if (info && info->mtd->suspend(info->mtd) == 0) ++ info->mtd->resume(info->mtd); + } + #endif + + static struct platform_driver physmap_flash_driver = { +- .probe = physmap_flash_probe, +- .remove = physmap_flash_remove, ++ .probe = physmap_flash_probe, ++ .remove = physmap_flash_remove, + #ifdef CONFIG_PM +- .suspend = physmap_flash_suspend, +- .resume = physmap_flash_resume, +- .shutdown = physmap_flash_shutdown, +-#endif +- .driver = { +- .name = "physmap-flash", +- }, ++ .suspend = physmap_flash_suspend, ++ .resume = physmap_flash_resume, ++ .shutdown = physmap_flash_shutdown, ++#endif ++ .driver = { ++ .name = "physmap-flash", ++ }, + }; + + +@@ -291,63 +295,63 @@ + } + + static struct physmap_flash_data physmap_flash_data = { +- .width = CONFIG_MTD_PHYSMAP_BANKWIDTH, ++ .width = CONFIG_MTD_PHYSMAP_BANKWIDTH, + }; + + static struct resource physmap_flash_resource = { +- .start = CONFIG_MTD_PHYSMAP_START, +- .end = CONFIG_MTD_PHYSMAP_START + CONFIG_MTD_PHYSMAP_LEN - 1, +- .flags = IORESOURCE_MEM, ++ .start = CONFIG_MTD_PHYSMAP_START, ++ .end = CONFIG_MTD_PHYSMAP_START + CONFIG_MTD_PHYSMAP_LEN - 1, ++ .flags = IORESOURCE_MEM, + }; + + static struct platform_device physmap_flash = { +- .name = "physmap-flash", +- .id = 0, +- .dev = { +- .platform_data = &physmap_flash_data, +- .release = physmap_flash_release, /* needed for module build */ +- }, +- .num_resources = 1, +- .resource = &physmap_flash_resource, ++ .name = "physmap-flash", ++ .id = 0, ++ .dev = { ++ .platform_data = &physmap_flash_data, ++ .release = physmap_flash_release, /* needed for module build */ ++ }, ++ .num_resources = 1, ++ .resource = &physmap_flash_resource, + }; + + void physmap_configure(unsigned long addr, unsigned long size, +- int bankwidth, void (*set_vpp)(struct map_info *, int)) ++ int bankwidth, void (*set_vpp)(struct map_info *, int)) + { +- physmap_flash_resource.start = addr; +- physmap_flash_resource.end = addr + size - 1; +- physmap_flash_data.width = bankwidth; +- physmap_flash_data.set_vpp = set_vpp; ++ physmap_flash_resource.start = addr; ++ physmap_flash_resource.end = addr + size - 1; ++ physmap_flash_data.width = bankwidth; ++ physmap_flash_data.set_vpp = set_vpp; + } + + #ifdef CONFIG_MTD_PARTITIONS + void physmap_set_partitions(struct mtd_partition *parts, int num_parts) + { +- physmap_flash_data.nr_parts = num_parts; +- physmap_flash_data.parts = parts; ++ physmap_flash_data.nr_parts = num_parts; ++ physmap_flash_data.parts = parts; + } + #endif + #endif + + static int __init physmap_init(void) + { +- int err; ++ int err; + +- err = platform_driver_register(&physmap_flash_driver); ++ err = platform_driver_register(&physmap_flash_driver); + #ifdef PHYSMAP_COMPAT +- if (err == 0) +- platform_device_register(&physmap_flash); ++ if (err == 0) ++ platform_device_register(&physmap_flash); + #endif + +- return err; ++ return err; + } + + static void __exit physmap_exit(void) + { + #ifdef PHYSMAP_COMPAT +- platform_device_unregister(&physmap_flash); ++ platform_device_unregister(&physmap_flash); + #endif +- platform_driver_unregister(&physmap_flash_driver); ++ platform_driver_unregister(&physmap_flash_driver); + } + + module_init(physmap_init); diff --git a/recipes/linux/linux_2.6.24.bb b/recipes/linux/linux_2.6.24.bb index 97eef1b16e..121a8c3b89 100644 --- a/recipes/linux/linux_2.6.24.bb +++ b/recipes/linux/linux_2.6.24.bb @@ -11,7 +11,7 @@ DEFAULT_PREFERENCE_hipox = "1" DEFAULT_PREFERENCE_cs-e9302 = "1" DEFAULT_PREFERENCE_smartq5 = "1" -PR = "r38" +PR = "r39" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;apply=yes;name=stablepatch \ @@ -108,6 +108,7 @@ SRC_URI_append_hipox = " \ file://hipox-phy.patch \ file://ox810-pci-read-config-fix.patch \ file://hipox-nand-timing.patch \ + file://ox810-pci-abort-handler.patch \ " EXTRA_OEMAKE_smartq5 = " OBJCOPY=${OBJCOPY}" From c3338c64284cd50d6390c0094a7a12179866de02 Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Thu, 12 May 2011 07:23:25 +0000 Subject: [PATCH 383/509] linux-2.6.24: disable 2nd SATA port (hipox machine only) The 2nd SATA port is not used at hipox machine and causes emission problems if activated. Signed-off-by: Steffen Sledz --- recipes/linux/linux-2.6.24/hipox/defconfig | 4 ++-- recipes/linux/linux_2.6.24.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig index 955423cab1..b22fc2b688 100644 --- a/recipes/linux/linux-2.6.24/hipox/defconfig +++ b/recipes/linux/linux-2.6.24/hipox/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24.7 -# Thu Feb 3 15:28:12 2011 +# Wed May 11 14:11:43 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -644,7 +644,7 @@ CONFIG_ATA=m # CONFIG_SATA_VITESSE is not set # CONFIG_SATA_INIC162X is not set CONFIG_SATA_OX810=m -# CONFIG_SATA_HIPOX_SINGLE_SATA is not set +CONFIG_SATA_HIPOX_SINGLE_SATA=y # CONFIG_SATA_HIPOX_DISK_LIGHT is not set # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set diff --git a/recipes/linux/linux_2.6.24.bb b/recipes/linux/linux_2.6.24.bb index 121a8c3b89..55c11c6f24 100644 --- a/recipes/linux/linux_2.6.24.bb +++ b/recipes/linux/linux_2.6.24.bb @@ -11,7 +11,7 @@ DEFAULT_PREFERENCE_hipox = "1" DEFAULT_PREFERENCE_cs-e9302 = "1" DEFAULT_PREFERENCE_smartq5 = "1" -PR = "r39" +PR = "r40" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;apply=yes;name=stablepatch \ From 005867c020e0518ff139e8085af416d2cb6dd955 Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Thu, 19 May 2011 13:44:34 +0000 Subject: [PATCH 384/509] linux-2.6.24: enable some more kernel debug options (hipox machine only) Signed-off-by: Steffen Sledz --- recipes/linux/linux-2.6.24/hipox/defconfig | 12 ++++++------ recipes/linux/linux_2.6.24.bb | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig index b22fc2b688..ce39776ccd 100644 --- a/recipes/linux/linux-2.6.24/hipox/defconfig +++ b/recipes/linux/linux-2.6.24/hipox/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24.7 -# Wed May 11 14:11:43 2011 +# Thu May 19 12:38:17 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1515,7 +1515,7 @@ CONFIG_OPROFILE=m # # Kernel hacking # -# CONFIG_PRINTK_TIME is not set +CONFIG_PRINTK_TIME=y CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_MAGIC_SYSRQ=y @@ -1525,8 +1525,8 @@ CONFIG_DEBUG_FS=y CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set CONFIG_DETECT_SOFTLOCKUP=y -CONFIG_SCHED_DEBUG=y -# CONFIG_SCHEDSTATS is not set +# CONFIG_SCHED_DEBUG is not set +CONFIG_SCHEDSTATS=y # CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -1550,8 +1550,8 @@ CONFIG_FORCED_INLINING=y # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_SAMPLES is not set -# CONFIG_DEBUG_USER is not set -# CONFIG_DEBUG_ERRORS is not set +CONFIG_DEBUG_USER=y +CONFIG_DEBUG_ERRORS=y # CONFIG_DEBUG_LL is not set # diff --git a/recipes/linux/linux_2.6.24.bb b/recipes/linux/linux_2.6.24.bb index 55c11c6f24..d64986ad02 100644 --- a/recipes/linux/linux_2.6.24.bb +++ b/recipes/linux/linux_2.6.24.bb @@ -11,7 +11,7 @@ DEFAULT_PREFERENCE_hipox = "1" DEFAULT_PREFERENCE_cs-e9302 = "1" DEFAULT_PREFERENCE_smartq5 = "1" -PR = "r40" +PR = "r41" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;apply=yes;name=stablepatch \ From 61378f7891027a6e81535398f96f0c228e2e0816 Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Tue, 31 May 2011 14:09:22 +0000 Subject: [PATCH 385/509] linux-2.6.24: enable some more diagnostic options (hipox machine only) * enable process and task accounting * enable per-task IO accounting Signed-off-by: Thilo Fromm --- recipes/linux/linux-2.6.24/hipox/defconfig | 12 +++++++++--- recipes/linux/linux_2.6.24.bb | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig index ce39776ccd..a901397f00 100644 --- a/recipes/linux/linux-2.6.24/hipox/defconfig +++ b/recipes/linux/linux-2.6.24/hipox/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24.7 -# Thu May 19 12:38:17 2011 +# Tue May 31 16:06:17 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -37,8 +37,12 @@ CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y -# CONFIG_BSD_PROCESS_ACCT is not set -# CONFIG_TASKSTATS is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y # CONFIG_USER_NS is not set # CONFIG_PID_NS is not set # CONFIG_AUDIT is not set @@ -46,6 +50,8 @@ CONFIG_POSIX_MQUEUE=y CONFIG_LOG_BUF_SHIFT=14 # CONFIG_CGROUPS is not set # CONFIG_FAIR_GROUP_SCHED is not set +# CONFIG_FAIR_USER_SCHED is not set +# CONFIG_FAIR_CGROUP_SCHED is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set CONFIG_BLK_DEV_INITRD=y diff --git a/recipes/linux/linux_2.6.24.bb b/recipes/linux/linux_2.6.24.bb index d64986ad02..85696906ca 100644 --- a/recipes/linux/linux_2.6.24.bb +++ b/recipes/linux/linux_2.6.24.bb @@ -11,7 +11,7 @@ DEFAULT_PREFERENCE_hipox = "1" DEFAULT_PREFERENCE_cs-e9302 = "1" DEFAULT_PREFERENCE_smartq5 = "1" -PR = "r41" +PR = "r42" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;apply=yes;name=stablepatch \ From 7c773ed200c32e5bf5962153550d1226a95238ad Mon Sep 17 00:00:00 2001 From: sledz Date: Tue, 7 Jun 2011 10:30:32 +0000 Subject: [PATCH 386/509] linux-2.6.24: add another 4N-GALAXY.DE PID to ftdi_sio driver Signed-off-by: Steffen Sledz --- .../linux/linux-2.6.24/ftdi-4n-galaxy.patch | 22 +++++++++++++++++++ recipes/linux/linux_2.6.24.bb | 3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 recipes/linux/linux-2.6.24/ftdi-4n-galaxy.patch diff --git a/recipes/linux/linux-2.6.24/ftdi-4n-galaxy.patch b/recipes/linux/linux-2.6.24/ftdi-4n-galaxy.patch new file mode 100644 index 0000000000..133aae856b --- /dev/null +++ b/recipes/linux/linux-2.6.24/ftdi-4n-galaxy.patch @@ -0,0 +1,22 @@ +diff -Nurd linux-2.6.24.orig/drivers/usb/serial/ftdi_sio.c linux-2.6.24/drivers/usb/serial/ftdi_sio.c +--- linux-2.6.24.orig/drivers/usb/serial/ftdi_sio.c 2011-06-07 12:15:01.418982729 +0200 ++++ linux-2.6.24/drivers/usb/serial/ftdi_sio.c 2011-06-07 12:16:20.107926616 +0200 +@@ -523,6 +523,7 @@ + { USB_DEVICE(FTDI_VID, EVER_ECO_PRO_CDS) }, + { USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_1_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_2_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_3_PID) }, + { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_0_PID) }, + { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_1_PID) }, + { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_2_PID) }, +diff -Nurd linux-2.6.24.orig/drivers/usb/serial/ftdi_sio.h linux-2.6.24/drivers/usb/serial/ftdi_sio.h +--- linux-2.6.24.orig/drivers/usb/serial/ftdi_sio.h 2011-06-07 12:15:01.413983114 +0200 ++++ linux-2.6.24/drivers/usb/serial/ftdi_sio.h 2011-06-07 12:16:11.652577907 +0200 +@@ -387,6 +387,7 @@ + */ + #define FTDI_4N_GALAXY_DE_1_PID 0xF3C0 + #define FTDI_4N_GALAXY_DE_2_PID 0xF3C1 ++#define FTDI_4N_GALAXY_DE_3_PID 0xF3C2 + + /* + * Mobility Electronics products. diff --git a/recipes/linux/linux_2.6.24.bb b/recipes/linux/linux_2.6.24.bb index 85696906ca..e9844bbeae 100644 --- a/recipes/linux/linux_2.6.24.bb +++ b/recipes/linux/linux_2.6.24.bb @@ -11,7 +11,7 @@ DEFAULT_PREFERENCE_hipox = "1" DEFAULT_PREFERENCE_cs-e9302 = "1" DEFAULT_PREFERENCE_smartq5 = "1" -PR = "r42" +PR = "r44" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;apply=yes;name=stablepatch \ @@ -20,6 +20,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=k file://ubifs-v2.6.24-silent-get-sb.patch \ file://cfi-amic.patch \ file://make-3.82.patch \ + file://ftdi-4n-galaxy.patch \ file://defconfig" # Moved away temporarely until committed properly (work in progress). From 7ddabd7fd44702eb035a104a2e0710b4b2e100cd Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Wed, 15 Jun 2011 07:46:24 +0200 Subject: [PATCH 387/509] linux-2.6.24: fix diff pathes in hipox machine specific patch file Signed-off-by: Steffen Sledz --- .../linux/linux-2.6.24/hipox/ox810-pci-read-config-fix.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/linux/linux-2.6.24/hipox/ox810-pci-read-config-fix.patch b/recipes/linux/linux-2.6.24/hipox/ox810-pci-read-config-fix.patch index 5df26762db..99042ef1ae 100644 --- a/recipes/linux/linux-2.6.24/hipox/ox810-pci-read-config-fix.patch +++ b/recipes/linux/linux-2.6.24/hipox/ox810-pci-read-config-fix.patch @@ -1,5 +1,5 @@ ---- /linux-2.6.24-orig/arch/arm/mach-hipox/pci.c 2011-03-31 16:56:17.968638003 +0200 -+++ /linux-2.6.24/arch/arm/mach-hipox/pci.c 2011-03-31 17:06:21.198638000 +0200 +--- linux-2.6.24-orig/arch/arm/mach-hipox/pci.c 2011-03-31 16:56:17.968638003 +0200 ++++ linux-2.6.24/arch/arm/mach-hipox/pci.c 2011-03-31 17:06:21.198638000 +0200 @@ -311,12 +311,12 @@ switch (size) { case 1: From ab17b63b27094a7e03e5f63462e5b08148a6a86e Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Wed, 15 Jun 2011 14:35:29 +0200 Subject: [PATCH 388/509] linux-2.6.24: fix a buggy patch file for hipox machine Signed-off-by: Steffen Sledz --- .../hipox/ox810-pci-abort-handler.patch | 792 +++--------------- 1 file changed, 136 insertions(+), 656 deletions(-) diff --git a/recipes/linux/linux-2.6.24/hipox/ox810-pci-abort-handler.patch b/recipes/linux/linux-2.6.24/hipox/ox810-pci-abort-handler.patch index f85954be8b..321dfa9ca8 100644 --- a/recipes/linux/linux-2.6.24/hipox/ox810-pci-abort-handler.patch +++ b/recipes/linux/linux-2.6.24/hipox/ox810-pci-abort-handler.patch @@ -1,5 +1,6 @@ ---- old/arch/arm/mach-hipox/pci.c 2011-05-16 11:00:10.665564998 +0200 -+++ new/arch/arm/mach-hipox/pci.c 2011-05-17 17:13:33.845565008 +0200 +diff -Nurd linux-2.6.24.orig//arch/arm/mach-hipox/pci.c linux-2.6.24/arch/arm/mach-hipox/pci.c +--- linux-2.6.24.orig//arch/arm/mach-hipox/pci.c 2011-06-15 08:54:13.869073667 +0200 ++++ linux-2.6.24/arch/arm/mach-hipox/pci.c 2011-06-15 08:56:11.275235253 +0200 @@ -667,6 +667,44 @@ .postinit = hipox_pci_postinit, }; @@ -53,9 +54,10 @@ pci_common_init(&hipox_pci); return 0; } ---- old/arch/arm/mach-hipox/smc.c 2011-05-16 11:00:09.165565000 +0200 -+++ new/arch/arm/mach-hipox/smc.c 2011-05-19 16:17:55.335565001 +0200 -@@ -20,17 +20,17 @@ +diff -Nurd linux-2.6.24.orig//arch/arm/mach-hipox/smc.c linux-2.6.24/arch/arm/mach-hipox/smc.c +--- linux-2.6.24.orig//arch/arm/mach-hipox/smc.c 2011-06-15 08:54:13.869073667 +0200 ++++ linux-2.6.24/arch/arm/mach-hipox/smc.c 2011-06-15 08:58:49.038353811 +0200 +@@ -20,6 +20,7 @@ #include #include @@ -63,11 +65,7 @@ #include #include #include - #include --#include - --static ktime_t request_pci_timestamp = {0}; -+static unsigned int request_pci_timestamp = 0; +@@ -30,7 +31,7 @@ /* * Request PCI_ARB to grant access to the STATIC core. */ @@ -76,12 +74,10 @@ { unsigned maxtries = 10; /* wait for maxtries jiffies at maximum */ -@@ -50,25 +50,185 @@ - if (!(readl(SYS_CTRL_PCI_STAT) & (1UL << SYSCTL_PCI_STAT_SYSPCI_STATIC_GNT))) +@@ -51,12 +52,14 @@ printk(KERN_WARNING "%s: timeout requesting access to PCI bus for static memory interface\n", __func__); -- request_pci_timestamp = ktime_get(); -+ request_pci_timestamp = jiffies_to_msecs(get_jiffies_64()); + request_pci_timestamp = ktime_get(); + + return ( 0 != ( readl(SYS_CTRL_PCI_STAT) & (1UL << SYSCTL_PCI_STAT_SYSPCI_STATIC_GNT) ) ? 0 : 1 ); } @@ -92,18 +88,9 @@ -void hipox_smc_release_pci_ad_31_0(void) +static void _hipox_smc_release_pci_ad_31_0(void) { -- const s64 timeout = 400; /* us */ -- s64 delta = ktime_us_delta(ktime_get(), request_pci_timestamp); -+ const unsigned int timeout = 100; /* ms */ -+ unsigned int delta = jiffies_to_msecs(get_jiffies_64()) - request_pci_timestamp; - - /* set PCI_ARB request bit in Sysctrl_PCI_Ctrl1 */ - writel(readl(SYS_CTRL_PCI_CTRL1) & ~(1UL << SYSCTL_PCI_CTRL1_SYSPCI_STATIC_REQ), SYS_CTRL_PCI_CTRL1); - - if (delta > timeout) - { -- printk(KERN_WARNING "%s: static memory interface blocked PCI bus for %llu us\n", __func__, delta); -+ printk(KERN_WARNING "%s: static memory interface blocked PCI bus for %u ms\n", __func__, delta); + const s64 timeout = 400; /* us */ + s64 delta = ktime_us_delta(ktime_get(), request_pci_timestamp); +@@ -70,5 +73,163 @@ } } @@ -269,58 +256,80 @@ + +EXPORT_SYMBOL(ox810_pci_register_semaphore_callbacks); +EXPORT_SYMBOL(ox810_pci_reset_semaphore_callbacks); ---- old/include/asm-arm/arch-hipox/smc.h 2011-05-16 11:00:09.165565000 +0200 -+++ new/include/asm-arm/arch-hipox/smc.h 2011-05-19 14:28:04.805564999 +0200 -@@ -15,14 +15,43 @@ - */ - extern struct mutex hipox_flash_mutex; +diff -Nurd linux-2.6.24.orig//drivers/mtd/maps/physmap.c linux-2.6.24/drivers/mtd/maps/physmap.c +--- linux-2.6.24.orig//drivers/mtd/maps/physmap.c 2011-06-15 08:54:14.204048457 +0200 ++++ linux-2.6.24/drivers/mtd/maps/physmap.c 2011-06-15 09:12:40.775896237 +0200 +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include -+ -+/* Low level PCI BUS semaphore acquisition -+ * -+ * This handler will claim the linux semaphore and the PCI bus semaphore -+ * for the caller's ID. -+ * -+ * Returns 0 if the claim was successful and both semaphores are held; !=0 otherwise. -+ * */ -+int ox810_pci_acquire_bus( void ); -+int ox810_flash_acquire_bus( void ); -+ -+/* Low level PCI BUS semaphore release -+ * -+ * Returns 0 if release was successful, !=0 otherwise. -+ */ -+int ox810_pci_release_bus( void ); -+int ox810_flash_release_bus( void ); -+ - /* -- * Request PCI_ARB to grant access to the STATIC core. -+ * PCI Driver bus semaphore registration / deregistration. -+ * This is used by the PCI driver which implements the low level bus semaphore logic: -+ * - int acquire (void * context, uint32_t owner): -+ * acquire the semaphore for an owner ID. Returns 0 if successful, -+ * !=0 otherwise. -+ * - int release (void * context): -+ * release the bus semaphore. There will be no owner check of the -+ * semaphore. Returns 0 if successful, !=0 otherwise. -+ * -+ * Deregistration must be done by the PCI driver upon unloading. - */ --void hipox_smc_request_pci_ad_31_0(void); -+void ox810_pci_register_semaphore_callbacks( int (*acquire)(void*, uint32_t), int (*release)(void*), void * ctx ); -+void ox810_pci_reset_semaphore_callbacks( void ); + #if defined (CONFIG_ARCH_HIPOX) + #include +@@ -87,11 +88,12 @@ - /* -- * Release access to PCI bus. -+ * LEGACY interface. Will print ugly error messages if used. Do not use. Use ox810_flash_[release|request]_bus() instead. - */ --void hipox_smc_release_pci_ad_31_0(void); -+void hipox_smc_release_pci_ad_31_0( void ); -+void hipox_smc_request_pci_ad_31_0( void ); + // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); + mutex_lock(&hipox_flash_mutex); +- hipox_smc_request_pci_ad_31_0(); ++ if ( 0 != ox810_flash_acquire_bus() ) ++ BUG(); - #endif // __ASM_ARCH_SMC_H ---- old/drivers/mtd/nand/hipox_nand.c 2011-05-16 11:00:10.895565009 +0200 -+++ new/drivers/mtd/nand/hipox_nand.c 2011-05-19 15:44:46.705564993 +0200 + ret = inline_map_read(map, ofs); + +- hipox_smc_release_pci_ad_31_0(); ++ ox810_flash_release_bus(); + mutex_unlock(&hipox_flash_mutex); + // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); + +@@ -102,11 +104,12 @@ + { + // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); + mutex_lock(&hipox_flash_mutex); +- hipox_smc_request_pci_ad_31_0(); ++ if ( 0 != ox810_flash_acquire_bus() ) ++ BUG(); + + inline_map_write(map, datum, ofs); + +- hipox_smc_release_pci_ad_31_0(); ++ ox810_flash_release_bus(); + mutex_unlock(&hipox_flash_mutex); + // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); + } +@@ -115,11 +118,12 @@ + { + // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); + mutex_lock(&hipox_flash_mutex); +- hipox_smc_request_pci_ad_31_0(); ++ if ( 0 != ox810_flash_acquire_bus() ) ++ BUG(); + + inline_map_copy_from(map, to, from, len); + +- hipox_smc_release_pci_ad_31_0(); ++ ox810_flash_release_bus(); + mutex_unlock(&hipox_flash_mutex); + // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); + } +@@ -128,11 +132,12 @@ + { + // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); + mutex_lock(&hipox_flash_mutex); +- hipox_smc_request_pci_ad_31_0(); ++ if ( 0 != ox810_flash_acquire_bus() ) ++ BUG(); + + inline_map_copy_to(map, to, from, len); + +- hipox_smc_release_pci_ad_31_0(); ++ ox810_flash_release_bus(); + mutex_unlock(&hipox_flash_mutex); + // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); + } +diff -Nurd linux-2.6.24.orig//drivers/mtd/nand/hipox_nand.c linux-2.6.24/drivers/mtd/nand/hipox_nand.c +--- linux-2.6.24.orig//drivers/mtd/nand/hipox_nand.c 2011-06-15 08:54:14.197048982 +0200 ++++ linux-2.6.24/drivers/mtd/nand/hipox_nand.c 2011-06-15 09:07:11.675625433 +0200 @@ -23,6 +23,7 @@ #include #include @@ -329,44 +338,7 @@ #include #include #include -@@ -30,10 +31,9 @@ - - // the testboards ran down to a value of 4 - //#define STATIC_BUS_FLASH_CONFIG 0x4f1f3f3f /* slow settings, 345 ns */ --#define STATIC_BUS_FLASH_CONFIG 0x4f1f3f0d /* fast settings, 70 ns; use this as default, because it works for hipox board NOR flash also */ -+//#define STATIC_BUS_FLASH_CONFIG 0x4f1f3f0d /* fast settings, 70 ns */ - //#define STATIC_BUS_FLASH_CONFIG 0x4f1f3f09 /* ultra fast settings, 50 ns */ --//#define STATIC_BUS_FLASH_CONFIG 0x4f1f3f04 /* warp settings, 27 ns */ --#define STATIC_BUS_FLASH_CONFIG_RW 0x41030303 /* read and write warp settings */ -+#define STATIC_BUS_FLASH_CONFIG 0x4f1f3f04 /* warp settings, 27 ns */ - - /* - * MTD structure for HydraIP board -@@ -66,7 +66,6 @@ - */ - static void hipox_nand_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl) - { -- static unsigned int bank0 = STATIC_BUS_FLASH_CONFIG; - struct nand_chip *this = mtd->priv; - - if (ctrl & NAND_CTRL_CHANGE) { -@@ -79,15 +78,12 @@ - // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); - mutex_lock(&hipox_flash_mutex); - writel(0x20000000, GPIO_A_OUTPUT_CLEAR); /* assert CS-NAND */ -- bank0 = readl(STATIC_CONTROL_BANK0); -- writel(STATIC_BUS_FLASH_CONFIG_RW, STATIC_CONTROL_BANK0); - } - } - else - { - if (!(0x20000000 & readl(GPIO_A_OUTPUT_VALUE))) - { -- writel(bank0, STATIC_CONTROL_BANK0); - writel(0x20000000, GPIO_A_OUTPUT_SET); /* deassert CS-NAND */ - mutex_unlock(&hipox_flash_mutex); - // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); -@@ -104,9 +100,10 @@ +@@ -104,9 +105,10 @@ if (cmd != NAND_CMD_NONE) { @@ -379,7 +351,7 @@ } } -@@ -120,9 +117,13 @@ +@@ -120,9 +122,13 @@ { struct nand_chip *chip = mtd->priv; uint8_t res; @@ -395,7 +367,7 @@ return res; } -@@ -137,9 +138,13 @@ +@@ -137,9 +143,13 @@ { struct nand_chip *chip = mtd->priv; u16 res; @@ -411,7 +383,7 @@ return res; } -@@ -156,10 +161,13 @@ +@@ -156,10 +166,13 @@ int i; struct nand_chip *chip = mtd->priv; @@ -427,7 +399,7 @@ } /** -@@ -175,10 +183,13 @@ +@@ -175,10 +188,13 @@ int i; struct nand_chip *chip = mtd->priv; @@ -443,7 +415,7 @@ } /** -@@ -195,7 +206,9 @@ +@@ -195,7 +211,9 @@ int ret = 0; struct nand_chip *chip = mtd->priv; @@ -454,7 +426,7 @@ for (i = 0; i < len; i++) { if (buf[i] != readb(chip->IO_ADDR_R)) -@@ -204,7 +217,8 @@ +@@ -204,7 +222,8 @@ break; } } @@ -464,546 +436,54 @@ return ret; } -@@ -239,9 +253,7 @@ - return -ENOMEM; - } - -- mutex_lock(&hipox_flash_mutex); - writel(STATIC_BUS_FLASH_CONFIG, STATIC_CONTROL_BANK0); -- mutex_unlock(&hipox_flash_mutex); - - /* Initialize structures */ - memset(hipox_nand_mtd, 0, sizeof(struct mtd_info)); -@@ -252,12 +264,12 @@ - writel(0x20000000, GPIO_A_OUTPUT_ENABLE_SET); - - // deselect alternate function -- writel(readl(SYS_CTRL_GPIO_PRIMSEL_CTRL_0) & ~0x20000000, -- SYS_CTRL_GPIO_PRIMSEL_CTRL_0); -- writel(readl(SYS_CTRL_GPIO_SECSEL_CTRL_0) & ~0x20000000, -- SYS_CTRL_GPIO_SECSEL_CTRL_0); -- writel(readl(SYS_CTRL_GPIO_TERTSEL_CTRL_0) & ~0x20000000, -- SYS_CTRL_GPIO_TERTSEL_CTRL_0); -+ writel(readl(SYS_CTRL_GPIO_PRIMSEL_CTRL_0) & ~0x20000000, -+ SYS_CTRL_GPIO_PRIMSEL_CTRL_0); -+ writel(readl(SYS_CTRL_GPIO_SECSEL_CTRL_0) & ~0x20000000, -+ SYS_CTRL_GPIO_SECSEL_CTRL_0); -+ writel(readl(SYS_CTRL_GPIO_TERTSEL_CTRL_0) & ~0x20000000, -+ SYS_CTRL_GPIO_TERTSEL_CTRL_0); - - // assert CS-NAND - writel(0x20000000, GPIO_A_OUTPUT_CLEAR); ---- old/drivers/mtd/maps/physmap.c 2011-05-16 11:00:10.895565009 +0200 -+++ new/drivers/mtd/maps/physmap.c 2011-05-19 15:45:07.765565002 +0200 -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #if defined (CONFIG_ARCH_HIPOX) - #include -@@ -31,110 +32,115 @@ - #endif /* CONFIG_ARCH_HIPOX */ - - struct physmap_flash_info { -- struct mtd_info *mtd; -- struct map_info map; -- struct resource *res; -+ struct mtd_info *mtd; -+ struct map_info map; -+ struct resource *res; - #ifdef CONFIG_MTD_PARTITIONS -- int nr_parts; -- struct mtd_partition *parts; -+ int nr_parts; -+ struct mtd_partition *parts; - #endif - }; - - - static int physmap_flash_remove(struct platform_device *dev) - { -- struct physmap_flash_info *info; -- struct physmap_flash_data *physmap_data; -+ struct physmap_flash_info *info; -+ struct physmap_flash_data *physmap_data; - -- info = platform_get_drvdata(dev); -- if (info == NULL) -- return 0; -- platform_set_drvdata(dev, NULL); -+ info = platform_get_drvdata(dev); -+ if (info == NULL) -+ return 0; -+ platform_set_drvdata(dev, NULL); - -- physmap_data = dev->dev.platform_data; -+ physmap_data = dev->dev.platform_data; - -- if (info->mtd != NULL) { -+ if (info->mtd != NULL) { - #ifdef CONFIG_MTD_PARTITIONS -- if (info->nr_parts) { -- del_mtd_partitions(info->mtd); -- kfree(info->parts); -- } else if (physmap_data->nr_parts) { -- del_mtd_partitions(info->mtd); -- } else { -- del_mtd_device(info->mtd); -- } -+ if (info->nr_parts) { -+ del_mtd_partitions(info->mtd); -+ kfree(info->parts); -+ } else if (physmap_data->nr_parts) { -+ del_mtd_partitions(info->mtd); -+ } else { -+ del_mtd_device(info->mtd); -+ } - #else -- del_mtd_device(info->mtd); -+ del_mtd_device(info->mtd); - #endif -- map_destroy(info->mtd); -- } -+ map_destroy(info->mtd); -+ } - -- if (info->map.virt != NULL) -- iounmap(info->map.virt); -+ if (info->map.virt != NULL) -+ iounmap(info->map.virt); - -- if (info->res != NULL) { -- release_resource(info->res); -- kfree(info->res); -- } -+ if (info->res != NULL) { -+ release_resource(info->res); -+ kfree(info->res); -+ } - -- return 0; -+ return 0; - } - - #if defined (CONFIG_ARCH_HIPOX) - static map_word __xipram physmap_hipox_read(struct map_info *map, unsigned long ofs) - { -- map_word ret; -+ map_word ret; - -- // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); -- mutex_lock(&hipox_flash_mutex); -- hipox_smc_request_pci_ad_31_0(); -+ // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); -+ mutex_lock(&hipox_flash_mutex); - -- ret = inline_map_read(map, ofs); -+ if ( 0 != ox810_flash_acquire_bus() ) -+ BUG(); - -- hipox_smc_release_pci_ad_31_0(); -- mutex_unlock(&hipox_flash_mutex); -- // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); -+ ret = inline_map_read(map, ofs); - -- return ret; -+ ox810_flash_release_bus(); -+ mutex_unlock(&hipox_flash_mutex); -+ // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); -+ -+ return ret; - } - - static void __xipram physmap_hipox_write(struct map_info *map, const map_word datum, unsigned long ofs) - { -- // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); -- mutex_lock(&hipox_flash_mutex); -- hipox_smc_request_pci_ad_31_0(); -- -- inline_map_write(map, datum, ofs); -- -- hipox_smc_release_pci_ad_31_0(); -- mutex_unlock(&hipox_flash_mutex); -- // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); -+ // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); -+ mutex_lock(&hipox_flash_mutex); -+ if ( 0 != ox810_flash_acquire_bus() ) -+ BUG(); -+ -+ inline_map_write(map, datum, ofs); -+ -+ ox810_flash_release_bus(); -+ mutex_unlock(&hipox_flash_mutex); -+ // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); - } - - static void __xipram physmap_hipox_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len) - { -- // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); -- mutex_lock(&hipox_flash_mutex); -- hipox_smc_request_pci_ad_31_0(); -- -- inline_map_copy_from(map, to, from, len); -- -- hipox_smc_release_pci_ad_31_0(); -- mutex_unlock(&hipox_flash_mutex); -- // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); -+ // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); -+ mutex_lock(&hipox_flash_mutex); -+ if ( 0 != ox810_flash_acquire_bus() ) -+ BUG(); -+ -+ inline_map_copy_from(map, to, from, len); -+ -+ ox810_flash_release_bus(); -+ mutex_unlock(&hipox_flash_mutex); -+ // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); - } - - static void __xipram physmap_hipox_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len) - { -- // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); -- mutex_lock(&hipox_flash_mutex); -- hipox_smc_request_pci_ad_31_0(); -- -- inline_map_copy_to(map, to, from, len); -- -- hipox_smc_release_pci_ad_31_0(); -- mutex_unlock(&hipox_flash_mutex); -- // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); -+ // printk("%s:%d would wait for hipox_flash_mutex\n", __func__, __LINE__); -+ mutex_lock(&hipox_flash_mutex); -+ if ( 0 != ox810_flash_acquire_bus() ) -+ BUG(); -+ -+ inline_map_copy_to(map, to, from, len); -+ -+ ox810_flash_release_bus(); -+ mutex_unlock(&hipox_flash_mutex); -+ // printk("%s:%d hipox_flash_mutex unlocked\n", __func__, __LINE__); - } - #endif /* CONFIG_ARCH_HIPOX */ - -@@ -145,136 +151,134 @@ - - static int physmap_flash_probe(struct platform_device *dev) - { -- struct physmap_flash_data *physmap_data; -- struct physmap_flash_info *info; -- const char **probe_type; -- int err; -- -- physmap_data = dev->dev.platform_data; -- if (physmap_data == NULL) -- return -ENODEV; -+ struct physmap_flash_data *physmap_data; -+ struct physmap_flash_info *info; -+ const char **probe_type; -+ int err; -+ -+ physmap_data = dev->dev.platform_data; -+ if (physmap_data == NULL) -+ return -ENODEV; - - #if defined (CONFIG_ARCH_HIPOX) -- /* init timing for static memory controller */ -- mutex_lock(&hipox_flash_mutex); -- writel(STATIC_BUS_FLASH_CONFIG, STATIC_CONTROL_BANK0); -- mutex_unlock(&hipox_flash_mutex); -+ /* init timing for static memory controller */ -+ writel(STATIC_BUS_FLASH_CONFIG, STATIC_CONTROL_BANK0); - #endif /* CONFIG_ARCH_HIPOX */ +diff -Nurd linux-2.6.24.orig//include/asm-arm/arch-hipox/smc.h linux-2.6.24/include/asm-arm/arch-hipox/smc.h +--- linux-2.6.24.orig//include/asm-arm/arch-hipox/smc.h 2011-06-15 08:54:17.548796712 +0200 ++++ linux-2.6.24/include/asm-arm/arch-hipox/smc.h 2011-06-15 09:01:21.333880081 +0200 +@@ -15,14 +15,43 @@ + */ + extern struct mutex hipox_flash_mutex; -- printk(KERN_NOTICE "physmap platform flash device: %.8llx at %.8llx\n", -- (unsigned long long)(dev->resource->end - dev->resource->start + 1), -- (unsigned long long)dev->resource->start); -- -- info = kzalloc(sizeof(struct physmap_flash_info), GFP_KERNEL); -- if (info == NULL) { -- err = -ENOMEM; -- goto err_out; -- } -- -- platform_set_drvdata(dev, info); -- -- info->res = request_mem_region(dev->resource->start, -- dev->resource->end - dev->resource->start + 1, -- dev->dev.bus_id); -- if (info->res == NULL) { -- dev_err(&dev->dev, "Could not reserve memory region\n"); -- err = -ENOMEM; -- goto err_out; -- } -- -- info->map.name = dev->dev.bus_id; -- info->map.phys = dev->resource->start; -- info->map.size = dev->resource->end - dev->resource->start + 1; -- info->map.bankwidth = physmap_data->width; -- info->map.set_vpp = physmap_data->set_vpp; -- -- info->map.virt = ioremap(info->map.phys, info->map.size); -- if (info->map.virt == NULL) { -- dev_err(&dev->dev, "Failed to ioremap flash region\n"); -- err = EIO; -- goto err_out; -- } -+ printk(KERN_NOTICE "physmap platform flash device: %.8llx at %.8llx\n", -+ (unsigned long long)(dev->resource->end - dev->resource->start + 1), -+ (unsigned long long)dev->resource->start); -+ -+ info = kzalloc(sizeof(struct physmap_flash_info), GFP_KERNEL); -+ if (info == NULL) { -+ err = -ENOMEM; -+ goto err_out; -+ } -+ -+ platform_set_drvdata(dev, info); + -+ info->res = request_mem_region(dev->resource->start, -+ dev->resource->end - dev->resource->start + 1, -+ dev->dev.bus_id); -+ if (info->res == NULL) { -+ dev_err(&dev->dev, "Could not reserve memory region\n"); -+ err = -ENOMEM; -+ goto err_out; -+ } ++/* Low level PCI BUS semaphore acquisition ++ * ++ * This handler will claim the linux semaphore and the PCI bus semaphore ++ * for the caller's ID. ++ * ++ * Returns 0 if the claim was successful and both semaphores are held; !=0 otherwise. ++ * */ ++int ox810_pci_acquire_bus( void ); ++int ox810_flash_acquire_bus( void ); + -+ info->map.name = dev->dev.bus_id; -+ info->map.phys = dev->resource->start; -+ info->map.size = dev->resource->end - dev->resource->start + 1; -+ info->map.bankwidth = physmap_data->width; -+ info->map.set_vpp = physmap_data->set_vpp; -+ -+ info->map.virt = ioremap(info->map.phys, info->map.size); -+ if (info->map.virt == NULL) { -+ dev_err(&dev->dev, "Failed to ioremap flash region\n"); -+ err = EIO; -+ goto err_out; -+ } - -- simple_map_init(&info->map); -+ simple_map_init(&info->map); - #if defined (CONFIG_ARCH_HIPOX) -- info->map.read = physmap_hipox_read; -- info->map.write = physmap_hipox_write; -- info->map.copy_from = physmap_hipox_copy_from; -- info->map.copy_to = physmap_hipox_copy_to; -+ info->map.read = physmap_hipox_read; -+ info->map.write = physmap_hipox_write; -+ info->map.copy_from = physmap_hipox_copy_from; -+ info->map.copy_to = physmap_hipox_copy_to; - #endif /* CONFIG_ARCH_HIPOX */ - -- probe_type = rom_probe_types; -- for (; info->mtd == NULL && *probe_type != NULL; probe_type++) -- info->mtd = do_map_probe(*probe_type, &info->map); -- if (info->mtd == NULL) { -- dev_err(&dev->dev, "map_probe failed\n"); -- err = -ENXIO; -- goto err_out; -- } -- info->mtd->owner = THIS_MODULE; -+ probe_type = rom_probe_types; -+ for (; info->mtd == NULL && *probe_type != NULL; probe_type++) -+ info->mtd = do_map_probe(*probe_type, &info->map); -+ if (info->mtd == NULL) { -+ dev_err(&dev->dev, "map_probe failed\n"); -+ err = -ENXIO; -+ goto err_out; -+ } -+ info->mtd->owner = THIS_MODULE; - - #ifdef CONFIG_MTD_PARTITIONS -- err = parse_mtd_partitions(info->mtd, part_probe_types, &info->parts, 0); -- if (err > 0) { -- add_mtd_partitions(info->mtd, info->parts, err); -- return 0; -- } -- -- if (physmap_data->nr_parts) { -- printk(KERN_NOTICE "Using physmap partition information\n"); -- add_mtd_partitions(info->mtd, physmap_data->parts, -- physmap_data->nr_parts); -- return 0; -- } -+ err = parse_mtd_partitions(info->mtd, part_probe_types, &info->parts, 0); -+ if (err > 0) { -+ add_mtd_partitions(info->mtd, info->parts, err); -+ return 0; -+ } ++/* Low level PCI BUS semaphore release ++ * ++ * Returns 0 if release was successful, !=0 otherwise. ++ */ ++int ox810_pci_release_bus( void ); ++int ox810_flash_release_bus( void ); + -+ if (physmap_data->nr_parts) { -+ printk(KERN_NOTICE "Using physmap partition information\n"); -+ add_mtd_partitions(info->mtd, physmap_data->parts, -+ physmap_data->nr_parts); -+ return 0; -+ } - #endif - -- add_mtd_device(info->mtd); -- return 0; -+ add_mtd_device(info->mtd); -+ return 0; - - err_out: -- physmap_flash_remove(dev); -- return err; -+ physmap_flash_remove(dev); -+ return err; - } - - #ifdef CONFIG_PM - static int physmap_flash_suspend(struct platform_device *dev, pm_message_t state) - { -- struct physmap_flash_info *info = platform_get_drvdata(dev); -- int ret = 0; -+ struct physmap_flash_info *info = platform_get_drvdata(dev); -+ int ret = 0; - -- if (info) -- ret = info->mtd->suspend(info->mtd); -+ if (info) -+ ret = info->mtd->suspend(info->mtd); - -- return ret; -+ return ret; - } - - static int physmap_flash_resume(struct platform_device *dev) - { -- struct physmap_flash_info *info = platform_get_drvdata(dev); -- if (info) -- info->mtd->resume(info->mtd); -- return 0; -+ struct physmap_flash_info *info = platform_get_drvdata(dev); -+ if (info) -+ info->mtd->resume(info->mtd); -+ return 0; - } - - static void physmap_flash_shutdown(struct platform_device *dev) - { -- struct physmap_flash_info *info = platform_get_drvdata(dev); -- if (info && info->mtd->suspend(info->mtd) == 0) -- info->mtd->resume(info->mtd); -+ struct physmap_flash_info *info = platform_get_drvdata(dev); -+ if (info && info->mtd->suspend(info->mtd) == 0) -+ info->mtd->resume(info->mtd); - } - #endif - - static struct platform_driver physmap_flash_driver = { -- .probe = physmap_flash_probe, -- .remove = physmap_flash_remove, -+ .probe = physmap_flash_probe, -+ .remove = physmap_flash_remove, - #ifdef CONFIG_PM -- .suspend = physmap_flash_suspend, -- .resume = physmap_flash_resume, -- .shutdown = physmap_flash_shutdown, --#endif -- .driver = { -- .name = "physmap-flash", -- }, -+ .suspend = physmap_flash_suspend, -+ .resume = physmap_flash_resume, -+ .shutdown = physmap_flash_shutdown, -+#endif -+ .driver = { -+ .name = "physmap-flash", -+ }, - }; - - -@@ -291,63 +295,63 @@ - } - - static struct physmap_flash_data physmap_flash_data = { -- .width = CONFIG_MTD_PHYSMAP_BANKWIDTH, -+ .width = CONFIG_MTD_PHYSMAP_BANKWIDTH, - }; - - static struct resource physmap_flash_resource = { -- .start = CONFIG_MTD_PHYSMAP_START, -- .end = CONFIG_MTD_PHYSMAP_START + CONFIG_MTD_PHYSMAP_LEN - 1, -- .flags = IORESOURCE_MEM, -+ .start = CONFIG_MTD_PHYSMAP_START, -+ .end = CONFIG_MTD_PHYSMAP_START + CONFIG_MTD_PHYSMAP_LEN - 1, -+ .flags = IORESOURCE_MEM, - }; - - static struct platform_device physmap_flash = { -- .name = "physmap-flash", -- .id = 0, -- .dev = { -- .platform_data = &physmap_flash_data, -- .release = physmap_flash_release, /* needed for module build */ -- }, -- .num_resources = 1, -- .resource = &physmap_flash_resource, -+ .name = "physmap-flash", -+ .id = 0, -+ .dev = { -+ .platform_data = &physmap_flash_data, -+ .release = physmap_flash_release, /* needed for module build */ -+ }, -+ .num_resources = 1, -+ .resource = &physmap_flash_resource, - }; - - void physmap_configure(unsigned long addr, unsigned long size, -- int bankwidth, void (*set_vpp)(struct map_info *, int)) -+ int bankwidth, void (*set_vpp)(struct map_info *, int)) - { -- physmap_flash_resource.start = addr; -- physmap_flash_resource.end = addr + size - 1; -- physmap_flash_data.width = bankwidth; -- physmap_flash_data.set_vpp = set_vpp; -+ physmap_flash_resource.start = addr; -+ physmap_flash_resource.end = addr + size - 1; -+ physmap_flash_data.width = bankwidth; -+ physmap_flash_data.set_vpp = set_vpp; - } - - #ifdef CONFIG_MTD_PARTITIONS - void physmap_set_partitions(struct mtd_partition *parts, int num_parts) - { -- physmap_flash_data.nr_parts = num_parts; -- physmap_flash_data.parts = parts; -+ physmap_flash_data.nr_parts = num_parts; -+ physmap_flash_data.parts = parts; - } - #endif - #endif - - static int __init physmap_init(void) - { -- int err; -+ int err; - -- err = platform_driver_register(&physmap_flash_driver); -+ err = platform_driver_register(&physmap_flash_driver); - #ifdef PHYSMAP_COMPAT -- if (err == 0) -- platform_device_register(&physmap_flash); -+ if (err == 0) -+ platform_device_register(&physmap_flash); - #endif - -- return err; -+ return err; - } + /* +- * Request PCI_ARB to grant access to the STATIC core. ++ * PCI Driver bus semaphore registration / deregistration. ++ * This is used by the PCI driver which implements the low level bus semaphore logic: ++ * - int acquire (void * context, uint32_t owner): ++ * acquire the semaphore for an owner ID. Returns 0 if successful, ++ * !=0 otherwise. ++ * - int release (void * context): ++ * release the bus semaphore. There will be no owner check of the ++ * semaphore. Returns 0 if successful, !=0 otherwise. ++ * ++ * Deregistration must be done by the PCI driver upon unloading. + */ +-void hipox_smc_request_pci_ad_31_0(void); ++void ox810_pci_register_semaphore_callbacks( int (*acquire)(void*, uint32_t), int (*release)(void*), void * ctx ); ++void ox810_pci_reset_semaphore_callbacks( void ); - static void __exit physmap_exit(void) - { - #ifdef PHYSMAP_COMPAT -- platform_device_unregister(&physmap_flash); -+ platform_device_unregister(&physmap_flash); - #endif -- platform_driver_unregister(&physmap_flash_driver); -+ platform_driver_unregister(&physmap_flash_driver); - } + /* +- * Release access to PCI bus. ++ * LEGACY interface. Will print ugly error messages if used. Do not use. Use ox810_flash_[release|request]_bus() instead. + */ +-void hipox_smc_release_pci_ad_31_0(void); ++void hipox_smc_release_pci_ad_31_0( void ); ++void hipox_smc_request_pci_ad_31_0( void ); - module_init(physmap_init); + #endif // __ASM_ARCH_SMC_H From 7b8fcf1378cdc76cca79cee3dc5d73f7a6d41e0c Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Mon, 4 Jul 2011 08:16:42 +0200 Subject: [PATCH 389/509] ppp-2.4.5: own package for PPPoL2TP plugin Adding that package fixes the following error message. NOTE: package ppp-2.4.5-r1: task do_qa_staging: Started WARNING: the following files were installed but not shipped in any package: WARNING: /usr/lib/pppd/2.4.5/pppol2tp.so WARNING: /usr/lib/pppd/2.4.5/openl2tp.so Signed-off-by: Steffen Sledz Acked-by: Paul Menzel --- recipes/ppp/ppp_2.4.5.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes/ppp/ppp_2.4.5.bb b/recipes/ppp/ppp_2.4.5.bb index 2b6b6f7a7a..b9354d025f 100644 --- a/recipes/ppp/ppp_2.4.5.bb +++ b/recipes/ppp/ppp_2.4.5.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Point-to-Point Protocol (PPP) daemon" HOMEPAGE = "http://samba.org/ppp/" DEPENDS = "libpcap" LICENSE = "BSD GPLv2" -PR = "r1" +PR = "r2" # Not well tested DEFAULT_PREFERENCE = "-1" @@ -49,10 +49,11 @@ do_install_append () { } CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" -PACKAGES =+ "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools" +PACKAGES =+ "ppp-l2tp ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools" FILES_${PN} = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd" FILES_${PN}_nylon = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${sbindir}/tdbread" FILES_${PN}-dbg += "${libdir}/pppd/${PV}/.debug" +FILES_${PN}-l2tp = "${libdir}/pppd/${PV}/pppol2tp.so ${libdir}/pppd/${PV}/openl2tp.so" FILES_${PN}-oa = "${libdir}/pppd/${PV}/pppoatm.so" FILES_${PN}-oe = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/rp-pppoe.so" FILES_${PN}-radius = "${libdir}/pppd/${PV}/radius.so ${libdir}/pppd/${PV}/radattr.so ${libdir}/pppd/${PV}/radrealms.so" @@ -60,6 +61,7 @@ FILES_${PN}-winbind = "${libdir}/pppd/${PV}/winbind.so" FILES_${PN}-minconn = "${libdir}/pppd/${PV}/minconn.so" FILES_${PN}-password = "${libdir}/pppd/${PV}/pass*.so" FILES_${PN}-tools = "${sbindir}/pppstats ${sbindir}/pppdump" +DESCRIPTION_ppp-l2tp = "Plugin for PPP needed for PPP-over-L2TP" DESCRIPTION_ppp-oa = "Plugin for PPP needed for PPP-over-ATM" DESCRIPTION_ppp-oe = "Plugin for PPP needed for PPP-over-Ethernet" DESCRIPTION_ppp-radius = "Plugin for PPP that are related to RADIUS" From 6197058a768710ff9ec151d52ef012f43f8eb1a7 Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Mon, 4 Jul 2011 08:19:28 +0200 Subject: [PATCH 390/509] ppp-2.4.5: remove `DP = "-1"` Oe-core is using 2.4.5 and it works OK there. Signed-off-by: Steffen Sledz Acked-by: Paul Menzel --- recipes/ppp/ppp_2.4.5.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/ppp/ppp_2.4.5.bb b/recipes/ppp/ppp_2.4.5.bb index b9354d025f..ce6076caa1 100644 --- a/recipes/ppp/ppp_2.4.5.bb +++ b/recipes/ppp/ppp_2.4.5.bb @@ -4,8 +4,6 @@ HOMEPAGE = "http://samba.org/ppp/" DEPENDS = "libpcap" LICENSE = "BSD GPLv2" PR = "r2" -# Not well tested -DEFAULT_PREFERENCE = "-1" PARALLEL_MAKE = "" From 049717234e638015e03dd209e980af31bc57ee5d Mon Sep 17 00:00:00 2001 From: Mario Schuknecht Date: Wed, 29 Jun 2011 09:40:55 +0000 Subject: [PATCH 391/509] udev: avoid udev stopping persistent pppd connections When a pppd session is disconnected it triggers the udev to ifdown the ppp link which kills pppd and inhibits a reconnection. Now avoid udev stopping ppp connections. See also: https://bugs.launchpad.net/ubuntu/+source/ifupdown/+bug/396804 https://bugs.launchpad.net/ubuntu/+source/ifupdown/+bug/78043 http://ubuntuforums.org/showthread.php?t=1177021 http://rants.atmurray.net/2007/01/pppd-persist-not-so-persist-with-udev.html Signed-off-by: Mario Schuknecht Acked-by: Steffen Sledz --- recipes/udev/files/network.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/udev/files/network.sh b/recipes/udev/files/network.sh index 182c26d86a..d287855221 100644 --- a/recipes/udev/files/network.sh +++ b/recipes/udev/files/network.sh @@ -9,6 +9,8 @@ test -x /sbin/cardctl && exit 0 # We get two "add" events for hostap cards due to wifi0 echo "$INTERFACE" | grep -q wifi && exit 0 +# Avoid udev stopping persistent ppp connections +echo "$INTERFACE" | grep -q ppp && exit 0 # Check if /etc/init.d/network has been run yet to see if we are # called by starting /etc/rcS.d/S03udev and not by hotplugging a device From f432183bb5fb35770cbc45669541a2175fc5f1da Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Fri, 8 Jul 2011 22:17:01 +0000 Subject: [PATCH 392/509] cacao-native_hg: Fix cacao-shutdownguard.patch The patch contained some left-over debug code which can result into problems if other programs (like configure) relays on the output of the JVM For 2011.03-maintenance: Tested-by: George C. Huntington III Signed-off-by: Stefan Schmidt Signed-off-by: Tom Rini --- recipes/cacao/cacao-native_hg.bb | 2 +- recipes/cacao/files/cacao-shutdownguard.patch | 32 ++++++++++--------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/recipes/cacao/cacao-native_hg.bb b/recipes/cacao/cacao-native_hg.bb index dc35ce8dd3..020dee39fe 100644 --- a/recipes/cacao/cacao-native_hg.bb +++ b/recipes/cacao/cacao-native_hg.bb @@ -1,7 +1,7 @@ require cacao-native.inc PV = "1.1.0+hgr${SRCPV}" -PR = "r4" +PR = "r5" SRCREV = "c7bf150bfa46" SRC_URI = "hg://mips.complang.tuwien.ac.at/hg/;module=cacao;rev=${SRCREV} \ diff --git a/recipes/cacao/files/cacao-shutdownguard.patch b/recipes/cacao/files/cacao-shutdownguard.patch index b89170c780..b0d9d9237e 100644 --- a/recipes/cacao/files/cacao-shutdownguard.patch +++ b/recipes/cacao/files/cacao-shutdownguard.patch @@ -1,6 +1,7 @@ -diff -r c7bf150bfa46 src/threads/posix/mutex-posix.hpp ---- a/src/threads/posix/mutex-posix.hpp Fri Mar 11 23:35:56 2011 +0100 -+++ b/src/threads/posix/mutex-posix.hpp Fri Apr 01 16:16:07 2011 +0200 +Index: cacao/src/threads/posix/mutex-posix.hpp +=================================================================== +--- cacao.orig/src/threads/posix/mutex-posix.hpp 2011-03-08 13:13:00.000000000 +0100 ++++ cacao/src/threads/posix/mutex-posix.hpp 2011-05-10 11:51:48.534869875 +0200 @@ -53,6 +53,9 @@ inline void lock(); @@ -80,9 +81,10 @@ diff -r c7bf150bfa46 src/threads/posix/mutex-posix.hpp #else // This structure must have the same layout as the class above. -diff -r c7bf150bfa46 src/threads/posix/thread-posix.cpp ---- a/src/threads/posix/thread-posix.cpp Fri Mar 11 23:35:56 2011 +0100 -+++ b/src/threads/posix/thread-posix.cpp Fri Apr 01 16:16:07 2011 +0200 +Index: cacao/src/threads/posix/thread-posix.cpp +=================================================================== +--- cacao.orig/src/threads/posix/thread-posix.cpp 2011-03-17 10:41:29.000000000 +0100 ++++ cacao/src/threads/posix/thread-posix.cpp 2011-05-10 11:51:48.534869875 +0200 @@ -74,6 +74,23 @@ #include "vm/string.hpp" #include "vm/vm.hpp" @@ -107,9 +109,10 @@ diff -r c7bf150bfa46 src/threads/posix/thread-posix.cpp #if defined(ENABLE_STATISTICS) # include "vm/statistics.h" #endif -diff -r c7bf150bfa46 src/vm/vm.cpp ---- a/src/vm/vm.cpp Fri Mar 11 23:35:56 2011 +0100 -+++ b/src/vm/vm.cpp Fri Apr 01 16:16:07 2011 +0200 +Index: cacao/src/vm/vm.cpp +=================================================================== +--- cacao.orig/src/vm/vm.cpp 2011-03-17 10:41:29.000000000 +0100 ++++ cacao/src/vm/vm.cpp 2011-05-10 11:56:36.564882762 +0200 @@ -52,6 +52,7 @@ #include "native/vm/nativevm.hpp" @@ -141,12 +144,10 @@ diff -r c7bf150bfa46 src/vm/vm.cpp /* vm_run ********************************************************************** -@@ -1865,6 +1882,15 @@ +@@ -1865,6 +1882,13 @@ void vm_shutdown(s4 status) { -+ log_println("vm_shutdown"); -+ + if (VM::get_current()->shutdown_guard()) + { + /* Shutdown in progress by another thread already. @@ -157,9 +158,10 @@ diff -r c7bf150bfa46 src/vm/vm.cpp if (opt_verbose #if defined(ENABLE_STATISTICS) || opt_getcompilingtime || opt_stat -diff -r c7bf150bfa46 src/vm/vm.hpp ---- a/src/vm/vm.hpp Fri Mar 11 23:35:56 2011 +0100 -+++ b/src/vm/vm.hpp Fri Apr 01 16:16:07 2011 +0200 +Index: cacao/src/vm/vm.hpp +=================================================================== +--- cacao.orig/src/vm/vm.hpp 2011-03-08 13:13:00.000000000 +0100 ++++ cacao/src/vm/vm.hpp 2011-05-10 11:51:48.554844342 +0200 @@ -64,6 +64,7 @@ bool _initializing; bool _created; From cf85079e57b27fa9cbee1bc004baa5cdb8b85717 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 14 Jun 2011 21:57:39 +0200 Subject: [PATCH 393/509] x-load git: 1.5.0 sorts lower than 1.44ss, so bump PE Signed-off-by: Koen Kooi --- recipes/x-load/x-load_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/x-load/x-load_git.bb b/recipes/x-load/x-load_git.bb index 17fe369299..3be993b3e9 100644 --- a/recipes/x-load/x-load_git.bb +++ b/recipes/x-load/x-load_git.bb @@ -6,7 +6,7 @@ FILESPATHPKG_prepend = "x-load-git:x-load-git/${MACHINE}" PV = "1.5.0+${PR}+gitr${SRCREV}" PR ="r24" -PE = "1" +PE = "2" SRCREV = "04b1732220078d47c18a84cbafc52e45db71f13d" SRC_URI = "git://gitorious.org/x-loader/x-loader.git;branch=master;protocol=git \ From 5be4911a35aab959b5fe843c9872fcc6f48d9631 Mon Sep 17 00:00:00 2001 From: Joel A Fernandes Date: Thu, 23 Jun 2011 13:04:40 +0000 Subject: [PATCH 394/509] linux-omap: Disable UART sleep timeout to avoid serial port problems on wakeup. Signed-off-by: Joel A Fernandes Signed-off-by: Koen Kooi --- ...ARM-OMAP-beagle-disable-uart-timeout.patch | 21 +++++++++++++++++++ recipes/linux/linux-omap-psp_2.6.32.bb | 1 + 2 files changed, 22 insertions(+) create mode 100644 recipes/linux/linux-omap-psp-2.6.32/0046-ARM-OMAP-beagle-disable-uart-timeout.patch diff --git a/recipes/linux/linux-omap-psp-2.6.32/0046-ARM-OMAP-beagle-disable-uart-timeout.patch b/recipes/linux/linux-omap-psp-2.6.32/0046-ARM-OMAP-beagle-disable-uart-timeout.patch new file mode 100644 index 0000000000..b0c0d0b891 --- /dev/null +++ b/recipes/linux/linux-omap-psp-2.6.32/0046-ARM-OMAP-beagle-disable-uart-timeout.patch @@ -0,0 +1,21 @@ +commit 06a8d6478752403a617ed9fb9f6b78c31ad25020 +Author: Joel A Fernandes +Date: Tue Jun 21 17:31:13 2011 -0500 + + omap: Disable UART sleep timeout to avoid serial port problems on wakeup. + + Signed-off-by: Joel A Fernandes + +diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c +index 19805a7..35a24af 100644 +--- a/arch/arm/mach-omap2/serial.c ++++ b/arch/arm/mach-omap2/serial.c +@@ -36,7 +36,7 @@ + #define UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV 0x52 + #define UART_OMAP_WER 0x17 /* Wake-up enable register */ + +-#define DEFAULT_TIMEOUT (5 * HZ) ++#define DEFAULT_TIMEOUT 0 + + struct omap_uart_state { + int num; diff --git a/recipes/linux/linux-omap-psp_2.6.32.bb b/recipes/linux/linux-omap-psp_2.6.32.bb index 9221813143..a076bf1e05 100644 --- a/recipes/linux/linux-omap-psp_2.6.32.bb +++ b/recipes/linux/linux-omap-psp_2.6.32.bb @@ -58,6 +58,7 @@ SRC_URI = "git://arago-project.org/git/projects/linux-omap3.git;protocol=http;br file://0043-MTD-silence-ecc-errors-on-mtdblock0.patch \ file://0044-ARM-OMAP-beagle-every-known-beagle-except-revB-uses-.patch \ file://0045-ARM-OMAP-beagle-add-support-for-beagleFPGA-expansion.patch \ + file://0046-ARM-OMAP-beagle-disable-uart-timeout.patch \ file://cam/0001-mt9t111-first-stab-at-merging-sensor-driver-based-on.patch \ file://cam/0002-mt9t111-Fix-all-checkpatch-errors.patch \ file://cam/0003-mt9t111-Pass-v4l2_int_device-data.patch \ From 3516412082f808588a58fe5639ae5868ee89c118 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 23 Jun 2011 09:41:52 +0200 Subject: [PATCH 395/509] linux-omap-psp 2.6.32: bump PR Signed-off-by: Koen Kooi --- recipes/linux/linux-omap-psp_2.6.32.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/linux/linux-omap-psp_2.6.32.bb b/recipes/linux/linux-omap-psp_2.6.32.bb index a076bf1e05..e16b1a0ec1 100644 --- a/recipes/linux/linux-omap-psp_2.6.32.bb +++ b/recipes/linux/linux-omap-psp_2.6.32.bb @@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "am3517-crane|beagleboard|omap3evm|am3517-evm|dm37x-evm|am3 SRCREV = "5fc29e7b2a76a64a739f857858ef0b98294aa155" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -MACHINE_KERNEL_PR_append = "c+gitr${SRCREV}" +MACHINE_KERNEL_PR_append = "d+gitr${SRCREV}" SRC_URI = "git://arago-project.org/git/projects/linux-omap3.git;protocol=http;branch=master \ file://0001-Added-Crane-Board-support.patch \ From 1e03c2ad5202de39a2a55db20a1faf35a2ee32f0 Mon Sep 17 00:00:00 2001 From: Joel A Fernandes Date: Mon, 11 Jul 2011 10:56:37 +0000 Subject: [PATCH 396/509] angstrom: Use pulseaudio version 0.9.22 for armv7a architecture This fixes all the issues noticed earlier with pulseaudio 0.9.15: * Pulseaudio keeping audio devices busy when run as per-user instance * Failure of pactl, pacmd etc to connect to the pulse server The gcc 4.3.x angstrom is using in maintenance lacks the needed atomic ops to build pulseaudio 0.9.23 for armv7a so we use pulseaudio 0.9.22 which is less buggier than pulseaudio 0.9.15 Signed-off-by: Joel A Fernandes Signed-off-by: Koen Kooi --- conf/distro/include/angstrom-2008-preferred-versions.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index b5b524a812..4833d35cbc 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -45,6 +45,7 @@ PREFERRED_VERSION_pango-native = "1.24.4" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.15" +PREFERRED_VERSION_pulseaudio_armv7a = "0.9.22" PREFERRED_VERSION_python-pycairo = "1.8.0" PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}" From d0c6dddaae96e1390589bf85e1f38ef1714bdae0 Mon Sep 17 00:00:00 2001 From: Joel A Fernandes Date: Fri, 8 Jul 2011 12:22:42 +0000 Subject: [PATCH 397/509] beagleboard-test-scripts: Add a script flash-fs.sh for flashing NAND This script flashes the NAND of a BeagleBoard if: * There is a valid image on the SD Card to flash * The board has NAND Signed-off-by: Joel A Fernandes Signed-off-by: Koen Kooi --- .../beagleboard/beagleboard-test-scripts_git.bb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/recipes/beagleboard/beagleboard-test-scripts_git.bb b/recipes/beagleboard/beagleboard-test-scripts_git.bb index be0d059c98..0ee7954f02 100644 --- a/recipes/beagleboard/beagleboard-test-scripts_git.bb +++ b/recipes/beagleboard/beagleboard-test-scripts_git.bb @@ -1,14 +1,18 @@ ## Reminder: The correct spacing for a variable is FOO = "BAR" in : PR="r1" DESCRIPTION = "BeagleBoard test scripts" HOMEPAGE = "http://beagleboad.org/support" -PR = "r2" +PR = "r3" -SRC_URI = "git://gitorious.org/beagleboard-validation/scripts.git;protocol=git \ +SRC_URI = "git://gitorious.org/~joelf/beagleboard-validation/validation-scripts.git;protocol=git \ " -SRCREV = "473dd2ab20d866be6168c9f992c2c9e74e485c9d" +SRCREV = "2df76857155fbd462527c2b00ee83214483f0594" S = "${WORKDIR}/git" +inherit update-rc.d +INITSCRIPT_NAME = "flash-nand-fs.sh" +INITSCRIPT_PARAMS = "start 99 2 3 4 5 ." + do_install() { TEST_FILES=" \ testaudio \ @@ -28,4 +32,8 @@ do_install() { for i in ${TEST_FILES}; do install -m 0755 ${S}/${i} ${D}/${bindir} done + # A script to flash NAND if the board has it, and if there is valid image to flash on the SD Card. + # We also register it as an init script so that the SD Card auto-flashes to NAND during boot. + install -d ${D}/${sysconfdir}/init.d/ + install -m 0755 ${S}/flashing/flash-nand-fs.sh ${D}/${sysconfdir}/init.d/flash-nand-fs.sh } From e86fb012598a4e46ef5986754eae855cf92ca240 Mon Sep 17 00:00:00 2001 From: Joel A Fernandes Date: Wed, 6 Jul 2011 09:48:56 +0000 Subject: [PATCH 398/509] linux-omap-psp: Fix the user button GPIO to the correct value for a BeagleBoard-xM Signed-off-by: Joel A Fernandes Signed-off-by: Koen Kooi --- ...08-omap3-beagle-cleaned-up-board-revision-conditions.patch | 4 ++-- recipes/linux/linux-omap-psp_2.6.32.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0008-omap3-beagle-cleaned-up-board-revision-conditions.patch b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0008-omap3-beagle-cleaned-up-board-revision-conditions.patch index 513a1019c2..fb91cb6f28 100644 --- a/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0008-omap3-beagle-cleaned-up-board-revision-conditions.patch +++ b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0008-omap3-beagle-cleaned-up-board-revision-conditions.patch @@ -143,8 +143,8 @@ index 4bde54b..664a9c6 100644 omap3_beagle_i2c_init(); - if (cpu_is_omap3630()) { -+ if ((omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XMAB) && -+ (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XMC)) { ++ if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMAB) || ++ (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC)) { gpio_buttons[0].gpio = 4; } diff --git a/recipes/linux/linux-omap-psp_2.6.32.bb b/recipes/linux/linux-omap-psp_2.6.32.bb index e16b1a0ec1..ab9a04a59e 100644 --- a/recipes/linux/linux-omap-psp_2.6.32.bb +++ b/recipes/linux/linux-omap-psp_2.6.32.bb @@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "am3517-crane|beagleboard|omap3evm|am3517-evm|dm37x-evm|am3 SRCREV = "5fc29e7b2a76a64a739f857858ef0b98294aa155" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -MACHINE_KERNEL_PR_append = "d+gitr${SRCREV}" +MACHINE_KERNEL_PR_append = "e+gitr${SRCREV}" SRC_URI = "git://arago-project.org/git/projects/linux-omap3.git;protocol=http;branch=master \ file://0001-Added-Crane-Board-support.patch \ From 22ae010d21351453e56b687f1ce4067b034b8c04 Mon Sep 17 00:00:00 2001 From: Joel A Fernandes Date: Fri, 15 Jul 2011 22:56:31 +0000 Subject: [PATCH 399/509] linux-omap-psp: Added patch to fix MMC timeout errors This fixes MMC errors due to timeouts, and is borrowed from Steve Sakoman's patch for the linux-omap-2.6.39 recipe (as noticed by Jason Kridner) Details of the issue: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg42214.html Signed-off-by: Joel A Fernandes Signed-off-by: Koen Kooi --- ...just-dto-to-eliminate-timeout-errors.patch | 22 +++++++++++++++++++ recipes/linux/linux-omap-psp_2.6.32.bb | 3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 recipes/linux/linux-omap-psp-2.6.32/0047-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch diff --git a/recipes/linux/linux-omap-psp-2.6.32/0047-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch b/recipes/linux/linux-omap-psp-2.6.32/0047-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch new file mode 100644 index 0000000000..4867d3f761 --- /dev/null +++ b/recipes/linux/linux-omap-psp-2.6.32/0047-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch @@ -0,0 +1,22 @@ +From 26a79f408bd41ad7b4a47f2683909d3fc1575eab Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Wed, 12 Jan 2011 05:54:55 -0800 +Subject: [PATCH] omap: mmc: Adjust dto to eliminate timeout errors + +A number of SD card types were experiencing timeout errors. This +could also lead to data corruption in some cases. + +This fix proposed by Sukumar Ghoral of TI. +--- +diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c +index 9646a75..ef458d6 100644 +--- a/drivers/mmc/host/omap_hsmmc.c ++++ b/drivers/mmc/host/omap_hsmmc.c +@@ -1032,6 +1032,7 @@ static void set_data_timeout(struct omap_hsmmc_host *host, + cycle_ns = 1000000000 / (clk_get_rate(host->fclk) / clkd); + timeout = timeout_ns / cycle_ns; + timeout += timeout_clks; ++ timeout *= 2; + if (timeout) { + while ((timeout & 0x80000000) == 0) { + dto += 1; diff --git a/recipes/linux/linux-omap-psp_2.6.32.bb b/recipes/linux/linux-omap-psp_2.6.32.bb index ab9a04a59e..7a0797ae7b 100644 --- a/recipes/linux/linux-omap-psp_2.6.32.bb +++ b/recipes/linux/linux-omap-psp_2.6.32.bb @@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "am3517-crane|beagleboard|omap3evm|am3517-evm|dm37x-evm|am3 SRCREV = "5fc29e7b2a76a64a739f857858ef0b98294aa155" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -MACHINE_KERNEL_PR_append = "e+gitr${SRCREV}" +MACHINE_KERNEL_PR_append = "f+gitr${SRCREV}" SRC_URI = "git://arago-project.org/git/projects/linux-omap3.git;protocol=http;branch=master \ file://0001-Added-Crane-Board-support.patch \ @@ -59,6 +59,7 @@ SRC_URI = "git://arago-project.org/git/projects/linux-omap3.git;protocol=http;br file://0044-ARM-OMAP-beagle-every-known-beagle-except-revB-uses-.patch \ file://0045-ARM-OMAP-beagle-add-support-for-beagleFPGA-expansion.patch \ file://0046-ARM-OMAP-beagle-disable-uart-timeout.patch \ + file://0047-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch \ file://cam/0001-mt9t111-first-stab-at-merging-sensor-driver-based-on.patch \ file://cam/0002-mt9t111-Fix-all-checkpatch-errors.patch \ file://cam/0003-mt9t111-Pass-v4l2_int_device-data.patch \ From 413152fced2b393b68f7f513bf4808a9117cc5d0 Mon Sep 17 00:00:00 2001 From: Joel A Fernandes Date: Sat, 16 Jul 2011 09:19:58 +0000 Subject: [PATCH 400/509] beagleboard-test-scripts: BeagleBoard userbutton detection for flashing * Build and install a userbutton tool to detect state of the user button on a BeagleBoard from /dev/input/event0 * Install a user.txt and uEnv.txt to /boot, Narcissus will copy from here to the FAT partition of an SD Card Signed-off-by: Joel A Fernandes Signed-off-by: Koen Kooi --- recipes/beagleboard/beagleboard-test-scripts_git.bb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/recipes/beagleboard/beagleboard-test-scripts_git.bb b/recipes/beagleboard/beagleboard-test-scripts_git.bb index 0ee7954f02..bb0e6e4e5f 100644 --- a/recipes/beagleboard/beagleboard-test-scripts_git.bb +++ b/recipes/beagleboard/beagleboard-test-scripts_git.bb @@ -1,18 +1,22 @@ ## Reminder: The correct spacing for a variable is FOO = "BAR" in : PR="r1" DESCRIPTION = "BeagleBoard test scripts" HOMEPAGE = "http://beagleboad.org/support" -PR = "r3" +PR = "r4" SRC_URI = "git://gitorious.org/~joelf/beagleboard-validation/validation-scripts.git;protocol=git \ " -SRCREV = "2df76857155fbd462527c2b00ee83214483f0594" +SRCREV = "f7ba1b49190003af524f1a768ec887955a9994a0" S = "${WORKDIR}/git" inherit update-rc.d INITSCRIPT_NAME = "flash-nand-fs.sh" INITSCRIPT_PARAMS = "start 99 2 3 4 5 ." +do_compile() { + ${CC} -o userbutton-pressed ${CFLAGS} ${LDFLAGS} flashing/userbutton-pressed.c +} + do_install() { TEST_FILES=" \ testaudio \ @@ -36,4 +40,8 @@ do_install() { # We also register it as an init script so that the SD Card auto-flashes to NAND during boot. install -d ${D}/${sysconfdir}/init.d/ install -m 0755 ${S}/flashing/flash-nand-fs.sh ${D}/${sysconfdir}/init.d/flash-nand-fs.sh + install -m 0755 userbutton-pressed ${D}/${bindir}/userbutton-pressed + install -d ${D}/boot/ + install -m 0755 ${S}/flashing/user.txt ${D}/boot/user.txt + install -m 0755 ${S}/flashing/uEnv.txt ${D}/boot/uEnv.txt } From 869002635c3755ded843ed5cbb198f248d52b917 Mon Sep 17 00:00:00 2001 From: chase maupin Date: Tue, 19 Jul 2011 20:29:59 +0000 Subject: [PATCH 401/509] nodejs: Add patch to compile with GCC 4.3.3 * Add a patch to nodejs to allow compiling with GCC versions less than or equal to 4.3.3. * Define the function nodejs_get_gcc_ver to allow applying the patch conditionally based on compiler version. * Patch based on post at https://github.com/joyent/node/issues/883 Signed-off-by: Chase Maupin Signed-off-by: Koen Kooi --- ...d-missing-compiler-flags-for-GCC-4.3.patch | 34 +++++++++++++++++++ recipes/nodejs/nodejs_0.4.0.bb | 9 +++++ 2 files changed, 43 insertions(+) create mode 100644 recipes/nodejs/files/0001-Add-missing-compiler-flags-for-GCC-4.3.patch diff --git a/recipes/nodejs/files/0001-Add-missing-compiler-flags-for-GCC-4.3.patch b/recipes/nodejs/files/0001-Add-missing-compiler-flags-for-GCC-4.3.patch new file mode 100644 index 0000000000..080b88f09b --- /dev/null +++ b/recipes/nodejs/files/0001-Add-missing-compiler-flags-for-GCC-4.3.patch @@ -0,0 +1,34 @@ +From 7cb51ed25b688be08825950ce3f5ce2ad38e3f95 Mon Sep 17 00:00:00 2001 +From: Chase Maupin +Date: Tue, 12 Jul 2011 11:00:48 -0500 +Subject: [PATCH] Add missing compiler flags for GCC 4.3 + +* When compiling nodejs for GCC 4.3.3 you need to also add the + flag -fno-tree-sink. +* This patch was taken from the thread at: + * https://github.com/joyent/node/issues/883 +* Believe that no action is taken on this change upstream because + it is GCC 4.3.3 specific and is not required for GCC 4.5 + +Upstream-Status: Denied + +Signed-off-by: Chase Maupin +--- + deps/v8/SConstruct | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/deps/v8/SConstruct b/deps/v8/SConstruct +index b2542fd..31c4c7b 100644 +--- a/deps/v8/SConstruct ++++ b/deps/v8/SConstruct +@@ -210,6 +210,7 @@ LIBRARY_FLAGS = { + }, + 'arch:arm': { + 'CPPDEFINES': ['V8_TARGET_ARCH_ARM'], ++ 'CCFLAGS': ['-fno-tree-sink'], + 'unalignedaccesses:on' : { + 'CPPDEFINES' : ['CAN_USE_UNALIGNED_ACCESSES=1'] + }, +-- +1.7.0.4 + diff --git a/recipes/nodejs/nodejs_0.4.0.bb b/recipes/nodejs/nodejs_0.4.0.bb index be3d23e02f..fe8a8780d2 100644 --- a/recipes/nodejs/nodejs_0.4.0.bb +++ b/recipes/nodejs/nodejs_0.4.0.bb @@ -4,11 +4,20 @@ LICENSE = "MIT" DEPENDS = "openssl" +PR = "r1" + +def nodejs_get_gcc_version(d): + import subprocess,os,bb + if os.path.exists(bb.data.getVar('TOOLCHAIN_PATH', d, 1)+'/bin/'+bb.data.getVar('TARGET_PREFIX', d, 1)+'gcc'): + return subprocess.Popen([bb.data.getVar('TOOLCHAIN_PATH', d, 1)+'/bin/'+bb.data.getVar('TARGET_PREFIX', d, 1)+'gcc', '-v'], stderr=subprocess.PIPE).communicate()[1].splitlines()[-1].split()[2] + SRC_URI = " \ http://nodejs.org/dist/node-v${PV}.tar.gz \ file://libev-cross-cc_${PV}.patch \ " +SRC_URI += "${@["", "file://0001-Add-missing-compiler-flags-for-GCC-4.3.patch"][nodejs_get_gcc_version(d) <= "4.3.3"]}" + SRC_URI[md5sum] = "18f89256751f9b8e27dee8494f508171" SRC_URI[sha256sum] = "4a30bd9963373cb86a994479bdd451ab3b6f2124f0089493366315da79d3408e" From 0b6b6494c74f888978cf7bd30388771c8e3d8b8d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Jul 2011 21:15:59 +0200 Subject: [PATCH 402/509] gst-plugins-good 0.10.28: bump PR for pulseaudio .15 -> .22 update This fixes: (totem:1133): GStreamer-WARNING **: Failed to load plugin '/usr/lib/gstreamer-0.10/libgstpulse.so': libpulsecommon-0.9.15.so: cannot open shared object file: No such file or directory. Signed-off-by: Koen Kooi --- recipes/gstreamer/gst-plugins-good_0.10.28.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/gstreamer/gst-plugins-good_0.10.28.bb b/recipes/gstreamer/gst-plugins-good_0.10.28.bb index 19a50fdd4a..c13f2d9c47 100644 --- a/recipes/gstreamer/gst-plugins-good_0.10.28.bb +++ b/recipes/gstreamer/gst-plugins-good_0.10.28.bb @@ -1,6 +1,6 @@ require gst-plugins.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI[archive.md5sum] = "6ef1588921f59d85c44ee2e49a3c97a0" SRC_URI[archive.sha256sum] = "adfbce68b9fbadb7a7aeda2227af6afe1928ef025af4158726617b9d6834b028" From 4a12bf7e980e77ddc6192c4927f1e22e1fa1b5a9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 23 Jul 2011 08:55:20 +0200 Subject: [PATCH 403/509] pulseaudio: make it work out of the box * reuse 'audio' group as access group The current failure is: root@usrp-e1xx:/etc/pulse# pulseaudio --system [..] W: protocol-native.c: Failed to get GID of group 'pulse-access' W: protocol-native.c: Failed to check group membership. W: protocol-native.c: Denied access to client with invalid authorization data. * add more required modules Signed-off-by: Richard Purdie Signed-off-by: Koen Kooi From OE-core rev 756e5fb08ee65cf459d88f97ae51adc86af75a70 --- recipes/pulseaudio/pulseaudio.inc | 4 ++++ recipes/pulseaudio/pulseaudio_0.9.15.bb | 2 +- recipes/pulseaudio/pulseaudio_0.9.21.bb | 2 +- recipes/pulseaudio/pulseaudio_0.9.22.bb | 2 +- recipes/pulseaudio/pulseaudio_git.bb | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/recipes/pulseaudio/pulseaudio.inc b/recipes/pulseaudio/pulseaudio.inc index 85048f2485..4fbfcf8538 100644 --- a/recipes/pulseaudio/pulseaudio.inc +++ b/recipes/pulseaudio/pulseaudio.inc @@ -24,6 +24,7 @@ EXTRA_OECONF = "\ --with-alsa \ --with-oss \ --with-hal \ + --with-access-group=audio \ " PARALLEL_MAKE = "" @@ -107,6 +108,8 @@ python populate_packages_prepend() { RDEPENDS_pulseaudio-module-console-kit =+ "consolekit" RDEPENDS_pulseaudio-module-hal_detect =+ "hal" RDEPENDS_pulseaudio-server = " \ + pulseaudio-module-udev-detect \ + pulseaudio-module-null-sink \ pulseaudio-module-device-restore \ pulseaudio-module-stream-restore \ pulseaudio-module-card-restore \ @@ -118,6 +121,7 @@ RDEPENDS_pulseaudio-server = " \ pulseaudio-module-native-protocol-unix \ pulseaudio-module-hal-detect \ pulseaudio-module-default-device-restore \ + pulseaudio-module-intended-roles \ pulseaudio-module-rescue-streams \ pulseaudio-module-always-sink \ pulseaudio-module-suspend-on-idle \ diff --git a/recipes/pulseaudio/pulseaudio_0.9.15.bb b/recipes/pulseaudio/pulseaudio_0.9.15.bb index d910e4865c..f9dd50e810 100644 --- a/recipes/pulseaudio/pulseaudio_0.9.15.bb +++ b/recipes/pulseaudio/pulseaudio_0.9.15.bb @@ -1,7 +1,7 @@ require pulseaudio.inc DEPENDS += "gdbm speex" -PR = "${INC_PR}.6" +PR = "${INC_PR}.7" inherit gettext diff --git a/recipes/pulseaudio/pulseaudio_0.9.21.bb b/recipes/pulseaudio/pulseaudio_0.9.21.bb index 159db39380..9a0e402863 100644 --- a/recipes/pulseaudio/pulseaudio_0.9.21.bb +++ b/recipes/pulseaudio/pulseaudio_0.9.21.bb @@ -1,6 +1,6 @@ require pulseaudio.inc -PR = ${INC_PR}.2 +PR = "${INC_PR}.3" DEPENDS += "gdbm speex" diff --git a/recipes/pulseaudio/pulseaudio_0.9.22.bb b/recipes/pulseaudio/pulseaudio_0.9.22.bb index 71ac6582d5..99a3f05e1c 100644 --- a/recipes/pulseaudio/pulseaudio_0.9.22.bb +++ b/recipes/pulseaudio/pulseaudio_0.9.22.bb @@ -1,6 +1,6 @@ require pulseaudio.inc -PR = ${INC_PR}.1 +PR = "${INC_PR}.3" DEPENDS += "gdbm speex" diff --git a/recipes/pulseaudio/pulseaudio_git.bb b/recipes/pulseaudio/pulseaudio_git.bb index 28c581421a..a8b6c0bf48 100644 --- a/recipes/pulseaudio/pulseaudio_git.bb +++ b/recipes/pulseaudio/pulseaudio_git.bb @@ -2,7 +2,7 @@ require pulseaudio.inc SRCREV = "f834150aceccd753e3ac5bab9f7d64bed9993624" PV = "0.9.22+git" -PR = "${INC_PR}.0-r${SRCPV}" +PR = "${INC_PR}.2-r${SRCPV}" DEPENDS += "orc gdbm speex" From 87304d3141662b49dd78f5f1f0be555687f25331 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 9 Jun 2011 12:27:32 -0700 Subject: [PATCH 404/509] gcc: Package libstdc++ gdb python helpers into dev package People are seeing these errrors from ldconfig libstdc++.so.6.0.14-gdb.py is not an ELF file - it has the wrong magic bytes at the start. this file is moved into gdb's autoload directory if it exists there then gdb will find it when debugging and it wont be in the paths where ldconfig looks for libraries. Signed-off-by: Khem Raj Tested-by: Philip Balister Signed-off-by: Koen Kooi --- recipes/gcc/gcc-4.3.3.inc | 2 +- recipes/gcc/gcc-4.5.inc | 3 +-- recipes/gcc/gcc-package-cross.inc | 8 +++++++- recipes/gcc/gcc-package-target.inc | 4 ++++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc index 649fdfe24b..8b6ffe5c2a 100644 --- a/recipes/gcc/gcc-4.3.3.inc +++ b/recipes/gcc/gcc-4.3.3.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r23" +INC_PR = "r24" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \ diff --git a/recipes/gcc/gcc-4.5.inc b/recipes/gcc/gcc-4.5.inc index 0a43bc7ef4..dbd9693058 100644 --- a/recipes/gcc/gcc-4.5.inc +++ b/recipes/gcc/gcc-4.5.inc @@ -7,8 +7,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp libmpc libelf" NATIVEDEPS = "mpfr-native gmp-native libmpc-native" - -INC_PR = "r33" +INC_PR = "r37" SRCREV = "170443" PV = "4.5" diff --git a/recipes/gcc/gcc-package-cross.inc b/recipes/gcc/gcc-package-cross.inc index f9a7eebca0..153306905c 100644 --- a/recipes/gcc/gcc-package-cross.inc +++ b/recipes/gcc/gcc-package-cross.inc @@ -4,7 +4,7 @@ PACKAGE_STRIP = "no" SHLIBSDIR = "${STAGING_DIR_TARGET}/shlibs" -PACKAGES = "libgcc libssp libstdc++ libg2c libgfortran" +PACKAGES = "libgcc libssp libstdc++ libg2c libgfortran libstdc++-dev libgcc-dev" # Called from within gcc-cross, so libdir is set wrong FILES_libg2c = "${target_libdir}/libg2c.so.*" @@ -18,6 +18,7 @@ FILES_libgcc-dev = "${target_libdir}/libgcc_s.so" FILES_libstdc++ = "${target_libdir}/libstdc++.so.*" +FILES_libstdc++-dev = "${target_datadir}/gdb/auto-load/${libdir}/libstdc++.so.*-gdb.py*" do_install () { oe_runmake 'DESTDIR=${D}' install install -d ${D}${target_base_libdir} @@ -68,5 +69,10 @@ GROUP ( libgcc_s.so.1 libgcc.a )" > ${D}${target_libdir}/libgcc_s.so # We use libiberty from binutils or binutils-cross rm -f ${D}${libdir}/libiberty.a rm -f ${D}${target_libdir}/libiberty.a + if [ -f ${D}${target_libdir}/libstdc++.so.*-gdb.py ]; then + # move the gdb python helpers to gdb auto-load directory + install -d ${D}${target_datadir}/gdb/auto-load${target_libdir} + mv -f ${D}${target_libdir}/libstdc++.so.*-gdb.py* ${D}${target_datadir}/gdb/auto-load${target_libdir} + fi } diff --git a/recipes/gcc/gcc-package-target.inc b/recipes/gcc/gcc-package-target.inc index 438c314b6f..33567da2a8 100644 --- a/recipes/gcc/gcc-package-target.inc +++ b/recipes/gcc/gcc-package-target.inc @@ -82,6 +82,7 @@ FILES_libstdc++-dev = "\ ${libdir}/libstdc++.a \ ${libdir}/libsupc++.la \ ${libdir}/libsupc++.a \ + ${datadir}/gdb/auto-load${libdir}/libstdc++.so.*-gdb.py* \ " FILES_libgfortran-dev = "${libdir}/libgfortran.a \ @@ -168,4 +169,7 @@ GROUP ( libgcc_s.so.1 libgcc.a )" > ${D}${libdir}/libgcc_s.so # Remove precompiled c++ headers as they are really big rm -rf ${D}${includedir}/c++/${BINV}/${TARGET_SYS}/bits/*.gch + # move the gdb python helpers to gdb auto-load directory + install -d ${D}${datadir}/gdb/auto-load/${libdir} + mv ${D}${libdir}/libstdc++.so.*-gdb.py* ${D}${datadir}/gdb/auto-load${libdir} } From a53f0d127123065e6d39731fde7ac99ac5c48e10 Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Wed, 1 Jun 2011 08:38:10 +0200 Subject: [PATCH 405/509] iotop: add missing runtime dependency Fixes runtime error: "No module named locale To run an uninstalled copy of iotop, launch iotop.py in the top directory" Signed-off-by: Steffen Sledz --- recipes/iotop/iotop_0.2.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/iotop/iotop_0.2.1.bb b/recipes/iotop/iotop_0.2.1.bb index 12ccc77708..0d3e3872ec 100644 --- a/recipes/iotop/iotop_0.2.1.bb +++ b/recipes/iotop/iotop_0.2.1.bb @@ -1,8 +1,8 @@ HOMEPAGE = "http://guichaz.free.fr/iotop/" LICENSE = "GPL" -PR = "r3" +PR = "r4" -RDEPENDS_${PN} = "python-distutils python-curses python-setuptools python-textutils" +RDEPENDS_${PN} = "python-distutils python-curses python-setuptools python-textutils python-codecs" SRC_URI = "http://guichaz.free.fr/iotop/files/${PN}-${PV}.tar.bz2" From 13003cf432ecf56b49ba55ca68f57353ae6f5374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Sun, 13 Mar 2011 15:32:48 +0100 Subject: [PATCH 406/509] apr-util: add 1.3.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Acked-by: Khem Raj --- recipes/apr/apr-util_1.3.10.bb | 36 ++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 recipes/apr/apr-util_1.3.10.bb diff --git a/recipes/apr/apr-util_1.3.10.bb b/recipes/apr/apr-util_1.3.10.bb new file mode 100644 index 0000000000..ee32ddde41 --- /dev/null +++ b/recipes/apr/apr-util_1.3.10.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "Apache Portable Runtime (APR) companion library" +SECTION = "libs" +DEPENDS = "apr expat gdbm" +LICENSE = "Apache License, Version 2.0" + +PR = "r0" + +SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \ + file://configfix.patch \ + file://configure_fixes.patch" + +EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ + --with-dbm=gdbm \ + --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} \ + --without-sqlite2 \ + --without-sqlite3 \ + --without-pgsql \ + --with-expat=${STAGING_DIR_HOST}${layout_prefix}" + +SRC_URI[md5sum] = "82acd25cf3df8c72eba44eaee8b80c19" +SRC_URI[sha256sum] = "7c37ac40b2351bfc23000fb6b7b54a67e0872255df315c82eb60c821bcef4b23" + +inherit autotools lib_package binconfig + +OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" + +do_configure_prepend() { + cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk + echo "AC_PROG_LIBTOOL" >> ${S}/configure.in +} + +do_configure_append() { + sed -i -e s:apr_builders=/usr/share/build-1:apr_builders=${STAGING_DATADIR}/build-1:g ${S}/build/rules.mk + sed -i /^LIBTOOL/d ${S}/build/rules.mk + echo LIBTOOL="${HOST_SYS}-libtool --tag=CC" >> ${S}/build/rules.mk +} From ea732248d4832826d338e30802802ad67afb45ed Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Mon, 23 May 2011 16:01:17 +0200 Subject: [PATCH 407/509] apr-util: disable odbc support to avoid QA error The odbc checker part of the configure script seems to be buggy and may add host paths to compiler and linker options: --------->snip<-------- checking for odbc_config... /usr/bin/odbc_config adding "-I/usr/include" to CPPFLAGS adding "-L/usr/lib" to LDFLAGS setting LIBS to "-L/usr/lib -lodbc" --------->snip<-------- Signed-off-by: Steffen Sledz Acked-by: Paul Menzel --- recipes/apr/apr-util_1.3.10.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/apr/apr-util_1.3.10.bb b/recipes/apr/apr-util_1.3.10.bb index ee32ddde41..32b568ec0d 100644 --- a/recipes/apr/apr-util_1.3.10.bb +++ b/recipes/apr/apr-util_1.3.10.bb @@ -3,7 +3,7 @@ SECTION = "libs" DEPENDS = "apr expat gdbm" LICENSE = "Apache License, Version 2.0" -PR = "r0" +PR = "r1" SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \ file://configfix.patch \ @@ -15,6 +15,7 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-sqlite2 \ --without-sqlite3 \ --without-pgsql \ + --without-odbc \ --with-expat=${STAGING_DIR_HOST}${layout_prefix}" SRC_URI[md5sum] = "82acd25cf3df8c72eba44eaee8b80c19" From 028aee8255b532441c46a4250efb793c224a05ad Mon Sep 17 00:00:00 2001 From: Mario Schuknecht Date: Thu, 16 Jun 2011 12:07:29 +0000 Subject: [PATCH 408/509] linux-2.6.24: enable tun device support (hipox machine only) Signed-off-by: Mario Schuknecht Acked-by: Steffen Sledz --- recipes/linux/linux-2.6.24/hipox/defconfig | 6 ++---- recipes/linux/linux_2.6.24.bb | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig index a901397f00..3b89dd4b8a 100644 --- a/recipes/linux/linux-2.6.24/hipox/defconfig +++ b/recipes/linux/linux-2.6.24/hipox/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24.7 -# Tue May 31 16:06:17 2011 +# Thu Jun 16 14:04:00 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -50,8 +50,6 @@ CONFIG_TASK_IO_ACCOUNTING=y CONFIG_LOG_BUF_SHIFT=14 # CONFIG_CGROUPS is not set # CONFIG_FAIR_GROUP_SCHED is not set -# CONFIG_FAIR_USER_SCHED is not set -# CONFIG_FAIR_CGROUP_SCHED is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set CONFIG_BLK_DEV_INITRD=y @@ -721,7 +719,7 @@ CONFIG_NETDEVICES=y # CONFIG_BONDING is not set # CONFIG_MACVLAN is not set # CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set +CONFIG_TUN=y # CONFIG_VETH is not set # CONFIG_ARCNET is not set # CONFIG_NET_ETHERNET is not set diff --git a/recipes/linux/linux_2.6.24.bb b/recipes/linux/linux_2.6.24.bb index e9844bbeae..4dd51ce025 100644 --- a/recipes/linux/linux_2.6.24.bb +++ b/recipes/linux/linux_2.6.24.bb @@ -11,7 +11,7 @@ DEFAULT_PREFERENCE_hipox = "1" DEFAULT_PREFERENCE_cs-e9302 = "1" DEFAULT_PREFERENCE_smartq5 = "1" -PR = "r44" +PR = "r45" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;apply=yes;name=stablepatch \ From 4a15127f47f3844137cb1cf412fb43b6289aab75 Mon Sep 17 00:00:00 2001 From: Mario Schuknecht Date: Mon, 27 Jun 2011 09:41:50 +0000 Subject: [PATCH 409/509] linux-2.6.24: fix deadlock situation in gmac driver (hipox machine only) Signed-off-by: Mario Schuknecht Acked-by: Steffen Sledz --- .../hipox/hipox-gmac-deadlock.patch | 36 +++++++++++++++++++ recipes/linux/linux_2.6.24.bb | 5 +-- 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 recipes/linux/linux-2.6.24/hipox/hipox-gmac-deadlock.patch diff --git a/recipes/linux/linux-2.6.24/hipox/hipox-gmac-deadlock.patch b/recipes/linux/linux-2.6.24/hipox/hipox-gmac-deadlock.patch new file mode 100644 index 0000000000..a566c5f9b7 --- /dev/null +++ b/recipes/linux/linux-2.6.24/hipox/hipox-gmac-deadlock.patch @@ -0,0 +1,36 @@ +diff -Nurd linux-2.6.24.orig//arch/arm/mach-hipox/gmac-napi.c linux-2.6.24/arch/arm/mach-hipox/gmac-napi.c +--- linux-2.6.24.orig//arch/arm/mach-hipox/gmac-napi.c 2011-06-27 11:17:48.000000000 +0200 ++++ linux-2.6.24/arch/arm/mach-hipox/gmac-napi.c 2011-06-27 11:06:20.000000000 +0200 +@@ -551,6 +551,7 @@ + skb = dev_alloc_skb(priv->rx_buffer_size_ + NET_IP_ALIGN); + if (!skb) { + // Can't refill any more RX descriptor ring entries ++ printk("%s: refill_rx_ring() dev_alloc_skb failed\n", dev->name); + break; + } else { + // Despite what the comments in the original code from Synopsys +@@ -1476,14 +1477,18 @@ + } + + if (!continue_polling) { +- // No more received packets to process so return to interrupt mode +- netif_rx_complete(dev, napi); ++ if(priv->rx_gmac_desc_list_info.full_count) { ++ // No more received packets to process so return to interrupt mode ++ netif_rx_complete(dev, napi); + +- // Enable interrupts caused by received packets that may have been ++ // Enable interrupts caused by received packets that may have been + // disabled in the ISR before entering polled mode +- gmac_int_en_set(priv, (1UL << DMA_INT_ENABLE_RI_BIT) | +- (1UL << DMA_INT_ENABLE_RU_BIT) | +- (1UL << DMA_INT_ENABLE_OV_BIT)); ++ gmac_int_en_set(priv, (1UL << DMA_INT_ENABLE_RI_BIT) | ++ (1UL << DMA_INT_ENABLE_RU_BIT) | ++ (1UL << DMA_INT_ENABLE_OV_BIT)); ++ } else { ++ printk("%s: no input buffer, remain within poll mode\n", dev->name); ++ } + } + + return work_done; diff --git a/recipes/linux/linux_2.6.24.bb b/recipes/linux/linux_2.6.24.bb index 4dd51ce025..edd67a6e35 100644 --- a/recipes/linux/linux_2.6.24.bb +++ b/recipes/linux/linux_2.6.24.bb @@ -11,7 +11,7 @@ DEFAULT_PREFERENCE_hipox = "1" DEFAULT_PREFERENCE_cs-e9302 = "1" DEFAULT_PREFERENCE_smartq5 = "1" -PR = "r45" +PR = "r46" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;apply=yes;name=stablepatch \ @@ -109,7 +109,8 @@ SRC_URI_append_hipox = " \ file://hipox-phy.patch \ file://ox810-pci-read-config-fix.patch \ file://hipox-nand-timing.patch \ - file://ox810-pci-abort-handler.patch \ + file://ox810-pci-abort-handler.patch \ + file://hipox-gmac-deadlock.patch \ " EXTRA_OEMAKE_smartq5 = " OBJCOPY=${OBJCOPY}" From 2179a4e451dc82ab0bf827699a56ceb74c9e2156 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 28 Jul 2011 17:10:12 +0000 Subject: [PATCH 410/509] gcc-package-target: fix for gcc 4.3.x Signed-off-by: Koen Kooi Acked-by: Steffen Sledz Signed-off-by: Tom Rini --- recipes/gcc/gcc-package-target.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/gcc/gcc-package-target.inc b/recipes/gcc/gcc-package-target.inc index 33567da2a8..7d3f4aef6d 100644 --- a/recipes/gcc/gcc-package-target.inc +++ b/recipes/gcc/gcc-package-target.inc @@ -171,5 +171,5 @@ GROUP ( libgcc_s.so.1 libgcc.a )" > ${D}${libdir}/libgcc_s.so rm -rf ${D}${includedir}/c++/${BINV}/${TARGET_SYS}/bits/*.gch # move the gdb python helpers to gdb auto-load directory install -d ${D}${datadir}/gdb/auto-load/${libdir} - mv ${D}${libdir}/libstdc++.so.*-gdb.py* ${D}${datadir}/gdb/auto-load${libdir} + mv ${D}${libdir}/libstdc++.so.*-gdb.py* ${D}${datadir}/gdb/auto-load${libdir} || true } From facc8dd2c259e91e85ae1a5ea09319f7ca94dad5 Mon Sep 17 00:00:00 2001 From: Ben Gardiner Date: Fri, 24 Jun 2011 02:56:46 +0000 Subject: [PATCH 411/509] raptor: add libxml2 DEPENDS The configure script of raptor allows either expat or libxml; the default is libxml. Add libxml2 to DEPENDS of raptor to fix broken raptor build in clean-tree. Signed-off-by: Ben Gardiner Signed-off-by: Tom Rini --- recipes/raptor/raptor_1.4.21.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/raptor/raptor_1.4.21.bb b/recipes/raptor/raptor_1.4.21.bb index edceff9379..e14d75b19e 100644 --- a/recipes/raptor/raptor_1.4.21.bb +++ b/recipes/raptor/raptor_1.4.21.bb @@ -4,6 +4,7 @@ HOMEPAGE = "http://librdf.org/raptor/" LICENSE = "LGPL 2.1/GPL 2/Apache 2.0" PR = "r0" SRC_URI = "http://download.librdf.org/source/raptor-${PV}.tar.gz" +DEPENDS = "libxml2" inherit autotools pkgconfig From 092fa311806460321f3f1a019d003c83686cff49 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 4 Mar 2011 20:30:33 -0800 Subject: [PATCH 412/509] net-snmp: Fix build error ./.libs/libnetsnmpmibs.so: undefined reference to `pthread_create' Do not override do_configure and pass endianness information in EXTRA_OECONF, also move common settings from EXTRA_OECONF in recipes to inc file. Let build go in parallel for svn recipe. It works ! Signed-off-by: Khem Raj --- recipes/net-snmp/net-snmp.inc | 8 ++------ recipes/net-snmp/net-snmp_5.1.2.bb | 3 +-- recipes/net-snmp/net-snmp_5.4.1.bb | 5 ++--- recipes/net-snmp/net-snmp_5.4.2.1.bb | 5 ++--- recipes/net-snmp/net-snmp_svn.bb | 16 ++-------------- 5 files changed, 9 insertions(+), 28 deletions(-) diff --git a/recipes/net-snmp/net-snmp.inc b/recipes/net-snmp/net-snmp.inc index 92df575378..1b604f5860 100644 --- a/recipes/net-snmp/net-snmp.inc +++ b/recipes/net-snmp/net-snmp.inc @@ -12,12 +12,8 @@ inherit autotools update-rc.d siteinfo TARGET_CC_ARCH += "${LDFLAGS}" -do_configure() { - # Additional flag based on target endiness (see siteinfo.bbclass) - ENDIANESS="${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)}" - oenote Determined endianess as: $ENDIANESS - oe_runconf $ENDIANESS -} +EXTRA_OECONF = "--enable-shared --disable-manuals --with-defaults \ +${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)}" do_install_append() { install -d ${D}${sysconfdir}/snmp diff --git a/recipes/net-snmp/net-snmp_5.1.2.bb b/recipes/net-snmp/net-snmp_5.1.2.bb index 45694c399a..2b7ec4f3e8 100644 --- a/recipes/net-snmp/net-snmp_5.1.2.bb +++ b/recipes/net-snmp/net-snmp_5.1.2.bb @@ -1,5 +1,5 @@ require net-snmp.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://uclibc-fix.patch \ @@ -10,7 +10,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ inherit autotools PARALLEL_MAKE = "" -EXTRA_OECONF = "--enable-shared --disable-manuals --with-defaults" EXTRA_OEMAKE = "INSTALL_PREFIX=${D}" CONFFILES_${PN}_nylon = "${sysconfdir}/snmp/snmpd.conf ${sysconfdir}/snmp/snmptrapd.conf" diff --git a/recipes/net-snmp/net-snmp_5.4.1.bb b/recipes/net-snmp/net-snmp_5.4.1.bb index bd9782746b..ac72849a50 100644 --- a/recipes/net-snmp/net-snmp_5.4.1.bb +++ b/recipes/net-snmp/net-snmp_5.4.1.bb @@ -1,5 +1,5 @@ require net-snmp.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://configure-tail.patch \ @@ -7,8 +7,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://snmpd.conf \ file://snmptrapd.conf" -EXTRA_OECONF = "--enable-shared --disable-manuals --with-defaults \ - --disable-embedded-perl --with-perl-modules=no" +EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no" EXTRA_OEMAKE = "INSTALL_PREFIX=${D}" do_configure_prepend() { diff --git a/recipes/net-snmp/net-snmp_5.4.2.1.bb b/recipes/net-snmp/net-snmp_5.4.2.1.bb index 1f80cbcef4..b043d073c1 100644 --- a/recipes/net-snmp/net-snmp_5.4.2.1.bb +++ b/recipes/net-snmp/net-snmp_5.4.2.1.bb @@ -1,5 +1,5 @@ require net-snmp.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://configure-tail.patch \ @@ -8,8 +8,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://snmpd.conf \ file://snmptrapd.conf" -EXTRA_OECONF = "--enable-shared --disable-manuals --with-defaults \ - --disable-embedded-perl --with-perl-modules=no" +EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no" EXTRA_OEMAKE = "INSTALL_PREFIX=${D}" do_configure_prepend() { diff --git a/recipes/net-snmp/net-snmp_svn.bb b/recipes/net-snmp/net-snmp_svn.bb index 689a41652e..2a75722841 100644 --- a/recipes/net-snmp/net-snmp_svn.bb +++ b/recipes/net-snmp/net-snmp_svn.bb @@ -1,6 +1,6 @@ require net-snmp.inc DEPENDS += "libtool libtool-native libtool-cross" -SRCREV = "17367" +SRCREV = "20069" PR = "${INC_PR}.0" S = "${WORKDIR}/net-snmp" @@ -10,19 +10,7 @@ SRC_URI = "svn://net-snmp.svn.sourceforge.net/svnroot/net-snmp/trunk;module=net- file://snmpd.conf \ file://snmptrapd.conf" -EXTRA_OECONF = "--enable-shared --disable-manuals --with-defaults \ - --disable-embedded-perl --with-perl-modules=no GREP=/bin/grep SED=/bin/sed" +EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no GREP=/bin/grep SED=/bin/sed" EXTRA_OEMAKE = "INSTALL_PREFIX=${D}" -PARALLEL_MAKE = "" CCACHE = "" - -do_configure_prepend() { - gnu-configize -f - # We better change sources and re-autoconf here, but - # required autoconf is too new for us. - sed -e '/echo.*\".*\\\\.*\"/s/echo/echo -e/g' \ - -e 's/tail -1/tail -n 1/g' \ - -i configure -} - From ea09d5da9422765eaccd0e23ead28a7e66c28227 Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Fri, 11 Mar 2011 11:59:34 +0100 Subject: [PATCH 413/509] net-snmp: disable libnl use Fixes compile error | ./.libs/libnetsnmpmibs.so: undefined reference to `nl_handle_destroy' | ./.libs/libnetsnmpmibs.so: undefined reference to `nl_handle_alloc' which occurred sometimes depending on build order (not in clean package only builds). Signed-off-by: Steffen Sledz Acked-by: Khem Raj --- recipes/net-snmp/net-snmp_svn.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/net-snmp/net-snmp_svn.bb b/recipes/net-snmp/net-snmp_svn.bb index 2a75722841..c53c91f3da 100644 --- a/recipes/net-snmp/net-snmp_svn.bb +++ b/recipes/net-snmp/net-snmp_svn.bb @@ -1,7 +1,7 @@ require net-snmp.inc DEPENDS += "libtool libtool-native libtool-cross" SRCREV = "20069" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" S = "${WORKDIR}/net-snmp" @@ -10,7 +10,7 @@ SRC_URI = "svn://net-snmp.svn.sourceforge.net/svnroot/net-snmp/trunk;module=net- file://snmpd.conf \ file://snmptrapd.conf" -EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no GREP=/bin/grep SED=/bin/sed" +EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no --without-nl GREP=/bin/grep SED=/bin/sed" EXTRA_OEMAKE = "INSTALL_PREFIX=${D}" CCACHE = "" From 7cbc3725ad6daaba8d99c72cb9b641913174dea3 Mon Sep 17 00:00:00 2001 From: Joel A Fernandes Date: Tue, 26 Jul 2011 15:25:03 +0000 Subject: [PATCH 414/509] linux-omap-psp: Fix MMC timeout errors This fixes MMC errors due to timeouts on certain SD Cards following suggestions to set dto to 14 by Jason Kridner and Steven Kipisz Details of the issue: http://talk.maemo.org/showthread.php?p=1000707#post1000707 This fix proposed by Sukumar Ghoral of TI. Signed-off-by: Joel A Fernandes Signed-off-by: Koen Kooi Signed-off-by: Koen Kooi --- ...just-dto-to-eliminate-timeout-errors.patch | 41 ++++++++++++------- recipes/linux/linux-omap-psp_2.6.32.bb | 2 +- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/recipes/linux/linux-omap-psp-2.6.32/0047-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch b/recipes/linux/linux-omap-psp-2.6.32/0047-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch index 4867d3f761..8cd314c6fb 100644 --- a/recipes/linux/linux-omap-psp-2.6.32/0047-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch +++ b/recipes/linux/linux-omap-psp-2.6.32/0047-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch @@ -1,22 +1,33 @@ -From 26a79f408bd41ad7b4a47f2683909d3fc1575eab Mon Sep 17 00:00:00 2001 +From bd0b2f97c48aa6aac0c6a494f1c6ba5af5de486b Mon Sep 17 00:00:00 2001 From: Steve Sakoman -Date: Wed, 12 Jan 2011 05:54:55 -0800 -Subject: [PATCH] omap: mmc: Adjust dto to eliminate timeout errors +Date: Mon, 18 Jul 2011 23:13:41 -0500 +Subject: [PATCH] omap_hsmmc: Set dto to max value of 14 to avoid SD Card timeouts -A number of SD card types were experiencing timeout errors. This -could also lead to data corruption in some cases. +This fixes MMC errors due to timeouts on certain SD Cards following suggestions +to set dto to 14 by Jason Kridner and Steven Kipisz -This fix proposed by Sukumar Ghoral of TI. +Details of the issue: +http://talk.maemo.org/showthread.php?p=1000707#post1000707 + +This fix was originally proposed by Sukumar Ghoral of TI. --- + drivers/mmc/host/omap_hsmmc.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c -index 9646a75..ef458d6 100644 +index 9646a75..7443647 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c -@@ -1032,6 +1032,7 @@ static void set_data_timeout(struct omap_hsmmc_host *host, - cycle_ns = 1000000000 / (clk_get_rate(host->fclk) / clkd); - timeout = timeout_ns / cycle_ns; - timeout += timeout_clks; -+ timeout *= 2; - if (timeout) { - while ((timeout & 0x80000000) == 0) { - dto += 1; +@@ -1049,6 +1049,9 @@ static void set_data_timeout(struct omap_hsmmc_host *host, + dto = 14; + } + ++ /* Set dto to max value of 14 to avoid SD Card timeouts */ ++ dto = 14; ++ + reg &= ~DTO_MASK; + reg |= dto << DTO_SHIFT; + OMAP_HSMMC_WRITE(host->base, SYSCTL, reg); +-- +1.7.0.4 + diff --git a/recipes/linux/linux-omap-psp_2.6.32.bb b/recipes/linux/linux-omap-psp_2.6.32.bb index 7a0797ae7b..06904a9fe3 100644 --- a/recipes/linux/linux-omap-psp_2.6.32.bb +++ b/recipes/linux/linux-omap-psp_2.6.32.bb @@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "am3517-crane|beagleboard|omap3evm|am3517-evm|dm37x-evm|am3 SRCREV = "5fc29e7b2a76a64a739f857858ef0b98294aa155" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -MACHINE_KERNEL_PR_append = "f+gitr${SRCREV}" +MACHINE_KERNEL_PR_append = "g+gitr${SRCREV}" SRC_URI = "git://arago-project.org/git/projects/linux-omap3.git;protocol=http;branch=master \ file://0001-Added-Crane-Board-support.patch \ From 47652a497c42729e0b46b84c24329bf35d5294eb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Aug 2011 11:56:48 +0200 Subject: [PATCH 415/509] gtk-icon-cache bbclass: only add runtime dependencies on hicolor-icon-theme when installing icons Also import a fix from OE-core for setting the loader dir. Tested with gnome-icon-theme and libsoup recipes on angstrom. Signed-off-by: Koen Kooi Acked-by: Steffen Sledz --- classes/gtk-icon-cache.bbclass | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass index 2449e954ce..d9b5d1bdd6 100644 --- a/classes/gtk-icon-cache.bbclass +++ b/classes/gtk-icon-cache.bbclass @@ -1,6 +1,4 @@ FILES_${PN} += "${datadir}/icons/hicolor" -# Only add runtime dependency on hicolor-icon-theme for target recipes -RDEPENDS_${PN} += "${@['', 'hicolor-icon-theme']['${PN}' == '${BPN}']}" # This could run on the host as icon cache files are architecture independent, # but there is no gtk-update-icon-cache built natively. @@ -10,7 +8,7 @@ if [ "x$D" != "x" ]; then fi # Update the pixbuf loaders in case they haven't been registered yet -gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders +GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache for icondir in /usr/share/icons/* ; do if [ -d $icondir ] ; then @@ -35,7 +33,12 @@ python populate_packages_append () { icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, bb.data.getVar('datadir', d, 1)) if not os.path.exists(icon_dir): continue - + + bb.note("adding hicolor-icon-theme dependency to %s" % pkg) + rdepends = bb.data.getVar('RDEPENDS', d, 1) + rdepends += "hicolor-icon-theme" + bb.data.setVar('RDEPENDS', rdepends, d) + bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg) postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1) From 0fb7457783624ae4e6697534d8e185993e1c6fae Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 7 Mar 2011 10:34:09 -0700 Subject: [PATCH 416/509] mtd-utils-native.inc: Drop lzo-native Which lzo is needed is handled by the recipe itself. Signed-off-by: Tom Rini (cherry picked from commit 66c7b423bbb83e66c610ececab08a2476470e674) Tested-by: Ben Gardiner --- recipes/mtd/mtd-utils-native.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/mtd/mtd-utils-native.inc b/recipes/mtd/mtd-utils-native.inc index aaef4ac666..b9dcc5a0bb 100644 --- a/recipes/mtd/mtd-utils-native.inc +++ b/recipes/mtd/mtd-utils-native.inc @@ -1,5 +1,5 @@ inherit native -DEPENDS = "zlib-native lzo-native" +DEPENDS = "zlib-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/mtd-utils" NATIVE_INSTALL_WORKS = "1" From 765baea1e975c95d92210001ff03a60c45f43236 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 17 Apr 2011 02:15:43 +0200 Subject: [PATCH 417/509] mtd-utils: upgrade to latest 1.4.4 release (bugfix) * whole 1.4.X serie was plagued by mtd alignment bug * http://lists.infradead.org/pipermail/linux-mtd/2011-April/034599.html * (note that now flash_eraseall is just a script) * * utilities are now installed in $sbindir like upstream/debian * change GPLv2 to GPLv2+ (like other distros and oe-core) * switch to BBCLASSEXTEND and customize do install (from oe-core) * remove ARM_INSTRUCTION_SET = "arm" (built fine for armv5te) * keep the split for mkfs.jffs2 and mkfs.ubifs Signed-off-by: Andrea Adami (cherry picked from commit f8e1b7793ff5b02fd27ce886b34a57c6c2358239) Tested-by: Ben Gardiner --- recipes/mtd/mtd-utils_1.4.4.bb | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 recipes/mtd/mtd-utils_1.4.4.bb diff --git a/recipes/mtd/mtd-utils_1.4.4.bb b/recipes/mtd/mtd-utils_1.4.4.bb new file mode 100644 index 0000000000..19adeff5d5 --- /dev/null +++ b/recipes/mtd/mtd-utils_1.4.4.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Tools for managing memory technology devices." +SECTION = "base" +DEPENDS = "zlib util-linux-ng lzo2" +#DEPENDS = "zlib lzo e2fsprogs util-linux" +HOMEPAGE = "http://www.linux-mtd.infradead.org/" +LICENSE = "GPLv2+" +PR = "r0" + +TAG = "v${PV}" + +SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG} \ + file://add-exclusion-to-mkfs-jffs2-git-2.patch \ + " + +S = "${WORKDIR}/git/" + +EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'BUILDDIR=${S}'" + +do_install () { + oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir} + install -d ${D}${includedir}/mtd/ + for f in ${S}/include/mtd/*.h; do + install -m 0644 $f ${D}${includedir}/mtd/ + done +} + +PACKAGES =+ "mkfs-jffs2 mkfs-ubifs" +FILES_mkfs-jffs2 = "${sbindir}/mkfs.jffs2" +FILES_mkfs-ubifs = "${sbindir}/mkfs.ubifs" + +PARALLEL_MAKE = "" + +BBCLASSEXTEND = "native" +NATIVE_INSTALL_WORKS = "1" From 8797b188f45cf6e9deaf41f83ffc0d39d2277531 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 17 Apr 2011 02:42:33 +0200 Subject: [PATCH 418/509] mtd-utils: remove broken 1.4.1 version * whole 1.4.X serie was plagued by mtd alignment bug * http://lists.infradead.org/pipermail/linux-mtd/2011-April/034599.html Signed-off-by: Andrea Adami (cherry picked from commit 0ecbd433895b1559e0c5898e280e6fa7ccdc4c3b) Tested-by: Ben Gardiner --- .../mtd-utils-1.4.1/fix_heap_corruption.patch | 95 ------------------- recipes/mtd/mtd-utils_1.4.1.bb | 18 ---- 2 files changed, 113 deletions(-) delete mode 100644 recipes/mtd/mtd-utils-1.4.1/fix_heap_corruption.patch delete mode 100644 recipes/mtd/mtd-utils_1.4.1.bb diff --git a/recipes/mtd/mtd-utils-1.4.1/fix_heap_corruption.patch b/recipes/mtd/mtd-utils-1.4.1/fix_heap_corruption.patch deleted file mode 100644 index 5ce3a53fc7..0000000000 --- a/recipes/mtd/mtd-utils-1.4.1/fix_heap_corruption.patch +++ /dev/null @@ -1,95 +0,0 @@ -From d8f0ae2f26898f652ad3af4536b5d0e4db37714f Mon Sep 17 00:00:00 2001 -From: Kevin Cernekee -Date: Wed, 22 Sep 2010 16:01:59 -0700 -Subject: [PATCH] mkfs.ubifs: Fix heap corruption on LEB overrun - -If max_leb_cnt (-c option) is set too low, set_lprops() will corrupt -the heap and may result in a scary looking crash: - -$ bin/mkfs.ubifs -U -r romfs -o ubifs.img -m 512 -e 15360 -c 39 -Error: max_leb_cnt too low (241 needed) -*** glibc detected *** bin/mkfs.ubifs: double free or corruption (!prev): 0x088fe070 *** -======= Backtrace: ========= -/lib32/libc.so.6(+0x6c231)[0xf75fb231] -/lib32/libc.so.6(+0x6dab8)[0xf75fcab8] -/lib32/libc.so.6(cfree+0x6d)[0xf75ffb9d] -bin/mkfs.ubifs[0x804e801] -bin/mkfs.ubifs[0x804e94b] -bin/mkfs.ubifs[0x804e99d] -/lib32/libc.so.6(__libc_start_main+0xe6)[0xf75a5bd6] -bin/mkfs.ubifs(__fxstat64+0x55)[0x80491e1] -======= Memory map: ======== -08048000-0805d000 r-xp 00000000 08:08 10012045 /work/bin/mkfs.ubifs -0805d000-0805e000 rwxp 00015000 08:08 10012045 /work/bin/mkfs.ubifs -088fe000-08945000 rwxp 00000000 00:00 0 [heap] -f73e1000-f73fe000 r-xp 00000000 08:05 2228842 /usr/lib32/libgcc_s.so.1 -f73fe000-f73ff000 r-xp 0001c000 08:05 2228842 /usr/lib32/libgcc_s.so.1 -f73ff000-f7400000 rwxp 0001d000 08:05 2228842 /usr/lib32/libgcc_s.so.1 -f7400000-f7421000 rwxp 00000000 00:00 0 -f7421000-f7500000 ---p 00000000 00:00 0 -f751c000-f758f000 rwxp 00000000 00:00 0 -f758f000-f76e2000 r-xp 00000000 08:05 426288 /lib32/libc-2.11.1.so -f76e2000-f76e3000 ---p 00153000 08:05 426288 /lib32/libc-2.11.1.so -f76e3000-f76e5000 r-xp 00153000 08:05 426288 /lib32/libc-2.11.1.so -f76e5000-f76e6000 rwxp 00155000 08:05 426288 /lib32/libc-2.11.1.so -f76e6000-f76e9000 rwxp 00000000 00:00 0 -f76e9000-f770d000 r-xp 00000000 08:05 426296 /lib32/libm-2.11.1.so -f770d000-f770e000 r-xp 00023000 08:05 426296 /lib32/libm-2.11.1.so -f770e000-f770f000 rwxp 00024000 08:05 426296 /lib32/libm-2.11.1.so -f772a000-f772c000 rwxp 00000000 00:00 0 -f772c000-f772d000 r-xp 00000000 00:00 0 [vdso] -f772d000-f7749000 r-xp 00000000 08:05 6062081 /lib32/ld-2.11.1.so -f7749000-f774a000 r-xp 0001b000 08:05 6062081 /lib32/ld-2.11.1.so -f774a000-f774b000 rwxp 0001c000 08:05 6062081 /lib32/ld-2.11.1.so -ffb58000-ffb6d000 rwxp 00000000 00:00 0 [stack] -Aborted - -New code aborts cleanly, and still calculates the number of LEBs -required: - -$ bin/mkfs.ubifs -U -r romfs -o tmp/ubifs.img -m 512 -e 15360 -c 39 -Error: max_leb_cnt too low (241 needed) -$ echo $? -255 -$ bin/mkfs.ubifs -U -r romfs -o tmp/ubifs.img -m 512 -e 15360 -c 240 -Error: max_leb_cnt too low (241 needed) -$ bin/mkfs.ubifs -U -r romfs -o tmp/ubifs.img -m 512 -e 15360 -c 241 -$ - -Signed-off-by: Kevin Cernekee -Signed-off-by: Artem Bityutskiy ---- - mkfs.ubifs/mkfs.ubifs.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/mkfs.ubifs/mkfs.ubifs.c b/mkfs.ubifs/mkfs.ubifs.c -index eeb5e42..ec38f0e 100644 ---- a/mkfs.ubifs/mkfs.ubifs.c -+++ b/mkfs.ubifs/mkfs.ubifs.c -@@ -929,9 +929,11 @@ static void set_lprops(int lnum, int offs, int flags) - dirty = c->leb_size - free - ALIGN(offs, 8); - dbg_msg(3, "LEB %d free %d dirty %d flags %d", lnum, free, dirty, - flags); -- c->lpt[i].free = free; -- c->lpt[i].dirty = dirty; -- c->lpt[i].flags = flags; -+ if (i < c->main_lebs) { -+ c->lpt[i].free = free; -+ c->lpt[i].dirty = dirty; -+ c->lpt[i].flags = flags; -+ } - c->lst.total_free += free; - c->lst.total_dirty += dirty; - if (flags & LPROPS_INDEX) -@@ -1943,8 +1945,6 @@ static int finalize_leb_cnt(void) - { - c->leb_cnt = head_lnum; - if (c->leb_cnt > c->max_leb_cnt) -- /* TODO: in this case it segfaults because buffer overruns - we -- * somewhere allocate smaller buffers - fix */ - return err_msg("max_leb_cnt too low (%d needed)", c->leb_cnt); - c->main_lebs = c->leb_cnt - c->main_first; - if (verbose) { --- -1.7.2.3 - diff --git a/recipes/mtd/mtd-utils_1.4.1.bb b/recipes/mtd/mtd-utils_1.4.1.bb deleted file mode 100644 index 948fce138e..0000000000 --- a/recipes/mtd/mtd-utils_1.4.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -require mtd-utils.inc - -DEPENDS += "util-linux-ng lzo2" - -PARALLEL_MAKE = "" -ARM_INSTRUCTION_SET = "arm" - -# This is the default package, thus we lock to a specific git version so -# upstream changes will not break builds. - -TAG = "v${PV}" - -SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG} \ - file://add-exclusion-to-mkfs-jffs2-git-2.patch \ - file://fix_heap_corruption.patch \ - " - -S = "${WORKDIR}/git/" From a8bcf3704b2f709c005b2ef205e056a72dccf33d Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 17 Apr 2011 02:59:01 +0200 Subject: [PATCH 419/509] mtd-utils: archive obsolete old versions Signed-off-by: Andrea Adami (cherry picked from commit 09c610dc6de5f94a4ce8a572045f7dcd8f18e710) Tested-by: Ben Gardiner --- recipes/{ => obsolete}/mtd/mtd-utils-native.inc | 0 recipes/{ => obsolete}/mtd/mtd-utils-native_1.1.0.bb | 0 recipes/{ => obsolete}/mtd/mtd-utils-native_1.2.0+git.bb | 0 recipes/{ => obsolete}/mtd/mtd-utils-native_1.3.1.bb | 0 recipes/{ => obsolete}/mtd/mtd-utils-native_1.4.1.bb | 0 recipes/{ => obsolete}/mtd/mtd-utils-tests_1.2.0+git.bb | 0 recipes/{ => obsolete}/mtd/mtd-utils.inc | 0 .../mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch | 0 recipes/{ => obsolete}/mtd/mtd-utils/fix-ignoreerrors-git.patch | 0 recipes/{ => obsolete}/mtd/mtd-utils/lzo_1x-git.patch | 0 recipes/{ => obsolete}/mtd/mtd-utils/lzo_1x.patch | 0 recipes/{ => obsolete}/mtd/mtd-utils_1.1.0.bb | 0 recipes/{ => obsolete}/mtd/mtd-utils_1.2.0+git.bb | 0 recipes/{ => obsolete}/mtd/mtd-utils_1.3.1.bb | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename recipes/{ => obsolete}/mtd/mtd-utils-native.inc (100%) rename recipes/{ => obsolete}/mtd/mtd-utils-native_1.1.0.bb (100%) rename recipes/{ => obsolete}/mtd/mtd-utils-native_1.2.0+git.bb (100%) rename recipes/{ => obsolete}/mtd/mtd-utils-native_1.3.1.bb (100%) rename recipes/{ => obsolete}/mtd/mtd-utils-native_1.4.1.bb (100%) rename recipes/{ => obsolete}/mtd/mtd-utils-tests_1.2.0+git.bb (100%) rename recipes/{ => obsolete}/mtd/mtd-utils.inc (100%) rename recipes/{ => obsolete}/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch (100%) rename recipes/{ => obsolete}/mtd/mtd-utils/fix-ignoreerrors-git.patch (100%) rename recipes/{ => obsolete}/mtd/mtd-utils/lzo_1x-git.patch (100%) rename recipes/{ => obsolete}/mtd/mtd-utils/lzo_1x.patch (100%) rename recipes/{ => obsolete}/mtd/mtd-utils_1.1.0.bb (100%) rename recipes/{ => obsolete}/mtd/mtd-utils_1.2.0+git.bb (100%) rename recipes/{ => obsolete}/mtd/mtd-utils_1.3.1.bb (100%) diff --git a/recipes/mtd/mtd-utils-native.inc b/recipes/obsolete/mtd/mtd-utils-native.inc similarity index 100% rename from recipes/mtd/mtd-utils-native.inc rename to recipes/obsolete/mtd/mtd-utils-native.inc diff --git a/recipes/mtd/mtd-utils-native_1.1.0.bb b/recipes/obsolete/mtd/mtd-utils-native_1.1.0.bb similarity index 100% rename from recipes/mtd/mtd-utils-native_1.1.0.bb rename to recipes/obsolete/mtd/mtd-utils-native_1.1.0.bb diff --git a/recipes/mtd/mtd-utils-native_1.2.0+git.bb b/recipes/obsolete/mtd/mtd-utils-native_1.2.0+git.bb similarity index 100% rename from recipes/mtd/mtd-utils-native_1.2.0+git.bb rename to recipes/obsolete/mtd/mtd-utils-native_1.2.0+git.bb diff --git a/recipes/mtd/mtd-utils-native_1.3.1.bb b/recipes/obsolete/mtd/mtd-utils-native_1.3.1.bb similarity index 100% rename from recipes/mtd/mtd-utils-native_1.3.1.bb rename to recipes/obsolete/mtd/mtd-utils-native_1.3.1.bb diff --git a/recipes/mtd/mtd-utils-native_1.4.1.bb b/recipes/obsolete/mtd/mtd-utils-native_1.4.1.bb similarity index 100% rename from recipes/mtd/mtd-utils-native_1.4.1.bb rename to recipes/obsolete/mtd/mtd-utils-native_1.4.1.bb diff --git a/recipes/mtd/mtd-utils-tests_1.2.0+git.bb b/recipes/obsolete/mtd/mtd-utils-tests_1.2.0+git.bb similarity index 100% rename from recipes/mtd/mtd-utils-tests_1.2.0+git.bb rename to recipes/obsolete/mtd/mtd-utils-tests_1.2.0+git.bb diff --git a/recipes/mtd/mtd-utils.inc b/recipes/obsolete/mtd/mtd-utils.inc similarity index 100% rename from recipes/mtd/mtd-utils.inc rename to recipes/obsolete/mtd/mtd-utils.inc diff --git a/recipes/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch b/recipes/obsolete/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch similarity index 100% rename from recipes/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch rename to recipes/obsolete/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch diff --git a/recipes/mtd/mtd-utils/fix-ignoreerrors-git.patch b/recipes/obsolete/mtd/mtd-utils/fix-ignoreerrors-git.patch similarity index 100% rename from recipes/mtd/mtd-utils/fix-ignoreerrors-git.patch rename to recipes/obsolete/mtd/mtd-utils/fix-ignoreerrors-git.patch diff --git a/recipes/mtd/mtd-utils/lzo_1x-git.patch b/recipes/obsolete/mtd/mtd-utils/lzo_1x-git.patch similarity index 100% rename from recipes/mtd/mtd-utils/lzo_1x-git.patch rename to recipes/obsolete/mtd/mtd-utils/lzo_1x-git.patch diff --git a/recipes/mtd/mtd-utils/lzo_1x.patch b/recipes/obsolete/mtd/mtd-utils/lzo_1x.patch similarity index 100% rename from recipes/mtd/mtd-utils/lzo_1x.patch rename to recipes/obsolete/mtd/mtd-utils/lzo_1x.patch diff --git a/recipes/mtd/mtd-utils_1.1.0.bb b/recipes/obsolete/mtd/mtd-utils_1.1.0.bb similarity index 100% rename from recipes/mtd/mtd-utils_1.1.0.bb rename to recipes/obsolete/mtd/mtd-utils_1.1.0.bb diff --git a/recipes/mtd/mtd-utils_1.2.0+git.bb b/recipes/obsolete/mtd/mtd-utils_1.2.0+git.bb similarity index 100% rename from recipes/mtd/mtd-utils_1.2.0+git.bb rename to recipes/obsolete/mtd/mtd-utils_1.2.0+git.bb diff --git a/recipes/mtd/mtd-utils_1.3.1.bb b/recipes/obsolete/mtd/mtd-utils_1.3.1.bb similarity index 100% rename from recipes/mtd/mtd-utils_1.3.1.bb rename to recipes/obsolete/mtd/mtd-utils_1.3.1.bb From 9f3b7fc95150ac50868b58f3de86b3baf4b6ee49 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sat, 23 Apr 2011 23:57:36 +0200 Subject: [PATCH 420/509] live555: catch up with upstream habits of upgrading and removing tarballs Signed-off-by: Andrea Adami --- recipes/live555/live555_20110110.bb | 7 ------- recipes/live555/live555_20110314.bb | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 recipes/live555/live555_20110110.bb create mode 100644 recipes/live555/live555_20110314.bb diff --git a/recipes/live555/live555_20110110.bb b/recipes/live555/live555_20110110.bb deleted file mode 100644 index a034a2c685..0000000000 --- a/recipes/live555/live555_20110110.bb +++ /dev/null @@ -1,7 +0,0 @@ -require live555.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "978cd8443735d47b53ee624a985a047e" -SRC_URI[sha256sum] = "39f23d4c140f9a0bfd6fa11f38c75ae8c3b4fab1930ca1acb8ad66e70947dbc1" - diff --git a/recipes/live555/live555_20110314.bb b/recipes/live555/live555_20110314.bb new file mode 100644 index 0000000000..44664d2231 --- /dev/null +++ b/recipes/live555/live555_20110314.bb @@ -0,0 +1,8 @@ +require live555.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "ff65b2c598e970b4b6c8219a1811de00" +SRC_URI[sha256sum] = "c6ce050a7f9f69901e6f7f81a6745c82d9419e3904a753b2d5db1139caaf6738" + + From 6f446e76fed63a502a88cbf3998d67b60255de39 Mon Sep 17 00:00:00 2001 From: Stefan Herbrechtsmeier Date: Tue, 30 Aug 2011 22:29:10 +0000 Subject: [PATCH 421/509] gcc: Remove package libstdc++-dev and libgcc-dev from gcc-cross Remove package libstdc++-dev and libgcc-dev from gcc-cross as they already provided by gcc. Commit 8c42351519ece9ed60659a103e624d2e154b3641 add dev packages (libstdc++-dev libgcc-dev) to gcc-cross (gcc-package-cross.inc) which are already part of gcc. The libgcc-dev package both include the libgcc_s.so file which triggers a 'file is already provided by package' error on incremental builds. The libstdc++-dev package have Acked-by: Steffen Sledz different content and is empty on some archs (armv5te, armv7e). The empty package triggers a 'Cannot satisfy the following dependencies for task-sdk-bare' error. If an empty libstdc++-dev package is generated it triggers a '..../usr/include/c++ not exist' error as this is part of the package from gcc but not gcc-cross. Signed-off-by: Stefan Herbrechtsmeier Acked-by: Steffen Sledz --- recipes/gcc/gcc-4.3.3.inc | 2 +- recipes/gcc/gcc-4.5.inc | 2 +- recipes/gcc/gcc-package-cross.inc | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc index 8b6ffe5c2a..4fa3863df3 100644 --- a/recipes/gcc/gcc-4.3.3.inc +++ b/recipes/gcc/gcc-4.3.3.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r24" +INC_PR = "r25" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \ diff --git a/recipes/gcc/gcc-4.5.inc b/recipes/gcc/gcc-4.5.inc index dbd9693058..66c03b20e1 100644 --- a/recipes/gcc/gcc-4.5.inc +++ b/recipes/gcc/gcc-4.5.inc @@ -7,7 +7,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp libmpc libelf" NATIVEDEPS = "mpfr-native gmp-native libmpc-native" -INC_PR = "r37" +INC_PR = "r38" SRCREV = "170443" PV = "4.5" diff --git a/recipes/gcc/gcc-package-cross.inc b/recipes/gcc/gcc-package-cross.inc index 153306905c..8d52b6ff99 100644 --- a/recipes/gcc/gcc-package-cross.inc +++ b/recipes/gcc/gcc-package-cross.inc @@ -4,7 +4,7 @@ PACKAGE_STRIP = "no" SHLIBSDIR = "${STAGING_DIR_TARGET}/shlibs" -PACKAGES = "libgcc libssp libstdc++ libg2c libgfortran libstdc++-dev libgcc-dev" +PACKAGES = "libgcc libssp libstdc++ libg2c libgfortran" # Called from within gcc-cross, so libdir is set wrong FILES_libg2c = "${target_libdir}/libg2c.so.*" @@ -14,11 +14,9 @@ FILES_libssp = "${target_libdir}/libssp.so.*" FILES_libgfortran = "${target_libdir}/libgfortran.so.*" FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1" -FILES_libgcc-dev = "${target_libdir}/libgcc_s.so" FILES_libstdc++ = "${target_libdir}/libstdc++.so.*" -FILES_libstdc++-dev = "${target_datadir}/gdb/auto-load/${libdir}/libstdc++.so.*-gdb.py*" do_install () { oe_runmake 'DESTDIR=${D}' install install -d ${D}${target_base_libdir} From 9ab7d1d30265bc453d1db0a096b7f30a638b18c0 Mon Sep 17 00:00:00 2001 From: Jesse Gilles Date: Tue, 9 Aug 2011 03:08:35 +0000 Subject: [PATCH 422/509] classpath in 2011.03-maintenance On Fri, 2011-08-05 at 11:38 -0400, George C. Huntington, III wrote: > I posted a patch that makes the wrapper script return the error code > if it > fails after 5 retries. it is on patchwork. > http://patches.openembedded.org/patch/7249/ It seems like saving the javac script arguments into the ARGS variable is what broke the old behavior where -bootclasspath '' worked for building classpath. Putting that part of the script back to the way it used to be fixes it. Do you want to merge this in with your error code return patch? Otherwise, I can submit it as another patch, but it will depend on yours... Thanks, Jesse --- recipes/ecj/files/ecj.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes/ecj/files/ecj.in b/recipes/ecj/files/ecj.in index 0fd4a65cdc..f8d97ac124 100755 --- a/recipes/ecj/files/ecj.in +++ b/recipes/ecj/files/ecj.in @@ -1,13 +1,16 @@ -ARGS=${1+"$@"} COUNT=5 END=0 +RETURNCODE=0 while test "${COUNT}" -gt "${END}" do - ${RUNTIME} -Xmx1024m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${ARGS} + ${RUNTIME} -Xmx1024m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"} + RETURNCODE=${?} if test "${?}" -eq "${END}" then break fi COUNT=$(($COUNT-1)) done + +exit ${RETURNCODE} From 144517db62ebd602f94d82e1284099ad2393c20e Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Thu, 8 Sep 2011 09:57:14 +0000 Subject: [PATCH 423/509] libdca: fix sed failing on unpack sed: can't read [...]/libdca/*.{ch}: No such file or directory Signed-off-by: Andreas Oberritter --- recipes/libdca/libdca_0.0.5-3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/libdca/libdca_0.0.5-3.bb b/recipes/libdca/libdca_0.0.5-3.bb index 5bc023a5b4..67b311e6d4 100644 --- a/recipes/libdca/libdca_0.0.5-3.bb +++ b/recipes/libdca/libdca_0.0.5-3.bb @@ -1,6 +1,7 @@ DESCRIPTION = "decoding library for DTS Coherent Acoustics streams" SECTION = "libs/multimedia" LICENSE = "GPLv2+" +PR = "r1" SRC_URI = "git://git.debian.org/pkg-multimedia/${PN}.git;protocol=git" @@ -12,7 +13,7 @@ inherit autotools lib_package pkgconfig do_unpackpost() { QUILT_PATCHES=debian/patches quilt push -a # single precision is enough and speeds up libdca by about 10-15% - sed -i -e 's/double/sample_t/g' ${S}/libdca/*.{ch} + sed -i -e 's/double/sample_t/g' ${S}/libdca/*.c ${S}/libdca/*.h } addtask unpackpost after do_unpack before do_patch From 18a91a1fa7648d942ab7564828f96370c32da498 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 11 Mar 2011 15:47:23 -0800 Subject: [PATCH 424/509] gcc-4.5: Fix ICE on i586 Upgrade to latest svnrev Get new linaro patches Delete patches that are not applied Signed-off-by: Khem Raj Tested-by: Yuri Bushmelev Signed-off-by: Denys Dmytriyenko --- recipes/gcc/gcc-4.5.inc | 13 +- .../linaro/gcc-4.5-linaro-r99350.patch | 184 ------------------ .../linaro/gcc-4.5-linaro-r99351.patch | 20 +- .../linaro/gcc-4.5-linaro-r99352.patch | 11 +- .../linaro/gcc-4.5-linaro-r99478.patch | 74 +++++++ .../gcc-4.5-linaro-r99479.patch} | 42 ++-- .../linaro/gcc-4.5-linaro-r99480.patch | 64 ++++++ .../linaro/gcc-4.5-linaro-r99481.patch | 40 ++++ .../linaro/gcc-4.5-linaro-r99482.patch | 84 ++++++++ .../linaro/gcc-4.5-linaro-r99483.patch | 63 ++++++ recipes/gcc/gcc-4.5/more-epilogues.patch | 83 ++++++++ 11 files changed, 449 insertions(+), 229 deletions(-) delete mode 100644 recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99350.patch create mode 100644 recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99478.patch rename recipes/gcc/gcc-4.5/{tune-xscale-infinite-loop-PR45177.patch => linaro/gcc-4.5-linaro-r99479.patch} (68%) create mode 100644 recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99480.patch create mode 100644 recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99481.patch create mode 100644 recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99482.patch create mode 100644 recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99483.patch create mode 100644 recipes/gcc/gcc-4.5/more-epilogues.patch diff --git a/recipes/gcc/gcc-4.5.inc b/recipes/gcc/gcc-4.5.inc index 66c03b20e1..2e48f6a8fd 100644 --- a/recipes/gcc/gcc-4.5.inc +++ b/recipes/gcc/gcc-4.5.inc @@ -9,7 +9,7 @@ NATIVEDEPS = "mpfr-native gmp-native libmpc-native" INC_PR = "r38" -SRCREV = "170443" +SRCREV = "170880" PV = "4.5" # BINV should be incremented after updating to a revision # after a minor gcc release (e.g. 4.5.1 or 4.5.2) has been made @@ -76,7 +76,6 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH} \ file://linaro/gcc-4.5-linaro-r99347.patch \ file://linaro/gcc-4.5-linaro-r99348.patch \ file://linaro/gcc-4.5-linaro-r99349.patch \ -# file://linaro/gcc-4.5-linaro-r99350.patch \ file://linaro/gcc-4.5-linaro-r99351.patch \ file://linaro/gcc-4.5-linaro-r99352.patch \ file://linaro/gcc-4.5-linaro-r99353.patch \ @@ -165,9 +164,15 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH} \ file://linaro/gcc-4.5-linaro-r99466.patch \ file://linaro/gcc-4.5-linaro-r99468.patch \ file://linaro/gcc-4.5-linaro-r99473.patch \ -# file://linaro/gcc-4.5-linaro-r99474.patch \ + file://linaro/gcc-4.5-linaro-r99474.patch \ file://linaro/gcc-4.5-linaro-r99475.patch \ - file://tune-xscale-infinite-loop-PR45177.patch \ + file://linaro/gcc-4.5-linaro-r99478.patch \ + file://linaro/gcc-4.5-linaro-r99479.patch \ + file://linaro/gcc-4.5-linaro-r99480.patch \ + file://linaro/gcc-4.5-linaro-r99481.patch \ + file://linaro/gcc-4.5-linaro-r99482.patch \ + file://linaro/gcc-4.5-linaro-r99483.patch \ + file://more-epilogues.patch \ file://gcc-scalar-widening-pr45847.patch \ file://gcc-arm-volatile-bitfield-fix.patch \ " diff --git a/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99350.patch b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99350.patch deleted file mode 100644 index 3f66f9d157..0000000000 --- a/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99350.patch +++ /dev/null @@ -1,184 +0,0 @@ - Jie Zhang - - Issue #7122 - - gcc/ - * config/arm/vfp.md (movdf_vfp): Add load double 0.0 case. - (thumb2_movdf_vfp): Likewise. Require that one of the operands be a - register. - * config/arm/constraints.md (D0): New constraint. - - gcc/testsuite/ - * gcc.target/arm/neon-load-df0.c: New test. - -2010-07-26 Julian Brown - - Merge from Sourcery G++ 4.4: - - 2010-02-23 Julian Brown - - gcc/ - -=== modified file 'gcc/config/arm/constraints.md' ---- old/gcc/config/arm/constraints.md 2010-08-12 16:47:21 +0000 -+++ new/gcc/config/arm/constraints.md 2010-08-13 10:59:06 +0000 -@@ -29,7 +29,7 @@ - ;; in Thumb-1 state: I, J, K, L, M, N, O - - ;; The following multi-letter normal constraints have been used: --;; in ARM/Thumb-2 state: Da, Db, Dc, Dn, Dl, DL, Dv, Dy, Di -+;; in ARM/Thumb-2 state: D0, Da, Db, Dc, Di, Dn, Dl, DL, Dv, Dy - ;; in Thumb-1 state: Pa, Pb - ;; in Thumb-2 state: Ps, Pt, Pv - -@@ -173,6 +173,13 @@ - (and (match_code "const_double") - (match_test "TARGET_32BIT && neg_const_double_rtx_ok_for_fpa (op)"))) - -+(define_constraint "D0" -+ "@internal -+ In ARM/Thumb-2 state a 0.0 floating point constant which can -+ be loaded with a Neon vmov immediate instruction." -+ (and (match_code "const_double") -+ (match_test "TARGET_NEON && op == CONST0_RTX (mode)"))) -+ - (define_constraint "Da" - "@internal - In ARM/Thumb-2 state a const_int, const_double or const_vector that can - -=== modified file 'gcc/config/arm/vfp.md' ---- old/gcc/config/arm/vfp.md 2010-08-12 11:29:02 +0000 -+++ new/gcc/config/arm/vfp.md 2010-08-13 10:59:06 +0000 -@@ -402,8 +402,8 @@ - ;; DFmode moves - - (define_insn "*movdf_vfp" -- [(set (match_operand:DF 0 "nonimmediate_soft_df_operand" "=w,?r,w ,r, m,w ,Uv,w,r") -- (match_operand:DF 1 "soft_df_operand" " ?r,w,Dy,mF,r,UvF,w, w,r"))] -+ [(set (match_operand:DF 0 "nonimmediate_soft_df_operand" "=w,?r,w ,w, r, m,w ,Uv,w,r") -+ (match_operand:DF 1 "soft_df_operand" " ?r,w,Dy,D0,mF,r,UvF,w, w,r"))] - "TARGET_ARM && TARGET_HARD_FLOAT && TARGET_VFP - && ( register_operand (operands[0], DFmode) - || register_operand (operands[1], DFmode))" -@@ -418,16 +418,18 @@ - case 2: - gcc_assert (TARGET_VFP_DOUBLE); - return \"fconstd%?\\t%P0, #%G1\"; -- case 3: case 4: -+ case 3: -+ return \"vmov.i32\\t%P0, #0\"; -+ case 4: case 5: - return output_move_double (operands); -- case 5: case 6: -+ case 6: case 7: - return output_move_vfp (operands); -- case 7: -+ case 8: - if (TARGET_VFP_SINGLE) - return \"fcpys%?\\t%0, %1\;fcpys%?\\t%p0, %p1\"; - else - return \"fcpyd%?\\t%P0, %P1\"; -- case 8: -+ case 9: - return \"#\"; - default: - gcc_unreachable (); -@@ -435,10 +437,10 @@ - } - " - [(set_attr "type" -- "r_2_f,f_2_r,fconstd,f_loadd,f_stored,load2,store2,ffarithd,*") -- (set_attr "neon_type" "neon_mcr_2_mcrr,neon_mrrc,*,*,*,*,*,neon_vmov,*") -- (set (attr "length") (cond [(eq_attr "alternative" "3,4,8") (const_int 8) -- (eq_attr "alternative" "7") -+ "r_2_f,f_2_r,fconstd,*,f_loadd,f_stored,load2,store2,ffarithd,*") -+ (set_attr "neon_type" "neon_mcr_2_mcrr,neon_mrrc,*,neon_vmov,*,*,*,*,neon_vmov,*") -+ (set (attr "length") (cond [(eq_attr "alternative" "4,5,9") (const_int 8) -+ (eq_attr "alternative" "8") - (if_then_else - (eq (symbol_ref "TARGET_VFP_SINGLE") - (const_int 1)) -@@ -446,14 +448,16 @@ - (const_int 4))] - (const_int 4))) - (set_attr "predicable" "yes") -- (set_attr "pool_range" "*,*,*,1020,*,1020,*,*,*") -- (set_attr "neg_pool_range" "*,*,*,1008,*,1008,*,*,*")] -+ (set_attr "pool_range" "*,*,*,*,1020,*,1020,*,*,*") -+ (set_attr "neg_pool_range" "*,*,*,*,1008,*,1008,*,*,*")] - ) - - (define_insn "*thumb2_movdf_vfp" -- [(set (match_operand:DF 0 "nonimmediate_soft_df_operand" "=w,?r,w ,r, m,w ,Uv,w,r") -- (match_operand:DF 1 "soft_df_operand" " ?r,w,Dy,mF,r,UvF,w, w,r"))] -- "TARGET_THUMB2 && TARGET_HARD_FLOAT && TARGET_VFP" -+ [(set (match_operand:DF 0 "nonimmediate_soft_df_operand" "=w,?r,w ,w,r, m,w ,Uv,w,r") -+ (match_operand:DF 1 "soft_df_operand" " ?r,w,Dy,D0,mF,r,UvF,w, w,r"))] -+ "TARGET_THUMB2 && TARGET_HARD_FLOAT && TARGET_VFP -+ && ( register_operand (operands[0], DFmode) -+ || register_operand (operands[1], DFmode))" - "* - { - switch (which_alternative) -@@ -465,11 +469,13 @@ - case 2: - gcc_assert (TARGET_VFP_DOUBLE); - return \"fconstd%?\\t%P0, #%G1\"; -- case 3: case 4: case 8: -+ case 3: -+ return \"vmov.i32\\t%P0, #0\"; -+ case 4: case 5: case 9: - return output_move_double (operands); -- case 5: case 6: -+ case 6: case 7: - return output_move_vfp (operands); -- case 7: -+ case 8: - if (TARGET_VFP_SINGLE) - return \"fcpys%?\\t%0, %1\;fcpys%?\\t%p0, %p1\"; - else -@@ -480,18 +486,18 @@ - } - " - [(set_attr "type" -- "r_2_f,f_2_r,fconstd,load2,store2,f_load,f_store,ffarithd,*") -- (set_attr "neon_type" "neon_mcr_2_mcrr,neon_mrrc,*,*,*,*,*,neon_vmov,*") -- (set (attr "length") (cond [(eq_attr "alternative" "3,4,8") (const_int 8) -- (eq_attr "alternative" "7") -+ "r_2_f,f_2_r,fconstd,*,load2,store2,f_load,f_store,ffarithd,*") -+ (set_attr "neon_type" "neon_mcr_2_mcrr,neon_mrrc,*,neon_vmov,*,*,*,*,neon_vmov,*") -+ (set (attr "length") (cond [(eq_attr "alternative" "4,5,9") (const_int 8) -+ (eq_attr "alternative" "8") - (if_then_else - (eq (symbol_ref "TARGET_VFP_SINGLE") - (const_int 1)) - (const_int 8) - (const_int 4))] - (const_int 4))) -- (set_attr "pool_range" "*,*,*,4096,*,1020,*,*,*") -- (set_attr "neg_pool_range" "*,*,*,0,*,1008,*,*,*")] -+ (set_attr "pool_range" "*,*,*,*,4096,*,1020,*,*,*") -+ (set_attr "neg_pool_range" "*,*,*,*,0,*,1008,*,*,*")] - ) - - - -=== added file 'gcc/testsuite/gcc.target/arm/neon-load-df0.c' ---- old/gcc/testsuite/gcc.target/arm/neon-load-df0.c 1970-01-01 00:00:00 +0000 -+++ new/gcc/testsuite/gcc.target/arm/neon-load-df0.c 2010-08-13 10:59:06 +0000 -@@ -0,0 +1,14 @@ -+/* Test the optimization of loading 0.0 for ARM Neon. */ -+ -+/* { dg-do compile } */ -+/* { dg-require-effective-target arm_neon_ok } */ -+/* { dg-options "-O2" } */ -+/* { dg-add-options arm_neon } */ -+ -+double x; -+void bar () -+{ -+ x = 0.0; -+} -+/* { dg-final { scan-assembler "vmov\.i32\[ \]+\[dD\]\[0-9\]+, #0\n" } } */ -+/* { dg-final { cleanup-saved-temps } } */ - diff --git a/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99351.patch b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99351.patch index a1a2c2ad81..aa3b3eb85f 100644 --- a/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99351.patch +++ b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99351.patch @@ -1,3 +1,11 @@ +2010-07-26 Julian Brown + + Merge from Sourcery G++ 4.4: + + Jie Zhang + Issue #7122 + + gcc/ * config/arm/arm.c (arm_rtx_costs_1): Adjust cost for CONST_VECTOR. (arm_size_rtx_costs): Likewise. @@ -25,18 +33,6 @@ * gcc.target/arm/neon-vdup-18.c: New test case. * gcc.target/arm/neon-vdup-19.c: New test case. -2010-07-26 Julian Brown - - Merge from Sourcery G++ 4.4: - - Jie Zhang - - Issue #7122 - - gcc/ - * config/arm/vfp.md (movdf_vfp): Add load double 0.0 case. - (thumb2_movdf_vfp): Likewise. Require that one of the operands be a - register. === modified file 'gcc/config/arm/arm.c' --- old/gcc/config/arm/arm.c 2010-08-13 10:55:28 +0000 diff --git a/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99352.patch b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99352.patch index 675c2f3ceb..8d48ada2fd 100644 --- a/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99352.patch +++ b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99352.patch @@ -1,3 +1,7 @@ +2010-07-26 Julian Brown + + Merge from Sourcery G++ 4.4: + 2010-04-07 Thomas Schwinge Daniel Jacobowitz @@ -13,13 +17,6 @@ * config/arm/arm.h (DWARF2_UNWIND_INFO): Remove definition. * config/arm/bpabi.h (DWARF2_UNWIND_INFO): Define to zero. -2010-07-26 Julian Brown - - Merge from Sourcery G++ 4.4: - - Jie Zhang - - Issue #7122 === modified file 'gcc/config/arm/arm.h' --- old/gcc/config/arm/arm.h 2010-08-13 10:30:35 +0000 diff --git a/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99478.patch b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99478.patch new file mode 100644 index 0000000000..38463a9b40 --- /dev/null +++ b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99478.patch @@ -0,0 +1,74 @@ +2011-01-11 Ramana Radhakrishnan + + * config/arm/t-arm: Fix up last commit. + +2011-01-11 Ramana Radhakrishnan + + * config/arm/t-arm: Update MD_INCLUDES to include + all the files correctly. + * config/arm/arm.md: Update comments. + +=== modified file 'gcc/config/arm/arm.md' +--- old/gcc/config/arm/arm.md 2011-02-22 11:38:56 +0000 ++++ new/gcc/config/arm/arm.md 2011-03-01 14:32:39 +0000 +@@ -11246,6 +11246,7 @@ + " + ) + ++;; Make sure that the includes are reflected in MD_INCLUDES. + ;; Load the load/store multiple patterns + (include "ldmstm.md") + ;; Load the FPA co-processor patterns + +=== modified file 'gcc/config/arm/t-arm' +--- old/gcc/config/arm/t-arm 2010-08-16 09:41:58 +0000 ++++ new/gcc/config/arm/t-arm 2011-01-11 21:01:30 +0000 +@@ -18,20 +18,33 @@ + # along with GCC; see the file COPYING3. If not see + # . + +-MD_INCLUDES= $(srcdir)/config/arm/arm-tune.md \ +- $(srcdir)/config/arm/predicates.md \ +- $(srcdir)/config/arm/arm-generic.md \ +- $(srcdir)/config/arm/arm1020e.md \ +- $(srcdir)/config/arm/arm1026ejs.md \ +- $(srcdir)/config/arm/arm1136jfs.md \ +- $(srcdir)/config/arm/arm926ejs.md \ +- $(srcdir)/config/arm/cirrus.md \ +- $(srcdir)/config/arm/fpa.md \ +- $(srcdir)/config/arm/vec-common.md \ +- $(srcdir)/config/arm/iwmmxt.md \ +- $(srcdir)/config/arm/vfp.md \ +- $(srcdir)/config/arm/neon.md \ +- $(srcdir)/config/arm/thumb2.md ++MD_INCLUDES= $(srcdir)/config/arm/arm-tune.md \ ++ $(srcdir)/config/arm/predicates.md \ ++ $(srcdir)/config/arm/arm-generic.md \ ++ $(srcdir)/config/arm/arm1020e.md \ ++ $(srcdir)/config/arm/arm1026ejs.md \ ++ $(srcdir)/config/arm/arm1136jfs.md \ ++ $(srcdir)/config/arm/arm926ejs.md \ ++ $(srcdir)/config/arm/cirrus.md \ ++ $(srcdir)/config/arm/fpa.md \ ++ $(srcdir)/config/arm/vec-common.md \ ++ $(srcdir)/config/arm/iwmmxt.md \ ++ $(srcdir)/config/arm/vfp.md \ ++ $(srcdir)/config/arm/cortex-a5.md \ ++ $(srcdir)/config/arm/cortex-a8.md \ ++ $(srcdir)/config/arm/cortex-a9.md \ ++ $(srcdir)/config/arm/cortex-a9-neon.md \ ++ $(srcdir)/config/arm/cortex-r4.md \ ++ $(srcdir)/config/arm/cortex-r4f.md \ ++ $(srcdir)/config/arm/cortex-m4.md \ ++ $(srcdir)/config/arm/cortex-m4-fpu.md \ ++ $(srcdir)/config/arm/vfp11.md \ ++ $(srcdir)/config/arm/ldmstm.md \ ++ $(srcdir)/config/arm/thumb2.md \ ++ $(srcdir)/config/arm/neon.md \ ++ $(srcdir)/config/arm/sync.md \ ++ $(srcdir)/config/arm/cortex-a8-neon.md \ ++ $(srcdir)/config/arm/constraints.md + + LIB1ASMSRC = arm/lib1funcs.asm + LIB1ASMFUNCS = _thumb1_case_sqi _thumb1_case_uqi _thumb1_case_shi \ + diff --git a/recipes/gcc/gcc-4.5/tune-xscale-infinite-loop-PR45177.patch b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99479.patch similarity index 68% rename from recipes/gcc/gcc-4.5/tune-xscale-infinite-loop-PR45177.patch rename to recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99479.patch index 55c6f90cb9..2920466d8f 100644 --- a/recipes/gcc/gcc-4.5/tune-xscale-infinite-loop-PR45177.patch +++ b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99479.patch @@ -1,21 +1,19 @@ -commit dcb4aa7b04d03ba107fd628ec3dc663d0a01c397 -Author: bernds -Date: Tue Aug 10 18:45:10 2010 +0000 +2011-02-24 Chung-Lin Tang - PR bootstrap/45177 - * config/arm/arm.c (multiple_operation_profitable_p): Move xscale - test here from arm_gen_load_multiple_1. - (arm_gen_load_multiple_1, arm_gen_store_multiple_1): Use - multiple_operation_profitable_p. - - - git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163077 138bc75d-0d04-0410-961f-82ee72b054a4 + Backport from FSF mainline: -Index: gcc-4_5-branch/gcc/config/arm/arm.c -=================================================================== ---- gcc-4_5-branch.orig/gcc/config/arm/arm.c -+++ gcc-4_5-branch/gcc/config/arm/arm.c -@@ -9716,6 +9716,36 @@ multiple_operation_profitable_p (bool is + 2010-08-10 Bernd Schmidt + + PR bootstrap/45177 + * config/arm/arm.c (multiple_operation_profitable_p): Move xscale + test here from arm_gen_load_multiple_1. + (arm_gen_load_multiple_1, arm_gen_store_multiple_1): Use + multiple_operation_profitable_p. + +=== modified file 'gcc/config/arm/arm.c' +--- old/gcc/config/arm/arm.c 2011-02-22 11:38:56 +0000 ++++ new/gcc/config/arm/arm.c 2011-02-24 17:30:32 +0000 +@@ -9728,6 +9728,36 @@ if (nops == 2 && arm_ld_sched && add_offset != 0) return false; @@ -52,11 +50,10 @@ Index: gcc-4_5-branch/gcc/config/arm/arm.c return true; } -@@ -10073,36 +10103,7 @@ arm_gen_load_multiple_1 (int count, int - { +@@ -10086,35 +10116,7 @@ int i = 0, j; rtx result; -- + - /* XScale has load-store double instructions, but they have stricter - alignment requirements than load-store multiple, so we cannot - use them. @@ -86,18 +83,19 @@ Index: gcc-4_5-branch/gcc/config/arm/arm.c - As a compromise, we use ldr for counts of 1 or 2 regs, and ldm - for counts of 3 or 4 regs. */ - if (low_irq_latency || (arm_tune_xscale && count <= 2 && ! optimize_size)) -+ if (!multiple_operation_profitable_p (false, count, 0)) ++ if (low_irq_latency || !multiple_operation_profitable_p (false, count, 0)) { rtx seq; -@@ -10154,9 +10155,7 @@ arm_gen_store_multiple_1 (int count, int +@@ -10166,9 +10168,7 @@ if (GET_CODE (basereg) == PLUS) basereg = XEXP (basereg, 0); - /* See arm_gen_load_multiple_1 for discussion of - the pros/cons of ldm/stm usage for XScale. */ - if (low_irq_latency || (arm_tune_xscale && count <= 2 && ! optimize_size)) -+ if (!multiple_operation_profitable_p (false, count, 0)) ++ if (low_irq_latency || !multiple_operation_profitable_p (false, count, 0)) { rtx seq; + diff --git a/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99480.patch b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99480.patch new file mode 100644 index 0000000000..76d3c9565c --- /dev/null +++ b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99480.patch @@ -0,0 +1,64 @@ +2011-02-02 Richard Sandiford + + + gcc/ + PR target/47551 + * config/arm/arm.c (coproc_secondary_reload_class): Handle + structure modes. Don't check neon_vector_mem_operand for + vector or structure modes. + + gcc/testsuite/ + PR target/47551 + * gcc.target/arm/neon-modes-2.c: New test. + +=== modified file 'gcc/config/arm/arm.c' +--- old/gcc/config/arm/arm.c 2011-02-24 17:30:32 +0000 ++++ new/gcc/config/arm/arm.c 2011-03-02 11:29:06 +0000 +@@ -9303,11 +9303,14 @@ + return GENERAL_REGS; + } + ++ /* The neon move patterns handle all legitimate vector and struct ++ addresses. */ + if (TARGET_NEON ++ && MEM_P (x) + && (GET_MODE_CLASS (mode) == MODE_VECTOR_INT +- || GET_MODE_CLASS (mode) == MODE_VECTOR_FLOAT) +- && neon_vector_mem_operand (x, 0)) +- return NO_REGS; ++ || GET_MODE_CLASS (mode) == MODE_VECTOR_FLOAT ++ || VALID_NEON_STRUCT_MODE (mode))) ++ return NO_REGS; + + if (arm_coproc_mem_operand (x, wb) || s_register_operand (x, mode)) + return NO_REGS; + +=== added file 'gcc/testsuite/gcc.target/arm/neon-modes-2.c' +--- old/gcc/testsuite/gcc.target/arm/neon-modes-2.c 1970-01-01 00:00:00 +0000 ++++ new/gcc/testsuite/gcc.target/arm/neon-modes-2.c 2011-02-02 13:48:10 +0000 +@@ -0,0 +1,24 @@ ++/* { dg-do compile } */ ++/* { dg-require-effective-target arm_neon_ok } */ ++/* { dg-options "-O1" } */ ++/* { dg-add-options arm_neon } */ ++ ++#include "arm_neon.h" ++ ++#define SETUP(A) x##A = vld3_u32 (ptr + A * 0x20) ++#define MODIFY(A) x##A = vld3_lane_u32 (ptr + A * 0x20 + 0x10, x##A, 1) ++#define STORE(A) vst3_u32 (ptr + A * 0x20, x##A) ++ ++#define MANY(A) A (0), A (1), A (2), A (3), A (4), A (5) ++ ++void ++bar (uint32_t *ptr, int y) ++{ ++ uint32x2x3_t MANY (SETUP); ++ int *x = __builtin_alloca (y); ++ int z[0x1000]; ++ foo (x, z); ++ MANY (MODIFY); ++ foo (x, z); ++ MANY (STORE); ++} + diff --git a/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99481.patch b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99481.patch new file mode 100644 index 0000000000..db53255de8 --- /dev/null +++ b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99481.patch @@ -0,0 +1,40 @@ + 2011-02-02 Richard Sandiford + + gcc/testsuite/ + PR target/47553 + * gcc.target/arm/neon-vld-1.c: New test. + gcc/ + PR target/47553 + * config/arm/predicates.md (neon_lane_number): Accept 0..15. + +=== modified file 'gcc/config/arm/predicates.md' +--- old/gcc/config/arm/predicates.md 2011-02-08 12:07:29 +0000 ++++ new/gcc/config/arm/predicates.md 2011-03-02 12:28:41 +0000 +@@ -607,7 +607,7 @@ + ;; TODO: We could check lane numbers more precisely based on the mode. + (define_predicate "neon_lane_number" + (and (match_code "const_int") +- (match_test "INTVAL (op) >= 0 && INTVAL (op) <= 7"))) ++ (match_test "INTVAL (op) >= 0 && INTVAL (op) <= 15"))) + ;; Predicates for named expanders that overlap multiple ISAs. + + (define_predicate "cmpdi_operand" + +=== added file 'gcc/testsuite/gcc.target/arm/neon-vld-1.c' +--- old/gcc/testsuite/gcc.target/arm/neon-vld-1.c 1970-01-01 00:00:00 +0000 ++++ new/gcc/testsuite/gcc.target/arm/neon-vld-1.c 2011-02-02 13:57:54 +0000 +@@ -0,0 +1,13 @@ ++/* { dg-do compile } */ ++/* { dg-require-effective-target arm_neon_ok } */ ++/* { dg-options "-O1" } */ ++/* { dg-add-options arm_neon } */ ++ ++#include ++ ++uint8x16_t ++foo (uint8_t *a, uint8x16_t b) ++{ ++ vst1q_lane_u8 (a, b, 14); ++ return vld1q_lane_u8 (a + 0x100, b, 15); ++} + diff --git a/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99482.patch b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99482.patch new file mode 100644 index 0000000000..334ac4ec1a --- /dev/null +++ b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99482.patch @@ -0,0 +1,84 @@ + 2011-02-02 Richard Sandiford + + gcc/ + Backport from mainline: + + 2011-01-23 Bernd Schmidt + Richard Sandiford + + PR rtl-optimization/47166 + * reload1.c (emit_reload_insns): Disable the spill_reg_store + mechanism for PRE_MODIFY and POST_MODIFY. + (inc_for_reload): For PRE_MODIFY, return the insn that sets the + reloadreg. + + gcc/testsuite/ + * gcc.c-torture/execute/postmod-1.c: New test. + +=== added file 'gcc/testsuite/gcc.c-torture/execute/postmod-1.c' +--- old/gcc/testsuite/gcc.c-torture/execute/postmod-1.c 1970-01-01 00:00:00 +0000 ++++ new/gcc/testsuite/gcc.c-torture/execute/postmod-1.c 2011-02-02 14:23:10 +0000 +@@ -0,0 +1,62 @@ ++#define DECLARE_ARRAY(A) array##A[0x10] ++#define DECLARE_COUNTER(A) counter##A = 0 ++#define DECLARE_POINTER(A) *pointer##A = array##A + x ++/* Create a loop that allows post-modification of pointerA, followed by ++ a use of the post-modified address. */ ++#define BEFORE(A) counter##A += *pointer##A, pointer##A += 3 ++#define AFTER(A) counter##A += pointer##A[x] ++ ++/* Set up the arrays so that one iteration of the loop sets the counter ++ to 3.0f. */ ++#define INIT_ARRAY(A) array##A[1] = 1.0f, array##A[5] = 2.0f ++ ++/* Check that the loop worked correctly for all values. */ ++#define CHECK_ARRAY(A) exit_code |= (counter##A != 3.0f) ++ ++/* Having 6 copies triggered the bug for ARM and Thumb. */ ++#define MANY(A) A (0), A (1), A (2), A (3), A (4), A (5) ++ ++/* Each addendA should be allocated a register. */ ++#define INIT_VOLATILE(A) addend##A = vol ++#define ADD_VOLATILE(A) vol += addend##A ++ ++/* Having 5 copies triggered the bug for ARM and Thumb. */ ++#define MANY2(A) A (0), A (1), A (2), A (3), A (4) ++ ++float MANY (DECLARE_ARRAY); ++float MANY (DECLARE_COUNTER); ++ ++volatile int stop = 1; ++volatile int vol; ++ ++void __attribute__((noinline)) ++foo (int x) ++{ ++ float MANY (DECLARE_POINTER); ++ int i; ++ ++ do ++ { ++ MANY (BEFORE); ++ MANY (AFTER); ++ /* Create an inner loop that should ensure the code above ++ has registers free for reload inheritance. */ ++ { ++ int MANY2 (INIT_VOLATILE); ++ for (i = 0; i < 10; i++) ++ MANY2 (ADD_VOLATILE); ++ } ++ } ++ while (!stop); ++} ++ ++int ++main (void) ++{ ++ int exit_code = 0; ++ ++ MANY (INIT_ARRAY); ++ foo (1); ++ MANY (CHECK_ARRAY); ++ return exit_code; ++} + diff --git a/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99483.patch b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99483.patch new file mode 100644 index 0000000000..c0be4a03b1 --- /dev/null +++ b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99483.patch @@ -0,0 +1,63 @@ +2011-02-11 Richard Sandiford + + gcc/ + * cse.c (count_reg_usage): Check side_effects_p. Remove the + separate check for volatile asms. + + gcc/testsuite/ + * gcc.dg/torture/volatile-pic-1.c: New test. + +=== modified file 'gcc/cse.c' +--- old/gcc/cse.c 2010-11-26 12:03:32 +0000 ++++ new/gcc/cse.c 2011-02-11 09:27:19 +0000 +@@ -6634,9 +6634,10 @@ + case CALL_INSN: + case INSN: + case JUMP_INSN: +- /* We expect dest to be NULL_RTX here. If the insn may trap, mark +- this fact by setting DEST to pc_rtx. */ +- if (insn_could_throw_p (x)) ++ /* We expect dest to be NULL_RTX here. If the insn may trap, ++ or if it cannot be deleted due to side-effects, mark this fact ++ by setting DEST to pc_rtx. */ ++ if (insn_could_throw_p (x) || side_effects_p (PATTERN (x))) + dest = pc_rtx; + if (code == CALL_INSN) + count_reg_usage (CALL_INSN_FUNCTION_USAGE (x), counts, dest, incr); +@@ -6676,10 +6677,6 @@ + return; + + case ASM_OPERANDS: +- /* If the asm is volatile, then this insn cannot be deleted, +- and so the inputs *must* be live. */ +- if (MEM_VOLATILE_P (x)) +- dest = NULL_RTX; + /* Iterate over just the inputs, not the constraints as well. */ + for (i = ASM_OPERANDS_INPUT_LENGTH (x) - 1; i >= 0; i--) + count_reg_usage (ASM_OPERANDS_INPUT (x, i), counts, dest, incr); + +=== added file 'gcc/testsuite/gcc.dg/torture/volatile-pic-1.c' +--- old/gcc/testsuite/gcc.dg/torture/volatile-pic-1.c 1970-01-01 00:00:00 +0000 ++++ new/gcc/testsuite/gcc.dg/torture/volatile-pic-1.c 2011-02-11 09:27:19 +0000 +@@ -0,0 +1,20 @@ ++/* { dg-do run } */ ++/* { dg-require-visibility "" } */ ++/* { dg-require-effective-target fpic } */ ++/* { dg-options "-fPIC" } */ ++ ++volatile int x __attribute__((visibility("hidden"))); ++ ++void __attribute__((noinline)) bar (void) ++{ ++#if defined (__arm__) ++ asm volatile ("mov r3,%0" :: "r" (0xdeadbeef) : "r3"); ++#endif ++ (void) x; ++} ++ ++int main (void) ++{ ++ bar (); ++ return 0; ++} + diff --git a/recipes/gcc/gcc-4.5/more-epilogues.patch b/recipes/gcc/gcc-4.5/more-epilogues.patch new file mode 100644 index 0000000000..64f1cf3751 --- /dev/null +++ b/recipes/gcc/gcc-4.5/more-epilogues.patch @@ -0,0 +1,83 @@ +Index: a/gcc/cfgcleanup.c +=================================================================== +--- a/gcc/cfgcleanup.c (revision 315947) ++++ b/gcc/cfgcleanup.c (working copy) +@@ -1179,13 +1179,19 @@ flow_find_head_matching_sequence (basic_ + + while (true) + { +- +- /* Ignore notes. */ ++ /* Ignore notes, except NOTE_INSN_EPILOGUE_BEG. */ + while (!NONDEBUG_INSN_P (i1) && i1 != BB_END (bb1)) +- i1 = NEXT_INSN (i1); +- ++ { ++ if (NOTE_P (i1) && NOTE_KIND (i1) == NOTE_INSN_EPILOGUE_BEG) ++ break; ++ i1 = NEXT_INSN (i1); ++ } + while (!NONDEBUG_INSN_P (i2) && i2 != BB_END (bb2)) +- i2 = NEXT_INSN (i2); ++ { ++ if (NOTE_P (i2) && NOTE_KIND (i2) == NOTE_INSN_EPILOGUE_BEG) ++ break; ++ i2 = NEXT_INSN (i2); ++ } + + if (NOTE_P (i1) || NOTE_P (i2) + || JUMP_P (i1) || JUMP_P (i2)) +Index: a/gcc/cfglayout.c +=================================================================== +--- a/gcc/cfglayout.c (revision 315947) ++++ b/gcc/cfglayout.c (working copy) +@@ -1295,6 +1295,16 @@ cfg_layout_initialize (unsigned int flag + bb->flags |= BB_NON_LOCAL_GOTO_TARGET; + } + ++ FOR_EACH_BB (bb) ++ { ++ rtx insn; ++ FOR_BB_INSNS (bb, insn) ++ if (NOTE_P (insn) && NOTE_KIND (insn) == NOTE_INSN_EPILOGUE_BEG) ++ { ++ bb->flags |= BB_EPILOGUE_BEGIN; ++ break; ++ } ++ } + cleanup_cfg (CLEANUP_CFGLAYOUT | flags); + } + +Index: a/gcc/basic-block.h +=================================================================== +--- a/gcc/basic-block.h (revision 315947) ++++ b/gcc/basic-block.h (working copy) +@@ -332,7 +332,11 @@ enum bb_flags + + /* Set on blocks that cannot be threaded through. + Only used in cfgcleanup.c. */ +- BB_NONTHREADABLE_BLOCK = 1 << 11 ++ BB_NONTHREADABLE_BLOCK = 1 << 11, ++ ++ /* Set on blocks that have a NOTE_INSN_EPILOGUE_BEGIN. ++ Only used in cfglayout mode. */ ++ BB_EPILOGUE_BEGIN = 1 << 12 + }; + + /* Dummy flag for convenience in the hot/cold partitioning code. */ +Index: a/gcc/cfgrtl.c +=================================================================== +--- a/gcc/cfgrtl.c (revision 315947) ++++ b/gcc/cfgrtl.c (working copy) +@@ -2707,7 +2707,10 @@ cfg_layout_can_merge_blocks_p (basic_blo + not allow us to redirect an edge by replacing a table jump. */ + && (!JUMP_P (BB_END (a)) + || ((!optimize || reload_completed) +- ? simplejump_p (BB_END (a)) : onlyjump_p (BB_END (a))))); ++ ? simplejump_p (BB_END (a)) : onlyjump_p (BB_END (a)))) ++ /* Don't separate a NOTE_INSN_EPILOGUE_BEG from its returnjump. */ ++ && (!(b->flags & BB_EPILOGUE_BEGIN) ++ || returnjump_p (BB_END (b)))); + } + + /* Merge block A and B. The blocks must be mergeable. */ From 383dcd314a0892494fb32f00314956d2f98ea4f7 Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Thu, 15 Sep 2011 16:15:16 +0200 Subject: [PATCH 425/509] rsyslog: switch to new upstream version 5.8.4 * many bug fixes and systemd support, see: http://www.rsyslog.com/changelog-for-5-8-1-v5-stable/ http://www.rsyslog.com/changelog-for-5-8-2-v5-stable/ http://www.rsyslog.com/changelog-for-5-8-3-v5-stable/ http://www.rsyslog.com/changelog-for-5-8-4-v5-stable/ * obsolete versions till 5.8.x deleted Signed-off-by: Steffen Sledz --- recipes/rsyslog/files/rsyslog-resume.patch | 29 ---------------------- recipes/rsyslog/rsyslog_5.5.4.bb | 7 ------ recipes/rsyslog/rsyslog_5.5.6.bb | 7 ------ recipes/rsyslog/rsyslog_5.6.3.bb | 5 ---- recipes/rsyslog/rsyslog_5.8.4.bb | 5 ++++ 5 files changed, 5 insertions(+), 48 deletions(-) delete mode 100644 recipes/rsyslog/files/rsyslog-resume.patch delete mode 100644 recipes/rsyslog/rsyslog_5.5.4.bb delete mode 100644 recipes/rsyslog/rsyslog_5.5.6.bb delete mode 100644 recipes/rsyslog/rsyslog_5.6.3.bb create mode 100644 recipes/rsyslog/rsyslog_5.8.4.bb diff --git a/recipes/rsyslog/files/rsyslog-resume.patch b/recipes/rsyslog/files/rsyslog-resume.patch deleted file mode 100644 index 73ed1012c7..0000000000 --- a/recipes/rsyslog/files/rsyslog-resume.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 467f10a13950b4b8d5a9fff7f14c20874777a4ba Mon Sep 17 00:00:00 2001 -From: Steffen Sledz -Date: Fri, 30 Jul 2010 14:39:53 +0200 -Subject: [PATCH] break potential infinite loop in actionDoRetry - -If a module always returns RS_RET_OK (like ompipe does) the actionDoRetry -loop may not have leaved faked ACT_STATE_SUSP state in case iResumeOKinRow -had ever reached a count of 1000. - -Signed-off-by: Steffen Sledz ---- - action.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/action.c b/action.c -index 32a07dc..90ec1bf 100644 ---- a/action.c -+++ b/action.c -@@ -508,6 +508,7 @@ static rsRetVal actionDoRetry(action_t *pThis, time_t ttNow) - iRet = pThis->pMod->tryResume(pThis->pModData); - if((pThis->iResumeOKinRow > 999) && (pThis->iResumeOKinRow % 1000 == 0)) { - bTreatOKasSusp = 1; -+ pThis->iResumeOKinRow = 0; - } else { - bTreatOKasSusp = 0; - } --- -1.6.4.2 - diff --git a/recipes/rsyslog/rsyslog_5.5.4.bb b/recipes/rsyslog/rsyslog_5.5.4.bb deleted file mode 100644 index e949ed5648..0000000000 --- a/recipes/rsyslog/rsyslog_5.5.4.bb +++ /dev/null @@ -1,7 +0,0 @@ -require rsyslog.inc -PR = "${INC_PR}.1" - -SRC_URI += " file://rsyslog-resume.patch " - -SRC_URI[md5sum] = "824df2504955df1619e5ec2915d783aa" -SRC_URI[sha256sum] = "31853a551ea7ca960c59c9e33406b1748bdf311059c9d8a4ce98816d51b17cac" diff --git a/recipes/rsyslog/rsyslog_5.5.6.bb b/recipes/rsyslog/rsyslog_5.5.6.bb deleted file mode 100644 index f05fcfd19e..0000000000 --- a/recipes/rsyslog/rsyslog_5.5.6.bb +++ /dev/null @@ -1,7 +0,0 @@ -require rsyslog.inc -PR = "${INC_PR}.0" - -SRC_URI += " file://rsyslog-resume.patch " - -SRC_URI[md5sum] = "835a7dd4f404d37c9d01a1056beaf3cb" -SRC_URI[sha256sum] = "ae866e1f92869b82cf30270cbea192dbc5229c8707a8782fff95641bcb5725a2" diff --git a/recipes/rsyslog/rsyslog_5.6.3.bb b/recipes/rsyslog/rsyslog_5.6.3.bb deleted file mode 100644 index d2128e1b8b..0000000000 --- a/recipes/rsyslog/rsyslog_5.6.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require rsyslog.inc -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "4fd22c5a4d9442b16f6717c65446b718" -SRC_URI[sha256sum] = "d78547097add18a7bc680899a87f3305926b3a57b4885fc8fc31e7014c29dc7b" diff --git a/recipes/rsyslog/rsyslog_5.8.4.bb b/recipes/rsyslog/rsyslog_5.8.4.bb new file mode 100644 index 0000000000..c874631875 --- /dev/null +++ b/recipes/rsyslog/rsyslog_5.8.4.bb @@ -0,0 +1,5 @@ +require rsyslog.inc +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "a2c2a65ac84d9a895c52a754aff61986" +SRC_URI[sha256sum] = "fdae6a027942f46eef8abcf2b6b28399986b5e983452e046e729eae70f13febe" From 1e2c0bac743d98ff7f3ef887bd52e17529ac9c09 Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Thu, 15 Sep 2011 20:29:02 +0000 Subject: [PATCH 426/509] linux-libc-headers 2.6.24: backport arm/asm/hwcap.h from linux 2.6.26 Enables building of OpenJDK which uses HWCAP_THUMBEE that is not present in 2.6.24 headers and was introduced with commit d7f864be8323e5394040e2877594645b0e7da85d Author: Catalin Marinas Date: Fri Apr 18 22:43:06 2008 +0100 ARMv7: Add support for the ThumbEE state saving/restoring This patch adds the detection and handling of the ThumbEE extension on ARMv7 CPUs. Signed-off-by: Catalin Marinas Upstream-Status: Backport [2.6.26] Signed-off-by: Steffen Sledz Reviewed-by: Paul Menzel --- .../arm-hwcap-add-new-entries.patch | 31 +++++++++++++++++++ .../linux-libc-headers_2.6.24.bb | 6 ++-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch diff --git a/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch new file mode 100644 index 0000000000..80a7949607 --- /dev/null +++ b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch @@ -0,0 +1,31 @@ +linux-libc-headers 2.6.24: backport arm/asm/hwcap.h from linux 2.6.26 + +Enables building of OpenJDK which uses HWCAP_THUMBEE that is not present +in 2.6.24 headers and was introduced with + + commit d7f864be8323e5394040e2877594645b0e7da85d + Author: Catalin Marinas + Date: Fri Apr 18 22:43:06 2008 +0100 + + ARMv7: Add support for the ThumbEE state saving/restoring + + This patch adds the detection and handling of the ThumbEE extension on + ARMv7 CPUs. + + Signed-off-by: Catalin Marinas + +Upstream-Status: Backport [2.6.26] + +Signed-off-by: Steffen Sledz + +diff -Nurd linux-2.6.24.orig//include/asm-arm/hwcap.h linux-2.6.24/include/asm-arm/hwcap.h +--- linux-2.6.24.orig//include/asm-arm/hwcap.h 2011-09-15 08:42:58.467307245 +0200 ++++ linux-2.6.24/include/asm-arm/hwcap.h 2011-09-15 08:43:46.004693497 +0200 +@@ -15,6 +15,7 @@ + #define HWCAP_JAVA 256 + #define HWCAP_IWMMXT 512 + #define HWCAP_CRUNCH 1024 ++#define HWCAP_THUMBEE 2048 + + #if defined(__KERNEL__) && !defined(__ASSEMBLY__) + /* diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb index 148d03fae3..d7f67edc7e 100644 --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb @@ -2,13 +2,15 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r7" +PR = "r8" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://procinfo.h \ file://export_falloc_h.patch \ file://make-3.82.patch \ - file://unifdef.patch" + file://unifdef.patch \ + file://arm-hwcap-add-new-entries.patch \ +" SRC_URI_append_hipox = " \ file://siocoutqsnd.patch \ From 21551be6e7a2d9abbee96ca983b10af5927887d0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 16 Mar 2011 12:16:12 -0700 Subject: [PATCH 427/509] gcc-4.5: Fix segfault in dwarf2out Currently following fails rm-oe-linux-uclibceabi-gcc -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mthumb-interwork -mno-thumb --sysroot=/oe/build-minimal-uclibc/minimal-uclibc-dev/sysroots/armv7a-oe-linux-uclibceabi -DHAVE_CONFIG_H -I. -I.. -DASN1_BUILDING -I./../gl -I./../gl -I./.. -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -pipe -g -MT coding.lo -MD -MP -MF .deps/coding.Tpo -c coding.c -o coding.o coding.c: In function 'asn1_length_der': coding.c:101:1: internal compiler error: in dwarf2out_frame_debug_expr, at dwarf2out.c:2221 Please submit a full bug report, with preprocessed source if appropriate. See for instructions. {standard input}: Assembler messages: Signed-off-by: Khem Raj Signed-off-by: Denys Dmytriyenko --- recipes/gcc/gcc-4.5.inc | 7 +- .../linaro/gcc-4.5-linaro-r99486.patch | 230 ++++++++++++++++++ .../linaro/gcc-4.5-linaro-r99487.patch | 42 ++++ .../linaro/gcc-4.5-linaro-r99488.patch | 22 ++ .../linaro/gcc-4.5-linaro-r99489.patch | 61 +++++ recipes/gcc/gcc-4.5/more-epilogues.patch | 83 ------- 6 files changed, 360 insertions(+), 85 deletions(-) create mode 100644 recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99486.patch create mode 100644 recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99487.patch create mode 100644 recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99488.patch create mode 100644 recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99489.patch delete mode 100644 recipes/gcc/gcc-4.5/more-epilogues.patch diff --git a/recipes/gcc/gcc-4.5.inc b/recipes/gcc/gcc-4.5.inc index 2e48f6a8fd..945ce3ff54 100644 --- a/recipes/gcc/gcc-4.5.inc +++ b/recipes/gcc/gcc-4.5.inc @@ -7,7 +7,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp libmpc libelf" NATIVEDEPS = "mpfr-native gmp-native libmpc-native" -INC_PR = "r38" +INC_PR = "r39" SRCREV = "170880" PV = "4.5" @@ -172,7 +172,10 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH} \ file://linaro/gcc-4.5-linaro-r99481.patch \ file://linaro/gcc-4.5-linaro-r99482.patch \ file://linaro/gcc-4.5-linaro-r99483.patch \ - file://more-epilogues.patch \ + file://linaro/gcc-4.5-linaro-r99486.patch \ + file://linaro/gcc-4.5-linaro-r99487.patch \ + file://linaro/gcc-4.5-linaro-r99488.patch \ + file://linaro/gcc-4.5-linaro-r99489.patch \ file://gcc-scalar-widening-pr45847.patch \ file://gcc-arm-volatile-bitfield-fix.patch \ " diff --git a/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99486.patch b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99486.patch new file mode 100644 index 0000000000..e6b58ac872 --- /dev/null +++ b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99486.patch @@ -0,0 +1,230 @@ +2011-03-09 Bernd Schmidt + + Issue #10649 + gcc/ + * dwarf2out.c (dwarf2out_begin_epilogue): Accept simplejumps + as well as returnjumps. + * cfganal.c (set_edge_can_fallthru_flag): Revert previous change + that tried to keep epilogue blocks adjacent. + +2011-02-03 Bernd Schmidt + + gcc/ + * function.c (prepare_shrink_wrap): New function. + (thread_prologue_and_epilogue_insns): Call it. + +=== modified file 'gcc/cfganal.c' +--- old/gcc/cfganal.c 2011-02-08 10:51:58 +0000 ++++ new/gcc/cfganal.c 2011-03-10 14:55:10 +0000 +@@ -271,37 +271,6 @@ + EDGE_SUCC (bb, 0)->flags |= EDGE_CAN_FALLTHRU; + EDGE_SUCC (bb, 1)->flags |= EDGE_CAN_FALLTHRU; + } +- /* dwarf2out expects that a NOTE_INSN_EPILOGUE_BEGIN is always paired +- with a return or a sibcall. Ensure that this remains the case if +- they are in different basic blocks. */ +- FOR_EACH_BB (bb) +- { +- edge e; +- edge_iterator ei; +- rtx insn, end; +- +- end = BB_END (bb); +- FOR_BB_INSNS (bb, insn) +- if (GET_CODE (insn) == NOTE +- && NOTE_KIND (insn) == NOTE_INSN_EPILOGUE_BEG +- && !(CALL_P (end) && SIBLING_CALL_P (end)) +- && !returnjump_p (end)) +- { +- basic_block other_bb = NULL; +- FOR_EACH_EDGE (e, ei, bb->succs) +- { +- if (e->flags & EDGE_FALLTHRU) +- other_bb = e->dest; +- else +- e->flags &= ~EDGE_CAN_FALLTHRU; +- } +- FOR_EACH_EDGE (e, ei, other_bb->preds) +- { +- if (!(e->flags & EDGE_FALLTHRU)) +- e->flags &= ~EDGE_CAN_FALLTHRU; +- } +- } +- } + } + + /* Find unreachable blocks. An unreachable block will have 0 in + +=== modified file 'gcc/dwarf2out.c' +--- old/gcc/dwarf2out.c 2011-02-08 10:51:58 +0000 ++++ new/gcc/dwarf2out.c 2011-03-10 14:55:10 +0000 +@@ -2782,10 +2782,10 @@ + dwarf2out_frame_debug_expr (insn, label); + } + +-/* Determine if we need to save and restore CFI information around this +- epilogue. If SIBCALL is true, then this is a sibcall epilogue. If +- we do need to save/restore, then emit the save now, and insert a +- NOTE_INSN_CFA_RESTORE_STATE at the appropriate place in the stream. */ ++/* Determine if we need to save and restore CFI information around ++ this epilogue. If we do need to save/restore, then emit the save ++ now, and insert a NOTE_INSN_CFA_RESTORE_STATE at the appropriate ++ place in the stream. */ + + void + dwarf2out_begin_epilogue (rtx insn) +@@ -2800,8 +2800,10 @@ + if (!INSN_P (i)) + continue; + +- /* Look for both regular and sibcalls to end the block. */ +- if (returnjump_p (i)) ++ /* Look for both regular and sibcalls to end the block. Various ++ optimization passes may cause us to jump to a common epilogue ++ tail, so we also accept simplejumps. */ ++ if (returnjump_p (i) || simplejump_p (i)) + break; + if (CALL_P (i) && SIBLING_CALL_P (i)) + break; + +=== modified file 'gcc/function.c' +--- old/gcc/function.c 2011-02-08 10:51:58 +0000 ++++ new/gcc/function.c 2011-03-10 14:55:10 +0000 +@@ -5038,6 +5038,127 @@ + return true; + return false; + } ++ ++/* Look for sets of call-saved registers in the first block of the ++ function, and move them down into successor blocks if the register ++ is used only on one path. This exposes more opportunities for ++ shrink-wrapping. ++ These kinds of sets often occur when incoming argument registers are ++ moved to call-saved registers because their values are live across ++ one or more calls during the function. */ ++ ++static void ++prepare_shrink_wrap (basic_block entry_block) ++{ ++ rtx insn, curr; ++ FOR_BB_INSNS_SAFE (entry_block, insn, curr) ++ { ++ basic_block next_bb; ++ edge e, live_edge; ++ edge_iterator ei; ++ rtx set, scan; ++ unsigned destreg, srcreg; ++ ++ if (!NONDEBUG_INSN_P (insn)) ++ continue; ++ set = single_set (insn); ++ if (!set) ++ continue; ++ ++ if (!REG_P (SET_SRC (set)) || !REG_P (SET_DEST (set))) ++ continue; ++ srcreg = REGNO (SET_SRC (set)); ++ destreg = REGNO (SET_DEST (set)); ++ if (hard_regno_nregs[srcreg][GET_MODE (SET_SRC (set))] > 1 ++ || hard_regno_nregs[destreg][GET_MODE (SET_DEST (set))] > 1) ++ continue; ++ ++ next_bb = entry_block; ++ scan = insn; ++ ++ for (;;) ++ { ++ live_edge = NULL; ++ FOR_EACH_EDGE (e, ei, next_bb->succs) ++ { ++ if (REGNO_REG_SET_P (df_get_live_in (e->dest), destreg)) ++ { ++ if (live_edge) ++ { ++ live_edge = NULL; ++ break; ++ } ++ live_edge = e; ++ } ++ } ++ if (!live_edge) ++ break; ++ /* We can sometimes encounter dead code. Don't try to move it ++ into the exit block. */ ++ if (live_edge->dest == EXIT_BLOCK_PTR) ++ break; ++ if (EDGE_COUNT (live_edge->dest->preds) > 1) ++ break; ++ while (scan != BB_END (next_bb)) ++ { ++ scan = NEXT_INSN (scan); ++ if (NONDEBUG_INSN_P (scan)) ++ { ++ rtx link; ++ HARD_REG_SET set_regs; ++ ++ CLEAR_HARD_REG_SET (set_regs); ++ note_stores (PATTERN (scan), record_hard_reg_sets, ++ &set_regs); ++ if (CALL_P (scan)) ++ IOR_HARD_REG_SET (set_regs, call_used_reg_set); ++ for (link = REG_NOTES (scan); link; link = XEXP (link, 1)) ++ if (REG_NOTE_KIND (link) == REG_INC) ++ record_hard_reg_sets (XEXP (link, 0), NULL, &set_regs); ++ ++ if (TEST_HARD_REG_BIT (set_regs, srcreg) ++ || reg_referenced_p (SET_DEST (set), ++ PATTERN (scan))) ++ { ++ scan = NULL_RTX; ++ break; ++ } ++ if (CALL_P (scan)) ++ { ++ rtx link = CALL_INSN_FUNCTION_USAGE (scan); ++ while (link) ++ { ++ rtx tmp = XEXP (link, 0); ++ if (GET_CODE (tmp) == USE ++ && reg_referenced_p (SET_DEST (set), tmp)) ++ break; ++ link = XEXP (link, 1); ++ } ++ if (link) ++ { ++ scan = NULL_RTX; ++ break; ++ } ++ } ++ } ++ } ++ if (!scan) ++ break; ++ next_bb = live_edge->dest; ++ } ++ ++ if (next_bb != entry_block) ++ { ++ rtx after = BB_HEAD (next_bb); ++ while (!NOTE_P (after) ++ || NOTE_KIND (after) != NOTE_INSN_BASIC_BLOCK) ++ after = NEXT_INSN (after); ++ emit_insn_after (PATTERN (insn), after); ++ delete_insn (insn); ++ } ++ } ++} ++ + #endif + + #ifdef HAVE_return +@@ -5215,6 +5336,8 @@ + bitmap_head bb_antic_flags; + bitmap_head bb_on_list; + ++ prepare_shrink_wrap (entry_edge->dest); ++ + bitmap_initialize (&bb_antic_flags, &bitmap_default_obstack); + bitmap_initialize (&bb_on_list, &bitmap_default_obstack); + + diff --git a/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99487.patch b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99487.patch new file mode 100644 index 0000000000..186c17717f --- /dev/null +++ b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99487.patch @@ -0,0 +1,42 @@ +2011-03-11 Andrew Stubbs + Michael Hope + Matthias Klose + + gcc/ + * function. (thread_prologue_and_epilogue_insns): Initialize + prologue_seq. + * opts.c (decode_options): Move flag_shrink_wrap to -O1. + +=== modified file 'gcc/function.c' +--- old/gcc/function.c 2011-03-10 14:55:10 +0000 ++++ new/gcc/function.c 2011-03-11 10:35:05 +0000 +@@ -5252,6 +5252,8 @@ + edge_iterator ei; + bitmap_head bb_flags; + ++ prologue_seq = NULL_RTX; ++ + df_analyze (); + + rtl_profile_for_bb (ENTRY_BLOCK_PTR); + +=== modified file 'gcc/opts.c' +--- old/gcc/opts.c 2011-02-08 10:51:58 +0000 ++++ new/gcc/opts.c 2011-03-11 10:35:05 +0000 +@@ -877,6 +877,7 @@ + flag_tree_copy_prop = opt1; + flag_tree_sink = opt1; + flag_tree_ch = opt1; ++ flag_shrink_wrap = opt1; + + /* -O2 optimizations. */ + opt2 = (optimize >= 2); +@@ -909,7 +910,6 @@ + flag_ipa_cp = opt2; + flag_ipa_sra = opt2; + flag_ee = opt2; +- flag_shrink_wrap = opt2; + + /* Track fields in field-sensitive alias analysis. */ + set_param_value ("max-fields-for-field-sensitive", + diff --git a/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99488.patch b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99488.patch new file mode 100644 index 0000000000..2f41a0a73c --- /dev/null +++ b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99488.patch @@ -0,0 +1,22 @@ +2011-03-03 Richard Sandiford + + gcc/ + * ee.c (reg_use_p): Handle subregs of promoted vars. + +=== modified file 'gcc/ee.c' +--- old/gcc/ee.c 2010-12-10 15:33:37 +0000 ++++ new/gcc/ee.c 2011-03-03 17:08:58 +0000 +@@ -209,7 +209,11 @@ + + *regno = REGNO (reg); + +- if (paradoxical_subreg_p (use)) ++ /* Non-paradoxical SUBREGs of promoted vars guarantee that the ++ upper (elided) bits of the inner register have a particular value. ++ For our purposes, such SUBREGs act as a full reference to the ++ inner register. */ ++ if (paradoxical_subreg_p (use) || SUBREG_PROMOTED_VAR_P (use)) + *size = GET_MODE_BITSIZE (GET_MODE (reg)); + else + *size = subreg_lsb (use) + GET_MODE_BITSIZE (GET_MODE (use)); + diff --git a/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99489.patch b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99489.patch new file mode 100644 index 0000000000..12fb56ad02 --- /dev/null +++ b/recipes/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99489.patch @@ -0,0 +1,61 @@ +2011-03-10 Ramana Radhakrishnan + + LP:730440 + PR target/47668 + gcc/ + * config/arm/arm.md (arm_movtas_ze): Use 'L' instead of 'c'. + gcc/testsuite/ + * gcc.target/arm/pr47688.c: New. + +=== modified file 'gcc/config/arm/arm.md' +--- old/gcc/config/arm/arm.md 2011-03-01 14:32:39 +0000 ++++ new/gcc/config/arm/arm.md 2011-03-11 14:26:34 +0000 +@@ -11133,13 +11133,15 @@ + [(set_attr "conds" "clob")] + ) + ++;; We only care about the lower 16 bits of the constant ++;; being inserted into the upper 16 bits of the register. + (define_insn "*arm_movtas_ze" + [(set (zero_extract:SI (match_operand:SI 0 "s_register_operand" "+r") + (const_int 16) + (const_int 16)) + (match_operand:SI 1 "const_int_operand" ""))] + "arm_arch_thumb2" +- "movt%?\t%0, %c1" ++ "movt%?\t%0, %L1" + [(set_attr "predicable" "yes") + (set_attr "length" "4")] + ) + +=== added file 'gcc/testsuite/gcc.target/arm/pr47688.c' +--- old/gcc/testsuite/gcc.target/arm/pr47688.c 1970-01-01 00:00:00 +0000 ++++ new/gcc/testsuite/gcc.target/arm/pr47688.c 2011-03-11 14:26:34 +0000 +@@ -0,0 +1,26 @@ ++/* { dg-options "-mthumb -O2" } */ ++/* { dg-require-effective-target arm_thumb2_ok } */ ++/* { dg-final { scan-assembler-not "-32768" } } */ ++ ++typedef union ++{ ++ unsigned long int u_32_value; ++ struct ++ { ++ unsigned short int u_16_value_0; ++ unsigned short int u_16_value_1; ++ } u_16_values; ++} my_union; ++ ++ ++unsigned long int Test(const unsigned short int wXe) ++{ ++ my_union dwCalcVal; ++ ++ dwCalcVal.u_16_values.u_16_value_0=wXe; ++ dwCalcVal.u_16_values.u_16_value_1=0x8000u; ++ ++ dwCalcVal.u_32_value /=3; ++ ++ return (dwCalcVal.u_32_value); ++} + diff --git a/recipes/gcc/gcc-4.5/more-epilogues.patch b/recipes/gcc/gcc-4.5/more-epilogues.patch deleted file mode 100644 index 64f1cf3751..0000000000 --- a/recipes/gcc/gcc-4.5/more-epilogues.patch +++ /dev/null @@ -1,83 +0,0 @@ -Index: a/gcc/cfgcleanup.c -=================================================================== ---- a/gcc/cfgcleanup.c (revision 315947) -+++ b/gcc/cfgcleanup.c (working copy) -@@ -1179,13 +1179,19 @@ flow_find_head_matching_sequence (basic_ - - while (true) - { -- -- /* Ignore notes. */ -+ /* Ignore notes, except NOTE_INSN_EPILOGUE_BEG. */ - while (!NONDEBUG_INSN_P (i1) && i1 != BB_END (bb1)) -- i1 = NEXT_INSN (i1); -- -+ { -+ if (NOTE_P (i1) && NOTE_KIND (i1) == NOTE_INSN_EPILOGUE_BEG) -+ break; -+ i1 = NEXT_INSN (i1); -+ } - while (!NONDEBUG_INSN_P (i2) && i2 != BB_END (bb2)) -- i2 = NEXT_INSN (i2); -+ { -+ if (NOTE_P (i2) && NOTE_KIND (i2) == NOTE_INSN_EPILOGUE_BEG) -+ break; -+ i2 = NEXT_INSN (i2); -+ } - - if (NOTE_P (i1) || NOTE_P (i2) - || JUMP_P (i1) || JUMP_P (i2)) -Index: a/gcc/cfglayout.c -=================================================================== ---- a/gcc/cfglayout.c (revision 315947) -+++ b/gcc/cfglayout.c (working copy) -@@ -1295,6 +1295,16 @@ cfg_layout_initialize (unsigned int flag - bb->flags |= BB_NON_LOCAL_GOTO_TARGET; - } - -+ FOR_EACH_BB (bb) -+ { -+ rtx insn; -+ FOR_BB_INSNS (bb, insn) -+ if (NOTE_P (insn) && NOTE_KIND (insn) == NOTE_INSN_EPILOGUE_BEG) -+ { -+ bb->flags |= BB_EPILOGUE_BEGIN; -+ break; -+ } -+ } - cleanup_cfg (CLEANUP_CFGLAYOUT | flags); - } - -Index: a/gcc/basic-block.h -=================================================================== ---- a/gcc/basic-block.h (revision 315947) -+++ b/gcc/basic-block.h (working copy) -@@ -332,7 +332,11 @@ enum bb_flags - - /* Set on blocks that cannot be threaded through. - Only used in cfgcleanup.c. */ -- BB_NONTHREADABLE_BLOCK = 1 << 11 -+ BB_NONTHREADABLE_BLOCK = 1 << 11, -+ -+ /* Set on blocks that have a NOTE_INSN_EPILOGUE_BEGIN. -+ Only used in cfglayout mode. */ -+ BB_EPILOGUE_BEGIN = 1 << 12 - }; - - /* Dummy flag for convenience in the hot/cold partitioning code. */ -Index: a/gcc/cfgrtl.c -=================================================================== ---- a/gcc/cfgrtl.c (revision 315947) -+++ b/gcc/cfgrtl.c (working copy) -@@ -2707,7 +2707,10 @@ cfg_layout_can_merge_blocks_p (basic_blo - not allow us to redirect an edge by replacing a table jump. */ - && (!JUMP_P (BB_END (a)) - || ((!optimize || reload_completed) -- ? simplejump_p (BB_END (a)) : onlyjump_p (BB_END (a))))); -+ ? simplejump_p (BB_END (a)) : onlyjump_p (BB_END (a)))) -+ /* Don't separate a NOTE_INSN_EPILOGUE_BEG from its returnjump. */ -+ && (!(b->flags & BB_EPILOGUE_BEGIN) -+ || returnjump_p (BB_END (b)))); - } - - /* Merge block A and B. The blocks must be mergeable. */ From db0b9d6a5a07fca1914474d1e6be2d694892755a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 17 Mar 2011 16:17:09 -0700 Subject: [PATCH 428/509] gcc-4.5: Fix the ARM ICE regression at -Os -g This holds off the patches that cause the ICE at -Os -g for now. The other workaround it to use -fno-shrink-wrap but it has to go into all affected recipes Signed-off-by: Khem Raj Signed-off-by: Denys Dmytriyenko --- recipes/gcc/gcc-4.5.inc | 9 +-- recipes/gcc/gcc-4.5/more-epilogues.patch | 83 ++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 recipes/gcc/gcc-4.5/more-epilogues.patch diff --git a/recipes/gcc/gcc-4.5.inc b/recipes/gcc/gcc-4.5.inc index 945ce3ff54..0effe1a41b 100644 --- a/recipes/gcc/gcc-4.5.inc +++ b/recipes/gcc/gcc-4.5.inc @@ -7,7 +7,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp libmpc libelf" NATIVEDEPS = "mpfr-native gmp-native libmpc-native" -INC_PR = "r39" +INC_PR = "r40" SRCREV = "170880" PV = "4.5" @@ -164,7 +164,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH} \ file://linaro/gcc-4.5-linaro-r99466.patch \ file://linaro/gcc-4.5-linaro-r99468.patch \ file://linaro/gcc-4.5-linaro-r99473.patch \ - file://linaro/gcc-4.5-linaro-r99474.patch \ +# file://linaro/gcc-4.5-linaro-r99474.patch \ file://linaro/gcc-4.5-linaro-r99475.patch \ file://linaro/gcc-4.5-linaro-r99478.patch \ file://linaro/gcc-4.5-linaro-r99479.patch \ @@ -172,10 +172,11 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH} \ file://linaro/gcc-4.5-linaro-r99481.patch \ file://linaro/gcc-4.5-linaro-r99482.patch \ file://linaro/gcc-4.5-linaro-r99483.patch \ - file://linaro/gcc-4.5-linaro-r99486.patch \ - file://linaro/gcc-4.5-linaro-r99487.patch \ +# file://linaro/gcc-4.5-linaro-r99486.patch \ +# file://linaro/gcc-4.5-linaro-r99487.patch \ file://linaro/gcc-4.5-linaro-r99488.patch \ file://linaro/gcc-4.5-linaro-r99489.patch \ + file://more-epilogues.patch \ file://gcc-scalar-widening-pr45847.patch \ file://gcc-arm-volatile-bitfield-fix.patch \ " diff --git a/recipes/gcc/gcc-4.5/more-epilogues.patch b/recipes/gcc/gcc-4.5/more-epilogues.patch new file mode 100644 index 0000000000..64f1cf3751 --- /dev/null +++ b/recipes/gcc/gcc-4.5/more-epilogues.patch @@ -0,0 +1,83 @@ +Index: a/gcc/cfgcleanup.c +=================================================================== +--- a/gcc/cfgcleanup.c (revision 315947) ++++ b/gcc/cfgcleanup.c (working copy) +@@ -1179,13 +1179,19 @@ flow_find_head_matching_sequence (basic_ + + while (true) + { +- +- /* Ignore notes. */ ++ /* Ignore notes, except NOTE_INSN_EPILOGUE_BEG. */ + while (!NONDEBUG_INSN_P (i1) && i1 != BB_END (bb1)) +- i1 = NEXT_INSN (i1); +- ++ { ++ if (NOTE_P (i1) && NOTE_KIND (i1) == NOTE_INSN_EPILOGUE_BEG) ++ break; ++ i1 = NEXT_INSN (i1); ++ } + while (!NONDEBUG_INSN_P (i2) && i2 != BB_END (bb2)) +- i2 = NEXT_INSN (i2); ++ { ++ if (NOTE_P (i2) && NOTE_KIND (i2) == NOTE_INSN_EPILOGUE_BEG) ++ break; ++ i2 = NEXT_INSN (i2); ++ } + + if (NOTE_P (i1) || NOTE_P (i2) + || JUMP_P (i1) || JUMP_P (i2)) +Index: a/gcc/cfglayout.c +=================================================================== +--- a/gcc/cfglayout.c (revision 315947) ++++ b/gcc/cfglayout.c (working copy) +@@ -1295,6 +1295,16 @@ cfg_layout_initialize (unsigned int flag + bb->flags |= BB_NON_LOCAL_GOTO_TARGET; + } + ++ FOR_EACH_BB (bb) ++ { ++ rtx insn; ++ FOR_BB_INSNS (bb, insn) ++ if (NOTE_P (insn) && NOTE_KIND (insn) == NOTE_INSN_EPILOGUE_BEG) ++ { ++ bb->flags |= BB_EPILOGUE_BEGIN; ++ break; ++ } ++ } + cleanup_cfg (CLEANUP_CFGLAYOUT | flags); + } + +Index: a/gcc/basic-block.h +=================================================================== +--- a/gcc/basic-block.h (revision 315947) ++++ b/gcc/basic-block.h (working copy) +@@ -332,7 +332,11 @@ enum bb_flags + + /* Set on blocks that cannot be threaded through. + Only used in cfgcleanup.c. */ +- BB_NONTHREADABLE_BLOCK = 1 << 11 ++ BB_NONTHREADABLE_BLOCK = 1 << 11, ++ ++ /* Set on blocks that have a NOTE_INSN_EPILOGUE_BEGIN. ++ Only used in cfglayout mode. */ ++ BB_EPILOGUE_BEGIN = 1 << 12 + }; + + /* Dummy flag for convenience in the hot/cold partitioning code. */ +Index: a/gcc/cfgrtl.c +=================================================================== +--- a/gcc/cfgrtl.c (revision 315947) ++++ b/gcc/cfgrtl.c (working copy) +@@ -2707,7 +2707,10 @@ cfg_layout_can_merge_blocks_p (basic_blo + not allow us to redirect an edge by replacing a table jump. */ + && (!JUMP_P (BB_END (a)) + || ((!optimize || reload_completed) +- ? simplejump_p (BB_END (a)) : onlyjump_p (BB_END (a))))); ++ ? simplejump_p (BB_END (a)) : onlyjump_p (BB_END (a)))) ++ /* Don't separate a NOTE_INSN_EPILOGUE_BEG from its returnjump. */ ++ && (!(b->flags & BB_EPILOGUE_BEGIN) ++ || returnjump_p (BB_END (b)))); + } + + /* Merge block A and B. The blocks must be mergeable. */ From cc4818fbafb82eeddd86ea81b14544da3cb9ccf4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 31 Mar 2011 07:48:29 -0700 Subject: [PATCH 429/509] conf/,gcc-common.inc: Add support for ARM hard float toolchain Rename ARM_FP_MODE to ARM_FP_ABI Set target fpu to hard for hardfp ARMv7 Use machine override to add base package arch instead of appending to OVERRIDES directly Pass --with-float option to gcc configure taking into account what float ABI is selected through ARM_FP_ABI Signed-off-by: Khem Raj Signed-off-by: Denys Dmytriyenko --- conf/distro/include/sane-toolchain.inc | 3 ++- conf/distro/minimal-uclibc.conf | 3 --- conf/machine/include/tune-cortexa8.inc | 6 +++--- recipes/gcc/gcc-common.inc | 12 ++++++++++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index 5882fd7a90..a174a070fd 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -73,7 +73,7 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc # Add BASE_PACKAGE_ARCH to the overrides list so that we can override the # ARM_INSTRUCTION_SET like below -OVERRIDES =. "${BASE_PACKAGE_ARCH}:" +MACHINE_OVERRIDES += "${FEED_ARCH}" # ARM920T and up can use thumb mode to decrease binary size at the expense of speed # (the complete story is a bit more nuanced due to cache starvation) @@ -114,6 +114,7 @@ TARGET_FPU_ppc405 ?= "soft" TARGET_FPU_armv6 ?= "hard" TARGET_FPU_armv6-novfp ?= "soft" TARGET_FPU_armv7a ?= "hard" +TARGET_FPU_armv7a-hardfp ?= "hard" TARGET_FPU_ppc603e ?= "hard" # webkit-gtk and cairo have alignment issues with double instructions on armv5 so diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf index b85ed1e7e1..487ae1bdd7 100644 --- a/conf/distro/minimal-uclibc.conf +++ b/conf/distro/minimal-uclibc.conf @@ -13,9 +13,6 @@ # DISTRO_NAME = "minimal-uclibc" -TARGET_FPU_arm = "soft" -TARGET_FPU_armeb = "soft" - LIBC = "uclibc" require conf/distro/minimal.conf diff --git a/conf/machine/include/tune-cortexa8.inc b/conf/machine/include/tune-cortexa8.inc index 2ac0ebfe45..5f556e0514 100644 --- a/conf/machine/include/tune-cortexa8.inc +++ b/conf/machine/include/tune-cortexa8.inc @@ -4,10 +4,10 @@ # [3] https://support.codesourcery.com/GNUToolchain/kbentry29 # Can be 'softfp' or 'hardfp' -ARM_FP_MODE ?= "softfp" +ARM_FP_ABI ?= "softfp" -ARM_FP_OPT = "${@['-mfloat-abi=softfp', '-mfloat-abi=hard'][bb.data.getVar('ARM_FP_MODE', d, 1) == 'hardfp']}" -ARM_FP_PACKAGESUFFIX = "${@['', '-hardfp'][bb.data.getVar('ARM_FP_MODE', d, 1) == 'hardfp']}" +ARM_FP_OPT = "${@['-mfloat-abi=softfp', '-mfloat-abi=hard'][bb.data.getVar('ARM_FP_ABI', d, 1) == 'hardfp']}" +ARM_FP_PACKAGESUFFIX = "${@['', '-hardfp'][bb.data.getVar('ARM_FP_ABI', d, 1) == 'hardfp']}" TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon ${ARM_FP_OPT}" diff --git a/recipes/gcc/gcc-common.inc b/recipes/gcc/gcc-common.inc index 9fd433b74f..d32b2ba002 100644 --- a/recipes/gcc/gcc-common.inc +++ b/recipes/gcc/gcc-common.inc @@ -15,8 +15,16 @@ COMPATIBLE_TARGET_SYS ?= "(?!nios2)" # for building for the new host part. So only obey TARGET_FPU for the # real target. def get_gcc_fpu_setting(bb, d): - if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ] and bb.data.getVar('TARGET_OS', d, 1).find('linux') >= 0 : - return "--with-float=soft" + if bb.data.getVar('TARGET_FPU', d, True) in [ 'soft', 'hard'] and bb.data.getVar('TARGET_OS', d, True).find('linux') >= 0 : + # ARM_FP_ABI could be either 'hardfp' or 'softfp' + arm_fpabi = bb.data.getVar('ARM_FP_ABI', d, True) or "" + if arm_fpabi != "": + if arm_fpabi == "hardfp": + # reset it to whatever gcc --with-float configure expects which is either 'softfp' or 'hard' + arm_fpabi = "hard" + return "--with-float=" + arm_fpabi + else: + return "--with-float=" + bb.data.getVar('TARGET_FPU', d, True) return "" def get_gcc_mips_plt_setting(bb, d): From 422d735bf59e055d2b5dc859d4748aa138f4347c Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 3 May 2011 08:09:44 -0700 Subject: [PATCH 430/509] gcc-package-target.inc: Switch to TARGET_PREFIX in symlinks When TARGET_PREFIX and TARGET_SYS didn't match up, the symlinks we made were invalid. TARGET_PREFIX is what we use when configuring so it's what we should be using here. Signed-off-by: Tom Rini Signed-off-by: Denys Dmytriyenko --- recipes/gcc/gcc-package-target.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/gcc/gcc-package-target.inc b/recipes/gcc/gcc-package-target.inc index 7d3f4aef6d..b2a5fb87bd 100644 --- a/recipes/gcc/gcc-package-target.inc +++ b/recipes/gcc/gcc-package-target.inc @@ -156,16 +156,16 @@ GROUP ( libgcc_s.so.1 libgcc.a )" > ${D}${libdir}/libgcc_s.so rm -f ${TARGET_ARCH}-*${TARGET_ARCH}-* # Symlinks so we can use these trivially on the target - ln -sf ${TARGET_SYS}-g77 g77 || true - ln -sf ${TARGET_SYS}-gfortran gfortran || true - ln -sf ${TARGET_SYS}-g++ g++ - ln -sf ${TARGET_SYS}-gcc gcc + ln -sf ${TARGET_PREFIX}g77 g77 || true + ln -sf ${TARGET_PREFIX}gfortran gfortran || true + ln -sf ${TARGET_PREFIX}g++ g++ + ln -sf ${TARGET_PREFIX}gcc gcc ln -sf g77 f77 || true ln -sf gfortran f95 || true ln -sf g++ c++ ln -sf gcc cc - ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${base_libdir}/cpp - ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${bindir}/cpp + ln -sf ${bindir}/${TARGET_PREFIX}cpp ${D}${base_libdir}/cpp + ln -sf ${bindir}/${TARGET_PREFIX}cpp ${D}${bindir}/cpp # Remove precompiled c++ headers as they are really big rm -rf ${D}${includedir}/c++/${BINV}/${TARGET_SYS}/bits/*.gch From 79ab6b3a6f85d78aa823f41a8efa95a404935db2 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Thu, 10 Feb 2011 08:27:10 -0800 Subject: [PATCH 431/509] gcc: Fix broken g77 link Signed-off-by: Steve Sakoman Acked-by: Khem Raj Signed-off-by: Koen Kooi Signed-off-by: Denys Dmytriyenko --- recipes/gcc/gcc-4.5.inc | 3 ++- recipes/gcc/gcc-package-target.inc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/gcc/gcc-4.5.inc b/recipes/gcc/gcc-4.5.inc index 0effe1a41b..d7f6b4df0e 100644 --- a/recipes/gcc/gcc-4.5.inc +++ b/recipes/gcc/gcc-4.5.inc @@ -7,7 +7,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp libmpc libelf" NATIVEDEPS = "mpfr-native gmp-native libmpc-native" -INC_PR = "r40" +INC_PR = "r41" SRCREV = "170880" PV = "4.5" @@ -186,6 +186,7 @@ SRC_URI_append_mips64el = " file://mips64-nomultilib.patch " # Language Overrides FORTRAN = "" +FORTRAN_linux-gnueabi = ",fortran" JAVA = "" S = "${WORKDIR}/${BRANCH}" diff --git a/recipes/gcc/gcc-package-target.inc b/recipes/gcc/gcc-package-target.inc index b2a5fb87bd..cc2b48b0d9 100644 --- a/recipes/gcc/gcc-package-target.inc +++ b/recipes/gcc/gcc-package-target.inc @@ -156,7 +156,7 @@ GROUP ( libgcc_s.so.1 libgcc.a )" > ${D}${libdir}/libgcc_s.so rm -f ${TARGET_ARCH}-*${TARGET_ARCH}-* # Symlinks so we can use these trivially on the target - ln -sf ${TARGET_PREFIX}g77 g77 || true + ln -sf ${TARGET_PREFIX}gfortran g77 || true ln -sf ${TARGET_PREFIX}gfortran gfortran || true ln -sf ${TARGET_PREFIX}g++ g++ ln -sf ${TARGET_PREFIX}gcc gcc From 04e35ce03eb15a64a1f9cc1a76868afe5d20b1bc Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Mon, 1 Aug 2011 10:26:17 -0400 Subject: [PATCH 432/509] uhd-firmware : Update recipe to package 3.2.1. Signed-off-by: Philip Balister --- recipes/uhd/uhd-firmware.inc | 3 +++ recipes/uhd/uhd-firmware_003.001.000.bb | 7 ------- recipes/uhd/uhd-firmware_003.002.001.bb | 7 +++++++ 3 files changed, 10 insertions(+), 7 deletions(-) delete mode 100644 recipes/uhd/uhd-firmware_003.001.000.bb create mode 100644 recipes/uhd/uhd-firmware_003.002.001.bb diff --git a/recipes/uhd/uhd-firmware.inc b/recipes/uhd/uhd-firmware.inc index b3c24ae7f6..bdb68bdef1 100644 --- a/recipes/uhd/uhd-firmware.inc +++ b/recipes/uhd/uhd-firmware.inc @@ -14,6 +14,9 @@ S = ${WORKDIR}/UHD-images-${PV} do_install() { install -d ${D}${datadir}/uhd/images + install -d ${D}${datadir}/uhd/images/bit + install -m 0644 ${S}/share/uhd/images/bit/* ${D}${datadir}/uhd/images/bit + rm -rf ${S}/share/uhd/images/bit install -m 0644 ${S}/share/uhd/images/* ${D}${datadir}/uhd/images } diff --git a/recipes/uhd/uhd-firmware_003.001.000.bb b/recipes/uhd/uhd-firmware_003.001.000.bb deleted file mode 100644 index 5d30806798..0000000000 --- a/recipes/uhd/uhd-firmware_003.001.000.bb +++ /dev/null @@ -1,7 +0,0 @@ -require recipes/uhd/uhd-firmware.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "0d6a6792c6b98e9163d67cb62bf29dce" -SRC_URI[sha256sum] = "3b25726946026c6d25061403e3343d72b34cc41e7e44026b272510379d01233a" - diff --git a/recipes/uhd/uhd-firmware_003.002.001.bb b/recipes/uhd/uhd-firmware_003.002.001.bb new file mode 100644 index 0000000000..654336b538 --- /dev/null +++ b/recipes/uhd/uhd-firmware_003.002.001.bb @@ -0,0 +1,7 @@ +require recipes/uhd/uhd-firmware.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "1894391da027884e5eed474606250be9" +SRC_URI[sha256sum] = "c194d9e30bb02225de623400bdba9be9200f70a57c6220506bc0b051eed8fae8" + From 3417433bd208571d5ae149198d1eec2ac16e0581 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Mon, 1 Aug 2011 10:27:19 -0400 Subject: [PATCH 433/509] uhd : Update recipe to build 3.2.1 from git repo. Signed-off-by: Philip Balister --- recipes/uhd/uhd.inc | 6 +++--- recipes/uhd/uhd_git.bb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/uhd/uhd.inc b/recipes/uhd/uhd.inc index 43bf038b58..8712ef6ae5 100644 --- a/recipes/uhd/uhd.inc +++ b/recipes/uhd/uhd.inc @@ -2,10 +2,10 @@ DESCRIPTION = "Universal Hardware Driver for Ettus Research products." HOMEPAGE = "http://www.ettus.com" LICENSE = "GPLV3+" -DEPENDS = "git-native python-cheetah-native boost libusb1 uhd-firmware" +DEPENDS = "git-native python-cheetah-native boost libusb1 uhd-firmware orc-native" RDEPENDS_${PN} += "uhd-firmware" -INC_PR = "r5" +INC_PR = "r6" inherit cmake @@ -24,6 +24,6 @@ FILES_${PN}-examples = "${datadir}/uhd/examples/*" OECMAKE_BUILDPATH = "${S}/build" OECMAKE_SOURCEPATH = "${S}" -EXTRA_OECMAKE = "-DENABLE_USRP_E100=TRUE -DENABLE_USRP_E_UTILS=TRUE" +EXTRA_OECMAKE = "-DENABLE_E100=TRUE -DENABLE_USRP_E_UTILS=TRUE" EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}" diff --git a/recipes/uhd/uhd_git.bb b/recipes/uhd/uhd_git.bb index 80f32b78f5..e1d2e99b28 100644 --- a/recipes/uhd/uhd_git.bb +++ b/recipes/uhd/uhd_git.bb @@ -1,8 +1,8 @@ require recipes/uhd/uhd.inc -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" SRC_URI = "git://ettus.sourcerepo.com/ettus/uhd.git;protocol=git" S = "${WORKDIR}/git/host" -SRCREV = "0aff497dacc9cc4eba5d800cc46343da083cfdf1" +SRCREV = "fc349d30507620baca935e75e68a9554b40d427c" From 8c9727909b27ad358bdd44ae22e9eccec93debbb Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Wed, 1 Jun 2011 11:47:13 -0400 Subject: [PATCH 434/509] asterisk : Create log file directory in init script. If the log file is created on a tmpfs, the init script must the logfile directory and chown it to the asterisk user each time asterisk starts. Signed-off-by: Philip Balister --- recipes/asterisk/asterisk-1.4.39.2/init | 3 +++ recipes/asterisk/asterisk_1.4.39.2.bb | 1 + 2 files changed, 4 insertions(+) diff --git a/recipes/asterisk/asterisk-1.4.39.2/init b/recipes/asterisk/asterisk-1.4.39.2/init index d53a9a1e5e..6436113d41 100644 --- a/recipes/asterisk/asterisk-1.4.39.2/init +++ b/recipes/asterisk/asterisk-1.4.39.2/init @@ -6,6 +6,7 @@ # asterisk=/usr/sbin/asterisk pidfile=/var/run/asterisk/asterisk.pid +logdir=/var/log/asterisk asterisk_args="-npqT -U asterisk -G asterisk" test -x "$asterisk" || exit 0 @@ -13,6 +14,8 @@ test -x "$asterisk" || exit 0 case "$1" in start) echo -n "Starting Asterisk" + mkdir -p $logdir + chown asterisk:asterisk $logdir start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args echo "." ;; diff --git a/recipes/asterisk/asterisk_1.4.39.2.bb b/recipes/asterisk/asterisk_1.4.39.2.bb index 90877c6070..41cb93f604 100644 --- a/recipes/asterisk/asterisk_1.4.39.2.bb +++ b/recipes/asterisk/asterisk_1.4.39.2.bb @@ -7,6 +7,7 @@ PRIORITY = "optional" SECTION = "console/telephony" DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis" #RRECOMMENDS_${PN} = "logrotate" +PR = "r1" SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${PV}.tar.gz \ # file://sounds.xml.patch \ From d545e48d6b7b79010f87f9fc169e9dd28a569c9b Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Wed, 18 May 2011 15:02:50 -0400 Subject: [PATCH 435/509] task-sdk-gnuradio-native.bb : GNU Radio (with UHD) no longer needs sdcc. Signed-off-by: Philip Balister --- recipes/tasks/task-sdk-gnuradio-native.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/tasks/task-sdk-gnuradio-native.bb b/recipes/tasks/task-sdk-gnuradio-native.bb index a671fa9990..f657b4a6f0 100644 --- a/recipes/tasks/task-sdk-gnuradio-native.bb +++ b/recipes/tasks/task-sdk-gnuradio-native.bb @@ -1,6 +1,6 @@ require task-sdk-native.inc -DEPENDS += "libusb1 guile fftw python alsa-lib jack boost cppunit sdcc swig \ +DEPENDS += "libusb1 guile fftw python alsa-lib jack boost cppunit swig \ python python-numpy git util-linux-ng gsl python-cheetah git \ distcc libdbd-sqlite-perl libdbix-simple-perl pkgconfig \ " @@ -12,13 +12,13 @@ RDEPENDS_${PN} += "libusb1-dev guile-dev fftwf-dev alsa-dev alsa-lib-dev jack-de python-pprint python-compiler python-pkgutil python-pydoc \ python-mmap python-netclient python-difflib python-compile \ python-cheetah python-netserver python-xml cmake \ - boost boost-dev gsl-dev sdcc git distcc pkgconfig-dev \ + boost boost-dev gsl-dev git distcc pkgconfig-dev \ util-linux-ng util-linux-ng-swaponoff \ " RPROVIDES_${PN} = "task-native-gnuradio-sdk" -PR = "${INC_PR}.15" +PR = "${INC_PR}.16" ALLOW_EMPTY = "1" PACKAGES = "${PN}" From 000517c858d2099b280eadd5efa6bc3ddd2675ff Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Tue, 2 Aug 2011 14:29:10 -0400 Subject: [PATCH 436/509] task-sdk-gnuradio-native : Remove distcc. I shouldn't have added this to the sdk. Deal with this at the image level. Signed-off-by: Philip Balister --- recipes/tasks/task-sdk-gnuradio-native.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/tasks/task-sdk-gnuradio-native.bb b/recipes/tasks/task-sdk-gnuradio-native.bb index f657b4a6f0..b66dd79c1c 100644 --- a/recipes/tasks/task-sdk-gnuradio-native.bb +++ b/recipes/tasks/task-sdk-gnuradio-native.bb @@ -2,7 +2,7 @@ require task-sdk-native.inc DEPENDS += "libusb1 guile fftw python alsa-lib jack boost cppunit swig \ python python-numpy git util-linux-ng gsl python-cheetah git \ - distcc libdbd-sqlite-perl libdbix-simple-perl pkgconfig \ + libdbd-sqlite-perl libdbix-simple-perl pkgconfig \ " RDEPENDS_${PN} += "libusb1-dev guile-dev fftwf-dev alsa-dev alsa-lib-dev jack-dev \ @@ -12,13 +12,13 @@ RDEPENDS_${PN} += "libusb1-dev guile-dev fftwf-dev alsa-dev alsa-lib-dev jack-de python-pprint python-compiler python-pkgutil python-pydoc \ python-mmap python-netclient python-difflib python-compile \ python-cheetah python-netserver python-xml cmake \ - boost boost-dev gsl-dev git distcc pkgconfig-dev \ + boost boost-dev gsl-dev git pkgconfig-dev \ util-linux-ng util-linux-ng-swaponoff \ " RPROVIDES_${PN} = "task-native-gnuradio-sdk" -PR = "${INC_PR}.16" +PR = "${INC_PR}.17" ALLOW_EMPTY = "1" PACKAGES = "${PN}" From 7ccf0492a8f2918873ccc24f489632d168145053 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Fri, 13 May 2011 13:21:45 -0400 Subject: [PATCH 437/509] gnuradio : Update rev to latest master and add patch to really disable volk. Signed-off-by: Philip Balister --- ...traces-of-volk-from-configure-for-OE.patch | 42 +++++++++++++++++++ recipes/gnuradio/gnuradio_git.bb | 9 ++-- 2 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 recipes/gnuradio/gnuradio-git/0001-volk-Remove-all-traces-of-volk-from-configure-for-OE.patch diff --git a/recipes/gnuradio/gnuradio-git/0001-volk-Remove-all-traces-of-volk-from-configure-for-OE.patch b/recipes/gnuradio/gnuradio-git/0001-volk-Remove-all-traces-of-volk-from-configure-for-OE.patch new file mode 100644 index 0000000000..e2f674b752 --- /dev/null +++ b/recipes/gnuradio/gnuradio-git/0001-volk-Remove-all-traces-of-volk-from-configure-for-OE.patch @@ -0,0 +1,42 @@ +From 857c38eb8201e2a34b524fcabea21b1accbdb288 Mon Sep 17 00:00:00 2001 +From: Philip Balister +Date: Fri, 13 May 2011 12:26:14 -0400 +Subject: [PATCH] volk : Remove all traces of volk from configure for OE builds. + +Signed-off-by: Philip Balister +--- + Makefile.common | 4 ++-- + configure.ac | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.common b/Makefile.common +index 20b8a78..aeda1dd 100644 +--- a/Makefile.common ++++ b/Makefile.common +@@ -92,8 +92,8 @@ GRUEL_INCLUDES = @gruel_INCLUDES@ + GRUEL_LA = @gruel_LA@ + + # How to link in the VOLK library from inside the tree +-VOLK_INCLUDES = @volk_INCLUDES@ +-VOLK_LA = @volk_LA@ ++#VOLK_INCLUDES = @volk_INCLUDES@ ++#VOLK_LA = @volk_LA@ + + # How to link in the USRP library from inside the tree + USRP_INCLUDES = @usrp_INCLUDES@ +diff --git a/configure.ac b/configure.ac +index 73ebbd6..e5cf7a2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -349,7 +349,7 @@ AC_ARG_ENABLE( + + build_dirs="config" + GRC_GRUEL dnl must come first +-GRC_VOLK ++dnl GRC_VOLK + GRC_GCELL + GRC_GNURADIO_CORE + GRC_USRP +-- +1.7.3.4 + diff --git a/recipes/gnuradio/gnuradio_git.bb b/recipes/gnuradio/gnuradio_git.bb index bc18d9e765..cf3bf5d408 100644 --- a/recipes/gnuradio/gnuradio_git.bb +++ b/recipes/gnuradio/gnuradio_git.bb @@ -1,15 +1,18 @@ require recipes/gnuradio/gnuradio.inc PR = "${INC_PR}.1" -PV = "3.3.0-${PR}+gitr${SRCREV}" +PV = "3.4.0-${PR}+gitr${SRCREV}" -SRCREV = "cdca1c917626f7c63f820da921a17187efc92cd5" +SRCREV = "f53fef3d2bc39b2020b8bce3d88b43569dd16605" # Make it easy to test against developer repos and branches GIT_REPO = "gnuradio.git" -GIT_BRANCH = "next" +GIT_BRANCH = "master" + +FILESPATHPKG_prepend = "gnuradio-git:" SRC_URI = "git://gnuradio.org/git/${GIT_REPO};branch=${GIT_BRANCH};protocol=http \ + file://0001-volk-Remove-all-traces-of-volk-from-configure-for-OE.patch \ " S="${WORKDIR}/git" From 1e861766b4c18eda933717dd2068f582d0fe71d1 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Tue, 9 Aug 2011 10:28:10 -0400 Subject: [PATCH 438/509] gnuradio : Bump SRCREV to current version. Fix pacakging warning. Signed-off-by: Philip Balister --- recipes/gnuradio/gnuradio.inc | 3 ++- recipes/gnuradio/gnuradio_git.bb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes/gnuradio/gnuradio.inc b/recipes/gnuradio/gnuradio.inc index d114f89eac..bd091f666d 100644 --- a/recipes/gnuradio/gnuradio.inc +++ b/recipes/gnuradio/gnuradio.inc @@ -4,7 +4,7 @@ SECTION = "apps" PRIORITY = "optional" LICENSE = "GPLv3" DEPENDS = "uhd gsl guile-native fftwf python alsa-lib boost cppunit swig-native python-numpy" -INC_PR = "r8" +INC_PR = "r9" inherit distutils-base autotools pkgconfig @@ -39,6 +39,7 @@ FILES_${PN}-examples = "${datadir}/gnuradio/examples" FILES_${PN}-grc = "${datadir}/gnuradio/grc" FILES_${PN}-conf = "${sysconfdir}/gnuradio" +FILES_${PN} += "${datadir}/gnuradio" FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/*" FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/.debug \ ${PYTHON_SITEPACKAGES_DIR}/gnuradio/*/.debug \ diff --git a/recipes/gnuradio/gnuradio_git.bb b/recipes/gnuradio/gnuradio_git.bb index cf3bf5d408..250ba5da9b 100644 --- a/recipes/gnuradio/gnuradio_git.bb +++ b/recipes/gnuradio/gnuradio_git.bb @@ -1,9 +1,9 @@ require recipes/gnuradio/gnuradio.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" PV = "3.4.0-${PR}+gitr${SRCREV}" -SRCREV = "f53fef3d2bc39b2020b8bce3d88b43569dd16605" +SRCREV = "62768eedf8f68680ef3a672a27025227e22ccbb0" # Make it easy to test against developer repos and branches GIT_REPO = "gnuradio.git" From 01300ab293fa77f7bcb87014f5f7f4408824bee0 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Sat, 16 Apr 2011 20:20:40 -0700 Subject: [PATCH 439/509] glib-2.0: Add recipe for 2.28.5 Signed-off-by: Steve Sakoman Signed-off-by: Koen Kooi --- .../60_wait-longer-for-threads-to-die.patch | 26 ++++++ .../glib-2.0-2.28.5/configure-ipv6.patch | 92 +++++++++++++++++++ .../glib-2.0-2.28.5/configure-libtool.patch | 30 ++++++ .../glib-2.0-2.28.5/g_once_init_enter.patch | 11 +++ .../gatomic-proper-pointer-get-cast.patch | 12 +++ .../glib-mkenums-interpreter.patch | 10 ++ ...x-compilation-with-no-builtin-atomic.patch | 25 +++++ recipes/glib-2.0/glib-2.0_2.28.5.bb | 76 +++++++++++++++ 8 files changed, 282 insertions(+) create mode 100644 recipes/glib-2.0/glib-2.0-2.28.5/60_wait-longer-for-threads-to-die.patch create mode 100644 recipes/glib-2.0/glib-2.0-2.28.5/configure-ipv6.patch create mode 100644 recipes/glib-2.0/glib-2.0-2.28.5/configure-libtool.patch create mode 100644 recipes/glib-2.0/glib-2.0-2.28.5/g_once_init_enter.patch create mode 100644 recipes/glib-2.0/glib-2.0-2.28.5/gatomic-proper-pointer-get-cast.patch create mode 100644 recipes/glib-2.0/glib-2.0-2.28.5/glib-mkenums-interpreter.patch create mode 100644 recipes/glib-2.0/glib-2.0-2.28.5/libglib2-fix-compilation-with-no-builtin-atomic.patch create mode 100644 recipes/glib-2.0/glib-2.0_2.28.5.bb diff --git a/recipes/glib-2.0/glib-2.0-2.28.5/60_wait-longer-for-threads-to-die.patch b/recipes/glib-2.0/glib-2.0-2.28.5/60_wait-longer-for-threads-to-die.patch new file mode 100644 index 0000000000..02fe9ff0ab --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-2.28.5/60_wait-longer-for-threads-to-die.patch @@ -0,0 +1,26 @@ +--- glib/tests/threadpool-test.c.old 2008-02-12 06:11:21.000000000 +0100 ++++ glib/tests/threadpool-test.c 2008-02-12 06:11:52.000000000 +0100 +@@ -5,8 +5,8 @@ + + #include + +-#define DEBUG_MSG(x) +-/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); */ ++/* #define DEBUG_MSG(x) */ ++#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); + + #define WAIT 5 /* seconds */ + #define MAX_THREADS 10 +@@ -124,10 +124,10 @@ + DEBUG_MSG (("[unused] stopping unused threads")); + g_thread_pool_stop_unused_threads (); + +- DEBUG_MSG (("[unused] waiting ONE second for threads to die")); ++ DEBUG_MSG (("[unused] waiting FIVE second for threads to die")); + + /* Some time for threads to die. */ +- g_usleep (G_USEC_PER_SEC); ++ g_usleep (5 * G_USEC_PER_SEC); + + DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist", + g_thread_pool_get_num_unused_threads (), diff --git a/recipes/glib-2.0/glib-2.0-2.28.5/configure-ipv6.patch b/recipes/glib-2.0/glib-2.0-2.28.5/configure-ipv6.patch new file mode 100644 index 0000000000..548e0dc650 --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-2.28.5/configure-ipv6.patch @@ -0,0 +1,92 @@ +From a619a217e3e5aa5345db631213aec5a3684a3001 Mon Sep 17 00:00:00 2001 +Subject: [PATCH] autodetect in6addr_{any,loopback} availability + +Fixes linking error on systems which choose not to support ipv6: +./.libs/libgio-2.0.so: undefined reference to `in6addr_loopback' +./.libs/libgio-2.0.so: undefined reference to `in6addr_any' + +Signed-off-by: Bernhard Reutner-Fischer +--- + configure.ac | 31 +++++++++++++++++++++++++++++++ + gio/ginetaddress.c | 16 ++++++++++++++-- + 2 files changed, 45 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7114014..023db49 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1019,6 +1019,37 @@ if test $glib_native_win32 = no; then + AC_SUBST(LIBASYNCNS_LIBADD) + fi + ++dnl handle --disable-ipv6 ++AC_ARG_ENABLE(ipv6, AC_HELP_STRING([--disable-ipv6],[Disable IPv6 support])) ++if test "$ipv6" != "no"; then ++ AC_DEFINE(HAVE_IPV6, 1, [Define if IPv6 is available]) ++ ++ AC_MSG_CHECKING([for struct in6addr_any]) ++ AC_TRY_LINK( ++ [#define IN_AUTOCONF ++ #include ++ #include ++ #include ], ++ [struct in6_addr a = in6addr_any; ++ return a.s6_addr[0];], ++ [AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_IN6ADDR_ANY, 1, [Define if in6addr_any is available])], ++ [AC_MSG_RESULT(no)] ++ ) ++ AC_MSG_CHECKING([for struct in6addr_loopback]) ++ AC_TRY_LINK( ++ [#define IN_AUTOCONF ++ #include ++ #include ++ #include ], ++ [struct in6_addr a = in6addr_loopback; ++ return a.s6_addr[0];], ++ [AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_IN6ADDR_LOOPBACK, 1, [Define if in6addr_loopback is available])], ++ [AC_MSG_RESULT(no)] ++ ) ++fi ++ + case $host in + *-*-solaris* ) + AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris) +diff --git a/gio/ginetaddress.c b/gio/ginetaddress.c +index 0f67e4f..ed29be2 100644 +--- a/gio/ginetaddress.c ++++ b/gio/ginetaddress.c +@@ -484,7 +484,13 @@ g_inet_address_new_loopback (GSocketFamily family) + return g_inet_address_new_from_bytes (addr, family); + } + else +- return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family); ++ { ++#ifdef HAVE_IN6ADDR_LOOPBACK ++ return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family); ++#else ++ return NULL; ++#endif ++ } + } + + /** +@@ -511,7 +517,13 @@ g_inet_address_new_any (GSocketFamily family) + return g_inet_address_new_from_bytes (addr, family); + } + else +- return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family); ++ { ++#ifdef HAVE_IN6ADDR_ANY ++ return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family); ++#else ++ return NULL; ++#endif ++ } + } + + +-- +1.7.2.3 + diff --git a/recipes/glib-2.0/glib-2.0-2.28.5/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.28.5/configure-libtool.patch new file mode 100644 index 0000000000..e4e9d213bb --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-2.28.5/configure-libtool.patch @@ -0,0 +1,30 @@ +diff -uNr glib-2.28.0.orig//configure.ac glib-2.28.0/configure.ac +--- glib-2.28.0.orig//configure.ac 2011-02-08 05:53:25.000000000 +0100 ++++ glib-2.28.0/configure.ac 2011-02-15 15:07:54.683976837 +0100 +@@ -1378,7 +1378,7 @@ + G_MODULE_LDFLAGS= + else + export SED +- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++ G_MODULE_LDFLAGS=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + fi + dnl G_MODULE_IMPL= don't reset, so cmd-line can override + G_MODULE_NEED_USCORE=0 +@@ -1443,7 +1443,7 @@ + LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" + dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness + echo "void glib_plugin_test(void) { }" > plugin.c +- ${SHELL} ./libtool --mode=compile ${CC} -shared \ ++ ${SHELL} $host_alias-libtool --mode=compile ${CC} -shared \ + -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null + AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], + glib_cv_rtldglobal_broken,[ +@@ -1517,7 +1517,7 @@ + + AC_MSG_CHECKING(for the suffix of module shared libraries) + export SED +-shrext_cmds=`./libtool --config | grep '^shrext_cmds='` ++shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='` + eval $shrext_cmds + module=yes eval std_shrext=$shrext_cmds + # chop the initial dot diff --git a/recipes/glib-2.0/glib-2.0-2.28.5/g_once_init_enter.patch b/recipes/glib-2.0/glib-2.0-2.28.5/g_once_init_enter.patch new file mode 100644 index 0000000000..58e410884f --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-2.28.5/g_once_init_enter.patch @@ -0,0 +1,11 @@ +--- glib-2.22.1/glib/gthread.h.orig 2009-10-13 22:53:23.000000000 +0200 ++++ glib-2.22.1/glib/gthread.h 2009-10-13 23:34:59.000000000 +0200 +@@ -341,7 +341,7 @@ + G_INLINE_FUNC gboolean + g_once_init_enter (volatile gsize *value_location) + { +- if G_LIKELY ((gpointer) g_atomic_pointer_get (value_location) != NULL) ++ if G_LIKELY ((gpointer) g_atomic_pointer_get ((volatile gpointer *)value_location) != NULL) + return FALSE; + else + return g_once_init_enter_impl (value_location); diff --git a/recipes/glib-2.0/glib-2.0-2.28.5/gatomic-proper-pointer-get-cast.patch b/recipes/glib-2.0/glib-2.0-2.28.5/gatomic-proper-pointer-get-cast.patch new file mode 100644 index 0000000000..5a8e37d53b --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-2.28.5/gatomic-proper-pointer-get-cast.patch @@ -0,0 +1,12 @@ +diff -uri glib-2.26.1.orig/glib/gatomic.h glib-2.26.1/glib/gatomic.h +--- glib-2.26.1.orig/glib/gatomic.h 2010-07-11 05:56:45.000000000 +0200 ++++ glib-2.26.1/glib/gatomic.h 2010-12-01 16:20:33.140009635 +0100 +@@ -70,7 +70,7 @@ + (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval))) + # define g_atomic_pointer_get(atomic) \ + ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \ +- (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic))) ++ (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void G_GNUC_MAY_ALIAS *) (atomic))) + # define g_atomic_pointer_set(atomic, newval) \ + ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \ + (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval))) diff --git a/recipes/glib-2.0/glib-2.0-2.28.5/glib-mkenums-interpreter.patch b/recipes/glib-2.0/glib-2.0-2.28.5/glib-mkenums-interpreter.patch new file mode 100644 index 0000000000..d8407b81f8 --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-2.28.5/glib-mkenums-interpreter.patch @@ -0,0 +1,10 @@ +Index: glib-2.28.0/gobject/glib-mkenums.in +=================================================================== +--- glib-2.28.0.orig/gobject/glib-mkenums.in ++++ glib-2.28.0/gobject/glib-mkenums.in +@@ -1,4 +1,4 @@ +-#! @PERL_PATH@ ++#! /usr/bin/env perl + + use warnings; + use File::Basename; diff --git a/recipes/glib-2.0/glib-2.0-2.28.5/libglib2-fix-compilation-with-no-builtin-atomic.patch b/recipes/glib-2.0/glib-2.0-2.28.5/libglib2-fix-compilation-with-no-builtin-atomic.patch new file mode 100644 index 0000000000..39c0510781 --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-2.28.5/libglib2-fix-compilation-with-no-builtin-atomic.patch @@ -0,0 +1,25 @@ +From 58096320ea0888c4fbbff318839017a4d2e82703 Mon Sep 17 00:00:00 2001 +From: Lionel Landwerlin +Date: Sat, 6 Nov 2010 14:56:15 +0100 +Subject: [PATCH] glib: fix compilation with no builtin atomic operations compilers + +Signed-off-by: Lionel Landwerlin +--- + glib/gatomic.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/glib/gatomic.c b/glib/gatomic.c +index 845c866..01468ce 100644 +--- a/glib/gatomic.c ++++ b/glib/gatomic.c +@@ -881,6 +881,7 @@ g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomi + #endif /* DEFINE_WITH_WIN32_INTERLOCKED */ + + #ifdef DEFINE_WITH_MUTEXES ++# include "gthread.h" + /* We have to use the slow, but safe locking method */ + static GMutex *g_atomic_mutex; + +-- +1.7.2.3 + diff --git a/recipes/glib-2.0/glib-2.0_2.28.5.bb b/recipes/glib-2.0/glib-2.0_2.28.5.bb new file mode 100644 index 0000000000..c6aaf7517d --- /dev/null +++ b/recipes/glib-2.0/glib-2.0_2.28.5.bb @@ -0,0 +1,76 @@ +DESCRIPTION = "GLib is a general-purpose utility library, \ +which provides many useful data types, macros, \ +type conversions, string utilities, file utilities, a main \ +loop abstraction, and so on. It works on many \ +UNIX-like platforms, Windows, OS/2 and BeOS." +LICENSE = "LGPLv2+" +SECTION = "libs" +PRIORITY = "optional" +PR = "r1" +DEPENDS = "glib-2.0-native gtk-doc zlib" +DEPENDS_virtclass-native = "gettext-native gtk-doc-native \ + pkgconfig-native" + +SRC_URI = "\ + http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${PV}.tar.bz2;name=archive \ + file://glibconfig-sysdefs.h \ + file://configure-libtool.patch \ + file://g_once_init_enter.patch \ + file://gatomic-proper-pointer-get-cast.patch \ + file://60_wait-longer-for-threads-to-die.patch \ + file://glib-mkenums-interpreter.patch \ + file://libglib2-fix-compilation-with-no-builtin-atomic.patch \ + file://configure-ipv6.patch \ +" + +SRC_URI[archive.md5sum] = "ddf80a060ec9039ad40452ba3ca2311b" +SRC_URI[archive.sha256sum] = "8eb4b56b228c6d0bf5021dd23db5b0084d80cc6d8d89d7863073c2da575ec22a" + +inherit autotools gettext + +S = "${WORKDIR}/glib-${PV}" + +EXTRA_OECONF = "--disable-debug " + +# Add and entry for your favourite arch if your (g)libc has a sane printf +EXTRA_OECONF_append_glibc_arm = " --enable-included-printf=no " + +do_configure_prepend () { + install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . + sed -i -e "s:TEST_PROGS += gdbus-serialization::g" ${S}/gio/tests/Makefile.am +} + +do_install_append() { + sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g ${D}${bindir}/glib-mkenums || true +} + +EXTRA_OECONF_virtclass-native = "" + +do_configure_prepend_virtclass-native() { + if [ -e ${S}/${TARGET_SYS}-libtool ] ; then + echo "${TARGET_SYS}-libtool already present" + else + cp ${STAGING_BINDIR}/${TARGET_SYS}-libtool ${S} + fi + +} + +BBCLASSEXTEND = "native" + +PACKAGES =+ "gobject-2.0 gmodule-2.0 gthread-2.0 gio-2.0 glib-2.0-utils " +LEAD_SONAME = "libglib-2.0.*" +FILES_glib-2.0-utils = "${bindir}/*" +FILES_${PN} = "${libdir}/lib*so.* ${libdir}/gio/modules/*.so" +FILES_${PN}-dev += "${libdir}/glib-2.0 ${datadir}/glib-2.0 ${libdir}/gio/modules/*.la" +FILES_${PN}-dbg += "${libdir}/gio/modules/.debug" +FILES_gmodule-2.0 = "${libdir}/libgmodule-2.0.so.*" +FILES_gobject-2.0 = "${libdir}/libgobject-2.0.so.*" +FILES_gio-2.0 = "${libdir}/libgio-2.0.so.*" +FILES_gthread-2.0 = "${libdir}/libgthread-2.0.so.*" + +# Let various glib components end up in glib package +# for compatibility (with binary packages from Maemo). +FILES_gthread-2.0_chinook-compat = "" +FILES_gmodule-2.0_chinook-compat = "" +FILES_gobject-2.0_chinook-compat = "" +FILES_gio-2.0_chinook-compat = "" From cc3739a387b06fe1be45f19860bd1929a80f4751 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Tue, 23 Aug 2011 14:17:05 -0400 Subject: [PATCH 440/509] glib-2.0: explicitly disable dtrace and systemtap for native variant Copied from oe-core : 0d883b5df25635fbad45191d297cbdf78a6c1fe0 Thanks to Joshua Lock for pointing out the fix. Signed-off-by: Philip Balister --- recipes/glib-2.0/glib-2.0_2.28.5.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/glib-2.0/glib-2.0_2.28.5.bb b/recipes/glib-2.0/glib-2.0_2.28.5.bb index c6aaf7517d..4aea8bfa46 100644 --- a/recipes/glib-2.0/glib-2.0_2.28.5.bb +++ b/recipes/glib-2.0/glib-2.0_2.28.5.bb @@ -6,7 +6,7 @@ UNIX-like platforms, Windows, OS/2 and BeOS." LICENSE = "LGPLv2+" SECTION = "libs" PRIORITY = "optional" -PR = "r1" +PR = "r2" DEPENDS = "glib-2.0-native gtk-doc zlib" DEPENDS_virtclass-native = "gettext-native gtk-doc-native \ pkgconfig-native" @@ -44,7 +44,7 @@ do_install_append() { sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g ${D}${bindir}/glib-mkenums || true } -EXTRA_OECONF_virtclass-native = "" +EXTRA_OECONF_virtclass-native = "--disable-dtrace --disable-systemtap" do_configure_prepend_virtclass-native() { if [ -e ${S}/${TARGET_SYS}-libtool ] ; then From d71dcf34a38e72d26a2a5e268a9f36a0620aaeb3 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Sat, 16 Apr 2011 20:21:58 -0700 Subject: [PATCH 441/509] angstrom: Use glib-2.0 2.28.5 Signed-off-by: Steve Sakoman Signed-off-by: Koen Kooi --- conf/distro/include/angstrom-2010-preferred-versions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/angstrom-2010-preferred-versions.inc b/conf/distro/include/angstrom-2010-preferred-versions.inc index beb62dc849..ceb84fe820 100644 --- a/conf/distro/include/angstrom-2010-preferred-versions.inc +++ b/conf/distro/include/angstrom-2010-preferred-versions.inc @@ -17,8 +17,8 @@ PREFERRED_VERSION_cairo = "1.10.0" PREFERRED_VERSION_dbus = "1.2.24" PREFERRED_VERSION_dropbear = "0.52" PREFERRED_VERSION_fontconfig = "2.8.0" -PREFERRED_VERSION_glib-2.0 = "2.28.0" -PREFERRED_VERSION_glib-2.0-native = "2.28.0" +PREFERRED_VERSION_glib-2.0 = "2.28.5" +PREFERRED_VERSION_glib-2.0-native = "2.28.5" PREFERRED_VERSION_glibmm = "2.24.0" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_gtk+ = "2.20.1" From e94404df859eb9166eea5bdc394111ec7c9dcdfc Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Wed, 24 Aug 2011 20:36:17 -0400 Subject: [PATCH 442/509] openjade: fix build with GCC 4.6 Copied from oe-core 5e58a44ee5d5be814614cdcc147d1ce67a9a401d Thanks to Joshua Lock. Commit message from oe core: In GCC 4.6 the compiler no longer allows objects of const-qualified type to be default initialized unless the type has a user-declared default constructor. Patch from Gentoo bugzilla: http://bugs.gentoo.org/show_bug.cgi?id=358021 Signed-off-by: Philip Balister --- .../user-declared-default-constructor.patch | 92 +++++++++++++++++++ recipes/openjade/openjade_1.3.2.bb | 3 +- 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 recipes/openjade/openjade-1.3.2/user-declared-default-constructor.patch diff --git a/recipes/openjade/openjade-1.3.2/user-declared-default-constructor.patch b/recipes/openjade/openjade-1.3.2/user-declared-default-constructor.patch new file mode 100644 index 0000000000..073af46fc5 --- /dev/null +++ b/recipes/openjade/openjade-1.3.2/user-declared-default-constructor.patch @@ -0,0 +1,92 @@ +In GCC 4.6 the compiler no longer allows objects of const-qualified type to +be default initialized unless the type has a user-declared default +constructor. + +Patch from Gentoo bugzilla: http://bugs.gentoo.org/show_bug.cgi?id=358021 + +Gentoo Bugzilla description follows: +"If a class or struct has no user-defined default constructor, C++ doesn't +allow you to default construct a const instance of it. + +https://bugs.gentoo.org/358021 +http://clang.llvm.org/compatibility.html#default_init_const +http://gcc.gnu.org/PR44499" + +Upstream-Status: Pending + +Signed-off-by: Scott Garman + +--- a/jade/TeXFOTBuilder.cxx ++++ b/jade/TeXFOTBuilder.cxx +@@ -88,6 +88,8 @@ public: + value.convertString(nic_.placement); + } + ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); } ++ public: ++ PageFloatFlowObj() {} + private: + PageFloatNIC nic_; + StringC name_; +@@ -101,6 +103,8 @@ public: + fotb.endPageFootnote(); + } + ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); } ++ public: ++ PageFootnoteFlowObj() {} + private: + }; + ////////////////////////////////////////////////////////////////////// +--- a/jade/TransformFOTBuilder.cxx ++++ b/jade/TransformFOTBuilder.cxx +@@ -41,6 +41,7 @@ public: + }; + class EntityRefFlowObj : public TransformExtensionFlowObj { + public: ++ EntityRefFlowObj() {} + void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { + fotb.entityRef(name_); + } +@@ -56,6 +57,7 @@ public: + }; + class ProcessingInstructionFlowObj : public TransformExtensionFlowObj { + public: ++ ProcessingInstructionFlowObj() {} + void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { + fotb.processingInstruction(data_); + } +@@ -98,6 +100,8 @@ public: + } + } + ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); } ++ public: ++ EmptyElementFlowObj() {} + private: + ElementNIC nic_; + }; +@@ -133,6 +137,8 @@ public: + } + } + ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); } ++ public: ++ ElementFlowObj() {} + private: + ElementNIC nic_; + }; +@@ -150,6 +156,8 @@ public: + value.convertString(systemId_); + } + ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); } ++ public: ++ EntityFlowObj() {} + private: + StringC systemId_; + }; +@@ -174,6 +182,8 @@ public: + } + } + ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); } ++ public: ++ DocumentTypeFlowObj() {} + private: + DocumentTypeNIC nic_; + }; diff --git a/recipes/openjade/openjade_1.3.2.bb b/recipes/openjade/openjade_1.3.2.bb index afd333a8f9..3a653b9ccb 100644 --- a/recipes/openjade/openjade_1.3.2.bb +++ b/recipes/openjade/openjade_1.3.2.bb @@ -5,11 +5,12 @@ DESCRIPTION = "OpenJade is a suite of tools for validating, \ processing, and applying DSSSL (Document Style Semantics and \ Specification Language) stylesheets to SGML and XML documents." LICENSE = "BSD" -PR = "r5" +PR = "r6" SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \ file://configure.patch \ file://autoconf.patch \ file://makefile.patch \ + file://user-declared-default-constructor.patch \ " SRC_URI_append_virtclass-native = " file://oj-native-libosp-fix.patch" From d4fa561bc1fc46bc5f7783c5cee297a5abdc6807 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Jul 2011 12:15:06 +0200 Subject: [PATCH 443/509] module-init-tools-cross: add hack for 3.0 support Signed-off-by: Koen Kooi --- recipes/module-init-tools/module-init-tools-cross_3.12.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/module-init-tools/module-init-tools-cross_3.12.bb b/recipes/module-init-tools/module-init-tools-cross_3.12.bb index 5c4f917733..6868d527ac 100644 --- a/recipes/module-init-tools/module-init-tools-cross_3.12.bb +++ b/recipes/module-init-tools/module-init-tools-cross_3.12.bb @@ -5,7 +5,7 @@ EXTRA_OECONF += "--disable-builddir" #DEPENDS += "docbook-utils-native" DEFAULT_PREFERENCE = "0" -PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" +PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6 virtual/${TARGET_PREFIX}depmod-3.0" # Remove the RDEPENDS_${PN} we picked up from the "require"; # it's simply extraneous for the cross package From 6b2a581b7347dedeef3cf1d41bdf0cc0546e0884 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Tue, 20 Sep 2011 11:07:48 -0400 Subject: [PATCH 444/509] uhd : Update SRCREV to head of master branch. This revision update is needed to pick up support for current USRP E100 fpga interface. Signed-off-by: Philip Balister --- recipes/uhd/uhd_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/uhd/uhd_git.bb b/recipes/uhd/uhd_git.bb index e1d2e99b28..5121f01828 100644 --- a/recipes/uhd/uhd_git.bb +++ b/recipes/uhd/uhd_git.bb @@ -1,8 +1,8 @@ require recipes/uhd/uhd.inc -PR = "${INC_PR}.5" +PR = "${INC_PR}.6" SRC_URI = "git://ettus.sourcerepo.com/ettus/uhd.git;protocol=git" S = "${WORKDIR}/git/host" -SRCREV = "fc349d30507620baca935e75e68a9554b40d427c" +SRCREV = "b20c9fc836a0f32666739dcd143692149eb66c68" From b92f664ef9592190596d5805ede85eca4c01687c Mon Sep 17 00:00:00 2001 From: Eyal Reizer Date: Mon, 26 Sep 2011 21:07:34 +0000 Subject: [PATCH 445/509] iw: build version 0.9.22 from git sources Builds a new version which adds wowlan support from public git source Signed-off-by: Eyal Reizer Signed-off-by: Denys Dmytriyenko --- recipes/iw/iw_git.bb | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 recipes/iw/iw_git.bb diff --git a/recipes/iw/iw_git.bb b/recipes/iw/iw_git.bb new file mode 100644 index 0000000000..c98e1bc5f7 --- /dev/null +++ b/recipes/iw/iw_git.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "nl80211 based CLI configuration utility for wireless devices" +HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/iw" +SECTION = "base" +PRIORITY = "optional" +LICENSE = "BSD" + +SRCREV = "0a236ef5f8e4ba7218aac7d0cdacf45673d5b35c" +PR = "r0" +PV = "0.9.22" +PR_append = "+gitr${SRCPV}" + +DEPENDS = "libnl pkgconfig" + +SRC_URI = " \ + git://git.sipsolutions.net/iw.git;protocol=git \ + " +CFLAGS += "-DCONFIG_LIBNL20" + +S = "${WORKDIR}/git/" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake DESTDIR=${D} install +} From 19d70440545016dbb54ca10cf766ed1a9f4e35b1 Mon Sep 17 00:00:00 2001 From: Eyal Reizer Date: Mon, 26 Sep 2011 16:29:36 +0000 Subject: [PATCH 446/509] wpa_supplicant update to use a newer commit Signed-off-by: Eyal Reizer Signed-off-by: Denys Dmytriyenko --- recipes/wpa-supplicant/wpa-supplicant_git.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes/wpa-supplicant/wpa-supplicant_git.bb b/recipes/wpa-supplicant/wpa-supplicant_git.bb index 8f6971e0d6..7525144985 100644 --- a/recipes/wpa-supplicant/wpa-supplicant_git.bb +++ b/recipes/wpa-supplicant/wpa-supplicant_git.bb @@ -1,7 +1,7 @@ require wpa-supplicant-0.7.inc -SRCREV = "b8fb017272ed4794339978c9fbc0e74571a44728" -PR = "r0" +SRCREV = "83fa07226debc2f7082b6ccd62dbb1cd47c30472" +PR = "r1" PV = "0.7.3+0.8.0-rc" PR_append = "+gitr${SRCPV}" FILESPATHPKG =. "wpa-supplicant-git:" @@ -28,5 +28,3 @@ do_configure () { echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config fi } - - From 987c0d6caae398332336a1e464d7ae2ff17af744 Mon Sep 17 00:00:00 2001 From: Eyal Reizer Date: Mon, 26 Sep 2011 16:29:00 +0000 Subject: [PATCH 447/509] hostapd: update to use a newer commit Signed-off-by: Eyal Reizer Signed-off-by: Denys Dmytriyenko --- recipes/hostap/hostap-daemon_git.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes/hostap/hostap-daemon_git.bb b/recipes/hostap/hostap-daemon_git.bb index cf0e6e9483..b8aaa02b8d 100644 --- a/recipes/hostap/hostap-daemon_git.bb +++ b/recipes/hostap/hostap-daemon_git.bb @@ -2,8 +2,8 @@ DESCRIPTION = "User space daemon for extended IEEE 802.11 management" require hostap-daemon-0.7.inc -PR = "r0" -SRCREV = "b8fb017272ed4794339978c9fbc0e74571a44728" +PR = "r1" +SRCREV = "83fa07226debc2f7082b6ccd62dbb1cd47c30472" PV = "0.7.3+0.8.0-rc" PR_append = "gitr${SRCPV}" FILESPATHPKG =. "hostap-daemon-git:" @@ -23,4 +23,3 @@ do_configure() { echo "CFLAGS += -I${STAGING_INCDIR}" >> .config echo "LIBS += -L${STAGING_LIBDIR}" >> .config } - From 6d2d1216c3d9106850b35143fa37e34be0b62bab Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 21 Oct 2011 11:39:29 +0200 Subject: [PATCH 448/509] binutils-{canadian,cross}-sdk_2.18: Remove checksums and implicitly update them MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Due to a GPL violation corrected Binutils archives were uploaded with the suffix »a« and the faulty archives were removed [1]. The URLs redirect to the new archives and therefore the checksums are now incorrect. In the following commit commit bc8ddbf7944f82383936d88379619aa46c3954a2 Author: Steffen Sledz Date: Mon Sep 5 17:39:57 2011 +0200 binutils-2.18: fix checksums the checksums were updated – though it should have been done differently [1–3] and therefore already downloaded old archives have to be deleted manually. `binutils-{canadian,cross}-sdk_2.18.bb` require `binutils_2.18.bb` but override the checksums by having separate definition for the checksums [4]. By removing these definitions the updated checksums from `binutils_2.18.bb` are used. This patch is similar to the one submitted by Mats Kärrman [5]. `mamona/binutils-noemu_2.18.bb` is not updated because it also defines `SRC_URI` separately. [1] http://git.openembedded.org/openembedded/commit/?id=f4faecdbd0b7c83e5787735ef1495a34aca861e4 [2] http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-September/034885.html [3] http://git.openembedded.org/meta-openembedded/commit/?id=15832ab1f64f2bc2ee7d342e5bff0351b5e2479b [4] http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-October/035702.html [5] http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-October/035732.html Signed-off-by: Paul Menzel --- recipes/binutils/binutils-canadian-sdk_2.18.bb | 3 --- recipes/binutils/binutils-cross-sdk_2.18.bb | 3 --- 2 files changed, 6 deletions(-) diff --git a/recipes/binutils/binutils-canadian-sdk_2.18.bb b/recipes/binutils/binutils-canadian-sdk_2.18.bb index 94cb61a6d3..28517ac6f4 100644 --- a/recipes/binutils/binutils-canadian-sdk_2.18.bb +++ b/recipes/binutils/binutils-canadian-sdk_2.18.bb @@ -22,6 +22,3 @@ do_install () { install -m 644 ${S}/include/ansidecl.h ${D}${includedir} install -m 644 ${S}/include/libiberty.h ${D}${includedir} } - -SRC_URI[md5sum] = "9d22ee4dafa3a194457caf4706f9cf01" -SRC_URI[sha256sum] = "487a33a452f0edcf1f8bb8fc23dff5c7a82edec3f3f8b65632b6c945e961ee9b" diff --git a/recipes/binutils/binutils-cross-sdk_2.18.bb b/recipes/binutils/binutils-cross-sdk_2.18.bb index 837ebbe5c8..2f13b264a1 100644 --- a/recipes/binutils/binutils-cross-sdk_2.18.bb +++ b/recipes/binutils/binutils-cross-sdk_2.18.bb @@ -1,6 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc PR = "${INC_PR}.1" - -SRC_URI[md5sum] = "9d22ee4dafa3a194457caf4706f9cf01" -SRC_URI[sha256sum] = "487a33a452f0edcf1f8bb8fc23dff5c7a82edec3f3f8b65632b6c945e961ee9b" From 629048693c584238cb5bc97730aad979dda06753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mats=20K=C3=A4rrman?= Date: Fri, 21 Oct 2011 22:21:02 +0000 Subject: [PATCH 449/509] binutils_2.18: update SRC_URI to avoid manual delete MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For reasons described in [1], the URL and contents of the source archive has changed and the old URL redirects to this. The checksums were updated by a previous commit [2], but only changing the checksums requires a previously downloaded archive to be manually deleted. This patch avoids this by updating the SRC_URI to the new URL. [1] http://git.openembedded.org/openembedded/commit/?id=f4faecdbd0b7c83e5787735ef1495a34aca861e4 [2] http://git.openembedded.org/openembedded/commit/?id=bc8ddbf7944f82383936d88379619aa46c3954a2 Signed-off-by: Mats Kärrman Signed-off-by: Tom Rini --- recipes/binutils/binutils_2.18.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/binutils/binutils_2.18.bb b/recipes/binutils/binutils_2.18.bb index 9d53a3f8d0..ea5fa93322 100644 --- a/recipes/binutils/binutils_2.18.bb +++ b/recipes/binutils/binutils_2.18.bb @@ -3,7 +3,7 @@ PR = "${INC_PR}.2" LICENSE = "GPLv3" SRC_URI = "\ - ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \ + ${GNU_MIRROR}/binutils/binutils-${PV}a.tar.bz2 \ file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch \ file://binutils-configure-texinfo-version.patch \ file://binutils-uclibc-100-uclibc-conf.patch \ From 785fe53a152e7e79c073503f0fb238475a9fd58e Mon Sep 17 00:00:00 2001 From: Chase Maupin Date: Mon, 10 Oct 2011 14:27:00 -0500 Subject: [PATCH 450/509] sourceipk: dereference symlinks in sourceipk * Added the -h option to the tar command to make sure that any patches that may have been applied by the recipe are actually copied instead of made as symlinks to the recipe directory. * This is so that people can see the actual patches and unapply individual patches as desired. Signed-off-by: Chase Maupin Signed-off-by: Denys Dmytriyenko --- classes/sourceipk.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/sourceipk.bbclass b/classes/sourceipk.bbclass index 1b63996997..546ec6787a 100644 --- a/classes/sourceipk.bbclass +++ b/classes/sourceipk.bbclass @@ -122,7 +122,7 @@ sourceipk_do_create_srcipk() { fi #Write the data tarball - tar -C $tmp_dir --owner=0 --group=0 -czf $srcipk_dir/data.tar.gz . + tar -C $tmp_dir --owner=0 --group=0 -chzf $srcipk_dir/data.tar.gz . # Create the debian-binary file echo "2.0" > $srcipk_dir/debian-binary From 5b665647ac7d1e20afd974cd8afe5c6303112931 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 28 Nov 2011 23:56:42 +0000 Subject: [PATCH 451/509] eglibc: Fix build when OPTION_EGLIBC_NSSWITCH is not set. Few of build problems are being reported on classic OE when OPTION_EGLIBC_NSSWITCH is set to 'n' by default it works well. But when its set to 'n' then we have to make sure that OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG and OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS are set to point to abosolute paths in sources Fixes build errors like Makefile:85: *** OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG variable left unset. Stop. Signed-off-by: Khem Raj Signed-off-by: Tom Rini --- recipes/eglibc/eglibc-options.inc | 6 +++++- recipes/eglibc/eglibc.inc | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/recipes/eglibc/eglibc-options.inc b/recipes/eglibc/eglibc-options.inc index 0af0aab0a4..c3ba5e3a91 100644 --- a/recipes/eglibc/eglibc-options.inc +++ b/recipes/eglibc/eglibc-options.inc @@ -4,7 +4,11 @@ def eglibc_cfg(feature, features, tokens, cnf ): if type(features) == type([]) and feature in features: cnf.extend([token + ' = y' for token in tokens]) else: - cnf.extend([token + ' = n' for token in tokens]) + for token in tokens: + cnf.extend([token + ' = n']) + if token == 'OPTION_EGLIBC_NSSWITCH': + cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = ${S}/nss/nsswitch.conf"]) + cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = ${S}/nss/fixed-nsswitch.functions"]) # Map distro features to eglibc options settings def features_to_eglibc_settings(d): diff --git a/recipes/eglibc/eglibc.inc b/recipes/eglibc/eglibc.inc index f0cfca8769..23c3763339 100644 --- a/recipes/eglibc/eglibc.inc +++ b/recipes/eglibc/eglibc.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.eglibc.org/home" SECTION = "libs" PRIORITY = "required" LICENSE = "LGPL" -INC_PR = "r21" +INC_PR = "r22" # nptl needs unwind support in gcc, which can't be built without glibc. DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" #this leads to circular deps, so lets not add it yet @@ -42,7 +42,7 @@ do_move_ports() { mv ${WORKDIR}/${EGLIBC_BRANCH}/ports ${S}/ fi } -OE_FEATURES := "${@features_to_eglibc_settings(d)}" +OE_FEATURES = "${@features_to_eglibc_settings(d)}" do_configure_prepend() { echo '${OE_FEATURES}' > ${B}/option-groups.config } From 938681cab6fbc5672127f3d1a05104c45e1979c5 Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Wed, 30 Nov 2011 08:57:53 +0000 Subject: [PATCH 452/509] rsyslog: change path for config includes to /etc/rsyslog.d Signed-off-by: Steffen Sledz Signed-off-by: Tom Rini --- recipes/rsyslog/rsyslog.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/rsyslog/rsyslog.inc b/recipes/rsyslog/rsyslog.inc index 8f67130274..3ab593e96b 100644 --- a/recipes/rsyslog/rsyslog.inc +++ b/recipes/rsyslog/rsyslog.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Rsyslog is an enhanced multi-threaded syslogd" DEPENDS = "zlib" HOMEPAGE = "http://www.rsyslog.com/" LICENSE = "GPLv3" -INC_PR = "r2" +INC_PR = "r3" SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \ file://rsyslog.conf \ @@ -12,7 +12,7 @@ SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \ inherit autotools do_install_append() { - install -d ${D}/${sysconfdir}/${PN} + install -d ${D}/${sysconfdir}/rsyslog.d install ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf install -d ${D}/${sysconfdir}/init.d install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog.${PN} From dbcbead93b611999b9bfe485b5bc23334b8725e2 Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Wed, 30 Nov 2011 08:57:54 +0000 Subject: [PATCH 453/509] gypsy: fix packaging of DBus starter script A wrong path had avoided the packaging of the dbus starter script /usr/share/dbus-1/system-services/org.freedesktop.Gypsy.service. Signed-off-by: Steffen Sledz Acked-by: Paul Menzel Signed-off-by: Tom Rini --- recipes/gypsy/gypsy.inc | 4 +++- recipes/gypsy/gypsy_0.7.bb | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes/gypsy/gypsy.inc b/recipes/gypsy/gypsy.inc index eab062c5d6..964e336c01 100644 --- a/recipes/gypsy/gypsy.inc +++ b/recipes/gypsy/gypsy.inc @@ -3,6 +3,8 @@ LICENSE = "GPL" SECTION = "x11" DEPENDS = "glib-2.0 dbus-glib bluez4 libxslt-native" +INC_PR = "r1" + inherit autotools pkgconfig do_configure_prepend () { @@ -14,6 +16,6 @@ PACKAGES += "libgypsy libgypsy-dev libgypsy-dbg" FILES_lib${PN} = "${libdir}/lib*.so*" FILES_lib${PN}-dev = "${includedir}/* ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig" FILES_lib${PN}-dbg = "${libdir}/.debug" -FILES_${PN} = "${datadir}/dbus-1/services/ ${libexecdir}/gypsy-daemon ${sysconfdir}/dbus-1/system.d/*" +FILES_${PN} = "${datadir}/dbus-1/system-services/* ${libexecdir}/gypsy-daemon ${sysconfdir}/dbus-1/system.d/*" FILES_${PN}-dbg ="${libexecdir}/.debug*" CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.d/Gypsy.conf" diff --git a/recipes/gypsy/gypsy_0.7.bb b/recipes/gypsy/gypsy_0.7.bb index 8cd8760a07..054c7840f7 100644 --- a/recipes/gypsy/gypsy_0.7.bb +++ b/recipes/gypsy/gypsy_0.7.bb @@ -1,5 +1,7 @@ require gypsy.inc +PR = "${INC_PR}.0" + SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-0.7.tar.gz;name=gypsy \ file://docs-reference-am.patch \ file://remove-werror.patch \ From 89ce3a50eeba6a540779d92aea8b9c0a6f96c4fa Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Wed, 30 Nov 2011 08:57:55 +0000 Subject: [PATCH 454/509] gypsy: move generic SRC_URI part to gypsy.inc Signed-off-by: Steffen Sledz Acked-by: Paul Menzel Signed-off-by: Tom Rini --- recipes/gypsy/gypsy.inc | 2 ++ recipes/gypsy/gypsy_0.7.bb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/gypsy/gypsy.inc b/recipes/gypsy/gypsy.inc index 964e336c01..6c7c942292 100644 --- a/recipes/gypsy/gypsy.inc +++ b/recipes/gypsy/gypsy.inc @@ -5,6 +5,8 @@ DEPENDS = "glib-2.0 dbus-glib bluez4 libxslt-native" INC_PR = "r1" +SRC_URI = "http://gypsy.freedesktop.org/releases/${PN}-${PV}.tar.gz;name=gypsy" + inherit autotools pkgconfig do_configure_prepend () { diff --git a/recipes/gypsy/gypsy_0.7.bb b/recipes/gypsy/gypsy_0.7.bb index 054c7840f7..66369611f7 100644 --- a/recipes/gypsy/gypsy_0.7.bb +++ b/recipes/gypsy/gypsy_0.7.bb @@ -2,7 +2,7 @@ require gypsy.inc PR = "${INC_PR}.0" -SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-0.7.tar.gz;name=gypsy \ +SRC_URI += " \ file://docs-reference-am.patch \ file://remove-werror.patch \ " From 487b14d973a23683f4ba44752d67755d628cdf38 Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Wed, 30 Nov 2011 08:57:56 +0000 Subject: [PATCH 455/509] gypsy: update to latest upstream version 0.8, and remove version 0.7 Bug fixes, enhanced logging, a new debugging system, enhanced device discovery. Signed-off-by: Steffen Sledz Acked-by: Paul Menzel Signed-off-by: Tom Rini --- recipes/gypsy/gypsy_0.7.bb | 12 ------------ recipes/gypsy/gypsy_0.8.bb | 6 ++++++ 2 files changed, 6 insertions(+), 12 deletions(-) delete mode 100644 recipes/gypsy/gypsy_0.7.bb create mode 100644 recipes/gypsy/gypsy_0.8.bb diff --git a/recipes/gypsy/gypsy_0.7.bb b/recipes/gypsy/gypsy_0.7.bb deleted file mode 100644 index 66369611f7..0000000000 --- a/recipes/gypsy/gypsy_0.7.bb +++ /dev/null @@ -1,12 +0,0 @@ -require gypsy.inc - -PR = "${INC_PR}.0" - -SRC_URI += " \ - file://docs-reference-am.patch \ - file://remove-werror.patch \ -" - -SRC_URI[gypsy.md5sum] = "cde52c121693014efa75d9098fd7de22" -SRC_URI[gypsy.sha256sum] = "60d9f9ada77c832899df4a164718895addc5015fa48f45fd58dc4bc8a983f205" - diff --git a/recipes/gypsy/gypsy_0.8.bb b/recipes/gypsy/gypsy_0.8.bb new file mode 100644 index 0000000000..c5813db701 --- /dev/null +++ b/recipes/gypsy/gypsy_0.8.bb @@ -0,0 +1,6 @@ +require gypsy.inc + +PR = "${INC_PR}.0" + +SRC_URI[gypsy.md5sum] = "32b8db24db86d2dac87b391dd255f4bf" +SRC_URI[gypsy.sha256sum] = "1986a58189614a950725c3bc7d05faa3b84695f35cb696326f340ef87fc3acaa" From 7cc9a65f5fbd330483c222113a1ee6403bbc4a80 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 2 Mar 2011 11:45:12 -0700 Subject: [PATCH 456/509] fakeroot.inc: Add RDEPENDS_${PN}-virtclass-native Fixes RDEPENDS on fakeroot-native. Signed-off-by: Tom Rini Signed-off-by: Denys Dmytriyenko --- recipes/fakeroot/fakeroot.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/fakeroot/fakeroot.inc b/recipes/fakeroot/fakeroot.inc index af71e24e2f..86002b973b 100644 --- a/recipes/fakeroot/fakeroot.inc +++ b/recipes/fakeroot/fakeroot.inc @@ -14,3 +14,4 @@ SRC_URI = "\ # fakeroot needs getopt which is provided by the util-linux package RDEPENDS_${PN} = "util-linux" +RDEPENDS_${PN}_virtclass-native = "util-linux-native" From 963304c372a642a1ab45a86109912475a01bd818 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 May 2011 11:28:09 +0200 Subject: [PATCH 457/509] fakeroot: Move from not fetchable 1.14.5 to 1.15.1 Fakeroot 1.14.5 was not fetchable any more. Updating to 1.15.1. Test environment: BB_VERSION = "1.10.2" METADATA_BRANCH = "org.openembedded.dev" TARGET_ARCH = "arm" TARGET_OS = "linux-gnueabi" MACHINE = "mainstone" DISTRO = "minimal" DISTRO_VERSION = "dev-snapshot-20110504" TARGET_FPU = "soft" Signed-off-by: Florian Boor Signed-off-by: Denys Dmytriyenko --- .../{fakeroot-1.14.5 => fakeroot-1.15.1}/fix-prefix.patch | 0 .../quiet-getopt-check.patch | 0 recipes/fakeroot/{fakeroot_1.14.5.bb => fakeroot_1.15.1.bb} | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename recipes/fakeroot/{fakeroot-1.14.5 => fakeroot-1.15.1}/fix-prefix.patch (100%) rename recipes/fakeroot/{fakeroot-1.14.5 => fakeroot-1.15.1}/quiet-getopt-check.patch (100%) rename recipes/fakeroot/{fakeroot_1.14.5.bb => fakeroot_1.15.1.bb} (53%) diff --git a/recipes/fakeroot/fakeroot-1.14.5/fix-prefix.patch b/recipes/fakeroot/fakeroot-1.15.1/fix-prefix.patch similarity index 100% rename from recipes/fakeroot/fakeroot-1.14.5/fix-prefix.patch rename to recipes/fakeroot/fakeroot-1.15.1/fix-prefix.patch diff --git a/recipes/fakeroot/fakeroot-1.14.5/quiet-getopt-check.patch b/recipes/fakeroot/fakeroot-1.15.1/quiet-getopt-check.patch similarity index 100% rename from recipes/fakeroot/fakeroot-1.14.5/quiet-getopt-check.patch rename to recipes/fakeroot/fakeroot-1.15.1/quiet-getopt-check.patch diff --git a/recipes/fakeroot/fakeroot_1.14.5.bb b/recipes/fakeroot/fakeroot_1.15.1.bb similarity index 53% rename from recipes/fakeroot/fakeroot_1.14.5.bb rename to recipes/fakeroot/fakeroot_1.15.1.bb index ff6844df6b..4c625caeb6 100644 --- a/recipes/fakeroot/fakeroot_1.14.5.bb +++ b/recipes/fakeroot/fakeroot_1.15.1.bb @@ -6,5 +6,5 @@ SRC_URI =+ "\ file://quiet-getopt-check.patch \ " -SRC_URI[md5sum] = "659a1f3a36554abfc2a3eaad2fdc0604" -SRC_URI[sha256] = "b035c834944bf9482027f48c388de8492e96609825265ac03f05408d0b3aae68" +SRC_URI[md5sum] = "248c408b1e06e776c5739871b49bd968" +SRC_URI[sha256sum] = "45fbb9ad611f33224cc09954963dde563cc80fe58c76feb25b6e98550b81729a" From 5968939cbe8f993736ba9912c59d4f6cf7ea7b11 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 14 Dec 2011 10:40:58 -0700 Subject: [PATCH 458/509] Revert "fakeroot: Move from not fetchable 1.14.5 to 1.15.1" This reverts commit 672af8093cf33d8b90e9186986ba5c95fc7a0a0a. Signed-off-by: Tom Rini --- .../{fakeroot-1.15.1 => fakeroot-1.14.5}/fix-prefix.patch | 0 .../quiet-getopt-check.patch | 0 recipes/fakeroot/{fakeroot_1.15.1.bb => fakeroot_1.14.5.bb} | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename recipes/fakeroot/{fakeroot-1.15.1 => fakeroot-1.14.5}/fix-prefix.patch (100%) rename recipes/fakeroot/{fakeroot-1.15.1 => fakeroot-1.14.5}/quiet-getopt-check.patch (100%) rename recipes/fakeroot/{fakeroot_1.15.1.bb => fakeroot_1.14.5.bb} (53%) diff --git a/recipes/fakeroot/fakeroot-1.15.1/fix-prefix.patch b/recipes/fakeroot/fakeroot-1.14.5/fix-prefix.patch similarity index 100% rename from recipes/fakeroot/fakeroot-1.15.1/fix-prefix.patch rename to recipes/fakeroot/fakeroot-1.14.5/fix-prefix.patch diff --git a/recipes/fakeroot/fakeroot-1.15.1/quiet-getopt-check.patch b/recipes/fakeroot/fakeroot-1.14.5/quiet-getopt-check.patch similarity index 100% rename from recipes/fakeroot/fakeroot-1.15.1/quiet-getopt-check.patch rename to recipes/fakeroot/fakeroot-1.14.5/quiet-getopt-check.patch diff --git a/recipes/fakeroot/fakeroot_1.15.1.bb b/recipes/fakeroot/fakeroot_1.14.5.bb similarity index 53% rename from recipes/fakeroot/fakeroot_1.15.1.bb rename to recipes/fakeroot/fakeroot_1.14.5.bb index 4c625caeb6..ff6844df6b 100644 --- a/recipes/fakeroot/fakeroot_1.15.1.bb +++ b/recipes/fakeroot/fakeroot_1.14.5.bb @@ -6,5 +6,5 @@ SRC_URI =+ "\ file://quiet-getopt-check.patch \ " -SRC_URI[md5sum] = "248c408b1e06e776c5739871b49bd968" -SRC_URI[sha256sum] = "45fbb9ad611f33224cc09954963dde563cc80fe58c76feb25b6e98550b81729a" +SRC_URI[md5sum] = "659a1f3a36554abfc2a3eaad2fdc0604" +SRC_URI[sha256] = "b035c834944bf9482027f48c388de8492e96609825265ac03f05408d0b3aae68" From f8eac41e225c9ae6070a10c083a55f6b74a9b215 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 14 Dec 2011 10:45:47 -0700 Subject: [PATCH 459/509] fakeroot: Update URI to a functioning one We have to use a specific date to the debian snapshot mirror to get this version of the file. Use PE = 1 to ensure everyone builds this. Signed-off-by: Tom Rini --- recipes/fakeroot/fakeroot_1.14.5.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/fakeroot/fakeroot_1.14.5.bb b/recipes/fakeroot/fakeroot_1.14.5.bb index ff6844df6b..1d333d2580 100644 --- a/recipes/fakeroot/fakeroot_1.14.5.bb +++ b/recipes/fakeroot/fakeroot_1.14.5.bb @@ -1,8 +1,9 @@ require fakeroot.inc +PE = "1" PR = "${INC_PR}.0" SRC_URI =+ "\ - ${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.orig.tar.bz2 \ + http://snapshot.debian.org/archive/debian/20110301/pool/main/f/fakeroot/fakeroot_1.14.5.orig.tar.bz2 \ file://quiet-getopt-check.patch \ " From 3bbf4350a6b58b9e6a6c7cbeee291c8ad75724a2 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Mon, 9 May 2011 09:32:24 +0200 Subject: [PATCH 460/509] llvm2.7_2.7: Add patch for build errors on newer gcc / glibc combinations Its seems there is a stricter header checking again which results in errors like this: error: 'ptrdiff_t' does not name a type This happens on my Debian SID system. Adding the needed includes fixes the build. Signed-off-by: Stefan Schmidt --- recipes/llvm/llvm2.7/include-fixes.patch | 55 ++++++++++++++++++++++++ recipes/llvm/llvm2.7_2.7.bb | 3 +- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 recipes/llvm/llvm2.7/include-fixes.patch diff --git a/recipes/llvm/llvm2.7/include-fixes.patch b/recipes/llvm/llvm2.7/include-fixes.patch new file mode 100644 index 0000000000..9e71e40a72 --- /dev/null +++ b/recipes/llvm/llvm2.7/include-fixes.patch @@ -0,0 +1,55 @@ +Fixes stricter includes which result in failures like this: +error: 'ptrdiff_t' does not name a type + +Upstream-Status: Unknown, not submitted as 2.7 is very old + +Signed-off-by: Stefan Schmidt + +Index: llvm-2.7/include/llvm/ADT/SmallVector.h +=================================================================== +--- llvm-2.7.orig/include/llvm/ADT/SmallVector.h 2011-05-08 17:07:09.000000000 +0200 ++++ llvm-2.7/include/llvm/ADT/SmallVector.h 2011-05-08 17:07:25.000000000 +0200 +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #ifdef _MSC_VER + namespace std { +Index: llvm-2.7/include/llvm/ADT/ilist.h +=================================================================== +--- llvm-2.7.orig/include/llvm/ADT/ilist.h 2011-05-08 20:24:57.000000000 +0200 ++++ llvm-2.7/include/llvm/ADT/ilist.h 2011-05-08 20:25:12.000000000 +0200 +@@ -40,6 +40,7 @@ + + #include + #include ++#include + + namespace llvm { + +Index: llvm-2.7/include/llvm/Use.h +=================================================================== +--- llvm-2.7.orig/include/llvm/Use.h 2011-05-08 20:28:21.000000000 +0200 ++++ llvm-2.7/include/llvm/Use.h 2011-05-08 20:28:37.000000000 +0200 +@@ -28,6 +28,7 @@ + #include "llvm/Support/Casting.h" + #include "llvm/ADT/PointerIntPair.h" + #include ++#include + + namespace llvm { + +Index: llvm-2.7/include/llvm/ADT/DenseMap.h +=================================================================== +--- llvm-2.7.orig/include/llvm/ADT/DenseMap.h 2011-05-08 20:32:11.000000000 +0200 ++++ llvm-2.7/include/llvm/ADT/DenseMap.h 2011-05-08 20:32:21.000000000 +0200 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + namespace llvm { + diff --git a/recipes/llvm/llvm2.7_2.7.bb b/recipes/llvm/llvm2.7_2.7.bb index 4353622323..12755dbed7 100644 --- a/recipes/llvm/llvm2.7_2.7.bb +++ b/recipes/llvm/llvm2.7_2.7.bb @@ -1,6 +1,6 @@ require llvm.inc -PR = "r9" +PR = "r10" DEPENDS = "llvm-common llvm2.7-native" @@ -15,6 +15,7 @@ SRC_URI += "\ file://r104652-VFPLoadStoreMultiple.patch \ file://r104653-BFC-BFI.patch \ file://rawMOVLRPC.patch \ + file://include-fixes.patch \ " LLVM_RELEASE = "2.7" From 0760ab6154b50728c8724ce3ce9fdc177ca9e41b Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Mon, 16 May 2011 11:10:38 +0200 Subject: [PATCH 461/509] llvm2.7_2.7.bb: Update patch to use c++ include style. As henning suggested on we should use a c++ style include here instead. Thus changing to #include Signed-off-by: Stefan Schmidt --- recipes/llvm/llvm2.7/include-fixes.patch | 8 ++++---- recipes/llvm/llvm2.7_2.7.bb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/llvm/llvm2.7/include-fixes.patch b/recipes/llvm/llvm2.7/include-fixes.patch index 9e71e40a72..2783f4d5b6 100644 --- a/recipes/llvm/llvm2.7/include-fixes.patch +++ b/recipes/llvm/llvm2.7/include-fixes.patch @@ -13,7 +13,7 @@ Index: llvm-2.7/include/llvm/ADT/SmallVector.h #include #include #include -+#include ++#include #ifdef _MSC_VER namespace std { @@ -25,7 +25,7 @@ Index: llvm-2.7/include/llvm/ADT/ilist.h #include #include -+#include ++#include namespace llvm { @@ -37,7 +37,7 @@ Index: llvm-2.7/include/llvm/Use.h #include "llvm/Support/Casting.h" #include "llvm/ADT/PointerIntPair.h" #include -+#include ++#include namespace llvm { @@ -49,7 +49,7 @@ Index: llvm-2.7/include/llvm/ADT/DenseMap.h #include #include #include -+#include ++#include namespace llvm { diff --git a/recipes/llvm/llvm2.7_2.7.bb b/recipes/llvm/llvm2.7_2.7.bb index 12755dbed7..7d56e7dd3a 100644 --- a/recipes/llvm/llvm2.7_2.7.bb +++ b/recipes/llvm/llvm2.7_2.7.bb @@ -1,6 +1,6 @@ require llvm.inc -PR = "r10" +PR = "r11" DEPENDS = "llvm-common llvm2.7-native" From 7e9f986dc8d8cd701739c50660868b280f5e0b72 Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Mon, 28 Nov 2011 11:59:00 +0000 Subject: [PATCH 462/509] live555: replace version 20110314 with 20111120 Signed-off-by: Steffen Sledz --- recipes/live555/live555_20110314.bb | 8 -------- recipes/live555/live555_20111120.bb | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 recipes/live555/live555_20110314.bb create mode 100644 recipes/live555/live555_20111120.bb diff --git a/recipes/live555/live555_20110314.bb b/recipes/live555/live555_20110314.bb deleted file mode 100644 index 44664d2231..0000000000 --- a/recipes/live555/live555_20110314.bb +++ /dev/null @@ -1,8 +0,0 @@ -require live555.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "ff65b2c598e970b4b6c8219a1811de00" -SRC_URI[sha256sum] = "c6ce050a7f9f69901e6f7f81a6745c82d9419e3904a753b2d5db1139caaf6738" - - diff --git a/recipes/live555/live555_20111120.bb b/recipes/live555/live555_20111120.bb new file mode 100644 index 0000000000..f6c4f63607 --- /dev/null +++ b/recipes/live555/live555_20111120.bb @@ -0,0 +1,7 @@ +require live555.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "8e5ebefdf7d12ca9cfd7175ff3d7eef2" +SRC_URI[sha256sum] = "695cf22d43516f082e26ee9eb8373a0ae3b4ed472f1e224b51d881219f694f2e" + From 6e3ff72c154c177128bb9bee2abfc90532e46721 Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Fri, 9 Dec 2011 17:00:27 +0000 Subject: [PATCH 463/509] icedtea6-native: fix problem on build hosts with linux kernel 3.x see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7072341 Signed-off-by: Steffen Sledz --- recipes/icedtea/icedtea6-native.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipes/icedtea/icedtea6-native.inc b/recipes/icedtea/icedtea6-native.inc index 06da7c0d36..91d6075a88 100644 --- a/recipes/icedtea/icedtea6-native.inc +++ b/recipes/icedtea/icedtea6-native.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Harness to build the source code from OpenJDK using Free Software build tools" HOMEPAGE = "http://icedtea.classpath.org" LICENSE = "GPL with Classpath Exception" -INC_PR = "r4" +INC_PR = "r5" DEPENDS = "virtual/javac-native classpath-tools-native \ virtual/java-native classpath-native \ @@ -108,6 +108,13 @@ do_configure_append() { -e"s|g++\$(GCC_SUFFIX)|${CXX}|" \ $F done + + for F in openjdk/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile ; + do + sed -i \ + -e"s|SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%|SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%|" \ + $F + done } EXTRA_OEMAKE = ' \ From ae9fc42593029ad51f9af599db903946a2ed1eaf Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Mon, 12 Dec 2011 08:58:01 +0000 Subject: [PATCH 464/509] openjdk: fix problem on build hosts with linux kernel 3.x see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7072341 Signed-off-by: Steffen Sledz --- recipes/openjdk/openjdk-6-common.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipes/openjdk/openjdk-6-common.inc b/recipes/openjdk/openjdk-6-common.inc index 54c45f84de..59a7a56ee3 100644 --- a/recipes/openjdk/openjdk-6-common.inc +++ b/recipes/openjdk/openjdk-6-common.inc @@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET" S = "${WORKDIR}/${ICEDTEA}" B = "${S}/build" -INC_PR = "r11" +INC_PR = "r12" SRC_URI = "\ ${ICEDTEA_URI} \ @@ -208,6 +208,13 @@ do_configure_prepend() { do_configure_append() { oe_runmake patch-ecj + + for F in ${WORKDIR}/openjdk-src-dir/hotspot/make/linux/Makefile ${WORKDIR}/icedtea6-1.8.5/build/openjdk-ecj/hotspot/make/linux/Makefile ${WORKDIR}/icedtea6-1.8.5/build/openjdk/hotspot/make/linux/Makefile ; + do + sed -i \ + -e"s|SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%|SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%|" \ + $F + done } # Work around broken variable quoting in oe-stable 2009 and provide the variable From 88b8d9405a903003d28396ae41566665c7faeab2 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Mon, 26 Dec 2011 21:22:26 +0100 Subject: [PATCH 465/509] net-snmp: added version 5.7.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backported from meta-oe where it was contributed by Eric Bénard While at it also fixed some whitespace warnings. Gave it a DEFAULT_PREFERENCE of 1 so it gets preference above the older svn recipe (svn is deprecatted by net-snmp anyway) Rationale for adding is because the existing recipe does not build for uclibc, and the new version does. Signed-off-by: Frans Meulenbroeks --- recipes/net-snmp/files/snmpd.conf | 32 +++++++++++++-------------- recipes/net-snmp/files/snmptrapd.conf | 1 - recipes/net-snmp/net-snmp_5.7.1.bb | 28 +++++++++++++++++++++++ 3 files changed, 44 insertions(+), 17 deletions(-) create mode 100644 recipes/net-snmp/net-snmp_5.7.1.bb diff --git a/recipes/net-snmp/files/snmpd.conf b/recipes/net-snmp/files/snmpd.conf index 728171c427..4e6b2eb404 100644 --- a/recipes/net-snmp/files/snmpd.conf +++ b/recipes/net-snmp/files/snmpd.conf @@ -39,7 +39,7 @@ # allow me to access it?" # # By default, the agent responds to the "public" community for read -# only access, if run out of the box without any configuration file in +# only access, if run out of the box without any configuration file in # place. The following examples show you other ways of configuring # the agent so that you can change the community names, and give # yourself write access as well. @@ -150,7 +150,7 @@ syscontact Root (configure /etc/snmp/snmpd.local.conf) #proc sendmail 10 1 # A snmpwalk of the prTable would look something like this: -# +# # % snmpwalk -v 1 -c public localhost .1.3.6.1.4.1.2021.2 # enterprises.ucdavis.procTable.prEntry.prIndex.1 = 1 # enterprises.ucdavis.procTable.prEntry.prIndex.2 = 2 @@ -180,8 +180,8 @@ syscontact Root (configure /etc/snmp/snmpd.local.conf) # Note that the errorFlag for mountd is set to 1 because one is not # running (in this case an rpc.mountd is, but thats not good enough), # and the ErrMessage tells you what's wrong. The configuration -# imposed in the snmpd.conf file is also shown. -# +# imposed in the snmpd.conf file is also shown. +# # Special Case: When the min and max numbers are both 0, it assumes # you want a max of infinity and a min of 1. # @@ -220,7 +220,7 @@ syscontact Root (configure /etc/snmp/snmpd.local.conf) # #exec shelltest /bin/sh /tmp/shtest -# Then, +# Then, # % snmpwalk -v 1 -c public localhost .1.3.6.1.4.1.2021.8 # enterprises.ucdavis.extTable.extEntry.extIndex.1 = 1 # enterprises.ucdavis.extTable.extEntry.extIndex.2 = 2 @@ -246,7 +246,7 @@ syscontact Root (configure /etc/snmp/snmpd.local.conf) # # The agent can check the amount of available disk space, and make -# sure it is above a set limit. +# sure it is above a set limit. # disk PATH [MIN=DEFDISKMINIMUMSPACE] # @@ -260,7 +260,7 @@ syscontact Root (configure /etc/snmp/snmpd.local.conf) # % snmpwalk -v 1 -c public localhost .1.3.6.1.4.1.2021.9 # enterprises.ucdavis.diskTable.dskEntry.diskIndex.1 = 0 -# enterprises.ucdavis.diskTable.dskEntry.diskPath.1 = "/" Hex: 2F +# enterprises.ucdavis.diskTable.dskEntry.diskPath.1 = "/" Hex: 2F # enterprises.ucdavis.diskTable.dskEntry.diskDevice.1 = "/dev/dsk/c201d6s0" # enterprises.ucdavis.diskTable.dskEntry.diskMinimum.1 = 10000 # enterprises.ucdavis.diskTable.dskEntry.diskTotal.1 = 837130 @@ -294,9 +294,9 @@ syscontact Root (configure /etc/snmp/snmpd.local.conf) # enterprises.ucdavis.loadTable.laEntry.loadaveNames.1 = "Load-1" # enterprises.ucdavis.loadTable.laEntry.loadaveNames.2 = "Load-5" # enterprises.ucdavis.loadTable.laEntry.loadaveNames.3 = "Load-15" -# enterprises.ucdavis.loadTable.laEntry.loadaveLoad.1 = "0.49" Hex: 30 2E 34 39 -# enterprises.ucdavis.loadTable.laEntry.loadaveLoad.2 = "0.31" Hex: 30 2E 33 31 -# enterprises.ucdavis.loadTable.laEntry.loadaveLoad.3 = "0.26" Hex: 30 2E 32 36 +# enterprises.ucdavis.loadTable.laEntry.loadaveLoad.1 = "0.49" Hex: 30 2E 34 39 +# enterprises.ucdavis.loadTable.laEntry.loadaveLoad.2 = "0.31" Hex: 30 2E 33 31 +# enterprises.ucdavis.loadTable.laEntry.loadaveLoad.3 = "0.26" Hex: 30 2E 32 36 # enterprises.ucdavis.loadTable.laEntry.loadaveConfig.1 = "12.00" # enterprises.ucdavis.loadTable.laEntry.loadaveConfig.2 = "14.00" # enterprises.ucdavis.loadTable.laEntry.loadaveConfig.3 = "14.00" @@ -312,7 +312,7 @@ syscontact Root (configure /etc/snmp/snmpd.local.conf) ############################################################################### # Extensible sections. -# +# # This alleviates the multiple line output problem found in the # previous executable mib by placing each mib in its own mib table: @@ -346,8 +346,8 @@ syscontact Root (configure /etc/snmp/snmpd.local.conf) # the .50.* outputs above to change to reasonable text descriptions. # Other ideas: -# -# exec .1.3.6.1.4.1.2021.51 ps /bin/ps +# +# exec .1.3.6.1.4.1.2021.51 ps /bin/ps # exec .1.3.6.1.4.1.2021.52 top /usr/local/bin/top # exec .1.3.6.1.4.1.2021.53 mailq /usr/bin/mailq @@ -356,17 +356,17 @@ syscontact Root (configure /etc/snmp/snmpd.local.conf) ############################################################################### # Pass through control. -# +# # Usage: # pass MIBOID EXEC-COMMAND # # This will pass total control of the mib underneath the MIBOID -# portion of the mib to the EXEC-COMMAND. +# portion of the mib to the EXEC-COMMAND. # # Note: You'll have to change the path of the passtest script to your # source directory or install it in the given location. -# +# # Example: (see the script for details) # (commented out here since it requires that you place the # script in the right location. (its not installed by default)) diff --git a/recipes/net-snmp/files/snmptrapd.conf b/recipes/net-snmp/files/snmptrapd.conf index 8d2e4375ef..a012a0001b 100644 --- a/recipes/net-snmp/files/snmptrapd.conf +++ b/recipes/net-snmp/files/snmptrapd.conf @@ -15,4 +15,3 @@ # # PLEASE: read the snmptrapd.conf(5) manual page as well! # - diff --git a/recipes/net-snmp/net-snmp_5.7.1.bb b/recipes/net-snmp/net-snmp_5.7.1.bb new file mode 100644 index 0000000000..08571e9043 --- /dev/null +++ b/recipes/net-snmp/net-snmp_5.7.1.bb @@ -0,0 +1,28 @@ +require net-snmp.inc +PR = "${INC_PR}.0" +LIC_FILES_CHKSUM = "file://README;beginline=3;endline=8;md5=7f7f00ba639ac8e8deb5a622ea24634e" + +DEFAULT_PREFERENCE = "1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ + file://init \ + file://snmpd.conf \ + file://snmptrapd.conf" + +EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no" +EXTRA_OEMAKE = "INSTALL_PREFIX=${D}" + +do_configure_prepend() { + gnu-configize -f + # We better change sources and re-autoconf here, but + # required autoconf is too new for us. + sed -e '/echo.*\".*\\\\.*\"/s/echo/echo -e/g' \ + -e 's/tail -1/tail -n 1/g' \ + -i configure +} + +PARALLEL_MAKE = "" +CCACHE = "" + +SRC_URI[md5sum] = "c95d08fd5d93df0c11a2e1bdf0e01e0b" +SRC_URI[sha256sum] = "7c71c9650c65b715356547e20ca2dbe6313944278af8cc19c32a5337f46b181f" From 329928d7f6a2a3e56ed0776366ccabcd1f54de72 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Thu, 12 Jan 2012 08:21:12 +0100 Subject: [PATCH 466/509] ntpclient: updated to 2010_365 version Changes since ntpclient_2007_365: -- fixed type of sa_xmit_len, thanks vapier -- dropped underscores in spelling of adjtimex(2), might make uClibc happier -- include netdb.h and always define _BSD_SOURCE to get prototype for herror -- minor formatting to align with Nilsson's fork -- add -fno-strict-aliasing as needed by traditional network coding style The 2nd -- also implies our local patch is not needed any more Signed-off-by: Frans Meulenbroeks --- recipes/ntpclient/ntpclient_2010_365.bb | 45 +++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 recipes/ntpclient/ntpclient_2010_365.bb diff --git a/recipes/ntpclient/ntpclient_2010_365.bb b/recipes/ntpclient/ntpclient_2010_365.bb new file mode 100644 index 0000000000..379348def7 --- /dev/null +++ b/recipes/ntpclient/ntpclient_2010_365.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "NTP (RFC-1305) client for unix-alike computers" +HOMEPAGE = "http://doolittle.icarus.com/ntpclient" +AUTHOR = "Larry Doolittle " +RDEPENDS_${PN} = "busybox" +SECTION = "admin" +LICENSE = "GPLv2" +PR = "r0" +# The ntpclient package uses version numbers that include an underscore :( +PV = "2010_365" +# ntpclient unpacks into a directory that doesn't include version info :( +S = "${WORKDIR}/${PN}-2010" + +SRC_URI = "http://doolittle.icarus.com/ntpclient/ntpclient_${PV}.tar.gz \ + file://init \ + " + +INITSCRIPT_NAME = "ntpclient" +INITSCRIPT_PARAMS = "defaults 65" +inherit update-rc.d + +LDFLAGS += " -lrt " + +do_compile() { + oe_runmake ntpclient + oe_runmake adjtimex +} + +do_install () { + # Install the binary and tools + install -D -m 0755 ${S}/ntpclient ${D}${base_sbindir}/ntpclient + install -D -m 0755 ${S}/adjtimex ${D}${base_sbindir}/adjtimex.${PN} + install -D -m 0755 ${S}/rate.awk ${D}${sbindir}/ntpclient-drift-rate.awk + install -D -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ntpclient +} + +pkg_postinst_${PN} () { + update-alternatives --install ${base_sbindir}/adjtimex adjtimex adjtimex.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove adjtimex adjtimex.${PN} +} + +SRC_URI[md5sum] = "a64689398f2df8933ee0d8da246e9eaa" +SRC_URI[sha256sum] = "9ad9b028385082fb804167f464e2db0a0b3d33780acd399327e64898b8fcfddd" From dcaa45f302d781a78b6a54c48bed5828705f629d Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Mon, 30 Jan 2012 09:28:09 -0500 Subject: [PATCH 467/509] Fix malformed list of files --- recipes/uwsgi/uwsgi_0.9.9.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/uwsgi/uwsgi_0.9.9.2.bb b/recipes/uwsgi/uwsgi_0.9.9.2.bb index 756e3d56f1..8bfba7074b 100644 --- a/recipes/uwsgi/uwsgi_0.9.9.2.bb +++ b/recipes/uwsgi/uwsgi_0.9.9.2.bb @@ -8,8 +8,8 @@ PR = "r0" SRC_URI = "http://projects.unbit.it/downloads/uwsgi-${PV}.tar.gz \ file://editor.ini \ - file://public.ini" - file://arm-timer-syscall.patch \ + file://public.ini \ + file://arm-timer-syscall.patch" S = "${WORKDIR}/${PN}-${PV}" From d89162982577100e106092e15423aea49ef01574 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Mon, 14 May 2012 20:51:29 -0400 Subject: [PATCH 468/509] Fix up feeds, binutils hashes, some SSL thing --- classes/mirrors.bbclass | 2 ++ conf/distro/include/angstrom.inc | 2 +- recipes/angstrom/angstrom-feed-configs.bb | 2 +- recipes/binutils/binutils_2.18.bb | 4 ++-- recipes/images/rascal-image.bb | 2 ++ recipes/openssl/openssl-native_1.0.0d.bb | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/classes/mirrors.bbclass b/classes/mirrors.bbclass index 71ee5f63bf..c030fa5f0a 100644 --- a/classes/mirrors.bbclass +++ b/classes/mirrors.bbclass @@ -56,6 +56,8 @@ ftp://.*/.* http://mirrors.openembedded.org/ https?$://.*/.* http://mirrors.openembedded.org/ ftp://.*/.* http://sources.openembedded.org/ https?$://.*/.* http://sources.openembedded.org/ +ftp://.*/.* http://rascalmicro.com/sources/ +https?$://.*/.* http://rascalmicro.com/sources/ } diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 5a027232d0..0aa8f60e15 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -63,7 +63,7 @@ THUMB_INTERWORK = "yes" #Use this variable in feeds and other parts that need a URI -ANGSTROM_URI ?= "http://feeds.angstrom-distribution.org" +ANGSTROM_URI ?= "http://rascalmicro.com/packages" #Use this variable to select which recipe you want to use to get feed configs (/etc/ipkg/, /etc/apt/sources.list) # usefull for derivative distros and local testing diff --git a/recipes/angstrom/angstrom-feed-configs.bb b/recipes/angstrom/angstrom-feed-configs.bb index 9d76d51f22..dbaf36ac61 100644 --- a/recipes/angstrom/angstrom-feed-configs.bb +++ b/recipes/angstrom/angstrom-feed-configs.bb @@ -7,7 +7,7 @@ RRECOMMENDS_${PN} += "opkg" PR = "r14" PACKAGE_ARCH = "${MACHINE_ARCH}" -FEED_BASEPATH ?= "unstable/feed/" +FEED_BASEPATH = "beta/" # Note that this may override other definitions of FEED_BASEPATH IWMMXT_FEED = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '',d)}" diff --git a/recipes/binutils/binutils_2.18.bb b/recipes/binutils/binutils_2.18.bb index 6ba551ebf0..9d53a3f8d0 100644 --- a/recipes/binutils/binutils_2.18.bb +++ b/recipes/binutils/binutils_2.18.bb @@ -26,5 +26,5 @@ SRC_URI += "\ # ep93xx crunch patches SRC_URI_append_ep9312 = " file://binutils-crunch.patch" -SRC_URI[md5sum] = "9d22ee4dafa3a194457caf4706f9cf01" -SRC_URI[sha256sum] = "487a33a452f0edcf1f8bb8fc23dff5c7a82edec3f3f8b65632b6c945e961ee9b" +SRC_URI[md5sum] = "ccd264a5fa9ed992a21427c69cba91d3" +SRC_URI[sha256sum] = "4515254f55ec3d8c4d91e7633f3850ff28f60652b2d90dc88eef47c74c194bc9" diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 32b3cc24b8..8529f6f079 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -2,6 +2,7 @@ require recipes/images/minimal-image.bb IMAGE_INSTALL += "\ ack \ + avahi-autoipd \ avahi-daemon \ binutils \ control-freak \ @@ -23,6 +24,7 @@ IMAGE_INSTALL += "\ nginx \ ntpdate \ openssh \ + openssh-sftp-server \ perl \ perl-modules \ python \ diff --git a/recipes/openssl/openssl-native_1.0.0d.bb b/recipes/openssl/openssl-native_1.0.0d.bb index bbee5f98a6..7dc55181a9 100644 --- a/recipes/openssl/openssl-native_1.0.0d.bb +++ b/recipes/openssl/openssl-native_1.0.0d.bb @@ -17,7 +17,7 @@ export BUILD_OPTIMIZATION = " " SRC_URI += "file://configure-targets.patch \ file://shared-libs.patch \ file://debian.patch \ - file://libdeps-first.patch \ +# file://libdeps-first.patch \ " PARALLEL_MAKE = "" From 5015e07b18c2c3edc1efba525451be9c1ee069b8 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 16 May 2012 10:02:16 -0400 Subject: [PATCH 469/509] Fix fakeroot URI --- recipes/fakeroot/fakeroot_1.14.5.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/fakeroot/fakeroot_1.14.5.bb b/recipes/fakeroot/fakeroot_1.14.5.bb index ff6844df6b..1d333d2580 100644 --- a/recipes/fakeroot/fakeroot_1.14.5.bb +++ b/recipes/fakeroot/fakeroot_1.14.5.bb @@ -1,8 +1,9 @@ require fakeroot.inc +PE = "1" PR = "${INC_PR}.0" SRC_URI =+ "\ - ${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.orig.tar.bz2 \ + http://snapshot.debian.org/archive/debian/20110301/pool/main/f/fakeroot/fakeroot_1.14.5.orig.tar.bz2 \ file://quiet-getopt-check.patch \ " From 20e636d6639c9b6559e617757f52b5291c88bac6 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 16 May 2012 17:10:17 -0400 Subject: [PATCH 470/509] Upgrade uWSGI to 1.2.3 --- recipes/uwsgi/uwsgi_1.2.3.bb | 44 ++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 recipes/uwsgi/uwsgi_1.2.3.bb diff --git a/recipes/uwsgi/uwsgi_1.2.3.bb b/recipes/uwsgi/uwsgi_1.2.3.bb new file mode 100644 index 0000000000..0b06fa246f --- /dev/null +++ b/recipes/uwsgi/uwsgi_1.2.3.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "uWSGI is a WSGI web server for Python web applications" +HOMEPAGE = "http://projects.unbit.it/uwsgi/wiki" +SECTION = "net" +PRIORITY = "optional" +LICENSE = "GPLv2" +SRCNAME = "uwsgi" +PR = "r0" + +SRC_URI = "http://projects.unbit.it/downloads/uwsgi-${PV}.tar.gz \ + file://editor.ini \ + file://public.ini \ + file://arm-timer-syscall.patch" + +S = "${WORKDIR}/${PN}-${PV}" + +DEPENDS = "libxml2" + +RDEPENDS_${PN} = "\ + python-core \ +" + +do_compile_prepend() { + export BUILD_SYS=${BUILD_SYS} + export HOST_SYS=${HOST_SYS} + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} +} + +do_compile() { + python uwsgiconfig.py --build +} + +do_install() { + echo ${S} + install -m 0755 -d ${D}${sbindir} + install -m 0755 ${S}/uwsgi ${D}${sbindir} + install -m 0755 -d ${D}${sysconfdir} + install -m 0755 -d ${D}${sysconfdir}/uwsgi + install -m 0644 ${WORKDIR}/editor.ini ${D}${sysconfdir}/uwsgi + install -m 0644 ${WORKDIR}/public.ini ${D}${sysconfdir}/uwsgi +} + +SRC_URI[md5sum] = "6090367c826216f59848677a79fb7129" +SRC_URI[sha256sum] = "1f9f6047468272708241780597014ed00d93919a384e81b30e65167fb2c2e129" From be23acf45656ede309ed675f850447d7e97444ad Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 16 May 2012 18:02:41 -0400 Subject: [PATCH 471/509] Upgrade Nginx to 1.3.0 --- recipes/nginx/files/rascal-conf.patch | 297 ++++++++++++++------------ recipes/nginx/nginx_1.3.0.bb | 38 ++++ 2 files changed, 201 insertions(+), 134 deletions(-) create mode 100644 recipes/nginx/nginx_1.3.0.bb diff --git a/recipes/nginx/files/rascal-conf.patch b/recipes/nginx/files/rascal-conf.patch index 2f6503f2e6..e2a3413a98 100644 --- a/recipes/nginx/files/rascal-conf.patch +++ b/recipes/nginx/files/rascal-conf.patch @@ -1,134 +1,163 @@ -diff --git a/./conf/nginx.conf b/./conf/rascal-nginx.conf -index 672ce8c..83d3f83 100644 ---- a/./conf/nginx.conf -+++ b/./conf/rascal-nginx.conf -@@ -1,118 +1,41 @@ -- --#user nobody; - worker_processes 1; - --#error_log logs/error.log; --#error_log logs/error.log notice; --#error_log logs/error.log info; -- --#pid logs/nginx.pid; -- -- - events { - worker_connections 1024; - } - -- - http { - include mime.types; - default_type application/octet-stream; - -- #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' -- # '$status $body_bytes_sent "$http_referer" ' -- # '"$http_user_agent" "$http_x_forwarded_for"'; -- -- #access_log logs/access.log main; -- - sendfile on; -- #tcp_nopush on; - -- #keepalive_timeout 0; - keepalive_timeout 65; - -- #gzip on; -+ log_format comb-with-links '$remote_addr [$time_local] ' -+ '$request => generated $body_bytes_sent bytes in $request_time s ($status)'; - - server { - listen 80; - server_name localhost; -+ access_log /var/log/nginx/access comb-with-links; - -- #charset koi8-r; -+ location ^~ /editor/static/ { -+ root /var/www/; -+ } - -- #access_log logs/host.access.log main; -+ location ^~ /static/ { -+ root /var/www/public/; -+ } - - location / { -- root html; -- index index.html index.htm; -+ uwsgi_pass 127.0.0.1:5000; -+ include uwsgi_params; - } - -- #error_page 404 /404.html; -- -- # redirect server error pages to the static page /50x.html -- # - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } -- -- # proxy the PHP scripts to Apache listening on 127.0.0.1:80 -- # -- #location ~ \.php$ { -- # proxy_pass http://127.0.0.1; -- #} -- -- # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 -- # -- #location ~ \.php$ { -- # root html; -- # fastcgi_pass 127.0.0.1:9000; -- # fastcgi_index index.php; -- # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; -- # include fastcgi_params; -- #} -- -- # deny access to .htaccess files, if Apache's document root -- # concurs with nginx's one -- # -- #location ~ /\.ht { -- # deny all; -- #} - } -- -- -- # another virtual host using mix of IP-, name-, and port-based configuration -- # -- #server { -- # listen 8000; -- # listen somename:8080; -- # server_name somename alias another.alias; -- -- # location / { -- # root html; -- # index index.html index.htm; -- # } -- #} -- -- -- # HTTPS server -- # -- #server { -- # listen 443; -- # server_name localhost; -- -- # ssl on; -- # ssl_certificate cert.pem; -- # ssl_certificate_key cert.key; -- -- # ssl_session_timeout 5m; -- -- # ssl_protocols SSLv2 SSLv3 TLSv1; -- # ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP; -- # ssl_prefer_server_ciphers on; -- -- # location / { -- # root html; -- # index index.html index.htm; -- # } -- #} -- - } +diff -crB nginx-1.3.0.orig/conf/nginx.conf nginx-1.3.0/conf/nginx.conf +*** nginx-1.3.0.orig/conf/nginx.conf 2012-05-16 17:04:32.526596875 -0400 +--- nginx-1.3.0/conf/nginx.conf 2012-05-16 17:05:51.974601936 -0400 +*************** +*** 1,14 **** +- +- #user nobody; + worker_processes 1; + +- #error_log logs/error.log; +- #error_log logs/error.log notice; +- #error_log logs/error.log info; +- +- #pid logs/nginx.pid; +- +- + events { + worker_connections 1024; + } +--- 1,5 ---- +*************** +*** 18,118 **** + include mime.types; + default_type application/octet-stream; + +- #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' +- # '$status $body_bytes_sent "$http_referer" ' +- # '"$http_user_agent" "$http_x_forwarded_for"'; +- +- #access_log logs/access.log main; +- + sendfile on; +- #tcp_nopush on; + +- #keepalive_timeout 0; + keepalive_timeout 65; + +! #gzip on; + + server { + listen 80; + server_name localhost; + +! #charset koi8-r; + +! #access_log logs/host.access.log main; + + location / { +! root html; +! index index.html index.htm; + } + +! #error_page 404 /404.html; + +- # redirect server error pages to the static page /50x.html +- # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } +- +- # proxy the PHP scripts to Apache listening on 127.0.0.1:80 +- # +- #location ~ \.php$ { +- # proxy_pass http://127.0.0.1; +- #} +- +- # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 +- # +- #location ~ \.php$ { +- # root html; +- # fastcgi_pass 127.0.0.1:9000; +- # fastcgi_index index.php; +- # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; +- # include fastcgi_params; +- #} +- +- # deny access to .htaccess files, if Apache's document root +- # concurs with nginx's one +- # +- #location ~ /\.ht { +- # deny all; +- #} + } +- +- +- # another virtual host using mix of IP-, name-, and port-based configuration +- # +- #server { +- # listen 8000; +- # listen somename:8080; +- # server_name somename alias another.alias; +- +- # location / { +- # root html; +- # index index.html index.htm; +- # } +- #} +- +- +- # HTTPS server +- # +- #server { +- # listen 443; +- # server_name localhost; +- +- # ssl on; +- # ssl_certificate cert.pem; +- # ssl_certificate_key cert.key; +- +- # ssl_session_timeout 5m; +- +- # ssl_protocols SSLv2 SSLv3 TLSv1; +- # ssl_ciphers HIGH:!aNULL:!MD5; +- # ssl_prefer_server_ciphers on; +- +- # location / { +- # root html; +- # index index.html index.htm; +- # } +- #} +- + } +--- 8,46 ---- + include mime.types; + default_type application/octet-stream; + + sendfile on; + + keepalive_timeout 65; + +! log_format comb-with-links '$remote_addr [$time_local] ' +! '$request => generated $body_bytes_sent bytes in $request_time s ($status)'; + + server { + listen 80; + server_name localhost; ++ access_log /var/log/nginx/access comb-with-links; + +! location ^~ /editor/static/ { +! root /var/www/; +! } + +! location ^~ /static/ { +! root /var/www/public/; +! } + + location / { +! uwsgi_pass 127.0.0.1:5000; # public app +! include uwsgi_params; + } + +! location /editor/ { +! uwsgi_pass 127.0.0.1:5001; # editor app +! include uwsgi_params; +! } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } + } + } diff --git a/recipes/nginx/nginx_1.3.0.bb b/recipes/nginx/nginx_1.3.0.bb new file mode 100644 index 0000000000..85c198168e --- /dev/null +++ b/recipes/nginx/nginx_1.3.0.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "Nginx is a free, open-source, high-performance HTTP server and reverse proxy, as well as an IMAP/POP3 proxy server." +HOMEPAGE = "http://wiki.nginx.org" +SECTION = "net" +PRIORITY = "optional" +LICENSE = "BSD" +PR = "r0" + +SRC_URI = "http://nginx.org/download/nginx-${PV}.tar.gz \ + file://allow-cross.patch \ + file://rascal-conf.patch" + +DEPENDS = "libpcre" + +do_configure() { + export cross_compiling="yes" + ${S}/configure \ + --with-cc="${HOST_PREFIX}gcc -Wl,--hash-style=gnu" \ + --sbin-path=${sbindir}/nginx \ + --pid-path=${localstatedir}/run/nginx.pid \ + --lock-path=${localstatedir}/lock/nginx.lock \ + --error-log-path=${localstatedir}/log/nginx/error \ + --conf-path=${sysconfdir}/nginx/nginx.conf \ + --http-log-path=${localstatedir}/log/nginx/access \ + --http-client-body-temp-path=${localstatedir}/lib/nginx/client_body_temp \ + --http-proxy-temp-path=${localstatedir}/lib/nginx/proxy_temp \ + --http-fastcgi-temp-path=${localstatedir}/lib/nginx/fastcgi_temp \ + --http-uwsgi-temp-path=${localstatedir}/lib/nginx/uwsgi_temp \ + --http-scgi-temp-path=${localstatedir}/lib/nginx/scgi_temp +} + +do_install() { + install -d ${D}${localstatedir}/lib/nginx + install -d ${D}${localstatedir}/log/nginx + oe_runmake DESTDIR=${D} install +} + +SRC_URI[md5sum] = "b02e171c4a088aa9a5ab387943ce08eb" +SRC_URI[sha256sum] = "e95d4e5f840afe0e85f95689a10ffa8acaf5a4a1372fe285b175fbc807a5f409" From bece4665b1eb9cfe68798e31254407d775d26791 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 20 Jun 2012 18:50:19 -0300 Subject: [PATCH 472/509] Make uWSGI start editor and public pages in vassal processes, make stopping uWSGI work. --- recipes/initscripts/files/rascal-webserver.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/recipes/initscripts/files/rascal-webserver.sh b/recipes/initscripts/files/rascal-webserver.sh index 0751ff185a..599e3e6737 100644 --- a/recipes/initscripts/files/rascal-webserver.sh +++ b/recipes/initscripts/files/rascal-webserver.sh @@ -4,24 +4,30 @@ PATH=/sbin:/bin:/usr/bin:/usr/sbin WEBSERVER="/usr/sbin/nginx" WEBSERVER_CONFIG="/etc/nginx/nginx.conf" APPSERVER="/usr/sbin/uwsgi" -APPSERVER_CONFIG="/etc/uwsgi.ini" +APPSERVER_CONFIG_DIR="/etc/uwsgi/" test -f $WEBSERVER || exit 0 test -f $WEBSERVER_CONFIG || exit 0 test -f $APPSERVER || exit 0 -test -f $APPSERVER_CONFIG || exit 0 +test -d $APPSERVER_CONFIG_DIR || exit 0 case "$1" in start) echo "Starting Rascal webserver..." $WEBSERVER -c $WEBSERVER_CONFIG - $APPSERVER --ini $APPSERVER_CONFIG + $APPSERVER --emperor $APPSERVER_CONFIG_DIR --daemonize /var/log/uwsgi/emperor.log echo "done" ;; reload|restart) echo "Reloading Rascal webserver..." $WEBSERVER -c $WEBSERVER_CONFIG -s reload - touch /etc/uwsgi.reload + echo "done" + echo "Reloading Python appserver..." + for file in $APPSERVER_CONFIG_DIR* + do + echo "Reloading app from $file" + touch $file + done echo "done" ;; stop) From 49f869f66c2c661e76851fed814c20bda62d5696 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 20 Jun 2012 18:56:57 -0300 Subject: [PATCH 473/509] Make uWSGI return Python error messages rather than swallowing them up in HTTP 500 errors --- recipes/uwsgi/files/public.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/uwsgi/files/public.ini b/recipes/uwsgi/files/public.ini index 7e4ef76e9d..6dc3a7bd00 100644 --- a/recipes/uwsgi/files/public.ini +++ b/recipes/uwsgi/files/public.ini @@ -5,3 +5,4 @@ processes = 1 env = PYTHONPATH=$PYTHONPATH:/var/www module = public callable = public +catch-exceptions = True From 7998e94fc3935a50062c7c89be8ca757c76af769 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Thu, 21 Jun 2012 00:41:24 +0000 Subject: [PATCH 474/509] Update to Flask 0.8, Jinja2 2.6, and Werkzeug 0.8.3 --- recipes/python/python-flask_0.8.bb | 25 ++++++++++++++++++++++++ recipes/python/python-jinja2_2.6.bb | 26 +++++++++++++++++++++++++ recipes/python/python-werkzeug_0.8.3.bb | 26 +++++++++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 recipes/python/python-flask_0.8.bb create mode 100644 recipes/python/python-jinja2_2.6.bb create mode 100644 recipes/python/python-werkzeug_0.8.3.bb diff --git a/recipes/python/python-flask_0.8.bb b/recipes/python/python-flask_0.8.bb new file mode 100644 index 0000000000..595526ad7a --- /dev/null +++ b/recipes/python/python-flask_0.8.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Web microframework for Python based on Werkzeug, Jinja 2 and good intentions" +HOMEPAGE = "http://flask.pocoo.org/" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "BSD" +SRCNAME = "flask" +PR = "r0" + +S = "${WORKDIR}/git" + +SRCREV = "0.8" +SRC_URI = "git://github.com/mitsuhiko/flask.git;protocol=git;branch=master" + +inherit setuptools + +RDEPENDS_${PN} = "\ + python-core \ + python-jinja2 \ + python-werkzeug \ +" + +do_install_append() { + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py +} diff --git a/recipes/python/python-jinja2_2.6.bb b/recipes/python/python-jinja2_2.6.bb new file mode 100644 index 0000000000..3c626fd3f0 --- /dev/null +++ b/recipes/python/python-jinja2_2.6.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Modern and designer-friendly templating language for Python, modelled after Django’s templates" +HOMEPAGE = "http://jinja.pocoo.org/" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "BSD" +SRCNAME = "jinja2" +PR = "r0" + +S = "${WORKDIR}/git" + +SRCREV = "2.6" +SRC_URI = "git://github.com/mitsuhiko/jinja2.git;protocol=git;branch=master" + +inherit setuptools + +RDEPENDS_${PN} = "\ + python-core \ +" + +do_install_append() { + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py +} + +SRC_URI[md5sum] = "1c49a8825c993bfdcf55bb36897d28a2" +SRC_URI[sha256sum] = ""85e185375db75c109f99ecde3d55415f035e7068a82252cf4f16c667ac38f49 diff --git a/recipes/python/python-werkzeug_0.8.3.bb b/recipes/python/python-werkzeug_0.8.3.bb new file mode 100644 index 0000000000..9ba5fcafdf --- /dev/null +++ b/recipes/python/python-werkzeug_0.8.3.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "WSGI utility library for Python" +HOMEPAGE = "http://werkzeug.pocoo.org" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "BSD" +SRCNAME = "werkzeug" +PR = "r0" + +S = "${WORKDIR}/git" + +SRCREV = "0.8.3" +SRC_URI = "git://github.com/mitsuhiko/werkzeug.git;protocol=git;branch=master" + +inherit setuptools + +RDEPENDS_${PN} = "\ + python-core \ +" + +do_install_append() { + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py +} + +SRC_URI[md5sum] = "12aa03e302ce49da98703938f257347a" +SRC_URI[sha256sum] = "108c3d41fb701c4af4ef00e8ebbedc147632c82247beb798c8d8657a12810206" From 32ea82c0a4aeefdcb5e237484b400bb34cda3637 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Thu, 21 Jun 2012 17:27:45 +0000 Subject: [PATCH 475/509] Make bitbake install uwsgidecorators.py correctly --- recipes/uwsgi/uwsgi_1.2.3.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes/uwsgi/uwsgi_1.2.3.bb b/recipes/uwsgi/uwsgi_1.2.3.bb index 0b06fa246f..282902eb30 100644 --- a/recipes/uwsgi/uwsgi_1.2.3.bb +++ b/recipes/uwsgi/uwsgi_1.2.3.bb @@ -6,6 +6,7 @@ LICENSE = "GPLv2" SRCNAME = "uwsgi" PR = "r0" +#SRC_URI = "http://goelzer.com/uwsgi/uwsgi-1.2.3.tar.gz \ SRC_URI = "http://projects.unbit.it/downloads/uwsgi-${PV}.tar.gz \ file://editor.ini \ file://public.ini \ @@ -27,6 +28,8 @@ do_compile_prepend() { } do_compile() { +# build with -D to see this output: +# echo "******************************* ${PV} ********************************** " python uwsgiconfig.py --build } @@ -38,7 +41,10 @@ do_install() { install -m 0755 -d ${D}${sysconfdir}/uwsgi install -m 0644 ${WORKDIR}/editor.ini ${D}${sysconfdir}/uwsgi install -m 0644 ${WORKDIR}/public.ini ${D}${sysconfdir}/uwsgi + install -m 0755 ${S}/uwsgi/uwsgidecorators.py ${D}${PYTHON_SITEPACKAGES_DIR} } SRC_URI[md5sum] = "6090367c826216f59848677a79fb7129" SRC_URI[sha256sum] = "1f9f6047468272708241780597014ed00d93919a384e81b30e65167fb2c2e129" +#SRC_URI[md5sum] = "a6f43569b46e11ff625f5f03d966fe57" +#SRC_URI[sha256sum] = "4433693fdbeda20b418e1eea5a494aa1db4965cd6b9a521a26b227c27d95b79c" From 7e90b6f3fb2d5d163a05c6f59bf28e5f12ef3007 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 22 Jun 2012 00:10:58 +0000 Subject: [PATCH 476/509] Add logfiles to uWSGI --- recipes/uwsgi/files/editor.log | 1 + recipes/uwsgi/files/emperor.log | 1 + recipes/uwsgi/files/public.log | 1 + recipes/uwsgi/uwsgi_1.2.3.bb | 18 +++++++++++++----- 4 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 recipes/uwsgi/files/editor.log create mode 100644 recipes/uwsgi/files/emperor.log create mode 100644 recipes/uwsgi/files/public.log diff --git a/recipes/uwsgi/files/editor.log b/recipes/uwsgi/files/editor.log new file mode 100644 index 0000000000..1cd1af845f --- /dev/null +++ b/recipes/uwsgi/files/editor.log @@ -0,0 +1 @@ +*** Start uWSGI editor log file *** diff --git a/recipes/uwsgi/files/emperor.log b/recipes/uwsgi/files/emperor.log new file mode 100644 index 0000000000..cbf6d5f72e --- /dev/null +++ b/recipes/uwsgi/files/emperor.log @@ -0,0 +1 @@ +*** Start uWSGI emperor log file *** diff --git a/recipes/uwsgi/files/public.log b/recipes/uwsgi/files/public.log new file mode 100644 index 0000000000..b53612f929 --- /dev/null +++ b/recipes/uwsgi/files/public.log @@ -0,0 +1 @@ +*** Start uWSGI public log file *** diff --git a/recipes/uwsgi/uwsgi_1.2.3.bb b/recipes/uwsgi/uwsgi_1.2.3.bb index 282902eb30..7ac440ae11 100644 --- a/recipes/uwsgi/uwsgi_1.2.3.bb +++ b/recipes/uwsgi/uwsgi_1.2.3.bb @@ -10,6 +10,9 @@ PR = "r0" SRC_URI = "http://projects.unbit.it/downloads/uwsgi-${PV}.tar.gz \ file://editor.ini \ file://public.ini \ + file://emperor.log \ + file://editor.log \ + file://public.log \ file://arm-timer-syscall.patch" S = "${WORKDIR}/${PN}-${PV}" @@ -41,10 +44,15 @@ do_install() { install -m 0755 -d ${D}${sysconfdir}/uwsgi install -m 0644 ${WORKDIR}/editor.ini ${D}${sysconfdir}/uwsgi install -m 0644 ${WORKDIR}/public.ini ${D}${sysconfdir}/uwsgi - install -m 0755 ${S}/uwsgi/uwsgidecorators.py ${D}${PYTHON_SITEPACKAGES_DIR} + install -m 0755 -d ${D}${libdir}/python2.6/site-packages/uwsgi + install -m 0755 ${S}/uwsgidecorators.py ${D}${libdir}/python2.6/site-packages/uwsgi + install -m 0755 -d ${D}${localstatedir}/log/uwsgi + install -m 0644 ${WORKDIR}/emperor.log ${D}${localstatedir}/log/uwsgi + install -m 0644 ${WORKDIR}/editor.log ${D}${localstatedir}/log/uwsgi + install -m 0644 ${WORKDIR}/public.log ${D}${localstatedir}/log/uwsgi } -SRC_URI[md5sum] = "6090367c826216f59848677a79fb7129" -SRC_URI[sha256sum] = "1f9f6047468272708241780597014ed00d93919a384e81b30e65167fb2c2e129" -#SRC_URI[md5sum] = "a6f43569b46e11ff625f5f03d966fe57" -#SRC_URI[sha256sum] = "4433693fdbeda20b418e1eea5a494aa1db4965cd6b9a521a26b227c27d95b79c" +#SRC_URI[md5sum] = "6090367c826216f59848677a79fb7129" +#SRC_URI[sha256sum] = "1f9f6047468272708241780597014ed00d93919a384e81b30e65167fb2c2e129" +SRC_URI[md5sum] = "a6f43569b46e11ff625f5f03d966fe57" +SRC_URI[sha256sum] = "4433693fdbeda20b418e1eea5a494aa1db4965cd6b9a521a26b227c27d95b79c" From 347533bab81156ad26121bb4a3ddbf1b31f4931c Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 22 Jun 2012 00:11:34 +0000 Subject: [PATCH 477/509] Update Nginx config to handle errors better --- recipes/nginx/files/rascal-conf.patch | 290 ++++++++++++++------------ 1 file changed, 156 insertions(+), 134 deletions(-) diff --git a/recipes/nginx/files/rascal-conf.patch b/recipes/nginx/files/rascal-conf.patch index e2a3413a98..e766017375 100644 --- a/recipes/nginx/files/rascal-conf.patch +++ b/recipes/nginx/files/rascal-conf.patch @@ -1,8 +1,8 @@ diff -crB nginx-1.3.0.orig/conf/nginx.conf nginx-1.3.0/conf/nginx.conf -*** nginx-1.3.0.orig/conf/nginx.conf 2012-05-16 17:04:32.526596875 -0400 ---- nginx-1.3.0/conf/nginx.conf 2012-05-16 17:05:51.974601936 -0400 +*** nginx-1.3.0.orig/conf/nginx.conf 2012-06-21 13:59:01.000000000 -0400 +--- nginx-1.3.0/conf/nginx.conf 2012-06-21 13:56:43.000000000 -0400 *************** -*** 1,14 **** +*** 1,118 **** - - #user nobody; worker_processes 1; @@ -15,149 +15,171 @@ diff -crB nginx-1.3.0.orig/conf/nginx.conf nginx-1.3.0/conf/nginx.conf - - events { - worker_connections 1024; +! worker_connections 1024; } ---- 1,5 ---- -*************** -*** 18,118 **** - include mime.types; - default_type application/octet-stream; -- #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' -- # '$status $body_bytes_sent "$http_referer" ' -- # '"$http_user_agent" "$http_x_forwarded_for"'; -- -- #access_log logs/access.log main; -- - sendfile on; -- #tcp_nopush on; - -- #keepalive_timeout 0; - keepalive_timeout 65; + http { +! include mime.types; +! default_type application/octet-stream; + +! #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' +! # '$status $body_bytes_sent "$http_referer" ' +! # '"$http_user_agent" "$http_x_forwarded_for"'; +! +! #access_log logs/access.log main; +! +! sendfile on; +! #tcp_nopush on; +! +! #keepalive_timeout 0; +! keepalive_timeout 65; +! ! #gzip on; - - server { - listen 80; - server_name localhost; - +! +! server { +! listen 80; +! server_name localhost; +! ! #charset koi8-r; - +! ! #access_log logs/host.access.log main; - - location / { +! +! location / { ! root html; ! index index.html index.htm; - } - +! } +! ! #error_page 404 /404.html; - -- # redirect server error pages to the static page /50x.html -- # - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } -- -- # proxy the PHP scripts to Apache listening on 127.0.0.1:80 -- # -- #location ~ \.php$ { -- # proxy_pass http://127.0.0.1; -- #} -- -- # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 -- # -- #location ~ \.php$ { -- # root html; -- # fastcgi_pass 127.0.0.1:9000; -- # fastcgi_index index.php; -- # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; -- # include fastcgi_params; -- #} -- -- # deny access to .htaccess files, if Apache's document root -- # concurs with nginx's one -- # -- #location ~ /\.ht { -- # deny all; -- #} - } -- -- -- # another virtual host using mix of IP-, name-, and port-based configuration -- # -- #server { -- # listen 8000; -- # listen somename:8080; -- # server_name somename alias another.alias; -- -- # location / { -- # root html; -- # index index.html index.htm; -- # } -- #} -- -- -- # HTTPS server -- # -- #server { -- # listen 443; -- # server_name localhost; -- -- # ssl on; -- # ssl_certificate cert.pem; -- # ssl_certificate_key cert.key; -- -- # ssl_session_timeout 5m; -- -- # ssl_protocols SSLv2 SSLv3 TLSv1; -- # ssl_ciphers HIGH:!aNULL:!MD5; -- # ssl_prefer_server_ciphers on; -- -- # location / { -- # root html; -- # index index.html index.htm; -- # } -- #} -- - } ---- 8,46 ---- - include mime.types; - default_type application/octet-stream; - - sendfile on; - - keepalive_timeout 65; - -! log_format comb-with-links '$remote_addr [$time_local] ' -! '$request => generated $body_bytes_sent bytes in $request_time s ($status)'; - - server { - listen 80; - server_name localhost; -+ access_log /var/log/nginx/access comb-with-links; - -! location ^~ /editor/static/ { -! root /var/www/; +! +! # redirect server error pages to the static page /50x.html +! # +! error_page 500 502 503 504 /50x.html; +! location = /50x.html { +! root html; ! } +! +! # proxy the PHP scripts to Apache listening on 127.0.0.1:80 +! # +! #location ~ \.php$ { +! # proxy_pass http://127.0.0.1; +! #} +! +! # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 +! # +! #location ~ \.php$ { +! # root html; +! # fastcgi_pass 127.0.0.1:9000; +! # fastcgi_index index.php; +! # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; +! # include fastcgi_params; +! #} +! +! # deny access to .htaccess files, if Apache's document root +! # concurs with nginx's one +! # +! #location ~ /\.ht { +! # deny all; +! #} +! } +! +! +! # another virtual host using mix of IP-, name-, and port-based configuration +! # +! #server { +! # listen 8000; +! # listen somename:8080; +! # server_name somename alias another.alias; +! +! # location / { +! # root html; +! # index index.html index.htm; +! # } +! #} +! +! +! # HTTPS server +! # +! #server { +! # listen 443; +! # server_name localhost; +! +! # ssl on; +! # ssl_certificate cert.pem; +! # ssl_certificate_key cert.key; +! +! # ssl_session_timeout 5m; +! +! # ssl_protocols SSLv2 SSLv3 TLSv1; +! # ssl_ciphers HIGH:!aNULL:!MD5; +! # ssl_prefer_server_ciphers on; +! +! # location / { +! # root html; +! # index index.html index.htm; +! # } +! #} -! location ^~ /static/ { -! root /var/www/public/; -! } + } +--- 1,61 ---- + worker_processes 1; - location / { -! uwsgi_pass 127.0.0.1:5000; # public app -! include uwsgi_params; - } + events { +! worker_connections 1024; + } -! location /editor/ { -! uwsgi_pass 127.0.0.1:5001; # editor app -! include uwsgi_params; -! } - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } - } + http { +! include mime.types; +! default_type application/octet-stream; +! +! sendfile on; + +! keepalive_timeout 65; + ++ log_format comb-with-links '$remote_addr ++ [$time_local] ' ++ '$request => generated $body_bytes_sent bytes in ++ $request_time s ($status)'; ++ ++ server { ++ listen 80; ++ server_name localhost; ++ access_log /var/log/nginx/access comb-with-links; ++ ++ location ^~ /editor/static/ { ++ root /var/www/; ++ } ++ ++ location ^~ /static/ { ++ root /var/www/public/; ++ } ++ ++ location / { ++ uwsgi_pass 127.0.0.1:5000; # public app ++ include uwsgi_params; ++ uwsgi_intercept_errors on; ++ } ++ ++ location /editor/ { ++ uwsgi_pass 127.0.0.1:5001; # editor app ++ include uwsgi_params; ++ } ++ ++ error_page 404 /404.html; ++ location = /404.html { ++ root /var/www/http-errors/; ++ } ++ ++ error_page 400 401 402 403 405 406 407 408 409 410 411 412 /4xx.html; ++ location = /4xx.html { ++ root /var/www/http-errors/; ++ } ++ ++ error_page 500 501 502 503 504 507 /50x.html; ++ location = /50x.html { ++ root /var/www/http-errors/; ++ } ++ } } From 340ffe4a7f8a603067d8b2e5ba739503746fd96a Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Thu, 28 Jun 2012 16:53:14 +0000 Subject: [PATCH 478/509] Fix feed address --- recipes/angstrom/angstrom-feed-configs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/angstrom/angstrom-feed-configs.bb b/recipes/angstrom/angstrom-feed-configs.bb index dbaf36ac61..403a3a1a2c 100644 --- a/recipes/angstrom/angstrom-feed-configs.bb +++ b/recipes/angstrom/angstrom-feed-configs.bb @@ -7,7 +7,7 @@ RRECOMMENDS_${PN} += "opkg" PR = "r14" PACKAGE_ARCH = "${MACHINE_ARCH}" -FEED_BASEPATH = "beta/" # Note that this may override other definitions of FEED_BASEPATH +FEED_BASEPATH = "beta/" IWMMXT_FEED = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '',d)}" From eda8109b349747056cd3e3a125492edb3e4f91b8 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Thu, 28 Jun 2012 16:54:00 +0000 Subject: [PATCH 479/509] Add PIL and simplejson packages --- recipes/images/rascal-image.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 8529f6f079..27d18ab77f 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -30,11 +30,13 @@ IMAGE_INSTALL += "\ python \ python-daemon \ python-flask \ + python-imaging \ python-jinja2 \ python-misc \ python-modules \ python-pyserial \ python-pytronics \ + python-simplejson \ python-werkzeug \ ruby \ sysstat \ From fbbeae7d355d23819d3b9b60fc9539aecac52464 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 29 Jun 2012 18:11:56 +0000 Subject: [PATCH 480/509] Add recipe for pip 1.1, the Python package installer --- recipes/python/python-pip_1.1.bb | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 recipes/python/python-pip_1.1.bb diff --git a/recipes/python/python-pip_1.1.bb b/recipes/python/python-pip_1.1.bb new file mode 100644 index 0000000000..c0109770dd --- /dev/null +++ b/recipes/python/python-pip_1.1.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Web microframework for Python based on Werkzeug, Jinja 2 and good intentions" +HOMEPAGE = "http://flask.pocoo.org/" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "MIT" +SRCNAME = "pip" +PR = "r0" + +SRC_URI = "http://cheeseshop.python.org/packages/source/p/pip/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit setuptools + +RDEPENDS_${PN} = "\ + python-core \ +" + +do_install_append() { + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py +} + +SRC_URI[md5sum] = "62a9f08dd5dc69d76734568a6c040508" +SRC_URI[sha256sum] = "993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" From 6203fd93866498723e21aec2b6d9d5d09dcdd666 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 29 Jun 2012 18:17:56 +0000 Subject: [PATCH 481/509] Add recipes: logrotate, python-dev, numpy, pip, sqlalchemy, vim-syntax; remove unused vim recipes that confuse Bitbake because PREFERRED_PROVIDER is screwy --- recipes/images/rascal-image.bb | 6 ++++++ recipes/vim/gvim_7.2.bb | 11 ----------- recipes/vim/vim-tiny_7.2.bb | 5 ----- 3 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 recipes/vim/gvim_7.2.bb delete mode 100644 recipes/vim/vim-tiny_7.2.bb diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 27d18ab77f..978b4f4af6 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -18,6 +18,7 @@ IMAGE_INSTALL += "\ iperf \ libgcc-dev \ libxml2 \ + logrotate \ make \ mtr \ nano \ @@ -29,14 +30,18 @@ IMAGE_INSTALL += "\ perl-modules \ python \ python-daemon \ + python-dev \ python-flask \ python-imaging \ python-jinja2 \ python-misc \ python-modules \ + python-numpy \ + python-pip \ python-pyserial \ python-pytronics \ python-simplejson \ + python-sqlalchemy \ python-werkzeug \ ruby \ sysstat \ @@ -44,6 +49,7 @@ IMAGE_INSTALL += "\ usb-gadget-mode \ uwsgi \ vim \ + vim-syntax \ vim-vimrc \ " diff --git a/recipes/vim/gvim_7.2.bb b/recipes/vim/gvim_7.2.bb deleted file mode 100644 index ad96e254ba..0000000000 --- a/recipes/vim/gvim_7.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -VIMGUI = "gtk2" -VIMX = "--with-x" - -require vim_${PV}.bb - -DEPENDS += "gtk+ libxt" - -EXTRA_OECONF += "--enable-gtk2-test" - -#might needs RREPLACES_${PN} as well -RCONFLICTS_${PN} = "vim vim-tiny" diff --git a/recipes/vim/vim-tiny_7.2.bb b/recipes/vim/vim-tiny_7.2.bb deleted file mode 100644 index 25a9205eb6..0000000000 --- a/recipes/vim/vim-tiny_7.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -VIMFEATURES = "tiny" - -require vim_${PV}.bb - -RCONFLICTS_${PN} = "gvim vim" From 769e71594de0fffbf16d4abff2d4ddf9f9cf564e Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 29 Jun 2012 18:35:45 +0000 Subject: [PATCH 482/509] Fix hashes and remove cruft from interrupt handler development --- recipes/uwsgi/uwsgi_1.2.3.bb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/recipes/uwsgi/uwsgi_1.2.3.bb b/recipes/uwsgi/uwsgi_1.2.3.bb index 7ac440ae11..6f45f63754 100644 --- a/recipes/uwsgi/uwsgi_1.2.3.bb +++ b/recipes/uwsgi/uwsgi_1.2.3.bb @@ -6,7 +6,6 @@ LICENSE = "GPLv2" SRCNAME = "uwsgi" PR = "r0" -#SRC_URI = "http://goelzer.com/uwsgi/uwsgi-1.2.3.tar.gz \ SRC_URI = "http://projects.unbit.it/downloads/uwsgi-${PV}.tar.gz \ file://editor.ini \ file://public.ini \ @@ -31,8 +30,6 @@ do_compile_prepend() { } do_compile() { -# build with -D to see this output: -# echo "******************************* ${PV} ********************************** " python uwsgiconfig.py --build } @@ -52,7 +49,5 @@ do_install() { install -m 0644 ${WORKDIR}/public.log ${D}${localstatedir}/log/uwsgi } -#SRC_URI[md5sum] = "6090367c826216f59848677a79fb7129" -#SRC_URI[sha256sum] = "1f9f6047468272708241780597014ed00d93919a384e81b30e65167fb2c2e129" -SRC_URI[md5sum] = "a6f43569b46e11ff625f5f03d966fe57" -SRC_URI[sha256sum] = "4433693fdbeda20b418e1eea5a494aa1db4965cd6b9a521a26b227c27d95b79c" +SRC_URI[md5sum] = "6090367c826216f59848677a79fb7129" +SRC_URI[sha256sum] = "1f9f6047468272708241780597014ed00d93919a384e81b30e65167fb2c2e129" From a61b898f98e128c9244b63495555068df80b180a Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Sat, 30 Jun 2012 20:13:34 +0000 Subject: [PATCH 483/509] Backport matplotlib recipe and patches from oe-core --- .../python/python-matplotlib/fix_setup.patch | 29 +++++++++++++++ .../python-matplotlib/fix_setupext.patch | 29 +++++++++++++++ recipes/python/python-matplotlib_1.1.0.bb | 37 +++++++++++++++++++ 3 files changed, 95 insertions(+) create mode 100644 recipes/python/python-matplotlib/fix_setup.patch create mode 100644 recipes/python/python-matplotlib/fix_setupext.patch create mode 100644 recipes/python/python-matplotlib_1.1.0.bb diff --git a/recipes/python/python-matplotlib/fix_setup.patch b/recipes/python/python-matplotlib/fix_setup.patch new file mode 100644 index 0000000000..9381583537 --- /dev/null +++ b/recipes/python/python-matplotlib/fix_setup.patch @@ -0,0 +1,29 @@ +This fixes the dependency checks inside of setup.py since things like +'import numpy' won't work with bitbake. + +diff --git a/setup.py b/setup.py +index 2f13821..e6d6ed0 100644 +--- a/setup.py ++++ b/setup.py +@@ -113,12 +113,6 @@ if 1: + baseline_images = [chop_package(f) for f in baseline_images] + package_data['matplotlib'].extend(baseline_images) + +-if not check_for_numpy(): +- sys.exit(1) +- +-if not check_for_freetype(): +- sys.exit(1) +- + build_ft2font(ext_modules, packages) + build_ttconv(ext_modules, packages) + build_contour(ext_modules, packages) +@@ -129,7 +123,7 @@ build_tri(ext_modules, packages) + + print_raw("") + print_raw("OPTIONAL BACKEND DEPENDENCIES") +-has_libpng = check_for_libpng() ++has_libpng = True + + if has_libpng and options['build_agg']: + build_agg(ext_modules, packages) diff --git a/recipes/python/python-matplotlib/fix_setupext.patch b/recipes/python/python-matplotlib/fix_setupext.patch new file mode 100644 index 0000000000..15faf84911 --- /dev/null +++ b/recipes/python/python-matplotlib/fix_setupext.patch @@ -0,0 +1,29 @@ +This fixes the numpy import problem in setupext.py using a hard-coded path. + +diff --git a/setupext.py b/setupext.py +index 962cedc..82297c4 100644 +--- a/setupext.py ++++ b/setupext.py +@@ -176,10 +176,7 @@ if os.path.exists(setup_cfg): + except: pass + + # For get_base_flags: +-if options['basedirlist']: +- basedirlist = options['basedirlist'].split() +-else: +- basedirlist = basedir[sys.platform] ++basedirlist = [os.environ['STAGING_LIBDIR']] + print("basedirlist is: %s" % basedirlist) + + if options['display_status']: +@@ -555,8 +552,8 @@ def check_for_numpy(): + + def add_numpy_flags(module): + "Add the modules flags to build extensions which use numpy" +- import numpy +- module.include_dirs.append(numpy.get_include()) ++ # Hard-coded path for OE since I know this is where numpy's include dir will be ++ module.include_dirs.append(os.path.join(os.environ['STAGING_LIBDIR'], 'python2.6/site-packages/numpy/core/include/')) + + def add_png_flags(module): + try_pkgconfig(module, 'libpng', 'png') diff --git a/recipes/python/python-matplotlib_1.1.0.bb b/recipes/python/python-matplotlib_1.1.0.bb new file mode 100644 index 0000000000..0cb0e4ba0d --- /dev/null +++ b/recipes/python/python-matplotlib_1.1.0.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "matplotlib is a python 2D plotting library which produces publication quality figures in a variety of hardcopy formats" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "PSF" +SRCNAME = "matplotlib" +PR = "r1" + +DEPENDS += "python-numpy freetype libpng" +RDEPENDS_${PN} = "python-core python-distutils python-numpy freetype libpng" + +SRC_URI = "${SOURCEFORGE_MIRROR}/matplotlib/matplotlib-${PV}.tar.gz \ + file://fix_setup.patch \ + file://fix_setupext.patch \ + " + +S = "${WORKDIR}/matplotlib-${PV}" + +EXTRA_OECONF = "--disable-docs --with-python-includes=${STAGING_INCDIR}/../" + +inherit distutils + +do_compile_prepend() { + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ + true +} + +# need to export these variables for python-config to work +export PYTHONPATH +export BUILD_SYS +export HOST_SYS +export STAGING_INCDIR +export STAGING_LIBDIR + + +SRC_URI[md5sum] = "57a627f30b3b27821f808659889514c2" +SRC_URI[sha256sum] = "be37e1d86c65ecacae6683f8805e051e9904e5f2e02bf2b7a34262c46a6d06a7" From 341af5403abf636f768f7c4f24ed8c960f1b595b Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 6 Jul 2012 23:05:13 +0000 Subject: [PATCH 484/509] Add ipython and matplotlib to the image --- recipes/images/rascal-image.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 978b4f4af6..13595884b1 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -16,6 +16,7 @@ IMAGE_INSTALL += "\ i2c-tools \ iotop \ iperf \ + ipython \ libgcc-dev \ libxml2 \ logrotate \ @@ -34,6 +35,7 @@ IMAGE_INSTALL += "\ python-flask \ python-imaging \ python-jinja2 \ + python-matplotlib \ python-misc \ python-modules \ python-numpy \ From e72ecbc91ef6eb798b47e976fe6e88b0b7740b80 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 6 Jul 2012 23:06:15 +0000 Subject: [PATCH 485/509] Remove uwsgi_intercept_errors on from nginx.conf and fix log format linebreaks --- recipes/nginx/files/rascal-conf.patch | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/recipes/nginx/files/rascal-conf.patch b/recipes/nginx/files/rascal-conf.patch index e766017375..02795d1959 100644 --- a/recipes/nginx/files/rascal-conf.patch +++ b/recipes/nginx/files/rascal-conf.patch @@ -1,6 +1,6 @@ diff -crB nginx-1.3.0.orig/conf/nginx.conf nginx-1.3.0/conf/nginx.conf -*** nginx-1.3.0.orig/conf/nginx.conf 2012-06-21 13:59:01.000000000 -0400 ---- nginx-1.3.0/conf/nginx.conf 2012-06-21 13:56:43.000000000 -0400 +*** nginx-1.3.0.orig/conf/nginx.conf 2012-06-30 20:17:18.000000000 +0000 +--- nginx-1.3.0/conf/nginx.conf 2012-06-30 20:20:07.000000000 +0000 *************** *** 1,118 **** - @@ -121,7 +121,7 @@ diff -crB nginx-1.3.0.orig/conf/nginx.conf nginx-1.3.0/conf/nginx.conf ! #} } ---- 1,61 ---- +--- 1,57 ---- worker_processes 1; events { @@ -137,11 +137,8 @@ diff -crB nginx-1.3.0.orig/conf/nginx.conf nginx-1.3.0/conf/nginx.conf ! keepalive_timeout 65; -+ log_format comb-with-links '$remote_addr -+ [$time_local] ' -+ '$request => generated $body_bytes_sent bytes in -+ $request_time s ($status)'; ++ log_format comb-with-links '$remote_addr [$time_local] ' ++ '$request => generated $body_bytes_sent bytes in $request_time s ($status)'; + + server { + listen 80; @@ -159,7 +156,6 @@ diff -crB nginx-1.3.0.orig/conf/nginx.conf nginx-1.3.0/conf/nginx.conf + location / { + uwsgi_pass 127.0.0.1:5000; # public app + include uwsgi_params; -+ uwsgi_intercept_errors on; + } + + location /editor/ { From 1a25a9f05ed763a5a69662b1af30f334e6d4dd19 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 11 Jul 2012 17:07:25 +0000 Subject: [PATCH 486/509] Stop building unused JFFS2 filesystem image --- build/conf/local.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/conf/local.conf b/build/conf/local.conf index 0345fcdc68..1ced668276 100644 --- a/build/conf/local.conf +++ b/build/conf/local.conf @@ -21,7 +21,7 @@ DISTRO = "angstrom-2008.1" DISTRO_SSH_DAEMON = "openssh" -IMAGE_FSTYPES = "jffs2 tar.bz2" +IMAGE_FSTYPES = "tar.bz2" IMAGE_KEEPROOTFS = "1" From 0b32e0e81603655aa3ff87d9f72a2b71975ab0dc Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 13 Jul 2012 20:24:37 +0000 Subject: [PATCH 487/509] Add recipe for Flask login extension --- recipes/images/rascal-image.bb | 1 + recipes/python/python-flask-login_0.1.3.bb | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 recipes/python/python-flask-login_0.1.3.bb diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 13595884b1..0ffd5c9c04 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -33,6 +33,7 @@ IMAGE_INSTALL += "\ python-daemon \ python-dev \ python-flask \ + python-flask-login \ python-imaging \ python-jinja2 \ python-matplotlib \ diff --git a/recipes/python/python-flask-login_0.1.3.bb b/recipes/python/python-flask-login_0.1.3.bb new file mode 100644 index 0000000000..46f64e133f --- /dev/null +++ b/recipes/python/python-flask-login_0.1.3.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "User session management for Flask" +HOMEPAGE = "http://packages.python.org/Flask-Login/" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "MIT" +SRCNAME = "Flask-Login" +PR = "r0" + +S = "${WORKDIR}/${SRCNAME}-${PV}" +SRC_URI = "http://pypi.python.org/packages/source/F/Flask-Login/Flask-Login-${PV}.tar.gz" + +inherit setuptools + +RDEPENDS_${PN} = "\ + python-flask \ +" + +do_install_append() { + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py +} + +SRC_URI[md5sum] = "8a9234d5e957f439cde270d026037363" +SRC_URI[sha256sum] = "8a1b309fc306875305bd4d2b95733a3e5527b637b0d1f9af3984d140f6284acf" From c46c6b1f526267b127f94c1a6c330c8f6d946773 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 13 Jul 2012 20:42:57 +0000 Subject: [PATCH 488/509] Make uwsgidecorators.py install correctly --- recipes/uwsgi/uwsgi_1.2.3.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes/uwsgi/uwsgi_1.2.3.bb b/recipes/uwsgi/uwsgi_1.2.3.bb index 6f45f63754..42eb632254 100644 --- a/recipes/uwsgi/uwsgi_1.2.3.bb +++ b/recipes/uwsgi/uwsgi_1.2.3.bb @@ -16,6 +16,8 @@ SRC_URI = "http://projects.unbit.it/downloads/uwsgi-${PV}.tar.gz \ S = "${WORKDIR}/${PN}-${PV}" +FILES_${PN} += ${libdir}/python2.6 + DEPENDS = "libxml2" RDEPENDS_${PN} = "\ @@ -41,8 +43,9 @@ do_install() { install -m 0755 -d ${D}${sysconfdir}/uwsgi install -m 0644 ${WORKDIR}/editor.ini ${D}${sysconfdir}/uwsgi install -m 0644 ${WORKDIR}/public.ini ${D}${sysconfdir}/uwsgi - install -m 0755 -d ${D}${libdir}/python2.6/site-packages/uwsgi - install -m 0755 ${S}/uwsgidecorators.py ${D}${libdir}/python2.6/site-packages/uwsgi + install -m 0755 -d ${D}${libdir}/python2.6 + install -m 0755 ${S}/uwsgidecorators.py ${D}${libdir}/python2.6 + install -m 0755 -d ${D}${localstatedir}/log/uwsgi install -m 0644 ${WORKDIR}/emperor.log ${D}${localstatedir}/log/uwsgi install -m 0644 ${WORKDIR}/editor.log ${D}${localstatedir}/log/uwsgi From 220ed4c255baeb48f2dc26891aec1920df01bfd8 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 13 Jul 2012 22:45:17 +0000 Subject: [PATCH 489/509] Make 1.2.3 recipe confusingly pull anthrax-rc2 tag --- recipes/uwsgi/uwsgi_1.2.3.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes/uwsgi/uwsgi_1.2.3.bb b/recipes/uwsgi/uwsgi_1.2.3.bb index 42eb632254..c22e1ba501 100644 --- a/recipes/uwsgi/uwsgi_1.2.3.bb +++ b/recipes/uwsgi/uwsgi_1.2.3.bb @@ -6,7 +6,9 @@ LICENSE = "GPLv2" SRCNAME = "uwsgi" PR = "r0" -SRC_URI = "http://projects.unbit.it/downloads/uwsgi-${PV}.tar.gz \ +SRCREV = "anthrax-rc2" + +SRC_URI = "git://github.com/rascalmicro/uwsgi.git;protocol=git;branch=interrupts \ file://editor.ini \ file://public.ini \ file://emperor.log \ @@ -14,7 +16,7 @@ SRC_URI = "http://projects.unbit.it/downloads/uwsgi-${PV}.tar.gz \ file://public.log \ file://arm-timer-syscall.patch" -S = "${WORKDIR}/${PN}-${PV}" +S = "${WORKDIR}/git" FILES_${PN} += ${libdir}/python2.6 From a8b550630c8af228e690916831c4e52cb4aec4e4 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 3 Aug 2012 23:19:02 -0300 Subject: [PATCH 490/509] Edit list to prevent clash between I2C and GPIO --- recipes/initscripts/files/rascal-gpio.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/initscripts/files/rascal-gpio.sh b/recipes/initscripts/files/rascal-gpio.sh index d3b504fd06..9130b78245 100644 --- a/recipes/initscripts/files/rascal-gpio.sh +++ b/recipes/initscripts/files/rascal-gpio.sh @@ -1,4 +1,4 @@ -for pin in 55 56 64 65 66 67 68 69 70 71 72 73 96 97 98 99 100 101 107 +for pin in 64 65 66 67 68 69 70 71 72 73 96 97 98 99 100 101 107 do echo $pin > /sys/class/gpio/export echo out > /sys/class/gpio/gpio$pin/direction From 92fd03f02ae1672a3663c4e0781697926f10d85b Mon Sep 17 00:00:00 2001 From: Dave Hylands Date: Sun, 5 Aug 2012 15:46:09 -0700 Subject: [PATCH 491/509] Fixed so that it looks between 4th and 5th colon of ip= argument --- recipes/initscripts/files/rascal-hostname.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/initscripts/files/rascal-hostname.sh b/recipes/initscripts/files/rascal-hostname.sh index f13d703f1f..99c5ca343e 100644 --- a/recipes/initscripts/files/rascal-hostname.sh +++ b/recipes/initscripts/files/rascal-hostname.sh @@ -10,10 +10,10 @@ # \1 means "retrieve the first thing you saved" # # Overall, the command means: -# "Search /proc/cmdline for 5 colons, +# "Search /proc/cmdline for 5 colons after ip=, # and print what's between colons 4 and 5." -HOSTNAME="`sed -ne 's/^[^:]*:[^:]*:[^:]*:[^:]*:\([^:]*\):.*/\1/p' /proc/cmdline`" +HOSTNAME="`sed -ne 's/^.*ip=[^:]*:[^:]*:[^:]*:[^:]*:\([^:]*\):.*/\1/p' /proc/cmdline`" if [ -z "$HOSTNAME" ] then From 0b82d0fa44e5d9be6bf5ea56d8ee54665de7e56e Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 8 Aug 2012 15:26:01 -0300 Subject: [PATCH 492/509] Hardcode Rascal mirror because Debian mirror behaves badly --- recipes/base-passwd/base-passwd_3.5.20.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/base-passwd/base-passwd_3.5.20.bb b/recipes/base-passwd/base-passwd_3.5.20.bb index 6e9c51b98f..4bdac233f1 100644 --- a/recipes/base-passwd/base-passwd_3.5.20.bb +++ b/recipes/base-passwd/base-passwd_3.5.20.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" PR = "r1" SRC_URI = "\ - ${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \ + http://rascalmicro.com/sources/base-passwd_${PV}.tar.gz \ file://nobash.patch \ file://root-home.patch \ file://mysql.patch \ From 6be12f94ae1de299bb359abaf56ef602524d34e1 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Wed, 8 Aug 2012 15:28:40 -0300 Subject: [PATCH 493/509] Add openldap dependency; thanks to D. Hylands for the catch. --- recipes/uwsgi/uwsgi_1.2.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/uwsgi/uwsgi_1.2.3.bb b/recipes/uwsgi/uwsgi_1.2.3.bb index c22e1ba501..ef32f55209 100644 --- a/recipes/uwsgi/uwsgi_1.2.3.bb +++ b/recipes/uwsgi/uwsgi_1.2.3.bb @@ -20,7 +20,7 @@ S = "${WORKDIR}/git" FILES_${PN} += ${libdir}/python2.6 -DEPENDS = "libxml2" +DEPENDS = "libxml2 openldap" RDEPENDS_${PN} = "\ python-core \ From 195e2099cf2691656c2aacb37c0d01b013b77597 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Thu, 6 Sep 2012 14:10:10 +0000 Subject: [PATCH 494/509] Update Numpy to 1.6.2 --- recipes/python/python-numpy_1.6.2.bb | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 recipes/python/python-numpy_1.6.2.bb diff --git a/recipes/python/python-numpy_1.6.2.bb b/recipes/python/python-numpy_1.6.2.bb new file mode 100644 index 0000000000..7d074d3c1b --- /dev/null +++ b/recipes/python/python-numpy_1.6.2.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "A sophisticated Numeric Processing Package for Python" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "PSF" +PR = "ml0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \ + file://config.h \ + file://numpyconfig.h \ + " + +S = "${WORKDIR}/numpy-${PV}" + +inherit distutils + +# Make the build fail and replace *config.h with proper one +# This is a ugly, ugly hack - Koen +do_compile_prepend() { + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ + true + cp ${WORKDIR}/*config.h ${S}/build/$(ls ${S}/build | grep src)/numpy/core/include/numpy/ +} + +SRC_URI[md5sum] = "95ed6c9dcc94af1fc1642ea2a33c1bba" +SRC_URI[sha256sum] = "0b83d96ab79711b548470b7aeee1272c4ba8fcbba6586a67116b566a21ed16c6" From 950585776f1913ab4538d5f7ca1113859c3a31fb Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Fri, 21 Sep 2012 16:31:05 +0000 Subject: [PATCH 495/509] Add packages: blinkm, ffmpeg, g++, gfortran, wireless-tools --- recipes/images/rascal-image.bb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 0ffd5c9c04..7edb35b630 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -5,12 +5,18 @@ IMAGE_INSTALL += "\ avahi-autoipd \ avahi-daemon \ binutils \ + blinkm \ control-freak \ cpp \ cpp-symlinks \ curl \ + ffmpeg \ + g++ \ + g++-symlinks \ gcc \ gcc-symlinks \ + gfortran \ + gfortran-symlinks \ git \ htop \ i2c-tools \ @@ -54,6 +60,7 @@ IMAGE_INSTALL += "\ vim \ vim-syntax \ vim-vimrc \ + wireless-tools \ " export IMAGE_BASENAME = "rascal-image" From 3ee209018b96036d8abb8bc7592655c9fc5d01f8 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Tue, 9 Oct 2012 21:57:57 +0000 Subject: [PATCH 496/509] Add logrotate scripts for Nginx and uWSGI --- recipes/nginx/files/nginx | 11 +++++++++++ recipes/nginx/nginx_1.3.0.bb | 5 ++++- recipes/uwsgi/files/uwsgi | 5 +++++ recipes/uwsgi/uwsgi_1.2.3.bb | 4 +++- 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 recipes/nginx/files/nginx create mode 100644 recipes/uwsgi/files/uwsgi diff --git a/recipes/nginx/files/nginx b/recipes/nginx/files/nginx new file mode 100644 index 0000000000..8bca1f10bc --- /dev/null +++ b/recipes/nginx/files/nginx @@ -0,0 +1,11 @@ +/var/log/nginx/access /var/log/nginx/error { + daily + missingok + rotate 7 + notifempty +# create + sharedscripts + postrotate + [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/recipes/nginx/nginx_1.3.0.bb b/recipes/nginx/nginx_1.3.0.bb index 85c198168e..323d8ecfa6 100644 --- a/recipes/nginx/nginx_1.3.0.bb +++ b/recipes/nginx/nginx_1.3.0.bb @@ -7,9 +7,10 @@ PR = "r0" SRC_URI = "http://nginx.org/download/nginx-${PV}.tar.gz \ file://allow-cross.patch \ + file://nginx \ file://rascal-conf.patch" -DEPENDS = "libpcre" +DEPENDS = "libpcre logrotate" do_configure() { export cross_compiling="yes" @@ -31,6 +32,8 @@ do_configure() { do_install() { install -d ${D}${localstatedir}/lib/nginx install -d ${D}${localstatedir}/log/nginx + install -m 0755 -d ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/nginx ${D}${sysconfdir}/logrotate oe_runmake DESTDIR=${D} install } diff --git a/recipes/uwsgi/files/uwsgi b/recipes/uwsgi/files/uwsgi new file mode 100644 index 0000000000..5c6ab91bea --- /dev/null +++ b/recipes/uwsgi/files/uwsgi @@ -0,0 +1,5 @@ +/var/log/uwsgi/*.log { + daily + copytruncate + rotate 7 +} diff --git a/recipes/uwsgi/uwsgi_1.2.3.bb b/recipes/uwsgi/uwsgi_1.2.3.bb index ef32f55209..c2d3d82c99 100644 --- a/recipes/uwsgi/uwsgi_1.2.3.bb +++ b/recipes/uwsgi/uwsgi_1.2.3.bb @@ -14,13 +14,14 @@ SRC_URI = "git://github.com/rascalmicro/uwsgi.git;protocol=git;branch=interrupts file://emperor.log \ file://editor.log \ file://public.log \ + file://uwsgi \ file://arm-timer-syscall.patch" S = "${WORKDIR}/git" FILES_${PN} += ${libdir}/python2.6 -DEPENDS = "libxml2 openldap" +DEPENDS = "libxml2 logrotate openldap" RDEPENDS_${PN} = "\ python-core \ @@ -52,6 +53,7 @@ do_install() { install -m 0644 ${WORKDIR}/emperor.log ${D}${localstatedir}/log/uwsgi install -m 0644 ${WORKDIR}/editor.log ${D}${localstatedir}/log/uwsgi install -m 0644 ${WORKDIR}/public.log ${D}${localstatedir}/log/uwsgi + install -m 0644 ${WORKDIR}/uwsgi ${D}${sysconfdir}/logrotate } SRC_URI[md5sum] = "6090367c826216f59848677a79fb7129" From 07dea2b03a97375656e6c3035278fbc49bb68e07 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Tue, 16 Oct 2012 21:12:03 +0000 Subject: [PATCH 497/509] Update Flask to 0.9. Builds, but not tested yet. --- recipes/python/python-flask_0.9.bb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 recipes/python/python-flask_0.9.bb diff --git a/recipes/python/python-flask_0.9.bb b/recipes/python/python-flask_0.9.bb new file mode 100644 index 0000000000..a0efe6064c --- /dev/null +++ b/recipes/python/python-flask_0.9.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Web microframework for Python based on Werkzeug, Jinja 2 and good intentions" +HOMEPAGE = "http://flask.pocoo.org/" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "BSD" +SRCNAME = "flask" +PR = "r0" + +S = "${WORKDIR}/git" + +SRCREV = "0.9" +SRC_URI = "git://github.com/mitsuhiko/flask.git;protocol=git;branch=master" + +inherit setuptools + +RDEPENDS_${PN} = "\ + python-core \ + python-jinja2 \ + python-werkzeug \ +" + +do_install_append() { + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py +} From bfce7a9bd511f9937c8145e20d7f39b338ed5cfc Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Thu, 18 Oct 2012 20:23:39 +0000 Subject: [PATCH 498/509] Add Autossh recipe --- recipes/autossh/autossh_1.4c.bb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 recipes/autossh/autossh_1.4c.bb diff --git a/recipes/autossh/autossh_1.4c.bb b/recipes/autossh/autossh_1.4c.bb new file mode 100644 index 0000000000..5f4c79e58f --- /dev/null +++ b/recipes/autossh/autossh_1.4c.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Automatically restart SSH sessions and tunnels" +HOMEPAGE = "http://www.harding.motd.ca/autossh/" +SECTION = "net" +PRIORITY = "optional" +LICENSE = "BSD" +PR = "r0" + +SRC_URI = "http://www.harding.motd.ca/autossh/autossh-${PV}.tgz" + +RDEPENDS = "openssh" + +EXTRA_OECONF = "--bindir=${D}/usr/bin --datadir=${D}/usr/share --mandir=${D}/usr/share/man --exec_prefix=${D}/usr --prefix=${D}/usr" +TARGET_CC_ARCH += "${LDFLAGS}" + +inherit autotools + +SRC_URI[md5sum] = "26520eea934f296be0783dabe7fcfd28" +SRC_URI[sha256sum] = "6fcaba6a409a46bdf832086736bb8f09d245ebce11027f41d39588a95dc7fd1d" From 75f9b7b0e7c63072bd490ada8b240938a6b00f34 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Tue, 23 Oct 2012 15:23:31 -0400 Subject: [PATCH 499/509] Add network config for USB wireless adapters --- recipes/netbase/netbase/interfaces | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipes/netbase/netbase/interfaces b/recipes/netbase/netbase/interfaces index 3aa7318c09..3a58975a99 100644 --- a/recipes/netbase/netbase/interfaces +++ b/recipes/netbase/netbase/interfaces @@ -8,10 +8,17 @@ iface lo inet loopback auto eth0 iface eth0 inet dhcp +# Wireless interface (USB) +# You need the correct wireless drivers to be loaded for this to work. +# Check rascalmicro.com for more details. +# auto wlan0 +# iface wlan0 inet dhcp +# pre-up wpa_supplicant -B -iwlan0 -c/etc/wpa_supplicant.conf +# post-down killall -q wpa_supplicant + # If you want to assign a static IP address, you could comment # out the dhcp line above and uncomment the five lines below. # You might need to tweak the addresses for your network. - # iface eth0 inet static # address 192.168.1.189 # netmask 255.255.255.0 From 853f9a3c9c5650f4ef80a542cbc43530b497d9f4 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Thu, 8 Nov 2012 19:30:19 +0000 Subject: [PATCH 500/509] Disable nginx log rotation; clashes with uWSGI during OE build --- recipes/nginx/nginx_1.3.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/nginx/nginx_1.3.0.bb b/recipes/nginx/nginx_1.3.0.bb index 323d8ecfa6..a8cbe3f93c 100644 --- a/recipes/nginx/nginx_1.3.0.bb +++ b/recipes/nginx/nginx_1.3.0.bb @@ -32,8 +32,8 @@ do_configure() { do_install() { install -d ${D}${localstatedir}/lib/nginx install -d ${D}${localstatedir}/log/nginx - install -m 0755 -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/nginx ${D}${sysconfdir}/logrotate +# install -m 0755 -d ${D}${sysconfdir} +# install -m 0644 ${WORKDIR}/nginx ${D}${sysconfdir}/logrotate oe_runmake DESTDIR=${D} install } From 31624af4b7c26db1b010d8a83f13bc35dd271f14 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Thu, 8 Nov 2012 19:31:37 +0000 Subject: [PATCH 501/509] Remove I2C and SPI pins from GPIO list (until pinctrl works) --- recipes/initscripts/files/rascal-gpio.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/initscripts/files/rascal-gpio.sh b/recipes/initscripts/files/rascal-gpio.sh index 9130b78245..4ebb3e9602 100644 --- a/recipes/initscripts/files/rascal-gpio.sh +++ b/recipes/initscripts/files/rascal-gpio.sh @@ -1,4 +1,4 @@ -for pin in 64 65 66 67 68 69 70 71 72 73 96 97 98 99 100 101 107 +for pin in 68 69 70 71 72 73 74 75 96 97 98 107 do echo $pin > /sys/class/gpio/export echo out > /sys/class/gpio/gpio$pin/direction From 4d489b5c7821f0ad17fcd92f87abdb1f27512bde Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Mon, 22 Jul 2013 19:44:52 +0000 Subject: [PATCH 502/509] Update a bunch of libraries and split Control Freak into Red and Demos repos --- rebuild-uwsgi.sh | 6 +++++ recipes/blas/blas.bb | 14 +++++++++++ recipes/control-freak/control-freak_0.1.bb | 23 ------------------ recipes/images/rascal-image.bb | 3 ++- recipes/python/python-flask-login_0.2.3.bb | 24 +++++++++++++++++++ recipes/python/python-flask_0.10.bb | 25 +++++++++++++++++++ recipes/python/python-jinja2_2.7.bb | 23 ++++++++++++++++++ recipes/python/python-scipy/libblas.so | 0 recipes/python/python-scipy/liblapack.a | 0 recipes/python/python-scipy/umfpack.so | 0 recipes/python/python-scipy_0.8.0.bb | 28 ++++++++++++++++++++++ recipes/python/python-werkzeug_0.9.1.bb | 23 ++++++++++++++++++ recipes/red/red_0.5.bb | 24 +++++++++++++++++++ 13 files changed, 169 insertions(+), 24 deletions(-) create mode 100755 rebuild-uwsgi.sh create mode 100644 recipes/blas/blas.bb delete mode 100644 recipes/control-freak/control-freak_0.1.bb create mode 100644 recipes/python/python-flask-login_0.2.3.bb create mode 100644 recipes/python/python-flask_0.10.bb create mode 100644 recipes/python/python-jinja2_2.7.bb create mode 100644 recipes/python/python-scipy/libblas.so create mode 100644 recipes/python/python-scipy/liblapack.a create mode 100644 recipes/python/python-scipy/umfpack.so create mode 100644 recipes/python/python-scipy_0.8.0.bb create mode 100644 recipes/python/python-werkzeug_0.9.1.bb create mode 100644 recipes/red/red_0.5.bb diff --git a/rebuild-uwsgi.sh b/rebuild-uwsgi.sh new file mode 100755 index 0000000000..10bbcf4bbf --- /dev/null +++ b/rebuild-uwsgi.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +rm oe_sources/uwsgi-1.2.3.tar.gz* +bitbake -c clean uwsgi +cog.py -r recipes/uwsgi/uwsgi_1.2.3.bb +bitbake -D -b uwsgi_1.2.3.bb diff --git a/recipes/blas/blas.bb b/recipes/blas/blas.bb new file mode 100644 index 0000000000..9ad3ed2509 --- /dev/null +++ b/recipes/blas/blas.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "The BLAS (Basic Linear Algebra Subprograms) are routines that provide standard building blocks for performing basic vector and matrix operations." +HOMEPAGE = "http://www.netlib.org/blas/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "Attribution requested" +PR = "r0" + +SRC_URI = "http://www.netlib.org/blas/blas.tgz \ + " + +inherit autotools + +SRC_URI[md5sum] = "5e99e975f7a1e3ea6abcad7c6e7e42e6" +SRC_URI[sha256sum] = "ea87df6dc44829ee0a1733226d130c550b17a0bc51c8dbfcd662fb15520b23b5" diff --git a/recipes/control-freak/control-freak_0.1.bb b/recipes/control-freak/control-freak_0.1.bb deleted file mode 100644 index 60da8ec3f0..0000000000 --- a/recipes/control-freak/control-freak_0.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Demonstration web interface for the Rascal, a small computer for art and science" -HOMEPAGE = "http://rascalmicro.com" -LICENSE = "GPLv3" -SRCNAME = "control-freak" -PR = "r0" - -S = "${WORKDIR}/git" - -SRCREV = "${AUTOREV}" -SRC_URI = "git://github.com/rascalmicro/control-freak.git;protocol=git;branch=master" - -FILES_${PN} = "/var" - -do_configure () { -} - -do_compile () { -} - -do_install () { - install -d ${D}/var/www - cp -r ${S}/* ${D}/var/www/ -} diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 7edb35b630..58a6be5419 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -6,7 +6,6 @@ IMAGE_INSTALL += "\ avahi-daemon \ binutils \ blinkm \ - control-freak \ cpp \ cpp-symlinks \ curl \ @@ -26,6 +25,7 @@ IMAGE_INSTALL += "\ libgcc-dev \ libxml2 \ logrotate \ + lsof \ make \ mtr \ nano \ @@ -52,6 +52,7 @@ IMAGE_INSTALL += "\ python-simplejson \ python-sqlalchemy \ python-werkzeug \ + red \ ruby \ sysstat \ usbutils \ diff --git a/recipes/python/python-flask-login_0.2.3.bb b/recipes/python/python-flask-login_0.2.3.bb new file mode 100644 index 0000000000..e692932184 --- /dev/null +++ b/recipes/python/python-flask-login_0.2.3.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "User session management for Flask" +HOMEPAGE = "http://packages.python.org/Flask-Login/" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "MIT" +SRCNAME = "Flask-Login" +PR = "r0" + +S = "${WORKDIR}/${SRCNAME}-${PV}" +SRC_URI = "http://pypi.python.org/packages/source/F/Flask-Login/Flask-Login-${PV}.tar.gz" + +inherit setuptools + +RDEPENDS_${PN} = "\ + python-flask \ +" + +do_install_append() { + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py +} + +SRC_URI[md5sum] = "566d1b13f2273d7bc35b04151539fa7d" +SRC_URI[sha256sum] = "c829d659cb7095601b2bc17ba3d7649deec78889eaa79e7613dcdfb9936c5830" diff --git a/recipes/python/python-flask_0.10.bb b/recipes/python/python-flask_0.10.bb new file mode 100644 index 0000000000..21ecf454b3 --- /dev/null +++ b/recipes/python/python-flask_0.10.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Web microframework for Python based on Werkzeug, Jinja 2 and good intentions" +HOMEPAGE = "http://flask.pocoo.org/" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "BSD" +SRCNAME = "flask" +PR = "r0" + +S = "${WORKDIR}/git" + +SRCREV = "0.10" +SRC_URI = "git://github.com/mitsuhiko/flask.git;protocol=git;branch=master" + +inherit setuptools + +RDEPENDS_${PN} = "\ + python-core \ + python-jinja2 \ + python-werkzeug \ +" + +do_install_append() { + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py +} diff --git a/recipes/python/python-jinja2_2.7.bb b/recipes/python/python-jinja2_2.7.bb new file mode 100644 index 0000000000..7e95209a68 --- /dev/null +++ b/recipes/python/python-jinja2_2.7.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Modern and designer-friendly templating language for Python, modelled after Django’s templates" +HOMEPAGE = "http://jinja.pocoo.org/" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "BSD" +SRCNAME = "jinja2" +PR = "r0" + +S = "${WORKDIR}/git" + +SRCREV = "2.7" +SRC_URI = "git://github.com/mitsuhiko/jinja2.git;protocol=git;branch=master" + +inherit setuptools + +RDEPENDS_${PN} = "\ + python-core \ +" + +do_install_append() { + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py +} diff --git a/recipes/python/python-scipy/libblas.so b/recipes/python/python-scipy/libblas.so new file mode 100644 index 0000000000..e69de29bb2 diff --git a/recipes/python/python-scipy/liblapack.a b/recipes/python/python-scipy/liblapack.a new file mode 100644 index 0000000000..e69de29bb2 diff --git a/recipes/python/python-scipy/umfpack.so b/recipes/python/python-scipy/umfpack.so new file mode 100644 index 0000000000..e69de29bb2 diff --git a/recipes/python/python-scipy_0.8.0.bb b/recipes/python/python-scipy_0.8.0.bb new file mode 100644 index 0000000000..4d9a3c447f --- /dev/null +++ b/recipes/python/python-scipy_0.8.0.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "SciPy is an Open Source library of scientific tools for Python." +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "BSD" +PR = "ml0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/scipy/scipy-${PV}.tar.gz \ + file://libblas.so\ + file://liblapack.a \ + file://umfpack.so \ + " + +S = "${WORKDIR}/scipy-${PV}" + +export BLAS = ${WORKDIR}/libblas.so +export LAPACK = ${WORKDIR}/liblapack.a +export UMFPACK = ${WORKDIR}/umfpack.so + +export LDFLAGS = "-L${STAGING_LIBDIR}" + +inherit distutils + +do_compile() { + ${STAGING_BINDIR_NATIVE}/python setup.py build --compiler arm-gnueabi-gcc +} + +SRC_URI[md5sum] = "f0bfc6141b90e6a31555b31486602251" +SRC_URI[sha256sum] = "b12937bd3a71ace8d7d6b7e19f8f220630969c2822e6248fc0bbc8f2cc18d825" diff --git a/recipes/python/python-werkzeug_0.9.1.bb b/recipes/python/python-werkzeug_0.9.1.bb new file mode 100644 index 0000000000..f196b12cef --- /dev/null +++ b/recipes/python/python-werkzeug_0.9.1.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "WSGI utility library for Python" +HOMEPAGE = "http://werkzeug.pocoo.org" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "BSD" +SRCNAME = "werkzeug" +PR = "r0" + +S = "${WORKDIR}/git" + +SRCREV = "0.9.1" +SRC_URI = "git://github.com/mitsuhiko/werkzeug.git;protocol=git;branch=master" + +inherit setuptools + +RDEPENDS_${PN} = "\ + python-core \ +" + +do_install_append() { + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py +} diff --git a/recipes/red/red_0.5.bb b/recipes/red/red_0.5.bb new file mode 100644 index 0000000000..40becd65ec --- /dev/null +++ b/recipes/red/red_0.5.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Red, the Rascal editor, is the web-based editor that is built into every Rascal, a small computer for art and science" +HOMEPAGE = "http://rascalmicro.com" +LICENSE = "GPLv3" +SRCNAME = "red" +PR = "r0" + +S = "${WORKDIR}/git" + +SRCREV = "${AUTOREV}" +SRC_URI = "git://github.com/rascalmicro/red.git;protocol=git;branch=master" + +FILES_${PN} = "/var" + +do_configure () { +} + +do_compile () { +} + +do_install () { + install -d ${D}/var/www + install -d ${D}/var/www/editor + cp -r ${S}/* ${D}/var/www/editor/ +} From ee85b537932c37dd899910a7ab21454a5a5bb24d Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Mon, 22 Jul 2013 19:49:18 +0000 Subject: [PATCH 503/509] Update uWSGI to 1.9.14 by fixing assert4 compile error --- recipes/uwsgi/uwsgi_1.9.14.bb | 61 +++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 recipes/uwsgi/uwsgi_1.9.14.bb diff --git a/recipes/uwsgi/uwsgi_1.9.14.bb b/recipes/uwsgi/uwsgi_1.9.14.bb new file mode 100644 index 0000000000..78cb9348fb --- /dev/null +++ b/recipes/uwsgi/uwsgi_1.9.14.bb @@ -0,0 +1,61 @@ +DESCRIPTION = "uWSGI is a WSGI web server for Python web applications" +HOMEPAGE = "http://projects.unbit.it/uwsgi/wiki" +SECTION = "net" +PRIORITY = "optional" +LICENSE = "GPLv2" +SRCNAME = "uwsgi" +PR = "r0" + +SRCREV = "1.9.14" + +SRC_URI = "git://github.com/rascalmicro/uwsgi.git;protocol=git;branch=interrupts \ + file://editor.ini \ + file://public.ini \ + file://emperor.log \ + file://editor.log \ + file://public.log \ + file://uwsgi" + +S = "${WORKDIR}/git" + +FILES_${PN} += ${libdir}/python2.6 + +DEPENDS = "libxml2 logrotate openldap" + +RDEPENDS_${PN} = "\ + python-core \ +" + +CFLAGS += "-DOBSOLETE_LINUX_KERNEL" + +do_compile_prepend() { + export BUILD_SYS=${BUILD_SYS} + export HOST_SYS=${HOST_SYS} + export STAGING_INCDIR=${STAGING_INCDIR} + export STAGING_LIBDIR=${STAGING_LIBDIR} +} + +do_compile() { + python uwsgiconfig.py --build +} + +do_install() { + echo ${S} + install -m 0755 -d ${D}${sbindir} + install -m 0755 ${S}/uwsgi ${D}${sbindir} + install -m 0755 -d ${D}${sysconfdir} + install -m 0755 -d ${D}${sysconfdir}/uwsgi + install -m 0644 ${WORKDIR}/editor.ini ${D}${sysconfdir}/uwsgi + install -m 0644 ${WORKDIR}/public.ini ${D}${sysconfdir}/uwsgi + install -m 0755 -d ${D}${libdir}/python2.6 + install -m 0755 ${S}/uwsgidecorators.py ${D}${libdir}/python2.6 + + install -m 0755 -d ${D}${localstatedir}/log/uwsgi + install -m 0644 ${WORKDIR}/emperor.log ${D}${localstatedir}/log/uwsgi + install -m 0644 ${WORKDIR}/editor.log ${D}${localstatedir}/log/uwsgi + install -m 0644 ${WORKDIR}/public.log ${D}${localstatedir}/log/uwsgi + install -m 0644 ${WORKDIR}/uwsgi ${D}${sysconfdir}/logrotate +} + +SRC_URI[md5sum] = "6090367c826216f59848677a79fb7129" +SRC_URI[sha256sum] = "1f9f6047468272708241780597014ed00d93919a384e81b30e65167fb2c2e129" From 9bd7345b1ddbba0a665c8e948dd51b87e3624e55 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Mon, 22 Jul 2013 20:38:47 +0000 Subject: [PATCH 504/509] Add recipes for gevent and greenlet, plus add libevent dep --- recipes/images/rascal-image.bb | 3 +++ recipes/python/python-gevent_0.13.8.bb | 22 ++++++++++++++++++++++ recipes/python/python-greenlet_0.4.0.bb | 17 +++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 recipes/python/python-gevent_0.13.8.bb create mode 100644 recipes/python/python-greenlet_0.4.0.bb diff --git a/recipes/images/rascal-image.bb b/recipes/images/rascal-image.bb index 58a6be5419..a36b5dea2a 100644 --- a/recipes/images/rascal-image.bb +++ b/recipes/images/rascal-image.bb @@ -22,6 +22,7 @@ IMAGE_INSTALL += "\ iotop \ iperf \ ipython \ + libevent \ libgcc-dev \ libxml2 \ logrotate \ @@ -40,6 +41,8 @@ IMAGE_INSTALL += "\ python-dev \ python-flask \ python-flask-login \ + python-gevent \ + python-greenlet \ python-imaging \ python-jinja2 \ python-matplotlib \ diff --git a/recipes/python/python-gevent_0.13.8.bb b/recipes/python/python-gevent_0.13.8.bb new file mode 100644 index 0000000000..49b1b80ac4 --- /dev/null +++ b/recipes/python/python-gevent_0.13.8.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Networking library that uses greenlet to provide synchronous API on top of libevent event loop" + +SECTION = "devel/python" +HOMEPAGE = "http://www.gevent.org" +LICENSE = "MIT" +DEPENDS = "libevent" +RDEPENDS_${PN} = "\ + python-pprint \ + python-greenlet" + +PR = "r1" + +SRC_URI = "http://pypi.python.org/packages/source/g/gevent/gevent-${PV}.tar.gz" +S = "${WORKDIR}/gevent-${PV}" + +inherit setuptools + +FILES_${PN}-dbg += "${libdir}/python2.*/site-packages/gevent/.debug" + +SRC_URI[md5sum] = "ca9dcaa7880762d8ebbc266b11252960" +SRC_URI[sha256sum] = "54b8d26300ce408c0916a3e63ef6cd3e6aca76230833558deb7de15196ed955e" + diff --git a/recipes/python/python-greenlet_0.4.0.bb b/recipes/python/python-greenlet_0.4.0.bb new file mode 100644 index 0000000000..6792090057 --- /dev/null +++ b/recipes/python/python-greenlet_0.4.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Lightweight in-process concurrent programming" + +SECTION = "devel/python" +HOMEPAGE = "https://github.com/python-greenlet/greenlet" +LICENSE = "MIT" +PR = "r1" + +SRC_URI = "http://pypi.python.org/packages/source/g/greenlet/greenlet-${PV}.zip" +S = "${WORKDIR}/greenlet-${PV}" + +inherit distutils + +FILES_${PN}-dbg += "${libdir}/python2.*/site-packages/.debug" + +SRC_URI[md5sum] = "87887570082caadc08fb1f8671dbed71" +SRC_URI[sha256sum] = "3f52af03bf8a89045fc159c6a76d5642349b30fb41c3df1a22b12bbd3920b1ee" + From 466f91a7b12c7f991acd84c7dbd276e3ebe2ca85 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Sat, 5 Oct 2013 04:43:16 +0000 Subject: [PATCH 505/509] Comment out annoying Angstrom warning --- classes/angstrom.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/angstrom.bbclass b/classes/angstrom.bbclass index 4a810a638a..12d9100dcd 100644 --- a/classes/angstrom.bbclass +++ b/classes/angstrom.bbclass @@ -12,7 +12,7 @@ python () { pkgnm = bb.data.getVar("PN", d, 1) if blacklist: - bb.note("Angstrom DOES NOT support %s because %s" % (pkgnm, blacklist)) + # bb.note("Angstrom DOES NOT support %s because %s" % (pkgnm, blacklist)) raise bb.parse.SkipPackage("Angstrom DOES NOT support %s because %s" % (pkgnm, blacklist)) } From a6b70c34c5be631ae682dd4cb3ce430fdf8d327c Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Sat, 5 Oct 2013 04:44:50 +0000 Subject: [PATCH 506/509] Add supervisord. Builds, runs, but needs a startup script and more testing --- recipes/supervisord/files/supervisord.conf | 20 ++++++++ recipes/supervisord/supervisord_3.0.bb | 59 ++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 recipes/supervisord/files/supervisord.conf create mode 100644 recipes/supervisord/supervisord_3.0.bb diff --git a/recipes/supervisord/files/supervisord.conf b/recipes/supervisord/files/supervisord.conf new file mode 100644 index 0000000000..c78dc6e595 --- /dev/null +++ b/recipes/supervisord/files/supervisord.conf @@ -0,0 +1,20 @@ +[inet_http_server] +port=127.0.0.1:9001 + +[supervisord] +logfile=/var/log/supervisord.log +logfile_maxbytes=1MB +logfile_backups=0 +loglevel=error +pidfile=/var/run/supervisord.pid +user=root +childlogdir=/var/log/ + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[supervisorctl] +serverurl=http://127.0.0.1:9001 + +[include] +files = /etc/supervisor/conf.d/*.conf diff --git a/recipes/supervisord/supervisord_3.0.bb b/recipes/supervisord/supervisord_3.0.bb new file mode 100644 index 0000000000..0f34c73a25 --- /dev/null +++ b/recipes/supervisord/supervisord_3.0.bb @@ -0,0 +1,59 @@ +DESCRIPTION = "A system for controlling process state under UNIX" +HOMEPAGE = "http://supervisord.org" +SECTION = "admin" +PRIORITY = "optional" +LICENSE = "BSD" +PR = "ml1" + +SRC_URI = "https://pypi.python.org/packages/source/s/supervisor/supervisor-${PV}.tar.gz \ + file://supervisord.conf" + +S = "${WORKDIR}/supervisor-${PV}" + +inherit setuptools + +# Removed python-meld3 from RDEPENDS. Will probably need to post-install it with pip. + +RDEPENDS_${PN} = "\ + python-setuptools \ + python-misc \ + python-html \ + python-unixadmin \ + python-xmlrpc \ + python-shell \ + python-resource" + + +PACKAGES = "${PN}" + +site_packages="${libdir}/python2.*/site-packages" + +FILES_${PN} = "\ + ${sysconfdir}/* \ + ${bindir}/* \ + ${site_packages}/*.egg-info \ + ${site_packages}/*.pth \ + ${site_packages}/supervisor/*.pyo \ + ${site_packages}/supervisor/*.txt \ + ${site_packages}/supervisor/ui \ + ${site_packages}/supervisor/medusa/*.pyo \ + ${site_packages}/supervisor/medusa/*.txt \ + ${site_packages}/supervisor/medusa/thread/*.pyo" + +do_install_prepend() { + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/supervisor/conf.d + + install -m 0644 ${WORKDIR}/supervisord.conf ${D}${sysconfdir}/supervisord.conf +} + +pkg_postinst() { + update-rc.d supervisord defaults 90 +} + +pkg_postrm() { + update-rc.d supervisord remove +} + +SRC_URI[md5sum] = "94ff3cf09618c36889425a8e002cd51a" +SRC_URI[sha256sum] = "82aac54c5760b6a4f4c28dda203714e362a68b4a9ba8549fa65955998e3a2212" From 2483bb717e79dbbe89d5695e9ca253a24c1cabe1 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Sat, 5 Oct 2013 04:46:12 +0000 Subject: [PATCH 507/509] Add recipes for Cython and Gevent --- ...docs-to-_Extension.extension.__doc__.patch | 27 +++++++++++++++++++ recipes/python/python-cython_0.15.1.bb | 19 +++++++++++++ ...cython_0.13.bb => python-cython_0.19.1.bb} | 10 +++---- recipes/python/python-gevent_1.0rc2.bb | 24 +++++++++++++++++ 4 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 recipes/python/python-cython/0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch create mode 100644 recipes/python/python-cython_0.15.1.bb rename recipes/python/{python-cython_0.13.bb => python-cython_0.19.1.bb} (65%) create mode 100644 recipes/python/python-gevent_1.0rc2.bb diff --git a/recipes/python/python-cython/0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch b/recipes/python/python-cython/0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch new file mode 100644 index 0000000000..9b9dd460bf --- /dev/null +++ b/recipes/python/python-cython/0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch @@ -0,0 +1,27 @@ +From bfed128dfe9551a3a40b1ac4269f18ecfeac80a9 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 1 Oct 2011 11:46:30 +0200 +Subject: [PATCH] Don't append docs to _Extension.extension.__doc__ + +* here it fails with TypeError: unsupported operand type(s) for +: 'NoneType' and 'str' in setup.py + +Signed-off-by: Martin Jansa +--- + Cython/Distutils/extension.py | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/Cython/Distutils/extension.py b/Cython/Distutils/extension.py +index a5a6638..e76c1e7 100644 +--- a/Cython/Distutils/extension.py ++++ b/Cython/Distutils/extension.py +@@ -16,7 +16,6 @@ except ImportError: + warnings = None + + class Extension(_Extension.Extension): +- _Extension.Extension.__doc__ + \ + """pyrex_include_dirs : [string] + list of directories to search for Pyrex header files (.pxd) (in + Unix form for portability) +-- +1.7.6.1 + diff --git a/recipes/python/python-cython_0.15.1.bb b/recipes/python/python-cython_0.15.1.bb new file mode 100644 index 0000000000..0bf057aa82 --- /dev/null +++ b/recipes/python/python-cython_0.15.1.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Cython is a language specially designed for writing Python extension modules. \ +It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \ +and the messy, low-level world of C." +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" +SRCNAME = "Cython" +BBCLASSEXTEND = "native" +PR = "r3" + +SRC_URI = "http://www.cython.org/release/${SRCNAME}-${PV}.tar.gz \ + file://0001-Don-t-append-docs-to-_Extension.extension.__doc__.patch \ +" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +SRC_URI[md5sum] = "171021b3845c9ca8bd6d8185b3cde664" +SRC_URI[sha256sum] = "248123f2f02f2701a28d9452132ac835533b396a273cda9d361cb65c26067edc" + +inherit distutils diff --git a/recipes/python/python-cython_0.13.bb b/recipes/python/python-cython_0.19.1.bb similarity index 65% rename from recipes/python/python-cython_0.13.bb rename to recipes/python/python-cython_0.19.1.bb index 966e265ffa..c2d806634b 100644 --- a/recipes/python/python-cython_0.13.bb +++ b/recipes/python/python-cython_0.19.1.bb @@ -2,17 +2,17 @@ DESCRIPTION = "Cython is a language specially designed for writing Python extens It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \ and the messy, low-level world of C." SECTION = "devel/python" -PRIORITY = "optional" LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" SRCNAME = "Cython" BBCLASSEXTEND = "native" -NATIVE_INSTALL_WORKS = "1" -DEPENDS = "python" +PR = "r3" SRC_URI = "http://www.cython.org/release/${SRCNAME}-${PV}.tar.gz" + S = "${WORKDIR}/${SRCNAME}-${PV}" -SRC_URI[md5sum] = "ed2ec5e0df60a6b8e500bedf93bb1feb" -SRC_URI[sha256sum] = "a30d5e26c82ec65d65703c7cf312161a21b30339addc1a42d3b2965dea254ca6" +SRC_URI[md5sum] = "df4cfb2b8e3345272e3fc451b76bd630" +SRC_URI[sha256sum] = "0b90aaa286acdd1bf75a6dd144dfc45192f011f2c2401cf5f80ed6ab5f8bf778" inherit distutils diff --git a/recipes/python/python-gevent_1.0rc2.bb b/recipes/python/python-gevent_1.0rc2.bb new file mode 100644 index 0000000000..069b1606c2 --- /dev/null +++ b/recipes/python/python-gevent_1.0rc2.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Networking library that uses greenlet to provide synchronous API on top of libevent event loop" + +SECTION = "devel/python" +HOMEPAGE = "http://www.gevent.org" +LICENSE = "MIT" +DEPENDS = "libevent python-cython" +RDEPENDS_${PN} = "\ + python-pprint \ + python-greenlet" + +PR = "r1" + +SRC_URI = "http://rascalmicro.com/sources/gevent-${PV}.tar.gz" +S = "${WORKDIR}/gevent-${PV}" + +CYTHON = ${WORKDIR}/tmp/work/i686-linux/python-cython-native-0.15.1-r3/Cython-0.15.1/bin/cython + +inherit setuptools + +FILES_${PN}-dbg += "${libdir}/python2.*/site-packages/gevent/.debug" + +SRC_URI[md5sum] = "e1bce8e15c7ebb08788978c0f4860f9d" +SRC_URI[sha256sum] = "f74bfe36e969e53b5e83ef06f7bee0b867147a38a762abb325cb7ad7b299c584" + From 0ead6cb8ad8791217e595bd5bcca119396abed14 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Sat, 5 Oct 2013 04:48:02 +0000 Subject: [PATCH 508/509] Add OpenSSL dependency so uWSGI will be able to use websockets --- recipes/uwsgi/uwsgi_1.9.14.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/uwsgi/uwsgi_1.9.14.bb b/recipes/uwsgi/uwsgi_1.9.14.bb index 78cb9348fb..79144ebb19 100644 --- a/recipes/uwsgi/uwsgi_1.9.14.bb +++ b/recipes/uwsgi/uwsgi_1.9.14.bb @@ -20,7 +20,7 @@ S = "${WORKDIR}/git" FILES_${PN} += ${libdir}/python2.6 -DEPENDS = "libxml2 logrotate openldap" +DEPENDS = "libxml2 logrotate openldap openssl" RDEPENDS_${PN} = "\ python-core \ @@ -36,7 +36,7 @@ do_compile_prepend() { } do_compile() { - python uwsgiconfig.py --build + UWSGI_INCLUDES=/usr/include,/home/ubuntu/openembedded-rascal/tmp/sysroots/armv5te-angstrom-linux-gnueabi/usr/include/openssl python uwsgiconfig.py --build } do_install() { From 504619c8a7d692968eebca53c7fb8edcb5bda6d1 Mon Sep 17 00:00:00 2001 From: Brandon Stafford Date: Thu, 24 Oct 2013 20:17:23 +0000 Subject: [PATCH 509/509] Add init script to supervisord --- recipes/supervisord/files/supervisord.sh | 84 ++++++++++++++++++++++++ recipes/supervisord/supervisord_3.0.bb | 4 +- 2 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 recipes/supervisord/files/supervisord.sh diff --git a/recipes/supervisord/files/supervisord.sh b/recipes/supervisord/files/supervisord.sh new file mode 100644 index 0000000000..a5f7357953 --- /dev/null +++ b/recipes/supervisord/files/supervisord.sh @@ -0,0 +1,84 @@ +#! /bin/sh +# +# Written by Miquel van Smoorenburg +# Modified for Debian GNU/Linux +# by Ian Murdock +# Modified for resetbutton by Juan Menendez + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="Supervisor" +NAME=supervisord +DAEMON=/usr/bin/$NAME +PIDFILE=/var/run/$NAME.pid +DAEMON_ARGS="--pidfile ${PIDFILE} --config /etc/$NAME.conf" +SUPERVISORCTL=/usr/bin/supervisorctl + +test -x $DAEMON || exit 0 + +set -e + +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + [ -e $PIDFILE ] && return 1 + + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ + $DAEMON_ARGS || return 2 +} + +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + [ -e $PIDFILE ] || return 1 + + # Stop all processes under supervisord control. + $SUPERVISORCTL stop all + + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + +case "$1" in + start) + echo -n "Starting $DESC: $NAME" + do_start + echo "." + ;; + stop) + echo -n "Stopping $DESC: $NAME" + do_stop + echo "." + ;; + restart) + echo -n "Restarting $DESC: $NAME" + do_stop + do_start + echo "done." + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/recipes/supervisord/supervisord_3.0.bb b/recipes/supervisord/supervisord_3.0.bb index 0f34c73a25..b114245a6f 100644 --- a/recipes/supervisord/supervisord_3.0.bb +++ b/recipes/supervisord/supervisord_3.0.bb @@ -6,7 +6,8 @@ LICENSE = "BSD" PR = "ml1" SRC_URI = "https://pypi.python.org/packages/source/s/supervisor/supervisor-${PV}.tar.gz \ - file://supervisord.conf" + file://supervisord.conf \ + file://supervisord.sh" S = "${WORKDIR}/supervisor-${PV}" @@ -45,6 +46,7 @@ do_install_prepend() { install -d ${D}${sysconfdir}/supervisor/conf.d install -m 0644 ${WORKDIR}/supervisord.conf ${D}${sysconfdir}/supervisord.conf + install -m 0755 ${WORKDIR}/supervisord.sh ${D}${sysconfdir}/init.d/supervisord.sh } pkg_postinst() {

    ^x+tN2w+w#}Nc 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%0A}*sND^(I_Uq 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