aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/config-5.10
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic/config-5.10')
-rw-r--r--target/linux/generic/config-5.104
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
index a093861b9d..a46fe13e64 100644
--- a/target/linux/generic/config-5.10
+++ b/target/linux/generic/config-5.10
@@ -2168,6 +2168,7 @@ CONFIG_GPIO_SYSFS=y
CONFIG_HARDENED_USERCOPY=y
# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+CONFIG_HARDEN_BRANCH_HISTORY=y
CONFIG_HARDEN_EL2_VECTORS=y
# CONFIG_HARDLOCKUP_DETECTOR is not set
# CONFIG_HAVE_ARM_ARCH_TIMER is not set
@@ -3389,8 +3390,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MICROCHIP_T1_PHY is not set
# CONFIG_MICROSEMI_PHY is not set
# CONFIG_MIGRATION is not set
-CONFIG_HARDEN_BRANCH_HISTORY=y
-CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
CONFIG_MII=y
# CONFIG_MIKROTIK is not set
# CONFIG_MIKROTIK_RB532 is not set
@@ -3421,6 +3420,7 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_MISDN_NETJET is not set
# CONFIG_MISDN_SPEEDFAX is not set
# CONFIG_MISDN_W6692 is not set
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
# CONFIG_MKISS is not set
# CONFIG_MLX4_CORE is not set
# CONFIG_MLX4_EN is not set