move ifd/gbe configs into config/ifd/

it doesn't really make sense for them to be under
blobs/ - nominally, they are blobs, but they are
well-understood data files containing config data,
that is easily parsed by tools like ich9show or
ifdtool (and tools like bincfg or nvmutil)

blobs/ has been re-purposed: this directory no longer
exists in lbmk, but it is created (and on .gitignore)
when needed, by blobutil

thus, the blobs/ directory shall only contain vendor
files, and only those files that libreboot scrubs from
releases. therefore, build/release/src can (and has
been) simplified; it currently copies just the ifd and
gbe files from blobs/, selectively, and this logic is
quite error prone, requiring maintenance. now, the
build/release/src script simply copies config/ (which
only ever contains distributable files) and entirely
ignores the blobs/ directory

the blob download script already creates the required
directory, except for the sch5545 download; this is
now fixed

lbmk code size is slightly smaller, due to this patch

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

116 files changed, 179 insertions, 198 deletions

diff --git a/.gitignore b/.gitignore
index 45dab601..def2cb04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,8 +41,7 @@
 /push
 /version
 /versiondate
-/blobs/app/
-/blobs/cache/
+/blobs/
 *me.bin
 *sch5545ec.bin
 /mrc/
diff --git a/blobs/e6430/gbe.bin b/config/ifd/e6430/gbe
index a256f571..a256f571 100644
--- a/blobs/e6430/gbe.bin
+++ b/config/ifd/e6430/gbe
diff --git a/blobs/e6430/ifd.bin b/config/ifd/e6430/ifd
index fe166bc7..fe166bc7 100644
--- a/blobs/e6430/ifd.bin
+++ b/config/ifd/e6430/ifd
diff --git a/blobs/hp8200sff/gbe.bin b/config/ifd/hp8200sff/gbe
index 7e8776f9..7e8776f9 100644
--- a/blobs/hp8200sff/gbe.bin
+++ b/config/ifd/hp8200sff/gbe
diff --git a/blobs/hp8200sff/ifd.bin b/config/ifd/hp8200sff/ifd
index db10f57f..db10f57f 100644
--- a/blobs/hp8200sff/ifd.bin
+++ b/config/ifd/hp8200sff/ifd
diff --git a/blobs/hp8200sff/ifd_4mb.bin b/config/ifd/hp8200sff/ifd_4mb
index fef35107..fef35107 100644
--- a/blobs/hp8200sff/ifd_4mb.bin
+++ b/config/ifd/hp8200sff/ifd_4mb
diff --git a/blobs/hp8300usdt/gbe.bin b/config/ifd/hp8300usdt/gbe
index e959787f..e959787f 100644
--- a/blobs/hp8300usdt/gbe.bin
+++ b/config/ifd/hp8300usdt/gbe
diff --git a/blobs/hp8300usdt/ifd.bin b/config/ifd/hp8300usdt/ifd
index 3b81b704..3b81b704 100644
--- a/blobs/hp8300usdt/ifd.bin
+++ b/config/ifd/hp8300usdt/ifd
diff --git a/blobs/hp_ivybridge/gbe.bin b/config/ifd/hp_ivybridge/gbe
index aa9556f0..aa9556f0 100644
--- a/blobs/hp_ivybridge/gbe.bin
+++ b/config/ifd/hp_ivybridge/gbe
diff --git a/blobs/hp_ivybridge/ifd.bin b/config/ifd/hp_ivybridge/ifd
index cc11e466..cc11e466 100644
--- a/blobs/hp_ivybridge/ifd.bin
+++ b/config/ifd/hp_ivybridge/ifd
diff --git a/blobs/hp_sandybridge/gbe.bin b/config/ifd/hp_sandybridge/gbe
index e0179de2..e0179de2 100644
--- a/blobs/hp_sandybridge/gbe.bin
+++ b/config/ifd/hp_sandybridge/gbe
diff --git a/blobs/hp_sandybridge/ifd.bin b/config/ifd/hp_sandybridge/ifd
index 3838bab0..3838bab0 100644
--- a/blobs/hp_sandybridge/ifd.bin
+++ b/config/ifd/hp_sandybridge/ifd
diff --git a/blobs/ich9m/16_ifd.bin b/config/ifd/ich9m/16_ifd
index e9dd5b64..e9dd5b64 100644
--- a/blobs/ich9m/16_ifd.bin
+++ b/config/ifd/ich9m/16_ifd
diff --git a/blobs/ich9m/4_ifd.bin b/config/ifd/ich9m/4_ifd
index aa2453b1..aa2453b1 100644
--- a/blobs/ich9m/4_ifd.bin
+++ b/config/ifd/ich9m/4_ifd
diff --git a/blobs/ich9m/4_ifd_nogbe.bin b/config/ifd/ich9m/4_ifd_nogbe
index 366d316a..366d316a 100644
--- a/blobs/ich9m/4_ifd_nogbe.bin
+++ b/config/ifd/ich9m/4_ifd_nogbe
diff --git a/blobs/ich9m/8_ifd.bin b/config/ifd/ich9m/8_ifd
index 094fc072..094fc072 100644
--- a/blobs/ich9m/8_ifd.bin
+++ b/config/ifd/ich9m/8_ifd
diff --git a/blobs/ich9m/gbe.bin b/config/ifd/ich9m/gbe
index 2f26a275..2f26a275 100644
--- a/blobs/ich9m/gbe.bin
+++ b/config/ifd/ich9m/gbe
diff --git a/blobs/t1650/12_ifd.bin b/config/ifd/t1650/12_ifd
index 623470e9..623470e9 100644
--- a/blobs/t1650/12_ifd.bin
+++ b/config/ifd/t1650/12_ifd
diff --git a/blobs/t1650/gbe.bin b/config/ifd/t1650/gbe
index 963369d5..963369d5 100644
--- a/blobs/t1650/gbe.bin
+++ b/config/ifd/t1650/gbe
diff --git a/blobs/t440p/gbe.bin b/config/ifd/t440p/gbe
index 6640a4f0..6640a4f0 100644
--- a/blobs/t440p/gbe.bin
+++ b/config/ifd/t440p/gbe
diff --git a/blobs/t440p/ifd.bin b/config/ifd/t440p/ifd
index 241266e6..241266e6 100644
--- a/blobs/t440p/ifd.bin
+++ b/config/ifd/t440p/ifd
diff --git a/blobs/xx20/gbe.bin b/config/ifd/xx20/gbe
index 0c9dfa1d..0c9dfa1d 100644
--- a/blobs/xx20/gbe.bin
+++ b/config/ifd/xx20/gbe
diff --git a/blobs/xx20/ifd.bin b/config/ifd/xx20/ifd
index d042aba3..d042aba3 100644
--- a/blobs/xx20/ifd.bin
+++ b/config/ifd/xx20/ifd
diff --git a/blobs/xx30/16_ifd.bin b/config/ifd/xx30/16_ifd
index b3a09fc8..b3a09fc8 100644
--- a/blobs/xx30/16_ifd.bin
+++ b/config/ifd/xx30/16_ifd
diff --git a/blobs/xx30/gbe.bin b/config/ifd/xx30/gbe
index 0c9dfa1d..0c9dfa1d 100644
--- a/blobs/xx30/gbe.bin
+++ b/config/ifd/xx30/gbe
diff --git a/blobs/xx30/ifd.bin b/config/ifd/xx30/ifd
index c377200f..c377200f 100644
--- a/blobs/xx30/ifd.bin
+++ b/config/ifd/xx30/ifd
diff --git a/resources/coreboot/e6400_4mb/config/libgfxinit_corebootfb b/resources/coreboot/e6400_4mb/config/libgfxinit_corebootfb
index 48b65dd7..49c2d786 100644
--- a/resources/coreboot/e6400_4mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/e6400_4mb/config/libgfxinit_corebootfb
@@ -148,8 +148,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="../../blobs/ich9m/4_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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_CARDBUS_PLUGIN_SUPPORT=y
diff --git a/resources/coreboot/e6400_4mb/config/libgfxinit_txtmode b/resources/coreboot/e6400_4mb/config/libgfxinit_txtmode
index 9303a2e2..e4404880 100644
--- a/resources/coreboot/e6400_4mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/e6400_4mb/config/libgfxinit_txtmode
@@ -146,8 +146,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="../../blobs/ich9m/4_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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_CARDBUS_PLUGIN_SUPPORT=y
diff --git a/resources/coreboot/e6430_12mb/config/libgfxinit_corebootfb b/resources/coreboot/e6430_12mb/config/libgfxinit_corebootfb
index dceecb8b..161d94da 100644
--- a/resources/coreboot/e6430_12mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/e6430/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/e6430/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/e6430/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/e6430/gbe.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
diff --git a/resources/coreboot/e6430_12mb/config/libgfxinit_txtmode b/resources/coreboot/e6430_12mb/config/libgfxinit_txtmode
index 88978945..d596f36f 100644
--- a/resources/coreboot/e6430_12mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/e6430/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/e6430/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/e6430/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/e6430/gbe.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
diff --git a/resources/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb b/resources/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb
index 168bce88..f795d913 100644
--- a/resources/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/hp_ivybridge/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/hp_ivybridge/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/hp_ivybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/hp_ivybridge/gbe.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
diff --git a/resources/coreboot/hp2170p_16mb/config/libgfxinit_txtmode b/resources/coreboot/hp2170p_16mb/config/libgfxinit_txtmode
index 53bc5bf8..44dde5ef 100644
--- a/resources/coreboot/hp2170p_16mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/hp_ivybridge/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/hp_ivybridge/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/hp_ivybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/hp_ivybridge/gbe.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
diff --git a/resources/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb b/resources/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb
index 7be0aa2d..9032b6bb 100644
--- a/resources/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/hp_sandybridge/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/hp_sandybridge/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/hp_sandybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/hp_sandybridge/gbe.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
diff --git a/resources/coreboot/hp2560p_8mb/config/libgfxinit_txtmode b/resources/coreboot/hp2560p_8mb/config/libgfxinit_txtmode
index 918ad0b7..febbb402 100644
--- a/resources/coreboot/hp2560p_8mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/hp_sandybridge/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/hp_sandybridge/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/hp_sandybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/hp_sandybridge/gbe.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
diff --git a/resources/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb b/resources/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb
index 0404d7a4..c846378b 100644
--- a/resources/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/hp_ivybridge/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/hp_ivybridge/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/hp_ivybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/hp_ivybridge/gbe.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
diff --git a/resources/coreboot/hp2570p_16mb/config/libgfxinit_txtmode b/resources/coreboot/hp2570p_16mb/config/libgfxinit_txtmode
index 59233eb4..cde6e8cc 100644
--- a/resources/coreboot/hp2570p_16mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/hp_ivybridge/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/hp_ivybridge/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/hp_ivybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/hp_ivybridge/gbe.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
diff --git a/resources/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb b/resources/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb
index e1414b9f..d29d7b93 100644
--- a/resources/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/hp8200sff/ifd_4mb.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/hp8200sff/ifd_4mb.bin"
 CONFIG_ME_BIN_PATH="../../blobs/hp8200sff/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/hp8200sff/gbe.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
diff --git a/resources/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode b/resources/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode
index 04ad2e94..9dc1eca1 100644
--- a/resources/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/hp8200sff/ifd_4mb.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/hp8200sff/ifd_4mb.bin"
 CONFIG_ME_BIN_PATH="../../blobs/hp8200sff/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/hp8200sff/gbe.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
diff --git a/resources/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb b/resources/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb
index e51924df..6fa62341 100644
--- a/resources/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/hp8200sff/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/hp8200sff/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/hp8200sff/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/hp8200sff/gbe.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
diff --git a/resources/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode b/resources/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode
index b473c8cd..9dcd05a9 100644
--- a/resources/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/hp8200sff/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/hp8200sff/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/hp8200sff/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/hp8200sff/gbe.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
diff --git a/resources/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb b/resources/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb
index 22897cee..0a58f193 100644
--- a/resources/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/hp8300usdt/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/hp8300usdt/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/hp8300usdt/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/hp8300usdt/gbe.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
diff --git a/resources/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode b/resources/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode
index 184d5198..d45b0920 100644
--- a/resources/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/hp8300usdt/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/hp8300usdt/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/hp8300usdt/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/hp8300usdt/gbe.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
diff --git a/resources/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb b/resources/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb
index 29c90f56..f94f2764 100644
--- a/resources/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/hp_ivybridge/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/hp_ivybridge/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/hp_ivybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/hp_ivybridge/gbe.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
diff --git a/resources/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode b/resources/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode
index 89db3cea..ab0800bf 100644
--- a/resources/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/hp_ivybridge/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/hp_ivybridge/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/hp_ivybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/hp_ivybridge/gbe.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
diff --git a/resources/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb b/resources/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb
index 7aba2760..bd91fe36 100644
--- a/resources/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/hp_ivybridge/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/hp_ivybridge/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/hp_ivybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/hp_ivybridge/gbe.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
diff --git a/resources/coreboot/hp9470m_16mb/config/libgfxinit_txtmode b/resources/coreboot/hp9470m_16mb/config/libgfxinit_txtmode
index f2f3c0d0..1a17cd11 100644
--- a/resources/coreboot/hp9470m_16mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/hp_ivybridge/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/hp_ivybridge/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/hp_ivybridge/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/hp_ivybridge/gbe.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
diff --git a/resources/coreboot/r400_16mb/config/libgfxinit_corebootfb b/resources/coreboot/r400_16mb/config/libgfxinit_corebootfb
index 14bef53d..5e5bca27 100644
--- a/resources/coreboot/r400_16mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/16_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/r400_16mb/config/libgfxinit_txtmode b/resources/coreboot/r400_16mb/config/libgfxinit_txtmode
index 6ecb8af5..7dfc9011 100644
--- a/resources/coreboot/r400_16mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/16_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/r400_4mb/config/libgfxinit_corebootfb b/resources/coreboot/r400_4mb/config/libgfxinit_corebootfb
index 1303b9c3..4ec1c55c 100644
--- a/resources/coreboot/r400_4mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/4_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/r400_4mb/config/libgfxinit_txtmode b/resources/coreboot/r400_4mb/config/libgfxinit_txtmode
index 04068896..38e25e21 100644
--- a/resources/coreboot/r400_4mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/4_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/r400_8mb/config/libgfxinit_corebootfb b/resources/coreboot/r400_8mb/config/libgfxinit_corebootfb
index a59324ad..daf5e339 100644
--- a/resources/coreboot/r400_8mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/8_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/r400_8mb/config/libgfxinit_txtmode b/resources/coreboot/r400_8mb/config/libgfxinit_txtmode
index 39e33537..9b19eba0 100644
--- a/resources/coreboot/r400_8mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/8_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/r500_4mb/config/libgfxinit_corebootfb b/resources/coreboot/r500_4mb/config/libgfxinit_corebootfb
index b69cdb7c..1ebc67f7 100644
--- a/resources/coreboot/r500_4mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/4_ifd_nogbe.bin"
+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
diff --git a/resources/coreboot/r500_4mb/config/libgfxinit_txtmode b/resources/coreboot/r500_4mb/config/libgfxinit_txtmode
index a2198136..6d562141 100644
--- a/resources/coreboot/r500_4mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/4_ifd_nogbe.bin"
+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
diff --git a/resources/coreboot/t1650_12mb/config/libgfxinit_txtmode b/resources/coreboot/t1650_12mb/config/libgfxinit_txtmode
index 7271e7ff..550705a2 100644
--- a/resources/coreboot/t1650_12mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/t1650_12mb/config/libgfxinit_txtmode
@@ -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="../../blobs/t1650/12_ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/t1650/12_ifd"
 CONFIG_ME_BIN_PATH="../../blobs/t1650/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/t1650/gbe.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
diff --git a/resources/coreboot/t400_16mb/config/libgfxinit_corebootfb b/resources/coreboot/t400_16mb/config/libgfxinit_corebootfb
index 186c1e79..46330ef3 100644
--- a/resources/coreboot/t400_16mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/16_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/t400_16mb/config/libgfxinit_txtmode b/resources/coreboot/t400_16mb/config/libgfxinit_txtmode
index 41181796..78161d1f 100644
--- a/resources/coreboot/t400_16mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/16_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/t400_4mb/config/libgfxinit_corebootfb b/resources/coreboot/t400_4mb/config/libgfxinit_corebootfb
index abcc5b6e..8f8430e7 100644
--- a/resources/coreboot/t400_4mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/4_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/t400_4mb/config/libgfxinit_txtmode b/resources/coreboot/t400_4mb/config/libgfxinit_txtmode
index 7927f8e0..c063dad0 100644
--- a/resources/coreboot/t400_4mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/4_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/t400_8mb/config/libgfxinit_corebootfb b/resources/coreboot/t400_8mb/config/libgfxinit_corebootfb
index 8ed0c318..0fceb142 100644
--- a/resources/coreboot/t400_8mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/8_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/t400_8mb/config/libgfxinit_txtmode b/resources/coreboot/t400_8mb/config/libgfxinit_txtmode
index 5edd9d1f..b19a2646 100644
--- a/resources/coreboot/t400_8mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/8_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/t420_8mb/config/libgfxinit_corebootfb b/resources/coreboot/t420_8mb/config/libgfxinit_corebootfb
index bbf0d645..c5edd56d 100644
--- a/resources/coreboot/t420_8mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/xx20/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx20/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.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
diff --git a/resources/coreboot/t420s_8mb/config/libgfxinit_corebootfb b/resources/coreboot/t420s_8mb/config/libgfxinit_corebootfb
index 1f6c0e43..8f044298 100644
--- a/resources/coreboot/t420s_8mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/xx20/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx20/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.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
diff --git a/resources/coreboot/t420s_8mb/config/libgfxinit_txtmode b/resources/coreboot/t420s_8mb/config/libgfxinit_txtmode
index ab7b2c1b..523a40a0 100644
--- a/resources/coreboot/t420s_8mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/xx20/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx20/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.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
diff --git a/resources/coreboot/t430_12mb/config/libgfxinit_corebootfb b/resources/coreboot/t430_12mb/config/libgfxinit_corebootfb
index fc20cf9a..a7f6dcd8 100644
--- a/resources/coreboot/t430_12mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/xx30/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.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
diff --git a/resources/coreboot/t430_12mb/config/libgfxinit_txtmode b/resources/coreboot/t430_12mb/config/libgfxinit_txtmode
index c463936c..dc747664 100644
--- a/resources/coreboot/t430_12mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/xx30/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.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
diff --git a/resources/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode b/resources/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode
index 7f49796d..59e1d94a 100644
--- a/resources/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/t440p/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/t440p/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/t440p/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/t440p/gbe.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
diff --git a/resources/coreboot/t440pmrc_12mb/config/libgfxinit_corebootfb b/resources/coreboot/t440pmrc_12mb/config/libgfxinit_corebootfb
index 3ca822ae..96fe0b73 100644
--- a/resources/coreboot/t440pmrc_12mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/t440p/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/t440p/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/t440p/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/t440p/gbe.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
diff --git a/resources/coreboot/t440pmrc_12mb/config/libgfxinit_txtmode b/resources/coreboot/t440pmrc_12mb/config/libgfxinit_txtmode
index 92bef736..7827b487 100644
--- a/resources/coreboot/t440pmrc_12mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/t440p/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/t440p/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/t440p/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/t440p/gbe.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
diff --git a/resources/coreboot/t500_16mb/config/libgfxinit_corebootfb b/resources/coreboot/t500_16mb/config/libgfxinit_corebootfb
index a4f2cce6..7622d022 100644
--- a/resources/coreboot/t500_16mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/16_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/t500_16mb/config/libgfxinit_txtmode b/resources/coreboot/t500_16mb/config/libgfxinit_txtmode
index 7e1e81f9..91a061f2 100644
--- a/resources/coreboot/t500_16mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/16_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/t500_4mb/config/libgfxinit_corebootfb b/resources/coreboot/t500_4mb/config/libgfxinit_corebootfb
index baf29cdc..d7fbb58e 100644
--- a/resources/coreboot/t500_4mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/4_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/t500_4mb/config/libgfxinit_txtmode b/resources/coreboot/t500_4mb/config/libgfxinit_txtmode
index 4fc09490..bdea25e2 100644
--- a/resources/coreboot/t500_4mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/4_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/t500_8mb/config/libgfxinit_corebootfb b/resources/coreboot/t500_8mb/config/libgfxinit_corebootfb
index 1cfa295e..25da3876 100644
--- a/resources/coreboot/t500_8mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/8_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/t500_8mb/config/libgfxinit_txtmode b/resources/coreboot/t500_8mb/config/libgfxinit_txtmode
index 2e59e815..33a84bdd 100644
--- a/resources/coreboot/t500_8mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/8_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/t520_8mb/config/libgfxinit_corebootfb b/resources/coreboot/t520_8mb/config/libgfxinit_corebootfb
index d6183f5a..ceca502b 100644
--- a/resources/coreboot/t520_8mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/xx20/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx20/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.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
diff --git a/resources/coreboot/t520_8mb/config/libgfxinit_txtmode b/resources/coreboot/t520_8mb/config/libgfxinit_txtmode
index 891f6fc2..74d00344 100644
--- a/resources/coreboot/t520_8mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/xx20/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx20/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.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
diff --git a/resources/coreboot/t530_12mb/config/libgfxinit_corebootfb b/resources/coreboot/t530_12mb/config/libgfxinit_corebootfb
index f708aca1..f63b7b71 100644
--- a/resources/coreboot/t530_12mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/xx30/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.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
diff --git a/resources/coreboot/t530_12mb/config/libgfxinit_txtmode b/resources/coreboot/t530_12mb/config/libgfxinit_txtmode
index 110a260b..e0c36d7e 100644
--- a/resources/coreboot/t530_12mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/xx30/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.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
diff --git a/resources/coreboot/w500_16mb/config/libgfxinit_corebootfb b/resources/coreboot/w500_16mb/config/libgfxinit_corebootfb
index 82893a47..a5a32010 100644
--- a/resources/coreboot/w500_16mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/16_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/w500_16mb/config/libgfxinit_txtmode b/resources/coreboot/w500_16mb/config/libgfxinit_txtmode
index 18d9138a..1b16f3c4 100644
--- a/resources/coreboot/w500_16mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/16_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/w500_4mb/config/libgfxinit_corebootfb b/resources/coreboot/w500_4mb/config/libgfxinit_corebootfb
index 185b1d8f..75e798c9 100644
--- a/resources/coreboot/w500_4mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/4_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/w500_4mb/config/libgfxinit_txtmode b/resources/coreboot/w500_4mb/config/libgfxinit_txtmode
index adc611c8..d37e7048 100644
--- a/resources/coreboot/w500_4mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/4_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/w500_8mb/config/libgfxinit_corebootfb b/resources/coreboot/w500_8mb/config/libgfxinit_corebootfb
index bb05d2da..53f1d40d 100644
--- a/resources/coreboot/w500_8mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/8_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/w500_8mb/config/libgfxinit_txtmode b/resources/coreboot/w500_8mb/config/libgfxinit_txtmode
index 9592c905..120012e1 100644
--- a/resources/coreboot/w500_8mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/8_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/w530_12mb/config/libgfxinit_corebootfb b/resources/coreboot/w530_12mb/config/libgfxinit_corebootfb
index d109fdd8..b4fcd7d6 100644
--- a/resources/coreboot/w530_12mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/xx30/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.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
diff --git a/resources/coreboot/w530_12mb/config/libgfxinit_txtmode b/resources/coreboot/w530_12mb/config/libgfxinit_txtmode
index 3a8b0521..359216b5 100644
--- a/resources/coreboot/w530_12mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/xx30/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.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
diff --git a/resources/coreboot/w541_12mb/config/libgfxinit_txtmode b/resources/coreboot/w541_12mb/config/libgfxinit_txtmode
index 9453ed56..5ef0f6f6 100644
--- a/resources/coreboot/w541_12mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/t440p/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/t440p/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/t440p/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/t440p/gbe.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
diff --git a/resources/coreboot/w541mrc_12mb/config/libgfxinit_corebootfb b/resources/coreboot/w541mrc_12mb/config/libgfxinit_corebootfb
index d1938ee4..5121968c 100644
--- a/resources/coreboot/w541mrc_12mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/t440p/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/t440p/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/t440p/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/t440p/gbe.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
diff --git a/resources/coreboot/w541mrc_12mb/config/libgfxinit_txtmode b/resources/coreboot/w541mrc_12mb/config/libgfxinit_txtmode
index 208c7a08..088b4fab 100644
--- a/resources/coreboot/w541mrc_12mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/t440p/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/t440p/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/t440p/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/t440p/gbe.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
diff --git a/resources/coreboot/x200_16mb/config/libgfxinit_corebootfb b/resources/coreboot/x200_16mb/config/libgfxinit_corebootfb
index a72136dc..54af0bbf 100644
--- a/resources/coreboot/x200_16mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/16_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/x200_16mb/config/libgfxinit_txtmode b/resources/coreboot/x200_16mb/config/libgfxinit_txtmode
index 4b4c36b5..75ac39a9 100644
--- a/resources/coreboot/x200_16mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/16_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/x200_4mb/config/libgfxinit_corebootfb b/resources/coreboot/x200_4mb/config/libgfxinit_corebootfb
index c171b788..6545d232 100644
--- a/resources/coreboot/x200_4mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/4_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/x200_4mb/config/libgfxinit_txtmode b/resources/coreboot/x200_4mb/config/libgfxinit_txtmode
index 9cf0bbf6..fddfeb4e 100644
--- a/resources/coreboot/x200_4mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/4_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/x200_8mb/config/libgfxinit_corebootfb b/resources/coreboot/x200_8mb/config/libgfxinit_corebootfb
index 9f0ca5e0..40fe8fc8 100644
--- a/resources/coreboot/x200_8mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/8_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/x200_8mb/config/libgfxinit_txtmode b/resources/coreboot/x200_8mb/config/libgfxinit_txtmode
index 1ff87a95..4455344f 100644
--- a/resources/coreboot/x200_8mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/8_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/x220_8mb/config/libgfxinit_corebootfb b/resources/coreboot/x220_8mb/config/libgfxinit_corebootfb
index 32909760..d19c3ae4 100644
--- a/resources/coreboot/x220_8mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/xx20/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx20/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.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
diff --git a/resources/coreboot/x220_8mb/config/libgfxinit_txtmode b/resources/coreboot/x220_8mb/config/libgfxinit_txtmode
index 40306b70..c016a933 100644
--- a/resources/coreboot/x220_8mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/xx20/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx20/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.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
diff --git a/resources/coreboot/x230_12mb/config/libgfxinit_corebootfb b/resources/coreboot/x230_12mb/config/libgfxinit_corebootfb
index 7446a57d..3a6742e1 100644
--- a/resources/coreboot/x230_12mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/xx30/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.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
diff --git a/resources/coreboot/x230_12mb/config/libgfxinit_txtmode b/resources/coreboot/x230_12mb/config/libgfxinit_txtmode
index c7e0170a..1daf47bb 100644
--- a/resources/coreboot/x230_12mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/xx30/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.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
diff --git a/resources/coreboot/x230_16mb/config/libgfxinit_corebootfb b/resources/coreboot/x230_16mb/config/libgfxinit_corebootfb
index 15c952b2..daf97d77 100644
--- a/resources/coreboot/x230_16mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/xx30/16_ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/16_ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.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
diff --git a/resources/coreboot/x230_16mb/config/libgfxinit_txtmode b/resources/coreboot/x230_16mb/config/libgfxinit_txtmode
index 043666d2..5f5bcd7c 100644
--- a/resources/coreboot/x230_16mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/xx30/16_ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/16_ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.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
diff --git a/resources/coreboot/x230edp_12mb/config/libgfxinit_corebootfb b/resources/coreboot/x230edp_12mb/config/libgfxinit_corebootfb
index a6486d7a..bd92d579 100644
--- a/resources/coreboot/x230edp_12mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/xx30/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.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
diff --git a/resources/coreboot/x230edp_12mb/config/libgfxinit_txtmode b/resources/coreboot/x230edp_12mb/config/libgfxinit_txtmode
index c7c10e1c..ba719909 100644
--- a/resources/coreboot/x230edp_12mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/xx30/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.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
diff --git a/resources/coreboot/x230t_12mb/config/libgfxinit_corebootfb b/resources/coreboot/x230t_12mb/config/libgfxinit_corebootfb
index 08c9d0a4..c93738ce 100644
--- a/resources/coreboot/x230t_12mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/xx30/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.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
diff --git a/resources/coreboot/x230t_12mb/config/libgfxinit_txtmode b/resources/coreboot/x230t_12mb/config/libgfxinit_txtmode
index 398c2e15..30b10498 100644
--- a/resources/coreboot/x230t_12mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/xx30/ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.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
diff --git a/resources/coreboot/x230t_16mb/config/libgfxinit_corebootfb b/resources/coreboot/x230t_16mb/config/libgfxinit_corebootfb
index b561ea73..90fec7bf 100644
--- a/resources/coreboot/x230t_16mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/xx30/16_ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/16_ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.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
diff --git a/resources/coreboot/x230t_16mb/config/libgfxinit_txtmode b/resources/coreboot/x230t_16mb/config/libgfxinit_txtmode
index 05019391..8dbcaac8 100644
--- a/resources/coreboot/x230t_16mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/xx30/16_ifd.bin"
+CONFIG_IFD_BIN_PATH="../../config/ifd/xx30/16_ifd"
 CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.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
diff --git a/resources/coreboot/x301_16mb/config/libgfxinit_corebootfb b/resources/coreboot/x301_16mb/config/libgfxinit_corebootfb
index c8018333..bfa228f0 100644
--- a/resources/coreboot/x301_16mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/16_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/x301_16mb/config/libgfxinit_txtmode b/resources/coreboot/x301_16mb/config/libgfxinit_txtmode
index d7754e5f..a7b645bb 100644
--- a/resources/coreboot/x301_16mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/16_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/x301_4mb/config/libgfxinit_corebootfb b/resources/coreboot/x301_4mb/config/libgfxinit_corebootfb
index 90a954d6..57ca5d31 100644
--- a/resources/coreboot/x301_4mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/4_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/x301_4mb/config/libgfxinit_txtmode b/resources/coreboot/x301_4mb/config/libgfxinit_txtmode
index 10a334d1..fc5216cf 100644
--- a/resources/coreboot/x301_4mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/4_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/x301_8mb/config/libgfxinit_corebootfb b/resources/coreboot/x301_8mb/config/libgfxinit_corebootfb
index ea888210..4bbcd115 100644
--- a/resources/coreboot/x301_8mb/config/libgfxinit_corebootfb
+++ b/resources/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="../../blobs/ich9m/8_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/resources/coreboot/x301_8mb/config/libgfxinit_txtmode b/resources/coreboot/x301_8mb/config/libgfxinit_txtmode
index af1bd6a5..1c7702fb 100644
--- a/resources/coreboot/x301_8mb/config/libgfxinit_txtmode
+++ b/resources/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="../../blobs/ich9m/8_ifd.bin"
-CONFIG_GBE_BIN_PATH="../../blobs/ich9m/gbe.bin"
+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
diff --git a/script/build/release/src b/script/build/release/src
index 596454e0..448e7b7b 100755
--- a/script/build/release/src
+++ b/script/build/release/src
@@ -29,8 +29,7 @@ trees_fetch_list="coreboot u-boot seabios"
 simple_fetch_list="flashrom grub memtest86plus me_cleaner uefitool"
 simple_fetch_list="${simple_fetch_list} bios_extract biosutilities"
 
-# do not add blobs directory here. it's handled below
-dirlist="resources util script include"
+dirlist="resources util script include config"
 
 filelist="lbmk modify build README.md COPYING update version handle"
 filelist="${filelist} versiondate projectname checkgit"
@@ -115,8 +114,6 @@ copy_files()
 		    err "copy_files: !cp -R ${dir}/ ${srcdir}/"
 	done
 
-	copy_blobs
-
 	for i in ${filelist}; do
 		if [ ! -f "${i}" ]; then
 			rm -Rf "${srcdir}" || \
@@ -128,24 +125,6 @@ copy_files()
 	done
 }
 
-copy_blobs()
-{
-	mkdir -p "${srcdir}"/blobs || \
-	    err "copy_blobs: !mkdir -p ${srcdir}/blobs"
-	# do not copy intel ME etc, but do copy ifd/gbe files
-	for i in t440p xx20 xx30 hp8200sff hp_ivybridge hp_sandybridge \
-	    hp8300usdt t1650 e6430 ich9m; do
-		for j in ifd gbe 4_ifd_nogbe 4_ifd 8_ifd 12_ifd 16_ifd; do
-			[ -f "blobs/${i}/${j}.bin" ] || continue
-			[ -e "${srcdir}/blobs/${i}" ] || \
-				mkdir -p "${srcdir}/blobs/${i}" || \
-				    err "copy_blobs: ! -d ${srcdir}/blobs/${i}"
-			cp "blobs/${i}/${j}.bin" "${srcdir}/blobs/${i}" || \
-			    err "copy_blobs: ! -f ${srcdir}/blobs/${i}"
-		done
-	done
-}
-
 purge_files()
 {
 	(
diff --git a/script/update/blobs/download b/script/update/blobs/download
index 012cf0b1..05730c4b 100755
--- a/script/update/blobs/download
+++ b/script/update/blobs/download
@@ -423,6 +423,9 @@ extract_sch5545ec()
 		printf "sch5545 firmware already downloaded\n" 1>&2
 		return 0
 	fi
+	[ -d "${_sch5545ec_destination%/*}" ] || \
+		mkdir -p "${_sch5545ec_destination%/*}" || \
+		    err "extract_sch: can't mkdir ${_sch5545ec_destination%/*}"
 
 	[ ! -d "${appdir}" ] || rm -Rf "${appdir}" || \
 	    err "extract_sch5545ec: can't remove ${appdir}"