Skip to content

Commit

Permalink
ayufan: dev.mk: improve u-boot compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
ayufan committed Nov 11, 2023
1 parent 4d1240c commit f25552a
Show file tree
Hide file tree
Showing 10 changed files with 71 additions and 88 deletions.
6 changes: 0 additions & 6 deletions .github/pull_request_template.md

This file was deleted.

6 changes: 1 addition & 5 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@ jobs:
run: |
export RELEASE=$(($RELEASE_START+$GITHUB_RUN_NUMBER))
rm -f ../*.deb
./dev-make BOARD_TARGET=rock64 -j5
./dev-make BOARD_TARGET=rockpro64 -j5
./dev-make BOARD_TARGET=pinebookpro -j5
./dev-make BOARD_TARGET=rockpi4b -j5
./dev-make BOARD_TARGET=rock5b -j5
./dev-make all-boards
- name: Release package
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
8 changes: 8 additions & 0 deletions dev-ayufan/blobs/pinebookpro/board.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
UBOOT_DEFCONFIG ?= pinebook-pro-rk3399_defconfig
BL31 ?= tmp/rkbin/bin/rk33/rk3399_bl31_v1.36.elf
BOARD_CHIP ?= rk3399
LOADER_BIN ?= tmp/rkbin/loaders/rk3399_loader_v1.30.130.bin
LOADER_OFFSET ?= 64
LOADER_FLASH ?= rksd_loader
IMAGES ?= flash-spi erase-spi
LOADERS ?= rksd_loader rkspi_loader
1 change: 1 addition & 0 deletions dev-ayufan/blobs/qemu-arm64/board.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
UBOOT_DEFCONFIG ?= qemu_arm64_defconfig
12 changes: 12 additions & 0 deletions dev-ayufan/blobs/rock5b/board.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
UBOOT_DEFCONFIG ?= rock5b-rk3588_defconfig
BL31 ?= tmp/rkbin/bin/rk35/rk3588_bl31_v1.40.elf
BOARD_CHIP ?= rk3588
UBOOT_TPL =
ROCKCHIP_TPL ?= tmp/rkbin/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin
LOADER_BIN ?= tmp/rkbin/loaders/rk3588_spl_loader_v1.12.112.bin
LOADER_OFFSET ?= 64
LOADER_FLASH ?= rksd_loader
IMAGES ?= flash-spi erase-spi
LOADERS ?= rksd_loader rkspi_loader
RKSD_LOADER ?= idbloader.img
RKSPI_LOADER ?= idbloader-spi.img
13 changes: 13 additions & 0 deletions dev-ayufan/blobs/rock64/board.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
UBOOT_DEFCONFIG ?= rock64-rk3328_defconfig
BL31 ?= tmp/rkbin/bin/rk33/rk322xh_bl31_v1.49.elf
BOARD_CHIP ?= rk3328
ifneq (,$(FLASH_SPI))
LOADER_BIN ?= tmp/rkbin/loaders/rk3328_loader_v1.08.244_for_spi_nor_build_Aug_7_2017.bin
else
LOADER_BIN ?= tmp/rkbin/loaders/rk3328_loader_v1.19.250.bin
endif
LOADER_OFFSET ?= 64
LOADER_FLASH ?= rksd_loader
IMAGES ?= flash-spi erase-spi
FLASH_LOADER ?= rksd_loader
LOADERS ?= rksd_loader
7 changes: 7 additions & 0 deletions dev-ayufan/blobs/rockpi4b/board.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
UBOOT_DEFCONFIG ?= rock-pi-4-rk3399_defconfig
BL31 ?= tmp/rkbin/bin/rk33/rk3399_bl31_v1.36.elf
BOARD_CHIP ?= rk3399
LOADER_BIN ?= tmp/rkbin/loaders/rk3399_loader_v1.30.130.bin
IMAGES ?= flash-spi erase-spi
FLASH_LOADER ?= rksd_loader
LOADERS ?= rksd_loader rkspi_loader
14 changes: 14 additions & 0 deletions dev-ayufan/blobs/rockpro64/board.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
UBOOT_DEFCONFIG ?= rockpro64-rk3399_defconfig
BL31 ?= tmp/rkbin/bin/rk33/rk3399_bl31_v1.36.elf
BOARD_CHIP ?= rk3399
ifneq (,$(FLASH_SPI))
LOADER_BIN ?= tmp/rkbin/loaders/rk3399_loader_spinor_v1.30.114.bin
LOADER_OFFSET ?= 0
LOADER_FLASH ?= rkspi_loader
else
LOADER_BIN ?= tmp/rkbin/loaders/rk3399_loader_v1.30.130.bin
LOADER_OFFSET ?= 64
LOADER_FLASH ?= rksd_loader
endif
IMAGES ?= flash-spi erase-spi
LOADERS ?= rksd_loader rkspi_loader
76 changes: 0 additions & 76 deletions dev-ayufan/boards.mk

This file was deleted.

16 changes: 15 additions & 1 deletion dev.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,19 @@ export RELEASE ?= 1

all:

include dev-ayufan/boards.mk
ifeq (,$(BOARD_TARGET))

all:
@echo $(addsuffix -board,$(notdir $(wildcard dev-ayufan/blobs/*)))

all-boards: $(addsuffix -board,$(notdir $(wildcard dev-ayufan/blobs/*)))

%-board:
./dev-make BOARD_TARGET=$(patsubst %-board,%,$@)

else

include dev-ayufan/blobs/$(BOARD_TARGET)/board.mk
include dev-ayufan/build.mk
include dev-ayufan/deps.mk
include dev-ayufan/images.mk
Expand All @@ -22,3 +34,5 @@ deploy: u-boot-package
scp u-boot-$(BOARD_TARGET)-$(RELEASE_NAME).deb root@$(TARGET_HOST):
ssh root@$(TARGET_HOST) apt install ./u-boot-$(BOARD_TARGET)-$(RELEASE_NAME).deb
ssh root@$(TARGET_HOST) rock64_upgrade_bootloader.sh

endif

0 comments on commit f25552a

Please sign in to comment.