summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorTianling Shen <cnsztl@immortalwrt.org>2023-05-13 12:34:45 +0800
committerHauke Mehrtens <hauke@hauke-m.de>2023-05-18 17:42:53 +0200
commitafff2feb28baecaaf368002d819fb63973cf778a (patch)
treeb99705fbc3bd358f555484934eff0d20f4d900bf /target
parente35c7ab51fd161724924321f0590a9e26cb24aa7 (diff)
downloadopenwrt-afff2feb28baecaaf368002d819fb63973cf778a.tar.gz
openwrt-afff2feb28baecaaf368002d819fb63973cf778a.tar.bz2
openwrt-afff2feb28baecaaf368002d819fb63973cf778a.zip
rockchip: move UBOOT_DEVICE_NAME to default
Simplify variable usage. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Diffstat (limited to 'target')
-rw-r--r--target/linux/rockchip/image/Makefile1
-rw-r--r--target/linux/rockchip/image/armv8.mk3
2 files changed, 1 insertions, 3 deletions
diff --git a/target/linux/rockchip/image/Makefile b/target/linux/rockchip/image/Makefile
index e232166e51..3b118201b6 100644
--- a/target/linux/rockchip/image/Makefile
+++ b/target/linux/rockchip/image/Makefile
@@ -50,6 +50,7 @@ define Device/Default
KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb
IMAGES := sysupgrade.img.gz
DEVICE_DTS = rockchip/$$(SOC)-$(lastword $(subst _, ,$(1)))
+ UBOOT_DEVICE_NAME = $(lastword $(subst _, ,$(1)))-$$(SOC)
endef
include $(SUBTARGET).mk
diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk
index f441f9b087..72e5832f06 100644
--- a/target/linux/rockchip/image/armv8.mk
+++ b/target/linux/rockchip/image/armv8.mk
@@ -19,7 +19,6 @@ define Device/friendlyarm_nanopi-r2s
DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPi R2S
SOC := rk3328
- UBOOT_DEVICE_NAME := nanopi-r2s-rk3328
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
DEVICE_PACKAGES := kmod-usb-net-rtl8152
endef
@@ -30,7 +29,6 @@ define Device/friendlyarm_nanopi-r4s
DEVICE_MODEL := NanoPi R4S
DEVICE_VARIANT := 4GB LPDDR4
SOC := rk3399
- UBOOT_DEVICE_NAME := nanopi-r4s-rk3399
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
DEVICE_PACKAGES := kmod-r8169
endef
@@ -40,7 +38,6 @@ define Device/pine64_rockpro64
DEVICE_VENDOR := Pine64
DEVICE_MODEL := RockPro64
SOC := rk3399
- UBOOT_DEVICE_NAME := rockpro64-rk3399
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
endef
TARGET_DEVICES += pine64_rockpro64