diff --git a/Makefile b/Makefile
index bc09c4aa..5cad8bcc 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,11 @@ CROSS_TOOLS := \
 
 
 
+ifeq "$(CONFIG_COREBOOT)" "y"
 all: $(BOARD).rom
+else
+all: nerf-$(BOARD).rom
+endif
 
 # Disable all built in rules
 .SUFFIXES:
diff --git a/Makefile.nerf b/Makefile.nerf
index 4888a05b..ef7d9afb 100644
--- a/Makefile.nerf
+++ b/Makefile.nerf
@@ -220,4 +220,4 @@ acpi-lz.ffs: blobs/$(BOARD)/acpi-data.ffs
 		-o $@
 
 
-nerf.intermediate: nerf-$(BOARD).rom
+nerf.intermediate: edk2.intermediate nerf-$(BOARD).rom