From c954ec19472defefe748613ec85c7c30b65812e1 Mon Sep 17 00:00:00 2001 From: Trammell hudson Date: Mon, 20 Nov 2017 17:28:35 -0500 Subject: [PATCH] Fix default target for NERF and edk2 dependency (issue #284) --- Makefile | 4 ++++ Makefile.nerf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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