From patchwork Fri Feb 11 08:11:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_Bie=C3=9Fmann?= X-Patchwork-Id: 82721 X-Patchwork-Delegate: info@emk-elektronik.de 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 BBC9FB7159 for ; Fri, 11 Feb 2011 19:11:32 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B4D78282D0; Fri, 11 Feb 2011 09:11:30 +0100 (CET) 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 TsKolVl0aMo0; Fri, 11 Feb 2011 09:11:30 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5E1E7282D6; Fri, 11 Feb 2011 09:11:28 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 17FD1282D6 for ; Fri, 11 Feb 2011 09:11:26 +0100 (CET) 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 yJYYB5IKPH4b for ; Fri, 11 Feb 2011 09:11:24 +0100 (CET) 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-bw0-f44.google.com (mail-bw0-f44.google.com [209.85.214.44]) by theia.denx.de (Postfix) with ESMTPS id 08C4B282D0 for ; Fri, 11 Feb 2011 09:11:22 +0100 (CET) Received: by bwz12 with SMTP id 12so3186879bwz.3 for ; Fri, 11 Feb 2011 00:11:21 -0800 (PST) Received: by 10.204.80.161 with SMTP id t33mr11835110bkk.121.1297411881574; Fri, 11 Feb 2011 00:11:21 -0800 (PST) Received: from [192.168.125.185] (dslb-092-075-113-200.pools.arcor-ip.net [92.75.113.200]) by mx.google.com with ESMTPS id f20sm269521bkf.16.2011.02.11.00.11.19 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 11 Feb 2011 00:11:20 -0800 (PST) Mime-Version: 1.0 (Apple Message framework v1082) From: =?iso-8859-1?Q?Andreas_Bie=DFmann?= In-Reply-To: <4D543D18.9050207@scharsoft.de> Date: Fri, 11 Feb 2011 09:11:18 +0100 Message-Id: <1DBE7A7C-2E1C-478A-A68F-CBA90EE629E4@googlemail.com> References: <4D543D18.9050207@scharsoft.de> To: Jens Scharsig X-Mailer: Apple Mail (2.1082) Cc: U-Boot List Subject: Re: [U-Boot] [PATCH ATMEL REWORK] update arm/at91rm9200 work with rework rework110202 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: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Dear Jens Scharsig, Am 10.02.2011 um 20:31 schrieb Jens Scharsig: > * update arm920t/at91 to ATMEL_xxx name scheme > * convert at91rm9200ek and eb_cpux9k2 board to ATMEL_xxx name scheme > * update arm920t/at91 soc lib > * update at91_emac driver > > Signed-off-by: Jens Scharsig Tested-by: Andreas Bießmann But some changes > --- > > The eb_cpux9k2 board can compile and runs after patch changes > The at91rm9200ek can compile, but i have no hardware to test it. at91rm9200ek is working but the change for timer.c is needed Testet peripheral for at91rm9200ek is: - USB (fatls) - EMAC (tftp) > arch/arm/cpu/arm920t/at91/reset.c | 2 +- > arch/arm/cpu/arm920t/at91/timer.c | 10 +- > arch/arm/include/asm/arch-at91/at91_mc.h | 12 +- > arch/arm/include/asm/arch-at91/at91_pmc.h | 10 +- > arch/arm/include/asm/arch-at91/at91rm9200.h | 209 ++++++++++++++------------- > board/BuS/eb_cpux9k2/cpux9k2.c | 52 ++++---- > board/atmel/at91rm9200ek/at91rm9200ek.c | 4 +- > board/atmel/at91rm9200ek/led.c | 22 ++-- > drivers/net/at91_emac.c | 32 ++-- > include/configs/at91rm9200ek.h | 2 +- > include/configs/eb_cpux9k2.h | 29 +++-- > 11 files changed, 201 insertions(+), 183 deletions(-) [reset.c is OK] Please add: [other changes to timer.c are OK] [at91_mc.h is OK] [at91_pmc.h is OK] > diff --git a/arch/arm/include/asm/arch-at91/at91rm9200.h b/arch/arm/include/asm/arch-at91/at91rm9200.h > index 1bee6f2..58f0e39 100644 > --- a/arch/arm/include/asm/arch-at91/at91rm9200.h > +++ b/arch/arm/include/asm/arch-at91/at91rm9200.h > @@ -21,115 +21,126 @@ > #ifndef __AT91RM9200_H__ > #define __AT91RM9200_H__ > > +#define CONFIG_AT91FAMILY /* it's a member of AT91 */ > +#define CONFIG_ARM920T /* This is an ARM920T Core */ > + These are defined in board header .. I saw they are defined also in other at91xxx.h files, we should discuss where to define these since all of the at91xx.h files are included by hardware.h > /* Periperial Identifiers */ [snip changes to at91rm9200.h which are obviously OK] > +#define ATMEL_PIO_PORTS 4 /* theese SoCs have 3 PIO */ 3 or 4 PIO? > +#define ATMEL_PMC_UHP AT91RM9200_PMC_UHP > + > +#define CONFIG_SYS_ATMEL_CPU_NAME "AT91RM9200" > > #endif [cpux9k2.c is OK] [at91rm9200ek.c is OK] [at91rm9200ek/led.c is OK] [at91_emac.c is OK] [at91rm9200ek.h is OK] > --- a/include/configs/eb_cpux9k2.h > +++ b/include/configs/eb_cpux9k2.h > @@ -29,12 +29,13 @@ > > /*--------------------------------------------------------------------------*/ > > -#define CONFIG_ARM920T 1 /* This is an ARM920T Core */ > -#define CONFIG_AT91RM9200 1 /* It's an Atmel AT91RM9200 SoC */ > -#define CONFIG_EB_CPUX9K2 1 /* on an EP+CPUX9K2 Board */ > -#define USE_920T_MMU 1 > +#define CONFIG_ARM920T /* This is an ARM920T Core */ > +#define CONFIG_AT91FAMILY > +#define CONFIG_AT91RM9200 /* It's an Atmel AT91RM9200 SoC */ > +#define CONFIG_EB_CPUX9K2 /* on an EP+CPUX9K2 Board */ > +#define USE_920T_MMU > > -#define CONFIG_VERSION_VARIABLE 1 > +#define CONFIG_VERSION_VARIABLE > #define CONFIG_IDENT_STRING " on EB+CPUx9K2" > > #include /* needed for port definitions */ > @@ -186,8 +187,12 @@ > #define CONFIG_NET_RETRY_COUNT 10 > #define CONFIG_RESET_PHY_R 1 > > + please remove this additional empty line > #define CONFIG_DRIVER_AT91EMAC 1 > #define CONFIG_DRIVER_AT91EMAC_QUIET 1 > +/* > +#define CONFIG_DRIVER_MACB 1 > +*/ why this? Either it is needed or not. > #define CONFIG_SYS_RX_ETH_BUFFER 8 > #define CONFIG_MII 1 > > @@ -217,19 +222,19 @@ > #define CONFIG_SYS_I2C_INIT_BOARD > > #define I2C_INIT i2c_init_board(); > -#define I2C_ACTIVE writel(AT91_PMX_AA_TWD, &pio->pioa.mddr); > -#define I2C_TRISTATE writel(AT91_PMX_AA_TWD, &pio->pioa.mder); > -#define I2C_READ ((readl(&pio->pioa.pdsr) & AT91_PMX_AA_TWD) != 0) > +#define I2C_ACTIVE writel(ATMEL_PMX_AA_TWD, &pio->pioa.mddr); > +#define I2C_TRISTATE writel(ATMEL_PMX_AA_TWD, &pio->pioa.mder); > +#define I2C_READ ((readl(&pio->pioa.pdsr) & ATMEL_PMX_AA_TWD) != 0) > #define I2C_SDA(bit) \ > if (bit) \ > - writel(AT91_PMX_AA_TWD, &pio->pioa.sodr); \ > + writel(ATMEL_PMX_AA_TWD, &pio->pioa.sodr); \ > else \ > - writel(AT91_PMX_AA_TWD, &pio->pioa.codr); > + writel(ATMEL_PMX_AA_TWD, &pio->pioa.codr); > #define I2C_SCL(bit) \ > if (bit) \ > - writel(AT91_PMX_AA_TWCK, &pio->pioa.sodr); \ > + writel(ATMEL_PMX_AA_TWCK, &pio->pioa.sodr); \ > else \ > - writel(AT91_PMX_AA_TWCK, &pio->pioa.codr); > + writel(ATMEL_PMX_AA_TWCK, &pio->pioa.codr); > > #define I2C_DELAY udelay(2500000/CONFIG_SYS_I2C_SPEED) > > -- > 1.7.1 > diff --git a/arch/arm/cpu/arm920t/at91/timer.c b/arch/arm/cpu/arm920t/at91/timer.c index e2630b8..f0ad7d6 100644 --- a/arch/arm/cpu/arm920t/at91/timer.c +++ b/arch/arm/cpu/arm920t/at91/timer.c @@ -32,7 +32,7 @@ #include -#include +#include #include #include #include