Skip to content

Commit b822c54

Browse files
committed
configs: rename BPi-R3 bootloader defconfig for consistency
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
1 parent 3ce3ab8 commit b822c54

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/build-boot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- cn9130_crb_boot
2121
- aarch64_qemu_boot
2222
- rpi4_boot
23-
- mt7986_sd_boot
23+
- bpi_r3_boot
2424
env:
2525
MAKEFLAGS: -j5
2626
steps:

.github/workflows/build-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
echo "TARGET=aarch64" >> $GITHUB_ENV
5959
;;
6060
bananapi-bpi-r3)
61-
echo "BOOTLOADER=mt7986_sd_boot" >> $GITHUB_ENV
61+
echo "BOOTLOADER=bpi_r3_boot" >> $GITHUB_ENV
6262
echo "TARGET=aarch64" >> $GITHUB_ENV
6363
;;
6464
friendlyarm-nanopi-r2s)

configs/mt7986_sd_boot_defconfig renamed to configs/bpi_r3_boot_defconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
2727
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
2828
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.01"
2929
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mt7986a_bpir3_sd"
30-
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="${BR2_EXTERNAL_INFIX_PATH}/board/common/uboot/extras.config ${BR2_EXTERNAL_INFIX_PATH}/src/board/banana-pi-r3/uboot/extras.config ${BR2_EXTERNAL_INFIX_PATH}/src/board/banana-pi-r3/uboot/sd-extras.config"
30+
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="${BR2_EXTERNAL_INFIX_PATH}/board/common/uboot/extras.config ${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/bananapi-bpi-r3/uboot/extras.config ${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/bananapi-bpi-r3/uboot/sd-extras.config"
3131
BR2_TARGET_UBOOT_NEEDS_DTC=y
3232
BR2_TARGET_UBOOT_FORMAT_DTB=y
33-
BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="${BR2_EXTERNAL_INFIX_PATH}/src/board/banana-pi-r3/uboot/*.dtsi"
33+
BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/bananapi-bpi-r3/uboot/*.dtsi"
3434
BR2_PACKAGE_HOST_BMAP_TOOLS=y
3535
BR2_PACKAGE_HOST_GENIMAGE=y
3636
BR2_PACKAGE_HOST_RAUC=y

0 commit comments

Comments
 (0)