From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Agner Date: Mon, 21 Nov 2016 10:58:51 -0800 Subject: [U-Boot] [PATCH v4 1/3] spl: add RAM boot device only if it is actually defined In-Reply-To: <20161121185853.11300-1-stefan@agner.ch> References: <20161121185853.11300-1-stefan@agner.ch> Message-ID: <20161121185853.11300-2-stefan@agner.ch> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Stefan Agner Some devices (e.g. dra7xx) support loading to RAM using DFU without having direct boot from RAM support. Make sure the linker list does not contain BOOT_DEVICE_RAM if CONFIG_SPL_RAM_DEVICE is not enabled. Fixes: 98136b2f26fa ("spl: Convert spl_ram_load_image() to use linker list") Signed-off-by: Stefan Agner Acked-by: Lukasz Majewski --- Changes in v4: - Use correct config CONFIG_SPL_RAM_DEVICE to descide whether to add BOOT_DEVICE_RAM to linker list. Changes in v3: None Changes in v2: - Use CONFIG_SPL_RAM_SUPPORT to descide whether to compile the function in first place. common/spl/spl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/spl/spl.c b/common/spl/spl.c index bdb165a..32b9f1e 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -220,7 +220,9 @@ static int spl_ram_load_image(struct spl_image_info *spl_image, return 0; } +#if defined(CONFIG_SPL_RAM_DEVICE) SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_RAM, spl_ram_load_image); +#endif #if defined(CONFIG_SPL_DFU_SUPPORT) SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_DFU, spl_ram_load_image); #endif -- 2.10.2