| Message ID | 20181020182624.9589-1-rosenp@gmail.com |
|---|---|
| State | Rejected |
| Delegated to: | Koen Vandeputte |
| Headers | show |
| Series | [OpenWrt-Devel] mvebu: Fix broken build as a result of last kernel bump | expand |
On 20.10.18 20:26, Rosen Penev wrote: > Moved the config option to the proper location. > > Signed-off-by: Rosen Penev <rosenp@gmail.com> > --- > target/linux/mvebu/config-4.14 | 1 + > target/linux/mvebu/cortexa9/config-default | 1 - > 2 files changed, 1 insertion(+), 1 deletion(-) > delete mode 100644 target/linux/mvebu/cortexa9/config-default > > diff --git a/target/linux/mvebu/config-4.14 b/target/linux/mvebu/config-4.14 > index 5d3fd350c2..9919003b0d 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/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 Compile-tested both generic and specifically for Turris Omnia No build issues seen ..
diff --git a/target/linux/mvebu/config-4.14 b/target/linux/mvebu/config-4.14 index 5d3fd350c2..9919003b0d 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/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
Moved the config option to the proper location. Signed-off-by: Rosen Penev <rosenp@gmail.com> --- target/linux/mvebu/config-4.14 | 1 + target/linux/mvebu/cortexa9/config-default | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 target/linux/mvebu/cortexa9/config-default