common: Drop asm/global_data.h from common header

[u-boot.git] / board / cavium / thunderx / thunderx.c

diff --git a/board/cavium/thunderx/thunderx.c b/board/cavium/thunderx/thunderx.c
index 02253af5d9ffa3e12523da8713f77c012759e3e6..b09f72cad5c342c7f55a37d25e1032991aa8e936 100644 (file)
--- a/board/cavium/thunderx/thunderx.c
+++ b/board/cavium/thunderx/thunderx.c
@@ -1,13 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0+
 /**
  * (C) Copyright 2014, Cavium Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
 **/
 
 #include <common.h>
+#include <cpu_func.h>
 #include <dm.h>
+#include <init.h>
 #include <malloc.h>
 #include <errno.h>
+#include <net.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 
 #include <cavium/atf.h>
@@ -16,28 +19,28 @@
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
 #include <dm/platform_data/serial_pl01x.h>
 
-static const struct pl01x_serial_platdata serial0 = {
+static const struct pl01x_serial_plat serial0 = {
        .base = CONFIG_SYS_SERIAL0,
        .type = TYPE_PL011,
        .clock = 0,
        .skip_init = true,
 };
 
-U_BOOT_DEVICE(thunderx_serial0) = {
+U_BOOT_DRVINFO(thunderx_serial0) = {
        .name = "serial_pl01x",
-       .platdata = &serial0,
+       .plat = &serial0,
 };
 
-static const struct pl01x_serial_platdata serial1 = {
+static const struct pl01x_serial_plat serial1 = {
        .base = CONFIG_SYS_SERIAL1,
        .type = TYPE_PL011,
        .clock = 0,
        .skip_init = true,
 };
 
-U_BOOT_DEVICE(thunderx_serial1) = {
+U_BOOT_DRVINFO(thunderx_serial1) = {
        .name = "serial_pl01x",
-       .platdata = &serial1,
+       .plat = &serial1,
 };
 #endif
 
@@ -114,7 +117,7 @@ void reset_cpu(ulong addr)
 /*
  * Board specific ethernet initialization routine.
  */
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
        int rc = 0;