aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/arch/i386/Config.lb4
-rw-r--r--src/boot/hardwaremain.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/arch/i386/Config.lb b/src/arch/i386/Config.lb
index ec1dd1ee0d..4c0241d69c 100644
--- a/src/arch/i386/Config.lb
+++ b/src/arch/i386/Config.lb
@@ -79,8 +79,8 @@ if USE_FAILOVER_IMAGE
end
else
makerule coreboot.rom
- depends "coreboot.strip buildrom $(PAYLOAD-1)"
- action "./buildrom $< $@ $(PAYLOAD-1) $(ROM_IMAGE_SIZE) $(ROM_SECTION_SIZE)"
+ depends "coreboot.strip buildrom $(PAYLOAD-1)"
+ action "PAYLOAD=$(PAYLOAD-1); if [ $(CONFIG_ROMFS) -eq 1 ]; then PAYLOAD=/dev/null; fi; ./buildrom $< $@ $$PAYLOAD $(ROM_IMAGE_SIZE) $(ROM_SECTION_SIZE)"
end
end
diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index bf2853a4b9..74f3dfcd97 100644
--- a/src/boot/hardwaremain.c
+++ b/src/boot/hardwaremain.c
@@ -36,6 +36,7 @@ it with the version available from LANL.
#include <part/hard_reset.h>
#include <part/init_timer.h>
#include <boot/elf.h>
+#include <romfs.h>
/**
* @brief Main function of the DRAM part of coreboot.