From 83f5e253a2e540248a27607b4aabf9ecd1dec171 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@project-openwrt.eu.org>
Date: Sun, 20 Dec 2020 12:49:38 +0800
Subject: [PATCH] Revert "rockchip: make sysupgrade image generation reusable"

This reverts commit 6039577c0bfd1e6ba1da42ac80d39f737cfb8102.
---
 target/linux/rockchip/image/Makefile                        | 3 +--
 target/linux/rockchip/image/armv8.mk                        | 6 ++++--
 .../{bootscript/rockpro64.bootscript => mmc.bootscript}     | 0
 .../rockchip/image/{bootscript => }/nanopi-r2s.bootscript   | 0
 4 files changed, 5 insertions(+), 4 deletions(-)
 rename target/linux/rockchip/image/{bootscript/rockpro64.bootscript => mmc.bootscript} (100%)
 rename target/linux/rockchip/image/{bootscript => }/nanopi-r2s.bootscript (100%)

diff --git a/target/linux/rockchip/image/Makefile b/target/linux/rockchip/image/Makefile
index e312b4f5fa..c4ce2a4de6 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 bootscript/$(1).bootscript $@.boot/boot.scr
+	mkimage -A arm -O linux -T script -C none -a 0 -e 0 -d $(if $(1),$(1),mmc).bootscript $@.boot/boot.scr
 endef
 
 define Build/pine64-img
@@ -55,7 +55,6 @@ 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
 
 define Device/FitImageLzma
diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk
index 599c33c7de..c3fb87ead3 100644
--- a/target/linux/rockchip/image/armv8.mk
+++ b/target/linux/rockchip/image/armv8.mk
@@ -10,8 +10,9 @@ define Device/friendlyarm_nanopi-r2s
   DEVICE_MODEL := NanoPi R2S
   SOC := rk3328
   UBOOT_DEVICE_NAME := nanopi-r2s-rk3328
-  DEVICE_PACKAGES := kmod-usb-net kmod-usb-net-rtl8152
-  $(call Device/FitImageLzma)
+  IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-img | gzip | append-metadata
+  DEVICE_PACKAGES := kmod-usb-net-rtl8152
+  $(call Devuce/FitImageLzma)
 endef
 TARGET_DEVICES += friendlyarm_nanopi-r2s
 
@@ -20,6 +21,7 @@ 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/bootscript/rockpro64.bootscript b/target/linux/rockchip/image/mmc.bootscript
similarity index 100%
rename from target/linux/rockchip/image/bootscript/rockpro64.bootscript
rename to target/linux/rockchip/image/mmc.bootscript
diff --git a/target/linux/rockchip/image/bootscript/nanopi-r2s.bootscript b/target/linux/rockchip/image/nanopi-r2s.bootscript
similarity index 100%
rename from target/linux/rockchip/image/bootscript/nanopi-r2s.bootscript
rename to target/linux/rockchip/image/nanopi-r2s.bootscript