diff options
author | Andres Salomon <dilinger@queued.net> | 2008-04-29 03:59:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:07 -0400 |
commit | 3ef0e1f8cad0a851b3dbf91802b14af7dd780352 (patch) | |
tree | 805450fdb2c056e7ba61ac3c26529cccd09e952f /arch/x86/Kconfig | |
parent | 2f9b12a31fcb738ea8c9eb0d4ddf906c6f1d696c (diff) |
x86: olpc: add One Laptop Per Child architecture support
This adds support for OLPC XO hardware. Open Firmware on XOs don't contain
the VSA, so it is necessary to emulate the PCI BARs in the kernel. This also
adds functionality for running EC commands, and a CONFIG_OLPC.
A number of OLPC drivers depend upon CONFIG_OLPC.
olpc_ec_timeout is a hack to work around Embedded Controller bugs.
[akpm@linux-foundation.org: build fix]
[akpm@linux-foundation.org: geode_has_vsa build fix]
[akpm@linux-foundation.org: olpc_register_battery_callback doesn't exist]
Signed-off-by: Andres Salomon <dilinger@debian.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@suse.de>
Cc: Jordan Crouse <jordan.crouse@amd.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 1d9d874cba59..f70e3e3a9fa7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -1504,6 +1504,10 @@ config PCI_GODIRECT | |||
1504 | config PCI_GOANY | 1504 | config PCI_GOANY |
1505 | bool "Any" | 1505 | bool "Any" |
1506 | 1506 | ||
1507 | config PCI_GOOLPC | ||
1508 | bool "OLPC" | ||
1509 | depends on OLPC | ||
1510 | |||
1507 | endchoice | 1511 | endchoice |
1508 | 1512 | ||
1509 | config PCI_BIOS | 1513 | config PCI_BIOS |
@@ -1513,12 +1517,17 @@ config PCI_BIOS | |||
1513 | # x86-64 doesn't support PCI BIOS access from long mode so always go direct. | 1517 | # x86-64 doesn't support PCI BIOS access from long mode so always go direct. |
1514 | config PCI_DIRECT | 1518 | config PCI_DIRECT |
1515 | def_bool y | 1519 | def_bool y |
1516 | depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY) || X86_VISWS) | 1520 | depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY || PCI_GOOLPC) || X86_VISWS) |
1517 | 1521 | ||
1518 | config PCI_MMCONFIG | 1522 | config PCI_MMCONFIG |
1519 | def_bool y | 1523 | def_bool y |
1520 | depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) | 1524 | depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) |
1521 | 1525 | ||
1526 | config PCI_OLPC | ||
1527 | bool | ||
1528 | depends on PCI && PCI_GOOLPC | ||
1529 | default y | ||
1530 | |||
1522 | config PCI_DOMAINS | 1531 | config PCI_DOMAINS |
1523 | def_bool y | 1532 | def_bool y |
1524 | depends on PCI | 1533 | depends on PCI |
@@ -1638,6 +1647,13 @@ config GEODE_MFGPT_TIMER | |||
1638 | MFGPTs have a better resolution and max interval than the | 1647 | MFGPTs have a better resolution and max interval than the |
1639 | generic PIT, and are suitable for use as high-res timers. | 1648 | generic PIT, and are suitable for use as high-res timers. |
1640 | 1649 | ||
1650 | config OLPC | ||
1651 | bool "One Laptop Per Child support" | ||
1652 | default n | ||
1653 | help | ||
1654 | Add support for detecting the unique features of the OLPC | ||
1655 | XO hardware. | ||
1656 | |||
1641 | endif # X86_32 | 1657 | endif # X86_32 |
1642 | 1658 | ||
1643 | config K8_NB | 1659 | config K8_NB |