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

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

diff --git a/Makefile b/Makefile
index 99837a38346f024b29f3be1813f966890a40fbf4..8672336f15a675c2a3f29e8c3d5c38c30ceedd1c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2514,12 +2514,7 @@ MPC8569MDS_config:       unconfig
 
 MPC8572DS_36BIT_config \
 MPC8572DS_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 MPC8572DS ppc mpc85xx mpc8572ds freescale
+       @$(MKCONFIG) -t $(@:_config=) MPC8572DS ppc mpc85xx mpc8572ds freescale
 
 P2020DS_36BIT_config \
 P2020DS_config:                unconfig

diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 55c1f29b1923b39811c2826c668afedaf0434787..000f8f62d62716de320909612945c1b812901f10 100644 (file)
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.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 */