From: Przemyslaw Marczak <p.marczak@samsung.com>
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_common/20141030.153846~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5898cb67c5b11004b72de5a08cdd78bfea63c9f4;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 <p.marczak@samsung.com>
---

diff --git a/common/cmd_thordown.c b/common/cmd_thordown.c
index 18a84cf..76438e4 100644
--- a/common/cmd_thordown.c
+++ b/common/cmd_thordown.c
@@ -65,9 +65,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 159434d..ef06a5a 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -565,8 +565,14 @@ 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);
 
 	return tmp;
@@ -711,8 +717,13 @@ 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");
 	while (!dev->configuration_done) {
@@ -728,8 +739,13 @@ 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 */
 	if (thor_rx_data() < 0) {
diff --git a/include/libtizen.h b/include/libtizen.h
index fc5df1f..1ab4ac6 100644
--- a/include/libtizen.h
+++ b/include/libtizen.h
@@ -9,6 +9,7 @@
 #define _LIBTIZEN_H_
 
 #include <lcd.h>
+#include <samsung/misc.h>
 
 #define HD_RESOLUTION	0