aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS2
-rw-r--r--board/armltd/vexpress/Makefile2
-rw-r--r--board/armltd/vexpress/vexpress_common.c (renamed from board/armltd/vexpress/ca9x4_ct_vxp.c)0
-rw-r--r--boards.cfg2
-rw-r--r--include/configs/vexpress_common.h (renamed from include/configs/ca9x4_ct_vxp.h)0
5 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 708ded79f..8db3534a2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -884,7 +884,7 @@ Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
Matt Waddel <matt.waddel@linaro.org>
- ca9x4_ct_vxp ARM ARMV7 (Quad Core)
+ vexpress_common ARM ARMV7 (Quad Core)
Prafulla Wadaskar <prafulla@marvell.com>
diff --git a/board/armltd/vexpress/Makefile b/board/armltd/vexpress/Makefile
index 87495901f..6719f3d44 100644
--- a/board/armltd/vexpress/Makefile
+++ b/board/armltd/vexpress/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).o
-COBJS := ca9x4_ct_vxp.o
+COBJS := vexpress_common.o
SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/board/armltd/vexpress/ca9x4_ct_vxp.c b/board/armltd/vexpress/vexpress_common.c
index 0b36d1280..0b36d1280 100644
--- a/board/armltd/vexpress/ca9x4_ct_vxp.c
+++ b/board/armltd/vexpress/vexpress_common.c
diff --git a/boards.cfg b/boards.cfg
index 3cf75c315..3fb0d013e 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -179,7 +179,7 @@ versatilepb arm arm926ejs versatile armltd
versatileqemu arm arm926ejs versatile armltd versatile versatile:ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB
integratorap_cm946es arm arm946es integrator armltd - integratorap:CM946ES
integratorcp_cm946es arm arm946es integrator armltd - integratorcp:CM946ES
-ca9x4_ct_vxp arm armv7 vexpress armltd
+vexpress_common arm armv7 vexpress armltd
am335x_evm arm armv7 am335x ti am33xx
highbank arm armv7 highbank - highbank
efikamx arm armv7 efikamx - mx5 efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/efikamx/imximage_mx.cfg
diff --git a/include/configs/ca9x4_ct_vxp.h b/include/configs/vexpress_common.h
index c5226ab14..c5226ab14 100644
--- a/include/configs/ca9x4_ct_vxp.h
+++ b/include/configs/vexpress_common.h