git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13756 27425a3e-05d8-49a3-a47f-9c15f0e5edd8

os/common/ports/ARMv8-M-ML-TZ/chcore.c

@@ -84,8 +84,14 @@ thread_t *port_schedule_next(void) {
 
 /**
  * @brief   Port-related initialization code.
+ *
+ * @param[in, out] oip  pointer to the @p os_instance_t structure
+ *
+ * @notapi
  */
-void port_init(void) {
+void port_init(os_instance_t *oip) {
+
+  (void)oip;
 
 #if PORT_KERNEL_MODE == PORT_KERNEL_MODE_HOST
   {

os/common/ports/ARMv8-M-ML-TZ/chcore.h

@@ -632,11 +632,11 @@ struct port_context {
  * @param[in] otp       the thread to be switched out
  */
 #define port_switch(ntp, otp) do {                                          \
-  _dbg_leave_lock();                                                        \
+  __dbg_check_lock();                                                       \
   register thread_t *_ntp asm ("r0") = (ntp);                               \
   register thread_t *_otp asm ("r1") = (otp);                               \
   asm volatile ("svc     #0" : : "r" (_otp), "r" (_ntp) : "memory");        \
-  _dbg_enter_lock();                                                        \
+  __dbg_check_unlock();                                                     \
 } while (false)
 
 /*===========================================================================*/
@@ -648,7 +648,7 @@ struct port_context {
 #ifdef __cplusplus
 extern "C" {
 #endif
-  void port_init(void);
+  void port_init(os_instance_t *oip);
   void __port_thread_start(void);
 #if PORT_KERNEL_MODE == PORT_KERNEL_MODE_HOST
   void __port_ns_boot(void *vtor);

os/common/ports/ARMv8-M-ML-TZ/compilers/GCC/chcoreasm.S

@@ -272,7 +272,7 @@ __port_thread_start:
                 blx     r4
                 movs    r0, #0              /* MSG_OK */
                 bl      chThdExit
-_zombies:       b       _zombies
+.zombies:       b       .zombies
 
 #if PORT_KERNEL_MODE == PORT_KERNEL_MODE_HOST
 /*--------------------------------------------------------------------------*

os/common/ports/ARMv8-M-ML-TZ/compilers/GCC/mk/port.mk

@@ -0,0 +1,12 @@
+# List of the ChibiOS/RT ARMv8-M mainline generic port files.
+PORTSRC = $(CHIBIOS)/os/common/ports/ARMv8-M-ML-TZ/chcore.c
+          
+PORTASM = $(CHIBIOS)/os/common/ports/ARMv8-M-ML-TZ/compilers/GCC/chcoreasm.S
+
+PORTINC = $(CHIBIOS)/os/common/ports/ARMv8-M-ML-TZ \
+          $(CHIBIOS)/os/common/ports/ARMv8-M-ML-TZ/compilers/GCC
+
+# Shared variables
+ALLXASMSRC += $(PORTASM)
+ALLCSRC    += $(PORTSRC)
+ALLINC     += $(PORTINC)

os/common/ports/ARMv8-M-ML/compilers/GCC/mk/port.mk

@@ -1,12 +0,0 @@
-# List of the ChibiOS/RT ARMv8-M mainline generic port files.
-PORTSRC = $(CHIBIOS)/os/common/ports/ARMv8-M-ML/chcore.c
-          
-PORTASM = $(CHIBIOS)/os/common/ports/ARMv8-M-ML/compilers/GCC/chcoreasm.S
-
-PORTINC = $(CHIBIOS)/os/common/ports/ARMv8-M-ML \
-          $(CHIBIOS)/os/common/ports/ARMv8-M-ML/compilers/GCC
-
-# Shared variables
-ALLXASMSRC += $(PORTASM)
-ALLCSRC    += $(PORTSRC)
-ALLINC     += $(PORTINC)