| Message ID | 1505330989-25602-4-git-send-email-philipp.tomsich@theobroma-systems.com |
|---|---|
| State | Accepted |
| Commit | f2efe6786eeaa2305353a01056ffef55ae520b7d |
| Delegated to: | Philipp Tomsich |
| Headers | show |
| Series | [U-Boot,01/15] image: add IH_OS_ARM_TRUSTED_FIRMWARE for ARM Trusted Firmware | expand |
On 13 September 2017 at 13:29, Philipp Tomsich <philipp.tomsich@theobroma-systems.com> wrote: > Mainly a stylistic change: convert the load_addr and entry_point > fields of struct spl_image_info to uintptr_t (from ulong). > > Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > --- > > include/spl.h | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org> I am a bit nervous though since we use ulong everywhere in U-Boot for addresses.
> Mainly a stylistic change: convert the load_addr and entry_point > fields of struct spl_image_info to uintptr_t (from ulong). > > Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > --- > > include/spl.h | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > Applied to u-boot-rockchip, thanks!
diff --git a/include/spl.h b/include/spl.h index acbc47a..19e64e3 100644 --- a/include/spl.h +++ b/include/spl.h @@ -23,8 +23,8 @@ struct spl_image_info { const char *name; u8 os; - ulong load_addr; - ulong entry_point; + uintptr_t load_addr; + uintptr_t entry_point; #if CONFIG_IS_ENABLED(LOAD_FIT) void *fdt_addr; #endif @@ -270,7 +270,10 @@ int spl_dfu_cmd(int usbctrl, char *dfu_alt_info, char *interface, char *devstr); int spl_mmc_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev); -void bl31_entry(void); +/** + * spl_invoke_atf - boot using an ARM trusted firmware image + */ +void spl_invoke_atf(struct spl_image_info *spl_image); /** * board_return_to_bootrom - allow for boards to continue with the boot ROM
Mainly a stylistic change: convert the load_addr and entry_point fields of struct spl_image_info to uintptr_t (from ulong). Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> --- include/spl.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)