| Message ID | 20200510113946.v3.17.Ib20521599e03e4a4489d714c9b7af5b04734638c@changeid |
|---|---|
| State | Accepted |
| Commit | eb41d8a1befc45a30ccdab68fa3e099528486ffe |
| Headers | show |
| Series | common: Further reduce the size of common.h | expand |
On Sun, May 10, 2020 at 11:40:08AM -0600, Simon Glass wrote: > Move this uncommon header out of the common header. > > Signed-off-by: Simon Glass <sjg at chromium.org> Applied to u-boot/master, thanks!
diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h index 01c0ebad64..5567dbd7f3 100644 --- a/arch/arm/mach-bcm283x/include/mach/timer.h +++ b/arch/arm/mach-bcm283x/include/mach/timer.h @@ -8,6 +8,7 @@ #ifndef __ASSEMBLY__ #include <asm/arch/base.h> +#include <linux/bug.h> #endif #define BCM2835_TIMER_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \ diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c index 85abbb4a89..2630bfff8e 100644 --- a/arch/arm/mach-imx/cmd_nandbcb.c +++ b/arch/arm/mach-imx/cmd_nandbcb.c @@ -15,6 +15,7 @@ #include <malloc.h> #include <nand.h> #include <dm/devres.h> +#include <linux/bug.h> #include <asm/io.h> #include <jffs2/jffs2.h> diff --git a/arch/arm/mach-tegra/ivc.c b/arch/arm/mach-tegra/ivc.c index a448f2df30..e7c6d78744 100644 --- a/arch/arm/mach-tegra/ivc.c +++ b/arch/arm/mach-tegra/ivc.c @@ -7,6 +7,7 @@ #include <cpu_func.h> #include <asm/io.h> #include <asm/arch-tegra/ivc.h> +#include <linux/bug.h> #define TEGRA_IVC_ALIGN 64 diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.c b/arch/arm/mach-uniphier/boot-device/boot-device.c index 777946970b..43b28f8b86 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device.c +++ b/arch/arm/mach-uniphier/boot-device/boot-device.c @@ -8,6 +8,7 @@ #include <command.h> #include <spl.h> #include <stdio.h> +#include <linux/bug.h> #include <linux/io.h> #include <linux/log2.h> diff --git a/arch/mips/lib/cache.c b/arch/mips/lib/cache.c index f05b24bd12..24f115ebc9 100644 --- a/arch/mips/lib/cache.c +++ b/arch/mips/lib/cache.c @@ -14,6 +14,7 @@ #include <asm/io.h> #include <asm/mipsregs.h> #include <asm/system.h> +#include <linux/bug.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/armltd/integrator/pci.c b/board/armltd/integrator/pci.c index e3793c1125..3ef5993213 100644 --- a/board/armltd/integrator/pci.c +++ b/board/armltd/integrator/pci.c @@ -24,6 +24,7 @@ #include <log.h> #include <pci.h> #include <asm/io.h> +#include <linux/bug.h> #include "integrator-sc.h" #include "pci_v3.h" diff --git a/board/sifive/fu540/fu540.c b/board/sifive/fu540/fu540.c index d2a1ed0a3e..df57b6ecc2 100644 --- a/board/sifive/fu540/fu540.c +++ b/board/sifive/fu540/fu540.c @@ -10,6 +10,7 @@ #include <dm.h> #include <env.h> #include <init.h> +#include <linux/bug.h> #include <linux/delay.h> #include <linux/io.h> diff --git a/cmd/jffs2.c b/cmd/jffs2.c index bb4790402e..9540988e33 100644 --- a/cmd/jffs2.c +++ b/cmd/jffs2.c @@ -77,6 +77,7 @@ #include <image.h> #include <malloc.h> #include <jffs2/jffs2.h> +#include <linux/bug.h> #include <linux/list.h> #include <linux/ctype.h> #include <cramfs/cramfs_fs.h> diff --git a/common/iotrace.c b/common/iotrace.c index 295ee07b72..7225ee4404 100644 --- a/common/iotrace.c +++ b/common/iotrace.c @@ -9,6 +9,7 @@ #include <mapmem.h> #include <time.h> #include <asm/io.h> +#include <linux/bug.h> #include <u-boot/crc.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c index d79ae367b8..2a68719eb6 100644 --- a/drivers/clk/clk-divider.c +++ b/drivers/clk/clk-divider.c @@ -18,6 +18,7 @@ #include <dm/uclass.h> #include <dm/lists.h> #include <dm/device-internal.h> +#include <linux/bug.h> #include <linux/clk-provider.h> #include <linux/err.h> #include <linux/log2.h> diff --git a/drivers/clk/clk-hsdk-cgu.c b/drivers/clk/clk-hsdk-cgu.c index 64508926ca..38e85430b9 100644 --- a/drivers/clk/clk-hsdk-cgu.c +++ b/drivers/clk/clk-hsdk-cgu.c @@ -14,6 +14,7 @@ #include <div64.h> #include <dm.h> #include <log.h> +#include <linux/bug.h> #include <linux/io.h> /* diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c index 276e4fb336..9ffc2243cb 100644 --- a/drivers/clk/clk-uclass.c +++ b/drivers/clk/clk-uclass.c @@ -16,6 +16,7 @@ #include <malloc.h> #include <dm/devres.h> #include <dm/read.h> +#include <linux/bug.h> #include <linux/clk-provider.h> #include <linux/err.h> diff --git a/drivers/clk/clk_pic32.c b/drivers/clk/clk_pic32.c index 79469c454f..7ddff2feaf 100644 --- a/drivers/clk/clk_pic32.c +++ b/drivers/clk/clk_pic32.c @@ -12,6 +12,7 @@ #include <wait_bit.h> #include <dm/lists.h> #include <asm/io.h> +#include <linux/bug.h> #include <mach/pic32.h> #include <dt-bindings/clock/microchip,clock.h> diff --git a/drivers/clk/uniphier/clk-uniphier-core.c b/drivers/clk/uniphier/clk-uniphier-core.c index 9f24050992..c9ec523080 100644 --- a/drivers/clk/uniphier/clk-uniphier-core.c +++ b/drivers/clk/uniphier/clk-uniphier-core.c @@ -9,6 +9,7 @@ #include <dm.h> #include <dm/device_compat.h> #include <linux/bitops.h> +#include <linux/bug.h> #include <linux/io.h> #include <linux/sizes.h> diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c index 710653be0e..922e78f99b 100644 --- a/drivers/core/of_access.c +++ b/drivers/core/of_access.c @@ -22,6 +22,7 @@ #include <common.h> #include <log.h> #include <malloc.h> +#include <linux/bug.h> #include <linux/libfdt.h> #include <dm/of_access.h> #include <linux/ctype.h> diff --git a/drivers/core/of_addr.c b/drivers/core/of_addr.c index ed8b73e8b3..ca34d84922 100644 --- a/drivers/core/of_addr.c +++ b/drivers/core/of_addr.c @@ -8,6 +8,7 @@ #include <common.h> #include <log.h> +#include <linux/bug.h> #include <linux/libfdt.h> #include <dm/of_access.h> #include <dm/of_addr.h> diff --git a/drivers/ddr/fsl/ddr4_dimm_params.c b/drivers/ddr/fsl/ddr4_dimm_params.c index 3d5f27ef58..e2bdc12ef2 100644 --- a/drivers/ddr/fsl/ddr4_dimm_params.c +++ b/drivers/ddr/fsl/ddr4_dimm_params.c @@ -13,6 +13,7 @@ #include <common.h> #include <fsl_ddr_sdram.h> #include <log.h> +#include <linux/bug.h> #include <fsl_ddr.h> diff --git a/drivers/gpio/adi_gpio2.c b/drivers/gpio/adi_gpio2.c index 9d293b6994..d0849c85c3 100644 --- a/drivers/gpio/adi_gpio2.c +++ b/drivers/gpio/adi_gpio2.c @@ -9,6 +9,7 @@ #include <common.h> #include <malloc.h> +#include <linux/bug.h> #include <linux/errno.h> #include <asm/gpio.h> diff --git a/drivers/gpio/sh_pfc.c b/drivers/gpio/sh_pfc.c index 0b412c2e0c..00b806e6a6 100644 --- a/drivers/gpio/sh_pfc.c +++ b/drivers/gpio/sh_pfc.c @@ -15,6 +15,7 @@ #include <asm/bitops.h> #include <asm/io.h> #include <sh_pfc.h> +#include <linux/bug.h> static struct pinmux_info *gpioc; diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c index 8cebf99c58..d44799b4af 100644 --- a/drivers/mmc/bcm2835_sdhost.c +++ b/drivers/mmc/bcm2835_sdhost.c @@ -37,6 +37,7 @@ #include <asm/arch/mbox.h> #include <asm/unaligned.h> #include <dm/device_compat.h> +#include <linux/bug.h> #include <linux/compat.h> #include <linux/io.h> #include <linux/iopoll.h> diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c index 2d38c2270e..86408d57f3 100644 --- a/drivers/mmc/sdhci-cadence.c +++ b/drivers/mmc/sdhci-cadence.c @@ -8,6 +8,7 @@ #include <dm.h> #include <dm/device_compat.h> #include <linux/bitfield.h> +#include <linux/bug.h> #include <linux/io.h> #include <linux/iopoll.h> #include <linux/sizes.h> diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c index 4ac65fd28b..684bc94998 100644 --- a/drivers/mtd/mtdconcat.c +++ b/drivers/mtd/mtdconcat.c @@ -21,6 +21,7 @@ #include <asm/div64.h> #else #include <div64.h> +#include <linux/bug.h> #include <linux/compat.h> #endif diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 2b7de6c03b..97e88b7178 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -28,6 +28,7 @@ #include <linux/gfp.h> #include <linux/slab.h> #else +#include <linux/bug.h> #include <linux/err.h> #include <ubi_uboot.h> #endif diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 9966cad795..d1f6029b2b 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -21,6 +21,7 @@ #include <common.h> #include <malloc.h> +#include <linux/bug.h> #include <linux/errno.h> #include <linux/compat.h> #include <ubi_uboot.h> diff --git a/drivers/mtd/nand/raw/atmel_nand.c b/drivers/mtd/nand/raw/atmel_nand.c index 89e107ffb7..2b39e4195a 100644 --- a/drivers/mtd/nand/raw/atmel_nand.c +++ b/drivers/mtd/nand/raw/atmel_nand.c @@ -16,6 +16,7 @@ #include <asm/arch/gpio.h> #include <dm/device_compat.h> #include <dm/devres.h> +#include <linux/bug.h> #include <malloc.h> #include <nand.h> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c index 7bdebf5869..5d77d53a09 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c @@ -19,6 +19,7 @@ #include <clk.h> #include <dm/device_compat.h> #include <dm/devres.h> +#include <linux/bug.h> #include <linux/err.h> #include <linux/ioport.h> #include <linux/completion.h> diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c index bf9f4be6de..9cca3c55cc 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c @@ -13,6 +13,7 @@ #include <common.h> #include <log.h> #include <nand.h> +#include <linux/bug.h> #include <linux/mtd/nand_ecc.h> #include <linux/errno.h> #include <asm/io.h> diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index ebc2bea069..c9e54eae39 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -36,6 +36,7 @@ #include <malloc.h> #include <watchdog.h> #include <dm/devres.h> +#include <linux/bug.h> #include <linux/err.h> #include <linux/compat.h> #include <linux/mtd/mtd.h> diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c index 531d48ce89..911472e91e 100644 --- a/drivers/mtd/nand/raw/nand_bbt.c +++ b/drivers/mtd/nand/raw/nand_bbt.c @@ -61,6 +61,7 @@ #include <log.h> #include <malloc.h> #include <dm/devres.h> +#include <linux/bug.h> #include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/bbm.h> diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c index 7e3346dfcc..fc5b6275f2 100644 --- a/drivers/mtd/nand/raw/pxa3xx_nand.c +++ b/drivers/mtd/nand/raw/pxa3xx_nand.c @@ -12,6 +12,7 @@ #include <nand.h> #include <dm/device_compat.h> #include <dm/devres.h> +#include <linux/bug.h> #include <linux/err.h> #include <linux/errno.h> #include <asm/io.h> diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c index 3fef204624..b3bdd201c3 100644 --- a/drivers/mtd/nand/raw/tegra_nand.c +++ b/drivers/mtd/nand/raw/tegra_nand.c @@ -15,6 +15,7 @@ #include <asm/arch/funcmux.h> #include <asm/arch-tegra/clk_rst.h> #include <dm/device_compat.h> +#include <linux/bug.h> #include <linux/errno.h> #include <asm/gpio.h> #include <fdtdec.h> diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c index 397dfa4178..f76b1239a4 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -26,6 +26,7 @@ #include <spi-mem.h> #include <dm/device_compat.h> #include <dm/devres.h> +#include <linux/bug.h> #include <linux/mtd/spinand.h> #endif diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macronix.c index 67d092be2c..215f09acc3 100644 --- a/drivers/mtd/nand/spi/macronix.c +++ b/drivers/mtd/nand/spi/macronix.c @@ -10,6 +10,7 @@ #include <linux/device.h> #include <linux/kernel.h> #endif +#include <linux/bug.h> #include <linux/mtd/spinand.h> #define SPINAND_MFR_MACRONIX 0xC2 diff --git a/drivers/mtd/nand/spi/toshiba.c b/drivers/mtd/nand/spi/toshiba.c index 77c25398fc..c4beefa617 100644 --- a/drivers/mtd/nand/spi/toshiba.c +++ b/drivers/mtd/nand/spi/toshiba.c @@ -11,6 +11,7 @@ #include <linux/device.h> #include <linux/kernel.h> #endif +#include <linux/bug.h> #include <linux/mtd/spinand.h> #define SPINAND_MFR_TOSHIBA 0x98 diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c index c40ed62959..e488caa554 100644 --- a/drivers/mtd/ubi/attach.c +++ b/drivers/mtd/ubi/attach.c @@ -79,6 +79,7 @@ #include <u-boot/crc.h> #else #include <div64.h> +#include <linux/bug.h> #include <linux/err.h> #endif diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index c19df82747..b54b56375b 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -16,6 +16,7 @@ #include <div64.h> #include <malloc.h> #include <ubi_uboot.h> +#include <linux/bug.h> #endif #include <linux/compat.h> diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c index 636edbb4a3..a2b5352cb2 100644 --- a/drivers/mtd/ubi/vtbl.c +++ b/drivers/mtd/ubi/vtbl.c @@ -55,6 +55,7 @@ #include <u-boot/crc.h> #else #include <ubi_uboot.h> +#include <linux/bug.h> #endif #include <linux/err.h> diff --git a/drivers/mtd/ubispl/ubispl.c b/drivers/mtd/ubispl/ubispl.c index 00102fcf74..ee2df11522 100644 --- a/drivers/mtd/ubispl/ubispl.c +++ b/drivers/mtd/ubispl/ubispl.c @@ -9,6 +9,7 @@ #include <common.h> #include <errno.h> +#include <linux/bug.h> #include <u-boot/crc.h> #include <ubispl.h> diff --git a/drivers/net/ep93xx_eth.c b/drivers/net/ep93xx_eth.c index 5aed164247..894ffc9d2b 100644 --- a/drivers/net/ep93xx_eth.c +++ b/drivers/net/ep93xx_eth.c @@ -24,6 +24,7 @@ #include <asm/io.h> #include <malloc.h> #include <miiphy.h> +#include <linux/bug.h> #include <linux/types.h> #include "ep93xx_eth.h" diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.c b/drivers/net/fsl-mc/dpio/qbman_portal.c index 1f77f84990..44ce00041e 100644 --- a/drivers/net/fsl-mc/dpio/qbman_portal.c +++ b/drivers/net/fsl-mc/dpio/qbman_portal.c @@ -6,6 +6,7 @@ #include <log.h> #include <malloc.h> #include <asm/arch/clock.h> +#include <linux/bug.h> #include "qbman_portal.h" /* QBMan portal management command codes */ diff --git a/drivers/net/fsl-mc/dpio/qbman_private.h b/drivers/net/fsl-mc/dpio/qbman_private.h index ded11a643e..53f1300eaf 100644 --- a/drivers/net/fsl-mc/dpio/qbman_private.h +++ b/drivers/net/fsl-mc/dpio/qbman_private.h @@ -7,6 +7,7 @@ #include <common.h> #include <errno.h> #include <asm/io.h> +#include <linux/bug.h> #include <linux/types.h> #include <asm/atomic.h> #include <malloc.h> diff --git a/drivers/net/fsl-mc/dpio/qbman_sys.h b/drivers/net/fsl-mc/dpio/qbman_sys.h index cdced68110..8be38e11a8 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 <linux/bug.h> #undef QBMAN_CCSR_TRACE #undef QBMAN_CINH_TRACE #undef QBMAN_CENA_TRACE diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c index 2a66c2e5f9..b47b27210c 100644 --- a/drivers/net/fsl_enetc.c +++ b/drivers/net/fsl_enetc.c @@ -15,6 +15,7 @@ #include <asm/io.h> #include <pci.h> #include <miiphy.h> +#include <linux/bug.h> #include "fsl_enetc.h" diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c index 8327fd747b..66bfafe217 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.c +++ b/drivers/net/ldpaa_eth/ldpaa_eth.c @@ -14,6 +14,7 @@ #include <hwconfig.h> #include <phy.h> #include <miiphy.h> +#include <linux/bug.h> #include <linux/compat.h> #include <fsl-mc/fsl_dpmac.h> diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 5c8c5e6800..f593aa6508 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -24,6 +24,7 @@ #include <asm/io.h> #include <dm/device_compat.h> #include <dm/devres.h> +#include <linux/bug.h> #include <linux/errno.h> #include <phy.h> #include <miiphy.h> diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index 1e0db6c8c7..83914286e8 100644 --- a/drivers/net/mvpp2.c +++ b/drivers/net/mvpp2.c @@ -26,6 +26,7 @@ #include <config.h> #include <malloc.h> #include <asm/io.h> +#include <linux/bug.h> #include <linux/err.h> #include <linux/errno.h> #include <phy.h> diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c index 14fcad5aad..8e942a8280 100644 --- a/drivers/pinctrl/pinctrl-sti.c +++ b/drivers/pinctrl/pinctrl-sti.c @@ -14,6 +14,7 @@ #include <syscon.h> #include <asm/io.h> #include <dm/pinctrl.h> +#include <linux/bug.h> #include <linux/libfdt.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/pinctrl/renesas/pfc.c b/drivers/pinctrl/renesas/pfc.c index ab64f4f0c8..efbff49f9b 100644 --- a/drivers/pinctrl/renesas/pfc.c +++ b/drivers/pinctrl/renesas/pfc.c @@ -17,6 +17,7 @@ #include <dm/device_compat.h> #include <dm/devres.h> #include <dm/pinctrl.h> +#include <linux/bug.h> #include <linux/io.h> #include <linux/sizes.h> diff --git a/drivers/pinctrl/renesas/sh_pfc.h b/drivers/pinctrl/renesas/sh_pfc.h index 1cfb881e58..db3d513358 100644 --- a/drivers/pinctrl/renesas/sh_pfc.h +++ b/drivers/pinctrl/renesas/sh_pfc.h @@ -672,4 +672,5 @@ extern const struct sh_pfc_soc_info r8a77995_pinmux_info; */ #define RCAR_GP_PIN(bank, pin) (((bank) * 32) + (pin)) +#include <linux/bug.h> #endif /* __SH_PFC_H */ diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c index abeba965c4..25231c10f9 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c @@ -7,6 +7,7 @@ #include <common.h> #include <dm.h> #include <dm/device_compat.h> +#include <linux/bug.h> #include <linux/io.h> #include <linux/err.h> #include <linux/kernel.h> diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier.h b/drivers/pinctrl/uniphier/pinctrl-uniphier.h index 8f83ecae7d..5951835d6e 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier.h +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier.h @@ -8,6 +8,7 @@ #define __PINCTRL_UNIPHIER_H__ #include <linux/bitops.h> +#include <linux/bug.h> #include <linux/build_bug.h> #include <linux/kernel.h> #include <linux/types.h> diff --git a/drivers/smem/msm_smem.c b/drivers/smem/msm_smem.c index 5557fd29ce..2557269bc5 100644 --- a/drivers/smem/msm_smem.c +++ b/drivers/smem/msm_smem.c @@ -13,6 +13,7 @@ #include <dm/of_access.h> #include <dm/of_addr.h> #include <asm/io.h> +#include <linux/bug.h> #include <linux/err.h> #include <linux/ioport.h> #include <linux/io.h> diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c index bb2e7748fe..61ae92d603 100644 --- a/drivers/spi/renesas_rpc_spi.c +++ b/drivers/spi/renesas_rpc_spi.c @@ -12,6 +12,7 @@ #include <dm/of_access.h> #include <dt-structs.h> #include <errno.h> +#include <linux/bug.h> #include <linux/errno.h> #include <spi.h> #include <wait_bit.h> diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c index 82ebd61823..ea86a25060 100644 --- a/drivers/usb/cdns3/core.c +++ b/drivers/usb/cdns3/core.c @@ -18,6 +18,7 @@ #include <dm/device_compat.h> #include <dm/devres.h> #include <dm/lists.h> +#include <linux/bug.h> #include <linux/kernel.h> #include <linux/io.h> #include <usb.h> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index a8982bdc09..f31a24b064 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -19,6 +19,7 @@ #include <dwc3-uboot.h> #include <dm/device_compat.h> #include <dm/devres.h> +#include <linux/bug.h> #include <linux/dma-mapping.h> #include <linux/err.h> #include <linux/ioport.h> diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c index 4af58941d8..385bed3e34 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -15,6 +15,7 @@ #include <common.h> #include <cpu_func.h> #include <dm/device_compat.h> +#include <linux/bug.h> #include <linux/kernel.h> #include <linux/list.h> diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index 13dec517f6..1feed417d6 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c @@ -15,6 +15,7 @@ #include <common.h> #include <dm/devres.h> +#include <linux/bug.h> #include <linux/err.h> #include <linux/errno.h> #include <asm/io.h> diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 74b8e0c5dd..91ed7fcec5 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -10,6 +10,7 @@ #include <log.h> #include <dm/devres.h> #include <linux/bitops.h> +#include <linux/bug.h> #include <linux/usb/composite.h> #define USB_BUFSIZ 4096 diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c index ec9fc4d3a0..32bf92752d 100644 --- a/drivers/usb/gadget/dwc2_udc_otg.c +++ b/drivers/usb/gadget/dwc2_udc_otg.c @@ -26,6 +26,7 @@ #include <reset.h> #include <dm/device_compat.h> #include <dm/devres.h> +#include <linux/bug.h> #include <linux/errno.h> #include <linux/list.h> diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c index e3147c98a1..1c0505eb28 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c +++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c @@ -20,6 +20,7 @@ #include <common.h> #include <cpu_func.h> #include <log.h> +#include <linux/bug.h> static u8 clear_feature_num; int clear_feature_flag; diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index 1a181bd6c6..439a31c255 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -247,6 +247,7 @@ #include <console.h> #include <g_dnl.h> #include <dm/devres.h> +#include <linux/bug.h> #include <linux/err.h> #include <linux/usb/ch9.h> diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index bce5aeb364..ebf1f4eb55 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c @@ -24,6 +24,7 @@ #include <asm/mach-types.h> #include <asm/unaligned.h> #include <dm/devres.h> +#include <linux/bug.h> #include <linux/compat.h> #include <malloc.h> #include <asm/io.h> diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index c282cf0be3..2d968aafb0 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -21,6 +21,7 @@ #include <usb.h> #include <malloc.h> #include <asm/cache.h> +#include <linux/bug.h> #include <linux/errno.h> #include <usb/xhci.h> diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index b6b7c29b3c..86aeaab412 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -19,6 +19,7 @@ #include <asm/byteorder.h> #include <usb.h> #include <asm/unaligned.h> +#include <linux/bug.h> #include <linux/errno.h> #include <usb/xhci.h> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index c95831cdd8..ec57f725d3 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -29,6 +29,7 @@ #include <watchdog.h> #include <asm/cache.h> #include <asm/unaligned.h> +#include <linux/bug.h> #include <linux/errno.h> #include <usb/xhci.h> diff --git a/drivers/usb/musb-new/am35x.c b/drivers/usb/musb-new/am35x.c index 6e5be90fe5..69d6104044 100644 --- a/drivers/usb/musb-new/am35x.c +++ b/drivers/usb/musb-new/am35x.c @@ -26,6 +26,7 @@ #else #include <common.h> #include <asm/omap_musb.h> +#include <linux/bug.h> #include "linux-compat.h" #endif diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c index 63ce8a5655..8e0e57cae8 100644 --- a/drivers/usb/musb-new/musb_core.c +++ b/drivers/usb/musb-new/musb_core.c @@ -81,6 +81,7 @@ #else #include <common.h> #include <usb.h> +#include <linux/bug.h> #include <linux/errno.h> #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c index 435dca6001..8ba98d8c0e 100644 --- a/drivers/usb/musb-new/musb_gadget.c +++ b/drivers/usb/musb-new/musb_gadget.c @@ -23,6 +23,7 @@ #include <linux/slab.h> #else #include <common.h> +#include <linux/bug.h> #include <linux/usb/ch9.h> #include "linux-compat.h" #endif diff --git a/drivers/usb/musb-new/musb_host.c b/drivers/usb/musb-new/musb_host.c index b98f0ed40e..5fa013659c 100644 --- a/drivers/usb/musb-new/musb_host.c +++ b/drivers/usb/musb-new/musb_host.c @@ -23,6 +23,7 @@ #else #include <common.h> #include <usb.h> +#include <linux/bug.h> #include "linux-compat.h" #include "usb-compat.h" #endif diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c index 4ea9dcb59d..35a56a8eab 100644 --- a/drivers/video/atmel_hlcdfb.c +++ b/drivers/video/atmel_hlcdfb.c @@ -20,6 +20,7 @@ #include <video.h> #include <wait_bit.h> #include <atmel_hlcdc.h> +#include <linux/bug.h> #if defined(CONFIG_LCD_LOGO) #include <bmp_logo.h> diff --git a/drivers/virtio/virtio-uclass.c b/drivers/virtio/virtio-uclass.c index d4ecd16ec8..2636cbedfe 100644 --- a/drivers/virtio/virtio-uclass.c +++ b/drivers/virtio/virtio-uclass.c @@ -22,6 +22,7 @@ #include <virtio_types.h> #include <virtio.h> #include <dm/lists.h> +#include <linux/bug.h> static const char *const virtio_drv_name[VIRTIO_ID_MAX_NUM] = { [VIRTIO_ID_NET] = VIRTIO_NET_DRV_NAME, diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 184c5f0a59..b951ea3257 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -13,6 +13,7 @@ #include <virtio_types.h> #include <virtio.h> #include <virtio_ring.h> +#include <linux/bug.h> #include <linux/compat.h> #include <linux/err.h> #include <linux/io.h> diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c index 79e62cfb62..fa7f2429f1 100644 --- a/drivers/virtio/virtio_pci_legacy.c +++ b/drivers/virtio/virtio_pci_legacy.c @@ -13,6 +13,7 @@ #include <virtio.h> #include <virtio_ring.h> #include <dm/device.h> +#include <linux/bug.h> #include <linux/compat.h> #include <linux/err.h> #include <linux/io.h> diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c index 32ce4ea5ae..64430f3b19 100644 --- a/drivers/virtio/virtio_pci_modern.c +++ b/drivers/virtio/virtio_pci_modern.c @@ -13,6 +13,7 @@ #include <virtio.h> #include <virtio_ring.h> #include <dm/device.h> +#include <linux/bug.h> #include <linux/compat.h> #include <linux/err.h> #include <linux/io.h> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 7130b8432a..7f1cbc5932 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -13,6 +13,7 @@ #include <virtio_types.h> #include <virtio.h> #include <virtio_ring.h> +#include <linux/bug.h> #include <linux/compat.h> int virtqueue_add(struct virtqueue *vq, struct virtio_sg *sgs[], diff --git a/drivers/virtio/virtio_sandbox.c b/drivers/virtio/virtio_sandbox.c index 61f6a96008..2a2abb9d49 100644 --- a/drivers/virtio/virtio_sandbox.c +++ b/drivers/virtio/virtio_sandbox.c @@ -10,6 +10,7 @@ #include <virtio_types.h> #include <virtio.h> #include <virtio_ring.h> +#include <linux/bug.h> #include <linux/compat.h> #include <linux/err.h> #include <linux/io.h> diff --git a/env/env.c b/env/env.c index 393f1490de..2084538f28 100644 --- a/env/env.c +++ b/env/env.c @@ -8,6 +8,7 @@ #include <env.h> #include <env_internal.h> #include <log.h> +#include <linux/bug.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index 0dc7886ac4..41c7d5666f 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c @@ -25,6 +25,7 @@ #include <linux/slab.h> #include <u-boot/crc.h> #else +#include <linux/bug.h> #include <linux/compat.h> #include <linux/err.h> #include <linux/stat.h> diff --git a/fs/yaffs2/yaffs_mtdif2.c b/fs/yaffs2/yaffs_mtdif2.c index 0d9d5cc4b1..81a4d964f3 100644 --- a/fs/yaffs2/yaffs_mtdif2.c +++ b/fs/yaffs2/yaffs_mtdif2.c @@ -15,6 +15,7 @@ /* XXX U-BOOT XXX */ #include <common.h> +#include <linux/bug.h> #include <linux/errno.h> #include "yportenv.h" diff --git a/fs/yaffs2/yportenv.h b/fs/yaffs2/yportenv.h index 251eba0792..081391a1d0 100644 --- a/fs/yaffs2/yportenv.h +++ b/fs/yaffs2/yportenv.h @@ -17,6 +17,7 @@ #ifndef __YPORTENV_H__ #define __YPORTENV_H__ +#include <linux/bug.h> #include <linux/types.h> /* Definition of types */ diff --git a/include/common.h b/include/common.h index 976046e620..711d409d47 100644 --- a/include/common.h +++ b/include/common.h @@ -17,7 +17,6 @@ #include <errno.h> #include <time.h> #include <linux/bitops.h> -#include <linux/bug.h> #include <linux/delay.h> #include <linux/types.h> #include <linux/printk.h> diff --git a/include/linux/soc/ti/cppi5.h b/include/linux/soc/ti/cppi5.h index 34038b31f7..cfdf7ea29f 100644 --- a/include/linux/soc/ti/cppi5.h +++ b/include/linux/soc/ti/cppi5.h @@ -10,6 +10,7 @@ #include <hexdump.h> #include <linux/bitops.h> +#include <linux/bug.h> /** * Descriptor header, present in all types of descriptors diff --git a/include/virtio.h b/include/virtio.h index 561dcc34ba..46f9efb732 100644 --- a/include/virtio.h +++ b/include/virtio.h @@ -20,6 +20,7 @@ #ifndef __VIRTIO_H__ #define __VIRTIO_H__ +#include <linux/bug.h> #define VIRTIO_ID_NET 1 /* virtio net */ #define VIRTIO_ID_BLOCK 2 /* virtio block */ #define VIRTIO_ID_RNG 4 /* virtio rng */ diff --git a/lib/crypto/asymmetric_type.c b/lib/crypto/asymmetric_type.c index aac9a1471a..1d0532d0f2 100644 --- a/lib/crypto/asymmetric_type.c +++ b/lib/crypto/asymmetric_type.c @@ -14,6 +14,7 @@ #endif #include <crypto/public_key.h> #ifdef __UBOOT__ +#include <linux/bug.h> #include <linux/compat.h> #include <linux/ctype.h> #include <linux/err.h> diff --git a/lib/crypto/public_key.c b/lib/crypto/public_key.c index 8b4821767a..e12ebbb3d0 100644 --- a/lib/crypto/public_key.c +++ b/lib/crypto/public_key.c @@ -10,6 +10,7 @@ #define pr_fmt(fmt) "PKEY: "fmt #ifdef __UBOOT__ #include <dm/devres.h> +#include <linux/bug.h> #include <linux/compat.h> #include <linux/err.h> #else diff --git a/net/eth_legacy.c b/net/eth_legacy.c index 9d40f86ab6..35f8d398a6 100644 --- a/net/eth_legacy.c +++ b/net/eth_legacy.c @@ -12,6 +12,7 @@ #include <log.h> #include <net.h> #include <phy.h> +#include <linux/bug.h> #include <linux/errno.h> #include <net/pcap.h> #include "eth_internal.h"
Move this uncommon header out of the common header. Signed-off-by: Simon Glass <sjg at chromium.org> --- Changes in v3: - Update stm32mp15_optee, etc. Changes in v2: None arch/arm/mach-bcm283x/include/mach/timer.h | 1 + arch/arm/mach-imx/cmd_nandbcb.c | 1 + arch/arm/mach-tegra/ivc.c | 1 + arch/arm/mach-uniphier/boot-device/boot-device.c | 1 + arch/mips/lib/cache.c | 1 + board/armltd/integrator/pci.c | 1 + board/sifive/fu540/fu540.c | 1 + cmd/jffs2.c | 1 + common/iotrace.c | 1 + drivers/clk/clk-divider.c | 1 + drivers/clk/clk-hsdk-cgu.c | 1 + drivers/clk/clk-uclass.c | 1 + drivers/clk/clk_pic32.c | 1 + drivers/clk/uniphier/clk-uniphier-core.c | 1 + drivers/core/of_access.c | 1 + drivers/core/of_addr.c | 1 + drivers/ddr/fsl/ddr4_dimm_params.c | 1 + drivers/gpio/adi_gpio2.c | 1 + drivers/gpio/sh_pfc.c | 1 + drivers/mmc/bcm2835_sdhost.c | 1 + drivers/mmc/sdhci-cadence.c | 1 + drivers/mtd/mtdconcat.c | 1 + drivers/mtd/mtdcore.c | 1 + drivers/mtd/mtdpart.c | 1 + drivers/mtd/nand/raw/atmel_nand.c | 1 + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 1 + drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 1 + drivers/mtd/nand/raw/nand_base.c | 1 + drivers/mtd/nand/raw/nand_bbt.c | 1 + drivers/mtd/nand/raw/pxa3xx_nand.c | 1 + drivers/mtd/nand/raw/tegra_nand.c | 1 + drivers/mtd/nand/spi/core.c | 1 + drivers/mtd/nand/spi/macronix.c | 1 + drivers/mtd/nand/spi/toshiba.c | 1 + drivers/mtd/ubi/attach.c | 1 + drivers/mtd/ubi/fastmap.c | 1 + drivers/mtd/ubi/vtbl.c | 1 + drivers/mtd/ubispl/ubispl.c | 1 + drivers/net/ep93xx_eth.c | 1 + drivers/net/fsl-mc/dpio/qbman_portal.c | 1 + drivers/net/fsl-mc/dpio/qbman_private.h | 1 + drivers/net/fsl-mc/dpio/qbman_sys.h | 1 + drivers/net/fsl_enetc.c | 1 + drivers/net/ldpaa_eth/ldpaa_eth.c | 1 + drivers/net/mvneta.c | 1 + drivers/net/mvpp2.c | 1 + drivers/pinctrl/pinctrl-sti.c | 1 + drivers/pinctrl/renesas/pfc.c | 1 + drivers/pinctrl/renesas/sh_pfc.h | 1 + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 1 + drivers/pinctrl/uniphier/pinctrl-uniphier.h | 1 + drivers/smem/msm_smem.c | 1 + drivers/spi/renesas_rpc_spi.c | 1 + drivers/usb/cdns3/core.c | 1 + drivers/usb/dwc3/core.c | 1 + drivers/usb/dwc3/ep0.c | 1 + drivers/usb/gadget/at91_udc.c | 1 + drivers/usb/gadget/composite.c | 1 + drivers/usb/gadget/dwc2_udc_otg.c | 1 + drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c | 1 + drivers/usb/gadget/f_mass_storage.c | 1 + drivers/usb/gadget/pxa25x_udc.c | 1 + drivers/usb/host/xhci-mem.c | 1 + drivers/usb/host/xhci-ring.c | 1 + drivers/usb/host/xhci.c | 1 + drivers/usb/musb-new/am35x.c | 1 + drivers/usb/musb-new/musb_core.c | 1 + drivers/usb/musb-new/musb_gadget.c | 1 + drivers/usb/musb-new/musb_host.c | 1 + drivers/video/atmel_hlcdfb.c | 1 + drivers/virtio/virtio-uclass.c | 1 + drivers/virtio/virtio_mmio.c | 1 + drivers/virtio/virtio_pci_legacy.c | 1 + drivers/virtio/virtio_pci_modern.c | 1 + drivers/virtio/virtio_ring.c | 1 + drivers/virtio/virtio_sandbox.c | 1 + env/env.c | 1 + fs/ubifs/tnc.c | 1 + fs/yaffs2/yaffs_mtdif2.c | 1 + fs/yaffs2/yportenv.h | 1 + include/common.h | 1 - include/linux/soc/ti/cppi5.h | 1 + include/virtio.h | 1 + lib/crypto/asymmetric_type.c | 1 + lib/crypto/public_key.c | 1 + net/eth_legacy.c | 1 + 86 files changed, 85 insertions(+), 1 deletion(-)