diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-08-04 16:13:55 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-08-04 16:13:55 +0100 |
| commit | 611ee64d3560a082b41f74fc3921cbe42be951ba (patch) | |
| tree | 8e27b7619064cf5cbeb2db3ce6983ab7bdb2fcfe /linaro | |
| parent | b08ba4cdea50ace8a6752f4618b4c1270cc5f73e (diff) | |
| parent | ff9c905471b0e3bf0755f7673dcad62e3c678a9f (diff) | |
Merge branch 'lsk-3.10-armlt-mali' into integration-lsk-3.10-juno-android
Conflicts:
linaro/configs/vexpress64.conf
Diffstat (limited to 'linaro')
| -rw-r--r-- | linaro/configs/vexpress64.conf | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf index 686d6bd5fa6d..e0fb35a95867 100644 --- a/linaro/configs/vexpress64.conf +++ b/linaro/configs/vexpress64.conf @@ -77,3 +77,8 @@ CONFIG_DRM_VIRTUAL_HDLCD=y CONFIG_CMA_SIZE_MBYTES=32 CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_DRM_I2C_NXP_TDA998X=y +CONFIG_MALI_MIDGARD=y +CONFIG_MALI_PLATFORM_THIRDPARTY=y +CONFIG_MALI_EXPERT=y +CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="juno_soc" +CONFIG_MALI_PLATFORM_FAKE=y |