uniphier: add ULL to physical address literals
Looks like this is requirement in the pre-merge static analysis.
misra_violation: [Required] MISRA C-2012 Rule 7.2 violation:
Unsigned constants must be declared with U or u suffix.
Adding ULL as requested. I used ULL() macros for BL*_{BASE,LIMIT}
because they are referenced from linker scripts.
Requested-by: David Cunado <david.cunado@arm.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
diff --git a/plat/socionext/uniphier/include/platform_def.h b/plat/socionext/uniphier/include/platform_def.h
index 9b006a9..301aa14 100644
--- a/plat/socionext/uniphier/include/platform_def.h
+++ b/plat/socionext/uniphier/include/platform_def.h
@@ -9,6 +9,7 @@
#include <common_def.h>
#include <tbbr/tbbr_img_def.h>
+#include <utils_def.h>
#define PLATFORM_STACK_SIZE 0x1000
@@ -27,21 +28,21 @@
#define PLAT_MAX_OFF_STATE 2
#define PLAT_MAX_RET_STATE 1
-#define BL2_BASE 0x80000000
-#define BL2_LIMIT 0x80080000
+#define BL2_BASE ULL(0x80000000)
+#define BL2_LIMIT ULL(0x80080000)
/* 0x80080000-0x81000000: reserved for DSP */
-#define UNIPHIER_SEC_DRAM_BASE 0x81000000
-#define UNIPHIER_SEC_DRAM_LIMIT 0x82000000
+#define UNIPHIER_SEC_DRAM_BASE 0x81000000ULL
+#define UNIPHIER_SEC_DRAM_LIMIT 0x82000000ULL
#define UNIPHIER_SEC_DRAM_SIZE ((UNIPHIER_SEC_DRAM_LIMIT) - \
(UNIPHIER_SEC_DRAM_BASE))
-#define BL31_BASE 0x81000000
-#define BL31_LIMIT 0x81080000
+#define BL31_BASE ULL(0x81000000)
+#define BL31_LIMIT ULL(0x81080000)
-#define BL32_BASE 0x81080000
-#define BL32_LIMIT 0x81180000
+#define BL32_BASE ULL(0x81080000)
+#define BL32_LIMIT ULL(0x81180000)
#define PLAT_PHY_ADDR_SPACE_SIZE (1ULL << 32)
#define PLAT_VIRT_ADDR_SPACE_SIZE (1ULL << 32)
diff --git a/plat/socionext/uniphier/uniphier_io_storage.c b/plat/socionext/uniphier/uniphier_io_storage.c
index 90f16a9..ed1f6fa 100644
--- a/plat/socionext/uniphier/uniphier_io_storage.c
+++ b/plat/socionext/uniphier/uniphier_io_storage.c
@@ -18,11 +18,11 @@
#include "uniphier.h"
-#define UNIPHIER_ROM_REGION_BASE 0x00000000
-#define UNIPHIER_ROM_REGION_SIZE 0x10000000
+#define UNIPHIER_ROM_REGION_BASE 0x00000000ULL
+#define UNIPHIER_ROM_REGION_SIZE 0x10000000ULL
-#define UNIPHIER_OCM_REGION_BASE 0x30000000
-#define UNIPHIER_OCM_REGION_SIZE 0x00040000
+#define UNIPHIER_OCM_REGION_BASE 0x30000000ULL
+#define UNIPHIER_OCM_REGION_SIZE 0x00040000ULL
static const io_dev_connector_t *uniphier_fip_dev_con;
static uintptr_t uniphier_fip_dev_handle;
diff --git a/plat/socionext/uniphier/uniphier_xlat_setup.c b/plat/socionext/uniphier/uniphier_xlat_setup.c
index 631ca6d..3112ecd 100644
--- a/plat/socionext/uniphier/uniphier_xlat_setup.c
+++ b/plat/socionext/uniphier/uniphier_xlat_setup.c
@@ -8,8 +8,8 @@
#include <platform_def.h>
#include <xlat_tables_v2.h>
-#define UNIPHIER_REG_REGION_BASE 0x50000000
-#define UNIPHIER_REG_REGION_SIZE 0x20000000
+#define UNIPHIER_REG_REGION_BASE 0x50000000ULL
+#define UNIPHIER_REG_REGION_SIZE 0x20000000ULL
void uniphier_mmap_setup(uintptr_t total_base, size_t total_size,
const struct mmap_region *mmap)