aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Huang2017-11-02 23:20:41 -0500
committerDavid Huang2017-11-02 23:20:41 -0500
commit437a4ea385b6a09dbacb83fae2616258fd106e30 (patch)
tree4632d33021d9b9fa79dfd54f931ae84486265fd8
parent8475ff36db1460ccf60c022b2e47ab14a9faa0c4 (diff)
downloadkernel-omap-6AM.1.3-rvc-video-j6e-aug.tar.gz
kernel-omap-6AM.1.3-rvc-video-j6e-aug.tar.xz
kernel-omap-6AM.1.3-rvc-video-j6e-aug.zip
Remove/add configs6AM.1.3-rvc-video-j6e-aug
-rw-r--r--arch/arm/configs/ti_sdk_dra7x_android_release_defconfig64
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
76CONFIG_AD525X_DPOT=y 76CONFIG_AD525X_DPOT=y
77CONFIG_AD525X_DPOT_I2C=y 77CONFIG_AD525X_DPOT_I2C=y
78CONFIG_ATMEL_TCLIB=y 78CONFIG_ATMEL_TCLIB=y
79CONFIG_ICS932S401=y
80CONFIG_ATMEL_SSC=m 79CONFIG_ATMEL_SSC=m
81CONFIG_APDS9802ALS=y 80CONFIG_APDS9802ALS=y
82CONFIG_ISL29003=y 81CONFIG_ISL29003=y
@@ -225,8 +224,6 @@ CONFIG_POWER_RESET_GPIO=y
225CONFIG_POWER_RESET_GPIO_RESTART=y 224CONFIG_POWER_RESET_GPIO_RESTART=y
226CONFIG_POWER_RESET_KEYSTONE=y 225CONFIG_POWER_RESET_KEYSTONE=y
227CONFIG_POWER_RESET_RMOBILE=y 226CONFIG_POWER_RESET_RMOBILE=y
228CONFIG_SENSORS_LM90=y
229CONFIG_SENSORS_LM95245=y
230CONFIG_SENSORS_NTC_THERMISTOR=m 227CONFIG_SENSORS_NTC_THERMISTOR=m
231CONFIG_ROCKCHIP_THERMAL=y 228CONFIG_ROCKCHIP_THERMAL=y
232CONFIG_RCAR_THERMAL=y 229CONFIG_RCAR_THERMAL=y
@@ -550,17 +547,14 @@ CONFIG_CHROME_PLATFORMS=n
550 547
551# Kernel compression 548# Kernel compression
552CONFIG_KERNEL_GZIP=n 549CONFIG_KERNEL_GZIP=n
553CONFIG_KERNEL_LZMA=y
554CONFIG_KERNEL_LZ4=n 550CONFIG_KERNEL_LZ4=n
555CONFIG_KERNEL_XZ=n 551CONFIG_KERNEL_XZ=n
556CONFIG_KERNEL_LZO=n
557 552
558# Enable process accounting 553# Enable process accounting
559CONFIG_BSD_PROCESS_ACCT=y 554CONFIG_BSD_PROCESS_ACCT=y
560 555
561# Have some way to pick up kernel config later on 556# Have some way to pick up kernel config later on
562# Always useful to look at /proc/config.gz 557# Always useful to look at /proc/config.gz
563CONFIG_IKCONFIG=y
564 558
565# Add Bin2c 559# Add Bin2c
566CONFIG_BUILD_BIN2C=y 560CONFIG_BUILD_BIN2C=y
@@ -590,9 +584,7 @@ CONFIG_AEABI=y
590CONFIG_BASE_FULL=y 584CONFIG_BASE_FULL=y
591CONFIG_BASE_SMALL=0 585CONFIG_BASE_SMALL=0
592CONFIG_MODULE_FORCE_LOAD=y 586CONFIG_MODULE_FORCE_LOAD=y
593CONFIG_MODULE_UNLOAD=y
594CONFIG_MODULE_FORCE_UNLOAD=y 587CONFIG_MODULE_FORCE_UNLOAD=y
595CONFIG_MODVERSIONS=y
596CONFIG_MODULE_SRCVERSION_ALL=y 588CONFIG_MODULE_SRCVERSION_ALL=y
597CONFIG_MODULE_SIG=n 589CONFIG_MODULE_SIG=n
598CONFIG_MODULE_COMPRESS=n 590CONFIG_MODULE_COMPRESS=n
@@ -893,6 +885,7 @@ CONFIG_TWL6040_CORE=y
893CONFIG_MFD_WL1273_CORE=n 885CONFIG_MFD_WL1273_CORE=n
894CONFIG_MFD_LM3533=n 886CONFIG_MFD_LM3533=n
895CONFIG_MFD_TI_LP873X=y 887CONFIG_MFD_TI_LP873X=y
888CONFIG_MFD_TI_LP87565=y
896CONFIG_MFD_TC3589X=n 889CONFIG_MFD_TC3589X=n
897CONFIG_MFD_TMIO=n 890CONFIG_MFD_TMIO=n
898CONFIG_MFD_T7L66XB=n 891CONFIG_MFD_T7L66XB=n
@@ -932,6 +925,7 @@ CONFIG_REGULATOR_LP3972=n
932CONFIG_REGULATOR_LP872X=n 925CONFIG_REGULATOR_LP872X=n
933CONFIG_REGULATOR_LP8755=n 926CONFIG_REGULATOR_LP8755=n
934CONFIG_REGULATOR_LP873X=y 927CONFIG_REGULATOR_LP873X=y
928CONFIG_REGULATOR_LP87565=y
935CONFIG_REGULATOR_LTC3589=n 929CONFIG_REGULATOR_LTC3589=n
936CONFIG_REGULATOR_MAX14577=n 930CONFIG_REGULATOR_MAX14577=n
937CONFIG_REGULATOR_MAX1586=n 931CONFIG_REGULATOR_MAX1586=n
@@ -1079,7 +1073,6 @@ CONFIG_GPIO_XILINX=n
1079CONFIG_GPIO_TPS6586X=n 1073CONFIG_GPIO_TPS6586X=n
1080 1074
1081# Enable options to facilitate testing 1075# Enable options to facilitate testing
1082CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=n
1083CONFIG_CRYPTO_TEST=m 1076CONFIG_CRYPTO_TEST=m
1084CONFIG_RTC_DEBUG=y 1077CONFIG_RTC_DEBUG=y
1085CONFIG_THERMAL_EMULATION=y 1078CONFIG_THERMAL_EMULATION=y
@@ -1432,6 +1425,7 @@ CONFIG_DRM_OMAP_NUM_CRTCS=2
1432CONFIG_DRM_OMAP_WB=y 1425CONFIG_DRM_OMAP_WB=y
1433 1426
1434CONFIG_OMAP2_DSS=y 1427CONFIG_OMAP2_DSS=y
1428CONFIG_OMAP2_DSS_NUM_OVLS=2
1435CONFIG_OMAP2_DSS_DEBUGFS=y 1429CONFIG_OMAP2_DSS_DEBUGFS=y
1436CONFIG_OMAP2_DSS_DPI=y 1430CONFIG_OMAP2_DSS_DPI=y
1437CONFIG_OMAP2_DSS_VENC=n 1431CONFIG_OMAP2_DSS_VENC=n
@@ -1550,7 +1544,6 @@ CONFIG_TIMERFD=y
1550CONFIG_EPOLL=y 1544CONFIG_EPOLL=y
1551CONFIG_SYSFS=y 1545CONFIG_SYSFS=y
1552CONFIG_PROC_FS=y 1546CONFIG_PROC_FS=y
1553CONFIG_FHANDLE=y
1554 1547
1555# udev will fail to work with the legacy sysfs layout: 1548# udev will fail to work with the legacy sysfs layout:
1556CONFIG_SYSFS_DEPRECATED=n 1549CONFIG_SYSFS_DEPRECATED=n
@@ -1610,16 +1603,18 @@ CONFIG_SCHED_DEBUG=y
1610# turn it off at kernel compile time using: 1603# turn it off at kernel compile time using:
1611# KEEP ALPHABETICALLY SORTED 1604# KEEP ALPHABETICALLY SORTED
1612# CONFIG_DEVKMEM is not set 1605# CONFIG_DEVKMEM is not set
1606# CONFIG_FHANDLE is not set
1613# CONFIG_INET_LRO is not set 1607# CONFIG_INET_LRO is not set
1614# CONFIG_OABI_COMPAT is not set 1608# CONFIG_OABI_COMPAT is not set
1615# CONFIG_SYSVIPC is not set 1609# CONFIG_SYSVIPC is not set
1610# CONFIG_USELIB is not set
1616CONFIG_ANDROID=y 1611CONFIG_ANDROID=y
1612CONFIG_ANDROID_BINDER_DEVICES=binder,hwbinder,vndbinder
1617CONFIG_ANDROID_BINDER_IPC=y 1613CONFIG_ANDROID_BINDER_IPC=y
1618CONFIG_ANDROID_LOW_MEMORY_KILLER=y 1614CONFIG_ANDROID_LOW_MEMORY_KILLER=y
1619CONFIG_ARMV8_DEPRECATED=y 1615CONFIG_ARMV8_DEPRECATED=y
1620CONFIG_ASHMEM=y 1616CONFIG_ASHMEM=y
1621CONFIG_AUDIT=y 1617CONFIG_AUDIT=y
1622CONFIG_BLK_DEV_DM=y
1623CONFIG_BLK_DEV_INITRD=y 1618CONFIG_BLK_DEV_INITRD=y
1624CONFIG_CGROUPS=y 1619CONFIG_CGROUPS=y
1625CONFIG_CGROUP_CPUACCT=y 1620CONFIG_CGROUP_CPUACCT=y
@@ -1627,14 +1622,14 @@ CONFIG_CGROUP_DEBUG=y
1627CONFIG_CGROUP_FREEZER=y 1622CONFIG_CGROUP_FREEZER=y
1628CONFIG_CGROUP_SCHED=y 1623CONFIG_CGROUP_SCHED=y
1629CONFIG_CP15_BARRIER_EMULATION=y 1624CONFIG_CP15_BARRIER_EMULATION=y
1630CONFIG_DM_CRYPT=y 1625CONFIG_DEFAULT_SECURITY_SELINUX=y
1631CONFIG_DM_VERITY=y
1632CONFIG_DM_VERITY_FEC=y
1633CONFIG_EMBEDDED=y 1626CONFIG_EMBEDDED=y
1634CONFIG_FB=y 1627CONFIG_FB=y
1635CONFIG_HARDENED_USERCOPY=y 1628CONFIG_HARDENED_USERCOPY=y
1636CONFIG_HIGH_RES_TIMERS=y 1629CONFIG_HIGH_RES_TIMERS=y
1630CONFIG_IKCONFIG=y
1637CONFIG_INET6_AH=y 1631CONFIG_INET6_AH=y
1632CONFIG_INET6_DIAG_DESTROY=y
1638CONFIG_INET6_ESP=y 1633CONFIG_INET6_ESP=y
1639CONFIG_INET6_IPCOMP=y 1634CONFIG_INET6_IPCOMP=y
1640CONFIG_INET=y 1635CONFIG_INET=y
@@ -1650,7 +1645,6 @@ CONFIG_IPV6=y
1650CONFIG_IPV6_MIP6=y 1645CONFIG_IPV6_MIP6=y
1651CONFIG_IPV6_MULTIPLE_TABLES=y 1646CONFIG_IPV6_MULTIPLE_TABLES=y
1652CONFIG_IPV6_OPTIMISTIC_DAD=y 1647CONFIG_IPV6_OPTIMISTIC_DAD=y
1653CONFIG_IPV6_PRIVACY=y
1654CONFIG_IPV6_ROUTER_PREF=y 1648CONFIG_IPV6_ROUTER_PREF=y
1655CONFIG_IPV6_ROUTE_INFO=y 1649CONFIG_IPV6_ROUTE_INFO=y
1656CONFIG_IP_ADVANCED_ROUTER=y 1650CONFIG_IP_ADVANCED_ROUTER=y
@@ -1671,6 +1665,8 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
1671CONFIG_IP_NF_TARGET_NETMAP=y 1665CONFIG_IP_NF_TARGET_NETMAP=y
1672CONFIG_IP_NF_TARGET_REDIRECT=y 1666CONFIG_IP_NF_TARGET_REDIRECT=y
1673CONFIG_IP_NF_TARGET_REJECT=y 1667CONFIG_IP_NF_TARGET_REJECT=y
1668CONFIG_MODULE_UNLOAD=y
1669CONFIG_MODVERSIONS=y
1674CONFIG_NET=y 1670CONFIG_NET=y
1675CONFIG_NETDEVICES=y 1671CONFIG_NETDEVICES=y
1676CONFIG_NETFILTER=y 1672CONFIG_NETFILTER=y
@@ -1748,9 +1744,9 @@ CONFIG_PREEMPT=y
1748CONFIG_PROFILING=y 1744CONFIG_PROFILING=y
1749CONFIG_QFMT_V2=y 1745CONFIG_QFMT_V2=y
1750CONFIG_QUOTA=y 1746CONFIG_QUOTA=y
1747CONFIG_QUOTACTL=y
1751CONFIG_QUOTA_NETLINK_INTERFACE=y 1748CONFIG_QUOTA_NETLINK_INTERFACE=y
1752CONFIG_QUOTA_TREE=y 1749CONFIG_QUOTA_TREE=y
1753CONFIG_QUOTACTL=y
1754CONFIG_RANDOMIZE_BASE=y 1750CONFIG_RANDOMIZE_BASE=y
1755CONFIG_RTC_CLASS=y 1751CONFIG_RTC_CLASS=y
1756CONFIG_RT_GROUP_SCHED=y 1752CONFIG_RT_GROUP_SCHED=y
@@ -1764,17 +1760,17 @@ CONFIG_STAGING=y
1764CONFIG_SWP_EMULATION=y 1760CONFIG_SWP_EMULATION=y
1765CONFIG_SYNC=y 1761CONFIG_SYNC=y
1766CONFIG_TUN=y 1762CONFIG_TUN=y
1767CONFIG_UID_CPUTIME=y 1763CONFIG_UID_SYS_STATS=y
1768CONFIG_UNIX=y 1764CONFIG_UNIX=y
1769CONFIG_USB_GADGET=y
1770CONFIG_USB_CONFIGFS=y 1765CONFIG_USB_CONFIGFS=y
1766CONFIG_USB_CONFIGFS_F_ACC=y
1767CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
1771CONFIG_USB_CONFIGFS_F_FS=y 1768CONFIG_USB_CONFIGFS_F_FS=y
1769CONFIG_USB_CONFIGFS_F_MIDI=y
1772CONFIG_USB_CONFIGFS_F_MTP=y 1770CONFIG_USB_CONFIGFS_F_MTP=y
1773CONFIG_USB_CONFIGFS_F_PTP=y 1771CONFIG_USB_CONFIGFS_F_PTP=y
1774CONFIG_USB_CONFIGFS_F_ACC=y
1775CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
1776CONFIG_USB_CONFIGFS_UEVENT=y 1772CONFIG_USB_CONFIGFS_UEVENT=y
1777CONFIG_USB_CONFIGFS_F_MIDI=y 1773CONFIG_USB_GADGET=y
1778CONFIG_USB_OTG_WAKELOCK=y 1774CONFIG_USB_OTG_WAKELOCK=y
1779CONFIG_XFRM_USER=y 1775CONFIG_XFRM_USER=y
1780# KEEP ALPHABETICALLY SORTED 1776# KEEP ALPHABETICALLY SORTED
@@ -1784,16 +1780,23 @@ CONFIG_XFRM_USER=y
1784# CONFIG_LEGACY_PTYS is not set 1780# CONFIG_LEGACY_PTYS is not set
1785# CONFIG_NF_CONNTRACK_SIP is not set 1781# CONFIG_NF_CONNTRACK_SIP is not set
1786# CONFIG_PM_WAKELOCKS_GC is not set 1782# CONFIG_PM_WAKELOCKS_GC is not set
1783# CONFIG_VT is not set
1787CONFIG_ANDROID_TIMED_GPIO=y 1784CONFIG_ANDROID_TIMED_GPIO=y
1785CONFIG_ARM64_SW_TTBR0_PAN=y
1788CONFIG_ARM_KERNMEM_PERMS=y 1786CONFIG_ARM_KERNMEM_PERMS=y
1789CONFIG_BACKLIGHT_LCD_SUPPORT=y 1787CONFIG_BACKLIGHT_LCD_SUPPORT=y
1788CONFIG_BLK_DEV_DM=y
1790CONFIG_BLK_DEV_LOOP=y 1789CONFIG_BLK_DEV_LOOP=y
1791CONFIG_BLK_DEV_RAM=y 1790CONFIG_BLK_DEV_RAM=y
1792CONFIG_BLK_DEV_RAM_SIZE=8192 1791CONFIG_BLK_DEV_RAM_SIZE=8192
1793CONFIG_CC_STACKPROTECTOR_STRONG=y 1792CONFIG_CC_STACKPROTECTOR_STRONG=y
1794CONFIG_COMPACTION=y 1793CONFIG_COMPACTION=y
1794CONFIG_CPU_SW_DOMAIN_PAN=y
1795CONFIG_DEBUG_RODATA=y 1795CONFIG_DEBUG_RODATA=y
1796CONFIG_DM_CRYPT=y
1796CONFIG_DM_UEVENT=y 1797CONFIG_DM_UEVENT=y
1798CONFIG_DM_VERITY=y
1799CONFIG_DM_VERITY_FEC=y
1797CONFIG_DRAGONRISE_FF=y 1800CONFIG_DRAGONRISE_FF=y
1798CONFIG_ENABLE_DEFAULT_TRACERS=y 1801CONFIG_ENABLE_DEFAULT_TRACERS=y
1799CONFIG_EXT4_FS=y 1802CONFIG_EXT4_FS=y
@@ -1869,8 +1872,9 @@ CONFIG_LOGIRUMBLEPAD2_FF=y
1869CONFIG_LOGITECH_FF=y 1872CONFIG_LOGITECH_FF=y
1870CONFIG_MD=y 1873CONFIG_MD=y
1871CONFIG_MEDIA_SUPPORT=y 1874CONFIG_MEDIA_SUPPORT=y
1875CONFIG_MEMORY_STATE_TIME=y
1872CONFIG_MSDOS_FS=y 1876CONFIG_MSDOS_FS=y
1873CONFIG_PANIC_TIMEOUT=5 1877CONFIG_PANIC_TIMEOUT=0
1874CONFIG_PANTHERLORD_FF=y 1878CONFIG_PANTHERLORD_FF=y
1875CONFIG_PERF_EVENTS=y 1879CONFIG_PERF_EVENTS=y
1876CONFIG_PM_DEBUG=y 1880CONFIG_PM_DEBUG=y
@@ -1898,7 +1902,6 @@ CONFIG_TIMER_STATS=y
1898CONFIG_TMPFS=y 1902CONFIG_TMPFS=y
1899CONFIG_TMPFS_POSIX_ACL=y 1903CONFIG_TMPFS_POSIX_ACL=y
1900CONFIG_UHID=y 1904CONFIG_UHID=y
1901CONFIG_MEMORY_STATE_TIME=y
1902CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 1905CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
1903CONFIG_USB_EHCI_HCD=y 1906CONFIG_USB_EHCI_HCD=y
1904CONFIG_USB_HIDDEV=y 1907CONFIG_USB_HIDDEV=y
@@ -1947,6 +1950,11 @@ CONFIG_DEBUG_LL=y
1947CONFIG_DEBUG_OMAP2UART1=y 1950CONFIG_DEBUG_OMAP2UART1=y
1948CONFIG_EARLY_PRINTK=y 1951CONFIG_EARLY_PRINTK=y
1949CONFIG_DEBUG_GPIO=n 1952CONFIG_DEBUG_GPIO=n
1953
1954#Turn off un-necessary drivers
1955CONFIG_SENSORS_LM90=n
1956CONFIG_SENSORS_LM95245=n
1957CONFIG_ICS932S401=n
1950############################################################################### 1958###############################################################################
1951# TI Android Config Options 1959# TI Android Config Options
1952# Use to set additional android options exclusively for TI products 1960# Use to set additional android options exclusively for TI products
@@ -1960,6 +1968,14 @@ CONFIG_MODULES=y
1960CONFIG_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" 1968CONFIG_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"
1961CONFIG_CMDLINE_EXTEND=y 1969CONFIG_CMDLINE_EXTEND=y
1962 1970
1971# Enable SquashFS
1972# CONFIG_KERNEL_LZMA is not set
1973CONFIG_KERNEL_LZO=y
1974CONFIG_SQUASHFS_XATTR=y
1975CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
1976CONFIG_SQUASHFS_FILE_DIRECT=y
1977CONFIG_SQUASHFS_LZ4=y
1978
1963# USB DWC3 1979# USB DWC3
1964CONFIG_USB_DWC3=y 1980CONFIG_USB_DWC3=y
1965CONFIG_USB_DWC3_OMAP=y 1981CONFIG_USB_DWC3_OMAP=y
@@ -2009,8 +2025,6 @@ CONFIG_WLCORE=y
2009CONFIG_WLCORE_SPI=y 2025CONFIG_WLCORE_SPI=y
2010CONFIG_WLCORE_SDIO=y 2026CONFIG_WLCORE_SDIO=y
2011 2027
2012CONFIG_VT=y
2013
2014# Disable /proc/config.gz 2028# Disable /proc/config.gz
2015CONFIG_IKCONFIG_PROC=n 2029CONFIG_IKCONFIG_PROC=n
2016 2030