Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753014AbcKRJHg (ORCPT ); Fri, 18 Nov 2016 04:07:36 -0500 Received: from terminus.zytor.com ([198.137.202.10]:51056 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752288AbcKRJHc (ORCPT ); Fri, 18 Nov 2016 04:07:32 -0500 Date: Fri, 18 Nov 2016 01:05:25 -0800 From: tip-bot for Lukas Wunner Message-ID: Cc: andreas.noever@gmail.com, tglx@linutronix.de, peterz@infradead.org, arnd@arndb.de, torvalds@linux-foundation.org, ard.biesheuvel@linaro.org, mingo@kernel.org, matt@codeblueprint.co.uk, hpa@zytor.com, linux-kernel@vger.kernel.org, lukas@wunner.de Reply-To: mingo@kernel.org, torvalds@linux-foundation.org, ard.biesheuvel@linaro.org, arnd@arndb.de, matt@codeblueprint.co.uk, hpa@zytor.com, lukas@wunner.de, linux-kernel@vger.kernel.org, tglx@linutronix.de, andreas.noever@gmail.com, peterz@infradead.org In-Reply-To: <5c241cf92eb1dc2421218c1204c6a9d22c9f847b.1479456179.git.lukas@wunner.de> References: <5c241cf92eb1dc2421218c1204c6a9d22c9f847b.1479456179.git.lukas@wunner.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] thunderbolt, efi: Fix Kconfig dependencies harder Git-Commit-ID: 5fbc89d37bb312c700dfa8121b02241a92b5df13 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2487 Lines: 59 Commit-ID: 5fbc89d37bb312c700dfa8121b02241a92b5df13 Gitweb: http://git.kernel.org/tip/5fbc89d37bb312c700dfa8121b02241a92b5df13 Author: Lukas Wunner AuthorDate: Fri, 18 Nov 2016 09:22:59 +0100 Committer: Ingo Molnar CommitDate: Fri, 18 Nov 2016 09:42:53 +0100 thunderbolt, efi: Fix Kconfig dependencies harder Since commit c9cc3aaa0281 ("thunderbolt: Use Device ROM retrieved from EFI"), the THUNDERBOLT config option selects APPLE_PROPERTIES. This broke the build for certain configs because APPLE_PROPERTIES is located in a menu which depends on EFI: If EFI is not enabled, the prerequisites needed for APPLE_PROPERTIES are not selected: Those are EFI_DEV_PATH_PARSER and UCS2_STRING. Additionally EFI_DEV_PATH_PARSER won't compile unless ACPI is enabled. Commit 79f9cd35b05e ("thunderbolt, efi: Fix Kconfig dependencies") sought to fix the breakage by making THUNDERBOLT select APPLE_PROPERTIES only if EFI_STUB is enabled. On x86, EFI_STUB depends on EFI and EFI depends on ACPI, so this fixed the build at least on this architecture. However on arm and arm64, EFI_STUB does not depend on EFI, so once again the prerequisites needed for APPLE_PROPERTIES are not selected. Additionally ACPI is not available on arm and optional on arm64, therefore EFI_DEV_PATH_PARSER won't compile. Fix by selecting APPLE_PROPERTIES only on x86. Suggested-by: Arnd Bergmann Signed-off-by: Lukas Wunner Acked-by: Arnd Bergmann Cc: Andreas Noever Cc: Ard Biesheuvel Cc: Linus Torvalds Cc: Matt Fleming Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/5c241cf92eb1dc2421218c1204c6a9d22c9f847b.1479456179.git.lukas@wunner.de Signed-off-by: Ingo Molnar --- drivers/thunderbolt/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/thunderbolt/Kconfig b/drivers/thunderbolt/Kconfig index bb0318c..de5d27e 100644 --- a/drivers/thunderbolt/Kconfig +++ b/drivers/thunderbolt/Kconfig @@ -1,7 +1,7 @@ menuconfig THUNDERBOLT tristate "Thunderbolt support for Apple devices" depends on PCI - select APPLE_PROPERTIES if EFI_STUB + select APPLE_PROPERTIES if EFI_STUB && X86 select CRC32 help Cactus Ridge Thunderbolt Controller driver