aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2012-01-10 14:17:15 -0700
committerJohn Rigby <john.rigby@linaro.org>2012-03-17 17:08:22 -0600
commit69d80a74269ed07339b497af3c1f80e4bfa07189 (patch)
treebcd60d078d1cfcc485e553b00a3f9e26aadc7ede
parent23da1e545c7fd1725d0e24e3216f6054a7b80075 (diff)
LINARO: CONFIG: enable CONFIG_DEBUG_IMX51_UART
Seems at lease one i.mx debug uart must be enabled if LLDEBUG is enabled or we get build errors Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-mx512
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-omap2
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-vexpress2
-rw-r--r--debian.linaro/config/config.common.ubuntu2
4 files changed, 6 insertions, 2 deletions
diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index ac05a9571c8..1e8db175324 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -10,6 +10,8 @@ CONFIG_ARM_THUMBEE=y
CONFIG_AUTO_ZRELADDR=y
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
CONFIG_CMDLINE=""
+CONFIG_DEBUG_IMX51_UART=y
+# CONFIG_DEBUG_LL_UART_NONE is not set
# CONFIG_DISPLAY_SUPPORT is not set
# CONFIG_DRM is not set
# CONFIG_FB_CFB_COPYAREA is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index bbde6dfbf93..1f10c6455f1 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -11,6 +11,8 @@ CONFIG_ARM_THUMBEE=y
# CONFIG_AUTO_ZRELADDR is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
+# CONFIG_DEBUG_IMX51_UART is not set
+CONFIG_DEBUG_LL_UART_NONE=y
CONFIG_DISPLAY_SUPPORT=y
CONFIG_DRM=y
CONFIG_FB_CFB_COPYAREA=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index e3880e950b0..d77de18ece7 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -11,6 +11,8 @@ CONFIG_ARM_L1_CACHE_SHIFT=5
# CONFIG_AUTO_ZRELADDR is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M"
+# CONFIG_DEBUG_IMX51_UART is not set
+CONFIG_DEBUG_LL_UART_NONE=y
# CONFIG_DISPLAY_SUPPORT is not set
# CONFIG_DRM is not set
CONFIG_FB_CFB_COPYAREA=y
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 70559cb6986..3c57a3a8a2e 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -413,7 +413,6 @@ CONFIG_DEBUG_GPIO=y
# CONFIG_DEBUG_HIGHMEM is not set
# CONFIG_DEBUG_ICEDCC is not set
# CONFIG_DEBUG_IMX50_IMX53_UART is not set
-# CONFIG_DEBUG_IMX51_UART is not set
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_INFO_REDUCED is not set
CONFIG_DEBUG_KERNEL=y
@@ -421,7 +420,6 @@ CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_LIST is not set
CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_LL_UART_NONE=y
# CONFIG_DEBUG_LOCKDEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
CONFIG_DEBUG_LOCK_ALLOC=y