Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / drivers / usb / gadget / Kconfig

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 26b4d12a09fa509fe588c67f37b040730759ef8c..46aa3fe95438d1bdb46608ac0ccb453796aef8c8 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -39,6 +39,7 @@ if USB_GADGET
 config USB_GADGET_MANUFACTURER
        string "Vendor name of the USB device"
        default "Allwinner Technology" if ARCH_SUNXI
+       default "Rockchip" if ARCH_ROCKCHIP
        default "U-Boot"
        help
          Vendor name of the USB device emulated, reported to the host device.
@@ -47,6 +48,7 @@ config USB_GADGET_MANUFACTURER
 config USB_GADGET_VENDOR_NUM
        hex "Vendor ID of the USB device"
        default 0x1f3a if ARCH_SUNXI
+       default 0x2207 if ARCH_ROCKCHIP
        default 0x0
        help
          Vendor ID of the USB device emulated, reported to the host device.
@@ -56,6 +58,11 @@ config USB_GADGET_VENDOR_NUM
 config USB_GADGET_PRODUCT_NUM
        hex "Product ID of the USB device"
        default 0x1010 if ARCH_SUNXI
+       default 0x310a if ROCKCHIP_RK3036
+       default 0x310c if ROCKCHIP_RK3128
+       default 0x320a if ROCKCHIP_RK3229 || ROCKCHIP_RK3288
+       default 0x330a if ROCKCHIP_RK3328
+       default 0x330c if ROCKCHIP_RK3399
        default 0x0
        help
          Product ID of the USB device emulated, reported to the host device.
@@ -115,6 +122,10 @@ config USB_GADGET_VBUS_DRAW
           This value will be used except for system-specific gadget
           drivers that have more specific information.
 
+config SDP_LOADADDR
+       hex "Default load address at SDP_WRITE and SDP_JUMP"
+       default 0
+
 # Selected by UDC drivers that support high-speed operation.
 config USB_GADGET_DUALSPEED
        bool