From bf5b588422a50d970ea8660d368cc6cdd2c377c9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 28 Jun 2020 20:00:58 +0100 Subject: disable SERIAL_SC16IS7XX_I2C, with both SPI and I2C enabled they conflict and we end up with neither --- configs/fedora/generic/CONFIG_SERIAL_SC16IS7XX_I2C | 2 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-armv7hl-debug-fedora.config | 2 +- kernel-armv7hl-fedora.config | 2 +- kernel-armv7hl-lpae-debug-fedora.config | 2 +- kernel-armv7hl-lpae-fedora.config | 2 +- kernel-i686-debug-fedora.config | 2 +- kernel-i686-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configs/fedora/generic/CONFIG_SERIAL_SC16IS7XX_I2C b/configs/fedora/generic/CONFIG_SERIAL_SC16IS7XX_I2C index 725798c75..80373470c 100644 --- a/configs/fedora/generic/CONFIG_SERIAL_SC16IS7XX_I2C +++ b/configs/fedora/generic/CONFIG_SERIAL_SC16IS7XX_I2C @@ -1 +1 @@ -CONFIG_SERIAL_SC16IS7XX_I2C=y +# CONFIG_SERIAL_SC16IS7XX_I2C is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 9e5823e1f..864d2584c 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -5849,7 +5849,7 @@ CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_QCOM_GENI_CONSOLE=y CONFIG_SERIAL_QCOM_GENI=y # CONFIG_SERIAL_RP2 is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +# CONFIG_SERIAL_SC16IS7XX_I2C is not set CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_SPI=y # CONFIG_SERIAL_SCCNXP is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index d30da95dc..3b8207cce 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -5828,7 +5828,7 @@ CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_QCOM_GENI_CONSOLE=y CONFIG_SERIAL_QCOM_GENI=y # CONFIG_SERIAL_RP2 is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +# CONFIG_SERIAL_SC16IS7XX_I2C is not set CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_SPI=y # CONFIG_SERIAL_SCCNXP is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index f207ab4f2..bfb6b2fb5 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -5967,7 +5967,7 @@ CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_SERIAL_RP2 is not set CONFIG_SERIAL_SAMSUNG_CONSOLE=y CONFIG_SERIAL_SAMSUNG=y -CONFIG_SERIAL_SC16IS7XX_I2C=y +# CONFIG_SERIAL_SC16IS7XX_I2C is not set CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_SPI=y # CONFIG_SERIAL_SCCNXP is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 7567d9e45..aad6dce32 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -5947,7 +5947,7 @@ CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_SERIAL_RP2 is not set CONFIG_SERIAL_SAMSUNG_CONSOLE=y CONFIG_SERIAL_SAMSUNG=y -CONFIG_SERIAL_SC16IS7XX_I2C=y +# CONFIG_SERIAL_SC16IS7XX_I2C is not set CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_SPI=y # CONFIG_SERIAL_SCCNXP is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 3e87b762a..05778dcc2 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -5778,7 +5778,7 @@ CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_SERIAL_RP2 is not set CONFIG_SERIAL_SAMSUNG_CONSOLE=y CONFIG_SERIAL_SAMSUNG=y -CONFIG_SERIAL_SC16IS7XX_I2C=y +# CONFIG_SERIAL_SC16IS7XX_I2C is not set CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_SPI=y # CONFIG_SERIAL_SCCNXP is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 56ea67f69..f485c88d6 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -5758,7 +5758,7 @@ CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_SERIAL_RP2 is not set CONFIG_SERIAL_SAMSUNG_CONSOLE=y CONFIG_SERIAL_SAMSUNG=y -CONFIG_SERIAL_SC16IS7XX_I2C=y +# CONFIG_SERIAL_SC16IS7XX_I2C is not set CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_SPI=y # CONFIG_SERIAL_SCCNXP is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index c9b98219f..947abfce0 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -5250,7 +5250,7 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_SERIAL_OF_PLATFORM=m # CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_RP2 is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +# CONFIG_SERIAL_SC16IS7XX_I2C is not set CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_SPI=y # CONFIG_SERIAL_SCCNXP is not set diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 3027b0df2..14d2577e0 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -5230,7 +5230,7 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_SERIAL_OF_PLATFORM=m # CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_RP2 is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +# CONFIG_SERIAL_SC16IS7XX_I2C is not set CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_SPI=y # CONFIG_SERIAL_SCCNXP is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 937b8fdc9..e142cc157 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4924,7 +4924,7 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_SERIAL_OF_PLATFORM=m # CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_RP2 is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +# CONFIG_SERIAL_SC16IS7XX_I2C is not set CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_SPI=y # CONFIG_SERIAL_SCCNXP is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 8276891e4..ecf65b16c 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -4902,7 +4902,7 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_SERIAL_OF_PLATFORM=m # CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_RP2 is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +# CONFIG_SERIAL_SC16IS7XX_I2C is not set CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_SPI=y # CONFIG_SERIAL_SCCNXP is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index c2cbdaf80..8001ff78d 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4864,7 +4864,7 @@ CONFIG_SERIAL_JSM=m # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_RP2 is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +# CONFIG_SERIAL_SC16IS7XX_I2C is not set CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_SPI=y # CONFIG_SERIAL_SCCNXP is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 0449fd184..5a4d45ade 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4842,7 +4842,7 @@ CONFIG_SERIAL_JSM=m # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_RP2 is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +# CONFIG_SERIAL_SC16IS7XX_I2C is not set CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_SPI=y # CONFIG_SERIAL_SCCNXP is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 5612c8214..b5736de7c 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5294,7 +5294,7 @@ CONFIG_SERIAL_JSM=m CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_RP2 is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +# CONFIG_SERIAL_SC16IS7XX_I2C is not set CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_SPI=y # CONFIG_SERIAL_SCCNXP is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index fd0e1febe..a9017635c 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5274,7 +5274,7 @@ CONFIG_SERIAL_JSM=m CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_RP2 is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +# CONFIG_SERIAL_SC16IS7XX_I2C is not set CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_SPI=y # CONFIG_SERIAL_SCCNXP is not set -- cgit