From patchwork Sun Oct 10 10:40:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 71860 Return-Path: X-Original-To: wd@gemini.denx.de Delivered-To: wd@gemini.denx.de Received: from diddl.denx.de (diddl.denx.de [10.0.0.6]) by gemini.denx.de (Postfix) with ESMTP id 5214714F310 for ; Sun, 10 Oct 2010 12:39:48 +0200 (CEST) Received: from diddl.denx.de (localhost.localdomain [127.0.0.1]) by diddl.denx.de (Postfix) with ESMTP id 3D7BC312DC86 for ; Sun, 10 Oct 2010 12:39:48 +0200 (CEST) Received: from pop.mnet-online.de by diddl.denx.de with POP3 (fetchmail-6.3.17) for (single-drop); Sun, 10 Oct 2010 12:39:48 +0200 (CEST) Received: from murder ([192.168.8.180]) by backend2 (Cyrus v2.2.12) with LMTPA; Sun, 10 Oct 2010 12:38:41 +0200 X-Sieve: CMU Sieve 2.2 Received: from mail.m-online.net (localhost [127.0.0.1]) by frontend1.mail.m-online.net (Cyrus v2.2.12) with LMTPA; Sun, 10 Oct 2010 12:38:41 +0200 Received: from scanner-1.m-online.net (scanner-1.mail.m-online.net [192.168.8.165]) by mail.m-online.net (Postfix) with ESMTP id 4682A1C0021F; Sun, 10 Oct 2010 12:38:41 +0200 (CEST) Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by mxin-3.m-online.net (Postfix) with ESMTP id C504C46C0A7; Sun, 10 Oct 2010 12:38:37 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3C7F528116; Sun, 10 Oct 2010 12:38:35 +0200 (CEST) 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 3kTS2JpxvJPd; Sun, 10 Oct 2010 12:38:34 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9524828138; Sun, 10 Oct 2010 12:38:28 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2F70C28115 for ; Sun, 10 Oct 2010 12:38:26 +0200 (CEST) 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 upaiigtNP2Yr for ; Sun, 10 Oct 2010 12:38:24 +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 smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by theia.denx.de (Postfix) with ESMTPS id 013D5280E1 for ; Sun, 10 Oct 2010 12:38:22 +0200 (CEST) Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 0A7B51B4115 for ; Sun, 10 Oct 2010 10:38:19 +0000 (UTC) From: Mike Frysinger To: u-boot@lists.denx.de Date: Sun, 10 Oct 2010 06:40:27 -0400 Message-Id: <1286707227-7156-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1286707060-7033-1-git-send-email-vapier@gentoo.org> References: <1286707060-7033-1-git-send-email-vapier@gentoo.org> Subject: [U-Boot] [PATCH 3/3] Blackfin: enable delayed NAND for all relevant boards 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 X-Virus-Scanned: by amavisd-new at m-online.net Now that the NAND is initialized only when used, we can enable support for it in boards that may have conflicting runtime requirements. This saves on the hassle of recompiling with different settings. Signed-off-by: Mike Frysinger --- include/configs/bf526-ezbrd.h | 7 +------ include/configs/bf527-ad7160-eval.h | 4 ---- include/configs/bf527-ezkit.h | 6 +----- include/configs/bf537-stamp.h | 2 +- include/configs/bf548-ezkit.h | 2 +- include/configs/bfin_adi_common.h | 1 + include/configs/cm-bf527.h | 11 +++++------ 7 files changed, 10 insertions(+), 23 deletions(-) diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h index 4c30c25..efa320e 100644 --- a/include/configs/bf526-ezbrd.h +++ b/include/configs/bf526-ezbrd.h @@ -58,27 +58,22 @@ /* * NAND Settings - * (can't be used same time as ethernet) */ #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND) -# define CONFIG_BFIN_NFC # define CONFIG_BFIN_NFC_BOOTROM_ECC #endif -#ifdef CONFIG_BFIN_NFC #define CONFIG_BFIN_NFC_CTL_VAL 0x0033 #define CONFIG_DRIVER_NAND_BFIN #define CONFIG_SYS_NAND_BASE 0 /* not actually used */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define NAND_MAX_CHIPS 1 -#define CONFIG_CMD_NAND -#endif /* * Network Settings */ #if !defined(__ADSPBF522__) && !defined(__ADSPBF523__) && \ - !defined(__ADSPBF524__) && !defined(__ADSPBF525__) && !defined(CONFIG_BFIN_NFC) + !defined(__ADSPBF524__) && !defined(__ADSPBF525__) #define ADI_CMDS_NETWORK 1 #define CONFIG_BFIN_MAC #define CONFIG_RMII diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h index 14ade1b..22e6502 100644 --- a/include/configs/bf527-ad7160-eval.h +++ b/include/configs/bf527-ad7160-eval.h @@ -57,19 +57,15 @@ /* * NAND Settings - * (can't be used same time as ethernet) */ #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND) -# define CONFIG_BFIN_NFC # define CONFIG_BFIN_NFC_BOOTROM_ECC #endif -#ifdef CONFIG_BFIN_NFC #define CONFIG_BFIN_NFC_CTL_VAL 0x0033 #define CONFIG_DRIVER_NAND_BFIN #define CONFIG_SYS_NAND_BASE 0 /* not actually used */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define NAND_MAX_CHIPS 1 -#endif /* diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h index 54fc063..2105468 100644 --- a/include/configs/bf527-ezkit.h +++ b/include/configs/bf527-ezkit.h @@ -57,26 +57,22 @@ /* * NAND Settings - * (can't be used same time as ethernet) */ #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND) -# define CONFIG_BFIN_NFC # define CONFIG_BFIN_NFC_BOOTROM_ECC #endif -#ifdef CONFIG_BFIN_NFC #define CONFIG_BFIN_NFC_CTL_VAL 0x0033 #define CONFIG_DRIVER_NAND_BFIN #define CONFIG_SYS_NAND_BASE 0 /* not actually used */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define NAND_MAX_CHIPS 1 -#endif /* * Network Settings */ #if !defined(__ADSPBF522__) && !defined(__ADSPBF523__) && \ - !defined(__ADSPBF524__) && !defined(__ADSPBF525__) && !defined(CONFIG_BFIN_NFC) + !defined(__ADSPBF524__) && !defined(__ADSPBF525__) #define ADI_CMDS_NETWORK 1 #define CONFIG_BFIN_MAC #define CONFIG_RMII diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index 22d3150..61f8f1a 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -145,7 +145,7 @@ /* * NAND Settings */ -/* #define CONFIG_NAND_PLAT */ +#define CONFIG_NAND_PLAT #define CONFIG_SYS_NAND_BASE 0x20212000 #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h index 4412177..c883896 100644 --- a/include/configs/bf548-ezkit.h +++ b/include/configs/bf548-ezkit.h @@ -124,10 +124,10 @@ /* * NAND Settings */ -#define CONFIG_BFIN_NFC_CTL_VAL 0x0033 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND) # define CONFIG_BFIN_NFC_BOOTROM_ECC #endif +#define CONFIG_BFIN_NFC_CTL_VAL 0x0033 #define CONFIG_DRIVER_NAND_BFIN #define CONFIG_SYS_NAND_BASE 0 /* not actually used */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 608788a..83597ec 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -48,6 +48,7 @@ # if defined(CONFIG_NAND_PLAT) || defined(CONFIG_DRIVER_NAND_BFIN) # define CONFIG_CMD_NAND # define CONFIG_CMD_NAND_LOCK_UNLOCK +# undef CONFIG_NAND_MAYBE_EARLY_INIT # endif # ifdef CONFIG_POST # define CONFIG_CMD_DIAG diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h index 84c9309..2bf830e 100644 --- a/include/configs/cm-bf527.h +++ b/include/configs/cm-bf527.h @@ -60,23 +60,22 @@ /* * NAND Settings - * (can't be used sametime as ethernet) */ -/* #define CONFIG_BFIN_NFC */ -#ifdef CONFIG_BFIN_NFC +#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND) +# define CONFIG_BFIN_NFC_BOOTROM_ECC +#endif #define CONFIG_BFIN_NFC_CTL_VAL 0x0033 +#define CONFIG_DRIVER_NAND_BFIN #define CONFIG_SYS_NAND_BASE 0 /* not actually used */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define NAND_MAX_CHIPS 1 -#define CONFIG_CMD_NAND -#endif /* * Network Settings */ #if !defined(__ADSPBF522__) && !defined(__ADSPBF523__) && \ - !defined(__ADSPBF524__) && !defined(__ADSPBF525__) && !defined(CONFIG_BFIN_NFC) + !defined(__ADSPBF524__) && !defined(__ADSPBF525__) #define ADI_CMDS_NETWORK 1 #define CONFIG_BFIN_MAC #define CONFIG_RMII