Signed-off-by: Dirk Eibach
---
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%)
diff --git a/MAINTAINERS b/MAINTAINERS
index e9db278..e0d4786 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -141,10 +141,10 @@ Jon Diekema
Dirk Eibach
- compactcenter PPC460EX
devconcenterPPC460EX
dlvisionPPC405EP
gdppc440etx PPC440EP/GR
+ intip PPC460EX
neo PPC405EP
Dave Ellis
diff --git a/MAKEALL b/MAKEALL
index f0ed8ea..b3d35ac 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 0449a5b..bb06d86 100644
--- a/Makefile
+++ b/Makefile
@@ -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
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 f448ef9..e929c8b 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
similarity index 98%
rename from board/gdsys/compactcenter/u-boot.lds
rename to board/gdsys/intip/u-boot.lds
index 0c95d5c..c1cbd1c
