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>

diff --git a/include/efi_driver.h b/include/efi_driver.h
index 840483a416a454155aad70b9515459e7d2cc3953..2b62219c5bf118c01e69cb7f824d2b43a091c52b 100644 (file)
--- 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 e7d8745ad858bc2ca0bb5274a0adc742d4ffbbfd..0e72a68bced0d6b575e9b20cc5c7cbf24bb5c265 100644 (file)
--- 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 04e4e457344afd307ebe36b8aa0049d4393fd692..0cf74b0361dbaefa5e48a715f1b47b4ad9dd0cd8 100644 (file)
--- 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>