commit 8536f0b3949597df792a8e4e2f685f7ad2669d65
author Aaron Durbin <adurbin@chromium.org> Mon Nov 24 15:24:14 2014 -0600
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Nov 25 00:16:16 2014 +0000
tree e16678b8791e9e7cd6af996b8f601e3eb278a9d0
parent ddbe0b39ec306ba387acea54590970eec8e131ba

ryu: enable tftp netboot output on display

There are 2 different display paths within depthcharge. vboot
has its own as well as the netboot path. For ryu we utilized
the vboot API. However, the netboot path assumes everything is
ready to go w/o any intervention. That's not always true. Correct
this by initializing the display.

BUG=None
TEST=Built and ran netboot image. Observed console.

Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Change-Id: I0ee5d9fd57499929ffbc15b4e4f643bd13793535
Reviewed-on: https://chromium-review.googlesource.com/231694
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Commit-Queue: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>

src/board/rush_ryu/board.c

diff --git a/src/board/rush_ryu/board.c b/src/board/rush_ryu/board.c
index 121f953..5f4d0ae 100644
--- a/src/board/rush_ryu/board.c
+++ b/src/board/rush_ryu/board.c
@@ -211,7 +211,7 @@
 static void * const winbuf_t_start_addr = (void *)(uintptr_t)0x54202000;
 static void * const win_t_win_options = (void *)(uintptr_t)0x54201c00;
 
-static VbError_t display_init(void)
+static VbError_t ryu_display_init(void)
 {
 	uintptr_t phys_addr = lib_sysinfo.framebuffer->physical_address;
 
@@ -230,7 +230,7 @@
 }
 
 static VbootDisplayOps ryu_display_ops = {
-	.init = &display_init,
+	.init = &ryu_display_init,
 	.backlight_update = &backlight_update,
 	.stop = &display_stop,
 };

src/netboot/netboot.c

diff --git a/src/netboot/netboot.c b/src/netboot/netboot.c
index 1cd621a..834a547 100644
--- a/src/netboot/netboot.c
+++ b/src/netboot/netboot.c
@@ -40,10 +40,14 @@
 #include "netboot/params.h"
 #include "netboot/tftp.h"
 #include "vboot/boot.h"
+#include "vboot/util/display.h"
 #include "vboot/util/flag.h"
 
 static void enable_graphics(void)
 {
+	display_init();
+	VbExDisplayBacklight(1);
+
 	if (!CONFIG_OPROM_MATTERS)
 		return;
 

src/vboot/callbacks/display.c

diff --git a/src/vboot/callbacks/display.c b/src/vboot/callbacks/display.c
index 03475b3..9f2be46 100644
--- a/src/vboot/callbacks/display.c
+++ b/src/vboot/callbacks/display.c
@@ -55,7 +55,7 @@
 	list_insert_after(&display_cleanup_func.list_node, &cleanup_funcs);
 }
 
-static VbError_t display_init(void)
+VbError_t display_init(void)
 {
 	if (display_ops != NULL && display_ops->init != NULL)
 		return display_ops->init();

src/vboot/util/display.h

diff --git a/src/vboot/util/display.h b/src/vboot/util/display.h
index 0884f18..6103d59 100644
--- a/src/vboot/util/display.h
+++ b/src/vboot/util/display.h
@@ -35,5 +35,6 @@
 } VbootDisplayOps;
 
 void display_set_ops(VbootDisplayOps *ops);
+VbError_t display_init(void);
 
 #endif /* __VBOOT_UTIL_DISPLAY_H__ */