From: Stefan Agner <stefan.agner@toradex.com>
Date: Mon, 21 Nov 2016 18:58:51 +0000 (-0800)
Subject: spl: add RAM boot device only if it is actually defined
X-Git-Tag: v2017.01-rc1~177
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=34ee947ac3be7a79b89fa8bb690379651cc9598a;p=oweals%2Fu-boot.git

spl: add RAM boot device only if it is actually defined

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 <stefan.agner@toradex.com>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
---

diff --git a/common/spl/spl.c b/common/spl/spl.c
index bdb165ac28..32b9f1e95c 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