summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJérémy Dufour2013-01-25 15:46:59 +0100
committerJérémy Dufour2013-01-30 10:45:43 +0100
commit93e1ed0fa67af1d5db5ad60a793e4261258607f7 (patch)
treed7d8d3138b66908f07724fb365ecee945e0b7390 /common
parente0c9b760da02c8cb96f71f023b6a0e6b7586ac89 (diff)
common/include/asm/arch: harmonize pointers arithmetic in nvram, refs #3709
Diffstat (limited to 'common')
-rw-r--r--common/include/asm/arch/nvram.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/include/asm/arch/nvram.h b/common/include/asm/arch/nvram.h
index 93abfa6457..6947b30434 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))
+#define SPC300_NVRAM_FIRST_FIELD_OFFSET ((uint32_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,7 +102,7 @@ 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 * sizeof (uint32_t))
+#define SPC300_NVRAM_LAST_FIELD_OFFSET ((uint32_t)&(((spidcom_nvram_t *)(0))->dynamic[256]))
#ifdef CONFIG_CHIP_FEATURE_EXTRA_NVRAM_FIELDS
/* SPC200 fields. */
@@ -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 * sizeof (char))
+#define SPC200_NVRAM_LAST_FIELD_OFFSET ((uint32_t)&(((spidcom_nvram_t *)(0))->manufactoryInfo[64]))
/* MSE500 specific fields. */
uint32_t eth2_phy_addr; /* Address of Ethernet PHY for ETH 2*/