Browse Source

treewide: convert bd_t to struct bd_info by coccinelle

The Linux coding style guide (Documentation/process/coding-style.rst)
clearly says:

  It's a **mistake** to use typedef for structures and pointers.

Besides, using typedef for structures is annoying when you try to make
headers self-contained.

Let's say you have the following function declaration in a header:

  void foo(bd_t *bd);

This is not self-contained since bd_t is not defined.

To tell the compiler what 'bd_t' is, you need to include <asm/u-boot.h>

  #include <asm/u-boot.h>
  void foo(bd_t *bd);

Then, the include direcective pulls in more bloat needlessly.

If you use 'struct bd_info' instead, it is enough to put a forward
declaration as follows:

  struct bd_info;
  void foo(struct bd_info *bd);

Right, typedef'ing bd_t is a mistake.

I used coccinelle to generate this commit.

The semantic patch that makes this change is as follows:

  <smpl>
  @@
  typedef bd_t;
  @@
  -bd_t
  +struct bd_info
  </smpl>

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Masahiro Yamada 3 years ago
parent
commit
b75d8dc564
100 changed files with 164 additions and 160 deletions
  1. 2 2
      arch/arm/cpu/arm1136/mx35/generic.c
  2. 2 2
      arch/arm/cpu/arm926ejs/mx25/generic.c
  3. 2 2
      arch/arm/cpu/arm926ejs/mx27/generic.c
  4. 1 1
      arch/arm/cpu/arm926ejs/mxs/mxs.c
  5. 1 1
      arch/arm/cpu/arm926ejs/mxs/spl_boot.c
  6. 2 2
      arch/arm/cpu/armv7/ls102xa/cpu.c
  7. 1 1
      arch/arm/cpu/armv7/ls102xa/fdt.c
  8. 2 2
      arch/arm/cpu/armv7/vf610/generic.c
  9. 2 2
      arch/arm/cpu/armv8/fsl-layerscape/cpu.c
  10. 1 1
      arch/arm/cpu/armv8/fsl-layerscape/fdt.c
  11. 1 1
      arch/arm/cpu/armv8/s32v234/generic.c
  12. 1 1
      arch/arm/include/asm/arch-mx27/mxcmmc.h
  13. 1 1
      arch/arm/include/asm/arch-mx31/sys_proto.h
  14. 1 1
      arch/arm/include/asm/arch-mx6/litesom.h
  15. 2 1
      arch/arm/include/asm/arch-mxs/sys_proto.h
  16. 1 1
      arch/arm/lib/bdinfo.c
  17. 1 1
      arch/arm/lib/bootm-fdt.c
  18. 6 5
      arch/arm/lib/bootm.c
  19. 1 1
      arch/arm/lib/cache-cp15.c
  20. 2 2
      arch/arm/mach-imx/cpu.c
  21. 1 1
      arch/arm/mach-imx/imx8/ahab.c
  22. 2 2
      arch/arm/mach-imx/imx8/fdt.c
  23. 1 1
      arch/arm/mach-imx/imx8m/soc.c
  24. 1 1
      arch/arm/mach-imx/mx6/litesom.c
  25. 1 1
      arch/arm/mach-imx/mx6/module_fuse.c
  26. 2 2
      arch/arm/mach-kirkwood/cpu.c
  27. 1 1
      arch/arm/mach-lpc32xx/cpu.c
  28. 2 2
      arch/arm/mach-meson/board-common.c
  29. 1 1
      arch/arm/mach-mvebu/cpu.c
  30. 1 1
      arch/arm/mach-omap2/am33xx/board.c
  31. 3 3
      arch/arm/mach-omap2/am33xx/fdt.c
  32. 4 4
      arch/arm/mach-omap2/fdt-common.c
  33. 1 1
      arch/arm/mach-omap2/omap-cache.c
  34. 1 1
      arch/arm/mach-omap2/omap3/emac.c
  35. 8 8
      arch/arm/mach-omap2/omap5/fdt.c
  36. 1 1
      arch/arm/mach-orion5x/cpu.c
  37. 1 1
      arch/arm/mach-rmobile/emac.c
  38. 1 1
      arch/arm/mach-stm32mp/fdt.c
  39. 1 1
      arch/arm/mach-tegra/dt-setup.c
  40. 2 2
      arch/arm/mach-uniphier/fdt-fixup.c
  41. 1 1
      arch/m68k/cpu/mcf523x/cpu.c
  42. 1 1
      arch/m68k/cpu/mcf52x2/cpu.c
  43. 1 1
      arch/m68k/cpu/mcf532x/cpu.c
  44. 1 1
      arch/m68k/cpu/mcf5445x/cpu.c
  45. 1 1
      arch/m68k/cpu/mcf547x_8x/cpu.c
  46. 1 1
      arch/m68k/lib/bdinfo.c
  47. 5 5
      arch/m68k/lib/bootm.c
  48. 13 11
      arch/nds32/lib/bootm.c
  49. 2 2
      arch/powerpc/cpu/mpc83xx/cpu.c
  50. 1 1
      arch/powerpc/cpu/mpc83xx/fdt.c
  51. 1 1
      arch/powerpc/cpu/mpc83xx/interrupts.c
  52. 1 1
      arch/powerpc/cpu/mpc83xx/pci.c
  53. 1 1
      arch/powerpc/cpu/mpc85xx/cpu.c
  54. 2 2
      arch/powerpc/cpu/mpc85xx/ether_fcc.c
  55. 1 1
      arch/powerpc/cpu/mpc85xx/fdt.c
  56. 1 1
      arch/powerpc/cpu/mpc86xx/fdt.c
  57. 1 1
      arch/powerpc/cpu/mpc8xx/cpu.c
  58. 1 1
      arch/powerpc/cpu/mpc8xx/fdt.c
  59. 1 1
      arch/powerpc/cpu/mpc8xxx/cpu.c
  60. 1 1
      arch/powerpc/lib/bdinfo.c
  61. 8 8
      arch/powerpc/lib/bootm.c
  62. 1 1
      arch/sh/cpu/sh4/cpu.c
  63. 1 1
      arch/x86/lib/bootm.c
  64. 1 1
      board/AndesTech/adp-ae3xx/adp-ae3xx.c
  65. 1 1
      board/AndesTech/adp-ag101p/adp-ag101p.c
  66. 1 1
      board/AndesTech/ax25-ae350/ax25-ae350.c
  67. 3 3
      board/Arcturus/ucp1020/spl.c
  68. 2 2
      board/Arcturus/ucp1020/ucp1020.c
  69. 1 1
      board/BuR/common/bur_common.h
  70. 1 1
      board/BuR/common/common.c
  71. 1 1
      board/CZ.NIC/turris_mox/turris_mox.c
  72. 1 1
      board/CarMediaLab/flea3/flea3.c
  73. 1 1
      board/Marvell/db-88f6720/db-88f6720.c
  74. 1 1
      board/Marvell/db-88f6820-amc/db-88f6820-amc.c
  75. 1 1
      board/Marvell/db-88f6820-gp/db-88f6820-gp.c
  76. 1 1
      board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
  77. 1 1
      board/Marvell/gplugd/gplugd.c
  78. 1 1
      board/abilis/tb100/tb100.c
  79. 2 2
      board/advantech/dms-ba16/dms-ba16.c
  80. 1 1
      board/advantech/imx8qm_rom7720_a1/spl.c
  81. 1 1
      board/amazon/kc1/kc1.c
  82. 1 1
      board/armltd/integrator/integrator.c
  83. 2 2
      board/armltd/vexpress/vexpress_common.c
  84. 1 1
      board/armltd/vexpress/vexpress_tc2.c
  85. 1 1
      board/armltd/vexpress64/vexpress64.c
  86. 1 1
      board/atmel/at91rm9200ek/at91rm9200ek.c
  87. 1 1
      board/atmel/at91sam9261ek/at91sam9261ek.c
  88. 1 1
      board/atmel/at91sam9n12ek/at91sam9n12ek.c
  89. 2 2
      board/bachmann/ot1200/ot1200.c
  90. 2 2
      board/barco/platinum/platinum.c
  91. 2 2
      board/barco/titanium/titanium.c
  92. 2 2
      board/bluegiga/apx4devkit/apx4devkit.c
  93. 2 2
      board/bluewater/gurnard/gurnard.c
  94. 1 1
      board/bluewater/snapper9260/snapper9260.c
  95. 1 1
      board/bosch/shc/board.c
  96. 1 1
      board/boundary/nitrogen6x/nitrogen6x.c
  97. 1 1
      board/broadcom/bcm23550_w1d/bcm23550_w1d.c
  98. 1 1
      board/broadcom/bcm28155_ap/bcm28155_ap.c
  99. 1 1
      board/broadcom/bcm_ep/board.c
  100. 1 1
      board/calao/usb_a9263/usb_a9263.c

+ 2 - 2
arch/arm/cpu/arm1136/mx35/generic.c

@@ -439,7 +439,7 @@ int print_cpuinfo(void)
  * Initializes on-chip ethernet controllers.
  * to override, implement board_eth_init()
  */
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 	int rc = -ENODEV;
 
@@ -455,7 +455,7 @@ int cpu_eth_init(bd_t *bis)
  * Initializes on-chip MMC controllers.
  * to override, implement board_mmc_init()
  */
-int cpu_mmc_init(bd_t *bis)
+int cpu_mmc_init(struct bd_info *bis)
 {
 	return fsl_esdhc_mmc_init(bis);
 }

+ 2 - 2
arch/arm/cpu/arm926ejs/mx25/generic.c

@@ -223,7 +223,7 @@ int print_cpuinfo(void)
  * Initializes on-chip ethernet controllers.
  * to override, implement board_eth_init()
  */
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 	struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
 	ulong val;
@@ -252,7 +252,7 @@ int get_clocks(void)
  * Initializes on-chip MMC controllers.
  * to override, implement board_mmc_init()
  */
-int cpu_mmc_init(bd_t *bis)
+int cpu_mmc_init(struct bd_info *bis)
 {
 	return fsl_esdhc_mmc_init(bis);
 }

+ 2 - 2
arch/arm/cpu/arm926ejs/mx27/generic.c

@@ -177,7 +177,7 @@ int print_cpuinfo (void)
 }
 #endif
 
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 #if defined(CONFIG_FEC_MXC)
 	struct pll_regs *pll = (struct pll_regs *)IMX_PLL_BASE;
@@ -195,7 +195,7 @@ int cpu_eth_init(bd_t *bis)
  * Initializes on-chip MMC controllers.
  * to override, implement board_mmc_init()
  */
-int cpu_mmc_init(bd_t *bis)
+int cpu_mmc_init(struct bd_info *bis)
 {
 #ifdef CONFIG_MMC_MXC
 	return mxc_mmc_init(bis);

+ 1 - 1
arch/arm/cpu/arm926ejs/mxs/mxs.c

@@ -203,7 +203,7 @@ int do_mx28_showclocks(struct cmd_tbl *cmdtp, int flag, int argc,
  * Initializes on-chip ethernet controllers.
  */
 #if defined(CONFIG_MX28) && defined(CONFIG_CMD_NET)
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 	struct mxs_clkctrl_regs *clkctrl_regs =
 		(struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE;

+ 1 - 1
arch/arm/cpu/arm926ejs/mxs/spl_boot.c

@@ -22,7 +22,7 @@
 DECLARE_GLOBAL_DATA_PTR;
 static gd_t gdata __section(".data");
 #ifdef CONFIG_SPL_SERIAL_SUPPORT
-static bd_t bdata __section(".data");
+static struct bd_info bdata __section(".data");
 #endif
 
 /*

+ 2 - 2
arch/arm/cpu/armv7/ls102xa/cpu.c

@@ -293,13 +293,13 @@ int print_cpuinfo(void)
 #endif
 
 #ifdef CONFIG_FSL_ESDHC
-int cpu_mmc_init(bd_t *bis)
+int cpu_mmc_init(struct bd_info *bis)
 {
 	return fsl_esdhc_mmc_init(bis);
 }
 #endif
 
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 #if defined(CONFIG_TSEC_ENET) && !defined(CONFIG_DM_ETH)
 	tsec_standard_init(bis);

+ 1 - 1
arch/arm/cpu/armv7/ls102xa/fdt.c

@@ -82,7 +82,7 @@ void ft_fixup_enet_phy_connect_type(void *fdt)
 	}
 }
 
-void ft_cpu_setup(void *blob, bd_t *bd)
+void ft_cpu_setup(void *blob, struct bd_info *bd)
 {
 	int off;
 	int val;

+ 2 - 2
arch/arm/cpu/armv7/vf610/generic.c

@@ -341,7 +341,7 @@ int arch_misc_init(void)
 }
 #endif
 
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 	int rc = -ENODEV;
 
@@ -353,7 +353,7 @@ int cpu_eth_init(bd_t *bis)
 }
 
 #ifdef CONFIG_FSL_ESDHC_IMX
-int cpu_mmc_init(bd_t *bis)
+int cpu_mmc_init(struct bd_info *bis)
 {
 	return fsl_esdhc_mmc_init(bis);
 }

+ 2 - 2
arch/arm/cpu/armv8/fsl-layerscape/cpu.c

@@ -1040,13 +1040,13 @@ int print_cpuinfo(void)
 #endif
 
 #ifdef CONFIG_FSL_ESDHC
-int cpu_mmc_init(bd_t *bis)
+int cpu_mmc_init(struct bd_info *bis)
 {
 	return fsl_esdhc_mmc_init(bis);
 }
 #endif
 
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 	int error = 0;
 

+ 1 - 1
arch/arm/cpu/armv8/fsl-layerscape/fdt.c

@@ -438,7 +438,7 @@ __weak void fdt_fixup_ecam(void *blob)
 }
 #endif
 
-void ft_cpu_setup(void *blob, bd_t *bd)
+void ft_cpu_setup(void *blob, struct bd_info *bd)
 {
 	struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR);
 	unsigned int svr = gur_in32(&gur->svr);

+ 1 - 1
arch/arm/cpu/armv8/s32v234/generic.c

@@ -333,7 +333,7 @@ int print_cpuinfo(void)
 }
 #endif
 
-int cpu_eth_init(bd_t * bis)
+int cpu_eth_init(struct bd_info * bis)
 {
 	int rc = -ENODEV;
 

+ 1 - 1
arch/arm/include/asm/arch-mx27/mxcmmc.h

@@ -6,6 +6,6 @@
 #ifndef ASM_ARCH_MXCMMC_H
 #define ASM_ARCH_MXCMMC_H
 
-int mxc_mmc_init(bd_t *bis);
+int mxc_mmc_init(struct bd_info *bis);
 
 #endif

+ 1 - 1
arch/arm/include/asm/arch-mx31/sys_proto.h

@@ -16,5 +16,5 @@ struct mxc_weimcs {
 };
 
 void mxc_setup_weimcs(int cs, const struct mxc_weimcs *weimcs);
-int mxc_mmc_init(bd_t *bis);
+int mxc_mmc_init(struct bd_info *bis);
 #endif

+ 1 - 1
arch/arm/include/asm/arch-mx6/litesom.h

@@ -6,7 +6,7 @@
 #ifndef __ARCH_ARM_MX6UL_LITESOM_H__
 #define __ARCH_ARM_MX6UL_LITESOM_H__
 
-int litesom_mmc_init(bd_t *bis);
+int litesom_mmc_init(struct bd_info *bis);
 
 #ifdef CONFIG_SPL_BUILD
 void litesom_init_f(void);

+ 2 - 1
arch/arm/include/asm/arch-mxs/sys_proto.h

@@ -11,7 +11,8 @@
 
 #include <asm/mach-imx/sys_proto.h>
 
-int mxsmmc_initialize(bd_t *bis, int id, int (*wp)(int), int (*cd)(int));
+int mxsmmc_initialize(struct bd_info *bis, int id, int (*wp)(int),
+		      int (*cd)(int));
 
 #ifdef CONFIG_SPL_BUILD
 

+ 1 - 1
arch/arm/lib/bdinfo.c

@@ -13,7 +13,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 void arch_print_bdinfo(void)
 {
-	bd_t *bd = gd->bd;
+	struct bd_info *bd = gd->bd;
 
 	bdinfo_print_num("arch_number", bd->bi_arch_number);
 #ifdef CONFIG_SYS_MEM_RESERVE_SECURE

+ 1 - 1
arch/arm/lib/bootm-fdt.c

@@ -35,7 +35,7 @@ int arch_fixup_fdt(void *blob)
 {
 	__maybe_unused int ret = 0;
 #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_OF_LIBFDT)
-	bd_t *bd = gd->bd;
+	struct bd_info *bd = gd->bd;
 	int bank;
 	u64 start[CONFIG_NR_DRAM_BANKS];
 	u64 size[CONFIG_NR_DRAM_BANKS];

+ 6 - 5
arch/arm/lib/bootm.c

@@ -124,7 +124,7 @@ static void announce_and_cleanup(int fake)
 	cleanup_before_linux();
 }
 
-static void setup_start_tag (bd_t *bd)
+static void setup_start_tag (struct bd_info *bd)
 {
 	params = (struct tag *)bd->bi_boot_params;
 
@@ -138,7 +138,7 @@ static void setup_start_tag (bd_t *bd)
 	params = tag_next (params);
 }
 
-static void setup_memory_tags(bd_t *bd)
+static void setup_memory_tags(struct bd_info *bd)
 {
 	int i;
 
@@ -153,7 +153,7 @@ static void setup_memory_tags(bd_t *bd)
 	}
 }
 
-static void setup_commandline_tag(bd_t *bd, char *commandline)
+static void setup_commandline_tag(struct bd_info *bd, char *commandline)
 {
 	char *p;
 
@@ -178,7 +178,8 @@ static void setup_commandline_tag(bd_t *bd, char *commandline)
 	params = tag_next (params);
 }
 
-static void setup_initrd_tag(bd_t *bd, ulong initrd_start, ulong initrd_end)
+static void setup_initrd_tag(struct bd_info *bd, ulong initrd_start,
+			     ulong initrd_end)
 {
 	/* an ATAG_INITRD node tells the kernel where the compressed
 	 * ramdisk can be found. ATAG_RDIMG is a better name, actually.
@@ -217,7 +218,7 @@ static void setup_revision_tag(struct tag **in_params)
 	params = tag_next (params);
 }
 
-static void setup_end_tag(bd_t *bd)
+static void setup_end_tag(struct bd_info *bd)
 {
 	params->hdr.tag = ATAG_NONE;
 	params->hdr.size = 0;

+ 1 - 1
arch/arm/lib/cache-cp15.c

@@ -104,7 +104,7 @@ void mmu_set_region_dcache_behaviour(phys_addr_t start, size_t size,
 
 __weak void dram_bank_mmu_setup(int bank)
 {
-	bd_t *bd = gd->bd;
+	struct bd_info *bd = gd->bd;
 	int	i;
 
 	/* bd->bi_dram is available only after relocation */

+ 2 - 2
arch/arm/mach-imx/cpu.c

@@ -239,7 +239,7 @@ int print_cpuinfo(void)
 }
 #endif
 
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 	int rc = -ENODEV;
 
@@ -255,7 +255,7 @@ int cpu_eth_init(bd_t *bis)
  * Initializes on-chip MMC controllers.
  * to override, implement board_mmc_init()
  */
-int cpu_mmc_init(bd_t *bis)
+int cpu_mmc_init(struct bd_info *bis)
 {
 	return fsl_esdhc_mmc_init(bis);
 }

+ 1 - 1
arch/arm/mach-imx/imx8/ahab.c

@@ -26,7 +26,7 @@ DECLARE_GLOBAL_DATA_PTR;
 static inline bool check_in_dram(ulong addr)
 {
 	int i;
-	bd_t *bd = gd->bd;
+	struct bd_info *bd = gd->bd;
 
 	for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) {
 		if (bd->bi_dram[i].size) {

+ 2 - 2
arch/arm/mach-imx/imx8/fdt.c

@@ -228,7 +228,7 @@ static int config_smmu_fdt(void *blob)
 	return 0;
 }
 
-static int ft_add_optee_node(void *fdt, bd_t *bd)
+static int ft_add_optee_node(void *fdt, struct bd_info *bd)
 {
 	const char *path, *subpath;
 	int offs;
@@ -278,7 +278,7 @@ static int ft_add_optee_node(void *fdt, bd_t *bd)
 	return 0;
 }
 
-int ft_system_setup(void *blob, bd_t *bd)
+int ft_system_setup(void *blob, struct bd_info *bd)
 {
 	int ret;
 	int off;

+ 1 - 1
arch/arm/mach-imx/imx8m/soc.c

@@ -785,7 +785,7 @@ static int disable_cpu_nodes(void *blob, u32 disabled_cores)
 	return 0;
 }
 
-int ft_system_setup(void *blob, bd_t *bd)
+int ft_system_setup(void *blob, struct bd_info *bd)
 {
 #ifdef CONFIG_IMX8MQ
 	int i = 0;

+ 1 - 1
arch/arm/mach-imx/mx6/litesom.c

@@ -56,7 +56,7 @@ static struct fsl_esdhc_cfg emmc_cfg = {USDHC2_BASE_ADDR, 0, 8};
 
 #define EMMC_PWR_GPIO	IMX_GPIO_NR(4, 10)
 
-int litesom_mmc_init(bd_t *bis)
+int litesom_mmc_init(struct bd_info *bis)
 {
 	int ret;
 

+ 1 - 1
arch/arm/mach-imx/mx6/module_fuse.c

@@ -190,7 +190,7 @@ u32 check_module_fused(enum fuse_module_type module)
 }
 
 #ifdef CONFIG_OF_SYSTEM_SETUP
-int ft_system_setup(void *blob, bd_t *bd)
+int ft_system_setup(void *blob, struct bd_info *bd)
 {
 	const char *status = "disabled";
 	u32 i, reg;

+ 2 - 2
arch/arm/mach-kirkwood/cpu.c

@@ -272,7 +272,7 @@ int arch_misc_init(void)
 #endif /* CONFIG_ARCH_MISC_INIT */
 
 #ifdef CONFIG_MVGBE
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 	mvgbe_initialize(bis);
 	return 0;
@@ -280,7 +280,7 @@ int cpu_eth_init(bd_t *bis)
 #endif
 
 #ifdef CONFIG_MVEBU_MMC
-int board_mmc_init(bd_t *bis)
+int board_mmc_init(struct bd_info *bis)
 {
 	mvebu_mmc_init(bis);
 	return 0;

+ 1 - 1
arch/arm/mach-lpc32xx/cpu.c

@@ -72,7 +72,7 @@ int print_cpuinfo(void)
 #endif
 
 #ifdef CONFIG_LPC32XX_ETH
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 	lpc32xx_eth_initialize(bis);
 	return 0;

+ 2 - 2
arch/arm/mach-meson/board-common.c

@@ -52,12 +52,12 @@ int dram_init(void)
 	return 0;
 }
 
-__weak int meson_ft_board_setup(void *blob, bd_t *bd)
+__weak int meson_ft_board_setup(void *blob, struct bd_info *bd)
 {
 	return 0;
 }
 
-int ft_board_setup(void *blob, bd_t *bd)
+int ft_board_setup(void *blob, struct bd_info *bd)
 {
 	meson_init_reserved_memory(blob);
 

+ 1 - 1
arch/arm/mach-mvebu/cpu.c

@@ -525,7 +525,7 @@ int arch_misc_init(void)
 #endif /* CONFIG_ARCH_MISC_INIT */
 
 #if defined(CONFIG_MMC_SDHCI_MV) && !defined(CONFIG_DM_MMC)
-int board_mmc_init(bd_t *bis)
+int board_mmc_init(struct bd_info *bis)
 {
 	mv_sdh_init(MVEBU_SDIO_BASE, 0, 0,
 		    SDHCI_QUIRK_32BIT_DMA_ADDR | SDHCI_QUIRK_WAIT_SEND_CMD);

+ 1 - 1
arch/arm/mach-omap2/am33xx/board.c

@@ -160,7 +160,7 @@ const struct gpio_bank *const omap_gpio_bank = gpio_bank_am33xx;
 #endif
 
 #if defined(CONFIG_MMC_OMAP_HS)
-int cpu_mmc_init(bd_t *bis)
+int cpu_mmc_init(struct bd_info *bis)
 {
 	int ret;
 

+ 3 - 3
arch/arm/mach-omap2/am33xx/fdt.c

@@ -14,7 +14,7 @@
 
 #ifdef CONFIG_TI_SECURE_DEVICE
 
-static void ft_hs_fixups(void *fdt, bd_t *bd)
+static void ft_hs_fixups(void *fdt, struct bd_info *bd)
 {
 	/* Check we are running on an HS/EMU device type */
 	if (GP_DEVICE != get_device_type()) {
@@ -29,7 +29,7 @@ static void ft_hs_fixups(void *fdt, bd_t *bd)
 	hang();
 }
 #else
-static void ft_hs_fixups(void *fdt, bd_t *bd) { }
+static void ft_hs_fixups(void *fdt, struct bd_info *bd) { }
 #endif /* #ifdef CONFIG_TI_SECURE_DEVICE */
 
 /*
@@ -37,7 +37,7 @@ static void ft_hs_fixups(void *fdt, bd_t *bd) { }
  * fixups should remain in the board files which is where
  * this function should be called from.
  */
-void ft_cpu_setup(void *fdt, bd_t *bd)
+void ft_cpu_setup(void *fdt, struct bd_info *bd)
 {
 	ft_hs_fixups(fdt, bd);
 }

+ 4 - 4
arch/arm/mach-omap2/fdt-common.c

@@ -21,7 +21,7 @@
 #define CONFIG_SECURE_RUNTIME_RESV_SRAM_SZ (0)
 #endif
 
-int ft_hs_disable_rng(void *fdt, bd_t *bd)
+int ft_hs_disable_rng(void *fdt, struct bd_info *bd)
 {
 	const char *path;
 	int offs;
@@ -69,7 +69,7 @@ static int fdt_pack_reg(const void *fdt, void *buf, u64 address, u64 size)
 	return p - (char *)buf;
 }
 
-int ft_hs_fixup_dram(void *fdt, bd_t *bd)
+int ft_hs_fixup_dram(void *fdt, struct bd_info *bd)
 {
 	const char *path, *subpath;
 	int offs, len;
@@ -122,10 +122,10 @@ int ft_hs_fixup_dram(void *fdt, bd_t *bd)
 	return 0;
 }
 #else
-int ft_hs_fixup_dram(void *fdt, bd_t *bd) { return 0; }
+int ft_hs_fixup_dram(void *fdt, struct bd_info *bd) { return 0; }
 #endif
 
-int ft_hs_add_tee(void *fdt, bd_t *bd)
+int ft_hs_add_tee(void *fdt, struct bd_info *bd)
 {
 	const char *path, *subpath;
 	int offs;

+ 1 - 1
arch/arm/mach-omap2/omap-cache.c

@@ -55,7 +55,7 @@ void enable_caches(void)
 
 void dram_bank_mmu_setup(int bank)
 {
-	bd_t *bd = gd->bd;
+	struct bd_info *bd = gd->bd;
 	int	i;
 
 	u32 start = bd->bi_dram[bank].start >> MMU_SECTION_SHIFT;

+ 1 - 1
arch/arm/mach-omap2/omap3/emac.c

@@ -15,7 +15,7 @@
  * Initializes on-chip ethernet controllers.
  * to override, implement board_eth_init()
  */
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 	u32 reset;
 

+ 8 - 8
arch/arm/mach-omap2/omap5/fdt.c

@@ -29,7 +29,7 @@ static u32 hs_irq_skip[] = {
 	118	/* One interrupt for Crypto DMA by secure world */
 };
 
-static int ft_hs_fixup_crossbar(void *fdt, bd_t *bd)
+static int ft_hs_fixup_crossbar(void *fdt, struct bd_info *bd)
 {
 	const char *path;
 	int offs;
@@ -93,7 +93,7 @@ static int ft_hs_fixup_crossbar(void *fdt, bd_t *bd)
 
 #if ((TI_OMAP5_SECURE_BOOT_RESV_SRAM_SZ != 0) || \
     (CONFIG_SECURE_RUNTIME_RESV_SRAM_SZ != 0))
-static int ft_hs_fixup_sram(void *fdt, bd_t *bd)
+static int ft_hs_fixup_sram(void *fdt, struct bd_info *bd)
 {
 	const char *path;
 	int offs;
@@ -128,10 +128,10 @@ static int ft_hs_fixup_sram(void *fdt, bd_t *bd)
 	return 0;
 }
 #else
-static int ft_hs_fixup_sram(void *fdt, bd_t *bd) { return 0; }
+static int ft_hs_fixup_sram(void *fdt, struct bd_info *bd) { return 0; }
 #endif
 
-static void ft_hs_fixups(void *fdt, bd_t *bd)
+static void ft_hs_fixups(void *fdt, struct bd_info *bd)
 {
 	/* Check we are running on an HS/EMU device type */
 	if (GP_DEVICE != get_device_type()) {
@@ -148,7 +148,7 @@ static void ft_hs_fixups(void *fdt, bd_t *bd)
 	hang();
 }
 #else
-static void ft_hs_fixups(void *fdt, bd_t *bd)
+static void ft_hs_fixups(void *fdt, struct bd_info *bd)
 {
 }
 #endif /* #ifdef CONFIG_TI_SECURE_DEVICE */
@@ -255,7 +255,7 @@ static int ft_fixup_clocks(void *fdt, const char **names, u32 *rates, int num)
 	return 0;
 }
 
-static void ft_opp_clock_fixups(void *fdt, bd_t *bd)
+static void ft_opp_clock_fixups(void *fdt, struct bd_info *bd)
 {
 	const char **clk_names;
 	u32 *clk_rates;
@@ -299,7 +299,7 @@ static void ft_opp_clock_fixups(void *fdt, bd_t *bd)
 	}
 }
 #else
-static void ft_opp_clock_fixups(void *fdt, bd_t *bd) { }
+static void ft_opp_clock_fixups(void *fdt, struct bd_info *bd) { }
 #endif /* CONFIG_TARGET_DRA7XX_EVM || CONFIG_TARGET_AM57XX_EVM */
 
 /*
@@ -307,7 +307,7 @@ static void ft_opp_clock_fixups(void *fdt, bd_t *bd) { }
  * fixups should remain in the board files which is where
  * this function should be called from.
  */
-void ft_cpu_setup(void *fdt, bd_t *bd)
+void ft_cpu_setup(void *fdt, struct bd_info *bd)
 {
 	ft_hs_fixups(fdt, bd);
 	ft_opp_clock_fixups(fdt, bd);

+ 1 - 1
arch/arm/mach-orion5x/cpu.c

@@ -290,7 +290,7 @@ int arch_misc_init(void)
 #endif /* CONFIG_ARCH_MISC_INIT */
 
 #ifdef CONFIG_MVGBE
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 	mvgbe_initialize(bis);
 	return 0;

+ 1 - 1
arch/arm/mach-rmobile/emac.c

@@ -11,7 +11,7 @@
 #include <linux/errno.h>
 #include <netdev.h>
 
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 	int ret = -ENODEV;
 #ifdef CONFIG_SH_ETHER

+ 1 - 1
arch/arm/mach-stm32mp/fdt.c

@@ -248,7 +248,7 @@ static void stm32_fdt_disable_optee(void *blob)
  * This function is called right before the kernel is booted. "blob" is the
  * device tree that will be passed to the kernel.
  */
-int ft_system_setup(void *blob, bd_t *bd)
+int ft_system_setup(void *blob, struct bd_info *bd)
 {
 	int ret = 0;
 	int soc;

+ 1 - 1
arch/arm/mach-tegra/dt-setup.c

@@ -10,7 +10,7 @@
  * This function is called right before the kernel is booted. "blob" is the
  * device tree that will be passed to the kernel.
  */
-int ft_system_setup(void *blob, bd_t *bd)
+int ft_system_setup(void *blob, struct bd_info *bd)
 {
 	const char *gpu_compats[] = {
 #if defined(CONFIG_TEGRA124)

+ 2 - 2
arch/arm/mach-uniphier/fdt-fixup.c

@@ -18,7 +18,7 @@
  * The DRAM PHY requires 64 byte scratch area in each DRAM channel
  * for its dynamic PHY training feature.
  */
-static int uniphier_ld20_fdt_mem_rsv(void *fdt, bd_t *bd)
+static int uniphier_ld20_fdt_mem_rsv(void *fdt, struct bd_info *bd)
 {
 	unsigned long rsv_addr;
 	const unsigned long rsv_size = 64;
@@ -46,7 +46,7 @@ static int uniphier_ld20_fdt_mem_rsv(void *fdt, bd_t *bd)
 	return 0;
 }
 
-int ft_board_setup(void *fdt, bd_t *bd)
+int ft_board_setup(void *fdt, struct bd_info *bd)
 {
 	static const struct node_info nodes[] = {
 		{ "socionext,uniphier-denali-nand-v5a", MTD_DEV_TYPE_NAND },

+ 1 - 1
arch/m68k/cpu/mcf523x/cpu.c

@@ -108,7 +108,7 @@ int watchdog_init(void)
  * 	int board_eth_init(bd_t *bis)
  */
 
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 	return mcffec_initialize(bis);
 }

+ 1 - 1
arch/m68k/cpu/mcf52x2/cpu.c

@@ -423,7 +423,7 @@ int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
  * 	int board_eth_init(bd_t *bis)
  */
 
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 	return mcffec_initialize(bis);
 }

+ 1 - 1
arch/m68k/cpu/mcf532x/cpu.c

@@ -149,7 +149,7 @@ int watchdog_init(void)
  * create a board-specific function called:
  * 	int board_eth_init(bd_t *bis)
  */
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 	return mcffec_initialize(bis);
 }

+ 1 - 1
arch/m68k/cpu/mcf5445x/cpu.c

@@ -112,7 +112,7 @@ int print_cpuinfo(void)
  * 	int board_eth_init(bd_t *bis)
  */
 
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 	return mcffec_initialize(bis);
 }

+ 1 - 1
arch/m68k/cpu/mcf547x_8x/cpu.c

@@ -139,7 +139,7 @@ int watchdog_init(void)
  * 	int board_eth_init(bd_t *bis)
  */
 
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 #if defined(CONFIG_FSLDMAFEC)
 	mcdmafec_initialize(bis);

+ 1 - 1
arch/m68k/lib/bdinfo.c

@@ -13,7 +13,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 void arch_print_bdinfo(void)
 {
-	bd_t *bd = gd->bd;
+	struct bd_info *bd = gd->bd;
 
 #if defined(CONFIG_SYS_INIT_RAM_ADDR)
 	bdinfo_print_num("sramstart", (ulong)bd->bi_sramstart);

+ 5 - 5
arch/m68k/lib/bootm.c

@@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define LINUX_MAX_ARGS		256
 
 static ulong get_sp (void);
-static void set_clocks_in_mhz (bd_t *kbd);
+static void set_clocks_in_mhz (struct bd_info *kbd);
 
 void arch_lmb_reserve(struct lmb *lmb)
 {
@@ -54,8 +54,8 @@ int do_bootm_linux(int flag, int argc, char *const argv[],
 		   bootm_headers_t *images)
 {
 	int ret;
-	bd_t  *kbd;
-	void  (*kernel) (bd_t *, ulong, ulong, ulong, ulong);
+	struct bd_info  *kbd;
+	void  (*kernel) (struct bd_info *, ulong, ulong, ulong, ulong);
 	struct lmb *lmb = &images->lmb;
 
 	/*
@@ -79,7 +79,7 @@ int do_bootm_linux(int flag, int argc, char *const argv[],
 	if (ret)
 		goto error;
 
-	kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))images->ep;
+	kernel = (void (*)(struct bd_info *, ulong, ulong, ulong, ulong))images->ep;
 
 	debug("## Transferring control to Linux (at address %08lx) ...\n",
 	      (ulong) kernel);
@@ -112,7 +112,7 @@ static ulong get_sp (void)
 	return sp;
 }
 
-static void set_clocks_in_mhz (bd_t *kbd)
+static void set_clocks_in_mhz (struct bd_info *kbd)
 {
 	char *s;
 

+ 13 - 11
arch/nds32/lib/bootm.c

@@ -23,24 +23,25 @@ DECLARE_GLOBAL_DATA_PTR;
 	defined(CONFIG_INITRD_TAG) || \
 	defined(CONFIG_SERIAL_TAG) || \
 	defined(CONFIG_REVISION_TAG)
-static void setup_start_tag(bd_t *bd);
+static void setup_start_tag(struct bd_info *bd);
 
 # ifdef CONFIG_SETUP_MEMORY_TAGS
-static void setup_memory_tags(bd_t *bd);
+static void setup_memory_tags(struct bd_info *bd);
 # endif
-static void setup_commandline_tag(bd_t *bd, char *commandline);
+static void setup_commandline_tag(struct bd_info *bd, char *commandline);
 
 # ifdef CONFIG_INITRD_TAG
-static void setup_initrd_tag(bd_t *bd, ulong initrd_start, ulong initrd_end);
+static void setup_initrd_tag(struct bd_info *bd, ulong initrd_start,
+			     ulong initrd_end);
 # endif
-static void setup_end_tag(bd_t *bd);
+static void setup_end_tag(struct bd_info *bd);
 
 static struct tag *params;
 #endif /* CONFIG_SETUP_MEMORY_TAGS || CONFIG_CMDLINE_TAG || CONFIG_INITRD_TAG */
 
 int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 {
-	bd_t	*bd = gd->bd;
+	struct bd_info	*bd = gd->bd;
 	char	*s;
 	int	machid = bd->bi_arch_number;
 	void	(*theKernel)(int zero, int arch, uint params);
@@ -130,7 +131,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 	defined(CONFIG_INITRD_TAG) || \
 	defined(CONFIG_SERIAL_TAG) || \
 	defined(CONFIG_REVISION_TAG)
-static void setup_start_tag(bd_t *bd)
+static void setup_start_tag(struct bd_info *bd)
 {
 	params = (struct tag *)bd->bi_boot_params;
 
@@ -145,7 +146,7 @@ static void setup_start_tag(bd_t *bd)
 }
 
 #ifdef CONFIG_SETUP_MEMORY_TAGS
-static void setup_memory_tags(bd_t *bd)
+static void setup_memory_tags(struct bd_info *bd)
 {
 	int i;
 
@@ -161,7 +162,7 @@ static void setup_memory_tags(bd_t *bd)
 }
 #endif /* CONFIG_SETUP_MEMORY_TAGS */
 
-static void setup_commandline_tag(bd_t *bd, char *commandline)
+static void setup_commandline_tag(struct bd_info *bd, char *commandline)
 {
 	char *p;
 
@@ -189,7 +190,8 @@ static void setup_commandline_tag(bd_t *bd, char *commandline)
 }
 
 #ifdef CONFIG_INITRD_TAG
-static void setup_initrd_tag(bd_t *bd, ulong initrd_start, ulong initrd_end)
+static void setup_initrd_tag(struct bd_info *bd, ulong initrd_start,
+			     ulong initrd_end)
 {
 	/* an ATAG_INITRD node tells the kernel where the compressed
 	 * ramdisk can be found. ATAG_RDIMG is a better name, actually.
@@ -235,7 +237,7 @@ void setup_revision_tag(struct tag **in_params)
 }
 #endif  /* CONFIG_REVISION_TAG */
 
-static void setup_end_tag(bd_t *bd)
+static void setup_end_tag(struct bd_info *bd)
 {
 	params->hdr.tag = ATAG_NONE;
 	params->hdr.size = 0;

+ 2 - 2
arch/powerpc/cpu/mpc83xx/cpu.c

@@ -184,7 +184,7 @@ void watchdog_reset (void)
  * Initializes on-chip ethernet controllers.
  * to override, implement board_eth_init()
  */
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 #if defined(CONFIG_UEC_ETH)
 	uec_standard_init(bis);
@@ -201,7 +201,7 @@ int cpu_eth_init(bd_t *bis)
  * Initializes on-chip MMC controllers.
  * to override, implement board_mmc_init()
  */
-int cpu_mmc_init(bd_t *bis)
+int cpu_mmc_init(struct bd_info *bis)
 {
 #ifdef CONFIG_FSL_ESDHC
 	return fsl_esdhc_mmc_init(bis);

+ 1 - 1
arch/powerpc/cpu/mpc83xx/fdt.c

@@ -31,7 +31,7 @@ void fdt_fixup_muram (void *blob)
 }
 #endif
 
-void ft_cpu_setup(void *blob, bd_t *bd)
+void ft_cpu_setup(void *blob, struct bd_info *bd)
 {
 	immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
 	int spridr = immr->sysconf.spridr;

+ 1 - 1
arch/powerpc/cpu/mpc83xx/interrupts.c

@@ -72,7 +72,7 @@ void timer_interrupt_cpu (struct pt_regs *regs)
  * irqinfo - print information about PCI devices
  */
 
-void do_irqinfo(struct cmd_tbl *cmdtp, bd_t *bd, int flag, int argc,
+void do_irqinfo(struct cmd_tbl *cmdtp, struct bd_info *bd, int flag, int argc,
 		char *const argv[])
 {
 }

+ 1 - 1
arch/powerpc/cpu/mpc83xx/pci.c

@@ -185,7 +185,7 @@ void mpc83xx_pcislave_unlock(int bus)
 #endif
 
 #if defined(CONFIG_OF_LIBFDT)
-void ft_pci_setup(void *blob, bd_t *bd)
+void ft_pci_setup(void *blob, struct bd_info *bd)
 {
 	int nodeoffset;
 	int tmp[2];

+ 1 - 1
arch/powerpc/cpu/mpc85xx/cpu.c

@@ -377,7 +377,7 @@ watchdog_reset(void)
  * Initializes on-chip MMC controllers.
  * to override, implement board_mmc_init()
  */
-int cpu_mmc_init(bd_t *bis)
+int cpu_mmc_init(struct bd_info *bis)
 {
 #ifdef CONFIG_FSL_ESDHC
 	return fsl_esdhc_mmc_init(bis);

+ 2 - 2
arch/powerpc/cpu/mpc85xx/ether_fcc.c

@@ -206,7 +206,7 @@ static int fec_recv(struct eth_device* dev)
 }
 
 
-static int fec_init(struct eth_device* dev, bd_t *bis)
+static int fec_init(struct eth_device* dev, struct bd_info *bis)
 {
     struct ether_fcc_info_s * info = dev->priv;
     int i;
@@ -418,7 +418,7 @@ static void fec_halt(struct eth_device* dev)
     }
 }
 
-int fec_initialize(bd_t *bis)
+int fec_initialize(struct bd_info *bis)
 {
 	struct eth_device* dev;
 	int i;

+ 1 - 1
arch/powerpc/cpu/mpc85xx/fdt.c

@@ -597,7 +597,7 @@ static void fdt_fixup_l2_switch(void *blob)
 #define fdt_fixup_l2_switch(x)
 #endif
 
-void ft_cpu_setup(void *blob, bd_t *bd)
+void ft_cpu_setup(void *blob, struct bd_info *bd)
 {
 	int off;
 	int val;

+ 1 - 1
arch/powerpc/cpu/mpc86xx/fdt.c

@@ -11,7 +11,7 @@
 extern void ft_fixup_num_cores(void *blob);
 extern void ft_srio_setup(void *blob);
 
-void ft_cpu_setup(void *blob, bd_t *bd)
+void ft_cpu_setup(void *blob, struct bd_info *bd)
 {
 #ifdef CONFIG_MP
 	int off;

+ 1 - 1
arch/powerpc/cpu/mpc8xx/cpu.c

@@ -277,7 +277,7 @@ unsigned long get_tbclk(void)
  * Initializes on-chip ethernet controllers.
  * to override, implement board_eth_init()
  */
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 #if defined(CONFIG_MPC8XX_FEC)
 	fec_initialize(bis);

+ 1 - 1
arch/powerpc/cpu/mpc8xx/fdt.c

@@ -12,7 +12,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-void ft_cpu_setup(void *blob, bd_t *bd)
+void ft_cpu_setup(void *blob, struct bd_info *bd)
 {
 	do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
 			     "timebase-frequency", get_tbclk(), 1);

+ 1 - 1
arch/powerpc/cpu/mpc8xxx/cpu.c

@@ -347,7 +347,7 @@ int fixup_cpu(void)
  * Initializes on-chip ethernet controllers.
  * to override, implement board_eth_init()
  */
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 #if defined(CONFIG_ETHER_ON_FCC)
 	fec_initialize(bis);

+ 1 - 1
arch/powerpc/lib/bdinfo.c

@@ -18,7 +18,7 @@ void __weak board_detail(void)
 
 void arch_print_bdinfo(void)
 {
-	bd_t *bd = gd->bd;
+	struct bd_info *bd = gd->bd;
 
 #if defined(CONFIG_SYS_INIT_RAM_ADDR)
 	bdinfo_print_num("sramstart", (ulong)bd->bi_sramstart);

+ 8 - 8
arch/powerpc/lib/bootm.c

@@ -38,7 +38,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static ulong get_sp (void);
 extern void ft_fixup_num_cores(void *blob);
-static void set_clocks_in_mhz (bd_t *kbd);
+static void set_clocks_in_mhz (struct bd_info *kbd);
 
 #ifndef CONFIG_SYS_LINUX_LOWMEM_MAX_SIZE
 #define CONFIG_SYS_LINUX_LOWMEM_MAX_SIZE	(768*1024*1024)
@@ -46,13 +46,13 @@ static void set_clocks_in_mhz (bd_t *kbd);
 
 static void boot_jump_linux(bootm_headers_t *images)
 {
-	void	(*kernel)(bd_t *, ulong r4, ulong r5, ulong r6,
-			  ulong r7, ulong r8, ulong r9);
+	void	(*kernel)(struct bd_info *, ulong r4, ulong r5, ulong r6,
+			      ulong r7, ulong r8, ulong r9);
 #ifdef CONFIG_OF_LIBFDT
 	char *of_flat_tree = images->ft_addr;
 #endif
 
-	kernel = (void (*)(bd_t *, ulong, ulong, ulong,
+	kernel = (void (*)(struct bd_info *, ulong, ulong, ulong,
 			   ulong, ulong, ulong))images->ep;
 	debug("## Transferring control to Linux (at address %08lx) ...\n",
 	      (ulong)kernel);
@@ -84,7 +84,7 @@ static void boot_jump_linux(bootm_headers_t *images)
 		 */
 		debug("   Booting using OF flat tree...\n");
 		WATCHDOG_RESET ();
-		(*kernel) ((bd_t *)of_flat_tree, 0, 0, EPAPR_MAGIC,
+		(*kernel) ((struct bd_info *)of_flat_tree, 0, 0, EPAPR_MAGIC,
 			   env_get_bootm_mapsize(), 0, 0);
 		/* does not return */
 	} else
@@ -104,7 +104,7 @@ static void boot_jump_linux(bootm_headers_t *images)
 		ulong cmd_end = images->cmdline_end;
 		ulong initrd_start = images->initrd_start;
 		ulong initrd_end = images->initrd_end;
-		bd_t *kbd = images->kbd;
+		struct bd_info *kbd = images->kbd;
 
 		debug("   Booting using board info...\n");
 		WATCHDOG_RESET ();
@@ -200,7 +200,7 @@ static int boot_bd_t_linux(bootm_headers_t *images)
 {
 	ulong of_size = images->ft_len;
 	struct lmb *lmb = &images->lmb;
-	bd_t **kbd = &images->kbd;
+	struct bd_info **kbd = &images->kbd;
 
 	int ret = 0;
 
@@ -270,7 +270,7 @@ static ulong get_sp (void)
 	return sp;
 }
 
-static void set_clocks_in_mhz (bd_t *kbd)
+static void set_clocks_in_mhz (struct bd_info *kbd)
 {
 	char	*s;
 

+ 1 - 1
arch/sh/cpu/sh4/cpu.c

@@ -36,7 +36,7 @@ int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 	return 0;
 }
 
-int cpu_eth_init(bd_t *bis)
+int cpu_eth_init(struct bd_info *bis)
 {
 #ifdef CONFIG_SH_ETHER
 	sh_eth_initialize(bis);

+ 1 - 1
arch/x86/lib/bootm.c

@@ -53,7 +53,7 @@ void bootm_announce_and_cleanup(void)
 #if defined(CONFIG_OF_LIBFDT) && !defined(CONFIG_OF_NO_KERNEL)
 int arch_fixup_memory_node(void *blob)
 {
-	bd_t	*bd = gd->bd;
+	struct bd_info	*bd = gd->bd;
 	int bank;
 	u64 start[CONFIG_NR_DRAM_BANKS];
 	u64 size[CONFIG_NR_DRAM_BANKS];

+ 1 - 1
board/AndesTech/adp-ae3xx/adp-ae3xx.c

@@ -59,7 +59,7 @@ int dram_init_banksize(void)
 }
 
 #if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH)
-int board_eth_init(bd_t *bd)
+int board_eth_init(struct bd_info *bd)
 {
 	return ftmac100_initialize(bd);
 }

+ 1 - 1
board/AndesTech/adp-ag101p/adp-ag101p.c

@@ -66,7 +66,7 @@ int dram_init_banksize(void)
 }
 
 #if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH)
-int board_eth_init(bd_t *bd)
+int board_eth_init(struct bd_info *bd)
 {
 	return ftmac100_initialize(bd);
 }

+ 1 - 1
board/AndesTech/ax25-ae350/ax25-ae350.c

@@ -43,7 +43,7 @@ int dram_init_banksize(void)
 }
 
 #if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH)
-int board_eth_init(bd_t *bd)
+int board_eth_init(struct bd_info *bd)
 {
 	return ftmac100_initialize(bd);
 }

+ 3 - 3
board/Arcturus/ucp1020/spl.c

@@ -77,11 +77,11 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 {
 	/* Pointer is writable since we allocated a register for it */
 	gd = (gd_t *)CONFIG_SPL_GD_ADDR;
-	bd_t *bd;
+	struct bd_info *bd;
 
 	memset(gd, 0, sizeof(gd_t));
-	bd = (bd_t *)(CONFIG_SPL_GD_ADDR + sizeof(gd_t));
-	memset(bd, 0, sizeof(bd_t));
+	bd = (struct bd_info *)(CONFIG_SPL_GD_ADDR + sizeof(gd_t));
+	memset(bd, 0, sizeof(struct bd_info));
 	gd->bd = bd;
 	bd->bi_memstart = CONFIG_SYS_INIT_L2_ADDR;
 	bd->bi_memsize = CONFIG_SYS_L2_SIZE;

+ 2 - 2
board/Arcturus/ucp1020/ucp1020.c

@@ -262,7 +262,7 @@ int last_stage_init(void)
 	return 0;
 }
 
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	struct fsl_pq_mdio_info mdio_info;
 	struct tsec_info_struct tsec_info[4];
@@ -307,7 +307,7 @@ int board_eth_init(bd_t *bis)
 }
 
 #ifdef CONFIG_OF_BOARD_SETUP
-int ft_board_setup(void *blob, bd_t *bd)
+int ft_board_setup(void *blob, struct bd_info *bd)
 {
 	phys_addr_t base;
 	phys_size_t size;

+ 1 - 1
board/BuR/common/bur_common.h

@@ -22,7 +22,7 @@ void pmicsetup(u32 mpupll, unsigned int bus);
 void enable_uart0_pin_mux(void);
 void enable_i2c_pin_mux(void);
 void enable_board_pin_mux(void);
-int board_eth_init(bd_t *bis);
+int board_eth_init(struct bd_info *bis);
 
 int brdefaultip_setup(int bus, int chip);
 

+ 1 - 1
board/BuR/common/common.c

@@ -246,7 +246,7 @@ void lcd_enable(void)
 }
 #endif /* CONFIG_LCD */
 
-int ft_board_setup(void *blob, bd_t *bd)
+int ft_board_setup(void *blob, struct bd_info *bd)
 {
 	int nodeoffset;
 

+ 1 - 1
board/CZ.NIC/turris_mox/turris_mox.c

@@ -700,7 +700,7 @@ static int remove_disabled_nodes(void *blob)
 	return 0;
 }
 
-int ft_board_setup(void *blob, bd_t *bd)
+int ft_board_setup(void *blob, struct bd_info *bd)
 {
 	int node, phandle, res;
 

+ 1 - 1
board/CarMediaLab/flea3/flea3.c

@@ -206,7 +206,7 @@ u32 get_board_rev(void)
  * called prior to booting kernel or by 'fdt boardsetup' command
  *
  */
-int ft_board_setup(void *blob, bd_t *bd)
+int ft_board_setup(void *blob, struct bd_info *bd)
 {
 	static const struct node_info nodes[] = {
 		{ "physmap-flash.0", MTD_DEV_TYPE_NOR, },  /* NOR flash */

+ 1 - 1
board/Marvell/db-88f6720/db-88f6720.c

@@ -86,7 +86,7 @@ int checkboard(void)
 	return 0;
 }
 
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	cpu_eth_init(bis); /* Built in controller(s) come first */
 	return pci_eth_init(bis);

+ 1 - 1
board/Marvell/db-88f6820-amc/db-88f6820-amc.c

@@ -124,7 +124,7 @@ int checkboard(void)
 	return 0;
 }
 
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	cpu_eth_init(bis); /* Built in controller(s) come first */
 	return pci_eth_init(bis);

+ 1 - 1
board/Marvell/db-88f6820-gp/db-88f6820-gp.c

@@ -151,7 +151,7 @@ int checkboard(void)
 	return 0;
 }
 
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	cpu_eth_init(bis); /* Built in controller(s) come first */
 	return pci_eth_init(bis);

+ 1 - 1
board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c

@@ -83,7 +83,7 @@ int checkboard(void)
 	return 0;
 }
 
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	cpu_eth_init(bis); /* Built in controller(s) come first */
 	return pci_eth_init(bis);

+ 1 - 1
board/Marvell/gplugd/gplugd.c

@@ -94,7 +94,7 @@ int board_init(void)
 }
 
 #ifdef CONFIG_ARMADA100_FEC
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	struct armd1apmu_registers *apmu_regs =
 		(struct armd1apmu_registers *)ARMD1_APMU_BASE;

+ 1 - 1
board/abilis/tb100/tb100.c

@@ -15,7 +15,7 @@ void reset_cpu(ulong addr)
 	writel(0x1, (void *)CRM_SWRESET);
 }
 
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	if (designware_initialize(ETH0_BASE_ADDRESS, 0) >= 0)
 		return 1;

+ 2 - 2
board/advantech/dms-ba16/dms-ba16.c

@@ -254,7 +254,7 @@ int board_mmc_getcd(struct mmc *mmc)
 	return ret;
 }
 
-int board_mmc_init(bd_t *bis)
+int board_mmc_init(struct bd_info *bis)
 {
 	int ret;
 	int i;
@@ -452,7 +452,7 @@ int overwrite_console(void)
 	return 1;
 }
 
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	setup_iomux_enet();
 	setup_pcie();

+ 1 - 1
board/advantech/imx8qm_rom7720_a1/spl.c

@@ -96,7 +96,7 @@ static iomux_cfg_t usdhc2_sd[] = {
 	SC_P_USDHC2_CD_B | MUX_MODE_ALT(3) | MUX_PAD_CTRL(ESDHC_PAD_CTRL),
 };
 
-int board_mmc_init(bd_t *bis)
+int board_mmc_init(struct bd_info *bis)
 {
 	int i, ret;
 

+ 1 - 1
board/amazon/kc1/kc1.c

@@ -168,7 +168,7 @@ int fastboot_set_reboot_flag(void)
 	return omap_reboot_mode_store("b");
 }
 
-int board_mmc_init(bd_t *bis)
+int board_mmc_init(struct bd_info *bis)
 {
 	return omap_mmc_init(1, 0, 0, -1, -1);
 }

+ 1 - 1
board/armltd/integrator/integrator.c

@@ -174,7 +174,7 @@ extern void dram_query(void);
 }
 
 #ifdef CONFIG_CMD_NET
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	int rc = 0;
 #ifdef CONFIG_SMC91111

+ 2 - 2
board/armltd/vexpress/vexpress_common.c

@@ -64,7 +64,7 @@ int board_init(void)
 	return 0;
 }
 
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	int rc = 0;
 #ifdef CONFIG_SMC911X
@@ -73,7 +73,7 @@ int board_eth_init(bd_t *bis)
 	return rc;
 }
 
-int cpu_mmc_init(bd_t *bis)
+int cpu_mmc_init(struct bd_info *bis)
 {
 	int rc = 0;
 	(void) bis;

+ 1 - 1
board/armltd/vexpress/vexpress_tc2.c

@@ -36,7 +36,7 @@ bool armv7_boot_nonsec_default(void)
 }
 
 #ifdef CONFIG_OF_BOARD_SETUP
-int ft_board_setup(void *fdt, bd_t *bd)
+int ft_board_setup(void *fdt, struct bd_info *bd)
 {
 	int offset, tmp, len;
 	const struct fdt_property *prop;

+ 1 - 1
board/armltd/vexpress64/vexpress64.c

@@ -149,7 +149,7 @@ void reset_cpu(ulong addr)
 /*
  * Board specific ethernet initialization routine.
  */
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	int rc = 0;
 #ifndef CONFIG_DM_ETH

+ 1 - 1
board/atmel/at91rm9200ek/at91rm9200ek.c

@@ -55,7 +55,7 @@ int dram_init (void)
 }
 
 #ifdef CONFIG_DRIVER_AT91EMAC
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	return at91emac_register(bis, (u32) ATMEL_BASE_EMAC);
 }

+ 1 - 1
board/atmel/at91sam9261ek/at91sam9261ek.c

@@ -265,7 +265,7 @@ int board_init(void)
 }
 
 #ifdef CONFIG_DRIVER_DM9000
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	return dm9000_initialize(bis);
 }

+ 1 - 1
board/atmel/at91sam9n12ek/at91sam9n12ek.c

@@ -207,7 +207,7 @@ int board_init(void)
 }
 
 #ifdef CONFIG_KS8851_MLL
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	return ks8851_mll_initialize(0, CONFIG_KS8851_MLL_BASEADDR);
 }

+ 2 - 2
board/bachmann/ot1200/ot1200.c

@@ -228,7 +228,7 @@ struct fsl_esdhc_cfg usdhc_cfg[2] = {
 	{USDHC4_BASE_ADDR},
 };
 
-int board_mmc_init(bd_t *bis)
+int board_mmc_init(struct bd_info *bis)
 {
 	int ret;
 	u32 index = 0;
@@ -281,7 +281,7 @@ static void backlight_lcd_off(void)
 	gpio_direction_output(gpio, 0);
 }
 
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	uint32_t base = IMX_FEC_BASE;
 	struct mii_dev *bus = NULL;

+ 2 - 2
board/barco/platinum/platinum.c

@@ -115,7 +115,7 @@ int board_mmc_getcd(struct mmc *mmc)
 	return 0;
 }
 
-int board_mmc_init(bd_t *bis)
+int board_mmc_init(struct bd_info *bis)
 {
 	imx_iomux_v3_setup_multiple_pads(usdhc3_pads, ARRAY_SIZE(usdhc3_pads));
 	usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
@@ -163,7 +163,7 @@ int board_phy_config(struct phy_device *phydev)
 	return platinum_phy_config(phydev);
 }
 
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	return cpu_eth_init(bis);
 }

+ 2 - 2
board/barco/titanium/titanium.c

@@ -235,7 +235,7 @@ int board_mmc_getcd(struct mmc *mmc)
 	return 0;
 }
 
-int board_mmc_init(bd_t *bis)
+int board_mmc_init(struct bd_info *bis)
 {
 	/*
 	 * Only one USDHC controller on titianium
@@ -264,7 +264,7 @@ int board_phy_config(struct phy_device *phydev)
 	return 0;
 }
 
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	setup_iomux_enet();
 

+ 2 - 2
board/bluegiga/apx4devkit/apx4devkit.c

@@ -59,7 +59,7 @@ int board_init(void)
 }
 
 #ifdef CONFIG_CMD_MMC
-int board_mmc_init(bd_t *bis)
+int board_mmc_init(struct bd_info *bis)
 {
 	return mxsmmc_initialize(bis, 0, NULL, NULL);
 }
@@ -77,7 +77,7 @@ int fecmxc_mii_postcall(int phy)
 	return 0;
 }
 
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	int ret;
 	struct eth_device *dev;

+ 2 - 2
board/bluewater/gurnard/gurnard.c

@@ -236,7 +236,7 @@ void gurnard_usb_init(void)
 #endif
 
 #ifdef CONFIG_GENERIC_ATMEL_MCI
-int cpu_mmc_init(bd_t *bis)
+int cpu_mmc_init(struct bd_info *bis)
 {
 	return atmel_mci_init((void *)ATMEL_BASE_MCI0);
 }
@@ -399,7 +399,7 @@ int board_late_init(void)
 }
 
 #ifndef CONFIG_DM_ETH
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	return macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC, 0);
 }

+ 1 - 1
board/bluewater/snapper9260/snapper9260.c

@@ -127,7 +127,7 @@ int board_init(void)
 	return 0;
 }
 
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	return macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC0, 0x1f);
 }

+ 1 - 1
board/bosch/shc/board.c

@@ -472,7 +472,7 @@ int board_late_init(void)
 
 #if defined(CONFIG_USB_ETHER) && \
 	(!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USB_ETHER))
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	return usb_eth_initialize(bis);
 }

+ 1 - 1
board/boundary/nitrogen6x/nitrogen6x.c

@@ -321,7 +321,7 @@ int board_phy_config(struct phy_device *phydev)
 	return 0;
 }
 
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	uint32_t base = IMX_FEC_BASE;
 	struct mii_dev *bus = NULL;

+ 1 - 1
board/broadcom/bcm23550_w1d/bcm23550_w1d.c

@@ -76,7 +76,7 @@ int dram_init_banksize(void)
 /*
  * mmc_init - Initializes mmc
  */
-int board_mmc_init(bd_t *bis)
+int board_mmc_init(struct bd_info *bis)
 {
 	int ret = 0;
 

+ 1 - 1
board/broadcom/bcm28155_ap/bcm28155_ap.c

@@ -83,7 +83,7 @@ int dram_init_banksize(void)
 /*
  * mmc_init - Initializes mmc
  */
-int board_mmc_init(bd_t *bis)
+int board_mmc_init(struct bd_info *bis)
 {
 	int ret = 0;
 

+ 1 - 1
board/broadcom/bcm_ep/board.c

@@ -75,7 +75,7 @@ void smp_waitloop(unsigned previous_address)
 #endif
 
 #ifdef CONFIG_BCM_SF2_ETH
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	int rc = -1;
 	printf("Registering BCM sf2 eth\n");

+ 1 - 1
board/calao/usb_a9263/usb_a9263.c

@@ -115,7 +115,7 @@ int dram_init(void)
 	return 0;
 }
 
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 	int rc = 0;
 

Some files were not shown because too many files changed in this diff