projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mmc-6-23' of https://github.com/MrVan/u-boot
[oweals/u-boot.git]
/
common
/
spl
/
spl_ram.c
diff --git
a/common/spl/spl_ram.c
b/common/spl/spl_ram.c
index 619b39a537485f79fd3527ee243a2b312c5b3ab7..954e91a0045cacf0d287acedb5add9549133ff87 100644
(file)
--- a/
common/spl/spl_ram.c
+++ b/
common/spl/spl_ram.c
@@
-35,7
+35,7
@@
static int spl_ram_load_image(struct spl_image_info *spl_image,
header = (struct image_header *)CONFIG_SPL_LOAD_FIT_ADDRESS;
header = (struct image_header *)CONFIG_SPL_LOAD_FIT_ADDRESS;
-#if CONFIG_IS_ENABLED(DFU
_SUPPORT
)
+#if CONFIG_IS_ENABLED(DFU)
if (bootdev->boot_device == BOOT_DEVICE_DFU)
spl_dfu_cmd(0, "dfu_alt_info_ram", "ram", "0");
#endif
if (bootdev->boot_device == BOOT_DEVICE_DFU)
spl_dfu_cmd(0, "dfu_alt_info_ram", "ram", "0");
#endif
@@
-63,9
+63,8
@@
static int spl_ram_load_image(struct spl_image_info *spl_image,
* No binman support or no information. For now, fix it
* to the address pointed to by U-Boot.
*/
* No binman support or no information. For now, fix it
* to the address pointed to by U-Boot.
*/
- header = spl_get_load_buffer(-sizeof(*header),
- sizeof(*header));
-
+ u_boot_pos = (ulong)spl_get_load_buffer(-sizeof(*header),
+ sizeof(*header));
}
header = (struct image_header *)map_sysmem(u_boot_pos, 0);
}
header = (struct image_header *)map_sysmem(u_boot_pos, 0);
@@
-77,7
+76,7
@@
static int spl_ram_load_image(struct spl_image_info *spl_image,
#if CONFIG_IS_ENABLED(RAM_DEVICE)
SPL_LOAD_IMAGE_METHOD("RAM", 0, BOOT_DEVICE_RAM, spl_ram_load_image);
#endif
#if CONFIG_IS_ENABLED(RAM_DEVICE)
SPL_LOAD_IMAGE_METHOD("RAM", 0, BOOT_DEVICE_RAM, spl_ram_load_image);
#endif
-#if CONFIG_IS_ENABLED(DFU
_SUPPORT
)
+#if CONFIG_IS_ENABLED(DFU)
SPL_LOAD_IMAGE_METHOD("DFU", 0, BOOT_DEVICE_DFU, spl_ram_load_image);
#endif
SPL_LOAD_IMAGE_METHOD("DFU", 0, BOOT_DEVICE_DFU, spl_ram_load_image);
#endif