Skip to content

Commit

Permalink
[bot] AutoMerging: merge all upstream's changes:
Browse files Browse the repository at this point in the history 
* https://github.com/coolsnowwolf/lede:
  mac80211: fix set wifi macaddr to zero
  linux-firmware: add ap6275s sdio firmware for rockchip target
  mac80211: brcm: backport APIs to support kernel 5.18+
  target: add Amlogic S805 and S9xxx SoCs init support
  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
  • Loading branch information
@zesming
zesming committed Aug 11, 2022
2 parents 1a31974 + af1f124 commit 07ff3dd
Show file tree
Hide file tree
Showing 41 changed files with 3,253 additions and 79 deletions.
12 changes: 12 additions & 0 deletions package/boot/uboot-rockchip/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,17 @@ define U-Boot/nanopi-r4se-rk3399
USE_RKBIN:=1
endef

define U-Boot/fastrhino-r66s-rk3568
BUILD_SUBTARGET:=armv8
NAME:=FastRhin-R66S
BUILD_DEVICES:= \
fastrhino_r66s
DEPENDS:=+PACKAGE_u-boot-fastrhino-r66s-rk3568:arm-trusted-firmware-rk3568
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
ATF:=rk3568_bl31_v1.34.elf
DDR:=rk3568_ddr_1560MHz_v1.13.bin
endef

define U-Boot/nanopi-r5s-rk3568
BUILD_SUBTARGET:=armv8
NAME:=NANOPI-R5S
Expand Down Expand Up @@ -159,6 +170,7 @@ endef

UBOOT_TARGETS := \
doornet2-rk3399 \
fastrhino-r66s-rk3568 \
guangmiao-g4c-rk3399 \
nanopi-r4s-rk3399 \
nanopi-r4se-rk3399 \
Expand Down
92 changes: 92 additions & 0 deletions package/boot/uboot-rockchip/patches/016-uboot-add-FastRhino-R66S-support.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
--- /dev/null
+++ b/arch/arm/dts/rk3568-fastrhino-r66s-u-boot.dtsi
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * (C) Copyright 2021 Rockchip Electronics Co., Ltd
+ */
+
+#include "rk3568-u-boot.dtsi"
+
+/ {
+ chosen {
+ stdout-path = &uart2;
+ u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc0;
+ };
+};
+
+&sdmmc0 {
+ bus-width = <4>;
+ u-boot,dm-spl;
+ u-boot,spl-fifo-mode;
+};
+
+&uart2 {
+ clock-frequency = <24000000>;
+ u-boot,dm-spl;
+ status = "okay";
+};
--- /dev/null
+++ b/arch/arm/dts/rk3568-fastrhino-r66s.dts
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+/dts-v1/;
+#include "rk3568-evb.dts"
+
+/ {
+ model = "FastRhino R66S";
+ compatible = "fastrhino,r66s", "rockchip,rk3568";
+};
--- /dev/null
+++ b/board/fastrhino/fastrhino-r66s-rk3568/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_FASTRHINO_R66S_RK3568
+
+config SYS_BOARD
+ default "fastrhino-r66s-rk3568"
+
+config SYS_VENDOR
+ default "fastrhino"
+
+config SYS_CONFIG_NAME
+ default "fastrhino-r66s-rk3568"
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+ def_bool y
+
+endif
--- /dev/null
+++ b/board/fastrhino/fastrhino-r66s-rk3568/Makefile
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+
+obj-y += fastrhino-r66s-rk3568.o
--- /dev/null
+++ b/board/fastrhino/fastrhino-r66s-rk3568/fastrhino-r66s-rk3568.c
@@ -0,0 +1,4 @@
+ // SPDX-License-Identifier: GPL-2.0+
+/*
+ *
+ */
--- /dev/null
+++ b/include/configs/fastrhino-r66s-rk3568.h
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __FASTRHINO_R66S_RK3568_H
+#define __FASTRHINO_R66S_RK3568_H
+
+#include <configs/rk3568_common.h>
+
+#define CONFIG_SUPPORT_EMMC_RPMB
+
+#define ROCKCHIP_DEVICE_SETTINGS \
+ "stdout=serial,vidconsole\0" \
+ "stderr=serial,vidconsole\0"
+
+#define CONFIG_USB_OHCI_NEW
+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
+
+#endif
3 changes: 2 additions & 1 deletion package/boot/uboot-rockchip/patches/900-arm-boot-add-dts-files.patch
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -157,6 +157,7 @@
@@ -157,6 +157,8 @@
rk3399-nanopi-m4b.dtb \
rk3399-nanopi-neo4.dtb \
rk3399-nanopi-r4s.dtb \
+ rk3399-nanopi-r4se.dtb \
+ rk3568-fastrhino-r66s.dtb \
rk3399-orangepi.dtb \
rk3399-pinebook-pro.dtb \
rk3399-puma-haikou.dtb \
97 changes: 97 additions & 0 deletions package/boot/uboot-rockchip/src/configs/fastrhino-r66s-rk3568_defconfig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
CONFIG_ARM=y
CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_ARCH_ROCKCHIP=y
CONFIG_SYS_TEXT_BASE=0x00a00000
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_NR_DRAM_BANKS=2
CONFIG_DEFAULT_DEVICE_TREE="rk3568-fastrhino-r66s"
CONFIG_ROCKCHIP_RK3568=y
CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y
CONFIG_SPL_MMC=y
CONFIG_SPL_SERIAL=y
CONFIG_SPL_STACK_R_ADDR=0x600000
CONFIG_TARGET_FASTRHINO_R66S_RK3568=y
CONFIG_DEBUG_UART_BASE=0xFE660000
CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0xc00800
CONFIG_API=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_OF_SYSTEM_SETUP=y
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-fastrhino-r66s.dtb"
# CONFIG_SYS_DEVICE_NULLDEV is not set
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
CONFIG_SPL_STACK_R=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_ATF=y
CONFIG_SPL_ATF_LOAD_IMAGE_V2=y
CONFIG_CMD_BIND=y
CONFIG_CMD_CLK=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_GPT=y
CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_PMIC=y
CONFIG_CMD_REGULATOR=y
# CONFIG_SPL_DOS_PARTITION is not set
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_LIVE=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPL_DM_WARN=y
CONFIG_SPL_REGMAP=y
CONFIG_SPL_SYSCON=y
CONFIG_SPL_CLK=y
CONFIG_ROCKCHIP_GPIO=y
CONFIG_ROCKCHIP_GPIO_V2=y
CONFIG_SYS_I2C_ROCKCHIP=y
CONFIG_MISC=y
CONFIG_MMC_HS200_SUPPORT=y
CONFIG_SPL_MMC_HS200_SUPPORT=y
CONFIG_MMC_DW=y
CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_SDMA=y
CONFIG_MMC_SDHCI_ROCKCHIP=y
CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_GMAC_ROCKCHIP=y
CONFIG_POWER_DOMAIN=y
CONFIG_DM_PMIC=y
CONFIG_PMIC_RK8XX=y
CONFIG_SPL_PMIC_RK8XX=y
CONFIG_REGULATOR_PWM=y
CONFIG_DM_REGULATOR_FIXED=y
CONFIG_SPL_DM_REGULATOR_FIXED=y
CONFIG_DM_REGULATOR_GPIO=y
CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y
CONFIG_SPL_RAM=y
CONFIG_DM_RESET=y
CONFIG_BAUDRATE=1500000
CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYSRESET=y
CONFIG_SYSRESET_PSCI=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_ROCKCHIP_USB2_PHY=y
CONFIG_USB_KEYBOARD=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_LAN75XX=y
CONFIG_USB_ETHER_LAN78XX=y
CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_ERRNO_STR=y
Binary file added package/firmware/linux-firmware/brcm_firmware/ap6275s/BCM4362A2.hcd
View file
Binary file not shown.
Binary file added package/firmware/linux-firmware/brcm_firmware/ap6275s/clm_bcm43752a2_ag.blob
View file
Binary file not shown.
Binary file added package/firmware/linux-firmware/brcm_firmware/ap6275s/fw_bcm43752a2_ag_apsta.bin
View file
Binary file not shown.
Loading

0 comments on commit 07ff3dd

Please sign in to comment.