aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2010-11-17 01:09:52 -0500
committerH. Peter Anvin <hpa@linux.intel.com>2010-12-15 20:11:30 -0500
commitc10d1e260f7cb6766dc76b4e36ed8f4be53f195a (patch)
treebcbeb1e08d65cd24a4c471d0fe8345ada28a076e /arch/x86/Kconfig
parent4722d194e648fb5755faecee895b96b26f9732f3 (diff)
x86, olpc: Add OLPC device-tree support
Make use of PROC_DEVICETREE to export the tree, and sparc's PROMTREE code to call into OLPC's Open Firmware to build the tree. v5: fix buglet with root node check (introduced in v4) v4: address some minor style issues pointed out by Grant, and explicitly cast negative phandle checks to s32. v3: rename olpc_prom to olpc_dt - rework Kconfig entries - drop devtree build hook from proc, instead adding a call to x86's paging_init (similarly to how sparc64 does it) - switch allocation from using slab to alloc_bootmem. this allows the DT to be built earlier during boot (during setup_arch); the downside is that there are some 1200 bootmem reservations that are done during boot. Not ideal.. - add a helper olpc_ofw_is_installed function to test for the existence and successful detection of OLPC's OFW. Signed-off-by: Andres Salomon <dilinger@queued.net> LKML-Reference: <20101116220952.26526a80@queued.net> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e330da21b84f..ef34031a8339 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2049,11 +2049,17 @@ config OLPC_OPENFIRMWARE
2049 bool "Support for OLPC's Open Firmware" 2049 bool "Support for OLPC's Open Firmware"
2050 depends on !X86_64 && !X86_PAE 2050 depends on !X86_64 && !X86_PAE
2051 default n 2051 default n
2052 select OF
2052 help 2053 help
2053 This option adds support for the implementation of Open Firmware 2054 This option adds support for the implementation of Open Firmware
2054 that is used on the OLPC XO-1 Children's Machine. 2055 that is used on the OLPC XO-1 Children's Machine.
2055 If unsure, say N here. 2056 If unsure, say N here.
2056 2057
2058config OLPC_OPENFIRMWARE_DT
2059 bool
2060 default y if OLPC_OPENFIRMWARE && PROC_DEVICETREE
2061 select OF_PROMTREE
2062
2057endif # X86_32 2063endif # X86_32
2058 2064
2059config AMD_NB 2065config AMD_NB