From patchwork Wed Aug 15 21:30:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 177834 X-Patchwork-Delegate: trini@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 763902C007F for ; Thu, 16 Aug 2012 07:32:38 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E108228258; Wed, 15 Aug 2012 23:32:16 +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 U9RgBB5Vh-na; Wed, 15 Aug 2012 23:32:16 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0AE8128211; Wed, 15 Aug 2012 23:31:35 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8B48628123 for ; Wed, 15 Aug 2012 23:31:22 +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 oUa+0IIxkJPG for ; Wed, 15 Aug 2012 23:31:22 +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-pb0-f44.google.com (mail-pb0-f44.google.com [209.85.160.44]) by theia.denx.de (Postfix) with ESMTPS id 90A00281E3 for ; Wed, 15 Aug 2012 23:31:08 +0200 (CEST) Received: by mail-pb0-f44.google.com with SMTP id rr4so473074pbb.3 for ; Wed, 15 Aug 2012 14:31:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=Vr06s9LoITJtuAPwEmjR0l3VH1zxM0AqInNFfIgNU00=; b=PBHdoGS9XRDsNbRLP8piekYBqmNST2aPpRLIrDvHfzcbNCTpVKerxeXN5YCi1MI8lc aL5HyzE9SKAJ1yFNAZBbZQo1zxapLCdq3aJrvyO92xXeq4oAtbr4SvHieNyIcIN2Y54c tRiIW0onKTiUBnN2xEI6Wr9fA9K2GvtVCgks4QZTf1g3lrCfj9dpn+UwAFUixCLRt2k3 tMjZZyJKUUk4D672cESqplwZaGjMMAJPiz/A0RXR1hHfqmxRbWRKEHucCe7fza9mPV01 XNf9BrSY5c00+MvyeJxjReIFLadd/tGOyt5PjZO52UiCcEwVeRJxhFJMj9TcDOmde1cJ nlgA== Received: by 10.68.220.104 with SMTP id pv8mr42979893pbc.119.1345066268188; Wed, 15 Aug 2012 14:31:08 -0700 (PDT) Received: from localhost.localdomain (ip68-230-54-74.ph.ph.cox.net. [68.230.54.74]) by mx.google.com with ESMTPS id kp3sm1128717pbc.64.2012.08.15.14.31.06 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Aug 2012 14:31:07 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Wed, 15 Aug 2012 14:30:51 -0700 Message-Id: <1345066254-6911-15-git-send-email-trini@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1345066254-6911-1-git-send-email-trini@ti.com> References: <1345066254-6911-1-git-send-email-trini@ti.com> Cc: Sudhakar Rajashekhara , Heiko Schocher , Christian Riesch Subject: [U-Boot] [PATCH 14/17] ARM: SPL: Move gpmc_init() to spl_board_init() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 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 This is an OMAP/related-specific function, move calling it to spl_board_init() and turn on CONFIG_SPL_BOARD_INIT on the boards that enabled NAND and didn't enable this already. Signed-off-by: Tom Rini --- arch/arm/cpu/armv7/omap-common/boot-common.c | 7 +++++++ arch/arm/cpu/armv7/omap3/board.c | 3 +++ arch/arm/lib/spl_nand.c | 1 - include/configs/am3517_crane.h | 1 + include/configs/am3517_evm.h | 1 + include/configs/mcx.h | 1 + include/configs/tam3517-common.h | 1 + 7 files changed, 14 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c index 3406cfb..ed398fd 100644 --- a/arch/arm/cpu/armv7/omap-common/boot-common.c +++ b/arch/arm/cpu/armv7/omap-common/boot-common.c @@ -49,6 +49,13 @@ u32 spl_boot_mode(void) return omap_bootmode; } +void spl_board_init(void) +{ +#ifdef CONFIG_SPL_NAND_SUPPORT + gpmc_init(); +#endif +} + int board_mmc_init(bd_t *bis) { switch (spl_boot_device()) { diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c index 3d74f09..52196c8 100644 --- a/arch/arm/cpu/armv7/omap3/board.c +++ b/arch/arm/cpu/armv7/omap3/board.c @@ -106,6 +106,9 @@ int board_mmc_init(bd_t *bis) void spl_board_init(void) { +#ifdef CONFIG_SPL_NAND_SUPPORT + gpmc_init(); +#endif #ifdef CONFIG_SPL_I2C_SUPPORT i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); #endif diff --git a/arch/arm/lib/spl_nand.c b/arch/arm/lib/spl_nand.c index 3e2f359..1e6b5f0 100644 --- a/arch/arm/lib/spl_nand.c +++ b/arch/arm/lib/spl_nand.c @@ -35,7 +35,6 @@ void spl_nand_load_image(void) int *dst __attribute__((unused)); debug("spl: nand - using hw ecc\n"); - gpmc_init(); nand_init(); /*use CONFIG_SYS_TEXT_BASE as temporary storage area */ diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index a5799d9..9f4c386 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -323,6 +323,7 @@ /* Defines for SPL */ #define CONFIG_SPL #define CONFIG_SPL_FRAMEWORK +#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_TEXT_BASE 0x40200800 #define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 62da56e..8f2ac89 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -322,6 +322,7 @@ /* Defines for SPL */ #define CONFIG_SPL #define CONFIG_SPL_FRAMEWORK +#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_TEXT_BASE 0x40200800 #define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */ diff --git a/include/configs/mcx.h b/include/configs/mcx.h index d91258a..4f29da6 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -310,6 +310,7 @@ /* Defines for SPL */ #define CONFIG_SPL #define CONFIG_SPL_FRAMEWORK +#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_SOFTECC diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 8646d94..bb2cb7c 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -242,6 +242,7 @@ /* Defines for SPL */ #define CONFIG_SPL #define CONFIG_SPL_FRAMEWORK +#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_CONSOLE #define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_SOFTECC