diff options
author | James Prestwood <james.prestwood@intel.com> | 2017-02-16 14:31:25 -0800 |
---|---|---|
committer | Geoff Gustafson <geoff@linux.intel.com> | 2017-02-16 14:31:25 -0800 |
commit | 46110bb83b610fa81dd76bc93e8b6190295d5065 (patch) | |
tree | 84c89ee2e3f77f1a5f695f13ab2c812d9a1cfbdc /Makefile.ocf_zephyr | |
parent | 59cdb74c8048a0c8c3109a31d10e0f42bb6fa4a3 (diff) |
[ocf] Fixed OCF debug flags (#747)
- OCF debugging was enabled by default, now controlled by VARIANT
- Fixed two warnings in OCF
Signed-off-by: James Prestwood <james.prestwood@intel.com>
Diffstat (limited to 'Makefile.ocf_zephyr')
-rw-r--r-- | Makefile.ocf_zephyr | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Makefile.ocf_zephyr b/Makefile.ocf_zephyr index 58133c1..cde2dd8 100644 --- a/Makefile.ocf_zephyr +++ b/Makefile.ocf_zephyr @@ -10,18 +10,23 @@ ccflags-y += -I$(OCF_ROOT)/port/zephyr/src \ -I$(OCF_ROOT)/include -I$(OCF_ROOT) \ -I$(OCF_ROOT)/deps/tinydtls -ccflags-y += -DDTLSV12 \ - -DWITH_SHA256 \ - -DDTLS_CHECK_CONTENTTYPE \ - -DWITH_OCF \ +ccflags-y += -DWITH_OCF \ -DOC_SERVER \ - -DOC_DEBUG \ -DNDEBUG + ifneq ($(BLE_ADDR), none) ccflags-y += -DZJS_CONFIG_BLE_ADDRESS=\"$(BLE_ADDR)\" endif + +ifeq ($(VARIANT), debug) +ccflags-y += -DOC_DEBUG +endif + ifeq ($(SECURE), 1) -ccflags-y += -DOC_SECURITY +ccflags-y += -DOC_SECURITY \ + -DDTLSV12 \ + -DWITH_SHA256 \ + -DDTLS_CHECK_CONTENTTYPE endif ccflags-y += -include $(ZJS_BASE)/$(OCF_ROOT)/port/zephyr/src/config.h |