From patchwork Tue Apr 23 10:46:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 238865 X-Patchwork-Delegate: monstr@monstr.eu 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 90A832C016F for ; Tue, 23 Apr 2013 20:47:15 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 288C34A19D; Tue, 23 Apr 2013 12:47:13 +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 oI2lC-TKihL0; Tue, 23 Apr 2013 12:47:12 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E71564A1A9; Tue, 23 Apr 2013 12:46:55 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 80D904A190 for ; Tue, 23 Apr 2013 12:46:52 +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 6QDKNYxoYKI4 for ; Tue, 23 Apr 2013 12:46:51 +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-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by theia.denx.de (Postfix) with ESMTPS id 222B34A191 for ; Tue, 23 Apr 2013 12:46:43 +0200 (CEST) Received: by mail-wi0-f180.google.com with SMTP id h11so558002wiv.7 for ; Tue, 23 Apr 2013 03:46:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:in-reply-to:references:content-type :x-gm-message-state; bh=Txh8nHwyaAF4HVwE02ivqsL2tdIXXCIPeGQBsbiugXw=; b=GDnNcY0bx/0zycKYsix577UOVxGlRVDa3G0QFNM32+p3Bh+i2x8X0eHiR8VqgA+6nR IO1+RD3n1jxXxYpF3X9MjS7Xd2AfAoYh75QvFwHU6BaNR9iEKI4boYFwV4jLkvmT5UZ0 bqMzLQQ0FWTtgBLXK9WZML7aCxLw29o81BCi5Cnu4rSjR61DfGUycyEImFi61bn5TjiL 3myZFLskvpiil90H8I9jis6q7zDXQnENFNisSgndXgH+G7Oz/yCT1f8NBCeZOVmRMUux +bFmmgkOPUHkj0qvJ1iogW+9o49VX9yZEepwuxq7sD5LB1iRgk/Sqwxzi/359QsSgwIN Brdg== X-Received: by 10.180.183.197 with SMTP id eo5mr17498869wic.28.1366714003192; Tue, 23 Apr 2013 03:46:43 -0700 (PDT) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPSA id t14sm26176900wib.0.2013.04.23.03.46.42 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Tue, 23 Apr 2013 03:46:42 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, Joe Hershberger , Albert Aribaud , Tom Rini Date: Tue, 23 Apr 2013 12:46:02 +0200 Message-Id: X-Mailer: git-send-email 1.8.2.1 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQlPfTpt3FgHVtVHIJi58i+xlXSyHjd5w0nPJzZGkmkN/aG7RAfBBqGgeJEE06uBo3r6dXpp Cc: Peter Crosthwaite , Jagannadha Sutradharudu Teki Subject: [U-Boot] [PATCH v2 03/15] zynq: Move scutimer baseaddr to hardware.h 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 Move baseaddr to hardware.h to be shared between configurations. Signed-off-by: Michal Simek --- Changes in v2: - Remove CONFIG_ prefix from non configurable macros (scutimer) arch/arm/cpu/armv7/zynq/timer.c | 3 ++- arch/arm/include/asm/arch-zynq/hardware.h | 1 + include/configs/zynq.h | 3 --- 3 files changed, 3 insertions(+), 4 deletions(-) -- 1.8.2.1 diff --git a/arch/arm/cpu/armv7/zynq/timer.c b/arch/arm/cpu/armv7/zynq/timer.c index 5d8bb24..8c4357d 100644 --- a/arch/arm/cpu/armv7/zynq/timer.c +++ b/arch/arm/cpu/armv7/zynq/timer.c @@ -44,6 +44,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -54,7 +55,7 @@ struct scu_timer { }; static struct scu_timer *timer_base = - (struct scu_timer *) CONFIG_SCUTIMER_BASEADDR; + (struct scu_timer *)ZYNQ_SCUTIMER_BASEADDR; #define SCUTIMER_CONTROL_PRESCALER_MASK 0x0000FF00 /* Prescaler */ #define SCUTIMER_CONTROL_PRESCALER_SHIFT 8 diff --git a/arch/arm/include/asm/arch-zynq/hardware.h b/arch/arm/include/asm/arch-zynq/hardware.h index a99edbe..ccbf54e 100644 --- a/arch/arm/include/asm/arch-zynq/hardware.h +++ b/arch/arm/include/asm/arch-zynq/hardware.h @@ -26,6 +26,7 @@ #define ZYNQ_SYS_CTRL_BASEADDR 0xF8000000 #define ZYNQ_DEV_CFG_APB_BASEADDR 0xF8007000 #define ZYNQ_SCU_BASEADDR 0xF8F00000 +#define ZYNQ_SCUTIMER_BASEADDR 0xF8F00600 /* Reflect slcr offsets */ struct slcr_regs { diff --git a/include/configs/zynq.h b/include/configs/zynq.h index 2989e72..1147689 100644 --- a/include/configs/zynq.h +++ b/include/configs/zynq.h @@ -50,9 +50,6 @@ #define CONFIG_ZYNQ_SERIAL_BAUDRATE0 CONFIG_BAUDRATE #define CONFIG_ZYNQ_SERIAL_CLOCK0 50000000 -/* SCU timer address is hardcoded */ -#define CONFIG_SCUTIMER_BASEADDR 0xF8F00600 - /* Ethernet driver */ #define CONFIG_NET_MULTI #define CONFIG_ZYNQ_GEM