summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-10-03 23:38:55 +0200
committerWolfgang Denk <wd@denx.de>2009-10-03 23:38:55 +0200
commiteb4bf4c077dbf69a94a1697c784bc1f02aaab952 (patch)
tree82d720ce8dc28009d3b8ae45ae2481426d3cde2e
parent1d96cfe8f5eebfc6ea39d1a387f35ca4499e6b67 (diff)
parent46a887949e11d2cddb91e17ca47e73341d71a379 (diff)
downloadu-boot-imx-eb4bf4c077dbf69a94a1697c784bc1f02aaab952.zip
u-boot-imx-eb4bf4c077dbf69a94a1697c784bc1f02aaab952.tar.gz
u-boot-imx-eb4bf4c077dbf69a94a1697c784bc1f02aaab952.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
-rw-r--r--include/configs/bf533-ezkit.h2
-rw-r--r--include/configs/bfin_adi_common.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/bf533-ezkit.h b/include/configs/bf533-ezkit.h
index f896cb0..8342ec7 100644
--- a/include/configs/bf533-ezkit.h
+++ b/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
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index 00bfc6e..0b87418 100644
--- a/include/configs/bfin_adi_common.h
+++ b/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" \