From da3c9bb3c5c3b1f2e6e67a3695ce39b17bf68d5b Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 4 Sep 2023 02:36:41 +0100 Subject: merge config/ and resources/ Signed-off-by: Leah Rowe --- script/build/release/roms | 12 ++++++------ script/build/release/src | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'script/build/release') diff --git a/script/build/release/roms b/script/build/release/roms index 1d6bcb76..ad2c3a98 100755 --- a/script/build/release/roms +++ b/script/build/release/roms @@ -89,10 +89,10 @@ make_archive() echo ${target} - [ -f "resources/coreboot/${target}/target.cfg" ] || \ + [ -f "config/coreboot/${target}/target.cfg" ] || \ err "make_archive: ${target}: target.cfg is missing" - . "resources/coreboot/${target}/target.cfg" + . "config/coreboot/${target}/target.cfg" [ "${microcode_required}" = "y" ] || \ [ "${microcode_required}" = "n" ] || microcode_required="y" @@ -100,15 +100,15 @@ make_archive() CONFIG_HAVE_ME_BIN="y" CONFIG_KBC1126_FIRMWARE="y" CONFIG_INCLUDE_SMSC_SCH5545_EC_FW="y" - grep "CONFIG_HAVE_ME_BIN=y" "resources/coreboot/${target}/config/"* || \ + grep "CONFIG_HAVE_ME_BIN=y" "config/coreboot/${target}/config/"* || \ CONFIG_HAVE_ME_BIN="n" - grep "CONFIG_HAVE_MRC=y" "resources/coreboot/${target}/config/"* || \ + grep "CONFIG_HAVE_MRC=y" "config/coreboot/${target}/config/"* || \ CONFIG_HAVE_MRC="n" grep "CONFIG_KBC1126_FIRMWARE=y" \ - "resources/coreboot/${target}/config"/* || \ + "config/coreboot/${target}/config"/* || \ CONFIG_KBC1126_FIRMWARE="n" grep "CONFIG_INCLUDE_SMSC_SCH5545_EC_FW=y" \ - "resources/coreboot/${target}/config"/* || \ + "config/coreboot/${target}/config"/* || \ CONFIG_INCLUDE_SMSC_SCH5545_EC_FW="n" # remove ME/MRC/EC firmware from ROM images diff --git a/script/build/release/src b/script/build/release/src index 448e7b7b..97d8fb41 100755 --- a/script/build/release/src +++ b/script/build/release/src @@ -29,7 +29,7 @@ trees_fetch_list="coreboot u-boot seabios" simple_fetch_list="flashrom grub memtest86plus me_cleaner uefitool" simple_fetch_list="${simple_fetch_list} bios_extract biosutilities" -dirlist="resources util script include config" +dirlist="config util script include" filelist="lbmk modify build README.md COPYING update version handle" filelist="${filelist} versiondate projectname checkgit" -- cgit v1.2.1