On Thu, 29 Aug 2024 at 12:56, Tom Rini <tr...@konsulko.com> wrote:
>
> Rather than guess what we need to name our u-boot.bin file as for it to
> boot make use of the kernel= option to always call it u-boot.bin and
> then on 64bit platforms (and since future platforms use rpi_arm64 this
> list should not grow) also pass in arm_64bit=1.
>
> Signed-off-by: Tom Rini <tr...@konsulko.com>
> ---
> bin/flashair.rpi | 32 ++++++++------------------------
> 1 file changed, 8 insertions(+), 24 deletions(-)
>
Reviewed-by: Simon Glass <s...@chromium.org>
> diff --git a/bin/flashair.rpi b/bin/flashair.rpi
> index 874c41f76a07..2c2756c73087 100644
> --- a/bin/flashair.rpi
> +++ b/bin/flashair.rpi
> @@ -27,34 +27,18 @@
> # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
> # POSSIBILITY OF SUCH DAMAGE.
>
> -flashair_rmlist=`mktemp`
> -
> -case "${board_type}" in
> -rpi)
> - kernel_dst=kernel.img
> - ;;
> -rpi_2)
> - kernel_dst=kernel7.img
> - ;;
> -rpi_3)
> - kernel_dst=kernel8.img
> - ;;
> -rpi_3_32b)
> - kernel_dst=kernel8-32.img
> - ;;
> -*)
> - echo Unknown Pi \""${board_type}"\"
> - exit 1
> - ;;
> -esac
> -
> -echo 'kern*.img' > "${flashair_rmlist}"
> -
> -cp "${U_BOOT_BUILD_DIR}"/u-boot.bin "${UL_DIR}"/"${kernel_dst}"
> +cp "${U_BOOT_BUILD_DIR}"/u-boot.bin "${UL_DIR}"/u-boot.bin
>
> touch "${UL_DIR}/config.txt"
>
> echo "enable_uart=1" >> "${UL_DIR}/config.txt"
> +echo "kernel=u-boot.bin" >> "${UL_DIR}/config.txt"
> +
> +case "${board_type}" in
> +rpi_3|rpi_3b|rpi_3_b_plus|rpi_4|rpi_arm64)
> + echo "arm_64bit=1" >> "${UL_DIR}/config.txt"
> + ;;
> +esac
>
> case "${board_ident}" in
> 3-32-pl011)
> --
> 2.34.1
>
