resolve merge conflict

37 files changed, 1068 insertions, 1097 deletions

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 device has nothing to do with the loopback
 	  device used for network connections from the machine to itself.
 
-config ADK_KPACKAGE_KMOD_BLK_DEV_NBD
+config ADK_KERNEL_BLK_DEV_NBD
 	prompt "Network Block Device support"
 	tristate
 	default n
@@ -354,13 +333,12 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_NBD
 	  Note that this has nothing to do with the network file systems NFS
 	  or Coda; you can say N here even if you intend to use NFS or Coda.
 
-config ADK_KPACKAGE_KMOD_SCSI
+config ADK_KERNEL_SCSI
 	prompt "SCSI support"
+	tristate
 	select ADK_KERNEL_LBD
 	select ADK_KERNEL_LSF
 	select ADK_KERNEL_IOSCHED_AS
-	depends on !ADK_KERNEL_SCSI
-	tristate
 	help
 	  If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or
 	  any other SCSI device under Linux, say Y and make sure that you know
@@ -373,11 +351,10 @@ config ADK_KPACKAGE_KMOD_SCSI
 	  version of the IOMEGA ZIP drive, USB storage devices, Fibre
 	  Channel, FireWire storage and the IDE-SCSI emulation driver.
 
-config ADK_KPACKAGE_KMOD_BLK_DEV_SD
+config ADK_KERNEL_BLK_DEV_SD
 	prompt "SCSI disk support"
-	select ADK_KPACKAGE_KMOD_SCSI if !ADK_KERNEL_SCSI
-	depends on !ADK_KERNEL_BLK_DEV_SD
 	tristate
+	select ADK_KERNEL_SCSI
 	help
 	  If you want to use SCSI hard disks, Fibre Channel disks,
 	  USB storage or the SCSI or parallel port version of
@@ -386,12 +363,10 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SD
 	  <http://www.tldp.org/docs.html#howto>. This is NOT for SCSI
 	  CD-ROMs.
 
-config ADK_KPACKAGE_KMOD_BLK_DEV_SR
+config ADK_KERNEL_BLK_DEV_SR
 	prompt "SCSI CDROM support"
-	depends on !ADK_KERNEL_SCSI
-	depends on !ADK_KERNEL_BLK_DEV_SR
-	depends on ADK_KPACKAGE_KMOD_SCSI
 	tristate
+	select ADK_KERNEL_SCSI
 	help
 	  If you want to use a SCSI or FireWire CD-ROM under Linux,
 	  say Y and read the SCSI-HOWTO and the CDROM-HOWTO at
@@ -399,51 +374,33 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SR
 	  Y or M to "ISO 9660 CD-ROM file system support" later.
 
 config ADK_KERNEL_BLK_DEV_MD
-	boolean
-	select ADK_KERNEL_MD
-	default n
-
-config ADK_KPACKAGE_KMOD_BLK_DEV_MD
 	prompt "RAID support"
 	tristate
-	depends on !ADK_KERNEL_BLK_DEV_MD
 	select ADK_KERNEL_MD
 	help
 
 config ADK_KERNEL_MD_RAID0
-	boolean
-	depends on ADK_KERNEL_BLK_DEV_MD
-	help
-
-config ADK_KPACKAGE_KMOD_MD_RAID0
 	prompt "RAID0 support"
 	tristate
-	depends on ADK_KPACKAGE_KMOD_BLK_DEV_MD
-	depends on !ADK_KERNEL_MD_RAID0
-	help
-
-config ADK_KERNEL_MD_RAID1
-	boolean
 	depends on ADK_KERNEL_BLK_DEV_MD
 	help
 
-config ADK_KPACKAGE_KMOD_MD_RAID1
+config ADK_KERNEL_MD_RAID1
 	prompt "RAID1 support"
 	tristate
-	depends on ADK_KPACKAGE_KMOD_BLK_DEV_MD
+	depends on ADK_KERNEL_BLK_DEV_MD
 	help
 
-config ADK_KPACKAGE_KMOD_MD_RAID456
+config ADK_KERNEL_MD_RAID456
 	prompt "RAID456 support"
 	tristate
-	depends on ADK_KPACKAGE_KMOD_BLK_DEV_MD
+	depends on ADK_KERNEL_BLK_DEV_MD
 	help
 
-config ADK_KPACKAGE_KMOD_BLK_DEV_DM
+config ADK_KERNEL_BLK_DEV_DM
 	prompt "Device Mapper support"
-	select ADK_KERNEL_MD
-	depends on !ADK_KERNEL_BLK_DEV_DM
 	tristate
+	select ADK_KERNEL_MD
 	help
 	  Device-mapper is a low level volume manager.  It works by allowing
 	  people to specify mappings for ranges of logical sectors.  Various
@@ -452,15 +409,16 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DM
 
 	  Higher level volume managers such as LVM2 use this driver.
 
-config ADK_KPACKAGE_KMOD_DM_CRYPT
+config ADK_KERNEL_DM_CRYPT
 	prompt "Crypt target support"
-	depends on !ADK_KERNEL_DM_CRYPT
-	depends on ADK_KPACKAGE_KMOD_BLK_DEV_DM
+	tristate
 	select ADK_KERNEL_MD
 	select ADK_KERNEL_CRYPTO
-	select ADK_KPACKAGE_KMOD_CRYPTO_CBC
-	select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER
-	tristate
+	select ADK_KERNEL_CRYPTO_CBC
+	select ADK_KERNEL_CRYPTO_BLKCIPHER
+	depends on ADK_KERNEL_BLK_DEV_DM
+	default m if ADK_PACKAGE_CRYPTSETUP
+	default n
 	help
 	  This device-mapper target allows you to create a device that
 	  transparently encrypts the data on it. You'll need to activate
@@ -470,22 +428,22 @@ config ADK_KPACKAGE_KMOD_DM_CRYPT
 
 	  <http://www.saout.de/misc/dm-crypt/>
 
-config ADK_KPACKAGE_KMOD_DM_SNAPSHOT
+config ADK_KERNEL_DM_SNAPSHOT
 	prompt "Devicemapper Snapshot target"
-	depends on ADK_KPACKAGE_KMOD_BLK_DEV_DM
 	tristate
+	depends on ADK_KERNEL_BLK_DEV_DM
 	help
          Allow volume managers to take writable snapshots of a device.
 
-config ADK_KPACKAGE_KMOD_DM_MIRROR
+config ADK_KERNEL_DM_MIRROR
 	prompt "Devicemapper Mirror target"
-	depends on ADK_KPACKAGE_KMOD_BLK_DEV_DM
 	tristate
+	depends on ADK_KERNEL_BLK_DEV_DM
 	help
          Allow volume managers to mirror logical volumes, also
          needed for live data migration tools such as 'pvmove'.
 
-config ADK_KPACKAGE_KMOD_BLK_DEV_DRBD
+config ADK_KERNEL_BLK_DEV_DRBD
 	prompt "DRBD support (Network RAID 1)"
 	tristate
 	select ADK_KERNEL_BLK_DEV
diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth
index 82b55bf49..b639676c1 100644
--- a/target/linux/config/Config.in.bluetooth
+++ b/target/linux/config/Config.in.bluetooth
@@ -1,7 +1,7 @@
 menu "Bluetooth support and drivers"
 depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_SDIO
 
-config ADK_KPACKAGE_KMOD_BT
+config ADK_KERNEL_BT
 	prompt "Bluetooth network stack"
 	tristate
 	default n
@@ -25,7 +25,7 @@ config ADK_KPACKAGE_KMOD_BT
 config ADK_KERNEL_BT_L2CAP
 	prompt "L2CAP protocol support"
 	boolean
-	select ADK_KPACKAGE_KMOD_BT
+	select ADK_KERNEL_BT
 	default n
 	help
 	  L2CAP (Logical Link Control and Adaptation Protocol) provides
@@ -36,63 +36,63 @@ config ADK_KERNEL_BT_L2CAP
 config ADK_KERNEL_BT_SCO
 	prompt "SCO link support"
 	boolean
-	select ADK_KPACKAGE_KMOD_BT
+	select ADK_KERNEL_BT
 	default n
 	help
 	  SCO link provides voice transport over Bluetooth.  SCO support is
 	  required for voice applications like Headset and Audio.
 
-config ADK_KPACKAGE_KMOD_BT_RFCOMM
+config ADK_KERNEL_BT_RFCOMM
 	prompt "RFCOMM protocol support"
 	tristate
-	select ADK_KPACKAGE_KMOD_BT
-	depends on ADK_KPACKAGE_KMOD_BT_L2CAP
+	select ADK_KERNEL_BT
+	depends on ADK_KERNEL_BT_L2CAP
 	default n
 	help
 	  RFCOMM provides connection oriented stream transport.  RFCOMM
 	  support is required for Dialup Networking, OBEX and other Bluetooth
 	  applications.
 
-config ADK_KPACKAGE_KMOD_BT_BNEP
+config ADK_KERNEL_BT_BNEP
 	prompt "BNEP protocol support"
 	tristate
-	select ADK_KPACKAGE_KMOD_BT
-	depends on ADK_KPACKAGE_KMOD_BT_L2CAP
+	select ADK_KERNEL_BT
+	depends on ADK_KERNEL_BT_L2CAP
 	default n
 	help
 	  BNEP (Bluetooth Network Encapsulation Protocol) is Ethernet
 	  emulation layer on top of Bluetooth.  BNEP is required for
 	  Bluetooth PAN (Personal Area Network).
 
-config ADK_KPACKAGE_KMOD_BT_HIDP
+config ADK_KERNEL_BT_HIDP
 	prompt "HIDP protocol support"
 	tristate
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_HID
-	select ADK_KPACKAGE_KMOD_BT
-	depends on ADK_KPACKAGE_KMOD_BT_L2CAP
+	select ADK_KERNEL_BT
+	depends on ADK_KERNEL_BT_L2CAP
 	default n
 	help
 	  HIDP (Human Interface Device Protocol) is a transport layer
 	  for HID reports.  HIDP is required for the Bluetooth Human
 	  Interface Device Profile.
 
-config ADK_KPACKAGE_KMOD_BT_HCIBTSDIO
+config ADK_KERNEL_BT_HCIBTSDIO
 	prompt "HCI SDIO driver"
 	tristate
-	select ADK_KPACKAGE_KMOD_BT
+	select ADK_KERNEL_BT
 	depends on ADK_TARGET_WITH_SDIO
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	default m if ADK_TARGET_SYSTEM_CUBOX_I
 	default n
 	help
 	  Bluetooth HCI SDIO driver.
 	  This driver is required if you want to use Bluetooth devices with
 	  SDIO interface.
 
-config ADK_KPACKAGE_KMOD_BT_HCIBTUSB
+config ADK_KERNEL_BT_HCIBTUSB
 	prompt "HCI USB driver"
 	tristate
-	select ADK_KPACKAGE_KMOD_BT
+	select ADK_KERNEL_BT
 	depends on ADK_TARGET_WITH_USB
 	default n
 	help
@@ -100,10 +100,10 @@ config ADK_KPACKAGE_KMOD_BT_HCIBTUSB
 	  This driver is required if you want to use Bluetooth devices with
 	  USB interface.
 
-config ADK_KPACKAGE_KMOD_BT_HCIUART
+config ADK_KERNEL_BT_HCIUART
 	prompt "HCI UART driver"
 	tristate
-	select ADK_KPACKAGE_KMOD_BT
+	select ADK_KERNEL_BT
 	default n
 	help
 	  Bluetooth HCI UART driver.
@@ -112,33 +112,33 @@ config ADK_KPACKAGE_KMOD_BT_HCIUART
 	  UART based Bluetooth PCMCIA and CF devices like Xircom Credit Card 
 	  adapter and BrainBoxes Bluetooth PC Card.
 
-config ADK_KPACKAGE_KMOD_BT_MRVL
+config ADK_KERNEL_BT_MRVL
 	prompt "Marvell driver"
 	tristate
-	select ADK_KPACKAGE_KMOD_BT
+	select ADK_KERNEL_BT
 	select ADK_PACKAGE_BRCM_BLUETOOTH
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	default m if ADK_TARGET_SYSTEM_CUBOX_I
 	default n
 	help
 	  Bluetooth Marvell driver.
 
-config ADK_KPACKAGE_KMOD_BT_MRVL_SDIO
+config ADK_KERNEL_BT_MRVL_SDIO
 	prompt "Marvell SDIO driver"
 	tristate
-	depends on ADK_KPACKAGE_KMOD_BT_MRVL
-	depends on ADK_KPACKAGE_KMOD_BT_HCIBTSDIO
+	depends on ADK_KERNEL_BT_MRVL
+	depends on ADK_KERNEL_BT_HCIBTSDIO
 	depends on ADK_TARGET_WITH_SDIO
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	default m if ADK_TARGET_SYSTEM_CUBOX_I
 	default n
 	help
 	  Bluetooth Marvell driver.
 
-config ADK_KPACKAGE_KMOD_BT_HCIBCM203X
+config ADK_KERNEL_BT_HCIBCM203X
 	prompt "HCI BCM203x USB driver"
 	tristate
-	select ADK_KPACKAGE_KMOD_FW_LOADER
-	select ADK_KPACKAGE_KMOD_BT_HCIBTUSB
-	select ADK_KPACKAGE_KMOD_BT
+	select ADK_KERNEL_FW_LOADER
+	select ADK_KERNEL_BT_HCIBTUSB
+	select ADK_KERNEL_BT
 	depends on ADK_TARGET_WITH_USB
 	default n
 	help
@@ -146,11 +146,11 @@ config ADK_KPACKAGE_KMOD_BT_HCIBCM203X
 	  This driver provides the firmware loading mechanism for the Broadcom
 	  Blutonium based devices.
 
-config ADK_KPACKAGE_KMOD_BT_HCIBPA10X
+config ADK_KERNEL_BT_HCIBPA10X
 	prompt "HCI BPA10x USB driver"
 	tristate
-	select ADK_KPACKAGE_KMOD_BT
-	select ADK_KPACKAGE_KMOD_BT_HCIBTUSB
+	select ADK_KERNEL_BT
+	select ADK_KERNEL_BT_HCIBTUSB
 	default n
 	help
 	  Bluetooth HCI BPA10x USB driver.
diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu
index 075d46565..71b32b963 100644
--- a/target/linux/config/Config.in.cpu
+++ b/target/linux/config/Config.in.cpu
@@ -9,11 +9,6 @@ config ADK_KERNEL_PM_SLEEP_SMP
 	default y if ADK_TARGET_CPU_WITH_HT
 	default n
 
-config ADK_KERNEL_SMP
-	boolean
-	default y if ADK_TARGET_CPU_WITH_HT
-	default n
-
 config ADK_KERNEL_X86_HT
 	boolean
 	default y if ADK_TARGET_CPU_WITH_HT
@@ -57,15 +52,17 @@ config ADK_KERNEL_ARM_IMX6_CPUFREQ
 	select ADK_KERNEL_REGULATOR
 	select ADK_KERNEL_REGULATOR_FIXED_VOLTAGE
 	select ADK_KERNEL_REGULATOR_ANATOP
-	default y if ADK_TARGET_SYSTEM_CUBOX_I
 	depends on ADK_TARGET_SYSTEM_CUBOX_I
+	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	default n
 
 config ADK_KERNEL_ARM_BCM2835_CPUFREQ
 	prompt "CPU frequency support for raspberry-pi"
 	boolean
 	select ADK_KERNEL_CPU_FREQ
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default n
 
 choice
 prompt "Governor"
diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index 01404e9bd..5b25a288c 100644
--- a/target/linux/config/Config.in.crypto
+++ b/target/linux/config/Config.in.crypto
@@ -5,27 +5,18 @@ config ADK_KERNEL_CRYPTO
 config ADK_KERNEL_CRYPTO_HW