summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPedro Perez de Heredia <pedro.perez@digi.com>2012-01-18 18:50:41 +0100
committerPedro Perez de Heredia <pedro.perez@digi.com>2012-01-18 18:51:21 +0100
commit0c5a7e8936e14435f668f1556acf668fdb8afcbb (patch)
tree40ace8fa8431a7ce676c47784943df81d959d34f /arch
parentee1a082458d149626c3c206dc4e732f77d1b7a14 (diff)
ccwmx53js_defconfig: enable 2nd display and set console uart
Signed-off-by: Pedro Perez de Heredia <pedro.perez@digi.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/imx5_ccwmx53js_defconfig11
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/configs/imx5_ccwmx53js_defconfig b/arch/arm/configs/imx5_ccwmx53js_defconfig
index ef9176badf32..e556d4d7a6f7 100644
--- a/arch/arm/configs/imx5_ccwmx53js_defconfig
+++ b/arch/arm/configs/imx5_ccwmx53js_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.35
-# Thu Dec 22 21:46:48 2011
+# Wed Jan 18 18:49:44 2012
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -284,6 +284,11 @@ CONFIG_CCXMX5X_PM_POWER_BUTTON=y
#
# Serial Port Options
#
+CONFIG_CONSOLE_UART1=y
+# CONFIG_CONSOLE_UART2 is not set
+# CONFIG_CONSOLE_UART3 is not set
+# CONFIG_CONSOLE_UART4 is not set
+# CONFIG_CONSOLE_UART5 is not set
CONFIG_UART1_ENABLED=y
CONFIG_UART1_MODE_STANDARD=y
# CONFIG_UART1_MODE_IRDA is not set
@@ -361,7 +366,9 @@ CONFIG_CCXMX5X_DEFAULT_VIDEO_BPP=32
CONFIG_CCXMX5X_DISP0=y
CONFIG_CCXMX5X_DISP0_RGB888=y
# CONFIG_CCXMX5X_DISP0_RGB666 is not set
-# CONFIG_CCXMX5X_DISP1 is not set
+CONFIG_CCXMX5X_DISP1=y
+CONFIG_CCXMX5X_DISP1_RGB888=y
+# CONFIG_CCXMX5X_DISP1_RGB666 is not set
# CONFIG_CCWMX5X_SECOND_TOUCH is not set
# CONFIG_CCWMX5X_FUSION_MULTITOUCH is not set
CONFIG_IRAM_ALLOC=y