GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change "VERSION*" to more determined name "CBFS_HEADER_VERSION*". 

The 'VERSION' in CBFS header file is confusing and may conflict when being used
in libpayload.

Change-Id: I24cce0cd73540e38d96f222df0a65414b16f6260
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: http://review.coreboot.org/2098
Tested-by: build bot (Jenkins)
Reviewed-by: David Hendricks <dhendrix@chromium.org>
This commit is contained in:
Hung-Te Lin 2013-01-04 12:33:03 +08:00 committed by David Hendricks
parent 858b65028e
commit 086842a13e
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
payloads/libpayload/include/cbfs_core.h
View File

@ -88,9 +88,9 @@
/* FIXME: This could also be 0xFFFF0000 with HIVECS enabled */
#define CBFS_HEADPTR_ADDR 0x0000000C
#endif
#define VERSION1 0x31313131
#define VERSION2 0x31313132
#define VERSION VERSION2
#define CBFS_HEADER_VERSION1 0x31313131
#define CBFS_HEADER_VERSION2 0x31313132
#define CBFS_HEADER_VERSION CBFS_HEADER_VERSION2
struct cbfs_header {
uint32_t magic;

6
src/include/cbfs_core.h
View File

@ -88,9 +88,9 @@
/* FIXME: This could also be 0xFFFF0000 with HIVECS enabled */
#define CBFS_HEADPTR_ADDR 0x0000000C
#endif
#define VERSION1 0x31313131
#define VERSION2 0x31313132
#define VERSION VERSION2
#define CBFS_HEADER_VERSION1 0x31313131
#define CBFS_HEADER_VERSION2 0x31313132
#define CBFS_HEADER_VERSION CBFS_HEADER_VERSION2
struct cbfs_header {
uint32_t magic;

6
util/cbfstool/cbfs.h
View File

@ -23,9 +23,9 @@
#define CBFS_HEADER_MAGIC 0x4F524243
#define CBFS_HEADPTR_ADDR_X86 0xFFFFFFFC
#define VERSION1 0x31313131
#define VERSION2 0x31313132
#define VERSION VERSION2
#define CBFS_HEADER_VERSION1 0x31313131
#define CBFS_HEADER_VERSION2 0x31313132
#define CBFS_HEADER_VERSION CBFS_HEADER_VERSION2
struct cbfs_header {
uint32_t magic;

6
util/cbfstool/common.c
View File

@ -143,7 +143,7 @@ void recalculate_rom_geometry(void *romarea)
}
/* Update old headers */
if (master_header->version == VERSION1 &&
if (master_header->version == CBFS_HEADER_VERSION1 &&
ntohl(master_header->architecture) == CBFS_ARCHITECTURE_UNKNOWN) {
dprintf("Updating CBFS master header to version 2\n");
master_header->architecture = htonl(CBFS_ARCHITECTURE_X86);
@ -583,7 +583,7 @@ int create_cbfs_image(const char *romfile, uint32_t _romsize,
arm_vec[0] = htonl(0x0e0000ea); // branch to . + 64 bytes
master_header->magic = ntohl(CBFS_HEADER_MAGIC);
master_header->version = ntohl(VERSION);
master_header->version = ntohl(CBFS_HEADER_VERSION);
master_header->romsize = htonl(romsize);
master_header->bootblocksize = htonl(bootblocksize);
master_header->align = htonl(align);
@ -612,7 +612,7 @@ int create_cbfs_image(const char *romfile, uint32_t _romsize,
bootblocksize - sizeof(struct cbfs_header));
master_header->magic = ntohl(CBFS_HEADER_MAGIC);
master_header->version = ntohl(VERSION);
master_header->version = ntohl(CBFS_HEADER_VERSION);
master_header->romsize = htonl(romsize);
master_header->bootblocksize = htonl(bootblocksize);
master_header->align = htonl(align);

2
util/nvramtool/cbfs.h
View File

@ -89,7 +89,7 @@ typedef uint8_t u8;
#define CBFS_HEADER_MAGIC 0x4F524243
#define CBFS_HEADPTR_ADDR 0xFFFFFFFc
#define VERSION1 0x31313131
#define CBFS_HEADER_VERSION1 0x31313131
struct cbfs_header {
u32 magic;