enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rockchip64_common: refactor: extract BOOT_SPI_RKSPI_LOADER=yes into rock-3a, rock-5b, and orangepi5 (no more such rockchip-rk3588 references in common code)

Browse Source
This commit is contained in:
Ricardo Pardini 2023-04-01 16:59:41 +02:00
parent 7ab8245a77
commit c4d91fd66f
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/boards/orangepi5.conf
View File

@ -10,6 +10,7 @@ BOOT_FDT_FILE="rockchip/rk3588s-orangepi-5.dtb"
BOOT_SCENARIO="spl-blobs"
WIREGUARD="no"
BOOT_SUPPORT_SPI="yes"
BOOT_SPI_RKSPI_LOADER="yes"
IMAGE_PARTITION_TABLE="gpt"
SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
BOOTFS_TYPE="fat"

1
config/boards/rock-3a.conf
View File

@ -9,5 +9,6 @@ BOOT_FDT_FILE="rockchip/rk3568-rock-3a.dtb"
BOOT_SCENARIO="spl-blobs"
WIREGUARD="no"
BOOT_SUPPORT_SPI="yes"
BOOT_SPI_RKSPI_LOADER="yes"
IMAGE_PARTITION_TABLE="gpt"
BOOTFS_TYPE="fat"

1
config/boards/rock-5b.wip
View File

@ -9,6 +9,7 @@ BOOT_FDT_FILE="rockchip/rk3588-rock-5b.dtb"
BOOT_SCENARIO="spl-blobs"
WIREGUARD="no"
BOOT_SUPPORT_SPI="yes"
BOOT_SPI_RKSPI_LOADER="yes"
IMAGE_PARTITION_TABLE="gpt"
SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
BOOTFS_TYPE="ext4"

4
config/sources/families/include/rockchip64_common.inc
View File

@ -184,7 +184,7 @@ prepare_boot_configuration() {
if [[ $BOOT_SUPPORT_SPI == yes ]]; then
if [[ $BOARD != "rock-3a" ]] && [[ $BOARD != "rock-5b" ]] && [[ $BOARD != "orangepi5" ]]; then
if [[ "${BOOT_SPI_RKSPI_LOADER:-"no"}" != "yes" ]]; 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"
@ -220,7 +220,7 @@ uboot_custom_postprocess() {
fi
if [[ $BOOT_SUPPORT_SPI == yes ]]; then
if [[ $BOARD == "rock-3a" ]] || [[ $BOARD == "rock-5b" ]] || [[ $BOARD == "orangepi5" ]]; then
if [[ "${BOOT_SPI_RKSPI_LOADER:-"no"}" == "yes" ]]; 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