Homogenize filenames for ICH2.

diff --git a/hardware/ich2/Makefile b/hardware/ich2/Makefile
index d383a50acc95e3c25387e3c822e3d732f5ad7ef8..748c9c198e0e8ab047919cabc3c086b4af2d5a9a 100644 (file)
--- a/hardware/ich2/Makefile
+++ b/hardware/ich2/Makefile
@@ -1,5 +1,5 @@
 smram-ich2: smm-open-ich2.c
-       gcc -o smram-ich2 smm-open-ich2.c ../pci/pci-linux.c -I../include
+       gcc -o smram-ich2 smm-open-ich2.c ../../pci/pci-linux.c -I../../include
 
 clean:
        rm -f smram-ich2

diff --git a/hardware/ich2/config.mk b/hardware/ich2/config.mk
index b2bb0646741f9d01cfac1da003d768a2090c51fe..c736963e0e7651bf30664c9eb3c4af79116ce93e 100644 (file)
--- a/hardware/ich2/config.mk
+++ b/hardware/ich2/config.mk
@@ -1,4 +1,4 @@
 CFLAGS += -DNETWATCH_ICH2 -I../hardware/ich2
-CHIP_OBJS += ../hardware/ich2/ich2-timer.o \
+CHIP_OBJS += ../hardware/ich2/timer.o \
              ../hardware/ich2/smi.o \
-             ../hardware/ich2/smram-ich2.o
+             ../hardware/ich2/smram.o

diff --git a/hardware/ich2/smm-open-ich2.c b/hardware/ich2/smm-open-ich2.c
index 813196106159d679a4b6bf5470bc6866ebb9449c..d7fb9cd420198a3157ed1f7d73339f1d992868ee 100644 (file)
--- a/hardware/ich2/smm-open-ich2.c
+++ b/hardware/ich2/smm-open-ich2.c
@@ -1,5 +1,5 @@
 /* smm-open-ich2.c
- * SMRAM control utility for ICH2 southbridge
+ * SMRAM control utility for ICH2 northbridge
  * NetWatch system management mode administration console
  *
  * Copyright (c) 2008 Jacob Potter and Joshua Wise.  All rights reserved.

diff --git a/hardware/ich2/smram-ich2.c b/hardware/ich2/smram.c
similarity index 99%
rename from hardware/ich2/smram-ich2.c
rename to hardware/ich2/smram.c
index 044191429b54458bfca85eb1b9bdfc7e54f3f358..b3488b21a5b828bd42c6b9bb61755659b2bba87e 100644 (file)
--- a/hardware/ich2/smram-ich2.c
+++ b/hardware/ich2/smram.c
@@ -1,4 +1,4 @@
-/* smram-ich2.c
+/* smram.c
  * SMRAM access utility for ICH2 chipset
  * NetWatch system management mode administration console
  *

diff --git a/hardware/ich2/ich2-timer.c b/hardware/ich2/timer.c
similarity index 98%
rename from hardware/ich2/ich2-timer.c
rename to hardware/ich2/timer.c
index b8f7e1cce79e10bbf0f871c2e24312b03ce15536..2b1a615c250549fb0a7e19ac68a8ea480894e198 100644 (file)
--- a/hardware/ich2/ich2-timer.c
+++ b/hardware/ich2/timer.c
@@ -1,4 +1,4 @@
-/* ich2-timer.c
+/* timer.c
  * High precision timer routines for ICH2 southbridge
  * NetWatch system management mode administration console
  *