From patchwork Tue Mar 15 09:03:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Schocher X-Patchwork-Id: 86906 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 DC490B6F93 for ; Tue, 15 Mar 2011 20:14:16 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 03EA7280B7; Tue, 15 Mar 2011 10:14:01 +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 pKIgHdWoBmPa; Tue, 15 Mar 2011 10:14:00 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9193A280A0; Tue, 15 Mar 2011 10:13:19 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2295E28088 for ; Tue, 15 Mar 2011 10:13:11 +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 EwbqZISANggb for ; Tue, 15 Mar 2011 10:13:10 +0100 (CET) X-policyd-weight: IN_SBL_XBL_SPAMHAUS=4.35 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from pollux.denx.de (p4FF07062.dip.t-dialin.net [79.240.112.98]) by theia.denx.de (Postfix) with ESMTP id 91C4B28094 for ; Tue, 15 Mar 2011 10:13:09 +0100 (CET) Received: by pollux.denx.de (Postfix, from userid 515) id A03581863382A; Tue, 15 Mar 2011 10:04:16 +0100 (CET) From: Heiko Schocher To: u-boot@lists.denx.de Date: Tue, 15 Mar 2011 10:03:44 +0100 Message-Id: <1300179844-8951-2-git-send-email-hs@denx.de> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1300179844-8951-1-git-send-email-hs@denx.de> References: <1299591018-8944-1-git-send-email-hs@denx.de> <1300179844-8951-1-git-send-email-hs@denx.de> In-Reply-To: <1299591018-8944-1-git-send-email-hs@denx.de> References: <1299591018-8944-1-git-send-email-hs@denx.de> Cc: Valentin Longchamp , Heiko Schocher , Holger Brunck Subject: [U-Boot] [PATCH v2 01/21] arm, keymile: rename MACH_SUEN3 to MACH_KM_KIRKWOOD 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: Holger Brunck The MACH_TYPE SUEN3 is now to specific for keymile boards, because other boards similar to suen3 will follow. So the MACH_SUEN3 was renamed to MACH_KM_KIRKWOOD. Signed-off-by: Holger Brunck Signed-off-by: Heiko Schocher cc: Wolfgang Denk cc: Valentin Longchamp --- Changes for v2: - new patch in v2, first patch of v1 serie was split up board/keymile/common/common.c | 4 ++-- board/keymile/km_arm/km_arm.c | 2 +- include/configs/km_arm.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 7b4eefd..86be9c2 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -500,7 +500,7 @@ void i2c_init_board(void) out_8 (&dev->cr, (I2C_CR_MEN)); #else -#if defined(CONFIG_HARD_I2C) && !defined(CONFIG_MACH_SUEN3) +#if defined(CONFIG_HARD_I2C) && !defined(MACH_TYPE_KM_KIRKWOOD) volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR ; volatile i2c8260_t *i2c = (i2c8260_t *)&immap->im_i2c; @@ -578,7 +578,7 @@ int fdt_get_node_and_value (void *blob, } #endif -#if !defined(CONFIG_MACH_SUEN3) +#if !defined(MACH_TYPE_KM_KIRKWOOD) int ethernet_present (void) { return (in_8((u8 *)CONFIG_SYS_PIGGY_BASE + CONFIG_SYS_SLOT_ID_OFF) & 0x80); diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index 2e20644..5c1e822 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -180,7 +180,7 @@ int board_init(void) /* * arch number of board */ - gd->bd->bi_arch_number = MACH_TYPE_SUEN3; + gd->bd->bi_arch_number = MACH_TYPE_KM_KIRKWOOD; /* address of boot parameters */ gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100; diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h index bf77cc0..533da73 100644 --- a/include/configs/km_arm.h +++ b/include/configs/km_arm.h @@ -38,7 +38,7 @@ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ #define CONFIG_KIRKWOOD /* SOC Family Name */ #define CONFIG_KW88F6281 /* SOC Name */ -#define CONFIG_MACH_SUEN3 /* Machine type */ +#define CONFIG_MACH_KM_KIRKWOOD /* Machine type */ /* include common defines/options for all Keymile boards */ #include "keymile-common.h"