ARM64: tegra21: update tegra21 defconfig using make

Update the tegra21 defconfig using make and savedefconfig
commands.

bug 200349203

Change-Id: I4c71d8ab18d75ef2965cc0659038e843c9e63a0c
Signed-off-by: Manikanta Maddireddy <mmaddireddy@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1565204
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

diff --git a/arch/arm64/configs/tegra21_android_defconfig b/arch/arm64/configs/tegra21_android_defconfig
index 73fa745eea5ccbc3590380548218b5fdcba92824..59a63b9bc09493ada9d55deca56741548e6d2e34 100644 (file)
--- a/arch/arm64/configs/tegra21_android_defconfig
+++ b/arch/arm64/configs/tegra21_android_defconfig
@@ -129,7 +129,6 @@ CONFIG_NETFILTER_XT_MATCH_STRING=y
 CONFIG_NETFILTER_XT_MATCH_TIME=y
 CONFIG_NETFILTER_XT_MATCH_U32=y
 CONFIG_NF_CONNTRACK_IPV4=y
-CONFIG_NF_NAT_IPV4=y
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_MATCH_AH=y
 CONFIG_IP_NF_MATCH_ECN=y
@@ -188,6 +187,7 @@ CONFIG_NVS=y
 CONFIG_NVS_IIO=y
 CONFIG_NVS_LIGHT=y
 CONFIG_NVS_PROXIMITY=y
+CONFIG_NVS_TRIGGERED_BUFFER=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_ATA=y
 CONFIG_SATA_AHCI_TEGRA=y
@@ -321,8 +321,8 @@ CONFIG_VIDEO_LC898212=y
 CONFIG_VIDEO_OV5693=y
 CONFIG_VIDEO_IMX219=y
 CONFIG_VIDEO_IMX274=y
-CONFIG_VIDEO_IMX185=y
 CONFIG_VIDEO_TC358840=y
+CONFIG_VIDEO_IMX185=y
 CONFIG_I2C_IOEXPANDER_PCA9570=y
 CONFIG_FB=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
@@ -431,12 +431,12 @@ CONFIG_ASHMEM=y
 CONFIG_ANDROID_TIMED_GPIO=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ION=y
-CONFIG_TEGRA_NVDUMPER=y
 CONFIG_FIQ_DEBUGGER=y
 CONFIG_SW_SYNC=y
 CONFIG_SW_SYNC_USER=y
 CONFIG_TEGRA_MC_DOMAINS=y
 # CONFIG_TEGRA3_PM is not set
+CONFIG_TEGRA_NVDUMPER=y
 CONFIG_TEGRA_BWMGR=y
 CONFIG_TEGRA_ISOMGR=y
 CONFIG_TEGRA_THERMAL_THROTTLE=y
@@ -454,12 +454,8 @@ CONFIG_EXTCON=y
 CONFIG_EXTCON_ADC_JACK=y
 CONFIG_EXTCON_GPIO=y
 CONFIG_MEMORY=y
-# NVS SENSOR CONFIGS START
 CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y
-CONFIG_IIO_KFIFO_BUF=y
-CONFIG_IIO_TRIGGER=y
-CONFIG_NVS_TRIGGERED_BUFFER=y
 CONFIG_NVS_AIS328DQ=y
 CONFIG_NVS_A3G4250D=y
 CONFIG_NVI_MPU=y
@@ -467,8 +463,6 @@ CONFIG_NVS_BH1730FVC=y
 CONFIG_NVS_CM3218=y
 CONFIG_NVI_AK89XX=y
 CONFIG_NVI_BMPX80=y
-CONFIG_NVS_LED_TEST=y
-# NVS SENSOR CONFIGS END
 CONFIG_PWM=y
 CONFIG_PWM_TEGRA=y
 CONFIG_PWM_TEGRA_DFLL=y
@@ -527,7 +521,6 @@ CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
 CONFIG_CORESIGHT_SINK_TPIU=y
 CONFIG_CORESIGHT_SINK_ETBV10=y
 CONFIG_CORESIGHT_SOURCE_ETM4X=y
-CONFIG_KEYS=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_SELINUX=y

diff --git a/arch/arm64/configs/tegra21_defconfig b/arch/arm64/configs/tegra21_defconfig
index 78ab68dc5bbd76d879e200da4651cd93817cd90e..bbe7bf3a2b95121735f8769e456f983b4847fcb5 100644 (file)
--- a/arch/arm64/configs/tegra21_defconfig
+++ b/arch/arm64/configs/tegra21_defconfig
@@ -126,14 +126,13 @@ CONFIG_NETFILTER_XT_MATCH_STRING=y
 CONFIG_NETFILTER_XT_MATCH_TIME=y
 CONFIG_NETFILTER_XT_MATCH_U32=y
 CONFIG_NF_CONNTRACK_IPV4=y
-CONFIG_NF_NAT_IPV4=y
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_MATCH_AH=y
 CONFIG_IP_NF_MATCH_ECN=y
 CONFIG_IP_NF_MATCH_TTL=y
 CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_NAT=y
 CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_NAT=y
 CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_MANGLE=y
 CONFIG_IP_NF_RAW=y
@@ -313,9 +312,9 @@ CONFIG_VIDEO_LC898212=y
 CONFIG_VIDEO_OV5693=y
 CONFIG_VIDEO_IMX219=y
 CONFIG_VIDEO_IMX274=y
+CONFIG_VIDEO_TC358840=y
 CONFIG_VIDEO_IMX185=y
 CONFIG_I2C_IOEXPANDER_PCA9570=y
-CONFIG_VIDEO_TC358840=y
 # CONFIG_VGA_ARB is not set
 CONFIG_FB=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y