From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 3 Oct 2021 07:42:41 +0000 (+0000)
Subject: flash-images: install u-boot for nanopi r2s on aarch64
X-Git-Tag: v2.27-core161~2^2~132
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=954ac9df0441ebbca230cd2e0adcd91cbb9c97c1;p=ipfire-2.x.git

flash-images: install u-boot for nanopi r2s on aarch64

rockchip has a large bootloader so this also increase the gap between partitiontable
and fist partition to 16MB on aarch64

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/lfs/flash-images b/lfs/flash-images
index cdd0fbf7e7..0abb23b0a0 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -67,6 +67,7 @@ ifeq "$(BUILD_PLATFORM)" "arm"
  PART_TYPE = c
 ifeq "$(BUILD_ARCH)" "aarch64"
  BOOTLOADER = grub
+ S_OFFSET = 32768
 endif
 else
  BOOTLOADER = grub
@@ -260,6 +261,10 @@ ifeq "$(BUILD_ARCH)" "armv6l"
 	# Install u-boot for Orangepi Zero/Nanopi DUO into image 8KB
 	dd if=/usr/share/u-boot/orangepi_zero/u-boot-sunxi-with-spl.bin of=$(IMG) bs=1K seek=8 conv=notrunc
 endif
+ifeq "$(BUILD_ARCH)" "aarch64"
+	# Install u-boot for NanoPi R2S into image 8KB
+	dd if=/usr/share/u-boot/nanopi_r2s/u-boot-rockchip.bin of=$(IMG) bs=1K seek=32 conv=notrunc
+endif
 
 	# Compress Image
 	xz $(XZ_OPT) < $(IMG) > $(IMAGE_FILE)