ppc4xx: Rename compactcenter to intip

Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Signed-off-by: Stefan Roese <sr@denx.de>

diff --git a/MAINTAINERS b/MAINTAINERS
index e9db27842ebac4809e40ff6d8ba5777be1195e71..e0d4786a79056a516c157174530955b3d30d4390 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -141,10 +141,10 @@ Jon Diekema <jon.diekema@smiths-aerospace.com>
 
 Dirk Eibach <eibach@gdsys.de>
 
-       compactcenter   PPC460EX
        devconcenter    PPC460EX
        dlvision        PPC405EP
        gdppc440etx     PPC440EP/GR
+       intip           PPC460EX
        neo             PPC405EP
 
 Dave Ellis <DGE@sixnetio.com>

diff --git a/MAKEALL b/MAKEALL
index f0ed8ea87faf686f0101ed4e6f1183d394f80728..b3d35ac05ffaf48a07a8f0bb6148cca1d061afee 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -185,7 +185,6 @@ LIST_4xx="          \
        canyonlands     \
        canyonlands_nand \
        CMS700          \
-       compactcenter   \
        CPCI2DP         \
        CPCI405         \
        CPCI4052        \
@@ -214,6 +213,7 @@ LIST_4xx="          \
        hcu5            \
        HH405           \
        HUB405          \
+       intip           \
        JSE             \
        KAREF           \
        katmai          \

diff --git a/Makefile b/Makefile
index 9764cea894f7b070be77b617c63dc81fa47adf35..e8c90a2f26044fa6d1c1137c13774fbd50930174 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
 

diff --git a/board/gdsys/compactcenter/Makefile b/board/gdsys/intip/Makefile
similarity index 100%
rename from board/gdsys/compactcenter/Makefile
rename to board/gdsys/intip/Makefile

diff --git a/board/gdsys/compactcenter/chip_config.c b/board/gdsys/intip/chip_config.c
similarity index 100%
rename from board/gdsys/compactcenter/chip_config.c
rename to board/gdsys/intip/chip_config.c

diff --git a/board/gdsys/compactcenter/config.mk b/board/gdsys/intip/config.mk
similarity index 100%
rename from board/gdsys/compactcenter/config.mk
rename to board/gdsys/intip/config.mk

diff --git a/board/gdsys/compactcenter/init.S b/board/gdsys/intip/init.S
similarity index 100%
rename from board/gdsys/compactcenter/init.S
rename to board/gdsys/intip/init.S

diff --git a/board/gdsys/compactcenter/compactcenter.c b/board/gdsys/intip/intip.c
similarity index 99%
rename from board/gdsys/compactcenter/compactcenter.c
rename to board/gdsys/intip/intip.c
index 8a5ea300d7abec0e41bc7cb7a006c45930700315..0de1be85792f6aa724b53eec2a1b7d96d2921ffe 100644 (file)
--- a/board/gdsys/compactcenter/compactcenter.c
+++ b/board/gdsys/intip/intip.c
@@ -129,7 +129,7 @@ int checkboard(void)
 #ifdef CONFIG_DEVCONCENTER
        printf("Board: DevCon-Center");
 #else
-       printf("Board: CompactCenter");
+       printf("Board: Intip");
 #endif
 
        if (s != NULL) {

diff --git a/board/gdsys/compactcenter/u-boot.lds b/board/gdsys/intip/u-boot.lds
similarity index 98%
rename from board/gdsys/compactcenter/u-boot.lds
rename to board/gdsys/intip/u-boot.lds
index 0c95d5c298cbc6ac3c4638718eb612d062ce2332..c1cbd1c4acedd7155cf91771001c829213a0d7bd 100644 (file)
--- a/board/gdsys/compactcenter/u-boot.lds
+++ b/board/gdsys/intip/u-boot.lds
@@ -66,7 +66,7 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/ppc4xx/start.o (.text)
-    board/gdsys/compactcenter/init.o   (.text)
+    board/gdsys/intip/init.o   (.text)
 
     *(.text)
     *(.fixup)

diff --git a/include/configs/compactcenter.h b/include/configs/intip.h
similarity index 98%
rename from include/configs/compactcenter.h
rename to include/configs/intip.h
index f8a1bbb982901397e263bf2750c9a9ae17aab8b2..4f7bc7e28dc8c2cd586223757bebbc6d22fb9d44 100644 (file)
--- a/include/configs/compactcenter.h
+++ b/include/configs/intip.h
@@ -23,7 +23,7 @@
  */
 
 /*
- * compactcenter.h - configuration for CompactCenter (460EX)
+ * intip.h - configuration for CompactCenter aka intip (460EX) and DevCon-Center
  */
 #ifndef __CONFIG_H
 #define __CONFIG_H
@@ -32,15 +32,15 @@
  * High Level Configuration Options
  */
 /*
- * This config file is used for CompactCenter and DevCon-Center
+ * This config file is used for CompactCenter(codename intip) and DevCon-Center
  */
 #define CONFIG_460EX           1       /* Specific PPC460EX            */
 #ifdef CONFIG_DEVCONCENTER
 #define CONFIG_HOSTNAME                devconcenter
 #define CONFIG_IDENT_STRING    " devconcenter 0.02"
 #else
-#define CONFIG_HOSTNAME                compactcenter
-#define CONFIG_IDENT_STRING    " compactcenter 0.02"
+#define CONFIG_HOSTNAME                intip
+#define CONFIG_IDENT_STRING    " intip 0.02"
 #endif
 #define CONFIG_440             1
 #define CONFIG_4xx             1       /* ... PPC4xx family */