Fixate mvebu64-next to 4.14.y + patches adjustement, mvebu64-dev back to mainline. Both tested and working

2025-03-18 12:51:40 +00:00 · 2017-11-14 20:35:57 +01:00 · 2017-11-14 20:35:57 +01:00 · 10e6445593
commit 10e6445593
parent 31a71e8f57
24 changed files with 996316 additions and 36933 deletions
--- a/config/kernel/linux-mvebu64-dev.config
+++ b/config/kernel/linux-mvebu64-dev.config
--- a/config/kernel/linux-mvebu64-next.config
+++ b/config/kernel/linux-mvebu64-next.config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.13.10 Kernel Configuration
+# Linux/arm64 4.14.0 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@ -69,6 +69,7 @@ CONFIG_AUDIT_TREE=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
 CONFIG_GENERIC_IRQ_MIGRATION=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_CHIP=y
@ -118,7 +119,7 @@ CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_EXPERT is not set
 CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
-# CONFIG_TASKS_RCU is not set
+CONFIG_TASKS_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
 CONFIG_BUILD_BIN2C=y
@ -195,6 +196,7 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
@ -224,6 +226,7 @@ CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
+# CONFIG_SLAB_FREELIST_HARDENED is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SYSTEM_DATA_VERIFICATION is not set
 CONFIG_PROFILING=y
@ -282,7 +285,8 @@ CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
 # CONFIG_CPU_NO_EFFICIENT_FFS is not set
-# CONFIG_HAVE_ARCH_VMAP_STACK is not set
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
 # CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set
 # CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
@ -579,6 +583,7 @@ CONFIG_ARM64_VHE=y
 # ARMv8.2 architectural features
 #
 CONFIG_ARM64_UAO=y
+# CONFIG_ARM64_PMEM is not set
 CONFIG_ARM64_MODULE_CMODEL_LARGE=y
 # CONFIG_RANDOMIZE_BASE is not set

@ -678,7 +683,6 @@ CONFIG_CPUFREQ_DT=y
 CONFIG_CPUFREQ_DT_PLATDEV=y
 CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
 CONFIG_ARM_DT_BL_CPUFREQ=y
-# CONFIG_ARM_DB8500_CPUFREQ is not set
 # CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
 CONFIG_ACPI_CPPC_CPUFREQ=y
 # CONFIG_QORIQ_CPUFREQ is not set
@ -800,7 +804,6 @@ CONFIG_NETWORK_SECMARK=y
 CONFIG_NET_PTP_CLASSIFY=y
 CONFIG_NETWORK_PHY_TIMESTAMPING=y
 CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
 CONFIG_NETFILTER_ADVANCED=y
 CONFIG_BRIDGE_NETFILTER=m

@ -883,6 +886,7 @@ CONFIG_NFT_FIB_INET=m
 # CONFIG_NF_DUP_NETDEV is not set
 # CONFIG_NFT_DUP_NETDEV is not set
 # CONFIG_NFT_FWD_NETDEV is not set
+CONFIG_NFT_FIB_NETDEV=m
 CONFIG_NETFILTER_XTABLES=m

 #
@ -1337,6 +1341,7 @@ CONFIG_MPLS=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NSH=m
 CONFIG_HSR=m
 CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_L3_MASTER_DEV=y
@ -1349,6 +1354,7 @@ CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
 CONFIG_BPF_JIT=y
+# CONFIG_BPF_STREAM_PARSER is not set
 CONFIG_NET_FLOW_LIMIT=y

 #
@ -1408,57 +1414,6 @@ CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_8DEV_USB=m
 CONFIG_CAN_MCBA_USB=m
 # CONFIG_CAN_DEBUG_DEVICES is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_MCS_FIR=m
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
@ -1491,7 +1446,6 @@ CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
 # CONFIG_BT_HCIUART_AG6XX is not set
 # CONFIG_BT_HCIUART_MRVL is not set
@ -1747,6 +1701,7 @@ CONFIG_MTD_NAND=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_DOCG4 is not set
 # CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_NAND_PXA3xx is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_BRCMNAND is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
@ -1793,9 +1748,7 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 CONFIG_ZRAM=m
-# CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZRAM_LZ4_COMPRESS=y
-# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_ZRAM_WRITEBACK is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
@ -2279,8 +2232,10 @@ CONFIG_NET_VENDOR_HISILICON=y
 # CONFIG_HNS is not set
 # CONFIG_HNS_DSAF is not set
 # CONFIG_HNS_ENET is not set
+# CONFIG_HNS3 is not set
 CONFIG_NET_VENDOR_HP=y
 # CONFIG_HP100 is not set
+CONFIG_NET_VENDOR_HUAWEI=y
 CONFIG_NET_VENDOR_INTEL=y
 # CONFIG_E100 is not set
 # CONFIG_E1000 is not set
@ -2345,6 +2300,7 @@ CONFIG_NET_VENDOR_QLOGIC=y
 CONFIG_NET_VENDOR_QUALCOMM=y
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCOM_EMAC is not set
+# CONFIG_RMNET is not set
 CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
@ -2438,6 +2394,7 @@ CONFIG_MICROCHIP_PHY=m
 # CONFIG_NATIONAL_PHY is not set
 # CONFIG_QSEMI_PHY is not set
 CONFIG_REALTEK_PHY=m
+# CONFIG_ROCKCHIP_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_STE10XP is not set
 # CONFIG_TERANETICS_PHY is not set
@ -2546,10 +2503,12 @@ CONFIG_ATH6KL_REGDOMAIN=y
 CONFIG_AR5523=m
 CONFIG_WIL6210=m
 CONFIG_WIL6210_ISR_COR=y
+CONFIG_WIL6210_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 # CONFIG_ATH10K_AHB is not set
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_USB is not set
 # CONFIG_ATH10K_DEBUG is not set
 # CONFIG_ATH10K_DEBUGFS is not set
 CONFIG_ATH10K_DFS_CERTIFIED=y
@ -2848,6 +2807,7 @@ CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_PS2MULT is not set
 # CONFIG_SERIO_ARC_PS2 is not set
 # CONFIG_SERIO_APBPS2 is not set
+# CONFIG_SERIO_GPIO_PS2 is not set
 # CONFIG_USERIO is not set
 # CONFIG_GAMEPORT is not set

@ -3107,12 +3067,6 @@ CONFIG_GENERIC_PINCONF=y
 CONFIG_PINCTRL_MCP23S08=m
 # CONFIG_PINCTRL_SINGLE is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_BAYTRAIL is not set
-# CONFIG_PINCTRL_CHERRYVIEW is not set
-# CONFIG_PINCTRL_BROXTON is not set
-# CONFIG_PINCTRL_CANNONLAKE is not set
-# CONFIG_PINCTRL_GEMINILAKE is not set
-# CONFIG_PINCTRL_SUNRISEPOINT is not set
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_ARMADA_AP806=y
 CONFIG_PINCTRL_ARMADA_CP110=y
@ -3312,6 +3266,7 @@ CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
+# CONFIG_SENSORS_IBM_CFFPS is not set
 CONFIG_SENSORS_IR35221=m
 CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_LTC2978=m
@ -3322,9 +3277,11 @@ CONFIG_SENSORS_MAX20751=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_TPS40422=m
+# CONFIG_SENSORS_TPS53679 is not set
 CONFIG_SENSORS_UCD9000=m
 CONFIG_SENSORS_UCD9200=m
 CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_PWM_FAN=m
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SHT3x=m
@ -3418,10 +3375,6 @@ CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
 # CONFIG_SSB_DRIVER_GPIO is not set
 CONFIG_BCMA_POSSIBLE=y
-
-#
-# Broadcom specific AMBA
-#
 CONFIG_BCMA=m
 CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_HOST_PCI_POSSIBLE=y
@ -3444,6 +3397,7 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
 # CONFIG_MFD_ATMEL_HLCDC is not set
 # CONFIG_MFD_BCM590XX is not set
+# CONFIG_MFD_BD9571MWV is not set
 # CONFIG_MFD_AXP20X_I2C is not set
 # CONFIG_MFD_CROS_EC is not set
 # CONFIG_PMIC_DA903X is not set
@ -3508,6 +3462,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TPS65086 is not set
 # CONFIG_MFD_TPS65090 is not set
 # CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TPS68470 is not set
 # CONFIG_MFD_TI_LP873X is not set
 CONFIG_MFD_TI_LP87565=m
 # CONFIG_MFD_TPS65218 is not set
@ -3562,6 +3517,7 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_PV88060 is not set
 # CONFIG_REGULATOR_PV88080 is not set
 # CONFIG_REGULATOR_PV88090 is not set
+CONFIG_REGULATOR_PWM=m
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
@ -3570,6 +3526,20 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_TPS6524X is not set
 # CONFIG_REGULATOR_VCTRL is not set
 # CONFIG_REGULATOR_VEXPRESS is not set
+CONFIG_RC_CORE=y
+CONFIG_RC_MAP=y
+CONFIG_RC_DECODERS=y
+# CONFIG_LIRC is not set
+CONFIG_IR_NEC_DECODER=y
+CONFIG_IR_RC5_DECODER=y
+CONFIG_IR_RC6_DECODER=y
+CONFIG_IR_JVC_DECODER=y
+CONFIG_IR_SONY_DECODER=y
+CONFIG_IR_SANYO_DECODER=y
+CONFIG_IR_SHARP_DECODER=y
+CONFIG_IR_MCE_KBD_DECODER=y
+CONFIG_IR_XMP_DECODER=y
+# CONFIG_RC_DEVICES is not set
 # CONFIG_MEDIA_SUPPORT is not set

 #
@ -3670,10 +3640,13 @@ CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_HX8357 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=y
+CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BACKLIGHT_PM8941_WLED is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_LM3630A=m
 # CONFIG_BACKLIGHT_LM3639 is not set
+CONFIG_BACKLIGHT_LP855X=m
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
@ -3996,7 +3969,6 @@ CONFIG_TYPEC=m
 # CONFIG_USB_ULPI_BUS is not set
 # CONFIG_UWB is not set
 CONFIG_MMC=y
-# CONFIG_MMC_DEBUG is not set
 CONFIG_PWRSEQ_EMMC=y
 # CONFIG_PWRSEQ_SD8787 is not set
 CONFIG_PWRSEQ_SIMPLE=y
@ -4008,6 +3980,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
+# CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_SDHCI=y
 # CONFIG_MMC_SDHCI_PCI is not set
@ -4055,6 +4028,7 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_PCA963X is not set
 # CONFIG_LEDS_DAC124S085 is not set
+CONFIG_LEDS_PWM=m
 # CONFIG_LEDS_REGULATOR is not set
 # CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_LT3593 is not set
@ -4213,6 +4187,7 @@ CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_ACPI=y
 CONFIG_DMA_OF=y
+# CONFIG_ALTERA_MSGDMA is not set
 # CONFIG_AMBA_PL08X is not set
 CONFIG_BCM_SBA_RAID=m
 # CONFIG_FSL_EDMA is not set
@ -4285,10 +4260,62 @@ CONFIG_XEN_XENBUS_FRONTEND=y
 CONFIG_XEN_GNTDEV=m
 CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_SWIOTLB_XEN=y
+# CONFIG_XEN_PVCALLS_BACKEND is not set
 CONFIG_XEN_PRIVCMD=m
 CONFIG_XEN_EFI=y
 CONFIG_XEN_AUTO_XLATE=y
 CONFIG_STAGING=y
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_MCS_FIR=m
 # CONFIG_PRISM2_USB is not set
 # CONFIG_COMEDI is not set
 # CONFIG_RTL8192U is not set
@ -4297,6 +4324,7 @@ CONFIG_RTL8723BS=m
 # CONFIG_R8712U is not set
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
+# CONFIG_R8822BE is not set
 # CONFIG_RTS5208 is not set
 CONFIG_VT6655=m
 CONFIG_VT6656=m
@ -4327,7 +4355,6 @@ CONFIG_MTD_SPINAND_ONDIEECC=y
 # CONFIG_KS7010 is not set
 # CONFIG_GREYBUS is not set
 CONFIG_CRYPTO_DEV_CCREE=m
-# CONFIG_CCREE_FIPS_SUPPORT is not set

 #
 # USB Power Delivery and Type-C drivers
@ -4335,6 +4362,7 @@ CONFIG_CRYPTO_DEV_CCREE=m
 CONFIG_TYPEC_TCPM=m
 CONFIG_TYPEC_TCPCI=m
 CONFIG_TYPEC_FUSB302=m
+# CONFIG_PI433 is not set
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
 CONFIG_CLKDEV_LOOKUP=y
@ -4347,6 +4375,7 @@ CONFIG_COMMON_CLK=y
 CONFIG_COMMON_CLK_VERSATILE=y
 CONFIG_CLK_SP810=y
 CONFIG_CLK_VEXPRESS_OSC=y
+# CONFIG_CLK_HSDK is not set
 # CONFIG_COMMON_CLK_SCPI is not set
 # CONFIG_COMMON_CLK_SI5351 is not set
 # CONFIG_COMMON_CLK_SI514 is not set
@ -4357,6 +4386,7 @@ CONFIG_CLK_VEXPRESS_OSC=y
 # CONFIG_CLK_QORIQ is not set
 CONFIG_COMMON_CLK_XGENE=y
 # CONFIG_COMMON_CLK_NXP is not set
+CONFIG_COMMON_CLK_PWM=m
 # CONFIG_COMMON_CLK_PXA is not set
 # CONFIG_COMMON_CLK_PIC32 is not set
 # CONFIG_COMMON_CLK_VC5 is not set
@ -4419,12 +4449,17 @@ CONFIG_ARM_SMMU=y
 #
 CONFIG_RPMSG=m
 # CONFIG_RPMSG_CHAR is not set
+CONFIG_RPMSG_QCOM_GLINK_NATIVE=m
 CONFIG_RPMSG_QCOM_GLINK_RPM=m

 #
 # SOC (System On Chip) specific Drivers
 #

+#
+# Amlogic SoC drivers
+#
+
 #
 # Broadcom SoC drivers
 #
@ -4433,6 +4468,10 @@ CONFIG_RPMSG_QCOM_GLINK_RPM=m
 #
 # i.MX SoC drivers
 #
+
+#
+# Qualcomm SoC drivers
+#
 # CONFIG_SUNXI_SRAM is not set
 # CONFIG_SOC_TI is not set
 # CONFIG_PM_DEVFREQ is not set
@ -4450,7 +4489,10 @@ CONFIG_EXTCON=y
 # CONFIG_IIO is not set
 # CONFIG_NTB is not set
 # CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+CONFIG_PWM_FSL_FTM=m
+CONFIG_PWM_PCA9685=m
 CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_MAX_NR=1
@ -4466,8 +4508,8 @@ CONFIG_PARTITION_PERCPU=y
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_ATH79 is not set
 # CONFIG_RESET_BERLIN is not set
-# CONFIG_RESET_GEMINI is not set
 # CONFIG_RESET_IMX7 is not set
+# CONFIG_RESET_LANTIQ is not set
 # CONFIG_RESET_LPC18XX is not set
 # CONFIG_RESET_MESON is not set
 # CONFIG_RESET_PISTACHIO is not set
@ -4485,6 +4527,7 @@ CONFIG_RESET_CONTROLLER=y
 CONFIG_GENERIC_PHY=y
 CONFIG_PHY_XGENE=y
 # CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_PHY_MVEBU_CP110_COMPHY is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_POWERCAP is not set
@ -4507,10 +4550,6 @@ CONFIG_DAX=y
 CONFIG_NVMEM=y
 # CONFIG_STM is not set
 # CONFIG_INTEL_TH is not set
-
-#
-# FPGA Configuration Support
-#
 # CONFIG_FPGA is not set

 #
@ -4556,6 +4595,7 @@ CONFIG_EFI_RUNTIME_WRAPPERS=y
 CONFIG_EFI_ARMSTUB=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_TEST is not set
+# CONFIG_RESET_ATTACK_MITIGATION is not set
 # CONFIG_EFI_DEV_PATH_PARSER is not set
 # CONFIG_MESON_SM is not set

@ -4734,22 +4774,6 @@ CONFIG_UBIFS_FS_SECURITY=y
 # CONFIG_UFS_FS is not set
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
-CONFIG_AUFS_FS=m
-CONFIG_AUFS_BRANCH_MAX_127=y
-# CONFIG_AUFS_BRANCH_MAX_511 is not set
-# CONFIG_AUFS_BRANCH_MAX_1023 is not set
-# CONFIG_AUFS_BRANCH_MAX_32767 is not set
-CONFIG_AUFS_SBILIST=y
-# CONFIG_AUFS_HNOTIFY is not set
-# CONFIG_AUFS_EXPORT is not set
-# CONFIG_AUFS_XATTR is not set
-# CONFIG_AUFS_FHSM is not set
-# CONFIG_AUFS_RDU is not set
-# CONFIG_AUFS_SHWH is not set
-# CONFIG_AUFS_BR_RAMFS is not set
-# CONFIG_AUFS_BR_FUSE is not set
-CONFIG_AUFS_BDEV_LOOP=y
-# CONFIG_AUFS_DEBUG is not set
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
@ -4982,6 +5006,7 @@ CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
+# CONFIG_DMA_API_DEBUG is not set

 #
 # Runtime Testing
@ -5003,17 +5028,16 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_TEST_UUID is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_HASH is not set
-# CONFIG_DMA_API_DEBUG is not set
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
 # CONFIG_TEST_UDELAY is not set
-CONFIG_MEMTEST=y
 # CONFIG_TEST_STATIC_KEYS is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_TEST_KMOD is not set
+CONFIG_MEMTEST=y
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
@ -5035,7 +5059,7 @@ CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
 # CONFIG_CORESIGHT_SINK_TPIU is not set
 # CONFIG_CORESIGHT_SINK_ETBV10 is not set
 CONFIG_CORESIGHT_SOURCE_ETM4X=y
-# CONFIG_CORESIGHT_QCOM_REPLICATOR is not set
+# CONFIG_CORESIGHT_DYNAMIC_REPLICATOR is not set
 # CONFIG_CORESIGHT_STM is not set
 CONFIG_CORESIGHT_CPU_DEBUG=m

@ -5104,7 +5128,7 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_USER is not set
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_NULL2=y
 # CONFIG_CRYPTO_PCRYPT is not set
@ -5160,7 +5184,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_RMD160 is not set
 # CONFIG_CRYPTO_RMD256 is not set
 # CONFIG_CRYPTO_RMD320 is not set
-CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
 # CONFIG_CRYPTO_SHA3 is not set
@ -5227,14 +5251,14 @@ CONFIG_CRYPTO_DEV_SAFEXCEL=m
 #
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 CONFIG_ARM64_CRYPTO=y
-# CONFIG_CRYPTO_SHA256_ARM64 is not set
+CONFIG_CRYPTO_SHA256_ARM64=y
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA1_ARM64_CE=y
 CONFIG_CRYPTO_SHA2_ARM64_CE=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
 # CONFIG_CRYPTO_CRCT10DIF_ARM64_CE is not set
 # CONFIG_CRYPTO_CRC32_ARM64_CE is not set
-# CONFIG_CRYPTO_AES_ARM64 is not set
+CONFIG_CRYPTO_AES_ARM64=y
 CONFIG_CRYPTO_AES_ARM64_CE=y
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
@ -5270,6 +5294,7 @@ CONFIG_CRC32_SLICEBY8=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=y
 CONFIG_CRC8=m
+CONFIG_XXHASH=y
 CONFIG_AUDIT_GENERIC=y
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 CONFIG_AUDIT_COMPAT_GENERIC=y
@ -5278,7 +5303,10 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
 CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
@ -5325,3 +5353,4 @@ CONFIG_FONT_8x16=y
 CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_SBITMAP=y
+# CONFIG_STRING_SELFTEST is not set
--- a/config/sources/mvebu64.conf
+++ b/config/sources/mvebu64.conf
@ -30,16 +30,16 @@ case $BRANCH in

 	next)
 	KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
-	KERNELBRANCH='branch:linux-4.13.y'
+	KERNELBRANCH='branch:linux-4.14.y'
 	KERNELDIR=$MAINLINE_KERNEL_DIR

 	KERNEL_USE_GCC='> 7.0'
 	;;

 	dev)
-	KERNELSOURCE='https://github.com/ioft/linux'
+	KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
 	KERNELBRANCH='branch:master'
-	KERNELDIR='linux-marvell'
+	KERNELDIR=$MAINLINE_KERNEL_DIR

 	KERNEL_USE_GCC='> 7.0'
 	;;
--- a/patch/kernel/mvebu64-dev/0004-ARM64-dts-marvell-armada37xx-Enable-USB2-on-espresso.patch
+++ b/patch/kernel/mvebu64-dev/0004-ARM64-dts-marvell-armada37xx-Enable-USB2-on-espresso.patch
@ -0,0 +1,33 @@
+From d71549275ca1e2bee8e7914501526b625e9f8a53 Mon Sep 17 00:00:00 2001
+From: Marc Zyngier <Marc.Zyngier@arm.com>
+Date: Sat, 1 Jul 2017 15:16:37 +0100
+Subject: [PATCH 04/11] ARM64: dts: marvell: armada37xx: Enable USB2 on
+ espressobin
+
+The Espressobin SBC has a USB2 interface available on J8. Let's
+enable it.
+
+Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
+---
+ arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+index e3a136ed77b0..b1af3f988b29 100644
+--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+@@ -81,6 +81,11 @@
+ 	status = "okay";
+ };
+ 
+/* J8 */
+&usb2 {
+	status = "okay";
+};
+
+ &mdio {
+ 	switch0: switch0@1 {
+ 		compatible = "marvell,mv88e6085";
+-- 
+2.13.3
+
--- a/patch/kernel/mvebu64-dev/0006-PCI-aardvark-fix-logic-in-PCI-configuration-read-wri.patch
+++ b/patch/kernel/mvebu64-dev/0006-PCI-aardvark-fix-logic-in-PCI-configuration-read-wri.patch
@ -0,0 +1,51 @@
+From 19f028017f93b19bd4142840a0714fc3b5c447a1 Mon Sep 17 00:00:00 2001
+From: Victor Gu <xigu@marvell.com>
+Date: Fri, 8 Sep 2017 11:53:42 +0200
+Subject: [PATCH 06/12] PCI: aardvark: fix logic in PCI configuration
+ read/write functions
+
+The PCI configuration space read/write functions were special casing
+the situation where PCI_SLOT(devfn) != 0, and returned
+PCIBIOS_DEVICE_NOT_FOUND in this case.
+
+However, will this is what is intended for the root bus, it is not
+intended for the child busses, as it prevents discovering devices with
+PCI_SLOT(x) != 0. Therefore, we return PCIBIOS_DEVICE_NOT_FOUND only
+if we're on the root bus.
+
+Fixes: 8c39d710363c1 ("PCI: aardvark: Add Aardvark PCI host controller driver")
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Victor Gu <xigu@marvell.com>
+Reviewed-by: Wilson Ding <dingwei@marvell.com>
+Reviewed-by: Nadav Haklai <nadavh@marvell.com>
+[Thomas: tweak commit log.]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ drivers/pci/host/pci-aardvark.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c
+index 5fb9b620ac78..582d75f864e3 100644
+--- a/drivers/pci/host/pci-aardvark.c
+++ b/drivers/pci/host/pci-aardvark.c
+@@ -441,7 +441,7 @@ static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn,
+ 	u32 reg;
+ 	int ret;
+ 
+-	if (PCI_SLOT(devfn) != 0) {
+	if ((bus->number == pcie->root_bus_nr) && (PCI_SLOT(devfn) != 0)) {
+ 		*val = 0xffffffff;
+ 		return PCIBIOS_DEVICE_NOT_FOUND;
+ 	}
+@@ -495,7 +495,7 @@ static int advk_pcie_wr_conf(struct pci_bus *bus, u32 devfn,
+ 	int offset;
+ 	int ret;
+ 
+-	if (PCI_SLOT(devfn) != 0)
+	if ((bus->number == pcie->root_bus_nr) && (PCI_SLOT(devfn) != 0))
+ 		return PCIBIOS_DEVICE_NOT_FOUND;
+ 
+ 	if (where % size)
+-- 
+2.14.1
+
--- a/patch/kernel/mvebu64-dev/0007-PCI-aardvark-set-PIO_ADDR_LS-correctly-in-advk_pcie_.patch
+++ b/patch/kernel/mvebu64-dev/0007-PCI-aardvark-set-PIO_ADDR_LS-correctly-in-advk_pcie_.patch
@ -0,0 +1,38 @@
+From e692c4478048fdcc01c939f28e9801aebdd622d3 Mon Sep 17 00:00:00 2001
+From: Victor Gu <xigu@marvell.com>
+Date: Fri, 8 Sep 2017 11:53:43 +0200
+Subject: [PATCH 07/12] PCI: aardvark: set PIO_ADDR_LS correctly in
+ advk_pcie_rd_conf()
+
+When setting the PIO_ADDR_LS register during a configuration read, we
+were properly passing the device number, function number and register
+number, but not the bus number, causing issues when reading the
+configuration of PCIe devices.
+
+Fixes: 8c39d710363c1 ("PCI: aardvark: Add Aardvark PCI host controller driver")
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Victor Gu <xigu@marvell.com>
+Reviewed-by: Wilson Ding <dingwei@marvell.com>
+Reviewed-by: Nadav Haklai <nadavh@marvell.com>
+[Thomas: tweak commit log.]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ drivers/pci/host/pci-aardvark.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c
+index 582d75f864e3..68ff10e17c74 100644
+--- a/drivers/pci/host/pci-aardvark.c
+++ b/drivers/pci/host/pci-aardvark.c
+@@ -460,7 +460,7 @@ static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn,
+ 	advk_writel(pcie, reg, PIO_CTRL);
+ 
+ 	/* Program the address registers */
+-	reg = PCIE_BDF(devfn) | PCIE_CONF_REG(where);
+	reg = PCIE_CONF_ADDR(bus->number, devfn, where);
+ 	advk_writel(pcie, reg, PIO_ADDR_LS);
+ 	advk_writel(pcie, 0, PIO_ADDR_MS);
+ 
+-- 
+2.14.1
+
--- a/patch/kernel/mvebu64-dev/0007-arm64-dts-marvell-armada37xx-Add-eth0-alias.patch
+++ b/patch/kernel/mvebu64-dev/0007-arm64-dts-marvell-armada37xx-Add-eth0-alias.patch
@ -0,0 +1,25 @@
+From 8440f9edeb29c10cc0ec29c55c07d4e5e5b67c5b Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Tue, 4 Jul 2017 19:25:28 -0600
+Subject: [PATCH 07/11] arm64: dts: marvell: armada37xx: Add eth0 alias
+
+Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
+---
+ arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+index a78195b4ef7a..14248957b2dd 100644
+--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+@@ -54,6 +54,7 @@
+ 	#size-cells = <2>;
+ 
+ 	aliases {
+		ethernet0 = &eth0;
+ 		serial0 = &uart0;
+ 	};
+ 
+-- 
+2.13.3
+
--- a/patch/kernel/mvebu64-dev/0008-PCI-aardvark-set-host-and-device-to-the-same-MAX-pay.patch
+++ b/patch/kernel/mvebu64-dev/0008-PCI-aardvark-set-host-and-device-to-the-same-MAX-pay.patch
@ -0,0 +1,123 @@
+From 6ce52078a28550c7103b79b2b26de08185035bda Mon Sep 17 00:00:00 2001
+From: Victor Gu <xigu@marvell.com>
+Date: Fri, 8 Sep 2017 11:53:44 +0200
+Subject: [PATCH 08/12] PCI: aardvark: set host and device to the same MAX
+ payload size
+
+Since the Aardvark does not implement a PCIe root bus, the Linux PCIe
+subsystem will not align the MAX payload size between the host and the
+device. This patch ensures that the host and device have the same MAX
+payload size, fixing a number of problems with various PCIe devices.
+
+This is part of fixing bug
+https://bugzilla.kernel.org/show_bug.cgi?id=196339, this commit was
+reported as the user to be important to get a Intel 7260 mini-PCIe
+WiFi card working.
+
+Fixes: Fixes: 8c39d710363c1 ("PCI: aardvark: Add Aardvark PCI host controller driver")
+Signed-off-by: Victor Gu <xigu@marvell.com>
+Reviewed-by: Evan Wang <xswang@marvell.com>
+Reviewed-by: Nadav Haklai <nadavh@marvell.com>
+[Thomas: tweak commit log.]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ drivers/pci/host/pci-aardvark.c | 60 ++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 59 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c
+index 68ff10e17c74..e361c673732f 100644
+--- a/drivers/pci/host/pci-aardvark.c
+++ b/drivers/pci/host/pci-aardvark.c
+@@ -30,8 +30,10 @@
+ #define PCIE_CORE_DEV_CTRL_STATS_REG				0xc8
+ #define     PCIE_CORE_DEV_CTRL_STATS_RELAX_ORDER_DISABLE	(0 << 4)
+ #define     PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SZ_SHIFT	5
+#define     PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SZ		0x2
+ #define     PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE		(0 << 11)
+ #define     PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT	12
+#define     PCIE_CORE_MPS_UNIT_BYTE				128
+ #define PCIE_CORE_LINK_CTRL_STAT_REG				0xd0
+ #define     PCIE_CORE_LINK_L0S_ENTRY				BIT(0)
+ #define     PCIE_CORE_LINK_TRAINING				BIT(5)
+@@ -298,7 +300,8 @@ static void advk_pcie_setup_hw(struct advk_pcie *pcie)
+ 
+ 	/* Set PCIe Device Control and Status 1 PF0 register */
+ 	reg = PCIE_CORE_DEV_CTRL_STATS_RELAX_ORDER_DISABLE |
+-		(7 << PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SZ_SHIFT) |
+		(PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SZ <<
+		 PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SZ_SHIFT) |
+ 		PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE |
+ 		PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT;
+ 	advk_writel(pcie, reg, PCIE_CORE_DEV_CTRL_STATS_REG);
+@@ -880,6 +883,58 @@ static int advk_pcie_parse_request_of_pci_ranges(struct advk_pcie *pcie)
+ 	return err;
+ }
+ 
+static int advk_pcie_find_smpss(struct pci_dev *dev, void *data)
+{
+	u8 *smpss = data;
+
+	if (!dev)
+		return 0;
+
+	if (!pci_is_pcie(dev))
+		return 0;
+
+	if (*smpss > dev->pcie_mpss)
+		*smpss = dev->pcie_mpss;
+
+	return 0;
+}
+
+static int advk_pcie_bus_configure_mps(struct pci_dev *dev, void *data)
+{
+	int mps;
+
+	if (!dev)
+		return 0;
+
+	if (!pci_is_pcie(dev))
+		return 0;
+
+	mps = PCIE_CORE_MPS_UNIT_BYTE << *(u8 *)data;
+	pcie_set_mps(dev, mps);
+
+	return 0;
+}
+
+static void advk_pcie_configure_mps(struct pci_bus *bus, struct advk_pcie *pcie)
+{
+	u8 smpss = PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SZ;
+	u32 reg;
+
+	/* Find the minimal supported MAX payload size */
+	advk_pcie_find_smpss(bus->self, &smpss);
+	pci_walk_bus(bus, advk_pcie_find_smpss, &smpss);
+
+	/* Configure RC MAX payload size */
+	reg = advk_readl(pcie, PCIE_CORE_DEV_CTRL_STATS_REG);
+	reg &= ~PCI_EXP_DEVCTL_PAYLOAD;
+	reg |= smpss << PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SZ_SHIFT;
+	advk_writel(pcie, reg, PCIE_CORE_DEV_CTRL_STATS_REG);
+
+	/* Configure device MAX payload size */
+	advk_pcie_bus_configure_mps(bus->self, &smpss);
+	pci_walk_bus(bus, advk_pcie_bus_configure_mps, &smpss);
+}
+
+ static int advk_pcie_probe(struct platform_device *pdev)
+ {
+ 	struct device *dev = &pdev->dev;
+@@ -951,6 +1006,9 @@ static int advk_pcie_probe(struct platform_device *pdev)
+ 	list_for_each_entry(child, &bus->children, node)
+ 		pcie_bus_configure_settings(child);
+ 
+	/* Configure the MAX pay load size */
+	advk_pcie_configure_mps(bus, pcie);
+
+ 	pci_bus_add_devices(bus);
+ 	return 0;
+ }
+-- 
+2.14.1
+
--- a/patch/kernel/mvebu64-dev/0008-fix-pci-aardvark-disable-LOS-state-by-default.patch
+++ b/patch/kernel/mvebu64-dev/0008-fix-pci-aardvark-disable-LOS-state-by-default.patch
@ -0,0 +1,35 @@
+From c1d0aadc4440c07d2e940c83c1b6e5d9d694a3a5 Mon Sep 17 00:00:00 2001
+From: Victor Gu <xigu@marvell.com>
+Date: Wed, 29 Mar 2017 15:17:03 +0800
+Subject: [PATCH 08/11] fix: pci: aardvark: disable LOS state by default
+
+Some PCIe devices do not support LOS, there will be time out issue
+if the RC forces the LOS state.
+This patch disables the LOS state by default.
+
+Change-Id: I88a6a5cf58ea5f2df234c99050ce041987cdabc6
+Signed-off-by: Victor Gu <xigu@marvell.com>
+Reviewed-on: http://vgitil04.il.marvell.com:8080/38119
+Tested-by: iSoC Platform CI <ykjenk@marvell.com>
+Reviewed-by: Evan Wang <xswang@marvell.com>
+---
+ drivers/pci/host/pci-aardvark.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c
+index 37d0bcd31f8a..072bc70e900c 100644
+--- a/drivers/pci/host/pci-aardvark.c
+++ b/drivers/pci/host/pci-aardvark.c
+@@ -365,8 +365,7 @@ static void advk_pcie_setup_hw(struct advk_pcie *pcie)
+ 
+ 	advk_pcie_wait_for_link(pcie);
+ 
+-	reg = PCIE_CORE_LINK_L0S_ENTRY |
+-		(1 << PCIE_CORE_LINK_WIDTH_SHIFT);
+	reg = (1 << PCIE_CORE_LINK_WIDTH_SHIFT);
+ 	advk_writel(pcie, reg, PCIE_CORE_LINK_CTRL_STAT_REG);
+ 
+ 	reg = advk_readl(pcie, PCIE_CORE_CMD_STATUS_REG);
+-- 
+2.13.3
+
--- a/patch/kernel/mvebu64-dev/0009-fix-pci-aardvark-use-isr1-interrupt-in-legacy-irq-mo.patch
+++ b/patch/kernel/mvebu64-dev/0009-fix-pci-aardvark-use-isr1-interrupt-in-legacy-irq-mo.patch
@ -0,0 +1,104 @@
+From 364d845b2fd8c083f32a95377f5b3cd3f0cf2323 Mon Sep 17 00:00:00 2001
+From: Victor Gu <xigu@marvell.com>
+Date: Mon, 27 Mar 2017 18:28:25 +0800
+Subject: [PATCH 09/11] fix: pci: aardvark: use isr1 interrupt in legacy irq
+ mode
+
+The Aardvark has two interrupts sets, first set is bit[23:16] of
+PCIe ISR 0 register(RD0074840h), second set is bit[11:8] of PCIe
+ISR 1 register(RD0074848h). Only one set should be used, while
+another set should be masked.
+The second set is more advanced, the Legacy INT_X status bit is
+asserted once Assert_INTX message is received, and de-asserted after
+Deassert_INTX message is received, which provides alternate way
+besides of the assert/deassert interrupt pairs in PCIe ISR 0 register.
+
+Change-Id: Idef2eb474a094754195a031ad580caa8a88f046d
+Signed-off-by: Victor Gu <xigu@marvell.com>
+Reviewed-on: http://vgitil04.il.marvell.com:8080/38024
+Tested-by: iSoC Platform CI <ykjenk@marvell.com>
+Reviewed-by: Evan Wang <xswang@marvell.com>
+---
+ drivers/pci/host/pci-aardvark.c | 29 ++++++++++++++++++-----------
+ 1 file changed, 18 insertions(+), 11 deletions(-)
+
+diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c
+index 072bc70e900c..10154dcf219b 100644
+--- a/drivers/pci/host/pci-aardvark.c
+++ b/drivers/pci/host/pci-aardvark.c
+@@ -103,7 +103,8 @@
+ #define PCIE_ISR1_MASK_REG			(CONTROL_BASE_ADDR + 0x4C)
+ #define     PCIE_ISR1_POWER_STATE_CHANGE	BIT(4)
+ #define     PCIE_ISR1_FLUSH			BIT(5)
+-#define     PCIE_ISR1_ALL_MASK			GENMASK(5, 4)
+#define     PCIE_ISR1_INTX_ASSERT(val)		BIT(8 + (val))
+#define     PCIE_ISR1_ALL_MASK			GENMASK(11, 4)
+ #define PCIE_MSI_ADDR_LOW_REG			(CONTROL_BASE_ADDR + 0x50)
+ #define PCIE_MSI_ADDR_HIGH_REG			(CONTROL_BASE_ADDR + 0x54)
+ #define PCIE_MSI_STATUS_REG			(CONTROL_BASE_ADDR + 0x58)
+@@ -612,9 +613,9 @@ static void advk_pcie_irq_mask(struct irq_data *d)
+ 	irq_hw_number_t hwirq = irqd_to_hwirq(d);
+ 	u32 mask;
+ 
+-	mask = advk_readl(pcie, PCIE_ISR0_MASK_REG);
+-	mask |= PCIE_ISR0_INTX_ASSERT(hwirq);
+-	advk_writel(pcie, mask, PCIE_ISR0_MASK_REG);
+	mask = advk_readl(pcie, PCIE_ISR1_MASK_REG);
+	mask |= PCIE_ISR1_INTX_ASSERT(hwirq);
+	advk_writel(pcie, mask, PCIE_ISR1_MASK_REG);
+ }
+ 
+ static void advk_pcie_irq_unmask(struct irq_data *d)
+@@ -623,9 +624,9 @@ static void advk_pcie_irq_unmask(struct irq_data *d)
+ 	irq_hw_number_t hwirq = irqd_to_hwirq(d);
+ 	u32 mask;
+ 
+-	mask = advk_readl(pcie, PCIE_ISR0_MASK_REG);
+-	mask &= ~PCIE_ISR0_INTX_ASSERT(hwirq);
+-	advk_writel(pcie, mask, PCIE_ISR0_MASK_REG);
+	mask = advk_readl(pcie, PCIE_ISR1_MASK_REG);
+	mask &= ~PCIE_ISR1_INTX_ASSERT(hwirq);
+	advk_writel(pcie, mask, PCIE_ISR1_MASK_REG);
+ }
+ 
+ static int advk_pcie_irq_map(struct irq_domain *h,
+@@ -769,14 +770,20 @@ static void advk_pcie_handle_msi(struct advk_pcie *pcie)
+ static void advk_pcie_handle_int(struct advk_pcie *pcie)
+ {
+ 	u32 val, mask, status;
+	u32 val2, mask2, status2;
+ 	int i, virq;
+ 
+ 	val = advk_readl(pcie, PCIE_ISR0_REG);
+ 	mask = advk_readl(pcie, PCIE_ISR0_MASK_REG);
+ 	status = val & ((~mask) & PCIE_ISR0_ALL_MASK);
+ 
+-	if (!status) {
+	val2 = advk_readl(pcie, PCIE_ISR1_REG);
+	mask2 = advk_readl(pcie, PCIE_ISR1_MASK_REG);
+	status2 = val2 & ((~mask2) & PCIE_ISR1_ALL_MASK);
+
+	if (!status && !status2) {
+ 		advk_writel(pcie, val, PCIE_ISR0_REG);
+		advk_writel(pcie, val2, PCIE_ISR1_REG);
+ 		return;
+ 	}
+ 
+@@ -795,11 +795,11 @@ static void advk_pcie_handle_int(struct advk_pcie *pcie)
+ 
+ 	/* Process legacy interrupts */
+ 	for (i = 0; i < PCI_NUM_INTX; i++) {
+-		if (!(status & PCIE_ISR0_INTX_ASSERT(i)))
+		if (!(status2 & PCIE_ISR1_INTX_ASSERT(i)))
+ 			continue;
+ 
+-		advk_writel(pcie, PCIE_ISR0_INTX_ASSERT(i),
+-			    PCIE_ISR0_REG);
+		advk_writel(pcie, PCIE_ISR1_INTX_ASSERT(i),
+			    PCIE_ISR1_REG); 
+ 
+ 		virq = irq_find_mapping(pcie->irq_domain, i);
+ 		generic_handle_irq(virq);
+-- 
+2.13.3
+
--- a/patch/kernel/mvebu64-dev/0010-enable-spi-i2c.patch
+++ b/patch/kernel/mvebu64-dev/0010-enable-spi-i2c.patch
@ -0,0 +1,33 @@
+diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+old mode 100644
+new mode 100755
+index bb8cb31..0e5348c
+--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+@@ -116,6 +116,26 @@
+ 	status = "okay";
+ };
+ 
+&spi0 {
+	status = "okay";
+
+	w25q32dw@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <104000000>;
+		m25,fast-read;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&spi_quad_pins>;
+	};
+};
+
+&i2c0 {
+	status = "okay";
+};
+
+ &mdio {
+ 	switch0: switch0@1 {
+ 		compatible = "marvell,mv88e6085";
--- a/patch/kernel/mvebu64-dev/90-01-add_8812au_8821au_with_monitor_mode_and_frame_injection.patch
+++ b/patch/kernel/mvebu64-dev/90-01-add_8812au_8821au_with_monitor_mode_and_frame_injection.patch
--- a/patch/kernel/mvebu64-dev/90-02-add_8814au_with_monitor_mode_and_frame_injection.patch
+++ b/patch/kernel/mvebu64-dev/90-02-add_8814au_with_monitor_mode_and_frame_injection.patch
--- a/patch/kernel/mvebu64-dev/packaging-4.x-DEV-with-postinstall-scripts.patch
+++ b/patch/kernel/mvebu64-dev/packaging-4.x-DEV-with-postinstall-scripts.patch
@ -1,5 +1,5 @@
 diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index 807c9cd..9b9435f 100755
+index 1845c5d..9dab810 100755
 --- a/scripts/package/builddeb
 +++ b/scripts/package/builddeb
@@ -29,6 +29,28 @@ create_package() {
@ -31,14 +31,13 @@ index 807c9cd..9b9435f 100755
 	# Create the package
 	dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch}" -p$pname -P"$pdir"
 	dpkg --build "$pdir" ..
-@@ -95,11 +117,13 @@ tmpdir="$objtree/debian/tmp"
- fwdir="$objtree/debian/fwtmp"
+@@ -94,10 +116,13 @@ sourcename=$KDEB_SOURCENAME
+ tmpdir="$objtree/debian/tmp"
 kernel_headers_dir="$objtree/debian/hdrtmp"
 libc_headers_dir="$objtree/debian/headertmp"
 +dtb_dir="$objtree/debian/dtbtmp"
 dbg_dir="$objtree/debian/dbgtmp"
 -packagename=linux-image-$version
-fwpackagename=linux-firmware-image-$version
 -kernel_headers_packagename=linux-headers-$version
 -libc_headers_packagename=linux-libc-dev
 +packagename=linux-image-dev"$LOCALVERSION"
@ -49,18 +48,18 @@ index 807c9cd..9b9435f 100755
 dbg_packagename=$packagename-dbg
 debarch=
 forcearch=
-@@ -126,7 +150,9 @@ esac
+@@ -124,7 +149,9 @@ esac
 BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
 
 # Setup the directory structure
-rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
+-rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
 +rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" "$dtb_dir" $objtree/debian/files
 +mkdir -m 755 -p "$dtb_dir/DEBIAN"
 +mkdir -p "$dtb_dir/boot/dtb-$version" "$dtb_dir/usr/share/doc/$dtb_packagename"
 mkdir -m 755 -p "$tmpdir/DEBIAN"
 mkdir -p "$tmpdir/lib" "$tmpdir/boot"
- mkdir -p "$fwdir/lib/firmware/$version/"
-@@ -180,6 +206,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
+ mkdir -p "$kernel_headers_dir/lib/modules/$version/"
+@@ -177,6 +204,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
 	fi
 fi
 
@ -72,7 +71,7 @@ index 807c9cd..9b9435f 100755
 if [ "$ARCH" != "um" ]; then
 	$MAKE headers_check KBUILD_SRC=
 	$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
-@@ -192,7 +223,7 @@ fi
+@@ -189,7 +221,7 @@ fi
 # so do we; recent versions of dracut and initramfs-tools will obey this.
 debhookdir=${KDEB_HOOKDIR:-/etc/kernel}
 if grep -q '^CONFIG_BLK_DEV_INITRD=y' $KCONFIG_CONFIG; then
@ -81,7 +80,7 @@ index 807c9cd..9b9435f 100755
 else
 	want_initrd=No
 fi
-@@ -204,9 +235,11 @@ for script in postinst postrm preinst prerm ; do
+@@ -201,9 +233,11 @@ for script in postinst postrm preinst prerm ; do
 set -e
 
 # Pass maintainer script parameters to hook scripts
@ -93,7 +92,7 @@ index 807c9cd..9b9435f 100755
 export INITRD=$want_initrd
 
 test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d
-@@ -215,6 +248,55 @@ EOF
+@@ -212,6 +246,55 @@ EOF
 	chmod 755 "$tmpdir/DEBIAN/$script"
 done
 
@ -149,7 +148,7 @@ index 807c9cd..9b9435f 100755
 # Try to determine maintainer and email values
 if [ -n "$DEBEMAIL" ]; then
        email=$DEBEMAIL
-@@ -329,12 +411,20 @@ if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then
+@@ -325,12 +408,20 @@ if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then
 fi
 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
 mkdir -p "$destdir"
@ -170,7 +169,7 @@ index 807c9cd..9b9435f 100755
 cat <<EOF >> debian/control
 
 Package: $kernel_headers_packagename
-@@ -363,6 +453,16 @@ fi
+@@ -343,6 +434,16 @@ EOF
 
 cat <<EOF >> debian/control
 
@ -187,7 +186,7 @@ index 807c9cd..9b9435f 100755
 Package: $libc_headers_packagename
 Section: devel
 Provides: linux-kernel-headers
-@@ -374,7 +474,7 @@ EOF
+@@ -354,7 +455,7 @@ EOF
 
 if [ "$ARCH" != "um" ]; then
 	create_package "$kernel_headers_packagename" "$kernel_headers_dir"
--- a/patch/kernel/mvebu64-dev/set-default-target-to-Image.patch
+++ b/patch/kernel/mvebu64-dev/set-default-target-to-Image.patch
@ -0,0 +1,13 @@
+diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
+index f839ecd9..cd276162 100644
+--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
+@@ -103,7 +103,7 @@ core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
+ 
+ # Default target when executing plain make
+ boot		:= arch/arm64/boot
+-KBUILD_IMAGE	:= $(boot)/Image.gz
+KBUILD_IMAGE	:= $(boot)/Image
+ KBUILD_DTBS	:= dtbs
+ 
+ all:	Image.gz $(KBUILD_DTBS)
--- a/patch/kernel/mvebu64-dev/unlock_atheros_regulatory_restrictions.patch
+++ b/patch/kernel/mvebu64-dev/unlock_atheros_regulatory_restrictions.patch
@ -0,0 +1,72 @@
+diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
+index ccc4c71..71a4d00 100644
+--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
+@@ -49,12 +49,9 @@ static int __ath_regd_init(struct ath_regulatory *reg);
+ #define ATH9K_5GHZ_5725_5850	REG_RULE(5725-10, 5850+10, 40, 0, 30,\
+ 				NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
+ 
+-#define ATH9K_2GHZ_ALL		ATH9K_2GHZ_CH01_11, \
+-				ATH9K_2GHZ_CH12_13, \
+-				ATH9K_2GHZ_CH14
+#define ATH9K_2GHZ_ALL     REG_RULE(2400, 2483, 40, 0, 30, 0)
+ 
+-#define ATH9K_5GHZ_ALL		ATH9K_5GHZ_5150_5350, \
+-				ATH9K_5GHZ_5470_5850
+#define ATH9K_5GHZ_ALL     REG_RULE(5140, 5860, 40, 0, 30, 0)
+ 
+ /* This one skips what we call "mid band" */
+ #define ATH9K_5GHZ_NO_MIDBAND	ATH9K_5GHZ_5150_5350, \
+@@ -76,9 +73,8 @@ static const struct ieee80211_regdomain ath_world_regdom_63_65 = {
+ 	.n_reg_rules = 4,
+ 	.alpha2 =  "99",
+ 	.reg_rules = {
+-		ATH9K_2GHZ_CH01_11,
+-		ATH9K_2GHZ_CH12_13,
+-		ATH9K_5GHZ_NO_MIDBAND,
+		ATH9K_2GHZ_ALL,
+		ATH9K_5GHZ_ALL,
+ 	}
+ };
+ 
+@@ -87,8 +83,8 @@ static const struct ieee80211_regdomain ath_world_regdom_64 = {
+ 	.n_reg_rules = 3,
+ 	.alpha2 =  "99",
+ 	.reg_rules = {
+-		ATH9K_2GHZ_CH01_11,
+-		ATH9K_5GHZ_NO_MIDBAND,
+		ATH9K_2GHZ_ALL,
+		ATH9K_5GHZ_ALL,
+ 	}
+ };
+ 
+@@ -97,7 +93,7 @@ static const struct ieee80211_regdomain ath_world_regdom_66_69 = {
+ 	.n_reg_rules = 3,
+ 	.alpha2 =  "99",
+ 	.reg_rules = {
+-		ATH9K_2GHZ_CH01_11,
+		ATH9K_2GHZ_ALL,
+ 		ATH9K_5GHZ_ALL,
+ 	}
+ };
+@@ -107,8 +103,7 @@ static const struct ieee80211_regdomain ath_world_regdom_67_68_6A_6C = {
+ 	.n_reg_rules = 4,
+ 	.alpha2 =  "99",
+ 	.reg_rules = {
+-		ATH9K_2GHZ_CH01_11,
+-		ATH9K_2GHZ_CH12_13,
+		ATH9K_2GHZ_ALL,
+ 		ATH9K_5GHZ_ALL,
+ 	}
+ };
+@@ -253,9 +253,7 @@ static bool ath_is_radar_freq(u16 center_freq,
+ 			      struct ath_regulatory *reg)
+ 
+ {
+-	if (reg->country_code == CTRY_INDIA)
+-		return (center_freq >= 5500 && center_freq <= 5700);
+-	return (center_freq >= 5260 && center_freq <= 5700);
+	return false;
+ }
+ 
+ static void ath_force_clear_no_ir_chan(struct wiphy *wiphy,
--- a/patch/kernel/mvebu64-dev/zImage_to_Image.patch
+++ b/patch/kernel/mvebu64-dev/zImage_to_Image.patch
@ -0,0 +1,50 @@
+diff --git a/scripts/package/builddeb b/scripts/package/builddeb
+index 0f8de20..3a39d73 100755
+--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
+@@ -251,7 +251,7 @@ done
+ ##
+ sed -e "s/set -e//g" -i $tmpdir/DEBIAN/postinst
+ sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
+-cat >> $tmpdir/DEBIAN/postinst <<EOT 
+cat >> $tmpdir/DEBIAN/postinst <<EOT
+ if [ "\$(grep nand /proc/partitions)" != "" ] && [ "\$(grep mmc /proc/partitions)" = "" ]; then
+ mkimage -A arm -O linux -T kernel -C none -a "0x40008000" -e "0x40008000" -n "Linux kernel" -d /$installed_image_path /boot/uImage  > /dev/null 2>&1
+ cp /boot/uImage /tmp/uImage
+@@ -260,7 +260,7 @@ mountpoint -q /boot || mount /boot
+ cp /tmp/uImage /boot/uImage
+ rm -f /$installed_image_path
+ else
+-ln -sf $(basename $installed_image_path) /boot/zImage > /dev/null 2>&1 || mv /$installed_image_path /boot/zImage
+ln -sf $(basename $installed_image_path) /boot/Image > /dev/null 2>&1 || mv /$installed_image_path /boot/Image
+ fi
+ touch /boot/.next
+ exit 0
+@@ -270,7 +270,7 @@ EOT
+ ##
+ sed -e "s/set -e//g" -i $tmpdir/DEBIAN/preinst
+ sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/preinst
+-cat >> $tmpdir/DEBIAN/preinst <<EOT 
+cat >> $tmpdir/DEBIAN/preinst <<EOT
+ # exit if we are running chroot
+ if [ "\$(stat -c %d:%i /)" != "\$(stat -c %d:%i /proc/1/root/.)" ]; then exit 0; fi
+ 
+@@ -286,14 +286,14 @@ for file in /dev/* ; do
+ done
+ 
+ bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
+-if [ "\$bootfstype" = "vfat" ]; then 
+-umount /boot; 
+-rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/zImage /boot/uImage
+if [ "\$bootfstype" = "vfat" ]; then
+umount /boot;
+rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/Image /boot/uImage
+ fi
+ }
+ mountpoint -q /boot && check_and_unmount
+ EOT
+-echo "exit 0" >> $tmpdir/DEBIAN/preinst 
+echo "exit 0" >> $tmpdir/DEBIAN/preinst
+ 
+ # Try to determine maintainer and email values
+ if [ -n "$DEBEMAIL" ]; then
--- a/patch/kernel/mvebu64-next/0002-ARM64-dts-marvell-armada37xx-Enable-memory-mapped-GI.patch
+++ b/patch/kernel/mvebu64-next/0002-ARM64-dts-marvell-armada37xx-Enable-memory-mapped-GI.patch
@ -1,38 +0,0 @@
-From a6e0e494f7213d914963b2aea8e3ff0e9a0e978a Mon Sep 17 00:00:00 2001
-From: Marc Zyngier <Marc.Zyngier@arm.com>
-Date: Sat, 1 Jul 2017 15:16:35 +0100
-Subject: [PATCH 02/11] ARM64: dts: marvell: armada37xx: Enable memory-mapped
- GIC CPU interface
-
-The Cortex-A53s that power the Armada-37xx SoCs are equipped with
-a GIC CPU interface that gets enabled when coupled with a GICv3
-interrupt controller, such as the GIC-500 on the this SoC.
-
-Advertise the MMIO ranges provided by the CPUs, which enables
-(among other things) GICv2 guests to run under a hypervisor such
-as KVM.
-
-Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
-index 592e95e5f633..fd26d31d2846 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
-+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
-@@ -311,7 +311,10 @@
- 				#interrupt-cells = <3>;
- 				interrupt-controller;
- 				reg = <0x1d00000 0x10000>, /* GICD */
-				      <0x1d40000 0x40000>; /* GICR */
-+				      <0x1d40000 0x40000>, /* GICR */
-+				      <0x1d80000 0x2000>,  /* GICC */
-+				      <0x1d90000 0x2000>,  /* GICH */
-+				      <0x1da0000 0x20000>; /* GICV */
- 				interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
- 			};
- 		};
-- 
-2.13.3
-
--- a/patch/kernel/mvebu64-next/0003-ARM64-dts-marvell-armada37xx-Wire-PMUv3.patch
+++ b/patch/kernel/mvebu64-next/0003-ARM64-dts-marvell-armada37xx-Wire-PMUv3.patch
@ -1,35 +0,0 @@
-From b61fe18e003c4a37b91092cf4abaee9592bb5a87 Mon Sep 17 00:00:00 2001
-From: Marc Zyngier <Marc.Zyngier@arm.com>
-Date: Sat, 1 Jul 2017 15:16:36 +0100
-Subject: [PATCH 03/11] ARM64: dts: marvell: armada37xx: Wire PMUv3
-
-The Cortex-A53s that power the Armada-37xx SoCs are equipped with
-a PMUv3, just like most ARMv8 cores.
-
-Advertise the PMUv3 presence in the device tree, and wire its
-interrupt. This allows the perf subsystem to work correctly.
-
-Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
-index fd26d31d2846..f4deb8cd11c6 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
-+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
-@@ -81,6 +81,11 @@
- 			     <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>;
- 	};
- 
-+	pmu {
-+                compatible = "arm,armv8-pmuv3";
-+                interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
-+	};
-+
- 	soc {
- 		compatible = "simple-bus";
- 		#address-cells = <2>;
-- 
-2.13.3
-
--- a/patch/kernel/mvebu64-next/0006-ARM64-dts-marvell-armada-37xx-Enable-uSD-on-ESPRESSO.patch
+++ b/patch/kernel/mvebu64-next/0006-ARM64-dts-marvell-armada-37xx-Enable-uSD-on-ESPRESSO.patch
@ -1,71 +0,0 @@
-From 1d0dd1ab378af298bf4040edb8ee58d340f48518 Mon Sep 17 00:00:00 2001
-From: Marcin Wojtas <mw@semihalf.com>
-Date: Fri, 21 Jul 2017 01:50:36 +0200
-Subject: [PATCH 06/11] ARM64: dts: marvell: armada-37xx: Enable uSD on
- ESPRESSObin
-
-The ESPRESSObin board exposes one of the SDHCI interfaces
-via J1 uSD slot. This patch enables it.
-
-Tested-by: Miquel Raynal <miquel.raynal@free-electrons.com>
-Signed-off-by: Marcin Wojtas <mw@semihalf.com>
-Signed-off-by: Zbigniew Bodek <zbodek@gmail.com>
-[gregory.clement@free-electrons.com:  removed "no-1-8-v"]
-Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
- .../boot/dts/marvell/armada-3720-espressobin.dts   | 25 ++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
-index b1af3f988b29..2ce52ba74f73 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
-+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
-@@ -45,6 +45,7 @@
- 
- /dts-v1/;
- 
-+#include <dt-bindings/gpio/gpio.h>
- #include "armada-372x.dtsi"
- 
- / {
-@@ -59,6 +60,20 @@
- 		device_type = "memory";
- 		reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
- 	};
-+
-+	vcc_sd_reg1: regulator {
-+		compatible = "regulator-gpio";
-+		regulator-name = "vcc_sd1";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-boot-on;
-+
-+		gpios = <&gpionb 4 GPIO_ACTIVE_HIGH>;
-+		gpios-states = <0>;
-+		states = <1800000 0x1
-+			  3300000 0x0>;
-+		enable-active-high;
-+	};
- };
- 
- /* J9 */
-@@ -71,6 +86,16 @@
- 	status = "okay";
- };
- 
-+/* J1 */
-+&sdhci1 {
-+	wp-inverted;
-+	bus-width = <4>;
-+	cd-gpios = <&gpionb 3 GPIO_ACTIVE_LOW>;
-+	marvell,pad-type = "sd";
-+	vqmmc-supply = <&vcc_sd_reg1>;
-+	status = "okay";
-+};
-+
- /* Exported on the micro USB connector J5 through an FTDI */
- &uart0 {
- 	status = "okay";
-- 
-2.13.3
-
--- a/patch/kernel/mvebu64-next/0009-fix-pci-aardvark-use-isr1-interrupt-in-legacy-irq-mo.patch
+++ b/patch/kernel/mvebu64-next/0009-fix-pci-aardvark-use-isr1-interrupt-in-legacy-irq-mo.patch
@ -84,10 +84,10 @@ index 072bc70e900c..10154dcf219b 100644
 		return;
 	}
 
-@@ -786,11 +793,11 @@ static void advk_pcie_handle_int(struct advk_pcie *pcie)
+@@ -795,11 +795,11 @@ static void advk_pcie_handle_int(struct advk_pcie *pcie)
 
 	/* Process legacy interrupts */
- 	for (i = 0; i < LEGACY_IRQ_NUM; i++) {
+ 	for (i = 0; i < PCI_NUM_INTX; i++) {
 -		if (!(status & PCIE_ISR0_INTX_ASSERT(i)))
 +		if (!(status2 & PCIE_ISR1_INTX_ASSERT(i)))
 			continue;
@ -95,7 +95,7 @@ index 072bc70e900c..10154dcf219b 100644
 -		advk_writel(pcie, PCIE_ISR0_INTX_ASSERT(i),
 -			    PCIE_ISR0_REG);
 +		advk_writel(pcie, PCIE_ISR1_INTX_ASSERT(i),
-+			    PCIE_ISR1_REG);
+			    PCIE_ISR1_REG); 
 
 		virq = irq_find_mapping(pcie->irq_domain, i);
 		generic_handle_irq(virq);
--- a/patch/kernel/mvebu64-next/0010-enable-spi-i2c.patch
+++ b/patch/kernel/mvebu64-next/0010-enable-spi-i2c.patch
@ -0,0 +1,33 @@
+diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+old mode 100644
+new mode 100755
+index bb8cb31..0e5348c
+--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+@@ -116,6 +116,26 @@
+ 	status = "okay";
+ };
+ 
+&spi0 {
+	status = "okay";
+
+	w25q32dw@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <104000000>;
+		m25,fast-read;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&spi_quad_pins>;
+	};
+};
+
+&i2c0 {
+	status = "okay";
+};
+
+ &mdio {
+ 	switch0: switch0@1 {
+ 		compatible = "marvell,mv88e6085";
--- a/patch/kernel/mvebu64-next/aufs4.12.patch
+++ b/patch/kernel/mvebu64-next/aufs4.12.patch
--- a/patch/kernel/mvebu64-next/packaging-4.x-NEXT-with-postinstall-scripts.patch
+++ b/patch/kernel/mvebu64-next/packaging-4.x-NEXT-with-postinstall-scripts.patch
@ -1,5 +1,5 @@
 diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index aad67000..b4f574e7 100755
+index 1845c5d..9dab810 100755
 --- a/scripts/package/builddeb
 +++ b/scripts/package/builddeb
@@ -29,6 +29,28 @@ create_package() {
@ -20,25 +20,24 @@ index aad67000..b4f574e7 100755
 +		echo "exit 0" >> $pdir/DEBIAN/postinst
 +		chmod 775 $pdir/DEBIAN/postinst
 +	fi
-+
+	
 +	# Create postinstall script for headers
 +	if [[ "$1" == *headers* ]]; then
 +		echo "cd /usr/src/linux-headers-$version; echo \"Compiling headers - please wait ...\"; make -s scripts >/dev/null 2>&1" >> $pdir/DEBIAN/postinst
 +		echo "exit 0" >> $pdir/DEBIAN/postinst
 +		chmod 775 $pdir/DEBIAN/postinst
 +	fi
-+
+	
 	# Create the package
 	dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch}" -p$pname -P"$pdir"
 	dpkg --build "$pdir" ..
-@@ -95,11 +117,13 @@ tmpdir="$objtree/debian/tmp"
- fwdir="$objtree/debian/fwtmp"
+@@ -94,10 +116,13 @@ sourcename=$KDEB_SOURCENAME
+ tmpdir="$objtree/debian/tmp"
 kernel_headers_dir="$objtree/debian/hdrtmp"
 libc_headers_dir="$objtree/debian/headertmp"
 +dtb_dir="$objtree/debian/dtbtmp"
 dbg_dir="$objtree/debian/dbgtmp"
 -packagename=linux-image-$version
-fwpackagename=linux-firmware-image-$version
 -kernel_headers_packagename=linux-headers-$version
 -libc_headers_packagename=linux-libc-dev
 +packagename=linux-image-next"$LOCALVERSION"
@ -49,18 +48,18 @@ index aad67000..b4f574e7 100755
 dbg_packagename=$packagename-dbg
 debarch=
 forcearch=
-@@ -126,7 +150,9 @@ esac
+@@ -124,7 +149,9 @@ esac
 BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
 
 # Setup the directory structure
-rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
+-rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
 +rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" "$dtb_dir" $objtree/debian/files
 +mkdir -m 755 -p "$dtb_dir/DEBIAN"
 +mkdir -p "$dtb_dir/boot/dtb-$version" "$dtb_dir/usr/share/doc/$dtb_packagename"
 mkdir -m 755 -p "$tmpdir/DEBIAN"
 mkdir -p "$tmpdir/lib" "$tmpdir/boot"
- mkdir -p "$fwdir/lib/firmware/$version/"
-@@ -180,6 +206,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
+ mkdir -p "$kernel_headers_dir/lib/modules/$version/"
+@@ -177,6 +204,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
 	fi
 fi
 
@ -72,7 +71,28 @@ index aad67000..b4f574e7 100755
 if [ "$ARCH" != "um" ]; then
 	$MAKE headers_check KBUILD_SRC=
 	$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
-@@ -215,6 +246,55 @@ EOF
+@@ -189,7 +221,7 @@ fi
+ # so do we; recent versions of dracut and initramfs-tools will obey this.
+ debhookdir=${KDEB_HOOKDIR:-/etc/kernel}
+ if grep -q '^CONFIG_BLK_DEV_INITRD=y' $KCONFIG_CONFIG; then
+-	want_initrd=Yes
+	want_initrd=Yes 
+ else
+ 	want_initrd=No
+ fi
+@@ -201,9 +233,11 @@ for script in postinst postrm preinst prerm ; do
+ set -e
+ 
+ # Pass maintainer script parameters to hook scripts
+
+ export DEB_MAINT_PARAMS="\$*"
+ 
+ # Tell initramfs builder whether it's wanted
+
+ export INITRD=$want_initrd
+ 
+ test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d
+@@ -212,6 +246,55 @@ EOF
 	chmod 755 "$tmpdir/DEBIAN/$script"
 done
 
@ -128,31 +148,28 @@ index aad67000..b4f574e7 100755
 # Try to determine maintainer and email values
 if [ -n "$DEBEMAIL" ]; then
        email=$DEBEMAIL
-@@ -318,6 +398,7 @@ fi
- # Build kernel header package
- (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"
- (cd $srctree; find arch/*/include include scripts -type f) >> "$objtree/debian/hdrsrcfiles"
-+(cd $srctree; find security/*/include -type f) >> "$objtree/debian/hdrsrcfiles"
- (cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
- (cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
- if grep -q '^CONFIG_STACK_VALIDATION=y' $KCONFIG_CONFIG ; then
-@@ -329,12 +410,15 @@ if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then
+@@ -325,12 +408,20 @@ if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then
 fi
 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
 mkdir -p "$destdir"
-+(cd $destdir; patch -p1 < /tmp/headers-debian-byteshift.patch)
+######################## headers patch
+ZACNI=$(pwd)
+cd $destdir
+patch -p1 < /tmp/headers-debian-byteshift.patch
+cd $ZACNI
+######################## headers patch
 (cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)
 (cd $objtree; tar -c -f - -T -) < "$objtree/debian/hdrobjfiles" | (cd $destdir; tar -xf -)
 (cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
 ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
 rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
 
-+(cd $destdir; make M=scripts clean)
+(cd "$destdir"; make M=scripts clean)
 +
 cat <<EOF >> debian/control
 
 Package: $kernel_headers_packagename
-@@ -363,6 +447,16 @@ fi
+@@ -343,6 +434,16 @@ EOF
 
 cat <<EOF >> debian/control
 
@ -169,7 +186,7 @@ index aad67000..b4f574e7 100755
 Package: $libc_headers_packagename
 Section: devel
 Provides: linux-kernel-headers
-@@ -374,7 +468,7 @@ EOF
+@@ -354,7 +455,7 @@ EOF
 
 if [ "$ARCH" != "um" ]; then
 	create_package "$kernel_headers_packagename" "$kernel_headers_dir"