From 7c800e431f5c61d4f8a283dc3840e6ebba9caf4b Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Mon, 30 Jul 2018 11:48:33 -0700 Subject: [PATCH] Disable framebuffer takeover on s390 again due to more build failures --- .../generic/s390x/CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER | 1 + kernel-s390x-debug.config | 2 +- kernel-s390x.config | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 configs/fedora/generic/s390x/CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER diff --git a/configs/fedora/generic/s390x/CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER b/configs/fedora/generic/s390x/CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER new file mode 100644 index 000000000..91eda6cd3 --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER @@ -0,0 +1 @@ +# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index a21ad960c..124a86dfd 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1517,7 +1517,7 @@ CONFIG_FPGA_MGR_MACHXO2_SPI=m CONFIG_FPGA_MGR_XILINX_SPI=m CONFIG_FPGA_MGR_ZYNQ_FPGA=m CONFIG_FPGA_REGION=m -CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y +# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FRAMEBUFFER_CONSOLE=y diff --git a/kernel-s390x.config b/kernel-s390x.config index b3e8f2b55..98406e3c9 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1496,7 +1496,7 @@ CONFIG_FPGA_MGR_MACHXO2_SPI=m CONFIG_FPGA_MGR_XILINX_SPI=m CONFIG_FPGA_MGR_ZYNQ_FPGA=m CONFIG_FPGA_REGION=m -CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y +# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FRAMEBUFFER_CONSOLE=y