From patchwork Tue Jul 12 11:24:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 104346 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 2E300B6F6F for ; Tue, 12 Jul 2011 21:31:30 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1A9462808A; Tue, 12 Jul 2011 13:31:28 +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 HkpX0L6kWXw1; Tue, 12 Jul 2011 13:31:27 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A4F542808B; Tue, 12 Jul 2011 13:31:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8E4002808D for ; Tue, 12 Jul 2011 13:31:24 +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 Rz6ZAh7w3LPT for ; Tue, 12 Jul 2011 13:31:23 +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.df.lth.se (mail.df.lth.se [194.47.250.12]) by theia.denx.de (Postfix) with ESMTPS id C086328080 for ; Tue, 12 Jul 2011 13:31:22 +0200 (CEST) Received: from localhost.localdomain (78-73-45-70-no184.tbcn.telia.com [78.73.45.70]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.df.lth.se (Postfix) with ESMTPSA id 5A4CA65D6C; Tue, 12 Jul 2011 13:24:11 +0200 (CEST) From: Linus Walleij To: Wolfgang Denk , u-boot@lists.denx.de Date: Tue, 12 Jul 2011 13:24:09 +0200 Message-Id: <1310469849-12908-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.7.6 Subject: [U-Boot] [PATCH 2/4] integratorap: support relocation 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: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de The integrator board was apparently never converted over to support relocation until now. After this the integrator u-boot both compiles and boots on the Integrator AP. Signed-off-by: Linus Walleij --- board/armltd/integrator/integrator.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c index 9bb56b5..a0d8de7 100644 --- a/board/armltd/integrator/integrator.c +++ b/board/armltd/integrator/integrator.c @@ -86,14 +86,16 @@ int misc_init_r (void) return (0); } -/****************************** - Routine: - Description: -******************************/ -int dram_init (void) +void dram_init_banksize(void) { gd->bd->bi_dram[0].start = PHYS_SDRAM_1; - gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; + gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; +} + +int dram_init (void) +{ + gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, + PHYS_SDRAM_1_SIZE); #ifdef CONFIG_CM_SPD_DETECT {