[U-Boot] [PATCH 06/38] spl: Correct priority selection for image loaders

Simon Glass sjg at chromium.org
Mon Aug 26 15:59:11 UTC 2019


At present the name of the image comes first in the linker-list symbol
used. This means that the name of the function sets the sort order, which
is not the intention.

Update it to put the board device type first, then the priority. This
produces the expected behaviour.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 include/spl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/spl.h b/include/spl.h
index a90f971a23..d446198e07 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -254,14 +254,14 @@ struct spl_image_loader {
  */
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
 #define SPL_LOAD_IMAGE_METHOD(_name, _priority, _boot_device, _method) \
-	SPL_LOAD_IMAGE(_method ## _priority ## _boot_device) = { \
+	SPL_LOAD_IMAGE(_boot_device ## _priority ## _method) = { \
 		.name = _name, \
 		.boot_device = _boot_device, \
 		.load_image = _method, \
 	}
 #else
 #define SPL_LOAD_IMAGE_METHOD(_name, _priority, _boot_device, _method) \
-	SPL_LOAD_IMAGE(_method ## _priority ## _boot_device) = { \
+	SPL_LOAD_IMAGE(_boot_device ## _priority ## _method) = { \
 		.boot_device = _boot_device, \
 		.load_image = _method, \
 	}
-- 
2.23.0.187.g17f5b7556c-goog



More information about the U-Boot mailing list