Revert "Remove Orange Pi rk3588 U-Boot package"

This reverts commit 118dd59.

packages/u-boot-orangepi-rk3588/debian/.gitignore

@@ -0,0 +1,3 @@
+files
+build
+tmp

packages/u-boot-orangepi-rk3588/debian/arch

@@ -0,0 +1 @@
+arm64

packages/u-boot-orangepi-rk3588/debian/bin/u-boot-install

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -eE 
+
+disk="$1"
+if [ $# -ne 1 ]; then
+    echo "Usage: $(basename "$0") /dev/mmcblk0"
+    exit 1
+fi
+
+if [ ! -b "${disk}" ]; then
+    echo "$(basename "$0"): block device '${disk}' not found"
+    exit 1
+fi
+
+if [ -f /usr/lib/u-boot/u-boot-rockchip.bin ]; then
+    echo "Writing idbloader and u-boot image"
+    sudo dd if=/usr/lib/u-boot/u-boot-rockchip.bin of="${disk}" seek=1 bs=32k conv=fsync
+else
+    echo "Writing idbloader"
+    sudo dd if=/usr/lib/u-boot/idbloader.img of="${disk}" seek=64 conv=notrunc
+    echo "Writing u-boot image"
+    sudo dd if=/usr/lib/u-boot/u-boot.itb of="${disk}" seek=16384 conv=notrunc
+fi
+
+sudo sync "${disk}"
+
+sleep 2

packages/u-boot-orangepi-rk3588/debian/bin/u-boot-install-mtd

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -eE 
+
+disk="/dev/mtd0"
+if [ ! -c "${disk}" ]; then
+    echo "$(basename "$0"): block device '${disk}' not found"
+    exit 1
+fi
+echo "$(basename "$0"): writing U-Boot to the SPI flash"
+
+uboot_spi_image="/usr/lib/u-boot/u-boot-rockchip-spi.bin"
+if [ ! -f "${uboot_spi_image}" ]; then
+    uboot_spi_image="/usr/lib/u-boot/rkspi_loader.img"
+fi
+
+extra_opts_flashcp=("--verbose")
+if flashcp -h | grep -q -e '--partition'; then
+    extra_opts_flashcp+=("--partition")
+fi
+sudo flashcp "${extra_opts_flashcp[@]}" "${uboot_spi_image}" "${disk}"
+
+sudo sync

packages/u-boot-orangepi-rk3588/debian/bin/u-boot-install-sata-mtd

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -eE 
+
+disk="/dev/mtd0"
+if [ ! -c "${disk}" ]; then
+    echo "$(basename "$0"): block device '${disk}' not found"
+    exit 1
+fi
+echo "$(basename "$0"): writing U-Boot to the SPI flash"
+
+uboot_spi_image="/usr/lib/u-boot/u-boot-rockchip-spi-sata.bin"
+if [ ! -f "${uboot_spi_image}" ]; then
+    uboot_spi_image="/usr/lib/u-boot/rkspi_loader_sata.img"
+fi
+
+extra_opts_flashcp=("--verbose")
+if flashcp -h | grep -q -e '--partition'; then
+    extra_opts_flashcp+=("--partition")
+fi
+sudo flashcp "${extra_opts_flashcp[@]}" "${uboot_spi_image}" "${disk}"
+
+sudo sync

packages/u-boot-orangepi-rk3588/debian/changelog

@@ -0,0 +1,123 @@
+u-boot-orangepi-rk3588 (2017.09+20240401.git7f7ff61a-6) jammy; urgency=medium
+
+  * Update ddr and bl31 blobs for the Orange Pi 5, 5B, and 5 Pro
+  * Update U-Boot install scripts
+
+ -- Joshua Riek <[email protected]>  Wed, 12 Jun 2024 18:42:39 -0400
+
+u-boot-orangepi-rk3588 (2017.09+20240401.git7f7ff61a-5) jammy; urgency=medium
+
+  * Update ddr and bl31 blobs for the Orange Pi 5 Pro
+
+ -- Joshua Riek <[email protected]>  Sat, 11 May 2024 09:32:06 -0400
+
+u-boot-orangepi-rk3588 (2017.09+20240401.git7f7ff61a-4) jammy; urgency=medium
+
+  * Use new ddr and bl31 blobs for the Orange Pi 5 Pro
+
+ -- Joshua Riek <[email protected]>  Sun, 05 May 2024 12:10:58 -0400
+
+u-boot-orangepi-rk3588 (2017.09+20240401.git7f7ff61a-3) jammy; urgency=medium
+
+  * Use older ddr and bl31 blobs for the Orange Pi 5 Pro
+
+ -- Joshua Riek <[email protected]>  Mon, 29 Apr 2024 17:05:10 -0400
+
+u-boot-orangepi-rk3588 (2017.09+20240401.git7f7ff61a-2) jammy; urgency=medium
+
+  * Add Orange Pi 5 Pro to control info
+
+ -- Joshua Riek <[email protected]>  Wed, 17 Apr 2024 14:51:01 -0400
+
+u-boot-orangepi-rk3588 (2017.09+20240401.git7f7ff61a-1) jammy; urgency=medium
+
+  * Add support for the Orange Pi 5 Pro
+
+ -- Joshua Riek <[email protected]>  Wed, 17 Apr 2024 14:51:01 -0400
+
+u-boot-orangepi-rk3588 (2017.09+20230704.git1f70ac3a-9) jammy; urgency=medium
+
+  * Use flashcp to update spi flash
+
+ -- Joshua Riek <[email protected]>  Mon, 25 Mar 2024 14:05:02 -0400
+
+u-boot-orangepi-rk3588 (2017.09+20230704.git1f70ac3a-8) jammy; urgency=medium
+
+  * Fix gcc 13 compile error
+
+ -- Joshua Riek <[email protected]>  Mon, 12 Feb 2024 10:11:04 -0500
+
+u-boot-orangepi-rk3588 (2017.09+20230704.git1f70ac3a-7) jammy; urgency=medium
+
+  * Remove emmc skip patch
+
+ -- Joshua Riek <[email protected]>  Fri, 29 Dec 2023 07:50:18 -0500
+
+u-boot-orangepi-rk3588 (2017.09+20230704.git1f70ac3a-6) jammy; urgency=medium
+
+  * Cleanup packaging and build process
+
+ -- Joshua Riek <[email protected]>  Sun, 24 Dec 2023 09:55:07 -0500
+
+u-boot-orangepi-rk3588 (2017.09+20230704.git1f70ac3a-5) jammy; urgency=medium
+
+  * Add u-boot install scripts
+
+ -- Joshua Riek <[email protected]>  Thu, 26 Oct 2023 17:52:06 -0400
+
+u-boot-orangepi-rk3588 (2017.09+20230704.git1f70ac3a-4) jammy; urgency=medium
+
+  * Update u-boot install path
+
+ -- Joshua Riek <[email protected]>  Fri, 20 Oct 2023 21:14:04 -0400
+
+u-boot-orangepi-rk3588 (2017.09+20230704.git1f70ac3a-3) jammy; urgency=medium
+
+  * Updated the ddr blob to rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin
+  * Updated the bl31 blob to rk3588_bl31_v1.38.elf 
+
+ -- Joshua Riek <[email protected]>  Thu, 10 Aug 2023 01:42:16 -0400
+
+u-boot-orangepi-rk3588 (2017.09+20230704.git1f70ac3a-2) jammy; urgency=medium
+
+  * revert "Disable set local-mac-address"
+
+ -- Joshua Riek <[email protected]>  Sun, 23 Jul 2023 17:10:03 -0400
+
+u-boot-orangepi-rk3588 (2017.09+20230704.git1f70ac3a-1) jammy; urgency=medium
+
+  * renamed orangepi5, orangepi5b, and orangepi5plus packages
+
+  * upstream changes
+    - Disable set local-mac-address
+
+ -- Joshua Riek <[email protected]>  Fri, 14 Jul 2023 20:07:24 -0400
+
+u-boot-orangepi-rk3588 (2017.09+20230525.gitac3b1ca9-2) jammy; urgency=medium
+
+  * fix source epoch
+
+ -- Joshua Riek <[email protected]>  Tue, 27 Jun 2023 19:09:42 -0400
+
+u-boot-orangepi-rk3588 (2017.09+20230525.gitac3b1ca9-1) jammy; urgency=medium
+
+  * upstream changes
+    - opi5plus: fixed spiflash not starting
+
+ -- Joshua Riek <[email protected]>  Fri, 26 May 2023 18:06:33 -0400
+
+u-boot-orangepi-rk3588 (2017.09+20230517.gite7fa0094-1) jammy; urgency=medium
+
+  * upstream changes
+    - opi5: Set CONFIG_MTD_BLK_U_BOOT_OFFS=0x400
+    - opi5b: Set CONFIG_ROCKCHIP_EMMC_IOMUX=y
+    - opi5plus: Set CONFIG_MTD_BLK_U_BOOT_OFFS=0x400 and CONFIG_ROCKCHIP_EMMC_IOMUX=y
+    - Automatically detects boot devices and enters download mode if needed
+
+ -- Joshua Riek <[email protected]>  Fri, 19 May 2023 13:54:33 -0400
+
+u-boot-orangepi-rk3588 (2017.09+20230427.git90d4bd74-1) jammy; urgency=medium
+
+  * Initial packaging.
+
+ -- Joshua Riek <[email protected]>  Sun, 30 Apr 2023 11:01:18 -0400

packages/u-boot-orangepi-rk3588/debian/control

@@ -0,0 +1,63 @@
+Source: u-boot-orangepi-rk3588
+Section: admin
+Priority: optional
+Standards-Version: 4.6.0
+Maintainer: Joshua Riek <[email protected]>
+Build-Depends: debhelper-compat (= 12), parted, gcc, make, bc, bison, python3, flex, device-tree-compiler, udev
+Vcs-Git: https://github.com/orangepi-xunlong/u-boot-orangepi.git
+
+Package: u-boot-orangepi-5
+Architecture: arm64
+Priority: optional
+Depends: mtd-utils
+Provides: u-boot-orangepi-rk3588, u-boot
+Replaces: u-boot-orangepi-rk3588, u-boot
+Conflicts: u-boot-orangepi-rk3588, u-boot
+Description: A boot loader for the Orange Pi 5.
+ Das U-Boot is a cross-platform bootloader for embedded systems,
+ used as the default boot loader by several board vendors.  It is
+ intended to be easy to port and to debug, and runs on many
+ supported architectures, including PPC, ARM, MIPS, x86, m68k,
+ NIOS, and Microblaze.
+
+Package: u-boot-orangepi-5b
+Architecture: arm64
+Priority: optional
+Depends: mtd-utils
+Provides: u-boot-orangepi-rk3588, u-boot
+Replaces: u-boot-orangepi-rk3588, u-boot
+Conflicts: u-boot-orangepi-rk3588, u-boot
+Description: A boot loader for the Orange Pi 5B.
+ Das U-Boot is a cross-platform bootloader for embedded systems,
+ used as the default boot loader by several board vendors.  It is
+ intended to be easy to port and to debug, and runs on many
+ supported architectures, including PPC, ARM, MIPS, x86, m68k,
+ NIOS, and Microblaze.
+
+Package: u-boot-orangepi-5-pro
+Architecture: arm64
+Priority: optional
+Depends: mtd-utils
+Provides: u-boot-orangepi-rk3588, u-boot
+Replaces: u-boot-orangepi-rk3588, u-boot
+Conflicts: u-boot-orangepi-rk3588, u-boot
+Description: A boot loader for the Orange Pi 5 Pro.
+ Das U-Boot is a cross-platform bootloader for embedded systems,
+ used as the default boot loader by several board vendors.  It is
+ intended to be easy to port and to debug, and runs on many
+ supported architectures, including PPC, ARM, MIPS, x86, m68k,
+ NIOS, and Microblaze.
+
+Package: u-boot-orangepi-5-plus
+Architecture: arm64
+Priority: optional
+Depends: mtd-utils
+Provides: u-boot-orangepi-rk3588, u-boot
+Replaces: u-boot-orangepi-rk3588, u-boot
+Conflicts: u-boot-orangepi-rk3588, u-boot
+Description: A boot loader for the Orange Pi 5 Plus.
+ Das U-Boot is a cross-platform bootloader for embedded systems,
+ used as the default boot loader by several board vendors.  It is
+ intended to be easy to port and to debug, and runs on many
+ supported architectures, including PPC, ARM, MIPS, x86, m68k,
+ NIOS, and Microblaze.

packages/u-boot-orangepi-rk3588/debian/copyright

@@ -0,0 +1,71 @@
+  U-Boot is Free Software.  It is copyrighted by Wolfgang Denk and
+many others who contributed code (see the actual source code and the
+git commit messages for details).  You can redistribute U-Boot and/or
+modify it under the terms of version 2 of the GNU General Public
+License as published by the Free Software Foundation.  Most of it can
+also be distributed, at your option, under any later version of the
+GNU General Public License -- see individual files for exceptions.
+
+  NOTE! This license does *not* cover the so-called "standalone"
+applications that use U-Boot services by means of the jump table
+provided by U-Boot exactly for this purpose - this is merely
+considered normal use of U-Boot, and does *not* fall under the
+heading of "derived work" -- see file  Licenses/Exceptions  for
+details.
+
+  Also note that the GPL and the other licenses are copyrighted by
+the Free Software Foundation and other organizations, but the
+instance of code that they refer to (the U-Boot source code) is
+copyrighted by me and others who actually wrote it.
+-- Wolfgang Denk
+
+
+Like many other projects, U-Boot has a tradition of including big
+blocks of License headers in all files.  This not only blows up the
+source code with mostly redundant information, but also makes it very
+difficult to generate License Clearing Reports.  An additional problem
+is that even the same licenses are referred to by a number of
+slightly varying text blocks (full, abbreviated, different
+indentation, line wrapping and/or white space, with obsolete address
+information, ...) which makes automatic processing a nightmare.
+
+To make this easier, such license headers in the source files will be
+replaced with a single line reference to Unique License Identifiers
+as defined by the Linux Foundation's SPDX project [1].  For example,
+in a source file the full "GPL v2.0 or later" header text will be
+replaced by a single line:
+
+	SPDX-License-Identifier:	GPL-2.0+
+
+Ideally, the license terms of all files in the source tree should be
+defined by such License Identifiers; in no case a file can contain
+more than one such License Identifier list.
+
+If a "SPDX-License-Identifier:" line references more than one Unique
+License Identifier, then this means that the respective file can be
+used under the terms of either of these licenses, i. e. with
+
+	SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
+
+you can choose between GPL-2.0+ and BSD-3-Clause licensing.
+
+We use the SPDX Unique License Identifiers here; these are available
+at [2].
+
+[1] http://spdx.org/
+[2] http://spdx.org/licenses/
+
+Full name					SPDX Identifier	OSI Approved	File name		URI
+=======================================================================================================================================
+GNU General Public License v2.0 only		GPL-2.0		Y		gpl-2.0.txt		http://www.gnu.org/licenses/gpl-2.0.txt
+GNU General Public License v2.0 or later	GPL-2.0+	Y		gpl-2.0.txt		http://www.gnu.org/licenses/gpl-2.0.txt
+GNU Library General Public License v2 or later	LGPL-2.0+	Y		lgpl-2.0.txt		http://www.gnu.org/licenses/old-licenses/lgpl-2.0.txt
+GNU Lesser General Public License v2.1 or later	LGPL-2.1+	Y		lgpl-2.1.txt		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+eCos license version 2.0			eCos-2.0			eCos-2.0.txt		http://www.gnu.org/licenses/ecos-license.html
+BSD 2-Clause License				BSD-2-Clause	Y		bsd-2-clause.txt	http://spdx.org/licenses/BSD-2-Clause
+BSD 3-clause "New" or "Revised" License		BSD-3-Clause	Y		bsd-3-clause.txt	http://spdx.org/licenses/BSD-3-Clause#licenseText
+IBM PIBS (PowerPC Initialization and		IBM-pibs			ibm-pibs.txt
+	Boot Software) license
+ISC License					ISC		Y		isc.txt			https://spdx.org/licenses/ISC
+SIL OPEN FONT LICENSE (OFL-1.1)			OFL-1.1		Y		OFL.txt			https://spdx.org/licenses/OFL-1.1.html
+X11 License					X11				x11.txt			https://spdx.org/licenses/X11.html

packages/u-boot-orangepi-rk3588/debian/patches/0001-fix-srctree-path.patch

@@ -0,0 +1,39 @@
+From 4ed890e3841133fd3f11bca1620c3f6d13b3405f Mon Sep 17 00:00:00 2001
+From: Joshua Riek <[email protected]>
+Date: Sun, 23 Apr 2023 10:26:00 -0400
+Subject: [PATCH] arch: arm: mach-rockchip: fix srctree path
+
+---
+ arch/arm/mach-rockchip/fit_nodes.sh    | 2 +-
+ arch/arm/mach-rockchip/make_fit_atf.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-rockchip/fit_nodes.sh b/arch/arm/mach-rockchip/fit_nodes.sh
+index be7d46d8f..c0afc1ade 100755
+--- a/arch/arm/mach-rockchip/fit_nodes.sh
++++ b/arch/arm/mach-rockchip/fit_nodes.sh
+@@ -6,7 +6,7 @@
+ #
+
+ # Process args and auto set variables
+-source ./${srctree}/arch/arm/mach-rockchip/fit_args.sh
++source ${srctree}/arch/arm/mach-rockchip/fit_args.sh
+ rm -f ${srctree}/*.digest ${srctree}/*.bin.gz ${srctree}/bl31_0x*.bin
+
+ # Periph register
+diff --git a/arch/arm/mach-rockchip/make_fit_atf.sh b/arch/arm/mach-rockchip/make_fit_atf.sh
+index 045273e3b..fa6a9780e 100755
+--- a/arch/arm/mach-rockchip/make_fit_atf.sh
++++ b/arch/arm/mach-rockchip/make_fit_atf.sh
+@@ -5,7 +5,7 @@
+ # SPDX-License-Identifier:     GPL-2.0+
+ #
+
+-source ./${srctree}/arch/arm/mach-rockchip/fit_nodes.sh
++source ${srctree}/arch/arm/mach-rockchip/fit_nodes.sh
+
+ gen_header
+ gen_uboot_node
+-- 
+2.25.1
+