diff options
| -rw-r--r-- | recipes-bsp/boot-monitor/boot-monitor_git.bb | 3 | ||||
| -rw-r--r-- | recipes-bsp/boot-monitor/files/0001-makedefs-Fix-issue-with-setting-CHECK-and-VERBOSE.patch | 42 |
2 files changed, 1 insertions, 44 deletions
diff --git a/recipes-bsp/boot-monitor/boot-monitor_git.bb b/recipes-bsp/boot-monitor/boot-monitor_git.bb index e4ea67f6..1b6f3206 100644 --- a/recipes-bsp/boot-monitor/boot-monitor_git.bb +++ b/recipes-bsp/boot-monitor/boot-monitor_git.bb @@ -8,7 +8,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "u-boot-mkimage-native" SRC_URI = "git://git.ti.com/processor-firmware/ks2-boot-monitor.git;protocol=git;branch=${BRANCH}" -SRC_URI += "file://0001-makedefs-Fix-issue-with-setting-CHECK-and-VERBOSE.patch" PV = "4.0+git${SRCPV}" @@ -16,7 +15,7 @@ BRANCH = "master" S = "${WORKDIR}/git" -SRCREV = "d7b2bbd419400228da621f445526e519b56aef93" +SRCREV = "e1f885ab6dc544884728e333cc6e396f7eb08286" BOOT_MONITOR_IMAGE ?= "skern-${BOOT_MONITOR_MAKE_TARGET}.bin" diff --git a/recipes-bsp/boot-monitor/files/0001-makedefs-Fix-issue-with-setting-CHECK-and-VERBOSE.patch b/recipes-bsp/boot-monitor/files/0001-makedefs-Fix-issue-with-setting-CHECK-and-VERBOSE.patch deleted file mode 100644 index ae6d25ca..00000000 --- a/recipes-bsp/boot-monitor/files/0001-makedefs-Fix-issue-with-setting-CHECK-and-VERBOSE.patch +++ /dev/null @@ -1,42 +0,0 @@ -From f22f18d426c8f5b70c0bce9ac6015c067c46f5ad Mon Sep 17 00:00:00 2001 -From: Dan Murphy <dmurphy@ti.com> -Date: Mon, 24 Apr 2017 17:02:56 -0500 -Subject: [PATCH] makedefs: Fix issue with setting CHECK and VERBOSE - -Within the ifndef tabs are not allowed. These need -to be converted to spaces. Without this CHECK is always -set and sparse is expected to be installed. - -Fixes: aba308b9868d ("Makefile: Use OBJROOT for build output to enable out-of-tree builds") -Reported-by: Denys Dmytriyenko <denys@ti.com> -Signed-off-by: Dan Murphy <dmurphy@ti.com> -Signed-off-by: Denys Dmytriyenko <denys@ti.com> ---- - makedefs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/makedefs b/makedefs -index 1c4e2a5..ab710c3 100644 ---- a/makedefs -+++ b/makedefs -@@ -58,7 +58,7 @@ ifeq ("$(origin C)", "command line") - endif - - ifndef VERBOSE -- export VERBOSE=0 -+ export VERBOSE=0 - endif - - ifeq ($(VERBOSE),1) -@@ -69,7 +69,7 @@ else - endif - - ifndef CHECK -- export CHECK=0 -+ export CHECK=0 - endif - - Q_CC=$(Q:@=@echo ' CC '$@;)$(CC) --- -2.7.4 - |