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

include/configs/bf533-ezkit.h

@@ -85,7 +85,7 @@
 #define CONFIG_SYS_MAX_FLASH_BANKS	3
 #define CONFIG_SYS_MAX_FLASH_SECT	40
 #define CONFIG_ENV_IS_IN_FLASH
-#define CONFIG_ENV_ADDR		0x20020000
+#define CONFIG_ENV_ADDR		0x20030000
 #define CONFIG_ENV_SECT_SIZE	0x10000
 #define FLASH_TOT_SECT		40
 

include/configs/bfin_adi_common.h

@@ -138,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" \