Skip to content

Commit ca4dc80

Browse files
chainsxigorpecovnik
authored andcommitted
filogic: fix build u-boot
1 parent e72eb53 commit ca4dc80

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

config/sources/families/filogic.conf

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ declare -g BOOTDELAY=1
1515
declare -g BOOTPATCHDIR="${BOOTPATCHDIR:-"u-boot-filogic"}"
1616
declare -g BOOTBRANCH="${BOOTBRANCH:-"tag:v2025.04"}"
1717
declare -g BOOTENV_FILE='filogic.txt'
18-
declare -g UBOOT_TARGET_MAP=";;u-boot.bin"
18+
declare -g UBOOT_TARGET_MAP=";;u-boot.bin u-boot_sdmmc.fip bl2.img"
1919
declare -g BOOTSCRIPT='boot-filogic.cmd:boot.cmd'
2020
declare -g IMAGE_PARTITION_TABLE="gpt"
2121
declare -g LINUXFAMILY=filogic
@@ -28,11 +28,15 @@ function add_host_dependencies__filogic_add_xxd_hostdep() {
2828

2929
# Handling of FIP blobs
3030
function uboot_custom_postprocess() {
31-
run_host_command_logged rm -f "$SRC"/cache/u-boot_sdmmc.fip
31+
run_host_command_logged rm -f "$SRC"/cache/sources/u-boot-worktree/u-boot/v2025.04/bl2.img
32+
run_host_command_logged cp "$SRC"/cache/sources/arm-trusted-firmware/mtksoc-20250212/build/mt7988/release/bl2.img \
33+
"$SRC"/cache/sources/u-boot-worktree/u-boot/v2025.04
34+
35+
run_host_command_logged rm -f "$SRC"/cache/sources/u-boot-worktree/u-boot/v2025.04/u-boot_sdmmc.fip
3236
run_host_command_logged fiptool create \
3337
--soc-fw "$SRC"/cache/sources/arm-trusted-firmware/mtksoc-20250212/build/mt7988/release/bl31.bin \
3438
--nt-fw "$SRC"/cache/sources/u-boot-worktree/u-boot/v2025.04/u-boot.bin \
35-
"$SRC"/cache/u-boot_sdmmc.fip
39+
"$SRC"/cache/sources/u-boot-worktree/u-boot/v2025.04/u-boot_sdmmc.fip
3640
}
3741

3842
case $BRANCH in
@@ -50,8 +54,8 @@ esac
5054
#KERNELPATCHDIR="archive/filogic-${KERNEL_MAJOR_MINOR}"
5155

5256
write_uboot_platform() {
53-
dd if="$SRC"/cache/sources/arm-trusted-firmware/mtksoc-20250212/build/mt7988/release/bl2.img of=$2 bs=512 seek=34 status=noxfer > /dev/null 2>&1
54-
dd if="$SRC"/cache/u-boot_sdmmc.fip of=$2 bs=512 seek=13312 status=noxfer >/dev/null 2>&1
57+
dd if=$1/bl2.img of=$2 bs=512 seek=34 status=noxfer > /dev/null 2>&1
58+
dd if=$1/u-boot_sdmmc.fip of=$2 bs=512 seek=13312 status=noxfer >/dev/null 2>&1
5559

5660
# backup gpt table
5761
LAST_START=$(parted "$2" unit s print | grep -v "^$" | tail -n 1 | awk '{print $2}' | tr -d 's')

0 commit comments

Comments
 (0)