Remoteproc: DRA7xx: Adjust entries to fix carveout allocation failures

[ipc/ipcdev.git] / ipc-bios.mak

diff --git a/ipc-bios.mak b/ipc-bios.mak
index de0628e20244c1aa0b6860e66ac69a85cdb4a626..81d6942c3a615108a246c503d3568c4a47faaac1 100644 (file)
--- a/ipc-bios.mak
+++ b/ipc-bios.mak
@@ -1,5 +1,5 @@
 #
-#   Copyright (c) 2012-2013, Texas Instruments Incorporated
+#   Copyright (c) 2012-2018, Texas Instruments Incorporated
 #
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
@@ -55,7 +55,9 @@ else
 packageprefix := $(prefix)
 endif
 
-include ./products.mak
+#Products.mak can be overriden by SDK top level Rules.make file
+RULES_MAKE ?= ./products.mak
+include $(RULES_MAKE)
 
 #
 # Set XDCARGS to some of the variables above.  XDCARGS are passed
@@ -74,10 +76,7 @@ include ./products.mak
 XDCARGS= \
     PLATFORM=\"$(PLATFORM)\" \
     BIOS_SMPENABLED=\"$(BIOS_SMPENABLED)\" \
-    ti.targets.C28_large=\"$(ti.targets.C28_large)\" \
-    ti.targets.C28_float=\"$(ti.targets.C28_float)\" \
     ti.targets.C64P=\"$(ti.targets.C64P)\" \
-    ti.targets.C64P_big_endian=\"$(ti.targets.C64P_big_endian)\" \
     ti.targets.C674=\"$(ti.targets.C674)\" \
     ti.targets.arm.elf.Arm9=\"$(ti.targets.arm.elf.Arm9)\" \
     ti.targets.arm.elf.A8F=\"$(ti.targets.arm.elf.A8F)\" \
@@ -85,16 +84,20 @@ XDCARGS= \
     ti.targets.arm.elf.M3=\"$(ti.targets.arm.elf.M3)\" \
     ti.targets.arm.elf.M4=\"$(ti.targets.arm.elf.M4)\" \
     ti.targets.arm.elf.M4F=\"$(ti.targets.arm.elf.M4F)\" \
+    ti.targets.arm.elf.R5F=\"$(ti.targets.arm.elf.R5F)\" \
     ti.targets.elf.C64P=\"$(ti.targets.elf.C64P)\" \
-    ti.targets.elf.C64P_big_endian=\"$(ti.targets.elf.C64P_big_endian)\" \
     ti.targets.elf.C64T=\"$(ti.targets.elf.C64T)\" \
     ti.targets.elf.C66=\"$(ti.targets.elf.C66)\" \
-    ti.targets.elf.C66_big_endian=\"$(ti.targets.elf.C66_big_endian)\" \
     ti.targets.elf.C674=\"$(ti.targets.elf.C674)\" \
     ti.targets.arp32.elf.ARP32=\"$(ti.targets.arp32.elf.ARP32)\" \
     ti.targets.arp32.elf.ARP32_far=\"$(ti.targets.arp32.elf.ARP32_far)\" \
     gnu.targets.arm.A8F=\"$(gnu.targets.arm.A8F)\" \
-    gnu.targets.arm.A15F=\"$(gnu.targets.arm.A15F)\"
+    gnu.targets.arm.A15F=\"$(gnu.targets.arm.A15F)\" \
+    gnu.targets.arm.A53F=\"$(gnu.targets.arm.A53F)\"
+
+ifeq ($(MAKECMDGOALS),release)
+    XDCARGS += GOAL=release
+endif
 
 #
 # Get list of packages to rebuild. Remove examples from the list.
@@ -102,21 +105,22 @@ XDCARGS= \
 XDCPKG := $(XDC_INSTALL_DIR)/bin/xdcpkg
 
 # Check for Windows specific env vars to determine if we are on Windows
-ifeq (,$(findstring :,$(WINDIR)$(windir)$(COMSPEC)$(comspec)))
-   FILTER = grep -v
-else
-   # Find is the rough equivalent of grep on Windows
-   FILTER = find /v
+ifneq (,$(findstring :,$(WINDIR)$(windir)$(COMSPEC)$(comspec)))
    # Replace '/' with '\' because cmd.exe requires '\'s in command names
    XDCPKG := $(subst /,\,$(XDCPKG))
 endif
 
-LIST = $(shell $(XDCPKG) ./packages | $(FILTER) "examples")
+LIST = $(shell $(XDCPKG) ./packages)
 
 #
 # Set XDCPATH to contain necessary repositories.
 #
 XDCPATH = $(BIOS_INSTALL_DIR)/packages
+ifeq ($(PDK_INSTALL_DIR),)
+XDCPATH = $(BIOS_INSTALL_DIR)/packages
+else
+XDCPATH = $(BIOS_INSTALL_DIR)/packages;${PDK_INSTALL_DIR}/packages
+endif
 export XDCPATH
 
 #
@@ -130,26 +134,30 @@ export XDCOPTIONS
 # Note that XDCBUILDCFG points to the ipc-bios.bld file which uses
 # the arguments specified by XDCARGS
 #
-XDC = $(XDC_INSTALL_DIR)/xdc XDCARGS="$(XDCARGS)" XDCBUILDCFG=./ipc-bios.bld
+XDC = $(XDC_INSTALL_DIR)/xdc $(JOBS) XDCARGS="$(XDCARGS)" XDCBUILDCFG=./ipc-bios.bld
 
 ######################################################
 ## Shouldnt have to modify anything below this line ##
 ######################################################
 
 all:
-       @ echo building ipc packages ...
+       @echo building ipc packages ...
 # build everything in the Bios IPC package
-       @ $(XDC) -P $(LIST)
+       @$(XDC) -P $(LIST)
+
+interfaces:
+       @echo building interfaces for  ipc packages ...
+       @$(patsubst ${JOBS},,$(XDC)) .interfaces -P $(LIST)
 
 libs:
        @echo "#"
        @echo "# Making $@ ..."
-       $(XDC) .dlls -P $(LIST)
+       @$(XDC) .dlls -P $(patsubst %/tests,,$(LIST))
 
-release:
-       @ echo building ipc packages ...
+release: interfaces
+       @echo building ipc packages ...
 # create a XDC release for the Bios IPC package
-       @ $(XDC) release -P $(LIST)
+       @$(XDC) release -P $(LIST)
 
 clean:
        @ echo cleaning ipc packages ...