chromeos: config: renormalize cfgs and drop debug_ll

Renormalize split configs based on current TOT k3.1 kernel and
remove DEBUG_LL to clean up the kernel log a bit.

BUG=None
TEST=Verified generated config doesn't prompt.

Signed-off-by: Rhyland Klein <rklein@nvidia.com>
Change-Id: Ib13e633742a2c4e0060629d145e0571e7a7d5241
Reviewed-on: http://git-master/r/116136
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Allen Martin <amartin@nvidia.com>

3 files changed, 5 insertions, 11 deletions

diff --git a/chromeos/config/armel/config.common.armel b/chromeos/config/armel/config.common.armel
index 98451e005db9..cf47e6aefd0d 100644
--- a/chromeos/config/armel/config.common.armel
+++ b/chromeos/config/armel/config.common.armel
@@ -158,8 +158,7 @@ CONFIG_CPU_V7=y
 # CONFIG_CRYPTO_DEV_TEGRA_AES is not set
 # CONFIG_DCC_TTY is not set
 # CONFIG_DEBUG_HIGHMEM is not set
-# CONFIG_DEBUG_ICEDCC is not set
-CONFIG_DEBUG_LL=y
+# CONFIG_DEBUG_LL is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 # CONFIG_DM9000 is not set
@@ -276,6 +275,7 @@ CONFIG_NVMAP_ALLOW_SYSMEM=y
 CONFIG_NVMAP_CACHE_MAINT_BY_SET_WAYS=y
 CONFIG_NVMAP_CARVEOUT_COMPACTOR=y
 # CONFIG_NVMAP_CARVEOUT_KILLER is not set
+CONFIG_NVMAP_CONVERT_CARVEOUT_TO_IOVMM=y
 # CONFIG_NVMAP_HIGHMEM_ONLY is not set
 CONFIG_NVMAP_PAGE_POOLS=y
 CONFIG_NVMAP_PAGE_POOL_SIZE=0x0
@@ -455,20 +455,19 @@ CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_TEGRA_BB_XMM_POWER2 is not set
 # CONFIG_TEGRA_BPC_MGMT is not set
 CONFIG_TEGRA_CAMERA=y
+# CONFIG_TEGRA_CEC_SUPPORT is not set
 CONFIG_TEGRA_CLOCK_DEBUG_WRITE=y
 CONFIG_TEGRA_CORE_DVFS=y
 CONFIG_TEGRA_CPU_DVFS=y
 CONFIG_TEGRA_DC=y
 CONFIG_TEGRA_DC_EXTENSIONS=y
-# CONFIG_TEGRA_DEBUG_UARTC is not set
-# CONFIG_TEGRA_DEBUG_UARTD is not set
-# CONFIG_TEGRA_DEBUG_UARTE is not set
-# CONFIG_TEGRA_DEBUG_UART_NONE is not set
+CONFIG_TEGRA_DEBUG_UART_NONE=y
 # CONFIG_TEGRA_DSI is not set
 CONFIG_TEGRA_DTV=y
 CONFIG_TEGRA_EMC_SCALING_ENABLE=y
 # CONFIG_TEGRA_FIQ_DEBUGGER is not set
 # CONFIG_TEGRA_FPGA_PLATFORM is not set
+CONFIG_TEGRA_GADGET_BOOST_CPU_FREQ=0
 CONFIG_TEGRA_GRHOST=y
 CONFIG_TEGRA_GRHOST_DEFAULT_TIMEOUT=30000
 CONFIG_TEGRA_GRHOST_USE_NVMAP=y
diff --git a/chromeos/config/armel/config.flavour.chromeos-tegra3 b/chromeos/config/armel/config.flavour.chromeos-tegra3
index 1b6f87579921..0fec8aefd690 100644
--- a/chromeos/config/armel/config.flavour.chromeos-tegra3
+++ b/chromeos/config/armel/config.flavour.chromeos-tegra3
@@ -64,7 +64,6 @@ CONFIG_NFS_V3=y
 CONFIG_NFS_V4=y
 # CONFIG_NFS_V4_1 is not set
 CONFIG_NR_CPUS=4
-CONFIG_NVMAP_CONVERT_CARVEOUT_TO_IOVMM=y
 CONFIG_PAGE_OFFSET=0x80000000
 CONFIG_PCI_MSI=y
 CONFIG_REGMAP=y
@@ -97,8 +96,6 @@ CONFIG_TEGRA_AUTO_HOTPLUG=y
 CONFIG_TEGRA_AVP_KERNEL_ON_SMMU=y
 # CONFIG_TEGRA_CARDHU_DSI is not set
 CONFIG_TEGRA_CLUSTER_CONTROL=y
-CONFIG_TEGRA_DEBUG_UARTA=y
-# CONFIG_TEGRA_DEBUG_UARTB is not set
 CONFIG_TEGRA_DYNAMIC_PWRDET=y
 CONFIG_TEGRA_EDP_EXACT_FREQ=y
 CONFIG_TEGRA_EDP_LIMITS=y
diff --git a/chromeos/config/armel/config.flavour.chromiumos-arm b/chromeos/config/armel/config.flavour.chromiumos-arm
index 3cfc11bfffc9..33c524d0d506 100644
--- a/chromeos/config/armel/config.flavour.chromiumos-arm
+++ b/chromeos/config/armel/config.flavour.chromiumos-arm
@@ -60,8 +60,6 @@ CONFIG_TASK_SIZE=0xBF000000
 CONFIG_TASK_SIZE_3G_LESS_16M=y
 # CONFIG_TASK_SIZE_3G_LESS_24M is not set
 CONFIG_TEGRA_AVP_KERNEL_ON_MMU=y
-# CONFIG_TEGRA_DEBUG_UARTA is not set
-CONFIG_TEGRA_DEBUG_UARTB=y
 # CONFIG_TEGRA_DYNAMIC_PWRDET is not set
 # CONFIG_TEGRA_EDP_LIMITS is not set
 CONFIG_TEGRA_EMC_TO_DDR_CLOCK=2