From d8a878600cbda7d20e0775db62b3964d1e3fb228 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Tue, 23 Dec 2014 08:16:18 -0500
Subject: ich9deblob: move ich9gbe.h to gbe/struct.h

---
(limited to 'resources/utilities/ich9deblob')

diff --git a/resources/utilities/ich9deblob/Makefile b/resources/utilities/ich9deblob/Makefile
index 656e2a1..4214dcf 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/ich9gbe.h b/resources/utilities/ich9deblob/gbe/struct.h
index 26b125b..3b49789 100644
--- a/resources/utilities/ich9deblob/ich9gbe.h
+++ b/resources/utilities/ich9deblob/gbe/struct.h
@@ -1,5 +1,5 @@
 /*
- *  ich9gbe.h
+ *  gbe/struct.h
  *  This file is part of the ich9deblob utility from the libreboot project
  *
  *  Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk>
@@ -25,8 +25,8 @@
 // bit fields used, corresponding to datasheet. See links to datasheets
 // and documentation in ich9deblob.c
 
-#ifndef ICH9GBE_H
-#define ICH9GBE_H
+#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
diff --git a/resources/utilities/ich9deblob/ich9deblob.c b/resources/utilities/ich9deblob/ich9deblob.c
index 66b9c9b..26fc9a7 100644
--- a/resources/utilities/ich9deblob/ich9deblob.c
+++ b/resources/utilities/ich9deblob/ich9deblob.c
@@ -43,7 +43,7 @@
 #include <stdio.h>
 #include <string.h>
 #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/x86compatibility.c b/resources/utilities/ich9deblob/x86compatibility.c
index 80aa062..985cedf 100644
--- a/resources/utilities/ich9deblob/x86compatibility.c
+++ b/resources/utilities/ich9deblob/x86compatibility.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #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 v0.9.1