From patchwork Wed Apr 3 13:44:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 233468 X-Patchwork-Delegate: albert.aribaud@free.fr 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 E0D512C00A7 for ; Thu, 4 Apr 2013 00:50:59 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 346014A1B7; Wed, 3 Apr 2013 15:50:58 +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 FRr74dtdgmnK; Wed, 3 Apr 2013 15:50:57 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0E0C44A1C0; Wed, 3 Apr 2013 15:50:57 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 403054A1CA for ; Wed, 3 Apr 2013 15:50:55 +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 Klaqm2w0kT1K for ; Wed, 3 Apr 2013 15:50:53 +0200 (CEST) X-Greylist: delayed 327 seconds by postgrey-1.27 at theia; Wed, 03 Apr 2013 15:50:49 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 mail-ia0-f179.google.com (mail-ia0-f179.google.com [209.85.210.179]) by theia.denx.de (Postfix) with ESMTPS id 5AAA74A1E6 for ; Wed, 3 Apr 2013 15:50:49 +0200 (CEST) Received: by mail-ia0-f179.google.com with SMTP id x24so1262695iak.38 for ; Wed, 03 Apr 2013 06:50:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=kdQeaKWp5fysqWBMwrMSTIIGgWLX+PT4JbVEMdsaGjg=; b=Nu+S3LvkXPtNiURxw8023zFSeVZsClew7AZiebFP3S59xdJ7b+6tWb4ZZiLYc5KYUP MZqvqtTP/HMgT/TiS+h955XklmHvJkkD9/FsJXOSyNaXRxqnywsq74eURMCT4nWMy9ij SXyhxBUb7lxQmSIVRtgKPwnbMI+oeTHUIQZgruzrqmDY45wf9uGaFVY3hK0bfzFdw5Sf yMP/PxnvUTqYuXsGOM7/HuOMWcdPiSYkUMzu7F+YJ5WqU5zM+zfqXipMILPgRNNhojwN 1YcjMC/4EN1K11V3gHc3UYYnFv+3RrpWQFDuWc7wyWGK1GyV3dBItpZyhinG2kV7MAxx X/oQ== X-Received: by 10.50.78.162 with SMTP id c2mr734947igx.11.1364996720721; Wed, 03 Apr 2013 06:45:20 -0700 (PDT) Received: from slackpad.calxeda.com (f053083090.adsl.alicedsl.de. [78.53.83.90]) by mx.google.com with ESMTPS id dy5sm4402417igc.1.2013.04.03.06.45.18 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Apr 2013 06:45:20 -0700 (PDT) From: Andre Przywara To: u-boot@lists.denx.de Date: Wed, 3 Apr 2013 15:44:33 +0200 Message-Id: <1364996676-25361-3-git-send-email-andre.przywara@linaro.org> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1364996676-25361-1-git-send-email-andre.przywara@linaro.org> References: <1364996676-25361-1-git-send-email-andre.przywara@linaro.org> X-Gm-Message-State: ALoCoQm3W96kNM6tCgHlNpySRvmQS9kC8lAKEhputwT/ivNTPpD9RIxRuTvndldnzY2plA5gMJBj Cc: jon.medhurst@linaro.org Subject: [U-Boot] [PATCH 2/5] ARM: vexpress: create A9 specific board config X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 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 From: Ryan Harkin 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 Signed-off-by: Andre Przywara --- MAINTAINERS | 2 +- boards.cfg | 2 +- include/configs/vexpress_ca9x4.h | 34 ++++++++++++++++++++++++++++++++++ include/configs/vexpress_common.h | 1 - 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 include/configs/vexpress_ca9x4.h diff --git a/MAINTAINERS b/MAINTAINERS index b4d9a35..761c36c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -960,7 +960,7 @@ Hugo Villeneuve Matt Waddel - vexpress_common ARM ARMV7 (Quad Core) + vexpress_ca9x4 ARM ARMV7 (Quad Core) Otavio Salvador diff --git a/boards.cfg b/boards.cfg index 3c971d4..908e3bc 100644 --- a/boards.cfg +++ b/boards.cfg @@ -232,7 +232,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 am335x_evm:SERIAL1,CONS_INDEX=1 am335x_evm_spiboot arm armv7 am335x ti am33xx am335x_evm:SERIAL1,CONS_INDEX=1,SPI_BOOT am335x_evm_uart1 arm armv7 am335x ti am33xx am335x_evm:SERIAL2,CONS_INDEX=2 diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h new file mode 100644 index 0000000..c3b6986 --- /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 a7cd1d4..9a3431e 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