From 435eab8c69441e2cfbc709529bd39ccdd155aaf7 Mon Sep 17 00:00:00 2001 From: Jun Zhu Date: Wed, 10 May 2017 16:24:07 +0800 Subject: imx-kobs: Pick up new commit as fix-compile patch is merged The patch is merged to the new version of imx-kobs. So pick up the new version and remove the patch file. Signed-off-by: Jun Zhu Signed-off-by: Otavio Salvador --- recipes-bsp/imx-kobs/imx-kobs/fix-compile.patch | 17 ----------------- recipes-bsp/imx-kobs/imx-kobs_git.bb | 7 +++---- 2 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 recipes-bsp/imx-kobs/imx-kobs/fix-compile.patch diff --git a/recipes-bsp/imx-kobs/imx-kobs/fix-compile.patch b/recipes-bsp/imx-kobs/imx-kobs/fix-compile.patch deleted file mode 100644 index 2ac73aef..00000000 --- a/recipes-bsp/imx-kobs/imx-kobs/fix-compile.patch +++ /dev/null @@ -1,17 +0,0 @@ -This patch fixes a build error with kernel includes (>= 4.4) must -be explicitly included to get uintX_t types. - -Upstream-Status: Pending - -Index: imx-kobs-5.4/src/BootControlBlocks.h -=================================================================== ---- imx-kobs-5.4.orig/src/BootControlBlocks.h -+++ imx-kobs-5.4/src/BootControlBlocks.h -@@ -54,6 +54,7 @@ - //! This structure holds the timing for the NAND. This data is used by - //! rom_nand_hal_GpmiSetNandTiming to setup the GPMI hardware registers. - -+#include - typedef struct _NAND_Timing { - uint8_t m_u8DataSetup; - uint8_t m_u8DataHold; diff --git a/recipes-bsp/imx-kobs/imx-kobs_git.bb b/recipes-bsp/imx-kobs/imx-kobs_git.bb index b228ab51..aab10f9c 100644 --- a/recipes-bsp/imx-kobs/imx-kobs_git.bb +++ b/recipes-bsp/imx-kobs/imx-kobs_git.bb @@ -1,4 +1,5 @@ # Copyright (C) 2013-2016 Freescale Semiconductor +# Copyright 2017 NXP SUMMARY = "Nand boot write source" SECTION = "base" @@ -6,11 +7,9 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" PV = "5.5+git${SRCPV}" -SRCREV = "b402243a04e5a6760a860445e5ff6a931d86f794" +SRCREV = "a2734b93759b4222f9dfa3f8c7645be9d39ea601" -SRC_URI = "git://github.com/NXPmicro/imx-kobs.git;protocal=https \ - file://fix-compile.patch \ -" +SRC_URI = "git://github.com/NXPmicro/imx-kobs.git;protocal=https" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf