-obj-y += mc146818rtc.o
-obj-y += isa-dma.o
-obj-y += i8259.o
-#obj-y += udelay_timer2.o CONFIG_UDELAY_TIMER2
-obj-$(CONFIG_UDELAY_IO) += udelay_io.o
-obj-y += keyboard.o
-
-#initobj-y += serial.o
+ramstage-y += mc146818rtc.c
+ramstage-y += isa-dma.c
+ramstage-y += i8259.c
+ramstage-$(CONFIG_UDELAY_IO) += udelay_io.c
+ramstage-y += keyboard.c
+
+romstage-$(CONFIG_USE_OPTION_TABLE) += mc146818rtc_early.c
+romstage-$(CONFIG_USBDEBUG) += usbdebug_serial.c
subdirs-y += vga
+
+$(obj)/pc80/mc146818rtc.ramstage.o : $(OPTION_TABLE_H)
+$(obj)/pc80/mc146818rtc_early.romstage.o : $(OPTION_TABLE_H)
+
+cbfs-files-$(CONFIG_HAVE_CMOS_DEFAULT) += $(CONFIG_CMOS_DEFAULT_FILE)
+$(CONFIG_CMOS_DEFAULT_FILE)-name := cmos.default
+$(CONFIG_CMOS_DEFAULT_FILE)-type := 0xaa
+