From 55717ca66f10bd8c1c05cd8053fee233d869e7e5 Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
Date: Wed, 14 May 2025 16:46:01 -0600
Subject: cmd/mem.c, test/cmd/mem_copy.c: Add <compiler.h>

These files require <compiler.h> in order to have MEM_SUPPORT_64BIT_DATA
be defined but currently rely on a long indirect include path to get it.
Add this directly.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 cmd/mem.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'cmd/mem.c')

diff --git a/cmd/mem.c b/cmd/mem.c
index 9e716776393..e5b9cb29349 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -14,6 +14,7 @@
 #include <bootretry.h>
 #include <cli.h>
 #include <command.h>
+#include <compiler.h>
 #include <console.h>
 #include <display_options.h>
 #ifdef CONFIG_MTD_NOR_FLASH
-- 
cgit v1.2.3


From dcb7d927d181b5798c6fd4a1b1650cd821e3b6ed Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
Date: Wed, 14 May 2025 16:46:03 -0600
Subject: 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>
---
 cmd/mem.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'cmd/mem.c')

diff --git a/cmd/mem.c b/cmd/mem.c
index e5b9cb29349..b8afe62e474 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -17,6 +17,7 @@
 #include <compiler.h>
 #include <console.h>
 #include <display_options.h>
+#include <env.h>
 #ifdef CONFIG_MTD_NOR_FLASH
 #include <flash.h>
 #endif
-- 
cgit v1.2.3