diff options
| author | Arvind Chauhan <arvind.chauhan@arm.com> | 2017-10-30 15:28:09 +0530 |
|---|---|---|
| committer | Arvind Chauhan <arvind.chauhan@arm.com> | 2018-01-24 14:31:35 +0530 |
| commit | 70f47073605bb72b6f6556f5a20f445aef7842cf (patch) | |
| tree | c5cf73fe1b310ce7fd400b942a330ee59d6c3f90 | |
| parent | 77e347a9710bc21c27dd3b2fc151be9dad471ee2 (diff) | |
configs: mali: Maintain mali gpu configs in mali.conf
Change-Id: Id902192eaec693a966ccf6e7e81e21261d30f0bc
Signed-off-by: Arvind Chauhan <arvind.chauhan@arm.com>
| -rw-r--r-- | linaro/configs/mali.conf | 7 | ||||
| -rw-r--r-- | linaro/configs/vexpress64.conf | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/linaro/configs/mali.conf b/linaro/configs/mali.conf new file mode 100644 index 000000000000..adf02b7fbd6d --- /dev/null +++ b/linaro/configs/mali.conf @@ -0,0 +1,7 @@ +CONFIG_MALI_MIDGARD=y +CONFIG_MALI_EXPERT=y +CONFIG_MALI_PLATFORM_FAKE=y +CONFIG_MALI_PLATFORM_THIRDPARTY=y +CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="juno_soc" +CONFIG_MALI_PLATFORM_DEVICETREE=y +CONFIG_MALI_DEVFREQ=y diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf index 75eae39b97e8..8ceaf7f1f633 100644 --- a/linaro/configs/vexpress64.conf +++ b/linaro/configs/vexpress64.conf @@ -86,6 +86,7 @@ CONFIG_ARM_TIMER_SP804=y CONFIG_ARM_CPUIDLE=y CONFIG_PM_DEBUG=y CONFIG_PM_RUNTIME=y +<<<<<<< 77e347a9710bc21c27dd3b2fc151be9dad471ee2 CONFIG_TEE=y CONFIG_OPTEE=y CONFIG_DEVMEM=y @@ -121,11 +122,4 @@ CONFIG_CMA=y CONFIG_DMA_CMA=y CONFIG_CMA_SIZE_MBYTES=96 CONFIG_DRM_I2C_NXP_TDA998X=y -CONFIG_MALI_MIDGARD=y -CONFIG_MALI_EXPERT=y -CONFIG_MALI_PLATFORM_FAKE=y -CONFIG_MALI_PLATFORM_THIRDPARTY=y -CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="juno_soc" -CONFIG_MALI_PLATFORM_DEVICETREE=y -CONFIG_MALI_DEVFREQ=y CONFIG_ION_DUMMY=y |