From 864fd4f019674e8333b1fdb91e9242ae75f35992 Mon Sep 17 00:00:00 2001 From: Haoran Wang Date: Wed, 30 Dec 2015 18:41:51 +0800 Subject: [PATCH] MA-7455-1 Pico: modify Pico configuration for Brillo. Modify the picosom to be suit for Brillo configurations. Signed-off-by: Haoran Wang --- configs/picosom-imx6ul_defconfig | 2 +- include/configs/picosom-imx6ul.h | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configs/picosom-imx6ul_defconfig b/configs/picosom-imx6ul_defconfig index 9f95f30..46a742e 100644 --- a/configs/picosom-imx6ul_defconfig +++ b/configs/picosom-imx6ul_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/technexion/picosom-imx6ul/imximage.cfg,MX6UL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/technexion/picosom-imx6ul/imximage.cfg,MX6UL,ANDROID_SUPPORT,BRILLO_SUPPORT" CONFIG_ARM=y CONFIG_TARGET_PICOSOM_IMX6UL=y CONFIG_DM=y diff --git a/include/configs/picosom-imx6ul.h b/include/configs/picosom-imx6ul.h index 932f9a2..7c96376 100644 --- a/include/configs/picosom-imx6ul.h +++ b/include/configs/picosom-imx6ul.h @@ -19,6 +19,7 @@ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_SYS_BOOTM_LEN 0x1000000 /* uncomment for SECURE mode support */ /* #define CONFIG_SECURE_BOOT */ @@ -58,7 +59,7 @@ #define CONFIG_FSL_USDHC #ifdef CONFIG_FSL_USDHC #define CONFIG_FSL_ESDHC -#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR +#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR #define CONFIG_SYS_FSL_USDHC_NUM 1 @@ -380,4 +381,9 @@ #include "mx6ul_14x14_evk_android.h" #endif +#if defined(CONFIG_BRILLO_SUPPORT) +#include "mx6ul_14x14_evk_brillo.h" +#endif + + #endif -- 1.9.1