mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-06-06 06:41:40 +00:00
omap3: Introduce weak misc_init_r
Introduce a __weak misc_init_r function that just runs dieid_num_r(). Remove misc_init_r from cm_t35, mcx, omap3_logic and mt_ventoux as this was all they did for misc_init_r. Cc: Igor Grinberg <grinberg@compulab.co.il> Cc: Ilya Yanok <yanok@emcraft.com> Cc: Peter Barada <peter.barada@logicpd.com> Cc: Stefano Babic <sbabic@denx.de> Signed-off-by: Tom Rini <trini@ti.com> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
This commit is contained in:
parent
60bd10df8a
commit
8a87a3d72e
5 changed files with 12 additions and 40 deletions
|
@ -41,6 +41,7 @@
|
||||||
#include <asm/arch/gpio.h>
|
#include <asm/arch/gpio.h>
|
||||||
#include <asm/omap_common.h>
|
#include <asm/omap_common.h>
|
||||||
#include <i2c.h>
|
#include <i2c.h>
|
||||||
|
#include <linux/compiler.h>
|
||||||
|
|
||||||
/* Declarations */
|
/* Declarations */
|
||||||
extern omap3_sysinfo sysinfo;
|
extern omap3_sysinfo sysinfo;
|
||||||
|
@ -244,6 +245,17 @@ void s_init(void)
|
||||||
mem_init();
|
mem_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Routine: misc_init_r
|
||||||
|
* Description: A basic misc_init_r that just displays the die ID
|
||||||
|
*/
|
||||||
|
int __weak misc_init_r(void)
|
||||||
|
{
|
||||||
|
dieid_num_r();
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* Routine: wait_for_command_complete
|
* Routine: wait_for_command_complete
|
||||||
* Description: Wait for posting to finish on watchdog
|
* Description: Wait for posting to finish on watchdog
|
||||||
|
|
|
@ -99,17 +99,6 @@ int board_init(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Routine: misc_init_r
|
|
||||||
* Description: display die ID
|
|
||||||
*/
|
|
||||||
int misc_init_r(void)
|
|
||||||
{
|
|
||||||
dieid_num_r();
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Routine: set_muxconf_regs
|
* Routine: set_muxconf_regs
|
||||||
* Description: Setting up the configuration Mux registers specific to the
|
* Description: Setting up the configuration Mux registers specific to the
|
||||||
|
|
|
@ -68,17 +68,6 @@ int board_init(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Routine: misc_init_r
|
|
||||||
* Description: late init.
|
|
||||||
*/
|
|
||||||
int misc_init_r(void)
|
|
||||||
{
|
|
||||||
dieid_num_r();
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Routine: set_muxconf_regs
|
* Routine: set_muxconf_regs
|
||||||
* Description: Setting up the configuration Mux registers specific to the
|
* Description: Setting up the configuration Mux registers specific to the
|
||||||
|
|
|
@ -144,17 +144,6 @@ int board_mmc_init(bd_t *bis)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
|
||||||
* Routine: misc_init_r
|
|
||||||
* Description: display die ID register
|
|
||||||
*/
|
|
||||||
int misc_init_r(void)
|
|
||||||
{
|
|
||||||
dieid_num_r();
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_SMC911X
|
#ifdef CONFIG_SMC911X
|
||||||
/* GPMC CS1 settings for Logic SOM LV/Torpedo LAN92xx Ethernet chip */
|
/* GPMC CS1 settings for Logic SOM LV/Torpedo LAN92xx Ethernet chip */
|
||||||
static const u32 gpmc_lan92xx_config[] = {
|
static const u32 gpmc_lan92xx_config[] = {
|
||||||
|
|
|
@ -196,13 +196,6 @@ int board_init(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int misc_init_r(void)
|
|
||||||
{
|
|
||||||
dieid_num_r();
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Routine: set_muxconf_regs
|
* Routine: set_muxconf_regs
|
||||||
* Description: Setting up the configuration Mux registers specific to the
|
* Description: Setting up the configuration Mux registers specific to the
|
||||||
|
|
Loading…
Add table
Reference in a new issue