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

1 files changed, 3 insertions, 7 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index dbc10fce6665..677501d061a3 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -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