--- ixp400_xscale_sw/Makefile +++ ixp400_xscale_sw/Makefile @@ -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 -mapcs-32 -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. @@ -1319,6 +1321,10 @@ endif ixp400.o : $(OBJ_DIR)/ixp400.o +ixp400.ko : $(OBJ_DIR)/ixp400.ko + +ixp400_eth.ko : $(OBJ_DIR)/ixp400_eth.ko + ifndef IX_INCLUDE_MICROCODE $(OBJ_DIR)/ixp400.o: $(COMPONENTS:%=$(OBJ_DIR)/ixp400_%.o) $(OSAL_MODULE) $(LD) $(LDFLAGS) $^ -o $@ @@ -1327,7 +1333,17 @@ $(OBJ_DIR)/ixp400.o: $(COMPONENTS:%=$(OB $(LD) $(LDFLAGS) $^ -o $@ endif +$(OBJ_DIR)/ixp400_ial.o_shipped : $(OBJ_DIR)/ixp400.o + mv $^ $@ +$(OBJ_DIR)/ixp400.ko : $(OBJ_DIR)/ixp400_ial.o_shipped + cp Makefile.ixp400 $(OBJ_DIR)/Makefile + $(MAKE) LINUX_SRC=$($(IX_TARGET)_KERNEL_DIR) CROSS_COMPILE=$(LINUX_CROSS_COMPILE) -C $(OBJ_DIR) ixp400.ko + +$(OBJ_DIR)/ixp400_eth.ko : $(IX_XSCALE_SW)/../ixp400_eth.c + cp Makefile.ixp400_eth $(OBJ_DIR)/Makefile + cp $(IX_XSCALE_SW)/../ixp400_eth.c $(OBJ_DIR)/ixp400_eth.c + $(MAKE) LINUX_SRC=$($(IX_TARGET)_KERNEL_DIR) CROSS_COMPILE=$(LINUX_CROSS_COMPILE) OSAL_DIR=$(OSAL_DIR) -C $(OBJ_DIR) ixp400_eth.ko ################################################################ # clean - deletes everything that can be rebuilt