diff options
author | danh-arm <dan.handley@arm.com> | 2018-07-25 16:09:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-25 16:09:54 +0100 |
commit | 60e062fb0e33f7d9825267cbfb397d7c7aca1169 (patch) | |
tree | 22e9c622d9bcc757156da179b997bf14cd66b1f9 /plat/hisilicon | |
parent | d87d524ee4482c00a15f6d72c6fe5ab02f5f4746 (diff) | |
parent | 6b7b0f368680ce657390d0a046871d880d704b2d (diff) | |
download | trusted-firmware-a-60e062fb0e33f7d9825267cbfb397d7c7aca1169.tar.gz |
Merge pull request #1486 from antonio-nino-diaz-arm/an/psci-misra
Fix several MISRA defects in PSCI library
Diffstat (limited to 'plat/hisilicon')
-rw-r--r-- | plat/hisilicon/hikey/include/platform_def.h | 11 | ||||
-rw-r--r-- | plat/hisilicon/hikey960/include/platform_def.h | 11 | ||||
-rw-r--r-- | plat/hisilicon/poplar/include/platform_def.h | 12 |
3 files changed, 18 insertions, 16 deletions
diff --git a/plat/hisilicon/hikey/include/platform_def.h b/plat/hisilicon/hikey/include/platform_def.h index b2404483a0..54be978597 100644 --- a/plat/hisilicon/hikey/include/platform_def.h +++ b/plat/hisilicon/hikey/include/platform_def.h @@ -4,14 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLATFORM_DEF_H__ -#define __PLATFORM_DEF_H__ +#ifndef PLATFORM_DEF_H +#define PLATFORM_DEF_H #include <arch.h> #include <common_def.h> #include <hikey_def.h> #include <hikey_layout.h> /* BL memory region sizes, etc */ #include <tbbr_img_def.h> +#include <utils_def.h> /* Special value used to verify platform parameters from BL2 to BL3-1 */ #define HIKEY_BL31_PLAT_PARAM_VAL 0x0f1e2d3c4b5a6978ULL @@ -34,8 +35,8 @@ #define PLAT_NUM_PWR_DOMAINS (PLATFORM_CORE_COUNT + \ PLATFORM_CLUSTER_COUNT + 1) -#define PLAT_MAX_RET_STATE 1 -#define PLAT_MAX_OFF_STATE 2 +#define PLAT_MAX_RET_STATE U(1) +#define PLAT_MAX_OFF_STATE U(2) #define MAX_IO_DEVICES 3 #define MAX_IO_HANDLES 4 @@ -79,4 +80,4 @@ #define CACHE_WRITEBACK_SHIFT 6 #define CACHE_WRITEBACK_GRANULE (1 << CACHE_WRITEBACK_SHIFT) -#endif /* __PLATFORM_DEF_H__ */ +#endif /* PLATFORM_DEF_H */ diff --git a/plat/hisilicon/hikey960/include/platform_def.h b/plat/hisilicon/hikey960/include/platform_def.h index beff47c0e4..5a6021a856 100644 --- a/plat/hisilicon/hikey960/include/platform_def.h +++ b/plat/hisilicon/hikey960/include/platform_def.h @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLATFORM_DEF_H__ -#define __PLATFORM_DEF_H__ +#ifndef PLATFORM_DEF_H +#define PLATFORM_DEF_H #include <arch.h> +#include <utils_def.h> #include "../hikey960_def.h" /* Special value used to verify platform parameters from BL2 to BL3-1 */ @@ -31,8 +32,8 @@ #define PLAT_NUM_PWR_DOMAINS (PLATFORM_CORE_COUNT + \ PLATFORM_CLUSTER_COUNT + 1) -#define PLAT_MAX_RET_STATE 1 -#define PLAT_MAX_OFF_STATE 2 +#define PLAT_MAX_RET_STATE U(1) +#define PLAT_MAX_OFF_STATE U(2) #define MAX_IO_DEVICES 3 #define MAX_IO_HANDLES 4 @@ -140,4 +141,4 @@ #define CACHE_WRITEBACK_SHIFT 6 #define CACHE_WRITEBACK_GRANULE (1 << CACHE_WRITEBACK_SHIFT) -#endif /* __PLATFORM_DEF_H__ */ +#endif /* PLATFORM_DEF_H */ diff --git a/plat/hisilicon/poplar/include/platform_def.h b/plat/hisilicon/poplar/include/platform_def.h index 8e8f009dd6..824ca34bf9 100644 --- a/plat/hisilicon/poplar/include/platform_def.h +++ b/plat/hisilicon/poplar/include/platform_def.h @@ -1,11 +1,11 @@ /* - * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLATFORM_DEF_H__ -#define __PLATFORM_DEF_H__ +#ifndef PLATFORM_DEF_H +#define PLATFORM_DEF_H #include <arch.h> #include <common_def.h> @@ -131,8 +131,8 @@ /* Power states */ #define PLAT_MAX_PWR_LVL (MPIDR_AFFLVL1) -#define PLAT_MAX_OFF_STATE 2 -#define PLAT_MAX_RET_STATE 1 +#define PLAT_MAX_OFF_STATE U(2) +#define PLAT_MAX_RET_STATE U(1) /* Interrupt controller */ #define PLAT_ARM_GICD_BASE GICD_BASE @@ -168,4 +168,4 @@ #define PLAT_ARM_G0_IRQ_PROPS(grp) -#endif /* __PLATFORM_DEF_H__ */ +#endif /* PLATFORM_DEF_H */ |