fixed compilation issue with --disable-inband configure option

diff --git a/flint/Makefile.am b/flint/Makefile.am
index 0041d10d0f6341c167a18cb043898d8d94471ce2..e4c032e5ca0991ec931b833f787bac24abf026e0 100755 (executable)
--- a/flint/Makefile.am
+++ b/flint/Makefile.am
@@ -32,6 +32,7 @@
 
 # Makefile.am -- Process this file with automake to produce Makefile.in
 MTCR_DIR    = $(top_srcdir)/mtcr_ul
+MTCR_INC_DIR = $(top_srcdir)/include/mtcr_ul
 MFLASH_DIR  = $(top_srcdir)/mflash
 COMMON_DIR  = $(top_srcdir)/common
 LAYOUTS_DIR = $(top_srcdir)/tools_layouts
@@ -39,7 +40,7 @@ MFT_UTILS_DIR = $(top_srcdir)/mft_utils
 CMDIF_DIR   = $(top_srcdir)/cmdif
 
 INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(MTCR_DIR) -I$(MFLASH_DIR) -I$(COMMON_DIR) \
-           -I$(LAYOUTS_DIR) -I$(MFT_UTILS_DIR)
+           -I$(LAYOUTS_DIR) -I$(MFT_UTILS_DIR) -I$(MTCR_INC_DIR)
 
 mstflint_CXXFLAGS = -Wall -W -g -MP -MD -pipe -DEXTERNAL
 bin_PROGRAMS = mstflint

diff --git a/mtcr_ul/mtcr_ul.c b/mtcr_ul/mtcr_ul.c
index aadeac6558a7f6301265791b86e72469e435c2de..20781d6700f6f720c62ebbe5fa3355ce00774a0f 100644 (file)
--- a/mtcr_ul/mtcr_ul.c
+++ b/mtcr_ul/mtcr_ul.c
@@ -1253,6 +1253,7 @@ name_parsed:
     *force = 0;
 #ifdef __aarch64__
     // on ARM processors MMAP not supported
+    (void)force_config;
     return MTCR_ACCESS_CONFIG;
 #else
     if (force_config) {

diff --git a/tools_res_mgmt/Makefile.am b/tools_res_mgmt/Makefile.am
index cf9819f59548562c9edc61e3dfb3908d1f869357..8231a8705e5e556d43b59d39eda7133f376a62df 100644 (file)
--- a/tools_res_mgmt/Makefile.am
+++ b/tools_res_mgmt/Makefile.am
@@ -40,3 +40,7 @@ noinst_LIBRARIES = libtools_res_mgmt.a
 
 libtools_res_mgmt_a_SOURCES = tools_res_mgmt.c tools_time.c
 
+if ENABLE_INBAND
+else
+AM_CFLAGS += -DNO_INBAND
+endif

diff --git a/tools_res_mgmt/tools_res_mgmt.c b/tools_res_mgmt/tools_res_mgmt.c
index 625da96e38d4fb8171b00652cabbec4463b96690..496acb42d8db04aae1cf50e8e0254e9e5e7229fe 100644 (file)
--- a/tools_res_mgmt/tools_res_mgmt.c
+++ b/tools_res_mgmt/tools_res_mgmt.c
@@ -38,7 +38,7 @@
 #include <common/compatibility.h>
 #include <dev_mgt/tools_dev_types.h>
 
-#if !defined(__FreeBSD__) && !defined(UEFI_BUILD)
+#if !defined(__FreeBSD__) && !defined(UEFI_BUILD) && !defined(NO_INBAND)
 #include <mtcr_ib_res_mgt.h>
 #endif
 
@@ -245,7 +245,7 @@ static trm_sts unlock_vsec_semaphore(mfile* mf, u_int32_t addr)
     return TRM_STS_OK;
 }
 
-#if !defined(__FreeBSD__) && !defined(UEFI_BUILD)
+#if !defined(__FreeBSD__) && !defined(UEFI_BUILD) && !defined(NO_INBAND)
 /************************************
  * Function: release_vs_mad_semaphore()
  ************************************/
@@ -377,7 +377,7 @@ trm_sts trm_create(trm_ctx* trm_p, mfile* mf)
     memset((*trm_p), 0, sizeof(struct trm_t));
     (*trm_p)->mf = mf;
 
-#if !defined(__FreeBSD__) && !defined(UEFI_BUILD)
+#if !defined(__FreeBSD__) && !defined(UEFI_BUILD) && !defined(NO_INBAND)
     u_int32_t dev_flags = 0;
     if (!mget_mdevs_flags(mf, &dev_flags)) {
         if ((dev_flags & MDEVS_IB) && mib_semaphore_lock_is_supported(mf) == 1) {
@@ -428,7 +428,7 @@ trm_sts trm_lock(trm_ctx trm, trm_resourse res, unsigned int max_retries)
     case TRM_RES_ICMD:
         if (trm->dev_sem_info->vsec_sem_supported && mget_vsec_supp(trm->mf)) {
             return lock_vsec_semaphore(trm->mf, g_vsec_sem_addr[TRM_RES_ICMD], max_retries);
-#if !defined(__FreeBSD__) && !defined(UEFI_BUILD)
+#if !defined(__FreeBSD__) && !defined(UEFI_BUILD) && !defined(NO_INBAND)
         } else if (trm->dev_sem_info->vsec_sem_supported && (dev_type & MDEVS_IB)) {
             return lock_vs_mad_semaphore(trm, TRM_RES_ICMD, max_retries);
 #endif
@@ -439,7 +439,7 @@ trm_sts trm_lock(trm_ctx trm, trm_resourse res, unsigned int max_retries)
     case TRM_RES_FLASH_PROGRAMING:
         if (trm->dev_sem_info->vsec_sem_supported && mget_vsec_supp(trm->mf)) {
             return lock_vsec_semaphore(trm->mf, g_vsec_sem_addr[TRM_RES_FLASH_PROGRAMING], max_retries);
-#if !defined(__FreeBSD__) && !defined(UEFI_BUILD)
+#if !defined(__FreeBSD__) && !defined(UEFI_BUILD) && !defined(NO_INBAND)
         } else if (trm->dev_sem_info->vsec_sem_supported && (dev_type & MDEVS_IB)) {
             return lock_vs_mad_semaphore(trm, TRM_RES_FLASH_PROGRAMING, max_retries);
 #endif
@@ -482,7 +482,7 @@ trm_sts trm_unlock(trm_ctx trm, trm_resourse res)
     case TRM_RES_ICMD:
         if (trm->dev_sem_info->vsec_sem_supported && mget_vsec_supp(trm->mf)) {
             return unlock_vsec_semaphore(trm->mf, g_vsec_sem_addr[TRM_RES_ICMD]);
-#if !defined(__FreeBSD__) && !defined(UEFI_BUILD)
+#if !defined(__FreeBSD__) && !defined(UEFI_BUILD) && !defined(NO_INBAND)
         } else if (trm->dev_sem_info->vsec_sem_supported && (dev_type & MDEVS_IB)) {
             return release_vs_mad_semaphore(trm, TRM_RES_ICMD);
 #endif
@@ -493,7 +493,7 @@ trm_sts trm_unlock(trm_ctx trm, trm_resourse res)
     case TRM_RES_FLASH_PROGRAMING:
         if (trm->dev_sem_info->vsec_sem_supported && mget_vsec_supp(trm->mf)) {
                    return unlock_vsec_semaphore(trm->mf, g_vsec_sem_addr[TRM_RES_FLASH_PROGRAMING]);
-#if !defined(__FreeBSD__) && !defined(UEFI_BUILD)
+#if !defined(__FreeBSD__) && !defined(UEFI_BUILD) && !defined(NO_INBAND)
         } else if (trm->dev_sem_info->vsec_sem_supported && (dev_type & MDEVS_IB)) {
             return release_vs_mad_semaphore(trm, TRM_RES_FLASH_PROGRAMING);
 #endif