From 1e8f4746da896356adbac21fb72f5ab8f0e738b3 Mon Sep 17 00:00:00 2001 From: EvilOlaf Date: Tue, 1 Apr 2025 05:37:36 +0200 Subject: [PATCH] nanopi-r3s: cleanup board config --- config/boards/nanopi-r3s.csc | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/config/boards/nanopi-r3s.csc b/config/boards/nanopi-r3s.csc index 6fdf8b6320..99978cd83d 100644 --- a/config/boards/nanopi-r3s.csc +++ b/config/boards/nanopi-r3s.csc @@ -11,18 +11,12 @@ IMAGE_PARTITION_TABLE="gpt" BOOT_SCENARIO="spl-blobs" -function post_family_config_branch_edge__use_mainline_dtb_name() { +function post_family_config__use_mainline_uboot() { + if [[ "$BRANCH" != "current" && "$BRANCH" != "edge" ]]; then + return 0 + fi unset BOOT_FDT_FILE # boot.scr will use whatever u-boot detects and sets 'fdtfile' to unset BOOTFS_TYPE # mainline u-boot can boot ext4 directly -} - -function post_family_config_branch_current__use_mainline_dtb_name() { - unset BOOT_FDT_FILE # boot.scr will use whatever u-boot detects and sets 'fdtfile' to - unset BOOTFS_TYPE # mainline u-boot can boot ext4 directly -} - - -function post_family_config_branch_current__nanopi-r3s_use_mainline_uboot() { BOOTCONFIG="nanopi-r3s-rk3566_defconfig" BOOTSOURCE="https://github.com/u-boot/u-boot" BOOTBRANCH="tag:v2024.10" @@ -36,18 +30,3 @@ function post_family_config_branch_current__nanopi-r3s_use_mainline_uboot() { dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none } } - -function post_family_config_branch_edge__nanopi-r3s_use_mainline_uboot() { - BOOTCONFIG="nanopi-r3s-rk3566_defconfig" - BOOTSOURCE="https://github.com/u-boot/u-boot" - BOOTBRANCH="tag:v2025.01" - BOOTPATCHDIR="v2025.01" - - UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin" - - unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd - - function write_uboot_platform() { - dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none - } -}