Skip to content

Commit aac24d3

Browse files
committed
uboot-rockchip: use prebuild IDB for NanoPi R76S (3GB) and NanoPi M5
1 parent 972418b commit aac24d3

3 files changed

Lines changed: 16 additions & 2 deletions

File tree

package/boot/uboot-rockchip/Makefile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,15 @@ define U-Boot/generic-rk3576
381381
friendlyarm_nanopi-r76s
382382
endef
383383

384+
define U-Boot/nanopi-m5-rk3576
385+
$(U-Boot/rk3576/Default)
386+
NAME:=NanoPi M5
387+
BUILD_DEVICES:= \
388+
friendlyarm_nanopi-m5 \
389+
friendlyarm_nanopi-r76s
390+
IDB_PRE_BUILD:=1
391+
endef
392+
384393
define U-Boot/rock-4d-rk3576
385394
$(U-Boot/rk3576/Default)
386395
NAME:=ROCK 4D
@@ -503,6 +512,7 @@ UBOOT_TARGETS := \
503512
rock-3b-rk3568 \
504513
station-p2-rk3568 \
505514
generic-rk3576 \
515+
nanopi-m5-rk3576 \
506516
rock-4d-rk3576 \
507517
sige5-rk3576 \
508518
generic-rk3588 \
@@ -552,8 +562,12 @@ define Build/InstallDev
552562
ifneq ($(USE_RKBIN),)
553563
$(STAGING_DIR_IMAGE)/loaderimage --pack --uboot $(PKG_BUILD_DIR)/u-boot-dtb.bin $(PKG_BUILD_DIR)/uboot.img 0x800000
554564
$(CP) $(PKG_BUILD_DIR)/uboot.img $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-uboot.img
565+
else
566+
ifneq ($(IDB_PRE_BUILD),)
567+
$(CP) ./files/$(BUILD_VARIANT)-idbloader.img $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-idbloader.img
555568
else
556569
$(CP) $(PKG_BUILD_DIR)/idbloader.img $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-idbloader.img
570+
endif
557571
$(CP) $(PKG_BUILD_DIR)/u-boot.itb $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-u-boot.itb
558572
endif
559573
endef
Binary file not shown.

target/linux/rockchip/image/armv8.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ define Device/friendlyarm_nanopi-m5
172172
DEVICE_MODEL := NanoPi M5
173173
SOC := rk3576
174174
DEVICE_DTS := rk3576-nanopi-m5
175-
UBOOT_DEVICE_NAME := generic-rk3576
175+
UBOOT_DEVICE_NAME := nanopi-m5-rk3576
176176
DEVICE_PACKAGES := kmod-gpio-button-hotplug
177177
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
178178
endef
@@ -302,7 +302,7 @@ define Device/friendlyarm_nanopi-r76s
302302
DEVICE_MODEL := NanoPi R76S
303303
SOC := rk3576
304304
DEVICE_DTS := rk3576-nanopi-r76s
305-
UBOOT_DEVICE_NAME := generic-rk3576
305+
UBOOT_DEVICE_NAME := nanopi-m5-rk3576
306306
DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-r8125
307307
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
308308
endef

0 commit comments

Comments
 (0)