From 6a8d38e31181f6624832e45394156e25fa7f4055 Mon Sep 17 00:00:00 2001
From: Frank Wunderlich <frank-w@public-files.de>
Date: Sat, 17 Feb 2024 13:57:59 +0100
Subject: [PATCH] build.sh: upload fit for all boards except bpi-r2

drop r2pro specific case for barebox
---
 build.sh | 32 ++++++++++----------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/build.sh b/build.sh
index f63ffce21108e..2c173e2f71383 100755
--- a/build.sh
+++ b/build.sh
@@ -350,27 +350,19 @@ function upload {
 		b=""
 	fi
 
-	if [[ "$board" == "bpi-r2pro" ]];then
-                imagename="none-linux-bpi-r2pro"
-                read -e -i $imagename -p "Kernel-filename: " input
-                imagename="${input:-$imagename}"
-	else
-		imagename="uImage_${kernver}${gitbranch}${b}"
-		read -e -i $imagename -p "Kernel-filename: " input
-		imagename="${input:-$imagename}"
-	fi
+	imagename="${kernver}${gitbranch}${b}"
+	read -e -i $imagename -p "Kernel-filename: " input
+	imagename="${input:-$imagename}"
 
 	echo "Name: $imagename"
 
-	if [[ "$board" == "bpi-r2pro" ]];then
-		dtbname="none-oftree-bpi-r2pro"
-		read -e -i $dtbname -p "dtb-filename: " input
-		dtbname="${input:-$dtbname}"
-	elif [[ "$board" == "bpi-r64" || "$board" == "bpi-r3" || "$board" == "bpi-r4" ]];then
+	if [[ "$board" == "bpi-r2" ]];then
+		imagename="uImage_$imagename"
+	else
 		read -e -i y -p "upload fit? " fitupload
 		if [[ "$fitupload" == "y" ]];
 		then
-			imagename="${imagename//uImage_}.itb"
+			imagename="${imagename}.itb"
 			echo "uploading fit as $imagename"
 		else
 			dtbname="${kernver}${b}${gitbranch}.dtb"
@@ -383,10 +375,9 @@ function upload {
 	echo "DTB Name: $dtbname"
 	echo "uploading to ${uploadserver}:${uploaddir}..."
 
-	if [[ "$board" == "bpi-r2pro" ]];then
-		scp ${bindir}arch/arm64/boot/Image.gz ${uploaduser}@${uploadserver}:${uploaddir}/${imagename}
-		scp ${bindir}${DTBFILE} ${uploaduser}@${uploadserver}:${uploaddir}/${dtbname}
-	elif [[ "$board" == "bpi-r64" || "$board" == "bpi-r3" || "$board" == "bpi-r4" ]];then
+	if [[ "$board" == "bpi-r2" ]];then
+		scp uImage ${uploaduser}@${uploadserver}:${uploaddir}/${imagename}
+	else
 		if [[ "$fitupload" == "y" ]];
 		then
 			scp ${board}.itb ${uploaduser}@${uploadserver}:${uploaddir}/${imagename}
@@ -394,9 +385,6 @@ function upload {
 			scp uImage_nodt ${uploaduser}@${uploadserver}:${uploaddir}/${imagename}
 			scp ${bindir}${DTBFILE} ${uploaduser}@${uploadserver}:${uploaddir}/${dtbname}
 		fi
-
-	else
-		scp uImage ${uploaduser}@${uploadserver}:${uploaddir}/${imagename}
 	fi
 }