aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harkin <ryan.harkin@linaro.org>2011-10-18 10:36:18 +0100
committerRyan Harkin <ryan.harkin@linaro.org>2011-10-18 10:36:18 +0100
commit17fc712004c28082940321b820d683854bf08f4c (patch)
tree3158cc2a30747d4c894f903556ddbf7bf14ac0f0
parenta2366a384b605e4c8771d1eafb36e71a6404d7f7 (diff)
ARM: vexpress: create A9 specific board config
This patch creates a new config for the A9 quad core tile that includes the generic config for the Versatile Express platform. Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
-rw-r--r--MAINTAINERS2
-rw-r--r--boards.cfg2
-rw-r--r--include/configs/vexpress_ca9x4.h34
-rw-r--r--include/configs/vexpress_common.h1
4 files changed, 36 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index bc89a4edf..c1973d3d8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -858,7 +858,7 @@ Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
Matt Waddel <matt.waddel@linaro.org>
- vexpress_common ARM ARMV7 (Quad Core)
+ vexpress_ca9x4 ARM ARMV7 (Quad Core)
Prafulla Wadaskar <prafulla@marvell.com>
diff --git a/boards.cfg b/boards.cfg
index 31202b84d..1043e9807 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -154,7 +154,7 @@ edminiv2 arm arm926ejs - LaCie
dkb arm arm926ejs - Marvell pantheon
integratorap_cm946es arm arm946es integrator armltd - integratorap
integratorcp_cm946es arm arm946es integrator armltd - integratorcp
-vexpress_common arm armv7 vexpress armltd
+vexpress_ca9x4 arm armv7 vexpress armltd
highbank arm armv7 highbank - highbank
efikamx arm armv7 efikamx - mx5 efikamx:IMX_CONFIG=board/efikamx/imximage.cfg
mx51evk arm armv7 mx51evk freescale mx5 mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg
diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h
new file mode 100644
index 000000000..f8066a28d
--- /dev/null
+++ b/include/configs/vexpress_ca9x4.h
@@ -0,0 +1,34 @@
+/*
+ * (C) Copyright 2011 Linaro
+ * Ryan Harkin, <ryan.harkin@linaro.org>
+ *
+ * Configuration for Versatile Express. Parts were derived from other ARM
+ * configurations.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef __VEXPRESS_CA9X4_H
+#define __VEXPRESS_CA9X4_H
+
+#define CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
+#include "vexpress_common.h"
+#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7.vexpress_ca9x4"
+
+#endif // VEXPRESS_CA9X4_H
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 5adfe649a..d37924f39 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -100,7 +100,6 @@
#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_PXE
#define CONFIG_BOOTP_PXE_CLIENTARCH 0x100
-#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7.ca9x4_ct_vxp"
/* Miscellaneous configurable options */
#undef CONFIG_SYS_CLKS_IN_HZ