ppc4xx: Rename compactcenter to intip

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

10 files changed, 16 insertions, 16 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index e9db27842e..e0d4786a79 100644
--- 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 f0ed8ea87f..b3d35ac05f 100755
--- 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 9764cea894..e8c90a2f26 100644
--- 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
index 12f8a642e7..12f8a642e7 100644
--- a/board/gdsys/compactcenter/Makefile
+++ b/board/gdsys/intip/Makefile
diff --git a/board/gdsys/compactcenter/chip_config.c b/board/gdsys/intip/chip_config.c
index e46f4d8ece..e46f4d8ece 100644
--- a/board/gdsys/compactcenter/chip_config.c
+++ b/board/gdsys/intip/chip_config.c
diff --git a/board/gdsys/compactcenter/config.mk b/board/gdsys/intip/config.mk
index 56e397d77a..56e397d77a 100644
--- a/board/gdsys/compactcenter/config.mk
+++ b/board/gdsys/intip/config.mk
diff --git a/board/gdsys/compactcenter/init.S b/board/gdsys/intip/init.S
index e205c9d7e8..e205c9d7e8 100644
--- a/board/gdsys/compactcenter/init.S
+++ b/board/gdsys/intip/init.S
diff --git a/board/gdsys/compactcenter/compactcenter.c b/board/gdsys/intip/intip.c
index 8a5ea300d7..0de1be8579 100644
--- 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
index 0c95d5c298..c1cbd1c4ac 100644
--- 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
index f8a1bbb982..4f7bc7e28d 100644
--- 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 */