Skip to content

Commit 0347745

Browse files
rpardiniigorpecovnik
authored andcommitted
mixtile-blade3: u-boot: join rockchip-rk3588's default u-boot-radxa-rk35xx scheme
- rebased 3 patches - moved null patches for dts & defconfigs to `dt` / `defconfig` dirs - don't rename defconfigs: those are shared with Joshua Riek (ubuntu-rockchip) - defconfigs re-saved
1 parent 8f6cd26 commit 0347745

15 files changed

+635
-1075
lines changed

config/boards/mixtile-blade3.csc

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,16 @@ declare -g BOARDFAMILY="rockchip-rk3588"
44
declare -g BOARD_MAINTAINER="rpardini"
55
declare -g KERNEL_TARGET="vendor,edge"
66
declare -g BOOT_FDT_FILE="rockchip/rk3588-blade3-v101-linux.dtb" # Included in https://github.com/armbian/linux-rockchip/pull/64 # has a hook to change it for edge below
7-
8-
declare -g BOOT_SCENARIO="spl-blobs" # so we don't depend on defconfig naming convention
9-
declare -g BOOT_SOC="rk3588" # so we don't depend on defconfig naming convention
10-
declare -g BOOTCONFIG="blade3_defconfig"
7+
declare -g BOOT_SCENARIO="spl-blobs" # so we don't depend on defconfig naming convention
8+
declare -g BOOT_SOC="rk3588" # so we don't depend on defconfig naming convention
9+
declare -g BOOTCONFIG="blade3_defconfig" # there is also blade3_sata_defconfig available
1110
declare -g IMAGE_PARTITION_TABLE="gpt"
1211
declare -g UEFI_EDK2_BOARD_ID="blade3" # This _only_ used for uefi-edk2-rk3588 extension
1312

14-
function post_family_config__uboot_mixtile() {
15-
display_alert "$BOARD" "Configuring Mixtile u-boot" "info"
16-
declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
17-
declare -g BOOTBRANCH='branch:next-dev-v2024.03'
18-
declare -g OVERLAY_PREFIX='rockchip-rk3588'
19-
declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
20-
declare -g BOOTPATCHDIR="legacy/u-boot-mixtile-rk3588" # Few patches in there; defconfig & PD hacks
21-
declare -g BOOTDELAY=1 # build injects this into u-boot config. we can then get into UMS mode and avoid the whole rockusb/rkdeveloptool thing
13+
# Vendor u-boot; use the default family (rockchip-rk3588) u-boot. See config/sources/families/rockchip-rk3588.conf
14+
function post_family_config__vendor_uboot_mekotronics() {
15+
display_alert "$BOARD" "Configuring $BOARD vendor u-boot" "info"
16+
declare -g BOOTDELAY=1 # build injects this into u-boot config. we can then get into UMS mode and avoid the whole rockusb/rkdeveloptool thing
2217
}
2318

2419
function post_family_config_branch_edge__different_dtb_for_edge() {

patch/u-boot/legacy/u-boot-mixtile-rk3588/0001-Add-Blade-3-defines.patch

Lines changed: 0 additions & 300 deletions
This file was deleted.

0 commit comments

Comments
 (0)