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>

diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c
index d1accce..c92430c 100644 (file)
--- a/board/freescale/ls1021atsn/ls1021atsn.c
+++ b/board/freescale/ls1021atsn/ls1021atsn.c
@@ -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);

diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index cc9665c..0758e5e 100644 (file)
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -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);