Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "rockchip: use LZMA compressed FIT image for NanoPi R2S"

Browse Source 
This reverts commit 0f57324f48378f1028e22f8e03a3c18f2bb50077.
Prepare for the upcoming kernel 5.10 support.

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
This commit is contained in:
CN_SZTL 2021-02-17 21:57:36 +08:00 committed by AmadeusGhost
parent 9053a3a80f
commit a9c065e5f3
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/linux/rockchip/image/Makefile
View File

@ -69,15 +69,10 @@ endef
define Device/Default
PROFILES := Default
KERNEL := kernel-bin
KERNEL_LOADADDR := 0x2080000
IMAGES := sysupgrade.img.gz
DEVICE_DTS = rockchip/$$(SOC)-$(lastword $(subst _, ,$(1)))
endef
define Device/FitImageLzma
KERNEL := kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb
endef
include $(SUBTARGET).mk
$(eval $(call BuildImage))

1
target/linux/rockchip/image/armv8.mk
View File

@ -9,7 +9,6 @@ define Device/friendlyarm_nanopi-r2s
UBOOT_DEVICE_NAME := nanopi-r2s-rk3328
IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-bin | gzip | append-metadata
DEVICE_PACKAGES := kmod-usb-net-rtl8152
$(call Device/FitImageLzma)
endef
TARGET_DEVICES += friendlyarm_nanopi-r2s

5
target/linux/rockchip/image/nanopi-r2s.bootscript
View File

@ -2,6 +2,7 @@ part uuid mmc ${devnum}:2 uuid
setenv bootargs "console=ttyS2,1500000 earlycon=uart8250,mmio32,0xff130000 root=PARTUUID=${uuid} rw rootwait"
load mmc ${devnum}:1 0x1000000 kernel.img
load mmc ${devnum}:1 ${fdt_addr_r} rockchip.dtb
load mmc ${devnum}:1 ${kernel_addr_r} kernel.img
bootm 0x1000000
booti ${kernel_addr_r} - ${fdt_addr_r}