summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-11-21 10:58:51 -0800
committerTom Rini <trini@konsulko.com>2016-11-28 19:49:49 -0500
commit34ee947ac3be7a79b89fa8bb690379651cc9598a (patch)
tree95fe6809915649536a3e386dfea83f67b5ce3389
parent41987784679955c23417b16b8d2b6a35134dc021 (diff)
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>
-rw-r--r--common/spl/spl.c2
1 files changed, 2 insertions, 0 deletions
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