From 789ebb2d04033053b3cfeaa73648e3a1c3b3d8f5 Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Sat, 10 Oct 2009 18:12:19 -0400 Subject: [PATCH] More churn moving files around. --- .gitignore | 2 ++ grubload/Makefile | 4 ++-- {ich2 => hardware/ich2}/Makefile | 0 hardware/ich2/config.mk | 4 ++++ {ich2 => hardware/ich2}/ich2-timer.c | 0 {ich2 => hardware/ich2}/smi.c | 0 {ich2 => hardware/ich2}/smm-open-ich2.c | 0 {ich2 => hardware/ich2}/smram-hardware.h | 0 {ich2 => hardware/ich2}/smram-ich2.c | 0 {ich2 => hardware/ich2}/smram-ich2.h | 0 {ich7 => hardware/ich7}/reg-82865.h | 0 {ich7 => hardware/ich7}/smm-open-ich7.c | 0 {net => hardware/net}/3c90x.c | 0 {video => hardware/video}/fb.c | 0 {video => hardware/video}/generic.c | 0 {video => hardware/video}/generic.h | 0 {video => hardware/video}/text.c | 0 {video => hardware/video}/tnt2.c | 0 ich2/config.mk | 4 ---- netwatch/Makefile | 14 +++++++------- 20 files changed, 15 insertions(+), 13 deletions(-) rename {ich2 => hardware/ich2}/Makefile (100%) create mode 100644 hardware/ich2/config.mk rename {ich2 => hardware/ich2}/ich2-timer.c (100%) rename {ich2 => hardware/ich2}/smi.c (100%) rename {ich2 => hardware/ich2}/smm-open-ich2.c (100%) rename {ich2 => hardware/ich2}/smram-hardware.h (100%) rename {ich2 => hardware/ich2}/smram-ich2.c (100%) rename {ich2 => hardware/ich2}/smram-ich2.h (100%) rename {ich7 => hardware/ich7}/reg-82865.h (100%) rename {ich7 => hardware/ich7}/smm-open-ich7.c (100%) rename {net => hardware/net}/3c90x.c (100%) rename {video => hardware/video}/fb.c (100%) rename {video => hardware/video}/generic.c (100%) rename {video => hardware/video}/generic.h (100%) rename {video => hardware/video}/text.c (100%) rename {video => hardware/video}/tnt2.c (100%) delete mode 100644 ich2/config.mk diff --git a/.gitignore b/.gitignore index 64c574e..20cefde 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ *.o *.bin *.elf +grubload/smmload +hardware/ich2/smram-ich2 \ No newline at end of file diff --git a/grubload/Makefile b/grubload/Makefile index 7e9a93e..8aae1dd 100644 --- a/grubload/Makefile +++ b/grubload/Makefile @@ -1,9 +1,9 @@ -include ../config.mk --include ../ich2/config.mk +-include ../hardware/ich2/config.mk OBJS=main.o mbentry.o realmode.o loader.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o $(CHIP_OBJS) output.o ../lib/sprintf.o ../lib/doprnt.o ../pci/pci.o CC=$(CROSS)gcc -CFLAGS=-nostdlib -I../include -I../include/raw -I. -D__RAW__ -fno-builtin -nostdinc -Wall -Werror -pedantic -std=gnu99 +CFLAGS+=-nostdlib -I../include -I../include/raw -I. -D__RAW__ -fno-builtin -nostdinc -Wall -Werror -pedantic -std=gnu99 all: smmload diff --git a/ich2/Makefile b/hardware/ich2/Makefile similarity index 100% rename from ich2/Makefile rename to hardware/ich2/Makefile diff --git a/hardware/ich2/config.mk b/hardware/ich2/config.mk new file mode 100644 index 0000000..b2bb064 --- /dev/null +++ b/hardware/ich2/config.mk @@ -0,0 +1,4 @@ +CFLAGS += -DNETWATCH_ICH2 -I../hardware/ich2 +CHIP_OBJS += ../hardware/ich2/ich2-timer.o \ + ../hardware/ich2/smi.o \ + ../hardware/ich2/smram-ich2.o diff --git a/ich2/ich2-timer.c b/hardware/ich2/ich2-timer.c similarity index 100% rename from ich2/ich2-timer.c rename to hardware/ich2/ich2-timer.c diff --git a/ich2/smi.c b/hardware/ich2/smi.c similarity index 100% rename from ich2/smi.c rename to hardware/ich2/smi.c diff --git a/ich2/smm-open-ich2.c b/hardware/ich2/smm-open-ich2.c similarity index 100% rename from ich2/smm-open-ich2.c rename to hardware/ich2/smm-open-ich2.c diff --git a/ich2/smram-hardware.h b/hardware/ich2/smram-hardware.h similarity index 100% rename from ich2/smram-hardware.h rename to hardware/ich2/smram-hardware.h diff --git a/ich2/smram-ich2.c b/hardware/ich2/smram-ich2.c similarity index 100% rename from ich2/smram-ich2.c rename to hardware/ich2/smram-ich2.c diff --git a/ich2/smram-ich2.h b/hardware/ich2/smram-ich2.h similarity index 100% rename from ich2/smram-ich2.h rename to hardware/ich2/smram-ich2.h diff --git a/ich7/reg-82865.h b/hardware/ich7/reg-82865.h similarity index 100% rename from ich7/reg-82865.h rename to hardware/ich7/reg-82865.h diff --git a/ich7/smm-open-ich7.c b/hardware/ich7/smm-open-ich7.c similarity index 100% rename from ich7/smm-open-ich7.c rename to hardware/ich7/smm-open-ich7.c diff --git a/net/3c90x.c b/hardware/net/3c90x.c similarity index 100% rename from net/3c90x.c rename to hardware/net/3c90x.c diff --git a/video/fb.c b/hardware/video/fb.c similarity index 100% rename from video/fb.c rename to hardware/video/fb.c diff --git a/video/generic.c b/hardware/video/generic.c similarity index 100% rename from video/generic.c rename to hardware/video/generic.c diff --git a/video/generic.h b/hardware/video/generic.h similarity index 100% rename from video/generic.h rename to hardware/video/generic.h diff --git a/video/text.c b/hardware/video/text.c similarity index 100% rename from video/text.c rename to hardware/video/text.c diff --git a/video/tnt2.c b/hardware/video/tnt2.c similarity index 100% rename from video/tnt2.c rename to hardware/video/tnt2.c diff --git a/ich2/config.mk b/ich2/config.mk deleted file mode 100644 index 5164324..0000000 --- a/ich2/config.mk +++ /dev/null @@ -1,4 +0,0 @@ -CFLAGS += -DNETWATCH_ICH2 -I../ich2 -CHIP_OBJS += ../ich2/ich2-timer.o \ - ../ich2/smi.o \ - ../ich2/smram-ich2.o diff --git a/netwatch/Makefile b/netwatch/Makefile index 11a837b..f36ac5f 100644 --- a/netwatch/Makefile +++ b/netwatch/Makefile @@ -1,8 +1,8 @@ -include ../config.mk --include ../ich2/config.mk +-include ../hardware/ich2/config.mk CC=$(CROSS)gcc -CFLAGS+=-I../include -I../include/raw \ +CFLAGS+=-I../include -I../net -I../include/raw \ -I../lwip/src/include -I../lwip/src/include/ipv4 \ -nostdlib -nostdinc -fno-builtin -D__RAW__ \ -Wall -Werror -std=gnu99 -Wstrict-aliasing=2 \ @@ -44,12 +44,12 @@ OBJS = $(CHIP_OBJS) \ ../net/net.o \ ../net/http/fs.o \ ../net/http/httpd.o \ - ../net/3c90x.o \ + ../hardware/net/3c90x.o \ ../net/rfb.o \ - ../video/tnt2.o \ - ../video/fb.o \ - ../video/generic.o \ - ../video/text.o \ + ../hardware/video/tnt2.o \ + ../hardware/video/fb.o \ + ../hardware/video/generic.o \ + ../hardware/video/text.o \ drivers.o \ ../lib/minilib.o \ ../lib/doprnt.o \ -- 2.39.2