From 0b2389a03a0b2b8f8066dac482a2a60f2e6ccb1c Mon Sep 17 00:00:00 2001
From: Alban Browaeys <alban.browaeys@gmail.com>
Date: Sun, 24 Dec 2023 09:14:54 +0100
Subject: [PATCH] Fixup compilation helios64 uboot (#6068)

* CONFIG_SYS_SCSI_MAX_DEVICE was replaced by a macro in U-Boot v2022.04
* Fixes u-boot for rockchip64 derivatives
* Fix missing include for cli_simple_run_command
* Do not return value in a void function
---
 .../add-board-helios64.patch                           |  4 +---
 .../u-boot/u-boot-rockchip64/add-board-helios64.patch  |  4 +---
 .../general-support-recovery-button.patch              | 10 +++++-----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/patch/u-boot/u-boot-rockchip64-v2022.04/add-board-helios64.patch b/patch/u-boot/u-boot-rockchip64-v2022.04/add-board-helios64.patch
index 560ebedb73..902ed81bd2 100644
--- a/patch/u-boot/u-boot-rockchip64-v2022.04/add-board-helios64.patch
+++ b/patch/u-boot/u-boot-rockchip64-v2022.04/add-board-helios64.patch
@@ -2171,7 +2171,7 @@ new file mode 100644
 index 0000000000..6fca9a6be0
 --- /dev/null
 +++ b/include/configs/helios64.h
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,45 @@
 +/* SPDX-License-Identifier: GPL-2.0+ */
 +/*
 + * (C) Copyright 2020 Aditya Prayoga <aditya@kobol.io>
@@ -2199,8 +2199,6 @@ index 0000000000..6fca9a6be0
 +
 +	#define CONFIG_SYS_SCSI_MAX_SCSI_ID     5
 +	#define CONFIG_SYS_SCSI_MAX_LUN         1
-+	#define CONFIG_SYS_SCSI_MAX_DEVICE      (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
-+						CONFIG_SYS_SCSI_MAX_LUN)
 +
 +	#define BOOT_TARGET_SCSI(func) \
 +	    func(SCSI, scsi, 0)
diff --git a/patch/u-boot/u-boot-rockchip64/add-board-helios64.patch b/patch/u-boot/u-boot-rockchip64/add-board-helios64.patch
index 03eb71f3d0..1e214b4506 100644
--- a/patch/u-boot/u-boot-rockchip64/add-board-helios64.patch
+++ b/patch/u-boot/u-boot-rockchip64/add-board-helios64.patch
@@ -2181,7 +2181,7 @@ new file mode 100644
 index 00000000..6fca9a6b
 --- /dev/null
 +++ b/include/configs/helios64.h
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,45 @@
 +/* SPDX-License-Identifier: GPL-2.0+ */
 +/*
 + * (C) Copyright 2020 Aditya Prayoga <aditya@kobol.io>
@@ -2209,8 +2209,6 @@ index 00000000..6fca9a6b
 +
 +	#define CONFIG_SYS_SCSI_MAX_SCSI_ID     5
 +	#define CONFIG_SYS_SCSI_MAX_LUN         1
-+	#define CONFIG_SYS_SCSI_MAX_DEVICE      (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
-+						CONFIG_SYS_SCSI_MAX_LUN)
 +
 +	#define BOOT_TARGET_SCSI(func) \
 +	    func(SCSI, scsi, 0)
diff --git a/patch/u-boot/u-boot-rockchip64/general-support-recovery-button.patch b/patch/u-boot/u-boot-rockchip64/general-support-recovery-button.patch
index 4916885c7d..117cf79a3d 100644
--- a/patch/u-boot/u-boot-rockchip64/general-support-recovery-button.patch
+++ b/patch/u-boot/u-boot-rockchip64/general-support-recovery-button.patch
@@ -53,17 +53,18 @@ diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mo
 index 21589341..c4dcb15e 100644
 --- a/arch/arm/mach-rockchip/boot_mode.c
 +++ b/arch/arm/mach-rockchip/boot_mode.c
-@@ -8,6 +8,9 @@
+@@ -8,6 +8,10 @@
  #include <command.h>
  #include <env.h>
 +#include <led.h>
  #include <log.h>
++#include <cli.h>
 +#include <mmc.h>
 +#include <linux/delay.h>
  #include <asm/io.h>
  #include <asm/arch-rockchip/boot_mode.h>
  #include <dm/device.h>
-@@ -70,13 +71,158 @@ __weak int rockchip_dnl_key_pressed(void)
+@@ -70,13 +71,157 @@ __weak int rockchip_dnl_key_pressed(void)
  		return false;
  }
  
@@ -161,11 +162,10 @@ index 21589341..c4dcb15e 100644
  {
 +#if defined(CONFIG_ROCKCHIP_ADVANCED_RECOVERY)
 +	int mmc_device = 0;
-+	int ret = 0;
 +	char cmd[32];
 +
 +	if (!rockchip_dnl_key_pressed()) {
-+		return 0;
++		return;
 +	}
 +
 +	if (rockchip_has_mmc_device(0)) {
@@ -174,7 +174,7 @@ index 21589341..c4dcb15e 100644
 +		mmc_device = 1;
 +	} else {
 +		printf("no mmc device suitable for download mode!\n");
-+		return 0;
++		return;
 +	}
 +
 +	printf("using mmc%d device for download mode\n", mmc_device);