Преглед изворни кода

default to simpleinit+sash for noMMU targets

GDB simulator targets for bfin/h8/300 might have only
8MB of RAM. A busybox based system in the default configuration
is to big :)
Waldemar Brodkorb пре 8 година
родитељ
комит
30d158ee24
3 измењених фајлова са 57 додато и 42 уклоњено
  1. 33 36
      package/busybox/Config.in.manual
  2. 3 0
      target/config/Config.in.kernelversion
  3. 21 6
      target/config/Config.in.runtime

+ 33 - 36
package/busybox/Config.in.manual

@@ -1,21 +1,18 @@
 config ADK_COMPILE_BUSYBOX
 	tristate
 	depends on ADK_PACKAGE_BUSYBOX
-	default n
 
 config ADK_PACKAGE_BUSYBOX
-	prompt "busybox.............. core utilities for embedded systems"
-	boolean
+	bool "busybox.............. core utilities for embedded systems"
 	select ADK_COMPILE_BUSYBOX
-	default y if !ADK_TOOLCHAIN_ONLY
+	default y if !ADK_TOOLCHAIN_ONLY && !ADK_TARGET_WITHOUT_MMU
 	help
 	  Core utilities for embedded Linux systems
 	  
 	  WWW: http://www.busybox.net
 
 config ADK_PACKAGE_BUSYBOX_HIDE
-	prompt "hide packages provided by busybox applets"
-	boolean
+	bool "hide packages provided by busybox applets"
 	depends on ADK_PACKAGE_BUSYBOX
 	default n
 	help
@@ -27,180 +24,180 @@ source "package/busybox/config/Config.in"
 endmenu
 
 config ADK_PACKAGE_UDHCPD
-	boolean
+	bool
 	default BUSYBOX_APP_UDHCPD
 
 # disable busybox applets, when full programs are choosen
 config BUSYBOX_DISABLE_MOUNT
-	boolean
+	bool
 	default y if ADK_PACKAGE_MOUNT
 	depends on ADK_PACKAGE_MOUNT
 	default n
 
 config BUSYBOX_DISABLE_UMOUNT
-	boolean
+	bool
 	default y if ADK_PACKAGE_MOUNT
 	depends on ADK_PACKAGE_MOUNT
 	default n
 
 config BUSYBOX_DISABLE_TAR
-	boolean
+	bool
 	default y if ADK_PACKAGE_TAR
 	depends on ADK_PACKAGE_TAR
 	default n
 
 config BUSYBOX_DISABLE_BZIP2
-	boolean
+	bool
 	default y if ADK_PACKAGE_BZIP2
 	depends on ADK_PACKAGE_BZIP2
 	default n
 
 config BUSYBOX_DISABLE_IP
-	boolean
+	bool
 	default y if ADK_PACKAGE_IP
 	depends on ADK_PACKAGE_IP
 	default n
 
 config BUSYBOX_DISABLE_PATCH
-	boolean
+	bool
 	default y if ADK_PACKAGE_PATCH
 	depends on ADK_PACKAGE_PATCH
 	default n
 
 config BUSYBOX_DISABLE_DIFF
-	boolean
+	bool
 	default y if ADK_PACKAGE_DIFFUTILS
 	depends on ADK_PACKAGE_DIFFUTILS
 	default n
 
 config BUSYBOX_DISABLE_ED
-	boolean
+	bool
 	default y if ADK_PACKAGE_ED
 	depends on ADK_PACKAGE_ED
 	default n
 
 config BUSYBOX_DISABLE_SED
-	boolean
+	bool
 	default y if ADK_PACKAGE_SED
 	depends on ADK_PACKAGE_SED
 	default n
 
 config BUSYBOX_DISABLE_LESS
-	boolean
+	bool
 	default y if ADK_PACKAGE_LESS
 	depends on ADK_PACKAGE_LESS
 	default n
 
 config BUSYBOX_DISABLE_HDPARM
-	boolean
+	bool
 	default y if ADK_PACKAGE_HDPARM
 	depends on ADK_PACKAGE_HDPARM
 	default n
 
 config BUSYBOX_DISABLE_WATCHDOG
-	boolean
+	bool
 	default y if ADK_PACKAGE_WATCHDOG
 	depends on ADK_PACKAGE_WATCHDOG
 	default n
 
 config BUSYBOX_DISABLE_PAM
-	boolean
+	bool
 	default y if ADK_PACKAGE_PAM
 	depends on ADK_PACKAGE_PAM
 	default n
 
 config BUSYBOX_DISABLE_BRCTL
-	boolean
+	bool
 	default y if ADK_PACKAGE_BRIDGE_UTILS
 	depends on ADK_PACKAGE_BRIDGE_UTILS
 	default n
 
 config BUSYBOX_DISABLE_ETHER_WAKE
-	boolean
+	bool
 	default y if ADK_PACKAGE_ETHER_WAKE
 	depends on ADK_PACKAGE_ETHER_WAKE
 	default n
 
 config BUSYBOX_DISABLE_NTPD
-	boolean
+	bool
 	default y if ADK_PACKAGE_OPENNTPD
 	depends on ADK_PACKAGE_OPENNTPD
 	default n
 
 config BUSYBOX_DISABLE_WGET
-	boolean
+	bool
 	default y if ADK_PACKAGE_WGET
 	depends on ADK_PACKAGE_WGET
 	default n
 
 config BUSYBOX_DISABLE_AR
-	boolean
+	bool
 	default y if ADK_PACKAGE_BINUTILS
 	depends on ADK_PACKAGE_BINUTILS
 	default n
 
 config BUSYBOX_DISABLE_CPIO
-	boolean
+	bool
 	default y if ADK_PACKAGE_CPIO
 	depends on ADK_PACKAGE_CPIO
 	default n
 
 config BUSYBOX_DISABLE_XZ
-	boolean
+	bool
 	default y if ADK_PACKAGE_XZ
 	depends on ADK_PACKAGE_XZ
 	default n
 
 config BUSYBOX_DISABLE_UNXZ
-	boolean
+	bool
 	default y if ADK_PACKAGE_XZ
 	depends on ADK_PACKAGE_XZ
 	default n
 
 config BUSYBOX_DISABLE_FBSET
-	boolean
+	bool
 	default y if ADK_PACKAGE_FBSET
 	depends on ADK_PACKAGE_FBSET
 	default n
 
 config BUSYBOX_DISABLE_LSPCI
-	boolean
+	bool
 	default y if ADK_PACKAGE_PCIUTILS
 	depends on ADK_PACKAGE_PCIUTILS
 	default n
 
 config BUSYBOX_DISABLE_LSUSB
-	boolean
+	bool
 	default y if ADK_PACKAGE_LSUSB
 	depends on ADK_PACKAGE_LSUSB
 	default n
 
 config BUSYBOX_DISABLE_GREP
-	boolean
+	bool
 	default y if ADK_PACKAGE_GREP
 	depends on ADK_PACKAGE_GREP
 	default n
 
 config BUSYBOX_DISABLE_FIND
-	boolean
+	bool
 	default y if ADK_PACKAGE_FINDUTILS
 	depends on ADK_PACKAGE_FINDUTILS
 	default n
 
 config BUSYBOX_DISABLE_RDATE
-	boolean
+	bool
 	default y if ADK_PACKAGE_RDATE
 	depends on ADK_PACKAGE_RDATE
 	default n
 
 config BUSYBOX_DISABLE_RFKILL
-	boolean
+	bool
 	default y if ADK_PACKAGE_RFKILL
 	depends on ADK_PACKAGE_RFKILL
 	default n
 
 config BUSYBOX_DISABLE_KMOD
-	boolean
+	bool
 	default y if ADK_PACKAGE_KMOD
 	depends on ADK_PACKAGE_KMOD
 	default n

+ 3 - 0
target/config/Config.in.kernelversion

@@ -7,6 +7,7 @@ depends on ADK_TARGET_KERNEL_CUSTOMISING
 default ADK_TARGET_KERNEL_VERSION_4_2_6 if ADK_TARGET_ARCH_ARC
 default ADK_TARGET_KERNEL_VERSION_4_2_6 if ADK_TARGET_ARCH_H8300
 default ADK_TARGET_KERNEL_VERSION_4_2_6 if ADK_TARGET_ARCH_SPARC
+default ADK_TARGET_KERNEL_VERSION_3_14_54 if ADK_TARGET_ARCH_BFIN
 default ADK_TARGET_KERNEL_VERSION_4_1_10
 
 config ADK_TARGET_KERNEL_VERSION_GIT
@@ -23,6 +24,7 @@ config ADK_TARGET_KERNEL_VERSION_4_2_6
 config ADK_TARGET_KERNEL_VERSION_4_1_10
 	bool "4.1.10"
 	depends on !ADK_TARGET_ARCH_ARC
+	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_ARCH_SPARC
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
@@ -31,6 +33,7 @@ config ADK_TARGET_KERNEL_VERSION_4_1_10
 config ADK_TARGET_KERNEL_VERSION_3_18_22
 	bool "3.18.22"
 	depends on !ADK_TARGET_ARCH_ARC
+	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2

+ 21 - 6
target/config/Config.in.runtime

@@ -7,6 +7,20 @@ config ADK_RUNTIME_HOSTNAME
 	help
 	  Set your target hostname.
 
+choice
+prompt "init"
+default ADK_RUNTIME_INIT_SIMPLEINIT if ADK_TARGET_WITHOUT_MMU
+default ADK_RUNTIME_INIT_SYSV
+
+config ADK_RUNTIME_INIT_SYSV
+	bool "Use busybox init"
+
+config ADK_RUNTIME_INIT_SIMPLEINIT
+	bool "Use a very simple init"
+	select ADK_PACKAGE_SIMPLEINIT
+
+endchoice
+
 choice
 prompt "System for /dev management"
 default ADK_RUNTIME_DEV_STATIC if ADK_TARGET_WITHOUT_MMU
@@ -97,6 +111,7 @@ config ADK_RUNTIME_TMPFS_SIZE
 	default "32768" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default "8192" if ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	default "2048"
+	depends on !ADK_RUNTIME_INIT_SIMPLEINIT
 	help
 	  Size of /tmp in memory in Kilobyte.
 
@@ -271,7 +286,7 @@ config ADK_RUNTIME_KBD_LAYOUT
 
 choice
 prompt "initial login shell for the root user"
-default ADK_ROOTSH_HUSH if ADK_TARGET_WITHOUT_MMU
+default ADK_ROOTSH_SASH if ADK_TARGET_WITHOUT_MMU
 default ADK_ROOTSH_MKSH
 
 config ADK_ROOTSH_MKSH
@@ -289,8 +304,8 @@ config ADK_ROOTSH_SASH
 
 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
+	select BUSYBOX_HUSH
+	select BUSYBOX_FEATURE_SH_IS_HUSH
 	help
 	  hush shell from busybox.
 
@@ -326,7 +341,7 @@ endchoice
 
 choice
 prompt "system /bin/sh (POSIX script shell)"
-default ADK_BINSH_HUSH if ADK_TARGET_WITHOUT_MMU
+default ADK_BINSH_SASH if ADK_TARGET_WITHOUT_MMU
 default ADK_BINSH_MKSH
 
 config ADK_BINSH_MKSH
@@ -338,13 +353,13 @@ config ADK_BINSH_MKSH
 
 config ADK_BINSH_SASH
 	bool "sash (Standalone Shell)"
-	select ADK_PACKAGE_SASH
+	select ADK_PACKAGE_SASH if !ADK_TOOLCHAIN_ONLY
 	help
 	  sash shell.
 
 config ADK_BINSH_HUSH
 	bool "hush (busybox)"
-	select ADK_PACKAGE_HUSH if !ADK_TOOLCHAIN_ONLY
+	select ADK_PACKAGE_HUSH
 	help
 	  hush shell.