Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / include / configs / bfin_adi_common.h

diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index b615c79c846484e27f94cee89a469769e8b040df..0b87418db69d33532fdee3c1d4d7219d8dc0cd35 100644 (file)
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -87,6 +87,9 @@
 #  define CONFIG_CMD_SPIBOOTLDR
 # endif
 #endif
+#ifdef CONFIG_CMD_NAND
+# define CONFIG_SYS_64BIT_VSPRINTF
+#endif
 
 /*
  * Console Settings
@@ -135,7 +138,7 @@
                "uart" MK_STR(CONFIG_UART_CONSOLE) "," \
                MK_STR(CONFIG_BAUDRATE) " " \
        CONFIG_BOOTARGS_VIDEO \
-       "console=ttyBF0," MK_STR(CONFIG_BAUDRATE)
+       "console=ttyBF" MK_STR(CONFIG_UART_CONSOLE) "," MK_STR(CONFIG_BAUDRATE)
 #if defined(CONFIG_CMD_NAND)
 # define NAND_ENV_SETTINGS \
        "nandargs=set bootargs " CONFIG_BOOTARGS "\0" \