summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--resources/utilities/ich9deblob/Makefile13
-rw-r--r--resources/utilities/ich9deblob/common/descriptor_gbe.c (renamed from resources/utilities/ich9deblob/common/common.c)6
-rw-r--r--resources/utilities/ich9deblob/common/descriptor_gbe.h (renamed from resources/utilities/ich9deblob/common/common.h)8
-rw-r--r--resources/utilities/ich9deblob/ich9deblob.c2
4 files changed, 16 insertions, 13 deletions
diff --git a/resources/utilities/ich9deblob/Makefile b/resources/utilities/ich9deblob/Makefile
index 06b1e32..ddf9c84 100644
--- a/resources/utilities/ich9deblob/Makefile
+++ b/resources/utilities/ich9deblob/Makefile
@@ -22,11 +22,14 @@ CFLAGS=-I. -Wall -g
all: ich9deblob
-ich9deblob: ich9deblob.o common/common.o descriptor/descriptor.o gbe/gbe.o x86compatibility.o
- $(CC) $(CFLAGS) ich9deblob.o common/common.o descriptor/descriptor.o gbe/gbe.o x86compatibility.o -o ich9deblob
-
-common/common.o: common/common.c
- $(CC) $(CFLAGS) -c common/common.c -o common/common.o
+ich9deblob: ich9deblob.o common/descriptor_gbe.o descriptor/descriptor.o \
+ gbe/gbe.o 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
ich9deblob.o: ich9deblob.c
$(CC) $(CFLAGS) -c ich9deblob.c -o ich9deblob.o
diff --git a/resources/utilities/ich9deblob/common/common.c b/resources/utilities/ich9deblob/common/descriptor_gbe.c
index cef5b3e..8aba9db 100644
--- a/resources/utilities/ich9deblob/common/common.c
+++ b/resources/utilities/ich9deblob/common/descriptor_gbe.c
@@ -1,8 +1,8 @@
/*
- * common.c
+ * descriptor_gbe.c
* This file is part of the ich9deblob utility from the libreboot project
*
- * Purpose: common functions/methods used by ich9deblob
+ * Purpose: common descriptor/gbe functions used by ich9deblob
*
* Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org>
* Francis Rowe <info@gluglug.org.uk>
@@ -23,7 +23,7 @@
#include <stdio.h>
#include <string.h>
-#include "common.h"
+#include "descriptor_gbe.h"
/*
* create 12KiB file with descriptor, and then gbe immediately after.
diff --git a/resources/utilities/ich9deblob/common/common.h b/resources/utilities/ich9deblob/common/descriptor_gbe.h
index e72821d..cc0cc42 100644
--- a/resources/utilities/ich9deblob/common/common.h
+++ b/resources/utilities/ich9deblob/common/descriptor_gbe.h
@@ -1,8 +1,8 @@
/*
- * common.h
+ * gbe_descriptor.h
* This file is part of the ich9deblob utility from the libreboot project
*
- * Purpose: header file for common.c
+ * Purpose: header file for descriptor_gbe.c
*
* Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org>
* Francis Rowe <info@gluglug.org.uk>
@@ -21,8 +21,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef COMMON_DESCRIPTOR_GBE_H
+#define COMMON_DESCRIPTOR_GBE_H
#include <stdio.h>
#include <string.h>
diff --git a/resources/utilities/ich9deblob/ich9deblob.c b/resources/utilities/ich9deblob/ich9deblob.c
index fafa9a2..6a4297c 100644
--- a/resources/utilities/ich9deblob/ich9deblob.c
+++ b/resources/utilities/ich9deblob/ich9deblob.c
@@ -46,7 +46,7 @@
#include <stdio.h>
#include <string.h>
-#include "common/common.h" /* common functions used by ich9deblob */
+#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. */