diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-08-27 17:14:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-08-27 17:14:13 +0200 |
| commit | 727dd67821e4581e4b61b30b79ca47c5bffc8497 (patch) | |
| tree | d5be61f067a42b2633ef148f416f138e7c2f7da2 /target/config | |
| parent | 683cf71a6ebccbd4f827ad4a6ac92dbbaf8f644d (diff) | |
| parent | 008d0e157538e4a4c302dc79e6c28c9da615b527 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/config')
| -rw-r--r-- | target/config/Config.in | 3 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 16 | ||||
| -rw-r--r-- | target/config/Config.in.target | 2 |
3 files changed, 17 insertions, 4 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index 38f8090dd..7393bfe9c 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -15,7 +15,8 @@ config ADK_TARGET_TOOLCHAIN boolean config ADK_TARGET_UCLINUX - select ADK_TARGET_USE_STATIC_LIBS + select ADK_PACKAGE_SASH + select ADK_PACKAGE_SIMPLEINIT boolean config ADK_TARGET_QEMU diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 845786a45..2caec15ec 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -150,7 +150,7 @@ config ADK_RUNTIME_KBD_LAYOUT choice prompt "initial login shell for the root user" -default ADK_ROOTSH_HUSH if ADK_TARGET_UCLINUX +default ADK_ROOTSH_SASH if ADK_TARGET_UCLINUX default ADK_ROOTSH_MKSH config ADK_ROOTSH_MKSH @@ -160,6 +160,12 @@ config ADK_ROOTSH_MKSH Use mksh (a Korn Shell variant) as standard login shell for the superuser. +config ADK_ROOTSH_SASH + select ADK_PACKAGE_SASH if !ADK_TOOLCHAIN_ONLY + bool "sash (Shell compatible with non-MMU systems)" + help + standalone shell. + config ADK_ROOTSH_HUSH select ADK_PACKAGE_HUSH if !ADK_TOOLCHAIN_ONLY bool "hush (Shell compatible with non-MMU systems)" @@ -197,7 +203,7 @@ endchoice choice prompt "system /bin/sh (POSIX script shell)" -default ADK_BINSH_HUSH if ADK_TARGET_UCLINUX +default ADK_BINSH_SASH if ADK_TARGET_UCLINUX default ADK_BINSH_MKSH config ADK_BINSH_MKSH @@ -207,6 +213,12 @@ config ADK_BINSH_MKSH Use mksh (a Korn Shell variant) as system shell, which is both small and powerful, so quite suited for this task. +config ADK_BINSH_SASH + select ADK_PACKAGE_SASH if !ADK_TOOLCHAIN_ONLY + bool "sash (Standalone Shell)" + help + hush shell. + config ADK_BINSH_HUSH select ADK_PACKAGE_HUSH if !ADK_TOOLCHAIN_ONLY bool "hush (busybox)" diff --git a/target/config/Config.in.target b/target/config/Config.in.target index 6cb858450..ad1e8dfe0 100644 --- a/target/config/Config.in.target +++ b/target/config/Config.in.target @@ -3,7 +3,7 @@ config ADK_TARGET_CFLAGS string - default "-march=isaaplus -mcpu=5208" if ADK_CPU_CF_5208 + default "-mcpu=5208" if ADK_CPU_CF_5208 default "-mcpu=v7.10.d" if ADK_CPU_MICROBLAZE default "-m4 -ml" if ADK_CPU_SH4 && ADK_little default "-m4 -mb" if ADK_CPU_SH4 && ADK_big |