diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 7617a002d2..41b668c2a7 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -288,7 +288,7 @@ endif
 
 kscope: $(obj)/mainboard/$(MAINBOARDDIR)/kscope/cscope.files
 	kscope $(obj)/mainboard/$(MAINBOARDDIR)/kscope
-ALLSRC=$(STAGE0_SRC) $(INITRAM_SRC) $(STAGE2_SRC) $(PCIROM_SRC)
+ALLSRC=$(STAGE0_SRC) $(INITRAM_SRC) $(STAGE2_SRC) $(PCIROM_SRC) $(STAGE2_DYNAMIC_SRC)
 $(obj)/mainboard/$(MAINBOARDDIR)/kscope/cscope.files: $(ALLSRC)
 	$(Q)mkdir -p $(obj)/mainboard/$(MAINBOARDDIR)/kscope
 	$(Q)cp cscope.proj $(obj)/mainboard/$(MAINBOARDDIR)/kscope
diff --git a/mainboard/via/Kconfig b/mainboard/via/Kconfig
index 23e054b774..fc37fccad5 100644
--- a/mainboard/via/Kconfig
+++ b/mainboard/via/Kconfig
@@ -30,7 +30,6 @@ config BOARD_VIA_EPIA_CN
 	select NORTHBRIDGE_VIA_CN700
 	select SOUTHBRIDGE_VIA_VT8237
 	select SUPERIO_VIA_VT1211
-	select PIRQ_TABLE
 	help
 	  VIA EPIA-CN
 
diff --git a/mainboard/via/epia-cn/cmos.layout b/mainboard/via/epia-cn/cmos.layout
index 4117089ab7..1c9a4b2f26 100644
--- a/mainboard/via/epia-cn/cmos.layout
+++ b/mainboard/via/epia-cn/cmos.layout
@@ -80,12 +80,12 @@ entries
 # coreboot config options: console
 392          3       e       5        baud_rate
 395          4       e       6        debug_level
-#399          1       r       0        unused
+399          1       r       0        unused
 
 # coreboot config options: southbridge
 408          1       e       1        nmi
 409          1       e       1        power_on_after_fail
-#410          6       r       0        unused
+410          6       r       0        unused
 
 # coreboot config options: bootloader
 416        512       s       0        boot_devices
@@ -124,8 +124,8 @@ enumerations
 6     9     Spew
 
 # -----------------------------------------------------------------
-checksums
+#checksums
 
-checksum 392 983 984
+#checksum 392 983 984