diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-12-23 06:51:52 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-14 21:46:26 (GMT) |
| commit | f417d40fe2f0663c5e98b1e123f6fb982b424450 (patch) | |
| tree | 55e27578f7ead2594fe17dec641999984b711333 | |
| parent | 4ac19bae2d1914b1612c720c71442f77aff331de (diff) | |
| download | u-boot-fsl-qoriq-f417d40fe2f0663c5e98b1e123f6fb982b424450.tar.xz | |
Convert CONFIG_SPL_RAM_DEVICE to defconfig
This converts the following to Kconfig:
CONFIG_SPL_RAM_DEVICE
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
| -rw-r--r-- | common/spl/Kconfig | 9 | ||||
| -rw-r--r-- | include/configs/microblaze-generic.h | 1 | ||||
| -rw-r--r-- | include/configs/socfpga_common.h | 1 | ||||
| -rw-r--r-- | include/configs/tegra-common.h | 1 | ||||
| -rw-r--r-- | include/configs/xilinx_zynqmp.h | 1 | ||||
| -rw-r--r-- | include/configs/zynq-common.h | 1 |
6 files changed, 9 insertions, 5 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index cba51f5..ea084f4 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 36b0a0e..643413f 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -283,7 +283,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 7de9d86..6285266 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -306,7 +306,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 23a0e78..f30fec8 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 ea4761c..bb749c5 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -288,7 +288,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 fd74e80..36dc140 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -290,7 +290,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" |