diff mbox

firmware/google: drop 'select EFI' to avoid recursive dependency

Message ID 1390473588-23367-1-git-send-email-ard.biesheuvel@linaro.org
State Accepted
Commit c2218e26c0d03c368fff825a6f15b7bb3418dbde
Headers show

Commit Message

Ard Biesheuvel Jan. 23, 2014, 10:39 a.m. UTC
The GOOGLE_SMI Kconfig symbol depends on DMI and selects EFI. This
causes problems on other archs when introducing DMI support that
depends on EFI, as it results in a recursive dependency:

arch/arm/Kconfig:1845:error: recursive dependency detected!
arch/arm/Kconfig:1845:	symbol DMI depends on EFI

Fix by changing the 'select EFI' to a 'depends on EFI'.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 drivers/firmware/google/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Ard Biesheuvel Jan. 23, 2014, 9:48 p.m. UTC | #1
On 23 January 2014 22:40, Mike Waychison <mikew@google.com> wrote:
> On Thu, Jan 23, 2014 at 1:36 PM, David Rientjes <rientjes@google.com> wrote:
>> On Thu, 23 Jan 2014, Ard Biesheuvel wrote:
>>
>>> The GOOGLE_SMI Kconfig symbol depends on DMI and selects EFI. This
>>> causes problems on other archs when introducing DMI support that
>>> depends on EFI, as it results in a recursive dependency:
>>>
>>> arch/arm/Kconfig:1845:error: recursive dependency detected!
>>> arch/arm/Kconfig:1845:        symbol DMI depends on EFI
>>>
>>> Fix by changing the 'select EFI' to a 'depends on EFI'.
>>>
>>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>
> Acked-by: Mike Waychison <mikew@google.com>
>

Thanks.

Indeed, get_maintainer.pl did not produce a name, or I would have
cc'ed you directly.

Regards,
Ard.



>>> ---
>>>  drivers/firmware/google/Kconfig | 3 +--
>>>  1 file changed, 1 insertion(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/firmware/google/Kconfig b/drivers/firmware/google/Kconfig
>>> index 2f21b0bfe653..29c8cdda82a1 100644
>>> --- a/drivers/firmware/google/Kconfig
>>> +++ b/drivers/firmware/google/Kconfig
>>> @@ -12,8 +12,7 @@ menu "Google Firmware Drivers"
>>>
>>>  config GOOGLE_SMI
>>>       tristate "SMI interface for Google platforms"
>>> -     depends on ACPI && DMI
>>> -     select EFI
>>> +     depends on ACPI && DMI && EFI
>>>       select EFI_VARS
>>>       help
>>>         Say Y here if you want to enable SMI callbacks for Google
>>
>> Adding Mike Waychison <mikew@google.com> to the cc since this is his code,
>> but it looks good to me.
>>
>> $ ./scripts/get_maintainer.pl -f drivers/firmware/google/Kconfig
>> linux-kernel@vger.kernel.org (open list)
>>
>> I wonder why he's not listed as a recipient for patches from
>> get_maintainer.pl since it's clearly obvious he wrote the entire file.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
diff mbox

Patch

diff --git a/drivers/firmware/google/Kconfig b/drivers/firmware/google/Kconfig
index 2f21b0bfe653..29c8cdda82a1 100644
--- a/drivers/firmware/google/Kconfig
+++ b/drivers/firmware/google/Kconfig
@@ -12,8 +12,7 @@  menu "Google Firmware Drivers"
 
 config GOOGLE_SMI
 	tristate "SMI interface for Google platforms"
-	depends on ACPI && DMI
-	select EFI
+	depends on ACPI && DMI && EFI
 	select EFI_VARS
 	help
 	  Say Y here if you want to enable SMI callbacks for Google