Merge branch 'master' of git+ssh://openadk.org/git/openadk

22 files changed, 167 insertions, 176 deletions

diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb
index ce52647be..dc5685995 100644
--- a/target/arm/kernel/qemu-arm-versatilepb
+++ b/target/arm/kernel/qemu-arm-versatilepb
@@ -16,16 +16,6 @@ CONFIG_USE_OF=y
 CONFIG_ATAGS=y
 CONFIG_DTC=y
 CONFIG_OF=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
 CONFIG_NETDEVICES=y
 CONFIG_MII=y
 CONFIG_NET_CORE=y
diff --git a/target/config/Config.in b/target/config/Config.in
index c3512a71f..ee6aaa695 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -188,9 +188,6 @@ config ADK_TARGET_LIBC_PATH
 				|| ADK_LINUX_X86_64
 	default "lib"
 
-
-# submodel support
-
 config ADK_TARGET_KERNEL_MINICONFIG
 	string
 	default "qemu-microblaze-s3adsp1800" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
@@ -222,6 +219,63 @@ config ADK_QEMU_ARGS
 	default "-nographic" if ADK_TARGET_QEMU_WITHOUT_GRAPHIC
 
 choice
+prompt "Qemu MICROBLAZE Emulation"
+depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE || ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL
+
+config ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
+	boolean "Xilinx ml605"
+	select ADK_TARGET_WITH_MTD
+
+config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
+	boolean "Xilinx Spartan S3ADSP1800"
+
+endchoice
+
+choice
+prompt "Qemu ARM Emulation"
+depends on ADK_TARGET_SYSTEM_QEMU_ARM || ADK_TARGET_SYSTEM_QEMU_ARMHF
+
+config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
+	boolean "ARM Ltd. Versatile Express for Cortex-A9"
+	select ADK_CPU_CORTEX_A9
+
+config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
+	boolean "ARM Ltd. Versatile/PB"
+	select ADK_soft_float
+	select ADK_eabi
+	select ADK_CPU_ARM926EJ_S
+	depends on ADK_TARGET_SYSTEM_QEMU_ARM
+
+config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
+	boolean "Xscale PXA270 Spitz PDA"
+	select ADK_soft_float
+	select ADK_eabi
+	select ADK_CPU_XSCALE
+	select ADK_TARGET_WITH_VGA
+	depends on ADK_TARGET_SYSTEM_QEMU_ARM
+
+endchoice
+
+choice
+prompt "Qemu Emulation with permanent storage device (disk/flash)"
+depends on ADK_HARDWARE_QEMU
+
+config ADK_TARGET_QEMU_WITHOUT_BLOCK
+	boolean "disabled"
+
+config ADK_TARGET_QEMU_WITH_BLOCK
+	boolean "enabled"
+	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
+	select ADK_KERNEL_ATA_PIIX if ADK_LINUX_MIPS || ADK_TARGET_SYSTEM_QEMU_I686
+	select ADK_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC
+	select ADK_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64
+	select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC
+	select ADK_KERNEL_PATA_PLATFORM if ADK_LINUX_SH
+
+endchoice
+
+choice
 prompt "Qemu Emulation with graphical output"
 depends on ADK_HARDWARE_QEMU
 
@@ -265,43 +319,6 @@ config ADK_TARGET_QEMU_WITHOUT_VIRTIO
 
 endchoice
 
-choice
-prompt "Qemu MICROBLAZE Emulation"
-depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE || ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL
-
-config ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
-	boolean "Xilinx ml605"
-	select ADK_TARGET_WITH_MTD
-
-config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
-	boolean "Xilinx Spartan S3ADSP1800"
-
-endchoice
-
-choice
-prompt "Qemu ARM Emulation"
-depends on ADK_TARGET_SYSTEM_QEMU_ARM || ADK_TARGET_SYSTEM_QEMU_ARMHF
-
-config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
-	boolean "ARM Ltd. Versatile Express for Cortex-A9"
-	select ADK_CPU_CORTEX_A9
-
-config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
-	boolean "ARM Ltd. Versatile/PB"
-	select ADK_soft_float
-	select ADK_eabi
-	select ADK_CPU_ARM926EJ_S
-	depends on ADK_TARGET_SYSTEM_QEMU_ARM
-
-config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
-	boolean "Xscale PXA270 Spitz PDA"
-	select ADK_soft_float
-	select ADK_eabi
-	select ADK_CPU_XSCALE
-	select ADK_TARGET_WITH_VGA
-	depends on ADK_TARGET_SYSTEM_QEMU_ARM
-
-endchoice
 
 choice
 prompt "Use ARM thumb mode"
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 7848a25ce..cb0929822 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -159,14 +159,14 @@ depends on ADK_SIMPLE_NETWORK_CONFIG
 
 choice
 	prompt "Type"
-	default SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC
-
-config SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC
-	bool "NIC / DHCP"
+	default SIMPLE_NETWORK_CONFIG_ETH0_TYPE_MANUAL
 
 config SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL
 	bool "NIC / manual IP"
 
+config SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC
+	bool "NIC / DHCP"
+
 config SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP
 	bool "Bridge with IP"
 
@@ -180,7 +180,7 @@ endchoice
 config SIMPLE_NETWORK_CONFIG_ETH0_IP
 	depends on SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL || SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP
 	string "eth0 IP Address"
-	default "192.168.1.2"
+	default "10.0.2.15"
 
 config SIMPLE_NETWORK_CONFIG_ETH0_NM
 	depends on SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL || SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP
@@ -190,7 +190,7 @@ config SIMPLE_NETWORK_CONFIG_ETH0_NM
 config SIMPLE_NETWORK_CONFIG_ETH0_GW
 	depends on SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL
 	string "eth0 Gateway"
-	default "192.168.1.1"
+	default "10.0.2.2"
 
 config SIMPLE_NETWORK_CONFIG_ETH0_BRIDGE
 	depends on SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE || SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP
@@ -282,7 +282,7 @@ depends on ADK_SIMPLE_NETWORK_CONFIG
 
 config SIMPLE_NETWORK_CONFIG_RESOLV
 	string "Nameserver"
-	default "192.168.1.1"
+	default "10.0.2.3"
 
 endmenu
 
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index cc84914d2..a1a5077e6 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -120,12 +120,13 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835
 
 config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
 	prompt "kmod-snd-bcm2708-soc-i2s...... ALSA SOC I2S Raspberry PI"
+	tristate
 	select ADK_KPACKAGE_KMOD_SND
 	select ADK_KERNEL_SND_ARM
 	select ADK_KPACKAGE_KMOD_SND_SOC
 	select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE
 	select ADK_KPACKAGE_KMOD_SND_COMPRESS
-	boolean
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DAC
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 0d1a28125..dd7c96dc5 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -21,6 +21,10 @@ config ADK_KERNEL_IOSCHED_CFQ
 
 config ADK_KERNEL_SCSI
 	boolean
+	default y if ADK_TARGET_SYSTEM_IBM_X40
+
+config ADK_KERNEL_SCSI_DMA
+	boolean
 
 config ADK_KERNEL_BLK_DEV_SD
 	boolean
@@ -71,7 +75,48 @@ config ADK_KERNEL_MMC_SDHCI_PLTFM
 config ADK_KERNEL_MMC_SDHCI_BCM2708_DMA
 	boolean
 
+config ADK_KERNEL_ATA_PIIX
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_SCSI_DMA
+	select ADK_KERNEL_ATA
+	select ADK_KERNEL_ATA_SFF
+	select ADK_KERNEL_ATA_BMDMA
+	select ADK_KERNEL_BLK_DEV
+	select ADK_KERNEL_BLK_DEV_SD
+	boolean
+
 config ADK_KERNEL_SCSI_SYM53C8XX_2
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_BLK_DEV
+	select ADK_KERNEL_BLK_DEV_SD
+	boolean
+
+config ADK_KERNEL_SCSI_IBMVSCSI
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_BLK_DEV
+	select ADK_KERNEL_BLK_DEV_SD
+	boolean
+
+config ADK_KERNEL_SCSI_SUNESP
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_BLK_DEV
+	select ADK_KERNEL_BLK_DEV_SD
+	boolean
+
+config ADK_KERNEL_PATA_MACIO
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_ATA
+	select ADK_KERNEL_ATA_BMDMA
+	select ADK_KERNEL_BLK_DEV
+	select ADK_KERNEL_BLK_DEV_SD
+	boolean
+
+config ADK_KERNEL_PATA_PLATFORM
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_ATA
+	select ADK_KERNEL_ATA_BMDMA
+	select ADK_KERNEL_BLK_DEV
+	select ADK_KERNEL_BLK_DEV_SD
 	boolean
 
 config ADK_KERNEL_PATA_PCMCIA
@@ -252,7 +297,6 @@ config ADK_KPACKAGE_KMOD_SCSI
 	select ADK_KERNEL_LSF
 	select ADK_KERNEL_IOSCHED_AS
 	depends on !ADK_KERNEL_SCSI
-	depends on !ADK_KERNEL_SATA_AHCI
 	tristate
 	help
 	  If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or
@@ -268,7 +312,7 @@ config ADK_KPACKAGE_KMOD_SCSI
 
 config ADK_KPACKAGE_KMOD_BLK_DEV_SD
 	prompt "kmod-scsi-disk.................... SCSI disk support"
-	select ADK_KPACKAGE_KMOD_SCSI
+	select ADK_KPACKAGE_KMOD_SCSI if !ADK_KERNEL_SCSI
 	depends on !ADK_KERNEL_BLK_DEV_SD
 	tristate
 	help
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug
index 80387c627..23c0bd8d2 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -34,7 +34,7 @@ config ADK_KERNEL_PRINTK
 	boolean
 	select ADK_KERNEL_EARLY_PRINTK
 	default y
-	depends on !ADK_PKG_TEST
+	#depends on !ADK_PKG_TEST
 	help
 	  Disable printk to save space and quieten bootup.
 
diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash
index 773c518e8..d8f4faf0f 100644
--- a/target/linux/config/Config.in.flash
+++ b/target/linux/config/Config.in.flash
@@ -87,8 +87,19 @@ config ADK_KERNEL_MTD_OF_PARTS
 	default n
 
 config ADK_KERNEL_MTD_M25P80
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_MTD
+	select ADK_KERNEL_MTD_PARTITIONS
+	select ADK_KERNEL_MTD_CHAR
+	select ADK_KERNEL_MTD_BLKDEVS
+	select ADK_KERNEL_MTD_BLOCK
+	select ADK_KERNEL_MTD_ROOTFS_ROOT_DEV
+	select ADK_KERNEL_MTD_CFI
+	select ADK_KERNEL_MTD_GEN_PROBE
+	select ADK_KERNEL_MTD_PHYSMAP
+	select ADK_KERNEL_MTD_PHYSMAP_OF
+	select ADK_KERNEL_MTD_OF_PARTS
 	boolean
-	default y if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
 	default n
 
 config ADK_KERNEL_MTD_AR2315
@@ -129,8 +140,6 @@ config ADK_TARGET_MTD
 	select ADK_KERNEL_MTD_CFI
 	select ADK_KERNEL_MTD_GEN_PROBE
 	select ADK_KERNEL_MTD_PHYSMAP
-	select ADK_KERNEL_MTD_PHYSMAP_OF if ADK_LINUX_MICROBLAZE
-	select ADK_KERNEL_MTD_OF_PARTS if ADK_LINUX_MICROBLAZE
 	default y if ADK_TARGET_WITH_MTD
 	default n
 
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 7aabc0b7e..62479c2cb 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -7,6 +7,18 @@ config ADK_KERNEL_NETDEVICES
 config ADK_KERNEL_NET_ETHERNET
 	boolean
 
+config ADK_KERNEL_NET_VENDOR_NATSEMI
+	boolean
+
+config ADK_KERNEL_NET_VENDOR_8390
+	boolean
+
+config ADK_KERNEL_NET_VENDOR_REALTEK
+	boolean
+
+config ADK_KERNEL_NET_VENDOR_MARVELL
+	boolean
+
 config ADK_KERNEL_PHYLIB
 	boolean
 
@@ -151,6 +163,8 @@ config ADK_KPACKAGE_KMOD_NE2K_PCI
 	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
+	select ADK_KERNEL_NET_VENDOR_NATSEMI
+	select ADK_KERNEL_NET_VENDOR_8390
 	select ADK_KERNEL_MII
 	default n
 	help
@@ -173,6 +187,7 @@ config ADK_KPACKAGE_KMOD_8139CP
 	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
+	select ADK_KERNEL_NET_VENDOR_REALTEK
 	select ADK_KERNEL_MII
 	default n
 	help
@@ -220,6 +235,7 @@ config ADK_KPACKAGE_KMOD_SKY2
 	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NETDEV_1000
+	select ADK_KERNEL_NET_VENDOR_MARVELL
 	depends on !ADK_KERNEL_SKY2
 	default n
 	help
diff --git a/target/microblaze/kernel/qemu-microblaze-ml605 b/target/microblaze/kernel/qemu-microblaze-ml605
index 3c331795d..a36267570 100644
--- a/target/microblaze/kernel/qemu-microblaze-ml605
+++ b/target/microblaze/kernel/qemu-microblaze-ml605
@@ -15,13 +15,13 @@ CONFIG_PCI_XILINX=y
 CONFIG_DTC=y
 CONFIG_OF=y
 CONFIG_PROC_DEVICETREE=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_OF_PLATFORM=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
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=1
+CONFIG_SERIAL_8250_RUNTIME_UARTS=1
+CONFIG_SERIAL_OF_PLATFORM=y
diff --git a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 b/target/microblaze/kernel/qemu-microblaze-s3adsp1800
index c49b961b3..b95e35766 100644
--- a/target/microblaze/kernel/qemu-microblaze-s3adsp1800
+++ b/target/microblaze/kernel/qemu-microblaze-s3adsp1800
@@ -15,10 +15,10 @@ CONFIG_PCI_XILINX=y
 CONFIG_DTC=y
 CONFIG_OF=y
 CONFIG_PROC_DEVICETREE=y
-CONFIG_SERIAL_UARTLITE=y
-CONFIG_SERIAL_UARTLITE_CONSOLE=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_CORE=y
 CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=y
+CONFIG_SERIAL_UARTLITE=y
+CONFIG_SERIAL_UARTLITE_CONSOLE=y
diff --git a/target/mips/kernel/qemu-mips b/target/mips/kernel/qemu-mips
index 2ea58176a..b94efcfaf 100644
--- a/target/mips/kernel/qemu-mips
+++ b/target/mips/kernel/qemu-mips
@@ -1,3 +1,4 @@
+CONFIG_MIPS=y
 CONFIG_MIPS_MALTA=y
 CONFIG_MIPS_BONITO64=y
 CONFIG_MIPS_MSC=y
@@ -6,15 +7,6 @@ CONFIG_CPU_MIPS32_R1=y
 CONFIG_PAGE_SIZE_4KB=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_PROC_FS=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-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
@@ -23,7 +15,5 @@ CONFIG_E1000=y
 CONFIG_PHYLIB=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=1
+CONFIG_SERIAL_8250_RUNTIME_UARTS=1
diff --git a/target/mips/kernel/qemu-mips64 b/target/mips/kernel/qemu-mips64
index 5ccc48cca..54c501549 100644
--- a/target/mips/kernel/qemu-mips64
+++ b/target/mips/kernel/qemu-mips64
@@ -1,3 +1,4 @@
+CONFIG_MIPS=y
 CONFIG_MIPS_MALTA=y
 CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_CPU_MIPS64_R1=y
@@ -9,15 +10,6 @@ CONFIG_MIPS32_COMPAT=y
 CONFIG_MIPS32_O32=y
 CONFIG_MIPS32_N32=y
 CONFIG_BINFMT_ELF32=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_PROC_FS=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-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
@@ -25,7 +17,5 @@ CONFIG_NET_VENDOR_INTEL=y
 CONFIG_E1000=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=1
+CONFIG_SERIAL_8250_RUNTIME_UARTS=1
diff --git a/target/mips/kernel/qemu-mips64el b/target/mips/kernel/qemu-mips64el
index 11240010d..8b9c6270f 100644
--- a/target/mips/kernel/qemu-mips64el
+++ b/target/mips/kernel/qemu-mips64el
@@ -1,3 +1,4 @@
+CONFIG_MIPS=y
 CONFIG_MIPS_MALTA=y
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_CPU_MIPS64_R1=y
@@ -9,15 +10,6 @@ CONFIG_MIPS32_COMPAT=y
 CONFIG_MIPS32_O32=y
 CONFIG_MIPS32_N32=y
 CONFIG_BINFMT_ELF32=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_PROC_FS=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-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
@@ -25,5 +17,5 @@ CONFIG_NET_VENDOR_INTEL=y
 CONFIG_E1000=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=1
+CONFIG_SERIAL_8250_RUNTIME_UARTS=1
diff --git a/target/mips/kernel/qemu-mipsel b/target/mips/kernel/qemu-mipsel
index b1b7c8c5b..b63ebeea1 100644
--- a/target/mips/kernel/qemu-mipsel
+++ b/target/mips/kernel/qemu-mipsel
@@ -1,3 +1,4 @@
+CONFIG_MIPS=y
 CONFIG_MIPS_MALTA=y
 CONFIG_MIPS_BONITO64=y
 CONFIG_MIPS_MSC=y
@@ -6,15 +7,6 @@ CONFIG_CPU_MIPS32_R1=y
 CONFIG_PAGE_SIZE_4KB=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_PROC_FS=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-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
@@ -23,7 +15,5 @@ CONFIG_E1000=y
 CONFIG_PHYLIB=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=1
+CONFIG_SERIAL_8250_RUNTIME_UARTS=1
diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test
index 074ce8246..ab8e0a75c 100644
--- a/target/packages/pkg-available/test
+++ b/target/packages/pkg-available/test
@@ -1,6 +1,5 @@
 config ADK_PKG_TEST
 	bool "Compile a ADK test framework system"
-	default n
 	select ADK_PACKAGE_ADK_TEST_TOOLS
 	select ADK_PACKAGE_STRACE
 	select ADK_PACKAGE_SOCAT
@@ -8,6 +7,8 @@ config ADK_PKG_TEST
 	select ADK_KERNEL_BLK_DEV_INITRD
 	select ADK_KERNEL_COMP_XZ
 	select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ
+	select ADK_SIMPLE_NETWORK_CONFIG
+	default n
 	help
 	  Package collection used to build adk-test-framework root
 	  filesystem.
diff --git a/target/ppc/kernel/qemu-ppc b/target/ppc/kernel/qemu-ppc
index 08dd506b5..8219d7765 100644
--- a/target/ppc/kernel/qemu-ppc
+++ b/target/ppc/kernel/qemu-ppc
@@ -26,14 +26,6 @@ CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_SYSCALL=y
 CONFIG_DTC=y
 CONFIG_OF=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-CONFIG_SATA_PMP=y
-CONFIG_ATA_SFF=y
-CONFIG_ATA_BMDMA=y
-CONFIG_PATA_MACIO=y
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
diff --git a/target/ppc64/kernel/qemu-ppc64 b/target/ppc64/kernel/qemu-ppc64
index a9e1abecb..dd88e3395 100644
--- a/target/ppc64/kernel/qemu-ppc64
+++ b/target/ppc64/kernel/qemu-ppc64
@@ -28,12 +28,6 @@ CONFIG_PCI_SYSCALL=y
 CONFIG_PCI_MSI=y
 CONFIG_DTC=y
 CONFIG_OF=y
-CONFIG_BLOCK=y
-CONFIG_SCSI=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_SCSI_DMA=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_IBMVSCSI=y
 CONFIG_NETDEVICES=y
 CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_IBM=y
diff --git a/target/sh/kernel/qemu-sh b/target/sh/kernel/qemu-sh
index 5c38a01fb..e701ac3b0 100644
--- a/target/sh/kernel/qemu-sh
+++ b/target/sh/kernel/qemu-sh
@@ -16,14 +16,6 @@ CONFIG_SH_INTC=y
 CONFIG_CMDLINE_OVERWRITE=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-CONFIG_SATA_PMP=y
-CONFIG_ATA_SFF=y
-CONFIG_ATA_BMDMA=y
-CONFIG_PATA_PLATFORM=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_CORE=y
 CONFIG_MII=y
@@ -33,5 +25,3 @@ CONFIG_8139CP=y
 CONFIG_SERIAL_SH_SCI=y
 CONFIG_SERIAL_SH_SCI_NR_UARTS=2
 CONFIG_SERIAL_SH_SCI_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
diff --git a/target/sparc/kernel/qemu-sparc b/target/sparc/kernel/qemu-sparc
index 26bd9a29e..4c4732317 100644
--- a/target/sparc/kernel/qemu-sparc
+++ b/target/sparc/kernel/qemu-sparc
@@ -6,11 +6,6 @@ CONFIG_PCI=y
 CONFIG_PCI_SYSCALL=y
 CONFIG_PCIC_PCI=y
 CONFIG_OF=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_SCSI_SUNESP=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_CORE=y
 CONFIG_ETHERNET=y
diff --git a/target/sparc64/kernel/qemu-sparc64 b/target/sparc64/kernel/qemu-sparc64
index 5119f1225..21238b838 100644
--- a/target/sparc64/kernel/qemu-sparc64
+++ b/target/sparc64/kernel/qemu-sparc64
@@ -1,6 +1,6 @@
-CONFIG_64BIT=y
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
+CONFIG_64BIT=y
 CONFIG_PCI=y
 CONFIG_PCI_SYSCALL=y
 CONFIG_PCI_DOMAINS=y
@@ -12,10 +12,6 @@ CONFIG_OF_NET=y
 CONFIG_OF_PCI=y
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_OF_IOMMU=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_LOWLEVEL=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_CORE=y
 CONFIG_ETHERNET=y
diff --git a/target/x86/kernel/qemu-i686 b/target/x86/kernel/qemu-i686
index 802de7cca..4c5156e45 100644
--- a/target/x86/kernel/qemu-i686
+++ b/target/x86/kernel/qemu-i686
@@ -5,14 +5,6 @@ CONFIG_PCI_GOANY=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_DOMAINS=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-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
@@ -21,5 +13,5 @@ CONFIG_E1000=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=1
+CONFIG_SERIAL_8250_RUNTIME_UARTS=1
diff --git a/target/x86_64/kernel/qemu-x86_64 b/target/x86_64/kernel/qemu-x86_64
index fa22835b8..febf38bcf 100644
--- a/target/x86_64/kernel/qemu-x86_64
+++ b/target/x86_64/kernel/qemu-x86_64
@@ -19,14 +19,6 @@ CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
 CONFIG_IA32_EMULATION=y
 CONFIG_X86_X32=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-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
@@ -36,5 +28,5 @@ CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=1
+CONFIG_SERIAL_8250_RUNTIME_UARTS=1