Skip to content

Commit f25552a

Browse files
committed
ayufan: dev.mk: improve u-boot compilation
1 parent 4d1240c commit f25552a

File tree

10 files changed

+71
-88
lines changed

10 files changed

+71
-88
lines changed

.github/pull_request_template.md

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

.github/workflows/build.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@ jobs:
2727
run: |
2828
export RELEASE=$(($RELEASE_START+$GITHUB_RUN_NUMBER))
2929
rm -f ../*.deb
30-
./dev-make BOARD_TARGET=rock64 -j5
31-
./dev-make BOARD_TARGET=rockpro64 -j5
32-
./dev-make BOARD_TARGET=pinebookpro -j5
33-
./dev-make BOARD_TARGET=rockpi4b -j5
34-
./dev-make BOARD_TARGET=rock5b -j5
30+
./dev-make all-boards
3531
- name: Release package
3632
env:
3733
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
UBOOT_DEFCONFIG ?= pinebook-pro-rk3399_defconfig
2+
BL31 ?= tmp/rkbin/bin/rk33/rk3399_bl31_v1.36.elf
3+
BOARD_CHIP ?= rk3399
4+
LOADER_BIN ?= tmp/rkbin/loaders/rk3399_loader_v1.30.130.bin
5+
LOADER_OFFSET ?= 64
6+
LOADER_FLASH ?= rksd_loader
7+
IMAGES ?= flash-spi erase-spi
8+
LOADERS ?= rksd_loader rkspi_loader
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
UBOOT_DEFCONFIG ?= qemu_arm64_defconfig

dev-ayufan/blobs/rock5b/board.mk

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
UBOOT_DEFCONFIG ?= rock5b-rk3588_defconfig
2+
BL31 ?= tmp/rkbin/bin/rk35/rk3588_bl31_v1.40.elf
3+
BOARD_CHIP ?= rk3588
4+
UBOOT_TPL =
5+
ROCKCHIP_TPL ?= tmp/rkbin/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin
6+
LOADER_BIN ?= tmp/rkbin/loaders/rk3588_spl_loader_v1.12.112.bin
7+
LOADER_OFFSET ?= 64
8+
LOADER_FLASH ?= rksd_loader
9+
IMAGES ?= flash-spi erase-spi
10+
LOADERS ?= rksd_loader rkspi_loader
11+
RKSD_LOADER ?= idbloader.img
12+
RKSPI_LOADER ?= idbloader-spi.img

dev-ayufan/blobs/rock64/board.mk

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
UBOOT_DEFCONFIG ?= rock64-rk3328_defconfig
2+
BL31 ?= tmp/rkbin/bin/rk33/rk322xh_bl31_v1.49.elf
3+
BOARD_CHIP ?= rk3328
4+
ifneq (,$(FLASH_SPI))
5+
LOADER_BIN ?= tmp/rkbin/loaders/rk3328_loader_v1.08.244_for_spi_nor_build_Aug_7_2017.bin
6+
else
7+
LOADER_BIN ?= tmp/rkbin/loaders/rk3328_loader_v1.19.250.bin
8+
endif
9+
LOADER_OFFSET ?= 64
10+
LOADER_FLASH ?= rksd_loader
11+
IMAGES ?= flash-spi erase-spi
12+
FLASH_LOADER ?= rksd_loader
13+
LOADERS ?= rksd_loader

dev-ayufan/blobs/rockpi4b/board.mk

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
UBOOT_DEFCONFIG ?= rock-pi-4-rk3399_defconfig
2+
BL31 ?= tmp/rkbin/bin/rk33/rk3399_bl31_v1.36.elf
3+
BOARD_CHIP ?= rk3399
4+
LOADER_BIN ?= tmp/rkbin/loaders/rk3399_loader_v1.30.130.bin
5+
IMAGES ?= flash-spi erase-spi
6+
FLASH_LOADER ?= rksd_loader
7+
LOADERS ?= rksd_loader rkspi_loader
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
UBOOT_DEFCONFIG ?= rockpro64-rk3399_defconfig
2+
BL31 ?= tmp/rkbin/bin/rk33/rk3399_bl31_v1.36.elf
3+
BOARD_CHIP ?= rk3399
4+
ifneq (,$(FLASH_SPI))
5+
LOADER_BIN ?= tmp/rkbin/loaders/rk3399_loader_spinor_v1.30.114.bin
6+
LOADER_OFFSET ?= 0
7+
LOADER_FLASH ?= rkspi_loader
8+
else
9+
LOADER_BIN ?= tmp/rkbin/loaders/rk3399_loader_v1.30.130.bin
10+
LOADER_OFFSET ?= 64
11+
LOADER_FLASH ?= rksd_loader
12+
endif
13+
IMAGES ?= flash-spi erase-spi
14+
LOADERS ?= rksd_loader rkspi_loader

dev-ayufan/boards.mk

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

dev.mk

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,19 @@ export RELEASE ?= 1
22

33
all:
44

5-
include dev-ayufan/boards.mk
5+
ifeq (,$(BOARD_TARGET))
6+
7+
all:
8+
@echo $(addsuffix -board,$(notdir $(wildcard dev-ayufan/blobs/*)))
9+
10+
all-boards: $(addsuffix -board,$(notdir $(wildcard dev-ayufan/blobs/*)))
11+
12+
%-board:
13+
./dev-make BOARD_TARGET=$(patsubst %-board,%,$@)
14+
15+
else
16+
17+
include dev-ayufan/blobs/$(BOARD_TARGET)/board.mk
618
include dev-ayufan/build.mk
719
include dev-ayufan/deps.mk
820
include dev-ayufan/images.mk
@@ -22,3 +34,5 @@ deploy: u-boot-package
2234
scp u-boot-$(BOARD_TARGET)-$(RELEASE_NAME).deb root@$(TARGET_HOST):
2335
ssh root@$(TARGET_HOST) apt install ./u-boot-$(BOARD_TARGET)-$(RELEASE_NAME).deb
2436
ssh root@$(TARGET_HOST) rock64_upgrade_bootloader.sh
37+
38+
endif

0 commit comments

Comments
 (0)