diff options
Diffstat (limited to 'target/linux/config')
-rw-r--r-- | target/linux/config/Config.in.audio | 49 | ||||
-rw-r--r-- | target/linux/config/Config.in.block | 13 | ||||
-rw-r--r-- | target/linux/config/Config.in.cpu | 9 | ||||
-rw-r--r-- | target/linux/config/Config.in.fs | 1 | ||||
-rw-r--r-- | target/linux/config/Config.in.graphics | 9 | ||||
-rw-r--r-- | target/linux/config/Config.in.kernel | 3 | ||||
-rw-r--r-- | target/linux/config/Config.in.systems | 17 |
7 files changed, 29 insertions, 72 deletions
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index e924902e3..cc84914d2 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -13,23 +13,14 @@ config ADK_KERNEL_SND_USB config ADK_KERNEL_SND_PXA2XX_AC97 boolean -config ADK_KERNEL_SND_TIMER +config ADK_KPACKAGE_KMOD_SND_TIMER boolean -config ADK_KERNEL_SND_PCM +config ADK_KPACKAGE_KMOD_SND_PCM boolean -config ADK_KERNEL_SND_HWDEP - boolean - -config ADK_KERNEL_SND_OSSEMUL - boolean - -config ADK_KERNEL_SND_MIXER_OSS - boolean - -config ADK_KERNEL_SND_PCM_OSS - boolean +config ADK_KPACKAGE_KMOD_SND_HWDEP + tristate config ADK_KPACKAGE_KMOD_SOUND tristate @@ -40,32 +31,24 @@ config ADK_KPACKAGE_KMOD_SND_RAWMIDI config ADK_KPACKAGE_KMOD_SND_AC97_CODEC tristate -config ADK_KPACKAGE_KMOD_SND - prompt "kmod-snd...................... ALSA sound support" +config ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE tristate - select ADK_KPACKAGE_KMOD_SOUND - select ADK_KERNEL_SND_OSSEMUL - select ADK_KERNEL_SND_TIMER - select ADK_KERNEL_SND_PCM - select ADK_KERNEL_SND_HWDEP - default n - help - Basic ALSA sound support. -config ADK_KPACKAGE_KMOD_SND_OSSEMUL - prompt "kmod-snd-ossemul.............. ALSA OSS Emulation" +config ADK_KPACKAGE_KMOD_SND_COMPRESS tristate - select ADK_KERNEL_SND_MIXER_OSS - select ADK_KERNEL_SND_PCM_OSS - select ADK_KPACKAGE_KMOD_SND - default y if ADK_TARGET_SYSTEM_IBM_X40 + +config ADK_KPACKAGE_KMOD_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 default n - help - ALSA OSS Emulation config ADK_KPACKAGE_KMOD_SND_INTEL8X0 prompt "kmod-snd-intel8x0............. 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 @@ -136,10 +119,12 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835 default n config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S - prompt "kmod-snd-bcm2708-soc-i2s........ ALSA SOC I2S Raspberry PI" + prompt "kmod-snd-bcm2708-soc-i2s...... ALSA SOC I2S Raspberry PI" 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 default n diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 9297031c2..0d1a28125 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -1,6 +1,3 @@ -config ADK_KERNEL_BLOCK - boolean - config ADK_KERNEL_MD boolean @@ -82,7 +79,6 @@ config ADK_KERNEL_PATA_PCMCIA config ADK_KERNEL_PATA_PXA boolean - select ADK_KERNEL_BLOCK select ADK_KERNEL_SCSI select ADK_KERNEL_ATA select ADK_KERNEL_ATA_SFF @@ -95,7 +91,6 @@ config ADK_KERNEL_PATA_PXA config ADK_KERNEL_MMC_AT91 boolean - select ADK_KERNEL_BLOCK select ADK_KERNEL_SCSI select ADK_KERNEL_MMC select ADK_KERNEL_MMC_BLOCK @@ -106,7 +101,6 @@ config ADK_KERNEL_MMC_AT91 config ADK_KERNEL_MMC_SDHCI_BCM2708 boolean - select ADK_KERNEL_BLOCK select ADK_KERNEL_SCSI select ADK_KERNEL_MMC select ADK_KERNEL_MMC_BLOCK @@ -121,7 +115,6 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708 config ADK_KERNEL_PATA_RB532 boolean - select ADK_KERNEL_BLOCK select ADK_KERNEL_SCSI select ADK_KERNEL_ATA select ADK_KERNEL_ATA_SFF @@ -133,7 +126,6 @@ config ADK_KERNEL_PATA_RB532 config ADK_KERNEL_PATA_AMD boolean - select ADK_KERNEL_BLOCK select ADK_KERNEL_SCSI select ADK_KERNEL_ATA select ADK_KERNEL_ATA_SFF @@ -148,7 +140,6 @@ config ADK_KERNEL_PATA_AMD config ADK_KERNEL_PATA_SC1200 boolean - select ADK_KERNEL_BLOCK select ADK_KERNEL_SCSI select ADK_KERNEL_ATA select ADK_KERNEL_ATA_SFF @@ -160,7 +151,6 @@ config ADK_KERNEL_PATA_SC1200 config ADK_KERNEL_PATA_JMICRON boolean - select ADK_KERNEL_BLOCK select ADK_KERNEL_SCSI select ADK_KERNEL_ATA select ADK_KERNEL_ATA_SFF @@ -171,7 +161,6 @@ config ADK_KERNEL_PATA_JMICRON config ADK_KERNEL_SATA_AHCI tristate - select ADK_KERNEL_BLOCK select ADK_KERNEL_SCSI select ADK_KERNEL_ATA select ADK_KERNEL_BLK_DEV @@ -185,7 +174,6 @@ menu "Block devices support" config ADK_KPACKAGE_KMOD_SATA_AHCI prompt "kmod-sata-ahci.................... AHCI SATA driver" tristate - select ADK_KERNEL_BLOCK select ADK_KERNEL_ATA select ADK_KERNEL_BLK_DEV_SD depends on !ADK_KERNEL_SATA_AHCI @@ -197,7 +185,6 @@ config ADK_KPACKAGE_KMOD_SATA_AHCI config ADK_KPACKAGE_KMOD_BLK_DEV_LOOP prompt "kmod-blk-dev-loop................. Loop mount support" tristate - select ADK_KERNEL_BLOCK select ADK_KERNEL_BLK_DEV default n help diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu index a8dfd5188..1d36c0b36 100644 --- a/target/linux/config/Config.in.cpu +++ b/target/linux/config/Config.in.cpu @@ -1,12 +1,3 @@ -config ADK_KERNEL_MATOM - boolean - -config ADK_KERNEL_MPENTIUMM - boolean - -config ADK_KERNEL_MGEODE_LX - boolean - config ADK_KERNEL_MTRR boolean default y if ADK_TARGET_CPU_WITH_MTRR diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 85065c093..377122dc5 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -62,6 +62,7 @@ config ADK_KERNEL_EXT2_FS boolean default y if ADK_TARGET_WITH_CF default y if ADK_TARGET_WITH_MMC && !ADK_TARGET_SYSTEM_RASPBERRY_PI + default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n config ADK_KPACKAGE_KMOD_EXT2_FS diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index dc748e6c0..48cd3ea73 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -13,7 +13,6 @@ config ADK_KERNEL_VT_CONSOLE config ADK_KERNEL_VGA_CONSOLE boolean default y if ADK_HARDWARE_VBOX - default y if ADK_TARGET_SYSTEM_ARANYM_M68K default n config ADK_KERNEL_FONTS @@ -27,11 +26,19 @@ config ADK_KERNEL_FB boolean config ADK_KERNEL_FRAMEBUFFER_CONSOLE + default y if ADK_TARGET_SYSTEM_ARANYM_M68K + default n boolean config ADK_KERNEL_MFD_SM501 boolean +config ADK_KERNEL_FB_ATARI + boolean + select ADK_KERNEL_FB + default y if ADK_TARGET_SYSTEM_ARANYM_M68K + default n + config ADK_KERNEL_FB_CIRRUS boolean diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index d928cea09..221a373df 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -7,6 +7,9 @@ config ADK_KERNEL_EXPERIMENTAL config ADK_KERNEL_BLK_DEV_INITRD boolean +config ADK_KERNEL_BLK_DEV_RAM + boolean + config ADK_KERNEL_INITRAMFS_COMPRESSION_NONE boolean diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems deleted file mode 100644 index 61284f0fb..000000000 --- a/target/linux/config/Config.in.systems +++ /dev/null @@ -1,17 +0,0 @@ -# page size -config ADK_KERNEL_PAGE_SIZE_4KB - boolean - -config ADK_KERNEL_PAGE_SIZE_16KB - boolean - -# ABI -config ADK_KERNEL_AEABI - boolean - -# endianess -config ADK_KERNEL_CPU_BIG_ENDIAN - boolean - -config ADK_KERNEL_CPU_LITTLE_ENDIAN - boolean |