summaryrefslogtreecommitdiff
path: root/include/spl.h
diff options
context:
space:
mode:
authorStefano Babic <[email protected]>2017-05-09 18:03:44 +0200
committerStefano Babic <[email protected]>2017-05-09 18:03:44 +0200
commit4f66e09bb9fbc47b73f67c3cc08ee2663e8fcdb1 (patch)
tree89bc85aa5a8ca9b60027cdd2f1a40fc83f6278c4 /include/spl.h
parent809b133722eee0e7bdfa6595daabc0bb2f5aa698 (diff)
parent85ea850976daea57c8045f3569566fad5ce9fe0f (diff)
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <[email protected]>
Diffstat (limited to 'include/spl.h')
-rw-r--r--include/spl.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/spl.h b/include/spl.h
index 2e5b885c8d6..d1638e9d7cb 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -27,6 +27,7 @@ struct spl_image_info {
ulong entry_point;
u32 size;
u32 flags;
+ void *arg;
};
/*
@@ -106,10 +107,8 @@ int spl_board_ubi_load_image(u32 boot_device);
* This jumps into a Linux kernel using the information in @spl_image.
*
* @spl_image: Image description to set up
- * @arg: Argument to pass to Linux (typically a device tree pointer)
*/
-void __noreturn jump_to_image_linux(struct spl_image_info *spl_image,
- void *arg);
+void __noreturn jump_to_image_linux(struct spl_image_info *spl_image);
/**
* spl_start_uboot() - Check if SPL should start the kernel or U-Boot