forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: Update README.md rockchip:fix nanopi-r4s mac address again Version update to R22.9.1 update README.md rockchip: add support for FastRhino R66S/R68S rockchip: add basic support for HINLINK OPC-H68K rockchip: add support for EZPRO Mrkaio M68S rockchip: backport support for Radxa ROCK3 A uboot-rockchip: don't hardcore USB_OHCI_NEW options rockchip: 5.15: fixes motorcomm driver build error rockchip: 5.15: introduce rk3568 support rockchip: revert to origin defaults Revert "rockchip: backport rk3568 support to kernel 5.10" x86: add new missing symbol kernel: bump 5.19 to 5.19.6 rockchip: backport rk3568 support to kernel 5.10 (coolsnowwolf#10025) linux-firmware: fix Intel GUC firmware support for N5105/N6005 (coolsnowwolf#10027)
- Loading branch information
Showing
275 changed files
with
6,780 additions
and
41,749 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| LINUX_VERSION-5.19 = .5 | ||
| LINUX_KERNEL_HASH-5.19.5 = 8c3f1cc4f93e50056bb0a8c15a41a8eb6acc7fd71bff6de60b1ef8c4532537bd | ||
| LINUX_VERSION-5.19 = .6 | ||
| LINUX_KERNEL_HASH-5.19.6 = 41a4f824af614460c429a7c723e8dcbb0e042f0047d328c18b4ed6f2b4efa63a |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,9 +17,6 @@ Signed-off-by: Marty Jones <[email protected]> | |
| 9 files changed, 692 insertions(+), 1 deletion(-) | ||
| create mode 100644 arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | ||
| create mode 100644 arch/arm/dts/rk3568-rock-3a.dts | ||
| create mode 100644 board/radxa/rock-3a-rk3568/Kconfig | ||
| create mode 100644 board/radxa/rock-3a-rk3568/Makefile | ||
| create mode 100644 board/radxa/rock-3a-rk3568/rock-3a-rk3568.c | ||
| create mode 100644 configs/rock-3a-rk3568_defconfig | ||
| create mode 100644 include/configs/rock-3a-rk3568.h | ||
|
|
||
|
|
@@ -37,7 +34,7 @@ Signed-off-by: Marty Jones <[email protected]> | |
| rv1108-elgin-r1.dtb \ | ||
| --- /dev/null | ||
| +++ b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | ||
| @@ -0,0 +1,25 @@ | ||
| @@ -0,0 +1,24 @@ | ||
| +// SPDX-License-Identifier: GPL-2.0+ | ||
| +/* | ||
| + * (C) Copyright 2021 Rockchip Electronics Co., Ltd | ||
|
|
@@ -54,13 +51,12 @@ Signed-off-by: Marty Jones <[email protected]> | |
| + | ||
| +&sdmmc0 { | ||
| + bus-width = <4>; | ||
| + u-boot,dm-spl; | ||
| + u-boot,spl-fifo-mode; | ||
| +}; | ||
| + | ||
| +&uart2 { | ||
| + clock-frequency = <24000000>; | ||
| + u-boot,dm-spl; | ||
| + clock-frequency = <24000000>; | ||
| + status = "okay"; | ||
| +}; | ||
| --- /dev/null | ||
|
|
@@ -591,59 +587,9 @@ Signed-off-by: Marty Jones <[email protected]> | |
| +&usb_host1_ohci { | ||
| + status = "okay"; | ||
| +}; | ||
| --- a/arch/arm/mach-rockchip/rk3568/Kconfig | ||
| +++ b/arch/arm/mach-rockchip/rk3568/Kconfig | ||
| @@ -18,6 +18,11 @@ config TARGET_QUARTZ64_A_RK3566 | ||
| help | ||
| Quartz64 Model A RK3566 is a development board from Pine64. | ||
|
|
||
| +config TARGET_ROCK_3A_RK3568 | ||
| + bool "ROCK3 Model A RK3568 development board" | ||
| + help | ||
| + ROCK3 Model A RK3568 is a development board from Radxa. | ||
| + | ||
| endchoice | ||
|
|
||
| config ROCKCHIP_BOOT_MODE_REG | ||
| @@ -35,5 +40,6 @@ config SYS_MALLOC_F_LEN | ||
| source "board/rockchip/bpi-r2-pro-rk3568/Kconfig" | ||
| source "board/rockchip/evb_rk3568/Kconfig" | ||
| source "board/pine64/quartz64-a-rk3566/Kconfig" | ||
| +source "board/radxa/rock-3a-rk3568/Kconfig" | ||
|
|
||
| endif | ||
| --- /dev/null | ||
| +++ b/board/radxa/rock-3a-rk3568/Kconfig | ||
| @@ -0,0 +1,15 @@ | ||
| +if TARGET_ROCK_3A_RK3568 | ||
| + | ||
| +config SYS_BOARD | ||
| + default "rock-3a-rk3568" | ||
| + | ||
| +config SYS_VENDOR | ||
| + default "radxa" | ||
| + | ||
| +config SYS_CONFIG_NAME | ||
| + default "rock-3a-rk3568" | ||
| + | ||
| +config BOARD_SPECIFIC_OPTIONS # dummy | ||
| + def_bool y | ||
| + | ||
| +endif | ||
| --- /dev/null | ||
| +++ b/board/radxa/rock-3a-rk3568/Makefile | ||
| @@ -0,0 +1,4 @@ | ||
| +# SPDX-License-Identifier: GPL-2.0+ | ||
| +# | ||
| + | ||
| +obj-y += rock-3a-rk3568.o | ||
| --- /dev/null | ||
| +++ b/board/radxa/rock-3a-rk3568/rock-3a-rk3568.c | ||
| @@ -0,0 +1 @@ | ||
| +// SPDX-License-Identifier: GPL-2.0+ | ||
| --- /dev/null | ||
| +++ b/configs/rock-3a-rk3568_defconfig | ||
| @@ -0,0 +1,97 @@ | ||
| @@ -0,0 +1,98 @@ | ||
| +CONFIG_ARM=y | ||
| +CONFIG_SKIP_LOWLEVEL_INIT=y | ||
| +CONFIG_ARCH_ROCKCHIP=y | ||
|
|
@@ -658,7 +604,7 @@ Signed-off-by: Marty Jones <[email protected]> | |
| +CONFIG_SPL_MMC=y | ||
| +CONFIG_SPL_SERIAL=y | ||
| +CONFIG_SPL_STACK_R_ADDR=0x600000 | ||
| +CONFIG_TARGET_ROCK_3A_RK3568=y | ||
| +CONFIG_TARGET_EVB_RK3568=y | ||
| +CONFIG_DEBUG_UART_BASE=0xFE660000 | ||
| +CONFIG_DEBUG_UART_CLOCK=24000000 | ||
| +CONFIG_DEBUG_UART=y | ||
|
|
@@ -670,6 +616,7 @@ Signed-off-by: Marty Jones <[email protected]> | |
| +CONFIG_OF_SYSTEM_SETUP=y | ||
| +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-rock-3a.dtb" | ||
| +# CONFIG_SYS_DEVICE_NULLDEV is not set | ||
| +CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2 | ||
| +# CONFIG_DISPLAY_CPUINFO is not set | ||
| +CONFIG_DISPLAY_BOARDINFO_LATE=y | ||
| +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set | ||
|
|
@@ -741,23 +688,3 @@ Signed-off-by: Marty Jones <[email protected]> | |
| +CONFIG_USB_ETHER_LAN78XX=y | ||
| +CONFIG_USB_ETHER_SMSC95XX=y | ||
| +CONFIG_ERRNO_STR=y | ||
| --- /dev/null | ||
| +++ b/include/configs/rock-3a-rk3568.h | ||
| @@ -0,0 +1,17 @@ | ||
| +/* SPDX-License-Identifier: GPL-2.0+ */ | ||
| + | ||
| +#ifndef __ROCK_3A_RK3568_H | ||
| +#define __ROCK_3A_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 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -129,7 +129,7 @@ Signed-off-by: Marty Jones <[email protected]> | |
| + */ | ||
| --- /dev/null | ||
| +++ b/configs/nanopi-r5s-rk3568_defconfig | ||
| @@ -0,0 +1,97 @@ | ||
| @@ -0,0 +1,98 @@ | ||
| +CONFIG_ARM=y | ||
| +CONFIG_SKIP_LOWLEVEL_INIT=y | ||
| +CONFIG_ARCH_ROCKCHIP=y | ||
|
|
@@ -149,6 +149,7 @@ Signed-off-by: Marty Jones <[email protected]> | |
| +CONFIG_DEBUG_UART_CLOCK=24000000 | ||
| +CONFIG_DEBUG_UART=y | ||
| +CONFIG_SYS_LOAD_ADDR=0xc00800 | ||
| +CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2 | ||
| +CONFIG_API=y | ||
| +CONFIG_FIT=y | ||
| +CONFIG_FIT_VERBOSE=y | ||
|
|
@@ -229,7 +230,7 @@ Signed-off-by: Marty Jones <[email protected]> | |
| +CONFIG_ERRNO_STR=y | ||
| --- /dev/null | ||
| +++ b/include/configs/nanopi-r5s-rk3568.h | ||
| @@ -0,0 +1,17 @@ | ||
| @@ -0,0 +1,14 @@ | ||
| +/* SPDX-License-Identifier: GPL-2.0+ */ | ||
| + | ||
| +#ifndef __NANOPI_R5S_RK3568_H | ||
|
|
@@ -243,7 +244,4 @@ Signed-off-by: Marty Jones <[email protected]> | |
| + "stdout=serial,vidconsole\0" \ | ||
| + "stderr=serial,vidconsole\0" | ||
| + | ||
| +#define CONFIG_USB_OHCI_NEW | ||
| +#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 | ||
| + | ||
| +#endif | ||
Oops, something went wrong.