Merge pull request #1814 from MilhouseVH/le82_intel_ucode

intel-ucode: update to intel-ucode-20170707 [backport]
This commit is contained in:
Christian Hewitt 2017-07-22 21:47:43 +04:00 committed by GitHub
commit d00c45151a
2 changed files with 6 additions and 15 deletions

View File

@ -17,11 +17,11 @@
################################################################################
PKG_NAME="intel-ucode"
PKG_VERSION="20170511"
PKG_VERSION="20170707"
PKG_ARCH="x86_64"
PKG_LICENSE="other"
PKG_SITE="https://downloadcenter.intel.com/search?keyword=linux+microcode"
PKG_URL="https://downloadmirror.intel.com/26798/eng/microcode-${PKG_VERSION}.tgz"
PKG_URL="https://downloadmirror.intel.com/26925/eng/microcode-${PKG_VERSION}.tgz"
PKG_DEPENDS_TARGET="toolchain intel-ucode:host"
PKG_SECTION="linux-firmware"
PKG_SHORTDESC="intel-ucode: Intel CPU microcodes"
@ -36,17 +36,9 @@ unpack() {
}
make_host() {
$CC $CFLAGS -o intel-microcode2ucode intel-microcode2ucode.c
:
}
makeinstall_host() {
cp intel-microcode2ucode $TOOLCHAIN/bin/
}
make_target() {
intel-microcode2ucode ./microcode.dat
}
makeinstall_target() {
:
}

View File

@ -76,7 +76,7 @@ PKG_AUTORECONF="no"
PKG_MAKE_OPTS_HOST="ARCH=$TARGET_KERNEL_ARCH headers_check"
if [ "$TARGET_ARCH" = "x86_64" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET intel-ucode kernel-firmware"
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET intel-ucode:host kernel-firmware"
fi
if [ "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then
@ -149,10 +149,9 @@ pre_make_target() {
mkdir -p $PKG_BUILD/external-firmware
cp -a $(get_build_dir kernel-firmware)/{amdgpu,amd-ucode,i915,radeon,rtl_nic} $PKG_BUILD/external-firmware
mkdir -p $PKG_BUILD/external-firmware/intel-ucode
cp -a $(get_build_dir intel-ucode)/microcode.bin $PKG_BUILD/external-firmware/intel-ucode
cp -a $(get_build_dir intel-ucode)/intel-ucode $PKG_BUILD/external-firmware
FW_LIST="$(find $PKG_BUILD/external-firmware \( -type f -o -type l \) \( -iname '*.bin' -o -iname '*.fw' \) | sed 's|.*external-firmware/||' | sort | xargs)"
FW_LIST="$(find $PKG_BUILD/external-firmware \( -type f -o -type l \) \( -iname '*.bin' -o -iname '*.fw' -o -path '*/intel-ucode/*' \) | sed 's|.*external-firmware/||' | sort | xargs)"
sed -i "s|CONFIG_EXTRA_FIRMWARE=.*|CONFIG_EXTRA_FIRMWARE=\"${FW_LIST}\"|" $PKG_BUILD/.config
fi