diff options
Diffstat (limited to 'target/linux/config')
| -rw-r--r-- | target/linux/config/Config.in.cpu | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.fsnet | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.graphics | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.input | 6 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 6 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netfilter.ip4 | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.usb | 2 |
7 files changed, 15 insertions, 7 deletions
diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu index b892f1455..17e82c3c3 100644 --- a/target/linux/config/Config.in.cpu +++ b/target/linux/config/Config.in.cpu @@ -35,3 +35,4 @@ config ADK_KERNEL_USE_GENERIC_SMP_HELPERS config ADK_KERNEL_VFP boolean + diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet index 77871f171..c22ae210c 100644 --- a/target/linux/config/Config.in.fsnet +++ b/target/linux/config/Config.in.fsnet @@ -3,7 +3,7 @@ config ADK_KERNEL_FS_POSIX_ACL default y config ADK_KPACKAGE_KMOD_CIFS - prompt "kmod-fs-cifs...................... CIFS support" + prompt "kmod-cifs......................... CIFS support" tristate select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS select ADK_KERNEL_NETWORK_FILESYSTEMS diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index e35f97ac4..3e59afda8 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -19,7 +19,6 @@ config ADK_KERNEL_VT_CONSOLE config ADK_KERNEL_VGA_CONSOLE boolean default y if ADK_HARDWARE_VBOX - default y if ADK_HARDWARE_QEMU default y if ADK_TARGET_SYSTEM_ARANYM_M68K default n diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 587a7f2c9..51d25c4ac 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -140,6 +140,8 @@ config ADK_KPACKAGE_KMOD_USB_HID tristate select ADK_KERNEL_INPUT select ADK_KERNEL_HID + select ADK_KERNEL_INPUT_KEYBOARD + select ADK_KERNEL_INPUT_MOUSEDEV depends on ADK_PACKAGE_KMOD_USB_CONTROLLER depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX depends on ADK_TARGET_WITH_USB @@ -152,12 +154,14 @@ config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD tristate select ADK_KERNEL_INPUT select ADK_KERNEL_INPUT_KEYBOARD + depends on !ADK_KERNEL_KEYBOARD_ATKBD default n config ADK_KPACKAGE_KMOD_INPUT_MOUSEDEV - prompt "kmod-input-mouse................. Mouse support (PS/2)" + prompt "kmod-input-mouse................. Mouse support" tristate select ADK_KERNEL_INPUT + depends on !ADK_KERNEL_INPUT_MOUSEDEV default n config ADK_KPACKAGE_KMOD_INPUT_EVDEV diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 0bff56a1b..dcf9f03ec 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -65,8 +65,6 @@ config ADK_KERNEL_PCNET32 select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII - default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL - default y if ADK_TARGET_SYSTEM_QEMU_MIPS default n help @@ -166,6 +164,10 @@ config ADK_KERNEL_E1000 default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_QEMU_I686 default y if ADK_TARGET_SYSTEM_QEMU_X86_64 + default y if ADK_TARGET_SYSTEM_QEMU_MIPS64 + default y if ADK_TARGET_SYSTEM_QEMU_MIPS64EL + default y if ADK_TARGET_SYSTEM_QEMU_MIPS + default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL default n help diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4 index 77d24ede7..817000d63 100644 --- a/target/linux/config/Config.in.netfilter.ip4 +++ b/target/linux/config/Config.in.netfilter.ip4 @@ -36,14 +36,14 @@ 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_60 + select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_65 select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_9_11 select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_5 config ADK_KPACKAGE_KMOD_NF_NAT tristate 'Full NAT' depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES - depends on ADK_KERNEL_VERSION_3_4_60 + depends on ADK_KERNEL_VERSION_3_4_65 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.usb b/target/linux/config/Config.in.usb index 1459039b6..e2e3051da 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -176,6 +176,8 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI depends on ADK_KPACKAGE_KMOD_USB + default y if ADK_TARGET_SYSTEM_QEMU_I686 + default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 |