intel-ucode: drop microcode.bin, use binary files

This commit is contained in:
MilhouseVH 2017-07-19 21:51:11 +01:00
parent 4df449fc51
commit bcbef60dad
2 changed files with 4 additions and 13 deletions

View File

@ -36,17 +36,9 @@ unpack() {
} }
make_host() { make_host() {
$CC $CFLAGS -o intel-microcode2ucode intel-microcode2ucode.c :
} }
makeinstall_host() { 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" PKG_MAKE_OPTS_HOST="ARCH=$TARGET_KERNEL_ARCH headers_check"
if [ "$TARGET_ARCH" = "x86_64" ]; then 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 fi
if [ "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then if [ "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then
@ -149,10 +149,9 @@ pre_make_target() {
mkdir -p $PKG_BUILD/external-firmware mkdir -p $PKG_BUILD/external-firmware
cp -a $(get_build_dir kernel-firmware)/{amdgpu,amd-ucode,i915,radeon,rtl_nic} $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)/intel-ucode $PKG_BUILD/external-firmware
cp -a $(get_build_dir intel-ucode)/microcode.bin $PKG_BUILD/external-firmware/intel-ucode
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 sed -i "s|CONFIG_EXTRA_FIRMWARE=.*|CONFIG_EXTRA_FIRMWARE=\"${FW_LIST}\"|" $PKG_BUILD/.config
fi fi