put all src downloads under src/

build/release/src was partly re-written to accomodate this memtest86plus was patched to have a central Makefile, and lbmk modified to use that, rather than mess with build32 and build64. the central Makefile just builds both targets or cleans both targets Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-10-06 22:59:36 +01:00 · 2023-10-06 22:59:36 +01:00 · 4e39d5a5a8
parent 965b6a7ed7
commit 4e39d5a5a8
103 changed files with 412 additions and 397 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,12 +5,9 @@
 /pciroms/
 /util/e6400-flash-unlock/e6400_flash_unlock
 /TODO
-/bios_extract/
 /ec/
 /tmp/
 /elf/
-/payload/
-/me_cleaner/
 *.s[a-w]?
 *.vim
 /*.elf
@ -18,20 +15,9 @@
 /*.rom
 /build_error
 /TODO/
-/docs/version
-/bucts/
-/coreboot/
-/crossgcc/
-/depthcharge/
-/flashrom/
 /config/*/*/seen
-/grub/
-/memtest86plus/
-/seabios/
-/u-boot/
 /bin/
 /release/
-/descriptors/
 /*.bin
 /push
 /version
@ -41,6 +27,4 @@
 *sch5545ec.bin
 /mrc/
 /util/nvmutil/nvm
-/biosutilities/
-/uefitool/
-/util-fw/
+/src/
--- a/6
+++ b/6
@ -15,7 +15,7 @@ set -u -e
 linkpath="${0}"
 linkname="${linkpath##*/}"
 buildpath="./script/${linkname}"
-eval "$(setvars "" mode option project version versiondate)"
+eval "$(setvars "" mode option project version versiondate aur_notice)"

 main()
 {
@ -61,7 +61,6 @@ install_packages()

 	[ -f "config/dependencies/${2}" ] || fail "Unsupported target"

-	aur_notice=""
 	. "config/dependencies/${2}"

 	xx_ ${pkg_add} ${pkglist}
@ -79,8 +78,7 @@ execute_command()
 	fi
 	lbmkcmd="${buildpath}/${mode}/${option}"
 	[ "${lbmkcmd}" = "./script/build/boot/roms" ] && \
-	    printf "NOTE: ./build boot roms now: ./build fw coreboot\n" \
-		    1>&2
+		printf "NOTE: ./build boot roms now: ./build fw coreboot\n" 1>&2
 	[ -f "${lbmkcmd}" ] || fail "Invalid command. Run: ${linkpath} help"
 	"${lbmkcmd}" $@ || fail "execute_command: ${lbmkcmd} ${@}"
 }
--- a/config/coreboot/e6400_4mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/e6400_4mb/config/libgfxinit_corebootfb
@ -148,10 +148,10 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/4_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_VGA_BIOS_FILE="../../pciroms/pci10de,06eb.rom"
+CONFIG_VGA_BIOS_FILE="../../../pciroms/pci10de,06eb.rom"
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_STMICRO=y
--- a/config/coreboot/e6400_4mb/config/libgfxinit_txtmode
+++ b/config/coreboot/e6400_4mb/config/libgfxinit_txtmode
@ -146,10 +146,10 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/4_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_VGA_BIOS_FILE="../../pciroms/pci10de,06eb.rom"
+CONFIG_VGA_BIOS_FILE="../../../pciroms/pci10de,06eb.rom"
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_STMICRO=y
--- a/config/coreboot/e6430_12mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/e6430_12mb/config/libgfxinit_corebootfb
@ -148,9 +148,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/e6430/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/e6430/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/e6430/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/e6430/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/e6430/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/e6430/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/e6430_12mb/config/libgfxinit_txtmode
+++ b/config/coreboot/e6430_12mb/config/libgfxinit_txtmode
@ -146,9 +146,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/e6430/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/e6430/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/e6430/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/e6430/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/e6430/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/e6430/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb
@ -149,9 +149,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/hp_ivybridge/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/hp_ivybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/hp_ivybridge/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/hp_ivybridge/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
@ -348,9 +348,9 @@ CONFIG_EC_HP_KBC1126=y
 CONFIG_KBC1126_FIRMWARE=y
 CONFIG_ECFW_PTR_ADDR=0xffffff00
 CONFIG_ECFW_PTR_SIZE=8
-CONFIG_KBC1126_FW1="../../ec/hp2170p/ec.bin.fw1"
+CONFIG_KBC1126_FW1="../../../ec/hp2170p/ec.bin.fw1"
 CONFIG_KBC1126_FW1_OFFSET=0xfffe8000
-CONFIG_KBC1126_FW2="../../ec/hp2170p/ec.bin.fw2"
+CONFIG_KBC1126_FW2="../../../ec/hp2170p/ec.bin.fw2"
 CONFIG_KBC1126_FW2_OFFSET=0xfffd0000

 #
--- a/config/coreboot/hp2170p_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/hp2170p_16mb/config/libgfxinit_txtmode
@ -147,9 +147,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/hp_ivybridge/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/hp_ivybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/hp_ivybridge/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/hp_ivybridge/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
@ -346,9 +346,9 @@ CONFIG_EC_HP_KBC1126=y
 CONFIG_KBC1126_FIRMWARE=y
 CONFIG_ECFW_PTR_ADDR=0xffffff00
 CONFIG_ECFW_PTR_SIZE=8
-CONFIG_KBC1126_FW1="../../ec/hp2170p/ec.bin.fw1"
+CONFIG_KBC1126_FW1="../../../ec/hp2170p/ec.bin.fw1"
 CONFIG_KBC1126_FW1_OFFSET=0xfffe8000
-CONFIG_KBC1126_FW2="../../ec/hp2170p/ec.bin.fw2"
+CONFIG_KBC1126_FW2="../../../ec/hp2170p/ec.bin.fw2"
 CONFIG_KBC1126_FW2_OFFSET=0xfffd0000

 #
--- a/config/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb
@ -147,9 +147,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/hp_sandybridge/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/hp_sandybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/hp_sandybridge/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_sandybridge/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/hp_sandybridge/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_sandybridge/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
@ -344,9 +344,9 @@ CONFIG_EC_HP_KBC1126=y
 CONFIG_KBC1126_FIRMWARE=y
 CONFIG_ECFW_PTR_ADDR=0xffffff00
 CONFIG_ECFW_PTR_SIZE=8
-CONFIG_KBC1126_FW1="../../ec/hp2560p/ec.bin.fw1"
+CONFIG_KBC1126_FW1="../../../ec/hp2560p/ec.bin.fw1"
 CONFIG_KBC1126_FW1_OFFSET=0xfffe8000
-CONFIG_KBC1126_FW2="../../ec/hp2560p/ec.bin.fw2"
+CONFIG_KBC1126_FW2="../../../ec/hp2560p/ec.bin.fw2"
 CONFIG_KBC1126_FW2_OFFSET=0xfffd0000

 #
--- a/config/coreboot/hp2560p_8mb/config/libgfxinit_txtmode
+++ b/config/coreboot/hp2560p_8mb/config/libgfxinit_txtmode
@ -145,9 +145,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/hp_sandybridge/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/hp_sandybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/hp_sandybridge/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_sandybridge/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/hp_sandybridge/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_sandybridge/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
@ -342,9 +342,9 @@ CONFIG_EC_HP_KBC1126=y
 CONFIG_KBC1126_FIRMWARE=y
 CONFIG_ECFW_PTR_ADDR=0xffffff00
 CONFIG_ECFW_PTR_SIZE=8
-CONFIG_KBC1126_FW1="../../ec/hp2560p/ec.bin.fw1"
+CONFIG_KBC1126_FW1="../../../ec/hp2560p/ec.bin.fw1"
 CONFIG_KBC1126_FW1_OFFSET=0xfffe8000
-CONFIG_KBC1126_FW2="../../ec/hp2560p/ec.bin.fw2"
+CONFIG_KBC1126_FW2="../../../ec/hp2560p/ec.bin.fw2"
 CONFIG_KBC1126_FW2_OFFSET=0xfffd0000

 #
--- a/config/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb
@ -146,9 +146,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/hp_ivybridge/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/hp_ivybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/hp_ivybridge/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/hp_ivybridge/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
@ -343,9 +343,9 @@ CONFIG_EC_HP_KBC1126=y
 CONFIG_KBC1126_FIRMWARE=y
 CONFIG_ECFW_PTR_ADDR=0xffffff00
 CONFIG_ECFW_PTR_SIZE=8
-CONFIG_KBC1126_FW1="../../ec/hp2570p/ec.bin.fw1"
+CONFIG_KBC1126_FW1="../../../ec/hp2570p/ec.bin.fw1"
 CONFIG_KBC1126_FW1_OFFSET=0xfffe8000
-CONFIG_KBC1126_FW2="../../ec/hp2570p/ec.bin.fw2"
+CONFIG_KBC1126_FW2="../../../ec/hp2570p/ec.bin.fw2"
 CONFIG_KBC1126_FW2_OFFSET=0xfffd0000

 #
--- a/config/coreboot/hp2570p_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/hp2570p_16mb/config/libgfxinit_txtmode
@ -144,9 +144,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/hp_ivybridge/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/hp_ivybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/hp_ivybridge/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/hp_ivybridge/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
@ -341,9 +341,9 @@ CONFIG_EC_HP_KBC1126=y
 CONFIG_KBC1126_FIRMWARE=y
 CONFIG_ECFW_PTR_ADDR=0xffffff00
 CONFIG_ECFW_PTR_SIZE=8
-CONFIG_KBC1126_FW1="../../ec/hp2570p/ec.bin.fw1"
+CONFIG_KBC1126_FW1="../../../ec/hp2570p/ec.bin.fw1"
 CONFIG_KBC1126_FW1_OFFSET=0xfffe8000
-CONFIG_KBC1126_FW2="../../ec/hp2570p/ec.bin.fw2"
+CONFIG_KBC1126_FW2="../../../ec/hp2570p/ec.bin.fw2"
 CONFIG_KBC1126_FW2_OFFSET=0xfffd0000

 #
--- a/config/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb
@ -147,9 +147,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/hp8200sff/ifd_4mb"
-CONFIG_ME_BIN_PATH="../../blobs/hp8200sff/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/hp8200sff/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8200sff/ifd_4mb"
+CONFIG_ME_BIN_PATH="../../../blobs/hp8200sff/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8200sff/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode
+++ b/config/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode
@ -145,9 +145,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/hp8200sff/ifd_4mb"
-CONFIG_ME_BIN_PATH="../../blobs/hp8200sff/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/hp8200sff/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8200sff/ifd_4mb"
+CONFIG_ME_BIN_PATH="../../../blobs/hp8200sff/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8200sff/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb
@ -147,9 +147,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/hp8200sff/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/hp8200sff/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/hp8200sff/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8200sff/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/hp8200sff/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8200sff/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode
+++ b/config/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode
@ -145,9 +145,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/hp8200sff/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/hp8200sff/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/hp8200sff/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8200sff/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/hp8200sff/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8200sff/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb
@ -147,9 +147,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/hp8300usdt/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/hp8300usdt/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/hp8300usdt/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8300usdt/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/hp8300usdt/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8300usdt/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode
@ -145,9 +145,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/hp8300usdt/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/hp8300usdt/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/hp8300usdt/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8300usdt/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/hp8300usdt/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8300usdt/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb
@ -148,9 +148,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/hp_ivybridge/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/hp_ivybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/hp_ivybridge/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/hp_ivybridge/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
@ -347,9 +347,9 @@ CONFIG_EC_HP_KBC1126=y
 CONFIG_KBC1126_FIRMWARE=y
 CONFIG_ECFW_PTR_ADDR=0xffffff00
 CONFIG_ECFW_PTR_SIZE=8
-CONFIG_KBC1126_FW1="../../ec/hp8470pintel/ec.bin.fw1"
+CONFIG_KBC1126_FW1="../../../ec/hp8470pintel/ec.bin.fw1"
 CONFIG_KBC1126_FW1_OFFSET=0xfffe8000
-CONFIG_KBC1126_FW2="../../ec/hp8470pintel/ec.bin.fw2"
+CONFIG_KBC1126_FW2="../../../ec/hp8470pintel/ec.bin.fw2"
 CONFIG_KBC1126_FW2_OFFSET=0xfffd0000

 #
--- a/config/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode
@ -146,9 +146,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/hp_ivybridge/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/hp_ivybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/hp_ivybridge/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/hp_ivybridge/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
@ -345,9 +345,9 @@ CONFIG_EC_HP_KBC1126=y
 CONFIG_KBC1126_FIRMWARE=y
 CONFIG_ECFW_PTR_ADDR=0xffffff00
 CONFIG_ECFW_PTR_SIZE=8
-CONFIG_KBC1126_FW1="../../ec/hp8470pintel/ec.bin.fw1"
+CONFIG_KBC1126_FW1="../../../ec/hp8470pintel/ec.bin.fw1"
 CONFIG_KBC1126_FW1_OFFSET=0xfffe8000
-CONFIG_KBC1126_FW2="../../ec/hp8470pintel/ec.bin.fw2"
+CONFIG_KBC1126_FW2="../../../ec/hp8470pintel/ec.bin.fw2"
 CONFIG_KBC1126_FW2_OFFSET=0xfffd0000

 #
--- a/config/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb
@ -147,9 +147,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/hp_ivybridge/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/hp_ivybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/hp_ivybridge/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/hp_ivybridge/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
@ -344,9 +344,9 @@ CONFIG_EC_HP_KBC1126=y
 CONFIG_KBC1126_FIRMWARE=y
 CONFIG_ECFW_PTR_ADDR=0xffffff00
 CONFIG_ECFW_PTR_SIZE=8
-CONFIG_KBC1126_FW1="../../ec/hp9470m/ec.bin.fw1"
+CONFIG_KBC1126_FW1="../../../ec/hp9470m/ec.bin.fw1"
 CONFIG_KBC1126_FW1_OFFSET=0xfffe8000
-CONFIG_KBC1126_FW2="../../ec/hp9470m/ec.bin.fw2"
+CONFIG_KBC1126_FW2="../../../ec/hp9470m/ec.bin.fw2"
 CONFIG_KBC1126_FW2_OFFSET=0xfffd0000

 #
--- a/config/coreboot/hp9470m_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/hp9470m_16mb/config/libgfxinit_txtmode
@ -145,9 +145,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/hp_ivybridge/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/hp_ivybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/hp_ivybridge/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/hp_ivybridge/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
@ -342,9 +342,9 @@ CONFIG_EC_HP_KBC1126=y
 CONFIG_KBC1126_FIRMWARE=y
 CONFIG_ECFW_PTR_ADDR=0xffffff00
 CONFIG_ECFW_PTR_SIZE=8
-CONFIG_KBC1126_FW1="../../ec/hp9470m/ec.bin.fw1"
+CONFIG_KBC1126_FW1="../../../ec/hp9470m/ec.bin.fw1"
 CONFIG_KBC1126_FW1_OFFSET=0xfffe8000
-CONFIG_KBC1126_FW2="../../ec/hp9470m/ec.bin.fw2"
+CONFIG_KBC1126_FW2="../../../ec/hp9470m/ec.bin.fw2"
 CONFIG_KBC1126_FW2_OFFSET=0xfffd0000

 #
--- a/config/coreboot/r400_16mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/r400_16mb/config/libgfxinit_corebootfb
@ -147,8 +147,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/16_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/r400_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/r400_16mb/config/libgfxinit_txtmode
@ -145,8 +145,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/16_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/r400_4mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/r400_4mb/config/libgfxinit_corebootfb
@ -147,8 +147,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/4_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/r400_4mb/config/libgfxinit_txtmode
+++ b/config/coreboot/r400_4mb/config/libgfxinit_txtmode
@ -145,8 +145,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/4_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/r400_8mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/r400_8mb/config/libgfxinit_corebootfb
@ -147,8 +147,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/8_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/r400_8mb/config/libgfxinit_txtmode
+++ b/config/coreboot/r400_8mb/config/libgfxinit_txtmode
@ -145,8 +145,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/8_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/r500_4mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/r500_4mb/config/libgfxinit_corebootfb
@ -147,7 +147,7 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/4_ifd_nogbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd_nogbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/r500_4mb/config/libgfxinit_txtmode
+++ b/config/coreboot/r500_4mb/config/libgfxinit_txtmode
@ -145,7 +145,7 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/4_ifd_nogbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd_nogbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t1650_12mb/config/libgfxinit_txtmode
+++ b/config/coreboot/t1650_12mb/config/libgfxinit_txtmode
@ -140,7 +140,7 @@ CONFIG_TPM_PIRQ=0x0
 CONFIG_BOARD_DELL_PRECISION_T1650=y
 CONFIG_BOARD_DELL_SNB_IVB_WORKSTATIONS=y
 CONFIG_INCLUDE_SMSC_SCH5545_EC_FW=y
-CONFIG_SMSC_SCH5545_EC_FW_FILE="../../blobs/t1650/sch5545ec.bin"
+CONFIG_SMSC_SCH5545_EC_FW_FILE="../../../blobs/t1650/sch5545ec.bin"
 CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
@ -154,9 +154,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/t1650/12_ifd"
-CONFIG_ME_BIN_PATH="../../blobs/t1650/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/t1650/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/t1650/12_ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/t1650/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/t1650/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t400_16mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/t400_16mb/config/libgfxinit_corebootfb
@ -147,8 +147,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/16_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t400_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/t400_16mb/config/libgfxinit_txtmode
@ -145,8 +145,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/16_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t400_4mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/t400_4mb/config/libgfxinit_corebootfb
@ -147,8 +147,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/4_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t400_4mb/config/libgfxinit_txtmode
+++ b/config/coreboot/t400_4mb/config/libgfxinit_txtmode
@ -145,8 +145,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/4_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t400_8mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/t400_8mb/config/libgfxinit_corebootfb
@ -147,8 +147,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/8_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t400_8mb/config/libgfxinit_txtmode
+++ b/config/coreboot/t400_8mb/config/libgfxinit_txtmode
@ -145,8 +145,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/8_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t420_8mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/t420_8mb/config/libgfxinit_corebootfb
@ -149,9 +149,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx20/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx20/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx20/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t420s_8mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/t420s_8mb/config/libgfxinit_corebootfb
@ -149,9 +149,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx20/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx20/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx20/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t420s_8mb/config/libgfxinit_txtmode
+++ b/config/coreboot/t420s_8mb/config/libgfxinit_txtmode
@ -147,9 +147,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx20/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx20/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx20/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t430_12mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/t430_12mb/config/libgfxinit_corebootfb
@ -148,9 +148,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx30/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t430_12mb/config/libgfxinit_txtmode
+++ b/config/coreboot/t430_12mb/config/libgfxinit_txtmode
@ -146,9 +146,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx30/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode
+++ b/config/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode
@ -142,9 +142,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/t440p/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/t440p/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/t440p/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/t440p/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/t440p/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/t440p/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_ENABLE_DDR_2X_REFRESH is not set
 CONFIG_PCIEXP_AER=y
--- a/config/coreboot/t440pmrc_12mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/t440pmrc_12mb/config/libgfxinit_corebootfb
@ -145,9 +145,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/t440p/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/t440p/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/t440p/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/t440p/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/t440p/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/t440p/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_ENABLE_DDR_2X_REFRESH is not set
 CONFIG_PCIEXP_AER=y
@ -261,7 +261,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
 CONFIG_INTEL_GMA_BCLM_WIDTH=16
 CONFIG_BOOTBLOCK_IN_CBFS=y
 CONFIG_HAVE_MRC=y
-CONFIG_MRC_FILE="../../mrc/haswell/mrc.bin"
+CONFIG_MRC_FILE="../../../mrc/haswell/mrc.bin"
 CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x30000
 CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
 CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
--- a/config/coreboot/t440pmrc_12mb/config/libgfxinit_txtmode
+++ b/config/coreboot/t440pmrc_12mb/config/libgfxinit_txtmode
@ -143,9 +143,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/t440p/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/t440p/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/t440p/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/t440p/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/t440p/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/t440p/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_ENABLE_DDR_2X_REFRESH is not set
 CONFIG_PCIEXP_AER=y
@ -259,7 +259,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
 CONFIG_INTEL_GMA_BCLM_WIDTH=16
 CONFIG_BOOTBLOCK_IN_CBFS=y
 CONFIG_HAVE_MRC=y
-CONFIG_MRC_FILE="../../mrc/haswell/mrc.bin"
+CONFIG_MRC_FILE="../../../mrc/haswell/mrc.bin"
 CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x30000
 CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
 CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
--- a/config/coreboot/t500_16mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/t500_16mb/config/libgfxinit_corebootfb
@ -147,8 +147,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/16_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t500_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/t500_16mb/config/libgfxinit_txtmode
@ -145,8 +145,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/16_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t500_4mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/t500_4mb/config/libgfxinit_corebootfb
@ -147,8 +147,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/4_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t500_4mb/config/libgfxinit_txtmode
+++ b/config/coreboot/t500_4mb/config/libgfxinit_txtmode
@ -145,8 +145,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/4_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t500_8mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/t500_8mb/config/libgfxinit_corebootfb
@ -147,8 +147,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/8_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t500_8mb/config/libgfxinit_txtmode
+++ b/config/coreboot/t500_8mb/config/libgfxinit_txtmode
@ -145,8 +145,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/8_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t520_8mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/t520_8mb/config/libgfxinit_corebootfb
@ -149,9 +149,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx20/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx20/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx20/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t520_8mb/config/libgfxinit_txtmode
+++ b/config/coreboot/t520_8mb/config/libgfxinit_txtmode
@ -147,9 +147,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx20/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx20/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx20/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t530_12mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/t530_12mb/config/libgfxinit_corebootfb
@ -148,9 +148,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx30/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/t530_12mb/config/libgfxinit_txtmode
+++ b/config/coreboot/t530_12mb/config/libgfxinit_txtmode
@ -146,9 +146,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx30/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/w500_16mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/w500_16mb/config/libgfxinit_corebootfb
@ -147,8 +147,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/16_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/w500_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/w500_16mb/config/libgfxinit_txtmode
@ -145,8 +145,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/16_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/w500_4mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/w500_4mb/config/libgfxinit_corebootfb
@ -147,8 +147,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/4_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/w500_4mb/config/libgfxinit_txtmode
+++ b/config/coreboot/w500_4mb/config/libgfxinit_txtmode
@ -145,8 +145,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/4_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/w500_8mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/w500_8mb/config/libgfxinit_corebootfb
@ -147,8 +147,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/8_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/w500_8mb/config/libgfxinit_txtmode
+++ b/config/coreboot/w500_8mb/config/libgfxinit_txtmode
@ -145,8 +145,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/8_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/w530_12mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/w530_12mb/config/libgfxinit_corebootfb
@ -148,9 +148,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx30/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/w530_12mb/config/libgfxinit_txtmode
+++ b/config/coreboot/w530_12mb/config/libgfxinit_txtmode
@ -146,9 +146,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx30/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/w541_12mb/config/libgfxinit_txtmode
+++ b/config/coreboot/w541_12mb/config/libgfxinit_txtmode
@ -142,9 +142,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/t440p/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/t440p/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/t440p/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/t440p/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/t440p/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/t440p/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_ENABLE_DDR_2X_REFRESH is not set
 CONFIG_PCIEXP_AER=y
--- a/config/coreboot/w541mrc_12mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/w541mrc_12mb/config/libgfxinit_corebootfb
@ -145,9 +145,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/t440p/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/t440p/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/t440p/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/t440p/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/t440p/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/t440p/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_ENABLE_DDR_2X_REFRESH is not set
 CONFIG_PCIEXP_AER=y
@ -261,7 +261,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
 CONFIG_INTEL_GMA_BCLM_WIDTH=16
 CONFIG_BOOTBLOCK_IN_CBFS=y
 CONFIG_HAVE_MRC=y
-CONFIG_MRC_FILE="../../mrc/haswell/mrc.bin"
+CONFIG_MRC_FILE="../../../mrc/haswell/mrc.bin"
 CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x30000
 CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
 CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
--- a/config/coreboot/w541mrc_12mb/config/libgfxinit_txtmode
+++ b/config/coreboot/w541mrc_12mb/config/libgfxinit_txtmode
@ -143,9 +143,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../config/ifd/t440p/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/t440p/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/t440p/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/t440p/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/t440p/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/t440p/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_ENABLE_DDR_2X_REFRESH is not set
 CONFIG_PCIEXP_AER=y
@ -259,7 +259,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
 CONFIG_INTEL_GMA_BCLM_WIDTH=16
 CONFIG_BOOTBLOCK_IN_CBFS=y
 CONFIG_HAVE_MRC=y
-CONFIG_MRC_FILE="../../mrc/haswell/mrc.bin"
+CONFIG_MRC_FILE="../../../mrc/haswell/mrc.bin"
 CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x30000
 CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
 CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
--- a/config/coreboot/x200_16mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/x200_16mb/config/libgfxinit_corebootfb
@ -147,8 +147,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/16_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x200_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/x200_16mb/config/libgfxinit_txtmode
@ -145,8 +145,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/16_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x200_4mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/x200_4mb/config/libgfxinit_corebootfb
@ -147,8 +147,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/4_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x200_4mb/config/libgfxinit_txtmode
+++ b/config/coreboot/x200_4mb/config/libgfxinit_txtmode
@ -145,8 +145,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/4_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x200_8mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/x200_8mb/config/libgfxinit_corebootfb
@ -147,8 +147,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/8_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x200_8mb/config/libgfxinit_txtmode
+++ b/config/coreboot/x200_8mb/config/libgfxinit_txtmode
@ -145,8 +145,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/8_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x220_8mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/x220_8mb/config/libgfxinit_corebootfb
@ -150,9 +150,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx20/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx20/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx20/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x220_8mb/config/libgfxinit_txtmode
+++ b/config/coreboot/x220_8mb/config/libgfxinit_txtmode
@ -148,9 +148,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx20/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx20/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx20/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x230_12mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/x230_12mb/config/libgfxinit_corebootfb
@ -149,9 +149,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx30/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x230_12mb/config/libgfxinit_txtmode
+++ b/config/coreboot/x230_12mb/config/libgfxinit_txtmode
@ -147,9 +147,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx30/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x230_16mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/x230_16mb/config/libgfxinit_corebootfb
@ -149,9 +149,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/16_ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx30/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/16_ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x230_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/x230_16mb/config/libgfxinit_txtmode
@ -147,9 +147,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/16_ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx30/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/16_ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x230edp_12mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/x230edp_12mb/config/libgfxinit_corebootfb
@ -149,9 +149,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx30/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x230edp_12mb/config/libgfxinit_txtmode
+++ b/config/coreboot/x230edp_12mb/config/libgfxinit_txtmode
@ -147,9 +147,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx30/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x230t_12mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/x230t_12mb/config/libgfxinit_corebootfb
@ -149,9 +149,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx30/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x230t_12mb/config/libgfxinit_txtmode
+++ b/config/coreboot/x230t_12mb/config/libgfxinit_txtmode
@ -147,9 +147,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx30/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x230t_16mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/x230t_16mb/config/libgfxinit_corebootfb
@ -149,9 +149,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/16_ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx30/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/16_ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x230t_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/x230t_16mb/config/libgfxinit_txtmode
@ -147,9 +147,9 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/16_ifd"
-CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../config/ifd/xx30/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/16_ifd"
+CONFIG_ME_BIN_PATH="../../../blobs/xx30/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x301_16mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/x301_16mb/config/libgfxinit_corebootfb
@ -147,8 +147,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/16_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x301_16mb/config/libgfxinit_txtmode
+++ b/config/coreboot/x301_16mb/config/libgfxinit_txtmode
@ -145,8 +145,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/16_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x301_4mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/x301_4mb/config/libgfxinit_corebootfb
@ -147,8 +147,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/4_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x301_4mb/config/libgfxinit_txtmode
+++ b/config/coreboot/x301_4mb/config/libgfxinit_txtmode
@ -145,8 +145,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/4_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x301_8mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/x301_8mb/config/libgfxinit_corebootfb
@ -147,8 +147,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/8_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/coreboot/x301_8mb/config/libgfxinit_txtmode
+++ b/config/coreboot/x301_8mb/config/libgfxinit_txtmode
@ -145,8 +145,8 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_IFD_BIN_PATH="../../config/ifd/ich9m/8_ifd"
-CONFIG_GBE_BIN_PATH="../../config/ifd/ich9m/gbe"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
--- a/config/git/serprog
+++ b/config/git/serprog
@ -1,27 +1,27 @@
-{rpi-pico-sdk}{
-	rev: 6a7db34ff63345a7badec79ebea3aaef1712f374
-	loc: util-fw/rp2040/pico-sdk
-	url: https://github.com/raspberrypi/pico-sdk
-}
-
-{rpi-pico-tinyusb}{
-	rev: 86c416d4c0fb38432460b3e11b08b9de76941bf5
-	loc: util-fw/rp2040/pico-sdk/lib/tinyusb
-	url: https://github.com/hathach/tinyusb.git
-}
-
 {rpi-pico-serprog}{
 	rev: c8c16e9c11fe9e5b7230ff358f79de3f1951e1d9
-	loc: util-fw/rp2040/pico-serprog
+	loc: pico-serprog
 	url: https://codeberg.org/libreboot/pico-serprog
 	bkup_url: https://notabug.org/libreboot/pico-serprog
 	depend: rpi-pico-sdk
 	depend: rpi-pico-tinyusb
 }

+{rpi-pico-sdk}{
+	rev: 6a7db34ff63345a7badec79ebea3aaef1712f374
+	loc: pico-sdk
+	url: https://github.com/raspberrypi/pico-sdk
+}
+
+{rpi-pico-tinyusb}{
+	rev: 86c416d4c0fb38432460b3e11b08b9de76941bf5
+	loc: pico-sdk/lib/tinyusb
+	url: https://github.com/hathach/tinyusb.git
+}
+
 {stm32-vserprog}{
 	rev: 8fcf0a4d41800631b571fa7bbd1d8b251f0a2111
-	loc: util-fw/stm32-vserprog
+	loc: stm32-vserprog
 	url: https://codeberg.org/libreboot/stm32-vserprog
 	bkup_url: https://notabug.org/libreboot/stm32-vserprog
 	depend: libopencm3
@ -29,6 +29,6 @@

 {libopencm3}{
 	rev: 458250dc6147dc807eec9e4d5a6caf38a699ecb1
-	loc: util-fw/stm32-vserprog/libopencm3
+	loc: stm32-vserprog/libopencm3
 	url: https://github.com/libopencm3/libopencm3
 }
--- a/config/memtest86plus/patches/0001-add-central-Makefile-in-main-directory.patch
+++ b/config/memtest86plus/patches/0001-add-central-Makefile-in-main-directory.patch
@ -0,0 +1,40 @@
+From 1727cb88a183a9e787e359e42c0a499917ba495b Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Fri, 6 Oct 2023 23:17:06 +0100
+Subject: [PATCH 1/1] add central Makefile in main directory
+
+it just runs the Makefiles in build32 and build64
+
+all, clean and distclean(runs clean) are supported
+
+this makes memtest86plus integrate easier in lbmk
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ Makefile | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+ create mode 100644 Makefile
+
+diff --git a/Makefile b/Makefile
+new file mode 100644
+index 0000000..50f2d58
+--- /dev/null
+++ b/Makefile
+@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org>
+
+all:
+	make -C build32
+	make -C build64
+
+clean:
+	make -C build32 clean
+	make -C build64 clean
+
+distclean:
+	make -C build32 clean
+	make -C build64 clean
+-- 
+2.39.2
+
--- a/include/blobutil.sh
+++ b/include/blobutil.sh
@ -6,19 +6,19 @@ _ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0"
 _7ztest="a"
 blobdir="blobs"
 appdir="${blobdir}/app"
-cbdir="coreboot/default"
+cbdir="src/coreboot/default"
 cbcfgsdir="config/coreboot"
 ifdtool="cbutils/default/ifdtool"
 cbfstool="cbutils/default/cbfstool"
 nvmutil="util/nvmutil/nvm"
 pciromsdir="pciroms"

-mecleaner="$(pwd)/me_cleaner/me_cleaner.py"
-me7updateparser="$(pwd)/util/me7_update_parser/me7_update_parser.py"
-e6400_unpack="$(pwd)/bios_extract/dell_inspiron_1100_unpacker.py"
-kbc1126_ec_dump="$(pwd)/${cbdir}/util/kbc1126/kbc1126_ec_dump"
-pfs_extract="$(pwd)/biosutilities/Dell_PFS_Extract.py"
-uefiextract="$(pwd)/uefitool/uefiextract"
+mecleaner="${PWD}/src/me_cleaner/me_cleaner.py"
+me7updateparser="${PWD}/util/me7_update_parser/me7_update_parser.py"
+e6400_unpack="${PWD}/src/bios_extract/dell_inspiron_1100_unpacker.py"
+kbc1126_ec_dump="${PWD}/${cbdir}/util/kbc1126/kbc1126_ec_dump"
+pfs_extract="${PWD}/src/biosutilities/Dell_PFS_Extract.py"
+uefiextract="${PWD}/src/uefitool/uefiextract"

 eval "$(setvars "" EC_url EC_url_bkup EC_hash DL_hash DL_url DL_url_bkup _dest \
    E6400_VGA_DL_hash E6400_VGA_DL_url E6400_VGA_DL_url_bkup E6400_VGA_offset \
@ -78,11 +78,10 @@ fetch()

 vendor_checksum()
 {
-	if [ "$(sha512sum ${2} | awk '{print $1}')" != "${1}" ]; then
-		printf "Bad checksum for file: %s\n" "${2}" 1>&2
-		rm -f "${2}" || :
-		return 1
-	fi
+	[ "$(sha512sum ${2} | awk '{print $1}')" != "${1}" ] || return 0 
+	printf "Bad checksum for file: %s\n" "${2}" 1>&2
+	rm -f "${2}" || :
+	return 1
 }

 mkdirs()
--- a/script/build/coreboot/grub
+++ b/script/build/coreboot/grub
@ -5,11 +5,12 @@
 [ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e

+. "include/err.sh"
+
 elfdir="elf/grub"
 grubcfgsdir="config/grub"
 layoutdir="/boot/grub/layouts"

-. "include/err.sh"
 . "${grubcfgsdir}/modules.list"

 main()
@ -21,16 +22,16 @@ main()

 handle_dependencies()
 {
-	[ -d "grub/" ] || x_ ./update project repo grub
-	[ -f "grub/grub-mkstandalone" ] || build_grub_utils
-	[ -d "${elfdir}" ] || x_ mkdir -p "${elfdir}"
+	[ -d "src/grub" ] || x_ ./update project repo grub
+	[ -f "src/grub/grub-mkstandalone" ] || build_grub_utils
+	x_ mkdir -p "${elfdir}"
 	x_ rm -f "${elfdir}/"*
 }

 build_grub_utils()
 {
 	(
-	x_ cd grub/
+	x_ cd "src/grub"
 	[ ! -d Makefile ] || x_ make distclean
 	x_ ./bootstrap --gnulib-srcdir=gnulib/ --no-git
 	x_ ./autogen.sh
@ -52,11 +53,11 @@ build_keymap_configs()

 build_grub_payload()
 {
-	grub/grub-mkstandalone \
-	    --grub-mkimage="grub/grub-mkimage" \
+	./src/grub/grub-mkstandalone \
+	    --grub-mkimage="src/grub/grub-mkimage" \
 	    -O i386-coreboot \
 	    -o "${elfdir}/grub.elf" \
-	    -d grub/grub-core/ \
+	    -d "src/grub/grub-core/" \
 	    --fonts= --themes= --locales=  \
 	    --modules="${grub_modules}" \
 	    --install-modules="${grub_install_modules}" \
--- a/script/build/coreboot/utils
+++ b/script/build/coreboot/utils
@ -29,13 +29,13 @@ build_for_mainboard() {
 }

 buildutils() {
-	[ -d "coreboot/${1}/" ] || \
+	[ -d "src/coreboot/${1}/" ] || \
 		x_ ./update project trees coreboot ${1}
 	for util in cbfstool ifdtool; do
 		[ -f "cbutils/${1}/${util}" ] && continue
 		[ -d "cbutils/${1}" ] || x_ mkdir -p "cbutils/${1}"

-		utildir="coreboot/${1}/util/${util}"
+		utildir="src/coreboot/${1}/util/${util}"
 		x_ make distclean -C "${utildir}"
 		x_ make -j$(nproc) -C "${utildir}"
 		x_ cp "${utildir}/${util}" "cbutils/${1}"
--- a/script/build/fw/coreboot
+++ b/script/build/fw/coreboot
@ -23,7 +23,7 @@ kmapdir="config/grub/keymap"
 # Disable all payloads by default.
 # target.cfg files have to specifically enable [a] payload(s)
 pv="payload_grub payload_grub_withseabios payload_seabios payload_memtest"
-pv="${pv} payload_seabios_withgrub payload_uboot"
+pv="${pv} payload_seabios_withgrub payload_uboot memtest_bin"
 v="romdir cbdir cbfstool cbrom initmode displaymode cbcfg targetdir tree arch"
 v="${v} grub_timeout ubdir blobs_required board grub_scan_disk uboot_config"
 eval "$(setvars "n" ${pv})"
@ -122,8 +122,8 @@ check_target()
 prepare_target()
 {
 	romdir="bin/${board}"
-	cbdir="coreboot/${board}"
-	[ "${board}" = "${tree}" ] || cbdir="coreboot/${tree}"
+	cbdir="src/coreboot/${board}"
+	[ "${board}" = "${tree}" ] || cbdir="src/coreboot/${tree}"
 	cbfstool="cbutils/${tree}/cbfstool"
 	cbrom="${cbdir}/build/coreboot.rom"

@ -132,8 +132,8 @@ prepare_target()
 	build_dependency_seabios

 	memtest_bin="memtest86plus/build${arch#*_}/memtest.bin"
-	[ "${payload_memtest}" != "y" ] || [ -f "${memtest_bin}" ] || \
-		x_ ./update project build -b ${memtest_bin%/*}
+	[ "${payload_memtest}" != "y" ] || [ -f "src/${memtest_bin}" ] || \
+		x_ ./update project build -b memtest86plus

 	x_ rm -f "${romdir}/"*

@ -226,7 +226,7 @@ build_roms()

 	[ "${payload_memtest}" != "y" ] || \
 		x_ "${cbfstool}" "${cbrom}" add-payload \
-		    -f "${memtest_bin}" -n img/memtest -c lzma
+		    -f "src/${memtest_bin}" -n img/memtest -c lzma
 	[ "${payload_seabios}" = "y" ] && \
 		build_seabios_roms
 	[ "${payload_grub}" != "y" ] || \
--- a/script/build/fw/serprog
+++ b/script/build/fw/serprog
@ -7,10 +7,12 @@ set -u -e

 . "include/err.sh"

-pico_src_dir=util-fw/rp2040/pico-serprog
-pico_sdk_dir=util-fw/rp2040/pico-sdk
+eval "$(setvars "" platform pico_sdk_dir pico_src_dir stm32_src_dir \
+    boards_dir)"

-stm32_src_dir=util-fw/stm32-vserprog
+pico_src_dir=src/pico-serprog
+pico_sdk_dir=src/pico-sdk
+stm32_src_dir=src/stm32-vserprog

 usage="usage: ./build firmware serprog <rp2040|stm32> [board]"

--- a/script/update/blobs/inject
+++ b/script/update/blobs/inject
@ -34,7 +34,6 @@ main()

 	printf "Friendly reminder (this is *not* an error message):\n"
 	printf "Please always ensure that the files were inserted correctly.\n"
-	printf "Read: https://libreboot.org/docs/install/ivy_has_common.html\n"
 }

 check_board()
@ -187,8 +186,7 @@ inject_blob_intel_mrc()

 	printf "adding mrc\n"

-	# mrc.bin must be inserted at a specific offset. the only
-	# libreboot platform that needs it, at present, is haswell
+	# mrc.bin must be inserted at a specific offset

 	# in cbfstool, -b values above 0x80000000 are interpreted as
 	# top-aligned x86 memory locations. this is converted into an
@ -197,7 +195,7 @@ inject_blob_intel_mrc()

 	# coreboot's own build system hardcodes the mrc.bin offset
 	# because there is only one correct location in memory, but
-	# it would be useful for lbmk if it could be easily scanned
+	# it would be useful for us if it could be easily scanned
 	# from Kconfig, with the option to change it where in practise
 	# it is not changed

@ -217,7 +215,7 @@ inject_blob_intel_me()
 	[ -z ${CONFIG_ME_BIN_PATH} ] && \
 		err "inject_blob_intel_me: CONFIG_ME_BIN_PATH not set"

-	_me_location=${CONFIG_ME_BIN_PATH#../../}
+	_me_location=${CONFIG_ME_BIN_PATH##*../}
 	[ ! -f "${_me_location}" ] && \
 		err "inject_blob_intel_me: per CONFIG_ME_BIN_PATH: file missing"

@ -228,9 +226,9 @@ inject_blob_hp_kbc1126_ec()
 {
 	rom="${1}"

-	_ec1_location="${CONFIG_KBC1126_FW1#../../}"
+	_ec1_location="${CONFIG_KBC1126_FW1##*../}"
 	_ec1_offset="${CONFIG_KBC1126_FW1_OFFSET}"
-	_ec2_location="${CONFIG_KBC1126_FW2#../../}"
+	_ec2_location="${CONFIG_KBC1126_FW2##*../}"
 	_ec2_offset="${CONFIG_KBC1126_FW2_OFFSET}"

 	printf "adding hp kbc1126 ec firmware\n"
@ -253,7 +251,7 @@ inject_blob_dell_e6400_vgarom_nvidia()
 {
 	rom="${1}"

-	_vga_location="${CONFIG_VGA_BIOS_FILE#../../}"
+	_vga_location="${CONFIG_VGA_BIOS_FILE##*../}"
 	_vga_dir="${_vga_location%/*}"
 	_vga_filename="${_vga_location##*/}"

@ -271,7 +269,7 @@ inject_blob_dell_e6400_vgarom_nvidia()
 inject_blob_smsc_sch5545_ec()
 {
 	rom="${1}"
-	_sch5545ec_location="${CONFIG_SMSC_SCH5545_EC_FW_FILE#../../}"
+	_sch5545ec_location="${CONFIG_SMSC_SCH5545_EC_FW_FILE##*../}"
 	[ -f "${_sch5545ec_location}" ] || \
 		err "inject_blob_smsc_sch5545_ec: SCH5545 fw missing"

@ -286,7 +284,7 @@ modify_gbe()
 		err "modify_gbe: ${board}: CONFIG_GBE_BIN_PATH not set"

 	rom="${1}"
-	_gbe_location=${CONFIG_GBE_BIN_PATH#../../}
+	_gbe_location=${CONFIG_GBE_BIN_PATH##*../}
 	[ -f "${_gbe_location}" ] || \
 		err "modify_gbe: CONFIG_GBE_BIN_PATH points to missing file"
 	[ -f "${nvmutil}" ] || \
--- a/script/update/project/build
+++ b/script/update/project/build
@ -33,7 +33,7 @@ main()
 		-x) mode="crossgcc-clean" ;;
 		*) err "Invalid option" ;;
 		esac
-		shift; project="${OPTARG}"; shift
+		shift; project="${OPTARG#src/}"; shift
 	done
 	[ -z ${_f} ] && err "flag not specified (-m, -u, -b, -c or -x)"
 	[ -z ${project} ] && err "project name not specified"
@ -48,15 +48,13 @@ main()
 build_projects()
 {
 	[ $# -gt 0 ] && x_ ./update project build ${_f} ${@}
-	codedir="${project}"
+	codedir="src/${project}"

-	[ -d "${codedir}" ] || x_ ./update project repo "${codedir%/*}"
-	[ -d "${codedir}" ] || \
-		err "build_targets: ${codedir%/*} not downloaded"
+	[ -d "${codedir}" ] || x_ ./update project repo "${project}"

 	if [ "${project}" = "uefitool" ]; then
 	(
-		x_ cd uefitool
+		x_ cd src/uefitool
 		cmake UEFIExtract/ || [ -f Makefile ] || \
 		    err "build_targets: !cmake UEFIExtract/"
 	)
@ -138,7 +136,7 @@ handle_src_tree()
 	[ -z ${arch} ] && \
 		err "handle_src_tree: ${target_dir}: undefined cpu type"

-	codedir="${project}/${tree}"
+	codedir="src/${project}/${tree}"
 	if [ ! -d "${codedir}" ]; then
 		if [ "${mode}" = "distclean" ] || \
 		    [ "${mode}" = "crossgcc-clean" ]; then
@ -171,13 +169,14 @@ check_cross_compiler()
 	[ "${crossgcc_ada}" != "y" ] && \
 		export BUILD_LANGUAGES=c

-	cbdir="coreboot/${tree}"
+	cbdir="src/coreboot/${tree}"
 	[ "${project}" != "coreboot" ] && \
-		cbdir="coreboot/default" # not u-boot (e.g. linux will use it)
+		cbdir="src/coreboot/default" # not u-boot (e.g. linux)
 	[ "${project}" = "u-boot" ] && \
-		cbdir="coreboot/cros" # u-boot only used on coreboot/cros
+		cbdir="src/coreboot/cros" # u-boot only used on coreboot/cros
+
 	# only true if not building coreboot:
-	ctarget="${cbdir#coreboot/}"
+	ctarget="${cbdir#src/coreboot/}"
 	[ -d "${cbdir}" ] || \
 		x_ ./update project trees coreboot ${ctarget}

--- a/script/update/project/repo
+++ b/script/update/project/repo
@ -16,7 +16,7 @@ main()
 	[ $# -gt 0 ] || fail "no argument given"

 	[ -z "${1+x}" ] && fail 'main(): name not set'
-	name=${1}
+	name=${1#src/}

 	scan_config "${name}" "config/git" "fail"
 	verify_config
@ -40,6 +40,9 @@ clone_project()
 	xx_ rm -Rf "${tmp_dir}"
 	xx_ mkdir -p "${tmp_dir%/*}"

+	loc="${loc#src/}"
+	loc="src/${loc}"
+
 	git clone ${url} "${tmp_dir}" || git clone ${bkup_url} "${tmp_dir}" || \
 	    fail "clone_project: could not download ${name}"
 	git_reset_rev "${tmp_dir}" "${rev}" "fail" || \
@ -47,8 +50,7 @@ clone_project()
 	git_am_patches "${tmp_dir}" "${PWD}/config/${name}/patches" "fail" || \
 	    fail "clone_project ${loc}/: cannot apply patches"

-	[ ! -d "${loc}" ] || \
-		xx_ rm -Rf "${loc}"
+	xx_ rm -Rf "${loc}"
 	[ "${loc}" = "${loc%/*}" ] || xx_ mkdir -p ${loc%/*}
 	xx_ mv "${tmp_dir}" "${loc}"
 }
--- a/Show More
+++ b/Show More