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

[platform/kernel/u-boot.git] / board / pdm360ng / pdm360ng.c

diff --git a/board/pdm360ng/pdm360ng.c b/board/pdm360ng/pdm360ng.c
index 15f8f31..371bcd9 100644 (file)
--- a/board/pdm360ng/pdm360ng.c
+++ b/board/pdm360ng/pdm360ng.c
@@ -48,7 +48,7 @@ sdram_conf_t mddrc_config[] = {
        },
 };
 
-phys_size_t initdram (int board_type)
+int dram_init(void)
 {
        int i;
        u32 msize = 0;
@@ -95,7 +95,9 @@ phys_size_t initdram (int board_type)
                        break;
        }
 
-       return msize;
+       gd->ram_size = msize;
+
+       return 0;
 }
 
 static int set_lcd_brightness(char *);
@@ -167,36 +169,6 @@ int misc_init_r(void)
        clrsetbits_be32(&im->gpio.gpdat, 0x01000000, 0x00040000);
 #endif
 
-#if defined(CONFIG_HARD_I2C)
-       if (!getenv("ethaddr")) {
-               uchar buf[6];
-               uchar ifm_oui[3] = { 0, 2, 1, };
-               int ret;
-
-               /* I2C-0 for on-board eeprom */
-               i2c_set_bus_num(CONFIG_SYS_I2C_EEPROM_BUS_NUM);
-
-               /* Read ethaddr from EEPROM */
-               ret = i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR,
-                              CONFIG_SYS_I2C_EEPROM_MAC_OFFSET, 1, buf, 6);
-               if (ret != 0) {
-                       printf("Error: Unable to read MAC from I2C"
-                               " EEPROM at address %02X:%02X\n",
-                               CONFIG_SYS_I2C_EEPROM_ADDR,
-                               CONFIG_SYS_I2C_EEPROM_MAC_OFFSET);
-                       return 1;
-               }
-
-               /* Owned by IFM ? */
-               if (memcmp(buf, ifm_oui, sizeof(ifm_oui))) {
-                       printf("Illegal MAC address in EEPROM: %pM\n", buf);
-                       return 1;
-               }
-
-               eth_setenv_enetaddr("ethaddr", buf);
-       }
-#endif /* defined(CONFIG_HARD_I2C) */
-
        return 0;
 }
 
@@ -429,7 +401,7 @@ int checkboard (void)
        return 0;
 }
 
-#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
+#ifdef CONFIG_OF_BOARD_SETUP
 #ifdef CONFIG_FDT_FIXUP_PARTITIONS
 struct node_info nodes[] = {
        { "fsl,mpc5121-nfc",    MTD_DEV_TYPE_NAND, },
@@ -477,7 +449,7 @@ static unsigned char edid_buf[128] = {
 };
 #endif
 
-void ft_board_setup(void *blob, bd_t *bd)
+int ft_board_setup(void *blob, bd_t *bd)
 {
        u32 val[8];
        int rc, i = 0;
@@ -526,8 +498,10 @@ void ft_board_setup(void *blob, bd_t *bd)
        if (rc)
                printf("Unable to update flash reg property, err=%s\n",
                       fdt_strerror(rc));
+
+       return 0;
 }
-#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
+#endif /* CONFIG_OF_BOARD_SETUP */
 
 /*
  * If argument is NULL, set the LCD brightness to the