diff --git a/target/linux/rockchip/image/Makefile b/target/linux/rockchip/image/Makefile index 46a57b07d4..f5fdff637f 100644 --- a/target/linux/rockchip/image/Makefile +++ b/target/linux/rockchip/image/Makefile @@ -49,15 +49,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)) diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index ecee301be7..c6aacf5e34 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -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-img | gzip | append-metadata DEVICE_PACKAGES := kmod-usb-net-rtl8152 - $(call Device/FitImageLzma) endef TARGET_DEVICES += friendlyarm_nanopi-r2s diff --git a/target/linux/rockchip/image/nanopi-r2s.bootscript b/target/linux/rockchip/image/nanopi-r2s.bootscript index 689503431f..5198881a26 100644 --- a/target/linux/rockchip/image/nanopi-r2s.bootscript +++ b/target/linux/rockchip/image/nanopi-r2s.bootscript @@ -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}