From 1f5bc08dd2e4a01daa679db16351510b3b5200b0 Mon Sep 17 00:00:00 2001 From: Rhyland Klein Date: Mon, 16 Jul 2012 12:43:50 -0700 Subject: 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 Change-Id: Ib13e633742a2c4e0060629d145e0571e7a7d5241 Reviewed-on: http://git-master/r/116136 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Allen Martin --- chromeos/config/armel/config.common.armel | 11 +++++------ chromeos/config/armel/config.flavour.chromeos-tegra3 | 3 --- chromeos/config/armel/config.flavour.chromiumos-arm | 2 -- chromeos/config/config.common.chromeos | 3 ++- chromeos/config/i386/config.common.i386 | 1 + chromeos/config/x86_64/config.common.x86_64 | 1 + 6 files changed, 9 insertions(+), 12 deletions(-) (limited to 'chromeos') 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 diff --git a/chromeos/config/config.common.chromeos b/chromeos/config/config.common.chromeos index 6c5db0fc665d..47cabc336e82 100644 --- a/chromeos/config/config.common.chromeos +++ b/chromeos/config/config.common.chromeos @@ -386,7 +386,6 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_DX_SEP is not set # CONFIG_DYNAMIC_DEBUG is not set CONFIG_DYNAMIC_FTRACE=y -CONFIG_EARLY_PRINTK=y # CONFIG_EASYCAP is not set # CONFIG_ECHO is not set # CONFIG_ECONET is not set @@ -969,6 +968,7 @@ CONFIG_MEDIA_TUNER_XC5000=m # CONFIG_MFD_MAX8997 is not set # CONFIG_MFD_MAX8998 is not set # CONFIG_MFD_MC13XXX is not set +# CONFIG_MFD_PALMAS is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_RC5T583 is not set # CONFIG_MFD_RDC321X is not set @@ -1680,6 +1680,7 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TEST_POWER is not set CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y +# CONFIG_THERM_EST is not set CONFIG_TICK_ONESHOT=y # CONFIG_TIFM_CORE is not set CONFIG_TIMERFD=y diff --git a/chromeos/config/i386/config.common.i386 b/chromeos/config/i386/config.common.i386 index a5a85733af59..f9d0c4998553 100644 --- a/chromeos/config/i386/config.common.i386 +++ b/chromeos/config/i386/config.common.i386 @@ -176,6 +176,7 @@ CONFIG_DRM_KMS_HELPER=y CONFIG_E100=m CONFIG_E1000=m CONFIG_E1000E=m +CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK_DBGP=y # CONFIG_EDAC is not set # CONFIG_EDD is not set diff --git a/chromeos/config/x86_64/config.common.x86_64 b/chromeos/config/x86_64/config.common.x86_64 index eab255dbd9e2..c65b0d3d8807 100644 --- a/chromeos/config/x86_64/config.common.x86_64 +++ b/chromeos/config/x86_64/config.common.x86_64 @@ -191,6 +191,7 @@ CONFIG_DRM_KMS_HELPER=y CONFIG_E100=m CONFIG_E1000=m CONFIG_E1000E=m +CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK_DBGP=y # CONFIG_EDAC is not set # CONFIG_EDD is not set -- cgit v1.2.3