summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJun Zhu <junzhu@nxp.com>2017-05-10 16:24:07 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2017-05-22 22:27:03 -0300
commit435eab8c69441e2cfbc709529bd39ccdd155aaf7 (patch)
tree8243fa36d3fe738c20a010fab38abb137b97c38a
parentd03806baa9db93ff3e09ee18fd52a86a9ef2b598 (diff)
downloadmeta-freescale-435eab8c69441e2cfbc709529bd39ccdd155aaf7.tar.gz
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 <junzhu@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-bsp/imx-kobs/imx-kobs/fix-compile.patch17
-rw-r--r--recipes-bsp/imx-kobs/imx-kobs_git.bb7
2 files changed, 3 insertions, 21 deletions
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 @@
1This patch fixes a build error with kernel includes (>= 4.4) <stdint.h> must
2be explicitly included to get uintX_t types.
3
4Upstream-Status: Pending
5
6Index: imx-kobs-5.4/src/BootControlBlocks.h
7===================================================================
8--- imx-kobs-5.4.orig/src/BootControlBlocks.h
9+++ imx-kobs-5.4/src/BootControlBlocks.h
10@@ -54,6 +54,7 @@
11 //! This structure holds the timing for the NAND. This data is used by
12 //! rom_nand_hal_GpmiSetNandTiming to setup the GPMI hardware registers.
13
14+#include <stdint.h>
15 typedef struct _NAND_Timing {
16 uint8_t m_u8DataSetup;
17 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 @@
1# Copyright (C) 2013-2016 Freescale Semiconductor 1# Copyright (C) 2013-2016 Freescale Semiconductor
2# Copyright 2017 NXP
2 3
3SUMMARY = "Nand boot write source" 4SUMMARY = "Nand boot write source"
4SECTION = "base" 5SECTION = "base"
@@ -6,11 +7,9 @@ LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 7LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
7 8
8PV = "5.5+git${SRCPV}" 9PV = "5.5+git${SRCPV}"
9SRCREV = "b402243a04e5a6760a860445e5ff6a931d86f794" 10SRCREV = "a2734b93759b4222f9dfa3f8c7645be9d39ea601"
10 11
11SRC_URI = "git://github.com/NXPmicro/imx-kobs.git;protocal=https \ 12SRC_URI = "git://github.com/NXPmicro/imx-kobs.git;protocal=https"
12 file://fix-compile.patch \
13"
14 13
15S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
16 15