Merge tag 'video-next' of https://gitlab.denx.de/u-boot/custodians/u-boot-video into...

[platform/kernel/u-boot.git] / board / freescale / c29xpcie / cpld.c

diff --git a/board/freescale/c29xpcie/cpld.c b/board/freescale/c29xpcie/cpld.c
index 5cbccff..826af42 100644 (file)
--- a/board/freescale/c29xpcie/cpld.c
+++ b/board/freescale/c29xpcie/cpld.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /**
  * Copyright 2013 Freescale Semiconductor
  * Author: Mingkai Hu <Mingkai.hu@freescale.com>
  *         Po Liu <Po.Liu@freescale.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * This file provides support for the board-specific CPLD used on some Freescale
  * reference boards.
  *
@@ -18,6 +17,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
+#include <linux/delay.h>
 
 #include "cpld.h"
 /**
@@ -89,7 +89,8 @@ static void cpld_dump_regs(void)
 }
 #endif
 
-int cpld_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+#ifndef CONFIG_SPL_BUILD
+int cpld_cmd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        int rc = 0;
        unsigned char value;
@@ -129,3 +130,4 @@ U_BOOT_CMD(
        "cpld_cmd dump - display the CPLD registers\n"
 #endif
        );
+#endif