summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZheng Liu <zhliu@nvidia.com>2014-09-02 14:51:33 -0700
committerWinnie Hsu <whsu@nvidia.com>2014-09-05 10:26:52 -0700
commitbe010face4ec72da81bac0f84314a3f1c45d147e (patch)
treed7ad4332d7a7c4edc9f3b024ec7970989120ecfd
parent96919f55ac0cb4c28aee2e4447ecc1e18a593cfd (diff)
arm: tegra12_defconfig: renormalize the defconfig
No actual configuration changes. Config items have shifted around, causing confusion when making actuall configuration changes. This defconfig is generated with the following process under the kernel directory: make tegra12_defconfig make oldconfig make savedefconfig cp defconfig arch/arm/configs/tegra12_defconfig Change-Id: Ic0c197cf6bad4cb4ddd7742215fab8a1e8d30a50 Signed-off-by: Zheng Liu <zhliu@nvidia.com> Reviewed-on: http://git-master/r/494897 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Allen Martin <amartin@nvidia.com>
-rw-r--r--arch/arm/configs/tegra12_defconfig14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/configs/tegra12_defconfig b/arch/arm/configs/tegra12_defconfig
index 48f36ba4d736..53b78e0455a3 100644
--- a/arch/arm/configs/tegra12_defconfig
+++ b/arch/arm/configs/tegra12_defconfig
@@ -35,7 +35,6 @@ CONFIG_TEGRA_EDP_LIMITS=y
CONFIG_TEGRA_GADGET_BOOST_CPU_FREQ=1400
CONFIG_TEGRA_DYNAMIC_PWRDET=y
CONFIG_TEGRA_PLLM_SCALED=y
-CONFIG_TEGRA_MC_DOMAINS=y
# CONFIG_CACHE_L2X0 is not set
CONFIG_PCI_TEGRA=y
CONFIG_PCIEPORTBUS=y
@@ -56,6 +55,7 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
CONFIG_CPU_IDLE=y
CONFIG_CPUQUIET_FRAMEWORK=y
+CONFIG_CPUQUIET_DEFAULT_GOV_RUNNABLE=y
CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_PM_RUNTIME=y
@@ -176,6 +176,8 @@ CONFIG_MAC80211=m
CONFIG_RFKILL=y
CONFIG_RFKILL_GPIO=y
CONFIG_CAIF=y
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_CMA=y
CONFIG_PLATFORM_ENABLE_IOMMU=y
@@ -320,7 +322,6 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
# CONFIG_TEGRA_RPC is not set
CONFIG_TEGRA_NVAVP=y
CONFIG_TEGRA_NVAVP_AUDIO=y
-CONFIG_VIDEO_CAMERA=y
CONFIG_VIDEO_OV5640=y
CONFIG_VIDEO_AR0832=y
CONFIG_VIDEO_IMX091=y
@@ -335,6 +336,7 @@ CONFIG_TORCH_AS364X=y
CONFIG_VIDEO_AD5816=y
CONFIG_VIDEO_DW9718=y
CONFIG_VIDEO_IMX179=y
+CONFIG_VIDEO_CAMERA=y
CONFIG_SOC_CAMERA=y
CONFIG_SOC_CAMERA_PLATFORM=m
CONFIG_VIDEO_TEGRA=m
@@ -347,7 +349,6 @@ CONFIG_TEGRA_DC=y
CONFIG_TEGRA_DSI=y
CONFIG_TEGRA_DSI2EDP_SN65DSI86=y
CONFIG_TEGRA_DP=y
-CONFIG_GK20A_PMU=y
# CONFIG_TEGRA_CAMERA is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
@@ -487,6 +488,7 @@ CONFIG_SENSORS_JSA1127=y
CONFIG_INA219=y
CONFIG_INA230=y
CONFIG_INA3221=y
+CONFIG_TEGRA_MC_DOMAINS=y
CONFIG_CLK_PALMAS=y
CONFIG_CLK_AS3722=y
CONFIG_TEGRA_IOMMU_SMMU=y
@@ -496,6 +498,8 @@ CONFIG_EXTCON_PALMAS=y
CONFIG_IIO=y
CONFIG_PWM=y
CONFIG_PWM_TEGRA=y
+CONFIG_GK20A_PMU=y
+CONFIG_GK20A_DEVFREQ=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
# CONFIG_DNOTIFY is not set
@@ -509,8 +513,6 @@ CONFIG_ROOT_NFS=y
CONFIG_NFSD=y
CONFIG_NFSD_V4=y
CONFIG_CIFS=m
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ISO8859_1=y
CONFIG_PRINTK_TIME=y
@@ -534,5 +536,3 @@ CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRYPTO_DEV_TEGRA_SE=y
-CONFIG_GK20A_DEVFREQ=y
-CONFIG_CPUQUIET_DEFAULT_GOV_RUNNABLE=y