Use PRODUCT to define build configuration for umm_malloc

Author: rhempel

README.md

@@ -102,7 +102,7 @@ The reason for this is the way the configuration override heirarchy
 works. The priority for configuration overrides is as follows:
 
 1. Command line defines using `-D UMM_xxx`
-2. A custom config filename using `-D UMM_CFGFILE="<filename.cfg>"`
+2. A custom config filename using `-D UMM_MALLOC_CFGFILE="<filename.cfg>"`
 3. The default config filename `path/to/config/umm_malloc_cfgport.h`
 4. The default configuration in `src/umm_malloc_cfg.h`
 

adaptabuild

@@ -71,10 +71,10 @@ $(MODULE)_INCPATH += $(PRODUCT)/config/$(MCU)
 $(MODULE)_CDEFS :=
 $(MODULE)_CDEFS +=
 
-$(call log_notice,UMM_CONFIG is $(UMM_CFGFILE))
+$(call log_notice,UMM_MALLOC_CFGFILE is $(UMM_MALLOC_CFGFILE))
 
-ifneq  (,$(UMM_CFGFILE))
-    $(MODULE)_CDEFS += UMM_CFGFILE=\"$(UMM_CFGFILE).h\"
+ifneq  (,$(UMM_MALLOC_CFGFILE))
+    $(MODULE)_CDEFS += UMM_MALLOC_CFGFILE=$(UMM_MALLOC_CFGFILE)
 endif
 
 $(MODULE)_CFLAGS :=

adaptabuild_module.mak

@@ -4,11 +4,46 @@
 # Here is where you specify your product options
 # ----------------------------------------------------------------------------
 
-PRODUCT_LIST := unittest  
+# The umm_malloc library can be build with a number of different options, and
+# we control the build by setting the UMM_MALLOC_CFGFILE on the command line
+#
+# The following configurations can be built as separate products, each one has
+# a corresponding .h file
+#
+# default
+# enable_critical_depth_check
+# enable_info
+# enable_inline_metrics
+# enable_integrity_checks
+# enable_poison_check
+# enable_first_fit
+#
+PRODUCT_LIST := default \
+                enable_info \
+                enable_critical_depth_check \
+                enable_inline_metrics \
+                enable_integrity_check \
+                enable_poison_check \
+                enable_first_fit  
 
 ifneq ($(filter $(PRODUCT),$(PRODUCT_LIST)),)
-  # Set PRODUCT_MAIN here based on $(PRODUCT)
-  # The unittest product typically does not need PRODUCT_MAIN
+    # Set PRODUCT_MAIN here based on $(PRODUCT)
+    # The unittest product typically does not need PRODUCT_MAIN
+    ifeq (default,$(PRODUCT))
+        UMM_MALLOC_CFGFILE := \"options/default.h\"
+    else ifeq (enable_info,$(PRODUCT))
+        UMM_MALLOC_CFGFILE := \"options/enable_umm_info.h\"
+    else ifeq (enable_critical_depth_check,$(PRODUCT))
+        UMM_MALLOC_CFGFILE := \"options/enable_critical_depth_check.h\"
+    else ifeq (enable_inline_metrics,$(PRODUCT))
+        UMM_MALLOC_CFGFILE := \"options/enable_inline_metrics.h\"
+    else ifeq (enable_integrity_check,$(PRODUCT))
+        UMM_MALLOC_CFGFILE := \"options/enable_integrity_check.h\"
+    else ifeq (enable_poison_check,$(PRODUCT))
+        UMM_MALLOC_CFGFILE := \"options/enable_poison_check.h\"
+    else ifeq (enable_first_fit,$(PRODUCT))
+        UMM_MALLOC_CFGFILE := \"options/enable_first_fit.h\"
+    endif
 else
   $(error PRODUCT must be one of $(PRODUCT_LIST))
 endif

adaptabuild_product.mak

@@ -0,0 +1 @@
+#define UMM_FIRST_FIT

src/options/enable_first_fit.h

@@ -0,0 +1 @@
+#define UMM_INLINE_METRICS

src/options/enable_inline_metrics.h

@@ -0,0 +1 @@
+#define UMM_INTEGRITY_CHECK

src/options/enable_integrity_check.h

@@ -0,0 +1 @@
+#define UMM_POISON_CHECK

src/options/enable_poison_check.h

@@ -24,7 +24,7 @@
  * of priority
  *
  * 1. Pass in the override values on the command line using -D UMM_xxx
- * 2. Pass in the filename holding override values using -D UMM_CFGFILE
+ * 2. Pass in the filename holding override values using -D UMM_MALLOC_CFGFILE
  * 3. Set up defaults in a file called umm_malloc_cfgport.h
  *
  * NOTE WELL: For the command line -D options to take highest priority, your
@@ -128,8 +128,8 @@
  * ----------------------------------------------------------------------------
  */
 
-#ifdef UMM_CFGFILE
-#include UMM_CFGFILE
+#ifdef UMM_MALLOC_CFGFILE
+#include UMM_MALLOC_CFGFILE
 #else
 #include <umm_malloc_cfgport.h>
 #endif