Added support for MAKERULEDIR

 - When EDMA3 LLD is built using external makerules, this is required
   inorder to provide exact control over the makerule file path
 - Without this, earlier we are assuming the files are present in
   $(ROOTDIR)/makerule folder which may not be true with other external
   package builds
 - The change is backward compatibile as we check for null before using
   MAKERULEDIR

Signed-off-by: Sivaraj R <sivaraj@ti.com>

diff --git a/packages/ti/sdo/edma3/drv/makefile b/packages/ti/sdo/edma3/drv/makefile
index c6f5ccc228ccc196885f862d111549d3dcd4cf41..10783e3712e2bf109d9ba51b89315ea653531482 100644 (file)
--- a/packages/ti/sdo/edma3/drv/makefile
+++ b/packages/ti/sdo/edma3/drv/makefile
@@ -5,9 +5,9 @@ MODULE_NAME = edma3_lld_drv
 SRCDIR = src
 INCDIR = . ../../../.. src
 
-# List all the external components/interfaces, whose interface header files 
+# List all the external components/interfaces, whose interface header files
 #  need to be included for this component
-INCLUDE_EXERNAL_INTERFACES = 
+INCLUDE_EXERNAL_INTERFACES =
 
 # Common source files and CFLAGS across all platforms and cores
 SRCS_COMMON = edma3_drv_init.c edma3_drv_basic.c edma3_drv_adv.c
@@ -16,14 +16,19 @@ CFLAGS_LOCAL_COMMON = -mi10
 endif
 
 # Core/SoC/platform specific source files and CFLAGS
-# Example: 
-#   SRCS_<core/SoC/platform-name> = 
+# Example:
+#   SRCS_<core/SoC/platform-name> =
 #   CFLAGS_LOCAL_<core/SoC/platform-name> =
 
 # Include common make files
-include $(ROOTDIR)/makerules/common.mk
+ifeq ($(MAKERULEDIR), )
+#Makerule path not defined, define this and assume relative path from ROOTDIR
+  MAKERULEDIR := $(ROOTDIR)/makerules
+  export MAKERULEDIR
+endif
+include $(MAKERULEDIR)/common.mk
 
-# OBJs and libraries are built by using rule defined in rules_<target>.mk 
+# OBJs and libraries are built by using rule defined in rules_<target>.mk
 #     and need not be explicitly specified here
 
 # Nothing beyond this point

diff --git a/packages/ti/sdo/edma3/drv/sample/makefile b/packages/ti/sdo/edma3/drv/sample/makefile
index d1c1d63f09db56682ebca62186cf9a046bd41f2a..1c52b6042702f069d1e77667aec1586042b6df39 100755 (executable)
--- a/packages/ti/sdo/edma3/drv/sample/makefile
+++ b/packages/ti/sdo/edma3/drv/sample/makefile
@@ -5,7 +5,7 @@ MODULE_NAME = edma3_lld_drv_sample
 SRCDIR = src src/platforms
 INCDIR = . ../../../../.. src
 
-# List all the external components/interfaces, whose interface header files 
+# List all the external components/interfaces, whose interface header files
 #  need to be included for this component
 INCLUDE_EXERNAL_INTERFACES = bios xdc
 
@@ -20,8 +20,8 @@ CFLAGS_LOCAL_COMMON = -mi10
 endif
 
 # Core/SoC/platform specific source files and CFLAGS
-# Example: 
-#   SRCS_<core/SoC/platform-name> = 
+# Example:
+#   SRCS_<core/SoC/platform-name> =
 #   CFLAGS_LOCAL_<core/SoC/platform-name> =
 ifeq ($(CORE),c6xdsp)
 SRCS_c6472-evm = sample_c6472_cfg.c sample_c6472_int_reg.c
@@ -100,9 +100,14 @@ CFLAGS_LOCAL_ti814x-evm += -DCHIP_TI814X
 CFLAGS_LOCAL_c6a811x-evm += -DCHIP_C6A811X
 
 # Include common make files
-include $(ROOTDIR)/makerules/common.mk
+ifeq ($(MAKERULEDIR), )
+#Makerule path not defined, define this and assume relative path from ROOTDIR
+  MAKERULEDIR := $(ROOTDIR)/makerules
+  export MAKERULEDIR
+endif
+include $(MAKERULEDIR)/common.mk
 
-# OBJs and libraries are built by using rule defined in rules_<target>.mk 
+# OBJs and libraries are built by using rule defined in rules_<target>.mk
 #     and need not be explicitly specified here
 
 # Nothing beyond this point

diff --git a/packages/ti/sdo/edma3/rm/makefile b/packages/ti/sdo/edma3/rm/makefile
index 985c93e14e81e6977d02ba0656a0a97b5c94d25e..3754147fe66e12c747b6e4f6c71dd3f335cbf6ff 100644 (file)
--- a/packages/ti/sdo/edma3/rm/makefile
+++ b/packages/ti/sdo/edma3/rm/makefile
@@ -5,9 +5,9 @@ MODULE_NAME = edma3_lld_rm
 SRCDIR = src src/configs
 INCDIR = . ../../../.. src
 
-# List all the external components/interfaces, whose interface header files 
+# List all the external components/interfaces, whose interface header files
 #  need to be included for this component
-INCLUDE_EXERNAL_INTERFACES = 
+INCLUDE_EXERNAL_INTERFACES =
 
 # Common source files and CFLAGS across all platforms and cores
 SRCS_COMMON = edma3resmgr.c edma3_rm_gbl_data.c
@@ -33,8 +33,8 @@ CFLAGS_LOCAL_tda2xx-evm = -DBUILD_TDA2XX_MPU
 endif
 
 # Core/SoC/platform specific source files and CFLAGS
-# Example: 
-#   SRCS_<core/SoC/platform-name> = 
+# Example:
+#   SRCS_<core/SoC/platform-name> =
 #   CFLAGS_LOCAL_<core/SoC/platform-name> =
 SRCS_c6472-evm = edma3_c6472_cfg.c
 SRCS_tci6486-evm = edma3_tci6486_cfg.c
@@ -63,9 +63,14 @@ SRCS_ti816x-sim = edma3_ti816x_cfg.c
 CFLAGS_LOCAL_generic = -DGENERIC
 
 # Include common make files
-include $(ROOTDIR)/makerules/common.mk
+ifeq ($(MAKERULEDIR), )
+#Makerule path not defined, define this and assume relative path from ROOTDIR
+  MAKERULEDIR := $(ROOTDIR)/makerules
+  export MAKERULEDIR
+endif
+include $(MAKERULEDIR)/common.mk
 
-# OBJs and libraries are built by using rule defined in rules_<target>.mk 
+# OBJs and libraries are built by using rule defined in rules_<target>.mk
 #     and need not be explicitly specified here
 
 # Nothing beyond this point

diff --git a/packages/ti/sdo/edma3/rm/sample/makefile b/packages/ti/sdo/edma3/rm/sample/makefile
index 29e93f05f080b057ff0f6f4e28f17434879b87f3..4973b01d48a1b8f0af2f1c60eb62880d56861ae5 100755 (executable)
--- a/packages/ti/sdo/edma3/rm/sample/makefile
+++ b/packages/ti/sdo/edma3/rm/sample/makefile
@@ -5,7 +5,7 @@ MODULE_NAME = edma3_lld_rm_sample
 SRCDIR = src src/platforms
 INCDIR = . ../../../../.. src
 
-# List all the external components/interfaces, whose interface header files 
+# List all the external components/interfaces, whose interface header files
 #  need to be included for this component
 INCLUDE_EXERNAL_INTERFACES = bios xdc
 
@@ -20,8 +20,8 @@ CFLAGS_LOCAL_COMMON = -mi10
 endif
 
 # Core/SoC/platform specific source files and CFLAGS
-# Example: 
-#   SRCS_<core/SoC/platform-name> = 
+# Example:
+#   SRCS_<core/SoC/platform-name> =
 #   CFLAGS_LOCAL_<core/SoC/platform-name> =
 ifeq ($(CORE),c6xdsp)
 SRCS_c6472-evm = sample_c6472_cfg.c sample_c6472_int_reg.c
@@ -77,9 +77,14 @@ SRCS_da830-evm = sample_da830_cfg.c sample_da830_int_reg.c
 CFLAGS_LOCAL_ti814x-evm = -DCHIP_TI814X
 
 # Include common make files
-include $(ROOTDIR)/makerules/common.mk
+ifeq ($(MAKERULEDIR), )
+#Makerule path not defined, define this and assume relative path from ROOTDIR
+  MAKERULEDIR := $(ROOTDIR)/makerules
+  export MAKERULEDIR
+endif
+include $(MAKERULEDIR)/common.mk
 
-# OBJs and libraries are built by using rule defined in rules_<target>.mk 
+# OBJs and libraries are built by using rule defined in rules_<target>.mk
 #     and need not be explicitly specified here
 
 # Nothing beyond this point