mediatek: Remove double CONFIG_HARDEN_BRANCH_PREDICTOR

CONFIG_HARDEN_BRANCH_PREDICTOR option is included two times in this
configuration file. Remove one definition. On arm32 SoC it should not be
needed.

Fixes: 54f9744c820a ("treewide: disable spectre mitigation on unaffected Arm32 targets")
Link: https://github.com/openwrt/openwrt/pull/16743
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/mediatek/mt7623/config-6.6 b/target/linux/mediatek/mt7623/config-6.6
index e34822d99224857c03288a7274aec8b2b2be7529..baa31b465df9ad6e2075be7aa8cf39f6b8dfbd5e 100644 (file)
--- a/target/linux/mediatek/mt7623/config-6.6
+++ b/target/linux/mediatek/mt7623/config-6.6
@@ -273,7 +273,6 @@ CONFIG_GPIO_CDEV=y
 CONFIG_GRO_CELLS=y
 # CONFIG_HARDEN_BRANCH_HISTORY is not set
 # CONFIG_HARDEN_BRANCH_PREDICTOR is not set
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y

diff --git a/target/linux/mediatek/mt7629/config-6.6 b/target/linux/mediatek/mt7629/config-6.6
index 81c07a54922569d2993b49b30a98a92afb1c087a..5169acb99f003372144c49426a9301d640db4802 100644 (file)
--- a/target/linux/mediatek/mt7629/config-6.6
+++ b/target/linux/mediatek/mt7629/config-6.6
@@ -147,7 +147,6 @@ CONFIG_GPIO_CDEV=y
 CONFIG_GRO_CELLS=y
 # CONFIG_HARDEN_BRANCH_HISTORY is not set
 # CONFIG_HARDEN_BRANCH_PREDICTOR is not set
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y