rockchip: rk3399: Add fastboot support
Subsystems (5)
cover rockchip: rk3399: Add fastboot support
This patchset add fastboot support on RK3399 and also rework of CONFIG items related to fastboot support.
patch 0001 - 0005: existing gadget, fastboot config move
patch 0006: add phy interface for dwc3_uboot
patch 0007: 0008: dwc3 setup for rk3399
patch 0009: enable fastboot, nanopc-t4, roc-pc
SD card work fine, but eMMC seems unstable when partitioning with gpt like below but it can be problem with fastboot though.
=> gpt write mmc 0 $partitions
Writing GPT: mmc write failed
** Can't write to device 0 **
** Can't write to device 0 **
error!
=> gpt verify mmc 0 $partitions
GUID Partition Table Header signature is wrong: 0x0 != 0x5452415020494645gpt_verify_headers: *** ERROR: Invalid GPT ***
Verify GPT: error!
Any inputs?
Jagan.
Jagan Teki (9):
gadget: Select USB_GADGET_MANUFACTURER for rockchip
gadget: Select USB_GADGET_VENDOR_NUM for rockchip
gadget: rockchip: USB_GADGET_PRODUCT_NUM
gadget: rockchip: Add rk3128 USB_GADGET_PRODUCT_NUM
fastboot: rockchip: Select FASTBOOT_FLASH[_MMC_DEV]
usb: dwc3: Add phy interface for dwc3_uboot
gadget: rockchip: Add rk3399 USB_GADGET_PRODUCT_NUM
rockchip: Setup dwc3_device (for non-dm gadgets) [DO NOT MERGE] rockchip: rk3399: Enable fastboot
arch/arm/mach-rockchip/board.c | 32 ++++++++++++++++++++++++++++-- configs/elgin-rv1108_defconfig | 2 -- configs/evb-rk3036_defconfig | 5 ----- configs/evb-rk3128_defconfig | 2 -- configs/evb-rk3229_defconfig | 5 ----- configs/evb-rk3288_defconfig | 5 ----- configs/evb-rk3328_defconfig | 5 ----- configs/evb-rv1108_defconfig | 2 -- configs/firefly-rk3288_defconfig | 5 ----- configs/kylin-rk3036_defconfig | 5 ----- configs/miqi-rk3288_defconfig | 5 ----- configs/nanopc-t4-rk3399_defconfig | 3 +++ configs/phycore-rk3288_defconfig | 5 ----- configs/popmetal-rk3288_defconfig | 5 ----- configs/roc-rk3399-pc_defconfig | 3 +++ configs/rock2_defconfig | 2 -- configs/rock64-rk3328_defconfig | 5 ----- configs/tinker-rk3288_defconfig | 5 ----- configs/vyasa-rk3288_defconfig | 3 --- drivers/fastboot/Kconfig | 4 +++- drivers/usb/dwc3/core.c | 26 ++++++++++++++++++++++++ drivers/usb/dwc3/core.h | 12 +++++++++++ drivers/usb/gadget/Kconfig | 6 ++++++ include/dwc3-uboot.h | 2 ++ include/linux/usb/phy.h | 19 ++++++++++++++++++ 25 files changed, 104 insertions(+), 69 deletions(-) create mode 100644 include/linux/usb/phy.h
Signature · 1 line
2.18.0.321.gffc6fa0e3
A message that is not in the archive (sent off-list or not yet received): 20191022175458.22604-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org
PATCH 1/9 gadget: Select USB_GADGET_MANUFACTURER for rockchip
Select the gadget manufacturer as 'Rockchip' for
all rockchip platform SoC's.
This eventually drop the explicit defined added
on supported board defconfig files.
--- configs/elgin-rv1108_defconfig | 1 - configs/evb-rk3036_defconfig | 1 - configs/evb-rk3229_defconfig | 1 - configs/evb-rk3288_defconfig | 1 - configs/evb-rk3328_defconfig | 1 - configs/evb-rv1108_defconfig | 1 - configs/firefly-rk3288_defconfig | 1 - configs/kylin-rk3036_defconfig | 1 - configs/miqi-rk3288_defconfig | 1 - configs/phycore-rk3288_defconfig | 1 - configs/popmetal-rk3288_defconfig | 1 - configs/rock2_defconfig | 1 - configs/rock64-rk3328_defconfig | 1 - configs/tinker-rk3288_defconfig | 1 - configs/vyasa-rk3288_defconfig | 1 - drivers/usb/gadget/Kconfig | 1 + 16 files changed, 1 insertion(+), 15 deletions(-)
configs/elgin-rv1108_defconfig +0 -1
@@ -49,7 +49,6 @@ CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Rockchip" CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x110a CONFIG_USB_GADGET_DWC2_OTG=y
configs/evb-rk3036_defconfig +0 -1
@@ -54,7 +54,6 @@ CONFIG_SYSRESET=y # CONFIG_SPL_SYSRESET is not set CONFIG_USB=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Rockchip" CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x310a CONFIG_USB_GADGET_DWC2_OTG=y
configs/evb-rk3229_defconfig +0 -1
@@ -64,7 +64,6 @@ CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Rockchip" CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y
configs/evb-rk3288_defconfig +0 -1
@@ -73,7 +73,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Rockchip" CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y
configs/evb-rk3328_defconfig +0 -1
@@ -87,7 +87,6 @@ CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Rockchip" CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x330a CONFIG_USB_GADGET_DWC2_OTG=y
configs/evb-rv1108_defconfig +0 -1
@@ -46,7 +46,6 @@ CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Rockchip" CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x110a CONFIG_USB_GADGET_DWC2_OTG=y
configs/firefly-rk3288_defconfig +0 -1
@@ -78,7 +78,6 @@ CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Rockchip" CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y
configs/kylin-rk3036_defconfig +0 -1
@@ -58,7 +58,6 @@ CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Rockchip" CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x310a CONFIG_USB_GADGET_DWC2_OTG=y
configs/miqi-rk3288_defconfig +0 -1
@@ -73,7 +73,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Rockchip" CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y
configs/phycore-rk3288_defconfig +0 -1
@@ -77,7 +77,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Rockchip" CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y
configs/popmetal-rk3288_defconfig +0 -1
@@ -73,7 +73,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Rockchip" CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y
configs/rock2_defconfig +0 -1
@@ -74,7 +74,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Rockchip" CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y
configs/rock64-rk3328_defconfig +0 -1
@@ -89,7 +89,6 @@ CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Rockchip" CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x330a CONFIG_USB_GADGET_DWC2_OTG=y
configs/tinker-rk3288_defconfig +0 -1
@@ -79,7 +79,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Rockchip" CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y
configs/vyasa-rk3288_defconfig +0 -1
@@ -71,7 +71,6 @@ CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Rockchip" CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y
drivers/usb/gadget/Kconfig +1 -0
@@ -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.
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 2/9 gadget: Select USB_GADGET_VENDOR_NUM for rockchip
In reply to a message not in the archiveGadget vendor number, 0x2207 is common across all platfroms supported in Rockchip SoC.
So, select the same number globally, if ARCH_ROCKCHIP.
This eventually drop the explicit configs defined in supported board defconfig files.
--- configs/elgin-rv1108_defconfig | 1 - configs/evb-rk3036_defconfig | 1 - configs/evb-rk3229_defconfig | 1 - configs/evb-rk3288_defconfig | 1 - configs/evb-rk3328_defconfig | 1 - configs/evb-rv1108_defconfig | 1 - configs/firefly-rk3288_defconfig | 1 - configs/kylin-rk3036_defconfig | 1 - configs/miqi-rk3288_defconfig | 1 - configs/phycore-rk3288_defconfig | 1 - configs/popmetal-rk3288_defconfig | 1 - configs/rock2_defconfig | 1 - configs/rock64-rk3328_defconfig | 1 - configs/tinker-rk3288_defconfig | 1 - configs/vyasa-rk3288_defconfig | 1 - drivers/usb/gadget/Kconfig | 1 + 16 files changed, 1 insertion(+), 15 deletions(-)
configs/elgin-rv1108_defconfig +0 -1
@@ -49,7 +49,6 @@ CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x110a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_ERRNO_STR=y
configs/evb-rk3036_defconfig +0 -1
@@ -54,7 +54,6 @@ CONFIG_SYSRESET=y # CONFIG_SPL_SYSRESET is not set CONFIG_USB=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x310a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_SPL_TINY_MEMSET=y
configs/evb-rk3229_defconfig +0 -1
@@ -64,7 +64,6 @@ CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_TPL_TINY_MEMSET=y
configs/evb-rk3288_defconfig +0 -1
@@ -73,7 +73,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_DM_VIDEO=y
configs/evb-rk3328_defconfig +0 -1
@@ -87,7 +87,6 @@ CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x330a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_SPL_TINY_MEMSET=y
configs/evb-rv1108_defconfig +0 -1
@@ -46,7 +46,6 @@ CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x110a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_ERRNO_STR=y
configs/firefly-rk3288_defconfig +0 -1
@@ -78,7 +78,6 @@ CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y
configs/kylin-rk3036_defconfig +0 -1
@@ -58,7 +58,6 @@ CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x310a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y
configs/miqi-rk3288_defconfig +0 -1
@@ -73,7 +73,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y
configs/phycore-rk3288_defconfig +0 -1
@@ -77,7 +77,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y
configs/popmetal-rk3288_defconfig +0 -1
@@ -73,7 +73,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y
configs/rock2_defconfig +0 -1
@@ -74,7 +74,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_DM_VIDEO=y
configs/rock64-rk3328_defconfig +0 -1
@@ -89,7 +89,6 @@ CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x330a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_SPL_TINY_MEMSET=y
configs/tinker-rk3288_defconfig +0 -1
@@ -79,7 +79,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y
configs/vyasa-rk3288_defconfig +0 -1
@@ -71,7 +71,6 @@ CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_FUNCTION_MASS_STORAGE=y
drivers/usb/gadget/Kconfig +1 -0
@@ -48,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.
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 3/9 gadget: rockchip: USB_GADGET_PRODUCT_NUM
In reply to a message not in the archiveRockchip support differnet or common gadget product number between Rockchip SoCs like,
0x310a - rk30360x320a - rk3229, rk32880x330a - rk3328
So, select them on Kconfig based on platform specific config defined.
This eventually drop the explicit configs defined in supporting board defconfig files.
--- configs/evb-rk3036_defconfig | 1 - configs/evb-rk3229_defconfig | 1 - configs/evb-rk3288_defconfig | 1 - configs/evb-rk3328_defconfig | 1 - configs/firefly-rk3288_defconfig | 1 - configs/kylin-rk3036_defconfig | 1 - configs/miqi-rk3288_defconfig | 1 - configs/phycore-rk3288_defconfig | 1 - configs/popmetal-rk3288_defconfig | 1 - configs/rock64-rk3328_defconfig | 1 - configs/tinker-rk3288_defconfig | 1 - configs/vyasa-rk3288_defconfig | 1 - drivers/usb/gadget/Kconfig | 3 +++ 13 files changed, 3 insertions(+), 12 deletions(-)
configs/evb-rk3036_defconfig +0 -1
@@ -54,7 +54,6 @@ CONFIG_SYSRESET=y # CONFIG_SPL_SYSRESET is not set CONFIG_USB=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_PRODUCT_NUM=0x310a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_SPL_TINY_MEMSET=y CONFIG_CMD_DHRYSTONE=y
configs/evb-rk3229_defconfig +0 -1
@@ -64,7 +64,6 @@ CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_TPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y
configs/evb-rk3288_defconfig +0 -1
@@ -73,7 +73,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_DM_VIDEO=y CONFIG_DISPLAY=y
configs/evb-rk3328_defconfig +0 -1
@@ -87,7 +87,6 @@ CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_PRODUCT_NUM=0x330a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_SPL_TINY_MEMSET=y CONFIG_TPL_TINY_MEMSET=y
configs/firefly-rk3288_defconfig +0 -1
@@ -78,7 +78,6 @@ CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y
configs/kylin-rk3036_defconfig +0 -1
@@ -58,7 +58,6 @@ CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_PRODUCT_NUM=0x310a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y
configs/miqi-rk3288_defconfig +0 -1
@@ -73,7 +73,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y
configs/phycore-rk3288_defconfig +0 -1
@@ -77,7 +77,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y
configs/popmetal-rk3288_defconfig +0 -1
@@ -73,7 +73,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y
configs/rock64-rk3328_defconfig +0 -1
@@ -89,7 +89,6 @@ CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_PRODUCT_NUM=0x330a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_SPL_TINY_MEMSET=y CONFIG_TPL_TINY_MEMSET=y
configs/tinker-rk3288_defconfig +0 -1
@@ -79,7 +79,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y
configs/vyasa-rk3288_defconfig +0 -1
@@ -71,7 +71,6 @@ CONFIG_USB_DWC2=y CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_FUNCTION_MASS_STORAGE=y CONFIG_USB_HOST_ETHER=y
drivers/usb/gadget/Kconfig +3 -0
@@ -58,6 +58,9 @@ 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 0x320a if ROCKCHIP_RK3229 || ROCKCHIP_RK3288 + default 0x330a if ROCKCHIP_RK3328 default 0x0 help Product ID of the USB device emulated, reported to the host device.
Signature · 7 lines
2.18.0.321.gffc6fa0e3 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH 4/9 gadget: rockchip: Add rk3128 USB_GADGET_PRODUCT_NUM
In reply to a message not in the archiveAdd 0x310c for rk3128 gadget product number.
--- drivers/usb/gadget/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/usb/gadget/Kconfig +1 -0
@@ -59,6 +59,7 @@ 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 0x0
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 5/9 fastboot: rockchip: Select FASTBOOT_FLASH[_MMC_DEV]
In reply to a message not in the archiveSelect CONFIG_FASTBOOT_FLASH, CONFIG_FASTBOOT_FLASH_MMC_DEV for rockchip SoC plaforms in fastboot Kconfig file instead of defined it in board defconfig.
This eventually drop the explicit configs defined in supporting board defconfig files.
--- configs/evb-rk3036_defconfig | 2 -- configs/evb-rk3128_defconfig | 2 -- configs/evb-rk3229_defconfig | 2 -- configs/evb-rk3288_defconfig | 2 -- configs/evb-rk3328_defconfig | 2 -- configs/firefly-rk3288_defconfig | 2 -- configs/kylin-rk3036_defconfig | 2 -- configs/miqi-rk3288_defconfig | 2 -- configs/phycore-rk3288_defconfig | 2 -- configs/popmetal-rk3288_defconfig | 2 -- configs/rock64-rk3328_defconfig | 2 -- configs/tinker-rk3288_defconfig | 2 -- drivers/fastboot/Kconfig | 4 +++- 13 files changed, 3 insertions(+), 25 deletions(-)
configs/evb-rk3036_defconfig +0 -2
@@ -36,8 +36,6 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_SPL_BLK is not set CONFIG_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y
configs/evb-rk3128_defconfig +0 -2
@@ -22,8 +22,6 @@ CONFIG_SYSCON=y CONFIG_CLK=y CONFIG_FASTBOOT_BUF_ADDR=0x60800800 CONFIG_FASTBOOT_BUF_SIZE=0x04000000 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y
configs/evb-rk3229_defconfig +0 -2
@@ -44,8 +44,6 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_TPL_CLK=y CONFIG_FASTBOOT_BUF_SIZE=0x04000000 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y
configs/evb-rk3288_defconfig +0 -2
@@ -44,8 +44,6 @@ CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y
configs/evb-rk3328_defconfig +0 -2
@@ -48,8 +48,6 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_TPL_CLK=y CONFIG_FASTBOOT_BUF_ADDR=0x800800 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y
configs/firefly-rk3288_defconfig +0 -2
@@ -46,8 +46,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y
configs/kylin-rk3036_defconfig +0 -2
@@ -38,8 +38,6 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_SPL_BLK is not set CONFIG_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y
configs/miqi-rk3288_defconfig +0 -2
@@ -46,8 +46,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y
configs/phycore-rk3288_defconfig +0 -2
@@ -48,8 +48,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y
configs/popmetal-rk3288_defconfig +0 -2
@@ -46,8 +46,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y
configs/rock64-rk3328_defconfig +0 -2
@@ -51,8 +51,6 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_TPL_CLK=y CONFIG_FASTBOOT_BUF_ADDR=0x800800 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y
configs/tinker-rk3288_defconfig +0 -2
@@ -48,8 +48,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y
drivers/fastboot/Kconfig +3 -1
@@ -64,7 +64,7 @@ config FASTBOOT_USB_DEV config FASTBOOT_FLASH bool "Enable FASTBOOT FLASH command" - default y if ARCH_SUNXI + default y if ARCH_SUNXI || ARCH_ROCKCHIP depends on MMC || (NAND && CMD_MTDPARTS) select IMAGE_SPARSE help
@@ -89,6 +89,8 @@ endchoice config FASTBOOT_FLASH_MMC_DEV int "Define FASTBOOT MMC FLASH default device" depends on FASTBOOT_FLASH_MMC + default 1 if ROCKCHIP_RK3328 + default 0 if ARCH_ROCKCHIP default 0 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1 default 1 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1 help
Signature · 1 line
2.18.0.321.gffc6fa0e3
Re: [PATCH 5/9] fastboot: rockchip: Select FASTBOOT_FLASH[_MMC_DEV]
Jagan,
Quoted 194 lines · Jagan Teki
Select
CONFIG_FASTBOOT_FLASH,CONFIG_FASTBOOT_FLASH_MMC_DEVfor rockchip SoC plaforms in fastbootKconfigfile instead of defined it in board defconfig.This eventually drop the explicit configs defined in supporting board defconfig files.
Signed-off-by Jagan Teki <[email protected]>--- configs/evb-rk3036_defconfig | 2 -- configs/evb-rk3128_defconfig | 2 -- configs/evb-rk3229_defconfig | 2 -- configs/evb-rk3288_defconfig | 2 -- configs/evb-rk3328_defconfig | 2 -- configs/firefly-rk3288_defconfig | 2 -- configs/kylin-rk3036_defconfig | 2 -- configs/miqi-rk3288_defconfig | 2 -- configs/phycore-rk3288_defconfig | 2 -- configs/popmetal-rk3288_defconfig | 2 -- configs/rock64-rk3328_defconfig | 2 -- configs/tinker-rk3288_defconfig | 2 -- drivers/fastboot/Kconfig | 4 +++- 13 files changed, 3 insertions(+), 25 deletions(-)configs/evb-rk3036_defconfig +0
-2@@ -36,8 +36,6 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_SPL_BLK is not set CONFIG_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/evb-rk3128_defconfig +0
-2@@ -22,8 +22,6 @@ CONFIG_SYSCON=y CONFIG_CLK=y CONFIG_FASTBOOT_BUF_ADDR=0x60800800 CONFIG_FASTBOOT_BUF_SIZE=0x04000000 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/evb-rk3229_defconfig +0
-2@@ -44,8 +44,6 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_TPL_CLK=y CONFIG_FASTBOOT_BUF_SIZE=0x04000000 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/evb-rk3288_defconfig +0
-2@@ -44,8 +44,6 @@ CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/evb-rk3328_defconfig +0
-2@@ -48,8 +48,6 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_TPL_CLK=y CONFIG_FASTBOOT_BUF_ADDR=0x800800 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/firefly-rk3288_defconfig +0
-2@@ -46,8 +46,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/kylin-rk3036_defconfig +0
-2@@ -38,8 +38,6 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_SPL_BLK is not set CONFIG_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/miqi-rk3288_defconfig +0
-2@@ -46,8 +46,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/phycore-rk3288_defconfig +0
-2@@ -48,8 +48,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/popmetal-rk3288_defconfig +0
-2@@ -46,8 +46,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/rock64-rk3328_defconfig +0
-2@@ -51,8 +51,6 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_TPL_CLK=y CONFIG_FASTBOOT_BUF_ADDR=0x800800 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/tinker-rk3288_defconfig +0
-2@@ -48,8 +48,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=ydrivers/fastboot/Kconfig +1
-1@@ -64,7 +64,7 @@ config FASTBOOT_USB_DEV config FASTBOOT_FLASH bool "Enable FASTBOOT FLASH command" - default y if ARCH_SUNXI + default y if ARCH_SUNXI || ARCH_ROCKCHIP depends on MMC || (NAND && CMD_MTDPARTS) select IMAGE_SPARSE help
drivers/fastboot/Kconfig endchoice · line 92
Quoted 4 lines
drivers/fastboot/Kconfig +1
-0@@ -89,6 +89,8 @@ endchoice config FASTBOOT_FLASH_MMC_DEV int "Define FASTBOOT MMC FLASH default device" depends on FASTBOOT_FLASH_MMC + default 1 if ROCKCHIP_RK3328
We can use '0' for rk3328 and remove this line.
When we using fastboot, we suppose to access to eMMC, but not SDCard,
and the eMMC number is always '0' on Rockchip platform.
Thanks,
- Kever
drivers/fastboot/Kconfig endchoice · line 96
Quoted 4 lines
drivers/fastboot/Kconfig +1
-0+ default 0 if ARCH_ROCKCHIP default 0 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1 default 1 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1 help
_______________________________________________
U-Boot mailing list
[email protected]
https://lists.denx.de/listinfo/u-boot
Re: [PATCH 5/9] fastboot: rockchip: Select FASTBOOT_FLASH[_MMC_DEV]
Quoted 205 lines · Kever Yang
Jagan,
Quoted 194 lines · Jagan Teki
Select
CONFIG_FASTBOOT_FLASH,CONFIG_FASTBOOT_FLASH_MMC_DEVfor rockchip SoC plaforms in fastbootKconfigfile instead of defined it in board defconfig.This eventually drop the explicit configs defined in supporting board defconfig files.
Signed-off-by Jagan Teki <[email protected]>--- configs/evb-rk3036_defconfig | 2 -- configs/evb-rk3128_defconfig | 2 -- configs/evb-rk3229_defconfig | 2 -- configs/evb-rk3288_defconfig | 2 -- configs/evb-rk3328_defconfig | 2 -- configs/firefly-rk3288_defconfig | 2 -- configs/kylin-rk3036_defconfig | 2 -- configs/miqi-rk3288_defconfig | 2 -- configs/phycore-rk3288_defconfig | 2 -- configs/popmetal-rk3288_defconfig | 2 -- configs/rock64-rk3328_defconfig | 2 -- configs/tinker-rk3288_defconfig | 2 -- drivers/fastboot/Kconfig | 4 +++- 13 files changed, 3 insertions(+), 25 deletions(-)configs/evb-rk3036_defconfig +0
-2@@ -36,8 +36,6 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_SPL_BLK is not set CONFIG_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/evb-rk3128_defconfig +0
-2@@ -22,8 +22,6 @@ CONFIG_SYSCON=y CONFIG_CLK=y CONFIG_FASTBOOT_BUF_ADDR=0x60800800 CONFIG_FASTBOOT_BUF_SIZE=0x04000000 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/evb-rk3229_defconfig +0
-2@@ -44,8 +44,6 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_TPL_CLK=y CONFIG_FASTBOOT_BUF_SIZE=0x04000000 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/evb-rk3288_defconfig +0
-2@@ -44,8 +44,6 @@ CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/evb-rk3328_defconfig +0
-2@@ -48,8 +48,6 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_TPL_CLK=y CONFIG_FASTBOOT_BUF_ADDR=0x800800 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/firefly-rk3288_defconfig +0
-2@@ -46,8 +46,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/kylin-rk3036_defconfig +0
-2@@ -38,8 +38,6 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_SPL_BLK is not set CONFIG_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/miqi-rk3288_defconfig +0
-2@@ -46,8 +46,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/phycore-rk3288_defconfig +0
-2@@ -48,8 +48,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/popmetal-rk3288_defconfig +0
-2@@ -46,8 +46,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/rock64-rk3328_defconfig +0
-2@@ -51,8 +51,6 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_TPL_CLK=y CONFIG_FASTBOOT_BUF_ADDR=0x800800 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=yconfigs/tinker-rk3288_defconfig +0
-2@@ -48,8 +48,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=ydrivers/fastboot/Kconfig +1
-1@@ -64,7 +64,7 @@ config FASTBOOT_USB_DEV config FASTBOOT_FLASH bool "Enable FASTBOOT FLASH command" - default y if ARCH_SUNXI + default y if ARCH_SUNXI || ARCH_ROCKCHIP depends on MMC || (NAND && CMD_MTDPARTS) select IMAGE_SPARSE helpdrivers/fastboot/Kconfig endchoice · line 92
Quoted 4 lines
drivers/fastboot/Kconfig +1
-0@@ -89,6 +89,8 @@ endchoice config FASTBOOT_FLASH_MMC_DEV int "Define FASTBOOT MMC FLASH default device" depends on FASTBOOT_FLASH_MMC + default 1 if ROCKCHIP_RK3328We can use '0' for rk3328 and remove this line.
Quoted 3 lines
When we using fastboot, we suppose to access to eMMC, but not SDCard,
and the eMMC number is always '0' on Rockchip platform.
True, since the respective defconfig is using 1 I have used the same. will make another change to update that.
_______________________________________________
U-Boot mailing list
[email protected]
https://lists.denx.de/listinfo/u-boot
PATCH 6/9 usb: dwc3: Add phy interface for dwc3_uboot
In reply to a message not in the archiveU-Boot has two different variants of dwc3 initializations,
- with dm variant gadget, so the respective dm driver would call the dwc3_init in core.
- with non-dm variant gadget, so the usage board file would call dwc3_uboot_init in core.
The driver probe would handle all respective gadget properties including phy interface via phy_type property and then trigger dwc3_init for dm-variant gadgets.
So, to support the phy interface for non-dm variant gadgets, the better option is dwc3_uboot_init since there is no dedicated controller for non-dm variant gadgets.
This patch support for adding phy interface like 8/16-bit UTMI+ code for dwc3_uboot.
This change used Linux phy.h enum list, to make proper code compatibility.
--- drivers/usb/dwc3/core.c | 26 ++++++++++++++++++++++++++ drivers/usb/dwc3/core.h | 12 ++++++++++++ include/dwc3-uboot.h | 2 ++ include/linux/usb/phy.h | 19 +++++++++++++++++++ 4 files changed, 59 insertions(+) create mode 100644 include/linux/usb/phy.h
drivers/usb/dwc3/core.c +26 -0
@@ -600,6 +600,30 @@ static void dwc3_core_exit_mode(struct dwc3 *dwc) } } +static void dwc3_uboot_hsphy_mode (struct dwc3_device *dwc3_dev,struct dwc3 *dwc) +{ +enum usb_phy_interface hsphy_mode = dwc3_dev->hsphy_mode; +u32 reg; + +/* Set dwc3 usb2 phy config */ + reg =dwc3_readl (dwc->regs,DWC3_GUSB2PHYCFG (0 )); + reg |=DWC3_GUSB2PHYCFG_PHYIF ; + reg &= ~DWC3_GUSB2PHYCFG_USBTRDTIM_MASK ; + +switch (hsphy_mode) { +case USBPHY_INTERFACE_MODE_UTMI : + reg |=DWC3_GUSB2PHYCFG_USBTRDTIM_8BIT ; +break ; +case USBPHY_INTERFACE_MODE_UTMIW : + reg |=DWC3_GUSB2PHYCFG_USBTRDTIM_16BIT ; +break ; +default : +break ; + } + +dwc3_writel (dwc->regs,DWC3_GUSB2PHYCFG (0 ), reg); +} +#define DWC3_ALIGN_MASK (16 - 1)/**
@@ -708,6 +732,8 @@ int dwc3_uboot_init(struct dwc3_device *dwc3_dev) goto err0; } +dwc3_uboot_hsphy_mode (dwc3_dev, dwc); + ret =dwc3_event_buffers_setup (dwc);if (ret) {dev_err (dwc->dev,"failed to setup event buffers\n" );
drivers/usb/dwc3/core.h +12 -0
@@ -162,6 +162,18 @@/* Global USB2 PHY Configuration Register */ #define DWC3_GUSB2PHYCFG_PHYSOFTRST (1 << 31)#define DWC3_GUSB2PHYCFG_SUSPHY (1 << 6) +#define DWC3_GUSB2PHYCFG_PHYIF (1 << 3) + +/* Global USB2 PHY Configuration Mask */ +#define DWC3_GUSB2PHYCFG_USBTRDTIM_MASK (0xf << 10) + +/* Global USB2 PHY Configuration Offset */ +#define DWC3_GUSB2PHYCFG_USBTRDTIM_OFFSET 10 + +#define DWC3_GUSB2PHYCFG_USBTRDTIM_16BIT (0x5 << \ + DWC3_GUSB2PHYCFG_USBTRDTIM_OFFSET) +#define DWC3_GUSB2PHYCFG_USBTRDTIM_8BIT (0x9 << \ + DWC3_GUSB2PHYCFG_USBTRDTIM_OFFSET)/* Global USB3 PIPE Control Register */ #define DWC3_GUSB3PIPECTL_PHYSOFTRST (1 << 31)
include/dwc3-uboot.h +2 -0
@@ -10,10 +10,12 @@#define __DWC3_UBOOT_H_#include <linux/usb/otg.h> +#include <linux/usb/phy.h> struct dwc3_device {unsigned long base;enum usb_dr_mode dr_mode; +enum usb_phy_interface hsphy_mode;u32 maximum_speed;unsigned tx_fifo_resize:1 ;unsigned has_lpm_erratum;
include/linux/usb/phy.h new file +19 -0
@@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* USB PHY defines +* +* These APIs may be used between USB controllers. USB device drivers +* (for either host or peripheral roles) don't use these calls; they +* continue to use just usb_device and usb_gadget. +*/ + +#ifndef __LINUX_USB_PHY_H +#define __LINUX_USB_PHY_H + +enum usb_phy_interface { +USBPHY_INTERFACE_MODE_UNKNOWN , +USBPHY_INTERFACE_MODE_UTMI , +USBPHY_INTERFACE_MODE_UTMIW , +}; + +#endif /* __LINUX_USB_PHY_H */
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 7/9 gadget: rockchip: Add rk3399 USB_GADGET_PRODUCT_NUM
In reply to a message not in the archiveAdd 0x330a for rk3399 gadget product number.
--- drivers/usb/gadget/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/Kconfig +1 -1
@@ -61,7 +61,7 @@ config USB_GADGET_PRODUCT_NUM default 0x310a if ROCKCHIP_RK3036 default 0x310c if ROCKCHIP_RK3128 default 0x320a if ROCKCHIP_RK3229 || ROCKCHIP_RK3288 - default 0x330a if ROCKCHIP_RK3328 + default 0x330a if ROCKCHIP_RK3328 || ROCKCHIP_RK3399 default 0x0 help Product ID of the USB device emulated, reported to the host device.
Signature · 1 line
2.18.0.321.gffc6fa0e3
Re: [PATCH 7/9] gadget: rockchip: Add rk3399 USB_GADGET_PRODUCT_NUM
Quoted 12 lines · Jagan Teki
Add
0x330afor rk3399 gadget product number.Signed-off-by Jagan Teki <[email protected]>--- drivers/usb/gadget/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/usb/gadget/Kconfig +0
-0
drivers/usb/gadget/Kconfig config USB_GADGET_PRODUCT_NUM · line 67
Quoted 8 lines
drivers/usb/gadget/Kconfig +1
-1@@ -61,7 +61,7 @@ config USB_GADGET_PRODUCT_NUM default 0x310a if ROCKCHIP_RK3036 default 0x310c if ROCKCHIP_RK3128 default 0x320a if ROCKCHIP_RK3229 || ROCKCHIP_RK3288 - default 0x330a if ROCKCHIP_RK3328 + default 0x330a if ROCKCHIP_RK3328 || ROCKCHIP_RK3399 default 0x0 help Product ID of the USB device emulated, reported to the host device.
With 0x330a, the device shown in lsusb is:
Bus 002 Device 024: ID 2207:330a Fuzhou Rockchip Electronics Company RK3368 in Mask ROM mode
While using 0x330c, the device shown in lsusb is:
Bus 002 Device 025: ID 2207:330c Fuzhou Rockchip Electronics Company RK3399 in Mask ROM mode
Therefore, this should be modified to use 0x330c:
+ default 0x330c if ROCKCHIP_RK3399
Thanks
Signature · 7 lines
Levin Du _______________________________________________ U-Boot mailing list [email protected] https://lists.denx.de/listinfo/u-boot
A message that is not in the archive (sent off-list or not yet received): 87y2x3ga9q.fsf-sOhrXWSnOqapXNIQCVAXCG0Lkn3mC4nZ0tOlhedn3YvkypF1WZHjJXhe7Zk3YmMvjmZSf7Nhrd8@public.gmane.org
Re: [PATCH 7/9] gadget: rockchip: Add rk3399 USB_GADGET_PRODUCT_NUM
Quoted 26 lines · On Tue, Oct 29, 2019 at 3:10 PM <[email protected]>…
Quoted 12 lines · Jagan Teki
Add
0x330afor rk3399 gadget product number.--- drivers/usb/gadget/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/usb/gadget/Kconfig +0
-0drivers/usb/gadget/Kconfig config USB_GADGET_PRODUCT_NUM · line 67
Quoted 8 lines
drivers/usb/gadget/Kconfig +1
-1@@ -61,7 +61,7 @@ config USB_GADGET_PRODUCT_NUM default 0x310a if ROCKCHIP_RK3036 default 0x310c if ROCKCHIP_RK3128 default 0x320a if ROCKCHIP_RK3229 || ROCKCHIP_RK3288 - default 0x330a if ROCKCHIP_RK3328 + default 0x330a if ROCKCHIP_RK3328 || ROCKCHIP_RK3399 default 0x0 help Product ID of the USB device emulated, reported to the host device.With
0x330a, the device shown inlsusbis:
Quoted 8 lines
Bus 002 Device 024: ID 2207:330a Fuzhou Rockchip Electronics Company RK3368 in Mask ROM mode
While using0x330c, the device shown inlsusbis:Bus 002 Device 025: ID 2207:330c Fuzhou Rockchip Electronics Company RK3399 in Mask ROM mode
Therefore, this should be modified to use
0x330c:+ default
0x330cifROCKCHIP_RK3399
Can you link the host driver for the rockchip gadget, I didn't see the name using lsusb. My output on ubuntu host is
Bus 001 Device 009: ID 2207:330a
PATCH 8/9 rockchip: Setup dwc3_device (for non-dm gadgets)
In reply to a message not in the archiveSetup dwc3_device structure for non-dm gadgets, which is used in rk3399 platforms.
dwc3_device would have basic regbase, dr_mode, high speed and 16-bit UTMI+ etc.
--- arch/arm/mach-rockchip/board.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)
arch/arm/mach-rockchip/board.c +30 -2
@@ -49,8 +49,10 @@ void enable_caches(void) }#endif -#if defined(CONFIG_USB_GADGET ) && defined(CONFIG_USB_GADGET_DWC2_OTG ) +#if defined(CONFIG_USB_GADGET )#include <usb.h> + +#if defined(CONFIG_USB_GADGET_DWC2_OTG )#include <usb/dwc2_udc.h> static struct dwc2_plat_otg_data otg_data = {
@@ -91,7 +93,33 @@ int board_usb_cleanup(int index, enum usb_init_type init) {return 0 ; } -#endif +#endif /* CONFIG_USB_GADGET_DWC2_OTG */ + +#if defined(CONFIG_USB_DWC3 ) && !defined(CONFIG_DM_USB_GADGET ) +#include <dwc3-uboot.h> + +static struct dwc3_device dwc3_device_data = { + .maximum_speed =USB_SPEED_HIGH , + .base =0xfe800000 , + .dr_mode =USB_DR_MODE_PERIPHERAL , + .index =0 , + .dis_u2_susphy_quirk =1 , + .hsphy_mode =USBPHY_INTERFACE_MODE_UTMIW , +}; + +int usb_gadget_handle_interrupts (void ) +{ +dwc3_uboot_handle_interrupt (0 ); +return 0 ; +} + +int board_usb_init (int index,enum usb_init_type init) +{ +return dwc3_uboot_init (&dwc3_device_data); +} +#endif /* CONFIG_USB_DWC3 */ + +#endif /* CONFIG_USB_GADGET */ #if CONFIG_IS_ENABLED (FASTBOOT )int fastboot_set_reboot_flag (void )
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 9/9 rockchip: rk3399: Enable fastboot
In reply to a message not in the archiveEnable fastboot on NanoPC-T4 and ROC-PC based rk3399 boards.
--- configs/nanopc-t4-rk3399_defconfig | 3 +++ configs/roc-rk3399-pc_defconfig | 3 +++ 2 files changed, 6 insertions(+)
configs/nanopc-t4-rk3399_defconfig +3 -0
@@ -53,5 +53,8 @@ CONFIG_USB_ETHER_ASIX88179=y CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_RTL8152=y CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_USB_GADGET=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_GADGET=y CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y
configs/roc-rk3399-pc_defconfig +3 -0
@@ -54,5 +54,8 @@ CONFIG_USB_ETHER_ASIX88179=y CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_RTL8152=y CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_USB_GADGET=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_GADGET=y CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y
Signature · 1 line
2.18.0.321.gffc6fa0e3
Quoted 57 lines · Jagan Teki
This patchset add fastboot support on RK3399 and also rework of CONFIG items related to fastboot support.
patch 0001 - 0005: existing gadget, fastboot config move
patch 0006: add phy interface for
dwc3_ubootpatch 0007: 0008: dwc3 setup for rk3399
patch 0009: enable fastboot, nanopc-t4, roc-pc
SD card work fine, but eMMC seems unstable when partitioning with gpt like below but it can be problem with fastboot though.
=> gpt write mmc 0 $partitions
Writing GPT: mmc write failed
** Can't write to device 0 **
** Can't write to device 0 **
error!
=> gpt verify mmc 0 $partitions
GUID Partition Table Header signature is wrong:0x0!=0x5452415020494645gpt_verify_headers: *** ERROR: Invalid GPT ***
Verify GPT: error!Any inputs?
Jagan.Jagan Teki (9):
gadget: SelectUSB_GADGET_MANUFACTURERfor rockchip
gadget: SelectUSB_GADGET_VENDOR_NUMfor rockchip
gadget: rockchip:USB_GADGET_PRODUCT_NUM
gadget: rockchip: Add rk3128USB_GADGET_PRODUCT_NUM
fastboot: rockchip: Select FASTBOOT_FLASH[_MMC_DEV]
usb: dwc3: Add phy interface fordwc3_uboot
gadget: rockchip: Add rk3399USB_GADGET_PRODUCT_NUM
rockchip: Setupdwc3_device(for non-dm gadgets) [DO NOT MERGE] rockchip: rk3399: Enable fastbootarch/arm/mach-rockchip/board.c | 32 ++++++++++++++++++++++++++++-- configs/elgin-rv1108_defconfig | 2 -- configs/evb-rk3036_defconfig | 5 ----- configs/evb-rk3128_defconfig | 2 -- configs/evb-rk3229_defconfig | 5 ----- configs/evb-rk3288_defconfig | 5 ----- configs/evb-rk3328_defconfig | 5 ----- configs/evb-rv1108_defconfig | 2 -- configs/firefly-rk3288_defconfig | 5 ----- configs/kylin-rk3036_defconfig | 5 ----- configs/miqi-rk3288_defconfig | 5 ----- configs/nanopc-t4-rk3399_defconfig | 3 +++ configs/phycore-rk3288_defconfig | 5 ----- configs/popmetal-rk3288_defconfig | 5 ----- configs/roc-rk3399-pc_defconfig | 3 +++ configs/rock2_defconfig | 2 -- configs/rock64-rk3328_defconfig | 5 ----- configs/tinker-rk3288_defconfig | 5 ----- configs/vyasa-rk3288_defconfig | 3 ---
Quoted 8 lines
drivers/fastboot/Kconfig | 4 +++- drivers/usb/dwc3/core.c | 26 ++++++++++++++++++++++++ drivers/usb/dwc3/core.h | 12 +++++++++++ drivers/usb/gadget/Kconfig | 6 ++++++ include/dwc3-uboot.h | 2 ++ include/linux/usb/phy.h | 19 ++++++++++++++++++ 25 files changed, 104 insertions(+), 69 deletions(-) create mode 100644 include/linux/usb/phy.h
I also tested rockusb and ums after this patch series on v2019.10, which work like a charm, with just a little glitches of the following messages appear in the serial console:
request 00000000f5f3fec0 was not queued to ep1in-bulk request 00000000f5f3fec0 was not queued to ep1in-bulk request 00000000f5f3fec0 was not queued to ep1in-bulk (repeat when there're read/write ops)
Thanks for your great work!
Signature · 7 lines
Levin Du _______________________________________________ U-Boot mailing list [email protected] https://lists.denx.de/listinfo/u-boot