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 <[email protected]> --- .../ti-tisdk-makefile/Makefile_big-data-ipc-demo | 21 +++++++---------- .../ti-tisdk-makefile/Makefile_ti-ipc | 27 +++++++++++----------- .../ti-tisdk-makefile_1.0.bbappend | 6 ++--- 3 files changed, 25 insertions(+), 29 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..49aefb3 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 @@ -15,10 +15,15 @@ endif TI_IPC_CLEAN = $(addsuffix _clean, $(TI_IPC_TARGETS)) TI_IPC_INSTALL = $(addsuffix _install, $(TI_IPC_TARGETS)) +ifneq ($(TI_RTOS_PATH),) export TI_PRSDK_PATH=$(TI_RTOS_PATH_ABS)/processor_sdk_rtos_$(PRSDK_PLATFORM)_$(PRSDK_VERSION) +export SDK_INSTALL_PATH=$(TI_RTOS_PATH_ABS) +include $(TI_PRSDK_PATH)/Rules.make export IPC_TOOLS_PATHS=__IPC_TOOLS_PATHS__ +endif + ti-ipc-rtos-missing ti-ipc-rtos-missing_clean ti-ipc-rtos-missing_install: @echo @echo =========================================================== @@ -91,15 +96,13 @@ 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,11 +117,9 @@ 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 @@ -129,11 +130,11 @@ ti-ipc-linux-examples_clean: ti-ipc-rtos-path-check 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 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
