From 51a54393e9038b1c6cf2cbb4b3f48ff6fcfe3493 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 7 Feb 2019 09:23:07 +0000 Subject: [PATCH] enable COMPAT on aarch64 to enable some legacy usecases on aarch64 with containers --- .../fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_845719 | 1 + configs/fedora/generic/arm/aarch64/CONFIG_ARMV8_DEPRECATED | 1 + configs/fedora/generic/arm/aarch64/CONFIG_COMPAT | 2 +- .../generic/arm/aarch64/CONFIG_CP15_BARRIER_EMULATION | 1 + configs/fedora/generic/arm/aarch64/CONFIG_DEBUG_WX | 1 - configs/fedora/generic/arm/aarch64/CONFIG_SETEND_EMULATION | 1 + configs/fedora/generic/arm/aarch64/CONFIG_SWP_EMULATION | 1 + kernel-aarch64-debug.config | 7 ++++++- kernel-aarch64.config | 7 ++++++- 9 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_845719 create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_ARMV8_DEPRECATED create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_CP15_BARRIER_EMULATION delete mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_DEBUG_WX create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_SETEND_EMULATION create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_SWP_EMULATION diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_845719 b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_845719 new file mode 100644 index 000000000..c223b74d7 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_845719 @@ -0,0 +1 @@ +CONFIG_ARM64_ERRATUM_845719=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARMV8_DEPRECATED b/configs/fedora/generic/arm/aarch64/CONFIG_ARMV8_DEPRECATED new file mode 100644 index 000000000..7ebf3c87e --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARMV8_DEPRECATED @@ -0,0 +1 @@ +CONFIG_ARMV8_DEPRECATED=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_COMPAT b/configs/fedora/generic/arm/aarch64/CONFIG_COMPAT index 3e041f1b6..9b072bae7 100644 --- a/configs/fedora/generic/arm/aarch64/CONFIG_COMPAT +++ b/configs/fedora/generic/arm/aarch64/CONFIG_COMPAT @@ -1 +1 @@ -# CONFIG_COMPAT is not set +CONFIG_COMPAT=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CP15_BARRIER_EMULATION b/configs/fedora/generic/arm/aarch64/CONFIG_CP15_BARRIER_EMULATION new file mode 100644 index 000000000..e084b1441 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_CP15_BARRIER_EMULATION @@ -0,0 +1 @@ +CONFIG_CP15_BARRIER_EMULATION=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_DEBUG_WX b/configs/fedora/generic/arm/aarch64/CONFIG_DEBUG_WX deleted file mode 100644 index 95e08f44b..000000000 --- a/configs/fedora/generic/arm/aarch64/CONFIG_DEBUG_WX +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DEBUG_WX=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SETEND_EMULATION b/configs/fedora/generic/arm/aarch64/CONFIG_SETEND_EMULATION new file mode 100644 index 000000000..73fd5c40b --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_SETEND_EMULATION @@ -0,0 +1 @@ +CONFIG_SETEND_EMULATION=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SWP_EMULATION b/configs/fedora/generic/arm/aarch64/CONFIG_SWP_EMULATION new file mode 100644 index 000000000..a99b5006f --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_SWP_EMULATION @@ -0,0 +1 @@ +CONFIG_SWP_EMULATION=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index dcc11d857..2f290d677 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -289,6 +289,7 @@ CONFIG_ARM64_ERRATUM_827319=y CONFIG_ARM64_ERRATUM_832075=y CONFIG_ARM64_ERRATUM_834220=y CONFIG_ARM64_ERRATUM_843419=y +CONFIG_ARM64_ERRATUM_845719=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_LSE_ATOMICS=y @@ -359,6 +360,7 @@ CONFIG_ARM_TEGRA186_CPUFREQ=m # CONFIG_ARM_TEGRA20_CPUFREQ is not set CONFIG_ARM_TEGRA_DEVFREQ=m CONFIG_ARM_TIMER_SP804=y +CONFIG_ARMV8_DEPRECATED=y # CONFIG_AS3935 is not set # CONFIG_ASIX_PHY is not set CONFIG_ASYMMETRIC_KEY_TYPE=y @@ -968,7 +970,7 @@ CONFIG_COMMON_CLK_ZYNQMP=y CONFIG_COMMON_RESET_HI6220=m CONFIG_COMPACTION=y # CONFIG_COMPAT_BRK is not set -# CONFIG_COMPAT is not set +CONFIG_COMPAT=y # CONFIG_COMPILE_TEST is not set CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y @@ -980,6 +982,7 @@ CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y # CONFIG_CORESIGHT is not set CONFIG_CORTINA_PHY=m +CONFIG_CP15_BARRIER_EMULATION=y # CONFIG_CPU5_WDT is not set # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set @@ -5320,6 +5323,7 @@ CONFIG_SERIO_RAW=m CONFIG_SERIO_SERPORT=y # CONFIG_SERIO_SUN4I_PS2 is not set CONFIG_SERIO=y +CONFIG_SETEND_EMULATION=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set @@ -5881,6 +5885,7 @@ CONFIG_SUNXI_WATCHDOG=m # CONFIG_SURFACE_3_BUTTON is not set CONFIG_SUSPEND=y CONFIG_SWAP=y +CONFIG_SWP_EMULATION=y # CONFIG_SW_SYNC is not set # CONFIG_SX9500 is not set CONFIG_SYNC_FILE=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index ce63c7085..733d3b43e 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -289,6 +289,7 @@ CONFIG_ARM64_ERRATUM_827319=y CONFIG_ARM64_ERRATUM_832075=y CONFIG_ARM64_ERRATUM_834220=y CONFIG_ARM64_ERRATUM_843419=y +CONFIG_ARM64_ERRATUM_845719=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_LSE_ATOMICS=y @@ -359,6 +360,7 @@ CONFIG_ARM_TEGRA186_CPUFREQ=m # CONFIG_ARM_TEGRA20_CPUFREQ is not set CONFIG_ARM_TEGRA_DEVFREQ=m CONFIG_ARM_TIMER_SP804=y +CONFIG_ARMV8_DEPRECATED=y # CONFIG_AS3935 is not set # CONFIG_ASIX_PHY is not set CONFIG_ASYMMETRIC_KEY_TYPE=y @@ -968,7 +970,7 @@ CONFIG_COMMON_CLK_ZYNQMP=y CONFIG_COMMON_RESET_HI6220=m CONFIG_COMPACTION=y # CONFIG_COMPAT_BRK is not set -# CONFIG_COMPAT is not set +CONFIG_COMPAT=y # CONFIG_COMPILE_TEST is not set CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y @@ -980,6 +982,7 @@ CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y # CONFIG_CORESIGHT is not set CONFIG_CORTINA_PHY=m +CONFIG_CP15_BARRIER_EMULATION=y # CONFIG_CPU5_WDT is not set # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set @@ -5299,6 +5302,7 @@ CONFIG_SERIO_RAW=m CONFIG_SERIO_SERPORT=y # CONFIG_SERIO_SUN4I_PS2 is not set CONFIG_SERIO=y +CONFIG_SETEND_EMULATION=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set @@ -5859,6 +5863,7 @@ CONFIG_SUNXI_WATCHDOG=m # CONFIG_SURFACE_3_BUTTON is not set CONFIG_SUSPEND=y CONFIG_SWAP=y +CONFIG_SWP_EMULATION=y # CONFIG_SW_SYNC is not set # CONFIG_SX9500 is not set CONFIG_SYNC_FILE=y