From patchwork Sun Oct 27 15:53:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185076 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.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="mAm0vEdF"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N9g0shyz9sPK for ; Mon, 28 Oct 2019 03:10:31 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C4D19C21E9F; Sun, 27 Oct 2019 15:59:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8588CC21E60; Sun, 27 Oct 2019 15:56:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 01401C21DFD; Sun, 27 Oct 2019 15:55:59 +0000 (UTC) Received: from mail-il1-f196.google.com (mail-il1-f196.google.com [209.85.166.196]) by lists.denx.de (Postfix) with ESMTPS id 0C9A6C21DF3 for ; Sun, 27 Oct 2019 15:55:07 +0000 (UTC) Received: by mail-il1-f196.google.com with SMTP id i12so5870594ils.6 for ; Sun, 27 Oct 2019 08:55:06 -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=ikQHl3biCI++3YxllFm5e8IEoBLnBeBAUgnlrhIeaIY=; b=mAm0vEdFMwgRNXuX3DtEk8cZB2IWEV2QC2FvvmNDfuL8a38HGrKr4qBGzKqEV2gLVx 25jsPeVJ/5qgjp0kEjciKBizBjBi9SCSTQZTpNYw2G9blpGo9nhdi61PHeSp/KeQgtZU DQ4V2WSCd4Kuu2YQUtYbMw2tv/E/adUlXi/n0= 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=ikQHl3biCI++3YxllFm5e8IEoBLnBeBAUgnlrhIeaIY=; b=A6bsHfRHD5MV+vZ06Fikly1RbRxuqgMe06GFN9OGJMnVFyNSmYsIKU2px2ofkD7VtB a2uqlR8jMR1OC4324C8xHyhxWf4Hjc6Ze9oow9ROS1Qtm7y5MrwVKkxOgxdah5vUxRLQ 6w2iETqD//NhzID5n2VLnW95CiJ5KkSW51tYwoT/vA9k4zmWU7JHZVQ8LMVv8k2gZyuH mAb2N/XTpyZEJP5BOWfqj06fv4FMBn3fdr8keVZlZneqaI3gF6Z2Ed0cl9MuF1wa0sWO RgxN6KUulLjFp8wpbmXrul5nznYhuwXkOQYHPg2b//+N+pcLWtrCalF7e0wqEmqWvcFy WXGQ== X-Gm-Message-State: APjAAAUifQPXU6iAVbJsyPpQIFlohO/Y2XNcnN9L7I44F/jyDCDAv82/ gxcnHHQh20iENbY4AmQc0xbuibHrFnS5WA== X-Google-Smtp-Source: APXvYqwqzbmRJNyFbW2fPboziRVjcXmE9rEdgSo92BDREO2JUviF76VVncJbx8nohtn5rSFZxP/pWQ== X-Received: by 2002:a92:1793:: with SMTP id 19mr15476096ilx.3.1572191705835; Sun, 27 Oct 2019 08:55:05 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:05 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:56 -0600 Message-Id: <20191027155410.187957-16-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , Alexander Graf , Heinrich Schuchardt Subject: [U-Boot] [PATCH 16/30] efi: Tidy up header includes X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Two files relay on efi_driver.h to include common.h and dm.h which is incorrect. The former should always be included in a non-host C file and the latter should be included if driver model is used. Signed-off-by: Simon Glass Reviewed-by: Heinrich Schuchardt --- include/efi_driver.h | 2 -- lib/efi_driver/efi_block_device.c | 2 ++ lib/efi_driver/efi_uclass.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/efi_driver.h b/include/efi_driver.h index 840483a416..2b62219c5b 100644 --- a/include/efi_driver.h +++ b/include/efi_driver.h @@ -8,8 +8,6 @@ #ifndef _EFI_DRIVER_H #define _EFI_DRIVER_H 1 -#include -#include #include /* diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c index cf02341931..c7e7946cdd 100644 --- a/lib/efi_driver/efi_block_device.c +++ b/lib/efi_driver/efi_block_device.c @@ -28,6 +28,8 @@ * iPXE uses the simple file protocol to load Grub or the Linux Kernel. */ +#include +#include #include #include #include diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c index b14746e6b1..c837db165c 100644 --- a/lib/efi_driver/efi_uclass.c +++ b/lib/efi_driver/efi_uclass.c @@ -17,6 +17,8 @@ * controllers. */ +#include +#include #include /**