aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandrine Bailleux <sandrine.bailleux@arm.com>2013-10-28 15:14:00 +0000
committerDan Handley <dan.handley@arm.com>2013-11-27 15:31:06 +0000
commit204aa03da7d8a34d5e06fba3ccc9e565ed01d305 (patch)
tree8be781529c4285d38b242e100913b6fe5b2fb20a
parent27866d84283580be3d41155008d47622e87667da (diff)
fvp: Remove unnecessary initializers
Global and static variables are expected to be initialised to zero by default. This is specified by the C99 standard. This patch removes some unnecessary initialisations of such variables. It fixes a compilation warning at the same time: plat/fvp/bl31_plat_setup.c:82:3: warning: missing braces around initializer [-Wmissing-braces] section("tzfw_coherent_mem"))) = {0}; ^ plat/fvp/bl31_plat_setup.c:82:3: warning: (near initialization for ‘ns_entry_info[0]’) [-Wmissing-braces] Note that GCC should not have emitted this warning message in the first place. The C Standard permits braces to be elided around subaggregate initializers. See this GCC bug report: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119 Change-Id: I13cb0c344feb9803bca8819f976377741fa6bc35
-rw-r--r--docs/change-log.md2
-rw-r--r--plat/fvp/bl1_plat_setup.c2
-rw-r--r--plat/fvp/bl2_plat_setup.c4
-rw-r--r--plat/fvp/bl31_plat_setup.c4
4 files changed, 7 insertions, 5 deletions
diff --git a/docs/change-log.md b/docs/change-log.md
index 71e6db1..1f2d12c 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -15,6 +15,8 @@ Detailed changes since last release
* The supplied FDTs expose the Interrupt Translation Service (ITS) available
in GICv3.
+* Fixed various GCC compiler warnings.
+
ARM Trusted Firmware - version 0.2
==================================
diff --git a/plat/fvp/bl1_plat_setup.c b/plat/fvp/bl1_plat_setup.c
index 7fa3f76..434dfb7 100644
--- a/plat/fvp/bl1_plat_setup.c
+++ b/plat/fvp/bl1_plat_setup.c
@@ -83,7 +83,7 @@ extern unsigned long __FIRMWARE_RAM_COHERENT_SIZE__;
/* Data structure which holds the extents of the trusted SRAM for BL1*/
-static meminfo bl1_tzram_layout = {0};
+static meminfo bl1_tzram_layout;
meminfo bl1_get_sec_mem_layout(void)
{
diff --git a/plat/fvp/bl2_plat_setup.c b/plat/fvp/bl2_plat_setup.c
index 4bb1015..9cd123a 100644
--- a/plat/fvp/bl2_plat_setup.c
+++ b/plat/fvp/bl2_plat_setup.c
@@ -60,10 +60,10 @@ extern unsigned char **bl2_el_change_mem_ptr;
/* Data structure which holds the extents of the trusted SRAM for BL2 */
static meminfo bl2_tzram_layout
__attribute__ ((aligned(PLATFORM_CACHE_LINE_SIZE),
- section("tzfw_coherent_mem"))) = {0};
+ section("tzfw_coherent_mem")));
/* Data structure which holds the extents of the non-trusted DRAM for BL2*/
-static meminfo dram_layout = {0};
+static meminfo dram_layout;
meminfo bl2_get_sec_mem_layout(void)
{
diff --git a/plat/fvp/bl31_plat_setup.c b/plat/fvp/bl31_plat_setup.c
index 7aa1182..0dd5c69 100644
--- a/plat/fvp/bl31_plat_setup.c
+++ b/plat/fvp/bl31_plat_setup.c
@@ -68,12 +68,12 @@ extern unsigned long __BL31_RW_BASE__;
******************************************************************************/
el_change_info ns_entry_info[PLATFORM_CORE_COUNT]
__attribute__ ((aligned(PLATFORM_CACHE_LINE_SIZE),
- section("tzfw_coherent_mem"))) = {0};
+ section("tzfw_coherent_mem")));
/* Data structure which holds the extents of the trusted SRAM for BL31 */
static meminfo bl31_tzram_layout
__attribute__ ((aligned(PLATFORM_CACHE_LINE_SIZE),
- section("tzfw_coherent_mem"))) = {0};
+ section("tzfw_coherent_mem")));
meminfo bl31_get_sec_mem_layout(void)
{