Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2

This commit is contained in:
Stephan Raue 2013-08-17 14:48:14 +02:00
commit bce65e4499
43 changed files with 1037 additions and 2999 deletions

View File

@ -34,7 +34,7 @@ case "$LINUX" in
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
;; ;;
*) *)
PKG_VERSION="3.10.5" PKG_VERSION="3.10.7"
PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
;; ;;
esac esac

View File

@ -3066,7 +3066,7 @@ CONFIG_MMC=m
# MMC/SD/SDIO Card Drivers # MMC/SD/SDIO Card Drivers
# #
CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_BLOCK_MINORS=32
CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_SDIO_UART is not set # CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set # CONFIG_MMC_TEST is not set

View File

@ -3097,7 +3097,7 @@ CONFIG_MMC=m
# MMC/SD/SDIO Card Drivers # MMC/SD/SDIO Card Drivers
# #
CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_BLOCK_MINORS=32
CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_SDIO_UART is not set # CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set # CONFIG_MMC_TEST is not set

View File

@ -3064,7 +3064,7 @@ CONFIG_MMC=m
# MMC/SD/SDIO Card Drivers # MMC/SD/SDIO Card Drivers
# #
CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_BLOCK_MINORS=32
CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_SDIO_UART is not set # CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set # CONFIG_MMC_TEST is not set

View File

@ -3100,7 +3100,7 @@ CONFIG_MMC=m
# MMC/SD/SDIO Card Drivers # MMC/SD/SDIO Card Drivers
# #
CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_BLOCK_MINORS=32
CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_SDIO_UART is not set # CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set # CONFIG_MMC_TEST is not set

View File

@ -2985,7 +2985,7 @@ CONFIG_MMC=m
# MMC/SD/SDIO Card Drivers # MMC/SD/SDIO Card Drivers
# #
CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_BLOCK_MINORS=32
CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_SDIO_UART is not set # CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set # CONFIG_MMC_TEST is not set

View File

@ -2918,7 +2918,7 @@ CONFIG_MMC=m
# MMC/SD/SDIO Card Drivers # MMC/SD/SDIO Card Drivers
# #
CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_BLOCK_MINORS=32
CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_SDIO_UART is not set # CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set # CONFIG_MMC_TEST is not set

View File

@ -3038,7 +3038,7 @@ CONFIG_MMC=m
# MMC/SD/SDIO Card Drivers # MMC/SD/SDIO Card Drivers
# #
CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_BLOCK_MINORS=32
CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_SDIO_UART is not set # CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set # CONFIG_MMC_TEST is not set

View File

@ -2984,7 +2984,7 @@ CONFIG_MMC=m
# MMC/SD/SDIO Card Drivers # MMC/SD/SDIO Card Drivers
# #
CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_BLOCK_MINORS=32
CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_SDIO_UART is not set # CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set # CONFIG_MMC_TEST is not set

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm 3.10.2 Kernel Configuration # Linux/arm 3.10.7 Kernel Configuration
# #
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -146,7 +146,7 @@ CONFIG_SLAB=y
# CONFIG_PROFILING is not set # CONFIG_PROFILING is not set
CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_OPROFILE=y
# CONFIG_KPROBES is not set # CONFIG_KPROBES is not set
# CONFIG_JUMP_LABEL is not set CONFIG_JUMP_LABEL=y
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_KRETPROBES=y
@ -305,6 +305,7 @@ CONFIG_ARM_THUMB=y
# CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_ICACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_BPREDICT_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set
CONFIG_KUSER_HELPERS=y
# CONFIG_CACHE_L2X0 is not set # CONFIG_CACHE_L2X0 is not set
CONFIG_ARM_L1_CACHE_SHIFT=5 CONFIG_ARM_L1_CACHE_SHIFT=5
CONFIG_ARM_DMA_MEM_BUFFERABLE=y CONFIG_ARM_DMA_MEM_BUFFERABLE=y
@ -429,8 +430,7 @@ CONFIG_VFP=y
CONFIG_BINFMT_ELF=y CONFIG_BINFMT_ELF=y
CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
CONFIG_BINFMT_SCRIPT=y CONFIG_BINFMT_SCRIPT=y
CONFIG_HAVE_AOUT=y # CONFIG_HAVE_AOUT is not set
# CONFIG_BINFMT_AOUT is not set
# CONFIG_BINFMT_MISC is not set # CONFIG_BINFMT_MISC is not set
# CONFIG_COREDUMP is not set # CONFIG_COREDUMP is not set
@ -883,7 +883,7 @@ CONFIG_PPPOE=m
CONFIG_PPP_ASYNC=m CONFIG_PPP_ASYNC=m
# CONFIG_PPP_SYNC_TTY is not set # CONFIG_PPP_SYNC_TTY is not set
# CONFIG_SLIP is not set # CONFIG_SLIP is not set
CONFIG_SLHC=m CONFIG_SLHC=y
# #
# USB Network Adapters # USB Network Adapters
@ -2138,7 +2138,7 @@ CONFIG_MMC=y
# MMC/SD/SDIO Card Drivers # MMC/SD/SDIO Card Drivers
# #
CONFIG_MMC_BLOCK=y CONFIG_MMC_BLOCK=y
CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_BLOCK_MINORS=32
CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_SDIO_UART is not set # CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set # CONFIG_MMC_TEST is not set

View File

@ -3099,7 +3099,7 @@ CONFIG_MMC=m
# MMC/SD/SDIO Card Drivers # MMC/SD/SDIO Card Drivers
# #
CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_BLOCK_MINORS=32
CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_SDIO_UART is not set # CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set # CONFIG_MMC_TEST is not set

View File

@ -3066,7 +3066,7 @@ CONFIG_MMC=m
# MMC/SD/SDIO Card Drivers # MMC/SD/SDIO Card Drivers
# #
CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_BLOCK_MINORS=32
CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_SDIO_UART is not set # CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set # CONFIG_MMC_TEST is not set