mpc83xx: make 8360 default environment fdt be 8360 (not 8349)

[u-boot] / Makefile

diff --git a/Makefile b/Makefile
index 0d11f82ec40adc96308d0bd0fabc5b4ffa5ba9bf..3e4afcc2a6a9be0fa3e79ac34446f2bd02a282a7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1615,16 +1615,10 @@ r5200_config :          unconfig
 ## MPC83xx Systems
 #########################################################################
 
-TQM834x_config:        unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc83xx tqm834x
-
-MPC8349EMDS_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc83xx mpc8349emds
-
-MPC8360EMDS_config \
-MPC8360EMDS_HOST_33_config \
-MPC8360EMDS_HOST_66_config \
-MPC8360EMDS_SLAVE_config:      unconfig
+MPC832XEMDS_config \
+MPC832XEMDS_HOST_33_config \
+MPC832XEMDS_HOST_66_config \
+MPC832XEMDS_SLAVE_config:      unconfig
        @echo "" >include/config.h ; \
        if [ "$(findstring _HOST_,$@)" ] ; then \
                echo -n "... PCI HOST " ; \
@@ -1643,18 +1637,18 @@ MPC8360EMDS_SLAVE_config:       unconfig
                echo -n "...66M..." ; \
                echo "#define PCI_66M" >>include/config.h ; \
        fi ;
-       @$(MKCONFIG) -a MPC8360EMDS ppc mpc83xx mpc8360emds
+       @$(MKCONFIG) -a MPC832XEMDS ppc mpc83xx mpc832xemds
+
+MPC8349EMDS_config:    unconfig
+       @$(MKCONFIG) $(@:_config=) ppc mpc83xx mpc8349emds
 
 MPC8349ITX_config:     unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc83xx mpc8349itx
 
-sbc8349_config:                unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc83xx sbc8349
-
-MPC832XEMDS_config \
-MPC832XEMDS_HOST_33_config \
-MPC832XEMDS_HOST_66_config \
-MPC832XEMDS_SLAVE_config:      unconfig
+MPC8360EMDS_config \
+MPC8360EMDS_HOST_33_config \
+MPC8360EMDS_HOST_66_config \
+MPC8360EMDS_SLAVE_config:      unconfig
        @echo "" >include/config.h ; \
        if [ "$(findstring _HOST_,$@)" ] ; then \
                echo -n "... PCI HOST " ; \
@@ -1673,7 +1667,14 @@ MPC832XEMDS_SLAVE_config:        unconfig
                echo -n "...66M..." ; \
                echo "#define PCI_66M" >>include/config.h ; \
        fi ;
-       @$(MKCONFIG) -a MPC832XEMDS ppc mpc83xx mpc832xemds
+       @$(MKCONFIG) -a MPC8360EMDS ppc mpc83xx mpc8360emds
+
+sbc8349_config:                unconfig
+       @$(MKCONFIG) $(@:_config=) ppc mpc83xx sbc8349
+
+TQM834x_config:        unconfig
+       @$(MKCONFIG) $(@:_config=) ppc mpc83xx tqm834x
+
 
 #########################################################################
 ## MPC85xx Systems