--- modules/Makefile	2007-10-19 12:25:54.000000000 -0500
+++ modules/Makefile.new	2008-02-15 23:22:12.000000000 -0500
@@ -20,16 +20,16 @@
 $(warning *** WARNING: Trying to compile kernel modules on a $(MACHINE_ARCH) system while the installed $(CNXTTARGET) driver package is for $(IMPORTED_ARCH), this is likely to fail... ***)
 endif
 
-CFLAGS += -I$(IMPORTED)/include -I$(TOP)/modules/include -I$(TOP)/modules/GPL
-CFLAGS += $(IMPORTED_COMPILATION_FLAGS)
-CFLAGS += $(IMPORTED_FRAMEWORK_DEFS) -imacros $(IMPORTED)/include/framewrk.h
-CFLAGS += $(IMPORTED_GENERAL_DEFS)
-CFLAGS += $(IMPORTED_DEBUG_DEFS)
+EXTRA_CFLAGS += -I$(IMPORTED)/include -I$(TOP)/modules/include -I$(TOP)/modules/GPL
+EXTRA_CFLAGS += $(IMPORTED_COMPILATION_FLAGS)
+EXTRA_CFLAGS += $(IMPORTED_FRAMEWORK_DEFS) -imacros $(IMPORTED)/include/framewrk.h
+EXTRA_CFLAGS += $(IMPORTED_GENERAL_DEFS)
+EXTRA_CFLAGS += $(IMPORTED_DEBUG_DEFS)
 
-CFLAGS += $(OTHER_INCLUDES)
-CFLAGS += $(DISTRO_CFLAGS)
+EXTRA_CFLAGS += $(OTHER_INCLUDES)
+EXTRA_CFLAGS += $(DISTRO_EXTRA_CFLAGS)
 
-CFLAGS += -DOS_NOREDEFS
+EXTRA_CFLAGS += -DOS_NOREDEFS
 
 ifeq ($(CNXT_MODS_DIR),)
 ON_BUILD_SYSTEM := no
@@ -55,7 +55,7 @@
 
 UTS_FILE := $(shell if [ -e "${CNXT_KERNELSRC}/include/linux/utsrelease.h" ]; then echo "${CNXT_KERNELSRC}/include/linux/utsrelease.h"; else echo "${CNXT_KERNELSRC}/include/linux/version.h"; fi)
 
-KERNELVER := $(shell echo UTS_RELEASE | gcc -E ${DISTRO_CFLAGS} -I${CNXT_KERNELSRC}/include -include $(UTS_FILE) - | grep '^"' | tr -d '" 	')
+KERNELVER := $(shell echo UTS_RELEASE | gcc -E ${DISTRO_EXTRA_CFLAGS} -I${CNXT_KERNELSRC}/include -include $(UTS_FILE) - | grep '^"' | tr -d '" 	')
 
 KMODS_DIR := /lib/modules/$(KERNELVER)
 CNXT_MODS_DIR := $(KMODS_DIR)/extra
@@ -92,7 +92,7 @@
 FOUND_PCI_DEV_SLOT_NAME := $(shell grep -q 'slot_name' ${REAL_KERNELSRC}/include/linux/pci.h 2>/dev/null && echo -DFOUND_PCI_DEV_SLOT_NAME)
 FOUND_DEVFS := $(shell [ -e "${REAL_KERNELSRC}/include/linux/devfs_fs_kernel.h" ] && echo -DFOUND_DEVFS)
 
-CFLAGS+= $(FOUND_PCI_DEV_SLOT_NAME) $(FOUND_DEVFS)
+EXTRA_CFLAGS+= $(FOUND_PCI_DEV_SLOT_NAME) $(FOUND_DEVFS)
 
 KBUILD_SUPPORTED := $(shell test -e ${CNXT_KERNELSRC}/scripts/kconfig && echo yes || echo no)
 
@@ -121,7 +121,7 @@
 FOUND_KTERMIOS := $(shell grep -q 'ktermios' ${REAL_KERNELSRC}/include/linux/serial_core.h 2>/dev/null && echo -DFOUND_KTERMIOS)
 FOUND_PCI_GET_DEVICE := $(shell grep -q 'pci_get_device' ${REAL_KERNELSRC}/include/linux/pci.h 2>/dev/null && echo -DFOUND_PCI_GET_DEVICE)
 
-CFLAGS+= $(FOUND_CLASS_SIMPLE) $(FOUND_UART_REGISTER_PORT) $(FOUND_TTY_START_STOP) $(FOUND_CLASS_DEVICE_PARENT) $(FOUND_MODULE_PARAM) $(FOUND_PM_MESSAGE_T) $(FOUND_PM_MESSAGE_STRUCT) $(FOUND_PCI_CHOOSE_STATE) $(FOUND_LINUX_SUSPEND) $(FOUND_USB_DRIVER_OWNER) $(FOUND_PCI_REGISTER_DRIVER) $(FOUND_TTY_NEW_API) $(FOUND_TOUCH_ATIME) $(FOUND_SEEK_MODES) $(FOUND_LINUX_CONFIG) $(FOUND_KERNEL_EXECVE) $(FOUND_IRQ_HANDLER_T) $(FOUND_USB_COMPLETE_PT_REGS) $(FOUND_KTERMIOS) $(FOUND_PCI_GET_DEVICE)
+EXTRA_CFLAGS+= $(FOUND_CLASS_SIMPLE) $(FOUND_UART_REGISTER_PORT) $(FOUND_TTY_START_STOP) $(FOUND_CLASS_DEVICE_PARENT) $(FOUND_MODULE_PARAM) $(FOUND_PM_MESSAGE_T) $(FOUND_PM_MESSAGE_STRUCT) $(FOUND_PCI_CHOOSE_STATE) $(FOUND_LINUX_SUSPEND) $(FOUND_USB_DRIVER_OWNER) $(FOUND_PCI_REGISTER_DRIVER) $(FOUND_TTY_NEW_API) $(FOUND_TOUCH_ATIME) $(FOUND_SEEK_MODES) $(FOUND_LINUX_CONFIG) $(FOUND_KERNEL_EXECVE) $(FOUND_IRQ_HANDLER_T) $(FOUND_USB_COMPLETE_PT_REGS) $(FOUND_KTERMIOS) $(FOUND_PCI_GET_DEVICE)
 
 FOUND_KZALLOC := $(shell grep -q 'kzalloc' ${REAL_KERNELSRC}/include/linux/slab.h 2>/dev/null && echo -DFOUND_KZALLOC)
 FOUND_OPEN_SUBSTREAM_NOFILE := $(shell grep -q 'snd_pcm_open_substream.*struct[ \t]*file' ${REAL_KERNELSRC}/include/sound/pcm.h 2>/dev/null || echo -DFOUND_OPEN_SUBSTREAM_NOFILE)
@@ -132,7 +132,7 @@
 FOUND_SOUND_TYPEDEFS := $(shell test -s ${REAL_KERNELSRC}/include/sound/typedefs.h && echo -DFOUND_SOUND_TYPEDEFS)
 FOUND_NO_CTL_ELEM_RW := $(shell grep -q snd_ctl_new ${REAL_KERNELSRC}/Module.symvers && ! grep -q snd_ctl_elem_read ${REAL_KERNELSRC}/Module.symvers && echo -DFOUND_NO_CTL_ELEM_RW)
 
-HDA_CFLAGS := $(FOUND_KZALLOC) $(FOUND_OPEN_SUBSTREAM_NOFILE) $(FOUND_TLV) $(FOUND_SND_PCM_HW_PARAM_SET) $(FOUND_READ_SIZE) $(FOUND_IRQ_HANDLER_T) $(FOUND_DELAYED_WORK) $(FOUND_SOUND_TYPEDEFS) $(FOUND_NO_CTL_ELEM_RW)
+HDA_EXTRA_CFLAGS := $(FOUND_KZALLOC) $(FOUND_OPEN_SUBSTREAM_NOFILE) $(FOUND_TLV) $(FOUND_SND_PCM_HW_PARAM_SET) $(FOUND_READ_SIZE) $(FOUND_IRQ_HANDLER_T) $(FOUND_DELAYED_WORK) $(FOUND_SOUND_TYPEDEFS) $(FOUND_NO_CTL_ELEM_RW)
 
 ifeq ($(ON_BUILD_SYSTEM)-$(CONFIG_SND_HDA_INTEL),no-)
 # On Ubuntu Gutsy (7.10), the HDA modules are not included in linux-image but in a seprarate package
@@ -143,31 +143,31 @@
 else
 KO= o
 
-# Configure various machine specific CFLAGS for compiling kernel modules
-#CFLAGS+= -mpreferred-stack-boundary=2
-#CFLAGS+= -fomit-frame-pointer
-CFLAGS += -Wall -Wstrict-prototypes -Werror-implicit-function-declaration -O2 -I$(CNXT_KERNELSRC)/include
-CFLAGS += -D__KERNEL__ -DMODULE
+# Configure various machine specific EXTRA_CFLAGS for compiling kernel modules
+#EXTRA_CFLAGS+= -mpreferred-stack-boundary=2
+#EXTRA_CFLAGS+= -fomit-frame-pointer
+EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Werror-implicit-function-declaration -O2 -I$(CNXT_KERNELSRC)/include
+EXTRA_CFLAGS += -D__KERNEL__ -DMODULE
 
-CONFIG_MODVERSIONS= $(shell echo CONFIG_MODVERSIONS | gcc ${DISTRO_CFLAGS} -E -I${CNXT_KERNELSRC}/include -include ${CNXT_KERNELSRC}/include/linux/config.h - | grep -q 'CONFIG_MODVERSIONS' && echo n || echo y)
+CONFIG_MODVERSIONS= $(shell echo CONFIG_MODVERSIONS | gcc ${DISTRO_EXTRA_CFLAGS} -E -I${CNXT_KERNELSRC}/include -include ${CNXT_KERNELSRC}/include/linux/config.h - | grep -q 'CONFIG_MODVERSIONS' && echo n || echo y)
 ifeq ($(CONFIG_MODVERSIONS),y)
 MODVERFLAGS= -DMODVERSIONS -include $(CNXT_KERNELSRC)/include/linux/modversions.h
 endif
-CONFIG_USB= $(shell echo 'CONFIG_USB CONFIG_USB_MODULE' | gcc ${DISTRO_CFLAGS} -E -I${CNXT_KERNELSRC}/include -include ${CNXT_KERNELSRC}/include/linux/config.h - | grep -q 'CONFIG_USB CONFIG_USB_MODULE' && echo n || echo y)
-CONFIG_SND_HDA_INTEL=$(shell echo 'CONFIG_SND_HDA_INTEL CONFIG_SND_HDA_INTEL_MODULE' | gcc ${DISTRO_CFLAGS} -E -I${CNXT_KERNELSRC}/include -include ${CNXT_KERNELSRC}/include/linux/config.h - | grep -q 'CONFIG_SND_HDA_INTEL CONFIG_SND_HDA_INTEL_MODULE' && echo n || echo y)
+CONFIG_USB= $(shell echo 'CONFIG_USB CONFIG_USB_MODULE' | gcc ${DISTRO_EXTRA_CFLAGS} -E -I${CNXT_KERNELSRC}/include -include ${CNXT_KERNELSRC}/include/linux/config.h - | grep -q 'CONFIG_USB CONFIG_USB_MODULE' && echo n || echo y)
+CONFIG_SND_HDA_INTEL=$(shell echo 'CONFIG_SND_HDA_INTEL CONFIG_SND_HDA_INTEL_MODULE' | gcc ${DISTRO_EXTRA_CFLAGS} -E -I${CNXT_KERNELSRC}/include -include ${CNXT_KERNELSRC}/include/linux/config.h - | grep -q 'CONFIG_SND_HDA_INTEL CONFIG_SND_HDA_INTEL_MODULE' && echo n || echo y)
 
-CFLAGS+= -include $(CNXT_KERNELSRC)/include/linux/config.h
-CFLAGS+= $(MODVERFLAGS)
-CFLAGS+= -DFOUND_TTY_START_STOP
+EXTRA_CFLAGS+= -include $(CNXT_KERNELSRC)/include/linux/config.h
+EXTRA_CFLAGS+= $(MODVERFLAGS)
+EXTRA_CFLAGS+= -DFOUND_TTY_START_STOP
 endif # KBUILD_SUPPORTED
 
 ## END OF CONFIGURATION SECTION
 ## no changes should be necessary beyond this point
 #####################################################################
 
-CFLAGS+= -DCNXTTARGET="\"$(CNXTTARGET)\""
-CFLAGS+= -DCNXTDRIVER="\"$(CNXTDRIVER)\""
-CFLAGS+= -DCNXTDRVDSC="\"$(CNXTDRVDSC)\""
+EXTRA_CFLAGS+= -DCNXTTARGET="\"$(CNXTTARGET)\""
+EXTRA_CFLAGS+= -DCNXTDRIVER="\"$(CNXTDRIVER)\""
+EXTRA_CFLAGS+= -DCNXTDRVDSC="\"$(CNXTDRVDSC)\""
 
 ifneq ($(WITHIN_KBUILD),yes)
 .PHONY: default
@@ -187,10 +187,10 @@
 endif
 endif
 ifeq ($(V),1)
-	$(COMPILE.c) $(CFLAGS_$(@F)) $(OUTPUT_OPTION) $<
+	$(COMPILE.c) $(EXTRA_CFLAGS_$(@F)) $(OUTPUT_OPTION) $<
 else
-	@echo ""; echo $(CC_SHOW) $(CFLAGS_$(@F)) $(OUTPUT_OPTION) $<
-	@$(COMPILE.c) $(CFLAGS_$(@F)) $(OUTPUT_OPTION) $<
+	@echo ""; echo $(CC_SHOW) $(EXTRA_CFLAGS_$(@F)) $(OUTPUT_OPTION) $<
+	@$(COMPILE.c) $(EXTRA_CFLAGS_$(@F)) $(OUTPUT_OPTION) $<
 endif
 
 CLEAN= *.o GPL/*.o *.ko GPL/*.ko *.mod.c GPL/*.mod.c .*.cmd GPL/.*.cmd .tmp_versions
@@ -204,12 +204,12 @@
 ifeq ($(KBUILD_EXTMOD_SUPPORTED),yes)
 	-(cd ${CNXT_KERNELSRC} && make "CNXT_KERNELSRC=${CNXT_KERNELSRC}" "M=$(MODULES_SRC_DIR)" "CC=$(CC)" clean)
 ifeq ($(CNXTDRIVER),hsf)
-	-(cd ${CNXT_KERNELSRC} && make "CNXT_KERNELSRC=${CNXT_KERNELSRC}" "M=$(MODULES_SRC_DIR)/GPL/hda" "CC=$(CC)" "HDA_CFLAGS=$(HDA_CFLAGS)" clean)
+	-(cd ${CNXT_KERNELSRC} && make "CNXT_KERNELSRC=${CNXT_KERNELSRC}" "M=$(MODULES_SRC_DIR)/GPL/hda" "CC=$(CC)" "HDA_EXTRA_CFLAGS=$(HDA_EXTRA_CFLAGS)" clean)
 endif
 else
 	-(cd ${CNXT_KERNELSRC} && make "CNXT_KERNELSRC=${CNXT_KERNELSRC}" "SUBDIRS+=$(MODULES_SRC_DIR)" "SUBDIRS+=$(MODULES_SRC_DIR)" "CC=$(CC)" clean)
 ifeq ($(CNXTDRIVER),hsf)
-	-(cd ${CNXT_KERNELSRC} && make "CNXT_KERNELSRC=${CNXT_KERNELSRC}" "SUBDIRS+=$(MODULES_SRC_DIR)/GPL/hda" "SUBDIRS+=$(MODULES_SRC_DIR)/GPL/hda" "CC=$(CC)" "HDA_CFLAGS=$(HDA_CFLAGS)" clean)
+	-(cd ${CNXT_KERNELSRC} && make "CNXT_KERNELSRC=${CNXT_KERNELSRC}" "SUBDIRS+=$(MODULES_SRC_DIR)/GPL/hda" "SUBDIRS+=$(MODULES_SRC_DIR)/GPL/hda" "CC=$(CC)" "HDA_EXTRA_CFLAGS=$(HDA_EXTRA_CFLAGS)" clean)
 endif
 endif
 endif
@@ -259,10 +259,10 @@
 OSSPEC_OBJS+= imported/$(CNXTDRIVER)blam-$(IMPORTED_ARCH).O
 endif
 
-CFLAGS_osnvm.o += -DCNXTSBINDIR=\"$(CNXTSBINDIR)\" -DCNXTNVMDIR=\"$(CNXTNVMDIR)\"
-CFLAGS_osdcp.o += -DCNXTSBINDIR=\"$(CNXTSBINDIR)\" -DCNXTDCPMAJOR=$(CNXTDCPMAJOR)
-CFLAGS_osdiag.o += -DCNXTDIAGMAJOR=$(CNXTDIAGMAJOR) -DCNXTDIAGDMPMINOR=$(CNXTDIAGDMPMINOR)
-CFLAGS_osscr.o += -DCNXTSCRMAJOR=$(CNXTSCRMAJOR)
+EXTRA_CFLAGS_osnvm.o += -DCNXTSBINDIR=\"$(CNXTSBINDIR)\" -DCNXTNVMDIR=\"$(CNXTNVMDIR)\"
+EXTRA_CFLAGS_osdcp.o += -DCNXTSBINDIR=\"$(CNXTSBINDIR)\" -DCNXTDCPMAJOR=$(CNXTDCPMAJOR)
+EXTRA_CFLAGS_osdiag.o += -DCNXTDIAGMAJOR=$(CNXTDIAGMAJOR) -DCNXTDIAGDMPMINOR=$(CNXTDIAGDMPMINOR)
+EXTRA_CFLAGS_osscr.o += -DCNXTSCRMAJOR=$(CNXTSCRMAJOR)
 
 ifneq ($(WITHIN_KBUILD),yes)
 ifeq ($(KBUILD_SUPPORTED),yes)
@@ -272,12 +272,12 @@
 ifeq ($(KBUILD_EXTMOD_SUPPORTED),yes)
 	(cd ${CNXT_KERNELSRC} && make "CNXT_KERNELSRC=${CNXT_KERNELSRC}" "M=$(MODULES_SRC_DIR)" "CC=$(CC)" modules)
 ifeq ($(USE_HDA),true)
-	-(cd ${CNXT_KERNELSRC} && make "CNXT_KERNELSRC=${CNXT_KERNELSRC}" "M=$(MODULES_SRC_DIR)/GPL/hda" "CC=$(CC)" "HDA_CFLAGS=$(HDA_CFLAGS)" modules)
+	-(cd ${CNXT_KERNELSRC} && make "CNXT_KERNELSRC=${CNXT_KERNELSRC}" "M=$(MODULES_SRC_DIR)/GPL/hda" "CC=$(CC)" "HDA_EXTRA_CFLAGS=$(HDA_EXTRA_CFLAGS)" modules)
 endif
 else
 	(cd ${CNXT_KERNELSRC} && make "CNXT_KERNELSRC=${CNXT_KERNELSRC}" "SUBDIRS+=$(MODULES_SRC_DIR)" "SUBDIRS+=$(MODULES_SRC_DIR)" "CC=$(CC)" modules)
 ifeq ($(USE_HDA),true)
-	-(cd ${CNXT_KERNELSRC} && make "CNXT_KERNELSRC=${CNXT_KERNELSRC}" "SUBDIRS+=$(MODULES_SRC_DIR)/GPL/hda" "SUBDIRS+=$(MODULES_SRC_DIR)/GPL/hda" "CC=$(CC)" "HDA_CFLAGS=$(HDA_CFLAGS)" modules)
+	-(cd ${CNXT_KERNELSRC} && make "CNXT_KERNELSRC=${CNXT_KERNELSRC}" "SUBDIRS+=$(MODULES_SRC_DIR)/GPL/hda" "SUBDIRS+=$(MODULES_SRC_DIR)/GPL/hda" "CC=$(CC)" "HDA_EXTRA_CFLAGS=$(HDA_EXTRA_CFLAGS)" modules)
 endif
 endif
 else
@@ -308,38 +308,38 @@
 $(CNXTTARGET)usbdcp-objs := mod_$(CNXTTARGET)usbdcp.o osdcp.o
 endif
 
-CFLAGS_mod_osspec.o = -DEXPORT_SYMTAB
-CFLAGS_mod_engine.o = -DEXPORT_SYMTAB
+EXTRA_CFLAGS_mod_osspec.o = -DEXPORT_SYMTAB
+EXTRA_CFLAGS_mod_engine.o = -DEXPORT_SYMTAB
 ifeq ($(CNXTDRIVER),hcf)
-CFLAGS_mod_$(CNXTTARGET).o = -DEXPORT_SYMTAB
+EXTRA_CFLAGS_mod_$(CNXTTARGET).o = -DEXPORT_SYMTAB
 endif
 ifeq ($(CNXTDRIVER),hsf)
-CFLAGS_mod_pcibasic2.o = -DEXPORT_SYMTAB
-CFLAGS_mod_pcibasic3.o = -DEXPORT_SYMTAB
-CFLAGS_mod_mc97ich.o = -DEXPORT_SYMTAB
-CFLAGS_mod_mc97via.o = -DEXPORT_SYMTAB
-CFLAGS_mod_mc97ali.o = -DEXPORT_SYMTAB
-CFLAGS_mod_mc97ati.o = -DEXPORT_SYMTAB
-CFLAGS_mod_mc97sis.o = -DEXPORT_SYMTAB
-CFLAGS_mod_usbcd2.o = -DEXPORT_SYMTAB
-CFLAGS_mod_hda.o = -DEXPORT_SYMTAB
-CFLAGS_mod_soar.o = -DEXPORT_SYMTAB
+EXTRA_CFLAGS_mod_pcibasic2.o = -DEXPORT_SYMTAB
+EXTRA_CFLAGS_mod_pcibasic3.o = -DEXPORT_SYMTAB
+EXTRA_CFLAGS_mod_mc97ich.o = -DEXPORT_SYMTAB
+EXTRA_CFLAGS_mod_mc97via.o = -DEXPORT_SYMTAB
+EXTRA_CFLAGS_mod_mc97ali.o = -DEXPORT_SYMTAB
+EXTRA_CFLAGS_mod_mc97ati.o = -DEXPORT_SYMTAB
+EXTRA_CFLAGS_mod_mc97sis.o = -DEXPORT_SYMTAB
+EXTRA_CFLAGS_mod_usbcd2.o = -DEXPORT_SYMTAB
+EXTRA_CFLAGS_mod_hda.o = -DEXPORT_SYMTAB
+EXTRA_CFLAGS_mod_soar.o = -DEXPORT_SYMTAB
 endif
 ifeq ($(CNXTDRIVER),dgc)
-CFLAGS_mod_dgcusbdcp.o = -DEXPORT_SYMTAB
+EXTRA_CFLAGS_mod_dgcusbdcp.o = -DEXPORT_SYMTAB
 endif
 
 
 NON_ATOMIC_TTY_STRUCT_COUNT := $(shell grep -A 15 'struct tty_struct {' ${CNXT_KERNELSRC}/include/linux/tty.h 2>/dev/null | grep -q 'int count;' && echo -DNON_ATOMIC_TTY_STRUCT_COUNT)
 
-CFLAGS_serial_cnxt.o = -DEXPORT_SYMTAB
-CFLAGS_serial_cnxt.o+= -DCNXTSERIALMAJOR=$(CNXTSERIALMAJOR) -DCNXTCALOUTMAJOR=$(CNXTCALOUTMAJOR) -DCNXTSERIALMINOR=$(CNXTSERIALMINOR)
-CFLAGS_serial_cnxt.o+= -DCNXTSERDEV="\"$(CNXTSERDEV)\""
-CFLAGS_serial_cnxt.o+= -DCNXTMAXMDM="$(CNXTMAXMDM)"
-CFLAGS_serial_cnxt.o+= $(NON_ATOMIC_TTY_STRUCT_COUNT)
+EXTRA_CFLAGS_serial_cnxt.o = -DEXPORT_SYMTAB
+EXTRA_CFLAGS_serial_cnxt.o+= -DCNXTSERIALMAJOR=$(CNXTSERIALMAJOR) -DCNXTCALOUTMAJOR=$(CNXTCALOUTMAJOR) -DCNXTSERIALMINOR=$(CNXTSERIALMINOR)
+EXTRA_CFLAGS_serial_cnxt.o+= -DCNXTSERDEV="\"$(CNXTSERDEV)\""
+EXTRA_CFLAGS_serial_cnxt.o+= -DCNXTMAXMDM="$(CNXTMAXMDM)"
+EXTRA_CFLAGS_serial_cnxt.o+= $(NON_ATOMIC_TTY_STRUCT_COUNT)
 
 ifneq ($(WITHIN_KBUILD),yes)
-CFLAGS_serial_cnxt.o+= -DCNXTSERIAL_INCLUDE_CORE -DFOUND_UART_REGISTER_PORT
+EXTRA_CFLAGS_serial_cnxt.o+= -DCNXTSERIAL_INCLUDE_CORE -DFOUND_UART_REGISTER_PORT
 
 GPL/serial_cnxt.o: GPL/serial_core.c GPL/serial_core.h