Browse Source

arm-nommu: enable uClinux, better defaults

Waldemar Brodkorb 5 years ago
parent
commit
422fff6d16

+ 1 - 1
package/busybox/Config.in.manual

@@ -13,7 +13,7 @@ config ADK_PACKAGE_BUSYBOX
 choice
 choice
 prompt "Choose predefined set of applets"
 prompt "Choose predefined set of applets"
 depends on ADK_PACKAGE_BUSYBOX
 depends on ADK_PACKAGE_BUSYBOX
-default ADK_PACKAGE_BUSYBOX_MINIMAL if ADK_TARGET_UCLINUX
+default ADK_PACKAGE_BUSYBOX_MINIMAL if !ADK_TARGET_WITH_MMU
 
 
 config ADK_PACKAGE_BUSYBOX_DEFAULT
 config ADK_PACKAGE_BUSYBOX_DEFAULT
 	bool "activate standard set of applets"
 	bool "activate standard set of applets"

+ 1 - 0
target/arm/kernel/qemu-arm-versatilepb

@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
 CONFIG_ARM_SINGLE_ARCH_VERSATILE=y
 CONFIG_ARM_SINGLE_ARCH_VERSATILE=y
+CONFIG_ARM_PATCH_PHYS_VIRT=y
 CONFIG_ARCH_VERSATILE=y
 CONFIG_ARCH_VERSATILE=y
 CONFIG_KUSER_HELPERS=y
 CONFIG_KUSER_HELPERS=y
 CONFIG_ATAGS=y
 CONFIG_ATAGS=y

+ 1 - 1
target/config/Config.in.binfmt

@@ -11,7 +11,7 @@ config ADK_TARGET_BINFMT_ELF
 
 
 config ADK_TARGET_BINFMT_FLAT
 config ADK_TARGET_BINFMT_FLAT
 	bool "FLAT"
 	bool "FLAT"
-	select ADK_TARGET_UCLINUX if ADK_TARGET_ARCH_BFIN
+	select ADK_TARGET_UCLINUX if ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_ARM
 	depends on ADK_TARGET_LIB_UCLIBC_NG
 	depends on ADK_TARGET_LIB_UCLIBC_NG
 	depends on !ADK_TARGET_WITH_MMU
 	depends on !ADK_TARGET_WITH_MMU
 	depends on ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_SH || ADK_TARGET_ARCH_XTENSA \
 	depends on ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_SH || ADK_TARGET_ARCH_XTENSA \

+ 12 - 3
target/config/Config.in.runtime

@@ -52,7 +52,7 @@ endchoice
 choice
 choice
 prompt "system for /dev management"
 prompt "system for /dev management"
 depends on !ADK_APPLIANCE_TOOLCHAIN
 depends on !ADK_APPLIANCE_TOOLCHAIN
-default ADK_RUNTIME_DEV_STATIC if ADK_TARGET_ARCH_CRIS || ADK_TARGET_UCLINUX
+default ADK_RUNTIME_DEV_STATIC if ADK_TARGET_ARCH_CRIS || !ADK_TARGET_WITH_MMU
 default ADK_RUNTIME_DEV_MDEV
 default ADK_RUNTIME_DEV_MDEV
 
 
 config ADK_RUNTIME_DEV_MDEV
 config ADK_RUNTIME_DEV_MDEV
@@ -425,12 +425,13 @@ config ADK_RUNTIME_KBD_LAYOUT
 
 
 choice
 choice
 prompt "initial login shell for the root user"
 prompt "initial login shell for the root user"
-default ADK_ROOTSH_HUSH if ADK_TARGET_UCLINUX
+default ADK_ROOTSH_HUSH if !ADK_TARGET_WITH_MMU
 default ADK_ROOTSH_MKSH
 default ADK_ROOTSH_MKSH
 
 
 config ADK_ROOTSH_MKSH
 config ADK_ROOTSH_MKSH
 	bool "mksh (MirBSD Korn Shell)"
 	bool "mksh (MirBSD Korn Shell)"
 	select ADK_PACKAGE_MKSH if !ADK_APPLIANCE_TOOLCHAIN
 	select ADK_PACKAGE_MKSH if !ADK_APPLIANCE_TOOLCHAIN
+	depends on ADK_TARGET_WITH_MMU
 	help
 	help
 	  Use mksh (a Korn Shell variant) as standard login shell
 	  Use mksh (a Korn Shell variant) as standard login shell
 	  for the superuser.
 	  for the superuser.
@@ -452,6 +453,7 @@ config ADK_ROOTSH_ASH
 	bool "ash (busybox shell)"
 	bool "ash (busybox shell)"
 	select BUSYBOX_ASH
 	select BUSYBOX_ASH
 	select BUSYBOX_SH_IS_ASH
 	select BUSYBOX_SH_IS_ASH
+	depends on ADK_TARGET_WITH_MMU
 	help
 	help
 	  Use the minimalistic ash variant that is part of busybox
 	  Use the minimalistic ash variant that is part of busybox
 	  as standard login shell for the superuser. This is the
 	  as standard login shell for the superuser. This is the
@@ -460,12 +462,14 @@ config ADK_ROOTSH_ASH
 config ADK_ROOTSH_BASH
 config ADK_ROOTSH_BASH
 	bool "bash (GNU Bourne-Again Shell)"
 	bool "bash (GNU Bourne-Again Shell)"
 	select ADK_PACKAGE_BASH
 	select ADK_PACKAGE_BASH
+	depends on ADK_TARGET_WITH_MMU
 	help
 	help
 	  Use GNU bash as standard login shell for the superuser.
 	  Use GNU bash as standard login shell for the superuser.
 
 
 config ADK_ROOTSH_TCSH
 config ADK_ROOTSH_TCSH
 	bool "tcsh (Tenex C Shell)"
 	bool "tcsh (Tenex C Shell)"
 	select ADK_PACKAGE_TCSH
 	select ADK_PACKAGE_TCSH
+	depends on ADK_TARGET_WITH_MMU
 	help
 	help
 	  Use tcsh (a C Shell variant) as standard login shell
 	  Use tcsh (a C Shell variant) as standard login shell
 	  for the superuser.
 	  for the superuser.
@@ -473,6 +477,7 @@ config ADK_ROOTSH_TCSH
 config ADK_ROOTSH_ZSH
 config ADK_ROOTSH_ZSH
 	bool "zsh (The Z Shell)"
 	bool "zsh (The Z Shell)"
 	select ADK_PACKAGE_ZSH
 	select ADK_PACKAGE_ZSH
+	depends on ADK_TARGET_WITH_MMU
 	help
 	help
 	  Use zsh as standard login shell for the superuser.
 	  Use zsh as standard login shell for the superuser.
 
 
@@ -480,12 +485,13 @@ endchoice
 
 
 choice
 choice
 prompt "system /bin/sh (POSIX script shell)"
 prompt "system /bin/sh (POSIX script shell)"
-default ADK_BINSH_HUSH if ADK_TARGET_UCLINUX
+default ADK_BINSH_HUSH if !ADK_TARGET_WITH_MMU
 default ADK_BINSH_MKSH
 default ADK_BINSH_MKSH
 
 
 config ADK_BINSH_MKSH
 config ADK_BINSH_MKSH
 	bool "mksh (MirBSD Korn Shell)"
 	bool "mksh (MirBSD Korn Shell)"
 	select ADK_PACKAGE_MKSH if !ADK_APPLIANCE_TOOLCHAIN
 	select ADK_PACKAGE_MKSH if !ADK_APPLIANCE_TOOLCHAIN
+	depends on ADK_TARGET_WITH_MMU
 	help
 	help
 	  Use mksh (a Korn Shell variant) as system shell, which is
 	  Use mksh (a Korn Shell variant) as system shell, which is
 	  both small and powerful, so quite suited for this task.
 	  both small and powerful, so quite suited for this task.
@@ -505,6 +511,7 @@ config ADK_BINSH_SASH
 config ADK_BINSH_ASH
 config ADK_BINSH_ASH
 	bool "ash (busybox)"
 	bool "ash (busybox)"
 	select BUSYBOX_ASH
 	select BUSYBOX_ASH
+	depends on ADK_TARGET_WITH_MMU
 	help
 	help
 	  Use the minimalistic ash variant that is part of busybox
 	  Use the minimalistic ash variant that is part of busybox
 	  as system shell. This is the default and rather small and
 	  as system shell. This is the default and rather small and
@@ -513,6 +520,7 @@ config ADK_BINSH_ASH
 config ADK_BINSH_BASH
 config ADK_BINSH_BASH
 	bool "bash (GNU Bourne-Again Shell)"
 	bool "bash (GNU Bourne-Again Shell)"
 	select ADK_PACKAGE_BASH
 	select ADK_PACKAGE_BASH
+	depends on ADK_TARGET_WITH_MMU
 	help
 	help
 	  Use GNU bash as system shell. This is discouraged due to
 	  Use GNU bash as system shell. This is discouraged due to
 	  its size and slowness.
 	  its size and slowness.
@@ -520,6 +528,7 @@ config ADK_BINSH_BASH
 config ADK_BINSH_ZSH
 config ADK_BINSH_ZSH
 	bool "zsh (The Z Shell)"
 	bool "zsh (The Z Shell)"
 	select ADK_PACKAGE_ZSH
 	select ADK_PACKAGE_ZSH
+	depends on ADK_TARGET_WITH_MMU
 	help
 	help
 	  Use zsh as system shell. This is probably a bad idea.
 	  Use zsh as system shell. This is probably a bad idea.