From patchwork Tue Apr 12 16:09:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clint Adams X-Patchwork-Id: 90828 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 C9763B6F1C for ; Wed, 13 Apr 2011 02:10:10 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 049E828140; Tue, 12 Apr 2011 18:10:05 +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 cvliR+aFGaE3; Tue, 12 Apr 2011 18:10:04 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6C18228151; Tue, 12 Apr 2011 18:10:01 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 974A728151 for ; Tue, 12 Apr 2011 18:10:00 +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 qLoAVcJxatMQ for ; Tue, 12 Apr 2011 18:09:59 +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 cork.scru.org (cork.scru.org [209.20.67.2]) by theia.denx.de (Postfix) with ESMTPS id 0B51928154 for ; Tue, 12 Apr 2011 18:09:55 +0200 (CEST) Received: from localhost (cpe-98-14-92-229.nyc.res.rr.com [98.14.92.229]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by cork.scru.org (Postfix) with ESMTPSA id 90BAE104028; Tue, 12 Apr 2011 16:14:53 +0000 (UTC) From: Clint Adams To: u-boot@lists.denx.de Date: Tue, 12 Apr 2011 12:09:40 -0400 Message-Id: <1302624582-26705-1-git-send-email-clint@debian.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: References: X-Virus-Scanned: clamav-milter 0.97 at cork.scru.org X-Virus-Status: Clean Cc: julian.pidancet@citrix.com Subject: [U-Boot] [PATCH 1/3] Add definitions for OpenRD-Client and OpenRD-Ultimate 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 --- MAKEALL | 2 ++ board/Marvell/openrd_base/openrd_base.c | 6 ++++++ boards.cfg | 4 +++- include/configs/openrd_base.h | 14 +++++++++++++- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/MAKEALL b/MAKEALL index e1b928f..011cead 100755 --- a/MAKEALL +++ b/MAKEALL @@ -361,6 +361,8 @@ LIST_ARM9=" \ omap5912osk \ omap730p2 \ openrd_base \ + openrd_client \ + openrd_ultimate \ rd6281a \ sbc2410x \ scb9328 \ diff --git a/board/Marvell/openrd_base/openrd_base.c b/board/Marvell/openrd_base/openrd_base.c index 10109c1..f7c63ac 100644 --- a/board/Marvell/openrd_base/openrd_base.c +++ b/board/Marvell/openrd_base/openrd_base.c @@ -110,7 +110,13 @@ int board_init(void) /* * arch number of board */ +#if defined(CONFIG_BOARD_IS_OPENRD_BASE) gd->bd->bi_arch_number = MACH_TYPE_OPENRD_BASE; +#elif defined(CONFIG_BOARD_IS_OPENRD_CLIENT) + gd->bd->bi_arch_number = MACH_TYPE_OPENRD_CLIENT; +#elif defined(CONFIG_BOARD_IS_OPENRD_ULTIMATE) + gd->bd->bi_arch_number = MACH_TYPE_OPENRD_ULTIMATE; +#endif /* adress of boot parameters */ gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100; diff --git a/boards.cfg b/boards.cfg index a45bd83..ee5d5f4 100644 --- a/boards.cfg +++ b/boards.cfg @@ -96,7 +96,9 @@ davinci_sonata arm arm926ejs sonata davinci suen3 arm arm926ejs km_arm keymile kirkwood guruplug arm arm926ejs - Marvell kirkwood mv88f6281gtw_ge arm arm926ejs - Marvell kirkwood -openrd_base arm arm926ejs - Marvell kirkwood +openrd_base arm arm926ejs openrd_base Marvell kirkwood openrd_base:BOARD_IS_OPENRD_BASE +openrd_client arm arm926ejs openrd_base Marvell kirkwood openrd_base:BOARD_IS_OPENRD_CLIENT +openrd_ultimate arm arm926ejs openrd_base Marvell kirkwood openrd_base:BOARD_IS_OPENRD_ULTIMATE rd6281a arm arm926ejs - Marvell kirkwood sheevaplug arm arm926ejs - Marvell kirkwood dockstar arm arm926ejs - Seagate kirkwood diff --git a/include/configs/openrd_base.h b/include/configs/openrd_base.h index cfdd09c..5e05890 100644 --- a/include/configs/openrd_base.h +++ b/include/configs/openrd_base.h @@ -33,7 +33,19 @@ /* * Version number information */ -#define CONFIG_IDENT_STRING "\nOpenRD_base" +#ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE +# define CONFIG_IDENT_STRING "\nOpenRD-Ultimate" +#else +# ifdef CONFIG_BOARD_IS_OPENRD_CLIENT +# define CONFIG_IDENT_STRING "\nOpenRD-Client" +# else +# ifdef CONFIG_BOARD_IS_OPENRD_BASE +# define CONFIG_IDENT_STRING "\nOpenRD-Base" +# else +# error Unknown OpenRD board specified +# endif +# endif +#endif /* * High Level Configuration Options (easy to change)