From 2bc872282b8ec6f90ef17013eb052f55f55659be Mon Sep 17 00:00:00 2001
From: Ye Li <ye.li@nxp.com>
Date: Tue, 14 Aug 2018 03:30:06 -0700
Subject: [PATCH] MLK-19218 imx8qm/qxp: spl: Fix build break in SPL build

Get such build error below due to the changes in tcpc.h
(MLK-19181-2: i.MX850: SPL enable usb support).
Fix the issue by removing unused tcpc and usb header files from spl.c

spl/board/freescale/imx8qxp_mek/spl.o: In function `tcpc_setup_ufp_mode':
spl.c:(.text.tcpc_setup_ufp_mode+0x0): multiple definition of `tcpc_setup_ufp_mode'
spl/board/freescale/imx8qxp_mek/imx8qxp_mek.o:imx8qxp_mek.c:(.text.tcpc_setup_ufp_mode+0x0): first defined here
spl/board/freescale/imx8qxp_mek/spl.o: In function `tcpc_setup_dfp_mode':
spl.c:(.text.tcpc_setup_dfp_mode+0x0): multiple definition of `tcpc_setup_dfp_mode'
spl/board/freescale/imx8qxp_mek/imx8qxp_mek.o:/home/leyoen/Workspace/u-boot-upgrading/u-boot/board/freescale/imx8qxp_mek/imx8qxp_mek.c:547: first defined here
scripts/Makefile.build:359: recipe for target 'spl/board/freescale/imx8qxp_mek/built-in.o' failed

Signed-off-by: Ye Li <ye.li@nxp.com>
---
 board/freescale/imx8qm_arm2/spl.c | 2 --
 board/freescale/imx8qxp_mek/spl.c | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/board/freescale/imx8qm_arm2/spl.c b/board/freescale/imx8qm_arm2/spl.c
index de5c2ebb96..7538a9bfb6 100644
--- a/board/freescale/imx8qm_arm2/spl.c
+++ b/board/freescale/imx8qm_arm2/spl.c
@@ -29,8 +29,6 @@
 #include <asm/mach-imx/video.h>
 #include <asm/arch/video_common.h>
 #include <power-domain.h>
-#include "../common/tcpc.h"
-#include <cdns3-uboot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c
index 4f349babab..03f92f67ae 100644
--- a/board/freescale/imx8qxp_mek/spl.c
+++ b/board/freescale/imx8qxp_mek/spl.c
@@ -29,9 +29,6 @@
 #include <asm/mach-imx/video.h>
 #include <asm/arch/video_common.h>
 #include <power-domain.h>
-#include "../common/tcpc.h"
-#include <cdns3-uboot.h>
-
 
 
 DECLARE_GLOBAL_DATA_PTR;