Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc3119e7 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: OLPC: Cleanup config maze completely 



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: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Andres Salomon <dilinger@queued.net>
parent fe239545

arch/x86/Kconfig

+3 −7
Original line number Diff line number Diff line
@@ -2066,9 +2066,10 @@ config SCx200HR_TIMER 


config OLPC

	bool "One Laptop Per Child support"

	select GPIOLIB

	select OLPC_OPENFIRMWARE

	depends on !X86_PAE

	select GPIOLIB

	select OF

	select OLPC_OPENFIRMWARE_DT if PROC_DEVICETREE

	---help---

	  Add support for detecting the unique features of the OLPC

	  XO hardware.
@@ -2079,11 +2080,6 @@ config OLPC_XO1 
	---help---

	  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

	bool

	select OF_PROMTREE

arch/x86/include/asm/olpc_ofw.h

+0 −11
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ 


#define OLPC_OFW_SIG 0x2057464F	/* aka "OFW " */



#ifdef CONFIG_OLPC_OPENFIRMWARE



extern bool olpc_ofw_is_installed(void);



/* 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 */

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

extern void olpc_dt_build_devicetree(void);

#else

arch/x86/kernel/head_32.S

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ ENTRY(startup_32) 
	movsl

1:



#ifdef CONFIG_OLPC_OPENFIRMWARE

#ifdef CONFIG_OLPC

	/* save OFW's pgdir table for later use when calling into OFW */

	movl %cr3, %eax

	movl %eax, pa(olpc_ofw_pgd)

arch/x86/platform/olpc/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_OLPC)		+= olpc.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