x86: OLPC: Cleanup config maze completely
A message that is not in the archive (sent off-list or not yet received): [email protected]
This one looks wrong, but I see you fixed it up in a later patch. Are you going to merge the two? Also, when will these be showing up in linux-next?
Quoted 106 lines · On Wed, 23 Feb 2011 09:52:50 GMT tip-bot for Thomas Gleixner…
Commit-ID:
dc3119e700216a70e82fe07a79f1618852058354Gitweb:
http://git.kernel.org/tip/dc3119e700216a70e82fe07a79f1618852058354
Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 23
Feb 2011 10:08:31 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 23 Feb 2011 10:40:45 +0100x86: OLPC: Cleanup config maze completely
Neither
CONFIG_OLPC_OPENFIRMWAREnorCONFIG_OLPC_OPENFIRMWARE_DTare really necessary.OLPC selects
OLPC_OPENFIRMWAREunconditionally, so move the "select OF" part under OLPC config option and fixup the dependencies in Makefiles and code.Signed-off-by Thomas Gleixner <[email protected]>Cc Andres Salomon <[email protected]>--- arch/x86/Kconfig | 10 +++------- arch/x86/include/asm/olpc_ofw.h | 11 ----------- arch/x86/kernel/head_32.S | 2 +- arch/x86/platform/olpc/Makefile | 2 +- 4 files changed, 5 insertions(+), 20 deletions(-)arch/x86/Kconfig +3
-2@@ -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-1laptop.
arch/x86/Kconfig +0
-5-config OLPC_OPENFIRMWARE - bool - select OF - select OLPC_OPENFIRMWARE_DT if PROC_DEVICETREE - config OLPC_OPENFIRMWARE_DT bool select OF_PROMTREE(quoted diff) +0
-0
b/arch/x86/include/asm/olpc_ofw.hindex 641988e..1fff2de 100644arch/x86/include/asm/olpc_ofw.h +0
-11@@ -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@@ -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 intoOFW */ movl %cr3, %eax
arch/x86/kernel/head_32.S +0
-0movl %eax, pa(olpc_ofw_pgd)(quoted diff) +0
-0b/arch/x86/platform/olpc/Makefile index e797428..e18e641 100644
arch/x86/platform/olpc/Makefile +1
-1@@ -1,4 +1,4 @@ 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
Quoted 3 lines · Andres Salomon
This one looks wrong, but I see you fixed it up in a later patch. Are you going to merge the two? Also, when will these be showing up in linux-next?
Tomorrow if nothing goes terribly wrong.