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

rockchip: move UBOOT_DEVICE_NAME to default

Browse source 
Simplify variable usage.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2023-05-13 12:34:45 +08:00 committed by Hauke Mehrtens
parent e35c7ab51f
commit afff2feb28
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,6 +50,7 @@ define Device/Default
KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb
IMAGES := sysupgrade.img.gz IMAGES := sysupgrade.img.gz
DEVICE_DTS = rockchip/$$(SOC)-$(lastword $(subst _, ,$(1))) DEVICE_DTS = rockchip/$$(SOC)-$(lastword $(subst _, ,$(1)))
UBOOT_DEVICE_NAME = $(lastword $(subst _, ,$(1)))-$$(SOC)
endef endef
include $(SUBTARGET).mk include $(SUBTARGET).mk

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

@ -19,7 +19,6 @@ define Device/friendlyarm_nanopi-r2s
DEVICE_VENDOR := FriendlyARM DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPi R2S DEVICE_MODEL := NanoPi R2S
SOC := rk3328 SOC := rk3328
UBOOT_DEVICE_NAME := nanopi-r2s-rk3328
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata 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
@ -30,7 +29,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
UBOOT_DEVICE_NAME := nanopi-r4s-rk3399
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
DEVICE_PACKAGES := kmod-r8169 DEVICE_PACKAGES := kmod-r8169
endef endef
@ -40,7 +38,6 @@ define Device/pine64_rockpro64
DEVICE_VENDOR := Pine64 DEVICE_VENDOR := Pine64
DEVICE_MODEL := RockPro64 DEVICE_MODEL := RockPro64
SOC := rk3399 SOC := rk3399
UBOOT_DEVICE_NAME := rockpro64-rk3399
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
endef endef
TARGET_DEVICES += pine64_rockpro64 TARGET_DEVICES += pine64_rockpro64