From patchwork Tue Apr 9 12:20:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 235062 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 EA66D2C00AA for ; Tue, 9 Apr 2013 22:21:28 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8DFB84AC1E; Tue, 9 Apr 2013 14:21:27 +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 7pFzkIsEZ7Mf; Tue, 9 Apr 2013 14:21:27 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 261C64AC06; Tue, 9 Apr 2013 14:21:22 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5C5FF4AC09 for ; Tue, 9 Apr 2013 14:21:20 +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 5Ql0Iwgcoehf for ; Tue, 9 Apr 2013 14:21:14 +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 mail-bk0-f43.google.com (mail-bk0-f43.google.com [209.85.214.43]) by theia.denx.de (Postfix) with ESMTPS id 4834E4ABB2 for ; Tue, 9 Apr 2013 14:21:11 +0200 (CEST) Received: by mail-bk0-f43.google.com with SMTP id jm2so3647417bkc.30 for ; Tue, 09 Apr 2013 05:21:11 -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=RVsS6vzYF6S74LGRDvoPs8p9hW2xRPcQ16pCA0docFA=; b=UzyjssLrKeCTTR4aCfhtcIr6phEGXh7XK4K8hemrGSfql1eoLHIIasS79K+UNTz2uw qF0LEUpf1MZaK7TUIpLPOUg+KdCKZZXhzdb3rNZB+CTib5Hs0zW1v8pKvT0lKHkswHlW M0jt7OQAiCfQw6Pcbe76gH+CXC4KrxG9Sp/HnuW/tDAqW9/82injk7PYR4WKTWJE4dLY bh36l+7MSI0pA4qtF31PlDddC5XpTLRmhIVZiO1IXnbss9EiAXWR+Cnkb07ToeOJLC7z xb5sEoMJMiQLqWGRI4tFa/ePdsvQ0KcqDFP1y4haf86OZcv9hn4239D9VfPQr6Y9R1LC xZ8Q== X-Received: by 10.205.17.200 with SMTP id qd8mr12603039bkb.36.1365510071242; Tue, 09 Apr 2013 05:21:11 -0700 (PDT) Received: from slackpad.drs.calxeda.com (g224198110.adsl.alicedsl.de. [92.224.198.110]) by mx.google.com with ESMTPS id x18sm13947971bkw.4.2013.04.09.05.21.09 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Apr 2013 05:21:10 -0700 (PDT) From: Andre Przywara To: albert.u.boot@aribaud.net, trini@ti.com Date: Tue, 9 Apr 2013 14:20:30 +0200 Message-Id: <1365510033-14508-2-git-send-email-andre.przywara@linaro.org> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1365510033-14508-1-git-send-email-andre.przywara@linaro.org> References: <1365510033-14508-1-git-send-email-andre.przywara@linaro.org> X-Gm-Message-State: ALoCoQnaOsYs5PTksM4TlCaf98xli1KtzymTXsBmXp/Qw/A3UoEeRDuprF8/kWo35cQm+rfsggzS Cc: u-boot@lists.denx.de, jon.medhurst@linaro.org Subject: [U-Boot] [PATCH v3 1/4] ARM: vexpress: refactoring of Versatile Express CA9x4 support 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 The current ca9x4_ct_vxp platform contains support for a Versatile Express motherboard with a quad core A9 core tile. This patch separates the Versatile Express motherboard code and the A9 specific code, to ease supporting more core tiles in the next patches. Andre: merged the first two of Ryan's original patches and did some checkpatch fixes. Signed-off-by: Ryan Harkin Signed-off-by: Andre Przywara --- MAINTAINERS | 2 +- board/armltd/vexpress/Makefile | 2 +- .../vexpress/{ca9x4_ct_vxp.c => vexpress_common.c} | 6 ++-- boards.cfg | 2 +- include/configs/vexpress_ca9x4.h | 34 ++++++++++++++++++++++ .../configs/{ca9x4_ct_vxp.h => vexpress_common.h} | 1 - 6 files changed, 40 insertions(+), 7 deletions(-) rename board/armltd/vexpress/{ca9x4_ct_vxp.c => vexpress_common.c} (98%) create mode 100644 include/configs/vexpress_ca9x4.h rename include/configs/{ca9x4_ct_vxp.h => vexpress_common.h} (99%) diff --git a/MAINTAINERS b/MAINTAINERS index 1614b91..761c36c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -960,7 +960,7 @@ Hugo Villeneuve Matt Waddel - ca9x4_ct_vxp ARM ARMV7 (Quad Core) + vexpress_ca9x4 ARM ARMV7 (Quad Core) Otavio Salvador diff --git a/board/armltd/vexpress/Makefile b/board/armltd/vexpress/Makefile index 8749590..6719f3d 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 similarity index 98% rename from board/armltd/vexpress/ca9x4_ct_vxp.c rename to board/armltd/vexpress/vexpress_common.c index d5e109e..c4f2520 100644 --- a/board/armltd/vexpress/ca9x4_ct_vxp.c +++ b/board/armltd/vexpress/vexpress_common.c @@ -166,8 +166,8 @@ static void vexpress_timer_init(void) */ writel(SYSTIMER_RELOAD, &systimer_base->timer0load); writel(SYSTIMER_RELOAD, &systimer_base->timer0value); - writel(SYSTIMER_EN | SYSTIMER_32BIT | \ - readl(&systimer_base->timer0control), \ + writel(SYSTIMER_EN | SYSTIMER_32BIT | + readl(&systimer_base->timer0control), &systimer_base->timer0control); reset_timer_masked(); @@ -251,7 +251,7 @@ unsigned long long get_ticks(void) return get_timer(0); } -ulong get_tbclk (void) +ulong get_tbclk(void) { return (ulong)CONFIG_SYS_HZ; } diff --git a/boards.cfg b/boards.cfg index 5fc70be..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 -ca9x4_ct_vxp 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/ca9x4_ct_vxp.h b/include/configs/vexpress_common.h similarity index 99% rename from include/configs/ca9x4_ct_vxp.h rename to include/configs/vexpress_common.h index a7cd1d4..9a3431e 100644 --- a/include/configs/ca9x4_ct_vxp.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