diff --git a/config/git/me_cleaner b/config/git/me_cleaner deleted file mode 100644 index fd5197c7..00000000 --- a/config/git/me_cleaner +++ /dev/null @@ -1,5 +0,0 @@ -{me_cleaner}{ - rev: 43612a630c79f3bc6f2653bfe90dfe0b7b137e08 - loc: me_cleaner - url: https://github.com/corna/me_cleaner.git -} diff --git a/include/vendor.sh b/include/vendor.sh index d6cb3cf8..51daba82 100755 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -13,7 +13,7 @@ cbfstool="cbutils/default/cbfstool" nvmutil="util/nvmutil/nvm" pciromsdir="pciroms" -mecleaner="${PWD}/src/me_cleaner/me_cleaner.py" +mecleaner="${PWD}/src/coreboot/default/util/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" diff --git a/script/update/project/release b/script/update/project/release index 8843f2d1..3b869f6a 100755 --- a/script/update/project/release +++ b/script/update/project/release @@ -11,7 +11,7 @@ eval "$(setvars "" vdir basename src_dirname srcdir _nogit _xm target romdir \ microcode_required CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \ CONFIG_KBC1126_FIRMWARE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW)" -_f="coreboot u-boot seabios flashrom grub memtest86plus me_cleaner uefitool" +_f="coreboot u-boot seabios flashrom grub memtest86plus uefitool" _f="${_f} bios_extract biosutilities pico-serprog stm32-vserprog" _f="${_f} rpi-pico-serprog" diff --git a/script/update/vendor/download b/script/update/vendor/download index de5abb68..2d90b9b0 100755 --- a/script/update/vendor/download +++ b/script/update/vendor/download @@ -42,7 +42,7 @@ build_dependencies() { [ -d ${cbdir} ] || \ x_ ./update project trees -f coreboot ${cbdir##*/} - for d in uefitool biosutilities bios_extract me_cleaner; do + for d in uefitool biosutilities bios_extract; do [ -d "src/${d}" ] && continue x_ ./update project trees -f "${d}" done