diff mbox

[U-Boot,v3,1/2] Convert CONFIG_SPL_RAM_DEVICE to defconfig

Message ID 20161223065153.13177-1-stefan@agner.ch
State Accepted
Commit f417d40fe2f0663c5e98b1e123f6fb982b424450
Delegated to: Tom Rini
Headers show

Commit Message

Stefan Agner Dec. 23, 2016, 6:51 a.m. UTC 
From: Stefan Agner <stefan.agner@toradex.com>

This converts the following to Kconfig:
  CONFIG_SPL_RAM_DEVICE

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
---

Changes in v3: None
Changes in v2: None

 common/spl/Kconfig                   | 9 +++++++++
 include/configs/microblaze-generic.h | 1 -
 include/configs/socfpga_common.h     | 1 -
 include/configs/tegra-common.h       | 1 -
 include/configs/xilinx_zynqmp.h      | 1 -
 include/configs/zynq-common.h        | 1 -
 6 files changed, 9 insertions(+), 5 deletions(-)

Comments

Stefan Agner Jan. 14, 2017, 9:14 p.m. UTC | #1 
Hi Tom,

I think this did not get applied yet?

--
Stefan

On 2016-12-22 22:51, Stefan Agner wrote:
> From: Stefan Agner <stefan.agner@toradex.com>
> 
> This converts the following to Kconfig:
>   CONFIG_SPL_RAM_DEVICE
> 
> Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
> ---
> 
> Changes in v3: None
> Changes in v2: None
> 
>  common/spl/Kconfig                   | 9 +++++++++
>  include/configs/microblaze-generic.h | 1 -
>  include/configs/socfpga_common.h     | 1 -
>  include/configs/tegra-common.h       | 1 -
>  include/configs/xilinx_zynqmp.h      | 1 -
>  include/configs/zynq-common.h        | 1 -
>  6 files changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/common/spl/Kconfig b/common/spl/Kconfig
> index cba51f5df6..ea084f462b 100644
> --- a/common/spl/Kconfig
> +++ b/common/spl/Kconfig
> @@ -449,6 +449,15 @@ config SPL_POWER_SUPPORT
>  	  in drivers/power, drivers/power/pmic and drivers/power/regulator
>  	  as part of an SPL build.
>  
> +config SPL_RAM_DEVICE
> +	bool "Support booting from preloaded image in RAM"
> +	depends on SPL
> +	default y if MICROBLAZE || ARCH_SOCFPGA || TEGRA || ARCH_ZYNQ
> +	help
> +	  Enable booting of an image already loaded in RAM. The image has to
> +	  be already in memory when SPL takes over, e.g. loaded by the boot
> +	  ROM.
> +
>  config SPL_SATA_SUPPORT
>  	bool "Support loading from SATA"
>  	depends on SPL
> diff --git a/include/configs/microblaze-generic.h
> b/include/configs/microblaze-generic.h
> index 7abffdb2ef..cc90b73fa1 100644
> --- a/include/configs/microblaze-generic.h
> +++ b/include/configs/microblaze-generic.h
> @@ -284,7 +284,6 @@
>  
>  #define CONFIG_SPL_LDSCRIPT	"arch/microblaze/cpu/u-boot-spl.lds"
>  
> -#define CONFIG_SPL_RAM_DEVICE
>  #ifdef CONFIG_SYS_FLASH_BASE
>  # define CONFIG_SYS_UBOOT_BASE		CONFIG_SYS_FLASH_BASE
>  #endif
> diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
> index 58a6550844..7292469433 100644
> --- a/include/configs/socfpga_common.h
> +++ b/include/configs/socfpga_common.h
> @@ -309,7 +309,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
>   * 0xFFFF_FF00 ...... End of SRAM
>   */
>  #define CONFIG_SPL_FRAMEWORK
> -#define CONFIG_SPL_RAM_DEVICE
>  #define CONFIG_SPL_TEXT_BASE		CONFIG_SYS_INIT_RAM_ADDR
>  #define CONFIG_SPL_MAX_SIZE		(64 * 1024)
>  
> diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
> index 23a0e782e0..f30fec84a2 100644
> --- a/include/configs/tegra-common.h
> +++ b/include/configs/tegra-common.h
> @@ -98,7 +98,6 @@
>  
>  /* Defines for SPL */
>  #define CONFIG_SPL_FRAMEWORK
> -#define CONFIG_SPL_RAM_DEVICE
>  #define CONFIG_SPL_BOARD_INIT
>  #define CONFIG_SPL_NAND_SIMPLE
>  #define CONFIG_SPL_MAX_FOOTPRINT	(CONFIG_SYS_TEXT_BASE - \
> diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
> index fb4f6d6806..8845ff425d 100644
> --- a/include/configs/xilinx_zynqmp.h
> +++ b/include/configs/xilinx_zynqmp.h
> @@ -260,7 +260,6 @@
>  
>  #define CONFIG_SPL_FRAMEWORK
>  #define CONFIG_SPL_BOARD_INIT
> -#define CONFIG_SPL_RAM_DEVICE
>  
>  /* u-boot is like dtb */
>  #define CONFIG_SPL_FS_LOAD_ARGS_NAME	"u-boot.bin"
> diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
> index 953e7311a6..e04be5c18c 100644
> --- a/include/configs/zynq-common.h
> +++ b/include/configs/zynq-common.h
> @@ -296,7 +296,6 @@
>  #define CONFIG_CMD_SPL
>  #define CONFIG_SPL_FRAMEWORK
>  #define CONFIG_SPL_BOARD_INIT
> -#define CONFIG_SPL_RAM_DEVICE
>  
>  #define CONFIG_SPL_LDSCRIPT	"arch/arm/mach-zynq/u-boot-spl.lds"
Tom Rini Jan. 14, 2017, 9:48 p.m. UTC | #2 
On Sat, Jan 14, 2017 at 01:14:42PM -0800, Stefan Agner wrote:

> Hi Tom,
> 
> I think this did not get applied yet?

Thanks for the reminder, testing this now.

> 
> --
> Stefan
> 
> On 2016-12-22 22:51, Stefan Agner wrote:
> > From: Stefan Agner <stefan.agner@toradex.com>
> > 
> > This converts the following to Kconfig:
> >   CONFIG_SPL_RAM_DEVICE
> > 
> > Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
> > ---
> > 
> > Changes in v3: None
> > Changes in v2: None
> > 
> >  common/spl/Kconfig                   | 9 +++++++++
> >  include/configs/microblaze-generic.h | 1 -
> >  include/configs/socfpga_common.h     | 1 -
> >  include/configs/tegra-common.h       | 1 -
> >  include/configs/xilinx_zynqmp.h      | 1 -
> >  include/configs/zynq-common.h        | 1 -
> >  6 files changed, 9 insertions(+), 5 deletions(-)
> > 
> > diff --git a/common/spl/Kconfig b/common/spl/Kconfig
> > index cba51f5df6..ea084f462b 100644
> > --- a/common/spl/Kconfig
> > +++ b/common/spl/Kconfig
> > @@ -449,6 +449,15 @@ config SPL_POWER_SUPPORT
> >  	  in drivers/power, drivers/power/pmic and drivers/power/regulator
> >  	  as part of an SPL build.
> >  
> > +config SPL_RAM_DEVICE
> > +	bool "Support booting from preloaded image in RAM"
> > +	depends on SPL
> > +	default y if MICROBLAZE || ARCH_SOCFPGA || TEGRA || ARCH_ZYNQ
> > +	help
> > +	  Enable booting of an image already loaded in RAM. The image has to
> > +	  be already in memory when SPL takes over, e.g. loaded by the boot
> > +	  ROM.
> > +
> >  config SPL_SATA_SUPPORT
> >  	bool "Support loading from SATA"
> >  	depends on SPL
> > diff --git a/include/configs/microblaze-generic.h
> > b/include/configs/microblaze-generic.h
> > index 7abffdb2ef..cc90b73fa1 100644
> > --- a/include/configs/microblaze-generic.h
> > +++ b/include/configs/microblaze-generic.h
> > @@ -284,7 +284,6 @@
> >  
> >  #define CONFIG_SPL_LDSCRIPT	"arch/microblaze/cpu/u-boot-spl.lds"
> >  
> > -#define CONFIG_SPL_RAM_DEVICE
> >  #ifdef CONFIG_SYS_FLASH_BASE
> >  # define CONFIG_SYS_UBOOT_BASE		CONFIG_SYS_FLASH_BASE
> >  #endif
> > diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
> > index 58a6550844..7292469433 100644
> > --- a/include/configs/socfpga_common.h
> > +++ b/include/configs/socfpga_common.h
> > @@ -309,7 +309,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
> >   * 0xFFFF_FF00 ...... End of SRAM
> >   */
> >  #define CONFIG_SPL_FRAMEWORK
> > -#define CONFIG_SPL_RAM_DEVICE
> >  #define CONFIG_SPL_TEXT_BASE		CONFIG_SYS_INIT_RAM_ADDR
> >  #define CONFIG_SPL_MAX_SIZE		(64 * 1024)
> >  
> > diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
> > index 23a0e782e0..f30fec84a2 100644
> > --- a/include/configs/tegra-common.h
> > +++ b/include/configs/tegra-common.h
> > @@ -98,7 +98,6 @@
> >  
> >  /* Defines for SPL */
> >  #define CONFIG_SPL_FRAMEWORK
> > -#define CONFIG_SPL_RAM_DEVICE
> >  #define CONFIG_SPL_BOARD_INIT
> >  #define CONFIG_SPL_NAND_SIMPLE
> >  #define CONFIG_SPL_MAX_FOOTPRINT	(CONFIG_SYS_TEXT_BASE - \
> > diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
> > index fb4f6d6806..8845ff425d 100644
> > --- a/include/configs/xilinx_zynqmp.h
> > +++ b/include/configs/xilinx_zynqmp.h
> > @@ -260,7 +260,6 @@
> >  
> >  #define CONFIG_SPL_FRAMEWORK
> >  #define CONFIG_SPL_BOARD_INIT
> > -#define CONFIG_SPL_RAM_DEVICE
> >  
> >  /* u-boot is like dtb */
> >  #define CONFIG_SPL_FS_LOAD_ARGS_NAME	"u-boot.bin"
> > diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
> > index 953e7311a6..e04be5c18c 100644
> > --- a/include/configs/zynq-common.h
> > +++ b/include/configs/zynq-common.h
> > @@ -296,7 +296,6 @@
> >  #define CONFIG_CMD_SPL
> >  #define CONFIG_SPL_FRAMEWORK
> >  #define CONFIG_SPL_BOARD_INIT
> > -#define CONFIG_SPL_RAM_DEVICE
> >  
> >  #define CONFIG_SPL_LDSCRIPT	"arch/arm/mach-zynq/u-boot-spl.lds"
Tom Rini Jan. 15, 2017, 6:29 p.m. UTC | #3 
On Fri, Dec 23, 2016 at 07:51:52AM +0100, Stefan Agner wrote:

> From: Stefan Agner <stefan.agner@toradex.com>
> 
> This converts the following to Kconfig:
>   CONFIG_SPL_RAM_DEVICE
> 
> Signed-off-by: Stefan Agner <stefan.agner@toradex.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index cba51f5df6..ea084f462b 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -449,6 +449,15 @@  config SPL_POWER_SUPPORT
 	  in drivers/power, drivers/power/pmic and drivers/power/regulator
 	  as part of an SPL build.
 
+config SPL_RAM_DEVICE
+	bool "Support booting from preloaded image in RAM"
+	depends on SPL
+	default y if MICROBLAZE || ARCH_SOCFPGA || TEGRA || ARCH_ZYNQ
+	help
+	  Enable booting of an image already loaded in RAM. The image has to
+	  be already in memory when SPL takes over, e.g. loaded by the boot
+	  ROM.
+
 config SPL_SATA_SUPPORT
 	bool "Support loading from SATA"
 	depends on SPL
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 7abffdb2ef..cc90b73fa1 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -284,7 +284,6 @@ 
 
 #define CONFIG_SPL_LDSCRIPT	"arch/microblaze/cpu/u-boot-spl.lds"
 
-#define CONFIG_SPL_RAM_DEVICE
 #ifdef CONFIG_SYS_FLASH_BASE
 # define CONFIG_SYS_UBOOT_BASE		CONFIG_SYS_FLASH_BASE
 #endif
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 58a6550844..7292469433 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -309,7 +309,6 @@  unsigned int cm_get_qspi_controller_clk_hz(void);
  * 0xFFFF_FF00 ...... End of SRAM
  */
 #define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_RAM_DEVICE
 #define CONFIG_SPL_TEXT_BASE		CONFIG_SYS_INIT_RAM_ADDR
 #define CONFIG_SPL_MAX_SIZE		(64 * 1024)
 
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 23a0e782e0..f30fec84a2 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -98,7 +98,6 @@ 
 
 /* Defines for SPL */
 #define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_RAM_DEVICE
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SIMPLE
 #define CONFIG_SPL_MAX_FOOTPRINT	(CONFIG_SYS_TEXT_BASE - \
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index fb4f6d6806..8845ff425d 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -260,7 +260,6 @@ 
 
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
-#define CONFIG_SPL_RAM_DEVICE
 
 /* u-boot is like dtb */
 #define CONFIG_SPL_FS_LOAD_ARGS_NAME	"u-boot.bin"
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 953e7311a6..e04be5c18c 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -296,7 +296,6 @@ 
 #define CONFIG_CMD_SPL
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
-#define CONFIG_SPL_RAM_DEVICE
 
 #define CONFIG_SPL_LDSCRIPT	"arch/arm/mach-zynq/u-boot-spl.lds"