From 682c00566aa3cf0deeff0cfd349494f078f38a04 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Fri, 12 Jun 2020 19:13:07 +0800 Subject: atf: remove two obsolete patches 0001-fix-fiptool-build-error.patch fixes below issue: | gcc fiptool.o tbbr_config.o -o fiptool -lcrypto | /opt/ci/yocto/dunfell/bld-lx2160ardb/tmp/hosttools/ld: cannot find -lcrypto | collect2: error: ld returned 1 exit status | Makefile:39: recipe for target 'fiptool' failed | make[1]: *** [fiptool] Error 1 The issue was fixed in atf_git.bb in below commit from meta-freescale: commit: fa4994b2d8da73fd3ae30875b3af8d7a682cdd53 author: Daniel Klauer atf: Fix builds of native tools during build process 0001-Makefile-add-CC-gcc.patch fixes below issue: | byte_swap.c:9:10: fatal error: stdio.h: No such file or directory | 9 | #include | | ^~~~~~~~~ | compilation terminated. | create_pbl.c:10:10: fatal error: stdio.h: No such file or directory | 10 | #include | | ^~~~~~~~~ | compilation terminated. The issue was fixed in atf source code: commit: 9aae9712ec09ddeae528a1896247e5c432a6a19f author: Biwen Li plat/nxp/tools: fix a makefiles bug that will use default implicit rules build and test have no problem without them. Signed-off-by: Ting Liu --- recipes-bsp/atf/atf/0001-Makefile-add-CC-gcc.patch | 28 ---------------------- .../atf/atf/0001-fix-fiptool-build-error.patch | 28 ---------------------- recipes-bsp/atf/atf_git.bb | 4 ---- 3 files changed, 60 deletions(-) delete mode 100644 recipes-bsp/atf/atf/0001-Makefile-add-CC-gcc.patch delete mode 100644 recipes-bsp/atf/atf/0001-fix-fiptool-build-error.patch (limited to 'recipes-bsp') diff --git a/recipes-bsp/atf/atf/0001-Makefile-add-CC-gcc.patch b/recipes-bsp/atf/atf/0001-Makefile-add-CC-gcc.patch deleted file mode 100644 index efa2749e..00000000 --- a/recipes-bsp/atf/atf/0001-Makefile-add-CC-gcc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3161524085339ae214f7dee17a98ccd6c442d66b Mon Sep 17 00:00:00 2001 -From: Chunrong Guo -Date: Thu, 16 Aug 2018 17:38:04 +0800 -Subject: [PATCH] Makefile: add CC=gcc - - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Chunrong Guo ---- - plat/nxp/tools/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/plat/nxp/tools/Makefile b/plat/nxp/tools/Makefile -index e648fd1..43d3b56 100644 ---- a/plat/nxp/tools/Makefile -+++ b/plat/nxp/tools/Makefile -@@ -32,6 +32,7 @@ endif - INCLUDE_PATHS := - - HOSTCC ?= gcc -+CC = gcc - - .PHONY: all clean distclean - --- -2.7.4 - diff --git a/recipes-bsp/atf/atf/0001-fix-fiptool-build-error.patch b/recipes-bsp/atf/atf/0001-fix-fiptool-build-error.patch deleted file mode 100644 index ffd9965a..00000000 --- a/recipes-bsp/atf/atf/0001-fix-fiptool-build-error.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a76ae26fdb673613f5f97872b7275c630b7b24b8 Mon Sep 17 00:00:00 2001 -From: BJ DevOps Team -Date: Wed, 16 May 2018 13:26:45 +0800 -Subject: [PATCH] fix fiptool build error - -Upstream-Status: Inappropriate [embedded specific] - ---- - tools/fiptool/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile -index e0e3923..f213f44 100644 ---- a/tools/fiptool/Makefile -+++ b/tools/fiptool/Makefile -@@ -19,7 +19,8 @@ ifeq (${DEBUG},1) - else - CFLAGS += -O2 - endif --LDLIBS := -lcrypto -+ -+LDLIBS := -Wl,-rpath=${LIBPATH}/usr/lib -L${LIBPATH}/usr/lib -lcrypto - - ifeq (${V},0) - Q := @ --- -1.8.3.1 - diff --git a/recipes-bsp/atf/atf_git.bb b/recipes-bsp/atf/atf_git.bb index dcc3689a..a93cb804 100644 --- a/recipes-bsp/atf/atf_git.bb +++ b/recipes-bsp/atf/atf_git.bb @@ -14,10 +14,6 @@ S = "${WORKDIR}/git" SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/atf;nobranch=1" SRCREV = "7d748e6f0ec652ba7c43733dc67a3d0b0217390a" -SRC_URI += "file://0001-fix-fiptool-build-error.patch \ - file://0001-Makefile-add-CC-gcc.patch \ -" - COMPATIBLE_MACHINE = "(qoriq)" PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3-54-g00ecf