From: David Bauer <mail@david-bauer.net>
Date: Thu, 30 Jul 2020 23:44:50 +0000 (+0200)
Subject: rockchip: use LZMA compressed FIT image for NanoPi R2S
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=736934149e9a0760016e5d552f2a05db005f92f7;p=openwrt%2Fstaging%2Fblocktrron.git

rockchip: use LZMA compressed FIT image for NanoPi R2S

This uses a LZMA compressed U-Boot FIT image for the NanoPi R2S. This
way, the resulting sysupgrade image uses ~1M les space compared to using
an uncompressed kernel.

Signed-off-by: David Bauer <mail@david-bauer.net>
---

diff --git a/target/linux/rockchip/image/Makefile b/target/linux/rockchip/image/Makefile
index a0bfa7ece9..e312b4f5fa 100644
--- a/target/linux/rockchip/image/Makefile
+++ b/target/linux/rockchip/image/Makefile
@@ -51,12 +51,17 @@ endef
 define Device/Default
   PROFILES := Default
   KERNEL := kernel-bin
+  KERNEL_LOADADDR := 0x2080000
   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
+  KERNEL := kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb
+endef
+
 include $(SUBTARGET).mk
 
 $(eval $(call BuildImage))
diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk
index b60f4985de..ef11321a4e 100644
--- a/target/linux/rockchip/image/armv8.mk
+++ b/target/linux/rockchip/image/armv8.mk
@@ -11,6 +11,7 @@ define Device/friendlyarm_nanopi-r2s
   SOC := rk3328
   UBOOT_DEVICE_NAME := nanopi-r2s-rk3328
   DEVICE_PACKAGES := kmod-usb-net-rtl8152
+  $(call Device/FitImageLzma)
 endef
 TARGET_DEVICES += friendlyarm_nanopi-r2s
 
diff --git a/target/linux/rockchip/image/bootscript/nanopi-r2s.bootscript b/target/linux/rockchip/image/bootscript/nanopi-r2s.bootscript
index 5198881a26..689503431f 100644
--- a/target/linux/rockchip/image/bootscript/nanopi-r2s.bootscript
+++ b/target/linux/rockchip/image/bootscript/nanopi-r2s.bootscript
@@ -2,7 +2,6 @@ part uuid mmc ${devnum}:2 uuid
 
 setenv bootargs "console=ttyS2,1500000 earlycon=uart8250,mmio32,0xff130000 root=PARTUUID=${uuid} rw rootwait"
 
-load mmc ${devnum}:1 ${fdt_addr_r} rockchip.dtb
-load mmc ${devnum}:1 ${kernel_addr_r} kernel.img
+load mmc ${devnum}:1 0x1000000 kernel.img
 
-booti ${kernel_addr_r} - ${fdt_addr_r}
+bootm 0x1000000