From patchwork Tue May 3 14:13:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentin Longchamp X-Patchwork-Id: 93799 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 63FE2B6EED for ; Wed, 4 May 2011 00:14:05 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8B8B42813F; Tue, 3 May 2011 16:13:48 +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 a2XCXjLz9MYD; Tue, 3 May 2011 16:13:48 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 901F628148; Tue, 3 May 2011 16:13:36 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5D66028135 for ; Tue, 3 May 2011 16:13:34 +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 XrX1lpxJvnXW for ; Tue, 3 May 2011 16:13:33 +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.ch.keymile.com (mail.ch.keymile.com [193.17.201.103]) by theia.denx.de (Postfix) with SMTP id 6413D28129 for ; Tue, 3 May 2011 16:13:27 +0200 (CEST) Received: from SRVCHBER1212.ch.keymile.net ([172.31.32.9]) by eSafe SMTP Relay 1297237168; Tue, 03 May 2011 16:01:16 +0100 Received: from localhost.localdomain ([172.31.32.134]) by SRVCHBER1212.ch.keymile.net with Microsoft SMTPSVC(6.0.3790.4675); Tue, 3 May 2011 16:13:26 +0200 From: Valentin Longchamp To: u-boot@lists.denx.de Date: Tue, 3 May 2011 16:13:10 +0200 Message-Id: <1304431996-24058-3-git-send-email-valentin.longchamp@keymile.com> X-Mailer: git-send-email 1.7.0.5 In-Reply-To: <1304431996-24058-1-git-send-email-valentin.longchamp@keymile.com> References: <1304431996-24058-1-git-send-email-valentin.longchamp@keymile.com> X-OriginalArrivalTime: 03 May 2011 14:13:26.0411 (UTC) FILETIME=[45007DB0:01CC099C] X-ESAFE-STATUS: Mail allowed X-ESAFE-DETAILS: Cc: Valentin Longchamp , Detlev@theia.denx.de, holger.brunck@keymile.com Subject: [U-Boot] [PATCH v2 2/8] arm/km: remove last_stage_init and unneeded printouts 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 last_stage_init is not available for arm platforms. So move the calls to set_km_var and set_bootcount_addr to misc_init_r and remove this function. Additionally some unneeded printouts were removed. Signed-off-by: Valentin Longchamp Signed-off-by: Holger Brunck Acked-by: Heiko Schocher cc: Prafulla Wadaskar cc: Wolfgang Denk cc: Detlev Zundel --- Changes for v2: - split up first large patch series to three independent smaller patch series board/keymile/km_arm/km_arm.c | 20 ++++---------------- 1 files changed, 4 insertions(+), 16 deletions(-) diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index f147f1f..4049a4e 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -161,11 +161,6 @@ int misc_init_r(void) char *str; int mach_type; - puts("Piggy:"); - if (ethernet_present() == 0) - puts (" not"); - puts(" present\n"); - str = getenv("mach_type"); if (str != NULL) { mach_type = simple_strtoul(str, NULL, 10); @@ -174,7 +169,10 @@ int misc_init_r(void) } initialize_unit_leds(); - + set_km_env(); +#if defined(CONFIG_BOOTCOUNT_LIMIT) + set_bootcount_addr(); +#endif return 0; } @@ -193,7 +191,6 @@ int board_early_init_f(void) writel(tmp | FLASH_GPIO_PIN , KW_GPIO0_BASE); tmp = readl(KW_GPIO0_BASE + 4); writel(tmp & (~FLASH_GPIO_PIN) , KW_GPIO0_BASE + 4); - printf("KM: setting NAND mode\n"); #if defined(CONFIG_SOFT_I2C) /* init the GPIO for I2C Bitbang driver */ @@ -223,15 +220,6 @@ int board_init(void) return 0; } -int last_stage_init(void) -{ - set_km_env(); -#if defined(CONFIG_BOOTCOUNT_LIMIT) - set_bootcount_addr(); -#endif - return 0; -} - #if defined(CONFIG_CMD_SF) int do_spi_toggle(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) {