From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Tue, 16 Dec 2025 23:06:24 +0000 (+0100)
Subject: uboot-sunxi: fix u-boot build
X-Git-Tag: v25.12.0-rc1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74247287ad4e472123aab78706ad857431cb8350;p=thirdparty%2Fopenwrt.git

uboot-sunxi: fix u-boot build

The u-boot target name has to match the u-boot configuration. Switch
this back to the old names.

Fixes: d871e95e7f83 ("sunxi: image: sync target profiles names with DT compatible")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 86996634f0b4917ccd6106e9d60cd2fd9bd68c6e)
---

diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile
index 515d6d6a928..7cd061b03f3 100644
--- a/package/boot/uboot-sunxi/Makefile
+++ b/package/boot/uboot-sunxi/Makefile
@@ -134,7 +134,7 @@ define U-Boot/Mele_M9
   BUILD_DEVICES:=mele_m9
 endef
 
-define U-Boot/a13-som
+define U-Boot/OLIMEX_A13_SOM
   BUILD_SUBTARGET:=cortexa8
   NAME:=Olimex A13 SOM
   BUILD_DEVICES:=olimex_a13-olinuxino
@@ -316,13 +316,13 @@ define U-Boot/pine64_plus
   ATF:=a64
 endef
 
-define U-Boot/bpi_m2_plus_h3
+define U-Boot/bananapi_m2_plus_h3
   BUILD_SUBTARGET:=cortexa7
   NAME:=Bananapi M2 Plus H3
   BUILD_DEVICES:=sinovoip_bpi-m2-plus
 endef
 
-define U-Boot/bpi_m3
+define U-Boot/Sinovoip_BPI_M3
   BUILD_SUBTARGET:=cortexa7
   NAME:=Bananapi M3
   BUILD_DEVICES:=sinovoip_bpi-m3
@@ -382,19 +382,19 @@ define U-Boot/orangepi_zero3
   ATF:=h616
 endef
 
-define U-Boot/bpi_m2_ultra
+define U-Boot/Bananapi_M2_Ultra
   BUILD_SUBTARGET:=cortexa7
   NAME:=Bananapi M2 Ultra
   BUILD_DEVICES:=sinovoip_bpi-m2-ultra
 endef
 
-define U-Boot/bpi_m2_berry
+define U-Boot/bananapi_m2_berry
   BUILD_SUBTARGET:=cortexa7
   NAME:=Bananapi M2 Berry
   BUILD_DEVICES:=sinovoip_bpi-m2-berry
 endef
 
-define U-Boot/bpi_p2_zero
+define U-Boot/bananapi_p2_zero
   BUILD_SUBTARGET:=cortexa7
   NAME:=Bananapi P2 Zero
   BUILD_DEVICES:=sinovoip_bpi-p2-zero
@@ -406,25 +406,24 @@ UBOOT_TARGETS := \
 	a64-olinuxino-emmc \
 	A10-OLinuXino-Lime \
 	A13-OLinuXino \
-	a13-som \
 	A20-OLinuXino-Lime \
 	A20-OLinuXino-Lime2 \
 	A20-OLinuXino-Lime2-eMMC \
 	A20-OLinuXino_MICRO \
-	beelink_x2 \
-	bpi_m2_berry \
-	bpi_m2_plus_h3 \
-	bpi_m2_ultra \
-	bpi_m3 \
-	bpi_p2_zero \
+	bananapi_m2_plus_h3 \
 	Bananapi \
+	bananapi_m2_berry \
+	bananapi_p2_zero \
+	Bananapi_M2_Ultra \
 	Bananapro \
+	beelink_x2 \
 	Cubieboard \
 	Cubieboard2 \
 	Cubietruck \
 	Hummingbird_A31 \
 	Marsboard_A10 \
 	Mele_M9 \
+	OLIMEX_A13_SOM \
 	licheepi_nano \
 	LicheePi_Zero \
 	Linksprite_pcDuino \
@@ -454,6 +453,7 @@ UBOOT_TARGETS := \
 	pangolin \
 	popstick \
 	pine64_plus \
+	Sinovoip_BPI_M3 \
 	sopine_baseboard \
 	orangepi_zero_plus \
 	libretech_all_h3_cc_h5