fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uboot-rockchip: Update to 2023.01

Browse Source 
Removed upstream patch:
- 010-arm-dts-rockchip-rk356x-sync-with-Linux-6.0.patch

Refreshed all patches and defconfigs.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2023-01-14 20:10:50 +08:00
parent 6ca0d3d43b
commit a82b84e63b
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
14 changed files with 37 additions and 2868 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/boot/uboot-rockchip/Makefile
View File

@ -5,10 +5,10 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_VERSION:=2022.10
PKG_RELEASE:=$(AUTORELEASE)
PKG_VERSION:=2023.01
PKG_RELEASE:=1
PKG_HASH:=50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8
PKG_HASH:=69423bad380f89a0916636e89e6dcbd2e4512d584308d922d1039d1e4331950f
PKG_MAINTAINER:=Tobias Maedel <openwrt@tbspace.de>

2
package/boot/uboot-rockchip/patches/001-force-build-dtc.patch
View File

@ -9,7 +9,7 @@
DTC ?= $(DTC_INTREE)
DTC_MIN_VERSION := 010406
@@ -2032,7 +2032,7 @@ endif
@@ -2028,7 +2028,7 @@ endif
# Check dtc and pylibfdt, if DTC is provided, else build them
PHONY += scripts_dtc
scripts_dtc: scripts_basic

2839
package/boot/uboot-rockchip/patches/010-arm-dts-rockchip-rk356x-sync-with-Linux-6.0.patch
View File

File diff suppressed because it is too large Load Diff

4
package/boot/uboot-rockchip/patches/101-spl-support-adc-drivers-in-spl.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Peter Geis <pgwipeout@gmail.com>
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -578,6 +578,11 @@ config SPL_FIT_IMAGE_TINY
@@ -586,6 +586,11 @@ config SPL_FIT_IMAGE_TINY
ensure this information is available to the next image
invoked).
@ -35,6 +35,6 @@ Signed-off-by: Peter Geis <pgwipeout@gmail.com>
# SPDX-License-Identifier: GPL-2.0+
+obj-$(CONFIG_$(SPL_)ADC) += adc/
obj-$(CONFIG_$(SPL_TPL_)BLK) += block/
obj-$(CONFIG_$(SPL_TPL_)BOOTCOUNT_LIMIT) += bootcount/
obj-$(CONFIG_$(SPL_TPL_)BUTTON) += button/
obj-$(CONFIG_$(SPL_TPL_)CACHE) += cache/

6
package/boot/uboot-rockchip/patches/105-rockchip-move-dwc3-config-to-chip-specific-handler.patch
View File

@ -19,7 +19,7 @@ Signed-off-by: Peter Geis <pgwipeout@gmail.com>
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -127,30 +127,6 @@ int board_usb_cleanup(int index, enum us
@@ -280,30 +280,6 @@ int board_usb_cleanup(int index, enum us
}
#endif /* CONFIG_USB_GADGET_DWC2_OTG */
@ -52,8 +52,8 @@ Signed-off-by: Peter Geis <pgwipeout@gmail.com>
#if CONFIG_IS_ENABLED(FASTBOOT)
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -285,3 +285,32 @@ void spl_board_init(void)
#endif
@@ -292,3 +292,32 @@ void spl_board_init(void)
}
}
#endif
+

2
package/boot/uboot-rockchip/patches/107-gpio-rockchip-rk_gpio-support-v2-gpio-controller.patch.patch
View File

@ -81,7 +81,7 @@ Signed-off-by: Peter Geis <pgwipeout@gmail.com>
GPIO_PULL_NORMAL = 0,
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -341,6 +341,19 @@ config ROCKCHIP_GPIO
@@ -340,6 +340,19 @@ config ROCKCHIP_GPIO
The GPIOs for a device are defined in the device tree with one node
for each bank.

18
package/boot/uboot-rockchip/patches/108-hack-fix-build-rk356x-idbloader.patch
View File

@ -1,11 +1,25 @@
--- a/arch/arm/dts/rockchip-u-boot.dtsi
+++ b/arch/arm/dts/rockchip-u-boot.dtsi
@@ -20,7 +20,7 @@
@@ -11,7 +11,7 @@
};
};
-#ifdef CONFIG_TPL
+#if defined(CONFIG_TPL) || defined(CONFIG_ROCKCHIP_RK3566) || defined(CONFIG_ROCKCHIP_RK3568)
&binman {
simple-bin {
filename = "u-boot-rockchip.bin";
@@ -20,12 +20,11 @@
mkimage {
filename = "idbloader.img";
args = "-n", CONFIG_SYS_SOC, "-T", "rksd";
-#ifdef CONFIG_TPL
+#if defined(CONFIG_TPL) || defined(CONFIG_ROCKCHIP_RK3566) || defined(CONFIG_ROCKCHIP_RK3568)
multiple-data-files;
u-boot-tpl {
};
-#endif
+
u-boot-spl {
};
};

2
package/boot/uboot-rockchip/patches/900-arm-add-dts-files.patch
View File

@ -1,6 +1,6 @@
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -124,7 +124,10 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \
@@ -123,7 +123,10 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \
dtb-$(CONFIG_ROCKCHIP_RK3328) += \
rk3328-evb.dtb \

6
package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-fastrhino-r68s.dts
View File

@ -1,4 +1,4 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "rk3568-fastrhino-r6xs.dtsi"
@ -18,10 +18,10 @@
io-channel-names = "buttons";
keyup-threshold-microvolt = <1800000>;
recovery {
button-recovery {
label = "Recovery";
linux,code = <KEY_VENDOR>;
press-threshold-microvolt = <9>;
press-threshold-microvolt = <1750>;
};
};
};

7
package/boot/uboot-rockchip/src/configs/fastrhino-r66s-rk3568_defconfig
View File

@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_COUNTER_FREQUENCY=24000000
CONFIG_ARCH_ROCKCHIP=y
CONFIG_SYS_TEXT_BASE=0x00a00000
CONFIG_TEXT_BASE=0x00a00000
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_NR_DRAM_BANKS=2
@ -26,7 +26,6 @@ CONFIG_SPL_LOAD_FIT=y
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-fastrhino-r66s.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_SYS_DEVICE_NULLDEV is not set
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_MAX_SIZE=0x20000
CONFIG_SPL_PAD_TO=0x7f8000
@ -38,7 +37,6 @@ CONFIG_SPL_BSS_MAX_SIZE=0x4000
CONFIG_SPL_STACK=0x400000
CONFIG_SPL_STACK_R=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_ADC=y
CONFIG_SPL_ATF=y
CONFIG_SPL_ATF_LOAD_IMAGE_V2=y
CONFIG_FASTBOOT_BUF_ADDR=0xc00800
@ -52,7 +50,7 @@ CONFIG_CMD_GPT=y
CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y
CONFIG_CMD_ROCKUSB=y
CONFIG_CMD_USB_MASS_STORAGE=y
CONFIG_CMD_PMIC=y
CONFIG_CMD_REGULATOR=y
# CONFIG_SPL_DOS_PARTITION is not set
@ -108,7 +106,6 @@ CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
CONFIG_USB_GADGET_VENDOR_NUM=0x2207
CONFIG_USB_GADGET_PRODUCT_NUM=0x350a
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_FUNCTION_ROCKUSB=y
CONFIG_ROCKCHIP_USB2_PHY=y
CONFIG_USB_KEYBOARD=y
CONFIG_USB_HOST_ETHER=y

4
package/boot/uboot-rockchip/src/configs/fastrhino-r68s-rk3568_defconfig
View File

@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_COUNTER_FREQUENCY=24000000
CONFIG_ARCH_ROCKCHIP=y
CONFIG_SYS_TEXT_BASE=0x00a00000
CONFIG_TEXT_BASE=0x00a00000
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_NR_DRAM_BANKS=2
@ -26,7 +26,6 @@ CONFIG_SPL_LOAD_FIT=y
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-fastrhino-r68s.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_SYS_DEVICE_NULLDEV is not set
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_MAX_SIZE=0x20000
CONFIG_SPL_PAD_TO=0x7f8000
@ -52,6 +51,7 @@ CONFIG_CMD_GPT=y
CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y
CONFIG_CMD_USB_MASS_STORAGE=y
CONFIG_CMD_ROCKUSB=y
CONFIG_CMD_PMIC=y
CONFIG_CMD_REGULATOR=y

3
package/boot/uboot-rockchip/src/configs/nanopi-r2c-rk3328_defconfig
View File

@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_COUNTER_FREQUENCY=24000000
CONFIG_ARCH_ROCKCHIP=y
CONFIG_SYS_TEXT_BASE=0x00200000
CONFIG_TEXT_BASE=0x00200000
CONFIG_SPL_GPIO=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_OFFSET=0x3F8000
@ -101,7 +101,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
CONFIG_USB_DWC2=y
CONFIG_USB_DWC3=y
# CONFIG_USB_DWC3_GADGET is not set

3
package/boot/uboot-rockchip/src/configs/orangepi-r1-plus-lts-rk3328_defconfig
View File

@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_COUNTER_FREQUENCY=24000000
CONFIG_ARCH_ROCKCHIP=y
CONFIG_SYS_TEXT_BASE=0x00200000
CONFIG_TEXT_BASE=0x00200000
CONFIG_SPL_GPIO=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_OFFSET=0x3F8000
@ -101,7 +101,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
CONFIG_USB_DWC2=y
CONFIG_USB_DWC3=y
# CONFIG_USB_DWC3_GADGET is not set

3
package/boot/uboot-rockchip/src/configs/orangepi-r1-plus-rk3328_defconfig
View File

@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_COUNTER_FREQUENCY=24000000
CONFIG_ARCH_ROCKCHIP=y
CONFIG_SYS_TEXT_BASE=0x00200000
CONFIG_TEXT_BASE=0x00200000
CONFIG_SPL_GPIO=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_OFFSET=0x3F8000
@ -101,7 +101,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
CONFIG_USB_DWC2=y
CONFIG_USB_DWC3=y
# CONFIG_USB_DWC3_GADGET is not set