From ff87428098c30c0ce4e9246fe697cbd647c6134e Mon Sep 17 00:00:00 2001 From: Trammell hudson Date: Fri, 2 Feb 2018 16:27:13 -0500 Subject: [PATCH] remove vestiges of Makefile.nerf --- config/r630.config | 10 +--------- config/s2600wf.config | 12 ++---------- config/winterfell.config | 10 +--------- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/config/r630.config b/config/r630.config index 37ff8bae..437b521b 100644 --- a/config/r630.config +++ b/config/r630.config @@ -2,14 +2,6 @@ # flashrom doesn't work on this mainboard # and it is NERF, not coreboot. BOARD=r630 -NERF_SIZE=0xB30000 -PEI_OFFSET=0xE40000 -PEI_SIZE=0x1C0000 -ME_OFFSET=0x20000 -ME_SIZE=0x2F0000 -ROM_SIZE=16777216 - -CONFIG_EDK2=y #CONFIG_CRYPTSETUP=y CONFIG_FLASHROM=y @@ -28,7 +20,7 @@ CONFIG_DROPBEAR=y CONFIG_LINUX_USB=y CONFIG_LINUX_IGB=y CONFIG_LINUX_MEGARAID=y -#CONFIG_LINUX_E1000E=y +CONFIG_LINUX_E1000E=y CONFIG_BOOTSCRIPT=/bin/generic-init diff --git a/config/s2600wf.config b/config/s2600wf.config index be27731e..7724cd4b 100644 --- a/config/s2600wf.config +++ b/config/s2600wf.config @@ -10,18 +10,10 @@ # new firmware volume location. # BOARD=s2600wf -NERF_SIZE=0x400000 -PEI_OFFSET=0x3900000 -PEI_SIZE=0x0700000 -ME_OFFSET=0x20000 -ME_SIZE=0x2BE0000 -ROM_SIZE=67108864 - -CONFIG_EDK2=y #CONFIG_CRYPTSETUP=y #CONFIG_FLASHROM=y -#CONFIG_GPG=y +CONFIG_GPG=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y #CONFIG_LVM2=y @@ -31,7 +23,7 @@ CONFIG_PCIUTILS=y #CONFIG_QRENCODE=y #CONFIG_TPMTOTP=y #CONFIG_XEN=y -#CONFIG_DROPBEAR=y +CONFIG_DROPBEAR=y CONFIG_LINUX_USB=y #CONFIG_LINUX_IGB=y diff --git a/config/winterfell.config b/config/winterfell.config index 2f6cc30b..03a4ef7d 100644 --- a/config/winterfell.config +++ b/config/winterfell.config @@ -1,14 +1,6 @@ # Configuration for a Winterfell OCP node # and it is NERF, not coreboot. BOARD=winterfell -NERF_SIZE=0x700000 -PEI_OFFSET=0xF00000 -PEI_SIZE=0x100000 -ME_OFFSET=0x30000 -ME_SIZE=0x7D0000 -ROM_SIZE=16777216 - -CONFIG_EDK2=y #CONFIG_CRYPTSETUP=y CONFIG_FLASHROM=y @@ -27,7 +19,7 @@ CONFIG_DROPBEAR=y CONFIG_LINUX_USB=y CONFIG_LINUX_IGB=y CONFIG_LINUX_MEGARAID=y -#CONFIG_LINUX_E1000E=y +CONFIG_LINUX_MLX4=y CONFIG_BOOTSCRIPT=/bin/generic-init