mirror of
				https://xff.cz/git/u-boot/
				synced 2025-10-31 10:26:10 +01:00 
			
		
		
		
	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>
This commit is contained in:
		
				
					committed by
					
						 Tom Rini
						Tom Rini
					
				
			
			
				
	
			
			
			
						parent
						
							02ff91e8c6
						
					
				
				
					commit
					b75d8dc564
				
			| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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 | ||||
|  | ||||
| /* | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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; | ||||
|  | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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; | ||||
|  | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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 | ||||
|  | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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]; | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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 */ | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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) { | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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; | ||||
|  | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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); | ||||
|  | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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; | ||||
|  | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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; | ||||
|  | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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 }, | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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; | ||||
|  | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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[]) | ||||
| { | ||||
| } | ||||
|   | ||||
| @@ -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]; | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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, | ||||
| 	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; | ||||
|  | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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]; | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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); | ||||
|  | ||||
|   | ||||
| @@ -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; | ||||
|  | ||||
|   | ||||
| @@ -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; | ||||
|  | ||||
|   | ||||
| @@ -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 */ | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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(); | ||||
|   | ||||
| @@ -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; | ||||
|  | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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(); | ||||
|  | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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; | ||||
|  | ||||
|   | ||||
| @@ -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; | ||||
|  | ||||
|   | ||||
| @@ -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"); | ||||
|   | ||||
| @@ -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 have changed in this diff Show More
		Reference in New Issue
	
	Block a user