From patchwork Tue Oct 18 12:41:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 120417 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 4A28AB6F8A for ; Tue, 18 Oct 2011 23:48:44 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0414D28DE9; Tue, 18 Oct 2011 14:48:43 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QxH8+ujdeHfx; Tue, 18 Oct 2011 14:48:42 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A7DDA28919; Tue, 18 Oct 2011 14:48:40 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 60C7B28919 for ; Tue, 18 Oct 2011 14:48:38 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ir4IsQM7j0+8 for ; Tue, 18 Oct 2011 14:48:37 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from woodbine.london.02.net (woodbine.london.02.net [87.194.255.145]) by theia.denx.de (Postfix) with ESMTP id 4DF8028165 for ; Tue, 18 Oct 2011 14:48:36 +0200 (CEST) Received: from quietpc (188.220.45.96) by woodbine.london.02.net (8.5.140) id 4E79D729015180C1; Tue, 18 Oct 2011 13:42:03 +0100 Received: from ryan by quietpc with local (Exim 4.74) (envelope-from ) id 1RG8za-0005Ob-UG; Tue, 18 Oct 2011 13:42:02 +0100 From: Ryan Harkin To: ryan.harkin@linaro.org, albert.u.boot@aribaud.net, matt.waddel@linaro.org, u-boot@lists.denx.de, john.rigby@linaro.org Date: Tue, 18 Oct 2011 13:41:48 +0100 Message-Id: <1318941709-20701-3-git-send-email-ryan.harkin@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1318941709-20701-1-git-send-email-ryan.harkin@linaro.org> References: <1318941709-20701-1-git-send-email-ryan.harkin@linaro.org> Subject: [U-Boot] [PATCH 2/3] ARM: vexpress: create A9 specific board config X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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 --- MAINTAINERS | 2 +- boards.cfg | 2 +- include/configs/vexpress_ca9x4.h | 34 ++++++++++++++++++++++++++++++++++ include/configs/vexpress_common.h | 1 - 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index bc89a4e..c1973d3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -858,7 +858,7 @@ Hugo Villeneuve Matt Waddel - vexpress_common ARM ARMV7 (Quad Core) + vexpress_ca9x4 ARM ARMV7 (Quad Core) Prafulla Wadaskar diff --git a/boards.cfg b/boards.cfg index 31202b8..1043e98 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 0000000..f8066a2 --- /dev/null +++ b/include/configs/vexpress_ca9x4.h @@ -0,0 +1,34 @@ +/* + * (C) Copyright 2011 Linaro + * Ryan Harkin, + * + * 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 5adfe64..d37924f 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