From patchwork Tue Jun 7 08:48:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Benard X-Patchwork-Id: 99098 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 288E6B6FA8 for ; Tue, 7 Jun 2011 18:49:10 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9AB1B281D3; Tue, 7 Jun 2011 10:48: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 Sz20pkwn2ZAi; Tue, 7 Jun 2011 10:48:55 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 00B73281D5; Tue, 7 Jun 2011 10:48:41 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A3D7028170 for ; Tue, 7 Jun 2011 10:48:37 +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 fRGe7QK89nfD for ; Tue, 7 Jun 2011 10:48:36 +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 64.mail-out.ovh.net (64.mail-out.ovh.net [91.121.185.65]) by theia.denx.de (Postfix) with SMTP id B05A128184 for ; Tue, 7 Jun 2011 10:48:33 +0200 (CEST) Received: (qmail 10429 invoked by uid 503); 7 Jun 2011 08:15:37 -0000 Received: from b7.ovh.net (HELO mail31.ha.ovh.net) (213.186.33.57) by 64.mail-out.ovh.net with SMTP; 7 Jun 2011 08:15:37 -0000 Received: from b0.ovh.net (HELO queueout) (213.186.33.50) by b0.ovh.net with SMTP; 7 Jun 2011 10:48:33 +0200 Received: from pac33-2-82-240-38-71.fbx.proxad.net (HELO i1720eb.lan) (ebenard%eukrea.com@82.240.38.71) by ns0.ovh.net with SMTP; 7 Jun 2011 10:48:31 +0200 From: =?UTF-8?q?Eric=20B=C3=A9nard?= To: u-boot@lists.denx.de Date: Tue, 7 Jun 2011 10:48:29 +0200 Message-Id: <1307436509-24126-4-git-send-email-eric@eukrea.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1307436509-24126-1-git-send-email-eric@eukrea.com> References: <1307436509-24126-1-git-send-email-eric@eukrea.com> MIME-Version: 1.0 X-Ovh-Tracer-Id: 16563957954677026077 X-Ovh-Remote: 82.240.38.71 (pac33-2-82-240-38-71.fbx.proxad.net) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-Spam-Check: DONE|U 0.5/N Subject: [U-Boot] [PATCH v2 4/4] cpuat91: fix board support 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 Signed-off-by: Eric Bénard --- MAKEALL | 1 - board/eukrea/cpuat91/cpuat91.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/MAKEALL b/MAKEALL index 13dde6f..50c0080 100755 --- a/MAKEALL +++ b/MAKEALL @@ -454,7 +454,6 @@ LIST_at91="$(boards_by_soc at91)\ at91sam9g20ek \ at91sam9m10g45ek \ at91sam9rlek \ - CPUAT91 \ pm9g45 \ SBC35_A9G20 \ TNY_A9260 \ diff --git a/board/eukrea/cpuat91/cpuat91.c b/board/eukrea/cpuat91/cpuat91.c index 4c4dad6..fa4b25b 100644 --- a/board/eukrea/cpuat91/cpuat91.c +++ b/board/eukrea/cpuat91/cpuat91.c @@ -63,7 +63,7 @@ int dram_init(void) #ifdef CONFIG_DRIVER_AT91EMAC int board_eth_init(bd_t *bis) { - return at91emac_register(bis, (u32) AT91_EMAC_BASE); + return at91emac_register(bis, (u32) ATMEL_BASE_EMAC); } #endif @@ -71,8 +71,8 @@ int board_eth_init(bd_t *bis) void i2c_init_board(void) { u32 pin; - at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; - at91_pio_t *pio = (at91_pio_t *) AT91_PIO_BASE; + at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC; + at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIO; writel(1 << AT91_ID_PIOA, &pmc->pcer); pin = AT91_PMX_AA_TWD | AT91_PMX_AA_TWCK;