From bf4446c900c3b714d819d40be2f0c9525cb37a0b Mon Sep 17 00:00:00 2001
From: Trammell hudson <hudson@trmm.net>
Date: Mon, 4 Dec 2017 15:31:18 -0500
Subject: [PATCH] Make DxeCore and others configurable

---
 Makefile.nerf         | 14 +++++++-------
 config/s2600wf.config |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.nerf b/Makefile.nerf
index 06f1952b..b4b76977 100644
--- a/Makefile.nerf
+++ b/Makefile.nerf
@@ -17,24 +17,24 @@ SmbiosProtocolGuid := {0x3583ff6, 0xcb36, 0x4940, { 0x94, 0x7e, 0xb9, 0xb3, 0x9f
 VariableArchProtocolGuid := { 0x1E5668E2, 0x8481, 0x11D4, { 0xBC, 0xF1, 0x00, 0x80, 0xC7, 0x3C, 0x88, 0x81 }}
 
 
-dxe-y += DxeCore
+dxe-$(CONFIG_BUNDLE_DXE) += DxeCore
 DxeCore-filetype := EFI_FV_FILETYPE_DXE_CORE
 DxeCore-guid := D6A2CB7F-6A18-4E2F-B43B-9920A733700A 
 #DxeCore-align := 1K
 
-dxe-y += RuntimeDxe
+dxe-$(CONFIG_BUNDLE_DXE) += RuntimeDxe
 RuntimeDxe-depex := TRUE
 RuntimeDxe-guid := B601F8C4-43B7-4784-95B1-F4226CB40CEE
 
-dxe-y += AcpiTableDxe
+dxe-$(CONFIG_BUNDLE_DXE) += AcpiTableDxe
 AcpiTableDxe-guid := 9622E42C-8E38-4a08-9E8F-54F784652F6B
 AcpiTableDxe-depex := $(RuntimeArchProtocolGuid)
 
-dxe-y += AcpiPlatform
+dxe-$(CONFIG_BUNDLE_DXE) += AcpiPlatform
 AcpiPlatform-guid := cb933912-df8f-4305-b1f9-7b44fa11395c
 AcpiPlatform-depex := $(RuntimeArchProtocolGuid) AND $(AcpiTableProtocolGuid)
 
-dxe-y += SmbiosDxe
+dxe-$(CONFIG_BUNDLE_DXE) += SmbiosDxe
 SmbiosDxe-guid := F9D88642-0737-49BC-81B5-6889CD57D9EA
 SmbiosDxe-depex := $(RuntimeArchProtocolGuid)
 
@@ -43,7 +43,7 @@ SmbiosDxe-depex := $(RuntimeArchProtocolGuid)
 dxe-n += VariableRuntimeDxe
 VariableRuntimeDxe-guid := CBD2E4D5-7068-4FF5-B462-9822B4AD8D60
 VariableRuntimeDxe-depex := $(RuntimeArchProtocolGuid)
-dxe-y += EmuVariableRuntimeDxe
+dxe-$(CONFIG_BUNDLE_DXE) += EmuVariableRuntimeDxe
 EmuVariableRuntimeDxe-guid := CBD2E4D5-7068-4FF5-B462-9822B4AD8D60
 EmuVariableRuntimeDxe-depex := $(RuntimeArchProtocolGuid)
 
@@ -157,7 +157,7 @@ $(build)/$(linux_dir)/arch/x86/boot/bzImage: linux.intermediate
 # up to PEI at 0xE40000, which leaves us almost 11 MB of space.
 #
 # x3550m5 -- pei starts at 0xb00000, bios is from 0x1000 == 0xaff
-nerf.vol: $(addsuffix .ffs,$(dxe-y)) Acpi-data.ffs  # blobs/r630/acpi-data.ffs.uncompressed
+nerf.vol: $(addsuffix .ffs,$(dxe-y)) # Acpi-data.ffs  # blobs/r630/acpi-data.ffs.uncompressed
 	$(EDK2_DIR)/GenFv \
 		--numberblock $$[$(NERF_SIZE)/0x1000] \
 		--blocksize 0x1000 \
diff --git a/config/s2600wf.config b/config/s2600wf.config
index 0c758551..c67c2984 100644
--- a/config/s2600wf.config
+++ b/config/s2600wf.config
@@ -1,7 +1,7 @@
 # Configuration for a Intel S2600wf server mainboard
 # and it is NERF, not coreboot.
 BOARD=s2600wf
-NERF_SIZE=0x900000
+NERF_SIZE=0x400000
 PEI_OFFSET=0x3900000
 PEI_SIZE=0x0700000
 ME_OFFSET=0x20000