From 658663e93c39ba479c94dd845441daee1dcbc170 Mon Sep 17 00:00:00 2001 From: DHDAXCW Date: Mon, 22 Apr 2024 09:52:36 +0800 Subject: [PATCH] uboot-rockchip: Update to 2024.04 --- package/boot/uboot-rockchip/Makefile | 4 +- .../100-spl-Add-Kconfig-options-for-ADC.patch | 2 +- ...se-dwc3-generic-driver-on-RK3328-and.patch | 561 ------------------ ...ove-dwc3-usb-init-and-gadget-handler.patch | 131 ---- ...e-PCI-to-discover-network-controller.patch | 10 +- ...ard_rng_seed-for-all-Rockchip-device.patch | 104 ---- .../patches/900-arm-add-dts-files.patch | 2 +- 7 files changed, 9 insertions(+), 805 deletions(-) delete mode 100644 package/boot/uboot-rockchip/patches/102-configs-rockchip-Use-dwc3-generic-driver-on-RK3328-and.patch delete mode 100644 package/boot/uboot-rockchip/patches/103-rockchip-board-Remove-dwc3-usb-init-and-gadget-handler.patch delete mode 100644 package/boot/uboot-rockchip/patches/106-rockchip-board-Add-board_rng_seed-for-all-Rockchip-device.patch diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile index a5f4cd04f..a549c61fc 100644 --- a/package/boot/uboot-rockchip/Makefile +++ b/package/boot/uboot-rockchip/Makefile @@ -5,9 +5,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk -PKG_VERSION:=2024.01 +PKG_VERSION:=2024.04 PKG_RELEASE:=1 -PKG_HASH:=b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 +PKG_HASH:=18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a PKG_MAINTAINER:=Tobias Maedel diff --git a/package/boot/uboot-rockchip/patches/100-spl-Add-Kconfig-options-for-ADC.patch b/package/boot/uboot-rockchip/patches/100-spl-Add-Kconfig-options-for-ADC.patch index af4cef623..cfa802aad 100644 --- a/package/boot/uboot-rockchip/patches/100-spl-Add-Kconfig-options-for-ADC.patch +++ b/package/boot/uboot-rockchip/patches/100-spl-Add-Kconfig-options-for-ADC.patch @@ -21,7 +21,7 @@ Signed-off-by: Chris Morgan --- a/common/spl/Kconfig +++ b/common/spl/Kconfig -@@ -579,6 +579,13 @@ config SPL_FIT_IMAGE_TINY +@@ -595,6 +595,13 @@ config SPL_FIT_IMAGE_TINY ensure this information is available to the next image invoked). diff --git a/package/boot/uboot-rockchip/patches/102-configs-rockchip-Use-dwc3-generic-driver-on-RK3328-and.patch b/package/boot/uboot-rockchip/patches/102-configs-rockchip-Use-dwc3-generic-driver-on-RK3328-and.patch deleted file mode 100644 index ecef16600..000000000 --- a/package/boot/uboot-rockchip/patches/102-configs-rockchip-Use-dwc3-generic-driver-on-RK3328-and.patch +++ /dev/null @@ -1,561 +0,0 @@ -From a7503c6fffae2d7ec85f92b76d64f2cfd1a464c5 Mon Sep 17 00:00:00 2001 -From: Jonas Karlman -Date: Sun, 12 Nov 2023 17:48:57 +0000 -Subject: [PATCH] configs: rockchip: Use dwc3-generic driver on RK3328 and - RK3399 - -Complete the transition away from xhci-dwc3 and dwc3-of-simple drivers -and change to use the dwc3-generic driver on remaining RK3328 and RK3399 -boards. - -MISC, USB_DWC3 and USB_DWC3_GENERIC is enabled on boards that used to -enable USB_XHCI_DWC3. USB_XHCI_DWC3 is dropped from updated boards along -with the default y of USB_XHCI_DWC3_OF_SIMPLE. - -There is no intended change in functionality with this changes, USB 3.0 -is expected to continue same as before this change. - -Signed-off-by: Jonas Karlman ---- - configs/chromebook_bob_defconfig | 2 +- - configs/chromebook_kevin_defconfig | 2 +- - configs/eaidk-610-rk3399_defconfig | 4 +++- - configs/evb-rk3399_defconfig | 1 - - configs/firefly-rk3399_defconfig | 1 - - configs/khadas-edge-captain-rk3399_defconfig | 4 +++- - configs/khadas-edge-rk3399_defconfig | 4 +++- - configs/khadas-edge-v-rk3399_defconfig | 4 +++- - configs/leez-rk3399_defconfig | 4 +++- - configs/nanopc-t4-rk3399_defconfig | 3 ++- - configs/nanopi-m4-2gb-rk3399_defconfig | 4 +++- - configs/nanopi-m4-rk3399_defconfig | 4 +++- - configs/nanopi-m4b-rk3399_defconfig | 4 +++- - configs/nanopi-neo4-rk3399_defconfig | 4 +++- - configs/nanopi-r4s-rk3399_defconfig | 3 ++- - configs/orangepi-r1-plus-lts-rk3328_defconfig | 3 ++- - configs/orangepi-r1-plus-rk3328_defconfig | 3 ++- - configs/orangepi-rk3399_defconfig | 4 +++- - configs/pinebook-pro-rk3399_defconfig | 1 - - configs/pinephone-pro-rk3399_defconfig | 1 - - configs/puma-rk3399_defconfig | 1 - - configs/roc-pc-mezzanine-rk3399_defconfig | 1 - - configs/roc-pc-rk3399_defconfig | 1 - - configs/rock-4c-plus-rk3399_defconfig | 1 - - configs/rock-4se-rk3399_defconfig | 1 - - configs/rock-pi-4-rk3399_defconfig | 1 - - configs/rock-pi-4c-rk3399_defconfig | 1 - - configs/rock-pi-n10-rk3399pro_defconfig | 1 - - configs/rock960-rk3399_defconfig | 3 ++- - configs/rockpro64-rk3399_defconfig | 1 - - drivers/usb/host/Kconfig | 1 - - 31 files changed, 42 insertions(+), 31 deletions(-) - ---- a/configs/chromebook_bob_defconfig -+++ b/configs/chromebook_bob_defconfig -@@ -98,12 +98,12 @@ CONFIG_ROCKCHIP_SPI=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_OHCI_HCD=y - CONFIG_USB_OHCI_GENERIC=y - CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GENERIC=y - CONFIG_USB_KEYBOARD=y - CONFIG_USB_HOST_ETHER=y - CONFIG_USB_ETHER_ASIX=y ---- a/configs/chromebook_kevin_defconfig -+++ b/configs/chromebook_kevin_defconfig -@@ -99,12 +99,12 @@ CONFIG_ROCKCHIP_SPI=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_OHCI_HCD=y - CONFIG_USB_OHCI_GENERIC=y - CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GENERIC=y - CONFIG_USB_KEYBOARD=y - CONFIG_USB_HOST_ETHER=y - CONFIG_USB_ETHER_ASIX=y ---- a/configs/eaidk-610-rk3399_defconfig -+++ b/configs/eaidk-610-rk3399_defconfig -@@ -40,6 +40,7 @@ CONFIG_ENV_IS_IN_MMC=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_MISC=y - CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y -@@ -56,8 +57,9 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y -+CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GENERIC=y - CONFIG_SPL_TINY_MEMSET=y - CONFIG_ERRNO_STR=y ---- a/configs/evb-rk3399_defconfig -+++ b/configs/evb-rk3399_defconfig -@@ -66,7 +66,6 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_DWC3=y ---- a/configs/firefly-rk3399_defconfig -+++ b/configs/firefly-rk3399_defconfig -@@ -66,7 +66,6 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_DWC3=y ---- a/configs/khadas-edge-captain-rk3399_defconfig -+++ b/configs/khadas-edge-captain-rk3399_defconfig -@@ -43,6 +43,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y - CONFIG_NET_RANDOM_ETHADDR=y - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_MISC=y - CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y -@@ -61,11 +62,12 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_OHCI_HCD=y - CONFIG_USB_OHCI_GENERIC=y -+CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GENERIC=y - CONFIG_USB_HOST_ETHER=y - CONFIG_USB_ETHER_ASIX=y - CONFIG_USB_ETHER_ASIX88179=y ---- a/configs/khadas-edge-rk3399_defconfig -+++ b/configs/khadas-edge-rk3399_defconfig -@@ -42,6 +42,7 @@ CONFIG_ENV_IS_IN_MMC=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_MISC=y - CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y -@@ -60,11 +61,12 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_OHCI_HCD=y - CONFIG_USB_OHCI_GENERIC=y -+CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GENERIC=y - CONFIG_USB_HOST_ETHER=y - CONFIG_USB_ETHER_ASIX=y - CONFIG_USB_ETHER_ASIX88179=y ---- a/configs/khadas-edge-v-rk3399_defconfig -+++ b/configs/khadas-edge-v-rk3399_defconfig -@@ -43,6 +43,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y - CONFIG_NET_RANDOM_ETHADDR=y - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_MISC=y - CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y -@@ -61,11 +62,12 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_OHCI_HCD=y - CONFIG_USB_OHCI_GENERIC=y -+CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GENERIC=y - CONFIG_USB_HOST_ETHER=y - CONFIG_USB_ETHER_ASIX=y - CONFIG_USB_ETHER_ASIX88179=y ---- a/configs/leez-rk3399_defconfig -+++ b/configs/leez-rk3399_defconfig -@@ -39,6 +39,7 @@ CONFIG_ENV_IS_IN_MMC=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_MISC=y - CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y -@@ -56,9 +57,10 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y -+CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GENERIC=y - CONFIG_USB_HOST_ETHER=y - CONFIG_USB_ETHER_ASIX=y - CONFIG_USB_ETHER_ASIX88179=y ---- a/configs/nanopc-t4-rk3399_defconfig -+++ b/configs/nanopc-t4-rk3399_defconfig -@@ -43,6 +43,7 @@ CONFIG_ENV_IS_IN_MMC=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_MISC=y - CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y -@@ -60,10 +61,10 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GENERIC=y - CONFIG_USB_KEYBOARD=y - CONFIG_USB_HOST_ETHER=y - CONFIG_USB_ETHER_ASIX=y ---- a/configs/nanopi-m4-2gb-rk3399_defconfig -+++ b/configs/nanopi-m4-2gb-rk3399_defconfig -@@ -40,6 +40,7 @@ CONFIG_ENV_IS_IN_MMC=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_MISC=y - CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y -@@ -56,9 +57,10 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y -+CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GENERIC=y - CONFIG_USB_KEYBOARD=y - CONFIG_USB_HOST_ETHER=y - CONFIG_USB_ETHER_ASIX=y ---- a/configs/nanopi-m4-rk3399_defconfig -+++ b/configs/nanopi-m4-rk3399_defconfig -@@ -40,6 +40,7 @@ CONFIG_ENV_IS_IN_MMC=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_MISC=y - CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y -@@ -56,9 +57,10 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y -+CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GENERIC=y - CONFIG_USB_KEYBOARD=y - CONFIG_USB_HOST_ETHER=y - CONFIG_USB_ETHER_ASIX=y ---- a/configs/nanopi-m4b-rk3399_defconfig -+++ b/configs/nanopi-m4b-rk3399_defconfig -@@ -40,6 +40,7 @@ CONFIG_ENV_IS_IN_MMC=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_MISC=y - CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y -@@ -56,9 +57,10 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y -+CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GENERIC=y - CONFIG_USB_KEYBOARD=y - CONFIG_USB_HOST_ETHER=y - CONFIG_USB_ETHER_ASIX=y ---- a/configs/nanopi-neo4-rk3399_defconfig -+++ b/configs/nanopi-neo4-rk3399_defconfig -@@ -40,6 +40,7 @@ CONFIG_ENV_IS_IN_MMC=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_MISC=y - CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y -@@ -56,9 +57,10 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y -+CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GENERIC=y - CONFIG_USB_KEYBOARD=y - CONFIG_USB_HOST_ETHER=y - CONFIG_USB_ETHER_ASIX=y ---- a/configs/nanopi-r4s-rk3399_defconfig -+++ b/configs/nanopi-r4s-rk3399_defconfig -@@ -63,9 +63,10 @@ CONFIG_SYSINFO_SMBIOS=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y -+CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GENERIC=y - CONFIG_USB_KEYBOARD=y - CONFIG_USB_HOST_ETHER=y - CONFIG_USB_ETHER_ASIX=y ---- a/configs/orangepi-r1-plus-lts-rk3328_defconfig -+++ b/configs/orangepi-r1-plus-lts-rk3328_defconfig -@@ -71,6 +71,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 - CONFIG_FASTBOOT_CMD_OEM_FORMAT=y - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_MISC=y - CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_SPI_FLASH_GIGADEVICE=y -@@ -99,7 +100,6 @@ CONFIG_SYSRESET=y - # CONFIG_TPL_SYSRESET is not set - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_OHCI_HCD=y -@@ -107,6 +107,7 @@ CONFIG_USB_OHCI_GENERIC=y - CONFIG_USB_DWC2=y - CONFIG_USB_DWC3=y - # CONFIG_USB_DWC3_GADGET is not set -+CONFIG_USB_DWC3_GENERIC=y - CONFIG_USB_GADGET=y - CONFIG_USB_GADGET_DWC2_OTG=y - CONFIG_SPL_TINY_MEMSET=y ---- a/configs/orangepi-r1-plus-rk3328_defconfig -+++ b/configs/orangepi-r1-plus-rk3328_defconfig -@@ -71,6 +71,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 - CONFIG_FASTBOOT_CMD_OEM_FORMAT=y - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_MISC=y - CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_SPI_FLASH_GIGADEVICE=y -@@ -99,7 +100,6 @@ CONFIG_SYSRESET=y - # CONFIG_TPL_SYSRESET is not set - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_OHCI_HCD=y -@@ -107,6 +107,7 @@ CONFIG_USB_OHCI_GENERIC=y - CONFIG_USB_DWC2=y - CONFIG_USB_DWC3=y - # CONFIG_USB_DWC3_GADGET is not set -+CONFIG_USB_DWC3_GENERIC=y - CONFIG_USB_GADGET=y - CONFIG_USB_GADGET_DWC2_OTG=y - CONFIG_SPL_TINY_MEMSET=y ---- a/configs/orangepi-rk3399_defconfig -+++ b/configs/orangepi-rk3399_defconfig -@@ -40,6 +40,7 @@ CONFIG_ENV_IS_IN_MMC=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_MISC=y - CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y -@@ -56,9 +57,10 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y -+CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GENERIC=y - CONFIG_USB_HOST_ETHER=y - CONFIG_USB_ETHER_ASIX=y - CONFIG_USB_ETHER_ASIX88179=y ---- a/configs/pinebook-pro-rk3399_defconfig -+++ b/configs/pinebook-pro-rk3399_defconfig -@@ -96,7 +96,6 @@ CONFIG_ROCKCHIP_SPI=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_OHCI_HCD=y ---- a/configs/pinephone-pro-rk3399_defconfig -+++ b/configs/pinephone-pro-rk3399_defconfig -@@ -85,7 +85,6 @@ CONFIG_ROCKCHIP_SPI=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_OHCI_HCD=y ---- a/configs/puma-rk3399_defconfig -+++ b/configs/puma-rk3399_defconfig -@@ -97,7 +97,6 @@ CONFIG_ROCKCHIP_SPI=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_DWC3=y ---- a/configs/roc-pc-mezzanine-rk3399_defconfig -+++ b/configs/roc-pc-mezzanine-rk3399_defconfig -@@ -81,7 +81,6 @@ CONFIG_ROCKCHIP_SPI=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_DWC3=y ---- a/configs/roc-pc-rk3399_defconfig -+++ b/configs/roc-pc-rk3399_defconfig -@@ -82,7 +82,6 @@ CONFIG_ROCKCHIP_SPI=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_OHCI_HCD=y ---- a/configs/rock-4c-plus-rk3399_defconfig -+++ b/configs/rock-4c-plus-rk3399_defconfig -@@ -74,7 +74,6 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_DWC3=y ---- a/configs/rock-4se-rk3399_defconfig -+++ b/configs/rock-4se-rk3399_defconfig -@@ -76,7 +76,6 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_DWC3=y ---- a/configs/rock-pi-4-rk3399_defconfig -+++ b/configs/rock-pi-4-rk3399_defconfig -@@ -77,7 +77,6 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_DWC3=y ---- a/configs/rock-pi-4c-rk3399_defconfig -+++ b/configs/rock-pi-4c-rk3399_defconfig -@@ -74,7 +74,6 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_DWC3=y ---- a/configs/rock-pi-n10-rk3399pro_defconfig -+++ b/configs/rock-pi-n10-rk3399pro_defconfig -@@ -68,7 +68,6 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_DWC3=y ---- a/configs/rock960-rk3399_defconfig -+++ b/configs/rock960-rk3399_defconfig -@@ -50,6 +50,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y - CONFIG_SYS_MMC_ENV_DEV=1 - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_MISC=y - CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y -@@ -70,12 +71,12 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_OHCI_HCD=y - CONFIG_USB_OHCI_GENERIC=y - CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GENERIC=y - CONFIG_USB_KEYBOARD=y - CONFIG_USB_HOST_ETHER=y - CONFIG_USB_ETHER_ASIX=y ---- a/configs/rockpro64-rk3399_defconfig -+++ b/configs/rockpro64-rk3399_defconfig -@@ -93,7 +93,6 @@ CONFIG_ROCKCHIP_SPI=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y --CONFIG_USB_XHCI_DWC3=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y - CONFIG_USB_OHCI_HCD=y ---- a/drivers/usb/host/Kconfig -+++ b/drivers/usb/host/Kconfig -@@ -39,7 +39,6 @@ config USB_XHCI_DWC3 - config USB_XHCI_DWC3_OF_SIMPLE - bool "DesignWare USB3 DRD Generic OF Simple Glue Layer" - depends on DM_USB -- default y if ARCH_ROCKCHIP - default y if DRA7XX - help - Support USB2/3 functionality in simple SoC integrations with diff --git a/package/boot/uboot-rockchip/patches/103-rockchip-board-Remove-dwc3-usb-init-and-gadget-handler.patch b/package/boot/uboot-rockchip/patches/103-rockchip-board-Remove-dwc3-usb-init-and-gadget-handler.patch deleted file mode 100644 index 21c6b3414..000000000 --- a/package/boot/uboot-rockchip/patches/103-rockchip-board-Remove-dwc3-usb-init-and-gadget-handler.patch +++ /dev/null @@ -1,131 +0,0 @@ -From ed7a42771f3b72c2cd51942b525ea6ba8935578d Mon Sep 17 00:00:00 2001 -From: Jonas Karlman -Date: Sun, 12 Nov 2023 17:48:58 +0000 -Subject: [PATCH] rockchip: board: Remove dwc3 usb init and gadget handler - functions - -Remove board_usb_init() and dm_usb_gadget_handle_interrupts() functions -related to dwc3, they use e.g. a hard-coded reg address for RK3399 and -are obsolete with use of DM_USB_GADGET. - -Use of DM_USB_GADGET, USB_DWC3_GENERIC and USB_DWC3_GADGET have replaced -same feature provided by the removed functions on RK3399 boards. - -Signed-off-by: Jonas Karlman ---- - arch/arm/Kconfig | 1 + - arch/arm/mach-rockchip/board.c | 30 +----------------------- - configs/nanopc-t6-rk3588_defconfig | 1 - - configs/orangepi-5-plus-rk3588_defconfig | 1 - - configs/orangepi-5-rk3588s_defconfig | 1 - - configs/rock5a-rk3588s_defconfig | 1 - - configs/rock5b-rk3588_defconfig | 1 - - 7 files changed, 2 insertions(+), 34 deletions(-) - ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -1974,6 +1974,7 @@ config ARCH_ROCKCHIP - select DM_SERIAL - select DM_SPI - select DM_SPI_FLASH -+ select DM_USB_GADGET if USB_DWC3_GADGET - select ENABLE_ARM_SOC_BOOT0_HOOK - select OF_CONTROL - select SPI ---- a/arch/arm/mach-rockchip/board.c -+++ b/arch/arm/mach-rockchip/board.c -@@ -208,10 +208,8 @@ void enable_caches(void) - } - #endif - --#if defined(CONFIG_USB_GADGET) -+#if defined(CONFIG_USB_GADGET) && defined(CONFIG_USB_GADGET_DWC2_OTG) - #include -- --#if defined(CONFIG_USB_GADGET_DWC2_OTG) - #include - #include - -@@ -287,32 +285,6 @@ int board_usb_cleanup(int index, enum us - } - #endif /* CONFIG_USB_GADGET_DWC2_OTG */ - --#if defined(CONFIG_USB_DWC3_GADGET) && !defined(CONFIG_DM_USB_GADGET) --#include -- --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 dm_usb_gadget_handle_interrupts(struct udevice *dev) --{ -- dwc3_uboot_handle_interrupt(dev); -- return 0; --} -- --int board_usb_init(int index, enum usb_init_type init) --{ -- return dwc3_uboot_init(&dwc3_device_data); --} --#endif /* CONFIG_USB_DWC3_GADGET */ -- --#endif /* CONFIG_USB_GADGET */ -- - #if IS_ENABLED(CONFIG_FASTBOOT) - int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) - { ---- a/configs/nanopc-t6-rk3588_defconfig -+++ b/configs/nanopc-t6-rk3588_defconfig -@@ -91,7 +91,6 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_ROCKCHIP_SFC=y - CONFIG_SYSRESET=y - CONFIG_USB=y --CONFIG_DM_USB_GADGET=y - CONFIG_USB_XHCI_HCD=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y ---- a/configs/orangepi-5-plus-rk3588_defconfig -+++ b/configs/orangepi-5-plus-rk3588_defconfig -@@ -94,7 +94,6 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_ROCKCHIP_SFC=y - CONFIG_SYSRESET=y - CONFIG_USB=y --CONFIG_DM_USB_GADGET=y - CONFIG_USB_XHCI_HCD=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y ---- a/configs/orangepi-5-rk3588s_defconfig -+++ b/configs/orangepi-5-rk3588s_defconfig -@@ -91,7 +91,6 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_ROCKCHIP_SFC=y - CONFIG_SYSRESET=y - CONFIG_USB=y --CONFIG_DM_USB_GADGET=y - CONFIG_USB_XHCI_HCD=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y ---- a/configs/rock5a-rk3588s_defconfig -+++ b/configs/rock5a-rk3588s_defconfig -@@ -75,7 +75,6 @@ CONFIG_DEBUG_UART_SHIFT=2 - CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y - CONFIG_USB=y --CONFIG_DM_USB_GADGET=y - CONFIG_USB_XHCI_HCD=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y ---- a/configs/rock5b-rk3588_defconfig -+++ b/configs/rock5b-rk3588_defconfig -@@ -99,7 +99,6 @@ CONFIG_SYS_NS16550_MEM32=y - CONFIG_ROCKCHIP_SFC=y - CONFIG_SYSRESET=y - CONFIG_USB=y --CONFIG_DM_USB_GADGET=y - CONFIG_USB_XHCI_HCD=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_EHCI_GENERIC=y diff --git a/package/boot/uboot-rockchip/patches/105-bootstd-efi-Initialize-PCI-to-discover-network-controller.patch b/package/boot/uboot-rockchip/patches/105-bootstd-efi-Initialize-PCI-to-discover-network-controller.patch index e7d92dfb7..045054a27 100644 --- a/package/boot/uboot-rockchip/patches/105-bootstd-efi-Initialize-PCI-to-discover-network-controller.patch +++ b/package/boot/uboot-rockchip/patches/105-bootstd-efi-Initialize-PCI-to-discover-network-controller.patch @@ -34,9 +34,9 @@ Signed-off-by: Jonas Karlman #include #include #include -@@ -453,6 +454,14 @@ static int distro_efi_boot(struct udevic - fdt = env_get_hex("fdt_addr_r", 0); - } +@@ -403,6 +404,14 @@ static int distro_efi_read_bootflow(stru + { + int ret; + /* init PCI first since this is often used to provide Ehternet */ + if (IS_ENABLED(CONFIG_NETDEVICES) && IS_ENABLED(CONFIG_PCI) && @@ -47,5 +47,5 @@ Signed-off-by: Jonas Karlman + } + /* - * At some point we can add a real interface to bootefi so we can call - * this directly. For now, go through the CLI, like distro boot. + * bootmeth_efi doesn't allocate any buffer neither for blk nor net device + * set flag to avoid freeing static buffer. diff --git a/package/boot/uboot-rockchip/patches/106-rockchip-board-Add-board_rng_seed-for-all-Rockchip-device.patch b/package/boot/uboot-rockchip/patches/106-rockchip-board-Add-board_rng_seed-for-all-Rockchip-device.patch deleted file mode 100644 index 97bda7006..000000000 --- a/package/boot/uboot-rockchip/patches/106-rockchip-board-Add-board_rng_seed-for-all-Rockchip-device.patch +++ /dev/null @@ -1,104 +0,0 @@ -From: Chris Morgan -To: u-boot@lists.denx.de -Cc: andre.przywara@arm.com, kever.yang@rock-chips.com, - philipp.tomsich@vrull.eu, sjg@chromium.org, jagan@edgeble.ai, - jonas@kwiboo.se, Chris Morgan -Subject: [PATCH V4 5/7] rockchip: board: Add board_rng_seed() for all Rockchip devices -Date: Tue, 2 Jan 2024 09:46:52 -0600 [thread overview] -Message-ID: <20240102154654.191055-6-macroalpha82@gmail.com> (raw) -In-Reply-To: <20240102154654.191055-1-macroalpha82@gmail.com> - -From: Chris Morgan - -Allow all rockchip devices to use the hardware RNG to seed Linux -RNG. - -Signed-off-by: Chris Morgan ---- - arch/arm/mach-rockchip/board.c | 32 ++++++++++++++++++++++ - board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c | 29 -------------------- - 2 files changed, 32 insertions(+), 29 deletions(-) - ---- a/arch/arm/mach-rockchip/board.c -+++ b/arch/arm/mach-rockchip/board.c -@@ -320,3 +320,35 @@ __weak int misc_init_r(void) - return ret; - } - #endif -+ -+#if IS_ENABLED(CONFIG_BOARD_RNG_SEED) && IS_ENABLED(CONFIG_RNG_ROCKCHIP) -+#include -+ -+/* Use hardware rng to seed Linux random. */ -+__weak int board_rng_seed(struct abuf *buf) -+{ -+ struct udevice *dev; -+ size_t len = 0x8; -+ u64 *data; -+ -+ data = malloc(len); -+ if (!data) { -+ printf("Out of memory\n"); -+ return -ENOMEM; -+ } -+ -+ if (uclass_get_device(UCLASS_RNG, 0, &dev) || !dev) { -+ printf("No RNG device\n"); -+ return -ENODEV; -+ } -+ -+ if (dm_rng_read(dev, data, len)) { -+ printf("Reading RNG failed\n"); -+ return -EIO; -+ } -+ -+ abuf_init_set(buf, data, len); -+ -+ return 0; -+} -+#endif ---- a/board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c -+++ b/board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c -@@ -16,7 +16,6 @@ - #include - #include - #include --#include - #include - #include - -@@ -117,34 +116,6 @@ void spl_board_init(void) - (GPIO0_BASE + GPIO_SWPORT_DR_H)); - } - --/* Use hardware rng to seed Linux random. */ --int board_rng_seed(struct abuf *buf) --{ -- struct udevice *dev; -- size_t len = 0x8; -- u64 *data; -- -- data = malloc(len); -- if (!data) { -- printf("Out of memory\n"); -- return -ENOMEM; -- } -- -- if (uclass_get_device(UCLASS_RNG, 0, &dev) || !dev) { -- printf("No RNG device\n"); -- return -ENODEV; -- } -- -- if (dm_rng_read(dev, data, len)) { -- printf("Reading RNG failed\n"); -- return -EIO; -- } -- -- abuf_init_set(buf, data, len); -- -- return 0; --} -- - /* - * Buzz the buzzer so the user knows something is going on. Make it - * optional in case PWM is disabled. diff --git a/package/boot/uboot-rockchip/patches/900-arm-add-dts-files.patch b/package/boot/uboot-rockchip/patches/900-arm-add-dts-files.patch index 06f9983a2..7e077fc4e 100644 --- a/package/boot/uboot-rockchip/patches/900-arm-add-dts-files.patch +++ b/package/boot/uboot-rockchip/patches/900-arm-add-dts-files.patch @@ -1,6 +1,6 @@ --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -156,6 +156,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ +@@ -158,6 +158,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ rk3399-nanopi-m4b.dtb \ rk3399-nanopi-neo4.dtb \ rk3399-nanopi-r4s.dtb \