From f06d0e3c62f879c66292cde0fcd3f1de7ecca149 Mon Sep 17 00:00:00 2001
From: Alexandru Palalau <ioan-alexandru.palalau@nxp.com>
Date: Thu, 23 May 2019 14:44:24 +0300
Subject: [PATCH] imx-test: Switch to branch imx_4.14.98_2.0.0_ga

Signed-off-by: Alexandru Palalau <ioan-alexandru.palalau@nxp.com>
---
 ...efile-Add-include-path-to-CC-command.patch | 27 -------------------
 recipes-bsp/imx-test/imx-test_git.bb          | 26 ++++++++----------
 2 files changed, 11 insertions(+), 42 deletions(-)
 delete mode 100644 recipes-bsp/imx-test/imx-test/0001-test-Makefile-Add-include-path-to-CC-command.patch

diff --git a/recipes-bsp/imx-test/imx-test/0001-test-Makefile-Add-include-path-to-CC-command.patch b/recipes-bsp/imx-test/imx-test/0001-test-Makefile-Add-include-path-to-CC-command.patch
deleted file mode 100644
index 8387a17c..00000000
--- a/recipes-bsp/imx-test/imx-test/0001-test-Makefile-Add-include-path-to-CC-command.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d289d905c64882c58e3b99f74f68e72f9100115e Mon Sep 17 00:00:00 2001
-From: Fabio Berton <fabio.berton@ossystems.com.br>
-Date: Tue, 12 Jun 2018 14:58:40 -0300
-Subject: [PATCH] test/Makefile: Add include path to CC command
-Organization: O.S. Systems Software LTDA.
-
-Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
----
- test/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/Makefile b/test/Makefile
-index f1cfa2a..4f14d2c 100644
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -12,7 +12,7 @@ ALL_OBJS :=
- 
- %.o: %.c
- 	@echo "	CC	$@"
--	$(Q)$(CC) -c $(CFLAGS) $< -o $@
-+	$(Q)$(CC) -c $(CFLAGS) $(INC) $< -o $@
- 
- 
- # This creates the build and copy rules for one executable. Because we
--- 
-2.17.1
-
diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb
index bf55f7df..084a2b04 100644
--- a/recipes-bsp/imx-test/imx-test_git.bb
+++ b/recipes-bsp/imx-test/imx-test_git.bb
@@ -1,6 +1,6 @@
-# Copyright (C) 2012-2018 O.S. Systems Software LTDA.
+# Copyright (C) 2012-2016 O.S. Systems Software LTDA.
 # Copyright (C) 2013-2016 Freescale Semiconductor
-# Copyright 2017-2018 NXP
+# Copyright (C) 2017-2019 NXP
 
 SUMMARY = "Test programs for i.MX BSP"
 DESCRIPTION = "Unit tests for the i.MX BSP"
@@ -16,13 +16,12 @@ DEPENDS_append_imxvpu = " virtual/imxvpu"
 PE = "1"
 PV = "7.0+${SRCPV}"
 
-SRCBRANCH = "imx_4.9.123_imx8mm_ga"
+SRCBRANCH = "imx_4.14.98_2.0.0_ga"
 SRC_URI = " \
     git://source.codeaurora.org/external/imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \
-    file://0001-test-Makefile-Add-include-path-to-CC-command.patch \
     file://memtool_profile \
 "
-SRCREV = "2cc785f94e5ee8782083d941e6aef24952cc2a38"
+SRCREV = "d32727a9d7ef2543729c149a713db24b8f5c2aa8"
 S = "${WORKDIR}/git"
 
 inherit module-base use-imx-headers
@@ -30,15 +29,15 @@ inherit module-base use-imx-headers
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
-PLATFORM_mx6q   = "IMX6Q"
-PLATFORM_mx6dl  = "IMX6Q"
-PLATFORM_mx6sl  = "IMX6SL"
+PLATFORM_mx6q  = "IMX6Q"
+PLATFORM_mx6dl = "IMX6Q"
+PLATFORM_mx6sl = "IMX6SL"
 PLATFORM_mx6sll = "IMX6SL"
-PLATFORM_mx6sx  = "IMX6SX"
-PLATFORM_mx6ul  = "IMX6UL"
-PLATFORM_mx7d   = "IMX7D"
+PLATFORM_mx6sx = "IMX6SX"
+PLATFORM_mx6ul = "IMX6UL"
+PLATFORM_mx7d  = "IMX7D"
 PLATFORM_mx7ulp = "IMX7D"
-PLATFORM_mx8    = "IMX8"
+PLATFORM_mx8 = "IMX8"
 
 PARALLEL_MAKE = "-j 1"
 EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
@@ -49,9 +48,6 @@ PACKAGECONFIG_append_imxvpu = " vpu"
 PACKAGECONFIG[x11] = ",,libx11 libxdamage libxrender libxrandr"
 PACKAGECONFIG[vpu] = "HAS_VPU=true,HAS_VPU=false,virtual/imxvpu"
 
-# FIXME: NXP should fix the possible string flaws from their code.
-SECURITY_STRINGFORMAT = ""
-
 do_compile() {
     CFLAGS="${TOOLCHAIN_OPTIONS}"
     oe_runmake V=1 VERBOSE='' \
-- 
2.40.1