diff options
author | Stefan Reinauer <stepan@coresystems.de> | 2010-03-30 09:59:23 +0000 |
---|---|---|
committer | Stefan Reinauer <stepan@openbios.org> | 2010-03-30 09:59:23 +0000 |
commit | fd0bef825d88fa75d0703569ed01e05066766826 (patch) | |
tree | 02be49ed6a84e12448c20fd9ed223c977d3cfe56 | |
parent | c719f1a506060e6283352d114fd6d589e4c6ce3d (diff) |
build_opt_tbl: error instead of null pointer access if no checksum is defined.
xe7501devkit: If cmos.layout is used, there must be a checksum.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5327 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r-- | src/mainboard/intel/xe7501devkit/cmos.layout | 3 | ||||
-rw-r--r-- | util/options/build_opt_tbl.c | 14 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/mainboard/intel/xe7501devkit/cmos.layout b/src/mainboard/intel/xe7501devkit/cmos.layout index 57139c1cd5..39cfc31784 100644 --- a/src/mainboard/intel/xe7501devkit/cmos.layout +++ b/src/mainboard/intel/xe7501devkit/cmos.layout @@ -52,4 +52,5 @@ enumerations checksums # Checksum FROM bit-location TO bit-location STORE AT bit-location -#checksum 1024 1047 1048 +checksum 1024 1047 1048 + diff --git a/util/options/build_opt_tbl.c b/util/options/build_opt_tbl.c index 910c49cce2..b4e4151dc1 100644 --- a/util/options/build_opt_tbl.c +++ b/util/options/build_opt_tbl.c @@ -608,9 +608,17 @@ int main(int argc, char **argv) fprintf(fp, "#define CMOS_VLEN_%s %d\n", ce->name, ce->length); } - fprintf(fp, "\n#define LB_CKS_RANGE_START %d\n", cs->range_start / 8); - fprintf(fp, "#define LB_CKS_RANGE_END %d\n", cs->range_end / 8); - fprintf(fp, "#define LB_CKS_LOC %d\n", cs->location / 8); + + if (cs != NULL) { + fprintf(fp, "\n#define LB_CKS_RANGE_START %d\n", cs->range_start / 8); + fprintf(fp, "#define LB_CKS_RANGE_END %d\n", cs->range_end / 8); + fprintf(fp, "#define LB_CKS_LOC %d\n", cs->location / 8); + } else { + fprintf(stderr, "Error - No checksums defined.\n"); + fclose(fp); + unlink(tempfilename); + exit(1); + } fclose(fp); UNLINK_IF_NECESSARY(header); |