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 b8f5b6ed83f9e1fe37412360a2217e41a583e5e3..e0fe5fb54498998a4ad13e94031013e811964ba3 100644 (file)
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -567,3 +567,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 b813d0463987b5353cb114243275cf2d0e908cd1..46437f86c498309c318833bce26a8c6d858339da 100644 (file)
--- a/configs/rpi_4_32b_defconfig
+++ b/configs/rpi_4_32b_defconfig
@@ -12,6 +12,7 @@ CONFIG_PREBOOT="pci enum; usb start;"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_MISC_INIT_R=y
 CONFIG_SYS_PROMPT="U-Boot> "
+CONFIG_CMD_THOR_DOWNLOAD=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
@@ -48,11 +49,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 de2658ae88d6111cd7cbfe6e58cfa37aa352d296..2793c584fd9a2af69917aef017d36d2b7411eb26 100644 (file)
--- a/configs/rpi_4_defconfig
+++ b/configs/rpi_4_defconfig
@@ -12,6 +12,7 @@ CONFIG_PREBOOT="pci enum; usb start;"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_MISC_INIT_R=y
 CONFIG_SYS_PROMPT="U-Boot> "
+CONFIG_CMD_THOR_DOWNLOAD=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
@@ -48,11 +49,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 53147db1745c41f40ab7228e6267f7877d93cf0d..6ebb5ba837645da884e61fd0ac13b88eae424e4c 100644 (file)
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -71,7 +71,7 @@
 #define CONFIG_VIDEO_BCM2835
 
 /* DFU over USB/UDC */
-#ifdef CONFIG_CMD_DFU
+#if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_THOR)
 #ifdef CONFIG_ARM64
 #define KERNEL_FILENAME                "Image"
 #else