diff options
author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-10 08:02:59 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-10 08:02:59 +0000 |
commit | 29ef956e45a9ef8100cb581ed34b8d6a6f218308 (patch) | |
tree | 1f4c6d2d0894697c778da4329027b9b70ee6034d /packages | |
parent | 931b88d4f952a2fbba63d9cbfbe6e5816cacfa95 (diff) |
ixp4xx-csr: split OE specific makefile patch parts out, correct patch dir names in 2.1
Diffstat (limited to 'packages')
-rw-r--r-- | packages/ixp4xx/ixp4xx-csr-2.1/Makefile.patch | 49 | ||||
-rw-r--r-- | packages/ixp4xx/ixp4xx-csr-2.1/bit-macro.patch | 4 | ||||
-rw-r--r-- | packages/ixp4xx/ixp4xx-csr-2.1/ixethdb-header.patch | 4 | ||||
-rw-r--r-- | packages/ixp4xx/ixp4xx-csr-2.1/ixnpemhconfigisr-is-private.patch | 4 | ||||
-rw-r--r-- | packages/ixp4xx/ixp4xx-csr-2.1/le.patch | 4 | ||||
-rw-r--r-- | packages/ixp4xx/ixp4xx-csr-2.1/mii-debug.patch | 4 | ||||
-rw-r--r-- | packages/ixp4xx/ixp4xx-csr-2.1/oe-makefile.patch | 49 | ||||
-rw-r--r-- | packages/ixp4xx/ixp4xx-csr_2.1.bb | 3 |
8 files changed, 63 insertions, 58 deletions
diff --git a/packages/ixp4xx/ixp4xx-csr-2.1/Makefile.patch b/packages/ixp4xx/ixp4xx-csr-2.1/Makefile.patch index afe472fc1c..11a9db4373 100644 --- a/packages/ixp4xx/ixp4xx-csr-2.1/Makefile.patch +++ b/packages/ixp4xx/ixp4xx-csr-2.1/Makefile.patch @@ -1,5 +1,5 @@ ---- ixp_osal/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ ixp_osal/Makefile 1970-01-01 00:00:00.000000000 +0000 +--- 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 @@ -24,48 +24,3 @@ ################################################################ # Rules to check that macros are defined. -@@ -1321,10 +1323,26 @@ ixp400.o : $(OBJ_DIR)/ixp400.o - - ifndef IX_INCLUDE_MICROCODE - $(OBJ_DIR)/ixp400.o: $(COMPONENTS:%=$(OBJ_DIR)/ixp400_%.o) $(OSAL_MODULE) -+ rm -f $(OBJ_DIR)/ixp400.c -+ touch $(OBJ_DIR)/ixp400.c -+ cp Makefile.kmod26 $(OBJ_DIR)/Makefile -+ make -C $(OBJ_DIR) -+ rm -f $(OBJ_DIR)/ixp400.c -+ cp ixp400.c $(OBJ_DIR)/ixp400.c - $(LD) $(LDFLAGS) $^ -o $@ -+ rm -f $(OBJ_DIR)/ixp400.ko $(OBJ_DIR)/ixp400.mod.o -+ make -C $(OBJ_DIR) - else - $(OBJ_DIR)/ixp400.o: $(COMPONENTS:%=$(OBJ_DIR)/ixp400_%.o) $(NPE_PRODUCTION_HEADER_OBJ) $(OSAL_MODULE) -+ rm -f $(OBJ_DIR)/ixp400.c -+ touch $(OBJ_DIR)/ixp400.c -+ cp Makefile.kmod26 $(OBJ_DIR)/Makefile -+ make -C $(OBJ_DIR) -+ rm -f $(OBJ_DIR)/ixp400.c -+ cp ixp400.c $(OBJ_DIR)/ixp400.c - $(LD) $(LDFLAGS) $^ -o $@ -+ rm -f $(OBJ_DIR)/ixp400.ko $(OBJ_DIR)/ixp400.mod.o -+ make -C $(OBJ_DIR) - endif - - ---- ixp_osal/ixp400.c 1970-01-01 00:00:00.000000000 +0000 -+++ ixp_osal/ixp400.c 1970-01-01 00:00:00.000000000 +0000 -@@ -0,0 +1,1 @@ -+#error this file must never be compiled ---- ixp_osal/Makefile.kmod26 1970-01-01 00:00:00.000000000 +0000 -+++ ixp_osal/Makefile.kmod26 1970-01-01 00:00:00.000000000 +0000 -@@ -0,0 +1,11 @@ -+obj-m := ixp400.o -+ -+PWD := $(shell pwd) -+ -+LINUX_SRC := $($(IX_TARGET)_KERNEL_DIR) -+ -+default: -+ $(MAKE) ARCH=arm CROSS_COMPILE=$(LINUX_CROSS_COMPILE) $(KERNEL_VERBOSE) -C $(LINUX_SRC) SUBDIRS=$(PWD) modules -+ -+clean: -+ rm -f ixp400.ko diff --git a/packages/ixp4xx/ixp4xx-csr-2.1/bit-macro.patch b/packages/ixp4xx/ixp4xx-csr-2.1/bit-macro.patch index f6d796a625..6efdba5c1e 100644 --- a/packages/ixp4xx/ixp4xx-csr-2.1/bit-macro.patch +++ b/packages/ixp4xx/ixp4xx-csr-2.1/bit-macro.patch @@ -1,5 +1,5 @@ ---- ixp_osal/src/include/IxTypes.h 1970-01-01 00:00:00.000000000 +0000 -+++ ixp_osal/src/include/IxTypes.h 1970-01-01 00:00:00.000000000 +0000 +--- ixp400_xscale_sw/src/include/IxTypes.h 1970-01-01 00:00:00.000000000 +0000 ++++ ixp400_xscale_sw/src/include/IxTypes.h 1970-01-01 00:00:00.000000000 +0000 @@ -79,6 +79,10 @@ #endif #endif diff --git a/packages/ixp4xx/ixp4xx-csr-2.1/ixethdb-header.patch b/packages/ixp4xx/ixp4xx-csr-2.1/ixethdb-header.patch index 674b546d32..8ab22bee89 100644 --- a/packages/ixp4xx/ixp4xx-csr-2.1/ixethdb-header.patch +++ b/packages/ixp4xx/ixp4xx-csr-2.1/ixethdb-header.patch @@ -1,5 +1,5 @@ ---- ixp_osal/src/ethDB/include/IxEthDB_p.h 1970-01-01 00:00:00.000000000 +0000 -+++ ixp_osal/src/ethDB/include/IxEthDB_p.h 1970-01-01 00:00:00.000000000 +0000 +--- ixp400_xscale_sw/src/ethDB/include/IxEthDB_p.h 1970-01-01 00:00:00.000000000 +0000 ++++ ixp400_xscale_sw/src/ethDB/include/IxEthDB_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -693,7 +693,7 @@ IX_ETH_DB_PUBLIC UINT32 ixEthDBEntryXORH IX_ETH_DB_PUBLIC UINT32 ixEthDBKeyXORHash(void *macAddress); diff --git a/packages/ixp4xx/ixp4xx-csr-2.1/ixnpemhconfigisr-is-private.patch b/packages/ixp4xx/ixp4xx-csr-2.1/ixnpemhconfigisr-is-private.patch index f300429c93..54faadf34a 100644 --- a/packages/ixp4xx/ixp4xx-csr-2.1/ixnpemhconfigisr-is-private.patch +++ b/packages/ixp4xx/ixp4xx-csr-2.1/ixnpemhconfigisr-is-private.patch @@ -1,5 +1,5 @@ ---- ixp_osal/src/npeMh/IxNpeMhSymbols.c 1970-01-01 00:00:00.000000000 +0000 -+++ ixp_osal/src/npeMh/IxNpeMhSymbols.c 1970-01-01 00:00:00.000000000 +0000 +--- ixp400_xscale_sw/src/npeMh/IxNpeMhSymbols.c 1970-01-01 00:00:00.000000000 +0000 ++++ ixp400_xscale_sw/src/npeMh/IxNpeMhSymbols.c 1970-01-01 00:00:00.000000000 +0000 @@ -63,7 +63,6 @@ EXPORT_SYMBOL(ixNpeMhMessagesReceive); EXPORT_SYMBOL(ixNpeMhShow); EXPORT_SYMBOL(ixNpeMhShowReset); diff --git a/packages/ixp4xx/ixp4xx-csr-2.1/le.patch b/packages/ixp4xx/ixp4xx-csr-2.1/le.patch index 7ffeb95d27..c308493a08 100644 --- a/packages/ixp4xx/ixp4xx-csr-2.1/le.patch +++ b/packages/ixp4xx/ixp4xx-csr-2.1/le.patch @@ -1,5 +1,5 @@ ---- ixp_osal/src/include/IxQMgr.h 1970-01-01 00:00:00.000000000 +0000 -+++ ixp_osal/src/include/IxQMgr.h 1970-01-01 00:00:00.000000000 +0000 +--- ixp400_xscale_sw/src/include/IxQMgr.h 1970-01-01 00:00:00.000000000 +0000 ++++ ixp400_xscale_sw/src/include/IxQMgr.h 1970-01-01 00:00:00.000000000 +0000 @@ -96,8 +98,8 @@ #else diff --git a/packages/ixp4xx/ixp4xx-csr-2.1/mii-debug.patch b/packages/ixp4xx/ixp4xx-csr-2.1/mii-debug.patch index b6e017a64c..762743cef5 100644 --- a/packages/ixp4xx/ixp4xx-csr-2.1/mii-debug.patch +++ b/packages/ixp4xx/ixp4xx-csr-2.1/mii-debug.patch @@ -1,7 +1,7 @@ debug only patch to add information about MII id problems ---- ixp_osal/src/ethMii/IxEthMii.c 1970-01-01 00:00:00.000000000 +0000 -+++ ixp_osal/src/ethMii/IxEthMii.c 1970-01-01 00:00:00.000000000 +0000 +--- ixp400_xscale_sw/src/ethMii/IxEthMii.c 1970-01-01 00:00:00.000000000 +0000 ++++ ixp400_xscale_sw/src/ethMii/IxEthMii.c 1970-01-01 00:00:00.000000000 +0000 @@ -122,6 +122,10 @@ ixEthMiiPhyScan(BOOL phyPresent[], UINT3 ) { diff --git a/packages/ixp4xx/ixp4xx-csr-2.1/oe-makefile.patch b/packages/ixp4xx/ixp4xx-csr-2.1/oe-makefile.patch new file mode 100644 index 0000000000..492b1eab03 --- /dev/null +++ b/packages/ixp4xx/ixp4xx-csr-2.1/oe-makefile.patch @@ -0,0 +1,49 @@ +changes to Makefile required only on OE + +--- ixp400_xscale_sw/Makefile 1970-01-01 00:00:00.000000000 +0000 ++++ ixp400_xscale_sw/Makefile 1970-01-01 00:00:00.000000000 +0000 +@@ -1321,10 +1323,26 @@ ixp400.o : $(OBJ_DIR)/ixp400.o + + ifndef IX_INCLUDE_MICROCODE + $(OBJ_DIR)/ixp400.o: $(COMPONENTS:%=$(OBJ_DIR)/ixp400_%.o) $(OSAL_MODULE) ++ rm -f $(OBJ_DIR)/ixp400.c ++ touch $(OBJ_DIR)/ixp400.c ++ cp Makefile.kmod26 $(OBJ_DIR)/Makefile ++ make -C $(OBJ_DIR) ++ rm -f $(OBJ_DIR)/ixp400.c ++ cp ixp400.c $(OBJ_DIR)/ixp400.c + $(LD) $(LDFLAGS) $^ -o $@ ++ rm -f $(OBJ_DIR)/ixp400.ko $(OBJ_DIR)/ixp400.mod.o ++ make -C $(OBJ_DIR) + else + $(OBJ_DIR)/ixp400.o: $(COMPONENTS:%=$(OBJ_DIR)/ixp400_%.o) $(NPE_PRODUCTION_HEADER_OBJ) $(OSAL_MODULE) ++ rm -f $(OBJ_DIR)/ixp400.c ++ touch $(OBJ_DIR)/ixp400.c ++ cp Makefile.kmod26 $(OBJ_DIR)/Makefile ++ make -C $(OBJ_DIR) ++ rm -f $(OBJ_DIR)/ixp400.c ++ cp ixp400.c $(OBJ_DIR)/ixp400.c + $(LD) $(LDFLAGS) $^ -o $@ ++ rm -f $(OBJ_DIR)/ixp400.ko $(OBJ_DIR)/ixp400.mod.o ++ make -C $(OBJ_DIR) + endif + + +--- ixp400_xscale_sw/ixp400.c 1970-01-01 00:00:00.000000000 +0000 ++++ ixp400_xscale_sw/ixp400.c 1970-01-01 00:00:00.000000000 +0000 +@@ -0,0 +1,1 @@ ++#error this file must never be compiled +--- ixp400_xscale_sw/Makefile.kmod26 1970-01-01 00:00:00.000000000 +0000 ++++ ixp400_xscale_sw/Makefile.kmod26 1970-01-01 00:00:00.000000000 +0000 +@@ -0,0 +1,11 @@ ++obj-m := ixp400.o ++ ++PWD := $(shell pwd) ++ ++LINUX_SRC := $($(IX_TARGET)_KERNEL_DIR) ++ ++default: ++ $(MAKE) ARCH=arm CROSS_COMPILE=$(LINUX_CROSS_COMPILE) $(KERNEL_VERBOSE) -C $(LINUX_SRC) SUBDIRS=$(PWD) modules ++ ++clean: ++ rm -f ixp400.ko diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.bb index a37f8c6944..76ef0c09da 100644 --- a/packages/ixp4xx/ixp4xx-csr_2.1.bb +++ b/packages/ixp4xx/ixp4xx-csr_2.1.bb @@ -33,10 +33,11 @@ SRC_URI += "file://ixnpemhconfigisr-is-private.patch;patch=1" SRC_URI += "file://le.patch;patch=1" SRC_URI += "file://mii-debug.patch;patch=1" SRC_URI += "file://rtl8201-support.patch;patch=1" +SRC_URI += "file://oe-makefile.patch;patch=1" DEPENDS = "ixp-osal" S = "${WORKDIR}/ixp400_xscale_sw" -PR = "r5" +PR = "r6" COMPATIBLE_HOST = "^arm.*-linux.*" |