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

[karo-tx-uboot.git] / board / faraday / a320evb / a320evb.c

diff --git a/board/faraday/a320evb/a320evb.c b/board/faraday/a320evb/a320evb.c
index 85b11b96a6f99bc67c1b2d89a2dc76d6be267b69..dfd186ba8a9481ede518b5c84fc52c83f090206d 100644 (file)
--- a/board/faraday/a320evb/a320evb.c
+++ b/board/faraday/a320evb/a320evb.c
@@ -21,7 +21,7 @@
 #include <netdev.h>
 #include <asm/io.h>
 
-#include <asm/arch/ftsmc020.h>
+#include <faraday/ftsmc020.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -31,7 +31,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
-       gd->bd->bi_arch_number = MACH_TYPE_FARADAY;
        gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
        ftsmc020_init();        /* initialize Flash */
@@ -46,8 +45,7 @@ int dram_init(void)
 
        actual_size = get_ram_size((void *)sdram_base, expected_size);
 
-       gd->bd->bi_dram[0].start = sdram_base;
-       gd->bd->bi_dram[0].size  = actual_size;
+       gd->ram_size = actual_size;
 
        if (expected_size != actual_size)
                printf("Warning: Only %lu of %lu MiB SDRAM is working\n",