[openwrt/openwrt] uboot-rockchip: cleanup redudant variables
LEDE Commits
lede-commits at lists.infradead.org
Thu May 18 08:51:08 PDT 2023
hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/1a5cb37dd3a09b4ce58c8c7708ad0aff87c86569
commit 1a5cb37dd3a09b4ce58c8c7708ad0aff87c86569
Author: Tianling Shen <cnsztl at immortalwrt.org>
AuthorDate: Sat May 13 12:16:21 2023 +0800
uboot-rockchip: cleanup redudant variables
Instead of adding these common variables again and again simply create a
shared set for each SoC.
Signed-off-by: Tianling Shen <cnsztl at immortalwrt.org>
---
package/boot/uboot-rockchip/Makefile | 40 ++++++++++++++++--------------------
1 file changed, 18 insertions(+), 22 deletions(-)
diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile
index c6fc525d9b..f27a3e0638 100644
--- a/package/boot/uboot-rockchip/Makefile
+++ b/package/boot/uboot-rockchip/Makefile
@@ -24,58 +24,54 @@ endef
# RK3328 boards
-define U-Boot/nanopi-r2s-rk3328
+define U-Boot/rk3328/Default
BUILD_SUBTARGET:=armv8
+ DEPENDS:=+PACKAGE_u-boot-$(1):arm-trusted-firmware-rockchip
+ ATF:=rk3328_bl31.elf
+ OF_PLATDATA:=$(1)
+endef
+
+define U-Boot/nanopi-r2s-rk3328
+ $(U-Boot/rk3328/Default)
NAME:=NanoPi R2S
BUILD_DEVICES:= \
friendlyarm_nanopi-r2s
- DEPENDS:=+PACKAGE_u-boot-nanopi-r2s-rk3328:arm-trusted-firmware-rockchip
- PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
- ATF:=rk3328_bl31.elf
- OF_PLATDATA:=$(1)
endef
define U-Boot/roc-cc-rk3328
- BUILD_SUBTARGET:=armv8
+ $(U-Boot/rk3328/Default)
NAME:=ROC-RK3328-CC
BUILD_DEVICES:= \
firefly_roc-rk3328-cc
- DEPENDS:=+PACKAGE_u-boot-roc-cc-rk3328:arm-trusted-firmware-rockchip
- PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
- ATF:=rk3328_bl31.elf
- OF_PLATDATA:=$(1)
endef
# RK3399 boards
-define U-Boot/nanopi-r4s-rk3399
+define U-Boot/rk3399/Default
BUILD_SUBTARGET:=armv8
+ DEPENDS:=+PACKAGE_u-boot-$(1):arm-trusted-firmware-rockchip
+ ATF:=rk3399_bl31.elf
+endef
+
+define U-Boot/nanopi-r4s-rk3399
+ $(U-Boot/rk3399/Default)
NAME:=NanoPi R4S
BUILD_DEVICES:= \
friendlyarm_nanopi-r4s
- DEPENDS:=+PACKAGE_u-boot-nanopi-r4s-rk3399:arm-trusted-firmware-rockchip
- PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
- ATF:=rk3399_bl31.elf
endef
define U-Boot/rock-pi-4-rk3399
- BUILD_SUBTARGET:=armv8
+ $(U-Boot/rk3399/Default)
NAME:=Rock Pi 4
BUILD_DEVICES:= \
radxa_rock-pi-4a
- DEPENDS:=+PACKAGE_u-boot-rock-pi-4-rk3399:arm-trusted-firmware-rockchip
- PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
- ATF:=rk3399_bl31.elf
endef
define U-Boot/rockpro64-rk3399
- BUILD_SUBTARGET:=armv8
+ $(U-Boot/rk3399/Default)
NAME:=RockPro64
BUILD_DEVICES:= \
pine64_rockpro64
- DEPENDS:=+PACKAGE_u-boot-rockpro64-rk3399:arm-trusted-firmware-rockchip
- PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
- ATF:=rk3399_bl31.elf
endef
UBOOT_TARGETS := \
More information about the lede-commits
mailing list