diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2011-10-18 10:36:18 +0100 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-08-16 09:44:57 -0600 |
| commit | fb431df9696090f1b1081c5af82842f605db9f9f (patch) | |
| tree | 5c08e398ea3dbd69993f333e2c57f780f4b713ce | |
| parent | f5ad9a8395efbd90fa4097c1684d67df37d31efa (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-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | boards.cfg | 2 | ||||
| -rw-r--r-- | include/configs/vexpress_ca9x4.h | 34 | ||||
| -rw-r--r-- | include/configs/vexpress_common.h | 1 |
4 files changed, 36 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b7dc232b6..5ef056f79 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -904,7 +904,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 1de70dc47..a383a0b63 100644 --- a/boards.cfg +++ b/boards.cfg @@ -205,7 +205,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 -vexpress_common arm armv7 vexpress armltd +vexpress_ca9x4 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/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 14b81460b..07e8d691e 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -97,7 +97,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 |