ppc/85xx: Simplify the top makefile for 36-bit config for P2020DS

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/Makefile b/Makefile
index 8672336f15a675c2a3f29e8c3d5c38c30ceedd1c..1e256698f05fd4b4a92b7e6cc08aa6998e95147f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2518,12 +2518,7 @@ MPC8572DS_config:       unconfig
 
 P2020DS_36BIT_config \
 P2020DS_config:                unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring _36BIT_,$@)" ] ; then \
-               echo "#define CONFIG_PHYS_64BIT" >>$(obj)include/config.h ; \
-               $(XECHO) "... enabling 36-bit physical addressing." ; \
-       fi
-       @$(MKCONFIG) -a P2020DS ppc mpc85xx p2020ds freescale
+       @$(MKCONFIG) -t $(@:_config=) P2020DS ppc mpc85xx p2020ds freescale
 
 P1011RDB_config:       unconfig
        @mkdir -p $(obj)include

diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h
index 2a2b9acf579698e86c4a0513b4ed027a6747c447..b48c1999f8ff8a7fe0fbf740d5023cc3346ba85f 100644 (file)
--- a/include/configs/P2020DS.h
+++ b/include/configs/P2020DS.h
@@ -27,6 +27,10 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#ifdef CONFIG_MK_36BIT
+#define CONFIG_PHYS_64BIT
+#endif
+
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */