* [meta-processor-sdk][PATCH v3] ti-tisdk-makefile: Update to fix issue with ipc builds from linux
@ 2018-06-13 18:50 Sam Nelson
2018-06-14 16:49 ` [EXTERNAL] " Jacob Stiffler
0 siblings, 1 reply; 5+ messages in thread
From: Sam Nelson @ 2018-06-13 18:50 UTC (permalink / raw)
To: meta-arago
setupenv.sh in PRSDK is getting deprecated and all the definitions moved
to Rules.make. With this change, Rules.make from RTOS package is
directly used.
Signed-off-by: Sam Nelson <sam.nelson@ti.com>
---
Changes from previous version of patch
Move RTOS related defines into existing ifneq statement
Remove export of IPC related variables
Update other uses of IPC_INSTALL_PATH
---
---
.../ti-tisdk-makefile/Makefile_big-data-ipc-demo | 21 ++++-----
.../ti-tisdk-makefile/Makefile_ti-ipc | 50 ++++++++++------------
.../ti-tisdk-makefile_1.0.bbappend | 6 +--
3 files changed, 33 insertions(+), 44 deletions(-)
diff --git a/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-data-ipc-demo b/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-data-ipc-demo
index 32bb398..ea6ae34 100644
--- a/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-data-ipc-demo
+++ b/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-data-ipc-demo
@@ -19,14 +19,12 @@ big-data-ipc-demo-linux:
@echo Building the big data ipc demo: Linux host
@echo ==================================================
@cd example-applications; cd `find . -name "*big-data-ipc-demo-linux*"`; \
- SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
- source $(ENV_SETUP); \
- make -j $(MAKE_JOBS) host_linux \
- PLATFORM="$${IPC_PLATFORM}" \
+ $(MAKE) -j $(MAKE_JOBS) host_linux \
+ PLATFORM="$(IPC_PLATFORM)" \
KERNEL_INSTALL_DIR="$(LINUXKERNEL_INSTALL_DIR)" \
- XDC_INSTALL_DIR="$${XDC_INSTALL_PATH}" \
- BIOS_INSTALL_DIR="$${BIOS_INSTALL_PATH}" \
- IPC_INSTALL_DIR="$${IPC_INSTALL_PATH}" \
+ XDC_INSTALL_DIR="$(XDC_INSTALL_PATH)" \
+ BIOS_INSTALL_DIR="$(BIOS_INSTALL_PATH)" \
+ IPC_INSTALL_DIR="$(IPC_INSTALL_PATH)" \
TOOLCHAIN_LONGNAME=$${TOOLCHAIN_SYS} \
TOOLCHAIN_INSTALL_DIR=$${SDK_PATH_NATIVE}/usr \
TOOLCHAIN_PREFIX=$(CROSS_COMPILE) \
@@ -44,17 +42,14 @@ big-data-ipc-demo-linux_install:
fi
@cd example-applications; \
cd `find . -name "*big-data-ipc-demo-linux*"`; \
- SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
- source $(ENV_SETUP); \
$(MAKE) -j $(MAKE_JOBS) install_linux_bin DESTDIR=$(DESTDIR) \
- PLATFORM="$${IPC_PLATFORM}"
+ PLATFORM="$(IPC_PLATFORM)"
big-data-ipc-demo-linux_clean:
@echo ==================================================
@echo Cleaning the big data ipc demo: Linux host
@echo ==================================================
@cd example-applications; cd `find . -name "*big-data-ipc-demo-linux*"`; \
- SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
- source $(ENV_SETUP); \
$(MAKE) -j $(MAKE_JOBS) clean_linux \
- PLATFORM="$${IPC_PLATFORM}"
+ PLATFORM="$(IPC_PLATFORM)"
+
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 f1721c7..f015b24 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
@@ -8,6 +8,13 @@ ifneq ($(TI_RTOS_PATH),)
TI_RTOS_PATH_ABS := $(realpath $(TI_RTOS_PATH))
+ TI_PRSDK_PATH=$(TI_RTOS_PATH_ABS)/processor_sdk_rtos_$(PRSDK_PLATFORM)_$(PRSDK_VERSION)
+ SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS)
+ include $(TI_PRSDK_PATH)/Rules.make
+
+ IPC_TOOLS_PATHS= ti.targets.elf.C66="${C6X_GEN_INSTALL_PATH}" ti.targets.arm.elf.M4="${TOOLCHAIN_PATH_M4}" ti.targets.arm.elf.M4F="${TOOLCHAIN_PATH_M4}"
+
+
else
TI_IPC_TARGETS = ti-ipc-rtos-missing
endif
@@ -15,10 +22,6 @@ endif
TI_IPC_CLEAN = $(addsuffix _clean, $(TI_IPC_TARGETS))
TI_IPC_INSTALL = $(addsuffix _install, $(TI_IPC_TARGETS))
-export TI_PRSDK_PATH=$(TI_RTOS_PATH_ABS)/processor_sdk_rtos_$(PRSDK_PLATFORM)_$(PRSDK_VERSION)
-
-export IPC_TOOLS_PATHS=__IPC_TOOLS_PATHS__
-
ti-ipc-rtos-missing ti-ipc-rtos-missing_clean ti-ipc-rtos-missing_install:
@echo
@echo ===========================================================
@@ -48,13 +51,12 @@ ti-ipc-linux-config: ti-ipc-rtos-path-check
@echo =================================
@echo Configuring IPC
@echo =================================
- SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
. $(ENV_SETUP); \
- cd $${IPC_INSTALL_PATH}; \
- ./configure $${CONFIGURE_FLAGS} \
+ cd $(IPC_INSTALL_PATH); \
+ ./configure $${CONFIGURE_FLAGS} \
CC=$${CC} \
--prefix=/usr \
- PLATFORM=$${IPC_PLATFORM} \
+ PLATFORM=$(IPC_PLATFORM) \
KERNEL_INSTALL_DIR=$(LINUXKERNEL_INSTALL_DIR)
@@ -62,17 +64,15 @@ ti-ipc-linux: ti-ipc-rtos-path-check linux ti-ipc-linux-config
@echo =================================
@echo Building IPC
@echo =================================
- SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
source $(ENV_SETUP); \
- $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}
+ $(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 =================================
- SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
source $(ENV_SETUP); \
- $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH} clean
+ $(MAKE) -j $(MAKE_JOBS) -C $(IPC_INSTALL_PATH) clean
ti-ipc-linux_install: ti-ipc-rtos-path-check ti-ipc-linux
@echo =================================
@@ -83,23 +83,20 @@ 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
- SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
source $(ENV_SETUP); \
- $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH} install DESTDIR=$(DESTDIR)
+ $(MAKE) -j $(MAKE_JOBS) -C $(IPC_INSTALL_PATH) install DESTDIR=$(DESTDIR)
ti-ipc-linux-examples: ti-ipc-rtos-path-check
@echo =================================
@echo Building the IPC Examples
@echo =================================
- SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
- source $(ENV_SETUP); \
$(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}/examples \
HOSTOS="linux" \
- PLATFORM="$${IPC_PLATFORM}" \
+ PLATFORM="$(IPC_PLATFORM)" \
KERNEL_INSTALL_DIR="$(LINUXKERNEL_INSTALL_DIR)" \
- XDC_INSTALL_DIR="$${XDC_INSTALL_PATH}" \
- BIOS_INSTALL_DIR="$${BIOS_INSTALL_PATH}" \
- IPC_INSTALL_DIR="$${IPC_INSTALL_PATH}" \
+ XDC_INSTALL_DIR="$(XDC_INSTALL_PATH)" \
+ BIOS_INSTALL_DIR="$(BIOS_INSTALL_PATH)" \
+ IPC_INSTALL_DIR="$(IPC_INSTALL_PATH)" \
TOOLCHAIN_LONGNAME=$${TOOLCHAIN_SYS} \
TOOLCHAIN_INSTALL_DIR=$${SDK_PATH_NATIVE}/usr \
TOOLCHAIN_PREFIX=$(CROSS_COMPILE) \
@@ -114,26 +111,23 @@ ti-ipc-linux-examples_install: ti-ipc-rtos-path-check ti-ipc-linux-examples
echo "Please run setup.sh in the SDK's root directory and then try again."; \
exit 1; \
fi
- SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
- source $(ENV_SETUP); \
$(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}/examples install \
HOSTOS="linux" \
- PLATFORM="$${IPC_PLATFORM}" \
+ PLATFORM="$(IPC_PLATFORM)" \
EXEC_DIR="$(EXEC_DIR)"
ti-ipc-linux-examples_clean: ti-ipc-rtos-path-check
@echo =================================
@echo Cleaning the IPC Examples
@echo =================================
- SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
source $(ENV_SETUP); \
$(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}/examples clean \
HOSTOS="linux" \
- PLATFORM="$${IPC_PLATFORM}" \
+ PLATFORM="$(IPC_PLATFORM)" \
KERNEL_INSTALL_DIR="$(LINUXKERNEL_INSTALL_DIR)" \
- XDC_INSTALL_DIR="$${XDC_INSTALL_PATH}" \
- BIOS_INSTALL_DIR="$${BIOS_INSTALL_PATH}" \
- IPC_INSTALL_DIR="$${IPC_INSTALL_PATH}" \
+ XDC_INSTALL_DIR="$(XDC_INSTALL_PATH)" \
+ BIOS_INSTALL_DIR="$(BIOS_INSTALL_PATH)" \
+ IPC_INSTALL_DIR="$(IPC_INSTALL_PATH)" \
TOOLCHAIN_LONGNAME=$${TOOLCHAIN_SYS} \
TOOLCHAIN_INSTALL_DIR=$${SDK_PATH_NATIVE}/usr \
TOOLCHAIN_PREFIX=$(CROSS_COMPILE) \
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 27a8b2b..b7399c7 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
@@ -71,9 +71,9 @@ KERNEL_DEVICETREE_append_am57xx-evm = " \
"
-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_C674 = "ti.targets.elf.C674="\$\${C6X_GEN_INSTALL_PATH}""
+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_C674 = "ti.targets.elf.C674="\$\(C6X_GEN_INSTALL_PATH\)""
IPC_TOOLS_PATHS = ""
IPC_TOOLS_PATHS_append_keystone = " ${IPC_TOOLS_PATHS_C66}"
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [EXTERNAL] [meta-processor-sdk][PATCH v3] ti-tisdk-makefile: Update to fix issue with ipc builds from linux
2018-06-13 18:50 [meta-processor-sdk][PATCH v3] ti-tisdk-makefile: Update to fix issue with ipc builds from linux Sam Nelson
@ 2018-06-14 16:49 ` Jacob Stiffler
2018-06-14 17:58 ` Nelson, Sam
0 siblings, 1 reply; 5+ messages in thread
From: Jacob Stiffler @ 2018-06-14 16:49 UTC (permalink / raw)
To: Sam Nelson, meta-arago
On 6/13/2018 2:50 PM, Sam Nelson wrote:
> setupenv.sh in PRSDK is getting deprecated and all the definitions moved
> to Rules.make. With this change, Rules.make from RTOS package is
> directly used.
>
> Signed-off-by: Sam Nelson <sam.nelson@ti.com>
>
> ---
> Changes from previous version of patch
> Move RTOS related defines into existing ifneq statement
> Remove export of IPC related variables
> Update other uses of IPC_INSTALL_PATH
> ---
> ---
> .../ti-tisdk-makefile/Makefile_big-data-ipc-demo | 21 ++++-----
> .../ti-tisdk-makefile/Makefile_ti-ipc | 50 ++++++++++------------
> .../ti-tisdk-makefile_1.0.bbappend | 6 +--
> 3 files changed, 33 insertions(+), 44 deletions(-)
>
> diff --git a/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-data-ipc-demo b/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-data-ipc-demo
> index 32bb398..ea6ae34 100644
> --- a/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-data-ipc-demo
> +++ b/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-data-ipc-demo
> @@ -19,14 +19,12 @@ big-data-ipc-demo-linux:
> @echo Building the big data ipc demo: Linux host
> @echo ==================================================
> @cd example-applications; cd `find . -name "*big-data-ipc-demo-linux*"`; \
> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> - source $(ENV_SETUP); \
> - make -j $(MAKE_JOBS) host_linux \
> - PLATFORM="$${IPC_PLATFORM}" \
> + $(MAKE) -j $(MAKE_JOBS) host_linux \
> + PLATFORM="$(IPC_PLATFORM)" \
> KERNEL_INSTALL_DIR="$(LINUXKERNEL_INSTALL_DIR)" \
> - XDC_INSTALL_DIR="$${XDC_INSTALL_PATH}" \
> - BIOS_INSTALL_DIR="$${BIOS_INSTALL_PATH}" \
> - IPC_INSTALL_DIR="$${IPC_INSTALL_PATH}" \
> + XDC_INSTALL_DIR="$(XDC_INSTALL_PATH)" \
> + BIOS_INSTALL_DIR="$(BIOS_INSTALL_PATH)" \
> + IPC_INSTALL_DIR="$(IPC_INSTALL_PATH)" \
> TOOLCHAIN_LONGNAME=$${TOOLCHAIN_SYS} \
> TOOLCHAIN_INSTALL_DIR=$${SDK_PATH_NATIVE}/usr \
> TOOLCHAIN_PREFIX=$(CROSS_COMPILE) \
> @@ -44,17 +42,14 @@ big-data-ipc-demo-linux_install:
> fi
> @cd example-applications; \
> cd `find . -name "*big-data-ipc-demo-linux*"`; \
> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> - source $(ENV_SETUP); \
> $(MAKE) -j $(MAKE_JOBS) install_linux_bin DESTDIR=$(DESTDIR) \
> - PLATFORM="$${IPC_PLATFORM}"
> + PLATFORM="$(IPC_PLATFORM)"
>
> big-data-ipc-demo-linux_clean:
> @echo ==================================================
> @echo Cleaning the big data ipc demo: Linux host
> @echo ==================================================
> @cd example-applications; cd `find . -name "*big-data-ipc-demo-linux*"`; \
> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> - source $(ENV_SETUP); \
> $(MAKE) -j $(MAKE_JOBS) clean_linux \
> - PLATFORM="$${IPC_PLATFORM}"
> + PLATFORM="$(IPC_PLATFORM)"
> +
> 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 f1721c7..f015b24 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
> @@ -8,6 +8,13 @@ ifneq ($(TI_RTOS_PATH),)
>
> TI_RTOS_PATH_ABS := $(realpath $(TI_RTOS_PATH))
>
> + TI_PRSDK_PATH=$(TI_RTOS_PATH_ABS)/processor_sdk_rtos_$(PRSDK_PLATFORM)_$(PRSDK_VERSION)
> + SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS)
I am still not comfortable globally defining this variable as the name
is too generic.
Can you only supply it to the commands that need it? For example,
ipc-target:
SDK_INSTALL_PATH="..." $(MAKE) ...
> + include $(TI_PRSDK_PATH)/Rules.make
> +
> + IPC_TOOLS_PATHS= ti.targets.elf.C66="${C6X_GEN_INSTALL_PATH}" ti.targets.arm.elf.M4="${TOOLCHAIN_PATH_M4}" ti.targets.arm.elf.M4F="${TOOLCHAIN_PATH_M4}"
This was previously "__IPC_TOOLS_PATHS__". Did you mean to change this here?
> +
> +
> else
> TI_IPC_TARGETS = ti-ipc-rtos-missing
> endif
> @@ -15,10 +22,6 @@ endif
> TI_IPC_CLEAN = $(addsuffix _clean, $(TI_IPC_TARGETS))
> TI_IPC_INSTALL = $(addsuffix _install, $(TI_IPC_TARGETS))
>
> -export TI_PRSDK_PATH=$(TI_RTOS_PATH_ABS)/processor_sdk_rtos_$(PRSDK_PLATFORM)_$(PRSDK_VERSION)
> -
> -export IPC_TOOLS_PATHS=__IPC_TOOLS_PATHS__
> -
> ti-ipc-rtos-missing ti-ipc-rtos-missing_clean ti-ipc-rtos-missing_install:
> @echo
> @echo ===========================================================
> @@ -48,13 +51,12 @@ ti-ipc-linux-config: ti-ipc-rtos-path-check
> @echo =================================
> @echo Configuring IPC
> @echo =================================
> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> . $(ENV_SETUP); \
> - cd $${IPC_INSTALL_PATH}; \
> - ./configure $${CONFIGURE_FLAGS} \
> + cd $(IPC_INSTALL_PATH); \
> + ./configure $${CONFIGURE_FLAGS} \
> CC=$${CC} \
> --prefix=/usr \
> - PLATFORM=$${IPC_PLATFORM} \
> + PLATFORM=$(IPC_PLATFORM) \
> KERNEL_INSTALL_DIR=$(LINUXKERNEL_INSTALL_DIR)
>
>
> @@ -62,17 +64,15 @@ ti-ipc-linux: ti-ipc-rtos-path-check linux ti-ipc-linux-config
> @echo =================================
> @echo Building IPC
> @echo =================================
> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> source $(ENV_SETUP); \
> - $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}
> + $(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 =================================
> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> source $(ENV_SETUP); \
> - $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH} clean
> + $(MAKE) -j $(MAKE_JOBS) -C $(IPC_INSTALL_PATH) clean
>
> ti-ipc-linux_install: ti-ipc-rtos-path-check ti-ipc-linux
> @echo =================================
> @@ -83,23 +83,20 @@ 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
> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> source $(ENV_SETUP); \
> - $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH} install DESTDIR=$(DESTDIR)
> + $(MAKE) -j $(MAKE_JOBS) -C $(IPC_INSTALL_PATH) install DESTDIR=$(DESTDIR)
>
> ti-ipc-linux-examples: ti-ipc-rtos-path-check
> @echo =================================
> @echo Building the IPC Examples
> @echo =================================
> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> - source $(ENV_SETUP); \
> $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}/examples \
> HOSTOS="linux" \
> - PLATFORM="$${IPC_PLATFORM}" \
> + PLATFORM="$(IPC_PLATFORM)" \
> KERNEL_INSTALL_DIR="$(LINUXKERNEL_INSTALL_DIR)" \
> - XDC_INSTALL_DIR="$${XDC_INSTALL_PATH}" \
> - BIOS_INSTALL_DIR="$${BIOS_INSTALL_PATH}" \
> - IPC_INSTALL_DIR="$${IPC_INSTALL_PATH}" \
> + XDC_INSTALL_DIR="$(XDC_INSTALL_PATH)" \
> + BIOS_INSTALL_DIR="$(BIOS_INSTALL_PATH)" \
> + IPC_INSTALL_DIR="$(IPC_INSTALL_PATH)" \
> TOOLCHAIN_LONGNAME=$${TOOLCHAIN_SYS} \
> TOOLCHAIN_INSTALL_DIR=$${SDK_PATH_NATIVE}/usr \
> TOOLCHAIN_PREFIX=$(CROSS_COMPILE) \
> @@ -114,26 +111,23 @@ ti-ipc-linux-examples_install: ti-ipc-rtos-path-check ti-ipc-linux-examples
> echo "Please run setup.sh in the SDK's root directory and then try again."; \
> exit 1; \
> fi
> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> - source $(ENV_SETUP); \
> $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}/examples install \
> HOSTOS="linux" \
> - PLATFORM="$${IPC_PLATFORM}" \
> + PLATFORM="$(IPC_PLATFORM)" \
> EXEC_DIR="$(EXEC_DIR)"
>
> ti-ipc-linux-examples_clean: ti-ipc-rtos-path-check
> @echo =================================
> @echo Cleaning the IPC Examples
> @echo =================================
> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> source $(ENV_SETUP); \
> $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}/examples clean \
> HOSTOS="linux" \
> - PLATFORM="$${IPC_PLATFORM}" \
> + PLATFORM="$(IPC_PLATFORM)" \
> KERNEL_INSTALL_DIR="$(LINUXKERNEL_INSTALL_DIR)" \
> - XDC_INSTALL_DIR="$${XDC_INSTALL_PATH}" \
> - BIOS_INSTALL_DIR="$${BIOS_INSTALL_PATH}" \
> - IPC_INSTALL_DIR="$${IPC_INSTALL_PATH}" \
> + XDC_INSTALL_DIR="$(XDC_INSTALL_PATH)" \
> + BIOS_INSTALL_DIR="$(BIOS_INSTALL_PATH)" \
> + IPC_INSTALL_DIR="$(IPC_INSTALL_PATH)" \
> TOOLCHAIN_LONGNAME=$${TOOLCHAIN_SYS} \
> TOOLCHAIN_INSTALL_DIR=$${SDK_PATH_NATIVE}/usr \
> TOOLCHAIN_PREFIX=$(CROSS_COMPILE) \
> 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 27a8b2b..b7399c7 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
> @@ -71,9 +71,9 @@ KERNEL_DEVICETREE_append_am57xx-evm = " \
> "
>
>
> -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_C674 = "ti.targets.elf.C674="\$\${C6X_GEN_INSTALL_PATH}""
> +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_C674 = "ti.targets.elf.C674="\$\(C6X_GEN_INSTALL_PATH\)""
>
> IPC_TOOLS_PATHS = ""
> IPC_TOOLS_PATHS_append_keystone = " ${IPC_TOOLS_PATHS_C66}"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [EXTERNAL] [meta-processor-sdk][PATCH v3] ti-tisdk-makefile: Update to fix issue with ipc builds from linux
2018-06-14 16:49 ` [EXTERNAL] " Jacob Stiffler
@ 2018-06-14 17:58 ` Nelson, Sam
2018-06-14 18:17 ` Jacob Stiffler
0 siblings, 1 reply; 5+ messages in thread
From: Nelson, Sam @ 2018-06-14 17:58 UTC (permalink / raw)
To: Stiffler, Jacob, meta-arago
> -----Original Message-----
> From: Stiffler, Jacob
> Sent: Thursday, June 14, 2018 12:50 PM
> To: Nelson, Sam; meta-arago@arago-project.org
> Subject: Re: [EXTERNAL] [meta-arago] [meta-processor-sdk][PATCH v3] ti-
> tisdk-makefile: Update to fix issue with ipc builds from linux
>
>
>
> On 6/13/2018 2:50 PM, Sam Nelson wrote:
> > setupenv.sh in PRSDK is getting deprecated and all the definitions moved
> > to Rules.make. With this change, Rules.make from RTOS package is
> > directly used.
> >
> > Signed-off-by: Sam Nelson <sam.nelson@ti.com>
> >
> > ---
> > Changes from previous version of patch
> > Move RTOS related defines into existing ifneq statement
> > Remove export of IPC related variables
> > Update other uses of IPC_INSTALL_PATH
> > ---
> > ---
> > .../ti-tisdk-makefile/Makefile_big-data-ipc-demo | 21 ++++-----
> > .../ti-tisdk-makefile/Makefile_ti-ipc | 50 ++++++++++------------
> > .../ti-tisdk-makefile_1.0.bbappend | 6 +--
> > 3 files changed, 33 insertions(+), 44 deletions(-)
> >
> > diff --git a/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-data-
> ipc-demo b/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-data-
> ipc-demo
> > index 32bb398..ea6ae34 100644
> > --- a/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-data-ipc-
> demo
> > +++ b/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-data-ipc-
> demo
> > @@ -19,14 +19,12 @@ big-data-ipc-demo-linux:
> > @echo Building the big data ipc demo: Linux host
> > @echo ==================================================
> > @cd example-applications; cd `find . -name "*big-data-ipc-demo-
> linux*"`; \
> > - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> > - source $(ENV_SETUP); \
> > - make -j $(MAKE_JOBS) host_linux \
> > - PLATFORM="$${IPC_PLATFORM}" \
> > + $(MAKE) -j $(MAKE_JOBS) host_linux \
> > + PLATFORM="$(IPC_PLATFORM)" \
> > KERNEL_INSTALL_DIR="$(LINUXKERNEL_INSTALL_DIR)" \
> > - XDC_INSTALL_DIR="$${XDC_INSTALL_PATH}" \
> > - BIOS_INSTALL_DIR="$${BIOS_INSTALL_PATH}" \
> > - IPC_INSTALL_DIR="$${IPC_INSTALL_PATH}" \
> > + XDC_INSTALL_DIR="$(XDC_INSTALL_PATH)" \
> > + BIOS_INSTALL_DIR="$(BIOS_INSTALL_PATH)" \
> > + IPC_INSTALL_DIR="$(IPC_INSTALL_PATH)" \
> > TOOLCHAIN_LONGNAME=$${TOOLCHAIN_SYS} \
> > TOOLCHAIN_INSTALL_DIR=$${SDK_PATH_NATIVE}/usr \
> > TOOLCHAIN_PREFIX=$(CROSS_COMPILE) \
> > @@ -44,17 +42,14 @@ big-data-ipc-demo-linux_install:
> > fi
> > @cd example-applications; \
> > cd `find . -name "*big-data-ipc-demo-linux*"`; \
> > - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> > - source $(ENV_SETUP); \
> > $(MAKE) -j $(MAKE_JOBS) install_linux_bin DESTDIR=$(DESTDIR) \
> > - PLATFORM="$${IPC_PLATFORM}"
> > + PLATFORM="$(IPC_PLATFORM)"
> >
> > big-data-ipc-demo-linux_clean:
> > @echo ==================================================
> > @echo Cleaning the big data ipc demo: Linux host
> > @echo ==================================================
> > @cd example-applications; cd `find . -name "*big-data-ipc-demo-
> linux*"`; \
> > - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> > - source $(ENV_SETUP); \
> > $(MAKE) -j $(MAKE_JOBS) clean_linux \
> > - PLATFORM="$${IPC_PLATFORM}"
> > + PLATFORM="$(IPC_PLATFORM)"
> > +
> > 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 f1721c7..f015b24 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
> > @@ -8,6 +8,13 @@ ifneq ($(TI_RTOS_PATH),)
> >
> > TI_RTOS_PATH_ABS := $(realpath $(TI_RTOS_PATH))
> >
> > +
> TI_PRSDK_PATH=$(TI_RTOS_PATH_ABS)/processor_sdk_rtos_$(PRSDK_PLATF
> ORM)_$(PRSDK_VERSION)
> > + SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS)
>
> I am still not comfortable globally defining this variable as the name
> is too generic.
>
> Can you only supply it to the commands that need it? For example,
>
> ipc-target:
> SDK_INSTALL_PATH="..." $(MAKE) ...
>
Unfortunately this variable is used by the PRSDK Rules.make included below.
There is no way to pass that as an argument to the included file.
> > + include $(TI_PRSDK_PATH)/Rules.make
> > +
> > + IPC_TOOLS_PATHS= ti.targets.elf.C66="${C6X_GEN_INSTALL_PATH}"
> ti.targets.arm.elf.M4="${TOOLCHAIN_PATH_M4}"
> ti.targets.arm.elf.M4F="${TOOLCHAIN_PATH_M4}"
>
> This was previously "__IPC_TOOLS_PATHS__". Did you mean to change this
> here?
>
> > +
> > +
> > else
> > TI_IPC_TARGETS = ti-ipc-rtos-missing
> > endif
> > @@ -15,10 +22,6 @@ endif
> > TI_IPC_CLEAN = $(addsuffix _clean, $(TI_IPC_TARGETS))
> > TI_IPC_INSTALL = $(addsuffix _install, $(TI_IPC_TARGETS))
> >
> > -export
> TI_PRSDK_PATH=$(TI_RTOS_PATH_ABS)/processor_sdk_rtos_$(PRSDK_PLATF
> ORM)_$(PRSDK_VERSION)
> > -
> > -export IPC_TOOLS_PATHS=__IPC_TOOLS_PATHS__
> > -
> > ti-ipc-rtos-missing ti-ipc-rtos-missing_clean ti-ipc-rtos-missing_install:
> > @echo
> > @echo
> ===========================================================
> > @@ -48,13 +51,12 @@ ti-ipc-linux-config: ti-ipc-rtos-path-check
> > @echo =================================
> > @echo Configuring IPC
> > @echo =================================
> > - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> > . $(ENV_SETUP); \
> > - cd $${IPC_INSTALL_PATH}; \
> > - ./configure $${CONFIGURE_FLAGS} \
> > + cd $(IPC_INSTALL_PATH); \
> > + ./configure $${CONFIGURE_FLAGS} \
> > CC=$${CC} \
> > --prefix=/usr \
> > - PLATFORM=$${IPC_PLATFORM} \
> > + PLATFORM=$(IPC_PLATFORM) \
> > KERNEL_INSTALL_DIR=$(LINUXKERNEL_INSTALL_DIR)
> >
> >
> > @@ -62,17 +64,15 @@ ti-ipc-linux: ti-ipc-rtos-path-check linux ti-ipc-linux-
> config
> > @echo =================================
> > @echo Building IPC
> > @echo =================================
> > - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> > source $(ENV_SETUP); \
> > - $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}
> > + $(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 =================================
> > - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> > source $(ENV_SETUP); \
> > - $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH} clean
> > + $(MAKE) -j $(MAKE_JOBS) -C $(IPC_INSTALL_PATH) clean
> >
> > ti-ipc-linux_install: ti-ipc-rtos-path-check ti-ipc-linux
> > @echo =================================
> > @@ -83,23 +83,20 @@ 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
> > - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> > source $(ENV_SETUP); \
> > - $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH} install
> DESTDIR=$(DESTDIR)
> > + $(MAKE) -j $(MAKE_JOBS) -C $(IPC_INSTALL_PATH) install
> DESTDIR=$(DESTDIR)
> >
> > ti-ipc-linux-examples: ti-ipc-rtos-path-check
> > @echo =================================
> > @echo Building the IPC Examples
> > @echo =================================
> > - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> > - source $(ENV_SETUP); \
> > $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}/examples \
> > HOSTOS="linux" \
> > - PLATFORM="$${IPC_PLATFORM}" \
> > + PLATFORM="$(IPC_PLATFORM)" \
> > KERNEL_INSTALL_DIR="$(LINUXKERNEL_INSTALL_DIR)" \
> > - XDC_INSTALL_DIR="$${XDC_INSTALL_PATH}" \
> > - BIOS_INSTALL_DIR="$${BIOS_INSTALL_PATH}" \
> > - IPC_INSTALL_DIR="$${IPC_INSTALL_PATH}" \
> > + XDC_INSTALL_DIR="$(XDC_INSTALL_PATH)" \
> > + BIOS_INSTALL_DIR="$(BIOS_INSTALL_PATH)" \
> > + IPC_INSTALL_DIR="$(IPC_INSTALL_PATH)" \
> > TOOLCHAIN_LONGNAME=$${TOOLCHAIN_SYS} \
> > TOOLCHAIN_INSTALL_DIR=$${SDK_PATH_NATIVE}/usr \
> > TOOLCHAIN_PREFIX=$(CROSS_COMPILE) \
> > @@ -114,26 +111,23 @@ ti-ipc-linux-examples_install: ti-ipc-rtos-path-check
> ti-ipc-linux-examples
> > echo "Please run setup.sh in the SDK's root directory and then
> try again."; \
> > exit 1; \
> > fi
> > - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> > - source $(ENV_SETUP); \
> > $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}/examples install
> \
> > HOSTOS="linux" \
> > - PLATFORM="$${IPC_PLATFORM}" \
> > + PLATFORM="$(IPC_PLATFORM)" \
> > EXEC_DIR="$(EXEC_DIR)"
> >
> > ti-ipc-linux-examples_clean: ti-ipc-rtos-path-check
> > @echo =================================
> > @echo Cleaning the IPC Examples
> > @echo =================================
> > - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> > source $(ENV_SETUP); \
> > $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}/examples clean \
> > HOSTOS="linux" \
> > - PLATFORM="$${IPC_PLATFORM}" \
> > + PLATFORM="$(IPC_PLATFORM)" \
> > KERNEL_INSTALL_DIR="$(LINUXKERNEL_INSTALL_DIR)" \
> > - XDC_INSTALL_DIR="$${XDC_INSTALL_PATH}" \
> > - BIOS_INSTALL_DIR="$${BIOS_INSTALL_PATH}" \
> > - IPC_INSTALL_DIR="$${IPC_INSTALL_PATH}" \
> > + XDC_INSTALL_DIR="$(XDC_INSTALL_PATH)" \
> > + BIOS_INSTALL_DIR="$(BIOS_INSTALL_PATH)" \
> > + IPC_INSTALL_DIR="$(IPC_INSTALL_PATH)" \
> > TOOLCHAIN_LONGNAME=$${TOOLCHAIN_SYS} \
> > TOOLCHAIN_INSTALL_DIR=$${SDK_PATH_NATIVE}/usr \
> > TOOLCHAIN_PREFIX=$(CROSS_COMPILE) \
> > 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 27a8b2b..b7399c7 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
> > @@ -71,9 +71,9 @@ KERNEL_DEVICETREE_append_am57xx-evm = " \
> > "
> >
> >
> > -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_C674 =
> "ti.targets.elf.C674="\$\${C6X_GEN_INSTALL_PATH}""
> > +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_C674 =
> "ti.targets.elf.C674="\$\(C6X_GEN_INSTALL_PATH\)""
> >
> > IPC_TOOLS_PATHS = ""
> > IPC_TOOLS_PATHS_append_keystone = " ${IPC_TOOLS_PATHS_C66}"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [EXTERNAL] [meta-processor-sdk][PATCH v3] ti-tisdk-makefile: Update to fix issue with ipc builds from linux
2018-06-14 17:58 ` Nelson, Sam
@ 2018-06-14 18:17 ` Jacob Stiffler
2018-06-14 18:25 ` Nelson, Sam
0 siblings, 1 reply; 5+ messages in thread
From: Jacob Stiffler @ 2018-06-14 18:17 UTC (permalink / raw)
To: Nelson, Sam, meta-arago
Sam,
I had an additional comment on "IPC_TOOLS_PATHS" below.
On 6/14/2018 1:58 PM, Nelson, Sam wrote:
>
>> -----Original Message-----
>> From: Stiffler, Jacob
>> Sent: Thursday, June 14, 2018 12:50 PM
>> To: Nelson, Sam; meta-arago@arago-project.org
>> Subject: Re: [EXTERNAL] [meta-arago] [meta-processor-sdk][PATCH v3] ti-
>> tisdk-makefile: Update to fix issue with ipc builds from linux
>>
>>
>>
>> On 6/13/2018 2:50 PM, Sam Nelson wrote:
>>> setupenv.sh in PRSDK is getting deprecated and all the definitions moved
>>> to Rules.make. With this change, Rules.make from RTOS package is
>>> directly used.
>>>
>>> Signed-off-by: Sam Nelson <sam.nelson@ti.com>
>>>
>>> ---
>>> Changes from previous version of patch
>>> Move RTOS related defines into existing ifneq statement
>>> Remove export of IPC related variables
>>> Update other uses of IPC_INSTALL_PATH
>>> ---
>>> ---
>>> .../ti-tisdk-makefile/Makefile_big-data-ipc-demo | 21 ++++-----
>>> .../ti-tisdk-makefile/Makefile_ti-ipc | 50 ++++++++++------------
>>> .../ti-tisdk-makefile_1.0.bbappend | 6 +--
>>> 3 files changed, 33 insertions(+), 44 deletions(-)
>>>
>>> diff --git a/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-data-
>> ipc-demo b/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-data-
>> ipc-demo
>>> index 32bb398..ea6ae34 100644
>>> --- a/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-data-ipc-
>> demo
>>> +++ b/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-data-ipc-
>> demo
>>> @@ -19,14 +19,12 @@ big-data-ipc-demo-linux:
>>> @echo Building the big data ipc demo: Linux host
>>> @echo ==================================================
>>> @cd example-applications; cd `find . -name "*big-data-ipc-demo-
>> linux*"`; \
>>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
>> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
>>> - source $(ENV_SETUP); \
>>> - make -j $(MAKE_JOBS) host_linux \
>>> - PLATFORM="$${IPC_PLATFORM}" \
>>> + $(MAKE) -j $(MAKE_JOBS) host_linux \
>>> + PLATFORM="$(IPC_PLATFORM)" \
>>> KERNEL_INSTALL_DIR="$(LINUXKERNEL_INSTALL_DIR)" \
>>> - XDC_INSTALL_DIR="$${XDC_INSTALL_PATH}" \
>>> - BIOS_INSTALL_DIR="$${BIOS_INSTALL_PATH}" \
>>> - IPC_INSTALL_DIR="$${IPC_INSTALL_PATH}" \
>>> + XDC_INSTALL_DIR="$(XDC_INSTALL_PATH)" \
>>> + BIOS_INSTALL_DIR="$(BIOS_INSTALL_PATH)" \
>>> + IPC_INSTALL_DIR="$(IPC_INSTALL_PATH)" \
>>> TOOLCHAIN_LONGNAME=$${TOOLCHAIN_SYS} \
>>> TOOLCHAIN_INSTALL_DIR=$${SDK_PATH_NATIVE}/usr \
>>> TOOLCHAIN_PREFIX=$(CROSS_COMPILE) \
>>> @@ -44,17 +42,14 @@ big-data-ipc-demo-linux_install:
>>> fi
>>> @cd example-applications; \
>>> cd `find . -name "*big-data-ipc-demo-linux*"`; \
>>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
>> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
>>> - source $(ENV_SETUP); \
>>> $(MAKE) -j $(MAKE_JOBS) install_linux_bin DESTDIR=$(DESTDIR) \
>>> - PLATFORM="$${IPC_PLATFORM}"
>>> + PLATFORM="$(IPC_PLATFORM)"
>>>
>>> big-data-ipc-demo-linux_clean:
>>> @echo ==================================================
>>> @echo Cleaning the big data ipc demo: Linux host
>>> @echo ==================================================
>>> @cd example-applications; cd `find . -name "*big-data-ipc-demo-
>> linux*"`; \
>>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
>> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
>>> - source $(ENV_SETUP); \
>>> $(MAKE) -j $(MAKE_JOBS) clean_linux \
>>> - PLATFORM="$${IPC_PLATFORM}"
>>> + PLATFORM="$(IPC_PLATFORM)"
>>> +
>>> 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 f1721c7..f015b24 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
>>> @@ -8,6 +8,13 @@ ifneq ($(TI_RTOS_PATH),)
>>>
>>> TI_RTOS_PATH_ABS := $(realpath $(TI_RTOS_PATH))
>>>
>>> +
>> TI_PRSDK_PATH=$(TI_RTOS_PATH_ABS)/processor_sdk_rtos_$(PRSDK_PLATF
>> ORM)_$(PRSDK_VERSION)
>>> + SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS)
>> I am still not comfortable globally defining this variable as the name
>> is too generic.
>>
>> Can you only supply it to the commands that need it? For example,
>>
>> ipc-target:
>> SDK_INSTALL_PATH="..." $(MAKE) ...
>>
> Unfortunately this variable is used by the PRSDK Rules.make included below.
> There is no way to pass that as an argument to the included file.
I'll accept this for now, but if anything breaks, this will need to be
reverted.
>>> + include $(TI_PRSDK_PATH)/Rules.make
>>> +
>>> + IPC_TOOLS_PATHS= ti.targets.elf.C66="${C6X_GEN_INSTALL_PATH}"
>> ti.targets.arm.elf.M4="${TOOLCHAIN_PATH_M4}"
>> ti.targets.arm.elf.M4F="${TOOLCHAIN_PATH_M4}"
>>
>> This was previously "__IPC_TOOLS_PATHS__". Did you mean to change this
>> here?
Was this intentional?
>>> +
>>> +
>>> else
>>> TI_IPC_TARGETS = ti-ipc-rtos-missing
>>> endif
>>> @@ -15,10 +22,6 @@ endif
>>> TI_IPC_CLEAN = $(addsuffix _clean, $(TI_IPC_TARGETS))
>>> TI_IPC_INSTALL = $(addsuffix _install, $(TI_IPC_TARGETS))
>>>
>>> -export
>> TI_PRSDK_PATH=$(TI_RTOS_PATH_ABS)/processor_sdk_rtos_$(PRSDK_PLATF
>> ORM)_$(PRSDK_VERSION)
>>> -
>>> -export IPC_TOOLS_PATHS=__IPC_TOOLS_PATHS__
>>> -
>>> ti-ipc-rtos-missing ti-ipc-rtos-missing_clean ti-ipc-rtos-missing_install:
>>> @echo
>>> @echo
>> ===========================================================
>>> @@ -48,13 +51,12 @@ ti-ipc-linux-config: ti-ipc-rtos-path-check
>>> @echo =================================
>>> @echo Configuring IPC
>>> @echo =================================
>>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
>> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
>>> . $(ENV_SETUP); \
>>> - cd $${IPC_INSTALL_PATH}; \
>>> - ./configure $${CONFIGURE_FLAGS} \
>>> + cd $(IPC_INSTALL_PATH); \
>>> + ./configure $${CONFIGURE_FLAGS} \
>>> CC=$${CC} \
>>> --prefix=/usr \
>>> - PLATFORM=$${IPC_PLATFORM} \
>>> + PLATFORM=$(IPC_PLATFORM) \
>>> KERNEL_INSTALL_DIR=$(LINUXKERNEL_INSTALL_DIR)
>>>
>>>
>>> @@ -62,17 +64,15 @@ ti-ipc-linux: ti-ipc-rtos-path-check linux ti-ipc-linux-
>> config
>>> @echo =================================
>>> @echo Building IPC
>>> @echo =================================
>>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
>> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
>>> source $(ENV_SETUP); \
>>> - $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}
>>> + $(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 =================================
>>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
>> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
>>> source $(ENV_SETUP); \
>>> - $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH} clean
>>> + $(MAKE) -j $(MAKE_JOBS) -C $(IPC_INSTALL_PATH) clean
>>>
>>> ti-ipc-linux_install: ti-ipc-rtos-path-check ti-ipc-linux
>>> @echo =================================
>>> @@ -83,23 +83,20 @@ 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
>>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
>> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
>>> source $(ENV_SETUP); \
>>> - $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH} install
>> DESTDIR=$(DESTDIR)
>>> + $(MAKE) -j $(MAKE_JOBS) -C $(IPC_INSTALL_PATH) install
>> DESTDIR=$(DESTDIR)
>>> ti-ipc-linux-examples: ti-ipc-rtos-path-check
>>> @echo =================================
>>> @echo Building the IPC Examples
>>> @echo =================================
>>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
>> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
>>> - source $(ENV_SETUP); \
>>> $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}/examples \
>>> HOSTOS="linux" \
>>> - PLATFORM="$${IPC_PLATFORM}" \
>>> + PLATFORM="$(IPC_PLATFORM)" \
>>> KERNEL_INSTALL_DIR="$(LINUXKERNEL_INSTALL_DIR)" \
>>> - XDC_INSTALL_DIR="$${XDC_INSTALL_PATH}" \
>>> - BIOS_INSTALL_DIR="$${BIOS_INSTALL_PATH}" \
>>> - IPC_INSTALL_DIR="$${IPC_INSTALL_PATH}" \
>>> + XDC_INSTALL_DIR="$(XDC_INSTALL_PATH)" \
>>> + BIOS_INSTALL_DIR="$(BIOS_INSTALL_PATH)" \
>>> + IPC_INSTALL_DIR="$(IPC_INSTALL_PATH)" \
>>> TOOLCHAIN_LONGNAME=$${TOOLCHAIN_SYS} \
>>> TOOLCHAIN_INSTALL_DIR=$${SDK_PATH_NATIVE}/usr \
>>> TOOLCHAIN_PREFIX=$(CROSS_COMPILE) \
>>> @@ -114,26 +111,23 @@ ti-ipc-linux-examples_install: ti-ipc-rtos-path-check
>> ti-ipc-linux-examples
>>> echo "Please run setup.sh in the SDK's root directory and then
>> try again."; \
>>> exit 1; \
>>> fi
>>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
>> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
>>> - source $(ENV_SETUP); \
>>> $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}/examples install
>> \
>>> HOSTOS="linux" \
>>> - PLATFORM="$${IPC_PLATFORM}" \
>>> + PLATFORM="$(IPC_PLATFORM)" \
>>> EXEC_DIR="$(EXEC_DIR)"
>>>
>>> ti-ipc-linux-examples_clean: ti-ipc-rtos-path-check
>>> @echo =================================
>>> @echo Cleaning the IPC Examples
>>> @echo =================================
>>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
>> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
>>> source $(ENV_SETUP); \
>>> $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}/examples clean \
>>> HOSTOS="linux" \
>>> - PLATFORM="$${IPC_PLATFORM}" \
>>> + PLATFORM="$(IPC_PLATFORM)" \
>>> KERNEL_INSTALL_DIR="$(LINUXKERNEL_INSTALL_DIR)" \
>>> - XDC_INSTALL_DIR="$${XDC_INSTALL_PATH}" \
>>> - BIOS_INSTALL_DIR="$${BIOS_INSTALL_PATH}" \
>>> - IPC_INSTALL_DIR="$${IPC_INSTALL_PATH}" \
>>> + XDC_INSTALL_DIR="$(XDC_INSTALL_PATH)" \
>>> + BIOS_INSTALL_DIR="$(BIOS_INSTALL_PATH)" \
>>> + IPC_INSTALL_DIR="$(IPC_INSTALL_PATH)" \
>>> TOOLCHAIN_LONGNAME=$${TOOLCHAIN_SYS} \
>>> TOOLCHAIN_INSTALL_DIR=$${SDK_PATH_NATIVE}/usr \
>>> TOOLCHAIN_PREFIX=$(CROSS_COMPILE) \
>>> 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 27a8b2b..b7399c7 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
>>> @@ -71,9 +71,9 @@ KERNEL_DEVICETREE_append_am57xx-evm = " \
>>> "
>>>
>>>
>>> -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_C674 =
>> "ti.targets.elf.C674="\$\${C6X_GEN_INSTALL_PATH}""
>>> +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_C674 =
>> "ti.targets.elf.C674="\$\(C6X_GEN_INSTALL_PATH\)""
>>> IPC_TOOLS_PATHS = ""
>>> IPC_TOOLS_PATHS_append_keystone = " ${IPC_TOOLS_PATHS_C66}"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [EXTERNAL] [meta-processor-sdk][PATCH v3] ti-tisdk-makefile: Update to fix issue with ipc builds from linux
2018-06-14 18:17 ` Jacob Stiffler
@ 2018-06-14 18:25 ` Nelson, Sam
0 siblings, 0 replies; 5+ messages in thread
From: Nelson, Sam @ 2018-06-14 18:25 UTC (permalink / raw)
To: Stiffler, Jacob, meta-arago
> -----Original Message-----
> From: Stiffler, Jacob
> Sent: Thursday, June 14, 2018 2:17 PM
> To: Nelson, Sam; meta-arago@arago-project.org
> Subject: Re: [EXTERNAL] [meta-arago] [meta-processor-sdk][PATCH v3] ti-
> tisdk-makefile: Update to fix issue with ipc builds from linux
>
> Sam,
>
> I had an additional comment on "IPC_TOOLS_PATHS" below.
>
>
> On 6/14/2018 1:58 PM, Nelson, Sam wrote:
> >
> >> -----Original Message-----
> >> From: Stiffler, Jacob
> >> Sent: Thursday, June 14, 2018 12:50 PM
> >> To: Nelson, Sam; meta-arago@arago-project.org
> >> Subject: Re: [EXTERNAL] [meta-arago] [meta-processor-sdk][PATCH v3] ti-
> >> tisdk-makefile: Update to fix issue with ipc builds from linux
> >>
> >>
> >>
> >> On 6/13/2018 2:50 PM, Sam Nelson wrote:
> >>> setupenv.sh in PRSDK is getting deprecated and all the definitions moved
> >>> to Rules.make. With this change, Rules.make from RTOS package is
> >>> directly used.
> >>>
> >>> Signed-off-by: Sam Nelson <sam.nelson@ti.com>
> >>>
> >>> ---
> >>> Changes from previous version of patch
> >>> Move RTOS related defines into existing ifneq statement
> >>> Remove export of IPC related variables
> >>> Update other uses of IPC_INSTALL_PATH
> >>> ---
> >>> ---
> >>> .../ti-tisdk-makefile/Makefile_big-data-ipc-demo | 21 ++++-----
> >>> .../ti-tisdk-makefile/Makefile_ti-ipc | 50 ++++++++++------------
> >>> .../ti-tisdk-makefile_1.0.bbappend | 6 +--
> >>> 3 files changed, 33 insertions(+), 44 deletions(-)
> >>>
> >>> diff --git a/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-
> data-
> >> ipc-demo b/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-
> data-
> >> ipc-demo
> >>> index 32bb398..ea6ae34 100644
> >>> --- a/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-data-ipc-
> >> demo
> >>> +++ b/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_big-data-
> ipc-
> >> demo
> >>> @@ -19,14 +19,12 @@ big-data-ipc-demo-linux:
> >>> @echo Building the big data ipc demo: Linux host
> >>> @echo ==================================================
> >>> @cd example-applications; cd `find . -name "*big-data-ipc-demo-
> >> linux*"`; \
> >>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> >> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> >>> - source $(ENV_SETUP); \
> >>> - make -j $(MAKE_JOBS) host_linux \
> >>> - PLATFORM="$${IPC_PLATFORM}" \
> >>> + $(MAKE) -j $(MAKE_JOBS) host_linux \
> >>> + PLATFORM="$(IPC_PLATFORM)" \
> >>> KERNEL_INSTALL_DIR="$(LINUXKERNEL_INSTALL_DIR)" \
> >>> - XDC_INSTALL_DIR="$${XDC_INSTALL_PATH}" \
> >>> - BIOS_INSTALL_DIR="$${BIOS_INSTALL_PATH}" \
> >>> - IPC_INSTALL_DIR="$${IPC_INSTALL_PATH}" \
> >>> + XDC_INSTALL_DIR="$(XDC_INSTALL_PATH)" \
> >>> + BIOS_INSTALL_DIR="$(BIOS_INSTALL_PATH)" \
> >>> + IPC_INSTALL_DIR="$(IPC_INSTALL_PATH)" \
> >>> TOOLCHAIN_LONGNAME=$${TOOLCHAIN_SYS} \
> >>> TOOLCHAIN_INSTALL_DIR=$${SDK_PATH_NATIVE}/usr \
> >>> TOOLCHAIN_PREFIX=$(CROSS_COMPILE) \
> >>> @@ -44,17 +42,14 @@ big-data-ipc-demo-linux_install:
> >>> fi
> >>> @cd example-applications; \
> >>> cd `find . -name "*big-data-ipc-demo-linux*"`; \
> >>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> >> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> >>> - source $(ENV_SETUP); \
> >>> $(MAKE) -j $(MAKE_JOBS) install_linux_bin DESTDIR=$(DESTDIR) \
> >>> - PLATFORM="$${IPC_PLATFORM}"
> >>> + PLATFORM="$(IPC_PLATFORM)"
> >>>
> >>> big-data-ipc-demo-linux_clean:
> >>> @echo ==================================================
> >>> @echo Cleaning the big data ipc demo: Linux host
> >>> @echo ==================================================
> >>> @cd example-applications; cd `find . -name "*big-data-ipc-demo-
> >> linux*"`; \
> >>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> >> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> >>> - source $(ENV_SETUP); \
> >>> $(MAKE) -j $(MAKE_JOBS) clean_linux \
> >>> - PLATFORM="$${IPC_PLATFORM}"
> >>> + PLATFORM="$(IPC_PLATFORM)"
> >>> +
> >>> 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 f1721c7..f015b24 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
> >>> @@ -8,6 +8,13 @@ ifneq ($(TI_RTOS_PATH),)
> >>>
> >>> TI_RTOS_PATH_ABS := $(realpath $(TI_RTOS_PATH))
> >>>
> >>> +
> >>
> TI_PRSDK_PATH=$(TI_RTOS_PATH_ABS)/processor_sdk_rtos_$(PRSDK_PLATF
> >> ORM)_$(PRSDK_VERSION)
> >>> + SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS)
> >> I am still not comfortable globally defining this variable as the name
> >> is too generic.
> >>
> >> Can you only supply it to the commands that need it? For example,
> >>
> >> ipc-target:
> >> SDK_INSTALL_PATH="..." $(MAKE) ...
> >>
> > Unfortunately this variable is used by the PRSDK Rules.make included below.
> > There is no way to pass that as an argument to the included file.
>
> I'll accept this for now, but if anything breaks, this will need to be
> reverted.
Ok.
>
> >>> + include $(TI_PRSDK_PATH)/Rules.make
> >>> +
> >>> + IPC_TOOLS_PATHS= ti.targets.elf.C66="${C6X_GEN_INSTALL_PATH}"
> >> ti.targets.arm.elf.M4="${TOOLCHAIN_PATH_M4}"
> >> ti.targets.arm.elf.M4F="${TOOLCHAIN_PATH_M4}"
> >>
> >> This was previously "__IPC_TOOLS_PATHS__". Did you mean to change this
> >> here?
>
> Was this intentional?
No. I will fix this.
>
> >>> +
> >>> +
> >>> else
> >>> TI_IPC_TARGETS = ti-ipc-rtos-missing
> >>> endif
> >>> @@ -15,10 +22,6 @@ endif
> >>> TI_IPC_CLEAN = $(addsuffix _clean, $(TI_IPC_TARGETS))
> >>> TI_IPC_INSTALL = $(addsuffix _install, $(TI_IPC_TARGETS))
> >>>
> >>> -export
> >>
> TI_PRSDK_PATH=$(TI_RTOS_PATH_ABS)/processor_sdk_rtos_$(PRSDK_PLATF
> >> ORM)_$(PRSDK_VERSION)
> >>> -
> >>> -export IPC_TOOLS_PATHS=__IPC_TOOLS_PATHS__
> >>> -
> >>> ti-ipc-rtos-missing ti-ipc-rtos-missing_clean ti-ipc-rtos-missing_install:
> >>> @echo
> >>> @echo
> >> ===========================================================
> >>> @@ -48,13 +51,12 @@ ti-ipc-linux-config: ti-ipc-rtos-path-check
> >>> @echo =================================
> >>> @echo Configuring IPC
> >>> @echo =================================
> >>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> >> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> >>> . $(ENV_SETUP); \
> >>> - cd $${IPC_INSTALL_PATH}; \
> >>> - ./configure $${CONFIGURE_FLAGS} \
> >>> + cd $(IPC_INSTALL_PATH); \
> >>> + ./configure $${CONFIGURE_FLAGS} \
> >>> CC=$${CC} \
> >>> --prefix=/usr \
> >>> - PLATFORM=$${IPC_PLATFORM} \
> >>> + PLATFORM=$(IPC_PLATFORM) \
> >>> KERNEL_INSTALL_DIR=$(LINUXKERNEL_INSTALL_DIR)
> >>>
> >>>
> >>> @@ -62,17 +64,15 @@ ti-ipc-linux: ti-ipc-rtos-path-check linux ti-ipc-linux-
> >> config
> >>> @echo =================================
> >>> @echo Building IPC
> >>> @echo =================================
> >>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> >> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> >>> source $(ENV_SETUP); \
> >>> - $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}
> >>> + $(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 =================================
> >>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> >> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> >>> source $(ENV_SETUP); \
> >>> - $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH} clean
> >>> + $(MAKE) -j $(MAKE_JOBS) -C $(IPC_INSTALL_PATH) clean
> >>>
> >>> ti-ipc-linux_install: ti-ipc-rtos-path-check ti-ipc-linux
> >>> @echo =================================
> >>> @@ -83,23 +83,20 @@ 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
> >>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> >> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> >>> source $(ENV_SETUP); \
> >>> - $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH} install
> >> DESTDIR=$(DESTDIR)
> >>> + $(MAKE) -j $(MAKE_JOBS) -C $(IPC_INSTALL_PATH) install
> >> DESTDIR=$(DESTDIR)
> >>> ti-ipc-linux-examples: ti-ipc-rtos-path-check
> >>> @echo =================================
> >>> @echo Building the IPC Examples
> >>> @echo =================================
> >>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> >> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> >>> - source $(ENV_SETUP); \
> >>> $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}/examples \
> >>> HOSTOS="linux" \
> >>> - PLATFORM="$${IPC_PLATFORM}" \
> >>> + PLATFORM="$(IPC_PLATFORM)" \
> >>> KERNEL_INSTALL_DIR="$(LINUXKERNEL_INSTALL_DIR)" \
> >>> - XDC_INSTALL_DIR="$${XDC_INSTALL_PATH}" \
> >>> - BIOS_INSTALL_DIR="$${BIOS_INSTALL_PATH}" \
> >>> - IPC_INSTALL_DIR="$${IPC_INSTALL_PATH}" \
> >>> + XDC_INSTALL_DIR="$(XDC_INSTALL_PATH)" \
> >>> + BIOS_INSTALL_DIR="$(BIOS_INSTALL_PATH)" \
> >>> + IPC_INSTALL_DIR="$(IPC_INSTALL_PATH)" \
> >>> TOOLCHAIN_LONGNAME=$${TOOLCHAIN_SYS} \
> >>> TOOLCHAIN_INSTALL_DIR=$${SDK_PATH_NATIVE}/usr \
> >>> TOOLCHAIN_PREFIX=$(CROSS_COMPILE) \
> >>> @@ -114,26 +111,23 @@ ti-ipc-linux-examples_install: ti-ipc-rtos-path-
> check
> >> ti-ipc-linux-examples
> >>> echo "Please run setup.sh in the SDK's root directory and then
> >> try again."; \
> >>> exit 1; \
> >>> fi
> >>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> >> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> >>> - source $(ENV_SETUP); \
> >>> $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}/examples install
> >> \
> >>> HOSTOS="linux" \
> >>> - PLATFORM="$${IPC_PLATFORM}" \
> >>> + PLATFORM="$(IPC_PLATFORM)" \
> >>> EXEC_DIR="$(EXEC_DIR)"
> >>>
> >>> ti-ipc-linux-examples_clean: ti-ipc-rtos-path-check
> >>> @echo =================================
> >>> @echo Cleaning the IPC Examples
> >>> @echo =================================
> >>> - SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) source
> >> $(TI_PRSDK_PATH)/setupenv.sh > /dev/null; \
> >>> source $(ENV_SETUP); \
> >>> $(MAKE) -j $(MAKE_JOBS) -C $${IPC_INSTALL_PATH}/examples clean \
> >>> HOSTOS="linux" \
> >>> - PLATFORM="$${IPC_PLATFORM}" \
> >>> + PLATFORM="$(IPC_PLATFORM)" \
> >>> KERNEL_INSTALL_DIR="$(LINUXKERNEL_INSTALL_DIR)" \
> >>> - XDC_INSTALL_DIR="$${XDC_INSTALL_PATH}" \
> >>> - BIOS_INSTALL_DIR="$${BIOS_INSTALL_PATH}" \
> >>> - IPC_INSTALL_DIR="$${IPC_INSTALL_PATH}" \
> >>> + XDC_INSTALL_DIR="$(XDC_INSTALL_PATH)" \
> >>> + BIOS_INSTALL_DIR="$(BIOS_INSTALL_PATH)" \
> >>> + IPC_INSTALL_DIR="$(IPC_INSTALL_PATH)" \
> >>> TOOLCHAIN_LONGNAME=$${TOOLCHAIN_SYS} \
> >>> TOOLCHAIN_INSTALL_DIR=$${SDK_PATH_NATIVE}/usr \
> >>> TOOLCHAIN_PREFIX=$(CROSS_COMPILE) \
> >>> 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 27a8b2b..b7399c7 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
> >>> @@ -71,9 +71,9 @@ KERNEL_DEVICETREE_append_am57xx-evm = " \
> >>> "
> >>>
> >>>
> >>> -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_C674 =
> >> "ti.targets.elf.C674="\$\${C6X_GEN_INSTALL_PATH}""
> >>> +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_C674 =
> >> "ti.targets.elf.C674="\$\(C6X_GEN_INSTALL_PATH\)""
> >>> IPC_TOOLS_PATHS = ""
> >>> IPC_TOOLS_PATHS_append_keystone = " ${IPC_TOOLS_PATHS_C66}"
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-06-14 18:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-13 18:50 [meta-processor-sdk][PATCH v3] ti-tisdk-makefile: Update to fix issue with ipc builds from linux Sam Nelson
2018-06-14 16:49 ` [EXTERNAL] " Jacob Stiffler
2018-06-14 17:58 ` Nelson, Sam
2018-06-14 18:17 ` Jacob Stiffler
2018-06-14 18:25 ` Nelson, Sam
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.