aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorTomasz Maciej Nowak <tomek_n@o2.pl>2019-01-13 21:29:22 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2019-01-27 00:16:14 +0100
commit9f6c4ba25c11fd5afecd36e9a02bb007d9397c5a (patch)
tree5acefe7fcf9f5f2f10fe0119879fd1f4aaa52d05 /target/linux
parentfd5c16870169bb76dd3d3bcfbcc6a112f74aeefe (diff)
downloadupstream-9f6c4ba25c11fd5afecd36e9a02bb007d9397c5a.tar.gz
upstream-9f6c4ba25c11fd5afecd36e9a02bb007d9397c5a.tar.bz2
upstream-9f6c4ba25c11fd5afecd36e9a02bb007d9397c5a.zip
mvebu: move HARDEN_BRANCH_PREDICTOR to common config
This symbol is enabled in all subtargets, move it to common kernel config. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl> Acked-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/mvebu/config-4.141
-rw-r--r--target/linux/mvebu/cortexa53/config-default1
-rw-r--r--target/linux/mvebu/cortexa72/config-default1
-rw-r--r--target/linux/mvebu/cortexa9/config-default1
4 files changed, 1 insertions, 3 deletions
diff --git a/target/linux/mvebu/config-4.14 b/target/linux/mvebu/config-4.14
index 296da5a109..cb26a927f9 100644
--- a/target/linux/mvebu/config-4.14
+++ b/target/linux/mvebu/config-4.14
@@ -212,6 +212,7 @@ CONFIG_GPIO_PCA953X_IRQ=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/mvebu/cortexa53/config-default b/target/linux/mvebu/cortexa53/config-default
index b631c30f5f..c5fcc0f3f8 100644
--- a/target/linux/mvebu/cortexa53/config-default
+++ b/target/linux/mvebu/cortexa53/config-default
@@ -65,7 +65,6 @@ CONFIG_GENERIC_CSUM=y
CONFIG_GENERIC_IRQ_MIGRATION=y
CONFIG_GENERIC_PINCONF=y
CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
CONFIG_HAVE_ARCH_HUGE_VMAP=y
CONFIG_HAVE_ARCH_KASAN=y
diff --git a/target/linux/mvebu/cortexa72/config-default b/target/linux/mvebu/cortexa72/config-default
index 50b8d21c32..b855aa21d1 100644
--- a/target/linux/mvebu/cortexa72/config-default
+++ b/target/linux/mvebu/cortexa72/config-default
@@ -63,7 +63,6 @@ CONFIG_GENERIC_CSUM=y
CONFIG_GENERIC_IRQ_MIGRATION=y
CONFIG_GENERIC_PINCONF=y
CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
CONFIG_HAVE_ARCH_HUGE_VMAP=y
CONFIG_HAVE_ARCH_KASAN=y
diff --git a/target/linux/mvebu/cortexa9/config-default b/target/linux/mvebu/cortexa9/config-default
deleted file mode 100644
index c9f039ba96..0000000000
--- a/target/linux/mvebu/cortexa9/config-default
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HARDEN_BRANCH_PREDICTOR=y