From 47f68ca58615fa71d7905130fb28d3ffe51effa2 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Thu, 18 Oct 2018 12:11:27 +0200 Subject: kernel: bump 4.14 to 4.14.77 Refreshed all patches. Altered patches: - 666-Add-support-for-MAP-E-FMRs-mesh-mode.patch New symbol for arm targets: - HARDEN_BRANCH_PREDICTOR Compile-tested on: cns3xxx, imx6, x86_64 Runtime-tested on: cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte Tested-by: Stijn Tintel --- target/linux/sunxi/cortexa7/config-default | 1 + target/linux/sunxi/cortexa8/config-default | 1 + .../001-net-stmmac-snps-dwmac-mdio-MDIOs-are-automatically-r.patch | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'target/linux/sunxi') diff --git a/target/linux/sunxi/cortexa7/config-default b/target/linux/sunxi/cortexa7/config-default index cf41ddb4e6..9daf9c443a 100644 --- a/target/linux/sunxi/cortexa7/config-default +++ b/target/linux/sunxi/cortexa7/config-default @@ -1,4 +1,5 @@ CONFIG_DWMAC_SUN8I=y +CONFIG_HARDEN_BRANCH_PREDICTOR=y # CONFIG_MACH_SUN4I is not set # CONFIG_MACH_SUN5I is not set # CONFIG_PINCTRL_GR8 is not set diff --git a/target/linux/sunxi/cortexa8/config-default b/target/linux/sunxi/cortexa8/config-default index fa40deb6f8..aab7dec0af 100644 --- a/target/linux/sunxi/cortexa8/config-default +++ b/target/linux/sunxi/cortexa8/config-default @@ -1,6 +1,7 @@ # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set # CONFIG_ARM_ERRATA_643719 is not set # CONFIG_ARM_LPAE is not set +CONFIG_HARDEN_BRANCH_PREDICTOR=y # CONFIG_MACH_SUN6I is not set # CONFIG_MACH_SUN7I is not set # CONFIG_MACH_SUN8I is not set diff --git a/target/linux/sunxi/patches-4.14/001-net-stmmac-snps-dwmac-mdio-MDIOs-are-automatically-r.patch b/target/linux/sunxi/patches-4.14/001-net-stmmac-snps-dwmac-mdio-MDIOs-are-automatically-r.patch index 3a9668b641..838b234717 100644 --- a/target/linux/sunxi/patches-4.14/001-net-stmmac-snps-dwmac-mdio-MDIOs-are-automatically-r.patch +++ b/target/linux/sunxi/patches-4.14/001-net-stmmac-snps-dwmac-mdio-MDIOs-are-automatically-r.patch @@ -20,7 +20,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c -@@ -318,10 +318,6 @@ static int stmmac_dt_phy(struct plat_stm +@@ -317,10 +317,6 @@ static int stmmac_dt_phy(struct plat_stm bool mdio = true; static const struct of_device_id need_mdio_ids[] = { { .compatible = "snps,dwc-qos-ethernet-4.10" }, -- cgit v1.2.3