Skip to content

Commit 0616d1d

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: uboot-rockchip: add fastrhino r66s support kernel: mdio-devres: fix of-mdio dependency (coolsnowwolf#9912) kernel: modules: fix kmod-mdio-devres dependency for 5.15 (coolsnowwolf#9911) armvirt: copy config files from 5.10 (coolsnowwolf#9910) armvirt: refresh 5.10 config (coolsnowwolf#9908) armvirt: enable MMIO_CMDLINE_DEVICES for firecracker support (coolsnowwolf#9907) armvirt: switch to Kernel 5.10 (coolsnowwolf#9906) rockchip: switch kernel version to 5.19 rockchip: add FastRhino R66S support in kernel 5.19 zlib: backport null dereference fix ramips: mt7628: fix memory controller reset bit
2 parents 323af99 + 114bd4f commit 0616d1d

File tree

21 files changed

+1460
-78
lines changed

21 files changed

+1460
-78
lines changed

‎package/boot/uboot-rockchip/Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,17 @@ define U-Boot/nanopi-r4se-rk3399
126126
USE_RKBIN:=1
127127
endef
128128

129+
define U-Boot/fastrhino-r66s-rk3568
130+
BUILD_SUBTARGET:=armv8
131+
NAME:=FastRhin-R66S
132+
BUILD_DEVICES:= \
133+
fastrhino_r66s
134+
DEPENDS:=+PACKAGE_u-boot-fastrhino-r66s-rk3568:arm-trusted-firmware-rk3568
135+
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
136+
ATF:=rk3568_bl31_v1.34.elf
137+
DDR:=rk3568_ddr_1560MHz_v1.13.bin
138+
endef
139+
129140
define U-Boot/nanopi-r5s-rk3568
130141
BUILD_SUBTARGET:=armv8
131142
NAME:=NANOPI-R5S
@@ -159,6 +170,7 @@ endef
159170

160171
UBOOT_TARGETS := \
161172
doornet2-rk3399 \
173+
fastrhino-r66s-rk3568 \
162174
guangmiao-g4c-rk3399 \
163175
nanopi-r4s-rk3399 \
164176
nanopi-r4se-rk3399 \

‎package/boot/uboot-rockchip/patches/016-uboot-add-FastRhino-R66S-support.patch

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
--- /dev/null
2+
+++ b/arch/arm/dts/rk3568-fastrhino-r66s-u-boot.dtsi
3+
@@ -0,0 +1,25 @@
4+
+// SPDX-License-Identifier: GPL-2.0+
5+
+/*
6+
+ * (C) Copyright 2021 Rockchip Electronics Co., Ltd
7+
+ */
8+
+
9+
+#include "rk3568-u-boot.dtsi"
10+
+
11+
+/ {
12+
+ chosen {
13+
+ stdout-path = &uart2;
14+
+ u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc0;
15+
+ };
16+
+};
17+
+
18+
+&sdmmc0 {
19+
+ bus-width = <4>;
20+
+ u-boot,dm-spl;
21+
+ u-boot,spl-fifo-mode;
22+
+};
23+
+
24+
+&uart2 {
25+
+ clock-frequency = <24000000>;
26+
+ u-boot,dm-spl;
27+
+ status = "okay";
28+
+};
29+
--- /dev/null
30+
+++ b/arch/arm/dts/rk3568-fastrhino-r66s.dts
31+
@@ -0,0 +1,9 @@
32+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
33+
+
34+
+/dts-v1/;
35+
+#include "rk3568-evb.dts"
36+
+
37+
+/ {
38+
+ model = "FastRhino R66S";
39+
+ compatible = "fastrhino,r66s", "rockchip,rk3568";
40+
+};
41+
--- /dev/null
42+
+++ b/board/fastrhino/fastrhino-r66s-rk3568/Kconfig
43+
@@ -0,0 +1,15 @@
44+
+if TARGET_FASTRHINO_R66S_RK3568
45+
+
46+
+config SYS_BOARD
47+
+ default "fastrhino-r66s-rk3568"
48+
+
49+
+config SYS_VENDOR
50+
+ default "fastrhino"
51+
+
52+
+config SYS_CONFIG_NAME
53+
+ default "fastrhino-r66s-rk3568"
54+
+
55+
+config BOARD_SPECIFIC_OPTIONS # dummy
56+
+ def_bool y
57+
+
58+
+endif
59+
--- /dev/null
60+
+++ b/board/fastrhino/fastrhino-r66s-rk3568/Makefile
61+
@@ -0,0 +1,4 @@
62+
+# SPDX-License-Identifier: GPL-2.0+
63+
+#
64+
+
65+
+obj-y += fastrhino-r66s-rk3568.o
66+
--- /dev/null
67+
+++ b/board/fastrhino/fastrhino-r66s-rk3568/fastrhino-r66s-rk3568.c
68+
@@ -0,0 +1,4 @@
69+
+ // SPDX-License-Identifier: GPL-2.0+
70+
+/*
71+
+ *
72+
+ */
73+
--- /dev/null
74+
+++ b/include/configs/fastrhino-r66s-rk3568.h
75+
@@ -0,0 +1,17 @@
76+
+/* SPDX-License-Identifier: GPL-2.0+ */
77+
+
78+
+#ifndef __FASTRHINO_R66S_RK3568_H
79+
+#define __FASTRHINO_R66S_RK3568_H
80+
+
81+
+#include <configs/rk3568_common.h>
82+
+
83+
+#define CONFIG_SUPPORT_EMMC_RPMB
84+
+
85+
+#define ROCKCHIP_DEVICE_SETTINGS \
86+
+ "stdout=serial,vidconsole\0" \
87+
+ "stderr=serial,vidconsole\0"
88+
+
89+
+#define CONFIG_USB_OHCI_NEW
90+
+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
91+
+
92+
+#endif

‎package/boot/uboot-rockchip/patches/900-arm-boot-add-dts-files.patch

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
--- a/arch/arm/dts/Makefile
22
+++ b/arch/arm/dts/Makefile
3-
@@ -157,6 +157,7 @@
3+
@@ -157,6 +157,8 @@
44
rk3399-nanopi-m4b.dtb \
55
rk3399-nanopi-neo4.dtb \
66
rk3399-nanopi-r4s.dtb \
77
+ rk3399-nanopi-r4se.dtb \
8+
+ rk3568-fastrhino-r66s.dtb \
89
rk3399-orangepi.dtb \
910
rk3399-pinebook-pro.dtb \
1011
rk3399-puma-haikou.dtb \

‎package/boot/uboot-rockchip/src/configs/fastrhino-r66s-rk3568_defconfig

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
CONFIG_ARM=y
2+
CONFIG_SKIP_LOWLEVEL_INIT=y
3+
CONFIG_ARCH_ROCKCHIP=y
4+
CONFIG_SYS_TEXT_BASE=0x00a00000
5+
CONFIG_SPL_LIBCOMMON_SUPPORT=y
6+
CONFIG_SPL_LIBGENERIC_SUPPORT=y
7+
CONFIG_NR_DRAM_BANKS=2
8+
CONFIG_DEFAULT_DEVICE_TREE="rk3568-fastrhino-r66s"
9+
CONFIG_ROCKCHIP_RK3568=y
10+
CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
11+
CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y
12+
CONFIG_SPL_MMC=y
13+
CONFIG_SPL_SERIAL=y
14+
CONFIG_SPL_STACK_R_ADDR=0x600000
15+
CONFIG_TARGET_FASTRHINO_R66S_RK3568=y
16+
CONFIG_DEBUG_UART_BASE=0xFE660000
17+
CONFIG_DEBUG_UART_CLOCK=24000000
18+
CONFIG_DEBUG_UART=y
19+
CONFIG_SYS_LOAD_ADDR=0xc00800
20+
CONFIG_API=y
21+
CONFIG_FIT=y
22+
CONFIG_FIT_VERBOSE=y
23+
CONFIG_SPL_LOAD_FIT=y
24+
CONFIG_OF_SYSTEM_SETUP=y
25+
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-fastrhino-r66s.dtb"
26+
# CONFIG_SYS_DEVICE_NULLDEV is not set
27+
# CONFIG_DISPLAY_CPUINFO is not set
28+
CONFIG_DISPLAY_BOARDINFO_LATE=y
29+
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
30+
CONFIG_SPL_STACK_R=y
31+
CONFIG_SPL_SEPARATE_BSS=y
32+
CONFIG_SPL_ATF=y
33+
CONFIG_SPL_ATF_LOAD_IMAGE_V2=y
34+
CONFIG_CMD_BIND=y
35+
CONFIG_CMD_CLK=y
36+
CONFIG_CMD_GPIO=y
37+
CONFIG_CMD_GPT=y
38+
CONFIG_CMD_I2C=y
39+
CONFIG_CMD_MMC=y
40+
CONFIG_CMD_USB=y
41+
# CONFIG_CMD_SETEXPR is not set
42+
CONFIG_CMD_PMIC=y
43+
CONFIG_CMD_REGULATOR=y
44+
# CONFIG_SPL_DOS_PARTITION is not set
45+
CONFIG_SPL_OF_CONTROL=y
46+
CONFIG_OF_LIVE=y
47+
CONFIG_NET_RANDOM_ETHADDR=y
48+
CONFIG_SPL_DM_WARN=y
49+
CONFIG_SPL_REGMAP=y
50+
CONFIG_SPL_SYSCON=y
51+
CONFIG_SPL_CLK=y
52+
CONFIG_ROCKCHIP_GPIO=y
53+
CONFIG_ROCKCHIP_GPIO_V2=y
54+
CONFIG_SYS_I2C_ROCKCHIP=y
55+
CONFIG_MISC=y
56+
CONFIG_MMC_HS200_SUPPORT=y
57+
CONFIG_SPL_MMC_HS200_SUPPORT=y
58+
CONFIG_MMC_DW=y
59+
CONFIG_MMC_DW_ROCKCHIP=y
60+
CONFIG_MMC_SDHCI=y
61+
CONFIG_MMC_SDHCI_SDMA=y
62+
CONFIG_MMC_SDHCI_ROCKCHIP=y
63+
CONFIG_DM_ETH=y
64+
CONFIG_ETH_DESIGNWARE=y
65+
CONFIG_GMAC_ROCKCHIP=y
66+
CONFIG_POWER_DOMAIN=y
67+
CONFIG_DM_PMIC=y
68+
CONFIG_PMIC_RK8XX=y
69+
CONFIG_SPL_PMIC_RK8XX=y
70+
CONFIG_REGULATOR_PWM=y
71+
CONFIG_DM_REGULATOR_FIXED=y
72+
CONFIG_SPL_DM_REGULATOR_FIXED=y
73+
CONFIG_DM_REGULATOR_GPIO=y
74+
CONFIG_REGULATOR_RK8XX=y
75+
CONFIG_PWM_ROCKCHIP=y
76+
CONFIG_SPL_RAM=y
77+
CONFIG_DM_RESET=y
78+
CONFIG_BAUDRATE=1500000
79+
CONFIG_DEBUG_UART_SHIFT=2
80+
CONFIG_SYSRESET=y
81+
CONFIG_SYSRESET_PSCI=y
82+
CONFIG_USB=y
83+
CONFIG_USB_XHCI_HCD=y
84+
CONFIG_USB_XHCI_DWC3=y
85+
CONFIG_USB_EHCI_HCD=y
86+
CONFIG_USB_EHCI_GENERIC=y
87+
CONFIG_USB_OHCI_HCD=y
88+
CONFIG_USB_OHCI_GENERIC=y
89+
CONFIG_USB_DWC3=y
90+
CONFIG_USB_DWC3_GENERIC=y
91+
CONFIG_ROCKCHIP_USB2_PHY=y
92+
CONFIG_USB_KEYBOARD=y
93+
CONFIG_USB_HOST_ETHER=y
94+
CONFIG_USB_ETHER_LAN75XX=y
95+
CONFIG_USB_ETHER_LAN78XX=y
96+
CONFIG_USB_ETHER_SMSC95XX=y
97+
CONFIG_ERRNO_STR=y

‎package/kernel/linux/modules/netdevices.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ $(eval $(call KernelPackage,mii))
142142
define KernelPackage/mdio-devres
143143
SUBMENU:=$(NETWORK_DEVICES_MENU)
144144
TITLE:=Supports MDIO device registration
145-
DEPENDS:=@(LINUX_5_10||LINUX_5_15||LINUX_5_18||LINUX_5_19) +kmod-libphy PACKAGE_kmod-of-mdio:kmod-of-mdio
145+
DEPENDS:=@(LINUX_5_10||LINUX_5_15||LINUX_5_18||LINUX_5_19) +kmod-libphy +(TARGET_armvirt||TARGET_bcm27xx_bcm2708||TARGET_tegra):kmod-of-mdio
146146
KCONFIG:=CONFIG_MDIO_DEVRES
147147
HIDDEN:=1
148148
FILES:=$(LINUX_DIR)/drivers/net/phy/mdio_devres.ko
@@ -1027,8 +1027,8 @@ define KernelPackage/of-mdio
10271027
KCONFIG:=CONFIG_OF_MDIO
10281028
FILES:= \
10291029
$(LINUX_DIR)/drivers/net/phy/fixed_phy.ko \
1030-
$(LINUX_DIR)/drivers/of/of_mdio.ko@lt5.10 \
1031-
$(LINUX_DIR)/drivers/net/mdio/of_mdio.ko@ge5.10
1030+
$(LINUX_DIR)/drivers/net/mdio/of_mdio.ko \
1031+
$(LINUX_DIR)/drivers/net/mdio/fwnode_mdio.ko@ge5.15
10321032
AUTOLOAD:=$(call AutoLoad,41,of_mdio)
10331033
endef
10341034

‎package/libs/zlib/patches/007-fix-null-dereference-in-fix-CVE-2022-37434.patch

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Mon Sep 17 00:00:00 2001
2+
From: Mark Adler <[email protected]>
3+
Date: Mon, 8 Aug 2022 10:50:09 -0700
4+
Subject: [PATCH] Fix extra field processing bug that dereferences NULL
5+
state->head.
6+
7+
The recent commit to fix a gzip header extra field processing bug
8+
introduced the new bug fixed here.
9+
---
10+
inflate.c | 4 ++--
11+
1 file changed, 2 insertions(+), 2 deletions(-)
12+
13+
diff --git a/inflate.c b/inflate.c
14+
index 7a7289749..2a3c4fe98 100644
15+
--- a/inflate.c
16+
+++ b/inflate.c
17+
@@ -763,10 +763,10 @@ int flush;
18+
copy = state->length;
19+
if (copy > have) copy = have;
20+
if (copy) {
21+
- len = state->head->extra_len - state->length;
22+
if (state->head != Z_NULL &&
23+
state->head->extra != Z_NULL &&
24+
- len < state->head->extra_max) {
25+
+ (len = state->head->extra_len - state->length) <
26+
+ state->head->extra_max) {
27+
zmemcpy(state->head->extra + len, next,
28+
len + copy > state->head->extra_max ?
29+
state->head->extra_max - len : copy);

‎target/linux/armvirt/32/config-5.15

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
CONFIG_ALIGNMENT_TRAP=y
2+
CONFIG_ARCH_32BIT_OFF_T=y
3+
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
4+
CONFIG_ARCH_MULTIPLATFORM=y
5+
CONFIG_ARCH_MULTI_V6_V7=y
6+
CONFIG_ARCH_MULTI_V7=y
7+
CONFIG_ARCH_NR_GPIO=0
8+
CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
9+
CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
10+
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
11+
CONFIG_ARCH_VIRT=y
12+
CONFIG_ARM=y
13+
CONFIG_ARM_CPU_SUSPEND=y
14+
CONFIG_ARM_HAS_SG_CHAIN=y
15+
CONFIG_ARM_HEAVY_MB=y
16+
CONFIG_ARM_L1_CACHE_SHIFT=6
17+
CONFIG_ARM_L1_CACHE_SHIFT_6=y
18+
CONFIG_ARM_LPAE=y
19+
CONFIG_ARM_PATCH_IDIV=y
20+
CONFIG_ARM_PATCH_PHYS_VIRT=y
21+
CONFIG_ARM_PSCI=y
22+
CONFIG_ARM_THUMB=y
23+
CONFIG_ARM_UNWIND=y
24+
CONFIG_ARM_VIRT_EXT=y
25+
CONFIG_AUTO_ZRELADDR=y
26+
CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
27+
CONFIG_CACHE_L2X0=y
28+
CONFIG_COMPAT_32BIT_TIME=y
29+
CONFIG_CPU_32v6K=y
30+
CONFIG_CPU_32v7=y
31+
CONFIG_CPU_ABRT_EV7=y
32+
CONFIG_CPU_CACHE_V7=y
33+
CONFIG_CPU_CACHE_VIPT=y
34+
CONFIG_CPU_COPY_V6=y
35+
CONFIG_CPU_CP15=y
36+
CONFIG_CPU_CP15_MMU=y
37+
CONFIG_CPU_HAS_ASID=y
38+
CONFIG_CPU_PABRT_V7=y
39+
CONFIG_CPU_SPECTRE=y
40+
CONFIG_CPU_THUMB_CAPABLE=y
41+
CONFIG_CPU_TLB_V7=y
42+
CONFIG_CPU_V7=y
43+
CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
44+
CONFIG_DMA_OPS=y
45+
CONFIG_EDAC_ATOMIC_SCRUB=y
46+
CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
47+
CONFIG_GENERIC_VDSO_32=y
48+
CONFIG_HARDEN_BRANCH_PREDICTOR=y
49+
CONFIG_HAVE_SMP=y
50+
CONFIG_HZ_FIXED=0
51+
CONFIG_HZ_PERIODIC=y
52+
CONFIG_MIGHT_HAVE_CACHE_L2X0=y
53+
CONFIG_MODULES_USE_ELF_REL=y
54+
CONFIG_NEON=y
55+
CONFIG_NR_CPUS=4
56+
CONFIG_OLD_SIGACTION=y
57+
CONFIG_OLD_SIGSUSPEND3=y
58+
CONFIG_OUTER_CACHE=y
59+
CONFIG_OUTER_CACHE_SYNC=y
60+
CONFIG_PAGE_OFFSET=0xC0000000
61+
CONFIG_PERF_USE_VMALLOC=y
62+
CONFIG_RTC_MC146818_LIB=y
63+
CONFIG_SERIAL_OF_PLATFORM=y
64+
CONFIG_SMP_ON_UP=y
65+
CONFIG_SWP_EMULATE=y
66+
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
67+
CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
68+
CONFIG_UNWINDER_ARM=y
69+
CONFIG_USE_OF=y
70+
CONFIG_VFP=y
71+
CONFIG_VFPv3=y
72+
CONFIG_XZ_DEC_ARM=y
73+
CONFIG_XZ_DEC_BCJ=y
74+
CONFIG_ZBOOT_ROM_BSS=0
75+
CONFIG_ZBOOT_ROM_TEXT=0

‎target/linux/armvirt/64/config-5.10

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
4141
CONFIG_BACKLIGHT_CLASS_DEVICE=y
4242
CONFIG_BLK_PM=y
4343
CONFIG_CAVIUM_TX2_ERRATUM_219=y
44+
CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
4445
CONFIG_CLK_SP810=y
4546
CONFIG_CLK_VEXPRESS_OSC=y
4647
# CONFIG_COMPAT_32BIT_TIME is not set
@@ -94,7 +95,6 @@ CONFIG_FRAME_POINTER=y
9495
CONFIG_FSL_ERRATUM_A008585=y
9596
CONFIG_FUJITSU_ERRATUM_010001=y
9697
CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
97-
CONFIG_GENERIC_CPU_VULNERABILITIES=y
9898
CONFIG_GENERIC_CSUM=y
9999
CONFIG_GPIO_GENERIC=y
100100
CONFIG_GPIO_GENERIC_PLATFORM=y

0 commit comments

Comments
 (0)