diff options
| author | Dan Handley <dan.handley@arm.com> | 2014-05-15 14:11:36 +0100 |
|---|---|---|
| committer | Achin Gupta <achin.gupta@arm.com> | 2014-05-23 17:18:54 +0100 |
| commit | dec5e0d1da9fdfe68cea4fbeb096f93e43860493 (patch) | |
| tree | 36124ce6017a1ce1c500f874d07c507086588ff3 /plat/fvp | |
| parent | 5f0cdb059d7d5c3a8a834074a7f236b85d014dde (diff) | |
Move BL porting functions into platform.h
Some platform porting functions were in BL specific header files.
These have been moved to platform.h so that all porting functions
are in the same place. The functions are now grouped by BL.
Obsolete BL headers files have been removed.
Also, the weak declaration of the init_bl2_mem_layout() function
has been moved out the header file and into the source file
(bl_common.c) using the more succinct #pragma syntax. This
mitigates the risk of 2 weak definitions being created and the
wrong one being picked up by the compiler.
Change-Id: Ib19934939fd755f3e5a5a5bceec88da684308a83
Diffstat (limited to 'plat/fvp')
| -rw-r--r-- | plat/fvp/bl1_plat_setup.c | 1 | ||||
| -rw-r--r-- | plat/fvp/bl2_plat_setup.c | 1 | ||||
| -rw-r--r-- | plat/fvp/bl32_plat_setup.c | 2 | ||||
| -rw-r--r-- | plat/fvp/fvp_private.h | 17 |
4 files changed, 17 insertions, 4 deletions
diff --git a/plat/fvp/bl1_plat_setup.c b/plat/fvp/bl1_plat_setup.c index 5fbebc1..34e74e2 100644 --- a/plat/fvp/bl1_plat_setup.c +++ b/plat/fvp/bl1_plat_setup.c @@ -31,7 +31,6 @@ #include <arch_helpers.h> #include <assert.h> #include <bl_common.h> -#include <bl1.h> #include <console.h> #include <mmio.h> #include <platform.h> diff --git a/plat/fvp/bl2_plat_setup.c b/plat/fvp/bl2_plat_setup.c index 87efe28..2cfb8bc 100644 --- a/plat/fvp/bl2_plat_setup.c +++ b/plat/fvp/bl2_plat_setup.c @@ -31,7 +31,6 @@ #include <arch_helpers.h> #include <assert.h> #include <bl_common.h> -#include <bl2.h> #include <console.h> #include <platform.h> #include <platform_def.h> diff --git a/plat/fvp/bl32_plat_setup.c b/plat/fvp/bl32_plat_setup.c index 7930314..b583349 100644 --- a/plat/fvp/bl32_plat_setup.c +++ b/plat/fvp/bl32_plat_setup.c @@ -28,9 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <arch_helpers.h> #include <bl_common.h> -#include <bl32.h> #include <console.h> #include <platform.h> #include "fvp_def.h" diff --git a/plat/fvp/fvp_private.h b/plat/fvp/fvp_private.h index cde1fd0..04e8b81 100644 --- a/plat/fvp/fvp_private.h +++ b/plat/fvp/fvp_private.h @@ -56,8 +56,25 @@ typedef struct bl2_to_bl31_params_mem { } bl2_to_bl31_params_mem_t; /******************************************************************************* + * Forward declarations + ******************************************************************************/ +struct meminfo; + +/******************************************************************************* * Function and variable prototypes ******************************************************************************/ +void configure_mmu_el1(unsigned long total_base, + unsigned long total_size, + unsigned long, + unsigned long, + unsigned long, + unsigned long); +void configure_mmu_el3(unsigned long total_base, + unsigned long total_size, + unsigned long, + unsigned long, + unsigned long, + unsigned long); unsigned long platform_get_cfgvar(unsigned int); int platform_config_setup(void); |