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/socionext | |
| parent | d87d524ee4482c00a15f6d72c6fe5ab02f5f4746 (diff) | |
| parent | 6b7b0f368680ce657390d0a046871d880d704b2d (diff) | |
Merge pull request #1486 from antonio-nino-diaz-arm/an/psci-misra
Fix several MISRA defects in PSCI library
Diffstat (limited to 'plat/socionext')
| -rw-r--r-- | plat/socionext/synquacer/include/platform_def.h | 13 | ||||
| -rw-r--r-- | plat/socionext/uniphier/include/platform_def.h | 12 |
2 files changed, 13 insertions, 12 deletions
diff --git a/plat/socionext/synquacer/include/platform_def.h b/plat/socionext/synquacer/include/platform_def.h index 3e166422..bde73485 100644 --- a/plat/socionext/synquacer/include/platform_def.h +++ b/plat/socionext/synquacer/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 <common_def.h> +#include <utils_def.h> /* CPU topology */ #define PLAT_MAX_CORES_PER_CLUSTER 2 @@ -15,9 +16,9 @@ #define PLATFORM_CORE_COUNT (PLAT_CLUSTER_COUNT * \ PLAT_MAX_CORES_PER_CLUSTER) -#define PLAT_MAX_PWR_LVL 1 -#define PLAT_MAX_RET_STATE 1 -#define PLAT_MAX_OFF_STATE 2 +#define PLAT_MAX_PWR_LVL U(1) +#define PLAT_MAX_RET_STATE U(1) +#define PLAT_MAX_OFF_STATE U(2) #define SQ_LOCAL_STATE_RUN 0 #define SQ_LOCAL_STATE_RET 1 @@ -78,4 +79,4 @@ #define PLAT_SQ_GPIO_BASE 0x51000000 -#endif /* __PLATFORM_DEF_H__ */ +#endif /* PLATFORM_DEF_H */ diff --git a/plat/socionext/uniphier/include/platform_def.h b/plat/socionext/uniphier/include/platform_def.h index 301aa147..3d71db20 100644 --- a/plat/socionext/uniphier/include/platform_def.h +++ b/plat/socionext/uniphier/include/platform_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __PLATFORM_DEF_H__ -#define __PLATFORM_DEF_H__ +#ifndef PLATFORM_DEF_H +#define PLATFORM_DEF_H #include <common_def.h> #include <tbbr/tbbr_img_def.h> @@ -23,10 +23,10 @@ #define PLATFORM_CORE_COUNT \ ((UNIPHIER_MAX_CPUS_PER_CLUSTER) * (UNIPHIER_CLUSTER_COUNT)) -#define PLAT_MAX_PWR_LVL 1 +#define PLAT_MAX_PWR_LVL U(1) -#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) #define BL2_BASE ULL(0x80000000) #define BL2_LIMIT ULL(0x80080000) @@ -59,4 +59,4 @@ #define TSP_SEC_MEM_SIZE ((BL32_LIMIT) - (BL32_BASE)) #define TSP_IRQ_SEC_PHY_TIMER 29 -#endif /* __PLATFORM_DEF_H__ */ +#endif /* PLATFORM_DEF_H */ |