From patchwork Tue Jul 26 21:19:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: u-boot@lakedaemon.net X-Patchwork-Id: 106942 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 C9BA0B6F8B for ; Wed, 27 Jul 2011 07:20:19 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2C49528178; Tue, 26 Jul 2011 23:20:04 +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 ig-lQSNdAyye; Tue, 26 Jul 2011 23:20:03 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 84DD42817A; Tue, 26 Jul 2011 23:19:46 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 999D128166 for ; Tue, 26 Jul 2011 23:19:43 +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 fUJp56COqapp for ; Tue, 26 Jul 2011 23:19:42 +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 mho-01-ewr.mailhop.org (mho-03-ewr.mailhop.org [204.13.248.66]) by theia.denx.de (Postfix) with ESMTPS id 3CD1F28169 for ; Tue, 26 Jul 2011 23:19:40 +0200 (CEST) Received: from pool-173-50-93-240.nrflva.fios.verizon.net ([173.50.93.240] helo=titan) by mho-01-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1Qlp2Q-000Ftp-3r; Tue, 26 Jul 2011 21:19:38 +0000 Received: from localhost.localdomain (triton.lakedaemon.net [10.16.5.97]) by titan (Postfix) with ESMTP id A926F2857B1; Tue, 26 Jul 2011 17:19:32 -0400 (EDT) X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 173.50.93.240 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+Z655MYUF2AF6Ti+cwTi+qpcDMzqqhdPE= From: Jason Cooper To: clint@debian.org, wd@denx.de, prafulla@marvell.com Date: Tue, 26 Jul 2011 21:19:26 +0000 Message-Id: <1311715171-13128-5-git-send-email-u-boot@lakedaemon.net> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <05ec95501d6c02ffeb1bc38d09fdca99142956a3.1307979826.git.u-boot@lakedaemon.net> References: <05ec95501d6c02ffeb1bc38d09fdca99142956a3.1307979826.git.u-boot@lakedaemon.net> In-Reply-To: <1311714350-12454-1-git-send-email-u-boot@lakedaemon.net> Cc: bdale@gag.com, u-boot@lists.denx.de, akarkare@marvell.com, gores@marvell.com, sarnaik@marvell.com Subject: [U-Boot] RFC [PATCH 5/5 v5] dreamplug: use MACH_TYPE_DREAMPLUG 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 Signed-off-by: Jason Cooper --- board/Marvell/dreamplug/dreamplug.c | 7 ++----- include/configs/dreamplug.h | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c index cdc094a..f848db7 100644 --- a/board/Marvell/dreamplug/dreamplug.c +++ b/board/Marvell/dreamplug/dreamplug.c @@ -104,11 +104,8 @@ int board_early_init_f(void) int board_init(void) { - /* - * arch number of board - * XXX: change to MACH_TYPE_DREAMPLUG once in Linux mainline. - */ - gd->bd->bi_arch_number = MACH_TYPE_GURUPLUG; + /* arch number of board */ + gd->bd->bi_arch_number = MACH_TYPE_DREAMPLUG; /* adress of boot parameters */ gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100; diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 2a908f4..4be2e59 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -39,7 +39,7 @@ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ #define CONFIG_KIRKWOOD 1 /* SOC Family Name */ #define CONFIG_KW88F6281 1 /* SOC Name */ -#define CONFIG_MACH_GURUPLUG /* Machine type */ +#define CONFIG_MACH_DREAMPLUG /* Machine type */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ /*