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

[u-boot] / board / davinci / common / misc.c

diff --git a/board/davinci/common/misc.c b/board/davinci/common/misc.c
index 9fab76fa5d887a73056590f9c1e0aca9c1c77118..b60a46e96d2d60b5612f0ef6426420ca8ba84196 100644 (file)
--- a/board/davinci/common/misc.c
+++ b/board/davinci/common/misc.c
@@ -33,6 +33,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 int dram_init(void)
 {
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
@@ -40,6 +41,22 @@ int dram_init(void)
 
        return(0);
 }
+#else
+int dram_init(void)
+{
+       /* dram_init must store complete ramsize in gd->ram_size */
+       gd->ram_size = get_ram_size(
+                       (volatile void *)CONFIG_SYS_SDRAM_BASE,
+                       CONFIG_MAX_RAM_BANK_SIZE);
+       return 0;
+}
+
+void dram_init_banksize(void)
+{
+       gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+       gd->bd->bi_dram[0].size = gd->ram_size;
+}
+#endif
 
 #ifdef CONFIG_DRIVER_TI_EMAC
 
@@ -68,45 +85,22 @@ err:
        return 0;
 }
 
-/* If there is a MAC address in the environment, and if it is not identical to
- * the MAC address in the EEPROM, then a warning is printed and the MAC address
- * from the environment is used.
- *
+/*
  * If there is no MAC address in the environment, then it will be initialized
  * (silently) from the value in the EEPROM.
  */
-void dv_configure_mac_address(uint8_t *rom_enetaddr)
+void davinci_sync_env_enetaddr(uint8_t *rom_enetaddr)
 {
-       int i;
-       u_int8_t env_enetaddr[6];
-       char *tmp = getenv("ethaddr");
-       char *end;
-
-       /* Read Ethernet MAC address from the U-Boot environment.
-        * If it is not defined, env_enetaddr[] will be cleared. */
-       for (i = 0; i < 6; i++) {
-               env_enetaddr[i] = tmp ? simple_strtoul(tmp, &end, 16) : 0;
-               if (tmp)
-                       tmp = (*end) ? end+1 : end;
-       }
-
-       /* Check if EEPROM and U-Boot environment MAC addresses match. */
-       if (memcmp(env_enetaddr, "\0\0\0\0\0\0", 6) != 0 &&
-           memcmp(env_enetaddr, rom_enetaddr, 6) != 0) {
-               printf("Warning: MAC addresses don't match:\n");
-               printf("  EEPROM MAC address: %pM\n", rom_enetaddr);
-               printf("     \"ethaddr\" value: %pM\n", env_enetaddr) ;
-               debug("### Using MAC address from environment\n");
-       }
-       if (!tmp) {
-               char ethaddr[20];
+       uint8_t env_enetaddr[6];
 
+       eth_getenv_enetaddr_by_index(0, env_enetaddr);
+       if (!memcmp(env_enetaddr, "\0\0\0\0\0\0", 6)) {
                /* There is no MAC address in the environment, so we initialize
                 * it from the value in the EEPROM. */
-               sprintf(ethaddr, "%pM", rom_enetaddr) ;
-               debug("### Setting environment from EEPROM MAC address = \"%s\"\n",
-                     ethaddr);
-               setenv("ethaddr", ethaddr);
+               debug("### Setting environment from EEPROM MAC address = "
+                       "\"%pM\"\n",
+                       env_enetaddr);
+               eth_setenv_enetaddr("ethaddr", rom_enetaddr);
        }
 }
 
@@ -155,3 +149,34 @@ int davinci_configure_pin_mux(const struct pinmux_config *pins,
 
        return 0;
 }
+
+/*
+ * Configure multiple pinmux resources.
+ *
+ * Takes an pinmux_resource array of pinmux_config and pin counts:
+ *
+ * const struct pinmux_resource pinmuxes[] = {
+ *     PINMUX_ITEM(uart_pins),
+ *     PINMUX_ITEM(i2c_pins),
+ * };
+ *
+ * The number of items in the array must be passed (ARRAY_SIZE can provide
+ * this value conveniently).
+ *
+ * Each item entry is configured in the defined order. If configuration
+ * of any item fails, -1 is returned and none of the following items are
+ * configured. On success, 0 is returned.
+ */
+int davinci_configure_pin_mux_items(const struct pinmux_resource *item,
+                                   const int n_items)
+{
+       int i;
+
+       for (i = 0; i < n_items; i++) {
+               if (davinci_configure_pin_mux(item[i].pins,
+                                             item[i].n_pins) != 0)
+                       return -1;
+       }
+
+       return 0;
+}