[PATCH v2] spl: ram: hide SPL_RAM_SUPPORT

[PATCH v2] spl: ram: hide SPL_RAM_SUPPORT

[Jerome Forissier]

Make SPL_RAM_SUPPORT a hidden Kconfig symbol, automatically selected
by SPL_RAM_DEVICE or SPL_DFU. Avoids the situation where SPL_RAM_SUPPORT
may be enabled without the other two being enabled, which results in the
following build warning:

common/spl/spl_ram.c:19:14: warning: ‘spl_ram_load_read’ defined but not used [-Wunused-function]
   19 | static ulong spl_ram_load_read(struct spl_load_info *load, ulong sector,
      |              ^~~~~~~~~~~~~~~~~

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
---
 common/spl/Kconfig         | 8 ++------
 drivers/usb/gadget/Kconfig | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index c08ff064493..885a012461c 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1238,15 +1238,11 @@ config SPL_POWER_DOMAIN
 	  the drivers in drivers/power/domain as part of a SPL build.
 
 config SPL_RAM_SUPPORT
-	bool "Support booting from RAM"
-	default y if MICROBLAZE || ARCH_SOCFPGA || ARCH_TEGRA || ARCH_ZYNQ
-	help
-	  Enable booting of an image in RAM. The image can be preloaded or
-	  it can be loaded by SPL directly into RAM (e.g. using USB).
+	bool
 
 config SPL_RAM_DEVICE
 	bool "Support booting from preloaded image in RAM"
-	depends on SPL_RAM_SUPPORT
+	select SPL_RAM_SUPPORT
 	default y if MICROBLAZE || ARCH_SOCFPGA || ARCH_TEGRA || ARCH_ZYNQ
 	help
 	  Enable booting of an image already loaded in RAM. The image has to
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 4621a6fd5e6..b1247a9eeae 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -323,7 +323,7 @@ config SPL_DFU
 	bool "Support DFU (Device Firmware Upgrade) in SPL"
 	select SPL_HASH
 	select SPL_DFU_NO_RESET
-	depends on SPL_RAM_SUPPORT
+	select SPL_RAM_SUPPORT
 	help
 	  This feature enables the DFU (Device Firmware Upgrade) in SPL with
 	  RAM memory device support. The ROM code will load and execute
-- 
2.40.1

Re: [PATCH v2] spl: ram: hide SPL_RAM_SUPPORT

[Sean Anderson]

On 9/10/24 09:00, Jerome Forissier wrote:
> Make SPL_RAM_SUPPORT a hidden Kconfig symbol, automatically selected
> by SPL_RAM_DEVICE or SPL_DFU. Avoids the situation where SPL_RAM_SUPPORT
> may be enabled without the other two being enabled, which results in the
> following build warning:
> 
> common/spl/spl_ram.c:19:14: warning: ‘spl_ram_load_read’ defined but not used [-Wunused-function]
>     19 | static ulong spl_ram_load_read(struct spl_load_info *load, ulong sector,
>        |              ^~~~~~~~~~~~~~~~~
> 
> Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
> ---
>   common/spl/Kconfig         | 8 ++------
>   drivers/usb/gadget/Kconfig | 2 +-
>   2 files changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/common/spl/Kconfig b/common/spl/Kconfig
> index c08ff064493..885a012461c 100644
> --- a/common/spl/Kconfig
> +++ b/common/spl/Kconfig
> @@ -1238,15 +1238,11 @@ config SPL_POWER_DOMAIN
>   	  the drivers in drivers/power/domain as part of a SPL build.
>   
>   config SPL_RAM_SUPPORT
> -	bool "Support booting from RAM"
> -	default y if MICROBLAZE || ARCH_SOCFPGA || ARCH_TEGRA || ARCH_ZYNQ
> -	help
> -	  Enable booting of an image in RAM. The image can be preloaded or
> -	  it can be loaded by SPL directly into RAM (e.g. using USB).
> +	bool
>   
>   config SPL_RAM_DEVICE
>   	bool "Support booting from preloaded image in RAM"
> -	depends on SPL_RAM_SUPPORT
> +	select SPL_RAM_SUPPORT
>   	default y if MICROBLAZE || ARCH_SOCFPGA || ARCH_TEGRA || ARCH_ZYNQ
>   	help
>   	  Enable booting of an image already loaded in RAM. The image has to
> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
> index 4621a6fd5e6..b1247a9eeae 100644
> --- a/drivers/usb/gadget/Kconfig
> +++ b/drivers/usb/gadget/Kconfig
> @@ -323,7 +323,7 @@ config SPL_DFU
>   	bool "Support DFU (Device Firmware Upgrade) in SPL"
>   	select SPL_HASH
>   	select SPL_DFU_NO_RESET
> -	depends on SPL_RAM_SUPPORT
> +	select SPL_RAM_SUPPORT
>   	help
>   	  This feature enables the DFU (Device Firmware Upgrade) in SPL with
>   	  RAM memory device support. The ROM code will load and execute

Reviewed-by: Sean Anderson <seanga2@gmail.com>

Re: [PATCH v2] spl: ram: hide SPL_RAM_SUPPORT

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 683 bytes --]

On Tue, Sep 10, 2024 at 03:00:18PM +0200, Jerome Forissier wrote:

> Make SPL_RAM_SUPPORT a hidden Kconfig symbol, automatically selected
> by SPL_RAM_DEVICE or SPL_DFU. Avoids the situation where SPL_RAM_SUPPORT
> may be enabled without the other two being enabled, which results in the
> following build warning:
> 
> common/spl/spl_ram.c:19:14: warning: ‘spl_ram_load_read’ defined but not used [-Wunused-function]
>    19 | static ulong spl_ram_load_read(struct spl_load_info *load, ulong sector,
>       |              ^~~~~~~~~~~~~~~~~
> 
> Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>

Reviewed-by: Tom Rini <trini@konsulko.com>

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH v2] spl: ram: hide SPL_RAM_SUPPORT

[Mattijs Korpershoek]

Hi Jerome,

Thank you for the patch.

On mar., sept. 10, 2024 at 15:00, Jerome Forissier <jerome.forissier@linaro.org> wrote:

> Make SPL_RAM_SUPPORT a hidden Kconfig symbol, automatically selected
> by SPL_RAM_DEVICE or SPL_DFU. Avoids the situation where SPL_RAM_SUPPORT
> may be enabled without the other two being enabled, which results in the
> following build warning:
>
> common/spl/spl_ram.c:19:14: warning: ‘spl_ram_load_read’ defined but not used [-Wunused-function]
>    19 | static ulong spl_ram_load_read(struct spl_load_info *load, ulong sector,
>       |              ^~~~~~~~~~~~~~~~~
>
> Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>

Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

> ---
>  common/spl/Kconfig         | 8 ++------
>  drivers/usb/gadget/Kconfig | 2 +-
>  2 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/common/spl/Kconfig b/common/spl/Kconfig
> index c08ff064493..885a012461c 100644
> --- a/common/spl/Kconfig
> +++ b/common/spl/Kconfig
> @@ -1238,15 +1238,11 @@ config SPL_POWER_DOMAIN
>  	  the drivers in drivers/power/domain as part of a SPL build.
>  
>  config SPL_RAM_SUPPORT
> -	bool "Support booting from RAM"
> -	default y if MICROBLAZE || ARCH_SOCFPGA || ARCH_TEGRA || ARCH_ZYNQ
> -	help
> -	  Enable booting of an image in RAM. The image can be preloaded or
> -	  it can be loaded by SPL directly into RAM (e.g. using USB).
> +	bool
>  
>  config SPL_RAM_DEVICE
>  	bool "Support booting from preloaded image in RAM"
> -	depends on SPL_RAM_SUPPORT
> +	select SPL_RAM_SUPPORT
>  	default y if MICROBLAZE || ARCH_SOCFPGA || ARCH_TEGRA || ARCH_ZYNQ
>  	help
>  	  Enable booting of an image already loaded in RAM. The image has to
> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
> index 4621a6fd5e6..b1247a9eeae 100644
> --- a/drivers/usb/gadget/Kconfig
> +++ b/drivers/usb/gadget/Kconfig
> @@ -323,7 +323,7 @@ config SPL_DFU
>  	bool "Support DFU (Device Firmware Upgrade) in SPL"
>  	select SPL_HASH
>  	select SPL_DFU_NO_RESET
> -	depends on SPL_RAM_SUPPORT
> +	select SPL_RAM_SUPPORT
>  	help
>  	  This feature enables the DFU (Device Firmware Upgrade) in SPL with
>  	  RAM memory device support. The ROM code will load and execute
> -- 
> 2.40.1

Re: [PATCH v2] spl: ram: hide SPL_RAM_SUPPORT

[Tom Rini]

On Tue, 10 Sep 2024 15:00:18 +0200, Jerome Forissier wrote:

> Make SPL_RAM_SUPPORT a hidden Kconfig symbol, automatically selected
> by SPL_RAM_DEVICE or SPL_DFU. Avoids the situation where SPL_RAM_SUPPORT
> may be enabled without the other two being enabled, which results in the
> following build warning:
> 
> common/spl/spl_ram.c:19:14: warning: ‘spl_ram_load_read’ defined but not used [-Wunused-function]
>    19 | static ulong spl_ram_load_read(struct spl_load_info *load, ulong sector,
>       |              ^~~~~~~~~~~~~~~~~
> 
> [...]

Applied to u-boot/next, thanks!

-- 
Tom