armv8m: Add MCX N94x target, fix armv8m build

JIRA: RTOS-881
phoenix-rtos · Jul 29, 2024 · f0cb98e · f0cb98e
1 parent 8c260ab
commit f0cb98e
Show file tree

Hide file tree

Showing 23 changed files with 1,941 additions and 33 deletions.
diff --git a/hal/armv7a/imx6ull/interrupts.c b/hal/armv7a/imx6ull/interrupts.c
@@ -20,8 +20,6 @@
 #include "proc/userintr.h"
 
 #define SIZE_INTERRUPTS 159
-#define SIZE_HANDLERS   4
-
 
 enum { /* 1024 reserved */ ctlr = 0x400, typer, iidr, /* 29 reserved */ igroupr0 = 0x420, /* 16 registers */
 	/* 16 reserved */ isenabler0 = 0x440, /* 16 registers */ /* 16 reserved */ icenabler0 = 0x460, /* 16 registers */

diff --git a/hal/armv7a/zynq7000/interrupts.c b/hal/armv7a/zynq7000/interrupts.c
@@ -24,7 +24,6 @@
 
 
 #define SIZE_INTERRUPTS 95
-#define SIZE_HANDLERS   4
 #define SPI_FIRST_IRQID 32
 
 #define SGI_FLT_USE_LIST   0 /* Send SGI to CPUs according to targetList */

diff --git a/hal/armv7m/stm32/interrupts.c b/hal/armv7m/stm32/interrupts.c
@@ -30,9 +30,6 @@
 #endif
 
 
-#define SIZE_HANDLERS       4
-
-
 struct {
 	spinlock_t spinlock;
 	intr_handler_t *handlers[SIZE_INTERRUPTS];

diff --git a/hal/armv8m/Makefile b/hal/armv8m/Makefile
@@ -8,6 +8,9 @@
 ifneq (, $(findstring nrf, $(TARGET_SUBFAMILY)))
     include hal/armv8m/nrf/Makefile
     CFLAGS += -Ihal/armv8m
+else ifneq (, $(findstring mcx, $(TARGET_SUBFAMILY)))
+    include hal/armv8m/mcx/Makefile
+    CFLAGS += -Ihal/armv8m
 endif
 
 OBJS += $(addprefix $(PREFIX_O)hal/armv8m/, string.o spinlock.o cpu.o hal.o pmap.o exceptions.o _memcpy.o _memset.o)
diff --git a/hal/armv8m/arch/cpu.h b/hal/armv8m/arch/cpu.h
@@ -16,11 +16,6 @@
 #ifndef _HAL_ARMV8M_CPU_H_
 #define _HAL_ARMV8M_CPU_H_
 
-
-#if defined(__CPU_NRF9160)
-#define CPU_NRF91
-#endif
-
 #include "hal/types.h"
 
 #define SIZE_PAGE 0x200

diff --git a/hal/armv8m/cpu.c b/hal/armv8m/cpu.c
@@ -182,8 +182,10 @@ char *hal_cpuInfo(char *info)
 	int i;
 	unsigned int cpuinfo;
 
-#ifdef CPU_NRF91
+#if defined(__CPU_NRF9160)
 	cpuinfo = _nrf91_cpuid();
+#elif defined(__CPU_MCXN94X)
+	cpuinfo = _mcxn94x_cpuid();
 #else
 	hal_strcpy(info, "unknown");
 	return info;

diff --git a/hal/armv8m/mcx/Makefile b/hal/armv8m/mcx/Makefile
@@ -0,0 +1,12 @@
+#
+# Makefile for Phoenix-RTOS kernel (ARMv8 HAL)
+#
+# Copyright 2016-2017, 2019-2020, 2022, 2024 Phoenix Systems
+#
+
+
+ifneq (, $(findstring mcxn94x, $(TARGET_SUBFAMILY)))
+    include hal/armv8m/mcx/n94x/Makefile
+endif
+
+OBJS += $(addprefix $(PREFIX_O)hal/armv8m/mcx/, _init.o interrupts.o)