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

This commit is contained in:
Stephan Raue 2012-12-02 00:55:46 +01:00
commit d0a3988215
4 changed files with 2669 additions and 691 deletions

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="bcm2835-driver" PKG_NAME="bcm2835-driver"
PKG_VERSION="99a37d1" PKG_VERSION="8ebb067"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="nonfree" PKG_LICENSE="nonfree"

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="bcm2835-bootloader" PKG_NAME="bcm2835-bootloader"
PKG_VERSION="99a37d1" PKG_VERSION="8ebb067"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="arm" PKG_ARCH="arm"
PKG_LICENSE="nonfree" PKG_LICENSE="nonfree"

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm 3.6.7 Kernel Configuration # Linux/arm 3.6.8 Kernel Configuration
# #
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -312,6 +312,7 @@ CONFIG_MACH_BCM2708=y
CONFIG_BCM2708_GPIO=y CONFIG_BCM2708_GPIO=y
CONFIG_BCM2708_VCMEM=y CONFIG_BCM2708_VCMEM=y
# CONFIG_BCM2708_NOL2CACHE is not set # CONFIG_BCM2708_NOL2CACHE is not set
CONFIG_BCM2708_DMAER=y
# #
# Processor Type # Processor Type