git-svn-id: svn://localhost/svn/linux-kernel/trunk@7548 526b6c2d-f592-4532-a319-5dd88ccb003d
---
drivers/firmware/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index ebb9e51..7fff33f 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -7,7 +7,7 @@ menu "Firmware Drivers"
config EDD
tristate "BIOS Enhanced Disk Drive calls determine boot disk"
- depends on !IA64
+ depends on (X86_64 || X86_32)
help
Say Y or M here if you want to enable BIOS Enhanced Disk Drive
Services real mode BIOS calls to determine which disk
--
1.6.5.rc2
Rather than have the EDD depend on !ia64 (and assuming that only ia64,
x86, x86_64 will be including this Kconfig), have EDD depend on the only
arches which can support this code. This should allow all other arches
to cleanly include the firmware Kconfig.
Signed-off-by: Mike Frysinger <[email protected]>
---
v2
- send out the right file this time
drivers/firmware/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index ebb9e51..7fff33f 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -7,7 +7,7 @@ menu "Firmware Drivers"
config EDD
tristate "BIOS Enhanced Disk Drive calls determine boot disk"
- depends on !IA64
+ depends on (X86_64 || X86_32)
help
Say Y or M here if you want to enable BIOS Enhanced Disk Drive
Services real mode BIOS calls to determine which disk
--
1.6.5.rc2
At Tue, 6 Oct 2009 01:57:07 -0400,
Mike Frysinger wrote:
>
> Rather than have the EDD depend on !ia64 (and assuming that only ia64,
> x86, x86_64 will be including this Kconfig), have EDD depend on the only
> arches which can support this code. This should allow all other arches
> to cleanly include the firmware Kconfig.
>
> Signed-off-by: Mike Frysinger <[email protected]>
> ---
> v2
> - send out the right file this time
>
> drivers/firmware/Kconfig | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
> index ebb9e51..7fff33f 100644
> --- a/drivers/firmware/Kconfig
> +++ b/drivers/firmware/Kconfig
> @@ -7,7 +7,7 @@ menu "Firmware Drivers"
>
> config EDD
> tristate "BIOS Enhanced Disk Drive calls determine boot disk"
> - depends on !IA64
> + depends on (X86_64 || X86_32)
How about "depends on X86" ?
Takashi
On Tue, Oct 6, 2009 at 03:07, Takashi Iwai wrote:
> At Tue, 6 Oct 2009 01:57:07 -0400,
>> Rather than have the EDD depend on !ia64 (and assuming that only ia64,
>> x86, x86_64 will be including this Kconfig), have EDD depend on the only
>> arches which can support this code. This should allow all other arches
>> to cleanly include the firmware Kconfig.
>>
>> Signed-off-by: Mike Frysinger <[email protected]>
>> ---
>> v2
>> - send out the right file this time
>>
>> drivers/firmware/Kconfig | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
>> index ebb9e51..7fff33f 100644
>> --- a/drivers/firmware/Kconfig
>> +++ b/drivers/firmware/Kconfig
>> @@ -7,7 +7,7 @@ menu "Firmware Drivers"
>>
>> config EDD
>> tristate "BIOS Enhanced Disk Drive calls determine boot disk"
>> - depends on !IA64
>> + depends on (X86_64 || X86_32)
>
> How about "depends on X86" ?
i merely copied the string as seen in FIRMWARE_MEMMAP ... i assumed
that was the way to go. if simply using x86 works, then i can change
it to that.
-mike
Rather than have the EDD depend on !ia64 (and assuming that only ia64,
x86, x86_64 will be including this Kconfig), have EDD depend on the only
arches which can support this code. This should allow all other arches
to cleanly include the firmware Kconfig.
Also simplify the x86 string used by FIRMWARE_MEMMAP to match EDD.
Signed-off-by: Mike Frysinger <[email protected]>
---
v3
- use simpler x86 string pointed out by Takashi
drivers/firmware/Kconfig | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index ebb9e51..1b03ba1 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -7,7 +7,7 @@ menu "Firmware Drivers"
config EDD
tristate "BIOS Enhanced Disk Drive calls determine boot disk"
- depends on !IA64
+ depends on X86
help
Say Y or M here if you want to enable BIOS Enhanced Disk Drive
Services real mode BIOS calls to determine which disk
@@ -28,7 +28,7 @@ config EDD_OFF
config FIRMWARE_MEMMAP
bool "Add firmware-provided memory map to sysfs" if EMBEDDED
- default (X86_64 || X86_32)
+ default X86
help
Add the firmware-provided (unmodified) memory map to /sys/firmware/memmap.
That memory map is used for example by kexec to set up parameter area
--
1.6.5.rc2
On Tue, Oct 06, 2009 at 03:40:18AM -0400, Mike Frysinger wrote:
> Rather than have the EDD depend on !ia64 (and assuming that only ia64,
> x86, x86_64 will be including this Kconfig), have EDD depend on the only
> arches which can support this code. This should allow all other arches
> to cleanly include the firmware Kconfig.
>
> Also simplify the x86 string used by FIRMWARE_MEMMAP to match EDD.
>
> Signed-off-by: Mike Frysinger <[email protected]>
Acked-by: Matt Domsch <[email protected]>
--
Matt Domsch
Technology Strategist, Dell Office of the CTO
linux.dell.com & http://www.dell.com/linux
On Tue, Oct 6, 2009 at 13:44, Matt Domsch wrote:
> On Tue, Oct 06, 2009 at 03:40:18AM -0400, Mike Frysinger wrote:
>> Rather than have the EDD depend on !ia64 (and assuming that only ia64,
>> x86, x86_64 will be including this Kconfig), have EDD depend on the only
>> arches which can support this code. This should allow all other arches
>> to cleanly include the firmware Kconfig.
>>
>> Also simplify the x86 string used by FIRMWARE_MEMMAP to match EDD.
>>
>> Signed-off-by: Mike Frysinger <[email protected]>
>
> Acked-by: Matt Domsch <[email protected]>
guessing you meant @dell.com :)
-mike