rebase haswell nri patches to coreboot/default

scrap the haswell tree. handle mrc- and nri-based haswell
configurations from the same default coreboot tree

this means that it will now be possible to use it on the
dell 9020 sff/mt ports

only txtmode configs were available before, on libremrc
setups for w541/t440p. because the grub payload was added,
i've now added the corebootfb configs.

the libremrc configs have been re-done, by re-copying the
mrc ones and then turning off mrc, instead enabling nri

Signed-off-by: Leah Rowe <leah@libreboot.org>

config/coreboot/default/patches/0058-haswell-NRI-include-commonlib-bsd-clamp.h.patch

@@ -0,0 +1,109 @@
+From 0310d8b3fcf8f305f655dacc3322de60bdc2adc4 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <info@minifree.org>
+Date: Mon, 8 Apr 2024 00:38:18 +0100
+Subject: [PATCH 1/1] haswell NRI: include commonlib/bsd/clamp.h
+
+the location of clamp.h changed. these sources were rebased
+from an older coreboot revision. update to match new code.
+
+Signed-off-by: Leah Rowe <info@minifree.org>
+---
+ src/northbridge/intel/haswell/native_raminit/change_margin.c   | 2 +-
+ src/northbridge/intel/haswell/native_raminit/configure_mc.c    | 2 +-
+ src/northbridge/intel/haswell/native_raminit/init_mpll.c       | 2 +-
+ src/northbridge/intel/haswell/native_raminit/io_comp_control.c | 2 +-
+ src/northbridge/intel/haswell/native_raminit/lookup_timings.c  | 2 +-
+ src/northbridge/intel/haswell/native_raminit/timings_refresh.c | 2 +-
+ src/northbridge/intel/haswell/native_raminit/train_read_mpr.c  | 2 +-
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/northbridge/intel/haswell/native_raminit/change_margin.c b/src/northbridge/intel/haswell/native_raminit/change_margin.c
+index 4ba9cfa5c6..299c44a6b0 100644
+--- a/src/northbridge/intel/haswell/native_raminit/change_margin.c
++++ b/src/northbridge/intel/haswell/native_raminit/change_margin.c
+@@ -1,7 +1,7 @@
+ /* SPDX-License-Identifier: GPL-2.0-or-later */
+ 
+ #include <assert.h>
+-#include <commonlib/clamp.h>
++#include <commonlib/bsd/clamp.h>
+ #include <console/console.h>
+ #include <delay.h>
+ #include <northbridge/intel/haswell/haswell.h>
+diff --git a/src/northbridge/intel/haswell/native_raminit/configure_mc.c b/src/northbridge/intel/haswell/native_raminit/configure_mc.c
+index 2a667b075b..003fa0e941 100644
+--- a/src/northbridge/intel/haswell/native_raminit/configure_mc.c
++++ b/src/northbridge/intel/haswell/native_raminit/configure_mc.c
+@@ -1,7 +1,7 @@
+ /* SPDX-License-Identifier: GPL-2.0-or-later */
+ 
+ #include <assert.h>
+-#include <commonlib/clamp.h>
++#include <commonlib/bsd/clamp.h>
+ #include <console/console.h>
+ #include <delay.h>
+ #include <lib.h>
+diff --git a/src/northbridge/intel/haswell/native_raminit/init_mpll.c b/src/northbridge/intel/haswell/native_raminit/init_mpll.c
+index 2faa183724..1f3f2c29a9 100644
+--- a/src/northbridge/intel/haswell/native_raminit/init_mpll.c
++++ b/src/northbridge/intel/haswell/native_raminit/init_mpll.c
+@@ -1,6 +1,6 @@
+ /* SPDX-License-Identifier: GPL-2.0-or-later */
+ 
+-#include <commonlib/clamp.h>
++#include <commonlib/bsd/clamp.h>
+ #include <console/console.h>
+ #include <delay.h>
+ #include <device/pci_ops.h>
+diff --git a/src/northbridge/intel/haswell/native_raminit/io_comp_control.c b/src/northbridge/intel/haswell/native_raminit/io_comp_control.c
+index ad8c848e57..8a55fd81b2 100644
+--- a/src/northbridge/intel/haswell/native_raminit/io_comp_control.c
++++ b/src/northbridge/intel/haswell/native_raminit/io_comp_control.c
+@@ -1,6 +1,6 @@
+ /* SPDX-License-Identifier: GPL-2.0-or-later */
+ 
+-#include <commonlib/clamp.h>
++#include <commonlib/bsd/clamp.h>
+ #include <console/console.h>
+ #include <northbridge/intel/haswell/haswell.h>
+ #include <timer.h>
+diff --git a/src/northbridge/intel/haswell/native_raminit/lookup_timings.c b/src/northbridge/intel/haswell/native_raminit/lookup_timings.c
+index afe2c615d2..b8d6c1ef40 100644
+--- a/src/northbridge/intel/haswell/native_raminit/lookup_timings.c
++++ b/src/northbridge/intel/haswell/native_raminit/lookup_timings.c
+@@ -1,6 +1,6 @@
+ /* SPDX-License-Identifier: GPL-2.0-or-later */
+ 
+-#include <commonlib/clamp.h>
++#include <commonlib/bsd/clamp.h>
+ #include <types.h>
+ 
+ #include "raminit_native.h"
+diff --git a/src/northbridge/intel/haswell/native_raminit/timings_refresh.c b/src/northbridge/intel/haswell/native_raminit/timings_refresh.c
+index 20a05b359b..820bb336b0 100644
+--- a/src/northbridge/intel/haswell/native_raminit/timings_refresh.c
++++ b/src/northbridge/intel/haswell/native_raminit/timings_refresh.c
+@@ -1,7 +1,7 @@
+ /* SPDX-License-Identifier: GPL-2.0-or-later */
+ 
+ #include <assert.h>
+-#include <commonlib/clamp.h>
++#include <commonlib/bsd/clamp.h>
+ #include <console/console.h>
+ #include <delay.h>
+ #include <device/pci_ops.h>
+diff --git a/src/northbridge/intel/haswell/native_raminit/train_read_mpr.c b/src/northbridge/intel/haswell/native_raminit/train_read_mpr.c
+index 0225e1a384..86f79942d3 100644
+--- a/src/northbridge/intel/haswell/native_raminit/train_read_mpr.c
++++ b/src/northbridge/intel/haswell/native_raminit/train_read_mpr.c
+@@ -1,6 +1,6 @@
+ /* SPDX-License-Identifier: GPL-2.0-or-later */
+ 
+-#include <commonlib/clamp.h>
++#include <commonlib/bsd/clamp.h>
+ #include <console/console.h>
+ #include <delay.h>
+ #include <northbridge/intel/haswell/haswell.h>
+-- 
+2.39.2
+