summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2014-12-23 08:22:32 (EST)
committer Francis Rowe <info@gluglug.org.uk>2014-12-23 08:25:48 (EST)
commit61dd44646d515a42fe1145f9e7707b39e387a1b4 (patch)
treeaca5d4a00679249641b37186c8797fd00871bd2c
parent810f1c9142df5633359ca3b97c335cb7aa1a02ab (diff)
downloadlibreboot-61dd44646d515a42fe1145f9e7707b39e387a1b4.zip
libreboot-61dd44646d515a42fe1145f9e7707b39e387a1b4.tar.gz
libreboot-61dd44646d515a42fe1145f9e7707b39e387a1b4.tar.bz2
ich9deblob: move ich9desc.h to descriptor/struct.h
-rw-r--r--resources/utilities/ich9deblob/Makefile4
-rw-r--r--resources/utilities/ich9deblob/descriptor/struct.h (renamed from resources/utilities/ich9deblob/ich9desc.h)6
-rw-r--r--resources/utilities/ich9deblob/ich9deblob.c2
-rw-r--r--resources/utilities/ich9deblob/x86compatibility.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/resources/utilities/ich9deblob/Makefile b/resources/utilities/ich9deblob/Makefile
index 4214dcf..6d6a905 100644
--- a/resources/utilities/ich9deblob/Makefile
+++ b/resources/utilities/ich9deblob/Makefile
@@ -20,8 +20,8 @@
CC=gcc
CFLAGS=-I.
-ich9deblob: ich9deblob.c ich9desc.h gbe/struct.h
- $(CC) $(CFLAGS) ich9deblob.c ich9desc.h gbe/struct.h -o ich9deblob
+ich9deblob: ich9deblob.c descriptor/struct.h gbe/struct.h
+ $(CC) $(CFLAGS) ich9deblob.c descriptor/struct.h gbe/struct.h -o ich9deblob
clean:
rm -f ich9deblob *.o
diff --git a/resources/utilities/ich9deblob/ich9desc.h b/resources/utilities/ich9deblob/descriptor/struct.h
index 7463e5c..3f2656e 100644
--- a/resources/utilities/ich9deblob/ich9desc.h
+++ b/resources/utilities/ich9deblob/descriptor/struct.h
@@ -1,5 +1,5 @@
/*
- * ich9desc.h
+ * descriptor/struct.h
* This file is part of the ich9deblob utility from the libreboot project
*
* Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org>
@@ -26,8 +26,8 @@
// bit fields used, corresponding to datasheet. See links to datasheets
// and documentation in ich9deblob.c
-#ifndef ICH9DESC_H
-#define ICH9DESC_H
+#ifndef DESCRIPTORSTRUCT_H
+#define DESCRIPTORSTRUCT_H
#define DESCRIPTORREGIONSIZE 0x1000 // 4 KiB
diff --git a/resources/utilities/ich9deblob/ich9deblob.c b/resources/utilities/ich9deblob/ich9deblob.c
index 26fc9a7..2081bc4 100644
--- a/resources/utilities/ich9deblob/ich9deblob.c
+++ b/resources/utilities/ich9deblob/ich9deblob.c
@@ -42,7 +42,7 @@
#include <stdio.h>
#include <string.h>
-#include "ich9desc.h" // structs describing what's in the descriptor region
+#include "descriptor/struct.h" // structs describing what's in the descriptor region
#include "gbe/struct.h" // structs describing what's in the gbe region
#include "x86compatibility.c" // compatibility checks. this utility is not portable yet.
diff --git a/resources/utilities/ich9deblob/x86compatibility.c b/resources/utilities/ich9deblob/x86compatibility.c
index 9123a9f..56a0791 100644
--- a/resources/utilities/ich9deblob/x86compatibility.c
+++ b/resources/utilities/ich9deblob/x86compatibility.c
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
-#include "ich9desc.h" // structs describing what's in the descriptor region
+#include "descriptor/struct.h" // structs describing what's in the descriptor region
#include "gbe/struct.h" // structs describing what's in the gbe region
// ---------------------------------------------------------------------