From 03788d14fb0dd79b38817d5a40f1c5c2017f4551 Mon Sep 17 00:00:00 2001 From: Leah Rowe <leah@libreboot.org> Date: Mon, 4 Sep 2023 01:17:23 +0100 Subject: 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> --- resources/coreboot/r400_4mb/config/libgfxinit_corebootfb | 4 ++-- resources/coreboot/r400_4mb/config/libgfxinit_txtmode | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'resources/coreboot/r400_4mb') 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 -- cgit v1.2.1