From patchwork Mon Nov 1 01:17:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1548927 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=YUUdjHwi; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HjFfn753Xz9sXN for ; Mon, 1 Nov 2021 12:23:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4A19B83667; Mon, 1 Nov 2021 02:22:18 +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=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="YUUdjHwi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9250C8363D; Mon, 1 Nov 2021 02:20:37 +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=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (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 84FC5835DB for ; Mon, 1 Nov 2021 02:19:38 +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-io1-xd34.google.com with SMTP id d63so19761778iof.4 for ; Sun, 31 Oct 2021 18:19:38 -0700 (PDT) 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=XilffrHKFvywlqMrYi2pdgIVVhDPANxP3avweeX9y00=; b=YUUdjHwigmzlSGeNN/oECCm21LBCl9zRGZr9TUVHPZBhnX9wvQieBr61RXBshS+gBT +efvNjmCBQw1jlFZEh/gsTCO0zJPv6TN92AH8RsZulfCN2VFI+Q2BKLueFm2QKx/aPJA uD8Nv/c+Y/CgFJV5PyWE2gYHzORggQUBJ0L3E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XilffrHKFvywlqMrYi2pdgIVVhDPANxP3avweeX9y00=; b=Nt1Z5nIg1ukOFFvP9SlXGMNaAzSeUm8CixnDcma4CYtXeSfrzYOUwDu+QO7LsDfI1p +q5A981FdMb2wwRBTlfEbqcHtEIPGmB/z99k4PpgtpdG05bTWpmSldmYgSc6y+3tSZkE pRdZ/PwPCrJpouGXnmmp6/ZrLsDvp51FncrS/R47e4piNPxIpOw96L9eCE59VVSkpKLM 1kYC3g3j6yQMNIu5EzdXIb1ZDq+MBLCSnuwt2rio5dH8dR+wvimLtrww99pofYATrs1e m2MsBUbNwaIvo7ifJ9zoKgOnYvpKCx9uu/iNPx94NQgJUN4OR0T5xeEbIIYVgxwXuPI/ WKxA== X-Gm-Message-State: AOAM533TlR182pDHABRKdzXcKlES4z6ClxjAcPRoOZBhtiLgsPhzEY1y E3JhIqQV/85MdstFAkAV2ZfLpBLaxP5VeQ== X-Google-Smtp-Source: ABdhPJzyg9ODvPKRUbA4+PiemJsreeTMaAiB3en0flDeHYHPcHOkmDa6PC8+y3vTm8fF5DpvS0dtPw== X-Received: by 2002:a05:6602:168f:: with SMTP id s15mr18842340iow.178.1635729577113; Sun, 31 Oct 2021 18:19:37 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id f11sm4351109ilu.82.2021.10.31.18.19.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Oct 2021 18:19:36 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Bin Meng , Ilias Apalodimas , Bill Mills , Heinrich Schuchardt , =?utf-8?q?Fran=C3=A7ois_Ozog?= , Simon Glass Subject: [PATCH 29/31] x86: Move Intel GNVS file into the common include directory Date: Sun, 31 Oct 2021 19:17:31 -0600 Message-Id: <20211101011734.1614781-30-sjg@chromium.org> X-Mailer: git-send-email 2.33.1.1089.g2158813163f-goog In-Reply-To: <20211101011734.1614781-1-sjg@chromium.org> References: <20211101011734.1614781-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.103.2 at phobos.denx.de X-Virus-Status: Clean Move this so we can include it from sandbox, needed since it is in a bloblist and must have a check. Signed-off-by: Simon Glass --- arch/x86/cpu/apollolake/acpi.c | 2 +- arch/x86/cpu/intel_common/acpi.c | 2 +- arch/x86/include/asm/arch-apollolake/global_nvs.h | 2 +- board/google/chromebook_coral/coral.c | 2 +- {arch/x86/include/asm => include}/intel_gnvs.h | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename {arch/x86/include/asm => include}/intel_gnvs.h (100%) diff --git a/arch/x86/cpu/apollolake/acpi.c b/arch/x86/cpu/apollolake/acpi.c index fd21c0b4968..2822b8d06d1 100644 --- a/arch/x86/cpu/apollolake/acpi.c +++ b/arch/x86/cpu/apollolake/acpi.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -21,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/x86/cpu/intel_common/acpi.c b/arch/x86/cpu/intel_common/acpi.c index 15f19da2067..4a288e85252 100644 --- a/arch/x86/cpu/intel_common/acpi.c +++ b/arch/x86/cpu/intel_common/acpi.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -23,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/x86/include/asm/arch-apollolake/global_nvs.h b/arch/x86/include/asm/arch-apollolake/global_nvs.h index ef8eb228dbe..639d8f2de78 100644 --- a/arch/x86/include/asm/arch-apollolake/global_nvs.h +++ b/arch/x86/include/asm/arch-apollolake/global_nvs.h @@ -10,6 +10,6 @@ #ifndef _GLOBAL_NVS_H_ #define _GLOBAL_NVS_H_ -#include +#include #endif /* _GLOBAL_NVS_H_ */ diff --git a/board/google/chromebook_coral/coral.c b/board/google/chromebook_coral/coral.c index 53c5171d02b..ca63cf4ef51 100644 --- a/board/google/chromebook_coral/coral.c +++ b/board/google/chromebook_coral/coral.c @@ -11,13 +11,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include #include #include diff --git a/arch/x86/include/asm/intel_gnvs.h b/include/intel_gnvs.h similarity index 100% rename from arch/x86/include/asm/intel_gnvs.h rename to include/intel_gnvs.h