summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2020-07-19 10:15:43 -0600
committerTom Rini <trini@konsulko.com>2020-08-03 22:19:54 -0400
commite1e10f29f9b5739b39b08b0c0040ec0cb315f3d7 (patch)
treebb6d93d51f3681b026d5ce5706809f247ac85292
parent411e9eb88c0cf2b99f3dcaa9b300c0e52ee751f3 (diff)
efi: Tidy up header includes
Two files relies 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 <sjg@chromium.org>
-rw-r--r--include/efi_driver.h2
-rw-r--r--lib/efi_driver/efi_block_device.c1
-rw-r--r--lib/efi_driver/efi_uclass.c2
3 files changed, 3 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 <common.h>
-#include <dm.h>
#include <efi_loader.h>
/*
diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c
index e7d8745ad8..0e72a68bce 100644
--- a/lib/efi_driver/efi_block_device.c
+++ b/lib/efi_driver/efi_block_device.c
@@ -30,6 +30,7 @@
#include <common.h>
#include <blk.h>
+#include <dm.h>
#include <efi_driver.h>
#include <malloc.h>
#include <dm/device-internal.h>
diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c
index 04e4e45734..0cf74b0361 100644
--- a/lib/efi_driver/efi_uclass.c
+++ b/lib/efi_driver/efi_uclass.c
@@ -17,6 +17,8 @@
* controllers.
*/
+#include <common.h>
+#include <dm.h>
#include <efi_driver.h>
#include <log.h>
#include <malloc.h>