From patchwork Sat Dec 7 04:42:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1205385 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="kZaK7IVV"; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47VHGB1hTCz9sPL for ; Sat, 7 Dec 2019 15:55:46 +1100 (AEDT) Received: from phobos.denx.de (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C25CD81740; Sat, 7 Dec 2019 05:49:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="kZaK7IVV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1993981759; Sat, 7 Dec 2019 05:49:25 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x144.google.com (mail-il1-x144.google.com [IPv6:2607:f8b0:4864:20::144]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0C8948175E for ; Sat, 7 Dec 2019 05:49:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x144.google.com with SMTP id u16so8105255ilg.10 for ; Fri, 06 Dec 2019 20:49:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TlB0Jja0gb6sNtGHAqlWWClegGdQ3QRcvYOnCjs2+4c=; b=kZaK7IVVdqy/BWjp0/TnGcOTzzuUblRGImLUvCwjlo7wtV0GRI4V3GkQL9RGRFmgnL QOoNTgA9JjKEAca/47UnFn84YI334BDhhY0s2+YxEw4Z07E2IC/I0ivWQCJFz8gpeTlM Q1U422MUBUBKmCZA6gVRFFDkg3MlhM8PbRxp8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TlB0Jja0gb6sNtGHAqlWWClegGdQ3QRcvYOnCjs2+4c=; b=J4ghEMecY7doUHbnebxUqcDPvBJzDLqnFdcf+VaoKBikOx43vAq1m8f+CjX5U9igAc 8yH6ZjbVe9qlGinHQJQKiILJ7d37XzD54RlTdZyyWRt3saBBjURZ2UkuAE7s7MH+WWCC 2huSV5n0hO+0XLIJ2eiaRSjfwSbREFohBpDPwQxKZtaGBKiIO+IhHsbMYnzACDewgQ8Q 8ZBd5dRG93Ba50P+CbasYzo2CzpqzBTftujDTYxvXH3D0Bow82OS/r3YRS42cW4V8pkg Viiq6aB6rWQUbEf81lb9ehSf/68YCAWzon1yTb8VoD9KvYyirWivANsZdKxCg6Pm/WGK ZQ0w== X-Gm-Message-State: APjAAAUmhopIXOC5MJbeuWk7DDCzIjW11tJJGdq1yfRZQhFHqNqFdRuw 0Yz+hMWGQ/kwyZMq7+pPRe3uUbfvYAc= X-Google-Smtp-Source: APXvYqxthcirBJ5+D/JHJmPsjzO3Gt9L1eWtPXMJ0I/QgIVbIP7nKD15OrbNkRQEy7u221Jh8vOEOQ== X-Received: by 2002:a92:5855:: with SMTP id m82mr17648511ilb.302.1575694159871; Fri, 06 Dec 2019 20:49:19 -0800 (PST) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id o7sm4549410ilo.58.2019.12.06.20.49.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Dec 2019 20:49:19 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Subject: [PATCH v6 051/102] x86: Add an option to include a FIT Date: Fri, 6 Dec 2019 21:42:24 -0700 Message-Id: <20191206213936.v6.51.I8927290f40075722d16217b170ef701463930bfd@changeid> X-Mailer: git-send-email 2.24.0.393.g34dc348eaf-goog In-Reply-To: <20191207044315.51770-1-sjg@chromium.org> References: <20191207044315.51770-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean Many Intel SoCs require a FIT in order to boot properly. Add an option to include this and enable it by default. This term can be confused with FIT (Flat Image Tree) in U-Boot so the CONFIG option has to include 'X86'. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: - Add help to CONFIG_FIT and don't make it 'default y' - Rename X86_HAS_FIT to HAVE_X86_FIT - Update commit message to explain why HAVE_FIT woudl be confusing Changes in v2: None arch/x86/Kconfig | 8 ++++++++ arch/x86/dts/u-boot.dtsi | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index e2e0f20f21..bcce1114ce 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -217,6 +217,14 @@ config SYS_X86_START16 depends on X86_RESET_VECTOR default 0xfffff800 +config HAVE_X86_FIT + bool + help + Enable inclusion of an Intel Firmware Interface Table (FIT) into the + image. This table is supposed to point to microcode and the like. So + far it is just a fixed table with the minimum set of headers, so that + it is actually present. + config X86_LOAD_FROM_32_BIT bool "Boot from a 32-bit program" help diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi index 0e87b88e10..33441c7c80 100644 --- a/arch/x86/dts/u-boot.dtsi +++ b/arch/x86/dts/u-boot.dtsi @@ -82,6 +82,12 @@ u-boot-ucode { align = <16>; }; +#ifdef CONFIG_HAVE_X86_FIT + intel-fit { + }; + intel-fit-ptr { + }; +#endif #ifdef CONFIG_HAVE_MRC intel-mrc { offset = ;