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

[oweals/u-boot.git] / board / armltd / vexpress64 / vexpress64.c

diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c
index 2ec3bc9835c41bc8dcab9ee3c64d17155960ca5d..7cb4e0021f66099c4c2b4a3c51c846863f0dec8a 100644 (file)
--- a/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@ -11,9 +11,22 @@
 #include <netdev.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
+#include <dm/platdata.h>
+#include <dm/platform_data/serial_pl01x.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
+static const struct pl01x_serial_platdata serial_platdata = {
+       .base = V2M_UART0,
+       .type = TYPE_PL011,
+       .clock = CONFIG_PL011_CLOCK,
+};
+
+U_BOOT_DEVICE(vexpress_serials) = {
+       .name = "serial_pl01x",
+       .platdata = &serial_platdata,
+};
+
 int board_init(void)
 {
        return 0;
@@ -21,21 +34,10 @@ int board_init(void)
 
 int dram_init(void)
 {
-       /*
-        * Clear spin table so that secondary processors
-        * observe the correct value after waken up from wfe.
-        */
-       *(unsigned long *)CPU_RELEASE_ADDR = 0;
-
        gd->ram_size = PHYS_SDRAM_1_SIZE;
        return 0;
 }
 
-int timer_init(void)
-{
-       return 0;
-}
-
 /*
  * Board specific reset that is system reset.
  */
@@ -51,6 +53,9 @@ int board_eth_init(bd_t *bis)
        int rc = 0;
 #ifdef CONFIG_SMC91111
        rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
+#endif
+#ifdef CONFIG_SMC911X
+       rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
 #endif
        return rc;
 }