Remove OPENAMP_BAREMETAL

bm_env.c will be picked when the system is set to generic.
It is not required to set OPENAMP_BAREMETAL macro anymore.

Signed-off-by: Wendy Liang <jliang@xilinx.com>

diff --git a/lib/Makefile b/lib/Makefile
index 17bac36dada370bf2fe7f9b2c032c0895827e426..5207f28d94b26e465c609bfdeafaebb6c611e63e 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -22,15 +22,11 @@ INCLUDES :=
 -include system/$(SYSTEM)/machine/$(MACHINE)/Makefile.platform
 -include system/$(SYSTEM)/Makefile.include
 
-ifeq ($(SYSTEM),generic)
-CFLAGS +=-D"OPENAMP_BAREMETAL=1"
-
 ifeq ($(ROLE),master)
 CFLAGS+=-D"MASTER=1"
 else
 CFLAGS+=-D"MASTER=0"
 endif
-endif
 
 ifeq ($(BENCHMARK),1)
 CFLAGS+=-D"OPENAMP_BENCHMARK_ENABLE"

diff --git a/lib/system/generic/bm_env.c b/lib/system/generic/bm_env.c
index 83f104173cc363afd7bdbab75d125e6921355854..fb7da5ae66df6b08a05aff06a764478ff1ade63c 100755 (executable)
--- a/lib/system/generic/bm_env.c
+++ b/lib/system/generic/bm_env.c
@@ -41,7 +41,6 @@
  *
  **************************************************************************/
 
-#ifdef OPENAMP_BAREMETAL
 #include "openamp/env.h"
 #include "machine.h"
 
@@ -551,4 +550,3 @@ static void release_spin_lock(void *plock)
 
        xchg(plock, 1);
 }
-#endif