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: 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
Showing
21 changed files
with
1,460 additions
and
78 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
92 changes: 92 additions & 0 deletions
92
package/boot/uboot-rockchip/patches/016-uboot-add-FastRhino-R66S-support.patch
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 |
|---|---|---|
| @@ -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
3
package/boot/uboot-rockchip/patches/900-arm-boot-add-dts-files.patch
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,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
97
package/boot/uboot-rockchip/src/configs/fastrhino-r66s-rk3568_defconfig
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 |
|---|---|---|
| @@ -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 |
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
29 changes: 29 additions & 0 deletions
29
package/libs/zlib/patches/007-fix-null-dereference-in-fix-CVE-2022-37434.patch
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 |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| From 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Mon Sep 17 00:00:00 2001 | ||
| From: Mark Adler <[email protected]> | ||
| Date: Mon, 8 Aug 2022 10:50:09 -0700 | ||
| Subject: [PATCH] Fix extra field processing bug that dereferences NULL | ||
| state->head. | ||
|
|
||
| The recent commit to fix a gzip header extra field processing bug | ||
| introduced the new bug fixed here. | ||
| --- | ||
| inflate.c | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/inflate.c b/inflate.c | ||
| index 7a7289749..2a3c4fe98 100644 | ||
| --- a/inflate.c | ||
| +++ b/inflate.c | ||
| @@ -763,10 +763,10 @@ int flush; | ||
| copy = state->length; | ||
| if (copy > have) copy = have; | ||
| if (copy) { | ||
| - len = state->head->extra_len - state->length; | ||
| if (state->head != Z_NULL && | ||
| state->head->extra != Z_NULL && | ||
| - len < state->head->extra_max) { | ||
| + (len = state->head->extra_len - state->length) < | ||
| + state->head->extra_max) { | ||
| zmemcpy(state->head->extra + len, next, | ||
| len + copy > state->head->extra_max ? | ||
| state->head->extra_max - len : copy); |
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 |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| CONFIG_ALIGNMENT_TRAP=y | ||
| CONFIG_ARCH_32BIT_OFF_T=y | ||
| CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y | ||
| CONFIG_ARCH_MULTIPLATFORM=y | ||
| CONFIG_ARCH_MULTI_V6_V7=y | ||
| CONFIG_ARCH_MULTI_V7=y | ||
| CONFIG_ARCH_NR_GPIO=0 | ||
| CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y | ||
| CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y | ||
| CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
| CONFIG_ARCH_VIRT=y | ||
| CONFIG_ARM=y | ||
| CONFIG_ARM_CPU_SUSPEND=y | ||
| CONFIG_ARM_HAS_SG_CHAIN=y | ||
| CONFIG_ARM_HEAVY_MB=y | ||
| CONFIG_ARM_L1_CACHE_SHIFT=6 | ||
| CONFIG_ARM_L1_CACHE_SHIFT_6=y | ||
| CONFIG_ARM_LPAE=y | ||
| CONFIG_ARM_PATCH_IDIV=y | ||
| CONFIG_ARM_PATCH_PHYS_VIRT=y | ||
| CONFIG_ARM_PSCI=y | ||
| CONFIG_ARM_THUMB=y | ||
| CONFIG_ARM_UNWIND=y | ||
| CONFIG_ARM_VIRT_EXT=y | ||
| CONFIG_AUTO_ZRELADDR=y | ||
| CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y | ||
| CONFIG_CACHE_L2X0=y | ||
| CONFIG_COMPAT_32BIT_TIME=y | ||
| CONFIG_CPU_32v6K=y | ||
| CONFIG_CPU_32v7=y | ||
| CONFIG_CPU_ABRT_EV7=y | ||
| CONFIG_CPU_CACHE_V7=y | ||
| CONFIG_CPU_CACHE_VIPT=y | ||
| CONFIG_CPU_COPY_V6=y | ||
| CONFIG_CPU_CP15=y | ||
| CONFIG_CPU_CP15_MMU=y | ||
| CONFIG_CPU_HAS_ASID=y | ||
| CONFIG_CPU_PABRT_V7=y | ||
| CONFIG_CPU_SPECTRE=y | ||
| CONFIG_CPU_THUMB_CAPABLE=y | ||
| CONFIG_CPU_TLB_V7=y | ||
| CONFIG_CPU_V7=y | ||
| CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" | ||
| CONFIG_DMA_OPS=y | ||
| CONFIG_EDAC_ATOMIC_SCRUB=y | ||
| CONFIG_GENERIC_IRQ_MULTI_HANDLER=y | ||
| CONFIG_GENERIC_VDSO_32=y | ||
| CONFIG_HARDEN_BRANCH_PREDICTOR=y | ||
| CONFIG_HAVE_SMP=y | ||
| CONFIG_HZ_FIXED=0 | ||
| CONFIG_HZ_PERIODIC=y | ||
| CONFIG_MIGHT_HAVE_CACHE_L2X0=y | ||
| CONFIG_MODULES_USE_ELF_REL=y | ||
| CONFIG_NEON=y | ||
| CONFIG_NR_CPUS=4 | ||
| CONFIG_OLD_SIGACTION=y | ||
| CONFIG_OLD_SIGSUSPEND3=y | ||
| CONFIG_OUTER_CACHE=y | ||
| CONFIG_OUTER_CACHE_SYNC=y | ||
| CONFIG_PAGE_OFFSET=0xC0000000 | ||
| CONFIG_PERF_USE_VMALLOC=y | ||
| CONFIG_RTC_MC146818_LIB=y | ||
| CONFIG_SERIAL_OF_PLATFORM=y | ||
| CONFIG_SMP_ON_UP=y | ||
| CONFIG_SWP_EMULATE=y | ||
| CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" | ||
| CONFIG_UNWINDER_ARM=y | ||
| CONFIG_USE_OF=y | ||
| CONFIG_VFP=y | ||
| CONFIG_VFPv3=y | ||
| CONFIG_XZ_DEC_ARM=y | ||
| CONFIG_XZ_DEC_BCJ=y | ||
| CONFIG_ZBOOT_ROM_BSS=0 | ||
| CONFIG_ZBOOT_ROM_TEXT=0 |
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 |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| CONFIG_64BIT=y | ||
| CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y | ||
| CONFIG_ARCH_MMAP_RND_BITS=18 | ||
| CONFIG_ARCH_MMAP_RND_BITS_MAX=24 | ||
| CONFIG_ARCH_MMAP_RND_BITS_MIN=18 | ||
| CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11 | ||
| CONFIG_ARCH_PROC_KCORE_TEXT=y | ||
| CONFIG_ARCH_STACKWALK=y | ||
| CONFIG_ARCH_VEXPRESS=y | ||
| CONFIG_ARCH_WANTS_NO_INSTR=y | ||
| CONFIG_ARM64=y | ||
| CONFIG_ARM64_4K_PAGES=y | ||
| CONFIG_ARM64_CNP=y | ||
| CONFIG_ARM64_CRYPTO=y | ||
| CONFIG_ARM64_EPAN=y | ||
| CONFIG_ARM64_ERRATUM_1165522=y | ||
| CONFIG_ARM64_ERRATUM_1286807=y | ||
| CONFIG_ARM64_ERRATUM_819472=y | ||
| CONFIG_ARM64_ERRATUM_824069=y | ||
| CONFIG_ARM64_ERRATUM_826319=y | ||
| CONFIG_ARM64_ERRATUM_827319=y | ||
| CONFIG_ARM64_ERRATUM_832075=y | ||
| CONFIG_ARM64_ERRATUM_843419=y | ||
| CONFIG_ARM64_HW_AFDBM=y | ||
| CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y | ||
| CONFIG_ARM64_MODULE_PLTS=y | ||
| CONFIG_ARM64_PAGE_SHIFT=12 | ||
| CONFIG_ARM64_PAN=y | ||
| CONFIG_ARM64_PA_BITS=48 | ||
| CONFIG_ARM64_PA_BITS_48=y | ||
| CONFIG_ARM64_PTR_AUTH=y | ||
| CONFIG_ARM64_PTR_AUTH_KERNEL=y | ||
| CONFIG_ARM64_SVE=y | ||
| CONFIG_ARM64_TAGGED_ADDR_ABI=y | ||
| CONFIG_ARM64_VA_BITS=39 | ||
| CONFIG_ARM64_VA_BITS_39=y | ||
| CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y | ||
| CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y | ||
| CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y | ||
| CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y | ||
| CONFIG_ATOMIC64_SELFTEST=y | ||
| CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y | ||
| CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| CONFIG_BLK_PM=y | ||
| CONFIG_CAVIUM_TX2_ERRATUM_219=y | ||
| CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y | ||
| CONFIG_CLK_SP810=y | ||
| CONFIG_CLK_VEXPRESS_OSC=y | ||
| # CONFIG_COMPAT_32BIT_TIME is not set | ||
| CONFIG_CPU_IDLE=y | ||
| CONFIG_CPU_IDLE_GOV_MENU=y | ||
| CONFIG_CPU_PM=y | ||
| CONFIG_CRYPTO_AES_ARM64=y | ||
| CONFIG_CRYPTO_AES_ARM64_BS=y | ||
| CONFIG_CRYPTO_AES_ARM64_CE=y | ||
| CONFIG_CRYPTO_AES_ARM64_CE_BLK=y | ||
| CONFIG_CRYPTO_AES_ARM64_CE_CCM=y | ||
| CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y | ||
| CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y | ||
| CONFIG_CRYPTO_CHACHA20=y | ||
| CONFIG_CRYPTO_CHACHA20_NEON=y | ||
| CONFIG_CRYPTO_CRYPTD=y | ||
| CONFIG_CRYPTO_GHASH_ARM64_CE=y | ||
| CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y | ||
| CONFIG_CRYPTO_SHA1=y | ||
| CONFIG_CRYPTO_SHA1_ARM64_CE=y | ||
| CONFIG_CRYPTO_SHA256_ARM64=y | ||
| CONFIG_CRYPTO_SHA2_ARM64_CE=y | ||
| CONFIG_CRYPTO_SHA512_ARM64=y | ||
| CONFIG_CRYPTO_SIMD=y | ||
| CONFIG_DMA_DIRECT_REMAP=y | ||
| CONFIG_DMA_SHARED_BUFFER=y | ||
| CONFIG_DRM=y | ||
| CONFIG_DRM_BOCHS=y | ||
| CONFIG_DRM_BRIDGE=y | ||
| CONFIG_DRM_GEM_SHMEM_HELPER=y | ||
| CONFIG_DRM_KMS_HELPER=y | ||
| CONFIG_DRM_PANEL=y | ||
| CONFIG_DRM_PANEL_BRIDGE=y | ||
| CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y | ||
| CONFIG_DRM_QXL=y | ||
| CONFIG_DRM_TTM=y | ||
| CONFIG_DRM_TTM_HELPER=y | ||
| CONFIG_DRM_VIRTIO_GPU=y | ||
| CONFIG_DRM_VRAM_HELPER=y | ||
| CONFIG_FB=y | ||
| CONFIG_FB_ARMCLCD=y | ||
| CONFIG_FB_CFB_COPYAREA=y | ||
| CONFIG_FB_CFB_FILLRECT=y | ||
| CONFIG_FB_CFB_IMAGEBLIT=y | ||
| CONFIG_FB_CMDLINE=y | ||
| CONFIG_FB_MODE_HELPERS=y | ||
| CONFIG_FRAME_POINTER=y | ||
| CONFIG_FSL_ERRATUM_A008585=y | ||
| CONFIG_FUJITSU_ERRATUM_010001=y | ||
| CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y | ||
| CONFIG_GENERIC_CSUM=y | ||
| CONFIG_GENERIC_FIND_FIRST_BIT=y | ||
| CONFIG_GPIO_GENERIC=y | ||
| CONFIG_GPIO_GENERIC_PLATFORM=y | ||
| CONFIG_HDMI=y | ||
| CONFIG_HW_RANDOM=y | ||
| CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y | ||
| CONFIG_HW_RANDOM_VIRTIO=y | ||
| CONFIG_I2C=y | ||
| CONFIG_I2C_ALGOBIT=y | ||
| CONFIG_I2C_BOARDINFO=y | ||
| CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 | ||
| CONFIG_KCMP=y | ||
| CONFIG_LCD_CLASS_DEVICE=m | ||
| # CONFIG_LCD_PLATFORM is not set | ||
| CONFIG_MFD_CORE=y | ||
| CONFIG_MFD_SYSCON=y | ||
| CONFIG_MFD_VEXPRESS_SYSREG=y | ||
| CONFIG_MMC=y | ||
| CONFIG_MMC_ARMMMCI=y | ||
| CONFIG_MODULES_USE_ELF_RELA=y | ||
| CONFIG_NEED_SG_DMA_LENGTH=y | ||
| CONFIG_NO_HZ=y | ||
| CONFIG_NO_HZ_COMMON=y | ||
| CONFIG_NO_HZ_IDLE=y | ||
| CONFIG_NR_CPUS=64 | ||
| CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y | ||
| CONFIG_PM=y | ||
| CONFIG_PM_CLK=y | ||
| CONFIG_PM_GENERIC_DOMAINS=y | ||
| CONFIG_PM_GENERIC_DOMAINS_OF=y | ||
| CONFIG_POWER_RESET=y | ||
| CONFIG_POWER_RESET_VEXPRESS=y | ||
| CONFIG_POWER_SUPPLY=y | ||
| CONFIG_QUEUED_RWLOCKS=y | ||
| CONFIG_QUEUED_SPINLOCKS=y | ||
| CONFIG_REGMAP=y | ||
| CONFIG_REGMAP_MMIO=y | ||
| CONFIG_RODATA_FULL_DEFAULT_ENABLED=y | ||
| CONFIG_RTC_I2C_AND_SPI=y | ||
| CONFIG_SMC91X=y | ||
| CONFIG_SPARSEMEM=y | ||
| CONFIG_SPARSEMEM_EXTREME=y | ||
| CONFIG_SPARSEMEM_VMEMMAP=y | ||
| CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | ||
| CONFIG_SYNC_FILE=y | ||
| CONFIG_SYSCTL_EXCEPTION_TRACE=y | ||
| CONFIG_THREAD_INFO_IN_TASK=y | ||
| CONFIG_UNMAP_KERNEL_AT_EL0=y | ||
| CONFIG_VEXPRESS_CONFIG=y | ||
| CONFIG_VIDEOMODE_HELPERS=y | ||
| CONFIG_VIRTIO_DMA_SHARED_BUFFER=y | ||
| CONFIG_VMAP_STACK=y | ||
| CONFIG_ZONE_DMA32=y |
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
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 |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| CONFIG_9P_FS=y | ||
| # CONFIG_9P_FS_POSIX_ACL is not set | ||
| # CONFIG_9P_FS_SECURITY is not set | ||
| CONFIG_ARCH_DMA_ADDR_T_64BIT=y | ||
| CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| CONFIG_ARCH_KEEP_MEMBLOCK=y | ||
| CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
| CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| CONFIG_ARM_AMBA=y | ||
| CONFIG_ARM_ARCH_TIMER=y | ||
| CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y | ||
| CONFIG_ARM_GIC=y | ||
| CONFIG_ARM_GIC_V2M=y | ||
| CONFIG_ARM_GIC_V3=y | ||
| CONFIG_ARM_GIC_V3_ITS=y | ||
| CONFIG_ARM_GIC_V3_ITS_PCI=y | ||
| CONFIG_ARM_PSCI_FW=y | ||
| CONFIG_BALLOON_COMPACTION=y | ||
| CONFIG_BLK_DEV_LOOP=y | ||
| CONFIG_BLK_MQ_PCI=y | ||
| CONFIG_BLK_MQ_VIRTIO=y | ||
| CONFIG_CLONE_BACKWARDS=y | ||
| CONFIG_COMMON_CLK=y | ||
| CONFIG_CPU_RMAP=y | ||
| CONFIG_CRC16=y | ||
| CONFIG_CRYPTO_CRC32=y | ||
| CONFIG_CRYPTO_CRC32C=y | ||
| CONFIG_CRYPTO_RNG2=y | ||
| CONFIG_DCACHE_WORD_ACCESS=y | ||
| CONFIG_DEBUG_BUGVERBOSE=y | ||
| CONFIG_DMADEVICES=y | ||
| CONFIG_DMA_ENGINE=y | ||
| CONFIG_DMA_OF=y | ||
| CONFIG_DMA_REMAP=y | ||
| CONFIG_DTC=y | ||
| CONFIG_EDAC_SUPPORT=y | ||
| CONFIG_EXT4_FS=y | ||
| CONFIG_F2FS_FS=y | ||
| CONFIG_FAILOVER=y | ||
| CONFIG_FIX_EARLYCON_MEM=y | ||
| CONFIG_FS_IOMAP=y | ||
| CONFIG_FS_MBCACHE=y | ||
| CONFIG_FW_LOADER_PAGED_BUF=y | ||
| CONFIG_GENERIC_ALLOCATOR=y | ||
| CONFIG_GENERIC_ARCH_TOPOLOGY=y | ||
| CONFIG_GENERIC_BUG=y | ||
| CONFIG_GENERIC_CLOCKEVENTS=y | ||
| CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y | ||
| CONFIG_GENERIC_CPU_AUTOPROBE=y | ||
| CONFIG_GENERIC_CPU_VULNERABILITIES=y | ||
| CONFIG_GENERIC_EARLY_IOREMAP=y | ||
| CONFIG_GENERIC_GETTIMEOFDAY=y | ||
| CONFIG_GENERIC_IDLE_POLL_SETUP=y | ||
| CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y | ||
| CONFIG_GENERIC_IRQ_MIGRATION=y | ||
| CONFIG_GENERIC_IRQ_SHOW=y | ||
| CONFIG_GENERIC_IRQ_SHOW_LEVEL=y | ||
| CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y | ||
| CONFIG_GENERIC_MSI_IRQ=y | ||
| CONFIG_GENERIC_MSI_IRQ_DOMAIN=y | ||
| CONFIG_GENERIC_PCI_IOMAP=y | ||
| CONFIG_GENERIC_SCHED_CLOCK=y | ||
| CONFIG_GENERIC_SMP_IDLE_THREAD=y | ||
| CONFIG_GENERIC_STRNCPY_FROM_USER=y | ||
| CONFIG_GENERIC_STRNLEN_USER=y | ||
| CONFIG_GENERIC_TIME_VSYSCALL=y | ||
| CONFIG_GPIOLIB=y | ||
| CONFIG_GPIOLIB_IRQCHIP=y | ||
| CONFIG_GPIO_CDEV=y | ||
| CONFIG_GPIO_PL061=y | ||
| CONFIG_HANDLE_DOMAIN_IRQ=y | ||
| CONFIG_HARDIRQS_SW_RESEND=y | ||
| CONFIG_HAS_DMA=y | ||
| CONFIG_HAS_IOMEM=y | ||
| CONFIG_HAS_IOPORT_MAP=y | ||
| CONFIG_HOTPLUG_CPU=y | ||
| CONFIG_HVC_DRIVER=y | ||
| CONFIG_INITRAMFS_SOURCE="" | ||
| CONFIG_IRQCHIP=y | ||
| CONFIG_IRQ_DOMAIN=y | ||
| CONFIG_IRQ_DOMAIN_HIERARCHY=y | ||
| CONFIG_IRQ_FORCED_THREADING=y | ||
| CONFIG_IRQ_WORK=y | ||
| CONFIG_JBD2=y | ||
| CONFIG_LIBFDT=y | ||
| CONFIG_LOCK_DEBUGGING_SUPPORT=y | ||
| CONFIG_LOCK_SPIN_ON_OWNER=y | ||
| CONFIG_MEMFD_CREATE=y | ||
| CONFIG_MEMORY_BALLOON=y | ||
| CONFIG_MIGRATION=y | ||
| CONFIG_MUTEX_SPIN_ON_OWNER=y | ||
| CONFIG_NEED_DMA_MAP_STATE=y | ||
| CONFIG_NET_9P=y | ||
| # CONFIG_NET_9P_DEBUG is not set | ||
| CONFIG_NET_9P_VIRTIO=y | ||
| CONFIG_NET_FAILOVER=y | ||
| CONFIG_NET_FLOW_LIMIT=y | ||
| CONFIG_NLS=y | ||
| CONFIG_NVMEM=y | ||
| CONFIG_OF=y | ||
| CONFIG_OF_ADDRESS=y | ||
| CONFIG_OF_EARLY_FLATTREE=y | ||
| CONFIG_OF_FLATTREE=y | ||
| CONFIG_OF_GPIO=y | ||
| CONFIG_OF_IRQ=y | ||
| CONFIG_OF_KOBJ=y | ||
| CONFIG_PADATA=y | ||
| CONFIG_PAGE_REPORTING=y | ||
| CONFIG_PARTITION_PERCPU=y | ||
| CONFIG_PCI=y | ||
| CONFIG_PCI_DOMAINS=y | ||
| CONFIG_PCI_DOMAINS_GENERIC=y | ||
| CONFIG_PCI_ECAM=y | ||
| CONFIG_PCI_HOST_COMMON=y | ||
| CONFIG_PCI_HOST_GENERIC=y | ||
| CONFIG_PCI_MSI=y | ||
| CONFIG_PCI_MSI_IRQ_DOMAIN=y | ||
| CONFIG_PGTABLE_LEVELS=3 | ||
| CONFIG_PHYS_ADDR_T_64BIT=y | ||
| CONFIG_PTP_1588_CLOCK_OPTIONAL=y | ||
| CONFIG_RATIONAL=y | ||
| CONFIG_RFS_ACCEL=y | ||
| CONFIG_RPS=y | ||
| CONFIG_RTC_CLASS=y | ||
| CONFIG_RTC_DRV_PL031=y | ||
| CONFIG_RWSEM_SPIN_ON_OWNER=y | ||
| CONFIG_SCSI=y | ||
| CONFIG_SCSI_COMMON=y | ||
| CONFIG_SCSI_VIRTIO=y | ||
| CONFIG_SERIAL_8250_FSL=y | ||
| CONFIG_SERIAL_AMBA_PL011=y | ||
| CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | ||
| CONFIG_SERIAL_MCTRL_GPIO=y | ||
| CONFIG_SG_POOL=y | ||
| CONFIG_SMP=y | ||
| CONFIG_SOCK_RX_QUEUE_MAPPING=y | ||
| CONFIG_SPARSE_IRQ=y | ||
| CONFIG_SRCU=y | ||
| CONFIG_SWIOTLB=y | ||
| CONFIG_TICK_CPU_ACCOUNTING=y | ||
| CONFIG_TIMER_OF=y | ||
| CONFIG_TIMER_PROBE=y | ||
| CONFIG_TREE_RCU=y | ||
| CONFIG_TREE_SRCU=y | ||
| CONFIG_USB_SUPPORT=y | ||
| CONFIG_VIRTIO=y | ||
| CONFIG_VIRTIO_BALLOON=y | ||
| CONFIG_VIRTIO_BLK=y | ||
| CONFIG_VIRTIO_CONSOLE=y | ||
| CONFIG_VIRTIO_MMIO=y | ||
| CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y | ||
| CONFIG_VIRTIO_NET=y | ||
| CONFIG_VIRTIO_PCI=y | ||
| CONFIG_VIRTIO_PCI_LEGACY=y | ||
| CONFIG_VIRTIO_PCI_LIB=y | ||
| CONFIG_XPS=y |
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
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
531 changes: 531 additions & 0 deletions
531
target/linux/rockchip/files-5.19/arch/arm64/boot/dts/rockchip/rk3568-r66s.dts
Large diffs are not rendered by default.
Oops, something went wrong.
45 changes: 45 additions & 0 deletions
45
target/linux/rockchip/files/Documentation/devicetree/bindings/rng/rockchip,rng.txt
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 |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| Rockchip Hardware Random Number Generator | ||
|
|
||
| Required properties: | ||
|
|
||
| - compatible : should be one of the following. | ||
| "rockchip,cryptov1-rng" for crypto v1 | ||
| "rockchip,cryptov2-rng" for crypto v2 | ||
| "rockchip,trngv1" for independent trng, such as rk3588. | ||
| - reg : Specifies base physical address and size of the registers map. | ||
| - clocks : Phandle to clock-controller plus clock-specifier pair. | ||
| - clock-names : "clk_crypto", "clk_crypto_apk", "aclk_crypto", "hclk_crypto" as a clock name. | ||
| - assigned-clocks: Main clock, should be <&cru SCLK_CRYPTO>, <&cru SCLK_CRYPTO_APK>, | ||
| <&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO> | ||
| - assigned-clock-rates : The rng core clk frequency, shall be: <150000000>, <150000000>, | ||
| <200000000>, <100000000> | ||
| - resets : Used for module reset | ||
| - reset-names : Reset names, should be "reset" | ||
| Example: | ||
|
|
||
| rng: rng@100fc000 { | ||
| compatible = "rockchip,cryptov1-rng"; | ||
| reg = <0x100fc000 0x4000>; | ||
| clocks = <&cru SCLK_CRYPTO>, <&cru HCLK_CRYPTO>; | ||
| clock-names = "clk_crypto", "hclk_crypto"; | ||
| assigned-clocks = <&cru SCLK_CRYPTO>, <&cru HCLK_CRYPTO>; | ||
| assigned-clock-rates = <150000000>, <100000000>; | ||
| resets = <&cru SRST_CRYPTO>; | ||
| reset-names = "reset"; | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| rng: rng@ff2f0000 { | ||
| compatible = "rockchip,cryptov2-rng"; | ||
| reg = <0x0 0xff2f0000 0x0 0x4000>; | ||
| clocks = <&cru SCLK_CRYPTO>, <&cru SCLK_CRYPTO_APK>, | ||
| <&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>; | ||
| clock-names = "clk_crypto", "clk_crypto_apk", | ||
| "aclk_crypto", "hclk_crypto"; | ||
| assigned-clocks = <&cru SCLK_CRYPTO>, <&cru SCLK_CRYPTO_APK>, | ||
| <&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>; | ||
| assigned-clock-rates = <150000000>, <150000000>, | ||
| <200000000>, <100000000>; | ||
| resets = <&cru SRST_CRYPTO>; | ||
| reset-names = "reset"; | ||
| }; |
289 changes: 222 additions & 67 deletions
289
target/linux/rockchip/files/drivers/char/hw_random/rockchip-rng.c
Large diffs are not rendered by default.
Oops, something went wrong.
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
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