diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-10-06 22:59:36 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-10-07 00:11:21 +0100 |
| commit | 4e39d5a5a808b0d59c6fb3426e1d9bc0195d6b08 (patch) | |
| tree | 26ccd90ebffb18c70132e6192f27bac1c4c3522c | |
| parent | 965b6a7ed73f1dbd78a353c83b99a88b50c86f38 (diff) | |
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>
103 files changed, 410 insertions, 395 deletions
@@ -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/ @@ -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} ${@}" } diff --git a/config/coreboot/e6400_4mb/config/libgfxinit_corebootfb b/config/coreboot/e6400_4mb/config/libgfxinit_corebootfb index 49c2d786..52f0cbf9 100644 --- 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 diff --git a/config/coreboot/e6400_4mb/config/libgfxinit_txtmode b/config/coreboot/e6400_4mb/config/libgfxinit_txtmode index e4404880..3ca3770c 100644 --- 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 diff --git a/config/coreboot/e6430_12mb/config/libgfxinit_corebootfb b/config/coreboot/e6430_12mb/config/libgfxinit_corebootfb index 161d94da..50f83367 100644 --- 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 diff --git a/config/coreboot/e6430_12mb/config/libgfxinit_txtmode b/config/coreboot/e6430_12mb/config/libgfxinit_txtmode index d596f36f..7979d799 100644 --- 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 diff --git a/config/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb b/config/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb index f795d913..fc6f46fb 100644 --- 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 # diff --git a/config/coreboot/hp2170p_16mb/config/libgfxinit_txtmode b/config/coreboot/hp2170p_16mb/config/libgfxinit_txtmode index 44dde5ef..a24a4cf8 100644 --- 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 # diff --git a/config/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb b/config/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb index 9032b6bb..37b4db80 100644 --- 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 # diff --git a/config/coreboot/hp2560p_8mb/config/libgfxinit_txtmode b/config/coreboot/hp2560p_8mb/config/libgfxinit_txtmode index febbb402..2037a600 100644 --- 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 # diff --git a/config/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb b/config/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb index c846378b..604ce768 100644 --- 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 # diff --git a/config/coreboot/hp2570p_16mb/config/libgfxinit_txtmode b/config/coreboot/hp2570p_16mb/config/libgfxinit_txtmode index cde6e8cc..891c252e 100644 --- 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 # diff --git a/config/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb b/config/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb index 88fe6990..4d9edb2e 100644 --- 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 diff --git a/config/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode b/config/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode index 984e6eb4..c254c869 100644 --- 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 diff --git a/config/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb b/config/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb index 6fa62341..1f594b3c 100644 --- 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 diff --git a/config/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode b/config/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode index 9dcd05a9..5ce449cd 100644 --- 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 diff --git a/config/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb b/config/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb index 0a58f193..636b938d 100644 --- 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 diff --git a/config/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode b/config/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode index d45b0920..60dcc5b6 100644 --- 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 diff --git a/config/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb b/config/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb index f94f2764..7654bd56 100644 --- 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 # diff --git a/config/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode b/config/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode index ab0800bf..8bf0ed57 100644 --- 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 # diff --git a/config/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb b/config/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb index bd91fe36..29c27f18 100644 --- 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 # diff --git a/config/coreboot/hp9470m_16mb/config/libgfxinit_txtmode b/config/coreboot/hp9470m_16mb/config/libgfxinit_txtmode index 1a17cd11..1819d317 100644 --- 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 # diff --git a/config/coreboot/r400_16mb/config/libgfxinit_corebootfb b/config/coreboot/r400_16mb/config/libgfxinit_corebootfb index 5e5bca27..47f8e605 100644 --- 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 diff --git a/config/coreboot/r400_16mb/config/libgfxinit_txtmode b/config/coreboot/r400_16mb/config/libgfxinit_txtmode index 7dfc9011..d0af6cce 100644 --- 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 diff --git a/config/coreboot/r400_4mb/config/libgfxinit_corebootfb b/config/coreboot/r400_4mb/config/libgfxinit_corebootfb index 4ec1c55c..8ce5d52c 100644 --- 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 diff --git a/config/coreboot/r400_4mb/config/libgfxinit_txtmode b/config/coreboot/r400_4mb/config/libgfxinit_txtmode index 38e25e21..3870e5d9 100644 --- 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 diff --git a/config/coreboot/r400_8mb/config/libgfxinit_corebootfb b/config/coreboot/r400_8mb/config/libgfxinit_corebootfb index daf5e339..25c475c6 100644 --- 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 diff --git a/config/coreboot/r400_8mb/config/libgfxinit_txtmode b/config/coreboot/r400_8mb/config/libgfxinit_txtmode index 9b19eba0..9076438c 100644 --- 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 diff --git a/config/coreboot/r500_4mb/config/libgfxinit_corebootfb b/config/coreboot/r500_4mb/config/libgfxinit_corebootfb index 1ebc67f7..c04fec56 100644 --- 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 diff --git a/config/coreboot/r500_4mb/config/libgfxinit_txtmode b/config/coreboot/r500_4mb/config/libgfxinit_txtmode index 6d562141..67d1de08 100644 --- 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 diff --git a/config/coreboot/t1650_12mb/config/libgfxinit_txtmode b/config/coreboot/t1650_12mb/config/libgfxinit_txtmode index 550705a2..1d917650 100644 --- 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 diff --git a/config/coreboot/t400_16mb/config/libgfxinit_corebootfb b/config/coreboot/t400_16mb/config/libgfxinit_corebootfb index 46330ef3..03d1455c 100644 --- 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 diff --git a/config/coreboot/t400_16mb/config/libgfxinit_txtmode b/config/coreboot/t400_16mb/config/libgfxinit_txtmode index 78161d1f..bfb87d49 100644 --- 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 diff --git a/config/coreboot/t400_4mb/config/libgfxinit_corebootfb b/config/coreboot/t400_4mb/config/libgfxinit_corebootfb index 8f8430e7..8d91dd9c 100644 --- 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 diff --git a/config/coreboot/t400_4mb/config/libgfxinit_txtmode b/config/coreboot/t400_4mb/config/libgfxinit_txtmode index c063dad0..a59d73cc 100644 --- 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 diff --git a/config/coreboot/t400_8mb/config/libgfxinit_corebootfb b/config/coreboot/t400_8mb/config/libgfxinit_corebootfb index 0fceb142..d5030616 100644 --- 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 diff --git a/config/coreboot/t400_8mb/config/libgfxinit_txtmode b/config/coreboot/t400_8mb/config/libgfxinit_txtmode index b19a2646..41786b73 100644 --- 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 diff --git a/config/coreboot/t420_8mb/config/libgfxinit_corebootfb b/config/coreboot/t420_8mb/config/libgfxinit_corebootfb index c5edd56d..48d031c9 100644 --- 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 diff --git a/config/coreboot/t420s_8mb/config/libgfxinit_corebootfb b/config/coreboot/t420s_8mb/config/libgfxinit_corebootfb index 8f044298..7ace9382 100644 --- 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 diff --git a/config/coreboot/t420s_8mb/config/libgfxinit_txtmode b/config/coreboot/t420s_8mb/config/libgfxinit_txtmode index 523a40a0..0f1b9968 100644 --- 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 diff --git a/config/coreboot/t430_12mb/config/libgfxinit_corebootfb b/config/coreboot/t430_12mb/config/libgfxinit_corebootfb index a7f6dcd8..202ed8d2 100644 --- 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 diff --git a/config/coreboot/t430_12mb/config/libgfxinit_txtmode b/config/coreboot/t430_12mb/config/libgfxinit_txtmode index dc747664..8f75c19f 100644 --- 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 diff --git a/config/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode b/config/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode index 59e1d94a..577bb535 100644 --- 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 diff --git a/config/coreboot/t440pmrc_12mb/config/libgfxinit_corebootfb b/config/coreboot/t440pmrc_12mb/config/libgfxinit_corebootfb index 96fe0b73..8801b7cd 100644 --- 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 diff --git a/config/coreboot/t440pmrc_12mb/config/libgfxinit_txtmode b/config/coreboot/t440pmrc_12mb/config/libgfxinit_txtmode index 7827b487..336cae08 100644 --- 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 diff --git a/config/coreboot/t500_16mb/config/libgfxinit_corebootfb b/config/coreboot/t500_16mb/config/libgfxinit_corebootfb index 7622d022..48ca599d 100644 --- 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 diff --git a/config/coreboot/t500_16mb/config/libgfxinit_txtmode b/config/coreboot/t500_16mb/config/libgfxinit_txtmode index 91a061f2..5918990f 100644 --- 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 diff --git a/config/coreboot/t500_4mb/config/libgfxinit_corebootfb b/config/coreboot/t500_4mb/config/libgfxinit_corebootfb index d7fbb58e..da077875 100644 --- 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 diff --git a/config/coreboot/t500_4mb/config/libgfxinit_txtmode b/config/coreboot/t500_4mb/config/libgfxinit_txtmode index bdea25e2..a7212e6f 100644 --- 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 diff --git a/config/coreboot/t500_8mb/config/libgfxinit_corebootfb b/config/coreboot/t500_8mb/config/libgfxinit_corebootfb index 25da3876..66c769c8 100644 --- 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 diff --git a/config/coreboot/t500_8mb/config/libgfxinit_txtmode b/config/coreboot/t500_8mb/config/libgfxinit_txtmode index 33a84bdd..ad4c190b 100644 --- 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 diff --git a/config/coreboot/t520_8mb/config/libgfxinit_corebootfb b/config/coreboot/t520_8mb/config/libgfxinit_corebootfb index ceca502b..ab779f5d 100644 --- 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 diff --git a/config/coreboot/t520_8mb/config/libgfxinit_txtmode b/config/coreboot/t520_8mb/config/libgfxinit_txtmode index 74d00344..8e2056d1 100644 --- 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 diff --git a/config/coreboot/t530_12mb/config/libgfxinit_corebootfb b/config/coreboot/t530_12mb/config/libgfxinit_corebootfb index f63b7b71..e293ccdf 100644 --- 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 diff --git a/config/coreboot/t530_12mb/config/libgfxinit_txtmode b/config/coreboot/t530_12mb/config/libgfxinit_txtmode index e0c36d7e..5f7d0311 100644 --- 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 diff --git a/config/coreboot/w500_16mb/config/libgfxinit_corebootfb b/config/coreboot/w500_16mb/config/libgfxinit_corebootfb index a5a32010..d024d6d1 100644 --- 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 diff --git a/config/coreboot/w500_16mb/config/libgfxinit_txtmode b/config/coreboot/w500_16mb/config/libgfxinit_txtmode index 1b16f3c4..3789a929 100644 --- 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 diff --git a/config/coreboot/w500_4mb/config/libgfxinit_corebootfb b/config/coreboot/w500_4mb/config/libgfxinit_corebootfb index 75e798c9..3bc2b049 100644 --- 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 diff --git a/config/coreboot/w500_4mb/config/libgfxinit_txtmode b/config/coreboot/w500_4mb/config/libgfxinit_txtmode index d37e7048..4c1e4a0d 100644 --- 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 diff --git a/config/coreboot/w500_8mb/config/libgfxinit_corebootfb b/config/coreboot/w500_8mb/config/libgfxinit_corebootfb index 53f1d40d..de8f590c 100644 --- 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 diff --git a/config/coreboot/w500_8mb/config/libgfxinit_txtmode b/config/coreboot/w500_8mb/config/libgfxinit_txtmode index 120012e1..7a9cdbaa 100644 --- 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 diff --git a/config/coreboot/w530_12mb/config/libgfxinit_corebootfb b/config/coreboot/w530_12mb/config/libgfxinit_corebootfb index b4fcd7d6..f2964b6b 100644 --- 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 diff --git a/config/coreboot/w530_12mb/config/libgfxinit_txtmode b/config/coreboot/w530_12mb/config/libgfxinit_txtmode index 359216b5..5ab79ccf 100644 --- 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 diff --git a/config/coreboot/w541_12mb/config/libgfxinit_txtmode b/config/coreboot/w541_12mb/config/libgfxinit_txtmode index 5ef0f6f6..3d4864ba 100644 --- 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 diff --git a/config/coreboot/w541mrc_12mb/config/libgfxinit_corebootfb b/config/coreboot/w541mrc_12mb/config/libgfxinit_corebootfb index 5121968c..833d8a92 100644 --- 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 diff --git a/config/coreboot/w541mrc_12mb/config/libgfxinit_txtmode b/config/coreboot/w541mrc_12mb/config/libgfxinit_txtmode index 088b4fab..898d556d 100644 --- 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 diff --git a/config/coreboot/x200_16mb/config/libgfxinit_corebootfb b/config/coreboot/x200_16mb/config/libgfxinit_corebootfb index 54af0bbf..9e04d929 100644 --- 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 diff --git a/config/coreboot/x200_16mb/config/libgfxinit_txtmode b/config/coreboot/x200_16mb/config/libgfxinit_txtmode index 75ac39a9..ddcb7e95 100644 --- 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 diff --git a/config/coreboot/x200_4mb/config/libgfxinit_corebootfb b/config/coreboot/x200_4mb/config/libgfxinit_corebootfb index 6545d232..bbd46e8e 100644 --- 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 diff --git a/config/coreboot/x200_4mb/config/libgfxinit_txtmode b/config/coreboot/x200_4mb/config/libgfxinit_txtmode index fddfeb4e..491e7c41 100644 --- 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 diff --git a/config/coreboot/x200_8mb/config/libgfxinit_corebootfb b/config/coreboot/x200_8mb/config/libgfxinit_corebootfb index 40fe8fc8..2cc06c03 100644 --- 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 diff --git a/config/coreboot/x200_8mb/config/libgfxinit_txtmode b/config/coreboot/x200_8mb/config/libgfxinit_txtmode index 4455344f..ec923476 100644 --- 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 diff --git a/config/coreboot/x220_8mb/config/libgfxinit_corebootfb b/config/coreboot/x220_8mb/config/libgfxinit_corebootfb index d19c3ae4..66cb1955 100644 --- 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 diff --git a/config/coreboot/x220_8mb/config/libgfxinit_txtmode b/config/coreboot/x220_8mb/config/libgfxinit_txtmode index c016a933..376428f5 100644 --- 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 diff --git a/config/coreboot/x230_12mb/config/libgfxinit_corebootfb b/config/coreboot/x230_12mb/config/libgfxinit_corebootfb index 3a6742e1..4e5fe763 100644 --- 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 diff --git a/config/coreboot/x230_12mb/config/libgfxinit_txtmode b/config/coreboot/x230_12mb/config/libgfxinit_txtmode index 1daf47bb..eb15d5d8 100644 --- 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 diff --git a/config/coreboot/x230_16mb/config/libgfxinit_corebootfb b/config/coreboot/x230_16mb/config/libgfxinit_corebootfb index daf97d77..b5aaec85 100644 --- 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 diff --git a/config/coreboot/x230_16mb/config/libgfxinit_txtmode b/config/coreboot/x230_16mb/config/libgfxinit_txtmode index 5f5bcd7c..d174fa02 100644 --- 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 diff --git a/config/coreboot/x230edp_12mb/config/libgfxinit_corebootfb b/config/coreboot/x230edp_12mb/config/libgfxinit_corebootfb index bd92d579..8a267683 100644 --- 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 diff --git a/config/coreboot/x230edp_12mb/config/libgfxinit_txtmode b/config/coreboot/x230edp_12mb/config/libgfxinit_txtmode index ba719909..0cc60b03 100644 --- 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 diff --git a/config/coreboot/x230t_12mb/config/libgfxinit_corebootfb b/config/coreboot/x230t_12mb/config/libgfxinit_corebootfb index c93738ce..b125408f 100644 --- 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 diff --git a/config/coreboot/x230t_12mb/config/libgfxinit_txtmode b/config/coreboot/x230t_12mb/config/libgfxinit_txtmode index 30b10498..7f4beef0 100644 --- 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 diff --git a/config/coreboot/x230t_16mb/config/libgfxinit_corebootfb b/config/coreboot/x230t_16mb/config/libgfxinit_corebootfb index 90fec7bf..70c13dac 100644 --- 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 diff --git a/config/coreboot/x230t_16mb/config/libgfxinit_txtmode b/config/coreboot/x230t_16mb/config/libgfxinit_txtmode index 8dbcaac8..d5897f51 100644 --- 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 diff --git a/config/coreboot/x301_16mb/config/libgfxinit_corebootfb b/config/coreboot/x301_16mb/config/libgfxinit_corebootfb index bfa228f0..b56c27b2 100644 --- 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 diff --git a/config/coreboot/x301_16mb/config/libgfxinit_txtmode b/config/coreboot/x301_16mb/config/libgfxinit_txtmode index a7b645bb..7bf284f8 100644 --- 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 diff --git a/config/coreboot/x301_4mb/config/libgfxinit_corebootfb b/config/coreboot/x301_4mb/config/libgfxinit_corebootfb index 57ca5d31..b04ac9e3 100644 --- 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 diff --git a/config/coreboot/x301_4mb/config/libgfxinit_txtmode b/config/coreboot/x301_4mb/config/libgfxinit_txtmode index fc5216cf..2c65aba1 100644 --- 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 diff --git a/config/coreboot/x301_8mb/config/libgfxinit_corebootfb b/config/coreboot/x301_8mb/config/libgfxinit_corebootfb index 4bbcd115..1fca524e 100644 --- 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 diff --git a/config/coreboot/x301_8mb/config/libgfxinit_txtmode b/config/coreboot/x301_8mb/config/libgfxinit_txtmode index 1c7702fb..8175ab6d 100644 --- 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 diff --git a/config/git/serprog b/config/git/serprog index cbfc1b3e..8dd6b504 100644 --- a/config/git/serprog +++ b/config/git/serprog @@ -1,27 +1,27 @@ +{rpi-pico-serprog}{ + rev: c8c16e9c11fe9e5b7230ff358f79de3f1951e1d9 + 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: util-fw/rp2040/pico-sdk + loc: pico-sdk url: https://github.com/raspberrypi/pico-sdk } {rpi-pico-tinyusb}{ rev: 86c416d4c0fb38432460b3e11b08b9de76941bf5 - loc: util-fw/rp2040/pico-sdk/lib/tinyusb + loc: pico-sdk/lib/tinyusb url: https://github.com/hathach/tinyusb.git } -{rpi-pico-serprog}{ - rev: c8c16e9c11fe9e5b7230ff358f79de3f1951e1d9 - loc: util-fw/rp2040/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 -} - {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 } diff --git a/config/memtest86plus/patches/0001-add-central-Makefile-in-main-directory.patch b/config/memtest86plus/patches/0001-add-central-Makefile-in-main-directory.patch new file mode 100644 index 00000000..7a54c102 --- /dev/null +++ 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 + diff --git a/include/blobutil.sh b/include/blobutil.sh index 3b59ba2e..4a798808 100755 --- 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() diff --git a/script/build/coreboot/grub b/script/build/coreboot/grub index 7f448e24..49b8b416 100755 --- 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}" \ diff --git a/script/build/coreboot/utils b/script/build/coreboot/utils index e3d471ad..65c565bb 100755 --- 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}" diff --git a/script/build/fw/coreboot b/script/build/fw/coreboot index 15430255..d7f67ad5 100755 --- 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" ] || \ diff --git a/script/build/fw/serprog b/script/build/fw/serprog index 0966af77..bb6952e2 100755 --- 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]" diff --git a/script/update/blobs/inject b/script/update/blobs/inject index 96ee0002..d778fe78 100755 --- 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}" ] || \ diff --git a/script/update/project/build b/script/update/project/build index 2c6eff97..69c11105 100755 --- 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} diff --git a/script/update/project/repo b/script/update/project/repo index 71c3940c..df522edc 100755 --- 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}" } diff --git a/script/update/project/trees b/script/update/project/trees index 29004760..4b25d5b9 100755 --- a/script/update/project/trees +++ b/script/update/project/trees @@ -15,13 +15,13 @@ eval "$(setvars "" _target tree rev project cfgsdir _xm)" main() { - printf "Downloading %s and applying patches\n" ${project} - [ -z "${1}" ] && err "project name not specified" - project="${1}" && shift 1 + project="${1#src/}" && shift 1 configure_targets $@ + printf "Downloading %s and applying patches\n" ${project} + for x in ${targets}; do x_ rm -f "${cfgsdir}/"*/seen download_for_target "${x}" @@ -45,8 +45,9 @@ download_for_target() _target="${1}" fetch_config - [ -d "${project}/${tree}" ] && printf "download/%s %s (%s): exists\n" \ - "${project}" "${tree}" "${_target}" 1>&2 && return 0 + [ -d "src/${project}/${tree}" ] && \ + printf "download/%s %s (%s): exists\n" \ + "${project}" "${tree}" "${_target}" 1>&2 && return 0 fetch_from_upstream prepare_new_tree @@ -83,9 +84,9 @@ check_config_for_target() fetch_from_upstream() { - [ -d "${project}" ] || x_ mkdir -p "${project}" - [ -d "${project}/${project}" ] && return 0 + [ -d "src/${project}/${project}" ] && return 0 + x_ mkdir -p "src/${project}" x_ ./update project repo "${project}" } @@ -93,14 +94,14 @@ prepare_new_tree() { printf "Creating %s tree %s (%s)\n" "${project}" "${tree}" "${_target}" - x_ cp -R "${project}/${project}" "${project}/${tree}" - x_ git_reset_rev "${project}/${tree}" "${rev}" "err" + x_ cp -R "src/${project}/${project}" "src/${project}/${tree}" + x_ git_reset_rev "src/${project}/${tree}" "${rev}" "err" ( - x_ cd "${project}/${tree}" + x_ cd "src/${project}/${tree}" git submodule update --init --checkout || \ err "prepare_new_tree ${project}/${tree}: can't update git modules" ) - git_am_patches "${PWD}/${project}/${tree}" \ + git_am_patches "${PWD}/src/${project}/${tree}" \ "${PWD}/${cfgsdir}/${tree}/patches" "err" } diff --git a/script/update/release/roms b/script/update/release/roms index 3cf5d93e..e4d5db4f 100755 --- a/script/update/release/roms +++ b/script/update/release/roms @@ -104,7 +104,7 @@ make_archive() strip_archive() { romdir=${1} - [ -d "coreboot/${tree}" ] || \ + [ -d "src/coreboot/${tree}" ] || \ x_ ./update project trees coreboot ${tree} x_ ./build coreboot utils ${tree} diff --git a/script/update/release/src b/script/update/release/src index 3a966015..689a23ab 100755 --- a/script/update/release/src +++ b/script/update/release/src @@ -14,9 +14,9 @@ simple_fetch_list="flashrom grub memtest86plus me_cleaner uefitool" simple_fetch_list="${simple_fetch_list} bios_extract biosutilities" download_only_list="pico-serprog stm32-vserprog" -dirlist="config util script include util-fw" -linklist="build update handle" # symlinks in main directory, to script: lbmk -filelist="lbmk README.md COPYING version versiondate projectname" +dirlist="config util script include" +linklist="update" # symlinks in main directory, to script: lbmk +filelist="build README.md COPYING version versiondate projectname .gitignore" version="version-unknown" versiondate="version-date-unknown" @@ -44,54 +44,39 @@ create_release_directory() dirname="${projectname}-${version}_src" srcdir="${reldir}/${dirname}" - [ -d "release/" ] || x_ mkdir -p release/ - [ -d "${reldir}/" ] || x_ mkdir -p "${reldir}/" - [ ! -d "${srcdir}/" ] || x_ rm -Rf "${srcdir}/" - [ ! -f "${srcdir}.tar.xz" ] || \ - x_ rm -f "${srcdir}.tar.xz/" - - x_ mkdir -p "${srcdir}/" - x_ printf "%s" "${version}" > "${srcdir}"/version + xx_ mkdir -p "${reldir}" + xx_ rm -Rf "${srcdir}" "${srcdir}.tar.xz" + xx_ mkdir -p "${srcdir}" } download_modules() { for modname in ${trees_fetch_list}; do - [ -d "${modname}" ] || x_ ./update project trees ${modname} + [ -d "src/${modname}" ] || xx_ ./update project trees ${modname} done for modname in ${simple_fetch_list} ${download_only_list}; do - [ -d "${modname}/" ] || x_ ./update project repo ${modname} + [ -d "src/${modname}/" ] || xx_ ./update project repo ${modname} done } copy_files() { + xx_ cp -R "src" "${srcdir}/src" for dir in ${trees_fetch_list}; do - [ -d "${dir}" ] || continue - for subdir in "${dir}"/*; do - [ -d "${subdir}" ] || continue - [ "${subdir##*/}" = "${dir}" ] && continue - x_ mkdir -p "${srcdir}/${dir}" - [ ! -d "${srcdir}/${dir}/${subdir##*/}" ] || \ - x_ rm -Rf "${srcdir}/${dir}/${subdir##*/}" - x_ cp -R "${subdir}" "${srcdir}/${dir}/${subdir##*/}" - done + xx_ rm -Rf "${srcdir}/src/${dir}/${dir}" done - for dir in ${simple_fetch_list} ${dirlist}; do - x_ cp -R "${dir}/" "${srcdir}/" + for dir in ${dirlist}; do + xx_ cp -R "${dir}/" "${srcdir}/" done for i in ${filelist}; do - if [ ! -f "${i}" ]; then - x_ rm -Rf "${srcdir}" - err "copy_files: file '${i}' does not exist" - fi - x_ cp "${i}" "${srcdir}/" + [ -f "${i}" ] || fail "copy_files: '${i}' does not exist" + xx_ cp "${i}" "${srcdir}/" done ( - x_ cd "${srcdir}/" + xx_ cd "${srcdir}/" for i in ${linklist}; do - x_ ln -s lbmk "${i}" + xx_ ln -s build "${i}" done ) } @@ -99,30 +84,36 @@ copy_files() purge_files() { ( - x_ cd "${srcdir}/" - [ ! -d "coreboot/default/util/kbc1126" ] || \ - x_ ./update project build -c "coreboot/default/util/kbc1126" - x_ ./update project build -x coreboot + xx_ cd "${srcdir}" + [ ! -d "src/coreboot/default/util/kbc1126" ] || \ + xx_ ./update project build -c "src/coreboot/default/util/kbc1126" + xx_ ./update project build -x coreboot for p in u-boot seabios coreboot; do - x_ ./update project build -c "${p}" + xx_ ./update project build -c "${p}" done - x_ ./update project build -c bios_extract flashrom grub uefitool \ - util-fw/stm32-vserprog util-fw/stm32-vserprog/libopencm3 \ - memtest86plus/build32 memtest86plus/build64 util/* + xx_ ./update project build -c bios_extract flashrom grub uefitool \ + stm32-vserprog stm32-vserprog/libopencm3 util/* memtest86plus - x_ rm -Rf .git* */.git* */*/.git* */*/*/.git* */*/*/*/.git* \ - */*/*/*/*/.git* */*/*/*/*/*/.git* */*/*/*/*/*/*/.git* - x_ rm -Rf cbutils elf util-fw/rp2040/pico-serprog/build + xx_ rm -Rf .git */.git* */*/.git* */*/*/.git* */*/*/*/.git* \ + */*/*/*/*/.git* */*/*/*/*/*/.git* */*/*/*/*/*/*/.git* \ + */*/*/*/*/*/*/*/.git* + xx_ rm -Rf cbutils elf src/pico-serprog/build ) } create_release_archive() { ( - x_ cd "${reldir}/" - x_ tar -c "${dirname}/" | xz -T0 -9e >"${dirname}.tar.xz" - x_ rm -Rf "${dirname}/" + xx_ cd "${reldir}/" + xx_ tar -c "${dirname}/" | xz -T0 -9e >"${dirname}.tar.xz" + xx_ rm -Rf "${dirname}/" ) } +fail() +{ + [ -z ${srcdir} ] || rm -Rf "${srcdir}" 1>/dev/null 2>/dev/null || : + fail "${1}" +} + main $@ |