Re: [PATCH 001/149] global: Make include
On Tue, 30 Apr 2024 20:40:48 -0600, Tom Rini wrote: > This follows the example of RISC-V where includes > directly as "gd" includes a reference to bd_info already > and so the first must include the second anyhow. We then remove > from all of the places which include references to "gd" > an so have already. > > > [...] Applied to u-boot/next, thanks! -- Tom
Re: [PATCH 001/149] global: Make include
On Tue, Apr 30, 2024 at 11:33:01PM -0700, Tony Dinh wrote: > Hi Tom, > > This patch does not apply cleanly on the master branch. Perhaps this > patch series has a dependency on another previous patch? Please see > below at arch/arm/lib/bdinfo.c. Yeah, sorry, this depends on the two previous series I've posted. https://patchwork.ozlabs.org/project/uboot/list/?series=404691 https://patchwork.ozlabs.org/project/uboot/list/?series=404991 -- Tom signature.asc Description: PGP signature
Re: [PATCH 001/149] global: Make include
Hi Tom, This patch does not apply cleanly on the master branch. Perhaps this patch series has a dependency on another previous patch? Please see below at arch/arm/lib/bdinfo.c. On Tue, Apr 30, 2024 at 7:50 PM Tom Rini wrote: > > This follows the example of RISC-V where includes > directly as "gd" includes a reference to bd_info already > and so the first must include the second anyhow. We then remove > from all of the places which include references to "gd" > an so have already. > > Signed-off-by: Tom Rini > --- > api/api_platform-arm.c | 1 - > api/api_platform-mips.c| 1 - > api/api_platform-powerpc.c | 1 - > arch/arc/include/asm/global_data.h | 2 ++ > arch/arm/include/asm/global_data.h | 1 + > arch/arm/lib/bdinfo.c | 1 - > arch/arm/lib/cache-cp15.c | 1 - > arch/arm/mach-davinci/cpu.c| 1 - > arch/arm/mach-davinci/misc.c | 1 - > arch/arm/mach-davinci/spl.c| 1 - > arch/arm/mach-imx/ele_ahab.c | 1 - > arch/arm/mach-imx/mx5/mx53_dram.c | 1 - > arch/arm/mach-mediatek/mt7622/init.c | 1 - > arch/arm/mach-mediatek/mt7981/init.c | 1 - > arch/arm/mach-mediatek/mt7986/init.c | 1 - > arch/arm/mach-mediatek/mt7988/init.c | 1 - > arch/arm/mach-mvebu/armada8k/dram.c| 1 - > arch/arm/mach-mvebu/dram.c | 1 - > arch/arm/mach-omap2/omap-cache.c | 1 - > arch/arm/mach-omap2/omap3/emif4.c | 1 - > arch/arm/mach-omap2/omap3/sdrc.c | 1 - > arch/arm/mach-owl/soc.c| 1 - > arch/arm/mach-renesas/memmap-gen3.c| 1 - > arch/arm/mach-renesas/memmap-rzg2l.c | 1 - > arch/arm/mach-socfpga/clock_manager.c | 1 - > arch/arm/mach-socfpga/clock_manager_agilex5.c | 1 - > arch/arm/mach-socfpga/spl_a10.c| 1 - > arch/arm/mach-socfpga/spl_agilex.c | 1 - > arch/arm/mach-socfpga/spl_gen5.c | 1 - > arch/arm/mach-socfpga/spl_n5x.c| 1 - > arch/arm/mach-socfpga/spl_s10.c| 1 - > arch/arm/mach-uniphier/dram_init.c | 1 - > arch/arm/mach-versal-net/clk.c | 1 - > arch/arm/mach-versal-net/cpu.c | 1 - > arch/arm/mach-versal/clk.c | 1 - > arch/arm/mach-versal/cpu.c | 1 - > arch/arm/mach-zynqmp/clk.c | 1 - > arch/arm/mach-zynqmp/cpu.c | 1 - > arch/m68k/include/asm/global_data.h| 2 ++ > arch/m68k/lib/bdinfo.c | 1 - > arch/microblaze/cpu/spl.c | 1 - > arch/microblaze/include/asm/global_data.h | 1 + > arch/mips/include/asm/global_data.h| 1 + > arch/mips/lib/traps.c | 1 - > arch/nios2/include/asm/global_data.h | 1 + > arch/powerpc/cpu/mpc83xx/interrupts.c | 1 - > arch/powerpc/cpu/mpc83xx/pcie.c| 1 - > arch/powerpc/cpu/mpc83xx/spd_sdram.c | 1 - > arch/powerpc/cpu/mpc83xx/speed.c | 1 - > arch/powerpc/cpu/mpc85xx/b4860_ids.c | 1 + > arch/powerpc/cpu/mpc85xx/cmd_errata.c | 1 - > arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c | 1 - > arch/powerpc/cpu/mpc85xx/p2041_ids.c | 3 ++- > arch/powerpc/cpu/mpc85xx/p2041_serdes.c| 1 - > arch/powerpc/cpu/mpc85xx/p3041_ids.c | 1 + > arch/powerpc/cpu/mpc85xx/p4080_ids.c | 1 + > arch/powerpc/cpu/mpc85xx/p5040_ids.c | 1 + > arch/powerpc/cpu/mpc85xx/speed.c | 1 - > arch/powerpc/cpu/mpc85xx/spl_minimal.c | 1 - > arch/powerpc/cpu/mpc85xx/t1024_ids.c | 3 ++- > arch/powerpc/cpu/mpc85xx/t1024_serdes.c| 1 - > arch/powerpc/cpu/mpc85xx/t1040_ids.c | 3 ++- > arch/powerpc/cpu/mpc85xx/t1040_serdes.c| 3 ++- > arch/powerpc/cpu/mpc85xx/t2080_ids.c | 3 ++- > arch/powerpc/cpu/mpc85xx/t2080_serdes.c| 3 ++- > arch/powerpc/cpu/mpc85xx/t4240_ids.c | 3 ++- > arch/powerpc/cpu/mpc85xx/t4240_serdes.c| 1 - > arch/powerpc/cpu/mpc8xxx/fsl_lbc.c | 1 - > arch/powerpc/cpu/mpc8xxx/fsl_pamu.c| 4 +++- > arch/powerpc/cpu/mpc8xxx/law.c | 1 - > arch/powerpc/cpu/mpc8xxx/pamu_table.c | 1 - > arch/powerpc/cpu/mpc8xxx/srio.c| 3 ++- > arch/powerpc/include/asm/fsl_liodn.h | 4 +++- > arch/powerpc/include/asm/fsl_portals.h | 2 ++ > arch/powerpc/include/asm/global_data.h | 2 ++ > arch/powerpc/lib/bdinfo.c | 1 - > arch/riscv/lib/boot.c | 3 ++- > arch/sandbox/include/asm/global_data.h | 1 + > arch/sh/include/asm/global_data.h | 2 ++ >
[PATCH 001/149] global: Make include
This follows the example of RISC-V where includes directly as "gd" includes a reference to bd_info already and so the first must include the second anyhow. We then remove from all of the places which include references to "gd" an so have already. Signed-off-by: Tom Rini --- api/api_platform-arm.c | 1 - api/api_platform-mips.c| 1 - api/api_platform-powerpc.c | 1 - arch/arc/include/asm/global_data.h | 2 ++ arch/arm/include/asm/global_data.h | 1 + arch/arm/lib/bdinfo.c | 1 - arch/arm/lib/cache-cp15.c | 1 - arch/arm/mach-davinci/cpu.c| 1 - arch/arm/mach-davinci/misc.c | 1 - arch/arm/mach-davinci/spl.c| 1 - arch/arm/mach-imx/ele_ahab.c | 1 - arch/arm/mach-imx/mx5/mx53_dram.c | 1 - arch/arm/mach-mediatek/mt7622/init.c | 1 - arch/arm/mach-mediatek/mt7981/init.c | 1 - arch/arm/mach-mediatek/mt7986/init.c | 1 - arch/arm/mach-mediatek/mt7988/init.c | 1 - arch/arm/mach-mvebu/armada8k/dram.c| 1 - arch/arm/mach-mvebu/dram.c | 1 - arch/arm/mach-omap2/omap-cache.c | 1 - arch/arm/mach-omap2/omap3/emif4.c | 1 - arch/arm/mach-omap2/omap3/sdrc.c | 1 - arch/arm/mach-owl/soc.c| 1 - arch/arm/mach-renesas/memmap-gen3.c| 1 - arch/arm/mach-renesas/memmap-rzg2l.c | 1 - arch/arm/mach-socfpga/clock_manager.c | 1 - arch/arm/mach-socfpga/clock_manager_agilex5.c | 1 - arch/arm/mach-socfpga/spl_a10.c| 1 - arch/arm/mach-socfpga/spl_agilex.c | 1 - arch/arm/mach-socfpga/spl_gen5.c | 1 - arch/arm/mach-socfpga/spl_n5x.c| 1 - arch/arm/mach-socfpga/spl_s10.c| 1 - arch/arm/mach-uniphier/dram_init.c | 1 - arch/arm/mach-versal-net/clk.c | 1 - arch/arm/mach-versal-net/cpu.c | 1 - arch/arm/mach-versal/clk.c | 1 - arch/arm/mach-versal/cpu.c | 1 - arch/arm/mach-zynqmp/clk.c | 1 - arch/arm/mach-zynqmp/cpu.c | 1 - arch/m68k/include/asm/global_data.h| 2 ++ arch/m68k/lib/bdinfo.c | 1 - arch/microblaze/cpu/spl.c | 1 - arch/microblaze/include/asm/global_data.h | 1 + arch/mips/include/asm/global_data.h| 1 + arch/mips/lib/traps.c | 1 - arch/nios2/include/asm/global_data.h | 1 + arch/powerpc/cpu/mpc83xx/interrupts.c | 1 - arch/powerpc/cpu/mpc83xx/pcie.c| 1 - arch/powerpc/cpu/mpc83xx/spd_sdram.c | 1 - arch/powerpc/cpu/mpc83xx/speed.c | 1 - arch/powerpc/cpu/mpc85xx/b4860_ids.c | 1 + arch/powerpc/cpu/mpc85xx/cmd_errata.c | 1 - arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c | 1 - arch/powerpc/cpu/mpc85xx/p2041_ids.c | 3 ++- arch/powerpc/cpu/mpc85xx/p2041_serdes.c| 1 - arch/powerpc/cpu/mpc85xx/p3041_ids.c | 1 + arch/powerpc/cpu/mpc85xx/p4080_ids.c | 1 + arch/powerpc/cpu/mpc85xx/p5040_ids.c | 1 + arch/powerpc/cpu/mpc85xx/speed.c | 1 - arch/powerpc/cpu/mpc85xx/spl_minimal.c | 1 - arch/powerpc/cpu/mpc85xx/t1024_ids.c | 3 ++- arch/powerpc/cpu/mpc85xx/t1024_serdes.c| 1 - arch/powerpc/cpu/mpc85xx/t1040_ids.c | 3 ++- arch/powerpc/cpu/mpc85xx/t1040_serdes.c| 3 ++- arch/powerpc/cpu/mpc85xx/t2080_ids.c | 3 ++- arch/powerpc/cpu/mpc85xx/t2080_serdes.c| 3 ++- arch/powerpc/cpu/mpc85xx/t4240_ids.c | 3 ++- arch/powerpc/cpu/mpc85xx/t4240_serdes.c| 1 - arch/powerpc/cpu/mpc8xxx/fsl_lbc.c | 1 - arch/powerpc/cpu/mpc8xxx/fsl_pamu.c| 4 +++- arch/powerpc/cpu/mpc8xxx/law.c | 1 - arch/powerpc/cpu/mpc8xxx/pamu_table.c | 1 - arch/powerpc/cpu/mpc8xxx/srio.c| 3 ++- arch/powerpc/include/asm/fsl_liodn.h | 4 +++- arch/powerpc/include/asm/fsl_portals.h | 2 ++ arch/powerpc/include/asm/global_data.h | 2 ++ arch/powerpc/lib/bdinfo.c | 1 - arch/riscv/lib/boot.c | 3 ++- arch/sandbox/include/asm/global_data.h | 1 + arch/sh/include/asm/global_data.h | 2 ++ arch/x86/cpu/coreboot/sdram.c | 1 - arch/x86/cpu/efi/payload.c | 1 - arch/x86/cpu/efi/sdram.c | 1 - arch/x86/cpu/ivybridge/sdram_nop.c | 1 - arch/x86/cpu/qemu/dram.c | 1 - arch/x86/cpu/quark/dram.c | 1 - arch/x86/cpu/tangier/sdram.c | 1 - arch/x86/include/asm/global_data.h
