From be49374ad9925e46e1b25da67ffa519ebedd276f Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Fri, 31 Jul 2020 01:49:16 +0200
Subject: [PATCH] rockchip: make sysupgrade image generation reusable

This refactors the sysupgrade image generation code to make it reusable
for all devices generating an SD card image.

While at it, move the bootscripts to their own subdirectory.

Signed-off-by: David Bauer <mail@david-bauer.net>
---
 target/linux/rockchip/image/Makefile                           | 3 ++-
 target/linux/rockchip/image/armv8.mk                           | 2 --
 .../rockchip/image/{ => bootscript}/nanopi-r2s.bootscript      | 0
 .../image/{mmc.bootscript => bootscript/rockpro64.bootscript}  | 0
 4 files changed, 2 insertions(+), 3 deletions(-)
 rename target/linux/rockchip/image/{ => bootscript}/nanopi-r2s.bootscript (100%)
 rename target/linux/rockchip/image/{mmc.bootscript => bootscript/rockpro64.bootscript} (100%)

diff --git a/target/linux/rockchip/image/Makefile b/target/linux/rockchip/image/Makefile
index 3c17e963be..a0bfa7ece9 100644
--- a/target/linux/rockchip/image/Makefile
+++ b/target/linux/rockchip/image/Makefile
@@ -24,7 +24,7 @@ endef
 
 define Build/boot-script
 	# Make an U-boot image and copy it to the boot partition
-	mkimage -A arm -O linux -T script -C none -a 0 -e 0 -d $(if $(1),$(1),mmc).bootscript $@.boot/boot.scr
+	mkimage -A arm -O linux -T script -C none -a 0 -e 0 -d bootscript/$(1).bootscript $@.boot/boot.scr
 endef
 
 define Build/pine64-img
@@ -54,6 +54,7 @@ define Device/Default
   IMAGES := sysupgrade.img.gz
   SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
   DEVICE_DTS = rockchip/$$(SOC)-$(lastword $(subst _, ,$(1)))
+  IMAGE/sysupgrade.img.gz := boot-common | boot-script $(lastword $(subst _, ,$(1))) | pine64-img | gzip | append-metadata
 endef
 
 include $(SUBTARGET).mk
diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk
index 8e4ba07e0b..3f8fa9f94a 100644
--- a/target/linux/rockchip/image/armv8.mk
+++ b/target/linux/rockchip/image/armv8.mk
@@ -10,7 +10,6 @@ define Device/friendlyarm_nanopi-r2s
   DEVICE_MODEL := NanoPi R2S
   SOC := rk3328
   UBOOT_DEVICE_NAME := nanopi-r2s-rk3328
-  IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-img | gzip | append-metadata
   DEVICE_PACKAGES := kmod-usb-net kmod-usb-net-rtl8152
 endef
 TARGET_DEVICES += friendlyarm_nanopi-r2s
@@ -20,6 +19,5 @@ define Device/pine64_rockpro64
   DEVICE_MODEL := RockPro64
   SOC := rk3399
   UBOOT_DEVICE_NAME := rockpro64-rk3399
-  IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
 endef
 TARGET_DEVICES += pine64_rockpro64
diff --git a/target/linux/rockchip/image/nanopi-r2s.bootscript b/target/linux/rockchip/image/bootscript/nanopi-r2s.bootscript
similarity index 100%
rename from target/linux/rockchip/image/nanopi-r2s.bootscript
rename to target/linux/rockchip/image/bootscript/nanopi-r2s.bootscript
diff --git a/target/linux/rockchip/image/mmc.bootscript b/target/linux/rockchip/image/bootscript/rockpro64.bootscript
similarity index 100%
rename from target/linux/rockchip/image/mmc.bootscript
rename to target/linux/rockchip/image/bootscript/rockpro64.bootscript