Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / board / engicam / common / spl.c

diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c
index 1a1fe6c66a45d1b277af567f044a05b465163222..6a0612481a8adebd7e21af19f0db748cd232ed82 100644 (file)
--- a/board/engicam/common/spl.c
+++ b/board/engicam/common/spl.c
@@ -6,7 +6,11 @@
  */
 
 #include <common.h>
+#include <image.h>
+#include <init.h>
+#include <serial.h>
 #include <spl.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 #include <asm/gpio.h>
@@ -414,7 +418,8 @@ void board_init_f(ulong dummy)
        /* setup AIPS and disable watchdog */
        arch_cpu_init();
 
-       gpr_init();
+       if (!(is_mx6ul()))
+               gpr_init();
 
        /* iomux */
        SETUP_IOMUX_PADS(uart_pads);