andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "fconf: Fix misra issues" into integration

This commit is contained in:
Sandrine Bailleux 2020-02-28 10:22:05 +00:00 committed by TrustedFirmware Code Review
parent 624852017b 845db72261
commit 562abecf98
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/lib/fconf/fconf.h
View File

@ -14,9 +14,9 @@
#define FCONF_REGISTER_POPULATOR(name, callback) \
__attribute__((used, section(".fconf_populator"))) \
const struct fconf_populator name##__populator = { \
.info = #name, \
.populate = callback \
const struct fconf_populator (name##__populator) = { \
.info = (#name), \
.populate = (callback) \
};
/*

6
include/lib/object_pool.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -56,13 +56,13 @@ struct object_pool {
*/
static inline void *pool_alloc_n(struct object_pool *pool, size_t count)
{
if (pool->used + count > pool->capacity) {
if ((pool->used + count) > pool->capacity) {
ERROR("Cannot allocate %zu objects out of pool (%zu objects left).\n",
count, pool->capacity - pool->used);
panic();
}
void *obj = (char *)(pool->objects) + pool->obj_size * pool->used;
void *obj = (char *)(pool->objects) + (pool->obj_size * pool->used);
pool->used += count;
return obj;
}

1
plat/arm/common/arm_dyn_cfg.c
View File

@ -21,7 +21,6 @@
#include <lib/fconf/fconf_tbbr_getter.h>
#include <plat/arm/common/arm_dyn_cfg_helpers.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#if TRUSTED_BOARD_BOOT

1
plat/arm/common/arm_fconf_io_storage.c
View File

@ -12,7 +12,6 @@
#include <drivers/io/io_memmap.h>
#include <drivers/io/io_storage.h>
#include <lib/utils.h>
#include <tools_share/firmware_image_package.h>
#include <plat/arm/common/arm_fconf_getter.h>
#include <plat/arm/common/arm_fconf_io_storage.h>

4
plat/arm/common/fconf/arm_fconf_io.c
View File

@ -59,9 +59,9 @@ struct plat_io_policy policies[MAX_NUMBER_IDS] = {
#ifdef IMAGE_BL2
#if TRUSTED_BOARD_BOOT
#define FCONF_ARM_IO_UUID_NUMBER 19
#define FCONF_ARM_IO_UUID_NUMBER U(19)
#else
#define FCONF_ARM_IO_UUID_NUMBER 10
#define FCONF_ARM_IO_UUID_NUMBER U(10)
#endif
static io_uuid_spec_t fconf_arm_uuids[FCONF_ARM_IO_UUID_NUMBER];