From patchwork Fri Apr 28 19:51:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9705279 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 28BBB603F7 for ; Fri, 28 Apr 2017 19:51:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B2E6268AE for ; Fri, 28 Apr 2017 19:51:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0FA1C28698; Fri, 28 Apr 2017 19:51:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F8AD28668 for ; Fri, 28 Apr 2017 19:51:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423354AbdD1TvY (ORCPT ); Fri, 28 Apr 2017 15:51:24 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:52756 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1035424AbdD1TvX (ORCPT ); Fri, 28 Apr 2017 15:51:23 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MNtut-1d9wPh1DnH-007Rsh; Fri, 28 Apr 2017 21:51:14 +0200 From: Arnd Bergmann To: Bartlomiej Zolnierkiewicz Cc: linux-parisc@vger.kernel.org, Helge Deller , jejb@parisc-linux.org, Alexander Beregalov , Arnd Bergmann , linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] fbdev: sti: don't select CONFIG_VT Date: Fri, 28 Apr 2017 21:51:25 +0200 Message-Id: <20170428195151.57706-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:a3XF0+tIIgBJOOUDbCDNRi+JsjuibzrJNaF4ZObw5PCLfwW1iTf WKgVZ+AuvIqr66piL6g4hj2N18OAzu7kg3zW+jGjWxT+hQt/9EgIZBxpIKhLW9nRCtRHqps BQ/mXU20kC4HJduUrBrQjmXKe1i0lcetFF9TqqJKvvaLhb9wsIpmmTApOuF9tSwutk9bF69 gJvPSp9z0jC3KUCPjY94g== X-UI-Out-Filterresults: notjunk:1; V01:K0:Ut6NlqyT64U=:bGlX09XXSarg5R2odTS8w0 qQfmewBEj9CtlXouHPY8F70DO44/DfLj4xff4UTyrYINa3uceiOK9kyAm8W5JtHP+PlyalQ2f n01rkw7c9fsFB0pQuJ0+pCV54wjj/QqSSyJYStgwnRkMIR8+hrXnUVw3X2kxHA5xq7P0RBTdV mwQYCIAxp2HJeiiZb2PhvKbYRXuX17N20JardCL32ynKzVUbFGB/59tRW1WkY5nvCY1i02NNH tOUI6N4KP84SguXFc3UTuq+AheYjYtf3YLtj9Vcsy+0cvnjHhkFDCDpTOaS7h3oFwXbcZmHhl 1d5eGRpABwEYrxzJK3rN18N1PLTMXpc+8gRZhzKh0NXTgnfQ49a1HBbHz9NYTz+RMor9g6oy7 wR7fYB/yBUKv9NA3buXAuqRgnalJng7N7YY4Px75tPRch0uzC076aEZGWrUhQoooUKAO3LsgH 0Zxe9/hXpDhBsFxmB/DrP4hgWtZ8KDwFlfcQ5LjGj1seJiqqVnFqAcIrLJCdh+hFFYt1wAI3a Q8c05h1PVo2FRtwwG//pO2+hZSDsY+EOF40tkvF3I7Dg4V/mMCsznEpipDKumgVNi0SRQVFAH lkelX/h2CNvyS/JhUcfFq0Q5JrTb502LWSze1jmp/36yvuST+txg1k2NYsRV2TaX1pkKmpDSo a6F0pk/r1V5K6ri+ulc2myoNFN2N/D58Lt/eMpzvIJkYfYCt4TrakX+ZHCZUCHDbM+gc= Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP While working on another build error, I ran into several variations of this dependency loop: subsection "Kconfig recursive dependency limitations" drivers/input/Kconfig:8: symbol INPUT is selected by VT For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/tty/Kconfig:12: symbol VT is selected by FB_STI For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/video/fbdev/Kconfig:677: symbol FB_STI depends on FB For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/video/fbdev/Kconfig:5: symbol FB is selected by DRM_KMS_FB_HELPER For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/gpu/drm/Kconfig:72: symbol DRM_KMS_FB_HELPER is selected by DRM_KMS_CMA_HELPER For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/gpu/drm/Kconfig:137: symbol DRM_KMS_CMA_HELPER is selected by DRM_HDLCD For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/gpu/drm/arm/Kconfig:6: symbol DRM_HDLCD depends on OF For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/of/Kconfig:4: symbol OF is selected by X86_INTEL_CE For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" arch/x86/Kconfig:523: symbol X86_INTEL_CE depends on X86_IO_APIC For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" arch/x86/Kconfig:1011: symbol X86_IO_APIC depends on X86_LOCAL_APIC For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" arch/x86/Kconfig:1005: symbol X86_LOCAL_APIC depends on X86_UP_APIC For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" arch/x86/Kconfig:980: symbol X86_UP_APIC depends on PCI_MSI For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/pci/Kconfig:11: symbol PCI_MSI is selected by AMD_IOMMU For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/iommu/Kconfig:106: symbol AMD_IOMMU depends on IOMMU_SUPPORT For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/iommu/Kconfig:5: symbol IOMMU_SUPPORT is selected by DRM_ETNAVIV For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/gpu/drm/etnaviv/Kconfig:2: symbol DRM_ETNAVIV depends on THERMAL For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/thermal/Kconfig:5: symbol THERMAL is selected by ACPI_VIDEO For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/acpi/Kconfig:183: symbol ACPI_VIDEO is selected by INPUT This doesn't currently show up as I fixed the 'THERMAL' part of it, but I noticed that the FB_STI dependency should not be there but was introduced by slightly incorrect bug-fix patch that tried to fix a link error. Instead of selecting 'VT' to make us enter the drivers/video/console directory at compile-time, it's sufficient to build the drivers/video/console/sticore.c file by adding its directory to when CONFIG_FB_STI is enabled. Alternatively, we could move the sticore code to another directory that is always built when we have at STI_CONSOLE or FB_STI enabled. Fixes: 17085a934592 ("parisc: stifb: should depend on STI_CONSOLE") Signed-off-by: Arnd Bergmann --- drivers/video/Makefile | 1 + drivers/video/fbdev/Kconfig | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 9ad3c17d6456..445b2c230b56 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -2,6 +2,7 @@ obj-$(CONFIG_VGASTATE) += vgastate.o obj-$(CONFIG_HDMI) += hdmi.o obj-$(CONFIG_VT) += console/ +obj-$(CONFIG_FB_STI) += console/ obj-$(CONFIG_LOGO) += logo/ obj-y += backlight/ diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 4e36e14d878f..a5797a697114 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -680,8 +680,6 @@ config FB_STI select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - select STI_CONSOLE - select VT default y ---help--- STI refers to the HP "Standard Text Interface" which is a set of