diff options
author | Soby Mathew <soby.mathew@arm.com> | 2016-03-24 16:56:29 +0000 |
---|---|---|
committer | Soby Mathew <soby.mathew@arm.com> | 2016-07-18 17:52:15 +0100 |
commit | 532ed6183868036e4a4f83cd7a71b93266a3bdb7 (patch) | |
tree | f49b622aa47b6b94eebfb58de1f59df30dd6c423 /include | |
parent | da554d7439b1e9b64d06dd50c6eb29bf1c952805 (diff) |
Introduce `el3_runtime` and `PSCI` libraries
This patch moves the PSCI services and BL31 frameworks like context
management and per-cpu data into new library components `PSCI` and
`el3_runtime` respectively. This enables PSCI to be built independently from
BL31. A new `psci_lib.mk` makefile is introduced which adds the relevant
PSCI library sources and gets included by `bl31.mk`. Other changes which
are done as part of this patch are:
* The runtime services framework is now moved to the `common/` folder to
enable reuse.
* The `asm_macros.S` and `assert_macros.S` helpers are moved to architecture
specific folder.
* The `plat_psci_common.c` is moved from the `plat/common/aarch64/` folder
to `plat/common` folder. The original file location now has a stub which
just includes the file from new location to maintain platform compatibility.
Most of the changes wouldn't affect platform builds as they just involve
changes to the generic bl1.mk and bl31.mk makefiles.
NOTE: THE `plat_psci_common.c` FILE HAS MOVED LOCATION AND THE STUB FILE AT
THE ORIGINAL LOCATION IS NOW DEPRECATED. PLATFORMS SHOULD MODIFY THEIR
MAKEFILES TO INCLUDE THE FILE FROM THE NEW LOCATION.
Change-Id: I6bd87d5b59424995c6a65ef8076d4fda91ad5e86
Diffstat (limited to 'include')
-rw-r--r-- | include/common/aarch64/asm_macros.S (renamed from include/common/asm_macros.S) | 2 | ||||
-rw-r--r-- | include/common/aarch64/assert_macros.S (renamed from include/common/assert_macros.S) | 2 | ||||
-rw-r--r-- | include/common/runtime_svc.h (renamed from include/bl31/runtime_svc.h) | 0 | ||||
-rw-r--r-- | include/lib/el3_runtime/aarch64/context.h (renamed from include/common/context.h) | 0 | ||||
-rw-r--r-- | include/lib/el3_runtime/context_mgmt.h (renamed from include/common/context_mgmt.h) | 1 | ||||
-rw-r--r-- | include/lib/el3_runtime/cpu_data.h (renamed from include/bl31/cpu_data.h) | 0 | ||||
-rw-r--r-- | include/lib/psci/psci.h (renamed from include/bl31/services/psci.h) | 0 | ||||
-rw-r--r-- | include/lib/psci/psci_compat.h (renamed from include/bl31/services/psci_compat.h) | 2 | ||||
-rw-r--r-- | include/services/std_svc.h (renamed from include/bl31/services/std_svc.h) | 2 |
9 files changed, 4 insertions, 5 deletions
diff --git a/include/common/asm_macros.S b/include/common/aarch64/asm_macros.S index bd8bb709..e7669899 100644 --- a/include/common/asm_macros.S +++ b/include/common/aarch64/asm_macros.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-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: diff --git a/include/common/assert_macros.S b/include/common/aarch64/assert_macros.S index cb6c78b8..b7e536c6 100644 --- a/include/common/assert_macros.S +++ b/include/common/aarch64/assert_macros.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015, 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: diff --git a/include/bl31/runtime_svc.h b/include/common/runtime_svc.h index adafcee4..adafcee4 100644 --- a/include/bl31/runtime_svc.h +++ b/include/common/runtime_svc.h diff --git a/include/common/context.h b/include/lib/el3_runtime/aarch64/context.h index b528c03b..b528c03b 100644 --- a/include/common/context.h +++ b/include/lib/el3_runtime/aarch64/context.h diff --git a/include/common/context_mgmt.h b/include/lib/el3_runtime/context_mgmt.h index 8a38ee5d..672ea11e 100644 --- a/include/common/context_mgmt.h +++ b/include/lib/el3_runtime/context_mgmt.h @@ -32,7 +32,6 @@ #define __CM_H__ #include <arch.h> -#include <bl_common.h> /******************************************************************************* * Forward declarations diff --git a/include/bl31/cpu_data.h b/include/lib/el3_runtime/cpu_data.h index 4fc801bf..4fc801bf 100644 --- a/include/bl31/cpu_data.h +++ b/include/lib/el3_runtime/cpu_data.h diff --git a/include/bl31/services/psci.h b/include/lib/psci/psci.h index b6d6d4ea..b6d6d4ea 100644 --- a/include/bl31/services/psci.h +++ b/include/lib/psci/psci.h diff --git a/include/bl31/services/psci_compat.h b/include/lib/psci/psci_compat.h index 24bd8dcc..3554667e 100644 --- a/include/bl31/services/psci_compat.h +++ b/include/lib/psci/psci_compat.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-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: diff --git a/include/bl31/services/std_svc.h b/include/services/std_svc.h index cbd5b620..49d79f8a 100644 --- a/include/bl31/services/std_svc.h +++ b/include/services/std_svc.h @@ -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: |