Merge pull request #811 from aep/master

sun7i: enable MALI_DRM=m
This commit is contained in:
Kevin Mihelich 2014-04-19 16:06:02 -06:00
commit 99fb611b55
2 changed files with 7 additions and 4 deletions

View file

@ -9,7 +9,7 @@ _srcname=linux-sunxi-${_commit}
_kernelname=${pkgbase#linux} _kernelname=${pkgbase#linux}
_desc="sun7i" _desc="sun7i"
pkgver=3.4.79 pkgver=3.4.79
pkgrel=6 pkgrel=7
arch=('armv7h') arch=('armv7h')
url="https://github.com/linux-sunxi/linux-sunxi/" url="https://github.com/linux-sunxi/linux-sunxi/"
license=('GPL2') license=('GPL2')
@ -19,7 +19,7 @@ source=("https://github.com/linux-sunxi/linux-sunxi/archive/${_commit}.tar.gz"
'config' 'config'
'working-bcmdhd-driver.patch') 'working-bcmdhd-driver.patch')
md5sums=('a6f18158a7f8dcb552547ea958c24c6b' md5sums=('a6f18158a7f8dcb552547ea958c24c6b'
'752776a4a195c39b7b388183034b29bf' '00382a1d3301801f3060aa8659046fc6'
'07c260ca97572a830778362c7b744f9c') '07c260ca97572a830778362c7b744f9c')
prepare() { prepare() {

View file

@ -1036,7 +1036,7 @@ CONFIG_EXTRA_FIRMWARE=""
CONFIG_REGMAP=y CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=y CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_SPI=y CONFIG_REGMAP_SPI=y
# CONFIG_DMA_SHARED_BUFFER is not set CONFIG_DMA_SHARED_BUFFER=y
CONFIG_SYNC=y CONFIG_SYNC=y
# CONFIG_SW_SYNC is not set # CONFIG_SW_SYNC is not set
# CONFIG_CMA is not set # CONFIG_CMA is not set
@ -1681,6 +1681,7 @@ CONFIG_I2C_COMPAT=y
CONFIG_I2C_CHARDEV=y CONFIG_I2C_CHARDEV=y
# CONFIG_I2C_MUX is not set # CONFIG_I2C_MUX is not set
CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_ALGOBIT=y
# #
# I2C Hardware Bus support # I2C Hardware Bus support
@ -2502,7 +2503,9 @@ CONFIG_DVB_M88RS2000=m
# #
# Graphics support # Graphics support
# #
# CONFIG_DRM is not set CONFIG_DRM=y
CONFIG_DRM_MALI=m
# CONFIG_DRM_UDL is not set
# CONFIG_ION is not set # CONFIG_ION is not set
CONFIG_MALI=m CONFIG_MALI=m
CONFIG_MALI400=m CONFIG_MALI400=m