summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Chou <thomas@wytron.com.tw>2011-01-18 11:13:56 +0800
committerScott McNutt <smcnutt@psyent.com>2011-04-08 09:02:27 -0400
commit030103d780490096c7052ecee8f2af1cb422217d (patch)
treec7ccf843c0f4cda60f788ef97779f7462519217d
parent4db2fa7f9446d0f2fe8db3d62184b1212fe22707 (diff)
downloadu-boot-imx-030103d780490096c7052ecee8f2af1cb422217d.zip
u-boot-imx-030103d780490096c7052ecee8f2af1cb422217d.tar.gz
u-boot-imx-030103d780490096c7052ecee8f2af1cb422217d.tar.bz2
nios2: reset cfi flash before reading env
Flash might be in unknown state when u-boot is started with jtag. And got wrong env data. So reset it in board early init. We cannot use generic cfi flash routines, because flash_init() is not run yet. Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
-rw-r--r--board/altera/nios2-generic/nios2-generic.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/board/altera/nios2-generic/nios2-generic.c b/board/altera/nios2-generic/nios2-generic.c
index 89848cf..220a4c4 100644
--- a/board/altera/nios2-generic/nios2-generic.c
+++ b/board/altera/nios2-generic/nios2-generic.c
@@ -24,12 +24,28 @@
#include <common.h>
#include <netdev.h>
+#include <mtd/cfi_flash.h>
+#include <asm/io.h>
void text_base_hook(void); /* nop hook for text_base.S */
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+static void __early_flash_cmd_reset(void)
+{
+ /* reset flash before we read env */
+ writeb(AMD_CMD_RESET, CONFIG_ENV_ADDR);
+ writeb(FLASH_CMD_RESET, CONFIG_ENV_ADDR);
+}
+void early_flash_cmd_reset(void)
+ __attribute__((weak,alias("__early_flash_cmd_reset")));
+#endif
+
int board_early_init_f(void)
{
text_base_hook();
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+ early_flash_cmd_reset();
+#endif
return 0;
}