From bc8745a6078e1f6c1b6b4c54be3fc49d25d2daa5 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Sat, 21 Sep 2024 20:39:35 +0800
Subject: [PATCH] uboot-rockchip: align shared recipes with master branch

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
---
 package/boot/uboot-rockchip/Makefile | 50 ++++++++++++++--------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile
index ef8f7a6bba..ad7394c39e 100644
--- a/package/boot/uboot-rockchip/Makefile
+++ b/package/boot/uboot-rockchip/Makefile
@@ -27,56 +27,56 @@ endef
 
 # RK3328 boards
 
-define U-Boot/Default/rk3328
+define U-Boot/rk3328/Default
   BUILD_SUBTARGET:=armv8
   DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3328
   ATF:=$(RK3328_ATF)
 endef
 
 define U-Boot/nanopi-r2c-rk3328
-  $(U-Boot/Default/rk3328)
+  $(U-Boot/rk3328/Default)
   NAME:=NanoPi R2C
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r2c
 endef
 
 define U-Boot/nanopi-r2c-plus-rk3328
-  $(U-Boot/Default/rk3328)
+  $(U-Boot/rk3328/Default)
   NAME:=NanoPi R2C Plus
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r2c-plus
 endef
 
 define U-Boot/nanopi-r2s-rk3328
-  $(U-Boot/Default/rk3328)
+  $(U-Boot/rk3328/Default)
   NAME:=NanoPi R2S
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r2s
 endef
 
 define U-Boot/orangepi-r1-plus-rk3328
-  $(U-Boot/Default/rk3328)
+  $(U-Boot/rk3328/Default)
   NAME:=Orange Pi R1 Plus
   BUILD_DEVICES:= \
     xunlong_orangepi-r1-plus
 endef
 
 define U-Boot/orangepi-r1-plus-lts-rk3328
-  $(U-Boot/Default/rk3328)
+  $(U-Boot/rk3328/Default)
   NAME:=Orange Pi R1 Plus LTS
   BUILD_DEVICES:= \
     xunlong_orangepi-r1-plus-lts
 endef
 
 define U-Boot/roc-cc-rk3328
-  $(U-Boot/Default/rk3328)
+  $(U-Boot/rk3328/Default)
   NAME:=ROC-RK3328-CC
   BUILD_DEVICES:= \
     firefly_roc-rk3328-cc
 endef
 
 define U-Boot/rock-pi-e-rk3328
-  $(U-Boot/Default/rk3328)
+  $(U-Boot/rk3328/Default)
   NAME:=Rock Pi E
   BUILD_DEVICES:= \
     radxa_rock-pi-e
@@ -84,56 +84,56 @@ endef
 
 # RK3399 boards
 
-define U-Boot/Default/rk3399
+define U-Boot/rk3399/Default
   BUILD_SUBTARGET:=armv8
   DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3399
   ATF:=$(RK3399_ATF)
 endef
 
 define U-Boot/guangmiao-g4c-rk3399
-  $(U-Boot/Default/rk3399)
+  $(U-Boot/rk3399/Default)
   NAME:=GuangMiao G4C
   BUILD_DEVICES:= \
     huake_guangmiao-g4c
 endef
 
 define U-Boot/nanopc-t4-rk3399
-  $(U-Boot/Default/rk3399)
+  $(U-Boot/rk3399/Default)
   NAME:=NanoPC T4
   BUILD_DEVICES:= \
     friendlyarm_nanopc-t4
 endef
 
 define U-Boot/nanopi-r4s-rk3399
-  $(U-Boot/Default/rk3399)
+  $(U-Boot/rk3399/Default)
   NAME:=NanoPi R4S
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r4s
 endef
 
 define U-Boot/nanopi-r4se-rk3399
-  $(U-Boot/Default/rk3399)
+  $(U-Boot/rk3399/Default)
   NAME:=NanoPi R4SE
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r4se
 endef
 
 define U-Boot/nanopi-r4s-enterprise-rk3399
-  $(U-Boot/Default/rk3399)
+  $(U-Boot/rk3399/Default)
   NAME:=NanoPi R4S Enterprise Edition
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r4s-enterprise
 endef
 
 define U-Boot/rock-pi-4-rk3399
-  $(U-Boot/Default/rk3399)
+  $(U-Boot/rk3399/Default)
   NAME:=Rock Pi 4
   BUILD_DEVICES:= \
     radxa_rock-pi-4a
 endef
 
 define U-Boot/rockpro64-rk3399
-  $(U-Boot/Default/rk3399)
+  $(U-Boot/rk3399/Default)
   NAME:=RockPro64
   BUILD_DEVICES:= \
     pine64_rockpro64
@@ -142,7 +142,7 @@ endef
 
 # RK3568 boards
 
-define U-Boot/Default/rk3568
+define U-Boot/rk3568/Default
   BUILD_SUBTARGET:=armv8
   DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3568
   ATF:=$(RK3568_ATF)
@@ -150,14 +150,14 @@ define U-Boot/Default/rk3568
 endef
 
 define U-Boot/fastrhino-r66s-rk3568
-  $(U-Boot/Default/rk3568)
+  $(U-Boot/rk3568/Default)
   NAME:=FastRhino R66S
   BUILD_DEVICES:= \
     lunzn_fastrhino-r66s
 endef
 
 define U-Boot/fastrhino-r68s-rk3568
-  $(U-Boot/Default/rk3568)
+  $(U-Boot/rk3568/Default)
   NAME:=FastRhino R68S
   BUILD_DEVICES:= \
     lunzn_fastrhino-r68s
@@ -171,42 +171,42 @@ define U-Boot/lyt-t68m-rk3568
 endef
 
 define U-Boot/mrkaio-m68s-rk3568
-  $(U-Boot/Default/rk3568)
+  $(U-Boot/rk3568/Default)
   NAME:=Mrkaio M68S
   BUILD_DEVICES:= \
     ezpro_mrkaio-m68s
 endef
 
 define U-Boot/nanopi-r5c-rk3568
-  $(U-Boot/Default/rk3568)
+  $(U-Boot/rk3568/Default)
   NAME:=NanoPi R5C
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r5c
 endef
 
 define U-Boot/nanopi-r5s-rk3568
-  $(U-Boot/Default/rk3568)
+  $(U-Boot/rk3568/Default)
   NAME:=NanoPi R5S
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r5s
 endef
 
 define U-Boot/photonicat-rk3568
-  $(U-Boot/Default/rk3568)
+  $(U-Boot/rk3568/Default)
   NAME:=Ariaboard Photonicat
   BUILD_DEVICES:= \
     ariaboard_photonicat
 endef
 
 define U-Boot/roc-pc-rk3568
-  $(U-Boot/Default/rk3568)
+  $(U-Boot/rk3568/Default)
   NAME:=Station P2
   BUILD_DEVICES:= \
     firefly_roc-rk3568-pc
 endef
 
 define U-Boot/sige3-rk3568
-  $(U-Boot/Default/rk3568)
+  $(U-Boot/rk3568/Default)
   NAME:=Sige3
   BUILD_DEVICES:= \
     armsom_sige3