diff --git a/boards/arm/lpc31xx/ea3131/README.txt b/boards/arm/lpc31xx/ea3131/README.txt index 52d91bfbfb4..6611d0595c6 100644 --- a/boards/arm/lpc31xx/ea3131/README.txt +++ b/boards/arm/lpc31xx/ea3131/README.txt @@ -170,9 +170,9 @@ Image Format retrieving revision 1.2 diff -r1.2 lpchdr.c 264c264 - < g_hdr.imageType = 0x0000000b; + < g_hdr.imagetype = 0x0000000b; --- - > g_hdr.imageType = 0x0000000a; + > g_hdr.imagetype = 0x0000000a; Image Download to ISRAM ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/boards/arm/lpc31xx/ea3131/tools/lpchdr.c b/boards/arm/lpc31xx/ea3131/tools/lpchdr.c index 942e65afcaf..558e502fc0e 100644 --- a/boards/arm/lpc31xx/ea3131/tools/lpchdr.c +++ b/boards/arm/lpc31xx/ea3131/tools/lpchdr.c @@ -252,16 +252,16 @@ int main(int argc, char **argv, char **envp) g_hdr.vector = 0xea00001e; /* b 0x11029080 */ g_hdr.magic = 0x41676d69; #if 1 /* CRC doesn't seem to be functional */ - g_hdr.imageType = 0x0000000a; + g_hdr.imagetype = 0x0000000a; #else - g_hdr.imageType = 0x0000000b; + g_hdr.imagetype = 0x0000000b; #endif - g_hdr.imageLength = (buf.st_size + + g_hdr.imagelength = (buf.st_size + sizeof(struct lpc31_header_s) + 511) & ~0x1ff; /* This is how much we must pad at the end of the binary image. */ - padlen = g_hdr.imageLength - buf.st_size; + padlen = g_hdr.imagelength - buf.st_size; /* Calculate CRCs */ diff --git a/boards/arm/lpc31xx/ea3131/tools/lpchdr.h b/boards/arm/lpc31xx/ea3131/tools/lpchdr.h index ea1cc3c870c..30b6f302430 100644 --- a/boards/arm/lpc31xx/ea3131/tools/lpchdr.h +++ b/boards/arm/lpc31xx/ea3131/tools/lpchdr.h @@ -48,29 +48,29 @@ struct lpc31_header_s uint32_t execution_crc32; /* 0x08 CRC32 value of execution part of the image. If * the ‘image_type’ is set to ‘0xA’, this field * is ignored by boot ROM. */ - uint32_t Reserved0[4]; /* 0x0c-0x18: Should be zero. */ - uint32_t imageType; /* 0x1c Specifies whether CRC check should be done + uint32_t reserved0[4]; /* 0x0c-0x18: Should be zero. */ + uint32_t imagetype; /* 0x1c Specifies whether CRC check should be done * on the image or not: * 0xA – No CRC check required. * 0xB – Do CRC32 check on both header and * execution part of the image. */ - uint32_t imageLength; /* 0x20 Total image length including header rounded + uint32_t imagelength; /* 0x20 Total image length including header rounded * up to the nearest 512 byte boundary. In C * language the field can be computed as: - * imageLength = (Actual length + 511) & ~0x1FF; */ - uint32_t releaseID; /* 0x24 Release or version number of the image. Note, + * imagelength = (Actual length + 511) & ~0x1FF; */ + uint32_t releaseid; /* 0x24 Release or version number of the image. Note, * this field is not used by boot ROM but is * provided to track the image versions. */ - uint32_t buildTime; /* 0x28 Time (expressed in EPOC time format) at which + uint32_t buildtime; /* 0x28 Time (expressed in EPOC time format) at which * image is built. Note, this field is not used * by boot ROM but is provided to track the image * versions. */ - uint32_t sbzBootParameter; /* 0x2c hould be zero. */ + uint32_t sbzbootparameter; /* 0x2c hould be zero. */ uint32_t cust_reserved[15]; /* 0x30-0x68: Reserved for customer use (60 bytes) */ uint32_t header_crc32; /* 0x6c CRC32 value of the header (bytes 0x00 to 0x6C * of the image). If the ‘image_type’ is set * to ‘0xA’, this field is ignored by boot ROM. */ - uint32_t Reserved1[4]; /* 0x70-0x7c: Should be zero. */ + uint32_t reserved1[4]; /* 0x70-0x7c: Should be zero. */ /* 0x80 Start of program code (128Kb max). The final * image has to be padded to the nearest 512 * byte boundary */ diff --git a/boards/arm/lpc31xx/ea3152/README.txt b/boards/arm/lpc31xx/ea3152/README.txt index 92309c25b30..fc23d8f38fe 100644 --- a/boards/arm/lpc31xx/ea3152/README.txt +++ b/boards/arm/lpc31xx/ea3152/README.txt @@ -169,9 +169,9 @@ Image Format retrieving revision 1.2 diff -r1.2 lpchdr.c 264c264 - < g_hdr.imageType = 0x0000000b; + < g_hdr.imagetype = 0x0000000b; --- - > g_hdr.imageType = 0x0000000a; + > g_hdr.imagetype = 0x0000000a; Image Download to ISRAM ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/boards/arm/lpc31xx/ea3152/tools/lpchdr.c b/boards/arm/lpc31xx/ea3152/tools/lpchdr.c index deab7e48c94..a3d242e6d86 100644 --- a/boards/arm/lpc31xx/ea3152/tools/lpchdr.c +++ b/boards/arm/lpc31xx/ea3152/tools/lpchdr.c @@ -249,16 +249,16 @@ int main(int argc, char **argv, char **envp) g_hdr.vector = 0xea00001e; /* b 0x11029080 */ g_hdr.magic = 0x41676d69; #if 1 /* CRC doesn't seem to be functional */ - g_hdr.imageType = 0x0000000a; + g_hdr.imagetype = 0x0000000a; #else - g_hdr.imageType = 0x0000000b; + g_hdr.imagetype = 0x0000000b; #endif - g_hdr.imageLength = (buf.st_size + + g_hdr.imagelength = (buf.st_size + sizeof(struct lpc31_header_s) + 511) & ~0x1ff; /* This is how much we must pad at the end of the binary image. */ - padlen = g_hdr.imageLength - buf.st_size; + padlen = g_hdr.imagelength - buf.st_size; /* Calculate CRCs */ diff --git a/boards/arm/lpc31xx/ea3152/tools/lpchdr.h b/boards/arm/lpc31xx/ea3152/tools/lpchdr.h index 695f24040e7..3d59d81c148 100644 --- a/boards/arm/lpc31xx/ea3152/tools/lpchdr.h +++ b/boards/arm/lpc31xx/ea3152/tools/lpchdr.h @@ -52,31 +52,31 @@ struct lpc31_header_s * to ‘0xA’, this field is ignored by boot * ROM. */ - uint32_t Reserved0[4]; /* 0x0c-0x18: Should be zero. */ - uint32_t imageType; /* 0x1c Specifies whether CRC check should be + uint32_t reserved0[4]; /* 0x0c-0x18: Should be zero. */ + uint32_t imagetype; /* 0x1c Specifies whether CRC check should be * done on the image or not: * 0xA – No CRC check required. * 0xB – Do CRC32 check on both header and * execution part of the image. */ - uint32_t imageLength; /* 0x20 Total image length including header + uint32_t imagelength; /* 0x20 Total image length including header * rounded up to the nearest 512 byte * boundary. In C language the field can be * computed as: - * imageLength = (Actual length + 511) & ~0x1FF; + * imagelength = (Actual length + 511) & ~0x1FF; */ - uint32_t releaseID; /* 0x24 Release or version number of the + uint32_t releaseid; /* 0x24 Release or version number of the * image. * Note, this field is not used by boot ROM * but is provided to track the image * versions. */ - uint32_t buildTime; /* 0x28 Time (expressed in EPOC time format) at + uint32_t buildtime; /* 0x28 Time (expressed in EPOC time format) at * which image is built. Note, this field is * not used by boot ROM but is provided to * track the image versions. */ - uint32_t sbzBootParameter; /* 0x2c hould be zero. */ + uint32_t sbzbootparameter; /* 0x2c hould be zero. */ uint32_t cust_reserved[15]; /* 0x30-0x68: Reserved for customer use * (60 bytes) */ @@ -85,7 +85,7 @@ struct lpc31_header_s * If the ‘image_type’ is set to ‘0xA’, * this field is ignored by boot ROM. */ - uint32_t Reserved1[4]; /* 0x70-0x7c: Should be zero. */ + uint32_t reserved1[4]; /* 0x70-0x7c: Should be zero. */ /* 0x80 Start of program code (128Kb max). * The final image has to be padded to the * nearest 512 byte boundary diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt b/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt index 84cf5519806..c1719409d86 100644 --- a/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt +++ b/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt @@ -220,9 +220,9 @@ Image Format retrieving revision 1.2 diff -r1.2 lpchdr.c 264c264 - < g_hdr.imageType = 0x0000000b; + < g_hdr.imagetype = 0x0000000b; --- - > g_hdr.imageType = 0x0000000a; + > g_hdr.imagetype = 0x0000000a; Image Download to ISRAM ======================= diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/tools/lpchdr.c b/boards/arm/lpc31xx/olimex-lpc-h3131/tools/lpchdr.c index 743432a26fb..69ff307afe1 100644 --- a/boards/arm/lpc31xx/olimex-lpc-h3131/tools/lpchdr.c +++ b/boards/arm/lpc31xx/olimex-lpc-h3131/tools/lpchdr.c @@ -250,16 +250,16 @@ int main(int argc, char **argv, char **envp) g_hdr.vector = 0xea00001e; /* b 0x11029080 */ g_hdr.magic = 0x41676d69; #if 1 /* CRC doesn't seem to be functional */ - g_hdr.imageType = 0x0000000a; + g_hdr.imagetype = 0x0000000a; #else - g_hdr.imageType = 0x0000000b; + g_hdr.imagetype = 0x0000000b; #endif - g_hdr.imageLength = (buf.st_size + + g_hdr.imagelength = (buf.st_size + sizeof(struct lpc31_header_s) + 511) & ~0x1ff; /* This is how much we must pad at the end of the binary image. */ - padlen = g_hdr.imageLength - buf.st_size; + padlen = g_hdr.imagelength - buf.st_size; /* Calculate CRCs */ diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/tools/lpchdr.h b/boards/arm/lpc31xx/olimex-lpc-h3131/tools/lpchdr.h index a89a178e10f..4b4f50b3df7 100644 --- a/boards/arm/lpc31xx/olimex-lpc-h3131/tools/lpchdr.h +++ b/boards/arm/lpc31xx/olimex-lpc-h3131/tools/lpchdr.h @@ -48,29 +48,29 @@ struct lpc31_header_s uint32_t execution_crc32; /* 0x08 CRC32 value of execution part of the image. If * the ‘image_type’ is set to ‘0xA’, this field * is ignored by boot ROM. */ - uint32_t Reserved0[4]; /* 0x0c-0x18: Should be zero. */ - uint32_t imageType; /* 0x1c Specifies whether CRC check should be done + uint32_t reserved0[4]; /* 0x0c-0x18: Should be zero. */ + uint32_t imagetype; /* 0x1c Specifies whether CRC check should be done * on the image or not: * 0xA – No CRC check required. * 0xB – Do CRC32 check on both header and * execution part of the image. */ - uint32_t imageLength; /* 0x20 Total image length including header rounded + uint32_t imagelength; /* 0x20 Total image length including header rounded * up to the nearest 512 byte boundary. In C * language the field can be computed as: - * imageLength = (Actual length + 511) & ~0x1FF; */ - uint32_t releaseID; /* 0x24 Release or version number of the image. Note, + * imagelength = (Actual length + 511) & ~0x1FF; */ + uint32_t releaseid; /* 0x24 Release or version number of the image. Note, * this field is not used by boot ROM but is * provided to track the image versions. */ - uint32_t buildTime; /* 0x28 Time (expressed in EPOC time format) at which + uint32_t buildtime; /* 0x28 Time (expressed in EPOC time format) at which * image is built. Note, this field is not used * by boot ROM but is provided to track the image * versions. */ - uint32_t sbzBootParameter; /* 0x2c hould be zero. */ + uint32_t sbzbootparameter; /* 0x2c hould be zero. */ uint32_t cust_reserved[15]; /* 0x30-0x68: Reserved for customer use (60 bytes) */ uint32_t header_crc32; /* 0x6c CRC32 value of the header (bytes 0x00 to 0x6C * of the image). If the ‘image_type’ is set * to ‘0xA’, this field is ignored by boot ROM. */ - uint32_t Reserved1[4]; /* 0x70-0x7c: Should be zero. */ + uint32_t reserved1[4]; /* 0x70-0x7c: Should be zero. */ /* 0x80 Start of program code (128Kb max). The final * image has to be padded to the nearest 512 * byte boundary */