summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2014-12-25 15:47:53 (EST)
committer Francis Rowe <info@gluglug.org.uk>2014-12-25 15:47:53 (EST)
commit1097b09af2d386900621a7733bd70a135929df32 (patch)
tree50ec5ced194088f441a94c9b6a0e72cf22ed83f8
parent24e129cc56f5f2d2866b7a02e19d25a735592f08 (diff)
downloadlibreboot-1097b09af2d386900621a7733bd70a135929df32.zip
libreboot-1097b09af2d386900621a7733bd70a135929df32.tar.gz
libreboot-1097b09af2d386900621a7733bd70a135929df32.tar.bz2
ich9deblob: move x86compatibility.c and .h to /common
-rw-r--r--resources/utilities/ich9deblob/Makefile18
-rw-r--r--resources/utilities/ich9deblob/common/x86compatibility.c (renamed from resources/utilities/ich9deblob/x86compatibility.c)0
-rw-r--r--resources/utilities/ich9deblob/common/x86compatibility.h (renamed from resources/utilities/ich9deblob/x86compatibility.h)4
-rw-r--r--resources/utilities/ich9deblob/ich9deblob.c8
4 files changed, 15 insertions, 15 deletions
diff --git a/resources/utilities/ich9deblob/Makefile b/resources/utilities/ich9deblob/Makefile
index ddf9c84..f9a6598 100644
--- a/resources/utilities/ich9deblob/Makefile
+++ b/resources/utilities/ich9deblob/Makefile
@@ -23,25 +23,25 @@ CFLAGS=-I. -Wall -g
all: ich9deblob
ich9deblob: ich9deblob.o common/descriptor_gbe.o descriptor/descriptor.o \
- gbe/gbe.o x86compatibility.o
+ gbe/gbe.o common/x86compatibility.o
- $(CC) $(CFLAGS) ich9deblob.o common/descriptor_gbe.o \
- descriptor/descriptor.o gbe/gbe.o x86compatibility.o -o ich9deblob
-
-common/descriptor_gbe.o: common/descriptor_gbe.c
- $(CC) $(CFLAGS) -c common/descriptor_gbe.c -o common/descriptor_gbe.o
+ $(CC) $(CFLAGS) ich9deblob.o common/descriptor_gbe.o common/x86compatibility.o \
+ descriptor/descriptor.o gbe/gbe.o -o ich9deblob
ich9deblob.o: ich9deblob.c
$(CC) $(CFLAGS) -c ich9deblob.c -o ich9deblob.o
+
+common/descriptor_gbe.o: common/descriptor_gbe.c
+ $(CC) $(CFLAGS) -c common/descriptor_gbe.c -o common/descriptor_gbe.o
+
+common/x86compatibility.o: common/x86compatibility.c
+ $(CC) $(CFLAGS) -c common/x86compatibility.c -o common/x86compatibility.o
descriptor/descriptor.o: descriptor/descriptor.c
$(CC) $(CFLAGS) -c descriptor/descriptor.c -o descriptor/descriptor.o
gbe/gbe.o: gbe/gbe.c
$(CC) $(CFLAGS) -c gbe/gbe.c -o gbe/gbe.o
-
-x86compatibility.o: x86compatibility.c
- $(CC) $(CFLAGS) -c x86compatibility.c -o x86compatibility.o
clean:
rm -f ich9deblob *.o */*.o
diff --git a/resources/utilities/ich9deblob/x86compatibility.c b/resources/utilities/ich9deblob/common/x86compatibility.c
index 46c60a7..46c60a7 100644
--- a/resources/utilities/ich9deblob/x86compatibility.c
+++ b/resources/utilities/ich9deblob/common/x86compatibility.c
diff --git a/resources/utilities/ich9deblob/x86compatibility.h b/resources/utilities/ich9deblob/common/x86compatibility.h
index 94e14e1..05f77f8 100644
--- a/resources/utilities/ich9deblob/x86compatibility.h
+++ b/resources/utilities/ich9deblob/common/x86compatibility.h
@@ -24,8 +24,8 @@
#ifndef X86COMPATIBILITY_H
#define X86COMPATIBILITY_H
-#include "descriptor/descriptor.h" /* structs describing what's in the descriptor region */
-#include "gbe/gbe.h" /* structs describing what's in the gbe region */
+#include "../descriptor/descriptor.h" /* structs describing what's in the descriptor region */
+#include "../gbe/gbe.h" /* structs describing what's in the gbe region */
int structSizesIncorrect(struct DESCRIPTORREGIONRECORD descriptorDummy, struct GBEREGIONRECORD_8K gbe8kDummy);
int systemIsBigEndian();
diff --git a/resources/utilities/ich9deblob/ich9deblob.c b/resources/utilities/ich9deblob/ich9deblob.c
index 6a4297c..5c607d8 100644
--- a/resources/utilities/ich9deblob/ich9deblob.c
+++ b/resources/utilities/ich9deblob/ich9deblob.c
@@ -46,10 +46,10 @@
#include <stdio.h>
#include <string.h>
-#include "common/descriptor_gbe.h" /* common descriptor/gbe functions used by ich9deblob */
-#include "descriptor/descriptor.h" /* structs describing what's in the descriptor region */
-#include "gbe/gbe.h" /* structs describing what's in the gbe region */
-#include "x86compatibility.h" /* system/compiler compatibility checks. This code is not portable. */
+#include "common/descriptor_gbe.h" /* common descriptor/gbe functions used by ich9deblob */
+#include "descriptor/descriptor.h" /* structs describing what's in the descriptor region */
+#include "gbe/gbe.h" /* structs describing what's in the gbe region */
+#include "common/x86compatibility.h" /* system/compiler compatibility checks. This code is not portable. */
int main(int argc, char *argv[])
{