rock-5b: add initial radxa rock-5b .wip (#4026)
* rock-5b: add initial raxda rock-5b .wip (by @amazingfate); vendor u-boot & kernel - .wip board - using BOARDFAMILY `rk35xx`, which was for rock-3a - patch by @piter75 uboot for working 'source' command so boot.scr can be used, and not extlinux - .config: hammer CONFIG_JOYSTICK_XPAD & CONFIG_JOYSTICK_PSXPAD_SPI - rock5 add kernel optiions by @lanefu - disable CONFIG_LOCALVERSION_AUTO otherwise packaging goes insane - make its kernel is own LINUXFAMILY to as to not mess up rock-3a - CONFIG_VT=y & SKIP_BOOTSPLASH="yes" * Add separate family for rock 5b - rockchip-rk3588 Co-authored-by: amazingfate <liujianfeng1994@gmail.com> Co-authored-by: root <catalinii@yahoo.com>
This commit is contained in:
parent
fa89975db7
commit
1fdbab346a
13
config/boards/rock-5b.wip
Normal file
13
config/boards/rock-5b.wip
Normal file
@ -0,0 +1,13 @@
|
||||
# Radxa RK3588 SoC
|
||||
BOARD_NAME="Rock 5B"
|
||||
BOARDFAMILY="rockchip-rk3588"
|
||||
BOOTCONFIG="rock-5b-rk3588_defconfig"
|
||||
KERNEL_TARGET="legacy"
|
||||
FULL_DESKTOP="yes"
|
||||
BOOT_LOGO="desktop"
|
||||
BOOT_FDT_FILE="rockchip/rk3588-rock-5b.dtb"
|
||||
BOOT_SCENARIO="spl-blobs"
|
||||
WIREGUARD="no"
|
||||
BOOT_SUPPORT_SPI="yes"
|
||||
IMAGE_PARTITION_TABLE="gpt"
|
||||
SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
|
||||
7853
config/kernel/linux-rockchip-rk3588-legacy.config
Normal file
7853
config/kernel/linux-rockchip-rk3588-legacy.config
Normal file
File diff suppressed because it is too large
Load Diff
@ -88,6 +88,12 @@ elif [[ $BOOT_SOC == rk3568 ]]; then
|
||||
DDR_BLOB="${DDR_BLOB:=rk35/rk3568_ddr_1560MHz_v1.10.bin}"
|
||||
BL31_BLOB='rk35/rk3568_bl31_v1.28.elf'
|
||||
|
||||
elif [[ $BOOT_SOC == rk3588 ]]; then
|
||||
|
||||
BOOT_SCENARIO="${BOOT_SCENARIO:=spl-blobs}"
|
||||
DDR_BLOB="${DDR_BLOB:=rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.07.bin}"
|
||||
BL31_BLOB='rk35/rk3588_bl31_v1.25.elf'
|
||||
|
||||
elif [[ $BOARD == rockpi-s ]]; then
|
||||
|
||||
BOOT_SCENARIO="${BOOT_SCENARIO:=only-blobs}"
|
||||
@ -160,7 +166,7 @@ prepare_boot_configuration() {
|
||||
|
||||
if [[ $BOOT_SUPPORT_SPI == yes ]]; then
|
||||
|
||||
if [[ $BOARD != "rock-3a" ]]; then
|
||||
if [[ $BOARD != "rock-3a" ]] && [[ $BOARD != "rock-5b" ]]; then
|
||||
UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB tpl/u-boot-tpl.bin spl/u-boot-spl.bin u-boot.itb ${UBOOT_TARGET_MAP} rkspi_loader.img"
|
||||
else
|
||||
UBOOT_TARGET_MAP="${UBOOT_TARGET_MAP} rkspi_loader.img"
|
||||
@ -191,7 +197,7 @@ uboot_custom_postprocess() {
|
||||
fi
|
||||
|
||||
if [[ $BOOT_SUPPORT_SPI == yes ]]; then
|
||||
if [[ $BOARD == "rock-3a" ]]; then
|
||||
if [[ $BOARD == "rock-3a" ]] || [[ $BOARD == "rock-5b" ]]; then
|
||||
dd if=/dev/zero of=rkspi_loader.img bs=1M count=0 seek=16
|
||||
/sbin/parted -s rkspi_loader.img mklabel gpt
|
||||
/sbin/parted -s rkspi_loader.img unit s mkpart idbloader 64 7167
|
||||
|
||||
29
config/sources/families/rockchip-rk3588.conf
Normal file
29
config/sources/families/rockchip-rk3588.conf
Normal file
@ -0,0 +1,29 @@
|
||||
source "${BASH_SOURCE%/*}/include/rockchip64_common.inc"
|
||||
|
||||
BOOTSOURCE='https://github.com/radxa/u-boot.git'
|
||||
BOOTBRANCH='branch:stable-5.10-rock5'
|
||||
BOOTPATCHDIR="u-boot-rockchip-rk3588"
|
||||
|
||||
OVERLAY_PREFIX='rockchip-rk3588'
|
||||
|
||||
case $BRANCH in
|
||||
|
||||
legacy)
|
||||
UBOOT_COMPILER="aarch64-linux-gnu-"
|
||||
UBOOT_USE_GCC='< 8.0'
|
||||
BOOTDIR='u-boot-rockchip64'
|
||||
KERNELDIR='linux-rockchip64'
|
||||
KERNELSOURCE='https://github.com/radxa/kernel'
|
||||
KERNELBRANCH='branch:stable-5.10-rock5'
|
||||
KERNELPATCHDIR='rockchip-rk3588-legacy'
|
||||
|
||||
;;
|
||||
|
||||
esac
|
||||
|
||||
prepare_boot_configuration
|
||||
|
||||
family_tweaks_bsp()
|
||||
{
|
||||
:
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
From ea50d7f6921e2c3017258ce8fdfad632d82fbd87 Mon Sep 17 00:00:00 2001
|
||||
From: Stephen <stephen@vamrs.com>
|
||||
Date: Mon, 8 Nov 2021 14:30:00 +0800
|
||||
Subject: [PATCH] cmd: source: fix the error that the command source failed to
|
||||
execute
|
||||
|
||||
Signed-off-by: Stephen <stephen@vamrs.com>
|
||||
---
|
||||
cmd/source.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmd/source.c b/cmd/source.c
|
||||
index 45e9794b2f3..d724d63eb7c 100644
|
||||
--- a/cmd/source.c
|
||||
+++ b/cmd/source.c
|
||||
@@ -84,7 +84,7 @@ source (ulong addr, const char *fit_uname)
|
||||
* past the zero-terminated sequence of image lengths to get
|
||||
* to the actual image data
|
||||
*/
|
||||
- while (*data++ != IMAGE_PARAM_INVAL);
|
||||
+ while (*data++);
|
||||
break;
|
||||
#endif
|
||||
#if defined(CONFIG_FIT)
|
||||
Loading…
Reference in New Issue
Block a user