zephyrproject-rtos · galak · May 22, 2018 · May 22, 2018 · May 22, 2018
diff --git a/ext/hal/CMakeLists.txt b/ext/hal/CMakeLists.txt
@@ -1,5 +1,13 @@
+if(CONFIG_LIBMETAL)
+  set(WITH_ZEPHYR 1)
+  set(WITH_ZEPHYR_LIB 1)
+  set(WITH_DOC OFF CACHE BOOL "" FORCE)
+  set(WITH_DEFAULT_LOGGER OFF CACHE BOOL "" FORCE)
+endif(CONFIG_LIBMETAL)
+
 add_subdirectory(atmel)
 add_subdirectory(cmsis)
+add_subdirectory_ifdef(CONFIG_LIBMETAL libmetal)
 add_subdirectory(nordic)
 add_subdirectory(nxp)
 add_subdirectory_if_kconfig(qmsi)

diff --git a/ext/hal/Kconfig b/ext/hal/Kconfig
@@ -16,6 +16,8 @@ source "ext/hal/altera/Kconfig"
 
 source "ext/hal/cmsis/Kconfig"
 
+source "ext/hal/libmetal/Kconfig"
+
 source "ext/hal/nordic/Kconfig"
 
 source "ext/hal/nxp/mcux/Kconfig"

diff --git a/ext/hal/README b/ext/hal/README
@@ -12,6 +12,10 @@ cmsis
 The ARM Cortex Microcontroller Software Interface Standard (CMSIS) defines a
 set of standard interfaces to ARM Cortex-M SoCs.
 
+libmetal
+--------
+libmetal provides a HAL abstraction layer utilized by open-amp
+
 gecko
 -----
 The Silicon Labs Gecko SDK provides device header files and peripheral drivers

diff --git a/ext/lib/ipc/README.libmetal → ext/hal/README.libmetal b/ext/lib/ipc/README.libmetal → ext/hal/README.libmetal
@@ -5,7 +5,7 @@ Origin:
    https://github.com/OpenAMP/libmetal
 
 Status:
-   606c31438025b9fb1515dace1c642d5835d8d33c [v2018.04]
+   b4b5beab4b71388d63c732470b6d6da606ae8ffc
 
    When we import libmetal we removed the tests/ and examples/ dir to reduce
    the amount of code imported.
@@ -29,7 +29,7 @@ URL:
    https://github.com/OpenAMP/libmetal
 
 commit:
-   606c31438025b9fb1515dace1c642d5835d8d33c
+   b4b5beab4b71388d63c732470b6d6da606ae8ffc
 
 Maintained-by:
    External

diff --git a/ext/lib/ipc/libmetal/.gitignore → ext/hal/libmetal/.gitignore b/ext/lib/ipc/libmetal/.gitignore → ext/hal/libmetal/.gitignore
diff --git a/ext/lib/ipc/libmetal/.travis.yml → ext/hal/libmetal/.travis.yml b/ext/lib/ipc/libmetal/.travis.yml → ext/hal/libmetal/.travis.yml
diff --git a/ext/lib/ipc/libmetal/CMakeLists.txt → ext/hal/libmetal/CMakeLists.txt b/ext/lib/ipc/libmetal/CMakeLists.txt → ext/hal/libmetal/CMakeLists.txt
@@ -1,9 +1,12 @@
 cmake_minimum_required (VERSION 2.6)
+if (POLICY CMP0048)
+  cmake_policy(SET CMP0048 NEW)
+endif()
 
 list (APPEND CMAKE_MODULE_PATH
-      "${CMAKE_SOURCE_DIR}/cmake"
-      "${CMAKE_SOURCE_DIR}/cmake/modules"
-      "${CMAKE_SOURCE_DIR}/cmake/platforms")
+      "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
+      "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
+      "${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms")
 
 include (syscheck)
 project (metal C)

diff --git a/ext/hal/libmetal/Kconfig b/ext/hal/libmetal/Kconfig
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2018 Linaro Limited
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config LIBMETAL
+	bool
+	prompt "libmetal Support"
+	default n
+	help
+	  This option enables the libmetal HAL abstraction layer
diff --git a/ext/lib/ipc/libmetal/LICENSE.md → ext/hal/libmetal/LICENSE.md b/ext/lib/ipc/libmetal/LICENSE.md → ext/hal/libmetal/LICENSE.md
diff --git a/ext/lib/ipc/libmetal/MAINTAINERS.md → ext/hal/libmetal/MAINTAINERS.md b/ext/lib/ipc/libmetal/MAINTAINERS.md → ext/hal/libmetal/MAINTAINERS.md
diff --git a/ext/lib/ipc/libmetal/README.md → ext/hal/libmetal/README.md b/ext/lib/ipc/libmetal/README.md → ext/hal/libmetal/README.md
diff --git a/ext/lib/ipc/libmetal/cmake/collect.cmake → ext/hal/libmetal/cmake/collect.cmake b/ext/lib/ipc/libmetal/cmake/collect.cmake → ext/hal/libmetal/cmake/collect.cmake
diff --git a/ext/lib/ipc/libmetal/cmake/depends.cmake → ext/hal/libmetal/cmake/depends.cmake b/ext/lib/ipc/libmetal/cmake/depends.cmake → ext/hal/libmetal/cmake/depends.cmake
diff --git a/...ibmetal/cmake/modules/FindHugeTLBFS.cmake → ...ibmetal/cmake/modules/FindHugeTLBFS.cmake b/...ibmetal/cmake/modules/FindHugeTLBFS.cmake → ...ibmetal/cmake/modules/FindHugeTLBFS.cmake
diff --git a/...pc/libmetal/cmake/modules/FindLibRt.cmake → ...al/libmetal/cmake/modules/FindLibRt.cmake b/...pc/libmetal/cmake/modules/FindLibRt.cmake → ...al/libmetal/cmake/modules/FindLibRt.cmake
diff --git a/...libmetal/cmake/modules/FindLibSysFS.cmake → ...libmetal/cmake/modules/FindLibSysFS.cmake b/...libmetal/cmake/modules/FindLibSysFS.cmake → ...libmetal/cmake/modules/FindLibSysFS.cmake
diff --git a/ext/lib/ipc/libmetal/cmake/options.cmake → ext/hal/libmetal/cmake/options.cmake b/ext/lib/ipc/libmetal/cmake/options.cmake → ext/hal/libmetal/cmake/options.cmake
@@ -51,6 +51,10 @@ if (WITH_TESTS AND (${_host} STREQUAL ${_target}))
   option (WITH_TESTS_EXEC "Run test applications during build" ON)
 endif (WITH_TESTS AND (${_host} STREQUAL ${_target}))
 
+if (WITH_ZEPHYR)
+  option (WITH_ZEPHYR_LIB "Build libmetal as a zephyr library" OFF)
+endif (WITH_ZEPHYR)
+
 option (WITH_DEFAULT_LOGGER "Build with default logger" ON)
 
 option (WITH_DOC "Build with documentation" ON)

diff --git a/.../cmake/platforms/cross-freertos-gcc.cmake → .../cmake/platforms/cross-freertos-gcc.cmake b/.../cmake/platforms/cross-freertos-gcc.cmake → .../cmake/platforms/cross-freertos-gcc.cmake
diff --git a/...l/cmake/platforms/cross-generic-gcc.cmake → ...l/cmake/platforms/cross-generic-gcc.cmake b/...l/cmake/platforms/cross-generic-gcc.cmake → ...l/cmake/platforms/cross-generic-gcc.cmake
diff --git a/...l/cmake/platforms/cross-generic-iar.cmake → ...l/cmake/platforms/cross-generic-iar.cmake b/...l/cmake/platforms/cross-generic-iar.cmake → ...l/cmake/platforms/cross-generic-iar.cmake
diff --git a/...tal/cmake/platforms/cross-linux-gcc.cmake → ...tal/cmake/platforms/cross-linux-gcc.cmake b/...tal/cmake/platforms/cross-linux-gcc.cmake → ...tal/cmake/platforms/cross-linux-gcc.cmake
diff --git a/.../cmake/platforms/microblaze-generic.cmake → .../cmake/platforms/microblaze-generic.cmake b/.../cmake/platforms/microblaze-generic.cmake → .../cmake/platforms/microblaze-generic.cmake
diff --git a/...l/cmake/platforms/template-freertos.cmake → ...l/cmake/platforms/template-freertos.cmake b/...l/cmake/platforms/template-freertos.cmake → ...l/cmake/platforms/template-freertos.cmake
diff --git a/...al/cmake/platforms/template-generic.cmake → ...al/cmake/platforms/template-generic.cmake b/...al/cmake/platforms/template-generic.cmake → ...al/cmake/platforms/template-generic.cmake
diff --git a/...etal/cmake/platforms/zynq7-freertos.cmake → ...etal/cmake/platforms/zynq7-freertos.cmake b/...etal/cmake/platforms/zynq7-freertos.cmake → ...etal/cmake/platforms/zynq7-freertos.cmake
diff --git a/...l/cmake/platforms/zynq7-generic-iar.cmake → ...l/cmake/platforms/zynq7-generic-iar.cmake b/...l/cmake/platforms/zynq7-generic-iar.cmake → ...l/cmake/platforms/zynq7-generic-iar.cmake
diff --git a/...metal/cmake/platforms/zynq7-generic.cmake → ...metal/cmake/platforms/zynq7-generic.cmake b/...metal/cmake/platforms/zynq7-generic.cmake → ...metal/cmake/platforms/zynq7-generic.cmake
diff --git a/...ibmetal/cmake/platforms/zynq7-linux.cmake → ...ibmetal/cmake/platforms/zynq7-linux.cmake b/...ibmetal/cmake/platforms/zynq7-linux.cmake → ...ibmetal/cmake/platforms/zynq7-linux.cmake
diff --git a/...cmake/platforms/zynqmp-a53-freertos.cmake → ...cmake/platforms/zynqmp-a53-freertos.cmake b/...cmake/platforms/zynqmp-a53-freertos.cmake → ...cmake/platforms/zynqmp-a53-freertos.cmake
diff --git a/.../cmake/platforms/zynqmp-a53-generic.cmake → .../cmake/platforms/zynqmp-a53-generic.cmake b/.../cmake/platforms/zynqmp-a53-generic.cmake → .../cmake/platforms/zynqmp-a53-generic.cmake
diff --git a/...bmetal/cmake/platforms/zynqmp-linux.cmake → ...bmetal/cmake/platforms/zynqmp-linux.cmake b/...bmetal/cmake/platforms/zynqmp-linux.cmake → ...bmetal/cmake/platforms/zynqmp-linux.cmake
diff --git a/.../cmake/platforms/zynqmp-r5-freertos.cmake → .../cmake/platforms/zynqmp-r5-freertos.cmake b/.../cmake/platforms/zynqmp-r5-freertos.cmake → .../cmake/platforms/zynqmp-r5-freertos.cmake
diff --git a/...l/cmake/platforms/zynqmp-r5-generic.cmake → ...l/cmake/platforms/zynqmp-r5-generic.cmake b/...l/cmake/platforms/zynqmp-r5-generic.cmake → ...l/cmake/platforms/zynqmp-r5-generic.cmake
diff --git a/ext/lib/ipc/libmetal/cmake/syscheck.cmake → ext/hal/libmetal/cmake/syscheck.cmake b/ext/lib/ipc/libmetal/cmake/syscheck.cmake → ext/hal/libmetal/cmake/syscheck.cmake
@@ -4,8 +4,9 @@ if (WITH_ZEPHYR)
   set (CMAKE_SYSTEM_NAME "Generic"             CACHE STRING "")
   string (TOLOWER "Zephyr"                PROJECT_SYSTEM)
   string (TOUPPER "Zephyr"                PROJECT_SYSTEM_UPPER)
-  set(IS_TEST 1)
-  include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
+  if (NOT WITH_ZEPHYR_LIB)
+    include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
+  endif()
   if (CONFIG_CPU_CORTEX_M)
     set (MACHINE "cortexm" CACHE STRING "")
   endif (CONFIG_CPU_CORTEX_M)

diff --git a/ext/lib/ipc/libmetal/doc/CMakeLists.txt → ext/hal/libmetal/doc/CMakeLists.txt b/ext/lib/ipc/libmetal/doc/CMakeLists.txt → ext/hal/libmetal/doc/CMakeLists.txt
diff --git a/ext/lib/ipc/libmetal/doc/Doxyfile.in → ext/hal/libmetal/doc/Doxyfile.in b/ext/lib/ipc/libmetal/doc/Doxyfile.in → ext/hal/libmetal/doc/Doxyfile.in
diff --git a/ext/lib/ipc/libmetal/lib/CMakeLists.txt → ext/hal/libmetal/lib/CMakeLists.txt b/ext/lib/ipc/libmetal/lib/CMakeLists.txt → ext/hal/libmetal/lib/CMakeLists.txt
@@ -64,6 +64,7 @@ if (WITH_ZEPHYR)
   zephyr_library_named(metal)
   add_dependencies(metal offsets_h)
   target_sources (metal PRIVATE ${_sources})
+  zephyr_include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
 else (WITH_ZEPHYR)
   # Build a shared library if so configured.
   if (WITH_SHARED_LIB)

diff --git a/ext/lib/ipc/libmetal/lib/alloc.h → ext/hal/libmetal/lib/alloc.h b/ext/lib/ipc/libmetal/lib/alloc.h → ext/hal/libmetal/lib/alloc.h
diff --git a/ext/lib/ipc/libmetal/lib/assert.h → ext/hal/libmetal/lib/assert.h b/ext/lib/ipc/libmetal/lib/assert.h → ext/hal/libmetal/lib/assert.h
diff --git a/ext/lib/ipc/libmetal/lib/atomic.h → ext/hal/libmetal/lib/atomic.h b/ext/lib/ipc/libmetal/lib/atomic.h → ext/hal/libmetal/lib/atomic.h
diff --git a/ext/lib/ipc/libmetal/lib/cache.h → ext/hal/libmetal/lib/cache.h b/ext/lib/ipc/libmetal/lib/cache.h → ext/hal/libmetal/lib/cache.h
diff --git a/ext/lib/ipc/libmetal/lib/compiler.h → ext/hal/libmetal/lib/compiler.h b/ext/lib/ipc/libmetal/lib/compiler.h → ext/hal/libmetal/lib/compiler.h
diff --git a/.../ipc/libmetal/lib/compiler/CMakeLists.txt → ext/hal/libmetal/lib/compiler/CMakeLists.txt b/.../ipc/libmetal/lib/compiler/CMakeLists.txt → ext/hal/libmetal/lib/compiler/CMakeLists.txt
diff --git a/.../libmetal/lib/compiler/gcc/CMakeLists.txt → .../libmetal/lib/compiler/gcc/CMakeLists.txt b/.../libmetal/lib/compiler/gcc/CMakeLists.txt → .../libmetal/lib/compiler/gcc/CMakeLists.txt
diff --git a/...ib/ipc/libmetal/lib/compiler/gcc/atomic.h → ext/hal/libmetal/lib/compiler/gcc/atomic.h b/...ib/ipc/libmetal/lib/compiler/gcc/atomic.h → ext/hal/libmetal/lib/compiler/gcc/atomic.h
diff --git a/.../ipc/libmetal/lib/compiler/gcc/compiler.h → ext/hal/libmetal/lib/compiler/gcc/compiler.h b/.../ipc/libmetal/lib/compiler/gcc/compiler.h → ext/hal/libmetal/lib/compiler/gcc/compiler.h
diff --git a/ext/lib/ipc/libmetal/lib/condition.h → ext/hal/libmetal/lib/condition.h b/ext/lib/ipc/libmetal/lib/condition.h → ext/hal/libmetal/lib/condition.h
diff --git a/ext/lib/ipc/libmetal/lib/config.h → ext/hal/libmetal/lib/config.h b/ext/lib/ipc/libmetal/lib/config.h → ext/hal/libmetal/lib/config.h
diff --git a/ext/lib/ipc/libmetal/lib/cpu.h → ext/hal/libmetal/lib/cpu.h b/ext/lib/ipc/libmetal/lib/cpu.h → ext/hal/libmetal/lib/cpu.h
diff --git a/ext/lib/ipc/libmetal/lib/device.c → ext/hal/libmetal/lib/device.c b/ext/lib/ipc/libmetal/lib/device.c → ext/hal/libmetal/lib/device.c
diff --git a/ext/lib/ipc/libmetal/lib/device.h → ext/hal/libmetal/lib/device.h b/ext/lib/ipc/libmetal/lib/device.h → ext/hal/libmetal/lib/device.h
diff --git a/ext/lib/ipc/libmetal/lib/dma.c → ext/hal/libmetal/lib/dma.c b/ext/lib/ipc/libmetal/lib/dma.c → ext/hal/libmetal/lib/dma.c
diff --git a/ext/lib/ipc/libmetal/lib/dma.h → ext/hal/libmetal/lib/dma.h b/ext/lib/ipc/libmetal/lib/dma.h → ext/hal/libmetal/lib/dma.h
diff --git a/ext/lib/ipc/libmetal/lib/init.c → ext/hal/libmetal/lib/init.c b/ext/lib/ipc/libmetal/lib/init.c → ext/hal/libmetal/lib/init.c
diff --git a/ext/lib/ipc/libmetal/lib/io.c → ext/hal/libmetal/lib/io.c b/ext/lib/ipc/libmetal/lib/io.c → ext/hal/libmetal/lib/io.c
diff --git a/ext/lib/ipc/libmetal/lib/io.h → ext/hal/libmetal/lib/io.h b/ext/lib/ipc/libmetal/lib/io.h → ext/hal/libmetal/lib/io.h
diff --git a/ext/lib/ipc/libmetal/lib/irq.h → ext/hal/libmetal/lib/irq.h b/ext/lib/ipc/libmetal/lib/irq.h → ext/hal/libmetal/lib/irq.h
diff --git a/ext/lib/ipc/libmetal/lib/list.h → ext/hal/libmetal/lib/list.h b/ext/lib/ipc/libmetal/lib/list.h → ext/hal/libmetal/lib/list.h
diff --git a/ext/lib/ipc/libmetal/lib/log.c → ext/hal/libmetal/lib/log.c b/ext/lib/ipc/libmetal/lib/log.c → ext/hal/libmetal/lib/log.c
diff --git a/ext/lib/ipc/libmetal/lib/log.h → ext/hal/libmetal/lib/log.h b/ext/lib/ipc/libmetal/lib/log.h → ext/hal/libmetal/lib/log.h
diff --git a/ext/lib/ipc/libmetal/lib/mutex.h → ext/hal/libmetal/lib/mutex.h b/ext/lib/ipc/libmetal/lib/mutex.h → ext/hal/libmetal/lib/mutex.h
diff --git a/...ipc/libmetal/lib/processor/CMakeLists.txt → ...hal/libmetal/lib/processor/CMakeLists.txt b/...ipc/libmetal/lib/processor/CMakeLists.txt → ...hal/libmetal/lib/processor/CMakeLists.txt
diff --git a/...etal/lib/processor/aarch64/CMakeLists.txt → ...etal/lib/processor/aarch64/CMakeLists.txt b/...etal/lib/processor/aarch64/CMakeLists.txt → ...etal/lib/processor/aarch64/CMakeLists.txt
diff --git a/...c/libmetal/lib/processor/aarch64/atomic.h → ...l/libmetal/lib/processor/aarch64/atomic.h b/...c/libmetal/lib/processor/aarch64/atomic.h → ...l/libmetal/lib/processor/aarch64/atomic.h
diff --git a/.../ipc/libmetal/lib/processor/aarch64/cpu.h → ext/hal/libmetal/lib/processor/aarch64/cpu.h b/.../ipc/libmetal/lib/processor/aarch64/cpu.h → ext/hal/libmetal/lib/processor/aarch64/cpu.h
diff --git a/...libmetal/lib/processor/arm/CMakeLists.txt → ...libmetal/lib/processor/arm/CMakeLists.txt b/...libmetal/lib/processor/arm/CMakeLists.txt → ...libmetal/lib/processor/arm/CMakeLists.txt
diff --git a/...b/ipc/libmetal/lib/processor/arm/atomic.h → ext/hal/libmetal/lib/processor/arm/atomic.h b/...b/ipc/libmetal/lib/processor/arm/atomic.h → ext/hal/libmetal/lib/processor/arm/atomic.h
diff --git a/ext/lib/ipc/libmetal/lib/processor/arm/cpu.h → ext/hal/libmetal/lib/processor/arm/cpu.h b/ext/lib/ipc/libmetal/lib/processor/arm/cpu.h → ext/hal/libmetal/lib/processor/arm/cpu.h
diff --git a/...l/lib/processor/microblaze/CMakeLists.txt → ...l/lib/processor/microblaze/CMakeLists.txt b/...l/lib/processor/microblaze/CMakeLists.txt → ...l/lib/processor/microblaze/CMakeLists.txt
diff --git a/...ibmetal/lib/processor/microblaze/atomic.h → ...ibmetal/lib/processor/microblaze/atomic.h b/...ibmetal/lib/processor/microblaze/atomic.h → ...ibmetal/lib/processor/microblaze/atomic.h
diff --git a/...c/libmetal/lib/processor/microblaze/cpu.h → ...l/libmetal/lib/processor/microblaze/cpu.h b/...c/libmetal/lib/processor/microblaze/cpu.h → ...l/libmetal/lib/processor/microblaze/cpu.h
diff --git a/...metal/lib/processor/x86_64/CMakeLists.txt → ...metal/lib/processor/x86_64/CMakeLists.txt b/...metal/lib/processor/x86_64/CMakeLists.txt → ...metal/lib/processor/x86_64/CMakeLists.txt
diff --git a/...pc/libmetal/lib/processor/x86_64/atomic.h → ...al/libmetal/lib/processor/x86_64/atomic.h b/...pc/libmetal/lib/processor/x86_64/atomic.h → ...al/libmetal/lib/processor/x86_64/atomic.h
diff --git a/...b/ipc/libmetal/lib/processor/x86_64/cpu.h → ext/hal/libmetal/lib/processor/x86_64/cpu.h b/...b/ipc/libmetal/lib/processor/x86_64/cpu.h → ext/hal/libmetal/lib/processor/x86_64/cpu.h
diff --git a/ext/lib/ipc/libmetal/lib/shmem.c → ext/hal/libmetal/lib/shmem.c b/ext/lib/ipc/libmetal/lib/shmem.c → ext/hal/libmetal/lib/shmem.c
diff --git a/ext/lib/ipc/libmetal/lib/shmem.h → ext/hal/libmetal/lib/shmem.h b/ext/lib/ipc/libmetal/lib/shmem.h → ext/hal/libmetal/lib/shmem.h
diff --git a/ext/lib/ipc/libmetal/lib/sleep.h → ext/hal/libmetal/lib/sleep.h b/ext/lib/ipc/libmetal/lib/sleep.h → ext/hal/libmetal/lib/sleep.h
diff --git a/ext/lib/ipc/libmetal/lib/spinlock.h → ext/hal/libmetal/lib/spinlock.h b/ext/lib/ipc/libmetal/lib/spinlock.h → ext/hal/libmetal/lib/spinlock.h
diff --git a/ext/lib/ipc/libmetal/lib/sys.h → ext/hal/libmetal/lib/sys.h b/ext/lib/ipc/libmetal/lib/sys.h → ext/hal/libmetal/lib/sys.h
diff --git a/...ib/ipc/libmetal/lib/system/CMakeLists.txt → ext/hal/libmetal/lib/system/CMakeLists.txt b/...ib/ipc/libmetal/lib/system/CMakeLists.txt → ext/hal/libmetal/lib/system/CMakeLists.txt
diff --git a/...bmetal/lib/system/freertos/CMakeLists.txt → ...bmetal/lib/system/freertos/CMakeLists.txt b/...bmetal/lib/system/freertos/CMakeLists.txt → ...bmetal/lib/system/freertos/CMakeLists.txt
diff --git a/.../ipc/libmetal/lib/system/freertos/alloc.h → ext/hal/libmetal/lib/system/freertos/alloc.h b/.../ipc/libmetal/lib/system/freertos/alloc.h → ext/hal/libmetal/lib/system/freertos/alloc.h
diff --git a/...ipc/libmetal/lib/system/freertos/assert.h → ...hal/libmetal/lib/system/freertos/assert.h b/...ipc/libmetal/lib/system/freertos/assert.h → ...hal/libmetal/lib/system/freertos/assert.h
diff --git a/.../ipc/libmetal/lib/system/freertos/cache.h → ext/hal/libmetal/lib/system/freertos/cache.h b/.../ipc/libmetal/lib/system/freertos/cache.h → ext/hal/libmetal/lib/system/freertos/cache.h
diff --git a/.../libmetal/lib/system/freertos/condition.c → .../libmetal/lib/system/freertos/condition.c b/.../libmetal/lib/system/freertos/condition.c → .../libmetal/lib/system/freertos/condition.c
diff --git a/.../libmetal/lib/system/freertos/condition.h → .../libmetal/lib/system/freertos/condition.h b/.../libmetal/lib/system/freertos/condition.h → .../libmetal/lib/system/freertos/condition.h
diff --git a/...ipc/libmetal/lib/system/freertos/device.c → ...hal/libmetal/lib/system/freertos/device.c b/...ipc/libmetal/lib/system/freertos/device.c → ...hal/libmetal/lib/system/freertos/device.c
diff --git a/...b/ipc/libmetal/lib/system/freertos/init.c → ext/hal/libmetal/lib/system/freertos/init.c b/...b/ipc/libmetal/lib/system/freertos/init.c → ext/hal/libmetal/lib/system/freertos/init.c
diff --git a/...lib/ipc/libmetal/lib/system/freertos/io.c → ext/hal/libmetal/lib/system/freertos/io.c b/...lib/ipc/libmetal/lib/system/freertos/io.c → ext/hal/libmetal/lib/system/freertos/io.c
diff --git a/...lib/ipc/libmetal/lib/system/freertos/io.h → ext/hal/libmetal/lib/system/freertos/io.h b/...lib/ipc/libmetal/lib/system/freertos/io.h → ext/hal/libmetal/lib/system/freertos/io.h
diff --git a/...ib/ipc/libmetal/lib/system/freertos/irq.c → ext/hal/libmetal/lib/system/freertos/irq.c b/...ib/ipc/libmetal/lib/system/freertos/irq.c → ext/hal/libmetal/lib/system/freertos/irq.c
diff --git a/...ib/ipc/libmetal/lib/system/freertos/irq.h → ext/hal/libmetal/lib/system/freertos/irq.h b/...ib/ipc/libmetal/lib/system/freertos/irq.h → ext/hal/libmetal/lib/system/freertos/irq.h
diff --git a/...ib/ipc/libmetal/lib/system/freertos/log.h → ext/hal/libmetal/lib/system/freertos/log.h b/...ib/ipc/libmetal/lib/system/freertos/log.h → ext/hal/libmetal/lib/system/freertos/log.h
diff --git a/.../ipc/libmetal/lib/system/freertos/mutex.h → ext/hal/libmetal/lib/system/freertos/mutex.h b/.../ipc/libmetal/lib/system/freertos/mutex.h → ext/hal/libmetal/lib/system/freertos/mutex.h
diff --git a/.../ipc/libmetal/lib/system/freertos/shmem.c → ext/hal/libmetal/lib/system/freertos/shmem.c b/.../ipc/libmetal/lib/system/freertos/shmem.c → ext/hal/libmetal/lib/system/freertos/shmem.c
diff --git a/.../ipc/libmetal/lib/system/freertos/sleep.h → ext/hal/libmetal/lib/system/freertos/sleep.h b/.../ipc/libmetal/lib/system/freertos/sleep.h → ext/hal/libmetal/lib/system/freertos/sleep.h
diff --git a/...ib/ipc/libmetal/lib/system/freertos/sys.h → ext/hal/libmetal/lib/system/freertos/sys.h b/...ib/ipc/libmetal/lib/system/freertos/sys.h → ext/hal/libmetal/lib/system/freertos/sys.h
diff --git a/...b/system/freertos/template/CMakeLists.txt → ...b/system/freertos/template/CMakeLists.txt b/...b/system/freertos/template/CMakeLists.txt → ...b/system/freertos/template/CMakeLists.txt
diff --git a/...bmetal/lib/system/freertos/template/sys.c → ...bmetal/lib/system/freertos/template/sys.c b/...bmetal/lib/system/freertos/template/sys.c → ...bmetal/lib/system/freertos/template/sys.c
diff --git a/...bmetal/lib/system/freertos/template/sys.h → ...bmetal/lib/system/freertos/template/sys.h b/...bmetal/lib/system/freertos/template/sys.h → ...bmetal/lib/system/freertos/template/sys.h
diff --git a/...b/ipc/libmetal/lib/system/freertos/time.c → ext/hal/libmetal/lib/system/freertos/time.c b/...b/ipc/libmetal/lib/system/freertos/time.c → ext/hal/libmetal/lib/system/freertos/time.c
diff --git a/.../lib/system/freertos/zynq7/CMakeLists.txt → .../lib/system/freertos/zynq7/CMakeLists.txt b/.../lib/system/freertos/zynq7/CMakeLists.txt → .../lib/system/freertos/zynq7/CMakeLists.txt
diff --git a/.../libmetal/lib/system/freertos/zynq7/sys.c → .../libmetal/lib/system/freertos/zynq7/sys.c b/.../libmetal/lib/system/freertos/zynq7/sys.c → .../libmetal/lib/system/freertos/zynq7/sys.c
diff --git a/.../libmetal/lib/system/freertos/zynq7/sys.h → .../libmetal/lib/system/freertos/zynq7/sys.h b/.../libmetal/lib/system/freertos/zynq7/sys.h → .../libmetal/lib/system/freertos/zynq7/sys.h
diff --git a/...system/freertos/zynqmp_a53/CMakeLists.txt → ...system/freertos/zynqmp_a53/CMakeLists.txt b/...system/freertos/zynqmp_a53/CMakeLists.txt → ...system/freertos/zynqmp_a53/CMakeLists.txt
diff --git a/...etal/lib/system/freertos/zynqmp_a53/sys.c → ...etal/lib/system/freertos/zynqmp_a53/sys.c b/...etal/lib/system/freertos/zynqmp_a53/sys.c → ...etal/lib/system/freertos/zynqmp_a53/sys.c
diff --git a/...etal/lib/system/freertos/zynqmp_a53/sys.h → ...etal/lib/system/freertos/zynqmp_a53/sys.h b/...etal/lib/system/freertos/zynqmp_a53/sys.h → ...etal/lib/system/freertos/zynqmp_a53/sys.h
diff --git a/.../system/freertos/zynqmp_r5/CMakeLists.txt → .../system/freertos/zynqmp_r5/CMakeLists.txt b/.../system/freertos/zynqmp_r5/CMakeLists.txt → .../system/freertos/zynqmp_r5/CMakeLists.txt
diff --git a/...metal/lib/system/freertos/zynqmp_r5/sys.c → ...metal/lib/system/freertos/zynqmp_r5/sys.c b/...metal/lib/system/freertos/zynqmp_r5/sys.c → ...metal/lib/system/freertos/zynqmp_r5/sys.c
diff --git a/...metal/lib/system/freertos/zynqmp_r5/sys.h → ...metal/lib/system/freertos/zynqmp_r5/sys.h b/...metal/lib/system/freertos/zynqmp_r5/sys.h → ...metal/lib/system/freertos/zynqmp_r5/sys.h
diff --git a/...ibmetal/lib/system/generic/CMakeLists.txt → ...ibmetal/lib/system/generic/CMakeLists.txt b/...ibmetal/lib/system/generic/CMakeLists.txt → ...ibmetal/lib/system/generic/CMakeLists.txt
diff --git a/...b/ipc/libmetal/lib/system/generic/alloc.h → ext/hal/libmetal/lib/system/generic/alloc.h b/...b/ipc/libmetal/lib/system/generic/alloc.h → ext/hal/libmetal/lib/system/generic/alloc.h
diff --git a/.../ipc/libmetal/lib/system/generic/assert.h → ext/hal/libmetal/lib/system/generic/assert.h b/.../ipc/libmetal/lib/system/generic/assert.h → ext/hal/libmetal/lib/system/generic/assert.h
diff --git a/...b/ipc/libmetal/lib/system/generic/cache.h → ext/hal/libmetal/lib/system/generic/cache.h b/...b/ipc/libmetal/lib/system/generic/cache.h → ext/hal/libmetal/lib/system/generic/cache.h
diff --git a/...c/libmetal/lib/system/generic/condition.c → ...l/libmetal/lib/system/generic/condition.c b/...c/libmetal/lib/system/generic/condition.c → ...l/libmetal/lib/system/generic/condition.c
diff --git a/...c/libmetal/lib/system/generic/condition.h → ...l/libmetal/lib/system/generic/condition.h b/...c/libmetal/lib/system/generic/condition.h → ...l/libmetal/lib/system/generic/condition.h
diff --git a/.../ipc/libmetal/lib/system/generic/device.c → ext/hal/libmetal/lib/system/generic/device.c b/.../ipc/libmetal/lib/system/generic/device.c → ext/hal/libmetal/lib/system/generic/device.c
diff --git a/...ib/ipc/libmetal/lib/system/generic/init.c → ext/hal/libmetal/lib/system/generic/init.c b/...ib/ipc/libmetal/lib/system/generic/init.c → ext/hal/libmetal/lib/system/generic/init.c
diff --git a/ext/lib/ipc/libmetal/lib/system/generic/io.c → ext/hal/libmetal/lib/system/generic/io.c b/ext/lib/ipc/libmetal/lib/system/generic/io.c → ext/hal/libmetal/lib/system/generic/io.c
diff --git a/ext/lib/ipc/libmetal/lib/system/generic/io.h → ext/hal/libmetal/lib/system/generic/io.h b/ext/lib/ipc/libmetal/lib/system/generic/io.h → ext/hal/libmetal/lib/system/generic/io.h
diff --git a/...lib/ipc/libmetal/lib/system/generic/irq.c → ext/hal/libmetal/lib/system/generic/irq.c b/...lib/ipc/libmetal/lib/system/generic/irq.c → ext/hal/libmetal/lib/system/generic/irq.c
diff --git a/...lib/ipc/libmetal/lib/system/generic/irq.h → ext/hal/libmetal/lib/system/generic/irq.h b/...lib/ipc/libmetal/lib/system/generic/irq.h → ext/hal/libmetal/lib/system/generic/irq.h
diff --git a/...lib/ipc/libmetal/lib/system/generic/log.h → ext/hal/libmetal/lib/system/generic/log.h b/...lib/ipc/libmetal/lib/system/generic/log.h → ext/hal/libmetal/lib/system/generic/log.h
diff --git a/...generic/microblaze_generic/CMakeLists.txt → ...generic/microblaze_generic/CMakeLists.txt b/...generic/microblaze_generic/CMakeLists.txt → ...generic/microblaze_generic/CMakeLists.txt
diff --git a/...b/system/generic/microblaze_generic/sys.c → ...b/system/generic/microblaze_generic/sys.c b/...b/system/generic/microblaze_generic/sys.c → ...b/system/generic/microblaze_generic/sys.c
diff --git a/...b/system/generic/microblaze_generic/sys.h → ...b/system/generic/microblaze_generic/sys.h b/...b/system/generic/microblaze_generic/sys.h → ...b/system/generic/microblaze_generic/sys.h
diff --git a/...b/ipc/libmetal/lib/system/generic/mutex.h → ext/hal/libmetal/lib/system/generic/mutex.h b/...b/ipc/libmetal/lib/system/generic/mutex.h → ext/hal/libmetal/lib/system/generic/mutex.h
diff --git a/...b/ipc/libmetal/lib/system/generic/shmem.c → ext/hal/libmetal/lib/system/generic/shmem.c b/...b/ipc/libmetal/lib/system/generic/shmem.c → ext/hal/libmetal/lib/system/generic/shmem.c
diff --git a/...b/ipc/libmetal/lib/system/generic/sleep.h → ext/hal/libmetal/lib/system/generic/sleep.h b/...b/ipc/libmetal/lib/system/generic/sleep.h → ext/hal/libmetal/lib/system/generic/sleep.h
diff --git a/...lib/ipc/libmetal/lib/system/generic/sys.h → ext/hal/libmetal/lib/system/generic/sys.h b/...lib/ipc/libmetal/lib/system/generic/sys.h → ext/hal/libmetal/lib/system/generic/sys.h
diff --git a/...ib/system/generic/template/CMakeLists.txt → ...ib/system/generic/template/CMakeLists.txt b/...ib/system/generic/template/CMakeLists.txt → ...ib/system/generic/template/CMakeLists.txt
diff --git a/...ibmetal/lib/system/generic/template/sys.c → ...ibmetal/lib/system/generic/template/sys.c b/...ibmetal/lib/system/generic/template/sys.c → ...ibmetal/lib/system/generic/template/sys.c
diff --git a/...ibmetal/lib/system/generic/template/sys.h → ...ibmetal/lib/system/generic/template/sys.h b/...ibmetal/lib/system/generic/template/sys.h → ...ibmetal/lib/system/generic/template/sys.h
diff --git a/...ib/ipc/libmetal/lib/system/generic/time.c → ext/hal/libmetal/lib/system/generic/time.c b/...ib/ipc/libmetal/lib/system/generic/time.c → ext/hal/libmetal/lib/system/generic/time.c
diff --git a/...l/lib/system/generic/zynq7/CMakeLists.txt → ...l/lib/system/generic/zynq7/CMakeLists.txt b/...l/lib/system/generic/zynq7/CMakeLists.txt → ...l/lib/system/generic/zynq7/CMakeLists.txt
diff --git a/...c/libmetal/lib/system/generic/zynq7/sys.c → ...l/libmetal/lib/system/generic/zynq7/sys.c b/...c/libmetal/lib/system/generic/zynq7/sys.c → ...l/libmetal/lib/system/generic/zynq7/sys.c
diff --git a/...c/libmetal/lib/system/generic/zynq7/sys.h → ...l/libmetal/lib/system/generic/zynq7/sys.h b/...c/libmetal/lib/system/generic/zynq7/sys.h → ...l/libmetal/lib/system/generic/zynq7/sys.h
diff --git a/.../system/generic/zynqmp_a53/CMakeLists.txt → .../system/generic/zynqmp_a53/CMakeLists.txt b/.../system/generic/zynqmp_a53/CMakeLists.txt → .../system/generic/zynqmp_a53/CMakeLists.txt
diff --git a/...metal/lib/system/generic/zynqmp_a53/sys.c → ...metal/lib/system/generic/zynqmp_a53/sys.c b/...metal/lib/system/generic/zynqmp_a53/sys.c → ...metal/lib/system/generic/zynqmp_a53/sys.c
diff --git a/...metal/lib/system/generic/zynqmp_a53/sys.h → ...metal/lib/system/generic/zynqmp_a53/sys.h b/...metal/lib/system/generic/zynqmp_a53/sys.h → ...metal/lib/system/generic/zynqmp_a53/sys.h
diff --git a/...b/system/generic/zynqmp_r5/CMakeLists.txt → ...b/system/generic/zynqmp_r5/CMakeLists.txt b/...b/system/generic/zynqmp_r5/CMakeLists.txt → ...b/system/generic/zynqmp_r5/CMakeLists.txt
diff --git a/...bmetal/lib/system/generic/zynqmp_r5/sys.c → ...bmetal/lib/system/generic/zynqmp_r5/sys.c b/...bmetal/lib/system/generic/zynqmp_r5/sys.c → ...bmetal/lib/system/generic/zynqmp_r5/sys.c
diff --git a/...bmetal/lib/system/generic/zynqmp_r5/sys.h → ...bmetal/lib/system/generic/zynqmp_r5/sys.h b/...bmetal/lib/system/generic/zynqmp_r5/sys.h → ...bmetal/lib/system/generic/zynqmp_r5/sys.h
diff --git a/.../libmetal/lib/system/linux/CMakeLists.txt → .../libmetal/lib/system/linux/CMakeLists.txt b/.../libmetal/lib/system/linux/CMakeLists.txt → .../libmetal/lib/system/linux/CMakeLists.txt
diff --git a/...lib/ipc/libmetal/lib/system/linux/alloc.h → ext/hal/libmetal/lib/system/linux/alloc.h b/...lib/ipc/libmetal/lib/system/linux/alloc.h → ext/hal/libmetal/lib/system/linux/alloc.h
diff --git a/...ib/ipc/libmetal/lib/system/linux/assert.h → ext/hal/libmetal/lib/system/linux/assert.h b/...ib/ipc/libmetal/lib/system/linux/assert.h → ext/hal/libmetal/lib/system/linux/assert.h
diff --git a/...lib/ipc/libmetal/lib/system/linux/cache.h → ext/hal/libmetal/lib/system/linux/cache.h b/...lib/ipc/libmetal/lib/system/linux/cache.h → ext/hal/libmetal/lib/system/linux/cache.h
diff --git a/...ipc/libmetal/lib/system/linux/condition.c → ...hal/libmetal/lib/system/linux/condition.c b/...ipc/libmetal/lib/system/linux/condition.c → ...hal/libmetal/lib/system/linux/condition.c
diff --git a/...ipc/libmetal/lib/system/linux/condition.h → ...hal/libmetal/lib/system/linux/condition.h b/...ipc/libmetal/lib/system/linux/condition.h → ...hal/libmetal/lib/system/linux/condition.h
diff --git a/...ib/ipc/libmetal/lib/system/linux/device.c → ext/hal/libmetal/lib/system/linux/device.c b/...ib/ipc/libmetal/lib/system/linux/device.c → ext/hal/libmetal/lib/system/linux/device.c
diff --git a/ext/lib/ipc/libmetal/lib/system/linux/init.c → ext/hal/libmetal/lib/system/linux/init.c b/ext/lib/ipc/libmetal/lib/system/linux/init.c → ext/hal/libmetal/lib/system/linux/init.c
diff --git a/ext/lib/ipc/libmetal/lib/system/linux/io.h → ext/hal/libmetal/lib/system/linux/io.h b/ext/lib/ipc/libmetal/lib/system/linux/io.h → ext/hal/libmetal/lib/system/linux/io.h
diff --git a/ext/lib/ipc/libmetal/lib/system/linux/irq.c → ext/hal/libmetal/lib/system/linux/irq.c b/ext/lib/ipc/libmetal/lib/system/linux/irq.c → ext/hal/libmetal/lib/system/linux/irq.c
diff --git a/ext/lib/ipc/libmetal/lib/system/linux/irq.h → ext/hal/libmetal/lib/system/linux/irq.h b/ext/lib/ipc/libmetal/lib/system/linux/irq.h → ext/hal/libmetal/lib/system/linux/irq.h
diff --git a/ext/lib/ipc/libmetal/lib/system/linux/log.h → ext/hal/libmetal/lib/system/linux/log.h b/ext/lib/ipc/libmetal/lib/system/linux/log.h → ext/hal/libmetal/lib/system/linux/log.h
diff --git a/...lib/ipc/libmetal/lib/system/linux/mutex.h → ext/hal/libmetal/lib/system/linux/mutex.h b/...lib/ipc/libmetal/lib/system/linux/mutex.h → ext/hal/libmetal/lib/system/linux/mutex.h
diff --git a/...lib/ipc/libmetal/lib/system/linux/shmem.c → ext/hal/libmetal/lib/system/linux/shmem.c b/...lib/ipc/libmetal/lib/system/linux/shmem.c → ext/hal/libmetal/lib/system/linux/shmem.c
diff --git a/...lib/ipc/libmetal/lib/system/linux/sleep.h → ext/hal/libmetal/lib/system/linux/sleep.h b/...lib/ipc/libmetal/lib/system/linux/sleep.h → ext/hal/libmetal/lib/system/linux/sleep.h
diff --git a/ext/lib/ipc/libmetal/lib/system/linux/sys.h → ext/hal/libmetal/lib/system/linux/sys.h b/ext/lib/ipc/libmetal/lib/system/linux/sys.h → ext/hal/libmetal/lib/system/linux/sys.h
diff --git a/ext/lib/ipc/libmetal/lib/system/linux/time.c → ext/hal/libmetal/lib/system/linux/time.c b/ext/lib/ipc/libmetal/lib/system/linux/time.c → ext/hal/libmetal/lib/system/linux/time.c
diff --git a/...ipc/libmetal/lib/system/linux/utilities.c → ...hal/libmetal/lib/system/linux/utilities.c b/...ipc/libmetal/lib/system/linux/utilities.c → ...hal/libmetal/lib/system/linux/utilities.c
diff --git a/...libmetal/lib/system/zephyr/CMakeLists.txt → ...libmetal/lib/system/zephyr/CMakeLists.txt b/...libmetal/lib/system/zephyr/CMakeLists.txt → ...libmetal/lib/system/zephyr/CMakeLists.txt
diff --git a/...ib/ipc/libmetal/lib/system/zephyr/alloc.c → ext/hal/libmetal/lib/system/zephyr/alloc.c b/...ib/ipc/libmetal/lib/system/zephyr/alloc.c → ext/hal/libmetal/lib/system/zephyr/alloc.c
diff --git a/...ib/ipc/libmetal/lib/system/zephyr/alloc.h → ext/hal/libmetal/lib/system/zephyr/alloc.h b/...ib/ipc/libmetal/lib/system/zephyr/alloc.h → ext/hal/libmetal/lib/system/zephyr/alloc.h
diff --git a/...b/ipc/libmetal/lib/system/zephyr/assert.h → ext/hal/libmetal/lib/system/zephyr/assert.h b/...b/ipc/libmetal/lib/system/zephyr/assert.h → ext/hal/libmetal/lib/system/zephyr/assert.h
diff --git a/...ib/ipc/libmetal/lib/system/zephyr/cache.h → ext/hal/libmetal/lib/system/zephyr/cache.h b/...ib/ipc/libmetal/lib/system/zephyr/cache.h → ext/hal/libmetal/lib/system/zephyr/cache.h
diff --git a/...pc/libmetal/lib/system/zephyr/condition.c → ...al/libmetal/lib/system/zephyr/condition.c b/...pc/libmetal/lib/system/zephyr/condition.c → ...al/libmetal/lib/system/zephyr/condition.c
diff --git a/...pc/libmetal/lib/system/zephyr/condition.h → ...al/libmetal/lib/system/zephyr/condition.h b/...pc/libmetal/lib/system/zephyr/condition.h → ...al/libmetal/lib/system/zephyr/condition.h
diff --git a/.../lib/system/zephyr/cortexm/CMakeLists.txt → .../lib/system/zephyr/cortexm/CMakeLists.txt b/.../lib/system/zephyr/cortexm/CMakeLists.txt → .../lib/system/zephyr/cortexm/CMakeLists.txt
diff --git a/.../libmetal/lib/system/zephyr/cortexm/sys.c → .../libmetal/lib/system/zephyr/cortexm/sys.c b/.../libmetal/lib/system/zephyr/cortexm/sys.c → .../libmetal/lib/system/zephyr/cortexm/sys.c
diff --git a/.../libmetal/lib/system/zephyr/cortexm/sys.h → .../libmetal/lib/system/zephyr/cortexm/sys.h b/.../libmetal/lib/system/zephyr/cortexm/sys.h → .../libmetal/lib/system/zephyr/cortexm/sys.h
diff --git a/...b/ipc/libmetal/lib/system/zephyr/device.c → ext/hal/libmetal/lib/system/zephyr/device.c b/...b/ipc/libmetal/lib/system/zephyr/device.c → ext/hal/libmetal/lib/system/zephyr/device.c
diff --git a/...lib/ipc/libmetal/lib/system/zephyr/init.c → ext/hal/libmetal/lib/system/zephyr/init.c b/...lib/ipc/libmetal/lib/system/zephyr/init.c → ext/hal/libmetal/lib/system/zephyr/init.c
diff --git a/ext/lib/ipc/libmetal/lib/system/zephyr/io.h → ext/hal/libmetal/lib/system/zephyr/io.h b/ext/lib/ipc/libmetal/lib/system/zephyr/io.h → ext/hal/libmetal/lib/system/zephyr/io.h
diff --git a/ext/lib/ipc/libmetal/lib/system/zephyr/irq.c → ext/hal/libmetal/lib/system/zephyr/irq.c b/ext/lib/ipc/libmetal/lib/system/zephyr/irq.c → ext/hal/libmetal/lib/system/zephyr/irq.c
diff --git a/ext/lib/ipc/libmetal/lib/system/zephyr/irq.h → ext/hal/libmetal/lib/system/zephyr/irq.h b/ext/lib/ipc/libmetal/lib/system/zephyr/irq.h → ext/hal/libmetal/lib/system/zephyr/irq.h
diff --git a/ext/lib/ipc/libmetal/lib/system/zephyr/log.c → ext/hal/libmetal/lib/system/zephyr/log.c b/ext/lib/ipc/libmetal/lib/system/zephyr/log.c → ext/hal/libmetal/lib/system/zephyr/log.c
diff --git a/ext/lib/ipc/libmetal/lib/system/zephyr/log.h → ext/hal/libmetal/lib/system/zephyr/log.h b/ext/lib/ipc/libmetal/lib/system/zephyr/log.h → ext/hal/libmetal/lib/system/zephyr/log.h
diff --git a/...ib/ipc/libmetal/lib/system/zephyr/mutex.h → ext/hal/libmetal/lib/system/zephyr/mutex.h b/...ib/ipc/libmetal/lib/system/zephyr/mutex.h → ext/hal/libmetal/lib/system/zephyr/mutex.h
diff --git a/...ib/ipc/libmetal/lib/system/zephyr/shmem.c → ext/hal/libmetal/lib/system/zephyr/shmem.c b/...ib/ipc/libmetal/lib/system/zephyr/shmem.c → ext/hal/libmetal/lib/system/zephyr/shmem.c
diff --git a/...ib/ipc/libmetal/lib/system/zephyr/sleep.h → ext/hal/libmetal/lib/system/zephyr/sleep.h b/...ib/ipc/libmetal/lib/system/zephyr/sleep.h → ext/hal/libmetal/lib/system/zephyr/sleep.h
diff --git a/ext/lib/ipc/libmetal/lib/system/zephyr/sys.h → ext/hal/libmetal/lib/system/zephyr/sys.h b/ext/lib/ipc/libmetal/lib/system/zephyr/sys.h → ext/hal/libmetal/lib/system/zephyr/sys.h
diff --git a/...lib/ipc/libmetal/lib/system/zephyr/time.c → ext/hal/libmetal/lib/system/zephyr/time.c b/...lib/ipc/libmetal/lib/system/zephyr/time.c → ext/hal/libmetal/lib/system/zephyr/time.c
diff --git a/ext/lib/ipc/libmetal/lib/time.h → ext/hal/libmetal/lib/time.h b/ext/lib/ipc/libmetal/lib/time.h → ext/hal/libmetal/lib/time.h
diff --git a/ext/lib/ipc/libmetal/lib/utilities.h → ext/hal/libmetal/lib/utilities.h b/ext/lib/ipc/libmetal/lib/utilities.h → ext/hal/libmetal/lib/utilities.h
diff --git a/ext/lib/ipc/libmetal/lib/version.c → ext/hal/libmetal/lib/version.c b/ext/lib/ipc/libmetal/lib/version.c → ext/hal/libmetal/lib/version.c
diff --git a/ext/lib/ipc/libmetal/lib/version.h → ext/hal/libmetal/lib/version.h b/ext/lib/ipc/libmetal/lib/version.h → ext/hal/libmetal/lib/version.h
diff --git a/ext/lib/ipc/libmetal.cmake b/ext/lib/ipc/libmetal.cmake
diff --git a/ext/lib/ipc/open-amp.cmake b/ext/lib/ipc/open-amp.cmake
@@ -1,13 +1,11 @@
 include(ExternalProject)
 
-include($ENV{ZEPHYR_BASE}/ext/lib/ipc/libmetal.cmake)
-
 ExternalProject_Add(
   open-amp
   SOURCE_DIR $ENV{ZEPHYR_BASE}/ext/lib/ipc/open-amp/
-  DEPENDS libmetal
+  DEPENDS metal
   INSTALL_COMMAND ""      # This particular build system has no install command
-  CMAKE_ARGS -DWITH_ZEPHYR=ON -DWITH_PROXY=OFF -DBOARD=${BOARD} -DLIBMETAL_INCLUDE_DIR=${LIBMETAL_INCLUDE_DIR} -DLIBMETAL_LIB=${LIBMETAL_LIBRARY}
+  CMAKE_ARGS -DWITH_ZEPHYR=ON -DWITH_PROXY=OFF -DBOARD=${BOARD} -DLIBMETAL_INCLUDE_DIR=${ZEPHYR_BINARY_DIR}/ext/hal/libmetal/lib/include -DLIBMETAL_LIB=${ZEPHYR_BINARY_DIR}/ext/hal/libmetal/lib
 )
 
 ExternalProject_Get_property(open-amp SOURCE_DIR)

diff --git a/samples/subsys/ipc/openamp/CMakeLists.txt b/samples/subsys/ipc/openamp/CMakeLists.txt
@@ -29,11 +29,9 @@ ExternalProject_Add(
 )
 add_dependencies(core_m0_inc_target openamp_remote)
 
-target_include_directories(app PRIVATE ${LIBMETAL_INCLUDE_DIR}
-			   ${OPENAMP_INCLUDE_DIR} ${PLATFORM_DIR})
+target_include_directories(app PRIVATE ${OPENAMP_INCLUDE_DIR} ${PLATFORM_DIR})
 
 target_link_libraries(app
 	${OPENAMP_LIBRARY}
-	${LIBMETAL_LIBRARY}
 	${ZEPHYR_KERNEL_LIBRARY})
 
diff --git a/samples/subsys/ipc/openamp/prj.conf b/samples/subsys/ipc/openamp/prj.conf
@@ -6,3 +6,4 @@ CONFIG_SLAVE_IMAGE_MCUX="${ZEPHYR_BINARY_DIR}/../openamp_remote-prefix/src/opena
 CONFIG_TIMESLICE_SIZE=1
 CONFIG_MAIN_STACK_SIZE=2048
 CONFIG_HEAP_MEM_POOL_SIZE=4096
+CONFIG_LIBMETAL=y
diff --git a/samples/subsys/ipc/openamp/remote/CMakeLists.txt b/samples/subsys/ipc/openamp/remote/CMakeLists.txt
@@ -14,12 +14,11 @@ target_sources(app PRIVATE src/main_remote.c ${PLATFORM_DIR}/platform.c ${PLATFO
 
 include($ENV{ZEPHYR_BASE}/ext/lib/ipc/open-amp.cmake)
 
-target_include_directories(app PRIVATE ${LIBMETAL_INCLUDE_DIR} ${OPENAMP_INCLUDE_DIR} ${PLATFORM_DIR})
+target_include_directories(app PRIVATE ${OPENAMP_INCLUDE_DIR} ${PLATFORM_DIR})
 
 add_dependencies(app open-amp)
 
 target_link_libraries(app
 	${OPENAMP_LIBRARY}
-	${LIBMETAL_LIBRARY}
 	${ZEPHYR_KERNEL_LIBRARY})
 
diff --git a/samples/subsys/ipc/openamp/remote/prj.conf b/samples/subsys/ipc/openamp/remote/prj.conf
@@ -4,3 +4,4 @@ CONFIG_IPM=y
 CONFIG_IPM_MCUX=y
 CONFIG_PLATFORM_SPECIFIC_INIT=n
 CONFIG_HEAP_MEM_POOL_SIZE=4096
+CONFIG_LIBMETAL=y