diff options
39 files changed, 50 insertions, 16 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 7642c5e09..1c7f2bfdf 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.1 -PKG_RELEASE:= 15 +PKG_RELEASE:= 16 PKG_SECTION:= base/apps PKG_DESCR:= basic files and scripts @@ -68,6 +68,11 @@ endif mkdir -p $(IDIR_BASE_FILES)/etc/network/{if-pre-up.d,if-up.d,if-down.d,if-post-down.d} mkdir -p $(IDIR_BASE_FILES)/usr/{lib,bin} chmod 600 $(IDIR_BASE_FILES)/etc/shadow +ifeq ($(ADK_TARGET_WITH_NETDEVICE),y) + cp ./files/interfaces-dhcp $(IDIR_BASE_FILES)/etc/network/interfaces +else + cp ./files/interfaces-lo $(IDIR_BASE_FILES)/etc/network/interfaces +endif chmod 600 $(IDIR_BASE_FILES)/etc/network/interfaces ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y) (cd $(IDIR_BASE_FILES)/etc; ln -sf ../proc/net/pnp resolv.conf) diff --git a/package/base-files/src/etc/network/interfaces b/package/base-files/files/interfaces-dhcp index 11174c152..11174c152 100644 --- a/package/base-files/src/etc/network/interfaces +++ b/package/base-files/files/interfaces-dhcp diff --git a/target/aarch64/systems/arm-fm b/target/aarch64/systems/arm-fm index 93166ff27..b53e7a0be 100644 --- a/target/aarch64/systems/arm-fm +++ b/target/aarch64/systems/arm-fm @@ -7,6 +7,7 @@ config ADK_TARGET_SYSTEM_ARM_FM select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK help Support for ARMv8 Foundation Model (aarch64). diff --git a/target/alpha/systems/qemu-alpha b/target/alpha/systems/qemu-alpha index 8c540d2e2..41641fc71 100644 --- a/target/alpha/systems/qemu-alpha +++ b/target/alpha/systems/qemu-alpha @@ -3,5 +3,5 @@ config ADK_TARGET_SYSTEM_QEMU_ALPHA select ADK_CPU_ALPHA select ADK_TARGET_QEMU help - Support for Qemu Emulator ALPHA architecture. + Support for Qemu Emulator ALPHA architecture. diff --git a/target/arc/systems/nsim-arcv1 b/target/arc/systems/nsim-arcv1 index 0971845c8..b67bb8e1f 100644 --- a/target/arc/systems/nsim-arcv1 +++ b/target/arc/systems/nsim-arcv1 @@ -1,6 +1,7 @@ config ADK_TARGET_SYSTEM_NSIM_ARCV1 bool "Synopsys NSIM Emulator (ARCv1)" select ADK_CPU_ARC700 + select ADK_TARGET_WITH_NET select ADK_TARGET_WITH_SERIAL help Support for NSIM Emulator for ARCv1. diff --git a/target/arc/systems/nsim-arcv2 b/target/arc/systems/nsim-arcv2 index 2f0e0d084..118c9339f 100644 --- a/target/arc/systems/nsim-arcv2 +++ b/target/arc/systems/nsim-arcv2 @@ -1,6 +1,7 @@ config ADK_TARGET_SYSTEM_NSIM_ARCV2 bool "Synopsys NSIM Emulator (ARCv2)" select ADK_CPU_ARC_HS + select ADK_TARGET_WITH_NET select ADK_TARGET_WITH_SERIAL help Support for NSIM Emulator for ARCv2. diff --git a/target/arm/systems/banana-pro b/target/arm/systems/banana-pro index 991d7fa14..e7158a5fc 100644 --- a/target/arm/systems/banana-pro +++ b/target/arm/systems/banana-pro @@ -14,6 +14,7 @@ config ADK_TARGET_SYSTEM_BANANA_PRO select ADK_TARGET_WITH_SMP select ADK_TARGET_WITH_ROOT_RW select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK select ADK_TARGET_KERNEL_UIMAGE select ADK_PACKAGE_U_BOOT diff --git a/target/arm/systems/beaglebone-black b/target/arm/systems/beaglebone-black index ed8a4a219..ef2ee0eca 100644 --- a/target/arm/systems/beaglebone-black +++ b/target/arm/systems/beaglebone-black @@ -11,6 +11,8 @@ config ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK select ADK_TARGET_WITH_SD select ADK_TARGET_WITH_I2C select ADK_TARGET_WITH_SPI + select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_ROOT_RW select ADK_TARGET_KERNEL_ZIMAGE help diff --git a/target/arm/systems/kinetis-k70 b/target/arm/systems/kinetis-k70 index 08d054834..50ca3edde 100644 --- a/target/arm/systems/kinetis-k70 +++ b/target/arm/systems/kinetis-k70 @@ -5,6 +5,7 @@ config ADK_TARGET_SYSTEM_KINETIS_K70 select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_USB + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_NET select ADK_TARGET_WITH_BLOCK select ADK_TARGET_UCLINUX diff --git a/target/arm/systems/linksys-nslu2 b/target/arm/systems/linksys-nslu2 index 2c1665996..b234d7d25 100644 --- a/target/arm/systems/linksys-nslu2 +++ b/target/arm/systems/linksys-nslu2 @@ -7,6 +7,7 @@ config ADK_TARGET_SYSTEM_LINKSYS_NSLU2 select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK select ADK_TARGET_KERNEL_ZIMAGE help diff --git a/target/arm/systems/raspberry-pi b/target/arm/systems/raspberry-pi index 75267c12b..2f84e33cc 100644 --- a/target/arm/systems/raspberry-pi +++ b/target/arm/systems/raspberry-pi @@ -12,6 +12,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_TARGET_WITH_I2C select ADK_TARGET_WITH_SPI select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK select ADK_TARGET_WITH_SOUND select ADK_PACKAGE_BCM28XX_BOOTLOADER diff --git a/target/arm/systems/raspberry-pi2 b/target/arm/systems/raspberry-pi2 index e0f438fd5..3badb46d0 100644 --- a/target/arm/systems/raspberry-pi2 +++ b/target/arm/systems/raspberry-pi2 @@ -13,6 +13,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI2 select ADK_TARGET_WITH_SPI select ADK_TARGET_WITH_SMP select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK select ADK_TARGET_WITH_SOUND select ADK_PACKAGE_BCM28XX_BOOTLOADER diff --git a/target/arm/systems/sharp-zaurus b/target/arm/systems/sharp-zaurus index 950217090..86c2405fe 100644 --- a/target/arm/systems/sharp-zaurus +++ b/target/arm/systems/sharp-zaurus @@ -11,6 +11,7 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS select ADK_TARGET_WITH_SOUND select ADK_TARGET_WITH_TOUCHSCREEN select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK select ADK_TARGET_KERNEL_ZIMAGE help diff --git a/target/arm/systems/solidrun-imx6 b/target/arm/systems/solidrun-imx6 index 4ade97a7e..0f7eafe3c 100644 --- a/target/arm/systems/solidrun-imx6 +++ b/target/arm/systems/solidrun-imx6 @@ -13,6 +13,7 @@ config ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_TARGET_WITH_SOUND select ADK_TARGET_WITH_LEDS select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK select ADK_TARGET_WITH_WATCHDOG select ADK_TARGET_KERNEL_ZIMAGE diff --git a/target/avr32/systems/atmel-ngw100 b/target/avr32/systems/atmel-ngw100 index aa895d1e8..c02904726 100644 --- a/target/avr32/systems/atmel-ngw100 +++ b/target/avr32/systems/atmel-ngw100 @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_ATMEL_NGW100 select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK select ADK_TARGET_KERNEL_UIMAGE select ADK_HOST_BUILD_U_BOOT diff --git a/target/config/Config.in b/target/config/Config.in index 4f983e412..795c80467 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -23,7 +23,7 @@ config ADK_TARGET_SIM config ADK_TARGET_QEMU bool - select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE config ADK_TARGET_VBOX bool diff --git a/target/config/Config.in.hardware b/target/config/Config.in.hardware index 45a4a444f..8a0c1daba 100644 --- a/target/config/Config.in.hardware +++ b/target/config/Config.in.hardware @@ -5,6 +5,9 @@ config ADK_TARGET_WITH_CPU_FREQ bool +config ADK_TARGET_WITH_NETDEVICE + bool + config ADK_TARGET_WITH_NET bool diff --git a/target/h8300/systems/sim-h8300h b/target/h8300/systems/sim-h8300h index f75e14599..d6cc62c94 100644 --- a/target/h8300/systems/sim-h8300h +++ b/target/h8300/systems/sim-h8300h @@ -1,5 +1,5 @@ config ADK_TARGET_SYSTEM_SIM_H8300H - bool "Simulator" + bool "GDB simulator" select ADK_CPU_H8300 select ADK_TARGET_SIM select ADK_TARGET_PACKAGE_TXZ diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet index 1a72ec7e9..aa08abff5 100644 --- a/target/linux/config/Config.in.ethernet +++ b/target/linux/config/Config.in.ethernet @@ -2,9 +2,7 @@ # material, please see the LICENCE file in the top-level directory. menu "Ethernet network devices support" -depends on ADK_TARGET_WITH_NET - -# vendor stuff +depends on ADK_TARGET_WITH_NETDEVICE config ADK_KERNEL_NET_CADENCE bool diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index e60b0da7b..028682f1a 100644 --- a/target/linux/config/Config.in.network +++ b/target/linux/config/Config.in.network @@ -1,6 +1,9 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. +menu "Network support" +depends on ADK_TARGET_WITH_NET + config ADK_KERNEL_NETDEVICES bool @@ -19,9 +22,6 @@ config ADK_KERNEL_UNIX config ADK_KERNEL_NET_CORE bool -menu "Network support" -depends on ADK_TARGET_WITH_NET - config ADK_KERNEL_INET bool "Enable TCP/IP support" select ADK_KERNEL_NET diff --git a/target/m68k/systems/aranym-m68k b/target/m68k/systems/aranym-m68k index e7cbe2cbe..dc318b518 100644 --- a/target/m68k/systems/aranym-m68k +++ b/target/m68k/systems/aranym-m68k @@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_ARANYM_M68K select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_HDD select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK select ADK_TARGET_KERNEL_ZIMAGE help diff --git a/target/m68k/systems/qemu-m68k-mcf5208 b/target/m68k/systems/qemu-m68k-mcf5208 index e41a35d69..70c7a0cfb 100644 --- a/target/m68k/systems/qemu-m68k-mcf5208 +++ b/target/m68k/systems/qemu-m68k-mcf5208 @@ -6,5 +6,5 @@ config ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 select ADK_TARGET_UCLINUX select ADK_TARGET_KERNEL_ZIMAGE help - Support for Qemu Emulator M68K/Coldfire. + Support for Qemu Emulator M68K/Coldfire. diff --git a/target/m68k/systems/qemu-m68k-q800 b/target/m68k/systems/qemu-m68k-q800 index 26e5e0b2a..1630f2f53 100644 --- a/target/m68k/systems/qemu-m68k-q800 +++ b/target/m68k/systems/qemu-m68k-q800 @@ -4,5 +4,5 @@ config ADK_TARGET_SYSTEM_QEMU_M68K_Q800 select ADK_CPU_68040 select ADK_TARGET_KERNEL_ZIMAGE help - Support for Qemu Emulator with M68K architecture (Q800). + Support for Qemu Emulator with M68K architecture (Q800). diff --git a/target/mips/systems/dragino-ms14s b/target/mips/systems/dragino-ms14s index 3cafb2c7a..2072863c9 100644 --- a/target/mips/systems/dragino-ms14s +++ b/target/mips/systems/dragino-ms14s @@ -8,6 +8,7 @@ config ADK_TARGET_SYSTEM_DRAGINO_MS14S select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK help Support for Dragino2 ms14-s. diff --git a/target/mips/systems/imgtec-ci20 b/target/mips/systems/imgtec-ci20 index 138f151e0..93922a920 100644 --- a/target/mips/systems/imgtec-ci20 +++ b/target/mips/systems/imgtec-ci20 @@ -8,6 +8,7 @@ config ADK_TARGET_SYSTEM_IMGTEC_CI20 select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_SMP select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK help Support for Imagination Creator CI20. diff --git a/target/mips/systems/mikrotik-rb4xx b/target/mips/systems/mikrotik-rb4xx index 785a57705..721613ba9 100644 --- a/target/mips/systems/mikrotik-rb4xx +++ b/target/mips/systems/mikrotik-rb4xx @@ -10,6 +10,7 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB4XX select ADK_TARGET_WITH_NAND select ADK_TARGET_WITH_LEDS select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK help Support for Mikrotik RB411/RB433/RB493g. diff --git a/target/mips/systems/mikrotik-rb532 b/target/mips/systems/mikrotik-rb532 index c29940e55..62785260d 100644 --- a/target/mips/systems/mikrotik-rb532 +++ b/target/mips/systems/mikrotik-rb532 @@ -10,6 +10,7 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB532 select ADK_TARGET_WITH_PATA select ADK_TARGET_WITH_LEDS select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK help Support for Mikrotik RB532. diff --git a/target/mips64/systems/lemote-yeelong b/target/mips64/systems/lemote-yeelong index 059dbf6cc..acdc32e80 100644 --- a/target/mips64/systems/lemote-yeelong +++ b/target/mips64/systems/lemote-yeelong @@ -11,6 +11,7 @@ config ADK_TARGET_SYSTEM_LEMOTE_YEELONG select ADK_TARGET_WITH_HDD select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK select ADK_TARGET_WITH_ROOT_RW select ADK_TARGET_KERNEL_VMLINUZ diff --git a/target/or1k/systems/or1k-sim b/target/or1k/systems/or1k-sim index 3f77324b1..56f51a852 100644 --- a/target/or1k/systems/or1k-sim +++ b/target/or1k/systems/or1k-sim @@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_OR1K_SIM bool "OR1K Simulator" select ADK_CPU_OR1K select ADK_TARGET_WITH_SERIAL + select ADK_TARGET_WITH_NET help Simulator for OR1K architecture. diff --git a/target/ppc/systems/mac-mini b/target/ppc/systems/mac-mini index ff13d2434..9841cb83c 100644 --- a/target/ppc/systems/mac-mini +++ b/target/ppc/systems/mac-mini @@ -4,7 +4,8 @@ config ADK_TARGET_SYSTEM_APPLE_MACMINI select ADK_CPU_PPC select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK help - Support for Apple Mac mini. + Support for Apple Mac mini. diff --git a/target/ppc/systems/qemu-ppc-bamboo b/target/ppc/systems/qemu-ppc-bamboo index 24d231205..dcac77ea7 100644 --- a/target/ppc/systems/qemu-ppc-bamboo +++ b/target/ppc/systems/qemu-ppc-bamboo @@ -4,5 +4,5 @@ config ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO select ADK_CPU_PPC_440 select ADK_TARGET_SOFT_FLOAT help - Support for Qemu Emulator PPC architecture (Bamboo). + Support for Qemu Emulator PPC architecture (Bamboo). diff --git a/target/ppc/systems/qemu-ppc-macppc b/target/ppc/systems/qemu-ppc-macppc index 2e9ba1a4f..26b5deeac 100644 --- a/target/ppc/systems/qemu-ppc-macppc +++ b/target/ppc/systems/qemu-ppc-macppc @@ -4,5 +4,5 @@ config ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC select ADK_CPU_PPC select ADK_TARGET_CPU_WITH_FPU help - Support for Qemu Emulator PPC architecture (MAC-PPC). + Support for Qemu Emulator PPC architecture (MAC-PPC). diff --git a/target/sparc/systems/sun-voyager b/target/sparc/systems/sun-voyager index 90f1cbb57..7fb9abd4e 100644 --- a/target/sparc/systems/sun-voyager +++ b/target/sparc/systems/sun-voyager @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_SUN_VOYAGER select ADK_CPU_SPARC_V8 select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK select ADK_TARGET_KERNEL_ZIMAGE help diff --git a/target/sparc64/systems/qemu-sparc64 b/target/sparc64/systems/qemu-sparc64 index 9079671dc..7baee84f4 100644 --- a/target/sparc64/systems/qemu-sparc64 +++ b/target/sparc64/systems/qemu-sparc64 @@ -4,5 +4,5 @@ config ADK_TARGET_SYSTEM_QEMU_SPARC64 select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE help - Support for Qemu Emulator SPARC64 architecture. + Support for Qemu Emulator SPARC64 architecture. diff --git a/target/x86/systems/generic-pc b/target/x86/systems/generic-pc index 901c54597..dc5f8e51b 100644 --- a/target/x86/systems/generic-pc +++ b/target/x86/systems/generic-pc @@ -7,8 +7,10 @@ config ADK_TARGET_SYSTEM_GENERIC_PC select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK select ADK_PACKAGE_GRUB help Example config for generic i686 based PC. + You need to enable all required drivers manually. diff --git a/target/x86/systems/ibm-x40 b/target/x86/systems/ibm-x40 index 9bb7e8e7a..8ccfad02c 100644 --- a/target/x86/systems/ibm-x40 +++ b/target/x86/systems/ibm-x40 @@ -20,6 +20,7 @@ config ADK_TARGET_SYSTEM_IBM_X40 select ADK_TARGET_WITH_ACPI select ADK_TARGET_WITH_WIFI select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK # with docking station select ADK_TARGET_WITH_PP diff --git a/target/x86/systems/pcengines-alix b/target/x86/systems/pcengines-alix index 0ae9a389a..be3f408c3 100644 --- a/target/x86/systems/pcengines-alix +++ b/target/x86/systems/pcengines-alix @@ -8,6 +8,7 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX select ADK_TARGET_WITH_GEODE_CRYPTO select ADK_TARGET_WITH_WATCHDOG select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK select ADK_TARGET_KERNEL_BZIMAGE select ADK_PACKAGE_GRUB diff --git a/target/x86_64/systems/pcengines-apu b/target/x86_64/systems/pcengines-apu index 9d42a2fbf..83c1048e8 100644 --- a/target/x86_64/systems/pcengines-apu +++ b/target/x86_64/systems/pcengines-apu @@ -11,6 +11,7 @@ config ADK_TARGET_SYSTEM_PCENGINES_APU select ADK_TARGET_WITH_SATA select ADK_TARGET_WITH_SMP select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK select ADK_PACKAGE_GRUB help diff --git a/target/xtensa/systems/xilinx-kintex7 b/target/xtensa/systems/xilinx-kintex7 index ff0002cc3..ead89dece 100644 --- a/target/xtensa/systems/xilinx-kintex7 +++ b/target/xtensa/systems/xilinx-kintex7 @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_XILINX_KINTEX7 select ADK_TARGET_KERNEL_ZIMAGE select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK select ADK_HOST_BUILD_U_BOOT_XTENSA help |