diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-07 06:24:31 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-07 06:24:31 +0200 |
| commit | a5393320f05f681006915fcffe5631da874daee8 (patch) | |
| tree | 0bc9563da6929ec872bad3263a23519426ec91d4 /target/config | |
| parent | c9712ddbbaf32cbf5bcdfd8154a733f2c2c84f6a (diff) | |
| parent | c59a468aae2eb6522e97d877992f3b059b4e6242 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/config')
| -rw-r--r-- | target/config/Config.in.runtime | 23 | ||||
| -rw-r--r-- | target/config/Config.in.toolchain | 6 |
2 files changed, 28 insertions, 1 deletions
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 207bcc0c1..6b7ee495b 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -349,6 +349,29 @@ config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_GW endmenu +choice +prompt "WLAN Security" +depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC || ADK_SIMPLE_NETWORK_CONFIG_WLAN0_DHCP +default ADK_SIMPLE_NETWORK_CONFIG_WLAN0_NOSEC + +config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_NOSEC + bool "No security" + +config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2 + bool "WPA2" + +endchoice + +config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2_SSID + depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2 + string "SSID" + default "" + +config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2_PW + depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2 + string "Password" + default "" + menu "eth1 Configuration" depends on ADK_SIMPLE_NETWORK_CONFIG && \ ADK_TARGET_SYSTEM_MIKROTIK_RB532 diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index 3a5d98cf1..16c075212 100644 --- a/target/config/Config.in.toolchain +++ b/target/config/Config.in.toolchain @@ -74,7 +74,9 @@ config ADK_TOOLCHAIN_BINUTILS_2_20_1 config ADK_TOOLCHAIN_BINUTILS_2_22 prompt "2.22" boolean - depends on ADK_LINUX_BFIN || ADK_LINUX_CRIS + depends on ADK_LINUX_BFIN \ + || ADK_LINUX_CRIS \ + || ADK_LINUX_M68K config ADK_TOOLCHAIN_BINUTILS_2_23_ARC prompt "2.23-arc" @@ -88,6 +90,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_24 depends on !ADK_LINUX_ARC depends on !ADK_LINUX_AVR32 depends on !ADK_LINUX_CRIS + depends on !ADK_LINUX_M68K config ADK_TOOLCHAIN_BINUTILS_GIT prompt "git" @@ -97,6 +100,7 @@ config ADK_TOOLCHAIN_BINUTILS_GIT depends on !ADK_LINUX_ARC depends on !ADK_LINUX_AVR32 depends on !ADK_LINUX_CRIS + depends on !ADK_LINUX_M68K endchoice |