aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/config-4.4
diff options
context:
space:
mode:
authorblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2016-04-29 11:34:31 +0000
committerJo-Philipp Wich <jo@mein.io>2016-05-10 10:43:11 +0200
commit23596ca527d2d7a0b197d3f9e8afdb9acd76273a (patch)
treedf9e64f4c5948a3ab79f6d8a0f86997efe1021d0 /target/linux/mediatek/config-4.4
parentdd16b7748d58f1f75c07bbe5986361a47cb84c32 (diff)
downloadupstream-23596ca527d2d7a0b197d3f9e8afdb9acd76273a.tar.gz
upstream-23596ca527d2d7a0b197d3f9e8afdb9acd76273a.tar.bz2
upstream-23596ca527d2d7a0b197d3f9e8afdb9acd76273a.zip
mediatek: sync patches and add more ethernet stability fixes
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 49265
Diffstat (limited to 'target/linux/mediatek/config-4.4')
-rw-r--r--target/linux/mediatek/config-4.49
1 files changed, 1 insertions, 8 deletions
diff --git a/target/linux/mediatek/config-4.4 b/target/linux/mediatek/config-4.4
index e69a74f476..cd8b915fd6 100644
--- a/target/linux/mediatek/config-4.4
+++ b/target/linux/mediatek/config-4.4
@@ -92,7 +92,6 @@ CONFIG_CPU_HAS_ASID=y
CONFIG_CPU_PABRT_V7=y
CONFIG_CPU_PM=y
CONFIG_CPU_RMAP=y
-# CONFIG_CPU_THERMAL is not set
CONFIG_CPU_TLB_V7=y
CONFIG_CPU_V7=y
CONFIG_CRC16=y
@@ -297,10 +296,9 @@ CONFIG_MODULES_USE_ELF_REL=y
CONFIG_MTD_BLOCK2MTD=y
CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_M25P80=y
-CONFIG_MTD_MT81xx_NOR=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_ECC=y
-CONFIG_MTD_NAND_MTK=y
+CONFIG_MTD_NAND_MTKSDG1=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTK_INFRACFG=y
CONFIG_MTK_PMIC_WRAP=y
@@ -454,11 +452,6 @@ CONFIG_SWCONFIG=y
CONFIG_SWIOTLB=y
CONFIG_SWP_EMULATE=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_THERMAL=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_HWMON=y
-CONFIG_THERMAL_OF=y
# CONFIG_THUMB2_KERNEL is not set
CONFIG_TICK_CPU_ACCOUNTING=y
CONFIG_TIMER_STATS=y