From bcbef60dad95d29aaf4b4aa13d4be480345b5cde Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 19 Jul 2017 21:51:11 +0100 Subject: [PATCH] intel-ucode: drop microcode.bin, use binary files --- packages/linux-firmware/intel-ucode/package.mk | 10 +--------- packages/linux/package.mk | 7 +++---- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/packages/linux-firmware/intel-ucode/package.mk b/packages/linux-firmware/intel-ucode/package.mk index 43a3e8fcce..8ff2b3a250 100644 --- a/packages/linux-firmware/intel-ucode/package.mk +++ b/packages/linux-firmware/intel-ucode/package.mk @@ -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() { : } diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 520af2d442..73b7467998 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -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