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@chromium.org ---
Changes in v2: None
include/spl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/spl.h b/include/spl.h index e4640f3830b..4bc35cb0e77 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, \ }