]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge patch series "Audit include list for include/[a-m]*.h"
authorTom Rini <trini@konsulko.com>
Mon, 2 Jun 2025 23:43:56 +0000 (17:43 -0600)
committerTom Rini <trini@konsulko.com>
Mon, 2 Jun 2025 23:43:56 +0000 (17:43 -0600)
Tom Rini <trini@konsulko.com> says:

Hey all,

Related to my other series I've posted recently on cleaning up some
headers, this series here is the result of at least lightly auditing the
#includes used in include/[a-m]*.h. This ignores subdirectories, as at
least in part I think the top-level includes we've constructed are the
most likely places to have some extra transitive include paths. I'm sure
there's exceptions and I'll likely audit deeper once this first pass is
done. This only gets as far as "include/m*.h" because I didn't want this
to get too big. This also sets aside <miiphy.h> and <phy.h>. While
miiphy.h does not directly need <phy.h> there are *so* many users and I
think I had half of the tree just about not building when I first tried.
It might be worth further investigation, but it might just be OK as-is.

Link: https://lore.kernel.org/r/20250521230119.2084088-1-trini@konsulko.com
1  2 
arch/arm/mach-tegra/dt-setup.c
common/board_r.c
disk/part.c
include/bootflow.h
include/efi_loader.h
include/part.h
lib/efi_loader/efi_device_path.c

index 96044ac78ce427f44c2307fdb5c0ef1b21b8bc14,7f1c3538ebebd42af4cf997233d915e9a6419a66..a74d59205d402b223d74c258932f10f87eef1ff3
@@@ -3,9 -3,9 +3,10 @@@
   * Copyright (c) 2010-2016, NVIDIA CORPORATION.
   */
  
 +#include <env.h>
  #include <fdtdec.h>
  #include <stdlib.h>
+ #include <linux/if_ether.h>
  #include <asm/arch-tegra/cboot.h>
  #include <asm/arch-tegra/gpu.h>
  
Simple merge
diff --cc disk/part.c
Simple merge
Simple merge
index b3beda5de7b53c6f4803a9eff9e529aa76365463,f3c85ae8d6634c0a002fd61d89f7fe47c437dace..8fd09aad2d0fe766b17a2b15c60a12906bbc59c1
@@@ -9,13 -9,9 +9,10 @@@
  #define _EFI_LOADER_H 1
  
  #include <blk.h>
 +#include <efi_device_path.h>
  #include <event.h>
- #include <log.h>
- #include <part_efi.h>
  #include <efi_api.h>
  #include <image.h>
- #include <pe.h>
  #include <setjmp.h>
  #include <linux/list.h>
  #include <linux/sizes.h>
diff --cc include/part.h
Simple merge
index 7316a76f462949b7a984fe2d09e517deb3033160,66a951a8c1bb5814df032060c06ca29127c61c8a..b3fb20b2501ec68f68063eab71eb8bde56f7a9f4
@@@ -10,7 -10,7 +10,8 @@@
  #include <blk.h>
  #include <dm.h>
  #include <dm/root.h>
 +#include <efi_device_path.h>
+ #include <ide.h>
  #include <log.h>
  #include <net.h>
  #include <usb.h>