kbuild: debbuild: fix deb-packe for r2+r64 and add r2pro+r3

scripts/package/builddeb

@@ -137,23 +137,46 @@ rm -rf "$tmpdir" "$dbg_dir" debian/files
 mkdir -m 755 -p "$tmpdir/DEBIAN"
 mkdir -p "$tmpdir/lib" "$tmpdir/boot"
 
-case $board in
-bpi-r64|bpi-r2)
+if [ $board != "bpi-r2pro" ];then
 	mkdir -p "$tmpdir/boot/bananapi/$board/linux/dtb"
 	installed_image_path="boot/bananapi/$board/linux/uImage_nodt-$version"
-
-	cp ./$board.dtb "$tmpdir/boot/bananapi/$board/linux/dtb/$board-$version.dtb"
-	if [ "$board" = "bpi-r64" ];
-	then
-		cp ./$board.itb "$tmpdir/boot/bananapi/$board/linux/$board-$version.itb"
-	fi
 	source_image_path="./uImage_nodt"
+else
+	mkdir -p "$tmpdir/boot/extlinux"
+fi
+
+case $board in
+bpi-r2)
+	DTBFILE=arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dtb
+	ls -l ./uImage
+	cp ./uImage "$tmpdir/boot/bananapi/$board/linux/uImage-$version"
+	;;
+bpi-r64)
+	DTBFILE=arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dtb
+	cp arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64-rtl8367.dtb "$tmpdir/boot/bananapi/$board/linux/dtb/"
+	cp ./$board.itb "$tmpdir/boot/bananapi/$board/linux/$board-$version.itb"
+	;;
+bpi-r2pro)
+	DTBFILE=arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dtb
+	cp arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro-rtl8367.dtb "$tmpdir/boot/extlinux/"
+	installed_image_path="boot/extlinux/Image-${version}.gz"
+	source_image_path="arch/arm64/boot/Image.gz"
+	;;
+bpi-r3)
+	DTBFILE=arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dtb
+	cp arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3*.dtbo "$tmpdir/boot/bananapi/$board/linux/dtb/"
+	cp ./$board.itb "$tmpdir/boot/bananapi/$board/linux/$board-$version.itb"
 	;;
 *)
 	source_image_path="$($MAKE -s -f $srctree/Makefile image_name)"
 	;;
 esac
 
+if [ $board != "bpi-r2pro" ];then
+	cp $DTBFILE "$tmpdir/boot/bananapi/$board/linux/dtb/$board-$version.dtb"
+else
+	cp $DTBFILE "$tmpdir/boot/extlinux/$board-$version.dtb"
+fi
 # Build and install the kernel
 if [ "$ARCH" = "um" ] ; then
 	mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin" "$tmpdir/usr/share/doc/$packagename"