diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2016-06-10 11:43:30 +0100 |
|---|---|---|
| committer | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2016-07-22 09:40:23 +0100 |
| commit | 8397a7a0842517d882557b04e0dcd2f682342cd2 (patch) | |
| tree | 82ea1ef6d16bd84e237ad085df32cf0c0c28f02b | |
| parent | 6e673bba0a510d64d8a013f7e50780bd43684ebb (diff) | |
Move plat_common.c out of AArch64 folder
The functions implemented in plat_common.c can be easily
reused between architectures with minor modification. Hence
this patch moves the file out of the `aarch64` to its parent
directory. The corresponding makefiles are also modified.
Change-Id: Ia77129f14497f3a5801735bf753afc5c6a6f77e3
| -rw-r--r-- | framework/framework.mk | 2 | ||||
| -rw-r--r-- | fwu/ns_bl1u/ns_bl1u.mk | 4 | ||||
| -rw-r--r-- | fwu/ns_bl2u/ns_bl2u.mk | 2 | ||||
| -rw-r--r-- | plat/common/plat_common.c (renamed from plat/common/aarch64/plat_common.c) | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/framework/framework.mk b/framework/framework.mk index 6103621..5aade18 100644 --- a/framework/framework.mk +++ b/framework/framework.mk @@ -75,9 +75,9 @@ FRAMEWORK_SOURCES := ${AUTOGEN_DIR}/tests_list.c \ lib/utils/uuid.c \ lib/xlat_tables/aarch64/xlat_tables.c \ lib/xlat_tables/xlat_tables_common.c \ - plat/common/aarch64/plat_common.c \ plat/common/aarch64/platform_helpers.S \ plat/common/aarch64/platform_mp_stack.S \ + plat/common/plat_common.c \ plat/common/plat_state_id.c \ plat/common/plat_topology.c \ plat/common/tftf_nvm_accessors.c diff --git a/fwu/ns_bl1u/ns_bl1u.mk b/fwu/ns_bl1u/ns_bl1u.mk index e2b0876..6ceb52e 100644 --- a/fwu/ns_bl1u/ns_bl1u.mk +++ b/fwu/ns_bl1u/ns_bl1u.mk @@ -45,11 +45,11 @@ 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/common/aarch64/plat_common.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/image_loader.c \ + plat/common/plat_common.c NS_BL1U_LINKERFILE := fwu/ns_bl1u/ns_bl1u.ld.S diff --git a/fwu/ns_bl2u/ns_bl2u.mk b/fwu/ns_bl2u/ns_bl2u.mk index 13be51c..cdf2910 100644 --- a/fwu/ns_bl2u/ns_bl2u.mk +++ b/fwu/ns_bl2u/ns_bl2u.mk @@ -43,11 +43,11 @@ 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/common/aarch64/plat_common.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 \ drivers/io/io_fip.c diff --git a/plat/common/aarch64/plat_common.c b/plat/common/plat_common.c index bcb3a86..a034e7d 100644 --- a/plat/common/aarch64/plat_common.c +++ b/plat/common/plat_common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: |