summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Schmoller <jschmoller@xes-inc.com>2010-10-22 00:20:25 -0500
committerKumar Gala <galak@kernel.crashing.org>2010-10-22 02:17:19 -0500
commit72fb68d53cfbe505319cbb4aa92a1fe7ecf3d4fb (patch)
tree560c19ad46b92223c88e5f67173b6bfed7b23788
parent92af6549b8c52e9c973e4e197aa4d1edf4df5803 (diff)
downloadu-boot-imx-72fb68d53cfbe505319cbb4aa92a1fe7ecf3d4fb.zip
u-boot-imx-72fb68d53cfbe505319cbb4aa92a1fe7ecf3d4fb.tar.gz
u-boot-imx-72fb68d53cfbe505319cbb4aa92a1fe7ecf3d4fb.tar.bz2
xes: Add board_flash_wp_on()
Add board_flash_wp_on() to check a pca9557 gpio pin to see if non-volatile memory write protection is enabled. Previously, write protected NOR flashes would fail initialization which resulted in a bootup error such as: ... DTT: 53 C local / 64 C remote (adt7461@4c) DTT: 54 C local (ds1621@48) FLASH: Executed from FLASH1 POST memory PASSED FLASH: ## Unknown FLASH on Bank 1 - Size = 0x00000000 = 0 MB ## Unknown FLASH on Bank 2 - Size = 0x00000000 = 0 MB *** failed *** ### ERROR ### Please RESET the board ### With this patch, NOR flash initialization is skipped: ... DTT: 53 C local / 64 C remote (adt7461@4c) DTT: 54 C local (ds1621@48) FLASH: Executed from FLASH1 POST memory PASSED FLASH: Uninitialized - Write Protect On L2: 1024 KB enabled NAND: 1024 MiB ... Note that flash related commands such as flinfo and saveenv will error out when flash write protection is enabled. Signed-off-by: John Schmoller <jschmoller@xes-inc.com> Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--board/xes/common/fsl_8xxx_misc.c15
-rw-r--r--include/configs/XPEDITE5200.h2
2 files changed, 16 insertions, 1 deletions
diff --git a/board/xes/common/fsl_8xxx_misc.c b/board/xes/common/fsl_8xxx_misc.c
index e37a3c1..b7fa695 100644
--- a/board/xes/common/fsl_8xxx_misc.c
+++ b/board/xes/common/fsl_8xxx_misc.c
@@ -22,6 +22,21 @@
#include <common.h>
#include <asm/mmu.h>
+#ifdef CONFIG_PCA953X
+#include <pca953x.h>
+
+/*
+ * Determine if a board's flashes are write protected
+ */
+int board_flash_wp_on(void)
+{
+ if (pca953x_get_val(CONFIG_SYS_I2C_PCA953X_ADDR0) &
+ CONFIG_SYS_PCA953X_NVM_WP)
+ return 1;
+
+ return 0;
+}
+#endif
/*
* Return a board's derivative model number. For example:
diff --git a/include/configs/XPEDITE5200.h b/include/configs/XPEDITE5200.h
index 4221829..1ad9b46 100644
--- a/include/configs/XPEDITE5200.h
+++ b/include/configs/XPEDITE5200.h
@@ -251,7 +251,7 @@
#define CONFIG_SYS_PCA953X_BRD_CFG2 0x04
#define CONFIG_SYS_PCA953X_XMC_ROOT0 0x08
#define CONFIG_SYS_PCA953X_FLASH_PASS_CS 0x10
-#define CONFIG_SYS_PCA953X_FLASH_WP 0x20
+#define CONFIG_SYS_PCA953X_NVM_WP 0x20
#define CONFIG_SYS_PCA953X_MONARCH 0x40
#define CONFIG_SYS_PCA953X_EREADY 0x80