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

[karo-tx-uboot.git] / arch / blackfin / lib / board.c

diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c
index 46e36c8904ce58fb01505130c62d14e3f5fc4009..fcfd1746a59f78dd872ae8319f98e4c070c7f57d 100644 (file)
--- a/arch/blackfin/lib/board.c
+++ b/arch/blackfin/lib/board.c
@@ -254,7 +254,7 @@ void board_init_f(ulong bootflag)
        memset((void *)bd, 0, sizeof(bd_t));
 
        bd->bi_r_version = version_string;
-       bd->bi_cpu = MK_STR(CONFIG_BFIN_CPU);
+       bd->bi_cpu = BFIN_CPU;
        bd->bi_board_name = BFIN_BOARD_NAME;
        bd->bi_vco = get_vco();
        bd->bi_cclk = get_cclk();
@@ -322,7 +322,6 @@ void board_init_r(gd_t * id, ulong dest_addr)
 
 #if defined(CONFIG_POST)
        post_output_backlog();
-       post_reloc();
 #endif
 
        /* initialize malloc() area */
@@ -352,7 +351,7 @@ void board_init_r(gd_t * id, ulong dest_addr)
 #endif
 
 #ifdef CONFIG_GENERIC_MMC
-       puts("MMC:  ");
+       puts("MMC:   ");
        mmc_initialize(bd);
 #endif