resolve merge conflict

62 files changed, 1080 insertions, 1264 deletions

diff --git a/target/Makefile b/target/Makefile
index 83e4e5ca6..22b989581 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -10,25 +10,16 @@ all: install
 # The following target combines all kernel-related variables and
 # config files into a single one to be used as the final kernel
 # configuration when building. This is how it's done:
-# 1) fetch all ADK_KPACKAGE_KMOD_* vars into
-#    .kernelconfig.modules and set them to "m",
-#    fetch all ADK_KERNEL_MOD_* vars into 
-#    .kernelconfig.modules and set them to "m"
-# 2) fetch all enabled ADK_KERNEL_* vars into
-#    .kernelconfig.kernel (no conversion, as they are booleans)
-# 3) get the global and device-specific static kernel config and place it into
+# 1) fetch all enabled ADK_KERNEL_* vars into
+#    .kernelconfig.kernel
+# 2) get the global and device-specific static kernel config and place it into
 #    .kernelconfig.board
-# 4) prepare for merging:
-#    * if a variable is disabled in .kernelconfig.board and
-#      enabled in either of .kernelconfig.{modules,kernel},
-#      remove it from .kernelconfig.board
-#    * append ${FS_CMDLINE} to the kernel commandline inside
-#      .kernelconfig.board
-# 5) merge (cat) it all together into .kernelconfig.tmp
-# 6) check if .kernelconfig.tmp differs from the current one
+# 3) append ${FS_CMDLINE} to the kernel commandline inside .kernelconfig.board
+# 4) merge both together into .kernelconfig.tmp
+# 5) check if .kernelconfig.tmp differs from the current one
 #    (.kernelconfig) at all, overwriting the current one
 #    only if it does (so the timestamp stays intact)
-# 7) remove the temporary .kernelconfig.tmp
+# 6) remove the temporary .kernelconfig.tmp
 ###
 ADK_PACKAGE_CRYPTINIT_ROOT:=$(strip $(subst ",, $(ADK_PACKAGE_CRYPTINIT_ROOT)))
 ADK_PACKAGE_CRYPTINIT_SWAP:=$(strip $(subst ",, $(ADK_PACKAGE_CRYPTINIT_SWAP)))
@@ -36,10 +27,6 @@ ADK_PACKAGE_CMDLINE:=root=$(ADK_PACKAGE_CRYPTINIT_ROOT) swap=$(ADK_PACKAGE_CRYPT
 
 ifeq (${ADK_TARGET_KERNEL_CUSTOMISING},y)
 config-prepare: $(TOPDIR)/.config
-	@sed -n '/^ADK_KPACKAGE_KMOD/s//CONFIG/p' ${TOPDIR}/.config | \
-	    sed 's/=y/=m/' >${BUILD_DIR}/.kernelconfig.modules
-	@sed -n '/^ADK_KERNEL_MOD/s//CONFIG/p' ${TOPDIR}/.config | \
-	    sed 's/=y/=m/' >>${BUILD_DIR}/.kernelconfig.modules
 	@sed -n '/^ADK_KERNEL/s//CONFIG/p' ${TOPDIR}/.config \
 	    >${BUILD_DIR}/.kernelconfig.kernel
 	@if [ -f ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} ];then \
@@ -49,10 +36,6 @@ config-prepare: $(TOPDIR)/.config
 		echo "no miniconfig found for target system"; \
 		exit 1; \
 	fi
-	@(cat ${BUILD_DIR}/.kernelconfig.{modules,kernel} | \
-	    while IFS='=' read symbol value; do \
-		sed -i -e "/^# $$symbol/d" ${BUILD_DIR}/.kernelconfig.board; \
-	done;)
 ifeq ($(ADK_TARGET_ROOTFS_NFSROOT),)
 	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ro"#' \
 		${BUILD_DIR}/.kernelconfig.board
@@ -83,8 +66,7 @@ ifeq ($(ADK_KERNEL_NETCONSOLE),y)
 	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 netconsole=@$(ADK_PARAMETER_NETCONSOLE_SRC_IP)/,@$(ADK_PARAMETER_NETCONSOLE_DST_IP)/"#' \
 		${BUILD_DIR}/.kernelconfig.board
 endif
-	@cd ${BUILD_DIR} && cat .kernelconfig.board \
-	    .kernelconfig.kernel .kernelconfig.modules \
+	@cd ${BUILD_DIR} && cat .kernelconfig.board .kernelconfig.kernel \
 	    >.kernelconfig.tmp
 	@cd ${BUILD_DIR} && cmp -s .kernelconfig.tmp .kernelconfig || \
 	    cp .kernelconfig.tmp .kernelconfig
diff --git a/target/aarch64/kernel/arm-fm b/target/aarch64/kernel/arm-fm
index db8edb12d..291b4093e 100644
--- a/target/aarch64/kernel/arm-fm
+++ b/target/aarch64/kernel/arm-fm
@@ -1,7 +1,5 @@
 CONFIG_ARM64=y
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_AEABI=y
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_SMC91X=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
diff --git a/target/arm/kernel/cubox-i b/target/arm/kernel/cubox-i
index 0b56db7d7..02b35f76b 100644
--- a/target/arm/kernel/cubox-i
+++ b/target/arm/kernel/cubox-i
@@ -15,9 +15,5 @@ CONFIG_NEON=y
 CONFIG_PCI_IMX6=y
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_NET_VENDOR_FREESCALE=y
-CONFIG_FEC=y
-CONFIG_PHYLIB=y
-CONFIG_AT803X_PHY=y
 CONFIG_ATAGS=y
 CONFIG_CMDLINE_FORCE=y
diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb
index ec76019d4..56ce4b98c 100644
--- a/target/arm/kernel/qemu-arm-versatilepb
+++ b/target/arm/kernel/qemu-arm-versatilepb
@@ -11,15 +11,8 @@ CONFIG_KUSER_HELPERS=y
 CONFIG_CPU_ARM926T=y
 CONFIG_CPU_32v5=y
 CONFIG_ARM_AMBA=y
-CONFIG_PCI=y
-CONFIG_PCI_SYSCALL=y
 CONFIG_AEABI=y
 CONFIG_USE_OF=y
 CONFIG_ATAGS=y
-CONFIG_DTC=y
-CONFIG_OF=y
-CONFIG_MII=y
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_SMC91X=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
diff --git a/target/arm/kernel/qemu-arm-vexpress-a9 b/target/arm/kernel/qemu-arm-vexpress-a9
index b89b87337..9c2194631 100644
--- a/target/arm/kernel/qemu-arm-vexpress-a9
+++ b/target/arm/kernel/qemu-arm-vexpress-a9
@@ -13,9 +13,5 @@ CONFIG_ATAGS=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_NEON=y
-CONFIG_OF=y
-CONFIG_DTC=y
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_SMSC911X=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
diff --git a/target/arm/kernel/raspberry-pi b/target/arm/kernel/raspberry-pi
index 486ec929b..86af8de40 100644
--- a/target/arm/kernel/raspberry-pi
+++ b/target/arm/kernel/raspberry-pi
@@ -9,6 +9,4 @@ CONFIG_BCM2708_VCMEM=y
 CONFIG_BCM2708_DMAER=y
 CONFIG_AEABI=y
 CONFIG_VFP=y
-CONFIG_DTC=y
-CONFIG_OF=y
 CONFIG_BCM2708_VCHIQ=y
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index 3c0d02dbf..be067302d 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -25,82 +25,82 @@ config ADK_KERNEL_SND_SOC_IMX_HDMI
 config ADK_KERNEL_SND_PXA2XX_AC97
 	boolean
 
-config ADK_KPACKAGE_KMOD_SND_TIMER
+config ADK_KERNEL_SND_TIMER
 	boolean
 
-config ADK_KPACKAGE_KMOD_SND_PCM
+config ADK_KERNEL_SND_PCM
 	boolean
 
-config ADK_KPACKAGE_KMOD_SND_HWDEP
+config ADK_KERNEL_SND_HWDEP
 	tristate
 
-config ADK_KPACKAGE_KMOD_SOUND
+config ADK_KERNEL_SOUND
 	tristate
 
-config ADK_KPACKAGE_KMOD_SND_RAWMIDI
+config ADK_KERNEL_SND_RAWMIDI
 	tristate
 
-config ADK_KPACKAGE_KMOD_SND_AC97_CODEC
+config ADK_KERNEL_SND_AC97_CODEC
 	tristate
 
-config ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE
+config ADK_KERNEL_SND_PCM_DMAENGINE
 	tristate
 
-config ADK_KPACKAGE_KMOD_SND_COMPRESS
+config ADK_KERNEL_SND_COMPRESS
 	tristate
 
-config ADK_KPACKAGE_KMOD_SND
+config ADK_KERNEL_SND
 	tristate
-	select ADK_KPACKAGE_KMOD_SOUND
-	select ADK_KPACKAGE_KMOD_SND_PCM
-	select ADK_KPACKAGE_KMOD_SND_TIMER
-	select ADK_KPACKAGE_KMOD_SND_HWDEP
+	select ADK_KERNEL_SOUND
+	select ADK_KERNEL_SND_PCM
+	select ADK_KERNEL_SND_TIMER
+	select ADK_KERNEL_SND_HWDEP
 	default n
 
-config ADK_KPACKAGE_KMOD_SND_INTEL8X0
+config ADK_KERNEL_SND_INTEL8X0
 	prompt "Intel AC97 driver"
 	tristate
 	select ADK_KERNEL_SND_PCI
-	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
-	select ADK_KPACKAGE_KMOD_SND
-	default y if ADK_TARGET_SYSTEM_IBM_X40
+	select ADK_KERNEL_SND_AC97_CODEC
+	select ADK_KERNEL_SND
+	default m if ADK_TARGET_SYSTEM_IBM_X40
 	default n
 	depends on ADK_TARGET_WITH_PCI
 	help
 	  Driver for intel chipsets.	
 
-config ADK_KPACKAGE_KMOD_SND_VIA82XX
+config ADK_KERNEL_SND_VIA82XX
 	prompt "VIA82XX driver"
 	tristate
-	select ADK_KPACKAGE_KMOD_SND
+	select ADK_KERNEL_SND
 	default n
 	depends on ADK_TARGET_WITH_PCI
 	help
 	 ALSA VIA82XX driver
 
-config ADK_KPACKAGE_KMOD_SND_ENS1370
+config ADK_KERNEL_SND_ENS1370
 	prompt "Ensoniq 1370 driver"
 	tristate
-	select ADK_KPACKAGE_KMOD_SND
+	select ADK_KERNEL_SND
 	default n
 	depends on ADK_TARGET_WITH_PCI
 	help
 	 ALSA Ensonique 1370 driver
 
-config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO
+config ADK_KERNEL_SND_CS5535AUDIO
 	prompt "AMD CS5535 driver"
 	tristate
 	select ADK_KERNEL_SND_PCI
-	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
-	select ADK_KPACKAGE_KMOD_SND
-	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
+	select ADK_KERNEL_SND_AC97_CODEC
+	select ADK_KERNEL_SND
+	default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default n
 	depends on ADK_TARGET_WITH_PCI
 	help
 	 ALSA AMD CS5535 driver
 
-config ADK_KPACKAGE_KMOD_SND_SOC
+config ADK_KERNEL_SND_SOC
 	tristate
 	default n
 
@@ -108,72 +108,72 @@ config ADK_KERNEL_SND_PXA2XX_SOC
 	tristate
 	default n
 
-config ADK_KPACKAGE_KMOD_SND_PXA2XX_SOC_SPITZ
+config ADK_KERNEL_SND_PXA2XX_SOC_SPITZ
 	prompt "Sharp Zaurus SoC"
 	tristate
 	select ADK_KERNEL_SND_ARM
 	select ADK_KERNEL_SND_PXA2XX_AC97
-	select ADK_KPACKAGE_KMOD_SND
-	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
-	select ADK_KPACKAGE_KMOD_SND_SOC
+	select ADK_KERNEL_SND
+	select ADK_KERNEL_SND_AC97_CODEC
+	select ADK_KERNEL_SND_SOC
 	select ADK_KERNEL_SND_PXA2XX_SOC
 	depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
+	default m if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default n
 
-config ADK_KPACKAGE_KMOD_SND_BCM2835
+config ADK_KERNEL_SND_BCM2835
 	prompt "Raspberry PI SoC"
 	tristate
-	select ADK_KPACKAGE_KMOD_SND
+	select ADK_KERNEL_SND
 	select ADK_KERNEL_SND_ARM
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default m if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
-config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
+config ADK_KERNEL_SND_BCM2708_SOC_I2S
 	prompt "Raspberry PI I2S driver"
 	tristate
-	select ADK_KPACKAGE_KMOD_SND
+	select ADK_KERNEL_SND
 	select ADK_KERNEL_SND_ARM
-	select ADK_KPACKAGE_KMOD_SND_SOC
-	select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_37
-	select ADK_KPACKAGE_KMOD_SND_COMPRESS
+	select ADK_KERNEL_SND_SOC
+	select ADK_KERNEL_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_37
+	select ADK_KERNEL_SND_COMPRESS
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
-config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DAC
+config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC
 	prompt "Raspberry PI hifiberry DAC"
 	tristate
-	select ADK_KPACKAGE_KMOD_DMA_BCM2708
-	select ADK_KPACKAGE_KMOD_REGMAP_MMIO
-	select ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
+	select ADK_KERNEL_DMA_BCM2708
+	select ADK_KERNEL_REGMAP_MMIO
+	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
-config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DIGI
+config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI
 	prompt "Raspberry PI hifiberry DIGI"
 	tristate
-	select ADK_KPACKAGE_KMOD_DMA_BCM2708
-	select ADK_KPACKAGE_KMOD_REGMAP_MMIO
-	select ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
+	select ADK_KERNEL_DMA_BCM2708
+	select ADK_KERNEL_REGMAP_MMIO
+	select ADK_KERNEL_SND_BCM2708_SOC_I2S
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
-config ADK_KPACKAGE_KMOD_SND_IMX_SOC
+config ADK_KERNEL_SND_IMX_SOC
 	prompt "Cubox-i SoC sound chip"
 	tristate
 	depends on ADK_TARGET_SYSTEM_CUBOX_I
-	select ADK_KPACKAGE_KMOD_SND
-	select ADK_KPACKAGE_KMOD_SND_SOC
-	select ADK_KPACKAGE_KMOD_SND_COMPRESS
-	select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_37
+	select ADK_KERNEL_SND
+	select ADK_KERNEL_SND_SOC
+	select ADK_KERNEL_SND_COMPRESS
+	select ADK_KERNEL_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_37
 	select ADK_KERNEL_SND_SOC_IMX_PCM_DMA
 	select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA
 	select ADK_KERNEL_SND_SOC_IMX_HDMI
 	select ADK_KERNEL_SND_SOC_IMX_SPDIF
-	select ADK_KPACKAGE_KMOD_REGMAP_SPI
-	select ADK_KPACKAGE_KMOD_REGMAP_I2C
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	select ADK_KERNEL_REGMAP_SPI
+	select ADK_KERNEL_REGMAP_I2C
+	default m if ADK_TARGET_SYSTEM_CUBOX_I
 	default n
 
 endmenu
diff --git a/target/linux/config/Config.in.aufs b/target/linux/config/Config.in.aufs
index 524133061..fe6c60b52 100644
--- a/target/linux/config/Config.in.aufs
+++ b/target/linux/config/Config.in.aufs
@@ -1,4 +1,4 @@
-config ADK_KPACKAGE_KMOD_AUFS_FS
+config ADK_KERNEL_AUFS_FS
 	prompt "Aufs (Advanced multi layered unification filesystem) support"
 	tristate
 	help
@@ -10,7 +10,7 @@ config ADK_KPACKAGE_KMOD_AUFS_FS
 	  original ideas, approaches and improvements, it becomes totally
 	  different from Unionfs while keeping the basic features.
 
-if ADK_KPACKAGE_KMOD_AUFS_FS
+if ADK_KERNEL_AUFS_FS
 
 choice 
 	boolean "Maximum number of branches"
@@ -75,7 +75,7 @@ config ADK_KERNEL_AUFS_BR_RAMFS
 config ADK_KERNEL_AUFS_BR_FUSE
 	bool "Fuse fs as an aufs branch"
 	select ADK_KERNEL_AUFS_POLL
-	select ADK_KPACKAGE_KMOD_FUSE_FS
+	select ADK_KERNEL_FUSE_FS
 	help
 	  If you want to use fuse-based userspace filesystem as an aufs
 	  branch fs, then enable this option.
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index a188981f3..9ca6e0d50 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -1,3 +1,5 @@
+menu "Block devices support"
+
 config ADK_KERNEL_MD
 	boolean
 
@@ -19,9 +21,6 @@ config ADK_KERNEL_IOSCHED_DEADLINE
 config ADK_KERNEL_IOSCHED_CFQ
 	boolean
 
-config ADK_KERNEL_SCSI
-	boolean
-
 config ADK_KERNEL_SCSI_DMA
 	boolean
 
@@ -37,25 +36,12 @@ config ADK_KERNEL_SCSI_LOGGING
 config ADK_KERNEL_SCSI_SCAN_ASYNC
 	boolean
 
-config ADK_KERNEL_BLK_DEV_SD
-	boolean
-
-config ADK_KERNEL_BLK_DEV_SR
-	boolean
-
 config ADK_KERNEL_ISCSI_TCP
 	boolean
 
-config ADK_KERNEL_DM_CRYPT
-	boolean
-
 config ADK_KERNEL_BLK_DEV
 	boolean
 
-config ADK_KERNEL_BLK_DEV_DM
-	boolean
-	select ADK_KERNEL_MD
-
 config ADK_KERNEL_ATA
 	boolean
 
@@ -102,6 +88,7 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708_DMA
 	boolean
 
 config ADK_KERNEL_ATA_PIIX
+	tristate
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_SCSI_DMA
 	select ADK_KERNEL_ATA
@@ -109,49 +96,49 @@ config ADK_KERNEL_ATA_PIIX
 	select ADK_KERNEL_ATA_BMDMA
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
-	boolean
 
 config ADK_KERNEL_SCSI_SYM53C8XX_2
+	tristate
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
-	boolean
 
 config ADK_KERNEL_SCSI_IBMVSCSI
+	tristate
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
-	boolean
 
 config ADK_KERNEL_SCSI_SUNESP
+	tristate
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
-	boolean
 
 config ADK_KERNEL_PATA_MACIO
+	tristate
 	select ADK_KERNEL_SCSI
 	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_PATA_PLATFORM
+	tristate
 	select ADK_KERNEL_SCSI
 	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_PATA_PCMCIA
-	boolean
+	tristate
 
 config ADK_KERNEL_PATA_IMX
-	boolean
+	prompt "eSATA driver for Cubox-i"
+	tristate
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -166,7 +153,7 @@ config ADK_KERNEL_PATA_IMX
 	default n
 
 config ADK_KERNEL_PATA_PXA
-	boolean
+	tristate
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -178,7 +165,7 @@ config ADK_KERNEL_PATA_PXA
 	default n
 
 config ADK_KERNEL_MMC_AT91
-	boolean
+	tristate
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_MMC
 	select ADK_KERNEL_MMC_BLOCK
@@ -188,7 +175,7 @@ config ADK_KERNEL_MMC_AT91
 	default n
 
 config ADK_KERNEL_MMC_SDHCI_BCM2708
-	boolean
+	tristate
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_MMC
 	select ADK_KERNEL_MMC_BLOCK
@@ -202,7 +189,7 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708
 	default n
 
 config ADK_KERNEL_MMC_SDHCI_ESDHC_IMX
-	boolean
+	tristate
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_SCSI_DMA
 	select ADK_KERNEL_SCSI_MULTI_LUN
@@ -222,7 +209,8 @@ config ADK_KERNEL_MMC_SDHCI_ESDHC_IMX
 	default n
 
 config ADK_KERNEL_PATA_RB532
-	boolean
+	prompt "CF disk driver for Mikrotik RB532"
+	tristate
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -233,7 +221,7 @@ config ADK_KERNEL_PATA_RB532
 	default n
 
 config ADK_KERNEL_PATA_AMD
-	boolean
+	tristate
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -247,7 +235,7 @@ config ADK_KERNEL_PATA_AMD
 	default n
 
 config ADK_KERNEL_PATA_SC1200
-	boolean
+	tristate
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -258,7 +246,7 @@ config ADK_KERNEL_PATA_SC1200
 	default n
 
 config ADK_KERNEL_PATA_JMICRON
-	boolean
+	tristate
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
@@ -268,6 +256,7 @@ config ADK_KERNEL_PATA_JMICRON
 	default n
 
 config ADK_KERNEL_SATA_AHCI
+	prompt "AHCI SATA driver"
 	tristate
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
@@ -276,24 +265,14 @@ config ADK_KERNEL_SATA_AHCI
 	depends on ADK_TARGET_WITH_SATA
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default n	
-
-menu "Block devices support"
-
-config ADK_KPACKAGE_KMOD_SATA_AHCI
-	prompt "AHCI SATA driver"
-	tristate
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_BLK_DEV_SD
-	depends on !ADK_KERNEL_SATA_AHCI
-	depends on ADK_TARGET_WITH_SATA
-	default n
 	help
 	  Enables support for AHCI Serial ATA.
 
-config ADK_KPACKAGE_KMOD_BLK_DEV_LOOP
+config ADK_KERNEL_BLK_DEV_LOOP
 	prompt "Loop mount support"
 	tristate
 	select ADK_KERNEL_BLK_DEV
+	default m if ADK_PACKAGE_LOSETUP
 	default n
 	help
 	  Saying Y here will allow you to use a regular file as a block
@@ -331,7 +310,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_LOOP
 	  Note that this loop