Merge

diff --cc aseg/Makefile
index a43a1f2c985003fed658841fa4a46ef8bc1b29d6,1c2867d43c67275c20e3d73fcf76e41f145f29a8..e2edc87ff61e7c09ade13d64603ad8cba167e069
--- 1/aseg/Makefile
--- 2/aseg/Makefile
+++ b/aseg/Makefile
@@@ -1,6 -1,6 +1,6 @@@
  CC=gcc
- CFLAGS=-I../include -I../include/raw -nostdlib -nostdinc -fno-builtin -D__RAW__
- OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smi.o
+ CFLAGS=-I../include -I../include/raw -nostdlib -nostdinc -fno-builtin -D__RAW__ -Wall -Werror -pedantic -ansi -std=gnu99
 -OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o
++OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o ../ich2/smi.o
  
  all: aseg.elf
  

diff --cc aseg/counter.c
Simple merge

diff --cc aseg/firstrun.c
index 9977d148d77406cc776240cb14acd0387337eed2,355fb9a8acc67867e5b8effe3c1da19e6b2f2ad9..ca892ea0b3dd9b487973e157cd7426b475dc1c6b
--- 1/aseg/firstrun.c
--- 2/aseg/firstrun.c
+++ b/aseg/firstrun.c
@@@ -1,5 -1,5 +1,6 @@@
  #include <io.h>
 +#include <smi.h>
+ #include <pci.h>
  
  void __firstrun_start() {
  /*