diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-03 19:28:54 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-03 19:28:54 -0500 |
| commit | ee93ef0c4b272c57c08038655ff0259fdd2c4126 (patch) | |
| tree | 8794b7d6bed8385811bac310d0ca35e6049b7e10 /include/spl.h | |
| parent | 9c17ad33fe3ec5ca9ce039db13ccf2e66d74d23b (diff) | |
| parent | 73c6cd6c0bdb3af76d573f619bbcc141758bb16b (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Add support for Intel FSP-S and FSP-T in binman
- Correct priority selection for image loaders for SPL
- Add a size check for TPL
- Various small SPL/TPL bug fixes and changes
- SPI: Add support for memory-mapped flash
Diffstat (limited to 'include/spl.h')
| -rw-r--r-- | include/spl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/spl.h b/include/spl.h index b5387ef273d..08ffddac29f 100644 --- a/include/spl.h +++ b/include/spl.h @@ -332,14 +332,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, \ } |