From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-655063-1516759648-2-17048292494717386229 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no ("Email failed DMARC policy for domain") X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org' X-Spam-charsets: X-IgnoreVacation: yes ("Email failed DMARC policy for domain") X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: linux-usb-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516759648; b=bE5uy7kbJdJ7LUTck8mkQ5CFVxvNmgTZ/5vYBRgRKlY+u3i cOPPGFnZnZ9j2u166FIm0n6MPuucFPw8u8l6bjD+EwVSv/xmjxUz0FOcJ86UB93n PChZHhBinyCbMw2r6+Yn8zQyQFOWcaiXpw6pAd31v3GHZzI+WX4Kqtykd0qYrGFV by1wBvD2NdXc2nkuHFYaT4oO1RFToqMBQGGAh1WD1WbcXXwu0LaQdQiR69Gom+a1 M4eRhaqrVdG5UZrl9WpMR6Ms2KZnsFhbO9doY1aQK6N7DO12zfLDe9ACHR4dPR2L W2aVltOewxvstvww9vEdOTIp6/QZf7iZv28p/+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:sender:list-id; s=arctest; t=1516759648; bh=TLmu33sRvlM87GBcrWmSP1kvWGqK8f48MACFJX0eP2U=; b=HHeF7nI67KTB 904ishzVOVI3K5Teonu3vQ6XecNAak7vobKeCtfYBvLi7QG7afuABcCQenATO/lS WVAVc4oJa0cMm3PGgkqmgYHe+81qFqcH7zs5oSJBAK3QYOgGl6XbBLMUHOVkd1vF mIBfvbBLNm8htMZrx6ozrNgP0RvcEjhPzPjg7MdK9pPwelOHleERexHehxM12qJT N6J9PQf85uKElACV5vjYL4NSCC3N+MpLP2sv+XG6x/9jep/pxUCsk8B+Cnk0e2lY cgW5iEO46h9xdbAPhw7rxzj9THm6mU/+ar8IzrZPzsfotPTs2cv9KwqS5gEmyRyl JGQIMXv0IQ== ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=fail (body has been altered; 1024-bit rsa key sha256) header.d=coreos.com header.i=@coreos.com header.b=EqiLzwAM x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=google; dmarc=fail (p=none,has-list-id=yes,d=none) header.from=coreos.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-usb-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-google-dkim=fail (body has been altered; 2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=BcVc7v3O; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=coreos.com header.result=pass header_is_org_domain=yes Authentication-Results: mx3.messagingengine.com; arc=none (no signatures found); dkim=fail (body has been altered; 1024-bit rsa key sha256) header.d=coreos.com header.i=@coreos.com header.b=EqiLzwAM x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=google; dmarc=fail (p=none,has-list-id=yes,d=none) header.from=coreos.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-usb-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-google-dkim=fail (body has been altered; 2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=BcVc7v3O; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=coreos.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752487AbeAXCHQ (ORCPT ); Tue, 23 Jan 2018 21:07:16 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:41834 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752385AbeAXCHL (ORCPT ); Tue, 23 Jan 2018 21:07:11 -0500 X-Google-Smtp-Source: AH8x226jtHnGvBPak5zyREBpoU/NZRqr15qeQNf6YurujEkY6Go7M1g43QVgXbNsTDtlp0fGm192jw== From: Benjamin Gilbert To: linux-kernel@vger.kernel.org Cc: linux-usb@vger.kernel.org, x86@kernel.org, Benjamin Gilbert , Borislav Petkov , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" Subject: [PATCH 3/3] firmware: Fix up docs referring to FIRMWARE_IN_KERNEL Date: Tue, 23 Jan 2018 18:06:32 -0800 Message-Id: <20180124020632.22905-4-benjamin.gilbert@coreos.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180124020632.22905-1-benjamin.gilbert@coreos.com> References: <20180124020632.22905-1-benjamin.gilbert@coreos.com> Sender: linux-usb-owner@vger.kernel.org X-Mailing-List: linux-usb@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: We've removed the option, so stop talking about it. Signed-off-by: Benjamin Gilbert Acked-by: Ingo Molnar Cc: Borislav Petkov Cc: Thomas Gleixner Cc: H. Peter Anvin --- Documentation/driver-api/firmware/built-in-fw.rst | 7 +------ Documentation/x86/microcode.txt | 5 ++--- arch/x86/Kconfig | 6 +++--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Documentation/driver-api/firmware/built-in-fw.rst b/Documentation/driver-api/firmware/built-in-fw.rst index 7300e66857f8..396cdf591ac5 100644 --- a/Documentation/driver-api/firmware/built-in-fw.rst +++ b/Documentation/driver-api/firmware/built-in-fw.rst @@ -11,13 +11,8 @@ options: * CONFIG_EXTRA_FIRMWARE * CONFIG_EXTRA_FIRMWARE_DIR -This should not be confused with CONFIG_FIRMWARE_IN_KERNEL, this is for drivers -which enables firmware to be built as part of the kernel build process. This -option, CONFIG_FIRMWARE_IN_KERNEL, will build all firmware for all drivers -enabled which ship its firmware inside the Linux kernel source tree. - There are a few reasons why you might want to consider building your firmware -into the kernel with CONFIG_EXTRA_FIRMWARE though: +into the kernel with CONFIG_EXTRA_FIRMWARE: * Speed * Firmware is needed for accessing the boot device, and the user doesn't diff --git a/Documentation/x86/microcode.txt b/Documentation/x86/microcode.txt index f57e1b45e628..aacd2f5e1a46 100644 --- a/Documentation/x86/microcode.txt +++ b/Documentation/x86/microcode.txt @@ -108,12 +108,11 @@ packages already put them there. ==================== The loader supports also loading of a builtin microcode supplied through -the regular firmware builtin method CONFIG_FIRMWARE_IN_KERNEL. Only -64-bit is currently supported. +the regular builtin firmware method CONFIG_EXTRA_FIRMWARE. Only 64-bit is +currently supported. Here's an example: -CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="intel-ucode/06-3a-09 amd-ucode/microcode_amd_fam15h.bin" CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware" diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 20da391b5f32..6d27d53de60d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1255,9 +1255,9 @@ config MICROCODE CONFIG_BLK_DEV_INITRD in order for the loader to be able to scan the initrd for microcode blobs. - In addition, you can build-in the microcode into the kernel. For that you - need to enable FIRMWARE_IN_KERNEL and add the vendor-supplied microcode - to the CONFIG_EXTRA_FIRMWARE config option. + In addition, you can build the microcode into the kernel. For that you + need to add the vendor-supplied microcode to the CONFIG_EXTRA_FIRMWARE + config option. config MICROCODE_INTEL bool "Intel microcode loading support" -- 2.13.6