[U-Boot] [PATCH 2/4] Kconfig: gadget: Move CONFIG_USB_FUNCTION_THOR to Kconfig
Michal Simek
michal.simek at xilinx.com
Tue Jan 30 07:27:07 UTC 2018
On 29.1.2018 19:30, Lukasz Majewski wrote:
> This commit moves USB_FUNCTION_THOR config to Kconfig.
>
> Signed-off-by: Lukasz Majewski <lukma at denx.de>
> ---
>
> configs/odroid-xu3_defconfig | 1 +
> configs/odroid_defconfig | 1 +
> configs/origen_defconfig | 1 +
> configs/s5p_goni_defconfig | 1 +
> configs/s5pc210_universal_defconfig | 1 +
> configs/syzygy_hub_defconfig | 1 +
> configs/topic_miami_defconfig | 1 +
> configs/topic_miamilite_defconfig | 1 +
> configs/topic_miamiplus_defconfig | 1 +
> configs/trats2_defconfig | 1 +
> configs/trats_defconfig | 1 +
> configs/xilinx_zynqmp_ep_defconfig | 1 +
> configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
> configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
> configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 +
> configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 +
> configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 +
> configs/zynq_cc108_defconfig | 1 +
> configs/zynq_microzed_defconfig | 1 +
> configs/zynq_picozed_defconfig | 1 +
> configs/zynq_z_turn_defconfig | 1 +
> configs/zynq_zc702_defconfig | 1 +
> configs/zynq_zc706_defconfig | 1 +
> configs/zynq_zed_defconfig | 1 +
> configs/zynq_zybo_defconfig | 1 +
> drivers/usb/gadget/Kconfig | 6 ++++++
> include/configs/exynos4-common.h | 3 ---
> include/configs/odroid_xu3.h | 1 -
> include/configs/s5p_goni.h | 3 ---
> include/configs/xilinx_zynqmp.h | 1 -
> include/configs/zynq-common.h | 1 -
> 31 files changed, 31 insertions(+), 9 deletions(-)
>
> diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
> index 11b1c8bf119a..7225bea2c8f7 100644
> --- a/configs/odroid-xu3_defconfig
> +++ b/configs/odroid-xu3_defconfig
> @@ -51,6 +51,7 @@ CONFIG_USB_GADGET_MANUFACTURER="Samsung"
> CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
> CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_VIDEO_BRIDGE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
> index bca423e4452b..40b9b7f050aa 100644
> --- a/configs/odroid_defconfig
> +++ b/configs/odroid_defconfig
> @@ -60,6 +60,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
> CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_SMSC95XX=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/origen_defconfig b/configs/origen_defconfig
> index 2cb553937125..fd9841e5ba4a 100644
> --- a/configs/origen_defconfig
> +++ b/configs/origen_defconfig
> @@ -45,3 +45,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
> CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig
> index 2749f2d893b1..37e2825a1e26 100644
> --- a/configs/s5p_goni_defconfig
> +++ b/configs/s5p_goni_defconfig
> @@ -39,4 +39,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
> CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> CONFIG_FAT_WRITE=y
> diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
> index 58bd14a936f2..e2711193400a 100644
> --- a/configs/s5pc210_universal_defconfig
> +++ b/configs/s5pc210_universal_defconfig
> @@ -51,3 +51,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
> CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> diff --git a/configs/syzygy_hub_defconfig b/configs/syzygy_hub_defconfig
> index 8bdc4be67d70..928608204752 100644
> --- a/configs/syzygy_hub_defconfig
> +++ b/configs/syzygy_hub_defconfig
> @@ -58,3 +58,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
> CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> CONFIG_CI_UDC=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig
> index aabd705da0fb..40774185a136 100644
> --- a/configs/topic_miami_defconfig
> +++ b/configs/topic_miami_defconfig
> @@ -54,3 +54,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
> CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> CONFIG_CI_UDC=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig
> index 7228283b3c6b..c338a83a7c14 100644
> --- a/configs/topic_miamilite_defconfig
> +++ b/configs/topic_miamilite_defconfig
> @@ -55,3 +55,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
> CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> CONFIG_CI_UDC=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig
> index d511a942838b..651d58e551ec 100644
> --- a/configs/topic_miamiplus_defconfig
> +++ b/configs/topic_miamiplus_defconfig
> @@ -54,3 +54,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
> CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> CONFIG_CI_UDC=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
> index aaa25a9bc72c..71ee9df230fc 100644
> --- a/configs/trats2_defconfig
> +++ b/configs/trats2_defconfig
> @@ -54,3 +54,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
> CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> diff --git a/configs/trats_defconfig b/configs/trats_defconfig
> index e0285aa8f656..b194cca237db 100644
> --- a/configs/trats_defconfig
> +++ b/configs/trats_defconfig
> @@ -53,3 +53,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
> CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig
> index 1fc0fabd9256..2f38e463356e 100644
> --- a/configs/xilinx_zynqmp_ep_defconfig
> +++ b/configs/xilinx_zynqmp_ep_defconfig
> @@ -90,5 +90,6 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
> CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
> CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> +CONFIG_USB_FUNCTION_THOR=y
> # CONFIG_REGEX is not set
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> index 6914767187b9..fad080e9defa 100644
> --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> @@ -83,4 +83,5 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
> CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
> CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> +CONFIG_USB_FUNCTION_THOR=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> index 67a6d9ae9b60..3aecf7d1f318 100644
> --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> @@ -79,4 +79,5 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
> CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
> CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> +CONFIG_USB_FUNCTION_THOR=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
> index c761d4948f5e..255dd6bc0eb2 100644
> --- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
> +++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
> @@ -87,4 +87,5 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
> CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
> CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> +CONFIG_USB_FUNCTION_THOR=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig
> index 43b533fdb908..b40353615df8 100644
> --- a/configs/xilinx_zynqmp_zcu102_revA_defconfig
> +++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig
> @@ -87,4 +87,5 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
> CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
> CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> +CONFIG_USB_FUNCTION_THOR=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig
> index c2d0ddbcf9de..3660af5d8c87 100644
> --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
> +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
> @@ -87,4 +87,5 @@ CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
> CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
> CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> +CONFIG_USB_FUNCTION_THOR=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> diff --git a/configs/zynq_cc108_defconfig b/configs/zynq_cc108_defconfig
> index bdba0d1cc9ba..1f4e7852c1a2 100644
> --- a/configs/zynq_cc108_defconfig
> +++ b/configs/zynq_cc108_defconfig
> @@ -56,3 +56,4 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_CI_UDC=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
> index fc21eb8f67a3..f53a1181a593 100644
> --- a/configs/zynq_microzed_defconfig
> +++ b/configs/zynq_microzed_defconfig
> @@ -61,3 +61,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
> CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> CONFIG_CI_UDC=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
> index f36e7bd849f4..80ddd5b929e5 100644
> --- a/configs/zynq_picozed_defconfig
> +++ b/configs/zynq_picozed_defconfig
> @@ -50,3 +50,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
> CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> CONFIG_CI_UDC=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> diff --git a/configs/zynq_z_turn_defconfig b/configs/zynq_z_turn_defconfig
> index c727b2acbf28..a7f3f2d36d0c 100644
> --- a/configs/zynq_z_turn_defconfig
> +++ b/configs/zynq_z_turn_defconfig
> @@ -60,3 +60,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
> CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> CONFIG_CI_UDC=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
> index 0d0efc223dd4..0e7df445f046 100644
> --- a/configs/zynq_zc702_defconfig
> +++ b/configs/zynq_zc702_defconfig
> @@ -70,3 +70,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
> CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> CONFIG_CI_UDC=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
> index 4b186c9fffc6..b7c094f97eda 100644
> --- a/configs/zynq_zc706_defconfig
> +++ b/configs/zynq_zc706_defconfig
> @@ -71,3 +71,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
> CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> CONFIG_CI_UDC=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
> index c18f056debc4..d921b883430a 100644
> --- a/configs/zynq_zed_defconfig
> +++ b/configs/zynq_zed_defconfig
> @@ -62,3 +62,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
> CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> CONFIG_CI_UDC=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
> index 21f8c08fd824..45bf2aec5cc0 100644
> --- a/configs/zynq_zybo_defconfig
> +++ b/configs/zynq_zybo_defconfig
> @@ -66,3 +66,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
> CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> CONFIG_CI_UDC=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_THOR=y
> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
> index b1541bb67781..0d99d84458b6 100644
> --- a/drivers/usb/gadget/Kconfig
> +++ b/drivers/usb/gadget/Kconfig
> @@ -142,6 +142,12 @@ config USB_FUNCTION_SDP
> allows to download images into memory and execute (jump to) them
> using the same protocol as implemented by the i.MX family's boot ROM.
>
> +config USB_FUNCTION_THOR
> + bool "Enable USB THOR gadget"
> + help
> + Enable Tizen's THOR download protocol support in U-Boot. It
> + allows downloading images into memory and flash them to target device.
> +
> endif # USB_GADGET_DOWNLOAD
>
> config USB_ETHER
> diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
> index 94fd3b36f623..3b70ff64f82c 100644
> --- a/include/configs/exynos4-common.h
> +++ b/include/configs/exynos4-common.h
> @@ -20,9 +20,6 @@
> /* SD/MMC configuration */
> #define CONFIG_MMC_DEFAULT_DEV 0
>
> -/* TIZEN THOR downloader support */
> -#define CONFIG_USB_FUNCTION_THOR
> -
> #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M
> #define DFU_DEFAULT_POLL_TIMEOUT 300
>
> diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
> index 2969f18993d7..ca46b61204fb 100644
> --- a/include/configs/odroid_xu3.h
> +++ b/include/configs/odroid_xu3.h
> @@ -47,7 +47,6 @@
> /* THOR */
> #define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_USB_GADGET_VENDOR_NUM
> #define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D
> -#define CONFIG_USB_FUNCTION_THOR
>
> /* UMS */
> #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
> diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
> index c31896ddf87a..852eb6406303 100644
> --- a/include/configs/s5p_goni.h
> +++ b/include/configs/s5p_goni.h
> @@ -54,9 +54,6 @@
> #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M
> #define DFU_DEFAULT_POLL_TIMEOUT 300
>
> -/* TIZEN THOR downloader support */
> -#define CONFIG_USB_FUNCTION_THOR
> -
> /* USB Samsung's IDs */
>
> #define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8
> diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
> index 9997fd095982..dddb10428d05 100644
> --- a/include/configs/xilinx_zynqmp.h
> +++ b/include/configs/xilinx_zynqmp.h
> @@ -88,7 +88,6 @@
> #define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x1800000
> #define DFU_DEFAULT_POLL_TIMEOUT 300
> #define CONFIG_USB_CABLE_CHECK
> -#define CONFIG_USB_FUNCTION_THOR
> #define CONFIG_THOR_RESET_OFF
> #define DFU_ALT_INFO_RAM \
> "dfu_ram_info=" \
> diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
> index 28cee15b37a5..f0ab9f341f3e 100644
> --- a/include/configs/zynq-common.h
> +++ b/include/configs/zynq-common.h
> @@ -91,7 +91,6 @@
> # define DFU_DEFAULT_POLL_TIMEOUT 300
> # define CONFIG_USB_CABLE_CHECK
> # define CONFIG_THOR_RESET_OFF
> -# define CONFIG_USB_FUNCTION_THOR
> # define DFU_ALT_INFO_RAM \
> "dfu_ram_info=" \
> "set dfu_alt_info " \
>
For zynq/zynqmp changes:
Acked-by: Michal Simek <michal.simek at xilinx.com>
Thanks,
Michal
More information about the U-Boot
mailing list