diff --git a/config/kernel/linux-mvebu64-default.config b/config/kernel/linux-mvebu64-default.config index b9a3cb38c..589e22f8c 100644 --- a/config/kernel/linux-mvebu64-default.config +++ b/config/kernel/linux-mvebu64-default.config @@ -92,6 +92,7 @@ CONFIG_HIGH_RES_TIMERS=y # CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set +# CONFIG_IRQ_TIME_ACCOUNTING is not set CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_TASKSTATS=y @@ -231,6 +232,7 @@ CONFIG_CC_STACKPROTECTOR_NONE=y # CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_MODULES_USE_ELF_RELA=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y @@ -1646,6 +1648,7 @@ CONFIG_SRAM=y CONFIG_VEXPRESS_SYSCFG=y CONFIG_MVEBU_A8K_DEBUGFS=y CONFIG_MVEBU_SOC_INFO=y +CONFIG_MVEBU_A8K_SAR=y # CONFIG_C2PORT is not set # @@ -1990,6 +1993,7 @@ CONFIG_VHOST=y # CONFIG_NET_DSA_MV88E6060 is not set CONFIG_NET_DSA_MV88E6XXX=y # CONFIG_NET_DSA_BCM_SF2 is not set +# CONFIG_DSA_MVMDIO is not set CONFIG_ETHERNET=y CONFIG_MDIO=y CONFIG_NET_VENDOR_3COM=y @@ -2790,7 +2794,6 @@ CONFIG_SPI_PL022=y # CONFIG_SPI_XILINX is not set # CONFIG_SPI_ZYNQMP_GQSPI is not set # CONFIG_SPI_DESIGNWARE is not set -CONFIG_SPI_ARMADA_3700=y # # SPI Protocol Masters @@ -2830,6 +2833,7 @@ CONFIG_PINCTRL=y # CONFIG_PINMUX=y CONFIG_PINCONF=y +CONFIG_GENERIC_PINCONF=y # CONFIG_DEBUG_PINCTRL is not set # CONFIG_PINCTRL_AMD is not set # CONFIG_PINCTRL_SINGLE is not set @@ -2838,9 +2842,9 @@ CONFIG_PINCONF=y # CONFIG_PINCTRL_BROXTON is not set # CONFIG_PINCTRL_SUNRISEPOINT is not set CONFIG_PINCTRL_MVEBU=y -CONFIG_PINCTRL_ARMADA_3700=y CONFIG_PINCTRL_ARMADA_AP806=y CONFIG_PINCTRL_ARMADA_CP110=y +CONFIG_PINCTRL_ARMADA_37XX=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y CONFIG_GPIO_DEVRES=y @@ -2861,7 +2865,6 @@ CONFIG_GPIO_AMDPT=m CONFIG_GPIO_GENERIC_PLATFORM=y # CONFIG_GPIO_GRGPIO is not set CONFIG_GPIO_MVEBU=y -CONFIG_GPIO_MVEBU_A3700=y CONFIG_GPIO_PL061=y # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_VX855 is not set @@ -4270,7 +4273,7 @@ CONFIG_USB_XUSBATM=m # USB Physical Layer drivers # CONFIG_USB_PHY=y -CONFIG_USB_A3700_OTG=y +# CONFIG_USB_A3700_PHY is not set CONFIG_NOP_USB_XCEIV=y # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_ISP1301 is not set @@ -4640,7 +4643,7 @@ CONFIG_COMMON_CLK_XGENE=y # CONFIG_COMMON_CLK_PXA is not set # CONFIG_COMMON_CLK_CDCE706 is not set CONFIG_MVEBU_CLK_COMMON=y -CONFIG_ARMADA_3700_CLK=y +CONFIG_ARMADA_37XX_CLK=y CONFIG_ARMADA_CP110_SYSCON=y CONFIG_ARMADA_AP806_SYSCON=y CONFIG_ARMADA_AP806_CORE_CLK=y @@ -4738,7 +4741,7 @@ CONFIG_GENERIC_PHY=y CONFIG_PHY_MVEBU_COMPHY=y CONFIG_PHY_MVEBU_COMPHY_CP110=y CONFIG_PHY_MVEBU_COMPHY_A3700=y -CONFIG_PHY_ARMADA3700_UTMI=y +CONFIG_PHY_MVEBU_UTMI=y # CONFIG_BCM_KONA_USB2_PHY is not set CONFIG_PHY_SAMSUNG_USB2=m # CONFIG_PHY_EXYNOS4210_USB2 is not set diff --git a/config/sources/mvebu64.conf b/config/sources/mvebu64.conf index 4cf992bef..d4c0cde57 100644 --- a/config/sources/mvebu64.conf +++ b/config/sources/mvebu64.conf @@ -17,7 +17,7 @@ HAS_UUID_SUPPORT=yes case $BRANCH in default) KERNELSOURCE='https://github.com/MarvellEmbeddedProcessors/linux-marvell.git' - KERNELBRANCH='branch:linux-4.4.52-armada-17.04' + KERNELBRANCH='branch:linux-4.4.52-armada-17.10' KERNELDIR='linux-marvell' KERNEL_USE_GCC='> 6.3'