Discussion:
[meta-arago] [meta-processor-sdk][master][PATCH v2] ti-tisdk-makefile: Add ipc targets for top level make for k3
Sam Nelson
2018-10-08 17:50:45 UTC
Permalink
Also modify usage of source to "." to make it work with native shell
environment as well

Signed-off-by: Sam Nelson <***@ti.com>

---
Change from previous version of patch
- updated title
---
---
.../ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ti-ipc | 9 +++++----
recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bbappend | 3 +++
2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ti-ipc b/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ti-ipc
index e74660b..7f566cf 100644
--- a/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ti-ipc
+++ b/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ti-ipc
@@ -63,14 +63,14 @@ ti-ipc-linux: ti-ipc-rtos-path-check linux ti-ipc-linux-config
@echo =================================
@echo Building IPC
@echo =================================
- source $(ENV_SETUP); \
+ . $(ENV_SETUP); \
$(MAKE) -j $(MAKE_JOBS) -C $(IPC_INSTALL_PATH)

ti-ipc-linux_clean: ti-ipc-rtos-path-check ti-ipc-linux-config
@echo =================================
@echo Cleaning IPC
@echo =================================
- source $(ENV_SETUP); \
+ . $(ENV_SETUP); \
$(MAKE) -j $(MAKE_JOBS) -C $(IPC_INSTALL_PATH) clean

ti-ipc-linux_install: ti-ipc-rtos-path-check ti-ipc-linux
@@ -82,7 +82,7 @@ ti-ipc-linux_install: ti-ipc-rtos-path-check ti-ipc-linux
echo "Please run setup.sh in the SDK's root directory and then try again."; \
exit 1; \
fi
- source $(ENV_SETUP); \
+ . $(ENV_SETUP); \
$(MAKE) -j $(MAKE_JOBS) -C $(IPC_INSTALL_PATH) install DESTDIR=$(DESTDIR)

ti-ipc-linux-examples: ti-ipc-rtos-path-check
@@ -94,6 +94,7 @@ ti-ipc-linux-examples: ti-ipc-rtos-path-check
PLATFORM="$(IPC_PLATFORM)" \
KERNEL_INSTALL_DIR="$(LINUXKERNEL_INSTALL_DIR)" \
XDC_INSTALL_DIR="$(XDC_INSTALL_PATH)" \
+ PDK_INSTALL_DIR="$(PDK_INSTALL_PATH)/.." \
BIOS_INSTALL_DIR="$(BIOS_INSTALL_PATH)" \
IPC_INSTALL_DIR="$(IPC_INSTALL_PATH)" \
TOOLCHAIN_LONGNAME=$${TOOLCHAIN_SYS} \
@@ -119,7 +120,7 @@ ti-ipc-linux-examples_clean: ti-ipc-rtos-path-check
@echo =================================
@echo Cleaning the IPC Examples
@echo =================================
- source $(ENV_SETUP); \
+ . $(ENV_SETUP); \
$(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}/examples clean \
HOSTOS="linux" \
PLATFORM="$(IPC_PLATFORM)" \
diff --git a/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bbappend b/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bbappend
index 29e0e76..70289a8 100644
--- a/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bbappend
+++ b/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bbappend
@@ -18,6 +18,7 @@ SRC_URI_append_omap-a15 = " file://Makefile_big-data-ipc-demo"
MAKEFILES_MATRIX_GUI_omapl138 = ""

MAKEFILES_append_keystone = " ti-ipc"
+MAKEFILES_append_k3 = " ti-ipc"

MAKEFILES_append_k2g = " opencl-examples \
openmpacc-examples \
@@ -88,12 +89,14 @@ KERNEL_DEVICETREE_append_am57xx-hs-evm = " ${AM57XX_KERNEL_DEVICETREE}"

IPC_TOOLS_PATHS_C66 = "ti.targets.elf.C66="\$\(C6X_GEN_INSTALL_PATH\)""
IPC_TOOLS_PATHS_M4 = "ti.targets.arm.elf.M4="\$\(TOOLCHAIN_PATH_M4\)" ti.targets.arm.elf.M4F="\$\(TOOLCHAIN_PATH_M4\)""
+IPC_TOOLS_PATHS_R5F = "ti.targets.arm.elf.R5F="\$\(TOOLCHAIN_PATH_R5\)""
IPC_TOOLS_PATHS_C674 = "ti.targets.elf.C674="\$\(C6X_GEN_INSTALL_PATH\)""

IPC_TOOLS_PATHS = ""
IPC_TOOLS_PATHS_append_keystone = " ${IPC_TOOLS_PATHS_C66}"
IPC_TOOLS_PATHS_append_omap-a15 = " ${IPC_TOOLS_PATHS_C66} ${IPC_TOOLS_PATHS_M4}"
IPC_TOOLS_PATHS_append_omapl138 = " ${IPC_TOOLS_PATHS_C674}"
+IPC_TOOLS_PATHS_append_k3 = "${IPC_TOOLS_PATHS_R5F}"

do_install_append() {
sed -i -e "s/__IPC_TOOLS_PATHS__/${IPC_TOOLS_PATHS}/g" ${D}/Makefile
--
1.9.1
Loading...