summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJérémy Dufour2013-01-29 08:27:46 +0100
committerJérémy Dufour2013-01-30 10:45:44 +0100
commit78a81bf192654580d20acf0901020b9af43ded2d (patch)
treeee964b6b9721e997bf72bd49fd348013ce3e2223 /common
parent93e1ed0fa67af1d5db5ad60a793e4261258607f7 (diff)
common/include/asm/arch: use uintptr_t for arithmetic pointers, refs #3709
This method is compatible between 32 and 64 bits architecture.
Diffstat (limited to 'common')
-rw-r--r--common/include/asm/arch/nvram.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/common/include/asm/arch/nvram.h b/common/include/asm/arch/nvram.h
index 6947b30434..8ddb1d64f2 100644
--- a/common/include/asm/arch/nvram.h
+++ b/common/include/asm/arch/nvram.h
@@ -53,7 +53,7 @@ enum spc300_gpio_direction_t
typedef struct
{
/* SPC300 fields. */
-#define SPC300_NVRAM_FIRST_FIELD_OFFSET ((uint32_t)&(((spidcom_nvram_t *)(0))->magic[0]))
+#define SPC300_NVRAM_FIRST_FIELD_OFFSET ((uintptr_t)&(((spidcom_nvram_t *)(0))->magic[0]))
char magic[8]; /* Magic number "NVRAM\0\0\0" */
uint32_t pkg_cfg; /* Package configuration register */
union {
@@ -102,11 +102,11 @@ typedef struct
uint32_t img_max_size; /* Max size of an image in flash */
uint32_t cpu_partnb; /* SPC3x0 partnb */
uint32_t dynamic[256]; /* Dynamic data (see miu_config) */
-#define SPC300_NVRAM_LAST_FIELD_OFFSET ((uint32_t)&(((spidcom_nvram_t *)(0))->dynamic[256]))
+#define SPC300_NVRAM_LAST_FIELD_OFFSET ((uintptr_t)&(((spidcom_nvram_t *)(0))->dynamic[256]))
#ifdef CONFIG_CHIP_FEATURE_EXTRA_NVRAM_FIELDS
/* SPC200 fields. */
-#define SPC200_NVRAM_FIRST_FIELD_OFFSET ((uint32_t)&(((spidcom_nvram_t *)(0))->magicWord1))
+#define SPC200_NVRAM_FIRST_FIELD_OFFSET ((uintptr_t)&(((spidcom_nvram_t *)(0))->magicWord1))
uint32_t magicWord1;
uint32_t magicWord2;
uint32_t boardNumber; /* board Number */
@@ -125,7 +125,7 @@ typedef struct
uint32_t afeType; /* Type of AFE design */
uint32_t ethPortNum; /* Number of the eth port */
char manufactoryInfo[64]; /* manufactory info string */
-#define SPC200_NVRAM_LAST_FIELD_OFFSET ((uint32_t)&(((spidcom_nvram_t *)(0))->manufactoryInfo[64]))
+#define SPC200_NVRAM_LAST_FIELD_OFFSET ((uintptr_t)&(((spidcom_nvram_t *)(0))->manufactoryInfo[64]))
/* MSE500 specific fields. */
uint32_t eth2_phy_addr; /* Address of Ethernet PHY for ETH 2*/