mirror of
				https://github.com/smaeul/u-boot.git
				synced 2025-11-04 05:50:17 +00:00 
			
		
		
		
	omap3: use device specific naming for mem_init
Use device specific naming for functions so as to not overlap with common function names. Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
		
							parent
							
								
									0c6d645d3f
								
							
						
					
					
						commit
						6c84e71258
					
				@ -475,7 +475,7 @@ enum {
 | 
				
			|||||||
#ifndef __ASSEMBLY__
 | 
					#ifndef __ASSEMBLY__
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Function prototypes */
 | 
					/* Function prototypes */
 | 
				
			||||||
void mem_init(void);
 | 
					void omap3_mem_init(void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
u32 is_mem_sdr(void);
 | 
					u32 is_mem_sdr(void);
 | 
				
			||||||
u32 mem_ok(u32 cs);
 | 
					u32 mem_ok(u32 cs);
 | 
				
			||||||
 | 
				
			|||||||
@ -216,7 +216,7 @@ void s_init(void)
 | 
				
			|||||||
void board_init_f(ulong dummy)
 | 
					void board_init_f(ulong dummy)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	early_system_init();
 | 
						early_system_init();
 | 
				
			||||||
	mem_init();
 | 
						omap3_mem_init();
 | 
				
			||||||
	/*
 | 
						/*
 | 
				
			||||||
	* Save the boot parameters passed from romcode.
 | 
						* Save the boot parameters passed from romcode.
 | 
				
			||||||
	* We cannot delay the saving further than this,
 | 
						* We cannot delay the saving further than this,
 | 
				
			||||||
 | 
				
			|||||||
@ -159,10 +159,10 @@ int dram_init_banksize(void)
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * mem_init() -
 | 
					 * omap3_mem_init() -
 | 
				
			||||||
 *  - Initialize memory subsystem
 | 
					 *  - Initialize memory subsystem
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
void mem_init(void)
 | 
					void omap3_mem_init(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	do_emif4_init();
 | 
						do_emif4_init();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -4,7 +4,7 @@
 | 
				
			|||||||
 *
 | 
					 *
 | 
				
			||||||
 * This file has been created after exctracting and consolidating
 | 
					 * This file has been created after exctracting and consolidating
 | 
				
			||||||
 * the SDRC related content from mem.c and board.c, also created
 | 
					 * the SDRC related content from mem.c and board.c, also created
 | 
				
			||||||
 * generic init function (mem_init).
 | 
					 * generic init function (omap3_mem_init).
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * Copyright (C) 2004-2010
 | 
					 * Copyright (C) 2004-2010
 | 
				
			||||||
 * Texas Instruments Incorporated - https://www.ti.com/
 | 
					 * Texas Instruments Incorporated - https://www.ti.com/
 | 
				
			||||||
@ -232,11 +232,11 @@ int dram_init_banksize(void)
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * mem_init -
 | 
					 * omap3_mem_init -
 | 
				
			||||||
 *  - Init the sdrc chip,
 | 
					 *  - Init the sdrc chip,
 | 
				
			||||||
 *  - Selects CS0 and CS1,
 | 
					 *  - Selects CS0 and CS1,
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
void mem_init(void)
 | 
					void omap3_mem_init(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	/* only init up first bank here */
 | 
						/* only init up first bank here */
 | 
				
			||||||
	do_sdrc_init(CS0, EARLY_INIT);
 | 
						do_sdrc_init(CS0, EARLY_INIT);
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user