diff options
25 files changed, 2116 insertions, 1460 deletions
@@ -118,8 +118,8 @@ config ADK_KERNEL_VERSION_3_11_10 prompt "3.11.10" boolean -config ADK_KERNEL_VERSION_3_10_34 - prompt "3.10.34" +config ADK_KERNEL_VERSION_3_10_36 + prompt "3.10.36" boolean config ADK_KERNEL_VERSION_3_4_84 @@ -133,7 +133,7 @@ config ADK_KERNEL_VERSION default "3.13.7" if ADK_KERNEL_VERSION_3_13_7 default "3.12.14" if ADK_KERNEL_VERSION_3_12_14 default "3.11.10" if ADK_KERNEL_VERSION_3_11_10 - default "3.10.34" if ADK_KERNEL_VERSION_3_10_34 + default "3.10.36" if ADK_KERNEL_VERSION_3_10_36 default "3.4.84" if ADK_KERNEL_VERSION_3_4_84 help diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 7cfb5998b..452415a94 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -22,11 +22,11 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= 59f352d3f4e2cdf6755f79e09fa09176 endif -ifeq ($(ADK_KERNEL_VERSION_3_10_34),y) -KERNEL_VERSION:= 3.10.34 +ifeq ($(ADK_KERNEL_VERSION_3_10_36),y) +KERNEL_VERSION:= 3.10.36 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 30991b495a3d75196d5608072d2e62e6 +KERNEL_MD5SUM:= 721f76050755ec8ec88876ee350a2726 endif ifeq ($(ADK_KERNEL_VERSION_3_4_84),y) KERNEL_VERSION:= 3.4.84 diff --git a/mk/vars.mk b/mk/vars.mk index 3ae3f1d67..947aacbed 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -169,6 +169,7 @@ LDFLAGS_FOR_BUILD?= -L$(STAGING_HOST_DIR)/usr/lib FLAGS_FOR_BUILD= ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD} PATCH= PATH=${HOST_PATH} ${BASH} $(SCRIPT_DIR)/patch.sh +PATCHP0= PATH=${HOST_PATH} patch -p0 SED:= PATH=${HOST_PATH} sed -i -e LINUX_DIR:= $(BUILD_DIR)/linux KERNEL_MODULE_FLAGS:= ARCH=${ARCH} \ diff --git a/package/bcm2835-bootloader/Makefile b/package/bcm2835-bootloader/Makefile index b88cd7f08..a23764076 100644 --- a/package/bcm2835-bootloader/Makefile +++ b/package/bcm2835-bootloader/Makefile @@ -4,15 +4,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bcm2835-bootloader -# actually 9953ce0847c04b587b694c79c5b5a4ac63f5c369 from 25.03.2014 -# https://github.com/raspberrypi/firmware -PKG_VERSION:= 0.7 +# actually 04ba1c03780ae708c9289bce14f56933e55e9c20 from 13.04.2014 +PKG_VERSION:= 0.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7ad7e5d3ad311d88d1e82fc729042d87 +PKG_MD5SUM:= 08beaa7d66e7dd6b0ab58483d0f4ce40 PKG_DESCR:= bootloader for raspberry pi (bcm2835) PKG_SECTION:= boot +PKG_URL:= https://github.com/raspberrypi/firmware PKG_SITES:= http://openadk.org/distfiles/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + PKG_SYSTEM_DEPENDS:= raspberry-pi include ${TOPDIR}/mk/package.mk diff --git a/package/bcm2835-vc/Makefile b/package/bcm2835-vc/Makefile index 12655228c..707d4e067 100644 --- a/package/bcm2835-vc/Makefile +++ b/package/bcm2835-vc/Makefile @@ -4,17 +4,19 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bcm2835-vc -# actually a8fbe2cd6a3d4455344295809f2e663373ad25cb from 25.03.2014 -# https://github.com/raspberrypi/userland -PKG_VERSION:= 0.4 +# actually a59842a068cbd19e262701f30014499e9070fbf6 from 13.04.2014 +PKG_VERSION:= 0.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 091ae422e05a59ffc2b8908256047b7d +PKG_MD5SUM:= ed8c41f58e5657209cca73cb46b846d3 PKG_DESCR:= vc tools and libraries for raspberry pi PKG_SECTION:= base PKG_DEPENDS:= libpthread PKG_BUILDDEP:= cmake-host +PKG_URL:= https://github.com/raspberrypi/userland PKG_SITES:= http://openadk.org/distfiles/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + PKG_SYSTEM_DEPENDS:= raspberry-pi include ${TOPDIR}/mk/package.mk diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 838ed551d..4ba06e495 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ffmpeg -PKG_VERSION:= 2.2 +PKG_VERSION:= 2.2.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 744febca199548c9393b1f1ed05ccdd8 +PKG_MD5SUM:= b8a1ee4964c2638f46fcc803ed453818 PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs PKG_FDEPENDS:= libpthread diff --git a/package/grub/Makefile b/package/grub/Makefile index 9e43242aa..ee0b214c4 100644 --- a/package/grub/Makefile +++ b/package/grub/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 5 PKG_MD5SUM:= e927540b6eda8b024fb0391eeaa4091c PKG_DESCR:= GRUB2 bootloader PKG_SECTION:= boot -PKG_BUILDDEP:= bison-host qemu-host +PKG_BUILDDEP:= bison-host PKG_URL:= http://www.gnu.org/software/grub PKG_SITES:= ftp://ftp.gnu.org/gnu/grub/ @@ -52,7 +52,7 @@ grub-install: ${INSTALL_DIR} $(IDIR_GRUB)/boot/grub/${GRUB_ARCH} ${CP} ${WRKINST}/usr/lib/grub/${GRUB_ARCH}/*{mod,lst,img} \ $(IDIR_GRUB)/boot/grub/${GRUB_ARCH}/ - ${CP} ./files/core.img.${GRUB_ARCH} \ + -${CP} ./files/core.img.${GRUB_ARCH} \ $(IDIR_GRUB)/boot/grub/core.img grub-tools-install: diff --git a/package/gst-plugins-base/Makefile b/package/gst-plugins-base/Makefile new file mode 100644 index 000000000..2759558e2 --- /dev/null +++ b/package/gst-plugins-base/Makefile @@ -0,0 +1,33 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= gst-plugins-base +PKG_VERSION:= 1.2.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 2e75fb03ed7e4d24d88601fcac4d57aa +PKG_DESCR:= gstreamer base plugins +PKG_SECTION:= libs +PKG_DEPENDS:= gstreamer +PKG_BUILDDEP:= gstreamer libvorbis libtheora alsa-lib +PKG_URL:= http://gstreamer.freedesktop.org/ +PKG_SITES:= http://gstreamer.freedesktop.org/src/gst-plugins-base/ +PKG_OPTS:= dev + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,GST_PLUGINS_BASE,gst-plugins-base,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE + +gst-plugins-base-install: + $(INSTALL_DIR) $(IDIR_GST_PLUGINS_BASE)/usr/lib/gstreamer-1.0/ + $(CP) $(WRKINST)/usr/lib/gstreamer-1.0/*.so \ + $(IDIR_GST_PLUGINS_BASE)/usr/lib/gstreamer-1.0/ + $(CP) $(WRKINST)/usr/lib/libgst*.so* \ + $(IDIR_GST_PLUGINS_BASE)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gstreamer/Makefile b/package/gstreamer/Makefile new file mode 100644 index 000000000..6a3012635 --- /dev/null +++ b/package/gstreamer/Makefile @@ -0,0 +1,27 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= gstreamer +PKG_VERSION:= 1.2.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 55d50f48a496799dbb0b195c9c6c6153 +PKG_DESCR:= opensource multimedia framework +PKG_SECTION:= libs +PKG_URL:= http://gstreamer.freedesktop.org/ +PKG_SITES:= http://gstreamer.freedesktop.org/src/gstreamer/ +PKG_OPTS:= dev + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,GSTREAMER,gstreamer,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +gstreamer-install: + $(INSTALL_DIR) $(IDIR_GSTREAMER)/usr/lib + $(CP) $(WRKINST)/usr/lib/libgstreamer*.so* \ + $(IDIR_GSTREAMER)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile index 24d7ce1d0..e048165bd 100644 --- a/package/gtk+/Makefile +++ b/package/gtk+/Makefile @@ -4,10 +4,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gtk+ -PKG_VERSION:= 2.24.6 +PKG_VERSION:= 2.24.22 PKG_EXTRAVER:= 2.24 PKG_RELEASE:= 1 -PKG_MD5SUM:= 4d7efde4ac24dbaa720bc0744eee8235 +PKG_MD5SUM:= 5fbbfb7637bbd571a572a2dae0e736d2 PKG_DESCR:= GTK+ library PKG_SECTION:= libs PKG_DEPENDS:= glib diff --git a/package/gtk+/patches/patch-Makefile_in b/package/gtk+/patches/patch-Makefile_in index 2303be5c0..7732e28b9 100644 --- a/package/gtk+/patches/patch-Makefile_in +++ b/package/gtk+/patches/patch-Makefile_in @@ -1,11 +1,11 @@ ---- gtk+-2.24.6.orig/Makefile.in 2011-08-30 22:23:21.000000000 +0200 -+++ gtk+-2.24.6/Makefile.in 2011-11-08 18:27:10.745082865 +0100 -@@ -459,7 +459,7 @@ XVFB_START = \ +--- gtk+-2.24.22.orig/Makefile.in 2013-10-11 11:58:05.000000000 +0200 ++++ gtk+-2.24.22/Makefile.in 2013-12-17 12:22:11.517248005 +0100 +@@ -552,7 +552,7 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY -SRC_SUBDIRS = gdk gtk modules demos tests perf -+SRC_SUBDIRS = gdk gtk modules tests perf ++SRC_SUBDIRS = gdk gtk modules perf SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build # require automake 1.4 diff --git a/package/gtk+/patches/patch-gtk_gtktypefuncs_c b/package/gtk+/patches/patch-gtk_gtktypefuncs_c deleted file mode 100644 index 2a98f9002..000000000 --- a/package/gtk+/patches/patch-gtk_gtktypefuncs_c +++ /dev/null @@ -1,78 +0,0 @@ ---- gtk+-2.24.6.orig/gtk/gtktypefuncs.c 2011-08-30 22:24:44.000000000 +0200 -+++ gtk+-2.24.6/gtk/gtktypefuncs.c 2011-11-08 18:06:50.273051952 +0100 -@@ -54,8 +54,8 @@ - *tp++ = gdk_pixbuf_simple_anim_get_type(); - *tp++ = gdk_pixbuf_simple_anim_iter_get_type(); - *tp++ = gdk_pixmap_get_type(); --*tp++ = gdk_property_state_get_type(); - *tp++ = gdk_prop_mode_get_type(); -+*tp++ = gdk_property_state_get_type(); - *tp++ = gdk_rectangle_get_type(); - *tp++ = gdk_rgb_dither_get_type(); - *tp++ = gdk_screen_get_type(); -@@ -190,14 +190,14 @@ - *tp++ = gtk_icon_view_drop_position_get_type(); - *tp++ = gtk_icon_view_get_type(); - *tp++ = gtk_identifier_get_type(); --*tp++ = gtk_image_get_type(); --*tp++ = gtk_image_menu_item_get_type(); --*tp++ = gtk_image_type_get_type(); - *tp++ = gtk_im_context_get_type(); - *tp++ = gtk_im_context_simple_get_type(); - *tp++ = gtk_im_multicontext_get_type(); - *tp++ = gtk_im_preedit_style_get_type(); - *tp++ = gtk_im_status_style_get_type(); -+*tp++ = gtk_image_get_type(); -+*tp++ = gtk_image_menu_item_get_type(); -+*tp++ = gtk_image_type_get_type(); - *tp++ = gtk_info_bar_get_type(); - *tp++ = gtk_invisible_get_type(); - *tp++ = gtk_item_get_type(); -@@ -281,10 +281,10 @@ - *tp++ = gtk_response_type_get_type(); - *tp++ = gtk_scale_button_get_type(); - *tp++ = gtk_scale_get_type(); --*tp++ = gtk_scrollbar_get_type(); --*tp++ = gtk_scrolled_window_get_type(); - *tp++ = gtk_scroll_step_get_type(); - *tp++ = gtk_scroll_type_get_type(); -+*tp++ = gtk_scrollbar_get_type(); -+*tp++ = gtk_scrolled_window_get_type(); - *tp++ = gtk_selection_data_get_type(); - *tp++ = gtk_selection_mode_get_type(); - *tp++ = gtk_sensitivity_type_get_type(); -@@ -301,11 +301,11 @@ - *tp++ = gtk_sort_type_get_type(); - *tp++ = gtk_spin_button_get_type(); - *tp++ = gtk_spin_button_update_policy_get_type(); --*tp++ = gtk_spinner_get_type(); - *tp++ = gtk_spin_type_get_type(); -+*tp++ = gtk_spinner_get_type(); - *tp++ = gtk_state_type_get_type(); --*tp++ = gtk_statusbar_get_type(); - *tp++ = gtk_status_icon_get_type(); -+*tp++ = gtk_statusbar_get_type(); - *tp++ = gtk_style_get_type(); - *tp++ = gtk_submenu_direction_get_type(); - *tp++ = gtk_submenu_placement_get_type(); -@@ -329,16 +329,16 @@ - *tp++ = gtk_toggle_action_get_type(); - *tp++ = gtk_toggle_button_get_type(); - *tp++ = gtk_toggle_tool_button_get_type(); --*tp++ = gtk_toolbar_child_type_get_type(); --*tp++ = gtk_toolbar_get_type(); --*tp++ = gtk_toolbar_space_style_get_type(); --*tp++ = gtk_toolbar_style_get_type(); - *tp++ = gtk_tool_button_get_type(); - *tp++ = gtk_tool_item_get_type(); - *tp++ = gtk_tool_item_group_get_type(); - *tp++ = gtk_tool_palette_drag_targets_get_type(); - *tp++ = gtk_tool_palette_get_type(); - *tp++ = gtk_tool_shell_get_type(); -+*tp++ = gtk_toolbar_child_type_get_type(); -+*tp++ = gtk_toolbar_get_type(); -+*tp++ = gtk_toolbar_space_style_get_type(); -+*tp++ = gtk_toolbar_style_get_type(); - *tp++ = gtk_tooltip_get_type(); - *tp++ = gtk_tree_drag_dest_get_type(); - *tp++ = gtk_tree_drag_source_get_type(); diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile index c36174f43..7e724dcd3 100644 --- a/package/omxplayer/Makefile +++ b/package/omxplayer/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= omxplayer -# actually 1ca2f7adaa7f6a92410d9664e76c395537659dba from 07.04.2014 -PKG_VERSION:= 0.4 -PKG_RELEASE:= 2 -PKG_MD5SUM:= d4efff32305bd16315e6fa4f80ea2a98 +# actually 46616c55c2fad3dac47d17e8a6b41a16a4d6f15e from 13.04.2014 +PKG_VERSION:= 0.5 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 1c882539dfcbc4e8efeae85ff8069cbe PKG_DESCR:= video player for raspberry pi PKG_SECTION:= multimedia PKG_DEPENDS:= libffmpeg boost bcm2835-vc libfreetype libpcre @@ -16,6 +16,8 @@ PKG_BUILDDEP:= ffmpeg boost bcm2835-vc freetype pcre dbus PKG_URL:= https://github.com/popcornmix/omxplayer PKG_SITES:= http://openadk.org/distfiles/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + PKG_SYSTEM_DEPENDS:= raspberry-pi PKG_LIBC_DEPENDS:= glibc musl diff --git a/package/python2/Makefile b/package/python2/Makefile index b5aac2032..757e6adc5 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -108,7 +108,7 @@ hostpre-configure: $(CP) $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py $(WRKBUILD) $(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py $(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py - (cd $(WRKBUILD) && patch -p0 < patch-Lib_distutils_sysconfig_py) + (cd $(WRKBUILD) && ${PATCHP0} < patch-Lib_distutils_sysconfig_py) $(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \ $(WRKBUILD)/Misc/python-config.in @@ -119,13 +119,13 @@ hostpost-install: $(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/python-config.patch $(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/python-config.patch (cd $(STAGING_HOST_DIR)/usr/bin && \ - patch -p0 < $(WRKBUILD)/python-config.patch) + ${PATCHP0} < $(WRKBUILD)/python-config.patch) pre-configure: $(CP) $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py $(WRKBUILD) $(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py $(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py - (cd $(WRKBUILD) && patch -p0 <$(WRKBUILD)/patch-Lib_distutils_sysconfig_py) + (cd $(WRKBUILD) && ${PATCHP0} <$(WRKBUILD)/patch-Lib_distutils_sysconfig_py) $(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \ $(WRKBUILD)/Misc/python-config.in diff --git a/package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c b/package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c new file mode 100644 index 000000000..1a93e1411 --- /dev/null +++ b/package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c @@ -0,0 +1,11 @@ +--- xbmc-12.3-Frodo.orig/lib/xbmc-dll-symbols/DllAvFormat.c 2013-12-12 22:47:49.000000000 +0100 ++++ xbmc-12.3-Frodo/lib/xbmc-dll-symbols/DllAvFormat.c 2014-04-14 17:07:49.000000000 +0200 +@@ -110,7 +110,7 @@ void av_read_frame_flush(AVFormatContext + #define RELATIVE_TS_BASE (INT64_MAX - (1LL<<48)) + if(st->first_dts == AV_NOPTS_VALUE) st->cur_dts = RELATIVE_TS_BASE; + else st->cur_dts = AV_NOPTS_VALUE; /* we set the current DTS to an unspecified origin */ +- st->reference_dts = AV_NOPTS_VALUE; ++ //st->reference_dts = AV_NOPTS_VALUE; + + st->probe_packets = MAX_PROBE_PACKETS; + #endif diff --git a/target/arm/cubox-i/patches/3.10.34/solidrun-cubox-i.patch b/target/arm/cubox-i/patches/3.10.36/solidrun-cubox-i.patch index beaa71b4e..beaa71b4e 100644 --- a/target/arm/cubox-i/patches/3.10.34/solidrun-cubox-i.patch +++ b/target/arm/cubox-i/patches/3.10.36/solidrun-cubox-i.patch diff --git a/target/arm/raspberry-pi/patches/3.10.34/raspberry-pi.patch b/target/arm/raspberry-pi/patches/3.10.36/raspberry-pi.patch index 2c313a843..bb50393a9 100644 --- a/target/arm/raspberry-pi/patches/3.10.34/raspberry-pi.patch +++ b/target/arm/raspberry-pi/patches/3.10.36/raspberry-pi.patch @@ -1,6 +1,6 @@ -diff -Nur linux-3.10.33/arch/arm/configs/bcmrpi_cutdown_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_cutdown_defconfig ---- linux-3.10.33/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-raspberry-pi/arch/arm/configs/bcmrpi_cutdown_defconfig 2014-03-13 12:46:12.312043485 +0100 +diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.10.36/arch/arm/configs/bcmrpi_cutdown_defconfig +--- linux-3.10.36.orig/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.36/arch/arm/configs/bcmrpi_cutdown_defconfig 2014-04-13 17:32:40.000000000 +0200 @@ -0,0 +1,504 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -506,10 +506,10 @@ diff -Nur linux-3.10.33/arch/arm/configs/bcmrpi_cutdown_defconfig linux-raspberr +CONFIG_SPI_MASTER=y +CONFIG_SPI_BCM2708=m + -diff -Nur linux-3.10.33/arch/arm/configs/bcmrpi_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_defconfig ---- linux-3.10.33/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-raspberry-pi/arch/arm/configs/bcmrpi_defconfig 2014-03-13 12:46:12.312043485 +0100 -@@ -0,0 +1,1093 @@ +diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_defconfig linux-3.10.36/arch/arm/configs/bcmrpi_defconfig +--- linux-3.10.36.orig/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.10.36/arch/arm/configs/bcmrpi_defconfig 2014-04-13 17:32:40.000000000 +0200 +@@ -0,0 +1,1098 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SYSVIPC=y @@ -781,6 +781,9 @@ diff -Nur linux-3.10.33/arch/arm/configs/bcmrpi_defconfig linux-raspberry-pi/arc +CONFIG_BRIDGE_EBT_NFLOG=m +CONFIG_SCTP_COOKIE_HMAC_SHA1=y +CONFIG_L2TP=m ++CONFIG_L2TP_V3=y ++CONFIG_L2TP_IP=m ++CONFIG_L2TP_ETH=m +CONFIG_BRIDGE=m +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y @@ -928,6 +931,7 @@ diff -Nur linux-3.10.33/arch/arm/configs/bcmrpi_defconfig linux-raspberry-pi/arc +CONFIG_MACVLAN=m +CONFIG_NETCONSOLE=m +CONFIG_TUN=m ++CONFIG_VETH=m +CONFIG_MDIO_BITBANG=m +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m @@ -1255,6 +1259,7 @@ diff -Nur linux-3.10.33/arch/arm/configs/bcmrpi_defconfig linux-raspberry-pi/arc +CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m +CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m +CONFIG_SND_BCM2708_SOC_RPI_DAC=m ++CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m +CONFIG_SOUND_PRIME=m +CONFIG_HIDRAW=y +CONFIG_HID_A4TECH=m @@ -1603,545 +1608,9 @@ diff -Nur linux-3.10.33/arch/arm/configs/bcmrpi_defconfig linux-raspberry-pi/arc +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.10.33/arch/arm/configs/bcmrpi_emergency_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_emergency_defconfig ---- linux-3.10.33/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-raspberry-pi/arch/arm/configs/bcmrpi_emergency_defconfig 2014-03-13 12:46:12.312043485 +0100 -@@ -0,0 +1,532 @@ -+CONFIG_EXPERIMENTAL=y -+# CONFIG_LOCALVERSION_AUTO is not set -+CONFIG_SYSVIPC=y -+CONFIG_POSIX_MQUEUE=y -+CONFIG_BSD_PROCESS_ACCT=y -+CONFIG_BSD_PROCESS_ACCT_V3=y -+CONFIG_FHANDLE=y -+CONFIG_AUDIT=y -+CONFIG_IKCONFIG=y -+CONFIG_IKCONFIG_PROC=y -+CONFIG_BLK_DEV_INITRD=y -+CONFIG_INITRAMFS_SOURCE="../target_fs" -+CONFIG_CGROUP_FREEZER=y -+CONFIG_CGROUP_DEVICE=y -+CONFIG_CGROUP_CPUACCT=y -+CONFIG_RESOURCE_COUNTERS=y -+CONFIG_BLK_CGROUP=y -+CONFIG_NAMESPACES=y -+CONFIG_SCHED_AUTOGROUP=y -+CONFIG_EMBEDDED=y -+# CONFIG_COMPAT_BRK is not set -+CONFIG_SLAB=y -+CONFIG_PROFILING=y -+CONFIG_OPROFILE=m -+CONFIG_KPROBES=y -+CONFIG_MODULES=y -+CONFIG_MODULE_UNLOAD=y -+CONFIG_MODVERSIONS=y -+CONFIG_MODULE_SRCVERSION_ALL=y -+# CONFIG_BLK_DEV_BSG is not set -+CONFIG_BLK_DEV_THROTTLING=y -+CONFIG_CFQ_GROUP_IOSCHED=y -+CONFIG_ARCH_BCM2708=y -+CONFIG_NO_HZ=y -+CONFIG_HIGH_RES_TIMERS=y -+CONFIG_AEABI=y -+CONFIG_SECCOMP=y -+CONFIG_CC_STACKPROTECTOR=y -+CONFIG_ZBOOT_ROM_TEXT=0x0 -+CONFIG_ZBOOT_ROM_BSS=0x0 -+CONFIG_CMDLINE="dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext3 rootwait" -+CONFIG_KEXEC=y -+CONFIG_CPU_IDLE=y -+CONFIG_VFP=y -+CONFIG_BINFMT_MISC=m -+CONFIG_NET=y -+CONFIG_PACKET=y -+CONFIG_UNIX=y -+CONFIG_XFRM_USER=y -+CONFIG_NET_KEY=m -+CONFIG_INET=y -+CONFIG_IP_MULTICAST=y -+CONFIG_IP_PNP=y -+CONFIG_IP_PNP_DHCP=y -+CONFIG_IP_PNP_RARP=y -+CONFIG_SYN_COOKIES=y -+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -+# CONFIG_INET_XFRM_MODE_TUNNEL is not set -+# CONFIG_INET_XFRM_MODE_BEET is not set -+# CONFIG_INET_LRO is not set -+# CONFIG_INET_DIAG is not set -+# CONFIG_IPV6 is not set -+CONFIG_NET_PKTGEN=m -+CONFIG_IRDA=m -+CONFIG_IRLAN=m -+CONFIG_IRCOMM=m -+CONFIG_IRDA_ULTRA=y -+CONFIG_IRDA_CACHE_LAST_LSAP=y -+CONFIG_IRDA_FAST_RR=y -+CONFIG_IRTTY_SIR=m -+CONFIG_KINGSUN_DONGLE=m -+CONFIG_KSDAZZLE_DONGLE=m -+CONFIG_KS959_DONGLE=m -+CONFIG_USB_IRDA=m -+CONFIG_SIGMATEL_FIR=m -+CONFIG_MCS_FIR=m -+CONFIG_BT=m -+CONFIG_BT_L2CAP=y -+CONFIG_BT_SCO=y -+CONFIG_BT_RFCOMM=m -+CONFIG_BT_RFCOMM_TTY=y -+CONFIG_BT_BNEP=m -+CONFIG_BT_BNEP_MC_FILTER=y -+CONFIG_BT_BNEP_PROTO_FILTER=y -+CONFIG_BT_HIDP=m -+CONFIG_BT_HCIBTUSB=m -+CONFIG_BT_HCIBCM203X=m -+CONFIG_BT_HCIBPA10X=m -+CONFIG_BT_HCIBFUSB=m -+CONFIG_BT_HCIVHCI=m -+CONFIG_BT_MRVL=m -+CONFIG_BT_MRVL_SDIO=m -+CONFIG_BT_ATH3K=m -+CONFIG_CFG80211=m -+CONFIG_MAC80211=m -+CONFIG_MAC80211_RC_PID=y -+CONFIG_MAC80211_MESH=y -+CONFIG_WIMAX=m -+CONFIG_NET_9P=m -+CONFIG_NFC=m -+CONFIG_NFC_PN533=m -+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -+CONFIG_BLK_DEV_LOOP=y -+CONFIG_BLK_DEV_CRYPTOLOOP=m -+CONFIG_BLK_DEV_NBD=m -+CONFIG_BLK_DEV_RAM=y -+CONFIG_CDROM_PKTCDVD=m -+CONFIG_MISC_DEVICES=y -+CONFIG_SCSI=y -+# CONFIG_SCSI_PROC_FS is not set -+CONFIG_BLK_DEV_SD=y -+CONFIG_BLK_DEV_SR=m -+CONFIG_SCSI_MULTI_LUN=y -+# CONFIG_SCSI_LOWLEVEL is not set -+CONFIG_MD=y -+CONFIG_NETDEVICES=y -+CONFIG_TUN=m -+CONFIG_PHYLIB=m -+CONFIG_MDIO_BITBANG=m -+CONFIG_NET_ETHERNET=y -+# CONFIG_NETDEV_1000 is not set -+# CONFIG_NETDEV_10000 is not set -+CONFIG_LIBERTAS_THINFIRM=m -+CONFIG_LIBERTAS_THINFIRM_USB=m -+CONFIG_AT76C50X_USB=m -+CONFIG_USB_ZD1201=m -+CONFIG_USB_NET_RNDIS_WLAN=m -+CONFIG_RTL8187=m -+CONFIG_MAC80211_HWSIM=m -+CONFIG_ATH_COMMON=m -+CONFIG_ATH9K=m -+CONFIG_ATH9K_HTC=m -+CONFIG_CARL9170=m -+CONFIG_B43=m -+CONFIG_B43LEGACY=m -+CONFIG_HOSTAP=m -+CONFIG_IWM=m -+CONFIG_LIBERTAS=m -+CONFIG_LIBERTAS_USB=m -+CONFIG_LIBERTAS_SDIO=m -+CONFIG_P54_COMMON=m -+CONFIG_P54_USB=m -+CONFIG_RT2X00=m -+CONFIG_RT2500USB=m -+CONFIG_RT73USB=m -+CONFIG_RT2800USB=m -+CONFIG_RT2800USB_RT53XX=y -+CONFIG_RTL8192CU=m -+CONFIG_WL1251=m -+CONFIG_WL12XX_MENU=m -+CONFIG_ZD1211RW=m -+CONFIG_MWIFIEX=m -+CONFIG_MWIFIEX_SDIO=m -+CONFIG_WIMAX_I2400M_USB=m -+CONFIG_USB_CATC=m -+CONFIG_USB_KAWETH=m -+CONFIG_USB_PEGASUS=m -+CONFIG_USB_RTL8150=m -+CONFIG_USB_USBNET=y -+CONFIG_USB_NET_AX8817X=m -+CONFIG_USB_NET_CDCETHER=m -+CONFIG_USB_NET_CDC_EEM=m -+CONFIG_USB_NET_DM9601=m -+CONFIG_USB_NET_SMSC75XX=m -+CONFIG_USB_NET_SMSC95XX=y -+CONFIG_USB_NET_GL620A=m -+CONFIG_USB_NET_NET1080=m -+CONFIG_USB_NET_PLUSB=m -+CONFIG_USB_NET_MCS7830=m -+CONFIG_USB_NET_CDC_SUBSET=m -+CONFIG_USB_ALI_M5632=y -+CONFIG_USB_AN2720=y -+CONFIG_USB_KC2190=y -+# CONFIG_USB_NET_ZAURUS is not set -+CONFIG_USB_NET_CX82310_ETH=m -+CONFIG_USB_NET_KALMIA=m -+CONFIG_USB_NET_INT51X1=m -+CONFIG_USB_IPHETH=m -+CONFIG_USB_SIERRA_NET=m -+CONFIG_USB_VL600=m -+CONFIG_PPP=m -+CONFIG_PPP_ASYNC=m -+CONFIG_PPP_SYNC_TTY=m -+CONFIG_PPP_DEFLATE=m -+CONFIG_PPP_BSDCOMP=m -+CONFIG_SLIP=m -+CONFIG_SLIP_COMPRESSED=y -+CONFIG_NETCONSOLE=m -+CONFIG_INPUT_POLLDEV=m -+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -+CONFIG_INPUT_JOYDEV=m -+CONFIG_INPUT_EVDEV=m -+# CONFIG_INPUT_KEYBOARD is not set -+# CONFIG_INPUT_MOUSE is not set -+CONFIG_INPUT_MISC=y -+CONFIG_INPUT_AD714X=m -+CONFIG_INPUT_ATI_REMOTE=m -+CONFIG_INPUT_ATI_REMOTE2=m -+CONFIG_INPUT_KEYSPAN_REMOTE=m -+CONFIG_INPUT_POWERMATE=m -+CONFIG_INPUT_YEALINK=m -+CONFIG_INPUT_CM109=m -+CONFIG_INPUT_UINPUT=m -+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -+CONFIG_INPUT_ADXL34X=m -+CONFIG_INPUT_CMA3000=m -+CONFIG_SERIO=m -+CONFIG_SERIO_RAW=m -+CONFIG_GAMEPORT=m -+CONFIG_GAMEPORT_NS558=m -+CONFIG_GAMEPORT_L4=m -+CONFIG_VT_HW_CONSOLE_BINDING=y -+# CONFIG_LEGACY_PTYS is not set -+# CONFIG_DEVKMEM is not set -+CONFIG_SERIAL_AMBA_PL011=y -+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -+# CONFIG_HW_RANDOM is not set -+CONFIG_RAW_DRIVER=y -+CONFIG_GPIO_SYSFS=y -+# CONFIG_HWMON is not set -+CONFIG_WATCHDOG=y -+CONFIG_BCM2708_WDT=m -+# CONFIG_MFD_SUPPORT is not set -+CONFIG_FB=y -+CONFIG_FB_BCM2708=y -+CONFIG_FRAMEBUFFER_CONSOLE=y -+CONFIG_LOGO=y -+# CONFIG_LOGO_LINUX_MONO is not set -+# CONFIG_LOGO_LINUX_VGA16 is not set -+CONFIG_SOUND=y -+CONFIG_SND=m -+CONFIG_SND_SEQUENCER=m -+CONFIG_SND_SEQ_DUMMY=m -+CONFIG_SND_MIXER_OSS=m -+CONFIG_SND_PCM_OSS=m -+CONFIG_SND_SEQUENCER_OSS=y -+CONFIG_SND_HRTIMER=m -+CONFIG_SND_DUMMY=m -+CONFIG_SND_ALOOP=m -+CONFIG_SND_VIRMIDI=m -+CONFIG_SND_MTPAV=m -+CONFIG_SND_SERIAL_U16550=m -+CONFIG_SND_MPU401=m -+CONFIG_SND_BCM2835=m -+CONFIG_SND_USB_AUDIO=m -+CONFIG_SND_USB_UA101=m -+CONFIG_SND_USB_CAIAQ=m -+CONFIG_SND_USB_6FIRE=m -+CONFIG_SOUND_PRIME=m -+CONFIG_HID_PID=y -+CONFIG_USB_HIDDEV=y -+CONFIG_HID_A4TECH=m -+CONFIG_HID_ACRUX=m -+CONFIG_HID_APPLE=m -+CONFIG_HID_BELKIN=m -+CONFIG_HID_CHERRY=m -+CONFIG_HID_CHICONY=m -+CONFIG_HID_CYPRESS=m -+CONFIG_HID_DRAGONRISE=m -+CONFIG_HID_EMS_FF=m -+CONFIG_HID_ELECOM=m -+CONFIG_HID_EZKEY=m -+CONFIG_HID_HOLTEK=m -+CONFIG_HID_KEYTOUCH=m -+CONFIG_HID_KYE=m -+CONFIG_HID_UCLOGIC=m -+CONFIG_HID_WALTOP=m -+CONFIG_HID_GYRATION=m -+CONFIG_HID_TWINHAN=m -+CONFIG_HID_KENSINGTON=m -+CONFIG_HID_LCPOWER=m -+CONFIG_HID_LOGITECH=m -+CONFIG_HID_MAGICMOUSE=m -+CONFIG_HID_MICROSOFT=m -+CONFIG_HID_MONTEREY=m -+CONFIG_HID_MULTITOUCH=m -+CONFIG_HID_NTRIG=m -+CONFIG_HID_ORTEK=m -+CONFIG_HID_PANTHERLORD=m -+CONFIG_HID_PETALYNX=m -+CONFIG_HID_PICOLCD=m -+CONFIG_HID_QUANTA=m -+CONFIG_HID_ROCCAT=m -+CONFIG_HID_SAMSUNG=m -+CONFIG_HID_SONY=m -+CONFIG_HID_SPEEDLINK=m -+CONFIG_HID_SUNPLUS=m -+CONFIG_HID_GREENASIA=m -+CONFIG_HID_SMARTJOYPLUS=m -+CONFIG_HID_TOPSEED=m -+CONFIG_HID_THRUSTMASTER=m -+CONFIG_HID_WACOM=m -+CONFIG_HID_WIIMOTE=m -+CONFIG_HID_ZEROPLUS=m -+CONFIG_HID_ZYDACRON=m -+CONFIG_USB=y -+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -+CONFIG_USB_MON=m -+CONFIG_USB_DWCOTG=y -+CONFIG_USB_STORAGE=y -+CONFIG_USB_STORAGE_REALTEK=m -+CONFIG_USB_STORAGE_DATAFAB=m -+CONFIG_USB_STORAGE_FREECOM=m -+CONFIG_USB_STORAGE_ISD200=m -+CONFIG_USB_STORAGE_USBAT=m -+CONFIG_USB_STORAGE_SDDR09=m -+CONFIG_USB_STORAGE_SDDR55=m -+CONFIG_USB_STORAGE_JUMPSHOT=m -+CONFIG_USB_STORAGE_ALAUDA=m -+CONFIG_USB_STORAGE_ONETOUCH=m -+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 -+CONFIG_USB_SERIAL=m -+CONFIG_USB_SERIAL_GENERIC=y -+CONFIG_USB_SERIAL_AIRCABLE=m -+CONFIG_USB_SERIAL_ARK3116=m -+CONFIG_USB_SERIAL_BELKIN=m -+CONFIG_USB_SERIAL_CH341=m -+CONFIG_USB_SERIAL_WHITEHEAT=m -+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -+CONFIG_USB_SERIAL_CP210X=m -+CONFIG_USB_SERIAL_CYPRESS_M8=m -+CONFIG_USB_SERIAL_EMPEG=m -+CONFIG_USB_SERIAL_FTDI_SIO=m -+CONFIG_USB_SERIAL_FUNSOFT=m -+CONFIG_USB_SERIAL_VISOR=m -+CONFIG_USB_SERIAL_IPAQ=m -+CONFIG_USB_SERIAL_IR=m -+CONFIG_US |