diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2016-11-09 15:20:38 +0000 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2016-11-10 09:51:25 +0000 |
| commit | cae734cd7479be6f63e3914cd837521cfabb9c4d (patch) | |
| tree | 688fab51f614f483ae7355ccdb9b99e998f18e0e /fwu | |
| parent | f0c152b614b077dccef94fdd5b752a7eec3900e9 (diff) | |
Isolate fwu-specific IO code
Added `plat_fwu_io_setup`, which is defined for arm platforms.
Added it to the documentation.
Renamed `arm_io_setup()` to `arm_fwu_io_setup()` and made it a weak
function. Removed the `plat_arm_io_setup()` associated to it because
this is not platform code and it's problematic for the actual
`plat_arm_io_setup()` that will be implemented in a following patch.
`plat_fwu_io_setup` calls `arm_fwu_io_storage` in ARM platforms.
Change-Id: Ibfb63139a6c0b0991ab70e935a3723d454d8d70c
Diffstat (limited to 'fwu')
| -rw-r--r-- | fwu/ns_bl1u/ns_bl1u.mk | 2 | ||||
| -rw-r--r-- | fwu/ns_bl1u/ns_bl1u_main.c | 2 | ||||
| -rw-r--r-- | fwu/ns_bl2u/ns_bl2u.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fwu/ns_bl1u/ns_bl1u.mk b/fwu/ns_bl1u/ns_bl1u.mk index a717f61..21d9904 100644 --- a/fwu/ns_bl1u/ns_bl1u.mk +++ b/fwu/ns_bl1u/ns_bl1u.mk @@ -45,9 +45,9 @@ NS_BL1U_SOURCES := drivers/io/io_fip.c \ lib/utils/uuid.c \ lib/xlat_tables/aarch64/xlat_tables.c \ lib/xlat_tables/xlat_tables_common.c \ + plat/arm/common/arm_fwu_io_storage.c \ plat/common/aarch64/platform_helpers.S \ plat/common/aarch64/platform_up_stack.S \ - plat/common/arm_io_storage.c \ plat/common/image_loader.c \ plat/common/plat_common.c diff --git a/fwu/ns_bl1u/ns_bl1u_main.c b/fwu/ns_bl1u/ns_bl1u_main.c index 35c2a7f..4b2d3c6 100644 --- a/fwu/ns_bl1u/ns_bl1u_main.c +++ b/fwu/ns_bl1u/ns_bl1u_main.c @@ -306,7 +306,7 @@ void ns_bl1u_main(void) tftf_arch_setup(); - plat_arm_io_setup(); + plat_fwu_io_setup(); #if FWU_BL_TEST ns_bl1u_fwu_test_main(); diff --git a/fwu/ns_bl2u/ns_bl2u.mk b/fwu/ns_bl2u/ns_bl2u.mk index 09aceb9..18b14c5 100644 --- a/fwu/ns_bl2u/ns_bl2u.mk +++ b/fwu/ns_bl2u/ns_bl2u.mk @@ -43,9 +43,9 @@ NS_BL2U_SOURCES := framework/aarch64/arch.c \ lib/utils/uuid.c \ lib/xlat_tables/aarch64/xlat_tables.c \ lib/xlat_tables/xlat_tables_common.c \ + plat/arm/common/arm_fwu_io_storage.c \ plat/common/aarch64/platform_helpers.S \ plat/common/aarch64/platform_up_stack.S \ - plat/common/arm_io_storage.c \ plat/common/fwu_nvm_accessors.c \ plat/common/plat_common.c \ drivers/io/io_memmap.c \ |