mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-17 10:24:49 +00:00
board: freescale: fix LS1021a build
Fix build error "undefined reference to `is_warm_boot'" when ls1021atsn and ls1021atwr boards are built with CONFIG_SPL=y and CONFIG_DEEP_SLEEP=n. Signed-off-by: Benjamin Lemouzy <blemouzy@centralp.fr> Signed-off-by: Peng Fan <peng.fan@nxp.com>
This commit is contained in:
parent
63a23cb465
commit
9f258e4820
2 changed files with 16 additions and 14 deletions
|
@ -166,10 +166,9 @@ void board_init_f(ulong dummy)
|
|||
|
||||
get_clocks();
|
||||
|
||||
#if defined(CONFIG_DEEP_SLEEP)
|
||||
if (is_warm_boot())
|
||||
fsl_dp_disable_console();
|
||||
#endif
|
||||
if (CONFIG_IS_ENABLED(DEEP_SLEEP))
|
||||
if (is_warm_boot())
|
||||
fsl_dp_disable_console();
|
||||
|
||||
preloader_console_init();
|
||||
|
||||
|
@ -187,9 +186,11 @@ void board_init_f(ulong dummy)
|
|||
* it from SD since it has already been reserved in memory
|
||||
* in last boot.
|
||||
*/
|
||||
if (is_warm_boot()) {
|
||||
second_uboot = (void (*)(void))CONFIG_TEXT_BASE;
|
||||
second_uboot();
|
||||
if (CONFIG_IS_ENABLED(DEEP_SLEEP)) {
|
||||
if (is_warm_boot()) {
|
||||
second_uboot = (void (*)(void))CONFIG_TEXT_BASE;
|
||||
second_uboot();
|
||||
}
|
||||
}
|
||||
|
||||
board_init_r(NULL, 0);
|
||||
|
|
|
@ -417,10 +417,9 @@ void board_init_f(ulong dummy)
|
|||
|
||||
get_clocks();
|
||||
|
||||
#if defined(CONFIG_DEEP_SLEEP)
|
||||
if (is_warm_boot())
|
||||
fsl_dp_disable_console();
|
||||
#endif
|
||||
if (CONFIG_IS_ENABLED(DEEP_SLEEP))
|
||||
if (is_warm_boot())
|
||||
fsl_dp_disable_console();
|
||||
|
||||
preloader_console_init();
|
||||
|
||||
|
@ -438,9 +437,11 @@ void board_init_f(ulong dummy)
|
|||
* it from SD since it has already been reserved in memeory
|
||||
* in last boot.
|
||||
*/
|
||||
if (is_warm_boot()) {
|
||||
second_uboot = (void (*)(void))CONFIG_TEXT_BASE;
|
||||
second_uboot();
|
||||
if (CONFIG_IS_ENABLED(DEEP_SLEEP)) {
|
||||
if (is_warm_boot()) {
|
||||
second_uboot = (void (*)(void))CONFIG_TEXT_BASE;
|
||||
second_uboot();
|
||||
}
|
||||
}
|
||||
|
||||
board_init_r(NULL, 0);
|
||||
|
|
Loading…
Add table
Reference in a new issue