commit 2285638768acfe97e4e3e3061c8bde7416fb0277
author Tom Rini <trini@konsulko.com> Wed May 14 16:46:03 2025 -0600
committer Tom Rini <trini@konsulko.com> Thu May 29 08:29:16 2025 -0600
tree 53a9d2469173205baee1767d212165cd187887e4
parent e2dc2811a96f4201e4423bb4958638beef440c98

global: Avoid indirect inclusion of <env.h> from <command.h>

The include file <command.h> does not need anything from <env.h>.
Furthermore, include/env.h itself includes other headers which can lead
to longer indirect inclusion paths. To prepare to remove <env.h> from
<command.h> fix all of the places which had relied on this indirect
inclusion to instead include <env.h> directly.

Reviewed-by: Mattijs Korpershoek <mkorpershoek@kernel.org> # android, bcb
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org> # spawn
Signed-off-by: Tom Rini <trini@konsulko.com>

test/boot/bootdev.c

diff --git a/test/boot/bootdev.c b/test/boot/bootdev.c
index 9af9478..a5f3d44 100644
--- a/test/boot/bootdev.c
+++ b/test/boot/bootdev.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <bootdev.h>
 #include <bootflow.h>
+#include <env.h>
 #include <mapmem.h>
 #include <os.h>
 #include <test/ut.h>

test/boot/bootflow.c

diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c
index b261bd5..a930d2c 100644
--- a/test/boot/bootflow.c
+++ b/test/boot/bootflow.c
@@ -14,6 +14,7 @@
 #include <dm.h>
 #include <efi.h>
 #include <efi_loader.h>
+#include <env.h>
 #include <expo.h>
 #include <mapmem.h>
 #ifdef CONFIG_SANDBOX

test/boot/bootm.c

diff --git a/test/boot/bootm.c b/test/boot/bootm.c
index 1d1efe7..ed60094 100644
--- a/test/boot/bootm.c
+++ b/test/boot/bootm.c
@@ -6,6 +6,7 @@
  */
 
 #include <bootm.h>
+#include <env.h>
 #include <asm/global_data.h>
 #include <test/test.h>
 #include <test/ut.h>

test/boot/bootmeth.c

diff --git a/test/boot/bootmeth.c b/test/boot/bootmeth.c
index 577f259..2ef3569 100644
--- a/test/boot/bootmeth.c
+++ b/test/boot/bootmeth.c
@@ -9,6 +9,7 @@
 #include <bootmeth.h>
 #include <bootstd.h>
 #include <dm.h>
+#include <env.h>
 #include <test/ut.h>
 #include "bootstd_common.h"
 

test/boot/measurement.c

diff --git a/test/boot/measurement.c b/test/boot/measurement.c
index 1d38663..71f503f 100644
--- a/test/boot/measurement.c
+++ b/test/boot/measurement.c
@@ -7,6 +7,7 @@
  */
 
 #include <bootm.h>
+#include <env.h>
 #include <malloc.h>
 #include <test/test.h>
 #include <test/ut.h>

test/boot/upl.c

diff --git a/test/boot/upl.c b/test/boot/upl.c
index eec8902..e2dc3d5 100644
--- a/test/boot/upl.c
+++ b/test/boot/upl.c
@@ -7,6 +7,7 @@
  */
 
 #include <abuf.h>
+#include <env.h>
 #include <mapmem.h>
 #include <upl.h>
 #include <dm/ofnode.h>