From patchwork Tue Jun 28 15:39:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 102412 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 49D1FB6F18 for ; Wed, 29 Jun 2011 01:41:15 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 343CC28152; Tue, 28 Jun 2011 17:40:44 +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 O8BbZQ60HwBI; Tue, 28 Jun 2011 17:40:43 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1FB5D2813F; Tue, 28 Jun 2011 17:40:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 41D9A280F4 for ; Tue, 28 Jun 2011 17:40: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 H0n7sB-eVB1c for ; Tue, 28 Jun 2011 17:40: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-gw0-f44.google.com (mail-gw0-f44.google.com [74.125.83.44]) by theia.denx.de (Postfix) with ESMTPS id 08A78280F1 for ; Tue, 28 Jun 2011 17:40:06 +0200 (CEST) Received: by mail-gw0-f44.google.com with SMTP id 20so128762gwb.3 for ; Tue, 28 Jun 2011 08:40:05 -0700 (PDT) Received: by 10.101.190.1 with SMTP id s1mr1952536anp.37.1309275605844; Tue, 28 Jun 2011 08:40:05 -0700 (PDT) Received: from rob-laptop.i.smooth-stone.com ([173.226.190.126]) by mx.google.com with ESMTPS id x32sm244413anx.6.2011.06.28.08.40.04 (version=SSLv3 cipher=OTHER); Tue, 28 Jun 2011 08:40:05 -0700 (PDT) From: Rob Herring To: u-boot@lists.denx.de Date: Tue, 28 Jun 2011 10:39:43 -0500 Message-Id: <1309275583-11763-7-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1309275583-11763-1-git-send-email-robherring2@gmail.com> References: <1309275583-11763-1-git-send-email-robherring2@gmail.com> Cc: Albert ARIBAUD , Rob Herring Subject: [U-Boot] [PATCH 6/6] ARM: highbank: Add AHCI 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: Rob Herring This enables the AHCI driver on highbank platforms. Signed-off-by: Rob Herring Cc: Wolfgang Denk Cc: Albert ARIBAUD --- board/highbank/highbank.c | 9 +++++++++ include/configs/highbank.h | 11 +++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c index 9a0fc19..bec3d2f 100644 --- a/board/highbank/highbank.c +++ b/board/highbank/highbank.c @@ -16,6 +16,8 @@ */ #include +#include +#include #include @@ -31,6 +33,13 @@ int board_init(void) return 0; } +int misc_init_r(void) +{ + ahci_init(0xffe08000); + scsi_scan(1); + return 0; +} + int dram_init(void) { gd->ram_size = SZ_512M; diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 6e26848..0ae198d 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -41,6 +41,15 @@ #define CONFIG_BAUDRATE 38400 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } +#define CONFIG_MISC_INIT_R +#define CONFIG_SCSI_AHCI +#define CONFIG_SYS_SCSI_MAX_SCSI_ID 5 +#define CONFIG_SYS_SCSI_MAX_LUN 1 +#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ + CONFIG_SYS_SCSI_MAX_LUN) + +#define CONFIG_DOS_PARTITION + /* * Command line configuration. */ @@ -52,6 +61,8 @@ #define CONFIG_CMD_ELF #define CONFIG_CMD_MEMORY #define CONFIG_CMD_LOADS +#define CONFIG_CMD_SCSI +#define CONFIG_CMD_EXT2 #define CONFIG_BOOTDELAY 2 /*