From 7e29eac7808bdec0a6a67d9c876f51aca348e319 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 16 Apr 2010 11:34:21 +0000 Subject: [PATCH] - enable PCI - add kmod-pcnet32 to default packages - make kmod-pcnet32 available for malta target SVN-Revision: 20923 --- package/kernel/modules/netdevices.mk | 2 +- target/linux/malta/Makefile | 2 +- target/linux/malta/be/config-default | 23 ++++++++++++++++++++--- target/linux/malta/le/config-default | 23 ++++++++++++++++++++--- 4 files changed, 42 insertions(+), 8 deletions(-) diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk index e2a00811cb..ae970f4637 100644 --- a/package/kernel/modules/netdevices.mk +++ b/package/kernel/modules/netdevices.mk @@ -273,7 +273,7 @@ $(eval $(call KernelPackage,3c59x)) define KernelPackage/pcnet32 SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=AMD PCnet32 PCI support - DEPENDS:=@TARGET_x86 + DEPENDS:=@(TARGET_x86||TARGET_malta) KCONFIG:=CONFIG_PCNET32 FILES:=$(LINUX_DIR)/drivers/net/pcnet32.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,pcnet32) diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index d6372df24e..48e0cc1040 100644 --- a/target/linux/malta/Makefile +++ b/target/linux/malta/Makefile @@ -16,6 +16,6 @@ LINUX_VERSION:=2.6.32.10 include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += wpad-mini kmod-mac80211-hwsim +DEFAULT_PACKAGES += wpad-mini kmod-mac80211-hwsim kmod-pcnet32 $(eval $(call BuildTarget)) diff --git a/target/linux/malta/be/config-default b/target/linux/malta/be/config-default index bc00455972..626acf8cb4 100644 --- a/target/linux/malta/be/config-default +++ b/target/linux/malta/be/config-default @@ -14,6 +14,7 @@ CONFIG_AX88796=m # CONFIG_AX88796_93CX6 is not set # CONFIG_BCM47XX is not set # CONFIG_BCM63XX is not set +# CONFIG_BE2NET is not set CONFIG_BITREVERSE=y # CONFIG_BLK_DEV_DM is not set CONFIG_BLK_DEV_IDECD=y @@ -24,6 +25,7 @@ CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 +# CONFIG_BNX2X is not set CONFIG_BOARD_SCACHE=y CONFIG_BONDING=m CONFIG_BOOT_ELF32=y @@ -38,6 +40,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CEVT_R4K=y CONFIG_CEVT_R4K_LIB=y CONFIG_CFG80211_DEFAULT_PS_VALUE=0 +CONFIG_CHELSIO_T3_DEPENDS=y CONFIG_CICADA_PHY=m # CONFIG_CLS_U32_MARK is not set # CONFIG_CLS_U32_PERF is not set @@ -98,6 +101,7 @@ CONFIG_DAVICOM_PHY=m CONFIG_DECOMPRESS_LZMA=y CONFIG_DEFAULT_TCP_CONG="cubic" CONFIG_DEVKMEM=y +CONFIG_DEVPORT=y # CONFIG_DM9000 is not set CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y @@ -107,6 +111,7 @@ CONFIG_DUMMY_CONSOLE=y CONFIG_EARLY_PRINTK=y CONFIG_ELF_CORE=y CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_ENIC is not set CONFIG_EQUALIZER=m CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FS_POSIX_ACL=y @@ -158,6 +163,9 @@ CONFIG_IPC_NS=y CONFIG_IRQ_CPU=y CONFIG_IRQ_GIC=y CONFIG_IRQ_PER_CPU=y +# CONFIG_ISDN_CAPI is not set +# CONFIG_ISDN_I4L is not set +# CONFIG_IXGBE is not set CONFIG_JFFS2_FS_POSIX_ACL=y CONFIG_JFFS2_FS_SECURITY=y CONFIG_JFFS2_FS_XATTR=y @@ -206,6 +214,8 @@ CONFIG_MIPS_MT_SMP=y # CONFIG_MIPS_SIM is not set # CONFIG_MIPS_VPE_LOADER is not set # CONFIG_MISC_DEVICES is not set +# CONFIG_MLX4_CORE is not set +# CONFIG_MLX4_EN is not set CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MTD_CFI_STAA=y # CONFIG_MTD_COMPLEX_MAPPINGS is not set @@ -246,6 +256,7 @@ CONFIG_NET_SCH_RED=m CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_TBF=m CONFIG_NET_SCH_TEQL=m +# CONFIG_NIU is not set CONFIG_NO_HZ=y # CONFIG_NO_IOPORT is not set CONFIG_NR_CPUS=2 @@ -254,6 +265,8 @@ CONFIG_NR_CPUS_DEFAULT_2=y # CONFIG_NXP_STB225 is not set CONFIG_PAGEFLAGS_EXTENDED=y # CONFIG_PARTITION_ADVANCED is not set +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y CONFIG_PCI_GT64XXX_PCI0=y CONFIG_PCSPKR_PLATFORM=y CONFIG_PHYLIB=m @@ -266,6 +279,7 @@ CONFIG_PRINT_QUOTA_WARNING=y CONFIG_PROC_PAGE_MONITOR=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y +# CONFIG_QLGE is not set CONFIG_QSEMI_PHY=m CONFIG_QUOTA=y CONFIG_QUOTACTL=y @@ -277,6 +291,7 @@ CONFIG_RTC_CLASS=y CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_SCHED_SMT is not set CONFIG_SCSI=y +# CONFIG_SCSI_CXGB3_ISCSI is not set CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_NETLINK=y @@ -288,8 +303,10 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIO=y # CONFIG_SERIO_I8042 is not set # CONFIG_SERIO_LIBPS2 is not set +# CONFIG_SERIO_PCIPS2 is not set # CONFIG_SERIO_RAW is not set CONFIG_SERIO_SERPORT=y +# CONFIG_SFC is not set # CONFIG_SGI_IP22 is not set # CONFIG_SGI_IP27 is not set # CONFIG_SGI_IP28 is not set @@ -328,16 +345,15 @@ CONFIG_SYS_SUPPORTS_MULTITHREADING=y CONFIG_SYS_SUPPORTS_SCHED_SMT=y CONFIG_SYS_SUPPORTS_SMARTMIPS=y CONFIG_SYS_SUPPORTS_SMP=y +# CONFIG_TC35815 is not set # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y +# CONFIG_TEHUTI is not set CONFIG_TRAD_SIGNALS=y # CONFIG_TREE_PREEMPT_RCU is not set CONFIG_TREE_RCU=y CONFIG_TUN=m # CONFIG_UBIFS_FS is not set -# CONFIG_USB_ARCH_HAS_EHCI is not set -# CONFIG_USB_ARCH_HAS_HCD is not set -# CONFIG_USB_ARCH_HAS_OHCI is not set CONFIG_USB_SUPPORT=y # CONFIG_USER_NS is not set CONFIG_USE_GENERIC_SMP_HELPERS=y @@ -350,5 +366,6 @@ CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_VXFS_FS=y +# CONFIG_VXGE is not set # CONFIG_WATCHDOG is not set CONFIG_WLAN_PRE80211=y diff --git a/target/linux/malta/le/config-default b/target/linux/malta/le/config-default index 382144d8d8..d1336a51b8 100644 --- a/target/linux/malta/le/config-default +++ b/target/linux/malta/le/config-default @@ -14,6 +14,7 @@ CONFIG_AX88796=m # CONFIG_AX88796_93CX6 is not set # CONFIG_BCM47XX is not set # CONFIG_BCM63XX is not set +# CONFIG_BE2NET is not set CONFIG_BITREVERSE=y # CONFIG_BLK_DEV_DM is not set CONFIG_BLK_DEV_IDECD=y @@ -24,6 +25,7 @@ CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 +# CONFIG_BNX2X is not set CONFIG_BOARD_SCACHE=y CONFIG_BONDING=m CONFIG_BOOT_ELF32=y @@ -38,6 +40,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CEVT_R4K=y CONFIG_CEVT_R4K_LIB=y CONFIG_CFG80211_DEFAULT_PS_VALUE=0 +CONFIG_CHELSIO_T3_DEPENDS=y CONFIG_CICADA_PHY=m # CONFIG_CLS_U32_MARK is not set # CONFIG_CLS_U32_PERF is not set @@ -98,6 +101,7 @@ CONFIG_DAVICOM_PHY=m CONFIG_DECOMPRESS_LZMA=y CONFIG_DEFAULT_TCP_CONG="cubic" CONFIG_DEVKMEM=y +CONFIG_DEVPORT=y # CONFIG_DM9000 is not set CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y @@ -107,6 +111,7 @@ CONFIG_DUMMY_CONSOLE=y CONFIG_EARLY_PRINTK=y CONFIG_ELF_CORE=y CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_ENIC is not set CONFIG_EQUALIZER=m CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FS_POSIX_ACL=y @@ -158,6 +163,9 @@ CONFIG_IPC_NS=y CONFIG_IRQ_CPU=y CONFIG_IRQ_GIC=y CONFIG_IRQ_PER_CPU=y +# CONFIG_ISDN_CAPI is not set +# CONFIG_ISDN_I4L is not set +# CONFIG_IXGBE is not set CONFIG_JFFS2_FS_POSIX_ACL=y CONFIG_JFFS2_FS_SECURITY=y CONFIG_JFFS2_FS_XATTR=y @@ -206,6 +214,8 @@ CONFIG_MIPS_MT_SMP=y # CONFIG_MIPS_SIM is not set # CONFIG_MIPS_VPE_LOADER is not set # CONFIG_MISC_DEVICES is not set +# CONFIG_MLX4_CORE is not set +# CONFIG_MLX4_EN is not set CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MTD_CFI_STAA=y # CONFIG_MTD_COMPLEX_MAPPINGS is not set @@ -246,6 +256,7 @@ CONFIG_NET_SCH_RED=m CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_TBF=m CONFIG_NET_SCH_TEQL=m +# CONFIG_NIU is not set CONFIG_NO_HZ=y # CONFIG_NO_IOPORT is not set CONFIG_NR_CPUS=2 @@ -254,6 +265,8 @@ CONFIG_NR_CPUS_DEFAULT_2=y # CONFIG_NXP_STB225 is not set CONFIG_PAGEFLAGS_EXTENDED=y # CONFIG_PARTITION_ADVANCED is not set +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y CONFIG_PCI_GT64XXX_PCI0=y CONFIG_PCSPKR_PLATFORM=y CONFIG_PHYLIB=m @@ -266,6 +279,7 @@ CONFIG_PRINT_QUOTA_WARNING=y CONFIG_PROC_PAGE_MONITOR=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y +# CONFIG_QLGE is not set CONFIG_QSEMI_PHY=m CONFIG_QUOTA=y CONFIG_QUOTACTL=y @@ -277,6 +291,7 @@ CONFIG_RTC_CLASS=y CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_SCHED_SMT is not set CONFIG_SCSI=y +# CONFIG_SCSI_CXGB3_ISCSI is not set CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_NETLINK=y @@ -288,8 +303,10 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIO=y # CONFIG_SERIO_I8042 is not set # CONFIG_SERIO_LIBPS2 is not set +# CONFIG_SERIO_PCIPS2 is not set # CONFIG_SERIO_RAW is not set CONFIG_SERIO_SERPORT=y +# CONFIG_SFC is not set # CONFIG_SGI_IP22 is not set # CONFIG_SGI_IP27 is not set # CONFIG_SGI_IP28 is not set @@ -328,16 +345,15 @@ CONFIG_SYS_SUPPORTS_MULTITHREADING=y CONFIG_SYS_SUPPORTS_SCHED_SMT=y CONFIG_SYS_SUPPORTS_SMARTMIPS=y CONFIG_SYS_SUPPORTS_SMP=y +# CONFIG_TC35815 is not set # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y +# CONFIG_TEHUTI is not set CONFIG_TRAD_SIGNALS=y # CONFIG_TREE_PREEMPT_RCU is not set CONFIG_TREE_RCU=y CONFIG_TUN=m # CONFIG_UBIFS_FS is not set -# CONFIG_USB_ARCH_HAS_EHCI is not set -# CONFIG_USB_ARCH_HAS_HCD is not set -# CONFIG_USB_ARCH_HAS_OHCI is not set CONFIG_USB_SUPPORT=y # CONFIG_USER_NS is not set CONFIG_USE_GENERIC_SMP_HELPERS=y @@ -350,5 +366,6 @@ CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_VXFS_FS=y +# CONFIG_VXGE is not set # CONFIG_WATCHDOG is not set CONFIG_WLAN_PRE80211=y