Skip to contentSkip to conversation

ppc4xx: Rename compactcenter to intip

PATCH New Dirk Eibach 2 participants 2 messages Sep 9, 2009 – Sep 11, 2009 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 ppc4xx: Rename compactcenter to intip

---
Changes since v1:
- also changed config name

Changes since v2:
- also changed file- and directory-names

Changes since v3:
- used format-patch -M -C to detect renames properly

 MAINTAINERS                                        |    2 +-
 MAKEALL                                            |    2 +-
 Makefile                                           |   16 ++++++++--------
 board/gdsys/{compactcenter => intip}/Makefile      |    0 
 board/gdsys/{compactcenter => intip}/chip_config.c |    0 
 board/gdsys/{compactcenter => intip}/config.mk     |    0 
 board/gdsys/{compactcenter => intip}/init.S        |    0 
 .../compactcenter.c => intip/intip.c}              |    2 +-
 board/gdsys/{compactcenter => intip}/u-boot.lds    |    2 +-
 include/configs/{compactcenter.h => intip.h}       |    8 ++++----
 10 files changed, 16 insertions(+), 16 deletions(-)
 rename board/gdsys/{compactcenter => intip}/Makefile (100%)
 rename board/gdsys/{compactcenter => intip}/chip_config.c (100%)
 rename board/gdsys/{compactcenter => intip}/config.mk (100%)
 rename board/gdsys/{compactcenter => intip}/init.S (100%)
 rename board/gdsys/{compactcenter/compactcenter.c => intip/intip.c} (99%)
 rename board/gdsys/{compactcenter => intip}/u-boot.lds (98%)
 rename include/configs/{compactcenter.h => intip.h} (98%)
MAINTAINERS +1 -1
index e9db278..e0d4786 100644
@@ -141,10 +141,10 @@ Jon Diekema <[email protected]>
 
 Dirk Eibach <[email protected]>
 
-	compactcenter	PPC460EX
 	devconcenter	PPC460EX
 	dlvision        PPC405EP
 	gdppc440etx	PPC440EP/GR
+	intip		PPC460EX
 	neo		PPC405EP
 
 Dave Ellis <[email protected]>
MAKEALL +1 -1
index f0ed8ea..b3d35ac 100755
@@ -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		\
Makefile +8 -8
index 0449a5b..bb06d86 100644
@@ -1304,14 +1304,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
 
@@ -1396,6 +1388,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
 
board/gdsys/intip/Makefile renamed from board/gdsys/compactcenter/Makefile +0 -0
similarity index 100%
rename from board/gdsys/compactcenter/Makefile
rename to board/gdsys/intip/Makefile
board/gdsys/intip/chip_config.c renamed from board/gdsys/compactcenter/chip_config.c +0 -0
similarity index 100%
rename from board/gdsys/compactcenter/chip_config.c
rename to board/gdsys/intip/chip_config.c
board/gdsys/intip/config.mk renamed from board/gdsys/compactcenter/config.mk +0 -0
similarity index 100%
rename from board/gdsys/compactcenter/config.mk
rename to board/gdsys/intip/config.mk
board/gdsys/intip/init.S renamed from board/gdsys/compactcenter/init.S +0 -0
similarity index 100%
rename from board/gdsys/compactcenter/init.S
rename to board/gdsys/intip/init.S
board/gdsys/intip/intip.c renamed from board/gdsys/compactcenter/compactcenter.c +1 -1
similarity index 99%
rename from board/gdsys/compactcenter/compactcenter.c
rename to board/gdsys/intip/intip.c
index f448ef9..e929c8b 100644
@@ -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) {
board/gdsys/intip/u-boot.lds renamed from board/gdsys/compactcenter/u-boot.lds +1 -1
similarity index 98%
rename from board/gdsys/compactcenter/u-boot.lds
rename to board/gdsys/intip/u-boot.lds
index 0c95d5c..c1cbd1c 100644
@@ -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)
include/configs/intip.h renamed from include/configs/compactcenter.h +4 -4
similarity index 98%
rename from include/configs/compactcenter.h
rename to include/configs/intip.h
index f8a1bbb..4f7bc7e 100644
@@ -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 */
Signature · 1 line
1.5.6.5
#1 lore raw

PATCH v4 1/1 ppc4xx: Rename compactcenter to intip

Quoted 1 line · On Wednesday 09 September 2009 12:36:07 Dirk Eibach wrote:

Applied to u-boot-ppc4xx. Thanks.

Cheers,
Stefan

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de