Browse Source

optimize miniconfigs, enable netstuff by default

Waldemar Brodkorb 10 years ago
parent
commit
521eddfc1e

+ 0 - 2
target/arm/kernel/cubox-i

@@ -26,11 +26,9 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
-CONFIG_NETDEVICES=y
 CONFIG_MII=y
 CONFIG_PHYLIB=y
 CONFIG_MICREL_PHY=y
-CONFIG_NET_ETHERNET=y
 CONFIG_SMSC911X=y
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y

+ 0 - 3
target/arm/kernel/qemu-arm-versatilepb

@@ -16,10 +16,7 @@ CONFIG_USE_OF=y
 CONFIG_ATAGS=y
 CONFIG_DTC=y
 CONFIG_OF=y
-CONFIG_NETDEVICES=y
 CONFIG_MII=y
-CONFIG_NET_CORE=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=y
 CONFIG_SERIAL_AMBA_PL011=y

+ 0 - 3
target/arm/kernel/qemu-arm-vexpress-a9

@@ -14,9 +14,6 @@ CONFIG_VFPv3=y
 CONFIG_NEON=y
 CONFIG_OF=y
 CONFIG_DTC=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMSC911X=y
 CONFIG_SERIAL_AMBA_PL011=y

+ 0 - 8
target/linux/config/Config.in.network

@@ -1,13 +1,5 @@
 menu "Network support"
 
-config ADK_KERNEL_INET
-	boolean
-	default y
-
-config ADK_KERNEL_NET_CORE
-	boolean
-	default y
-
 config ADK_KERNEL_IP_FIB_HASH
 	boolean
 	default y

+ 3 - 0
target/linux/kernel.config

@@ -12,6 +12,9 @@ CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_INET=y
+CONFIG_NETDEVICES=y
+CONFIG_NET_CORE=y
+CONFIG_ETHERNET=y
 CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
 CONFIG_BLOCK=y

+ 0 - 2
target/m68k/kernel/aranym-m68k

@@ -4,8 +4,6 @@ CONFIG_M68KCLASSIC=y
 CONFIG_M68040=y
 CONFIG_FPU=y
 CONFIG_ATARI=y
-CONFIG_NETDEVICES=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_CADENCE=y
 CONFIG_SERIO=y

+ 0 - 3
target/microblaze/kernel/qemu-microblaze-ml605

@@ -15,9 +15,6 @@ CONFIG_PCI_XILINX=y
 CONFIG_DTC=y
 CONFIG_OF=y
 CONFIG_PROC_DEVICETREE=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_AXI_EMAC=y
 CONFIG_SERIAL_8250=y

+ 0 - 3
target/microblaze/kernel/qemu-microblaze-s3adsp1800

@@ -15,9 +15,6 @@ CONFIG_PCI_XILINX=y
 CONFIG_DTC=y
 CONFIG_OF=y
 CONFIG_PROC_DEVICETREE=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=y
 CONFIG_SERIAL_UARTLITE=y

+ 0 - 3
target/mips/kernel/lemote-yeelong

@@ -15,9 +15,6 @@ CONFIG_COMPAT=y
 CONFIG_MIPS32_O32=y
 CONFIG_MIPS32_N32=y
 CONFIG_BLK_DEV=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_8139TOO=y
 CONFIG_SERIO=y

+ 0 - 3
target/mips/kernel/qemu-mips

@@ -7,9 +7,6 @@ CONFIG_CPU_MIPS32_R1=y
 CONFIG_PAGE_SIZE_4KB=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_E1000=y
 CONFIG_PHYLIB=y

+ 0 - 3
target/mips/kernel/qemu-mips64

@@ -10,9 +10,6 @@ CONFIG_MIPS32_COMPAT=y
 CONFIG_MIPS32_O32=y
 CONFIG_MIPS32_N32=y
 CONFIG_BINFMT_ELF32=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_E1000=y
 CONFIG_SERIAL_8250=y

+ 0 - 3
target/mips/kernel/qemu-mips64el

@@ -10,9 +10,6 @@ CONFIG_MIPS32_COMPAT=y
 CONFIG_MIPS32_O32=y
 CONFIG_MIPS32_N32=y
 CONFIG_BINFMT_ELF32=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_E1000=y
 CONFIG_SERIAL_8250=y

+ 0 - 3
target/mips/kernel/qemu-mipsel

@@ -7,9 +7,6 @@ CONFIG_CPU_MIPS32_R1=y
 CONFIG_PAGE_SIZE_4KB=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_E1000=y
 CONFIG_PHYLIB=y

+ 0 - 3
target/ppc/kernel/qemu-ppc

@@ -30,9 +30,6 @@ CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_INPUT_ADBHID=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NET_VENDOR_8390=y
 CONFIG_NE2K_PCI=y

+ 0 - 3
target/ppc64/kernel/qemu-ppc64

@@ -28,11 +28,8 @@ CONFIG_PCI_SYSCALL=y
 CONFIG_PCI_MSI=y
 CONFIG_DTC=y
 CONFIG_OF=y
-CONFIG_NETDEVICES=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_IBM=y
 CONFIG_IBMVETH=y
-CONFIG_NET_CORE=y
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_CONSOLE=y

+ 0 - 3
target/sh/kernel/qemu-sh

@@ -16,10 +16,7 @@ CONFIG_SH_INTC=y
 CONFIG_CMDLINE_OVERWRITE=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
 CONFIG_MII=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_8139CP=y
 CONFIG_SERIAL_SH_SCI=y

+ 0 - 3
target/sparc/kernel/qemu-sparc

@@ -6,9 +6,6 @@ CONFIG_PCI=y
 CONFIG_PCI_SYSCALL=y
 CONFIG_PCIC_PCI=y
 CONFIG_OF=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_SUNLANCE=y
 CONFIG_SERIAL_CONSOLE=y

+ 0 - 3
target/sparc64/kernel/qemu-sparc64

@@ -12,9 +12,6 @@ CONFIG_OF_NET=y
 CONFIG_OF_PCI=y
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_OF_IOMMU=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NET_VENDOR_8390=y
 CONFIG_NE2K_PCI=y

+ 0 - 3
target/x86/kernel/ibm-x40

@@ -18,9 +18,6 @@ CONFIG_SATA_PMP=y
 CONFIG_ATA_SFF=y
 CONFIG_ATA_BMDMA=y
 CONFIG_ATA_PIIX=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_E1000=y
 CONFIG_SERIAL_8250=y

+ 0 - 3
target/x86/kernel/qemu-i686

@@ -5,9 +5,6 @@ CONFIG_PCI_GOANY=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_DOMAINS=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_E1000=y
 CONFIG_SERIAL_8250=y

+ 0 - 3
target/x86_64/kernel/qemu-x86_64

@@ -19,9 +19,6 @@ CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
 CONFIG_IA32_EMULATION=y
 CONFIG_X86_X32=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_E1000=y
 CONFIG_SERIAL_8250=y