From 58f98ac38244ed93bb01dcf377937f1aec45202b Mon Sep 17 00:00:00 2001 From: kaloz Date: Fri, 28 Dec 2007 21:00:01 +0000 Subject: * upgrade ixp4xx to 2.6.23.12 * upgrade to the new ethernet driver (temporary breaks Marvell switch support on Compex units) * handle NPE microcodes in a user friendly way - YAY for Intel for changing the license * add support for the Lanready AP1000 (used in for example the Ligowave LGO2AGN) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10016 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ixp4xx/image/Config.in | 9 -- target/linux/ixp4xx/image/Makefile | 31 +---- target/linux/ixp4xx/image/npe-ucode/Makefile | 41 ------ .../ixp4xx/image/npe-ucode/src/IxNpeMicrocode.h | 143 --------------------- 4 files changed, 4 insertions(+), 220 deletions(-) delete mode 100644 target/linux/ixp4xx/image/Config.in delete mode 100644 target/linux/ixp4xx/image/npe-ucode/Makefile delete mode 100644 target/linux/ixp4xx/image/npe-ucode/src/IxNpeMicrocode.h (limited to 'target/linux/ixp4xx/image') diff --git a/target/linux/ixp4xx/image/Config.in b/target/linux/ixp4xx/image/Config.in deleted file mode 100644 index 7dd3b5fd5..000000000 --- a/target/linux/ixp4xx/image/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config IXP4XX_INCLUDE_UCODE - bool "Build images with Intel IXP4xx Microcode" - depends TARGET_ixp4xx - default y - help - You must manually download IPL_ixp400NpeLibrary-2_4.zip from - http://www.intel.com/design/network/products/npfamily/ixp400_archives.htm - and put it in the dl/ directory of the build system. - You will need to agree to the Intel Public License to do so - please do read it! diff --git a/target/linux/ixp4xx/image/Makefile b/target/linux/ixp4xx/image/Makefile index 167bd1d5f..b23ebc3b1 100644 --- a/target/linux/ixp4xx/image/Makefile +++ b/target/linux/ixp4xx/image/Makefile @@ -7,43 +7,28 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -UCODEFILE:=IPL_ixp400NpeLibrary-2_4.zip - -ifneq ($(CONFIG_IXP4XX_INCLUDE_UCODE),) - define Require/npe-ucode - [ -f $(DL_DIR)/$(UCODEFILE) ] - endef - define Build/Compile/npe - $(MAKE) -C npe-ucode \ - BUILD_DIR="$(KDIR)" \ - TARGET="$(KDIR)" \ - compile - endef - define Image/Build/slug +define Image/Build/slug BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \ - -L $(KDIR)/apex-nslu2-armeb.bin -m $(KDIR)/NPE-B \ + -L $(KDIR)/apex-nslu2-armeb.bin \ -k $(BIN_DIR)/openwrt-nslu2-zImage \ -r rootfs:$(BIN_DIR)/openwrt-$(BOARD)-$(1).img \ -p -o $(BIN_DIR)/openwrt-nslu2-$(1).bin BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \ - -F -L $(KDIR)/apex-nslu2-armeb.bin -m $(KDIR)/NPE-B \ + -F -L $(KDIR)/apex-nslu2-armeb.bin \ -k $(BIN_DIR)/openwrt-nslu2-zImage \ -r rootfs:$(BIN_DIR)/openwrt-$(BOARD)-$(1).img \ -p -o $(BIN_DIR)/openwrt-nslu2-$(1)-16mb.bin - endef -endif +endef define Build/Compile $(MAKE) -C apex \ BUILD_DIR="$(KDIR)" \ TARGET="$(KDIR)" \ compile - $(call Build/Compile/npe) endef define Build/Clean $(MAKE) -C apex clean - $(MAKE) -C npe-ucode clean endef define Image/Prepare @@ -52,7 +37,6 @@ endef define Image/BuildKernel cp $(KDIR)/zImage $(BIN_DIR)/openwrt-$(BOARD)-zImage -# $(shell BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/arm-magic.sh) BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/arm-magic.sh endef @@ -76,10 +60,3 @@ define Image/Build/squashfs endef $(eval $(call BuildImage)) - -$(eval $(call Require,npe-ucode, \ - You must manually download $(UCODEFILE) from \\\ - http://www.intel.com/design/network/products/npfamily/ixp400_archives.htm \\\ - and put it in $(DL_DIR). \\\ - You will need to agree to the Intel Public License to do so - please do read it! \ -)) diff --git a/target/linux/ixp4xx/image/npe-ucode/Makefile b/target/linux/ixp4xx/image/npe-ucode/Makefile deleted file mode 100644 index 6b1c82e53..000000000 --- a/target/linux/ixp4xx/image/npe-ucode/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=npe-ucode -PKG_VERSION:=2.4 -PKG_RELEASE:=2 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=IPL_ixp400NpeLibrary-2_4.zip - -include $(INCLUDE_DIR)/package.mk - -define Build/Prepare - rm -rf $(PKG_BUILD_DIR) - mkdir -p $(PKG_BUILD_DIR) - unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE) - mv $(PKG_BUILD_DIR)/ixp400_xscale_sw/src/npeDl/IxNpeMicrocode.c $(PKG_BUILD_DIR)/ - rm -rf $(PKG_BUILD_DIR)/ixp400_xscale_sw - $(CP) ./src/* $(PKG_BUILD_DIR)/ -endef - -define Build/Compile - (cd $(PKG_BUILD_DIR); \ - $(HOSTCC) -Wall IxNpeMicrocode.c -o IxNpeMicrocode; \ - ./IxNpeMicrocode -be \ - ) -endef - -define Build/InstallDev - $(INSTALL_BIN) $(PKG_BUILD_DIR)/NPE-B $(TARGET)/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/NPE-C $(TARGET)/ -endef - -$(eval $(call Build/DefaultTargets)) diff --git a/target/linux/ixp4xx/image/npe-ucode/src/IxNpeMicrocode.h b/target/linux/ixp4xx/image/npe-ucode/src/IxNpeMicrocode.h deleted file mode 100644 index 5cbb4b473..000000000 --- a/target/linux/ixp4xx/image/npe-ucode/src/IxNpeMicrocode.h +++ /dev/null @@ -1,143 +0,0 @@ -/* - * IxNpeMicrocode.h - Headerfile for compiling the Intel microcode C file - * - * Copyright (C) 2006 Christian Hohnstaedt - * - * This file is released under the GPLv2 - * - * - * compile with - * - * gcc -Wall IxNpeMicrocode.c -o IxNpeMicrocode - * - * Executing the resulting binary on your build-host creates the - * "NPE-[ABC].xxxxxxxx" files containing the selected microcode - * - * fetch the IxNpeMicrocode.c from the Intel Access Library. - * It will include this header. - * - * select Images for every NPE from the following - * (used C++ comments for easy uncommenting ....) - */ - -// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_SPAN_MASK_FIREWALL_VLAN_QOS_HDR_CONV_EXTMIB -// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_SPAN_VLAN_QOS_HDR_CONV_EXTMIB -// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_LEARN_FILTER_SPAN_MASK_FIREWALL_VLAN_QOS_EXTMIB -// #define IX_NPEDL_NPEIMAGE_NPEA_HSS_TSLOT_SWITCH -// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV -// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS -// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_LEARN_FILTER_SPAN_FIREWALL -// #define IX_NPEDL_NPEIMAGE_NPEA_HSS_2_PORT -// #define IX_NPEDL_NPEIMAGE_NPEA_DMA -// #define IX_NPEDL_NPEIMAGE_NPEA_ATM_MPHY_12_PORT -// #define IX_NPEDL_NPEIMAGE_NPEA_HSS0_ATM_MPHY_1_PORT -// #define IX_NPEDL_NPEIMAGE_NPEA_HSS0_ATM_SPHY_1_PORT -// #define IX_NPEDL_NPEIMAGE_NPEA_HSS0 -// #define IX_NPEDL_NPEIMAGE_NPEA_WEP - - -// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_SPAN_MASK_FIREWALL_VLAN_QOS_HDR_CONV_EXTMIB -// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_SPAN_VLAN_QOS_HDR_CONV_EXTMIB -// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_LEARN_FILTER_SPAN_MASK_FIREWALL_VLAN_QOS_EXTMIB -// #define IX_NPEDL_NPEIMAGE_NPEB_DMA -// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV -// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS -#define IX_NPEDL_NPEIMAGE_NPEB_ETH_LEARN_FILTER_SPAN_FIREWALL - - -// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_MASK_FIREWALL_VLAN_QOS_HDR_CONV_EXTMIB -// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_VLAN_QOS_HDR_CONV_EXTMIB -// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_MASK_FIREWALL_VLAN_QOS_EXTMIB -// #define IX_NPEDL_NPEIMAGE_NPEC_DMA -// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_ETH_LEARN_FILTER_SPAN -// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_ETH_LEARN_FILTER_FIREWALL -#define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_CCM_ETH -// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_ETH_LEARN_FILTER_SPAN_FIREWALL -// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV -// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS -#define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if __BYTE_ORDER == __LITTLE_ENDIAN -#define to_le32(x) (x) -#define to_be32(x) bswap_32(x) -#else -#define to_be32(x) (x) -#define to_le32(x) bswap_32(x) -#endif - -struct dl_image { - unsigned magic; - unsigned id; - unsigned size; - unsigned data[0]; -}; - -const unsigned IxNpeMicrocode_array[]; - -int main(int argc, char *argv[]) -{ - struct dl_image *image = (struct dl_image *)IxNpeMicrocode_array; - int imgsiz, i, fd, cnt; - const unsigned *arrayptr = IxNpeMicrocode_array; - const char *names[] = { "IXP425", "IXP465", "unknown" }; - int bigendian = 1; - - if (argc > 1) { - if (!strcmp(argv[1], "-le")) - bigendian = 0; - else if (!strcmp(argv[1], "-be")) - bigendian = 1; - else { - printf("Usage: %s <-le|-be>\n", argv[0]); - return EXIT_FAILURE; - } - } - - for (image = (struct dl_image *)arrayptr, cnt=0; - (image->id != 0xfeedf00d) && (image->magic == 0xfeedf00d); - image = (struct dl_image *)(arrayptr), cnt++) - { - unsigned char field[4]; - imgsiz = image->size + 3; - *(unsigned*)field = to_be32(image->id); - char filename[40], slnk[10]; - - sprintf(filename, "NPE-%c.%08x", (field[0] & 0xf) + 'A', - image->id); - sprintf(slnk, "NPE-%c", (field[0] & 0xf) + 'A'); - printf("Writing image: %s.NPE_%c Func: %2x Rev: %02x.%02x " - "Size: %5d to: '%s'\n", - names[field[0] >> 4], (field[0] & 0xf) + 'A', - field[1], field[2], field[3], imgsiz*4, filename); - fd = open(filename, O_CREAT | O_RDWR | O_TRUNC, 0644); - if (fd >= 0) { - for (i=0; i