From patchwork Fri Nov 4 08:47:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ceresoli X-Patchwork-Id: 123575 X-Patchwork-Delegate: s-paulraj@ti.com 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 C194BB6F91 for ; Fri, 4 Nov 2011 19:47:55 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3F01729604; Fri, 4 Nov 2011 09:47:52 +0100 (CET) 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 sxCSEXb56mE8; Fri, 4 Nov 2011 09:47:52 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A2B5C29606; Fri, 4 Nov 2011 09:47:50 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8FB5229606 for ; Fri, 4 Nov 2011 09:47:48 +0100 (CET) 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 V5n8bYTggj-S for ; Fri, 4 Nov 2011 09:47:48 +0100 (CET) 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 relayer.comelit.it (mail.comelit.it [213.149.219.85]) by theia.denx.de (Postfix) with ESMTP id CA0B729604 for ; Fri, 4 Nov 2011 09:47:46 +0100 (CET) Received: from wallace.comelit.it ([172.20.0.36]) by relayer.comelit.it with Microsoft SMTPSVC(6.0.3790.1830); Fri, 4 Nov 2011 09:47:45 +0100 From: Luca Ceresoli To: s-paulraj@ti.com Date: Fri, 4 Nov 2011 09:47:40 +0100 Message-Id: <1320396460-5234-1-git-send-email-luca.ceresoli@comelit.it> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1320226830-18245-1-git-send-email-luca.ceresoli@comelit.it> References: <1320226830-18245-1-git-send-email-luca.ceresoli@comelit.it> X-OriginalArrivalTime: 04 Nov 2011 08:47:45.0348 (UTC) FILETIME=[6C0AA840:01CC9ACE] Cc: u-boot@lists.denx.de, Luca Ceresoli Subject: [U-Boot] [PATCH v2] ARM: dig297: Define MACH_TYPE_OMAP3_CPS and CONFIG_MACH_TYPE 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 MACH_TYPE_OMAP3_CPS was dropped in the latest mach-types sync (47af6f61bcd9) because it is not mainlined in Linux. Signed-off-by: Luca Ceresoli Cc: Sandeep Paulraj Cc: Albert Aribaud Cc: Wolfgang Denk CC: Tom Rini --- Changed in v2: squashed the two previously separated patches as requested by Tom Rini. board/comelit/dig297/dig297.c | 2 -- include/configs/dig297.h | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/board/comelit/dig297/dig297.c b/board/comelit/dig297/dig297.c index c81ce58..6548281 100644 --- a/board/comelit/dig297/dig297.c +++ b/board/comelit/dig297/dig297.c @@ -91,8 +91,6 @@ static const u32 gpmc_lan_config[] = { int board_init(void) { gpmc_init(); /* in SRAM or SDRAM, finish GPMC */ - /* board id for Linux */ - gd->bd->bi_arch_number = MACH_TYPE_OMAP3_CPS; /* boot param addr */ gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100); diff --git a/include/configs/dig297.h b/include/configs/dig297.h index 3a05c82..9baf415 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -32,6 +32,14 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include +#ifdef MACH_TYPE_OMAP3_CPS +#error "MACH_TYPE_OMAP3_CPS has been defined properly, please remove this." +#else +#define MACH_TYPE_OMAP3_CPS 2751 +#endif +#define CONFIG_MACH_TYPE MACH_TYPE_OMAP3_CPS + /* * High Level Configuration Options */