From d8a878600cbda7d20e0775db62b3964d1e3fb228 Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Tue, 23 Dec 2014 13:16:18 +0000 Subject: ich9deblob: move ich9gbe.h to gbe/struct.h --- resources/utilities/ich9deblob/Makefile | 4 +- resources/utilities/ich9deblob/gbe/struct.h | 54 +++++++++++++++++++++++ resources/utilities/ich9deblob/ich9deblob.c | 2 +- resources/utilities/ich9deblob/ich9gbe.h | 54 ----------------------- resources/utilities/ich9deblob/x86compatibility.c | 2 +- 5 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 resources/utilities/ich9deblob/gbe/struct.h delete mode 100644 resources/utilities/ich9deblob/ich9gbe.h (limited to 'resources') diff --git a/resources/utilities/ich9deblob/Makefile b/resources/utilities/ich9deblob/Makefile index 656e2a19..4214dcf2 100644 --- a/resources/utilities/ich9deblob/Makefile +++ b/resources/utilities/ich9deblob/Makefile @@ -20,8 +20,8 @@ CC=gcc CFLAGS=-I. -ich9deblob: ich9deblob.c ich9desc.h ich9gbe.h - $(CC) $(CFLAGS) ich9deblob.c ich9desc.h ich9gbe.h -o ich9deblob +ich9deblob: ich9deblob.c ich9desc.h gbe/struct.h + $(CC) $(CFLAGS) ich9deblob.c ich9desc.h gbe/struct.h -o ich9deblob clean: rm -f ich9deblob *.o diff --git a/resources/utilities/ich9deblob/gbe/struct.h b/resources/utilities/ich9deblob/gbe/struct.h new file mode 100644 index 00000000..3b49789f --- /dev/null +++ b/resources/utilities/ich9deblob/gbe/struct.h @@ -0,0 +1,54 @@ +/* + * gbe/struct.h + * This file is part of the ich9deblob utility from the libreboot project + * + * Copyright (C) 2014 Francis Rowe + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +// Purpose: provide struct representing gbe region. +// Map actual buffers of this regions, directly to instances of these +// structs. This makes working with gbe really easy. + +// bit fields used, corresponding to datasheet. See links to datasheets +// and documentation in ich9deblob.c + +#ifndef GBESTRUCT_H +#define GBESTRUCT_H + +#define GBEREGIONSIZE 0x2000 // 8 KiB +// These will have a modified descriptor+gbe based on what's in the factory.rom +// These will be joined into a single 12KiB buffer (descriptor, then gbe) and saved to a file +// NOTE: The GBE region of 8K is actually 2x 4K regions in a single region; both 4K blocks can be identical (and by default, are) +// The 2nd one is a "backup", but we don't know when it's used. perhaps it's used when the checksum on the first one does not match? + +struct GBEREGIONRECORD_4K { + unsigned char macAddress[6]; // 0x03 words, or 0x06 bytes + unsigned char otherStuff[120]; // 0x3c words, or 0x7E bytes + unsigned short checkSum; // when added to the sum of all words above, this should be 0xBABA + unsigned char padding1[3968]; +}; + +// main and backup region in gbe +struct GBEREGIONRECORD_8K { + struct GBEREGIONRECORD_4K main; + struct GBEREGIONRECORD_4K backup; + // Backup region: + // This is actually "main" on X200, since the real main has a bad checksum + // and other errors. You should do what you need on this one (if modifying + // lenovobios's gbe region) and then copy to main +}; + +#endif diff --git a/resources/utilities/ich9deblob/ich9deblob.c b/resources/utilities/ich9deblob/ich9deblob.c index 66b9c9ba..26fc9a78 100644 --- a/resources/utilities/ich9deblob/ich9deblob.c +++ b/resources/utilities/ich9deblob/ich9deblob.c @@ -43,7 +43,7 @@ #include #include #include "ich9desc.h" // structs describing what's in the descriptor region -#include "ich9gbe.h" // structs describing what's in the gbe region +#include "gbe/struct.h" // structs describing what's in the gbe region #include "x86compatibility.c" // compatibility checks. this utility is not portable yet. unsigned short gbeGetChecksumFrom4kStruct(struct GBEREGIONRECORD_4K gbeStruct4k, unsigned short desiredValue); diff --git a/resources/utilities/ich9deblob/ich9gbe.h b/resources/utilities/ich9deblob/ich9gbe.h deleted file mode 100644 index 26b125bc..00000000 --- a/resources/utilities/ich9deblob/ich9gbe.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * ich9gbe.h - * This file is part of the ich9deblob utility from the libreboot project - * - * Copyright (C) 2014 Francis Rowe - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// Purpose: provide struct representing gbe region. -// Map actual buffers of this regions, directly to instances of these -// structs. This makes working with gbe really easy. - -// bit fields used, corresponding to datasheet. See links to datasheets -// and documentation in ich9deblob.c - -#ifndef ICH9GBE_H -#define ICH9GBE_H - -#define GBEREGIONSIZE 0x2000 // 8 KiB -// These will have a modified descriptor+gbe based on what's in the factory.rom -// These will be joined into a single 12KiB buffer (descriptor, then gbe) and saved to a file -// NOTE: The GBE region of 8K is actually 2x 4K regions in a single region; both 4K blocks can be identical (and by default, are) -// The 2nd one is a "backup", but we don't know when it's used. perhaps it's used when the checksum on the first one does not match? - -struct GBEREGIONRECORD_4K { - unsigned char macAddress[6]; // 0x03 words, or 0x06 bytes - unsigned char otherStuff[120]; // 0x3c words, or 0x7E bytes - unsigned short checkSum; // when added to the sum of all words above, this should be 0xBABA - unsigned char padding1[3968]; -}; - -// main and backup region in gbe -struct GBEREGIONRECORD_8K { - struct GBEREGIONRECORD_4K main; - struct GBEREGIONRECORD_4K backup; - // Backup region: - // This is actually "main" on X200, since the real main has a bad checksum - // and other errors. You should do what you need on this one (if modifying - // lenovobios's gbe region) and then copy to main -}; - -#endif diff --git a/resources/utilities/ich9deblob/x86compatibility.c b/resources/utilities/ich9deblob/x86compatibility.c index 80aa0626..985cedfc 100644 --- a/resources/utilities/ich9deblob/x86compatibility.c +++ b/resources/utilities/ich9deblob/x86compatibility.c @@ -2,7 +2,7 @@ #include #include "ich9desc.h" // structs describing what's in the descriptor region -#include "ich9gbe.h" // structs describing what's in the gbe region +#include "gbe/struct.h" // structs describing what's in the gbe region // --------------------------------------------------------------------- // x86 compatibility checking: -- cgit v1.2.3-70-g09d2