summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2011-08-23 11:38:11 -0700
committerSimon Glass <sjg@chromium.org>2011-08-29 12:28:30 -0700
commitc648159d0a01b32d61da555c9b42c75bddcab62b (patch)
treec257f748866ab584d2ca27815eea0434c5d88380
parent102f460b3bf7843860cb0ed596948946462c381a (diff)
CHROMIUMOS: Add vbexport_init() to set up library
We need to register available boot devices. It seems reasonable that this library should be initialized before use. BUG=chromium-os:19518 TEST=build on Seaboard; vbexport_test diskinfo See that all boot devices are found with SD and USB inserted Change-Id: I17a535dc85b5aaee669ea67b439632bafb19c806 Reviewed-on: http://gerrit.chromium.org/gerrit/6501 Reviewed-by: Anton Staaf <robotboy@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
-rw-r--r--board/nvidia/common/board.c8
-rw-r--r--include/chromeos/common.h3
-rw-r--r--lib/vbexport/misc.c5
3 files changed, 16 insertions, 0 deletions
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c
index dfce988b82..c5c29a0e14 100644
--- a/board/nvidia/common/board.c
+++ b/board/nvidia/common/board.c
@@ -50,6 +50,10 @@
#include <libfdt.h>
#endif
+#ifdef CONFIG_CHROMEOS
+#include <chromeos/common.h>
+#endif
+
#include <asm/arch/warmboot.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -258,6 +262,10 @@ int board_init(void)
/* boot param addr */
gd->bd->bi_boot_params = (NV_PA_SDRAM_BASE + 0x100);
+#ifdef CONFIG_CHROMEOS
+ vbexport_init();
+#endif
+
return 0;
}
diff --git a/include/chromeos/common.h b/include/chromeos/common.h
index 1c4b3925dc..974e40d7f3 100644
--- a/include/chromeos/common.h
+++ b/include/chromeos/common.h
@@ -45,4 +45,7 @@ enum {
/* this function is implemented along with vboot_api */
int display_clear(void);
+/* set up the vbexport library */
+int vbexport_init(void);
+
#endif /* CHROMEOS_COMMON_H_ */
diff --git a/lib/vbexport/misc.c b/lib/vbexport/misc.c
index 9a608aba4b..f4f73e4763 100644
--- a/lib/vbexport/misc.c
+++ b/lib/vbexport/misc.c
@@ -39,3 +39,8 @@ uint32_t VbExIsShutdownRequested(void)
return 0;
}
+
+int vbexport_init(void)
+{
+ return 0;
+}