From 6611c24419bf63d0f3dc1f760c5451d8105cf466 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 9 Oct 2017 14:13:08 +0100 Subject: [PATCH] disable SNI NIC driver for the moment, ftb on 4.14 --- baseconfig/arm/arm64/CONFIG_SNI_NETSEC | 2 +- kernel-aarch64-debug.config | 2 +- kernel-aarch64.config | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/baseconfig/arm/arm64/CONFIG_SNI_NETSEC b/baseconfig/arm/arm64/CONFIG_SNI_NETSEC index c348519ff..f9c8aea38 100644 --- a/baseconfig/arm/arm64/CONFIG_SNI_NETSEC +++ b/baseconfig/arm/arm64/CONFIG_SNI_NETSEC @@ -1 +1 @@ -CONFIG_SNI_NETSEC=m +# CONFIG_SNI_NETSEC is not set diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index ad0eaf138..f4219bf3c 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -4304,6 +4304,7 @@ CONFIG_RADIO_ZOLTRIX=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOMIZE_BASE is not set +CONFIG_RANDOMIZE_MODULE_REGION_FULL=y CONFIG_RAS_CEC=y CONFIG_RASPBERRYPI_FIRMWARE=y CONFIG_RASPBERRYPI_POWER=y @@ -5387,7 +5388,6 @@ CONFIG_SND_VIRMIDI=m CONFIG_SND_VIRTUOSO=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m -CONFIG_SNI_NETSEC=m # CONFIG_SOC_BRCMSTB is not set # CONFIG_SOC_CAMERA is not set CONFIG_SOCIONEXT_SYNQUACER_PREITS=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 18ecfca1b..27db50b0c 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -4282,6 +4282,7 @@ CONFIG_RADIO_ZOLTRIX=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOMIZE_BASE is not set +CONFIG_RANDOMIZE_MODULE_REGION_FULL=y CONFIG_RAS_CEC=y CONFIG_RASPBERRYPI_FIRMWARE=y CONFIG_RASPBERRYPI_POWER=y @@ -5364,7 +5365,6 @@ CONFIG_SND_VIRMIDI=m CONFIG_SND_VIRTUOSO=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m -CONFIG_SNI_NETSEC=m # CONFIG_SOC_BRCMSTB is not set # CONFIG_SOC_CAMERA is not set CONFIG_SOCIONEXT_SYNQUACER_PREITS=y