diff --git a/patches/defconfig b/patches/defconfig index 064cc941429b608bed762eafb5cd7f8a2801f885..8e58cbb76821cb29be5a664da1aed3f1391dafb3 100644 --- a/patches/defconfig +++ b/patches/defconfig @@ -693,7 +693,7 @@ CONFIG_PM_WAKELOCKS_GC=y CONFIG_PM_RUNTIME=y CONFIG_PM=y CONFIG_PM_DEBUG=y -# CONFIG_PM_ADVANCED_DEBUG is not set +CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_TEST_SUSPEND is not set CONFIG_PM_SLEEP_DEBUG=y CONFIG_APM_EMULATION=y @@ -1274,14 +1274,16 @@ CONFIG_CAN_VCAN=m CONFIG_CAN_SLCAN=m CONFIG_CAN_DEV=m CONFIG_CAN_CALC_BITTIMING=y -CONFIG_CAN_LEDS=y -CONFIG_CAN_AT91=m -CONFIG_CAN_TI_HECC=m -CONFIG_CAN_MCP251X=m -CONFIG_CAN_GRCAN=m -# CONFIG_CAN_SJA1000 is not set -CONFIG_CAN_C_CAN=m -CONFIG_CAN_C_CAN_PLATFORM=m +# CONFIG_CAN_LEDS is not set +# CONFIG_CAN_AT91 is not set +# CONFIG_CAN_TI_HECC is not set +# CONFIG_CAN_MCP251X is not set +# CONFIG_CAN_GRCAN is not set +CONFIG_CAN_SJA1000=m +CONFIG_CAN_SJA1000_ISA=m +# CONFIG_CAN_SJA1000_PLATFORM is not set +# CONFIG_CAN_SJA1000_OF_PLATFORM is not set +# CONFIG_CAN_C_CAN is not set # CONFIG_CAN_CC770 is not set # @@ -1526,7 +1528,7 @@ CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_CFI_STAA=y CONFIG_MTD_CFI_UTIL=y -# CONFIG_MTD_RAM is not set +CONFIG_MTD_RAM=m # CONFIG_MTD_ROM is not set # CONFIG_MTD_ABSENT is not set @@ -2098,9 +2100,9 @@ CONFIG_IEEE802154_MRF24J40=m # CONFIG_INPUT=y CONFIG_INPUT_FF_MEMLESS=y -CONFIG_INPUT_POLLDEV=y +CONFIG_INPUT_POLLDEV=m CONFIG_INPUT_SPARSEKMAP=m -CONFIG_INPUT_MATRIXKMAP=y +CONFIG_INPUT_MATRIXKMAP=m # # Userland interfaces @@ -2110,7 +2112,7 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_JOYDEV=m -CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_EVBUG is not set # CONFIG_INPUT_APMPOWER is not set diff --git a/tools/config-checker.sh b/tools/config-checker.sh index cf1a83350c78809ab73ab539e673729acdffa331..50134214acca7bb36c71deec264048e354dd0d33 100755 --- a/tools/config-checker.sh +++ b/tools/config-checker.sh @@ -336,8 +336,6 @@ config="CONFIG_PM_WAKELOCKS" check_config_builtin config="CONFIG_PM_WAKELOCKS_GC" check_config_builtin -config="CONFIG_PM_ADVANCED_DEBUG" -check_config_disable # # Networking options @@ -461,26 +459,6 @@ check_config_module config="CONFIG_CGROUP_NET_CLASSID" check_config_builtin -# -# CAN Device Drivers -# -config="CONFIG_CAN_LEDS" -check_config_builtin -config="CONFIG_CAN_AT91" -check_config_module -config="CONFIG_CAN_TI_HECC" -check_config_module -config="CONFIG_CAN_MCP251X" -check_config_module -config="CONFIG_CAN_GRCAN" -check_config_module -config="CONFIG_CAN_SJA1000" -check_config_disable -config="CONFIG_CAN_C_CAN" -check_config_module -config="CONFIG_CAN_C_CAN_PLATFORM" -check_config_module - # # CAN USB interfaces # @@ -638,8 +616,6 @@ config="CONFIG_MTD_CFI_STAA" check_config_builtin config="CONFIG_MTD_CFI_UTIL" check_config_builtin -config="CONFIG_MTD_RAM" -check_config_disable # # Mapping drivers for chip access @@ -960,20 +936,6 @@ check_config_module config="CONFIG_IEEE802154_MRF24J40" check_config_module -# -# Input device support -# -config="CONFIG_INPUT_POLLDEV" -check_config_builtin -config="CONFIG_INPUT_MATRIXKMAP" -check_config_builtin - -# -# Userland interfaces -# -config="CONFIG_INPUT_EVDEV" -check_config_builtin - # # Input Device Drivers # diff --git a/version.sh b/version.sh index 0cdaf4e8e576ddea641d59c7550ab3bd17c9bee3..6a4ec766d0c42613990e529dab3f2bddc88a6d96 100644 --- a/version.sh +++ b/version.sh @@ -29,10 +29,10 @@ toolchain="gcc_linaro_gnueabihf_4_8" #Kernel/Build KERNEL_REL=3.14 KERNEL_TAG=${KERNEL_REL}-rc2 -BUILD=armv7-devel-r56 +BUILD=armv7-devel-r57 #v3.X-rcX + upto SHA -#KERNEL_SHA="ef42c58a5b4b8060a3931aab36bf2b4f81b44afc" +KERNEL_SHA="6792dfe383dd20ed270da198aa0676bac47245b4" #git branch #BRANCH="v3.14.x"