dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 17:22:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

spl: Correct priority selection for image loaders

Browse Source 
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 boot-device type first, then the priority. This
produces the expected behaviour.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass
2019-10-20 21:31:45 -06:00
committed by Bin Meng
parent 211193dc5c
commit e1500a6ce2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/spl.h
View File

@@ -332,14 +332,14 @@ struct spl_image_loader {
*/ */
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
#define SPL_LOAD_IMAGE_METHOD(_name, _priority, _boot_device, _method) \ #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, \ .name = _name, \
.boot_device = _boot_device, \ .boot_device = _boot_device, \
.load_image = _method, \ .load_image = _method, \
} }
#else #else
#define SPL_LOAD_IMAGE_METHOD(_name, _priority, _boot_device, _method) \ #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, \ .boot_device = _boot_device, \
.load_image = _method, \ .load_image = _method, \
} }