Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rockchip: move image generation command to default

Browse source 
It's applicable for all devices so move it to default to reduce
redudant code. Addtionally introduce a new variable `BOOT_SCRIPT`
to allow custom boot script (if necessary).

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2023-06-26 00:37:28 +08:00 committed by Hauke Mehrtens
parent b061e2d890
commit dd8972fde3
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/rockchip/image/Makefile
View file

@ -48,7 +48,9 @@ endef
define Device/Default define Device/Default
PROFILES := Default PROFILES := Default
KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb
BOOT_SCRIPT :=
IMAGES := sysupgrade.img.gz IMAGES := sysupgrade.img.gz
IMAGE/sysupgrade.img.gz = boot-common | boot-script $$(BOOT_SCRIPT) | pine64-img | gzip | append-metadata
DEVICE_DTS = rockchip/$$(SOC)-$(lastword $(subst _, ,$(1))) DEVICE_DTS = rockchip/$$(SOC)-$(lastword $(subst _, ,$(1)))
UBOOT_DEVICE_NAME = $(lastword $(subst _, ,$(1)))-$$(SOC) UBOOT_DEVICE_NAME = $(lastword $(subst _, ,$(1)))-$$(SOC)
endef endef

13
target/linux/rockchip/image/armv8.mk
View file

@ -11,7 +11,6 @@ define Device/firefly_roc-rk3328-cc
SOC := rk3328 SOC := rk3328
DEVICE_DTS := rockchip/rk3328-roc-cc DEVICE_DTS := rockchip/rk3328-roc-cc
UBOOT_DEVICE_NAME := roc-cc-rk3328 UBOOT_DEVICE_NAME := roc-cc-rk3328
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
endef endef
TARGET_DEVICES += firefly_roc-rk3328-cc TARGET_DEVICES += firefly_roc-rk3328-cc
@ -19,7 +18,6 @@ define Device/friendlyarm_nanopc-t4
DEVICE_VENDOR := FriendlyARM DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPC T4 DEVICE_MODEL := NanoPC T4
SOC := rk3399 SOC := rk3399
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
DEVICE_PACKAGES := kmod-brcmfmac brcmfmac-nvram-4356-sdio cypress-firmware-4356-sdio DEVICE_PACKAGES := kmod-brcmfmac brcmfmac-nvram-4356-sdio cypress-firmware-4356-sdio
endef endef
TARGET_DEVICES += friendlyarm_nanopc-t4 TARGET_DEVICES += friendlyarm_nanopc-t4
@ -28,7 +26,6 @@ define Device/friendlyarm_nanopi-r2c
DEVICE_VENDOR := FriendlyARM DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPi R2C DEVICE_MODEL := NanoPi R2C
SOC := rk3328 SOC := rk3328
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
DEVICE_PACKAGES := kmod-usb-net-rtl8152 DEVICE_PACKAGES := kmod-usb-net-rtl8152
endef endef
TARGET_DEVICES += friendlyarm_nanopi-r2c TARGET_DEVICES += friendlyarm_nanopi-r2c
@ -37,7 +34,6 @@ define Device/friendlyarm_nanopi-r2s
DEVICE_VENDOR := FriendlyARM DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPi R2S DEVICE_MODEL := NanoPi R2S
SOC := rk3328 SOC := rk3328
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
DEVICE_PACKAGES := kmod-usb-net-rtl8152 DEVICE_PACKAGES := kmod-usb-net-rtl8152
endef endef
TARGET_DEVICES += friendlyarm_nanopi-r2s TARGET_DEVICES += friendlyarm_nanopi-r2s
@ -47,7 +43,6 @@ define Device/friendlyarm_nanopi-r4s
DEVICE_MODEL := NanoPi R4S DEVICE_MODEL := NanoPi R4S
DEVICE_VARIANT := 4GB LPDDR4 DEVICE_VARIANT := 4GB LPDDR4
SOC := rk3399 SOC := rk3399
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
DEVICE_PACKAGES := kmod-r8169 DEVICE_PACKAGES := kmod-r8169
endef endef
TARGET_DEVICES += friendlyarm_nanopi-r4s TARGET_DEVICES += friendlyarm_nanopi-r4s
@ -56,8 +51,6 @@ define Device/pine64_rock64
DEVICE_VENDOR := Pine64 DEVICE_VENDOR := Pine64
DEVICE_MODEL := Rock64 DEVICE_MODEL := Rock64
SOC := rk3328 SOC := rk3328
UBOOT_DEVICE_NAME := rock64-rk3328
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
endef endef
TARGET_DEVICES += pine64_rock64 TARGET_DEVICES += pine64_rock64
@ -65,7 +58,6 @@ define Device/pine64_rockpro64
DEVICE_VENDOR := Pine64 DEVICE_VENDOR := Pine64
DEVICE_MODEL := RockPro64 DEVICE_MODEL := RockPro64
SOC := rk3399 SOC := rk3399
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
endef endef
TARGET_DEVICES += pine64_rockpro64 TARGET_DEVICES += pine64_rockpro64
@ -75,7 +67,6 @@ define Device/radxa_rock-pi-4a
SOC := rk3399 SOC := rk3399
SUPPORTED_DEVICES := radxa,rockpi4a radxa,rockpi4 SUPPORTED_DEVICES := radxa,rockpi4a radxa,rockpi4
UBOOT_DEVICE_NAME := rock-pi-4-rk3399 UBOOT_DEVICE_NAME := rock-pi-4-rk3399
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
endef endef
TARGET_DEVICES += radxa_rock-pi-4a TARGET_DEVICES += radxa_rock-pi-4a
@ -83,8 +74,6 @@ define Device/radxa_rock-pi-e
DEVICE_VENDOR := Radxa DEVICE_VENDOR := Radxa
DEVICE_MODEL := ROCK Pi E DEVICE_MODEL := ROCK Pi E
SOC := rk3328 SOC := rk3328
UBOOT_DEVICE_NAME := rock-pi-e-rk3328
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
endef endef
TARGET_DEVICES += radxa_rock-pi-e TARGET_DEVICES += radxa_rock-pi-e
@ -92,7 +81,6 @@ define Device/xunlong_orangepi-r1-plus
DEVICE_VENDOR := Xunlong DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi R1 Plus DEVICE_MODEL := Orange Pi R1 Plus
SOC := rk3328 SOC := rk3328
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
DEVICE_PACKAGES := kmod-usb-net-rtl8152 DEVICE_PACKAGES := kmod-usb-net-rtl8152
endef endef
TARGET_DEVICES += xunlong_orangepi-r1-plus TARGET_DEVICES += xunlong_orangepi-r1-plus
@ -101,7 +89,6 @@ define Device/xunlong_orangepi-r1-plus-lts
DEVICE_VENDOR := Xunlong DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi R1 Plus LTS DEVICE_MODEL := Orange Pi R1 Plus LTS
SOC := rk3328 SOC := rk3328
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
DEVICE_PACKAGES := kmod-usb-net-rtl8152 DEVICE_PACKAGES := kmod-usb-net-rtl8152
endef endef
TARGET_DEVICES += xunlong_orangepi-r1-plus-lts TARGET_DEVICES += xunlong_orangepi-r1-plus-lts