From 7a5f0d251dbefa3758f9691c23033187f635ecf7 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 1 Dec 2015 11:25:56 +0000 Subject: pa-lld: set sane defaults when platform is not defined Also fix this build error: | makefile_armv7:27: *** missing separator. Stop. Signed-off-by: Denys Dmytriyenko --- ...akefile_armv7-fix-missing-separator-error.patch | 30 ++++++++++++++++++++++ recipes-bsp/pa-lld/pa-lld.inc | 7 +++-- recipes-bsp/pa-lld/pa-lld_git.bb | 2 +- 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 recipes-bsp/pa-lld/files/0001-makefile_armv7-fix-missing-separator-error.patch diff --git a/recipes-bsp/pa-lld/files/0001-makefile_armv7-fix-missing-separator-error.patch b/recipes-bsp/pa-lld/files/0001-makefile_armv7-fix-missing-separator-error.patch new file mode 100644 index 00000000..2ff41d3d --- /dev/null +++ b/recipes-bsp/pa-lld/files/0001-makefile_armv7-fix-missing-separator-error.patch @@ -0,0 +1,30 @@ +From 60a938e6902c7cb8bec34abbc5a3723c8094d728 Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko +Date: Tue, 1 Dec 2015 00:00:00 -0500 +Subject: [PATCH] makefile_armv7: fix missing separator error + +Doesn't seem to work in all versions of Make, fails like this: +makefile_armv7:27: *** missing separator. Stop. + +Signed-off-by: Denys Dmytriyenko +--- + makefile_armv7 | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/makefile_armv7 b/makefile_armv7 +index a2bc4f6..1ae6e0a 100644 +--- a/makefile_armv7 ++++ b/makefile_armv7 +@@ -24,9 +24,6 @@ else + export LLD_NAME=pa + endif + +-echo DEVICE=$(DEVICE) +-echo LLD_NAME=$(LLD_NAME) +- + # Output for prebuilt generated libraries + export ARMV7LIBDIR ?= ./lib + export ARMV7OBJDIR ?= ./obj/$(DEVICE) +-- +2.2.0 + diff --git a/recipes-bsp/pa-lld/pa-lld.inc b/recipes-bsp/pa-lld/pa-lld.inc index 082d59d0..396278d4 100644 --- a/recipes-bsp/pa-lld/pa-lld.inc +++ b/recipes-bsp/pa-lld/pa-lld.inc @@ -13,18 +13,21 @@ PA_LLD_GIT_DESTSUFFIX = "git/ti/drv/pa" PA_LLD_SRCREV = "ae3aa3e80ecf64fe5a16515d134a6bc217220e2e" BRANCH = "${PA_LLD_GIT_BRANCH}" -SRC_URI = "${PA_LLD_GIT_URI};destsuffix=${PA_LLD_GIT_DESTSUFFIX};protocol=${PA_LLD_GIT_PROTOCOL};branch=${BRANCH}" +SRC_URI = "${PA_LLD_GIT_URI};destsuffix=${PA_LLD_GIT_DESTSUFFIX};protocol=${PA_LLD_GIT_PROTOCOL};branch=${BRANCH} \ + file://0001-makefile_armv7-fix-missing-separator-error.patch" SRCREV = "${PA_LLD_SRCREV}" PV = "03.00.01.05" -INC_PR = "r2" +INC_PR = "r3" S = "${WORKDIR}/${PA_LLD_GIT_DESTSUFFIX}" +DEVICELIST = "k2h k2k k2l k2e" DEVICELIST_k2hk-evm = "k2h k2k" DEVICELIST_k2l-evm = "k2l" DEVICELIST_k2e-evm = "k2e" +LIBPA = "libpa" LIBPA_k2hk-evm = "libpa" LIBPA_k2e-evm = "libpa2" LIBPA_k2l-evm = "libpa2" diff --git a/recipes-bsp/pa-lld/pa-lld_git.bb b/recipes-bsp/pa-lld/pa-lld_git.bb index 501ee2d9..f6de5b15 100644 --- a/recipes-bsp/pa-lld/pa-lld_git.bb +++ b/recipes-bsp/pa-lld/pa-lld_git.bb @@ -10,7 +10,7 @@ do_compile () { # Now build the lld in the updated directory for device in ${DEVICELIST} do - make -f makefile_armv7 DEVICE=$device lib PDK_INSTALL_PATH=${STAGING_INCDIR} + make -f makefile_armv7 lib PDK_INSTALL_PATH=${STAGING_INCDIR} DEVICE="$device" done } -- cgit v1.2.3-54-g00ecf