From 58f400fb35cc87a5405d570c0563192b87b50a91 Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Wed, 13 Mar 2013 10:41:10 +0200 Subject: [PATCH 01/41] tvheadend: do not send debug message to syslog Apparently tvheadend by default uses the syslog service, and the `-s` option that we provide in the startup script in fact makes tvheadend send debug messages to syslog (which we obviously do not want by default as this causes for my single DVB card 1k/min to /var, which is 4MB/month). So this fix disables the `-s` option in the tvheadend startup script. closes #2053, closes #2055 --- .../service/multimedia/tvheadend/source/bin/tvheadend.start | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start index d39b22dc8f..3ddfa7d65c 100755 --- a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start +++ b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start @@ -94,7 +94,11 @@ if [ ! -f "$TIMESHIFT_SETTINGS_FILE" ]; then fi fi -TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME" +if [ "$DEBUG" = "yes" ]; then + ADEND_ARG="-C -s -u root -g video -c $ADDON_HOME" +else + ADEND_ARG="-C -u root -g video -c $ADDON_HOME" +fi mkdir -p /var/config if [ -f $ADDON_DIR/settings-default.xml ]; then From 90be8140a5dd0d7d2c426474125733ee04f5018e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 13 Mar 2013 16:38:35 +0000 Subject: [PATCH 02/41] linux-tbs-drivers: update to linux-tbs-drivers-130127 --- packages/linux-drivers/linux-tbs-drivers/meta | 2 +- .../linux-tbs-drivers-121119-kernel-3.7.patch | 117 ------------------ .../linux-drivers/linux-tbs-drivers/unpack | 7 -- 3 files changed, 1 insertion(+), 125 deletions(-) delete mode 100644 packages/linux-drivers/linux-tbs-drivers/patches.upstream/linux-tbs-drivers-121119-kernel-3.7.patch diff --git a/packages/linux-drivers/linux-tbs-drivers/meta b/packages/linux-drivers/linux-tbs-drivers/meta index 0623b0bf3d..04f4056b9e 100644 --- a/packages/linux-drivers/linux-tbs-drivers/meta +++ b/packages/linux-drivers/linux-tbs-drivers/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="linux-tbs-drivers" -PKG_VERSION="121119" +PKG_VERSION="130127" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/linux-drivers/linux-tbs-drivers/patches.upstream/linux-tbs-drivers-121119-kernel-3.7.patch b/packages/linux-drivers/linux-tbs-drivers/patches.upstream/linux-tbs-drivers-121119-kernel-3.7.patch deleted file mode 100644 index 93ce5d8c0c..0000000000 --- a/packages/linux-drivers/linux-tbs-drivers/patches.upstream/linux-tbs-drivers-121119-kernel-3.7.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff --git a/linux-tbs-drivers/linux/drivers/media/video/et61x251/et61x251_core.c b/linux-tbs-drivers/linux/drivers/media/video/et61x251/et61x251_core.c -index 3146eec..c3a112e 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/et61x251/et61x251_core.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/et61x251/et61x251_core.c -@@ -1550,7 +1550,7 @@ static int et61x251_mmap(struct file* filp, struct vm_area_struct *vma) - } - - vma->vm_flags |= VM_IO; -- vma->vm_flags |= VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - - pos = cam->frame[i].bufmem; - while (size > 0) { /* size is page-aligned */ -diff --git a/linux-tbs-drivers/linux/drivers/media/video/meye.c b/linux-tbs-drivers/linux/drivers/media/video/meye.c -index 2b7b1db..c80a3c5 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/meye.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/meye.c -@@ -1708,7 +1708,7 @@ static int meye_mmap(struct file *file, struct vm_area_struct *vma) - - vma->vm_ops = &meye_vm_ops; - vma->vm_flags &= ~VM_IO; /* not I/O memory */ -- vma->vm_flags |= VM_RESERVED; /* avoid to swap out this VMA */ -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; /* avoid to swap out this VMA */ - vma->vm_private_data = (void *) (offset / gbufsize); - meye_vm_open(vma); - -diff --git a/linux-tbs-drivers/linux/drivers/media/video/omap/omap_vout.c b/linux-tbs-drivers/linux/drivers/media/video/omap/omap_vout.c -index b5ef362..b8119fe 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/omap/omap_vout.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/omap/omap_vout.c -@@ -896,7 +896,7 @@ static int omap_vout_mmap(struct file *file, struct vm_area_struct *vma) - - q->bufs[i]->baddr = vma->vm_start; - -- vma->vm_flags |= VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); - vma->vm_ops = &omap_vout_vm_ops; - vma->vm_private_data = (void *) vout; -diff --git a/linux-tbs-drivers/linux/drivers/media/video/sn9c102/sn9c102_core.c b/linux-tbs-drivers/linux/drivers/media/video/sn9c102/sn9c102_core.c -index 32aa3c2..49d7042 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/sn9c102/sn9c102_core.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/sn9c102/sn9c102_core.c -@@ -2130,7 +2130,7 @@ static int sn9c102_mmap(struct file* filp, struct vm_area_struct *vma) - } - - vma->vm_flags |= VM_IO; -- vma->vm_flags |= VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - - pos = cam->frame[i].bufmem; - while (size > 0) { /* size is page-aligned */ -diff --git a/linux-tbs-drivers/linux/drivers/media/video/usbvision/usbvision-video.c b/linux-tbs-drivers/linux/drivers/media/video/usbvision/usbvision-video.c -index 5a74f5e..5791c67 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/usbvision/usbvision-video.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/usbvision/usbvision-video.c -@@ -1091,7 +1091,7 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma) - - /* VM_IO is eventually going to replace PageReserved altogether */ - vma->vm_flags |= VM_IO; -- vma->vm_flags |= VM_RESERVED; /* avoid to swap out this VMA */ -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; /* avoid to swap out this VMA */ - - pos = usbvision->frame[i].data; - while (size > 0) { -diff --git a/linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c b/linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c -index f163a3a..844adad 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c -@@ -586,7 +586,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q, - map->count = 1; - map->q = q; - vma->vm_ops = &videobuf_vm_ops; -- vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - vma->vm_flags &= ~VM_IO; /* using shared anonymous pages */ - vma->vm_private_data = map; - dprintk(1, "mmap %p: q=%p %08lx-%08lx pgoff %08lx bufs %d-%d\n", -diff --git a/linux-tbs-drivers/linux/drivers/media/video/videobuf-vmalloc.c b/linux-tbs-drivers/linux/drivers/media/video/videobuf-vmalloc.c -index 9f5632c..21375fa 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/videobuf-vmalloc.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/videobuf-vmalloc.c -@@ -274,7 +274,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q, - } - - vma->vm_ops = &videobuf_vm_ops; -- vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - vma->vm_private_data = map; - - dprintk(1, "mmap %p: q=%p %08lx-%08lx (%lx) pgoff %08lx buf %d\n", -diff --git a/linux-tbs-drivers/linux/drivers/media/video/videobuf2-memops.c b/linux-tbs-drivers/linux/drivers/media/video/videobuf2-memops.c -index f542538..f330bf0 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/videobuf2-memops.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/videobuf2-memops.c -@@ -176,7 +176,7 @@ int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr, - return ret; - } - -- vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - vma->vm_private_data = priv; - vma->vm_ops = vm_ops; - -diff --git a/linux-tbs-drivers/linux/drivers/media/video/vino.c b/linux-tbs-drivers/linux/drivers/media/video/vino.c -index 52a0a37..7a40e12 100755 ---- a/linux-tbs-drivers/linux/drivers/media/video/vino.c -+++ b/linux-tbs-drivers/linux/drivers/media/video/vino.c -@@ -3950,7 +3950,7 @@ found: - - fb->map_count = 1; - -- vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED; -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; - vma->vm_flags &= ~VM_IO; - vma->vm_private_data = fb; - vma->vm_file = file; diff --git a/packages/linux-drivers/linux-tbs-drivers/unpack b/packages/linux-drivers/linux-tbs-drivers/unpack index 725aaf616f..e91a5bc4c5 100755 --- a/packages/linux-drivers/linux-tbs-drivers/unpack +++ b/packages/linux-drivers/linux-tbs-drivers/unpack @@ -33,10 +33,3 @@ tar xjf $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers.tar.bz2 -C $BUILD/${ # fix permissions chmod -R u+rwX $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers/* -echo "### Applying upstream patches ###" - -for patch in `ls $PKG_DIR/patches.upstream/*.patch`; do - cat $patch | patch -d \ - `echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1 -done - From 52e5e212260d7214448846edb4ab4a690e831bed Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 13 Mar 2013 22:12:52 +0200 Subject: [PATCH 03/41] tools/mkpkg: add script to get and package 'boblightd' --- tools/mkpkg/mkpkg_boblightd | 44 +++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100755 tools/mkpkg/mkpkg_boblightd diff --git a/tools/mkpkg/mkpkg_boblightd b/tools/mkpkg/mkpkg_boblightd new file mode 100755 index 0000000000..5961b288cc --- /dev/null +++ b/tools/mkpkg/mkpkg_boblightd @@ -0,0 +1,44 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# 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, 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 OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + + +echo "getting sources..." + svn checkout http://boblight.googlecode.com/svn/trunk/ boblightd-latest + +echo "getting version..." + cd boblightd-latest + SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'` + echo $SVN_REV + cd .. + +echo "copying sources..." + rm -rf boblightd-$SVN_REV + cp -R boblightd-latest boblightd-$SVN_REV + +#echo "cleaning sources..." + find boblightd-$SVN_REV -name ".svn" -exec rm -rf {} \; 2>/dev/null + +echo "packing sources..." + tar cvJf boblightd-$SVN_REV.tar.xz boblightd-$SVN_REV + +echo "remove temporary sourcedir..." + rm -rf boblightd-$SVN_REV From b62eb63f10b95b5099893dc93d34f608d623ebd6 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 13 Mar 2013 22:13:34 +0200 Subject: [PATCH 04/41] boblightd: update to boblightd-465 --- .../service/multimedia/boblightd/changelog.txt | 3 +++ packages/addons/service/multimedia/boblightd/meta | 4 ++-- .../patches/boblightd-2.0.5-automake-1.13.patch | 13 ------------- 3 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-automake-1.13.patch diff --git a/packages/addons/service/multimedia/boblightd/changelog.txt b/packages/addons/service/multimedia/boblightd/changelog.txt index ce49292a38..96b75f4a3e 100644 --- a/packages/addons/service/multimedia/boblightd/changelog.txt +++ b/packages/addons/service/multimedia/boblightd/changelog.txt @@ -1,3 +1,6 @@ +3.0.3 +- update to boblightd-465 + 3.0.2 - depends on libGLU diff --git a/packages/addons/service/multimedia/boblightd/meta b/packages/addons/service/multimedia/boblightd/meta index a3d1cffabf..ba30c23e8b 100644 --- a/packages/addons/service/multimedia/boblightd/meta +++ b/packages/addons/service/multimedia/boblightd/meta @@ -19,8 +19,8 @@ ################################################################################ PKG_NAME="boblightd" -PKG_VERSION="449" -PKG_REV="2" +PKG_VERSION="465" +PKG_REV="3" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://code.google.com/p/boblight" diff --git a/packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-automake-1.13.patch b/packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-automake-1.13.patch deleted file mode 100644 index 04c35d7645..0000000000 --- a/packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-automake-1.13.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index e2a6aaf..c20a3fc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9,7 +9,7 @@ AM_MAINTAINER_MODE - - AC_ISC_POSIX - AC_PROG_CXX --AM_PROG_CC_STDC -+AC_PROG_CC - AC_HEADER_STDC - - AM_PROG_LIBTOOL From ca8d8a03451c94a08e33baac7d2cdab4f0f2304e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 14 Mar 2013 10:58:05 +0200 Subject: [PATCH 05/41] boblightd: depends on libusb --- packages/addons/service/multimedia/boblightd/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/multimedia/boblightd/meta b/packages/addons/service/multimedia/boblightd/meta index ba30c23e8b..00d3dec056 100644 --- a/packages/addons/service/multimedia/boblightd/meta +++ b/packages/addons/service/multimedia/boblightd/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://code.google.com/p/boblight" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" +PKG_DEPENDS="libusb" +PKG_BUILD_DEPENDS="toolchain libusb" PKG_PRIORITY="optional" PKG_SECTION="service/multimedia" PKG_SHORTDESC="boblightd: an ambilight controller." From afb99f9b76f287c22a37e846218816672cd284e3 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 15 Mar 2013 12:01:45 +0400 Subject: [PATCH 06/41] nvidia: remove FlatPanelProperties this is no longer supported on 3xx series nvidia drivers --- packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf b/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf index 19958df7ef..cd1c69a439 100644 --- a/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf +++ b/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf @@ -5,7 +5,6 @@ Section "Device" Option "NoFlip" "false" Option "NoLogo" "true" Option "ConnectToAcpid" "0" - Option "FlatPanelProperties" "Scaling = Native" Option "ModeValidation" "NoVesaModes, NoXServerModes" Option "HWCursor" "false" # To put Xorg in debug mode change "false" to "true" in the line below: @@ -31,4 +30,4 @@ EndSection Section "Extensions" Option "Composite" "false" -EndSection \ No newline at end of file +EndSection From 8170ae661f8e8558b6870a25bc4f660e4d025937 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 15 Mar 2013 12:02:42 +0400 Subject: [PATCH 07/41] nvidia-legacy: remove FlatPanelProperties this is no longer supported on 3xx series nvidia drivers --- .../driver/xf86-video-nvidia-legacy/config/xorg-nvidia.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/config/xorg-nvidia.conf b/packages/x11/driver/xf86-video-nvidia-legacy/config/xorg-nvidia.conf index 19958df7ef..cd1c69a439 100644 --- a/packages/x11/driver/xf86-video-nvidia-legacy/config/xorg-nvidia.conf +++ b/packages/x11/driver/xf86-video-nvidia-legacy/config/xorg-nvidia.conf @@ -5,7 +5,6 @@ Section "Device" Option "NoFlip" "false" Option "NoLogo" "true" Option "ConnectToAcpid" "0" - Option "FlatPanelProperties" "Scaling = Native" Option "ModeValidation" "NoVesaModes, NoXServerModes" Option "HWCursor" "false" # To put Xorg in debug mode change "false" to "true" in the line below: @@ -31,4 +30,4 @@ EndSection Section "Extensions" Option "Composite" "false" -EndSection \ No newline at end of file +EndSection From 5e21db74991c2fcbc2e7953a7269e0418eb73985 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 15 Mar 2013 12:04:09 +0400 Subject: [PATCH 08/41] nvidia-atv: remove FlatPanelProperties this is no longer supported on 3xx series nvidia drivers --- projects/ATV/filesystem/etc/X11/xorg-nvidia.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf b/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf index dc8c0d4fc0..83a8ba9e58 100644 --- a/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf +++ b/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf @@ -5,7 +5,6 @@ Section "Device" Option "NoFlip" "false" Option "NoLogo" "true" Option "ConnectToAcpid" "0" - Option "FlatPanelProperties" "Scaling = Native" Option "ModeValidation" "NoVesaModes, NoXServerModes" Option "HWCursor" "false" Option "RegistryDwords" "RMDisableRenderToSysmem=1" From 9eb67f02a964141310f1d445c918989b5311283b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 15 Mar 2013 14:59:04 +0100 Subject: [PATCH 09/41] xbmc: update PR2403 patch Signed-off-by: Stephan Raue --- .../xbmc/patches/xbmc-990.24-PR2403-01.patch | 94 +++++++++++++++++++ .../xbmc/patches/xbmc-990.24-PR2403.patch | 14 --- 2 files changed, 94 insertions(+), 14 deletions(-) create mode 100644 packages/mediacenter/xbmc/patches/xbmc-990.24-PR2403-01.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-990.24-PR2403.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.24-PR2403-01.patch b/packages/mediacenter/xbmc/patches/xbmc-990.24-PR2403-01.patch new file mode 100644 index 0000000000..6eac2089ef --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-990.24-PR2403-01.patch @@ -0,0 +1,94 @@ +diff -Naur xbmc-12.0.6/xbmc/powermanagement/linux/FallbackPowerSyscall.h xbmc-12.0.6.patch/xbmc/powermanagement/linux/FallbackPowerSyscall.h +--- xbmc-12.0.6/xbmc/powermanagement/linux/FallbackPowerSyscall.h 1970-01-01 01:00:00.000000000 +0100 ++++ xbmc-12.0.6.patch/xbmc/powermanagement/linux/FallbackPowerSyscall.h 2013-03-13 22:25:29.220700789 +0100 +@@ -0,0 +1,39 @@ ++/* ++ * Copyright (C) 2005-2013 Team XBMC ++ * http://www.xbmc.org ++ * ++ * 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, 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 XBMC; see the file COPYING. If not, see ++ * . ++ * ++ */ ++#pragma once ++#include "powermanagement/IPowerSyscall.h" ++#include "system.h" ++#if defined(TARGET_LINUX) ++ ++class CFallbackPowerSyscall : public CPowerSyscallWithoutEvents ++{ ++public: ++ virtual bool Powerdown() {return true; } ++ virtual bool Suspend() {return false; } ++ virtual bool Hibernate() {return false; } ++ virtual bool Reboot() {return true; } ++ ++ virtual bool CanPowerdown() {return true; } ++ virtual bool CanSuspend() {return false; } ++ virtual bool CanHibernate() {return false; } ++ virtual bool CanReboot() {return true; } ++ virtual int BatteryLevel() {return 0; } ++}; ++#endif +diff -Naur xbmc-12.0.6/xbmc/powermanagement/PowerManager.cpp xbmc-12.0.6.patch/xbmc/powermanagement/PowerManager.cpp +--- xbmc-12.0.6/xbmc/powermanagement/PowerManager.cpp 2013-03-11 18:01:45.000000000 +0100 ++++ xbmc-12.0.6.patch/xbmc/powermanagement/PowerManager.cpp 2013-03-14 00:20:43.263315592 +0100 +@@ -41,14 +41,17 @@ + #include "osx/CocoaPowerSyscall.h" + #elif defined(TARGET_ANDROID) + #include "android/AndroidPowerSyscall.h" +-#elif defined(_LINUX) && defined(HAS_DBUS) ++#elif defined(TARGET_LINUX) ++#include "linux/FallbackPowerSyscall.h" ++#if defined(HAS_DBUS) + #include "linux/ConsoleUPowerSyscall.h" + #include "linux/ConsoleDeviceKitPowerSyscall.h" + #include "linux/SystemdUPowerSyscall.h" + #include "linux/UPowerSyscall.h" +-#ifdef HAS_HAL ++#if defined(HAS_HAL) + #include "linux/HALPowerSyscall.h" +-#endif ++#endif // HAS_HAL ++#endif // HAS_DBUS + #elif defined(_WIN32) + #include "powermanagement/windows/Win32PowerSyscall.h" + extern HWND g_hWnd; +@@ -74,7 +77,8 @@ + m_instance = new CCocoaPowerSyscall(); + #elif defined(TARGET_ANDROID) + m_instance = new CAndroidPowerSyscall(); +-#elif defined(_LINUX) && defined(HAS_DBUS) ++#elif defined(TARGET_LINUX) ++#if defined(HAS_DBUS) + if (CConsoleUPowerSyscall::HasConsoleKitAndUPower()) + m_instance = new CConsoleUPowerSyscall(); + else if (CConsoleDeviceKitPowerSyscall::HasDeviceConsoleKit()) +@@ -83,10 +87,13 @@ + m_instance = new CSystemdUPowerSyscall(); + else if (CUPowerSyscall::HasUPower()) + m_instance = new CUPowerSyscall(); +-#ifdef HAS_HAL +- else ++#if defined(HAS_HAL) ++ else if(1) + m_instance = new CHALPowerSyscall(); +-#endif ++#endif // HAS_HAL ++#endif // HAS_DBUS ++ else ++ m_instance = new CFallbackPowerSyscall(); + #elif defined(_WIN32) + m_instance = new CWin32PowerSyscall(); + #endif diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.24-PR2403.patch b/packages/mediacenter/xbmc/patches/xbmc-990.24-PR2403.patch deleted file mode 100644 index b89f4b39ee..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-990.24-PR2403.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur xbmc-12.0.6/xbmc/powermanagement/PowerManager.h xbmc-12.0.6.patch/xbmc/powermanagement/PowerManager.h ---- xbmc-12.0.6/xbmc/powermanagement/PowerManager.h 2013-03-11 18:01:45.000000000 +0100 -+++ xbmc-12.0.6.patch/xbmc/powermanagement/PowerManager.h 2013-03-12 13:42:28.698769168 +0100 -@@ -32,8 +32,8 @@ - virtual bool Reboot() { return false; } - - virtual bool CanPowerdown() { return true; } -- virtual bool CanSuspend() { return true; } -- virtual bool CanHibernate() { return true; } -+ virtual bool CanSuspend() { return false; } -+ virtual bool CanHibernate() { return false; } - virtual bool CanReboot() { return true; } - - virtual int BatteryLevel() { return 0; } From 8b4aff7d69a33bfc86362c4fc2f3e286f0edf7c4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 15 Mar 2013 14:59:47 +0100 Subject: [PATCH 10/41] xbmc: update to xbmc-12.0.7 Signed-off-by: Stephan Raue --- .../mediacenter/xbmc-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc/meta | 2 +- ...bmc-453-add_openelec.tv_RSS_news-0.1.patch | 8 +-- ...ec-extra-guards-around-m_queryThread.patch | 51 ------------------- ...90.22-cec-init_m_queryThread_to_NULL.patch | 25 --------- ..._generate_problem_with_binary_string.patch | 22 -------- tools/mkpkg/mkpkg_xbmc-frodo | 2 +- 7 files changed, 7 insertions(+), 105 deletions(-) delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-990.21-cec-extra-guards-around-m_queryThread.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-990.22-cec-init_m_queryThread_to_NULL.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-990.23-Fix_code_generate_problem_with_binary_string.patch diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 8624112f66..a7dd88d984 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="12.0.6" +PKG_VERSION="12.0.7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 09f8fbe5d5..edbbd70b55 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="12.0.6" +PKG_VERSION="12.0.7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-453-add_openelec.tv_RSS_news-0.1.patch index 5b32c0cce7..ff8b12e703 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-453-add_openelec.tv_RSS_news-0.1.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-453-add_openelec.tv_RSS_news-0.1.patch @@ -1,11 +1,11 @@ -diff -Naur xbmc-10.1-Dharma/userdata/RssFeeds.xml xbmc-10.1-Dharma.patch/userdata/RssFeeds.xml ---- xbmc-10.1-Dharma/userdata/RssFeeds.xml 2011-03-08 02:49:24.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/userdata/RssFeeds.xml 2011-06-14 17:07:08.450880123 +0200 +diff -Naur xbmc-12.0.7/userdata/RssFeeds.xml xbmc-12.0.7.patch/userdata/RssFeeds.xml +--- xbmc-12.0.7/userdata/RssFeeds.xml 2013-03-15 14:25:26.000000000 +0100 ++++ xbmc-12.0.7.patch/userdata/RssFeeds.xml 2013-03-15 14:40:54.695338102 +0100 @@ -3,6 +3,7 @@ + http://openelec.tv/news?format=feed&type=rss - http://feeds.feedburner.com/xbmc + http://feeds.xbmc.org/xbmc diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.21-cec-extra-guards-around-m_queryThread.patch b/packages/mediacenter/xbmc/patches/xbmc-990.21-cec-extra-guards-around-m_queryThread.patch deleted file mode 100644 index e882e54d75..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-990.21-cec-extra-guards-around-m_queryThread.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 5385b26621a8d966f187f7b63dfaa8f336beb9a5 Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp -Date: Tue, 12 Mar 2013 10:20:27 +0100 -Subject: [PATCH] [cec] extra guards around m_queryThread - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 4cdd3c4..6509c5d 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -99,8 +99,8 @@ class DllLibCEC : public DllDynamic, DllLibCECInterface - m_bStop = true; - } - -- SAFE_DELETE(m_queryThread); - StopThread(true); -+ delete m_queryThread; - - if (m_dll && m_cecAdapter) - { -@@ -389,7 +389,7 @@ void CPeripheralCecAdapter::Process(void) - Sleep(5); - } - -- SAFE_DELETE(m_queryThread); -+ m_queryThread->StopThread(true); - - bool bSendStandbyCommands(false); - { -@@ -1105,9 +1105,12 @@ void CPeripheralCecAdapter::OnSettingChanged(const CStdString &strChangedSetting - } - else if (IsRunning()) - { -- CLog::Log(LOGDEBUG, "%s - sending the updated configuration to libCEC", __FUNCTION__); -- SetConfigurationFromSettings(); -- m_queryThread->UpdateConfiguration(&m_configuration); -+ if (m_queryThread->IsRunning()) -+ { -+ CLog::Log(LOGDEBUG, "%s - sending the updated configuration to libCEC", __FUNCTION__); -+ SetConfigurationFromSettings(); -+ m_queryThread->UpdateConfiguration(&m_configuration); -+ } - } - else - { --- -1.7.10 - diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.22-cec-init_m_queryThread_to_NULL.patch b/packages/mediacenter/xbmc/patches/xbmc-990.22-cec-init_m_queryThread_to_NULL.patch deleted file mode 100644 index 2145ca975b..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-990.22-cec-init_m_queryThread_to_NULL.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9526c4ce7da5c70d8ba79a5c21e9d95c918ebadb Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp -Date: Tue, 12 Mar 2013 11:08:55 +0100 -Subject: [PATCH] [cec] and let's init m_queryThread to NULL so we won't crash - on exit when CEC has been disabled - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 6509c5d..61233bb 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -135,6 +135,7 @@ void CPeripheralCecAdapter::ResetMembers(void) - m_bActiveSourceBeforeStandby = false; - m_bOnPlayReceived = false; - m_bPlaybackPaused = false; -+ m_queryThread = NULL; - - m_currentButton.iButton = 0; - m_currentButton.iDuration = 0; --- -1.7.10 - diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.23-Fix_code_generate_problem_with_binary_string.patch b/packages/mediacenter/xbmc/patches/xbmc-990.23-Fix_code_generate_problem_with_binary_string.patch deleted file mode 100644 index 56420955ee..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-990.23-Fix_code_generate_problem_with_binary_string.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 1a5e251cc4382ad3e918af68072f2ba08e26574b Mon Sep 17 00:00:00 2001 -From: ulion -Date: Tue, 12 Mar 2013 06:40:54 +0800 -Subject: [PATCH] Fix code generate problem with binary string. - ---- - xbmc/interfaces/python/typemaps/python.string.outtm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/interfaces/python/typemaps/python.string.outtm b/xbmc/interfaces/python/typemaps/python.string.outtm -index cdfba2e..c396166 100644 ---- a/xbmc/interfaces/python/typemaps/python.string.outtm -+++ b/xbmc/interfaces/python/typemaps/python.string.outtm -@@ -22,4 +22,4 @@ - %> - ${result} = <% - if(method.@feature_python_coerceToUnicode) { %>PyUnicode_DecodeUTF8(${api}.c_str(),${api}.size(),"replace");<% } -- else { %>PyString_FromString(${api}.c_str());<% } %> -+ else { %>PyString_FromStringAndSize(${api}.c_str(), ${api}.length());<% } %> --- -1.7.10 - diff --git a/tools/mkpkg/mkpkg_xbmc-frodo b/tools/mkpkg/mkpkg_xbmc-frodo index b51f2cf9a5..2106a596e7 100755 --- a/tools/mkpkg/mkpkg_xbmc-frodo +++ b/tools/mkpkg/mkpkg_xbmc-frodo @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="12.0.6" +PKG_VERSION="12.0.7" GIT_REPO="-b Frodo git://github.com/xbmc/xbmc.git" DEST_DIR="$PKG_NAME-frodo" From 3b6d0f3e7c6123a98b1d0f36196e19d2debb0fda Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 15 Mar 2013 22:48:17 +0200 Subject: [PATCH 11/41] oeinstaller: do not use diskpart diskpart does not work as should on usb drives so we just format the target drive now if a user, for some reason, has a 'partitioned' usb stick, it is not our job to clean up the mess. in this case using "HP USB Disk Storage Format Tool" is recommended, people should do it anyway when using create_installstick.bat on sticks with partitions --- tools/nsis-installer/oeinstaller.nsi | 65 +--------------------------- 1 file changed, 1 insertion(+), 64 deletions(-) diff --git a/tools/nsis-installer/oeinstaller.nsi b/tools/nsis-installer/oeinstaller.nsi index a0b42cf23f..c7e968f31b 100644 --- a/tools/nsis-installer/oeinstaller.nsi +++ b/tools/nsis-installer/oeinstaller.nsi @@ -15,7 +15,6 @@ VIAddVersionKey InternalName "OpenELEC USB Stick Creator" BrandingText " " Var "SLET" -Var "SNUM" !include "MUI.nsh" !include LogicLib.nsh @@ -59,20 +58,9 @@ Page Custom CustomCreate CustomLeave Section "oeusbstart" StrCpy $1 "$INSTDIR\" - Push $1 - Call DISKNO ExpandEnvStrings $0 %COMSPEC% - DetailPrint "- Creating Configuration Files ..." - FileOpen $4 "$TEMP\oedp.txt" w - FileWrite $4 "select disk $SNUM$\r$\n" - FileWrite $4 "clean$\r$\n" - FileWrite $4 "create partition primary$\r$\n" - FileWrite $4 "format FS=FAT32 LABEL=OPENELEC QUICK OVERRIDE$\r$\n" - FileWrite $4 "rescan$\r$\n" - FileWrite $4 "exit$\r$\n" - FileClose $4 DetailPrint "- Formatting USB Device ($SLET) ..." - nsExec::Exec '"%SystemRoot%\system32\diskpart.exe" /s "$TEMP\oedp.txt"' + nsExec::Exec `"$0" /c format $SLET /V:OPENELEC /Q /FS:FAT32 /X` DetailPrint "- Mounting USB Device ..." sleep 3000 DetailPrint "- Making Device Bootable ..." @@ -142,57 +130,6 @@ Function GetDrivesCallBack Push $0 FunctionEnd -Function DISKNO - Exch $1 - Push $2 - Push $3 - Push $4 - Push $5 - Push $6 - Push $7 - - System::Call "kernel32::GetVolumeNameForVolumeMountPoint(t r1, t r3r3, i ${MAXLEN_VOLUME_GUID}) i.r2" - ${If} $2 != 0 - StrCpy $3 $3 -1 - System::Call "kernel32::CreateFile(t r3, \\ - i ${GENERIC_READ}|${GENERIC_WRITE}, \\ - i ${FILE_SHARE_READ}|${FILE_SHARE_WRITE}, \\ - i 0, i ${OPEN_EXISTING}, i 0, i 0) i.r2" - ${If} $2 != ${INVALID_HANDLE_VALUE} - System::Alloc ${EXTENTS_BUFFER_SIZE} - Pop $4 - IntOp $5 0 + 0 - System::Call "kernel32::DeviceIoControl(i r2, \\ - i ${IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS}, \\ - i 0, i 0, \\ - i r4, i ${EXTENTS_BUFFER_SIZE}, \\ - *i r5r5, i 0) i.r3" - ${If} $3 != 0 - System::Call "*$4(i .r5, i, i .r0)" - ${If} $5 == 0 - StrCpy $0 "Error: Invalid DISK_EXTENT data" - ${EndIf} - ${Else} - StrCpy $0 "Error: DeviceIoControl failed" - ${EndIf} - System::Free $4 - System::Call "kernel32::CloseHandle(i r2) i.r3" - ${Else} - StrCpy $0 "Error: CreateFile failed for $3" - ${EndIf} - ${Else} - StrCpy $0 "Error: GetVolumeNameForVolumeMountPoint failed for $1" - ${EndIf} - StrCpy $SNUM $0 - - Pop $7 - Pop $6 - Pop $5 - Pop $4 - Pop $3 - Pop $2 - Pop $1 -FunctionEnd !define MUI_FINISHPAGE_TITLE "OpenELEC USB Stick Successfully Created" !define MUI_FINISHPAGE_TEXT "An OpenELEC USB Installer Stick has been created on the device $SLET\n\nPlease boot your HTPC off this USB stick and follow the on-screen instructions." From 4a6592e6352b7f3d904ff81041f3c6c4d5162144 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 15 Mar 2013 23:22:03 +0200 Subject: [PATCH 12/41] tools: add updated create_installstick.exe --- .../syslinux/files/create_installstick.exe | Bin 110430 -> 109953 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/tools/syslinux/files/create_installstick.exe b/packages/tools/syslinux/files/create_installstick.exe index 826794d6026b00be84b2368cde4156f1f13b7814..b1505b568177aaf2580dc2de82f0f22a11a35495 100644 GIT binary patch delta 10979 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 delta 11460 zcmYk?V{qoZ`vCg8?zX#ax7e+1+gsb_*0#09x3*0NC*N!fZ#zT@c(V%?gZlhT_Ypo{})37fnwiJAYeevwg?bKaDY)J2&9_@ z0^!que9ygsNZe)bZQR0=hZg4qPDMH@=HZ{x9m)@CZsJOL5@AzYoAJ#H4wnt>6zNpT zp0;imwga1K_Y<@+87q^T4p!|%3k6Y8tYH~%0AV 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 Date: Sat, 16 Mar 2013 18:26:28 +0200 Subject: [PATCH 13/41] oeinstaller: disable 'install' button if no usb stick detected --- tools/nsis-installer/oeinstaller.nsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/nsis-installer/oeinstaller.nsi b/tools/nsis-installer/oeinstaller.nsi index c7e968f31b..76451ad8bf 100644 --- a/tools/nsis-installer/oeinstaller.nsi +++ b/tools/nsis-installer/oeinstaller.nsi @@ -100,6 +100,12 @@ Function CustomCreate StrCpy $R0 '' ${GetDrives} "FDD" GetDrivesCallBack + GetDlgItem $1 $HWNDPARENT 1 + ${If} $R0 == "" + EnableWindow $1 0 + ${Else} + EnableWindow $1 1 + ${EndIf} WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Type' 'DropList' WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Left' '30' WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Top' '25' From 0015373fea3aa91c615762b2703140f8c687a70b Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 16 Mar 2013 18:27:06 +0200 Subject: [PATCH 14/41] tools: add updated create_installstick.exe --- .../syslinux/files/create_installstick.exe | Bin 109953 -> 109988 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/tools/syslinux/files/create_installstick.exe b/packages/tools/syslinux/files/create_installstick.exe index b1505b568177aaf2580dc2de82f0f22a11a35495..3a53b43f3544adca87a4a06916b21e56787f9ca8 100644 GIT binary patch delta 10653 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 D?B@qm delta 10619 zcmV->DTLOf+XjK#27t5yND3wp5C8xH03ZNp1ONb_(NzE-001D+-VXqXo>u?>1yle5 z03ZOU5Vvj$0j39kQIP-uftvsTK`8)$?R^i78|ii5?45nFCq5@Z;vjb8dT#AVyB99C zl1{!m=`5Gar6iuY+&z*jS+4wNmYm(46FEcA40lDRhGo~a>qKyy#t!laMN_v45TIy^ zCh0#EiGg05t6itIdrf^wS|mo$1_hj?E!w&bWcT;p`@Z>qL(Xs|##Yq$7B|`@zxm$x zzW2TV@6FsJhGCQz4C5jE{(BD?2L3dj!-xNdKdiSH{Bz>3%lD7`sBz@a*K>aUJHG#8 z{Qgf1$@nke@1I=Azu)*%{`q_ghZw1re10hP{aaF>>F0C!?%&}0w*`CHRlm>Us^Yqc z>*Juoi@1J&9dmx=l40oiAH(0jwJ;5X*82su{wBs>t?r@upT+f=8S6ib>p@%qZEWCb z;(CRVtUrnWzsB$9Cus5Vi8D6w`Pc9}Z+_kn;eS<~`%mDvnOgr}sd+{72X*;PTYd+w zj`7mZOFu9De5?Pg;(8ia8`nE=y<6#s^w@jV=e)6hn+0PZ$Mr+Fe!O7p)1>=y#y*4V zi@1KHV2tLySTIKG{l|&1>Wsa=k?b3RDF^N!(K#Pyrl&p*XI|2%cyBWk}i_c>gj zPMt}5z0cmodbGdKFWkFx(6oM`fYwFN#*_4obrBaPIMvnn%~wZxB6yV@_QD zy_)xG6|d#dWfnbOtHy8Cr^o)B`u+ZTevJ9i`usNF=P|ebhP$)H|D;}QiwWNE*Qa@Z zi17SM!Mtyy>*?Yc`c+TQx4)kUYs|C1<)^1}JT$Lpe>6sTzVjaAd1FpIf9xLP`O9U>R{oGCm60F+(U@u6eGY=gnj6LbF8w^Pb@zFVe^GG$bQW)&flF(n zc+8l=y9-C;HHzlVqRXs##+>V2p0U4o%ouyujIo^=W4klPo}Dq~ZOk991ep7OV?TIz zy61x%#qkQk`^ZLqKC37`{$}BM>j*r5H3!evDL#7+V_%(^_qqul{M{V+du}6Nj=nl0 zP9?qke9pYrt1;q>$^6r6RsHqzDmRtp9m4ao>htQt^d2-X{TCyD?2Bsr%LVIA^661{ z8Y#L>;z{dio%WR+x_rX8J9=t=m@g=pf0P6BopZwcl7jg^a$tUVV?LO_t>*o&9GI8p z#PiD=`TR*R-&2j9`m=WEitWN&}>9_`_K zn)B^J>z8lK*#p@Jl9AV7Y-M43Ov{70FfE(S0v>$LLNUJ(Of3%&=fHe_VNRG@9=s~Qq z?4cQBFP|~?vKeC!&KP@O#@NCfHNMv=pRbXl2Vbvnp)-8fM)BCBohBUrk8yAP$je9g zXYXj{`;p(O=RPY&pEXZ^_nc77{O;y-3`=7aGe5tOKSnY0e!)D7nXea&QOxWYjD`4q zTrl>2eE-pjv3p&ce}l>q%<7T&k>)q9Za?d6PpaRVZfU&8R=uWxHm_B+*uT-dyY;@G z`j(pFOKs!2tS$}n+Y4gO*Q=Zd&CQDgDChB0&AZD_9L4i56xauU;)!3JVH+QrAuGD) zi*i%nsNOBz5B90%e0^P?X};9g^{v#`MSkR;w6AN@kId`q(thNh<-RVW^>2O?dcNj4 zqoSTKeGV`6e7)53b*E#q_;VHy67S-%oR^cX_(z1;2cG}M|9kBD1>!+%|K78S+CDy~ zZH}JT!`NR~r^b$dzq|BHkNkQ(PuD_dJUwsL*`{^D7jfOGE|?|nvv}f8=e=)pzIh*- zbG>fCyzevaPBv%F%d5G4VDsp{weQ9C7_Kj<8sa}p-TdI3y!*|n=iJMj$7^To@%t2Q z^7c3xhc8UPd|5%=kk0AT1q;4j&3ji)Z2$f0`}7{akn-n$A4t^^-Zhb*Cz}0`swMx+ zi5wZt`|xHyo}ZhMcO#e|Rr8+Df%&m{VX6e-XLDfQniJ+{CPd^RzY9F=TkcJr|&>V&TEUm zTmAl24!?YVr`m&#_kV8l&gi1o%d7PeU;ncdoIhB&v-5jc@kHLwtUc)5#4B>uz9F&t6ksS^S;x zwGV!mQS}D{-;3|TSJ&h#eb3LGG1^WPx!zuAG)I7c=Jb1^aoV{3Q#Y@pK0KXYcf#p2731Q^pmi-}MKM75P@Q?^v5d$E!7JRcpJw zX0;=?d)=xAjve`dvE~ERz&QPcntR&l_(S8dGsej$&KRA2H?$7j_t`-YzxsV^Z{+qI zYwVAI05@T@wY9z0s8=mqwPw3!TKPYhoggIQoGMvQk37dZ`Q(!) zP1CCS!*Ss5?MK#9bs1ki@nngItP6qTSZ#kdIs_T43;xLKF?CCzWw%^1tuu6w?OpGG zyB>&&yQ31=XgAuoF7$mrC|PTM7}5P36>Ig>$&;%qCr_`Q#A#Gat9IZ7V;@-HV24gH zaHGiS5u0>@4i2wp_1rKD+?`S6Sh#lwOAlz!bwZQQHzJnkyIse_3HJQ%XyABQANO0` zecRikQ*%)?7{US$Lq;bdm|fEj~wRzz?!ubjhPzfl@;7FAUwknZlgux?O+MImp2N3S^>w< z8iin(GEu?}%`9q`M$H}$`#2F=oaw^{<78RKOjzf5n4+M^yRp5ongNN7wUxeI<^ECro2Kp!~yz$KC{-9eaEv7LD!*UUngQPQ8gkZ8X|Xpi7{km%&6tussLz7nyn@corX1Q|TUm#i$u(#B}hU z1suDAB?0j)&p8x)HQmn%4{31MJ^wI<+hcW+7|F2#*W)F!K7P0i}Beni*h!X-EYzRACtWIxccLqc&X2>?`cpN^hRAqC4+=IA(X7>*)aTsoE{8t#vOOT0*0JrPQ9PT`R{q^M!- ziIx#e2=89m#vu(yWM;v4q+3~o9Qdwyq&?D(f$SLeOS1zRM)Glm=&|9XO}JjqJ#c#? zLdx=YSdqvgu{#5a_bdmz*=1>CJG7sG!Ecx$C$fWaSt(8M1hET_nVE+vKCpY_%UE4F z(F#M5Ky65W#BV2dp?boainWd_Z-cZvz9zcI_u1^Mm9+~tr1Os@m+g~}9g5Z@m?S9J zK`BvRiq}oywyrn>;@TJZf3tn*POY`kwkpkatGd}-uXpO3&9-%6vxSdaSL@A-C2PIj z?zHM_+cd;CZfvgCFVw3Q`hu2REwdMu=Qb(cWXfZIJL1zE`oVRjCdf;~8HT1!bRt7M z?AwZYIp&FV(7xX%OB32-<@*lcjp7IrCDJoTu`v>YYDYTX*C@*wEUGwi5$?4EDwa%k zU}E&yMx^#Y*s~G@gD&z`c5D%CURgsk2M&y$<+!}%)Cj>KxIooC!100E7>XdDY`AY9 zo)rOqcNrJ#9LvhRifoFvGmx#JALu9%{)nj%h=UB;0V(@5|Aboq#)i5_iiGyhCua5` zs3Qc8{*f*nt02?9f}>!iN0kQZ4`wr z%RkI1plepKNpxC?wN&nTez+&7(Ha?c44EQ~}c34LE0Acbp-K z1aW|J^-P%-YV$?T5GR7tnoy!Z+PuAg6FSHtN%Cf#fHvtK_9&BBG36CxNe4#Yt!Txj z)-jQD!Rd+abPH8+Nf}mu;nTF& z$*Mi82$h1ja!g5EZSJIL??7&I_!6uE?|Xn$5i^PGB6Lzl{j8X1dpU^+y7nlPa3Xdf zcPU%RellpwgvB07ycNqajF9vy%d`$Sncgbb#}Kpz>QU&W7*Fm}uENd~9?Y9WfEa9w zULcN=EEVTMrxO_DH2OTs-dGTS#b%wq3&qsYz9v+lI#`Cm^VkRXcPS#uxL42-wpzs| zDrkNt6UEZ#2E7;xF;I~wpiRGQzq_pc_?YzC(0kx3b}}h_DtQ_X6)05|*kp#FXVm7Q zXrW+J0iuwSc$5cmQURG%t%XS|9dv0UZh) zC1PmdC(lD>sOwOcP#Iwsij2myay6dK0Mr-7fzT2;xCmxS+5?OELrH<)5l>i7vKO3b zV~J1s_`>m;+I(CLVNzg}8Fl)7ZNCVd#gVUX9k|GvWOX7#Nj$uz+KsNm>gp^R*o?`J zLZ`p0^N;!rfE$A#TgN7UJ>~=yQS=Foxg5u4Ehp>p>IAn^gkWDyBMS_I`_$>Cvt2`y1hi*wn@K9MLj zWAs^)CiD^KKJ0K}Y05v3qIiNi!E>QKNKpl|S@UqbDH=v16F1D*6m!z1uwG63o62Sh z3>_em-`wi71`X&n0#$enK+0iwM~1#?e%m>j_}b zb&nzoS1LUNQgrs-9#JW&tfhifqDmehbJEpf{m5U=a731W>9cJe`27*(_jeKWqJk74 zu2L#J*`K(+i4xigwE9b7Ct8zvnu3&EBX@eXr#`ubN$e?t6kDpjA0+-@qWqm_DZirg z;W)i6@%i{20uD5zDsRNOIN8@22`etzBvA$XN30OW zCFPGR2g;+$mL#J+sqL{}q>5cSKp^Ai1lrYBgiG^(Yl)4p(4HYoQaoj%Cl4oc4(#`d z{k^j@D5k&cWR5fF7IByB5eY<7q(WA9PnBWj0}|6eQIjgzGPx+6JhS`2#S?v|yckv1 zmF&PSrxHDKL`hR3YMaV-=qv&mJ(?fmmv*&|7GBE$rQ_W6Qv>vF~NmPgmN5%*mBZMRG3p)+iYM4dUA2}0>=z#q$MF2i@vOG^6Ijr zuFXv0h3~P*h(aYd30e@?^+zEGCP>=*U03JBAObcqzOzf64xD$TFiYJpdN^>0Qd}m3 zZEE{P$hj&_#%_-^PuOY4A=wdjc?k!9Ktv~h-_8uBF@<7k@nuU>`$>xnm;1jR;xZ5uNg7C! zHHiK=g)Z)E+G)wS5~eUJF|TuDNNHSu4xf~z*V;VgsZe2)(o0~9VPvw4bI8u1U$}hn z>ZCrY#3U@pWh2zLd{W$E%gBhhbdH%4XbxItEQXrC2^i4XI*{0K!44dEq~5-4d=g8At5DQpK8o@{PLT=x%C!f^m$#IYGpU2uF22ytyn@6eQjq<)6&* z^pDtaroUlAfE4pngsi1eYcx~Wl+}ndjffCuGl{8Mzs3vF&8jG(%C=Kb7uDSqNK6#HD@Dw|nJQq3yjBq6YW#lKxTr$ho( zK`Et;c^?x2+2duTXvD5_HU%OY*9FK1AZUMf)Z61sp7H(!|tR*Qt4_wuHs7lum*O3!0m&_CwvM5J5R3zmK*pNNtRwi2COc!lZeS7F0k>q=7nzH;;he)2cX3PTFQyl=)O-i;t-MEp) zAN9qLlNM4d@W+S}#w*-ikP_~co1j;L@)NJu=Z+jdF0ZKqOAls$p-bHwoV1TW>2_o6 zL$=78hvN#>{7K9JtTcIdKqT^=B@dOhb9~zlDMPBK2V}J3Y!Dyv4D`i?OO<@4@=^G6 zpZcg>Phw$es`ErB9d`1>^fCw%#_p((Hjb_vpp!Oatt}dE$L=R8+)0B^^`x4TlhoA| zeN(C^G10@SdMQ1BVIecUEY(lznT*?T6tD)%Nx9)*!T1PDtN8*Q6zz?_r zNsWF}C?TbrG}l8YRY<~(iAtaQp5(hjR-D|`(oKbI=nVA+)s6)=X-Jh zJy@R}H<@zR6*~8rXUG|3^Pb5S#JFnw5@n>2l;)GTTSBQpWeG(Q@B1$Mgq;bgNwX<; z#}T5m3MKb{x!37X#fWHzah(GZfE{PrT8UK+qujLP6J=dlo6J(2Q2nnH3d;>sy%SVC z&~2g|76qiURBTGDk}&_yI4NtTqjXWxi8nIUNJL7J1FtZH$8;3H3LQCP$vO}Z;I#J~ zx_!9M<@3xIQynibYf^|aMGwbYDM^#29c8Cx9u|;)WRAx^0G?pkGZR9H<`{))0W|)@ zB6?Dp>e^ylQ>qv~z7GMW0!hgFJcS~}989Uxi>mgx+h7WN(uq>K^#WaW zE|+fQ$f>>gKpxQuO?CDK&FSI-xazqY{Kod$w6`=2mL1|t7{80 z+^QLW^6&&<2)C2^7BHcQHbA$}8eY1Mc!{`|Qi>d4L~e#;-&z5qqoV98WgF=TamFKT zn$)7c!y65DoFM5G)uA!xa&|dZpSX7_ju1_m>ZVhMc9C>9b!i0}!eS{2;@D#A294B1 zKS}yD>rd+rF;-3BX%%04SYYu{0Kqo$;TU4^OU6K;eP^_%WT4OR6nBf%3swQw32h)Kkpta&h1 zH$8dpNg%B}!`KMK)yTA(JA(2P%N5D%IewS}oysI+p~>bTPBDgY@3VSfgKQYnol_Wp zkUV}$EyjhK$M<{`Z%lR*9DcAuv7LAYP&p%M?8W>f2f$zHM}0C6&R6XH8|$?e_wSy->O9ffsa-0sB4)8;CF&8ybi z>dp0%RjV_g+S|8UwKn!|0(N}^7}qdZZ&n-I>)aZQreIK@13F=6z_YW-q|x_k=s*VW z&5c?M^lNr1YxPDQOHwcKg?gunCAj0bBA8dV8x?F~yS261u2D{hNC+Sxc&pxin^kF> zim=aYS7Jb*E?{g_npHliiG!qn?OInix5<=X-;H&;!PGYpp=#E8?Lw{Esb9wN;!Z5n z-rlGwdbc}Fphm-L)~dj_(zsoK9%+@Jl=e1IgiE1siRD;!2-cpI%cW%P3H~F#Xl%BL*|12b zVll?}y;h^UTeT+W#o|?q*NtE8Em@QRdwISgs4GNCM5j}?QDm#iRN_O$Ex&%crb>#2A+f@t5_jxyzaMXOB*h7SAd(ya5J_>@Q$$amuNwE_GUt6R zejqY)%Hk#`&yz`?Wt86(n)hsS(!U*M9L%_?5S(2_2L_XT!lVZ|F|6Kf>hN>uX8o1Amg}U(*9yx)S zwA~=?9hmNaw!?g4#*ZNtM0|Wy{NOJIWTDzRCE(M1o%CB|+DT@eAJx#LOINC$2`$f2 z;0s>ALti<5EdYMze=`6*!b0s$luk%@lTgM@lrT3T$itcBSv%C!7Wf|aBu^0{P=M}p z`;sEfGc>xPB4rS_{`TGLqEAiklf-?0te--8_9D{}3n6k;+F zepoku^9)KR;4FMfZF84PFsf>jtj8thkg}m;%7jpDjw{Cq=r|RTdPFK0HTA@kWb|1B zp!aHkjH*xrdLQVCGv;)bIOa zOk2_q%g0^IYBpM$mMwYwJ1|3v_4`s2@ucs6or==*xLuOPOCHo&OrB@a9*DbZdh~RC zC=YpFQvK{UwOb&Ed`_CJcn-0tJe6_PA0zMOIZD#G47f9n7m_xj1Ob*1@==r$R*M7B zds2LUoC;~&S_o+ja7 zXD?Jbr%zcY-fqxDtg=D5?uj)B`e_i0hNVGJ4XpXTGHGgH@aR!tprRox^WGj z`{`5h$1&Q{$4K!+%cHRhlMUT9S zvfK5u!?h}s21tTbwi_LbX=Rnx!7ko(bZK?gR@4+Zh!Em zar;BK{xYr)s(Nvb)l8dJVmS_&%YjSECuTKLAAZ4t7oTLTl?O#7=Tmlx&TF0oagNY2JNK%md z@YT>rSy_q*kZT2}pP&rdEJ?Z_YM8KFTA zzp)N0(|~_yoH}EyoW@(rR`H@Z3KfB$P3A%wvF%NNN@@_X`Wih>%I$KrhL=}5Q zfI|jH{+{G7q%h>Igv_$c@xe%%q{>FC)8G>)UqA3x>p$G-ldn~=R|G&BShM{Z{=*jL>tgU)Pt zz~jM=-_LyC_w63OU__{r0q=|IeWbk+-`T(oGCCScP^}K+t*}NB1wk}X|K%`$1X@_X z;EJ*@MskW>4d`sroHC@|TBGS(o5-d@Vgaz_NPtAC3p&O4EBw*E?hc0pz#t0)Gbb?+ za#Pj5JKXVcG-@ZL%=w8@SM{YS#Lij|n-7~f4*FGPZ=|wA(I5HJV1M;EL!vfH51TEA zXij0UCOsu99yaTH9zP+1nZQeby$uKJl?|j7+vvjSTkHKj@-a|9-J*w?*8M|nUkM#& zqD#O@+Q-U9Mr~D9`@X^F3%4YUJNkQ6*^UKiVjgb`VwFsjp5^?h#}u)0B6bK@Aj9nv~)2xa+$3f;xuJEl-nH>gj4LVWd@bB6k5 zqfHUnF%@JQnixIfShbHLqw%#jy@}iy5*-$*SH|zrd=YQWd@@X1F8%ZP z`^{U%%%6)B;|KVB6W7n+dM-8g1^oScxW0nxe;2^~u4fG6lej*G>jhl@71yg;co{6N zi!FHx?DM#96Mx^p^#NQfAHnr;TtANM@8kN%xPAxMAGBnDUv0(zV}Q(yeCZ|X-=VIB V)c5q_(*FmyggXHoas+r#p#{N(0FD3v From ad0543112e1a53e3afb44b578e2e6d03ae13ac6a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 17 Mar 2013 18:44:05 +0100 Subject: [PATCH 15/41] projects/ATV/xbmc: show xbmc splash Signed-off-by: Stephan Raue --- projects/ATV/xbmc/advancedsettings.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/ATV/xbmc/advancedsettings.xml b/projects/ATV/xbmc/advancedsettings.xml index 178b719f24..b5fb5620ec 100644 --- a/projects/ATV/xbmc/advancedsettings.xml +++ b/projects/ATV/xbmc/advancedsettings.xml @@ -1,6 +1,5 @@ - false false gputemp gputemp From 9d2280d6fbc1b0c56c4667008e5ab8db91021f55 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 17 Mar 2013 18:46:34 +0100 Subject: [PATCH 16/41] atv-bootloader: update to atv-bootloader-r520 Signed-off-by: Stephan Raue --- packages/tools/atv-bootloader/build | 3 +- packages/tools/atv-bootloader/meta | 4 +-- ...-r518-allow_build_without_initrd-0.1.patch | 12 -------- ...ootloader-r518-allow_setup_paths-0.1.patch | 29 ------------------- ...ch => atv-bootloader-silence-output.patch} | 0 5 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 packages/tools/atv-bootloader/patches/atv-bootloader-r518-allow_build_without_initrd-0.1.patch delete mode 100644 packages/tools/atv-bootloader/patches/atv-bootloader-r518-allow_setup_paths-0.1.patch rename packages/tools/atv-bootloader/patches/{atv-bootloader-r518-silence-output.patch => atv-bootloader-silence-output.patch} (100%) diff --git a/packages/tools/atv-bootloader/build b/packages/tools/atv-bootloader/build index 33f4674787..ffab01459b 100755 --- a/packages/tools/atv-bootloader/build +++ b/packages/tools/atv-bootloader/build @@ -24,10 +24,11 @@ cd $PKG_BUILD +rm -rf mach_kernel vmlinuz initrd.gz cp -PR $(kernel_path)/arch/x86/boot/bzImage vmlinuz make clean -make LDFLAGS="" \ +make LDFLAGS="" KERN_OBJ=vmlinuz.obj \ CC="$ROOT/$BUILD/darwin-cross/bin/i386-apple-darwin8-gcc-4.0.1" \ LD="$ROOT/$BUILD/darwin-cross/bin/i386-apple-darwin8-ld" diff --git a/packages/tools/atv-bootloader/meta b/packages/tools/atv-bootloader/meta index a36407a00b..e69c7933d6 100644 --- a/packages/tools/atv-bootloader/meta +++ b/packages/tools/atv-bootloader/meta @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="atv-bootloader" -PKG_VERSION="r518" +PKG_VERSION="r520" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="GPL" PKG_SITE="http://code.google.com/p/atv-bootloader/" -PKG_URL="http://travisghansen.openelec.tv/sources/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS="" PKG_BUILD_DEPENDS="toolchain darwin-cross linux" PKG_PRIORITY="optional" diff --git a/packages/tools/atv-bootloader/patches/atv-bootloader-r518-allow_build_without_initrd-0.1.patch b/packages/tools/atv-bootloader/patches/atv-bootloader-r518-allow_build_without_initrd-0.1.patch deleted file mode 100644 index f36755a91e..0000000000 --- a/packages/tools/atv-bootloader/patches/atv-bootloader-r518-allow_build_without_initrd-0.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur atv-bootloader-r518/Makefile atv-bootloader-r518.patch/Makefile ---- atv-bootloader-r518/Makefile 2010-03-09 20:17:22.000000000 +0100 -+++ atv-bootloader-r518.patch/Makefile 2011-05-21 15:26:26.509551389 +0200 -@@ -22,7 +22,7 @@ - # start.o must be 1st in the link order (ld below) - OBJ = start.o vsprintf.o console.o utils.o elilo_code.o darwin_code.o linux_code.o boot_loader.o - --KERN_OBJ= vmlinuz.obj initrd.obj -+KERN_OBJ:= vmlinuz.obj initrd.obj - - mach_kernel: $(KERN_OBJ) $(OBJ) - $(LD) $(LDFLAGS) -arch $(ARCH) -o mach_kernel $(OBJ) $(KERN_OBJ) \ diff --git a/packages/tools/atv-bootloader/patches/atv-bootloader-r518-allow_setup_paths-0.1.patch b/packages/tools/atv-bootloader/patches/atv-bootloader-r518-allow_setup_paths-0.1.patch deleted file mode 100644 index 4bca96c210..0000000000 --- a/packages/tools/atv-bootloader/patches/atv-bootloader-r518-allow_setup_paths-0.1.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur atv-bootloader-r518/Makefile atv-bootloader-r518.patch/Makefile ---- atv-bootloader-r518/Makefile 2010-03-09 20:17:22.000000000 +0100 -+++ atv-bootloader-r518.patch/Makefile 2011-05-21 14:04:05.592144598 +0200 -@@ -11,12 +11,12 @@ - - # if Linxu, use the darwin-cross tools to compile/link - ifeq ($(OSTYPE),Linux) -- CC = /opt/darwin-cross/bin/i386-apple-darwin8-gcc-4.0 -- LD = /opt/darwin-cross/bin/i386-apple-darwin8-ld -+ CC := /opt/darwin-cross/bin/i386-apple-darwin8-gcc-4.0 -+ LD := /opt/darwin-cross/bin/i386-apple-darwin8-ld - else -- CC = /usr/bin/gcc-4.0 -- LD = /usr/bin/ld -- LDFLAGS = -classic_linker -+ CC := /usr/bin/gcc-4.0 -+ LD := /usr/bin/ld -+ LDFLAGS = -classic_linker - endif - - # start.o must be 1st in the link order (ld below) -@@ -53,7 +53,4 @@ - clean: - rm -f *.o $(KERN_OBJ) mach_kernel - -- -- - #xxd mach_kernel | sed -e "s/ffff ffff 1000/0100 0000 1000/" | xxd -r - mach_kernel -- diff --git a/packages/tools/atv-bootloader/patches/atv-bootloader-r518-silence-output.patch b/packages/tools/atv-bootloader/patches/atv-bootloader-silence-output.patch similarity index 100% rename from packages/tools/atv-bootloader/patches/atv-bootloader-r518-silence-output.patch rename to packages/tools/atv-bootloader/patches/atv-bootloader-silence-output.patch From ad905fa33412be5ebbbd2a633caa69015b8f0266 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 17 Mar 2013 18:48:41 +0100 Subject: [PATCH 17/41] projects/ATV: enable atv bootloader Signed-off-by: Stephan Raue --- projects/ATV/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/ATV/options b/projects/ATV/options index b21caf6cae..2795b59ffa 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -87,7 +87,7 @@ # Bootloader to use (syslinux / u-boot / atv-bootloader) # BOOTLOADER="atv-bootloader" disabled for now - BOOTLOADER="" + BOOTLOADER="atv-bootloader" # Configuration for u-boot UBOOT_CONFIG="" From 4aadb2013eb52f6fff86fcbb7ec71c943e4f200a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 17 Mar 2013 22:27:48 +0100 Subject: [PATCH 18/41] projects/ATV/linux: compress kernel with gzip instead xz - one fix to fix the 64MB issue Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 18b29c687a..7c3dd8d9bf 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -55,10 +55,10 @@ CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y -# CONFIG_KERNEL_GZIP is not set +CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_LZMA is not set -CONFIG_KERNEL_XZ=y +# CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set CONFIG_DEFAULT_HOSTNAME="openelec" CONFIG_SWAP=y From ff74c4b7ab37cf796c9c4884e3af44979f091112 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 17 Mar 2013 22:50:03 +0100 Subject: [PATCH 19/41] projects/ATV/linux: add FB_VESA support, remove FB_UVESA and FB_EFI support Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 7c3dd8d9bf..8f11e6e555 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -2067,7 +2067,7 @@ CONFIG_AGP_INTEL=y # CONFIG_AGP_VIA is not set # CONFIG_AGP_EFFICEON is not set CONFIG_VGA_ARB=y -CONFIG_VGA_ARB_MAX_GPUS=1 +CONFIG_VGA_ARB_MAX_GPUS=2 # CONFIG_VGA_SWITCHEROO is not set # CONFIG_DRM is not set # CONFIG_STUB_POULSBO is not set @@ -2076,7 +2076,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y 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_BOOT_VESA_SUPPORT=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y @@ -2090,7 +2090,7 @@ CONFIG_FB_CFB_IMAGEBLIT=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_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set # @@ -2103,9 +2103,9 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_VGA16 is not set -CONFIG_FB_UVESA=m -# CONFIG_FB_VESA is not set -CONFIG_FB_EFI=y +# CONFIG_FB_UVESA is not set +CONFIG_FB_VESA=y +# CONFIG_FB_EFI is not set # CONFIG_FB_N411 is not set # CONFIG_FB_HGA is not set # CONFIG_FB_S1D13XXX is not set @@ -2157,8 +2157,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y # Console display driver support # CONFIG_VGA_CONSOLE=y -CONFIG_VGACON_SOFT_SCROLLBACK=y -CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256 +# CONFIG_VGACON_SOFT_SCROLLBACK is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y From d38a92828107d16b60c0e8ca0259fd3f981edca1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 18 Mar 2013 04:38:06 +0100 Subject: [PATCH 20/41] projects/ATV/linux: dont optimize kernel build for size, another 64MB fix... Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 8f11e6e555..bcd7d9776e 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -133,7 +133,7 @@ CONFIG_RD_GZIP=y # CONFIG_RD_LZO is not set CONFIG_INITRAMFS_COMPRESSION_NONE=y # CONFIG_INITRAMFS_COMPRESSION_GZIP is not set -CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y CONFIG_EXPERT=y @@ -3052,6 +3052,7 @@ CONFIG_TRACING_SUPPORT=y CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y +# CONFIG_KMEMCHECK is not set # CONFIG_TEST_KSTRTOX is not set CONFIG_STRICT_DEVMEM=y # CONFIG_X86_VERBOSE_BOOTUP is not set From 46b83941bf361c89da51ddcf3fb8d38e8d949631 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 18 Mar 2013 05:17:00 +0100 Subject: [PATCH 21/41] xbmc: update to xbmc-12.1 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc/meta | 2 +- tools/mkpkg/mkpkg_xbmc-frodo | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index a7dd88d984..0430faf0d3 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="12.0.7" +PKG_VERSION="12.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index edbbd70b55..2da82caac6 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="12.0.7" +PKG_VERSION="12.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/tools/mkpkg/mkpkg_xbmc-frodo b/tools/mkpkg/mkpkg_xbmc-frodo index 2106a596e7..dfe903881d 100755 --- a/tools/mkpkg/mkpkg_xbmc-frodo +++ b/tools/mkpkg/mkpkg_xbmc-frodo @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="12.0.7" +PKG_VERSION="12.1" GIT_REPO="-b Frodo git://github.com/xbmc/xbmc.git" DEST_DIR="$PKG_NAME-frodo" From 9c2bb7c5ed286066e0bd06b3499bb4176ce6dd80 Mon Sep 17 00:00:00 2001 From: Daniel Forsberg Date: Mon, 18 Mar 2013 08:50:34 +0100 Subject: [PATCH 22/41] connman: enable background scanning, needed for router changes. or no reconnect. --- packages/network/connman/config/main.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/connman/config/main.conf b/packages/network/connman/config/main.conf index 1f7af14728..b4144ddc67 100644 --- a/packages/network/connman/config/main.conf +++ b/packages/network/connman/config/main.conf @@ -4,4 +4,4 @@ # Background scanning will start every 5 minutes unless # the scan list is empty. In that case, a simple backoff # mechanism starting from 10s up to 5 minutes will run. -BackgroundScanning = false +BackgroundScanning = true From 7621731a35799907e306238f13530d3220add9ca Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 18 Mar 2013 16:14:53 +0200 Subject: [PATCH 23/41] setxkbmap: re-add init script for some reason the udev approach is not working for some users re-adding this as a temporary workaround --- packages/x11/app/setxkbmap/init.d/72_keyboard | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 packages/x11/app/setxkbmap/init.d/72_keyboard diff --git a/packages/x11/app/setxkbmap/init.d/72_keyboard b/packages/x11/app/setxkbmap/init.d/72_keyboard new file mode 100644 index 0000000000..32478732e2 --- /dev/null +++ b/packages/x11/app/setxkbmap/init.d/72_keyboard @@ -0,0 +1,45 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# 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, 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 OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +# setup keyboard layout +# +# runlevels: openelec + +( + if [ -f /var/config/settings.conf ]; then + . /var/config/settings.conf + + progress "setup keyboard layout" + + if [ -z $X11_KEYMAP ]; then + X11_KEYMAP="us" + fi + + # waiting for Xorg to start + wait_for_xorg + + # setup keymap + if [ -z $X11_KEYMAP2 ]; then + setxkbmap -display $DISPLAY $X11_KEYMAP; + else + setxkbmap -display $DISPLAY -layout "$X11_KEYMAP,$X11_KEYMAP2" -option "grp:alt_shift_toggle"; + fi + fi +)& From 25c01ba39c169241d425a03ddef6062be81a5106 Mon Sep 17 00:00:00 2001 From: Daniel Forsberg Date: Mon, 18 Mar 2013 20:30:46 +0100 Subject: [PATCH 24/41] added lirc_rpi section to udev.d/98_lircd.rules --- packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules b/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules index 4ab905ddcf..253310e248 100644 --- a/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules +++ b/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules @@ -25,6 +25,11 @@ SUBSYSTEM=="lirc", DRIVERS=="lirc_xbox", \ ENV{lircd_driver}="default", \ ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox" +### RPi GPIO IR Receiver +SUBSYSTEM=="lirc", DRIVERS=="lirc_rpi", \ + ENV{lircd_driver}="default", \ + ENV{lircd_conf}="/etc/lirc/lircd.conf.rpi" + #------------------------------------------------------------------------------- # Ask lircd_helper to handle USB devices that do not show up as lirc devices # and are supported by lircd. Remote controls that are USB HID devices that show From 8e10d3604a4b274a62b5e4fd837fd8fe631e0c29 Mon Sep 17 00:00:00 2001 From: Daniel Forsberg Date: Mon, 18 Mar 2013 20:32:10 +0100 Subject: [PATCH 25/41] added lirc_rpi lirc config file with mce, macmini and xbox remote mappings. --- .../remote/lirc/config/lircd.conf.rpi | 285 ++++++++++++++++++ 1 file changed, 285 insertions(+) create mode 100644 packages/sysutils/remote/lirc/config/lircd.conf.rpi diff --git a/packages/sysutils/remote/lirc/config/lircd.conf.rpi b/packages/sysutils/remote/lirc/config/lircd.conf.rpi new file mode 100644 index 0000000000..94bd3f8939 --- /dev/null +++ b/packages/sysutils/remote/lirc/config/lircd.conf.rpi @@ -0,0 +1,285 @@ +# /etc/lirc/lircd.conf.rpi +# +# Lirc config for lirc_rpi (GPIO) receiver. +# Enables use of MCE Remote, Apple MacMini and XBOX remote. +# +######## +# +# brand: HP/Philips/Microsoft/Other +# model no. of remote control: Media Center Edition remote +# devices being controlled by this remote: HP Slimline S3100y and a +# myriad of devices with Media Center Edition receivers +# +# RC-6 config file +# +# source: http://home.hccnet.nl/m.majoor/projects_remote_control.htm +# http://home.hccnet.nl/m.majoor/pronto.pdf +# +# used by: Philips +# +######### +# +# Philips Media Center Edition remote control +# For use with the USB MCE ir receiver +# +# Dan Conti dconti|acm.wwu.edu +# +# Updated with codes for MCE 2005 Remote additional buttons +# *, #, Teletext, Red, Green, Yellow & Blue Buttons +# Note: TV power button transmits no code until programmed. +# Updated 12th September 2005 +# Graham Auld - mce|graham.auld.me.uk +# +# Radio, Print, RecTV are only available on the HP Media Center remote control +# +# +# Updated with codes for MCE 2007 Remote additional buttons +# Visualization, Aspect, SlideShow, Eject +# Note: +# Renamed some buttons: DVD->DVDMenu, More->MoreInfo, Star->Asterisk, Hash->Pound +# Note: +# Blue, Yellow, Green, Red, and Teletext buttons do not exist on the HP remote + +begin remote + + name mceusb + bits 16 + flags RC6|CONST_LENGTH + eps 30 + aeps 100 + + header 2667 889 + one 444 444 + zero 444 444 + pre_data_bits 21 + pre_data 0x37FF0 + gap 105000 + toggle_bit 22 + rc6_mask 0x100000000 + + + begin codes + +#seen on HP Pavilion dv3t remote --Tim Mann, 3 Nov 2009 + Media 0x00007b7f + PlayPause 0x00007b91 + + +#unused by HP remote + KEY_BLUE 0x00007ba1 + KEY_YELLOW 0x00007ba2 + KEY_GREEN 0x00007ba3 + KEY_RED 0x00007ba4 + Teletext 0x00007ba5 + +#ba6 - bae unused + BA6 0x00007ba6 + BA7 0x00007ba7 + BA8 0x00007ba8 + BA9 0x00007ba9 + BAA 0x00007baa + BAB 0x00007bab + BAC 0x00007bac + BAD 0x00007bad + BAE 0x00007bae + + KEY_RADIO 0x00007baf + Print 0x00007bb1 + +#bb2 - bb4 unused + BB2 0x00007bb2 + BB3 0x00007bb3 + BB4 0x00007bb4 + + KEY_VIDEO 0x00007bb5 + Pictures 0x00007bb6 + RecTV 0x00007bb7 + KEY_AUDIO 0x00007bb8 + KEY_TV 0x00007bb9 + +#bba - bbf unused + BBA 0x00007bba + BBB 0x00007bbb + BBC 0x00007bbc + BBD 0x00007bbd + BBE 0x00007bbe + BBF 0x00007bbf +#bc1 - bca unused + BC1 0x00007bc1 + BC2 0x00007bc2 + BC3 0x00007bc3 + BC4 0x00007bc4 + BC5 0x00007bc5 + BC6 0x00007bc6 + BC7 0x00007bc7 + BC8 0x00007bc8 + BC9 0x00007bc9 + BCA 0x00007bca + + KEY_EJECTCD 0x00007bcb + SlideShow 0x00007bcc + Visualization 0x00007bcd + +#bce - bcf unused + BCE 0x00007bce + BCF 0x00007bcf +#bd1 - bd7 unused + BD1 0x00007bd1 + BD2 0x00007bd2 + BD3 0x00007bd3 + BD4 0x00007bd4 + BD5 0x00007bd5 + BD6 0x00007bd6 + BD7 0x00007bd7 + + Aspect 0x00007bd8 + Guide 0x00007bd9 + LiveTV 0x00007bda + KEY_DVD 0x00007bdb +#NoGap + KEY_BACK 0x00007bdc + KEY_OK 0x00007bdd + KEY_RIGHT 0x00007bde + KEY_LEFT 0x00007bdf + KEY_DOWN 0x00007be0 + KEY_UP 0x00007be1 +#NoGap + Star 0x00007be2 + Hash 0x00007be3 +#NoGap + KEY_AGAIN 0x00007be4 + KEY_NEXT 0x00007be5 + KEY_STOP 0x00007be6 + KEY_PAUSE 0x00007be7 + KEY_RECORD 0x00007be8 + KEY_PLAY 0x00007be9 + KEY_REWIND 0x00007bea + KEY_FORWARD 0x00007beb +#NoGap + KEY_CHANNELDOWN 0x00007bec + KEY_CHANNELUP 0x00007bed + KEY_VOLUMEDOWN 0x00007bee + KEY_VOLUMEUP 0x00007bef +#NoGap + More 0x00007bf0 + KEY_MUTE 0x00007bf1 + KEY_HOME 0x00007bf2 + KEY_POWER 0x00007bf3 +#NoGap + KEY_ENTER 0x00007bf4 + KEY_CLEAR 0x00007bf5 +#NoGap + KEY_9 0x00007bf6 + KEY_8 0x00007bf7 + KEY_7 0x00007bf8 + KEY_6 0x00007bf9 + KEY_5 0x00007bfa + KEY_4 0x00007bfb + KEY_3 0x00007bfc + KEY_2 0x00007bfd + KEY_1 0x00007bfe + KEY_0 0x00007bff + end codes + +end remote + +# +# this config file was automatically generated +# using lirc-0.8.2(macmini) on Tue Dec 11 11:35:26 2007 +# +# contributed by Sebastian Schaetzel +# +# brand: Apple +# model no. of remote control: A1156 +# devices being controlled by this remote: Mac mini, MacBookPro 15" +# SantaRosa (3.1), MacBook2 +# + +begin remote + + name Apple_A1156 + bits 8 + eps 30 + aeps 100 + + one 0 0 + zero 0 0 + pre_data_bits 24 + pre_data 0x87EE81 + gap 211982 + toggle_bit_mask 0x0 + ignore_mask 0x0000ff01 + + begin codes + KEY_VOLUMEUP 0x0B + KEY_VOLUMEDOWN 0x0D + KEY_REWIND 0x08 + KEY_FORWARD 0x07 + KEY_PLAYPAUSE 0x04 + KEY_MENU 0x02 + end codes + +end remote + +# Please make this file available to others +# by sending it to +# +# this config file was automatically generated +# using lirc-0.9.1-git(default) on Sat Jan 26 21:54:39 2013 +# +# contributed by +# +# brand: xbox.conf +# model no. of remote control: +# devices being controlled by this remote: +# + +begin remote + + name xbox.conf + bits 8 + eps 30 + aeps 100 + + one 0 0 + zero 0 0 + gap 63950 + min_repeat 4 +# suppress_repeat 4 +# uncomment to suppress unwanted repeats +# toggle_bit_mask 0x72 + toggle_bit_mask 0xE1 + + begin codes + KEY_OK 0x0B + KEY_OK 0xEA + KEY_STOP 0xE0 + KEY_PAUSE 0xE6 + KEY_NEXT 0xDF + KEY_PREVIOUS 0xDD + KEY_FASTFORWARD 0xE3 + KEY_REWIND 0xE2 + KEY_PROG1 0xD5 + KEY_EPG 0xE5 + KEY_INFO 0xC3 + KEY_UP 0xA6 + KEY_DOWN 0xA7 + KEY_LEFT 0xA9 + KEY_RIGHT 0xA8 + KEY_MENU 0xF7 + KEY_EXIT 0xD8 + KEY_0 0xCF + KEY_1 0xCE + KEY_2 0xCD + KEY_3 0xCC + KEY_4 0xCB + KEY_5 0xCA + KEY_6 0xC9 + KEY_7 0xC8 + KEY_8 0xC7 + KEY_9 0xC6 + end codes + +end remote + + From cadffc0208f1dcc567e87a0dc0a1807cf68d6520 Mon Sep 17 00:00:00 2001 From: Daniel Forsberg Date: Mon, 18 Mar 2013 20:33:07 +0100 Subject: [PATCH 26/41] install lircd.conf.rpi --- packages/sysutils/remote/lirc/install | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/sysutils/remote/lirc/install b/packages/sysutils/remote/lirc/install index f3f4ea7a78..1d3c280bb6 100755 --- a/packages/sysutils/remote/lirc/install +++ b/packages/sysutils/remote/lirc/install @@ -34,6 +34,7 @@ mkdir -p $INSTALL/usr/sbin mkdir -p $INSTALL/etc/lirc cp $PKG_DIR/config/lircd.conf.xbox $INSTALL/etc/lirc + cp $PKG_DIR/config/lircd.conf.rpi $INSTALL/etc/lirc mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/tools/.libs/ircat $INSTALL/usr/bin # do we need this? From 27ae3473ba3d3cecc30307678405fda32032719f Mon Sep 17 00:00:00 2001 From: Daniel Forsberg Date: Mon, 18 Mar 2013 23:23:33 +0100 Subject: [PATCH 27/41] lirc_rpi: fixed some mce mappings, try to limit repeats by default. --- .../remote/lirc/config/lircd.conf.rpi | 48 +++++++++---------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/packages/sysutils/remote/lirc/config/lircd.conf.rpi b/packages/sysutils/remote/lirc/config/lircd.conf.rpi index 94bd3f8939..494d26c287 100644 --- a/packages/sysutils/remote/lirc/config/lircd.conf.rpi +++ b/packages/sysutils/remote/lirc/config/lircd.conf.rpi @@ -2,13 +2,13 @@ # # Lirc config for lirc_rpi (GPIO) receiver. # Enables use of MCE Remote, Apple MacMini and XBOX remote. +# Should work with any generic receiver # ######## # # brand: HP/Philips/Microsoft/Other # model no. of remote control: Media Center Edition remote -# devices being controlled by this remote: HP Slimline S3100y and a -# myriad of devices with Media Center Edition receivers +# devices being controlled by this remote: myriad of devices with Media Center Edition receivers # # RC-6 config file # @@ -36,9 +36,7 @@ # Updated with codes for MCE 2007 Remote additional buttons # Visualization, Aspect, SlideShow, Eject # Note: -# Renamed some buttons: DVD->DVDMenu, More->MoreInfo, Star->Asterisk, Hash->Pound -# Note: -# Blue, Yellow, Green, Red, and Teletext buttons do not exist on the HP remote +# Blue, Yellow, Green, Red, and Teletext buttons do not exist on some HP remote begin remote @@ -56,13 +54,16 @@ begin remote gap 105000 toggle_bit 22 rc6_mask 0x100000000 + min_repeat 4 +# uncomment to suppress unwanted repeats + suppress_repeat 4 begin codes #seen on HP Pavilion dv3t remote --Tim Mann, 3 Nov 2009 - Media 0x00007b7f - PlayPause 0x00007b91 + KEY_VIDEO 0x00007b7f + KEY_PLAYPAUSE 0x00007b91 #unused by HP remote @@ -70,7 +71,7 @@ begin remote KEY_YELLOW 0x00007ba2 KEY_GREEN 0x00007ba3 KEY_RED 0x00007ba4 - Teletext 0x00007ba5 + KEY_TEXT 0x00007ba5 #ba6 - bae unused BA6 0x00007ba6 @@ -92,8 +93,8 @@ begin remote BB4 0x00007bb4 KEY_VIDEO 0x00007bb5 - Pictures 0x00007bb6 - RecTV 0x00007bb7 + KEY_CAMERA 0x00007bb6 + KEY_PVR 0x00007bb7 KEY_AUDIO 0x00007bb8 KEY_TV 0x00007bb9 @@ -132,9 +133,9 @@ begin remote BD6 0x00007bd6 BD7 0x00007bd7 - Aspect 0x00007bd8 - Guide 0x00007bd9 - LiveTV 0x00007bda + KEY_ANGLE 0x00007bd8 + KEY_EPG 0x00007bd9 + KEY_TV 0x00007bda KEY_DVD 0x00007bdb #NoGap KEY_BACK 0x00007bdc @@ -144,10 +145,10 @@ begin remote KEY_DOWN 0x00007be0 KEY_UP 0x00007be1 #NoGap - Star 0x00007be2 - Hash 0x00007be3 + KEY_NUMERIC_STAR 0x00007be2 + KEY_NUMERIC_POUND 0x00007be3 #NoGap - KEY_AGAIN 0x00007be4 + KEY_PREVIOUS 0x00007be4 KEY_NEXT 0x00007be5 KEY_STOP 0x00007be6 KEY_PAUSE 0x00007be7 @@ -161,7 +162,7 @@ begin remote KEY_VOLUMEDOWN 0x00007bee KEY_VOLUMEUP 0x00007bef #NoGap - More 0x00007bf0 + KEY_INFO 0x00007bf0 KEY_MUTE 0x00007bf1 KEY_HOME 0x00007bf2 KEY_POWER 0x00007bf3 @@ -183,7 +184,6 @@ begin remote end remote -# # this config file was automatically generated # using lirc-0.8.2(macmini) on Tue Dec 11 11:35:26 2007 # @@ -229,14 +229,13 @@ end remote # # contributed by # -# brand: xbox.conf -# model no. of remote control: -# devices being controlled by this remote: -# +# brand: Microsoft +# model: Xbox DVD Remote +# devices being controlled by this remote: xbox begin remote - name xbox.conf + name XboxDVDDongle bits 8 eps 30 aeps 100 @@ -245,7 +244,7 @@ begin remote zero 0 0 gap 63950 min_repeat 4 -# suppress_repeat 4 + suppress_repeat 4 # uncomment to suppress unwanted repeats # toggle_bit_mask 0x72 toggle_bit_mask 0xE1 @@ -282,4 +281,3 @@ begin remote end remote - From 3e910acdab7d742de55b6def1daed56aeb1ae680 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 19 Mar 2013 00:38:14 +0100 Subject: [PATCH 28/41] projects/ATV/linux: change to UP kernel Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 45 +++++------------------------- 1 file changed, 7 insertions(+), 38 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index bcd7d9776e..7a7e7e7e7c 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -32,8 +32,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y # CONFIG_AUDIT_ARCH is not set CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_X86_32_SMP=y -CONFIG_X86_HT=y CONFIG_X86_32_LAZY_GS=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" CONFIG_ARCH_SUPPORTS_UPROBES=y @@ -46,6 +44,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y # General setup # CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="" @@ -76,14 +75,12 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_PENDING_IRQ=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_KTIME_SCALAR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y @@ -106,12 +103,9 @@ CONFIG_BSD_PROCESS_ACCT=y # # RCU Subsystem # -CONFIG_TREE_RCU=y +# CONFIG_TREE_RCU is not set +CONFIG_TINY_RCU=y # CONFIG_PREEMPT_RCU is not set -CONFIG_RCU_FANOUT=32 -CONFIG_RCU_FANOUT_LEAF=16 -# CONFIG_RCU_FANOUT_EXACT is not set -CONFIG_RCU_FAST_NO_HZ=y # CONFIG_TREE_RCU_TRACE is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=16 @@ -183,7 +177,6 @@ CONFIG_HAVE_OPTPROBES=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_USE_GENERIC_SMP_HELPERS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_DMA_API_DEBUG=y @@ -221,7 +214,6 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set -CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_LBDAF=y CONFIG_BLK_DEV_BSG=y @@ -265,16 +257,13 @@ CONFIG_INLINE_READ_UNLOCK=y CONFIG_INLINE_READ_UNLOCK_IRQ=y CONFIG_INLINE_WRITE_UNLOCK=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -CONFIG_MUTEX_SPIN_ON_OWNER=y # CONFIG_FREEZER is not set # # Processor type and features # CONFIG_ZONE_DMA=y -CONFIG_SMP=y -CONFIG_X86_MPPARSE=y -# CONFIG_X86_BIGSMP is not set +# CONFIG_SMP is not set # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y # CONFIG_X86_32_IRIS is not set @@ -333,22 +322,14 @@ CONFIG_CPU_SUP_INTEL=y CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_DMI=y -CONFIG_NR_CPUS=2 -# CONFIG_SCHED_SMT is not set -# CONFIG_SCHED_MC is not set +CONFIG_NR_CPUS=1 # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set -CONFIG_X86_LOCAL_APIC=y -CONFIG_X86_IO_APIC=y -CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y +# CONFIG_X86_UP_APIC is not set CONFIG_X86_MCE=y -CONFIG_X86_MCE_INTEL=y -# CONFIG_X86_MCE_AMD is not set # CONFIG_X86_ANCIENT_MCE is not set -CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set -CONFIG_X86_THERMAL_VECTOR=y # CONFIG_VM86 is not set # CONFIG_TOSHIBA is not set # CONFIG_I8K is not set @@ -398,6 +379,7 @@ CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_NEED_PER_CPU_KM=y CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set @@ -425,7 +407,6 @@ CONFIG_KEXEC=y CONFIG_PHYSICAL_START=0x1000000 # CONFIG_RELOCATABLE is not set CONFIG_PHYSICAL_ALIGN=0x1000000 -# CONFIG_HOTPLUG_CPU is not set # CONFIG_COMPAT_VDSO is not set CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init processor.max_cstate=2" @@ -529,12 +510,9 @@ CONFIG_PCIEASPM=y CONFIG_PCIEASPM_DEFAULT=y # CONFIG_PCIEASPM_POWERSAVE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set -CONFIG_ARCH_SUPPORTS_MSI=y -CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set # CONFIG_PCI_STUB is not set -CONFIG_HT_IRQ=y # CONFIG_PCI_IOV is not set # CONFIG_PCI_PRI is not set # CONFIG_PCI_PASID is not set @@ -729,9 +707,6 @@ CONFIG_LLC=y CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set # CONFIG_OPENVSWITCH is not set -CONFIG_RPS=y -CONFIG_RFS_ACCEL=y -CONFIG_XPS=y CONFIG_BQL=y # @@ -3019,13 +2994,10 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y # CONFIG_FRAME_POINTER is not set # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=60 -# CONFIG_RCU_CPU_STALL_INFO is not set # CONFIG_RCU_TRACE 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_DEBUG_PER_CPU_MAPS is not set # CONFIG_LKDTM is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set @@ -3081,7 +3053,6 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 # CONFIG_CPA_DEBUG is not set CONFIG_OPTIMIZE_INLINING=y # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set -# CONFIG_DEBUG_NMI_SELFTEST is not set # # Security options @@ -3114,7 +3085,6 @@ CONFIG_CRYPTO_MANAGER2=y # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set # 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 is not set @@ -3248,7 +3218,6 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y -CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_NLATTR=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y From 714a3fc2ea55e5965b5a9f996119eca0b8154eb0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 19 Mar 2013 01:06:18 +0100 Subject: [PATCH 29/41] projects/ATV/linux: add UP_APIC, UP_IOAPIC, LOCAL_APIC and IO_APIC support, this fixes the 'crazy' ATV-Remote on UP kernels Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 7a7e7e7e7c..05e8f901ee 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -81,6 +81,7 @@ CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_KTIME_SCALAR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y @@ -103,7 +104,6 @@ CONFIG_BSD_PROCESS_ACCT=y # # RCU Subsystem # -# CONFIG_TREE_RCU is not set CONFIG_TINY_RCU=y # CONFIG_PREEMPT_RCU is not set # CONFIG_TREE_RCU_TRACE is not set @@ -264,6 +264,7 @@ CONFIG_INLINE_WRITE_UNLOCK_IRQ=y # CONFIG_ZONE_DMA=y # CONFIG_SMP is not set +CONFIG_X86_MPPARSE=y # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y # CONFIG_X86_32_IRIS is not set @@ -326,10 +327,18 @@ CONFIG_NR_CPUS=1 # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set -# CONFIG_X86_UP_APIC is not set +CONFIG_X86_UP_APIC=y +CONFIG_X86_UP_IOAPIC=y +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set CONFIG_X86_MCE=y +CONFIG_X86_MCE_INTEL=y +# CONFIG_X86_MCE_AMD is not set # CONFIG_X86_ANCIENT_MCE is not set +CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set +CONFIG_X86_THERMAL_VECTOR=y # CONFIG_VM86 is not set # CONFIG_TOSHIBA is not set # CONFIG_I8K is not set @@ -510,9 +519,12 @@ CONFIG_PCIEASPM=y CONFIG_PCIEASPM_DEFAULT=y # CONFIG_PCIEASPM_POWERSAVE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set +CONFIG_ARCH_SUPPORTS_MSI=y +# CONFIG_PCI_MSI is not set # CONFIG_PCI_DEBUG is not set # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set # CONFIG_PCI_STUB is not set +# CONFIG_HT_IRQ is not set # CONFIG_PCI_IOV is not set # CONFIG_PCI_PRI is not set # CONFIG_PCI_PASID is not set @@ -3053,6 +3065,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 # CONFIG_CPA_DEBUG is not set CONFIG_OPTIMIZE_INLINING=y # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set +# CONFIG_DEBUG_NMI_SELFTEST is not set # # Security options From c7b3ffe573a18a2593b1f5f01e441b69c362448e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 19 Mar 2013 03:27:09 +0100 Subject: [PATCH 30/41] xbmc: Added recordedtv and liveradio buttons to devinput mapm thanks to jenkins101, this fixes #1753 Signed-off-by: Stephan Raue --- .../xbmc/patches/xbmc-463-add_remote_devinput-0.1.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/xbmc/patches/xbmc-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-463-add_remote_devinput-0.1.patch index 85d635b61b..a15ab62d94 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-463-add_remote_devinput-0.1.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-463-add_remote_devinput-0.1.patch @@ -1,7 +1,7 @@ diff -Naur xbmc-10.1-Dharma/system/Lircmap.xml xbmc-10.1-Dharma.patch/system/Lircmap.xml --- xbmc-10.1-Dharma/system/Lircmap.xml 2011-06-18 01:43:43.132101246 +0200 +++ xbmc-10.1-Dharma.patch/system/Lircmap.xml 2011-06-18 01:44:53.777025290 +0200 -@@ -365,7 +365,6 @@ +@@ -409,7 +409,6 @@ cx23885_remote @@ -9,7 +9,7 @@ diff -Naur xbmc-10.1-Dharma/system/Lircmap.xml xbmc-10.1-Dharma.patch/system/Lir KEY_LEFT KEY_RIGHT KEY_UP -@@ -452,4 +451,59 @@ +@@ -510,4 +509,61 @@ yellow blue @@ -67,5 +67,7 @@ diff -Naur xbmc-10.1-Dharma/system/Lircmap.xml xbmc-10.1-Dharma.patch/system/Lir + KEY_GREEN + KEY_YELLOW + KEY_BLUE ++ KEY_PVR ++ KEY_RADIO + From 3d0546ddbcea0ca3a1ef2b922572fbb29b30f2d5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 19 Mar 2013 16:57:21 +0100 Subject: [PATCH 31/41] RTL8192CU: add new device ID (330D), thanks to https://github.com/raspberrypi/linux/commit/ae67bed09d7a2b85a62c13b3ea1eecb487d04812 Signed-off-by: Stephan Raue --- .../RTL8192CU-add_device_ID_330d.patch | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 packages/linux-drivers/RTL8192CU/patches/RTL8192CU-add_device_ID_330d.patch diff --git a/packages/linux-drivers/RTL8192CU/patches/RTL8192CU-add_device_ID_330d.patch b/packages/linux-drivers/RTL8192CU/patches/RTL8192CU-add_device_ID_330d.patch new file mode 100644 index 0000000000..e34cae9858 --- /dev/null +++ b/packages/linux-drivers/RTL8192CU/patches/RTL8192CU-add_device_ID_330d.patch @@ -0,0 +1,23 @@ +diff -Naur RTL8192CU-v3.4.4_4749.20121105/hal/rtl8192c/usb/usb_halinit.c RTL8192CU-v3.4.4_4749.20121105.patch/hal/rtl8192c/usb/usb_halinit.c +--- RTL8192CU-v3.4.4_4749.20121105/hal/rtl8192c/usb/usb_halinit.c 2012-07-30 14:51:05.000000000 +0200 ++++ RTL8192CU-v3.4.4_4749.20121105.patch/hal/rtl8192c/usb/usb_halinit.c 2013-03-19 16:51:48.251080509 +0100 +@@ -3786,6 +3786,8 @@ + pHalData->CustomerID = RT_CID_DLINK; + else if((pHalData->EEPROMVID == 0x2001) && (pHalData->EEPROMPID == 0x330a)) + pHalData->CustomerID = RT_CID_DLINK; ++ else if((pHalData->EEPROMVID == 0x2001) && (pHalData->EEPROMPID == 0x330d)) ++ pHalData->CustomerID = RT_CID_DLINK; + break; + case EEPROM_CID_WHQL: + /* +diff -Naur RTL8192CU-v3.4.4_4749.20121105/os_dep/linux/usb_intf.c RTL8192CU-v3.4.4_4749.20121105.patch/os_dep/linux/usb_intf.c +--- RTL8192CU-v3.4.4_4749.20121105/os_dep/linux/usb_intf.c 2012-07-30 14:51:05.000000000 +0200 ++++ RTL8192CU-v3.4.4_4749.20121105.patch/os_dep/linux/usb_intf.c 2013-03-19 16:52:54.174644642 +0100 +@@ -137,6 +137,7 @@ + {USB_DEVICE(0x2001, 0x3307)},//D-Link - Cameo + {USB_DEVICE(0x2001, 0x330A)},//D-Link - Alpha + {USB_DEVICE(0x2001, 0x3309)},//D-Link - Alpha ++ {USB_DEVICE(0x2001, 0x330D)},//D-Link - Alpha(?) + {USB_DEVICE(0x0586, 0x341F)},//Zyxel - Abocom + {USB_DEVICE(0x7392, 0x7822)},//Edimax - Edimax + {USB_DEVICE(0x2019, 0xAB2B)},//Planex - Abocom From f91baeb8dc6fdf8a1369e9c645bea44677451964 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 19 Mar 2013 16:58:04 +0100 Subject: [PATCH 32/41] samba: update to samba-3.6.13 Signed-off-by: Stephan Raue --- packages/network/samba/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/samba/meta b/packages/network/samba/meta index 02ce613ccb..dbf38b3043 100644 --- a/packages/network/samba/meta +++ b/packages/network/samba/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="samba" -PKG_VERSION="3.6.11" +PKG_VERSION="3.6.13" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 9817b9d937a6bb258eb142e701eba230533354c6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 19 Mar 2013 16:58:38 +0100 Subject: [PATCH 33/41] libffi: update to libffi-3.0.13 Signed-off-by: Stephan Raue --- packages/devel/libffi/meta | 2 +- .../{libffi-3.0.11-includedir.patch => libffi-includedir.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/devel/libffi/patches/{libffi-3.0.11-includedir.patch => libffi-includedir.patch} (100%) diff --git a/packages/devel/libffi/meta b/packages/devel/libffi/meta index 50a026fe89..15dcf2ff4b 100644 --- a/packages/devel/libffi/meta +++ b/packages/devel/libffi/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libffi" -PKG_VERSION="3.0.11" +PKG_VERSION="3.0.13" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/devel/libffi/patches/libffi-3.0.11-includedir.patch b/packages/devel/libffi/patches/libffi-includedir.patch similarity index 100% rename from packages/devel/libffi/patches/libffi-3.0.11-includedir.patch rename to packages/devel/libffi/patches/libffi-includedir.patch From ff0b3b64653b04fc33792842ef4c57de83d54f50 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 19 Mar 2013 16:59:40 +0100 Subject: [PATCH 34/41] projects/RPi: update RPi kernel patches Signed-off-by: Stephan Raue --- ...=> linux-3.6-01-RPi_support-e959a8e.patch} | 1452 ++++++++++++++--- 1 file changed, 1229 insertions(+), 223 deletions(-) rename projects/RPi/patches/linux/{linux-3.6-01-RPi_support-89caf39.patch => linux-3.6-01-RPi_support-e959a8e.patch} (98%) diff --git a/projects/RPi/patches/linux/linux-3.6-01-RPi_support-89caf39.patch b/projects/RPi/patches/linux/linux-3.6-01-RPi_support-e959a8e.patch similarity index 98% rename from projects/RPi/patches/linux/linux-3.6-01-RPi_support-89caf39.patch rename to projects/RPi/patches/linux/linux-3.6-01-RPi_support-e959a8e.patch index bb317c6693..19c531780e 100644 --- a/projects/RPi/patches/linux/linux-3.6-01-RPi_support-89caf39.patch +++ b/projects/RPi/patches/linux/linux-3.6-01-RPi_support-e959a8e.patch @@ -1,6 +1,19 @@ +diff -Naur linux-3.6.11/arch/arm/boot/compressed/decompress.c linux-rpi-3.6.y/arch/arm/boot/compressed/decompress.c +--- linux-3.6.11/arch/arm/boot/compressed/decompress.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/boot/compressed/decompress.c 2013-03-19 15:30:32.401096952 +0100 +@@ -32,6 +32,9 @@ + # define Tracecv(c,x) + #endif + ++/* Not needed, but used in some headers pulled in by decompressors */ ++extern char * strstr(const char * s1, const char *s2); ++ + #ifdef CONFIG_KERNEL_GZIP + #include "../../../../lib/decompress_inflate.c" + #endif diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_cutdown_defconfig --- linux-3.6.11/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_cutdown_defconfig 2013-02-28 04:23:24.903596383 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_cutdown_defconfig 2013-03-19 15:30:33.497089006 +0100 @@ -0,0 +1,546 @@ +CONFIG_EXPERIMENTAL=y +CONFIG_LOCALVERSION="-cutdown" @@ -550,7 +563,7 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi-3.6. +CONFIG_LIBCRC32C=y diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_defconfig --- linux-3.6.11/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_defconfig 2013-02-28 04:23:24.901596390 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_defconfig 2013-03-19 15:30:33.400089710 +0100 @@ -0,0 +1,1001 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_EXPERIMENTAL=y @@ -1555,7 +1568,7 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.y/arch/a +CONFIG_LIBCRC32C=y diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_emergency_defconfig --- linux-3.6.11/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_emergency_defconfig 2013-02-28 04:23:24.899596397 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_emergency_defconfig 2013-03-19 15:30:33.405089673 +0100 @@ -0,0 +1,532 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -2091,7 +2104,7 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi-3. +CONFIG_LIBCRC32C=y diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_quick_defconfig --- linux-3.6.11/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_quick_defconfig 2013-02-28 04:23:24.894596418 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_quick_defconfig 2013-03-19 15:30:33.496089014 +0100 @@ -0,0 +1,298 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_EXPERIMENTAL=y @@ -2393,7 +2406,7 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi-3.6.y/ +CONFIG_AVERAGE=y diff -Naur linux-3.6.11/arch/arm/include/asm/fiq.h linux-rpi-3.6.y/arch/arm/include/asm/fiq.h --- linux-3.6.11/arch/arm/include/asm/fiq.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/include/asm/fiq.h 2013-02-28 04:23:24.927596289 +0100 ++++ linux-rpi-3.6.y/arch/arm/include/asm/fiq.h 2013-03-19 15:30:32.680094929 +0100 @@ -42,6 +42,7 @@ /* helpers defined in fiqasm.S: */ extern void __set_fiq_regs(unsigned long const *regs); @@ -2404,7 +2417,7 @@ diff -Naur linux-3.6.11/arch/arm/include/asm/fiq.h linux-rpi-3.6.y/arch/arm/incl { diff -Naur linux-3.6.11/arch/arm/Kconfig linux-rpi-3.6.y/arch/arm/Kconfig --- linux-3.6.11/arch/arm/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/Kconfig 2013-02-28 04:23:24.936596253 +0100 ++++ linux-rpi-3.6.y/arch/arm/Kconfig 2013-03-19 15:30:33.090091957 +0100 @@ -999,6 +999,23 @@ help Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx). @@ -2439,7 +2452,7 @@ diff -Naur linux-3.6.11/arch/arm/Kconfig linux-rpi-3.6.y/arch/arm/Kconfig config ARCH_ACORN diff -Naur linux-3.6.11/arch/arm/Kconfig.debug linux-rpi-3.6.y/arch/arm/Kconfig.debug --- linux-3.6.11/arch/arm/Kconfig.debug 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/Kconfig.debug 2013-02-28 04:23:25.032595878 +0100 ++++ linux-rpi-3.6.y/arch/arm/Kconfig.debug 2013-03-19 15:30:31.429103997 +0100 @@ -371,6 +371,14 @@ For more details about semihosting, please see chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd. @@ -2457,7 +2470,7 @@ diff -Naur linux-3.6.11/arch/arm/Kconfig.debug linux-rpi-3.6.y/arch/arm/Kconfig. config EARLY_PRINTK diff -Naur linux-3.6.11/arch/arm/kernel/fiqasm.S linux-rpi-3.6.y/arch/arm/kernel/fiqasm.S --- linux-3.6.11/arch/arm/kernel/fiqasm.S 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/kernel/fiqasm.S 2013-02-28 04:23:24.670597292 +0100 ++++ linux-rpi-3.6.y/arch/arm/kernel/fiqasm.S 2013-03-19 15:30:31.170105875 +0100 @@ -47,3 +47,7 @@ mov r0, r0 @ avoid hazard prior to ARMv4 mov pc, lr @@ -2468,7 +2481,7 @@ diff -Naur linux-3.6.11/arch/arm/kernel/fiqasm.S linux-rpi-3.6.y/arch/arm/kernel +ENDPROC(__FIQ_Branch) diff -Naur linux-3.6.11/arch/arm/kernel/fiq.c linux-rpi-3.6.y/arch/arm/kernel/fiq.c --- linux-3.6.11/arch/arm/kernel/fiq.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/kernel/fiq.c 2013-02-28 04:23:24.677597265 +0100 ++++ linux-rpi-3.6.y/arch/arm/kernel/fiq.c 2013-03-19 15:30:31.170105875 +0100 @@ -137,6 +137,7 @@ EXPORT_SYMBOL(set_fiq_handler); EXPORT_SYMBOL(__set_fiq_regs); /* defined in fiqasm.S */ @@ -2477,9 +2490,162 @@ diff -Naur linux-3.6.11/arch/arm/kernel/fiq.c linux-rpi-3.6.y/arch/arm/kernel/fi EXPORT_SYMBOL(claim_fiq); EXPORT_SYMBOL(release_fiq); EXPORT_SYMBOL(enable_fiq); +diff -Naur linux-3.6.11/arch/arm/lib/memset.S linux-rpi-3.6.y/arch/arm/lib/memset.S +--- linux-3.6.11/arch/arm/lib/memset.S 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/lib/memset.S 2013-03-19 15:30:33.266090681 +0100 +@@ -19,9 +19,9 @@ + 1: subs r2, r2, #4 @ 1 do we have enough + blt 5f @ 1 bytes to align with? + cmp r3, #2 @ 1 +- strltb r1, [r0], #1 @ 1 +- strleb r1, [r0], #1 @ 1 +- strb r1, [r0], #1 @ 1 ++ strltb r1, [ip], #1 @ 1 ++ strleb r1, [ip], #1 @ 1 ++ strb r1, [ip], #1 @ 1 + add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3)) + /* + * The pointer is now aligned and the length is adjusted. Try doing the +@@ -29,10 +29,14 @@ + */ + + ENTRY(memset) +- ands r3, r0, #3 @ 1 unaligned? ++/* ++ * Preserve the contents of r0 for the return value. ++ */ ++ mov ip, r0 ++ ands r3, ip, #3 @ 1 unaligned? + bne 1b @ 1 + /* +- * we know that the pointer in r0 is aligned to a word boundary. ++ * we know that the pointer in ip is aligned to a word boundary. + */ + orr r1, r1, r1, lsl #8 + orr r1, r1, r1, lsl #16 +@@ -43,29 +47,28 @@ + #if ! CALGN(1)+0 + + /* +- * We need an extra register for this loop - save the return address and +- * use the LR ++ * We need 2 extra registers for this loop - use r8 and the LR + */ +- str lr, [sp, #-4]! +- mov ip, r1 ++ stmfd sp!, {r8, lr} ++ mov r8, r1 + mov lr, r1 + + 2: subs r2, r2, #64 +- stmgeia r0!, {r1, r3, ip, lr} @ 64 bytes at a time. +- stmgeia r0!, {r1, r3, ip, lr} +- stmgeia r0!, {r1, r3, ip, lr} +- stmgeia r0!, {r1, r3, ip, lr} ++ stmgeia ip!, {r1, r3, r8, lr} @ 64 bytes at a time. ++ stmgeia ip!, {r1, r3, r8, lr} ++ stmgeia ip!, {r1, r3, r8, lr} ++ stmgeia ip!, {r1, r3, r8, lr} + bgt 2b +- ldmeqfd sp!, {pc} @ Now <64 bytes to go. ++ ldmeqfd sp!, {r8, pc} @ Now <64 bytes to go. + /* + * No need to correct the count; we're only testing bits from now on + */ + tst r2, #32 +- stmneia r0!, {r1, r3, ip, lr} +- stmneia r0!, {r1, r3, ip, lr} ++ stmneia ip!, {r1, r3, r8, lr} ++ stmneia ip!, {r1, r3, r8, lr} + tst r2, #16 +- stmneia r0!, {r1, r3, ip, lr} +- ldr lr, [sp], #4 ++ stmneia ip!, {r1, r3, r8, lr} ++ ldmfd sp!, {r8, lr} + + #else + +@@ -74,54 +77,54 @@ + * whole cache lines at once. + */ + +- stmfd sp!, {r4-r7, lr} ++ stmfd sp!, {r4-r8, lr} + mov r4, r1 + mov r5, r1 + mov r6, r1 + mov r7, r1 +- mov ip, r1 ++ mov r8, r1 + mov lr, r1 + + cmp r2, #96 +- tstgt r0, #31 ++ tstgt ip, #31 + ble 3f + +- and ip, r0, #31 +- rsb ip, ip, #32 +- sub r2, r2, ip +- movs ip, ip, lsl #(32 - 4) +- stmcsia r0!, {r4, r5, r6, r7} +- stmmiia r0!, {r4, r5} +- tst ip, #(1 << 30) +- mov ip, r1 +- strne r1, [r0], #4 ++ and r8, ip, #31 ++ rsb r8, r8, #32 ++ sub r2, r2, r8 ++ movs r8, r8, lsl #(32 - 4) ++ stmcsia ip!, {r4, r5, r6, r7} ++ stmmiia ip!, {r4, r5} ++ tst r8, #(1 << 30) ++ mov r8, r1 ++ strne r1, [ip], #4 + + 3: subs r2, r2, #64 +- stmgeia r0!, {r1, r3-r7, ip, lr} +- stmgeia r0!, {r1, r3-r7, ip, lr} ++ stmgeia ip!, {r1, r3-r8, lr} ++ stmgeia ip!, {r1, r3-r8, lr} + bgt 3b +- ldmeqfd sp!, {r4-r7, pc} ++ ldmeqfd sp!, {r4-r8, pc} + + tst r2, #32 +- stmneia r0!, {r1, r3-r7, ip, lr} ++ stmneia ip!, {r1, r3-r8, lr} + tst r2, #16 +- stmneia r0!, {r4-r7} +- ldmfd sp!, {r4-r7, lr} ++ stmneia ip!, {r4-r7} ++ ldmfd sp!, {r4-r8, lr} + + #endif + + 4: tst r2, #8 +- stmneia r0!, {r1, r3} ++ stmneia ip!, {r1, r3} + tst r2, #4 +- strne r1, [r0], #4 ++ strne r1, [ip], #4 + /* + * When we get here, we've got less than 4 bytes to zero. We + * may have an unaligned pointer as well. + */ + 5: tst r2, #2 +- strneb r1, [r0], #1 +- strneb r1, [r0], #1 ++ strneb r1, [ip], #1 ++ strneb r1, [ip], #1 + tst r2, #1 +- strneb r1, [r0], #1 ++ strneb r1, [ip], #1 + mov pc, lr + ENDPROC(memset) diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/armctrl.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.c --- linux-3.6.11/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.c 2013-02-28 04:23:24.455598131 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.c 2013-03-19 15:30:31.974100047 +0100 @@ -0,0 +1,227 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -2710,7 +2876,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/armctrl.c linux-rpi-3.6.y/arch/arm +} diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/armctrl.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.h --- linux-3.6.11/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.h 2013-02-28 04:23:24.456598127 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.h 2013-03-19 15:30:31.968100091 +0100 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -2741,7 +2907,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/armctrl.h linux-rpi-3.6.y/arch/arm +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.c --- linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.c 2013-02-28 04:23:24.454598135 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.c 2013-03-19 15:30:31.968100091 +0100 @@ -0,0 +1,947 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c @@ -3692,8 +3858,8 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.6.y/arch/arm +module_param(uart_clock, uint, 0644); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708_gpio.c --- linux-3.6.11/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708_gpio.c 2013-02-28 04:23:24.455598131 +0100 -@@ -0,0 +1,339 @@ ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708_gpio.c 2013-03-19 15:30:31.988099946 +0100 +@@ -0,0 +1,341 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c + * @@ -3869,6 +4035,8 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-3.6.y/arc + unsigned long rising = readl(gpio->base + GPIOREN(gb)); + unsigned long falling = readl(gpio->base + GPIOFEN(gb)); + ++ gn = gn % 32; ++ + writel(rising & ~(1 << gn), gpio->base + GPIOREN(gb)); + writel(falling & ~(1 << gn), gpio->base + GPIOFEN(gb)); +} @@ -4035,7 +4203,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-3.6.y/arc +MODULE_LICENSE("GPL"); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.h --- linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.h 2013-02-28 04:23:24.455598131 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.h 2013-03-19 15:30:31.988099946 +0100 @@ -0,0 +1,51 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -4090,7 +4258,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.h linux-rpi-3.6.y/arch/arm +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/clock.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.c --- linux-3.6.11/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.c 2013-02-28 04:23:24.454598135 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.c 2013-03-19 15:30:31.988099946 +0100 @@ -0,0 +1,61 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.c @@ -4155,7 +4323,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/clock.c linux-rpi-3.6.y/arch/arm/m +EXPORT_SYMBOL(clk_set_rate); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/clock.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.h --- linux-3.6.11/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.h 2013-02-28 04:23:24.455598131 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.h 2013-03-19 15:30:31.968100091 +0100 @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.h @@ -4183,7 +4351,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/clock.h linux-rpi-3.6.y/arch/arm/m +}; diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/delay.S linux-rpi-3.6.y/arch/arm/mach-bcm2708/delay.S --- linux-3.6.11/arch/arm/mach-bcm2708/delay.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/delay.S 2013-02-28 04:23:24.456598127 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/delay.S 2013-03-19 15:30:31.988099946 +0100 @@ -0,0 +1,21 @@ +/* + * linux/arch/arm/lib/delay.S @@ -4208,7 +4376,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/delay.S linux-rpi-3.6.y/arch/arm/m +ENDPROC(bcm2708_delay) diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dma.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/dma.c --- linux-3.6.11/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/dma.c 2013-02-28 04:23:24.456598127 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/dma.c 2013-03-19 15:30:31.968100091 +0100 @@ -0,0 +1,397 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -4609,7 +4777,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dma.c linux-rpi-3.6.y/arch/arm/mac +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/dmaer.c --- linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/dmaer.c 2013-02-28 04:23:24.460598112 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/dmaer.c 2013-03-19 15:30:31.988099946 +0100 @@ -0,0 +1,887 @@ +#include +#include @@ -5500,7 +5668,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_control.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_control.h 2013-02-28 04:23:24.457598123 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_control.h 2013-03-19 15:30:31.975100040 +0100 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -5923,7 +6091,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-r +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_power.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_power.h 2013-02-28 04:23:24.460598112 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_power.h 2013-03-19 15:30:31.975100040 +0100 @@ -0,0 +1,60 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -5987,7 +6155,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/clkdev.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/clkdev.h 2013-02-28 04:23:24.458598120 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/clkdev.h 2013-03-19 15:30:31.977100025 +0100 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -5998,7 +6166,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi-3. +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/debug-macro.S --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2013-02-28 04:23:24.457598123 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2013-03-19 15:30:31.977100025 +0100 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -6024,7 +6192,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-r +#include diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/dma.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/dma.h 2013-02-28 04:23:24.458598120 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/dma.h 2013-03-19 15:30:31.977100025 +0100 @@ -0,0 +1,84 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -6112,7 +6280,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi-3.6.y +#endif /* _MACH_BCM2708_DMA_H */ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/entry-macro.S --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2013-02-28 04:23:24.459598116 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2013-03-19 15:30:31.975100040 +0100 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -6185,7 +6353,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-r + .endm diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/frc.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/frc.h 2013-02-28 04:23:24.458598120 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/frc.h 2013-03-19 15:30:31.977100025 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6227,7 +6395,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi-3.6.y +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/gpio.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/gpio.h 2013-02-28 04:23:24.459598116 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/gpio.h 2013-03-19 15:30:31.977100025 +0100 @@ -0,0 +1,48 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -6279,7 +6447,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi-3.6. + diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/hardware.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/hardware.h 2013-02-28 04:23:24.458598120 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/hardware.h 2013-03-19 15:30:31.975100040 +0100 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -6311,7 +6479,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi- +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/io.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/io.h 2013-02-28 04:23:24.459598116 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/io.h 2013-03-19 15:30:31.974100047 +0100 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -6343,7 +6511,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi-3.6.y/ +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/irqs.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/irqs.h 2013-02-28 04:23:24.457598123 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/irqs.h 2013-03-19 15:30:31.977100025 +0100 @@ -0,0 +1,199 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -6546,7 +6714,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi-3.6. +#endif /* _BCM2708_IRQS_H_ */ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/memory.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/memory.h 2013-02-28 04:23:24.458598120 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/memory.h 2013-03-19 15:30:31.977100025 +0100 @@ -0,0 +1,57 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -6607,7 +6775,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi-3. +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/platform.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/platform.h 2013-02-28 04:23:24.458598120 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/platform.h 2013-03-19 15:30:31.975100040 +0100 @@ -0,0 +1,226 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -6837,7 +7005,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi- +/* END */ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/power.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/power.h 2013-02-28 04:23:24.458598120 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/power.h 2013-03-19 15:30:31.975100040 +0100 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -6867,7 +7035,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi-3.6 +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/system.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/system.h 2013-02-28 04:23:24.457598123 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/system.h 2013-03-19 15:30:31.977100025 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -6909,7 +7077,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi-3. +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/timex.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/timex.h 2013-02-28 04:23:24.459598116 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/timex.h 2013-03-19 15:30:31.975100040 +0100 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6936,7 +7104,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi-3.6 +#define CLOCK_TICK_RATE (1000000) diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/uncompress.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/uncompress.h 2013-02-28 04:23:24.458598120 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/uncompress.h 2013-03-19 15:30:31.977100025 +0100 @@ -0,0 +1,85 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -7025,7 +7193,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rp + diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vcio.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vcio.h 2013-02-28 04:23:24.457598123 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vcio.h 2013-03-19 15:30:31.977100025 +0100 @@ -0,0 +1,141 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -7170,7 +7338,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi-3.6. +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_mem.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2013-02-28 04:23:24.459598116 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2013-03-19 15:30:31.977100025 +0100 @@ -0,0 +1,36 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -7210,7 +7378,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi-3. + diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_support.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_support.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_support.h 2013-02-28 04:23:24.459598116 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_support.h 2013-03-19 15:30:31.975100040 +0100 @@ -0,0 +1,69 @@ +#ifndef _VC_SUPPORT_H_ +#define _VC_SUPPORT_H_ @@ -7283,7 +7451,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-rp +#endif diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vmalloc.h --- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2013-02-28 04:23:24.457598123 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2013-03-19 15:30:31.977100025 +0100 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -7307,7 +7475,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi-3 +#define VMALLOC_END (0xe8000000) diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Kconfig linux-rpi-3.6.y/arch/arm/mach-bcm2708/Kconfig --- linux-3.6.11/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Kconfig 2013-02-28 04:23:24.460598112 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Kconfig 2013-03-19 15:30:31.988099946 +0100 @@ -0,0 +1,41 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 @@ -7352,7 +7520,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Kconfig linux-rpi-3.6.y/arch/arm/m +endmenu diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Makefile linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile --- linux-3.6.11/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile 2013-02-28 04:23:24.454598135 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile 2013-03-19 15:30:31.968100091 +0100 @@ -0,0 +1,11 @@ +# +# Makefile for the linux kernel. @@ -7367,14 +7535,14 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Makefile linux-rpi-3.6.y/arch/arm/ + diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Makefile.boot linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile.boot --- linux-3.6.11/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile.boot 2013-02-28 04:23:24.460598112 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile.boot 2013-03-19 15:30:31.977100025 +0100 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/power.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/power.c --- linux-3.6.11/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/power.c 2013-02-28 04:23:24.453598139 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/power.c 2013-03-19 15:30:31.988099946 +0100 @@ -0,0 +1,194 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -7572,7 +7740,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/power.c linux-rpi-3.6.y/arch/arm/m +MODULE_LICENSE("GPL"); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/vcio.c --- linux-3.6.11/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vcio.c 2013-02-28 04:23:24.455598131 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vcio.c 2013-03-19 15:30:31.988099946 +0100 @@ -0,0 +1,474 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c @@ -8050,7 +8218,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.6.y/arch/arm/ma +MODULE_ALIAS("platform:bcm-mbox"); diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vc_mem.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_mem.c --- linux-3.6.11/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_mem.c 2013-02-28 04:23:24.454598135 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_mem.c 2013-03-19 15:30:31.988099946 +0100 @@ -0,0 +1,458 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -8512,7 +8680,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vc_mem.c linux-rpi-3.6.y/arch/arm/ + diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vc_support.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_support.c --- linux-3.6.11/arch/arm/mach-bcm2708/vc_support.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_support.c 2013-02-28 04:23:24.460598112 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_support.c 2013-03-19 15:30:31.974100047 +0100 @@ -0,0 +1,319 @@ +/* + * vc_support.c @@ -8835,7 +9003,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vc_support.c linux-rpi-3.6.y/arch/ + diff -Naur linux-3.6.11/arch/arm/Makefile linux-rpi-3.6.y/arch/arm/Makefile --- linux-3.6.11/arch/arm/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/Makefile 2013-02-28 04:23:24.614597511 +0100 ++++ linux-rpi-3.6.y/arch/arm/Makefile 2013-03-19 15:30:31.288105021 +0100 @@ -198,6 +198,7 @@ machine-$(CONFIG_MACH_SPEAR320) := spear3xx machine-$(CONFIG_MACH_SPEAR600) := spear6xx @@ -8846,7 +9014,7 @@ diff -Naur linux-3.6.11/arch/arm/Makefile linux-rpi-3.6.y/arch/arm/Makefile # by CONFIG_* macro name. diff -Naur linux-3.6.11/arch/arm/mm/alignment.c linux-rpi-3.6.y/arch/arm/mm/alignment.c --- linux-3.6.11/arch/arm/mm/alignment.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mm/alignment.c 2013-02-28 04:23:24.577597656 +0100 ++++ linux-rpi-3.6.y/arch/arm/mm/alignment.c 2013-03-19 15:30:33.706087491 +0100 @@ -856,9 +856,11 @@ case 0x08000000: /* ldm or stm, or thumb-2 32bit instruction */ if (thumb2_32b) @@ -8863,7 +9031,7 @@ diff -Naur linux-3.6.11/arch/arm/mm/alignment.c linux-rpi-3.6.y/arch/arm/mm/alig goto bad; diff -Naur linux-3.6.11/arch/arm/mm/Kconfig linux-rpi-3.6.y/arch/arm/mm/Kconfig --- linux-3.6.11/arch/arm/mm/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mm/Kconfig 2013-02-28 04:23:24.585597624 +0100 ++++ linux-rpi-3.6.y/arch/arm/mm/Kconfig 2013-03-19 15:30:33.707087484 +0100 @@ -354,7 +354,7 @@ # ARMv6 @@ -8875,7 +9043,7 @@ diff -Naur linux-3.6.11/arch/arm/mm/Kconfig linux-rpi-3.6.y/arch/arm/mm/Kconfig select CPU_PABRT_V6 diff -Naur linux-3.6.11/arch/arm/mm/proc-v6.S linux-rpi-3.6.y/arch/arm/mm/proc-v6.S --- linux-3.6.11/arch/arm/mm/proc-v6.S 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mm/proc-v6.S 2013-02-28 04:23:24.584597628 +0100 ++++ linux-rpi-3.6.y/arch/arm/mm/proc-v6.S 2013-03-19 15:30:33.692087593 +0100 @@ -73,10 +73,19 @@ * * IRQs are already disabled. @@ -8901,7 +9069,7 @@ diff -Naur linux-3.6.11/arch/arm/mm/proc-v6.S linux-rpi-3.6.y/arch/arm/mm/proc-v ENTRY(cpu_v6_dcache_clean_area) diff -Naur linux-3.6.11/arch/arm/tools/mach-types linux-rpi-3.6.y/arch/arm/tools/mach-types --- linux-3.6.11/arch/arm/tools/mach-types 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/tools/mach-types 2013-02-28 04:23:24.768596910 +0100 ++++ linux-rpi-3.6.y/arch/arm/tools/mach-types 2013-03-19 15:30:33.324090260 +0100 @@ -519,6 +519,7 @@ prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103 paz00 MACH_PAZ00 PAZ00 3128 @@ -8912,7 +9080,7 @@ diff -Naur linux-3.6.11/arch/arm/tools/mach-types linux-rpi-3.6.y/arch/arm/tools ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206 diff -Naur linux-3.6.11/arch/arm/vfp/vfpmodule.c linux-rpi-3.6.y/arch/arm/vfp/vfpmodule.c --- linux-3.6.11/arch/arm/vfp/vfpmodule.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/vfp/vfpmodule.c 2013-02-28 04:23:24.732597050 +0100 ++++ linux-rpi-3.6.y/arch/arm/vfp/vfpmodule.c 2013-03-19 15:30:32.807094009 +0100 @@ -413,7 +413,7 @@ * If there isn't a second FP instruction, exit now. Note that * the FPEXC.FP2V bit is valid only if FPEXC.EX is 1. @@ -8924,7 +9092,7 @@ diff -Naur linux-3.6.11/arch/arm/vfp/vfpmodule.c linux-rpi-3.6.y/arch/arm/vfp/vf /* diff -Naur linux-3.6.11/drivers/char/broadcom/Kconfig linux-rpi-3.6.y/drivers/char/broadcom/Kconfig --- linux-3.6.11/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/broadcom/Kconfig 2013-02-28 04:23:36.673550432 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/Kconfig 2013-03-19 15:30:49.616972120 +0100 @@ -0,0 +1,18 @@ +# +# Broadcom char driver config @@ -8946,13 +9114,13 @@ diff -Naur linux-3.6.11/drivers/char/broadcom/Kconfig linux-rpi-3.6.y/drivers/ch + diff -Naur linux-3.6.11/drivers/char/broadcom/Makefile linux-rpi-3.6.y/drivers/char/broadcom/Makefile --- linux-3.6.11/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/broadcom/Makefile 2013-02-28 04:23:36.672550436 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/Makefile 2013-03-19 15:30:49.615972127 +0100 @@ -0,0 +1,2 @@ +obj-$(CONFIG_BCM_VC_CMA) += vc_cma/ + diff -Naur linux-3.6.11/drivers/char/broadcom/vc_cma/Makefile linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/Makefile --- linux-3.6.11/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/Makefile 2013-02-28 04:23:36.672550436 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/Makefile 2013-03-19 15:30:49.615972127 +0100 @@ -0,0 +1,15 @@ +EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs +EXTRA_CFLAGS += -Werror @@ -8971,7 +9139,7 @@ diff -Naur linux-3.6.11/drivers/char/broadcom/vc_cma/Makefile linux-rpi-3.6.y/dr + diff -Naur linux-3.6.11/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/vc_cma.c --- linux-3.6.11/drivers/char/broadcom/vc_cma/vc_cma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/vc_cma.c 2013-02-28 04:23:36.672550436 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/vc_cma.c 2013-03-19 15:30:49.616972120 +0100 @@ -0,0 +1,1145 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -10120,7 +10288,7 @@ diff -Naur linux-3.6.11/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi-3.6.y/dr +MODULE_AUTHOR("Broadcom Corporation"); diff -Naur linux-3.6.11/drivers/char/hw_random/bcm2708-rng.c linux-rpi-3.6.y/drivers/char/hw_random/bcm2708-rng.c --- linux-3.6.11/drivers/char/hw_random/bcm2708-rng.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/hw_random/bcm2708-rng.c 2013-02-28 04:23:36.677550418 +0100 ++++ linux-rpi-3.6.y/drivers/char/hw_random/bcm2708-rng.c 2013-03-19 15:30:49.599972243 +0100 @@ -0,0 +1,117 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -10241,7 +10409,7 @@ diff -Naur linux-3.6.11/drivers/char/hw_random/bcm2708-rng.c linux-rpi-3.6.y/dri +MODULE_LICENSE("GPL and additional rights"); diff -Naur linux-3.6.11/drivers/char/hw_random/Kconfig linux-rpi-3.6.y/drivers/char/hw_random/Kconfig --- linux-3.6.11/drivers/char/hw_random/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/hw_random/Kconfig 2013-02-28 04:23:36.676550421 +0100 ++++ linux-rpi-3.6.y/drivers/char/hw_random/Kconfig 2013-03-19 15:30:49.599972243 +0100 @@ -289,3 +289,14 @@ module will be called exynos-rng. @@ -10260,7 +10428,7 @@ diff -Naur linux-3.6.11/drivers/char/hw_random/Kconfig linux-rpi-3.6.y/drivers/c \ Kein Zeilenumbruch am Dateiende. diff -Naur linux-3.6.11/drivers/char/hw_random/Makefile linux-rpi-3.6.y/drivers/char/hw_random/Makefile --- linux-3.6.11/drivers/char/hw_random/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/hw_random/Makefile 2013-02-28 04:23:36.674550428 +0100 ++++ linux-rpi-3.6.y/drivers/char/hw_random/Makefile 2013-03-19 15:30:49.598972251 +0100 @@ -25,3 +25,4 @@ obj-$(CONFIG_HW_RANDOM_PPC4XX) += ppc4xx-rng.o obj-$(CONFIG_HW_RANDOM_PSERIES) += pseries-rng.o @@ -10268,7 +10436,7 @@ diff -Naur linux-3.6.11/drivers/char/hw_random/Makefile linux-rpi-3.6.y/drivers/ +obj-$(CONFIG_HW_RANDOM_BCM2708) += bcm2708-rng.o diff -Naur linux-3.6.11/drivers/char/Kconfig linux-rpi-3.6.y/drivers/char/Kconfig --- linux-3.6.11/drivers/char/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/Kconfig 2013-02-28 04:23:36.686550383 +0100 ++++ linux-rpi-3.6.y/drivers/char/Kconfig 2013-03-19 15:30:49.608972178 +0100 @@ -585,6 +585,8 @@ source "drivers/s390/char/Kconfig" @@ -10280,7 +10448,7 @@ diff -Naur linux-3.6.11/drivers/char/Kconfig linux-rpi-3.6.y/drivers/char/Kconfi default n diff -Naur linux-3.6.11/drivers/char/Makefile linux-rpi-3.6.y/drivers/char/Makefile --- linux-3.6.11/drivers/char/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/Makefile 2013-02-28 04:23:36.666550460 +0100 ++++ linux-rpi-3.6.y/drivers/char/Makefile 2013-03-19 15:30:49.587972330 +0100 @@ -63,3 +63,6 @@ js-rtc-y = rtc.o @@ -10290,7 +10458,7 @@ diff -Naur linux-3.6.11/drivers/char/Makefile linux-rpi-3.6.y/drivers/char/Makef + diff -Naur linux-3.6.11/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi-3.6.y/drivers/cpufreq/bcm2835-cpufreq.c --- linux-3.6.11/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/cpufreq/bcm2835-cpufreq.c 2013-02-28 04:23:35.792553872 +0100 ++++ linux-rpi-3.6.y/drivers/cpufreq/bcm2835-cpufreq.c 2013-03-19 15:30:49.533972722 +0100 @@ -0,0 +1,239 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -10533,7 +10701,7 @@ diff -Naur linux-3.6.11/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi-3.6.y/driver + diff -Naur linux-3.6.11/drivers/cpufreq/Kconfig.arm linux-rpi-3.6.y/drivers/cpufreq/Kconfig.arm --- linux-3.6.11/drivers/cpufreq/Kconfig.arm 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/cpufreq/Kconfig.arm 2013-02-28 04:23:35.803553830 +0100 ++++ linux-rpi-3.6.y/drivers/cpufreq/Kconfig.arm 2013-03-19 15:30:49.534972715 +0100 @@ -76,3 +76,12 @@ help This adds the CPUFreq driver for Samsung EXYNOS5250 @@ -10549,7 +10717,7 @@ diff -Naur linux-3.6.11/drivers/cpufreq/Kconfig.arm linux-rpi-3.6.y/drivers/cpuf + diff -Naur linux-3.6.11/drivers/cpufreq/Makefile linux-rpi-3.6.y/drivers/cpufreq/Makefile --- linux-3.6.11/drivers/cpufreq/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/cpufreq/Makefile 2013-02-28 04:23:35.791553876 +0100 ++++ linux-rpi-3.6.y/drivers/cpufreq/Makefile 2013-03-19 15:30:49.530972743 +0100 @@ -48,6 +48,7 @@ obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ) += exynos5250-cpufreq.o @@ -10560,7 +10728,7 @@ diff -Naur linux-3.6.11/drivers/cpufreq/Makefile linux-rpi-3.6.y/drivers/cpufreq # PowerPC platform drivers diff -Naur linux-3.6.11/drivers/hwmon/bcm2835-hwmon.c linux-rpi-3.6.y/drivers/hwmon/bcm2835-hwmon.c --- linux-3.6.11/drivers/hwmon/bcm2835-hwmon.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/hwmon/bcm2835-hwmon.c 2013-02-28 04:23:35.871553564 +0100 ++++ linux-rpi-3.6.y/drivers/hwmon/bcm2835-hwmon.c 2013-03-19 15:30:50.011969255 +0100 @@ -0,0 +1,219 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -10783,7 +10951,7 @@ diff -Naur linux-3.6.11/drivers/hwmon/bcm2835-hwmon.c linux-rpi-3.6.y/drivers/hw +module_platform_driver(bcm2835_hwmon_driver); diff -Naur linux-3.6.11/drivers/hwmon/Kconfig linux-rpi-3.6.y/drivers/hwmon/Kconfig --- linux-3.6.11/drivers/hwmon/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/hwmon/Kconfig 2013-02-28 04:23:35.893553478 +0100 ++++ linux-rpi-3.6.y/drivers/hwmon/Kconfig 2013-03-19 15:30:50.417966311 +0100 @@ -1411,6 +1411,16 @@ help Support for the A/D converter on MC13783 and MC13892 PMIC. @@ -10803,7 +10971,7 @@ diff -Naur linux-3.6.11/drivers/hwmon/Kconfig linux-rpi-3.6.y/drivers/hwmon/Kcon comment "ACPI drivers" diff -Naur linux-3.6.11/drivers/hwmon/Makefile linux-rpi-3.6.y/drivers/hwmon/Makefile --- linux-3.6.11/drivers/hwmon/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/hwmon/Makefile 2013-02-28 04:23:35.846553661 +0100 ++++ linux-rpi-3.6.y/drivers/hwmon/Makefile 2013-03-19 15:30:50.018969204 +0100 @@ -129,6 +129,7 @@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o @@ -10814,7 +10982,7 @@ diff -Naur linux-3.6.11/drivers/hwmon/Makefile linux-rpi-3.6.y/drivers/hwmon/Mak diff -Naur linux-3.6.11/drivers/i2c/busses/i2c-bcm2708.c linux-rpi-3.6.y/drivers/i2c/busses/i2c-bcm2708.c --- linux-3.6.11/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/i2c/busses/i2c-bcm2708.c 2013-02-28 04:23:36.074552771 +0100 ++++ linux-rpi-3.6.y/drivers/i2c/busses/i2c-bcm2708.c 2013-03-19 15:30:51.470958673 +0100 @@ -0,0 +1,400 @@ +/* + * Driver for Broadcom BCM2708 BSC Controllers @@ -11218,7 +11386,7 @@ diff -Naur linux-3.6.11/drivers/i2c/busses/i2c-bcm2708.c linux-rpi-3.6.y/drivers +MODULE_ALIAS("platform:" DRV_NAME); diff -Naur linux-3.6.11/drivers/i2c/busses/Kconfig linux-rpi-3.6.y/drivers/i2c/busses/Kconfig --- linux-3.6.11/drivers/i2c/busses/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/i2c/busses/Kconfig 2013-02-28 04:23:36.086552725 +0100 ++++ linux-rpi-3.6.y/drivers/i2c/busses/Kconfig 2013-03-19 15:30:51.475958637 +0100 @@ -314,6 +314,25 @@ This driver can also be built as a module. If so, the module will be called i2c-au1550. @@ -11247,7 +11415,7 @@ diff -Naur linux-3.6.11/drivers/i2c/busses/Kconfig linux-rpi-3.6.y/drivers/i2c/b depends on BLACKFIN diff -Naur linux-3.6.11/drivers/i2c/busses/Makefile linux-rpi-3.6.y/drivers/i2c/busses/Makefile --- linux-3.6.11/drivers/i2c/busses/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/i2c/busses/Makefile 2013-02-28 04:23:36.071552784 +0100 ++++ linux-rpi-3.6.y/drivers/i2c/busses/Makefile 2013-03-19 15:30:51.458958760 +0100 @@ -30,6 +30,7 @@ # Embedded system I2C/SMBus host controller drivers obj-$(CONFIG_I2C_AT91) += i2c-at91.o @@ -11258,7 +11426,7 @@ diff -Naur linux-3.6.11/drivers/i2c/busses/Makefile linux-rpi-3.6.y/drivers/i2c/ obj-$(CONFIG_I2C_DAVINCI) += i2c-davinci.o diff -Naur linux-3.6.11/drivers/misc/Kconfig linux-rpi-3.6.y/drivers/misc/Kconfig --- linux-3.6.11/drivers/misc/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/Kconfig 2013-02-28 04:23:39.683538681 +0100 ++++ linux-rpi-3.6.y/drivers/misc/Kconfig 2013-03-19 15:30:55.549929087 +0100 @@ -517,4 +517,6 @@ source "drivers/misc/carma/Kconfig" source "drivers/misc/altera-stapl/Kconfig" @@ -11268,7 +11436,7 @@ diff -Naur linux-3.6.11/drivers/misc/Kconfig linux-rpi-3.6.y/drivers/misc/Kconfi + diff -Naur linux-3.6.11/drivers/misc/Makefile linux-rpi-3.6.y/drivers/misc/Makefile --- linux-3.6.11/drivers/misc/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/Makefile 2013-02-28 04:23:39.671538729 +0100 ++++ linux-rpi-3.6.y/drivers/misc/Makefile 2013-03-19 15:30:55.443929856 +0100 @@ -50,3 +50,4 @@ obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ @@ -11276,7 +11444,7 @@ diff -Naur linux-3.6.11/drivers/misc/Makefile linux-rpi-3.6.y/drivers/misc/Makef +obj-$(CONFIG_BCM2708_VCHIQ) += vc04_services/ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/connections/connection.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2013-02-28 04:23:39.695538635 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2013-03-19 15:30:55.557929030 +0100 @@ -0,0 +1,328 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -11608,7 +11776,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/connections/co +/****************************** End of file **********************************/ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2013-02-28 04:23:39.695538635 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2013-03-19 15:30:55.556929037 +0100 @@ -0,0 +1,204 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -11816,7 +11984,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/message_driver +/****************************** End of file ***********************************/ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2013-02-28 04:23:39.694538639 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2013-03-19 15:30:55.557929030 +0100 @@ -0,0 +1,224 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12044,7 +12212,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h lin +/****************************** End of file **********************************/ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2013-02-28 04:23:39.693538643 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2013-03-19 15:30:55.556929037 +0100 @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12119,7 +12287,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg_inter +#endif /*VCHI_CFG_INTERNAL_H_*/ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_common.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2013-02-28 04:23:39.694538639 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2013-03-19 15:30:55.556929037 +0100 @@ -0,0 +1,163 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12286,7 +12454,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_common.h +#endif // VCHI_COMMON_H_ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi.h 2013-02-28 04:23:39.694538639 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi.h 2013-03-19 15:30:55.556929037 +0100 @@ -0,0 +1,373 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12663,7 +12831,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi.h linux-r +/****************************** End of file **********************************/ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_mh.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2013-02-28 04:23:39.694538639 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2013-03-19 15:30:55.556929037 +0100 @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12709,7 +12877,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linu +#endif diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2013-02-28 04:23:39.691538650 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2013-03-19 15:30:55.673928188 +0100 @@ -0,0 +1,538 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -13251,7 +13419,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_283 +} diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2013-02-28 04:23:39.693538643 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2013-03-19 15:30:55.673928188 +0100 @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -13297,7 +13465,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_283 +#endif /* VCHIQ_2835_H */ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2013-02-28 04:23:39.687538667 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2013-03-19 15:30:55.673928188 +0100 @@ -0,0 +1,2802 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -16103,7 +16271,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm +MODULE_AUTHOR("Broadcom Corporation"); diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2013-02-28 04:23:39.693538643 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2013-03-19 15:30:55.675928173 +0100 @@ -0,0 +1,212 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -16319,7 +16487,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm +#endif /* VCHIQ_ARM_H */ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2013-02-28 04:23:39.688538663 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2013-03-19 15:30:55.675928173 +0100 @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -16360,7 +16528,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_bui +const char *vchiq_get_build_date(void); diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2013-02-28 04:23:39.691538650 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2013-03-19 15:30:55.675928173 +0100 @@ -0,0 +1,60 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -16424,7 +16592,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg +#endif /* VCHIQ_CFG_H */ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2013-02-28 04:23:39.692538647 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2013-03-19 15:30:55.673928188 +0100 @@ -0,0 +1,119 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -16547,7 +16715,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_con +EXPORT_SYMBOL(vchiq_add_connected_callback); diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2013-02-28 04:23:39.692538647 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2013-03-19 15:30:55.675928173 +0100 @@ -0,0 +1,51 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -16602,7 +16770,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_con + diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2013-02-28 04:23:39.687538667 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2013-03-19 15:30:55.674928181 +0100 @@ -0,0 +1,3818 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -20424,7 +20592,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cor +} diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2013-02-28 04:23:39.692538647 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2013-03-19 15:30:55.557929030 +0100 @@ -0,0 +1,703 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -21131,7 +21299,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cor +#endif diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2013-02-28 04:23:39.689538659 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2013-03-19 15:30:55.557929030 +0100 @@ -0,0 +1,89 @@ +#!/usr/bin/perl -w + @@ -21224,7 +21392,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_gen + diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2013-02-28 04:23:39.686538670 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2013-03-19 15:30:55.673928188 +0100 @@ -0,0 +1,41 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -21269,7 +21437,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h l + diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2013-02-28 04:23:39.693538643 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2013-03-19 15:30:55.674928181 +0100 @@ -0,0 +1,185 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -21458,7 +21626,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if. +#endif /* VCHIQ_IF_H */ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2013-02-28 04:23:39.688538663 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2013-03-19 15:30:55.675928173 +0100 @@ -0,0 +1,129 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -21591,7 +21759,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioc +#endif diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2013-02-28 04:23:39.691538650 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2013-03-19 15:30:55.673928188 +0100 @@ -0,0 +1,454 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -22049,7 +22217,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ker +} diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2013-02-28 04:23:39.693538643 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2013-03-19 15:30:55.674928181 +0100 @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -22124,7 +22292,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_mem +#endif diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2013-02-28 04:23:39.692538647 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2013-03-19 15:30:55.675928173 +0100 @@ -0,0 +1,58 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -22186,7 +22354,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pag +#endif /* VCHIQ_PAGELIST_H */ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 2013-02-28 04:23:39.688538663 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 2013-03-19 15:30:55.674928181 +0100 @@ -0,0 +1,240 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -22430,7 +22598,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pro + diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2013-02-28 04:23:39.692538647 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2013-03-19 15:30:55.557929030 +0100 @@ -0,0 +1,815 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -23249,7 +23417,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shi +EXPORT_SYMBOL(vchi_service_release); diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2013-02-28 04:23:39.689538659 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2013-03-19 15:30:55.675928173 +0100 @@ -0,0 +1,120 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -23373,7 +23541,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_uti +} diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2013-02-28 04:23:39.689538659 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2013-03-19 15:30:55.674928181 +0100 @@ -0,0 +1,82 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -23459,7 +23627,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_uti + diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c --- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2013-02-28 04:23:39.687538667 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2013-03-19 15:30:55.673928188 +0100 @@ -0,0 +1,59 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -23522,7 +23690,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ver +} diff -Naur linux-3.6.11/drivers/misc/vc04_services/Kconfig linux-rpi-3.6.y/drivers/misc/vc04_services/Kconfig --- linux-3.6.11/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/Kconfig 2013-02-28 04:23:39.695538635 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/Kconfig 2013-03-19 15:30:55.675928173 +0100 @@ -0,0 +1,10 @@ +config BCM2708_VCHIQ + tristate "Videocore VCHIQ" @@ -23536,7 +23704,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/Kconfig linux-rpi-3.6.y/drive + diff -Naur linux-3.6.11/drivers/misc/vc04_services/Makefile linux-rpi-3.6.y/drivers/misc/vc04_services/Makefile --- linux-3.6.11/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/Makefile 2013-02-28 04:23:39.685538674 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/Makefile 2013-03-19 15:30:55.555929044 +0100 @@ -0,0 +1,18 @@ +ifeq ($(CONFIG_MACH_BCM2708),y) + @@ -23558,7 +23726,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/Makefile linux-rpi-3.6.y/driv + diff -Naur linux-3.6.11/drivers/mmc/card/block.c linux-rpi-3.6.y/drivers/mmc/card/block.c --- linux-3.6.11/drivers/mmc/card/block.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/card/block.c 2013-02-28 04:23:36.975549254 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/card/block.c 2013-03-19 15:30:49.892970118 +0100 @@ -1135,7 +1135,7 @@ brq->data.blocks = 1; } @@ -23570,7 +23738,7 @@ diff -Naur linux-3.6.11/drivers/mmc/card/block.c linux-rpi-3.6.y/drivers/mmc/car */ diff -Naur linux-3.6.11/drivers/mmc/core/sd.c linux-rpi-3.6.y/drivers/mmc/core/sd.c --- linux-3.6.11/drivers/mmc/core/sd.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/core/sd.c 2013-02-28 04:23:36.971549269 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/core/sd.c 2013-03-19 15:30:49.853970401 +0100 @@ -13,6 +13,8 @@ #include #include @@ -23731,7 +23899,7 @@ diff -Naur linux-3.6.11/drivers/mmc/core/sd.c linux-rpi-3.6.y/drivers/mmc/core/s * Fetch and process SD Status register. diff -Naur linux-3.6.11/drivers/mmc/host/Kconfig linux-rpi-3.6.y/drivers/mmc/host/Kconfig --- linux-3.6.11/drivers/mmc/host/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/Kconfig 2013-02-28 04:23:36.965549292 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/Kconfig 2013-03-19 15:30:49.886970162 +0100 @@ -229,6 +229,27 @@ YMMV. @@ -23762,7 +23930,7 @@ diff -Naur linux-3.6.11/drivers/mmc/host/Kconfig linux-rpi-3.6.y/drivers/mmc/hos depends on ARCH_OMAP diff -Naur linux-3.6.11/drivers/mmc/host/Makefile linux-rpi-3.6.y/drivers/mmc/host/Makefile --- linux-3.6.11/drivers/mmc/host/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/Makefile 2013-02-28 04:23:36.959549316 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/Makefile 2013-03-19 15:30:49.875970241 +0100 @@ -13,6 +13,7 @@ obj-$(CONFIG_MMC_SDHCI_PXAV2) += sdhci-pxav2.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o @@ -23773,7 +23941,7 @@ diff -Naur linux-3.6.11/drivers/mmc/host/Makefile linux-rpi-3.6.y/drivers/mmc/ho obj-$(CONFIG_MMC_OMAP) += omap.o diff -Naur linux-3.6.11/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-3.6.y/drivers/mmc/host/sdhci-bcm2708.c --- linux-3.6.11/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/sdhci-bcm2708.c 2013-02-28 04:23:36.962549305 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/sdhci-bcm2708.c 2013-03-19 15:30:49.888970147 +0100 @@ -0,0 +1,1413 @@ +/* + * sdhci-bcm2708.c Support for SDHCI device on BCM2708 @@ -25190,7 +25358,7 @@ diff -Naur linux-3.6.11/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-3.6.y/drivers + diff -Naur linux-3.6.11/drivers/mmc/host/sdhci.c linux-rpi-3.6.y/drivers/mmc/host/sdhci.c --- linux-3.6.11/drivers/mmc/host/sdhci.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/sdhci.c 2013-02-28 04:23:36.960549313 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/sdhci.c 2013-03-19 15:30:49.887970155 +0100 @@ -28,6 +28,7 @@ #include #include @@ -26063,7 +26231,7 @@ diff -Naur linux-3.6.11/drivers/mmc/host/sdhci.c linux-rpi-3.6.y/drivers/mmc/hos sdhci_disable_card_detection(host); diff -Naur linux-3.6.11/drivers/mmc/host/sdhci.h linux-rpi-3.6.y/drivers/mmc/host/sdhci.h --- linux-3.6.11/drivers/mmc/host/sdhci.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/sdhci.h 2013-02-28 04:23:36.966549289 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/sdhci.h 2013-03-19 15:30:49.864970321 +0100 @@ -275,6 +275,20 @@ void (*platform_reset_enter)(struct sdhci_host *host, u8 mask); void (*platform_reset_exit)(struct sdhci_host *host, u8 mask); @@ -26126,7 +26294,7 @@ diff -Naur linux-3.6.11/drivers/mmc/host/sdhci.h linux-rpi-3.6.y/drivers/mmc/hos #endif /* __SDHCI_HW_H */ diff -Naur linux-3.6.11/drivers/net/usb/smsc95xx.c linux-rpi-3.6.y/drivers/net/usb/smsc95xx.c --- linux-3.6.11/drivers/net/usb/smsc95xx.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/net/usb/smsc95xx.c 2013-02-28 04:23:37.785546091 +0100 ++++ linux-rpi-3.6.y/drivers/net/usb/smsc95xx.c 2013-03-19 15:30:58.011911229 +0100 @@ -46,11 +46,23 @@ #define SMSC95XX_INTERNAL_PHY_ID (1) #define SMSC95XX_TX_OVERHEAD (8) @@ -27143,7 +27311,7 @@ diff -Naur linux-3.6.11/drivers/net/usb/smsc95xx.c linux-rpi-3.6.y/drivers/net/u }; diff -Naur linux-3.6.11/drivers/net/usb/smsc95xx.h linux-rpi-3.6.y/drivers/net/usb/smsc95xx.h --- linux-3.6.11/drivers/net/usb/smsc95xx.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/net/usb/smsc95xx.h 2013-02-28 04:23:37.782546104 +0100 ++++ linux-rpi-3.6.y/drivers/net/usb/smsc95xx.h 2013-03-19 15:30:58.011911229 +0100 @@ -63,6 +63,7 @@ #define INT_STS_TDFO_ (0x00001000) #define INT_STS_RXDF_ (0x00000800) @@ -27184,7 +27352,7 @@ diff -Naur linux-3.6.11/drivers/net/usb/smsc95xx.h linux-rpi-3.6.y/drivers/net/u #define Tx_COE_EN_ (0x00010000) diff -Naur linux-3.6.11/drivers/net/usb/usbnet.c linux-rpi-3.6.y/drivers/net/usb/usbnet.c --- linux-3.6.11/drivers/net/usb/usbnet.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/net/usb/usbnet.c 2013-02-28 04:23:37.780546112 +0100 ++++ linux-rpi-3.6.y/drivers/net/usb/usbnet.c 2013-03-19 15:30:58.013911214 +0100 @@ -359,10 +359,12 @@ void usbnet_defer_kevent (struct usbnet *dev, int work) { @@ -27370,7 +27538,7 @@ diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c li diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/wlan0dhcp linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/wlan0dhcp diff -Naur linux-3.6.11/drivers/spi/Kconfig linux-rpi-3.6.y/drivers/spi/Kconfig --- linux-3.6.11/drivers/spi/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/spi/Kconfig 2013-02-28 04:23:36.903549535 +0100 ++++ linux-rpi-3.6.y/drivers/spi/Kconfig 2013-03-19 15:30:51.024961908 +0100 @@ -74,6 +74,14 @@ This selects a driver for the Atmel SPI Controller, present on many AT32 (AVR32) and AT91 (ARM) chips. @@ -27388,7 +27556,7 @@ diff -Naur linux-3.6.11/drivers/spi/Kconfig linux-rpi-3.6.y/drivers/spi/Kconfig depends on BLACKFIN diff -Naur linux-3.6.11/drivers/spi/Makefile linux-rpi-3.6.y/drivers/spi/Makefile --- linux-3.6.11/drivers/spi/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/spi/Makefile 2013-02-28 04:23:36.897549558 +0100 ++++ linux-rpi-3.6.y/drivers/spi/Makefile 2013-03-19 15:30:50.715964149 +0100 @@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_AU1550) += spi-au1550.o obj-$(CONFIG_SPI_BCM63XX) += spi-bcm63xx.o @@ -27399,7 +27567,7 @@ diff -Naur linux-3.6.11/drivers/spi/Makefile linux-rpi-3.6.y/drivers/spi/Makefil obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o diff -Naur linux-3.6.11/drivers/spi/spi-bcm2708.c linux-rpi-3.6.y/drivers/spi/spi-bcm2708.c --- linux-3.6.11/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/spi/spi-bcm2708.c 2013-02-28 04:23:36.898549554 +0100 ++++ linux-rpi-3.6.y/drivers/spi/spi-bcm2708.c 2013-03-19 15:30:50.775963714 +0100 @@ -0,0 +1,600 @@ +/* + * Driver for Broadcom BCM2708 SPI Controllers @@ -28003,7 +28171,7 @@ diff -Naur linux-3.6.11/drivers/spi/spi-bcm2708.c linux-rpi-3.6.y/drivers/spi/sp +MODULE_ALIAS("platform:" DRV_NAME); diff -Naur linux-3.6.11/drivers/staging/media/lirc/Kconfig linux-rpi-3.6.y/drivers/staging/media/lirc/Kconfig --- linux-3.6.11/drivers/staging/media/lirc/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/staging/media/lirc/Kconfig 2013-02-28 04:23:38.473543405 +0100 ++++ linux-rpi-3.6.y/drivers/staging/media/lirc/Kconfig 2013-03-19 15:31:07.246844230 +0100 @@ -38,6 +38,12 @@ help Driver for Homebrew Parallel Port Receivers @@ -28019,7 +28187,7 @@ diff -Naur linux-3.6.11/drivers/staging/media/lirc/Kconfig linux-rpi-3.6.y/drive depends on LIRC && USB diff -Naur linux-3.6.11/drivers/staging/media/lirc/lirc_rpi.c linux-rpi-3.6.y/drivers/staging/media/lirc/lirc_rpi.c --- linux-3.6.11/drivers/staging/media/lirc/lirc_rpi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/staging/media/lirc/lirc_rpi.c 2013-02-28 04:23:38.474543402 +0100 ++++ linux-rpi-3.6.y/drivers/staging/media/lirc/lirc_rpi.c 2013-03-19 15:31:07.245844237 +0100 @@ -0,0 +1,692 @@ +/* + * lirc_rpi.c @@ -28715,7 +28883,7 @@ diff -Naur linux-3.6.11/drivers/staging/media/lirc/lirc_rpi.c linux-rpi-3.6.y/dr +MODULE_PARM_DESC(debug, "Enable debugging messages"); diff -Naur linux-3.6.11/drivers/staging/media/lirc/Makefile linux-rpi-3.6.y/drivers/staging/media/lirc/Makefile --- linux-3.6.11/drivers/staging/media/lirc/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/staging/media/lirc/Makefile 2013-02-28 04:23:38.472543409 +0100 ++++ linux-rpi-3.6.y/drivers/staging/media/lirc/Makefile 2013-03-19 15:31:07.244844244 +0100 @@ -7,6 +7,7 @@ obj-$(CONFIG_LIRC_IGORPLUGUSB) += lirc_igorplugusb.o obj-$(CONFIG_LIRC_IMON) += lirc_imon.o @@ -28726,7 +28894,7 @@ diff -Naur linux-3.6.11/drivers/staging/media/lirc/Makefile linux-rpi-3.6.y/driv obj-$(CONFIG_LIRC_SIR) += lirc_sir.o diff -Naur linux-3.6.11/drivers/thermal/bcm2835-thermal.c linux-rpi-3.6.y/drivers/thermal/bcm2835-thermal.c --- linux-3.6.11/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/thermal/bcm2835-thermal.c 2013-02-28 04:23:39.657538784 +0100 ++++ linux-rpi-3.6.y/drivers/thermal/bcm2835-thermal.c 2013-03-19 15:30:55.735927738 +0100 @@ -0,0 +1,184 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -28914,7 +29082,7 @@ diff -Naur linux-3.6.11/drivers/thermal/bcm2835-thermal.c linux-rpi-3.6.y/driver +module_platform_driver(bcm2835_thermal_driver); diff -Naur linux-3.6.11/drivers/thermal/Kconfig linux-rpi-3.6.y/drivers/thermal/Kconfig --- linux-3.6.11/drivers/thermal/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/thermal/Kconfig 2013-02-28 04:23:39.658538780 +0100 ++++ linux-rpi-3.6.y/drivers/thermal/Kconfig 2013-03-19 15:30:55.735927738 +0100 @@ -27,3 +27,14 @@ help Enable this to plug the SPEAr thermal sensor driver into the Linux @@ -28932,7 +29100,7 @@ diff -Naur linux-3.6.11/drivers/thermal/Kconfig linux-rpi-3.6.y/drivers/thermal/ + diff -Naur linux-3.6.11/drivers/thermal/Makefile linux-rpi-3.6.y/drivers/thermal/Makefile --- linux-3.6.11/drivers/thermal/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/thermal/Makefile 2013-02-28 04:23:39.657538784 +0100 ++++ linux-rpi-3.6.y/drivers/thermal/Makefile 2013-03-19 15:30:55.735927738 +0100 @@ -3,4 +3,5 @@ # @@ -28943,7 +29111,7 @@ diff -Naur linux-3.6.11/drivers/thermal/Makefile linux-rpi-3.6.y/drivers/thermal +obj-$(CONFIG_THERMAL_BCM2835) += bcm2835-thermal.o diff -Naur linux-3.6.11/drivers/usb/core/generic.c linux-rpi-3.6.y/drivers/usb/core/generic.c --- linux-3.6.11/drivers/usb/core/generic.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/core/generic.c 2013-02-28 04:23:39.515539338 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/generic.c 2013-03-19 15:30:54.313938053 +0100 @@ -149,6 +149,7 @@ dev_warn(&udev->dev, "no configuration chosen from %d choice%s\n", @@ -28954,7 +29122,7 @@ diff -Naur linux-3.6.11/drivers/usb/core/generic.c linux-rpi-3.6.y/drivers/usb/c } diff -Naur linux-3.6.11/drivers/usb/core/hub.c linux-rpi-3.6.y/drivers/usb/core/hub.c --- linux-3.6.11/drivers/usb/core/hub.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/core/hub.c 2013-02-28 04:23:39.517539330 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/hub.c 2013-03-19 15:30:54.313938053 +0100 @@ -25,7 +25,6 @@ #include #include @@ -29077,7 +29245,7 @@ diff -Naur linux-3.6.11/drivers/usb/core/hub.c linux-rpi-3.6.y/drivers/usb/core/ !hcd->driver->port_handed_over || diff -Naur linux-3.6.11/drivers/usb/core/message.c linux-rpi-3.6.y/drivers/usb/core/message.c --- linux-3.6.11/drivers/usb/core/message.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/core/message.c 2013-02-28 04:23:39.513539346 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/message.c 2013-03-19 15:30:54.311938067 +0100 @@ -1877,6 +1877,85 @@ if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) @@ -29166,7 +29334,7 @@ diff -Naur linux-3.6.11/drivers/usb/core/message.c linux-rpi-3.6.y/drivers/usb/c usb_unlocked_enable_lpm(dev); diff -Naur linux-3.6.11/drivers/usb/core/otg_whitelist.h linux-rpi-3.6.y/drivers/usb/core/otg_whitelist.h --- linux-3.6.11/drivers/usb/core/otg_whitelist.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/core/otg_whitelist.h 2013-02-28 04:23:39.513539346 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/otg_whitelist.h 2013-03-19 15:30:54.314938046 +0100 @@ -19,33 +19,82 @@ static struct usb_device_id whitelist_table [] = { @@ -29384,7 +29552,7 @@ diff -Naur linux-3.6.11/drivers/usb/core/otg_whitelist.h linux-rpi-3.6.y/drivers diff -Naur linux-3.6.11/drivers/usb/gadget/file_storage.c linux-rpi-3.6.y/drivers/usb/gadget/file_storage.c --- linux-3.6.11/drivers/usb/gadget/file_storage.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/gadget/file_storage.c 2013-02-28 04:23:39.510539357 +0100 ++++ linux-rpi-3.6.y/drivers/usb/gadget/file_storage.c 2013-03-19 15:30:54.154939206 +0100 @@ -573,8 +573,37 @@ .iConfiguration = FSG_STRING_CONFIG, .bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER, @@ -29514,7 +29682,7 @@ diff -Naur linux-3.6.11/drivers/usb/gadget/file_storage.c linux-rpi-3.6.y/driver if (!req) diff -Naur linux-3.6.11/drivers/usb/gadget/Kconfig linux-rpi-3.6.y/drivers/usb/gadget/Kconfig --- linux-3.6.11/drivers/usb/gadget/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/gadget/Kconfig 2013-02-28 04:23:39.505539378 +0100 ++++ linux-rpi-3.6.y/drivers/usb/gadget/Kconfig 2013-03-19 15:30:54.183938996 +0100 @@ -505,6 +505,12 @@ bool depends on USB_GADGET_DUALSPEED @@ -29530,7 +29698,7 @@ diff -Naur linux-3.6.11/drivers/usb/gadget/Kconfig linux-rpi-3.6.y/drivers/usb/g # diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/changes.txt linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/changes.txt --- linux-3.6.11/drivers/usb/host/dwc_common_port/changes.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/changes.txt 2013-02-28 04:23:39.411539743 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/changes.txt 2013-03-19 15:30:54.946933462 +0100 @@ -0,0 +1,174 @@ + +dwc_read_reg32() and friends now take an additional parameter, a pointer to an @@ -29708,7 +29876,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/changes.txt linux-rpi-3 +library code directly into a driver module, instead of as a standalone module. diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/doc/doxygen.cfg --- linux-3.6.11/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2013-02-28 04:23:39.413539736 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2013-03-19 15:30:54.936933534 +0100 @@ -0,0 +1,270 @@ +# Doxyfile 1.4.5 + @@ -29982,7 +30150,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-r +SEARCHENGINE = NO diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.c 2013-02-28 04:23:39.411539743 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.c 2013-03-19 15:30:54.949933440 +0100 @@ -0,0 +1,532 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.c $ @@ -30518,7 +30686,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi-3.6. +#endif /* DWC_CCLIB */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.h 2013-02-28 04:23:39.414539733 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.h 2013-03-19 15:30:54.949933440 +0100 @@ -0,0 +1,225 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.h $ @@ -30747,7 +30915,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi-3.6. + diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2013-02-28 04:23:39.414539733 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2013-03-19 15:30:54.937933527 +0100 @@ -0,0 +1,1308 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -32059,7 +32227,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_linux.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2013-02-28 04:23:39.412539740 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2013-03-19 15:30:54.948933447 +0100 @@ -0,0 +1,1421 @@ +#include +#include @@ -33484,7 +33652,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_linux.c linu +#endif /* DWC_LIBMODULE */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2013-02-28 04:23:39.413539736 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2013-03-19 15:30:54.937933527 +0100 @@ -0,0 +1,1275 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -34763,7 +34931,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.c 2013-02-28 04:23:39.410539747 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.c 2013-03-19 15:30:54.948933447 +0100 @@ -0,0 +1,308 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.c $ @@ -35075,7 +35243,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi- +#endif /* DWC_CRYPTOLIB */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.h 2013-02-28 04:23:39.414539733 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.h 2013-03-19 15:30:54.948933447 +0100 @@ -0,0 +1,111 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.h $ @@ -35190,7 +35358,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi- +#endif /* _DWC_CRYPTO_H_ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.c 2013-02-28 04:23:39.411539743 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.c 2013-03-19 15:30:54.948933447 +0100 @@ -0,0 +1,291 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.c $ @@ -35485,7 +35653,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi-3.6. +#endif /* DWC_CRYPTOLIB */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.h 2013-02-28 04:23:39.411539743 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.h 2013-03-19 15:30:54.937933527 +0100 @@ -0,0 +1,106 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.h $ @@ -35595,7 +35763,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi-3.6. +#endif /* _DWC_DH_H_ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_list.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_list.h 2013-02-28 04:23:39.412539740 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_list.h 2013-03-19 15:30:54.949933440 +0100 @@ -0,0 +1,594 @@ +/* $OpenBSD: queue.h,v 1.26 2004/05/04 16:59:32 grange Exp $ */ +/* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ @@ -36193,7 +36361,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi-3. +#endif /* _DWC_LIST_H_ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_mem.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_mem.c 2013-02-28 04:23:39.412539740 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_mem.c 2013-03-19 15:30:54.937933527 +0100 @@ -0,0 +1,245 @@ +/* Memory Debugging */ +#ifdef DWC_DEBUG_MEMORY @@ -36442,7 +36610,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi-3.6 +#endif /* DWC_DEBUG_MEMORY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.c 2013-02-28 04:23:39.413539736 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.c 2013-03-19 15:30:54.949933440 +0100 @@ -0,0 +1,636 @@ +/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows. + * @@ -37082,7 +37250,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi- +#endif /*DWC_CRYPTOLIB */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.h 2013-02-28 04:23:39.412539740 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.h 2013-03-19 15:30:54.948933447 +0100 @@ -0,0 +1,34 @@ +/* + * dwc_modpow.h @@ -37120,7 +37288,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi- +#endif /* _LINUX_BIGNUM_H */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.c --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.c 2013-02-28 04:23:39.411539743 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.c 2013-03-19 15:30:54.946933462 +0100 @@ -0,0 +1,319 @@ +#ifdef DWC_NOTIFYLIB + @@ -37443,7 +37611,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rp +#endif /* DWC_NOTIFYLIB */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.h 2013-02-28 04:23:39.412539740 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.h 2013-03-19 15:30:54.949933440 +0100 @@ -0,0 +1,122 @@ + +#ifndef __DWC_NOTIFIER_H__ @@ -37569,7 +37737,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rp +#endif /* __DWC_NOTIFIER_H__ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_os.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_os.h 2013-02-28 04:23:39.413539736 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_os.h 2013-03-19 15:30:54.949933440 +0100 @@ -0,0 +1,1260 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_os.h $ @@ -38833,7 +39001,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi-3.6. +#endif /* _DWC_OS_H_ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile --- linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile 2013-02-28 04:23:39.412539740 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile 2013-03-19 15:30:54.937933527 +0100 @@ -0,0 +1,58 @@ +# +# Makefile for DWC_common library @@ -38895,7 +39063,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile linux-rpi-3.6. + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.fbsd --- linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.fbsd 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.fbsd 2013-02-28 04:23:39.414539733 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.fbsd 2013-03-19 15:30:54.948933447 +0100 @@ -0,0 +1,17 @@ +CFLAGS += -I/sys/i386/compile/GENERIC -I/sys/i386/include -I/usr/include +CFLAGS += -DDWC_FREEBSD @@ -38916,7 +39084,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi +.include diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.linux --- linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.linux 2013-02-28 04:23:39.410539747 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.linux 2013-03-19 15:30:54.949933440 +0100 @@ -0,0 +1,49 @@ +# +# Makefile for DWC_common library @@ -38969,7 +39137,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.linux linux-rp + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/usb.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/usb.h --- linux-3.6.11/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/usb.h 2013-02-28 04:23:39.414539733 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/usb.h 2013-03-19 15:30:54.948933447 +0100 @@ -0,0 +1,946 @@ +/* + * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -39919,7 +40087,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/usb.h linux-rpi-3.6.y/d +#endif /* _USB_H_ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi-3.6.y/drivers/usb/host/dwc_otg/doc/doxygen.cfg --- linux-3.6.11/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2013-02-28 04:23:39.084541020 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2013-03-19 15:30:55.023932903 +0100 @@ -0,0 +1,224 @@ +# Doxyfile 1.3.9.1 + @@ -40147,7 +40315,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi-3.6.y +SEARCHENGINE = NO diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dummy_audio.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dummy_audio.c 2013-02-28 04:23:39.087541009 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dummy_audio.c 2013-03-19 15:30:55.046932736 +0100 @@ -0,0 +1,1575 @@ +/* + * zero.c -- Gadget Zero, for USB development @@ -41726,7 +41894,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi-3.6.y/d +module_exit (cleanup); diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_cfi_common.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2013-02-28 04:23:39.078541044 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2013-03-19 15:30:55.026932881 +0100 @@ -0,0 +1,142 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -41872,7 +42040,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi-3.6. +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2013-02-28 04:23:39.087541009 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2013-03-19 15:30:55.025932888 +0100 @@ -0,0 +1,854 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.c $ @@ -42730,7 +42898,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi-3.6.y/d +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2013-02-28 04:23:39.077541047 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2013-03-19 15:30:55.047932729 +0100 @@ -0,0 +1,80 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.h $ @@ -42814,7 +42982,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi-3.6.y/d +#endif //__DWC_OTG_ADP_H__ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2013-02-28 04:23:39.082541028 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2013-03-19 15:30:55.047932729 +0100 @@ -0,0 +1,1210 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $ @@ -44028,7 +44196,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi-3.6.y/ +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2013-02-28 04:23:39.087541009 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2013-03-19 15:30:55.025932888 +0100 @@ -0,0 +1,89 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $ @@ -44121,7 +44289,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi-3.6.y/ +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2013-02-28 04:23:39.084541020 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2013-03-19 15:30:55.027932874 +0100 @@ -0,0 +1,1876 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -46001,7 +46169,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi-3.6.y/d +#endif //DWC_UTE_CFI diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2013-02-28 04:23:39.084541020 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2013-03-19 15:30:55.026932881 +0100 @@ -0,0 +1,320 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -46325,7 +46493,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi-3.6.y/d +#endif /* (__DWC_OTG_CFI_H__) */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2013-02-28 04:23:39.088541004 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2013-03-19 15:30:55.028932867 +0100 @@ -0,0 +1,7151 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $ @@ -53480,7 +53648,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi-3.6.y/d +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2013-02-28 04:23:39.085541017 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2013-03-19 15:30:55.026932881 +0100 @@ -0,0 +1,1464 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $ @@ -54948,7 +55116,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi-3.6.y/d +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2013-02-28 04:23:39.079541040 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2013-03-19 15:30:55.028932867 +0100 @@ -0,0 +1,1571 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $ @@ -56523,7 +56691,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi-3. +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_core_if.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2013-02-28 04:23:39.084541020 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2013-03-19 15:30:55.026932881 +0100 @@ -0,0 +1,705 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $ @@ -57232,7 +57400,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi-3.6 +#endif /* __DWC_CORE_IF_H__ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_dbg.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2013-02-28 04:23:39.078541044 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2013-03-19 15:30:55.047932729 +0100 @@ -0,0 +1,117 @@ +/* ========================================================================== + * @@ -57353,7 +57521,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi-3.6.y/d +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2013-02-28 04:23:39.081541032 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2013-03-19 15:30:55.046932736 +0100 @@ -0,0 +1,1732 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $ @@ -59089,7 +59257,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi-3.6. +*/ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2013-02-28 04:23:39.080541036 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2013-03-19 15:30:55.040932780 +0100 @@ -0,0 +1,86 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $ @@ -59179,7 +59347,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi-3.6. +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2013-02-28 04:23:39.083541024 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2013-03-19 15:30:55.040932780 +0100 @@ -0,0 +1,3493 @@ + +/* ========================================================================== @@ -62676,7 +62844,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi-3.6.y/d +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2013-02-28 04:23:39.086541013 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2013-03-19 15:30:55.048932722 +0100 @@ -0,0 +1,1132 @@ +/*========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $ @@ -63812,7 +63980,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi-3. +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2013-02-28 04:23:39.076541051 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2013-03-19 15:30:55.027932874 +0100 @@ -0,0 +1,829 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $ @@ -64645,7 +64813,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi-3.6.y/d +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2013-02-28 04:23:39.085541017 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2013-03-19 15:30:55.024932896 +0100 @@ -0,0 +1,417 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $ @@ -65066,8 +65234,8 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi-3.6. +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2013-02-28 04:23:39.080541036 +0100 -@@ -0,0 +1,2248 @@ ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2013-03-19 15:30:55.046932736 +0100 +@@ -0,0 +1,2258 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $ + * $Revision: #89 $ @@ -66991,13 +67159,20 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3. + dwc_otg_qtd_t * qtd) +{ + DWC_DEBUGPL(DBG_HCDI, "--Host Channel %d Interrupt: " -+ "Data Toggle Error--\n", hc->hc_num); ++ "Data Toggle Error on %s transfer--\n", ++ hc->hc_num, (hc->ep_is_in ? "IN" : "OUT")); + -+ if (hc->ep_is_in) { ++ /* Data toggles on split transactions cause the hc to halt. ++ * restart transfer */ ++ if(hc->qh->do_split) ++ { ++ qtd->error_count++; ++ dwc_otg_hcd_save_data_toggle(hc, hc_regs, qtd); ++ update_urb_state_xfer_intr(hc, hc_regs, ++ qtd->urb, qtd, DWC_OTG_HC_XFER_XACT_ERR); ++ halt_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_XACT_ERR); ++ } else if (hc->ep_is_in) { + qtd->error_count = 0; -+ } else { -+ DWC_ERROR("Data Toggle Error on OUT transfer," -+ "channel %d\n", hc->hc_num); + } + + disable_hc_int(hc_regs, datatglerr); @@ -67150,6 +67325,8 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3. + handle_hc_babble_intr(hcd, hc, hc_regs, qtd); + } else if (hcint.b.frmovrun) { + handle_hc_frmovrun_intr(hcd, hc, hc_regs, qtd); ++ } else if (hcint.b.datatglerr) { ++ handle_hc_datatglerr_intr(hcd, hc, hc_regs, qtd); + } else if (!out_nak_enh) { + if (hcint.b.nyet) { + /* @@ -67293,7 +67470,8 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3. + retval |= handle_hc_nak_intr(dwc_otg_hcd, hc, hc_regs, qtd); + } + if (hcint.b.ack) { -+ retval |= handle_hc_ack_intr(dwc_otg_hcd, hc, hc_regs, qtd); ++ if(!hcint.b.chhltd) ++ retval |= handle_hc_ack_intr(dwc_otg_hcd, hc, hc_regs, qtd); + } + if (hcint.b.nyet) { + retval |= handle_hc_nyet_intr(dwc_otg_hcd, hc, hc_regs, qtd); @@ -67318,7 +67496,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3. +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2013-02-28 04:23:39.077541047 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2013-03-19 15:30:55.048932722 +0100 @@ -0,0 +1,938 @@ + +/* ========================================================================== @@ -68260,7 +68438,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi-3 +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2013-02-28 04:23:39.079541040 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2013-03-19 15:30:55.025932888 +0100 @@ -0,0 +1,958 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $ @@ -69222,7 +69400,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi-3 +#endif /* DWC_DEVICE_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 2013-02-28 04:23:39.078541044 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 2013-03-19 15:30:55.048932722 +0100 @@ -0,0 +1,113 @@ +#include "dwc_otg_regs.h" +#include "dwc_otg_dbg.h" @@ -69339,7 +69517,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-rpi-3. +} diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 2013-02-28 04:23:39.077541047 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 2013-03-19 15:30:55.025932888 +0100 @@ -0,0 +1,36 @@ +#ifndef __DWC_OTG_MPHI_FIX_H__ +#define __DWC_OTG_MPHI_FIX_H__ @@ -69379,7 +69557,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-rpi-3. +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2013-02-28 04:23:39.087541009 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2013-03-19 15:30:55.048932722 +0100 @@ -0,0 +1,188 @@ +#ifndef _DWC_OS_DEP_H_ +#define _DWC_OS_DEP_H_ @@ -69571,7 +69749,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi-3.6. +#endif /* _DWC_OS_DEP_H_ */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2013-02-28 04:23:39.080541036 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2013-03-19 15:30:55.047932729 +0100 @@ -0,0 +1,2708 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $ @@ -72283,7 +72461,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi-3.6.y/d +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2013-02-28 04:23:39.082541028 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2013-03-19 15:30:55.025932888 +0100 @@ -0,0 +1,266 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $ @@ -72553,7 +72731,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi-3.6.y/d +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2013-02-28 04:23:39.077541047 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2013-03-19 15:30:55.029932859 +0100 @@ -0,0 +1,360 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $ @@ -72917,7 +73095,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi-3.6. +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2013-02-28 04:23:39.081541032 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2013-03-19 15:30:55.038932794 +0100 @@ -0,0 +1,5147 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $ @@ -78068,7 +78246,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi-3. +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2013-02-28 04:23:39.085541017 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2013-03-19 15:30:55.048932722 +0100 @@ -0,0 +1,1374 @@ + /* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $ @@ -79446,7 +79624,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi-3 +#endif /* DWC_HOST_ONLY */ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_regs.h --- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2013-02-28 04:23:39.082541028 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2013-03-19 15:30:55.048932722 +0100 @@ -0,0 +1,2550 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $ @@ -82000,7 +82178,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi-3.6.y/ +#endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/Makefile linux-rpi-3.6.y/drivers/usb/host/dwc_otg/Makefile --- linux-3.6.11/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/Makefile 2013-02-28 04:23:39.077541047 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/Makefile 2013-03-19 15:30:55.025932888 +0100 @@ -0,0 +1,81 @@ +# +# Makefile for DWC_otg Highspeed USB controller driver @@ -82085,7 +82263,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/Makefile linux-rpi-3.6.y/driver +endif diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm --- linux-3.6.11/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2013-02-28 04:23:39.086541013 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2013-03-19 15:30:55.025932888 +0100 @@ -0,0 +1,337 @@ +package dwc_otg_test; + @@ -82426,7 +82604,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi- +1; diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/Makefile linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/Makefile --- linux-3.6.11/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/Makefile 2013-02-28 04:23:39.086541013 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/Makefile 2013-03-19 15:30:55.024932896 +0100 @@ -0,0 +1,16 @@ + +PERL=/usr/bin/perl @@ -82446,7 +82624,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/Makefile linux-rpi-3.6.y/d + done diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_mod_param.pl --- linux-3.6.11/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2013-02-28 04:23:39.086541013 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2013-03-19 15:30:55.025932888 +0100 @@ -0,0 +1,133 @@ +#!/usr/bin/perl -w +# @@ -82583,7 +82761,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rp +0; diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_sysfs.pl --- linux-3.6.11/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2013-02-28 04:23:39.086541013 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2013-03-19 15:30:55.024932896 +0100 @@ -0,0 +1,193 @@ +#!/usr/bin/perl -w +# @@ -82780,7 +82958,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi-3. +0; diff -Naur linux-3.6.11/drivers/usb/host/Kconfig linux-rpi-3.6.y/drivers/usb/host/Kconfig --- linux-3.6.11/drivers/usb/host/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/Kconfig 2013-02-28 04:23:39.422539701 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/Kconfig 2013-03-19 15:30:54.961933353 +0100 @@ -610,6 +610,19 @@ To compile this driver a module, choose M here: the module will be called "hwa-hc". @@ -82803,7 +82981,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/Kconfig linux-rpi-3.6.y/drivers/usb/hos depends on USB && ARM && ARCH_MXC diff -Naur linux-3.6.11/drivers/usb/host/Makefile linux-rpi-3.6.y/drivers/usb/host/Makefile --- linux-3.6.11/drivers/usb/host/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/Makefile 2013-02-28 04:23:39.404539771 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/Makefile 2013-03-19 15:30:54.619935833 +0100 @@ -37,6 +37,8 @@ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o @@ -82815,7 +82993,7 @@ diff -Naur linux-3.6.11/drivers/usb/host/Makefile linux-rpi-3.6.y/drivers/usb/ho obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o diff -Naur linux-3.6.11/drivers/usb/Makefile linux-rpi-3.6.y/drivers/usb/Makefile --- linux-3.6.11/drivers/usb/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/Makefile 2013-02-28 04:23:39.440539631 +0100 ++++ linux-rpi-3.6.y/drivers/usb/Makefile 2013-03-19 15:30:54.199938880 +0100 @@ -25,6 +25,7 @@ obj-$(CONFIG_USB_R8A66597_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ @@ -82824,9 +83002,52 @@ diff -Naur linux-3.6.11/drivers/usb/Makefile linux-rpi-3.6.y/drivers/usb/Makefil obj-$(CONFIG_USB_IMX21_HCD) += host/ obj-$(CONFIG_USB_FSL_MPH_DR_OF) += host/ +diff -Naur linux-3.6.11/drivers/usb/serial/cp210x.c linux-rpi-3.6.y/drivers/usb/serial/cp210x.c +--- linux-3.6.11/drivers/usb/serial/cp210x.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/serial/cp210x.c 2013-03-19 15:30:54.257938459 +0100 +@@ -67,6 +67,7 @@ + { USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */ + { USB_DEVICE(0x0FCF, 0x1004) }, /* Dynastream ANT2USB */ + { USB_DEVICE(0x0FCF, 0x1006) }, /* Dynastream ANT development board */ ++ { USB_DEVICE(0x0FDE, 0xCA05) }, /* OWL Wireless Electricity Monitor CM-160 */ + { USB_DEVICE(0x10A6, 0xAA26) }, /* Knock-off DCU-11 cable */ + { USB_DEVICE(0x10AB, 0x10C5) }, /* Siemens MC60 Cable */ + { USB_DEVICE(0x10B5, 0xAC70) }, /* Nokia CA-42 USB */ +diff -Naur linux-3.6.11/drivers/usb/serial/option.c linux-rpi-3.6.y/drivers/usb/serial/option.c +--- linux-3.6.11/drivers/usb/serial/option.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/serial/option.c 2013-03-19 15:30:54.279938299 +0100 +@@ -289,6 +289,7 @@ + #define ALCATEL_VENDOR_ID 0x1bbb + #define ALCATEL_PRODUCT_X060S_X200 0x0000 + #define ALCATEL_PRODUCT_X220_X500D 0x0017 ++#define ALCATEL_PRODUCT_L100V 0x011e + + #define PIRELLI_VENDOR_ID 0x1266 + #define PIRELLI_PRODUCT_C100_1 0x1002 +@@ -1191,6 +1192,8 @@ + .driver_info = (kernel_ulong_t)&alcatel_x200_blacklist + }, + { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D) }, ++ { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L100V), ++ .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) }, + { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) }, + { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14), +diff -Naur linux-3.6.11/drivers/usb/storage/unusual_cypress.h linux-rpi-3.6.y/drivers/usb/storage/unusual_cypress.h +--- linux-3.6.11/drivers/usb/storage/unusual_cypress.h 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/storage/unusual_cypress.h 2013-03-19 15:30:54.348937799 +0100 +@@ -31,7 +31,7 @@ + "Cypress ISD-300LP", + USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0), + +-UNUSUAL_DEV( 0x14cd, 0x6116, 0x0000, 0x9999, ++UNUSUAL_DEV( 0x14cd, 0x6116, 0x0000, 0x0219, + "Super Top", + "USB 2.0 SATA BRIDGE", + USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0), diff -Naur linux-3.6.11/drivers/video/bcm2708_fb.c linux-rpi-3.6.y/drivers/video/bcm2708_fb.c --- linux-3.6.11/drivers/video/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/video/bcm2708_fb.c 2013-02-28 04:23:36.517551041 +0100 ++++ linux-rpi-3.6.y/drivers/video/bcm2708_fb.c 2013-03-19 15:30:52.351952284 +0100 @@ -0,0 +1,491 @@ +/* + * linux/drivers/video/bcm2708_fb.c @@ -83321,7 +83542,7 @@ diff -Naur linux-3.6.11/drivers/video/bcm2708_fb.c linux-rpi-3.6.y/drivers/video +MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer"); diff -Naur linux-3.6.11/drivers/video/console/fbcon.c linux-rpi-3.6.y/drivers/video/console/fbcon.c --- linux-3.6.11/drivers/video/console/fbcon.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/video/console/fbcon.c 2013-02-28 04:23:36.601550714 +0100 ++++ linux-rpi-3.6.y/drivers/video/console/fbcon.c 2013-03-19 15:30:52.764949288 +0100 @@ -1242,8 +1242,16 @@ if (!height || !width) return; @@ -83342,7 +83563,7 @@ diff -Naur linux-3.6.11/drivers/video/console/fbcon.c linux-rpi-3.6.y/drivers/vi diff -Naur linux-3.6.11/drivers/video/Kconfig linux-rpi-3.6.y/drivers/video/Kconfig --- linux-3.6.11/drivers/video/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/video/Kconfig 2013-02-28 04:23:36.619550644 +0100 ++++ linux-rpi-3.6.y/drivers/video/Kconfig 2013-03-19 15:30:52.675949934 +0100 @@ -312,6 +312,20 @@ help Support the Permedia2 FIFO disconnect feature. @@ -83366,7 +83587,7 @@ diff -Naur linux-3.6.11/drivers/video/Kconfig linux-rpi-3.6.y/drivers/video/Kcon depends on FB && ARM && ARM_AMBA diff -Naur linux-3.6.11/drivers/video/logo/logo_linux_clut224.ppm linux-rpi-3.6.y/drivers/video/logo/logo_linux_clut224.ppm --- linux-3.6.11/drivers/video/logo/logo_linux_clut224.ppm 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/video/logo/logo_linux_clut224.ppm 2013-02-28 04:23:36.591550752 +0100 ++++ linux-rpi-3.6.y/drivers/video/logo/logo_linux_clut224.ppm 2013-03-19 15:30:53.031947352 +0100 @@ -1,1604 +1,883 @@ P3 -# Standard 224-color Linux logo @@ -85855,7 +86076,7 @@ diff -Naur linux-3.6.11/drivers/video/logo/logo_linux_clut224.ppm linux-rpi-3.6. +0 0 0 0 0 0 0 0 0 diff -Naur linux-3.6.11/drivers/video/Makefile linux-rpi-3.6.y/drivers/video/Makefile --- linux-3.6.11/drivers/video/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/video/Makefile 2013-02-28 04:23:36.548550920 +0100 ++++ linux-rpi-3.6.y/drivers/video/Makefile 2013-03-19 15:30:52.343952342 +0100 @@ -99,6 +99,7 @@ obj-$(CONFIG_FB_PVR2) += pvr2fb.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o @@ -85864,9 +86085,794 @@ diff -Naur linux-3.6.11/drivers/video/Makefile linux-rpi-3.6.y/drivers/video/Mak obj-$(CONFIG_FB_68328) += 68328fb.o obj-$(CONFIG_FB_GBE) += gbefb.o obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o +diff -Naur linux-3.6.11/drivers/w1/masters/w1-gpio.c linux-rpi-3.6.y/drivers/w1/masters/w1-gpio.c +--- linux-3.6.11/drivers/w1/masters/w1-gpio.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/w1/masters/w1-gpio.c 2013-03-19 15:30:45.799999801 +0100 +@@ -18,6 +18,9 @@ + #include "../w1.h" + #include "../w1_int.h" + ++static int w1_gpio_pullup = 0; ++module_param_named(pullup, w1_gpio_pullup, int, 0); ++ + static void w1_gpio_write_bit_dir(void *data, u8 bit) + { + struct w1_gpio_platform_data *pdata = data; +@@ -42,6 +45,16 @@ + return gpio_get_value(pdata->pin) ? 1 : 0; + } + ++static void w1_gpio_bitbang_pullup(void *data, u8 on) ++{ ++ struct w1_gpio_platform_data *pdata = data; ++ ++ if (on) ++ gpio_direction_output(pdata->pin, 1); ++ else ++ gpio_direction_input(pdata->pin); ++} ++ + static int __init w1_gpio_probe(struct platform_device *pdev) + { + struct w1_bus_master *master; +@@ -70,6 +83,13 @@ + master->write_bit = w1_gpio_write_bit_dir; + } + ++ if (w1_gpio_pullup) ++ if (pdata->is_open_drain) ++ printk(KERN_ERR "w1-gpio 'pullup' option " ++ "doesn't work with open drain GPIO\n"); ++ else ++ master->bitbang_pullup = w1_gpio_bitbang_pullup; ++ + err = w1_add_master_device(master); + if (err) + goto free_gpio; +@@ -81,9 +101,9 @@ + + return 0; + +- free_gpio: ++free_gpio: + gpio_free(pdata->pin); +- free_master: ++free_master: + kfree(master); + + return err; +@@ -133,10 +153,10 @@ + + static struct platform_driver w1_gpio_driver = { + .driver = { +- .name = "w1-gpio", +- .owner = THIS_MODULE, +- }, +- .remove = __exit_p(w1_gpio_remove), ++ .name = "w1-gpio", ++ .owner = THIS_MODULE, ++ }, ++ .remove = __exit_p(w1_gpio_remove), + .suspend = w1_gpio_suspend, + .resume = w1_gpio_resume, + }; +diff -Naur linux-3.6.11/drivers/w1/w1.h linux-rpi-3.6.y/drivers/w1/w1.h +--- linux-3.6.11/drivers/w1/w1.h 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/w1/w1.h 2013-03-19 15:30:45.800999794 +0100 +@@ -22,16 +22,11 @@ + #ifndef __W1_H + #define __W1_H + +-struct w1_reg_num +-{ ++struct w1_reg_num { + #if defined(__LITTLE_ENDIAN_BITFIELD) +- __u64 family:8, +- id:48, +- crc:8; ++ __u64 family:8, id:48, crc:8; + #elif defined(__BIG_ENDIAN_BITFIELD) +- __u64 crc:8, +- id:48, +- family:8; ++ __u64 crc:8, id:48, family:8; + #else + #error "Please fix " + #endif +@@ -59,26 +54,24 @@ + + #define W1_SLAVE_ACTIVE 0 + +-struct w1_slave +-{ +- struct module *owner; +- unsigned char name[W1_MAXNAMELEN]; +- struct list_head w1_slave_entry; +- struct w1_reg_num reg_num; +- atomic_t refcnt; +- u8 rom[9]; +- u32 flags; +- int ttl; +- +- struct w1_master *master; +- struct w1_family *family; +- void *family_data; +- struct device dev; +- struct completion released; ++struct w1_slave { ++ struct module *owner; ++ unsigned char name[W1_MAXNAMELEN]; ++ struct list_head w1_slave_entry; ++ struct w1_reg_num reg_num; ++ atomic_t refcnt; ++ u8 rom[9]; ++ u32 flags; ++ int ttl; ++ ++ struct w1_master *master; ++ struct w1_family *family; ++ void *family_data; ++ struct device dev; ++ struct completion released; + }; + +-typedef void (*w1_slave_found_callback)(struct w1_master *, u64); +- ++typedef void (*w1_slave_found_callback) (struct w1_master *, u64); + + /** + * Note: read_bit and write_bit are very low level functions and should only +@@ -87,19 +80,18 @@ + * Either define read_bit and write_bit OR define, at minimum, touch_bit and + * reset_bus. + */ +-struct w1_bus_master +-{ ++struct w1_bus_master { + /** the first parameter in all the functions below */ +- void *data; ++ void *data; + + /** + * Sample the line level + * @return the level read (0 or 1) + */ +- u8 (*read_bit)(void *); ++ u8(*read_bit) (void *); + + /** Sets the line level */ +- void (*write_bit)(void *, u8); ++ void (*write_bit) (void *, u8); + + /** + * touch_bit is the lowest-level function for devices that really +@@ -108,96 +100,103 @@ + * touch_bit(1) = write-1 / read cycle + * @return the bit read (0 or 1) + */ +- u8 (*touch_bit)(void *, u8); ++ u8(*touch_bit) (void *, u8); + + /** + * Reads a bytes. Same as 8 touch_bit(1) calls. + * @return the byte read + */ +- u8 (*read_byte)(void *); ++ u8(*read_byte) (void *); + + /** + * Writes a byte. Same as 8 touch_bit(x) calls. + */ +- void (*write_byte)(void *, u8); ++ void (*write_byte) (void *, u8); + + /** + * Same as a series of read_byte() calls + * @return the number of bytes read + */ +- u8 (*read_block)(void *, u8 *, int); ++ u8(*read_block) (void *, u8 *, int); + + /** Same as a series of write_byte() calls */ +- void (*write_block)(void *, const u8 *, int); ++ void (*write_block) (void *, const u8 *, int); + + /** + * Combines two reads and a smart write for ROM searches + * @return bit0=Id bit1=comp_id bit2=dir_taken + */ +- u8 (*triplet)(void *, u8); ++ u8(*triplet) (void *, u8); + + /** + * long write-0 with a read for the presence pulse detection + * @return -1=Error, 0=Device present, 1=No device present + */ +- u8 (*reset_bus)(void *); ++ u8(*reset_bus) (void *); + + /** + * Put out a strong pull-up pulse of the specified duration. + * @return -1=Error, 0=completed + */ +- u8 (*set_pullup)(void *, int); ++ u8(*set_pullup) (void *, int); ++ ++ /** ++ * Turns the pullup on/off in bitbanging mode, takes an on/off argument. ++ * @return -1=Error, 0=completed ++ */ ++ void (*bitbang_pullup) (void *, u8); + + /** Really nice hardware can handles the different types of ROM search + * w1_master* is passed to the slave found callback. + */ +- void (*search)(void *, struct w1_master *, +- u8, w1_slave_found_callback); ++ void (*search) (void *, struct w1_master *, ++ u8, w1_slave_found_callback); + }; + +-struct w1_master +-{ +- struct list_head w1_master_entry; +- struct module *owner; +- unsigned char name[W1_MAXNAMELEN]; +- struct list_head slist; +- int max_slave_count, slave_count; +- unsigned long attempts; +- int slave_ttl; +- int initialized; +- u32 id; +- int search_count; ++struct w1_master { ++ struct list_head w1_master_entry; ++ struct module *owner; ++ unsigned char name[W1_MAXNAMELEN]; ++ struct list_head slist; ++ int max_slave_count, slave_count; ++ unsigned long attempts; ++ int slave_ttl; ++ int initialized; ++ u32 id; ++ int search_count; + +- atomic_t refcnt; ++ atomic_t refcnt; + +- void *priv; +- int priv_size; ++ void *priv; ++ int priv_size; + + /** 5V strong pullup enabled flag, 1 enabled, zero disabled. */ +- int enable_pullup; ++ int enable_pullup; + /** 5V strong pullup duration in milliseconds, zero disabled. */ +- int pullup_duration; ++ int pullup_duration; + +- struct task_struct *thread; +- struct mutex mutex; +- struct mutex bus_mutex; ++ struct task_struct *thread; ++ struct mutex mutex; ++ struct mutex bus_mutex; + +- struct device_driver *driver; +- struct device dev; ++ struct device_driver *driver; ++ struct device dev; + +- struct w1_bus_master *bus_master; ++ struct w1_bus_master *bus_master; + +- u32 seq; ++ u32 seq; + }; + + int w1_create_master_attributes(struct w1_master *); + void w1_destroy_master_attributes(struct w1_master *master); +-void w1_search(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb); +-void w1_search_devices(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb); ++void w1_search(struct w1_master *dev, u8 search_type, ++ w1_slave_found_callback cb); ++void w1_search_devices(struct w1_master *dev, u8 search_type, ++ w1_slave_found_callback cb); + struct w1_slave *w1_search_slave(struct w1_reg_num *id); + void w1_slave_found(struct w1_master *dev, u64 rn); + void w1_search_process_cb(struct w1_master *dev, u8 search_type, +- w1_slave_found_callback cb); ++ w1_slave_found_callback cb); + struct w1_master *w1_search_master_id(u32 id); + + /* Disconnect and reconnect devices in the given family. Used for finding +@@ -220,17 +219,17 @@ + int w1_reset_resume_command(struct w1_master *); + void w1_next_pullup(struct w1_master *, int); + +-static inline struct w1_slave* dev_to_w1_slave(struct device *dev) ++static inline struct w1_slave *dev_to_w1_slave(struct device *dev) + { + return container_of(dev, struct w1_slave, dev); + } + +-static inline struct w1_slave* kobj_to_w1_slave(struct kobject *kobj) ++static inline struct w1_slave *kobj_to_w1_slave(struct kobject *kobj) + { + return dev_to_w1_slave(container_of(kobj, struct device, kobj)); + } + +-static inline struct w1_master* dev_to_w1_master(struct device *dev) ++static inline struct w1_master *dev_to_w1_master(struct device *dev) + { + return container_of(dev, struct w1_master, dev); + } +diff -Naur linux-3.6.11/drivers/w1/w1_int.c linux-rpi-3.6.y/drivers/w1/w1_int.c +--- linux-3.6.11/drivers/w1/w1_int.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/w1/w1_int.c 2013-03-19 15:30:45.800999794 +0100 +@@ -32,15 +32,15 @@ + #include "w1_netlink.h" + #include "w1_int.h" + +-static int w1_search_count = -1; /* Default is continual scan */ ++static int w1_search_count = -1; /* Default is continual scan */ + module_param_named(search_count, w1_search_count, int, 0); + + static int w1_enable_pullup = 1; + module_param_named(enable_pullup, w1_enable_pullup, int, 0); + +-static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl, +- struct device_driver *driver, +- struct device *device) ++static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl, ++ struct device_driver *driver, ++ struct device *device) + { + struct w1_master *dev; + int err; +@@ -48,26 +48,27 @@ + /* + * We are in process context(kernel thread), so can sleep. + */ +- dev = kzalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), GFP_KERNEL); ++ dev = ++ kzalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), ++ GFP_KERNEL); + if (!dev) { + printk(KERN_ERR +- "Failed to allocate %zd bytes for new w1 device.\n", +- sizeof(struct w1_master)); ++ "Failed to allocate %zd bytes for new w1 device.\n", ++ sizeof(struct w1_master)); + return NULL; + } + +- + dev->bus_master = (struct w1_bus_master *)(dev + 1); + +- dev->owner = THIS_MODULE; +- dev->max_slave_count = slave_count; +- dev->slave_count = 0; +- dev->attempts = 0; +- dev->initialized = 0; +- dev->id = id; +- dev->slave_ttl = slave_ttl; +- dev->search_count = w1_search_count; +- dev->enable_pullup = w1_enable_pullup; ++ dev->owner = THIS_MODULE; ++ dev->max_slave_count = slave_count; ++ dev->slave_count = 0; ++ dev->attempts = 0; ++ dev->initialized = 0; ++ dev->id = id; ++ dev->slave_ttl = slave_ttl; ++ dev->search_count = w1_search_count; ++ dev->enable_pullup = w1_enable_pullup; + + /* 1 for w1_process to decrement + * 1 for __w1_remove_master_device to decrement +@@ -89,7 +90,8 @@ + + err = device_register(&dev->dev); + if (err) { +- printk(KERN_ERR "Failed to register master device. err=%d\n", err); ++ printk(KERN_ERR "Failed to register master device. err=%d\n", ++ err); + memset(dev, 0, sizeof(struct w1_master)); + kfree(dev); + dev = NULL; +@@ -110,23 +112,25 @@ + struct w1_netlink_msg msg; + int id, found; + +- /* validate minimum functionality */ +- if (!(master->touch_bit && master->reset_bus) && +- !(master->write_bit && master->read_bit) && ++ /* validate minimum functionality */ ++ if (!(master->touch_bit && master->reset_bus) && ++ !(master->write_bit && master->read_bit) && + !(master->write_byte && master->read_byte && master->reset_bus)) { + printk(KERN_ERR "w1_add_master_device: invalid function set\n"); +- return(-EINVAL); +- } +- /* While it would be electrically possible to make a device that +- * generated a strong pullup in bit bang mode, only hardware that +- * controls 1-wire time frames are even expected to support a strong +- * pullup. w1_io.c would need to support calling set_pullup before +- * the last write_bit operation of a w1_write_8 which it currently +- * doesn't. +- */ ++ return (-EINVAL); ++ } ++ ++ /* bitbanging hardware uses bitbang_pullup, other hardware uses set_pullup ++ * and takes care of timing itself */ + if (!master->write_byte && !master->touch_bit && master->set_pullup) { + printk(KERN_ERR "w1_add_master_device: set_pullup requires " +- "write_byte or touch_bit, disabling\n"); ++ "write_byte or touch_bit, disabling\n"); ++ master->set_pullup = NULL; ++ } ++ ++ if (master->set_pullup && master->bitbang_pullup) { ++ printk(KERN_ERR "w1_add_master_device: set_pullup should not " ++ "be set when bitbang_pullup is used, disabling\n"); + master->set_pullup = NULL; + } + +@@ -146,13 +150,13 @@ + } while (found); + + dev = w1_alloc_dev(id, w1_max_slave_count, w1_max_slave_ttl, +- &w1_master_driver, &w1_master_device); ++ &w1_master_driver, &w1_master_device); + if (!dev) { + mutex_unlock(&w1_mlock); + return -ENOMEM; + } + +- retval = w1_create_master_attributes(dev); ++ retval = w1_create_master_attributes(dev); + if (retval) { + mutex_unlock(&w1_mlock); + goto err_out_free_dev; +@@ -166,8 +170,7 @@ + if (IS_ERR(dev->thread)) { + retval = PTR_ERR(dev->thread); + dev_err(&dev->dev, +- "Failed to create new kernel thread. err=%d\n", +- retval); ++ "Failed to create new kernel thread. err=%d\n", retval); + mutex_unlock(&w1_mlock); + goto err_out_rm_attr; + } +@@ -182,7 +185,7 @@ + + return 0; + +-#if 0 /* Thread cleanup code, not required currently. */ ++#if 0 /* Thread cleanup code, not required currently. */ + err_out_kill_thread: + kthread_stop(dev->thread); + #endif +@@ -207,14 +210,15 @@ + + mutex_lock(&dev->mutex); + list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry) +- w1_slave_detach(sl); ++ w1_slave_detach(sl); + w1_destroy_master_attributes(dev); + mutex_unlock(&dev->mutex); + atomic_dec(&dev->refcnt); + + while (atomic_read(&dev->refcnt)) { +- dev_info(&dev->dev, "Waiting for %s to become free: refcnt=%d.\n", +- dev->name, atomic_read(&dev->refcnt)); ++ dev_info(&dev->dev, ++ "Waiting for %s to become free: refcnt=%d.\n", ++ dev->name, atomic_read(&dev->refcnt)); + + if (msleep_interruptible(1000)) + flush_signals(current); +diff -Naur linux-3.6.11/drivers/w1/w1_io.c linux-rpi-3.6.y/drivers/w1/w1_io.c +--- linux-3.6.11/drivers/w1/w1_io.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/w1/w1_io.c 2013-03-19 15:30:45.791999859 +0100 +@@ -43,14 +43,15 @@ + 219, 133, 103, 57, 186, 228, 6, 88, 25, 71, 165, 251, 120, 38, 196, 154, + 101, 59, 217, 135, 4, 90, 184, 230, 167, 249, 27, 69, 198, 152, 122, 36, + 248, 166, 68, 26, 153, 199, 37, 123, 58, 100, 134, 216, 91, 5, 231, 185, +- 140, 210, 48, 110, 237, 179, 81, 15, 78, 16, 242, 172, 47, 113, 147, 205, +- 17, 79, 173, 243, 112, 46, 204, 146, 211, 141, 111, 49, 178, 236, 14, 80, +- 175, 241, 19, 77, 206, 144, 114, 44, 109, 51, 209, 143, 12, 82, 176, 238, +- 50, 108, 142, 208, 83, 13, 239, 177, 240, 174, 76, 18, 145, 207, 45, 115, +- 202, 148, 118, 40, 171, 245, 23, 73, 8, 86, 180, 234, 105, 55, 213, 139, +- 87, 9, 235, 181, 54, 104, 138, 212, 149, 203, 41, 119, 244, 170, 72, 22, +- 233, 183, 85, 11, 136, 214, 52, 106, 43, 117, 151, 201, 74, 20, 246, 168, +- 116, 42, 200, 150, 21, 75, 169, 247, 182, 232, 10, 84, 215, 137, 107, 53 ++ 140, 210, 48, 110, 237, 179, 81, 15, 78, 16, 242, 172, 47, 113, 147, ++ 205, 17, 79, 173, 243, 112, 46, 204, 146, 211, 141, 111, 49, 178, ++ 236, 14, 80, 175, 241, 19, 77, 206, 144, 114, 44, 109, 51, 209, 143, ++ 12, 82, 176, 238, 50, 108, 142, 208, 83, 13, 239, 177, 240, 174, 76, ++ 18, 145, 207, 45, 115, 202, 148, 118, 40, 171, 245, 23, 73, 8, 86, ++ 180, 234, 105, 55, 213, 139, 87, 9, 235, 181, 54, 104, 138, 212, ++ 149, 203, 41, 119, 244, 170, 72, 22, 233, 183, 85, 11, 136, 214, 52, ++ 106, 43, 117, 151, 201, 74, 20, 246, 168, 116, 42, 200, 150, 21, 75, ++ 169, 247, 182, 232, 10, 84, 215, 137, 107, 53 + }; + + static void w1_delay(unsigned long tm) +@@ -84,7 +85,8 @@ + { + unsigned long flags = 0; + +- if(w1_disable_irqs) local_irq_save(flags); ++ if (w1_disable_irqs) ++ local_irq_save(flags); + + if (bit) { + dev->bus_master->write_bit(dev->bus_master->data, 0); +@@ -98,7 +100,8 @@ + w1_delay(10); + } + +- if(w1_disable_irqs) local_irq_restore(flags); ++ if (w1_disable_irqs) ++ local_irq_restore(flags); + } + + /** +@@ -111,9 +114,9 @@ + static void w1_pre_write(struct w1_master *dev) + { + if (dev->pullup_duration && +- dev->enable_pullup && dev->bus_master->set_pullup) { ++ dev->enable_pullup && dev->bus_master->set_pullup) { + dev->bus_master->set_pullup(dev->bus_master->data, +- dev->pullup_duration); ++ dev->pullup_duration); + } + } + +@@ -127,10 +130,22 @@ + static void w1_post_write(struct w1_master *dev) + { + if (dev->pullup_duration) { +- if (dev->enable_pullup && dev->bus_master->set_pullup) +- dev->bus_master->set_pullup(dev->bus_master->data, 0); +- else ++ if (dev->enable_pullup) { ++ if (dev->bus_master->set_pullup) { ++ dev->bus_master->set_pullup(dev-> ++ bus_master->data, ++ 0); ++ } else if (dev->bus_master->bitbang_pullup) { ++ dev->bus_master-> ++ bitbang_pullup(dev->bus_master->data, 1); ++ msleep(dev->pullup_duration); ++ dev->bus_master-> ++ bitbang_pullup(dev->bus_master->data, 0); ++ } ++ } else { + msleep(dev->pullup_duration); ++ } ++ + dev->pullup_duration = 0; + } + } +@@ -148,8 +163,7 @@ + if (dev->bus_master->write_byte) { + w1_pre_write(dev); + dev->bus_master->write_byte(dev->bus_master->data, byte); +- } +- else ++ } else + for (i = 0; i < 8; ++i) { + if (i == 7) + w1_pre_write(dev); +@@ -157,8 +171,8 @@ + } + w1_post_write(dev); + } +-EXPORT_SYMBOL_GPL(w1_write_8); + ++EXPORT_SYMBOL_GPL(w1_write_8); + + /** + * Generates a write-1 cycle and samples the level. +@@ -196,17 +210,17 @@ + * @param bdir the bit to write if both id_bit and comp_bit are 0 + * @return bit fields - see above + */ +-u8 w1_triplet(struct w1_master *dev, int bdir) ++u8 w1_triplet(struct w1_master * dev, int bdir) + { + if (dev->bus_master->triplet) + return dev->bus_master->triplet(dev->bus_master->data, bdir); + else { +- u8 id_bit = w1_touch_bit(dev, 1); ++ u8 id_bit = w1_touch_bit(dev, 1); + u8 comp_bit = w1_touch_bit(dev, 1); + u8 retval; + + if (id_bit && comp_bit) +- return 0x03; /* error */ ++ return 0x03; /* error */ + + if (!id_bit && !comp_bit) { + /* Both bits are valid, take the direction given */ +@@ -231,7 +245,7 @@ + * @param dev the master device + * @return the byte read + */ +-u8 w1_read_8(struct w1_master *dev) ++u8 w1_read_8(struct w1_master * dev) + { + int i; + u8 res = 0; +@@ -240,10 +254,11 @@ + res = dev->bus_master->read_byte(dev->bus_master->data); + else + for (i = 0; i < 8; ++i) +- res |= (w1_touch_bit(dev,1) << i); ++ res |= (w1_touch_bit(dev, 1) << i); + + return res; + } ++ + EXPORT_SYMBOL_GPL(w1_read_8); + + /** +@@ -253,19 +268,19 @@ + * @param buf pointer to the data to write + * @param len the number of bytes to write + */ +-void w1_write_block(struct w1_master *dev, const u8 *buf, int len) ++void w1_write_block(struct w1_master *dev, const u8 * buf, int len) + { + int i; + + if (dev->bus_master->write_block) { + w1_pre_write(dev); + dev->bus_master->write_block(dev->bus_master->data, buf, len); +- } +- else ++ } else + for (i = 0; i < len; ++i) +- w1_write_8(dev, buf[i]); /* calls w1_pre_write */ ++ w1_write_8(dev, buf[i]); /* calls w1_pre_write */ + w1_post_write(dev); + } ++ + EXPORT_SYMBOL_GPL(w1_write_block); + + /** +@@ -275,7 +290,7 @@ + * @param buf pointer to the data to write + * @param len the number of bytes to write + */ +-void w1_touch_block(struct w1_master *dev, u8 *buf, int len) ++void w1_touch_block(struct w1_master *dev, u8 * buf, int len) + { + int i, j; + u8 tmp; +@@ -291,6 +306,7 @@ + buf[i] = tmp; + } + } ++ + EXPORT_SYMBOL_GPL(w1_touch_block); + + /** +@@ -301,13 +317,15 @@ + * @param len the number of bytes to read + * @return the number of bytes read + */ +-u8 w1_read_block(struct w1_master *dev, u8 *buf, int len) ++u8 w1_read_block(struct w1_master *dev, u8 * buf, int len) + { + int i; + u8 ret; + + if (dev->bus_master->read_block) +- ret = dev->bus_master->read_block(dev->bus_master->data, buf, len); ++ ret = ++ dev->bus_master->read_block(dev->bus_master->data, buf, ++ len); + else { + for (i = 0; i < len; ++i) + buf[i] = w1_read_8(dev); +@@ -316,6 +334,7 @@ + + return ret; + } ++ + EXPORT_SYMBOL_GPL(w1_read_block); + + /** +@@ -329,10 +348,12 @@ + int result; + unsigned long flags = 0; + +- if(w1_disable_irqs) local_irq_save(flags); ++ if (w1_disable_irqs) ++ local_irq_save(flags); + + if (dev->bus_master->reset_bus) +- result = dev->bus_master->reset_bus(dev->bus_master->data) & 0x1; ++ result = ++ dev->bus_master->reset_bus(dev->bus_master->data) & 0x1; + else { + dev->bus_master->write_bit(dev->bus_master->data, 0); + /* minimum 480, max ? us +@@ -355,10 +376,12 @@ + msleep(1); + } + +- if(w1_disable_irqs) local_irq_restore(flags); ++ if (w1_disable_irqs) ++ local_irq_restore(flags); + + return result; + } ++ + EXPORT_SYMBOL_GPL(w1_reset_bus); + + u8 w1_calc_crc8(u8 * data, int len) +@@ -370,14 +393,16 @@ + + return crc; + } ++ + EXPORT_SYMBOL_GPL(w1_calc_crc8); + +-void w1_search_devices(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb) ++void w1_search_devices(struct w1_master *dev, u8 search_type, ++ w1_slave_found_callback cb) + { + dev->attempts++; + if (dev->bus_master->search) + dev->bus_master->search(dev->bus_master->data, dev, +- search_type, cb); ++ search_type, cb); + else + w1_search(dev, search_type, cb); + } +@@ -398,14 +423,15 @@ + if (sl->master->slave_count == 1) + w1_write_8(sl->master, W1_SKIP_ROM); + else { +- u8 match[9] = {W1_MATCH_ROM, }; +- u64 rn = le64_to_cpu(*((u64*)&sl->reg_num)); ++ u8 match[9] = { W1_MATCH_ROM, }; ++ u64 rn = le64_to_cpu(*((u64 *) & sl->reg_num)); + + memcpy(&match[1], &rn, 8); + w1_write_block(sl->master, match, 9); + } + return 0; + } ++ + EXPORT_SYMBOL_GPL(w1_reset_select_slave); + + /** +@@ -432,6 +458,7 @@ + w1_write_8(dev, W1_RESUME_CMD); + return 0; + } ++ + EXPORT_SYMBOL_GPL(w1_reset_resume_command); + + /** +@@ -449,4 +476,5 @@ + { + dev->pullup_duration = delay; + } ++ + EXPORT_SYMBOL_GPL(w1_next_pullup); diff -Naur linux-3.6.11/drivers/watchdog/bcm2708_wdog.c linux-rpi-3.6.y/drivers/watchdog/bcm2708_wdog.c --- linux-3.6.11/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/watchdog/bcm2708_wdog.c 2013-02-28 04:23:40.165536800 +0100 ++++ linux-rpi-3.6.y/drivers/watchdog/bcm2708_wdog.c 2013-03-19 15:31:01.647884852 +0100 @@ -0,0 +1,385 @@ +/* + * Broadcom BCM2708 watchdog driver. @@ -86255,7 +87261,7 @@ diff -Naur linux-3.6.11/drivers/watchdog/bcm2708_wdog.c linux-rpi-3.6.y/drivers/ + diff -Naur linux-3.6.11/drivers/watchdog/Kconfig linux-rpi-3.6.y/drivers/watchdog/Kconfig --- linux-3.6.11/drivers/watchdog/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/watchdog/Kconfig 2013-02-28 04:23:40.185536723 +0100 ++++ linux-rpi-3.6.y/drivers/watchdog/Kconfig 2013-03-19 15:31:01.742884162 +0100 @@ -352,6 +352,12 @@ To compile this driver as a module, choose M here: the module will be called imx2_wdt. @@ -86271,7 +87277,7 @@ diff -Naur linux-3.6.11/drivers/watchdog/Kconfig linux-rpi-3.6.y/drivers/watchdo config AT32AP700X_WDT diff -Naur linux-3.6.11/drivers/watchdog/Makefile linux-rpi-3.6.y/drivers/watchdog/Makefile --- linux-3.6.11/drivers/watchdog/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/watchdog/Makefile 2013-02-28 04:23:40.149536862 +0100 ++++ linux-rpi-3.6.y/drivers/watchdog/Makefile 2013-03-19 15:31:01.735884213 +0100 @@ -52,6 +52,7 @@ obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o @@ -86282,7 +87288,7 @@ diff -Naur linux-3.6.11/drivers/watchdog/Makefile linux-rpi-3.6.y/drivers/watchd obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o diff -Naur linux-3.6.11/include/linux/broadcom/vc_cma.h linux-rpi-3.6.y/include/linux/broadcom/vc_cma.h --- linux-3.6.11/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/include/linux/broadcom/vc_cma.h 2013-02-28 04:23:28.681581633 +0100 ++++ linux-rpi-3.6.y/include/linux/broadcom/vc_cma.h 2013-03-19 15:30:45.304003398 +0100 @@ -0,0 +1,30 @@ +/***************************************************************************** +* Copyright 2012 Broadcom Corporation. All rights reserved. @@ -86316,7 +87322,7 @@ diff -Naur linux-3.6.11/include/linux/broadcom/vc_cma.h linux-rpi-3.6.y/include/ + diff -Naur linux-3.6.11/include/linux/mmc/host.h linux-rpi-3.6.y/include/linux/mmc/host.h --- linux-3.6.11/include/linux/mmc/host.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/include/linux/mmc/host.h 2013-02-28 04:23:28.637581805 +0100 ++++ linux-rpi-3.6.y/include/linux/mmc/host.h 2013-03-19 15:30:41.186033259 +0100 @@ -257,6 +257,7 @@ #define MMC_CAP2_HC_ERASE_SZ (1 << 9) /* High-capacity erase size */ #define MMC_CAP2_CD_ACTIVE_HIGH (1 << 10) /* Card-detect signal active high */ @@ -86327,7 +87333,7 @@ diff -Naur linux-3.6.11/include/linux/mmc/host.h linux-rpi-3.6.y/include/linux/m unsigned int power_notify_type; diff -Naur linux-3.6.11/include/linux/mmc/sdhci.h linux-rpi-3.6.y/include/linux/mmc/sdhci.h --- linux-3.6.11/include/linux/mmc/sdhci.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/include/linux/mmc/sdhci.h 2013-02-28 04:23:28.639581797 +0100 ++++ linux-rpi-3.6.y/include/linux/mmc/sdhci.h 2013-03-19 15:30:41.184033274 +0100 @@ -93,6 +93,7 @@ #define SDHCI_QUIRK2_HOST_OFF_CARD_ON (1<<0) @@ -86354,7 +87360,7 @@ diff -Naur linux-3.6.11/include/linux/mmc/sdhci.h linux-rpi-3.6.y/include/linux/ diff -Naur linux-3.6.11/include/net/bluetooth/hci.h linux-rpi-3.6.y/include/net/bluetooth/hci.h --- linux-3.6.11/include/net/bluetooth/hci.h 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/include/net/bluetooth/hci.h 2013-02-28 04:23:28.955580564 +0100 ++++ linux-rpi-3.6.y/include/net/bluetooth/hci.h 2013-03-19 15:30:45.517001854 +0100 @@ -142,7 +142,7 @@ #define HCI_DISCONN_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */ #define HCI_PAIRING_TIMEOUT msecs_to_jiffies(60000) /* 60 seconds */ @@ -86366,7 +87372,7 @@ diff -Naur linux-3.6.11/include/net/bluetooth/hci.h linux-rpi-3.6.y/include/net/ diff -Naur linux-3.6.11/kernel/module.c linux-rpi-3.6.y/kernel/module.c --- linux-3.6.11/kernel/module.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/kernel/module.c 2013-02-28 04:23:27.986584347 +0100 ++++ linux-rpi-3.6.y/kernel/module.c 2013-03-19 15:30:13.291235451 +0100 @@ -2680,20 +2680,23 @@ memset(ptr, 0, mod->core_size); mod->module_core = ptr; @@ -86406,7 +87412,7 @@ diff -Naur linux-3.6.11/kernel/module.c linux-rpi-3.6.y/kernel/module.c pr_debug("final section addresses:\n"); diff -Naur linux-3.6.11/net/core/skbuff.c linux-rpi-3.6.y/net/core/skbuff.c --- linux-3.6.11/net/core/skbuff.c 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/net/core/skbuff.c 2013-02-28 04:23:28.190583549 +0100 ++++ linux-rpi-3.6.y/net/core/skbuff.c 2013-03-19 15:31:08.738833404 +0100 @@ -340,43 +340,57 @@ EXPORT_SYMBOL(build_skb); @@ -86483,7 +87489,7 @@ diff -Naur linux-3.6.11/net/core/skbuff.c linux-rpi-3.6.y/net/core/skbuff.c local_irq_restore(flags); diff -Naur linux-3.6.11/sound/arm/bcm2835.c linux-rpi-3.6.y/sound/arm/bcm2835.c --- linux-3.6.11/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835.c 2013-02-28 04:23:29.322579131 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835.c 2013-03-19 15:30:28.238127129 +0100 @@ -0,0 +1,413 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -86900,7 +87906,7 @@ diff -Naur linux-3.6.11/sound/arm/bcm2835.c linux-rpi-3.6.y/sound/arm/bcm2835.c +MODULE_ALIAS("platform:bcm2835_alsa"); diff -Naur linux-3.6.11/sound/arm/bcm2835-ctl.c linux-rpi-3.6.y/sound/arm/bcm2835-ctl.c --- linux-3.6.11/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835-ctl.c 2013-02-28 04:23:29.321579135 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835-ctl.c 2013-03-19 15:30:28.239127122 +0100 @@ -0,0 +1,200 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -87104,7 +88110,7 @@ diff -Naur linux-3.6.11/sound/arm/bcm2835-ctl.c linux-rpi-3.6.y/sound/arm/bcm283 +} diff -Naur linux-3.6.11/sound/arm/bcm2835.h linux-rpi-3.6.y/sound/arm/bcm2835.h --- linux-3.6.11/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835.h 2013-02-28 04:23:29.320579139 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835.h 2013-03-19 15:30:28.239127122 +0100 @@ -0,0 +1,155 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -87263,7 +88269,7 @@ diff -Naur linux-3.6.11/sound/arm/bcm2835.h linux-rpi-3.6.y/sound/arm/bcm2835.h +#endif /* __SOUND_ARM_BCM2835_H */ diff -Naur linux-3.6.11/sound/arm/bcm2835-pcm.c linux-rpi-3.6.y/sound/arm/bcm2835-pcm.c --- linux-3.6.11/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835-pcm.c 2013-02-28 04:23:29.319579142 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835-pcm.c 2013-03-19 15:30:28.238127129 +0100 @@ -0,0 +1,409 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -87294,7 +88300,7 @@ diff -Naur linux-3.6.11/sound/arm/bcm2835-pcm.c linux-rpi-3.6.y/sound/arm/bcm283 + .channels_min = 1, + .channels_max = 2, + .buffer_bytes_max = 32 * 1024, /* Needs to be less than audioplay buffer size */ -+ .period_bytes_min = 1 * 1024, ++ .period_bytes_min = 4 * 1024, + .period_bytes_max = 32 * 1024, + .periods_min = 1, + .periods_max = 32, @@ -87676,7 +88682,7 @@ diff -Naur linux-3.6.11/sound/arm/bcm2835-pcm.c linux-rpi-3.6.y/sound/arm/bcm283 +} diff -Naur linux-3.6.11/sound/arm/bcm2835-vchiq.c linux-rpi-3.6.y/sound/arm/bcm2835-vchiq.c --- linux-3.6.11/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835-vchiq.c 2013-02-28 04:23:29.321579135 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835-vchiq.c 2013-03-19 15:30:28.238127129 +0100 @@ -0,0 +1,844 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -88524,7 +89530,7 @@ diff -Naur linux-3.6.11/sound/arm/bcm2835-vchiq.c linux-rpi-3.6.y/sound/arm/bcm2 +MODULE_PARM_DESC(force_bulk, "Force use of vchiq bulk for audio"); diff -Naur linux-3.6.11/sound/arm/Kconfig linux-rpi-3.6.y/sound/arm/Kconfig --- linux-3.6.11/sound/arm/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/Kconfig 2013-02-28 04:23:29.322579131 +0100 ++++ linux-rpi-3.6.y/sound/arm/Kconfig 2013-03-19 15:30:28.238127129 +0100 @@ -39,5 +39,12 @@ Say Y or M if you want to support any AC97 codec attached to the PXA2xx AC97 interface. @@ -88540,7 +89546,7 @@ diff -Naur linux-3.6.11/sound/arm/Kconfig linux-rpi-3.6.y/sound/arm/Kconfig diff -Naur linux-3.6.11/sound/arm/Makefile linux-rpi-3.6.y/sound/arm/Makefile --- linux-3.6.11/sound/arm/Makefile 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/Makefile 2013-02-28 04:23:29.320579139 +0100 ++++ linux-rpi-3.6.y/sound/arm/Makefile 2013-03-19 15:30:28.238127129 +0100 @@ -14,3 +14,9 @@ obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o @@ -88553,7 +89559,7 @@ diff -Naur linux-3.6.11/sound/arm/Makefile linux-rpi-3.6.y/sound/arm/Makefile + diff -Naur linux-3.6.11/sound/arm/vc_vchi_audioserv_defs.h linux-rpi-3.6.y/sound/arm/vc_vchi_audioserv_defs.h --- linux-3.6.11/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/vc_vchi_audioserv_defs.h 2013-02-28 04:23:29.322579131 +0100 ++++ linux-rpi-3.6.y/sound/arm/vc_vchi_audioserv_defs.h 2013-03-19 15:30:28.238127129 +0100 @@ -0,0 +1,116 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -88673,7 +89679,7 @@ diff -Naur linux-3.6.11/sound/arm/vc_vchi_audioserv_defs.h linux-rpi-3.6.y/sound +#endif // _VC_AUDIO_DEFS_H_ diff -Naur linux-3.6.11/sound/pci/Kconfig linux-rpi-3.6.y/sound/pci/Kconfig --- linux-3.6.11/sound/pci/Kconfig 2012-12-17 18:27:45.000000000 +0100 -+++ linux-rpi-3.6.y/sound/pci/Kconfig 2013-02-28 04:23:29.449578634 +0100 ++++ linux-rpi-3.6.y/sound/pci/Kconfig 2013-03-19 15:30:29.023121439 +0100 @@ -2,8 +2,8 @@ config SND_TEA575X From e4fa6ff80412a32a065ef321a0f60acc076f4c32 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 19 Mar 2013 17:00:40 +0100 Subject: [PATCH 35/41] bcm2835-driver: update to bcm2835-driver-2bcb2bc Signed-off-by: Stephan Raue --- packages/graphics/bcm2835-driver/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/bcm2835-driver/meta b/packages/graphics/bcm2835-driver/meta index b82728899c..3219a6a302 100644 --- a/packages/graphics/bcm2835-driver/meta +++ b/packages/graphics/bcm2835-driver/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-driver" -PKG_VERSION="98e5704" +PKG_VERSION="2bcb2bc" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="nonfree" From 980dc049c9906b29b81dc2efb75666d38ab3be33 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 19 Mar 2013 17:00:58 +0100 Subject: [PATCH 36/41] bcm2835-bootloader: update to bcm2835-bootloader-2bcb2bc Signed-off-by: Stephan Raue --- packages/tools/bcm2835-bootloader/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tools/bcm2835-bootloader/meta b/packages/tools/bcm2835-bootloader/meta index 2d486e58aa..62cf34f9a0 100644 --- a/packages/tools/bcm2835-bootloader/meta +++ b/packages/tools/bcm2835-bootloader/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-bootloader" -PKG_VERSION="98e5704" +PKG_VERSION="2bcb2bc" PKG_REV="1" PKG_ARCH="arm" PKG_LICENSE="nonfree" From ae61666e006713381605d6373280ea334c6d6633 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 19 Mar 2013 17:01:37 +0100 Subject: [PATCH 37/41] mpfr: update to mpfr-3.1.2 Signed-off-by: Stephan Raue --- packages/toolchain/math/mpfr/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolchain/math/mpfr/meta b/packages/toolchain/math/mpfr/meta index 255bd96a0d..35995abbb8 100644 --- a/packages/toolchain/math/mpfr/meta +++ b/packages/toolchain/math/mpfr/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="mpfr" -PKG_VERSION="3.1.1" +PKG_VERSION="3.1.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" From 9507eb48c26d0c3e52fa65aaac3f2a1ad579dd51 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 19 Mar 2013 23:36:00 +0100 Subject: [PATCH 38/41] libva: update to libva-1.1.1 Signed-off-by: Stephan Raue --- packages/multimedia/libva/meta | 2 +- .../libva/patches/libva-1.1.0-automake_1.13.patch | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 packages/multimedia/libva/patches/libva-1.1.0-automake_1.13.patch diff --git a/packages/multimedia/libva/meta b/packages/multimedia/libva/meta index 5d51b9f17a..46ffd533ff 100644 --- a/packages/multimedia/libva/meta +++ b/packages/multimedia/libva/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libva" -PKG_VERSION="1.1.0" +PKG_VERSION="1.1.1" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="GPL" diff --git a/packages/multimedia/libva/patches/libva-1.1.0-automake_1.13.patch b/packages/multimedia/libva/patches/libva-1.1.0-automake_1.13.patch deleted file mode 100644 index 1024bb328b..0000000000 --- a/packages/multimedia/libva/patches/libva-1.1.0-automake_1.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libva-1.1.0-old/configure.ac libva-1.1.0-new/configure.ac ---- libva-1.1.0-old/configure.ac 2012-10-04 06:30:51.000000000 -0700 -+++ libva-1.1.0-new/configure.ac 2012-12-30 15:06:37.000000000 -0800 -@@ -86,7 +86,7 @@ - AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE([dist-bzip2]) - --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - TODAY="`LC_ALL=C date +'%a, %d %b %Y %X %z'`" From 7b3f683968afd70ecfbb46643aae5ff4f0b557ca Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 19 Mar 2013 23:36:45 +0100 Subject: [PATCH 39/41] libva-driver-intel: update to libva-driver-intel-1.0.20 Signed-off-by: Stephan Raue --- packages/multimedia/libva-driver-intel/meta | 2 +- ...va-driver-intel-1.0.19-automake_1.13.patch | 12 ---------- ...ver-intel-enlarge_dmv_buffer_ivb-001.patch | 23 ------------------- 3 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 packages/multimedia/libva-driver-intel/patches.upstream/libva-driver-intel-1.0.19-automake_1.13.patch delete mode 100644 packages/multimedia/libva-driver-intel/patches.upstream/libva-driver-intel-enlarge_dmv_buffer_ivb-001.patch diff --git a/packages/multimedia/libva-driver-intel/meta b/packages/multimedia/libva-driver-intel/meta index 59fe22b461..30686506ed 100644 --- a/packages/multimedia/libva-driver-intel/meta +++ b/packages/multimedia/libva-driver-intel/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libva-driver-intel" -PKG_VERSION="1.0.19" +PKG_VERSION="1.0.20" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="GPL" diff --git a/packages/multimedia/libva-driver-intel/patches.upstream/libva-driver-intel-1.0.19-automake_1.13.patch b/packages/multimedia/libva-driver-intel/patches.upstream/libva-driver-intel-1.0.19-automake_1.13.patch deleted file mode 100644 index 9d2f4e09ff..0000000000 --- a/packages/multimedia/libva-driver-intel/patches.upstream/libva-driver-intel-1.0.19-automake_1.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur intel-driver-1.0.19-old/configure.ac intel-driver-1.0.19-new/configure.ac ---- intel-driver-1.0.19-old/configure.ac 2012-11-08 17:43:34.000000000 -0800 -+++ intel-driver-1.0.19-new/configure.ac 2013-01-03 17:19:13.000000000 -0800 -@@ -22,7 +22,7 @@ - AC_CONFIG_SRCDIR([Makefile.am]) - AM_INIT_AUTOMAKE([1.9 tar-ustar]) - --AM_CONFIG_HEADER([src/config.h]) -+AC_CONFIG_HEADERS([src/config.h]) - - INTEL_DRIVER_MAJOR_VERSION=intel_driver_major_version - INTEL_DRIVER_MINOR_VERSION=intel_driver_minor_version diff --git a/packages/multimedia/libva-driver-intel/patches.upstream/libva-driver-intel-enlarge_dmv_buffer_ivb-001.patch b/packages/multimedia/libva-driver-intel/patches.upstream/libva-driver-intel-enlarge_dmv_buffer_ivb-001.patch deleted file mode 100644 index d2ed53af52..0000000000 --- a/packages/multimedia/libva-driver-intel/patches.upstream/libva-driver-intel-enlarge_dmv_buffer_ivb-001.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c -index 5b36c8d..2967347 100755 ---- a/src/gen7_mfd.c -+++ b/src/gen7_mfd.c -@@ -194,7 +194,7 @@ gen7_mfd_init_avc_surface(VADriverContextP ctx, - if (gen7_avc_surface->dmv_top == NULL) { - gen7_avc_surface->dmv_top = dri_bo_alloc(i965->intel.bufmgr, - "direct mv w/r buffer", -- width_in_mbs * height_in_mbs * 64, -+ width_in_mbs * (height_in_mbs + 1) * 64, - 0x1000); - assert(gen7_avc_surface->dmv_top); - } -@@ -203,7 +203,7 @@ gen7_mfd_init_avc_surface(VADriverContextP ctx, - gen7_avc_surface->dmv_bottom == NULL) { - gen7_avc_surface->dmv_bottom = dri_bo_alloc(i965->intel.bufmgr, - "direct mv w/r buffer", -- width_in_mbs * height_in_mbs * 64, -+ width_in_mbs * (height_in_mbs + 1) * 64, - 0x1000); - assert(gen7_avc_surface->dmv_bottom); - } - From 00a162d5cb150ead2a35e6fa8bf89cd244944cca Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 19 Mar 2013 23:38:10 +0100 Subject: [PATCH 40/41] xf86-video-intel: update to xf86-video-intel-2.21.4 Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-intel/build | 3 +++ packages/x11/driver/xf86-video-intel/meta | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-intel/build b/packages/x11/driver/xf86-video-intel/build index 527b7be384..bef9fe65f0 100755 --- a/packages/x11/driver/xf86-video-intel/build +++ b/packages/x11/driver/xf86-video-intel/build @@ -22,6 +22,9 @@ . config/options $1 +# TODO: xf86-video-intel-2.21.4 dont link with LTO enabled + strip_lto + xorg_drv_configure_prepend cd $PKG_BUILD diff --git a/packages/x11/driver/xf86-video-intel/meta b/packages/x11/driver/xf86-video-intel/meta index f684895fc6..ee623c3d58 100644 --- a/packages/x11/driver/xf86-video-intel/meta +++ b/packages/x11/driver/xf86-video-intel/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-video-intel" -PKG_VERSION="2.21.2" +PKG_VERSION="2.21.4" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" From 7fa5143928057900974994e66a1ae33d3f6a338e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 20 Mar 2013 00:04:26 +0100 Subject: [PATCH 41/41] xbmc: add upstream patch Signed-off-by: Stephan Raue --- ...nasty_this_could_just_be_a_bad_audio.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 packages/mediacenter/xbmc/patches/xbmc-990.06-assert0_is_nasty_this_could_just_be_a_bad_audio.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.06-assert0_is_nasty_this_could_just_be_a_bad_audio.patch b/packages/mediacenter/xbmc/patches/xbmc-990.06-assert0_is_nasty_this_could_just_be_a_bad_audio.patch new file mode 100644 index 0000000000..1d826af89b --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-990.06-assert0_is_nasty_this_could_just_be_a_bad_audio.patch @@ -0,0 +1,26 @@ +From 2c915ea56abd68cf2310eb9d01936d19a2f118ab Mon Sep 17 00:00:00 2001 +From: davilla +Date: Tue, 19 Mar 2013 13:41:53 -0400 +Subject: [PATCH] changed, assert(0) is nasty, this could just be a bad audio + packet + +--- + xbmc/cores/dvdplayer/DVDPlayerAudio.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp b/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp +index 03ba5ea..e075cd6 100644 +--- a/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp ++++ b/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp +@@ -284,7 +284,7 @@ int CDVDPlayerAudio::DecodeFrame(DVDAudioFrame &audioframe, bool bDropPacket) + CLog::Log(LOGERROR, "CDVDPlayerAudio:DecodeFrame - Codec tried to consume more data than available. Potential memory corruption"); + m_decode.Release(); + m_pAudioCodec->Reset(); +- assert(0); ++ return DECODE_FLAG_ERROR; + } + + m_decode.data += len; +-- +1.8.1.5 +