From 277c1164df171586ef2f57f228bcd400c88f2b64 Mon Sep 17 00:00:00 2001 From: vpeter4 Date: Fri, 21 Dec 2012 20:28:40 +0100 Subject: [PATCH 01/45] pycurl: link with gcrypt library --- packages/3rdparty/web/pycurl/meta | 3 +-- .../patches/pycurl-7.19.0-linking_with_gcrypt.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-linking_with_gcrypt.patch diff --git a/packages/3rdparty/web/pycurl/meta b/packages/3rdparty/web/pycurl/meta index 6916697c7e..77df467de9 100644 --- a/packages/3rdparty/web/pycurl/meta +++ b/packages/3rdparty/web/pycurl/meta @@ -26,11 +26,10 @@ PKG_LICENSE="GPL-2" PKG_SITE="http://pycurl.sourceforge.net/" PKG_URL="http://pycurl.sourceforge.net/download/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="Python curl" -PKG_BUILD_DEPENDS="toolchain Python distutilscross curl" +PKG_BUILD_DEPENDS="toolchain Python distutilscross curl libgcrypt" PKG_PRIORITY="optional" PKG_SECTION="python/web" PKG_SHORTDESC="pycurl: a Python interface to libcurl" PKG_LONGDESC="PycURL is a Python interface to libcurl. PycURL can be used to fetch objects identified by a URL from a Python program, similar to the urllib Python module. PycURL is mature, very fast, and supports a lot of features." PKG_IS_ADDON="no" - PKG_AUTORECONF="no" diff --git a/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-linking_with_gcrypt.patch b/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-linking_with_gcrypt.patch new file mode 100644 index 0000000000..5940c7d3d7 --- /dev/null +++ b/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-linking_with_gcrypt.patch @@ -0,0 +1,11 @@ +diff -uNr pycurl-7.19.0-orig/setup.py pycurl-7.19.0-new/setup.py +--- pycurl-7.19.0-orig/setup.py 2012-12-21 19:20:27.000000000 +0100 ++++ pycurl-7.19.0-new/setup.py 2012-12-21 19:31:11.000000000 +0100 +@@ -104,6 +104,7 @@ + if e[2:] == 'ssl': + define_macros.append(('HAVE_CURL_OPENSSL', 1)) + if e[2:] == 'gnutls': ++ libraries.append("gcrypt") + define_macros.append(('HAVE_CURL_GNUTLS', 1)) + elif e[:2] == "-L": + library_dirs.append(e[2:]) From b1c19cb2bf48a95d21a85488946f5219865ef177 Mon Sep 17 00:00:00 2001 From: Georgi Georgiev Date: Sat, 22 Dec 2012 13:32:59 +0900 Subject: [PATCH 02/45] Version typo in the changelog --- packages/addons/service/downloadmanager/pyload/changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/downloadmanager/pyload/changelog.txt b/packages/addons/service/downloadmanager/pyload/changelog.txt index c3bba03b7c..6a6c32320d 100644 --- a/packages/addons/service/downloadmanager/pyload/changelog.txt +++ b/packages/addons/service/downloadmanager/pyload/changelog.txt @@ -1,4 +1,4 @@ -3.0.1 +3.0.2 - pycrypto is installed per default now 3.0.1 From b4b494c25a6a741f34fb3780a55ce727c92f5141 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 22 Dec 2012 15:07:54 +0100 Subject: [PATCH 03/45] freetype: update to freetype-2.4.11 Signed-off-by: Stephan Raue --- packages/print/freetype/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/print/freetype/meta b/packages/print/freetype/meta index a10d5451fe..5e24db2612 100644 --- a/packages/print/freetype/meta +++ b/packages/print/freetype/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="freetype" -PKG_VERSION="2.4.10" +PKG_VERSION="2.4.11" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From e9df8022d72817bbfd2ca5613a69f819fa9c8759 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 22 Dec 2012 15:08:21 +0100 Subject: [PATCH 04/45] sqlite: update to sqlite-autoconf-3071501 Signed-off-by: Stephan Raue --- packages/databases/sqlite/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/databases/sqlite/meta b/packages/databases/sqlite/meta index 0968d89876..8d6e6ea92d 100644 --- a/packages/databases/sqlite/meta +++ b/packages/databases/sqlite/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="sqlite" -PKG_VERSION="autoconf-3071500" +PKG_VERSION="autoconf-3071501" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="PublicDomain" From ee61a4ade4d28bfbe301e0ce29fb24ff46f03f70 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 22 Dec 2012 15:08:42 +0100 Subject: [PATCH 05/45] pango: update to pango-1.32.5 Signed-off-by: Stephan Raue --- packages/x11/toolkits/pango/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/toolkits/pango/meta b/packages/x11/toolkits/pango/meta index ef0e340754..ef07e831cc 100644 --- a/packages/x11/toolkits/pango/meta +++ b/packages/x11/toolkits/pango/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="pango" -PKG_VERSION="1.32.4" +PKG_VERSION="1.32.5" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 8f03efb28385ecd5f0b13c4f398d29af772647ac Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 23 Dec 2012 11:52:15 +0200 Subject: [PATCH 06/45] vdr-dynamite: update to vdr-dynamite-914af24 --- packages/3rdparty/multimedia/vdr-dynamite/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3rdparty/multimedia/vdr-dynamite/meta b/packages/3rdparty/multimedia/vdr-dynamite/meta index 25b0bc22e4..113d821255 100644 --- a/packages/3rdparty/multimedia/vdr-dynamite/meta +++ b/packages/3rdparty/multimedia/vdr-dynamite/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="vdr-dynamite" -PKG_VERSION="10d78a8" +PKG_VERSION="914af24" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 9bbf3804c5a347685bc44ab0ec398b2d312bdecb Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 23 Dec 2012 11:53:30 +0200 Subject: [PATCH 07/45] vdr-plugin-dvbapi: update to vdr-plugin-dvbapi-e87e15f --- packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta | 2 +- ...ing.patch => vdr-plugin-dvbapi-e87e15f-crosscompiling.patch} | 0 ...c8-ffdecsa.patch => vdr-plugin-dvbapi-e87e15f-ffdecsa.patch} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/{vdr-plugin-dvbapi-e3200c8-crosscompiling.patch => vdr-plugin-dvbapi-e87e15f-crosscompiling.patch} (100%) rename packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/{vdr-plugin-dvbapi-e3200c8-ffdecsa.patch => vdr-plugin-dvbapi-e87e15f-ffdecsa.patch} (100%) diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta index c1bfc2a621..06be1b532c 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta +++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="vdr-plugin-dvbapi" -PKG_VERSION="e3200c8" +PKG_VERSION="e87e15f" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e3200c8-crosscompiling.patch b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e87e15f-crosscompiling.patch similarity index 100% rename from packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e3200c8-crosscompiling.patch rename to packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e87e15f-crosscompiling.patch diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e3200c8-ffdecsa.patch b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e87e15f-ffdecsa.patch similarity index 100% rename from packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e3200c8-ffdecsa.patch rename to packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e87e15f-ffdecsa.patch From 23263c2c28a26eb4b1007a9a32139ddedd1c5ebb Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 23 Dec 2012 11:54:32 +0200 Subject: [PATCH 08/45] vdr-plugin-streamdev: update to vdr-plugin-streamdev-9135cde --- packages/3rdparty/multimedia/vdr-plugin-streamdev/meta | 2 +- ...kefile.patch => vdr-plugin-streamdev-9135cde-makefile.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/{vdr-plugin-streamdev-6a47e20-makefile.patch => vdr-plugin-streamdev-9135cde-makefile.patch} (100%) diff --git a/packages/3rdparty/multimedia/vdr-plugin-streamdev/meta b/packages/3rdparty/multimedia/vdr-plugin-streamdev/meta index cb21b32d27..9e214329d3 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-streamdev/meta +++ b/packages/3rdparty/multimedia/vdr-plugin-streamdev/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="vdr-plugin-streamdev" -PKG_VERSION="6a47e20" +PKG_VERSION="9135cde" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-6a47e20-makefile.patch b/packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-9135cde-makefile.patch similarity index 100% rename from packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-6a47e20-makefile.patch rename to packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-9135cde-makefile.patch From 6db8eaee93ea2f2baef9d8ef910211f3ff42a260 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 23 Dec 2012 11:55:06 +0200 Subject: [PATCH 09/45] vdr-plugin-vnsiserver: update to vdr-plugin-vnsiserver-e3cd383 --- packages/3rdparty/multimedia/vdr-plugin-vnsiserver/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/meta b/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/meta index 01d4368603..85d1172604 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/meta +++ b/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="vdr-plugin-vnsiserver" -PKG_VERSION="e3c185b" +PKG_VERSION="e3cd383" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 015d7cbbc304ae39f5c8a8ac2773ff3dac8d7b12 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 23 Dec 2012 11:55:38 +0200 Subject: [PATCH 10/45] vdr-plugin-xvdr: update to vdr-plugin-xvdr-c43033c --- packages/3rdparty/multimedia/vdr-plugin-xvdr/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3rdparty/multimedia/vdr-plugin-xvdr/meta b/packages/3rdparty/multimedia/vdr-plugin-xvdr/meta index 8d3c562e7d..1b8f1ef53b 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-xvdr/meta +++ b/packages/3rdparty/multimedia/vdr-plugin-xvdr/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="vdr-plugin-xvdr" -PKG_VERSION="c2fa08a" +PKG_VERSION="c43033c" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 48cee273cf14e18c2e79b2ab29e27010c98093f4 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 23 Dec 2012 11:56:22 +0200 Subject: [PATCH 11/45] vdr-sc: update to vdr-sc-620 --- packages/3rdparty/multimedia/vdr-sc/meta | 2 +- ...613-crosscompiling.patch => vdr-sc-620-crosscompiling.patch} | 0 .../{vdr-sc-613-dynamite.patch => vdr-sc-620-dynamite.patch} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename packages/3rdparty/multimedia/vdr-sc/patches/{vdr-sc-613-crosscompiling.patch => vdr-sc-620-crosscompiling.patch} (100%) rename packages/3rdparty/multimedia/vdr-sc/patches/{vdr-sc-613-dynamite.patch => vdr-sc-620-dynamite.patch} (100%) diff --git a/packages/3rdparty/multimedia/vdr-sc/meta b/packages/3rdparty/multimedia/vdr-sc/meta index 9885abdb26..db0d93f17f 100644 --- a/packages/3rdparty/multimedia/vdr-sc/meta +++ b/packages/3rdparty/multimedia/vdr-sc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="vdr-sc" -PKG_VERSION="613" +PKG_VERSION="620" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-613-crosscompiling.patch b/packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-620-crosscompiling.patch similarity index 100% rename from packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-613-crosscompiling.patch rename to packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-620-crosscompiling.patch diff --git a/packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-613-dynamite.patch b/packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-620-dynamite.patch similarity index 100% rename from packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-613-dynamite.patch rename to packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-620-dynamite.patch From c05b554f2123b02c084205533b4153db1c03eed6 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 23 Dec 2012 11:58:19 +0200 Subject: [PATCH 12/45] vdr-addon: bump --- .../addons/service/multimedia/vdr-addon/changelog.txt | 8 ++++++++ packages/addons/service/multimedia/vdr-addon/meta | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt index b70ad54d24..9196f35f8a 100644 --- a/packages/addons/service/multimedia/vdr-addon/changelog.txt +++ b/packages/addons/service/multimedia/vdr-addon/changelog.txt @@ -1,3 +1,11 @@ +3.0.3 +- update to vdr-sc-620 +- update to vdr-plugin-xvdr-c43033c +- update to vdr-plugin-vnsiserver-e3cd383 +- update to vdr-plugin-streamdev-9135cde +- update to vdr-plugin-dvbapi-e87e15f +- update to vdr-dynamite-914af24 + 3.0.2 - update to vdr-plugin-xmltv2vdr-8be374e - update to vdr-plugin-xvdr-c2fa08a diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta index 05056acec3..aeb334f985 100644 --- a/packages/addons/service/multimedia/vdr-addon/meta +++ b/packages/addons/service/multimedia/vdr-addon/meta @@ -21,7 +21,7 @@ PKG_NAME="vdr-addon" PKG_VERSION="3.0" -PKG_REV="2" +PKG_REV="3" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" From ee629f8896d68688e99ab8c57e6abcab71033bff Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 23 Dec 2012 12:14:16 +0200 Subject: [PATCH 13/45] lcdproc: add 'hd44780' driver. closes #1602 --- .../xbmc-addon-settings/source/resources/settings.xml | 2 +- projects/Fusion/options | 2 +- projects/Generic/options | 2 +- projects/Generic_OSS/options | 2 +- projects/ION/options | 2 +- projects/Intel/options | 2 +- projects/RPi/options | 2 +- projects/Virtual/options | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml index e0572ba720..dff77a8eee 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml @@ -12,7 +12,7 @@ - + diff --git a/projects/Fusion/options b/projects/Fusion/options index 9e4c01a7ed..60c091ee06 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -280,7 +280,7 @@ # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140" + LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780" # Modules to install in initramfs for early boot INITRAMFS_MODULES="uvesafb xhci-hcd" diff --git a/projects/Generic/options b/projects/Generic/options index a53d75ec50..f2a7749305 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -280,7 +280,7 @@ # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140" + LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780" # Modules to install in initramfs for early boot INITRAMFS_MODULES="uvesafb xhci-hcd" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index 877dec5484..c7bfdeef20 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -280,7 +280,7 @@ # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140" + LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780" # Modules to install in initramfs for early boot INITRAMFS_MODULES="uvesafb xhci-hcd" diff --git a/projects/ION/options b/projects/ION/options index 48db4186c9..569f0e08df 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -280,7 +280,7 @@ # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140" + LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780" # Modules to install in initramfs for early boot INITRAMFS_MODULES="uvesafb xhci-hcd" diff --git a/projects/Intel/options b/projects/Intel/options index 58def3ac0e..0e23527a1a 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -280,7 +280,7 @@ # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140" + LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780" # Modules to install in initramfs for early boot INITRAMFS_MODULES="xhci-hcd" diff --git a/projects/RPi/options b/projects/RPi/options index 57a175c13a..a962caaf17 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -280,7 +280,7 @@ # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140" + LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780" # Modules to install in initramfs for early boot INITRAMFS_MODULES="" diff --git a/projects/Virtual/options b/projects/Virtual/options index b735940f25..4051ce8c06 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -275,7 +275,7 @@ # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140" + LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780" # Modules to install in initramfs for early boot INITRAMFS_MODULES="" From 7a7e14c18f6906a8c2c16e981aac4dfa2855aae7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 23 Dec 2012 18:20:08 +0100 Subject: [PATCH 14/45] linux: add D-Link DGE-560T support Signed-off-by: Stephan Raue --- .../linux-3.6.11-999.53-RTL8169-2a35cfa.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 packages/linux/patches/linux-3.6.11-999.53-RTL8169-2a35cfa.patch diff --git a/packages/linux/patches/linux-3.6.11-999.53-RTL8169-2a35cfa.patch b/packages/linux/patches/linux-3.6.11-999.53-RTL8169-2a35cfa.patch new file mode 100644 index 0000000000..a00f4f1b55 --- /dev/null +++ b/packages/linux/patches/linux-3.6.11-999.53-RTL8169-2a35cfa.patch @@ -0,0 +1,29 @@ +From: Francois Romieu +Date: Fri, 31 Aug 2012 21:06:17 +0000 (+0200) +Subject: r8169: add D-Link DGE-560T identifiers. +X-Git-Tag: v3.7-rc1~145^2~236 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-stable.git;a=commitdiff_plain;h=2a35cfa591ac63f17815c2d9432b799e37527980;hp=da210f559019ba1cd4ebee2a28ad158bfb95bab2 + +r8169: add D-Link DGE-560T identifiers. + +This one includes a 8168. Not to be confused with the sky2 driven +one whose PCI vendor and device ID are the same. + +Reported-by: Neyuki Inaya +Signed-off-by: Francois Romieu +Signed-off-by: David S. Miller +--- + +diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c +index b47d5b3..0c96604 100644 +--- a/drivers/net/ethernet/realtek/r8169.c ++++ b/drivers/net/ethernet/realtek/r8169.c +@@ -287,6 +287,8 @@ static DEFINE_PCI_DEVICE_TABLE(rtl8169_pci_tbl) = { + { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8167), 0, 0, RTL_CFG_0 }, + { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8168), 0, 0, RTL_CFG_1 }, + { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), 0, 0, RTL_CFG_0 }, ++ { PCI_VENDOR_ID_DLINK, 0x4300, ++ PCI_VENDOR_ID_DLINK, 0x4b10, 0, 0, RTL_CFG_1 }, + { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 }, + { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4302), 0, 0, RTL_CFG_0 }, + { PCI_DEVICE(PCI_VENDOR_ID_AT, 0xc107), 0, 0, RTL_CFG_0 }, From d33cf0ad4acb0ec7103d768e5408dbc38a3dce9e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 26 Dec 2012 15:03:05 +0100 Subject: [PATCH 15/45] new package: add package 'marvell-libbmm' Signed-off-by: Stephan Raue --- packages/devel/marvell-libbmm/build | 33 +++++++++++++++++ packages/devel/marvell-libbmm/install | 29 +++++++++++++++ packages/devel/marvell-libbmm/meta | 36 +++++++++++++++++++ .../marvell-libbmm-0.2.0-cldflags.patch | 27 ++++++++++++++ 4 files changed, 125 insertions(+) create mode 100755 packages/devel/marvell-libbmm/build create mode 100755 packages/devel/marvell-libbmm/install create mode 100644 packages/devel/marvell-libbmm/meta create mode 100644 packages/devel/marvell-libbmm/patches/marvell-libbmm-0.2.0-cldflags.patch diff --git a/packages/devel/marvell-libbmm/build b/packages/devel/marvell-libbmm/build new file mode 100755 index 0000000000..20a99a0a0c --- /dev/null +++ b/packages/devel/marvell-libbmm/build @@ -0,0 +1,33 @@ +#!/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 +################################################################################ + +. config/options $1 + +cd $PKG_BUILD + +make -f Makefile_general libbmm.so.0u + +mkdir -p $SYSROOT_PREFIX/usr/lib + cp -PR libbmm.so* $SYSROOT_PREFIX/usr/lib + +mkdir -p $SYSROOT_PREFIX/usr/include + cp -PR bmm_lib.h $SYSROOT_PREFIX/usr/include diff --git a/packages/devel/marvell-libbmm/install b/packages/devel/marvell-libbmm/install new file mode 100755 index 0000000000..25c228e1a0 --- /dev/null +++ b/packages/devel/marvell-libbmm/install @@ -0,0 +1,29 @@ +#!/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 +################################################################################ + +. config/options $1 + +mkdir -p $INSTALL/usr/lib + cp -P $PKG_BUILD/libbmm.so* $INSTALL/usr/lib + +mkdir -p $INSTALL/lib/udev/rules.d + cp -PR $PKG_BUILD/etc/udev/rules.d/*.rules $INSTALL/lib/udev/rules.d \ No newline at end of file diff --git a/packages/devel/marvell-libbmm/meta b/packages/devel/marvell-libbmm/meta new file mode 100644 index 0000000000..c017bf97f9 --- /dev/null +++ b/packages/devel/marvell-libbmm/meta @@ -0,0 +1,36 @@ +################################################################################ +# 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 +################################################################################ + +PKG_NAME="marvell-libbmm" +PKG_VERSION="0.2.0" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="free to use" +PKG_SITE="http://www.marvell.com" +PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="toolchain" +PKG_PRIORITY="optional" +PKG_SECTION="system" +PKG_SHORTDESC="marvell-libbmm: Allocate, manage and share large block of physical continuous memory." +PKG_LONGDESC="marvell-libbmm: Allocate, manage and share large block of physical continuous memory." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" diff --git a/packages/devel/marvell-libbmm/patches/marvell-libbmm-0.2.0-cldflags.patch b/packages/devel/marvell-libbmm/patches/marvell-libbmm-0.2.0-cldflags.patch new file mode 100644 index 0000000000..a6ae30f902 --- /dev/null +++ b/packages/devel/marvell-libbmm/patches/marvell-libbmm-0.2.0-cldflags.patch @@ -0,0 +1,27 @@ +diff -Naur libbmm-0.2.0/Makefile_general libbmm-0.2.0.patch/Makefile_general +--- libbmm-0.2.0/Makefile_general 2011-03-07 18:48:46.000000000 +0100 ++++ libbmm-0.2.0.patch/Makefile_general 2012-12-24 20:19:47.791960702 +0100 +@@ -30,20 +30,20 @@ + uninstall-host uninstall-target + + .c.o: +- ${CC} -fPIC -o $@ -c $< ++ ${CC} -fPIC ${CFLAGS} -o $@ -c $< + + all: compile install-host install-target + + compile: bmm_test libbmm.so libbmm.a + + bmm_test: libbmm.so.$(ABI_VERSION) ${bmm_test_obj} +- ${CC} -o $@ ${bmm_test_obj} -L. -lbmm ++ ${CC} ${LDLAGS} -o $@ ${bmm_test_obj} -L. -lbmm + + libbmm.a: ${bmm_lib_obj} + ${AR} -rcs $@ ${bmm_lib_obj} + + libbmm.so.$(ABI_VERSION): ${bmm_lib_obj} +- ${CC} -g -s -shared -Wl,-soname,$@ -o $@.$(ABI_REVISION) ${bmm_lib_obj} ++ ${CC} -g -s ${LDFLAGS} -shared -Wl,-soname,$@ -o $@.$(ABI_REVISION) ${bmm_lib_obj} + ln -s $@.$(ABI_REVISION) $@ + ln -s $@.$(ABI_REVISION) libbmm.so + From 646ed69ffdbce00abfc8ae9548a66473bee05a4b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 26 Dec 2012 15:11:09 +0100 Subject: [PATCH 16/45] add CuBox support, update package with last bootloader support changes Signed-off-by: Stephan Raue --- config/functions | 3 +++ packages/tools/u-boot/build | 8 ++++++-- packages/tools/u-boot/files/INSTALL | 0 packages/tools/u-boot/install | 10 ++++++---- packages/tools/u-boot/meta | 6 ++++++ packages/tools/u-boot/release | 30 +++++++++++++++++++++++++++++ projects/ATV/options | 3 +++ projects/Fusion/options | 3 +++ projects/Generic/options | 3 +++ projects/Generic_OSS/options | 3 +++ projects/ION/options | 3 +++ projects/Intel/options | 3 +++ projects/RPi/options | 3 +++ projects/Ultra/options | 3 +++ projects/Virtual/options | 3 +++ 15 files changed, 78 insertions(+), 6 deletions(-) create mode 100644 packages/tools/u-boot/files/INSTALL create mode 100755 packages/tools/u-boot/release diff --git a/config/functions b/config/functions index b4f5f06d05..dcc6f3ebfa 100644 --- a/config/functions +++ b/config/functions @@ -335,7 +335,10 @@ show_config() { config_message="$config_message\n - Default Hostname:\t\t\t $HOSTNAME" config_message="$config_message\n - Default ROOT Password:\t\t $ROOT_PASSWORD" config_message="$config_message\n - Bootloader:\t\t\t\t $BOOTLOADER" +if [ "$BOOTLOADER" = "u-boot" ]; then config_message="$config_message\n - U-Boot configuration:\t\t $UBOOT_CONFIG" + config_message="$config_message\n - U-Boot config file:\t\t\t $UBOOT_CONFIGFILE" +fi config_message="$config_message\n - UDisks support:\t\t\t $UDISKS" config_message="$config_message\n - UPower support:\t\t\t $UPOWER" config_message="$config_message\n - Update support:\t\t\t $UPDATE_SUPPORT" diff --git a/packages/tools/u-boot/build b/packages/tools/u-boot/build index a117f27403..3537ecdd74 100755 --- a/packages/tools/u-boot/build +++ b/packages/tools/u-boot/build @@ -35,9 +35,13 @@ if [ -z "$UBOOT_CONFIG" ]; then exit 1 fi +if [ -z "$UBOOT_CONFIGFILE" ]; then + UBOOT_CONFIGFILE="boot.scr" +fi + cd $PKG_BUILD -make CROSS_COMPILE="$TARGET_PREFIX" ARCH="$TARGET_ARCH" "$UBOOT_CONFIG" +make CROSS_COMPILE="$TARGET_PREFIX" ARCH="$TARGET_ARCH" $UBOOT_CONFIG make CROSS_COMPILE="$TARGET_PREFIX" ARCH="$TARGET_ARCH" HOSTCC="$HOST_CC" HOSTSTRIP="true" mkdir -p $ROOT/$TOOLCHAIN/bin @@ -51,5 +55,5 @@ if [ -r "$BOOT_CFG" ]; then -C none \ -n "$DISTRONAME Boot" \ -d boot.cfg \ - boot.ini + $UBOOT_CONFIGFILE fi diff --git a/packages/tools/u-boot/files/INSTALL b/packages/tools/u-boot/files/INSTALL new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/tools/u-boot/install b/packages/tools/u-boot/install index a81777674f..cdaf9f4b8f 100755 --- a/packages/tools/u-boot/install +++ b/packages/tools/u-boot/install @@ -22,6 +22,10 @@ . config/options $1 +if [ -z "$UBOOT_CONFIGFILE" ]; then + UBOOT_CONFIGFILE="boot.scr" +fi + mkdir -p $INSTALL/usr/share/u-boot cp $PKG_BUILD/u-boot.bin $INSTALL/usr/share/u-boot @@ -33,8 +37,6 @@ if [ -f "$PKG_BUILD/boot.cfg" ]; then cp $PKG_BUILD/boot.cfg $INSTALL/usr/share/u-boot fi -if [ -f "$PKG_BUILD/boot.ini" ]; then - cp $PKG_BUILD/boot.ini $INSTALL/usr/share/u-boot - # some boards read boot.scr by default - cp $PKG_BUILD/boot.ini $INSTALL/usr/share/u-boot/boot.scr +if [ -f "$PKG_BUILD/$UBOOT_CONFIGFILE" ]; then + cp $PKG_BUILD/$UBOOT_CONFIGFILE $INSTALL/usr/share/u-boot fi diff --git a/packages/tools/u-boot/meta b/packages/tools/u-boot/meta index 870638aede..f8221f0d1a 100644 --- a/packages/tools/u-boot/meta +++ b/packages/tools/u-boot/meta @@ -34,3 +34,9 @@ PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems, us PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +if [ "$PROJECT" = "CuBox" ]; then + PKG_VERSION="cubox-f826edd" + PKG_SITE="https://github.com/rabeeh/u-boot/tree/" + PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +fi diff --git a/packages/tools/u-boot/release b/packages/tools/u-boot/release new file mode 100755 index 0000000000..fec05774f2 --- /dev/null +++ b/packages/tools/u-boot/release @@ -0,0 +1,30 @@ +#!/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 +################################################################################ + +. config/options $1 + +if [ -z "$UBOOT_CONFIGFILE" ]; then + UBOOT_CONFIGFILE="boot.scr" +fi + +mkdir -p $RELEASE_DIR/3rdparty/bootloader + cp -PR $BUILD/u-boot-*/$UBOOT_CONFIGFILE $RELEASE_DIR/3rdparty/bootloader diff --git a/projects/ATV/options b/projects/ATV/options index 326a820e5b..9b0944247d 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -92,6 +92,9 @@ # Configuration for u-boot UBOOT_CONFIG="" +# Target Configfile for u-boot + UBOOT_CONFIGFILE="" + # Kernel to use. values can be: # default: default mainline kernel # ti-omap4: Ti's OMAP4 kernel diff --git a/projects/Fusion/options b/projects/Fusion/options index 60c091ee06..975efb748d 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -91,6 +91,9 @@ # Configuration for u-boot UBOOT_CONFIG="" +# Target Configfile for u-boot + UBOOT_CONFIGFILE="" + # Kernel to use. values can be: # default: default mainline kernel # ti-omap4: Ti's OMAP4 kernel diff --git a/projects/Generic/options b/projects/Generic/options index f2a7749305..829f09a4fe 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -91,6 +91,9 @@ # Configuration for u-boot UBOOT_CONFIG="" +# Target Configfile for u-boot + UBOOT_CONFIGFILE="" + # Kernel to use. values can be: # default: default mainline kernel # ti-omap4: Ti's OMAP4 kernel diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index c7bfdeef20..194b9c466a 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -91,6 +91,9 @@ # Configuration for u-boot UBOOT_CONFIG="" +# Target Configfile for u-boot + UBOOT_CONFIGFILE="" + # Kernel to use. values can be: # default: default mainline kernel # ti-omap4: Ti's OMAP4 kernel diff --git a/projects/ION/options b/projects/ION/options index 569f0e08df..f7c21849d0 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -91,6 +91,9 @@ # Configuration for u-boot UBOOT_CONFIG="" +# Target Configfile for u-boot + UBOOT_CONFIGFILE="" + # Kernel to use. values can be: # default: default mainline kernel # ti-omap4: Ti's OMAP4 kernel diff --git a/projects/Intel/options b/projects/Intel/options index 0e23527a1a..a2754dbe04 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -91,6 +91,9 @@ # Configuration for u-boot UBOOT_CONFIG="" +# Target Configfile for u-boot + UBOOT_CONFIGFILE="" + # Kernel to use. values can be: # default: default mainline kernel # ti-omap4: Ti's OMAP4 kernel diff --git a/projects/RPi/options b/projects/RPi/options index a962caaf17..cc9e2a08fe 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -91,6 +91,9 @@ # Configuration for u-boot UBOOT_CONFIG="" +# Target Configfile for u-boot + UBOOT_CONFIGFILE="" + # Kernel to use. values can be: # default: default mainline kernel # ti-omap4: Ti's OMAP4 kernel diff --git a/projects/Ultra/options b/projects/Ultra/options index 503ab34e30..a954c61d04 100755 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -91,6 +91,9 @@ # Configuration for u-boot UBOOT_CONFIG="" +# Target Configfile for u-boot + UBOOT_CONFIGFILE="" + # Kernel to use. values can be: # default: default mainline kernel # ti-omap4: Ti's OMAP4 kernel diff --git a/projects/Virtual/options b/projects/Virtual/options index 4051ce8c06..c52937d55a 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -86,6 +86,9 @@ # Configuration for u-boot UBOOT_CONFIG="" +# Target Configfile for u-boot + UBOOT_CONFIGFILE="" + # Kernel to use. values can be: # default: default mainline kernel # ti-omap4: Ti's OMAP4 kernel From 5716aff4a13204cba9ed992f3b9c35495b0b77cd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 26 Dec 2012 15:16:16 +0100 Subject: [PATCH 17/45] new package: add package 'marvell-libgfx' Signed-off-by: Stephan Raue --- packages/graphics/marvell-libgfx/build | 36 ++++++++++++++++++++++++ packages/graphics/marvell-libgfx/install | 32 +++++++++++++++++++++ packages/graphics/marvell-libgfx/meta | 36 ++++++++++++++++++++++++ 3 files changed, 104 insertions(+) create mode 100755 packages/graphics/marvell-libgfx/build create mode 100755 packages/graphics/marvell-libgfx/install create mode 100644 packages/graphics/marvell-libgfx/meta diff --git a/packages/graphics/marvell-libgfx/build b/packages/graphics/marvell-libgfx/build new file mode 100755 index 0000000000..b725d421f6 --- /dev/null +++ b/packages/graphics/marvell-libgfx/build @@ -0,0 +1,36 @@ +#!/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 +################################################################################ + +. config/options $1 + +if [ "$TARGET_FLOAT" = "softfp" -o "$TARGET_FLOAT" = "soft" ]; then + LIBGLES_LIBDIR="soft/lib" +elif [ "$TARGET_FLOAT" = "hard" ]; then + LIBGLES_LIBDIR="hard/lib" +fi + +cd $PKG_BUILD +mkdir -p $SYSROOT_PREFIX/usr/include + cp -PR include/* $SYSROOT_PREFIX/usr/include + +mkdir -p $SYSROOT_PREFIX/usr/lib + cp -PR $LIBGLES_LIBDIR/*.so* $SYSROOT_PREFIX/usr/lib diff --git a/packages/graphics/marvell-libgfx/install b/packages/graphics/marvell-libgfx/install new file mode 100755 index 0000000000..fc9ff36791 --- /dev/null +++ b/packages/graphics/marvell-libgfx/install @@ -0,0 +1,32 @@ +#!/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 +################################################################################ + +. config/options $1 + +if [ "$TARGET_FLOAT" = "softfp" -o "$TARGET_FLOAT" = "soft" ]; then + LIBGLES_LIBDIR="soft/lib" +elif [ "$TARGET_FLOAT" = "hard" ]; then + LIBGLES_LIBDIR="hard/lib" +fi + +mkdir -p $INSTALL/usr/lib + cp -PR $PKG_BUILD/$LIBGLES_LIBDIR/*.so* $INSTALL/usr/lib diff --git a/packages/graphics/marvell-libgfx/meta b/packages/graphics/marvell-libgfx/meta new file mode 100644 index 0000000000..0f3214b8b4 --- /dev/null +++ b/packages/graphics/marvell-libgfx/meta @@ -0,0 +1,36 @@ +################################################################################ +# 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 +################################################################################ + +PKG_NAME="marvell-libgfx" +PKG_VERSION="20121001" +PKG_REV="1" +PKG_ARCH="arm" +PKG_LICENSE="nonfree" +PKG_SITE="http://www.marvell.com" +PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_DEPENDS="libXfixes libXdamage" +PKG_BUILD_DEPENDS="toolchain libXfixes libXdamage" +PKG_PRIORITY="optional" +PKG_SECTION="graphics" +PKG_SHORTDESC="marvell-libgfx: OpenGL-ES and OpenMAX driver for Marvell Dove" +PKG_LONGDESC="marvell-libgfx: OpenGL-ES and OpenMAX driver for Marvell Dove" +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" From 79da0a9f9073023525e0085c1fb0889d78288b49 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 26 Dec 2012 15:17:04 +0100 Subject: [PATCH 18/45] new package: add package 'xf86-video-dove' Signed-off-by: Stephan Raue --- config/graphic | 4 ++ packages/x11/driver/xf86-video-dove/build | 60 +++++++++++++++++++ .../xf86-video-dove/config/xorg-dove.conf | 53 ++++++++++++++++ packages/x11/driver/xf86-video-dove/install | 29 +++++++++ packages/x11/driver/xf86-video-dove/meta | 36 +++++++++++ .../xserver/xorg-server/udev.d/97-xorg.rules | 1 + 6 files changed, 183 insertions(+) create mode 100755 packages/x11/driver/xf86-video-dove/build create mode 100644 packages/x11/driver/xf86-video-dove/config/xorg-dove.conf create mode 100755 packages/x11/driver/xf86-video-dove/install create mode 100644 packages/x11/driver/xf86-video-dove/meta diff --git a/config/graphic b/config/graphic index fb1cd3f238..c96aff4099 100644 --- a/config/graphic +++ b/config/graphic @@ -38,6 +38,10 @@ get_graphicdrivers() { fi for drv in $GRAPHIC_DRIVERS; do + if [ "$drv" = "dove" ]; then + XORG_DRIVERS="$XORG_DRIVERS dove" + fi + if [ "$drv" = "fglrx" ]; then XORG_DRIVERS="$XORG_DRIVERS fglrx" COMPOSITE_SUPPORT="yes" diff --git a/packages/x11/driver/xf86-video-dove/build b/packages/x11/driver/xf86-video-dove/build new file mode 100755 index 0000000000..d9667f9902 --- /dev/null +++ b/packages/x11/driver/xf86-video-dove/build @@ -0,0 +1,60 @@ +#!/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 +################################################################################ + +. config/options $1 + +xorg_drv_configure_prepend + +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_SUPPORT_RANDR=1" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_SUPPORT_EXA=1" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DDUMP_RAW_VIDEO=1" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_USE_OFFSCREEN_HEAP=0" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_MODE=2" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_ENABLE_UP_DOWNLOAD=0" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_FORCE_HW_LOAD=0" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_ALLOC_PIXMAP_FROM_SYSTEM=0" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_PERF_PROFILING=0" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_TRACE_FALLBACK=1" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_EXA_XBGR_SUPPORT=1" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_XV_SUPPORT_RGB_FORMAT=1" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_XV_TEX_VIDEO=1" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_XV_OVERLAY_VIDEO=2" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_XV_DEFERRED_STALL_GPU=1" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_XV_USE_FAKE_FENCE_STALL=1" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_RANDR_EDID_MODES=1" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_CRTC_SUPPORT_ROTATION=1" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_PLATFORM_INFO=1" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_XV_MIXED_VIDEO=1" +MARVEL_CFLAGS="$MARVEL_CFLAGS -DMRVL_SOURCE_VERSION='\"0.1.0\"'" + +CFLAGS="$CFLAGS $MARVEL_CFLAGS -I$SYSROOT_PREFIX/usr/include/HAL" + +cd $PKG_BUILD +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-shared \ + --disable-static \ + --with-xorg-module-dir=$XORG_PATH_MODULES + +make diff --git a/packages/x11/driver/xf86-video-dove/config/xorg-dove.conf b/packages/x11/driver/xf86-video-dove/config/xorg-dove.conf new file mode 100644 index 0000000000..932325cb79 --- /dev/null +++ b/packages/x11/driver/xf86-video-dove/config/xorg-dove.conf @@ -0,0 +1,53 @@ +Section "Monitor" + Identifier "DVI" + Option "Position" "0 0" + Option "Enable" "true" + Option "PreferredMode" "1920x1080" +# Option "PreferredMode" "1280x720" +# Option "Rotate" "left" +# Option "NoDDCValue" "true" +# Option "PreferredMode" "800x600" +EndSection +Section "Monitor" + Identifier "VGA" + Option "Position" "0 0" + Option "Enable" "true" + Option "PreferredMode" "1920x1080" +# Option "PreferredMode" "1280x720" +# Option "PreferredMode" "800x600" +EndSection + +Section "Device" + Identifier "Driver0" + Screen 0 + Driver "dovefb" + Option "debug" "false" +# Option "ShadowFB" "TRUE" +# Option "UseGPU" "FALSE" + Option "ExaAccel" "FALSE" + Option "Solid" "TRUE" + Option "Copy" "TRUE" + Option "Composite" "FALSE" + Option "SWSolid" "FALSE" + Option "SWCopy" "FALSE" + Option "Commit" "FALSE" + Option "XvAccel" "TRUE" + Option "HWCursor" "false" + Option "EncFunc" "7" + Option "UseDriverBuiltInMode" "TRUE" + Option "EnableDualDisplay" "true" + Option "Monitor-VGA" "VGA" + Option "Monitor-lvds" "DVI" +EndSection + +Section "Screen" + Device "Driver0" + Identifier "Primary Screen" + DefaultDepth 32 + DefaultFbBpp 32 + SubSection "Display" + Viewport 0 0 + Virtual 2048 2048 + EndSubSection +EndSection + diff --git a/packages/x11/driver/xf86-video-dove/install b/packages/x11/driver/xf86-video-dove/install new file mode 100755 index 0000000000..ee3585562b --- /dev/null +++ b/packages/x11/driver/xf86-video-dove/install @@ -0,0 +1,29 @@ +#!/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 +################################################################################ + +. config/options $1 + +mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers + cp -P $PKG_BUILD/src/.libs/dovefb_drv.so $INSTALL/$XORG_PATH_MODULES/drivers + +mkdir -p $INSTALL/etc/X11 + cp $PKG_DIR/config/*.conf $INSTALL/etc/X11 diff --git a/packages/x11/driver/xf86-video-dove/meta b/packages/x11/driver/xf86-video-dove/meta new file mode 100644 index 0000000000..1e39526c3a --- /dev/null +++ b/packages/x11/driver/xf86-video-dove/meta @@ -0,0 +1,36 @@ +################################################################################ +# 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 +################################################################################ + +PKG_NAME="xf86-video-dove" +PKG_VERSION="0.3.4" +PKG_REV="1" +PKG_ARCH="arm" +PKG_LICENSE="OSS" +PKG_SITE="http://www.solid-run.com" +PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_DEPENDS="marvell-libgfx" +PKG_BUILD_DEPENDS="toolchain randrproto renderproto videoproto xproto fontsproto marvell-libgfx xorg-server" +PKG_PRIORITY="optional" +PKG_SECTION="x11/driver" +PKG_SHORTDESC="xf86-video-dove: The Xorg driver for Marvell Dove video chips" +PKG_LONGDESC="The Xorg driver for Marvell Dove video chips." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="yes" diff --git a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules index c04fad3aca..ad8fc3e857 100644 --- a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules +++ b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules @@ -27,6 +27,7 @@ GOTO="end_video" # check for drivers dont use the pci substem LABEL="subsystem_drivers" +KERNEL=="dovefb", ENV{xorg_driver}="dove", GOTO="start_xorg" KERNEL=="fglrx_pci", ENV{xorg_driver}="fglrx", GOTO="start_xorg" KERNEL=="fglrx_legacy_pci", ENV{xorg_driver}="fglrx-legacy", GOTO="start_xorg" KERNEL=="nvidia", ENV{xorg_driver}="nvidia", GOTO="start_xorg" From ce42d313c48534d2bbdf2a124fb6f5a97fdfc783 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Dec 2012 10:19:00 +0100 Subject: [PATCH 19/45] new package: add package 'marvell-libvmeta' Signed-off-by: Stephan Raue --- packages/devel/marvell-libvmeta/build | 27 ++++++++++++++ packages/devel/marvell-libvmeta/install | 26 ++++++++++++++ packages/devel/marvell-libvmeta/meta | 36 +++++++++++++++++++ .../marvell-libvmeta-3.8.3-cldflags.patch | 21 +++++++++++ 4 files changed, 110 insertions(+) create mode 100755 packages/devel/marvell-libvmeta/build create mode 100755 packages/devel/marvell-libvmeta/install create mode 100644 packages/devel/marvell-libvmeta/meta create mode 100644 packages/devel/marvell-libvmeta/patches/marvell-libvmeta-3.8.3-cldflags.patch diff --git a/packages/devel/marvell-libvmeta/build b/packages/devel/marvell-libvmeta/build new file mode 100755 index 0000000000..b8d34531c7 --- /dev/null +++ b/packages/devel/marvell-libvmeta/build @@ -0,0 +1,27 @@ +#!/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 +################################################################################ + +. config/options $1 + +cd $PKG_BUILD + +make libvmeta.so diff --git a/packages/devel/marvell-libvmeta/install b/packages/devel/marvell-libvmeta/install new file mode 100755 index 0000000000..0a978d3d03 --- /dev/null +++ b/packages/devel/marvell-libvmeta/install @@ -0,0 +1,26 @@ +#!/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 +################################################################################ + +. config/options $1 + +mkdir -p $INSTALL/usr/lib + cp -P $PKG_BUILD/libvmeta.so* $INSTALL/usr/lib diff --git a/packages/devel/marvell-libvmeta/meta b/packages/devel/marvell-libvmeta/meta new file mode 100644 index 0000000000..530d49f25f --- /dev/null +++ b/packages/devel/marvell-libvmeta/meta @@ -0,0 +1,36 @@ +################################################################################ +# 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 +################################################################################ + +PKG_NAME="marvell-libvmeta" +PKG_VERSION="3.8.3" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="free to use" +PKG_SITE="http://www.marvell.com" +PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_DEPENDS="marvell-libbmm" +PKG_BUILD_DEPENDS="toolchain marvell-libbmm" +PKG_PRIORITY="optional" +PKG_SECTION="system" +PKG_SHORTDESC="marvell-libvmeta: vmeta library on marvell dove platform." +PKG_LONGDESC="marvell-libvmeta: vmeta library on marvell dove platform." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" diff --git a/packages/devel/marvell-libvmeta/patches/marvell-libvmeta-3.8.3-cldflags.patch b/packages/devel/marvell-libvmeta/patches/marvell-libvmeta-3.8.3-cldflags.patch new file mode 100644 index 0000000000..579ea6e062 --- /dev/null +++ b/packages/devel/marvell-libvmeta/patches/marvell-libvmeta-3.8.3-cldflags.patch @@ -0,0 +1,21 @@ +diff -Naur marvell-libvmeta-3.8.3/Makefile marvell-libvmeta-3.8.3.patch/Makefile +--- marvell-libvmeta-3.8.3/Makefile 2011-03-07 18:51:17.000000000 +0100 ++++ marvell-libvmeta-3.8.3.patch/Makefile 2012-12-27 01:14:34.043086675 +0100 +@@ -22,7 +22,7 @@ + uninstall-host uninstall-target + + .c.o: +- ${CC} -fPIC -o $@ -c $< ++ ${CC} ${CFLAGS} -fPIC -o $@ -c $< + + all: compile install-host install-target + +@@ -32,7 +32,7 @@ + ${AR} -rcs $@ ${vmeta_lib_obj} + + libvmeta.so: ${vmeta_lib_obj} +- ${CC} -g -s -shared -Wl,-soname,$@ -o $@ ${vmeta_lib_obj} -lbmm ++ ${CC} -g -s ${LDFLAGS} -shared -Wl,-soname,$@ -o $@ ${vmeta_lib_obj} -lbmm + + clean: clean-local + From 0ef84cec42ff9858cacb677a1724f929e6764b24 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Dec 2012 10:19:24 +0100 Subject: [PATCH 20/45] new package: add package 'marvell-ipp' Signed-off-by: Stephan Raue --- packages/multimedia/marvell-ipp/build | 44 +++++++++++++++++++ packages/multimedia/marvell-ipp/install | 37 ++++++++++++++++ packages/multimedia/marvell-ipp/meta | 36 +++++++++++++++ .../patches/marvell-ipp-0.2.1-cross.patch | 41 +++++++++++++++++ 4 files changed, 158 insertions(+) create mode 100755 packages/multimedia/marvell-ipp/build create mode 100755 packages/multimedia/marvell-ipp/install create mode 100644 packages/multimedia/marvell-ipp/meta create mode 100644 packages/multimedia/marvell-ipp/patches/marvell-ipp-0.2.1-cross.patch diff --git a/packages/multimedia/marvell-ipp/build b/packages/multimedia/marvell-ipp/build new file mode 100755 index 0000000000..25b18e2279 --- /dev/null +++ b/packages/multimedia/marvell-ipp/build @@ -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 +################################################################################ + +. config/options $1 + +if [ "$TARGET_FLOAT" = "softfp" -o "$TARGET_FLOAT" = "soft" ]; then + VMETA_LIBDIR="vmeta/soft/lib" +elif [ "$TARGET_FLOAT" = "hard" ]; then + VMETA_LIBDIR="vmeta/hard/lib" +fi + +# dont build parallel + MAKEFLAGS=-j1 + +cd $PKG_BUILD +cd example/misc/build/wmmx2_linux + make -f makefile_miscGen +cd - + +mkdir -p $SYSROOT_PREFIX/usr/include/marvell-ipp + cp -PR include/* $SYSROOT_PREFIX/usr/include/marvell-ipp + +mkdir -p $SYSROOT_PREFIX/usr/lib + cp -P lib/libmiscgen.so $SYSROOT_PREFIX/usr/lib + cp -PR $VMETA_LIBDIR/*.so* $SYSROOT_PREFIX/usr/lib diff --git a/packages/multimedia/marvell-ipp/install b/packages/multimedia/marvell-ipp/install new file mode 100755 index 0000000000..33bdf3e416 --- /dev/null +++ b/packages/multimedia/marvell-ipp/install @@ -0,0 +1,37 @@ +#!/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 +################################################################################ + +. config/options $1 + + +if [ "$TARGET_FLOAT" = "softfp" -o "$TARGET_FLOAT" = "soft" ]; then + VMETA_LIBDIR="vmeta/soft/lib" +elif [ "$TARGET_FLOAT" = "hard" ]; then + VMETA_LIBDIR="vmeta/hard/lib" +fi + +mkdir -p $INSTALL/usr/lib + cp -PR $PKG_BUILD/$VMETA_LIBDIR/*.so* $INSTALL/usr/lib + cp -P $PKG_BUILD/lib/libmiscgen.so $SYSROOT_PREFIX/usr/lib + +mkdir -p $INSTALL/lib/udev/rules.d + cp -PR $PKG_BUILD/etc/*.rules $INSTALL/lib/udev/rules.d diff --git a/packages/multimedia/marvell-ipp/meta b/packages/multimedia/marvell-ipp/meta new file mode 100644 index 0000000000..8e1ff2e23b --- /dev/null +++ b/packages/multimedia/marvell-ipp/meta @@ -0,0 +1,36 @@ +################################################################################ +# 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 +################################################################################ + +PKG_NAME="marvell-ipp" +PKG_VERSION="0.2.1" +PKG_REV="1" +PKG_ARCH="arm" +PKG_LICENSE="nonfree" +PKG_SITE="http://www.marvell.com" +PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_DEPENDS="marvell-libvmeta" +PKG_BUILD_DEPENDS="toolchain marvell-libvmeta" +PKG_PRIORITY="optional" +PKG_SECTION="multimedia" +PKG_SHORTDESC="marvell-ipp: Marvell IPP Codecs" +PKG_LONGDESC="marvell-ipp: Marvell IPP Codecs" +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" diff --git a/packages/multimedia/marvell-ipp/patches/marvell-ipp-0.2.1-cross.patch b/packages/multimedia/marvell-ipp/patches/marvell-ipp-0.2.1-cross.patch new file mode 100644 index 0000000000..f1757a5775 --- /dev/null +++ b/packages/multimedia/marvell-ipp/patches/marvell-ipp-0.2.1-cross.patch @@ -0,0 +1,41 @@ +diff -Naur marvell-ipp-0.2.1/example/Rules.make marvell-ipp-0.2.1.patch/example/Rules.make +--- marvell-ipp-0.2.1/example/Rules.make 2011-03-07 18:51:40.000000000 +0100 ++++ marvell-ipp-0.2.1.patch/example/Rules.make 2012-12-26 23:48:51.811467005 +0100 +@@ -28,26 +28,26 @@ + #PATH_GNU_BIN=/usr/local/arm-marvell-linux-gnueabi/bin + PATH_GNU_BIN=/usr/local/arm-marvell-linux-gnueabi-4.4.4/bin + TOOLCHAIN_PREFIX=arm-marvell-linux-gnueabi +-CFLAGS= -mcpu=marvell-f ++#CFLAGS= -mcpu=marvell-f + endif + + #============================================================================== + # GNU binaries (server admin update) + #============================================================================== +-CC=$(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-gcc +-CXX=$(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-gcc +-AR=$(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-ar +-AS=$(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-as +-LN=$(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-gcc ++CC ?= $(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-gcc ++CXX?= $(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-gcc ++AR ?= $(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-ar ++AS ?= $(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-as ++LN ?= $(PATH_GNU_BIN)/$(TOOLCHAIN_PREFIX)-gcc + + #============================================================================== + # GNU build options: (build engineer update) + #============================================================================== +-CFLAGS+= -O3 -Wall -mabi=aapcs-linux -fPIC -D_IPP_LINUX +-CXXFLAGS= $(CFLAGS) +-ASFLAGS= -k -mcpu=iwmmxt2 +-ARFLAGS= +-LNFLAGS= -lpthread -ldl -lm -lrt $(PGO_FLAGS) -Wl,-R ./ ++CFLAGS += -O3 -Wall -mabi=aapcs-linux -fPIC -D_IPP_LINUX ++CXXFLAGS ?= $(CFLAGS) ++ASFLAGS ?= -k -mcpu=iwmmxt2 ++ARFLAGS = ++LNFLAGS ?= -lpthread -ldl -lm -lrt $(PGO_FLAGS) -Wl,-R ./ + + #============================================================================== + # User root path (user update) From 3fbcaec5d54107d4cf842c29a12a7b60c98d6ec7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Dec 2012 10:40:15 +0100 Subject: [PATCH 21/45] scripts/unpack: add general support for project based patches for every package, this patches must be put as *.patch files in 'projects/$PROJECT/patches/$PKG_NAME/' Signed-off-by: Stephan Raue --- scripts/unpack | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/scripts/unpack b/scripts/unpack index 8c81a21049..842623856c 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -91,6 +91,20 @@ for i in $PKG_DIR/patches/$PKG_NAME-$PKG_VERSION*.patch ; do fi done +for i in $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/*.patch ; do + if [ -f "$i" ]; then + PATCH=`basename $i` + PT=`echo $PATCH | sed 's/.*\.\(.*\)$/\1/'` + if [ "$PT" != "patch" -a "$PT" != "$TARGET_ARCH" ]; then + printf "%${BUILD_INDENT}c SKIP PROJECT PATCH: $i\n" ' '>&$SILENT_OUT + continue; + else + printf "%${BUILD_INDENT}c APPLY PROJECT PATCH: $i\n" ' '>&$SILENT_OUT + cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT + fi + fi +done + [ -f "$PKG_DIR/unpack" ] && $PKG_DIR/unpack $@ >&$VERBOSE_OUT for config in `find $BUILD/$1* -name config.guess | sed 's/config.guess//'`; do From 12df4ac0cf381ed4245b26ef68afb487231516fb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Dec 2012 11:03:38 +0100 Subject: [PATCH 22/45] linux: move RPi patch to project folder Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 7 +------ projects/Fusion/linux/linux.i386.conf | 8 +------- projects/Fusion/linux/linux.x86_64.conf | 8 +------- projects/Generic/linux/linux.i386.conf | 8 +------- projects/Generic_OSS/linux/linux.i386.conf | 8 +------- projects/ION/linux/linux.i386.conf | 8 +------- projects/ION/linux/linux.x86_64.conf | 8 +------- projects/Intel/linux/linux.i386.conf | 8 +------- projects/Intel/linux/linux.x86_64.conf | 8 +------- .../patches/linux/linux-3.6-01-RPi_support-197d15b.patch | 0 .../linux/linux-3.6-21-RPi_add_LIRC_RPi_support.patch | 0 projects/Ultra/linux/linux.x86_64.conf | 8 +------- projects/Virtual/linux/linux.i386.conf | 7 +------ projects/Virtual/linux/linux.x86_64.conf | 7 +------ 14 files changed, 12 insertions(+), 81 deletions(-) rename packages/linux/patches/linux-3.6.11-601-RPi_support-197d15b.patch => projects/RPi/patches/linux/linux-3.6-01-RPi_support-197d15b.patch (100%) rename packages/linux/patches/linux-3.6.11-603-RPi_add_LIRC_RPi_support.patch => projects/RPi/patches/linux/linux-3.6-21-RPi_add_LIRC_RPi_support.patch (100%) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 9a9a76ea07..af1f4eaa68 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.10 Kernel Configuration +# Linux/i386 3.6.11 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1586,7 +1586,6 @@ CONFIG_SERIAL_CORE=y # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set CONFIG_DEVPORT=y -# CONFIG_BRCM_CHAR_DRIVERS is not set CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_COMPAT is not set @@ -1689,7 +1688,6 @@ CONFIG_POWER_SUPPLY=y # CONFIG_POWER_AVS is not set # CONFIG_HWMON is not set CONFIG_THERMAL=y -# CONFIG_THERMAL_BCM2835 is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y @@ -2477,7 +2475,6 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_UHCI_HCD=y # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_DWCOTG is not set # CONFIG_USB_HCD_SSB is not set # CONFIG_USB_CHIPIDEA is not set @@ -2511,7 +2508,6 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_UAS is not set # CONFIG_USB_LIBUSUAL is not set # @@ -2780,7 +2776,6 @@ CONFIG_LIRC_STAGING=y # CONFIG_LIRC_BT829 is not set CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_IMON is not set -# CONFIG_LIRC_RPI is not set # CONFIG_LIRC_SASEM is not set # CONFIG_LIRC_SERIAL is not set # CONFIG_LIRC_SIR is not set diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 7477d579d7..0b8832b5c8 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.10 Kernel Configuration +# Linux/i386 3.6.11 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1650,7 +1650,6 @@ CONFIG_SERIAL_CORE=y # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set CONFIG_DEVPORT=y -# CONFIG_BRCM_CHAR_DRIVERS is not set CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_COMPAT is not set @@ -1858,7 +1857,6 @@ CONFIG_SENSORS_FAM15H_POWER=y # CONFIG_SENSORS_W83627HF is not set CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_APPLESMC is not set -# CONFIG_SENSORS_BCM2835 is not set # # ACPI drivers @@ -1867,7 +1865,6 @@ CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_ATK0110 is not set CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y -# CONFIG_THERMAL_BCM2835 is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -2786,7 +2783,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_UHCI_HCD is not set # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_DWCOTG is not set # CONFIG_USB_HCD_SSB is not set # CONFIG_USB_CHIPIDEA is not set @@ -2820,7 +2816,6 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -CONFIG_USB_UAS=m # CONFIG_USB_LIBUSUAL is not set # @@ -3090,7 +3085,6 @@ CONFIG_LIRC_STAGING=y # CONFIG_LIRC_BT829 is not set CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_IMON is not set -# CONFIG_LIRC_RPI is not set # CONFIG_LIRC_SASEM is not set CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index b429766a55..40fd11b54a 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.10 Kernel Configuration +# Linux/x86_64 3.6.11 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -1601,7 +1601,6 @@ CONFIG_SERIAL_CORE=y # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set CONFIG_DEVPORT=y -# CONFIG_BRCM_CHAR_DRIVERS is not set CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_COMPAT is not set @@ -1808,7 +1807,6 @@ CONFIG_SENSORS_FAM15H_POWER=y # CONFIG_SENSORS_W83627HF is not set CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_APPLESMC is not set -# CONFIG_SENSORS_BCM2835 is not set # # ACPI drivers @@ -1817,7 +1815,6 @@ CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_ATK0110 is not set CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y -# CONFIG_THERMAL_BCM2835 is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -2726,7 +2723,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_UHCI_HCD is not set # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_DWCOTG is not set # CONFIG_USB_HCD_SSB is not set # CONFIG_USB_CHIPIDEA is not set @@ -2760,7 +2756,6 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -CONFIG_USB_UAS=m # CONFIG_USB_LIBUSUAL is not set # @@ -3030,7 +3025,6 @@ CONFIG_LIRC_STAGING=y # CONFIG_LIRC_BT829 is not set CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_IMON is not set -# CONFIG_LIRC_RPI is not set # CONFIG_LIRC_SASEM is not set CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 29c2902dd1..2567dc2509 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.10 Kernel Configuration +# Linux/i386 3.6.11 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1732,7 +1732,6 @@ CONFIG_SERIAL_CORE=y # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set CONFIG_DEVPORT=y -# CONFIG_BRCM_CHAR_DRIVERS is not set CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_COMPAT is not set @@ -1941,7 +1940,6 @@ CONFIG_SENSORS_IT87=m # CONFIG_SENSORS_W83627HF is not set CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_APPLESMC is not set -# CONFIG_SENSORS_BCM2835 is not set # # ACPI drivers @@ -1950,7 +1948,6 @@ CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_ATK0110 is not set CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y -# CONFIG_THERMAL_BCM2835 is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -2909,7 +2906,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=y # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_DWCOTG is not set # CONFIG_USB_HCD_SSB is not set # CONFIG_USB_CHIPIDEA is not set @@ -2943,7 +2939,6 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -CONFIG_USB_UAS=m # CONFIG_USB_LIBUSUAL is not set # @@ -3260,7 +3255,6 @@ CONFIG_LIRC_STAGING=y # CONFIG_LIRC_BT829 is not set CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_IMON is not set -# CONFIG_LIRC_RPI is not set # CONFIG_LIRC_SASEM is not set CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 1d9aea90df..60a966d14a 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.10 Kernel Configuration +# Linux/i386 3.6.11 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1730,7 +1730,6 @@ CONFIG_SERIAL_CORE=y # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set CONFIG_DEVPORT=y -# CONFIG_BRCM_CHAR_DRIVERS is not set CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_COMPAT is not set @@ -1939,7 +1938,6 @@ CONFIG_SENSORS_IT87=m # CONFIG_SENSORS_W83627HF is not set CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_APPLESMC is not set -# CONFIG_SENSORS_BCM2835 is not set # # ACPI drivers @@ -1948,7 +1946,6 @@ CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_ATK0110 is not set CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y -# CONFIG_THERMAL_BCM2835 is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -2911,7 +2908,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=y # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_DWCOTG is not set # CONFIG_USB_HCD_SSB is not set # CONFIG_USB_CHIPIDEA is not set @@ -2945,7 +2941,6 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -CONFIG_USB_UAS=m # CONFIG_USB_LIBUSUAL is not set # @@ -3262,7 +3257,6 @@ CONFIG_LIRC_STAGING=y # CONFIG_LIRC_BT829 is not set CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_IMON is not set -# CONFIG_LIRC_RPI is not set # CONFIG_LIRC_SASEM is not set CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 98fb81418c..8a07c00af3 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.10 Kernel Configuration +# Linux/i386 3.6.11 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1657,7 +1657,6 @@ CONFIG_SERIAL_CORE=y # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set CONFIG_DEVPORT=y -# CONFIG_BRCM_CHAR_DRIVERS is not set CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_COMPAT is not set @@ -1864,7 +1863,6 @@ CONFIG_SENSORS_CORETEMP=m # CONFIG_SENSORS_W83627HF is not set CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_APPLESMC is not set -# CONFIG_SENSORS_BCM2835 is not set # # ACPI drivers @@ -1873,7 +1871,6 @@ CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_ATK0110 is not set CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y -# CONFIG_THERMAL_BCM2835 is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y @@ -2761,7 +2758,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=y # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_DWCOTG is not set # CONFIG_USB_HCD_SSB is not set # CONFIG_USB_CHIPIDEA is not set @@ -2795,7 +2791,6 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_UAS is not set # CONFIG_USB_LIBUSUAL is not set # @@ -3104,7 +3099,6 @@ CONFIG_LIRC_STAGING=y # CONFIG_LIRC_BT829 is not set CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_IMON is not set -# CONFIG_LIRC_RPI is not set # CONFIG_LIRC_SASEM is not set CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index bdd3b263c0..2f5ff01405 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.10 Kernel Configuration +# Linux/x86_64 3.6.11 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -1593,7 +1593,6 @@ CONFIG_SERIAL_CORE=y # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set CONFIG_DEVPORT=y -# CONFIG_BRCM_CHAR_DRIVERS is not set CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_COMPAT is not set @@ -1799,7 +1798,6 @@ CONFIG_SENSORS_CORETEMP=m # CONFIG_SENSORS_W83627HF is not set CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_APPLESMC is not set -# CONFIG_SENSORS_BCM2835 is not set # # ACPI drivers @@ -1808,7 +1806,6 @@ CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_ATK0110 is not set CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y -# CONFIG_THERMAL_BCM2835 is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y @@ -2686,7 +2683,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=y # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_DWCOTG is not set # CONFIG_USB_HCD_SSB is not set # CONFIG_USB_CHIPIDEA is not set @@ -2720,7 +2716,6 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_UAS is not set # CONFIG_USB_LIBUSUAL is not set # @@ -3028,7 +3023,6 @@ CONFIG_LIRC_STAGING=y # CONFIG_LIRC_BT829 is not set CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_IMON is not set -# CONFIG_LIRC_RPI is not set # CONFIG_LIRC_SASEM is not set CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 870b7d1c09..39175f5fe5 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.10 Kernel Configuration +# Linux/i386 3.6.11 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1675,7 +1675,6 @@ CONFIG_SERIAL_CORE=y # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set CONFIG_DEVPORT=y -# CONFIG_BRCM_CHAR_DRIVERS is not set CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_COMPAT is not set @@ -1881,7 +1880,6 @@ CONFIG_SENSORS_CORETEMP=m # CONFIG_SENSORS_W83627HF is not set CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_APPLESMC is not set -# CONFIG_SENSORS_BCM2835 is not set # # ACPI drivers @@ -1890,7 +1888,6 @@ CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_ATK0110 is not set CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y -# CONFIG_THERMAL_BCM2835 is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y @@ -2807,7 +2804,6 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_UHCI_HCD=y # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_DWCOTG is not set # CONFIG_USB_HCD_SSB is not set # CONFIG_USB_CHIPIDEA is not set @@ -2841,7 +2837,6 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_UAS is not set # CONFIG_USB_LIBUSUAL is not set # @@ -3150,7 +3145,6 @@ CONFIG_LIRC_STAGING=y # CONFIG_LIRC_BT829 is not set CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_IMON is not set -# CONFIG_LIRC_RPI is not set # CONFIG_LIRC_SASEM is not set CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 7494448c3e..67b40da874 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.10 Kernel Configuration +# Linux/x86_64 3.6.11 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -1612,7 +1612,6 @@ CONFIG_SERIAL_CORE=y # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set CONFIG_DEVPORT=y -# CONFIG_BRCM_CHAR_DRIVERS is not set CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_COMPAT is not set @@ -1817,7 +1816,6 @@ CONFIG_SENSORS_CORETEMP=m # CONFIG_SENSORS_W83627HF is not set CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_APPLESMC is not set -# CONFIG_SENSORS_BCM2835 is not set # # ACPI drivers @@ -1826,7 +1824,6 @@ CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_ATK0110 is not set CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y -# CONFIG_THERMAL_BCM2835 is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y @@ -2733,7 +2730,6 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_UHCI_HCD=y # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_DWCOTG is not set # CONFIG_USB_HCD_SSB is not set # CONFIG_USB_CHIPIDEA is not set @@ -2767,7 +2763,6 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_UAS is not set # CONFIG_USB_LIBUSUAL is not set # @@ -3075,7 +3070,6 @@ CONFIG_LIRC_STAGING=y # CONFIG_LIRC_BT829 is not set CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_IMON is not set -# CONFIG_LIRC_RPI is not set # CONFIG_LIRC_SASEM is not set CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y diff --git a/packages/linux/patches/linux-3.6.11-601-RPi_support-197d15b.patch b/projects/RPi/patches/linux/linux-3.6-01-RPi_support-197d15b.patch similarity index 100% rename from packages/linux/patches/linux-3.6.11-601-RPi_support-197d15b.patch rename to projects/RPi/patches/linux/linux-3.6-01-RPi_support-197d15b.patch diff --git a/packages/linux/patches/linux-3.6.11-603-RPi_add_LIRC_RPi_support.patch b/projects/RPi/patches/linux/linux-3.6-21-RPi_add_LIRC_RPi_support.patch similarity index 100% rename from packages/linux/patches/linux-3.6.11-603-RPi_add_LIRC_RPi_support.patch rename to projects/RPi/patches/linux/linux-3.6-21-RPi_add_LIRC_RPi_support.patch diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index 9e58e6af0b..e88ddba016 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.10 Kernel Configuration +# Linux/x86_64 3.6.11 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -1516,7 +1516,6 @@ CONFIG_SERIAL_CORE=y # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set CONFIG_DEVPORT=y -# CONFIG_BRCM_CHAR_DRIVERS is not set CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_COMPAT is not set @@ -1722,7 +1721,6 @@ CONFIG_SENSORS_CORETEMP=y # CONFIG_SENSORS_W83627HF is not set CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_APPLESMC is not set -# CONFIG_SENSORS_BCM2835 is not set # # ACPI drivers @@ -1731,7 +1729,6 @@ CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_ATK0110 is not set CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y -# CONFIG_THERMAL_BCM2835 is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y @@ -2532,7 +2529,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=y # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_DWCOTG is not set # CONFIG_USB_HCD_SSB is not set # CONFIG_USB_CHIPIDEA is not set @@ -2566,7 +2562,6 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_UAS is not set # CONFIG_USB_LIBUSUAL is not set # @@ -2835,7 +2830,6 @@ CONFIG_LIRC_STAGING=y # CONFIG_LIRC_BT829 is not set CONFIG_LIRC_IGORPLUGUSB=m # CONFIG_LIRC_IMON is not set -# CONFIG_LIRC_RPI is not set # CONFIG_LIRC_SASEM is not set # CONFIG_LIRC_SERIAL is not set # CONFIG_LIRC_SIR is not set diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index fd9df93730..24e9535cf7 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.10 Kernel Configuration +# Linux/i386 3.6.11 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1677,7 +1677,6 @@ CONFIG_SERIAL_CORE=y # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set CONFIG_DEVPORT=y -# CONFIG_BRCM_CHAR_DRIVERS is not set CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_COMPAT is not set @@ -1883,7 +1882,6 @@ CONFIG_SENSORS_CORETEMP=m # CONFIG_SENSORS_W83627HF is not set CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_APPLESMC is not set -# CONFIG_SENSORS_BCM2835 is not set # # ACPI drivers @@ -1892,7 +1890,6 @@ CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_ATK0110 is not set CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y -# CONFIG_THERMAL_BCM2835 is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y @@ -2812,7 +2809,6 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_UHCI_HCD=y # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_DWCOTG is not set # CONFIG_USB_HCD_SSB is not set # CONFIG_USB_CHIPIDEA is not set @@ -2846,7 +2842,6 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_UAS is not set # CONFIG_USB_LIBUSUAL is not set # diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index 0246054f51..8240c5d136 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.10 Kernel Configuration +# Linux/x86_64 3.6.11 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -1613,7 +1613,6 @@ CONFIG_SERIAL_CORE=y # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set CONFIG_DEVPORT=y -# CONFIG_BRCM_CHAR_DRIVERS is not set CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_COMPAT is not set @@ -1818,7 +1817,6 @@ CONFIG_SENSORS_CORETEMP=m # CONFIG_SENSORS_W83627HF is not set CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_APPLESMC is not set -# CONFIG_SENSORS_BCM2835 is not set # # ACPI drivers @@ -1827,7 +1825,6 @@ CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_ATK0110 is not set CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y -# CONFIG_THERMAL_BCM2835 is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y @@ -2737,7 +2734,6 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_UHCI_HCD=y # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_DWCOTG is not set # CONFIG_USB_HCD_SSB is not set # CONFIG_USB_CHIPIDEA is not set @@ -2771,7 +2767,6 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set # CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_UAS is not set # CONFIG_USB_LIBUSUAL is not set # From 3298d88cbd5aa27eddcd72673d964f965dd011d0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Dec 2012 11:08:15 +0100 Subject: [PATCH 23/45] xbmc: remove package based support for project based patches Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/unpack | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/mediacenter/xbmc/unpack b/packages/mediacenter/xbmc/unpack index c00197e783..f21b1bc057 100755 --- a/packages/mediacenter/xbmc/unpack +++ b/packages/mediacenter/xbmc/unpack @@ -30,10 +30,3 @@ if [ ! $TARGET_ARCH = arm ]; then `echo $PKG_BUILD | cut -f1 -d\ ` -p1 done fi - -echo "### Applying project based patches ###" - -for patch in `ls $PROJECT_DIR/$PROJECT/patches/$1`; do - cat $PROJECT_DIR/$PROJECT/patches/$1/$patch | patch -d \ - `echo $PKG_BUILD | cut -f1 -d\ ` -p1 -done From 873d055c46a9d31acc3f9deefa69e740e9649fd1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Dec 2012 11:40:09 +0100 Subject: [PATCH 24/45] ffmpeg: update upstream patches Signed-off-by: Stephan Raue --- ...m_fix_initialization_on_some_streams.patch | 28 +++++++++++++++++++ ...037-fixed_missing_S_DVBSUB_subtitles.patch | 24 ++++++++++++++++ ...-to-list-of-codecs-in-mkv-containers.patch | 10 ------- 3 files changed, 52 insertions(+), 10 deletions(-) create mode 100644 packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-0036-latm_fix_initialization_on_some_streams.patch create mode 100644 packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-0037-fixed_missing_S_DVBSUB_subtitles.patch delete mode 100644 packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-911-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-0036-latm_fix_initialization_on_some_streams.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-0036-latm_fix_initialization_on_some_streams.patch new file mode 100644 index 0000000000..de9e161e41 --- /dev/null +++ b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-0036-latm_fix_initialization_on_some_streams.patch @@ -0,0 +1,28 @@ +From 06d713fefaf19cb4dfb83126ba1c078d6dcabc67 Mon Sep 17 00:00:00 2001 +From: xbmc +Date: Tue, 25 Dec 2012 08:35:36 +0100 +Subject: [PATCH] ffmpeg: backport latm: fix initialization on some streams + when no extradata is available: + d039b6074ca68da9b6dc88d8bb40056fee9fecb6 + +--- + libavcodec/aacdec.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c +index 5c6404e..ad2991b 100644 +--- a/libavcodec/aacdec.c ++++ b/libavcodec/aacdec.c +@@ -2403,7 +2403,8 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx, + if (bits_consumed < 0) + return AVERROR_INVALIDDATA; + +- if (ac->m4ac.sample_rate != m4ac.sample_rate || ++ if (!latmctx->initialized || ++ ac->m4ac.sample_rate != m4ac.sample_rate || + ac->m4ac.chan_config != m4ac.chan_config) { + + av_log(avctx, AV_LOG_INFO, "audio config changed\n"); +-- +1.7.10 + diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-0037-fixed_missing_S_DVBSUB_subtitles.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-0037-fixed_missing_S_DVBSUB_subtitles.patch new file mode 100644 index 0000000000..7d3bcf87ce --- /dev/null +++ b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-0037-fixed_missing_S_DVBSUB_subtitles.patch @@ -0,0 +1,24 @@ +From 9066d83f0f237d90fe0c2d9b6202bb8cd59a6562 Mon Sep 17 00:00:00 2001 +From: Allan Kristensen +Date: Fri, 21 Dec 2012 21:04:18 +0100 +Subject: [PATCH] [ffmpeg] fixed missing S_DVBSUB subtitles + +--- + libavformat/matroska.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libavformat/matroska.c b/libavformat/matroska.c +index 2f5b617..11c2fa5 100644 +--- a/libavformat/matroska.c ++++ b/libavformat/matroska.c +@@ -59,6 +59,7 @@ + {"S_ASS" , CODEC_ID_SSA}, + {"S_SSA" , CODEC_ID_SSA}, + {"S_VOBSUB" , CODEC_ID_DVD_SUBTITLE}, ++ {"S_DVBSUB" , CODEC_ID_DVB_SUBTITLE}, + {"S_HDMV/PGS" , CODEC_ID_HDMV_PGS_SUBTITLE}, + + {"V_DIRAC" , CODEC_ID_DIRAC}, +-- +1.7.10 + diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-911-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-911-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch deleted file mode 100644 index b780d72a55..0000000000 --- a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-911-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libavformat/matroska.c 2012-07-07 03:11:59.514972002 -0700 -+++ b/libavformat/matroska.c 2012-07-07 03:12:49.054969249 -0700 -@@ -59,6 +59,7 @@ - {"S_ASS" , CODEC_ID_SSA}, - {"S_SSA" , CODEC_ID_SSA}, - {"S_VOBSUB" , CODEC_ID_DVD_SUBTITLE}, -+ {"S_DVBSUB" , CODEC_ID_DVB_SUBTITLE}, - {"S_HDMV/PGS" , CODEC_ID_HDMV_PGS_SUBTITLE}, - - {"V_DIRAC" , CODEC_ID_DIRAC}, From dc2a27534a93b258f60b84ab2040695a0929b213 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Dec 2012 11:41:50 +0100 Subject: [PATCH 25/45] xbmc: add 'marvell-libgfx' and vmeta support Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/build | 3 +++ packages/mediacenter/xbmc/meta | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index 70a3e6236a..a78c9cb007 100755 --- a/packages/mediacenter/xbmc/build +++ b/packages/mediacenter/xbmc/build @@ -39,6 +39,9 @@ fi if [ "$OPENGLES_SUPPORT" = yes ]; then XBMC_OPENGLES="--enable-gles" + if [ "$OPENGLES" = "marvell-libgfx" ]; then + XBMC_PLATFORM_SUPPORT="--with-platform=marvell-dove" + fi else XBMC_OPENGLES="--disable-gles" fi diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 13e93831a1..015f28fa15 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -71,6 +71,10 @@ if [ "$OPENGLES_SUPPORT" = yes ]; then # for OpenGL-ES support PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS $OPENGLES" PKG_DEPENDS="$PKG_DEPENDS $OPENGLES" + if [ "$OPENGLES" = "marvell-libgfx" ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS marvell-libvmeta marvell-ipp" + PKG_DEPENDS="$PKG_DEPENDS marvell-libvmeta marvell-ipp" + fi fi # for dbus support From 67dbb9194e4071d523cb4c5edc2c2bfd4baf78f6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Dec 2012 12:12:43 +0100 Subject: [PATCH 26/45] xbmc: remove deprecated configure options Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/build | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index a78c9cb007..3ff2f9d1fa 100755 --- a/packages/mediacenter/xbmc/build +++ b/packages/mediacenter/xbmc/build @@ -88,9 +88,6 @@ fi if [ "$CEC_SUPPORT" = yes ]; then XBMC_CEC="--enable-libcec" - if [ "$OPENMAX" = "bcm2835-driver" ]; then - XBMC_CEC="$XBMC_CEC --enable-rpi-cec-api" - fi else XBMC_CEC="--disable-libcec" fi From 951a7b1d2e16f59e6b5a8b16ab92c084d29bb201 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Dec 2012 12:13:49 +0100 Subject: [PATCH 27/45] xbmc: update to xbmc-84fe311 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- ...-Confluence-84fe311-001-add_oe_settings_to_homescreen.patch} | 0 packages/mediacenter/xbmc/meta | 2 +- ...> xbmc-84fe311-001-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...S-0.1.patch => xbmc-84fe311-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...uild-0.1.patch => xbmc-84fe311-311-fix_rsxs_build-0.1.patch} | 0 ...> xbmc-84fe311-321-texturepacker-hostflags-and-rework.patch} | 0 ...11-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} | 0 ...-0.1.patch => xbmc-84fe311-452-change_lcd_content-0.1.patch} | 0 ...atch => xbmc-84fe311-453-add_openelec.tv_RSS_news-0.1.patch} | 0 ...h-0.1.patch => xbmc-84fe311-454-disable_backslash-0.1.patch} | 0 ....1.patch => xbmc-84fe311-457-fix_connection_check-0.1.patch} | 0 ...0.1.patch => xbmc-84fe311-463-add_remote_devinput-0.1.patch} | 0 13 files changed, 2 insertions(+), 2 deletions(-) rename packages/mediacenter/xbmc-theme-Confluence/patches/{xbmc-theme-Confluence-74b907c-001-add_oe_settings_to_homescreen.patch => xbmc-theme-Confluence-84fe311-001-add_oe_settings_to_homescreen.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-74b907c-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-84fe311-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-74b907c-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-84fe311-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-74b907c-311-fix_rsxs_build-0.1.patch => xbmc-84fe311-311-fix_rsxs_build-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-74b907c-321-texturepacker-hostflags-and-rework.patch => xbmc-84fe311-321-texturepacker-hostflags-and-rework.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-74b907c-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch => xbmc-84fe311-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-74b907c-452-change_lcd_content-0.1.patch => xbmc-84fe311-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-74b907c-453-add_openelec.tv_RSS_news-0.1.patch => xbmc-84fe311-453-add_openelec.tv_RSS_news-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-74b907c-454-disable_backslash-0.1.patch => xbmc-84fe311-454-disable_backslash-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-74b907c-457-fix_connection_check-0.1.patch => xbmc-84fe311-457-fix_connection_check-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-74b907c-463-add_remote_devinput-0.1.patch => xbmc-84fe311-463-add_remote_devinput-0.1.patch} (100%) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 059c7a343c..59fe3ef40c 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="74b907c" +PKG_VERSION="84fe311" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-74b907c-001-add_oe_settings_to_homescreen.patch b/packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-84fe311-001-add_oe_settings_to_homescreen.patch similarity index 100% rename from packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-74b907c-001-add_oe_settings_to_homescreen.patch rename to packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-84fe311-001-add_oe_settings_to_homescreen.patch diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 015f28fa15..d541ed9191 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="74b907c" +PKG_VERSION="84fe311" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-74b907c-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-84fe311-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-74b907c-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-84fe311-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-74b907c-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-84fe311-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-74b907c-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-84fe311-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-74b907c-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-84fe311-311-fix_rsxs_build-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-74b907c-311-fix_rsxs_build-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-84fe311-311-fix_rsxs_build-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-74b907c-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc/patches/xbmc-84fe311-321-texturepacker-hostflags-and-rework.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-74b907c-321-texturepacker-hostflags-and-rework.patch rename to packages/mediacenter/xbmc/patches/xbmc-84fe311-321-texturepacker-hostflags-and-rework.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-74b907c-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-84fe311-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-74b907c-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-84fe311-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-74b907c-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-84fe311-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-74b907c-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-84fe311-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-74b907c-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-84fe311-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-74b907c-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-84fe311-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-74b907c-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-84fe311-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-74b907c-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-84fe311-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-74b907c-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-84fe311-457-fix_connection_check-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-74b907c-457-fix_connection_check-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-84fe311-457-fix_connection_check-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-74b907c-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-84fe311-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-74b907c-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-84fe311-463-add_remote_devinput-0.1.patch From df423cab0c369f2160726ad62bc2ed57cfa33938 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Dec 2012 12:14:58 +0100 Subject: [PATCH 28/45] xf86-video-intel: update to xf86-video-intel-2.20.17 Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-intel/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-intel/meta b/packages/x11/driver/xf86-video-intel/meta index 6495d7f675..3329f082bc 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.20.16" +PKG_VERSION="2.20.17" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" From 714d84edec1116440ece0aa4c475a5f8abe6c790 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Dec 2012 12:16:01 +0100 Subject: [PATCH 29/45] Revert "syslinux: update to syslinux-5.00" This reverts commit c5541beedc22ad998248b207461a99e378458ea2. --- packages/tools/syslinux/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/syslinux/meta b/packages/tools/syslinux/meta index ceca50af21..fd9c8432e8 100644 --- a/packages/tools/syslinux/meta +++ b/packages/tools/syslinux/meta @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="syslinux" -PKG_VERSION="5.00" +PKG_VERSION="4.06" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="GPL" PKG_SITE="http://syslinux.zytor.com/" -PKG_URL="http://www.kernel.org/pub/linux/utils/boot/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://www.kernel.org/pub/linux/utils/boot/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" PKG_BUILD_DEPENDS="toolchain util-linux e2fsprogs" PKG_PRIORITY="optional" From fbdd7cda1daff043b82d25fd2c6e6145367eff97 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Dec 2012 12:46:31 +0100 Subject: [PATCH 30/45] gettext: update to gettext-0.18.2 Signed-off-by: Stephan Raue --- .../toolchain/devel/autotools/gettext/meta | 2 +- .../patches/gettext-0.18.1.1-gets.patch | 42 ------------------- ...h => gettext-0.18.2-non_interactive.patch} | 0 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 packages/toolchain/devel/autotools/gettext/patches/gettext-0.18.1.1-gets.patch rename packages/toolchain/devel/autotools/gettext/patches/{gettext-0.18.1.1-non_interactive.patch => gettext-0.18.2-non_interactive.patch} (100%) diff --git a/packages/toolchain/devel/autotools/gettext/meta b/packages/toolchain/devel/autotools/gettext/meta index b23fea3423..93588f4152 100644 --- a/packages/toolchain/devel/autotools/gettext/meta +++ b/packages/toolchain/devel/autotools/gettext/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="gettext" -PKG_VERSION="0.18.1.1" +PKG_VERSION="0.18.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/toolchain/devel/autotools/gettext/patches/gettext-0.18.1.1-gets.patch b/packages/toolchain/devel/autotools/gettext/patches/gettext-0.18.1.1-gets.patch deleted file mode 100644 index daca7742ca..0000000000 --- a/packages/toolchain/devel/autotools/gettext/patches/gettext-0.18.1.1-gets.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/gettext-runtime/gnulib-lib/stdio.in.h b/gettext-runtime/gnulib-lib/stdio.in.h -index c43848e..ae05c26 100644 ---- a/gettext-runtime/gnulib-lib/stdio.in.h -+++ b/gettext-runtime/gnulib-lib/stdio.in.h -@@ -141,7 +141,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ - #undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+#endif - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ -diff --git a/gettext-tools/gnulib-lib/stdio.in.h b/gettext-tools/gnulib-lib/stdio.in.h -index c43848e..ae05c26 100644 ---- a/gettext-tools/gnulib-lib/stdio.in.h -+++ b/gettext-tools/gnulib-lib/stdio.in.h -@@ -141,7 +141,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ - #undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+#endif - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ -diff --git a/gettext-tools/libgettextpo/stdio.in.h b/gettext-tools/libgettextpo/stdio.in.h -index c43848e..ae05c26 100644 ---- a/gettext-tools/libgettextpo/stdio.in.h -+++ b/gettext-tools/libgettextpo/stdio.in.h -@@ -141,7 +141,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ - #undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+#endif - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ diff --git a/packages/toolchain/devel/autotools/gettext/patches/gettext-0.18.1.1-non_interactive.patch b/packages/toolchain/devel/autotools/gettext/patches/gettext-0.18.2-non_interactive.patch similarity index 100% rename from packages/toolchain/devel/autotools/gettext/patches/gettext-0.18.1.1-non_interactive.patch rename to packages/toolchain/devel/autotools/gettext/patches/gettext-0.18.2-non_interactive.patch From caaadd5b603d3f080f8459245d8b7f3905ac5970 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Dec 2012 12:47:00 +0100 Subject: [PATCH 31/45] mysql: update to mysql-5.1.67 Signed-off-by: Stephan Raue --- packages/databases/mysql/meta | 2 +- ...osscompiling.patch => mysql-5.1.67-010_crosscompiling.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/databases/mysql/patches/{mysql-5.1.66-010_crosscompiling.patch => mysql-5.1.67-010_crosscompiling.patch} (100%) diff --git a/packages/databases/mysql/meta b/packages/databases/mysql/meta index f62cb29606..2d621ac651 100644 --- a/packages/databases/mysql/meta +++ b/packages/databases/mysql/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="mysql" -PKG_VERSION="5.1.66" +PKG_VERSION="5.1.67" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" diff --git a/packages/databases/mysql/patches/mysql-5.1.66-010_crosscompiling.patch b/packages/databases/mysql/patches/mysql-5.1.67-010_crosscompiling.patch similarity index 100% rename from packages/databases/mysql/patches/mysql-5.1.66-010_crosscompiling.patch rename to packages/databases/mysql/patches/mysql-5.1.67-010_crosscompiling.patch From d2286012b3a216fc45679f2ee062b0d7639092e6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Dec 2012 12:47:40 +0100 Subject: [PATCH 32/45] sed: update to sed-4.2.2 Signed-off-by: Stephan Raue --- packages/toolchain/sysutils/sed/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolchain/sysutils/sed/meta b/packages/toolchain/sysutils/sed/meta index 3696a997b3..6775c01dbb 100644 --- a/packages/toolchain/sysutils/sed/meta +++ b/packages/toolchain/sysutils/sed/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="sed" -PKG_VERSION="4.2.1" +PKG_VERSION="4.2.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 2b42d0caf6fca8d10e891119c7103b4fe378b10d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Dec 2012 12:48:00 +0100 Subject: [PATCH 33/45] libmicrohttpd: update to libmicrohttpd-0.9.24 Signed-off-by: Stephan Raue --- packages/web/libmicrohttpd/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web/libmicrohttpd/meta b/packages/web/libmicrohttpd/meta index 95bd09601a..0c99bdeb41 100644 --- a/packages/web/libmicrohttpd/meta +++ b/packages/web/libmicrohttpd/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libmicrohttpd" -PKG_VERSION="0.9.22" +PKG_VERSION="0.9.24" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 2fa66b2c0dbe2bd593dc237a0d603d05a66207d0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Dec 2012 12:58:34 +0100 Subject: [PATCH 34/45] php: update to php-5.4.10 Signed-off-by: Stephan Raue --- packages/lang/php/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/lang/php/meta b/packages/lang/php/meta index 9ef1a06c91..27e4fca3e0 100644 --- a/packages/lang/php/meta +++ b/packages/lang/php/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="php" -PKG_VERSION="5.4.8" +PKG_VERSION="5.4.10" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OpenSource" From 2e953faaf1013cd5c82d607f3942d5508d283737 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 27 Dec 2012 14:31:24 +0200 Subject: [PATCH 35/45] systemd: disable building the man page index and systemd-python --- packages/sysutils/systemd/build | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/sysutils/systemd/build b/packages/sysutils/systemd/build index 76876d886f..815d8332bc 100755 --- a/packages/sysutils/systemd/build +++ b/packages/sysutils/systemd/build @@ -51,6 +51,7 @@ cd $PKG_BUILD --disable-pam \ --disable-acl \ --enable-xattr \ + --without-python \ --disable-gcrypt \ --disable-audit \ --disable-libcryptsetup \ From e9cc5d1ac024023b5cde9ffdd225acf1e67146c1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 27 Dec 2012 15:22:15 +0100 Subject: [PATCH 36/45] xbmc-addon-xvdr: fix build, use our CXXFLAGS too Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-addon-xvdr/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-addon-xvdr/build b/packages/mediacenter/xbmc-addon-xvdr/build index 3966e63a04..f3262a0183 100755 --- a/packages/mediacenter/xbmc-addon-xvdr/build +++ b/packages/mediacenter/xbmc-addon-xvdr/build @@ -28,7 +28,7 @@ cd $PKG_BUILD touch NEWS AUTHORS ChangeLog do_autoreconf -CXXFLAGS="-DZLIB_INTERNAL=1" \ +CXXFLAGS="$CXXFLAGS -DZLIB_INTERNAL=1" \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr/share/xbmc \ From 702ef6f6b42056475d5b09ed728538362874f081 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 28 Dec 2012 12:01:42 +0200 Subject: [PATCH 37/45] libvdpau: fix build depends --- packages/multimedia/libvdpau/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/multimedia/libvdpau/meta b/packages/multimedia/libvdpau/meta index a9c3707c21..cefa3c1dbf 100644 --- a/packages/multimedia/libvdpau/meta +++ b/packages/multimedia/libvdpau/meta @@ -26,7 +26,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://freedesktop.org/wiki/Software/VDPAU" PKG_URL="http://people.freedesktop.org/~aplattner/vdpau/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="libX11" -PKG_BUILD_DEPENDS="toolchain libX11" +PKG_BUILD_DEPENDS="toolchain libX11 dri2proto libXext" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="libvdpau: a Video Decode and Presentation API for UNIX." From 55f64448225ef216155cc0560c802b02f8ba6646 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 28 Dec 2012 13:55:40 +0100 Subject: [PATCH 38/45] connman: update to connman-1.10 Signed-off-by: Stephan Raue --- packages/network/connman/build | 2 +- packages/network/connman/install | 19 +++++++++++++++++++ packages/network/connman/meta | 2 +- ... connman-1.10-do-not-cleanup-routes.patch} | 0 4 files changed, 21 insertions(+), 2 deletions(-) rename packages/network/connman/patches/{connman-1.9-do-not-cleanup-routes.patch => connman-1.10-do-not-cleanup-routes.patch} (100%) diff --git a/packages/network/connman/build b/packages/network/connman/build index 5fb935c068..9f46026db1 100755 --- a/packages/network/connman/build +++ b/packages/network/connman/build @@ -27,7 +27,7 @@ if [ "$PPTP_SUPPORT" = yes ]; then export PPPD="/usr/sbin/pppd" export PPTP="/usr/sbin/pptp" else - CONNMAN_PPP="--disable-pptp" + CONNMAN_PPTP="--disable-pptp" fi if [ "$OPENVPN_SUPPORT" = yes ]; then diff --git a/packages/network/connman/install b/packages/network/connman/install index 875465ea60..c7added2b3 100755 --- a/packages/network/connman/install +++ b/packages/network/connman/install @@ -51,3 +51,22 @@ mkdir -p $INSTALL/usr/sbin mkdir -p $INSTALL/usr/config cp $PKG_DIR/config/hosts.conf $INSTALL/usr/config + +if [ "$PPTP_SUPPORT" = yes -o "$OPENVPN_SUPPORT" = yes ]; then + mkdir -p $INSTALL/etc/dbus-1/system.d + cp $PKG_BUILD/vpn/connman-vpn-dbus.conf $INSTALL/etc/dbus-1/system.d + + mkdir -p $INSTALL/usr/lib/connman/plugins-vpn + cp -P $PKG_BUILD/vpn/plugins/.libs/*.so $INSTALL/usr/lib/connman/plugins-vpn || true + + mkdir -p $INSTALL/usr/sbin + cp -P $PKG_BUILD/vpn/connman-vpnd $INSTALL/usr/sbin + + mkdir -p $INSTALL/usr/share/dbus-1/system-services + cp -P $PKG_BUILD/vpn/net.connman.vpn.service $INSTALL/usr/share/dbus-1/system-services +fi + +if [ "$OPENVPN_SUPPORT" = yes ]; then + mkdir -p $INSTALL/usr/lib/connman/scripts + cp -P $PKG_BUILD/scripts/openvpn-script $INSTALL/usr/lib/connman/scripts +fi diff --git a/packages/network/connman/meta b/packages/network/connman/meta index bfab7a6b5f..400cf2e491 100644 --- a/packages/network/connman/meta +++ b/packages/network/connman/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="connman" -PKG_VERSION="1.9" +PKG_VERSION="1.10" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/connman/patches/connman-1.9-do-not-cleanup-routes.patch b/packages/network/connman/patches/connman-1.10-do-not-cleanup-routes.patch similarity index 100% rename from packages/network/connman/patches/connman-1.9-do-not-cleanup-routes.patch rename to packages/network/connman/patches/connman-1.10-do-not-cleanup-routes.patch From c2ddd5672c5a9aaee6704bb41173e67ca86b85bd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 28 Dec 2012 15:09:47 +0100 Subject: [PATCH 39/45] bcm2835-driver: update to bcm2835-driver-76d0ac3 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 beee8bad35..a23f7da4cd 100644 --- a/packages/graphics/bcm2835-driver/meta +++ b/packages/graphics/bcm2835-driver/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-driver" -PKG_VERSION="3bd073e" +PKG_VERSION="76d0ac3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="nonfree" From 91599af2b6d615844e8b938dc683a33c38cc9847 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 28 Dec 2012 15:10:08 +0100 Subject: [PATCH 40/45] bcm2835-bootloader: update to bcm2835-bootloader-76d0ac3 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 6127ac7e08..4472fc1d29 100644 --- a/packages/tools/bcm2835-bootloader/meta +++ b/packages/tools/bcm2835-bootloader/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-bootloader" -PKG_VERSION="3bd073e" +PKG_VERSION="76d0ac3" PKG_REV="1" PKG_ARCH="arm" PKG_LICENSE="nonfree" From 74dac2ea0032107a0664a4bbd0ca424125a429b6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 28 Dec 2012 15:10:45 +0100 Subject: [PATCH 41/45] projects/RPi: update RPi support patch Signed-off-by: Stephan Raue --- ...=> linux-3.6-01-RPi_support-aa270a5.patch} | 1397 +++++++++++++---- 1 file changed, 1052 insertions(+), 345 deletions(-) rename projects/RPi/patches/linux/{linux-3.6-01-RPi_support-197d15b.patch => linux-3.6-01-RPi_support-aa270a5.patch} (97%) diff --git a/projects/RPi/patches/linux/linux-3.6-01-RPi_support-197d15b.patch b/projects/RPi/patches/linux/linux-3.6-01-RPi_support-aa270a5.patch similarity index 97% rename from projects/RPi/patches/linux/linux-3.6-01-RPi_support-197d15b.patch rename to projects/RPi/patches/linux/linux-3.6-01-RPi_support-aa270a5.patch index fed9df7178..deb5127f3a 100644 --- a/projects/RPi/patches/linux/linux-3.6-01-RPi_support-197d15b.patch +++ b/projects/RPi/patches/linux/linux-3.6-01-RPi_support-aa270a5.patch @@ -1,6 +1,6 @@ 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 2012-12-19 16:01:29.437339342 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_cutdown_defconfig 2012-12-28 12:40:25.436604240 +0100 @@ -0,0 +1,546 @@ +CONFIG_EXPERIMENTAL=y +CONFIG_LOCALVERSION="-cutdown" @@ -550,7 +550,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 2012-12-19 16:01:29.434339361 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_defconfig 2012-12-28 12:40:25.434604266 +0100 @@ -0,0 +1,1054 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_EXPERIMENTAL=y @@ -1347,7 +1347,6 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.y/arch/a +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m -+CONFIG_USB_UAS=y +CONFIG_USB_LIBUSUAL=y +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m @@ -1434,6 +1433,7 @@ diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.y/arch/a +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m +CONFIG_RTC_CLASS=y ++# CONFIG_RTC_HCTOSYS is not set +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1672=m @@ -1608,7 +1608,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 2012-12-19 16:01:29.431339382 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_emergency_defconfig 2012-12-28 12:40:25.433604279 +0100 @@ -0,0 +1,532 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -2144,7 +2144,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 2012-12-19 16:01:29.423339436 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_quick_defconfig 2012-12-28 12:40:25.428604344 +0100 @@ -0,0 +1,298 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_EXPERIMENTAL=y @@ -2446,7 +2446,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 2012-12-19 16:01:29.474339093 +0100 ++++ linux-rpi-3.6.y/arch/arm/include/asm/fiq.h 2012-12-28 12:40:25.455603997 +0100 @@ -42,6 +42,7 @@ /* helpers defined in fiqasm.S: */ extern void __set_fiq_regs(unsigned long const *regs); @@ -2457,7 +2457,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 2012-12-19 16:01:29.489338992 +0100 ++++ linux-rpi-3.6.y/arch/arm/Kconfig 2012-12-28 12:40:25.464603881 +0100 @@ -999,6 +999,23 @@ help Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx). @@ -2492,7 +2492,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 2012-12-19 16:01:29.661337835 +0100 ++++ linux-rpi-3.6.y/arch/arm/Kconfig.debug 2012-12-28 12:40:25.554602721 +0100 @@ -371,6 +371,14 @@ For more details about semihosting, please see chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd. @@ -2510,7 +2510,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 2012-12-19 16:01:29.088341687 +0100 ++++ linux-rpi-3.6.y/arch/arm/kernel/fiqasm.S 2012-12-28 12:40:25.238606788 +0100 @@ -47,3 +47,7 @@ mov r0, r0 @ avoid hazard prior to ARMv4 mov pc, lr @@ -2521,7 +2521,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 2012-12-19 16:01:29.098341619 +0100 ++++ linux-rpi-3.6.y/arch/arm/kernel/fiq.c 2012-12-28 12:40:25.244606710 +0100 @@ -137,6 +137,7 @@ EXPORT_SYMBOL(set_fiq_handler); EXPORT_SYMBOL(__set_fiq_regs); /* defined in fiqasm.S */ @@ -2532,7 +2532,7 @@ diff -Naur linux-3.6.11/arch/arm/kernel/fiq.c linux-rpi-3.6.y/arch/arm/kernel/fi EXPORT_SYMBOL(enable_fiq); 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 2012-12-19 16:01:28.757343912 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.c 2012-12-28 12:40:25.038609362 +0100 @@ -0,0 +1,227 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -2763,7 +2763,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 2012-12-19 16:01:28.758343905 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.h 2012-12-28 12:40:25.038609362 +0100 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -2794,8 +2794,8 @@ 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 2012-12-19 16:01:28.757343912 +0100 -@@ -0,0 +1,949 @@ ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.c 2012-12-28 12:40:25.037609376 +0100 +@@ -0,0 +1,950 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c + * @@ -3560,13 +3560,14 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.6.y/arch/arm + unsigned long stc; + + switch (mode) { -+ case CLOCK_EVT_MODE_PERIODIC: -+ stc = readl(__io_address(ST_BASE + 0x04)); -+ writel(stc + TIMER_PERIOD, __io_address(ST_BASE + 0x18)); /* stc3 */ -+ break; -+ case CLOCK_EVT_MODE_ONESHOT: -+ case CLOCK_EVT_MODE_UNUSED: ++ case CLOCK_EVT_MODE_ONESHOT: /* Leave the timer disabled, .set_next_event will enable it */ + case CLOCK_EVT_MODE_SHUTDOWN: ++ break; ++ case CLOCK_EVT_MODE_PERIODIC: ++ ++ case CLOCK_EVT_MODE_UNUSED: ++ case CLOCK_EVT_MODE_RESUME: ++ + default: + printk(KERN_ERR "timer_set_mode: unhandled mode:%d\n", + (int)mode); @@ -3747,7 +3748,7 @@ 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 2012-12-19 16:01:28.757343912 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708_gpio.c 2012-12-28 12:40:25.038609362 +0100 @@ -0,0 +1,339 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -4014,7 +4015,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-3.6.y/arc + struct resource *res; + int err = 0; + -+ printk(KERN_ERR DRIVER_NAME ": bcm2708_gpio_probe %p\n", dev); ++ printk(KERN_INFO DRIVER_NAME ": bcm2708_gpio_probe %p\n", dev); + + ucb = kzalloc(sizeof(*ucb), GFP_KERNEL); + if (NULL == ucb) { @@ -4090,7 +4091,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 2012-12-19 16:01:28.757343912 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.h 2012-12-28 12:40:25.037609376 +0100 @@ -0,0 +1,51 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -4145,7 +4146,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 2012-12-19 16:01:28.756343919 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.c 2012-12-28 12:40:25.037609376 +0100 @@ -0,0 +1,61 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.c @@ -4210,7 +4211,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 2012-12-19 16:01:28.757343912 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.h 2012-12-28 12:40:25.038609362 +0100 @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.h @@ -4238,7 +4239,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 2012-12-19 16:01:28.758343905 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/delay.S 2012-12-28 12:40:25.038609362 +0100 @@ -0,0 +1,20 @@ +/* + * linux/arch/arm/lib/delay.S @@ -4262,7 +4263,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 2012-12-19 16:01:28.758343905 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/dma.c 2012-12-28 12:40:25.038609362 +0100 @@ -0,0 +1,397 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -4663,8 +4664,8 @@ 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 2012-12-19 16:01:28.763343872 +0100 -@@ -0,0 +1,755 @@ ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/dmaer.c 2012-12-28 12:40:25.041609324 +0100 +@@ -0,0 +1,887 @@ +#include +#include +#include @@ -4678,6 +4679,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m +#include +#include +#include ++#include + +#include +#include @@ -4685,10 +4687,30 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m +#include + +#include ++#include + -+MODULE_LICENSE("Dual BSD/GPL"); ++#ifdef ECLIPSE_IGNORE + -+//#define inline ++#define __user ++#define __init ++#define __exit ++#define __iomem ++#define KERN_DEBUG ++#define KERN_ERR ++#define KERN_WARNING ++#define KERN_INFO ++#define _IOWR(a, b, c) b ++#define _IOW(a, b, c) b ++#define _IO(a, b) b ++ ++#endif ++ ++//#define inline ++ ++#define PRINTK(args...) printk(args) ++//#define PRINTK_VERBOSE(args...) printk(args) ++//#define PRINTK(args...) ++#define PRINTK_VERBOSE(args...) + +/***** TYPES ****/ +#define PAGES_PER_LIST 500 @@ -4706,6 +4728,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + struct PageList *m_pPageTail; + unsigned int m_refCount; +}; ++ +struct DmaControlBlock +{ + unsigned int m_transferInfo; @@ -4745,6 +4768,15 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m +//set the address range through which the user address is assumed to already by a physical address +#define DMA_SET_MIN_PHYS _IOW(DMA_MAGIC, 7, unsigned long) +#define DMA_SET_MAX_PHYS _IOW(DMA_MAGIC, 8, unsigned long) ++#define DMA_SET_PHYS_OFFSET _IOW(DMA_MAGIC, 9, unsigned long) ++ ++//used to define the size for the CMA-based allocation *in pages*, can only be done once once the file is opened ++#define DMA_CMA_SET_SIZE _IOW(DMA_MAGIC, 10, unsigned long) ++ ++//used to get the version of the module, to test for a capability ++#define DMA_GET_VERSION _IO(DMA_MAGIC, 99) ++ ++#define VERSION_NUMBER 1 + +#define VIRT_TO_BUS_CACHE_SIZE 8 + @@ -4756,19 +4788,24 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m +static int Mmap(struct file *pFile, struct vm_area_struct *pVma); + +/***** VMA OPS ****/ -+static void VmaOpen(struct vm_area_struct *pVma); -+static void VmaClose(struct vm_area_struct *pVma); -+static int VmaFault(struct vm_area_struct *pVma, struct vm_fault *pVmf); ++static void VmaOpen4k(struct vm_area_struct *pVma); ++static void VmaClose4k(struct vm_area_struct *pVma); ++static int VmaFault4k(struct vm_area_struct *pVma, struct vm_fault *pVmf); ++ ++/**** DMA PROTOTYPES */ ++static struct DmaControlBlock __user *DmaPrepare(struct DmaControlBlock __user *pUserCB, int *pError); ++static int DmaKick(struct DmaControlBlock __user *pUserCB); ++static void DmaWaitAll(void); + +/**** GENERIC ****/ +static int __init dmaer_init(void); +static void __exit dmaer_exit(void); + +/*** OPS ***/ -+static struct vm_operations_struct g_vmOps = { -+ .open = VmaOpen, -+ .close = VmaClose, -+ .fault = VmaFault, ++static struct vm_operations_struct g_vmOps4k = { ++ .open = VmaOpen4k, ++ .close = VmaClose4k, ++ .fault = VmaFault4k, +}; + +static struct file_operations g_fOps = { @@ -4784,13 +4821,23 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + +/***** GLOBALS ******/ +static dev_t g_majorMinor; -+static atomic_t g_oneLock = ATOMIC_INIT(1); ++ ++//tracking usage of the two files ++static atomic_t g_oneLock4k = ATOMIC_INIT(1); ++ ++//device operations +static struct cdev g_cDev; +static int g_trackedPages = 0; ++ ++//dma control +static unsigned int *g_pDmaChanBase; +static int g_dmaIrq; +static int g_dmaChan; + ++//cma allocation ++static int g_cmaHandle; ++ ++//user virtual to bus address translation acceleration +static unsigned long g_virtAddr[VIRT_TO_BUS_CACHE_SIZE]; +static unsigned long g_busAddr[VIRT_TO_BUS_CACHE_SIZE]; +static unsigned long g_cbVirtAddr; @@ -4799,8 +4846,9 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m +static int g_cacheHit, g_cacheMiss; + +//off by default -+static void __user *g_pMinPhys = (void __user *)-1; -+static void __user *g_pMaxPhys = (void __user *)0; ++static void __user *g_pMinPhys; ++static void __user *g_pMaxPhys; ++static unsigned long g_physOffset; + +/****** CACHE OPERATIONS ********/ +static inline void FlushAddrCache(void) @@ -4832,6 +4880,9 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + if (mapped <= 0) //error + return 0; + ++ PRINTK_VERBOSE(KERN_DEBUG "user virtual %p arm phys %p bus %p\n", ++ pUser, page_address(pPage), (void __iomem *)__virt_to_bus(page_address(pPage))); ++ + //get the arm physical address + phys = page_address(pPage) + offset_in_page(pUser); + page_cache_release(pPage); @@ -4878,8 +4929,8 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + + if (pUser >= g_pMinPhys && pUser < g_pMaxPhys) + { -+// printk(KERN_DEBUG "user->phys passthrough on %p\n", pUser); -+ return (void __iomem *)__virt_to_bus(pUser); ++ PRINTK_VERBOSE(KERN_DEBUG "user->phys passthrough on %p\n", pUser); ++ return (void __iomem *)((unsigned long)pUser + g_physOffset); + } + + //check the cache for our entry @@ -4913,25 +4964,57 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m +/***** FILE OPERATIONS ****/ +static int Open(struct inode *pInode, struct file *pFile) +{ -+ printk(KERN_DEBUG "file opening\n"); ++ PRINTK(KERN_DEBUG "file opening: %d/%d\n", imajor(pInode), iminor(pInode)); + -+ //only one at a time -+ if (!atomic_dec_and_test(&g_oneLock)) ++ //check which device we are ++ if (iminor(pInode) == 0) //4k + { -+ atomic_inc(&g_oneLock); -+ return -EBUSY; ++ //only one at a time ++ if (!atomic_dec_and_test(&g_oneLock4k)) ++ { ++ atomic_inc(&g_oneLock4k); ++ return -EBUSY; ++ } + } ++ else ++ return -EINVAL; + ++ //todo there will be trouble if two different processes open the files ++ ++ //reset after any file is opened ++ g_pMinPhys = (void __user *)-1; ++ g_pMaxPhys = (void __user *)0; ++ g_physOffset = 0; ++ g_cmaHandle = 0; ++ + return 0; +} + +static int Release(struct inode *pInode, struct file *pFile) +{ -+ printk(KERN_DEBUG "file closing, %d pages tracked\n", g_trackedPages); ++ PRINTK(KERN_DEBUG "file closing, %d pages tracked\n", g_trackedPages); + if (g_trackedPages) -+ printk(KERN_ERR "we\'re leaking memory!\n"); ++ PRINTK(KERN_ERR "we\'re leaking memory!\n"); + -+ atomic_inc(&g_oneLock); ++ //wait for any dmas to finish ++ DmaWaitAll(); ++ ++ //free this memory on the application closing the file or it crashing (implicitly closing the file) ++ if (g_cmaHandle) ++ { ++ PRINTK(KERN_DEBUG "unlocking vc memory\n"); ++ if (UnlockVcMemory(g_cmaHandle)) ++ PRINTK(KERN_ERR "uh-oh, unable to unlock vc memory!\n"); ++ PRINTK(KERN_DEBUG "releasing vc memory\n"); ++ if (ReleaseVcMemory(g_cmaHandle)) ++ PRINTK(KERN_ERR "uh-oh, unable to release vc memory!\n"); ++ } ++ ++ if (iminor(pInode) == 0) ++ atomic_inc(&g_oneLock4k); ++ else ++ return -EINVAL; ++ + return 0; +} + @@ -4941,18 +5024,17 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + struct DmaControlBlock __user *pUNext; + void __iomem *pSourceBus, __iomem *pDestBus; + -+ + //get the control block into kernel memory so we can work on it + if (copy_from_user(&kernCB, pUserCB, sizeof(struct DmaControlBlock)) != 0) + { -+ printk(KERN_ERR "copy_from_user failed for user cb %p\n", pUserCB); ++ PRINTK(KERN_ERR "copy_from_user failed for user cb %p\n", pUserCB); + *pError = 1; + return 0; + } + + if (kernCB.m_pSourceAddr == 0 || kernCB.m_pDestAddr == 0) + { -+ printk(KERN_ERR "faulty source (%p) dest (%p) addresses for user cb %p\n", ++ PRINTK(KERN_ERR "faulty source (%p) dest (%p) addresses for user cb %p\n", + kernCB.m_pSourceAddr, kernCB.m_pDestAddr, pUserCB); + *pError = 1; + return 0; @@ -4963,7 +5045,9 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + + if (!pSourceBus || !pDestBus) + { -+ printk(KERN_ERR "virtual to bus translation failure for source/dest\n"); ++ PRINTK(KERN_ERR "virtual to bus translation failure for source/dest %p/%p->%p/%p\n", ++ kernCB.m_pSourceAddr, kernCB.m_pDestAddr, ++ pSourceBus, pDestBus); + *pError = 1; + return 0; + } @@ -4971,6 +5055,8 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + //update the user structure with the new bus addresses + kernCB.m_pSourceAddr = pSourceBus; + kernCB.m_pDestAddr = pDestBus; ++ ++ PRINTK_VERBOSE(KERN_DEBUG "final source %p dest %p\n", kernCB.m_pSourceAddr, kernCB.m_pDestAddr); + + //sort out the bus address for the next block + pUNext = kernCB.m_pNext; @@ -4982,7 +5068,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + + if (!pNextBus) + { -+ printk(KERN_ERR "virtual to bus translation failure for m_pNext\n"); ++ PRINTK(KERN_ERR "virtual to bus translation failure for m_pNext\n"); + *pError = 1; + return 0; + } @@ -4994,7 +5080,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + //write it back to user space + if (copy_to_user(pUserCB, &kernCB, sizeof(struct DmaControlBlock)) != 0) + { -+ printk(KERN_ERR "copy_to_user failed for cb %p\n", pUserCB); ++ PRINTK(KERN_ERR "copy_to_user failed for cb %p\n", pUserCB); + *pError = 1; + return 0; + } @@ -5012,7 +5098,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + pBusCB = UserVirtualToBusViaCbCache(pUserCB); + if (!pBusCB) + { -+ printk(KERN_ERR "virtual to bus translation failure for cb\n"); ++ PRINTK(KERN_ERR "virtual to bus translation failure for cb\n"); + return 1; + } + @@ -5028,9 +5114,9 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + int counter = 0; + volatile int inner_count; + volatile unsigned int cs; -+ //unsigned long time_before, time_after; ++ unsigned long time_before, time_after; + -+ //time_before = jiffies; ++ time_before = jiffies; + //bcm_dma_wait_idle(g_pDmaChanBase); + dsb(); + @@ -5047,19 +5133,19 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + //cpu_do_idle(); + if (counter >= 1000000) + { -+ printk(KERN_WARNING "DMA failed to finish in a timely fashion\n"); ++ PRINTK(KERN_WARNING "DMA failed to finish in a timely fashion\n"); + break; + } + } -+ //time_after = jiffies; -+ //printk(KERN_DEBUG "done, counter %d, cs %08x", counter, cs); -+ //printk(KERN_DEBUG "took %ld jiffies, %d HZ\n", time_after - time_before, HZ); ++ time_after = jiffies; ++ PRINTK_VERBOSE(KERN_DEBUG "done, counter %d, cs %08x", counter, cs); ++ PRINTK_VERBOSE(KERN_DEBUG "took %ld jiffies, %d HZ\n", time_after - time_before, HZ); +} + +static long Ioctl(struct file *pFile, unsigned int cmd, unsigned long arg) +{ + int error = 0; -+ //printk(KERN_DEBUG "ioctl cmd %x arg %lx\n", cmd, arg); ++ PRINTK_VERBOSE(KERN_DEBUG "ioctl cmd %x arg %lx\n", cmd, arg); + + switch (cmd) + { @@ -5069,29 +5155,30 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + { + struct DmaControlBlock __user *pUCB = (struct DmaControlBlock *)arg; + int steps = 0; -+ //unsigned long start_time = jiffies; ++ unsigned long start_time = jiffies; ++ (void)start_time; + + //flush our address cache + FlushAddrCache(); + -+// printk(KERN_DEBUG "dma prepare\n"); -+ ++ PRINTK_VERBOSE(KERN_DEBUG "dma prepare\n"); ++ + //do virtual to bus translation for each entry + do + { + pUCB = DmaPrepare(pUCB, &error); + } while (error == 0 && ++steps && pUCB); -+ //printk(KERN_DEBUG "prepare done in %d steps, %ld\n", steps, jiffies - start_time); ++ PRINTK_VERBOSE(KERN_DEBUG "prepare done in %d steps, %ld\n", steps, jiffies - start_time); + + //carry straight on if we want to kick too + if (cmd == DMA_PREPARE || error) + { -+// printk(KERN_DEBUG "falling out\n"); -+ break; ++ PRINTK_VERBOSE(KERN_DEBUG "falling out\n"); ++ return error ? -EINVAL : 0; + } -+ }; ++ } + case DMA_KICK: -+// printk(KERN_DEBUG "dma begin\n"); ++ PRINTK_VERBOSE(KERN_DEBUG "dma begin\n"); + + if (cmd == DMA_KICK) + FlushAddrCache(); @@ -5101,10 +5188,10 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + if (cmd != DMA_PREPARE_KICK_WAIT) + break; +/* case DMA_WAIT_ONE: -+ //printk(KERN_DEBUG "dma wait one\n"); ++ //PRINTK(KERN_DEBUG "dma wait one\n"); + break;*/ + case DMA_WAIT_ALL: -+ //printk(KERN_DEBUG "dma wait all\n"); ++ //PRINTK(KERN_DEBUG "dma wait all\n"); + DmaWaitAll(); + break; + case DMA_MAX_BURST: @@ -5114,14 +5201,54 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + return 5; + case DMA_SET_MIN_PHYS: + g_pMinPhys = (void __user *)arg; -+ printk("min/max user/phys bypass set to %p %p\n", g_pMinPhys, g_pMaxPhys); ++ PRINTK(KERN_DEBUG "min/max user/phys bypass set to %p %p\n", g_pMinPhys, g_pMaxPhys); + break; + case DMA_SET_MAX_PHYS: + g_pMaxPhys = (void __user *)arg; -+ printk("min/max user/phys bypass set to %p %p\n", g_pMinPhys, g_pMaxPhys); ++ PRINTK(KERN_DEBUG "min/max user/phys bypass set to %p %p\n", g_pMinPhys, g_pMaxPhys); + break; ++ case DMA_SET_PHYS_OFFSET: ++ g_physOffset = arg; ++ PRINTK(KERN_DEBUG "user/phys bypass offset set to %ld\n", g_physOffset); ++ break; ++ case DMA_CMA_SET_SIZE: ++ { ++ unsigned int pBusAddr; ++ ++ if (g_cmaHandle) ++ { ++ PRINTK(KERN_ERR "memory has already been allocated (handle %d)\n", g_cmaHandle); ++ return -EINVAL; ++ } ++ ++ PRINTK(KERN_INFO "allocating %ld bytes of VC memory\n", arg * 4096); ++ ++ //get the memory ++ if (AllocateVcMemory(&g_cmaHandle, arg * 4096, 4096, MEM_FLAG_L1_NONALLOCATING | MEM_FLAG_NO_INIT | MEM_FLAG_HINT_PERMALOCK)) ++ { ++ PRINTK(KERN_ERR "failed to allocate %ld bytes of VC memory\n", arg * 4096); ++ g_cmaHandle = 0; ++ return -EINVAL; ++ } ++ ++ //get an address for it ++ PRINTK(KERN_INFO "trying to map VC memory\n"); ++ ++ if (LockVcMemory(&pBusAddr, g_cmaHandle)) ++ { ++ PRINTK(KERN_ERR "failed to map CMA handle %d, releasing memory\n", g_cmaHandle); ++ ReleaseVcMemory(g_cmaHandle); ++ g_cmaHandle = 0; ++ } ++ ++ PRINTK(KERN_INFO "bus address for CMA memory is %x\n", pBusAddr); ++ return pBusAddr; ++ } ++ case DMA_GET_VERSION: ++ PRINTK(KERN_DEBUG "returning version number, %d\n", VERSION_NUMBER); ++ return VERSION_NUMBER; + default: -+ printk(KERN_DEBUG "unknown ioctl: %d\n", cmd); ++ PRINTK(KERN_DEBUG "unknown ioctl: %d\n", cmd); + return -EINVAL; + } + @@ -5130,12 +5257,6 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + +static ssize_t Read(struct file *pFile, char __user *pUser, size_t count, loff_t *offp) +{ -+ /*printk(KERN_DEBUG "file read pFile %p pUser %p count %ld offp %p\n", -+ pFile, pUser, count, offp); -+ printk(KERN_DEBUG "phys pFile %lx pUser %lx offp %lx\n", -+ __pa(pFile), __pa(pUser), __pa(offp)); -+ printk(KERN_DEBUG "bus pFile %lx pUser %lx offp %lx\n", -+ virt_to_bus(pFile), virt_to_bus(pUser), virt_to_bus(offp));*/ + return -EIO; +} + @@ -5144,20 +5265,20 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + struct PageList *pPages; + struct VmaPageList *pVmaList; + -+// printk(KERN_DEBUG "MMAP vma %p, length %ld (%s %d)\n", -+// pVma, pVma->vm_end - pVma->vm_start, -+// current->comm, current->pid); -+// printk(KERN_DEBUG "MMAP %p %d (tracked %d)\n", pVma, current->pid, g_trackedPages); -+ ++ PRINTK_VERBOSE(KERN_DEBUG "MMAP vma %p, length %ld (%s %d)\n", ++ pVma, pVma->vm_end - pVma->vm_start, ++ current->comm, current->pid); ++ PRINTK_VERBOSE(KERN_DEBUG "MMAP %p %d (tracked %d)\n", pVma, current->pid, g_trackedPages); ++ + //make a new page list + pPages = (struct PageList *)kmalloc(sizeof(struct PageList), GFP_KERNEL); + if (!pPages) + { -+ printk(KERN_ERR "couldn\'t allocate a new page list (%s %d)\n", ++ PRINTK(KERN_ERR "couldn\'t allocate a new page list (%s %d)\n", + current->comm, current->pid); + return -ENOMEM; + } -+ ++ + //clear the page list + pPages->m_used = 0; + pPages->m_pNext = 0; @@ -5167,67 +5288,72 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + { + struct VmaPageList *pList; + -+// printk(KERN_DEBUG "new vma list, making new one (%s %d)\n", -+// current->comm, current->pid); -+ ++ PRINTK_VERBOSE(KERN_DEBUG "new vma list, making new one (%s %d)\n", ++ current->comm, current->pid); ++ + //make a new vma list + pList = (struct VmaPageList *)kmalloc(sizeof(struct VmaPageList), GFP_KERNEL); + if (!pList) + { -+ printk(KERN_ERR "couldn\'t allocate vma page list (%s %d)\n", ++ PRINTK(KERN_ERR "couldn\'t allocate vma page list (%s %d)\n", + current->comm, current->pid); + kfree(pPages); + return -ENOMEM; + } -+ ++ + //clear this list + pVma->vm_private_data = (void *)pList; + pList->m_refCount = 0; + } -+ ++ + pVmaList = (struct VmaPageList *)pVma->vm_private_data; -+ ++ + //add it to the vma list + pVmaList->m_pPageHead = pPages; + pVmaList->m_pPageTail = pPages; -+ -+ pVma->vm_ops = &g_vmOps; ++ ++ pVma->vm_ops = &g_vmOps4k; + pVma->vm_flags |= VM_RESERVED; -+ -+ VmaOpen(pVma); -+ ++ ++ VmaOpen4k(pVma); ++ + return 0; +} + +/****** VMA OPERATIONS ******/ + -+static void VmaOpen(struct vm_area_struct *pVma) ++static void VmaOpen4k(struct vm_area_struct *pVma) +{ + struct VmaPageList *pVmaList; + -+// printk(KERN_DEBUG "vma open %p private %p (%s %d), %d live pages\n", pVma, pVma->vm_private_data, current->comm, current->pid, g_trackedPages); -+// printk(KERN_DEBUG "OPEN %p %d %ld pages (tracked pages %d)\n", -+// pVma, current->pid, (pVma->vm_end - pVma->vm_start) >> 12, -+// g_trackedPages); ++ PRINTK_VERBOSE(KERN_DEBUG "vma open %p private %p (%s %d), %d live pages\n", pVma, pVma->vm_private_data, current->comm, current->pid, g_trackedPages); ++ PRINTK_VERBOSE(KERN_DEBUG "OPEN %p %d %ld pages (tracked pages %d)\n", ++ pVma, current->pid, (pVma->vm_end - pVma->vm_start) >> 12, ++ g_trackedPages); + + pVmaList = (struct VmaPageList *)pVma->vm_private_data; + + if (pVmaList) + { + pVmaList->m_refCount++; -+// printk(KERN_DEBUG "ref count is now %d\n", pVmaList->m_refCount); ++ PRINTK_VERBOSE(KERN_DEBUG "ref count is now %d\n", pVmaList->m_refCount); ++ } ++ else ++ { ++ PRINTK_VERBOSE(KERN_DEBUG "err, open but no vma page list\n"); + } -+// else -+// printk(KERN_DEBUG "err, open but no vma page list\n"); +} + -+static void VmaClose(struct vm_area_struct *pVma) ++static void VmaClose4k(struct vm_area_struct *pVma) +{ + struct VmaPageList *pVmaList; + int freed = 0; + -+// printk(KERN_DEBUG "vma close %p private %p (%s %d)\n", pVma, pVma->vm_private_data, current->comm, current->pid); ++ PRINTK_VERBOSE(KERN_DEBUG "vma close %p private %p (%s %d)\n", pVma, pVma->vm_private_data, current->comm, current->pid); + ++ //wait for any dmas to finish ++ DmaWaitAll(); ++ + //find our vma in the list + pVmaList = (struct VmaPageList *)pVma->vm_private_data; + @@ -5240,14 +5366,14 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + + if (pVmaList->m_refCount == 0) + { -+// printk(KERN_DEBUG "found vma, freeing pages (%s %d)\n", -+// current->comm, current->pid); ++ PRINTK_VERBOSE(KERN_DEBUG "found vma, freeing pages (%s %d)\n", ++ current->comm, current->pid); + + pPages = pVmaList->m_pPageHead; + + if (!pPages) + { -+ printk(KERN_ERR "no page list (%s %d)!\n", ++ PRINTK(KERN_ERR "no page list (%s %d)!\n", + current->comm, current->pid); + return; + } @@ -5257,22 +5383,22 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + struct PageList *next; + int count; + -+// printk(KERN_DEBUG "page list (%s %d)\n", -+// current->comm, current->pid); ++ PRINTK_VERBOSE(KERN_DEBUG "page list (%s %d)\n", ++ current->comm, current->pid); + + next = pPages->m_pNext; + for (count = 0; count < pPages->m_used; count++) + { -+// printk(KERN_DEBUG "freeing page %p (%s %d)\n", -+// pPages->m_pPages[count], -+// current->comm, current->pid); ++ PRINTK_VERBOSE(KERN_DEBUG "freeing page %p (%s %d)\n", ++ pPages->m_pPages[count], ++ current->comm, current->pid); + __free_pages(pPages->m_pPages[count], 0); + g_trackedPages--; + freed++; + } + -+// printk(KERN_DEBUG "freeing page list (%s %d)\n", -+// current->comm, current->pid); ++ PRINTK_VERBOSE(KERN_DEBUG "freeing page list (%s %d)\n", ++ current->comm, current->pid); + kfree(pPages); + pPages = next; + } @@ -5281,33 +5407,38 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + kfree(pVmaList); + pVma->vm_private_data = 0; + } -+// else -+// printk(KERN_DEBUG "ref count is %d, not closing\n", pVmaList->m_refCount); ++ else ++ { ++ PRINTK_VERBOSE(KERN_DEBUG "ref count is %d, not closing\n", pVmaList->m_refCount); ++ } + } + else + { -+// printk(KERN_ERR "uh-oh, vma %p not found (%s %d)!\n", pVma, current->comm, current->pid); -+// printk(KERN_ERR "CLOSE ERR\n"); ++ PRINTK_VERBOSE(KERN_ERR "uh-oh, vma %p not found (%s %d)!\n", pVma, current->comm, current->pid); ++ PRINTK_VERBOSE(KERN_ERR "CLOSE ERR\n"); + } + -+// printk(KERN_DEBUG "CLOSE %p %d %d pages (tracked pages %d)", -+// pVma, current->pid, freed, g_trackedPages); ++ PRINTK_VERBOSE(KERN_DEBUG "CLOSE %p %d %d pages (tracked pages %d)", ++ pVma, current->pid, freed, g_trackedPages); + -+// printk(KERN_DEBUG "%d pages open\n", g_trackedPages); ++ PRINTK_VERBOSE(KERN_DEBUG "%d pages open\n", g_trackedPages); +} + -+static int VmaFault(struct vm_area_struct *pVma, struct vm_fault *pVmf) ++static int VmaFault4k(struct vm_area_struct *pVma, struct vm_fault *pVmf) +{ -+// printk(KERN_DEBUG "vma fault for vma %p private %p at offset %ld (%s %d)\n", pVma, pVma->vm_private_data, pVmf->pgoff, -+// current->comm, current->pid); -+ //printk(KERN_DEBUG "FAULT\n"); ++ PRINTK_VERBOSE(KERN_DEBUG "vma fault for vma %p private %p at offset %ld (%s %d)\n", pVma, pVma->vm_private_data, pVmf->pgoff, ++ current->comm, current->pid); ++ PRINTK_VERBOSE(KERN_DEBUG "FAULT\n"); + pVmf->page = alloc_page(GFP_KERNEL); -+ /*if (pVmf->page) -+ printk(KERN_DEBUG "alloc page virtual %p\n", page_address(pVmf->page));*/ + ++ if (pVmf->page) ++ { ++ PRINTK_VERBOSE(KERN_DEBUG "alloc page virtual %p\n", page_address(pVmf->page)); ++ } ++ + if (!pVmf->page) + { -+ printk(KERN_ERR "vma fault oom (%s %d)\n", current->comm, current->pid); ++ PRINTK(KERN_ERR "vma fault oom (%s %d)\n", current->comm, current->pid); + return VM_FAULT_OOM; + } + else @@ -5322,11 +5453,11 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + + if (pVmaList) + { -+// printk(KERN_DEBUG "vma found (%s %d)\n", current->comm, current->pid); ++ PRINTK_VERBOSE(KERN_DEBUG "vma found (%s %d)\n", current->comm, current->pid); + + if (pVmaList->m_pPageTail->m_used == PAGES_PER_LIST) + { -+// printk(KERN_DEBUG "making new page list (%s %d)\n", current->comm, current->pid); ++ PRINTK_VERBOSE(KERN_DEBUG "making new page list (%s %d)\n", current->comm, current->pid); + //making a new page list + pVmaList->m_pPageTail->m_pNext = (struct PageList *)kmalloc(sizeof(struct PageList), GFP_KERNEL); + if (!pVmaList->m_pPageTail->m_pNext) @@ -5338,13 +5469,13 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + pVmaList->m_pPageTail->m_pNext = 0; + } + -+// printk(KERN_DEBUG "adding page to list (%s %d)\n", current->comm, current->pid); ++ PRINTK_VERBOSE(KERN_DEBUG "adding page to list (%s %d)\n", current->comm, current->pid); + + pVmaList->m_pPageTail->m_pPages[pVmaList->m_pPageTail->m_used] = pVmf->page; + pVmaList->m_pPageTail->m_used++; + } + else -+ printk(KERN_ERR "returned page for vma we don\'t know %p (%s %d)\n", pVma, current->comm, current->pid); ++ PRINTK(KERN_ERR "returned page for vma we don\'t know %p (%s %d)\n", pVma, current->comm, current->pid); + + return 0; + } @@ -5356,32 +5487,33 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + int result = alloc_chrdev_region(&g_majorMinor, 0, 1, "dmaer"); + if (result < 0) + { -+ printk(KERN_ERR "unable to get major device number\n"); ++ PRINTK(KERN_ERR "unable to get major device number\n"); + return result; + } + else -+ printk(KERN_DEBUG "major device number %d\n", MAJOR(g_majorMinor)); ++ PRINTK(KERN_DEBUG "major device number %d\n", MAJOR(g_majorMinor)); + -+ printk(KERN_DEBUG "vma list size %d, page list size %d, page size %ld\n", ++ PRINTK(KERN_DEBUG "vma list size %d, page list size %d, page size %ld\n", + sizeof(struct VmaPageList), sizeof(struct PageList), PAGE_SIZE); -+ -+ ++ + //get a dma channel to work with + result = bcm_dma_chan_alloc(BCM_DMA_FEATURE_FAST, (void **)&g_pDmaChanBase, &g_dmaIrq); ++ ++ //uncomment to force to channel 0 + //result = 0; + //g_pDmaChanBase = 0xce808000; + + if (result < 0) + { -+ printk(KERN_ERR "failed to allocate dma channel\n"); ++ PRINTK(KERN_ERR "failed to allocate dma channel\n"); + cdev_del(&g_cDev); + unregister_chrdev_region(g_majorMinor, 1); + } + + //reset the channel -+ printk(KERN_DEBUG "allocated dma channel %d (%p), initial state %08x\n", result, g_pDmaChanBase, *g_pDmaChanBase); ++ PRINTK(KERN_DEBUG "allocated dma channel %d (%p), initial state %08x\n", result, g_pDmaChanBase, *g_pDmaChanBase); + *g_pDmaChanBase = 1 << 31; -+ printk(KERN_DEBUG "post-reset %08x\n", *g_pDmaChanBase); ++ PRINTK(KERN_DEBUG "post-reset %08x\n", *g_pDmaChanBase); + + g_dmaChan = result; + @@ -5397,7 +5529,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + result = cdev_add(&g_cDev, g_majorMinor, 1); + if (result < 0) + { -+ printk(KERN_ERR "failed to add character device\n"); ++ PRINTK(KERN_ERR "failed to add character device\n"); + unregister_chrdev_region(g_majorMinor, 1); + bcm_dma_chan_free(g_dmaChan); + return result; @@ -5408,7 +5540,7 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + +static void __exit dmaer_exit(void) +{ -+ printk(KERN_INFO "closing dmaer device, cache stats: %d hits %d misses\n", g_cacheHit, g_cacheMiss); ++ PRINTK(KERN_INFO "closing dmaer device, cache stats: %d hits %d misses\n", g_cacheHit, g_cacheMiss); + //unregister the device + cdev_del(&g_cDev); + unregister_chrdev_region(g_majorMinor, 1); @@ -5416,13 +5548,14 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/m + bcm_dma_chan_free(g_dmaChan); +} + ++MODULE_LICENSE("Dual BSD/GPL"); +MODULE_AUTHOR("Simon Hall"); +module_init(dmaer_init); +module_exit(dmaer_exit); + 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 2012-12-19 16:01:28.760343891 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_control.h 2012-12-28 12:40:25.039609349 +0100 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -5845,7 +5978,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 2012-12-19 16:01:28.762343879 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_power.h 2012-12-28 12:40:25.041609324 +0100 @@ -0,0 +1,60 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -5909,7 +6042,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 2012-12-19 16:01:28.761343885 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/clkdev.h 2012-12-28 12:40:25.040609337 +0100 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -5920,7 +6053,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 2012-12-19 16:01:28.760343891 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2012-12-28 12:40:25.039609349 +0100 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -5946,7 +6079,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 2012-12-19 16:01:28.760343891 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/dma.h 2012-12-28 12:40:25.040609337 +0100 @@ -0,0 +1,84 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -6034,7 +6167,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 2012-12-19 16:01:28.762343879 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2012-12-28 12:40:25.040609337 +0100 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -6107,7 +6240,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 2012-12-19 16:01:28.760343891 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/frc.h 2012-12-28 12:40:25.039609349 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6149,7 +6282,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 2012-12-19 16:01:28.762343879 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/gpio.h 2012-12-28 12:40:25.040609337 +0100 @@ -0,0 +1,48 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -6201,7 +6334,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 2012-12-19 16:01:28.761343885 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/hardware.h 2012-12-28 12:40:25.040609337 +0100 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -6233,7 +6366,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 2012-12-19 16:01:28.762343879 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/io.h 2012-12-28 12:40:25.040609337 +0100 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -6265,7 +6398,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 2012-12-19 16:01:28.759343898 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/irqs.h 2012-12-28 12:40:25.039609349 +0100 @@ -0,0 +1,199 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -6468,7 +6601,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 2012-12-19 16:01:28.760343891 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/memory.h 2012-12-28 12:40:25.040609337 +0100 @@ -0,0 +1,57 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -6529,7 +6662,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 2012-12-19 16:01:28.761343885 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/platform.h 2012-12-28 12:40:25.040609337 +0100 @@ -0,0 +1,225 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -6758,7 +6891,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 2012-12-19 16:01:28.761343885 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/power.h 2012-12-28 12:40:25.040609337 +0100 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -6788,7 +6921,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 2012-12-19 16:01:28.759343898 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/system.h 2012-12-28 12:40:25.039609349 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -6830,7 +6963,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 2012-12-19 16:01:28.762343879 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/timex.h 2012-12-28 12:40:25.040609337 +0100 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6857,7 +6990,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 2012-12-19 16:01:28.761343885 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/uncompress.h 2012-12-28 12:40:25.040609337 +0100 @@ -0,0 +1,85 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -6946,7 +7079,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 2012-12-19 16:01:28.760343891 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vcio.h 2012-12-28 12:40:25.039609349 +0100 @@ -0,0 +1,141 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -7091,7 +7224,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 2012-12-19 16:01:28.762343879 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2012-12-28 12:40:25.041609324 +0100 @@ -0,0 +1,36 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -7129,9 +7262,82 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi-3. + +#endif /* VC_MEM_H */ + +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 2012-12-28 12:40:25.040609337 +0100 +@@ -0,0 +1,69 @@ ++#ifndef _VC_SUPPORT_H_ ++#define _VC_SUPPORT_H_ ++ ++/* ++ * vc_support.h ++ * ++ * Created on: 25 Nov 2012 ++ * Author: Simon ++ */ ++ ++enum { ++/* ++ If a MEM_HANDLE_T is discardable, the memory manager may resize it to size ++ 0 at any time when it is not locked or retained. ++ */ ++ MEM_FLAG_DISCARDABLE = 1 << 0, ++ ++ /* ++ If a MEM_HANDLE_T is allocating (or normal), its block of memory will be ++ accessed in an allocating fashion through the cache. ++ */ ++ MEM_FLAG_NORMAL = 0 << 2, ++ MEM_FLAG_ALLOCATING = MEM_FLAG_NORMAL, ++ ++ /* ++ If a MEM_HANDLE_T is direct, its block of memory will be accessed ++ directly, bypassing the cache. ++ */ ++ MEM_FLAG_DIRECT = 1 << 2, ++ ++ /* ++ If a MEM_HANDLE_T is coherent, its block of memory will be accessed in a ++ non-allocating fashion through the cache. ++ */ ++ MEM_FLAG_COHERENT = 2 << 2, ++ ++ /* ++ If a MEM_HANDLE_T is L1-nonallocating, its block of memory will be accessed by ++ the VPU in a fashion which is allocating in L2, but only coherent in L1. ++ */ ++ MEM_FLAG_L1_NONALLOCATING = (MEM_FLAG_DIRECT | MEM_FLAG_COHERENT), ++ ++ /* ++ If a MEM_HANDLE_T is zero'd, its contents are set to 0 rather than ++ MEM_HANDLE_INVALID on allocation and resize up. ++ */ ++ MEM_FLAG_ZERO = 1 << 4, ++ ++ /* ++ If a MEM_HANDLE_T is uninitialised, it will not be reset to a defined value ++ (either zero, or all 1's) on allocation. ++ */ ++ MEM_FLAG_NO_INIT = 1 << 5, ++ ++ /* ++ Hints. ++ */ ++ MEM_FLAG_HINT_PERMALOCK = 1 << 6, /* Likely to be locked for long periods of time. */ ++}; ++ ++unsigned int AllocateVcMemory(unsigned int *pHandle, unsigned int size, unsigned int alignment, unsigned int flags); ++unsigned int ReleaseVcMemory(unsigned int handle); ++unsigned int LockVcMemory(unsigned int *pBusAddress, unsigned int handle); ++unsigned int UnlockVcMemory(unsigned int handle); ++ ++unsigned int ExecuteVcCode(unsigned int code, ++ unsigned int r0, unsigned int r1, unsigned int r2, unsigned int r3, unsigned int r4, unsigned int r5); ++ ++#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 2012-12-19 16:01:28.759343898 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2012-12-28 12:40:25.039609349 +0100 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -7155,7 +7361,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 2012-12-19 16:01:28.763343872 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Kconfig 2012-12-28 12:40:25.041609324 +0100 @@ -0,0 +1,41 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 @@ -7200,8 +7406,8 @@ 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 2012-12-19 16:01:28.756343919 +0100 -@@ -0,0 +1,9 @@ ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile 2012-12-28 12:40:25.037609376 +0100 +@@ -0,0 +1,11 @@ +# +# Makefile for the linux kernel. +# @@ -7209,18 +7415,20 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Makefile linux-rpi-3.6.y/arch/arm/ +obj-$(CONFIG_MACH_BCM2708) += clock.o bcm2708.o armctrl.o vcio.o power.o dma.o delay.o +obj-$(CONFIG_BCM2708_GPIO) += bcm2708_gpio.o +obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o -+obj-$(CONFIG_BCM2708_DMAER) += dmaer.o ++ ++obj-$(CONFIG_BCM2708_DMAER) += dmaer_master.o ++dmaer_master-objs := dmaer.o vc_support.o + 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 2012-12-19 16:01:28.763343872 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile.boot 2012-12-28 12:40:25.041609324 +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 2012-12-19 16:01:28.756343919 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/power.c 2012-12-28 12:40:25.037609376 +0100 @@ -0,0 +1,194 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -7418,7 +7626,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 2012-12-19 16:01:28.758343905 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vcio.c 2012-12-28 12:40:25.038609362 +0100 @@ -0,0 +1,471 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c @@ -7893,7 +8101,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 2012-12-19 16:01:28.756343919 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_mem.c 2012-12-28 12:40:25.037609376 +0100 @@ -0,0 +1,458 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -8353,9 +8561,332 @@ diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vc_mem.c linux-rpi-3.6.y/arch/arm/ +module_param(mem_size, uint, 0644); +module_param(mem_base, uint, 0644); + +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 2012-12-28 12:40:25.041609324 +0100 +@@ -0,0 +1,319 @@ ++/* ++ * vc_support.c ++ * ++ * Created on: 25 Nov 2012 ++ * Author: Simon ++ */ ++ ++#include ++#include ++ ++#ifdef ECLIPSE_IGNORE ++ ++#define __user ++#define __init ++#define __exit ++#define __iomem ++#define KERN_DEBUG ++#define KERN_ERR ++#define KERN_WARNING ++#define KERN_INFO ++#define _IOWR(a, b, c) b ++#define _IOW(a, b, c) b ++#define _IO(a, b) b ++ ++#endif ++ ++/****** VC MAILBOX FUNCTIONALITY ******/ ++unsigned int AllocateVcMemory(unsigned int *pHandle, unsigned int size, unsigned int alignment, unsigned int flags) ++{ ++ struct vc_msg ++ { ++ unsigned int m_msgSize; ++ unsigned int m_response; ++ ++ struct vc_tag ++ { ++ unsigned int m_tagId; ++ unsigned int m_sendBufferSize; ++ union { ++ unsigned int m_sendDataSize; ++ unsigned int m_recvDataSize; ++ }; ++ ++ struct args ++ { ++ union { ++ unsigned int m_size; ++ unsigned int m_handle; ++ }; ++ unsigned int m_alignment; ++ unsigned int m_flags; ++ } m_args; ++ } m_tag; ++ ++ unsigned int m_endTag; ++ } msg; ++ int s; ++ ++ msg.m_msgSize = sizeof(msg); ++ msg.m_response = 0; ++ msg.m_endTag = 0; ++ ++ //fill in the tag for the allocation command ++ msg.m_tag.m_tagId = 0x3000c; ++ msg.m_tag.m_sendBufferSize = 12; ++ msg.m_tag.m_sendDataSize = 12; ++ ++ //fill in our args ++ msg.m_tag.m_args.m_size = size; ++ msg.m_tag.m_args.m_alignment = alignment; ++ msg.m_tag.m_args.m_flags = flags; ++ ++ //run the command ++ s = bcm_mailbox_property(&msg, sizeof(msg)); ++ ++ if (s == 0 && msg.m_response == 0x80000000 && msg.m_tag.m_recvDataSize == 0x80000004) ++ { ++ *pHandle = msg.m_tag.m_args.m_handle; ++ return 0; ++ } ++ else ++ { ++ printk(KERN_ERR "failed to allocate vc memory: s=%d response=%08x recv data size=%08x\n", ++ s, msg.m_response, msg.m_tag.m_recvDataSize); ++ return 1; ++ } ++} ++ ++unsigned int ReleaseVcMemory(unsigned int handle) ++{ ++ struct vc_msg ++ { ++ unsigned int m_msgSize; ++ unsigned int m_response; ++ ++ struct vc_tag ++ { ++ unsigned int m_tagId; ++ unsigned int m_sendBufferSize; ++ union { ++ unsigned int m_sendDataSize; ++ unsigned int m_recvDataSize; ++ }; ++ ++ struct args ++ { ++ union { ++ unsigned int m_handle; ++ unsigned int m_error; ++ }; ++ } m_args; ++ } m_tag; ++ ++ unsigned int m_endTag; ++ } msg; ++ int s; ++ ++ msg.m_msgSize = sizeof(msg); ++ msg.m_response = 0; ++ msg.m_endTag = 0; ++ ++ //fill in the tag for the release command ++ msg.m_tag.m_tagId = 0x3000f; ++ msg.m_tag.m_sendBufferSize = 4; ++ msg.m_tag.m_sendDataSize = 4; ++ ++ //pass across the handle ++ msg.m_tag.m_args.m_handle = handle; ++ ++ s = bcm_mailbox_property(&msg, sizeof(msg)); ++ ++ if (s == 0 && msg.m_response == 0x80000000 && msg.m_tag.m_recvDataSize == 0x80000004 && msg.m_tag.m_args.m_error == 0) ++ return 0; ++ else ++ { ++ printk(KERN_ERR "failed to release vc memory: s=%d response=%08x recv data size=%08x error=%08x\n", ++ s, msg.m_response, msg.m_tag.m_recvDataSize, msg.m_tag.m_args.m_error); ++ return 1; ++ } ++} ++ ++unsigned int LockVcMemory(unsigned int *pBusAddress, unsigned int handle) ++{ ++ struct vc_msg ++ { ++ unsigned int m_msgSize; ++ unsigned int m_response; ++ ++ struct vc_tag ++ { ++ unsigned int m_tagId; ++ unsigned int m_sendBufferSize; ++ union { ++ unsigned int m_sendDataSize; ++ unsigned int m_recvDataSize; ++ }; ++ ++ struct args ++ { ++ union { ++ unsigned int m_handle; ++ unsigned int m_busAddress; ++ }; ++ } m_args; ++ } m_tag; ++ ++ unsigned int m_endTag; ++ } msg; ++ int s; ++ ++ msg.m_msgSize = sizeof(msg); ++ msg.m_response = 0; ++ msg.m_endTag = 0; ++ ++ //fill in the tag for the lock command ++ msg.m_tag.m_tagId = 0x3000d; ++ msg.m_tag.m_sendBufferSize = 4; ++ msg.m_tag.m_sendDataSize = 4; ++ ++ //pass across the handle ++ msg.m_tag.m_args.m_handle = handle; ++ ++ s = bcm_mailbox_property(&msg, sizeof(msg)); ++ ++ if (s == 0 && msg.m_response == 0x80000000 && msg.m_tag.m_recvDataSize == 0x80000004) ++ { ++ //pick out the bus address ++ *pBusAddress = msg.m_tag.m_args.m_busAddress; ++ return 0; ++ } ++ else ++ { ++ printk(KERN_ERR "failed to lock vc memory: s=%d response=%08x recv data size=%08x\n", ++ s, msg.m_response, msg.m_tag.m_recvDataSize); ++ return 1; ++ } ++} ++ ++unsigned int UnlockVcMemory(unsigned int handle) ++{ ++ struct vc_msg ++ { ++ unsigned int m_msgSize; ++ unsigned int m_response; ++ ++ struct vc_tag ++ { ++ unsigned int m_tagId; ++ unsigned int m_sendBufferSize; ++ union { ++ unsigned int m_sendDataSize; ++ unsigned int m_recvDataSize; ++ }; ++ ++ struct args ++ { ++ union { ++ unsigned int m_handle; ++ unsigned int m_error; ++ }; ++ } m_args; ++ } m_tag; ++ ++ unsigned int m_endTag; ++ } msg; ++ int s; ++ ++ msg.m_msgSize = sizeof(msg); ++ msg.m_response = 0; ++ msg.m_endTag = 0; ++ ++ //fill in the tag for the unlock command ++ msg.m_tag.m_tagId = 0x3000e; ++ msg.m_tag.m_sendBufferSize = 4; ++ msg.m_tag.m_sendDataSize = 4; ++ ++ //pass across the handle ++ msg.m_tag.m_args.m_handle = handle; ++ ++ s = bcm_mailbox_property(&msg, sizeof(msg)); ++ ++ //check the error code too ++ if (s == 0 && msg.m_response == 0x80000000 && msg.m_tag.m_recvDataSize == 0x80000004 && msg.m_tag.m_args.m_error == 0) ++ return 0; ++ else ++ { ++ printk(KERN_ERR "failed to unlock vc memory: s=%d response=%08x recv data size=%08x error%08x\n", ++ s, msg.m_response, msg.m_tag.m_recvDataSize, msg.m_tag.m_args.m_error); ++ return 1; ++ } ++} ++ ++unsigned int ExecuteVcCode(unsigned int code, ++ unsigned int r0, unsigned int r1, unsigned int r2, unsigned int r3, unsigned int r4, unsigned int r5) ++{ ++ struct vc_msg ++ { ++ unsigned int m_msgSize; ++ unsigned int m_response; ++ ++ struct vc_tag ++ { ++ unsigned int m_tagId; ++ unsigned int m_sendBufferSize; ++ union { ++ unsigned int m_sendDataSize; ++ unsigned int m_recvDataSize; ++ }; ++ ++ struct args ++ { ++ union { ++ unsigned int m_pCode; ++ unsigned int m_return; ++ }; ++ unsigned int m_r0; ++ unsigned int m_r1; ++ unsigned int m_r2; ++ unsigned int m_r3; ++ unsigned int m_r4; ++ unsigned int m_r5; ++ } m_args; ++ } m_tag; ++ ++ unsigned int m_endTag; ++ } msg; ++ int s; ++ ++ msg.m_msgSize = sizeof(msg); ++ msg.m_response = 0; ++ msg.m_endTag = 0; ++ ++ //fill in the tag for the unlock command ++ msg.m_tag.m_tagId = 0x30010; ++ msg.m_tag.m_sendBufferSize = 28; ++ msg.m_tag.m_sendDataSize = 28; ++ ++ //pass across the handle ++ msg.m_tag.m_args.m_pCode = code; ++ msg.m_tag.m_args.m_r0 = r0; ++ msg.m_tag.m_args.m_r1 = r1; ++ msg.m_tag.m_args.m_r2 = r2; ++ msg.m_tag.m_args.m_r3 = r3; ++ msg.m_tag.m_args.m_r4 = r4; ++ msg.m_tag.m_args.m_r5 = r5; ++ ++ s = bcm_mailbox_property(&msg, sizeof(msg)); ++ ++ //check the error code too ++ if (s == 0 && msg.m_response == 0x80000000 && msg.m_tag.m_recvDataSize == 0x80000004) ++ return msg.m_tag.m_args.m_return; ++ else ++ { ++ printk(KERN_ERR "failed to execute: s=%d response=%08x recv data size=%08x\n", ++ s, msg.m_response, msg.m_tag.m_recvDataSize); ++ return 1; ++ } ++} ++ 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 2012-12-19 16:01:28.997342298 +0100 ++++ linux-rpi-3.6.y/arch/arm/Makefile 2012-12-28 12:40:25.184607483 +0100 @@ -198,6 +198,7 @@ machine-$(CONFIG_MACH_SPEAR320) := spear3xx machine-$(CONFIG_MACH_SPEAR600) := spear6xx @@ -8366,7 +8897,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 2012-12-19 16:01:28.938342695 +0100 ++++ linux-rpi-3.6.y/arch/arm/mm/alignment.c 2012-12-28 12:40:25.143608010 +0100 @@ -856,9 +856,11 @@ case 0x08000000: /* ldm or stm, or thumb-2 32bit instruction */ if (thumb2_32b) @@ -8383,7 +8914,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 2012-12-19 16:01:28.950342615 +0100 ++++ linux-rpi-3.6.y/arch/arm/mm/Kconfig 2012-12-28 12:40:25.151607909 +0100 @@ -354,7 +354,7 @@ # ARMv6 @@ -8395,7 +8926,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 2012-12-19 16:01:28.949342622 +0100 ++++ linux-rpi-3.6.y/arch/arm/mm/proc-v6.S 2012-12-28 12:40:25.150607922 +0100 @@ -73,10 +73,19 @@ * * IRQs are already disabled. @@ -8421,7 +8952,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 2012-12-19 16:01:29.250340598 +0100 ++++ linux-rpi-3.6.y/arch/arm/tools/mach-types 2012-12-28 12:40:25.329605617 +0100 @@ -519,6 +519,7 @@ prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103 paz00 MACH_PAZ00 PAZ00 3128 @@ -8432,7 +8963,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/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 2012-12-19 16:01:42.541249979 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/Kconfig 2012-12-28 12:40:37.030457933 +0100 @@ -0,0 +1,18 @@ +# +# Broadcom char driver config @@ -8454,13 +8985,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 2012-12-19 16:01:42.541249979 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/Makefile 2012-12-28 12:40:37.030457933 +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 2012-12-19 16:01:42.540249986 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/Makefile 2012-12-28 12:40:37.030457933 +0100 @@ -0,0 +1,15 @@ +EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs +EXTRA_CFLAGS += -Werror @@ -8479,7 +9010,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 2012-12-19 16:01:42.541249979 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/vc_cma.c 2012-12-28 12:40:37.030457933 +0100 @@ -0,0 +1,1145 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -8639,7 +9170,7 @@ diff -Naur linux-3.6.11/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi-3.6.y/dr +static int __init early_vc_cma_mem(char *p) +{ + unsigned int new_size; -+ printk(KERN_ERR "early_vc_cma_mem(%s)", p); ++ printk(KERN_NOTICE "early_vc_cma_mem(%s)", p); + vc_cma_size = memparse(p, &p); + vc_cma_initial = vc_cma_size; + if (*p == '/') @@ -8658,7 +9189,7 @@ diff -Naur linux-3.6.11/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi-3.6.y/dr + vc_cma_base = (vc_cma_base + VC_CMA_CHUNK_SIZE - 1) + & ~(VC_CMA_CHUNK_SIZE - 1); + -+ printk(KERN_ERR " -> initial %x, size %x, base %x", vc_cma_initial, ++ printk(KERN_NOTICE " -> initial %x, size %x, base %x", vc_cma_initial, + vc_cma_size, (unsigned int)vc_cma_base); + + return 0; @@ -9628,7 +10159,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/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 2012-12-19 16:01:42.559249859 +0100 ++++ linux-rpi-3.6.y/drivers/char/Kconfig 2012-12-28 12:40:37.043457776 +0100 @@ -585,6 +585,8 @@ source "drivers/s390/char/Kconfig" @@ -9640,7 +10171,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 2012-12-19 16:01:42.531250046 +0100 ++++ linux-rpi-3.6.y/drivers/char/Makefile 2012-12-28 12:40:37.023458019 +0100 @@ -63,3 +63,6 @@ js-rtc-y = rtc.o @@ -9650,7 +10181,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 2012-12-19 16:01:40.357265101 +0100 ++++ linux-rpi-3.6.y/drivers/cpufreq/bcm2835-cpufreq.c 2012-12-28 12:40:30.836535615 +0100 @@ -0,0 +1,239 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -9893,7 +10424,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 2012-12-19 16:01:40.362265068 +0100 ++++ linux-rpi-3.6.y/drivers/cpufreq/Kconfig.arm 2012-12-28 12:40:30.841535553 +0100 @@ -76,3 +76,12 @@ help This adds the CPUFreq driver for Samsung EXYNOS5250 @@ -9909,7 +10440,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 2012-12-19 16:01:40.356265108 +0100 ++++ linux-rpi-3.6.y/drivers/cpufreq/Makefile 2012-12-28 12:40:30.835535628 +0100 @@ -48,6 +48,7 @@ obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ) += exynos5250-cpufreq.o @@ -9920,7 +10451,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 2012-12-19 16:01:40.394264853 +0100 ++++ linux-rpi-3.6.y/drivers/hwmon/bcm2835-hwmon.c 2012-12-28 12:40:31.007533468 +0100 @@ -0,0 +1,219 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -10143,7 +10674,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 2012-12-19 16:01:40.409264753 +0100 ++++ linux-rpi-3.6.y/drivers/hwmon/Kconfig 2012-12-28 12:40:31.082532531 +0100 @@ -1411,6 +1411,16 @@ help Support for the A/D converter on MC13783 and MC13892 PMIC. @@ -10163,7 +10694,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 2012-12-19 16:01:40.383264927 +0100 ++++ linux-rpi-3.6.y/drivers/hwmon/Makefile 2012-12-28 12:40:30.939534322 +0100 @@ -129,6 +129,7 @@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o @@ -10174,7 +10705,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 2012-12-19 16:01:40.516264034 +0100 ++++ linux-rpi-3.6.y/drivers/i2c/busses/i2c-bcm2708.c 2012-12-28 12:40:36.140468796 +0100 @@ -0,0 +1,400 @@ +/* + * Driver for Broadcom BCM2708 BSC Controllers @@ -10578,7 +11109,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 2012-12-19 16:01:40.526263966 +0100 ++++ linux-rpi-3.6.y/drivers/i2c/busses/Kconfig 2012-12-28 12:40:36.156468600 +0100 @@ -314,6 +314,25 @@ This driver can also be built as a module. If so, the module will be called i2c-au1550. @@ -10607,7 +11138,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 2012-12-19 16:01:40.514264047 +0100 ++++ linux-rpi-3.6.y/drivers/i2c/busses/Makefile 2012-12-28 12:40:36.138468820 +0100 @@ -30,6 +30,7 @@ # Embedded system I2C/SMBus host controller drivers obj-$(CONFIG_I2C_AT91) += i2c-at91.o @@ -10618,7 +11149,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 2012-12-19 16:01:45.299231452 +0100 ++++ linux-rpi-3.6.y/drivers/misc/Kconfig 2012-12-28 12:40:38.971434408 +0100 @@ -517,4 +517,6 @@ source "drivers/misc/carma/Kconfig" source "drivers/misc/altera-stapl/Kconfig" @@ -10628,7 +11159,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 2012-12-19 16:01:45.282231565 +0100 ++++ linux-rpi-3.6.y/drivers/misc/Makefile 2012-12-28 12:40:38.961434529 +0100 @@ -50,3 +50,4 @@ obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ @@ -10636,7 +11167,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 2012-12-19 16:01:45.312231365 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2012-12-28 12:40:38.978434325 +0100 @@ -0,0 +1,328 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -10968,7 +11499,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 2012-12-19 16:01:45.312231365 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2012-12-28 12:40:38.978434325 +0100 @@ -0,0 +1,204 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -11176,7 +11707,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 2012-12-19 16:01:45.311231372 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2012-12-28 12:40:38.977434336 +0100 @@ -0,0 +1,224 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -11404,7 +11935,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 2012-12-19 16:01:45.310231378 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2012-12-28 12:40:38.977434336 +0100 @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -11479,7 +12010,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 2012-12-19 16:01:45.310231378 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2012-12-28 12:40:38.977434336 +0100 @@ -0,0 +1,163 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -11646,7 +12177,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 2012-12-19 16:01:45.311231372 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi.h 2012-12-28 12:40:38.977434336 +0100 @@ -0,0 +1,370 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12020,7 +12551,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 2012-12-19 16:01:45.311231372 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2012-12-28 12:40:38.977434336 +0100 @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12066,7 +12597,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 2012-12-19 16:01:45.307231398 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2012-12-28 12:40:38.976434347 +0100 @@ -0,0 +1,538 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12608,7 +13139,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 2012-12-19 16:01:45.309231384 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2012-12-28 12:40:38.977434336 +0100 @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -12654,7 +13185,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 2012-12-19 16:01:45.304231418 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2012-12-28 12:40:38.974434372 +0100 @@ -0,0 +1,2802 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -14103,7 +14634,7 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm + if (g_state.remote == NULL) + printk(KERN_ERR "%s: g_state.remote == NULL\n", __func__); + else if (g_state.remote->initialised != 1) -+ printk(KERN_ERR "%s: g_state.remote->initialised != 1 (%d)\n", ++ printk(KERN_NOTICE "%s: g_state.remote->initialised != 1 (%d)\n", + __func__, g_state.remote->initialised); + + return ((g_state.remote != NULL) && @@ -15460,7 +15991,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 2012-12-19 16:01:45.310231378 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2012-12-28 12:40:38.977434336 +0100 @@ -0,0 +1,212 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -15676,7 +16207,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 2012-12-19 16:01:45.306231405 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2012-12-28 12:40:38.975434359 +0100 @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -15717,7 +16248,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 2012-12-19 16:01:45.307231398 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2012-12-28 12:40:38.976434347 +0100 @@ -0,0 +1,60 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -15781,7 +16312,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 2012-12-19 16:01:45.308231391 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2012-12-28 12:40:38.976434347 +0100 @@ -0,0 +1,119 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -15904,7 +16435,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 2012-12-19 16:01:45.309231384 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2012-12-28 12:40:38.976434347 +0100 @@ -0,0 +1,51 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -15959,7 +16490,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 2012-12-19 16:01:45.305231412 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2012-12-28 12:40:38.975434359 +0100 @@ -0,0 +1,3727 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -19690,7 +20221,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 2012-12-19 16:01:45.309231384 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2012-12-28 12:40:38.976434347 +0100 @@ -0,0 +1,698 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -20392,7 +20923,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 2012-12-19 16:01:45.307231398 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2012-12-28 12:40:38.975434359 +0100 @@ -0,0 +1,89 @@ +#!/usr/bin/perl -w + @@ -20485,7 +21016,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 2012-12-19 16:01:45.304231418 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2012-12-28 12:40:38.974434372 +0100 @@ -0,0 +1,41 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -20530,7 +21061,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 2012-12-19 16:01:45.310231378 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2012-12-28 12:40:38.977434336 +0100 @@ -0,0 +1,182 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -20716,7 +21247,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 2012-12-19 16:01:45.306231405 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2012-12-28 12:40:38.975434359 +0100 @@ -0,0 +1,129 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -20849,8 +21380,8 @@ 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 2012-12-19 16:01:45.308231391 +0100 -@@ -0,0 +1,443 @@ ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2012-12-28 12:40:38.976434347 +0100 +@@ -0,0 +1,454 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * @@ -20921,20 +21452,31 @@ diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ker +* vchiq_initialise +* +***************************************************************************/ -+ ++#define VCHIQ_INIT_RETRIES 10 +VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instanceOut) +{ + VCHIQ_STATUS_T status = VCHIQ_ERROR; + VCHIQ_STATE_T *state; + VCHIQ_INSTANCE_T instance = NULL; ++ int i; + + vchiq_log_trace(vchiq_core_log_level, "%s called", __func__); + -+ state = vchiq_get_state(); -+ if (!state) { ++ /* VideoCore may not be ready due to boot up timing. ++ It may never be ready if kernel and firmware are mismatched, so don't block forever. */ ++ for (i=0; i0) { ++ vchiq_log_warning(vchiq_core_log_level, ++ "%s: videocore initialized after %d retries\n", __func__, i); + } + + instance = kzalloc(sizeof(*instance), GFP_KERNEL); @@ -21296,7 +21838,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 2012-12-19 16:01:45.309231384 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2012-12-28 12:40:38.976434347 +0100 @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -21371,7 +21913,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 2012-12-19 16:01:45.308231391 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2012-12-28 12:40:38.976434347 +0100 @@ -0,0 +1,58 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -21433,7 +21975,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 2012-12-19 16:01:45.306231405 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 2012-12-28 12:40:38.975434359 +0100 @@ -0,0 +1,240 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -21677,7 +22219,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 2012-12-19 16:01:45.308231391 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2012-12-28 12:40:38.976434347 +0100 @@ -0,0 +1,802 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -22483,7 +23025,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 2012-12-19 16:01:45.307231398 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2012-12-28 12:40:38.975434359 +0100 @@ -0,0 +1,120 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -22607,7 +23149,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 2012-12-19 16:01:45.306231405 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2012-12-28 12:40:38.975434359 +0100 @@ -0,0 +1,82 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -22693,7 +23235,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 2012-12-19 16:01:45.305231412 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2012-12-28 12:40:38.975434359 +0100 @@ -0,0 +1,59 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -22756,7 +23298,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 2012-12-19 16:01:45.312231365 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/Kconfig 2012-12-28 12:40:38.978434325 +0100 @@ -0,0 +1,10 @@ +config BCM2708_VCHIQ + tristate "Videocore VCHIQ" @@ -22770,7 +23312,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 2012-12-19 16:01:45.303231424 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/Makefile 2012-12-28 12:40:38.974434372 +0100 @@ -0,0 +1,18 @@ +ifeq ($(CONFIG_MACH_BCM2708),y) + @@ -22792,7 +23334,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 2012-12-19 16:01:42.682249032 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/card/block.c 2012-12-28 12:40:37.130456719 +0100 @@ -1135,7 +1135,7 @@ brq->data.blocks = 1; } @@ -22804,7 +23346,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 2012-12-19 16:01:42.677249065 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/core/sd.c 2012-12-28 12:40:37.127456755 +0100 @@ -13,6 +13,8 @@ #include #include @@ -22965,7 +23507,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 2012-12-19 16:01:42.668249126 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/Kconfig 2012-12-28 12:40:37.121456828 +0100 @@ -229,6 +229,27 @@ YMMV. @@ -22996,7 +23538,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 2012-12-19 16:01:42.659249187 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/Makefile 2012-12-28 12:40:37.115456900 +0100 @@ -13,6 +13,7 @@ obj-$(CONFIG_MMC_SDHCI_PXAV2) += sdhci-pxav2.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o @@ -23007,7 +23549,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 2012-12-19 16:01:42.664249153 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/sdhci-bcm2708.c 2012-12-28 12:40:37.118456864 +0100 @@ -0,0 +1,1413 @@ +/* + * sdhci-bcm2708.c Support for SDHCI device on BCM2708 @@ -24424,7 +24966,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 2012-12-19 16:01:42.662249166 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/sdhci.c 2012-12-28 12:40:37.117456876 +0100 @@ -28,6 +28,7 @@ #include #include @@ -25297,7 +25839,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 2012-12-19 16:01:42.669249119 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/sdhci.h 2012-12-28 12:40:37.122456816 +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); @@ -25360,7 +25902,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 2012-12-19 16:01:43.776241681 +0100 ++++ linux-rpi-3.6.y/drivers/net/usb/smsc95xx.c 2012-12-28 12:40:37.954446709 +0100 @@ -46,11 +46,23 @@ #define SMSC95XX_INTERNAL_PHY_ID (1) #define SMSC95XX_TX_OVERHEAD (8) @@ -26377,7 +26919,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 2012-12-19 16:01:43.772241707 +0100 ++++ linux-rpi-3.6.y/drivers/net/usb/smsc95xx.h 2012-12-28 12:40:37.951446743 +0100 @@ -63,6 +63,7 @@ #define INT_STS_TDFO_ (0x00001000) #define INT_STS_RXDF_ (0x00000800) @@ -26418,7 +26960,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 2012-12-19 16:01:43.769241728 +0100 ++++ linux-rpi-3.6.y/drivers/net/usb/usbnet.c 2012-12-28 12:40:37.949446769 +0100 @@ -359,10 +359,12 @@ void usbnet_defer_kevent (struct usbnet *dev, int work) { @@ -26437,9 +26979,174 @@ diff -Naur linux-3.6.11/drivers/net/usb/usbnet.c linux-rpi-3.6.y/drivers/net/usb diff -Naur linux-3.6.11/drivers/net/wireless/Kconfig linux-rpi-3.6.y/drivers/net/wireless/Kconfig diff -Naur linux-3.6.11/drivers/net/wireless/Makefile linux-rpi-3.6.y/drivers/net/wireless/Makefile +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/clean linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/clean +\ Kein Zeilenumbruch am Dateiende. +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_debug.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_debug.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_io.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_io.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_iol.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_iol.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_mp.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_mp.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_recv.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_recv.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_rf.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_rf.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_security.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_security.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/hal/hal_init.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/hal_init.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 +\ Kein Zeilenumbruch am Dateiende. +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/autoconf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/autoconf.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/basic_types.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/basic_types.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/circ_buf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/circ_buf.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/drv_conf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/drv_conf.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/drv_types.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/drv_types.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/ethernet.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/ethernet.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/farray.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/farray.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/h2clbk.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/h2clbk.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/Hal8192DETestHWImg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192DETestHWImg.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/Hal8192DUTestHWImg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192DUTestHWImg.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/hal_init.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/hal_init.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/ieee80211.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/ieee80211.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/if_ether.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/if_ether.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/ip.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/ip.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/nic_spec.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/nic_spec.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/osdep_intf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/osdep_intf.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/osdep_service.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/osdep_service.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/pci_hal.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/pci_hal.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/pci_ops.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/pci_ops.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/pci_osintf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/pci_osintf.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/recv_osdep.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/recv_osdep.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_android.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_android.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_debug.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_debug.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_event.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_event.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_ht.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_ht.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_io.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_io.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_iol.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_iol.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_led.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_led.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_mp.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_mp.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_qos.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_qos.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_recv.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_recv.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_rf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_rf.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_security.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_security.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_version.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_version.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/sdio_hal.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/sdio_hal.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/sdio_ops_ce.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/sdio_ops_ce.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/sdio_ops.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/sdio_ops.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/sdio_ops_linux.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/sdio_ops_linux.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/sdio_ops_xp.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/sdio_ops_xp.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/sdio_osintf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/sdio_osintf.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/sta_info.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/sta_info.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/usb_hal.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/usb_hal.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/usb_ops.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/usb_ops.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/usb_osintf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/usb_osintf.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/wifi.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/wifi.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/Kconfig linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/Kconfig +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/Makefile linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/Makefile +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/os_dep/linux/sdio_intf.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/sdio_intf.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c +diff -Naur linux-3.6.11/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c +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 2012-12-19 16:01:42.582249704 +0100 ++++ linux-rpi-3.6.y/drivers/spi/Kconfig 2012-12-28 12:40:37.062457545 +0100 @@ -74,6 +74,14 @@ This selects a driver for the Atmel SPI Controller, present on many AT32 (AVR32) and AT91 (ARM) chips. @@ -26457,7 +27164,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 2012-12-19 16:01:42.575249751 +0100 ++++ linux-rpi-3.6.y/drivers/spi/Makefile 2012-12-28 12:40:37.057457605 +0100 @@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_AU1550) += spi-au1550.o obj-$(CONFIG_SPI_BCM63XX) += spi-bcm63xx.o @@ -26468,7 +27175,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 2012-12-19 16:01:42.575249751 +0100 ++++ linux-rpi-3.6.y/drivers/spi/spi-bcm2708.c 2012-12-28 12:40:37.057457605 +0100 @@ -0,0 +1,594 @@ +/* + * Driver for Broadcom BCM2708 SPI Controllers @@ -27069,7 +27776,7 @@ diff -Naur linux-3.6.11/drivers/staging/media/lirc/lirc_rpi.c linux-rpi-3.6.y/dr diff -Naur linux-3.6.11/drivers/staging/media/lirc/Makefile linux-rpi-3.6.y/drivers/staging/media/lirc/Makefile 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 2012-12-19 16:01:45.264231687 +0100 ++++ linux-rpi-3.6.y/drivers/thermal/bcm2835-thermal.c 2012-12-28 12:40:38.950434663 +0100 @@ -0,0 +1,208 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -27281,7 +27988,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 2012-12-19 16:01:45.264231687 +0100 ++++ linux-rpi-3.6.y/drivers/thermal/Kconfig 2012-12-28 12:40:38.951434651 +0100 @@ -27,3 +27,14 @@ help Enable this to plug the SPEAr thermal sensor driver into the Linux @@ -27299,7 +28006,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 2012-12-19 16:01:45.263231694 +0100 ++++ linux-rpi-3.6.y/drivers/thermal/Makefile 2012-12-28 12:40:38.950434663 +0100 @@ -3,4 +3,5 @@ # @@ -27310,7 +28017,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 2012-12-19 16:01:45.087232876 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/generic.c 2012-12-28 12:40:38.834436064 +0100 @@ -149,6 +149,7 @@ dev_warn(&udev->dev, "no configuration chosen from %d choice%s\n", @@ -27321,7 +28028,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 2012-12-19 16:01:45.089232862 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/hub.c 2012-12-28 12:40:38.835436053 +0100 @@ -25,7 +25,6 @@ #include #include @@ -27444,7 +28151,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 2012-12-19 16:01:45.085232888 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/message.c 2012-12-28 12:40:38.832436089 +0100 @@ -1877,6 +1877,85 @@ if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) @@ -27533,7 +28240,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 2012-12-19 16:01:45.084232895 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/otg_whitelist.h 2012-12-28 12:40:38.831436102 +0100 @@ -19,33 +19,82 @@ static struct usb_device_id whitelist_table [] = { @@ -27751,7 +28458,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 2012-12-19 16:01:45.080232923 +0100 ++++ linux-rpi-3.6.y/drivers/usb/gadget/file_storage.c 2012-12-28 12:40:38.829436125 +0100 @@ -573,8 +573,37 @@ .iConfiguration = FSG_STRING_CONFIG, .bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER, @@ -27881,7 +28588,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 2012-12-19 16:01:45.074232963 +0100 ++++ linux-rpi-3.6.y/drivers/usb/gadget/Kconfig 2012-12-28 12:40:38.824436186 +0100 @@ -505,6 +505,12 @@ bool depends on USB_GADGET_DUALSPEED @@ -27897,7 +28604,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 2012-12-19 16:01:44.947233816 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/changes.txt 2012-12-28 12:40:38.733437286 +0100 @@ -0,0 +1,174 @@ + +dwc_read_reg32() and friends now take an additional parameter, a pointer to an @@ -28075,7 +28782,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 2012-12-19 16:01:44.950233795 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2012-12-28 12:40:38.735437262 +0100 @@ -0,0 +1,270 @@ +# Doxyfile 1.4.5 + @@ -28349,7 +29056,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 2012-12-19 16:01:44.948233809 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.c 2012-12-28 12:40:38.733437286 +0100 @@ -0,0 +1,532 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.c $ @@ -28885,7 +29592,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 2012-12-19 16:01:44.953233776 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.h 2012-12-28 12:40:38.736437250 +0100 @@ -0,0 +1,225 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.h $ @@ -29114,7 +29821,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 2012-12-19 16:01:44.952233782 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2012-12-28 12:40:38.736437250 +0100 @@ -0,0 +1,1308 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -30426,7 +31133,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 2012-12-19 16:01:44.949233802 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2012-12-28 12:40:38.734437274 +0100 @@ -0,0 +1,1421 @@ +#include +#include @@ -31851,7 +32558,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 2012-12-19 16:01:44.951233788 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2012-12-28 12:40:38.735437262 +0100 @@ -0,0 +1,1275 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -33130,7 +33837,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 2012-12-19 16:01:44.947233816 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.c 2012-12-28 12:40:38.732437298 +0100 @@ -0,0 +1,308 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.c $ @@ -33442,7 +34149,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 2012-12-19 16:01:44.952233782 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.h 2012-12-28 12:40:38.736437250 +0100 @@ -0,0 +1,111 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.h $ @@ -33557,7 +34264,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 2012-12-19 16:01:44.947233816 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.c 2012-12-28 12:40:38.733437286 +0100 @@ -0,0 +1,291 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.c $ @@ -33852,7 +34559,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 2012-12-19 16:01:44.948233809 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.h 2012-12-28 12:40:38.733437286 +0100 @@ -0,0 +1,106 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.h $ @@ -33962,7 +34669,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 2012-12-19 16:01:44.949233802 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_list.h 2012-12-28 12:40:38.734437274 +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 $ */ @@ -34560,7 +35267,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 2012-12-19 16:01:44.949233802 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_mem.c 2012-12-28 12:40:38.734437274 +0100 @@ -0,0 +1,245 @@ +/* Memory Debugging */ +#ifdef DWC_DEBUG_MEMORY @@ -34809,7 +35516,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 2012-12-19 16:01:44.951233788 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.c 2012-12-28 12:40:38.735437262 +0100 @@ -0,0 +1,636 @@ +/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows. + * @@ -35449,7 +36156,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 2012-12-19 16:01:44.950233795 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.h 2012-12-28 12:40:38.734437274 +0100 @@ -0,0 +1,34 @@ +/* + * dwc_modpow.h @@ -35487,7 +36194,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 2012-12-19 16:01:44.948233809 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.c 2012-12-28 12:40:38.733437286 +0100 @@ -0,0 +1,319 @@ +#ifdef DWC_NOTIFYLIB + @@ -35810,7 +36517,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 2012-12-19 16:01:44.949233802 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.h 2012-12-28 12:40:38.734437274 +0100 @@ -0,0 +1,122 @@ + +#ifndef __DWC_NOTIFIER_H__ @@ -35936,7 +36643,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 2012-12-19 16:01:44.951233788 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_os.h 2012-12-28 12:40:38.735437262 +0100 @@ -0,0 +1,1260 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_os.h $ @@ -37200,7 +37907,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 2012-12-19 16:01:44.948233809 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile 2012-12-28 12:40:38.733437286 +0100 @@ -0,0 +1,58 @@ +# +# Makefile for DWC_common library @@ -37262,7 +37969,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 2012-12-19 16:01:44.952233782 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.fbsd 2012-12-28 12:40:38.736437250 +0100 @@ -0,0 +1,17 @@ +CFLAGS += -I/sys/i386/compile/GENERIC -I/sys/i386/include -I/usr/include +CFLAGS += -DDWC_FREEBSD @@ -37283,7 +37990,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 2012-12-19 16:01:44.947233816 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.linux 2012-12-28 12:40:38.732437298 +0100 @@ -0,0 +1,49 @@ +# +# Makefile for DWC_common library @@ -37336,7 +38043,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 2012-12-19 16:01:44.952233782 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/usb.h 2012-12-28 12:40:38.736437250 +0100 @@ -0,0 +1,946 @@ +/* + * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38286,7 +38993,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 2012-12-19 16:01:44.923233976 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2012-12-28 12:40:38.713437527 +0100 @@ -0,0 +1,224 @@ +# Doxyfile 1.3.9.1 + @@ -38514,7 +39221,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 2012-12-19 16:01:44.927233950 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dummy_audio.c 2012-12-28 12:40:38.716437492 +0100 @@ -0,0 +1,1575 @@ +/* + * zero.c -- Gadget Zero, for USB development @@ -40093,7 +40800,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 2012-12-19 16:01:44.916234023 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2012-12-28 12:40:38.707437599 +0100 @@ -0,0 +1,142 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -40239,7 +40946,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 2012-12-19 16:01:44.928233943 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2012-12-28 12:40:38.716437492 +0100 @@ -0,0 +1,854 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.c $ @@ -41097,7 +41804,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 2012-12-19 16:01:44.915234030 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2012-12-28 12:40:38.707437599 +0100 @@ -0,0 +1,80 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.h $ @@ -41181,7 +41888,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 2012-12-19 16:01:44.921233990 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2012-12-28 12:40:38.711437553 +0100 @@ -0,0 +1,1210 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $ @@ -42395,7 +43102,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 2012-12-19 16:01:44.927233950 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2012-12-28 12:40:38.716437492 +0100 @@ -0,0 +1,89 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $ @@ -42488,7 +43195,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 2012-12-19 16:01:44.922233983 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2012-12-28 12:40:38.713437527 +0100 @@ -0,0 +1,1876 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -44368,7 +45075,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 2012-12-19 16:01:44.923233976 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2012-12-28 12:40:38.713437527 +0100 @@ -0,0 +1,320 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -44692,7 +45399,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 2012-12-19 16:01:44.929233936 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2012-12-28 12:40:38.718437466 +0100 @@ -0,0 +1,7151 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $ @@ -51847,7 +52554,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 2012-12-19 16:01:44.924233970 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2012-12-28 12:40:38.714437515 +0100 @@ -0,0 +1,1464 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $ @@ -53315,7 +54022,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 2012-12-19 16:01:44.917234017 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2012-12-28 12:40:38.708437587 +0100 @@ -0,0 +1,1571 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $ @@ -54890,7 +55597,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 2012-12-19 16:01:44.923233976 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2012-12-28 12:40:38.713437527 +0100 @@ -0,0 +1,705 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $ @@ -55599,7 +56306,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 2012-12-19 16:01:44.916234023 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2012-12-28 12:40:38.707437599 +0100 @@ -0,0 +1,117 @@ +/* ========================================================================== + * @@ -55720,7 +56427,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 2012-12-19 16:01:44.920233997 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2012-12-28 12:40:38.710437565 +0100 @@ -0,0 +1,1732 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $ @@ -57456,7 +58163,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 2012-12-19 16:01:44.918234011 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2012-12-28 12:40:38.709437576 +0100 @@ -0,0 +1,86 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $ @@ -57546,7 +58253,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 2012-12-19 16:01:44.922233983 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2012-12-28 12:40:38.712437540 +0100 @@ -0,0 +1,3498 @@ + +/* ========================================================================== @@ -61048,7 +61755,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 2012-12-19 16:01:44.927233950 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2012-12-28 12:40:38.716437492 +0100 @@ -0,0 +1,1132 @@ +/*========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $ @@ -62184,7 +62891,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 2012-12-19 16:01:44.914234037 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2012-12-28 12:40:38.706437612 +0100 @@ -0,0 +1,829 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $ @@ -63017,7 +63724,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 2012-12-19 16:01:44.924233970 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2012-12-28 12:40:38.714437515 +0100 @@ -0,0 +1,417 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $ @@ -63438,7 +64145,7 @@ 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 2012-12-19 16:01:44.917234017 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2012-12-28 12:40:38.709437576 +0100 @@ -0,0 +1,2248 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $ @@ -65690,7 +66397,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 2012-12-19 16:01:44.914234037 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2012-12-28 12:40:38.706437612 +0100 @@ -0,0 +1,938 @@ + +/* ========================================================================== @@ -66632,7 +67339,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 2012-12-19 16:01:44.916234023 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2012-12-28 12:40:38.708437587 +0100 @@ -0,0 +1,957 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $ @@ -67593,7 +68300,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 2012-12-19 16:01:44.916234023 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 2012-12-28 12:40:38.708437587 +0100 @@ -0,0 +1,113 @@ +#include "dwc_otg_regs.h" +#include "dwc_otg_dbg.h" @@ -67710,7 +68417,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 2012-12-19 16:01:44.915234030 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 2012-12-28 12:40:38.706437612 +0100 @@ -0,0 +1,36 @@ +#ifndef __DWC_OTG_MPHI_FIX_H__ +#define __DWC_OTG_MPHI_FIX_H__ @@ -67750,7 +68457,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 2012-12-19 16:01:44.927233950 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2012-12-28 12:40:38.716437492 +0100 @@ -0,0 +1,188 @@ +#ifndef _DWC_OS_DEP_H_ +#define _DWC_OS_DEP_H_ @@ -67942,7 +68649,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 2012-12-19 16:01:44.918234011 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2012-12-28 12:40:38.709437576 +0100 @@ -0,0 +1,2708 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $ @@ -70654,7 +71361,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 2012-12-19 16:01:44.920233997 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2012-12-28 12:40:38.711437553 +0100 @@ -0,0 +1,266 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $ @@ -70924,7 +71631,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 2012-12-19 16:01:44.915234030 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2012-12-28 12:40:38.707437599 +0100 @@ -0,0 +1,360 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $ @@ -71288,7 +71995,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 2012-12-19 16:01:44.919234004 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2012-12-28 12:40:38.710437565 +0100 @@ -0,0 +1,5147 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $ @@ -76439,7 +77146,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 2012-12-19 16:01:44.925233964 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2012-12-28 12:40:38.714437515 +0100 @@ -0,0 +1,1374 @@ + /* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $ @@ -77817,7 +78524,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 2012-12-19 16:01:44.921233990 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2012-12-28 12:40:38.711437553 +0100 @@ -0,0 +1,2550 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $ @@ -80371,7 +81078,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 2012-12-19 16:01:44.915234030 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/Makefile 2012-12-28 12:40:38.707437599 +0100 @@ -0,0 +1,81 @@ +# +# Makefile for DWC_otg Highspeed USB controller driver @@ -80456,7 +81163,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 2012-12-19 16:01:44.926233957 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2012-12-28 12:40:38.715437504 +0100 @@ -0,0 +1,337 @@ +package dwc_otg_test; + @@ -80797,7 +81504,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 2012-12-19 16:01:44.925233964 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/Makefile 2012-12-28 12:40:38.715437504 +0100 @@ -0,0 +1,16 @@ + +PERL=/usr/bin/perl @@ -80817,7 +81524,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 2012-12-19 16:01:44.926233957 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2012-12-28 12:40:38.715437504 +0100 @@ -0,0 +1,133 @@ +#!/usr/bin/perl -w +# @@ -80954,7 +81661,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 2012-12-19 16:01:44.926233957 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2012-12-28 12:40:38.715437504 +0100 @@ -0,0 +1,193 @@ +#!/usr/bin/perl -w +# @@ -81151,7 +81858,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 2012-12-19 16:01:44.964233701 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/Kconfig 2012-12-28 12:40:38.744437153 +0100 @@ -610,6 +610,19 @@ To compile this driver a module, choose M here: the module will be called "hwa-hc". @@ -81174,7 +81881,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 2012-12-19 16:01:44.939233870 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/Makefile 2012-12-28 12:40:38.726437371 +0100 @@ -37,6 +37,8 @@ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o @@ -81186,7 +81893,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 2012-12-19 16:01:44.990233527 +0100 ++++ linux-rpi-3.6.y/drivers/usb/Makefile 2012-12-28 12:40:38.762436934 +0100 @@ -25,6 +25,7 @@ obj-$(CONFIG_USB_R8A66597_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ @@ -81197,7 +81904,7 @@ diff -Naur linux-3.6.11/drivers/usb/Makefile linux-rpi-3.6.y/drivers/usb/Makefil 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 2012-12-19 16:01:42.339251336 +0100 ++++ linux-rpi-3.6.y/drivers/video/bcm2708_fb.c 2012-12-28 12:40:36.871459872 +0100 @@ -0,0 +1,491 @@ +/* + * linux/drivers/video/bcm2708_fb.c @@ -81692,7 +82399,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/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 2012-12-19 16:01:42.471250449 +0100 ++++ linux-rpi-3.6.y/drivers/video/Kconfig 2012-12-28 12:40:36.977458578 +0100 @@ -312,6 +312,20 @@ help Support the Permedia2 FIFO disconnect feature. @@ -81716,7 +82423,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 2012-12-19 16:01:42.436250684 +0100 ++++ linux-rpi-3.6.y/drivers/video/logo/logo_linux_clut224.ppm 2012-12-28 12:40:36.948458932 +0100 @@ -1,1604 +1,883 @@ P3 -# Standard 224-color Linux logo @@ -84205,7 +84912,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 2012-12-19 16:01:42.379251067 +0100 ++++ linux-rpi-3.6.y/drivers/video/Makefile 2012-12-28 12:40:36.903459482 +0100 @@ -99,6 +99,7 @@ obj-$(CONFIG_FB_PVR2) += pvr2fb.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o @@ -84216,7 +84923,7 @@ diff -Naur linux-3.6.11/drivers/video/Makefile linux-rpi-3.6.y/drivers/video/Mak obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o 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 2012-12-19 16:01:45.831227879 +0100 ++++ linux-rpi-3.6.y/drivers/watchdog/bcm2708_wdog.c 2012-12-28 12:40:39.321430194 +0100 @@ -0,0 +1,385 @@ +/* + * Broadcom BCM2708 watchdog driver. @@ -84605,7 +85312,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 2012-12-19 16:01:45.841227812 +0100 ++++ linux-rpi-3.6.y/drivers/watchdog/Kconfig 2012-12-28 12:40:39.328430110 +0100 @@ -352,6 +352,12 @@ To compile this driver as a module, choose M here: the module will be called imx2_wdt. @@ -84621,7 +85328,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 2012-12-19 16:01:45.823227932 +0100 ++++ linux-rpi-3.6.y/drivers/watchdog/Makefile 2012-12-28 12:40:39.316430254 +0100 @@ -52,6 +52,7 @@ obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o @@ -84632,7 +85339,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 2012-12-19 16:01:33.936309054 +0100 ++++ linux-rpi-3.6.y/include/linux/broadcom/vc_cma.h 2012-12-28 12:40:27.928572347 +0100 @@ -0,0 +1,30 @@ +/***************************************************************************** +* Copyright 2012 Broadcom Corporation. All rights reserved. @@ -84666,7 +85373,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 2012-12-19 16:01:33.884309402 +0100 ++++ linux-rpi-3.6.y/include/linux/mmc/host.h 2012-12-28 12:40:27.896572755 +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 */ @@ -84677,7 +85384,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 2012-12-19 16:01:33.887309383 +0100 ++++ linux-rpi-3.6.y/include/linux/mmc/sdhci.h 2012-12-28 12:40:27.898572729 +0100 @@ -93,6 +93,7 @@ #define SDHCI_QUIRK2_HOST_OFF_CARD_ON (1<<0) @@ -84704,7 +85411,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 2012-12-19 16:01:34.503305216 +0100 ++++ linux-rpi-3.6.y/include/net/bluetooth/hci.h 2012-12-28 12:40:28.158569425 +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 */ @@ -84716,7 +85423,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 2012-12-19 16:01:32.978315492 +0100 ++++ linux-rpi-3.6.y/kernel/module.c 2012-12-28 12:40:27.343579803 +0100 @@ -2680,20 +2680,23 @@ memset(ptr, 0, mod->core_size); mod->module_core = ptr; @@ -84756,7 +85463,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 2012-12-19 16:01:33.247313683 +0100 ++++ linux-rpi-3.6.y/net/core/skbuff.c 2012-12-28 12:40:27.517577585 +0100 @@ -340,43 +340,57 @@ EXPORT_SYMBOL(build_skb); @@ -84833,7 +85540,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 2012-12-19 16:01:34.893302594 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835.c 2012-12-28 12:40:28.395566420 +0100 @@ -0,0 +1,413 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -85250,7 +85957,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 2012-12-19 16:01:34.892302601 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835-ctl.c 2012-12-28 12:40:28.395566420 +0100 @@ -0,0 +1,200 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -85454,7 +86161,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 2012-12-19 16:01:34.890302615 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835.h 2012-12-28 12:40:28.393566446 +0100 @@ -0,0 +1,155 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -85613,7 +86320,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 2012-12-19 16:01:34.889302622 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835-pcm.c 2012-12-28 12:40:28.393566446 +0100 @@ -0,0 +1,408 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -86025,7 +86732,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 2012-12-19 16:01:34.891302608 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835-vchiq.c 2012-12-28 12:40:28.394566433 +0100 @@ -0,0 +1,826 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -86855,7 +87562,7 @@ diff -Naur linux-3.6.11/sound/arm/bcm2835-vchiq.c linux-rpi-3.6.y/sound/arm/bcm2 +} 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 2012-12-19 16:01:34.892302601 +0100 ++++ linux-rpi-3.6.y/sound/arm/Kconfig 2012-12-28 12:40:28.395566420 +0100 @@ -39,5 +39,12 @@ Say Y or M if you want to support any AC97 codec attached to the PXA2xx AC97 interface. @@ -86871,7 +87578,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 2012-12-19 16:01:34.890302615 +0100 ++++ linux-rpi-3.6.y/sound/arm/Makefile 2012-12-28 12:40:28.393566446 +0100 @@ -14,3 +14,9 @@ obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o @@ -86884,7 +87591,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 2012-12-19 16:01:34.892302601 +0100 ++++ linux-rpi-3.6.y/sound/arm/vc_vchi_audioserv_defs.h 2012-12-28 12:40:28.395566420 +0100 @@ -0,0 +1,114 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -87002,7 +87709,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 2012-12-19 16:01:35.041301600 +0100 ++++ linux-rpi-3.6.y/sound/pci/Kconfig 2012-12-28 12:40:28.489565228 +0100 @@ -2,8 +2,8 @@ config SND_TEA575X From b0e83b79945155463df2c519d9b58c987c59bb4a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 28 Dec 2012 15:11:15 +0100 Subject: [PATCH 42/45] tools/mkpkg: update 'mkpkg_bcm2835-driver' script Signed-off-by: Stephan Raue --- tools/mkpkg/mkpkg_bcm2835-driver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mkpkg/mkpkg_bcm2835-driver b/tools/mkpkg/mkpkg_bcm2835-driver index ee94837fb5..dce844b331 100755 --- a/tools/mkpkg/mkpkg_bcm2835-driver +++ b/tools/mkpkg/mkpkg_bcm2835-driver @@ -21,7 +21,7 @@ echo "getting sources..." if [ ! -d bcm2835-driver.git ]; then - git clone git://github.com/raspberrypi/firmware.git -b next bcm2835-driver.git + git clone git://github.com/raspberrypi/firmware.git -b master bcm2835-driver.git fi cd bcm2835-driver.git From cc3bc30e1633abd9562f293b8a296a69e4cc43cb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 28 Dec 2012 16:38:29 +0100 Subject: [PATCH 43/45] xbmc: update to xbmc-c0320c2 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- ...-Confluence-c0320c2-001-add_oe_settings_to_homescreen.patch} | 0 packages/mediacenter/xbmc/meta | 2 +- ...> xbmc-c0320c2-001-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...S-0.1.patch => xbmc-c0320c2-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...uild-0.1.patch => xbmc-c0320c2-311-fix_rsxs_build-0.1.patch} | 0 ...> xbmc-c0320c2-321-texturepacker-hostflags-and-rework.patch} | 0 ...c2-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} | 0 ...-0.1.patch => xbmc-c0320c2-452-change_lcd_content-0.1.patch} | 0 ...atch => xbmc-c0320c2-453-add_openelec.tv_RSS_news-0.1.patch} | 0 ...h-0.1.patch => xbmc-c0320c2-454-disable_backslash-0.1.patch} | 0 ....1.patch => xbmc-c0320c2-457-fix_connection_check-0.1.patch} | 0 ...0.1.patch => xbmc-c0320c2-463-add_remote_devinput-0.1.patch} | 0 13 files changed, 2 insertions(+), 2 deletions(-) rename packages/mediacenter/xbmc-theme-Confluence/patches/{xbmc-theme-Confluence-84fe311-001-add_oe_settings_to_homescreen.patch => xbmc-theme-Confluence-c0320c2-001-add_oe_settings_to_homescreen.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-84fe311-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-c0320c2-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-84fe311-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-c0320c2-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-84fe311-311-fix_rsxs_build-0.1.patch => xbmc-c0320c2-311-fix_rsxs_build-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-84fe311-321-texturepacker-hostflags-and-rework.patch => xbmc-c0320c2-321-texturepacker-hostflags-and-rework.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-84fe311-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch => xbmc-c0320c2-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-84fe311-452-change_lcd_content-0.1.patch => xbmc-c0320c2-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-84fe311-453-add_openelec.tv_RSS_news-0.1.patch => xbmc-c0320c2-453-add_openelec.tv_RSS_news-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-84fe311-454-disable_backslash-0.1.patch => xbmc-c0320c2-454-disable_backslash-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-84fe311-457-fix_connection_check-0.1.patch => xbmc-c0320c2-457-fix_connection_check-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-84fe311-463-add_remote_devinput-0.1.patch => xbmc-c0320c2-463-add_remote_devinput-0.1.patch} (100%) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 59fe3ef40c..bb91f6ab84 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="84fe311" +PKG_VERSION="c0320c2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-84fe311-001-add_oe_settings_to_homescreen.patch b/packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-c0320c2-001-add_oe_settings_to_homescreen.patch similarity index 100% rename from packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-84fe311-001-add_oe_settings_to_homescreen.patch rename to packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-c0320c2-001-add_oe_settings_to_homescreen.patch diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index d541ed9191..036ce3e0db 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="84fe311" +PKG_VERSION="c0320c2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-84fe311-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-c0320c2-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-84fe311-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-c0320c2-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-84fe311-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-c0320c2-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-84fe311-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-c0320c2-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-84fe311-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-c0320c2-311-fix_rsxs_build-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-84fe311-311-fix_rsxs_build-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-c0320c2-311-fix_rsxs_build-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-84fe311-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc/patches/xbmc-c0320c2-321-texturepacker-hostflags-and-rework.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-84fe311-321-texturepacker-hostflags-and-rework.patch rename to packages/mediacenter/xbmc/patches/xbmc-c0320c2-321-texturepacker-hostflags-and-rework.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-84fe311-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-c0320c2-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-84fe311-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-c0320c2-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-84fe311-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-c0320c2-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-84fe311-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-c0320c2-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-84fe311-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-c0320c2-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-84fe311-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-c0320c2-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-84fe311-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-c0320c2-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-84fe311-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-c0320c2-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-84fe311-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-c0320c2-457-fix_connection_check-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-84fe311-457-fix_connection_check-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-c0320c2-457-fix_connection_check-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-84fe311-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-c0320c2-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-84fe311-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-c0320c2-463-add_remote_devinput-0.1.patch From 3d3f29534e431cda9633e3c840254b954e3ecff6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 28 Dec 2012 16:39:07 +0100 Subject: [PATCH 44/45] rtmpdump: build and install 'rtmp*' binaries, needed by various adons too Signed-off-by: Stephan Raue --- packages/multimedia/rtmpdump/build | 8 +++++--- packages/multimedia/rtmpdump/install | 6 ++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/multimedia/rtmpdump/build b/packages/multimedia/rtmpdump/build index 601b9d17b9..1a499c8107 100755 --- a/packages/multimedia/rtmpdump/build +++ b/packages/multimedia/rtmpdump/build @@ -22,7 +22,7 @@ . config/options $1 -cd $PKG_BUILD/librtmp +cd $PKG_BUILD make prefix=/usr \ incdir=/usr/include/librtmp \ @@ -34,7 +34,8 @@ make prefix=/usr \ CRYPTO="OPENSSL" \ OPT="" \ XCFLAGS="$CFLAGS" \ - XLDFLAGS="$LDFLAGS" + XLDFLAGS="$LDFLAGS" \ + XLIBS="-lm" $MAKEINSTALL prefix=/usr \ incdir=/usr/include/librtmp \ @@ -46,4 +47,5 @@ $MAKEINSTALL prefix=/usr \ CRYPTO="OPENSSL" \ OPT="" \ XCFLAGS="$CFLAGS" \ - XLDFLAGS="$LDFLAGS" + XLDFLAGS="$LDFLAGS" \ + XLIBS="-lm" diff --git a/packages/multimedia/rtmpdump/install b/packages/multimedia/rtmpdump/install index c9a3ea51c3..f9c9ab04e8 100755 --- a/packages/multimedia/rtmpdump/install +++ b/packages/multimedia/rtmpdump/install @@ -22,6 +22,12 @@ . config/options $1 +mkdir -p $INSTALL/usr/bin + cp -P $PKG_BUILD/rtmpdump $INSTALL/usr/bin + cp -P $PKG_BUILD/rtmpgw $INSTALL/usr/bin + cp -P $PKG_BUILD/rtmpsrv $INSTALL/usr/bin + cp -P $PKG_BUILD/rtmpsuck $INSTALL/usr/bin + mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/librtmp/*.so* $INSTALL/usr/lib From 25cddb8802c3c6653e7328f63c9dfb6e3d697684 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 28 Dec 2012 16:42:45 +0100 Subject: [PATCH 45/45] ffmpeg: add upstream patch Signed-off-by: Stephan Raue --- ...rced_subtitles_display_in_PGS_stream.patch | 284 ++++++++++++++++++ 1 file changed, 284 insertions(+) create mode 100644 packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-0038-Fixed_forced_subtitles_display_in_PGS_stream.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-0038-Fixed_forced_subtitles_display_in_PGS_stream.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-0038-Fixed_forced_subtitles_display_in_PGS_stream.patch new file mode 100644 index 0000000000..d6e3b5e3ec --- /dev/null +++ b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-0038-Fixed_forced_subtitles_display_in_PGS_stream.patch @@ -0,0 +1,284 @@ +From 3b1409c1a1f0ce486f95087fa0b6ff5bfb841464 Mon Sep 17 00:00:00 2001 +From: GreenOnyx +Date: Thu, 27 Dec 2012 00:18:40 -0600 +Subject: [PATCH] ffmpeg: Fixed forced subtitles display in PGS stream + +Associated ffmpeg commits: + +https://github.com/FFmpeg/FFmpeg/commit/36436a4032b022f5439fa86a0986065d24cd51fd +Add option forced_subs_only for Bluray subtitles. +2012-01-30 04:25:59 + +https://github.com/FFmpeg/FFmpeg/commit/1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9 +PGS subtitles: Expose forced flag +2012-10-20 11:56:11 + +https://github.com/FFmpeg/FFmpeg/commit/1c5805521c3e406886341d752ebf38f8d41e1d13 +PGS subtitles: Set AVSubtitle pts value +2012-11-02 11:30:39 + +https://github.com/FFmpeg/FFmpeg/commit/6549a9b75333027f66cdaac450a66b6a6186fc6e +pgssubdec: remove unused variable +2012-11-28 10:20:08 + +https://github.com/FFmpeg/FFmpeg/commit/1f46b50a9591f68b697e943f829c79a4f4829dd6 +Added AVClass for AVSubtitleRect +2012-04-18 01:08:25 +--- + libavcodec/avcodec.h | 18 +++++++++++++ + libavcodec/dvdsubdec.c | 1 + + libavcodec/options.c | 25 +++++++++++++++++ + libavcodec/pgssubdec.c | 53 ++++++++++++++++++++++++++----------- + 4 files changed, 81 insertions(+), 16 deletions(-) + +diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h +index 6996c92..585414b 100644 +--- a/libavcodec/avcodec.h ++++ b/libavcodec/avcodec.h +@@ -3245,6 +3245,12 @@ enum AVFieldOrder { + int64_t pts_correction_num_faulty_dts; /// Number of incorrect DTS values so far + int64_t pts_correction_last_pts; /// PTS of the last frame + int64_t pts_correction_last_dts; /// DTS of the last frame ++ /** ++ * Requests that only forced subpictures be decoded. ++ * - decoding: set by user ++ * - encoding: unused ++ */ ++ int forced_subs_only; + + } AVCodecContext; + +@@ -3488,6 +3494,8 @@ enum AVSubtitleType { + SUBTITLE_ASS, + }; + ++#define AV_SUBTITLE_FLAG_FORCED 0x00000001 ++ + typedef struct AVSubtitleRect { + int x; ///< top left corner of pict, undefined when pict is not set + int y; ///< top left corner of pict, undefined when pict is not set +@@ -3510,6 +3518,8 @@ enum AVSubtitleType { + * struct. + */ + char *ass; ++ ++ int flags; + } AVSubtitleRect; + + typedef struct AVSubtitle { +@@ -4895,6 +4905,14 @@ enum AVLockOp { + const AVClass *avcodec_get_frame_class(void); + + /** ++ * Get the AVClass for AVSubtitleRect. It can be used in combination with ++ * AV_OPT_SEARCH_FAKE_OBJ for examining options. ++ * ++ * @see av_opt_find(). ++ */ ++const AVClass *avcodec_get_subtitle_rect_class(void); ++ ++/** + * @return a positive value if s is open (i.e. avcodec_open2() was called on it + * with no corresponding avcodec_close()), 0 otherwise. + */ +diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c +index d0d13ee..46a0b8d 100644 +--- a/libavcodec/dvdsubdec.c ++++ b/libavcodec/dvdsubdec.c +@@ -375,6 +375,7 @@ static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header, + sub_header->rects[0]->h = h; + sub_header->rects[0]->type = SUBTITLE_BITMAP; + sub_header->rects[0]->pict.linesize[0] = w; ++ sub_header->rects[0]->flags = is_menu ? AV_SUBTITLE_FLAG_FORCED : 0; + } + } + if (next_cmd_pos < cmd_pos) { +diff --git a/libavcodec/options.c b/libavcodec/options.c +index 5f940a0..ae62e75 100644 +--- a/libavcodec/options.c ++++ b/libavcodec/options.c +@@ -730,3 +730,28 @@ const AVClass *avcodec_get_frame_class(void) + { + return &av_frame_class; + } ++ ++#define SROFFSET(x) offsetof(AVSubtitleRect,x) ++ ++static const AVOption subtitle_rect_options[]={ ++{"x", "", SROFFSET(x), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, ++{"y", "", SROFFSET(y), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, ++{"w", "", SROFFSET(w), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, ++{"h", "", SROFFSET(h), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, ++{"type", "", SROFFSET(type), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, ++{"flags", "", SROFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, 0, 1, 0, "flags"}, ++{"forced", "", SROFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, 0, 1, 0}, ++{NULL}, ++}; ++ ++static const AVClass av_subtitle_rect_class = { ++ .class_name = "AVSubtitleRect", ++ .item_name = NULL, ++ .option = subtitle_rect_options, ++ .version = LIBAVUTIL_VERSION_INT, ++}; ++ ++const AVClass *avcodec_get_subtitle_rect_class(void) ++{ ++ return &av_subtitle_rect_class; ++} +\ No newline at end of file +diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c +index 02e650a..83d7f43 100644 +--- a/libavcodec/pgssubdec.c ++++ b/libavcodec/pgssubdec.c +@@ -29,6 +29,7 @@ + #include "bytestream.h" + #include "libavutil/colorspace.h" + #include "libavutil/imgutils.h" ++#include "libavutil/opt.h" + + #define RGBA(r,g,b,a) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b)) + +@@ -44,12 +45,14 @@ enum SegmentType { + int x; + int y; + int picture_id; ++ int composition; + } PGSSubPictureReference; + + typedef struct PGSSubPresentation { + int id_number; + int object_count; + PGSSubPictureReference *objects; ++ int64_t pts; + } PGSSubPresentation; + + typedef struct PGSSubPicture { +@@ -61,10 +64,11 @@ enum SegmentType { + } PGSSubPicture; + + typedef struct PGSSubContext { ++ AVClass *class; + PGSSubPresentation presentation; + uint32_t clut[256]; + PGSSubPicture pictures[UINT16_MAX]; +- int64_t pts; ++ int forced_subs_only; + } PGSSubContext; + + static av_cold int init_decoder(AVCodecContext *avctx) +@@ -284,10 +288,10 @@ static void parse_palette_segment(AVCodecContext *avctx, + * @param buf pointer to the packet to process + * @param buf_size size of packet to process + * @todo TODO: Implement cropping +- * @todo TODO: Implement forcing of subtitles + */ + static void parse_presentation_segment(AVCodecContext *avctx, +- const uint8_t *buf, int buf_size) ++ const uint8_t *buf, int buf_size, ++ int64_t pts) + { + PGSSubContext *ctx = avctx->priv_data; + +@@ -296,6 +300,8 @@ static void parse_presentation_segment(AVCodecContext *avctx, + + uint16_t object_index; + ++ ctx->presentation.pts = pts; ++ + av_dlog(avctx, "Video Dimensions %dx%d\n", + w, h); + if (av_image_check_size(w, h, 0, avctx) >= 0) +@@ -336,12 +342,10 @@ static void parse_presentation_segment(AVCodecContext *avctx, + PGSSubPictureReference *reference = &ctx->presentation.objects[object_index]; + reference->picture_id = bytestream_get_be16(&buf); + +- /* +- * Skip 2 bytes of unknown: +- * window_id_ref, +- * composition_flag (0x80 - object cropped, 0x40 - object forced) +- */ +- buf += 2; ++ /* Skip window_id_ref */ ++ buf++; ++ /* composition_flag (0x80 - object cropped, 0x40 - object forced) */ ++ reference->composition = bytestream_get_byte(&buf); + + reference->x = bytestream_get_be16(&buf); + reference->y = bytestream_get_be16(&buf); +@@ -388,10 +392,10 @@ static int display_end_segment(AVCodecContext *avctx, void *data, + * not been cleared by a subsequent empty display command. + */ + +- pts = ctx->pts != AV_NOPTS_VALUE ? ctx->pts : sub->pts; ++ pts = ctx->presentation.pts != AV_NOPTS_VALUE ? ctx->presentation.pts : sub->pts; + memset(sub, 0, sizeof(*sub)); + sub->pts = pts; +- ctx->pts = AV_NOPTS_VALUE; ++ ctx->presentation.pts = AV_NOPTS_VALUE; + + // Blank if last object_count was 0. + if (!ctx->presentation.object_count) +@@ -427,6 +431,10 @@ static int display_end_segment(AVCodecContext *avctx, void *data, + sub->rects[rect]->nb_colors = 256; + sub->rects[rect]->pict.data[1] = av_mallocz(AVPALETTE_SIZE); + ++ /* Copy the forced flag */ ++ sub->rects[rect]->flags = (ctx->presentation.objects[rect].composition & 0x40) != 0 ? AV_SUBTITLE_FLAG_FORCED : 0; ++ ++ if (!ctx->forced_subs_only || ctx->presentation.objects[rect].composition & 0x40) + memcpy(sub->rects[rect]->pict.data[1], ctx->clut, sub->rects[rect]->nb_colors * sizeof(uint32_t)); + } + +@@ -436,7 +444,6 @@ static int display_end_segment(AVCodecContext *avctx, void *data, + static int decode(AVCodecContext *avctx, void *data, int *data_size, + AVPacket *avpkt) + { +- PGSSubContext *ctx = avctx->priv_data; + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; + AVSubtitle *sub = data; +@@ -483,8 +490,7 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size, + parse_picture_segment(avctx, buf, segment_length); + break; + case PRESENTATION_SEGMENT: +- parse_presentation_segment(avctx, buf, segment_length); +- ctx->pts = sub->pts; ++ parse_presentation_segment(avctx, buf, segment_length, sub->pts); + break; + case WINDOW_SEGMENT: + /* +@@ -511,6 +517,20 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size, + return buf_size; + } + ++#define OFFSET(x) offsetof(PGSSubContext, x) ++#define SD AV_OPT_FLAG_SUBTITLE_PARAM | AV_OPT_FLAG_DECODING_PARAM ++static const AVOption options[] = { ++ {"forced_subs_only", "Only show forced subtitles", OFFSET(forced_subs_only), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, SD}, ++ { NULL }, ++}; ++ ++static const AVClass pgsdec_class = { ++ .class_name = "PGS subtitle decoder", ++ .item_name = av_default_item_name, ++ .option = options, ++ .version = LIBAVUTIL_VERSION_INT, ++}; ++ + AVCodec ff_pgssub_decoder = { + .name = "pgssub", + .type = AVMEDIA_TYPE_SUBTITLE, +@@ -519,5 +539,6 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size, + .init = init_decoder, + .close = close_decoder, + .decode = decode, +- .long_name = NULL_IF_CONFIG_SMALL("HDMV Presentation Graphic Stream subtitles"), +-}; ++ .long_name = NULL_IF_CONFIG_SMALL("HDMV Presentation Graphic Stream subtitles"), ++ .priv_class = &pgsdec_class, ++}; +\ No newline at end of file +-- +1.7.10 +