Fix building MCXA/MCXW with mcx-sdk

Author: danielinux

arch.mk

@@ -624,19 +624,15 @@ ifeq ($(TARGET),mcxa)
   LDFLAGS+=-mcpu=cortex-m33
   OBJS+=\
       $(MCUXPRESSO_DRIVERS)/drivers/fsl_clock.o \
-      $(MCUXPRESSO_DRIVERS)/drivers/fsl_spc.o
+      $(MCUXPRESSO)/drivers/mcx_spc/fsl_spc.o
 
-  ifeq ($(MCUXSDK),1)
     CFLAGS+=\
       -I$(MCUXPRESSO)/drivers/flash \
       -I$(MCUXPRESSO)/drivers/mcx_spc \
       -I$(MCUXPRESSO)/drivers/sysmpu \
       -I$(MCUXPRESSO)/drivers/ltc \
       -I$(MCUXPRESSO)/drivers/port \
       -I$(MCUXPRESSO)/drivers/gpio
-
-  else
-  endif
 endif
 
 ifeq ($(TARGET),mcxw)
@@ -656,12 +652,11 @@ ifeq ($(TARGET),mcxw)
   LDFLAGS+=-mcpu=cortex-m33
   OBJS+=\
       $(MCUXPRESSO_DRIVERS)/drivers/fsl_clock.o \
-      $(MCUXPRESSO_DRIVERS)/drivers/fsl_spc.o \
+      $(MCUXPRESSO)/drivers/mcx_spc/fsl_spc.o \
 	  $(MCUXPRESSO_DRIVERS)/project_template/clock_config.o \
       $(MCUXPRESSO_DRIVERS)/drivers/fsl_ccm32k.o \
       $(MCUXPRESSO_DRIVERS)/drivers/fsl_romapi.o
 
-  ifeq ($(MCUXSDK),1)
     CFLAGS+=\
       -I$(MCUXPRESSO)/drivers/flash \
       -I$(MCUXPRESSO)/drivers/mcx_spc \
@@ -670,8 +665,6 @@ ifeq ($(TARGET),mcxw)
       -I$(MCUXPRESSO)/drivers/port \
       -I$(MCUXPRESSO)/drivers/gpio
 
-  else
-  endif
 endif
 
 ifeq ($(TARGET),imx_rt)

test-app/Makefile

@@ -298,15 +298,15 @@ ifeq ($(TARGET),mcxa)
     LSCRIPT_TEMPLATE=ARM-mcxa.ld
     APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_clock.o
     APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_reset.o
-    APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_gpio.o
-    APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_spc.o
+    APP_OBJS+=$(MCUXPRESSO)/drivers/gpio/fsl_gpio.o
+    APP_OBJS+=$(MCUXPRESSO)/drivers/mcx_spc/fsl_spc.o
 endif
 
 ifeq ($(TARGET),mcxw)
     LSCRIPT_TEMPLATE=ARM-mcxw.ld
     APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_clock.o
-    APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_gpio.o
-    APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_spc.o
+    APP_OBJS+=$(MCUXPRESSO)/drivers/gpio/fsl_gpio.o
+    APP_OBJS+=$(MCUXPRESSO)/drivers/mcx_spc/fsl_spc.o
     APP_OBJS+=$(MCUXPRESSO_DRIVERS)/project_template/clock_config.o
     APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_ccm32k.o
     APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_romapi.o