iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: OLPC: Cleanup config maze completely

Browse Source 
Neither CONFIG_OLPC_OPENFIRMWARE nor CONFIG_OLPC_OPENFIRMWARE_DT are
really necessary.

OLPC selects OLPC_OPENFIRMWARE unconditionally, so move the "select
OF" part under OLPC config option and fixup the dependencies in
Makefiles and code.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Andres Salomon <dilinger@queued.net>
This commit is contained in:
Thomas Gleixner 2011-02-23 10:08:31 +01:00
parent fe239545a1
commit dc3119e700
4 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/Kconfig
View File

@ -2066,9 +2066,10 @@ config SCx200HR_TIMER
config OLPC config OLPC
bool "One Laptop Per Child support" bool "One Laptop Per Child support"
select GPIOLIB
select OLPC_OPENFIRMWARE
depends on !X86_PAE depends on !X86_PAE
select GPIOLIB
select OF
select OLPC_OPENFIRMWARE_DT if PROC_DEVICETREE
---help--- ---help---
Add support for detecting the unique features of the OLPC Add support for detecting the unique features of the OLPC
XO hardware. XO hardware.
@ -2079,11 +2080,6 @@ config OLPC_XO1
---help--- ---help---
Add support for non-essential features of the OLPC XO-1 laptop. Add support for non-essential features of the OLPC XO-1 laptop.
config OLPC_OPENFIRMWARE
bool
select OF
select OLPC_OPENFIRMWARE_DT if PROC_DEVICETREE
config OLPC_OPENFIRMWARE_DT config OLPC_OPENFIRMWARE_DT
bool bool
select OF_PROMTREE select OF_PROMTREE

11
arch/x86/include/asm/olpc_ofw.h
View File

@ -6,8 +6,6 @@
#define OLPC_OFW_SIG 0x2057464F /* aka "OFW " */ #define OLPC_OFW_SIG 0x2057464F /* aka "OFW " */
#ifdef CONFIG_OLPC_OPENFIRMWARE
extern bool olpc_ofw_is_installed(void); extern bool olpc_ofw_is_installed(void);
/* run an OFW command by calling into the firmware */ /* run an OFW command by calling into the firmware */
@ -26,15 +24,6 @@ extern void setup_olpc_ofw_pgd(void);
/* check if OFW was detected during boot */ /* check if OFW was detected during boot */
extern bool olpc_ofw_present(void); extern bool olpc_ofw_present(void);
#else /* !CONFIG_OLPC_OPENFIRMWARE */
static inline bool olpc_ofw_is_installed(void) { return false; }
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 */
#ifdef CONFIG_OLPC_OPENFIRMWARE_DT #ifdef CONFIG_OLPC_OPENFIRMWARE_DT
extern void olpc_dt_build_devicetree(void); extern void olpc_dt_build_devicetree(void);
#else #else

2
arch/x86/kernel/head_32.S
View File

@ -137,7 +137,7 @@ ENTRY(startup_32)
movsl movsl
1: 1:
#ifdef CONFIG_OLPC_OPENFIRMWARE #ifdef CONFIG_OLPC
/* save OFW's pgdir table for later use when calling into OFW */ /* save OFW's pgdir table for later use when calling into OFW */
movl %cr3, %eax movl %cr3, %eax
movl %eax, pa(olpc_ofw_pgd) movl %eax, pa(olpc_ofw_pgd)

2
arch/x86/platform/olpc/Makefile
View File

@ -1,4 +1,4 @@
obj-$(CONFIG_OLPC) += olpc.o obj-$(CONFIG_OLPC) += olpc.o
obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o
obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o obj-$(CONFIG_OLPC) += olpc_ofw.o
obj-$(CONFIG_OLPC_OPENFIRMWARE_DT) += olpc_dt.o obj-$(CONFIG_OLPC_OPENFIRMWARE_DT) += olpc_dt.o