diff options
| author |   Daniel Drake <dsd@laptop.org> | 2010-09-23 17:28:46 +0100 |
|---|---|---|
| committer |   H. Peter Anvin <hpa@linux.intel.com> | 2010-09-23 11:15:00 -0700 |
| commit | 3e3c486012a3dbb113c0ca15ee265d309d77aea9 (patch) | |
| tree | 9b1a1e22ab7f7a9e7cd47778cc70e007375fcb11 /arch/x86/include/asm/olpc_ofw.h | |
| parent | x86, olpc: Only enable PCI configuration type override on XO-1 (diff) | |
| download | linux-dev-3e3c486012a3dbb113c0ca15ee265d309d77aea9.tar.xz linux-dev-3e3c486012a3dbb113c0ca15ee265d309d77aea9.zip | |
x86, olpc: Rework BIOS signature check
The XO-1.5 laptop is not currently detected as an OLPC machine because
it fails this XO-1-centric check.
Now that we have OLPC OFW support in the kernel, a more sensible
check is to see if we found OFW during boot and check the architecture
property.
Also remove a now-meaningless codepath, as we're always going to have
OFW support with OLPC.
Signed-off-by: Daniel Drake <dsd@laptop.org>
LKML-Reference: <20100923162846.D8D409D401B@zog.reactivated.net>
Cc: Andres Salomon <dilinger@queued.net>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/olpc_ofw.h')
| -rw-r--r-- | arch/x86/include/asm/olpc_ofw.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/include/asm/olpc_ofw.h b/arch/x86/include/asm/olpc_ofw.h index 08fde475cb3b..2a8478140bb3 100644 --- a/arch/x86/include/asm/olpc_ofw.h +++ b/arch/x86/include/asm/olpc_ofw.h @@ -21,10 +21,14 @@ extern void olpc_ofw_detect(void); /* install OFW's pde permanently into the kernel's pgtable */ extern void setup_olpc_ofw_pgd(void); +/* check if OFW was detected during boot */ +extern bool olpc_ofw_present(void); + #else /* !CONFIG_OLPC_OPENFIRMWARE */ static inline void olpc_ofw_detect(void) { } static inline void setup_olpc_ofw_pgd(void) { } +static inline bool olpc_ofw_present(void) { return false; } #endif /* !CONFIG_OLPC_OPENFIRMWARE */ |