--- ixp400_xscale_sw/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ ixp400_xscale_sw/Makefile	1970-01-01 00:00:00.000000000 +0000
@@ -297,9 +297,9 @@ endif
 else # IX_TARGET_OS == vxworks
 # linux compiler flags 
 MAKE_DEP_FLAG := -M
-LINUX_MACH_CFLAGS := -D__LINUX_ARM_ARCH__=5 -mcpu=xscale -mtune=xscale
+LINUX_MACH_CFLAGS := -D__LINUX_ARM_ARCH__=5 -mtune=xscale
 
-CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -Wall -Wno-trigraphs -fno-common -pipe -mapcs-32 -mshort-load-bytes -msoft-float -DMODULE -Isrc/include -D__linux -DCPU=33 -DXSCALE=33 $(LINUX_MACH_CFLAGS)
+CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -Wall -Wno-trigraphs -fno-common -pipe -msoft-float -DMODULE -Isrc/include -D__linux -DCPU=33 -DXSCALE=33 $(LINUX_MACH_CFLAGS)
 ifndef IX_INCLUDE_MICROCODE
 CFLAGS += -DIX_NPEDL_READ_MICROCODE_FROM_FILE
 endif
@@ -867,9 +867,11 @@ $(NPE_DAT) : $(NPE_CONVERTER)
 
 ifeq ($(IX_HOST_OS),linux)
 ifndef IX_INCLUDE_MICROCODE
+ifdef IX_BUILD_MICROCODE
 Makefile: $(NPE_CONVERTER) $(NPE_DAT)
 endif
 endif
+endif
 
 ################################################################
 # Rules to check that macros are defined.