diff options
author | Wolfgang Denk <wd@denx.de> | 2009-02-22 22:51:25 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-02-22 22:51:25 +0100 |
commit | 9d34d0a0c12266d80e7b3ab3cbdafc3d81a01832 (patch) | |
tree | e96e91ec782fb30e5eede0de6bcf57716496c6b6 /lib_arm | |
parent | 0b741df241aa5eba6c9e21b4cfcaa3fe5f57753d (diff) | |
parent | aba45c85b22f8c57fc2fedba8e948e06c2e2f5b3 (diff) | |
download | u-boot-imx-9d34d0a0c12266d80e7b3ab3cbdafc3d81a01832.zip u-boot-imx-9d34d0a0c12266d80e7b3ab3cbdafc3d81a01832.tar.gz u-boot-imx-9d34d0a0c12266d80e7b3ab3cbdafc3d81a01832.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'lib_arm')
-rw-r--r-- | lib_arm/board.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib_arm/board.c b/lib_arm/board.c index f125d38..09eaaf2 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -145,6 +145,9 @@ void inline yellow_LED_off(void)__attribute__((weak, alias("__yellow_LED_off"))) * but let's get it working (again) first... */ +#if defined(CONFIG_ARM_DCC) && !defined(CONFIG_BAUDRATE) +#define CONFIG_BAUDRATE 115200 +#endif static int init_baudrate (void) { char tmp[64]; /* long enough for environment variables */ |