diff options
Diffstat (limited to 'target/config')
-rw-r--r-- | target/config/Config.in.gdb | 6 | ||||
-rw-r--r-- | target/config/Config.in.runtime | 33 | ||||
-rw-r--r-- | target/config/Config.in.target | 5 |
3 files changed, 26 insertions, 18 deletions
diff --git a/target/config/Config.in.gdb b/target/config/Config.in.gdb index e151f1aa0..79d20dd67 100644 --- a/target/config/Config.in.gdb +++ b/target/config/Config.in.gdb @@ -4,12 +4,18 @@ choice prompt "GNU debugger version" default ADK_TOOLCHAIN_GDB_7_9_1 if ADK_TARGET_ARCH_BFIN +default ADK_TOOLCHAIN_GDB_H8300_GIT if ADK_TARGET_ARCH_H8300 default ADK_TOOLCHAIN_GDB_7_10_1 config ADK_TOOLCHAIN_GDB_GIT bool "git" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN + depends on !ADK_TARGET_ARCH_H8300 + +config ADK_TOOLCHAIN_GDB_H8300_GIT + bool "h8300-git" + depends on ADK_TARGET_ARCH_H8300 config ADK_TOOLCHAIN_GDB_7_10_1 bool "7.10.1" diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index b4fe068c8..8bcef7fb7 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -10,7 +10,6 @@ config ADK_RUNTIME_HOSTNAME choice prompt "init" depends on !ADK_TOOLCHAIN_ONLY -default ADK_RUNTIME_INIT_SIMPLEINIT if ADK_TARGET_WITHOUT_MMU default ADK_RUNTIME_INIT_SYSV config ADK_RUNTIME_INIT_SYSV @@ -112,7 +111,7 @@ config ADK_RUNTIME_TMPFS_SIZE default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI2 default "32768" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default "8192" if ADK_TARGET_SYSTEM_MIKROTIK_RB532 - default "2048" + default "1024" depends on !ADK_RUNTIME_INIT_SIMPLEINIT help Size of /tmp in memory in Kilobyte. @@ -290,7 +289,7 @@ config ADK_RUNTIME_KBD_LAYOUT choice prompt "initial login shell for the root user" -default ADK_ROOTSH_SASH if ADK_TARGET_WITHOUT_MMU +default ADK_ROOTSH_HUSH if ADK_TARGET_WITHOUT_MMU default ADK_ROOTSH_MKSH config ADK_ROOTSH_MKSH @@ -300,19 +299,19 @@ config ADK_ROOTSH_MKSH Use mksh (a Korn Shell variant) as standard login shell for the superuser. +config ADK_ROOTSH_HUSH + bool "hush (busybox shell compatible with non-MMU systems)" + select BUSYBOX_HUSH if !ADK_TOOLCHAIN_ONLY + select BUSYBOX_FEATURE_SH_IS_HUSH if !ADK_TOOLCHAIN_ONLY + help + hush shell from busybox. + config ADK_ROOTSH_SASH bool "sash (Shell compatible with non-MMU systems)" select ADK_PACKAGE_SASH if !ADK_TOOLCHAIN_ONLY help standalone shell. -config ADK_ROOTSH_HUSH - bool "hush (busybox shell compatible with non-MMU systems)" - select BUSYBOX_HUSH - select BUSYBOX_FEATURE_SH_IS_HUSH - help - hush shell from busybox. - config ADK_ROOTSH_ASH bool "ash (busybox shell)" select BUSYBOX_ASH @@ -345,7 +344,7 @@ endchoice choice prompt "system /bin/sh (POSIX script shell)" -default ADK_BINSH_SASH if ADK_TARGET_WITHOUT_MMU +default ADK_BINSH_HUSH if ADK_TARGET_WITHOUT_MMU default ADK_BINSH_MKSH config ADK_BINSH_MKSH @@ -355,18 +354,18 @@ 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_HUSH + bool "hush (busybox)" + select ADK_PACKAGE_HUSH if !ADK_TOOLCHAIN_ONLY + help + hush shell. + config ADK_BINSH_SASH bool "sash (Standalone Shell)" select ADK_PACKAGE_SASH if !ADK_TOOLCHAIN_ONLY help sash shell. -config ADK_BINSH_HUSH - bool "hush (busybox)" - select ADK_PACKAGE_HUSH - help - hush shell. - config ADK_BINSH_ASH bool "ash (busybox)" select BUSYBOX_ASH diff --git a/target/config/Config.in.target b/target/config/Config.in.target index 4f8b95c04..4bf725e74 100644 --- a/target/config/Config.in.target +++ b/target/config/Config.in.target @@ -29,6 +29,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS ADK_TARGET_ARCH_X86_64 depends on !ADK_TARGET_VBOX depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532 + depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 select ADK_KERNEL_BLK_DEV_INITRD help create an read-only initramfs system. @@ -135,6 +136,7 @@ config ADK_TARGET_ROOTFS_ISO config ADK_TARGET_ROOTFS_INITRAMFSARCHIVE bool "Archive usable for initramfs creation" depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532 \ + && !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 \ && !ADK_TARGET_SIM select ADK_KERNEL_BLK_DEV_INITRD help @@ -144,7 +146,8 @@ config ADK_TARGET_ROOTFS_ARCHIVE bool "Archive usable for different filesystems" select ADK_HOST_NEED_GENEXT2FS if ADK_TARGET_QEMU || ADK_TARGET_VBOX select ADK_KERNEL_EXT2_FS if ADK_TARGET_QEMU || ADK_TARGET_VBOX - depends on !ADK_TARGET_SIM + depends on !ADK_TARGET_SIM \ + && !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 help Use this option if your root filesystem is ext2/ext3/ext4/xfs. |