diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2019-01-29 13:44:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-29 13:44:10 +0000 |
| commit | 7d3884000d671ece18788791de875229f983f079 (patch) | |
| tree | c9accb3b616c3892a544fa8a3610e613b3762236 /plat/rpi3 | |
| parent | 5755a30b85e779e38685c6bffff55bf2f71264a5 (diff) | |
| parent | e77ccb657fe916e645a159e4af779a6fa4b47da2 (diff) | |
| download | platform_external_arm-trusted-firmware-7d3884000d671ece18788791de875229f983f079.tar.gz platform_external_arm-trusted-firmware-7d3884000d671ece18788791de875229f983f079.tar.bz2 platform_external_arm-trusted-firmware-7d3884000d671ece18788791de875229f983f079.zip | |
Merge pull request #1788 from laroche/rpi3_duplicate_initialization
rpi3: Remove duplicate initialization for BL32_IMAGE_ID and mark one more function as static.
Diffstat (limited to 'plat/rpi3')
| -rw-r--r-- | plat/rpi3/rpi3_io_storage.c | 5 | ||||
| -rw-r--r-- | plat/rpi3/rpi3_pm.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/plat/rpi3/rpi3_io_storage.c b/plat/rpi3/rpi3_io_storage.c index 7e66deb72..49c6a760c 100644 --- a/plat/rpi3/rpi3_io_storage.c +++ b/plat/rpi3/rpi3_io_storage.c @@ -133,11 +133,6 @@ static const struct plat_io_policy policies[] = { (uintptr_t)&bl32_uuid_spec, open_fip }, - [BL32_IMAGE_ID] = { - &fip_dev_handle, - (uintptr_t)&bl32_uuid_spec, - open_fip - }, [BL32_EXTRA1_IMAGE_ID] = { &fip_dev_handle, (uintptr_t)&bl32_extra1_uuid_spec, diff --git a/plat/rpi3/rpi3_pm.c b/plat/rpi3/rpi3_pm.c index 3a077d37a..4f586b514 100644 --- a/plat/rpi3/rpi3_pm.c +++ b/plat/rpi3/rpi3_pm.c @@ -140,7 +140,7 @@ static int rpi3_pwr_domain_on(u_register_t mpidr) * being turned off earlier. The target_state encodes the low power state that * each level has woken up from. ******************************************************************************/ -void rpi3_pwr_domain_on_finish(const psci_power_state_t *target_state) +static void rpi3_pwr_domain_on_finish(const psci_power_state_t *target_state) { assert(target_state->pwr_domain_state[MPIDR_AFFLVL0] == PLAT_LOCAL_STATE_OFF); |