Merge branch 'master' of git://git.denx.de/u-boot-microblaze

[u-boot] / Makefile

diff --git a/Makefile b/Makefile
index 9764cea894f7b070be77b617c63dc81fa47adf35..0b61d057f309ba3a7b05ea6262286c181546cbcf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1308,14 +1308,6 @@ CATcenter_33_config:     unconfig
 CMS700_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx cms700 esd
 
-# Compact-Center & DevCon-Center use different U-Boot images
-compactcenter_config \
-devconcenter_config:   unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
-               tr '[:lower:]' '[:upper:]')" >$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a compactcenter ppc ppc4xx compactcenter gdsys
-
 CPCI2DP_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci2dp esd
 
@@ -1400,6 +1392,14 @@ HH405_config:    unconfig
 HUB405_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx hub405 esd
 
+# Compact-Center(codename intip) & DevCon-Center use different U-Boot images
+intip_config \
+devconcenter_config:   unconfig
+       @mkdir -p $(obj)include
+       @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
+               tr '[:lower:]' '[:upper:]')" >$(obj)include/config.h
+       @$(MKCONFIG) -n $@ -a intip ppc ppc4xx intip gdsys
+
 JSE_config:    unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx jse
 
@@ -3541,11 +3541,6 @@ microblaze-generic_config:       unconfig
        @mkdir -p $(obj)include
        @$(MKCONFIG) -a $(@:_config=) microblaze microblaze microblaze-generic xilinx
 
-suzaku_config: unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_SUZAKU 1" > $(obj)include/config.h
-       @$(MKCONFIG) -a $(@:_config=) microblaze microblaze suzaku AtmarkTechno
-
 #========================================================================
 # Blackfin
 #========================================================================