CHROMIUM: config: disable serial on exynos by default

Serial slows down boot, besides there will be no accessible serial port on actual
devices.

BUG=chrome-os-partner:11403
TEST=boot

Change-Id: If7a0f19a299c1f220ddfc95294caea6ff98ef7c3
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/28921
Reviewed-by: Doug Anderson <dianders@chromium.org>

diff --git a/chromeos/config/armel/chromeos-exynos5.flavour.config b/chromeos/config/armel/chromeos-exynos5.flavour.config
index 4d8905c..0932355 100644 (file)
--- a/chromeos/config/armel/chromeos-exynos5.flavour.config
+++ b/chromeos/config/armel/chromeos-exynos5.flavour.config
@@ -216,9 +216,7 @@ CONFIG_SAMSUNG_IRQ_VIC_TIMER=y
 # CONFIG_SERIAL_AMBA_PL010 is not set
 # CONFIG_SERIAL_AMBA_PL011 is not set
 # CONFIG_SERIAL_OF_PLATFORM is not set
-CONFIG_SERIAL_SAMSUNG=y
-CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-# CONFIG_SERIAL_SAMSUNG_DEBUG is not set
+# CONFIG_SERIAL_SAMSUNG is not set
 CONFIG_SERIAL_SAMSUNG_UARTS=4
 CONFIG_SERIAL_SAMSUNG_UARTS_4=y
 # CONFIG_SERIO_AMBAKMI is not set

diff --git a/chromeos/config/armel/chromeos-tegra2.flavour.config b/chromeos/config/armel/chromeos-tegra2.flavour.config
index 0ea7d61..13a2c40 100644 (file)
--- a/chromeos/config/armel/chromeos-tegra2.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra2.flavour.config
@@ -114,6 +114,7 @@ CONFIG_REGULATOR_TPS6586X=y
 # CONFIG_RTC_DRV_TEGRA is not set
 CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SMC911X is not set
 CONFIG_SMC91X=m

diff --git a/chromeos/config/armel/chromiumos-arm.flavour.config b/chromeos/config/armel/chromiumos-arm.flavour.config
index 05fbbcc..80ae31c 100644 (file)
--- a/chromeos/config/armel/chromiumos-arm.flavour.config
+++ b/chromeos/config/armel/chromiumos-arm.flavour.config
@@ -114,6 +114,7 @@ CONFIG_REGULATOR_TPS6586X=y
 # CONFIG_RTC_DRV_TEGRA is not set
 CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SMC911X is not set
 CONFIG_SMC91X=m

diff --git a/chromeos/config/armel/common.config b/chromeos/config/armel/common.config
index 0b3ace9..c178cdb 100644 (file)
--- a/chromeos/config/armel/common.config
+++ b/chromeos/config/armel/common.config
@@ -287,7 +287,6 @@ CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SMP_ON_UP=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_PCM=y