Remove/add configs6AM.1.3-rvc-video-j6e-aug

1 files changed, 39 insertions, 25 deletions

diff --git a/arch/arm/configs/ti_sdk_dra7x_android_release_defconfig b/arch/arm/configs/ti_sdk_dra7x_android_release_defconfig
index f1f3ed5b8a26..8968a569b2f5 100644
--- a/arch/arm/configs/ti_sdk_dra7x_android_release_defconfig
+++ b/arch/arm/configs/ti_sdk_dra7x_android_release_defconfig
@@ -76,7 +76,6 @@ CONFIG_MTD_UBI=y
 CONFIG_AD525X_DPOT=y
 CONFIG_AD525X_DPOT_I2C=y
 CONFIG_ATMEL_TCLIB=y
-CONFIG_ICS932S401=y
 CONFIG_ATMEL_SSC=m
 CONFIG_APDS9802ALS=y
 CONFIG_ISL29003=y
@@ -225,8 +224,6 @@ CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_POWER_RESET_KEYSTONE=y
 CONFIG_POWER_RESET_RMOBILE=y
-CONFIG_SENSORS_LM90=y
-CONFIG_SENSORS_LM95245=y
 CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_ROCKCHIP_THERMAL=y
 CONFIG_RCAR_THERMAL=y
@@ -550,17 +547,14 @@ CONFIG_CHROME_PLATFORMS=n
 
 # Kernel compression
 CONFIG_KERNEL_GZIP=n
-CONFIG_KERNEL_LZMA=y
 CONFIG_KERNEL_LZ4=n
 CONFIG_KERNEL_XZ=n
-CONFIG_KERNEL_LZO=n
 
 # Enable process accounting
 CONFIG_BSD_PROCESS_ACCT=y
 
 # Have some way to pick up kernel config later on
 # Always useful to look at /proc/config.gz
-CONFIG_IKCONFIG=y
 
 # Add Bin2c
 CONFIG_BUILD_BIN2C=y
@@ -590,9 +584,7 @@ CONFIG_AEABI=y
 CONFIG_BASE_FULL=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_MODULE_SIG=n
 CONFIG_MODULE_COMPRESS=n
@@ -893,6 +885,7 @@ CONFIG_TWL6040_CORE=y
 CONFIG_MFD_WL1273_CORE=n
 CONFIG_MFD_LM3533=n
 CONFIG_MFD_TI_LP873X=y
+CONFIG_MFD_TI_LP87565=y
 CONFIG_MFD_TC3589X=n
 CONFIG_MFD_TMIO=n
 CONFIG_MFD_T7L66XB=n
@@ -932,6 +925,7 @@ CONFIG_REGULATOR_LP3972=n
 CONFIG_REGULATOR_LP872X=n
 CONFIG_REGULATOR_LP8755=n
 CONFIG_REGULATOR_LP873X=y
+CONFIG_REGULATOR_LP87565=y
 CONFIG_REGULATOR_LTC3589=n
 CONFIG_REGULATOR_MAX14577=n
 CONFIG_REGULATOR_MAX1586=n
@@ -1079,7 +1073,6 @@ CONFIG_GPIO_XILINX=n
 CONFIG_GPIO_TPS6586X=n
 
 # Enable options to facilitate testing
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=n
 CONFIG_CRYPTO_TEST=m
 CONFIG_RTC_DEBUG=y
 CONFIG_THERMAL_EMULATION=y
@@ -1432,6 +1425,7 @@ CONFIG_DRM_OMAP_NUM_CRTCS=2
 CONFIG_DRM_OMAP_WB=y
 
 CONFIG_OMAP2_DSS=y
+CONFIG_OMAP2_DSS_NUM_OVLS=2
 CONFIG_OMAP2_DSS_DEBUGFS=y
 CONFIG_OMAP2_DSS_DPI=y
 CONFIG_OMAP2_DSS_VENC=n
@@ -1550,7 +1544,6 @@ CONFIG_TIMERFD=y
 CONFIG_EPOLL=y
 CONFIG_SYSFS=y
 CONFIG_PROC_FS=y
-CONFIG_FHANDLE=y
 
 # udev will fail to work with the legacy sysfs layout:
 CONFIG_SYSFS_DEPRECATED=n
@@ -1610,16 +1603,18 @@ CONFIG_SCHED_DEBUG=y
 # turn it off at kernel compile time using:
 #  KEEP ALPHABETICALLY SORTED
 # CONFIG_DEVKMEM is not set
+# CONFIG_FHANDLE is not set
 # CONFIG_INET_LRO is not set
 # CONFIG_OABI_COMPAT is not set
 # CONFIG_SYSVIPC is not set
+# CONFIG_USELIB is not set
 CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_DEVICES=binder,hwbinder,vndbinder
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ARMV8_DEPRECATED=y
 CONFIG_ASHMEM=y
 CONFIG_AUDIT=y
-CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_CPUACCT=y
@@ -1627,14 +1622,14 @@ CONFIG_CGROUP_DEBUG=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CP15_BARRIER_EMULATION=y
-CONFIG_DM_CRYPT=y
-CONFIG_DM_VERITY=y
-CONFIG_DM_VERITY_FEC=y
+CONFIG_DEFAULT_SECURITY_SELINUX=y
 CONFIG_EMBEDDED=y
 CONFIG_FB=y
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_IKCONFIG=y
 CONFIG_INET6_AH=y
+CONFIG_INET6_DIAG_DESTROY=y
 CONFIG_INET6_ESP=y
 CONFIG_INET6_IPCOMP=y
 CONFIG_INET=y
@@ -1650,7 +1645,6 @@ CONFIG_IPV6=y
 CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IP_ADVANCED_ROUTER=y
@@ -1671,6 +1665,8 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_NETMAP=y
 CONFIG_IP_NF_TARGET_REDIRECT=y
 CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NETFILTER=y
@@ -1748,9 +1744,9 @@ CONFIG_PREEMPT=y
 CONFIG_PROFILING=y
 CONFIG_QFMT_V2=y
 CONFIG_QUOTA=y
+CONFIG_QUOTACTL=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA_TREE=y
-CONFIG_QUOTACTL=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_RTC_CLASS=y
 CONFIG_RT_GROUP_SCHED=y
@@ -1764,17 +1760,17 @@ CONFIG_STAGING=y
 CONFIG_SWP_EMULATION=y
 CONFIG_SYNC=y
 CONFIG_TUN=y
-CONFIG_UID_CPUTIME=y
+CONFIG_UID_SYS_STATS=y
 CONFIG_UNIX=y
-CONFIG_USB_GADGET=y
 CONFIG_USB_CONFIGFS=y
+CONFIG_USB_CONFIGFS_F_ACC=y
+CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
 CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
 CONFIG_USB_CONFIGFS_F_MTP=y
 CONFIG_USB_CONFIGFS_F_PTP=y
-CONFIG_USB_CONFIGFS_F_ACC=y
-CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
 CONFIG_USB_CONFIGFS_UEVENT=y
-CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_GADGET=y
 CONFIG_USB_OTG_WAKELOCK=y
 CONFIG_XFRM_USER=y
 #  KEEP ALPHABETICALLY SORTED
@@ -1784,16 +1780,23 @@ CONFIG_XFRM_USER=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_NF_CONNTRACK_SIP is not set
 # CONFIG_PM_WAKELOCKS_GC is not set
+# CONFIG_VT is not set
 CONFIG_ANDROID_TIMED_GPIO=y
+CONFIG_ARM64_SW_TTBR0_PAN=y
 CONFIG_ARM_KERNMEM_PERMS=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_CC_STACKPROTECTOR_STRONG=y
 CONFIG_COMPACTION=y
+CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_DEBUG_RODATA=y
+CONFIG_DM_CRYPT=y
 CONFIG_DM_UEVENT=y
+CONFIG_DM_VERITY=y
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DRAGONRISE_FF=y
 CONFIG_ENABLE_DEFAULT_TRACERS=y
 CONFIG_EXT4_FS=y
@@ -1869,8 +1872,9 @@ CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGITECH_FF=y
 CONFIG_MD=y
 CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEMORY_STATE_TIME=y
 CONFIG_MSDOS_FS=y
-CONFIG_PANIC_TIMEOUT=5
+CONFIG_PANIC_TIMEOUT=0
 CONFIG_PANTHERLORD_FF=y
 CONFIG_PERF_EVENTS=y
 CONFIG_PM_DEBUG=y
@@ -1898,7 +1902,6 @@ CONFIG_TIMER_STATS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_UHID=y
-CONFIG_MEMORY_STATE_TIME=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_HIDDEV=y
@@ -1947,6 +1950,11 @@ CONFIG_DEBUG_LL=y
 CONFIG_DEBUG_OMAP2UART1=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_DEBUG_GPIO=n
+
+#Turn off un-necessary drivers
+CONFIG_SENSORS_LM90=n
+CONFIG_SENSORS_LM95245=n
+CONFIG_ICS932S401=n
 ###############################################################################
 # TI Android Config Options
 # Use to set additional android options exclusively for TI products
@@ -1960,6 +1968,14 @@ CONFIG_MODULES=y
 CONFIG_CMDLINE="root=/dev/mmcblk0p2 rw init=/init rootfstype=ext4 rootwait drm.rnodes=1 androidboot.selinux=permissive snd.slots_reserved=1,1 snd-soc-core.pmdown_time=-1 uio_pdrv_genirq.of_id=generic-uio console=ttyS0,115200 androidboot.console=ttyS0 androidboot.hardware=jacinto6evmboard"
 CONFIG_CMDLINE_EXTEND=y
 
+# Enable SquashFS
+# CONFIG_KERNEL_LZMA is not set
+CONFIG_KERNEL_LZO=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_LZ4=y
+
 # USB DWC3
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_OMAP=y
@@ -2009,8 +2025,6 @@ CONFIG_WLCORE=y
 CONFIG_WLCORE_SPI=y
 CONFIG_WLCORE_SDIO=y
 
-CONFIG_VT=y
-
 # Disable /proc/config.gz
 CONFIG_IKCONFIG_PROC=n