Merge commit '7b2fac7654f7420c2787f74ec3b1540fa3b343e9'

[platform/kernel/u-boot.git] / common / cmd_bmp.c

diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c
index 6fa8a15..23fc82f 100644 (file)
--- a/common/cmd_bmp.c
+++ b/common/cmd_bmp.c
@@ -79,7 +79,7 @@ bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp)
                return NULL;
        }
 
-       puts("Gzipped BMP image detected!\n");
+       debug("Gzipped BMP image detected!\n");
 
        return bmp;
 }
@@ -137,7 +137,7 @@ static cmd_tbl_t cmd_bmp_sub[] = {
        U_BOOT_CMD_MKENT(display, 5, 0, do_bmp_display, "", ""),
 };
 
-#ifndef CONFIG_RELOC_FIXUP_WORKS
+#ifdef CONFIG_NEEDS_MANUAL_RELOC
 void bmp_reloc(void) {
        fixup_cmdtable(cmd_bmp_sub, ARRAY_SIZE(cmd_bmp_sub));
 }