kernel: make net and block support optional

44 files changed, 157 insertions, 36 deletions

diff --git a/target/aarch64/systems/arm-fm b/target/aarch64/systems/arm-fm
index a23d8092f..93166ff27 100644
--- a/target/aarch64/systems/arm-fm
+++ b/target/aarch64/systems/arm-fm
@@ -6,5 +6,8 @@ config ADK_TARGET_SYSTEM_ARM_FM
 	select ADK_PACKAGE_BOOT_WRAPPER_AARCH64
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_PCI
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	help
-	 Support for ARMv8 Foundation Model (aarch64).
+	  Support for ARMv8 Foundation Model (aarch64).
+
diff --git a/target/aarch64/systems/toolchain-aarch64 b/target/aarch64/systems/toolchain-aarch64
index b23b056df..8f490dd5a 100644
--- a/target/aarch64/systems/toolchain-aarch64
+++ b/target/aarch64/systems/toolchain-aarch64
@@ -6,3 +6,4 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_AARCH64
 	select ADK_TARGET_PACKAGE_TXZ
 	help
 	  AARCH64 toolchain.
+
diff --git a/target/arm/systems/banana-pro b/target/arm/systems/banana-pro
index 232133145..991d7fa14 100644
--- a/target/arm/systems/banana-pro
+++ b/target/arm/systems/banana-pro
@@ -13,6 +13,8 @@ config ADK_TARGET_SYSTEM_BANANA_PRO
 	select ADK_TARGET_WITH_SPI
 	select ADK_TARGET_WITH_SMP
 	select ADK_TARGET_WITH_ROOT_RW
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	select ADK_TARGET_KERNEL_UIMAGE
 	select ADK_PACKAGE_U_BOOT
 	select ADK_HOST_BUILD_U_BOOT
diff --git a/target/arm/systems/kinetis-k70 b/target/arm/systems/kinetis-k70
index ff35694f4..96dca0071 100644
--- a/target/arm/systems/kinetis-k70
+++ b/target/arm/systems/kinetis-k70
@@ -5,6 +5,8 @@ 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_NET
+	select ADK_TARGET_WITH_BLOCK
 	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_KERNEL_UIMAGE
 	select ADK_KERNEL_REPO "https://github.com/EmcraftSystems/linux-emcraft.git"
diff --git a/target/arm/systems/linksys-nslu2 b/target/arm/systems/linksys-nslu2
index f78a2a907..2c1665996 100644
--- a/target/arm/systems/linksys-nslu2
+++ b/target/arm/systems/linksys-nslu2
@@ -6,6 +6,8 @@ config ADK_TARGET_SYSTEM_LINKSYS_NSLU2
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_PCI
 	select ADK_TARGET_WITH_SERIAL
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	  Linksys NSLU2
diff --git a/target/arm/systems/raspberry-pi b/target/arm/systems/raspberry-pi
index 9bd6c878b..6eb86d2a9 100644
--- a/target/arm/systems/raspberry-pi
+++ b/target/arm/systems/raspberry-pi
@@ -12,6 +12,8 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_TARGET_WITH_SD
 	select ADK_TARGET_WITH_I2C
 	select ADK_TARGET_WITH_SPI
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	select ADK_PACKAGE_BCM28XX_BOOTLOADER
 	select ADK_TARGET_WITH_ROOT_RW
 	select ADK_TARGET_KERNEL_ZIMAGE
diff --git a/target/arm/systems/raspberry-pi2 b/target/arm/systems/raspberry-pi2
index 5016a0d98..83b62c92c 100644
--- a/target/arm/systems/raspberry-pi2
+++ b/target/arm/systems/raspberry-pi2
@@ -13,6 +13,8 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI2
 	select ADK_TARGET_WITH_I2C
 	select ADK_TARGET_WITH_SPI
 	select ADK_TARGET_WITH_SMP
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	select ADK_PACKAGE_BCM28XX_BOOTLOADER
 	select ADK_TARGET_WITH_ROOT_RW
 	select ADK_TARGET_KERNEL_ZIMAGE
diff --git a/target/arm/systems/sharp-zaurus b/target/arm/systems/sharp-zaurus
index a5c7744ee..950217090 100644
--- a/target/arm/systems/sharp-zaurus
+++ b/target/arm/systems/sharp-zaurus
@@ -10,7 +10,9 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_SOUND
 	select ADK_TARGET_WITH_TOUCHSCREEN
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
-	 Support for Sharp Zaurus CL3200 (Terrier)
+	  Support for Sharp Zaurus CL3200 (Terrier)
 
diff --git a/target/arm/systems/solidrun-imx6 b/target/arm/systems/solidrun-imx6
index 39c1fd9a3..4ade97a7e 100644
--- a/target/arm/systems/solidrun-imx6
+++ b/target/arm/systems/solidrun-imx6
@@ -12,6 +12,8 @@ config ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	select ADK_TARGET_WITH_SPI
 	select ADK_TARGET_WITH_SOUND
 	select ADK_TARGET_WITH_LEDS
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_WITH_ROOT_RW
diff --git a/target/arm/systems/toolchain-arm b/target/arm/systems/toolchain-arm
index 180510d42..268daed0d 100644
--- a/target/arm/systems/toolchain-arm
+++ b/target/arm/systems/toolchain-arm
@@ -4,3 +4,4 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM
 	select ADK_TARGET_PACKAGE_TXZ
 	help
 	  ARM toolchain.
+
diff --git a/target/avr32/systems/atmel-ngw100 b/target/avr32/systems/atmel-ngw100
index 4e7c9a253..aa895d1e8 100644
--- a/target/avr32/systems/atmel-ngw100
+++ b/target/avr32/systems/atmel-ngw100
@@ -3,6 +3,8 @@ config ADK_TARGET_SYSTEM_ATMEL_NGW100
 	select ADK_CPU_AVR32
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_PCI
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	select ADK_TARGET_KERNEL_UIMAGE
 	select ADK_HOST_BUILD_U_BOOT
 	help
diff --git a/target/config/Config.in b/target/config/Config.in
index 34885ecba..4f983e412 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -23,6 +23,7 @@ config ADK_TARGET_SIM
 
 config ADK_TARGET_QEMU
 	bool
+	select ADK_TARGET_WITH_NET
 
 config ADK_TARGET_VBOX
 	bool
diff --git a/target/config/Config.in.hardware b/target/config/Config.in.hardware
index fb59a0d0e..45a4a444f 100644
--- a/target/config/Config.in.hardware
+++ b/target/config/Config.in.hardware
@@ -5,6 +5,12 @@
 config ADK_TARGET_WITH_CPU_FREQ
 	bool
 
+config ADK_TARGET_WITH_NET
+	bool
+
+config ADK_TARGET_WITH_BLOCK
+	bool
+
 config ADK_TARGET_WITH_USB
 	bool
 
@@ -104,5 +110,3 @@ config ADK_TARGET_WITH_MMU
 
 config ADK_TARGET_WITHOUT_MMU
 	bool
-	select ADK_PACKAGE_SASH
-	select ADK_PACKAGE_SIMPLEINIT
diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts
index 7d34aa3e9..cec56dc32 100644
--- a/target/config/Config.in.qemuopts
+++ b/target/config/Config.in.qemuopts
@@ -50,6 +50,7 @@ config ADK_TARGET_QEMU_WITHOUT_BLOCK
 
 config ADK_TARGET_QEMU_WITH_BLOCK
 	bool "enabled"
+	select ADK_TARGET_WITH_BLOCK
 	select ADK_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
 	select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
 	select ADK_KERNEL_ATA_PIIX if ADK_TARGET_SYSTEM_QEMU_MIPS || ADK_TARGET_SYSTEM_QEMU_MIPS64 || ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 188320d09..01e84380a 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -17,6 +17,9 @@ config ADK_RUNTIME_DEV_UDEV
 	bool "Use udev"
 	select ADK_PACKAGE_UDEV
 
+config ADK_RUNTIME_DEV_STATIC
+	bool "Use static /dev"
+
 endchoice
 
 config ADK_RUNTIME_SSH_PUBKEY
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 57d556af0..c18e37b18 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -1,4 +1,11 @@
+config ADK_KERNEL_BLOCK
+	bool
+
+config ADK_KERNEL_LBDAF
+	bool
+
 menu "Block devices support"
+depends on ADK_TARGET_WITH_BLOCK
 
 config ADK_KERNEL_MD
 	bool
@@ -101,6 +108,8 @@ depends on ADK_TARGET_WITH_PATA || ADK_TARGET_WITH_SATA || ADK_TARGET_QEMU || AD
 
 config ADK_KERNEL_PATA_RB532
 	tristate "CF disk driver for Mikrotik RB532"
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_LBDAF
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -113,6 +122,8 @@ config ADK_KERNEL_PATA_RB532
 
 config ADK_KERNEL_PATA_AMD
 	tristate "AMD PATA driver"
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_LBDAF
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -127,6 +138,8 @@ config ADK_KERNEL_PATA_AMD
 
 config ADK_KERNEL_PATA_SC1200
 	tristate
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_LBDAF
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -139,6 +152,8 @@ config ADK_KERNEL_PATA_SC1200
 
 config ADK_KERNEL_SATA_AHCI
 	tristate "AHCI SATA driver"
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_LBDAF
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_BLK_DEV
@@ -153,6 +168,8 @@ config ADK_KERNEL_SATA_AHCI
 
 config ADK_KERNEL_ATA_PIIX
 	tristate "ATA PIIX support"
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_LBDAF
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_SCSI_DMA
 	select ADK_KERNEL_ATA
@@ -172,6 +189,8 @@ config ADK_KERNEL_ATA_PIIX
 
 config ADK_KERNEL_PATA_MACIO
 	tristate "MAC IO support"
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_LBDAF
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -182,6 +201,8 @@ config ADK_KERNEL_PATA_MACIO
 	
 config ADK_KERNEL_PATA_PLATFORM
 	tristate "PATA platform driver"
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_LBDAF
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -198,6 +219,8 @@ config ADK_KERNEL_PATA_PCMCIA
 
 config ADK_KERNEL_PATA_IMX
 	tristate "eSATA driver for IMX6 boards"
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_LBDAF
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -216,6 +239,8 @@ config ADK_KERNEL_PATA_IMX
 
 config ADK_KERNEL_PATA_CMD64X
 	tristate "CMD64x PATA driver"
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_LBDAF
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -228,6 +253,8 @@ config ADK_KERNEL_PATA_CMD64X
 
 config ADK_KERNEL_PATA_PXA
 	tristate "PATA driver for Sharp Zaurus"
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_LBDAF
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -252,6 +279,8 @@ depends on ADK_TARGET_WITH_SCSI || \
 
 config ADK_KERNEL_SCSI_SYM53C8XX_2
 	tristate "Symbios Logic 53C8XX2 support"
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_LBDAF
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_SCSI_LOWLEVEL
 	select ADK_KERNEL_BLK_DEV
@@ -260,6 +289,8 @@ config ADK_KERNEL_SCSI_SYM53C8XX_2
 
 config ADK_KERNEL_SCSI_IBMVSCSI
 	tristate "IBM VSCSI support"
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_LBDAF
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_SCSI_LOWLEVEL
 	select ADK_KERNEL_BLK_DEV
@@ -268,6 +299,8 @@ config ADK_KERNEL_SCSI_IBMVSCSI
 
 config ADK_KERNEL_SCSI_SUNESP
 	tristate "SUN ESP support"
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_LBDAF
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_SCSI_LOWLEVEL
 	select ADK_KERNEL_SBUS
@@ -282,6 +315,8 @@ depends on ADK_TARGET_WITH_SD
 
 config ADK_KERNEL_MMC_AT91
 	tristate
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_LBDAF
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_MMC
 	select ADK_KERNEL_MMC_BLOCK
@@ -293,6 +328,8 @@ config ADK_KERNEL_MMC_AT91
 
 config ADK_KERNEL_MMC_BCM2835
 	bool "SD card support for BCM2835 boards"
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_LBDAF
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_MMC
 	select ADK_KERNEL_MMC_BLOCK
@@ -307,6 +344,8 @@ config ADK_KERNEL_MMC_BCM2835
 
 config ADK_KERNEL_MMC_SDHCI_ESDHC_IMX
 	bool "SD card support for IMX6 boards"
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_LBDAF
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_SCSI_DMA
 	select ADK_KERNEL_SCSI_MULTI_LUN
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index 5ddcb4087..d1f7c2930 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -1,4 +1,5 @@
 menu "Ethernet network devices support"
+depends on ADK_TARGET_WITH_NET
 
 # vendor stuff
 config ADK_KERNEL_NET_CADENCE
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 325660ccc..b26f03c8b 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -183,6 +183,18 @@ endchoice
 
 menu "Kernel options"
 
+config ADK_KERNEL_DEVTMPFS
+	bool
+	default y
+
+config ADK_KERNEL_DEVTMPFS_MOUNT
+	bool
+	default y
+
+config ADK_KERNEL_UEVENT_HELPER
+	bool
+	depends on ADK_RUNTIME_DEV_MDEV
+
 config ADK_KERNEL_UEVENT_HELPER_PATH
 	string
 	default "/sbin/mdev"
diff --git a/target/linux/config/Config.in.netfilter b/target/linux/config/Config.in.netfilter
index 877e32357..cb493a02b 100644
--- a/target/linux/config/Config.in.netfilter
+++ b/target/linux/config/Config.in.netfilter
@@ -1,4 +1,5 @@
 menu "Netfilter"
+depends on ADK_TARGET_WITH_NET
 
 config ADK_KERNEL_NETFILTER
 	bool
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 9fb3007aa..9669ba8a5 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -1,7 +1,32 @@
+config ADK_KERNEL_NETDEVICES
+	bool
+
+config ADK_KERNEL_ETHERNET
+	bool
+
+config ADK_KERNEL_NET
+	bool
+
+config ADK_KERNEL_PACKET
+	bool
+
+config ADK_KERNEL_UNIX
+	bool
+
+config ADK_KERNEL_NET_CORE
+	bool
+
 menu "Network support"
+depends on ADK_TARGET_WITH_NET
 
-config ADK_KERNEL_CONFIG_INET
+config ADK_KERNEL_INET
 	bool "Enable TCP/IP support"
+	select ADK_KERNEL_NET
+	select ADK_KERNEL_UNIX
+	select ADK_KERNEL_PACKET
+	select ADK_KERNEL_NET_CORE
+	select ADK_KERNEL_NETDEVICES
+	select ADK_KERNEL_ETHERNET
 	select ADK_KERNEL_CRYPTO
 	select ADK_KERNEL_CRYPTO_AES
 	default y
diff --git a/target/linux/kernel.config b/target/linux/kernel.config
index e8423c7b6..cbc0ed34a 100644
--- a/target/linux/kernel.config
+++ b/target/linux/kernel.config
@@ -5,18 +5,8 @@ CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_NET=y
-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
-CONFIG_LBDAF=y
 CONFIG_FILE_LOCKING=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
@@ -26,9 +16,6 @@ CONFIG_MODULES=y
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_HOTPLUG=y
-CONFIG_UEVENT_HELPER=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
diff --git a/target/m68k/systems/aranym-m68k b/target/m68k/systems/aranym-m68k
index 1086e9c2a..e7cbe2cbe 100644
--- a/target/m68k/systems/aranym-m68k
+++ b/target/m68k/systems/aranym-m68k
@@ -5,7 +5,9 @@ config ADK_TARGET_SYSTEM_ARANYM_M68K
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_PCI
 	select ADK_TARGET_WITH_HDD
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
-	 Support for ARAnyM Emulator (M68K).
+	  Support for ARAnyM Emulator (M68K).
 
diff --git a/target/microblaze/systems/qemu-microblaze b/target/microblaze/systems/qemu-microblaze
index 76690a2d8..588979b50 100644
--- a/target/microblaze/systems/qemu-microblaze
+++ b/target/microblaze/systems/qemu-microblaze
@@ -4,5 +4,5 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_LINUXBIN
 	help
-	 Qemu support for MICROBLAZE architecture.
+	  Qemu support for MICROBLAZE architecture.
 
diff --git a/target/mips/systems/dragino-ms14s b/target/mips/systems/dragino-ms14s
index 66de3ae5d..3cafb2c7a 100644
--- a/target/mips/systems/dragino-ms14s
+++ b/target/mips/systems/dragino-ms14s
@@ -7,6 +7,8 @@ config ADK_TARGET_SYSTEM_DRAGINO_MS14S
 	select ADK_TARGET_WITH_NAND
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_PCI
+	select ADK_TARGET_WITH_NET
+	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 81f9b67c6..138f151e0 100644
--- a/target/mips/systems/imgtec-ci20
+++ b/target/mips/systems/imgtec-ci20
@@ -7,6 +7,8 @@ config ADK_TARGET_SYSTEM_IMGTEC_CI20
 	select ADK_TARGET_WITH_NAND
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_SMP
+	select ADK_TARGET_WITH_NET
+	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 26f24d0b5..57e853eb1 100644
--- a/target/mips/systems/mikrotik-rb4xx
+++ b/target/mips/systems/mikrotik-rb4xx
@@ -8,6 +8,8 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_NAND
 	select ADK_TARGET_WITH_LEDS
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	select ADK_TARGET_KERNEL_VMLINUZ
 	help
 	  Support for Mikrotik RB411/RB433/RB493g.
diff --git a/target/mips/systems/mikrotik-rb532 b/target/mips/systems/mikrotik-rb532
index 74cb2aa90..c29940e55 100644
--- a/target/mips/systems/mikrotik-rb532
+++ b/target/mips/systems/mikrotik-rb532
@@ -9,6 +9,8 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	select ADK_TARGET_WITH_NAND
 	select ADK_TARGET_WITH_PATA
 	select ADK_TARGET_WITH_LEDS
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	help
 	  Support for Mikrotik RB532.
 
diff --git a/target/mips/systems/qemu-mips b/target/mips/systems/qemu-mips
index 949e686a7..066421630 100644
--- a/target/mips/systems/qemu-mips
+++ b/target/mips/systems/qemu-mips
@@ -3,5 +3,5 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_VMLINUZ
 	help
-	 Qemu support for MIPS architecture.
+	  Qemu support for MIPS architecture.
 
diff --git a/target/mips64/systems/lemote-yeelong b/target/mips64/systems/lemote-yeelong
index aa5046e51..059dbf6cc 100644
--- a/target/mips64/systems/lemote-yeelong
+++ b/target/mips64/systems/lemote-yeelong
@@ -10,8 +10,10 @@ config ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_HDD
 	select ADK_TARGET_WITH_PCI
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	select ADK_TARGET_WITH_ROOT_RW
 	select ADK_TARGET_KERNEL_VMLINUZ
 	help
-         System profile for Lemote Yeelong laptop.
+          System profile for Lemote Yeelong laptop.
 
diff --git a/target/mips64/systems/qemu-mips64 b/target/mips64/systems/qemu-mips64
index eda927cfd..880dbf42f 100644
--- a/target/mips64/systems/qemu-mips64
+++ b/target/mips64/systems/qemu-mips64
@@ -4,5 +4,5 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_VMLINUZ
 	help
-	 Qemu support for MIPS64 architecture.
+	  Qemu support for MIPS64 architecture.
 
diff --git a/target/ppc/systems/mac-mini b/target/ppc/systems/mac-mini
index 00552bf20..ff13d2434 100644
--- a/target/ppc/systems/mac-mini
+++ b/target/ppc/systems/mac-mini
@@ -2,6 +2,9 @@ config ADK_TARGET_SYSTEM_APPLE_MACMINI
 	bool "Apple Mac mini"
 	depends on ADK_EXPERIMENTAL
 	select ADK_CPU_PPC
+	select ADK_TARGET_WITH_PCI
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	help
 	 Support for Apple Mac mini.
 
diff --git a/target/ppc64/systems/qemu-ppc64 b/target/ppc64/systems/qemu-ppc64
index cee9c5a6c..e7c0acf5e 100644
--- a/target/ppc64/systems/qemu-ppc64
+++ b/target/ppc64/systems/qemu-ppc64
@@ -3,5 +3,5 @@ config ADK_TARGET_SYSTEM_QEMU_PPC64
 	select ADK_CPU_PPC64
 	select ADK_TARGET_QEMU
 	help
-	 Support for Qemu Emulator PPC64 architecture.
+	  Support for Qemu Emulator PPC64 architecture.
 
diff --git a/target/sh/systems/qemu-sh b/target/sh/systems/qemu-sh
index 671f08871..83347b4ec 100644
--- a/target/sh/systems/qemu-sh
+++ b/target/sh/systems/qemu-sh
@@ -4,5 +4,5 @@ config ADK_TARGET_SYSTEM_QEMU_SH
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
-	 Support for Qemu Emulator SUPERH architecture.
+	  Support for Qemu Emulator SUPERH architecture.
 
diff --git a/target/sparc/systems/qemu-sparc b/target/sparc/systems/qemu-sparc
index 915378ee6..1db6445c8 100644
--- a/target/sparc/systems/qemu-sparc
+++ b/target/sparc/systems/qemu-sparc
@@ -4,5 +4,5 @@ config ADK_TARGET_SYSTEM_QEMU_SPARC
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
-	 Support for Qemu Emulator SPARC architecture.
+	  Support for Qemu Emulator SPARC architecture.
 
diff --git a/target/sparc/systems/sun-voyager b/target/sparc/systems/sun-voyager
index 50a100d0d..90f1cbb57 100644
--- a/target/sparc/systems/sun-voyager
+++ b/target/sparc/systems/sun-voyager
@@ -3,7 +3,9 @@ config ADK_TARGET_SYSTEM_SUN_VOYAGER
 	depends on ADK_EXPERIMENTAL
 	select ADK_CPU_SPARC_V8
 	select ADK_TARGET_WITH_VGA
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
-	 Support for Sun Voyager.
+	  Support for Sun Voyager.
 
diff --git a/target/x86/systems/generic-pc b/target/x86/systems/generic-pc
index 46790f49b..901c54597 100644
--- a/target/x86/systems/generic-pc
+++ b/target/x86/systems/generic-pc
@@ -6,7 +6,9 @@ config ADK_TARGET_SYSTEM_GENERIC_PC
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_VGA
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	select ADK_PACKAGE_GRUB
 	help
-	 Example config for generic i686 based PC.
+	  Example config for generic i686 based PC.
 
diff --git a/target/x86/systems/ibm-x40 b/target/x86/systems/ibm-x40
index f610535ec..1cde36744 100644
--- a/target/x86/systems/ibm-x40
+++ b/target/x86/systems/ibm-x40
@@ -18,11 +18,13 @@ config ADK_TARGET_SYSTEM_IBM_X40
 	select ADK_TARGET_WITH_PCI
 	select ADK_TARGET_WITH_ACPI
 	select ADK_TARGET_WITH_WIFI
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	# with docking station 
 	select ADK_TARGET_WITH_PP
 	select ADK_TARGET_WITH_ROOT_RW
 	select ADK_TARGET_KERNEL_BZIMAGE
 	select ADK_PACKAGE_GRUB
 	help
-         System profile for IBM X40 laptop.
+          System profile for IBM X40 laptop.
 
diff --git a/target/x86/systems/pcengines-alix b/target/x86/systems/pcengines-alix
index bfc6150fb..0ae9a389a 100644
--- a/target/x86/systems/pcengines-alix
+++ b/target/x86/systems/pcengines-alix
@@ -7,8 +7,10 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX
 	select ADK_TARGET_WITH_PATA
 	select ADK_TARGET_WITH_GEODE_CRYPTO
 	select ADK_TARGET_WITH_WATCHDOG
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	select ADK_TARGET_KERNEL_BZIMAGE
 	select ADK_PACKAGE_GRUB
 	help
-	 Support for PCengines ALIX Boards.
+	  Support for PCengines ALIX Boards.
 
diff --git a/target/x86/systems/qemu-x86 b/target/x86/systems/qemu-x86
index ee282bdf7..fc0d3953c 100644
--- a/target/x86/systems/qemu-x86
+++ b/target/x86/systems/qemu-x86
@@ -4,5 +4,5 @@ config ADK_TARGET_SYSTEM_QEMU_X86
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_BZIMAGE
 	help
-	 Support for Qemu Emulator X86 architecture.
+	  Support for Qemu Emulator X86 architecture.
 
diff --git a/target/x86/systems/vbox-x86 b/target/x86/systems/vbox-x86
index 97049bbaa..6f7f38ad5 100644
--- a/target/x86/systems/vbox-x86
+++ b/target/x86/systems/vbox-x86
@@ -4,5 +4,5 @@ config ADK_TARGET_SYSTEM_VBOX_X86
 	select ADK_TARGET_KERNEL_BZIMAGE
 	select ADK_PACKAGE_GRUB
 	help
-	 Support for VirtualBox Emulator.
+	  Support for VirtualBox Emulator.
 
diff --git a/target/x86_64/systems/pcengines-apu b/target/x86_64/systems/pcengines-apu
index fdd0f7341..9d42a2fbf 100644
--- a/target/x86_64/systems/pcengines-apu
+++ b/target/x86_64/systems/pcengines-apu
@@ -10,6 +10,8 @@ config ADK_TARGET_SYSTEM_PCENGINES_APU
 	select ADK_TARGET_WITH_ACPI
 	select ADK_TARGET_WITH_SATA
 	select ADK_TARGET_WITH_SMP
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	select ADK_PACKAGE_GRUB
 	help
 	  Support for PC Engines APU, see
diff --git a/target/x86_64/systems/qemu-x86_64 b/target/x86_64/systems/qemu-x86_64
index 0d132fc9c..3af8a6f96 100644
--- a/target/x86_64/systems/qemu-x86_64
+++ b/target/x86_64/systems/qemu-x86_64
@@ -4,5 +4,5 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_BZIMAGE
 	help
-	 Support for Qemu Emulator X86_64 architecture.
+	  Support for Qemu Emulator X86_64 architecture.
 
diff --git a/target/xtensa/systems/qemu-xtensa b/target/xtensa/systems/qemu-xtensa
index 9f2be13bd..5718bdaca 100644
--- a/target/xtensa/systems/qemu-xtensa
+++ b/target/xtensa/systems/qemu-xtensa
@@ -5,5 +5,5 @@ config ADK_TARGET_SYSTEM_QEMU_XTENSA
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_HOST_BUILD_U_BOOT
 	help
-	 Support for Qemu Emulator XTENSA architecture.
+	  Support for Qemu Emulator XTENSA architecture.
 
diff --git a/target/xtensa/systems/xilinx-kintex7 b/target/xtensa/systems/xilinx-kintex7
index 20ed62dd3..ff0002cc3 100644
--- a/target/xtensa/systems/xilinx-kintex7
+++ b/target/xtensa/systems/xilinx-kintex7
@@ -3,8 +3,9 @@ config ADK_TARGET_SYSTEM_XILINX_KINTEX7
 	select ADK_CPU_XTENSA
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_WITH_SERIAL
+	select ADK_TARGET_WITH_NET
+	select ADK_TARGET_WITH_BLOCK
 	select ADK_HOST_BUILD_U_BOOT_XTENSA
 	help
-	 Support for Xilinx Kintex 7 with Cadence daughterboard.
-
+	  Support for Xilinx Kintex 7 with Cadence daughterboard.