From: Tom Rini Date: Thu, 14 Dec 2023 18:16:47 +0000 (-0500) Subject: global: Drop common.h inclusion X-Git-Tag: v2024.04-rc1~51^2~12^2~11 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb3ce954013ce383e64b73b65df1eb4ef8833570;p=pandora-u-boot.git global: Drop common.h inclusion In order to make it easier to move on to dropping common.h from code directly, remove common.h inclusion from the rest of the header file which had been including it. Reviewed-by: Simon Glass Signed-off-by: Tom Rini --- diff --git a/board/BuR/common/br_resetc.h b/board/BuR/common/br_resetc.h index ba0689bf205..999045b867d 100644 --- a/board/BuR/common/br_resetc.h +++ b/board/BuR/common/br_resetc.h @@ -7,7 +7,6 @@ */ #ifndef __CONFIG_BRRESETC_H__ #define __CONFIG_BRRESETC_H__ -#include int br_resetc_regget(u8 reg, u8 *dst); int br_resetc_regset(u8 reg, u8 val); diff --git a/board/CZ.NIC/turris_mox/mox_sp.h b/board/CZ.NIC/turris_mox/mox_sp.h index 720880d5df3..c766c7423ac 100644 --- a/board/CZ.NIC/turris_mox/mox_sp.h +++ b/board/CZ.NIC/turris_mox/mox_sp.h @@ -6,8 +6,6 @@ #ifndef _BOARD_CZNIC_TURRIS_MOX_MOX_SP_H_ #define _BOARD_CZNIC_TURRIS_MOX_MOX_SP_H_ -#include - enum cznic_a3720_board { BOARD_UNDEFINED = 0x0, BOARD_TURRIS_MOX = 0x1, diff --git a/board/freescale/common/vsc3316_3308.h b/board/freescale/common/vsc3316_3308.h index 8d343ba4d65..9725d6d9e39 100644 --- a/board/freescale/common/vsc3316_3308.h +++ b/board/freescale/common/vsc3316_3308.h @@ -6,7 +6,6 @@ #ifndef __VSC_CROSSBAR_H_ #define __VSC_CROSSBAR_H_ -#include #include #include diff --git a/board/ti/ks2_evm/mux-k2g.h b/board/ti/ks2_evm/mux-k2g.h index f24e62850b8..447e70607f9 100644 --- a/board/ti/ks2_evm/mux-k2g.h +++ b/board/ti/ks2_evm/mux-k2g.h @@ -6,7 +6,6 @@ * Texas Instruments Incorporated, */ -#include #include #include #include diff --git a/board/tq/tqma6/tqma6_bb.h b/board/tq/tqma6/tqma6_bb.h index ca81bdf5853..a2f871af1f8 100644 --- a/board/tq/tqma6/tqma6_bb.h +++ b/board/tq/tqma6/tqma6_bb.h @@ -7,8 +7,6 @@ #ifndef __TQMA6_BB__ #define __TQMA6_BB__ -#include - int tqma6_bb_board_mmc_getwp(struct mmc *mmc); int tqma6_bb_board_mmc_getcd(struct mmc *mmc); int tqma6_bb_board_mmc_init(struct bd_info *bis); diff --git a/board/xilinx/zynqmp/xil_io.h b/board/xilinx/zynqmp/xil_io.h index e6caa7c8503..dd823d6f62a 100644 --- a/board/xilinx/zynqmp/xil_io.h +++ b/board/xilinx/zynqmp/xil_io.h @@ -5,7 +5,6 @@ /* FIXME remove this when vivado is fixed */ #include -#include #include #define xil_printf(...) diff --git a/disk/part_amiga.h b/disk/part_amiga.h index 42f5eb0f941..dfa70bdb8a8 100644 --- a/disk/part_amiga.h +++ b/disk/part_amiga.h @@ -7,7 +7,6 @@ #ifndef _DISK_PART_AMIGA_H #define _DISK_PART_AMIGA_H -#include #if CONFIG_IS_ENABLED(ISO_PARTITION) /* Make the buffers bigger if ISO partition support is enabled -- CD-ROMS diff --git a/drivers/bios_emulator/include/x86emu.h b/drivers/bios_emulator/include/x86emu.h index b28cdc6b8ca..d2650a8d160 100644 --- a/drivers/bios_emulator/include/x86emu.h +++ b/drivers/bios_emulator/include/x86emu.h @@ -42,7 +42,6 @@ #define __X86EMU_X86EMU_H #include -#include #include #include #define X86API diff --git a/drivers/crypto/fsl/jobdesc.h b/drivers/crypto/fsl/jobdesc.h index c4501abd26b..69adfdca95b 100644 --- a/drivers/crypto/fsl/jobdesc.h +++ b/drivers/crypto/fsl/jobdesc.h @@ -7,7 +7,6 @@ #ifndef __JOBDESC_H #define __JOBDESC_H -#include #include #include "rsa_caam.h" diff --git a/drivers/crypto/fsl/rsa_caam.h b/drivers/crypto/fsl/rsa_caam.h index 9a6a8afa4aa..fb132a3d181 100644 --- a/drivers/crypto/fsl/rsa_caam.h +++ b/drivers/crypto/fsl/rsa_caam.h @@ -6,8 +6,6 @@ #ifndef __RSA_CAAM_H #define __RSA_CAAM_H -#include - /** * struct pk_in_params - holder for input to PKHA block in CAAM * These parameters are required to perform Modular Exponentiation diff --git a/drivers/ddr/altera/sdram_soc64.h b/drivers/ddr/altera/sdram_soc64.h index 07a0f9f2ae9..87a70a861ba 100644 --- a/drivers/ddr/altera/sdram_soc64.h +++ b/drivers/ddr/altera/sdram_soc64.h @@ -6,7 +6,6 @@ #ifndef _SDRAM_SOC64_H_ #define _SDRAM_SOC64_H_ -#include #include struct altera_sdram_priv { diff --git a/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h b/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h index 73573119658..dff56338b19 100644 --- a/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h +++ b/drivers/ddr/marvell/a38x/ddr_ml_wrapper.h @@ -6,7 +6,6 @@ #ifndef _DDR_ML_WRAPPER_H #define _DDR_ML_WRAPPER_H -#include #include #include #include diff --git a/drivers/net/fm/fm.h b/drivers/net/fm/fm.h index a2d5b03429a..5c45ad56d0a 100644 --- a/drivers/net/fm/fm.h +++ b/drivers/net/fm/fm.h @@ -6,7 +6,6 @@ #ifndef __FM_H__ #define __FM_H__ -#include #include #include #include diff --git a/drivers/net/fsl-mc/dpio/qbman_private.h b/drivers/net/fsl-mc/dpio/qbman_private.h index 53f1300eaf8..f9dad178075 100644 --- a/drivers/net/fsl-mc/dpio/qbman_private.h +++ b/drivers/net/fsl-mc/dpio/qbman_private.h @@ -4,7 +4,6 @@ */ /* Perform extra checking */ -#include #include #include #include diff --git a/drivers/net/fsl-mc/dpio/qbman_sys.h b/drivers/net/fsl-mc/dpio/qbman_sys.h index 1c6e4891302..cac70a1291c 100644 --- a/drivers/net/fsl-mc/dpio/qbman_sys.h +++ b/drivers/net/fsl-mc/dpio/qbman_sys.h @@ -20,6 +20,7 @@ /* Trace the 3 different classes of read/write access to QBMan. #undef as * required. */ +#include #include #include #undef QBMAN_CCSR_TRACE diff --git a/drivers/net/mscc_eswitch/mscc_mac_table.c b/drivers/net/mscc_eswitch/mscc_mac_table.c index 25b9cad42c9..06e1f625fb7 100644 --- a/drivers/net/mscc_eswitch/mscc_mac_table.c +++ b/drivers/net/mscc_eswitch/mscc_mac_table.c @@ -3,6 +3,7 @@ * Copyright (c) 2018 Microsemi Corporation */ +#include #include #include #include "mscc_mac_table.h" diff --git a/drivers/net/mscc_eswitch/mscc_mac_table.h b/drivers/net/mscc_eswitch/mscc_mac_table.h index 17fed2e7925..5ec8db25417 100644 --- a/drivers/net/mscc_eswitch/mscc_mac_table.h +++ b/drivers/net/mscc_eswitch/mscc_mac_table.h @@ -3,8 +3,6 @@ * Copyright (c) 2018 Microsemi Corporation */ -#include - #define ETH_LEN 6 #define MAC_VID 1 diff --git a/drivers/net/mscc_eswitch/mscc_xfer.c b/drivers/net/mscc_eswitch/mscc_xfer.c index 6f747464571..ee6bf065d3a 100644 --- a/drivers/net/mscc_eswitch/mscc_xfer.c +++ b/drivers/net/mscc_eswitch/mscc_xfer.c @@ -3,6 +3,7 @@ * Copyright (c) 2018 Microsemi Corporation */ +#include #include #include #include diff --git a/drivers/net/mscc_eswitch/mscc_xfer.h b/drivers/net/mscc_eswitch/mscc_xfer.h index c880a4e7e6a..70f279401e1 100644 --- a/drivers/net/mscc_eswitch/mscc_xfer.h +++ b/drivers/net/mscc_eswitch/mscc_xfer.h @@ -3,8 +3,6 @@ * Copyright (c) 2018 Microsemi Corporation */ -#include - enum mscc_regs_qs { MSCC_QS_XTR_RD, MSCC_QS_XTR_FLUSH, diff --git a/drivers/pci/pcie_layerscape_fixup_common.h b/drivers/pci/pcie_layerscape_fixup_common.h index 70bd3f0cba3..3255b7648c0 100644 --- a/drivers/pci/pcie_layerscape_fixup_common.h +++ b/drivers/pci/pcie_layerscape_fixup_common.h @@ -9,8 +9,6 @@ #ifndef _PCIE_LAYERSCAPE_FIXUP_COMMON_H_ #define _PCIE_LAYERSCAPE_FIXUP_COMMON_H_ -#include - void ft_pci_setup_ls(void *blob, struct bd_info *bd); #ifdef CONFIG_PCIE_LAYERSCAPE_GEN4 diff --git a/drivers/pci_endpoint/pcie-cadence.h b/drivers/pci_endpoint/pcie-cadence.h index 8a659c36aa2..dd0101a33af 100644 --- a/drivers/pci_endpoint/pcie-cadence.h +++ b/drivers/pci_endpoint/pcie-cadence.h @@ -11,7 +11,6 @@ #ifndef PCIE_CADENCE_H #define PCIE_CADENCE_H -#include #include #include #include diff --git a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h index 1f1023ef421..7a38f8d8753 100644 --- a/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h +++ b/drivers/pinctrl/mtmips/pinctrl-mtmips-common.h @@ -8,8 +8,6 @@ #ifndef _PINCTRL_MTMIPS_COMMON_H_ #define _PINCTRL_MTMIPS_COMMON_H_ -#include - struct mtmips_pmx_func { const char *name; int value; diff --git a/drivers/usb/gadget/bcm_udc_otg.h b/drivers/usb/gadget/bcm_udc_otg.h index 24cc936c6b4..48370f37d8a 100644 --- a/drivers/usb/gadget/bcm_udc_otg.h +++ b/drivers/usb/gadget/bcm_udc_otg.h @@ -6,8 +6,6 @@ #ifndef __BCM_UDC_OTG_H #define __BCM_UDC_OTG_H -#include - static inline void wfld_set(uintptr_t addr, uint32_t fld_val, uint32_t fld_mask) { writel(((readl(addr) & ~(fld_mask)) | (fld_val)), (addr)); diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index ffd095ffdd2..59439552a45 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -9,7 +9,6 @@ #ifndef __BTRFS_CTREE_H__ #define __BTRFS_CTREE_H__ -#include #include #include #include diff --git a/fs/yaffs2/ydirectenv.h b/fs/yaffs2/ydirectenv.h index d274f22e84d..790f8512f74 100644 --- a/fs/yaffs2/ydirectenv.h +++ b/fs/yaffs2/ydirectenv.h @@ -20,7 +20,6 @@ #ifndef __YDIRECTENV_H__ #define __YDIRECTENV_H__ -#include #include #include diff --git a/lib/libavb/avb_sysdeps.h b/lib/libavb/avb_sysdeps.h index f52428cc622..aece8e0a018 100644 --- a/lib/libavb/avb_sysdeps.h +++ b/lib/libavb/avb_sysdeps.h @@ -19,7 +19,9 @@ extern "C" { * like uint8_t, uint64_t, and bool (with |false|, |true| keywords) * must be present. */ -#include +#include +#include +#include /* If you don't have gcc or clang, these attribute macros may need to * be adjusted. diff --git a/lib/zlib/zlib.h b/lib/zlib/zlib.h index af3703e6d77..560e7be97d3 100644 --- a/lib/zlib/zlib.h +++ b/lib/zlib/zlib.h @@ -2,7 +2,6 @@ #ifndef __GLUE_ZLIB_H__ #define __GLUE_ZLIB_H__ -#include #include #include #include diff --git a/net/arp.h b/net/arp.h index 25b3c00d5c5..c50885fb9a5 100644 --- a/net/arp.h +++ b/net/arp.h @@ -12,8 +12,6 @@ #ifndef __ARP_H__ #define __ARP_H__ -#include - extern struct in_addr net_arp_wait_packet_ip; /* MAC address of waiting packet's destination */ extern uchar *arp_wait_packet_ethaddr; diff --git a/net/link_local.h b/net/link_local.h index bb998164df9..d8701255142 100644 --- a/net/link_local.h +++ b/net/link_local.h @@ -10,15 +10,12 @@ * Licensed under the GPL v2 or later */ -#if defined(CONFIG_CMD_LINK_LOCAL) - #ifndef __LINK_LOCAL_H__ #define __LINK_LOCAL_H__ -#include +struct arp_hdr; void link_local_receive_arp(struct arp_hdr *arp, int len); void link_local_start(void); #endif /* __LINK_LOCAL_H__ */ -#endif diff --git a/net/net_rand.h b/net/net_rand.h index 6a52cda85e0..d3c5559adfd 100644 --- a/net/net_rand.h +++ b/net/net_rand.h @@ -9,7 +9,6 @@ #ifndef __NET_RAND_H__ #define __NET_RAND_H__ -#include #include #include diff --git a/net/ping.h b/net/ping.h index 7b6f4e566db..76ac225fc07 100644 --- a/net/ping.h +++ b/net/ping.h @@ -12,7 +12,6 @@ #ifndef __PING_H__ #define __PING_H__ -#include #include /*