diff options
| -rw-r--r-- | target/arm/kernel/cubox-i | 2 | ||||
| -rw-r--r-- | target/arm/kernel/qemu-arm-versatilepb | 3 | ||||
| -rw-r--r-- | target/arm/kernel/qemu-arm-vexpress-a9 | 3 | ||||
| -rw-r--r-- | target/linux/config/Config.in.network | 8 | ||||
| -rw-r--r-- | target/linux/kernel.config | 3 | ||||
| -rw-r--r-- | target/m68k/kernel/aranym-m68k | 2 | ||||
| -rw-r--r-- | target/microblaze/kernel/qemu-microblaze-ml605 | 3 | ||||
| -rw-r--r-- | target/microblaze/kernel/qemu-microblaze-s3adsp1800 | 3 | ||||
| -rw-r--r-- | target/mips/kernel/lemote-yeelong | 3 | ||||
| -rw-r--r-- | target/mips/kernel/qemu-mips | 3 | ||||
| -rw-r--r-- | target/mips/kernel/qemu-mips64 | 3 | ||||
| -rw-r--r-- | target/mips/kernel/qemu-mips64el | 3 | ||||
| -rw-r--r-- | target/mips/kernel/qemu-mipsel | 3 | ||||
| -rw-r--r-- | target/ppc/kernel/qemu-ppc | 3 | ||||
| -rw-r--r-- | target/ppc64/kernel/qemu-ppc64 | 3 | ||||
| -rw-r--r-- | target/sh/kernel/qemu-sh | 3 | ||||
| -rw-r--r-- | target/sparc/kernel/qemu-sparc | 3 | ||||
| -rw-r--r-- | target/sparc64/kernel/qemu-sparc64 | 3 | ||||
| -rw-r--r-- | target/x86/kernel/ibm-x40 | 3 | ||||
| -rw-r--r-- | target/x86/kernel/qemu-i686 | 3 | ||||
| -rw-r--r-- | target/x86_64/kernel/qemu-x86_64 | 3 |
21 files changed, 3 insertions, 63 deletions
diff --git a/target/arm/kernel/cubox-i b/target/arm/kernel/cubox-i index 9843ee37e..10e5e1a73 100644 --- a/target/arm/kernel/cubox-i +++ b/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 diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb index dc5685995..f208772d0 100644 --- a/target/arm/kernel/qemu-arm-versatilepb +++ b/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 diff --git a/target/arm/kernel/qemu-arm-vexpress-a9 b/target/arm/kernel/qemu-arm-vexpress-a9 index b6535116a..7415e31b4 100644 --- a/target/arm/kernel/qemu-arm-vexpress-a9 +++ b/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 diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index 00d05dcd4..71a510d69 100644 --- a/target/linux/config/Config.in.network +++ b/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 diff --git a/target/linux/kernel.config b/target/linux/kernel.config index 01bb061b3..9c6c96c01 100644 --- a/target/linux/kernel.config +++ b/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 diff --git a/target/m68k/kernel/aranym-m68k b/target/m68k/kernel/aranym-m68k index e6efb5b9b..93bf0022f 100644 --- a/target/m68k/kernel/aranym-m68k +++ b/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 diff --git a/target/microblaze/kernel/qemu-microblaze-ml605 b/target/microblaze/kernel/qemu-microblaze-ml605 index a36267570..8d13c5ddd 100644 --- a/target/microblaze/kernel/qemu-microblaze-ml605 +++ b/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 diff --git a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 index b95e35766..fc43ab5f1 100644 --- a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 +++ b/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 diff --git a/target/mips/kernel/lemote-yeelong b/target/mips/kernel/lemote-yeelong index c37d40271..ec7868db2 100644 --- a/target/mips/kernel/lemote-yeelong +++ b/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 diff --git a/target/mips/kernel/qemu-mips b/target/mips/kernel/qemu-mips index b94efcfaf..4f5c34fd6 100644 --- a/target/mips/kernel/qemu-mips +++ b/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 diff --git a/target/mips/kernel/qemu-mips64 b/target/mips/kernel/qemu-mips64 index 54c501549..a3accc1a6 100644 --- a/target/mips/kernel/qemu-mips64 +++ b/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 diff --git a/target/mips/kernel/qemu-mips64el b/target/mips/kernel/qemu-mips64el index 8b9c6270f..684b187be 100644 --- a/target/mips/kernel/qemu-mips64el +++ b/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 diff --git a/target/mips/kernel/qemu-mipsel b/target/mips/kernel/qemu-mipsel index b63ebeea1..f1f7adcec 100644 --- a/target/mips/kernel/qemu-mipsel +++ b/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 diff --git a/target/ppc/kernel/qemu-ppc b/target/ppc/kernel/qemu-ppc index 8219d7765..f45511601 100644 --- a/target/ppc/kernel/qemu-ppc +++ b/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 diff --git a/target/ppc64/kernel/qemu-ppc64 b/target/ppc64/kernel/qemu-ppc64 index dd88e3395..0eb40bd77 100644 --- a/target/ppc64/kernel/qemu-ppc64 +++ b/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 diff --git a/target/sh/kernel/qemu-sh b/target/sh/kernel/qemu-sh index e701ac3b0..c8d6e347c 100644 --- a/target/sh/kernel/qemu-sh +++ b/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 diff --git a/target/sparc/kernel/qemu-sparc b/target/sparc/kernel/qemu-sparc index 4c4732317..f58df04b4 100644 --- a/target/sparc/kernel/qemu-sparc +++ b/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 diff --git a/target/sparc64/kernel/qemu-sparc64 b/target/sparc64/kernel/qemu-sparc64 index 21238b838..e78fd6071 100644 --- a/target/sparc64/kernel/qemu-sparc64 +++ b/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 diff --git a/target/x86/kernel/ibm-x40 b/target/x86/kernel/ibm-x40 index c1dd930ae..0d57d810a 100644 --- a/target/x86/kernel/ibm-x40 +++ b/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 diff --git a/target/x86/kernel/qemu-i686 b/target/x86/kernel/qemu-i686 index 4c5156e45..275b49592 100644 --- a/target/x86/kernel/qemu-i686 +++ b/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 diff --git a/target/x86_64/kernel/qemu-x86_64 b/target/x86_64/kernel/qemu-x86_64 index febf38bcf..9c1a14724 100644 --- a/target/x86_64/kernel/qemu-x86_64 +++ b/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 |