From 2eeb5d6aac55e097074c4ee08fe6324e1d6a5f0e Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 8 Dec 2018 18:33:17 +0100 Subject: [PATCH] sunxi: Refresh kernel 4.14 configuration Refresh the sunxi kernel configuration without doing any intentional changes. Signed-off-by: Hauke Mehrtens --- target/linux/sunxi/config-4.14 | 2 ++ target/linux/sunxi/cortexa53/config-4.14 | 8 +------- target/linux/sunxi/cortexa8/config-4.14 | 5 ++--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/target/linux/sunxi/config-4.14 b/target/linux/sunxi/config-4.14 index cd48b36d02..c13b1452ee 100644 --- a/target/linux/sunxi/config-4.14 +++ b/target/linux/sunxi/config-4.14 @@ -109,6 +109,7 @@ CONFIG_CPU_HAS_ASID=y CONFIG_CPU_PABRT_V7=y CONFIG_CPU_PM=y CONFIG_CPU_RMAP=y +CONFIG_CPU_SPECTRE=y CONFIG_CPU_THERMAL=y CONFIG_CPU_THUMB_CAPABLE=y CONFIG_CPU_TLB_V7=y @@ -221,6 +222,7 @@ CONFIG_GPIO_AXP209=y CONFIG_GPIO_SYSFS=y # CONFIG_GRO_CELLS is not set CONFIG_HANDLE_DOMAIN_IRQ=y +CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y diff --git a/target/linux/sunxi/cortexa53/config-4.14 b/target/linux/sunxi/cortexa53/config-4.14 index b1702bc3c2..154f5e9a48 100644 --- a/target/linux/sunxi/cortexa53/config-4.14 +++ b/target/linux/sunxi/cortexa53/config-4.14 @@ -31,7 +31,6 @@ CONFIG_ARM64_CONT_SHIFT=4 CONFIG_ARM64_PAGE_SHIFT=12 # CONFIG_ARM64_PAN is not set # CONFIG_ARM64_PMEM is not set -# CONFIG_ARM64_PTDUMP is not set # CONFIG_ARM64_PTDUMP_CORE is not set # CONFIG_ARM64_PTDUMP_DEBUGFS is not set # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set @@ -46,17 +45,12 @@ CONFIG_ARM_AMBA=y CONFIG_ARM_GIC_V3=y # CONFIG_ARM_SP805_WATCHDOG is not set CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y -# CONFIG_COMMON_CLK_VERSATILE is not set -CONFIG_COMMON_CLK_XGENE=y # CONFIG_COMPAT is not set -# CONFIG_DEBUG_ALIGN_RODATA is not set CONFIG_DWMAC_SUN8I=y CONFIG_FRAME_POINTER=y -# CONFIG_FSL_ERRATUM_A008585 is not set CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_CSUM=y CONFIG_GENERIC_IRQ_MIGRATION=y -CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_ARCH_HUGE_VMAP=y CONFIG_HAVE_ARCH_KASAN=y @@ -66,6 +60,7 @@ CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_DEBUG_BUGVERBOSE=y CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_HAVE_PATA_PLATFORM=y +CONFIG_HOLES_IN_ZONE=y CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 CONFIG_KERNEL_MODE_NEON=y CONFIG_KVM_ARM_PMU=y @@ -76,7 +71,6 @@ CONFIG_NO_IOPORT_MAP=y # CONFIG_NUMA is not set CONFIG_PARTITION_PERCPU=y # CONFIG_PCI_DOMAINS is not set -# CONFIG_PHY_XGENE is not set # CONFIG_PINCTRL_SUN4I_A10 is not set CONFIG_PINCTRL_SUN50I_A64=y CONFIG_PINCTRL_SUN50I_A64_R=y diff --git a/target/linux/sunxi/cortexa8/config-4.14 b/target/linux/sunxi/cortexa8/config-4.14 index aab7dec0af..6cbb4417f6 100644 --- a/target/linux/sunxi/cortexa8/config-4.14 +++ b/target/linux/sunxi/cortexa8/config-4.14 @@ -1,7 +1,6 @@ # 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 @@ -9,14 +8,14 @@ CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_PGTABLE_LEVELS=2 # CONFIG_PHYS_ADDR_T_64BIT is not set # CONFIG_PINCTRL_SUN6I_A31 is not set -# CONFIG_PINCTRL_SUN6I_A31S is not set # CONFIG_PINCTRL_SUN6I_A31_R is not set -# CONFIG_PINCTRL_SUN7I_A20 is not set # CONFIG_PINCTRL_SUN8I_A23 is not set # CONFIG_PINCTRL_SUN8I_A23_R is not set # CONFIG_PINCTRL_SUN8I_A33 is not set # CONFIG_PINCTRL_SUN8I_A83T is not set +# CONFIG_PINCTRL_SUN8I_A83T_R is not set # CONFIG_PINCTRL_SUN8I_H3 is not set # CONFIG_PINCTRL_SUN8I_H3_R is not set +# CONFIG_PINCTRL_SUN8I_V3S is not set # CONFIG_PINCTRL_SUN9I_A80 is not set # CONFIG_PINCTRL_SUN9I_A80_R is not set -- 2.30.2