From 2f2c0f15fb4def5c7ef0bdd17cd66a2372958ec8 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Mon, 16 Sep 2019 13:31:06 +0200 Subject: [PATCH] config: enable THOR download support on Raspberry Pi4 boards Change-Id: Icd9091c5670653a551d05aaabf6cc5f1bf0243f6 Signed-off-by: Marek Szyprowski Signed-off-by: Jaehoon Chung --- board/raspberrypi/rpi/rpi.c | 5 +++++ configs/rpi_4_32b_defconfig | 8 +++++--- configs/rpi_4_defconfig | 8 +++++--- drivers/usb/gadget/f_thor.h | 11 ++++++++--- include/configs/rpi.h | 2 +- 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index c4203fc..e670c01 100644 --- 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 565e5d5..7ea159c 100644 --- 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 7ae1f93..4eff3fa 100644 --- 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 8ba3fa2..49d0399 100644 --- 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 5b2bf2b..883149f 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -75,7 +75,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 -- 2.7.4