summaryrefslogtreecommitdiff
path: root/polux
diff options
context:
space:
mode:
authorJérémy Dufour2013-01-22 16:23:49 +0100
committerJérémy Dufour2013-01-30 10:45:44 +0100
commit333b4065c569668d930082050a812c8b658464d6 (patch)
tree84676aa90a2e6ef6d0010850171e326892e1d289 /polux
parentfd28abe48da61ee24aa8236e36a55caec820fcf7 (diff)
{common,polux}: do not use pointers in NVRAM structure, closes #3709
Pointer size differs between 32 and 64 bits architecture. Building an NVRAM using genNVRAM built with a 64 bits PC generates a non compatible NVRAM for the boards. Removing the pointers make the NVRAM architecture independent.
Diffstat (limited to 'polux')
-rw-r--r--polux/application/nvramutility/src/nvramutility.c4
-rw-r--r--polux/linux-2.6.10/arch/arm/mach-mse500/nvram.c2
-rw-r--r--polux/linux-2.6.10/arch/arm/mach-spc2XX/nvram.c4
-rw-r--r--polux/linux-2.6.10/arch/arm/mach-spc2XXc/nvram.c4
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-spc2XXc/nvram.h4
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-spc2xx/nvram.h4
6 files changed, 11 insertions, 11 deletions
diff --git a/polux/application/nvramutility/src/nvramutility.c b/polux/application/nvramutility/src/nvramutility.c
index 3377de896d..addb4d2e34 100644
--- a/polux/application/nvramutility/src/nvramutility.c
+++ b/polux/application/nvramutility/src/nvramutility.c
@@ -26,8 +26,8 @@ static spidcom_nvram_t default_image = {
.boardId = 0,
.vendorInfo = { "" },
.sdramSize = 32,
- .imageOffset0 = (unsigned char*)0x000a0000,
- .imageOffset1 = (unsigned char*)0x00250000,
+ .imageOffset0 = 0x000a0000,
+ .imageOffset1 = 0x00250000,
.ethPortNum = 1,
.manufactoryInfo = { "" }
};
diff --git a/polux/linux-2.6.10/arch/arm/mach-mse500/nvram.c b/polux/linux-2.6.10/arch/arm/mach-mse500/nvram.c
index ceedde8843..315b2e8928 100644
--- a/polux/linux-2.6.10/arch/arm/mach-mse500/nvram.c
+++ b/polux/linux-2.6.10/arch/arm/mach-mse500/nvram.c
@@ -51,7 +51,7 @@ int proc_r_nvram (char *buf, char **start, off_t offset, int count, int *eof, vo
spidcom_nvram.plcPhysAddress[4], spidcom_nvram.plcPhysAddress[5]);
p += sprintf(p, "Board description: %s\n", spidcom_nvram.boardDesc);
p += sprintf(p, "Vendor info: %s\n", spidcom_nvram.vendorInfo);
- p += sprintf(p, "Image 0 offset: %08x\n", (unsigned int) spidcom_nvram.imageOffset0);
+ p += sprintf(p, "Image 0 offset: %08x\n", spidcom_nvram.imageOffset0);
p += sprintf(p, "Eth port nb: %d\n", spidcom_nvram.ethPortNum);
p += sprintf(p, "Manufactory info: %s\n", spidcom_nvram.manufactoryInfo);
}
diff --git a/polux/linux-2.6.10/arch/arm/mach-spc2XX/nvram.c b/polux/linux-2.6.10/arch/arm/mach-spc2XX/nvram.c
index b6cdfff906..c6825fc95f 100644
--- a/polux/linux-2.6.10/arch/arm/mach-spc2XX/nvram.c
+++ b/polux/linux-2.6.10/arch/arm/mach-spc2XX/nvram.c
@@ -55,8 +55,8 @@ int proc_r_nvram (char *buf, char **start, off_t offset, int count, int *eof, vo
p += sprintf(p, "Board id: %d\n", spidcom_nvram.boardId);
p += sprintf(p, "Vendor info: %s\n", spidcom_nvram.vendorInfo);
p += sprintf(p, "SDRAM size: %d\n", spidcom_nvram.sdramSize);
- p += sprintf(p, "Image 0 offset: %08x\n", (unsigned int)spidcom_nvram.imageOffset0);
- p += sprintf(p, "Image 1 offset: %08x\n", (unsigned int)spidcom_nvram.imageOffset1);
+ p += sprintf(p, "Image 0 offset: %08x\n", spidcom_nvram.imageOffset0);
+ p += sprintf(p, "Image 1 offset: %08x\n", spidcom_nvram.imageOffset1);
p += sprintf(p, "Eth port nb: %d\n", spidcom_nvram.ethPortNum);
p += sprintf(p, "Manufactory info: %s\n", spidcom_nvram.manufactoryInfo);
}
diff --git a/polux/linux-2.6.10/arch/arm/mach-spc2XXc/nvram.c b/polux/linux-2.6.10/arch/arm/mach-spc2XXc/nvram.c
index 5b57fca2a6..f281df38bb 100644
--- a/polux/linux-2.6.10/arch/arm/mach-spc2XXc/nvram.c
+++ b/polux/linux-2.6.10/arch/arm/mach-spc2XXc/nvram.c
@@ -55,8 +55,8 @@ int proc_r_nvram (char *buf, char **start, off_t offset, int count, int *eof, vo
p += sprintf(p, "Board id: %d\n", spidcom_nvram.boardId);
p += sprintf(p, "Vendor info: %s\n", spidcom_nvram.vendorInfo);
p += sprintf(p, "SDRAM size: %d\n", spidcom_nvram.sdramSize);
- p += sprintf(p, "Image 0 offset: %08x\n", (unsigned int)spidcom_nvram.imageOffset0);
- p += sprintf(p, "Image 1 offset: %08x\n", (unsigned int)spidcom_nvram.imageOffset1);
+ p += sprintf(p, "Image 0 offset: %08x\n", spidcom_nvram.imageOffset0);
+ p += sprintf(p, "Image 1 offset: %08x\n", spidcom_nvram.imageOffset1);
p += sprintf(p, "Eth port nb: %d\n", spidcom_nvram.ethPortNum);
p += sprintf(p, "Manufactory info: %s\n", spidcom_nvram.manufactoryInfo);
}
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-spc2XXc/nvram.h b/polux/linux-2.6.10/include/asm-arm/arch-spc2XXc/nvram.h
index d41bf02487..612ce10278 100644
--- a/polux/linux-2.6.10/include/asm-arm/arch-spc2XXc/nvram.h
+++ b/polux/linux-2.6.10/include/asm-arm/arch-spc2XXc/nvram.h
@@ -62,8 +62,8 @@ typedef struct {
uint32_t boardId; /* board identification number */
char vendorInfo[64]; /* vendor additional info (OEM) */
uint32_t sdramSize; /* size of SDRAM in MBytes */
- unsigned char *imageOffset0; /* address of image #0 in flash */
- unsigned char *imageOffset1; /* address of image #1 in flash */
+ uint32_t imageOffset0; /* address of image #0 in flash */
+ uint32_t imageOffset1; /* address of image #1 in flash */
uint32_t afeType; /* Type of AFE design */
uint32_t ethPortNum; /* Number of the eth port */
char manufactoryInfo[64]; /* manufactory info string */
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-spc2xx/nvram.h b/polux/linux-2.6.10/include/asm-arm/arch-spc2xx/nvram.h
index 4fe6114c02..3add2d1994 100644
--- a/polux/linux-2.6.10/include/asm-arm/arch-spc2xx/nvram.h
+++ b/polux/linux-2.6.10/include/asm-arm/arch-spc2xx/nvram.h
@@ -62,8 +62,8 @@ typedef struct {
uint32_t boardId; /* board identification number */
char vendorInfo[64]; /* vendor additional info (OEM) */
uint32_t sdramSize; /* size of SDRAM in MBytes */
- unsigned char *imageOffset0; /* address of image #0 in flash */
- unsigned char *imageOffset1; /* address of image #1 in flash */
+ uint32_t imageOffset0; /* address of image #0 in flash */
+ uint32_t imageOffset1; /* address of image #1 in flash */
uint32_t afeType; /* Type of AFE design */
uint32_t ethPortNum; /* Number of the eth port */
char manufactoryInfo[64]; /* manufactory info string */