Merge branch 'master' of /home/stefan/git/u-boot/u-boot

[karo-tx-uboot.git] / board / bf537-stamp / bf537-stamp.c

diff --git a/board/bf537-stamp/bf537-stamp.c b/board/bf537-stamp/bf537-stamp.c
index e714177d7cb945e9a12849c58e76b6b371fe390c..7303f1b4155e59cf003b8bee64c4690bbe8433e7 100644 (file)
--- a/board/bf537-stamp/bf537-stamp.c
+++ b/board/bf537-stamp/bf537-stamp.c
@@ -32,6 +32,7 @@
 #include <asm/io.h>
 #include <net.h>
 #include <asm/mach-common/bits/bootrom.h>
+#include <netdev.h>
 
 /**
  * is_valid_ether_addr - Determine if the given Ethernet address is valid
@@ -97,7 +98,7 @@ void cf_outsw(unsigned short *addr, unsigned short *sect_buf, int words)
 }
 #endif                         /* CONFIG_BFIN_IDE */
 
-long int initdram(int board_type)
+phys_size_t initdram(int board_type)
 {
 #ifdef DEBUG
        int brate;
@@ -108,12 +109,12 @@ long int initdram(int board_type)
        printf("tRCD %d SCLK Cycles,tRP %d SCLK Cycles,tRAS %d SCLK Cycles"
               "tWR %d SCLK Cycles,CAS Latency %d SCLK cycles \n",
               3, 3, 6, 2, 3);
-       printf("SDRAM Begin: 0x%x\n", CFG_SDRAM_BASE);
-       printf("Bank size = %d MB\n", CFG_MAX_RAM_SIZE >> 20);
+       printf("SDRAM Begin: 0x%x\n", CONFIG_SYS_SDRAM_BASE);
+       printf("Bank size = %d MB\n", CONFIG_SYS_MAX_RAM_SIZE >> 20);
 #endif
-       gd->bd->bi_memstart = CFG_SDRAM_BASE;
-       gd->bd->bi_memsize = CFG_MAX_RAM_SIZE;
-       return CFG_MAX_RAM_SIZE;
+       gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_memsize = CONFIG_SYS_MAX_RAM_SIZE;
+       return CONFIG_SYS_MAX_RAM_SIZE;
 }
 
 #if defined(CONFIG_MISC_INIT_R)
@@ -154,6 +155,14 @@ int misc_init_r(void)
 }
 #endif                         /* CONFIG_MISC_INIT_R */
 
+#if defined(CONFIG_BFIN_MAC)
+
+int board_eth_init(bd_t *bis)
+{
+       return bfin_EMAC_initialize(bis);
+}
+#endif
+
 #ifdef CONFIG_POST
 /* Using sw10-PF5 as the hotkey */
 int post_hotkeys_pressed(void)
@@ -227,11 +236,11 @@ int flash_post_test(int flags)
                erase_block_flash(n);
                printf("OK\r");
                printf("--------Program block:%2d...", n);
-               write_data(CFG_FLASH_BASE + offset, BLOCK_SIZE, pbuf);
+               write_data(CONFIG_SYS_FLASH_BASE + offset, BLOCK_SIZE, pbuf);
                printf("OK\r");
                printf("--------Verify  block:%2d...", n);
                for (i = 0; i < BLOCK_SIZE; i += 2) {
-                       if (*(unsigned short *)(CFG_FLASH_BASE + offset + i) !=
+                       if (*(unsigned short *)(CONFIG_SYS_FLASH_BASE + offset + i) !=
                            *temp++) {
                                value = 1;
                                result = 1;