config: enable THOR download support on Raspberry Pi4 boards

Change-Id: Icd9091c5670653a551d05aaabf6cc5f1bf0243f6
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index c4203fcf980afc5ef7f20567770a5ac074df5f7a..e670c016f69bb764603fdbead32b97486716e72a 100644 (file)
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -551,3 +551,8 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 
        return 0;
 }
+
+int checkboard(void)
+{
+       return 0;
+}

diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
index 565e5d50721f8a9cf6f008e7f9edea6d542b061e..7ea159c5b4ceadb7a722417383b6394ebb5f7548 100644 (file)
--- a/configs/rpi_4_32b_defconfig
+++ b/configs/rpi_4_32b_defconfig
@@ -12,6 +12,7 @@ CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_SYS_PROMPT="U-Boot> "
+CONFIG_CMD_THOR_DOWNLOAD=y
 CONFIG_CMD_DFU=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
@@ -45,11 +46,12 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="FSL"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
+CONFIG_USB_GADGET_MANUFACTURER="Tizen"
+CONFIG_USB_GADGET_VENDOR_NUM=0x04E8
+CONFIG_USB_GADGET_PRODUCT_NUM=0x685D
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_USB_FUNCTION_THOR=y
 CONFIG_DM_VIDEO=y
 # CONFIG_VIDEO_BPP8 is not set
 # CONFIG_VIDEO_BPP16 is not set

diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig
index 7ae1f93faa76b9f878f44a3d703a9ff8c769b4df..4eff3faa40ad16a4f9f199242478694fbaf02986 100644 (file)
--- a/configs/rpi_4_defconfig
+++ b/configs/rpi_4_defconfig
@@ -12,6 +12,7 @@ CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_SYS_PROMPT="U-Boot> "
+CONFIG_CMD_THOR_DOWNLOAD=y
 CONFIG_CMD_DFU=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
@@ -45,11 +46,12 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="FSL"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
+CONFIG_USB_GADGET_MANUFACTURER="Tizen"
+CONFIG_USB_GADGET_VENDOR_NUM=0x04E8
+CONFIG_USB_GADGET_PRODUCT_NUM=0x685D
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_USB_FUNCTION_THOR=y
 CONFIG_DM_VIDEO=y
 # CONFIG_VIDEO_BPP8 is not set
 # CONFIG_VIDEO_BPP16 is not set

diff --git a/drivers/usb/gadget/f_thor.h b/drivers/usb/gadget/f_thor.h
index 8ba3fa21b73316edb5e5491d6d87fcdae06ba215..49d0399835788079aa6b67281d62dac07c98a712 100644 (file)
--- a/drivers/usb/gadget/f_thor.h
+++ b/drivers/usb/gadget/f_thor.h
@@ -117,9 +117,14 @@ struct f_thor {
        struct thor_dev *dev;
 };
 
-#define F_NAME_BUF_SIZE 32
-#define THOR_PACKET_SIZE SZ_1M      /* 1 MiB */
-#define THOR_STORE_UNIT_SIZE SZ_32M /* 32 MiB */
+#define F_NAME_BUF_SIZE 64
+#if defined(CONFIG_TARGET_RPI_4) || defined (CONFIG_TARGET_RPI_4_32B)
+#define THOR_PACKET_SIZE       SZ_256K
+#define THOR_STORE_UNIT_SIZE   SZ_1M
+#else
+#define THOR_PACKET_SIZE       SZ_1M
+#define THOR_STORE_UNIT_SIZE   SZ_32M
+#endif
 #ifdef CONFIG_THOR_RESET_OFF
 #define RESET_DONE 0xFFFFFFFF
 #endif

diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 441347085f4aa9a8966fd54bb52b24fba4d8a2d4..df19eaf36f72dec32bdb71559620f851cf59e97a 100644 (file)
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -76,7 +76,7 @@
 #endif
 
 /* DFU over USB/UDC */
-#ifdef CONFIG_CMD_DFU
+#if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_THOR)
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE   SZ_1M
 #define CONFIG_SYS_DFU_MAX_FILE_SIZE   SZ_2M