From: Przemyslaw Marczak
Date: Thu, 18 Sep 2014 13:27:59 +0000 (+0200)
Subject: thor: check board type before display for CONFIG_OF_MULTI.
X-Git-Tag: submit/tizen/20160425.072005~37
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0ba353e6265501cfa29c2d67a36470162ca73285;p=platform%2Fkernel%2Fu-boot.git
thor: check board type before display for CONFIG_OF_MULTI.
For multi platform binary, it is required to check
the board type because not every board supports display.
Change-Id: Ia4153d58f48846a0bec6e9dc90ea17d87d5da096
Signed-off-by: Przemyslaw Marczak
---
diff --git a/cmd/thordown.c b/cmd/thordown.c
index bc48401b2d..a1bd4bde7f 100644
--- a/cmd/thordown.c
+++ b/cmd/thordown.c
@@ -66,9 +66,14 @@ done:
dfu_free_entities();
#ifdef CONFIG_TIZEN
- if (ret != CMD_RET_SUCCESS)
+ if (ret != CMD_RET_SUCCESS) {
+#ifdef CONFIG_OF_MULTI
+ if (board_is_trats2())
+ draw_thor_fail_screen();
+#else
draw_thor_fail_screen();
- else
+#endif
+ } else
lcd_clear();
#endif
return ret;
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index e19cf6b572..342b1e79ab 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -578,7 +578,13 @@ static int thor_rx_data(void)
data_to_rx -= dev->out_req->actual;
#ifdef CONFIG_TIZEN
downloaded_file_size += dev->out_req->actual;
+#ifdef CONFIG_OF_MULTI
+ if (board_is_trats2())
+ draw_thor_progress(total_file_size,
+ downloaded_file_size);
+#else
draw_thor_progress(total_file_size, downloaded_file_size);
+#endif
#endif
} while (data_to_rx);
@@ -724,7 +730,12 @@ int thor_init(void)
int power_key_cnt = 0;
#ifdef CONFIG_TIZEN
+#ifdef CONFIG_OF_MULTI
+ if (board_is_trats2())
+ draw_thor_screen();
+#else
draw_thor_screen();
+#endif
#endif
/* Wait for a device enumeration and configuration settings */
debug("THOR enumeration/configuration setting....\n");
@@ -741,7 +752,12 @@ int thor_init(void)
}
}
#ifdef CONFIG_TIZEN
+#ifdef CONFIG_OF_MULTI
+ if (board_is_trats2())
+ draw_thor_connected();
+#else
draw_thor_connected();
+#endif
#endif
thor_set_dma(thor_rx_data_buf, strlen("THOR"));
/* detect the download request from Host PC */
diff --git a/include/libtizen.h b/include/libtizen.h
index fc5df1f867..1ab4ac618a 100644
--- a/include/libtizen.h
+++ b/include/libtizen.h
@@ -9,6 +9,7 @@
#define _LIBTIZEN_H_
#include
+#include
#define HD_RESOLUTION 0