diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 2555280456..68e5dcdd07 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -228,7 +228,7 @@ endif
 
 # Things that appear in every board
 romstage-srcs += $(objgenerated)/crt0.s
-ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/mainboard.c
+ramstage-srcs += $(wildcard src/mainboard/$(MAINBOARDDIR)/mainboard.c)
 ifeq ($(CONFIG_GENERATE_MP_TABLE),y)
 ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/mptable.c),)
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/mptable.c
diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index f5e6ac137f..8dfd50c47a 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -637,6 +637,7 @@ int main(int argc, char** argv) {
 				fprintf(autogen, "#include \"%s/chip.h\"\n", h->name);
 		}
 		fprintf(autogen, "\n#ifndef __PRE_RAM__\n");
+		fprintf(autogen, "__attribute__((weak)) struct chip_operations mainboard_ops = {};\n");
 		h = &headers;
 		while (h->next) {
 			h = h->next;
@@ -653,8 +654,6 @@ int main(int argc, char** argv) {
 			    "ROMSTAGE_CONST struct device * ROMSTAGE_CONST last_dev = &%s;\n", lastdev->name);
 #ifdef MAINBOARDS_HAVE_CHIP_H
 		fprintf(autogen, "static ROMSTAGE_CONST struct mainboard_config ROMSTAGE_CONST mainboard_info_0;\n");
-#else
-		fprintf(autogen, "extern struct chip_operations mainboard_ops;\n");
 #endif
 		walk_device_tree(autogen, &root, pass1, NULL);