From 70ef5398170de0524310f0828922bbd58fe3036b Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Tue, 27 Feb 2018 16:15:38 +0100 Subject: [PATCH] Meson64 NEXT patch and config update --- config/kernel/linux-meson64-next.config | 5 ++++- .../kernel/meson64-next/1040_GXL_SOC_ID_fix.patch | 15 --------------- 2 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 patch/kernel/meson64-next/1040_GXL_SOC_ID_fix.patch diff --git a/config/kernel/linux-meson64-next.config b/config/kernel/linux-meson64-next.config index f5a1154a91..65bb14463a 100644 --- a/config/kernel/linux-meson64-next.config +++ b/config/kernel/linux-meson64-next.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.18 Kernel Configuration +# Linux/arm64 4.14.22 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -433,6 +433,7 @@ CONFIG_CAVIUM_ERRATUM_30115=y CONFIG_QCOM_FALKOR_ERRATUM_1003=y CONFIG_QCOM_FALKOR_ERRATUM_1009=y CONFIG_QCOM_QDF2400_ERRATUM_0065=y +CONFIG_QCOM_FALKOR_ERRATUM_E1041=y CONFIG_ARM64_4K_PAGES=y # CONFIG_ARM64_16K_PAGES is not set # CONFIG_ARM64_64K_PAGES is not set @@ -518,6 +519,8 @@ CONFIG_KEXEC=y CONFIG_XEN_DOM0=y CONFIG_XEN=y CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_UNMAP_KERNEL_AT_EL0=y +CONFIG_HARDEN_BRANCH_PREDICTOR=y # CONFIG_ARMV8_DEPRECATED is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set diff --git a/patch/kernel/meson64-next/1040_GXL_SOC_ID_fix.patch b/patch/kernel/meson64-next/1040_GXL_SOC_ID_fix.patch deleted file mode 100644 index a07c627bad..0000000000 --- a/patch/kernel/meson64-next/1040_GXL_SOC_ID_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c -index 89f4cf5..f2d8c3c 100644 ---- a/drivers/soc/amlogic/meson-gx-socinfo.c -+++ b/drivers/soc/amlogic/meson-gx-socinfo.c -@@ -20,8 +20,8 @@ - #define AO_SEC_SOCINFO_OFFSET AO_SEC_SD_CFG8 - - #define SOCINFO_MAJOR GENMASK(31, 24) --#define SOCINFO_MINOR GENMASK(23, 16) --#define SOCINFO_PACK GENMASK(15, 8) -+#define SOCINFO_PACK GENMASK(23, 16) -+#define SOCINFO_MINOR GENMASK(15, 8) - #define SOCINFO_MISC GENMASK(7, 0) - - static const struct meson_gx_soc_id {