[PATCH 4/4] ti: mach-k3: Move dfu.h include to be with the code

Tom Rini trini at konsulko.com
Thu Aug 17 19:41:25 CEST 2023


Move where we include <dfu.h> to be guarded by a DFU-related Kconfig
option.

Signed-off-by: Tom Rini <trini at konsulko.com>
---
This becomes an issue with
https://patchwork.ozlabs.org/project/uboot/patch/20220620111354.448512-1-jh80.chung@samsung.com/
applied as now we can't include <dfu.h> without CONFIG_DFU_NAME_MAX_SIZE
set (or we have a dummy value for ifndef).
---
 arch/arm/mach-k3/sysfw-loader.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/sysfw-loader.c
index 9be2d9eaea26..a8edc4a92d11 100644
--- a/arch/arm/mach-k3/sysfw-loader.c
+++ b/arch/arm/mach-k3/sysfw-loader.c
@@ -18,7 +18,6 @@
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <g_dnl.h>
 #include <usb.h>
-#include <dfu.h>
 #include <dm/uclass-internal.h>
 #include <spi_flash.h>
 
@@ -297,6 +296,8 @@ static void k3_sysfw_configure_using_fit(void *fit,
 }
 
 #if CONFIG_IS_ENABLED(DFU)
+#include <dfu.h>
+
 static int k3_sysfw_dfu_download(void *addr)
 {
 	char dfu_str[50];
-- 
2.34.1



More information about the U-Boot mailing list