diff options
| author | danh-arm <dan.handley@arm.com> | 2015-12-15 16:12:10 +0000 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2015-12-15 16:12:10 +0000 |
| commit | 9831154f55849e4529a29283754ee869e154a07a (patch) | |
| tree | 3b1a2800607a79e479fffb417d513b5128411e7c /bl1 | |
| parent | e551c5bf4286e06b4ea299c997f2c532583594ad (diff) | |
| parent | 1f37b9442fa47af519eabd2f5b67fdaeb1ddfa64 (diff) | |
Merge pull request #470 from danh-arm/dh/fwu-done-fixv1.2-rc0
FWU: Pass client cookie to FWU_SMC_UPDATE_DONE
Diffstat (limited to 'bl1')
| -rw-r--r-- | bl1/bl1_fwu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bl1/bl1_fwu.c b/bl1/bl1_fwu.c index 9e7dd82a..80ce831a 100644 --- a/bl1/bl1_fwu.c +++ b/bl1/bl1_fwu.c @@ -63,7 +63,7 @@ static register_t bl1_fwu_image_resume(register_t image_param, unsigned int flags); static int bl1_fwu_sec_image_done(void **handle, unsigned int flags); -__dead2 static void bl1_fwu_done(void *cookie, void *reserved); +__dead2 static void bl1_fwu_done(void *client_cookie, void *reserved); /* * This keeps track of last executed secure image id. @@ -100,7 +100,7 @@ register_t bl1_fwu_smc_handler(unsigned int smc_fid, SMC_RET1(handle, bl1_fwu_sec_image_done(&handle, flags)); case FWU_SMC_UPDATE_DONE: - bl1_fwu_done(cookie, NULL); + bl1_fwu_done((void *)x1, NULL); /* We should never return from bl1_fwu_done() */ default: @@ -495,13 +495,13 @@ static int bl1_fwu_sec_image_done(void **handle, unsigned int flags) * This function provides the opportunity for users to perform any * platform specific handling after the Firmware update is done. ******************************************************************************/ -__dead2 static void bl1_fwu_done(void *cookie, void *reserved) +__dead2 static void bl1_fwu_done(void *client_cookie, void *reserved) { NOTICE("BL1-FWU: *******FWU Process Completed*******\n"); /* * Call platform done function. */ - bl1_plat_fwu_done(cookie, reserved); + bl1_plat_fwu_done(client_cookie, reserved); assert(0); } |