From patchwork Fri Jul 15 09:16:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Torsten Koschorrek X-Patchwork-Id: 104777 X-Patchwork-Delegate: sbabic@denx.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 24059B6F18 for ; Fri, 15 Jul 2011 19:29:34 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 999C7280E0; Fri, 15 Jul 2011 11:29:32 +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 mIc5DcpxLfMp; Fri, 15 Jul 2011 11:29:32 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BB286280C3; Fri, 15 Jul 2011 11:29:30 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B62B5280C3 for ; Fri, 15 Jul 2011 11:29: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 zE13gIkLHlHS for ; Fri, 15 Jul 2011 11:29:26 +0200 (CEST) X-Greylist: delayed 455 seconds by postgrey-1.27 at theia; Fri, 15 Jul 2011 11:29:26 CEST Received: from mout-bounce.kundenserver.de (mout-bounce.kundenserver.de [212.227.15.21]) by theia.denx.de (Postfix) with ESMTP id D3E1128093 for ; Fri, 15 Jul 2011 11:29:26 +0200 (CEST) Received: from localhost.localdomain (p578becea.dip0.t-ipconnect.de [87.139.236.234]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0Lmufk-1ROi1a12NA-00hATH; Fri, 15 Jul 2011 11:16:46 +0200 From: 'Torsten Koschorrek , '@theia.denx.de To: u-boot@lists.denx.de Date: Fri, 15 Jul 2011 11:16:51 +0200 Message-Id: <1310721411-9715-1-git-send-email-koschorrek@synertronixx.de> X-Mailer: git-send-email 1.7.5.4 X-Provags-ID: V02:K0:irgH0MlE09Twp0g9B4wCPE0WxL7BZNjDzMOdHyB1NdM 9CLlYCICcwLa9aFMl3uedKtelzy1XYBp5YqDFG1GjSSsye5VnZ r3UkTSYlveVCniRTmI7lN0lZwBnFVKuphNwwwonQUlmcSqMO3H jo5iXCCpva2xEDvAwuDEBn4M5XSvdH/i1PcvV0okWha24n6T4L FPGED9A7AQrTSnhVIiQuJdgHNKgjW4GaxV9z/EIjAA= Subject: [U-Boot] [PATCH v4] scb9328: Add ARM relocation 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: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Torsten Koschorrek This patch fixes compiler errors due to missing definitions of CONFIG_SYS_SDRAM_BASE and CONFIG_SYS_INIT_SP_ADDR. It also does some cleanup: CONFIG_SYS_TEXT_BASE was moved to scb9328.h, obsolete config.mk was removed. The scb9328 board has 1 DRAM bank, so don't ask for more banks. CONFIG_NR_DRAM_BANKS will ever be 1. Signed-off-by: Torsten Koschorrek --- Changes in v2: - config.mk removed - cleanups in dram_init_banksize() Changes in v3: - checkpatch errors fixed Changes in v4: - patch send with git send-email board/scb9328/config.mk | 10 ---------- board/scb9328/scb9328.c | 24 +++++++++--------------- include/configs/scb9328.h | 5 +++++ 3 files changed, 14 insertions(+), 25 deletions(-) delete mode 100644 board/scb9328/config.mk diff --git a/board/scb9328/config.mk b/board/scb9328/config.mk deleted file mode 100644 index 7c5e067..0000000 --- a/board/scb9328/config.mk +++ /dev/null @@ -1,10 +0,0 @@ -# -# This config file is used for compilation of scb93328 sources -# -# You might change location of U-Boot in memory by setting right CONFIG_SYS_TEXT_BASE. -# This allows for example having one copy located at the end of ram and stored -# in flash device and later on while developing use other location to test -# the code in RAM device only. -# - -CONFIG_SYS_TEXT_BASE = 0x08f00000 diff --git a/board/scb9328/scb9328.c b/board/scb9328/scb9328.c index 428e8c9..2e31e8c 100644 --- a/board/scb9328/scb9328.c +++ b/board/scb9328/scb9328.c @@ -39,23 +39,17 @@ int board_init (void) int dram_init (void) { -#if ( CONFIG_NR_DRAM_BANKS > 0 ) + /* dram_init must store complete ramsize in gd->ram_size */ + gd->ram_size = get_ram_size((volatile void *)SCB9328_SDRAM_1, + SCB9328_SDRAM_1_SIZE); + + return 0; +} + +void dram_init_banksize(void) +{ gd->bd->bi_dram[0].start = SCB9328_SDRAM_1; gd->bd->bi_dram[0].size = SCB9328_SDRAM_1_SIZE; -#endif -#if ( CONFIG_NR_DRAM_BANKS > 1 ) - gd->bd->bi_dram[1].start = SCB9328_SDRAM_2; - gd->bd->bi_dram[1].size = SCB9328_SDRAM_2_SIZE; -#endif -#if ( CONFIG_NR_DRAM_BANKS > 2 ) - gd->bd->bi_dram[2].start = SCB9328_SDRAM_3; - gd->bd->bi_dram[2].size = SCB9328_SDRAM_3_SIZE; -#endif -#if ( CONFIG_NR_DRAM_BANKS > 3 ) - gd->bd->bi_dram[3].start = SCB9328_SDRAM_4; - gd->bd->bi_dram[3].size = SCB9328_SDRAM_4_SIZE; -#endif - return 0; } /** diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h index 6a92ec3..1b5d931 100644 --- a/include/configs/scb9328.h +++ b/include/configs/scb9328.h @@ -126,6 +126,11 @@ #define SCB9328_SDRAM_1 0x08000000 /* SDRAM bank #1 */ #define SCB9328_SDRAM_1_SIZE 0x01000000 /* 16 MB */ +#define CONFIG_SYS_TEXT_BASE 0x10000000 + +#define CONFIG_SYS_SDRAM_BASE SCB9328_SDRAM_1 +#define CONFIG_SYS_INIT_SP_ADDR (SCB9328_SDRAM_1 + 0xf00000) + /* * Configuration for FLASH memory for the Synertronixx board */