upgrade to linux 2.6.9-1.11_FC2

[linux-2.6.git] / drivers / firmware / Kconfig

diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 597bf5f..4607ddd 100644 (file)
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -14,8 +14,9 @@ config EDD
          Services real mode BIOS calls to determine which disk
          BIOS tries boot from.  This information is then exported via sysfs.
 
-         This option is experimental, but believed to be safe,
-         and most disk controller BIOS vendors do not yet implement this feature.
+         This option is experimental and is known to fail to boot on some
+          obscure configurations. Most disk controller BIOS vendors do
+          not yet implement this feature.
 
 config EFI_VARS
        tristate "EFI Variable Support via sysfs"
@@ -34,4 +35,23 @@ config EFI_VARS
          Subsequent efibootmgr releases may be found at:
          http://linux.dell.com/efibootmgr
 
+config EFI_PCDP
+       bool "Console device selection via EFI PCDP or HCDP table"
+       depends on ACPI && EFI && IA64
+       default y if IA64
+       help
+         If your firmware supplies the PCDP table, and you want to
+         automatically use the primary console device it describes
+         as the Linux console, say Y here.
+
+         If your firmware supplies the HCDP table, and you want to
+         use the first serial port it describes as the Linux console,
+         say Y here.  If your EFI ConOut path contains only a UART
+         device, it will become the console automatically.  Otherwise,
+         you must specify the "console=ttyS0" kernel boot argument.
+
+         You must also enable the appropriate drivers (serial, VGA, etc.)
+
+         See <http://www.dig64.org/specifications/DIG64_HCDPv20_042804.pdf>
+
 endmenu