summaryrefslogtreecommitdiff
path: root/board/gateworks
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-10-08 21:20:49 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-10-08 21:20:49 +0200
commit4b19b7448e63bab8af17abbb30acff00d8f0dc99 (patch)
tree6ba89c10ebffb00cee92656da9a5aad8396390c0 /board/gateworks
parentc19a8bc5711ec63e905ef91f045a1489f0aa3cb0 (diff)
parent5e3a388cddce1685ccd9bc1b58ddb89a191ed88f (diff)
Merge remote-tracking branch 'u-boot-imx/master'
The single file conflict below is actually trivial. Conflicts: board/boundary/nitrogen6x/nitrogen6x.c
Diffstat (limited to 'board/gateworks')
-rw-r--r--board/gateworks/gw_ventana/gw_ventana_spl.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
index 9fc253bb82..ca35b3cb7e 100644
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -402,13 +402,6 @@ void board_init_f(ulong dummy)
struct ventana_board_info ventana_info;
int board_model;
- /*
- * Zero out global data:
- * - this shoudl be done by crt0.S
- * - failure to zero it will cause i2c_setup to fail
- */
- memset((void *)gd, 0, sizeof(struct global_data));
-
/* setup AIPS and disable watchdog */
arch_cpu_init();