summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Virdi <amit.virdi@st.com>2012-05-07 13:06:49 +0530
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-07-07 14:07:41 +0200
commit0b7ff3f4595f751ca796456f536c50cae498351d (patch)
treed220fb1a11c84eadb070ad956be0535db0410ae4
parent1b7935cd96f2295d5cdf144fa46696fb60a820ef (diff)
downloadu-boot-imx-0b7ff3f4595f751ca796456f536c50cae498351d.zip
u-boot-imx-0b7ff3f4595f751ca796456f536c50cae498351d.tar.gz
u-boot-imx-0b7ff3f4595f751ca796456f536c50cae498351d.tar.bz2
SPEAr: Initialize SNOR in early_board_init_f
flash reading is required earlier than flash_init is called since the env_init is called before flash_init. This makes the smi_init necessary before env_init being called. Signed-off-by: Amit Virdi <amit.virdi@st.com> Acked-by: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
-rw-r--r--board/spear/common/spr_misc.c8
-rw-r--r--include/configs/spear-common.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/board/spear/common/spr_misc.c b/board/spear/common/spr_misc.c
index e2918ff..043c72a 100644
--- a/board/spear/common/spr_misc.c
+++ b/board/spear/common/spr_misc.c
@@ -25,6 +25,7 @@
#include <command.h>
#include <i2c.h>
#include <net.h>
+#include <linux/mtd/st_smi.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
#include <asm/arch/spr_emi.h>
@@ -54,6 +55,13 @@ void dram_init_banksize(void)
gd->bd->bi_dram[0].size = gd->ram_size;
}
+int board_early_init_f()
+{
+#if defined(CONFIG_ST_SMI)
+ smi_init();
+#endif
+ return 0;
+}
int misc_init_r(void)
{
#if defined(CONFIG_CMD_NET)
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index cf09090..c2dff8b 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -198,6 +198,7 @@
/* Miscellaneous configurable options */
#define CONFIG_ARCH_CPU_INIT
+#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_BOOT_PARAMS_ADDR 0x00000100
#define CONFIG_CMDLINE_TAG 1