summaryrefslogtreecommitdiff
path: root/target/linux/config
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/config')
-rw-r--r--target/linux/config/Config.in.audio52
-rw-r--r--target/linux/config/Config.in.block61
-rw-r--r--target/linux/config/Config.in.cpu9
-rw-r--r--target/linux/config/Config.in.debug4
-rw-r--r--target/linux/config/Config.in.flash21
-rw-r--r--target/linux/config/Config.in.fs25
-rw-r--r--target/linux/config/Config.in.graphics17
-rw-r--r--target/linux/config/Config.in.kernel10
-rw-r--r--target/linux/config/Config.in.netdevice16
-rw-r--r--target/linux/config/Config.in.netfilter.ip416
-rw-r--r--target/linux/config/Config.in.network8
-rw-r--r--target/linux/config/Config.in.nls10
-rw-r--r--target/linux/config/Config.in.spi6
-rw-r--r--target/linux/config/Config.in.systems17
-rw-r--r--target/linux/config/Config.in.usb6
15 files changed, 158 insertions, 120 deletions
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index e924902e3..a1a5077e6 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,11 +119,14 @@ 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"
+ tristate
select ADK_KPACKAGE_KMOD_SND
select ADK_KERNEL_SND_ARM
select ADK_KPACKAGE_KMOD_SND_SOC
- boolean
+ select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE
+ select ADK_KPACKAGE_KMOD_SND_COMPRESS
+ 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 9297031c2..dd7c96dc5 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
@@ -24,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
@@ -74,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
@@ -82,7 +124,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 +136,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 +146,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 +160,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 +171,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 +185,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 +196,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 +206,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 +219,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 +230,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
@@ -265,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
@@ -281,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.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.debug b/target/linux/config/Config.in.debug
index 80387c627..a1c7ae6c9 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -30,7 +30,7 @@ config ADK_KERNEL_EARLY_PRINTK
default n
config ADK_KERNEL_PRINTK
- prompt "Enable printk to save space and quieten bootup"
+ prompt "printk support (disable to save space and quieten bootup)"
boolean
select ADK_KERNEL_EARLY_PRINTK
default y
@@ -39,7 +39,7 @@ config ADK_KERNEL_PRINTK
Disable printk to save space and quieten bootup.
config ADK_KERNEL_PRINTK_TIME
- prompt "Enable timing information for printk"
+ prompt "timing information for printk"
boolean
depends on ADK_KERNEL_PRINTK
default n
diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash
index 773c518e8..dda8ad4c9 100644
--- a/target/linux/config/Config.in.flash
+++ b/target/linux/config/Config.in.flash
@@ -87,8 +87,21 @@ 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
+ select ADK_KERNEL_SPI
+ select ADK_KERNEL_SPI_MASTER
boolean
- default y if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
default n
config ADK_KERNEL_MTD_AR2315
@@ -129,13 +142,11 @@ 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
config ADK_TARGET_MTD_SIZE
int
- default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
- default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL
+ default "16777216" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
+ default "33554432" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
default "0"
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index 85065c093..5ebf38794 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -11,9 +11,6 @@ config ADK_KERNEL_EXPORTFS
boolean
default y
-config ADK_KERNEL_JFFS2_FS
- boolean
-
config ADK_KERNEL_YAFFS_FS
tristate
@@ -51,6 +48,21 @@ config ADK_KERNEL_SQUASHFS_XZ
boolean
default n
+config ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS
+ boolean
+ default n
+
+config ADK_KERNEL_JFFS2_ZLIB
+ boolean
+ default n
+
+config ADK_KERNEL_JFFS2_FS
+ prompt "jffs2............................. JFFS2 filesystem"
+ select ADK_KERNEL_MISC_FILESYSTEMS
+ select ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS
+ select ADK_KERNEL_JFFS2_ZLIB
+ boolean
+
config ADK_KERNEL_SQUASHFS
prompt "squashfs.......................... SquashFS filesystem"
boolean
@@ -60,8 +72,7 @@ config ADK_KERNEL_SQUASHFS
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
@@ -183,7 +194,7 @@ config ADK_KPACKAGE_KMOD_VFAT_FS
select ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850
select ADK_KPACKAGE_KMOD_NLS_ISO8859_1
select ADK_KERNEL_BLOCK
- default y if ADK_TARGET_WITH_MMC
+ default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
help
This option provides support for normal Windows file systems with
@@ -222,7 +233,7 @@ config ADK_KPACKAGE_KMOD_XFS_FS
with the IRIX version of XFS.
config ADK_KPACKAGE_KMOD_FUSE_FS
- prompt "kmod-fs-fuse...................... Filesystem in Userspace support"
+ prompt "kmod-fuse-fs...................... Filesystem in Userspace support"
tristate
default n
help
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index dc748e6c0..3a8e18b25 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
@@ -61,7 +68,7 @@ config ADK_KERNEL_LOGO
boolean
menu "Graphic devices support"
-depends on ADK_TARGET_WITH_VGA
+depends on ADK_TARGET_WITH_VGA || ADK_HARDWARE_QEMU
config ADK_KERNEL_LOGO_LINUX_CLUT224
prompt "Enable Linux penguin boot logo"
@@ -69,6 +76,12 @@ config ADK_KERNEL_LOGO_LINUX_CLUT224
select ADK_KERNEL_LOGO
default n
+config ADK_KERNEL_FB_CON_DECOR
+ prompt "Enable fullscreen boot logo"
+ boolean
+ select ADK_PACKAGE_FBSPLASH
+ default n
+
config ADK_KERNEL_FB_VESA
prompt "................................ Framebuffer support for VirtualBox Emulator (VESA)"
boolean
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index d928cea09..ead74cc7e 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
@@ -95,7 +98,7 @@ config ADK_KERNEL_PCI
config ADK_KERNEL_64BIT
boolean
- default y if ADK_TARGET_KERNEL64
+ default y if ADK_LINUX_64
config ADK_KERNEL_CPU_MIPS64
boolean
@@ -103,6 +106,9 @@ config ADK_KERNEL_CPU_MIPS64
config ADK_KERNEL_CPU_MIPS64_R1
boolean
+config ADK_KERNEL_CPU_MIPS64_R2
+ boolean
+
config ADK_KERNEL_PREEMPT
boolean
@@ -122,7 +128,9 @@ config ADK_KERNEL_AEABI
# endianess
config ADK_KERNEL_CPU_BIG_ENDIAN
+ default y if ADK_big
boolean
config ADK_KERNEL_CPU_LITTLE_ENDIAN
+ default y if ADK_little
boolean
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/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index b43a566b9..d3f988845 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -36,16 +36,16 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
config ADK_KPACKAGE_KMOD_FULL_NAT
tristate "Meta package for Full NAT"
- select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_82
- select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_30
+ select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_84
+ select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_34
select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10
- select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_13
- select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_6
+ select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_14
+ select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_7
config ADK_KPACKAGE_KMOD_NF_NAT
tristate 'Full NAT'
depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
- depends on ADK_KERNEL_VERSION_3_4_82
+ depends on ADK_KERNEL_VERSION_3_4_84
help
The Full NAT option allows masquerading, port forwarding and other
forms of full Network Address Port Translation. It is controlled by
@@ -54,10 +54,10 @@ config ADK_KPACKAGE_KMOD_NF_NAT
config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
tristate 'Full NAT'
depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
- depends on ADK_KERNEL_VERSION_3_10_30 \
+ depends on ADK_KERNEL_VERSION_3_10_34 \
|| ADK_KERNEL_VERSION_3_11_10 \
- || ADK_KERNEL_VERSION_3_12_13 \
- || ADK_KERNEL_VERSION_3_13_6
+ || ADK_KERNEL_VERSION_3_12_14 \
+ || ADK_KERNEL_VERSION_3_13_7
help
The Full NAT option allows masquerading, port forwarding and other
forms of full Network Address Port Translation. It is controlled by
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 00d05dcd4..71a510d69 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -1,13 +1,5 @@
menu "Network support"
-config ADK_KERNEL_INET
- boolean
- default y
-
-config ADK_KERNEL_NET_CORE
- boolean
- default y
-
config ADK_KERNEL_IP_FIB_HASH
boolean
default y
diff --git a/target/linux/config/Config.in.nls b/target/linux/config/Config.in.nls
index 587d5a37b..61dd32752 100644
--- a/target/linux/config/Config.in.nls
+++ b/target/linux/config/Config.in.nls
@@ -1,12 +1,8 @@
menu "Native Language support"
-config ADK_KERNEL_NLS
- boolean
- default y
-
config ADK_KERNEL_NLS_DEFAULT
string
- default "iso8859-1"
+ default "utf-8"
config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_437
prompt "kmod-nls-codepage-437........... Codepage 437 (United States, Canada)"
@@ -325,7 +321,7 @@ config ADK_KPACKAGE_KMOD_NLS_ASCII
config ADK_KPACKAGE_KMOD_NLS_ISO8859_1
prompt "kmod-nls-iso8859-1.............. NLS ISO 8859-1 (Latin-1; Western European Languages)"
tristate
- default n
+ default y
help
If you want to display filenames with native language characters
from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -499,7 +495,7 @@ config ADK_KPACKAGE_KMOD_NLS_KOI8_U
config ADK_KPACKAGE_KMOD_NLS_UTF8
prompt "kmod-nls-utf8................... NLS UTF8"
tristate
- default n
+ default y
help
If you want to display filenames with native language characters
from the Microsoft FAT file system family or from JOLIET CD-ROMs
diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi
index 73db5e86d..c130523ef 100644
--- a/target/linux/config/Config.in.spi
+++ b/target/linux/config/Config.in.spi
@@ -1,6 +1,12 @@
config ADK_KERNEL_SPI
boolean
+config ADK_KERNEL_SPI_MASTER
+ boolean
+
+config ADK_KERNEL_SPI_XILINX
+ boolean
+
config ADK_KERNEL_SPI_AR71XX
select ADK_KERNEL_SPI
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
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 2d50e24b2..ac85f977e 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -7,20 +7,14 @@ config ADK_KERNEL_USB_SUPPORT
config ADK_KERNEL_USB
boolean
select ADK_KERNEL_USB_SUPPORT
- default y if ADK_TARGET_SYSTEM_QEMU_SH4
- default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
default n
config ADK_KERNEL_USB_OHCI_HCD
boolean
- default y if ADK_TARGET_SYSTEM_QEMU_SH4
- default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
default n
config ADK_KERNEL_USB_OHCI_HCD_PLATFORM
boolean
- default y if ADK_TARGET_SYSTEM_QEMU_SH4
- default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
default n
config ADK_KERNEL_USB_LIBUSUAL