| Message ID | 1462690341-3922-1-git-send-email-l.majewski@majess.pl |
|---|---|
| State | Accepted |
| Commit | 851bda81487b0e2b5b43c9c2dc2582214751953e |
| Delegated to: | Tom Rini |
| Headers | show |
On Sun, May 08, 2016 at 08:52:21AM +0200, Lukasz Majewski wrote: > Replace #ifdef DEBUG with dedicated debug() macro. > > Signed-off-by: Lukasz Majewski <l.majewski@majess.pl> Applied to u-boot/master, thanks!
diff --git a/common/bootm_os.c b/common/bootm_os.c index cb83f4a..9ec84bd 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -484,9 +484,8 @@ int boot_selected_os(int argc, char * const argv[], int state, state == BOOTM_STATE_OS_FAKE_GO) /* We expect to return */ return 0; bootstage_error(BOOTSTAGE_ID_BOOT_OS_RETURNED); -#ifdef DEBUG - puts("\n## Control returned to monitor - resetting...\n"); -#endif + debug("\n## Control returned to monitor - resetting...\n"); + return BOOTM_ERR_RESET; }
Replace #ifdef DEBUG with dedicated debug() macro. Signed-off-by: Lukasz Majewski <l.majewski@majess.pl> --- common/bootm_os.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)